diff --git a/.eslintignore b/.eslintignore
index 644318acf6..cc014c8b92 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 b3b29b2727..218cb72b81 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -14,23 +14,19 @@
     {"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,
@@ -45,18 +41,21 @@
     "visible":true,
     "invisible":true,
     "asyncRender":true,
-    "selectDropdown":true,
+    "selectKit":true,
+    "expandSelectKit":true,
+    "collapseSelectKit":true,
+    "selectKitSelectRowByValue":true,
+    "selectKitSelectRowByName":true,
+    "selectKitSelectRowByIndex":true,
+    "selectKitSelectNoneRow":true,
+    "selectKitFillInFilter":true,
     "asyncTestDiscourse":true,
     "fixture":true,
     "find":true,
     "sinon":true,
     "moment":true,
-    "start":true,
     "_":true,
     "alert":true,
-    "containsInstance":true,
-    "deepEqual":true,
-    "notEqual":true,
     "define":true,
     "require":true,
     "requirejs":true,
@@ -100,7 +99,9 @@
     "wrap-iife": [
       2,
       "inside"
-    ]
+    ],
+    "no-mixed-spaces-and-tabs": 2,
+    "no-trailing-spaces": 2
   },
   "parser": "babel-eslint"
 }
diff --git a/.gitignore b/.gitignore
index 2b372eaa07..8a1f8652b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ config/discourse.conf
 *.sql.gz
 /db/*.sqlite3
 /db/structure.sql
+/db/schema.rb
 
 # Ignore all logfiles and tempfiles.
 /log/*.log
@@ -43,6 +44,7 @@ config/discourse.conf
 /logfile
 log/
 bootsnap-load-path-cache
+bootsnap-compile-cache/
 
 # Ignore plugins except for the bundled ones.
 /plugins/*
@@ -52,6 +54,7 @@ bootsnap-load-path-cache
 !/plugins/discourse-details/
 !/plugins/discourse-nginx-performance-report
 !/plugins/discourse-narrative-bot
+!/plugins/discourse-presence
 /plugins/*/auto_generated/
 
 /spec/fixtures/plugins/my_plugin/auto_generated
@@ -116,3 +119,7 @@ vendor/bundle/*
 
 #ignore jetbrains ide file
 *.iml
+
+# ignore nodejs files
+/node_modules
+/package-lock.json
diff --git a/.image_optim.yml b/.image_optim.yml
deleted file mode 100644
index 746b85dc3b..0000000000
--- 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/.overcommit.yml b/.overcommit.yml
new file mode 100644
index 0000000000..2de35d6df9
--- /dev/null
+++ b/.overcommit.yml
@@ -0,0 +1,23 @@
+# Use this file to configure the Overcommit hooks you wish to use. This will
+# extend the default configuration defined in:
+# https://github.com/brigade/overcommit/blob/master/config/default.yml
+#
+# At the topmost level of this YAML file is a key representing type of hook
+# being run (e.g. pre-commit, commit-msg, etc.). Within each type you can
+# customize each hook, such as whether to only run it on certain files (via
+# `include`), whether to only display output if it fails (via `quiet`), etc.
+#
+# For a complete list of hooks, see:
+# https://github.com/brigade/overcommit/tree/master/lib/overcommit/hook
+#
+# For a complete list of options that you can use to customize hooks, see:
+# https://github.com/brigade/overcommit#configuration
+
+PreCommit:
+  RuboCop:
+    enabled: true
+    command: ['bundle', 'exec', 'rubocop']
+  EsLint:
+    enabled: true
+    command: ['eslint', '--ext', '.es6', '-f', 'compact']
+    include: '**/*.es6'
diff --git a/.rubocop.yml b/.rubocop.yml
index 792d6e22e1..b897ad3b9e 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,14 +1,113 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
+  DisabledByDefault: true
+  Exclude:
+    - 'db/schema.rb'
+    - 'bundle/**/*'
+    - 'vendor/**/*'
+    - 'node_modules/**/*'
+    - 'public/**/*'
 
-Metrics/LineLength:
-  Max: 120
+# Prefer &&/|| over and/or.
+Style/AndOr:
+  Enabled: true
 
-Metrics/MethodLength:
+# Do not use braces for hash literals when they are the last argument of a
+# method call.
+Style/BracesAroundHashParameters:
+  Enabled: true
+
+# Align `when` with `case`.
+Layout/CaseIndentation:
+  Enabled: true
+
+# Align comments with method definitions.
+Layout/CommentIndentation:
+  Enabled: true
+
+# No extra empty lines.
+Layout/EmptyLines:
+  Enabled: true
+
+# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
+Style/HashSyntax:
+  Enabled: true
+
+# Two spaces, no tabs (for indentation).
+Layout/IndentationWidth:
+  Enabled: true
+
+Layout/SpaceAfterColon:
+  Enabled: true
+
+Layout/SpaceAfterComma:
+  Enabled: true
+
+Layout/SpaceAroundEqualsInParameterDefault:
+  Enabled: true
+
+Layout/SpaceAroundKeyword:
+  Enabled: true
+
+Layout/SpaceAroundOperators:
+  Enabled: true
+
+Layout/SpaceBeforeFirstArg:
+    Enabled: true
+
+# Defining a method with parameters needs parentheses.
+Style/MethodDefParentheses:
+  Enabled: true
+
+# Use `foo {}` not `foo{}`.
+Layout/SpaceBeforeBlockBraces:
+  Enabled: true
+
+# Use `foo { bar }` not `foo {bar}`.
+Layout/SpaceInsideBlockBraces:
+  Enabled: true
+
+# Use `{ a: 1 }` not `{a:1}`.
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: true
+
+Layout/SpaceInsideParens:
+  Enabled: true
+
+# Detect hard tabs, no hard tabs.
+Layout/Tab:
+  Enabled: true
+
+# Blank lines should not have any spaces.
+Layout/TrailingBlankLines:
+  Enabled: true
+
+# No trailing whitespace.
+Layout/TrailingWhitespace:
+  Enabled: true
+
+Lint/Debugger:
+  Enabled: true
+
+Lint/BlockAlignment:
+  Enabled: true
+
+# Align `end` with the matching keyword or starting expression except for
+# assignments, where it should be aligned with the LHS.
+Lint/EndAlignment:
+  Enabled: true
+  EnforcedStyleAlignWith: variable
+
+# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
+Lint/RequireParentheses:
+  Enabled: true
+
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+
+Layout/AlignHash:
+  Enabled: true
+
+Bundler/OrderedGems:
   Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/FrozenStringLiteralComment:
-  Enabled: False
diff --git a/.travis.yml b/.travis.yml
index f41ee300dc..73ae46e5b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ env:
     - "RAILS_MASTER=0 QUNIT_RUN=0 RUN_LINT=1"
 
 addons:
+  chrome: stable
   postgresql: 9.5
   apt:
     packages:
@@ -20,8 +21,11 @@ addons:
 
 matrix:
   fast_finish: true
+  allow_failures:
+    - rvm: 2.5.0
 
 rvm:
+  - 2.5.0
   - 2.4.2
   - 2.3.4
 
@@ -44,12 +48,14 @@ before_install:
   - 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-chat-integration.git plugins/discourse-chat-integration
   - git clone --depth=1 https://github.com/discourse/discourse-assign.git plugins/discourse-assign
+  - git clone --depth=1 https://github.com/discourse/discourse-patreon.git plugins/discourse-patreon
   - export PATH=$HOME/.yarn/bin:$PATH
 
 install:
   - bash -c "if [ '$RAILS_MASTER' == '1' ]; then bundle update --retry=3 --jobs=3 arel rails seed-fu; fi"
   - bash -c "if [ '$RAILS_MASTER' == '0' ]; then bundle install --without development --deployment --retry=3 --jobs=3; fi"
   - bash -c "if [ '$RUN_LINT' == '1' ]; then yarn global add eslint babel-eslint; fi"
+  - bash -c "if [ '$QUNIT_RUN' == '1' ]; then yarn install --dev; fi"
 
 script:
   - |
@@ -65,7 +71,8 @@ script:
         bundle exec rake db:create db:migrate
 
         if [ '$QUNIT_RUN' == '1' ]; then
-          LOAD_PLUGINS=1 bundle exec rake qunit:test['400000']
+          bundle exec rake qunit:test['400000'] && \
+          bundle exec rake plugin:spec
         else
           bundle exec rspec && bundle exec rake plugin:spec
         fi
diff --git a/.tx/config b/.tx/config
index bd09128d4c..26ec9541c4 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
@@ -44,6 +38,18 @@ source_file = plugins/discourse-narrative-bot/config/locales/server.en.yml
 source_lang = en
 type = YML
 
+[discourse-org.discourse-presenceclientenyml]
+file_filter = plugins/discourse-presence/config/locales/client.<lang>.yml
+source_file = plugins/discourse-presence/config/locales/client.en.yml
+source_lang = en
+type = YML
+
+[discourse-org.discourse-presenceserverenyml]
+file_filter = plugins/discourse-presence/config/locales/server.<lang>.yml
+source_file = plugins/discourse-presence/config/locales/server.en.yml
+source_lang = en
+type = YML
+
 [discourse-org.403html]
 file_filter = public/403.<lang>.html
 source_file = public/403.html
diff --git a/Brewfile b/Brewfile
index ee7378b71c..ba4f913899 100644
--- a/Brewfile
+++ b/Brewfile
@@ -14,6 +14,3 @@ brew 'postgresql'
 
 # install the Redis datastore
 brew 'redis'
-
-# install headless Javascript testing library
-brew 'phantomjs'
diff --git a/Gemfile b/Gemfile
index 5bf31ec332..e558ffb47c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,28 +14,21 @@ if rails_master?
   gem 'rails', git: 'https://github.com/rails/rails.git'
   gem 'seed-fu', git: 'https://github.com/SamSaffron/seed-fu.git', branch: 'discourse'
 else
-  # Rails 5 is going to ship with Action Cable, we have no use for it as
-  # we already ship MessageBus, AC introduces dependencies on Event Machine,
-  # Celluloid and Faye Web Sockets.
-  #
-  # Note this means upgrading Rails is more annoying, to do so, comment out the
-  # explicit dependencies, and add gem 'rails', bundle update rails and then
-  # comment back the explicit dependencies. Leaving this in a comment till we
-  # upgrade to Rails 5
-  #
-  # gem 'activesupport'
-  # gem 'actionpack'
-  # gem 'activerecord'
-  # gem 'actionmailer'
-  # gem 'activejob'
-  # gem 'railties'
-  # gem 'sprockets-rails'
-  gem 'rails', '~> 4.2'
-  gem 'seed-fu', '~> 2.3.5'
+  gem 'actionmailer', '~> 5.1'
+  gem 'actionpack', '~> 5.1'
+  gem 'actionview', '~> 5.1'
+  gem 'activemodel', '~> 5.1'
+  gem 'activerecord', '~> 5.1'
+  gem 'activesupport', '~> 5.1'
+  gem 'railties', '~> 5.1'
+  gem 'sprockets-rails'
+  gem 'seed-fu'
 end
 
 gem 'mail'
 gem 'mime-types', require: 'mime/types/columnar'
+gem 'mini_mime'
+gem 'mini_suffix'
 
 gem 'hiredis'
 gem 'redis', require:  ["redis", "redis/connection/hiredis"]
@@ -43,7 +36,7 @@ gem 'redis-namespace'
 
 gem 'active_model_serializers', '~> 0.8.3'
 
-gem 'onebox'
+gem 'onebox', '1.8.33'
 
 gem 'http_accept_language', '~>2.0.5', require: false
 
@@ -51,7 +44,6 @@ gem 'ember-rails', '0.18.5'
 gem 'ember-source'
 gem 'ember-handlebars-template', '0.7.5'
 gem 'barber'
-gem 'babel-transpiler'
 
 gem 'message_bus'
 
@@ -61,28 +53,31 @@ gem 'fast_xs'
 
 gem 'fast_xor'
 
-gem 'fastimage', '2.1.0'
-gem 'aws-sdk', require: false
+# Forked until https://github.com/sdsykes/fastimage/pull/93 is merged
+gem 'discourse_fastimage', require: 'fastimage'
+
+gem 'aws-sdk-s3', require: false
 gem 'excon', require: false
 gem 'unf', require: false
 
-gem 'email_reply_trimmer', '0.1.6'
+gem 'email_reply_trimmer', '0.1.8'
 
-# TODO Use official image_optim gem once https://github.com/toy/image_optim/pull/149
-# is merged.
+# Forked until https://github.com/toy/image_optim/pull/149 is merged
 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'
 gem 'omniauth-facebook'
 gem 'omniauth-twitter'
 gem 'omniauth-instagram'
-
-# forked while https://github.com/intridea/omniauth-github/pull/41 is being upstreamd
-gem 'omniauth-github-discourse', require: 'omniauth-github'
+gem 'omniauth-github'
 
 gem 'omniauth-oauth2', require: false
 
@@ -94,21 +89,20 @@ 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
 gem 'rack-protection' # security
 
-# Gems used only for assets and not required
-# in production environments by default.
-# allow everywhere for now cause we are allowing asset debugging in prd
+# Gems used only for assets and not required in production environments by default.
+# Allow everywhere for now cause we are allowing asset debugging in production
 group :assets do
   gem 'uglifier'
   gem 'rtlit', require: false # for css rtling
@@ -118,9 +112,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
 
 group :test, :development do
@@ -137,12 +128,13 @@ group :test, :development do
   gem 'rspec-rails', require: false
   gem 'shoulda', require: false
   gem 'rspec-html-matchers'
-  gem 'spork-rails'
   gem 'pry-nav'
   gem 'byebug', require: ENV['RM_INFO'].nil?
+  gem 'rubocop', require: false
 end
 
 group :development do
+  gem 'ruby-prof', require: false
   gem 'bullet', require: !!ENV['BULLET']
   gem 'better_errors'
   gem 'binding_of_caller'
@@ -153,7 +145,7 @@ end
 # this is an optional gem, it provides a high performance replacement
 # to String#blank? a method that is called quite frequently in current
 # ActiveRecord, this may change in the future
-gem 'fast_blank' #, github: "SamSaffron/fast_blank"
+gem 'fast_blank'
 
 # this provides a very efficient lru cache
 gem 'lru_redux'
@@ -173,22 +165,23 @@ gem 'rbtrace', require: false, platform: :mri
 gem 'gc_tracer', require: false, platform: :mri
 
 # required for feed importing and embedding
-#
 gem 'ruby-readability', require: false
-gem 'simple-rss', require: false
 
 gem 'stackprof', require: false, platform: :mri
 gem 'memory_profiler', require: false, platform: :mri
 
-gem 'rmmseg-cpp', require: false
+gem 'cppjieba_rb', require: false
 
+gem 'lograge', require: false
+gem 'logstash-event', require: false
+gem 'logstash-logger', require: false
 gem 'logster'
 
 gem 'sassc', require: false
 
-
 if ENV["IMPORT"] == "1"
   gem 'mysql2'
   gem 'redcarpet'
   gem 'sqlite3', '~> 1.3.13'
+  gem 'ruby-bbcode-to-md', github: 'nlalonde/ruby-bbcode-to-md'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index a0a2290d93..529aa37e43 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,58 +1,62 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
+    actionmailer (5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.8)
-      actionview (= 4.2.8)
-      activesupport (= 4.2.8)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.4)
+      actionview (= 5.1.4)
+      activesupport (= 5.1.4)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.8)
-      activesupport (= 4.2.8)
+    actionview (5.1.4)
+      activesupport (= 5.1.4)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
     active_model_serializers (0.8.3)
       activemodel (>= 3.0)
-    activejob (4.2.8)
-      activesupport (= 4.2.8)
-      globalid (>= 0.3.0)
-    activemodel (4.2.8)
-      activesupport (= 4.2.8)
-      builder (~> 3.1)
-    activerecord (4.2.8)
-      activemodel (= 4.2.8)
-      activesupport (= 4.2.8)
-      arel (~> 6.0)
-    activesupport (4.2.8)
+    activejob (5.1.4)
+      activesupport (= 5.1.4)
+      globalid (>= 0.3.6)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
+      arel (~> 8.0)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       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)
-    arel (6.0.4)
-    aws-sdk (2.5.3)
-      aws-sdk-resources (= 2.5.3)
-    aws-sdk-core (2.5.3)
+      rake (>= 10.4, < 13.0)
+    ansi (1.5.0)
+    arel (8.0.0)
+    ast (2.3.0)
+    aws-partitions (1.24.0)
+    aws-sdk-core (3.6.0)
+      aws-partitions (~> 1.0)
+      aws-sigv4 (~> 1.0)
       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)
+    aws-sdk-kms (1.2.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-s3 (1.4.0)
+      aws-sdk-core (~> 3)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.0)
+    aws-sigv4 (1.0.2)
     barber (0.11.2)
       ember-source (>= 1.0, < 3)
       execjs (>= 1.2, < 3)
@@ -62,33 +66,33 @@ 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)
+    cppjieba_rb (0.3.0)
     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)
+    discourse-qunit-rails (0.0.11)
       railties
+    discourse_fastimage (2.1.0)
     discourse_image_optim (0.24.5)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       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)
+    email_reply_trimmer (0.1.8)
     ember-data-source (2.2.1)
       ember-source (>= 1.8, < 3.0)
     ember-handlebars-template (0.7.5)
@@ -101,9 +105,10 @@ GEM
       ember-source (>= 1.1.0)
       jquery-rails (>= 1.0.17)
       railties (>= 3.1)
-    ember-source (2.10.0)
+    ember-source (2.13.3)
+    erubi (1.6.1)
     erubis (2.7.0)
-    excon (0.55.0)
+    excon (0.56.0)
     execjs (2.7.0)
     exifr (1.2.5)
     fabrication (2.9.8)
@@ -115,68 +120,78 @@ GEM
       rake
       rake-compiler
     fast_xs (0.8.0)
-    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.6)
     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.9.211.38.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    logster (1.2.7)
-    loofah (2.0.3)
+    lograge (0.7.1)
+      actionpack (>= 4, < 5.2)
+      activesupport (>= 4, < 5.2)
+      railties (>= 4, < 5.2)
+      request_store (~> 1.0)
+    logstash-event (1.2.02)
+    logstash-logger (0.25.1)
+      logstash-event (~> 1.2)
+    logster (1.2.9)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
       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)
-    message_bus (2.0.2)
+    memory_profiler (0.9.8)
+    message_bus (2.1.1)
       rack (>= 1.1.3)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.99.3)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_mime (0.1.3)
     mini_portile2 (2.3.0)
-    mini_racer (0.1.9)
-      libv8 (~> 5.3)
-    minitest (5.10.1)
-    mocha (1.1.0)
+    mini_racer (0.1.11)
+      libv8 (~> 5.7)
+    mini_suffix (0.3.0)
+      ffi (~> 1.9)
+    minitest (5.10.3)
+    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.8.1)
       mini_portile2 (~> 2.3.0)
-    nokogumbo (1.4.10)
+    nokogumbo (1.4.13)
       nokogiri
     oauth (0.5.1)
     oauth2 (1.3.1)
@@ -185,15 +200,18 @@ 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)
     omniauth-facebook (4.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-github-discourse (1.1.2)
-      omniauth (~> 1.0)
-      omniauth-oauth2 (~> 1.1)
+    omniauth-github (1.3.0)
+      omniauth (~> 1.5)
+      omniauth-oauth2 (>= 1.4.0, < 2.0)
     omniauth-google-oauth2 (0.3.1)
       jwt (~> 1.0)
       multi_json (~> 1.3)
@@ -214,7 +232,7 @@ GEM
     omniauth-twitter (1.3.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.8.12)
+    onebox (1.8.33)
       fast_blank (>= 1.0.0)
       htmlentities (~> 4.3)
       moneta (~> 1.0)
@@ -225,7 +243,11 @@ GEM
     openid-redis-store (0.0.2)
       redis
       ruby-openid
-    pg (0.19.0)
+    parallel (1.12.0)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    pg (0.20.0)
+    powerpack (0.1.1)
     progress (3.3.1)
     pry (0.10.4)
       coderay (~> 1.1.0)
@@ -236,128 +258,117 @@ 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 (2.0.3)
+    rack-mini-profiler (0.10.7)
       rack (>= 1.2.0)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-protection (1.5.3)
+    rack-protection (2.0.0)
       rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.8)
-      actionmailer (= 4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
-      activemodel (= 4.2.8)
-      activerecord (= 4.2.8)
-      activesupport (= 4.2.8)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.8)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
+    rack-test (0.7.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    rails_multisite (1.0.6)
-      rails (> 4.2, < 5)
-    railties (4.2.8)
-      actionpack (= 4.2.8)
-      activesupport (= 4.2.8)
+    rails_multisite (1.1.2)
+      activerecord (> 4.2, < 6)
+      railties (> 4.2, < 6)
+    railties (5.1.4)
+      actionpack (= 5.1.4)
+      activesupport (= 5.1.4)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    raindrops (0.18.0)
-    rake (11.3.0)
-    rake-compiler (0.9.9)
+    rainbow (2.2.2)
       rake
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.7)
+    raindrops (0.19.0)
+    rake (12.1.0)
+    rake-compiler (1.0.4)
+      rake
+    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 (3.3.5)
+    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)
-    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)
+    request_store (1.3.2)
+    rinku (2.0.2)
+    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.1)
+      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)
+    rubocop (0.51.0)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-ll (2.1.2)
+      ansi
+      ast
     ruby-openid (2.7.0)
+    ruby-prof (0.16.2)
+    ruby-progressbar (1.9.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.7)
+      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.5)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
-      redis (~> 3.2, >= 3.2.1)
-    simple-rss (1.3.1)
-    sinatra (1.4.6)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
+      redis (>= 3.3.4, < 5)
     slop (3.6.0)
-    spork (1.0.0rc4)
-    spork-rails (4.0.0)
-      rails (>= 3.0.0, < 5)
-      spork (>= 1.0rc0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -366,21 +377,19 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     stackprof (0.2.10)
-    test_after_commit (1.1.0)
-      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)
-    unicorn (5.3.0)
+    unf_ext (0.0.7.4)
+    unicode-display_width (1.3.0)
+    unicorn (5.3.1)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uniform_notifier (1.10.0)
@@ -393,10 +402,15 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  actionmailer (~> 5.1)
+  actionpack (~> 5.1)
+  actionview (~> 5.1)
   active_model_serializers (~> 0.8.3)
+  activemodel (~> 5.1)
+  activerecord (~> 5.1)
+  activesupport (~> 5.1)
   annotate
-  aws-sdk
-  babel-transpiler
+  aws-sdk-s3
   barber
   better_errors
   binding_of_caller
@@ -404,9 +418,11 @@ DEPENDENCIES
   bullet
   byebug
   certified
+  cppjieba_rb
   discourse-qunit-rails
+  discourse_fastimage
   discourse_image_optim
-  email_reply_trimmer (= 0.1.6)
+  email_reply_trimmer (= 0.1.8)
   ember-handlebars-template (= 0.7.5)
   ember-rails (= 0.18.5)
   ember-source
@@ -417,7 +433,6 @@ DEPENDENCIES
   fast_blank
   fast_xor
   fast_xs
-  fastimage (= 2.1.0)
   flamegraph
   foreman
   gc_tracer
@@ -426,29 +441,35 @@ DEPENDENCIES
   htmlentities
   http_accept_language (~> 2.0.5)
   listen
+  lograge
+  logstash-event
+  logstash-logger
   logster
   lru_redux
   mail
   memory_profiler
   message_bus
   mime-types
+  mini_mime
   mini_racer
+  mini_suffix
   minitest
   mocha
   mock_redis
   multi_json
   mustache
   nokogiri
+  oga
   oj
   omniauth
   omniauth-facebook
-  omniauth-github-discourse
+  omniauth-github
   omniauth-google-oauth2
   omniauth-instagram
   omniauth-oauth2
   omniauth-openid
   omniauth-twitter
-  onebox
+  onebox (= 1.8.33)
   openid-redis-store
   pg
   pry-nav
@@ -457,38 +478,35 @@ DEPENDENCIES
   r2 (~> 0.2.5)
   rack-mini-profiler
   rack-protection
-  rails (~> 4.2)
   rails_multisite
+  railties (~> 5.1)
   rake
   rb-fsevent
   rb-inotify (~> 0.9)
   rbtrace
   redis
   redis-namespace
-  rest-client
   rinku
-  rmmseg-cpp
   rspec
   rspec-html-matchers
   rspec-rails
   rtlit
+  rubocop
+  ruby-prof
   ruby-readability
   sanitize
   sassc
-  seed-fu (~> 2.3.5)
+  seed-fu
   shoulda
   sidekiq
-  simple-rss
-  sinatra
-  spork-rails
+  sprockets-rails
   stackprof
-  test_after_commit
   thor
-  timecop
+  tilt
   uglifier
   unf
   unicorn
   webmock
 
 BUNDLED WITH
-   1.15.4
+   1.16.0
diff --git a/Rakefile b/Rakefile
index 179ba560eb..7a7f9ee44b 100755
--- a/Rakefile
+++ b/Rakefile
@@ -9,4 +9,3 @@ Discourse::Application.load_tasks
 # this prevents crashes when migrating a database in production in certain
 # PostgreSQL configuations when trying to create structure.sql
 Rake::Task["db:structure:dump"].clear if Rails.env.production?
-
diff --git a/app/assets/images/favicons/google_branding/logo_calendar_48px.png b/app/assets/images/favicons/google_branding/logo_calendar_48px.png
new file mode 100644
index 0000000000..bb50bb966d
Binary files /dev/null and b/app/assets/images/favicons/google_branding/logo_calendar_48px.png differ
diff --git a/app/assets/javascripts/admin/adapters/flagged-post.js.es6 b/app/assets/javascripts/admin/adapters/flagged-post.js.es6
new file mode 100644
index 0000000000..1a1065f638
--- /dev/null
+++ b/app/assets/javascripts/admin/adapters/flagged-post.js.es6
@@ -0,0 +1,38 @@
+import RestAdapter from 'discourse/adapters/rest';
+
+export default RestAdapter.extend({
+  pathFor(store, type, findArgs) {
+    let args = _.merge({ rest_api: true }, findArgs);
+    delete args.filter;
+    return `/admin/flags/${findArgs.filter}.json?${$.param(args)}`;
+  },
+
+  afterFindAll(results, helper) {
+    results.forEach(flag => {
+      let conversations = [];
+      flag.post_actions.forEach(pa => {
+        if (pa.conversation) {
+          let conversation = {
+            permalink: pa.permalink,
+            hasMore: pa.conversation.has_more,
+            response: {
+              excerpt: pa.conversation.response.excerpt,
+              user: helper.lookup('user', pa.conversation.response.user_id)
+            }
+          };
+
+          if (pa.conversation.reply) {
+            conversation.reply = {
+              excerpt: pa.conversation.reply.excerpt,
+              user: helper.lookup('user', pa.conversation.reply.user_id)
+            };
+          }
+          conversations.push(conversation);
+        }
+      });
+      flag.set('conversations', conversations);
+    });
+
+    return results;
+  }
+});
diff --git a/app/assets/javascripts/admin/components/ace-editor.js.es6 b/app/assets/javascripts/admin/components/ace-editor.js.es6
index 749ce2492d..faad36798a 100644
--- a/app/assets/javascripts/admin/components/ace-editor.js.es6
+++ b/app/assets/javascripts/admin/components/ace-editor.js.es6
@@ -1,13 +1,14 @@
 import loadScript from 'discourse/lib/load-script';
 import { observes } from 'ember-addons/ember-computed-decorators';
 
-const LOAD_ASYNC = !Ember.Test;
+const LOAD_ASYNC = !Ember.testing;
 
 export default Ember.Component.extend({
   mode: 'css',
   classNames: ['ace-wrapper'],
   _editor: null,
   _skipContentChangeEvent: null,
+  disabled: false,
 
   @observes('editorId')
   editorIdChanged() {
@@ -30,6 +31,24 @@ export default Ember.Component.extend({
     }
   },
 
+  @observes('disabled')
+  disabledStateChanged() {
+    this.changeDisabledState();
+  },
+
+  changeDisabledState() {
+    const editor = this._editor;
+    if (editor) {
+      const disabled = this.get('disabled');
+      editor.setOptions({
+        readOnly: disabled,
+        highlightActiveLine: !disabled,
+        highlightGutterLine: !disabled
+      });
+      editor.container.parentNode.setAttribute("data-disabled", disabled);
+    }
+  },
+
   _destroyEditor: function() {
     if (this._editor) {
       this._editor.destroy();
@@ -76,6 +95,7 @@ export default Ember.Component.extend({
 
         this.$().data('editor', editor);
         this._editor = editor;
+        this.changeDisabledState();
 
         $(window).off('ace:resize').on('ace:resize', ()=>{
           this.appEvents.trigger('ace:resize');
diff --git a/app/assets/javascripts/admin/components/admin-directory-toggle.js.es6 b/app/assets/javascripts/admin/components/admin-directory-toggle.js.es6
index e4d19613b5..8d43474a9d 100644
--- a/app/assets/javascripts/admin/components/admin-directory-toggle.js.es6
+++ b/app/assets/javascripts/admin/components/admin-directory-toggle.js.es6
@@ -1,4 +1,4 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
 export default Ember.Component.extend(bufferedRender({
diff --git a/app/assets/javascripts/admin/components/admin-group-selector.js.es6 b/app/assets/javascripts/admin/components/admin-group-selector.js.es6
deleted file mode 100644
index fd487640d0..0000000000
--- a/app/assets/javascripts/admin/components/admin-group-selector.js.es6
+++ /dev/null
@@ -1,43 +0,0 @@
-export default Ember.Component.extend({
-  tagName: 'div',
-
-  _init: function(){
-    this.$("input").select2({
-        multiple: true,
-        width: '100%',
-        query: function(opts) {
-                opts.callback({
-                  results: this.get("available").filter(function(o) {
-                      return -1 !== o.name.toLowerCase().indexOf(opts.term.toLowerCase());
-                    }).map(this._format)
-                });
-              }.bind(this)
-      }).on("change", function(evt) {
-        if (evt.added){
-          this.triggerAction({
-            action: "groupAdded",
-            actionContext: this.get("available").findBy("id", evt.added.id)
-          });
-        } else if (evt.removed) {
-          this.triggerAction({
-            action:"groupRemoved",
-            actionContext: evt.removed.id
-          });
-        }
-      }.bind(this));
-
-    this._refreshOnReset();
-  }.on("didInsertElement"),
-
-  _format(item) {
-    return {
-      "text": item.name,
-      "id": item.id,
-      "locked": item.automatic
-    };
-  },
-
-  _refreshOnReset: function() {
-    this.$("input").select2("data", this.get("selected").map(this._format));
-  }.observes("selected")
-});
diff --git a/app/assets/javascripts/admin/components/admin-nav.js.es6 b/app/assets/javascripts/admin/components/admin-nav.js.es6
new file mode 100644
index 0000000000..9250c1ae73
--- /dev/null
+++ b/app/assets/javascripts/admin/components/admin-nav.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  tagName: ''
+});
diff --git a/app/assets/javascripts/admin/components/admin-watched-word.js.es6 b/app/assets/javascripts/admin/components/admin-watched-word.js.es6
new file mode 100644
index 0000000000..3c78becb49
--- /dev/null
+++ b/app/assets/javascripts/admin/components/admin-watched-word.js.es6
@@ -0,0 +1,19 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
+
+export default Ember.Component.extend(bufferedRender({
+  classNames: ['watched-word'],
+
+  buildBuffer(buffer) {
+    buffer.push(iconHTML('times'));
+    buffer.push(' ' + this.get('word.word'));
+  },
+
+  click() {
+    this.get('word').destroy().then(() => {
+      this.sendAction('action', this.get('word'));
+    }).catch(e => {
+      bootbox.alert(I18n.t("generic_error_with_reason", {error: `http: ${e.status} - ${e.body}`}));
+    });;
+  }
+}));
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6 b/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6
index d176b5a40a..c5f1a4a244 100644
--- a/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6
+++ b/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6
@@ -1,5 +1,5 @@
 import computed from 'ember-addons/ember-computed-decorators';
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
 export default Ember.Component.extend(bufferedRender({
diff --git a/app/assets/javascripts/admin/components/flagged-post-response.js.es6 b/app/assets/javascripts/admin/components/flagged-post-response.js.es6
new file mode 100644
index 0000000000..e031f33e03
--- /dev/null
+++ b/app/assets/javascripts/admin/components/flagged-post-response.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  classNames: ['flagged-post-response']
+});
diff --git a/app/assets/javascripts/admin/components/flagged-post.js.es6 b/app/assets/javascripts/admin/components/flagged-post.js.es6
new file mode 100644
index 0000000000..0754952a01
--- /dev/null
+++ b/app/assets/javascripts/admin/components/flagged-post.js.es6
@@ -0,0 +1,72 @@
+import showModal from 'discourse/lib/show-modal';
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  adminTools: Ember.inject.service(),
+  expanded: false,
+  suspended: false,
+
+  tagName: 'div',
+  classNameBindings: [
+    ':flagged-post',
+    'flaggedPost.hidden:hidden-post',
+    'flaggedPost.deleted'
+  ],
+
+  @computed('filter')
+  canAct(filter) {
+    return filter === 'active';
+  },
+
+  removeAfter(promise) {
+    return promise.then(() => {
+      this.attrs.removePost();
+    }).catch(() => {
+      bootbox.alert(I18n.t("admin.flags.error"));
+    });
+  },
+
+  _spawnModal(name, model, modalClass) {
+    let controller = showModal(name, { model, admin: true, modalClass });
+    controller.removeAfter = (p) => this.removeAfter(p);
+  },
+
+  actions: {
+    removeAfter(promise) {
+      this.removeAfter(promise);
+    },
+
+    disagree() {
+      this.removeAfter(this.get('flaggedPost').disagreeFlags());
+    },
+
+    defer() {
+      this.removeAfter(this.get('flaggedPost').deferFlags());
+    },
+
+    expand() {
+      this.get('flaggedPost').expandHidden().then(() => {
+        this.set('expanded', true);
+      });
+    },
+
+    showModerationHistory() {
+      this.get('adminTools').showModerationHistory({
+        filter: 'post',
+        post_id: this.get('flaggedPost.id')
+      });
+    },
+
+    showSuspendModal() {
+      let post = this.get('flaggedPost');
+      let user = post.get('user');
+      this.get('adminTools').showSuspendModal(
+        user,
+        {
+          post,
+          successCallback: result => this.set('suspended', result.suspended)
+        }
+      );
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/components/ip-lookup.js.es6 b/app/assets/javascripts/admin/components/ip-lookup.js.es6
index 0c9b73d54a..a185e4c0b6 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/list-setting.js.es6 b/app/assets/javascripts/admin/components/list-setting.js.es6
deleted file mode 100644
index da6c5173d6..0000000000
--- a/app/assets/javascripts/admin/components/list-setting.js.es6
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
-  Provide a nice GUI for a pipe-delimited list in the site settings.
-
-  @param settingValue is a reference to SiteSetting.value.
-  @param choices is a reference to SiteSetting.choices
-**/
-export default Ember.Component.extend({
-
-  _select2FormatSelection: function(selectedObject, jqueryWrapper, htmlEscaper) {
-    var text = selectedObject.text;
-    if (text.length <= 6) {
-      jqueryWrapper.closest('li.select2-search-choice').css({"border-bottom": '7px solid #'+text});
-    }
-    return htmlEscaper(text);
-  },
-
-  _initializeSelect2: function(){
-    var options = {
-      multiple: false,
-      separator: "|",
-      tokenSeparators: ["|"],
-      tags : this.get("choices") || [],
-      width: 'off',
-      dropdownCss: this.get("choices") ? {} : {display: 'none'},
-      selectOnBlur: this.get("choices") ? false : true
-    };
-
-    var settingName = this.get('settingName');
-    if (typeof settingName === 'string' && settingName.indexOf('colors') > -1) {
-      options.formatSelection = this._select2FormatSelection;
-    }
-
-    var self = this;
-    this.$("input").select2(options).on("change", function(obj) {
-      self.set("settingValue", obj.val.join("|"));
-      self.refreshSortables();
-    });
-
-    this.refreshSortables();
-  }.on('didInsertElement'),
-
-  refreshOnReset: function() {
-    this.$("input").select2("val", this.get("settingValue").split("|"));
-  }.observes("settingValue"),
-
-  refreshSortables: function() {
-    var self = this;
-    this.$("ul.select2-choices").sortable().on('sortupdate', function() {
-      self.$("input").select2("onSortEnd");
-    });
-  }
-});
-
-
diff --git a/app/assets/javascripts/admin/components/moderation-history-item.js.es6 b/app/assets/javascripts/admin/components/moderation-history-item.js.es6
new file mode 100644
index 0000000000..b8674a8aaf
--- /dev/null
+++ b/app/assets/javascripts/admin/components/moderation-history-item.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  tagName: 'tr',
+});
diff --git a/app/assets/javascripts/admin/components/permalink-form.js.es6 b/app/assets/javascripts/admin/components/permalink-form.js.es6
index 2bde845c0c..90dcf2a7b2 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/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js.es6
index 73a46eded3..36f420d100 100644
--- a/app/assets/javascripts/admin/components/resumable-upload.js.es6
+++ b/app/assets/javascripts/admin/components/resumable-upload.js.es6
@@ -1,3 +1,4 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
 /*global Resumable:true */
@@ -40,7 +41,7 @@ export default Ember.Component.extend(bufferedRender({
 
   buildBuffer(buffer) {
     const icon = this.get("isUploading") ? "times" : "upload";
-    buffer.push(`<i class="fa fa-${icon}"></i>`);
+    buffer.push(iconHTML(icon));
     buffer.push("<span class='ru-label'>" + this.get("text") + "</span>");
     buffer.push("<span class='ru-progress' style='width:" + this.get("progress") + "%'></span>");
   },
diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js.es6
index 662e4ef684..73e8160a28 100644
--- a/app/assets/javascripts/admin/components/site-setting.js.es6
+++ b/app/assets/javascripts/admin/components/site-setting.js.es6
@@ -2,6 +2,7 @@ import BufferedContent from 'discourse/mixins/buffered-content';
 import SiteSetting from 'admin/models/site-setting';
 import { propertyNotEqual } from 'discourse/lib/computed';
 import computed from 'ember-addons/ember-computed-decorators';
+import { categoryLinkHTML } from 'discourse/helpers/category-link';
 
 const CustomTypes = ['bool', 'enum', 'list', 'url_list', 'host_list', 'category_list', 'value_list'];
 
@@ -11,8 +12,19 @@ export default Ember.Component.extend(BufferedContent, {
   dirty: propertyNotEqual('buffered.value', 'setting.value'),
   validationMessage: null,
 
-  @computed("setting.preview", "buffered.value")
-  preview(preview, value) {
+  @computed("setting", "buffered.value")
+  preview(setting, value) {
+    // A bit hacky, but allows us to use helpers
+    if (setting.get('setting') === 'category_style') {
+      let category = this.site.get('categories.firstObject');
+      if (category) {
+        return categoryLinkHTML(category, {
+          categoryStyle: value
+        });
+      }
+    }
+
+    let preview = setting.get('preview');
     if (preview) {
       return new Handlebars.SafeString("<div class='preview'>" + preview.replace(/\{\{value\}\}/g, value) + "</div>");
     }
@@ -52,16 +64,16 @@ export default Ember.Component.extend(BufferedContent, {
   }.on("willDestroyElement"),
 
   _save() {
-    const self = this,
-          setting = this.get('buffered');
-    SiteSetting.update(setting.get('setting'), setting.get('value')).then(function() {
-      self.set('validationMessage', null);
-      self.commitBuffer();
-    }).catch(function(e) {
+    const setting = this.get('buffered'),
+      action = SiteSetting.update(setting.get('setting'), setting.get('value'));
+    action.then(() => {
+      this.set('validationMessage', null);
+      this.commitBuffer();
+    }).catch((e) => {
       if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
-        self.set('validationMessage', e.jqXHR.responseJSON.errors[0]);
+        this.set('validationMessage', e.jqXHR.responseJSON.errors[0]);
       } else {
-        self.set('validationMessage', I18n.t('generic_error'));
+        this.set('validationMessage', I18n.t('generic_error'));
       }
     });
   },
diff --git a/app/assets/javascripts/admin/components/watched-word-form.js.es6 b/app/assets/javascripts/admin/components/watched-word-form.js.es6
new file mode 100644
index 0000000000..1e187bcd53
--- /dev/null
+++ b/app/assets/javascripts/admin/components/watched-word-form.js.es6
@@ -0,0 +1,55 @@
+import WatchedWord from 'admin/models/watched-word';
+import { default as computed, on, observes } from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  classNames: ['watched-word-form'],
+  formSubmitted: false,
+  actionKey: null,
+  showSuccessMessage: false,
+
+  @computed('regularExpressions')
+  placeholderKey(regularExpressions) {
+    return "admin.watched_words.form.placeholder" +
+      (regularExpressions ? "_regexp" : "");
+  },
+
+  @observes('word')
+  removeSuccessMessage() {
+    if (this.get('showSuccessMessage') && !Ember.isEmpty(this.get('word'))) {
+      this.set('showSuccessMessage', false);
+    }
+  },
+
+  actions: {
+    submit() {
+      if (!this.get('formSubmitted')) {
+        this.set('formSubmitted', true);
+
+        const watchedWord = WatchedWord.create({ word: this.get('word'), action: this.get('actionKey') });
+
+        watchedWord.save().then(result => {
+          this.setProperties({ word: '', formSubmitted: false, showSuccessMessage: true });
+          this.sendAction('action', WatchedWord.create(result));
+          Ember.run.schedule('afterRender', () => this.$('.watched-word-input').focus());
+        }).catch(e => {
+          this.set('formSubmitted', false);
+          const msg = (e.responseJSON && e.responseJSON.errors) ?
+                      I18n.t("generic_error_with_reason", {error: e.responseJSON.errors.join('. ')}) :
+                      I18n.t("generic_error");
+          bootbox.alert(msg, () => this.$('.watched-word-input').focus());
+        });
+      }
+    }
+  },
+
+  @on("didInsertElement")
+  _init() {
+    Ember.run.schedule('afterRender', () => {
+      this.$('.watched-word-input').keydown(e => {
+        if (e.keyCode === 13) {
+          this.send('submit');
+        }
+      });
+    });
+  }
+});
diff --git a/app/assets/javascripts/admin/components/watched-word-uploader.js.es6 b/app/assets/javascripts/admin/components/watched-word-uploader.js.es6
new file mode 100644
index 0000000000..8d9e6ba0a9
--- /dev/null
+++ b/app/assets/javascripts/admin/components/watched-word-uploader.js.es6
@@ -0,0 +1,25 @@
+import computed from "ember-addons/ember-computed-decorators";
+import UploadMixin from "discourse/mixins/upload";
+
+export default Em.Component.extend(UploadMixin, {
+  type: 'csv',
+  classNames: 'watched-words-uploader',
+  uploadUrl: '/admin/logs/watched_words/upload',
+  addDisabled: Em.computed.alias("uploading"),
+
+  validateUploadedFilesOptions() {
+    return { csvOnly: true };
+  },
+
+  @computed('actionKey')
+  data(actionKey) {
+    return { action_key: actionKey };
+  },
+
+  uploadDone() {
+    if (this) {
+      bootbox.alert(I18n.t("admin.watched_words.form.upload_successful"));
+      this.sendAction("done");
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js.es6
index 1c8eb6b086..4c5a2a2854 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js.es6
@@ -15,6 +15,7 @@ export default Ember.Controller.extend(bufferedProperty('emailTemplate'), {
 
   actions: {
     saveChanges() {
+      this.set('saved', false);
       const buffered = this.get('buffered');
       this.get('emailTemplate').save(buffered.getProperties('subject', 'body')).then(() => {
         this.set('saved', true);
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
index 2e39c15880..d06b8dc06e 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
@@ -7,7 +7,7 @@ import computed from 'ember-addons/ember-computed-decorators';
 
 const PROBLEMS_CHECK_MINUTES = 1;
 
-const ATTRIBUTES = [ 'disk_space','admins', 'moderators', 'blocked', 'suspended', 'top_traffic_sources',
+const ATTRIBUTES = [ 'disk_space','admins', 'moderators', 'silenced', 'suspended', 'top_traffic_sources',
                      'top_referred_topics', 'updated_at'];
 
 const REPORTS = [ 'global_reports', 'page_view_reports', 'private_message_reports', 'http_reports',
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 8065d732fc..eb03301c92 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-flags-list.js.es6 b/app/assets/javascripts/admin/controllers/admin-flags-list.js.es6
deleted file mode 100644
index e3101e2fa3..0000000000
--- a/app/assets/javascripts/admin/controllers/admin-flags-list.js.es6
+++ /dev/null
@@ -1,41 +0,0 @@
-import FlaggedPost from 'admin/models/flagged-post';
-
-export default Ember.Controller.extend({
-  query: null,
-
-  adminOldFlagsView: Em.computed.equal("query", "old"),
-  adminActiveFlagsView: Em.computed.equal("query", "active"),
-
-  actions: {
-    disagreeFlags(flaggedPost) {
-      flaggedPost.disagreeFlags().then(() => {
-        this.get('model').removeObject(flaggedPost);
-      }, function () {
-        bootbox.alert(I18n.t("admin.flags.error"));
-      });
-    },
-
-    deferFlags(flaggedPost) {
-      flaggedPost.deferFlags().then(() => {
-        this.get('model').removeObject(flaggedPost);
-      }, function () {
-        bootbox.alert(I18n.t("admin.flags.error"));
-      });
-    },
-
-    doneTopicFlags(item) {
-      this.send("disagreeFlags", item);
-    },
-
-    loadMore() {
-      const flags = this.get('model');
-      return FlaggedPost.findAll(this.get('query'), flags.length+1).then(data => {
-        if (data.length===0) {
-          flags.set("allLoaded",true);
-        }
-        flags.addObjects(data);
-      });
-    }
-  }
-
-});
diff --git a/app/assets/javascripts/admin/controllers/admin-group.js.es6 b/app/assets/javascripts/admin/controllers/admin-group.js.es6
index a0f4961b62..cab20f908f 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_admission')
+  disableMembershipRequestSetting(visibility_level, publicAdmission) {
+    visibility_level = parseInt(visibility_level);
+    return (visibility_level !== 0) || publicAdmission;
   },
 
-  @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/controllers/admin-logs-staff-action-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6
index 4899c4b59e..626fe955ce 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6
@@ -30,7 +30,7 @@ export default Ember.Controller.extend({
 
   showInstructions: Ember.computed.gt('model.length', 0),
 
-  refresh: function() {
+  _refresh() {
     this.set('loading', true);
 
     var filters = this.get('filters'),
@@ -65,14 +65,18 @@ export default Ember.Controller.extend({
     });
   },
 
+  scheduleRefresh() {
+    Ember.run.scheduleOnce('afterRender', this, this._refresh);
+  },
+
   resetFilters: function() {
     this.set('filters', Ember.Object.create());
-    this.refresh();
+    this.scheduleRefresh();
   }.on('init'),
 
   _changeFilters: function(props) {
     this.get('filters').setProperties(props);
-    this.refresh();
+    this.scheduleRefresh();
   },
 
   actions: {
@@ -91,7 +95,7 @@ export default Ember.Controller.extend({
       this._changeFilters(changed);
     },
 
-    clearAllFilters: function() {
+    clearAllFilters() {
       this.set("filterActionId", null);
       this.resetFilters();
     },
diff --git a/app/assets/javascripts/admin/controllers/admin-search-logs-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-search-logs-index.js.es6
new file mode 100644
index 0000000000..83436849fe
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/admin-search-logs-index.js.es6
@@ -0,0 +1,11 @@
+export default Ember.Controller.extend({
+  loading: false,
+  period: "all",
+  searchType: "all",
+
+  searchTypeOptions: [
+                      {id: 'all',       name: I18n.t('admin.logs.search_logs.types.all_search_types')},
+                      {id: 'header',    name: I18n.t('admin.logs.search_logs.types.header')},
+                      {id: 'full_page', name: I18n.t('admin.logs.search_logs.types.full_page')}
+                    ]
+});
diff --git a/app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6 b/app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6
new file mode 100644
index 0000000000..98d061e060
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6
@@ -0,0 +1,13 @@
+export default Ember.Controller.extend({
+  loading: false,
+  term: null,
+  period: "yearly",
+  searchType: "all",
+
+  searchTypeOptions: [
+                      {id: 'all', name: I18n.t('admin.logs.search_logs.types.all_search_types')},
+                      {id: 'header', name: I18n.t('admin.logs.search_logs.types.header')},
+                      {id: 'full_page', name: I18n.t('admin.logs.search_logs.types.full_page')},
+                      {id: 'click_through_only', name: I18n.t('admin.logs.search_logs.types.click_through_only')}
+                    ]
+});
diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
index 834ed3912b..266fdbd02c 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
@@ -6,6 +6,7 @@ import { popupAjaxError } from 'discourse/lib/ajax-error';
 import computed from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Controller.extend(CanCheckEmails, {
+  adminTools: Ember.inject.service(),
   editingUsername: false,
   editingName: false,
   editingTitle: false,
@@ -57,13 +58,22 @@ export default Ember.Controller.extend(CanCheckEmails, {
     saveTrustLevel() { return this.get("model").saveTrustLevel(); },
     restoreTrustLevel() { return this.get("model").restoreTrustLevel(); },
     lockTrustLevel(locked) { return this.get("model").lockTrustLevel(locked); },
-    unsuspend() { return this.get("model").unsuspend(); },
-    unblock() { return this.get("model").unblock(); },
-    block() { return this.get("model").block(); },
+    unsilence() { return this.get("model").unsilence(); },
+    silence() { return this.get("model").silence(); },
     deleteAllPosts() { return this.get("model").deleteAllPosts(); },
     anonymize() { return this.get('model').anonymize(); },
     destroy() { return this.get('model').destroy(); },
 
+    showSuspendModal() {
+      this.get('adminTools').showSuspendModal(this.get('model'));
+    },
+    unsuspend() {
+      this.get("model").unsuspend().catch(popupAjaxError);
+    },
+    showSilenceModal() {
+      this.get('adminTools').showSilenceModal(this.get('model'));
+    },
+
     toggleUsernameEdit() {
       this.set('userUsernameValue', this.get('model.username'));
       this.toggleProperty('editingUsername');
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
new file mode 100644
index 0000000000..bd11f15fcf
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
@@ -0,0 +1,65 @@
+import computed from 'ember-addons/ember-computed-decorators';
+import WatchedWord from 'admin/models/watched-word';
+
+export default Ember.Controller.extend({
+  actionNameKey: null,
+  adminWatchedWords: Ember.inject.controller(),
+  showWordsList: Ember.computed.or('adminWatchedWords.filtered', 'adminWatchedWords.showWords'),
+
+  findAction(actionName) {
+    return (this.get('adminWatchedWords.model') || []).findBy('nameKey', actionName);
+  },
+
+  @computed('adminWatchedWords.model', 'actionNameKey')
+  filteredContent() {
+    if (!this.get('actionNameKey')) { return []; }
+
+    const a = this.findAction(this.get('actionNameKey'));
+    return a ? a.words : [];
+  },
+
+  @computed('actionNameKey')
+  actionDescription(actionNameKey) {
+    return I18n.t('admin.watched_words.action_descriptions.' + actionNameKey);
+  },
+
+  actions: {
+    recordAdded(arg) {
+      const a = this.findAction(this.get('actionNameKey'));
+      if (a) {
+        a.words.unshiftObject(arg);
+        a.incrementProperty('count');
+        Em.run.schedule('afterRender', () => {
+          // remove from other actions lists
+          let match = null;
+          this.get('adminWatchedWords.model').forEach(action => {
+            if (match) return;
+
+            if (action.nameKey !== this.get('actionNameKey')) {
+              match = action.words.findBy('id', arg.id);
+              if (match) {
+                action.words.removeObject(match);
+                action.decrementProperty('count');
+              }
+            }
+          });
+        });
+      }
+    },
+
+    recordRemoved(arg) {
+      const a = this.findAction(this.get('actionNameKey'));
+      if (a) {
+        a.words.removeObject(arg);
+        a.decrementProperty('count');
+      }
+    },
+
+    uploadComplete() {
+      WatchedWord.findAll().then(data => {
+        this.set('adminWatchedWords.model', data);
+      });
+    }
+  }
+
+});
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
new file mode 100644
index 0000000000..dc4428fc72
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
@@ -0,0 +1,52 @@
+import debounce from 'discourse/lib/debounce';
+
+export default Ember.Controller.extend({
+  filter: null,
+  filtered: false,
+  showWords: false,
+  disableShowWords: Ember.computed.alias('filtered'),
+  regularExpressions: null,
+
+  filterContentNow() {
+
+    if (!!Ember.isEmpty(this.get('allWatchedWords'))) return;
+
+    let filter;
+    if (this.get('filter')) {
+      filter = this.get('filter').toLowerCase();
+    }
+
+    if (filter === undefined || filter.length < 1) {
+      this.set('model', this.get('allWatchedWords'));
+      return;
+    }
+
+    const matchesByAction = [];
+
+    this.get('allWatchedWords').forEach(wordsForAction => {
+      const wordRecords = wordsForAction.words.filter(wordRecord => {
+        return (wordRecord.word.indexOf(filter) > -1);
+      });
+      matchesByAction.pushObject( Ember.Object.create({
+        nameKey: wordsForAction.nameKey,
+        name: wordsForAction.name,
+        words: wordRecords,
+        count: wordRecords.length
+      }) );
+    });
+
+    this.set('model', matchesByAction);
+  },
+
+  filterContent: debounce(function() {
+    this.filterContentNow();
+    this.set('filtered', !Ember.isEmpty(this.get('filter')));
+  }, 250).observes('filter'),
+
+  actions: {
+    clearFilter() {
+      this.setProperties({ filter: '' });
+    }
+  }
+
+});
diff --git a/app/assets/javascripts/admin/controllers/admin.js.es6 b/app/assets/javascripts/admin/controllers/admin.js.es6
index 3bdfbe6b50..0e5d3c6b50 100644
--- a/app/assets/javascripts/admin/controllers/admin.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin.js.es6
@@ -1,5 +1,20 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
 export default Ember.Controller.extend({
-  showBadges: function() {
-    return this.get('currentUser.admin') && this.siteSettings.enable_badges;
-  }.property()
+  application: Ember.inject.controller(),
+
+  @computed
+  showBadges() {
+    return this.currentUser.get('admin') && this.siteSettings.enable_badges;
+  },
+
+  @computed('application.currentPath')
+  adminContentsClassName(currentPath) {
+    return currentPath.split('.').filter(segment => {
+      return segment !== 'index' &&
+        segment !== 'loading' &&
+        segment !== 'show' &&
+        segment !== 'admin';
+    }).map(Ember.String.dasherize).join(' ');
+  }
 });
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
index 3d771a91e6..7bbdaa3de5 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
@@ -16,16 +16,17 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
   @computed('name')
   nameValid(name) {
-    return name && name.match(/^[a-zA-Z0-9-_]+$/);
+    return name && name.match(/^[a-z_][a-z0-9_-]*$/i);
   },
 
   @observes('name')
-  uploadChanged(){
-    let file = $('#file-input')[0];
+  uploadChanged() {
+    const file = $('#file-input')[0];
     this.set('fileSelected', file && file.files[0]);
   },
 
   actions: {
+
     updateName() {
       let name = this.get('name');
       if (Em.isEmpty(name)) {
@@ -34,20 +35,21 @@ export default Ember.Controller.extend(ModalFunctionality, {
       }
       this.uploadChanged();
     },
-    upload() {
 
-      let options = {
-        type: 'POST'
+    upload() {
+      const file = $('#file-input')[0].files[0];
+
+      const options = {
+        type: 'POST',
+        processData: false,
+        contentType: false,
+        data: new FormData()
       };
 
-      options.processData = false;
-      options.contentType = false;
-      options.data = new FormData();
-      let file = $('#file-input')[0].files[0];
       options.data.append('file', file);
 
-      ajax('/admin/themes/upload_asset', options).then(result=>{
-        let upload = {
+      ajax('/admin/themes/upload_asset', options).then(result => {
+        const upload = {
           upload_id: result.upload_id,
           name: this.get('name'),
           original_filename: file.name
@@ -57,7 +59,6 @@ export default Ember.Controller.extend(ModalFunctionality, {
       }).catch(e => {
         popupAjaxError(e);
       });
-
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6
deleted file mode 100644
index 7f1f4f2e49..0000000000
--- a/app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6
+++ /dev/null
@@ -1,24 +0,0 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-
-export default Ember.Controller.extend(ModalFunctionality, {
-  adminFlagsList: Ember.inject.controller(),
-
-  _agreeFlag: function (actionOnPost) {
-    const adminFlagController = this.get("adminFlagsList");
-    const post = this.get("content");
-
-    return post.agreeFlags(actionOnPost).then(() => {
-      adminFlagController.get('model').removeObject(post);
-      this.send("closeModal");
-    }, function () {
-      bootbox.alert(I18n.t("admin.flags.error"));
-    });
-  },
-
-  actions: {
-    agreeFlagHidePost: function () { return this._agreeFlag("hide"); },
-    agreeFlagKeepPost: function () { return this._agreeFlag("keep"); },
-    agreeFlagRestorePost: function () { return this._agreeFlag("restore"); }
-  }
-
-});
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-delete-flag.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-delete-flag.js.es6
deleted file mode 100644
index fc2e062794..0000000000
--- a/app/assets/javascripts/admin/controllers/modals/admin-delete-flag.js.es6
+++ /dev/null
@@ -1,31 +0,0 @@
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-
-export default Ember.Controller.extend(ModalFunctionality, {
-  adminFlagsList: Ember.inject.controller(),
-
-  actions: {
-    deletePostDeferFlag() {
-      const adminFlagController = this.get("adminFlagsList");
-      const post = this.get("content");
-
-      return post.deferFlags(true).then(() => {
-        adminFlagController.get('model').removeObject(post);
-        this.send("closeModal");
-      }, function () {
-        bootbox.alert(I18n.t("admin.flags.error"));
-      });
-    },
-
-    deletePostAgreeFlag() {
-      const adminFlagController = this.get("adminFlagsList");
-      const post = this.get("content");
-
-      return post.agreeFlags("delete").then(() => {
-        adminFlagController.get('model').removeObject(post);
-        this.send("closeModal");
-      }, function () {
-        bootbox.alert(I18n.t("admin.flags.error"));
-      });
-    }
-  }
-});
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-moderation-history.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-moderation-history.js.es6
new file mode 100644
index 0000000000..ee017eae88
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/modals/admin-moderation-history.js.es6
@@ -0,0 +1,18 @@
+import ModalFunctionality from 'discourse/mixins/modal-functionality';
+
+export default Ember.Controller.extend(ModalFunctionality, {
+  loading: null,
+  historyTarget: null,
+  history: null,
+
+  onShow() {
+    this.set('loading', true);
+    this.set('history', null);
+  },
+
+  loadHistory(target) {
+    this.store.findAll('moderation-history', target).then(result => {
+      this.set('history', result);
+    }).finally(() => this.set('loading', false));
+  }
+});
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6
new file mode 100644
index 0000000000..9f1aef916f
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6
@@ -0,0 +1,50 @@
+import ModalFunctionality from 'discourse/mixins/modal-functionality';
+import computed from 'ember-addons/ember-computed-decorators';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+
+export default Ember.Controller.extend(ModalFunctionality, {
+  silenceUntil: null,
+  reason: null,
+  message: null,
+  silencing: false,
+  user: null,
+  post: null,
+  successCallback: null,
+
+  onShow() {
+    this.setProperties({
+      silenceUntil: null,
+      reason: null,
+      message: null,
+      silencing: false,
+      loadingUser: true,
+      post: null,
+      successCallback: null,
+    });
+  },
+
+  @computed('silenceUntil', 'reason', 'silencing')
+  submitDisabled(silenceUntil, reason, silencing) {
+    return (silencing || Ember.isEmpty(silenceUntil) || !reason || reason.length < 1);
+  },
+
+  actions: {
+    silence() {
+      if (this.get('submitDisabled')) { return; }
+
+      this.set('silencing', true);
+      this.get('user').silence({
+        silenced_till: this.get('silenceUntil'),
+        reason: this.get('reason'),
+        message: this.get('message'),
+        post_id: this.get('post.id')
+      }).then(result => {
+        this.send('closeModal');
+        let callback = this.get('successCallback');
+        if (callback) {
+          callback(result);
+        }
+      }).catch(popupAjaxError).finally(() => this.set('silencing', false));
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6
index d3e19de569..efcd142670 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6
@@ -1,25 +1,50 @@
 import ModalFunctionality from 'discourse/mixins/modal-functionality';
+import computed from 'ember-addons/ember-computed-decorators';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
 
 export default Ember.Controller.extend(ModalFunctionality, {
+  suspendUntil: null,
+  reason: null,
+  message: null,
+  suspending: false,
+  user: null,
+  post: null,
+  successCallback: null,
 
-  submitDisabled: function() {
-    return (!this.get('reason') || this.get('reason').length < 1);
-  }.property('reason'),
+  onShow() {
+    this.setProperties({
+      suspendUntil: null,
+      reason: null,
+      message: null,
+      suspending: false,
+      loadingUser: true,
+      post: null,
+      successCallback: null,
+    });
+  },
+
+  @computed('suspendUntil', 'reason', 'suspending')
+  submitDisabled(suspendUntil, reason, suspending) {
+    return (suspending || Ember.isEmpty(suspendUntil) || !reason || reason.length < 1);
+  },
 
   actions: {
-    suspend: function() {
-      if (this.get('submitDisabled')) return;
-      var duration = parseInt(this.get('duration'), 10);
-      if (duration > 0) {
-        var self = this;
-        this.send('hideModal');
-        this.get('model').suspend(duration, this.get('reason')).then(function() {
-          window.location.reload();
-        }, function(e) {
-          var error = I18n.t('admin.user.suspend_failed', { error: "http: " + e.status + " - " + e.body });
-          bootbox.alert(error, function() { self.send('reopenModal'); });
-        });
-      }
+    suspend() {
+      if (this.get('submitDisabled')) { return; }
+
+      this.set('suspending', true);
+      this.get('user').suspend({
+        suspend_until: this.get('suspendUntil'),
+        reason: this.get('reason'),
+        message: this.get('message'),
+        post_id: this.get('post.id')
+      }).then(result => {
+        this.send('closeModal');
+        let callback = this.get('successCallback');
+        if (callback) {
+          callback(result);
+        }
+      }).catch(popupAjaxError).finally(() => this.set('suspending', false));
     }
   }
 
diff --git a/app/assets/javascripts/admin/helpers/check-icon.js.es6 b/app/assets/javascripts/admin/helpers/check-icon.js.es6
new file mode 100644
index 0000000000..0a68c0be0b
--- /dev/null
+++ b/app/assets/javascripts/admin/helpers/check-icon.js.es6
@@ -0,0 +1,7 @@
+import { registerUnbound } from 'discourse-common/lib/helpers';
+import { renderIcon } from 'discourse-common/lib/icon-library';
+
+registerUnbound('check-icon', function(value) {
+  let icon = value ? "check" : "times";
+  return new Handlebars.SafeString(renderIcon('string', icon));
+});
diff --git a/app/assets/javascripts/admin/helpers/disposition-icon.js.es6 b/app/assets/javascripts/admin/helpers/disposition-icon.js.es6
new file mode 100644
index 0000000000..60473dc18b
--- /dev/null
+++ b/app/assets/javascripts/admin/helpers/disposition-icon.js.es6
@@ -0,0 +1,15 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
+
+export default Ember.Helper.extend({
+  compute([disposition]) {
+    if (!disposition) { return null; }
+    let icon;
+    let title = 'admin.flags.dispositions.' + disposition;
+    switch (disposition) {
+      case "deferred": { icon = "external-link"; break; }
+      case "agreed": { icon = "thumbs-o-up"; break; }
+      case "disagreed": { icon = "thumbs-o-down"; break; }
+    }
+    return iconHTML(icon, { title }).htmlSafe();
+  }
+});
diff --git a/app/assets/javascripts/admin/helpers/post-action-title.js.es6 b/app/assets/javascripts/admin/helpers/post-action-title.js.es6
new file mode 100644
index 0000000000..ced180d8bb
--- /dev/null
+++ b/app/assets/javascripts/admin/helpers/post-action-title.js.es6
@@ -0,0 +1,12 @@
+function postActionTitle([id, nameKey]) {
+  let title = I18n.t(`admin.flags.short_names.${nameKey}`, { defaultValue: null });
+
+  // TODO: We can remove this once other translations have been updated
+  if (!title) {
+    return I18n.t(`admin.flags.summary.action_type_${id}`, { count: 1 });
+  }
+
+  return title;
+}
+
+export default Ember.Helper.helper(postActionTitle);
diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js.es6
index 0720976e69..e3f1530bad 100644
--- a/app/assets/javascripts/admin/models/admin-user.js.es6
+++ b/app/assets/javascripts/admin/models/admin-user.js.es6
@@ -1,3 +1,4 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { ajax } from 'discourse/lib/ajax';
 import computed from 'ember-addons/ember-computed-decorators';
 import { propertyNotEqual } from 'discourse/lib/computed';
@@ -7,8 +8,10 @@ import Group from 'discourse/models/group';
 import TL3Requirements from 'admin/models/tl3-requirements';
 import { userPath } from 'discourse/lib/url';
 
-const AdminUser = Discourse.User.extend({
+const wrapAdmin = user => user ? AdminUser.create(user) : null;
 
+const AdminUser = Discourse.User.extend({
+  adminUserView: true,
   customGroups: Ember.computed.filter("groups", g => !g.automatic && Group.create(g)),
   automaticGroups: Ember.computed.filter("groups", g => g.automatic && Group.create(g)),
 
@@ -105,10 +108,10 @@ const AdminUser = Discourse.User.extend({
           message = I18n.messageFormat('admin.user.delete_all_posts_confirm_MF', { "POSTS": user.get('post_count'), "TOPICS": user.get('topic_count') }),
           buttons = [{
             "label": I18n.t("composer.cancel"),
-            "class": "cancel-inline",
+            "class": "d-modal-cancel",
             "link":  true
           }, {
-            "label": '<i class="fa fa-exclamation-triangle"></i> ' + I18n.t("admin.user.delete_all_posts"),
+            "label": `${iconHTML('exclamation-triangle')} ` + I18n.t("admin.user.delete_all_posts"),
             "class": "btn btn-danger",
             "callback": function() {
               ajax("/admin/users/" + user.get('id') + "/delete_all_posts", {
@@ -231,6 +234,7 @@ const AdminUser = Discourse.User.extend({
   }.property('trust_level'),
 
   isSuspended: Em.computed.equal('suspended', true),
+  isSilenced: Ember.computed.equal('silenced', true),
   canSuspend: Em.computed.not('staff'),
 
   suspendDuration: function() {
@@ -239,22 +243,17 @@ const AdminUser = Discourse.User.extend({
     return suspended_at.format('L') + " - " + suspended_till.format('L');
   }.property('suspended_till', 'suspended_at'),
 
-  suspend(duration, reason) {
-    return ajax("/admin/users/" + this.id + "/suspend", {
+  suspend(data) {
+    return ajax(`/admin/users/${this.id}/suspend`, {
       type: 'PUT',
-      data: { duration: duration, reason: reason }
-    });
+      data
+    }).then(result => this.setProperties(result.suspension));
   },
 
   unsuspend() {
-    return ajax("/admin/users/" + this.id + "/unsuspend", {
+    return ajax(`/admin/users/${this.id}/unsuspend`, {
       type: 'PUT'
-    }).then(function() {
-      window.location.reload();
-    }).catch(function(e) {
-      var error = I18n.t('admin.user.unsuspend_failed', { error: "http: " + e.status + " - " + e.body });
-      bootbox.alert(error);
-    });
+    }).then(result => this.setProperties(result.suspension));
   },
 
   logOut() {
@@ -303,46 +302,38 @@ const AdminUser = Discourse.User.extend({
     });
   },
 
-  unblock() {
-    this.set('blockingUser', true);
-    return ajax('/admin/users/' + this.id + '/unblock', {
+  unsilence() {
+    this.set('silencingUser', true);
+
+    return ajax(`/admin/users/${this.id}/unsilence`, {
       type: 'PUT'
-    }).then(function() {
-      window.location.reload();
-    }).catch(function(e) {
-      var error = I18n.t('admin.user.unblock_failed', { error: "http: " + e.status + " - " + e.body });
+    }).then(result => {
+      this.setProperties(result.unsilence);
+    }).catch(e => {
+      let error = I18n.t('admin.user.unsilence_failed', {
+        error: `http: ${e.status} - ${e.body}`
+      });
       bootbox.alert(error);
+    }).finally(() => {
+      this.set('silencingUser', false);
     });
   },
 
-  block() {
-    const user = this,
-          message = I18n.t("admin.user.block_confirm");
-
-    const performBlock = function() {
-      user.set('blockingUser', true);
-      return ajax('/admin/users/' + user.id + '/block', {
-        type: 'PUT'
-      }).then(function() {
-        window.location.reload();
-      }).catch(function(e) {
-        var error = I18n.t('admin.user.block_failed', { error: "http: " + e.status + " - " + e.body });
-        bootbox.alert(error);
-        user.set('blockingUser', false);
+  silence(data) {
+    this.set('silencingUser', true);
+    return ajax(`/admin/users/${this.id}/silence`, {
+      type: 'PUT',
+      data
+    }).then(result => {
+      this.setProperties(result.silence);
+    }).catch(e => {
+      let error = I18n.t('admin.user.silence_failed', {
+        error: `http: ${e.status} - ${e.body}`
       });
-    };
-
-    const buttons = [{
-      "label": I18n.t("composer.cancel"),
-      "class": "cancel",
-      "link":  true
-    }, {
-      "label": '<i class="fa fa-exclamation-triangle"></i>' + I18n.t('admin.user.block_accept'),
-      "class": "btn btn-danger",
-      "callback": function() { performBlock(); }
-    }];
-
-    bootbox.dialog(message, buttons, { "classes": "delete-user-modal" });
+      bootbox.alert(error);
+    }).finally(() => {
+      this.set('silencingUser', false);
+    });
   },
 
   sendActivationEmail() {
@@ -386,7 +377,7 @@ const AdminUser = Discourse.User.extend({
       "class": "cancel",
       "link":  true
     }, {
-      "label": '<i class="fa fa-exclamation-triangle"></i>' + I18n.t('admin.user.anonymize_yes'),
+      "label": `${iconHTML('exclamation-triangle')} ` + I18n.t('admin.user.anonymize_yes'),
       "class": "btn btn-danger",
       "callback": function() { performAnonymize(); }
     }];
@@ -450,7 +441,7 @@ const AdminUser = Discourse.User.extend({
       "class": "btn",
       "link":  true
     }, {
-      "label": '<i class="fa fa-exclamation-triangle"></i>' + I18n.t('admin.user.delete_and_block'),
+      "label": `${iconHTML('exclamation-triangle')} ` + I18n.t('admin.user.delete_and_block'),
       "class": "btn btn-danger",
       "callback": function(){ performDestroy(true); }
     }, {
@@ -462,52 +453,6 @@ const AdminUser = Discourse.User.extend({
     bootbox.dialog(message, buttons, { "classes": "delete-user-modal" });
   },
 
-  deleteAsSpammer(successCallback) {
-    const user = this;
-
-    user.checkEmail().then(function() {
-      const data = {
-        "POSTS": user.get('post_count'),
-        "TOPICS": user.get('topic_count'),
-        email: user.get('email') || I18n.t("flagging.hidden_email_address"),
-        ip_address: user.get('ip_address') || I18n.t("flagging.ip_address_missing")
-        };
-
-      const message = I18n.messageFormat('flagging.delete_confirm_MF', data),
-            buttons = [{
-        "label": I18n.t("composer.cancel"),
-        "class": "cancel-inline",
-        "link":  true
-      }, {
-        "label": '<i class="fa fa-exclamation-triangle"></i> ' + I18n.t("flagging.yes_delete_spammer"),
-        "class": "btn btn-danger",
-        "callback": function() {
-          return ajax("/admin/users/" + user.get('id') + '.json', {
-            type: 'DELETE',
-            data: {
-              delete_posts: true,
-              block_email: true,
-              block_urls: true,
-              block_ip: true,
-              delete_as_spammer: true,
-              context: window.location.pathname
-            }
-          }).then(function(result) {
-            if (result.deleted) {
-              if (successCallback) successCallback();
-            } else {
-              bootbox.alert(I18n.t("admin.user.delete_failed"));
-            }
-          }).catch(function() {
-            bootbox.alert(I18n.t("admin.user.delete_failed"));
-          });
-        }
-      }];
-
-      bootbox.dialog(message, buttons, {"classes": "flagging-delete-spammer"});
-    });
-  },
-
   loadDetails() {
     const user = this;
 
@@ -525,17 +470,14 @@ const AdminUser = Discourse.User.extend({
     }
   }.property('tl3_requirements'),
 
-  suspendedBy: function() {
-    if (this.get('suspended_by')) {
-      return AdminUser.create(this.get('suspended_by'));
-    }
-  }.property('suspended_by'),
+  @computed('suspended_by')
+  suspendedBy: wrapAdmin,
 
-  approvedBy: function() {
-    if (this.get('approved_by')) {
-      return AdminUser.create(this.get('approved_by'));
-    }
-  }.property('approved_by')
+  @computed('silenced_by')
+  silencedBy: wrapAdmin,
+
+  @computed('approved_by')
+  approvedBy: wrapAdmin,
 
 });
 
diff --git a/app/assets/javascripts/admin/models/api-key.js.es6 b/app/assets/javascripts/admin/models/api-key.js.es6
index 2a7cf86778..024a143392 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 acc7462b92..2aaca02d1e 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/flag-type.js.es6 b/app/assets/javascripts/admin/models/flag-type.js.es6
new file mode 100644
index 0000000000..54ef7f26c1
--- /dev/null
+++ b/app/assets/javascripts/admin/models/flag-type.js.es6
@@ -0,0 +1,10 @@
+import RestModel from 'discourse/models/rest';
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default RestModel.extend({
+  @computed('id')
+  name(id) {
+    return I18n.t(`admin.flags.summary.action_type_${id}`, { count: 1});
+  }
+});
+
diff --git a/app/assets/javascripts/admin/models/flagged-post.js.es6 b/app/assets/javascripts/admin/models/flagged-post.js.es6
index c7a654608f..acd3a0e0df 100644
--- a/app/assets/javascripts/admin/models/flagged-post.js.es6
+++ b/app/assets/javascripts/admin/models/flagged-post.js.es6
@@ -1,111 +1,50 @@
 import { ajax } from 'discourse/lib/ajax';
-import AdminUser from 'admin/models/admin-user';
-import Topic from 'discourse/models/topic';
 import Post from 'discourse/models/post';
+import computed from 'ember-addons/ember-computed-decorators';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
 
+export default Post.extend({
 
-const FlaggedPost = Post.extend({
-
-  summary: function () {
+  @computed
+  summary() {
     return _(this.post_actions)
       .groupBy(function (a) { return a.post_action_type_id; })
       .map(function (v,k) { return I18n.t('admin.flags.summary.action_type_' + k, { count: v.length }); })
       .join(',');
-  }.property(),
-
-  flaggers: function () {
-    var self = this;
-    var flaggers = [];
-
-    _.each(this.post_actions, function (postAction) {
-      flaggers.push({
-        user: self.userLookup[postAction.user_id],
-        topic: self.topicLookup[postAction.topic_id],
-        flagType: I18n.t('admin.flags.summary.action_type_' + postAction.post_action_type_id, { count: 1 }),
-        flaggedAt: postAction.created_at,
-        disposedBy: postAction.disposed_by_id ? self.userLookup[postAction.disposed_by_id] : null,
-        disposedAt: postAction.disposed_at,
-        dispositionIcon: self.dispositionIcon(postAction.disposition),
-        tookAction: postAction.staff_took_action
-      });
-    });
-
-    return flaggers;
-  }.property(),
-
-  dispositionIcon: function (disposition) {
-    if (!disposition) { return null; }
-    var icon, title = I18n.t('admin.flags.dispositions.' + disposition);
-    switch (disposition) {
-      case "deferred": { icon = "fa-external-link"; break; }
-      case "agreed": { icon = "fa-thumbs-o-up"; break; }
-      case "disagreed": { icon = "fa-thumbs-o-down"; break; }
-    }
-    return "<i class='fa " + icon + "' title='" + title + "'></i>";
   },
 
-  wasEdited: function () {
+  @computed('last_revised_at', 'post_actions.@each.created_at')
+  wasEdited(lastRevisedAt) {
     if (Ember.isEmpty(this.get("last_revised_at"))) { return false; }
-    var lastRevisedAt = Date.parse(this.get("last_revised_at"));
+    lastRevisedAt = Date.parse(lastRevisedAt);
     return _.some(this.get("post_actions"), function (postAction) {
       return Date.parse(postAction.created_at) < lastRevisedAt;
     });
-  }.property("last_revised_at", "post_actions.@each.created_at"),
+  },
 
-  conversations: function () {
-    var self = this;
-    var conversations = [];
+  @computed('post_actions.@each.name_key')
+  flaggedForSpam() {
+    return this.get('post_actions').every(action => action.name_key === 'spam');
+  },
 
-    _.each(this.post_actions, function (postAction) {
-      if (postAction.conversation) {
-        var conversation = {
-          permalink: postAction.permalink,
-          hasMore: postAction.conversation.has_more,
-          response: {
-            excerpt: postAction.conversation.response.excerpt,
-            user: self.userLookup[postAction.conversation.response.user_id]
-          }
-        };
-
-        if (postAction.conversation.reply) {
-          conversation["reply"] = {
-            excerpt: postAction.conversation.reply.excerpt,
-            user: self.userLookup[postAction.conversation.reply.user_id]
-          };
-        }
-
-        conversations.push(conversation);
-      }
-    });
-
-    return conversations;
-  }.property(),
-
-  user: function() {
-    return this.userLookup[this.user_id];
-  }.property(),
-
-  topic: function () {
-    return this.topicLookup[this.topic_id];
-  }.property(),
-
-  flaggedForSpam: function() {
-    return !_.every(this.get('post_actions'), function(action) { return action.name_key !== 'spam'; });
-  }.property('post_actions.@each.name_key'),
-
-  topicFlagged: function() {
+  @computed('post_actions.@each.targets_topic')
+  topicFlagged() {
     return _.any(this.get('post_actions'), function(action) { return action.targets_topic; });
-  }.property('post_actions.@each.targets_topic'),
+  },
 
-  postAuthorFlagged: function() {
+  @computed('post_actions.@each.targets_topic')
+  postAuthorFlagged() {
     return _.any(this.get('post_actions'), function(action) { return !action.targets_topic; });
-  }.property('post_actions.@each.targets_topic'),
+  },
 
-  canDeleteAsSpammer: function() {
-    return Discourse.User.currentProp('staff') && this.get('flaggedForSpam') && this.get('user.can_delete_all_posts') && this.get('user.can_be_deleted');
-  }.property('flaggedForSpam'),
+  @computed('flaggedForSpam')
+  canDeleteAsSpammer(flaggedForSpam) {
+    return flaggedForSpam &&
+      this.get('user.can_delete_all_posts') &&
+      this.get('user.can_be_deleted');
+  },
 
-  deletePost: function() {
+  deletePost() {
     if (this.get('post_number') === 1) {
       return ajax('/t/' + this.topic_id, { type: 'DELETE', cache: false });
     } else {
@@ -113,64 +52,20 @@ const FlaggedPost = Post.extend({
     }
   },
 
-  disagreeFlags: function () {
-    return ajax('/admin/flags/disagree/' + this.id, { type: 'POST', cache: false });
+  disagreeFlags() {
+    return ajax('/admin/flags/disagree/' + this.id, { type: 'POST', cache: false }).catch(popupAjaxError);
   },
 
-  deferFlags: function (deletePost) {
-    return ajax('/admin/flags/defer/' + this.id, { type: 'POST', cache: false, data: { delete_post: deletePost } });
+  deferFlags(deletePost) {
+    return ajax('/admin/flags/defer/' + this.id, { type: 'POST', cache: false, data: { delete_post: deletePost } }).catch(popupAjaxError);
   },
 
-  agreeFlags: function (actionOnPost) {
-    return ajax('/admin/flags/agree/' + this.id, { type: 'POST', cache: false, data: { action_on_post: actionOnPost } });
+  agreeFlags(actionOnPost) {
+    return ajax('/admin/flags/agree/' + this.id, { type: 'POST', cache: false, data: { action_on_post: actionOnPost } }).catch(popupAjaxError);
   },
 
-  postHidden: Em.computed.alias('hidden'),
+  postHidden: Ember.computed.alias('hidden'),
 
-  extraClasses: function() {
-    var classes = [];
-    if (this.get('hidden')) { classes.push('hidden-post'); }
-    if (this.get('deleted')) { classes.push('deleted'); }
-    return classes.join(' ');
-  }.property(),
-
-  deleted: Em.computed.or('deleted_at', 'topic_deleted_at')
+  deleted: Ember.computed.or('deleted_at', 'topic_deleted_at'),
 
 });
-
-FlaggedPost.reopenClass({
-  findAll: function (filter, offset) {
-    offset = offset || 0;
-
-    var result = Em.A();
-    result.set('loading', true);
-
-    return ajax('/admin/flags/' + filter + '.json?offset=' + offset).then(function (data) {
-      // users
-      var userLookup = {};
-      _.each(data.users, function (user) {
-        userLookup[user.id] = AdminUser.create(user);
-      });
-
-      // topics
-      var topicLookup = {};
-      _.each(data.topics, function (topic) {
-        topicLookup[topic.id] = Topic.create(topic);
-      });
-
-      // posts
-      _.each(data.posts, function (post) {
-        var f = FlaggedPost.create(post);
-        f.userLookup = userLookup;
-        f.topicLookup = topicLookup;
-        result.pushObject(f);
-      });
-
-      result.set('loading', false);
-
-      return result;
-    });
-  }
-});
-
-export default FlaggedPost;
diff --git a/app/assets/javascripts/admin/models/site-setting.js.es6 b/app/assets/javascripts/admin/models/site-setting.js.es6
index 5103762663..6ed7878796 100644
--- a/app/assets/javascripts/admin/models/site-setting.js.es6
+++ b/app/assets/javascripts/admin/models/site-setting.js.es6
@@ -48,7 +48,7 @@ SiteSetting.reopenClass({
   update(key, value) {
     const data = {};
     data[key] = value;
-    return ajax("/admin/site_settings/" + key, { type: 'PUT', data });
+    return ajax(`/admin/site_settings/${key}`, { type: 'PUT', data });
   }
 });
 
diff --git a/app/assets/javascripts/admin/models/version-check.js.es6 b/app/assets/javascripts/admin/models/version-check.js.es6
index 75f0d9e04f..ce1f420b49 100644
--- a/app/assets/javascripts/admin/models/version-check.js.es6
+++ b/app/assets/javascripts/admin/models/version-check.js.es6
@@ -8,18 +8,6 @@ const VersionCheck = Discourse.Model.extend({
     return updatedAt === null;
   },
 
-  @computed('updated_at', 'version_check_pending')
-  dataIsOld(updatedAt, versionCheckPending) {
-    return versionCheckPending || moment().diff(moment(updatedAt), 'hours') >= 48;
-  },
-
-  @computed('dataIsOld', 'installed_version', 'latest_version', 'missing_versions_count')
-  staleData(dataIsOld, installedVersion, latestVersion, missingVersionsCount) {
-    return dataIsOld ||
-           (installedVersion !== latestVersion && missingVersionsCount === 0) ||
-           (installedVersion === latestVersion && missingVersionsCount !== 0);
-  },
-
   @computed('missing_versions_count')
   upToDate(missingVersionsCount) {
     return missingVersionsCount === 0 || missingVersionsCount === null;
diff --git a/app/assets/javascripts/admin/models/watched-word.js.es6 b/app/assets/javascripts/admin/models/watched-word.js.es6
new file mode 100644
index 0000000000..f2b1ad8a05
--- /dev/null
+++ b/app/assets/javascripts/admin/models/watched-word.js.es6
@@ -0,0 +1,43 @@
+import { ajax } from 'discourse/lib/ajax';
+
+const WatchedWord = Discourse.Model.extend({
+  save() {
+    return ajax("/admin/logs/watched_words" + (this.id ? '/' + this.id : '') + ".json", {
+      type: this.id ? 'PUT' : 'POST',
+      data: {word: this.get('word'), action_key: this.get('action')},
+      dataType: 'json'
+    });
+  },
+
+  destroy() {
+    return ajax("/admin/logs/watched_words/" + this.get('id') + ".json", {type: 'DELETE'});
+  }
+});
+
+WatchedWord.reopenClass({
+  findAll() {
+    return ajax("/admin/logs/watched_words").then(list => {
+      const actions = {};
+      list.words.forEach(s => {
+        if (!actions[s.action]) { actions[s.action] = []; }
+        actions[s.action].pushObject(WatchedWord.create(s));
+      });
+
+      list.actions.forEach(a => {
+        if (!actions[a]) { actions[a] = []; }
+      });
+
+      return Object.keys(actions).map(n => {
+        return Ember.Object.create({
+          nameKey: n,
+          name: I18n.t('admin.watched_words.actions.' + n),
+          words: actions[n],
+          count: actions[n].length,
+          regularExpressions: list.regular_expressions
+        });
+      });
+    });
+  }
+});
+
+export default WatchedWord;
diff --git a/app/assets/javascripts/admin/models/web-hook.js.es6 b/app/assets/javascripts/admin/models/web-hook.js.es6
index 325d931045..27d72878b0 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-backups.js.es6 b/app/assets/javascripts/admin/routes/admin-backups.js.es6
index 6d1a425190..92ac4652fa 100644
--- a/app/assets/javascripts/admin/routes/admin-backups.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups.js.es6
@@ -68,7 +68,7 @@ export default Discourse.Route.extend({
         function(confirmed) {
           if (confirmed) {
             backup.destroy().then(function() {
-              self.controllerFor("adminBackupsIndex").removeObject(backup);
+              self.controllerFor("adminBackupsIndex").get('model').removeObject(backup);
             });
           }
         }
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 7ca2f72772..0ee7b69755 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-flags-index.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-index.js.es6
index c3f9a6d373..32b70b9d30 100644
--- a/app/assets/javascripts/admin/routes/admin-flags-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-flags-index.js.es6
@@ -1,5 +1,6 @@
 export default Discourse.Route.extend({
   redirect() {
-    this.replaceWith('adminFlags.list', 'active');
+    let segment = this.siteSettings.flags_default_topics ? 'topics' : 'postsActive';
+    this.replaceWith(`adminFlags.${segment}`);
   }
 });
diff --git a/app/assets/javascripts/admin/routes/admin-flags-list.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-list.js.es6
deleted file mode 100644
index ba00186d90..0000000000
--- a/app/assets/javascripts/admin/routes/admin-flags-list.js.es6
+++ /dev/null
@@ -1,27 +0,0 @@
-import showModal from 'discourse/lib/show-modal';
-import FlaggedPost from 'admin/models/flagged-post';
-
-export default Discourse.Route.extend({
-  model(params) {
-    this.filter = params.filter;
-    return FlaggedPost.findAll(params.filter);
-  },
-
-  setupController(controller, model) {
-    controller.set('model', model);
-    controller.set('query', this.filter);
-  },
-
-  actions: {
-    showAgreeFlagModal(model) {
-      showModal('admin-agree-flag', { model, admin: true });
-      this.controllerFor('modal').set('modalClass', 'agree-flag-modal');
-    },
-
-    showDeleteFlagModal(model) {
-      showModal('admin-delete-flag', { model, admin: true });
-      this.controllerFor('modal').set('modalClass', 'delete-flag-modal');
-    }
-
-  }
-});
diff --git a/app/assets/javascripts/admin/routes/admin-flags-posts-active.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-posts-active.js.es6
new file mode 100644
index 0000000000..6c8b797603
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-flags-posts-active.js.es6
@@ -0,0 +1,5 @@
+export default Discourse.Route.extend({
+  model() {
+    return this.store.findAll('flagged-post', { filter: 'active' });
+  }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-flags-posts-old.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-posts-old.js.es6
new file mode 100644
index 0000000000..f6743f4857
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-flags-posts-old.js.es6
@@ -0,0 +1,5 @@
+export default Discourse.Route.extend({
+  model() {
+    return this.store.findAll('flagged-post', { filter: 'old' });
+  },
+});
diff --git a/app/assets/javascripts/admin/routes/admin-flags-topics-index.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-topics-index.js.es6
new file mode 100644
index 0000000000..bb18c6c56a
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-flags-topics-index.js.es6
@@ -0,0 +1,9 @@
+export default Discourse.Route.extend({
+  model() {
+    return this.store.findAll('flagged-topic');
+  },
+
+  setupController(controller, model) {
+    controller.set('flaggedTopics', model);
+  }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-flags-topics-show.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-topics-show.js.es6
new file mode 100644
index 0000000000..b75799bc8c
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-flags-topics-show.js.es6
@@ -0,0 +1,20 @@
+import { loadTopicView } from 'discourse/models/topic';
+
+export default Ember.Route.extend({
+  model(params) {
+    let topicRecord = this.store.createRecord('topic', { id: params.id });
+    let topic = loadTopicView(topicRecord).then(() => topicRecord);
+
+    return Ember.RSVP.hash({
+      topic,
+      flaggedPosts: this.store.findAll('flagged-post', {
+        filter: 'active',
+        topic_id: params.id
+      })
+    });
+  },
+
+  setupController(controller, hash) {
+    controller.setProperties(hash);
+  }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-group.js.es6 b/app/assets/javascripts/admin/routes/admin-group.js.es6
index 3575496edd..0009f834e1 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 47ece70580..65771110e8 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/routes/admin-route-map.js.es6 b/app/assets/javascripts/admin/routes/admin-route-map.js.es6
index dd87207156..a6ccabc810 100644
--- a/app/assets/javascripts/admin/routes/admin-route-map.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-route-map.js.es6
@@ -54,7 +54,11 @@ export default function() {
     this.route('adminReports', { path: '/reports/:type', resetNamespace: true });
 
     this.route('adminFlags', { path: '/flags', resetNamespace: true }, function() {
-      this.route('list', { path: '/:filter' });
+      this.route('postsActive', { path: 'active' });
+      this.route('postsOld', { path: 'old' });
+      this.route('topics', { path: 'topics' }, function() {
+        this.route('show', { path: ":id" });
+      });
     });
 
     this.route('adminLogs', { path: '/logs', resetNamespace: true }, function() {
@@ -62,6 +66,14 @@ export default function() {
       this.route('screenedEmails', { path: '/screened_emails' });
       this.route('screenedIpAddresses', { path: '/screened_ip_addresses' });
       this.route('screenedUrls', { path: '/screened_urls' });
+      this.route('adminSearchLogs', { path: '/search_logs', resetNamespace: true}, function() {
+        this.route('index', { path: '/' });
+        this.route('term', { path: '/term/:term' });
+      });
+      this.route('adminWatchedWords', { path: '/watched_words', resetNamespace: true}, function() {
+        this.route('index', { path: '/' });
+        this.route('action', { path: '/action/:action_id' });
+      });
     });
 
     this.route('adminGroups', { path: '/groups', resetNamespace: true }, function() {
diff --git a/app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6 b/app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6
new file mode 100644
index 0000000000..08beeb5ea6
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6
@@ -0,0 +1,20 @@
+import { ajax } from 'discourse/lib/ajax';
+
+export default Discourse.Route.extend({
+  queryParams: {
+    period: { refreshModel: true },
+    searchType: { refreshModel: true }
+  },
+
+  model(params) {
+    this._params = params;
+    return ajax('/admin/logs/search_logs.json', { data: { period: params.period, search_type: params.searchType } }).then(search_logs => {
+      return search_logs.map(sl => Ember.Object.create(sl));
+    });
+  },
+
+  setupController(controller, model) {
+    const params = this._params;
+    controller.setProperties({ model, period: params.period, searchType: params.searchType });
+  }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6 b/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
new file mode 100644
index 0000000000..775fec62c5
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
@@ -0,0 +1,33 @@
+import { ajax } from 'discourse/lib/ajax';
+
+export default Discourse.Route.extend({
+  queryParams: {
+    period: { refreshModel: true },
+    searchType: { refreshModel: true }
+  },
+
+  model(params) {
+    this._params = params;
+
+    return ajax(`/admin/logs/search_logs/term/${params.term}.json`, {
+      data: {
+        period: params.period,
+        search_type: params.searchType
+      }
+    }).then(json => {
+      const model = Ember.Object.create({ type: "search_log_term" });
+      model.setProperties(json.term);
+      return model;
+    });
+  },
+
+  setupController(controller, model) {
+    const params = this._params;
+    controller.setProperties({
+      model,
+      term: params.term,
+      period: params.period,
+      searchType: params.searchType
+    });
+  }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-user-index.js.es6 b/app/assets/javascripts/admin/routes/admin-user-index.js.es6
index 03053efeb9..36d1d8cedd 100644
--- a/app/assets/javascripts/admin/routes/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user-index.js.es6
@@ -1,4 +1,3 @@
-import showModal from 'discourse/lib/show-modal';
 import Group from 'discourse/models/group';
 
 export default Discourse.Route.extend({
@@ -25,11 +24,6 @@ export default Discourse.Route.extend({
   },
 
   actions: {
-    showSuspendModal(model) {
-      showModal('admin-suspend-user', { model, admin: true });
-      this.controllerFor('modal').set('modalClass', 'suspend-user-modal');
-    },
-
     viewActionLogs(username) {
       const controller = this.controllerFor('adminLogs.staffActionLogs');
       this.transitionTo('adminLogs.staffActionLogs').then(() => {
diff --git a/app/assets/javascripts/admin/routes/admin-users-index.js.es6 b/app/assets/javascripts/admin/routes/admin-users-index.js.es6
new file mode 100644
index 0000000000..8bb7adc055
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-users-index.js.es6
@@ -0,0 +1,5 @@
+export default Discourse.Route.extend({
+  redirect: function() {
+    this.transitionTo('adminUsersList');
+  }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6
new file mode 100644
index 0000000000..123884d6fc
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6
@@ -0,0 +1,11 @@
+export default Discourse.Route.extend({
+  model(params) {
+    this.controllerFor('adminWatchedWordsAction').set('actionNameKey', params.action_id);
+    let filteredContent = this.controllerFor('adminWatchedWordsAction').get('filteredContent');
+    return Ember.Object.create({
+      nameKey: params.action_id,
+      name: I18n.t('admin.watched_words.actions.' + params.action_id),
+      words: filteredContent
+    });
+  }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6
new file mode 100644
index 0000000000..0103744b52
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6
@@ -0,0 +1,5 @@
+export default Discourse.Route.extend({
+  beforeModel() {
+    this.replaceWith('adminWatchedWords.action', this.modelFor('adminWatchedWords')[0].nameKey);
+  }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words.js.es6
new file mode 100644
index 0000000000..308dfd6544
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-watched-words.js.es6
@@ -0,0 +1,22 @@
+import WatchedWord from 'admin/models/watched-word';
+
+export default Discourse.Route.extend({
+  queryParams: {
+    filter: { replace: true }
+  },
+
+  model() {
+    return WatchedWord.findAll();
+  },
+
+  setupController(controller, model) {
+    controller.set('model', model);
+    if (model && model.length) {
+      controller.set('regularExpressions', model[0].get('regularExpressions'));
+    }
+  },
+
+  afterModel(watchedWordsList) {
+    this.controllerFor('adminWatchedWords').set('allWatchedWords', watchedWordsList);
+  }
+});
diff --git a/app/assets/javascripts/admin/services/admin-tools.js.es6 b/app/assets/javascripts/admin/services/admin-tools.js.es6
new file mode 100644
index 0000000000..439b85cd42
--- /dev/null
+++ b/app/assets/javascripts/admin/services/admin-tools.js.es6
@@ -0,0 +1,127 @@
+// A service that can act as a bridge between the front end Discourse application
+// and the admin application. Use this if you need front end code to access admin
+// modules. Inject it optionally, and if it exists go to town!
+
+import AdminUser from 'admin/models/admin-user';
+import { iconHTML } from 'discourse-common/lib/icon-library';
+import { ajax } from 'discourse/lib/ajax';
+import showModal from 'discourse/lib/show-modal';
+import { getOwner } from 'discourse-common/lib/get-owner';
+
+export default Ember.Service.extend({
+
+  init() {
+    this._super();
+
+    // TODO: Make `siteSettings` a service that can be injected
+    this.siteSettings = getOwner(this).lookup('site-settings:main');
+  },
+
+  checkSpammer(userId) {
+    return AdminUser.find(userId).then(au => this.spammerDetails(au));
+  },
+
+  spammerDetails(adminUser) {
+    return {
+      deleteUser: () => this._deleteSpammer(adminUser),
+      canDelete: adminUser.get('can_be_deleted') && adminUser.get('can_delete_all_posts')
+    };
+  },
+
+  _showControlModal(type, user, opts) {
+    opts = opts || {};
+
+    let controller = showModal(`admin-${type}-user`, {
+      admin: true,
+      modalClass: `${type}-user-modal`
+    });
+    if (opts.post) {
+      controller.set('post', opts.post);
+    }
+
+    let promise = user.adminUserView ?
+      Ember.RSVP.resolve(user) :
+      AdminUser.find(user.get('id'));
+
+    promise.then(loadedUser => {
+      controller.setProperties({
+        user: loadedUser,
+        loadingUser: false,
+        successCallback: opts.successCallback
+      });
+    });
+  },
+
+  showSilenceModal(user, opts) {
+    this._showControlModal('silence', user, opts);
+  },
+
+  showSuspendModal(user, opts) {
+    this._showControlModal('suspend', user, opts);
+  },
+
+  showModerationHistory(target) {
+    let controller = showModal('admin-moderation-history', { admin: true });
+    controller.loadHistory(target);
+  },
+
+  _deleteSpammer(adminUser) {
+
+    // Try loading the email if the site supports it
+    let tryEmail = this.siteSettings.show_email_on_profile ?
+      adminUser.checkEmail() :
+      Ember.RSVP.resolve();
+
+    return tryEmail.then(() => {
+
+      let message = I18n.messageFormat('flagging.delete_confirm_MF', {
+        "POSTS": adminUser.get('post_count'),
+        "TOPICS": adminUser.get('topic_count'),
+        email: adminUser.get('email') || I18n.t("flagging.hidden_email_address"),
+        ip_address: adminUser.get('ip_address') || I18n.t("flagging.ip_address_missing")
+      });
+
+      let userId = adminUser.get('id');
+
+      return new Ember.RSVP.Promise((resolve, reject) => {
+        const buttons = [
+          {
+            label: I18n.t("composer.cancel"),
+            class: "d-modal-cancel",
+            link:  true
+          },
+          {
+            label: `${iconHTML('exclamation-triangle')} ` + I18n.t("flagging.yes_delete_spammer"),
+            class: "btn btn-danger confirm-delete",
+            callback() {
+              return ajax(`/admin/users/${userId}.json`, {
+                type: 'DELETE',
+                data: {
+                  delete_posts: true,
+                  block_email: true,
+                  block_urls: true,
+                  block_ip: true,
+                  delete_as_spammer: true,
+                  context: window.location.pathname
+                }
+              }).then(result => {
+                if (result.deleted) {
+                  resolve();
+                } else {
+                  throw 'failed to delete';
+                }
+              }).catch(() => {
+                bootbox.alert(I18n.t("admin.user.delete_failed"));
+                reject();
+              });
+            }
+          }
+        ];
+
+        bootbox.dialog(message, buttons, {classes: "flagging-delete-spammer"});
+      });
+
+    });
+  }
+
+});
diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs
index 780aad41fc..af4aafde94 100644
--- a/app/assets/javascripts/admin/templates/admin.hbs
+++ b/app/assets/javascripts/admin/templates/admin.hbs
@@ -20,14 +20,16 @@
         {{#if currentUser.admin}}
           {{nav-item route='adminCustomize' label='admin.customize.title'}}
           {{nav-item route='adminApi' label='admin.api.title'}}
-          {{nav-item route='admin.backups' label='admin.backups.title'}}
+          {{#if siteSettings.enable_backups}}
+            {{nav-item route='admin.backups' label='admin.backups.title'}}
+          {{/if}}
         {{/if}}
         {{nav-item route='adminPlugins' label='admin.plugins.title'}}
         {{plugin-outlet name="admin-menu" connectorTagName="li"}}
       </ul>
 
       <div class='boxed white admin-content'>
-        <div class='admin-contents'>
+        <div class='admin-contents {{adminContentsClassName}}'>
           {{outlet}}
         </div>
       </div>
diff --git a/app/assets/javascripts/admin/templates/api-keys.hbs b/app/assets/javascripts/admin/templates/api-keys.hbs
index 60449052bb..b25eebd69a 100644
--- a/app/assets/javascripts/admin/templates/api-keys.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys.hbs
@@ -29,5 +29,5 @@
 {{/if}}
 
 {{#unless hasMasterKey}}
-  <button class='btn' {{action "generateMasterKey"}}><i class="fa fa-key"></i>{{i18n 'admin.api.generate_master'}}</button>
+<button class='btn' {{action "generateMasterKey"}}>{{d-icon "key"}}</button>
 {{/unless}}
diff --git a/app/assets/javascripts/admin/templates/api.hbs b/app/assets/javascripts/admin/templates/api.hbs
index f3407fe0cc..45bfbd9ca7 100644
--- a/app/assets/javascripts/admin/templates/api.hbs
+++ b/app/assets/javascripts/admin/templates/api.hbs
@@ -1,10 +1,8 @@
-<div class="api">
-  {{#admin-nav}}
-    {{nav-item route='adminApiKeys' label='admin.api.title'}}
-    {{nav-item route='adminWebHooks' label='admin.web_hooks.title'}}
-  {{/admin-nav}}
+{{#admin-nav}}
+  {{nav-item route='adminApiKeys' label='admin.api.title'}}
+  {{nav-item route='adminWebHooks' label='admin.web_hooks.title'}}
+{{/admin-nav}}
 
-  <div class="admin-container">
-    {{outlet}}
-  </div>
+<div class="admin-container">
+  {{outlet}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/backups.hbs b/app/assets/javascripts/admin/templates/backups.hbs
index ea8bc18987..5cfd123114 100644
--- a/app/assets/javascripts/admin/templates/backups.hbs
+++ b/app/assets/javascripts/admin/templates/backups.hbs
@@ -4,6 +4,7 @@
       <ul class="nav nav-pills">
         {{nav-item route='admin.backups.index' label='admin.backups.menu.backups'}}
         {{nav-item route='admin.backups.logs' label='admin.backups.menu.logs'}}
+        {{plugin-outlet name="downloader" tagName=""}}
       </ul>
     </div>
     <div class="pull-right">
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index c94f59fe10..674eae8de2 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -3,7 +3,7 @@
 
   <div>
     {{#link-to 'adminBadges.show' 'new' class="btn"}}
-      {{fa-icon "plus"}} {{i18n 'admin.badges.new'}}
+      {{d-icon "plus"}} {{i18n 'admin.badges.new'}}
     {{/link-to}}
   </div>
 {{/d-section}}
diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/templates/badges-show.hbs
index e0ae7001df..94239f9d03 100644
--- a/app/assets/javascripts/admin/templates/badges-show.hbs
+++ b/app/assets/javascripts/admin/templates/badges-show.hbs
@@ -26,9 +26,8 @@
       {{combo-box name="badge_type_id"
                   value=buffered.badge_type_id
                   content=badgeTypes
-                  optionValuePath="content.id"
-                  optionLabelPath="content.name"
-                  disabled=readOnly}}
+                  allowInitialValueMutation=true
+                  isDisabled=readOnly}}
     </div>
 
     <div>
@@ -36,9 +35,8 @@
       {{combo-box name="badge_grouping_id"
                   value=buffered.badge_grouping_id
                   content=badgeGroupings
-                  optionValuePath="content.id"
-                  optionLabelPath="content.displayName"}}
-      &nbsp;<button {{action "editGroupings"}} class='btn'>{{fa-icon 'pencil'}}</button>
+                  nameProperty="name"}}
+      &nbsp;<button {{action "editGroupings"}} class='btn'>{{d-icon 'pencil'}}</button>
     </div>
 
 
@@ -63,7 +61,7 @@
     {{#if siteSettings.enable_badge_sql}}
       <div>
         <label for="query">{{i18n 'admin.badges.query'}}</label>
-        {{textarea name="query" value=buffered.query disabled=readOnly}}
+        {{ace-editor content=buffered.query mode="sql" disabled=readOnly}}
       </div>
 
       {{#if hasQuery}}
diff --git a/app/assets/javascripts/admin/templates/badges.hbs b/app/assets/javascripts/admin/templates/badges.hbs
index 3ca7f91294..aeeaac9c9e 100644
--- a/app/assets/javascripts/admin/templates/badges.hbs
+++ b/app/assets/javascripts/admin/templates/badges.hbs
@@ -15,7 +15,7 @@
       {{/each}}
     </ul>
     {{#link-to 'adminBadges.show' 'new' class="btn"}}
-      {{fa-icon "plus"}} {{i18n 'admin.badges.new'}}
+      {{d-icon "plus"}} {{i18n 'admin.badges.new'}}
     {{/link-to}}
     <br>
     <br>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs b/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs
index 304570c0a5..82fbf0d799 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs
@@ -1,6 +1,6 @@
 <td class="title">
   {{#if report.icon}}
-    {{fa-icon report.icon}}
+    {{d-icon report.icon}}
   {{/if}}
   <a href="{{report.reportUrl}}">{{report.title}}</a>
 </td>
@@ -8,15 +8,15 @@
 <td class="value">{{number report.todayCount}}</td>
 
 <td class="value {{report.yesterdayTrend}}" title={{report.yesterdayCountTitle}}>
-  {{number report.yesterdayCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}}
+  {{number report.yesterdayCount}} {{d-icon "caret-up" class="up"}} {{d-icon "caret-down" class="down"}}
 </td>
 
 <td class="value {{report.sevenDayTrend}}" title={{report.sevenDayCountTitle}}>
-  {{number report.lastSevenDaysCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}}
+  {{number report.lastSevenDaysCount}} {{d-icon "caret-up" class="up"}} {{d-icon "caret-down" class="down"}}
 </td>
 
 <td class="value {{report.thirtyDayTrend}}" title={{report.thirtyDayCountTitle}}>
-  {{number report.lastThirtyDaysCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}}
+  {{number report.lastThirtyDaysCount}} {{d-icon "caret-up" class="up"}} {{d-icon "caret-down" class="down"}}
 </td>
 
 <td class="value">{{number report.total}}</td>
diff --git a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
index c5620d84ed..419ef0b69c 100644
--- a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
@@ -1,6 +1,6 @@
 {{#if editing}}
   {{#admin-form-row label="admin.user_fields.type"}}
-    {{combo-box content=fieldTypes valueAttribute="id" value=buffered.field_type}}
+    {{combo-box content=fieldTypes value=buffered.field_type}}
   {{/admin-form-row}}
 
   {{#admin-form-row label="admin.user_fields.name"}}
diff --git a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
index f4367abeff..e21685831b 100644
--- a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
+++ b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
@@ -9,7 +9,7 @@
     {{input value=buffered.path_whitelist placeholder="/blog/.*" enter="save" class="path-whitelist"}}
   </td>
   <td>
-    {{category-chooser value=categoryId}}
+    {{category-chooser value=categoryId class="small"}}
   </td>
   <td>
     {{d-button icon="check" action="save" class="btn-primary" disabled=cantSave}}
diff --git a/app/assets/javascripts/admin/templates/components/flag-counts.hbs b/app/assets/javascripts/admin/templates/components/flag-counts.hbs
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/assets/javascripts/admin/templates/components/flag-user.hbs b/app/assets/javascripts/admin/templates/components/flag-user.hbs
new file mode 100644
index 0000000000..92f6871847
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/flag-user.hbs
@@ -0,0 +1,18 @@
+<div class='flag-user'>
+  {{#link-to 'adminUser' user.id user.username class='flag-user-avatar'}}
+    {{avatar user imageSize="small"}}
+  {{/link-to}}
+  <div class='flag-user-details'>
+    <div class='flag-user-who'>
+      {{#link-to 'adminUser' user.id user.username class="flag-user-username"}}
+        {{user.username}}
+      {{/link-to}}
+      <div class='flag-user-date'>
+        {{format-age date}}
+      </div>
+    </div>
+    <div class='flag-user-extra'>
+      {{yield}}
+    </div>
+  </div>
+</div>
diff --git a/app/assets/javascripts/admin/templates/components/flagged-post-response.hbs b/app/assets/javascripts/admin/templates/components/flagged-post-response.hbs
new file mode 100644
index 0000000000..133c72b036
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/flagged-post-response.hbs
@@ -0,0 +1,7 @@
+{{#link-to 'adminUser' response.user.id response.user.username class="response-avatar"}}
+  {{avatar response.user imageSize="small"}}
+{{/link-to}}
+<div class='excerpt'>{{{response.excerpt}}}</div>
+{{#if hasMore}}
+  <a href={{permalink}} class="has-more">{{i18n 'admin.flags.more'}}</a>
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/flagged-post.hbs b/app/assets/javascripts/admin/templates/components/flagged-post.hbs
new file mode 100644
index 0000000000..2b7f03940f
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/flagged-post.hbs
@@ -0,0 +1,163 @@
+<div class='flagged-post-details'>
+  <div class="flagged-post-avatar">
+    {{#if flaggedPost.postAuthorFlagged}}
+      {{#if flaggedPost.user}}
+        {{#link-to 'adminUser' flaggedPost.user.id flaggedPost.user.username}}
+          {{avatar flaggedPost.user imageSize="large"}}
+        {{/link-to}}
+        {{#if flaggedPost.wasEdited}}
+          <div class='edited-after'>
+            {{d-icon "pencil" title="admin.flags.was_edited"}}
+          </div>
+        {{/if}}
+      {{/if}}
+    {{/if}}
+    {{#if canAct}}
+      {{#if flaggedPost.previous_flags_count}}
+        <span title="{{i18n 'admin.flags.previous_flags_count' count=flaggedPost.previous_flags_count}}" class="badge-notification previous-flagged-posts">{{flaggedPost.previous_flags_count}}</span>
+      {{/if}}
+    {{/if}}
+  </div>
+
+  <div class="flagged-post-contents">
+    <div class='flagged-post-user-details'>
+      <a class='username' href={{user.path}} data-user-card={{flaggedPost.user.username}}>{{format-username flaggedPost.user.username}}</a>
+    </div>
+
+    <div class='flagged-post-excerpt'>
+      {{#unless hideTitle}}
+        <h3>
+          {{#if flaggedPost.topic.isPrivateMessage}}
+            <span class="private-message-glyph">{{d-icon "envelope"}}</span>
+          {{/if}}
+          {{topic-status topic=flaggedPost.topic}}
+          <a href='{{unbound flaggedPost.url}}'>{{{unbound flaggedPost.topic.fancyTitle}}}</a>
+        </h3>
+      {{/unless}}
+      {{#if flaggedPost.postAuthorFlagged}}
+        {{#if expanded}}
+          {{{flaggedPost.cooked}}}
+        {{else}}
+          <p>
+            {{{flaggedPost.excerpt}}}
+            <a href {{action "expand"}}>{{i18n "admin.flags.show_full"}}</a>
+          </p>
+        {{/if}}
+      {{/if}}
+    </div>
+
+    {{#if flaggedPost.topicFlagged}}
+      <div class='flagged-post-message'>
+        <span class='text'>{{{i18n 'admin.flags.topic_flagged'}}}</span>
+        <a href={{flaggedPost.url}} class="btn">{{i18n 'admin.flags.visit_topic'}}</a>
+      </div>
+    {{/if}}
+
+    {{#each flaggedPost.conversations as |c|}}
+      <div class='flag-conversation'>
+        {{#if c.response}}
+          {{flagged-post-response response=c.response}}
+          {{#if c.reply}}
+            {{flagged-post-response response=c.reply hasMore=c.hasMore permalink=c.permalink}}
+          {{/if}}
+          <a href={{c.permalink}} class="btn reply-conversation btn-small">
+            {{d-icon "reply"}}
+            {{i18n "admin.flags.reply_message"}}
+          </a>
+        {{/if}}
+      </div>
+    {{/each}}
+
+    <div class='flag-user-lists'>
+      <div class='flagged-by'>
+        <div class='user-list-title'>
+          {{i18n "admin.flags.flagged_by"}}
+        </div>
+        <div class='flag-users'>
+          {{#each flaggedPost.post_actions as |postAction|}}
+            {{#flag-user user=postAction.user date=postAction.created_at}}
+              <div class='flagger-flag-type'>
+                {{post-action-title postAction.post_action_type_id postAction.name_key}}
+              </div>
+            {{/flag-user}}
+          {{/each}}
+        </div>
+      </div>
+
+      {{#if showResolvedBy}}
+        <div class='flagged-post-resolved-by'>
+          <div class='user-list-title'>
+            {{i18n "admin.flags.resolved_by"}}
+          </div>
+          <div class='flag-users'>
+            {{#each flaggedPost.post_actions as |postAction|}}
+              {{#flag-user user=postAction.disposed_by date=postAction.disposed_at}}
+                {{disposition-icon postAction.disposition}}
+                {{#if postAction.staff_took_action}}
+                  {{d-icon "gavel" title="admin.flags.took_action"}}
+                {{/if}}
+              {{/flag-user}}
+            {{/each}}
+          </div>
+        </div>
+      {{/if}}
+    </div>
+
+    {{#if suspended}}
+      <div class='suspended-message'>
+        The user was suspended for this post.
+      </div>
+    {{/if}}
+
+    <div class='flagged-post-controls'>
+      {{#if canAct}}
+        {{admin-agree-flag-dropdown
+          post=flaggedPost
+          removeAfter=(action "removeAfter") }}
+
+        {{#if flaggedPost.postHidden}}
+          {{d-button
+            title="admin.flags.disagree_flag_unhide_post_title"
+            class="disagree-flag"
+            action="disagree"
+            icon="thumbs-o-down"
+            label="admin.flags.disagree_flag_unhide_post"}}
+        {{else}}
+          {{d-button
+            title="admin.flags.disagree_flag_title"
+            class="disagree-flag"
+            action="disagree"
+            icon="thumbs-o-down"
+            label="admin.flags.disagree_flag"}}
+        {{/if}}
+
+        {{d-button
+          class="defer-flag"
+          title="admin.flags.defer_flag_title"
+          action="defer"
+          icon="external-link"
+          label="admin.flags.defer_flag"}}
+
+        {{admin-delete-flag-dropdown post=flaggedPost removeAfter=(action "removeAfter")}}
+
+        {{#unless suspended}}
+          {{d-button
+            class="btn-danger suspend-user"
+            icon="ban"
+            label="admin.flags.suspend_user"
+            title="admin.flags.suspend_user_title"
+            action=(action "showSuspendModal")}}
+        {{/unless}}
+      {{/if}}
+
+      {{d-button
+        icon="list"
+        label="admin.flags.moderation_history"
+        action=(action "showModerationHistory")}}
+    </div>
+    {{plugin-outlet
+      name="flagged-post-below-controls"
+      tagName=""
+      args=(hash flaggedPost=flaggedPost canAct=canAct)}}
+  </div>
+</div>
diff --git a/app/assets/javascripts/admin/templates/components/flagged-posts.hbs b/app/assets/javascripts/admin/templates/components/flagged-posts.hbs
new file mode 100644
index 0000000000..a2f60c2587
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/flagged-posts.hbs
@@ -0,0 +1,16 @@
+{{#if flaggedPosts}}
+  {{#load-more selector=".flagged-post" action=(action "loadMore")}}
+    <div class='flagged-posts'>
+      {{#each flaggedPosts as |flaggedPost|}}
+        {{flagged-post
+          flaggedPost=flaggedPost
+          filter=filter
+          showResolvedBy=showResolvedBy
+          removePost=(action "removePost" flaggedPost)
+          hideTitle=topic}}
+      {{/each}}
+    </div>
+  {{/load-more}}
+{{else}}
+  <p>{{i18n 'admin.flags.no_results'}}</p>
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/flagged-topic-users.hbs b/app/assets/javascripts/admin/templates/components/flagged-topic-users.hbs
new file mode 100644
index 0000000000..ad9f40585a
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/flagged-topic-users.hbs
@@ -0,0 +1,5 @@
+{{#each users as |u|}}
+  {{#link-to 'adminUser' u.id u.username class="flagged-topic-user"}}
+    {{avatar u imageSize="small"}}
+  {{/link-to}}
+{{/each}}
diff --git a/app/assets/javascripts/admin/templates/components/moderation-history-item.hbs b/app/assets/javascripts/admin/templates/components/moderation-history-item.hbs
new file mode 100644
index 0000000000..bf2ddc0f4c
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/moderation-history-item.hbs
@@ -0,0 +1,17 @@
+<td class='date'>
+  {{format-date item.created_at}}
+</td>
+<td class='history-item-action'>
+  <div class='action-name'>
+    {{i18n (concat "admin.moderation_history.actions." item.action_name)}}
+  </div>
+  <div class='action-details'>{{item.details}}</div>
+</td>
+<td class='history-item-actor'>
+  {{#if item.acting_user}}
+    {{#user-link user=item.acting_user}}
+      {{avatar item.acting_user imageSize="small"}}
+      <span>{{format-username item.acting_user.username}}</span>
+    {{/user-link}}
+  {{/if}}
+</td>
diff --git a/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs b/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs
index 92451dbbf9..88d59816fe 100644
--- a/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs
+++ b/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs
@@ -1,4 +1,4 @@
 <div class="validation-error {{unless message 'hidden'}}">
-  {{fa-icon "times"}}
+  {{d-icon "times"}}
   {{message}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/site-setting.hbs b/app/assets/javascripts/admin/templates/components/site-setting.hbs
index 32510bef5f..7fd80e4446 100644
--- a/app/assets/javascripts/admin/templates/components/site-setting.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-setting.hbs
@@ -2,7 +2,7 @@
    <h3>{{unbound settingName}}</h3>
 </div>
 <div class="setting-value">
-  {{component componentName setting=setting value=buffered.value validationMessage=validationMessage}}
+  {{component componentName setting=setting value=buffered.value validationMessage=validationMessage preview=preview}}
 </div>
 {{#if dirty}}
   <div class='setting-controls'>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
index 8c0b4eda1e..0aadec18d8 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs
@@ -1,3 +1,3 @@
-{{category-selector categories=selectedCategories blacklist=selectedCategories}}
+{{category-selector categories=selectedCategories}}
 <div class='desc'>{{{unbound setting.description}}}</div>
 {{setting-validation-message message=validationMessage}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
index 765a0e20d1..9b3da3178e 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
@@ -1,4 +1,4 @@
-{{combo-box valueAttribute="value" content=setting.validValues value=value none=setting.allowsNone}}
+{{combo-box castInteger=true valueAttribute="value" content=setting.validValues value=value none=setting.allowsNone}}
 {{preview}}
 {{setting-validation-message message=validationMessage}}
 <div class='desc'>{{{unbound setting.description}}}</div>
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 71d7216f27..77e254b42f 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/components/watched-word-form.hbs b/app/assets/javascripts/admin/templates/components/watched-word-form.hbs
new file mode 100644
index 0000000000..7d2b460aa0
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/watched-word-form.hbs
@@ -0,0 +1,7 @@
+<b>{{i18n 'admin.watched_words.form.label'}}</b>
+{{text-field value=word disabled=formSubmitted class="watched-word-input" autocorrect="off" autocapitalize="off" placeholderKey=placeholderKey}}
+{{d-button action="submit" disabled=formSubmitted label="admin.watched_words.form.add"}}
+
+{{#if showSuccessMessage}}
+  <span class="success-message">{{i18n 'admin.watched_words.form.success'}}</span>
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs b/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs
new file mode 100644
index 0000000000..caa74a8615
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs
@@ -0,0 +1,7 @@
+<label class="btn {{if addDisabled 'disabled'}}">
+  {{d-icon "upload"}}
+  {{i18n 'admin.watched_words.form.upload'}}
+  <input disabled={{addDisabled}} type="file" accept="text/plain,text/csv" style="visibility: hidden; position: absolute;" />
+</label>
+<br/>
+<span class="instructions">One word per line</span>
diff --git a/app/assets/javascripts/admin/templates/customize-colors-show.hbs b/app/assets/javascripts/admin/templates/customize-colors-show.hbs
index 6b3c8a3e91..e688e13316 100644
--- a/app/assets/javascripts/admin/templates/customize-colors-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-colors-show.hbs
@@ -5,13 +5,13 @@
       {{#unless model.theme_id}}
       <button {{action "save"}} disabled={{model.disableSave}} class='btn'>{{i18n 'admin.customize.save'}}</button>
       {{/unless}}
-      <button {{action "copy" model}} class='btn'><i class="fa fa-copy"></i> {{i18n 'admin.customize.copy'}}</button>
-      <button {{action "copyToClipboard" model}} class='btn'><i class="fa fa-clipboard"></i> {{i18n 'admin.customize.copy_to_clipboard'}}</button>
+      <button {{action "copy" model}} class='btn'>{{d-icon "copy"}} {{i18n 'admin.customize.copy'}}</button>
+      <button {{action "copyToClipboard" model}} class='btn'>{{d-icon "clipboard"}} {{i18n 'admin.customize.copy_to_clipboard'}}</button>
       {{#if model.theme_id}}
       {{i18n "admin.customize.theme_owner"}}
       {{#link-to "adminCustomizeThemes.show" model.theme_id}}{{model.theme_name}}{{/link-to}}
       {{else}}
-      <button {{action "destroy"}} class='btn btn-danger'><i class="fa fa-trash-o"></i> {{i18n 'admin.customize.delete'}}</button>
+      <button {{action "destroy"}} class='btn btn-danger'>{{d-icon "trash-o"}} {{i18n 'admin.customize.delete'}}</button>
       {{/if}}
       <span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span>
     </div>
diff --git a/app/assets/javascripts/admin/templates/customize-colors.hbs b/app/assets/javascripts/admin/templates/customize-colors.hbs
index 1ed39b8fcf..920f6f1954 100644
--- a/app/assets/javascripts/admin/templates/customize-colors.hbs
+++ b/app/assets/javascripts/admin/templates/customize-colors.hbs
@@ -4,12 +4,12 @@
     {{#each model as |scheme|}}
       {{#unless scheme.is_base}}
       <li>
-        {{#link-to 'adminCustomize.colors.show' scheme replace=true}}{{fa-icon 'paint-brush'}}{{scheme.description}}{{/link-to}}
+        {{#link-to 'adminCustomize.colors.show' scheme replace=true}}{{d-icon 'paint-brush'}}{{scheme.description}}{{/link-to}}
       </li>
       {{/unless}}
     {{/each}}
   </ul>
-  <button {{action "newColorScheme"}} class='btn'>{{fa-icon 'plus'}}{{i18n 'admin.customize.new'}}</button>
+  <button {{action "newColorScheme"}} class='btn'>{{d-icon 'plus'}}{{i18n 'admin.customize.new'}}</button>
 </div>
 
 {{outlet}}
diff --git a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
index fafce666a6..83eebb83d0 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
@@ -19,7 +19,7 @@
         <li>
           {{#link-to 'adminCustomizeThemes.edit' model.id 'desktop' fieldName replace=true title=field.title}}
             {{i18n 'admin.customize.theme.desktop'}}
-            {{fa-icon 'desktop'}}
+            {{d-icon 'desktop'}}
           {{/link-to}}
         </li>
         {{/if}}
@@ -27,7 +27,7 @@
         <li class='mobile'>
           {{#link-to 'adminCustomizeThemes.edit' model.id 'mobile' fieldName replace=true title=field.title}}
             {{i18n 'admin.customize.theme.mobile'}}
-            {{fa-icon 'mobile'}}
+            {{d-icon 'mobile'}}
           {{/link-to}}
         </li>
         {{/if}}
@@ -46,14 +46,14 @@
         {{#each fields as |field|}}
           <li>
             {{#link-to 'adminCustomizeThemes.edit' model.id currentTargetName field.name replace=true title=field.title}}
-              {{#if field.icon}}{{fa-icon field.icon}} {{/if}}
+              {{#if field.icon}}{{d-icon field.icon}} {{/if}}
               {{i18n field.key}}
             {{/link-to}}
           </li>
         {{/each}}
         <li class='toggle-maximize'>
           <a {{action "toggleMaximize"}}>
-            <i class="fa fa-{{maximizeIcon}}"></i>
+            {{d-icon maximizeIcon}}
           </a>
         </li>
       </ul>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index 6e89af4767..7f339d63d7 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -1,13 +1,13 @@
 <div class="show-current-style">
-  <h2>
+  <h1>
     {{#if editingName}}
       {{text-field value=model.name autofocus="true"}}
       {{d-button action="finishedEditingName" class="btn-primary btn-small submit-edit" icon="check"}}
       {{d-button action="cancelEditingName" class="btn-small cancel-edit" icon="times"}}
     {{else}}
-      {{model.name}} <a {{action "startEditingName"}}>{{fa-icon "pencil"}}</a>
+      {{model.name}} <a {{action "startEditingName"}}>{{d-icon "pencil"}}</a>
     {{/if}}
-  </h2>
+  </h1>
 
   {{#if model.remote_theme}}
   <p>
@@ -15,7 +15,7 @@
   </p>
   {{#if model.remote_theme.license_url}}
   <p>
-    <a href="{{model.remote_theme.license_url}}">{{i18n "admin.customize.theme.license"}} {{fa-icon "copyright"}}</a>
+    <a href="{{model.remote_theme.license_url}}">{{i18n "admin.customize.theme.license"}} {{d-icon "copyright"}}</a>
   </p>
   {{/if}}
   {{/if}}
@@ -37,10 +37,9 @@
   <h3>{{i18n "admin.customize.theme.color_scheme"}}</h3>
   <p>{{i18n "admin.customize.theme.color_scheme_select"}}</p>
   <p>{{combo-box content=colorSchemes
-                 nameProperty="name"
-                 value=colorSchemeId
-                 selectionIcon="paint-brush"
-                 valueAttribute="id"}}
+                  filterable=true
+                  value=colorSchemeId
+                  icon="paint-brush"}}
      {{#if colorSchemeChanged}}
         {{d-button action="changeScheme" class="btn-primary btn-small submit-edit" icon="check"}}
         {{d-button action="cancelChangeScheme" class="btn-small cancel-edit" icon="times"}}
@@ -123,18 +122,15 @@
     </ul>
     {{/unless}}
     {{#if selectableChildThemes}}
-      <p>{{combo-box content=selectableChildThemes
-                   nameProperty="name"
-                   value=selectedChildThemeId
-                   valueAttribute="id"}}
-
+      <p>
+        {{combo-box content=selectableChildThemes value=selectedChildThemeId}}
         {{#d-button action="addChildTheme" icon="plus"}}{{i18n "admin.customize.theme.add"}}{{/d-button}}
       </p>
     {{/if}}
   {{/if}}
 
-  <a href='{{previewUrl}}' title="{{i18n 'admin.customize.explain_preview'}}" target='_blank' class='btn'>{{fa-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
-  <a class="btn export" target="_blank" href={{downloadUrl}}>{{fa-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
+  <a href='{{previewUrl}}' title="{{i18n 'admin.customize.explain_preview'}}" target='_blank' class='btn'>{{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
+  <a class="btn export" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
 
   {{d-button action="destroy" label="admin.customize.delete" icon="trash" class="btn-danger"}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/customize-themes.hbs b/app/assets/javascripts/admin/templates/customize-themes.hbs
index 43129006a5..c9474917ef 100644
--- a/app/assets/javascripts/admin/templates/customize-themes.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes.hbs
@@ -7,10 +7,10 @@
         {{#link-to 'adminCustomizeThemes.show' theme replace=true}}
           {{theme.name}}
           {{#if theme.user_selectable}}
-            {{fa-icon "user"}}
+            {{d-icon "user"}}
           {{/if}}
           {{#if theme.default}}
-            {{fa-icon "asterisk"}}
+            {{d-icon "asterisk"}}
           {{/if}}
         {{/link-to}}
       </li>
diff --git a/app/assets/javascripts/admin/templates/customize.hbs b/app/assets/javascripts/admin/templates/customize.hbs
index 3065c09855..d5d3816310 100644
--- a/app/assets/javascripts/admin/templates/customize.hbs
+++ b/app/assets/javascripts/admin/templates/customize.hbs
@@ -1,16 +1,14 @@
-<div class='customize'>
-  {{#admin-nav}}
-    {{nav-item route='adminCustomizeThemes' label='admin.customize.theme.title'}}
-    {{nav-item route='adminCustomize.colors' label='admin.customize.colors.title'}}
-    {{nav-item route='adminSiteText' label='admin.site_text.title'}}
-    {{nav-item route='adminCustomizeEmailTemplates' label='admin.customize.email_templates.title'}}
-    {{nav-item route='adminUserFields' label='admin.user_fields.title'}}
-    {{nav-item route='adminEmojis' label='admin.emoji.title'}}
-    {{nav-item route='adminPermalinks' label='admin.permalink.title'}}
-    {{nav-item route='adminEmbedding' label='admin.embedding.title'}}
-  {{/admin-nav}}
+{{#admin-nav}}
+  {{nav-item route='adminCustomizeThemes' label='admin.customize.theme.title'}}
+  {{nav-item route='adminCustomize.colors' label='admin.customize.colors.title'}}
+  {{nav-item route='adminSiteText' label='admin.site_text.title'}}
+  {{nav-item route='adminCustomizeEmailTemplates' label='admin.customize.email_templates.title'}}
+  {{nav-item route='adminUserFields' label='admin.user_fields.title'}}
+  {{nav-item route='adminEmojis' label='admin.emoji.title'}}
+  {{nav-item route='adminPermalinks' label='admin.permalink.title'}}
+  {{nav-item route='adminEmbedding' label='admin.embedding.title'}}
+{{/admin-nav}}
 
-  <div class="admin-container">
-    {{outlet}}
-  </div>
+<div class="admin-container">
+  {{outlet}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs
index c6c4487009..6b4dc88584 100644
--- a/app/assets/javascripts/admin/templates/dashboard.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard.hbs
@@ -29,16 +29,16 @@
     <div class="dashboard-stats totals">
       <table>
         <tr>
-          <td class="title">{{fa-icon "shield"}} {{i18n 'admin.dashboard.admins'}}</td>
+          <td class="title">{{d-icon "shield"}} {{i18n 'admin.dashboard.admins'}}</td>
           <td class="value">{{#link-to 'adminUsersList.show' 'admins'}}{{admins}}{{/link-to}}</td>
-          <td class="title">{{fa-icon "ban"}} {{i18n 'admin.dashboard.suspended'}}</td>
+          <td class="title">{{d-icon "ban"}} {{i18n 'admin.dashboard.suspended'}}</td>
           <td class="value">{{#link-to 'adminUsersList.show' 'suspended'}}{{suspended}}{{/link-to}}</td>
         </tr>
         <tr>
-          <td class="title">{{fa-icon "shield"}} {{i18n 'admin.dashboard.moderators'}}</td>
+          <td class="title">{{d-icon "shield"}} {{i18n 'admin.dashboard.moderators'}}</td>
           <td class="value">{{#link-to 'adminUsersList.show' 'moderators'}}{{moderators}}{{/link-to}}</td>
-          <td class="title">{{fa-icon "ban"}} {{i18n 'admin.dashboard.blocked'}}</td>
-          <td class="value">{{#link-to 'adminUsersList.show' 'blocked'}}{{blocked}}{{/link-to}}</td>
+          <td class="title">{{d-icon "ban"}} {{i18n 'admin.dashboard.silenced'}}</td>
+          <td class="value">{{#link-to 'adminUsersList.show' 'silenced'}}{{silenced}}{{/link-to}}</td>
         </tr>
       </table>
     </div>
@@ -87,7 +87,7 @@
       <table class="table table-condensed table-hover">
         <thead>
           <tr>
-            <th class="title" title="{{i18n 'admin.dashboard.private_messages_title'}}">{{fa-icon "envelope"}} {{i18n 'admin.dashboard.private_messages_short'}}</th>
+            <th class="title" title="{{i18n 'admin.dashboard.private_messages_title'}}">{{d-icon "envelope"}} {{i18n 'admin.dashboard.private_messages_short'}}</th>
             <th>{{i18n 'admin.dashboard.reports.today'}}</th>
             <th>{{i18n 'admin.dashboard.reports.yesterday'}}</th>
             <th>{{i18n 'admin.dashboard.reports.last_7_days'}}</th>
@@ -176,7 +176,7 @@
   <div class="dashboard-right">
     {{#if foundProblems}}
       <div class="dashboard-stats detected-problems">
-        <div class="look-here">{{fa-icon "exclamation-triangle"}}</div>
+        <div class="look-here">{{d-icon "exclamation-triangle"}}</div>
         <div class="problem-messages">
           {{#conditional-loading-spinner condition=loadingProblems}}
             <p>
diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
index 7f31c6e9bf..87372268c7 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/email-sent.hbs b/app/assets/javascripts/admin/templates/email-sent.hbs
index 847076f098..9dd7996ff5 100644
--- a/app/assets/javascripts/admin/templates/email-sent.hbs
+++ b/app/assets/javascripts/admin/templates/email-sent.hbs
@@ -30,7 +30,7 @@
           {{/if}}
         </td>
         <td>
-          {{#if l.bounced}}{{fa-icon "repeat" title="admin.email.bounced"}}{{/if}}
+          {{#if l.bounced}}{{d-icon "repeat" title="admin.email.bounced"}}{{/if}}
           <a href='mailto:{{unbound l.to_address}}'>{{l.to_address}}</a>
         </td>
         <td>{{l.email_type}}</td>
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index 6f35c097a9..675e8249be 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -20,7 +20,7 @@
             <tr>
               <th><img class="emoji emoji-custom" src="{{unbound e.url}}" title="{{unbound e.name}}"></th>
               <th>:{{e.name}}:</th>
-              <th><button {{action "destroy" e}} class='btn btn-danger no-text pull-right'>{{fa-icon 'trash-o'}} </button></th>
+              <th><button {{action "destroy" e}} class='btn btn-danger no-text pull-right'>{{d-icon 'trash-o'}} </button></th>
             </tr>
           {{/each}}
         </tbody>
diff --git a/app/assets/javascripts/admin/templates/flags-list.hbs b/app/assets/javascripts/admin/templates/flags-list.hbs
deleted file mode 100644
index 7edc1b30f2..0000000000
--- a/app/assets/javascripts/admin/templates/flags-list.hbs
+++ /dev/null
@@ -1,166 +0,0 @@
-{{#if model.length}}
-  {{#load-more selector="tbody tr" action="loadMore"}}
-    <table class="admin-flags">
-      <thead>
-        <tr>
-          <th class='excerpt'></th>
-          <th class='flaggers'>{{i18n 'admin.flags.flagged_by'}}</th>
-          <th class='flaggers'>{{#if adminOldFlagsView}}{{i18n 'admin.flags.resolved_by'}}{{/if}}</th>
-        </tr>
-      </thead>
-      <tbody>
-        {{#each content as |flaggedPost|}}
-          <tr class={{flaggedPost.extraClasses}}>
-
-            <td class='excerpt'>
-
-              <div class="flex-center-align">
-                <div class="flagged-post-avatar">
-                  {{#if flaggedPost.postAuthorFlagged}}
-                    {{#if flaggedPost.user}}
-                      {{#link-to 'adminUser' flaggedPost.user}}{{avatar flaggedPost.user imageSize="large"}}{{/link-to}}
-                      {{#if flaggedPost.wasEdited}}<i class="fa fa-pencil" title="{{i18n 'admin.flags.was_edited'}}"></i>{{/if}}
-                    {{/if}}
-                  {{/if}}
-                  {{#if adminActiveFlagsView}}
-                    {{#if flaggedPost.previous_flags_count}}
-                      <span title="{{i18n 'admin.flags.previous_flags_count' count=flaggedPost.previous_flags_count}}" class="badge-notification flagged-posts">{{flaggedPost.previous_flags_count}}</span>
-                    {{/if}}
-                  {{/if}}
-                </div>
-                <div class="topic-excerpt">
-                  <h3>
-                    {{#if flaggedPost.topic.isPrivateMessage}}
-                      <span class="private-message-glyph">{{fa-icon "envelope"}}</span>
-                    {{/if}}
-                    {{topic-status topic=flaggedPost.topic}}
-                    <a href='{{unbound flaggedPost.url}}'>{{{unbound flaggedPost.topic.fancyTitle}}}</a>
-                  </h3>
-                  {{#unless site.mobileView}}
-                    {{#if flaggedPost.postAuthorFlagged}}
-                      <p>{{{flaggedPost.excerpt}}}</p>
-                    {{/if}}
-                  {{/unless}}
-                </div>
-              </div>
-
-              {{#if site.mobileView}}
-                {{#if flaggedPost.postAuthorFlagged}}
-                  <p>{{{flaggedPost.excerpt}}}</p>
-                {{/if}}
-              {{/if}}
-            </td>
-
-            <td class='flaggers'>
-              <table>
-                <tbody>
-                  {{#each flaggedPost.flaggers as |flagger|}}
-                    <tr>
-                      <td class='avatar'>
-                        {{#link-to 'adminUser' flagger.user}}
-                          {{avatar flagger.user imageSize="medium"}}
-                        {{/link-to}}
-                      </td>
-                      <td>
-                        {{#link-to 'adminUser' flagger.user}}
-                          {{flagger.user.username}}
-                        {{/link-to}}
-                        {{format-age flagger.flaggedAt}}
-                        <br />
-                        {{flagger.flagType}}
-                      </td>
-                    </tr>
-                  {{/each}}
-                </tbody>
-              </table>
-            </td>
-
-            <td class='flaggers result'>
-              {{#if adminOldFlagsView}}
-                <table>
-                  <tbody>
-                    {{#each flaggedPost.flaggers as |flagger|}}
-                      <tr>
-                        <td class='avatar'>
-                          {{#link-to 'adminUser' flagger.disposedBy}}
-                            {{avatar flagger.disposedBy imageSize="medium"}}
-                          {{/link-to}}
-                        </td>
-                        <td>
-                          {{format-age flagger.disposedAt}}
-                          {{{flagger.dispositionIcon}}}
-                          {{#if flagger.tookAction}}
-                            <i class='fa fa-gavel' title='{{i18n 'admin.flags.took_action'}}'></i>
-                          {{/if}}
-                        </td>
-                      </tr>
-                    {{/each}}
-                  </tbody>
-                </table>
-              {{/if}}
-            </td>
-
-          </tr>
-
-          {{#if flaggedPost.topicFlagged}}
-            <tr class='message'>
-              <td></td>
-              <td colspan="3">
-                <div>
-                  {{{i18n 'admin.flags.topic_flagged'}}}&nbsp;<a href='{{unbound flaggedPost.url}}' class="btn">{{i18n 'admin.flags.visit_topic'}}</a>
-                </div>
-              </td>
-            </tr>
-          {{/if}}
-
-          {{#each flaggedPost.conversations as |c|}}
-            <tr class='message'>
-              <td colspan="3">
-                <div>
-                  {{#if c.response}}
-                    <p>
-                      {{#link-to 'adminUser' c.response.user}}{{avatar c.response.user imageSize="medium"}}{{/link-to}}&nbsp;{{{c.response.excerpt}}}
-                    </p>
-                    {{#if c.reply}}
-                      <p>
-                        {{#link-to 'adminUser' c.reply.user}}{{avatar c.reply.user imageSize="medium"}}{{/link-to}}&nbsp;{{{c.reply.excerpt}}}
-                        {{#if c.hasMore}}
-                          <a href="{{unbound c.permalink}}">{{i18n 'admin.flags.more'}}</a>
-                        {{/if}}
-                      </p>
-                    {{/if}}
-                    <a href="{{unbound c.permalink}}">
-                      <button class='btn btn-reply'><i class="fa fa-reply"></i>&nbsp;{{i18n 'admin.flags.reply_message'}}</button>
-                    </a>
-                  {{/if}}
-                </div>
-              </td>
-            </tr>
-          {{/each}}
-
-          {{#unless adminOldFlagsView}}
-            <tr>
-              <td colspan="3" class="action">
-                {{#if adminActiveFlagsView}}
-                  <button title='{{i18n 'admin.flags.agree_title'}}' class='btn' {{action "showAgreeFlagModal" flaggedPost}}><i class="fa fa-thumbs-o-up"></i>{{i18n 'admin.flags.agree'}}&hellip;</button>
-                  {{#if flaggedPost.postHidden}}
-                    <button title='{{i18n 'admin.flags.disagree_flag_unhide_post_title'}}' class='btn' {{action "disagreeFlags" flaggedPost}}><i class="fa fa-thumbs-o-down"></i>{{i18n 'admin.flags.disagree_flag_unhide_post'}}</button>
-                  {{else}}
-                    <button title='{{i18n 'admin.flags.disagree_flag_title'}}' class='btn' {{action "disagreeFlags" flaggedPost}}><i class="fa fa-thumbs-o-down"></i>{{i18n 'admin.flags.disagree_flag'}}</button>
-                  {{/if}}
-                  <button title='{{i18n 'admin.flags.defer_flag_title'}}' class='btn' {{action "deferFlags" flaggedPost}}><i class="fa fa-external-link"></i>{{i18n 'admin.flags.defer_flag'}}</button>
-                  <button title='{{i18n 'admin.flags.delete_title'}}' class='btn btn-danger' {{action "showDeleteFlagModal" flaggedPost}}><i class="fa fa-trash-o"></i>{{i18n 'admin.flags.delete'}}&hellip;</button>
-                {{/if}}
-              </td>
-            </tr>
-          {{/unless}}
-
-        {{/each}}
-
-      </tbody>
-    </table>
-  {{/load-more}}
-
-{{else}}
-  <p>{{i18n 'admin.flags.no_results'}}</p>
-{{/if}}
diff --git a/app/assets/javascripts/admin/templates/flags-posts-active.hbs b/app/assets/javascripts/admin/templates/flags-posts-active.hbs
new file mode 100644
index 0000000000..9f1c21e463
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/flags-posts-active.hbs
@@ -0,0 +1 @@
+{{flagged-posts flaggedPosts=model filter="active"}}
diff --git a/app/assets/javascripts/admin/templates/flags-posts-old.hbs b/app/assets/javascripts/admin/templates/flags-posts-old.hbs
new file mode 100644
index 0000000000..b4f5284612
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/flags-posts-old.hbs
@@ -0,0 +1 @@
+{{flagged-posts flaggedPosts=model filter="old"}}
diff --git a/app/assets/javascripts/admin/templates/flags-topics-index.hbs b/app/assets/javascripts/admin/templates/flags-topics-index.hbs
new file mode 100644
index 0000000000..b5a7eca133
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/flags-topics-index.hbs
@@ -0,0 +1,46 @@
+{{plugin-outlet name="flagged-topics-before" noTags=true args=(hash flaggedTopics=flaggedTopics)}}
+
+<table class='flagged-topics'>
+  <thead>
+    {{plugin-outlet name="flagged-topic-header-row" noTags=true}}
+    <th>{{i18n "admin.flags.flagged_topics.topic"}} </th>
+    <th>{{i18n "admin.flags.flagged_topics.type"}}</th>
+    <th>{{I18n "admin.flags.flagged_topics.users"}}</th>
+    <th>{{i18n "admin.flags.flagged_topics.last_flagged"}}</th>
+    <th></th>
+  </thead>
+
+  {{#each flaggedTopics as |ft|}}
+    <tr class='flagged-topic'>
+      {{plugin-outlet name="flagged-topic-row" noTags=true args=(hash topic=ft.topic)}}
+
+      <td class="topic-title">
+        <a href={{ft.topic.relative_url}} target="_blank">{{replace-emoji ft.topic.fancy_title}}</a>
+      </td>
+      <td>
+        {{#each ft.flag_counts as |fc|}}
+          <div class='flag-counts'>
+            <span class='type-name'>{{post-action-title fc.post_action_type_id fc.name_key}}</span>
+            <span class='type-count'>x{{fc.count}}</span>
+          </div>
+        {{/each}}
+      </td>
+      <td class='flagged-topic-users'>
+        {{flagged-topic-users users=ft.users tagName=""}}
+      </td>
+      <td>
+        {{format-age ft.last_flag_at}}
+      </td>
+      <td>
+        {{#link-to
+          "adminFlags.topics.show"
+          ft.id
+          class="btn d-button no-text btn-small btn-primary show-details"
+          title=(i18n "admin.flags.show_details")}}
+          {{d-icon "list"}}
+          {{i18n "admin.flags.details"}}
+        {{/link-to}}
+      </td>
+    </tr>
+  {{/each}}
+</table>
diff --git a/app/assets/javascripts/admin/templates/flags-topics-show.hbs b/app/assets/javascripts/admin/templates/flags-topics-show.hbs
new file mode 100644
index 0000000000..0494780220
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/flags-topics-show.hbs
@@ -0,0 +1,19 @@
+<div class='flagged-topic-details'>
+  <div class='topic-title'>
+    <h1>
+      {{topic-status topic=topic}}
+      {{#link-to 'topic' topic target="_blank"}}
+        {{{topic.fancyTitle}}}
+      {{/link-to}}
+    </h1>
+  </div>
+
+  {{plugin-outlet name="flagged-topic-details-header" args=(hash topic=topic)}}
+</div>
+
+<div class='topic-flags'>
+  {{flagged-posts
+    flaggedPosts=flaggedPosts
+    filter="active"
+    topic=topic}}
+</div>
diff --git a/app/assets/javascripts/admin/templates/flags.hbs b/app/assets/javascripts/admin/templates/flags.hbs
index b19e8e2276..d13ad994bc 100644
--- a/app/assets/javascripts/admin/templates/flags.hbs
+++ b/app/assets/javascripts/admin/templates/flags.hbs
@@ -1,6 +1,13 @@
 {{#admin-nav}}
-  {{nav-item route='adminFlags.list' routeParam='active' label='admin.flags.active'}}
-  {{nav-item route='adminFlags.list' routeParam='old' label='admin.flags.old'}}
+  {{#if siteSettings.flags_default_topics}}
+    {{nav-item route='adminFlags.topics' label='admin.flags.topics'}}
+    {{nav-item route='adminFlags.postsActive' label='admin.flags.active_posts'}}
+  {{else}}
+    {{nav-item route='adminFlags.postsActive' label='admin.flags.active_posts'}}
+    {{nav-item route='adminFlags.topics' label='admin.flags.topics'}}
+  {{/if}}
+
+  {{nav-item route='adminFlags.postsOld' label='admin.flags.old_posts' class='right'}}
 {{/admin-nav}}
 
 <div class="admin-container">
diff --git a/app/assets/javascripts/admin/templates/group.hbs b/app/assets/javascripts/admin/templates/group.hbs
index 79dbcfc3b6..0689bd30ce 100644
--- a/app/assets/javascripts/admin/templates/group.hbs
+++ b/app/assets/javascripts/admin/templates/group.hbs
@@ -9,19 +9,18 @@
     {{/if}}
   </div>
 
-  {{#if model.id}}
-    {{#unless model.automatic}}
-      <div>
-        <label for='full_name'>{{i18n 'groups.edit.full_name'}}</label>
-        {{input type='text' name='full_name' value=model.full_name class='group-edit-full-name'}}
-      </div>
+  {{#unless model.automatic}}
+    <div>
+      <label for='full_name'>{{i18n 'groups.edit.full_name'}}</label>
+      {{input type='text' name='full_name' value=model.full_name class='group-edit-full-name'}}
+    </div>
 
-      <div>
-        <label for="bio">{{i18n 'groups.bio'}}</label>
-        {{d-editor value=model.bio_raw}}
-      </div>
+    <div>
+      <label for="bio">{{i18n 'groups.bio'}}</label>
+      {{d-editor value=model.bio_raw}}
+    </div>
 
-      {{#if model.hasOwners}}
+    {{#if model.hasOwners}}
       <div>
         <label for='owner-list'>{{i18n 'admin.groups.group_owners'}}</label>
         <div class="ac-wrap clearfix" id='owner-list'>
@@ -30,33 +29,55 @@
           {{/each}}
         </div>
       </div>
-      {{/if}}
-      <div>
-        <label for="owner-selector">{{i18n 'admin.groups.add_owners'}}</label>
-        {{user-selector usernames=model.ownerUsernames placeholderKey="admin.groups.selector_placeholder" id="owner-selector"}}
-        {{d-button action="addOwners" class="add" icon="plus" label="admin.groups.add"}}
-      </div>
-    {{/unless}}
+    {{/if}}
+
     <div>
-      {{group-members-input model=model}}
+      <label for="owner-selector">{{i18n 'admin.groups.add_owners'}}</label>
+
+      {{user-selector usernames=model.ownerUsernames
+          placeholderKey="admin.groups.selector_placeholder"
+          id="owner-selector"}}
+
+      {{#if model.id}}
+        {{d-button
+            action="addOwners"
+            class="add"
+            icon="plus"
+            label="admin.groups.add"}}
+      {{/if}}
     </div>
-  {{/if}}
+  {{/unless}}
 
   <div>
-    <label>
-      {{input type="checkbox" checked=model.visible}}
-      {{i18n 'groups.visible'}}
-    </label>
+    {{group-members-input model=model addButton=model.id}}
+  </div>
+
+  <div>
+    <label for="visiblity">{{i18n 'groups.visibility_levels.title'}}</label>
+    {{combo-box name="alias"
+        valueAttribute="value"
+        value=model.visibility_level
+        content=visibilityLevelOptions
+        castInteger=true}}
   </div>
 
   {{#unless model.automatic}}
     <div>
       <label>
         {{input type="checkbox"
-            checked=model.public
+            checked=model.public_admission
             disabled=disablePublicSetting}}
 
-        {{i18n 'groups.public'}}
+        {{i18n 'groups.public_admission'}}
+      </label>
+    </div>
+
+    <div>
+      <label>
+        {{input type='checkbox'
+            checked=model.public_exit}}
+
+        {{i18n 'groups.public_exit'}}
       </label>
     </div>
 
@@ -70,8 +91,19 @@
       </label>
     </div>
 
+    {{#if model.allow_membership_requests}}
+      <div>
+        <label for="membership-request-template">
+          {{i18n 'groups.membership_request_template'}}
+        </label>
+
+        {{expanding-text-area name="membership-request-template"
+            value=model.membership_request_template}}
+      </div>
+    {{/if}}
+
     <div>
-      <label for="primary_group">
+      <label>
         {{input type="checkbox" checked=model.primary_group}}
         {{i18n 'admin.groups.primary_group'}}
       </label>
@@ -79,13 +111,18 @@
   {{/unless}}
 
   <div>
-    <label for="alias">{{i18n 'groups.alias_levels.title'}}</label>
-    {{combo-box name="alias" valueAttribute="value" value=model.alias_level content=aliasLevelOptions}}
+    <label for="alias">{{i18n 'groups.alias_levels.mentionable'}}</label>
+    {{combo-box name="alias" valueAttribute="value" value=model.mentionable_level content=aliasLevelOptions}}
+  </div>
+
+  <div>
+    <label for="alias">{{i18n 'groups.alias_levels.messageable'}}</label>
+    {{combo-box name="alias" valueAttribute="value" value=model.messageable_level content=aliasLevelOptions}}
   </div>
 
   <div>
     <label>{{i18n 'groups.notification_level'}}</label>
-    {{notifications-button i18nPrefix='groups.notifications' notificationLevel=model.default_notification_level}}
+    {{notifications-button i18nPrefix='groups.notifications' value=model.default_notification_level}}
     <div class='clearfix'></div>
   </div>
 
@@ -122,10 +159,12 @@
     {{group-flair-inputs model=model}}
   {{/unless}}
 
+  {{plugin-outlet name="group-edit" args=(hash group=model)}}
+
   <div class='buttons'>
     <button {{action "save"}} disabled={{disableSave}} class='btn btn-primary'>{{i18n 'admin.customize.save'}}</button>
     {{#unless model.automatic}}
-      <button {{action "destroy"}} class='btn btn-danger'>{{fa-icon "trash-o"}}{{i18n 'admin.customize.delete'}}</button>
+      <button {{action "destroy"}} class='btn btn-danger'>{{d-icon "trash-o"}}{{i18n 'admin.customize.delete'}}</button>
     {{/unless}}
 
     <span class="saving {{unless savingStatus 'hidden'}}">{{savingStatus}}</span>
diff --git a/app/assets/javascripts/admin/templates/groups-bulk.hbs b/app/assets/javascripts/admin/templates/groups-bulk.hbs
index baf3a63cda..337ab37cb3 100644
--- a/app/assets/javascripts/admin/templates/groups-bulk.hbs
+++ b/app/assets/javascripts/admin/templates/groups-bulk.hbs
@@ -6,7 +6,7 @@
   </div>
 
   <div class='control'>
-    {{combo-box content=groups valueAttribute="id" value=groupId none="admin.groups.bulk_select"}}
+    {{combo-box filterable=true content=groups value=groupId none="admin.groups.bulk_select"}}
   </div>
 
   <div class='control'>
diff --git a/app/assets/javascripts/admin/templates/groups-type-index.hbs b/app/assets/javascripts/admin/templates/groups-type-index.hbs
index 88d870c1f6..196ded96d2 100644
--- a/app/assets/javascripts/admin/templates/groups-type-index.hbs
+++ b/app/assets/javascripts/admin/templates/groups-type-index.hbs
@@ -3,7 +3,7 @@
 
   <div>
     {{#link-to 'adminGroup' 'new' class="btn"}}
-      {{fa-icon "plus"}} {{i18n 'admin.groups.new'}}
+      {{d-icon "plus"}} {{i18n 'admin.groups.new'}}
     {{/link-to}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/groups-type.hbs b/app/assets/javascripts/admin/templates/groups-type.hbs
index b4d2a0acf3..a1fa829897 100644
--- a/app/assets/javascripts/admin/templates/groups-type.hbs
+++ b/app/assets/javascripts/admin/templates/groups-type.hbs
@@ -18,7 +18,7 @@
           {{d-button action="refreshAutoGroups" icon="refresh" label="admin.groups.refresh" disabled=refreshingAutoGroups}}
         {{else}}
           {{#link-to 'adminGroup' 'new' class="btn"}}
-            {{fa-icon "plus"}} {{i18n 'admin.groups.new'}}
+            {{d-icon "plus"}} {{i18n 'admin.groups.new'}}
           {{/link-to}}
         {{/if}}
       </div>
diff --git a/app/assets/javascripts/admin/templates/logs.hbs b/app/assets/javascripts/admin/templates/logs.hbs
index 5c412949fa..b936904999 100644
--- a/app/assets/javascripts/admin/templates/logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs.hbs
@@ -3,6 +3,8 @@
   {{nav-item route='adminLogs.screenedEmails' label='admin.logs.screened_emails.title'}}
   {{nav-item route='adminLogs.screenedIpAddresses' label='admin.logs.screened_ips.title'}}
   {{nav-item route='adminLogs.screenedUrls' label='admin.logs.screened_urls.title'}}
+  {{nav-item route='adminWatchedWords' label='admin.watched_words.title'}}
+  {{nav-item route='adminSearchLogs' label='admin.logs.search_logs.title'}}
   {{#if currentUser.admin}}
     {{nav-item path='/logs' label='admin.logs.logster.title'}}
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
index 685d8455c3..f99ff865e1 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
@@ -1,6 +1,6 @@
 <p>
   {{i18n 'admin.logs.screened_emails.description'}}
-  <button class="btn pull-right" {{action "exportScreenedEmailList"}} title="{{i18n 'admin.export_csv.button_title.screened_email'}}">{{fa-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
+  <button class="btn pull-right" {{action "exportScreenedEmailList"}} title="{{i18n 'admin.export_csv.button_title.screened_email'}}">{{d-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
 </p>
 <br>
 
diff --git a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
index ca6c216f50..00e67a9aa5 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
@@ -41,9 +41,9 @@
           </div>
           <div class="col action">
             {{#if item.isBlocked}}
-              {{fa-icon "ban"}}
+              {{d-icon "ban"}}
             {{else}}
-              {{fa-icon "check"}}
+              {{d-icon "check"}}
             {{/if}}
             {{item.actionName}}
           </div>
diff --git a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
index 40aaceba70..7b1048f1b4 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
@@ -1,6 +1,6 @@
 <p>
   {{i18n 'admin.logs.screened_urls.description'}}
-  <button class="btn pull-right" {{action "exportScreenedUrlList"}} title="{{i18n 'admin.export_csv.button_title.screened_url'}}">{{fa-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
+  <button class="btn pull-right" {{action "exportScreenedUrlList"}} title="{{i18n 'admin.export_csv.button_title.screened_url'}}">{{d-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
 </p>
 <br>
 
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index f469ec266e..5df150c79f 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -1,36 +1,36 @@
 <div class="staff-action-logs-controls">
   {{#if filtersExists}}
-  <div>
+  <div class='staff-action-logs-filters'>
     <a {{action "clearAllFilters"}} class="clear-filters filter">
       <span class="label">{{i18n 'admin.logs.staff_actions.clear_filters'}}</span>
     </a>
     {{#if actionFilter}}
       <a {{action "clearFilter" "actionFilter"}} class="filter">
         <span class="label">{{i18n 'admin.logs.action'}}</span>: {{actionFilter}}
-        {{fa-icon "times-circle"}}
+        {{d-icon "times-circle"}}
       </a>
     {{/if}}
     {{#if filters.acting_user}}
       <a {{action "clearFilter" "acting_user"}} class="filter">
         <span class="label">{{i18n 'admin.logs.staff_actions.staff_user'}}</span>: {{filters.acting_user}}
-        {{fa-icon "times-circle"}}
+        {{d-icon "times-circle"}}
       </a>
     {{/if}}
     {{#if filters.target_user}}
       <a {{action "clearFilter" "target_user"}} class="filter">
         <span class="label">{{i18n 'admin.logs.staff_actions.target_user'}}</span>: {{filters.target_user}}
-        {{fa-icon "times-circle"}}
+        {{d-icon "times-circle"}}
       </a>
     {{/if}}
     {{#if filters.subject}}
       <a {{action "clearFilter" "subject"}} class="filter">
         <span class="label">{{i18n 'admin.logs.staff_actions.subject'}}</span>: {{filters.subject}}
-        {{fa-icon "times-circle"}}
+        {{d-icon "times-circle"}}
       </a>
     {{/if}}
   </div>
   {{else}}
-    {{i18n "admin.logs.staff_actions.filter"}} {{combo-box content=userHistoryActions nameProperty="name" value=filterActionId none="admin.logs.staff_actions.all"}}
+    {{i18n "admin.logs.staff_actions.filter"}} {{combo-box content=userHistoryActions value=filterActionId none="admin.logs.staff_actions.all"}}
   {{/if}}
 
   <div class="pull-right">
diff --git a/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs b/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
index 5023927af2..2bd1691a32 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
@@ -10,5 +10,5 @@
 
 <div class="modal-footer">
   {{d-button action="upload" disabled=disabled class='btn btn-primary' icon='upload' label='admin.customize.theme.upload'}}
-  <a href {{action "closeModal"}}>{{i18n 'cancel'}}</a>
+  {{d-modal-cancel close=(action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs b/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs
deleted file mode 100644
index 6f845b22c8..0000000000
--- a/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-{{#d-modal-body title="admin.flags.agree_flag_modal_title"}}
-  {{#if model.user_deleted}}
-    <button title="{{i18n 'admin.flags.agree_flag_restore_post_title'}}" {{action "agreeFlagRestorePost"}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye"></i>{{i18n 'admin.flags.agree_flag_restore_post'}}</button>
-  {{else}}
-    {{#unless model.postHidden}}
-      <button title="{{i18n 'admin.flags.agree_flag_hide_post_title'}}" {{action "agreeFlagHidePost"}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye-slash"></i>{{i18n 'admin.flags.agree_flag_hide_post'}}</button>
-    {{/unless}}
-  {{/if}}
-  <button title="{{i18n 'admin.flags.agree_flag_title'}}" {{action "agreeFlagKeepPost"}} class="btn"><i class="fa fa-thumbs-o-up"></i>{{i18n 'admin.flags.agree_flag'}}</button>
-  {{#if model.canDeleteAsSpammer}}
-    <button title="{{i18n 'admin.flags.delete_spammer_title'}}" {{action "deleteSpammer" model.user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n 'admin.flags.delete_spammer'}}</button>
-  {{/if}}
-{{/d-modal-body}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
index c22bd9d99d..70b0c1c3fc 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
@@ -24,7 +24,7 @@
 
     {{#if count_warning}}
       <div class="count-warning">
-        <p class="heading"><i class="fa fa-warning"></i> {{i18n 'admin.badges.preview.bad_count_warning.header'}}</p>
+        <p class="heading">{{d-icon "warning"}} {{i18n 'admin.badges.preview.bad_count_warning.header'}}</p>
         <p class="body">{{i18n 'admin.badges.preview.bad_count_warning.text'}}</p>
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs b/app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs
index 5286bbf0b0..371c06df49 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs
@@ -2,11 +2,11 @@
   {{#d-modal-body title="admin.customize.colors.select_base.title"}}
     {{i18n "admin.customize.colors.select_base.description"}}
     {{combo-box content=model
-                   nameProperty="name"
                    value=selectedBaseThemeId
+                   allowInitialValueMutation=true
                    valueAttribute="base_scheme_id"}}
   {{/d-modal-body}}
   <div class="modal-footer">
-    <button class='btn btn-primary' {{action "selectBase"}}>{{fa-icon 'plus'}}{{i18n 'admin.customize.new'}}</button>
+    <button class='btn btn-primary' {{action "selectBase"}}>{{d-icon 'plus'}}{{i18n 'admin.customize.new'}}</button>
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-delete-flag.hbs b/app/assets/javascripts/admin/templates/modal/admin-delete-flag.hbs
deleted file mode 100644
index c2abeae36d..0000000000
--- a/app/assets/javascripts/admin/templates/modal/admin-delete-flag.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-{{#d-modal-body title="admin.flags.delete_flag_modal_title"}}
-  <button title="{{i18n 'admin.flags.delete_post_defer_flag_title'}}" {{action "deletePostDeferFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-external-link"></i>{{i18n 'admin.flags.delete_post_defer_flag'}}</button>
-  <button title="{{i18n 'admin.flags.delete_post_agree_flag_title'}}" {{action "deletePostAgreeFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-thumbs-o-up"></i>{{i18n 'admin.flags.delete_post_agree_flag'}}</button>
-  {{#if model.canDeleteAsSpammer}}
-    <button title="{{i18n 'admin.flags.delete_spammer_title'}}" {{action "deleteSpammer" model.user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n 'admin.flags.delete_spammer'}}</button>
-  {{/if}}
-{{/d-modal-body}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs b/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
index 80eb0844b3..22a87af0df 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
@@ -5,15 +5,15 @@
       <li>
         {{#if wc.editing}}
           {{input value=wc.name}}
-          <button {{action "save" wc}} class="btn no-text">{{fa-icon 'check'}}</button>
+          <button {{action "save" wc}} class="btn no-text">{{d-icon 'check'}}</button>
         {{else}}
           {{wc.displayName}}
         {{/if}}
         <div class='actions'>
-          <button {{action "edit" wc}} class="btn no-text" disabled={{wc.system}}>{{fa-icon 'pencil'}}</button>
-          <button {{action "up" wc}} class="btn no-text">{{fa-icon 'toggle-up'}}</button>
-          <button {{action "down" wc}} class="btn no-text">{{fa-icon 'toggle-down'}}</button>
-          <button {{action "delete" wc}} class="btn no-text btn-danger" disabled={{wc.system}}>{{fa-icon 'times'}}</button>
+          <button {{action "edit" wc}} class="btn no-text" disabled={{wc.system}}>{{d-icon 'pencil'}}</button>
+          <button {{action "up" wc}} class="btn no-text">{{d-icon 'toggle-up'}}</button>
+          <button {{action "down" wc}} class="btn no-text">{{d-icon 'toggle-down'}}</button>
+          <button {{action "delete" wc}} class="btn no-text btn-danger" disabled={{wc.system}}>{{d-icon 'times'}}</button>
         </div>
       </li>
     {{/each}}
@@ -24,5 +24,5 @@
 
 <div class="modal-footer">
   <button class='btn btn-primary' {{action "saveAll"}} disabled={{submitDisabled}}>{{i18n 'admin.badges.save'}}</button>
-  <a {{action "cancel"}}>{{i18n 'cancel'}}</a>
+  {{d-modal-cancel close=(action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-import-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-import-theme.hbs
index 7c4058d52d..19d7065db6 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-import-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-import-theme.hbs
@@ -23,5 +23,5 @@
 
 <div class="modal-footer">
   {{d-button action="importTheme" disabled=loading class='btn btn-primary' icon='upload' label='admin.customize.import'}}
-  <a href {{action "closeModal"}}>{{i18n 'cancel'}}</a>
+  {{d-modal-cancel close=(action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-moderation-history.hbs b/app/assets/javascripts/admin/templates/modal/admin-moderation-history.hbs
new file mode 100644
index 0000000000..4abc13e7f3
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/modal/admin-moderation-history.hbs
@@ -0,0 +1,23 @@
+{{#d-modal-body title="admin.flags.moderation_history"}}
+  {{#conditional-loading-spinner condition=loading}}
+    {{#if history}}
+      <table class='moderation-history'>
+        <tr>
+          <th>{{i18n "admin.logs.created_at"}}</th>
+          <th>{{i18n "admin.logs.action"}}</th>
+          <th>{{i18n "admin.moderation_history.performed_by"}}</th>
+        </tr>
+        {{#each history as |item|}}
+          {{moderation-history-item item=item}}
+        {{/each}}
+      </table>
+    {{else}}
+      <div class='no-results'>
+        {{i18n "admin.moderation_history.no_results"}}
+      </div>
+    {{/if}}
+  {{/conditional-loading-spinner}}
+{{/d-modal-body}}
+<div class="modal-footer">
+  {{d-button action=(action "closeModal") label="close"}}
+</div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
new file mode 100644
index 0000000000..0abe77544c
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
@@ -0,0 +1,50 @@
+{{#d-modal-body title="admin.user.silence_modal_title"}}
+  {{#conditional-loading-spinner condition=loadingUser}}
+
+    <div class='until-controls'>
+      <label>
+        {{future-date-input
+          class="silence-until"
+          label="admin.user.silence_duration"
+          includeFarFuture=true
+          input=silenceUntil}}
+      </label>
+    </div>
+
+    <div class='reason-controls'>
+      <label>
+        <div class='silence-reason-label'>
+          {{{i18n 'admin.user.silence_reason_label'}}}
+        </div>
+        </label>
+        {{text-field
+          value=reason
+          class="silence-reason"
+          placeholderKey="admin.user.silence_reason_placeholder"}}
+    </div>
+
+    <label>
+      <div class='silence-message-label'>
+        {{i18n "admin.user.silence_message"}}
+      </div>
+    </label>
+    {{textarea
+      value=message
+      class="silence-message"
+      placeholder=(i18n "admin.user.silence_message_placeholder")}}
+
+
+  {{/conditional-loading-spinner}}
+
+{{/d-modal-body}}
+
+<div class="modal-footer">
+  {{d-button
+    class="btn-danger perform-silence"
+    action="silence"
+    disabled=submitDisabled
+    icon="microphone-slash"
+    label="admin.user.silence"}}
+  {{d-modal-cancel close=(action "closeModal")}}
+  {{conditional-loading-spinner condition=loading size="small"}}
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/templates/modal/admin-staff-action-log-details.hbs b/app/assets/javascripts/admin/templates/modal/admin-staff-action-log-details.hbs
index f63be2d098..e8e8cd8d2e 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-staff-action-log-details.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-staff-action-log-details.hbs
@@ -2,5 +2,5 @@
   <pre>{{model.details}}</pre>
 {{/d-modal-body}}
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action "closeModal"}}>{{i18n 'close'}}</button>
+  {{d-button action=(action "closeModal") label="close"}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
index 9d9326ad3e..fc6025a6a6 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
@@ -1,16 +1,59 @@
 {{#d-modal-body title="admin.user.suspend_modal_title"}}
-  <form>
-    {{i18n 'admin.user.suspend_duration'}}
-    {{text-field value=duration maxlength="5" autofocus="autofocus"}}
-    {{i18n 'admin.user.suspend_duration_units'}}<br/>
-    <br/>
-    {{{i18n 'admin.user.suspend_reason_label'}}}<br/>
-    <br/>
-    {{text-field value=reason class="span8"}}
-  </form>
+  {{#conditional-loading-spinner condition=loadingUser}}
+
+    {{#if user.canSuspend}}
+      <div class='until-controls'>
+        <label>
+          {{future-date-input
+            class="suspend-until"
+            label="admin.user.suspend_duration"
+            includeFarFuture=true
+            input=suspendUntil}}
+        </label>
+      </div>
+
+      <div class='reason-controls'>
+        <label>
+          <div class='suspend-reason-label'>
+            {{#if siteSettings.hide_suspension_reasons}}
+              {{{i18n 'admin.user.suspend_reason_hidden_label'}}}
+            {{else}}
+              {{{i18n 'admin.user.suspend_reason_label'}}}
+            {{/if}}
+          </div>
+        </label>
+        {{text-field
+          value=reason
+          class="suspend-reason"
+          placeholderKey="admin.user.suspend_reason_placeholder"}}
+      </div>
+
+      <label>
+        <div class='suspend-message-label'>
+          {{i18n "admin.user.suspend_message"}}
+        </div>
+      </label>
+      {{textarea
+          value=message
+          class="suspend-message"
+          placeholder=(i18n "admin.user.suspend_message_placeholder")}}
+    {{else}}
+      <div class='cant-suspend'>
+        {{i18n "admin.user.cant_suspend"}}
+      </div>
+    {{/if}}
+
+  {{/conditional-loading-spinner}}
+
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  <button class='btn btn-danger' {{action "suspend"}} disabled={{submitDisabled}}><i class='fa fa-ban'></i>{{i18n 'admin.user.suspend'}}</button>
-  <a {{action "closeModal"}}>{{i18n 'cancel'}}</a>
+  {{d-button
+    class="btn-danger perform-suspend"
+    action="suspend"
+    disabled=submitDisabled
+    icon="ban"
+    label="admin.user.suspend"}}
+  {{d-modal-cancel close=(action "closeModal")}}
+  {{conditional-loading-spinner condition=loading size="small"}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/reports.hbs b/app/assets/javascripts/admin/templates/reports.hbs
index 57acba8f50..3927d1e384 100644
--- a/app/assets/javascripts/admin/templates/reports.hbs
+++ b/app/assets/javascripts/admin/templates/reports.hbs
@@ -4,10 +4,10 @@
   {{i18n 'admin.dashboard.reports.start_date'}} {{date-picker-past value=startDate defaultDate=startDate}}
   {{i18n 'admin.dashboard.reports.end_date'}} {{date-picker-past value=endDate defaultDate=endDate}}
   {{#if showCategoryOptions}}
-    {{combo-box valueAttribute="value" content=categoryOptions value=categoryId}}
+    {{combo-box filterable=true valueAttribute="value" content=categoryOptions value=categoryId}}
   {{/if}}
   {{#if showGroupOptions}}
-    {{combo-box valueAttribute="value" content=groupOptions value=groupId}}
+    {{combo-box filterable=true valueAttribute="value" content=groupOptions value=groupId}}
   {{/if}}
   {{d-button action="refreshReport" class="btn-primary" label="admin.dashboard.reports.refresh_report" icon="refresh"}}
   {{d-button action="exportCsv" label="admin.export_csv.button_text" icon="download"}}
diff --git a/app/assets/javascripts/admin/templates/search-logs-index.hbs b/app/assets/javascripts/admin/templates/search-logs-index.hbs
new file mode 100644
index 0000000000..257155b4b5
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/search-logs-index.hbs
@@ -0,0 +1,33 @@
+<p>
+  {{period-chooser period=period}}
+  {{combo-box content=searchTypeOptions value=searchType class='search-logs-filter'}}
+</p>
+<br>
+
+{{#conditional-loading-spinner condition=loading}}
+  {{#if model.length}}
+
+    <div class='table search-logs-list'>
+      <div class="heading-container">
+        <div class="col heading term">{{i18n 'admin.logs.search_logs.term'}}</div>
+        <div class="col heading">{{i18n 'admin.logs.search_logs.searches'}}</div>
+        <div class="col heading">{{i18n 'admin.logs.search_logs.click_through'}}</div>
+        <div class="col heading" title="{{i18n 'admin.logs.search_logs.unique_title'}}">{{i18n 'admin.logs.search_logs.unique'}}</div>
+      </div>
+
+      {{#each model as |item|}}
+        <div class="admin-list-item">
+          <div class="col term">
+            {{#link-to 'adminSearchLogs.term' item.term}}{{item.term}}{{/link-to}}
+          </div>
+          <div class="col">{{item.searches}}</div>
+          <div class="col">{{item.click_through}}</div>
+          <div class="col">{{item.unique}}</div>
+        </div>
+      {{/each}}
+    </div>
+
+  {{else}}
+    {{i18n 'search.no_results'}}
+  {{/if}}
+{{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/templates/search-logs-term.hbs
new file mode 100644
index 0000000000..c405a86d35
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/search-logs-term.hbs
@@ -0,0 +1,13 @@
+<p>
+  {{period-chooser period=period}}
+  {{combo-box content=searchTypeOptions value=searchType class='search-logs-filter'}}
+</p>
+<br>
+
+<h2>
+  {{#link-to 'full-page-search' (query-params q=term)}}{{term}}{{/link-to}}
+</h2>
+
+{{#conditional-loading-spinner condition=refreshing}}
+  {{admin-graph model=model}}
+{{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/site-settings.hbs b/app/assets/javascripts/admin/templates/site-settings.hbs
index 5fd9545932..4561129eb8 100644
--- a/app/assets/javascripts/admin/templates/site-settings.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings.hbs
@@ -15,14 +15,14 @@
 <div class="admin-nav pull-left">
   <ul class="nav nav-stacked">
     {{#each model as |category|}}
-      {{#link-to 'adminSiteSettingsCategory' category.nameKey tagName='li' class=category.nameKey}}
+      <li class="{{category.nameKey}}">
         {{#link-to 'adminSiteSettingsCategory' category.nameKey class=category.nameKey}}
           {{category.name}}
           {{#if filtered}}
             {{#if category.count}}<span class="count">({{category.count}})</span>{{/if}}
           {{/if}}
         {{/link-to}}
-      {{/link-to}}
+      </li>
     {{/each}}
   </ul>
 </div>
diff --git a/app/assets/javascripts/admin/templates/site-text-edit.hbs b/app/assets/javascripts/admin/templates/site-text-edit.hbs
index 5e02eb0731..4e134433d8 100644
--- a/app/assets/javascripts/admin/templates/site-text-edit.hbs
+++ b/app/assets/javascripts/admin/templates/site-text-edit.hbs
@@ -13,7 +13,7 @@
   {{/save-controls}}
 
   {{#link-to 'adminSiteText.index' class="go-back"}}
-    {{fa-icon 'arrow-left'}}
+    {{d-icon 'arrow-left'}}
     {{i18n 'admin.site_text.go_back'}}
   {{/link-to}}
 
diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
index 393695e842..1f6bae617c 100644
--- a/app/assets/javascripts/admin/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/templates/user-badges.hbs
@@ -1,7 +1,7 @@
 <div class='admin-controls'>
   <div class='span15'>
     <ul class='nav nav-pills'>
-      <li>{{#link-to 'adminUser' user}}<i class="fa fa-caret-left"></i> &nbsp;{{user.username}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUser' user}}{{d-icon "caret-left"}} &nbsp;{{user.username}}{{/link-to}}</li>
     </ul>
   </div>
 </div>
@@ -16,7 +16,7 @@
     <form class="form-horizontal">
       <div>
       <label>{{i18n 'admin.badges.badge'}}</label>
-      {{combo-box valueAttribute="id" value=selectedBadgeId content=grantableBadges nameProperty="name"}}
+      {{combo-box filterable=true value=selectedBadgeId content=grantableBadges}}
       </div>
       <label>
       <label>{{i18n 'admin.badges.reason'}}</label>
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index f6a7a2d75e..96f962a0b5 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -1,9 +1,8 @@
 <section class="details {{unless model.active 'not-activated'}}">
-
   <div class='user-controls'>
     {{#if model.canViewProfile}}
       {{#link-to 'user' model class="btn"}}
-        {{fa-icon "user"}}
+        {{d-icon "user"}}
         {{i18n 'admin.user.show_public_profile'}}
       {{/link-to}}
     {{/if}}
@@ -18,6 +17,7 @@
         {{d-button action="logOut" icon="power-off" label="admin.user.log_out"}}
       {{/if}}
     {{/if}}
+    {{plugin-outlet name="admin-user-controls-after" args=(hash model=model) tagName="" connectorTagName=""}}
   </div>
 
   <div class='display-row username'>
@@ -151,7 +151,7 @@
         {{i18n 'badges.badge_count' count=model.badge_count}}
       </div>
       <div class='controls'>
-        {{#link-to 'adminUser.badges' model class="btn"}}{{fa-icon "certificate"}}{{i18n 'admin.badges.edit_badges'}}{{/link-to}}
+        {{#link-to 'adminUser.badges' model class="btn"}}{{d-icon "certificate"}}{{i18n 'admin.badges.edit_badges'}}{{/link-to}}
       </div>
     </div>
   {{/if}}
@@ -174,6 +174,8 @@
   </section>
 {{/if}}
 
+{{plugin-outlet name="admin-user-details" args=(hash model=model)}}
+
 <section class='details'>
   <h1>{{i18n 'admin.user.permissions'}}</h1>
 
@@ -221,6 +223,12 @@
     </div>
   </div>
 
+  <div class="display-row">
+    <div class='field'>{{i18n 'admin.user.staged'}}</div>
+    <div class='value'>{{i18n-yes-no model.staged}}</div>
+    <div class='controls'>{{i18n 'admin.user.staged_explanation'}}</div>
+  </div>
+
   {{#if currentUser.admin}}
     <div class='display-row'>
       <div class='field'>{{i18n 'admin.api.key'}}</div>
@@ -280,10 +288,12 @@
     </div>
     <div class="controls">
       {{#if model.canLockTrustLevel}}
-        {{#if model.trust_level_locked}}
-          <i title='{{i18n 'admin.user.trust_level_locked_tip'}}' class='fa fa-lock'></i> {{d-button action="lockTrustLevel" actionParam=false label="admin.user.unlock_trust_level"}}
+        {{#if model.manual_locked_trust_level}}
+          {{d-icon "lock" title="admin.user.trust_level_locked_tip"}}
+          {{d-button action="lockTrustLevel" actionParam=false label="admin.user.unlock_trust_level"}}
         {{else}}
-          <i title='{{i18n 'admin.user.trust_level_unlocked_tip'}}' class='fa fa-unlock'></i> {{d-button action="lockTrustLevel" actionParam=true label="admin.user.lock_trust_level"}}
+          {{d-icon "unlock" title="admin.user.trust_level_unlocked_tip"}}
+          {{d-button action="lockTrustLevel" actionParam=true label="admin.user.lock_trust_level"}}
         {{/if}}
       {{/if}}
       {{#if model.tl3Requirements}}
@@ -292,25 +302,39 @@
     </div>
   </div>
 
-    <div class="display-row {{if model.isSuspended 'highlight-danger'}}">
-    <div class='field'>{{i18n 'admin.user.suspended'}}</div>
-    <div class='value'>{{i18n-yes-no model.isSuspended}}</div>
-    <div class='controls'>
-    {{#if model.isSuspended}}
-      {{d-button class="btn-danger" action="unsuspend" icon="ban" label="admin.user.unsuspend"}}
-      {{suspendDuration}}
-      {{i18n 'admin.user.suspended_explanation'}}
-    {{else}}
-      {{#if model.canSuspend}}
-        {{d-button class="btn-danger" action="showSuspendModal" actionParam=model icon="ban" label="admin.user.suspend"}}
+    <div class="user-suspended display-row {{if model.isSuspended 'highlight-danger'}}">
+      <div class='field'>{{i18n 'admin.user.suspended'}}</div>
+      <div class='value'>
+        {{i18n-yes-no model.isSuspended}}
+        {{#if model.isSuspended}}
+          {{#unless model.suspendedForever}}
+            {{i18n "admin.user.suspended_until" until=model.suspendedTillDate}}
+          {{/unless}}
+        {{/if}}
+      </div>
+      <div class='controls'>
+      {{#if model.isSuspended}}
+        {{d-button
+          class="btn-danger unsuspend-user"
+          action=(action "unsuspend")
+          icon="ban"
+          label="admin.user.unsuspend"}}
         {{i18n 'admin.user.suspended_explanation'}}
+      {{else}}
+        {{#if model.canSuspend}}
+          {{d-button
+            class="btn-danger suspend-user"
+            action=(action "showSuspendModal")
+            icon="ban"
+            label="admin.user.suspend"}}
+          {{i18n 'admin.user.suspended_explanation'}}
+        {{/if}}
       {{/if}}
-    {{/if}}
     </div>
   </div>
 
   {{#if model.isSuspended}}
-    <div class='display-row highlight-danger'>
+    <div class='display-row highlight-danger suspension-info'>
       <div class='field'>{{i18n 'admin.user.suspended_by'}}</div>
       <div class='value'>
         {{#link-to 'adminUser' suspendedBy}}{{avatar model.suspendedBy imageSize="tiny"}}{{/link-to}}
@@ -318,32 +342,56 @@
       </div>
       <div class='controls'>
         <b>{{i18n 'admin.user.suspend_reason'}}</b>:
-        {{model.suspend_reason}}
+        <div class='full-reason'>{{model.full_suspend_reason}}</div>
       </div>
     </div>
   {{/if}}
 
-  <div class="display-row {{if model.blocked 'highlight-danger'}}">
-    <div class='field'>{{i18n 'admin.user.blocked'}}</div>
-    <div class='value'>{{i18n-yes-no model.blocked}}</div>
+  <div class="display-row {{if model.silenced 'highlight-danger'}}">
+    <div class='field'>{{i18n 'admin.user.silenced'}}</div>
+    <div class='value'>
+      {{i18n-yes-no model.silenced}}
+      {{#if model.isSilenced}}
+        {{#unless model.silencedForever}}
+          {{i18n "admin.user.suspended_until" until=model.silencedTillDate}}
+        {{/unless}}
+      {{/if}}
+    </div>
     <div class='controls'>
-      {{#conditional-loading-spinner size="small" condition=model.blockingUser}}
-        {{#if model.blocked}}
-          {{d-button action="unblock" icon="thumbs-o-up" label="admin.user.unblock"}}
-          {{i18n 'admin.user.block_explanation'}}
+      {{#conditional-loading-spinner size="small" condition=model.silencingUser}}
+        {{#if model.silenced}}
+          {{d-button
+            class="btn-danger unsilence-user"
+            action="unsilence"
+            icon="microphone-slash"
+            label="admin.user.unsilence"}}
+          {{i18n 'admin.user.silence_explanation'}}
         {{else}}
-          {{d-button action="block" icon="ban" label="admin.user.block"}}
-          {{i18n 'admin.user.block_explanation'}}
+          {{d-button
+            class="btn-danger silence-user"
+            action=(action "showSilenceModal")
+            icon="microphone-slash"
+            label="admin.user.silence"}}
+          {{i18n 'admin.user.silence_explanation'}}
         {{/if}}
       {{/conditional-loading-spinner}}
     </div>
   </div>
 
-  <div class="display-row">
-    <div class='field'>{{i18n 'admin.user.staged'}}</div>
-    <div class='value'>{{i18n-yes-no model.staged}}</div>
-    <div class='controls'>{{i18n 'admin.user.staged_explanation'}}</div>
-  </div>
+  {{#if model.isSilenced}}
+    <div class='display-row highlight-danger silence-info'>
+      <div class='field'>{{i18n 'admin.user.silenced_by'}}</div>
+      <div class='value'>
+        {{#link-to 'adminUser' silencedBy}}{{avatar model.silencedBy imageSize="tiny"}}{{/link-to}}
+        {{#link-to 'adminUser' silencedBy}}{{model.silencedBy.username}}{{/link-to}}
+      </div>
+      <div class='controls'>
+        <b>{{i18n 'admin.user.silence_reason'}}</b>:
+        <div class='full-reason'>{{model.silence_reason}}</div>
+      </div>
+    </div>
+  {{/if}}
+
 </section>
 
 {{#if currentUser.admin}}
@@ -361,7 +409,7 @@
         <div class='controls'>
           {{#if model.customGroups}}
             {{i18n 'admin.groups.primary'}}
-            {{combo-box content=model.customGroups value=model.primary_group_id nameProperty="name" none="admin.groups.no_primary"}}
+            {{combo-box content=model.customGroups value=model.primary_group_id none="admin.groups.no_primary"}}
           {{/if}}
           {{#if primaryGroupDirty}}
             {{d-button icon="check" class="ok" action="savePrimaryGroup"}}
@@ -381,7 +429,7 @@
   </div>
   <div class='display-row'>
     <div class='field'>{{i18n 'admin.users.last_emailed'}}</div>
-    <div class='value'>{{format-date model.last_emailed_at leaveAgo="true"}}</div>
+    <div class='value'>{{format-date model.last_emailed_at}}</div>
   </div>
   <div class='display-row'>
     <div class='field'>{{i18n 'last_seen'}}</div>
@@ -426,7 +474,7 @@
   </div>
   <div class='display-row'>
     <div class='field'>{{i18n 'admin.user.time_read'}}</div>
-    <div class='value'>{{{model.time_read}}}</div>
+    <div class='value'>{{{format-duration model.time_read}}}</div>
   </div>
   <div class='display-row'>
     <div class='field'>{{i18n 'user.invited.days_visited'}}</div>
@@ -464,7 +512,7 @@
 {{/if}}
 
 <section>
-  <hr/>
+  <hr>
   <div class="pull-right">
     {{#unless model.anonymizeForbidden}}
       {{d-button label="admin.user.anonymize"
@@ -485,9 +533,9 @@
 
   {{#if model.deleteExplanation}}
     <div class="clearfix"></div>
-    <br/>
+    <br>
     <div class="pull-right">
-      {{fa-icon "exclamation-triangle"}} {{model.deleteExplanation}}
+      {{d-icon "exclamation-triangle"}} {{model.deleteExplanation}}
     </div>
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
index e0536ddd08..1561a95670 100644
--- a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
+++ b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
@@ -1,7 +1,7 @@
 <div class='admin-controls'>
   <div class='span15'>
     <ul class="nav nav-pills">
-      <li>{{#link-to 'adminUser' model}}<i class="fa fa-caret-left"></i> &nbsp;{{model.username}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUser' model}}{{d-icon "caret-left"}} &nbsp;{{model.username}}{{/link-to}}</li>
       <li>{{#link-to 'adminUsersList.show' 'member'}}{{i18n 'admin.user.trust_level_2_users'}}{{/link-to}}</li>
     </ul>
   </div>
@@ -24,7 +24,7 @@
     <tbody>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.visits'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.days_visited 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.days_visited}}</td>
         <td>
           {{model.tl3Requirements.days_visited_percent}}% ({{model.tl3Requirements.days_visited}} / {{model.tl3Requirements.time_period}} {{i18n 'admin.user.tl3_requirements.days'}})
         </td>
@@ -32,67 +32,67 @@
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.topics_replied_to'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.topics_replied_to 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.topics_replied_to}}</td>
         <td>{{model.tl3Requirements.num_topics_replied_to}}</td>
         <td>{{model.tl3Requirements.min_topics_replied_to}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.topics_viewed'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.topics_viewed 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.topics_viewed}}</td>
         <td>{{model.tl3Requirements.topics_viewed}}</td>
         <td>{{model.tl3Requirements.min_topics_viewed}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.topics_viewed_all_time'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.topics_viewed_all_time 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.topics_viewed_all_time}}</td>
         <td>{{model.tl3Requirements.topics_viewed_all_time}}</td>
         <td>{{model.tl3Requirements.min_topics_viewed_all_time}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.posts_read'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.posts_read 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.posts_read}}</td>
         <td>{{model.tl3Requirements.posts_read}}</td>
         <td>{{model.tl3Requirements.min_posts_read}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.posts_read_all_time'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.posts_read_all_time 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.posts_read_all_time}}</td>
         <td>{{model.tl3Requirements.posts_read_all_time}}</td>
         <td>{{model.tl3Requirements.min_posts_read_all_time}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.flagged_posts'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.flagged_posts 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.flagged_posts}}</td>
         <td>{{model.tl3Requirements.num_flagged_posts}}</td>
         <td>{{i18n 'max_of_count' count=model.tl3Requirements.max_flagged_posts}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.flagged_by_users'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.flagged_by_users 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.flagged_by_users}}</td>
         <td>{{model.tl3Requirements.num_flagged_by_users}}</td>
         <td>{{i18n 'max_of_count' count=model.tl3Requirements.max_flagged_by_users}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.likes_given'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.likes_given 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.likes_given}}</td>
         <td>{{model.tl3Requirements.num_likes_given}}</td>
         <td>{{model.tl3Requirements.min_likes_given}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.likes_received'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.likes_received 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.likes_received}}</td>
         <td>{{model.tl3Requirements.num_likes_received}}</td>
         <td>{{model.tl3Requirements.min_likes_received}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.likes_received_days'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.likes_received_days 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.likes_received_days}}</td>
         <td>{{model.tl3Requirements.num_likes_received_days}}</td>
         <td>{{model.tl3Requirements.min_likes_received_days}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.likes_received_users'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.likes_received_users 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.likes_received_users}}</td>
         <td>{{model.tl3Requirements.num_likes_received_users}}</td>
         <td>{{model.tl3Requirements.min_likes_received_users}}</td>
       </tr>
@@ -105,16 +105,16 @@
       {{#if model.tl3Requirements.requirements_lost}}
         {{! tl implicitly not locked }}
         {{#if model.tl3Requirements.on_grace_period}}
-          <i class="fa fa-times"></i> {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
+          {{d-icon "times"}} {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
         {{else}} {{! not on grace period }}
-          <i class="fa fa-times"></i> {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
+          {{d-icon "times"}} {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
                                       {{i18n 'admin.user.tl3_requirements.will_be_demoted'}}
         {{/if}}
       {{else}} {{! requirements not lost - remains tl3 }}
         {{#if model.tl3Requirements.trust_level_locked}}
-          <i class="fa fa-lock"></i> {{i18n 'admin.user.tl3_requirements.locked_will_not_be_demoted'}}
+          {{d-icon "lock"}} {{i18n 'admin.user.tl3_requirements.locked_will_not_be_demoted'}}
         {{else}} {{! tl not locked }}
-          <i class="fa fa-check"></i> {{i18n 'admin.user.tl3_requirements.qualifies'}}
+          {{d-icon "check"}} {{i18n 'admin.user.tl3_requirements.qualifies'}}
           {{#if model.tl3Requirements.on_grace_period}}
             {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
           {{/if}}
@@ -123,13 +123,13 @@
     {{else}} {{! is not tl3 }}
       {{#if model.tl3Requirements.requirements_met}}
         {{! met & not tl3 - will be promoted}}
-        <i class="fa fa-check"></i> {{i18n 'admin.user.tl3_requirements.qualifies'}}
+        {{d-icon "check"}} {{i18n 'admin.user.tl3_requirements.qualifies'}}
                                     {{i18n 'admin.user.tl3_requirements.will_be_promoted'}}
       {{else}} {{! requirements not met - remains regular }}
         {{#if model.tl3Requirements.trust_level_locked}}
-          <i class="fa fa-lock"></i> {{i18n 'admin.user.tl3_requirements.locked_will_not_be_promoted'}}
+          {{d-icon "lock"}} {{i18n 'admin.user.tl3_requirements.locked_will_not_be_promoted'}}
         {{else}}
-          <i class="fa fa-times"></i> {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
+          {{d-icon "times"}} {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
         {{/if}}
       {{/if}}
     {{/if}}
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index cc0c5ce09e..0ccaee0251 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -6,15 +6,13 @@
 {{/if}}
 
 <div class="admin-title">
-  <div class="pull-left">
-    <h2>{{title}}</h2>
-  </div>
+  <h2>{{title}}</h2>
 </div>
 <div class='username controls'>
   {{text-field value=listFilter placeholder=searchHint}}
   {{#unless showEmails}}
     <div class="pull-right">
-      <button {{action "showEmails"}} class="btn">{{i18n 'admin.users.show_emails'}}</button>
+      <button {{action "showEmails"}} class="show-emails btn">{{i18n 'admin.users.show_emails'}}</button>
     </div>
   {{/unless}}
 </div>
@@ -28,7 +26,7 @@
         {{/if}}
         <th>&nbsp;</th>
         <th>{{i18n 'username'}}</th>
-        <th>{{i18n 'email'}}</th>
+        <th class='email-heading'>{{i18n 'email'}}</th>
         <th>{{i18n 'admin.users.last_emailed'}}</th>
         {{admin-directory-toggle field="seen" i18nKey='last_seen' order=order ascending=ascending}}
         {{admin-directory-toggle field="topics_viewed" i18nKey="admin.user.topics_entered" order=order ascending=ascending}}
@@ -55,17 +53,20 @@
                 {{avatar user imageSize="small"}}
               </a>
             </td>
-            <td>
+            <td class="username">
               {{#link-to 'adminUser' user}}{{unbound user.username}}{{/link-to}}
+              {{#if user.staged}}
+                {{d-icon "envelope-o" title="user.staged" }}
+              {{/if}}
             </td>
             <td class='email'>
               {{unbound user.email}}
             </td>
             <td>
-              {{{unbound user.last_emailed_age}}}
+              {{{format-duration user.last_emailed_age}}}
             </td>
             <td>
-              {{{unbound user.last_seen_age}}}
+              {{{format-duration user.last_seen_age}}}
             </td>
             <td>
               {{number user.topics_entered}}
@@ -74,11 +75,11 @@
               {{number user.posts_read_count}}
             </td>
             <td>
-              {{{unbound user.time_read}}}
+              {{{format-duration user.time_read}}}
             </td>
 
             <td>
-              {{{unbound user.created_at_age}}}
+              {{{format-duration user.created_at_age}}}
             </td>
 
             {{#if showApproval}}
@@ -92,10 +93,10 @@
             {{/if}}
             <td>
               {{#if user.admin}}
-                {{fa-icon "shield" title="admin.title" }}
+                {{d-icon "shield" title="admin.title" }}
               {{/if}}
               {{#if user.moderator}}
-                {{fa-icon "shield" title="admin.moderator" }}
+                {{d-icon "shield" title="admin.moderator" }}
               {{/if}}
             </td>
           </tr>
diff --git a/app/assets/javascripts/admin/templates/users-list.hbs b/app/assets/javascripts/admin/templates/users-list.hbs
index d37a9ae267..398732685b 100644
--- a/app/assets/javascripts/admin/templates/users-list.hbs
+++ b/app/assets/javascripts/admin/templates/users-list.hbs
@@ -8,7 +8,7 @@
       {{/if}}
       {{nav-item route='adminUsersList.show' routeParam='staff' label='admin.users.nav.staff'}}
       {{nav-item route='adminUsersList.show' routeParam='suspended' label='admin.users.nav.suspended'}}
-      {{nav-item route='adminUsersList.show' routeParam='blocked' label='admin.users.nav.blocked'}}
+      {{nav-item route='adminUsersList.show' routeParam='silenced' label='admin.users.nav.silenced'}}
       {{nav-item route='adminUsersList.show' routeParam='suspect' label='admin.users.nav.suspect'}}
     </ul>
   </div>
diff --git a/app/assets/javascripts/admin/templates/version-checks.hbs b/app/assets/javascripts/admin/templates/version-checks.hbs
index 25c560ad6a..a8724b7e5a 100644
--- a/app/assets/javascripts/admin/templates/version-checks.hbs
+++ b/app/assets/javascripts/admin/templates/version-checks.hbs
@@ -18,19 +18,19 @@
       {{#if versionCheck.noCheckPerformed}}
         <td class="version-number">&mdash;</td>
         <td class="face">
-          <span class="icon critical-updates-available">{{fa-icon "frown-o"}}</span>
+          <span class="icon critical-updates-available">{{d-icon "frown-o"}}</span>
         </td>
         <td class="version-notes">
           <span class="normal-note">{{i18n 'admin.dashboard.no_check_performed'}}</span>
         </td>
       {{else}}
-        {{#if versionCheck.staleData}}
+        {{#if versionCheck.stale_data}}
           <td class="version-number">{{#if versionCheck.version_check_pending}}{{dash-if-empty versionCheck.installed_version}}{{/if}}</td>
           <td class="face">
             {{#if versionCheck.version_check_pending}}
-              <span class='icon up-to-date'>{{fa-icon "smile-o"}}</span>
+              <span class='icon up-to-date'>{{d-icon "smile-o"}}</span>
             {{else}}
-              <span class="icon critical-updates-available">{{fa-icon "frown-o"}}</span>
+              <span class="icon critical-updates-available">{{d-icon "frown-o"}}</span>
             {{/if}}
           </td>
           <td class="version-notes">
@@ -46,13 +46,13 @@
           <td class="version-number">{{dash-if-empty versionCheck.latest_version}}</td>
           <td class="face">
             {{#if versionCheck.upToDate }}
-            <span class='icon up-to-date'>{{fa-icon "smile-o"}}</span>
+            <span class='icon up-to-date'>{{d-icon "smile-o"}}</span>
             {{else}}
               <span class="icon {{if versionCheck.critical_updates 'critical-updates-available' 'updates-available'}}">
                 {{#if versionCheck.behindByOneVersion}}
-                  {{fa-icon "meh-o"}}
+                  {{d-icon "meh-o"}}
                 {{else}}
-                  {{fa-icon "frown-o"}}
+                  {{d-icon "frown-o"}}
                 {{/if}}
               </span>
             {{/if}}
diff --git a/app/assets/javascripts/admin/templates/watched-words-action.hbs b/app/assets/javascripts/admin/templates/watched-words-action.hbs
new file mode 100644
index 0000000000..8377c28bd5
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/watched-words-action.hbs
@@ -0,0 +1,21 @@
+<h2>{{model.name}}</h2>
+
+<p class="about">{{actionDescription}}</p>
+
+{{watched-word-form
+  actionKey=actionNameKey
+  action="recordAdded"
+  regularExpressions=adminWatchedWords.regularExpressions}}
+
+{{watched-word-uploader uploading=uploading actionKey=actionNameKey done="uploadComplete"}}
+
+<div class='clearfix'></div>
+<div class="watched-words-list">
+  {{#if showWordsList}}
+    {{#each filteredContent as |word| }}
+      <div class="watched-word-box">{{admin-watched-word word=word action="recordRemoved"}}</div>
+    {{/each}}
+  {{else}}
+    {{i18n 'admin.watched_words.word_count' count=model.words.length}}
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/admin/templates/watched-words.hbs b/app/assets/javascripts/admin/templates/watched-words.hbs
new file mode 100644
index 0000000000..7bec3d8812
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/watched-words.hbs
@@ -0,0 +1,31 @@
+<div class='admin-controls'>
+  <div class='search controls'>
+    <label class="show-words-checkbox">
+      {{input type="checkbox" checked=showWords disabled=disableShowWords}}
+      {{i18n 'admin.watched_words.show_words'}}
+    </label>
+  </div>
+  <div class='controls'>
+    {{text-field value=filter placeholderKey="admin.watched_words.search" class="no-blur"}}
+    {{d-button action="clearFilter" label="admin.watched_words.clear_filter"}}
+  </div>
+</div>
+
+<div class="admin-nav pull-left">
+  <ul class="nav nav-stacked">
+    {{#each model as |action|}}
+      <li class="{{action.nameKey}}">
+        {{#link-to 'adminWatchedWords.action' action.nameKey}}
+          {{action.name}}
+          {{#if action.count}}<span class="count">({{action.count}})</span>{{/if}}
+        {{/link-to}}
+      </li>
+    {{/each}}
+  </ul>
+</div>
+
+<div class="admin-detail pull-left mobile-closed watched-words-detail">
+  {{outlet}}
+</div>
+
+<div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
index f3b8825e5b..e0d0609871 100644
--- a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
@@ -1,10 +1,10 @@
 <div class="web-hook-direction">
   {{#link-to 'adminWebHooks' tagName='button' classNames='btn'}}
-    {{fa-icon 'list'}} {{i18n 'admin.web_hooks.events.go_list'}}
+    {{d-icon 'list'}} {{i18n 'admin.web_hooks.events.go_list'}}
   {{/link-to}}
   {{d-button icon="send" label="admin.web_hooks.events.ping" action="ping" disabled=pingDisabled}}
   {{#link-to 'adminWebHooks.show' model.extras.web_hook_id tagName='button' classNames='btn'}}
-    {{fa-icon 'edit'}} {{i18n 'admin.web_hooks.events.go_details'}}
+    {{d-icon 'edit'}} {{i18n 'admin.web_hooks.events.go_details'}}
   {{/link-to}}
 </div>
 
diff --git a/app/assets/javascripts/admin/templates/web-hooks-show.hbs b/app/assets/javascripts/admin/templates/web-hooks-show.hbs
index c7a8e03088..ef9c478774 100644
--- a/app/assets/javascripts/admin/templates/web-hooks-show.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks-show.hbs
@@ -1,5 +1,5 @@
 {{#link-to 'adminWebHooks' class="go-back"}}
-  {{fa-icon 'arrow-left'}}
+  {{d-icon 'arrow-left'}}
   {{i18n 'admin.web_hooks.go_back'}}
 {{/link-to}}
 
@@ -16,8 +16,6 @@
       <label for='content-type'>{{i18n 'admin.web_hooks.content_type'}}</label>
       {{combo-box content=contentTypes
                   name="content-type"
-                  nameProperty="name"
-                  valueAttribute="id"
                   value=model.content_type}}
     </div>
 
@@ -49,12 +47,12 @@
 
     <div class='filters'>
       <div>
-        <label>{{fa-icon 'circle' class='tracking'}}{{i18n 'admin.web_hooks.categories_filter'}}</label>
-        {{category-selector categories=model.categories blacklist=model.categories}}
+        <label>{{d-icon 'circle' class='tracking'}}{{i18n 'admin.web_hooks.categories_filter'}}</label>
+        {{category-selector categories=model.categories}}
         <div class="instructions">{{i18n 'admin.web_hooks.categories_filter_instructions'}}</div>
       </div>
       <div>
-        <label>{{fa-icon 'circle' class='tracking'}}{{i18n 'admin.web_hooks.groups_filter'}}</label>
+        <label>{{d-icon 'circle' class='tracking'}}{{i18n 'admin.web_hooks.groups_filter'}}</label>
         {{group-selector groupNames=model.groupsFilterInName groupFinder=model.groupFinder}}
         <div class="instructions">{{i18n 'admin.web_hooks.groups_filter_instructions'}}</div>
       </div>
diff --git a/app/assets/javascripts/admin/templates/web-hooks.hbs b/app/assets/javascripts/admin/templates/web-hooks.hbs
index 082cf170b4..81d4b86e4d 100644
--- a/app/assets/javascripts/admin/templates/web-hooks.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks.hbs
@@ -1,6 +1,6 @@
 <div class='pull-right'>
   {{#link-to 'adminWebHooks.show' 'new' tagName='button' classNames='btn'}}
-    {{fa-icon 'plus'}} {{i18n 'admin.web_hooks.new'}}
+    {{d-icon 'plus'}} {{i18n 'admin.web_hooks.new'}}
   {{/link-to}}
 </div>
 <div class='clearfix'></div>
@@ -24,7 +24,7 @@
             <td>{{#link-to 'adminWebHooks.show' webHook}}{{webHook.payload_url}}{{/link-to}}</td>
             <td class='description'>{{webHook.description}}</td>
             <td class='controls'>
-              {{#link-to 'adminWebHooks.show' webHook tagName='button' classNames='btn btn-default no-text'}}{{fa-icon 'edit'}}{{/link-to}}
+              {{#link-to 'adminWebHooks.show' webHook tagName='button' classNames='btn btn-default no-text'}}{{d-icon 'edit'}}{{/link-to}}
               {{d-button class="destroy btn-danger" action='destroy' actionParam=webHook icon="remove"}}
             </td>
           </tr>
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 29c8e300b1..6b0d64be84 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -4,6 +4,7 @@
 //= require ./ember-addons/ember-computed-decorators
 //= require ./ember-addons/fmt
 //= require_tree ./discourse-common
+//= require_tree ./select-kit
 //= require ./discourse
 //= require ./deprecated
 
@@ -27,15 +28,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 +51,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
@@ -63,11 +67,8 @@
 //= require ./discourse/controllers/navigation/default
 //= require ./discourse/components/edit-category-panel
 //= require ./discourse/components/dropdown-button
-//= 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 151ed975d0..e96105b581 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/components/combo-box.js.es6 b/app/assets/javascripts/discourse-common/components/combo-box.js.es6
deleted file mode 100644
index e5828e8fc7..0000000000
--- a/app/assets/javascripts/discourse-common/components/combo-box.js.es6
+++ /dev/null
@@ -1,145 +0,0 @@
-import { bufferedRender } from 'discourse-common/lib/buffered-render';
-import { on, observes } from 'ember-addons/ember-computed-decorators';
-
-export default Ember.Component.extend(bufferedRender({
-  tagName: 'select',
-  attributeBindings: ['tabindex', 'disabled'],
-  classNames: ['combobox'],
-  valueAttribute: 'id',
-  nameProperty: 'name',
-
-  buildBuffer(buffer) {
-    const nameProperty = this.get('nameProperty');
-    const none = this.get('none');
-    let noneValue = null;
-
-    // Add none option if required
-    if (typeof none === "string") {
-      buffer.push('<option value="">' + I18n.t(none) + "</option>");
-    } else if (typeof none === "object") {
-      noneValue = Em.get(none, this.get('valueAttribute'));
-      buffer.push(`<option value="${noneValue}">${Em.get(none, nameProperty)}</option>`);
-    }
-
-    let selected = this.get('value');
-    if (!Em.isNone(selected)) { selected = selected.toString(); }
-
-    let selectedFound = false;
-    let firstVal = undefined;
-    const content = this.get('content');
-
-    if (content) {
-      let first = true;
-      content.forEach(o => {
-        let val = o[this.get('valueAttribute')];
-        if (typeof val === "undefined") { val = o; }
-        if (!Em.isNone(val)) { val = val.toString(); }
-
-        const selectedText = (val === selected) ? "selected" : "";
-        const name = Handlebars.Utils.escapeExpression(Ember.get(o, nameProperty) || o);
-
-        if (val === selected) {
-          selectedFound = true;
-        }
-        if (first) {
-          firstVal = val;
-          first = false;
-        }
-        buffer.push(`<option ${selectedText} value="${val}">${name}</option>`);
-      });
-    }
-
-    if (!selectedFound && !noneValue) {
-      if (none) {
-        this.set('value', null);
-      } else {
-        this.set('value', firstVal);
-      }
-    }
-
-    Ember.run.scheduleOnce('afterRender', this, this._updateSelect2);
-  },
-
-  @observes('value')
-  valueChanged() {
-    const $combo = this.$(),
-          val = this.get('value');
-
-    if (val !== undefined && val !== null) {
-      $combo.select2('val', val.toString());
-    } else {
-      $combo.select2('val', null);
-    }
-  },
-
-  @observes('content.[]')
-  _rerenderOnChange() {
-    this.rerenderBuffer();
-  },
-
-  didInsertElement() {
-    this._super();
-
-    // Workaround for https://github.com/emberjs/ember.js/issues/9813
-    // Can be removed when fixed. Without it, the wrong option is selected
-    this.$('option').each((i, o) => o.selected = !!$(o).attr('selected'));
-
-    // observer for item names changing (optional)
-    if (this.get('nameChanges')) {
-      this.addObserver('content.@each.' + this.get('nameProperty'), this.rerenderBuffer);
-    }
-
-    const $elem = this.$();
-    const caps = this.capabilities;
-    const minimumResultsForSearch = this.get('minimumResultsForSearch') || ((caps && caps.isIOS) ? -1 : 5);
-
-    if (!this.get("selectionTemplate") && this.get("selectionIcon")) {
-      this.selectionTemplate = (item) => {
-        let name = Em.get(item, 'text');
-        name = Handlebars.escapeExpression(name);
-        return `<i class='fa fa-${this.get("selectionIcon")}'></i>${name}`;
-      };
-    }
-
-    const options = {
-      minimumResultsForSearch,
-      width: this.get('width') || 'resolve',
-      allowClear: true
-    };
-
-    if (this.comboTemplate) {
-      options.formatResult = this.comboTemplate.bind(this);
-    }
-
-    if (this.selectionTemplate) {
-      options.formatSelection = this.selectionTemplate.bind(this);
-    }
-
-    $elem.select2(options);
-
-    const castInteger = this.get('castInteger');
-    $elem.on("change", e => {
-      let val = $(e.target).val();
-      if (val && val.length && castInteger) {
-        val = parseInt(val, 10);
-      }
-      this.set('value', val);
-    });
-
-    Ember.run.scheduleOnce('afterRender', this, this._triggerChange);
-  },
-
-  _updateSelect2() {
-    this.$().trigger('change.select2');
-  },
-
-  _triggerChange() {
-    this.$().trigger('change');
-  },
-
-  @on('willDestroyElement')
-  _destroyDropdown() {
-    this.$().select2('destroy');
-  }
-
-}));
diff --git a/app/assets/javascripts/discourse-common/helpers/d-icon.js.es6 b/app/assets/javascripts/discourse-common/helpers/d-icon.js.es6
new file mode 100644
index 0000000000..b85b9ebf26
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/helpers/d-icon.js.es6
@@ -0,0 +1,6 @@
+import { registerUnbound } from 'discourse-common/lib/helpers';
+import { renderIcon } from 'discourse-common/lib/icon-library';
+
+registerUnbound('d-icon', function(id, params) {
+  return new Handlebars.SafeString(renderIcon('string', id, params));
+});
diff --git a/app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6 b/app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6
index 3c1f8b9b5a..bd736c8482 100644
--- a/app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6
+++ b/app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6
@@ -1,25 +1,12 @@
 import { registerUnbound } from 'discourse-common/lib/helpers';
+import { renderIcon } from 'discourse-common/lib/icon-library';
+import deprecated from 'discourse-common/lib/deprecated';
 
-export function iconClasses(icon, params) {
-  let classes = "fa fa-" + icon;
-  if (params.modifier) { classes += " fa-" + params.modifier; }
-  if (params['class']) { classes += ' ' + params['class']; }
-  return classes;
-}
-
-export function iconHTML(icon, params) {
-  params = params || {};
-
-  var html = "<i class='" + iconClasses(icon, params) + "'";
-  if (params.title) { html += ` title='${I18n.t(params.title)}'`; }
-  if (params.label) { html += " aria-hidden='true'"; }
-  html += "></i>";
-  if (params.label) {
-    html += "<span class='sr-only'>" + I18n.t(params.label) + "</span>";
-  }
-  return html;
+export function iconHTML(id, params) {
+  return renderIcon('string', id, params);
 }
 
 registerUnbound('fa-icon', function(icon, params) {
+  deprecated("Use `{{d-icon}}` instead of `{{fa-icon}}");
   return new Handlebars.SafeString(iconHTML(icon, params));
 });
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 ada334f075..09f23c7b0d 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/lib/icon-library.js.es6 b/app/assets/javascripts/discourse-common/lib/icon-library.js.es6
new file mode 100644
index 0000000000..84242d03f6
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/lib/icon-library.js.es6
@@ -0,0 +1,113 @@
+import { h } from 'virtual-dom';
+let _renderers = [];
+
+const REPLACEMENTS = {
+  'd-tracking': 'circle',
+  'd-muted': 'times-circle',
+  'd-regular': 'circle-o',
+  'd-watching': 'exclamation-circle',
+  'd-watching-first': 'dot-circle-o',
+  'd-drop-expanded': 'caret-down',
+  'd-drop-collapsed': 'caret-right',
+  'd-unliked': 'heart',
+  'd-liked': 'heart',
+  'notification.mentioned': "at",
+  'notification.group_mentioned': "at",
+  'notification.quoted': "quote-right",
+  'notification.replied': "reply",
+  'notification.posted': "reply",
+  'notification.edited': "pencil",
+  'notification.liked': "heart",
+  'notification.liked_2': "heart",
+  'notification.liked_many': "heart",
+  'notification.private_message': "envelope-o",
+  'notification.invited_to_private_message': "envelope-o",
+  'notification.invited_to_topic': "hand-o-right",
+  'notification.invitee_accepted': "user",
+  'notification.moved_post': "sign-out",
+  'notification.linked': "link",
+  'notification.granted_badge': "certificate",
+  'notification.topic_reminder': "hand-o-right",
+  'notification.watching_first_post': "dot-circle-o",
+  'notification.group_message_summary': "group"
+};
+
+export function replaceIcon(source, destination) {
+  REPLACEMENTS[source] = destination;
+}
+
+export function renderIcon(renderType, id, params) {
+  for (let i=0; i<_renderers.length; i++) {
+    let renderer = _renderers[i];
+    let rendererForType = renderer[renderType];
+
+    if (rendererForType) {
+      const icon = { id, replacementId: REPLACEMENTS[id] };
+      let result = rendererForType(icon, params || {});
+      if (result) {
+        return result;
+      }
+    }
+  }
+}
+
+export function iconHTML(id, params) {
+  return renderIcon('string', id, params);
+}
+
+export function iconNode(id, params) {
+  return renderIcon('node', id, params);
+}
+
+// TODO: Improve how helpers are registered for vdom compliation
+if (typeof Discourse !== "undefined") {
+  Discourse.__widget_helpers.iconNode = iconNode;
+}
+
+export function registerIconRenderer(renderer) {
+  _renderers.unshift(renderer);
+}
+
+// Support for font awesome icons
+function faClasses(icon, params) {
+  let classNames = `fa fa-${icon.replacementId || icon.id} d-icon d-icon-${icon.id}`;
+
+  if (params) {
+    if (params.modifier) { classNames += " fa-" + params.modifier; }
+    if (params['class']) { classNames += ' ' + params['class']; }
+  }
+  return classNames;
+}
+
+// default resolver is font awesome
+registerIconRenderer({
+  name: 'font-awesome',
+
+  string(icon, params) {
+    let tagName = params.tagName || 'i';
+    let html = `<${tagName} class='${faClasses(icon, params)}'`;
+    if (params.title) { html += ` title='${I18n.t(params.title)}'`; }
+    if (params.label) { html += " aria-hidden='true'"; }
+    html += `></${tagName}>`;
+    if (params.label) {
+      html += "<span class='sr-only'>" + I18n.t(params.label) + "</span>";
+    }
+    return html;
+  },
+
+  node(icon, params) {
+    let tagName = params.tagName || 'i';
+
+    const properties = {
+      className: faClasses(icon, params),
+      attributes: { "aria-hidden": true }
+    };
+
+    if (params.title) { properties.attributes.title = params.title; }
+    if (params.label) {
+      return h(tagName, properties, h('span.sr-only', I18n.t(params.label)));
+    } else {
+      return h(tagName, properties);
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse-common/resolver.js.es6 b/app/assets/javascripts/discourse-common/resolver.js.es6
index b400d0b788..4c2dec2f0b 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;
@@ -194,7 +194,6 @@ export function buildResolver(baseName) {
     // (similar to how discourse lays out templates)
     findAdminTemplate(parsedName) {
       var decamelized = parsedName.fullNameWithoutType.decamelize();
-
       if (decamelized.indexOf('components') === 0) {
         const compTemplate = Ember.TEMPLATES['admin/templates/' + decamelized];
         if (compTemplate) { return compTemplate; }
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 2d9f1d9f35..dee43e5a9c 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 5ca85473c5..e8f252c5a9 100644
--- a/app/assets/javascripts/discourse.js.es6
+++ b/app/assets/javascripts/discourse.js.es6
@@ -7,6 +7,11 @@ const Discourse = Ember.Application.extend({
   rootElement: '#main',
   _docTitle: document.title,
   RAW_TEMPLATES: {},
+  __widget_helpers: {},
+  showingSignup: false,
+  customEvents: {
+    paste: 'paste'
+  },
 
   getURL(url) {
     if (!url) return url;
@@ -102,7 +107,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 +122,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 +136,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/adapters/rest.js.es6 b/app/assets/javascripts/discourse/adapters/rest.js.es6
index b56ac1628a..c826bbefc9 100644
--- a/app/assets/javascripts/discourse/adapters/rest.js.es6
+++ b/app/assets/javascripts/discourse/adapters/rest.js.es6
@@ -1,7 +1,15 @@
 import { ajax } from 'discourse/lib/ajax';
 import { hashString } from 'discourse/lib/hash';
 
-const ADMIN_MODELS = ['plugin', 'theme', 'embeddable-host', 'web-hook', 'web-hook-event'];
+const ADMIN_MODELS = [
+  'plugin',
+  'theme',
+  'embeddable-host',
+  'web-hook',
+  'web-hook-event',
+  'flagged-topic',
+  'moderation-history'
+];
 
 export function Result(payload, responseJson) {
   this.payload = payload;
@@ -19,7 +27,6 @@ function rethrow(error) {
 
 export default Ember.Object.extend({
 
-
   storageKey(type, findArgs, options) {
     if (options && options.cacheKey) {
       return options.cacheKey;
diff --git a/app/assets/javascripts/discourse/components/auto-update-input-selector.js.es6 b/app/assets/javascripts/discourse/components/auto-update-input-selector.js.es6
deleted file mode 100644
index 60978f3959..0000000000
--- a/app/assets/javascripts/discourse/components/auto-update-input-selector.js.es6
+++ /dev/null
@@ -1,186 +0,0 @@
-import { default as computed, observes } from "ember-addons/ember-computed-decorators";
-import Combobox from 'discourse-common/components/combo-box';
-import { CLOSE_STATUS_TYPE } from 'discourse/controllers/edit-topic-timer';
-
-const LATER_TODAY = 'later_today';
-const TOMORROW = 'tomorrow';
-const LATER_THIS_WEEK = 'later_this_week';
-const THIS_WEEKEND = 'this_weekend';
-const NEXT_WEEK = 'next_week';
-const NEXT_MONTH = 'next_month';
-export const PICK_DATE_AND_TIME = 'pick_date_and_time';
-export const SET_BASED_ON_LAST_POST = 'set_based_on_last_post';
-
-export const FORMAT = 'YYYY-MM-DD HH:mm';
-
-export default Combobox.extend({
-  classNames: ['auto-update-input-selector'],
-  isCustom: Ember.computed.equal("value", PICK_DATE_AND_TIME),
-
-  @computed()
-  content() {
-    const selections = [];
-    const now = moment();
-    const canScheduleToday = (24 - now.hour()) > 6;
-    const day = now.day();
-
-    if (canScheduleToday) {
-      selections.push({
-        id: LATER_TODAY,
-        name: I18n.t('topic.auto_update_input.later_today')
-      });
-    }
-
-    selections.push({
-      id: TOMORROW,
-      name: I18n.t('topic.auto_update_input.tomorrow')
-    });
-
-    if (!canScheduleToday && day < 4) {
-      selections.push({
-        id: LATER_THIS_WEEK,
-        name: I18n.t('topic.auto_update_input.later_this_week')
-      });
-    }
-
-    if (day < 5) {
-      selections.push({
-        id: THIS_WEEKEND,
-        name: I18n.t('topic.auto_update_input.this_weekend')
-      });
-    }
-
-
-    if (day !== 7)  {
-      selections.push({
-        id: NEXT_WEEK,
-        name: I18n.t('topic.auto_update_input.next_week')
-      });
-    }
-
-    if (moment().endOf('month').date() !== now.date()) {
-      selections.push({
-        id: NEXT_MONTH,
-        name: I18n.t('topic.auto_update_input.next_month')
-      });
-    }
-
-    selections.push({
-      id: PICK_DATE_AND_TIME,
-      name: I18n.t('topic.auto_update_input.pick_date_and_time')
-    });
-
-    if (this.get('statusType') === CLOSE_STATUS_TYPE) {
-      selections.push({
-        id: SET_BASED_ON_LAST_POST,
-        name: I18n.t('topic.auto_update_input.set_based_on_last_post')
-      });
-    }
-
-    return selections;
-  },
-
-  @observes('value')
-  _updateInput() {
-    if (this.get('isCustom')) return;
-    let input = null;
-    const { time } = this.get('updateAt');
-
-    if (time && !Ember.isEmpty(this.get('value'))) {
-      input = time.format(FORMAT);
-    }
-
-    this.set('input', input);
-  },
-
-  @computed('value')
-  updateAt(value) {
-    return this._updateAt(value);
-  },
-
-  comboTemplate(state) {
-    return this._format(state);
-  },
-
-  selectionTemplate(state) {
-    return this._format(state);
-  },
-
-  _format(state) {
-    let { time, icon } = this._updateAt(state.id);
-    let icons;
-
-    if (icon) {
-      icons = icon.split(',').map(i => {
-        return `<i class='fa fa-${i}'/>`;
-      }).join(" ");
-    }
-
-    if (time) {
-      if (state.id === LATER_TODAY) {
-        time = time.format('h a');
-      } else if (state.id === NEXT_MONTH) {
-        time = time.format('MMM D');
-      } else {
-        time = time.format('ddd, h a');
-      }
-    }
-
-    let output = "";
-
-    if (!Ember.isEmpty(icons)) {
-      output += `<span class='auto-update-input-selector-icons'>${icons}</span>`;
-    }
-
-    output += `<span>${state.text}</span>`;
-
-    if (time) {
-      output += `<span class='auto-update-input-selector-datetime'>${time}</span>`;
-    }
-
-    return output;
-  },
-
-  _updateAt(selection) {
-    let time = moment();
-    let icon;
-    const timeOfDay = this.get('statusType') !== CLOSE_STATUS_TYPE ? 8 : 18;
-
-    switch(selection) {
-      case LATER_TODAY:
-        time = time.hour(18).minute(0);
-        icon = 'moon-o';
-        break;
-      case TOMORROW:
-        time = time.add(1, 'day').hour(timeOfDay).minute(0);
-        icon = 'sun-o';
-        break;
-      case LATER_THIS_WEEK:
-        time = time.add(2, 'day').hour(timeOfDay).minute(0);
-        icon = 'briefcase';
-        break;
-      case THIS_WEEKEND:
-        time = time.day(6).hour(timeOfDay).minute(0);
-        icon = 'bed';
-        break;
-      case NEXT_WEEK:
-        time = time.add(1, 'week').day(1).hour(timeOfDay).minute(0);
-        icon = 'briefcase';
-        break;
-      case NEXT_MONTH:
-        time = time.add(1, 'month').startOf('month').hour(timeOfDay).minute(0);
-        icon = 'briefcase';
-        break;
-      case PICK_DATE_AND_TIME:
-        time = null;
-        icon = 'calendar-plus-o';
-        break;
-      case SET_BASED_ON_LAST_POST:
-        time = null;
-        icon = 'clock-o';
-        break;
-    }
-
-    return { time, icon };
-  },
-});
diff --git a/app/assets/javascripts/discourse/components/auto-update-input.js.es6 b/app/assets/javascripts/discourse/components/auto-update-input.js.es6
deleted file mode 100644
index 747c061793..0000000000
--- a/app/assets/javascripts/discourse/components/auto-update-input.js.es6
+++ /dev/null
@@ -1,92 +0,0 @@
-import { default as computed, observes } from "ember-addons/ember-computed-decorators";
-import {
-  FORMAT,
-  PICK_DATE_AND_TIME,
-  SET_BASED_ON_LAST_POST
-} from "discourse/components/auto-update-input-selector";
-
-export default Ember.Component.extend({
-  selection: null,
-  date: null,
-  time: null,
-  isCustom: Ember.computed.equal('selection', PICK_DATE_AND_TIME),
-  isBasedOnLastPost: Ember.computed.equal('selection', SET_BASED_ON_LAST_POST),
-
-  init() {
-    this._super();
-
-    const input = this.get('input');
-
-    if (input) {
-      if (this.get('basedOnLastPost')) {
-        this.set('selection', SET_BASED_ON_LAST_POST);
-      } else {
-        this.set('selection', PICK_DATE_AND_TIME);
-        const datetime = moment(input);
-        this.set('date', datetime.toDate());
-        this.set('time', datetime.format("HH:mm"));
-        this._updateInput();
-      }
-    }
-  },
-
-  @observes("date", "time")
-  _updateInput() {
-    const date = moment(this.get('date')).format("YYYY-MM-DD");
-    const time = (this.get('time') && ` ${this.get('time')}`) || '';
-    this.set('input', moment(`${date}${time}`).format(FORMAT));
-  },
-
-  @observes("isBasedOnLastPost")
-  _updateBasedOnLastPost() {
-    this.set('basedOnLastPost', this.get('isBasedOnLastPost'));
-  },
-
-  @computed("input", "isBasedOnLastPost")
-  duration(input, isBasedOnLastPost) {
-    const now = moment();
-
-    if (isBasedOnLastPost) {
-      return parseFloat(input);
-    } else {
-      return moment(input) - now;
-    }
-  },
-
-  @computed("input", "isBasedOnLastPost")
-  executeAt(input, isBasedOnLastPost) {
-    if (isBasedOnLastPost) {
-      return moment().add(input, 'hours').format(FORMAT);
-    } else {
-      return input;
-    }
-  },
-
-  @computed("statusType", "input", "isCustom", "date", "time", "willCloseImmediately")
-  showTopicStatusInfo(statusType, input, isCustom, date, time, willCloseImmediately) {
-    if (!statusType || willCloseImmediately) return false;
-
-    if (isCustom) {
-      return date || time;
-    } else {
-      return input;
-    }
-  },
-
-  @computed('isBasedOnLastPost', 'input', 'lastPostedAt')
-  willCloseImmediately(isBasedOnLastPost, input, lastPostedAt) {
-    if (isBasedOnLastPost && input) {
-      let closeDate = moment(lastPostedAt);
-      closeDate = closeDate.add(input, 'hours');
-      return closeDate < moment();
-    }
-  },
-
-  @computed('isBasedOnLastPost', 'lastPostedAt')
-  willCloseI18n(isBasedOnLastPost, lastPostedAt) {
-    if (isBasedOnLastPost) {
-      const diff = Math.round((new Date() - new Date(lastPostedAt)) / (1000*60*60));
-      return I18n.t('topic.auto_close_immediate', { count: diff });
-    }
-  },
-});
diff --git a/app/assets/javascripts/discourse/components/badge-button.js.es6 b/app/assets/javascripts/discourse/components/badge-button.js.es6
index c32e1f1cbb..58b0d1358c 100644
--- a/app/assets/javascripts/discourse/components/badge-button.js.es6
+++ b/app/assets/javascripts/discourse/components/badge-button.js.es6
@@ -1,6 +1,6 @@
 export default Ember.Component.extend({
   tagName: 'span',
-  classNameBindings: [':user-badge', 'badge.badgeTypeClassName'],
+  classNameBindings: [':user-badge', 'badge.badgeTypeClassName', 'badge.enabled::disabled'],
   title: function(){
     return $("<div>"+this.get('badge.description')+"</div>").text();
   }.property('badge.description'),
diff --git a/app/assets/javascripts/discourse/components/badge-title.js.es6 b/app/assets/javascripts/discourse/components/badge-title.js.es6
new file mode 100644
index 0000000000..af5c0ee726
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/badge-title.js.es6
@@ -0,0 +1,30 @@
+import { ajax } from 'discourse/lib/ajax';
+import BadgeSelectController from 'discourse/mixins/badge-select-controller';
+
+export default Ember.Component.extend(BadgeSelectController, {
+  classNames: ["badge-title"],
+
+  saved: false,
+  saving: false,
+
+  actions: {
+    save() {
+      this.setProperties({ saved: false, saving: true });
+
+      const badge_id = this.get('selectedUserBadgeId') || 0;
+
+      ajax(this.get('user.path') + "/preferences/badge_title", {
+        type: "PUT",
+        data: { user_badge_id: badge_id }
+      }).then(() => {
+        this.setProperties({
+          saved: true,
+          saving: false,
+          "user.title": this.get('selectedUserBadge.badge.name')
+        });
+      }, () => {
+        bootbox.alert(I18n.t('generic_error'));
+      });
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/bulk-select-button.js.es6 b/app/assets/javascripts/discourse/components/bulk-select-button.js.es6
index 96f08fd76d..aa0fae4002 100644
--- a/app/assets/javascripts/discourse/components/bulk-select-button.js.es6
+++ b/app/assets/javascripts/discourse/components/bulk-select-button.js.es6
@@ -1,6 +1,8 @@
 import showModal from 'discourse/lib/show-modal';
 
 export default Ember.Component.extend({
+  classNames: ['bulk-select-container'],
+
   actions: {
     showBulkActions() {
       const controller = showModal('topic-bulk-actions', {
diff --git a/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6 b/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6
deleted file mode 100644
index 8dbb4d3423..0000000000
--- a/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6
+++ /dev/null
@@ -1,39 +0,0 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
-import DropdownButton from 'discourse/components/dropdown-button';
-import computed from "ember-addons/ember-computed-decorators";
-
-export default DropdownButton.extend({
-  buttonExtraClasses: 'no-text',
-  title: '',
-  text: iconHTML('bars') + ' ' + iconHTML('caret-down'),
-  classNames: ['category-notification-menu', 'category-admin-menu'],
-
-  @computed()
-  dropDownContent() {
-    const includeReorder = this.get('siteSettings.fixed_category_positions');
-    const items = [
-      { id: 'create',
-        title: I18n.t('category.create'),
-        description: I18n.t('category.create_long'),
-        styleClasses: 'fa fa-plus' }
-    ];
-    if (includeReorder) {
-      items.push({
-        id: 'reorder',
-        title: I18n.t('categories.reorder.title'),
-        description: I18n.t('categories.reorder.title_long'),
-        styleClasses: 'fa fa-random'
-      });
-    }
-    return items;
-  },
-
-  actionNames: {
-    create: 'createCategory',
-    reorder: 'reorderCategories'
-  },
-
-  clicked(id) {
-    this.sendAction('actionNames.' + id);
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/categories-only.js.es6 b/app/assets/javascripts/discourse/components/categories-only.js.es6
new file mode 100644
index 0000000000..9250c1ae73
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/categories-only.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  tagName: ''
+});
diff --git a/app/assets/javascripts/discourse/components/category-chooser.js.es6 b/app/assets/javascripts/discourse/components/category-chooser.js.es6
deleted file mode 100644
index d0b8b45009..0000000000
--- a/app/assets/javascripts/discourse/components/category-chooser.js.es6
+++ /dev/null
@@ -1,88 +0,0 @@
-import Combobox from 'discourse-common/components/combo-box';
-import { categoryBadgeHTML } from 'discourse/helpers/category-link';
-import computed from 'ember-addons/ember-computed-decorators';
-import { observes, on } from 'ember-addons/ember-computed-decorators';
-import PermissionType from 'discourse/models/permission-type';
-import Category from 'discourse/models/category';
-
-export default Combobox.extend({
-  classNames: ['combobox category-combobox'],
-  dataAttributes: ['id', 'description_text'],
-  overrideWidths: true,
-  castInteger: true,
-
-  @computed("scopedCategoryId", "categories")
-  content(scopedCategoryId, categories) {
-    // Always scope to the parent of a category, if present
-    if (scopedCategoryId) {
-      const scopedCat = Category.findById(scopedCategoryId);
-      scopedCategoryId = scopedCat.get('parent_category_id') || scopedCat.get('id');
-    }
-
-    const excludeCategoryId = this.get('excludeCategoryId');
-
-    return categories.filter(c => {
-      const categoryId = c.get('id');
-      if (scopedCategoryId && categoryId !== scopedCategoryId && c.get('parent_category_id') !== scopedCategoryId) { return false; }
-      if (c.get('isUncategorizedCategory') || excludeCategoryId === categoryId) { return false; }
-      return c.get('permission') === PermissionType.FULL;
-    });
-  },
-
-  @on("init")
-  @observes("site.sortedCategories")
-  _updateCategories() {
-    if (!this.get('categories')) {
-      const categories = Discourse.SiteSettings.fixed_category_positions_on_create ?
-                           Category.list() :
-                           Category.listByActivity();
-      this.set('categories', categories);
-    }
-  },
-
-  @computed("rootNone", "rootNoneLabel")
-  none(rootNone, rootNoneLabel) {
-    if (Discourse.SiteSettings.allow_uncategorized_topics || this.get('allowUncategorized')) {
-      if (rootNone) {
-        return rootNoneLabel || "category.none";
-      } else {
-        return Category.findUncategorized();
-      }
-    } else {
-      return 'category.choose';
-    }
-  },
-
-  comboTemplate(item) {
-    let category;
-
-    // If we have no id, but text with the uncategorized name, we can use that badge.
-    if (Ember.isEmpty(item.id)) {
-      const uncat = Category.findUncategorized();
-      if (uncat && uncat.get('name') === item.text) {
-        category = uncat;
-      }
-    } else {
-      category = Category.findById(parseInt(item.id,10));
-    }
-
-    if (!category) return item.text;
-    let result = categoryBadgeHTML(category, {link: false, allowUncategorized: true, hideParent: true});
-    const parentCategoryId = category.get('parent_category_id');
-
-    if (parentCategoryId) {
-      result = categoryBadgeHTML(Category.findById(parentCategoryId), {link: false}) + "&nbsp;" + result;
-    }
-
-    result += ` <span class='topic-count'>&times; ${category.get('topic_count')}</span>`;
-
-    const description = category.get('description');
-    // TODO wtf how can this be null?;
-    if (description && description !== 'null') {
-      result += `<div class="category-desc">${description.substr(0, 200)}${description.length > 200 ? '&hellip;' : ''}</div>`;
-    }
-
-    return result;
-  }
-
-});
diff --git a/app/assets/javascripts/discourse/components/category-drop.js.es6 b/app/assets/javascripts/discourse/components/category-drop.js.es6
index e9f05c33fe..379e326ac8 100644
--- a/app/assets/javascripts/discourse/components/category-drop.js.es6
+++ b/app/assets/javascripts/discourse/components/category-drop.js.es6
@@ -1,4 +1,6 @@
 import { setting } from 'discourse/lib/computed';
+import computed from 'ember-addons/ember-computed-decorators';
+
 var get = Ember.get;
 
 export default Ember.Component.extend({
@@ -8,10 +10,10 @@ export default Ember.Component.extend({
 
   tagName: 'li',
 
-  iconClass: function() {
-    if (this.get('expanded')) { return "fa fa-caret-down"; }
-    return "fa fa-caret-right";
-  }.property('expanded'),
+  @computed('expanded')
+  expandIcon(expanded) {
+    return expanded ? 'd-drop-expanded' : 'd-drop-collapsed';
+  },
 
   allCategoriesUrl: function() {
     if (this.get('subCategory')) {
@@ -33,7 +35,7 @@ export default Ember.Component.extend({
   }.property('category'),
 
   dropdownButtonClass: function() {
-    var result = 'badge-category category-dropdown-button';
+    let result = 'dropdown-header category-dropdown-button';
     if (Em.isNone(this.get('category'))) {
       result += ' home';
     }
@@ -57,21 +59,35 @@ export default Ember.Component.extend({
   }.property('category'),
 
   badgeStyle: function() {
-    var category = this.get('category');
+    let category = this.get('category');
+
+    const categoryStyle = this.siteSettings.category_style;
+    if (categoryStyle === 'bullet') {
+      return;
+    }
 
     if (category) {
-      var color = get(category, 'color'),
-          textColor = get(category, 'text_color');
+      let color = get(category, 'color');
+      let textColor = get(category, 'text_color');
 
       if (color || textColor) {
-        var style = "";
-        if (color) { style += "background-color: #" + color + "; border-color: #" + color + ";"; }
-        if (textColor) { style += "color: #" + textColor + "; "; }
+        let style = "";
+        if (color) {
+          if (categoryStyle === "bar") {
+            style += `border-color: #${color};`;
+          } else if (categoryStyle === "box") {
+            style += `background-color: #${color};`;
+            if (textColor) { style += "color: #" + textColor + "; "; }
+          }
+        }
+
         return style.htmlSafe();
       }
     }
 
-    return "background-color: #eee; color: #333".htmlSafe();
+    if (categoryStyle === 'box') {
+      return "background-color: #eee; color: #333".htmlSafe();
+    }
   }.property('category'),
 
   clickEventName: function() {
diff --git a/app/assets/javascripts/discourse/components/category-notifications-button.js.es6 b/app/assets/javascripts/discourse/components/category-notifications-button.js.es6
deleted file mode 100644
index 7be7e1bc97..0000000000
--- a/app/assets/javascripts/discourse/components/category-notifications-button.js.es6
+++ /dev/null
@@ -1,13 +0,0 @@
-import NotificationsButton from 'discourse/components/notifications-button';
-
-export default NotificationsButton.extend({
-  classNames: ['notification-options', 'category-notification-menu'],
-  buttonIncludesText: false,
-  hidden: Em.computed.alias('category.deleted'),
-  notificationLevel: Em.computed.alias('category.notification_level'),
-  i18nPrefix: 'category.notifications',
-
-  clicked(id) {
-    this.get('category').setNotification(id);
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/category-selector.js.es6 b/app/assets/javascripts/discourse/components/category-selector.js.es6
deleted file mode 100644
index 9cb3eec14a..0000000000
--- a/app/assets/javascripts/discourse/components/category-selector.js.es6
+++ /dev/null
@@ -1,49 +0,0 @@
-import { categoryBadgeHTML } from 'discourse/helpers/category-link';
-import Category from 'discourse/models/category';
-import { on, observes } from 'ember-addons/ember-computed-decorators';
-import { findRawTemplate } from 'discourse/lib/raw-templates';
-
-export default Ember.Component.extend({
-  @observes('categories')
-  _update() {
-    if (this.get('canReceiveUpdates') === 'true')
-      this._initializeAutocomplete({updateData: true});
-  },
-
-  @on('didInsertElement')
-  _initializeAutocomplete(opts) {
-    const self = this,
-          regexp = new RegExp(`href=['\"]${Discourse.getURL('/c/')}([^'\"]+)`);
-
-    this.$('input').autocomplete({
-      items: this.get('categories'),
-      single: this.get('single'),
-      allowAny: false,
-      updateData: (opts && opts.updateData) ? opts.updateData : false,
-      dataSource(term) {
-        return Category.list().filter(category => {
-          const regex = new RegExp(term, 'i');
-          return category.get('name').match(regex) &&
-            !_.contains(self.get('blacklist') || [], category) &&
-            !_.contains(self.get('categories'), category) ;
-        });
-      },
-      onChangeItems(items) {
-        const categories = _.map(items, link => {
-          const slug = link.match(regexp)[1];
-          return Category.findSingleBySlug(slug);
-        });
-        Em.run.next(() => {
-          let existingCategory = _.isArray(self.get('categories')) ? self.get('categories') : [self.get('categories')];
-          const result = _.intersection(existingCategory.map(itm => itm.id), categories.map(itm => itm.id));
-          if (result.length !== categories.length || existingCategory.length !== categories.length)
-            self.set('categories', categories);
-        });
-      },
-      template: findRawTemplate('category-selector-autocomplete'),
-      transformComplete(category) {
-        return categoryBadgeHTML(category, {allowUncategorized: true});
-      }
-    });
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/composer-body.js.es6 b/app/assets/javascripts/discourse/components/composer-body.js.es6
index e9e4552a2b..8df136d372 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',
@@ -13,7 +14,14 @@ export default Ember.Component.extend({
                       'composer.canEditTitle:edit-title',
                       'composer.createdPost:created-post',
                       'composer.creatingTopic:topic',
-                      'composer.whisper:composing-whisper'],
+                      'composer.whisper:composing-whisper',
+                      'showPreview:show-preview:hide-preview',
+                      'currentUserPrimaryGroupClass'],
+
+  @computed("currentUser.primary_group_name")
+  currentUserPrimaryGroupClass(primaryGroupName) {
+    return primaryGroupName && `group-${primaryGroupName}`;
+  },
 
   @computed('composer.composeState')
   composeState(composeState) {
@@ -34,19 +42,6 @@ export default Ember.Component.extend({
 
       const h = $('#reply-control').height() || 0;
       this.movePanels(h + "px");
-
-      // Figure out the size of the fields
-      const $fields = this.$('.composer-fields');
-      const fieldPos = $fields.position();
-      if (fieldPos) {
-        this.$('.wmd-controls').css('top', $fields.height() + fieldPos.top + 5);
-      }
-
-      // get the submit panel height
-      const submitPos = this.$('.submit-panel').position();
-      if (submitPos) {
-        this.$('.wmd-controls').css('bottom', h - submitPos.top + 7);
-      }
     });
   },
 
@@ -65,17 +60,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 b0213647fe..968e1ade9a 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -1,50 +1,60 @@
 import userSearch from 'discourse/lib/user-search';
-import { default as computed, on } from 'ember-addons/ember-computed-decorators';
+import { default as computed, observes, on } 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';
 import { tinyAvatar,
          displayErrorForUpload,
          getUploadMarkdown,
-         validateUploadedFiles } from 'discourse/lib/utilities';
+         validateUploadedFiles,
+         formatUsername,
+         clipboardData
+} from 'discourse/lib/utilities';
+import { cacheShortUploadUrl, resolveAllShortUrls } from 'pretty-text/image-short-url';
+
+const REBUILD_SCROLL_MAP_EVENTS = [
+  'composer:resized',
+  'composer:typed-reply'
+];
 
 export default Ember.Component.extend({
-  classNames: ['wmd-controls'],
-  classNameBindings: ['showToolbar:toolbar-visible', ':wmd-controls', 'showPreview', 'showPreview::hide-preview'],
+  classNameBindings: ['showToolbar:toolbar-visible', ':wmd-controls'],
 
   uploadProgress: 0,
-  showPreview: true,
   _xhr: null,
+  shouldBuildScrollMap: true,
+  scrollMap: null,
 
   @computed
   uploadPlaceholder() {
     return `[${I18n.t('uploading')}]() `;
   },
 
-  @on('init')
-  _setupPreview() {
-    const val = (this.site.mobileView ? false : (this.keyValueStore.get('composer.showPreview') || 'true'));
-    this.set('showPreview', val === 'true');
-  },
+  @observes('composer.uploadCancelled')
+  _cancelUpload() {
+    if (!this.get('composer.uploadCancelled')) { return; }
+    this.set('composer.uploadCancelled', false);
 
-  @computed('site.mobileView', 'showPreview')
-  forcePreview(mobileView, showPreview) {
-    return mobileView && showPreview;
-  },
-
-  @computed('showPreview')
-  toggleText: function(showPreview) {
-    return showPreview ? I18n.t('composer.hide_preview') : I18n.t('composer.show_preview');
+    if (this._xhr) {
+      this._xhr._userCancelled = true;
+      this._xhr.abort();
+    }
+    this._resetUpload(true);
   },
 
   @computed
   markdownOptions() {
     return {
+      previewing: true,
+
+      formatUsername,
+
       lookupAvatarByPostNumber: (postNumber, topicId) => {
         const topic = this.get('topic');
         if (!topic) { return; }
@@ -56,6 +66,19 @@ export default Ember.Component.extend({
             return tinyAvatar(quotedPost.get('avatar_template'));
           }
         }
+      },
+
+      lookupPrimaryUserGroupByPostNumber: (postNumber, topicId) => {
+        const topic = this.get('topic');
+        if (!topic) { return; }
+
+        const posts = topic.get('postStream.posts');
+        if (posts && topicId === topic.get('id')) {
+          const quotedPost = posts.findBy("post_number", postNumber);
+          if (quotedPost) {
+            return quotedPost.primary_group_name;
+          }
+        }
       }
     };
   },
@@ -64,14 +87,31 @@ export default Ember.Component.extend({
   _composerEditorInit() {
     const topicId = this.get('topic.id');
     const $input = this.$('.d-editor-input');
-    $input.autocomplete({
-      template: findRawTemplate('user-selector-autocomplete'),
-      dataSource: term => userSearch({ term, topicId, includeGroups: true }),
-      key: "@",
-      transformComplete: v => v.username || v.name
-    });
+    const $preview = this.$('.d-editor-preview-wrapper');
 
-    $input.on('scroll', () => Ember.run.throttle(this, this._syncEditorAndPreviewScroll, 20));
+    if (this.siteSettings.enable_mentions) {
+      $input.autocomplete({
+        template: findRawTemplate('user-selector-autocomplete'),
+        dataSource: term => userSearch({
+          term,
+          topicId,
+          includeMentionableGroups: true
+        }),
+        key: "@",
+        transformComplete: v => v.username || v.name
+      });
+    }
+
+    if (this._enableAdvancedEditorPreviewSync()) {
+      this._initInputPreviewSync($input, $preview);
+    } else {
+      $input.on('scroll', () => Ember.run.throttle(this,
+        this._syncEditorAndPreviewScroll,
+        $input,
+        $preview,
+        20
+      ));
+    }
 
     // Focus on the body unless we have a title
     if (!this.get('composer.canEditTitle') && !this.capabilities.isIOS) {
@@ -80,14 +120,6 @@ export default Ember.Component.extend({
 
     this._bindUploadTarget();
     this.appEvents.trigger('composer:will-open');
-
-    if (this.site.mobileView) {
-      $(window).on('resize.composer-popup-menu', () => {
-        if (this.get('optionsVisible')) {
-          this.appEvents.trigger('popup-menu:open', this._optionsLocation());
-        }
-      });
-    }
   },
 
   @computed('composer.reply', 'composer.replyLength', 'composer.missingReplyCharacters', 'composer.minimumPostLength', 'lastValidatedAt')
@@ -111,29 +143,190 @@ export default Ember.Component.extend({
     }
   },
 
-  _syncEditorAndPreviewScroll() {
-    const $input = this.$('.d-editor-input');
-    if (!$input) { return; }
+  _enableAdvancedEditorPreviewSync() {
+    return this.siteSettings.enable_advanced_editor_preview_sync;
+  },
 
-    const $preview = this.$('.d-editor-preview');
+  _resetShouldBuildScrollMap() {
+    this.set('shouldBuildScrollMap', true);
+  },
 
-    if ($input.scrollTop() === 0) {
-      $preview.scrollTop(0);
-      return;
+  _initInputPreviewSync($input, $preview) {
+    REBUILD_SCROLL_MAP_EVENTS.forEach(event => {
+      this.appEvents.on(event, this, this._resetShouldBuildScrollMap);
+    });
+
+    Ember.run.scheduleOnce("afterRender", () => {
+      $input.on('touchstart mouseenter', () => {
+        if (!$preview.is(":visible")) return;
+        $preview.off('scroll');
+
+        $input.on('scroll', () => {
+          this._syncScroll(this._syncEditorAndPreviewScroll, $input, $preview);
+        });
+      });
+
+      $preview.on('touchstart mouseenter', () => {
+        $input.off('scroll');
+
+        $preview.on('scroll', () => {
+          this._syncScroll(this._syncPreviewAndEditorScroll, $input, $preview);
+        });
+      });
+    });
+  },
+
+  _syncScroll($callback, $input, $preview) {
+    if (!this.get('scrollMap') || this.get('shouldBuildScrollMap')) {
+      this.set('scrollMap', this._buildScrollMap($input, $preview));
+      this.set('shouldBuildScrollMap', false);
     }
 
-    const inputHeight = $input[0].scrollHeight;
-    const previewHeight = $preview[0].scrollHeight;
-    if (($input.height() + $input.scrollTop() + 100) > inputHeight) {
-      // cheat, special case for bottom
-      $preview.scrollTop(previewHeight);
-      return;
+    Ember.run.throttle(this, $callback, $input, $preview, this.get('scrollMap'), 20);
+  },
+
+  _teardownInputPreviewSync() {
+    [this.$('.d-editor-input'), this.$('.d-editor-preview-wrapper')].forEach($element => {
+      $element.off("mouseenter touchstart");
+      $element.off("scroll");
+    });
+
+    REBUILD_SCROLL_MAP_EVENTS.forEach(event => {
+      this.appEvents.off(event, this, this._resetShouldBuildScrollMap);
+    });;
+  },
+
+  // Adapted from https://github.com/markdown-it/markdown-it.github.io
+  _buildScrollMap($input, $preview) {
+    let sourceLikeDiv = $('<div />').css({
+      position: 'absolute',
+      height: 'auto',
+      visibility: 'hidden',
+      width: $input[0].clientWidth,
+      'font-size': $input.css('font-size'),
+      'font-family': $input.css('font-family'),
+      'line-height': $input.css('line-height'),
+      'white-space': $input.css('white-space')
+    }).appendTo('body');
+
+    const linesMap = [];
+    let numberOfLines = 0;
+
+    $input.val().split('\n').forEach(text => {
+      linesMap.push(numberOfLines);
+
+      if (text.length === 0) {
+        numberOfLines++;
+      } else {
+        sourceLikeDiv.text(text);
+
+        let height;
+        let lineHeight;
+        height = parseFloat(sourceLikeDiv.css('height'));
+        lineHeight = parseFloat(sourceLikeDiv.css('line-height'));
+        numberOfLines += Math.round(height / lineHeight);
+      }
+    });
+
+    linesMap.push(numberOfLines);
+    sourceLikeDiv.remove();
+
+    const previewOffsetTop = $preview.offset().top;
+    const offset = $preview.scrollTop() - previewOffsetTop - ($input.offset().top - previewOffsetTop);
+    const nonEmptyList = [];
+    const scrollMap = [];
+    for (let i = 0; i < numberOfLines; i++) { scrollMap.push(-1); };
+
+    nonEmptyList.push(0);
+    scrollMap[0] = 0;
+
+    $preview.find('.preview-sync-line').each((_, element) => {
+      let $element = $(element);
+      let lineNumber = $element.data('line-number');
+      let linesToTop = linesMap[lineNumber];
+      if (linesToTop !== 0) { nonEmptyList.push(linesToTop); }
+      scrollMap[linesToTop] = Math.round($element.offset().top + offset);
+    });
+
+    nonEmptyList.push(numberOfLines);
+    scrollMap[numberOfLines] = $preview[0].scrollHeight;
+
+    let position = 0;
+
+    for (let i = 1; i < numberOfLines; i++) {
+      if (scrollMap[i] !== -1) {
+        position++;
+        continue;
+      }
+
+      let top = nonEmptyList[position];
+      let bottom = nonEmptyList[position + 1];
+
+      scrollMap[i] =
+        ((
+          scrollMap[bottom] * (i - top) +
+          scrollMap[top] * (bottom - i)
+        ) / (bottom - top)).toFixed(2);
+    };
+
+    return scrollMap;
+  },
+
+  _syncEditorAndPreviewScroll($input, $preview, scrollMap) {
+    if (this._enableAdvancedEditorPreviewSync()) {
+      let scrollTop;
+      const inputHeight = $input.height();
+      const inputScrollHeight = $input[0].scrollHeight;
+      const inputClientHeight = $input[0].clientHeight;
+      const scrollable = inputScrollHeight > inputClientHeight;
+
+      if (scrollable && ((inputHeight + $input.scrollTop() + 100) > inputScrollHeight)) {
+        scrollTop = $preview[0].scrollHeight;
+      } else {
+        const lineHeight = parseFloat($input.css('line-height'));
+        const lineNumber = Math.floor($input.scrollTop() / lineHeight);
+        scrollTop = scrollMap[lineNumber];
+      }
+
+      $preview.stop(true).animate({ scrollTop }, 100, 'linear');
+    } else {
+      if (!$input) { return; }
+
+      if ($input.scrollTop() === 0) {
+        $preview.scrollTop(0);
+        return;
+      }
+
+      const inputHeight = $input[0].scrollHeight;
+      const previewHeight = $preview[0].scrollHeight;
+
+      if (($input.height() + $input.scrollTop() + 100) > inputHeight) {
+        // cheat, special case for bottom
+        $preview.scrollTop(previewHeight);
+        return;
+      }
+
+      const scrollPosition = $input.scrollTop();
+      const factor = previewHeight / inputHeight;
+      const desired = scrollPosition * factor;
+      $preview.scrollTop(desired + 50);
+    }
+  },
+
+  _syncPreviewAndEditorScroll($input, $preview, scrollMap) {
+    if (scrollMap.length < 1) return;
+
+    let scrollTop;
+    const previewScrollTop = $preview.scrollTop();
+
+    if (($preview.height() + previewScrollTop + 100) > $preview[0].scrollHeight) {
+      scrollTop = $input[0].scrollHeight;
+    } else {
+      const lineHeight = parseFloat($input.css('line-height'));
+      scrollTop = lineHeight * scrollMap.findIndex(offset => offset > previewScrollTop);
     }
 
-    const scrollPosition = $input.scrollTop();
-    const factor = previewHeight / inputHeight;
-    const desired = scrollPosition * factor;
-    $preview.scrollTop(desired + 50);
+    $input.stop(true).animate({ scrollTop }, 100, 'linear');
   },
 
   _renderUnseenMentions($preview, unseen) {
@@ -158,6 +351,10 @@ export default Ember.Component.extend({
     });
   },
 
+  _loadInlineOneboxes(inline) {
+    applyInlineOneboxes(inline, ajax);
+  },
+
   _loadOneboxes($oneboxes) {
     const post = this.get('composer.post');
     let refresh = false;
@@ -178,7 +375,7 @@ export default Ember.Component.extend({
         const $e = $(e);
         var name = $e.data('name');
         if (found.indexOf(name) === -1){
-          this.sendAction('groupsMentioned', [{name: name, user_count: $e.data('mentionable-user-count')}]);
+          this.sendAction('groupsMentioned', [{name: name, user_count: $e.data('mentionable-user-count'), max_mentions: $e.data('max-mentions')}]);
           found.push(name);
         }
       });
@@ -216,7 +413,9 @@ export default Ember.Component.extend({
   },
 
   _resetUpload(removePlaceholder) {
-    this._validUploads--;
+    if (this._validUploads > 0) {
+      this._validUploads--;
+    }
     if (this._validUploads === 0) {
       this.setProperties({ uploadProgress: 0, isUploading: false, isCancellable: false });
     }
@@ -228,6 +427,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 +439,36 @@ export default Ember.Component.extend({
       pasteZone: $element,
     });
 
+    $element.on('fileuploadpaste', (e) => {
+      this._pasted = true;
+
+      if (!$(".d-editor-input").is(":focus")) {
+        return;
+      }
+
+      const { canUpload, canPasteHtml } = clipboardData(e, true);
+
+      if (!canUpload || canPasteHtml) {
+        e.preventDefault();
+      }
+    });
+
     $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 +477,7 @@ export default Ember.Component.extend({
     });
 
     $element.on("fileuploadsend", (e, data) => {
+      this._pasted = false;
       this._validUploads++;
       this.appEvents.trigger('composer:insert-text', uploadPlaceholder);
 
@@ -259,6 +487,19 @@ export default Ember.Component.extend({
       }
     });
 
+    $element.on("fileuploaddone", (e, data) => {
+      let upload = data.result;
+
+      if (!this._xhr || !this._xhr._userCancelled) {
+        const markdown = getUploadMarkdown(upload);
+        cacheShortUploadUrl(upload.short_url, upload.url);
+        this.appEvents.trigger('composer:replace-text', uploadPlaceholder, markdown);
+        this._resetUpload(false);
+      } else {
+        this._resetUpload(true);
+      }
+    });
+
     $element.on("fileuploadfail", (e, data) => {
       this._resetUpload(true);
 
@@ -270,24 +511,8 @@ export default Ember.Component.extend({
       }
     });
 
-    this.messageBus.subscribe("/uploads/composer", upload => {
-      // replace upload placeholder
-      if (upload && upload.url) {
-        if (!this._xhr || !this._xhr._userCancelled) {
-          const markdown = getUploadMarkdown(upload);
-          this.appEvents.trigger('composer:replace-text', uploadPlaceholder, markdown);
-          this._resetUpload(false);
-        } else {
-          this._resetUpload(true);
-        }
-      } else {
-        this._resetUpload(true);
-        displayErrorForUpload(upload);
-      }
-    });
-
     if (this.site.mobileView) {
-      this.$(".mobile-file-upload").on("click.uploader", function () {
+      $("#reply-control .mobile-file-upload").on("click.uploader", function () {
         // redirect the click on the hidden file input
         $("#mobile-uploader").click();
       });
@@ -296,35 +521,6 @@ export default Ember.Component.extend({
     this._firefoxPastingHack();
   },
 
-  _optionsLocation() {
-    // long term we want some smart positioning algorithm in popup-menu
-    // the problem is that positioning in a fixed panel is a nightmare
-    // cause offsetParent can end up returning a fixed element and then
-    // using offset() is not going to work, so you end up needing special logic
-    // especially since we allow for negative .top, provided there is room on screen
-    const myPos = this.$().position();
-    const buttonPos = this.$('.options').position();
-
-    const popupHeight = $('#reply-control .popup-menu').height();
-    const popupWidth = $('#reply-control .popup-menu').width();
-
-    var top = myPos.top + buttonPos.top - 15;
-    var left = myPos.left + buttonPos.left - (popupWidth/2);
-
-    const composerPos = $('#reply-control').position();
-
-    if (composerPos.top + top - popupHeight < 0) {
-      top = top + popupHeight + this.$('.options').height() + 50;
-    }
-
-    var replyWidth = $('#reply-control').width();
-    if (left + popupWidth > replyWidth) {
-      left = replyWidth - popupWidth - 40;
-    }
-
-    return { position: "absolute", left, top };
-  },
-
   // Believe it or not pasting an image in Firefox doesn't work without this code
   _firefoxPastingHack() {
     const uaMatch = navigator.userAgent.match(/Firefox\/(\d+)\.\d/);
@@ -417,7 +613,7 @@ export default Ember.Component.extend({
   @on('willDestroyElement')
   _unbindUploadTarget() {
     this._validUploads = 0;
-    this.$(".mobile-file-upload").off("click.uploader");
+    $("#reply-control .mobile-file-upload").off("click.uploader");
     this.messageBus.unsubscribe("/uploads/composer");
     const $uploadTarget = this.$();
     try { $uploadTarget.fileupload("destroy"); }
@@ -434,9 +630,7 @@ export default Ember.Component.extend({
       Ember.run.later(() => this.appEvents.trigger("composer:closed"), 400);
     });
 
-    if (this.site.mobileView) {
-      $(window).off('resize.composer-popup-menu');
-    }
+    if (this._enableAdvancedEditorPreviewSync()) this._teardownInputPreviewSync();
   },
 
   actions: {
@@ -444,34 +638,20 @@ export default Ember.Component.extend({
       this.sendAction('importQuote', toolbarEvent);
     },
 
-    cancelUpload() {
-      if (this._xhr) {
-        this._xhr._userCancelled = true;
-        this._xhr.abort();
-      }
-      this._resetUpload(true);
+    onExpandPopupMenuOptions(toolbarEvent) {
+      const selected = toolbarEvent.selected;
+      toolbarEvent.selectText(selected.start, selected.end - selected.start);
+      this.sendAction('storeToolbarState', toolbarEvent);
     },
 
-    toggleOptions(toolbarEvent) {
-      if (this.get('optionsVisible')) {
-        this.sendAction('hideOptions');
-      } else {
-        const selected = toolbarEvent.selected;
-        toolbarEvent.selectText(selected.start, selected.end - selected.start);
-
-        this.sendAction('showOptions', toolbarEvent, this._optionsLocation());
-      }
+    togglePreview() {
+      this.sendAction('togglePreview');
     },
 
     showUploadModal(toolbarEvent) {
       this.sendAction('showUploadSelector', toolbarEvent);
     },
 
-    togglePreview() {
-      this.toggleProperty('showPreview');
-      this.keyValueStore.set({ key: 'composer.showPreview', value: this.get('showPreview') });
-    },
-
     extraButtons(toolbar) {
       toolbar.addButton({
         id: 'quote',
@@ -490,15 +670,14 @@ export default Ember.Component.extend({
         sendAction: 'showUploadModal'
       });
 
-      if (this.get("showPopupMenu")) {
-        toolbar.addButton({
-          id: 'options',
-          group: 'extras',
-          icon: 'gear',
-          title: 'composer.options',
-          sendAction: 'toggleOptions'
-        });
-      }
+      toolbar.addButton({
+        id: 'options',
+        group: 'extras',
+        icon: 'gear',
+        title: 'composer.options',
+        sendAction: 'onExpandPopupMenuOptions',
+        popupMenu: true
+      });
 
       if (this.site.mobileView) {
         toolbar.addButton({
@@ -541,6 +720,29 @@ export default Ember.Component.extend({
         Ember.run.debounce(this, this._loadOneboxes, $oneboxes, 450);
       }
 
+      // Short upload urls need resolution
+      resolveAllShortUrls(ajax);
+
+      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);
+      }
+
+      if (this._enableAdvancedEditorPreviewSync()) {
+        this._syncScroll(
+          this._syncEditorAndPreviewScroll,
+          this.$('.d-editor-input'),
+          $preview
+        );
+      }
+
       this.trigger('previewRefreshed', $preview);
       this.sendAction('afterRefresh', $preview);
     },
diff --git a/app/assets/javascripts/discourse/components/composer-messages.js.es6 b/app/assets/javascripts/discourse/components/composer-messages.js.es6
index 59b3586dd3..6f791315ab 100644
--- a/app/assets/javascripts/discourse/components/composer-messages.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-messages.js.es6
@@ -119,18 +119,15 @@ export default Ember.Component.extend({
     // We don't care about similar topics unless creating a topic
     if (!composer.get('creatingTopic')) { return; }
 
-    const origBody = composer.get('reply') || '';
+    // TODO pass the 200 in from somewhere
+    const raw = (composer.get('reply') || '').substr(0, 200);
     const title = composer.get('title') || '';
 
-    // Ensure the fields are of the minimum length
-    if (origBody.length < Discourse.SiteSettings.min_body_similar_length) { return; }
-    if (title.length < Discourse.SiteSettings.min_title_similar_length) { return; }
-
-    // TODO pass the 200 in from somewhere
-    const body = origBody.substr(0, 200);
+    // Ensure we have at least a title
+    if (title.length < this.siteSettings.min_title_similar_length) { return; }
 
     // Don't search over and over
-    const concat = title + body;
+    const concat = title + raw;
     if (concat === this._lastSimilaritySearch) { return; }
     this._lastSimilaritySearch = concat;
 
@@ -143,9 +140,9 @@ export default Ember.Component.extend({
 
     this._similarTopicsMessage = message;
 
-    composer.store.find('similar-topic', {title, raw: body}).then(newTopics => {
+    composer.store.find('similar-topic', { title, raw }).then(topics => {
       similarTopics.clear();
-      similarTopics.pushObjects(newTopics.get('content'));
+      similarTopics.pushObjects(topics.get('content'));
 
       if (similarTopics.get('length') > 0) {
         message.set('similarTopics', similarTopics);
@@ -168,8 +165,8 @@ export default Ember.Component.extend({
     if (topicId) { args.topic_id = topicId; }
     if (postId)  { args.post_id = postId; }
 
-    const queuedForTyping = this.get('queuedForTyping');
     composer.store.find('composer-message', args).then(messages => {
+      if (this.isDestroying || this.isDestroyed) { return; }
 
       // Checking composer messages on replies can give us a list of links to check for
       // duplicates
@@ -178,6 +175,7 @@ export default Ember.Component.extend({
       }
 
       this.set('checkedMessages', true);
+      const queuedForTyping = this.get('queuedForTyping');
       messages.forEach(msg => msg.wait_for_typing ? queuedForTyping.addObject(msg) : this.send('popup', msg));
     });
   }
diff --git a/app/assets/javascripts/discourse/components/composer-save-button.js.es6 b/app/assets/javascripts/discourse/components/composer-save-button.js.es6
new file mode 100644
index 0000000000..b33bfb04cc
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/composer-save-button.js.es6
@@ -0,0 +1,7 @@
+import Button from 'discourse/components/d-button';
+
+export default Button.extend({
+  tabindex: 5,
+  classNameBindings: [':btn-primary', ':create', 'disableSubmit:disabled'],
+  title: 'composer.title',
+});
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6
index 2e37da138e..2a828a9483 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,15 @@ 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();
+      });
+    }
+
+    if (this.get('composer.titleLength') > 0) {
+      Ember.run.debounce(this, this._titleChanged, 10);
     }
   },
 
@@ -119,7 +128,7 @@ export default Ember.Component.extend({
 
   @computed('composer.title', 'composer.titleLength')
   isAbsoluteUrl(title, titleLength) {
-    return titleLength > 0 && /^(https?:)?\/\/[\w\.\-]+/i.test(title);
+    return titleLength > 0 && /^(https?:)?\/\/[\w\.\-]+/i.test(title) && !/\s/.test(title);
   },
 
   bodyIsDefault() {
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 0000000000..205044922e
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/composer-toggles.js.es6
@@ -0,0 +1,22 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  tagName: '',
+
+  @computed('composeState')
+  title(composeState) {
+    if (composeState === "draft" || composeState === "saving") {
+      return "composer.abandon";
+    }
+    return "composer.collapse";
+  },
+
+  @computed('composeState')
+  toggleIcon(composeState) {
+    if (composeState === "draft" || composeState === "saving") {
+      return "times";
+    }
+    return "chevron-down";
+  }
+});
+
diff --git a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6 b/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
index c248ea5b95..58bddf795a 100644
--- a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
+++ b/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6
@@ -1,7 +1,7 @@
 import computed from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Component.extend({
-  classNameBindings: ['containerClass', 'condition:visible'],
+  classNameBindings: [':loading-container', 'containerClass', 'condition:visible'],
 
   @computed('size')
   containerClass(size) {
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 0000000000..60a96295c8
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/cook-text.js.es6
@@ -0,0 +1,25 @@
+import { cookAsync } from 'discourse/lib/text';
+import { ajax } from 'discourse/lib/ajax';
+
+const CookText = Ember.Component.extend({
+  tagName: '',
+  cooked: null,
+
+  didReceiveAttrs() {
+    this._super(...arguments);
+    cookAsync(this.get('rawText')).then(
+      cooked => {
+        this.set('cooked', cooked);
+        // no choice but to defer this cause
+        // pretty text may only be loaded now
+        Em.run.next(() =>
+          window.requireModule('pretty-text/image-short-url').resolveAllShortUrls(ajax)
+        );
+      }
+    );
+  }
+});
+
+CookText.reopenClass({ positionalParams: ['rawText'] });
+
+export default CookText;
diff --git a/app/assets/javascripts/discourse/components/create-topic-button.js.es6 b/app/assets/javascripts/discourse/components/create-topic-button.js.es6
new file mode 100644
index 0000000000..a792b83a29
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/create-topic-button.js.es6
@@ -0,0 +1 @@
+export default Ember.Component.extend({ tagName: '' });
diff --git a/app/assets/javascripts/discourse/components/d-button.js.es6 b/app/assets/javascripts/discourse/components/d-button.js.es6
index bd606facaf..c56e1b6b34 100644
--- a/app/assets/javascripts/discourse/components/d-button.js.es6
+++ b/app/assets/javascripts/discourse/components/d-button.js.es6
@@ -5,14 +5,25 @@ export default Ember.Component.extend({
   layoutName: 'components/d-button',
 
   tagName: 'button',
-  classNameBindings: [':btn', 'noText'],
-  attributeBindings: ['disabled', 'translatedTitle:title'],
+  classNameBindings: [':btn', 'noText', 'btnType'],
+  attributeBindings: ['disabled', 'translatedTitle:title', 'tabindex'],
+
+  btnIcon: Ember.computed.notEmpty('icon'),
+
+  @computed('icon', 'translatedLabel')
+  btnType(icon, translatedLabel) {
+    if (icon) {
+      return translatedLabel ? "btn-icon-text" : "btn-icon";
+    } else if (translatedLabel) {
+      return "btn-text";
+    }
+  },
 
   noText: Ember.computed.empty('translatedLabel'),
 
   @computed("title")
   translatedTitle(title) {
-    if (title) return I18n.t(title);
+    return title ? I18n.t(title) : this.get('translatedLabel');
   },
 
   @computed("label")
diff --git a/app/assets/javascripts/discourse/components/d-checkbox.js.es6 b/app/assets/javascripts/discourse/components/d-checkbox.js.es6
index 5e50bf98ed..91f6d6f0a6 100644
--- a/app/assets/javascripts/discourse/components/d-checkbox.js.es6
+++ b/app/assets/javascripts/discourse/components/d-checkbox.js.es6
@@ -3,9 +3,8 @@ import { on } from "ember-addons/ember-computed-decorators";
 export default Ember.Component.extend({
   tagName: 'label',
 
-  didInsertElement() {
-    this._super();
-
+  @on("didInsertElement")
+  _init() {
     const checked = this.get('checked');
     if (checked && checked !== "false") {
       this.$('input').prop('checked', true);
@@ -18,8 +17,7 @@ export default Ember.Component.extend({
   },
 
   @on('willDestroyElement')
-  willDestroyElement() {
-    this._super();
+  _clear() {
     this.$('input').off('click.d-checkbox');
   }
 });
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index 9307e4cffb..3d357ec225 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -1,18 +1,15 @@
 /*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';
-import { determinePostReplaceSelection } from 'discourse/lib/utilities';
+import { determinePostReplaceSelection, clipboardData } from 'discourse/lib/utilities';
+import toMarkdown from 'discourse/lib/to-markdown';
 import deprecated from 'discourse-common/lib/deprecated';
 
 // Our head can be a static string or a function that returns a string
@@ -40,6 +37,11 @@ const FOUR_SPACES_INDENT = '4-spaces-indent';
 
 const _createCallbacks = [];
 
+const isInside = (text, regex) => {
+  const matches = text.match(regex);
+  return matches && (matches.length % 2);
+};
+
 class Toolbar {
 
   constructor(site) {
@@ -78,7 +80,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'});
@@ -101,24 +107,6 @@ class Toolbar {
       perform: e => e.applyList(i => !i ? "1. " : `${parseInt(i) + 1}. `, 'list_item')
     });
 
-    this.addButton({
-      id: 'heading',
-      group: 'extras',
-      icon: 'header',
-      label: getButtonLabel('composer.heading_label', 'H'),
-      shortcut: 'Alt+1',
-      perform: e => e.applyList('## ', 'heading_text')
-    });
-
-    this.addButton({
-      id: 'rule',
-      group: 'extras',
-      icon: 'minus',
-      shortcut: 'Alt+R',
-      title: 'composer.hr_title',
-      perform: e => e.addText("\n\n----------\n")
-    });
-
     if (site.mobileView) {
       this.groups.push({group: 'mobileExtras', buttons: []});
     }
@@ -138,8 +126,9 @@ class Toolbar {
       label: button.label,
       icon: button.label ? null : button.icon || button.id,
       action: button.action || 'toolbarButton',
-      perform: button.perform || Ember.K,
-      trimLeading: button.trimLeading
+      perform: button.perform || function() { },
+      trimLeading: button.trimLeading,
+      popupMenu: button.popupMenu || false
     };
 
     if (button.sendAction) {
@@ -198,6 +187,7 @@ export default Ember.Component.extend({
   linkText: '',
   lastSel: null,
   _mouseTrap: null,
+  emojiPickerIsActive: false,
 
   @computed('placeholder')
   placeholderTranslated(placeholder) {
@@ -230,6 +220,13 @@ export default Ember.Component.extend({
 
     const mouseTrap = Mousetrap(this.$('.d-editor-input')[0]);
     const shortcuts = this.get('toolbar.shortcuts');
+
+    // for some reason I am having trouble bubbling this so hack it in
+    mouseTrap.bind(['ctrl+alt+f'], (event) =>{
+      this.appEvents.trigger('header:keyboard-trigger', {type: 'search', event});
+      return true;
+    });
+
     Object.keys(shortcuts).forEach(sc => {
       const button = shortcuts[sc];
       mouseTrap.bind(sc, () => {
@@ -247,7 +244,8 @@ export default Ember.Component.extend({
     });
 
     if (this.get('composerEvents')) {
-      this.appEvents.on('composer:insert-text', text => this._addText(this._getSelected(), text));
+      this.appEvents.on('composer:insert-block', text => this._addBlock(this._getSelected(), text));
+      this.appEvents.on('composer:insert-text', (text, options) => this._addText(this._getSelected(), text, options));
       this.appEvents.on('composer:replace-text', (oldVal, newVal) => this._replaceText(oldVal, newVal));
     }
     this._mouseTrap = mouseTrap;
@@ -262,6 +260,7 @@ export default Ember.Component.extend({
 
     const mouseTrap = this._mouseTrap;
     Object.keys(this.get('toolbar.shortcuts')).forEach(sc => mouseTrap.unbind(sc));
+    mouseTrap.unbind('ctrl+/','command+/');
     this.$('.d-editor-preview').off('click.preview');
   },
 
@@ -279,14 +278,15 @@ 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 => {
+      if (this.get('isDestroyed')) { return; }
+      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);
+      });
     });
   },
 
@@ -309,11 +309,7 @@ export default Ember.Component.extend({
       template: findRawTemplate('category-tag-autocomplete'),
       key: '#',
       transformComplete(obj) {
-        if (obj.model) {
-          return Category.slugFor(obj.model, SEPARATOR);
-        } else {
-          return `${obj.text}${TAG_HASHTAG_POSTFIX}`;
-        }
+        return obj.text;
       },
       dataSource(term) {
         return searchCategoryTag(term, siteSettings);
@@ -327,7 +323,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 +332,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 +359,20 @@ export default Ember.Component.extend({
             return resolve([translations[full]]);
           }
 
+          const match = term.match(/^:?(.*?):t([2-6])?$/);
+          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,14 +435,20 @@ 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)) {
+          (l.slice(0, hlen) === hval && tlen === 0 ||
+          (tail.length && l.slice(-tlen) === tail))) {
+
         operation = OP.REMOVED;
         if (tlen === 0) {
           const result = l.slice(hlen);
@@ -494,7 +501,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) {
@@ -506,9 +521,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,8 +568,53 @@ export default Ember.Component.extend({
     this._selectText(newSelection.start, newSelection.end - newSelection.start);
   },
 
-  _addText(sel, text) {
+  _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");
+    } else {
+      post = "\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, options) {
+    const $textarea = this.$('textarea.d-editor-input');
+
+    if (options && options.ensureSpace) {
+      if ((sel.pre + '').length > 0) {
+        if (!sel.pre.match(/\s$/)) {
+          text = ' ' + text;
+        }
+      }
+      if ((sel.post + '').length > 0) {
+        if (!sel.post.match(/^\s/)) {
+          text = text + ' ';
+        }
+      }
+    }
+
     const insert = `${sel.pre}${text}`;
     const value = `${insert}${sel.post}`;
     this.set('value', value);
@@ -564,14 +624,102 @@ export default Ember.Component.extend({
     Ember.run.scheduleOnce("afterRender", () => $textarea.focus());
   },
 
+  _extractTable(text) {
+    if (text.endsWith("\n")) {
+      text = text.substring(0, text.length - 1);
+    }
+
+    let rows = text.split("\n");
+
+    if (rows.length > 1) {
+      const columns = rows.map(r => r.split("\t").length);
+      const isTable = columns.reduce((a, b) => a && columns[0] === b && b > 1) &&
+                      !(columns[0] === 2 && rows[0].split("\t")[0].match(/^•$|^\d+.$/)); // to skip tab delimited lists
+
+      if (isTable) {
+        const splitterRow = [...Array(columns[0])].map(() => "---").join("\t");
+        rows.splice(1, 0, splitterRow);
+
+        return "|" + rows.map(r => r.split("\t").join("|")).join("|\n|") + "|\n";
+      }
+    }
+    return null;
+  },
+
+  paste(e) {
+    if (!$(".d-editor-input").is(":focus")) {
+      return;
+    }
+
+    const isComposer = $("#reply-control .d-editor-input").is(":focus");
+    let { clipboard, canPasteHtml } = clipboardData(e, isComposer);
+
+    let plainText = clipboard.getData("text/plain");
+    let html = clipboard.getData("text/html");
+    let handled = false;
+
+    if (plainText) {
+      plainText = plainText.trim().replace(/\r/g,"");
+      const table = this._extractTable(plainText);
+      if (table) {
+        this.appEvents.trigger('composer:insert-text', table);
+        handled = true;
+      }
+    }
+
+    const { pre, lineVal } = this._getSelected(null, {lineVal: true});
+    const isInlinePasting = pre.match(/[^\n]$/);
+
+    if (canPasteHtml && plainText) {
+      if (isInlinePasting) {
+        canPasteHtml = !(lineVal.match(/^```/) || isInside(pre, /`/g) || lineVal.match(/^    /));
+      } else {
+        canPasteHtml = !isInside(pre, /(^|\n)```/g);
+      }
+    }
+
+    if (canPasteHtml && !handled) {
+      let markdown = toMarkdown(html);
+
+      if (!plainText || plainText.length < markdown.length) {
+        if(isInlinePasting) {
+          markdown = markdown.replace(/^#+/, "").trim();
+          markdown = pre.match(/\S$/) ? ` ${markdown}` : markdown;
+        }
+
+        this.appEvents.trigger('composer:insert-text', markdown);
+        handled = true;
+      }
+    }
+
+    if (handled) {
+      e.preventDefault();
+    }
+  },
+
   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 +791,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/d-modal-body.js.es6 b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
index 42c797ddf9..660456db7f 100644
--- a/app/assets/javascripts/discourse/components/d-modal-body.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
@@ -1,10 +1,17 @@
 export default Ember.Component.extend({
   classNames: ['modal-body'],
+  fixed: false,
 
   didInsertElement() {
     this._super();
     $('#modal-alert').hide();
-    $('#discourse-modal').modal('show');
+
+    let fixedParent = this.$().closest('.d-modal.fixed-modal');
+    if (fixedParent.length) {
+      this.set('fixed', true);
+      fixedParent.modal('show');
+    }
+
     Ember.run.scheduleOnce('afterRender', this, this._afterFirstRender);
     this.appEvents.on('modal-body:flash', msg => this._flash(msg));
   },
@@ -28,7 +35,14 @@ export default Ember.Component.extend({
       }
     }
 
-    this.appEvents.trigger('modal:body-shown', this.getProperties('title', 'rawTitle'));
+    this.appEvents.trigger(
+      'modal:body-shown',
+      this.getProperties(
+        'title',
+        'rawTitle',
+        'fixed'
+      )
+    );
   },
 
   _flash(msg) {
diff --git a/app/assets/javascripts/discourse/components/d-modal-cancel.js.es6 b/app/assets/javascripts/discourse/components/d-modal-cancel.js.es6
new file mode 100644
index 0000000000..9250c1ae73
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/d-modal-cancel.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  tagName: ''
+});
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
index 475c79d049..c015ca6ba5 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -1,10 +1,20 @@
 import { on } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
-  elementId: 'discourse-modal',
-  classNameBindings: [':modal', ':hidden', 'modalClass'],
+  classNameBindings: [':modal', ':d-modal', 'modalClass', 'modalStyle'],
   attributeBindings: ['data-keyboard'],
 
+  init() {
+    this._super(...arguments);
+
+    // If we need to render a second modal for any reason, we can't
+    // use `elementId`
+    if (this.get('modalStyle') !== 'inline-modal') {
+      this.set('elementId', 'discourse-modal');
+      this.set('modalStyle', 'fixed-modal');
+    }
+  },
+
   // We handle ESC ourselves
   'data-keyboard': 'false',
 
@@ -17,6 +27,11 @@ export default Ember.Component.extend({
     });
 
     this.appEvents.on('modal:body-shown', data => {
+      if (this.isDestroying || this.isDestroyed) { return; }
+      if (data.fixed) {
+        this.$().removeClass('hidden');
+      }
+
       if (data.title) {
         this.set('title', I18n.t(data.title));
       } else if (data.rawTitle) {
diff --git a/app/assets/javascripts/discourse/components/d-navigation.js.es6 b/app/assets/javascripts/discourse/components/d-navigation.js.es6
new file mode 100644
index 0000000000..ff1e6ef40a
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/d-navigation.js.es6
@@ -0,0 +1,25 @@
+import computed from "ember-addons/ember-computed-decorators";
+
+export default Ember.Component.extend({
+  tagName: '',
+
+  @computed('category')
+  showCategoryNotifications(category) {
+    return category && this.currentUser;
+  },
+
+  @computed()
+  categories() {
+    return this.site.get('categoriesList');
+  },
+
+  @computed('category.can_edit')
+  showCategoryEdit: canEdit => canEdit,
+
+  @computed("filterMode", "category", 'noSubcategories')
+  navItems(filterMode, category, noSubcategories) {
+    // we don't want to show the period in the navigation bar since it's in a dropdown
+    if (filterMode.indexOf("top/") === 0) { filterMode = filterMode.replace("top/", ""); }
+    return Discourse.NavItem.buildList(category, { filterMode, noSubcategories });
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/date-picker.js.es6 b/app/assets/javascripts/discourse/components/date-picker.js.es6
index d2667dd863..709e1e5149 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/directory-toggle.js.es6 b/app/assets/javascripts/discourse/components/directory-toggle.js.es6
index 3f55ec0543..8da529957a 100644
--- a/app/assets/javascripts/discourse/components/directory-toggle.js.es6
+++ b/app/assets/javascripts/discourse/components/directory-toggle.js.es6
@@ -1,4 +1,4 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
 export default Ember.Component.extend(bufferedRender({
diff --git a/app/assets/javascripts/discourse/components/discourse-topic.js.es6 b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
index ba81a63bf3..809d3b6f90 100644
--- a/app/assets/javascripts/discourse/components/discourse-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-topic.js.es6
@@ -99,7 +99,6 @@ export default Ember.Component.extend(AddArchetypeClass, Scrolling, {
     // this happens after route exit, stuff could have trickled in
     this.appEvents.trigger('header:hide-topic');
     this.appEvents.off('post:highlight');
-
   },
 
   @observes('Discourse.hasFocus')
diff --git a/app/assets/javascripts/discourse/components/dropdown-button.js.es6 b/app/assets/javascripts/discourse/components/dropdown-button.js.es6
index 032c80e2af..bffeaa6cdc 100644
--- a/app/assets/javascripts/discourse/components/dropdown-button.js.es6
+++ b/app/assets/javascripts/discourse/components/dropdown-button.js.es6
@@ -1,3 +1,4 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
 export default Ember.Component.extend(bufferedRender({
@@ -29,7 +30,7 @@ export default Ember.Component.extend(bufferedRender({
       buffer.push("<h4 class='title'>" + title + "</h4>");
     }
 
-    buffer.push(`<button class='btn standard dropdown-toggle ${this.get('buttonExtraClasses')}' data-toggle='dropdown'>${this.get('text')}</button>`);
+    buffer.push(`<button class='btn standard dropdown-toggle ${this.get('buttonExtraClasses') || ''}' data-toggle='dropdown'>${this.get('text')}</button>`);
     buffer.push("<ul class='dropdown-menu'>");
 
     const contents = this.get('dropDownContent');
@@ -40,7 +41,15 @@ export default Ember.Component.extend(bufferedRender({
               className = (self.get('activeItem') === id ? 'disabled': '');
 
         buffer.push("<li data-id=\"" + id + "\" class=\"" + className + "\"><a href>");
-        buffer.push("<span class='icon " + row.styleClasses + "'></span>");
+
+        if (row.icon) {
+          let iconClass = 'icon';
+          if (row.iconClass) {
+            iconClass += ` ${row.iconClass}`;
+          }
+          buffer.push(iconHTML(row.icon, { tagName: 'span', class: iconClass }));
+        }
+
         buffer.push("<div><span class='title'>" + row.title + "</span>");
         buffer.push("<span>" + row.description + "</span></div>");
         buffer.push("</a></li>");
diff --git a/app/assets/javascripts/discourse/components/edit-category-general.js.es6 b/app/assets/javascripts/discourse/components/edit-category-general.js.es6
index e26c24a21e..906acf2ae8 100644
--- a/app/assets/javascripts/discourse/components/edit-category-general.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-general.js.es6
@@ -2,56 +2,69 @@ import DiscourseURL from 'discourse/lib/url';
 import { buildCategoryPanel } from 'discourse/components/edit-category-panel';
 import { categoryBadgeHTML } from 'discourse/helpers/category-link';
 import Category from 'discourse/models/category';
+import computed from 'ember-addons/ember-computed-decorators';
 
 export default buildCategoryPanel('general', {
   foregroundColors: ['FFFFFF', '000000'],
   canSelectParentCategory: Em.computed.not('category.isUncategorizedCategory'),
 
   // background colors are available as a pipe-separated string
-  backgroundColors: function() {
-    const categories = Discourse.Category.list();
+  @computed
+  backgroundColors() {
+    const categories = this.site.get('categoriesList');
     return this.siteSettings.category_colors.split("|").map(function(i) { return i.toUpperCase(); }).concat(
                 categories.map(function(c) { return c.color.toUpperCase(); }) ).uniq();
-  }.property(),
+  },
 
-  usedBackgroundColors: function() {
-    const categories = Discourse.Category.list();
-    const category = this.get('category');
+  @computed
+  noCategoryStyle() {
+    return this.siteSettings.category_style === 'none';
+  },
+
+  @computed('category.id', 'category.color')
+  usedBackgroundColors(categoryId, categoryColor) {
+    const categories = this.site.get('categoriesList');
 
     // If editing a category, don't include its color:
     return categories.map(function(c) {
-      return (category.get('id') && category.get('color').toUpperCase() === c.color.toUpperCase()) ? null : c.color.toUpperCase();
+      return (categoryId && categoryColor.toUpperCase() === c.color.toUpperCase()) ? null : c.color.toUpperCase();
     }, this).compact();
-  }.property('category.id', 'category.color'),
+  },
 
-  parentCategories: function() {
-    return Discourse.Category.list().filter(function (c) {
-      return !c.get('parentCategory');
-    });
-  }.property(),
+  @computed
+  parentCategories() {
+    return this.site.get('categoriesList').filter(c => !c.get('parentCategory'));
+  },
 
-  categoryBadgePreview: function() {
+  @computed(
+    'category.parent_category_id',
+    'category.categoryName',
+    'category.color',
+    'category.text_color'
+  )
+  categoryBadgePreview(parentCategoryId, name, color, textColor) {
     const category = this.get('category');
     const c = Category.create({
-      name: category.get('categoryName'),
-      color: category.get('color'),
-      text_color: category.get('text_color'),
-      parent_category_id: parseInt(category.get('parent_category_id'),10),
+      name,
+      color,
+      text_color: textColor,
+      parent_category_id: parseInt(parentCategoryId),
       read_restricted: category.get('read_restricted')
     });
-    return categoryBadgeHTML(c, {link: false});
-  }.property('category.parent_category_id', 'category.categoryName', 'category.color', 'category.text_color'),
-
+    return categoryBadgeHTML(c, { link: false });
+  },
 
   // We can change the parent if there are no children
-  subCategories: function() {
-    if (Ember.isEmpty(this.get('category.id'))) { return null; }
-    return Category.list().filterBy('parent_category_id', this.get('category.id'));
-  }.property('category.id'),
+  @computed('category.id')
+  subCategories(categoryId) {
+    if (Ember.isEmpty(categoryId)) { return null; }
+    return Category.list().filterBy('parent_category_id', categoryId);
+  },
 
-  showDescription: function() {
-    return !this.get('category.isUncategorizedCategory') && this.get('category.id');
-  }.property('category.isUncategorizedCategory', 'category.id'),
+  @computed('category.isUncategorizedCategory', 'category.id')
+  showDescription(isUncategorizedCategory, categoryId) {
+    return !isUncategorizedCategory && categoryId;
+  },
 
   actions: {
     showCategoryTopic() {
diff --git a/app/assets/javascripts/discourse/components/edit-category-security.js.es6 b/app/assets/javascripts/discourse/components/edit-category-security.js.es6
index 05b1f02515..83d658564d 100644
--- a/app/assets/javascripts/discourse/components/edit-category-security.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-security.js.es6
@@ -20,6 +20,8 @@ export default buildCategoryPanel('security', {
           permission: PermissionType.create({ id: parseInt(id) })
         });
       }
+
+      this.set('selectedGroup', this.get('category.availableGroups.firstObject'));
     },
 
     removePermission(permission) {
diff --git a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
index 556e072ea1..220da95a4a 100644
--- a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
@@ -23,9 +23,17 @@ export default Em.Component.extend({
     this.get('panels').addObject(this.get('tabClassName'));
   },
 
+  _resetModalScrollState() {
+    const $modalBody = this.$().parents("#discourse-modal").find(".modal-body");
+    if ($modalBody.length === 1) {
+      $modalBody.scrollTop(0);
+    }
+  },
+
   actions: {
     select: function() {
       this.set('selectedTab', this.get('tab'));
+      this._resetModalScrollState();
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6 b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
new file mode 100644
index 0000000000..421972b834
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
@@ -0,0 +1,50 @@
+import { default as computed, observes, on } from "ember-addons/ember-computed-decorators";
+
+import {
+  PUBLISH_TO_CATEGORY_STATUS_TYPE,
+  OPEN_STATUS_TYPE,
+  DELETE_STATUS_TYPE,
+  REMINDER_TYPE,
+  CLOSE_STATUS_TYPE
+} from 'discourse/controllers/edit-topic-timer';
+
+export default Ember.Component.extend({
+  selection: Ember.computed.alias('topicTimer.status_type'),
+  autoOpen: Ember.computed.equal('selection', OPEN_STATUS_TYPE),
+  autoClose: Ember.computed.equal('selection', CLOSE_STATUS_TYPE),
+  autoDelete: Ember.computed.equal('selection', DELETE_STATUS_TYPE),
+  publishToCategory: Ember.computed.equal('selection', PUBLISH_TO_CATEGORY_STATUS_TYPE),
+  reminder: Ember.computed.equal('selection', REMINDER_TYPE),
+  showTimeOnly: Ember.computed.or('autoOpen', 'autoDelete', 'reminder'),
+
+  @computed('topicTimer.updateTime', 'loading', 'publishToCategory', 'topicTimer.category_id')
+  saveDisabled(updateTime, loading, publishToCategory, topicTimerCategoryId) {
+    return Ember.isEmpty(updateTime) ||
+      loading ||
+      (publishToCategory && !topicTimerCategoryId);
+  },
+
+  @computed("topic.visible")
+  excludeCategoryId(visible) {
+    if (visible) return this.get('topic.category_id');
+  },
+
+  @on('init')
+  @observes("topicTimer", "topicTimer.execute_at", "topicTimer.duration")
+  _setUpdateTime() {
+    let time = null;
+    const executeAt = this.get('topicTimer.execute_at');
+
+    if (executeAt && this.get("topicTimer.based_on_last_post")) {
+      time = this.get("topicTimer.duration");
+    } else if (executeAt) {
+      const closeTime = moment(executeAt);
+
+      if (closeTime > moment()) {
+        time = closeTime.format("YYYY-MM-DD HH:mm");
+      }
+    }
+
+    this.set("topicTimer.updateTime", time);
+  }
+});
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 0000000000..03efe27a53
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -0,0 +1,539 @@
+import { on, 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 });
+}
+
+export default Ember.Component.extend({
+  automaticPositioning: true,
+
+  close() {
+    this._unbindEvents();
+
+    this.$picker
+      .css({width: "", left: "", bottom: "", display: "none"})
+      .empty();
+
+    this.$modal.removeClass("fadeIn");
+
+    clearTimeout(this._checkTimeout);
+  },
+
+  show() {
+    const template = findRawTemplate("emoji-picker")({customEmojis});
+    this.$picker.html(template);
+
+    this.$filter = this.$picker.find(".filter");
+    this.$results = this.$picker.find(".results");
+    this.$list = this.$picker.find(".list");
+
+    this.set("selectedDiversity", keyValueStore.getObject(EMOJI_SELECTED_DIVERSITY) || 1);
+    this.set("recentEmojis", keyValueStore.getObject(EMOJI_USAGE) || []);
+
+    Ember.run.scheduleOnce("afterRender", this, function() {
+      this._bindEvents();
+      this._sectionLoadingCheck();
+      this._loadCategoriesEmojis();
+      this._positionPicker();
+      this._scrollTo();
+      this._updateSelectedDiversity();
+    });
+  },
+
+  @on("init")
+  _setInitialValues() {
+    this._checkTimeout = null;
+    this.scrollPosition = 0;
+    this.$visibleSections = [];
+  },
+
+  @on("willDestroyElement")
+  _unbindGlobalEvents() {
+    this.appEvents.off("emoji-picker:close");
+  },
+
+  @on("didInsertElement")
+  _setup() {
+    this.$picker = this.$(".emoji-picker");
+    this.$modal = this.$(".emoji-picker-modal");
+
+    this.appEvents.on("emoji-picker:close", () => this.set("active", false));
+
+    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)) });
+    }
+  },
+
+  @on("didUpdateAttrs")
+  _setState() {
+    this.get("active") === true ? this.show() : this.close();
+  },
+
+  @observes("filter")
+  filterChanged() {
+    this.$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(this.$list.find(".emoji[data-loaded='1'].diversity"), (_, button) => {
+      $(button).css("background-image", "").removeAttr("data-loaded");
+    });
+
+    if(this.get("filter") !== "") {
+      $.each(this.$results.find(".emoji.diversity"), (_, button) => this._setButtonBackground(button, true) );
+    }
+
+    this._updateSelectedDiversity();
+  },
+
+  @observes("recentEmojis")
+  _recentEmojisChanged() {
+    const previousScrollTop = this.scrollPosition;
+    const $recentSection = this.$list.find(".section[data-section='recent']");
+    const $recentSectionGroup = $recentSection.find(".section-group");
+    const $recentCategory = this.$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) {
+      this.$list.scrollTop(previousScrollTop + $recentSection.outerHeight());
+    }
+
+    this._bindHover($recentSectionGroup);
+  },
+
+  _updateSelectedDiversity() {
+    const $diversityPicker = this.$picker.find(".diversity-picker");
+
+    $diversityPicker.find(".diversity-scale").removeClass("selected");
+    $diversityPicker
+      .find(`.diversity-scale[data-level="${this.get("selectedDiversity")}"]`)
+      .addClass("selected");
+  },
+
+  _sectionLoadingCheck() {
+    this._checkTimeout = setTimeout(() => { this._sectionLoadingCheck(); }, 500);
+    Ember.run.throttle(this, this._checkVisibleSection, 100);
+  },
+
+  _loadCategoriesEmojis() {
+    $.each(this.$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(this.$list.find(".section-group"));
+    this._bindClearRecentEmojisGroup();
+    this._bindResizing();
+    this._bindCategoryClick();
+    this._bindModalClick();
+    this._bindFilterInput();
+
+    if(!this.site.isMobileDevice) {
+      this._bindHover();
+    }
+  },
+
+  _bindModalClick() {
+    this.$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;
+      }
+    });
+  },
+
+  @on("willDestroyElement")
+  _unbindEvents() {
+    this.$().off();
+    this.$(window).off("resize");
+    this.$modal.off("click");
+    $("#reply-control").off("div-resizing");
+    this.$(document).off("click.emoji-picker");
+  },
+
+  _filterEmojisList() {
+    if (this.get("filter") === "") {
+      this.$filter.find("input[name='filter']").val("");
+      this.$results.empty().hide();
+      this.$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);
+      this.$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(this.$results);
+      this._bindEmojiClick(this.$results);
+      this.$list.hide();
+    }
+  },
+
+  _bindFilterInput() {
+    const $input = this.$filter.find("input");
+
+    $input.on("input", (event) => {
+      this.set("filter", event.currentTarget.value);
+    });
+
+    this.$filter.find(".clear-filter").on("click", () => {
+      $input.val("").focus();
+      this.set("filter", "");
+      return false;
+    });
+  },
+
+  _bindCategoryClick() {
+    this.$picker.find(".category-icon").on("click", "button.emoji", (event) => {
+      this.set("filter", "");
+      this.$results.empty();
+      this.$list.show();
+
+      const section = $(event.currentTarget).data("section");
+      const $section = this.$list.find(`.section[data-section="${section}"]`);
+      const scrollTop = this.$list.scrollTop() + ($section.offset().top - this.$list.offset().top);
+      this._scrollTo(scrollTop);
+      return false;
+    });
+  },
+
+  _bindHover($hoverables) {
+    const replaceInfoContent = (html) => this.$picker.find(".footer .info").html(html || "");
+
+    ($hoverables || this.$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);
+    });
+
+    $("#reply-control").on("div-resizing", () => {
+      Ember.run.throttle(this, this._positionPicker, 16);
+    });
+  },
+
+  _bindClearRecentEmojisGroup() {
+    const $recent = this.$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.$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() {
+    this.$list.on("scroll", () => {
+      this.scrollPosition = this.$list.scrollTop();
+      Ember.run.throttle(this, this._checkVisibleSection, 150);
+    });
+  },
+
+  _checkVisibleSection() {
+    // make sure we stop loading if picker has been removed
+    if(!this.$picker) {
+      return;
+    }
+
+    const $sections = this.$list.find(".section");
+    const listHeight = this.$list.innerHeight();
+    let $selectedSection;
+
+    this.$visibleSections = _.filter($sections, section => {
+      const $section = $(section);
+      const sectionTop = $section.position().top;
+      return sectionTop + $section.height() > 0 && sectionTop < listHeight;
+    });
+
+    if (!_.isEmpty(this.get("recentEmojis")) && this.scrollPosition === 0) {
+      $selectedSection = $(_.first(this.$visibleSections));
+    } else {
+      $selectedSection = $(_.last(this.$visibleSections));
+    }
+
+    if($selectedSection) {
+      this.$picker.find(".category-icon").removeClass("current");
+      this.$picker.find(`.category-icon button[data-section='${$selectedSection.data("section")}']`)
+             .parent()
+             .addClass("current");
+
+      this._loadVisibleSections();
+    }
+  },
+
+  _loadVisibleSections() {
+    if(!this.$visibleSections) {
+      return;
+    }
+
+    const listHeight = this.$list.innerHeight();
+    this.$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 = this.$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() -
+                          $(".d-header").height() -
+                          $("#reply-control").height();
+
+    return verticalSpace < this.$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.$modal.addClass("fadeIn");
+      this.$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.$modal.addClass("fadeIn");
+      this.$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.$modal.removeClass("fadeIn");
+      this.$picker.css(_.merge(attributes, options));
+    };
+
+    if(Ember.testing || this.get("automaticPositioning") === false) {
+      desktopPositioning();
+      return;
+    }
+
+    if(this.site.isMobileDevice) {
+      mobilePositioning();
+    } else {
+      if(this._isReplyControlExpanded()) {
+        let $editorWrapper = $(".d-editor-preview-wrapper");
+        if(($editorWrapper.is(":visible") && $editorWrapper.width() < 400) || windowWidth < 485) {
+          desktopModalePositioning();
+        } else {
+          if($editorWrapper.is(":visible")) {
+            let previewOffset = $(".d-editor-preview-wrapper").offset();
+            let replyControlOffset = $("#reply-control").offset();
+            let left = previewOffset.left - replyControlOffset.left;
+            desktopPositioning({left});
+          } else {
+            desktopPositioning({
+              right: ($("#reply-control").width() - $(".d-editor-container").width()) / 2
+            });
+          }
+        }
+      } else {
+        if(windowWidth < 485) {
+          desktopModalePositioning();
+        } else {
+          let previewInputOffset = $(".d-editor-input").offset();
+          let left = previewInputOffset.left;
+          desktopPositioning({left, bottom: $("#reply-control").height() - 45});
+        }
+      }
+    }
+
+    const infoMaxWidth = this.$picker.width() -
+                         this.$picker.find(".categories-column").width() -
+                         this.$picker.find(".diversity-picker").width() -
+                         32;
+    this.$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) ? this.scrollPosition : y;
+
+    this.$list.scrollTop(yPosition);
+
+    // if we don’t actually scroll we need to force it
+    if(yPosition === 0) {
+      this.$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 0000000000..643781dba4
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/expand-post.js.es6
@@ -0,0 +1,30 @@
+import { ajax } from 'discourse/lib/ajax';
+
+export default Ember.Component.extend({
+  tagName: '',
+  expanded: null,
+  _loading: false,
+
+  actions: {
+    toggleItem() {
+      if (this._loading) { return false; }
+      const item = this.get('item');
+
+      if (this.get('expanded')) {
+        this.set('expanded', false);
+        item.set('expandedExcerpt', null);
+        return;
+      }
+
+      const topicId = item.get('topic_id');
+      const postNumber = item.get('post_number');
+
+      this._loading = true;
+      return ajax(`/posts/by_number/${topicId}/${postNumber}.json`).then(result => {
+        this.set('expanded', true);
+        item.set('expandedExcerpt', result.cooked);
+      }).finally(() => this._loading = false);
+    }
+  }
+});
+
diff --git a/app/assets/javascripts/admin/components/expanding-text-area.js.es6 b/app/assets/javascripts/discourse/components/expanding-text-area.js.es6
similarity index 100%
rename from app/assets/javascripts/admin/components/expanding-text-area.js.es6
rename to app/assets/javascripts/discourse/components/expanding-text-area.js.es6
diff --git a/app/assets/javascripts/discourse/components/flag-action-type.js.es6 b/app/assets/javascripts/discourse/components/flag-action-type.js.es6
index 0598ffa8e8..7f0ffb70ed 100644
--- a/app/assets/javascripts/discourse/components/flag-action-type.js.es6
+++ b/app/assets/javascripts/discourse/components/flag-action-type.js.es6
@@ -2,6 +2,7 @@ import { MAX_MESSAGE_LENGTH } from 'discourse/models/post-action-type';
 import computed from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Component.extend({
+  classNames: ['flag-action-type'],
 
   @computed('flag.name_key')
   customPlaceholder(nameKey) {
diff --git a/app/assets/javascripts/discourse/components/flagged-posts.js.es6 b/app/assets/javascripts/discourse/components/flagged-posts.js.es6
new file mode 100644
index 0000000000..67763d54e4
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/flagged-posts.js.es6
@@ -0,0 +1,18 @@
+export default Ember.Component.extend({
+  canAct: Ember.computed.equal('filter', 'active'),
+  showResolvedBy: Ember.computed.equal('filter', 'old'),
+  allLoaded: false,
+
+  actions: {
+    removePost(flaggedPost) {
+      this.get('flaggedPosts').removeObject(flaggedPost);
+    },
+
+    loadMore() {
+      const flaggedPosts = this.get('flaggedPosts');
+      if (flaggedPosts.get('canLoadMore')) {
+        flaggedPosts.loadMore();
+      }
+    }
+  }
+});
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 0000000000..792db36138
--- /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/footer-message.js.es6 b/app/assets/javascripts/discourse/components/footer-message.js.es6
new file mode 100644
index 0000000000..1d6d852838
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/footer-message.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  classNames: ['footer-message']
+});
diff --git a/app/assets/javascripts/discourse/components/future-date-input.js.es6 b/app/assets/javascripts/discourse/components/future-date-input.js.es6
new file mode 100644
index 0000000000..5c9d37527e
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/future-date-input.js.es6
@@ -0,0 +1,101 @@
+import { default as computed, observes } from "ember-addons/ember-computed-decorators";
+import {
+  FORMAT,
+} from "select-kit/components/future-date-input-selector";
+
+import { PUBLISH_TO_CATEGORY_STATUS_TYPE } from 'discourse/controllers/edit-topic-timer';
+
+export default Ember.Component.extend({
+  selection: null,
+  date: null,
+  time: null,
+  isCustom: Ember.computed.equal('selection', 'pick_date_and_time'),
+  isBasedOnLastPost: Ember.computed.equal('selection', 'set_based_on_last_post'),
+  displayLabel: null,
+
+  init() {
+    this._super();
+
+    const input = this.get('input');
+
+    if (input) {
+      if (this.get('basedOnLastPost')) {
+        this.set('selection', 'set_based_on_last_post');
+      } else {
+        this.set('selection', 'pick_date_and_time');
+        const datetime = moment(input);
+        this.set('date', datetime.toDate());
+        this.set('time', datetime.format("HH:mm"));
+        this._updateInput();
+      }
+    }
+  },
+
+  @observes("date", "time")
+  _updateInput() {
+    const date = moment(this.get('date')).format("YYYY-MM-DD");
+    const time = (this.get('time') && ` ${this.get('time')}`) || '';
+    this.set('input', moment(`${date}${time}`).format(FORMAT));
+  },
+
+  @observes("isBasedOnLastPost")
+  _updateBasedOnLastPost() {
+    this.set('basedOnLastPost', this.get('isBasedOnLastPost'));
+  },
+
+  @computed("input", "isBasedOnLastPost")
+  duration(input, isBasedOnLastPost) {
+    const now = moment();
+
+    if (isBasedOnLastPost) {
+      return parseFloat(input);
+    } else {
+      return moment(input) - now;
+    }
+  },
+
+  @computed("input", "isBasedOnLastPost")
+  executeAt(input, isBasedOnLastPost) {
+    if (isBasedOnLastPost) {
+      return moment().add(input, 'hours').format(FORMAT);
+    } else {
+      return input;
+    }
+  },
+
+  didReceiveAttrs() {
+    this.set('displayLabel', I18n.t(this.get('label') || 'topic.topic_status_update.when'));
+  },
+
+  @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 {
+      return input;
+    }
+  },
+
+  @computed('isBasedOnLastPost', 'input', 'lastPostedAt')
+  willCloseImmediately(isBasedOnLastPost, input, lastPostedAt) {
+    if (isBasedOnLastPost && input) {
+      let closeDate = moment(lastPostedAt);
+      closeDate = closeDate.add(input, 'hours');
+      return closeDate < moment();
+    }
+  },
+
+  @computed('isBasedOnLastPost', 'lastPostedAt')
+  willCloseI18n(isBasedOnLastPost, lastPostedAt) {
+    if (isBasedOnLastPost) {
+      const diff = Math.round((new Date() - new Date(lastPostedAt)) / (1000*60*60));
+      return I18n.t('topic.auto_close_immediate', { count: diff });
+    }
+  },
+});
diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6
index d3ae423548..06f7e68a16 100644
--- a/app/assets/javascripts/discourse/components/global-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/global-notice.js.es6
@@ -1,5 +1,5 @@
 import { on } from 'ember-addons/ember-computed-decorators';
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import LogsNotice from 'discourse/services/logs-notice';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
diff --git a/app/assets/javascripts/discourse/components/google-search.js.es6 b/app/assets/javascripts/discourse/components/google-search.js.es6
new file mode 100644
index 0000000000..97036b0117
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/google-search.js.es6
@@ -0,0 +1,13 @@
+import computed from "ember-addons/ember-computed-decorators";
+
+export default Ember.Component.extend({
+  classNames: ['google-search-form'],
+  classNameBindings: ['hidden:hidden'],
+
+  hidden: Ember.computed.alias('siteSettings.login_required'),
+
+  @computed
+  siteUrl() {
+    return `${location.protocol}//${location.host}${Discourse.getURL('/')}`;
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/group-activity-filter.js.es6 b/app/assets/javascripts/discourse/components/group-activity-filter.js.es6
new file mode 100644
index 0000000000..d100e27e25
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/group-activity-filter.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  tagName: 'li'
+});
diff --git a/app/assets/javascripts/discourse/components/group-index-toggle.js.es6 b/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
index fb7c9d24c5..f5b2468408 100644
--- a/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
+++ b/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
@@ -1,4 +1,4 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
 export default Ember.Component.extend(bufferedRender({
diff --git a/app/assets/javascripts/discourse/components/group-members-input.js.es6 b/app/assets/javascripts/discourse/components/group-members-input.js.es6
index b2d892095b..691eb051bb 100644
--- a/app/assets/javascripts/discourse/components/group-members-input.js.es6
+++ b/app/assets/javascripts/discourse/components/group-members-input.js.es6
@@ -4,6 +4,7 @@ import { propertyEqual } from 'discourse/lib/computed';
 
 export default Ember.Component.extend({
   classNames: ["group-members-input"],
+  addButton: true,
 
   @computed('model.limit', 'model.offset', 'model.user_count')
   currentPage(limit, offset, userCount) {
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 b27ce66f79..99c5273e09 100644
--- a/app/assets/javascripts/discourse/components/group-membership-button.js.es6
+++ b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
@@ -1,13 +1,16 @@
 import { default as computed } from 'ember-addons/ember-computed-decorators';
 import { popupAjaxError } from 'discourse/lib/ajax-error';
-import DiscourseURL from 'discourse/lib/url';
+import showModal from 'discourse/lib/show-modal';
 
 export default Ember.Component.extend({
-  loading: false,
+  @computed("model.public_admission", "userIsGroupUser")
+  canJoinGroup(publicAdmission, userIsGroupUser) {
+    return publicAdmission && !userIsGroupUser;
+  },
 
-  @computed("model.public")
-  canJoinGroup(publicGroup) {
-    return publicGroup;
+  @computed("model.public_exit", "userIsGroupUser")
+  canLeaveGroup(publicExit, userIsGroupUser) {
+    return publicExit && userIsGroupUser;
   },
 
   @computed("model.is_group_user", "model.id", "groupUserIds")
@@ -51,15 +54,9 @@ export default Ember.Component.extend({
       });
     },
 
-    requestMembership() {
+    showRequestMembershipForm() {
       if (this.currentUser) {
-        this.set('loading', true);
-
-        this.get('model').requestMembership().then(result => {
-          DiscourseURL.routeTo(result.relative_url);
-        }).catch(popupAjaxError).finally(() => {
-          this.set('loading', false);
-        });
+        showModal("request-group-membership-form", { model: this.get('model') });
       } else {
         this._showLoginModal();
       }
diff --git a/app/assets/javascripts/discourse/components/group-navigation.js.es6 b/app/assets/javascripts/discourse/components/group-navigation.js.es6
new file mode 100644
index 0000000000..35f5f238e4
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/group-navigation.js.es6
@@ -0,0 +1,15 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  tagName: '',
+
+  @computed('group')
+  availableTabs(group) {
+    return this.get('tabs').filter(t => {
+      if (t.admin) {
+        return this.currentUser ? this.currentUser.canManageGroup(group) : false;
+      }
+      return true;
+    });
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/group-notifications-button.js.es6 b/app/assets/javascripts/discourse/components/group-notifications-button.js.es6
deleted file mode 100644
index ef2386086f..0000000000
--- a/app/assets/javascripts/discourse/components/group-notifications-button.js.es6
+++ /dev/null
@@ -1,11 +0,0 @@
-import NotificationsButton from 'discourse/components/notifications-button';
-
-export default NotificationsButton.extend({
-  classNames: ['notification-options', 'group-notification-menu'],
-  notificationLevel: Em.computed.alias('group.group_user.notification_level'),
-  i18nPrefix: 'groups.notifications',
-
-  clicked(id) {
-    this.get('group').setNotification(id, this.get('user.id'));
-  }
-});
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 fc83f2dbb6..0000000000
--- 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 4beb5a3a93..563911b725 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/hide-modal-trigger.js.es6 b/app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6
index 0db92cc461..8cafdeb0dd 100644
--- a/app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6
+++ b/app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6
@@ -1,6 +1,6 @@
 export default Ember.Component.extend({
   didInsertElement() {
     this._super();
-    $('#discourse-modal').modal('hide');
+    $('.d-modal.fixed-modal').modal('hide').addClass('hidden');
   }
 });
diff --git a/app/assets/javascripts/discourse/components/highlight-text.js.es6 b/app/assets/javascripts/discourse/components/highlight-text.js.es6
index ca783a23b7..a86d2dd389 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/input-tip.js.es6 b/app/assets/javascripts/discourse/components/input-tip.js.es6
index 0178ad7cac..4120544afe 100644
--- a/app/assets/javascripts/discourse/components/input-tip.js.es6
+++ b/app/assets/javascripts/discourse/components/input-tip.js.es6
@@ -1,5 +1,5 @@
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 
 export default Ember.Component.extend(bufferedRender({
   classNameBindings: [':tip', 'good', 'bad'],
diff --git a/app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6
index 07a4c53b2f..6a78bf877d 100644
--- a/app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6
+++ b/app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6
@@ -1,6 +1,21 @@
-import { showEntrance } from "discourse/components/topic-list-item";
+import { showEntrance, navigateToTopic } from "discourse/components/topic-list-item";
 
 export default Ember.Component.extend({
-  tagName: "tr",
-  click: showEntrance,
+  attributeBindings: ['topic.id:data-topic-id'],
+  classNameBindings: [':latest-topic-list-item', 'topic.archived', 'topic.visited'],
+
+  showEntrance,
+  navigateToTopic,
+
+  click(e) {
+    // for events undefined has a different meaning than false
+    if (this.showEntrance(e) === false) {
+      return false;
+    }
+
+    return this.unhandledRowClick(e, this.get('topic'));
+  },
+
+  // Can be overwritten by plugins to handle clicks on other parts of the row
+  unhandledRowClick() { },
 });
diff --git a/app/assets/javascripts/discourse/components/latest-topic-list.js.es6 b/app/assets/javascripts/discourse/components/latest-topic-list.js.es6
new file mode 100644
index 0000000000..664eb94c31
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/latest-topic-list.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  classNames: ['latest-topic-list']
+});
diff --git a/app/assets/javascripts/discourse/components/mobile-category-topic.js.es6 b/app/assets/javascripts/discourse/components/mobile-category-topic.js.es6
index 833c4a1dfb..55ede8c675 100644
--- a/app/assets/javascripts/discourse/components/mobile-category-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/mobile-category-topic.js.es6
@@ -2,6 +2,6 @@ import { showEntrance } from 'discourse/components/topic-list-item';
 
 export default Ember.Component.extend({
   tagName: 'tr',
-  classNameBindings: [':category-topic-link', 'topic.archived'],
+  classNameBindings: [':category-topic-link', 'topic.archived', 'topic.visited'],
   click: showEntrance
 });
diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6
index 2153d3553a..ed327cf8c3 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/navigation-bar.js.es6 b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
index 5f9e1266f1..bb80145167 100644
--- a/app/assets/javascripts/discourse/components/navigation-bar.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
@@ -5,7 +5,7 @@ import { renderedConnectorsFor } from 'discourse/lib/plugin-connectors';
 export default Ember.Component.extend({
   tagName: 'ul',
   classNameBindings: [':nav', ':nav-pills'],
-  id: 'navigation-bar',
+  elementId: 'navigation-bar',
 
   init() {
     this._super();
@@ -16,6 +16,22 @@ export default Ember.Component.extend({
   selectedNavItem(filterMode, navItems) {
     if (filterMode.indexOf("top/") === 0) { filterMode = "top"; }
     var item = navItems.find(i => i.get('filterMode').indexOf(filterMode) === 0);
+    if (!item) {
+      let connectors = this.get('connectors');
+      let category = this.get('category');
+      if (connectors && category) {
+        connectors.forEach(c => {
+          if (c.connectorClass && typeof(c.connectorClass.path) === "function" && typeof(c.connectorClass.displayName === "function")) {
+            let path = c.connectorClass.path(category);
+            if (path.indexOf(filterMode) > 0) {
+              item = {
+                displayName: c.connectorClass.displayName()
+              };
+            }
+          }
+        });
+      }
+    }
     return item || navItems[0];
   },
 
diff --git a/app/assets/javascripts/discourse/components/navigation-item.js.es6 b/app/assets/javascripts/discourse/components/navigation-item.js.es6
index 62f6a37fde..888eb3c28c 100644
--- a/app/assets/javascripts/discourse/components/navigation-item.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-item.js.es6
@@ -3,23 +3,11 @@ import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
 export default Ember.Component.extend(bufferedRender({
   tagName: 'li',
-  classNameBindings: ['active', 'content.hasIcon:has-icon'],
-  attributeBindings: ['title'],
+  classNameBindings: ['active', 'content.hasIcon:has-icon', 'content.classNames'],
+  attributeBindings: ['content.title:title'],
   hidden: Em.computed.not('content.visible'),
   rerenderTriggers: ['content.count'],
 
-  @computed("content.categoryName", "content.name")
-  title(categoryName, name) {
-    const extra = {};
-
-    if (categoryName) {
-      name = "category";
-      extra.categoryName = categoryName;
-    }
-
-    return I18n.t("filters." + name.replace("/", ".") + ".help", extra);
-  },
-
   @computed("content.filterMode", "filterMode")
   active(contentFilterMode, filterMode) {
     return contentFilterMode === filterMode ||
@@ -28,7 +16,18 @@ export default Ember.Component.extend(bufferedRender({
 
   buildBuffer(buffer) {
     const content = this.get('content');
-    buffer.push("<a href='" + content.get('href') + "'>");
+
+    let href = content.get('href');
+
+    // Include the category id if the option is present
+    if (content.get('includeCategoryId')) {
+      let categoryId = this.get('category.id');
+      if (categoryId) {
+        href += `?category_id=${categoryId}`;
+      }
+    }
+
+    buffer.push(`<a href='${href}'>`);
     if (content.get('hasIcon')) {
       buffer.push("<span class='" + content.get('name') + "'></span>");
     }
diff --git a/app/assets/javascripts/discourse/components/notifications-button.js.es6 b/app/assets/javascripts/discourse/components/notifications-button.js.es6
deleted file mode 100644
index d01f17e43d..0000000000
--- a/app/assets/javascripts/discourse/components/notifications-button.js.es6
+++ /dev/null
@@ -1,49 +0,0 @@
-import DropdownButton from 'discourse/components/dropdown-button';
-import { allLevels, buttonDetails } from 'discourse/lib/notification-levels';
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
-import computed from 'ember-addons/ember-computed-decorators';
-
-export default DropdownButton.extend({
-  classNames: ['notification-options'],
-  title: '',
-  buttonIncludesText: true,
-  activeItem: Em.computed.alias('notificationLevel'),
-  i18nPrefix: '',
-  i18nPostfix: '',
-
-  @computed
-  dropDownContent() {
-    const prefix = this.get('i18nPrefix');
-    const postfix = this.get('i18nPostfix');
-
-    return allLevels.map(l => {
-      const start = `${prefix}.${l.key}${postfix}`;
-      return {
-        id: l.id,
-        title: I18n.t(`${start}.title`),
-        description: I18n.t(`${start}.description`),
-        styleClasses: `${l.key.dasherize()} fa fa-${l.icon}`
-      };
-    });
-  },
-
-  @computed('notificationLevel')
-  text(notificationLevel) {
-    const details = buttonDetails(notificationLevel);
-    const { key } = details;
-    const icon = iconHTML(details.icon, { class: key.dasherize() });
-
-    if (this.get('buttonIncludesText')) {
-      const prefix = this.get('i18nPrefix');
-      const postfix = this.get('i18nPostfix');
-      const text = I18n.t(`${prefix}.${key}${postfix}.title`);
-      return `${icon}&nbsp;${text}<span class='caret'></span>`;
-    } else {
-      return `${icon}&nbsp;<span class='caret'></span>`;
-    }
-  },
-
-  clicked(id) {
-    this.set("notificationLevel", id);
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/period-chooser.js.es6 b/app/assets/javascripts/discourse/components/period-chooser.js.es6
index efd7e15720..e3bc67fb5f 100644
--- a/app/assets/javascripts/discourse/components/period-chooser.js.es6
+++ b/app/assets/javascripts/discourse/components/period-chooser.js.es6
@@ -25,7 +25,7 @@ export default Ember.Component.extend(CleansUp, {
 
     if (!this.get('showPeriods')) {
       if (!this.site.mobileView) {
-        const $chevron = this.$('i.fa-caret-down');
+        const $chevron = this.$('.d-icon-caret-down');
         this.$('#period-popup').css($chevron.position());
       } else {
         this.$('#period-popup').css({top: this.$().height()});
diff --git a/app/assets/javascripts/discourse/components/pinned-button.js.es6 b/app/assets/javascripts/discourse/components/pinned-button.js.es6
deleted file mode 100644
index e08586bc52..0000000000
--- a/app/assets/javascripts/discourse/components/pinned-button.js.es6
+++ /dev/null
@@ -1,56 +0,0 @@
-import DropdownButton from 'discourse/components/dropdown-button';
-
-export default DropdownButton.extend({
-  descriptionKey: 'help',
-  classNames: ['pinned-options'],
-  title: '',
-  longDescription: function(){
-    const topic = this.get('topic');
-    const globally = topic.get('pinned_globally') ? '_globally' : '';
-    const key = 'topic_statuses.' + (topic.get('pinned') ? 'pinned' + globally : 'unpinned') + '.help';
-    return I18n.t(key);
-  }.property('topic.pinned'),
-
-  target: Em.computed.alias('topic'),
-
-  hidden: function(){
-    const topic = this.get('topic');
-    return topic.get('deleted') || (!topic.get('pinned') && !topic.get('unpinned'));
-  }.property('topic.pinned', 'topic.deleted', 'topic.unpinned'),
-
-  activeItem: function(){
-    return this.get('topic.pinned') ? 'pinned' : 'unpinned';
-  }.property('topic.pinned'),
-
-  dropDownContent: function() {
-    const globally = this.get('topic.pinned_globally') ? '_globally' : '';
-    return [
-      {id: 'pinned',
-       title: I18n.t('topic_statuses.pinned' + globally + '.title'),
-       description: I18n.t('topic_statuses.pinned' + globally + '.help'),
-       styleClasses: 'fa fa-thumb-tack' },
-      {id: 'unpinned',
-       title: I18n.t('topic_statuses.unpinned.title'),
-       description: I18n.t('topic_statuses.unpinned.help'),
-       styleClasses: 'fa fa-thumb-tack unpinned' }
-    ];
-  }.property(),
-
-  text: function() {
-    const globally = this.get('topic.pinned_globally') ? '_globally' : '';
-    const state = this.get('topic.pinned') ? 'pinned' + globally : 'unpinned';
-
-    return '<span class="fa fa-thumb-tack' + (state === 'unpinned' ? ' unpinned' : "") +  '"></span> ' +
-      I18n.t('topic_statuses.' + state + '.title') + "<span class='caret'></span>";
-  }.property('topic.pinned', 'topic.unpinned'),
-
-  clicked(id) {
-    const topic = this.get('topic');
-    if(id==='unpinned'){
-      topic.clearPin();
-    } else {
-      topic.rePin();
-    }
-  }
-
-});
diff --git a/app/assets/javascripts/discourse/components/plugin-outlet.js.es6 b/app/assets/javascripts/discourse/components/plugin-outlet.js.es6
index 268e964eda..396d8b9751 100644
--- a/app/assets/javascripts/discourse/components/plugin-outlet.js.es6
+++ b/app/assets/javascripts/discourse/components/plugin-outlet.js.es6
@@ -36,6 +36,12 @@ export default Ember.Component.extend({
   connectors: null,
 
   init() {
+    // This should be the future default
+    if (this.get('noTags')) {
+      this.set('tagName', '');
+      this.set('connectorTagName', '');
+    }
+
     this._super();
     const name = this.get('name');
     if (name) {
diff --git a/app/assets/javascripts/discourse/components/popup-input-tip.js.es6 b/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
index 59e5856db0..e3e27621f9 100644
--- a/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
+++ b/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
@@ -1,4 +1,4 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
diff --git a/app/assets/javascripts/discourse/components/popup-menu.js.es6 b/app/assets/javascripts/discourse/components/popup-menu.js.es6
deleted file mode 100644
index 4f8de9b592..0000000000
--- a/app/assets/javascripts/discourse/components/popup-menu.js.es6
+++ /dev/null
@@ -1,50 +0,0 @@
-import { on } from 'ember-addons/ember-computed-decorators';
-
-export default Ember.Component.extend({
-  classNameBindings: ["visible::hidden", ":popup-menu", "extraClasses"],
-
-  @on('didInsertElement')
-  _setup() {
-    this.appEvents.on("popup-menu:open", this, "_changeLocation");
-
-    $('html').on(`keydown.popup-menu-${this.get('elementId')}`, () => {
-      this.sendAction('hide');
-    });
-
-    $('html').on(`mouseup.popup-menu-${this.get('elementId')}`, (e) => {
-      const $target = $(e.target);
-      if ($target.is("button") || this.$().has($target).length === 0) {
-        this.sendAction('hide');
-      }
-    });
-  },
-
-  @on('willDestroyElement')
-  _cleanup() {
-    $('html').off(`mouseup.popup-menu-${this.get('elementId')}`);
-    $('html').off(`keydown.popup-menu-${this.get('elementId')}`);
-    this.appEvents.off("popup-menu:open", this, "_changeLocation");
-  },
-
-  _changeLocation(location) {
-    const $this = this.$();
-    switch (location.position) {
-      case "absolute": {
-        $this.css({
-          position: "absolute",
-          top: location.top - $this.innerHeight() + 5,
-          left: location.left,
-        });
-        break;
-      }
-      case "fixed": {
-        $this.css({
-          position: "fixed",
-          top: location.top,
-          left: location.left - $this.innerWidth(),
-        });
-        break;
-      }
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/queued-post.js.es6 b/app/assets/javascripts/discourse/components/queued-post.js.es6
index 9629724b43..b0b40c996b 100644
--- a/app/assets/javascripts/discourse/components/queued-post.js.es6
+++ b/app/assets/javascripts/discourse/components/queued-post.js.es6
@@ -17,10 +17,43 @@ function updateState(state, opts) {
   };
 }
 
-export default Ember.Component.extend(bufferedProperty('post'), {
+export default Ember.Component.extend(bufferedProperty('editables'), {
   editing: propertyEqual('post', 'currentlyEditing'),
+  editables: null,
   _confirmDelete: updateState('rejected', {deleteUser: true}),
 
+  _initEditables: function() {
+    const post = this.get('post');
+    const postOptions = post.get('post_options');
+
+    this.set('editables', {});
+    this.set('editables.raw', post.get('raw'));
+    this.set('editables.category', post.get('category'));
+    this.set('editables.category_id', post.get('category.id'));
+    this.set('editables.title', postOptions.title);
+    this.set('editables.tags', postOptions.tags);
+  }.on('init'),
+
+  _categoryChanged: function() {
+    this.set('buffered.category', Discourse.Category.findById(this.get('buffered.category_id')));
+  }.observes('buffered.category_id'),
+
+  editTitleAndCategory: function() {
+    return this.get('editing') && !this.get('post.topic');
+  }.property('editing'),
+
+  tags: function() {
+    return this.get('editables.tags') || this.get('post.topic.tags') || [];
+  }.property('editables.tags'),
+
+  showTags: function() {
+    return this.siteSettings.tagging_enabled && !this.get('editing') && this.get('tags').length > 0;
+  }.property('editing', 'tags'),
+
+  editTags: function() {
+    return this.siteSettings.tagging_enabled && this.get('editing') && !this.get('post.topic');
+  }.property('editing'),
+
   actions: {
     approve: updateState('approved'),
     reject: updateState('rejected'),
@@ -38,7 +71,14 @@ export default Ember.Component.extend(bufferedProperty('post'), {
     },
 
     confirmEdit() {
-      this.get('post').update({ raw: this.get('buffered.raw') }).then(() => {
+      const buffered = this.get('buffered');
+
+      this.get('post').update(buffered.getProperties(
+        'raw',
+        'title',
+        'tags',
+        'category_id'
+      )).then(() => {
         this.commitBuffer();
         this.set('currentlyEditing', null);
       });
diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js.es6
index 535ebe0272..5d41b049cc 100644
--- a/app/assets/javascripts/discourse/components/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/components/quote-button.js.es6
@@ -1,11 +1,5 @@
 import { selectedText } from 'discourse/lib/utilities';
 
-// we don't want to deselect when we click on buttons that use it
-function willQuote(e) {
-  const $target = $(e.target);
-  return $target.hasClass('quote-button') || $target.closest('.create, .share, .reply-new').length;
-}
-
 export default Ember.Component.extend({
   classNames: ['quote-button'],
   classNameBindings: ['visible'],
@@ -46,9 +40,18 @@ export default Ember.Component.extend({
       }
     }
 
-    quoteState.selected(postId, selectedText());
+    const _selectedText = selectedText();
+    quoteState.selected(postId, _selectedText);
     this.set('visible', quoteState.buffer.length > 0);
 
+    // avoid hard loops in quote selection unconditionally
+    // this can happen if you triple click text in firefox
+    if (this._prevSelection === _selectedText) {
+      return;
+    }
+
+    this._prevSelection = _selectedText;
+
     // on Desktop, shows the button at the beginning of the selection
     // on Mobile, shows the button at the end of the selection
     const isMobileDevice = this.site.isMobileDevice;
@@ -107,12 +110,14 @@ export default Ember.Component.extend({
     const onSelectionChanged = _.debounce(() => this._selectionChanged(), wait);
 
     $(document).on("mousedown.quote-button", e => {
+      this._prevSelection = null;
       this._isMouseDown = true;
       this._reselected = false;
-      if (!willQuote(e)) {
+      if ($(e.target).closest('.quote-button, .create, .share, .reply-new').length === 0) {
         this._hideButton();
       }
     }).on("mouseup.quote-button", () => {
+      this._prevSelection = null;
       this._isMouseDown = false;
       onSelectionChanged();
     }).on("selectionchange.quote-button", () => {
diff --git a/app/assets/javascripts/discourse/components/scroll-tracker.js.es6 b/app/assets/javascripts/discourse/components/scroll-tracker.js.es6
new file mode 100644
index 0000000000..cb3fa3a613
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/scroll-tracker.js.es6
@@ -0,0 +1,41 @@
+import Scrolling from 'discourse/mixins/scrolling';
+
+export default Ember.Component.extend(Scrolling, {
+
+  didReceiveAttrs() {
+    this._super();
+
+    this.set('trackerName', `scroll-tracker-${this.get('name')}`);
+  },
+
+  didInsertElement() {
+    this._super();
+
+    this.bindScrolling({ name: this.get('name') });
+  },
+
+  didRender() {
+    this._super();
+
+    const data = this.session.get(this.get('trackerName'));
+    if (data && data.position >= 0 && data.tag === this.get('tag')) {
+      Ember.run.next(() => $(window).scrollTop(data.position + 1));
+    }
+  },
+
+  willDestroyElement() {
+    this._super();
+
+    this.unbindScrolling(this.get('name'));
+  },
+
+  scrolled() {
+    this._super();
+
+    this.session.set(this.get('trackerName'), {
+      position: $(window).scrollTop(),
+      tag: this.get('tag'),
+    });
+  },
+
+});
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 994626ae8c..b36b39a701 100644
--- a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
@@ -1,17 +1,17 @@
 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';
 import offsetCalculator from 'discourse/lib/offset-calculator';
+import optionalService from 'discourse/lib/optional-service';
 
-function findTopView($posts, viewportTop, min, max) {
+function findTopView($posts, viewportTop, postsWrapperTop, min, max) {
   if (max < min) { return min; }
 
   while (max > min) {
     const mid = Math.floor((min + max) / 2);
     const $post = $($posts[mid]);
-    const viewBottom = $post.position().top + $post.height();
+    const viewBottom = ($post.offset().top - postsWrapperTop) + $post.height();
 
     if (viewBottom > viewportTop) {
       max = mid-1;
@@ -24,6 +24,7 @@ function findTopView($posts, viewportTop, min, max) {
 }
 
 export default MountWidget.extend({
+  adminTools: optionalService(),
   widget: 'post-stream',
   _topVisible: null,
   _bottomVisible: null,
@@ -64,6 +65,10 @@ export default MountWidget.extend({
     if (this.isDestroyed || this.isDestroying) { return; }
     if (isWorkaroundActive()) { return; }
 
+    // We use this because watching videos fullscreen in Chrome was super buggy
+    // otherwise. Thanks to arrendek from q23 for the technique.
+    if (document.elementFromPoint(0, 0).tagName.toUpperCase() === "IFRAME") { return; }
+
     const $w = $(window);
     const windowHeight = window.innerHeight ? window.innerHeight : $w.height();
     const slack = Math.round(windowHeight * 5);
@@ -72,9 +77,10 @@ export default MountWidget.extend({
 
     const windowTop = $w.scrollTop();
 
+    const postsWrapperTop = $('.posts-wrapper').offset().top;
     const $posts = this.$('.onscreen-post, .cloaked-post');
     const viewportTop = windowTop - slack;
-    const topView = findTopView($posts, viewportTop, 0, $posts.length-1);
+    const topView = findTopView($posts, viewportTop, postsWrapperTop, 0, $posts.length-1);
 
     let windowBottom = windowTop + windowHeight;
     let viewportBottom = windowBottom + slack;
@@ -245,13 +251,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();
@@ -267,6 +273,9 @@ export default MountWidget.extend({
     this.$().off('mouseleave.post-stream');
     this.appEvents.off('post-stream:refresh');
     this.appEvents.off('post-stream:posted');
-  }
+  },
 
+  showModerationHistory(post) {
+    this.get('adminTools').showModerationHistory({ filter: 'post', post_id: post.id });
+  }
 });
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 0bc886a817..a171083523 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;
 
@@ -8,13 +10,13 @@ const REGEXP_CATEGORY_PREFIX       = /^(category:|#)/ig;
 const REGEXP_GROUP_PREFIX          = /^group:/ig;
 const REGEXP_BADGE_PREFIX          = /^badge:/ig;
 const REGEXP_TAGS_PREFIX           = /^(tags?:|#(?=[a-z0-9\-]+::tag))/ig;
-const REGEXP_IN_PREFIX             = /^in:/ig;
+const REGEXP_IN_PREFIX             = /^(in|with):/ig;
 const REGEXP_STATUS_PREFIX         = /^status:/ig;
 const REGEXP_MIN_POST_COUNT_PREFIX = /^min_post_count:/ig;
 const REGEXP_POST_TIME_PREFIX      = /^(before|after):/ig;
 const REGEXP_TAGS_REPLACE          = /(^(tags?:|#(?=[a-z0-9\-]+::tag))|::tag\s?$)/ig;
 
-const REGEXP_IN_MATCH                 = /^in:(posted|watching|tracking|bookmarks|first|pinned|unpinned|wiki|unseen)/ig;
+const REGEXP_IN_MATCH                 = /^(in|with):(posted|watching|tracking|bookmarks|first|pinned|unpinned|wiki|unseen|image)/ig;
 const REGEXP_SPECIAL_IN_LIKES_MATCH   = /^in:likes/ig;
 const REGEXP_SPECIAL_IN_PRIVATE_MATCH = /^in:private/ig;
 const REGEXP_SPECIAL_IN_SEEN_MATCH    = /^in:seen/ig;
@@ -23,19 +25,24 @@ const REGEXP_CATEGORY_SLUG            = /^(\#[a-zA-Z0-9\-:]+)/ig;
 const REGEXP_CATEGORY_ID              = /^(category:[0-9]+)/ig;
 const REGEXP_POST_TIME_WHEN           = /^(before|after)/ig;
 
+const IN_OPTIONS_MAPPING = {'images': 'with'};
+
 export default Em.Component.extend({
   classNames: ['search-advanced-options'],
 
-  inOptions: [
+  inOptionsForUsers: [
     {name: I18n.t('search.advanced.filters.unseen'),  value: "unseen"},
     {name: I18n.t('search.advanced.filters.posted'),    value: "posted"},
     {name: I18n.t('search.advanced.filters.watching'),  value: "watching"},
     {name: I18n.t('search.advanced.filters.tracking'),  value: "tracking"},
     {name: I18n.t('search.advanced.filters.bookmarks'), value: "bookmarks"},
+  ],
+  inOptionsForAll: [
     {name: I18n.t('search.advanced.filters.first'),     value: "first"},
     {name: I18n.t('search.advanced.filters.pinned'),    value: "pinned"},
     {name: I18n.t('search.advanced.filters.unpinned'),  value: "unpinned"},
     {name: I18n.t('search.advanced.filters.wiki'),  value: "wiki"},
+    {name: I18n.t('search.advanced.filters.images'),  value: "images"},
   ],
   statusOptions: [
     {name: I18n.t('search.advanced.statuses.open'),        value: "open"},
@@ -77,7 +84,8 @@ export default Em.Component.extend({
             likes: false,
             private: false,
             seen: false
-          }
+          },
+          all_tags: false
         },
         status: '',
         min_post_count: '',
@@ -85,7 +93,8 @@ export default Em.Component.extend({
           when: 'before',
           days: ''
         }
-      }
+      },
+      inOptions: this.currentUser ? this.inOptionsForUsers.concat(this.inOptionsForAll) : this.inOptionsForAll
     });
   },
 
@@ -176,18 +185,18 @@ export default Em.Component.extend({
         const userInput = Discourse.Category.findBySlug(subcategories[1], subcategories[0]);
         if ((!existingInput && userInput)
           || (existingInput && userInput && existingInput.id !== userInput.id))
-          this.set('searchedTerms.category', [userInput]);
+          this.set('searchedTerms.category', userInput);
       } else
       if (isNaN(subcategories)) {
         const userInput = Discourse.Category.findSingleBySlug(subcategories[0]);
         if ((!existingInput && userInput)
           || (existingInput && userInput && existingInput.id !== userInput.id))
-          this.set('searchedTerms.category', [userInput]);
+          this.set('searchedTerms.category', userInput);
       } else {
         const userInput = Discourse.Category.findById(subcategories[0]);
         if ((!existingInput && userInput)
           || (existingInput && userInput && existingInput.id !== userInput.id))
-          this.set('searchedTerms.category', [userInput]);
+          this.set('searchedTerms.category', userInput);
       }
     } else
       this.set('searchedTerms.category', '');
@@ -230,13 +239,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', []);
@@ -292,11 +303,11 @@ export default Em.Component.extend({
 
     const slugCategoryMatches = (match.length !== 0) ? match[0].match(REGEXP_CATEGORY_SLUG) : null;
     const idCategoryMatches = (match.length !== 0) ? match[0].match(REGEXP_CATEGORY_ID) : null;
-    if (categoryFilter && categoryFilter[0]) {
-      const id = categoryFilter[0].id;
-      const slug = categoryFilter[0].slug;
-      if (categoryFilter[0].parentCategory) {
-        const parentSlug = categoryFilter[0].parentCategory.slug;
+    if (categoryFilter) {
+      const id = categoryFilter.id;
+      const slug = categoryFilter.slug;
+      if (categoryFilter.parentCategory) {
+        const parentSlug = categoryFilter.parentCategory.slug;
         if (slugCategoryMatches)
           searchTerm = searchTerm.replace(slugCategoryMatches[0], `#${parentSlug}:${slug}`);
         else if (idCategoryMatches)
@@ -365,14 +376,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}`);
@@ -391,13 +404,17 @@ export default Em.Component.extend({
   updateSearchTermForIn() {
     const match = this.filterBlocks(REGEXP_IN_MATCH);
     const inFilter = this.get('searchedTerms.in');
+    let keyword = 'in';
+    if(inFilter in IN_OPTIONS_MAPPING) {
+        keyword = IN_OPTIONS_MAPPING[inFilter];
+    }
     let searchTerm = this.get('searchTerm') || '';
 
     if (inFilter) {
       if (match.length !== 0) {
-        searchTerm = searchTerm.replace(match[0], `in:${inFilter}`);
+        searchTerm = searchTerm.replace(match[0], `${keyword}:${inFilter}`);
       } else {
-        searchTerm += ` in:${inFilter}`;
+        searchTerm += ` ${keyword}:${inFilter}`;
       }
 
       this.set('searchTerm', searchTerm.trim());
@@ -520,12 +537,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/share-button.js.es6 b/app/assets/javascripts/discourse/components/share-button.js.es6
new file mode 100644
index 0000000000..c099e91b50
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/share-button.js.es6
@@ -0,0 +1,13 @@
+import Button from 'discourse/components/d-button';
+
+export default Button.extend({
+  classNames: ['share'],
+  icon: 'link',
+  title: 'topic.share.help',
+  label: 'topic.share.title',
+  attributeBindings: ['url:data-share-url'],
+
+  click() {
+    return true;
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/share-popup.js.es6 b/app/assets/javascripts/discourse/components/share-popup.js.es6
index 3b04176dc9..54ffeaa21f 100644
--- a/app/assets/javascripts/discourse/components/share-popup.js.es6
+++ b/app/assets/javascripts/discourse/components/share-popup.js.es6
@@ -81,6 +81,14 @@ export default Ember.Component.extend({
     Ember.run.scheduleOnce('afterRender', this, this._focusUrl);
   },
 
+  _webShare(url) {
+    // We can pass title and text too, but most share targets do their own oneboxing
+    navigator.share({
+      url: url
+    })
+    .catch((error) => console.warn('Error sharing', error));
+  },
+
   didInsertElement() {
     this._super();
 
@@ -106,7 +114,15 @@ export default Ember.Component.extend({
       const date = $currentTarget.children().data('time');
 
       this.setProperties({ postNumber, date, postId });
-      this._showUrl($currentTarget, url);
+
+      // use native webshare only when the user clicks on the "chain" icon
+      // navigator.share needs HTTPS, returns undefined on HTTP
+      if (navigator.share && !$currentTarget.hasClass('post-date')) {
+        this._webShare(url);
+      } else {
+        this._showUrl($currentTarget, url);
+      }
+
       return false;
     });
 
diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js.es6
index 9285f5355b..56731c96df 100644
--- a/app/assets/javascripts/discourse/components/site-header.js.es6
+++ b/app/assets/javascripts/discourse/components/site-header.js.es6
@@ -62,6 +62,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, {
 
     this.dispatch('notifications:changed', 'user-notifications');
     this.dispatch('header:keyboard-trigger', 'header');
+    this.dispatch('search-autocomplete:after-complete', 'search-term');
 
     this.appEvents.on('dom:clean', () => {
       // For performance, only trigger a re-render if any menu panels are visible
diff --git a/app/assets/javascripts/discourse/components/small-action.js.es6 b/app/assets/javascripts/discourse/components/small-action.js.es6
deleted file mode 100644
index 114d35801c..0000000000
--- a/app/assets/javascripts/discourse/components/small-action.js.es6
+++ /dev/null
@@ -1,44 +0,0 @@
-import { autoUpdatingRelativeAge } from 'discourse/lib/formatter';
-import { userPath } from 'discourse/lib/url';
-
-export function actionDescriptionHtml(actionCode, createdAt, username) {
-  const dt = new Date(createdAt);
-  const when = autoUpdatingRelativeAge(dt, { format: 'medium-with-ago' });
-
-  var who = "";
-  if (username) {
-    if (actionCode === "invited_group" || actionCode === "removed_group") {
-      who = `<a class="mention-group" href="/groups/${username}">@${username}</a>`;
-    } else {
-      who = `<a class="mention" href="${userPath(username)}">@${username}</a>`;
-    }
-  }
-  return I18n.t(`action_codes.${actionCode}`, { who, when }).htmlSafe();
-}
-
-export function actionDescription(actionCode, createdAt, username) {
-  return function() {
-    const ac = this.get(actionCode);
-    if (ac) {
-      return actionDescriptionHtml(ac, this.get(createdAt), this.get(username));
-    }
-  }.property(actionCode, createdAt);
-}
-
-export default Ember.Component.extend({
-  layoutName: 'components/small-action', // needed because `time-gap` inherits from this
-  classNames: ['small-action'],
-
-  description: actionDescription('actionCode', 'post.created_at', 'post.action_code_who'),
-
-  actions: {
-    edit() {
-      this.sendAction('editPost', this.get('post'));
-    },
-
-    delete() {
-      this.sendAction('deletePost', this.get('post'));
-    }
-  }
-
-});
diff --git a/app/assets/javascripts/discourse/components/stream-item.js.es6 b/app/assets/javascripts/discourse/components/stream-item.js.es6
deleted file mode 100644
index d81366bec7..0000000000
--- a/app/assets/javascripts/discourse/components/stream-item.js.es6
+++ /dev/null
@@ -1,14 +0,0 @@
-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"],
-  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/suggested-topics.js.es6 b/app/assets/javascripts/discourse/components/suggested-topics.js.es6
new file mode 100644
index 0000000000..87ffd1865b
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/suggested-topics.js.es6
@@ -0,0 +1,53 @@
+import computed from 'ember-addons/ember-computed-decorators';
+import { categoryBadgeHTML } from 'discourse/helpers/category-link';
+import { iconHTML } from 'discourse-common/lib/icon-library';
+
+export default Ember.Component.extend({
+  elementId: 'suggested-topics',
+
+  @computed('topic')
+  suggestedTitle(topic) {
+    return topic.get('isPrivateMessage') ?
+      `<a href="${this.get('pmPath')}">${iconHTML('envelope', { class: 'private-message-glyph' })}</a> ${I18n.t("suggested_topics.pm_title")}` :
+      I18n.t("suggested_topics.title");
+  },
+
+  @computed('topic', 'topicTrackingState.messageCount')
+  browseMoreMessage(topic) {
+    // TODO decide what to show for pms
+    if (topic.get('isPrivateMessage')) { return; }
+
+    const opts = { latestLink: `<a href="${Discourse.getURL("/latest")}">${I18n.t("topic.view_latest_topics")}</a>` };
+    let category = topic.get('category');
+
+    if (category && Em.get(category, 'id') === Discourse.Site.currentProp("uncategorized_category_id")) {
+      category = null;
+    }
+
+    if (category) {
+      opts.catLink = categoryBadgeHTML(category);
+    } else {
+      opts.catLink = "<a href=\"" + Discourse.getURL("/categories") + "\">" + I18n.t("topic.browse_all_categories") + "</a>";
+    }
+
+    const unreadTopics = this.topicTrackingState.countUnread();
+    const newTopics = this.topicTrackingState.countNew();
+
+    if (newTopics + unreadTopics > 0) {
+      const hasBoth = unreadTopics > 0 && newTopics > 0;
+
+      return I18n.messageFormat("topic.read_more_MF", {
+        "BOTH": hasBoth,
+        "UNREAD": unreadTopics,
+        "NEW": newTopics,
+        "CATEGORY": category ? true : false,
+        latestLink: opts.latestLink,
+        catLink: opts.catLink
+      });
+    } else if (category) {
+      return I18n.t("topic.read_more_in_category", opts);
+    } else {
+      return I18n.t("topic.read_more", opts);
+    }
+  },
+});
diff --git a/app/assets/javascripts/discourse/components/tag-drop.js.es6 b/app/assets/javascripts/discourse/components/tag-drop.js.es6
index 61e287dc88..201d9a134d 100644
--- a/app/assets/javascripts/discourse/components/tag-drop.js.es6
+++ b/app/assets/javascripts/discourse/components/tag-drop.js.es6
@@ -21,9 +21,8 @@ export default Ember.Component.extend({
   },
 
   @computed('expanded')
-  iconClass() {
-    if (this.get('expanded')) { return "fa fa-caret-down"; }
-    return "fa fa-caret-right";
+  expandedIcon(expanded) {
+    return expanded ? 'd-drop-expanded' : 'd-drop-collapsed';
   },
 
   @computed('tagId')
@@ -70,7 +69,7 @@ export default Ember.Component.extend({
 
   @computed('tag')
   dropdownButtonClass() {
-    var result = 'badge-category category-dropdown-button';
+    let result = 'dropdown-header category-dropdown-button';
     if (Em.isNone(this.get('tag'))) {
       result += ' home';
     }
diff --git a/app/assets/javascripts/discourse/components/tag-notifications-button.js.es6 b/app/assets/javascripts/discourse/components/tag-notifications-button.js.es6
deleted file mode 100644
index b4588df710..0000000000
--- a/app/assets/javascripts/discourse/components/tag-notifications-button.js.es6
+++ /dev/null
@@ -1,11 +0,0 @@
-import NotificationsButton from 'discourse/components/notifications-button';
-
-export default NotificationsButton.extend({
-  classNames: ['notification-options', 'tag-notification-menu'],
-  buttonIncludesText: false,
-  i18nPrefix: 'tagging.notifications',
-
-  clicked(id) {
-    this.sendAction('action', id);
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6 b/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
index 6d1c7ae7b3..13640fde77 100644
--- a/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
+++ b/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
@@ -1,4 +1,4 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import DropdownButton from 'discourse/components/dropdown-button';
 import computed from "ember-addons/ember-computed-decorators";
 
@@ -14,7 +14,7 @@ export default DropdownButton.extend({
       { id: 'manageGroups',
         title: I18n.t('tagging.manage_groups'),
         description: I18n.t('tagging.manage_groups_description'),
-        styleClasses: 'fa fa-wrench' }
+        icon: 'wrench' }
     ];
     return items;
   },
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 cb76f7997d..c8bb7fef4f 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,20 @@
 import MountWidget from 'discourse/components/mount-widget';
+import optionalService from 'discourse/lib/optional-service';
 
 export default MountWidget.extend({
+  classNames: 'topic-admin-menu-button-container',
   tagName: 'span',
   widget: "topic-admin-menu-button",
+  adminTools: optionalService(),
 
   buildArgs() {
-    return this.getProperties('topic', 'fixed', 'openUpwards');
+    return this.getProperties('topic', 'fixed', 'openUpwards', 'rightSide');
+  },
+
+  showModerationHistory() {
+    this.get('adminTools').showModerationHistory({
+      filter: 'topic',
+      topic_id: this.get('topic.id')
+    });
   }
 });
diff --git a/app/assets/javascripts/discourse/components/topic-entrance.js.es6 b/app/assets/javascripts/discourse/components/topic-entrance.js.es6
index 6e4ba25d14..d72be633d2 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-footer-buttons.js.es6 b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
index 13473c0e0f..e370f0d337 100644
--- a/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-footer-buttons.js.es6
@@ -15,7 +15,7 @@ export default Ember.Component.extend({
 
   @computed
   showAdminButton() {
-    return !this.site.mobileView && this.currentUser.get('canManageTopic');
+    return !this.site.mobileView && this.currentUser && this.currentUser.get('canManageTopic');
   },
 
   @computed('topic.message_archived')
diff --git a/app/assets/javascripts/discourse/components/topic-footer-mobile-dropdown.js.es6 b/app/assets/javascripts/discourse/components/topic-footer-mobile-dropdown.js.es6
deleted file mode 100644
index d5370e416e..0000000000
--- a/app/assets/javascripts/discourse/components/topic-footer-mobile-dropdown.js.es6
+++ /dev/null
@@ -1,70 +0,0 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
-import Combobox from 'discourse-common/components/combo-box';
-import { observes } from 'ember-addons/ember-computed-decorators';
-
-export default Combobox.extend({
-  none: "topic.controls",
-
-  init() {
-    this._super();
-    this._createContent();
-  },
-
-  _createContent() {
-    const content = [];
-    const topic = this.get('topic');
-    const details = topic.get('details');
-
-    if (details.get('can_invite_to')) {
-      content.push({ id: 'invite', icon: 'users', name: I18n.t('topic.invite_reply.title') });
-    }
-
-    if (topic.get('bookmarked')) {
-      content.push({ id: 'bookmark', icon: 'bookmark', name: I18n.t('bookmarked.clear_bookmarks') });
-    } else {
-      content.push({ id: 'bookmark', icon: 'bookmark', name: I18n.t('bookmarked.title') });
-    }
-    content.push({ id: 'share', icon: 'link', name: I18n.t('topic.share.title') });
-
-    if (details.get('can_flag_topic')) {
-      content.push({ id: 'flag', icon: 'flag', name: I18n.t('topic.flag_topic.title') });
-    }
-
-    this.comboTemplate = (item) => {
-      const contentItem = content.findBy('id', item.id);
-      if (!contentItem) { return item.text; }
-      return `${iconHTML(contentItem.icon)}&nbsp; ${item.text}`;
-    };
-
-    this.set('content', content);
-  },
-
-  @observes('value')
-  _valueChanged() {
-    const value = this.get('value');
-    const topic = this.get('topic');
-
-    const refresh = () => {
-      this._createContent();
-      this.set('value', null);
-    };
-
-    switch(value) {
-      case 'invite':
-        this.attrs.showInvite();
-        refresh();
-        break;
-      case 'bookmark':
-        topic.toggleBookmark().then(() => refresh());
-        break;
-      case 'share':
-        this.appEvents.trigger('share:url', topic.get('shareUrl'), $('#topic-footer-buttons'));
-        refresh();
-        break;
-      case 'flag':
-        this.attrs.showFlagTopic();
-        refresh();
-        break;
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
index f4227cca1e..f9b3cd38b7 100644
--- a/app/assets/javascripts/discourse/components/topic-list-item.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
@@ -20,10 +20,16 @@ export function showEntrance(e) {
   }
 }
 
+export function navigateToTopic(topic, href) {
+  this.appEvents.trigger('header:update-topic', topic);
+  DiscourseURL.routeTo(href || topic.get('url'));
+  return false;
+}
+
 export default Ember.Component.extend(bufferedRender({
   rerenderTriggers: ['bulkSelectEnabled', 'topic.pinned'],
   tagName: 'tr',
-  classNameBindings: [':topic-list-item', 'unboundClassNames'],
+  classNameBindings: [':topic-list-item', 'unboundClassNames', 'topic.visited'],
   attributeBindings: ['data-topic-id'],
   'data-topic-id': Em.computed.alias('topic.id'),
 
@@ -52,7 +58,8 @@ export default Ember.Component.extend(bufferedRender({
       classes.push('has-excerpt');
     }
 
-    _.each(['liked', 'archived', 'bookmarked'],function(name) {
+
+    ['liked', 'archived', 'bookmarked', 'pinned'].forEach(name => {
       if (topic.get(name)) {
         classes.push(name);
       }
@@ -106,8 +113,10 @@ export default Ember.Component.extend(bufferedRender({
     return false;
   }.property(),
 
+  showEntrance,
+
   click(e) {
-    const result = showEntrance.call(this, e);
+    const result = this.showEntrance(e);
     if (result === false) { return result; }
 
     const topic = this.get('topic');
@@ -123,19 +132,23 @@ export default Ember.Component.extend(bufferedRender({
     }
 
     if (target.hasClass('raw-topic-link')) {
-       if (wantsNewWindow(e)) { return true; }
-
-      this.appEvents.trigger('header:update-topic', topic);
-      DiscourseURL.routeTo(target.attr('href'));
-      return false;
+      if (wantsNewWindow(e)) { return true; }
+      return this.navigateToTopic(topic, target.attr('href'));
     }
 
     if (target.closest('a.topic-status').length === 1) {
       this.get('topic').togglePinnedForUser();
       return false;
     }
+
+    return this.unhandledRowClick(e, topic);
   },
 
+  navigateToTopic,
+
+  // Can be overwritten by plugins to handle clicks on other parts of the row
+  unhandledRowClick() { },
+
   highlight(opts = { isLastViewedTopic: false }) {
     const $topic = this.$();
     $topic
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6
index 5b214be7aa..7dde582385 100644
--- a/app/assets/javascripts/discourse/components/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list.js.es6
@@ -5,6 +5,9 @@ export default Ember.Component.extend({
   classNames: ['topic-list'],
   showTopicPostBadges: true,
 
+  // Overwrite this to perform client side filtering of topics, if desired
+  filteredTopics: Ember.computed.alias('topics'),
+
   _init: function(){
     this.addObserver('hideCategory', this.rerender);
     this.addObserver('order', this.rerender);
@@ -69,7 +72,7 @@ export default Ember.Component.extend({
       return;
     }
 
-    let user = Discourse.User.current();
+    let user = this.currentUser;
     if (!user || !user.previous_visit_at) {
       return;
     }
diff --git a/app/assets/javascripts/discourse/components/topic-notifications-button.js.es6 b/app/assets/javascripts/discourse/components/topic-notifications-button.js.es6
deleted file mode 100644
index 4e2163122f..0000000000
--- a/app/assets/javascripts/discourse/components/topic-notifications-button.js.es6
+++ /dev/null
@@ -1,20 +0,0 @@
-import MountWidget from 'discourse/components/mount-widget';
-import { observes } from 'ember-addons/ember-computed-decorators';
-
-export default MountWidget.extend({
-  widget: 'topic-notifications-button',
-
-  buildArgs() {
-    return { topic: this.get('topic'), appendReason: true, showFullTitle: true };
-  },
-
-  @observes('topic.details.notification_level')
-  _queueRerender() {
-    this.queueRerender();
-  },
-
-  didInsertElement() {
-    this._super();
-    this.dispatch('topic-notifications-button:changed', 'topic-notifications-button');
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js.es6
index f20f47426d..a3f09e3182 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-status.js.es6 b/app/assets/javascripts/discourse/components/topic-status.js.es6
index bede7d57a6..f1c8695dfd 100644
--- a/app/assets/javascripts/discourse/components/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-status.js.es6
@@ -1,4 +1,4 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 import { escapeExpression } from 'discourse/lib/utilities';
 
@@ -8,7 +8,7 @@ export default Ember.Component.extend(bufferedRender({
   rerenderTriggers: ['topic.archived', 'topic.closed', 'topic.pinned', 'topic.visible', 'topic.unpinned', 'topic.is_warning'],
 
   click(e) {
-    if ($(e.target).hasClass('fa-thumb-tack')) {
+    if ($(e.target).hasClass('d-icon-thumb-tack')) {
       const topic = this.get('topic');
 
       // only pin unpin for now
diff --git a/app/assets/javascripts/discourse/components/topic-timeline.js.es6 b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
index cc72ba7f2c..c693fd9c94 100644
--- a/app/assets/javascripts/discourse/components/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
@@ -1,10 +1,12 @@
 import MountWidget from 'discourse/components/mount-widget';
 import Docking from 'discourse/mixins/docking';
 import { observes } from 'ember-addons/ember-computed-decorators';
+import optionalService from 'discourse/lib/optional-service';
 
 const headerPadding = () => parseInt($('#main-outlet').css('padding-top')) + 3;
 
 export default MountWidget.extend(Docking, {
+  adminTools: optionalService(),
   widget: 'topic-timeline-container',
   dockBottom: null,
   dockAt: null,
@@ -12,6 +14,7 @@ export default MountWidget.extend(Docking, {
   buildArgs() {
     let attrs =  {
       topic: this.get('topic'),
+      notificationLevel: this.get('notificationLevel'),
       topicTrackingState: this.topicTrackingState,
       enteredIndex: this.get('enteredIndex'),
       dockAt: this.dockAt,
@@ -84,6 +87,12 @@ export default MountWidget.extend(Docking, {
     }
 
     this.dispatch('topic:current-post-scrolled', 'timeline-scrollarea');
-    this.dispatch('topic-notifications-button:changed', 'topic-notifications-button');
+  },
+
+  showModerationHistory() {
+    this.get('adminTools').showModerationHistory({
+      filter: 'topic',
+      topic_id: this.get('topic.id')
+    });
   }
 });
diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
index 8cb29a0b21..16ea751834 100644
--- a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
@@ -1,9 +1,10 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 import Category from 'discourse/models/category';
 
 export default Ember.Component.extend(bufferedRender({
   classNames: ['topic-status-info'],
-  delayedRerender: null,
+  _delayedRerender: null,
 
   rerenderTriggers: [
     'statusType',
@@ -35,7 +36,7 @@ export default Ember.Component.extend(bufferedRender({
 
     let autoCloseHours = this.get("duration") || 0;
 
-    buffer.push('<h3><i class="fa fa-clock-o"></i> ');
+    buffer.push(`<h3>${iconHTML('clock-o')} `);
 
     let options = {
       timeLeft: duration.humanize(true),
@@ -57,12 +58,14 @@ export default Ember.Component.extend(bufferedRender({
     buffer.push('</h3>');
 
     // TODO Sam: concerned this can cause a heavy rerender loop
-    this.set('delayedRerender', Em.run.later(this, this.rerender, rerenderDelay));
+    if (!Ember.testing) {
+      this._delayedRerender = Ember.run.later(this, this.rerender, rerenderDelay);
+    }
   },
 
   willDestroyElement() {
-    if( this.delayedRerender ) {
-      Em.run.cancel(this.get('delayedRerender'));
+    if (this._delayedRerender) {
+      Em.run.cancel(this._delayedRerender);
     }
   },
 
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 0000000000..05c6c37b69
--- /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-card-contents.js.es6 b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
index 969a6a931c..b7d3b4d31f 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
@@ -6,12 +6,14 @@ import { default as computed, observes } from 'ember-addons/ember-computed-decor
 import DiscourseURL from 'discourse/lib/url';
 import User from 'discourse/models/user';
 import { userPath } from 'discourse/lib/url';
+import { durationTiny } from 'discourse/lib/formatter';
+import CanCheckEmails from 'discourse/mixins/can-check-emails';
 
 const clickOutsideEventName = "mousedown.outside-user-card";
 const clickDataExpand = "click.discourse-user-card";
 const clickMention = "click.discourse-user-mention";
 
-export default Ember.Component.extend(CleansUp, {
+export default Ember.Component.extend(CleansUp, CanCheckEmails, {
   elementId: 'user-card',
   classNameBindings: ['visible:show', 'showBadges', 'hasCardBadgeImage', 'user.card_background::no-bg'],
   allowBackgrounds: setting('allow_profile_backgrounds'),
@@ -29,6 +31,7 @@ export default Ember.Component.extend(CleansUp, {
   showDelete: Ember.computed.and("viewingAdmin", "showName", "user.canBeDeleted"),
   linkWebsite: Ember.computed.not('user.isBasic'),
   hasLocationOrWebsite: Ember.computed.or('user.location', 'user.website_name'),
+  showCheckEmail: Ember.computed.and('user.staged', 'canCheckEmails'),
 
   visible: false,
   user: null,
@@ -46,6 +49,11 @@ export default Ember.Component.extend(CleansUp, {
     return !this.siteSettings.prioritize_username_in_ux && name && name.trim().length > 0;
   },
 
+  @computed('username', 'topicPostCount')
+  togglePostsLabel(username, count) {
+    return I18n.t("topic.filter_to", { username, count });
+  },
+
   @computed('user.user_fields.@each.value')
   publicUserFields() {
     const siteUserFields = this.site.get('user_fields');
@@ -82,14 +90,32 @@ export default Ember.Component.extend(CleansUp, {
     $this.css('background-image', bg);
   },
 
+  @computed('user.time_read', 'user.recent_time_read')
+  showRecentTimeRead(timeRead, recentTimeRead) {
+    return timeRead !== recentTimeRead && recentTimeRead !== 0;
+  },
+
+  @computed('user.recent_time_read')
+  recentTimeRead(recentTimeReadSeconds) {
+    return durationTiny(recentTimeReadSeconds);
+  },
+
+  @computed('showRecentTimeRead', 'user.time_read', 'recentTimeRead')
+  timeReadTooltip(showRecent, timeRead, recentTimeRead) {
+    if (showRecent) {
+      return I18n.t('time_read_recently_tooltip', {time_read: durationTiny(timeRead), recent_time_read: recentTimeRead});
+    } else {
+      return I18n.t('time_read_tooltip', {time_read: durationTiny(timeRead)});
+    }
+  },
+
   _show(username, $target) {
     // No user card for anon
     if (this.siteSettings.hide_user_profiles_from_public && !this.currentUser) {
       return false;
     }
 
-    // XSS protection (should be encapsulated)
-    username = username.toString().replace(/[^A-Za-z0-9_\.\-]/g, "");
+    username = Ember.Handlebars.Utils.escapeExpression(username.toString());
 
     // Don't show on mobile
     if (this.site.mobileView) {
@@ -243,6 +269,10 @@ export default Ember.Component.extend(CleansUp, {
   },
 
   actions: {
+    close() {
+      this._close();
+    },
+
     cancelFilter() {
       const postStream = this.get('postStream');
       postStream.cancelFilter();
@@ -266,6 +296,10 @@ export default Ember.Component.extend(CleansUp, {
     showUser() {
       this.sendAction('showUser', this.get('user'));
       this._close();
+    },
+
+    checkEmail(user) {
+      user.checkEmail();
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/user-selector.js.es6 b/app/assets/javascripts/discourse/components/user-selector.js.es6
index 99bfeba07c..830a74d708 100644
--- a/app/assets/javascripts/discourse/components/user-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/user-selector.js.es6
@@ -21,6 +21,7 @@ export default TextField.extend({
         groups = [],
         currentUser = this.currentUser,
         includeMentionableGroups = this.get('includeMentionableGroups') === 'true',
+        includeMessageableGroups = this.get('includeMessageableGroups') === 'true',
         includeGroups = this.get('includeGroups') === 'true',
         allowedUsers = this.get('allowedUsers') === 'true';
 
@@ -41,21 +42,25 @@ export default TextField.extend({
       allowAny: this.get('allowAny'),
       updateData: (opts && opts.updateData) ? opts.updateData : false,
 
-      dataSource: function(term) {
+      dataSource(term) {
+        const termRegex = Discourse.User.currentProp('can_send_private_email_messages') ?
+          /[^a-zA-Z0-9_\-\.@\+]/ : /[^a-zA-Z0-9_\-\.]/;
+
         var results = userSearch({
-          term: term.replace(/[^a-zA-Z0-9_\-\.]/, ''),
+          term: term.replace(termRegex, ''),
           topicId: self.get('topicId'),
           exclude: excludedUsernames(),
           includeGroups,
           allowedUsers,
           includeMentionableGroups,
+          includeMessageableGroups,
           group: self.get("group")
         });
 
         return results;
       },
 
-      transformComplete: function(v) {
+      transformComplete(v) {
         if (v.username || v.name) {
           if (!v.username) { groups.push(v.name); }
           return v.username || v.name;
@@ -67,7 +72,7 @@ export default TextField.extend({
         }
       },
 
-      onChangeItems: function(items) {
+      onChangeItems(items) {
         var hasGroups = false;
         items = items.map(function(i) {
           if (groups.indexOf(i) > -1) { hasGroups = true; }
@@ -80,7 +85,7 @@ export default TextField.extend({
         if (self.get('onChangeCallback')) self.sendAction('onChangeCallback');
       },
 
-      reverseTransform: function(i) {
+      reverseTransform(i) {
         return { username: i };
       }
 
diff --git a/app/assets/javascripts/discourse/components/user-stat.js.es6 b/app/assets/javascripts/discourse/components/user-stat.js.es6
index 290aae5a97..8931501e3e 100644
--- a/app/assets/javascripts/discourse/components/user-stat.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stat.js.es6
@@ -1,3 +1,5 @@
 export default Ember.Component.extend({
-  classNames: ['user-stat']
+  classNames: ['user-stat'],
+  type: 'number',
+  isNumber: Ember.computed.equal('type', 'number')
 });
diff --git a/app/assets/javascripts/discourse/components/user-stream-item.js.es6 b/app/assets/javascripts/discourse/components/user-stream-item.js.es6
new file mode 100644
index 0000000000..103f450b24
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/user-stream-item.js.es6
@@ -0,0 +1,15 @@
+import { propertyEqual } from 'discourse/lib/computed';
+import { actionDescription } from "discourse/widgets/post-small-action";
+
+export default Ember.Component.extend({
+  classNameBindings: [
+    ":user-stream-item",
+    ":item", // DEPRECATED: 'item' class
+    "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"),
+});
diff --git a/app/assets/javascripts/discourse/components/user-stream.js.es6 b/app/assets/javascripts/discourse/components/user-stream.js.es6
index c9871ecadb..4e7b2456a7 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,
@@ -16,6 +17,7 @@ export default Ember.Component.extend(LoadMore, {
 
     $(window).on('resize.discourse-on-scroll', () => this.scrolled());
 
+    this.$().on('click.details-disabled', 'details.disabled', () => false);
     this.$().on('mouseup.discourse-redirect', '.excerpt a', function(e) {
       // bypass if we are selecting stuff
       const selection = window.getSelection && window.getSelection();
@@ -37,6 +39,7 @@ export default Ember.Component.extend(LoadMore, {
   _destroyed: function() {
     this.unbindScrolling('user-stream-view');
     $(window).unbind('resize.discourse-on-scroll');
+    this.$().off('click.details-disabled', 'details.disabled');
 
     // Unbind link tracking
     this.$().off('mouseup.discourse-redirect', '.excerpt a');
@@ -44,6 +47,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/components/user-summary-section.js.es6 b/app/assets/javascripts/discourse/components/user-summary-section.js.es6
new file mode 100644
index 0000000000..bc13ab3644
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/user-summary-section.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  classNames: ['top-sub-section']
+});
diff --git a/app/assets/javascripts/discourse/components/user-summary-topic.js.es6 b/app/assets/javascripts/discourse/components/user-summary-topic.js.es6
new file mode 100644
index 0000000000..d100e27e25
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/user-summary-topic.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  tagName: 'li'
+});
diff --git a/app/assets/javascripts/discourse/components/user-summary-topics-list.js.es6 b/app/assets/javascripts/discourse/components/user-summary-topics-list.js.es6
new file mode 100644
index 0000000000..ccdf6ef0f9
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/user-summary-topics-list.js.es6
@@ -0,0 +1,13 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+// should be kept in sync with 'UserSummary::MAX_SUMMARY_RESULTS'
+const MAX_SUMMARY_RESULTS = 6;
+
+export default Ember.Component.extend({
+  tagName: '',
+
+  @computed('items.length')
+  hasMore(length) {
+    return length >= MAX_SUMMARY_RESULTS;
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/user-summary-user.js.es6 b/app/assets/javascripts/discourse/components/user-summary-user.js.es6
new file mode 100644
index 0000000000..d100e27e25
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/user-summary-user.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  tagName: 'li'
+});
diff --git a/app/assets/javascripts/discourse/controllers/application.js.es6 b/app/assets/javascripts/discourse/controllers/application.js.es6
index 78402acd25..45286bbec3 100644
--- a/app/assets/javascripts/discourse/controllers/application.js.es6
+++ b/app/assets/javascripts/discourse/controllers/application.js.es6
@@ -14,11 +14,5 @@ export default Ember.Controller.extend({
   @computed
   loginRequired() {
     return Discourse.SiteSettings.login_required && !Discourse.User.current();
-  },
-
-  actions: {
-    appRouteAction(name) {
-      return this.send(name);
-    }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6 b/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
index ab30fef157..6eb9a7183e 100644
--- a/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
+++ b/app/assets/javascripts/discourse/controllers/avatar-selector.js.es6
@@ -36,10 +36,17 @@ export default Ember.Controller.extend(ModalFunctionality, {
     refreshGravatar() {
       this.set("gravatarRefreshDisabled", true);
       return ajax(`/user_avatar/${this.get("username")}/refresh_gravatar.json`, { method: "POST" })
-        .then(result => this.setProperties({
-          gravatar_avatar_template: result.gravatar_avatar_template,
-          gravatar_avatar_upload_id: result.gravatar_upload_id,
-        }))
+        .then(result => {
+          if (!result.gravatar_upload_id) {
+            this.set("gravatarFailed", true);
+          } else {
+            this.setProperties({
+              gravatarFailed: false,
+              gravatar_avatar_template: result.gravatar_avatar_template,
+              gravatar_avatar_upload_id: result.gravatar_upload_id,
+            });
+          }
+        })
         .finally(() => this.set("gravatarRefreshDisabled", false));
     }
   }
diff --git a/app/assets/javascripts/discourse/controllers/badges/show.js.es6 b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
index f7f79f14c4..11d01f32a7 100644
--- a/app/assets/javascripts/discourse/controllers/badges/show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
@@ -1,11 +1,17 @@
 import UserBadge from 'discourse/models/user-badge';
 import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import BadgeSelectController from "discourse/mixins/badge-select-controller";
 
-export default Ember.Controller.extend({
+export default Ember.Controller.extend(BadgeSelectController, {
   queryParams: ['username'],
   noMoreBadges: false,
   userBadges: null,
   application: Ember.inject.controller(),
+  hiddenSetTitle: true,
+
+  filteredList: function() {
+    return this.get('userBadgesAll').filterBy('badge.allow_title', true);
+  }.property('userBadgesAll'),
 
   @computed('username')
   user(username) {
@@ -19,6 +25,11 @@ export default Ember.Controller.extend({
     return username ? userCount : modelCount;
   },
 
+  @computed("model.allow_title", "model.has_badge", "model")
+  canSelectTitle(hasTitleBadges, hasBadge) {
+    return this.siteSettings.enable_badges && hasTitleBadges && hasBadge;
+  },
+
   actions: {
     loadMore() {
       if (this.get('loadingMore')) {
@@ -39,6 +50,10 @@ export default Ember.Controller.extend({
       }).finally(()=>{
         this.set('loadingMore', false);
       });
+    },
+
+    toggleSetUserTitle() {
+      return this.toggleProperty('hiddenSetTitle');
     }
   },
 
diff --git a/app/assets/javascripts/discourse/controllers/change-owner.js.es6 b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
index 84c323b88a..3bb3c10ca2 100644
--- a/app/assets/javascripts/discourse/controllers/change-owner.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-owner.js.es6
@@ -1,55 +1,54 @@
-import SelectedPostsCount from 'discourse/mixins/selected-posts-count';
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import DiscourseURL from 'discourse/lib/url';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import DiscourseURL from "discourse/lib/url";
+import computed from "ember-addons/ember-computed-decorators";
+
+export default Ember.Controller.extend(ModalFunctionality, {
+  topicController: Ember.inject.controller("topic"),
 
-// Modal related to changing the ownership of posts
-export default Ember.Controller.extend(SelectedPostsCount, ModalFunctionality, {
-  topicController: Ember.inject.controller('topic'),
-  selectedPosts: Em.computed.alias('topicController.selectedPosts'),
   saving: false,
   new_user: null,
 
-  buttonDisabled: function() {
-    if (this.get('saving')) return true;
-    return Ember.isEmpty(this.get('new_user'));
-  }.property('saving', 'new_user'),
+  selectedPostsCount: Ember.computed.alias("topicController.selectedPostsCount"),
+  selectedPostsUsername: Ember.computed.alias("topicController.selectedPostsUsername"),
 
-  buttonTitle: function() {
-    if (this.get('saving')) return I18n.t('saving');
-    return I18n.t('topic.change_owner.action');
-  }.property('saving'),
+  @computed("saving", "new_user")
+  buttonDisabled(saving, newUser) {
+    return saving || Ember.isEmpty(newUser);
+  },
 
-  onShow: function() {
+  @computed("saving")
+  buttonTitle(saving) {
+    return saving ? I18n.t("saving") : I18n.t("topic.change_owner.action");
+  },
+
+  onShow() {
     this.setProperties({
       saving: false,
-      new_user: ''
+      new_user: ""
     });
   },
 
   actions: {
-    changeOwnershipOfPosts: function() {
-      this.set('saving', true);
+    changeOwnershipOfPosts() {
+      this.set("saving", true);
 
-      var postIds = this.get('selectedPosts').map(function(p) { return p.get('id'); }),
-          self = this,
-          saveOpts = {
-            post_ids: postIds,
-            username: this.get('new_user')
-          };
+      const options = {
+        post_ids: this.get("topicController.selectedPostIds"),
+        username: this.get("new_user"),
+      };
 
-      Discourse.Topic.changeOwners(this.get('topicController.model.id'), saveOpts).then(function() {
-        // success
-        self.send('closeModal');
-        self.get('topicController').send('deselectAll');
-        if (self.get('topicController.multiSelect')) {
-          self.get('topicController').send('toggleMultiSelect');
+      Discourse.Topic.changeOwners(this.get("topicController.model.id"), options).then(() => {
+        this.send("closeModal");
+        this.get("topicController").send("deselectAll");
+        if (this.get("topicController.multiSelect")) {
+          this.get("topicController").send("toggleMultiSelect");
         }
-        Em.run.next(() => { DiscourseURL.routeTo(self.get("topicController.model.url")); });
-      }, function() {
-        // failure
-        self.flash(I18n.t('topic.change_owner.error'), 'alert-error');
-        self.set('saving', false);
+        Ember.run.next(() => DiscourseURL.routeTo(this.get("topicController.model.url")));
+      }, () => {
+        this.flash(I18n.t("topic.change_owner.error"), "alert-error");
+        this.set("saving", false);
       });
+
       return false;
     }
   }
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 6c10b0b1dc..d08f59c9f4 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -2,7 +2,7 @@ import DiscourseURL from 'discourse/lib/url';
 import Quote from 'discourse/lib/quote';
 import Draft from 'discourse/models/draft';
 import Composer from 'discourse/models/composer';
-import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import { default as computed, observes, on } from 'ember-addons/ember-computed-decorators';
 import InputValidation from 'discourse/models/input-validation';
 import { getOwner } from 'discourse-common/lib/get-owner';
 import { escapeExpression } from 'discourse/lib/utilities';
@@ -40,7 +40,8 @@ function loadDraft(store, opts) {
       draft: true,
       composerState: Composer.DRAFT,
       composerTime: draft.composerTime,
-      typingTime: draft.typingTime
+      typingTime: draft.typingTime,
+      whisper: draft.whisper
     });
     return composer;
   }
@@ -48,6 +49,10 @@ function loadDraft(store, opts) {
 
 const _popupMenuOptionsCallbacks = [];
 
+export function clearPopupMenuOptionsCallback() {
+  _popupMenuOptionsCallbacks.length = 0;
+}
+
 export function addPopupMenuOptionsCallback(callback) {
   _popupMenuOptionsCallbacks.push(callback);
 }
@@ -63,12 +68,32 @@ export default Ember.Controller.extend({
   showEditReason: false,
   editReason: null,
   scopedCategoryId: null,
-  optionsVisible: false,
   lastValidatedAt: null,
   isUploading: false,
   topic: null,
   linkLookup: null,
+  showPreview: true,
+  forcePreview: Ember.computed.and('site.mobileView', 'showPreview'),
   whisperOrUnlistTopic: Ember.computed.or('model.whisper', 'model.unlistTopic'),
+  categories: Ember.computed.alias('site.categoriesList'),
+
+  @on('init')
+  _setupPreview() {
+    const val = (this.site.mobileView ? false : (this.keyValueStore.get('composer.showPreview') || 'true'));
+    this.set('showPreview', val === 'true');
+  },
+
+  @computed('showPreview')
+  toggleText: function(showPreview) {
+    return showPreview ? I18n.t('composer.hide_preview') : I18n.t('composer.show_preview');
+  },
+
+  @observes('showPreview')
+  showPreviewChanged() {
+    if (!this.site.mobileView) {
+      this.keyValueStore.set({ key: 'composer.showPreview', value: this.get('showPreview') });
+    }
+  },
 
   @computed('model.replyingToTopic', 'model.creatingPrivateMessage', 'model.targetUsernames')
   focusTarget(replyingToTopic, creatingPM, usernames) {
@@ -139,11 +164,6 @@ export default Ember.Controller.extend({
     return isStaffUser && this.siteSettings.enable_whispers && action === Composer.REPLY;
   },
 
-  @computed("popupMenuOptions")
-  showPopupMenu(popupMenuOptions) {
-    return popupMenuOptions ? popupMenuOptions.some(option => option.condition) : false;
-  },
-
   _setupPopupMenuOption(callback) {
     let option = callback();
 
@@ -204,6 +224,21 @@ export default Ember.Controller.extend({
   },
 
   actions: {
+    cancelUpload() {
+      this.set('model.uploadCancelled', true);
+    },
+
+    onPopupMenuAction(action) {
+      this.send(action);
+    },
+
+    storeToolbarState(toolbarEvent) {
+      this.set('toolbarEvent', toolbarEvent);
+    },
+
+    togglePreview() {
+      this.toggleProperty('showPreview');
+    },
 
     typed() {
       this.checkReplyLength();
@@ -212,7 +247,6 @@ export default Ember.Controller.extend({
 
     cancelled() {
       this.send('hitEsc');
-      this.send('hideOptions');
     },
 
     addLinkLookup(linkLookup) {
@@ -265,23 +299,21 @@ export default Ember.Controller.extend({
       this.toggleProperty('showToolbar');
     },
 
-    showOptions(toolbarEvent, loc) {
-      this.set('toolbarEvent', toolbarEvent);
-      this.appEvents.trigger('popup-menu:open', loc);
-      this.set('optionsVisible', true);
-    },
-
-    hideOptions() {
-      this.set('optionsVisible', false);
-    },
-
     // Toggle the reply view
     toggle() {
-      this.toggle();
-    },
+      this.closeAutocomplete();
 
-    togglePreview() {
-      this.get('model').togglePreview();
+      if (Ember.isEmpty(this.get('model.reply')) && Ember.isEmpty(this.get('model.title'))) {
+        this.close();
+      } else {
+        if (this.get('model.composeState') === Composer.OPEN) {
+          this.shrink();
+        } else {
+          this.cancelComposer();
+        }
+      }
+
+      return false;
     },
 
     // Import a quote from the post
@@ -330,6 +362,11 @@ export default Ember.Controller.extend({
     },
 
     hitEsc() {
+      if (Ember.$(".emoji-picker-modal.fadeIn").length === 1) {
+        this.appEvents.trigger('emoji-picker:close');
+        return;
+      }
+
       if ((this.get('messageCount') || 0) > 0) {
         this.appEvents.trigger('composer-messages:close');
         return;
@@ -349,11 +386,22 @@ export default Ember.Controller.extend({
     groupsMentioned(groups) {
       if (!this.get('model.creatingPrivateMessage') && !this.get('model.topic.isPrivateMessage')) {
         groups.forEach(group => {
-          const body = I18n.t('composer.group_mentioned', {
-            group: "@" + group.name,
-            count: group.user_count,
-            group_link: Discourse.getURL(`/group/${group.name}/members`)
-          });
+          let body;
+
+          if (group.max_mentions < group.user_count) {
+            body = I18n.t('composer.group_mentioned_limit', {
+              group: "@" + group.name,
+              max: group.max_mentions,
+              group_link: Discourse.getURL(`/groups/${group.name}/members`)
+            });
+          } else {
+            body = I18n.t('composer.group_mentioned', {
+              group: "@" + group.name,
+              count: group.user_count,
+              group_link: Discourse.getURL(`/groups/${group.name}/members`)
+            });
+          }
+
           this.appEvents.trigger('composer-messages:create', {
             extraClass: 'custom-body',
             templateName: 'custom-body',
@@ -381,24 +429,6 @@ export default Ember.Controller.extend({
 
   },
 
-  categories: function() {
-    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) {
@@ -429,7 +459,7 @@ export default Ember.Controller.extend({
 
         let buttons = [{
           "label": I18n.t("composer.cancel"),
-          "class": "cancel",
+          "class": "d-modal-cancel",
           "link": true
         }];
 
@@ -653,7 +683,7 @@ export default Ember.Controller.extend({
       if (!splitCategory[1]) {
         category = this.site.get('categories').findBy('nameLower', splitCategory[0].toLowerCase());
       } else {
-        const categories = Discourse.Category.list();
+        const categories = this.site.get('categories');
         const mainCategory = categories.findBy('nameLower', splitCategory[0].toLowerCase());
         category = categories.find(function(item) {
           return item && item.get('nameLower') === splitCategory[1].toLowerCase() && item.get('parent_category_id') === mainCategory.id;
@@ -719,7 +749,7 @@ export default Ember.Controller.extend({
   },
 
   shrink() {
-    if (this.get('model.replyDirty')) {
+    if (this.get('model.replyDirty') || (this.get('model.canEditTitle') && this.get('model.titleDirty'))) {
       this.collapse();
     } else {
       this.close();
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index 956b9bf35b..9b3528f32b 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 e64351a291..e955208acc 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-category.js.es6 b/app/assets/javascripts/discourse/controllers/edit-category.js.es6
index e05c37937b..2af5d3593d 100644
--- a/app/assets/javascripts/discourse/controllers/edit-category.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-category.js.es6
@@ -65,7 +65,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
     saveCategory() {
       const self = this,
           model = this.get('model'),
-          parentCategory = Discourse.Category.list().findBy('id', parseInt(model.get('parent_category_id'), 10));
+          parentCategory = this.site.get('categories').findBy('id', parseInt(model.get('parent_category_id'), 10));
 
       this.set('saving', true);
       model.set('parentCategory', parentCategory);
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 34f1b9cf66..e1a122a37a 100644
--- a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
@@ -1,65 +1,51 @@
-import { default as computed, observes } from "ember-addons/ember-computed-decorators";
+import { default as computed } from "ember-addons/ember-computed-decorators";
 import ModalFunctionality from 'discourse/mixins/modal-functionality';
 import TopicTimer from 'discourse/models/topic-timer';
 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';
-const DELETE_STATUS_TYPE = 'delete';
-const REMINDER_TYPE = 'reminder';
+export const OPEN_STATUS_TYPE = 'open';
+export const PUBLISH_TO_CATEGORY_STATUS_TYPE = 'publish_to_category';
+export const DELETE_STATUS_TYPE = 'delete';
+export const REMINDER_TYPE = 'reminder';
 
 export default Ember.Controller.extend(ModalFunctionality, {
   loading: false,
-  updateTime: null,
-  topicTimer: Ember.computed.alias("model.topic_timer"),
-  selection: Ember.computed.alias('model.topic_timer.status_type'),
-  autoOpen: Ember.computed.equal('selection', OPEN_STATUS_TYPE),
-  autoClose: Ember.computed.equal('selection', CLOSE_STATUS_TYPE),
-  autoDelete: Ember.computed.equal('selection', DELETE_STATUS_TYPE),
-  publishToCategory: Ember.computed.equal('selection', PUBLISH_TO_CATEGORY_STATUS_TYPE),
-  reminder: Ember.computed.equal('selection', REMINDER_TYPE),
-
-  showTimeOnly: Ember.computed.or('autoOpen', 'autoDelete', 'reminder'),
+  isPublic: "true",
 
   @computed("model.closed")
-  timerTypes(closed) {
+  publicTimerTypes(closed) {
     return [
       { id: CLOSE_STATUS_TYPE, name: I18n.t(closed ? 'topic.temp_open.title' : 'topic.auto_close.title'), },
       { id: OPEN_STATUS_TYPE, name: I18n.t(closed ? 'topic.auto_reopen.title' : 'topic.temp_close.title') },
       { id: PUBLISH_TO_CATEGORY_STATUS_TYPE, name: I18n.t('topic.publish_to_category.title') },
-      { id: DELETE_STATUS_TYPE, name: I18n.t('topic.auto_delete.title') },
+      { id: DELETE_STATUS_TYPE, name: I18n.t('topic.auto_delete.title') }
+    ];
+  },
+
+  @computed()
+  privateTimerTypes() {
+    return [
       { id: REMINDER_TYPE, name: I18n.t('topic.reminder.title') }
     ];
   },
 
-  @computed('updateTime', 'loading')
-  saveDisabled(updateTime, loading) {
-    return Ember.isEmpty(updateTime) || loading;
-  },
-
-  @computed("model.visible")
-  excludeCategoryId(visible) {
-    if (visible) return this.get('model.category_id');
-  },
-
-  @observes("topicTimer.execute_at", "topicTimer.duration")
-  _setUpdateTime() {
-    if (!this.get('topicTimer.execute_at')) return;
-
-    let time = null;
-
-    if (this.get("topicTimer.based_on_last_post")) {
-      time = this.get("topicTimer.duration");
-    } else if (this.get("topicTimer.execute_at")) {
-      const closeTime = moment(this.get('topicTimer.execute_at'));
-
-      if (closeTime > moment()) {
-        time = closeTime.format("YYYY-MM-DD HH:mm");
-      }
+  @computed("isPublic", 'publicTimerTypes', 'privateTimerTypes')
+  selections(isPublic, publicTimerTypes, privateTimerTypes) {
+    if (isPublic === 'true') {
+      return publicTimerTypes;
+    } else {
+      return privateTimerTypes;
     }
+  },
 
-    this.set("updateTime", time);
+  @computed('isPublic', 'model.topic_timer', 'model.private_topic_timer')
+  topicTimer(isPublic, publicTopicTimer, privateTopicTimer) {
+    if (isPublic === 'true') {
+      return publicTopicTimer;
+    } else {
+      return privateTopicTimer;
+    }
   },
 
   _setTimer(time, statusType) {
@@ -70,7 +56,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');
@@ -83,10 +69,11 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
         this.set('model.closed', result.closed);
       } else {
+        const topicTimer = this.get('isPublic') === 'true' ? 'topic_timer' : 'private_topic_timer';
+        this.set(`model.${topicTimer}`, Ember.Object.create({}));
+
         this.setProperties({
-          topicTimer: Ember.Object.create({}),
           selection: null,
-          updateTime: null
         });
       }
     }).catch(error => {
@@ -96,11 +83,11 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
   actions: {
     saveTimer() {
-      this._setTimer(this.get("updateTime"), this.get('selection'));
+      this._setTimer(this.get("topicTimer.updateTime"), this.get('topicTimer.status_type'));
     },
 
     removeTimer() {
-      this._setTimer(null, this.get('selection'));
+      this._setTimer(null, this.get('topicTimer.status_type'));
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/exception.js.es6 b/app/assets/javascripts/discourse/controllers/exception.js.es6
index a44d0b9c93..dc265426a0 100644
--- a/app/assets/javascripts/discourse/controllers/exception.js.es6
+++ b/app/assets/javascripts/discourse/controllers/exception.js.es6
@@ -32,6 +32,7 @@ export default Ember.Controller.extend({
     if (this.get('thrown.jqTextStatus') === "timeout") return true;
     return false;
   }.property(),
+
   isNotFound: Em.computed.equal('thrown.status', 404),
   isForbidden: Em.computed.equal('thrown.status', 403),
   isServer: Em.computed.gte('thrown.status', 500),
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6
index b316091285..e8d309c8c9 100644
--- a/app/assets/javascripts/discourse/controllers/flag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -2,17 +2,35 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality';
 import ActionSummary from 'discourse/models/action-summary';
 import { MAX_MESSAGE_LENGTH } from 'discourse/models/post-action-type';
 import computed from 'ember-addons/ember-computed-decorators';
+import optionalService from 'discourse/lib/optional-service';
 
 export default Ember.Controller.extend(ModalFunctionality, {
+  adminTools: optionalService(),
   userDetails: null,
   selected: null,
   flagTopic: null,
   message: null,
   isWarning: false,
   topicActionByName: null,
+  spammerDetails: null,
 
   onShow() {
-    this.set('selected', null);
+    this.setProperties({
+      selected: null,
+      spammerDetails: null,
+    });
+
+    let adminTools = this.get('adminTools');
+    if (adminTools) {
+      adminTools.checkSpammer(this.get('model.user_id')).then(result => {
+        this.set('spammerDetails', result);
+      });
+    }
+  },
+
+  @computed('spammerDetails.canDelete', 'selected.name_key')
+  showDeleteSpammer(canDeleteSpammer, nameKey) {
+    return canDeleteSpammer && nameKey === 'spam';
   },
 
   @computed('flagTopic')
@@ -35,19 +53,17 @@ export default Ember.Controller.extend(ModalFunctionality, {
       return flagsAvailable;
     } else {
       // flagging topic
-      const self = this,
-          lookup = Em.Object.create();
-
-      _.each(this.get("model.actions_summary"),function(a) {
-        a.flagTopic = self.get('model');
-        a.actionType = self.site.topicFlagTypeById(a.id);
-        const actionSummary = ActionSummary.create(a);
-        lookup.set(a.actionType.get('name_key'), actionSummary);
+      let lookup = Em.Object.create();
+      let model = this.get('model');
+      model.get('actions_summary').forEach(a => {
+        a.flagTopic = model;
+        a.actionType = this.site.topicFlagTypeById(a.id);
+        lookup.set(a.actionType.get('name_key'), ActionSummary.create(a));
       });
       this.set('topicActionByName', lookup);
 
-      return this.site.get('topic_flag_types').filter(function(item) {
-        return _.any(self.get("model.actions_summary"), function(a) {
+      return this.site.get('topic_flag_types').filter(item => {
+        return _.any(this.get("model.actions_summary"), a => {
           return (a.id === item.get('id') && a.can_act);
         });
       });
@@ -73,23 +89,32 @@ export default Ember.Controller.extend(ModalFunctionality, {
   submitDisabled: Em.computed.not('submitEnabled'),
 
   // Staff accounts can "take action"
-  canTakeAction: function() {
-    if (this.get("flagTopic")) return false;
+  @computed('flagTopic', 'selected.is_custom_flag')
+  canTakeAction(flagTopic, isCustomFlag) {
+    return !flagTopic && !isCustomFlag && this.currentUser.get('staff');
+  },
 
-    // We can only take actions on non-custom flags
-    if (this.get('selected.is_custom_flag')) return false;
-    return Discourse.User.currentProp('staff');
-  }.property('selected.is_custom_flag'),
+  @computed('selected.is_custom_flag')
+  submitIcon(isCustomFlag) {
+    return isCustomFlag ? "envelope" : "flag";
+  },
 
-  submitText: function(){
-    if (this.get('selected.is_custom_flag')) {
-      return "<i class='fa fa-envelope'></i>" + (I18n.t(this.get('flagTopic') ? "flagging_topic.notify_action" : "flagging.notify_action"));
-    } else {
-      return "<i class='fa fa-flag'></i>" + (I18n.t(this.get('flagTopic') ? "flagging_topic.action" : "flagging.action"));
+  @computed('selected.is_custom_flag', 'flagTopic')
+  submitLabel(isCustomFlag, flagTopic) {
+    if (isCustomFlag) {
+      return flagTopic ? "flagging_topic.notify_action" : "flagging.notify_action";
     }
-  }.property('selected.is_custom_flag'),
+    return flagTopic ? "flagging_topic.action" : "flagging.action";
+  },
 
   actions: {
+    deleteSpammer() {
+      let details = this.get('spammerDetails');
+      if (details) {
+        details.deleteUser().then(() => window.location.reload());
+      }
+    },
+
     takeAction() {
       this.send('createFlag', {takeAction: true});
       this.set('model.hidden', true);
@@ -135,32 +160,9 @@ export default Ember.Controller.extend(ModalFunctionality, {
     },
   },
 
-  canDeleteSpammer: function() {
-    if (this.get("flagTopic")) return false;
-
-    if (Discourse.User.currentProp('staff') && this.get('selected.name_key') === 'spam') {
-      return this.get('userDetails.can_be_deleted') && this.get('userDetails.can_delete_all_posts');
-    } else {
-      return false;
-    }
-  }.property('selected.name_key', 'userDetails.can_be_deleted', 'userDetails.can_delete_all_posts'),
-
-  canSendWarning: function() {
-    if (this.get("flagTopic")) return false;
-
-    return (Discourse.User.currentProp('staff') && this.get('selected.name_key') === 'notify_user');
-  }.property('selected.name_key'),
-
-  usernameChanged: function() {
-    this.set('userDetails', null);
-    this.fetchUserDetails();
-  }.observes('model.username'),
-
-  fetchUserDetails() {
-    if (Discourse.User.currentProp('staff') && this.get('model.username')) {
-      const AdminUser = require('admin/models/admin-user').default;
-      AdminUser.find(this.get('model.user_id')).then(user => this.set('userDetails', user));
-    }
+  @computed('flagTopic', 'selected.name_key')
+  canSendWarning(flagTopic, nameKey) {
+    return !flagTopic && this.currentUser.get('staff') && nameKey === 'notify_user';
   }
 
 });
diff --git a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6 b/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
index fb15918640..4311368186 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 a6751b639e..741e74a897 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -4,7 +4,8 @@ import { default as computed, observes } from 'ember-addons/ember-computed-decor
 import Category from 'discourse/models/category';
 import { escapeExpression } from 'discourse/lib/utilities';
 import { setTransient } from 'discourse/lib/page-tracker';
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
+import Composer from 'discourse/models/composer';
 
 const SortOrders = [
   {name: I18n.t('search.relevance'), id: 0},
@@ -14,12 +15,14 @@ const SortOrders = [
   {name: I18n.t('search.latest_topic'), id: 4, term: 'order:latest_topic'},
 
 ];
+const PAGE_LIMIT = 10;
 
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
+  composer: Ember.inject.controller(),
   bulkSelectEnabled: null,
 
-  loading: Em.computed.not("model"),
+  loading: false,
   queryParams: ["q", "expanded", "context_id", "context", "skip_context"],
   q: null,
   selected: [],
@@ -30,11 +33,8 @@ export default Ember.Controller.extend({
   sortOrder: 0,
   sortOrders: SortOrders,
   invalidSearch: false,
-
-  @computed('model.posts')
-  resultCount(posts) {
-    return posts && posts.length;
-  },
+  page: 1,
+  resultCount: null,
 
   @computed('resultCount')
   hasResults(resultCount) {
@@ -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){
@@ -79,6 +87,11 @@ export default Ember.Controller.extend({
     return escapeExpression(q);
   },
 
+  @computed('canCreateTopic', 'siteSettings.login_required')
+  showSuggestion(canCreateTopic, loginRequired) {
+    return canCreateTopic || !loginRequired;
+  },
+
   _searchOnSortChange: true,
 
   setSearchTerm(term) {
@@ -91,11 +104,13 @@ export default Ember.Controller.extend({
   cleanTerm(term) {
     if (term) {
       SortOrders.forEach(order => {
-        let matches = term.match(new RegExp(`${order.term}\\b`));
-        if (matches) {
-          this.set('sortOrder', order.id);
-          term = term.replace(new RegExp(`${order.term}\\b`, 'g'), "");
-          term = term.trim();
+        if (order.term) {
+          let matches = term.match(new RegExp(`${order.term}\\b`));
+          if (matches) {
+            this.set('sortOrder', order.id);
+            term = term.replace(new RegExp(`${order.term}\\b`, 'g'), "");
+            term = term.trim();
+          }
         }
       });
     }
@@ -105,6 +120,7 @@ export default Ember.Controller.extend({
   @observes('sortOrder')
   triggerSearch() {
     if (this._searchOnSortChange) {
+      this.set("page", 1);
       this._search();
     }
   },
@@ -135,14 +151,25 @@ export default Ember.Controller.extend({
     this.set("application.showFooter", !this.get("loading"));
   },
 
+  @computed('resultCount', 'noSortQ')
+  resultCountLabel(count, term) {
+    const plus = (count % 50 === 0 ? "+" : "");
+    return I18n.t('search.result_count', {count, plus, term});
+  },
+
+  @observes('model.posts.length')
+  resultCountChanged() {
+    this.set("resultCount", this.get("model.posts.length"));
+  },
+
   @computed('hasResults')
   canBulkSelect(hasResults) {
     return this.currentUser && this.currentUser.staff && hasResults;
   },
 
-  @computed('expanded')
-  canCreateTopic(expanded) {
-    return this.currentUser && !this.site.mobileView && !expanded;
+  @computed('expanded', 'model.grouped_search_result.can_create_topic')
+  canCreateTopic(expanded, userCanCreateTopic) {
+    return this.currentUser && userCanCreateTopic && !this.site.mobileView && !expanded;
   },
 
   @computed('expanded')
@@ -150,6 +177,11 @@ export default Ember.Controller.extend({
     return iconHTML(expanded ? "caret-down" : "caret-right");
   },
 
+  @computed('page')
+  isLastPage(page) {
+    return page === PAGE_LIMIT;
+  },
+
   _search() {
     if (this.get("searching")) { return; }
 
@@ -161,10 +193,11 @@ export default Ember.Controller.extend({
     }
 
     this.set("searching", true);
+    this.set("loading", true);
     this.set('bulkSelectEnabled', false);
     this.get('selected').clear();
 
-    var args = { q: searchTerm };
+    var args = { q: searchTerm, page: this.get('page') };
 
     const sortOrder = this.get("sortOrder");
     if (sortOrder && SortOrders[sortOrder].term) {
@@ -172,7 +205,6 @@ export default Ember.Controller.extend({
     }
 
     this.set("q", args.q);
-    this.set("model", null);
 
     const skip = this.get("skip_context");
     if ((!skip && this.get('context')) || skip==="false"){
@@ -186,13 +218,44 @@ export default Ember.Controller.extend({
 
     ajax("/search", { data: args }).then(results => {
       const model = translateResults(results) || {};
-      setTransient('lastSearch', { searchKey, model }, 5);
-      this.set("model", model);
-    }).finally(() => this.set("searching", false));
+
+      if (results.grouped_search_result) {
+        this.set('q', results.grouped_search_result.term);
+      }
+
+      if(args.page > 1){
+        if (model){
+          this.get("model").posts.pushObjects(model.posts);
+          this.get("model").topics.pushObjects(model.topics);
+          this.get("model").set('grouped_search_result', results.grouped_search_result);
+        }
+      }else{
+        setTransient('lastSearch', { searchKey, model }, 5);
+        this.set("model", model);
+      }
+    }).finally(() => {
+      this.set("searching", false);
+      this.set("loading", false);
+    });
   },
 
   actions: {
 
+    createTopic(searchTerm) {
+      let topicCategory;
+      if (searchTerm.indexOf("category:") !== -1) {
+        const match =  searchTerm.match(/category:(\S*)/);
+        if (match && match[1]) {
+          topicCategory = match[1];
+        }
+      }
+      this.get('composer').open({
+        action: Composer.CREATE_TOPIC,
+        draftKey: Composer.CREATE_TOPIC,
+        topicCategory
+      });
+    },
+
     selectAll() {
       this.get('selected').addObjects(this.get('model.posts').map(r => r.topic));
       // Doing this the proper way is a HUGE pain,
@@ -214,11 +277,33 @@ export default Ember.Controller.extend({
     },
 
     search() {
+      this.set("page", 1);
       this._search();
     },
 
     toggleAdvancedSearch() {
       this.toggleProperty('expanded');
+    },
+
+    loadMore() {
+      var page = this.get('page');
+      if (this.get('model.grouped_search_result.more_full_page_results') && !this.get("loading") && page < PAGE_LIMIT){
+        this.incrementProperty("page");
+        this._search();
+      }
+    },
+
+    logClick(topicId) {
+      if (this.get('model.grouped_search_result.search_log_id') && topicId) {
+        ajax('/search/click', {
+          type: 'POST',
+          data: {
+            search_log_id: this.get('model.grouped_search_result.search_log_id'),
+            search_result_id: topicId,
+            search_result_type: 'topic'
+          }
+        });
+      }
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
index c2434c83c6..4047450a1c 100644
--- a/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6
@@ -1,12 +1,17 @@
+import { observes } from 'ember-addons/ember-computed-decorators';
 import { fmt } from 'discourse/lib/computed';
 
 export default Ember.Controller.extend({
   group: Ember.inject.controller(),
+  groupActivity: Ember.inject.controller(),
+  application: Ember.inject.controller(),
+  canLoadMore: true,
   loading: false,
   emptyText: fmt('type', 'groups.empty.%@'),
 
   actions: {
     loadMore() {
+      if (!this.get('canLoadMore')) { return; }
       if (this.get('loading')) { return; }
       this.set('loading', true);
       const posts = this.get('model');
@@ -14,12 +19,23 @@ export default Ember.Controller.extend({
         const beforePostId = posts[posts.length-1].get('id');
         const group = this.get('group.model');
 
-        const opts = { beforePostId, type: this.get('type') };
+        let categoryId = this.get('groupActivity.category_id');
+        const opts = { beforePostId, type: this.get('type'), categoryId };
+
         group.findPosts(opts).then(newPosts => {
           posts.addObjects(newPosts);
+          if(newPosts.length === 0) {
+            this.set('canLoadMore', false);
+          }
+        }).finally(() => {
           this.set('loading', false);
         });
       }
     }
+  },
+
+  @observes('canLoadMore')
+  _showFooter() {
+    this.set("application.showFooter", !this.get("canLoadMore"));
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/group-activity.js.es6 b/app/assets/javascripts/discourse/controllers/group-activity.js.es6
index 955822ffcf..de4bda4dcd 100644
--- a/app/assets/javascripts/discourse/controllers/group-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-activity.js.es6
@@ -2,6 +2,7 @@ import computed from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
+  queryParams: ['category_id'],
 
   @computed('model.is_group_user')
   showGroupMessages(isGroupUser) {
diff --git a/app/assets/javascripts/discourse/controllers/group.js.es6 b/app/assets/javascripts/discourse/controllers/group.js.es6
index 09466b4c4f..98e4687f89 100644
--- a/app/assets/javascripts/discourse/controllers/group.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group.js.es6
@@ -1,14 +1,11 @@
 import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
 
-var Tab = Em.Object.extend({
-  @computed('name')
-  location(name) {
-    return 'group.' + name;
-  },
-
-  @computed('name', 'i18nKey')
-  message(name, i18nKey) {
-    return I18n.t(`groups.${i18nKey || name}`);
+const Tab = Ember.Object.extend({
+  init() {
+    this._super();
+    let name = this.get('name');
+    this.set('route', this.get('route') || `group.` + name);
+    this.set('message', I18n.t(`groups.${this.get('i18nKey') || name}`));
   }
 });
 
@@ -18,13 +15,13 @@ export default Ember.Controller.extend({
   showing: 'members',
 
   tabs: [
-    Tab.create({ name: 'members', 'location': 'group.index', icon: 'users' }),
+    Tab.create({ name: 'members', route: 'group.index', icon: 'users' }),
     Tab.create({ name: 'activity' }),
     Tab.create({
-      name: 'edit', i18nKey: 'edit.title', icon: 'pencil', requiresGroupAdmin: true
+      name: 'edit', i18nKey: 'edit.title', icon: 'pencil', admin: true
     }),
     Tab.create({
-      name: 'logs', i18nKey: 'logs.title', icon: 'list-alt', requiresGroupAdmin: true
+      name: 'logs', i18nKey: 'logs.title', icon: 'list-alt', admin: true
     })
   ],
 
@@ -48,23 +45,19 @@ export default Ember.Controller.extend({
     };
   },
 
+  @computed("model.messageable")
+  displayGroupMessageButton(messageable) {
+    return this.currentUser && messageable;
+  },
+
   @observes('model.user_count')
   _setMembersTabCount() {
     this.get('tabs')[0].set('count', this.get('model.user_count'));
   },
 
-  @computed('model.is_group_owner', 'model.automatic')
-  getTabs() {
-    return this.get('tabs').filter(t => {
-      let canSee = true;
-
-      if (this.currentUser && t.requiresGroupAdmin) {
-        canSee = this.currentUser.canManageGroup(this.get('model'));
-      } else if (t.requiresGroupAdmin) {
-        canSee = false;
-      }
-
-      return canSee;
-    });
+  actions: {
+    messageGroup() {
+      this.send('createNewMessageViaParams', this.get('model.name'));
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/invite.js.es6 b/app/assets/javascripts/discourse/controllers/invite.js.es6
index de971784e2..71509d9e13 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 d032c76985..2553a01a13 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,35 @@ 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;
+  },
+
+  @computed
+  fullnameRequired() {
+    return this.siteSettings.full_name_required || this.siteSettings.enable_names;
   },
 
   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'),
+          user_custom_fields: userCustomFields
         }
       }).then(result => {
         if (result.success) {
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index 38ea5f9d30..c524939435 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -71,7 +71,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
         type: 'POST'
       }).then(function (result) {
         // Successful login
-        if (result.error) {
+        if (result && result.error) {
           self.set('loggingIn', false);
           if (result.reason === 'not_activated') {
             self.send('showNotActivated', {
@@ -90,7 +90,6 @@ export default Ember.Controller.extend(ModalFunctionality, {
           // Trigger the browser's password manager using the hidden static login form:
           const $hidden_login_form = $('#hidden-login-form');
           const destinationUrl = $.cookie('destination_url');
-          const shouldRedirectToUrl = self.session.get("shouldRedirectToUrl");
           const ssoDestinationUrl = $.cookie('sso_destination_url');
           $hidden_login_form.find('input[name=username]').val(self.get('loginName'));
           $hidden_login_form.find('input[name=password]').val(self.get('loginPassword'));
@@ -103,9 +102,6 @@ export default Ember.Controller.extend(ModalFunctionality, {
             // redirect client to the original URL
             $.cookie('destination_url', null);
             $hidden_login_form.find('input[name=redirect]').val(destinationUrl);
-          } else if (shouldRedirectToUrl) {
-            self.session.set("shouldRedirectToUrl", null);
-            $hidden_login_form.find('input[name=redirect]').val(shouldRedirectToUrl);
           } else {
             $hidden_login_form.find('input[name=redirect]').val(window.location.href);
           }
@@ -222,14 +218,10 @@ export default Ember.Controller.extend(ModalFunctionality, {
     // Reload the page if we're authenticated
     if (options.authenticated) {
       const destinationUrl = $.cookie('destination_url');
-      const shouldRedirectToUrl = self.session.get("shouldRedirectToUrl");
-      if (self.get('loginRequired') && destinationUrl) {
+      if (destinationUrl) {
         // redirect client to the original URL
         $.cookie('destination_url', null);
         window.location.href = destinationUrl;
-      } else if (shouldRedirectToUrl) {
-        self.session.set("shouldRedirectToUrl", null);
-        window.location.href = shouldRedirectToUrl;
       } else if (window.location.pathname === Discourse.getURL('/login')) {
         window.location.pathname = Discourse.getURL('/');
       } else {
diff --git a/app/assets/javascripts/discourse/controllers/merge-topic.js.es6 b/app/assets/javascripts/discourse/controllers/merge-topic.js.es6
index 34bfa8ba34..6fe4f71e85 100644
--- a/app/assets/javascripts/discourse/controllers/merge-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/merge-topic.js.es6
@@ -1,64 +1,53 @@
-import SelectedPostsCount from 'discourse/mixins/selected-posts-count';
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import { movePosts, mergeTopic } from 'discourse/models/topic';
-import DiscourseURL from 'discourse/lib/url';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { movePosts, mergeTopic } from "discourse/models/topic";
+import DiscourseURL from "discourse/lib/url";
+import computed from "ember-addons/ember-computed-decorators";
 
-// Modal related to merging of topics
-export default Ember.Controller.extend(SelectedPostsCount, ModalFunctionality, {
-  topicController: Ember.inject.controller('topic'),
+export default Ember.Controller.extend(ModalFunctionality, {
+  topicController: Ember.inject.controller("topic"),
 
   saving: false,
   selectedTopicId: null,
 
-  selectedPosts: Em.computed.alias('topicController.selectedPosts'),
-  selectedReplies: Em.computed.alias('topicController.selectedReplies'),
-  allPostsSelected: Em.computed.alias('topicController.allPostsSelected'),
+  selectedPostsCount: Ember.computed.alias("topicController.selectedPostsCount"),
 
-  buttonDisabled: function() {
-    if (this.get('saving')) return true;
-    return Ember.isEmpty(this.get('selectedTopicId'));
-  }.property('selectedTopicId', 'saving'),
+  @computed("saving", "selectedTopicId")
+  buttonDisabled(saving, selectedTopicId) {
+    return saving || Ember.isEmpty(selectedTopicId);
+  },
 
-  buttonTitle: function() {
-    if (this.get('saving')) return I18n.t('saving');
-    return I18n.t('topic.merge_topic.title');
-  }.property('saving'),
+  @computed("saving")
+  buttonTitle(saving) {
+    return saving ? I18n.t("saving") : I18n.t("topic.merge_topic.title");
+  },
 
   onShow() {
-    this.set('modal.modalClass', 'split-modal');
+    this.set("modal.modalClass", "split-modal");
   },
 
   actions: {
     movePostsToExistingTopic() {
-      const topicId = this.get('model.id');
+      const topicId = this.get("model.id");
 
-      this.set('saving', true);
+      this.set("saving", true);
 
-      let promise = null;
-      if (this.get('allPostsSelected')) {
-        promise = mergeTopic(topicId, this.get('selectedTopicId'));
-      } else {
-        const postIds = this.get('selectedPosts').map(function(p) { return p.get('id'); });
-        const replyPostIds = this.get('selectedReplies').map(function(p) { return p.get('id'); });
-
-        promise = movePosts(topicId, {
-          destination_topic_id: this.get('selectedTopicId'),
-          post_ids: postIds,
-          reply_post_ids: replyPostIds
+      let promise = this.get("topicController.selectedAllPosts") ?
+        mergeTopic(topicId, this.get("selectedTopicId")) :
+        movePosts(topicId, {
+          destination_topic_id: this.get("selectedTopicId"),
+          post_ids: this.get("topicController.selectedPostIds")
         });
-      }
 
-      const self = this;
-      promise.then(function(result) {
-        // Posts moved
-        self.send('closeModal');
-        self.get('topicController').send('toggleMultiSelect');
-        Em.run.next(function() { DiscourseURL.routeTo(result.url); });
-      }).catch(function() {
-        self.flash(I18n.t('topic.merge_topic.error'));
-      }).finally(function() {
-        self.set('saving', false);
+      promise.then(result => {
+        this.send("closeModal");
+        this.get("topicController").send("toggleMultiSelect");
+        Ember.run.next(() => DiscourseURL.routeTo(result.url));
+      }).catch(() => {
+        this.flash(I18n.t("topic.merge_topic.error"));
+      }).finally(() => {
+        this.set("saving", false);
       });
+
       return false;
     }
   }
diff --git a/app/assets/javascripts/discourse/controllers/navigation/category.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/category.js.es6
index 143812960b..0d757e4bce 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/category.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/category.js.es6
@@ -1,12 +1,6 @@
-import computed from "ember-addons/ember-computed-decorators";
 import NavigationDefaultController from 'discourse/controllers/navigation/default';
 
 export default NavigationDefaultController.extend({
   showingParentCategory: Em.computed.none('category.parentCategory'),
   showingSubcategoryList: Em.computed.and('category.show_subcategory_list', 'showingParentCategory'),
-
-  @computed("showingSubcategoryList", "category", "noSubcategories")
-  navItems(showingSubcategoryList, category, noSubcategories) {
-    return Discourse.NavItem.buildList(category, { noSubcategories });
-  }
 });
diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
index 93ae014e47..1fa8eedcc7 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
@@ -1,19 +1,4 @@
-import computed from "ember-addons/ember-computed-decorators";
-
 export default Ember.Controller.extend({
   discovery: Ember.inject.controller(),
   discoveryTopics: Ember.inject.controller('discovery/topics'),
-
-  @computed()
-  categories() {
-    return Discourse.Category.list();
-  },
-
-  @computed("filterMode")
-  navItems(filterMode) {
-    // we don't want to show the period in the navigation bar since it's in a dropdown
-    if (filterMode.indexOf("top/") === 0) { filterMode = filterMode.replace("top/", ""); }
-    return Discourse.NavItem.buildList(null, { filterMode });
-  }
-
 });
diff --git a/app/assets/javascripts/discourse/controllers/password-reset.js.es6 b/app/assets/javascripts/discourse/controllers/password-reset.js.es6
index e7694a2301..91c62436d6 100644
--- a/app/assets/javascripts/discourse/controllers/password-reset.js.es6
+++ b/app/assets/javascripts/discourse/controllers/password-reset.js.es6
@@ -7,6 +7,7 @@ import { userPath } from 'discourse/lib/url';
 
 export default Ember.Controller.extend(PasswordValidation, {
   isDeveloper: Ember.computed.alias('model.is_developer'),
+  admin: Ember.computed.alias('model.admin'),
   passwordRequired: true,
   errorMessage: null,
   successMessage: null,
diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
index c7ba00e3e1..9dc6083f15 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
@@ -1,3 +1,4 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import CanCheckEmails from 'discourse/mixins/can-check-emails';
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
@@ -9,6 +10,7 @@ export default Ember.Controller.extend(CanCheckEmails, PreferencesTabController,
   saveAttrNames: ['name'],
 
   canEditName: setting('enable_names'),
+  canSaveUser: true,
 
   newNameInput: null,
 
@@ -77,11 +79,11 @@ export default Ember.Controller.extend(CanCheckEmails, PreferencesTabController,
         model = this.get('model'),
         buttons = [
           { label: I18n.t("cancel"),
-            class: "cancel-inline",
+            class: "d-modal-cancel",
             link:  true,
             callback: () => { this.set('deleting', false); }
           },
-          { label: '<i class="fa fa-exclamation-triangle"></i> ' + I18n.t("user.delete_account"),
+          { label: iconHTML('exclamation-triangle') + I18n.t("user.delete_account"),
             class: "btn btn-danger",
             callback() {
               model.delete().then(function() {
diff --git a/app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6
index f2c543e6be..c39fb86395 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/badge-title.js.es6
@@ -1,28 +1,9 @@
-import { ajax } from 'discourse/lib/ajax';
 import BadgeSelectController from "discourse/mixins/badge-select-controller";
 
 export default Ember.Controller.extend(BadgeSelectController, {
 
   filteredList: function() {
     return this.get('model').filterBy('badge.allow_title', true);
-  }.property('model'),
+  }.property('model')
 
-  actions: {
-    save() {
-      this.setProperties({ saved: false, saving: true });
-
-      ajax(this.get('user.path') + "/preferences/badge_title", {
-        type: "PUT",
-        data: { user_badge_id: this.get('selectedUserBadgeId') }
-      }).then(() => {
-        this.setProperties({
-          saved: true,
-          saving: false,
-          "user.title": this.get('selectedUserBadge.badge.name')
-        });
-      }, () => {
-        bootbox.alert(I18n.t('generic_error'));
-      });
-    }
-  }
 });
diff --git a/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
index 66aa5ccc68..f394acd3e1 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/categories.js.es6
@@ -1,5 +1,6 @@
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { default as computed } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Controller.extend(PreferencesTabController, {
   saveAttrNames: [
@@ -9,6 +10,16 @@ export default Ember.Controller.extend(PreferencesTabController, {
     'watched_first_post_category_ids'
   ],
 
+  @computed("model.watchedCategories", "model.watchedFirstPostCategories", "model.trackedCategories", "model.mutedCategories")
+  selectedCategories(watched, watchedFirst, tracked, muted) {
+    return [].concat(watched, watchedFirst, tracked, muted);
+  },
+
+  canSave: function() {
+    return this.get('currentUser.id') === this.get('model.id') ||
+      this.get('currentUser.admin');
+  }.property(),
+
   actions: {
     save() {
       this.set('saved', false);
diff --git a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
index d49a6ffd6c..fd688471bc 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
@@ -1,8 +1,11 @@
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
+import { setDefaultHomepage } from "discourse/lib/utilities";
 import { default as computed, observes } from "ember-addons/ember-computed-decorators";
 import { currentThemeKey, listThemes, previewTheme, setLocalTheme } from 'discourse/lib/theme-selector';
 import { popupAjaxError } from 'discourse/lib/ajax-error';
 
+const USER_HOMES = { 1: "latest", 2: "categories", 3: "unread", 4: "new", 5: "top" };
+
 export default Ember.Controller.extend(PreferencesTabController, {
 
   @computed("makeThemeDefault")
@@ -13,7 +16,9 @@ export default Ember.Controller.extend(PreferencesTabController, {
       'dynamic_favicon',
       'enable_quoting',
       'disable_jump_reply',
-      'automatically_unpin_topics'
+      'automatically_unpin_topics',
+      'allow_private_messages',
+      'homepage_id',
     ];
 
     if (makeDefault) {
@@ -28,7 +33,7 @@ export default Ember.Controller.extend(PreferencesTabController, {
 
   @computed()
   availableLocales() {
-    return this.siteSettings.available_locales.split('|').map(s => ({ name: s, value: s }));
+    return JSON.parse(this.siteSettings.available_locales);
   },
 
   @computed()
@@ -51,6 +56,19 @@ export default Ember.Controller.extend(PreferencesTabController, {
     previewTheme(key);
   },
 
+  homeChanged() {
+    const siteHome = Discourse.SiteSettings.top_menu.split("|")[0].split(",")[0];
+    const userHome = USER_HOMES[this.get('model.user_option.homepage_id')];
+    setDefaultHomepage(userHome || siteHome);
+  },
+
+  @computed()
+  userSelectableHome() {
+    return _.map(USER_HOMES, (name, num) => {
+      return {name: I18n.t('filters.' + name + '.title'), value: Number(num)};
+    });
+  },
+
   actions: {
     save() {
       this.set('saved', false);
@@ -66,6 +84,8 @@ export default Ember.Controller.extend(PreferencesTabController, {
           setLocalTheme(this.get('themeKey'), this.get('model.user_option.theme_key_seq'));
         }
 
+        this.homeChanged();
+
       }).catch(popupAjaxError);
     }
   }
diff --git a/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
index 8129641b5d..dbc8a4aa2f 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
@@ -1,5 +1,4 @@
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
-import { default as computed } from "ember-addons/ember-computed-decorators";
 import { NotificationLevels } from 'discourse/lib/notification-levels';
 import { popupAjaxError } from 'discourse/lib/ajax-error';
 
@@ -10,14 +9,10 @@ export default Ember.Controller.extend(PreferencesTabController, {
     'new_topic_duration_minutes',
     'auto_track_topics_after_msecs',
     'notification_level_when_replying',
-    'like_notification_frequency'
+    'like_notification_frequency',
+    'allow_private_messages',
   ],
 
-  @computed("model.watchedCategories", "model.trackedCategories", "model.mutedCategories")
-  selectedCategories(watched, tracked, muted) {
-    return [].concat(watched, tracked, muted);
-  },
-
   likeNotificationFrequencies: [{ name: I18n.t('user.like_notification_frequency.always'), value: 0 },
                       { name: I18n.t('user.like_notification_frequency.first_time_and_daily'), value: 1 },
                       { name: I18n.t('user.like_notification_frequency.first_time'), value: 2 },
diff --git a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
index fa7f7470b3..71d8265260 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
@@ -1,7 +1,7 @@
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { popupAjaxError } from 'discourse/lib/ajax-error';
-import { cook } from 'discourse/lib/text';
+import { cookAsync } from 'discourse/lib/text';
 
 export default Ember.Controller.extend(PreferencesTabController, {
 
@@ -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');
@@ -59,9 +57,12 @@ export default Ember.Controller.extend(PreferencesTabController, {
         }
       }
 
+
       return model.save(this.get('saveAttrNames')).then(() => {
-        model.set('bio_cooked', cook(model.get('bio_raw')));
-        this.set('saved', true);
+        cookAsync(model.get('bio_raw')).then(()=>{
+          model.set('bio_cooked', );
+          this.set('saved', true);
+        }).catch(popupAjaxError);
       }).catch(popupAjaxError);
     }
   }
diff --git a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
index f6cfa7be70..6317b07d67 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/request-group-membership-form.js.es6 b/app/assets/javascripts/discourse/controllers/request-group-membership-form.js.es6
new file mode 100644
index 0000000000..8ff6259ae3
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/request-group-membership-form.js.es6
@@ -0,0 +1,35 @@
+import computed from 'ember-addons/ember-computed-decorators';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+import DiscourseURL from 'discourse/lib/url';
+import ModalFunctionality from 'discourse/mixins/modal-functionality';
+
+export default Ember.Controller.extend(ModalFunctionality, {
+  loading: false,
+  reason: Ember.computed.alias('model.membership_request_template'),
+
+  @computed('model.name')
+  title(groupName) {
+    return I18n.t('groups.membership_request.title', { group_name: groupName });
+  },
+
+  @computed('loading', 'reason')
+  disableSubmit(loading, reason) {
+    return (loading || Ember.isEmpty(reason));
+  },
+
+  actions: {
+    requestMember() {
+      if (this.currentUser) {
+        this.set('loading', true);
+
+        this.get('model').requestMembership(this.get('reason')).then(result => {
+          DiscourseURL.routeTo(result.relative_url);
+        }).catch(popupAjaxError).finally(() => {
+          this.set('loading', false);
+        });
+      } else {
+        this._showLoginModal();
+      }
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/split-topic.js.es6 b/app/assets/javascripts/discourse/controllers/split-topic.js.es6
index c8ea321570..818205e703 100644
--- a/app/assets/javascripts/discourse/controllers/split-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/split-topic.js.es6
@@ -1,68 +1,58 @@
-import SelectedPostsCount from 'discourse/mixins/selected-posts-count';
-import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import { extractError } from 'discourse/lib/ajax-error';
-import { movePosts } from 'discourse/models/topic';
-import DiscourseURL from 'discourse/lib/url';
+import ModalFunctionality from "discourse/mixins/modal-functionality";
+import { extractError } from "discourse/lib/ajax-error";
+import { movePosts } from "discourse/models/topic";
+import DiscourseURL from "discourse/lib/url";
+import { default as computed } from "ember-addons/ember-computed-decorators";
 
-// Modal related to auto closing of topics
-export default Ember.Controller.extend(SelectedPostsCount, ModalFunctionality, {
+export default Ember.Controller.extend(ModalFunctionality, {
   topicName: null,
   saving: false,
   categoryId: null,
 
-  topicController: Ember.inject.controller('topic'),
-  selectedPosts: Em.computed.alias('topicController.selectedPosts'),
-  selectedReplies: Em.computed.alias('topicController.selectedReplies'),
-  allPostsSelected: Em.computed.alias('topicController.allPostsSelected'),
+  topicController: Ember.inject.controller("topic"),
+  selectedPostsCount: Ember.computed.alias("topicController.selectedPostsCount"),
 
-  buttonDisabled: function() {
-    if (this.get('saving')) return true;
-    return Ember.isEmpty(this.get('topicName'));
-  }.property('saving', 'topicName'),
+  @computed("saving", "topicName")
+  buttonDisabled(saving, topicName) {
+    return saving || Ember.isEmpty(topicName);
+  },
 
-  buttonTitle: function() {
-    if (this.get('saving')) return I18n.t('saving');
-    return I18n.t('topic.split_topic.action');
-  }.property('saving'),
+  @computed("saving")
+  buttonTitle(saving) {
+    return saving ? I18n.t("saving") : I18n.t("topic.split_topic.action");
+  },
 
   onShow() {
     this.setProperties({
-      'modal.modalClass': 'split-modal',
+      "modal.modalClass": "split-modal",
       saving: false,
       categoryId: null,
-      topicName: ''
+      topicName: ""
     });
   },
 
   actions: {
     movePostsToNewTopic() {
-      this.set('saving', true);
+      this.set("saving", true);
 
-      const postIds = this.get('selectedPosts').map(function(p) { return p.get('id'); }),
-            replyPostIds = this.get('selectedReplies').map(function(p) { return p.get('id'); }),
-            self = this,
-            categoryId = this.get('categoryId'),
-            saveOpts = {
-              title: this.get('topicName'),
-              post_ids: postIds,
-              reply_post_ids: replyPostIds
-            };
+      const options = {
+        title: this.get("topicName"),
+        post_ids: this.get("topicController.selectedPostIds"),
+        category_id: this.get("categoryId")
+      };
 
-      if (!Ember.isNone(categoryId)) { saveOpts.category_id = categoryId; }
-
-      movePosts(this.get('model.id'), saveOpts).then(function(result) {
-        // Posts moved
-        self.send('closeModal');
-        self.get('topicController').send('toggleMultiSelect');
-        Ember.run.next(function() { DiscourseURL.routeTo(result.url); });
-      }).catch(function(xhr) {
-        self.flash(extractError(xhr, I18n.t('topic.split_topic.error')));
-      }).finally(function() {
-        self.set('saving', false);
+      movePosts(this.get("model.id"), options).then(result => {
+        this.send("closeModal");
+        this.get("topicController").send("toggleMultiSelect");
+        Ember.run.next(() => DiscourseURL.routeTo(result.url));
+      }).catch(xhr => {
+        this.flash(extractError(xhr, I18n.t("topic.split_topic.error")));
+      }).finally(() => {
+        this.set("saving", false);
       });
+
       return false;
     }
   }
 
-
 });
diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
index 1e8e0c2fa0..d1a292c2e8 100644
--- a/app/assets/javascripts/discourse/controllers/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
@@ -1,3 +1,4 @@
+import { default as computed } from 'ember-addons/ember-computed-decorators';
 import BulkTopicSelection from "discourse/mixins/bulk-topic-selection";
 import { default as NavItem, extraNavItemProperties, customNavItemHref } from 'discourse/models/nav-item';
 
@@ -58,6 +59,13 @@ export default Ember.Controller.extend(BulkTopicSelection, {
   max_posts: null,
   q: null,
 
+  categories: Ember.computed.alias('site.categoriesList'),
+
+  @computed('canCreateTopic', 'category', 'canCreateTopicOnCategory')
+  createTopicDisabled(canCreateTopic, category, canCreateTopicOnCategory) {
+    return !canCreateTopic || (category && !canCreateTopicOnCategory);
+  },
+
   queryParams: ['order', 'ascending', 'status', 'state', 'search', 'max_posts', 'q'],
 
   navItems: function() {
@@ -68,10 +76,6 @@ export default Ember.Controller.extend(BulkTopicSelection, {
     return Discourse.SiteSettings.show_filter_by_tag;
   }.property('category'),
 
-  categories: function() {
-    return Discourse.Category.list();
-  }.property(),
-
   showAdminControls: function() {
     return !this.get('additionalTags') && this.get('canAdminTag') && !this.get('category');
   }.property('additionalTags', 'canAdminTag', 'category'),
@@ -115,7 +119,9 @@ export default Ember.Controller.extend(BulkTopicSelection, {
 
     deleteTag() {
       const self = this;
-      bootbox.confirm(I18n.t("tagging.delete_confirm"), function(result) {
+      const topicsLength = this.get('list.topic_list.topics.length');
+      const confirmText = topicsLength === 0 ? I18n.t("tagging.delete_confirm_no_topics") : I18n.t("tagging.delete_confirm", {count: topicsLength});
+      bootbox.confirm(confirmText, function(result) {
         if (!result) { return; }
 
         self.get("tag").destroyRecord().then(function() {
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 ac84cf1968..997270dc5f 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 || {};
 
@@ -22,7 +25,7 @@ function addBulkButton(action, key, opts) {
 addBulkButton('showChangeCategory', 'change_category', {icon: 'pencil'});
 addBulkButton('closeTopics', 'close_topics', {icon: 'lock'});
 addBulkButton('archiveTopics', 'archive_topics', {icon: 'folder'});
-addBulkButton('showNotificationLevel', 'notification_level', {icon: 'circle-o'});
+addBulkButton('showNotificationLevel', 'notification_level', {icon: 'd-regular'});
 addBulkButton('resetRead', 'reset_read', {icon: 'backward'});
 addBulkButton('unlistTopics', 'unlist_topics', {
   icon: 'eye-slash',
@@ -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');
     });
   },
@@ -112,7 +115,6 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
     showChangeCategory() {
       this.send('changeBulkTemplate', 'modal/bulk-change-category');
-      this.set('modal.modalClass', 'topic-bulk-actions-modal full');
     },
 
     showNotificationLevel() {
@@ -145,7 +147,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 8d36ea0e75..80209d7b73 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -1,27 +1,25 @@
 import BufferedContent from 'discourse/mixins/buffered-content';
-import SelectedPostsCount from 'discourse/mixins/selected-posts-count';
-import { spinnerHTML } from 'discourse/helpers/loading-spinner';
-import Topic from 'discourse/models/topic';
-import Quote from 'discourse/lib/quote';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
-import computed from 'ember-addons/ember-computed-decorators';
 import Composer from 'discourse/models/composer';
 import DiscourseURL from 'discourse/lib/url';
-import { categoryBadgeHTML } from 'discourse/helpers/category-link';
 import Post from 'discourse/models/post';
+import Quote from 'discourse/lib/quote';
+import QuoteState from 'discourse/lib/quote-state';
+import Topic from 'discourse/models/topic';
 import debounce from 'discourse/lib/debounce';
 import isElementInViewport from "discourse/lib/is-element-in-viewport";
-import QuoteState from 'discourse/lib/quote-state';
+import { ajax } from 'discourse/lib/ajax';
+import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
+import { extractLinkMeta } from 'discourse/lib/render-topic-featured-link';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
+import { spinnerHTML } from 'discourse/helpers/loading-spinner';
 import { userPath } from 'discourse/lib/url';
 
-export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
+export default Ember.Controller.extend(BufferedContent, {
   composer: Ember.inject.controller(),
   application: Ember.inject.controller(),
   multiSelect: false,
-  allPostsSelected: false,
+  selectedPostIds: null,
   editingTopic: false,
-  selectedPosts: null,
-  selectedReplies: null,
   queryParams: ['filter', 'username_filters'],
   loadedAllPosts: Ember.computed.or('model.postStream.loadedAllPosts', 'model.postStream.loadingLastPost'),
   enteredAt: null,
@@ -33,31 +31,29 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
   username_filters: null,
   filter: null,
   quoteState: null,
+  canRemoveTopicFeaturedLink: Ember.computed.and('canEditTopicFeaturedLink', 'buffered.featured_link'),
 
   updateQueryParams() {
-    const postStream = this.get('model.postStream');
-    this.setProperties(postStream.get('streamFilters'));
+    this.setProperties(this.get('model.postStream.streamFilters'));
   },
 
-  _titleChanged: function() {
+  @observes('model.title', 'category')
+  _titleChanged() {
     const title = this.get('model.title');
     if (!Ember.isEmpty(title)) {
-
-      // Note normally you don't have to trigger this, but topic titles can be updated
-      // and are sometimes lazily loaded.
+      // force update lazily loaded titles
       this.send('refreshTitle');
     }
-  }.observes('model.title', 'category'),
+  },
 
   @computed('site.mobileView', 'model.posts_count')
   showSelectedPostsAtBottom(mobileView, postsCount) {
-    return mobileView && (postsCount > 3);
+    return mobileView && postsCount > 3;
   },
 
-  @computed('model.postStream.posts')
-  postsToRender() {
-    return this.capabilities.isAndroid ? this.get('model.postStream.posts')
-                                       : this.get('model.postStream.postsWithPlaceholders');
+  @computed('model.postStream.posts', 'model.postStream.postsWithPlaceholders')
+  postsToRender(posts, postsWithPlaceholders) {
+    return this.capabilities.isAndroid ? posts : postsWithPlaceholders;
   },
 
   @computed('model.postStream.loadingFilter')
@@ -65,63 +61,17 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
     return this.capabilities.isAndroid && loading;
   },
 
-  @computed('model', 'topicTrackingState.messageCount')
-  browseMoreMessage(model) {
-
-    // TODO decide what to show for pms
-    if (model.get('isPrivateMessage')) { return; }
-
-    const opts = { latestLink: `<a href="${Discourse.getURL("/latest")}">${I18n.t("topic.view_latest_topics")}</a>` };
-    let category = model.get('category');
-
-    if (category && Em.get(category, 'id') === Discourse.Site.currentProp("uncategorized_category_id")) {
-      category = null;
-    }
-
-    if (category) {
-      opts.catLink = categoryBadgeHTML(category);
-    } else {
-      opts.catLink = "<a href=\"" + Discourse.getURL("/categories") + "\">" + I18n.t("topic.browse_all_categories") + "</a>";
-    }
-
-    const unreadTopics = this.topicTrackingState.countUnread();
-    const newTopics = this.topicTrackingState.countNew();
-
-    if (newTopics + unreadTopics > 0) {
-      const hasBoth = unreadTopics > 0 && newTopics > 0;
-
-      return I18n.messageFormat("topic.read_more_MF", {
-        "BOTH": hasBoth,
-        "UNREAD": unreadTopics,
-        "NEW": newTopics,
-        "CATEGORY": category ? true : false,
-        latestLink: opts.latestLink,
-        catLink: opts.catLink
-      });
-    } else if (category) {
-      return I18n.t("topic.read_more_in_category", opts);
-    } else {
-      return I18n.t("topic.read_more", opts);
-    }
-  },
-
   @computed('model')
-  pmPath(model) {
-    return this.currentUser && this.currentUser.pmPath(model);
-  },
-
-  @computed('model')
-  suggestedTitle(model) {
-    return model.get('isPrivateMessage') ?
-      `<a href="${this.get('pmPath')}"><i class='private-message-glyph fa fa-envelope'></i></a> ${I18n.t("suggested_topics.pm_title")}` :
-      I18n.t("suggested_topics.title");
+  pmPath(topic) {
+    return this.currentUser && this.currentUser.pmPath(topic);
   },
 
   init() {
     this._super();
-    this.set('selectedPosts', []);
-    this.set('selectedReplies', []);
-    this.set('quoteState', new QuoteState());
+    this.setProperties({
+      selectedPostIds: [],
+      quoteState: new QuoteState(),
+    });
   },
 
   showCategoryChooser: Ember.computed.not("model.isPrivateMessage"),
@@ -134,16 +84,22 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
     DiscourseURL.routeTo(url);
   },
 
-  selectedQuery: function() {
+  @computed
+  selectedQuery() {
     return post => this.postSelected(post);
-  }.property(),
+  },
 
   @computed('model.isPrivateMessage', 'model.category.id')
   canEditTopicFeaturedLink(isPrivateMessage, categoryId) {
     if (!this.siteSettings.topic_featured_link_enabled || isPrivateMessage) { return false; }
 
     const categoryIds = this.site.get('topic_featured_link_allowed_category_ids');
-    return categoryIds === undefined || !categoryIds.length || categoryIds.indexOf(categoryId) !== -1;
+    return categoryIds === undefined || !categoryIds.length || categoryIds.includes(categoryId);
+  },
+
+  @computed('model')
+  featuredLinkDomain(topic) {
+    return extractLinkMeta(topic).domain;
   },
 
   @computed('model.isPrivateMessage')
@@ -170,9 +126,11 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
         const composer = this.get('composer');
         const viewOpen = composer.get('model.viewOpen');
 
+        const quotedText = Quote.build(post, buffer);
+
         // If we can't create a post, delegate to reply as new topic
         if ((!viewOpen) && (!this.get('model.details.can_create_post'))) {
-          this.send('replyAsNewTopic', post);
+          this.send('replyAsNewTopic', post, quotedText);
           return;
         }
 
@@ -193,10 +151,9 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
           composerOpts.post = composerPost;
         }
 
-        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);
@@ -229,6 +186,8 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
 
       this.send('postChangedRoute', postNumber);
       this._progressIndex = topic.get('postStream').progressIndexOfPost(post);
+
+      this.appEvents.trigger('topic:current-post-changed', { post });
     },
 
     currentPostScrolled(event) {
@@ -276,7 +235,11 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
     },
 
     removeAllowedUser(user) {
-      return this.get('model.details').removeAllowedUser(user);
+      return this.get('model.details').removeAllowedUser(user).then(() => {
+        if (this.currentUser.id === user.id) {
+          this.transitionToRoute("userPrivateMessages", user);
+        }
+      });
     },
 
     removeAllowedGroup(group) {
@@ -290,16 +253,15 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
     // Archive a PM (as opposed to archiving a topic)
     toggleArchiveMessage() {
       const topic = this.get('model');
+
       if (topic.get('archiving')) { return; }
 
+      const backToInbox = () => this.gotoInbox(topic.get("inboxGroupName"));
+
       if (topic.get('message_archived')) {
-        topic.moveToInbox().then(()=>{
-          this.gotoInbox(topic.get("inboxGroupName"));
-        });
+        topic.moveToInbox().then(backToInbox);
       } else {
-        topic.archiveMessage().then(()=>{
-          this.gotoInbox(topic.get("inboxGroupName"));
-        });
+        topic.archiveMessage().then(backToInbox);
       }
     },
 
@@ -307,10 +269,11 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
     replyToPost(post) {
       const composerController = this.get('composer');
       const topic = post ? post.get('topic') : this.get('model');
-
       const quoteState = this.get('quoteState');
       const postStream = this.get('model.postStream');
-      if (!postStream) return;
+
+      if (!postStream || !topic || !topic.get('details.can_create_post')) { return; }
+
       const quotedPost = postStream.findLoadedPost(quoteState.postId);
       const quotedText = Quote.build(quotedPost, quoteState.buffer);
 
@@ -320,9 +283,8 @@ 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 = {
           action: Composer.REPLY,
           draftKey: topic.get('draft_key'),
@@ -343,78 +305,94 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
     },
 
     recoverPost(post) {
-      // Recovering the first post recovers the topic instead
-      if (post.get('post_number') === 1) {
-        this.recoverTopic();
-        return;
-      }
-      post.recover();
+      post.get("post_number") === 1 ? this.recoverTopic() : post.recover();
     },
 
     deletePost(post) {
-
-      // Deleting the first post deletes the topic
       if (post.get('post_number') === 1) {
         return this.deleteTopic();
       } else if (!post.can_delete) {
-        // check if current user can delete post
         return false;
       }
 
-      const user = Discourse.User.current(),
-          replyCount = post.get('reply_count'),
-          self = this;
+      const user = this.currentUser;
+      const refresh = () => this.appEvents.trigger('post-stream:refresh');
+      const hasReplies = post.get('reply_count') > 0;
+      const loadedPosts = this.get('model.postStream.posts');
 
-      // If the user is staff and the post has replies, ask if they want to delete replies too.
-      if (user.get('staff') && replyCount > 0) {
-        bootbox.dialog(I18n.t("post.controls.delete_replies.confirm", {count: replyCount}), [
-          {label: I18n.t("cancel"),
-           'class': 'btn-danger right'},
-          {label: I18n.t("post.controls.delete_replies.no_value"),
+      if (user.get('staff') && hasReplies) {
+        ajax(`/posts/${post.id}/reply-ids.json`).then(replies => {
+          const buttons = [];
+
+          buttons.push({
+            label: I18n.t('cancel'),
+            'class': 'btn-danger right'
+          });
+
+          buttons.push({
+            label: I18n.t('post.controls.delete_replies.just_the_post'),
             callback() {
-              post.destroy(user);
-            }
-          },
-          {label: I18n.t("post.controls.delete_replies.yes_value"),
-           'class': 'btn-primary',
-            callback() {
-              Discourse.Post.deleteMany([post], [post]);
-              self.get('model.postStream.posts').forEach(function (p) {
-                if (p === post || p.get('reply_to_post_number') === post.get('post_number')) {
-                  p.setDeletedState(user);
-                }
-              });
+              post.destroy(user)
+                  .then(refresh)
+                  .catch(error => {
+                    popupAjaxError(error);
+                    post.undoDeleteState();
+                  });
             }
+          });
+
+          if (replies.some(r => r.level > 1)) {
+            buttons.push({
+              label: I18n.t('post.controls.delete_replies.all_replies', { count: replies.length }),
+              callback() {
+                loadedPosts.forEach(p => (p === post || replies.some(r => r.id === p.id)) && p.setDeletedState(user));
+                Post.deleteMany([post.id, ...replies.map(r => r.id)])
+                    .then(refresh)
+                    .catch(popupAjaxError);
+              }
+            });
           }
-        ]);
-      } else {
-        return post.destroy(user).then(() => {
-          this.appEvents.trigger('post-stream:refresh');
-        }).catch(error => {
-          popupAjaxError(error);
-          post.undoDeleteState();
+
+          const directReplyIds = replies.filter(r => r.level === 1).map(r => r.id);
+
+          buttons.push({
+            label: I18n.t('post.controls.delete_replies.direct_replies', { count: directReplyIds.length }),
+            'class': 'btn-primary',
+            callback() {
+              loadedPosts.forEach(p => (p === post || directReplyIds.includes(p.id)) && p.setDeletedState(user));
+              Post.deleteMany([post.id, ...directReplyIds])
+                  .then(refresh)
+                  .catch(popupAjaxError);
+            }
+          });
+
+          bootbox.dialog(I18n.t("post.controls.delete_replies.confirm"), buttons);
         });
+      } else {
+        return post.destroy(user)
+                   .then(refresh)
+                   .catch(error => {
+                     popupAjaxError(error);
+                     post.undoDeleteState();
+                   });
       }
     },
 
     editPost(post) {
-      if (!Discourse.User.current()) {
+      if (!this.currentUser) {
         return bootbox.alert(I18n.t('post.controls.edit_anonymous'));
-      }
-
-      // check if current user can edit post
-      if (!post.can_edit) {
+      } else if (!post.can_edit) {
         return false;
       }
 
-      const composer = this.get('composer'),
-            composerModel = composer.get('model'),
-            opts = {
-              post: post,
-              action: Composer.EDIT,
-              draftKey: post.get('topic.draft_key'),
-              draftSequence: post.get('topic.draft_sequence')
-            };
+      const composer = this.get("composer");
+      const composerModel = composer.get("model");
+      const opts = {
+        post,
+        action: Composer.EDIT,
+        draftKey: post.get("topic.draft_key"),
+        draftSequence: post.get("topic.draft_sequence")
+      };
 
       // Cancel and reopen the composer for the first post
       if (composerModel && (post.get('firstPost') || composerModel.get('editingFirstPost'))) {
@@ -426,10 +404,8 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
 
     toggleBookmark(post) {
       if (!this.currentUser) {
-        alert(I18n.t("bookmarks.not_bookmarked"));
-        return;
-      }
-      if (post) {
+        return bootbox.alert(I18n.t("bookmarks.not_bookmarked"));
+      } else if (post) {
         return post.toggleBookmark().catch(popupAjaxError);
       } else {
         return this.get("model").toggleBookmark().then(changedIds => {
@@ -440,14 +416,16 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
     },
 
     jumpToIndex(index) {
-      this._jumpToPostId(this.get('model.postStream.stream')[index-1]);
+      this._jumpToPostId(this.get('model.postStream.stream')[index - 1]);
     },
 
     jumpToPostPrompt() {
       const postText = prompt(I18n.t('topic.progress.jump_prompt_long'));
       if (postText === null) { return; }
+
       const postNumber = parseInt(postText, 10);
       if (postNumber === 0) { return; }
+
       this._jumpToPostId(this.get('model.postStream').findPostIdForPostNumber(postNumber));
     },
 
@@ -460,6 +438,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
         const closest = postStream.closestPostNumberFor(postNumber);
         postId = postStream.findPostIdForPostNumber(closest);
       }
+
       this._jumpToPostId(postId);
     },
 
@@ -475,96 +454,51 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
       this._jumpToPostId(this.get('model.last_read_post_id'));
     },
 
-    selectAll() {
-      const posts = this.get('model.postStream.posts');
-      const selectedPosts = this.get('selectedPosts');
-      if (posts) {
-        selectedPosts.addObjects(posts);
-      }
-      this.set('allPostsSelected', true);
-      this.appEvents.trigger('post-stream:refresh', { force: true });
-    },
-
-    deselectAll() {
-      this.get('selectedPosts').clear();
-      this.get('selectedReplies').clear();
-      this.set('allPostsSelected', false);
-      this.appEvents.trigger('post-stream:refresh', { force: true });
-    },
-
-    toggleParticipant(user) {
-      const postStream = this.get('model.postStream');
-      postStream.toggleParticipant(Ember.get(user, 'username')).then(() => {
-        this.updateQueryParams();
-      });
-    },
-
-    editTopic() {
-      if (!this.get('model.details.can_edit')) return false;
-
-      this.set('editingTopic', true);
-      return false;
-    },
-
-    cancelEditingTopic() {
-      this.set('editingTopic', false);
-      this.rollbackBuffer();
-    },
-
     toggleMultiSelect() {
       this.toggleProperty('multiSelect');
       this.appEvents.trigger('post-stream:refresh', { force: true });
     },
 
-    finishedEditingTopic() {
-      if (!this.get('editingTopic')) { return; }
-
-      // save the modifications
-      const self = this,
-          props = this.get('buffered.buffer');
-
-      Topic.update(this.get('model'), props).then(function() {
-        // Note we roll back on success here because `update` saves
-        // the properties to the topic.
-        self.rollbackBuffer();
-        self.set('editingTopic', false);
-      }).catch(popupAjaxError);
+    selectAll() {
+      this.set('selectedPostIds', [...this.get('model.postStream.stream')]);
+      this.appEvents.trigger('post-stream:refresh', { force: true });
     },
 
-    toggledSelectedPost(post) {
-      this.performTogglePost(post);
+    deselectAll() {
+      this.set('selectedPostIds', []);
+      this.appEvents.trigger('post-stream:refresh', { force: true });
     },
 
-    toggledSelectedPostReplies(post) {
-      const selectedReplies = this.get('selectedReplies');
-      if (this.performTogglePost(post)) {
-        selectedReplies.addObject(post);
-      } else {
-        selectedReplies.removeObject(post);
-      }
+    togglePostSelection(post) {
+      const selected = this.get('selectedPostIds');
+      selected.includes(post.id) ? selected.removeObject(post.id) : selected.addObject(post.id);
+    },
+
+    selectReplies(post) {
+      ajax(`/posts/${post.id}/reply-ids.json`).then(replies => {
+        const replyIds = replies.map(r => r.id);
+        this.get('selectedPostIds').pushObjects([post.id, ...replyIds]);
+        this.appEvents.trigger('post-stream:refresh', { force: true });
+      });
+    },
+
+    selectBelow(post) {
+      const stream = [...this.get('model.postStream.stream')];
+      const below = stream.slice(stream.indexOf(post.id));
+      this.get('selectedPostIds').pushObjects(below);
       this.appEvents.trigger('post-stream:refresh', { force: true });
     },
 
     deleteSelected() {
+      const user = this.currentUser;
+
       bootbox.confirm(I18n.t("post.delete.confirm", { count: this.get('selectedPostsCount')}), result => {
         if (result) {
-
           // If all posts are selected, it's the same thing as deleting the topic
-          if (this.get('allPostsSelected')) {
-            return this.deleteTopic();
-          }
-
-          const selectedPosts = this.get('selectedPosts');
-          const selectedReplies = this.get('selectedReplies');
-          const postStream = this.get('model.postStream');
-
-          Discourse.Post.deleteMany(selectedPosts, selectedReplies);
-          postStream.get('posts').forEach(p => {
-            if (this.postSelected(p)) {
-              p.set('deleted_at', new Date());
-            }
-          });
+          if (this.get('selectedAllPosts')) return this.deleteTopic();
 
+          Post.deleteMany(this.get('selectedPostIds'));
+          this.get('model.postStream.posts').forEach(p => this.postSelected(p) && p.setDeletedState(user));
           this.send('toggleMultiSelect');
         }
       });
@@ -573,15 +507,50 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
     mergePosts() {
       bootbox.confirm(I18n.t("post.merge.confirm", { count: this.get('selectedPostsCount') }), result => {
         if (result) {
-          const selectedPosts = this.get('selectedPosts');
-          Post.mergePosts(selectedPosts);
+          Post.mergePosts(this.get("selectedPostIds"));
           this.send('toggleMultiSelect');
         }
       });
     },
 
+    changePostOwner(post) {
+      this.set("selectedPostIds", [post.id]);
+      this.send('changeOwner');
+    },
+
+    toggleParticipant(user) {
+      this.get("model.postStream")
+          .toggleParticipant(user.get("username"))
+          .then(() => this.updateQueryParams);
+    },
+
+    editTopic() {
+      if (this.get('model.details.can_edit')) {
+        this.set('editingTopic', true);
+      }
+      return false;
+    },
+
+    cancelEditingTopic() {
+      this.set('editingTopic', false);
+      this.rollbackBuffer();
+    },
+
+    finishedEditingTopic() {
+      if (!this.get('editingTopic')) { return; }
+
+      // save the modifications
+      const props = this.get('buffered.buffer');
+
+      Topic.update(this.get('model'), props).then(() => {
+        // We roll back on success here because `update` saves the properties to the topic
+        this.rollbackBuffer();
+        this.set('editingTopic', false);
+      }).catch(popupAjaxError);
+    },
+
     expandHidden(post) {
-      post.expandHidden();
+      return post.expandHidden();
     },
 
     toggleVisibility() {
@@ -656,11 +625,11 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
       }
     },
 
-    replyAsNewTopic(post) {
+    replyAsNewTopic(post, quotedText) {
       const composerController = this.get('composer');
 
       const { quoteState } = this;
-      const quotedText = Quote.build(post, quoteState.buffer);
+      quotedText = quotedText || Quote.build(post, quoteState.buffer);
       quoteState.clear();
 
       var options;
@@ -697,13 +666,9 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
     },
 
     retryLoading() {
-      const self = this;
-      self.set('retrying', true);
-      this.get('model.postStream').refresh().then(function() {
-        self.set('retrying', false);
-      }, function() {
-        self.set('retrying', false);
-      });
+      this.set("retrying", true);
+      const rollback = () => this.set("retrying", false);
+      this.get("model.postStream").refresh().then(rollback, rollback);
     },
 
     toggleWiki(post) {
@@ -724,17 +689,16 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
       return post.unhide();
     },
 
-    changePostOwner(post) {
-      this.get('selectedPosts').addObject(post);
-      this.send('changeOwner');
-    },
-
     convertToPublicTopic() {
       this.get('content').convertTopic("public");
     },
 
     convertToPrivateMessage() {
       this.get('content').convertTopic("private");
+    },
+
+    removeFeaturedLink() {
+      this.set('buffered.featured_link', null);
     }
   },
 
@@ -770,101 +734,84 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
     }
   },
 
-  canMergeTopic: function() {
-    if (!this.get('model.details.can_move_posts')) return false;
-    return this.get('selectedPostsCount') > 0;
-  }.property('selectedPostsCount'),
-
-  canSplitTopic: function() {
-    if (!this.get('model.details.can_move_posts')) return false;
-    if (this.get('allPostsSelected')) return false;
-    return this.get('selectedPostsCount') > 0;
-  }.property('selectedPostsCount'),
-
-  canChangeOwner: function() {
-    if (!Discourse.User.current() || !Discourse.User.current().admin) return false;
-    return this.get('selectedPostsUsername') !== undefined;
-  }.property('selectedPostsUsername'),
-
-  @computed('selectedPosts', 'selectedPostsCount', 'selectedPostsUsername')
-  canMergePosts(selectedPosts, selectedPostsCount, selectedPostsUsername) {
-    if (selectedPostsCount < 2) return false;
-    if (!selectedPosts.every(p => p.get('can_delete'))) return false;
-    return selectedPostsUsername !== undefined;
-  },
-
-  categories: function() {
-    return Discourse.Category.list();
-  }.property(),
-
-  canSelectAll: Em.computed.not('allPostsSelected'),
-
-  canDeselectAll: function () {
-    if (this.get('selectedPostsCount') > 0) return true;
-    if (this.get('allPostsSelected')) return true;
-  }.property('selectedPostsCount', 'allPostsSelected'),
-
-  canDeleteSelected: function() {
-    const selectedPosts = this.get('selectedPosts');
-
-    if (this.get('allPostsSelected')) return true;
-    if (this.get('selectedPostsCount') === 0) return false;
-
-    let canDelete = true;
-    selectedPosts.forEach(function(p) {
-      if (!p.get('can_delete')) {
-        canDelete = false;
-        return false;
-      }
-    });
-    return canDelete;
-  }.property('selectedPostsCount'),
-
   hasError: Ember.computed.or('model.notFoundHtml', 'model.message'),
   noErrorYet: Ember.computed.not('hasError'),
 
-  multiSelectChanged: function() {
-    // Deselect all posts when multi select is turned off
-    if (!this.get('multiSelect')) {
-      this.send('deselectAll');
-    }
-  }.observes('multiSelect'),
+  categories: Ember.computed.alias('site.categoriesList'),
 
-  deselectPost(post) {
-    this.get('selectedPosts').removeObject(post);
+  selectedPostsCount: Ember.computed.alias('selectedPostIds.length'),
 
-    const selectedReplies = this.get('selectedReplies');
-    selectedReplies.removeObject(post);
+  @computed('selectedPostIds', 'model.postStream.posts', 'selectedPostIds.[]', 'model.postStream.posts.[]')
+  selectedPosts(selectedPostIds, loadedPosts) {
+    return selectedPostIds.map(id => loadedPosts.find(p => p.id === id))
+                          .filter(post => post !== undefined);
+  },
 
-    const selectedReply = selectedReplies.findBy('post_number', post.get('reply_to_post_number'));
-    if (selectedReply) { selectedReplies.removeObject(selectedReply); }
+  @computed('selectedPostsCount', 'selectedPosts', 'selectedPosts.[]')
+  selectedPostsUsername(selectedPostsCount, selectedPosts) {
+    if (selectedPosts.length < 1 || selectedPostsCount > selectedPosts.length) { return undefined; }
+    const username = selectedPosts[0].username;
+    return selectedPosts.every(p => p.username === username) ? username : undefined;
+  },
 
-    this.set('allPostsSelected', false);
+  @computed('selectedPostsCount', 'model.postStream.stream.length')
+  selectedAllPosts(selectedPostsCount, postsCount) {
+    return selectedPostsCount >= postsCount;
+  },
+
+  canSelectAll: Ember.computed.not('selectedAllPosts'),
+  canDeselectAll: Ember.computed.alias('selectedAllPosts'),
+
+  @computed('selectedPostsCount', 'selectedAllPosts', 'selectedPosts', 'selectedPosts.[]')
+  canDeleteSelected(selectedPostsCount, selectedAllPosts, selectedPosts) {
+    return selectedPostsCount > 0 && (selectedAllPosts || selectedPosts.every(p => p.can_delete));
+  },
+
+  @computed('canMergeTopic', 'selectedAllPosts')
+  canSplitTopic(canMergeTopic, selectedAllPosts) {
+    return canMergeTopic && !selectedAllPosts;
+  },
+
+  @computed('model.details.can_move_posts', 'selectedPostsCount')
+  canMergeTopic(canMovePosts, selectedPostsCount) {
+    return canMovePosts && selectedPostsCount > 0;
+  },
+
+  @computed('currentUser.admin', 'selectedPostsCount', 'selectedPostsUsername')
+  canChangeOwner(isAdmin, selectedPostsCount, selectedPostsUsername) {
+    return isAdmin && selectedPostsCount > 0 && selectedPostsUsername !== undefined;
+  },
+
+  @computed('selectedPostsCount', 'selectedPostsUsername', 'selectedPosts', 'selectedPosts.[]')
+  canMergePosts(selectedPostsCount, selectedPostsUsername, selectedPosts) {
+    return selectedPostsCount > 1 &&
+           selectedPostsUsername !== undefined &&
+           selectedPosts.every(p => p.can_delete);
+  },
+
+  @observes("multiSelect")
+  _multiSelectChanged() {
+    this.set('selectedPostIds', []);
   },
 
   postSelected(post) {
-    if (this.get('allPostsSelected')) { return true; }
-    if (this.get('selectedPosts').includes(post)) { return true; }
-    if (this.get('selectedReplies').findBy('post_number', post.get('reply_to_post_number'))) { return true; }
-
-    return false;
+    return this.get('selectedAllPost') || this.get('selectedPostIds').includes(post.id);
   },
 
-  loadingHTML: function() {
+  @computed
+  loadingHTML() {
     return spinnerHTML;
-  }.property(),
+  },
 
   recoverTopic() {
     this.get('content').recover();
   },
 
   deleteTopic() {
-    this.get('content').destroy(Discourse.User.current());
+    this.get('content').destroy(this.currentUser);
   },
 
-  // Receive notifications for this topic
   subscribe() {
-    // Unsubscribe before subscribing again
     this.unsubscribe();
 
     const refresh = (args) => this.appEvents.trigger('post-stream:refresh', args);
@@ -872,7 +819,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
     this.messageBus.subscribe(`/topic/${this.get('model.id')}`, data => {
       const topic = this.get('model');
 
-      if (data.notification_level_change) {
+      if (Ember.isPresent(data.notification_level_change)) {
         topic.set('details.notification_level', data.notification_level_change);
         topic.set('details.notifications_reason_id', data.notifications_reason_id);
         return;
@@ -959,38 +906,22 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
   }, 500),
 
   unsubscribe() {
-    const topicId = this.get('content.id');
-    if (!topicId) return;
-
-    // there is a condition where the view never calls unsubscribe, navigate to a topic from a topic
+    // never unsubscribe when navigating from topic to topic
+    if (!this.get("content.id")) return;
     this.messageBus.unsubscribe('/topic/*');
   },
 
-  // Topic related
   reply() {
     this.replyToPost();
   },
 
-  performTogglePost(post) {
-    const selectedPosts = this.get('selectedPosts');
-    if (this.postSelected(post)) {
-      this.deselectPost(post);
-      return false;
-    } else {
-      selectedPosts.addObject(post);
-      // If the user manually selects all posts, all posts are selected
-      this.set('allPostsSelected', selectedPosts.length === this.get('model.posts_count'));
-      return true;
-    }
-  },
-
   readPosts(topicId, postNumbers) {
     const topic = this.get("model");
     const postStream = topic.get("postStream");
 
     if (topic.get('id') === topicId) {
       postStream.get('posts').forEach(post => {
-        if (!post.read && postNumbers.indexOf(post.post_number) !== -1) {
+        if (!post.read && postNumbers.includes(post.post_number)) {
           post.set('read', true);
           this.appEvents.trigger('post-stream:refresh', { id: post.get('id') });
         }
@@ -1003,16 +934,17 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
         // automatically unpin topics when the user reaches the bottom
         const max = _.max(postNumbers);
         if (topic.get("pinned") && max >= topic.get("highest_post_number")) {
-          Em.run.next(() => topic.clearPin());
+          Ember.run.next(() => topic.clearPin());
         }
 
       }
     }
   },
 
-  _showFooter: function() {
+  @observes("model.postStream.loaded", "model.postStream.loadedAllPosts")
+  _showFooter() {
     const showFooter = this.get("model.postStream.loaded") && this.get("model.postStream.loadedAllPosts");
     this.set("application.showFooter", showFooter);
-  }.observes("model.postStream.{loaded,loadedAllPosts}")
+  }
 
 });
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
index 624a8b0ae7..24d4c33480 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
@@ -3,11 +3,9 @@ import { exportUserArchive } from 'discourse/lib/export-csv';
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
   user: Ember.inject.controller(),
-
   userActionType: null,
-  currentPath: Ember.computed.alias('application.currentPath'),
-  viewingSelf: Ember.computed.alias("user.viewingSelf"),
-  showBookmarks: Ember.computed.alias("user.showBookmarks"),
+
+  canDownloadPosts: Ember.computed.alias('user.viewingSelf'),
 
   _showFooter: function() {
     var showFooter;
@@ -26,11 +24,7 @@ export default Ember.Controller.extend({
         I18n.t("user.download_archive.confirm"),
         I18n.t("no_value"),
         I18n.t("yes_value"),
-        function(confirmed) {
-          if (confirmed) {
-            exportUserArchive();
-          }
-        }
+        confirmed => confirmed ? exportUserArchive() : null
       );
     }
   }
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 6e9f48296d..d78b671081 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-summary.js.es6 b/app/assets/javascripts/discourse/controllers/user-summary.js.es6
index c40014854c..d489f9ba28 100644
--- a/app/assets/javascripts/discourse/controllers/user-summary.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-summary.js.es6
@@ -1,7 +1,6 @@
 import computed from 'ember-addons/ember-computed-decorators';
+import { durationTiny } from 'discourse/lib/formatter';
 
-// should be kept in sync with 'UserSummary::MAX_SUMMARY_RESULTS'
-const MAX_SUMMARY_RESULTS = 6;
 // should be kept in sync with 'UserSummary::MAX_BADGES'
 const MAX_BADGES = 6;
 
@@ -9,12 +8,21 @@ export default Ember.Controller.extend({
   userController: Ember.inject.controller('user'),
   user: Ember.computed.alias('userController.model'),
 
-  @computed("model.topics.length")
-  moreTopics(topicsLength) { return topicsLength >= MAX_SUMMARY_RESULTS; },
-
-  @computed("model.replies.length")
-  moreReplies(repliesLength) { return repliesLength >= MAX_SUMMARY_RESULTS; },
-
   @computed("model.badges.length")
   moreBadges(badgesLength) { return badgesLength >= MAX_BADGES; },
+
+  @computed('model.time_read')
+  timeRead(timeReadSeconds) {
+    return durationTiny(timeReadSeconds);
+  },
+
+  @computed('model.time_read', 'model.recent_time_read')
+  showRecentTimeRead(timeRead, recentTimeRead) {
+    return timeRead !== recentTimeRead && recentTimeRead !== 0;
+  },
+
+  @computed('model.recent_time_read')
+  recentTimeRead(recentTimeReadSeconds) {
+    return recentTimeReadSeconds > 0 ? durationTiny(recentTimeReadSeconds) : null;
+  }
 });
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index 0aceb7d13b..37e88e21ac 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -23,6 +23,14 @@ export default Ember.Controller.extend(CanCheckEmails, {
     return (!indexStream || viewingSelf) && !forceExpand;
   },
 
+  hasGivenFlags: Ember.computed.gt('model.number_of_flags_given', 0),
+  hasFlaggedPosts: Ember.computed.gt('model.number_of_flagged_posts', 0),
+  hasDeletedPosts: Ember.computed.gt('model.number_of_deleted_posts', 0),
+  hasBeenSuspended: Ember.computed.gt('model.number_of_suspensions', 0),
+  hasReceivedWarnings: Ember.computed.gt('model.warnings_received_count', 0),
+
+  showStaffCounters: Ember.computed.or('hasGivenFlags', 'hasFlaggedPosts', 'hasDeletedPosts', 'hasBeenSuspended', 'hasReceivedWarnings'),
+
   @computed('model.isSuspended', 'currentUser.staff')
   isNotSuspendedOrIsStaff(isSuspended, isStaff) {
     return !isSuspended || isStaff;
@@ -87,7 +95,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/bound-avatar-template.js.es6 b/app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6
index 5682cd2fbd..e62cf98405 100644
--- a/app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6
+++ b/app/assets/javascripts/discourse/helpers/bound-avatar-template.js.es6
@@ -1,4 +1,10 @@
 import { htmlHelper } from 'discourse-common/lib/helpers';
 import { avatarImg } from 'discourse/lib/utilities';
 
-export default htmlHelper((avatarTemplate, size) => avatarImg({ size, avatarTemplate }));
+export default htmlHelper((avatarTemplate, size) => {
+  if (Ember.isEmpty(avatarTemplate)) {
+    return "<div class='avatar-placeholder'></div>";
+  } else {
+    return avatarImg({ size, avatarTemplate });
+  }
+});
diff --git a/app/assets/javascripts/discourse/helpers/category-badge.js.es6 b/app/assets/javascripts/discourse/helpers/category-badge.js.es6
index 41aad35a59..0d38f38410 100644
--- a/app/assets/javascripts/discourse/helpers/category-badge.js.es6
+++ b/app/assets/javascripts/discourse/helpers/category-badge.js.es6
@@ -5,6 +5,7 @@ registerUnbound('category-badge', function(cat, options) {
   return categoryLinkHTML(cat, {
     hideParent: options.hideParent,
     allowUncategorized: options.allowUncategorized,
+    categoryStyle: options.categoryStyle,
     link: false
   });
 });
diff --git a/app/assets/javascripts/discourse/helpers/category-link.js.es6 b/app/assets/javascripts/discourse/helpers/category-link.js.es6
index 618eca3211..d02254e31c 100644
--- a/app/assets/javascripts/discourse/helpers/category-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/category-link.js.es6
@@ -1,5 +1,5 @@
 import { registerUnbound } from 'discourse-common/lib/helpers';
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 
 var get = Em.get,
     escapeExpression = Handlebars.Utils.escapeExpression;
@@ -24,57 +24,61 @@ export function categoryBadgeHTML(category, opts) {
 
   if ((!category) ||
         (!opts.allowUncategorized &&
-         Em.get(category, 'id') === Discourse.Site.currentProp("uncategorized_category_id") &&
+         Ember.get(category, 'id') === Discourse.Site.currentProp("uncategorized_category_id") &&
          Discourse.SiteSettings.suppress_uncategorized_badge
         )
      ) return "";
 
-  var description = get(category, 'description_text'),
-      restricted = get(category, 'read_restricted'),
-      url = opts.url ? opts.url : Discourse.getURL("/c/") + Discourse.Category.slugFor(category),
-      href = (opts.link === false ? '' : url),
-      tagName = (opts.link === false || opts.link === "false" ? 'span' : 'a'),
-      extraClasses = (opts.extraClasses ? (' ' + opts.extraClasses) : ''),
-      color = get(category, 'color'),
-      html = "",
-      parentCat = null;
+  let description = get(category, 'description_text');
+  let restricted = get(category, 'read_restricted');
+  let url = opts.url ? opts.url : Discourse.getURL("/c/") + Discourse.Category.slugFor(category);
+  let href = (opts.link === false ? '' : url);
+  let tagName = (opts.link === false || opts.link === "false" ? 'span' : 'a');
+  let extraClasses = (opts.extraClasses ? (' ' + opts.extraClasses) : '');
+  let color = get(category, 'color');
+  let html = "";
+  let parentCat = null;
 
   if (!opts.hideParent) {
     parentCat = Discourse.Category.findById(get(category, 'parent_category_id'));
   }
 
-  if (parentCat && parentCat !== category) {
-    html += categoryStripe(get(parentCat,'color'), "badge-category-parent-bg");
+  const categoryStyle = opts.categoryStyle || Discourse.SiteSettings.category_style;
+  if (categoryStyle !== "none") {
+    if (parentCat && parentCat !== category) {
+      html += categoryStripe(get(parentCat,'color'), "badge-category-parent-bg");
+    }
+    html += categoryStripe(color, "badge-category-bg");
   }
 
-  html += categoryStripe(color, "badge-category-bg");
-
-  var classNames = "badge-category clear-badge";
+  let classNames = "badge-category clear-badge";
   if (restricted) { classNames += " restricted"; }
 
-  var textColor = "#" + get(category, 'text_color');
+  let style = "";
+  if (categoryStyle === "box") {
+    style = `style="color: #${get(category, 'text_color')};"`;
+  }
 
-  html += "<span" + ' style="color: ' + textColor + ';" '+
+  html += `<span ${style} ` +
              'data-drop-close="true" class="' + classNames + '"' +
              (description ? 'title="' + escapeExpression(description) + '" ' : '') +
           ">";
 
-  var name = escapeExpression(get(category, 'name'));
+  let categoryName = escapeExpression(get(category, 'name'));
 
   if (restricted) {
-    html += iconHTML('lock') + " " + name;
+    html += iconHTML('lock') + " " + categoryName;
   } else {
-    html += name;
+    html += categoryName;
   }
   html += "</span>";
 
-  if(href){
-    href = " href='" + href + "' ";
+  if (href) {
+    href = ` href="${href}" `;
   }
 
-  extraClasses = Discourse.SiteSettings.category_style ? Discourse.SiteSettings.category_style + extraClasses : extraClasses;
-
-  return "<" + tagName + " class='badge-wrapper " + extraClasses + "' " + href + ">" + html + "</" + tagName + ">";
+  extraClasses = categoryStyle ? categoryStyle + extraClasses : extraClasses;
+  return `<${tagName} class="badge-wrapper ${extraClasses}" ${href}>${html}</${tagName}>`;
 }
 
 export function categoryLinkHTML(category, options) {
@@ -89,6 +93,7 @@ export function categoryLinkHTML(category, options) {
     if (options.link !== undefined) { categoryOptions.link = options.link; }
     if (options.extraClasses) { categoryOptions.extraClasses = options.extraClasses; }
     if (options.hideParent) { categoryOptions.hideParent = true; }
+    if (options.categoryStyle) { categoryOptions.categoryStyle = options.categoryStyle; }
   }
   return new Handlebars.SafeString(categoryBadgeHTML(category, categoryOptions));
 }
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 7864f01af8..0000000000
--- 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/fa-icon-node.js.es6 b/app/assets/javascripts/discourse/helpers/fa-icon-node.js.es6
index 84f1542025..9b5d989f5a 100644
--- a/app/assets/javascripts/discourse/helpers/fa-icon-node.js.es6
+++ b/app/assets/javascripts/discourse/helpers/fa-icon-node.js.es6
@@ -1,20 +1,5 @@
-import { h } from 'virtual-dom';
-import { iconClasses } from 'discourse-common/helpers/fa-icon';
+import { renderIcon } from 'discourse-common/lib/icon-library';
 
-export function iconNode(icon, params) {
-  params = params ||  {};
-
-  const properties = {
-    className: iconClasses(icon, params),
-    attributes: { "aria-hidden": true }
-  };
-
-  if (params.title) { properties.attributes.title = params.title; }
-
-  if (params.label) {
-    return h('i', properties, h('span.sr-only', I18n.t(params.label)));
-  } else {
-    return h('i', properties);
-  }
+export function iconNode(id, params) {
+  return renderIcon('node', id, params);
 }
-
diff --git a/app/assets/javascripts/discourse/helpers/format-age.js.es6 b/app/assets/javascripts/discourse/helpers/format-age.js.es6
index 75119d0c5f..a2a52d3d8c 100644
--- a/app/assets/javascripts/discourse/helpers/format-age.js.es6
+++ b/app/assets/javascripts/discourse/helpers/format-age.js.es6
@@ -1,7 +1,11 @@
-import { autoUpdatingRelativeAge } from 'discourse/lib/formatter';
+import { autoUpdatingRelativeAge, durationTiny } from 'discourse/lib/formatter';
 import { registerUnbound } from 'discourse-common/lib/helpers';
 
 registerUnbound('format-age', function(dt) {
   dt = new Date(dt);
   return new Handlebars.SafeString(autoUpdatingRelativeAge(dt));
 });
+
+registerUnbound('format-duration', function(seconds) {
+  return new Handlebars.SafeString(durationTiny(seconds));
+});
diff --git a/app/assets/javascripts/discourse/helpers/format-date.js.es6 b/app/assets/javascripts/discourse/helpers/format-date.js.es6
index 84602bebc8..046c5f9370 100644
--- a/app/assets/javascripts/discourse/helpers/format-date.js.es6
+++ b/app/assets/javascripts/discourse/helpers/format-date.js.es6
@@ -25,5 +25,3 @@ registerUnbound('format-date', function(val, params) {
     return new Handlebars.SafeString(autoUpdatingRelativeAge(date, {format: format, title: title, leaveAgo: leaveAgo}));
   }
 });
-
-
diff --git a/app/assets/javascripts/discourse/helpers/format-username.js.es6 b/app/assets/javascripts/discourse/helpers/format-username.js.es6
new file mode 100644
index 0000000000..dcb8be1840
--- /dev/null
+++ b/app/assets/javascripts/discourse/helpers/format-username.js.es6
@@ -0,0 +1,4 @@
+import { registerUnbound } from 'discourse-common/lib/helpers';
+import { formatUsername } from 'discourse/lib/utilities';
+
+export default registerUnbound('format-username', formatUsername);
diff --git a/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6 b/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
index f673bb8cda..d5439c7323 100644
--- a/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
+++ b/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
@@ -1,6 +1,7 @@
 import { htmlHelper } from 'discourse-common/lib/helpers';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 
 export default htmlHelper(function(str) {
   if (Ember.isEmpty(str)) { return ""; }
-  return (str.indexOf('fa-') === 0) ? `<i class='fa ${str}'></i>` : `<img src='${str}'>`;
+  return (str.indexOf('fa-') === 0) ? iconHTML(str.replace('fa-', '')) : `<img src='${str}'>`;
 });
diff --git a/test/javascripts/helpers/parse-html.js.es6 b/app/assets/javascripts/discourse/helpers/parse-html.js.es6
similarity index 100%
rename from test/javascripts/helpers/parse-html.js.es6
rename to app/assets/javascripts/discourse/helpers/parse-html.js.es6
diff --git a/app/assets/javascripts/discourse/helpers/raw.js.es6 b/app/assets/javascripts/discourse/helpers/raw.js.es6
index 7f3d8b247b..98725287f6 100644
--- a/app/assets/javascripts/discourse/helpers/raw.js.es6
+++ b/app/assets/javascripts/discourse/helpers/raw.js.es6
@@ -7,24 +7,28 @@ function renderRaw(ctx, container, template, templateName, params) {
   params = jQuery.extend({}, params);
   params.parent = params.parent || ctx;
 
-  if (!params.view) {
-    if (!_injections) {
-      _injections = {
-        siteSettings: container.lookup('site-settings:main'),
-        currentUser: container.lookup('currentUser:main'),
-        site: container.lookup('site:main'),
-        session: container.lookup('session:main'),
-        topicTrackingState: container.lookup('topic-tracking-state:main')
-      };
-    }
+  if (!_injections) {
+    _injections = {
+      siteSettings: container.lookup('site-settings:main'),
+      currentUser: container.lookup('current-user:main'),
+      site: container.lookup('site:main'),
+      session: container.lookup('session:main'),
+      topicTrackingState: container.lookup('topic-tracking-state:main')
+    };
+  }
 
+  if (!params.view) {
     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);
       }
     }
+
+    if (!params.view) {
+      params = jQuery.extend({}, params, _injections);
+    }
   }
 
   return new Handlebars.SafeString(template(params));
diff --git a/app/assets/javascripts/discourse/helpers/route-action.js.es6 b/app/assets/javascripts/discourse/helpers/route-action.js.es6
new file mode 100644
index 0000000000..983d62b05d
--- /dev/null
+++ b/app/assets/javascripts/discourse/helpers/route-action.js.es6
@@ -0,0 +1,59 @@
+const {
+  A: emberArray,
+  Helper,
+  assert,
+  computed,
+  get,
+  getOwner,
+  run,
+  runInDebug
+} = Ember;
+
+function getCurrentHandlerInfos(router) {
+  let routerLib = router._routerMicrolib || router.router;
+
+  return routerLib.currentHandlerInfos;
+}
+
+function getRoutes(router) {
+  return emberArray(getCurrentHandlerInfos(router))
+    .mapBy('handler')
+    .reverse();
+}
+
+function getRouteWithAction(router, actionName) {
+  let action;
+  let handler = emberArray(getRoutes(router)).find((route) => {
+    let actions = route.actions || route._actions;
+    action = actions[actionName];
+
+    return typeof(action) === 'function';
+  });
+
+  return { action, handler };
+}
+
+export default Helper.extend({
+  router: computed(function() {
+    return getOwner(this).lookup('router:main');
+  }).readOnly(),
+
+  compute([actionName, ...params]) {
+    let router = get(this, 'router');
+    assert('[ember-route-action-helper] Unable to lookup router', router);
+
+    runInDebug(() => {
+      let { handler } = getRouteWithAction(router, actionName);
+      assert(`[ember-route-action-helper] Unable to find action ${actionName}`, handler);
+    });
+
+    let routeAction = function(...invocationArgs) {
+      let { action, handler } = getRouteWithAction(router, actionName);
+      let args = params.concat(invocationArgs);
+      return run.join(handler, action, ...args);
+    };
+
+    return routeAction;
+  }
+});
+
diff --git a/app/assets/javascripts/discourse/helpers/topic-link.js.es6 b/app/assets/javascripts/discourse/helpers/topic-link.js.es6
index b71649495b..ac85252c61 100644
--- a/app/assets/javascripts/discourse/helpers/topic-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/topic-link.js.es6
@@ -7,10 +7,6 @@ registerUnbound('topic-link', (topic, args) => {
     topic.get('lastUnreadUrl');
 
   const classes = ['title'];
-  if (topic.get('last_read_post_number') === topic.get('highest_post_number')) {
-    classes.push('visited');
-  }
-
   if (args.class) {
     args.class.split(" ").forEach(c => classes.push(c));
   }
diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
index 75e60da098..71e6e87249 100644
--- a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
@@ -1,5 +1,5 @@
 import { registerUnbound } from 'discourse-common/lib/helpers';
-import { avatarImg } from 'discourse/lib/utilities';
+import { avatarImg, formatUsername } from 'discourse/lib/utilities';
 
 function renderAvatar(user, options) {
   options = options || {};
@@ -11,6 +11,8 @@ function renderAvatar(user, options) {
 
     if (!username || !avatarTemplate) { return ''; }
 
+    let formattedUsername = formatUsername(username);
+
     let title = options.title;
     if (!title && !options.ignoreTitle) {
       // first try to get a title
@@ -22,7 +24,7 @@ function renderAvatar(user, options) {
         // if a description has been provided
         if (description && description.length > 0) {
           // preprend the username before the description
-          title = username + " - " + description;
+          title = formattedUsername + " - " + description;
         }
       }
     }
@@ -30,7 +32,7 @@ function renderAvatar(user, options) {
     return avatarImg({
       size: options.imageSize,
       extraClasses: Em.get(user, 'extras') || options.extraClasses,
-      title: title || username,
+      title: title || formattedUsername,
       avatarTemplate: avatarTemplate
     });
   } else {
diff --git a/app/assets/javascripts/discourse/helpers/user-status.js.es6 b/app/assets/javascripts/discourse/helpers/user-status.js.es6
index fb1a05efee..c1b64fe833 100644
--- a/app/assets/javascripts/discourse/helpers/user-status.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-status.js.es6
@@ -1,4 +1,4 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { htmlHelper } from 'discourse-common/lib/helpers';
 import { escapeExpression } from 'discourse/lib/utilities';
 
diff --git a/app/assets/javascripts/discourse/initializers/android-app-banner-service-worker.js.es6 b/app/assets/javascripts/discourse/initializers/android-app-banner-service-worker.js.es6
deleted file mode 100644
index 3d8c2f7fd2..0000000000
--- a/app/assets/javascripts/discourse/initializers/android-app-banner-service-worker.js.es6
+++ /dev/null
@@ -1,16 +0,0 @@
-// Android Chrome App Banner requires at least **one** service worker to be instantiate and https.
-// After Discourse starts to use service workers for other stuff (like mobile notification, offline mode, or ember)
-// we can ditch this.
-
-export default {
-  name: 'android-app-banner-service-worker',
-
-  initialize(container) {
-    const caps = container.lookup('capabilities:main');
-    const isSecure = document.location.protocol === 'https:';
-
-    if (isSecure && caps.isAndroid && 'serviceWorker' in navigator) {
-        navigator.serviceWorker.register(Discourse.BaseUri + '/service-worker.js', {scope: './'});
-    }
-  }
-};
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 4920eca574..943c330a10 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 f15f57fa8a..1ad38a8fb1 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/live-development.js.es6 b/app/assets/javascripts/discourse/initializers/live-development.js.es6
index 79b200107a..c6dba5fdfc 100644
--- a/app/assets/javascripts/discourse/initializers/live-development.js.es6
+++ b/app/assets/javascripts/discourse/initializers/live-development.js.es6
@@ -22,6 +22,7 @@ export default {
 
     // Observe file changes
     messageBus.subscribe("/file-change", function(data) {
+
       if (Handlebars.compile && !Ember.TEMPLATES.empty) {
         // hbs notifications only happen in dev
         Ember.TEMPLATES.empty = Handlebars.compile("<div></div>");
diff --git a/app/assets/javascripts/discourse/initializers/localization.js.es6 b/app/assets/javascripts/discourse/initializers/localization.js.es6
index 5d3ce55f98..2603ddaf4b 100644
--- a/app/assets/javascripts/discourse/initializers/localization.js.es6
+++ b/app/assets/javascripts/discourse/initializers/localization.js.es6
@@ -55,7 +55,9 @@ export default {
         node = node[segs[i]];
       }
 
-      node[segs[segs.length-1]] = v;
+      if (typeof node === "object") {
+        node[segs[segs.length-1]] = v;
+      }
 
     });
   }
diff --git a/app/assets/javascripts/discourse/initializers/page-tracking.js.es6 b/app/assets/javascripts/discourse/initializers/page-tracking.js.es6
index cf978f4300..ec1f3a446d 100644
--- a/app/assets/javascripts/discourse/initializers/page-tracking.js.es6
+++ b/app/assets/javascripts/discourse/initializers/page-tracking.js.es6
@@ -1,9 +1,10 @@
 import { cleanDOM } from 'discourse/lib/clean-dom';
-import { startPageTracking, onPageChange } from 'discourse/lib/page-tracker';
+import { startPageTracking } from 'discourse/lib/page-tracker';
 import { viewTrackingRequired } from 'discourse/lib/ajax';
 
 export default {
   name: "page-tracking",
+  after: 'inject-objects',
 
   initialize(container) {
 
@@ -12,33 +13,34 @@ export default {
     router.on('willTransition', viewTrackingRequired);
     router.on('didTransition', cleanDOM);
 
-    startPageTracking(router);
+    let appEvents = container.lookup('app-events:main');
+    startPageTracking(router, appEvents);
 
     // Out of the box, Discourse tries to track google analytics
     // if it is present
     if (typeof window._gaq !== 'undefined') {
-      onPageChange((url, title) => {
-        window._gaq.push(["_set", "title", title]);
-        window._gaq.push(['_trackPageview', url]);
+      appEvents.on('page:changed', data => {
+        window._gaq.push(["_set", "title", data.title]);
+        window._gaq.push(['_trackPageview', data.url]);
       });
       return;
     }
 
     // Also use Universal Analytics if it is present
     if (typeof window.ga !== 'undefined') {
-      onPageChange((url, title) => {
-        window.ga('send', 'pageview', {page: url, title: title});
+      appEvents.on('page:changed', data => {
+        window.ga('send', 'pageview', {page: data.url, title: data.title});
       });
     }
 
     // And Google Tag Manager too
     if (typeof window.dataLayer !== 'undefined') {
-      onPageChange((url, title) => {
+      appEvents.on('page:changed', data => {
         window.dataLayer.push({
           'event': 'virtualPageView',
           'page': {
-            'title': title,
-            'url': url
+            'title': data.title,
+            'url': data.url
           }
         });
       });
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 1f073e95cf..88c49402a8 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/initializers/register-service-worker.js.es6 b/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
new file mode 100644
index 0000000000..7c16106dda
--- /dev/null
+++ b/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
@@ -0,0 +1,12 @@
+export default {
+  name: 'register-service-worker',
+
+  initialize() {
+    const isSecure = (document.location.protocol === 'https:') ||
+      (location.hostname === "localhost");
+
+    if (isSecure && ('serviceWorker' in navigator)) {
+      navigator.serviceWorker.register(`${Discourse.BaseUri}/service-worker.js`);
+    }
+  }
+};
diff --git a/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6 b/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6
index 33a2e389a4..53764e0882 100644
--- a/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6
+++ b/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6
@@ -6,7 +6,7 @@ export default {
   initialize: function() {
     Sharing.addSource({
       id: 'twitter',
-      faIcon: 'fa-twitter-square',
+      icon: 'twitter-square',
       generateUrl: function(link, title) {
         return "http://twitter.com/intent/tweet?url=" + encodeURIComponent(link) + "&text=" + encodeURIComponent(title);
       },
@@ -17,7 +17,7 @@ export default {
 
     Sharing.addSource({
       id: 'facebook',
-      faIcon: 'fa-facebook-square',
+      icon: 'facebook-square',
       title: I18n.t('share.facebook'),
       generateUrl: function(link, title) {
         return "http://www.facebook.com/sharer.php?u=" + encodeURIComponent(link) + '&t=' + encodeURIComponent(title);
@@ -27,7 +27,7 @@ export default {
 
     Sharing.addSource({
       id: 'google+',
-      faIcon: 'fa-google-plus-square',
+      icon: 'google-plus-square',
       title: I18n.t('share.google+'),
       generateUrl: function(link) {
         return "https://plus.google.com/share?url=" + encodeURIComponent(link);
@@ -38,7 +38,7 @@ export default {
 
     Sharing.addSource({
       id: 'email',
-      faIcon: 'fa-envelope-square',
+      icon: 'envelope-square',
       title: I18n.t('share.email'),
       generateUrl: function(link, title) {
         return "mailto:?to=&subject=" + encodeURIComponent('[' + Discourse.SiteSettings.title + '] ' + title) + "&body=" + encodeURIComponent(link);
diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
index 8efabdb327..a477463d95 100644
--- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
@@ -13,6 +13,7 @@ export default {
     const user = container.lookup('current-user:main');
     const keyValueStore = container.lookup('key-value-store:main');
     const bus = container.lookup('message-bus:main');
+    const appEvents = container.lookup('app-events:main');
 
     // clear old cached notifications, we used to store in local storage
     // TODO 2017 delete this line
@@ -32,8 +33,7 @@ export default {
       }
 
       bus.subscribe(`/notification/${user.get('id')}`, data => {
-        const store = container.lookup('store:main');
-        const appEvents = container.lookup('app-events:main');
+        const store = container.lookup('service:store');
 
         const oldUnread = user.get('unread_notifications');
         const oldPM = user.get('unread_private_messages');
@@ -95,10 +95,14 @@ export default {
 
       bus.subscribe("/client_settings", data => Ember.set(siteSettings, data.name, data.value));
 
+      bus.subscribe("/refresh_client", data => {
+        Discourse.set("assetVersion", data);
+      });
+
       if (!Ember.testing) {
         if (!site.mobileView) {
           bus.subscribe(alertChannel(user), data => onNotification(data, user));
-          initDesktopNotifications(bus);
+          initDesktopNotifications(bus, appEvents);
         }
       }
     }
diff --git a/app/assets/javascripts/discourse/lib/after-transition.js.es6 b/app/assets/javascripts/discourse/lib/after-transition.js.es6
index 11fe20b5e4..afa1700e6d 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 4b49fdc014..15cb6d5d93 100644
--- a/app/assets/javascripts/discourse/lib/autocomplete.js.es6
+++ b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
@@ -3,6 +3,7 @@
 
   @module $.fn.autocomplete
 **/
+import { iconHTML } from 'discourse-common/lib/icon-library';
 export const CANCELLED_STATUS = "__CANCELLED";
 import { setCaretPosition, caretPosition } from 'discourse/lib/utilities';
 
@@ -105,7 +106,7 @@ export default function(options) {
     transformed = _.isArray(transformedItem) ? transformedItem : [transformedItem || item];
 
     const divs = transformed.map(itm => {
-      let d = $(`<div class='item'><span>${itm}<a class='remove' href><i class='fa fa-times'></i></a></span></div>`);
+      let d = $(`<div class='item'><span>${itm}<a class='remove' href>${iconHTML('times')}</a></span></div>`);
       const $parent = me.parent();
       const prev = $parent.find('.item:last');
 
@@ -164,7 +165,7 @@ export default function(options) {
   };
 
   if (isInput) {
-    const width = this.width();
+    const width = Math.max(this.width(), 200);
 
     if (options.updateData) {
       wrap = this.parent();
@@ -358,10 +359,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 +383,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 dbdb858093..efb85155c3 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/category-tag-search.js.es6 b/app/assets/javascripts/discourse/lib/category-tag-search.js.es6
index d7895ff47a..359e766041 100644
--- a/app/assets/javascripts/discourse/lib/category-tag-search.js.es6
+++ b/app/assets/javascripts/discourse/lib/category-tag-search.js.es6
@@ -1,5 +1,7 @@
 import { CANCELLED_STATUS } from 'discourse/lib/autocomplete';
 import Category from 'discourse/models/category';
+import { TAG_HASHTAG_POSTFIX } from 'discourse/lib/tag-hashtags';
+import { SEPARATOR } from 'discourse/lib/category-hashtags';
 
 var cache = {};
 var cacheTime;
@@ -27,7 +29,18 @@ function searchTags(term, categories, limit) {
       var returnVal = CANCELLED_STATUS;
 
       oldSearch.then((r) => {
-        var tags = r.results.map((tag) => { return { text: tag.text, count: tag.count }; });
+        const categoryNames = cats.map(c => c.model.get('name'));
+
+        const tags = r.results.map((tag) => {
+          const tagName = tag.text;
+
+          return {
+            name: tagName,
+            text: (categoryNames.includes(tagName) ? `${tagName}${TAG_HASHTAG_POSTFIX}` : tagName),
+            count: tag.count,
+          };
+        });
+
         returnVal = cats.concat(tags);
       }).always(() => {
         oldSearch = null;
@@ -55,7 +68,10 @@ export function search(term, siteSettings) {
   const limit = 5;
   var categories = Category.search(term, { limit });
   var numOfCategories = categories.length;
-  categories = categories.map((category) => { return { model: category }; });
+
+  categories = categories.map((category) => {
+    return { model: category, text: Category.slugFor(category, SEPARATOR) };
+  });
 
   if (numOfCategories !== limit && siteSettings.tagging_enabled) {
     return searchTags(term, categories, limit - numOfCategories);
diff --git a/app/assets/javascripts/discourse/lib/click-track.js.es6 b/app/assets/javascripts/discourse/lib/click-track.js.es6
index ff9cb9a862..6247973d45 100644
--- a/app/assets/javascripts/discourse/lib/click-track.js.es6
+++ b/app/assets/javascripts/discourse/lib/click-track.js.es6
@@ -13,48 +13,57 @@ export default {
     // cancel click if triggered as part of selection.
     if (selectedText() !== "") { return false; }
 
-    var $link = $(e.currentTarget);
+    const $link = $(e.currentTarget);
 
-    // don't track lightboxes, group mentions or links with disabled tracking
-    if ($link.hasClass('lightbox') || $link.hasClass('mention-group') ||
-        $link.hasClass('no-track-link') || $link.hasClass('hashtag')) {
+    // don't track
+    //   - lightboxes
+    //   - group mentions
+    //   - links with disabled tracking
+    //   - category links
+    //   - quote back button
+    if ($link.is('.lightbox, .mention-group, .no-track-link, .hashtag, .back')) {
       return true;
     }
 
     // don't track links in quotes or in elided part
-    if ($link.parents('aside.quote,.elided').length) { return true; }
+    let tracking = $link.parents('aside.quote,.elided').length === 0;
 
-    var href = $link.attr('href') || $link.data('href'),
-        $article = $link.closest('article,.excerpt,#revisions'),
-        postId = $article.data('post-id'),
-        topicId = $('#topic').data('topic-id') || $article.data('topic-id'),
-        userId = $link.data('user-id');
+    let href = $link.attr('href') || $link.data('href');
 
     if (!href || href.trim().length === 0) { return false; }
-    if (href.indexOf("mailto:") === 0) { return true; }
+    if (href.indexOf('mailto:') === 0) { return true; }
 
-    if (!userId) userId = $article.data('user-id');
+    const $article = $link.closest('article:not(.onebox-body), .excerpt, #revisions');
+    const postId = $article.data('post-id');
+    const topicId = $('#topic').data('topic-id') || $article.data('topic-id');
+    const userId = $link.data('user-id') || $article.data('user-id');
+    const ownLink = userId && (userId === Discourse.User.currentProp('id'));
 
-    var ownLink = userId && (userId === Discourse.User.currentProp('id')),
-        trackingUrl = Discourse.getURL("/clicks/track?url=" + encodeURIComponent(href));
-    if (postId && (!$link.data('ignore-post-id'))) {
-      trackingUrl += "&post_id=" + encodeURI(postId);
-    }
-    if (topicId) {
-      trackingUrl += "&topic_id=" + encodeURI(topicId);
-    }
+    let destUrl = href;
 
-    // Update badge clicks unless it's our own
-    if (!ownLink) {
-      const $badge = $('span.badge', $link);
-      if ($badge.length === 1) {
-        // don't update counts in category badge nor in oneboxes (except when we force it)
-        if (isValidLink($link)) {
-          const html = $badge.html();
-          const key = `${new Date().toLocaleDateString()}-${postId}-${href}`;
-          if (/^\d+$/.test(html) && !sessionStorage.getItem(key)) {
-            sessionStorage.setItem(key, true);
-            $badge.html(parseInt(html, 10) + 1);
+    if (tracking) {
+
+      destUrl = Discourse.getURL('/clicks/track?url=' + encodeURIComponent(href));
+
+      if (postId && !$link.data('ignore-post-id')) {
+        destUrl += "&post_id=" + encodeURI(postId);
+      }
+      if (topicId) {
+        destUrl += "&topic_id=" + encodeURI(topicId);
+      }
+
+      // Update badge clicks unless it's our own
+      if (!ownLink) {
+        const $badge = $('span.badge', $link);
+        if ($badge.length === 1) {
+          // don't update counts in category badge nor in oneboxes (except when we force it)
+          if (isValidLink($link)) {
+            const html = $badge.html();
+            const key = `${new Date().toLocaleDateString()}-${postId}-${href}`;
+            if (/^\d+$/.test(html) && !sessionStorage.getItem(key)) {
+              sessionStorage.setItem(key, true);
+              $badge.html(parseInt(html, 10) + 1);
+            }
           }
         }
       }
@@ -62,13 +71,12 @@ export default {
 
     // If they right clicked, change the destination href
     if (e.which === 3) {
-      var destination = Discourse.SiteSettings.track_external_right_clicks ? trackingUrl : href;
-      $link.attr('href', destination);
+      $link.attr('href', Discourse.SiteSettings.track_external_right_clicks ? destUrl : href);
       return true;
     }
 
     // if they want to open in a new tab, do an AJAX request
-    if (wantsNewWindow(e)) {
+    if (tracking && wantsNewWindow(e)) {
       ajax("/clicks/track", {
         data: {
           url: href,
@@ -83,9 +91,6 @@ export default {
 
     e.preventDefault();
 
-    // We don't track clicks on quote back buttons
-    if ($link.hasClass('back') || $link.hasClass('quote-other-topic')) { return true; }
-
     // Remove the href, put it as a data attribute
     if (!$link.data('href')) {
       $link.addClass('no-href');
@@ -109,7 +114,7 @@ export default {
     }
 
     // If we're on the same site, use the router and track via AJAX
-    if (DiscourseURL.isInternal(href) && !$link.hasClass('attachment')) {
+    if (tracking && DiscourseURL.isInternal(href) && !$link.hasClass('attachment')) {
       ajax("/clicks/track", {
         data: {
           url: href,
@@ -125,10 +130,9 @@ export default {
 
     // Otherwise, use a custom URL with a redirect
     if (Discourse.User.currentProp('external_links_in_new_tab')) {
-      var win = window.open(trackingUrl, '_blank');
-      win.focus();
+      window.open(destUrl, '_blank').focus();
     } else {
-      DiscourseURL.redirectTo(trackingUrl);
+      DiscourseURL.redirectTo(destUrl);
     }
 
     return false;
diff --git a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
index 8d5c010def..12c481e4af 100644
--- a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
+++ b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
@@ -1,6 +1,6 @@
 import DiscourseURL from 'discourse/lib/url';
 import KeyValueStore from 'discourse/lib/key-value-store';
-import { onPageChange } from 'discourse/lib/page-tracker';
+import { formatUsername } from 'discourse/lib/utilities';
 
 let primaryTab = false;
 let liveEnabled = false;
@@ -15,7 +15,7 @@ const context = "discourse_desktop_notifications_";
 const keyValueStore = new KeyValueStore(context);
 
 // Called from an initializer
-function init(messageBus) {
+function init(messageBus, appEvents) {
   liveEnabled = false;
   mbClientId = messageBus.clientId;
 
@@ -49,14 +49,14 @@ function init(messageBus) {
   liveEnabled = true;
   try {
     // Preliminary checks passed, continue with setup
-    setupNotifications();
+    setupNotifications(appEvents);
   } catch (e) {
     Em.Logger.error(e);
   }
 }
 
 // This function is only called if permission was granted
-function setupNotifications() {
+function setupNotifications(appEvents) {
 
   window.addEventListener("storage", function(e) {
     // note: This event only fires when other tabs setItem()
@@ -85,7 +85,7 @@ function setupNotifications() {
     document.addEventListener("scroll", resetIdle);
   }
 
-  onPageChange(resetIdle);
+  appEvents.on('page:changed', resetIdle);
 }
 
 function resetIdle() {
@@ -105,7 +105,7 @@ function onNotification(data) {
   const notificationTitle = I18n.t(i18nKey(data.notification_type), {
      site_title: Discourse.SiteSettings.title,
      topic: data.topic_title,
-     username: data.username
+     username: formatUsername(data.username)
   });
 
   const notificationBody = data.excerpt;
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 0000000000..924e8fd2fb
--- /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 7b8d9bbedf..0000000000
--- 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 3666df1b58..0000000000
--- 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/formatter.js.es6 b/app/assets/javascripts/discourse/lib/formatter.js.es6
index b478ddfa43..dcce95ca99 100644
--- a/app/assets/javascripts/discourse/lib/formatter.js.es6
+++ b/app/assets/javascripts/discourse/lib/formatter.js.es6
@@ -129,6 +129,58 @@ function wrapAgo(dateStr) {
   return I18n.t("dates.wrap_ago", { date: dateStr });
 }
 
+export function durationTiny(distance, ageOpts) {
+  if (typeof(distance) !== 'number') { return '&mdash;'; }
+
+  const dividedDistance = Math.round(distance / 60.0);
+  const distanceInMinutes = (dividedDistance < 1) ? 1 : dividedDistance;
+
+  const t = function(key, opts) {
+    const result = I18n.t("dates.tiny." + key, opts);
+    return (ageOpts && ageOpts.addAgo) ? wrapAgo(result) : result;
+  };
+
+  let formatted;
+
+  switch(true) {
+    case(distance <= 59):
+      formatted = t("less_than_x_minutes", {count: 1});
+      break;
+    case(distanceInMinutes >= 0 && distanceInMinutes <= 44):
+      formatted = t("x_minutes", {count: distanceInMinutes});
+      break;
+    case(distanceInMinutes >= 45 && distanceInMinutes <= 89):
+      formatted = t("about_x_hours", {count: 1});
+      break;
+    case(distanceInMinutes >= 90 && distanceInMinutes <= 1409):
+      formatted = t("about_x_hours", {count: Math.round(distanceInMinutes / 60.0)});
+      break;
+    case(distanceInMinutes >= 1410 && distanceInMinutes <= 2519):
+      formatted = t("x_days", {count: 1});
+      break;
+    case(distanceInMinutes >= 2520 && distanceInMinutes <= 129599):
+      formatted = t("x_days", {count: Math.round(distanceInMinutes / 1440.0)});
+      break;
+    case(distanceInMinutes >= 129600 && distanceInMinutes <= 525599):
+      formatted = t("x_months", {count: Math.round(distanceInMinutes / 43200.0)});
+      break;
+    default:
+      const numYears = distanceInMinutes / 525600.0;
+      const remainder = numYears % 1;
+      if (remainder < 0.25) {
+        formatted = t("about_x_years", {count: parseInt(numYears)});
+      } else if (remainder < 0.75) {
+        formatted = t("over_x_years", {count: parseInt(numYears)});
+      } else {
+        formatted = t("almost_x_years", {count: parseInt(numYears) + 1});
+      }
+
+      break;
+  }
+
+  return formatted;
+}
+
 function relativeAgeTiny(date, ageOpts) {
   const format = "tiny";
   const distance = Math.round((new Date() - date) / 1000);
@@ -258,8 +310,10 @@ export function number(val) {
   if (val > 999999) {
     formattedNumber = I18n.toNumber(val / 1000000, {precision: 1});
     return I18n.t("number.short.millions", {number: formattedNumber});
-  }
-  if (val > 999) {
+  } else if (val > 99999) {
+    formattedNumber = I18n.toNumber(val / 1000, {precision: 0});
+    return I18n.t("number.short.thousands", {number: formattedNumber});
+  } else if (val > 999) {
     formattedNumber = I18n.toNumber(val / 1000, {precision: 1});
     return I18n.t("number.short.thousands", {number: formattedNumber});
   }
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 0000000000..6d4b6020c7
--- /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/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index 816767473f..c3a7ecd27c 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -6,6 +6,7 @@ const bindings = {
   '!':               {postAction: 'showFlags'},
   '#':               {handler: 'goToPost', anonymous: true},
   '/':               {handler: 'toggleSearch', anonymous: true},
+  'ctrl+alt+f':      {handler: 'toggleSearch', anonymous: true},
   '=':               {handler: 'toggleHamburgerMenu', anonymous: true},
   '?':               {handler: 'showHelpModal', anonymous: true},
   '.':               {click: '.alert.alert-info.clickable', anonymous: true}, // show incoming/updated topics
@@ -168,7 +169,9 @@ export default {
   },
 
   createTopic() {
-    this.container.lookup('controller:composer').open({action: Composer.CREATE_TOPIC, draftKey: Composer.CREATE_TOPIC});
+    if (this.currentUser && this.currentUser.can_create_topic) {
+      this.container.lookup('controller:composer').open({action: Composer.CREATE_TOPIC, draftKey: Composer.CREATE_TOPIC});
+    }
   },
 
   pinUnpinTopic() {
diff --git a/app/assets/javascripts/discourse/lib/link-mentions.js.es6 b/app/assets/javascripts/discourse/lib/link-mentions.js.es6
index d8cd970299..8aa802f80f 100644
--- a/app/assets/javascripts/discourse/lib/link-mentions.js.es6
+++ b/app/assets/javascripts/discourse/lib/link-mentions.js.es6
@@ -1,5 +1,8 @@
 import { ajax } from 'discourse/lib/ajax';
 import { userPath } from 'discourse/lib/url';
+import { formatUsername } from 'discourse/lib/utilities';
+
+let maxGroupMention;
 
 function replaceSpan($e, username, opts) {
   let extra = "";
@@ -7,7 +10,7 @@ function replaceSpan($e, username, opts) {
 
   if (opts && opts.group) {
     if (opts.mentionable) {
-      extra = `data-name='${username}' data-mentionable-user-count='${opts.mentionable.user_count}'`;
+      extra = `data-name='${username}' data-mentionable-user-count='${opts.mentionable.user_count}' data-max-mentions='${maxGroupMention}'`;
       extraClass = "notify";
     }
     $e.replaceWith(`<a href='${Discourse.getURL("/groups/") + username}' class='mention-group ${extraClass}' ${extra}>@${username}</a>`);
@@ -16,7 +19,7 @@ function replaceSpan($e, username, opts) {
       extra = `data-name='${username}'`;
       extraClass = "cannot-see";
     }
-    $e.replaceWith(`<a href='${userPath(username.toLowerCase())}' class='mention ${extraClass}' ${extra}>@${username}</a>`);
+    $e.replaceWith(`<a href='${userPath(username.toLowerCase())}' class='mention ${extraClass}' ${extra}>@${formatUsername(username)}</a>`);
   }
 }
 
@@ -60,6 +63,7 @@ export function fetchUnseenMentions(usernames, topic_id) {
     r.valid_groups.forEach(vg => foundGroups[vg] = true);
     r.mentionable_groups.forEach(mg => mentionableGroups[mg.name] = mg);
     r.cannot_see.forEach(cs => cannotSee[cs] = true);
+    maxGroupMention = r.max_users_notified_per_group_mention;
     usernames.forEach(u => checked[u] = true);
     return r;
   });
diff --git a/app/assets/javascripts/discourse/lib/load-script.js.es6 b/app/assets/javascripts/discourse/lib/load-script.js.es6
index 8baf4b905d..d40b17c663 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/notification-levels.js.es6 b/app/assets/javascripts/discourse/lib/notification-levels.js.es6
index 6d744790e2..adeae1bcaa 100644
--- a/app/assets/javascripts/discourse/lib/notification-levels.js.es6
+++ b/app/assets/javascripts/discourse/lib/notification-levels.js.es6
@@ -9,15 +9,15 @@ export const NotificationLevels = { WATCHING_FIRST_POST, WATCHING, TRACKING, REG
 export function buttonDetails(level) {
   switch(level) {
     case WATCHING_FIRST_POST:
-      return { id: WATCHING_FIRST_POST, key: 'watching_first_post', icon: 'dot-circle-o' };
+      return { id: WATCHING_FIRST_POST, key: 'watching_first_post', icon: 'd-watching-first' };
     case WATCHING:
-      return { id: WATCHING, key: 'watching', icon: 'exclamation-circle' };
+      return { id: WATCHING, key: 'watching', icon: 'd-watching' };
     case TRACKING:
-      return { id: TRACKING, key: 'tracking', icon: 'circle' };
+      return { id: TRACKING, key: 'tracking', icon: 'd-tracking' };
     case MUTED:
-      return { id: MUTED, key: 'muted', icon: 'times-circle' };
+      return { id: MUTED, key: 'muted', icon: 'd-muted' };
     default:
-      return { id: REGULAR, key: 'regular', icon: 'circle-o' };
+      return { id: REGULAR, key: 'regular', icon: 'd-regular' };
   }
 }
 
diff --git a/app/assets/javascripts/discourse/lib/optional-service.js.es6 b/app/assets/javascripts/discourse/lib/optional-service.js.es6
new file mode 100644
index 0000000000..e4053ccc7e
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/optional-service.js.es6
@@ -0,0 +1,7 @@
+const { computed, getOwner, String: { dasherize } } = Ember;
+
+export default function(name) {
+  return computed(function(defaultName) {
+    return getOwner(this).lookup(`service:${name || dasherize(defaultName)}`);
+  });
+};
diff --git a/app/assets/javascripts/discourse/lib/page-tracker.js.es6 b/app/assets/javascripts/discourse/lib/page-tracker.js.es6
index ddef479268..e6bd2c79e1 100644
--- a/app/assets/javascripts/discourse/lib/page-tracker.js.es6
+++ b/app/assets/javascripts/discourse/lib/page-tracker.js.es6
@@ -1,8 +1,3 @@
-import deprecated from 'discourse-common/lib/deprecated';
-
-const PageTracker = Ember.Object.extend(Ember.Evented);
-let _pageTracker = PageTracker.create();
-
 let _started = false;
 
 const cache = {};
@@ -16,7 +11,7 @@ export function getTransient(key) {
   return cache[key];
 }
 
-export function startPageTracking(router) {
+export function startPageTracking(router, appEvents) {
   if (_started) { return; }
 
   router.on('didTransition', function() {
@@ -25,7 +20,14 @@ export function startPageTracking(router) {
 
     // Refreshing the title is debounced, so we need to trigger this in the
     // next runloop to have the correct title.
-    Em.run.next(() => _pageTracker.trigger('change', url, Discourse.get('_docTitle')));
+    Ember.run.next(() => {
+      let title = Discourse.get('_docTitle');
+      appEvents.trigger('page:changed', {
+        url,
+        title,
+        currentRouteName: router.get('currentRouteName')
+      });
+    });
 
     transitionCount++;
     _.each(cache, (v,k) => {
@@ -36,18 +38,3 @@ export function startPageTracking(router) {
   });
   _started = true;
 }
-
-export function onPageChange(fn) {
-  _pageTracker.on('change', fn);
-}
-
-// backwards compatibility
-const BackwardsCompat = {
-  current() {
-    deprecated(`Using PageTracker.current() is deprecated. Your plugin should use the PluginAPI`);
-    return _pageTracker;
-  }
-};
-
-Discourse.PageTracker = BackwardsCompat;
-export default BackwardsCompat;
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index 01b1c9216d..68cc7eb8e6 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -1,4 +1,4 @@
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { addDecorator } from 'discourse/widgets/post-cooked';
 import ComposerEditor from 'discourse/components/composer-editor';
 import { addButton } from 'discourse/widgets/post-menu';
@@ -6,7 +6,6 @@ import { includeAttributes } from 'discourse/lib/transform-post';
 import { addToolbarCallback } from 'discourse/components/d-editor';
 import { addWidgetCleanCallback } from 'discourse/components/mount-widget';
 import { createWidget, reopenWidget, decorateWidget, changeSetting } from 'discourse/widgets/widget';
-import { onPageChange } from 'discourse/lib/page-tracker';
 import { preventCloak } from 'discourse/widgets/post-stream';
 import { h } from 'virtual-dom';
 import { addFlagProperty } from 'discourse/components/site-header';
@@ -19,10 +18,13 @@ import { addUserMenuGlyph } from 'discourse/widgets/user-menu';
 import { addPostClassesCallback } from 'discourse/widgets/post';
 import { addPostTransformCallback } from 'discourse/widgets/post-stream';
 import { attachAdditionalPanel } from 'discourse/widgets/header';
-
+import { registerIconRenderer, replaceIcon } from 'discourse-common/lib/icon-library';
+import { addNavItem } from 'discourse/models/nav-item';
+import { replaceFormatter } from 'discourse/lib/utilities';
+import { modifySelectKit } from "select-kit/mixins/plugin-api";
 
 // 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.13';
 
 class PluginApi {
   constructor(version, container) {
@@ -39,6 +41,76 @@ 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, opts) {
+    opts = opts || {};
+
+    if (this.container.cache[resolverName]) {
+      console.warn(`"${resolverName}" was already cached in the container. Changes won't be applied.`);
+    }
+
+    const klass = this.container.factoryFor(resolverName);
+    if (!klass) {
+      if (!opts.ignoreMissing) {
+        console.warn(`"${resolverName}" was not found by modifyClass`);
+      }
+      return;
+    }
+
+    klass.class.reopen(changes);
+    return klass;
+  }
+
+  /**
+   * If you want to use custom icons in your discourse application,
+   * you can register a renderer that will return an icon in the
+   * format required.
+   *
+   * For example, the follwing resolver will render a smile in the place
+   * of every icon on Discourse.
+   *
+   * api.registerIconRenderer({
+   *   name: 'smile-icons',
+   *
+   *   // for the place in code that render a string
+   *   string() {
+   *     return "<i class='fa fa-smile-o'></i>";
+   *   },
+   *
+   *   // for the places in code that render virtual dom elements
+   *   node() {
+   *     return h('i', { className: 'fa fa-smile-o' });
+   *   }
+   * });
+   **/
+  registerIconRenderer(fn) {
+    registerIconRenderer(fn);
+  }
+
+  /**
+   * Replace all ocurrences of one icon with another without having to
+   * resort to a custom IconRenderer. If you want to do something more
+   * complicated than a simple replacement then create a new icon renderer.
+   *
+   * api.replaceIcon('d-tracking', 'smile-o');
+   *
+   **/
+  replaceIcon(source, destination) {
+    replaceIcon(source, destination);
+  }
+
   /**
    * Used for decorating the `cooked` content of a post after it is rendered using
    * jQuery.
@@ -61,7 +133,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 +242,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;
   }
 
@@ -278,7 +350,8 @@ class PluginApi {
     ```
   **/
   onPageChange(fn) {
-    onPageChange(fn);
+    let appEvents = this.container.lookup('app-events:main');
+    appEvents.on('page:changed', data => fn(data.url, data.title));
   }
 
   /**
@@ -369,7 +442,7 @@ class PluginApi {
    * will issue a request to `/mice.json`
    **/
   addStorePluralization(thing, plural) {
-    this.container.lookup("store:main").addPluralization(thing, plural);
+    this.container.lookup("service:store").addPluralization(thing, plural);
   }
 
   /**
@@ -478,6 +551,60 @@ class PluginApi {
   addPostTransformCallback(callback) {
     addPostTransformCallback(callback);
   }
+
+  /**
+  *
+  * Adds a new item in the navigation bar.
+  *
+  * Example:
+  *
+  * addNavigationBarItem({
+  *   name: "discourse",
+  *   displayName: "Discourse"
+  *   href: "https://www.discourse.org",
+  * })
+  */
+  addNavigationBarItem(item) {
+    if (!item["name"]) {
+      console.warn("A 'name' is required when adding a Navigation Bar Item.", item);
+    } else {
+      addNavItem(item);
+    }
+  }
+
+
+  /**
+   *
+   * Registers a function that will format a username when displayed. This will not
+   * be applied when the username is used as an `id` or in URL strings.
+   *
+   * Example:
+   *
+   * ```
+   * // display usernames in UPPER CASE
+   * api.formatUsername(username => username.toUpperCase());
+   *
+   * ```
+   *
+   **/
+  formatUsername(fn) {
+    replaceFormatter(fn);
+  }
+
+  /**
+  *
+  * Access SelectKit plugin api
+  *
+  * Example:
+  *
+  * modifySelectKit("topic-footer-mobile-dropdown").appendContent(() => [{
+  *   name: "discourse",
+  *   id: 1
+  * }])
+  */
+  modifySelectKit(pluginApiKey) {
+    return modifySelectKit(pluginApiKey);
+  }
 }
 
 let _pluginv01;
@@ -504,7 +631,7 @@ function cmpVersions (a, b) {
 
 function getPluginApi(version) {
   version = version.toString();
-  if (cmpVersions(version,PLUGIN_API_VERSION) <= 0) {
+  if (cmpVersions(version, PLUGIN_API_VERSION) <= 0) {
     if (!_pluginv01) {
       _pluginv01 = new PluginApi(version, Discourse.__container__);
     }
diff --git a/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6 b/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6
index d398031d81..3b1179c48b 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 a57f46c9eb..fcad355343 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/render-topic-featured-link.js.es6 b/app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6
index 3b747284fd..86b30b60bf 100644
--- a/app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6
+++ b/app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6
@@ -1,4 +1,3 @@
-import { extractDomainFromUrl } from 'discourse/lib/utilities';
 import { h } from 'virtual-dom';
 
 const _decorators = [];
@@ -7,24 +6,23 @@ export function addFeaturedLinkMetaDecorator(decorator) {
   _decorators.push(decorator);
 }
 
-function extractLinkMeta(topic) {
-  const href = topic.featured_link,
-        target = Discourse.User.currentProp('external_links_in_new_tab') ? '_blank' : '';
+export function extractLinkMeta(topic) {
+  const href = topic.get('featured_link');
+  const target = Discourse.User.currentProp('external_links_in_new_tab') ? '_blank' : '';
 
   if (!href) { return; }
 
-  let domain = extractDomainFromUrl(href);
-  if (!domain) { return; }
+  const meta = {
+    target: target,
+    href,
+    domain: topic.get('featured_link_root_domain'),
+    rel: 'nofollow'
+  };
 
-  // www appears frequently, so we truncate it
-  if (domain && domain.substr(0, 4) === 'www.') {
-    domain = domain.substring(4);
-  }
-
-  const meta = { target, href, domain, rel: 'nofollow' };
   if (_decorators.length) {
     _decorators.forEach(cb => cb(meta));
   }
+
   return meta;
 }
 
@@ -45,4 +43,3 @@ export function topicFeaturedLinkNode(topic) {
     }, meta.domain);
   }
 }
-
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index 745f7a84de..9e3a72c6cf 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -1,22 +1,61 @@
-export function isAppleDevice() {
-  // IE has no DOMNodeInserted so can not get this hack despite saying it is like iPhone
-  // This will apply hack on all iDevices
-  return navigator.userAgent.match(/(iPad|iPhone|iPod)/g) &&
-         navigator.userAgent.match(/Safari/g) &&
-         !navigator.userAgent.match(/Trident/g);
-}
+import { isAppleDevice } from 'discourse/lib/utilities';
 
-
-// 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
-function calcHeight(composingTopic) {
-  const winHeight = window.innerHeight;
-  const ratio = composingTopic ? 0.45 : 0.45;
-  const min = composingTopic ? 300 : 300;
-  return Math.max(parseInt(winHeight*ratio), min);
+function calcHeight() {
+
+  // estimate 270 px for keyboard
+  let withoutKeyboard = window.innerHeight - 270;
+  const min = 270;
+
+  // iPhone shrinks header and removes footer controls ( back / forward nav )
+  // at 39px we are at the largest viewport
+  const portrait = window.innerHeight > window.innerWidth;
+  const smallViewport = ((portrait ? window.screen.height : window.screen.width) - window.innerHeight) > 40;
+
+  if (portrait) {
+
+    // iPhone SE, it is super small so just
+    // have a bit of crop
+    if (window.screen.height === 568) {
+      withoutKeyboard = 270;
+    }
+
+    // iPhone 6/7/8
+    if (window.screen.height === 667) {
+      withoutKeyboard = smallViewport ? 295 : 325;
+    }
+
+    // iPhone 6/7/8 plus
+    if (window.screen.height === 736) {
+      withoutKeyboard = smallViewport ? 353 : 383;
+    }
+
+    // iPhone X
+    if (window.screen.height === 812) {
+      withoutKeyboard = smallViewport ? 340 : 370;
+    }
+
+    // iPad can use innerHeight cause it renders nothing in the footer
+    if (window.innerHeight > 920) {
+      withoutKeyboard -= 45;
+    }
+
+  } else {
+
+    // landscape
+    // iPad, we have a bigger keyboard
+    if (window.innerHeight > 665) {
+      withoutKeyboard -= 128;
+    }
+  }
+
+
+  // iPad portrait also has a bigger keyboard
+  return Math.max(withoutKeyboard, min);
 }
 
 let workaroundActive = false;
@@ -33,6 +72,7 @@ function positioningWorkaround($fixedElement) {
   }
 
   const fixedElement = $fixedElement[0];
+  const oldHeight = fixedElement.style.height;
 
   var done = false;
   var originalScrollTop = 0;
@@ -46,7 +86,11 @@ function positioningWorkaround($fixedElement) {
 
       fixedElement.style.position = '';
       fixedElement.style.top = '';
-      fixedElement.style.height = '';
+      fixedElement.style.height = oldHeight;
+
+      setTimeout(()=>{
+        $(fixedElement).removeClass('no-transition');
+      },500);
 
       $(window).scrollTop(originalScrollTop);
 
@@ -63,10 +107,6 @@ function positioningWorkaround($fixedElement) {
       return;
     }
 
-    if (composingTopic) {
-      return false;
-    }
-
     positioningWorkaround.blur(evt);
 
   };
@@ -97,17 +137,22 @@ function positioningWorkaround($fixedElement) {
 
     $(window).scrollTop(0);
 
+    let i = 20;
+    let interval = setInterval(()=>{
+      $(window).scrollTop(0);
+      if (i--===0) {
+        clearInterval(interval);
+      }
+    }, 10);
+
     fixedElement.style.top = '0px';
 
-    composingTopic = $('#reply-control select.category-combobox').length > 0;
+    composingTopic = $('#reply-control .category-chooser').length > 0;
 
     const height = calcHeight(composingTopic);
-
     fixedElement.style.height = height + "px";
 
-    // I used to do this, but it seems like we don't need to with position
-    // fixed
-    // setTimeout(()=>$(window).scrollTop(0),500);
+    $(fixedElement).addClass('no-transition');
 
     evt.preventDefault();
     self.focus();
@@ -123,6 +168,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 30ab32629f..f64b74db94 100644
--- a/app/assets/javascripts/discourse/lib/search.js.es6
+++ b/app/assets/javascripts/discourse/lib/search.js.es6
@@ -1,18 +1,14 @@
 import { ajax } from 'discourse/lib/ajax';
 import { findRawTemplate } from 'discourse/lib/raw-templates';
-import { TAG_HASHTAG_POSTFIX } from 'discourse/lib/tag-hashtags';
-import { SEPARATOR } from 'discourse/lib/category-hashtags';
 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
@@ -20,6 +16,7 @@ export function translateResults(results, opts) {
   if (!results.users) { results.users = []; }
   if (!results.posts) { results.posts = []; }
   if (!results.categories) { results.categories = []; }
+  if (!results.tags) { results.tags = []; }
 
   const topicMap = {};
   results.topics = results.topics.map(function(topic){
@@ -46,12 +43,17 @@ export function translateResults(results, opts) {
     return Category.list().findBy('id', category.id);
   }).compact();
 
+  results.tags = results.tags.map(function(tag){
+    let tagName = Handlebars.Utils.escapeExpression(tag.name);
+    return Ember.Object.create({ id: tagName, url: Discourse.getURL("/tags/" + tagName) });
+  }).compact();
+
   const r = results.grouped_search_result;
   results.resultTypes = [];
 
   // TODO: consider refactoring front end to take a better structure
   if (r) {
-    [['topic','posts'],['user','users'],['category','categories']].forEach(function(pair){
+    [['topic','posts'],['user','users'],['category','categories'],['tag','tags']].forEach(function(pair){
       const type = pair[0], name = pair[1];
       if (results[name].length > 0) {
         var result = {
@@ -94,9 +96,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);
   });
 
@@ -144,11 +146,7 @@ export function applySearchAutocomplete($input, siteSettings, appEvents, options
     width: '100%',
     treatAsTextarea: true,
     transformComplete(obj) {
-      if (obj.model) {
-        return Category.slugFor(obj.model, SEPARATOR);
-      } else {
-        return `${obj.text}${TAG_HASHTAG_POSTFIX}`;
-      }
+      return obj.text;
     },
     dataSource(term) {
       return searchCategoryTag(term, siteSettings);
@@ -156,13 +154,15 @@ export function applySearchAutocomplete($input, siteSettings, appEvents, options
     afterComplete
   }, options));
 
-  $input.autocomplete(_.merge({
-    template: findRawTemplate('user-selector-autocomplete'),
-    key: "@",
-    width: '100%',
-    treatAsTextarea: true,
-    transformComplete: v => v.username || v.name,
-    dataSource: term => userSearch({ term, includeGroups: true }),
-    afterComplete
-  }, options));
+  if (Discourse.SiteSettings.enable_mentions) {
+    $input.autocomplete(_.merge({
+      template: findRawTemplate('user-selector-autocomplete'),
+      key: "@",
+      width: '100%',
+      treatAsTextarea: true,
+      transformComplete: v => v.username || v.name,
+      dataSource: term => userSearch({ term, includeGroups: true }),
+      afterComplete
+    }, options));
+  }
 };
diff --git a/app/assets/javascripts/discourse/lib/sharing.js.es6 b/app/assets/javascripts/discourse/lib/sharing.js.es6
index 955618f074..ef485ed24f 100644
--- a/app/assets/javascripts/discourse/lib/sharing.js.es6
+++ b/app/assets/javascripts/discourse/lib/sharing.js.es6
@@ -9,9 +9,9 @@
       // This id must be present in the `share_links` site setting too
       id: 'twitter',
 
-      // The icon that will be displayed, choose between font awesome class name `faIcon` and custom HTML `htmlIcon`.
-      // When both provided, prefer `faIcon`
-      faIcon: 'fa-twitter-square'
+      // The icon that will be displayed, choose between icon name `icon` and custom HTML `htmlIcon`.
+      // When both provided, prefer `icon`
+      icon: 'twitter-square'
       htmlIcon: '<img src="example.com/example.jpg">',
 
       // A callback for generating the remote link from the `link` and `title`
@@ -30,6 +30,12 @@ var _sources = {};
 
 export default {
   addSource(source) {
+    // backwards compatibility for plugins
+    if (source.faIcon) {
+      source.icon = source.faIcon.replace('fa-', '');
+      delete source.faIcon;
+    }
+
     _sources[source.id] = source;
   },
 
diff --git a/app/assets/javascripts/discourse/lib/show-modal.js.es6 b/app/assets/javascripts/discourse/lib/show-modal.js.es6
index 739fdd17b3..179a700da5 100644
--- a/app/assets/javascripts/discourse/lib/show-modal.js.es6
+++ b/app/assets/javascripts/discourse/lib/show-modal.js.es6
@@ -1,13 +1,43 @@
+import { isAppleDevice } from 'discourse/lib/utilities';
+
 export default function(name, opts) {
   opts = opts || {};
   const container = Discourse.__container__;
 
+
+  // iOS 11 -> 11.1 have broken INPUTs on position fixed
+  // if for any reason there is a body higher than 100% behind them.
+  // What happens is that when INPUTs gets focus they shift the body
+  // which ends up moving the cursor to an invisible spot
+  // this makes the login experience on iOS painful, user thinks it is broken.
+  //
+  // Also, very little value in showing main outlet and header on iOS
+  // anyway, so just hide it.
+  if (isAppleDevice()) {
+    let pos = $(window).scrollTop();
+    $(window)
+      .off('show.bs.modal.ios-hacks')
+      .on('show.bs.modal.ios-hacks', () => {
+        $('#main-outlet, header').hide();
+      });
+
+    $(window)
+      .off('hide.bs.modal.ios-hacks')
+      .on('hide.bs.modal.ios-hacks', () => {
+        $('#main-outlet, header').show();
+        $(window).scrollTop(pos);
+
+        $(window).off('hide.bs.modal.ios-hacks');
+        $(window).off('show.bs.modal.ios-hacks');
+      });
+  }
+
   // We use the container here because modals are like singletons
   // in Discourse. Only one can be shown with a particular state.
   const route = container.lookup('route:application');
   const modalController = route.controllerFor('modal');
 
-  modalController.set('modalClass', null);
+  modalController.set('modalClass', opts.modalClass);
 
   const controllerName = opts.admin ? `modals/${name}` : name;
 
diff --git a/app/assets/javascripts/discourse/lib/text.js.es6 b/app/assets/javascripts/discourse/lib/text.js.es6
index dc3c1cdf97..09a7592828 100644
--- a/app/assets/javascripts/discourse/lib/text.js.es6
+++ b/app/assets/javascripts/discourse/lib/text.js.es6
@@ -2,24 +2,44 @@ 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';
+import { formatUsername } from 'discourse/lib/utilities';
 
-function getOpts() {
-  const siteSettings = Discourse.__container__.lookup('site-settings:main');
+function getOpts(opts) {
+  const siteSettings = Discourse.__container__.lookup('site-settings:main'),
+        site = Discourse.__container__.lookup('site:main');
 
-  return buildOptions({
+  opts = _.merge({
     getURL: Discourse.getURLWithCDN,
     currentUser: Discourse.__container__.lookup('current-user:main'),
-    siteSettings
-  });
+    censoredWords: site.censored_words,
+    siteSettings,
+    formatUsername
+  }, 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/to-markdown.js.es6 b/app/assets/javascripts/discourse/lib/to-markdown.js.es6
new file mode 100644
index 0000000000..2fd90c59e0
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/to-markdown.js.es6
@@ -0,0 +1,462 @@
+import parseHTML from 'discourse/helpers/parse-html';
+
+const trimLeft = text => text.replace(/^\s+/,"");
+const trimRight = text => text.replace(/\s+$/,"");
+const countPipes = text => text.replace(/\\\|/,"").match(/\|/g).length;
+
+class Tag {
+  constructor(name, prefix = "", suffix = "", inline = false) {
+    this.name = name;
+    this.prefix = prefix;
+    this.suffix = suffix;
+    this.inline = inline;
+  }
+
+  decorate(text) {
+    if (this.prefix || this.suffix) {
+      text = [this.prefix, text, this.suffix].join("");
+    }
+
+    if (this.inline) {
+      text = " " + text + " ";
+    }
+
+    return text;
+  }
+
+  toMarkdown() {
+    const text = this.element.innerMarkdown();
+
+    if (text && text.trim()) {
+      return this.decorate(text);
+    }
+
+    return text;
+  }
+
+  static blocks() {
+    return ["address", "article", "aside", "dd", "div", "dl", "dt", "fieldset", "figcaption", "figure",
+            "footer", "form", "header", "hgroup", "hr", "main", "nav", "p", "pre", "section"];
+  }
+
+  static headings() {
+    return ["h1", "h2", "h3", "h4", "h5", "h6"];
+  }
+
+  static emphases() {
+    return  [ ["b", "**"], ["strong", "**"], ["i", "*"], ["em", "*"], ["s", "~~"], ["strike", "~~"] ];
+  }
+
+  static slices() {
+    return ["dt", "dd", "thead", "tbody", "tfoot"];
+  }
+
+  static trimmable() {
+    return [...Tag.blocks(), ...Tag.headings(), ...Tag.slices(), "li", "td", "th", "br", "hr", "blockquote", "table", "ol", "tr", "ul"];
+  }
+
+  static block(name, prefix, suffix) {
+    return class extends Tag {
+      constructor() {
+        super(name, prefix, suffix);
+        this.gap = "\n\n";
+      }
+
+      decorate(text) {
+        return `${this.gap}${this.prefix}${text}${this.suffix}${this.gap}`;
+      }
+    };
+  }
+
+  static heading(name, i) {
+    const prefix = `${[...Array(i)].map(() => "#").join("")} `;
+    return Tag.block(name, prefix, "");
+  }
+
+  static emphasis(name, decorator) {
+    return class extends Tag {
+      constructor() {
+        super(name, decorator, decorator, true);
+      }
+
+      decorate(text) {
+        if (text.includes("\n")) {
+          this.prefix = `<${this.name}>`;
+          this.suffix = `</${this.name}>`;
+        }
+
+        let space = text.match(/^\s/) || [""];
+        this.prefix = space[0] + this.prefix;
+        space = text.match(/\s$/) || [""];
+        this.suffix = this.suffix + space[0];
+
+        return super.decorate(text.trim());
+      }
+    };
+  }
+
+  static keep(name) {
+    return class extends Tag {
+      constructor() {
+        super(name, `<${name}>`, `</${name}>`);
+      }
+    };
+  }
+
+  static replace(name, text) {
+    return class extends Tag {
+      constructor() {
+        super(name, "", "");
+        this.text = text;
+      }
+
+      toMarkdown() {
+        return this.text;
+      }
+    };
+  }
+
+  static link() {
+    return class extends Tag {
+      constructor() {
+        super("a", "", "", true);
+      }
+
+      decorate(text) {
+        const attr = this.element.attributes;
+
+        if (attr.href && text !== attr.href) {
+          text = text.replace(/\n{2,}/g, "\n");
+          return "[" + text + "](" + attr.href + ")";
+        }
+
+        return text;
+      }
+    };
+  }
+
+  static image() {
+    return class extends Tag {
+      constructor() {
+        super("img", "", "", true);
+      }
+
+      toMarkdown() {
+        const e = this.element;
+        const attr = e.attributes;
+        const pAttr = (e.parent && e.parent.attributes) || {};
+        const src = attr.src || pAttr.src;
+
+        if (src) {
+          let alt = attr.alt || pAttr.alt || "";
+          const width = attr.width || pAttr.width;
+          const height = attr.height || pAttr.height;
+
+          if (width && height) {
+            const pipe = this.element.parentNames.includes("table") ? "\\|" : "|";
+            alt = `${alt}${pipe}${width}x${height}`;
+          }
+
+          return "![" + alt + "](" + src + ")";
+        }
+
+        return "";
+      }
+    };
+  }
+
+  static slice(name, suffix) {
+    return class extends Tag {
+      constructor() {
+        super(name, "", suffix);
+      }
+
+      decorate(text) {
+        if (!this.element.next) {
+          this.suffix = "";
+        }
+        return `${text}${this.suffix}`;
+      }
+    };
+  }
+
+  static cell(name) {
+    return class extends Tag {
+      constructor() {
+        super(name, "|");
+      }
+
+      toMarkdown() {
+        const text = this.element.innerMarkdown().trim();
+
+        if (text.includes("\n")) {
+          throw "Unsupported format inside Markdown table cells";
+        }
+
+        return this.decorate(text);
+      }
+    };
+  }
+
+  static li() {
+    return class extends Tag.slice("li", "\n") {
+      decorate(text) {
+        const indent = this.element.filterParentNames(["ol", "ul"]).slice(1).map(() => "\t").join("");
+        return super.decorate(`${indent}* ${trimLeft(text)}`);
+      }
+    };
+  }
+
+  static code() {
+    return class extends Tag {
+      constructor() {
+        super("code", "`", "`");
+      }
+
+      decorate(text) {
+        if (this.element.parentNames.includes("pre")) {
+          this.prefix = '\n\n```\n';
+          this.suffix = '\n```\n\n';
+        } else {
+          this.inline = true;
+        }
+
+        text = $('<textarea />').html(text).text();
+        return super.decorate(text);
+      }
+    };
+  }
+
+  static blockquote() {
+    return class extends Tag {
+      constructor() {
+        super("blockquote", "\n> ", "\n");
+      }
+
+      decorate(text) {
+        text = text.trim().replace(/\n{2,}>/g, "\n>").replace(/\n/g, "\n> ");
+        return super.decorate(text);
+      }
+    };
+  }
+
+  static table() {
+    return class extends Tag.block("table") {
+      decorate(text) {
+        text = super.decorate(text).replace(/\|\n{2,}\|/g, "|\n|");
+        const rows = text.trim().split("\n");
+        const pipeCount = countPipes(rows[0]);
+        const isValid = rows.length > 1 &&
+                        pipeCount > 2 &&
+                        rows.reduce((a, c) => a && countPipes(c) <= pipeCount);
+
+        if (!isValid) {
+          throw "Unsupported table format for Markdown conversion";
+        }
+
+        const splitterRow = [...Array(pipeCount-1)].map(() => "| --- ").join("") + "|\n";
+        text = text.replace("|\n", "|\n" + splitterRow);
+
+        return text;
+      }
+    };
+  }
+
+  static list(name) {
+    return class extends Tag.block(name) {
+      decorate(text) {
+        let smallGap = "";
+
+        if (this.element.filterParentNames(["li"]).length) {
+          this.gap = "";
+          smallGap = "\n";
+        }
+
+        return smallGap + super.decorate(trimRight(text));
+      }
+    };
+  }
+
+  static ol() {
+    return class extends Tag.list("ol") {
+      decorate(text) {
+        text = "\n" + text;
+        const bullet = text.match(/\n\t*\*/)[0];
+
+        for (let i = parseInt(this.element.attributes.start || 1); text.includes(bullet); i++) {
+          text = text.replace(bullet, bullet.replace("*", `${i}.`));
+        }
+
+        return super.decorate(text.slice(1));
+      }
+    };
+  }
+
+  static tr() {
+    return class extends Tag.slice("tr", "|\n") {
+      decorate(text) {
+        if (!this.element.next) {
+          this.suffix = "|";
+        }
+        return `${text}${this.suffix}`;
+      }
+    };
+  }
+
+}
+
+const tags = [
+  ...Tag.blocks().map((b) => Tag.block(b)),
+  ...Tag.headings().map((h, i) => Tag.heading(h, i + 1)),
+  ...Tag.slices().map((s) => Tag.slice(s, "\n")),
+  ...Tag.emphases().map((e) => Tag.emphasis(e[0], e[1])),
+  Tag.cell("td"), Tag.cell("th"),
+  Tag.replace("br", "\n"), Tag.replace("hr", "\n---\n"), Tag.replace("head", ""),
+  Tag.keep("ins"), Tag.keep("del"), Tag.keep("small"), Tag.keep("big"),
+  Tag.li(), Tag.link(), Tag.image(), Tag.code(), Tag.blockquote(), Tag.table(), Tag.tr(), Tag.ol(), Tag.list("ul"),
+];
+
+class Element {
+  constructor(element, parent, previous, next) {
+    this.name = element.name;
+    this.type = element.type;
+    this.data = element.data;
+    this.children = element.children;
+    this.attributes = element.attributes || {};
+
+    if (parent) {
+      this.parent = parent;
+      this.parentNames = parent.parentNames.slice();
+      this.parentNames.push(parent.name);
+    }
+
+    this.parentNames = this.parentNames || [];
+    this.previous = previous;
+    this.next = next;
+  }
+
+  tag() {
+    const tag = new (tags.filter(t => (new t().name === this.name))[0] || Tag)();
+    tag.element = this;
+    return tag;
+  }
+
+  innerMarkdown() {
+    return Element.parseChildren(this);
+  }
+
+  leftTrimmable() {
+    return this.previous && Tag.trimmable().includes(this.previous.name);
+  }
+
+  rightTrimmable() {
+    return this.next && Tag.trimmable().includes(this.next.name);
+  }
+
+  text() {
+    let text = this.data || "";
+
+    if (this.leftTrimmable()) {
+      text = trimLeft(text);
+    }
+
+    if (this.rightTrimmable()) {
+      text = trimRight(text);
+    }
+
+    text = text.replace(/[ \t]+/g, " ");
+
+    return text;
+  }
+
+  toMarkdown() {
+    switch(this.type) {
+      case "text":
+        return this.text();
+        break;
+      case "tag":
+        return this.tag().toMarkdown();
+        break;
+    }
+  }
+
+  filterParentNames(names) {
+    return this.parentNames.filter(p => names.includes(p));
+  }
+
+  static toMarkdown(element, parent, prev, next) {
+    return new Element(element, parent, prev, next).toMarkdown();
+  }
+
+  static parseChildren(parent) {
+    return Element.parse(parent.children, parent);
+  }
+
+  static parse(elements, parent = null) {
+    if (elements) {
+      let result = [];
+
+      for (let i = 0; i < elements.length; i++) {
+        const prev = (i === 0) ? null : elements[i-1];
+        const next = (i === elements.length) ? null : elements[i+1];
+
+        result.push(Element.toMarkdown(elements[i], parent, prev, next));
+      }
+
+      return result.join("");
+    }
+
+    return "";
+  }
+}
+
+function trimUnwantedSpaces(html) {
+  const body = html.match(/<body[^>]*>([\s\S]*?)<\/body>/);
+  html = body ? body[1] : html;
+  html = html.replace(/\r|\n|&nbsp;/g, " ");
+
+  let match;
+  while (match = html.match(/<[^\s>]+[^>]*>\s{2,}<[^\s>]+[^>]*>/)) {
+    html = html.replace(match[0], match[0].replace(/>\s{2,}</, "> <"));
+  }
+
+  return html;
+}
+
+function putPlaceholders(html) {
+  const codeRegEx = /<code[^>]*>([\s\S]*?)<\/code>/gi;
+  const origHtml = html;
+  let match = codeRegEx.exec(origHtml);
+  let placeholders = [];
+
+  while(match) {
+    const placeholder = `DISCOURSE_PLACEHOLDER_${placeholders.length + 1}`;
+    let code = match[1];
+    code = $('<div />').html(code).text().replace(/^\n/, '').replace(/\n$/, '');
+    placeholders.push([placeholder, code]);
+    html = html.replace(match[0], `<code>${placeholder}</code>`);
+    match = codeRegEx.exec(origHtml);
+  }
+
+  const elements = parseHTML(trimUnwantedSpaces(html));
+  return { elements, placeholders };
+}
+
+function replacePlaceholders(markdown, placeholders) {
+  placeholders.forEach(p => {
+    markdown = markdown.replace(p[0], p[1]);
+  });
+  return markdown;
+}
+
+export default function toMarkdown(html) {
+  try {
+    const { elements, placeholders } = putPlaceholders(html);
+    let markdown = Element.parse(elements).trim();
+    markdown = markdown.replace(/^<b>/, "").replace(/<\/b>$/, "").trim(); // fix for google doc copy paste
+    markdown = markdown.replace(/\n +/g, "\n").replace(/ +\n/g, "\n").replace(/ {2,}/g, " ").replace(/\n{3,}/g, "\n\n").replace(/\t/g, "  ");
+    return replacePlaceholders(markdown, placeholders);
+  } catch(err) {
+    return "";
+  }
+}
diff --git a/app/assets/javascripts/discourse/lib/transform-post.js.es6 b/app/assets/javascripts/discourse/lib/transform-post.js.es6
index 7df3954b30..ac81e64e68 100644
--- a/app/assets/javascripts/discourse/lib/transform-post.js.es6
+++ b/app/assets/javascripts/discourse/lib/transform-post.js.es6
@@ -35,6 +35,7 @@ export function transformBasicPost(post) {
     primary_group_flair_bg_color: post.primary_group_flair_bg_color,
     primary_group_flair_color: post.primary_group_flair_color,
     wiki: post.wiki,
+    lastWikiEdit: post.last_wiki_edit,
     firstPost: post.post_number === 1,
     post_number: post.post_number,
     cooked: post.cooked,
@@ -126,6 +127,7 @@ export default function transformPost(currentUser, site, post, prevPost, nextPos
     postAtts.allowedGroups = details.allowed_groups;
     postAtts.allowedUsers = details.allowed_users;
     postAtts.canRemoveAllowedUsers = details.can_remove_allowed_users;
+    postAtts.canRemoveSelfId = details.can_remove_self_id;
     postAtts.canInvite = details.can_invite_to;
   }
 
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index e1c0282152..2fe1b79a8b 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -192,6 +192,17 @@ const DiscourseURL = Ember.Object.extend({
     const oldPath = window.location.pathname;
     path = path.replace(/(https?\:)?\/\/[^\/]+/, '');
 
+    // Rewrite /my/* urls
+    if (path.indexOf(Discourse.BaseUri + '/my/') === 0) {
+      const currentUser = Discourse.User.current();
+      if (currentUser) {
+        path = path.replace(Discourse.BaseUri + '/my/', userPath(currentUser.get('username_lower') + "/"));
+      } else {
+        document.location.href = "/404";
+        return;
+      }
+    }
+
     // handle prefixes
     if (path.match(/^\//)) {
       let rootURL = (Discourse.BaseUri === undefined ? "/" : Discourse.BaseUri);
@@ -199,17 +210,6 @@ const DiscourseURL = Ember.Object.extend({
       path = path.replace(rootURL, '');
     }
 
-    // Rewrite /my/* urls
-    if (path.indexOf('/my/') === 0) {
-      const currentUser = Discourse.User.current();
-      if (currentUser) {
-        path = path.replace('/my/', userPath(currentUser.get('username_lower') + "/"));
-      } else {
-        document.location.href = "/404";
-        return;
-      }
-    }
-
     path = rewritePath(path);
     if (this.navigatedToPost(oldPath, path, opts)) { return; }
 
@@ -222,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);
   },
 
@@ -368,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/user-search.js.es6 b/app/assets/javascripts/discourse/lib/user-search.js.es6
index 6361ea9213..29ad228a05 100644
--- a/app/assets/javascripts/discourse/lib/user-search.js.es6
+++ b/app/assets/javascripts/discourse/lib/user-search.js.es6
@@ -7,7 +7,7 @@ var cache = {},
     currentTerm,
     oldSearch;
 
-function performSearch(term, topicId, includeGroups, includeMentionableGroups, allowedUsers, group, resultsFn) {
+function performSearch(term, topicId, includeGroups, includeMentionableGroups, includeMessageableGroups, allowedUsers, group, resultsFn) {
   var cached = cache[term];
   if (cached) {
     resultsFn(cached);
@@ -20,6 +20,7 @@ function performSearch(term, topicId, includeGroups, includeMentionableGroups, a
             topic_id: topicId,
             include_groups: includeGroups,
             include_mentionable_groups: includeMentionableGroups,
+            include_messageable_groups: includeMessageableGroups,
             group: group,
             topic_allowed_users: allowedUsers }
   });
@@ -46,6 +47,7 @@ function organizeResults(r, options) {
   var exclude = options.exclude || [],
       limit = options.limit || 5,
       users = [],
+      emails = [],
       groups = [],
       results = [];
 
@@ -59,6 +61,12 @@ function organizeResults(r, options) {
     });
   }
 
+  if (options.term.match(/@/)) {
+    let e = { username: options.term };
+    emails = [ e ];
+    results.push(e);
+  }
+
   if (r.groups) {
     r.groups.every(function(g) {
       if (results.length > limit && options.term.toLowerCase() !== g.name.toLowerCase()) return false;
@@ -71,6 +79,7 @@ function organizeResults(r, options) {
   }
 
   results.users = users;
+  results.emails = emails;
   results.groups = groups;
   return results;
 }
@@ -80,6 +89,7 @@ export default function userSearch(options) {
   var term = options.term || "",
       includeGroups = options.includeGroups,
       includeMentionableGroups = options.includeMentionableGroups,
+      includeMessageableGroups = options.includeMessageableGroups,
       allowedUsers = options.allowedUsers,
       topicId = options.topicId,
       group = options.group;
@@ -94,7 +104,7 @@ export default function userSearch(options) {
 
   return new Ember.RSVP.Promise(function(resolve) {
     // TODO site setting for allowed regex in username
-    if (term.match(/[^\w\.\-]/)) {
+    if (term.match(/[^\w_\-\.@\+]/)) {
       resolve([]);
       return;
     }
@@ -112,6 +122,7 @@ export default function userSearch(options) {
         topicId,
         includeGroups,
         includeMentionableGroups,
+        includeMessageableGroups,
         allowedUsers,
         group,
         function(r) {
diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6
index d80b84cabc..33558befac 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js.es6
+++ b/app/assets/javascripts/discourse/lib/utilities.js.es6
@@ -1,5 +1,7 @@
 import { escape } from 'pretty-text/sanitizer';
 
+const homepageSelector = 'meta[name=discourse_current_homepage]';
+
 export function translateSize(size) {
   switch (size) {
     case 'tiny': return 20;
@@ -21,6 +23,17 @@ export function escapeExpression(string) {
   return escape(string);
 }
 
+let _usernameFormatDelegate = username => username;
+
+export function formatUsername(username) {
+  return _usernameFormatDelegate(username || '');
+}
+
+export function replaceFormatter(fn) {
+  _usernameFormatDelegate = fn;
+}
+
+
 export function avatarUrl(template, size) {
   if (!template) { return ""; }
   const rawSize = getRawSize(translateSize(size));
@@ -102,8 +115,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 +187,7 @@ export function validateUploadedFiles(files, opts) {
   }
 
   opts = opts || {};
-  opts["type"] = uploadTypeFromFileName(upload.name);
+  opts.type = uploadTypeFromFileName(upload.name);
 
   return validateUploadedFile(upload, opts);
 }
@@ -185,12 +200,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 +223,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;
     }
   }
@@ -264,6 +285,21 @@ function uploadTypeFromFileName(fileName) {
   return isAnImage(fileName) ? 'image' : 'attachment';
 }
 
+function isGUID(value) {
+  return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(value);
+}
+
+function imageNameFromFileName(fileName) {
+  const split = fileName.split('.');
+  const name = split[split.length-2];
+
+  if (exports.isAppleDevice() && isGUID(name)) {
+    return I18n.t('upload_selector.default_image_alt_text');
+  }
+
+  return name;
+}
+
 export function allowsImages() {
   return authorizesAllExtensions() || IMAGES_EXTENSIONS_REGEX.test(authorizedExtensions());
 }
@@ -288,7 +324,8 @@ 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 name = imageNameFromFileName(upload.original_filename);
+    return `![${name}|${upload.width}x${upload.height}](${upload.short_url || 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 {
@@ -297,27 +334,27 @@ export function getUploadMarkdown(upload) {
 }
 
 export function displayErrorForUpload(data) {
-  // deal with meaningful errors first
   if (data.jqXHR) {
     switch (data.jqXHR.status) {
       // cancelled by the user
-      case 0: return;
+      case 0:
+        return;
 
-              // entity too large, usually returned from the web server
+      // entity too large, usually returned from the web server
       case 413:
-              var type = uploadTypeFromFileName(data.files[0].name);
-              var maxSizeKB = Discourse.SiteSettings['max_' + type + '_size_kb'];
-              bootbox.alert(I18n.t('post.errors.file_too_large', { max_size_kb: maxSizeKB }));
-              return;
+        const type = uploadTypeFromFileName(data.files[0].name);
+        const max_size_kb = Discourse.SiteSettings[`max_${type}_size_kb`];
+        bootbox.alert(I18n.t('post.errors.file_too_large', { max_size_kb }));
+        return;
 
-              // the error message is provided by the server
+      // the error message is provided by the server
       case 422:
-              if (data.jqXHR.responseJSON.message) {
-                bootbox.alert(data.jqXHR.responseJSON.message);
-              } else {
-                bootbox.alert(data.jqXHR.responseJSON.join("\n"));
-              }
-              return;
+        if (data.jqXHR.responseJSON.message) {
+          bootbox.alert(data.jqXHR.responseJSON.message);
+        } else {
+          bootbox.alert(data.jqXHR.responseJSON.join("\n"));
+        }
+        return;
     }
   } else if (data.errors && data.errors.length > 0) {
     bootbox.alert(data.errors.join("\n"));
@@ -328,8 +365,22 @@ export function displayErrorForUpload(data) {
 }
 
 export function defaultHomepage() {
-  // the homepage is the first item of the 'top_menu' site setting
-  return Discourse.SiteSettings.top_menu.split("|")[0].split(",")[0];
+  let homepage = null;
+  let elem = _.first($(homepageSelector));
+  if (elem) {
+    homepage = elem.content;
+  }
+  if (!homepage) {
+    homepage = Discourse.SiteSettings.top_menu.split("|")[0].split(",")[0];
+  }
+  return homepage;
+}
+
+export function setDefaultHomepage(homepage) {
+  let elem = _.first($(homepageSelector));
+  if (elem) {
+    elem.content = homepage;
+  }
 }
 
 export function determinePostReplaceSelection({ selection, needle, replacement }) {
@@ -362,5 +413,42 @@ export function determinePostReplaceSelection({ selection, needle, replacement }
   }
 }
 
+export function isAppleDevice() {
+  // IE has no DOMNodeInserted so can not get this hack despite saying it is like iPhone
+  // This will apply hack on all iDevices
+  return navigator.userAgent.match(/(iPad|iPhone|iPod)/g) &&
+    navigator.userAgent.match(/Safari/g) &&
+    !navigator.userAgent.match(/Trident/g);
+}
+
+const toArray = items => {
+  items = items || [];
+
+  if (!Array.isArray(items)) {
+    return Array.from(items);
+  }
+
+  return items;
+};
+
+export function clipboardData(e, canUpload) {
+  const clipboard = e.clipboardData ||
+                      e.originalEvent.clipboardData ||
+                      e.delegatedEvent.originalEvent.clipboardData;
+
+  const types = toArray(clipboard.types);
+  let files = toArray(clipboard.files);
+
+  if (types.includes("Files") && files.length === 0) { // for IE
+    files = toArray(clipboard.items).filter(i => i.kind === "file");
+  }
+
+  canUpload = files && canUpload && !types.includes("text/plain");
+  const canUploadImage = canUpload && files.filter(f => f.type.match('^image/'))[0];
+  const canPasteHtml = Discourse.SiteSettings.enable_rich_text_paste && types.includes("text/html") && !canUploadImage;
+
+  return { clipboard, types, canUpload, canPasteHtml };
+}
+
 // This prevents a mini racer crash
 export default {};
diff --git a/app/assets/javascripts/discourse/mapping-router.js.es6 b/app/assets/javascripts/discourse/mapping-router.js.es6
index 140ea94610..2f91989918 100644
--- a/app/assets/javascripts/discourse/mapping-router.js.es6
+++ b/app/assets/javascripts/discourse/mapping-router.js.es6
@@ -32,6 +32,7 @@ class RouteNode {
     this.children = [];
     this.childrenByName = {};
     this.paths = {};
+    this.site = Discourse.Site.current();
 
     if (!opts.path) {
       opts.path = name;
@@ -106,7 +107,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;
@@ -119,7 +120,7 @@ export function mapRoutes() {
   });
 
   extras.forEach(extra => {
-    const node = tree.findPath(extra.resource);
+    let node = tree.findPath(extra.resource);
     if (node) {
       node.extract(extra.map);
     }
diff --git a/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6 b/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
index cf8878c437..46c1e93b99 100644
--- a/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
+++ b/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
@@ -1,4 +1,4 @@
-import NotificationLevels from 'discourse/lib/notification-levels';
+import { NotificationLevels } from 'discourse/lib/notification-levels';
 
 export default Ember.Mixin.create({
   bulkSelectEnabled: false,
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 0000000000..f9037da98d
--- /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 8a286522df..b225533c36 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/password-validation.js.es6 b/app/assets/javascripts/discourse/mixins/password-validation.js.es6
index 7e9caf62dc..b65272e03f 100644
--- a/app/assets/javascripts/discourse/mixins/password-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/password-validation.js.es6
@@ -16,13 +16,13 @@ export default Ember.Mixin.create({
     return I18n.t('user.password.instructions', {count: this.get('passwordMinLength')});
   },
 
-  @computed('isDeveloper')
-  passwordMinLength() {
-    return this.get('isDeveloper') ? this.siteSettings.min_admin_password_length : this.siteSettings.min_password_length;
+  @computed('isDeveloper', 'admin')
+  passwordMinLength(isDeveloper, admin) {
+    return (isDeveloper || admin) ? this.siteSettings.min_admin_password_length : this.siteSettings.min_password_length;
   },
 
-  @computed('accountPassword', 'passwordRequired', 'rejectedPasswords.[]', 'accountUsername', 'accountEmail', 'isDeveloper')
-  passwordValidation(password, passwordRequired, rejectedPasswords, accountUsername, accountEmail, isDeveloper) {
+  @computed('accountPassword', 'passwordRequired', 'rejectedPasswords.[]', 'accountUsername', 'accountEmail', 'passwordMinLength')
+  passwordValidation(password, passwordRequired, rejectedPasswords, accountUsername, accountEmail, passwordMinLength) {
     if (!passwordRequired) {
       return InputValidation.create({ ok: true });
     }
@@ -40,8 +40,7 @@ export default Ember.Mixin.create({
     }
 
     // If too short
-    const passwordLength = isDeveloper ? this.siteSettings.min_admin_password_length : this.siteSettings.min_password_length;
-    if (password.length < passwordLength) {
+    if (password.length < passwordMinLength) {
       return InputValidation.create({
         failed: true,
         reason: I18n.t('user.password.too_short')
diff --git a/app/assets/javascripts/discourse/mixins/scrolling.js.es6 b/app/assets/javascripts/discourse/mixins/scrolling.js.es6
index c2997fa395..bbd21aca02 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/selected-posts-count.js.es6 b/app/assets/javascripts/discourse/mixins/selected-posts-count.js.es6
deleted file mode 100644
index f4c17587b3..0000000000
--- a/app/assets/javascripts/discourse/mixins/selected-posts-count.js.es6
+++ /dev/null
@@ -1,34 +0,0 @@
-export default Em.Mixin.create({
-
-  selectedPostsCount: function() {
-    if (this.get('allPostsSelected')) {
-      return this.get('model.posts_count') || this.get('topic.posts_count') || this.get('posts_count');
-    }
-
-    var sum = this.get('selectedPosts.length') || 0;
-    if (this.get('selectedReplies')) {
-      this.get('selectedReplies').forEach(function (p) {
-        sum += p.get('reply_count') || 0;
-      });
-    }
-
-    return sum;
-  }.property('selectedPosts.length', 'allPostsSelected', 'selectedReplies.length'),
-
-  // The username that owns every selected post, or undefined if no selection or if ownership is mixed.
-  selectedPostsUsername: function() {
-    // Don't proceed if replies are selected or usernames are mixed
-    // Changing ownership in those cases normally doesn't make sense
-    if (this.get('selectedReplies') && this.get('selectedReplies').length > 0) { return undefined; }
-    if (this.get('selectedPosts').length <= 0) { return undefined; }
-
-    const selectedPosts = this.get('selectedPosts'),
-          username = selectedPosts[0].username;
-
-    if (selectedPosts.every(function(post) { return post.username === username; })) {
-      return username;
-    } else {
-      return undefined;
-    }
-  }.property('selectedPosts.length', 'selectedReplies.length')
-});
diff --git a/app/assets/javascripts/discourse/mixins/upload.js.es6 b/app/assets/javascripts/discourse/mixins/upload.js.es6
index ec76aa1e66..eec73d8c3d 100644
--- a/app/assets/javascripts/discourse/mixins/upload.js.es6
+++ b/app/assets/javascripts/discourse/mixins/upload.js.es6
@@ -18,12 +18,9 @@ export default Em.Mixin.create({
           uploadUrl = Discourse.getURL(this.getWithDefault("uploadUrl", "/uploads")),
           reset = () => this.setProperties({ uploading: false, uploadProgress: 0});
 
-    this.messageBus.subscribe("/uploads/" + this.get("type"), upload => {
-      if (upload && upload.url) {
-        this.uploadDone(upload);
-      } else {
-        displayErrorForUpload(upload);
-      }
+    $upload.on("fileuploaddone", (e, data) => {
+      let upload = data.result;
+      this.uploadDone(upload);
       reset();
     });
 
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 0000000000..6c3f8ca3c6
--- /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/mixins/username-validation.js.es6 b/app/assets/javascripts/discourse/mixins/username-validation.js.es6
index 515d32c313..b67fa857ac 100644
--- a/app/assets/javascripts/discourse/mixins/username-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/username-validation.js.es6
@@ -25,7 +25,7 @@ export default Ember.Mixin.create({
     this.set('uniqueUsernameValidation', null);
 
 
-    if (accountUsername === this.get('prefilledUsername')) {
+    if (accountUsername && accountUsername === this.get('prefilledUsername')) {
       return InputValidation.create({
         ok: true,
         reason: I18n.t('user.username.prefilled')
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 8de331ac95..0000000000
--- 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/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6
index 16304f453e..52c3eb443c 100644
--- a/app/assets/javascripts/discourse/models/category.js.es6
+++ b/app/assets/javascripts/discourse/models/category.js.es6
@@ -90,6 +90,7 @@ const Category = RestModel.extend({
         position: this.get('position'),
         email_in: this.get('email_in'),
         email_in_allow_strangers: this.get('email_in_allow_strangers'),
+        mailinglist_mirror: this.get('mailinglist_mirror'),
         parent_category_id: this.get('parent_category_id'),
         uploaded_logo_id: this.get('uploaded_logo.id'),
         uploaded_background_id: this.get('uploaded_background.id'),
@@ -205,9 +206,7 @@ Category.reopenClass({
   },
 
   list() {
-    return Discourse.SiteSettings.fixed_category_positions ?
-             Discourse.Site.currentProp('categories') :
-             Discourse.Site.currentProp('sortedCategories');
+    return Discourse.Site.currentProp('categoriesList');
   },
 
   listByActivity() {
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 6c9a970917..4cdc2bd4c4 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -1,3 +1,4 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import RestModel from 'discourse/models/rest';
 import Topic from 'discourse/models/topic';
 import { throwAjaxError } from 'discourse/lib/ajax-error';
@@ -45,6 +46,12 @@ const CLOSED = 'closed',
         featuredLink: 'topic.featured_link'
       };
 
+const _saveLabels = {};
+_saveLabels[EDIT] = 'composer.save_edit';
+_saveLabels[REPLY] = 'composer.reply';
+_saveLabels[CREATE_TOPIC] = 'composer.create_topic';
+_saveLabels[PRIVATE_MESSAGE] = 'composer.create_pm';
+
 const Composer = RestModel.extend({
   _categoryId: null,
   unlistTopic: false,
@@ -84,7 +91,7 @@ const Composer = RestModel.extend({
 
   @computed("privateMessage", "archetype.hasOptions")
   showCategoryChooser(isPrivateMessage, hasOptions) {
-    const manyCategories = Discourse.Category.list().length > 1;
+    const manyCategories = this.site.get('categories').length > 1;
     return !isPrivateMessage && (hasOptions || manyCategories);
   },
 
@@ -191,7 +198,7 @@ const Composer = RestModel.extend({
         const replyUsername = post.get('reply_to_user.username');
         const replyAvatarTemplate = post.get('reply_to_user.avatar_template');
         if (replyUsername && replyAvatarTemplate && this.get('action') === EDIT) {
-          postDescription += " <i class='fa fa-mail-forward reply-to-glyph'></i> " + tinyAvatar(replyAvatarTemplate) + " " + replyUsername;
+          postDescription += ` ${iconHTML('mail-forward', { class: 'reply-to-glyph' })} ` + tinyAvatar(replyAvatarTemplate) + " " + replyUsername;
         }
       }
     }
@@ -239,25 +246,20 @@ const Composer = RestModel.extend({
     return (this.get('titleLength') <= this.siteSettings.max_topic_title_length);
   }.property('minimumTitleLength', 'titleLength', 'post.static_doc'),
 
-  // The icon for the save button
-  saveIcon: function () {
-    switch (this.get('action')) {
-      case EDIT: return '<i class="fa fa-pencil"></i>';
-      case REPLY: return '<i class="fa fa-reply"></i>';
-      case CREATE_TOPIC: return '<i class="fa fa-plus"></i>';
-      case PRIVATE_MESSAGE: return '<i class="fa fa-envelope"></i>';
+  @computed('action')
+  saveIcon(action) {
+    switch (action) {
+      case EDIT: return 'pencil';
+      case REPLY: return 'reply';
+      case CREATE_TOPIC: 'plus';
+      case PRIVATE_MESSAGE: 'envelope';
     }
-  }.property('action'),
+  },
 
-  // The text for the save button
-  saveText: function() {
-    switch (this.get('action')) {
-      case EDIT: return I18n.t('composer.save_edit');
-      case REPLY: return I18n.t('composer.reply');
-      case CREATE_TOPIC: return I18n.t('composer.create_topic');
-      case PRIVATE_MESSAGE: return I18n.t('composer.create_pm');
-    }
-  }.property('action'),
+  @computed('action', 'whisper')
+  saveLabel(action, whisper) {
+    return whisper ? 'composer.create_whisper' : _saveLabels[action];
+  },
 
   hasMetaData: function() {
     const metaData = this.get('metaData');
@@ -273,6 +275,16 @@ const Composer = RestModel.extend({
     return this.get('reply') !== this.get('originalText');
   }.property('reply', 'originalText'),
 
+  /**
+    Did the user make changes to the topic title?
+
+    @property titleDirty
+  **/
+  @computed('title', 'originalTitle')
+  titleDirty(title, originalTitle) {
+    return title !== originalTitle;
+  },
+
   /**
     Number of missing characters in the title until valid.
 
@@ -456,7 +468,8 @@ const Composer = RestModel.extend({
       topic: opts.topic,
       targetUsernames: opts.usernames,
       composerTotalOpened: opts.composerTime,
-      typingTime: opts.typingTime
+      typingTime: opts.typingTime,
+      whisper: opts.whisper
     });
 
     if (opts.post) {
@@ -480,7 +493,7 @@ const Composer = RestModel.extend({
     this.set('categoryId', opts.categoryId || this.get('topic.category.id'));
 
     if (!this.get('categoryId') && this.get('creatingTopic')) {
-      const categories = Discourse.Category.list();
+      const categories = this.site.get('categories');
       if (categories.length === 1) {
         this.set('categoryId', categories[0].get('id'));
       }
@@ -517,6 +530,9 @@ const Composer = RestModel.extend({
     }
     if (opts.title) { this.set('title', opts.title); }
     this.set('originalText', opts.draft ? '' : this.get('reply'));
+    if (this.get('editingFirstPost')) {
+      this.set('originalTitle', this.get('title'));
+    }
 
     return false;
   },
@@ -739,10 +755,18 @@ const Composer = RestModel.extend({
   saveDraft() {
     // Do not save when drafts are disabled
     if (this.get('disableDrafts')) return;
-    // Do not save when there is no reply
-    if (!this.get('reply')) return;
-    // Do not save when the reply's length is too small
-    if (this.get('replyLength') < this.siteSettings.min_post_length) return;
+
+    if (this.get('canEditTitle')) {
+      // Save title and/or post body
+      if (!this.get('title') && !this.get('reply')) return;
+      if (this.get('title') && this.get('titleLengthValid') &&
+        this.get('reply') && this.get('replyLength') < this.siteSettings.min_post_length) return;
+    } else {
+      // Do not save when there is no reply
+      if (!this.get('reply')) return;
+      // Do not save when the reply's length is too small
+      if (this.get('replyLength') < this.siteSettings.min_post_length) return;
+    }
 
     const data = {
       reply: this.get('reply'),
@@ -751,6 +775,7 @@ const Composer = RestModel.extend({
       categoryId: this.get('categoryId'),
       postId: this.get('post.id'),
       archetypeId: this.get('archetypeId'),
+      whisper: this.get('whisper'),
       metaData: this.get('metaData'),
       usernames: this.get('targetUsernames'),
       composerTime: this.get('composerTime'),
diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6
index f14507c6ab..c26544e7c5 100644
--- a/app/assets/javascripts/discourse/models/group.js.es6
+++ b/app/assets/javascripts/discourse/models/group.js.es6
@@ -2,6 +2,9 @@ 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 Category from "discourse/models/category";
+import User from "discourse/models/user";
+import Topic from "discourse/models/topic";
 
 const Group = RestModel.extend({
   limit: 50,
@@ -44,9 +47,9 @@ const Group = RestModel.extend({
           if (ownerIds[member.id]) {
             member.owner = true;
           }
-          return Discourse.User.create(member);
+          return User.create(member);
         }),
-        owners: result.owners.map(owner => Discourse.User.create(owner)),
+        owners: result.owners.map(owner => User.create(owner)),
       });
     });
   },
@@ -85,9 +88,9 @@ const Group = RestModel.extend({
 
   addOwners(usernames) {
     var self = this;
-    return ajax('/admin/groups/' + this.get('id') + '/owners.json', {
+    return ajax(`/admin/groups/${this.get('id')}/owners.json`, {
       type: "PUT",
-      data: { usernames: usernames }
+      data: { group: { usernames: usernames } }
     }).then(function() {
       self.findMembers();
     });
@@ -108,28 +111,32 @@ const Group = RestModel.extend({
     return this.get('flair_color') ? this.get('flair_color').replace(new RegExp("[^0-9a-fA-F]", "g"), "") : null;
   },
 
-  @computed('alias_level')
-  canEveryoneMention(aliasLevel) {
-    return aliasLevel === '99';
+  @computed('mentionable_level')
+  canEveryoneMention(mentionableLevel) {
+    return mentionableLevel === '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);
+    if (this.get('visibility_level') !== 0) {
+      this.set('public', false);
+      this.set('allow_membership_requests', false);
+    }
   },
 
   asJSON() {
-    return {
+    const attrs = {
       name: this.get('name'),
-      alias_level: this.get('alias_level'),
-      visible: !!this.get('visible'),
+      mentionable_level: this.get('mentionable_level'),
+      messageable_level: this.get('messageable_level'),
+      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'),
@@ -140,18 +147,33 @@ const Group = RestModel.extend({
       flair_bg_color: this.get('flairBackgroundHexColor'),
       flair_color: this.get('flairHexColor'),
       bio_raw: this.get('bio_raw'),
-      public: this.get('public'),
+      public_admission: this.get('public_admission'),
+      public_exit: this.get('public_exit'),
       allow_membership_requests: this.get('allow_membership_requests'),
       full_name: this.get('full_name'),
-      default_notification_level: this.get('default_notification_level')
+      default_notification_level: this.get('default_notification_level'),
+      membership_request_template: this.get('membership_request_template')
     };
+
+    if (!this.get('id')) {
+      attrs['usernames'] = this.get('usernames');
+      attrs['owner_usernames'] = this.get('ownerUsernames');
+    }
+
+    return attrs;
   },
 
   create() {
-    var self = this;
-    return ajax("/admin/groups", { type: "POST", data:  { group: this.asJSON() } }).then(function(resp) {
-      self.set('id', resp.basic_group.id);
-    });
+    return ajax("/admin/groups", { type: "POST", data:  { group: this.asJSON() } })
+      .then(resp => {
+        this.setProperties({
+          id: resp.basic_group.id,
+          usernames: null,
+          ownerUsernames: null
+        });
+
+        this.findMembers();
+      });
   },
 
   save() {
@@ -181,15 +203,17 @@ const Group = RestModel.extend({
   findPosts(opts) {
     opts = opts || {};
 
-    const type = opts['type'] || 'posts';
+    const type = opts.type || 'posts';
 
     var data = {};
     if (opts.beforePostId) { data.before_post_id = opts.beforePostId; }
+    if (opts.categoryId) { data.category_id = parseInt(opts.categoryId); }
 
-    return ajax(`/groups/${this.get('name')}/${type}.json`, { data: data }).then(posts => {
+    return ajax(`/groups/${this.get('name')}/${type}.json`, { data }).then(posts => {
       return posts.map(p => {
-        p.user = Discourse.User.create(p.user);
-        p.topic = Discourse.Topic.create(p.topic);
+        p.user = User.create(p.user);
+        p.topic = Topic.create(p.topic);
+        p.category = Category.findById(p.category_id);
         return Em.Object.create(p);
       });
     });
@@ -203,16 +227,17 @@ const Group = RestModel.extend({
     });
   },
 
-  requestMembership() {
+  requestMembership(reason) {
     return ajax(`/groups/${this.get('name')}/request_membership`, {
-      type: "POST"
+      type: "POST",
+      data: { reason: reason }
     });
   },
 });
 
 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));
     });
   },
@@ -232,6 +257,10 @@ Group.reopenClass({
 
   mentionable(name) {
     return ajax(`/groups/${name}/mentionable`, { data: { name } });
+  },
+
+  messageable(name) {
+    return ajax(`/groups/${name}/messageable`, { data: { name } });
   }
 });
 
diff --git a/app/assets/javascripts/discourse/models/invite.js.es6 b/app/assets/javascripts/discourse/models/invite.js.es6
index 1425e63b25..b3373f1080 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/nav-item.js.es6 b/app/assets/javascripts/discourse/models/nav-item.js.es6
index d28b672834..7616644968 100644
--- a/app/assets/javascripts/discourse/models/nav-item.js.es6
+++ b/app/assets/javascripts/discourse/models/nav-item.js.es6
@@ -1,83 +1,105 @@
 import { toTitleCase } from 'discourse/lib/formatter';
+import computed from 'ember-addons/ember-computed-decorators';
 
 const NavItem = Discourse.Model.extend({
 
-  displayName: function() {
-    var categoryName = this.get('categoryName'),
-        name = this.get('name'),
-        count = this.get('count') || 0;
+  @computed("categoryName", "name")
+  title(categoryName, name) {
+    const extra = {};
+
+    if (categoryName) {
+      name = "category";
+      extra.categoryName = categoryName;
+    }
+
+    return I18n.t("filters." + name.replace("/", ".") + ".help", extra);
+  },
+
+  @computed("categoryName", "name", "count")
+  displayName(categoryName, name, count) {
+    count = count || 0;
 
     if (name === 'latest' && !Discourse.Site.currentProp('mobileView')) {
       count = 0;
     }
 
-    var extra = { count: count };
-    var titleKey = count === 0 ? '.title' : '.title_with_count';
+    let extra = { count: count };
+    const titleKey = count === 0 ? '.title' : '.title_with_count';
 
     if (categoryName) {
       name = 'category';
       extra.categoryName = toTitleCase(categoryName);
     }
-    return I18n.t("filters." + name.replace("/", ".") + titleKey, extra);
-  }.property('categoryName', 'name', 'count'),
 
-  categoryName: function() {
-    var split = this.get('name').split('/');
+    return I18n.t(`filters.${name.replace("/", ".") + titleKey}`, extra);
+  },
+
+  @computed("name")
+  categoryName(name) {
+    const split = name.split('/');
     return split[0] === 'category' ? split[1] : null;
-  }.property('name'),
+  },
 
-  categorySlug: function() {
-    var split = this.get('name').split('/');
+  @computed("name")
+  categorySlug(name) {
+    const split = name.split('/');
     if (split[0] === 'category' && split[1]) {
-      var cat = Discourse.Site.current().categories.findBy('nameLower', split[1].toLowerCase());
+      const cat = Discourse.Site.current().categories.findBy('nameLower', split[1].toLowerCase());
       return cat ? Discourse.Category.slugFor(cat) : null;
     }
     return null;
-  }.property('name'),
+  },
+
+  @computed("filterMode")
+  href(filterMode) {
+    let customHref = null;
 
-  href: function() {
-    var customHref = null;
     _.each(NavItem.customNavItemHrefs, function(cb) {
       customHref = cb.call(this, this);
       if (customHref) { return false; }
     }, this);
+
     if (customHref) { return customHref; }
-    return Discourse.getURL("/") + this.get('filterMode');
-  }.property('filterMode'),
 
-  // href from this item
-  filterMode: function() {
-    var name = this.get('name');
+    return Discourse.getURL("/") + filterMode;
+  },
 
-    if( name.split('/')[0] === 'category' ) {
-      return 'c/' + this.get('categorySlug');
+  @computed("name", "category", "categorySlug", "noSubcategories")
+  filterMode(name, category, categorySlug, noSubcategories) {
+    if (name.split('/')[0] === 'category') {
+      return 'c/' + categorySlug;
     } else {
-      var mode = "",
-      category = this.get("category");
-
-      if(category){
+      let mode = "";
+      if (category) {
         mode += "c/";
-        mode += Discourse.Category.slugFor(this.get('category'));
-        if (this.get('noSubcategories')) { mode += '/none'; }
+        mode += Discourse.Category.slugFor(category);
+        if (noSubcategories) { mode += '/none'; }
         mode += "/l/";
       }
       return mode + name.replace(' ', '-');
     }
-  }.property('name'),
+  },
 
-  count: function() {
-    var state = this.get('topicTrackingState');
+  @computed("name", "category", "topicTrackingState.messageCount")
+  count(name, category) {
+    const state = this.get("topicTrackingState");
     if (state) {
-      return state.lookupCount(this.get('name'), this.get('category'));
+      return state.lookupCount(name, category);
     }
-  }.property('topicTrackingState.messageCount')
+  }
 
 });
 
+ const ExtraNavItem = NavItem.extend({
+  @computed("href")
+  href: (href) => href
+});
+
 NavItem.reopenClass({
 
   extraArgsCallbacks: [],
   customNavItemHrefs: [],
+  extraNavItems: [],
 
   // create a nav item from the text, will return null if there is not valid nav item for this particular text
   fromText(text, opts) {
@@ -86,7 +108,10 @@ NavItem.reopenClass({
         testName = name.split("/")[0],
         anonymous = !Discourse.User.current();
 
+    opts = opts || {};
+
     if (anonymous && !Discourse.Site.currentProp('anonymous_top_menu_items').includes(testName)) return null;
+
     if (!Discourse.Category.list() && testName === "categories") return null;
     if (!Discourse.Site.currentProp('top_menu_items').includes(testName)) return null;
 
@@ -98,7 +123,7 @@ NavItem.reopenClass({
       _.merge(args, extra);
     });
 
-    const store = Discourse.__container__.lookup('store:main');
+    const store = Discourse.__container__.lookup('service:store');
     return store.createRecord('nav-item', args);
   },
 
@@ -113,16 +138,24 @@ NavItem.reopenClass({
       items.push(args.filterMode);
     }
 
-    return items.map(i => Discourse.NavItem.fromText(i, args))
-                .filter(i => i !== null && !(category && i.get("name").indexOf("categor") === 0));
+    items = items.map(i => Discourse.NavItem.fromText(i, args))
+                 .filter(i => i !== null && !(category && i.get("name").indexOf("categor") === 0));
+
+    return items.concat(NavItem.extraNavItems);
   }
 
 });
 
 export default NavItem;
+
 export function extraNavItemProperties(cb) {
   NavItem.extraArgsCallbacks.push(cb);
 }
+
 export function customNavItemHref(cb) {
   NavItem.customNavItemHrefs.push(cb);
 }
+
+export function addNavItem(item) {
+  NavItem.extraNavItems.push(ExtraNavItem.create(item));
+}
diff --git a/app/assets/javascripts/discourse/models/post-action-type.js.es6 b/app/assets/javascripts/discourse/models/post-action-type.js.es6
index 94a82ff5cb..fb3125f0fa 100644
--- a/app/assets/javascripts/discourse/models/post-action-type.js.es6
+++ b/app/assets/javascripts/discourse/models/post-action-type.js.es6
@@ -1,9 +1,7 @@
 import RestModel from 'discourse/models/rest';
 
-const PostActionType = RestModel.extend({
-  notCustomFlag: Em.computed.not('is_custom_flag')
-});
-
 export const MAX_MESSAGE_LENGTH = 500;
 
-export default PostActionType;
+export default RestModel.extend({
+  notCustomFlag: Em.computed.not('is_custom_flag')
+});
diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6
index de1ab50f78..53544c04c0 100644
--- a/app/assets/javascripts/discourse/models/post-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/post-stream.js.es6
@@ -538,7 +538,7 @@ export default RestModel.extend({
   triggerDeletedPost(postId){
     const existing = this._identityMap[postId];
 
-    if (existing) {
+    if (existing && !existing.deleted_at) {
       const url = "/posts/" + postId;
       const store = this.store;
 
@@ -741,6 +741,11 @@ export default RestModel.extend({
     const store = this.store;
     return ajax(url, {data}).then(result => {
       const posts = Ember.get(result, "post_stream.posts");
+
+      if (result.suggested_topics) {
+        this.set('topic.suggested_topics', result.suggested_topics);
+      }
+
       if (posts) {
         posts.forEach(p => this.storePost(store.createRecord('post', p)));
       }
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index 7800d3be38..c6903f71fd 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -6,8 +6,9 @@ import { propertyEqual } from 'discourse/lib/computed';
 import Quote from 'discourse/lib/quote';
 import computed from 'ember-addons/ember-computed-decorators';
 import { postUrl } from 'discourse/lib/utilities';
-import { cook } from 'discourse/lib/text';
+import { cookAsync } from 'discourse/lib/text';
 import { userPath } from 'discourse/lib/url';
+import Composer from 'discourse/models/composer';
 
 const Post = RestModel.extend({
 
@@ -52,7 +53,11 @@ const Post = RestModel.extend({
   }.property('firstPost', 'deleted_at', 'topic.deleted_at'),
 
   url: function() {
-    return postUrl(this.get('topic.slug') || this.get('topic_slug'), this.get('topic_id'), this.get('post_number'));
+    return postUrl(
+      this.get('topic.slug') || this.get('topic_slug'),
+      this.get('topic_id') || this.get('topic.id'),
+      this.get('post_number')
+    );
   }.property('post_number', 'topic_id', 'topic.slug'),
 
   // Don't drop the /1
@@ -83,15 +88,14 @@ const Post = RestModel.extend({
   }.property('link_counts.@each.internal'),
 
   flagsAvailable: function() {
-    const post = this;
-    return Discourse.Site.currentProp('flagTypes').filter(function(item) {
-      return post.get("actionByName." + item.get('name_key') + ".can_act");
+    return this.site.get('flagTypes').filter(item => {
+      return this.get(`actionByName.${item.get('name_key')}.can_act`);
     });
   }.property('actions_summary.@each.can_act'),
 
   afterUpdate(res) {
     if (res.category) {
-      Discourse.Site.current().updateCategory(res.category);
+      this.site.updateCategory(res.category);
     }
   },
 
@@ -104,7 +108,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');
@@ -122,35 +125,33 @@ const Post = RestModel.extend({
 
   // Expands the first post's content, if embedded and shortened.
   expand() {
-    const self = this;
-    return ajax("/posts/" + this.get('id') + "/expand-embed").then(function(post) {
-      self.set('cooked', "<section class='expanded-embed'>" + post.cooked + "</section>" );
+    return ajax(`/posts/${this.get('id')}/expand-embed`).then(post => {
+      this.set('cooked', `<section class="expanded-embed">${post.cooked}</section>`);
     });
   },
 
   // Recover a deleted post
   recover() {
-    const post = this,
-          initProperties = post.getProperties('deleted_at', 'deleted_by', 'user_deleted', 'can_delete');
+    const initProperties = this.getProperties('deleted_at', 'deleted_by', 'user_deleted', 'can_delete');
 
-    post.setProperties({
+    this.setProperties({
       deleted_at: null,
       deleted_by: null,
       user_deleted: false,
       can_delete: false
     });
 
-    return ajax("/posts/" + (this.get('id')) + "/recover", { type: 'PUT', cache: false }).then(function(data){
-      post.setProperties({
+    return ajax(`/posts/${this.get('id')}/recover`, { type: 'PUT', cache: false }).then(data => {
+      this.setProperties({
         cooked: data.cooked,
         raw: data.raw,
         user_deleted: false,
         can_delete: true,
         version: data.version
       });
-    }).catch(function(error) {
+    }).catch(error => {
       popupAjaxError(error);
-      post.setProperties(initProperties);
+      this.setProperties(initProperties);
     });
   },
 
@@ -159,6 +160,7 @@ const Post = RestModel.extend({
     done elsewhere.
   **/
   setDeletedState(deletedBy) {
+    let promise;
     this.set('oldCooked', this.get('cooked'));
 
     // Moderators can delete posts. Users can only trigger a deleted at message, unless delete_removed_posts_after is 0.
@@ -169,16 +171,19 @@ const Post = RestModel.extend({
         can_delete: false
       });
     } else {
-
-      this.setProperties({
-        cooked: cook(I18n.t("post.deleted_by_author", {count: Discourse.SiteSettings.delete_removed_posts_after})),
-        can_delete: false,
-        version: this.get('version') + 1,
-        can_recover: true,
-        can_edit: false,
-        user_deleted: true
+      promise = cookAsync(I18n.t("post.deleted_by_author", {count: Discourse.SiteSettings.delete_removed_posts_after})).then(cooked => {
+        this.setProperties({
+          cooked: cooked,
+          can_delete: false,
+          version: this.get('version') + 1,
+          can_recover: true,
+          can_edit: false,
+          user_deleted: true
+        });
       });
     }
+
+    return promise || Em.RSVP.Promise.resolve();
   },
 
   /**
@@ -201,10 +206,11 @@ const Post = RestModel.extend({
   },
 
   destroy(deletedBy) {
-    this.setDeletedState(deletedBy);
-    return ajax("/posts/" + this.get('id'), {
-      data: { context: window.location.pathname },
-      type: 'DELETE'
+    return this.setDeletedState(deletedBy).then(()=>{
+      return ajax("/posts/" + this.get('id'), {
+        data: { context: window.location.pathname },
+        type: 'DELETE'
+      });
     });
   },
 
@@ -321,22 +327,17 @@ Post.reopenClass({
     });
   },
 
-  deleteMany(selectedPosts, selectedReplies) {
+  deleteMany(post_ids) {
     return ajax("/posts/destroy_many", {
       type: 'DELETE',
-      data: {
-        post_ids: selectedPosts.map(function(p) { return p.get('id'); }),
-        reply_post_ids: selectedReplies.map(function(p) { return p.get('id'); })
-      }
+      data: { post_ids }
     });
   },
 
-  mergePosts(selectedPosts) {
+  mergePosts(post_ids) {
     return ajax("/posts/merge_posts", {
       type: 'PUT',
-      data: { post_ids: selectedPosts.map(p => p.get('id')) }
-    }).catch(() => {
-      self.flash(I18n.t('topic.merge_posts.error'));
+      data: { post_ids }
     });
   },
 
diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6
index 0c595bb735..6c267a0e15 100644
--- a/app/assets/javascripts/discourse/models/rest.js.es6
+++ b/app/assets/javascripts/discourse/models/rest.js.es6
@@ -3,7 +3,8 @@ const RestModel = Ember.Object.extend({
   isCreated: Ember.computed.equal('__state', 'created'),
   isSaving: false,
 
-  afterUpdate: Ember.K,
+  beforeCreate() { },
+  afterUpdate() { },
 
   update(props) {
     if (this.get('isSaving')) { return Ember.RSVP.reject(); }
@@ -34,6 +35,8 @@ const RestModel = Ember.Object.extend({
 
     props = props || this.createProperties();
 
+    this.beforeCreate(props);
+
     const type = this.get('__type'),
           store = this.get('store'),
           adapter = store.adapterFor(type);
@@ -81,7 +84,7 @@ RestModel.reopenClass({
     if (!args.store) {
       const container = Discourse.__container__;
       // Ember.warn('Use `store.createRecord` to create records instead of `.create()`');
-      args.store = container.lookup('store:main');
+      args.store = container.lookup('service:store');
     }
 
     args.__munge = this.munge;
diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6
index 5b421c46be..073f6b43f9 100644
--- a/app/assets/javascripts/discourse/models/site.js.es6
+++ b/app/assets/javascripts/discourse/models/site.js.es6
@@ -54,6 +54,14 @@ const Site = RestModel.extend({
     return result;
   },
 
+  // Returns it in the correct order, by setting
+  @computed
+  categoriesList() {
+    return this.siteSettings.fixed_category_positions ?
+      this.get('categories') :
+      this.get('sortedCategories');
+  },
+
   postActionTypeById(id) {
     return this.get("postActionByIdLookup.action" + id);
   },
@@ -94,7 +102,7 @@ Site.reopenClass(Singleton, {
 
   // The current singleton will retrieve its attributes from the `PreloadStore`.
   createCurrent() {
-    const store = Discourse.__container__.lookup('store:main');
+    const store = Discourse.__container__.lookup('service:store');
     return store.createRecord('site', PreloadStore.get('site'));
   },
 
diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6
index 0d1ef7cdac..d198883b58 100644
--- a/app/assets/javascripts/discourse/models/store.js.es6
+++ b/app/assets/javascripts/discourse/models/store.js.es6
@@ -40,7 +40,8 @@ flushMap();
 
 export default Ember.Object.extend({
   _plurals: {'post-reply': 'post-replies',
-             'post-reply-history': 'post_reply_histories'},
+             'post-reply-history': 'post_reply_histories',
+             'moderation-history': 'moderation_history'},
 
   init() {
     this._super();
@@ -57,10 +58,19 @@ export default Ember.Object.extend({
 
   findAll(type, findArgs) {
     const adapter = this.adapterFor(type);
-    return adapter.findAll(this, type, findArgs).then((result) => {
+
+    let store = this;
+    return adapter.findAll(this, type, findArgs).then(result => {
       let results = this._resultSet(type, result);
       if (adapter.afterFindAll) {
-        results = adapter.afterFindAll(results);
+        results = adapter.afterFindAll(
+          results,
+          {
+            lookup(subType, id) {
+              return store._lookupSubType(subType, type, id, result);
+            }
+          }
+        );
       }
       return results;
     });
@@ -136,10 +146,12 @@ export default Ember.Object.extend({
     const self = this;
 
     return ajax(url).then(function(result) {
-      const typeName = Ember.String.underscore(self.pluralize(type)),
-            totalRows = result["total_rows_" + typeName] || result.get('totalRows'),
-            loadMoreUrl = result["load_more_" + typeName],
-            content = result[typeName].map(obj => self._hydrate(type, obj, result));
+      let typeName = Ember.String.underscore(self.pluralize(type));
+
+      let pageTarget = result.meta || result;
+      let totalRows = pageTarget["total_rows_" + typeName] || resultSet.get('totalRows');
+      let loadMoreUrl = pageTarget["load_more_" + typeName];
+      let content = result[typeName].map(obj => self._hydrate(type, obj, result));
 
       resultSet.setProperties({ totalRows, loadMoreUrl });
       resultSet.get('content').pushObjects(content);
@@ -183,12 +195,14 @@ export default Ember.Object.extend({
     const typeName = Ember.String.underscore(this.pluralize(type));
     const content = result[typeName].map(obj => this._hydrate(type, obj, result));
 
+    let pageTarget = result.meta || result;
+
     const createArgs = {
       content,
       findArgs,
-      totalRows: result["total_rows_" + typeName] || content.length,
-      loadMoreUrl: result["load_more_" + typeName],
-      refreshUrl: result['refresh_' + typeName],
+      totalRows: pageTarget["total_rows_" + typeName] || content.length,
+      loadMoreUrl: pageTarget["load_more_" + typeName],
+      refreshUrl: pageTarget['refresh_' + typeName],
       store: this,
       __type: type
     };
@@ -231,6 +245,10 @@ export default Ember.Object.extend({
       return Discourse.Category.findById(id);
     }
 
+    if (root.meta && root.meta.types) {
+      subType = root.meta.types[subType] || subType;
+    }
+
     const pluralType = this.pluralize(subType);
     const collection = root[this.pluralize(subType)];
     if (collection) {
@@ -297,7 +315,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/topic-details.js.es6 b/app/assets/javascripts/discourse/models/topic-details.js.es6
index 72ef0d0fe9..4c9fdc2c76 100644
--- a/app/assets/javascripts/discourse/models/topic-details.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-details.js.es6
@@ -18,13 +18,6 @@ const TopicDetails = RestModel.extend({
       });
     }
 
-    if (details.suggested_topics) {
-      const store = this.store;
-      details.suggested_topics = details.suggested_topics.map(function (st) {
-        return store.createRecord('topic', st);
-      });
-    }
-
     if (details.participants) {
       details.participants = details.participants.map(function (p) {
         p.topic = topic;
diff --git a/app/assets/javascripts/discourse/models/topic-list.js.es6 b/app/assets/javascripts/discourse/models/topic-list.js.es6
index b9076f078d..3e39ae5c89 100644
--- a/app/assets/javascripts/discourse/models/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-list.js.es6
@@ -140,7 +140,7 @@ TopicList.reopenClass({
   },
 
   find(filter, params) {
-    const store = Discourse.__container__.lookup('store:main');
+    const store = Discourse.__container__.lookup('service:store');
     return store.findFiltered('topicList', {filter, params});
   },
 
diff --git a/app/assets/javascripts/discourse/models/topic-timer.js.es6 b/app/assets/javascripts/discourse/models/topic-timer.js.es6
index 909ff9c365..12b2b31ce9 100644
--- a/app/assets/javascripts/discourse/models/topic-timer.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-timer.js.es6
@@ -6,8 +6,7 @@ const TopicTimer = RestModel.extend({});
 TopicTimer.reopenClass({
   updateStatus(topicId, time, basedOnLastPost, statusType, categoryId) {
     let data = {
-      time: time,
-      timezone_offset: (new Date().getTimezoneOffset()),
+      time,
       status_type: statusType
     };
 
diff --git a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
index 16513b74b1..d4c3a0354a 100644
--- a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
@@ -179,8 +179,7 @@ const TopicTrackingState = Discourse.Model.extend({
     delete this.states["t" + topic_id];
   },
 
-  // If we have a cached topic list, we can update it from our tracking
-  // information.
+  // If we have a cached topic list, we can update it from our tracking information.
   updateTopics(topics) {
     if (Em.isEmpty(topics)) { return; }
 
@@ -283,7 +282,7 @@ const TopicTrackingState = Discourse.Model.extend({
   },
 
   incrementMessageCount() {
-    this.set("messageCount", this.get("messageCount") + 1);
+    this.incrementProperty("messageCount");
   },
 
   countNew(category_id) {
@@ -358,8 +357,7 @@ const TopicTrackingState = Discourse.Model.extend({
     const states = this.states;
     const idMap = Discourse.Category.idMap();
 
-    // I am taking some shortcuts here to avoid 500 gets for
-    // a large list
+    // I am taking some shortcuts here to avoid 500 gets for a large list
     if (data) {
       _.each(data,topic => {
         var category = idMap[topic.category_id];
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index 5949766a91..69a4f9c27f 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -29,10 +29,18 @@ export function loadTopicView(topic, args) {
   });
 }
 
+export const ID_CONSTRAINT = /^\d+$/;
+
 const Topic = RestModel.extend({
   message: null,
   errorLoading: false,
 
+  @computed('last_read_post_number', 'highest_post_number')
+  visited(lastReadPostNumber, highestPostNumber) {
+    // >= to handle case where there are deleted posts at the end of the topic
+    return lastReadPostNumber >= highestPostNumber;
+  },
+
   @computed('posters.firstObject')
   creator(poster){
     return poster && poster.user;
@@ -50,11 +58,7 @@ const Topic = RestModel.extend({
 
   @computed('fancy_title')
   fancyTitle(title) {
-    // TODO: `siteSettings` should always be present, but there are places in the code
-    // that call Discourse.Topic.create instead of using the store.
-    // When the store is used, remove this.
-    const siteSettings = this.siteSettings || Discourse.SiteSettings;
-    return censor(emojiUnescape(title || ""), siteSettings.censored_words);
+    return censor(emojiUnescape(title || ""), Discourse.Site.currentProp('censored_words'));
   },
 
   // returns createdAt if there's no bumped date
@@ -98,6 +102,17 @@ const Topic = RestModel.extend({
     return newTags;
   },
 
+  @computed("suggested_topics")
+  suggestedTopics(suggestedTopics) {
+    if (suggestedTopics) {
+      const store = this.store;
+
+      return this.set('suggested_topics', suggestedTopics.map(st => {
+        return store.createRecord('topic', st);
+      }));
+    }
+  },
+
   replyCount: function() {
     return this.get('posts_count') - 1;
   }.property('posts_count'),
@@ -121,7 +136,7 @@ const Topic = RestModel.extend({
     const categoryName = this.get('categoryName');
     let category;
     if (categoryName) {
-      category = Discourse.Category.list().findBy('name', categoryName);
+      category = this.site.get('categories').findBy('name', categoryName);
     }
     this.set('category', category);
   }.observes('categoryName'),
@@ -411,6 +426,10 @@ const Topic = RestModel.extend({
     });
   },
 
+  @computed('excerpt')
+  escapedExcerpt(excerpt) {
+    return emojiUnescape(excerpt);
+  },
 
   hasExcerpt: Em.computed.notEmpty('excerpt'),
 
diff --git a/app/assets/javascripts/discourse/models/user-action.js.es6 b/app/assets/javascripts/discourse/models/user-action.js.es6
index c4d5b7a161..f10d6ee620 100644
--- a/app/assets/javascripts/discourse/models/user-action.js.es6
+++ b/app/assets/javascripts/discourse/models/user-action.js.es6
@@ -120,10 +120,10 @@ const UserAction = RestModel.extend({
     let groups = this.get("childGroups");
     if (!groups) {
       groups = {
-        likes: UserActionGroup.create({ icon: "fa fa-heart" }),
-        stars: UserActionGroup.create({ icon: "fa fa-star" }),
-        edits: UserActionGroup.create({ icon: "fa fa-pencil" }),
-        bookmarks: UserActionGroup.create({ icon: "fa fa-bookmark" })
+        likes: UserActionGroup.create({ icon: "heart" }),
+        stars: UserActionGroup.create({ icon: "star" }),
+        edits: UserActionGroup.create({ icon: "pencil" }),
+        bookmarks: UserActionGroup.create({ icon: "bookmark" })
       };
     }
     this.set("childGroups", groups);
diff --git a/app/assets/javascripts/discourse/models/user-badge.js.es6 b/app/assets/javascripts/discourse/models/user-badge.js.es6
index e3a6872432..ebf44e5efd 100644
--- a/app/assets/javascripts/discourse/models/user-badge.js.es6
+++ b/app/assets/javascripts/discourse/models/user-badge.js.es6
@@ -86,6 +86,9 @@ UserBadge.reopenClass({
     @returns {Promise} a promise that resolves to an array of `UserBadge`.
   **/
   findByUsername: function(username, options) {
+    if (!username) {
+      return Em.RSVP.resolve([]);
+    }
     var url = "/user-badges/" + username + ".json";
     if (options && options.grouped) {
       url += "?grouped=true";
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 cd552d35db..6a96803bdd 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/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index 93dce42015..9925d4798a 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -11,12 +11,13 @@ import UserBadge from 'discourse/models/user-badge';
 import UserActionStat from 'discourse/models/user-action-stat';
 import UserAction from 'discourse/models/user-action';
 import Group from 'discourse/models/group';
-import Topic from 'discourse/models/topic';
 import { emojiUnescape } from 'discourse/lib/text';
 import PreloadStore from 'preload-store';
 import { defaultHomepage } from 'discourse/lib/utilities';
 import { userPath } from 'discourse/lib/url';
 
+const isForever = dt => moment().diff(dt, 'years') < -500;
+
 const User = RestModel.extend({
 
   hasPMs: Em.computed.gt("private_messages_stats.all", 0),
@@ -179,9 +180,16 @@ const User = RestModel.extend({
   },
 
   @computed("suspended_till")
-  suspendedTillDate(suspendedTill) {
-    return longDate(suspendedTill);
-  },
+  suspendedForever: isForever,
+
+  @computed("silenced_till")
+  silencedForever: isForever,
+
+  @computed("suspended_till")
+  suspendedTillDate: longDate,
+
+  @computed("silenced_till")
+  silencedTillDate: longDate,
 
   changeUsername(new_username) {
     return ajax(userPath(`${this.get('username_lower')}/preferences/username`), {
@@ -243,7 +251,9 @@ const User = RestModel.extend({
       'notification_level_when_replying',
       'like_notification_frequency',
       'include_tl0_in_digests',
-      'theme_key'
+      'theme_key',
+      'allow_private_messages',
+      'homepage_id',
     ];
 
     if (fields) {
@@ -456,7 +466,7 @@ const User = RestModel.extend({
 
   "delete": function() {
     if (this.get('can_delete_account')) {
-      return ajax(userPath(this.get('username')), {
+      return ajax(userPath(this.get('username') + ".json"), {
         type: 'DELETE',
         data: {context: window.location.pathname}
       });
@@ -467,7 +477,7 @@ const User = RestModel.extend({
 
   dismissBanner(bannerKey) {
     this.set("dismissed_banner_key", bannerKey);
-    ajax(userPath(this.get('username')), {
+    ajax(userPath(this.get('username') + ".json"), {
       type: 'PUT',
       data: { dismissed_banner_key: bannerKey }
     });
@@ -487,38 +497,39 @@ const User = RestModel.extend({
   },
 
   summary() {
-    return ajax(userPath(`${this.get("username_lower")}/summary.json`))
-           .then(json => {
-              const summary = json["user_summary"];
-              const topicMap = {};
-              const badgeMap = {};
+    let { store } = this;
 
-              json.topics.forEach(t => topicMap[t.id] = Topic.create(t));
-              Badge.createFromJson(json).forEach(b => badgeMap[b.id] = b );
+    return ajax(userPath(`${this.get("username_lower")}/summary.json`)).then(json => {
+      const summary = json.user_summary;
+      const topicMap = {};
+      const badgeMap = {};
 
-              summary.topics = summary.topic_ids.map(id => topicMap[id]);
+      json.topics.forEach(t => topicMap[t.id] = store.createRecord('topic', t));
+      Badge.createFromJson(json).forEach(b => badgeMap[b.id] = b );
 
-              summary.replies.forEach(r => {
-                r.topic = topicMap[r.topic_id];
-                r.url = r.topic.urlForPostNumber(r.post_number);
-                r.createdAt = new Date(r.created_at);
-              });
+      summary.topics = summary.topic_ids.map(id => topicMap[id]);
 
-              summary.links.forEach(l => {
-                l.topic = topicMap[l.topic_id];
-                l.post_url = l.topic.urlForPostNumber(l.post_number);
-              });
+      summary.replies.forEach(r => {
+        r.topic = topicMap[r.topic_id];
+        r.url = r.topic.urlForPostNumber(r.post_number);
+        r.createdAt = new Date(r.created_at);
+      });
 
-              if (summary.badges) {
-                summary.badges = summary.badges.map(ub => {
-                  const badge = badgeMap[ub.badge_id];
-                  badge.count = ub.count;
-                  return badge;
-                });
-              }
+      summary.links.forEach(l => {
+        l.topic = topicMap[l.topic_id];
+        l.post_url = l.topic.urlForPostNumber(l.post_number);
+      });
 
-              return summary;
-           });
+      if (summary.badges) {
+        summary.badges = summary.badges.map(ub => {
+          const badge = badgeMap[ub.badge_id];
+          badge.count = ub.count;
+          return badge;
+        });
+      }
+
+      return summary;
+    });
   },
 
   canManageGroup(group) {
@@ -538,7 +549,7 @@ User.reopenClass(Singleton, {
   createCurrent() {
     const userJson = PreloadStore.get('currentUser');
     if (userJson) {
-      const store = Discourse.__container__.lookup('store:main');
+      const store = Discourse.__container__.lookup('service:store');
       return store.createRecord('user', userJson);
     }
     return null;
diff --git a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6 b/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
index 51849ef402..453ee0612b 100644
--- a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
@@ -8,17 +8,7 @@ import SearchService from 'discourse/services/search';
 import { startTracking, default as TopicTrackingState } from 'discourse/models/topic-tracking-state';
 import ScreenTrack from 'discourse/lib/screen-track';
 
-function inject() {
-  const app = arguments[0],
-        name = arguments[1],
-        singletonName = Ember.String.underscore(name).replace(/_/g, '-') + ':main';
-
-  Array.prototype.slice.call(arguments, 2).forEach(dest => app.inject(dest, name, singletonName));
-}
-
-function injectAll(app, name) {
-  inject(app, name, 'controller', 'component', 'route', 'model', 'adapter');
-}
+const ALL_TARGETS = ['controller', 'component', 'route', 'model', 'adapter'];
 
 export default {
   name: "inject-discourse-objects",
@@ -26,51 +16,62 @@ export default {
   initialize(container, app) {
     const appEvents = AppEvents.create();
     app.register('app-events:main', appEvents, { instantiate: false });
-    injectAll(app, 'appEvents');
+    ALL_TARGETS.forEach(t => app.inject(t, 'appEvents', 'app-events:main'));
     DiscourseURL.appEvents = appEvents;
 
+    // backwards compatibility: remove when plugins have updated
     app.register('store:main', Store);
-    inject(app, 'store', 'route', 'controller');
+
+    app.register('service:store', Store);
+    ALL_TARGETS.forEach(t => app.inject(t, 'store', 'service:store'));
 
     const messageBus = window.MessageBus;
     app.register('message-bus:main', messageBus, { instantiate: false });
-    injectAll(app, 'messageBus');
+    ALL_TARGETS.forEach(t => app.inject(t, 'messageBus', 'message-bus:main'));
 
     const currentUser = Discourse.User.current();
     app.register('current-user:main', currentUser, { instantiate: false });
 
     const topicTrackingState = TopicTrackingState.create({ messageBus, currentUser });
     app.register('topic-tracking-state:main', topicTrackingState, { instantiate: false });
-    injectAll(app, 'topicTrackingState');
-
-    const site = Discourse.Site.current();
-    app.register('site:main', site, { instantiate: false });
-    injectAll(app, 'site');
+    ALL_TARGETS.forEach(t => app.inject(t, 'topicTrackingState', 'topic-tracking-state:main'));
 
     const siteSettings = Discourse.SiteSettings;
     app.register('site-settings:main', siteSettings, { instantiate: false });
-    injectAll(app, 'siteSettings');
+    ALL_TARGETS.forEach(t => app.inject(t, 'siteSettings', 'site-settings:main'));
+
+    const site = Discourse.Site.current();
+    app.register('site:main', site, { instantiate: false });
+    ALL_TARGETS.forEach(t => app.inject(t, 'site', 'site:main'));
 
     app.register('search-service:main', SearchService);
-    injectAll(app, 'searchService');
+    ALL_TARGETS.forEach(t => app.inject(t, 'searchService', 'search-service:main'));
 
     const session = Session.current();
     app.register('session:main', session, { instantiate: false });
-    injectAll(app, 'session');
+    ALL_TARGETS.forEach(t => app.inject(t, 'session', 'session:main'));
+
+    const screenTrack = new ScreenTrack(
+      topicTrackingState,
+      siteSettings,
+      session,
+      currentUser
+    );
 
-    const screenTrack = new ScreenTrack(topicTrackingState, siteSettings, session, currentUser);
     app.register('screen-track:main', screenTrack, { instantiate: false });
-    inject(app, 'screenTrack', 'component', 'route');
+    ['component', 'route'].forEach(t => app.inject(t, 'screenTrack', 'screen-track:main'));
 
     if (currentUser) {
-      inject(app, 'currentUser', 'component', 'route', 'controller');
+      ['component', 'route', 'controller'].forEach(t => {
+        app.inject(t, 'currentUser', 'current-user:main');
+      });
     }
 
     app.register('location:discourse-location', DiscourseLocation);
 
     const keyValueStore = new KeyValueStore("discourse_");
     app.register('key-value-store:main', keyValueStore, { instantiate: false });
-    injectAll(app, 'keyValueStore');
+    ALL_TARGETS.forEach(t => app.inject(t, 'keyValueStore', 'key-value-store:main'));
 
     startTracking(topicTrackingState);
   }
diff --git a/app/assets/javascripts/discourse/raw-views/topic-list-header-column.js.es6 b/app/assets/javascripts/discourse/raw-views/topic-list-header-column.js.es6
index 781fdc131b..ffec7cc8bc 100644
--- a/app/assets/javascripts/discourse/raw-views/topic-list-header-column.js.es6
+++ b/app/assets/javascripts/discourse/raw-views/topic-list-header-column.js.es6
@@ -7,8 +7,8 @@ export default Ember.Object.extend({
     return I18n.t(this.name);
   }.property(),
 
-  sortClass: function(){
-    return "fa fa-chevron-" + (this.parent.ascending ? "up" : "down");
+  sortIcon: function() {
+    return "chevron-" + (this.parent.ascending ? "up" : "down");
   }.property(),
 
   isSorting: function(){
diff --git a/app/assets/javascripts/discourse/raw-views/topic-status.js.es6 b/app/assets/javascripts/discourse/raw-views/topic-status.js.es6
index e5d5befde9..8b6af94cbb 100644
--- a/app/assets/javascripts/discourse/raw-views/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/raw-views/topic-status.js.es6
@@ -1,10 +1,11 @@
 import computed from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Object.extend({
+  showDefault: null,
 
-  @computed
-  renderDiv() {
-    return this.get('statuses').length > 0 && !this.noDiv;
+  @computed('defaultIcon')
+  renderDiv(defaultIcon) {
+    return (defaultIcon || this.get('statuses').length > 0) && !this.noDiv;
   },
 
   @computed
@@ -61,6 +62,11 @@ export default Ember.Object.extend({
       }
     });
 
+    let defaultIcon = this.get('defaultIcon');
+    if (results.length === 0 && defaultIcon) {
+      this.set('showDefault', defaultIcon);
+    }
+
     return results;
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 b/app/assets/javascripts/discourse/routes/app-route-map.js.es6
index 7b6e59a895..72dca540a1 100644
--- a/app/assets/javascripts/discourse/routes/app-route-map.js.es6
+++ b/app/assets/javascripts/discourse/routes/app-route-map.js.es6
@@ -1,6 +1,7 @@
 export default function() {
   // Error page
   this.route('exception', { path: '/exception' });
+  this.route('exception-unknown', { path: '/404' });
 
   this.route('about', { path: '/about', resetNamespace: true });
 
@@ -9,7 +10,8 @@ export default function() {
     this.route('fromParams', { path: '/' });
     this.route('fromParamsNear', { path: '/:nearPost' });
   });
-  this.route('topicBySlug', { path: '/t/:slug', resetNamespace: true });
+
+  this.route('topicBySlugOrId', { path: '/t/:slugOrId', resetNamespace: true });
   this.route('topicUnsubscribe', { path: '/t/:slug/:id/unsubscribe' });
 
   this.route('discovery', { path: '/', resetNamespace: true }, function() {
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 2c800ff199..599adde72c 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,
@@ -83,6 +83,10 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
         c.error(xhrOrErr);
       }
 
+      if (xhrOrErr && xhrOrErr.status === 404) {
+        return this.transitionTo('exception-unknown');
+      }
+
       exceptionController.setProperties({ lastTransition: transition, thrown: xhrOrErr });
 
       this.intermediateTransitionTo('exception');
@@ -94,6 +98,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' });
     },
 
@@ -120,11 +125,11 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
       user clicks "No", reopenModal. If user clicks "Yes", be sure to call closeModal.
     **/
     hideModal() {
-      $('#discourse-modal').modal('hide');
+      $('.d-modal.fixed-modal').modal('hide');
     },
 
     reopenModal() {
-      $('#discourse-modal').modal('show');
+      $('.d-modal.fixed-modal').modal('show');
     },
 
     editCategory(category) {
@@ -137,11 +142,6 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
       });
     },
 
-    deleteSpammer(user) {
-      this.send('closeModal');
-      user.deleteAsSpammer(function() { window.location.reload(); });
-    },
-
     checkEmail(user) {
       user.checkEmail();
     },
diff --git a/app/assets/javascripts/discourse/routes/badges-show.js.es6 b/app/assets/javascripts/discourse/routes/badges-show.js.es6
index 3545598528..e5d1aae23c 100644
--- a/app/assets/javascripts/discourse/routes/badges-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/badges-show.js.es6
@@ -30,9 +30,20 @@ export default Discourse.Route.extend({
   afterModel(model, transition) {
     const username = transition.queryParams && transition.queryParams.username;
 
-    return UserBadge.findByBadgeId(model.get("id"), {username}).then(userBadges => {
-      this.userBadges = userBadges;
+    const userBadgesGrant = UserBadge.findByBadgeId(model.get("id"), {username}).then(userBadges => {
+      this.userBadgesGrant = userBadges;
     });
+
+    const userBadgesAll = UserBadge.findByUsername(username).then(userBadges => {
+      this.userBadgesAll = userBadges;
+    });
+
+    const promises = {
+      userBadgesGrant,
+      userBadgesAll,
+    };
+
+    return Ember.RSVP.hash(promises);
   },
 
   titleToken() {
@@ -42,8 +53,10 @@ export default Discourse.Route.extend({
     }
   },
 
+
   setupController(controller, model) {
     controller.set("model", model);
-    controller.set("userBadges", this.userBadges);
+    controller.set("userBadges", this.userBadgesGrant);
+    controller.set("userBadgesAll", this.userBadgesAll);
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/build-category-route.js.es6 b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
index 0f8fb98d39..4b29783e56 100644
--- a/app/assets/javascripts/discourse/routes/build-category-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
@@ -49,7 +49,6 @@ export default (filterArg, params) => {
         category,
         filterMode: filterMode,
         noSubcategories: params && params.no_subcategories,
-        canEditCategory: category.get('can_edit')
       });
     },
 
diff --git a/app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6 b/app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6
index 63fa6d56e8..b20e9e1b3d 100644
--- a/app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6
@@ -32,7 +32,10 @@ export default (viewName, path) => {
     },
 
     deactivate() {
-      this.searchService.set('contextType', 'private_messages');
+      this.searchService.set(
+        'searchContext',
+        this.controllerFor("user").get("model.searchContext")
+      );
     }
   });
 };
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
index d254e0e6a2..0ba2194e50 100644
--- a/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery-categories.js.es6
@@ -12,10 +12,6 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
     this.render("discovery/categories", { outlet: "list-container" });
   },
 
-  beforeModel() {
-    this.controllerFor("navigation/categories").set("filterMode", "categories");
-  },
-
   model() {
     const style = !this.site.mobileView && this.siteSettings.desktop_category_page_style;
     const parentCategory = this.get("model.parentCategory");
@@ -81,7 +77,7 @@ const DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
     controller.set("model", model);
 
     this.controllerFor("navigation/categories").setProperties({
-      canCreateCategory: model.get("can_create_category"),
+      showCategoryAdmin: model.get("can_create_category"),
       canCreateTopic: model.get("can_create_topic"),
     });
 
diff --git a/app/assets/javascripts/discourse/routes/exception-unknown.js.es6 b/app/assets/javascripts/discourse/routes/exception-unknown.js.es6
new file mode 100644
index 0000000000..a3d0778d30
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/exception-unknown.js.es6
@@ -0,0 +1,7 @@
+import UnknownRoute from 'discourse/routes/unknown';
+
+export default UnknownRoute.extend({
+  renderTemplate() {
+    this.render('unknown');
+  }
+});
diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
index 41ea9d4829..73598c948e 100644
--- a/app/assets/javascripts/discourse/routes/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
@@ -1,15 +1,14 @@
 import { ajax } from 'discourse/lib/ajax';
 import { translateResults, getSearchKey, isValidSearchTerm } from "discourse/lib/search";
-import Composer from 'discourse/models/composer';
 import PreloadStore from 'preload-store';
 import { getTransient, setTransient } from 'discourse/lib/page-tracker';
-import { getOwner } from 'discourse-common/lib/get-owner';
+import { escapeExpression } from 'discourse/lib/utilities';
 
 export default Discourse.Route.extend({
   queryParams: { q: {}, expanded: false, context_id: {}, context: {}, skip_context: {} },
 
   titleToken() {
-    return I18n.t('search.results_page');
+    return I18n.t('search.results_page', { term: escapeExpression(this.controllerFor("full-page-search").get('searchTerm')) });
   },
 
   model(params) {
@@ -47,17 +46,6 @@ export default Discourse.Route.extend({
     didTransition() {
       this.controllerFor("full-page-search")._showFooter();
       return true;
-    },
-
-    createTopic(searchTerm) {
-      let category;
-      if (searchTerm.indexOf("category:")) {
-        const match =  searchTerm.match(/category:(\S*)/);
-        if (match && match[1]) {
-          category = match[1];
-        }
-      }
-      getOwner(this).lookup('controller:composer').open({action: Composer.CREATE_TOPIC, draftKey: Composer.CREATE_TOPIC, topicCategory: category});
     }
   }
 
diff --git a/app/assets/javascripts/discourse/routes/group-activity.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-index.js.es6
similarity index 100%
rename from app/assets/javascripts/discourse/routes/group-activity.js.es6
rename to app/assets/javascripts/discourse/routes/group-activity-index.js.es6
diff --git a/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6 b/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
index 03cd7ec114..827c8c468b 100644
--- a/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-activity-posts.js.es6
@@ -6,12 +6,13 @@ export function buildGroupPage(type) {
       return I18n.t(`groups.${type}`);
     },
 
-    model() {
-      return this.modelFor("group").findPosts({ type });
+    model(params, transition) {
+      let categoryId = Ember.get(transition, 'queryParams.category_id');
+      return this.modelFor("group").findPosts({ type, categoryId });
     },
 
     setupController(controller, model) {
-      this.controllerFor('group-activity-posts').setProperties({ model, type });
+      this.controllerFor('group-activity-posts').setProperties({ model, type, canLoadMore: true });
       this.controllerFor("group").set("showing", type);
     },
 
diff --git a/app/assets/javascripts/discourse/routes/invites-show.js.es6 b/app/assets/javascripts/discourse/routes/invites-show.js.es6
index 9acc266ced..10d8515258 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/new-message.js.es6 b/app/assets/javascripts/discourse/routes/new-message.js.es6
index 85731a8e82..91269c4a5b 100644
--- a/app/assets/javascripts/discourse/routes/new-message.js.es6
+++ b/app/assets/javascripts/discourse/routes/new-message.js.es6
@@ -21,8 +21,8 @@ export default Discourse.Route.extend({
           });
         } else if (params.groupname) {
           // send a message to a group
-          Group.mentionable(params.groupname).then(result => {
-            if (result.mentionable) {
+          Group.messageable(params.groupname).then(result => {
+            if (result.messageable) {
               Ember.run.next(() => e.send("createNewMessageViaParams", params.groupname, params.title, params.body));
             } else {
               bootbox.alert(I18n.t("composer.cant_send_pm", { username: params.groupname }));
@@ -33,8 +33,12 @@ export default Discourse.Route.extend({
         }
       });
     } else {
-      this.session.set("shouldRedirectToUrl", window.location.href);
-      this.replaceWith('login');
+      $.cookie('destination_url', window.location.href);
+      if (Discourse.showingSignup) {
+        Discourse.showingSignup = false;
+      } else {
+        self.replaceWith('login');
+      }
     }
   }
 
diff --git a/app/assets/javascripts/discourse/routes/new-topic.js.es6 b/app/assets/javascripts/discourse/routes/new-topic.js.es6
index 53336a67f2..0459e75d4c 100644
--- a/app/assets/javascripts/discourse/routes/new-topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/new-topic.js.es6
@@ -13,8 +13,13 @@ export default Discourse.Route.extend({
       });
     } else {
       // User is not logged in
-      self.session.set("shouldRedirectToUrl", window.location.href);
-      self.replaceWith('login');
+      $.cookie('destination_url', window.location.href);
+      if (Discourse.showingSignup) {
+        // We're showing the sign up modal
+        Discourse.showingSignup = false;
+      } else {
+        self.replaceWith('login');
+      }
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/tags-show.js.es6 b/app/assets/javascripts/discourse/routes/tags-show.js.es6
index db344ef884..eec3a6b362 100644
--- a/app/assets/javascripts/discourse/routes/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/tags-show.js.es6
@@ -1,6 +1,7 @@
 import Composer from 'discourse/models/composer';
 import showModal from "discourse/lib/show-modal";
 import { findTopicList } from 'discourse/routes/build-topic-route';
+import PermissionType from 'discourse/models/permission-type';
 
 export default Discourse.Route.extend({
   navMode: 'latest',
@@ -62,8 +63,10 @@ export default Discourse.Route.extend({
       } else {
         params.filter = `tags/c/${categorySlug}/${tag_id}/l/${filter}`;
       }
-
-      this.set('category', category);
+      if (category) {
+        category.setupGroupsAndPermissions();
+        this.set('category', category);
+      }
     } else if (this.get("additionalTags")) {
       params.filter = `tags/intersection/${tag_id}/${this.get('additionalTags').join('/')}`;
       this.set('category', null);
@@ -72,10 +75,13 @@ export default Discourse.Route.extend({
       this.set('category', null);
     }
 
-    return findTopicList(this.store, this.topicTrackingState, params.filter, params, {}).then(function(list) {
-      controller.set('list', list);
-      controller.set('canCreateTopic', list.get('can_create_topic'));
-      controller.set('loading', false);
+    return findTopicList(this.store, this.topicTrackingState, params.filter, params, {}).then((list) => {
+      controller.setProperties({
+        list: list,
+        canCreateTopic: list.get('can_create_topic'),
+        loading: false,
+        canCreateTopicOnCategory: this.get('category.permission') === PermissionType.FULL
+      });
     });
   },
 
diff --git a/app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js.es6 b/app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js.es6
new file mode 100644
index 0000000000..6fcc92151a
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/topic-by-slug-or-id.js.es6
@@ -0,0 +1,16 @@
+import { default as Topic, ID_CONSTRAINT } from 'discourse/models/topic';
+import DiscourseURL from 'discourse/lib/url';
+
+export default Discourse.Route.extend({
+  model(params) {
+    if (params.slugOrId.match(ID_CONSTRAINT)) {
+      return { url: `/t/topic/${params.slugOrId}` };
+    } else {
+      return Topic.idForSlug(params.slugOrId);
+    }
+  },
+
+  afterModel(result) {
+    DiscourseURL.routeTo(result.url, { replaceURL: true });
+  }
+});
diff --git a/app/assets/javascripts/discourse/routes/topic-by-slug.js.es6 b/app/assets/javascripts/discourse/routes/topic-by-slug.js.es6
deleted file mode 100644
index fc402e43c9..0000000000
--- a/app/assets/javascripts/discourse/routes/topic-by-slug.js.es6
+++ /dev/null
@@ -1,12 +0,0 @@
-import Topic from 'discourse/models/topic';
-import DiscourseURL from 'discourse/lib/url';
-
-export default Discourse.Route.extend({
-  model: function(params) {
-    return Topic.idForSlug(params.slug);
-  },
-
-  afterModel: function(result) {
-    DiscourseURL.routeTo(result.url, { replaceURL: true });
-  }
-});
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index 7f05b9f3eb..9cc709d197 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -1,4 +1,5 @@
 import DiscourseURL from 'discourse/lib/url';
+import { ID_CONSTRAINT } from 'discourse/models/topic';
 
 let isTransitioning = false,
     scheduledReplace = null,
@@ -19,11 +20,11 @@ const TopicRoute = Discourse.Route.extend({
   titleToken() {
     const model = this.modelFor('topic');
     if (model) {
-      const result = model.get('unicode_title') ? model.get('unicode_title') : model.get('title'),
+      const result = model.get('unicode_title') || model.get('title'),
             cat = model.get('category');
 
       // Only display uncategorized in the title tag if it was renamed
-      if (cat && !(cat.get('isUncategorizedCategory') && cat.get('name').toLowerCase() === "uncategorized")) {
+      if (this.siteSettings.topic_page_title_includes_category && cat && !(cat.get('isUncategorizedCategory') && cat.get('name').toLowerCase() === "uncategorized")) {
         let catName = cat.get('name');
 
         const parentCategory = cat.get('parentCategory');
@@ -40,19 +41,20 @@ const TopicRoute = Discourse.Route.extend({
   actions: {
 
     showFlags(model) {
-      showModal('flag', { model });
-      this.controllerFor('flag').setProperties({ selected: null, flagTopic: false });
+      let controller = showModal('flag', { model });
+      controller.setProperties({ flagTopic: false });
     },
 
     showFlagTopic() {
       const model = this.modelFor('topic');
-      showModal('flag',  { model });
-      this.controllerFor('flag').setProperties({ selected: null, flagTopic: true });
+      let controller = showModal('flag',  { model });
+      controller.setProperties({ flagTopic: true });
     },
 
     showTopicStatusUpdate() {
       const model = this.modelFor('topic');
       model.set('topic_timer', Ember.Object.create(model.get('topic_timer')));
+      model.set('private_topic_timer', Ember.Object.create(model.get('private_topic_timer')));
       showModal('edit-topic-timer', { model });
       this.controllerFor('modal').set('modalClass', 'edit-topic-timer-modal');
     },
@@ -157,6 +159,10 @@ const TopicRoute = Discourse.Route.extend({
   },
 
   model(params, transition) {
+    if (params.slug.match(ID_CONSTRAINT)) {
+      return DiscourseURL.routeTo(`/t/topic/${params.slug}/${params.id}`, { replaceURL: true });
+    };
+
     const queryParams = transition.queryParams;
 
     let topic = this.modelFor('topic');
@@ -218,6 +224,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-replies.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-replies.js.es6
index 62607c9a16..f4b579b005 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-replies.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-replies.js.es6
@@ -2,5 +2,6 @@ import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
 import UserAction from "discourse/models/user-action";
 
 export default UserActivityStreamRoute.extend({
-  userActionType: UserAction.TYPES["posts"]
+  userActionType: UserAction.TYPES["posts"],
+  noContentHelpKey: 'user_activity.no_replies'
 });
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 4fbf8e4300..38cc03c2f2 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
@@ -6,7 +6,10 @@ export default Discourse.Route.extend(ViewingActionType, {
   },
 
   afterModel() {
-    return this.modelFor("user").get("stream").filterBy(this.get("userActionType"), this.get("noContentHelpKey"));
+    return this.modelFor("user").get("stream").filterBy(
+      this.get("userActionType"),
+      this.get("noContentHelpKey") || "user_activity.no_default"
+    );
   },
 
   renderTemplate() {
@@ -19,26 +22,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/routes/user-private-messages-group-archive.js.es6 b/app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js.es6
index c4f3a3d913..19d84f9b7e 100644
--- a/app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js.es6
@@ -8,6 +8,14 @@ export default createPMRoute('groups', 'private-messages-groups').extend({
       });
     },
 
+    afterModel(model) {
+      const split = model.get("filter").split('/');
+      const groupName = split[split.length-2];
+      const groups = this.modelFor("user").get("groups");
+      const group = _.first(groups.filterBy("name", groupName));
+      this.controllerFor("user-private-messages").set("group", group);
+    },
+
     setupController(controller, model) {
       this._super.apply(this, arguments);
       const split = model.get("filter").split('/');
diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs
index 480b10c0fd..67157908b4 100644
--- a/app/assets/javascripts/discourse/templates/about.hbs
+++ b/app/assets/javascripts/discourse/templates/about.hbs
@@ -14,14 +14,14 @@
         <li class="nav-item-privacy">{{#link-to 'privacy'}}{{i18n 'privacy'}}{{/link-to}}</li>
       </ul>
 
-      <section class='about'>
+      <section class='about description'>
         <h2>{{i18n 'about.title' title=model.title}}</h2>
         <p>{{model.description}}</p>
       </section>
 
       {{#if model.admins}}
         <section class='about admins'>
-          <h3>{{i18n 'about.our_admins'}}</h3>
+          <h3>{{d-icon "users"}} {{i18n 'about.our_admins'}}</h3>
 
           {{#each model.admins as |a|}}
             {{user-info user=a}}
@@ -33,7 +33,7 @@
 
       {{#if model.moderators}}
         <section class='about moderators'>
-          <h3>{{i18n 'about.our_moderators'}}</h3>
+          <h3>{{d-icon "users"}} {{i18n 'about.our_moderators'}}</h3>
 
           <div class='users'>
             {{#each model.moderators as |m|}}
@@ -45,7 +45,7 @@
       {{/if}}
 
       <section class='about stats'>
-        <h3>{{i18n 'about.stats'}}</h3>
+        <h3>{{d-icon "bar-chart"}}  {{i18n 'about.stats'}}</h3>
 
         <table class='table'>
           <tr>
@@ -89,7 +89,7 @@
 
       {{#if contactInfo}}
         <section class='about contact'>
-            <h3>{{i18n 'about.contact'}}</h3>
+            <h3>{{d-icon "envelope-o"}} {{i18n 'about.contact'}}</h3>
             <p>{{{contactInfo}}}</p>
         </section>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/application.hbs b/app/assets/javascripts/discourse/templates/application.hbs
index 6250c28d1f..dfe8853dce 100644
--- a/app/assets/javascripts/discourse/templates/application.hbs
+++ b/app/assets/javascripts/discourse/templates/application.hbs
@@ -1,12 +1,13 @@
 {{plugin-outlet name="above-site-header"}}
 {{site-header canSignUp=canSignUp
-              showCreateAccount=(action "appRouteAction" "showCreateAccount")
-              showLogin=(action "appRouteAction" "showLogin")
-              showKeyboard=(action "appRouteAction" "showKeyboardShortcutsHelp")
-              toggleMobileView=(action "appRouteAction" "toggleMobileView")
-              toggleAnonymous=(action "appRouteAction" "toggleAnonymous")
-              logout=(action "appRouteAction" "logout")}}
-{{plugin-outlet name="below-site-header"}}
+              showCreateAccount=(route-action "showCreateAccount")
+              showLogin=(route-action "showLogin")
+              showKeyboard=(route-action "showKeyboardShortcutsHelp")
+              toggleMobileView=(route-action "toggleMobileView")
+              toggleAnonymous=(route-action "toggleAnonymous")
+              logout=(route-action "logout")}}
+
+{{plugin-outlet name="below-site-header" args=(hash currentPath=currentPath)}}
 
 <div id="main-outlet" class="wrap">
   <div class="container">
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index 3ac5e04965..fab3e9a5aa 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -7,11 +7,15 @@
 
   <div class='show-badge-details'>
     {{badge-card badge=model size="large" count=userBadges.grant_count}}
-    <div class='badge-grant-info'>
+    <div class='badge-grant-info {{if hiddenSetTitle '' 'hidden'}}'>
       <div>
-        {{#if model.allow_title}}
+        {{#if canSelectTitle}}
           <div class='grant-info-item'>
             {{i18n 'badges.allow_title'}}
+            {{d-button
+                    class='btn btn-small pad-left no-text'
+                    action='toggleSetUserTitle'
+                    icon='pencil'}}
           </div>
         {{/if}}
         {{#if model.multiple_grant}}
@@ -21,6 +25,13 @@
         {{/if}}
       </div>
     </div>
+
+    {{#if canSelectTitle}}
+      <div class='badge-set-title {{if hiddenSetTitle 'hidden' ''}}'>
+        {{badge-title selectableUserBadges=selectableUserBadges user=user}}
+        <button class='btn btn-default close-btn' {{action "toggleSetUserTitle"}}>{{i18n 'close'}}</button>
+      </div>
+    {{/if}}
   </div>
 
   {{#if userBadges}}
diff --git a/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs
index efbf18a33b..3f4359aab5 100644
--- a/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs
@@ -5,7 +5,7 @@
         {{#if option.model}}
           <a href>{{category-link option.model allowUncategorized="true" link="false"}}</a>
         {{else}}
-          <a href>{{fa-icon 'tag'}}{{option.text}} x {{option.count}}</a>
+          <a href>{{d-icon 'tag'}}{{option.name}} x {{option.count}}</a>
         {{/if}}
       </li>
     {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/admin-group-selector.hbs b/app/assets/javascripts/discourse/templates/components/admin-group-selector.hbs
deleted file mode 100644
index 4856de5179..0000000000
--- a/app/assets/javascripts/discourse/templates/components/admin-group-selector.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<input type="text">
diff --git a/app/assets/javascripts/discourse/templates/components/auto-update-input.hbs b/app/assets/javascripts/discourse/templates/components/auto-update-input.hbs
deleted file mode 100644
index 1e6fbe778b..0000000000
--- a/app/assets/javascripts/discourse/templates/components/auto-update-input.hbs
+++ /dev/null
@@ -1,52 +0,0 @@
-<div class="auto-update-input">
-  <div class="control-group">
-    <label>{{i18n "topic.topic_status_update.when"}}</label>
-
-    {{auto-update-input-selector
-        valueAttribute="id"
-        minimumResultsForSearch=-1
-        statusType=statusType
-        value=selection
-        input=input
-        width="50%"
-        none="topic.auto_update_input.none"}}
-  </div>
-
-  {{#if isCustom}}
-    <div class="control-group">
-      {{fa-icon "calendar"}} {{date-picker-future value=date defaultDate=date}}
-    </div>
-
-    <div class="control-group">
-      {{fa-icon "clock-o"}}
-      {{input type="time" value=time}}
-    </div>
-  {{/if}}
-
-  {{#if isBasedOnLastPost}}
-    <div class="control-group">
-      <label>
-        {{i18n 'topic.topic_status_update.num_of_hours'}}
-        {{text-field value=input type="number"}}
-      </label>
-    </div>
-
-    {{#if willCloseImmediately}}
-      <div class="warning">
-        {{fa-icon "warning"}}
-        {{willCloseI18n}}
-      </div>
-    {{/if}}
-  {{/if}}
-
-  {{#if showTopicStatusInfo}}
-    <div class="alert alert-info">
-      {{topic-timer-info
-          statusType=statusType
-          executeAt=executeAt
-          basedOnLastPost=basedOnLastPost
-          duration=duration
-          categoryId=categoryId}}
-    </div>
-  {{/if}}
-</div>
diff --git a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
index 89c46363e3..b43cbb0d56 100644
--- a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
@@ -1,5 +1,5 @@
 <label class="btn" disabled={{uploading}} title="{{i18n 'user.change_avatar.upload_title'}}">
-  {{fa-icon "picture-o"}}&nbsp;{{uploadButtonText}}
+  {{d-icon "picture-o"}}&nbsp;{{uploadButtonText}}
   <input disabled={{uploading}} type="file" accept="image/*" style="visibility: hidden; position: absolute;" />
 </label>
 {{#if uploading}}
diff --git a/app/assets/javascripts/discourse/templates/components/badge-card.hbs b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
index 93d3c490b6..3c519d85dd 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-card.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
@@ -2,7 +2,7 @@
   <span class='grant-count' title={{i18n 'badges.granted' count=displayCount}}>{{displayCount}}</span>
 {{/if}}
 {{#if badge.has_badge}}
-  <span class='check-display status-checked'>{{fa-icon "check"}}</span>
+  <span class='check-display status-checked'>{{d-icon "check"}}</span>
 {{/if}}
 <div class='badge-contents'>
   <div class='badge-icon {{badge.badgeTypeClassName}}'>
diff --git a/app/assets/javascripts/discourse/templates/components/badge-title.hbs b/app/assets/javascripts/discourse/templates/components/badge-title.hbs
new file mode 100644
index 0000000000..8101829c4d
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/badge-title.hbs
@@ -0,0 +1,25 @@
+<section class='user-content'>
+  <form class="form-horizontal">
+
+    <div class="control-group">
+      <div class="controls">
+        <h3>{{i18n 'badges.select_badge_for_title'}}</h3>
+      </div>
+    </div>
+
+    <div class="control-group">
+      <label class="control-label"></label>
+      <div class="controls">
+        {{combo-box value=selectedUserBadgeId nameProperty="badge.name" content=selectableUserBadges}}
+      </div>
+    </div>
+
+    <div class="control-group">
+      <div class="controls">
+        <button class="btn btn-primary" disabled={{disableSave}} {{action "save"}}> {{savingStatus}} </button>
+        {{#if saved}}{{i18n 'saved'}}{{/if}}
+      </div>
+    </div>
+
+  </form>
+</section>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs
index c837733c18..1a32cea92d 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-and-latest-topics.hbs
@@ -1,29 +1,7 @@
-{{categories-only categories=categories}}
+<div class='column categories'>
+  {{categories-only categories=categories}}
+</div>
 
-<table class="topic-list topic-list-latest">
-  <thead>
-    <tr>
-      <th class="latest">{{i18n "filters.latest.title"}}</th>
-    </tr>
-  </thead>
-  <tbody>
-    {{#if topics}}
-      {{#each topics as |t|}}
-        {{latest-topic-list-item topic=t}}
-      {{/each}}
-      <tr class="more-topics">
-        <td>
-          <a href="/latest" class="btn pull-right">{{i18n "more"}}</a>
-        </td>
-      </tr>
-    {{else}}
-      <tr class="no-topics">
-        <td>
-          <h3>{{i18n "topics.none.latest"}}</h3>
-        </td>
-      </tr>
-    {{/if}}
-  </tbody>
-</table>
-
-<div class="clearfix"></div>
+<div class='column'>
+  {{latest-topic-list topics=topics}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
index 8909e8a9ba..434e18fe62 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
@@ -9,7 +9,7 @@
 
           <h3>
             {{#if c.read_restricted}}
-              {{fa-icon 'lock'}}
+              {{d-icon 'lock'}}
             {{/if}}
             {{c.name}}
           </h3>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index 3bb4fde665..c473668648 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -9,7 +9,7 @@
 
           <h3>
             {{#if c.read_restricted}}
-              {{fa-icon 'lock'}}
+              {{d-icon 'lock'}}
             {{/if}}
             {{c.name}}
           </h3>
diff --git a/app/assets/javascripts/discourse/templates/components/category-drop.hbs b/app/assets/javascripts/discourse/templates/components/category-drop.hbs
index 9e9cc410e5..ba5062a429 100644
--- a/app/assets/javascripts/discourse/templates/components/category-drop.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-drop.hbs
@@ -1,21 +1,23 @@
 {{#if category}}
-  <a href {{action "expand"}} class="badge-category" style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>
+  <a href {{action "expand"}} class="dropdown-header" style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>
     <span class="badge-category-bg" style={{categoryColor}}></span>
     {{#if category.read_restricted}}
-      {{fa-icon "lock"}}
+      {{d-icon "lock"}}
     {{/if}}
-    {{category.name}}
+    <span class='d-label'>{{category.name}}</span>
   </a>
 {{else}}
   {{#if noSubcategories}}
-    <a href {{action "expand"}} class='badge-category home' style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>{{i18n 'categories.no_subcategory'}}</a>
+    <a href {{action "expand"}} class='dropdown-header home' style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>{{i18n 'categories.no_subcategory'}}</a>
   {{else}}
-    <a href {{action "expand"}} class='badge-category home' style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>{{allCategoriesLabel}}</a>
+    <a href {{action "expand"}} class='dropdown-header home' style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>{{allCategoriesLabel}}</a>
   {{/if}}
 {{/if}}
 
 {{#if categories}}
-  <a href {{action "expand"}} class={{dropdownButtonClass}} style={{badgeStyle}}><i class={{iconClass}}></i></a>
+  <a href {{action "expand"}} class={{dropdownButtonClass}} style={{badgeStyle}}>
+    {{d-icon expandIcon}}
+  </a>
   <section class="{{unless expanded 'hidden'}} category-dropdown-menu chooser">
     <div class='cat'><a href={{allCategoriesUrl}} data-drop-close="true" class='badge-category home'>{{allCategoriesLabel}}</a></div>
     {{#if subCategory}}
diff --git a/app/assets/javascripts/discourse/templates/components/category-selector.hbs b/app/assets/javascripts/discourse/templates/components/category-selector.hbs
deleted file mode 100644
index a265ef5f12..0000000000
--- a/app/assets/javascripts/discourse/templates/components/category-selector.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<input class='category-selector' type='text' name='categories'>
diff --git a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs b/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
index 49e3b088f1..fcb0bdeb07 100644
--- a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
@@ -1,6 +1,6 @@
 <a href={{category.url}}>
   {{#if category.read_restricted}}
-    {{fa-icon 'lock'}}
+    {{d-icon 'lock'}}
   {{/if}}
 
   <span class="category-name">{{category.name}}</span>
diff --git a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
index 46daaeb10e..006cd5eddc 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
@@ -5,36 +5,16 @@
            markdownOptions=markdownOptions
            extraButtons="extraButtons"
            importQuote="importQuote"
-           toggleOptions="toggleOptions"
            showUploadModal="showUploadModal"
            togglePreview="togglePreview"
            validation=validation
            loading=composer.loading
            forcePreview=forcePreview
-           composerEvents=true}}
+           composerEvents=true
+           onExpandPopupMenuOptions="onExpandPopupMenuOptions"
+           onPopupMenuAction=onPopupMenuAction
+           popupMenuOptions=popupMenuOptions}}
 
-<div class="composer-bottom-right">
-  {{#if site.mobileView}}
+{{#if site.mobileView}}
     <input type="file" id="mobile-uploader" multiple />
-    <a class="mobile-file-upload {{if isUploading 'hidden'}}">{{i18n 'upload'}}</a>
-
-    {{#if showPreview}}
-      {{d-button action='togglePreview' class='hide-preview' label='composer.hide_preview'}}
-    {{/if}}
-  {{else}}
-    <a href {{action "togglePreview"}} class='toggle-preview'>{{{toggleText}}}</a>
-  {{/if}}
-
-  {{#if isUploading}}
-    <div id="file-uploading">
-      {{loading-spinner size="small"}} {{i18n 'upload_selector.uploading'}}
-      {{uploadProgress}}%
-      {{#if isCancellable}}
-        <a href id="cancel-file-upload" {{action "cancelUpload"}}>{{fa-icon "times"}}</a>
-      {{/if}}
-    </div>
-  {{/if}}
-  <div id='draft-status' class="{{if isUploading 'hidden'}}">
-    {{draftStatus}}
-  </div>
-</div>
+{{/if}}
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 0000000000..93263ae3cb
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/composer-toggles.hbs
@@ -0,0 +1,14 @@
+<div class="composer-controls">
+  {{#if site.mobileView}}
+    {{flat-button
+      class="toggle-toolbar"
+      icon="bars"
+      action=toggleToolbar}}
+  {{/if}}
+
+  {{flat-button
+    class="toggler"
+    icon=toggleIcon
+    action=toggleComposer
+    title=title}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
index 402416a1d6..99fc0a5b97 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
@@ -2,7 +2,7 @@
   {{user-selector topicId=topicId
                   onChangeCallback='triggerResize'
                   id="private-message-users"
-                  includeMentionableGroups='true'
+                  includeMessageableGroups='true'
                   class="span8"
                   placeholderKey="composer.users_placeholder"
                   tabindex="1"
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 0000000000..1732a78191
--- /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/create-topic-button.hbs b/app/assets/javascripts/discourse/templates/components/create-topic-button.hbs
new file mode 100644
index 0000000000..ee1172ffe2
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/create-topic-button.hbs
@@ -0,0 +1,9 @@
+{{#if canCreateTopic}}
+  {{d-button
+    id="create-topic"
+    class="btn btn-default"
+    action=action
+    icon="plus"
+    disabled=disabled
+    label="topic.create"}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs b/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
index a29839a790..859433546c 100644
--- a/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
@@ -1,5 +1,5 @@
 <label class="btn" disabled={{uploadButtonDisabled}}>
-  {{fa-icon "upload"}}&nbsp;{{uploadButtonText}}
+  {{d-icon "upload"}}&nbsp;{{uploadButtonText}}
   <input disabled={{uploading}} type="file" accept=".csv" style="visibility: hidden; position: absolute;" />
 </label>
 {{#if uploading}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-button.hbs b/app/assets/javascripts/discourse/templates/components/d-button.hbs
index 47b714b8dc..755e4ea857 100644
--- a/app/assets/javascripts/discourse/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-button.hbs
@@ -1,6 +1,9 @@
 {{#if icon}}
-  {{fa-icon icon}}
+  {{d-icon icon}}
+{{/if}}
+
+{{#if translatedLabel}}
+  <span class='d-button-label'>{{{translatedLabel}}}{{#if ellipsis}}&hellip;{{/if}}</span>
 {{/if}}
 
-{{{translatedLabel}}}
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-checkbox.hbs b/app/assets/javascripts/discourse/templates/components/d-checkbox.hbs
index f39a68e79c..8ec5979a1f 100644
--- a/app/assets/javascripts/discourse/templates/components/d-checkbox.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-checkbox.hbs
@@ -1,2 +1,2 @@
-<input type='checkbox'>
+<input type='checkbox' disabled={{disabled}}>
 {{i18n label}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index dacde9aa74..6133b28f8f 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -1,4 +1,5 @@
 <div class='d-editor-overlay hidden'></div>
+
 <div class='d-editor-modals'>
   {{#d-editor-modal class="insert-link" hidden=insertLinkHidden okAction="insertLink"}}
     <h3>{{i18n "composer.link_dialog_title"}}</h3>
@@ -8,19 +9,35 @@
 </div>
 
 <div class='d-editor-container'>
-  <div class='d-editor-button-bar'>
-    {{#each toolbar.groups as |group|}}
-      {{#each group.buttons as |b|}}
-        {{d-button action=b.action actionParam=b translatedTitle=b.title label=b.label icon=b.icon class=b.className}}
-      {{/each}}
-      {{#unless group.lastGroup}}
-        <div class='d-editor-spacer'></div>
-      {{/unless}}
-    {{/each}}
-  </div>
-  <div class='d-editor-preview-header'></div>
-
   <div class="d-editor-textarea-wrapper">
+    <div class='d-editor-button-bar'>
+      {{#each toolbar.groups as |group|}}
+        {{#each group.buttons as |b|}}
+          {{#if b.popupMenu}}
+            {{toolbar-popup-menu-options
+              onPopupMenuAction=onPopupMenuAction
+              onExpand=(action b.action b)
+              title=b.title
+              headerIcon=b.icon
+              class=b.className
+              content=popupMenuOptions}}
+          {{else}}
+            {{d-button
+              action=b.action
+              actionParam=b
+              translatedTitle=b.title
+              label=b.label
+              icon=b.icon
+              class=b.className}}
+          {{/if}}
+        {{/each}}
+
+        {{#unless group.lastGroup}}
+          <div class='d-editor-spacer'></div>
+        {{/unless}}
+      {{/each}}
+    </div>
+
     {{conditional-loading-spinner condition=loading}}
     {{textarea tabindex=tabindex value=value class="d-editor-input" placeholder=placeholderTranslated}}
     {{popup-input-tip validation=validation}}
@@ -30,5 +47,8 @@
     <div class="d-editor-preview">
       {{{preview}}}
     </div>
+      {{plugin-outlet name="editor-preview" classNames="d-editor-plugin"}}
   </div>
 </div>
+
+{{emoji-picker active=emojiPickerIsActive emojiSelected=(action 'emojiSelected')}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-modal-cancel.hbs b/app/assets/javascripts/discourse/templates/components/d-modal-cancel.hbs
new file mode 100644
index 0000000000..e4fc5950d9
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/d-modal-cancel.hbs
@@ -0,0 +1 @@
+<a {{action close}} class='d-modal-cancel'>{{i18n 'cancel'}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
new file mode 100644
index 0000000000..8ed28a6a0e
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
@@ -0,0 +1,24 @@
+<div class="modal-outer-container">
+  <div class="modal-middle-container">
+    <div class="modal-inner-container">
+      <div class="modal-header">
+        <div class='modal-close'>
+          <a class="close" {{action closeModal}}>{{d-icon "times"}}</a>
+        </div>
+
+        <h3>{{title}}</h3>
+      </div>
+
+      <div id='modal-alert'></div>
+
+      {{yield}}
+
+      {{#each errors as |error|}}
+        <div class="alert alert-error">
+          <button class="close" data-dismiss="alert">×</button>
+          {{error}}
+        </div>
+      {{/each}}
+    </div>
+  </div>
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/d-navigation.hbs b/app/assets/javascripts/discourse/templates/components/d-navigation.hbs
new file mode 100644
index 0000000000..6f8c71f524
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/d-navigation.hbs
@@ -0,0 +1,26 @@
+{{bread-crumbs categories=categories category=category noSubcategories=noSubcategories}}
+
+{{#if showCategoryAdmin}}
+  {{categories-admin-dropdown
+    create=createCategory
+    reorder=reorderCategories}}
+{{/if}}
+
+{{navigation-bar navItems=navItems filterMode=filterMode category=category}}
+
+{{#if showCategoryNotifications}}
+  {{category-notifications-button value=category.notification_level category=category}}
+{{/if}}
+
+{{create-topic-button
+  canCreateTopic=canCreateTopic
+  action=createTopic
+  disabled=createTopicDisabled}}
+
+{{#if showCategoryEdit}}
+  {{d-button
+    class="btn-default edit-category"
+    action=editCategory
+    icon="wrench"
+    label="category.edit_long"}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/date-picker.hbs b/app/assets/javascripts/discourse/templates/components/date-picker.hbs
index d49379d954..6e6054c2ad 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/directory-item.hbs b/app/assets/javascripts/discourse/templates/components/directory-item.hbs
index 4b1d9a940e..e7758227f4 100644
--- a/app/assets/javascripts/discourse/templates/components/directory-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/directory-item.hbs
@@ -7,5 +7,5 @@
 <td>{{number item.posts_read}}</td>
 <td>{{number item.days_visited}}</td>
 {{#if showTimeRead}}
-  <td><span class='time-read'>{{unbound item.time_read}}</span></td>
+  <td><span class='time-read'>{{format-duration item.time_read}}</span></td>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/disabled-icon.hbs b/app/assets/javascripts/discourse/templates/components/disabled-icon.hbs
index b7749fecee..100849f312 100644
--- a/app/assets/javascripts/discourse/templates/components/disabled-icon.hbs
+++ b/app/assets/javascripts/discourse/templates/components/disabled-icon.hbs
@@ -1,5 +1,5 @@
-{{fa-icon icon modifier="stack-2x"}}
+{{d-icon icon modifier="stack-2x"}}
 
 {{#if disabled}}
-  {{fa-icon "ban" modifier="stack-2x"}}
+  {{d-icon "ban" modifier="stack-2x"}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index b46760d5c1..d7e0c5e1d4 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -1,7 +1,9 @@
 {{#if visible}}
   <div class="row">
     <div id="banner" class={{overlay}}>
-      <div class="close" {{action "dismiss"}}><i class="fa fa-times" title="{{i18n 'banner.close'}}"></i></div>
+      <div class="close" {{action "dismiss"}}>
+        {{d-icon "times" title="banner.close"}}
+      </div>
       <div id="banner-content">
         {{{banner.html}}}
         {{#if currentUser.staff}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index 734ad2b4c7..c31406819a 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -19,7 +19,13 @@
         {{/each}}
       {{else}}
         <label>{{i18n 'category.parent'}}</label>
-        {{category-chooser valueAttribute="id" value=category.parent_category_id categories=parentCategories rootNone=true allowUncategorized="true"}}
+        {{category-chooser
+          none="category.none"
+          value=category.parent_category_id
+          excludeCategoryId=category.id
+          categories=parentCategories
+          allowSubCategories=false
+          allowUncategorized=false}}
       {{/if}}
     </section>
   {{/if}}
@@ -33,28 +39,30 @@
         {{i18n 'category.no_description'}}
       {{/if}}
       {{#if category.topic_url}}
-        <br/>
+        <br>
         {{d-button class="btn-small" action="showCategoryTopic" icon="pencil" label="category.change_in_category_topic"}}
       {{/if}}
     </section>
   {{/if}}
 
-  <section class='field'>
-    <label>{{i18n 'category.badge_colors'}}</label>
-    <div class="category-color-editor">
-      {{{categoryBadgePreview}}}
+  {{#unless noCategoryStyle}}
+    <section class='field'>
+      <label>{{i18n 'category.badge_colors'}}</label>
+      <div class="category-color-editor">
+        {{{categoryBadgePreview}}}
 
-      <div class='input-prepend input-append' style="margin-top: 10px;">
-        <span class='color-title'>{{i18n 'category.background_color'}}:</span>
-        <span class='add-on'>#</span>{{text-field value=category.color placeholderKey="category.color_placeholder" maxlength="6"}}
-        {{color-picker colors=backgroundColors usedColors=usedBackgroundColors value=category.color}}
-      </div>
+        <div class='input-prepend input-append' style="margin-top: 10px;">
+          <span class='color-title'>{{i18n 'category.background_color'}}:</span>
+          <span class='add-on'>#</span>{{text-field value=category.color placeholderKey="category.color_placeholder" maxlength="6"}}
+          {{color-picker colors=backgroundColors usedColors=usedBackgroundColors value=category.color}}
+        </div>
 
-      <div class='input-prepend input-append'>
-        <span class='color-title'>{{i18n 'category.foreground_color'}}:</span>
-        <span class='add-on'>#</span>{{text-field value=category.text_color placeholderKey="category.color_placeholder" maxlength="6"}}
-        {{color-picker colors=foregroundColors value=category.text_color id='edit-text-color'}}
+        <div class='input-prepend input-append'>
+          <span class='color-title'>{{i18n 'category.foreground_color'}}:</span>
+          <span class='add-on'>#</span>{{text-field value=category.text_color placeholderKey="category.color_placeholder" maxlength="6"}}
+          {{color-picker colors=foregroundColors value=category.text_color id='edit-text-color'}}
+        </div>
       </div>
-    </div>
-  </section>
+    </section>
+  {{/unless}}
 </form>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
index 760863befe..ad078cda2f 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -9,21 +9,30 @@
         {{{i18n "category.can"}}}
         <span class="permission">{{p.permission.description}}</span>
         {{#if editingPermissions}}
-        <a href {{action "removePermission" p}}>{{fa-icon "times-circle"}}</a>
+        <a class="remove-permission" href {{action "removePermission" p}}>{{d-icon "times-circle"}}</a>
         {{/if}}
       </li>
     {{/each}}
   </ul>
   {{#if editingPermissions}}
-    {{combo-box content=category.availableGroups value=selectedGroup}}
-    {{combo-box class="permission-selector"
-                nameProperty="description"
-                content=category.availablePermissions
-                value=selectedPermission}}
-    <button {{action "addPermission" selectedGroup selectedPermission}} class="btn btn-small">{{i18n 'category.add_permission'}}</button>
+    {{#if category.availableGroups}}
+      {{combo-box class="available-groups"
+                  allowInitialValueMutation=true
+                  allowContentReplacement=true
+                  content=category.availableGroups
+                  value=selectedGroup}}
+      {{combo-box allowInitialValueMutation=true
+                  class="permission-selector"
+                  nameProperty="description"
+                  content=category.availablePermissions
+                  value=selectedPermission}}
+      <button {{action "addPermission" selectedGroup selectedPermission}} class="btn btn-small add-permission">
+        {{i18n 'category.add_permission'}}
+      </button>
+    {{/if}}
   {{else}}
     {{#unless category.is_special}}
-      <button {{action "editPermissions"}} class="btn btn-small">{{i18n 'category.edit_permissions'}}</button>
+      <button {{action "editPermissions"}} class="btn btn-small edit-permission">{{i18n 'category.edit_permissions'}}</button>
     {{/unless}}
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
index ddfb1ce11b..fa7b2a5653 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -47,25 +47,31 @@
 <section class="field default-view-field">
   <label>
     {{i18n "category.default_view"}}
-    {{combo-box valueAttribute="value" content=availableViews value=category.default_view}}
   </label>
+  <div class="controls">
+    {{combo-box valueAttribute="value" content=availableViews value=category.default_view}}
+  </div>
 </section>
 
 <section class="field default-top-period-field">
   <label>
     {{i18n "category.default_top_period"}}
-    {{combo-box valueAttribute="value" content=availableTopPeriods value=category.default_top_period}}
   </label>
+  <div class="controls">
+    {{combo-box valueAttribute="value" content=availableTopPeriods value=category.default_top_period}}
+  </div>
 </section>
 
 <section class="field">
   <label>
     {{i18n "category.sort_order"}}
-    {{combo-box valueAttribute="value" content=availableSorts value=category.sort_order none="category.sort_options.default"}}
-    {{#unless isDefaultSortOrder}}
-      {{combo-box valueAttribute="value" content=sortAscendingOptions value=category.sort_ascending none="category.sort_options.default"}}
-    {{/unless}}
   </label>
+  <div class="controls">
+  {{combo-box valueAttribute="value" content=availableSorts value=category.sort_order none="category.sort_options.default"}}
+  {{#unless isDefaultSortOrder}}
+    {{combo-box valueAttribute="value" content=sortAscendingOptions value=category.sort_ascending none="category.sort_options.default"}}
+  {{/unless}}
+    </div>
 </section>
 
 <section class="field num-featured-topics-fields">
@@ -107,12 +113,19 @@
 
     <section class='field'>
       <label>
-        {{fa-icon "envelope-o"}}
+        {{d-icon "envelope-o"}}
         {{i18n 'category.email_in'}}
         {{text-field class="email-in" value=category.email_in}}
       </label>
     </section>
 
+    <section class='field'>
+        <label>
+          {{input type="checkbox" checked=category.mailinglist_mirror}}
+          {{i18n 'category.mailinglist_mirror'}}
+        </label>
+    </section>
+
   {{plugin-outlet name="category-email-in" args=(hash category=category)}}
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs b/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
new file mode 100644
index 0000000000..f90534931b
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
@@ -0,0 +1,36 @@
+<form>
+  <div class="control-group">
+    {{combo-box class="timer-type" allowInitialValueMutation=true content=timerTypes value=selection}}
+  </div>
+
+  <div>
+    {{#if showTimeOnly}}
+      {{future-date-input
+          input=topicTimer.updateTime
+          statusType=selection
+          includeWeekend=true
+          basedOnLastPost=false}}
+    {{else if publishToCategory}}
+      <div class="control-group">
+        <label>{{i18n 'topic.topic_status_update.publish_to'}}</label>
+        {{category-chooser
+          value=topicTimer.category_id
+          excludeCategoryId=excludeCategoryId}}
+      </div>
+
+      {{future-date-input
+          input=topicTimer.updateTime
+          statusType=selection
+          includeWeekend=true
+          categoryId=topicTimer.category_id
+          basedOnLastPost=false}}
+    {{else if autoClose}}
+      {{future-date-input
+          input=topicTimer.updateTime
+          statusType=selection
+          includeWeekend=true
+          basedOnLastPost=topicTimer.based_on_last_post
+          lastPostedAt=model.last_posted_at}}
+    {{/if}}
+  </div>
+</form>
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 0000000000..a5a525b4f1
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs
@@ -0,0 +1,2 @@
+<div class='emoji-picker'></div>
+<div class='emoji-picker-modal'></div>
diff --git a/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs b/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
index 1fb6a26eac..85ad4157bb 100644
--- a/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
@@ -1,6 +1,6 @@
 {{text-field name="name" placeholderKey="admin.emoji.name" value=name}}
 <label class="btn btn-primary {{if addDisabled 'disabled'}}">
-  {{fa-icon "plus"}}
+  {{d-icon "plus"}}
   {{i18n 'admin.emoji.add'}}
   <input disabled={{addDisabled}} type="file" accept=".png,.gif" style="visibility: hidden; position: absolute;" />
 </label>
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 0000000000..63716b696c
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/expand-post.hbs
@@ -0,0 +1,11 @@
+{{#if item.truncated}}
+  {{#if expanded}}
+    <a class="collapse-item" onclick={{action "toggleItem"}} title={{i18n "post.expand_collapse"}}>
+      {{d-icon "chevron-up"}}
+    </a>
+  {{else}}
+    <a class="expand-item" onclick={{action "toggleItem"}} title={{i18n "post.expand_collapse"}}>
+      {{d-icon "chevron-down"}}
+    </a>
+  {{/if}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
index 8138a72954..8802d1c9b2 100644
--- a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
@@ -1,11 +1,17 @@
 {{#if isNotifyUser}}
   <h3>{{formattedName}}</h3>
   <div class='controls'>
-    <label class='radio'><input type='radio' id="radio_{{unbound flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'> <span class='description'>{{{flag.description}}}</span></label>
-    {{#if showMessageInput}}
-      {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
-      <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
-    {{/if}}
+    <label class='radio'>
+      <input type='radio' id="radio_{{unbound flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
+
+      <div class='flag-action-type-details'>
+        <span class='description'>{{{flag.description}}}</span>
+        {{#if showMessageInput}}
+          {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
+          <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
+        {{/if}}
+      </div>
+    </label>
   </div>
   {{#if staffFlagsAvailable}}
     <hr>
@@ -14,14 +20,17 @@
 {{else}}
   <div class='controls'>
     <label class='radio'>
-      <input type='radio' id="radio_{{unbound flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'> <strong>{{formattedName}}</strong>
-      {{#if showDescription}}
-        <div class='description'>{{{description}}}</div>
-      {{/if}}
+      <input type='radio' id="radio_{{unbound flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
+      <div class='flag-action-type-details'>
+        <strong>{{formattedName}}</strong>
+        {{#if showDescription}}
+          <div class='description'>{{{description}}}</div>
+        {{/if}}
+        {{#if showMessageInput}}
+          {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
+          <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
+        {{/if}}
+      </div>
     </label>
-    {{#if showMessageInput}}
-      {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
-      <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
-    {{/if}}
   </div>
 {{/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 0000000000..5c8be2b5ea
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/flat-button.hbs
@@ -0,0 +1 @@
+{{d-icon icon}}
diff --git a/app/assets/javascripts/discourse/templates/components/footer-message.hbs b/app/assets/javascripts/discourse/templates/components/footer-message.hbs
new file mode 100644
index 0000000000..65e3a460df
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/footer-message.hbs
@@ -0,0 +1,5 @@
+{{#if education}}<div class="education">{{{education}}}</div>{{/if}}
+<h3>
+  {{message}}
+  {{yield}}
+</h3>
diff --git a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
new file mode 100644
index 0000000000..b509f19d76
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
@@ -0,0 +1,51 @@
+<div class="future-date-input">
+  <div class="control-group">
+    <label>{{displayLabel}}</label>
+    {{future-date-input-selector
+        minimumResultsForSearch=-1
+        statusType=statusType
+        value=selection
+        input=input
+        includeWeekend=includeWeekend
+        includeFarFuture=includeFarFuture
+        none="topic.auto_update_input.none"}}
+  </div>
+
+  {{#if isCustom}}
+    <div class="control-group">
+      {{d-icon "calendar"}} {{date-picker-future value=date defaultDate=date}}
+    </div>
+
+    <div class="control-group">
+      {{d-icon "clock-o"}}
+      {{input type="time" value=time}}
+    </div>
+  {{/if}}
+
+  {{#if isBasedOnLastPost}}
+    <div class="control-group">
+      <label>
+        {{i18n 'topic.topic_status_update.num_of_hours'}}
+        {{text-field value=input type="number"}}
+      </label>
+    </div>
+
+    {{#if willCloseImmediately}}
+      <div class="warning">
+        {{d-icon "warning"}}
+        {{willCloseI18n}}
+      </div>
+    {{/if}}
+  {{/if}}
+
+  {{#if showTopicStatusInfo}}
+    <div class="alert alert-info">
+      {{topic-timer-info
+          statusType=statusType
+          executeAt=executeAt
+          basedOnLastPost=basedOnLastPost
+          duration=duration
+          categoryId=categoryId}}
+    </div>
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/google-search.hbs b/app/assets/javascripts/discourse/templates/components/google-search.hbs
new file mode 100644
index 0000000000..766bf3a908
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/google-search.hbs
@@ -0,0 +1,7 @@
+<div>
+  <form action='//google.com/search' id='google-search'>
+    <input type="text" name="q" value="{{searchTerm}}">
+    <input type='hidden' name="as_sitesearch" value="{{siteUrl}}">
+    <button class="btn btn-primary">{{i18n 'search.search_google_button'}}</button>
+  </form>
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/group-activity-filter.hbs b/app/assets/javascripts/discourse/templates/components/group-activity-filter.hbs
new file mode 100644
index 0000000000..68623d09c8
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/group-activity-filter.hbs
@@ -0,0 +1,3 @@
+{{#link-to (concat 'group.activity.' filter) (query-params category_id=categoryId)}}
+  {{i18n (concat 'groups.' filter)}}
+{{/link-to}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-logs-filter.hbs b/app/assets/javascripts/discourse/templates/components/group-logs-filter.hbs
index 11c1eb7b55..f9f13474c7 100644
--- a/app/assets/javascripts/discourse/templates/components/group-logs-filter.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-logs-filter.hbs
@@ -1,6 +1,6 @@
 {{#if value}}
   {{#d-button class="btn-small group-logs-filter" action="clearFilter" actionParam=type}}
     <span>{{label}}</span>: {{filterText}}
-    {{fa-icon "times-circle"}}
+    {{d-icon "times-circle"}}
   {{/d-button}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-logs-row.hbs b/app/assets/javascripts/discourse/templates/components/group-logs-row.hbs
index 31d6303995..6fe9bfd858 100644
--- a/app/assets/javascripts/discourse/templates/components/group-logs-row.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-logs-row.hbs
@@ -36,9 +36,9 @@
   <td {{action "toggleDetails"}} class="group-logs-expand-details">
     {{#if log.prev_value}}
       {{#if expandDetails}}
-        {{fa-icon 'ellipsis-v'}}
+        {{d-icon 'ellipsis-v'}}
       {{else}}
-        {{fa-icon 'ellipsis-h'}}
+        {{d-icon 'ellipsis-h'}}
       {{/if}}
     {{/if}}
   </td>
diff --git a/app/assets/javascripts/discourse/templates/components/group-member.hbs b/app/assets/javascripts/discourse/templates/components/group-member.hbs
index d476fdf033..ddc6456b83 100644
--- a/app/assets/javascripts/discourse/templates/components/group-member.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-member.hbs
@@ -1 +1 @@
-<a href={{member.adminPath}}>{{avatar member imageSize="small"}}</a> {{member.username}} {{#unless automatic}}<a class='remove' {{action "remove"}}>{{fa-icon "times"}}</a>{{/unless}}
+<a href={{member.adminPath}}>{{avatar member imageSize="small"}}</a> {{member.username}} {{#unless automatic}}<a class='remove' {{action "remove"}}>{{d-icon "times"}}</a>{{/unless}}
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 c720c630f5..ad66499dbb 100644
--- a/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
@@ -1,23 +1,30 @@
 <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"}}>{{d-icon "fast-backward"}}</a>
+    {{currentPage}}/{{totalPages}}
+    <a class="next {{if showingLast 'disabled'}}" {{action "next"}}>{{d-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">
-    {{user-selector usernames=model.usernames}}
+    {{user-selector usernames=model.usernames
+          placeholderKey="admin.groups.selector_placeholder"
+          id="member-selector"}}
 
-    {{d-button action="addMembers"
-        class="add"
-        icon="plus"
-        disabled=disableAddButton
-        label="groups.edit.add_members"}}
+    {{#if addButton}}
+      {{d-button action="addMembers"
+          class="add"
+          icon="plus"
+          disabled=disableAddButton
+          label="groups.edit.add_members"}}
+    {{/if}}
   </div>
 {{/unless}}
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 ed17b2a79b..8240f372f9 100644
--- a/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
@@ -1,17 +1,15 @@
 {{#if canJoinGroup}}
-  {{#if userIsGroupUser}}
-    {{d-button action="leaveGroup"
-        class="btn-danger group-index-leave"
-        icon="minus"
-        label="groups.leave"
-        disabled=updatingMembership}}
-  {{else}}
-    {{d-button action="joinGroup"
-        class="group-index-join"
-        icon="plus"
-        label="groups.join"
-        disabled=updatingMembership}}
-  {{/if}}
+  {{d-button action="joinGroup"
+      class="group-index-join"
+      icon="user-plus"
+      label="groups.join"
+      disabled=updatingMembership}}
+{{else if canLeaveGroup}}
+  {{d-button action="leaveGroup"
+      class="btn-danger group-index-leave"
+      icon="user-times"
+      label="groups.leave"
+      disabled=updatingMembership}}
 {{else if model.allow_membership_requests}}
   {{#if userIsGroupUser}}
     {{#if showMembershipStatus}}
@@ -22,10 +20,10 @@
           disabled=true}}
     {{/if}}
   {{else}}
-    {{d-button action="requestMembership"
+    {{d-button action="showRequestMembershipForm"
         class="group-index-request"
         disabled=loading
-        icon="envelope"
+        icon="user-plus"
         label="groups.request"}}
 
     {{#if loading}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-navigation.hbs b/app/assets/javascripts/discourse/templates/components/group-navigation.hbs
new file mode 100644
index 0000000000..8501e9e2f5
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/group-navigation.hbs
@@ -0,0 +1,11 @@
+{{#mobile-nav class='group-nav' desktopClass="nav nav-pills" currentPath=currentPath}}
+  {{#each availableTabs as |tab|}}
+    <li>
+      {{#link-to tab.route group title=tab.message class=tab.name}}
+        {{#if tab.icon}}{{d-icon tab.icon}}{{/if}}
+        {{tab.message}}
+        {{#if tab.count}}<span class='count'>({{tab.count}})</span>{{/if}}
+      {{/link-to}}
+    </li>
+  {{/each}}
+{{/mobile-nav}}
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 a67a93d4e5..0000000000
--- 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 09ac259ce2..9f51a1584f 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -1,18 +1,32 @@
-<div class='item'>
-  <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>
-    <span class="title">
-      <a href={{post.url}}>{{{post.topic.fancyTitle}}}</a>
-    </span>
-    <span class="category">{{category-link post.category}}</span>
-    <div class="group-member-info">
+<div class='group-post-header'>
+  <div class='group-post-avatar'>
+    <a href="{{unbound post.user.userUrl}}" data-user-card="{{unbound post.user.username}}" class='avatar-link'>
+      {{avatar post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}
+    </a>
+  </div>
+  <div class='group-post-info'>
+    <div class="group-post-topic">
+      <div class='group-post-title'>
+        <a href={{post.url}}>{{{post.topic.fancyTitle}}}</a>
+      </div>
+      <div class="group-post-category">{{category-link post.category}}</div>
       {{#if post.user.name}}
-        <span class="name">{{post.user.name}}</span>{{#if post.user.title}}<span class="title">, {{post.user.title}}</span>{{/if}}
+        <div class="group-member-info">
+          <span class="name">{{post.user.name}}</span>
+          {{#if post.user.title}}<span class="title">, {{post.user.title}}</span>{{/if}}
+        </div>
       {{/if}}
     </div>
+    <div class='group-post-controls'>
+      {{expand-post item=post}}
+      <span class='time'>{{format-date post.created_at leaveAgo="true"}}</span>
+    </div>
   </div>
-  <p class='excerpt'>
-  {{{unbound post.excerpt}}}
-  </p>
+</div>
+<div class='group-post-excerpt'>
+  {{#if post.expandedExcerpt}}
+    {{{post.expandedExcerpt}}}
+  {{else}}
+    {{{post.excerpt}}}
+  {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
index 14f0695fd2..5a12cff39b 100644
--- a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
@@ -1,11 +1,11 @@
 <div class="uploaded-image-preview input-xxlarge" style={{backgroundStyle}}>
   <div class="image-upload-controls">
     <label class="btn pad-left no-text {{if uploading 'disabled'}}">
-      {{fa-icon "picture-o"}}
+      {{d-icon "picture-o"}}
       <input disabled={{uploading}} type="file" accept="image/*" style="visibility: hidden; position: absolute;" />
     </label>
     {{#if backgroundStyle}}
-      <button {{action "trash"}} class="btn btn-danger pad-left no-text">{{fa-icon "trash-o"}}</button>
+      <button {{action "trash"}} class="btn btn-danger pad-left no-text">{{d-icon "trash-o"}}</button>
     {{/if}}
     <span class="btn {{unless uploading 'hidden'}}">{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 35d5afd0bb..7fc97aeb05 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -1,12 +1,13 @@
 {{#if ip}}
   <button class="btn" {{action "lookup"}}>
-    {{fa-icon "globe"}}{{i18n 'admin.user.ip_lookup'}}
+    {{d-icon "globe"}}{{i18n 'admin.user.ip_lookup'}}
   </button>
 {{/if}}
 {{#if show}}
   <div class="location-box">
-    <a class="close pull-right" {{action "hide"}}>{{fa-icon "times"}}</a>
+    <a class="close pull-right" {{action "hide"}}>{{d-icon "times"}}</a>
     <h4>{{i18n 'ip_lookup.title'}}</h4>
+    <p class='powered-by'>{{{i18n 'ip_lookup.powered_by'}}}</p>
     <dl>
       {{#if location}}
         {{#if location.hostname}}
@@ -42,7 +43,7 @@
         <strong>{{totalOthersWithSameIP}}</strong>
         {{#if other_accounts.length}}
           <button class="btn btn-danger pull-right" {{action "deleteOtherAccounts"}}>
-            {{fa-icon "warning"}}{{i18n 'ip_lookup.delete_other_accounts' count=otherAccountsToDelete}}
+            {{d-icon "warning"}}{{i18n 'ip_lookup.delete_other_accounts' count=otherAccountsToDelete}}
           </button>
         {{/if}}
       </dt>
diff --git a/app/assets/javascripts/discourse/templates/components/latest-topic-list-contents.hbs b/app/assets/javascripts/discourse/templates/components/latest-topic-list-contents.hbs
new file mode 100644
index 0000000000..33b8ec95b9
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/latest-topic-list-contents.hbs
@@ -0,0 +1,3 @@
+{{#each topics as |t|}}
+  {{latest-topic-list-item topic=t}}
+{{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
index ab80c70c21..a3666f6842 100644
--- a/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
@@ -1,33 +1,25 @@
-<table>
-  <tbody>
-    <tr data-topic-id={{topic.id}} class="{{if topic.archived 'archived'}}">
-      <td class="topic-poster">
-        {{#with topic.lastPoster as |lastPoster|}}
-          {{#user-link user=lastPoster}}
-            {{avatar lastPoster imageSize="large"}}
-          {{/user-link}}
-        {{/with}}
-      </td>
-      <td class="main-link">
-        <tr>
-          {{raw "topic-status" topic=topic}}
-          {{topic-link topic}}
-          {{#if topic.featured_link}}
-            {{topic-featured-link topic}}
-          {{/if}}
-          {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
-        </tr>
-        <tr>
-          {{category-link topic.category}}
-          {{discourse-tags topic mode="list"}}
-        </tr>
-      </td>
-      <td class="topic-stats">
-        {{raw "list/posts-count-column" topic=topic tagName="div"}}
-        <div class="topic-last-activity">
-          <a href="{{topic.lastPostUrl}}" title="{{topic.bumpedAtTitle}}">{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a>
-        </div>
-      </td>
-    </tr>
-  </tbody>
-</table>
+<div class='topic-poster'>
+  {{#user-link user=topic.lastPoster}}
+    {{avatar topic.lastPoster imageSize="large"}}
+  {{/user-link}}
+</div>
+<div class='main-link'>
+  <div class='top-row'>
+    {{raw "topic-status" topic=topic}}
+    {{topic-link topic}}
+    {{#if topic.featured_link}}
+      {{topic-featured-link topic}}
+    {{/if}}
+    {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
+  </div>
+  <div class='bottom-row'>
+    {{category-link topic.category}}
+    {{discourse-tags topic mode="list"}}
+  </div>
+</div>
+<div class='topic-stats'>
+  {{raw "list/posts-count-column" topic=topic tagName="div"}}
+  <div class="topic-last-activity">
+    <a href="{{topic.lastPostUrl}}" title="{{topic.bumpedAtTitle}}">{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a>
+  </div>
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/latest-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/latest-topic-list.hbs
new file mode 100644
index 0000000000..2390a154ab
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/latest-topic-list.hbs
@@ -0,0 +1,14 @@
+<div class='table-heading'>
+  {{i18n "filters.latest.title"}}
+</div>
+
+{{#if topics}}
+  {{latest-topic-list-contents topics=topics tagName=""}}
+  <div class="more-topics">
+    <a href="/latest" class="btn pull-right">{{i18n "more"}}</a>
+  </div>
+{{else}}
+  <div class='no-topics'>
+    <h3>{{i18n "topics.none.latest"}}</h3>
+  </div>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/list-setting.hbs b/app/assets/javascripts/discourse/templates/components/list-setting.hbs
deleted file mode 100644
index 830982fc47..0000000000
--- a/app/assets/javascripts/discourse/templates/components/list-setting.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="input-setting-list">
-    <input type="text" value="{{unbound settingValue}}">
-</div>
diff --git a/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs b/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs
index 256ab2af04..0808efcc6d 100644
--- a/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs
@@ -1,5 +1,5 @@
 {{#each navItems as |navItem|}}
-  {{navigation-item content=navItem filterMode=filterMode}}
+  {{navigation-item content=navItem filterMode=filterMode category=category}}
 {{/each}}
 {{custom-html name="extraNavItem" tagName="li"}}
 {{!- this is done to avoid DIV in the UL, originally {{plugin-outlet name="extra-nav-item"}}
diff --git a/app/assets/javascripts/discourse/templates/components/period-chooser.hbs b/app/assets/javascripts/discourse/templates/components/period-chooser.hbs
index 3defac6a02..ce4d6066c5 100644
--- a/app/assets/javascripts/discourse/templates/components/period-chooser.hbs
+++ b/app/assets/javascripts/discourse/templates/components/period-chooser.hbs
@@ -1,5 +1,5 @@
 <h2>{{period-title period showDateRange=true}}</h2>
-<button>{{fa-icon "caret-down"}}</button>
+<button>{{d-icon "caret-down"}}</button>
 
 <div id='period-popup' class="{{unless showPeriods 'hidden'}} period-popup">
   <ul>
diff --git a/app/assets/javascripts/discourse/templates/components/queued-post.hbs b/app/assets/javascripts/discourse/templates/components/queued-post.hbs
index 6ddd37b864..de2709ca4a 100644
--- a/app/assets/javascripts/discourse/templates/components/queued-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/queued-post.hbs
@@ -10,8 +10,8 @@
         {{#user-link user=post.user}}
           {{post.user.username}}
         {{/user-link}}
-        {{#if post.user.blocked}}
-        <i class='fa fa-ban' title='{{i18n "user.blocked_tooltip"}}'></i>
+        {{#if post.user.silenced}}
+          {{d-icon "ban" title="user.silenced_tooltip"}}
         {{/if}}
       </span>
     </div>
@@ -20,24 +20,41 @@
     </div>
     <div class='clearfix'></div>
 
-    <span class='post-title'>
-      {{i18n "queue.topic"}}
-      {{#if post.topic}}
-        {{topic-link post.topic}}
-      {{else}}
-        {{post.post_options.title}}
-      {{/if}}
-      {{category-badge post.category}}
-    </span>
+    {{#if editTitleAndCategory}}
+      <span class="edit-title">
+        {{text-field value=buffered.title maxlength=siteSettings.max_topic_title_length}}
+      </span>
+      {{category-chooser value=buffered.category_id}}
+    {{else}}
+      <span class='post-title'>
+        {{i18n "queue.topic"}}
+        {{#if post.topic}}
+          {{topic-link post.topic}}
+        {{else}}
+          {{editables.title}}
+        {{/if}}
+        {{category-badge editables.category}}
+      </span>
+    {{/if}}
 
     <div class='body'>
       {{#if editing}}
         {{d-editor value=buffered.raw}}
       {{else}}
-        {{{cook-text post.raw}}}
+        {{cook-text editables.raw}}
       {{/if}}
     </div>
 
+    {{#if showTags}}
+      <div class="list-tags">
+        {{#each tags as |t|}}
+          {{discourse-tag t}}
+        {{/each}}
+      </div>
+    {{else if editTags}}
+      {{tag-chooser tags=buffered.tags categoryId=buffered.category_id width='100%'}}
+    {{/if}}
+
     <div class='queue-controls'>
       {{#if editing}}
         {{d-button action="confirmEdit"
diff --git a/app/assets/javascripts/discourse/templates/components/quote-button.hbs b/app/assets/javascripts/discourse/templates/components/quote-button.hbs
index 1dce9fb288..163e768ec0 100644
--- a/app/assets/javascripts/discourse/templates/components/quote-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/quote-button.hbs
@@ -1 +1 @@
-{{i18n "post.quote_reply"}}
+{{d-icon "quote-left"}} <span class='quote-label'>{{i18n "post.quote_reply"}}</span>
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 71a9c1b619..f53a0e0c50 100644
--- a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
+++ b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
@@ -13,7 +13,7 @@
   <div class="control-group pull-left">
     <label class="control-label" for="search-in-category">{{i18n "search.advanced.in_category.label"}}</label>
     <div class="controls">
-      {{category-selector categories=searchedTerms.category single="true" canReceiveUpdates="true"}}
+      {{search-advanced-category-chooser value=searchedTerms.category}}
     </div>
   </div>
 </div>
@@ -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>
@@ -50,11 +53,13 @@
   <div class="control-group pull-left">
     <label class="control-label" for="search-in-options">{{i18n "search.advanced.filters.label"}}</label>
     <div class="controls">
-      <section class='field'>
-        <label>{{input type="checkbox" class="in-likes" checked=searchedTerms.special.in.likes}} {{i18n "search.advanced.filters.likes"}}</label>
-        <label>{{input type="checkbox" class="in-private" checked=searchedTerms.special.in.private}} {{i18n "search.advanced.filters.private"}}</label>
-        <label>{{input type="checkbox" class="in-seen" checked=searchedTerms.special.in.seen}} {{i18n "search.advanced.filters.seen"}}</label>
-      </section>
+      {{#if currentUser}}
+        <section class='field'>
+          <label>{{input type="checkbox" class="in-likes" checked=searchedTerms.special.in.likes}} {{i18n "search.advanced.filters.likes"}}</label>
+          <label>{{input type="checkbox" class="in-private" checked=searchedTerms.special.in.private}} {{i18n "search.advanced.filters.private"}}</label>
+          <label>{{input type="checkbox" class="in-seen" checked=searchedTerms.special.in.seen}} {{i18n "search.advanced.filters.seen"}}</label>
+        </section>
+      {{/if}}
       {{combo-box id="in" valueAttribute="value" content=inOptions value=searchedTerms.in none="user.locale.any"}}
     </div>
   </div>
@@ -69,9 +74,9 @@
 <div class="container">
   <div class="control-group pull-left">
     <label class="control-label" for="search-post-date">{{i18n "search.advanced.post.time.label"}}</label>
-    <div class="controls">
+    <div class="controls full-search-dates">
       {{combo-box id="postTime" valueAttribute="value" content=postTimeOptions value=searchedTerms.time.when}}
-      {{input type="date" value=searchedTerms.time.days class="input-small" id='search-post-date'}}
+      {{date-picker value=searchedTerms.time.days id="search-post-date"}}
     </div>
   </div>
   <div class="control-group pull-left">
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index b6f77b67c3..ad3dc852dd 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -16,13 +16,13 @@
 {{#if topic.details.can_reply_as_new_topic}}
   <div class='reply-as-new-topic'>
     {{#if topic.isPrivateMessage}}
-      <a href {{action "replyAsNewTopic"}} aria-label={{i18n 'post.reply_as_new_private_message'}} title={{i18n 'post.reply_as_new_private_message'}}>{{fa-icon "plus"}}{{i18n 'user.new_private_message'}}</a>
+      <a href {{action "replyAsNewTopic"}} aria-label={{i18n 'post.reply_as_new_private_message'}} title={{i18n 'post.reply_as_new_private_message'}}>{{d-icon "plus"}}{{i18n 'user.new_private_message'}}</a>
     {{else}}
-      <a href {{action "replyAsNewTopic"}} aria-label={{i18n 'post.reply_as_new_topic'}} title={{i18n 'post.reply_as_new_topic'}}>{{fa-icon "plus"}}{{i18n 'topic.create'}}</a>
+      <a href {{action "replyAsNewTopic"}} aria-label={{i18n 'post.reply_as_new_topic'}} title={{i18n 'post.reply_as_new_topic'}}>{{d-icon "plus"}}{{i18n 'topic.create'}}</a>
     {{/if}}
   </div>
 {{/if}}
 
 <div class='link'>
-  <a href {{action "close"}} class="close-share" aria-label={{i18n 'share.close'}} title={{i18n 'share.close'}}>{{fa-icon "close"}}</a>
+  <a href {{action "close"}} class="close-share" aria-label={{i18n 'share.close'}} title={{i18n 'share.close'}}>{{d-icon "close"}}</a>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/share-source.hbs b/app/assets/javascripts/discourse/templates/components/share-source.hbs
index 64242d17fe..185f80ab9c 100644
--- a/app/assets/javascripts/discourse/templates/components/share-source.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-source.hbs
@@ -1,6 +1,6 @@
 <a href {{action "share" source}} title="{{unbound source.title}}" aria-label="{{unbound source.title}}" >
-  {{#if source.faIcon}}
-    <i class="fa {{source.faIcon}}"></i>
+  {{#if source.icon}}
+    {{d-icon source.icon}}
   {{else}}
     {{{source.htmlIcon}}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/small-action.hbs b/app/assets/javascripts/discourse/templates/components/small-action.hbs
deleted file mode 100644
index 821ed4ff91..0000000000
--- a/app/assets/javascripts/discourse/templates/components/small-action.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class='small-action-desc'>
-  {{#if post}}
-    {{#if post.can_delete}}
-      <button {{action "delete"}} title={{i18n "post.controls.delete"}}>{{fa-icon "times"}}</button>
-    {{/if}}
-    {{#if post.can_edit}}
-      <button {{action "edit"}} title={{i18n "post.controls.edit"}}>{{fa-icon "pencil"}}</button>
-    {{/if}}
-    <a href={{post.usernameUrl}} data-user-card={{post.username}}>
-      {{avatar post imageSize="small"}}
-    </a>
-  {{/if}}
-</div>
diff --git a/app/assets/javascripts/discourse/templates/components/stream-item.hbs b/app/assets/javascripts/discourse/templates/components/stream-item.hbs
deleted file mode 100644
index fed530753e..0000000000
--- a/app/assets/javascripts/discourse/templates/components/stream-item.hbs
+++ /dev/null
@@ -1,32 +0,0 @@
-<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>
-  {{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>
-  {{plugin-outlet name="user-stream-item-header" args=(hash item=item)}}
-</div>
-
-{{#if actionDescription}}
-  <p class='excerpt'>{{actionDescription}}</p>
-{{/if}}
-
-<p class='excerpt' data-topic-id="{{item.topic_id}}" data-post-id="{{item.post_id}}" data-user-id="{{item.user_id}}">{{{item.excerpt}}}</p>
-
-{{#each item.children as |child|}}
-  <div class='child-actions'>
-    <i class="icon {{child.icon}}"></i>
-    {{#each child.items as |grandChild|}}
-      {{#if grandChild.removableBookmark}}
-        <button class="btn btn-default remove-bookmark" {{action "removeBookmark" grandChild}}>
-          {{fa-icon 'times'}} {{i18n "bookmarks.remove"}}
-        </button>
-      {{else}}
-          <a href={{grandChild.userUrl}} data-user-card={{grandChild.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true" avatarTemplatePath="acting_avatar_template"}}</div></a>
-          {{#if grandChild.edit_reason}} &mdash; <span class="edit-reason">{{grandChild.edit_reason}}</span>{{/if}}
-      {{/if}}
-    {{/each}}
-  </div>
-{{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
new file mode 100644
index 0000000000..76127f2bf5
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/suggested-topics.hbs
@@ -0,0 +1,12 @@
+<h3>{{{suggestedTitle}}}</h3>
+<div class="topics">
+  {{#if topic.isPrivateMessage}}
+    {{basic-topic-list
+      hideCategory="true"
+      showPosters="true"
+      topics=topic.suggestedTopics}}
+  {{else}}
+    {{basic-topic-list topics=topic.suggestedTopics}}
+  {{/if}}
+</div>
+<h3 class='suggested-topics-message'>{{{browseMoreMessage}}}</h3>
diff --git a/app/assets/javascripts/discourse/templates/components/tag-drop.hbs b/app/assets/javascripts/discourse/templates/components/tag-drop.hbs
index 833ab89590..8dc8869f6f 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-drop.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-drop.hbs
@@ -1,19 +1,21 @@
 {{#if showTagDropdown}}
   {{#if tagId}}
     {{#if noTagsSelected}}
-      <a href {{action "expand"}} class="badge-category {{tagClass}} home">{{noTagsLabel}}</a>
+      <a href {{action "expand"}} class="dropdown-header {{tagClass}} home">{{noTagsLabel}}</a>
     {{else}}
-      <a href {{action "expand"}} class="badge-category {{tagClass}}">{{tagId}}</a>
+      <a href {{action "expand"}} class="dropdown-header {{tagClass}}">{{tagId}}</a>
     {{/if}}
   {{else}}
-    <a href {{action "expand"}} class="badge-category {{tagClass}} home">{{allTagsLabel}}</a>
+    <a href {{action "expand"}} class="dropdown-header {{tagClass}} home">{{allTagsLabel}}</a>
   {{/if}}
 
   {{#if tags}}
-    <a href {{action "expand"}} class={{dropdownButtonClass}}><i class={{iconClass}}></i></a>
+    <a href {{action "expand"}} class={{dropdownButtonClass}}>
+      {{d-icon expandedIcon}}
+    </a>
     <section class="{{unless expanded 'hidden'}} category-dropdown-menu chooser">
-      <div class='cat'><a href={{allTagsUrl}} data-drop-close="true" class='badge-category home'>{{allTagsLabel}}</a></div>
-      <div class='cat'><a href={{noTagsUrl}}  data-drop-close="true" class='badge-category home'>{{noTagsLabel}}</a></div>
+      <div class='cat'><a href={{allTagsUrl}} data-drop-close="true" class='dropdown-header home'>{{allTagsLabel}}</a></div>
+      <div class='cat'><a href={{noTagsUrl}}  data-drop-close="true" class='dropdown-header home'>{{noTagsLabel}}</a></div>
       {{#if renderTags}}
         {{#each tags as |t|}}
           <div class='cat'>
diff --git a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
index 399ac0bdaf..b62feb185e 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
@@ -1,7 +1,7 @@
 {{#d-button action="enterTop" class="full jump-top"}}
-  {{fa-icon 'caret-up'}} {{{topDate}}}
+  {{d-icon 'caret-up'}} {{{topDate}}}
 {{/d-button}}
 
-{{#d-button action="enterBottom" class="full jump-button"}}
-  {{{bottomDate}}} {{fa-icon 'caret-down'}}
+{{#d-button action="enterBottom" class="full jump-bottom"}}
+  {{{bottomDate}}} {{d-icon 'caret-down'}}
 {{/d-button}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
index 7e28cc0f9a..3af1dba017 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
@@ -1,83 +1,87 @@
-{{#if showAdminButton}}
-  {{topic-admin-menu-button
-    topic=topic
-    openUpwards="true"
-    toggleMultiSelect=toggleMultiSelect
-    deleteTopic=deleteTopic
-    recoverTopic=recoverTopic
-    toggleClosed=toggleClosed
-    toggleArchived=toggleArchived
-    toggleVisibility=toggleVisibility
-    showTopicStatusUpdate=showTopicStatusUpdate
-    showFeatureTopic=showFeatureTopic
-    showChangeTimestamp=showChangeTimestamp
-    convertToPublicTopic=convertToPublicTopic
-    convertToPrivateMessage=convertToPrivateMessage}}
-{{/if}}
-
-{{#unless topic.isPrivateMessage}}
-  {{#if site.mobileView}}
-    {{topic-footer-mobile-dropdown topic=topic
-                                   showInvite=showInvite
-                                   showFlagTopic=showFlagTopic}}
-  {{else}}
-    {{d-button class=bookmarkClass
-               title=bookmarkTitle
-               label=bookmarkLabel
-               icon="bookmark"
-               action=toggleBookmark}}
-
-    <button class="btn share" data-share-url={{topic.shareUrl}} title={{i18n "topic.share.help"}}>
-      {{fa-icon "link"}}
-      {{i18n "topic.share.title"}}
-    </button>
-
-    {{#if topic.details.can_flag_topic}}
-      {{d-button class="flag-topic"
-                 title="topic.flag_topic.help"
-                 label="topic.flag_topic.title"
-                 icon="flag"
-                 action=showFlagTopic}}
-    {{/if}}
-
+<div class='topic-footer-main-buttons'>
+  {{#if showAdminButton}}
+    {{topic-admin-menu-button
+      topic=topic
+      openUpwards="true"
+      toggleMultiSelect=toggleMultiSelect
+      deleteTopic=deleteTopic
+      recoverTopic=recoverTopic
+      toggleClosed=toggleClosed
+      toggleArchived=toggleArchived
+      toggleVisibility=toggleVisibility
+      showTopicStatusUpdate=showTopicStatusUpdate
+      showFeatureTopic=showFeatureTopic
+      showChangeTimestamp=showChangeTimestamp
+      convertToPublicTopic=convertToPublicTopic
+      convertToPrivateMessage=convertToPrivateMessage}}
   {{/if}}
-{{/unless}}
 
-{{#if canInviteTo}}
-  {{d-button class="invite-topic"
-             title="topic.invite_reply.help"
-             label="topic.invite_reply.title"
-             icon="users"
-             action=showInvite
-             disabled=inviteDisabled}}
-{{/if}}
+  {{#unless topic.isPrivateMessage}}
+    {{#if site.mobileView}}
+      {{topic-footer-mobile-dropdown topic=topic
+                                     showInvite=showInvite
+                                     showFlagTopic=showFlagTopic}}
+    {{else}}
+      {{d-button class=bookmarkClass
+                 title=bookmarkTitle
+                 label=bookmarkLabel
+                 icon="bookmark"
+                 action=toggleBookmark}}
 
-{{#if topic.isPrivateMessage}}
-  {{d-button class="standard"
-             title=archiveTitle
-             label=archiveLabel
-             icon=archiveIcon
-             action=toggleArchiveMessage}}
-{{/if}}
+      {{share-button url=topic.shareUrl}}
 
-{{plugin-outlet name="topic-footer-main-buttons-before-create"
-                args=(hash topic=topic)
-                connectorTagName="span"}}
+      {{#if topic.details.can_flag_topic}}
+        {{d-button class="flag-topic"
+                   title="topic.flag_topic.help"
+                   label="topic.flag_topic.title"
+                   icon="flag"
+                   action=showFlagTopic}}
+      {{/if}}
 
-{{#if topic.details.can_create_post}}
-  {{d-button class="btn-primary create"
-             icon="reply"
-             action=replyToPost
-             label="topic.reply.title"
-             title="topic.reply.help"}}
-{{/if}}
+    {{/if}}
+  {{/unless}}
 
-{{plugin-outlet name="after-topic-footer-main-buttons"
-                args=(hash topic=topic)
-                connectorTagName="span"}}
+  {{#if canInviteTo}}
+    {{d-button class="invite-topic"
+               title="topic.invite_reply.help"
+               label="topic.invite_reply.title"
+               icon="users"
+               action=showInvite
+               disabled=inviteDisabled}}
+  {{/if}}
+
+  {{#if topic.isPrivateMessage}}
+    {{d-button class="standard"
+               title=archiveTitle
+               label=archiveLabel
+               icon=archiveIcon
+               action=toggleArchiveMessage}}
+  {{/if}}
+
+  {{plugin-outlet name="topic-footer-main-buttons-before-create"
+                  args=(hash topic=topic)
+                  tagName=""
+                  connectorTagName="span"}}
+
+  {{#if topic.details.can_create_post}}
+    {{d-button class="btn-primary create"
+               icon="reply"
+               action=replyToPost
+               label="topic.reply.title"
+               title="topic.reply.help"}}
+  {{/if}}
+
+  {{plugin-outlet name="after-topic-footer-main-buttons"
+                  args=(hash topic=topic)
+                  tagName=""
+                  connectorTagName="span"}}
+
+  {{pinned-button pinned=topic.pinned topic=topic}}
+</div>
+
+{{topic-notifications-button notificationLevel=topic.details.notification_level topic=topic}}
 
-{{pinned-button topic=topic}}
-{{topic-notifications-button topic=topic}}
 {{plugin-outlet name="after-topic-footer-buttons"
                 args=(hash topic=topic)
+                tagName=""
                 connectorTagName="span"}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-list.hbs b/app/assets/javascripts/discourse/templates/components/topic-list.hbs
index e6c3723447..b0d2ae5b11 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-list.hbs
@@ -1,21 +1,34 @@
 {{#unless skipHeader}}
   <thead>
-    {{raw "topic-list-header" currentUser=currentUser
-                              canBulkSelect=canBulkSelect
-                              toggleInTitle=toggleInTitle
-                              hideCategory=hideCategory
-                              showPosters=showPosters
-                              showLikes=showLikes
-                              showOpLikes=showOpLikes
-                              showParticipants=showParticipants
-                              order=order
-                              ascending=ascending
-                              sortable=sortable
-                              bulkSelectEnabled=bulkSelectEnabled}}
+    {{raw "topic-list-header"
+      canBulkSelect=canBulkSelect
+      toggleInTitle=toggleInTitle
+      hideCategory=hideCategory
+      showPosters=showPosters
+      showLikes=showLikes
+      showOpLikes=showOpLikes
+      showParticipants=showParticipants
+      order=order
+      ascending=ascending
+      sortable=sortable
+      bulkSelectEnabled=bulkSelectEnabled}}
   </thead>
 {{/unless}}
+
+{{plugin-outlet
+  name="before-topic-list-body"
+  args=(hash
+    topics=topics
+    selected=selected
+    bulkSelectEnabled=bulkSelectEnabled
+    lastVisitedTopic=lastVisitedTopic
+    discoveryList=discoveryList
+    hideCategory=hideCategory)
+  tagName=""
+  connectorTagName=""}}
+
 <tbody>
-  {{#each topics as |topic|}}
+  {{#each filteredTopics as |topic|}}
     {{topic-list-item topic=topic
                       bulkSelectEnabled=bulkSelectEnabled
                       showTopicPostBadges=showTopicPostBadges
diff --git a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
index 1e2dfce6cc..e368600dda 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 0000000000..8cea0f5c6c
--- /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-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index a7041a5065..31e9c70b27 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -10,13 +10,15 @@
           flairColor=user.primary_group_flair_color
           groupName=user.primary_group_name}}
       {{/if}}
+      {{plugin-outlet name="user-card-avatar-flair" args=(hash user=user) tagName='div'}}
     </div>
 
     <div class="names">
       <span>
         <h1 class="{{staff}} {{new_user}} {{if nameFirst "full-name" "username"}}">
-          <a href={{user.path}} {{action "showUser"}}>{{if nameFirst user.name username}} {{user-status user currentUser=currentUser}}</a>
+          <a href={{user.path}} {{action "showUser"}}>{{if nameFirst user.name (format-username username)}} {{user-status user currentUser=currentUser}}</a>
         </h1>
+        {{plugin-outlet name="user-card-after-username" args=(hash user=user) tagName=''}}
 
         {{#unless nameFirst}}
           {{#if user.name}}
@@ -30,32 +32,62 @@
           <h2>{{user.title}}</h2>
         {{/if}}
 
+        {{#if user.staged}}
+          <h2 class="staged">{{i18n 'user.staged'}}</h2>
+        {{/if}}
+
         {{plugin-outlet name="user-card-post-names" args=(hash user=user) tagName='div'}}
       </span>
     </div>
 
     <ul class="usercard-controls">
       {{#if user.can_send_private_message_to_user}}
-        <li><a class='btn btn-primary' {{action "composePrivateMessage" user post}}>{{fa-icon "envelope"}}{{i18n 'user.private_message'}}</a></li>
+        <li class='compose-pm'>
+          {{d-button
+            class="btn-primary"
+            action=(action "composePrivateMessage" user post)
+            icon="envelope"
+            label="user.private_message"}}
+        </li>
       {{/if}}
 
       {{#if showFilter}}
-        <li><a class='btn' href {{action "togglePosts" user}}>{{fa-icon "filter"}}{{i18n 'topic.filter_to' username=username count=topicPostCount}}</a></li>
+        <li>
+          {{d-button
+            action=(action "togglePosts" user)
+            icon="filter"
+            translatedLabel=togglePostsLabel}}
+        </li>
       {{/if}}
 
       {{#if hasUserFilters}}
-        <li><a class='btn' href {{action "cancelFilter"}}>{{fa-icon "times"}}{{i18n 'topic.filters.cancel'}}</a></li>
+        <li>
+          {{d-button
+            action="cancelFilter"
+            icon="times"
+            label="topic.filters.cancel"}}
+        </li>
       {{/if}}
 
       {{#if showDelete}}
-        <li><a class='btn btn-danger' href {{action "deleteUser" user}}>{{fa-icon "exclamation-triangle"}}{{i18n 'admin.user.delete'}}</a></li>
+        <li>
+          {{d-button
+            class="btn-danger"
+            action=(action "deleteUser" user)
+            icon="exclamation-triangle"
+            label="admin.user.delete"}}
+        </li>
       {{/if}}
     </ul>
+    {{plugin-outlet
+      name="user-card-additional-controls"
+      args=(hash user=user close=(action "close"))
+      tagName=""}}
 
     {{#if isSuspended}}
       <div class='suspended'>
-        {{fa-icon "ban"}}
-        <b>{{i18n 'user.suspended_notice' date=user.suspendedTillDate}}</b><br/>
+        {{d-icon "ban"}}
+        <b>{{i18n 'user.suspended_notice' date=user.suspendedTillDate}}</b><br>
         <b>{{i18n 'user.suspended_reason'}}</b> {{user.suspend_reason}}
       </div>
     {{else}}
@@ -71,12 +103,12 @@
     {{#if hasLocationOrWebsite}}
       <div class="location-and-website">
         {{#if user.location}}
-          <span class='location'>{{fa-icon "map-marker"}} {{user.location}}</span>
+          <span class='location'>{{d-icon "map-marker"}} {{user.location}}</span>
         {{/if}}
 
         {{#if user.website_name}}
           <span class='website-name'>
-            {{fa-icon "globe"}}
+            {{d-icon "globe"}}
             {{#if linkWebsite}}
               <a href={{user.website}} rel={{unless removeNoFollow 'nofollow noopener'}} target="_blank">{{user.website_name}}</a>
             {{else}}
@@ -95,6 +127,23 @@
           <h3><span class='desc'>{{i18n 'last_post'}}</span> {{format-date user.last_posted_at leaveAgo="true"}}</h3>
         {{/if}}
         <h3><span class='desc'>{{i18n 'joined'}}</span> {{format-date user.created_at leaveAgo="true"}}</h3>
+        <h3 title="{{timeReadTooltip}}">
+          <span class='desc'>{{i18n 'time_read'}}</span>
+          {{format-duration user.time_read}}
+          {{#if showRecentTimeRead}}
+            <span>({{i18n 'time_read_recently' time_read=recentTimeRead}})</span>
+          {{/if}}
+        </h3>
+        {{#if showCheckEmail}}
+          <h3 class="email">
+            {{d-icon "envelope-o" title="user.email.title"}}
+            {{#if user.email}}
+              {{user.email}}
+            {{else}}
+              {{d-button action="checkEmail" actionParam=user icon="envelope-o" label="admin.users.check_email.text" class="btn-primary"}}
+            {{/if}}
+          </h3>
+        {{/if}}
         {{plugin-outlet name="user-card-metadata" args=(hash user=user)}}
       </div>
     {{/if}}
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 5db0b43bb5..ad7f851e2c 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-info.hbs b/app/assets/javascripts/discourse/templates/components/user-info.hbs
index 8270000cc2..ef2e2c0b6d 100644
--- a/app/assets/javascripts/discourse/templates/components/user-info.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-info.hbs
@@ -4,7 +4,7 @@
 
 <div class="user-detail">
   <div class='name-line'>
-    <span class="username"><a href="{{unbound userPath}}" data-user-card="{{unbound user.username}}">{{unbound user.username}}</a></span>
+    <span class="username"><a href="{{unbound userPath}}" data-user-card="{{unbound user.username}}">{{format-username user.username}}</a></span>
     <span class="name">{{unbound name}}</span>
   </div>
   <div class="title">{{unbound user.title}}</div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
index 67d28d7276..19c62e09d9 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stat.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
@@ -1,5 +1,11 @@
 <span class='value'>
-  {{#if icon}}{{fa-icon icon}}{{/if}}
-  {{number value}}
+  {{#if isNumber}}
+    {{number value}}
+  {{else}}
+    {{value}}
+  {{/if}}
+</span>
+<span class='label'>
+  {{#if icon}}{{d-icon icon}}{{/if}}
+  {{{i18n label count=value}}}
 </span>
-<span class='label'>{{{i18n label count=value}}}</span>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
new file mode 100644
index 0000000000..e4e49ecbc1
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
@@ -0,0 +1,52 @@
+<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}}
+  <div class='stream-topic-details'>
+    <div class='stream-topic-title'>
+      {{topic-status topic=item disableActions=true}}
+      <span class="title">
+        <a href={{item.postUrl}}>{{{item.title}}}</a>
+      </span>
+    </div>
+    <div class="category">{{category-link item.category}}</div>
+  </div>
+
+  {{#if item.deleted_by}}
+    <span class="delete-info">
+      {{d-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>
+
+{{#if actionDescription}}
+  <p class='excerpt'>{{actionDescription}}</p>
+{{/if}}
+
+<p class='excerpt' data-topic-id="{{item.topic_id}}" data-post-id="{{item.post_id}}" data-user-id="{{item.user_id}}">
+  {{#if item.expandedExcerpt}}
+    {{{item.expandedExcerpt}}}
+  {{else}}
+    {{{item.excerpt}}}
+  {{/if}}
+</p>
+
+{{#each item.children as |child|}}
+  <div class='user-stream-item-actions child-actions'>{{!-- DEPRECATED: 'child-actions' class --}}
+    {{d-icon child.icon class="icon"}}
+    {{#each child.items as |grandChild|}}
+      {{#if grandChild.removableBookmark}}
+        <button class="btn btn-default remove-bookmark" {{action removeBookmark grandChild}}>
+          {{d-icon 'times'}} {{i18n "bookmarks.remove"}}
+        </button>
+      {{else}}
+          <a href={{grandChild.userUrl}} data-user-card={{grandChild.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true" avatarTemplatePath="acting_avatar_template"}}</div></a>
+          {{#if grandChild.edit_reason}} &mdash; <span class="edit-reason">{{grandChild.edit_reason}}</span>{{/if}}
+      {{/if}}
+    {{/each}}
+  </div>
+{{/each}}
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 0000000000..e12fd05d51
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/user-stream.hbs
@@ -0,0 +1,3 @@
+{{#each stream.content as |item|}}
+  {{user-stream-item item=item removeBookmark=(action "removeBookmark")}}
+{{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs
new file mode 100644
index 0000000000..28bdf9d7b8
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs
@@ -0,0 +1,2 @@
+<h3 class='stats-title'>{{i18n (concat "user.summary." title)}}</h3>
+{{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
new file mode 100644
index 0000000000..056b9cf088
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
@@ -0,0 +1,9 @@
+<span class='topic-info'>
+  {{format-date createdAt format="tiny" noTitle="true"}}
+  {{#if likes}}
+    &middot;
+    {{d-icon 'heart'}}&nbsp;<span class='like-count'>{{number likes}}</span>
+  {{/if}}
+</span>
+<br>
+<a href="{{unbound url}}">{{{topic.fancyTitle}}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topics-list.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topics-list.hbs
new file mode 100644
index 0000000000..a74e5d6a23
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topics-list.hbs
@@ -0,0 +1,16 @@
+{{#if items}}
+  <ul>
+    {{#each items as |item|}}
+      {{yield item}}
+    {{/each}}
+  </ul>
+  {{#if hasMore}}
+    <p>
+      {{#link-to (concat "userActivity." type) user class="more"}}
+        {{i18n (concat "user.summary.more_" type)}}
+      {{/link-to}}
+    </p>
+  {{/if}}
+{{else}}
+  <p>{{i18n (concat "user.summary.no_" type)}}</p>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-user.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-user.hbs
new file mode 100644
index 0000000000..876702f195
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-user.hbs
@@ -0,0 +1,4 @@
+{{#user-info user=user}}
+  {{d-icon icon}}
+  <span class={{countClass}}>{{number user.count}}</span>
+{{/user-info}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-users-list.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-users-list.hbs
new file mode 100644
index 0000000000..1b291b638a
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-users-list.hbs
@@ -0,0 +1,9 @@
+{{#if users}}
+  <ul>
+    {{#each users as |user|}}
+      {{yield user}}
+    {{/each}}
+  </ul>
+{{else}}
+  <p>{{i18n (concat "user.summary." none)}}</p>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 9e20fd7330..93864a0863 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -1,145 +1,172 @@
-{{#composer-body
-  composer=model
-  openIfDraft="openIfDraft"
-  typed="typed"
-  cancelled="cancelled"
-  save="save"}}
+{{#composer-body composer=model
+                 showPreview=showPreview
+                 openIfDraft="openIfDraft"
+                 typed="typed"
+                 cancelled="cancelled"
+                 save="save"}}
+
   {{#if visible}}
-    <div class='contents'>
+      {{composer-messages composer=model
+                          messageCount=messageCount
+                          addLinkLookup="addLinkLookup"}}
 
-      {{#if showPopupMenu}}
-        {{#popup-menu visible=optionsVisible hide="hideOptions" title="composer.options"}}
-          {{#each popupMenuOptions as |option|}}
-            {{#if option.condition}}
-              <li>
-                {{d-button action=option.action icon=option.icon label=option.label}}
-              </li>
-            {{/if}}
-          {{/each}}
-        {{/popup-menu}}
-      {{/if}}
-
-      {{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>
-
-        {{#if model.viewOpen}}
-          <div class='control-row reply-area'>
-            <div class='composer-fields'>
-              {{plugin-outlet name="composer-open" args=(hash model=model)}}
-
-              <div class='reply-to'>
+      {{#if model.viewOpen}}
+        <div class="reply-area {{if canEditTags 'with-tags'}}">
+          <div class='composer-fields'>
+            {{plugin-outlet name="composer-open" args=(hash model=model)}}
+            <div class='reply-to'>
+              <div class="reply-details">
                 {{{model.actionTitle}}}
+
                 {{#unless site.mobileView}}
-                {{#if whisperOrUnlistTopicText}}
-                  <span class='whisper'>({{whisperOrUnlistTopicText}})</span>
-                {{/if}}
+                  {{#if whisperOrUnlistTopicText}}
+                    <span class='whisper'>({{whisperOrUnlistTopicText}})</span>
+                  {{/if}}
                 {{/unless}}
 
                 {{#if canEdit}}
                   {{#if showEditReason}}
-                    <div class="edit-reason-input">
-                      {{text-field autofocus="true" value=editReason tabindex="7" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}}
-                    </div>
+                    {{text-field autofocus="true" value=editReason tabindex="7" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}}
                   {{else}}
                     <a {{action "displayEditReason"}} class="display-edit-reason">{{i18n 'composer.show_edit_reason'}}</a>
                   {{/if}}
                 {{/if}}
               </div>
+              {{composer-toggles composeState=model.composeState
+                        toggleComposer=(action "toggle")
+                        toggleToolbar=(action "toggleToolbar")}}
+            </div>
 
-              {{#if model.canEditTitle}}
-                <div class='form-element clearfix'>
-                  {{#if model.creatingPrivateMessage}}
-                    {{composer-user-selector topicId=topicModel.id
-                                             usernames=model.targetUsernames
-                                             hasGroups=model.hasTargetGroups
-                                             focusTarget=focusTarget}}
-                    {{#if showWarning}}
-                      <div class='add-warning'>
-                        <label>
-                          {{input type="checkbox" checked=model.isWarning tabindex="3"}}
-                          {{i18n "composer.add_warning"}}
-                        </label>
-                      </div>
-                    {{/if}}
-                  {{/if}}
-
-                  {{composer-title composer=model lastValidatedAt=lastValidatedAt focusTarget=focusTarget}}
-
-                  {{#if model.showCategoryChooser}}
-                    <div class="category-input">
-                      {{category-chooser valueAttribute="id" value=model.categoryId scopedCategoryId=scopedCategoryId tabindex="3"}}
-                      {{popup-input-tip validation=categoryValidation}}
-                    </div>
-                    {{#if model.archetype.hasOptions}}
-                      <button class='btn' {{action "showOptions"}}>{{i18n 'topic.options'}}</button>
-                    {{/if}}
+            {{#if model.canEditTitle}}
+              {{#if model.creatingPrivateMessage}}
+                <div class='user-selector'>
+                  {{composer-user-selector topicId=topicModel.id
+                                           usernames=model.targetUsernames
+                                           hasGroups=model.hasTargetGroups
+                                           focusTarget=focusTarget
+                                           class="users-input"}}
+                  {{#if showWarning}}
+                    <label class='add-warning'>
+                      {{input type="checkbox" checked=model.isWarning tabindex="3"}}
+                      {{i18n "composer.add_warning"}}
+                    </label>
                   {{/if}}
                 </div>
               {{/if}}
-              {{plugin-outlet name="composer-fields" args=(hash model=model)}}
-            </div>
 
-            {{composer-editor topic=topic
-                              composer=model
-                              lastValidatedAt=lastValidatedAt
-                              canWhisper=canWhisper
-                              showPopupMenu=showPopupMenu
-                              draftStatus=model.draftStatus
-                              isUploading=isUploading
-                              groupsMentioned="groupsMentioned"
-                              cannotSeeMention="cannotSeeMention"
-                              importQuote="importQuote"
-                              showOptions="showOptions"
-                              hideOptions="hideOptions"
-                              optionsVisible=optionsVisible
-                              showToolbar=showToolbar
-                              showUploadSelector="showUploadSelector"
-                              afterRefresh="afterRefresh"}}
+              <div class="title-and-category {{if showPreview 'with-preview'}}">
 
-            {{#if currentUser}}
-              <div class='submit-panel'>
-                {{plugin-outlet name="composer-fields-below" args=(hash model=model)}}
+                {{composer-title composer=model lastValidatedAt=lastValidatedAt focusTarget=focusTarget}}
+
+                {{#if model.showCategoryChooser}}
+                  <div class="category-input">
+                    {{category-chooser value=model.categoryId scopedCategoryId=scopedCategoryId tabindex="3"}}
+                    {{popup-input-tip validation=categoryValidation}}
+                  </div>
+                {{/if}}
                 {{#if canEditTags}}
                   {{tag-chooser tags=model.tags tabIndex="4" categoryId=model.categoryId}}
                 {{/if}}
-                <button {{action "save"}} tabindex="5" class="btn btn-primary create {{if disableSubmit 'disabled'}}" title="{{i18n 'composer.title'}}">{{{model.saveIcon}}}{{model.saveText}}</button>
-                <a href {{action "cancel"}} class='cancel' tabindex="6">{{i18n 'cancel'}}</a>
 
-                {{#if site.mobileView}}
-                {{#if whisperOrUnlistTopic}}
-                  <span class='whisper'><i class='fa fa-eye-slash'></i></span>
-                {{/if}}
-                {{/if}}
+
               </div>
             {{/if}}
+
+            {{plugin-outlet name="composer-fields" args=(hash model=model)}}
+
           </div>
-        {{else}}
-          <div class='row'>
-            <div class='span24'>
-              <div class='saving-text'>
-                {{#if model.createdPost}}
-                  {{i18n 'composer.saved'}} <a class='permalink' href="{{unbound createdPost.url}}" {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
-                {{else}}
-                  {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
-                {{/if}}
-              </div>
-              <div class='draft-text'>
-                {{#if model.topic}}
-                  {{fa-icon "mail-forward"}} {{{draftTitle}}}
-                {{else}}
-                  {{i18n "composer.saved_draft"}}
+
+          {{composer-editor topic=topic
+                            composer=model
+                            lastValidatedAt=lastValidatedAt
+                            canWhisper=canWhisper
+                            storeToolbarState="storeToolbarState"
+                            onPopupMenuAction=(action "onPopupMenuAction")
+                            popupMenuOptions=popupMenuOptions
+                            draftStatus=model.draftStatus
+                            isUploading=isUploading
+                            isCancellable=isCancellable
+                            uploadProgress=uploadProgress
+                            groupsMentioned="groupsMentioned"
+                            cannotSeeMention="cannotSeeMention"
+                            importQuote="importQuote"
+                            togglePreview="togglePreview"
+                            showToolbar=showToolbar
+                            showUploadSelector="showUploadSelector"
+                            afterRefresh="afterRefresh"}}
+
+          <div class='submit-panel'>
+            {{plugin-outlet name="composer-fields-below" args=(hash model=model)}}
+
+            <div class='save-or-cancel'>
+              {{composer-save-button action=(action "save")
+                                     icon=model.saveIcon
+                                     label=model.saveLabel
+                                     disableSubmit=disableSubmit}}
+
+              <a href {{action "cancel"}} class='cancel' tabindex="6">{{i18n 'cancel'}}</a>
+
+              {{#if site.mobileView}}
+                {{#if whisperOrUnlistTopic}}
+                  <span class='whisper'>
+                    {{d-icon "eye-slash"}}
+                  </span>
                 {{/if}}
+              {{/if}}
+
+
+              {{#if isUploading}}
+                <div id="file-uploading">
+                  {{loading-spinner size="small"}} {{i18n 'upload_selector.uploading'}}
+                  {{uploadProgress}}%
+                  {{#if isCancellable}}
+                    <a href id="cancel-file-upload" {{action "cancelUpload"}}>{{d-icon "times"}}</a>
+                  {{/if}}
+                </div>
+              {{/if}}
+              <div id='draft-status' class="{{if isUploading 'hidden'}}">
+                {{model.draftStatus}}
               </div>
             </div>
-          </div>
-        {{/if}}
 
-      </div>
-    </div>
+            <div class="composer-bottom-right">
+              {{#if site.mobileView}}
+                <a class="mobile-file-upload {{if isUploading 'hidden'}}">{{i18n 'upload'}}</a>
+
+                {{#if showPreview}}
+                  {{d-button action='togglePreview' class='hide-preview' label='composer.hide_preview'}}
+                {{/if}}
+              {{else}}
+                <a href {{action "togglePreview"}} class='toggle-preview'>{{{toggleText}}}</a>
+              {{/if}}
+
+            </div>
+          </div>
+        </div>
+
+      {{else}}
+        <div class='saving-text'>
+          {{#if model.createdPost}}
+            {{i18n 'composer.saved'}} <a class='permalink' href="{{unbound createdPost.url}}" {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
+          {{else}}
+            {{i18n 'composer.saving'}} {{loading-spinner size="small"}}
+          {{/if}}
+        </div>
+
+        <div class='draft-text'>
+          {{#if model.topic}}
+            {{d-icon "mail-forward"}} {{{draftTitle}}}
+          {{else}}
+            {{i18n "composer.saved_draft"}}
+          {{/if}}
+        </div>
+
+        {{composer-toggles composeState=model.composeState
+          toggleComposer=(action "toggle")
+          toggleToolbar=(action "toggleToolbar")}}
+
+      {{/if}}
+
   {{/if}}
+
 {{/composer-body}}
diff --git a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
index 4b2be21c2d..60493d7526 100644
--- a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
@@ -1,3 +1,3 @@
-<a href {{action "closeMessage"}} class='close'>{{fa-icon "close"}}</a>
+<a href {{action "closeMessage"}} class='close'>{{d-icon "close"}}</a>
 {{#if message.title}}<h3>{{message.title}}</h3>{{/if}}
 <p>{{{message.body}}}</p>
diff --git a/app/assets/javascripts/discourse/templates/composer/education.hbs b/app/assets/javascripts/discourse/templates/composer/education.hbs
index a461a9b512..c2d574cb69 100644
--- a/app/assets/javascripts/discourse/templates/composer/education.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/education.hbs
@@ -1,2 +1,2 @@
-<a href {{action "closeMessage"}} class='close'>{{fa-icon "times"}}</a>
+<a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
 {{{message.body}}}
diff --git a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
index 8497ac5dbd..a91a313e0f 100644
--- a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
@@ -1,2 +1,2 @@
-<a href {{action "closeMessage"}} class='close'>{{fa-icon "close"}}</a>
+<a href {{action "closeMessage"}} class='close'>{{d-icon "close"}}</a>
 {{{message.body}}}
diff --git a/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs b/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
index 304352f549..bdd2cd5a3f 100644
--- a/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
@@ -1,4 +1,4 @@
-<a href {{action "closeMessage"}} class='close'>{{fa-icon "close"}}</a>
+<a href {{action "closeMessage"}} class='close'>{{d-icon "close"}}</a>
 <h3>{{i18n 'composer.similar_topics'}}</h3>
 
 <ul class='topics'>
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
index 22e5eb3a60..3ae66d589d 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
@@ -8,7 +8,7 @@
       <button title="{{i18n 'topics.bulk.dismiss_tooltip'}}" id='dismiss-topics-top' class='btn dismiss-read' {{action "dismissReadPosts"}}>{{i18n 'topics.bulk.dismiss_button'}}</button>
     {{/if}}
     {{#if showResetNew}}
-      <button id='dismiss-new-top' class='btn dismiss-read' {{action "resetNew"}}><i class="fa fa-check"></i> {{i18n 'topics.bulk.dismiss_new'}}</button>
+    <button id='dismiss-new-top' class='btn dismiss-read' {{action "resetNew"}}>{{d-icon "check"}} {{i18n 'topics.bulk.dismiss_new'}}</button>
     {{/if}}
   </div>
 {{/if}}
@@ -32,24 +32,24 @@
   {{/if}}
 
   {{#if hasTopics}}
-      {{topic-list
-          highlightLastVisited=true
-          top=top
-          showTopicPostBadges=showTopicPostBadges
-          showPosters=true
-          currentUser=currentUser
-          canBulkSelect=canBulkSelect
-          changeSort="changeSort"
-          toggleBulkSelect="toggleBulkSelect"
-          hideCategory=model.hideCategory
-          order=order
-          ascending=ascending
-          bulkSelectEnabled=bulkSelectEnabled
-          selected=selected
-          expandGloballyPinned=expandGloballyPinned
-          expandAllPinned=expandAllPinned
-          category=category
-          topics=model.topics}}
+    {{topic-list
+      highlightLastVisited=true
+      top=top
+      showTopicPostBadges=showTopicPostBadges
+      showPosters=true
+      canBulkSelect=canBulkSelect
+      changeSort="changeSort"
+      toggleBulkSelect="toggleBulkSelect"
+      hideCategory=model.hideCategory
+      order=order
+      ascending=ascending
+      bulkSelectEnabled=bulkSelectEnabled
+      selected=selected
+      expandGloballyPinned=expandGloballyPinned
+      expandAllPinned=expandAllPinned
+      category=category
+      topics=model.topics
+      discoveryList=true}}
   {{/if}}
 {{/discovery-topics-list}}
 
@@ -60,31 +60,20 @@
       <button title="{{i18n 'topics.bulk.dismiss_tooltip'}}" id='dismiss-topics' class='btn dismiss-read' {{action "dismissReadPosts"}}>{{i18n 'topics.bulk.dismiss_button'}}</button>
     {{/if}}
     {{#if showResetNew}}
-      <button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}><i class="fa fa-check"></i> {{i18n 'topics.bulk.dismiss_new'}}</button>
+      <button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}>
+        {{d-icon "check"}} {{i18n 'topics.bulk.dismiss_new'}}</button>
     {{/if}}
 
-    {{#if latest}}
-      <div class="education">
-        {{{footerEducation}}}
-      </div>
-      <h3>
-        {{footerMessage}}
+    {{#footer-message education=footerEducation message=footerMessage}}
+      {{#if latest}}
         {{#if canCreateTopicOnCategory}}<a href {{action "createTopic"}}>{{i18n 'topic.suggest_create_topic'}}</a>{{/if}}
-      </h3>
-    {{else}}
-      {{#if top}}
-        <h3>
-          {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}}
+      {{else if top}}
+        {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}}
         {{top-period-buttons period=period action="changePeriod"}}
-        </h3>
       {{else}}
-        <div class="education">
-            {{{footerEducation}}}
-        </div>
-        <h3>
-          {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}
-        </h3>
+        {{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}
       {{/if}}
-    {{/if}}
+    {{/footer-message}}
+
   {{/if}}
 </footer>
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 0000000000..0ead5e5aee
--- /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 0000000000..c2ae260f77
--- /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'>
+    {{d-icon 'search'}}
+    <input type='text' name="filter" placeholder="{{i18n 'emoji_picker.filter_placeholder'}}" autocomplete="off"/>
+    <button class='clear-filter'>
+      {{d-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'>{{d-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 %>">
+          {{d-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 b7e39bb37b..0000000000
--- 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/exception.hbs b/app/assets/javascripts/discourse/templates/exception.hbs
index 69537d6d70..2c6d59e487 100644
--- a/app/assets/javascripts/discourse/templates/exception.hbs
+++ b/app/assets/javascripts/discourse/templates/exception.hbs
@@ -7,7 +7,7 @@
     </div>
     <div class="desc">
       {{#if networkFixed}}
-        <i class="fa fa-check-circle"></i>
+        {{d-icon "check-circle"}}
       {{/if}}
 
       {{desc}}
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 0000000000..9b5f10eebc
--- /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"}}'>
+  {{d-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 bfeab09cfe..01edd14023 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -1,8 +1,10 @@
 {{#d-section pageClass="search" class="search-container"}}
+  {{scroll-tracker name="full-page-search" tag=searchTerm}}
   <div class="search row clearfix">
+    <div class="search-bar">
     {{search-text-field value=searchTerm class="full-page-search input-xxlarge search no-blur" action="search" hasAutofocus=hasAutofocus}}
     {{d-button action="search" icon="search" class="btn-primary" disabled=searching}}
-
+    </div>
     <div class='search-advanced'>
       <button class="search-advanced-btn btn" {{action "toggleAdvancedSearch"}}>
         {{{searchAdvancedIcon}}}
@@ -14,8 +16,8 @@
       {{/if}}
     </div>
 
-    {{#if canCreateTopic}}
-      <span class="new-topic-btn">{{d-button id="create-topic" class="btn-default" action="createTopic" actionParam=searchTerm icon="plus" label="topic.create"}}</span>
+    {{#if hasResults}}
+      {{create-topic-button canCreateTopic=canCreateTopic action=(action "createTopic" searchTerm)}}
     {{/if}}
 
     {{#if canBulkSelect}}
@@ -45,32 +47,23 @@
     </div>
   {{/if}}
 
-  {{#conditional-loading-spinner condition=loading}}
-
-    {{#unless hasResults}}
-      <h3>
-        {{#if searchActive}}
-          {{i18n "search.no_results"}}
-        {{/if}}
-      </h3>
-    {{/unless}}
-
-    {{#if hasResults}}
-      <div class='search-title clearfix'>
-        <div class='result-count'>
-          <span>
-            {{{i18n "search.result_count" count=resultCount term=noSortQ}}}
-          </span>
-        </div>
-        <div class='sort-by'>
-          <span class='desc'>
-            {{i18n "search.sort_by"}}
-          </span>
-          {{combo-box value=sortOrder content=sortOrders castInteger="true"}}
-        </div>
+  {{#if hasResults}}
+    <div class='search-title clearfix'>
+      <div class='result-count'>
+        <span>
+          {{{resultCountLabel}}}
+        </span>
       </div>
-    {{/if}}
+      <div class='sort-by'>
+        <span class='desc'>
+          {{i18n "search.sort_by"}}
+        </span>
+        {{combo-box value=sortOrder content=sortOrders castInteger=true}}
+      </div>
+    </div>
+  {{/if}}
 
+  {{#load-more selector=".fps-result" action="loadMore"}}
     {{#each model.posts as |result|}}
       <div class='fps-result'>
         <div class='author'>
@@ -85,12 +78,15 @@
               {{track-selected selectedList=selected selectedId=result.topic}}
             {{/if}}
 
-            <a class='search-link' href='{{unbound result.url}}'>
+            <a class='search-link' href='{{unbound result.url}}' {{action "logClick" result.topic_id}}>
               {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{#highlight-text highlight=q}}{{{unbound result.topic.fancyTitle}}}{{/highlight-text}}</span>
             </a>
 
             <div class='search-category'>
-              {{category-link result.topic.category}}
+              {{#if result.topic.category.parentCategory}}
+              {{category-link result.topic.category.parentCategory}}
+              {{/if}}
+              {{category-link result.topic.category hideParent=true}}
               {{#each result.topic.tags as |tag|}}
                 {{discourse-tag tag}}
               {{/each}}
@@ -107,7 +103,7 @@
             </span>
 
             {{#if result.blurb}}
-              {{#highlight-text highlight=q}}
+              {{#highlight-text highlight=highlightQuery}}
                 {{{unbound result.blurb}}}
               {{/highlight-text}}
             {{/if}}
@@ -116,7 +112,7 @@
           {{#if showLikeCount}}
             {{#if result.like_count}}
               <span class='like-count'>
-                {{result.like_count}} {{fa-icon "heart"}}
+                {{result.like_count}} {{d-icon "heart"}}
               </span>
             {{/if}}
           {{/if}}
@@ -124,11 +120,44 @@
       </div>
     {{/each}}
 
-    {{#if hasResults}}
-      <h3 class="search-footer">
-        {{i18n "search.no_more_results"}}
-      </h3>
-    {{/if}}
+    {{#conditional-loading-spinner condition=loading }}
+      {{#unless hasResults}}
+        {{#if searchActive}}
+          <h3>{{i18n "search.no_results"}}</h3>
+
+          {{#if showSuggestion}}
+            <div class="no-results-suggestion">
+              {{i18n "search.cant_find"}}
+              {{#if canCreateTopic}}
+                <a href {{action "createTopic" searchTerm}}>{{i18n "search.start_new_topic"}}</a>
+                {{#unless siteSettings.login_required}}
+                  {{i18n "search.or_search_google"}}
+                {{/unless}}
+              {{else}}
+                {{i18n "search.search_google"}}
+              {{/if}}
+            </div>
+
+            {{google-search searchTerm=searchTerm}}
+          {{/if}}
+        {{/if}}
+      {{/unless}}
+
+      {{#if hasResults}}
+        {{#unless loading}}
+          <h3 class="search-footer">
+            {{#if model.grouped_search_result.more_full_page_results}}
+              {{#if isLastPage }}
+                {{i18n "search.more_results"}}
+              {{/if}}
+            {{else}}
+              {{i18n "search.no_more_results"}}
+            {{/if}}
+          </h3>
+        {{/unless}}
+      {{/if}}
+    {{/conditional-loading-spinner}}
+
+  {{/load-more}}
 
-  {{/conditional-loading-spinner}}
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/group-activity-posts.hbs b/app/assets/javascripts/discourse/templates/group-activity-posts.hbs
index 7dbeebb300..061160d1ed 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=".group-post" action=(action "loadMore")}}
+  <div class='group-posts'>
+    {{#each model as |post|}}
+      {{group-post post=post class="group-post"}}
+    {{else}}
+      <div>{{i18n emptyText}}</div>
+    {{/each}}
+  </div>
+{{/load-more}}
+
+{{conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/discourse/templates/group-edit.hbs b/app/assets/javascripts/discourse/templates/group-edit.hbs
index 03122d2aba..b149a4ad7f 100644
--- a/app/assets/javascripts/discourse/templates/group-edit.hbs
+++ b/app/assets/javascripts/discourse/templates/group-edit.hbs
@@ -21,11 +21,21 @@
     <div class="control-group">
       <label>
         {{input type='checkbox'
-            checked=model.public
-            class="group-edit-public"
+            checked=model.public_admission
+            class="group-edit-public-admission"
             disabled=model.allow_membership_requests}}
 
-        {{i18n 'groups.public'}}
+        {{i18n 'groups.public_admission'}}
+      </label>
+    </div>
+
+    <div class="control-group">
+      <label>
+        {{input type='checkbox'
+            checked=model.public_exit
+            class="group-edit-public-exit"}}
+
+        {{i18n 'groups.public_exit'}}
       </label>
     </div>
 
@@ -34,12 +44,26 @@
         {{input type='checkbox'
             checked=model.allow_membership_requests
             class="group-edit-allow-membership-requests"
-            disabled=model.public}}
+            disabled=model.public_admission}}
 
         {{i18n 'groups.allow_membership_requests'}}
       </label>
     </div>
 
+    {{#if model.allow_membership_requests}}
+      <div>
+        <label for="membership-request-template">
+          {{i18n 'groups.membership_request_template'}}
+        </label>
+
+        {{expanding-text-area name="membership-request-template"
+            value=model.membership_request_template
+            class="group-edit-membership-request-template"}}
+      </div>
+    {{/if}}
+
+    {{plugin-outlet name="group-edit" args=(hash group=model)}}
+
     {{d-button action="save" class="btn-primary" disabled=saving label="save"}}
     {{savingText}}
   </form>
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 24afa5a0c7..909c3f6e15 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -1,4 +1,6 @@
-<div class="container group">
+{{plugin-outlet name="before-group-container" args=(hash group=model)}}
+
+<div class="container group {{model.name}}">
   <div class='group-details-container'>
     <div class='group-info'>
       {{#if model.flair_url}}
@@ -21,7 +23,7 @@
     </div>
 
     {{#if model.bio_cooked}}
-      <hr/>
+      <hr>
 
       <div class='group-bio'>
         <p>{{{model.bio_cooked}}}</p>
@@ -31,17 +33,15 @@
 
   <div class="list-controls">
     <div class="container">
-      {{#mobile-nav class='group-nav' desktopClass="nav nav-pills" currentPath=application.currentPath}}
-        {{#each getTabs as |tab|}}
-          <li>
-            {{#link-to tab.location model title=tab.message}}
-              {{#if tab.icon}}{{fa-icon tab.icon}}{{/if}}
-              {{tab.message}}
-              {{#if tab.count}}<span class='count'>({{tab.count}})</span>{{/if}}
-            {{/link-to}}
-          </li>
-        {{/each}}
-      {{/mobile-nav}}
+      {{group-navigation group=model currentPath=application.currentPath tabs=tabs}}
+
+      {{#if displayGroupMessageButton}}
+        {{d-button
+            action="messageGroup"
+            class="btn-primary group-message-button"
+            icon="envelope"
+            label="groups.message"}}
+      {{/if}}
 
       {{group-membership-button model=model showLogin='showLogin'}}
     </div>
diff --git a/app/assets/javascripts/discourse/templates/group/activity.hbs b/app/assets/javascripts/discourse/templates/group/activity.hbs
index d03a14e84f..50798a89d7 100644
--- a/app/assets/javascripts/discourse/templates/group/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/group/activity.hbs
@@ -1,22 +1,14 @@
 <div class='group-activity container'>
   {{#mobile-nav class='group-activity-nav' desktopClass="pull-left nav nav-stacked" currentPath=application.currentPath}}
-    <li>
-      {{#link-to 'group.activity.posts'}}{{i18n 'groups.posts'}}{{/link-to}}
-    </li>
-
-    <li>
-      {{#link-to 'group.activity.topics'}}{{i18n 'groups.topics'}}{{/link-to}}
-    </li>
-
-    <li>
-      {{#link-to 'group.activity.mentions'}}{{i18n 'groups.mentions'}}{{/link-to}}
-    </li>
-
-    {{#if showGroupMessages}}
-      <li>
-        {{#link-to 'group.activity.messages'}}{{i18n 'groups.messages'}}{{/link-to}}
-      </li>
+    {{group-activity-filter filter="posts" categoryId=category_id}}
+    {{group-activity-filter filter="topics" categoryId=category_id}}
+    {{#if siteSettings.enable_mentions}}
+      {{group-activity-filter filter="mentions" categoryId=category_id}}
     {{/if}}
+    {{#if showGroupMessages}}
+      {{group-activity-filter filter="messages"}}
+    {{/if}}
+    {{plugin-outlet name="below-group-activity-nav" tagName='' connectorTagName='li'}}
   {{/mobile-nav}}
 
   <div class="{{if site.mobileView "" "pull-left"}} group-activity-outlet">
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index 5822156abd..65c775087b 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -23,26 +23,39 @@
         </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">
-            {{input value=accountName id="new-account-name" name="name"}}
-          </div>
+          {{#if fullnameRequired}}
+            <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>
+          {{/if}}
 
-          <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'}}">
+                {{d-icon "exclamation-triangle"}} {{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/list/action-list.raw.hbs b/app/assets/javascripts/discourse/templates/list/action-list.raw.hbs
index 428a5c53a7..5714b98d83 100644
--- a/app/assets/javascripts/discourse/templates/list/action-list.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/action-list.raw.hbs
@@ -1,6 +1,6 @@
 {{#if postNumbers}}
 <div class='post-actions {{className}}'>
-  <i class='fa fa-{{icon}}'></i>
+  {{d-icon icon}}
   {{#each postNumbers as |postNumber|}}
     <a href='{{topic.url}}/{{postNumber}}'>#{{postNumber}}</a>
   {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/list/posts-count-column.raw.hbs b/app/assets/javascripts/discourse/templates/list/posts-count-column.raw.hbs
index 599d695abf..b37ddd9c1b 100644
--- a/app/assets/javascripts/discourse/templates/list/posts-count-column.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/posts-count-column.raw.hbs
@@ -1,3 +1,6 @@
 <{{view.tagName}} class='num posts-map posts {{view.likesHeat}}' title='{{view.title}}'>
-  <a href class='posts-map badge-posts {{view.likesHeat}}'>{{number topic.replyCount noTitle="true"}}</a>
+  <a href class='posts-map badge-posts {{view.likesHeat}}'>
+    {{raw-plugin-outlet name="topic-list-before-reply-count"}}
+    {{number topic.replyCount noTitle="true"}}
+  </a>
 </{{view.tagName}}>
diff --git a/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs
index 76be2c412f..0a42a6a0c5 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs
@@ -1,6 +1,6 @@
 {{#if topic.hasExcerpt}}
   <div class="topic-excerpt">
-    {{{topic.excerpt}}}
+    {{{topic.escapedExcerpt}}}
     {{#if topic.excerptTruncated}}
       <a href="{{topic.url}}">{{i18n 'read_more'}}</a>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
index d38f958ab3..3ad017f622 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
@@ -45,7 +45,7 @@
 <td class="num likes">
   {{#if hasLikes}}
     <a href='{{topic.summaryUrl}}'>
-      {{number topic.like_count}} <i class='fa fa-heart'></i></td>
+      {{number topic.like_count}} {{d-icon "heart"}}</td>
     </a>
   {{/if}}
 {{/if}}
@@ -54,7 +54,7 @@
 <td class="num likes">
   {{#if hasOpLikes}}
     <a href='{{topic.summaryUrl}}'>
-      {{number topic.op_like_count}} <i class='fa fa-heart'></i></td>
+      {{number topic.op_like_count}} {{d-icon "heart"}}</td>
     </a>
   {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index 8abe6bc1fa..b0a3dbe21e 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -3,7 +3,7 @@
     <table class="topic-list">
       <tbody>
       {{#each topics as |t|}}
-        <tr class="{{if t.archived 'archived'}}" data-topic-id={{t.id}}>
+        <tr class="topic-list-item {{if t.archived 'archived'}} {{if t.visited 'visited'}}" data-topic-id={{t.id}}>
           <td>
             <div class='main-link'>
               {{topic-status topic=t}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
index 8a58906d19..83bdf44a11 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
@@ -1,5 +1,7 @@
 {{#if selectedHtml}}
-  <li><a class='expander' {{action 'toggleExpanded'}}>{{{selectedHtml}}} <i class='fa fa-caret-down'></i></a></li>
+  <li><a class='expander' {{action 'toggleExpanded'}}>{{{selectedHtml}}}
+      {{d-icon "caret-down"}}
+    </a></li>
 {{/if}}
 <ul class='drop {{if expanded 'expanded'}}'>
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs b/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
index 456db2abce..9d1ffb0932 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
@@ -1,13 +1,16 @@
-<li>
-  <a {{action "toggleDrop"}}>
-  {{selectedNavItem.displayName}}
-  <i class='fa fa-caret-down'></i>
+<li class='navigation-toggle'>
+  <a {{action "toggleDrop"}} class='toggle-link'>
+    {{selectedNavItem.displayName}}
+    {{d-icon "caret-down"}}
   </a>
 </li>
 {{#if expanded}}
 <ul class='drop'>
   {{#each navItems as |navItem|}}
-    {{navigation-item content=navItem filterMode=filterMode}}
+    {{navigation-item content=navItem filterMode=filterMode category=category}}
+  {{/each}}
+  {{#each connectors as |c|}}
+  {{plugin-connector connector=c class=c.classNames tagName="li" args=(hash category=category filterMode=filterMode)}}
   {{/each}}
 </ul>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
index c17937e618..192129e037 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
@@ -16,7 +16,6 @@
     {{topic-list
         highlightLastVisited=true
         showPosters=true
-        currentUser=currentUser
         hideCategory=model.hideCategory
         order=order
         ascending=ascending
@@ -35,32 +34,20 @@
       <button title="{{i18n 'topics.bulk.dismiss_tooltip'}}" id='dismiss-topics' class='btn dismiss-read' {{action "dismissReadPosts"}}>{{i18n 'topics.bulk.dismiss_button'}}</button>
     {{/if}}
     {{#if showResetNew}}
-      <button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}><i class="fa fa-check"></i> {{i18n 'topics.bulk.dismiss_new'}}</button>
+      <button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}>
+        {{d-icon "check"}}
+        {{i18n 'topics.bulk.dismiss_new'}}</button>
     {{/if}}
 
-    {{#if latest}}
-      <div class="education">
-        {{{footerEducation}}}
-      </div>
-      <h3>
-        {{footerMessage}}
-        {{#if model.can_create_topic}}<a href {{action "createTopic"}}>{{i18n 'topic.suggest_create_topic'}}</a>{{/if}}
-      </h3>
-    {{else}}
-      {{#if top}}
-        <h3>
-          {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}}
-          <br/>
-          {{top-period-buttons period=period action="changePeriod"}}
-        </h3>
+    {{#footer-message education=footerEducation message=footerMessage}}
+      {{#if latest}}
+        {{#if canCreateTopicOnCategory}}<a href {{action "createTopic"}}>{{i18n 'topic.suggest_create_topic'}}</a>{{/if}}
+      {{else if top}}
+        {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}}
+        {{top-period-buttons period=period action="changePeriod"}}
       {{else}}
-        <div class="education">
-            {{{footerEducation}}}
-        </div>
-        <h3>
-          {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}
-        </h3>
+        {{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}
       {{/if}}
-    {{/if}}
+    {{/footer-message}}
   {{/if}}
 </footer>
diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
index d156ca66dd..0e191a6c8d 100644
--- a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
@@ -46,7 +46,7 @@
       <button class='btn btn-large btn-primary'
         disabled={{loginDisabled}}
         {{action "login"}}>
-          <i class="fa fa-unlock"></i>&nbsp;{{loginButtonText}}
+          {{d-icon "unlock"}}&nbsp;{{loginButtonText}}
       </button>
 
       {{#if showSignupLink}}
diff --git a/app/assets/javascripts/discourse/templates/modal.hbs b/app/assets/javascripts/discourse/templates/modal.hbs
index 0366d78a54..43c4e79f49 100644
--- a/app/assets/javascripts/discourse/templates/modal.hbs
+++ b/app/assets/javascripts/discourse/templates/modal.hbs
@@ -1,24 +1,10 @@
-{{#d-modal modalClass=modalClass title=title}}
-  <div class="modal-outer-container">
-    <div class="modal-middle-container">
-      <div class="modal-inner-container">
-        <div class="modal-header">
-          <div class='modal-close'>
-            <a class="close" {{action "closeModal"}}>{{fa-icon "times"}}</a>
-          </div>
+{{#d-modal
+  modalClass=modalClass
+  title=title
+  class="hidden"
+  errors=errors
+  closeModal=(route-action "closeModal")}}
 
-          <h3>{{title}}</h3>
-        </div>
+  {{outlet "modalBody"}}
 
-        <div id='modal-alert'></div>
-        {{outlet "modalBody"}}
-        {{#each errors as |error|}}
-          <div class="alert alert-error">
-            <button class="close" data-dismiss="alert">×</button>
-            {{error}}
-          </div>
-        {{/each}}
-      </div>
-    </div>
-  </div>
 {{/d-modal}}
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
index 7a7470f391..f974216e93 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
@@ -1,36 +1,37 @@
 {{#d-modal-body title="user.change_avatar.title" class="avatar-selector"}}
-  <div>
-    <div>
-      {{radio-button id="system-avatar" name="avatar" value="system" selection=selected}}
-      <label class="radio" for="system-avatar">{{bound-avatar-template system_avatar_template "large"}} {{{i18n 'user.change_avatar.letter_based'}}}</label>
-    </div>
-    <div>
-      {{radio-button id="gravatar" name="avatar" value="gravatar" selection=selected}}
-      <label class="radio" for="gravatar">{{bound-avatar-template gravatar_avatar_template "large"}} {{{i18n 'user.change_avatar.gravatar'}}} {{email}}</label>
-      {{d-button action="refreshGravatar" title="user.change_avatar.refresh_gravatar_title" disabled=gravatarRefreshDisabled icon="refresh"}}
-    </div>
-    {{#if allowAvatarUpload}}
-      <div>
-        {{radio-button id="uploaded-avatar" name="avatar" value="uploaded" selection=selected}}
-        <label class="radio" for="uploaded-avatar">
-          {{#if custom_avatar_template}}
-            {{bound-avatar-template custom_avatar_template "large"}}
-            {{i18n 'user.change_avatar.uploaded_avatar'}}
-          {{else}}
-            {{i18n 'user.change_avatar.uploaded_avatar_empty'}}
-          {{/if}}
-        </label>
-        {{avatar-uploader user_id=id
-                          uploadedAvatarTemplate=custom_avatar_template
-                          uploadedAvatarId=custom_avatar_upload_id
-                          uploading=uploading
-                          done="uploadComplete"}}
-      </div>
+  <div class="avatar-choice">
+    {{radio-button id="system-avatar" name="avatar" value="system" selection=selected}}
+    <label class="radio" for="system-avatar">{{bound-avatar-template system_avatar_template "large"}} {{{i18n 'user.change_avatar.letter_based'}}}</label>
+  </div>
+  <div class="avatar-choice">
+    {{radio-button id="gravatar" name="avatar" value="gravatar" selection=selected}}
+    <label class="radio" for="gravatar">{{bound-avatar-template gravatar_avatar_template "large"}} {{{i18n 'user.change_avatar.gravatar'}}} {{email}}</label>
+    {{d-button action="refreshGravatar" title="user.change_avatar.refresh_gravatar_title" disabled=gravatarRefreshDisabled icon="refresh"}}
+    {{#if gravatarFailed}}
+      <p class="error">{{I18n 'user.change_avatar.gravatar_failed'}}</p>
     {{/if}}
   </div>
+  {{#if allowAvatarUpload}}
+    <div class="avatar-choice">
+      {{radio-button id="uploaded-avatar" name="avatar" value="uploaded" selection=selected}}
+      <label class="radio" for="uploaded-avatar">
+        {{#if custom_avatar_template}}
+          {{bound-avatar-template custom_avatar_template "large"}}
+          {{i18n 'user.change_avatar.uploaded_avatar'}}
+        {{else}}
+          {{i18n 'user.change_avatar.uploaded_avatar_empty'}}
+        {{/if}}
+      </label>
+      {{avatar-uploader user_id=id
+                        uploadedAvatarTemplate=custom_avatar_template
+                        uploadedAvatarId=custom_avatar_upload_id
+                        uploading=uploading
+                        done="uploadComplete"}}
+    </div>
+  {{/if}}
 {{/d-modal-body}}
 
 <div class="modal-footer">
   {{d-button action="saveAvatarSelection" class="btn-primary" disabled=uploading label="save"}}
-  <a {{action "closeModal"}}>{{i18n 'cancel'}}</a>
+  {{d-modal-cancel close=(action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
index 33cbe1dd24..480034cb68 100644
--- a/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change-owner.hbs
@@ -1,4 +1,4 @@
-{{#d-modal-body}}
+{{#d-modal-body class='change-ownership'}}
   {{{i18n 'topic.change_owner.instructions' count=selectedPostsCount old_user=selectedPostsUsername}}}
   <p>
       {{{i18n 'topic.change_owner.instructions_warn'}}}
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index bdaa3d8239..9efde75e55 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -11,14 +11,14 @@
           <form>
           <table>
 
-          <tr class="input">
+          <tr class="input create-account-email">
                 <td class="label"><label for='new-account-email'>{{i18n 'user.email.title'}}</label></td>
                 <td>
                 {{input type="email" value=accountEmail id="new-account-email" disabled=emailValidated name="email" autofocus="autofocus"}}
                 &nbsp;{{input-tip validation=emailValidation}}
                 </td>
           </tr>
-          <tr class="instructions">
+          <tr class="instructions create-account-email">
             <td></td>
             <td><label>{{i18n 'user.email.instructions'}}</label></td>
           </tr>
@@ -70,7 +70,8 @@
               <td></td>
               <td>
                 <label>{{passwordInstructions}}</label>
-                <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}"><i class="fa fa-exclamation-triangle"></i> {{i18n 'login.caps_lock_warning'}}</div>
+                <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">
+                  {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div>
               </td>
             </tr>
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs b/app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs
index 4dc7a96b32..367359d9e7 100644
--- a/app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs
@@ -5,5 +5,6 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action "dismissReadTopics" dismissTopics}}><i class="fa fa-check"></i> {{i18n 'topics.bulk.dismiss'}}</button>
+  <button class='btn btn-primary' {{action "dismissReadTopics" dismissTopics}}>
+    {{d-icon "check"}} {{i18n 'topics.bulk.dismiss'}}</button>
 </div>
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 8668ba43a1..4de56698a3 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
@@ -1,49 +1,35 @@
-<form>
-  {{#d-modal-body title="topic.topic_status_update.title" autoFocus="false"}}
-    <div class="control-group">
-      {{combo-box content=timerTypes value=selection width="50%"}}
-    </div>
+{{#d-modal-body title="topic.topic_status_update.title" autoFocus="false"}}
+  <div class="radios">
+    <label for="public-topic-timer">
+      {{radio-button id='public-topic-timer' name="topic-timer" value="true" selection=isPublic}}
+      <b>{{i18n 'topic.topic_status_update.public_timer_types'}}</b>
+    </label>
 
-    <div>
-      {{#if showTimeOnly}}
-        {{auto-update-input
-            input=updateTime
-            statusType=selection
-            basedOnLastPost=false}}
-      {{else if publishToCategory}}
-        <div class="control-group">
-          <label>{{i18n 'topic.topic_status_update.publish_to'}}</label>
-          {{category-chooser valueAttribute="id" value=categoryId excludeCategoryId=excludeCategoryId}}
-        </div>
-
-        {{auto-update-input
-            input=updateTime
-            statusType=selection
-            categoryId=categoryId
-            basedOnLastPost=false}}
-      {{else if autoClose}}
-        {{auto-update-input
-            input=updateTime
-            statusType=selection
-            basedOnLastPost=topicTimer.based_on_last_post
-            lastPostedAt=model.last_posted_at}}
-      {{/if}}
-    </div>
-  {{/d-modal-body}}
-
-  <div class="modal-footer">
-    {{d-button class="btn-primary"
-        disabled=saveDisabled
-        label="topic.topic_status_update.save"
-        action="saveTimer"}}
-
-    <a {{action "closeModal"}}>{{i18n 'cancel'}}</a>
-    {{conditional-loading-spinner size="small" condition=loading}}
-
-    {{#if topicTimer.execute_at}}
-      {{d-button class="pull-right btn-danger"
-          action="removeTimer"
-          label='topic.topic_status_update.remove'}}
-    {{/if}}
+    <label for="private-topic-timer">
+      {{radio-button id='private-topic-timer' name="topic-timer" value="false" selection=isPublic}}
+      <b>{{i18n 'topic.topic_status_update.private_timer_types'}}</b>
+    </label>
   </div>
-</form>
+
+  {{edit-topic-timer-form
+      topic=model
+      topicTimer=topicTimer
+      timerTypes=selections
+      updateTime=updateTime
+      closeModal="closeModal"}}
+{{/d-modal-body}}
+
+<div class="modal-footer">
+  {{d-button class="btn-primary"
+      disabled=saveDisabled
+      label="topic.topic_status_update.save"
+      action="saveTimer"}}
+
+  {{conditional-loading-spinner size="small" condition=loading}}
+
+  {{#if topicTimer.execute_at}}
+    {{d-button class="pull-right btn-danger"
+        action="removeTimer"
+        label='topic.topic_status_update.remove'}}
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
index aebd7ad77f..36146e7ee4 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
@@ -38,7 +38,7 @@
         </p>
         <p class="with-validation">
           {{{pinMessage}}}
-          {{fa-icon "clock-o"}}
+          {{d-icon "clock-o"}}
           {{date-picker-future value=model.pinnedInCategoryUntil}}
           {{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}}
         </p>
@@ -64,7 +64,7 @@
         </p>
         <p class="with-validation">
           {{i18n "topic.feature_topic.pin_globally"}}
-          {{fa-icon "clock-o"}}
+          {{d-icon "clock-o"}}
           {{date-picker-future value=model.pinnedGloballyUntil}}
           {{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}
         </p>
@@ -107,5 +107,5 @@
   </div>
 {{/d-modal-body}}
 <div class="modal-footer">
-  <a class="pull-right" {{action "closeModal"}}>{{i18n "cancel"}}</a>
+  {{d-modal-cancel close=(action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/flag.hbs b/app/assets/javascripts/discourse/templates/modal/flag.hbs
index 3b0da39123..e863fd7948 100644
--- a/app/assets/javascripts/discourse/templates/modal/flag.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/flag.hbs
@@ -13,17 +13,39 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action "createFlag"}} disabled={{submitDisabled}} title="{{i18n 'flagging.submit_tooltip'}}">{{{submitText}}}</button>
+  {{d-button
+    class="btn-primary"
+    action=(action "createFlag")
+    disabled=submitDisabled
+    title="flagging.submit_tooltip"
+    icon=submitIcon
+    label=submitLabel}}
 
   {{#if canSendWarning}}
-    <button class="btn btn-danger" {{action "createFlagAsWarning" }} disabled={{submitDisabled}} title="{{i18n 'flagging.official_warning'}}"><i class="fa fa-exclamation-triangle"></i> {{i18n 'flagging.official_warning'}}</button>
+    {{d-button
+      class="btn-danger"
+      action=(action "createFlagAsWarning")
+      disabled=submitDisabled
+      icon="exclamation-triangle"
+      label="flagging.official_warning"}}
   {{/if}}
 
   {{#if canTakeAction}}
-    <button class='btn btn-danger' {{action "takeAction"}} disabled={{submitDisabled}} title="{{i18n 'flagging.take_action_tooltip'}}"><i class="fa fa-gavel"></i>{{i18n 'flagging.take_action'}}</button>
+    {{d-button
+      class="btn-danger"
+      action=(action "takeAction")
+      disabled=submitDisabled
+      title="flagging.take_action_tooltip"
+      icon="gavel"
+      label="flagging.take_action"}}
   {{/if}}
 
-  {{#if canDeleteSpammer}}
-    <button class="btn btn-danger" {{action "deleteSpammer" userDetails}} disabled={{submitDisabled}} title="{{i18n 'flagging.delete_spammer'}}"><i class="fa fa-exclamation-triangle"></i> {{i18n 'flagging.delete_spammer'}}</button>
+  {{#if showDeleteSpammer}}
+    {{d-button
+      class="btn-danger"
+      action="deleteSpammer"
+      disabled=submitDisabled
+      icon="exclamation-triangle"
+      label="flagging.delete_spammer"}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
index 8a8db45cce..c739f77197 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/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index 8597721283..7b83a8961f 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -40,7 +40,7 @@
     </div>
   </div>
   <div id="revision-details">
-    {{fa-icon "pencil"}}
+    {{d-icon "pencil"}}
     {{#link-to 'user' model.username}}
       {{bound-avatar-template model.avatar_template "small"}} {{model.username}}
     {{/link-to}}
diff --git a/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs b/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs
index 7c5b9b171a..73e6bf0ca4 100644
--- a/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs
@@ -7,5 +7,5 @@
 
 <div class='modal-footer'>
   {{d-button class="btn-primary" action="jump" label="composer.modal_ok"}}
-  {{d-button class="btn-danger" action="closeModal" label="composer.modal_cancel"}}
+  {{d-modal-cancel close=(action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs
index f7a7d616bc..81b3fb611d 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/login.hbs
@@ -27,7 +27,7 @@
             </tr>
             <tr>
               <td></td>
-              <td><div class="caps-lock-warning {{unless capsLockOn 'invisible'}}"><i class="fa fa-exclamation-triangle"></i> {{i18n 'login.caps_lock_warning'}}</div></td>
+              <td><div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">{{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div></td>
               <td></td>
             </tr>
           </table>
@@ -43,7 +43,7 @@
       <button class="btn btn-large btn-primary"
         disabled={{loginDisabled}}
         {{action "login"}}>
-          <i class="fa fa-unlock"></i>&nbsp;{{loginButtonText}}
+          {{d-icon "unlock"}} &nbsp;{{loginButtonText}}
       </button>
 
       {{#if showSignupLink}}
diff --git a/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs b/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs
index 8cd51857b7..a94f8b40e4 100644
--- a/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs
@@ -8,6 +8,6 @@
 
 <div class="modal-footer">
   {{#d-button class="btn-primary" disabled=buttonDisabled action="movePostsToExistingTopic"}}
-    {{fa-icon 'sign-out'}} {{buttonTitle}}
+    {{d-icon 'sign-out'}} {{buttonTitle}}
   {{/d-button}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs b/app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs
new file mode 100644
index 0000000000..7455c62be3
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs
@@ -0,0 +1,21 @@
+<form class='request-group-membership-form'>
+  {{#d-modal-body rawTitle=title}}
+    <div class="control-group">
+      <label>
+        {{i18n "groups.membership_request.reason"}}
+      </label>
+
+      {{expanding-text-area value=reason}}
+    </div>
+  {{/d-modal-body}}
+
+  <div class="modal-footer">
+    {{d-button class="btn-primary"
+        disabled=disableSubmit
+        label="groups.membership_request.submit"
+        action="requestMember"}}
+
+    {{d-modal-cancel close=(action "closeModal")}}
+    {{conditional-loading-spinner size="small" condition=loading}}
+  </div>
+</form>
diff --git a/app/assets/javascripts/discourse/templates/modal/split-topic.hbs b/app/assets/javascripts/discourse/templates/modal/split-topic.hbs
index b18a2d793b..219584343f 100644
--- a/app/assets/javascripts/discourse/templates/modal/split-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/split-topic.hbs
@@ -6,12 +6,12 @@
     {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
 
     <label>{{i18n 'categories.category'}}</label>
-    {{category-chooser value=categoryId}}
+    {{category-chooser value=categoryId class="small"}}
   </form>
 {{/d-modal-body}}
 
 <div class="modal-footer">
   {{#d-button class="btn-primary" disabled=buttonDisabled action="movePostsToNewTopic"}}
-    {{fa-icon 'sign-out'}} {{buttonTitle}}
+    {{d-icon 'sign-out'}} {{buttonTitle}}
   {{/d-button}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/upload-selector.hbs b/app/assets/javascripts/discourse/templates/modal/upload-selector.hbs
index e0cd9a3134..0720195f8b 100644
--- a/app/assets/javascripts/discourse/templates/modal/upload-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/upload-selector.hbs
@@ -22,7 +22,7 @@
   {{#if showMore}}
     <div class="radios">
       <div class="inputs">
-        {{input value=imageLink laceholder="http://example.com"}}
+        {{input value=imageLink placeholder="http://example.com"}}
         <span class="description">{{i18n 'upload_selector.image_link'}}</span>
       </div>
     </div>
@@ -42,6 +42,6 @@
 
 <div class="modal-footer">
   {{d-button action="upload" class='btn-primary' icon=uploadIcon label='upload'}}
-  <a href {{action "closeModal"}}>{{i18n 'cancel'}}</a>
+  {{d-modal-cancel close=(action "closeModal")}}
   {{#if remote}}<a {{action "toggleShowMore"}} class="pull-right">{{i18n 'show_more'}}</a>{{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/navigation/categories.hbs b/app/assets/javascripts/discourse/templates/navigation/categories.hbs
index a324ccebc7..30495333df 100644
--- a/app/assets/javascripts/discourse/templates/navigation/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/categories.hbs
@@ -1,12 +1,9 @@
-{{#d-section bodyClass="navigation-categories"}}
-  {{bread-crumbs categories=categories}}
-
-  {{navigation-bar navItems=navItems filterMode=filterMode}}
-
-  {{#if canCreateCategory}}
-    {{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>
-  {{/if}}
+{{#d-section bodyClass="navigation-categories" class="navigation-container"}}
+  {{d-navigation
+    filterMode="categories"
+    showCategoryAdmin=showCategoryAdmin
+    createCategory=(route-action "createCategory")
+    reorderCategories=(route-action "reorderCategories")
+    canCreateTopic=canCreateTopic
+    createTopic=(route-action "createTopic")}}
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs
index a4e9aebda1..d8dcac7040 100644
--- a/app/assets/javascripts/discourse/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs
@@ -1,38 +1,25 @@
-{{add-category-class category=category}}
+{{#d-section class="navigation-container"}}
+  {{add-category-class category=category}}
 
-<section class='category-heading'>
-  {{#if category.uploaded_logo.url}}
-    {{cdn-img src=category.uploaded_logo.url class="category-logo"}}
-    {{#if category.description}}
-      <p>{{{category.description}}}</p>
+  <section class='category-heading'>
+    {{#if category.uploaded_logo.url}}
+      {{cdn-img src=category.uploaded_logo.url class="category-logo"}}
+      {{#if category.description}}
+        <p>{{{category.description}}}</p>
+      {{/if}}
     {{/if}}
-  {{/if}}
-</section>
+  </section>
 
-<div class='category-navigation'>
-  {{bread-crumbs categories=categories
-                 category=category
-                 noSubcategories=noSubcategories
-                 hideSubcategories=showingSubcategoryList}}
+  <div class='category-navigation'>
+    {{d-navigation
+      category=category
+      filterMode=filterMode
+      noSubcategories=noSubcategories
+      canCreateTopic=canCreateTopic
+      createTopic=(route-action "createTopic")
+      createTopicDisabled=cannotCreateTopicOnCategory
+      editCategory=(route-action "editCategory" category)}}
 
-  {{navigation-bar navItems=navItems filterMode=filterMode category=category}}
-
-  {{#if currentUser}}
-    {{category-notifications-button category=category}}
-  {{/if}}
-
-  {{#if canCreateTopic}}
-    {{d-button  id="create-topic"
-                class="btn-default"
-                action="createTopic"
-                icon="plus"
-                label="topic.create"
-                disabled=cannotCreateTopicOnCategory}}
-  {{/if}}
-
-  {{#if canEditCategory}}
-    {{d-button class="btn-default edit-category" action="editCategory" actionParam=category icon="wrench" label="category.edit_long"}}
-  {{/if}}
-
-  {{plugin-outlet name="category-navigation" args=(hash category=category)}}
-</div>
+    {{plugin-outlet name="category-navigation" args=(hash category=category)}}
+  </div>
+{{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/navigation/default.hbs b/app/assets/javascripts/discourse/templates/navigation/default.hbs
index c8cc96a9e7..b9d9854295 100644
--- a/app/assets/javascripts/discourse/templates/navigation/default.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/default.hbs
@@ -1,9 +1,6 @@
-{{#d-section bodyClass="navigation-topics" scrollTop="false"}}
-  {{bread-crumbs categories=categories}}
-
-  {{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>
-  {{/if}}
+{{#d-section bodyClass="navigation-topics" class="navigation-container" scrollTop="false"}}
+  {{d-navigation
+    filterMode=filterMode
+    canCreateTopic=canCreateTopic
+    createTopic=(route-action "createTopic")}}
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/password-reset.hbs b/app/assets/javascripts/discourse/templates/password-reset.hbs
index e101ed0b94..e999fedb1e 100644
--- a/app/assets/javascripts/discourse/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/templates/password-reset.hbs
@@ -25,7 +25,8 @@
         </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 class="caps-lock-warning {{unless capsLockOn 'invisible'}}">
+            {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div>
         </div>
 
         <button class='btn btn-primary' {{action "submit"}}>{{i18n 'user.change_password.set_password'}}</button>
diff --git a/app/assets/javascripts/discourse/templates/preferences-email.hbs b/app/assets/javascripts/discourse/templates/preferences-email.hbs
index 6c1beb2ad8..27e7b28cef 100644
--- a/app/assets/javascripts/discourse/templates/preferences-email.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-email.hbs
@@ -1,4 +1,4 @@
-<section class='user-content user-preferences'>
+<section class='user-right user-preferences'>
   <form class="form-horizontal">
 
     <div class="control-group">
@@ -8,11 +8,17 @@
     </div>
 
     {{#if success}}
-        <div class="control-group">
-          <div class="instructions">
-            <p>{{i18n 'user.change_email.success'}}</p>
-          </div>
+      <div class="control-group">
+        <div class="instructions">
+          <p>
+            {{#if currentUser.staff}}
+              {{i18n 'user.change_email.success_staff'}}
+            {{else}}
+              {{i18n 'user.change_email.success'}}
+            {{/if}}
+          </p>
         </div>
+      </div>
     {{else}}
       {{#if error}}
         <div class="control-group">
@@ -34,7 +40,6 @@
           {{else}}
             {{i18n 'user.email.instructions'}}
           {{/if}}
-
         </div>
       </div>
 
diff --git a/app/assets/javascripts/discourse/templates/preferences-username.hbs b/app/assets/javascripts/discourse/templates/preferences-username.hbs
index ae27149d9d..fc68eccedc 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/preferences.hbs b/app/assets/javascripts/discourse/templates/preferences.hbs
index 14efd012bd..e714afba84 100644
--- a/app/assets/javascripts/discourse/templates/preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences.hbs
@@ -1,18 +1,50 @@
 {{#d-section pageClass="user-preferences" class="user-navigation"}}
   {{#mobile-nav class='preferences-nav' desktopClass='preferences-list action-list nav-stacked' currentPath=application.currentPath}}
-    <li class='no-glyph nav-account'>{{#link-to 'preferences.account'}}{{i18n 'user.preferences_nav.account'}}{{/link-to}}</li>
-    <li class='no-glyph nav-profile'>{{#link-to 'preferences.profile'}}{{i18n 'user.preferences_nav.profile'}}{{/link-to}}</li>
-    <li class='no-glyph nav-emails'>{{#link-to 'preferences.emails'}}{{i18n 'user.preferences_nav.emails'}}{{/link-to}}</li>
-    <li class='no-glyph nav-notifications'>{{#link-to 'preferences.notifications'}}{{i18n 'user.preferences_nav.notifications'}}{{/link-to}}</li>
-    <li class='no-glyph indent nav-categories'>{{#link-to 'preferences.categories'}}{{i18n 'user.preferences_nav.categories'}}{{/link-to}}</li>
+    <li class='nav-account'>
+      {{#link-to 'preferences.account'}}
+        {{i18n 'user.preferences_nav.account'}}
+      {{/link-to}}
+    </li>
+    <li class='nav-profile'>
+      {{#link-to 'preferences.profile'}}
+        {{i18n 'user.preferences_nav.profile'}}
+      {{/link-to}}
+    </li>
+    <li class='nav-emails'>
+      {{#link-to 'preferences.emails'}}
+        {{i18n 'user.preferences_nav.emails'}}
+      {{/link-to}}
+    </li>
+    <li class='nav-notifications'>
+      {{#link-to 'preferences.notifications'}}
+        {{i18n 'user.preferences_nav.notifications'}}
+      {{/link-to}}
+    </li>
+    <li class='indent nav-categories'>
+      {{#link-to 'preferences.categories'}}
+        {{i18n 'user.preferences_nav.categories'}}
+      {{/link-to}}
+    </li>
     {{#if siteSettings.tagging_enabled}}
-      <li class='no-glyph indent nav-tags'>{{#link-to 'preferences.tags'}}{{i18n 'user.preferences_nav.tags'}}{{/link-to}}</li>
+      <li class='indent nav-tags'>
+        {{#link-to 'preferences.tags'}}
+          {{i18n 'user.preferences_nav.tags'}}
+        {{/link-to}}
+      </li>
     {{/if}}
-    <li class='no-glyph nav-interface'>{{#link-to 'preferences.interface'}}{{i18n 'user.preferences_nav.interface'}}{{/link-to}}</li>
+    <li class='nav-interface'>
+      {{#link-to 'preferences.interface'}}
+        {{i18n 'user.preferences_nav.interface'}}
+      {{/link-to}}
+    </li>
     {{#if model.userApiKeys}}
-      <li class='no-glyph nav-apps'>{{#link-to 'preferences.apps'}}{{i18n 'user.preferences_nav.apps'}}{{/link-to}}</li>
+      <li class='nav-apps'>
+        {{#link-to 'preferences.apps'}}
+          {{i18n 'user.preferences_nav.apps'}}
+        {{/link-to}}
+      </li>
     {{/if}}
-    {{plugin-outlet name="user-preferences-nav"}}
+    {{plugin-outlet name="user-preferences-nav" connectorTagName="li" args=(hash model=model)}}
   {{/mobile-nav}}
 {{/d-section}}
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 27e50337a3..38569dd9bd 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -3,12 +3,15 @@
   <div class="controls">
     <span class='static'>{{model.username}}</span>
     {{#if model.can_edit_username}}
-      {{#link-to "preferences.username" class="btn btn-small pad-left no-text"}}<i class="fa fa-pencil"></i>{{/link-to}}
+      {{#link-to "preferences.username" class="btn btn-small btn-icon pad-left no-text"}}
+      {{d-icon "pencil"}} {{/link-to}}
     {{/if}}
   </div>
-  <div class='instructions'>
-    {{{i18n 'user.username.short_instructions' username=model.username}}}
-  </div>
+  {{#if siteSettings.enable_mentions}}
+    <div class='instructions'>
+      {{{i18n 'user.username.short_instructions' username=model.username}}}
+    </div>
+  {{/if}}
 </div>
 
 {{#if canEditName}}
@@ -34,7 +37,7 @@
       <div class="controls">
         <span class='static'>{{model.email}}</span>
         {{#if model.can_edit_email}}
-          {{#link-to "preferences.email" class="btn btn-small pad-left no-text"}}{{fa-icon "pencil"}}{{/link-to}}
+          {{#link-to "preferences.email" class="btn btn-small btn-icon pad-left no-text"}}{{d-icon "pencil"}}{{/link-to}}
         {{/if}}
       </div>
       <div class='instructions'>
@@ -53,7 +56,7 @@
   <label class="control-label">{{i18n 'user.password.title'}}</label>
   <div class="controls">
     <a href {{action "changePassword"}} class='btn'>
-      {{fa-icon "envelope"}}
+      {{d-icon "envelope"}}
       {{#if model.no_password}}
         {{i18n 'user.change_password.set_password'}}
       {{else}}
@@ -81,22 +84,24 @@
     <label class="control-label">{{i18n 'user.title.title'}}</label>
     <div class="controls">
       <span class="static">{{model.title}}</span>
-      {{#link-to "preferences.badgeTitle" class="btn btn-small pad-left no-text"}}{{fa-icon "pencil"}}{{/link-to}}
+      {{#link-to "preferences.badgeTitle" class="btn btn-small btn-icon pad-left no-text"}}{{d-icon "pencil"}}{{/link-to}}
     </div>
   </div>
 {{/if}}
 
-{{plugin-outlet name="user-preferences-account"}}
+{{plugin-outlet name="user-preferences-account" args=(hash model=model save=(action "save"))}}
 
 <br/>
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-<div class="control-group save-button">
-  <div class="controls">
-    {{partial 'user/preferences/save-button'}}
+{{#if canSaveUser}}
+  <div class="control-group save-button">
+    <div class="controls">
+      {{partial 'user/preferences/save-button'}}
+    </div>
   </div>
-</div>
+{{/if}}
 
 
 {{#if model.canDeleteAccount}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs b/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs
index d23c2682a4..12f06094ea 100644
--- a/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs
@@ -10,7 +10,7 @@
     <div class="control-group">
       <label class="control-label"></label>
       <div class="controls">
-      {{combo-box valueAttribute="id" value=selectedUserBadgeId nameProperty="badge.name" content=selectableUserBadges}}
+        {{combo-box value=selectedUserBadgeId nameProperty="badge.name" content=selectableUserBadges}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
index 6562962686..ee57fea81e 100644
--- a/app/assets/javascripts/discourse/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
@@ -1,9 +1,8 @@
 <div class="control-group category-notifications">
-
   <label class="control-label">{{i18n 'user.categories_settings'}}</label>
 
   <div class="controls category-controls">
-    <label><span class="icon fa fa-exclamation-circle watching"></span> {{i18n 'user.watched_categories'}}</label>
+    <label>{{d-icon "d-watching"}} {{i18n 'user.watched_categories'}}</label>
     {{category-selector categories=model.watchedCategories blacklist=selectedCategories}}
   </div>
   <div class="instructions">{{i18n 'user.watched_categories_instructions'}}</div>
@@ -12,7 +11,7 @@
   </div>
 
   <div class="controls category-controls">
-    <label><span class="icon fa fa-circle tracking"></span> {{i18n 'user.tracked_categories'}}</label>
+    <label>{{d-icon "d-tracking"}} {{i18n 'user.tracked_categories'}}</label>
     {{category-selector categories=model.trackedCategories blacklist=selectedCategories}}
   </div>
   <div class="instructions">{{i18n 'user.tracked_categories_instructions'}}</div>
@@ -21,13 +20,13 @@
   </div>
 
   <div class="controls category-controls">
-    <label><span class="icon fa fa-dot-circle-o watching-first-post"></span> {{i18n 'user.watched_first_post_categories'}}</label>
-    {{category-selector categories=model.watchedFirstPostCategories}}
+    <label>{{d-icon "d-watching-first"}} {{i18n 'user.watched_first_post_categories'}}</label>
+    {{category-selector categories=model.watchedFirstPostCategories blacklist=selectedCategories}}
   </div>
   <div class="instructions">{{i18n 'user.watched_first_post_categories_instructions'}}</div>
 
   <div class="controls category-controls">
-    <label><span class="icon fa fa-times-circle muted"></span> {{i18n 'user.muted_categories'}}</label>
+    <label>{{d-icon "d-muted"}} {{i18n 'user.muted_categories'}}</label>
     {{category-selector categories=model.mutedCategories blacklist=selectedCategories}}
   </div>
   <div class="instructions">{{i18n 'user.muted_categories_instructions'}}</div>
@@ -43,8 +42,12 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
+{{#if canSave}}
 <div class="control-group save-button">
   <div class="controls">
     {{partial 'user/preferences/save-button'}}
   </div>
 </div>
+{{else}}
+  {{i18n 'user.no_category_access'}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
index 375bb5124d..9d5f3b5766 100644
--- a/app/assets/javascripts/discourse/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
@@ -25,7 +25,7 @@
     {{preference-checkbox labelKey="user.email_digests.title" disabled=model.user_option.mailing_list_mode checked=model.user_option.email_digests}}
     {{#if model.user_option.email_digests}}
       <div class='controls controls-dropdown'>
-        {{combo-box valueAttribute="value" content=digestFrequencies value=model.user_option.digest_after_minutes}}
+        {{combo-box valueAttribute="value" filterable=true content=digestFrequencies value=model.user_option.digest_after_minutes}}
       </div>
       {{preference-checkbox labelKey="user.include_tl0_in_digests" disabled=model.user_option.mailing_list_mode checked=model.user_option.include_tl0_in_digests}}
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
index f4b0b1e484..f6db98b840 100644
--- a/app/assets/javascripts/discourse/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
@@ -14,7 +14,7 @@
   <div class="control-group pref-locale">
     <label class="control-label">{{i18n 'user.locale.title'}}</label>
     <div class="controls">
-      {{combo-box valueAttribute="value" content=availableLocales value=model.locale none="user.locale.default"}}
+      {{combo-box filterable=true valueAttribute="value" content=availableLocales value=model.locale none="user.locale.default"}}
     </div>
     <div class='instructions'>
       {{i18n 'user.locale.instructions'}}
@@ -23,6 +23,13 @@
 {{/if}}
 
 
+<div class="control-group home">
+  <label class="control-label">{{i18n 'user.home'}}</label>
+  <div class="controls">
+    {{combo-box content=userSelectableHome valueAttribute="value" value=model.user_option.homepage_id}}
+  </div>
+</div>
+
 <div class="control-group other">
   <label class="control-label">{{i18n 'user.other_settings'}}</label>
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
index 6c81046e27..c0441202b4 100644
--- a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
@@ -1,7 +1,7 @@
 <div class="control-group notifications">
   <div class="controls controls-dropdown">
     <label>{{i18n 'user.new_topic_duration.label'}}</label>
-    {{combo-box valueAttribute="value" content=considerNewTopicOptions value=model.user_option.new_topic_duration_minutes}}
+    {{combo-box class="duration" valueAttribute="value" content=considerNewTopicOptions value=model.user_option.new_topic_duration_minutes}}
   </div>
 
   <div class="controls controls-dropdown">
@@ -26,10 +26,20 @@
   <div class="instructions">{{i18n 'user.desktop_notifications.each_browser_note'}}</div>
 </div>
 
+<div class="control-group private-messages">
+  <label class="control-label">{{i18n 'user.private_messages'}}</label>
+
+  <div class="controls">
+    {{preference-checkbox
+        labelKey="user.allow_private_messages"
+        checked=model.user_option.allow_private_messages}}
+  </div>
+</div>
+
 <div class="control-group muting">
   <label class="control-label">{{i18n 'user.users'}}</label>
   <div class="controls category-controls">
-    <label><span class="icon fa fa-times-circle muted"></span> {{i18n 'user.muted_users'}}</label>
+    <label>{{d-icon "d-muted" class="muted icon"}} {{i18n 'user.muted_users'}}</label>
     {{user-selector excludeCurrentUser=true usernames=model.muted_usernames class="user-selector"}}
   </div>
   <div class="instructions">{{i18n 'user.muted_users_instructions'}}</div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index c80b98e783..39686f2b12 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -1,7 +1,7 @@
 {{#if canChangeBio}}
 <div class="control-group pref-bio">
   <label class="control-label">{{i18n 'user.bio'}}</label>
-  <div class="controls bio-composer">
+  <div class="controls bio-composer input-xxlarge">
     {{d-editor value=model.bio_raw}}
   </div>
 </div>
@@ -56,7 +56,7 @@
     {{#if model.card_image_badge}}
       {{icon-or-image model.card_image_badge}}
     {{/if}}
-    {{#link-to "preferences.card-badge" class="btn btn-small pad-left no-text"}}{{fa-icon "pencil"}}{{/link-to}}
+    {{#link-to "preferences.card-badge" class="btn btn-small pad-left no-text"}}{{d-icon "pencil"}}{{/link-to}}
   </div>
 </div>
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/tags.hbs b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
index e2e9507b5b..1c24147a2f 100644
--- a/app/assets/javascripts/discourse/templates/preferences/tags.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
@@ -4,25 +4,25 @@
   <label class="control-label">{{i18n 'user.tag_settings'}}</label>
 
   <div class="controls tag-controls">
-    <label><span class="icon fa fa-exclamation-circle watching"></span> {{i18n 'user.watched_tags'}}</label>
+    <label>{{d-icon "d-watching" class="icon watching"}} {{i18n 'user.watched_tags'}}</label>
     {{tag-chooser tags=model.watched_tags blacklist=selectedTags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true"}}
   </div>
   <div class="instructions">{{i18n 'user.watched_tags_instructions'}}</div>
 
   <div class="controls tag-controls">
-    <label><span class="icon fa fa-circle tracking"></span> {{i18n 'user.tracked_tags'}}</label>
+    <label>{{d-icon "d-regular" class="icon tracking"}} {{i18n 'user.tracked_tags'}}</label>
     {{tag-chooser tags=model.tracked_tags blacklist=selectedTags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true"}}
   </div>
   <div class="instructions">{{i18n 'user.tracked_tags_instructions'}}</div>
 
   <div class="controls tag-controls">
-    <label><span class="icon fa fa-dot-circle-o watching-first-post"></span> {{i18n 'user.watched_first_post_tags'}}</label>
+    <label>{{d-icon "d-watching-first" class="icon watching-first-post"}} {{i18n 'user.watched_first_post_tags'}}</label>
     {{tag-chooser tags=model.watching_first_post_tags blacklist=selectedTags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true"}}
   </div>
   <div class="instructions">{{i18n 'user.watched_first_post_tags_instructions'}}</div>
 
   <div class="controls tag-controls">
-    <label><span class="icon fa fa-times-circle muted"></span> {{i18n 'user.muted_tags'}}</label>
+    <label>{{d-icon "d-muted" class="icon muted"}} {{i18n 'user.muted_tags'}}</label>
     {{tag-chooser tags=model.muted_tags blacklist=selectedTags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true"}}
   </div>
   <div class="instructions">{{i18n 'user.muted_tags_instructions'}}</div>
diff --git a/app/assets/javascripts/discourse/templates/tag-groups-show.hbs b/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
index 58b80d565e..26fde8830f 100644
--- a/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
+++ b/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
@@ -20,6 +20,6 @@
   </section>
 
   <button {{action "save"}} disabled={{model.disableSave}} class='btn'>{{i18n 'tagging.groups.save'}}</button>
-  <button {{action "destroy"}} disabled={{model.disableSave}} class='btn btn-danger'><i class="fa fa-trash-o"></i> {{i18n 'tagging.groups.delete'}}</button>
+  <button {{action "destroy"}} disabled={{model.disableSave}} class='btn btn-danger'>{{d-icon "trash-o"}} {{i18n 'tagging.groups.delete'}}</button>
   <span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/assets/javascripts/discourse/templates/tag-groups.hbs b/app/assets/javascripts/discourse/templates/tag-groups.hbs
index 139874e75d..a4c0ec21de 100644
--- a/app/assets/javascripts/discourse/templates/tag-groups.hbs
+++ b/app/assets/javascripts/discourse/templates/tag-groups.hbs
@@ -7,10 +7,10 @@
         <li><a {{action "selectTagGroup" tagGroup}} class="{{if tagGroup.selected 'active'}}">{{tagGroup.name}}</a></li>
       {{/each}}
     </ul>
-    <button {{action "newTagGroup"}} class='btn'><i class="fa fa-plus"></i>{{i18n 'tagging.groups.new'}}</button>
+    <button {{action "newTagGroup"}} class='btn'>{{d-icon "plus"}}{{i18n 'tagging.groups.new'}}</button>
   </div>
 
   {{outlet}}
 
   <div class="clearfix" />
-</div>
\ No newline at end of file
+</div>
diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/templates/tags/show.hbs
index 194b9ef3bc..3504bacd98 100644
--- a/app/assets/javascripts/discourse/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/show.hbs
@@ -15,23 +15,23 @@
       {{d-button action="deleteTag" icon="trash-o" class="admin-tag btn-danger"}}
       {{d-button action="renameTag" actionParam=tag icon="pencil" class="admin-tag"}}
     {{else}}
-      {{#if canCreateTopic}}
-        <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n 'topic.create'}}</button>
-      {{/if}}
+      {{create-topic-button
+        canCreateTopic=canCreateTopic
+        disabled=createTopicDisabled
+        action=(route-action "createTopic")}}
     {{/if}}
 
     {{#if showTagFilter}}
       {{bread-crumbs categories=categories
                      category=category
                      tagId=tag.id
-                     noSubcategories=noSubcategories
-                     hideSubcategories=showingSubcategoryList}}
+                     noSubcategories=noSubcategories}}
 
       {{navigation-bar navItems=navItems filterMode=filterMode}}
     {{else}}
       <h2 class="tag-show-heading">
         {{#link-to 'tags'}}{{i18n "tagging.tags"}}{{/link-to}}
-        {{fa-icon "angle-right"}}
+        {{d-icon "angle-right"}}
         {{discourse-tag-bound tagRecord=tag style="simple"}}
         {{#each additionalTags as |tag|}}
           <span>&amp;</span>
@@ -44,30 +44,30 @@
 
 {{plugin-outlet name="discovery-list-container-top"}}
 
-<footer class='topic-list-bottom'>
-  {{conditional-loading-spinner condition=loading}}
+{{conditional-loading-spinner condition=loading}}
 
-  {{#unless loading}}
-    {{#if list.topics}}
-      {{#discovery-topics-list model=list refresh="refresh"}}
-      {{bulk-select-button selected=selected action="refresh"}}
+{{#unless loading}}
+  {{#if list.topics}}
+    {{#discovery-topics-list model=list refresh="refresh"}}
+    {{bulk-select-button selected=selected action="refresh"}}
 
-      {{topic-list topics=list.topics
-                   canBulkSelect=canBulkSelect
-                   toggleBulkSelect="toggleBulkSelect"
-                   bulkSelectEnabled=bulkSelectEnabled
-                   selected=selected
-                   showPosters=true
-                   currentUser=currentUser
-                   order=order
-                   ascending=ascending
-                   changeSort="changeSort"}}
+    {{topic-list topics=list.topics
+                 canBulkSelect=canBulkSelect
+                 toggleBulkSelect="toggleBulkSelect"
+                 bulkSelectEnabled=bulkSelectEnabled
+                 selected=selected
+                 showPosters=true
+                 order=order
+                 ascending=ascending
+                 changeSort="changeSort"}}
 
-      {{/discovery-topics-list}}
-    {{else}}
+    {{/discovery-topics-list}}
+  {{else}}
+    <footer class='topic-list-bottom'>
       <h3>
         {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}
       </h3>
-    {{/if}}
-  {{/unless}}
-</footer>
+    </footer>
+  {{/if}}
+{{/unless}}
+
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 ab53f6f29c..eba88d2dbb 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,15 +1,17 @@
 <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}}
-    <i class='{{view.sortClass}}'></i>
+    {{d-icon view.sortIcon}}
   {{/if ~}}
 </th>
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 e5d1f506d6..9f4646b3ad 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-status.raw.hbs b/app/assets/javascripts/discourse/templates/topic-status.raw.hbs
index 621415dfa1..c8b1c3a6f3 100644
--- a/app/assets/javascripts/discourse/templates/topic-status.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-status.raw.hbs
@@ -3,11 +3,12 @@
 {{/if ~}}
 {{~#each view.statuses as |status|~}}
 {{~#if status.href ~}}
-<a href='{{status.href}}' title='{{status.title}}' class='topic-status {{status.extraClasses}}'><i class='fa fa-{{status.icon}}'></i></a>
+<a href='{{status.href}}' title='{{status.title}}' class='topic-status {{status.extraClasses}}'>{{d-icon status.icon}}</a>
 {{~else ~}}
-<{{status.openTag}} title='{{status.title}}' class='topic-status'><i class='fa fa-{{status.icon}}'></i></{{status.closeTag}}>
+<{{status.openTag}} title='{{status.title}}' class='topic-status'>{{d-icon status.icon}}</{{status.closeTag}}>
 {{~/if ~}}
 {{~/each}}
+{{~#if view.showDefault~}}{{d-icon view.showDefault}}{{~/if ~}}
 {{~#if view.renderDiv ~}}
 </div>
 {{/if ~}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 24f4950982..28a0cf5fdc 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -10,59 +10,60 @@
 
   {{#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}}
+          <div class="edit-topic-title">
+          {{#if model.isPrivateMessage}}
+            <span class="private-message-glyph">{{d-icon "envelope"}}</span>
+          {{/if}}
+            {{text-field id="edit-title" value=buffered.title maxlength=siteSettings.max_topic_title_length autofocus="true"}}
+            {{#if showCategoryChooser}}
+              {{category-chooser class="small" value=buffered.category_id}}
+            {{/if}}
 
-          <div class="title-wrapper">
-            {{#if editingTopic}}
-              {{#if model.isPrivateMessage}}
-                <span class="private-message-glyph">{{fa-icon "envelope"}}</span>
-              {{/if}}
+            {{#if canEditTags}}
+              {{tag-chooser tags=buffered.tags categoryId=buffered.category_id}}
+            {{/if}}
 
-              {{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>
+            {{plugin-outlet name="edit-topic" args=(hash model=model buffered=buffered)}}
+            <div class="edit-controls">
               {{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}}
+              {{#if canRemoveTopicFeaturedLink}}
+                <a href {{action "removeFeaturedLink"}} class="remove-featured-link" title="{{i18n "composer.remove_featured_link"}}">
+                  {{d-icon "times-circle"}}
+                  {{featuredLinkDomain}}
+                </a>
+              {{/if}}
+            </div>
           </div>
-          {{plugin-outlet name="topic-title" args=(hash model=model)}}
-        </div>
-      </div>
+
+        {{else}}
+          <h1>
+            {{#unless model.is_warning}}
+              <a href={{pmPath}}>
+                <span class="private-message-glyph">{{d-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"}}">{{d-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,26 +72,27 @@
       </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
+            notificationLevel=model.details.notification_level
             prevEvent=info.prevEvent
             fullscreen=info.topicProgressExpanded
             enteredIndex=enteredIndex
@@ -113,11 +115,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}}
 
@@ -161,8 +181,9 @@
                 currentPostChanged=(action "currentPostChanged")
                 currentPostScrolled=(action "currentPostScrolled")
                 bottomVisibleChanged=(action "bottomVisibleChanged")
-                selectPost=(action "toggledSelectedPost")
-                selectReplies=(action "toggledSelectedPostReplies")
+                togglePostSelection=(action "togglePostSelection")
+                selectReplies=(action "selectReplies")
+                selectBelow=(action "selectBelow")
                 fillGapBefore=(action "fillGapBefore")
                 fillGapAfter=(action "fillGapAfter")}}
             {{/unless}}
@@ -174,6 +195,26 @@
           {{#conditional-loading-spinner condition=model.postStream.loadingFilter}}
             {{#if loadedAllPosts}}
 
+              {{#if model.pending_posts_count}}
+                <div class="has-pending-posts">
+                  {{{i18n "queue.has_pending_posts" count=model.pending_posts_count}}}
+
+                  {{#if currentUser.show_queued_posts}}
+                    {{#link-to "queued-posts"}}
+                      {{d-icon "check"}}
+                      {{i18n "queue.view_pending"}}
+                    {{/link-to}}
+                  {{/if}}
+                </div>
+              {{/if}}
+
+              {{#if model.private_topic_timer.execute_at}}
+                {{topic-timer-info
+                    statusType=model.private_topic_timer.status_type
+                    executeAt=model.private_topic_timer.execute_at
+                    duration=model.private_topic_timer.duration}}
+              {{/if}}
+
               {{topic-timer-info
                   statusType=model.topic_timer.status_type
                   executeAt=model.topic_timer.execute_at
@@ -186,6 +227,8 @@
                 {{signup-cta}}
               {{else}}
                 {{#if currentUser}}
+                  {{plugin-outlet name="topic-above-footer-buttons" args=(hash model=model)}}
+
                   {{topic-footer-buttons
                     topic=model
                     toggleMultiSelect=(action "toggleMultiSelect")
@@ -206,25 +249,12 @@
                     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}}
               {{/if}}
 
-              {{#if model.pending_posts_count}}
-                <div class="has-pending-posts">
-                  {{{i18n "queue.has_pending_posts" count=model.pending_posts_count}}}
-
-                  {{#if currentUser.show_queued_posts}}
-                    {{#link-to "queued-posts"}}
-                      {{fa-icon "check"}}
-                      {{i18n "queue.view_pending"}}
-                    {{/link-to}}
-                  {{/if}}
-                </div>
-              {{/if}}
-
               {{#if showSelectedPostsAtBottom}}
                 <div class='selected-posts {{unless multiSelect 'hidden'}}'>
                   {{partial "selected-posts"}}
@@ -233,22 +263,9 @@
 
               {{plugin-outlet name="topic-above-suggested" args=(hash model=model)}}
 
-              {{#if model.details.suggested_topics.length}}
-                <div id="suggested-topics">
-                  <h3>{{{suggestedTitle}}}</h3>
-                  <div class="topics">
-                    {{#if model.isPrivateMessage}}
-                      {{basic-topic-list hideCategory="true"
-                                         showPosters="true"
-                                         topics=model.details.suggested_topics}}
-                    {{else}}
-                      {{basic-topic-list topics=model.details.suggested_topics}}
-                    {{/if}}
-                  </div>
-                  <h3>{{{browseMoreMessage}}}</h3>
-                </div>
+              {{#if model.suggestedTopics.length}}
+                {{suggested-topics topic=model}}
               {{/if}}
-
             {{/if}}
           {{/conditional-loading-spinner}}
 
diff --git a/app/assets/javascripts/discourse/templates/topic/unsubscribe.hbs b/app/assets/javascripts/discourse/templates/topic/unsubscribe.hbs
index f330d1046b..17a4df882e 100644
--- a/app/assets/javascripts/discourse/templates/topic/unsubscribe.hbs
+++ b/app/assets/javascripts/discourse/templates/topic/unsubscribe.hbs
@@ -3,8 +3,11 @@
     <p>
       {{{stopNotificiationsText}}}
     </p>
+
     <p>
-      {{i18n "topic.unsubscribe.change_notification_state"}} {{topic-notifications-button topic=model}}
+      {{i18n "topic.unsubscribe.change_notification_state"}}
     </p>
+
+    {{topic-notifications-button notificationLevel=model.details.notification_level topic=model}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index 0a78d6e64f..5f8dc6d18a 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -17,9 +17,14 @@
               {{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}}
               {{#if canBulkInvite}}
                 {{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>
+                <a href="https://meta.discourse.org/t/sending-bulk-user-invites/16468" target="_blank" style="color:black;">{{d-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}}
@@ -66,7 +71,7 @@
                     <td>{{format-date invite.user.last_seen_at}}</td>
                     <td>{{number invite.user.topics_entered}}</td>
                     <td>{{number invite.user.posts_read_count}}</td>
-                    <td>{{{unbound invite.user.time_read}}}</td>
+                    <td>{{{format-duration invite.user.time_read}}}</td>
                     <td><span title="{{i18n 'user.invited.days_visited'}}">{{{unbound invite.user.days_visited}}}</span>
                         /
                       <span title="{{i18n 'user.invited.account_age_days'}}">{{{unbound invite.user.days_since_created}}}</span></td>
diff --git a/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs
index 02a8b005dd..a72dd3e518 100644
--- a/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs
@@ -9,11 +9,23 @@
         </a>
       </li>
     {{/each}}
+
+    {{#if options.emails}}
+      {{#each options.emails as |email|}}
+        <li>
+          <a href title="{{email.username}}">
+            <i class='fa fa-envelope'></i>
+            <span class='username'>{{email.username}}</span>
+          </a>
+        </li>
+      {{/each}}
+    {{/if}}
+
     {{#if options.groups}}
       {{#each options.groups as |group|}}
         <li>
           <a href title="{{group.full_name}}">
-            <i class='fa fa-users'></i>
+            {{d-icon "users"}}
             <span class='username'>{{group.name}}</span>
             <span class='name'>{{group.full_name}}</span>
           </a>
diff --git a/app/assets/javascripts/discourse/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/templates/user-topics-list.hbs
index 6ce1c11705..355e4aee77 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.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 7970c3f9a0..e97ab3cefb 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -3,31 +3,33 @@
 
     <section class="{{if collapsedInfo 'collapsed-info'}} about {{if hasProfileBackground 'has-background' 'no-background'}}"  style={{model.profileBackground}}>
     {{#unless collapsedInfo}}
-    <div class='staff-counters'>
-      {{#if model.number_of_flags_given}}
-        <div><span class="helpful-flags">{{model.number_of_flags_given}}</span>&nbsp;{{i18n 'user.staff_counters.flags_given'}}</div>
-      {{/if}}
-      {{#if model.number_of_flagged_posts}}
-        <div>
-          {{#link-to 'user.flaggedPosts' model}}
-            <span class="flagged-posts">{{model.number_of_flagged_posts}}</span>&nbsp;{{i18n 'user.staff_counters.flagged_posts'}}
-          {{/link-to}}
+      {{#if showStaffCounters}}
+        <div class='staff-counters'>
+          {{#if model.number_of_flags_given}}
+            <div><span class="helpful-flags">{{model.number_of_flags_given}}</span>{{i18n 'user.staff_counters.flags_given'}}</div>
+          {{/if}}
+          {{#if model.number_of_flagged_posts}}
+            <div>
+              {{#link-to 'user.flaggedPosts' model}}
+                <span class="flagged-posts">{{model.number_of_flagged_posts}}</span>{{i18n 'user.staff_counters.flagged_posts'}}
+              {{/link-to}}
+            </div>
+          {{/if}}
+          {{#if model.number_of_deleted_posts}}
+            <div>
+              {{#link-to 'user.deletedPosts' model}}
+                <span class="deleted-posts">{{model.number_of_deleted_posts}}</span>{{i18n 'user.staff_counters.deleted_posts'}}
+              {{/link-to}}
+            </div>
+          {{/if}}
+          {{#if model.number_of_suspensions}}
+            <div><span class="suspensions">{{model.number_of_suspensions}}</span>{{i18n 'user.staff_counters.suspensions'}}</div>
+          {{/if}}
+          {{#if model.warnings_received_count}}
+            <div><span class="warnings-received">{{model.warnings_received_count}}</span>{{i18n 'user.staff_counters.warnings_received'}}</div>
+          {{/if}}
         </div>
       {{/if}}
-      {{#if model.number_of_deleted_posts}}
-        <div>
-          {{#link-to 'user.deletedPosts' model}}
-            <span class="deleted-posts">{{model.number_of_deleted_posts}}</span>&nbsp;{{i18n 'user.staff_counters.deleted_posts'}}
-          {{/link-to}}
-        </div>
-      {{/if}}
-      {{#if model.number_of_suspensions}}
-        <div><span class="suspensions">{{model.number_of_suspensions}}</span>&nbsp;{{i18n 'user.staff_counters.suspensions'}}</div>
-      {{/if}}
-      {{#if model.warnings_received_count}}
-        <div><span class="warnings-received">{{model.warnings_received_count}}</span>&nbsp;{{i18n 'user.staff_counters.warnings_received'}}</div>
-      {{/if}}
-    </div>
     {{/unless}}
 
       <div class='profile-image'></div>
@@ -39,13 +41,13 @@
               {{#if model.can_send_private_message_to_user}}
               <li>
                 <a class='btn btn-primary' {{action "composePrivateMessage" model}}>
-                  {{fa-icon "envelope"}}
+                  {{d-icon "envelope"}}
                   {{i18n 'user.private_message'}}
                 </a>
               </li>
               {{/if}}
               {{#if currentUser.staff}}
-                <li><a href={{model.adminPath}} class="btn">{{fa-icon "wrench"}}{{i18n 'admin.user.show_admin_profile'}}</a></li>
+                <li><a href={{model.adminPath}} class="btn">{{d-icon "wrench"}}{{i18n 'admin.user.show_admin_profile'}}</a></li>
               {{/if}}
               {{plugin-outlet name="user-profile-controls"
                               connectorTagName="li"
@@ -53,7 +55,7 @@
 
               {{#if collapsedInfo}}
               {{#if viewingSelf}}
-              <li><a {{action "expandProfile"}} href class="btn">{{fa-icon "angle-double-down"}}{{i18n 'user.expand_profile'}}</a></li>
+              <li><a {{action "expandProfile"}} href class="btn">{{d-icon "angle-double-down"}}{{i18n 'user.expand_profile'}}</a></li>
               {{/if}}
               {{/if}}
 
@@ -61,16 +63,16 @@
           </section>
 
           <div class="primary-textual">
-            <h1 class="{{if nameFirst "full-name" "username"}}">{{if nameFirst model.name model.username}} {{user-status model currentUser=currentUser}}</h1>
+            <h1 class="{{if nameFirst "full-name" "username"}}">{{if nameFirst model.name (format-username model.username)}} {{user-status model currentUser=currentUser}}</h1>
             <h2 class="{{if nameFirst "username" "full-name"}}">{{#if nameFirst}}{{model.username}}{{else}}{{model.name}}{{/if}}</h2>
             {{#if model.title}}
               <h3>{{model.title}}</h3>
             {{/if}}
             {{plugin-outlet name="user-post-names" args=(hash model=model)}}
             <h3>
-            {{#if model.location}}{{fa-icon "map-marker"}} {{model.location}}{{/if}}
+            {{#if model.location}}{{d-icon "map-marker"}} {{model.location}}{{/if}}
             {{#if model.website_name}}
-              {{fa-icon "globe"}}
+              {{d-icon "globe"}}
               {{#if linkWebsite}}
                 <a href={{model.website}} rel={{unless removeNoFollow 'nofollow noopener'}} target="_blank">{{model.website_name}}</a>
               {{else}}
@@ -83,9 +85,17 @@
             <div class='bio'>
               {{#if model.isSuspended}}
                 <div class='suspended'>
-                  {{fa-icon "ban"}}
-                  <b>{{i18n 'user.suspended_notice' date=model.suspendedTillDate}}</b><br/>
-                  <b>{{i18n 'user.suspended_reason'}}</b> {{model.suspend_reason}}
+                  {{d-icon "ban"}}
+                  <b>
+                    {{#if model.suspendedForever}}
+                      {{i18n 'user.suspended_permanently'}}
+                    {{else}}
+                      {{i18n 'user.suspended_notice' date=model.suspendedTillDate}}
+                    {{/if}}
+                  </b><br>
+                  {{#if model.suspend_reason}}
+                    <b>{{i18n 'user.suspended_reason'}}</b> {{model.suspend_reason}}
+                  {{/if}}
                 </div>
               {{/if}}
               {{#if isNotSuspendedOrIsStaff}}
@@ -116,7 +126,6 @@
         <div style='clear: both'></div>
       </div>
 
-
       {{#unless collapsedInfo}}
       <div class='secondary'>
         <dl>
@@ -133,7 +142,9 @@
           {{#if model.invited_by}}
             <dt class="invited-by">{{i18n 'user.invited_by'}}</dt><dd class="invited-by">{{#link-to 'user' model.invited_by}}{{model.invited_by.username}}{{/link-to}}</dd>
           {{/if}}
-          <dt class="trust-level">{{i18n 'user.trust_level'}}</dt><dd class="trust-level">{{model.trustLevel.name}}</dd>
+          {{#if model.trust_level}}
+            <dt class="trust-level">{{i18n 'user.trust_level'}}</dt><dd class="trust-level">{{model.trustLevel.name}}</dd>
+          {{/if}}
           {{#if canCheckEmails}}
             <dt>{{i18n 'user.email.title'}}</dt>
             <dd title={{model.email}}>
@@ -167,22 +178,22 @@
       {{#if showNotificationsTab}}
         <li>
           {{#link-to 'userNotifications'}}
-            {{fa-icon "comment" class="glyph"}}{{i18n 'user.notifications'}}
+            {{d-icon "comment" class="glyph"}}{{i18n 'user.notifications'}}
           {{/link-to}}
         </li>
       {{/if}}
       {{#if showPrivateMessages}}
-        <li>{{#link-to 'userPrivateMessages'}}{{fa-icon "envelope-o"}}{{i18n 'user.private_messages'}}{{/link-to}}</li>
+        <li>{{#link-to 'userPrivateMessages'}}{{d-icon "envelope-o"}}{{i18n 'user.private_messages'}}{{/link-to}}</li>
       {{/if}}
       {{#if canInviteToForum}}
-        <li>{{#link-to 'userInvited'}}{{fa-icon "user-plus"}}{{i18n 'user.invited.title'}}{{/link-to}}</li>
+        <li>{{#link-to 'userInvited'}}{{d-icon "user-plus"}}{{i18n 'user.invited.title'}}{{/link-to}}</li>
       {{/if}}
       {{#if showBadges}}
-        <li>{{#link-to 'user.badges'}}{{fa-icon "certificate"}}{{i18n 'badges.title'}}{{/link-to}}</li>
+        <li>{{#link-to 'user.badges'}}{{d-icon "certificate"}}{{i18n 'badges.title'}}{{/link-to}}</li>
       {{/if}}
-      {{plugin-outlet name="user-main-nav" connectorTagName='li' args=(hash model=model)}}
+      {{plugin-outlet name="user-main-nav" tagName='' connectorTagName='li' args=(hash model=model)}}
       {{#if model.can_edit}}
-        <li>{{#link-to 'preferences'}}{{fa-icon "cog"}}{{i18n 'user.preferences'}}{{/link-to}}</li>
+        <li>{{#link-to 'preferences'}}{{d-icon "cog"}}{{i18n 'user.preferences'}}{{/link-to}}</li>
       {{/if}}
     {{/mobile-nav}}
 
diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/templates/user/activity.hbs
index b0fa84ba14..f546aff2f4 100644
--- a/app/assets/javascripts/discourse/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/user/activity.hbs
@@ -1,26 +1,20 @@
 {{#d-section pageClass="user-activity" class="user-navigation" scrollTop="false"}}
-  {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=currentPath}}
-    <li class='no-glyph'>
+  {{#mobile-nav class='activity-nav' desktopClass='action-list activity-list nav-stacked' currentPath=application.currentPath}}
+    <li>
       {{#link-to 'userActivity.index'}}{{i18n 'user.filters.all'}}{{/link-to}}
     </li>
-    <li class='no-glyph'>
+    <li>
       {{#link-to 'userActivity.topics'}}{{i18n 'user_action_groups.4'}}{{/link-to}}
     </li>
     <li>
-      {{#link-to 'userActivity.replies'}}
-        <i class="glyph fa fa-reply"></i>{{i18n 'user_action_groups.5'}}
-      {{/link-to}}
+      {{#link-to 'userActivity.replies'}}{{i18n 'user_action_groups.5'}}{{/link-to}}
     </li>
     <li>
-      {{#link-to 'userActivity.likesGiven'}}
-        <i class="glyph fa fa-heart"></i>{{i18n 'user_action_groups.1'}}
-      {{/link-to}}
+      {{#link-to 'userActivity.likesGiven'}}{{i18n 'user_action_groups.1'}}{{/link-to}}
     </li>
-    {{#if showBookmarks}}
+    {{#if user.showBookmarks}}
     <li>
-      {{#link-to 'userActivity.bookmarks'}}
-        <i class="glyph fa fa-bookmark"></i>{{i18n 'user_action_groups.3'}}
-      {{/link-to}}
+      {{#link-to 'userActivity.bookmarks'}}{{i18n 'user_action_groups.3'}}{{/link-to}}
     </li>
     {{/if}}
     {{plugin-outlet name="user-activity-bottom"
@@ -28,7 +22,7 @@
                     args=(hash model=model)}}
   {{/mobile-nav}}
 
-  {{#if viewingSelf}}
+  {{#if canDownloadPosts}}
     <div class='user-archive'>
       {{d-button action="exportUserArchive" label="user.download_archive.button_text" icon="download"}}
     </div>
diff --git a/app/assets/javascripts/discourse/templates/user/badge-title.hbs b/app/assets/javascripts/discourse/templates/user/badge-title.hbs
index dcad8ac772..f51fbd234b 100644
--- a/app/assets/javascripts/discourse/templates/user/badge-title.hbs
+++ b/app/assets/javascripts/discourse/templates/user/badge-title.hbs
@@ -1,25 +1 @@
-<section class='user-content'>
-  <form class="form-horizontal">
-
-    <div class="control-group">
-      <div class="controls">
-        <h3>{{i18n 'badges.select_badge_for_title'}}</h3>
-      </div>
-    </div>
-
-    <div class="control-group">
-      <label class="control-label"></label>
-      <div class="controls">
-        {{combo-box valueAttribute="id" value=selectedUserBadgeId nameProperty="badge.name" content=selectableUserBadges}}
-      </div>
-    </div>
-
-    <div class="control-group">
-      <div class="controls">
-        <button class="btn btn-primary" disabled={{disableSave}} {{action "save"}}>{{savingStatus}}</button>
-        {{#if saved}}{{i18n 'saved'}}{{/if}}
-      </div>
-    </div>
-
-  </form>
-</section>
+{{badge-title selectableUserBadges=selectableUserBadges user=user}}
diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs
index ece0c407b7..5a78828233 100644
--- a/app/assets/javascripts/discourse/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/user/messages.hbs
@@ -26,7 +26,7 @@
     {{#if group.has_messages}}
     <li>
       {{#link-to 'userPrivateMessages.group' group.name}}
-        <i class='glyph fa fa-group'></i>
+        {{d-icon "group" class="glyph"}}
         {{capitalize-string group.name}}
       {{/link-to}}
     </li>
@@ -44,7 +44,7 @@
 
 <div class="clearfix list-actions">
     <button {{action "toggleBulkSelect"}} class="btn bulk-select" title="{{i18n "user.messages.bulk_select"}}">
-      <i class="fa fa-list"></i>
+      {{d-icon "list"}}
     </button>
 
     {{#if site.mobileView}}
@@ -73,7 +73,7 @@
     {{/if}}
 
     {{#if isGroup}}
-      {{group-notifications-button group=group user=model}}
+      {{group-notifications-button value=group.group_user.notification_level group=group user=model}}
     {{/if}}
 </div>
 
diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs
index ce0128519f..c732db3fba 100644
--- a/app/assets/javascripts/discourse/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs
@@ -1,21 +1,32 @@
 {{#d-section pageClass="user-notifications" class="user-navigation"}}
   {{#mobile-nav class='notifications-nav' desktopClass='notification-list action-list nav-stacked' currentPath=application.currentPath}}
-    <li class='no-glyph'>
-      {{#link-to 'userNotifications.index'}}{{i18n 'user.filters.all'}}{{/link-to}}
+    <li>
+      {{#link-to 'userNotifications.index'}}
+        {{i18n 'user.filters.all'}}
+      {{/link-to}}
     </li>
     <li>
       {{#link-to 'userNotifications.responses'}}
-        <i class="glyph fa fa-reply"></i>
         {{i18n 'user_action_groups.6'}}
       {{/link-to}}
     </li>
     <li>
       {{#link-to 'userNotifications.likesReceived'}}
-        <i class="glyph fa fa-heart"></i>{{i18n 'user_action_groups.2'}}
+        {{i18n 'user_action_groups.2'}}
+      {{/link-to}}
+    </li>
+    {{#if siteSettings.enable_mentions}}
+      <li>
+        {{#link-to 'userNotifications.mentions'}}
+          {{i18n 'user_action_groups.7'}}
+        {{/link-to}}
+      </li>
+    {{/if}}
+    <li>
+      {{#link-to 'userNotifications.edits'}}
+        {{i18n 'user_action_groups.11'}}
       {{/link-to}}
     </li>
-    <li>{{#link-to 'userNotifications.mentions'}}<i class="glyph fa fa-at"></i>{{i18n 'user_action_groups.7'}}{{/link-to}}</li>
-    <li>{{#link-to 'userNotifications.edits'}}<i class="glyph fa fa-pencil"></i>{{i18n 'user_action_groups.11'}}{{/link-to}}</li>
   {{/mobile-nav}}
 
   {{#if model}}
diff --git a/app/assets/javascripts/discourse/templates/user/posts.hbs b/app/assets/javascripts/discourse/templates/user/posts.hbs
index 08fc6f5f27..b1743bf077 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 220ae57ba8..1af06a86d9 100644
--- a/app/assets/javascripts/discourse/templates/user/stream.hbs
+++ b/app/assets/javascripts/discourse/templates/user/stream.hbs
@@ -1,10 +1,4 @@
 {{#if model.noContent}}
-  <div class='no-content'>
-    {{{model.noContentHelp}}}
-  </div>
+  <div class='alert alert-info'>{{{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 679bd10259..695cbf1c01 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -6,15 +6,22 @@
         {{user-stat value=model.days_visited label="user.summary.days_visited"}}
       </li>
       <li>
-        <span class='value'>{{model.time_read}}</span>
-        <span class='label'>{{{i18n "user.summary.time_read"}}}</span>
+        {{user-stat value=timeRead label="user.summary.time_read" type="string"}}
+      </li>
+      {{#if showRecentTimeRead}}
+        <li>
+          {{user-stat value=recentTimeRead label="user.summary.recent_time_read" type="string"}}
+        </li>
+      {{/if}}
+      <li>
+        {{user-stat value=model.topics_entered label="user.summary.topics_entered"}}
       </li>
       <li>
         {{user-stat value=model.posts_read_count label="user.summary.posts_read"}}
       </li>
       <li class="linked-stat">
         {{#link-to 'userActivity.likesGiven'}}
-          {{user-stat value=model.likes_given label="user.summary.likes_given"}}
+          {{user-stat value=model.likes_given icon="heart" label="user.summary.likes_given"}}
         {{/link-to}}
       </li>
       {{#if model.bookmark_count}}
@@ -35,70 +42,36 @@
         {{/link-to}}
       </li>
       <li>
-          {{user-stat value=model.likes_received label="user.summary.likes_received"}}
+        {{user-stat value=model.likes_received icon="heart" label="user.summary.likes_received"}}
       </li>
-      {{plugin-outlet name="user-summary-stat"
-                      connectorTagName="li"
-                      args=(hash model=model)}}
+      {{plugin-outlet name="user-summary-stat" connectorTagName="li" args=(hash model=model)}}
     </ul>
   </div>
 
   <div class='top-section'>
-    <div class='top-sub-section replies-section pull-left'>
-      <h3 class='stats-title'>{{i18n "user.summary.top_replies"}}</h3>
-      {{#if model.replies.length}}
-        <ul>
-          {{#each model.replies as |reply|}}
-            <li>
-              <span class='topic-info'>
-                {{format-date reply.createdAt format="tiny" noTitle="true"}}
-                {{#if reply.like_count}}
-                  &middot;
-                  {{fa-icon 'heart'}}&nbsp;<span class='like-count'>{{number reply.like_count}}</span>
-                {{/if}}
-              </span>
-              <br>
-              <a href="{{unbound reply.url}}">{{{reply.topic.fancyTitle}}}</a>
-            </li>
-          {{/each}}
-        </ul>
-        {{#if moreReplies}}
-          <p>{{#link-to "userActivity.replies" user class="more"}}{{i18n "user.summary.more_replies"}}{{/link-to}}</p>
-        {{/if}}
-      {{else}}
-        <p>{{i18n "user.summary.no_replies"}}</p>
-      {{/if}}
-    </div>
-    <div class='top-sub-section topics-section pull-right'>
-      <h3 class='stats-title'>{{i18n "user.summary.top_topics"}}</h3>
-      {{#if model.topics.length}}
-        <ul>
-          {{#each model.topics as |topic|}}
-            <li>
-              <span class='topic-info'>
-                {{format-date topic.createdAt format="tiny" noTitle="true"}}
-                {{#if topic.like_count}}
-                  &middot;
-                  {{fa-icon 'heart'}}&nbsp;<span class='like-count'>{{number topic.like_count}}</span>
-                {{/if}}
-              </span>
-              <br>
-              <a href="{{unbound topic.url}}">{{{topic.fancyTitle}}}</a>
-            </li>
-          {{/each}}
-        </ul>
-        {{#if moreTopics}}
-          <p>{{#link-to "userActivity.topics" user class="more"}}{{i18n "user.summary.more_topics"}}{{/link-to}}</p>
-        {{/if}}
-      {{else}}
-        <p>{{i18n "user.summary.no_topics"}}</p>
-      {{/if}}
-    </div>
+    {{#user-summary-section title="top_replies" class="replies-section pull-left"}}
+      {{#user-summary-topics-list type="replies" items=model.replies user=user as |reply|}}
+        {{user-summary-topic
+          createdAt=reply.createdAt
+          topic=reply.topic
+          likes=reply.like_count
+          url=reply.url}}
+      {{/user-summary-topics-list}}
+    {{/user-summary-section}}
+
+    {{#user-summary-section title="top_topics" class="topics-section pull-right"}}
+      {{#user-summary-topics-list type="topics" items=model.topics user=user as |topic|}}
+        {{user-summary-topic
+          createdAt=topic.created_at
+          topic=topic
+          likes=topic.like_count
+          url=topic.url}}
+      {{/user-summary-topics-list}}
+    {{/user-summary-section}}
   </div>
 
   <div class='top-section'>
-    <div class='top-sub-section links-section pull-left'>
-      <h3 class='stats-title'>{{i18n "user.summary.top_links"}}</h3>
+    {{#user-summary-section title="top_links" class="links-section pull-left"}}
       {{#if model.links.length}}
         <ul>
           {{#each model.links as |link|}}
@@ -119,61 +92,27 @@
       {{else}}
         <p>{{i18n "user.summary.no_links"}}</p>
       {{/if}}
-    </div>
-    <div class='top-sub-section likes-section pull-right'>
-    <h3 class='stats-title'>{{i18n "user.summary.most_replied_to_users"}}</h3>
-      {{#if model.most_replied_to_users.length}}
-        <ul>
-          {{#each model.most_replied_to_users as |user|}}
-            <li>
-              {{#user-info user=user}}
-                {{fa-icon "reply"}}
-                <span class='replies'>{{number user.count}}</span>
-              {{/user-info}}
-            </li>
-          {{/each}}
-        </ul>
-      {{else}}
-        <p>{{i18n "user.summary.no_replies"}}</p>
-      {{/if}}
-    </div>
+    {{/user-summary-section}}
+
+    {{#user-summary-section title="most_replied_to_users" class="summary-user-list replied-section pull-right"}}
+      {{#user-summary-users-list none="no_replies" users=model.most_replied_to_users as |user|}}
+        {{user-summary-user user=user icon="reply" countClass="replies"}}
+      {{/user-summary-users-list}}
+    {{/user-summary-section}}
   </div>
 
-  <div class='top-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}}
-        <ul>
-          {{#each model.most_liked_by_users as |user|}}
-            <li>
-              {{#user-info user=user}}
-                {{fa-icon "heart"}}
-                <span class='likes'>{{number user.count}}</span>
-              {{/user-info}}
-            </li>
-          {{/each}}
-        </ul>
-      {{else}}
-        <p>{{i18n "user.summary.no_likes"}}</p>
-      {{/if}}
-    </div>
-    <div class='top-sub-section likes-section pull-right'>
-      <h3 class='stats-title'>{{i18n "user.summary.most_liked_users"}}</h3>
-      {{#if model.most_liked_users.length}}
-        <ul>
-          {{#each model.most_liked_users as |user|}}
-            <li>
-              {{#user-info user=user}}
-                {{fa-icon "heart"}}
-                <span class='likes'>{{number user.count}}</span>
-              {{/user-info}}
-            </li>
-          {{/each}}
-        </ul>
-      {{else}}
-        <p>{{i18n "user.summary.no_likes"}}</p>
-      {{/if}}
-    </div>
+  <div class='top-section most-liked-section'>
+    {{#user-summary-section title="most_liked_by" class="summary-user-list liked-by-section pull-left"}}
+      {{#user-summary-users-list none="no_likes" users=model.most_liked_by_users as |user|}}
+        {{user-summary-user user=user icon="heart" countClass="likes"}}
+      {{/user-summary-users-list}}
+    {{/user-summary-section}}
+
+    {{#user-summary-section title="most_liked_users" class="summary-user-list liked-section pull-right"}}
+      {{#user-summary-users-list none="no_likes" users=model.most_liked_users as |user|}}
+        {{user-summary-user user=user icon="heart" countClass="likes"}}
+      {{/user-summary-users-list}}
+    {{/user-summary-section}}
   </div>
 
   {{#if siteSettings.enable_badges}}
diff --git a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 b/app/assets/javascripts/discourse/widgets/actions-summary.js.es6
index df852621b9..2d4c1b296e 100644
--- a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6
+++ b/app/assets/javascripts/discourse/widgets/actions-summary.js.es6
@@ -1,6 +1,6 @@
 import { createWidget } from 'discourse/widgets/widget';
 import { avatarFor } from 'discourse/widgets/post';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { h } from 'virtual-dom';
 import { dateNode } from 'discourse/helpers/node';
 import { userPath } from 'discourse/lib/url';
@@ -30,7 +30,7 @@ createWidget('small-user-list', {
       let description = null;
 
       if (atts.description) {
-        description = I18n.t(atts.description, { icons: '' });
+        description = I18n.t(atts.description, { count: atts.count });
       }
 
       // oddly post_url is on the user
@@ -119,6 +119,23 @@ createWidget('actions-summary-item', {
   }
 });
 
+createWidget('deleted-post', {
+  tagName: 'div.post-action.deleted-post',
+
+  html(attrs) {
+    return [
+      iconNode('trash-o'),
+      ' ',
+      avatarFor.call(this, 'small', {
+        template: attrs.deletedByAvatarTemplate,
+        username: attrs.deletedByUsername
+      }),
+      ' ',
+      dateNode(attrs.deleted_at)
+    ];
+  }
+});
+
 export default createWidget('actions-summary', {
   tagName: 'section.post-actions',
 
@@ -131,16 +148,7 @@ export default createWidget('actions-summary', {
     });
 
     if (attrs.deleted_at) {
-      body.push(h('div.post-action', [
-        iconNode('trash-o'),
-        ' ',
-        avatarFor.call(this, 'small', {
-          template: attrs.deletedByAvatarTemplate,
-          username: attrs.deletedByUsername
-        }),
-        ' ',
-        dateNode(attrs.deleted_at)
-      ]));
+      body.push(this.attach('deleted-post', attrs));
     }
 
     return body;
diff --git a/app/assets/javascripts/discourse/widgets/button.js.es6 b/app/assets/javascripts/discourse/widgets/button.js.es6
index f3893f1f69..ebc7b56149 100644
--- a/app/assets/javascripts/discourse/widgets/button.js.es6
+++ b/app/assets/javascripts/discourse/widgets/button.js.es6
@@ -1,14 +1,26 @@
 import { createWidget } from 'discourse/widgets/widget';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
+import { h } from 'virtual-dom';
 
-export default createWidget('button', {
-  tagName: 'button.widget-button',
+export const ButtonClass = {
+  tagName: 'button.widget-button.btn',
 
   buildClasses(attrs) {
-    const className = this.attrs.className || '';
+    let className = this.attrs.className || '';
 
-    if (!attrs.label && !attrs.contents) {
-      return className + ' no-text';
+    let hasText = attrs.label || attrs.contents;
+
+    if (!hasText) {
+      className += ' no-text';
+    }
+
+    if (attrs.icon) {
+      className += ' btn-icon';
+      if (hasText) {
+        className += '-text';
+      }
+    } else if (hasText) {
+      className += ' btn-text';
     }
 
     return className;
@@ -38,7 +50,9 @@ export default createWidget('button', {
     const contents = [];
     const left = !attrs.iconRight;
     if (attrs.icon && left) { contents.push(iconNode(attrs.icon, { class: attrs.iconClass })); }
-    if (attrs.label) { contents.push(I18n.t(attrs.label, attrs.labelOptions)); }
+    if (attrs.label) {
+      contents.push(h('span.d-button-label', I18n.t(attrs.label, attrs.labelOptions)));
+    }
     if (attrs.contents) { contents.push(attrs.contents); }
     if (attrs.icon && !left) { contents.push(iconNode(attrs.icon, { class: attrs.iconClass })); }
 
@@ -59,4 +73,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/component-connector.js.es6 b/app/assets/javascripts/discourse/widgets/component-connector.js.es6
new file mode 100644
index 0000000000..5f01effceb
--- /dev/null
+++ b/app/assets/javascripts/discourse/widgets/component-connector.js.es6
@@ -0,0 +1,51 @@
+export default class ComponentConnector {
+  constructor(widget, componentName, opts, trackedProperties) {
+    this.widget = widget;
+    this.opts = opts;
+    this.componentName = componentName;
+    this.trackedProperties = trackedProperties || [];
+  }
+
+  init() {
+    const $elem = $('<div style="display: inline-flex;" class="widget-component-connector"></div>');
+    const elem = $elem[0];
+    const { opts, widget, componentName } = this;
+
+    Ember.run.next(() => {
+      const mounted = widget._findView();
+
+      const view = widget
+        .register
+        .lookupFactory(`component:${componentName}`)
+        .create(opts);
+
+      if (Ember.setOwner) {
+        Ember.setOwner(view, Ember.getOwner(mounted));
+      }
+
+      mounted._connected.push(view);
+      view.renderer.appendTo(view, $elem[0]);
+    });
+
+    return elem;
+  }
+
+  update(prev) {
+    // mutated external properties might not correctly update the underlying component
+    // in this case we can define trackedProperties, if different from previous
+    // state we will re-init the whole component, be careful when using this
+    // to not track a property which would be updated too often (on scroll for example)
+    let shouldInit = false;
+    this.trackedProperties.forEach(prop => {
+      if (prev.opts[prop] !== this.opts[prop]) {
+        shouldInit = true;
+      }
+    });
+
+    if (shouldInit) return this.init();
+
+    return null;
+  }
+}
+
+ComponentConnector.prototype.type = 'Widget';
diff --git a/app/assets/javascripts/discourse/widgets/embedded-post.js.es6 b/app/assets/javascripts/discourse/widgets/embedded-post.js.es6
index 6f572388ab..56d8fb18be 100644
--- a/app/assets/javascripts/discourse/widgets/embedded-post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/embedded-post.js.es6
@@ -2,21 +2,23 @@ import PostCooked from 'discourse/widgets/post-cooked';
 import DecoratorHelper from 'discourse/widgets/decorator-helper';
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
 import DiscourseURL from 'discourse/lib/url';
+import hbs from 'discourse/widgets/hbs-compiler';
 
 createWidget('post-link-arrow', {
-  html(attrs) {
-   if (attrs.above) {
-     return h('a.post-info.arrow', {
-       attributes: { title: I18n.t('topic.jump_reply_up') }
-     }, iconNode('arrow-up'));
-   } else {
-     return h('a.post-info.arrow', {
-       attributes: { title: I18n.t('topic.jump_reply_down') }
-     }, iconNode('arrow-down'));
-   }
-  },
+  tagName: 'div.post-link-arrow',
+
+  template: hbs`
+    {{#if attrs.above}}
+      <a class="post-info arrow" title={{i18n "topic.jump_reply_up"}}>
+        {{d-icon "arrow-up"}}
+      </a>
+    {{else}}
+      <a class="post-info arrow" title={{i18n "topic.jump_reply_down"}}>
+        {{d-icon "arrow-down"}}
+      </a>
+    {{/if}}
+  `,
 
   click() {
     DiscourseURL.routeTo(this.attrs.shareUrl);
diff --git a/app/assets/javascripts/discourse/widgets/glue.js.es6 b/app/assets/javascripts/discourse/widgets/glue.js.es6
index 6351bc0710..ef126fe152 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/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
index 890a7a7b4a..77e8b33186 100644
--- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
@@ -33,17 +33,29 @@ createWidget('priority-faq-link', {
 export default createWidget('hamburger-menu', {
   tagName: 'div.hamburger-panel',
 
-  adminLinks() {
-    const { currentUser } = this;
+  settings: {
+    showCategories: true,
+    maxWidth: 300,
+    showFAQ: true,
+    showAbout: true
+  },
 
-    const links = [{ route: 'admin', className: 'admin-link', icon: 'wrench', label: 'admin_title' },
-                   { href: '/admin/flags/active',
-                     className: 'flagged-posts-link',
-                     icon: 'flag',
-                     label: 'flags_title',
-                     badgeClass: 'flagged-posts',
-                     badgeTitle: 'notifications.total_flagged',
-                     badgeCount: 'site_flagged_posts_count' }];
+  adminLinks() {
+    const { currentUser, siteSettings } = this;
+    let flagsPath = siteSettings.flags_default_topics ? 'topics' : 'active';
+
+    const links = [
+      { route: 'admin', className: 'admin-link', icon: 'wrench', label: 'admin_title' },
+      {
+        href: `/admin/flags/${flagsPath}`,
+        className: 'flagged-posts-link',
+        icon: 'flag',
+        label: 'flags_title',
+        badgeClass: 'flagged-posts',
+        badgeTitle: 'notifications.total_flagged',
+        badgeCount: 'site_flagged_posts_count'
+      }
+    ];
 
     if (currentUser.show_queued_posts) {
       links.push({ route: 'queued-posts',
@@ -120,7 +132,7 @@ export default createWidget('hamburger-menu', {
     const hideUncategorized = !this.siteSettings.allow_uncategorized_topics;
     const isStaff = Discourse.User.currentProp('staff');
 
-    const categories = Discourse.Category.list().reject((c) => {
+    const categories = this.site.get('categoriesList').reject((c) => {
       if (c.get('parentCategory.show_subcategory_list')) { return true; }
       if (hideUncategorized && c.get('isUncategorizedCategory') && !isStaff) { return true; }
       return false;
@@ -131,9 +143,11 @@ export default createWidget('hamburger-menu', {
 
   footerLinks(prioritizeFaq, faqUrl) {
     const links = [];
-    links.push({ route: 'about', className: 'about-link', label: 'about.simple_title' });
+    if (this.settings.showAbout) {
+      links.push({ route: 'about', className: 'about-link', label: 'about.simple_title' });
+    }
 
-    if (!prioritizeFaq) {
+    if (this.settings.showFAQ && !prioritizeFaq) {
       links.push({ href: faqUrl, className: 'faq-link', label: 'faq' });
     }
 
@@ -161,7 +175,10 @@ export default createWidget('hamburger-menu', {
       faqUrl = Discourse.getURL('/faq');
     }
 
-    const prioritizeFaq = this.currentUser && !this.currentUser.read_faq;
+    const prioritizeFaq = this.settings.showFAQ &&
+      this.currentUser &&
+      !this.currentUser.read_faq;
+
     if (prioritizeFaq) {
       results.push(this.attach('menu-links', { name: 'faq-link', heading: true, contents: () => {
         return this.attach('priority-faq-link', { href: faqUrl });
@@ -176,15 +193,22 @@ export default createWidget('hamburger-menu', {
     }
 
     results.push(this.attach('menu-links', {name: 'general-links', contents: () => this.generalLinks() }));
-    results.push(this.listCategories());
-    results.push(h('hr'));
+
+    if (this.settings.showCategories) {
+      results.push(this.listCategories());
+      results.push(h('hr'));
+    }
+
     results.push(this.attach('menu-links', {name: 'footer-links', omitRule: true, contents: () => this.footerLinks(prioritizeFaq, faqUrl) }));
 
     return results;
   },
 
   html() {
-    return this.attach('menu-panel', { contents: () => this.panelContents() });
+    return this.attach('menu-panel', {
+      contents: () => this.panelContents(),
+      maxWidth: this.settings.maxWidth,
+    });
   },
 
   clickOutside() {
diff --git a/app/assets/javascripts/discourse/widgets/hbs-compiler.js.es6 b/app/assets/javascripts/discourse/widgets/hbs-compiler.js.es6
new file mode 100644
index 0000000000..ef58ffc796
--- /dev/null
+++ b/app/assets/javascripts/discourse/widgets/hbs-compiler.js.es6
@@ -0,0 +1,3 @@
+export default function hbs() {
+  console.log('Templates should be precompiled server side');
+}
diff --git a/app/assets/javascripts/discourse/widgets/header-contents.js.es6 b/app/assets/javascripts/discourse/widgets/header-contents.js.es6
new file mode 100644
index 0000000000..e998053ff4
--- /dev/null
+++ b/app/assets/javascripts/discourse/widgets/header-contents.js.es6
@@ -0,0 +1,13 @@
+import { createWidget } from 'discourse/widgets/widget';
+import hbs from 'discourse/widgets/hbs-compiler';
+
+createWidget('header-contents', {
+  tagName: 'div.contents.clearfix',
+  template: hbs`
+    {{attach widget="home-logo" attrs=attrs}}
+    <div class="panel clearfix">{{yield}}</div>
+    {{#if attrs.topic}}
+      {{attach widget="header-topic-info" attrs=attrs}}
+    {{/if}}
+  `,
+});
diff --git a/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 b/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6
index 8a083df660..65ae654c5d 100644
--- a/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6
+++ b/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6
@@ -1,6 +1,6 @@
 import { applyDecorators, createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import DiscourseURL from 'discourse/lib/url';
 import RawHtml from 'discourse/widgets/raw-html';
 import renderTags from 'discourse/lib/render-tags';
diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6
index 5b67b1bda3..db166e6659 100644
--- a/app/assets/javascripts/discourse/widgets/header.js.es6
+++ b/app/assets/javascripts/discourse/widgets/header.js.es6
@@ -1,9 +1,10 @@
 import { createWidget } from 'discourse/widgets/widget';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 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';
 
@@ -27,23 +28,28 @@ createWidget('header-notifications', {
   },
 
   html(attrs) {
-    const { currentUser } = this;
+    const { user } = attrs;
 
     const contents = [ avatarImg(this.settings.avatarSize, {
-      template: currentUser.get('avatar_template'),
-      username: currentUser.get('username')
+      template: user.get('avatar_template'),
+      username: user.get('username')
     }) ];
 
-    const unreadNotifications = currentUser.get('unread_notifications');
+    const unreadNotifications = user.get('unread_notifications');
     if (!!unreadNotifications) {
-      contents.push(this.attach('link', { action: attrs.action,
-                                          className: 'badge-notification unread-notifications',
-                                          rawLabel: unreadNotifications }));
+      contents.push(this.attach('link', {
+        action: attrs.action,
+        className: 'badge-notification unread-notifications',
+        rawLabel: unreadNotifications,
+        omitSpan: true,
+        title: "notifications.tooltip.regular",
+        titleOptions: {count: unreadNotifications}
+      }));
     }
 
-    const unreadPMs = currentUser.get('unread_private_messages');
+    const unreadPMs = user.get('unread_private_messages');
     if (!!unreadPMs) {
-      if (!currentUser.get('read_first_notification')) {
+      if (!user.get('read_first_notification')) {
         contents.push(h('span.ring'));
         if (!attrs.active && attrs.ringBackdrop) {
           contents.push(h('span.ring-backdrop-spotlight'));
@@ -54,9 +60,14 @@ createWidget('header-notifications', {
         }
       };
 
-      contents.push(this.attach('link', { action: attrs.action,
-                                          className: 'badge-notification unread-private-messages',
-                                          rawLabel: unreadPMs }));
+      contents.push(this.attach('link', {
+        action: attrs.action,
+        className: 'badge-notification unread-private-messages',
+        rawLabel: unreadPMs,
+        omitSpan: true,
+        title: "notifications.tooltip.message",
+        titleOptions: {count: unreadPMs}
+      }));
     }
 
     return contents;
@@ -71,9 +82,7 @@ createWidget('user-dropdown', jQuery.extend({
   },
 
   html(attrs) {
-    const { currentUser } = this;
-
-    return h('a.icon', { attributes: { href: currentUser.get('path'), 'data-auto-route': true } },
+    return h('a.icon', { attributes: { href: attrs.user.get('path'), 'data-auto-route': true } },
              this.attach('header-notifications', attrs));
   }
 }, dropdown));
@@ -89,16 +98,23 @@ createWidget('header-dropdown', jQuery.extend({
       body.push(attrs.contents.call(this));
     }
 
-    return h('a.icon', { attributes: { href: attrs.href,
-                                       'data-auto-route': true,
-                                       title,
-                                       'aria-label': title,
-                                       id: attrs.iconId } }, body);
+    return h(
+      'a.icon.btn-flat',
+      { attributes: {
+        href: attrs.href,
+          'data-auto-route': true,
+          title,
+          'aria-label': title,
+          id: attrs.iconId
+        }
+      },
+      body
+    );
   }
 }, dropdown));
 
 createWidget('header-icons', {
-  tagName: 'ul.icons.clearfix',
+  tagName: 'ul.icons.d-header-icons.clearfix',
 
   buildAttributes() {
     return { role: 'navigation' };
@@ -131,10 +147,13 @@ createWidget('header-icons', {
                    });
 
     const icons = [search, hamburger];
-    if (this.currentUser) {
-      icons.push(this.attach('user-dropdown', { active: attrs.userVisible,
-                                                action: 'toggleUserMenu',
-                                                ringBackdrop: attrs.ringBackdrop }));
+    if (attrs.user) {
+      icons.push(this.attach('user-dropdown', {
+        active: attrs.userVisible,
+        action: 'toggleUserMenu',
+        ringBackdrop: attrs.ringBackdrop,
+        user: attrs.user
+      }));
     }
 
     return icons;
@@ -142,7 +161,7 @@ createWidget('header-icons', {
 });
 
 createWidget('header-buttons', {
-  tagName: 'span',
+  tagName: 'span.header-buttons',
 
   html(attrs) {
     if (this.currentUser) { return; }
@@ -191,48 +210,54 @@ export default createWidget('header', {
   },
 
   html(attrs, state) {
-    const panels = [this.attach('header-buttons', attrs),
-                    this.attach('header-icons', { hamburgerVisible: state.hamburgerVisible,
-                                                  userVisible: state.userVisible,
-                                                  searchVisible: state.searchVisible,
-                                                  ringBackdrop: state.ringBackdrop,
-                                                  flagCount: attrs.flagCount })];
 
-    if (state.searchVisible) {
-      const contextType = this.searchContextType();
+    let contents = () => {
+      const panels = [
+        this.attach('header-buttons', attrs),
+        this.attach('header-icons', {
+          hamburgerVisible: state.hamburgerVisible,
+          userVisible: state.userVisible,
+          searchVisible: state.searchVisible,
+          ringBackdrop: state.ringBackdrop,
+          flagCount: attrs.flagCount,
+          user: this.currentUser }
+        )
+      ];
 
-      if (state.searchContextType !== contextType) {
-        state.contextEnabled = undefined;
-        state.searchContextType = contextType;
-      }
+      if (state.searchVisible) {
+        const contextType = this.searchContextType();
 
-      if (state.contextEnabled === undefined) {
-        if (forceContextEnabled.includes(contextType)) {
-          state.contextEnabled = true;
+        if (state.searchContextType !== contextType) {
+          state.contextEnabled = undefined;
+          state.searchContextType = contextType;
         }
+
+        if (state.contextEnabled === undefined) {
+          if (forceContextEnabled.includes(contextType)) {
+            state.contextEnabled = true;
+          }
+        }
+
+        panels.push(this.attach('search-menu', { contextEnabled: state.contextEnabled }));
+      } else if (state.hamburgerVisible) {
+        panels.push(this.attach('hamburger-menu'));
+      } else if (state.userVisible) {
+        panels.push(this.attach('user-menu'));
       }
 
-      panels.push(this.attach('search-menu', { contextEnabled: state.contextEnabled }));
-    } else if (state.hamburgerVisible) {
-      panels.push(this.attach('hamburger-menu'));
-    } else if (state.userVisible) {
-      panels.push(this.attach('user-menu'));
-    }
+      additionalPanels.map((panel) => {
+        if (this.state[panel.toggle]) {
+          panels.push(this.attach(panel.name, panel.transformAttrs.call(this, attrs, state)));
+        }
+      });
 
-    additionalPanels.map((panel) => {
-      if (this.state[panel.toggle]) {
-        panels.push(this.attach(panel.name, panel.transformAttrs.call(this, attrs, state)));
-      }
-    });
+      return panels;
+    };
 
-    const contents = [ this.attach('home-logo', { minimized: !!attrs.topic }),
-                       h('div.panel.clearfix', panels) ];
-
-    if (attrs.topic) {
-      contents.push(this.attach('header-topic-info', attrs));
-    }
-
-    return h('div.wrap', h('div.contents.clearfix', contents));
+    let contentsAttrs = { contents, minimized: !!attrs.topic };
+    return h('div.wrap',
+      this.attach('header-contents', $.extend({}, attrs, contentsAttrs))
+    );
   },
 
   updateHighlight() {
@@ -249,7 +274,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 +329,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 +353,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/home-logo.js.es6 b/app/assets/javascripts/discourse/widgets/home-logo.js.es6
index ad4c59b26a..c226d944eb 100644
--- a/app/assets/javascripts/discourse/widgets/home-logo.js.es6
+++ b/app/assets/javascripts/discourse/widgets/home-logo.js.es6
@@ -1,6 +1,6 @@
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { wantsNewWindow } from 'discourse/lib/intercept-click';
 import DiscourseURL from 'discourse/lib/url';
 
diff --git a/app/assets/javascripts/discourse/widgets/link.js.es6 b/app/assets/javascripts/discourse/widgets/link.js.es6
index 9e33999957..611c41ac39 100644
--- a/app/assets/javascripts/discourse/widgets/link.js.es6
+++ b/app/assets/javascripts/discourse/widgets/link.js.es6
@@ -1,6 +1,6 @@
 import { wantsNewWindow } from 'discourse/lib/intercept-click';
 import { createWidget } from 'discourse/widgets/widget';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { h } from 'virtual-dom';
 import DiscourseURL from 'discourse/lib/url';
 
@@ -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);
@@ -31,8 +31,10 @@ export default createWidget('link', {
   },
 
   buildAttributes(attrs) {
-    return { href: this.href(attrs),
-             title: attrs.title ? I18n.t(attrs.title) : this.label(attrs) };
+    return {
+      href: this.href(attrs),
+      title: attrs.title ? I18n.t(attrs.title, attrs.titleOptions) : this.label(attrs)
+    };
   },
 
   label(attrs) {
@@ -54,7 +56,13 @@ export default createWidget('link', {
     }
 
     if (!attrs.hideLabel) {
-      result.push(this.label(attrs));
+      let label = this.label(attrs);
+
+      if (attrs.omitSpan) {
+        result.push(label);
+      } else {
+        result.push(h('span.d-label', label));
+      }
     }
 
     const currentUser = this.currentUser;
diff --git a/app/assets/javascripts/discourse/widgets/menu-panel.js.es6 b/app/assets/javascripts/discourse/widgets/menu-panel.js.es6
index 607da731a2..bca0c606b0 100644
--- a/app/assets/javascripts/discourse/widgets/menu-panel.js.es6
+++ b/app/assets/javascripts/discourse/widgets/menu-panel.js.es6
@@ -1,7 +1,14 @@
+import hbs from 'discourse/widgets/hbs-compiler';
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
 
 createWidget('menu-links', {
+  buildClasses(attrs) {
+    if (attrs.name && attrs.name.length) {
+      return `menu-container-${attrs.name}`;
+    }
+  },
+
   html(attrs) {
     const links = [].concat(attrs.contents());
     const liOpts = {};
@@ -23,14 +30,17 @@ createWidget('menu-links', {
 
 createWidget('menu-panel', {
   tagName: 'div.menu-panel',
+  template: hbs`
+    <div class='panel-body'>
+      <div class='panel-body-contents clearfix'>
+        {{yield}}
+      </div>
+    </div>
+  `,
 
   buildAttributes(attrs) {
     if (attrs.maxWidth) {
       return { 'data-max-width': attrs.maxWidth };
     }
   },
-
-  html(attrs) {
-    return h('div.panel-body', h('div.panel-body-contents.clearfix', attrs.contents()));
-  }
 });
diff --git a/app/assets/javascripts/discourse/widgets/notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/notification-item.js.es6
index 55ce637d50..83f0c368fa 100644
--- a/app/assets/javascripts/discourse/widgets/notification-item.js.es6
+++ b/app/assets/javascripts/discourse/widgets/notification-item.js.es6
@@ -4,9 +4,10 @@ import { createWidget } from 'discourse/widgets/widget';
 import DiscourseURL from 'discourse/lib/url';
 import { h } from 'virtual-dom';
 import { emojiUnescape } from 'discourse/lib/text';
-import { postUrl, escapeExpression } from 'discourse/lib/utilities';
+import { postUrl, escapeExpression, formatUsername } from 'discourse/lib/utilities';
 import { setTransientHeader } from 'discourse/lib/ajax';
 import { userPath } from 'discourse/lib/url';
+import { iconNode } from 'discourse-common/lib/icon-library';
 
 const LIKED_TYPE = 5;
 const INVITED_TYPE = 8;
@@ -78,11 +79,11 @@ createWidget('notification-item', {
       return I18n.t(scope, { count, group_name });
     }
 
-    const username = data.display_username;
+    const username = formatUsername(data.display_username);
     const description = this.description();
     if (notificationType === LIKED_TYPE && data.count > 1) {
       const count = data.count - 2;
-      const username2 = data.username2;
+      const username2 = formatUsername(data.username2);
       if (count===0) {
         return I18n.t('notifications.liked_2', {description, username, username2});
       } else {
@@ -98,10 +99,21 @@ createWidget('notification-item', {
     const lookup = this.site.get('notificationLookup');
     const notName = lookup[notificationType];
 
-    const contents = new RawHtml({ html: `<div>${emojiUnescape(this.text(notificationType, notName))}</div>` });
+    let { data } = attrs;
+    let infoKey = notName === 'custom' ? data.message : notName;
+    let title = I18n.t(`notifications.alt.${infoKey}`);
+    let icon = iconNode(`notification.${infoKey}`, { title });
+
+    let text = emojiUnescape(this.text(notificationType, notName));
+
+    // We can use a `<p>` tag here once other languages have fixed their HTML
+    // translations.
+    let html = new RawHtml({ html: `<div>${text}</div>` });
+
+    let contents = [ icon, html ];
+
     const href = this.url();
-    const alt = I18n.t(`notifications.alt.${notName}`);
-    return href ? h('a', { attributes: { href, alt, 'data-auto-route': true } }, contents) : contents;
+    return href ? h('a', { attributes: { href, title, 'data-auto-route': true } }, contents) : contents;
   },
 
   click(e) {
diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
index eb868b0343..484935a7a9 100644
--- a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
@@ -1,67 +1,102 @@
-import { iconNode } from 'discourse/helpers/fa-icon-node';
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
+import { ButtonClass } from 'discourse/widgets/button';
 
-createWidget('post-admin-menu-button', {
+createWidget('post-admin-menu-button', jQuery.extend(ButtonClass, {
   tagName: 'li.btn',
-  buildClasses(attrs) {
-    return attrs.className;
-  },
-  html(attrs) {
-    return [iconNode(attrs.icon), I18n.t(attrs.label)];
-  },
   click() {
     this.sendWidgetAction('closeAdminMenu');
     return this.sendWidgetAction(this.attrs.action);
   }
-});
+}));
+
+export function buildManageButtons(attrs, currentUser) {
+  if (!currentUser) {
+    return [];
+  }
+
+  let contents = [];
+  if (currentUser.staff) {
+    contents.push({
+      icon: 'list',
+      label: 'admin.flags.moderation_history',
+      action: 'showModerationHistory',
+    });
+  }
+
+  if (!attrs.isWhisper && currentUser.staff) {
+    const buttonAtts = {
+      action: 'togglePostType',
+      icon: 'shield',
+      className: 'toggle-post-type'
+    };
+
+    if (attrs.isModeratorAction) {
+      buttonAtts.label = 'post.controls.revert_to_regular';
+    } else {
+      buttonAtts.label = 'post.controls.convert_to_moderator';
+    }
+    contents.push(buttonAtts);
+  }
+
+  if (attrs.canManage) {
+    contents.push({
+      icon: 'cog',
+      label: 'post.controls.rebake',
+      action: 'rebakePost',
+      className: 'rebuild-html'
+    });
+
+    if (attrs.hidden) {
+      contents.push({
+        icon: 'eye',
+        label: 'post.controls.unhide',
+        action: 'unhidePost',
+        className: 'unhide-post'
+      });
+    }
+  }
+
+  if (currentUser.admin) {
+    contents.push({
+      icon: 'user',
+      label: 'post.controls.change_owner',
+      action: 'changePostOwner',
+      className: 'change-owner'
+    });
+  }
+
+  if (attrs.canManage || attrs.canWiki) {
+    if (attrs.wiki) {
+      contents.push({
+        action: 'toggleWiki',
+        label: 'post.controls.unwiki',
+        icon: 'pencil-square-o',
+        className: 'wiki wikied'
+      });
+    } else {
+      contents.push({
+        action: 'toggleWiki',
+        label: 'post.controls.wiki',
+        icon: 'pencil-square-o',
+        className: 'wiki'
+      });
+    }
+  }
+
+  return contents;
+}
 
 export default createWidget('post-admin-menu', {
   tagName: 'div.post-admin-menu.popup-menu',
 
-  html(attrs) {
+  html() {
     const contents = [];
     contents.push(h('h3', I18n.t('admin_title')));
 
-    if (!attrs.isWhisper && this.currentUser.staff) {
-      const buttonAtts = { action: 'togglePostType', icon: 'shield', className: 'toggle-post-type' };
-
-      if (attrs.isModeratorAction) {
-        buttonAtts.label = 'post.controls.revert_to_regular';
-      } else {
-        buttonAtts.label = 'post.controls.convert_to_moderator';
-      }
-      contents.push(this.attach('post-admin-menu-button', buttonAtts));
-    }
-
-    if (attrs.canManage) {
-      contents.push(this.attach('post-admin-menu-button', {
-        icon: 'cog', label: 'post.controls.rebake', action: 'rebakePost', className: 'rebuild-html'
-      }));
-
-      if (attrs.hidden) {
-        contents.push(this.attach('post-admin-menu-button', {
-          icon: 'eye', label: 'post.controls.unhide', action: 'unhidePost', className: 'unhide-post'
-        }));
-      }
-    }
-
-    if (this.currentUser.admin) {
-      contents.push(this.attach('post-admin-menu-button', {
-        icon: 'user', label: 'post.controls.change_owner', action: 'changePostOwner', className: 'change-owner'
-      }));
-    }
-
-    // toggle Wiki button
-    if (attrs.wiki) {
-      contents.push(this.attach('post-admin-menu-button', {
-        action: 'toggleWiki', label: 'post.controls.unwiki', icon: 'pencil-square-o', className: 'wiki wikied'
-      }));
-    } else {
-      contents.push(this.attach('post-admin-menu-button', {
-        action: 'toggleWiki', label: 'post.controls.wiki', icon: 'pencil-square-o', className: 'wiki'
-      }));
-    }
+    buildManageButtons(this.attrs, this.currentUser).forEach(b => {
+      contents.push(this.attach('post-admin-menu-button', b));
+    });
 
     return contents;
   },
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
index 2786f7df73..6e8f82c167 100644
--- a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
@@ -1,3 +1,4 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { ajax } from 'discourse/lib/ajax';
 import { isValidLink } from 'discourse/lib/click-track';
 import { number } from 'discourse/lib/formatter';
@@ -140,7 +141,7 @@ export default class PostCooked {
         $blockQuote.showHtml(div, 'fast', finished);
       }).catch((e) => {
         if (e.jqXHR.status === 404) {
-          $blockQuote.showHtml($("<div class='expanded-quote'><i class='fa fa-trash-o'></i></div>"), 'fast', finished);
+          $blockQuote.showHtml($(`<div class='expanded-quote'>${iconHTML('trash-o')}</div>`), 'fast', finished);
         }
       });
     } else {
@@ -158,27 +159,19 @@ export default class PostCooked {
   _updateQuoteElements($aside, desc) {
     let navLink = "";
     const quoteTitle = I18n.t("post.follow_quote");
-    const postNumber = $aside.data('post');
+    let postNumber = $aside.data('post');
+    let topicNumber = $aside.data('topic');
 
-    if (postNumber) {
-
-      // If we have a topic reference
-      const asideTopicId = parseInt($aside.data('topic'));
-
-      if (asideTopicId) {
-        // If it's the same topic as ours, build the URL from the topic object
-        if (this.attrs.topicId === asideTopicId) {
-          navLink = `<a href='${this._urlForPostNumber(postNumber)}' title='${quoteTitle}' class='back'></a>`;
-        }
-      } else {
-        // assume the same topic
-        navLink = `<a href='${this._urlForPostNumber(postNumber)}' title='${quoteTitle}' class='back'></a>`;
-      }
+    // If we have a post reference
+    if (topicNumber && topicNumber === this.attrs.topicId && postNumber) {
+      let icon = iconHTML('arrow-up');
+      navLink = `<a href='${this._urlForPostNumber(postNumber)}' title='${quoteTitle}' class='back'>${icon}</a>`;
     }
+
     // Only add the expand/contract control if it's not a full post
     let expandContract = "";
     if (!$aside.data('full')) {
-      expandContract = `<i class='fa fa-${desc}' title='${I18n.t("post.expand_collapse")}'></i>`;
+      expandContract = iconHTML(desc, { title: "post.expand_collapse" });
       $('.title', $aside).css('cursor', 'pointer');
     }
     $('.quote-controls', $aside).html(expandContract + navLink);
@@ -197,7 +190,8 @@ export default class PostCooked {
         // Unless it's a full quote, allow click to expand
         if (!($aside.data('full') || $title.data('has-quote-controls'))) {
           $title.on('click', e2 => {
-            if ($(e2.target).is('a')) return true;
+            let $target = $(e2.target);
+            if ($target.closest('a').length) { return true; }
             this._toggleQuote($aside);
           });
           $title.data('has-quote-controls', true);
diff --git a/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6 b/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6
index 531e439685..7d8f492807 100644
--- a/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6
@@ -1,5 +1,5 @@
 import { createWidget } from 'discourse/widgets/widget';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { longDate } from 'discourse/lib/formatter';
 import { h } from 'virtual-dom';
 
diff --git a/app/assets/javascripts/discourse/widgets/post-links.js.es6 b/app/assets/javascripts/discourse/widgets/post-links.js.es6
index 9182191451..69340bc86b 100644
--- a/app/assets/javascripts/discourse/widgets/post-links.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-links.js.es6
@@ -1,4 +1,4 @@
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
 import { replaceEmoji } from 'discourse/widgets/emoji';
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index 4c39f4a542..6186ae4e72 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -1,4 +1,4 @@
-import { createWidget } from 'discourse/widgets/widget';
+import { applyDecorators, createWidget } from 'discourse/widgets/widget';
 import { avatarAtts } from 'discourse/widgets/actions-summary';
 import { h } from 'virtual-dom';
 
@@ -29,13 +29,26 @@ function registerButton(name, builder) {
   _builders[name] = builder;
 }
 
+export function buildButton(name, widget) {
+  let { attrs, state, siteSettings, settings } = widget;
+  let builder = _builders[name];
+  if (builder) {
+    let button = builder(attrs, state, siteSettings, settings);
+    if (button && !button.id) {
+      button.id = name;
+    }
+    return button;
+  }
+}
+
 registerButton('like', attrs => {
   if (!attrs.showLike) { return; }
+
   const className = attrs.liked ? 'toggle-like has-like fade-out' : 'toggle-like like';
 
   const button = {
     action: 'like',
-    icon: 'heart',
+    icon: attrs.liked ? 'd-liked' : 'd-unliked',
     className
   };
 
@@ -45,6 +58,7 @@ registerButton('like', attrs => {
     button.title = 'post.controls.has_liked';
     button.disabled = true;
   }
+
   return button;
 });
 
@@ -86,6 +100,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;
 
@@ -124,7 +167,7 @@ registerButton('share', attrs => {
   };
 });
 
-registerButton('reply', attrs => {
+registerButton('reply', (attrs, state, siteSettings, postMenuSettings) => {
   const args = {
     action: 'replyToPost',
     title: 'post.controls.reply',
@@ -134,7 +177,7 @@ registerButton('reply', attrs => {
 
   if (!attrs.canCreatePost) { return; }
 
-  if (!attrs.mobileView) {
+  if (postMenuSettings.showReplyTitleOnMobile || !attrs.mobileView) {
     args.label = 'topic.reply.title';
   }
 
@@ -144,20 +187,19 @@ registerButton('reply', attrs => {
 registerButton('bookmark', attrs => {
   if (!attrs.canBookmark) { return; }
 
-  let iconClass = 'read-icon';
-  let buttonClass = 'bookmark';
-  let tooltip = 'bookmarks.not_bookmarked';
+  let className = 'bookmark';
 
   if (attrs.bookmarked) {
-    iconClass += ' bookmarked';
-    buttonClass += ' bookmarked';
-    tooltip = 'bookmarks.created';
+    className += ' bookmarked';
   }
 
-  return { action: 'toggleBookmark',
-           title: tooltip,
-           className: buttonClass,
-           contents: h('div', { className: iconClass }) };
+  return {
+    id: attrs.bookmarked ? 'bookmark' : 'unbookmark',
+    action: 'toggleBookmark',
+    title: attrs.bookmarked ? "bookmarks.created" : "bookmarks.not_bookmarked",
+    className,
+    icon: 'bookmark'
+  };
 });
 
 registerButton('admin', attrs => {
@@ -170,62 +212,97 @@ registerButton('admin', attrs => {
 
 registerButton('delete', attrs => {
   if (attrs.canRecoverTopic) {
-    return { action: 'recoverPost', title: 'topic.actions.recover', icon: 'undo', className: 'recover' };
+    return { id: 'recover_topic', action: 'recoverPost', title: 'topic.actions.recover', icon: 'undo', className: 'recover' };
   } else if (attrs.canDeleteTopic) {
-    return { action: 'deletePost', title: 'topic.actions.delete', icon: 'trash-o', className: 'delete' };
+    return { id: 'delete_topic', action: 'deletePost', title: 'topic.actions.delete', icon: 'trash-o', className: 'delete' };
   } else if (attrs.canRecover) {
-    return { action: 'recoverPost', title: 'post.controls.undelete', icon: 'undo', className: 'recover' };
+    return { id: 'recover', action: 'recoverPost', title: 'post.controls.undelete', icon: 'undo', className: 'recover' };
   } else if (attrs.canDelete) {
-    return { action: 'deletePost', title: 'post.controls.delete', icon: 'trash-o', className: 'delete' };
+    return { id: 'delete', action: 'deletePost', title: 'post.controls.delete', icon: 'trash-o', className: 'delete' };
   }
 });
 
+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',
 
+  settings: {
+    collapseButtons: true,
+    buttonType: 'flat-button',
+    showReplyTitleOnMobile: false
+  },
+
   defaultState() {
     return { collapsed: true, likedUsers: [], adminVisible: false };
   },
 
   buildKey: attrs => `post-menu-${attrs.id}`,
 
-  attachButton(name, attrs) {
-    const builder = _builders[name];
-    if (builder) {
-      const buttonAtts = builder(attrs, this.state, this.siteSettings);
-      if (buttonAtts) {
-        return this.attach('button', buttonAtts);
-      }
+  attachButton(name) {
+    let buttonAtts = buildButton(name, this);
+    if (buttonAtts) {
+      return this.attach(this.settings.buttonType, buttonAtts);
     }
   },
 
-  html(attrs, state) {
-    const { siteSettings } = this;
+  menuItems() {
+    let result = this.siteSettings.post_menu.split('|');
+    return result;
+  },
 
-    const hiddenSetting = (siteSettings.post_menu_hidden_items || '');
-    const hiddenButtons = hiddenSetting.split('|').filter(s => {
-      return !attrs.bookmarked || s !== 'bookmark';
-    });
+  html(attrs, state) {
+    const { currentUser, keyValueStore, siteSettings } = this;
+
+    const hiddenSetting = siteSettings.post_menu_hidden_items || '';
+    const hiddenButtons = hiddenSetting.split('|').filter(s => !attrs.bookmarked || s !== 'bookmark');
+
+    if (currentUser && keyValueStore) {
+      const likedPostId = keyValueStore.getInt("likedPostId");
+      if (likedPostId === attrs.id) {
+        keyValueStore.remove("likedPostId");
+        Ember.run.next(() => this.sendWidgetAction("toggleLike"));
+      }
+    }
 
     const allButtons = [];
     let visibleButtons = [];
-    siteSettings.post_menu.split('|').forEach(i => {
+
+    const orderedButtons = this.menuItems();
+
+    // 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);
+
         if ((attrs.yours && button.attrs.alwaysShowYours) || (hiddenButtons.indexOf(i) === -1)) {
           visibleButtons.push(button);
         }
       }
     });
 
+    if (!this.settings.collapseButtons) {
+      visibleButtons = allButtons;
+    }
+
     // Only show ellipsis if there is more than one button hidden
     // if there are no more buttons, we are not collapsed
     if (!state.collapsed || (allButtons.length <= visibleButtons.length + 1)) {
       visibleButtons = allButtons;
       if (state.collapsed) { state.collapsed = false; }
     } else {
-      const showMore = this.attach('button', {
+      const showMore = this.attach('flat-button', {
         action: 'showMoreActions',
         title: 'show_more',
         className: 'show-more-actions',
@@ -241,7 +318,7 @@ export default createWidget('post-menu', {
           const { position, beforeButton } = buttonAtts;
           delete buttonAtts.position;
 
-          let button = this.attach('button', buttonAtts);
+          let button = this.attach(this.settings.buttonType, buttonAtts);
 
           if (beforeButton) {
             button = h('span', [beforeButton(h), button]);
@@ -276,18 +353,21 @@ export default createWidget('post-menu', {
       postControls.push(repliesButton);
     }
 
-    postControls.push(h('div.actions', visibleButtons));
+    let extraControls = applyDecorators(this, 'extra-controls', attrs, state);
+    postControls.push(h('div.actions', visibleButtons.concat(extraControls)));
     if (state.adminVisible) {
       postControls.push(this.attach('post-admin-menu', attrs));
     }
 
     const contents = [ h('nav.post-controls.clearfix', postControls) ];
     if (state.likedUsers.length) {
+      const remaining = state.total - state.likedUsers.length;
       contents.push(this.attach('small-user-list', {
         users: state.likedUsers,
-        addSelf: attrs.liked,
+        addSelf: attrs.liked && remaining === 0,
         listClassName: 'who-liked',
-        description: 'post.actions.people.like'
+        description: remaining > 0 ? 'post.actions.people.like_capped' : 'post.actions.people.like',
+        count: remaining
       }));
     }
 
@@ -307,15 +387,18 @@ export default createWidget('post-menu', {
   },
 
   like() {
-    if (!this.currentUser) {
+    const { attrs, currentUser, keyValueStore } = this;
+
+    if (!currentUser) {
+      keyValueStore && keyValueStore.set({ key: "likedPostId", value: attrs.id });
       return this.sendWidgetAction('showLogin');
     }
-    const attrs = this.attrs;
+
     if (attrs.liked) {
       return this.sendWidgetAction('toggleLike');
     }
 
-    const $heart = $(`[data-post-id=${attrs.id}] .fa-heart`);
+    const $heart = $(`[data-post-id=${attrs.id}] .toggle-like .d-icon`);
     $heart.closest('button').addClass('has-like');
 
     if (!Ember.testing) {
@@ -343,6 +426,7 @@ export default createWidget('post-menu', {
 
     return this.store.find('post-action-user', { id: attrs.id, post_action_type_id: LIKE_ACTION }).then(users => {
       state.likedUsers = users.map(avatarAtts);
+      state.total = users.totalRows;
     });
   },
 
diff --git a/app/assets/javascripts/discourse/widgets/post-placeholder.js.es6 b/app/assets/javascripts/discourse/widgets/post-placeholder.js.es6
index f12fb26f34..1579413613 100644
--- a/app/assets/javascripts/discourse/widgets/post-placeholder.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-placeholder.js.es6
@@ -1,17 +1,18 @@
 import { createWidget } from 'discourse/widgets/widget';
-import { h } from 'virtual-dom';
+import hbs from 'discourse/widgets/hbs-compiler';
 
 export default createWidget('post-placeholder', {
   tagName: 'article.placeholder',
-
-  html() {
-    return h('div.row', [
-             h('div.topic-avatar', h('div.placeholder-avatar')),
-             h('div.topic-body', [
-                h('div.placeholder-text'),
-                h('div.placeholder-text'),
-                h('div.placeholder-text')
-               ])
-           ]);
-  }
+  template: hbs`
+    <div class='row'>
+      <div class='topic-avatar'>
+        <div class='placeholder-avatar'></div>
+      </div>
+      <div class='topic-body'>
+        <div class='placeholder-text'></div>
+        <div class='placeholder-text'></div>
+        <div class='placeholder-text'></div>
+      </div>
+    </div>
+  `
 });
diff --git a/app/assets/javascripts/discourse/widgets/post-small-action.js.es6 b/app/assets/javascripts/discourse/widgets/post-small-action.js.es6
index b128b246ce..8f7113727d 100644
--- a/app/assets/javascripts/discourse/widgets/post-small-action.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-small-action.js.es6
@@ -1,9 +1,34 @@
 import { createWidget } from 'discourse/widgets/widget';
 import RawHtml from 'discourse/widgets/raw-html';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { h } from 'virtual-dom';
-import { actionDescriptionHtml } from 'discourse/components/small-action';
 import { avatarFor } from 'discourse/widgets/post';
+import { userPath } from 'discourse/lib/url';
+import { autoUpdatingRelativeAge } from 'discourse/lib/formatter';
+
+export function actionDescriptionHtml(actionCode, createdAt, username) {
+  const dt = new Date(createdAt);
+  const when = autoUpdatingRelativeAge(dt, { format: 'medium-with-ago' });
+
+  var who = "";
+  if (username) {
+    if (actionCode === "invited_group" || actionCode === "removed_group") {
+      who = `<a class="mention-group" href="/groups/${username}">@${username}</a>`;
+    } else {
+      who = `<a class="mention" href="${userPath(username)}">@${username}</a>`;
+    }
+  }
+  return I18n.t(`action_codes.${actionCode}`, { who, when }).htmlSafe();
+}
+
+export function actionDescription(actionCode, createdAt, username) {
+  return function() {
+    const ac = this.get(actionCode);
+    if (ac) {
+      return actionDescriptionHtml(ac, this.get(createdAt), this.get(username));
+    }
+  }.property(actionCode, createdAt);
+}
 
 const icons = {
   'closed.enabled': 'lock',
@@ -23,6 +48,7 @@ const icons = {
   'split_topic': 'sign-out',
   'invited_user': 'plus-circle',
   'invited_group': 'plus-circle',
+  'user_left': 'minus-circle',
   'removed_user': 'minus-circle',
   'removed_group': 'minus-circle',
   'public_topic': 'comment',
@@ -50,6 +76,7 @@ export default createWidget('post-small-action', {
 
     if (attrs.canDelete) {
       contents.push(this.attach('button', {
+        className: 'small-action-delete',
         icon: 'times',
         action: 'deletePost',
         title: 'post.controls.delete'
@@ -58,6 +85,7 @@ export default createWidget('post-small-action', {
 
     if (attrs.canEdit) {
       contents.push(this.attach('button', {
+        className: 'small-action-edit',
         icon: 'pencil',
         action: 'editPost',
         title: 'post.controls.edit'
diff --git a/app/assets/javascripts/discourse/widgets/post-stream.js.es6 b/app/assets/javascripts/discourse/widgets/post-stream.js.es6
index 0f99af0ce2..863f717011 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();
 }
 
@@ -87,7 +87,6 @@ export default createWidget('post-stream', {
 
         if (attrs.multiSelect) {
           transformed.selected = attrs.selectedQuery(post);
-          transformed.selectedPostsCount = attrs.selectedPostsCount;
         }
       }
 
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6
index c6c9f581f4..427b7c3bae 100644
--- a/app/assets/javascripts/discourse/widgets/post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post.js.es6
@@ -1,12 +1,12 @@
 import PostCooked from 'discourse/widgets/post-cooked';
 import DecoratorHelper from 'discourse/widgets/decorator-helper';
 import { createWidget, applyDecorators } from 'discourse/widgets/widget';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { transformBasicPost } from 'discourse/lib/transform-post';
 import { h } from 'virtual-dom';
 import DiscourseURL from 'discourse/lib/url';
 import { dateNode } from 'discourse/helpers/node';
-import { translateSize, avatarUrl } from 'discourse/lib/utilities';
+import { translateSize, avatarUrl, formatUsername } from 'discourse/lib/utilities';
 
 export function avatarImg(wanted, attrs) {
   const size = translateSize(wanted);
@@ -14,7 +14,7 @@ export function avatarImg(wanted, attrs) {
 
   // We won't render an invalid url
   if (!url || url.length === 0) { return; }
-  const title = attrs.username;
+  const title = formatUsername(attrs.username);
 
   const properties = {
     attributes: { alt: '', width: size, height: size, src: Discourse.getURLWithCDN(url), title },
@@ -37,15 +37,31 @@ createWidget('select-post', {
   html(attrs) {
     const buttons = [];
 
-    if (attrs.replyCount > 0 && !attrs.selected) {
-      buttons.push(this.attach('button', { label: 'topic.multi_select.select_replies', action: 'selectReplies' }));
+    if (!attrs.selected && attrs.post_number > 1) {
+      if (attrs.replyCount > 0) {
+        buttons.push(this.attach('button', {
+          label: 'topic.multi_select.select_replies.label',
+          title: 'topic.multi_select.select_replies.title',
+          action: 'selectReplies',
+          className: 'select-replies'
+        }));
+      }
+      buttons.push(this.attach('button', {
+        label: 'topic.multi_select.select_below.label',
+        title: 'topic.multi_select.select_below.title',
+        action: 'selectBelow',
+        className: 'select-below'
+      }));
     }
 
-    const selectPostKey = attrs.selected ? 'topic.multi_select.selected' : 'topic.multi_select.select';
-    buttons.push(this.attach('button', { className: 'select-post',
-                                         label: selectPostKey,
-                                         labelOptions: { count: attrs.selectedPostsCount },
-                                         action: 'selectPost' }));
+    const key = `topic.multi_select.${attrs.selected ? 'selected' : 'select' }_post`;
+    buttons.push(this.attach('button', {
+      label: key + ".label",
+      title: key + ".title",
+      action: 'togglePostSelection',
+      className: 'select-post'
+    }));
+
     return buttons;
   }
 });
@@ -68,7 +84,7 @@ createWidget('reply-to-tab', {
               username: attrs.replyToUsername
             }),
             ' ',
-            h('span', attrs.replyToUsername)];
+            h('span', formatUsername(attrs.replyToUsername))];
   },
 
   click() {
@@ -78,17 +94,26 @@ createWidget('reply-to-tab', {
 });
 
 
+createWidget('post-avatar-user-info', {
+  tagName: 'div.post-avatar-user-info',
+
+  html(attrs) {
+    return this.attach('poster-name', attrs);
+  }
+});
+
 createWidget('post-avatar', {
   tagName: 'div.topic-avatar',
 
   settings: {
-    size: 'large'
+    size: 'large',
+    displayPosterName: false
   },
 
   html(attrs) {
     let body;
     if (!attrs.user_id) {
-      body = h('i', { className: 'fa fa-trash-o deleted-user-avatar' });
+      body = iconNode('trash-o', { class: 'deleted-user-avatar' });
     } else {
       body = avatarFor.call(this, this.settings.size, {
         template: attrs.avatar_template,
@@ -106,6 +131,10 @@ createWidget('post-avatar', {
 
     result.push(h('div.poster-avatar-extra'));
 
+    if (this.settings.displayPosterName) {
+      result.push(this.attach('post-avatar-user-info', attrs));
+    }
+
     return result;
   }
 });
@@ -141,8 +170,16 @@ function showReplyTab(attrs, siteSettings) {
 
 createWidget('post-meta-data', {
   tagName: 'div.topic-meta-data',
+
+  settings: {
+    displayPosterName: true
+  },
+
   html(attrs) {
-    const result = [this.attach('poster-name', attrs)];
+    let result = [];
+    if (this.settings.displayPosterName) {
+      result.push(this.attach('poster-name', attrs));
+    }
 
     if (attrs.isWhisper) {
       result.push(h('div.post-info.whisper', {
@@ -150,19 +187,22 @@ createWidget('post-meta-data', {
       }, iconNode('eye-slash')));
     }
 
+    const lastWikiEdit = attrs.wiki && attrs.lastWikiEdit && new Date(attrs.lastWikiEdit);
     const createdAt = new Date(attrs.created_at);
-    if (createdAt) {
-      result.push(h('div.post-info',
-        h('a.post-date', {
-          attributes: {
-            href: attrs.shareUrl,
-            'data-share-url': attrs.shareUrl,
-            'data-post-number': attrs.post_number,
-          }
-        }, dateNode(createdAt))
-      ));
+    const date = lastWikiEdit ? dateNode(lastWikiEdit) : dateNode(createdAt);
+    const attributes = {
+      class: "post-date",
+      href: attrs.shareUrl,
+      'data-share-url': attrs.shareUrl,
+      'data-post-number': attrs.post_number
+    };
+
+    if (lastWikiEdit) {
+      attributes["class"] += " last-wiki-edit";
     }
 
+    result.push(h('div.post-info', h('a', { attributes }, date)));
+
     if (attrs.via_email) {
       result.push(this.attach('post-email-indicator', attrs));
     }
diff --git a/app/assets/javascripts/discourse/widgets/poster-name.js.es6 b/app/assets/javascripts/discourse/widgets/poster-name.js.es6
index f514b9ac8b..363f769101 100644
--- a/app/assets/javascripts/discourse/widgets/poster-name.js.es6
+++ b/app/assets/javascripts/discourse/widgets/poster-name.js.es6
@@ -1,6 +1,7 @@
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
+import { formatUsername } from 'discourse/lib/utilities';
 
 function sanitizeName(name){
   return name.toLowerCase().replace(/[\s_-]/g,'');
@@ -17,10 +18,11 @@ export default createWidget('poster-name', {
   },
 
   userLink(attrs, text) {
-    return h('a', { attributes: {
-      href: attrs.usernameUrl,
-      'data-user-card': attrs.username
-    } }, text);
+    return h(
+      'a',
+      { attributes: { href: attrs.usernameUrl, 'data-user-card': attrs.username } },
+      formatUsername(text)
+    );
   },
 
   html(attrs) {
diff --git a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 b/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
index 1c43153798..788ed58be0 100644
--- a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
+++ b/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
@@ -1,14 +1,12 @@
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
 import { avatarFor } from 'discourse/widgets/post';
+import hbs from 'discourse/widgets/hbs-compiler';
 
 createWidget('pm-remove-group-link', {
   tagName: 'a.remove-invited',
-
-  html() {
-    return iconNode('times');
-  },
+  template: hbs`{{d-icon "times"}}`,
 
   click() {
     bootbox.confirm(I18n.t("private_message_info.remove_allowed_group", {name: this.attrs.name}), (confirmed) => {
@@ -20,29 +18,30 @@ createWidget('pm-remove-group-link', {
 createWidget('pm-map-user-group', {
   tagName: 'div.user.group',
 
-  html(attrs) {
-    const link = h('a', { attributes: { href: Discourse.getURL(`/groups/${attrs.group.name}`) } }, attrs.group.name);
-    const result = [iconNode('users'), ' ', link];
+  transform(attrs) {
+    return { href: Discourse.getURL(`/groups/${attrs.group.name}`) };
+  },
 
-    if (attrs.canRemoveAllowedUsers) {
-      result.push(' ');
-      result.push(this.attach('pm-remove-group-link', attrs.group));
-    }
-
-    return result;
-  }
+  template: hbs`
+    {{fa-icon 'users'}}
+    <a href={{transformed.href}}>{{attrs.group.name}}</a>
+    {{#if attrs.canRemoveAllowedUsers}}
+      {{attach widget="pm-remove-group-link" attrs=attrs.group}}
+    {{/if}}
+  `
 });
 
 createWidget('pm-remove-link', {
   tagName: 'a.remove-invited',
-
-  html() {
-    return iconNode('times');
-  },
+  template: hbs`{{d-icon "times"}}`,
 
   click() {
-    bootbox.confirm(I18n.t("private_message_info.remove_allowed_user", {name: this.attrs.username}), (confirmed) => {
-      if (confirmed) { this.sendWidgetAction('removeAllowedUser', this.attrs); }
+    const messageKey = this.attrs.isCurrentUser ? 'leave_message' : 'remove_allowed_user';
+
+    bootbox.confirm(I18n.t(`private_message_info.${messageKey}`, { name: this.attrs.user.username }), confirmed => {
+      if (confirmed) {
+        this.sendWidgetAction('removeAllowedUser', this.attrs.user);
+      }
     });
   }
 });
@@ -54,11 +53,12 @@ createWidget('pm-map-user', {
     const user = attrs.user;
     const avatar = avatarFor('small', { template: user.avatar_template, username: user.username });
     const link = h('a', { attributes: { href: user.get('path') } }, [ avatar, ' ', user.username ]);
-
     const result = [link];
-    if (attrs.canRemoveAllowedUsers) {
+    const isCurrentUser = attrs.canRemoveSelfId === user.get('id');
+
+    if (attrs.canRemoveAllowedUsers || isCurrentUser) {
       result.push(' ');
-      result.push(this.attach('pm-remove-link', user));
+      result.push(this.attach('pm-remove-link', { user, isCurrentUser } ));
     }
 
     return result;
@@ -72,12 +72,23 @@ export default createWidget('private-message-map', {
     const participants = [];
 
     if (attrs.allowedGroups.length) {
-      participants.push(attrs.allowedGroups.map(ag => this.attach('pm-map-user-group', {group: ag, canRemoveAllowedUsers: attrs.canRemoveAllowedUsers})));
+      participants.push(attrs.allowedGroups.map(group => {
+        return this.attach('pm-map-user-group', {
+          group,
+          canRemoveAllowedUsers: attrs.canRemoveAllowedUsers
+        });
+      }));
     }
 
-    if (attrs.allowedUsers.length) {
+    const allowedUsersLength = attrs.allowedUsers.length;
+
+    if (allowedUsersLength) {
       participants.push(attrs.allowedUsers.map(au => {
-        return this.attach('pm-map-user', { user: au, canRemoveAllowedUsers: attrs.canRemoveAllowedUsers });
+        return this.attach('pm-map-user', {
+          user: au,
+          canRemoveAllowedUsers: attrs.canRemoveAllowedUsers,
+          canRemoveSelfId: attrs.canRemoveSelfId
+        });
       }));
     }
 
diff --git a/app/assets/javascripts/discourse/widgets/raw-html.js.es6 b/app/assets/javascripts/discourse/widgets/raw-html.js.es6
index e009d3caf4..c532946207 100644
--- a/app/assets/javascripts/discourse/widgets/raw-html.js.es6
+++ b/app/assets/javascripts/discourse/widgets/raw-html.js.es6
@@ -20,3 +20,8 @@ export default class RawHtml {
 }
 
 RawHtml.prototype.type = 'Widget';
+
+// TODO: Improve how helpers are registered for vdom compliation
+if (typeof Discourse !== "undefined") {
+  Discourse.__widget_helpers.rawHtml = RawHtml;
+}
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
index 689e749ee8..c91a9ccb07 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
@@ -5,16 +5,16 @@ import { createWidget } from 'discourse/widgets/widget';
 createWidget('search-term', {
   tagName: 'input',
   buildId: () => 'search-term',
-  buildKey: (attrs) => `search-term-${attrs.id}`,
+  buildKey: () => `search-term`,
 
   defaultState() {
-    this.appEvents.on("search-autocomplete:after-complete", () => {
-      this.state.afterAutocomplete = true;
-    });
-
     return { afterAutocomplete: false };
   },
 
+  searchAutocompleteAfterComplete() {
+    this.state.afterAutocomplete = true;
+  },
+
   buildAttributes(attrs) {
     return { type: 'text',
              value: attrs.value || '',
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 1d190fc7c8..f00fcf8277 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
@@ -3,7 +3,9 @@ import { dateNode } from 'discourse/helpers/node';
 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 { iconNode } from 'discourse-common/lib/icon-library';
+import highlightText from 'discourse/lib/highlight-text';
+import { escapeExpression, formatUsername } from 'discourse/lib/utilities';
 
 class Highlighted extends RawHtml {
   constructor(html, term) {
@@ -12,24 +14,34 @@ 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');
+        } else {
+          searchResultId = r.get('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 +57,60 @@ 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', formatUsername(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 });
+  }
+});
+
+createSearchResult({
+  type: 'tag',
+  linkField: 'url',
+  builder(t) {
+    const tag = escapeExpression(t.get('id'));
+    return h('a', { attributes: { href: t.get('url') }, className: `tag-${tag} discourse-tag ${Discourse.SiteSettings.tag_style}`}, tag);
+  }
 });
 
 createWidget('search-menu-results', {
@@ -98,14 +143,19 @@ createWidget('search-menu-results', {
                                                            className: "filter filter-type"})));
       }
 
-      return [
+      let resultNode = [
         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
         })),
-        h('div.no-results', more)
       ];
+      if (more.length) {
+        resultNode.push(h('div.no-results', more));
+      }
+
+      return resultNode;
     });
   }
 });
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
index 9f462a1205..5bd25047f1 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
@@ -3,14 +3,18 @@ import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
 import DiscourseURL from 'discourse/lib/url';
 
-const searchData = {
-  loading: false,
-  results: {},
-  noResults: false,
-  term: undefined,
-  typeFilter: null,
-  invalidTerm: false
-};
+const searchData = {};
+
+export function initSearchData() {
+  searchData.loading = false;
+  searchData.results = {};
+  searchData.noResults = false;
+  searchData.term = undefined;
+  searchData.typeFilter = null;
+  searchData.invalidTerm = false;
+}
+
+initSearchData();
 
 // Helps with debouncing and cancelling promises
 const SearchHelper = {
@@ -54,6 +58,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;
@@ -66,6 +75,7 @@ const SearchHelper = {
 
 export default createWidget('search-menu', {
   tagName: 'div.search-menu',
+  searchData,
 
   fullSearchUrl(opts) {
     const contextEnabled = searchData.contextEnabled;
@@ -110,24 +120,29 @@ export default createWidget('search-menu', {
   panelContents() {
     const contextEnabled = searchData.contextEnabled;
 
-    const results = [
+    let searchInput = [
       this.attach('search-term', { value: searchData.term, contextEnabled }),
+    ];
+    if (searchData.term && searchData.loading) {
+      searchInput.push(h('div.searching', h('div.spinner')));
+    }
+
+    const results = [
+      h('div.search-input', searchInput),
       this.attach('search-context', {
         contextEnabled,
         url: this.fullSearchUrl({ expanded: true })
       })
     ];
 
-    if (searchData.term) {
-      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 }));
-      }
+    if (searchData.term && !searchData.loading) {
+      results.push(this.attach('search-menu-results', {
+        term: searchData.term,
+        noResults: searchData.noResults,
+        results: searchData.results,
+        invalidTerm: searchData.invalidTerm,
+        searchContextEnabled: searchData.contextEnabled,
+      }));
     }
 
     return results;
@@ -150,7 +165,7 @@ export default createWidget('search-menu', {
   html(attrs) {
     if (searchData.contextEnabled !== attrs.contextEnabled) {
       searchData.contextEnabled = attrs.contextEnabled;
-      this.triggerSearch();
+      if (searchData.term) this.triggerSearch();
     } else {
       searchData.contextEnabled = attrs.contextEnabled;
     }
@@ -162,6 +177,75 @@ export default createWidget('search-menu', {
     this.sendWidgetAction('toggleSearchMenu');
   },
 
+  keyDown(e) {
+    if (searchData.loading || searchData.noResults) {
+      return;
+    }
+
+    if (e.which === 65 /* a */) {
+      let focused = $('header .results .search-link:focus');
+      if (focused.length === 1) {
+        if ($('#reply-control.open').length === 1) {
+          // add a link and focus composer
+
+          this.appEvents.trigger('composer:insert-text', focused[0].href, {ensureSpace: true});
+          this.appEvents.trigger('header:keyboard-trigger', {type: 'search'});
+
+          e.preventDefault();
+          $('#reply-control.open textarea').focus();
+          return false;
+        }
+      }
+    }
+
+    const up = e.which === 38;
+    const down = e.which === 40;
+    if (up || down) {
+
+      let focused = $('header .panel-body *:focus')[0];
+
+      if (!focused) {
+        return;
+      }
+
+      let links = $('header .panel-body .results a');
+      let results = $('header .panel-body .results .search-link');
+
+      let prevResult;
+      let result;
+
+      links.each((idx,item) => {
+        if ($(item).hasClass('search-link')) {
+          prevResult = item;
+        }
+
+        if (item === focused) {
+          result = prevResult;
+        }
+      });
+
+      let index = -1;
+
+      if (result) {
+        index = results.index(result);
+      }
+
+      if (index === -1 && down) {
+        $('header .panel-body .search-link:first').focus();
+      } else if (index === 0 && up) {
+        $('header .panel-body input:first').focus();
+      } else if (index > -1) {
+        index += (down ? 1 : -1);
+        if (index >= 0 && index < results.length) {
+          $(results[index]).focus();
+        }
+      }
+
+      e.preventDefault();
+      return false;
+    }
+  },
+
   triggerSearch() {
     searchData.noResults = false;
     this.searchService().set('highlightTerm', searchData.term);
diff --git a/app/assets/javascripts/discourse/widgets/time-gap.js.es6 b/app/assets/javascripts/discourse/widgets/time-gap.js.es6
index f2ce1cfdb9..2dc8573f33 100644
--- a/app/assets/javascripts/discourse/widgets/time-gap.js.es6
+++ b/app/assets/javascripts/discourse/widgets/time-gap.js.es6
@@ -1,6 +1,6 @@
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 
 function description(attrs) {
   const daysSince = attrs.daysSince;
@@ -8,10 +8,10 @@ function description(attrs) {
   if (daysSince < 30) {
     return I18n.t('dates.later.x_days', {count: daysSince});
   } else if (daysSince < 365) {
-    const gapMonths = Math.floor(daysSince / 30);
+    const gapMonths = Math.round(daysSince / 30);
     return I18n.t('dates.later.x_months', {count: gapMonths});
   } else {
-    const gapYears = Math.floor(daysSince / 365);
+    const gapYears = Math.round(daysSince / 365);
     return I18n.t('dates.later.x_years', {count: gapYears});
   }
 }
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 ce00e979de..bd24b59840 100644
--- a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
@@ -10,7 +10,7 @@ createWidget('admin-menu-button', {
       className,
       action: attrs.action,
       icon: attrs.icon,
-      label: `topic.${attrs.label}`,
+      label: attrs.fullLabel || `topic.${attrs.label}`,
       secondaryAction: 'hideAdminMenu'
     }));
   }
@@ -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: 'toggle-admin-menu' + (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();
@@ -97,6 +114,7 @@ export default createWidget('topic-admin-menu', {
 
     const topic = attrs.topic;
     const details = topic.get('details');
+
     if (details.get('can_delete')) {
       buttons.push({ className: 'topic-admin-delete',
                      buttonClass: 'btn-danger',
@@ -123,11 +141,12 @@ export default createWidget('topic-admin-menu', {
                      icon: 'lock',
                      label: 'actions.close' });
     }
-
-    buttons.push({ className: 'topic-admin-status-update',
+    if (this.currentUser.get('staff')) {
+      buttons.push({ className: 'topic-admin-status-update',
                    action: 'showTopicStatusUpdate',
                    icon: 'clock-o',
                    label: 'actions.timed_update' });
+    }
 
     const isPrivateMessage = topic.get('isPrivateMessage');
 
@@ -159,13 +178,21 @@ export default createWidget('topic-admin-menu', {
                    icon: visible ? 'eye-slash' : 'eye',
                    label: visible ? 'actions.invisible' : 'actions.visible' });
 
-    if (this.currentUser.get('staff')) {
+    if (details.get('can_convert_topic')) {
       buttons.push({ className: 'topic-admin-convert',
                      action: isPrivateMessage ? 'convertToPublicTopic' : 'convertToPrivateMessage',
                      icon: isPrivateMessage ? 'comment' : 'envelope',
                      label: isPrivateMessage ? 'actions.make_public' : 'actions.make_private' });
     }
 
+    if (this.currentUser.get('staff')) {
+      buttons.push({
+        action: 'showModerationHistory',
+        icon: 'list',
+        fullLabel: 'admin.flags.moderation_history'
+      });
+    }
+
     const extraButtons = applyDecorators(this, 'adminMenuButtons', this.attrs, this.state);
 
     return [ h('h3', I18n.t('admin_title')),
diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js.es6 b/app/assets/javascripts/discourse/widgets/topic-map.js.es6
index c489eb7ec2..fbf6074e0a 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');
   }
 });
@@ -61,15 +66,19 @@ createWidget('topic-map-summary', {
     contents.push(h('li',
       [
         h('h4', I18n.t('created_lowercase')),
-        avatarFor('tiny', { username: attrs.createdByUsername, template: attrs.createdByAvatarTemplate }),
-        dateNode(attrs.topicCreatedAt)
+        h('div.topic-map-post.created-at', [
+          avatarFor('tiny', { username: attrs.createdByUsername, template: attrs.createdByAvatarTemplate }),
+          dateNode(attrs.topicCreatedAt)
+        ])
       ]
     ));
     contents.push(h('li',
       h('a', { attributes: { href: attrs.lastPostUrl } }, [
         h('h4', I18n.t('last_reply_lowercase')),
-        avatarFor('tiny', { username: attrs.lastPostUsername, template: attrs.lastPostAvatarTemplate }),
-        dateNode(attrs.lastPostAt)
+        h('div.topic-map-post.last-reply', [
+          avatarFor('tiny', { username: attrs.lastPostUsername, template: attrs.lastPostAvatarTemplate }),
+          dateNode(attrs.lastPostAt)
+        ])
       ])
     ));
     contents.push(h('li', [
@@ -104,7 +113,14 @@ createWidget('topic-map-summary', {
       contents.push(h('li.avatars', participants));
     }
 
-    return h('ul.clearfix', contents);
+    const nav = h('nav.buttons', this.attach('button', {
+      title: 'topic.toggle_information',
+      icon: state.collapsed ? 'chevron-down' : 'chevron-up',
+      action: 'toggleMap',
+      className: 'btn',
+    }));
+
+    return [nav, h('ul.clearfix', contents)];
   }
 });
 
@@ -120,7 +136,8 @@ createWidget('topic-map-link', {
              target: "_blank",
              'data-user-id': attrs.user_id,
              'data-ignore-post-id': 'true',
-             title: attrs.url };
+             title: attrs.url,
+             rel: 'nofollow noopener' };
   },
 
   html(attrs) {
@@ -151,17 +168,16 @@ createWidget('topic-map-expanded', {
 
     const result = [avatars];
     if (attrs.topicLinks) {
-
       const toShow = state.allLinksShown ? attrs.topicLinks : attrs.topicLinks.slice(0, LINKS_SHOWN);
-      const links = toShow.map(l => {
 
+      const links = toShow.map(l => {
         let host = '';
+
         if (l.title && l.title.length) {
-          const domain = l.domain;
-          if (domain && domain.length) {
-            const s = domain.split('.');
-            if (s[0] === 'www') s.shift();
-            host = h('span.domain', s.join('.'));
+          const rootDomain = l.root_domain;
+
+          if (rootDomain && rootDomain.length) {
+            host = h('span.domain', rootDomain);
           }
         }
 
@@ -181,7 +197,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);
@@ -204,14 +220,7 @@ export default createWidget('topic-map', {
   },
 
   html(attrs, state) {
-    const nav = h('nav.buttons', this.attach('button', {
-      title: 'topic.toggle_information',
-      icon: state.collapsed ? 'chevron-down' : 'chevron-up',
-      action: 'toggleMap',
-      className: 'btn',
-    }));
-
-    const contents = [nav, this.attach('topic-map-summary', attrs, { state })];
+    const contents = [this.attach('topic-map-summary', attrs, { state })];
 
     if (!state.collapsed) {
       contents.push(this.attach('topic-map-expanded', attrs));
diff --git a/app/assets/javascripts/discourse/widgets/topic-notifications-button.js.es6 b/app/assets/javascripts/discourse/widgets/topic-notifications-button.js.es6
deleted file mode 100644
index bd37c8b4d8..0000000000
--- a/app/assets/javascripts/discourse/widgets/topic-notifications-button.js.es6
+++ /dev/null
@@ -1,100 +0,0 @@
-import { createWidget } from 'discourse/widgets/widget';
-import { topicLevels, buttonDetails } from 'discourse/lib/notification-levels';
-import { h } from 'virtual-dom';
-import RawHTML from 'discourse/widgets/raw-html';
-
-createWidget('notification-option', {
-  buildKey: attrs => `topic-notifications-button-${attrs.id}`,
-  tagName: 'li',
-
-  html(attrs) {
-    return h('a', [
-        h('span.icon', { className: `fa fa-${attrs.icon} ${attrs.key}`}),
-        h('div', [
-          h('span.title', I18n.t(`topic.notifications.${attrs.key}.title`)),
-          h('span.desc', I18n.t(`topic.notifications.${attrs.key}.description`)),
-        ])
-    ]);
-  },
-
-  click() {
-    this.sendWidgetAction('notificationLevelChanged', this.attrs.id);
-  }
-});
-
-export default createWidget('topic-notifications-button', {
-  tagName: 'span.btn-group.notification-options',
-  buildKey: () => `topic-notifications-button`,
-
-  defaultState() {
-    return { expanded: false };
-  },
-
-  buildClasses(attrs, state) {
-    if (state.expanded) { return "open"; }
-  },
-
-  buildAttributes() {
-    return { title: I18n.t('topic.notifications.title') };
-  },
-
-  buttonFor(level) {
-    const details = buttonDetails(level);
-
-    const button = {
-      className: `btn`,
-      label: null,
-      icon: details.icon,
-      action: 'toggleDropdown',
-      iconClass: details.key
-    };
-
-    if (this.attrs.showFullTitle) {
-      button.label = `topic.notifications.${details.key}.title`;
-    } else {
-      button.className = 'btn notifications-dropdown';
-    }
-
-    return this.attach('button', button);
-  },
-
-  html(attrs, state) {
-    const details = attrs.topic.get('details');
-    const result = [ this.buttonFor(details.get('notification_level')) ];
-
-    if (state.expanded) {
-      result.push(h('ul.dropdown-menu', topicLevels.map(l => this.attach('notification-option', l))));
-    }
-
-    if (attrs.appendReason) {
-      result.push(new RawHTML({ html: `<p>${details.get('notificationReasonText')}</p>` }));
-    }
-
-    return result;
-  },
-
-  toggleDropdown() {
-    this.state.expanded = !this.state.expanded;
-  },
-
-  clickOutside() {
-    if (this.state.expanded) {
-      this.sendWidgetAction('toggleDropdown');
-    }
-  },
-
-  notificationLevelChanged(id) {
-    this.state.expanded = false;
-    return this.attrs.topic.get('details').updateNotifications(id);
-  },
-
-  topicNotificationsButtonChanged(msg) {
-    switch(msg.type) {
-      case 'notification':
-        if (this.attrs.topic.get('details.notification_level') !== msg.id) {
-          this.notificationLevelChanged(msg.id);
-        }
-        break;
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/widgets/topic-status.js.es6 b/app/assets/javascripts/discourse/widgets/topic-status.js.es6
index d0b8ac5ef6..763ce7e216 100644
--- a/app/assets/javascripts/discourse/widgets/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-status.js.es6
@@ -1,5 +1,5 @@
 import { createWidget } from 'discourse/widgets/widget';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { h } from 'virtual-dom';
 import { escapeExpression } from 'discourse/lib/utilities';
 
diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
index a77012282b..0b4d32661a 100644
--- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
@@ -1,7 +1,8 @@
 import { createWidget } from 'discourse/widgets/widget';
+import ComponentConnector from 'discourse/widgets/component-connector';
 import { h } from 'virtual-dom';
 import { relativeAge } from 'discourse/lib/formatter';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import RawHtml from 'discourse/widgets/raw-html';
 
 const SCROLLAREA_HEIGHT = 300;
@@ -15,7 +16,7 @@ function clamp(p, min=0.0, max=1.0) {
 
 function attachBackButton(widget) {
   return widget.attach('button', {
-    className: 'btn btn-primary btn-small back-button',
+    className: 'btn-primary btn-small back-button',
     label: 'topic.timeline.back',
     title: 'topic.timeline.back_description',
     action: 'goBack'
@@ -270,6 +271,65 @@ createWidget('topic-timeline-container', {
   }
 });
 
+createWidget('timeline-controls', {
+  tagName: 'div.timeline-controls',
+
+  html(attrs) {
+    const controls = [];
+    const { fullScreen, currentUser, topic } = attrs;
+
+    if (!fullScreen && currentUser && currentUser.get('canManageTopic')) {
+      controls.push(this.attach('topic-admin-menu-button', { topic }));
+    }
+
+    return controls;
+  }
+});
+
+createWidget('timeline-footer-controls', {
+  tagName: 'div.timeline-footer-controls',
+
+  html(attrs) {
+    const controls = [];
+    const { currentUser, fullScreen, topic, notificationLevel } = attrs;
+
+    if (currentUser && !fullScreen) {
+      if (topic.get('details.can_create_post')) {
+        controls.push(this.attach('button', {
+          className: 'create',
+          icon: 'reply',
+          title: 'topic.reply.help',
+          action: 'replyToPost'
+        }));
+      }
+    }
+
+    if (fullScreen) {
+      controls.push(this.attach('button', {
+        className: 'jump-to-post',
+        title: 'topic.progress.jump_prompt_long',
+        label: 'topic.progress.jump_prompt',
+        action: 'jumpToPostPrompt'
+      }));
+    }
+
+    if (currentUser) {
+      controls.push(new ComponentConnector(this,
+        'topic-notifications-options',
+        {
+          value: notificationLevel,
+          topic,
+          showFullTitle: false
+        },
+        ["value"]
+      ));
+    }
+
+    return controls;
+  }
+
+});
+
 export default createWidget('topic-timeline', {
   tagName: 'div.topic-timeline',
 
@@ -317,6 +377,8 @@ export default createWidget('topic-timeline', {
     const stream = attrs.topic.get('postStream.stream');
     const { currentUser } = this;
 
+    attrs["currentUser"] = currentUser;
+
     let result = [];
 
     if (attrs.fullScreen) {
@@ -333,19 +395,21 @@ export default createWidget('topic-timeline', {
 
       if (this.state.excerpt) {
         elems.push(new RawHtml({
-          html: "<div class='post-excerpt'>" + this.state.excerpt + "</div>"
+          html: `<div class='post-excerpt'>${this.state.excerpt}</div>`
         }));
       }
 
       result.push(h('div.title', elems));
     }
 
-    if (!attrs.fullScreen && currentUser && currentUser.get('canManageTopic')) {
-      result.push(h('div.timeline-controls', this.attach('topic-admin-menu-button', { topic })));
-    }
+    result.push(this.attach('timeline-controls', attrs));
 
     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 });
@@ -361,37 +425,8 @@ export default createWidget('topic-timeline', {
                               action: 'jumpBottom'
                             }))];
 
-    result = result.concat([h('div.timeline-scrollarea-wrapper', scroller)]);
-
-    const controls = [];
-    if (currentUser && !attrs.fullScreen) {
-      if (attrs.topic.get('details.can_create_post')) {
-        controls.push(this.attach('button', {
-          className: 'btn create',
-          icon: 'reply',
-          title: 'topic.reply.help',
-          action: 'replyToPost'
-        }));
-      }
-
-    }
-
-    if (attrs.fullScreen) {
-      controls.push(this.attach('button', {
-        className: 'btn jump-to-post',
-        title: 'topic.progress.jump_prompt_long',
-        label: 'topic.progress.jump_prompt',
-        action: 'jumpToPostPrompt'
-      }));
-    }
-
-    if (currentUser) {
-      controls.push(this.attach('topic-notifications-button', { topic }));
-    }
-
-    if (controls.length > 0) {
-      result.push(h('div.timeline-footer-controls', controls));
-    }
+    result.push(h('div.timeline-scrollarea-wrapper', scroller));
+    result.push(this.attach('timeline-footer-controls', attrs));
 
     return result;
   }
diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js.es6 b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
index bdb1c4ed9b..302264c07e 100644
--- a/app/assets/javascripts/discourse/widgets/user-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/user-menu.js.es6
@@ -1,5 +1,7 @@
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
+import { formatUsername } from 'discourse/lib/utilities';
+import { ajax } from 'discourse/lib/ajax';
 
 let extraGlyphs;
 
@@ -23,9 +25,14 @@ createWidget('user-menu-links', {
     const glyphs = [];
 
     if (extraGlyphs) {
-      // yes glyphs.push(...extraGlyphs) is nicer, but pulling in
-      // _toConsumableArray seems totally uneeded here
-      glyphs.push.apply(glyphs, extraGlyphs);
+      extraGlyphs.forEach(g => {
+        if (typeof g === "function") {
+          g = g(this);
+        }
+        if (g) {
+          glyphs.push(g);
+        }
+      });
     }
 
     glyphs.push({ label: 'user.bookmarks',
@@ -45,7 +52,7 @@ createWidget('user-menu-links', {
       model: currentUser,
       className: 'user-activity-link',
       icon: 'user',
-      rawLabel: currentUser.username
+      rawLabel: formatUsername(currentUser.username)
     };
 
     if (currentUser.is_anonymous) {
@@ -81,25 +88,74 @@ createWidget('user-menu-links', {
   }
 });
 
+createWidget('user-menu-dismiss-link', {
+  tagName: 'div.dismiss-link',
+  buildKey: () => 'user-menu-dismiss-link',
+
+  html() {
+    if (userNotifications.state.notifications.filterBy("read", false).length > 0) {
+      return h('ul.menu-links',
+        h('li',
+          this.attach('link', {
+            action: 'dismissNotifications',
+            className: 'dismiss',
+            icon: 'check',
+            label: 'user.dismiss',
+            title: 'user.dismiss_notifications_tooltip'
+          })
+        )
+      );
+    } else {
+      return '';
+    }
+  },
+
+  dismissNotifications() {
+    ajax('/notifications/mark-read', { method: 'PUT' }).then(() => {
+      userNotifications.notificationsChanged();
+    });
+  }
+});
+
+let userNotifications = null,
+  dismissLink = null;
+
 export default createWidget('user-menu', {
   tagName: 'div.user-menu',
 
+  settings: {
+    maxWidth: 300
+  },
+
   panelContents() {
     const path = this.currentUser.get('path');
+    userNotifications = this.attach('user-notifications', { path });
+    dismissLink = this.attach('user-menu-dismiss-link');
 
-    return [this.attach('user-menu-links', { path }),
-            this.attach('user-notifications', { path }),
-            h('div.logout-link', [
-              h('ul.menu-links',
-                h('li', this.attach('link', { action: 'logout',
-                                                       className: 'logout',
-                                                       icon: 'sign-out',
-                                                       label: 'user.log_out' })))
-              ])];
+    return [
+      this.attach('user-menu-links', { path }),
+      userNotifications,
+      h('div.logout-link', [
+        h('ul.menu-links',
+          h('li',
+            this.attach('link', {
+              action: 'logout',
+              className: 'logout',
+              icon: 'sign-out',
+              label: 'user.log_out'
+            })
+          )
+        )
+      ]),
+      dismissLink
+    ];
   },
 
   html() {
-    return this.attach('menu-panel', { contents: () => this.panelContents() });
+    return this.attach('menu-panel', {
+      maxWidth: this.settings.maxWidth,
+      contents: () => this.panelContents()
+    });
   },
 
   clickOutside() {
diff --git a/app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6 b/app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6
index d10e64b581..dd90f28159 100644
--- a/app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6
+++ b/app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6
@@ -4,7 +4,7 @@ import { dateNode } from 'discourse/helpers/node';
 
 createWidget('large-notification-item', {
   buildClasses(attrs) {
-    const result = ['item', 'notification'];
+    const result = ['item', 'notification', 'large-notification'];
     if (!attrs.get('read')) {
       result.push('unread');
     }
diff --git a/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 b/app/assets/javascripts/discourse/widgets/user-notifications.js.es6
index 2be1dd832d..a6353a995f 100644
--- a/app/assets/javascripts/discourse/widgets/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/widgets/user-notifications.js.es6
@@ -1,13 +1,14 @@
 import { createWidget } from 'discourse/widgets/widget';
 import { headerHeight } from 'discourse/components/site-header';
 import { h } from 'virtual-dom';
+import DiscourseURL from 'discourse/lib/url';
 
 export default createWidget('user-notifications', {
   tagName: 'div.notifications',
   buildKey: () => 'user-notifications',
 
   defaultState() {
-    return { notifications: [], loading: false };
+    return { notifications: [], loading: false, loaded: false };
   },
 
   notificationsChanged() {
@@ -49,12 +50,13 @@ export default createWidget('user-notifications', {
       state.notifications = [];
     }).finally(() => {
       state.loading = false;
+      state.loaded = true;
       this.scheduleRerender();
     });
   },
 
   html(attrs, state) {
-    if (!state.notifications.length) {
+    if (!state.loaded) {
       this.refreshNotifications(state);
     }
 
@@ -70,10 +72,14 @@ export default createWidget('user-notifications', {
       const items = [notificationItems];
 
       if (notificationItems.length > 5) {
-        const href = `${attrs.path}/notifications`;
-
         items.push(
-          h('li.read.last.heading', h('a', { attributes: { href } }, [I18n.t('notifications.more'), '...'])),
+          h('li.read.last.heading.show-all',
+            this.attach('button', {
+              title: 'notifications.more',
+              icon: 'chevron-down',
+              action: 'showAllNotifications',
+              className: 'btn'
+            })),
           h('hr')
         );
       }
@@ -82,5 +88,9 @@ export default createWidget('user-notifications', {
     }
 
     return result;
+  },
+
+  showAllNotifications() {
+    DiscourseURL.routeTo(`${this.attrs.path}/notifications`);
   }
 });
diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js.es6
index 94c798741f..e81123c8ad 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];
@@ -103,6 +91,8 @@ function drawWidget(builder, attrs, state) {
     }
   }
 
+  this.transformed = this.transform(this.attrs, this.state);
+
   let contents = this.html(attrs, state);
   if (this.name) {
     const beforeContents = applyDecorators(this, 'before', attrs, state) || [];
@@ -124,6 +114,10 @@ export function createWidget(name, opts) {
   opts.html = opts.html || emptyContent;
   opts.draw = drawWidget;
 
+  if (opts.template) {
+    opts.html = opts.template;
+  }
+
   Object.keys(opts).forEach(k => result.prototype[k] = opts[k]);
   return result;
 }
@@ -135,7 +129,25 @@ export function reopenWidget(name, opts) {
     return;
   }
 
-  Object.keys(opts).forEach(k => existing.prototype[k] = opts[k]);
+  if (opts.template) {
+    opts.html = opts.template;
+  }
+
+  Object.keys(opts).forEach(k => {
+    let old = existing.prototype[k];
+
+    if (old) {
+      // Add support for `this._super()` to reopened widgets if the prototype exists in the
+      // base object
+      existing.prototype[k] = function(...args) {
+        let ctx = Object.create(this);
+        ctx._super = (...superArgs) => old.apply(this, superArgs);
+        return opts[k].apply(ctx, args);
+      };
+    } else {
+      existing.prototype[k] = opts[k];
+    }
+  });
   return existing;
 }
 
@@ -146,6 +158,7 @@ export default class Widget {
     this.mergeState = opts.state;
     this.model = opts.model;
     this.register = register;
+    this.dirtyKeys = opts.dirtyKeys;
 
     register.deprecateContainer(this);
 
@@ -154,7 +167,7 @@ export default class Widget {
     this.siteSettings = register.lookup('site-settings:main');
     this.currentUser = register.lookup('current-user:main');
     this.capabilities = register.lookup('capabilities:main');
-    this.store = register.lookup('store:main');
+    this.store = register.lookup('service:store');
     this.appEvents = register.lookup('app-events:main');
     this.keyValueStore = register.lookup('key-value-store:main');
 
@@ -176,6 +189,10 @@ export default class Widget {
     }
   }
 
+  transform() {
+    return {};
+  }
+
   defaultState() {
     return {};
   }
@@ -185,6 +202,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 +216,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 +264,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 +283,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;
@@ -287,7 +310,7 @@ export default class Widget {
         view.sendAction(method, param);
         promise = Ember.RSVP.resolve();
       } else {
-        const target = view.get('targetObject');
+        const target = view.get('targetObject') || view;
         promise = method.call(target, param);
         if (!promise || !promise.then) {
           promise = Ember.RSVP.resolve(promise);
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 e8d3b7ba88..3df6ac4018 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/locales/ca.js.erb b/app/assets/javascripts/locales/ca.js.erb
new file mode 100644
index 0000000000..4d68068765
--- /dev/null
+++ b/app/assets/javascripts/locales/ca.js.erb
@@ -0,0 +1,3 @@
+//= depend_on 'client.ca.yml'
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:ca) %>
diff --git a/app/assets/javascripts/locales/en.js.erb b/app/assets/javascripts/locales/en.js.erb
index df19d22fa8..edf422ff76 100644
--- a/app/assets/javascripts/locales/en.js.erb
+++ b/app/assets/javascripts/locales/en.js.erb
@@ -1,3 +1,5 @@
 //= depend_on 'client.en.yml'
 //= require locales/i18n
+
+<% JsLocaleHelper.reloadable_plugins(:en, self) %>
 <%= JsLocaleHelper.output_locale(:en) %>
diff --git a/app/assets/javascripts/locales/i18n.js b/app/assets/javascripts/locales/i18n.js
index ddf3fd55f1..ba56bc3a80 100644
--- a/app/assets/javascripts/locales/i18n.js
+++ b/app/assets/javascripts/locales/i18n.js
@@ -48,8 +48,7 @@ function checkExtras(origScope, sep, extras) {
 I18n.lookup = function(scope, options) {
   options = options || {};
 
-  var lookupInitialScope = scope,
-      translations = this.prepareOptions(I18n.translations),
+  var translations = this.prepareOptions(I18n.translations),
       locale = options.locale || I18n.currentLocale(),
       messages = translations[locale] || {},
       currentScope;
diff --git a/app/assets/javascripts/locales/lv.js.erb b/app/assets/javascripts/locales/lv.js.erb
new file mode 100644
index 0000000000..3b75ac291b
--- /dev/null
+++ b/app/assets/javascripts/locales/lv.js.erb
@@ -0,0 +1,3 @@
+//= depend_on 'client.lv.yml'
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:lv) %>
diff --git a/app/assets/javascripts/locales/sr.js.erb b/app/assets/javascripts/locales/sr.js.erb
new file mode 100644
index 0000000000..7d2e42c701
--- /dev/null
+++ b/app/assets/javascripts/locales/sr.js.erb
@@ -0,0 +1,3 @@
+//= depend_on 'client.sr.yml'
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:sr) %>
diff --git a/app/assets/javascripts/locales/th.js.erb b/app/assets/javascripts/locales/th.js.erb
new file mode 100644
index 0000000000..e20959e00c
--- /dev/null
+++ b/app/assets/javascripts/locales/th.js.erb
@@ -0,0 +1,3 @@
+//= depend_on 'client.th.yml'
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:th) %>
diff --git a/app/assets/javascripts/markdown-it-bundle.js b/app/assets/javascripts/markdown-it-bundle.js
new file mode 100644
index 0000000000..eba760fd6b
--- /dev/null
+++ b/app/assets/javascripts/markdown-it-bundle.js
@@ -0,0 +1,18 @@
+//= 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
+//= require ./pretty-text/engines/discourse-markdown/image-protocol
+//= require ./pretty-text/engines/discourse-markdown/inject-line-number
diff --git a/app/assets/javascripts/pretty-text-bundle.js b/app/assets/javascripts/pretty-text-bundle.js
index 51d7b2b355..41324ba31e 100644
--- a/app/assets/javascripts/pretty-text-bundle.js
+++ b/app/assets/javascripts/pretty-text-bundle.js
@@ -3,11 +3,11 @@
 //= 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
+//= require ./pretty-text/image-short-url
diff --git a/app/assets/javascripts/pretty-text/censored-words.js.es6 b/app/assets/javascripts/pretty-text/censored-words.js.es6
index 48e351cc17..58900460bc 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 3df9040a24..0000000000
--- 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 0000000000..fc7f79c94b
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/emoji.js.es6.erb
@@ -0,0 +1,123 @@
+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) {
+  if (!string) { return; }
+
+  // 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 90861fb7bb..1864844957 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 0000000000..4af5b67f08
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6
@@ -0,0 +1,281 @@
+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();
+    if (this.cache.hasOwnProperty(tag)) {
+      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]*)(\s*,\s*([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 7555bebdf3..0000000000
--- 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 1a2bb7c0ff..0000000000
--- 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 0000000000..ddb92eefdb
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6
@@ -0,0 +1,335 @@
+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 findBlockCloseTag(state, openTag, startLine, endLine) {
+
+  let nesting = 0,
+    line = startLine-1,
+    start,
+    closeTag,
+    max;
+
+  for (;;) {
+    line++;
+    if (line >= endLine) {
+      // unclosed bbcode block should not be autoclosed by end of document.
+      return;
+    }
+
+    start = state.bMarks[line] + state.tShift[line];
+    max = state.eMarks[line];
+
+    if (start < max && state.sCount[line] < 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[line] - state.blkIndent >= 4) {
+      // closing bbcode less than 4 spaces
+      continue;
+    }
+
+    closeTag = parseBBCodeTag(state.src, start, max, true);
+
+    if (closeTag && closeTag.closing && closeTag.tag === openTag.tag) {
+      if (nesting === 0) {
+        closeTag.line = line;
+        closeTag.block = true;
+        break;
+      }
+      nesting--;
+    }
+
+    if (closeTag && !closeTag.closing && closeTag.tag === openTag.tag) {
+      nesting++;
+    }
+
+    closeTag = null;
+  }
+
+  return closeTag;
+}
+
+function findInlineCloseTag(state, openTag, start, max) {
+
+  let closeTag;
+  let possibleTag = false;
+
+  for(let j=max-1;j>start;j--){
+    if (!possibleTag) {
+      if (state.src.charCodeAt(j) === 93 /* ] */) {
+        possibleTag = true;
+        continue;
+      }
+      if(!isWhiteSpace(state.src.charCodeAt(j))) {
+        break;
+      }
+    } else {
+      if (state.src.charCodeAt(j) === 91 /* [ */) {
+        closeTag = parseBBCodeTag(state.src, j, max);
+        if (!closeTag || closeTag.tag !== openTag.tag || !closeTag.closing) {
+          closeTag = null;
+        } else {
+          closeTag.start = j;
+          break;
+        }
+      }
+    }
+  }
+
+  return closeTag;
+}
+
+function applyBBCode(state, startLine, endLine, silent, md) {
+
+  var nextLine,
+      oldParent, oldLineMax, 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);
+
+  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;
+
+  // We might have a single inline bbcode
+
+  let closeTag = findInlineCloseTag(state, info, start + info.length, max);
+
+  if (!closeTag) {
+    if (!trailingSpaceOnly(state.src, start + info.length, max)) {
+      return false;
+    }
+    closeTag = findBlockCloseTag(state, info, nextLine+1, endLine);
+  }
+
+  if (!closeTag) {
+    return false;
+  }
+
+  nextLine = closeTag.line || startLine;
+
+  oldParent = state.parentType;
+  oldLineMax = state.lineMax;
+
+  // this will prevent lazy continuations from ever going past our end marker
+  // which can happen if we are parsing a bbcode block
+  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 ];
+
+    if (closeTag.block) {
+      state.md.block.tokenize(state, startLine + 1, nextLine);
+    } else {
+      let token = state.push('paragraph_open', 'p', 1);
+      token.map = [startLine, startLine];
+
+      token = state.push('inline', '', 0);
+      token.children = [];
+      token.map = [startLine, startLine];
+      token.content = state.src.slice(start + info.length, closeTag.start);
+
+      state.push('paragraph_close', 'p', -1);
+    }
+
+    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 = oldParent;
+  state.lineMax = oldLineMax;
+  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 0000000000..e508509298
--- /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 52e0ecba1e..0000000000
--- 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 e4d3679316..0000000000
--- 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 2135663ea4..488a528211 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 b0ac2e5acc..91a0d297ba 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,40 @@
-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.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 10110f150b..a8def62ce2 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 20577a97ad..522edbe766 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,245 @@
-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))
+    );
+  });
+
+  helper.whiteList(['img[class=emoji]','img[class=emoji emoji-custom]']);
 }
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 0000000000..c689d5c633
--- /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 0000000000..02adc2cf1e
--- /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 0e5c5e4a18..0000000000
--- 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/image-protocol.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/image-protocol.js.es6
new file mode 100644
index 0000000000..2211413f44
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/image-protocol.js.es6
@@ -0,0 +1,60 @@
+// add image to array if src has an upload
+function addImage(images, token) {
+  if (token.attrs) {
+    for(let i=0; i<token.attrs.length; i++) {
+      if (token.attrs[i][1].indexOf('upload://') === 0) {
+        images.push([token, i]);
+        break;
+      }
+    }
+  }
+}
+
+function rule(state) {
+
+  let images = [];
+
+  for (let i = 0; i < state.tokens.length; i++) {
+    let blockToken = state.tokens[i];
+
+    if (blockToken.tag === 'img') {
+      addImage(images, blockToken);
+    }
+
+    if (!blockToken.children) {
+      continue;
+    }
+
+    for (let j = 0; j < blockToken.children.length; j++) {
+      let token = blockToken.children[j];
+      if (token.tag === 'img') {
+        addImage(images, token);
+      }
+    }
+  }
+
+  if (images.length > 0) {
+    let srcList = images.map(([token, srcIndex]) => token.attrs[srcIndex][1]);
+    let lookup = state.md.options.discourse.lookupImageUrls;
+    let longUrls = (lookup && lookup(srcList)) || {};
+
+    images.forEach(([token, srcIndex]) => {
+      let origSrc = token.attrs[srcIndex][1];
+      let mapped = longUrls[origSrc];
+      if (mapped) {
+        token.attrs[srcIndex][1] = mapped;
+      } else {
+        token.attrs[srcIndex][1] = state.md.options.discourse.getURL('/images/transparent.png');
+        token.attrs.push(['data-orig-src', origSrc]);
+      }
+    });
+  }
+
+}
+
+export function setup(helper) {
+  helper.whiteList(['img[data-orig-src]']);
+  helper.registerPlugin(md => {
+    md.core.ruler.push('image-protocol', rule);
+  });
+}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/inject-line-number.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/inject-line-number.js.es6
new file mode 100644
index 0000000000..1f741d7df9
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/inject-line-number.js.es6
@@ -0,0 +1,52 @@
+export function setup(helper) {
+  const opts = helper.getOptions();
+
+  if (opts.previewing && opts.injectLineNumbersToPreview) {
+    helper.whiteList([
+      'p.preview-sync-line',
+      'p[data-line-number]',
+      'h1.preview-sync-line',
+      'h1[data-line-number]',
+      'h2.preview-sync-line',
+      'h2[data-line-number]',
+      'h3.preview-sync-line',
+      'h3[data-line-number]',
+      'h4.preview-sync-line',
+      'h4[data-line-number]',
+      'h5.preview-sync-line',
+      'h5[data-line-number]',
+      'h6.preview-sync-line',
+      'h6[data-line-number]',
+      'blockquote.preview-sync-line',
+      'blockquote[data-line-number]',
+      'hr.preview-sync-line',
+      'hr[data-line-number]',
+      'ul.preview-sync-line',
+      'ul[data-line-number]',
+      'ol.preview-sync-line',
+      'ol[data-line-number]',
+    ]);
+
+    helper.registerPlugin(md => {
+      const injectLineNumber = (tokens, index, options, env, self) => {
+        let line;
+        const token = tokens[index];
+
+        if (token.map && token.level === 0) {
+          line = token.map[0];
+          token.attrJoin('class', 'preview-sync-line');
+          token.attrSet('data-line-number', String(line));
+        }
+
+        return self.renderToken(tokens, index, options, env, self);
+      };
+
+      md.renderer.rules.paragraph_open = injectLineNumber;
+      md.renderer.rules.heading_open = injectLineNumber;
+      md.renderer.rules.blockquote_open = injectLineNumber;
+      md.renderer.rules.hr = injectLineNumber;
+      md.renderer.rules.ordered_list_open = injectLineNumber;
+      md.renderer.rules.bullet_list_open = injectLineNumber;
+    });
+  }
+}
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 115f58997d..8484f7ba6c 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,54 @@
-/**
-  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 { getURL, mentionLookup, formatUsername } = state.md.options.discourse;
+
+  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);
+  if (formatUsername) {
+    username = formatUsername(username);
+  }
+
+  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) {
-
-  // We have to prune @mentions that are within links.
-  helper.onParseNode(event => {
-    const node = event.node,
-    path = event.path;
-
-    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.registerOptions((opts, siteSettings) => {
+    opts.features.mentions = !!siteSettings.enable_mentions;
   });
 
-  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,
+  helper.registerPlugin(md => {
 
-    emitter(matches) {
-      const mention = matches[0].trim();
-      const name = matches[1];
-      const opts = helper.getOptions();
-      const mentionLookup = opts.mentionLookup;
+    const rule = {
+      matcher: /@(\w[\w.-]{0,58}\w)|@(\w)/,
+      onMatch: addMention
+    };
 
-      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 3e74225e9c..f1eb2ba759 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 ee73c02925..2ff5c2a120 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,124 @@
 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; }
-  }
-
-  if (idx < siblings.length) {
-    const next = siblings[idx+1];
-    if (next && (!((next[0] === 'br') || (typeof next === 'string' && next.trim() === "")))) { return false; }
-  }
-
-  return true;
+function isTopLevel(href) {
+  let split = href.split(/https?:\/\/[^\/]+[\/?]/i);
+  let hasExtra = split && split[1] && split[1].length > 0;
+  return !hasExtra;
 }
 
-//  We only onebox stuff that is on its own line.
-export function setup(helper) {
-  helper.onParseNode(event => {
-    const node = event.node,
-    path = event.path;
+function applyOnebox(state, silent) {
+  if (silent || !state.tokens) {
+    return;
+  }
 
-    // We only care about links
-    if (node[0] !== 'a')  { return; }
+  for(let i=1;i<state.tokens.length;i++) {
+    let token = state.tokens[i];
+    let prev = state.tokens[i-1];
+    let mode = prev.type === "paragraph_open" && prev.level === 0 ? ONEBOX : INLINE;
 
-    const parent = path[path.length - 1];
+    if (token.type === "inline") {
 
-    // We don't onebox bbcode
-    if (node[1]['data-bbcode']) {
-      delete node[1]['data-bbcode'];
-      return;
-    }
+      let children = token.children;
+      for(let j=0;j<children.length-2;j++){
+        let child = children[j];
 
-    // We don't onebox mentions
-    if (node[1]['class'] === 'mention') { return; }
+        if (child.type === "link_open" && child.markup === 'linkify' && child.info === 'auto') {
 
-    // Don't onebox links within a list
-    for (var i=0; i<path.length; i++) {
-      if (path[i][0] === 'li') { return; }
-    }
+          if (j > children.length-3) {
+            continue;
+          }
 
-    // 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; }
+          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;
+            }
+          }
 
-    if (isOnOneLine(node, parent)) {
+          // look ahead for soft or hard break
+          let text = children[j+1];
+          let close = children[j+2];
+          let lookahead = children[j+3];
 
-      node[1]['class'] = 'onebox';
-      node[1].target = '_blank';
+          if (lookahead && lookahead.tag !== 'br') {
+            mode = INLINE;
+          }
 
-      const contents = lookupCache(node[1].href);
-      if (contents) {
-        node[0] = '__RAW';
-        node[1] = contents;
-        node.length = 2;
+          // check attrs only include a href
+          let attrs = child.attrs;
+
+          if (!attrs || attrs.length !== 1 || attrs[0][0] !== "href") {
+            continue;
+          }
+
+          let href = attrs[0][1];
+
+          // 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) {
+
+            if (!isTopLevel(href)) {
+              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 0000000000..dbc43b275f
--- /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 87bc948d69..0000000000
--- 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 0000000000..3a0523bef6
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
@@ -0,0 +1,161 @@
+import { performEmojiUnescape } from 'pretty-text/emoji';
+
+const rule = {
+  tag: 'quote',
+
+  before(state, tagInfo) {
+
+    const attrs = tagInfo.attrs;
+    let options = state.md.options.discourse;
+
+    let quoteInfo = attrs['_default'];
+    let username, postNumber, topicId, avatarImg, primaryGroupName, full, displayName;
+
+    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;
+        }
+      }
+    }
+
+    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 (options.lookupPrimaryUserGroupByPostNumber) {
+      // client-side, we can retrieve the primary user group from the post
+      primaryGroupName = options.lookupPrimaryUserGroupByPostNumber(postNumber, topicId);
+    } else if (options.lookupPrimaryUserGroup) {
+      // server-side, we need to lookup the primary user group from the username
+      primaryGroupName = options.lookupPrimaryUserGroup(username);
+    }
+
+    if (options.formatUsername) {
+      displayName = options.formatUsername(username);
+    } else {
+      displayName = username;
+    }
+
+    let token   = state.push('bbcode_open', 'aside', 1);
+    token.attrs = [];
+
+    if (primaryGroupName && primaryGroupName.length !== 0) {
+      token.attrs.push(['class', `quote group-${primaryGroupName}`]);
+    } else {
+      token.attrs.push(['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 (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 = ` ${displayName}:`;
+      }
+
+      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);
+  });
+
+  helper.whiteList(['img[class=avatar]']);
+  helper.whiteList({
+    custom(tag, name, value) {
+      if (tag === 'aside' && name === 'class') {
+        return !!/^quote group\-(.+)$/.exec(value);
+      }
+    }
+  });
+}
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 2a0e04a5b3..3506e66ceb 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,38 @@
-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) {
 
-  helper.whiteList(['table', 'table.md-table', 'tbody', 'thead', 'tr', 'th', 'td']);
+  helper.registerPlugin(md => {
 
-  helper.replaceBlock({
-    start: /(<table[^>]*>)([\S\s]*)/igm,
-    stop: /<\/table>/igm,
-    rawContents: true,
-    priority: 1,
+    md.renderer.rules.table_open = function(){
+      return '<div class="md-table">\n<table>\n';
+    };
 
-    emitter(contents) {
-      return ['table', {"class": "md-table"}, tableFlattenBlocks.apply(this, [contents])];
+    md.renderer.rules.table_close = function(){
+      return '</table>\n</div>';
+    };
+  });
+
+  // we need a custom callback for style handling
+  helper.whiteList({
+    custom: function(tag,attr,val) {
+      if (tag !== 'th' && tag !== 'td') {
+        return false;
+      }
+
+      if (attr !== 'style') {
+        return false;
+      }
+
+      return (val === 'text-align:right' || val === 'text-align:left' || val === 'text-align:center');
     }
   });
+
+  helper.whiteList([
+      'table',
+      'tbody',
+      'thead',
+      'tr',
+      'th',
+      'td',
+      'div.md-table'
+  ]);
 }
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 0000000000..38bea8abf1
--- /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/image-short-url.js.es6 b/app/assets/javascripts/pretty-text/image-short-url.js.es6
new file mode 100644
index 0000000000..4efcefaec3
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/image-short-url.js.es6
@@ -0,0 +1,50 @@
+let _cache = {};
+
+export function lookupCachedUploadUrl(shortUrl) {
+  return _cache[shortUrl];
+}
+
+export function lookupUncachedUploadUrls(urls, ajax) {
+  return ajax('/uploads/lookup-urls', { method: 'POST', data: { short_urls: urls } })
+    .then(uploads => {
+      uploads.forEach(upload => _cache[upload.short_url] = upload.url);
+      urls.forEach(url => _cache[url] = _cache[url] || "missing");
+      return uploads;
+    });
+}
+
+export function cacheShortUploadUrl(shortUrl, url) {
+  _cache[shortUrl] = url;
+}
+
+function _loadCachedShortUrls($images) {
+  $images.each((idx, image) => {
+    let $image = $(image);
+    let url = lookupCachedUploadUrl($image.data('orig-src'));
+    if (url) {
+      $image.removeAttr('data-orig-src');
+      if (url !== "missing") {
+        $image.attr('src', url);
+      }
+    }
+  });
+}
+
+function _loadShortUrls($images, ajax) {
+  const urls = _.map($images, img => $(img).data('orig-src'));
+  lookupUncachedUploadUrls(urls, ajax).then(() => _loadCachedShortUrls($images));
+}
+
+export function resolveAllShortUrls(ajax) {
+  let $shortUploadUrls = $('img[data-orig-src]');
+
+  if ($shortUploadUrls.length > 0) {
+    _loadCachedShortUrls($shortUploadUrls);
+
+    $shortUploadUrls = $('img[data-orig-src]');
+    if ($shortUploadUrls.length > 0) {
+      // this is carefully batched so we can do a leading debounce (trigger right away)
+      Ember.run.debounce(null, () => { _loadShortUrls($shortUploadUrls, ajax); }, 450, 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 0000000000..b8be79f60e
--- /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 b56cff9d5a..245c87cbca 100644
--- a/app/assets/javascripts/pretty-text/oneboxer.js.es6
+++ b/app/assets/javascripts/pretty-text/oneboxer.js.es6
@@ -3,6 +3,38 @@ const loadingQueue = [];
 const localCache = {};
 const failedCache = {};
 
+function resolveSize(img) {
+  $(img).addClass('size-resolved');
+
+  if (img.width > 0 && img.width === img.height) {
+    $(img).addClass('onebox-avatar');
+  }
+}
+
+// Detect square images and apply smaller onebox-avatar class
+function applySquareGenericOnebox($elem, normalizedUrl) {
+  if (!$elem.hasClass('whitelistedgeneric')) {
+    return;
+  }
+
+  let $img = $elem.find('.onebox-body img.thumbnail');
+  let img = $img[0];
+
+  // already resolved... skip
+  if ($img.length !== 1 || $img.hasClass('size-resolved')) {
+    return;
+  }
+
+  if (img.complete) {
+    resolveSize(img, $elem, normalizedUrl);
+  } else {
+    $img.on('load.onebox', () => {
+      resolveSize(img, $elem, normalizedUrl);
+      $img.off('load.onebox');
+    });
+  }
+}
+
 function loadNext(ajax) {
   if (loadingQueue.length === 0) {
     timeout = null;
@@ -16,18 +48,21 @@ function loadNext(ajax) {
   // Retrieve the onebox
   return ajax("/onebox", {
     dataType: 'html',
-    data: { url, refresh, user_id: userId },
+    data: { url, refresh },
     cache: true
   }).then(html => {
-    localCache[url] = html;
-    $elem.replaceWith(html);
+    let $html = $(html);
+
+    localCache[normalize(url)] = $html;
+    $elem.replaceWith($html);
+    applySquareGenericOnebox($html, normalize(url));
   }, result => {
     if (result && result.jqXHR && result.jqXHR.status === 429) {
       timeoutMs = 2000;
       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 +87,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];
-    if (cached) return cached;
+    const cached = localCache[normalize(url)];
+    if (cached) return cached.prop('outerHTML');
 
     // If the request failed, don't do anything
-    const failed = failedCache[url];
+    const failed = failedCache[normalize(url)];
     if (failed) return;
   }
 
@@ -74,6 +109,13 @@ 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) {
+  const cached = localCache[normalize(url)];
+  return cached && cached.prop('outerHTML');
 }
diff --git a/app/assets/javascripts/pretty-text/pretty-text.js.es6 b/app/assets/javascripts/pretty-text/pretty-text.js.es6
index 2769502ff8..0d24a92aef 100644
--- a/app/assets/javascripts/pretty-text/pretty-text.js.es6
+++ b/app/assets/javascripts/pretty-text/pretty-text.js.es6
@@ -1,30 +1,37 @@
-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,
     lookupAvatar,
+    lookupPrimaryUserGroup,
     getTopicInfo,
     topicId,
     categoryHashtagLookup,
     userId,
     getCurrentUser,
-    currentUser
+    currentUser,
+    lookupAvatarByPostNumber,
+    lookupPrimaryUserGroupByPostNumber,
+    formatUsername,
+    emojiUnicodeReplacer,
+    lookupInlineOnebox,
+    lookupImageUrls,
+    previewing,
+    linkify,
+    censoredWords,
+    mentionLookup
   } = state;
 
-  const features = {
+  let features = {
     'bold-italics': true,
     'auto-link': true,
     'mentions': true,
@@ -33,45 +40,69 @@ 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,
     features,
     lookupAvatar,
+    lookupPrimaryUserGroup,
     getTopicInfo,
     topicId,
     categoryHashtagLookup,
     userId,
     getCurrentUser,
     currentUser,
-    mentionLookup: state.mentionLookup,
-    allowedHrefSchemes: siteSettings.allowed_href_schemes ? siteSettings.allowed_href_schemes.split('|') : null
+    lookupAvatarByPostNumber,
+    lookupPrimaryUserGroupByPostNumber,
+    formatUsername,
+    mentionLookup,
+    emojiUnicodeReplacer,
+    lookupInlineOnebox,
+    lookupImageUrls,
+    censoredWords,
+    allowedHrefSchemes: siteSettings.allowed_href_schemes ? siteSettings.allowed_href_schemes.split('|') : null,
+    allowedIframes: siteSettings.allowed_iframes ? siteSettings.allowed_iframes.split('|') : [],
+    markdownIt: true,
+    injectLineNumbersToPreview: siteSettings.enable_advanced_editor_preview_sync,
+    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/sanitizer.js.es6 b/app/assets/javascripts/pretty-text/sanitizer.js.es6
index d865c9be5c..512e332846 100644
--- a/app/assets/javascripts/pretty-text/sanitizer.js.es6
+++ b/app/assets/javascripts/pretty-text/sanitizer.js.es6
@@ -1,7 +1,5 @@
 import xss from 'pretty-text/xss';
 
-const _validIframes = [];
-
 function attr(name, value) {
   if (value) {
     return `${name}="${xss.escapeAttrValue(value)}"`;
@@ -69,7 +67,8 @@ export function sanitize(text, whiteLister) {
   text = text.replace(/<([^A-Za-z\/\!]|$)/g, "&lt;$1");
 
   const whiteList = whiteLister.getWhiteList(),
-        allowedHrefSchemes = whiteLister.getAllowedHrefSchemes();
+        allowedHrefSchemes = whiteLister.getAllowedHrefSchemes(),
+        allowedIframes = whiteLister.getAllowedIframes();
   let extraHrefMatchers = null;
 
   if (allowedHrefSchemes && allowedHrefSchemes.length > 0) {
@@ -85,11 +84,13 @@ export function sanitize(text, whiteLister) {
       const forTag = whiteList.attrList[tag];
       if (forTag) {
         const forAttr = forTag[name];
-        if ((forAttr && (forAttr.indexOf('*') !== -1 || forAttr.indexOf(value) !== -1)) ||
+        if (
+            (forAttr && (forAttr.indexOf('*') !== -1 || forAttr.indexOf(value) !== -1)) ||
             (name.indexOf('data-') === 0 && forTag['data-*']) ||
             ((tag === 'a' && name === 'href') && hrefAllowed(value, extraHrefMatchers)) ||
             (tag === 'img' && name === 'src' && (/^data:image.*$/i.test(value) || hrefAllowed(value, extraHrefMatchers))) ||
-            (tag === 'iframe' && name === 'src' && _validIframes.some(i => i.test(value)))) {
+            (tag === 'iframe' && name === 'src' && allowedIframes.some(i => { return value.toLowerCase().indexOf((i || '').toLowerCase()) === 0;}))
+        ) {
           return attr(name, value);
         }
 
@@ -97,6 +98,14 @@ export function sanitize(text, whiteLister) {
           return "-STRIP-";
         }
 
+        // Heading ids must begin with `heading--`
+        if (
+          ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'].indexOf(tag) !== -1 &&
+          value.match(/^heading\-\-[a-zA-Z0-9\-\_]+$/)
+        ) {
+          return attr(name, value);
+        }
+
         const custom = whiteLister.getCustom();
         for (let i=0; i<custom.length; i++) {
           const fn = custom[i];
@@ -114,10 +123,3 @@ export function sanitize(text, whiteLister) {
                .replace(/&#39;/g, "'")
                .replace(/ \/>/g, '>');
 };
-
-export function whiteListIframe(regexp) {
-  _validIframes.push(regexp);
-}
-
-whiteListIframe(/^(https?:)?\/\/www\.google\.com\/maps\/embed\?.+/i);
-whiteListIframe(/^(https?:)?\/\/www\.openstreetmap\.org\/export\/embed.html\?.+/i);
diff --git a/app/assets/javascripts/pretty-text/white-lister.js.es6 b/app/assets/javascripts/pretty-text/white-lister.js.es6
index 81956eb4cc..4fd6e36295 100644
--- a/app/assets/javascripts/pretty-text/white-lister.js.es6
+++ b/app/assets/javascripts/pretty-text/white-lister.js.es6
@@ -1,114 +1,123 @@
-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._allowedIframes = (options && options.allowedIframes) || [];
+    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 || [];
-  }
-}
-
-// 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;
+    return this._allowedHrefSchemes;
   }
 
-  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;
+  getAllowedIframes() {
+    return this._allowedIframes;
+  }
 }
 
 // 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]',
@@ -132,12 +141,12 @@ whiteListFeature('default', [
   'dl',
   'dt',
   'em',
-  'h1[id]',
-  'h2[id]',
-  'h3[id]',
-  'h4[id]',
-  'h5[id]',
-  'h6[id]',
+  'h1',
+  'h2',
+  'h3',
+  'h4',
+  'h5',
+  'h6',
   'hr',
   'i',
   'iframe',
@@ -147,7 +156,6 @@ whiteListFeature('default', [
   'iframe[marginwidth]',
   'iframe[width]',
   'img[alt]',
-  'img[class]',
   'img[height]',
   'img[title]',
   'img[width]',
@@ -155,6 +163,7 @@ whiteListFeature('default', [
   'kbd',
   'li',
   'ol',
+  'ol[start]',
   'p',
   'pre',
   's',
@@ -167,4 +176,4 @@ whiteListFeature('default', [
   'sub',
   'sup',
   'ul',
-]);
+];
diff --git a/app/assets/javascripts/select-kit/components/admin-agree-flag-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/admin-agree-flag-dropdown.js.es6
new file mode 100644
index 0000000000..55708f10ea
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/admin-agree-flag-dropdown.js.es6
@@ -0,0 +1,87 @@
+import DropdownSelectBox from "select-kit/components/dropdown-select-box";
+import computed from "ember-addons/ember-computed-decorators";
+
+export default DropdownSelectBox.extend({
+  pluginApiIdentifiers: ["admin-agree-flag-dropdown"],
+  classNames: ["agree-flag", "admin-agree-flag-dropdown"],
+  adminTools: Ember.inject.service(),
+  nameProperty: "label",
+  allowInitialValueMutation: false,
+  headerIcon: "thumbs-o-up",
+
+  computeHeaderContent() {
+    let content = this.baseHeaderComputedContent();
+    content.name = `${I18n.t("admin.flags.agree")}...`;
+    return content;
+  },
+
+  @computed("adminTools", "post.user")
+  spammerDetails(adminTools, user) {
+    return adminTools.spammerDetails(user);
+  },
+
+  canDeleteSpammer: Ember.computed.and("spammerDetails.canDelete", "post.flaggedForSpam"),
+
+  computeContent() {
+    const content = [];
+    const post = this.get("post");
+    const canDeleteSpammer = this.get("canDeleteSpammer");
+
+    if (post.user_deleted) {
+      content.push({
+        icon: "eye",
+        id: "confirm-agree-restore",
+        action: () => this.send("perform", "restore"),
+        label:  I18n.t("admin.flags.agree_flag_restore_post"),
+        description:  I18n.t("admin.flags.agree_flag_restore_post_title")
+      });
+    } else {
+      if (!post.get("postHidden")) {
+        content.push({
+          icon: "eye-slash",
+          action: () => this.send("perform", "hide"),
+          id: "confirm-agree-hide",
+          label: I18n.t("admin.flags.agree_flag_hide_post"),
+          description: I18n.t("admin.flags.agree_flag_hide_post_title")
+        });
+      }
+    }
+
+    content.push({
+      icon: "thumbs-o-up",
+      id: "confirm-agree-keep",
+      description: I18n.t('admin.flags.agree_flag_title'),
+      action: () => this.send("perform", "keep"),
+      label:  I18n.t("admin.flags.agree_flag"),
+    });
+
+    if (canDeleteSpammer) {
+      content.push({
+        title:  I18n.t("admin.flags.delete_spammer_title"),
+        icon: "exclamation-triangle",
+        id: "delete-spammer",
+        action: () => this.send("deleteSpammer"),
+        label:  I18n.t("admin.flags.delete_spammer"),
+      });
+    }
+
+    return content;
+  },
+
+  mutateValue(value) {
+    const computedContentItem = this.get("computedContent").findBy("value", value);
+    Ember.get(computedContentItem, "originalContent.action")();
+  },
+
+  actions: {
+    deleteSpammer() {
+      let spammerDetails = this.get("spammerDetails");
+      this.attrs.removeAfter(spammerDetails.deleteUser());
+    },
+
+    perform(action) {
+      let flaggedPost = this.get("post");
+      this.attrs.removeAfter(flaggedPost.agreeFlags(action));
+    },
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6
new file mode 100644
index 0000000000..2144a1512a
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/admin-delete-flag-dropdown.js.es6
@@ -0,0 +1,77 @@
+import DropdownSelectBox from "select-kit/components/dropdown-select-box";
+import computed from "ember-addons/ember-computed-decorators";
+
+export default DropdownSelectBox.extend({
+  classNames: ["delete-flag", "admin-delete-flag-dropdown"],
+  adminTools: Ember.inject.service(),
+  nameProperty: "label",
+  headerIcon: "trash-o",
+
+  computeHeaderContent() {
+    let content = this.baseHeaderComputedContent();
+    content.name = I18n.t("admin.flags.delete");
+    return content;
+  },
+
+  @computed("adminTools", "post.user")
+  spammerDetails(adminTools, user) {
+    return adminTools.spammerDetails(user);
+  },
+
+  canDeleteSpammer: Ember.computed.and("spammerDetails.canDelete", "post.flaggedForSpam"),
+
+  computeContent() {
+    const content = [];
+    const canDeleteSpammer = this.get("canDeleteSpammer");
+
+    content.push({
+      icon: "external-link",
+      id: "delete-defer",
+      action: () => this.send("deletePostDeferFlag"),
+      label: I18n.t("admin.flags.delete_post_defer_flag"),
+      description:  I18n.t("admin.flags.delete_post_defer_flag_title"),
+    });
+
+    content.push({
+      icon: "thumbs-o-up",
+      id: "delete-agree",
+      action: () => this.send("deletePostAgreeFlag"),
+      label: I18n.t("admin.flags.delete_post_agree_flag"),
+      description:  I18n.t("admin.flags.delete_post_agree_flag_title"),
+    });
+
+    if (canDeleteSpammer) {
+      content.push({
+        title:  I18n.t("admin.flags.delete_post_agree_flag_title"),
+        icon: "exclamation-triangle",
+        id: "delete-spammer",
+        action: () => this.send("deleteSpammer"),
+        label: I18n.t("admin.flags.delete_spammer")
+      });
+    }
+
+    return content;
+  },
+
+  mutateValue(value) {
+    const computedContentItem = this.get("computedContent").findBy("value", value);
+    Ember.get(computedContentItem, "originalContent.action")();
+  },
+
+  actions: {
+    deleteSpammer() {
+      let spammerDetails = this.get("spammerDetails");
+      this.attrs.removeAfter(spammerDetails.deleteUser());
+    },
+
+    deletePostDeferFlag() {
+      let flaggedPost = this.get('post');
+      this.attrs.removeAfter(flaggedPost.deferFlags(true));
+    },
+
+    deletePostAgreeFlag() {
+      let flaggedPost = this.get('post');
+      this.attrs.removeAfter(flaggedPost.agreeFlags('delete'));
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/admin-group-selector.js.es6 b/app/assets/javascripts/select-kit/components/admin-group-selector.js.es6
new file mode 100644
index 0000000000..be3352b376
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/admin-group-selector.js.es6
@@ -0,0 +1,51 @@
+import MultiSelectComponent from "select-kit/components/multi-select";
+const { makeArray } = Ember;
+
+export default MultiSelectComponent.extend({
+  pluginApiIdentifiers: ["admin-group-selector"],
+  classNames: "admin-group-selector",
+  selected: null,
+  available: null,
+  allowAny: false,
+
+  computeValues() {
+    return makeArray(this.get("selected"))
+      .map(s => this.valueForContentItem(s));
+  },
+
+  computeContent() {
+    return makeArray(this.get("available"));
+  },
+
+  computeContentItem(contentItem, name) {
+    let computedContent = this.baseComputedContentItem(contentItem, name);
+    computedContent.locked = contentItem.automatic;
+    return computedContent;
+  },
+
+  mutateValues(values) {
+    if (values.length > this.get("selected").length) {
+      const newValues = values
+        .filter(v => !this.get("selected")
+        .map(s => this.valueForContentItem(s))
+        .includes(v));
+
+      newValues.forEach(value => {
+        const actionContext = this.get("available")
+          .findBy(this.get("valueAttribute"), parseInt(value, 10));
+
+        this.triggerAction({ action: "groupAdded", actionContext });
+      });
+    } else if (values.length < this.get("selected").length) {
+      const selected = this.get("selected")
+        .filter(s => !values.includes(this.valueForContentItem(s)));
+
+      selected.forEach(s => {
+        this.triggerAction({
+          action: "groupRemoved",
+          actionContext: this.valueForContentItem(s)
+        });
+      });
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/categories-admin-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/categories-admin-dropdown.js.es6
new file mode 100644
index 0000000000..63f1bac549
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/categories-admin-dropdown.js.es6
@@ -0,0 +1,38 @@
+import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+
+export default DropdownSelectBoxComponent.extend({
+  pluginApiIdentifiers: ["categories-admin-dropdown"],
+  classNames: "categories-admin-dropdown",
+  showFullTitle: false,
+  allowInitialValueMutation: false,
+  headerIcon: ["bars", "caret-down"],
+
+  autoHighlight() {},
+
+  computeContent() {
+    const items = [
+      {
+        id: "create",
+        name: I18n.t("category.create"),
+        description: I18n.t("category.create_long"),
+        icon: "plus"
+      }
+    ];
+
+    const includeReorder = this.get("siteSettings.fixed_category_positions");
+    if (includeReorder) {
+      items.push({
+        id: "reorder",
+        name: I18n.t("categories.reorder.title"),
+        description: I18n.t("categories.reorder.title_long"),
+        icon: "random"
+      });
+    }
+
+    return items;
+  },
+
+  mutateValue(value) {
+    this.get(value)();
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/category-chooser.js.es6 b/app/assets/javascripts/select-kit/components/category-chooser.js.es6
new file mode 100644
index 0000000000..47a319e066
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/category-chooser.js.es6
@@ -0,0 +1,92 @@
+import ComboBoxComponent from "select-kit/components/combo-box";
+import { on } from "ember-addons/ember-computed-decorators";
+import computed from "ember-addons/ember-computed-decorators";
+import PermissionType from "discourse/models/permission-type";
+import Category from "discourse/models/category";
+const { get, isNone, isEmpty } = Ember;
+
+export default ComboBoxComponent.extend({
+  pluginApiIdentifiers: ["category-chooser"],
+  classNames: "category-chooser",
+  filterable: true,
+  castInteger: true,
+  allowUncategorized: false,
+  rowComponent: "category-row",
+  noneRowComponent: "none-category-row",
+  allowSubCategories: true,
+
+  filterComputedContent(computedContent, computedValue, filter) {
+    if (isEmpty(filter)) { return computedContent; }
+
+    const _matchFunction = (f, text) => {
+      return text.toLowerCase().indexOf(f) > -1;
+    };
+    const lowerFilter = filter.toLowerCase();
+
+    return computedContent.filter(c => {
+      const category = Category.findById(get(c, "value"));
+      const text = get(c, "name");
+      if (category && category.get("parentCategory")) {
+        const categoryName = category.get("parentCategory.name");
+        return _matchFunction(lowerFilter, text) || _matchFunction(lowerFilter, categoryName);
+      } else {
+        return _matchFunction(lowerFilter, text);
+      }
+    });
+  },
+
+  @computed("rootNone", "rootNoneLabel")
+  none(rootNone, rootNoneLabel) {
+    if (this.siteSettings.allow_uncategorized_topics || this.get("allowUncategorized")) {
+      if (!isNone(rootNone)) {
+        return rootNoneLabel || "category.none";
+      } else {
+        return Category.findUncategorized();
+      }
+    } else {
+      return "category.choose";
+    }
+  },
+
+  @on("didRender")
+  _bindComposerResizing() {
+    this.appEvents.on("composer:resized", this, this.applyDirection);
+  },
+
+  @on("willDestroyElement")
+  _unbindComposerResizing() {
+    this.appEvents.off("composer:resized");
+  },
+
+  computeContent() {
+    const categories = Discourse.SiteSettings.fixed_category_positions_on_create ?
+      Category.list() :
+      Category.listByActivity();
+
+    let scopedCategoryId = this.get("scopedCategoryId");
+    if (scopedCategoryId) {
+      const scopedCat = Category.findById(scopedCategoryId);
+      scopedCategoryId = scopedCat.get("parent_category_id") || scopedCat.get("id");
+    }
+
+    const excludeCategoryId = this.get("excludeCategoryId");
+
+    return categories.filter(c => {
+      const categoryId = this.valueForContentItem(c);
+
+      if (scopedCategoryId && categoryId !== scopedCategoryId && get(c, "parent_category_id") !== scopedCategoryId) {
+        return false;
+      }
+
+      if (this.get("allowSubCategories") === false && c.get("parentCategory") ) {
+        return false;
+      }
+
+      if ((this.get("allowUncategorized") === false && get(c, "isUncategorizedCategory")) || excludeCategoryId === categoryId) {
+        return false;
+      }
+
+      return get(c, "permission") === PermissionType.FULL;
+    });
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6
new file mode 100644
index 0000000000..f84c0ba4c2
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/category-notifications-button.js.es6
@@ -0,0 +1,20 @@
+import NotificationOptionsComponent from "select-kit/components/notifications-button";
+import computed from "ember-addons/ember-computed-decorators";
+
+export default NotificationOptionsComponent.extend({
+  pluginApiIdentifiers: ["category-notifications-button"],
+  classNames: "category-notifications-button",
+  isHidden: Ember.computed.or("category.deleted", "site.isMobileDevice"),
+  i18nPrefix: "category.notifications",
+  showFullTitle: false,
+  allowInitialValueMutation: false,
+
+  mutateValue(value) {
+    this.get("category").setNotification(value);
+  },
+
+  @computed("iconForSelectedDetails")
+  headerIcon(iconForSelectedDetails) {
+    return [iconForSelectedDetails, "caret-down"];
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/category-row.js.es6 b/app/assets/javascripts/select-kit/components/category-row.js.es6
new file mode 100644
index 0000000000..da59a4cfe9
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/category-row.js.es6
@@ -0,0 +1,71 @@
+import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
+import computed from "ember-addons/ember-computed-decorators";
+import Category from "discourse/models/category";
+import { categoryBadgeHTML } from "discourse/helpers/category-link";
+
+export default SelectKitRowComponent.extend({
+  layoutName: "select-kit/templates/components/category-row",
+  classNames: "category-row",
+
+  @computed("options.displayCategoryDescription")
+  displayCategoryDescription(displayCategoryDescription) {
+    if (Ember.isNone(displayCategoryDescription)) {
+      return true;
+    }
+
+    return displayCategoryDescription;
+  },
+
+  @computed("computedContent.value", "computedContent.name")
+  category(value, name) {
+    if (Ember.isEmpty(value)) {
+      const uncat = Category.findUncategorized();
+      if (uncat && uncat.get("name") === name) {
+        return uncat;
+      }
+    } else {
+      return Category.findById(parseInt(value, 10));
+    }
+  },
+
+  @computed("category")
+  badgeForCategory(category) {
+    return categoryBadgeHTML(category, {
+      link: false,
+      allowUncategorized: true,
+      hideParent: true
+    }).htmlSafe();
+  },
+
+  @computed("parentCategory")
+  badgeForParentCategory(parentCategory) {
+    return categoryBadgeHTML(parentCategory, {link: false}).htmlSafe();
+  },
+
+  @computed("parentCategoryid")
+  parentCategory(parentCategoryId) {
+    return Category.findById(parentCategoryId);
+  },
+
+  @computed("parentCategoryid")
+  hasParentCategory(parentCategoryid) {
+    return !Ember.isNone(parentCategoryid);
+  },
+
+  @computed("category")
+  parentCategoryid(category) {
+    return category.get("parent_category_id");
+  },
+
+  topicCount: Ember.computed.alias("category.topic_count"),
+
+  @computed("displayCategoryDescription", "category.description")
+  shouldDisplayDescription(displayCategoryDescription, description) {
+    return displayCategoryDescription && description && description !== "null";
+  },
+
+  @computed("category.description")
+  description(description) {
+    return `${description.substr(0, 200)}${description.length > 200 ? '&hellip;' : ''}`;
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/category-selector.js.es6 b/app/assets/javascripts/select-kit/components/category-selector.js.es6
new file mode 100644
index 0000000000..9484e13844
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/category-selector.js.es6
@@ -0,0 +1,48 @@
+import MultiSelectComponent from "select-kit/components/multi-select";
+import Category from "discourse/models/category";
+
+export default MultiSelectComponent.extend({
+  pluginApiIdentifiers: ["category-selector"],
+  classNames: "category-selector",
+  filterable: true,
+  allowAny: false,
+  rowComponent: "category-row",
+  categories: null,
+  blacklist: null,
+
+  init() {
+    this._super();
+
+    if (!this.get("categories")) this.set("categories", []);
+    if (!this.get("blacklist")) this.set("blacklist", []);
+
+    this.get("headerComponentOptions").setProperties({
+      selectedNameComponent: "multi-select/selected-category"
+    });
+
+    this.get("rowComponentOptions").setProperties({
+      displayCategoryDescription: false
+    });
+  },
+
+  computeValues() {
+    return Ember.makeArray(this.get("categories")).map(c => c.id);
+  },
+
+  mutateValues(values) {
+    this.set("categories", values.map(v => Category.findById(v)));
+  },
+
+  filterComputedContent(computedContent, computedValues, filter) {
+    const regex = new RegExp(filter.toLowerCase(), 'i');
+    return computedContent.filter(category => Ember.get(category, "name").match(regex));
+  },
+
+  computeContent() {
+    const blacklist = Ember.makeArray(this.get("blacklist"));
+    return Category.list().filter(category => {
+      return this.get("categories").includes(category) ||
+             !blacklist.includes(category);
+    });
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/combo-box.js.es6 b/app/assets/javascripts/select-kit/components/combo-box.js.es6
new file mode 100644
index 0000000000..0a576eae9a
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/combo-box.js.es6
@@ -0,0 +1,28 @@
+import SingleSelectComponent from "select-kit/components/single-select";
+import { on } from "ember-addons/ember-computed-decorators";
+
+export default SingleSelectComponent.extend({
+  pluginApiIdentifiers: ["combo-box"],
+  classNames: "combobox combo-box",
+  autoFilterable: true,
+  headerComponent: "combo-box/combo-box-header",
+
+  caretUpIcon: "caret-up",
+  caretDownIcon: "caret-down",
+  clearable: false,
+
+  computeHeaderContent() {
+    let content = this.baseHeaderComputedContent();
+    content.hasSelection = this.get("hasSelection");
+    return content;
+  },
+
+  @on("didReceiveAttrs")
+  _setComboBoxOptions() {
+    this.get("headerComponentOptions").setProperties({
+      caretUpIcon: this.get("caretUpIcon"),
+      caretDownIcon: this.get("caretDownIcon"),
+      clearable: this.get("clearable"),
+    });
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js.es6 b/app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js.es6
new file mode 100644
index 0000000000..6cc5ecd21f
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/combo-box/combo-box-header.js.es6
@@ -0,0 +1,21 @@
+import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header";
+import { default as computed } from "ember-addons/ember-computed-decorators";
+
+export default SelectKitHeaderComponent.extend({
+  layoutName: "select-kit/templates/components/combo-box/combo-box-header",
+  classNames: "combo-box-header",
+
+  clearable: Ember.computed.alias("options.clearable"),
+  caretUpIcon: Ember.computed.alias("options.caretUpIcon"),
+  caretDownIcon: Ember.computed.alias("options.caretDownIcon"),
+
+  @computed("isExpanded", "caretUpIcon", "caretDownIcon")
+  caretIcon(isExpanded, caretUpIcon, caretDownIcon) {
+    return isExpanded === true ? caretUpIcon : caretDownIcon;
+  },
+
+  @computed("clearable", "computedContent.hasSelection")
+  shouldDisplayClearableButton(clearable, hasSelection) {
+    return clearable === true && hasSelection === true;
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/dropdown-select-box.js.es6 b/app/assets/javascripts/select-kit/components/dropdown-select-box.js.es6
new file mode 100644
index 0000000000..5f76542aac
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/dropdown-select-box.js.es6
@@ -0,0 +1,32 @@
+import SingleSelectComponent from "select-kit/components/single-select";
+import { on } from "ember-addons/ember-computed-decorators";
+
+export default SingleSelectComponent.extend({
+  pluginApiIdentifiers: ["dropdown-select-box"],
+  classNames: "dropdown-select-box",
+  verticalOffset: 3,
+  fullWidthOnMobile: true,
+  filterable: false,
+  autoFilterable: false,
+  headerComponent: "dropdown-select-box/dropdown-select-box-header",
+  rowComponent: "dropdown-select-box/dropdown-select-box-row",
+  showFullTitle: true,
+  allowInitialValueMutation: false,
+
+  @on("didReceiveAttrs")
+  _setDropdownSelectBoxComponentOptions() {
+    this.get("headerComponentOptions").setProperties({
+      showFullTitle: this.get("showFullTitle")
+    });
+  },
+
+  didClickOutside() {
+    if (this.get("isExpanded") === false) return;
+    this.close();
+  },
+
+  didSelect() {
+    this._super();
+    this.close();
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6 b/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6
new file mode 100644
index 0000000000..d7e0876430
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6
@@ -0,0 +1,15 @@
+import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header";
+import computed from "ember-addons/ember-computed-decorators";
+
+export default SelectKitHeaderComponent.extend({
+  layoutName: "select-kit/templates/components/dropdown-select-box/dropdown-select-box-header",
+  classNames: "dropdown-select-box-header",
+  tagName: "button",
+
+  classNameBindings: ["btnClassName"],
+
+  @computed("options.showFullTitle")
+  btnClassName(showFullTitle) {
+    return `btn ${showFullTitle ? 'btn-icon-text' : 'no-text btn-icon'}`;
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-row.js.es6 b/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-row.js.es6
new file mode 100644
index 0000000000..0d5989717c
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-row.js.es6
@@ -0,0 +1,8 @@
+import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
+
+export default SelectKitRowComponent.extend({
+  layoutName: "select-kit/templates/components/dropdown-select-box/dropdown-select-box-row",
+  classNames: "dropdown-select-box-row",
+
+  description: Ember.computed.alias("computedContent.originalContent.description")
+});
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
new file mode 100644
index 0000000000..8597cb9668
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/future-date-input-selector.js.es6
@@ -0,0 +1,171 @@
+import ComboBoxComponent from "select-kit/components/combo-box";
+import { CLOSE_STATUS_TYPE } from "discourse/controllers/edit-topic-timer";
+import DatetimeMixin from "select-kit/components/future-date-input-selector/mixin";
+
+const TIMEFRAME_BASE = {
+  enabled: () => true,
+  when: () => null,
+  icon: 'briefcase',
+  displayWhen: true,
+};
+
+function buildTimeframe(opts) {
+  return jQuery.extend({}, TIMEFRAME_BASE, opts);
+}
+
+export const TIMEFRAMES = [
+  buildTimeframe({
+    id: 'later_today',
+    format: "h a",
+    enabled: opts => opts.canScheduleToday,
+    when: (time) => time.hour(18).minute(0),
+    icon: 'moon-o'
+  }),
+  buildTimeframe({
+    id: "tomorrow",
+    format: "ddd, h a",
+    when: (time, timeOfDay) => time.add(1, 'day').hour(timeOfDay).minute(0),
+    icon: 'sun-o'
+  }),
+  buildTimeframe({
+    id: "later_this_week",
+    format: "ddd, h a",
+    enabled: opts => !opts.canScheduleToday && opts.day < 4,
+    when: (time, timeOfDay) => time.add(2, 'day').hour(timeOfDay).minute(0),
+  }),
+  buildTimeframe({
+    id: "this_weekend",
+    format: "ddd, h a",
+    enabled: opts => opts.day < 5 && opts.includeWeekend,
+    when: (time, timeOfDay) => time.day(6).hour(timeOfDay).minute(0),
+    icon: 'bed'
+  }),
+  buildTimeframe({
+    id: "next_week",
+    format: "ddd, h a",
+    enabled: opts => opts.day !== 7,
+    when: (time, timeOfDay) => time.add(1, 'week').day(1).hour(timeOfDay).minute(0),
+    icon: 'briefcase'
+  }),
+  buildTimeframe({
+    id: "two_weeks",
+    format: "MMM D",
+    when: (time, timeOfDay) => time.add(2, 'week').hour(timeOfDay).minute(0),
+    icon: 'briefcase'
+  }),
+  buildTimeframe({
+    id: "next_month",
+    format: "MMM D",
+    enabled: opts => opts.now.date() !== moment().endOf("month").date(),
+    when: (time, timeOfDay) => time.add(1, 'month').startOf('month').hour(timeOfDay).minute(0),
+    icon: 'briefcase'
+  }),
+  buildTimeframe({
+    id: "three_months",
+    format: "MMM D",
+    enabled: opts => opts.includeFarFuture,
+    when: (time, timeOfDay) => time.add(3, 'month').startOf('month').hour(timeOfDay).minute(0),
+    icon: 'briefcase'
+  }),
+  buildTimeframe({
+    id: "six_months",
+    format: "MMM D",
+    enabled: opts => opts.includeFarFuture,
+    when: (time, timeOfDay) => time.add(6, 'month').startOf('month').hour(timeOfDay).minute(0),
+    icon: 'briefcase'
+  }),
+  buildTimeframe({
+    id: "one_year",
+    format: "MMM D",
+    enabled: opts => opts.includeFarFuture,
+    when: (time, timeOfDay) => time.add(1, 'year').startOf('day').hour(timeOfDay).minute(0),
+    icon: 'briefcase'
+  }),
+  buildTimeframe({
+    id: "forever",
+    enabled: opts => opts.includeFarFuture,
+    when: (time, timeOfDay) => time.add(1000, 'year').hour(timeOfDay).minute(0),
+    icon: 'gavel',
+    displayWhen: false
+  }),
+  buildTimeframe({
+    id: "pick_date_and_time",
+    icon: 'calendar-plus-o'
+  }),
+  buildTimeframe({
+    id: "set_based_on_last_post",
+    enabled: opts => opts.includeBasedOnLastPost,
+    icon: 'clock-o'
+  }),
+];
+
+let _timeframeById = null;
+export function timeframeDetails(id) {
+  if (!_timeframeById) {
+    _timeframeById = {};
+    TIMEFRAMES.forEach(t => _timeframeById[t.id] = t);
+  }
+  return _timeframeById[id];
+}
+
+export const FORMAT = "YYYY-MM-DD HH:mmZ";
+
+export default ComboBoxComponent.extend(DatetimeMixin, {
+  pluginApiIdentifiers: ["future-date-input-selector"],
+  classNames: ["future-date-input-selector"],
+  isCustom: Ember.computed.equal("value", "pick_date_and_time"),
+  isBasedOnLastPost: Ember.computed.equal("value", "set_based_on_last_post"),
+  clearable: true,
+  rowComponent: "future-date-input-selector/future-date-input-selector-row",
+  headerComponent: "future-date-input-selector/future-date-input-selector-header",
+
+  computeHeaderContent() {
+    let content = this.baseHeaderComputedContent();
+    content.datetime = this._computeDatetimeForValue(this.get("computedValue"));
+    content.name = this.get("selectedComputedContent.name") || content.name;
+    content.hasSelection = this.get("hasSelection");
+    content.icons = this._computeIconsForValue(this.get("computedValue"));
+    return content;
+  },
+
+  computeContentItem(contentItem, name) {
+    let item = this.baseComputedContentItem(contentItem, name);
+    item.datetime = this._computeDatetimeForValue(contentItem.id);
+    item.icons = this._computeIconsForValue(contentItem.id);
+    return item;
+  },
+
+  computeContent() {
+    let now = moment();
+    let opts = {
+      now,
+      day: now.day(),
+      includeWeekend: this.get('includeWeekend'),
+      includeFarFuture: this.get('includeFarFuture'),
+      includeBasedOnLastPost: this.get("statusType") === CLOSE_STATUS_TYPE,
+      canScheduleToday: (24 - now.hour()) > 6,
+    };
+
+    return TIMEFRAMES.filter(tf => tf.enabled(opts)).map(tf => {
+      return {
+        id: tf.id,
+        name: I18n.t(`topic.auto_update_input.${tf.id}`)
+      };
+    });
+  },
+
+  mutateValue(value) {
+    if (this.get("isCustom") || this.get("isBasedOnLastPost")) {
+      this.set("value", value);
+    } else {
+      let input = null;
+      const { time } = this._updateAt(value);
+
+      if (time && !Ember.isEmpty(value)) {
+        input = time.format(FORMAT);
+      }
+
+      this.setProperties({ input, value });
+    }
+  },
+});
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-header.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-header.js.es6
new file mode 100644
index 0000000000..7a5e807538
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-header.js.es6
@@ -0,0 +1,6 @@
+import ComboBoxHeaderComponent from "select-kit/components/combo-box/combo-box-header";
+
+export default ComboBoxHeaderComponent.extend({
+  layoutName: "select-kit/templates/components/future-date-input-selector/future-date-input-selector-header",
+  classNames: "future-date-input-selector-header"
+});
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-row.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-row.js.es6
new file mode 100644
index 0000000000..a04a59507b
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/future-date-input-selector/future-date-input-selector-row.js.es6
@@ -0,0 +1,6 @@
+import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
+
+export default SelectKitRowComponent.extend({
+  layoutName: "select-kit/templates/components/future-date-input-selector/future-date-input-selector-row",
+  classNames: "future-date-input-selector-row"
+});
diff --git a/app/assets/javascripts/select-kit/components/future-date-input-selector/mixin.js.es6 b/app/assets/javascripts/select-kit/components/future-date-input-selector/mixin.js.es6
new file mode 100644
index 0000000000..6368957056
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/future-date-input-selector/mixin.js.es6
@@ -0,0 +1,45 @@
+import { CLOSE_STATUS_TYPE } from 'discourse/controllers/edit-topic-timer';
+import { timeframeDetails } from 'select-kit/components/future-date-input-selector';
+
+export default Ember.Mixin.create({
+  _computeIconsForValue(value) {
+    let {icon} = this._updateAt(value);
+
+    if (icon) {
+      return icon.split(",");
+    }
+
+    return [];
+  },
+
+  _computeDatetimeForValue(value) {
+    if (Ember.isNone(value)) {
+      return null;
+    }
+
+    let {time} = this._updateAt(value);
+    if (time) {
+      let details = timeframeDetails(value);
+      if (!details.displayWhen) {
+        time = null;
+      }
+      if (time && details.format) {
+        return time.format(details.format);
+      }
+    }
+    return time;
+  },
+
+  _updateAt(selection) {
+    let details = timeframeDetails(selection);
+
+    if (details) {
+      return {
+        time: details.when(moment(), this.get('statusType') !== CLOSE_STATUS_TYPE ? 8 : 18),
+        icon: details.icon
+      };
+    }
+
+    return { time: moment() };
+  },
+});
diff --git a/app/assets/javascripts/select-kit/components/group-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/group-notifications-button.js.es6
new file mode 100644
index 0000000000..8236e4bbe1
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/group-notifications-button.js.es6
@@ -0,0 +1,12 @@
+import NotificationOptionsComponent from "select-kit/components/notifications-button";
+
+export default NotificationOptionsComponent.extend({
+  pluginApiIdentifiers: ["grouo-notifications-button"],
+  classNames: ["group-notifications-button"],
+  i18nPrefix: "groups.notifications",
+  allowInitialValueMutation: false,
+
+  mutateValue(value) {
+    this.get("group").setNotification(value, this.get("user.id"));
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/list-setting.js.es6 b/app/assets/javascripts/select-kit/components/list-setting.js.es6
new file mode 100644
index 0000000000..0872aab951
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/list-setting.js.es6
@@ -0,0 +1,54 @@
+import MultiSelectComponent from "select-kit/components/multi-select";
+
+export default MultiSelectComponent.extend({
+  pluginApiIdentifiers: ["list-setting"],
+  classNames: "list-setting",
+  tokenSeparator: "|",
+  settingValue: "",
+  choices: null,
+  filterable: true,
+
+  init() {
+    this._super();
+
+    if (!Ember.isNone(this.get("settingName"))) {
+      this.set("nameProperty", this.get("settingName"));
+    }
+
+    if (this.get("nameProperty").indexOf("color") > -1) {
+      this.set("headerComponentOptions", Ember.Object.create({
+        selectedNameComponent: "multi-select/selected-color"
+      }));
+    }
+  },
+
+  computeContent() {
+    let content;
+    if (Ember.isNone(this.get("choices"))) {
+      content = this.get("settingValue").split(this.get("tokenSeparator"));;
+    }  else {
+      content = this.get("choices");
+    }
+
+    return Ember.makeArray(content).filter(c => c);
+  },
+
+  mutateValues(values) {
+    this.set("settingValue", values.join(this.get("tokenSeparator")));
+  },
+
+  computeValues() {
+    return this.get("settingValue")
+               .split(this.get("tokenSeparator"))
+               .filter(c => c);
+  },
+
+  _handleTabOnKeyDown(event) {
+    if (this.$highlightedRow().length === 1) {
+      this._super(event);
+    } else {
+      this.close();
+      return false;
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/multi-select.js.es6 b/app/assets/javascripts/select-kit/components/multi-select.js.es6
new file mode 100644
index 0000000000..2929584f81
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/multi-select.js.es6
@@ -0,0 +1,272 @@
+import SelectKitComponent from "select-kit/components/select-kit";
+import computed from "ember-addons/ember-computed-decorators";
+import { on } from "ember-addons/ember-computed-decorators";
+const { get, isNone, isEmpty, makeArray } = Ember;
+import {
+  applyOnSelectPluginApiCallbacks
+} from "select-kit/mixins/plugin-api";
+
+export default SelectKitComponent.extend({
+  pluginApiIdentifiers: ["multi-select"],
+  classNames: "multi-select",
+  headerComponent: "multi-select/multi-select-header",
+  filterComponent: null,
+  headerText: "select_kit.default_header_text",
+  allowAny: true,
+  allowInitialValueMutation: false,
+  autoFilterable: true,
+  selectedNameComponent: "multi-select/selected-name",
+
+  init() {
+    this._super();
+
+    this.set("computedValues", []);
+    if (isNone(this.get("values"))) { this.set("values", []); }
+
+    this.set("headerComponentOptions", Ember.Object.create({
+      selectedNameComponent: this.get("selectedNameComponent")
+    }));
+  },
+
+  @on("didRender")
+  _setChoicesMaxWidth() {
+    const width = this.$body().outerWidth(false);
+    this.$(".choices").css({ maxWidth: width, width });
+  },
+
+  @on("didReceiveAttrs")
+  _compute() {
+    Ember.run.scheduleOnce("afterRender", () => {
+      this.willComputeAttributes();
+      let content = this.willComputeContent(this.get("content") || []);
+      let values = this._beforeWillComputeValues(this.get("values"));
+      content = this.computeContent(content);
+      content = this._beforeDidComputeContent(content);
+      values = this.willComputeValues(values);
+      values = this.computeValues(values);
+      values = this._beforeDidComputeValues(values);
+      this.set("headerComputedContent", this.computeHeaderContent());
+      this.didComputeContent(content);
+      this.didComputeValues(values);
+      this.didComputeAttributes();
+    });
+  },
+
+  @computed("filter", "shouldDisplayCreateRow")
+  createRowComputedContent(filter, shouldDisplayCreateRow) {
+    if (shouldDisplayCreateRow === true) {
+      let content = this.createContentFromInput(filter);
+      return this.computeContentItem(content, { created: true });
+    }
+  },
+
+  @computed("filter", "computedValues")
+  shouldDisplayCreateRow(filter, computedValues) {
+    return this._super() && !computedValues.includes(filter);
+  },
+
+  @computed
+  shouldDisplayFilter() { return true; },
+
+  _beforeWillComputeValues(values) {
+    return values.map(v => this._castInteger(v === "" ? null : v));
+  },
+  willComputeValues(values) { return values; },
+  computeValues(values) { return values; },
+  _beforeDidComputeValues(values) {
+    this.setProperties({ computedValues: values });
+    return values;
+  },
+  didComputeValues(values) { return values; },
+
+  mutateAttributes() {
+    if (this.get("isDestroyed") || this.get("isDestroying")) return;
+
+    Ember.run.next(() => {
+      this.mutateContent(this.get("computedContent"));
+      this.mutateValues(this.get("computedValues"));
+      applyOnSelectPluginApiCallbacks(this.get("pluginApiIdentifiers"), this.get("computedValues"), this);
+      this.set("headerComputedContent", this.computeHeaderContent());
+    });
+  },
+  mutateValues(computedValues) {
+    this.set("values", computedValues);
+  },
+  mutateContent() { },
+
+  filterComputedContent(computedContent, computedValues, filter) {
+    const lowerFilter = filter.toLowerCase();
+    return computedContent.filter(c => {
+      return get(c, "name").toLowerCase().indexOf(lowerFilter) > -1;
+    });
+  },
+
+  @computed("computedContent.[]", "computedValues.[]", "filter")
+  filteredComputedContent(computedContent, computedValues, filter) {
+    computedContent = computedContent.filter(c => {
+      return !computedValues.includes(get(c, "value"));
+    });
+
+    if (this.get("shouldFilter") === true) {
+      computedContent = this.filterComputedContent(computedContent, computedValues, filter);
+    }
+
+    return computedContent.slice(0, this.get("limitMatches"));
+  },
+
+  baseHeaderComputedContent() {
+    return {
+      title: this.get("title"),
+      selectedComputedContents: this.get("selectedComputedContents")
+    };
+  },
+
+  @computed("filter")
+  templateForCreateRow() {
+    return (rowComponent) => {
+      return I18n.t("select_kit.create", { content: rowComponent.get("computedContent.name")});
+    };
+  },
+
+  didPressBackspace(event) {
+    this.expand(event);
+    this.keyDown(event);
+    this._destroyEvent(event);
+  },
+
+  didPressEscape(event) {
+    const $highlighted = this.$(".selected-name.is-highlighted");
+    if ($highlighted.length > 0) {
+      $highlighted.removeClass("is-highlighted");
+    }
+
+    this._super(event);
+  },
+
+  keyDown(event) {
+    if (!isEmpty(this.get("filter"))) return;
+
+    const keyCode = event.keyCode || event.which;
+    const $filterInput = this.$filterInput();
+
+    // select all choices
+    if (this.get("hasSelection") && event.metaKey === true && keyCode === 65) {
+      this.$(".choices .selected-name:not(.is-locked)").addClass("is-highlighted");
+      return false;
+    }
+
+    // clear selection when multiple
+    if (this.$(".selected-name.is-highlighted").length >= 1 && keyCode === this.keys.BACKSPACE) {
+      const highlightedComputedContents = [];
+      $.each(this.$(".selected-name.is-highlighted"), (i, el) => {
+        const computedContent = this._findComputedContentItemByGuid($(el).attr("data-guid"));
+        if (!Ember.isNone(computedContent)) { highlightedComputedContents.push(computedContent); }
+      });
+      this.send("onDeselect", highlightedComputedContents);
+      return;
+    }
+
+    // try to remove last item from the list
+    if (keyCode === this.keys.BACKSPACE) {
+      let $lastSelectedValue = $(this.$(".choices .selected-name:not(.is-locked)").last());
+
+      if ($lastSelectedValue.length === 0) { return; }
+
+      if ($filterInput.not(":visible") && $lastSelectedValue.length > 0) {
+        $lastSelectedValue.click();
+        return false;
+      }
+
+      if ($filterInput.val() === "") {
+        if ($filterInput.is(":focus")) {
+          if ($lastSelectedValue.length > 0) { $lastSelectedValue.click(); }
+        } else {
+          if ($lastSelectedValue.length > 0) {
+            $lastSelectedValue.click();
+          } else {
+            $filterInput.focus();
+          }
+        }
+      }
+    }
+  },
+
+  @computed("computedValues.[]", "computedContent.[]")
+  selectedComputedContents(computedValues, computedContent) {
+    const selected = [];
+
+    computedValues.forEach(v => {
+      const value = computedContent.findBy("value", v);
+      if (value) selected.push(value);
+    });
+
+    return selected;
+  },
+
+  @computed("selectedComputedContents.[]")
+  hasSelection(selectedComputedContents) { return !Ember.isEmpty(selectedComputedContents); },
+
+  autoHighlight() {
+    Ember.run.schedule("afterRender", () => {
+      if (this.get("isExpanded") === false) { return; }
+      if (this.get("renderedBodyOnce") === false) { return; }
+      if (!isNone(this.get("highlightedValue"))) { return; }
+
+      if (isEmpty(this.get("filteredComputedContent"))) {
+        if (this.get("createRowComputedContent")) {
+          this.send("onHighlight", this.get("createRowComputedContent"));
+        } else if (this.get("noneRowComputedContent") && this.get("hasSelection") === true) {
+          this.send("onHighlight", this.get("noneRowComputedContent"));
+        }
+      } else {
+        this.send("onHighlight", this.get("filteredComputedContent.firstObject"));
+      }
+    });
+  },
+
+  didSelect() {
+    this.focusFilterOrHeader();
+    this.autoHighlight();
+  },
+
+  didDeselect() {
+    this.focusFilterOrHeader();
+    this.autoHighlight();
+  },
+
+  validateComputedContentItem(computedContentItem) {
+    return !this.get("computedValues").includes(computedContentItem.value);
+  },
+
+  actions: {
+    onClear() {
+      this.get("selectedComputedContents").forEach(selectedComputedContent => {
+        this.send("onDeselect", selectedComputedContent);
+      });
+    },
+
+    onCreate(computedContentItem) {
+      if (this.validateComputedContentItem(computedContentItem)) {
+        this.get("computedContent").pushObject(computedContentItem);
+        this.send("onSelect", computedContentItem);
+      }
+    },
+
+    onSelect(computedContentItem) {
+      this.willSelect(computedContentItem);
+      this.get("computedValues").pushObject(computedContentItem.value);
+      Ember.run.next(() => this.mutateAttributes());
+      Ember.run.schedule("afterRender", () => this.didSelect(computedContentItem));
+    },
+
+    onDeselect(rowComputedContentItems) {
+      rowComputedContentItems = Ember.makeArray(rowComputedContentItems);
+      const generatedComputedContents = this._filterRemovableComputedContents(makeArray(rowComputedContentItems));
+      this.willDeselect(rowComputedContentItems);
+      this.get("computedValues").removeObjects(rowComputedContentItems.map(r => r.value));
+      this.get("computedContent").removeObjects(generatedComputedContents);
+      Ember.run.next(() => this.mutateAttributes());
+      Ember.run.schedule("afterRender", () => this.didDeselect(rowComputedContentItems));
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6
new file mode 100644
index 0000000000..2db2019689
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6
@@ -0,0 +1,46 @@
+import { on } from "ember-addons/ember-computed-decorators";
+import computed from "ember-addons/ember-computed-decorators";
+import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header";
+
+export default SelectKitHeaderComponent.extend({
+  attributeBindings: [
+    "label:title",
+    "label:aria-label",
+    "names:data-name",
+    "values:data-value"
+  ],
+  classNames: "multi-select-header",
+  layoutName: "select-kit/templates/components/multi-select/multi-select-header",
+  selectedNameComponent: Ember.computed.alias("options.selectedNameComponent"),
+
+  ariaLabel: Ember.computed.or("computedContent.ariaLabel", "title", "names"),
+
+  title: Ember.computed.or("computedContent.title", "names"),
+
+  @on("didRender")
+  _positionFilter() {
+    if (!this.get("shouldDisplayFilter")) return;
+
+    const $filter = this.$(".filter");
+    $filter.width(0);
+
+    const leftHeaderOffset = this.$().offset().left;
+    const leftFilterOffset = $filter.offset().left;
+    const offset = leftFilterOffset - leftHeaderOffset;
+    const width = this.$().outerWidth(false);
+    const availableSpace = width - offset;
+    const $choices = $filter.parent(".choices");
+    const parentRightPadding = parseInt($choices.css("padding-right") , 10);
+    $filter.width(availableSpace - parentRightPadding * 4);
+  },
+
+  @computed("computedContent.selectedComputedContents.[]")
+  names(selection) {
+    return Ember.makeArray(selection).map(s => s.name).join(",");
+  },
+
+  @computed("computedContent.selectedComputedContents.[]")
+  values(selection) {
+    return Ember.makeArray(selection).map(s => s.value).join(",");
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/multi-select/selected-category.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/selected-category.js.es6
new file mode 100644
index 0000000000..200f6a747a
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/multi-select/selected-category.js.es6
@@ -0,0 +1,14 @@
+import SelectedNameComponent from "select-kit/components/multi-select/selected-name";
+import computed from "ember-addons/ember-computed-decorators";
+import { categoryBadgeHTML } from "discourse/helpers/category-link";
+
+export default SelectedNameComponent.extend({
+  classNames: "selected-category",
+  layoutName: "select-kit/templates/components/multi-select/selected-category",
+
+  @computed("computedContent.originalContent")
+  badge(category) {
+    return categoryBadgeHTML(category, { allowUncategorized: true, link: false })
+            .htmlSafe();
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6
new file mode 100644
index 0000000000..7e835e8439
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/multi-select/selected-color.js.es6
@@ -0,0 +1,11 @@
+import SelectedNameComponent from "select-kit/components/multi-select/selected-name";
+
+export default SelectedNameComponent.extend({
+  classNames: "selected-color",
+  layoutName: "select-kit/templates/components/multi-select/selected-color",
+
+  didRender() {
+    const name = this.get("name");
+    this.$(".color-preview").css("background", `#${name}`.htmlSafe());
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6
new file mode 100644
index 0000000000..a6b672d50e
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6
@@ -0,0 +1,46 @@
+import computed from "ember-addons/ember-computed-decorators";
+
+export default Ember.Component.extend({
+  attributeBindings: [
+    "tabindex",
+    "ariaLabel:aria-label",
+    "title",
+    "name:data-name",
+    "value:data-value",
+    "guid:data-guid"
+  ],
+  classNames: ["selected-name", "choice"],
+  classNameBindings: ["isHighlighted", "isLocked"],
+  layoutName: "select-kit/templates/components/multi-select/selected-name",
+  tagName: "span",
+  tabindex: -1,
+
+  @computed("computedContent")
+  guid(computedContent) { return Ember.guidFor(computedContent); },
+
+  ariaLabel: Ember.computed.or("computedContent.ariaLabel", "title"),
+
+  @computed("computedContent.title", "name")
+  title(computedContentTitle, name) {
+    if (computedContentTitle) return computedContentTitle;
+    if (name) return name;
+
+    return null;
+  },
+
+  label: Ember.computed.or("computedContent.label", "title", "name"),
+
+  name: Ember.computed.alias("computedContent.name"),
+
+  value: Ember.computed.alias("computedContent.value"),
+
+  isLocked: Ember.computed("computedContent.locked", function() {
+    return this.getWithDefault("computedContent.locked", false);
+  }),
+
+  click() {
+    if (this.get("isLocked") === true) { return false; }
+    this.toggleProperty("isHighlighted");
+    return false;
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/none-category-row.js.es6 b/app/assets/javascripts/select-kit/components/none-category-row.js.es6
new file mode 100644
index 0000000000..60b932920e
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/none-category-row.js.es6
@@ -0,0 +1,10 @@
+import CategoryRowComponent from "select-kit/components/category-row";
+
+export default CategoryRowComponent.extend({
+  layoutName: "select-kit/templates/components/category-row",
+  classNames: "none category-row",
+
+  click() {
+    this.sendAction("onClear");
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/notifications-button.js.es6
new file mode 100644
index 0000000000..eaa9c6780f
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/notifications-button.js.es6
@@ -0,0 +1,44 @@
+import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import { default as computed, on } from "ember-addons/ember-computed-decorators";
+import { buttonDetails } from "discourse/lib/notification-levels";
+import { allLevels } from "discourse/lib/notification-levels";
+
+export default DropdownSelectBoxComponent.extend({
+  classNames: "notifications-button",
+  nameProperty: "key",
+  fullWidthOnMobile: true,
+  content: allLevels,
+  collectionHeight: "auto",
+  castInteger: true,
+  autofilterable: false,
+  filterable: false,
+  rowComponent: "notifications-button/notifications-button-row",
+  allowInitialValueMutation: false,
+  i18nPrefix: "",
+  i18nPostfix: "",
+
+  @computed("iconForSelectedDetails")
+  headerIcon(iconForSelectedDetails) { return iconForSelectedDetails; },
+
+  iconForSelectedDetails: Ember.computed.alias("selectedDetails.icon"),
+
+  computeHeaderContent() {
+    let content = this.baseHeaderComputedContent();
+    content.name = I18n.t(`${this.get("i18nPrefix")}.${this.get("selectedDetails.key")}.title`);
+    content.hasSelection = this.get("hasSelection");
+    return content;
+  },
+
+  @on("didReceiveAttrs")
+  _setNotificationsButtonComponentOptions() {
+    this.get("rowComponentOptions").setProperties({
+      i18nPrefix: this.get("i18nPrefix"),
+      i18nPostfix: this.get("i18nPostfix")
+    });
+  },
+
+  @computed("computedValue")
+  selectedDetails(computedValue) {
+    return buttonDetails(computedValue);
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js.es6 b/app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js.es6
new file mode 100644
index 0000000000..e2e89d3a0b
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/notifications-button/notifications-button-row.js.es6
@@ -0,0 +1,37 @@
+import DropdownSelectBoxRoxComponent from "select-kit/components/dropdown-select-box/dropdown-select-box-row";
+import { buttonDetails } from "discourse/lib/notification-levels";
+import computed from "ember-addons/ember-computed-decorators";
+import { iconHTML } from 'discourse-common/lib/icon-library';
+
+export default DropdownSelectBoxRoxComponent.extend({
+  classNames: "notifications-button-row",
+
+  i18nPrefix: Ember.computed.alias("options.i18nPrefix"),
+  i18nPostfix: Ember.computed.alias("options.i18nPostfix"),
+
+  @computed("computedContent.value", "i18nPrefix")
+  title(value, prefix) {
+    const key = buttonDetails(value).key;
+    return I18n.t(`${prefix}.${key}.title`);
+  },
+
+  @computed("computedContent.name", "computedContent.originalContent.icon")
+  icon(contentName, icon) {
+    return iconHTML(icon, { class: contentName.dasherize() });
+  },
+
+  @computed("_start")
+  description(_start) {
+    return Handlebars.escapeExpression(I18n.t(`${_start}.description`));
+  },
+
+  @computed("_start")
+  name(_start) {
+    return Handlebars.escapeExpression(I18n.t(`${_start}.title`));
+  },
+
+  @computed("i18nPrefix", "i18nPostfix", "computedContent.name")
+  _start(prefix, postfix, contentName) {
+    return `${prefix}.${contentName}${postfix}`;
+  },
+});
diff --git a/app/assets/javascripts/select-kit/components/pinned-button.js.es6 b/app/assets/javascripts/select-kit/components/pinned-button.js.es6
new file mode 100644
index 0000000000..079274a2a8
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/pinned-button.js.es6
@@ -0,0 +1,22 @@
+import computed from "ember-addons/ember-computed-decorators";
+
+export default Ember.Component.extend({
+  pluginApiIdentifiers: ["pinned-button"],
+  descriptionKey: "help",
+  classNames: "pinned-button",
+  classNameBindings: ["isHidden"],
+  layoutName: "select-kit/templates/components/pinned-button",
+
+  @computed("topic.pinned_globally", "pinned")
+  reasonText(pinnedGlobally, pinned) {
+    const globally = pinnedGlobally ? "_globally" : "";
+    const pinnedKey = pinned ? `pinned${globally}` : "unpinned";
+    const key = `topic_statuses.${pinnedKey}.help`;
+    return I18n.t(key);
+  },
+
+  @computed("pinned", "topic.deleted", "topic.unpinned")
+  isHidden(pinned, deleted, unpinned) {
+    return deleted || (!pinned && !unpinned);
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/pinned-options.js.es6 b/app/assets/javascripts/select-kit/components/pinned-options.js.es6
new file mode 100644
index 0000000000..ca4c65289c
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/pinned-options.js.es6
@@ -0,0 +1,56 @@
+import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import { on } from "ember-addons/ember-computed-decorators";
+import { iconHTML } from 'discourse-common/lib/icon-library';
+
+export default DropdownSelectBoxComponent.extend({
+  pluginApiIdentifiers: ["pinned-options"],
+  classNames: "pinned-options",
+  allowInitialValueMutation: false,
+
+  autoHighlight() {},
+
+  computeHeaderContent() {
+    let content = this.baseHeaderComputedContent();
+    const pinnedGlobally = this.get("topic.pinned_globally");
+    const pinned = this.get("computedValue");
+    const globally = pinnedGlobally ? "_globally" : "";
+    const state = pinned ? `pinned${globally}` : "unpinned";
+    const title = I18n.t(`topic_statuses.${state}.title`);
+
+    content.label = `${title}${iconHTML("caret-down")}`.htmlSafe();
+    content.title = title;
+    content.name = state;
+    content.icon = `thumb-tack${state === "unpinned" ? " unpinned" : ''}`;
+    return content;
+  },
+
+  @on("init")
+  _setContent() {
+    const globally = this.get("topic.pinned_globally") ? "_globally" : "";
+
+    this.set("content", [
+      {
+        id: "pinned",
+        name: I18n.t("topic_statuses.pinned" + globally + ".title"),
+        description: I18n.t('topic_statuses.pinned' + globally + '.help'),
+        icon: "thumb-tack"
+      },
+      {
+        id: "unpinned",
+        name: I18n.t("topic_statuses.unpinned.title"),
+        icon: "thumb-tack unpinned",
+        description: I18n.t('topic_statuses.unpinned.help'),
+      }
+    ]);
+  },
+
+  mutateValue(value) {
+    const topic = this.get("topic");
+
+    if (value === "unpinned") {
+      topic.clearPin();
+    } else {
+      topic.rePin();
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6 b/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6
new file mode 100644
index 0000000000..7ed95af14a
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/search-advanced-category-chooser.js.es6
@@ -0,0 +1,29 @@
+import CategoryChooserComponent from "select-kit/components/category-chooser";
+import Category from "discourse/models/category";
+
+export default CategoryChooserComponent.extend({
+  pluginApiIdentifiers: ["search-advanced-category-chooser"],
+  classNames: ["search-advanced-category-chooser"],
+  rootNone: true,
+  rootNoneLabel: "category.all",
+  allowUncategorized: true,
+  clearable: true,
+
+  init() {
+    this._super();
+
+    this.get("rowComponentOptions").setProperties({
+      displayCategoryDescription: false
+    });
+  },
+
+  mutateValue(value) {
+    if (value) {
+      this.set("value", Category.findById(value));
+    } else {
+      this.set("value", null);
+    }
+  },
+
+  computeValue(category) { if (category) return category.id; }
+});
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
new file mode 100644
index 0000000000..0e7546bae8
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -0,0 +1,249 @@
+const { isNone } = Ember;
+import computed from "ember-addons/ember-computed-decorators";
+import UtilsMixin from "select-kit/mixins/utils";
+import DomHelpersMixin from "select-kit/mixins/dom-helpers";
+import EventsMixin from "select-kit/mixins/events";
+import PluginApiMixin from "select-kit/mixins/plugin-api";
+import {
+  applyContentPluginApiCallbacks
+} from "select-kit/mixins/plugin-api";
+
+export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixin, EventsMixin, {
+  pluginApiIdentifiers: ["select-kit"],
+  layoutName: "select-kit/templates/components/select-kit",
+  classNames: ["select-kit", "select-box-kit"],
+  classNameBindings: [
+    "isFocused",
+    "isExpanded",
+    "isDisabled",
+    "isHidden",
+    "isAbove",
+    "isBelow",
+    "isLeftAligned",
+    "isRightAligned"
+  ],
+  isDisabled: false,
+  isExpanded: false,
+  isFocused: false,
+  isHidden: false,
+  renderedBodyOnce: false,
+  renderedFilterOnce: false,
+  tabindex: 0,
+  none: null,
+  highlightedValue: null,
+  noContentLabel: "select_kit.no_content",
+  valueAttribute: "id",
+  nameProperty: "name",
+  autoFilterable: false,
+  filterable: false,
+  filter: "",
+  filterPlaceholder: "select_kit.filter_placeholder",
+  filterIcon: "search",
+  headerIcon: null,
+  rowComponent: "select-kit/select-kit-row",
+  rowComponentOptions: null,
+  noneRowComponent: "select-kit/select-kit-none-row",
+  createRowComponent: "select-kit/select-kit-create-row",
+  filterComponent: "select-kit/select-kit-filter",
+  headerComponent: "select-kit/select-kit-header",
+  headerComponentOptions: null,
+  headerComputedContent: null,
+  collectionComponent: "select-kit/select-kit-collection",
+  collectionHeight: 200,
+  verticalOffset: 0,
+  horizontalOffset: 0,
+  fullWidthOnMobile: false,
+  castInteger: false,
+  allowAny: false,
+  allowInitialValueMutation: false,
+  content: null,
+  computedContent: null,
+  limitMatches: 100,
+  nameChanges: false,
+  allowContentReplacement: false,
+  collectionHeader: null,
+
+  init() {
+    this._super();
+
+    this.noneValue = "__none__";
+    this.set("headerComponentOptions", Ember.Object.create());
+    this.set("rowComponentOptions", Ember.Object.create());
+    this.set("computedContent", []);
+
+    if (this.site && this.site.isMobileDevice) {
+      this.setProperties({ filterable: false, autoFilterable: false });
+    }
+
+    if (this.get("nameChanges")) {
+      this.addObserver(`content.@each.${this.get("nameProperty")}`, this, this._compute);
+    }
+
+    if (this.get("allowContentReplacement")) {
+      this.addObserver(`content.[]`, this, this._compute);
+    }
+  },
+
+  willDestroyElement() {
+    this.removeObserver(`content.@each.${this.get("nameProperty")}`, this, this._compute);
+    this.removeObserver(`content.[]`, this, this._compute);
+  },
+
+  willComputeAttributes() {},
+  didComputeAttributes() {},
+
+  willComputeContent(content) { return content; },
+  computeContent(content) { return content; },
+  _beforeDidComputeContent(content) {
+    content = applyContentPluginApiCallbacks(this.get("pluginApiIdentifiers"), content, this);
+
+    const existingCreatedComputedContent = this.get("computedContent").filterBy("created", true);
+    this.setProperties({
+      computedContent: content.map(c => this.computeContentItem(c)).concat(existingCreatedComputedContent)
+    });
+    return content;
+  },
+  didComputeContent() {},
+
+  computeHeaderContent() {
+    return this.baseHeaderComputedContent();
+  },
+
+  computeContentItem(contentItem, options) {
+    return this.baseComputedContentItem(contentItem, options);
+  },
+
+  baseComputedContentItem(contentItem, options) {
+    let originalContent;
+    options = options || {};
+    const name = options.name;
+
+    if (typeof contentItem === "string" || typeof contentItem === "number") {
+      originalContent = {};
+      originalContent[this.get("valueAttribute")] = contentItem;
+      originalContent[this.get("nameProperty")] = name || contentItem;
+    } else {
+      originalContent = contentItem;
+    }
+
+    return {
+      value: this._castInteger(this.valueForContentItem(contentItem)),
+      name: name || this._nameForContent(contentItem),
+      locked: false,
+      created: options.created || false,
+      originalContent
+    };
+  },
+
+  @computed("shouldFilter", "allowAny", "filter")
+  shouldDisplayFilter(shouldFilter, allowAny, filter) {
+    if (shouldFilter === true) return true;
+    if (allowAny === true && filter.length > 0) return true;
+    return false;
+  },
+
+  @computed("filter", "filteredComputedContent.[]")
+  shouldDisplayNoContentRow(filter, filteredComputedContent) {
+    return filter.length > 0 && filteredComputedContent.length === 0;
+  },
+
+  @computed("filter", "filterable", "autoFilterable", "renderedFilterOnce")
+  shouldFilter(filter, filterable, autoFilterable, renderedFilterOnce) {
+    if (renderedFilterOnce === true && filterable === true) return true;
+    if (filterable === true) return true;
+    if (autoFilterable === true && filter.length > 0) return true;
+    return false;
+  },
+
+  @computed("filter", "computedContent")
+  shouldDisplayCreateRow(filter, computedContent) {
+    if (computedContent.map(c => c.value).includes(filter)) return false;
+    if (this.get("allowAny") === true && filter.length > 0) return true;
+    return false;
+  },
+
+  @computed("filter", "shouldDisplayCreateRow")
+  createRowComputedContent(filter, shouldDisplayCreateRow) {
+    if (shouldDisplayCreateRow === true) {
+      let content = this.createContentFromInput(filter);
+      return this.computeContentItem(content, { created: true });
+    }
+  },
+
+  @computed
+  templateForRow() { return () => null; },
+
+  @computed
+  templateForNoneRow() { return () => null; },
+
+  @computed("filter")
+  templateForCreateRow() {
+    return (rowComponent) => {
+      return I18n.t("select_box.create", {
+        content: rowComponent.get("computedContent.name")
+      });
+    };
+  },
+
+  @computed("none")
+  noneRowComputedContent(none) {
+    if (isNone(none)) { return null; }
+
+    switch (typeof none) {
+    case "string":
+      return this.computeContentItem(this.noneValue, {
+        name: I18n.t(none).htmlSafe()
+      });
+    default:
+      return this.computeContentItem(none);
+    }
+  },
+
+  createContentFromInput(input) { return input; },
+
+  willSelect() {
+    this.clearFilter();
+    this.set("highlightedValue", null);
+  },
+  didSelect() {
+    this.collapse();
+    this.focus();
+  },
+
+  willDeselect() {
+    this.clearFilter();
+    this.set("highlightedValue", null);
+  },
+  didDeselect() {
+    this.collapse();
+    this.focus();
+  },
+
+  clearFilter() {
+    this.$filterInput().val("");
+    this.setProperties({ filter: "" });
+  },
+
+  actions: {
+    onToggle() {
+      if (this.get("onToggle")) this.sendAction("onToggle");
+      if (this.get("onCollapse") && this.get("isExpanded") === true) this.sendAction("onCollapse");
+      if (this.get("onExpand") && this.get("isExpanded") === false) this.sendAction("onExpand");
+
+      this.get("isExpanded") === true ? this.collapse() : this.expand();
+    },
+
+    onHighlight(rowComputedContent) {
+      this.set("highlightedValue", rowComputedContent.value);
+    },
+
+    onFilter(filter) {
+      this.setProperties({
+        highlightedValue: null,
+        renderedFilterOnce: true,
+        filter
+      });
+      this.autoHighlight();
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js.es6
new file mode 100644
index 0000000000..67508609d2
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-collection.js.es6
@@ -0,0 +1,5 @@
+export default Ember.Component.extend({
+  layoutName: "select-kit/templates/components/select-kit/select-kit-collection",
+  classNames: ["select-kit-collection", "select-box-kit-collection"],
+  tagName: "ul"
+});
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js.es6
new file mode 100644
index 0000000000..390408349b
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-create-row.js.es6
@@ -0,0 +1,10 @@
+import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
+
+export default SelectKitRowComponent.extend({
+  layoutName: "select-kit/templates/components/select-kit/select-kit-row",
+  classNames: "create",
+
+  click() {
+    this.sendAction("onCreate", this.get("computedContent"));
+  },
+});
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6
new file mode 100644
index 0000000000..f60a627de8
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-filter.js.es6
@@ -0,0 +1,6 @@
+export default Ember.Component.extend({
+  layoutName: "select-kit/templates/components/select-kit/select-kit-filter",
+  classNames: ["select-kit-filter", "select-box-kit-filter"],
+  classNameBindings: ["isFocused", "isHidden"],
+  isHidden: Ember.computed.not("shouldDisplayFilter")
+});
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
new file mode 100644
index 0000000000..b7705fa999
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
@@ -0,0 +1,42 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  layoutName: "select-kit/templates/components/select-kit/select-kit-header",
+  classNames: ["select-kit-header", "select-box-kit-header"],
+  classNameBindings: ["isFocused"],
+  attributeBindings: [
+    "tabindex",
+    "ariaLabel:aria-label",
+    "ariaHasPopup:aria-haspopup",
+    "title",
+    "value:data-value",
+    "name:data-name",
+  ],
+
+  ariaHasPopup: true,
+
+  ariaLabel: Ember.computed.or("computedContent.ariaLabel", "title"),
+
+  @computed("computedContent.title", "name")
+  title(computedContentTitle, name) {
+    if (computedContentTitle) return computedContentTitle;
+    if (name) return name;
+
+    return null;
+  },
+
+  label: Ember.computed.or("computedContent.label", "title", "name"),
+
+  name: Ember.computed.alias("computedContent.name"),
+
+  value: Ember.computed.alias("computedContent.value"),
+
+  @computed("computedContent.icon", "computedContent.icons")
+  icons(icon, icons) {
+    return Ember.makeArray(icon).concat(icons).filter(i => !Ember.isEmpty(i));
+  },
+
+  click() {
+    this.sendAction("onToggle");
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js.es6
new file mode 100644
index 0000000000..542b9472c4
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-none-row.js.es6
@@ -0,0 +1,10 @@
+import SelectKitRowComponent from "select-kit/components/select-kit/select-kit-row";
+
+export default SelectKitRowComponent.extend({
+  layoutName: "select-kit/templates/components/select-kit/select-kit-row",
+  classNames: "none",
+
+  click() {
+    this.sendAction("onClear");
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6
new file mode 100644
index 0000000000..d4638a9386
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6
@@ -0,0 +1,70 @@
+import { on } from 'ember-addons/ember-computed-decorators';
+import computed from 'ember-addons/ember-computed-decorators';
+const { run, isPresent, makeArray, isEmpty } = Ember;
+import UtilsMixin from "select-kit/mixins/utils";
+
+export default Ember.Component.extend(UtilsMixin, {
+  layoutName: "select-kit/templates/components/select-kit/select-kit-row",
+  classNames: ["select-kit-row", "select-box-kit-row"],
+  tagName: "li",
+  tabIndex: -1,
+  attributeBindings: [
+    "tabIndex",
+    "title",
+    "value:data-value",
+    "name:data-name",
+    "ariaLabel:aria-label"
+  ],
+  classNameBindings: ["isHighlighted", "isSelected"],
+
+  ariaLabel: Ember.computed.or("computedContent.ariaLabel", "title"),
+
+  @computed("computedContent.title", "name")
+  title(computedContentTitle, name) {
+    if (computedContentTitle) return computedContentTitle;
+    if (name) return name;
+
+    return null;
+  },
+
+  label: Ember.computed.or("computedContent.label", "title", "name"),
+
+  name: Ember.computed.alias("computedContent.name"),
+
+  value: Ember.computed.alias("computedContent.value"),
+
+  @computed("templateForRow")
+  template(templateForRow) { return templateForRow(this); },
+
+  @on("didReceiveAttrs")
+  _setSelectionState() {
+    this.set("isSelected", this.get("computedValue") === this.get("value"));
+    this.set("isHighlighted", this.get("highlightedValue") === this.get("value"));
+  },
+
+  @on("willDestroyElement")
+  _clearDebounce() {
+    const hoverDebounce = this.get("hoverDebounce");
+    if (isPresent(hoverDebounce)) { run.cancel(hoverDebounce); }
+  },
+
+  @computed("computedContent.icon", "computedContent.icons", "computedContent.originalContent.icon")
+  icons(icon, icons, originalIcon) {
+    return makeArray(icon)
+            .concat(icons)
+            .concat(makeArray(originalIcon))
+            .filter(i => !isEmpty(i));
+  },
+
+  mouseEnter() {
+    this.set("hoverDebounce", run.debounce(this, this._sendOnHighlightAction, 32));
+  },
+
+  click() {
+    this.sendAction("onSelect", this.get("computedContent"));
+  },
+
+  _sendOnHighlightAction() {
+    this.sendAction("onHighlight", this.get("computedContent"));
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/single-select.js.es6 b/app/assets/javascripts/select-kit/components/single-select.js.es6
new file mode 100644
index 0000000000..8e2a35a5ef
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/single-select.js.es6
@@ -0,0 +1,173 @@
+import SelectKitComponent from "select-kit/components/select-kit";
+import { on } from "ember-addons/ember-computed-decorators";
+import computed from "ember-addons/ember-computed-decorators";
+const { get, isNone, isEmpty, isPresent, run } = Ember;
+import {
+  applyOnSelectPluginApiCallbacks
+} from "select-kit/mixins/plugin-api";
+
+export default SelectKitComponent.extend({
+  pluginApiIdentifiers: ["single-select"],
+  classNames: "single-select",
+  computedValue: null,
+  value: null,
+  allowInitialValueMutation: false,
+
+  @on("didReceiveAttrs")
+  _compute() {
+    run.scheduleOnce("afterRender", () => {
+      this.willComputeAttributes();
+      let content = this.willComputeContent(this.get("content") || []);
+      let value = this._beforeWillComputeValue(this.get("value"));
+      content = this.computeContent(content);
+      content = this._beforeDidComputeContent(content);
+      value = this.willComputeValue(value);
+      value = this.computeValue(value);
+      value = this._beforeDidComputeValue(value);
+      this.didComputeContent(content);
+      this.didComputeValue(value);
+      this.set("headerComputedContent", this.computeHeaderContent());
+      this.didComputeAttributes();
+
+      if (this.get("allowInitialValueMutation")) this.mutateAttributes();
+    });
+  },
+
+  mutateAttributes() {
+    if (this.get("isDestroyed") || this.get("isDestroying")) return;
+
+    run.next(() => {
+      this.mutateContent(this.get("computedContent"));
+      this.mutateValue(this.get("computedValue"));
+      applyOnSelectPluginApiCallbacks(this.get("pluginApiIdentifiers"), this.get("computedValue"), this);
+      this.set("headerComputedContent", this.computeHeaderContent());
+    });
+  },
+  mutateContent() {},
+  mutateValue(computedValue) {
+    this.set("value", computedValue);
+  },
+
+  _beforeWillComputeValue(value) {
+    if (!isEmpty(this.get("content")) && isEmpty(value) && isNone(this.get("none"))) {
+      value = this.valueForContentItem(get(this.get("content"), "firstObject"));
+    }
+
+    switch (typeof value) {
+    case "string":
+    case "number":
+      return this._castInteger(value === "" ? null : value);
+    default:
+      return value;
+    }
+  },
+  willComputeValue(value) { return value; },
+  computeValue(value) { return value; },
+  _beforeDidComputeValue(value) {
+    this.setProperties({ computedValue: value });
+    return value;
+  },
+  didComputeValue(value) { return value; },
+
+  filterComputedContent(computedContent, computedValue, filter) {
+    const lowerFilter = filter.toLowerCase();
+    return computedContent.filter(c => {
+      return get(c, "name").toLowerCase().indexOf(lowerFilter) > -1;
+    });
+  },
+
+  baseHeaderComputedContent() {
+    return {
+      title: this.get("title"),
+      icons: Ember.makeArray(this.getWithDefault("headerIcon", [])),
+      value: this.get("selectedComputedContent.value"),
+      name: this.get("selectedComputedContent.name") || this.get("noneRowComputedContent.name")
+    };
+  },
+
+  @computed("computedContent.[]", "computedValue", "filter", "shouldFilter")
+  filteredComputedContent(computedContent, computedValue, filter, shouldFilter) {
+    if (shouldFilter === true) {
+      computedContent = this.filterComputedContent(computedContent, computedValue, filter);
+    }
+
+    return computedContent.slice(0, this.get("limitMatches"));
+  },
+
+  @computed("computedValue", "computedContent.[]")
+  selectedComputedContent(computedValue, computedContent) {
+    return computedContent.findBy("value", computedValue);
+  },
+
+  @computed("selectedComputedContent")
+  hasSelection(selectedComputedContent) {
+    return selectedComputedContent !== this.get("noneRowComputedContent") &&
+      !Ember.isNone(selectedComputedContent);
+  },
+
+  @computed("filter", "computedValue")
+  shouldDisplayCreateRow(filter, computedValue) {
+    return this._super() && computedValue !== filter;
+  },
+
+  autoHighlight() {
+    run.schedule("afterRender", () => {
+      if (!isNone(this.get("highlightedValue"))) { return; }
+
+      const filteredComputedContent = this.get("filteredComputedContent");
+      const displayCreateRow = this.get("shouldDisplayCreateRow");
+      const none = this.get("noneRowComputedContent");
+
+      if (this.get("hasSelection") && isEmpty(this.get("filter"))) {
+        this.send("onHighlight", this.get("selectedComputedContent"));
+        return;
+      }
+
+      if (isNone(this.get("highlightedValue")) && !isEmpty(filteredComputedContent)) {
+        this.send("onHighlight", get(filteredComputedContent, "firstObject"));
+        return;
+      }
+
+      if (displayCreateRow === true && isEmpty(filteredComputedContent)) {
+        this.send("onHighlight", this.get("createRowComputedContent"));
+      }
+      else if (!isEmpty(filteredComputedContent)) {
+        this.send("onHighlight", get(filteredComputedContent, "firstObject"));
+      }
+      else if (isEmpty(filteredComputedContent) && isPresent(none) && displayCreateRow === false) {
+        this.send("onHighlight", none);
+      }
+    });
+  },
+
+  validateComputedContentItem(computedContentItem) {
+    return this.get("computedValue") !== computedContentItem.value;
+  },
+
+  actions: {
+    onClear() {
+      this.send("onDeselect", this.get("selectedComputedContent"));
+    },
+
+    onCreate(computedContentItem) {
+      if (this.validateComputedContentItem(computedContentItem)) {
+        this.get("computedContent").pushObject(computedContentItem);
+        this.send("onSelect", computedContentItem);
+      }
+    },
+
+    onSelect(rowComputedContentItem) {
+      this.willSelect(rowComputedContentItem);
+      this.set("computedValue", rowComputedContentItem.value);
+      this.mutateAttributes();
+      run.schedule("afterRender", () => this.didSelect(rowComputedContentItem));
+    },
+
+    onDeselect(rowComputedContentItem) {
+      this.willDeselect(rowComputedContentItem);
+      this.set("computedValue", null);
+      this.mutateAttributes();
+      run.schedule("afterRender", () => this.didDeselect(rowComputedContentItem));
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6
new file mode 100644
index 0000000000..7208f8c81a
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6
@@ -0,0 +1,23 @@
+import NotificationOptionsComponent from "select-kit/components/notifications-button";
+import computed from "ember-addons/ember-computed-decorators";
+
+export default NotificationOptionsComponent.extend({
+  pluginApiIdentifiers: ["tag-notifications-button"],
+  classNames: "tag-notifications-button",
+  i18nPrefix: "tagging.notifications",
+  showFullTitle: false,
+  allowInitialValueMutation: false,
+
+  mutateValue(value) {
+    this.sendAction("action", value);
+  },
+
+  computeValue() {
+    return this.get("notificationLevel");
+  },
+
+  @computed("iconForSelectedDetails")
+  headerIcon(iconForSelectedDetails) {
+    return [iconForSelectedDetails, "caret-down"];
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6 b/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6
new file mode 100644
index 0000000000..d679b9421e
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/toolbar-popup-menu-options.js.es6
@@ -0,0 +1,48 @@
+import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
+import computed from "ember-addons/ember-computed-decorators";
+
+export default DropdownSelectBoxComponent.extend({
+  pluginApiIdentifiers: ["toolbar-popup-menu-options"],
+  classNames: ["toolbar-popup-menu-options"],
+  isHidden: Ember.computed.empty("computedContent"),
+  showFullTitle: false,
+  collectionHeight: "auto",
+
+  @computed("title")
+  collectionHeader(title) {
+    return `<h3>${title}</h3>`;
+  },
+
+  mutateValue(value) {
+    this.sendAction("onPopupMenuAction", value);
+    this.setProperties({ value: null, highlightedValue: null });
+  },
+
+  computeContent(content) {
+    return content.map(contentItem => {
+      if (contentItem.condition) {
+        return {
+          icon: contentItem.icon,
+          name: I18n.t(contentItem.label),
+          id: contentItem.action
+        };
+      }
+    }).filter(contentItem => contentItem);
+  },
+
+  didInsertElement() {
+    this._super();
+
+    $("#reply-control").on("touchstart.toolbar-popup-menu-options", (event) => {
+      if (this.get("isExpanded") && !this.element.contains(event.target)) {
+        this.close(event);
+      }
+    });
+  },
+
+  willDestroyElement() {
+    this._super();
+
+    $("#reply-control").off("touchstart.toolbar-popup-menu-options");
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6
new file mode 100644
index 0000000000..ccdf3af489
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6
@@ -0,0 +1,68 @@
+import ComboBoxComponent from "select-kit/components/combo-box";
+
+export default ComboBoxComponent.extend({
+  pluginApiIdentifiers: ["topic-footer-mobile-dropdown"],
+  classNames: "topic-footer-mobile-dropdown",
+  filterable: false,
+  autoFilterable: false,
+  allowInitialValueMutation: false,
+
+  computeHeaderContent() {
+    let content = this.baseHeaderComputedContent();
+    content.name = I18n.t("topic.controls");
+    return content;
+  },
+
+  computeContent(content) {
+    const topic = this.get("topic");
+    const details = topic.get("details");
+
+    if (details.get("can_invite_to")) {
+      content.push({ id: "invite", icon: "users", name: I18n.t("topic.invite_reply.title") });
+    }
+
+    if (topic.get("bookmarked")) {
+      content.push({ id: "bookmark", icon: "bookmark", name: I18n.t("bookmarked.clear_bookmarks") });
+    } else {
+      content.push({ id: "bookmark", icon: "bookmark", name: I18n.t("bookmarked.title") });
+    }
+
+    content.push({ id: "share", icon: "link", name: I18n.t("topic.share.title") });
+
+    if (details.get("can_flag_topic")) {
+      content.push({ id: "flag", icon: "flag", name: I18n.t("topic.flag_topic.title") });
+    }
+
+    return content;
+  },
+
+  autoHighlight() {},
+
+  mutateValue(value) {
+    const topic = this.get("topic");
+
+    if (!topic.get("id")) {
+      return;
+    }
+
+    const refresh = () => this.send("onDeselect", value);
+
+    switch(value) {
+      case "invite":
+        this.attrs.showInvite();
+        refresh();
+        break;
+      case "bookmark":
+        topic.toggleBookmark().then(() => refresh() );
+        break;
+      case "share":
+        this.appEvents.trigger("share:url", topic.get("shareUrl"), $("#topic-footer-buttons"));
+        refresh();
+        break;
+      case "flag":
+        this.attrs.showFlagTopic();
+        refresh();
+        break;
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-kit/components/topic-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/topic-notifications-button.js.es6
new file mode 100644
index 0000000000..741b89106f
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/topic-notifications-button.js.es6
@@ -0,0 +1,6 @@
+export default Ember.Component.extend({
+  layoutName: "select-kit/templates/components/topic-notifications-button",
+  classNames: "topic-notifications-button",
+  showFullTitle: true,
+  appendReason: true
+});
diff --git a/app/assets/javascripts/select-kit/components/topic-notifications-options.js.es6 b/app/assets/javascripts/select-kit/components/topic-notifications-options.js.es6
new file mode 100644
index 0000000000..4feb3b003f
--- /dev/null
+++ b/app/assets/javascripts/select-kit/components/topic-notifications-options.js.es6
@@ -0,0 +1,33 @@
+import NotificationOptionsComponent from "select-kit/components/notifications-button";
+import { on } from "ember-addons/ember-computed-decorators";
+import { topicLevels } from "discourse/lib/notification-levels";
+
+export default NotificationOptionsComponent.extend({
+  pluginApiIdentifiers: ["topic-notifications-options"],
+  classNames: "topic-notifications-options",
+  content: topicLevels,
+  i18nPrefix: "topic.notifications",
+  allowInitialValueMutation: false,
+
+  @on("didInsertElement")
+  _bindGlobalLevelChanged() {
+    this.appEvents.on("topic-notifications-button:changed", (msg) => {
+      if (msg.type === "notification") {
+        if (this.get("computedValue") !== msg.id) {
+          this.get("topic.details").updateNotifications(msg.id);
+        }
+      }
+    });
+  },
+
+  @on("willDestroyElement")
+  _unbindGlobalLevelChanged() {
+    this.appEvents.off("topic-notifications-button:changed");
+  },
+
+  mutateValue(value) {
+    if (value !== this.get("value")) {
+      this.get("topic.details").updateNotifications(value);
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6 b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
new file mode 100644
index 0000000000..6f9e7f556b
--- /dev/null
+++ b/app/assets/javascripts/select-kit/mixins/dom-helpers.js.es6
@@ -0,0 +1,256 @@
+import { on } from "ember-addons/ember-computed-decorators";
+
+export default Ember.Mixin.create({
+  init() {
+    this._super();
+
+    this._previousScrollParentOverflow = null;
+    this._previousCSSContext = null;
+    this.filterInputSelector = ".filter-input";
+    this.rowSelector = ".select-kit-row";
+    this.collectionSelector = ".select-kit-collection";
+    this.headerSelector = ".select-kit-header";
+    this.bodySelector = ".select-kit-body";
+    this.wrapperSelector = ".select-kit-wrapper";
+    this.scrollableParentSelector = ".modal-body";
+    this.fixedPlaceholderSelector = `.select-kit-fixed-placeholder-${this.elementId}`;
+  },
+
+  $findRowByValue(value) { return this.$(`${this.rowSelector}[data-value='${value}']`); },
+
+  $header() { return this.$(this.headerSelector); },
+
+  $body() { return this.$(this.bodySelector); },
+
+  $wrapper() { return this.$(this.wrapperSelector); },
+
+  $collection() { return this.$(this.collectionSelector); },
+
+  $scrollableParent() { return $(this.scrollableParentSelector); },
+
+  $fixedPlaceholder() { return $(this.fixedPlaceholderSelector); },
+
+  $rows() {
+    return this.$(`${this.rowSelector}:not(.no-content):not(.is-hidden)`);
+  },
+
+  $highlightedRow() { return this.$rows().filter(".is-highlighted"); },
+
+  $selectedRow() { return this.$rows().filter(".is-selected"); },
+
+  $filterInput() { return this.$(this.filterInputSelector); },
+
+  @on("didRender")
+  _adjustPosition() {
+    this.$collection().css("max-height", this.get("collectionHeight"));
+    this._applyFixedPosition();
+    this._applyDirection();
+    this._positionWrapper();
+  },
+
+  @on("willDestroyElement")
+  _clearState() {
+    this.$fixedPlaceholder().remove();
+  },
+
+  // use to collapse and remove focus
+  close(event) {
+    this.collapse(event);
+    this.setProperties({ isFocused: false });
+  },
+
+  // force the component in a known default state
+  focus() {
+    Ember.run.schedule("afterRender", () => this.$header().focus());
+  },
+
+  // try to focus filter and fallback to header if not present
+  focusFilterOrHeader() {
+    Ember.run.schedule("afterRender", () => {
+      if ((this.site && this.site.isMobileDevice) || !this.$filterInput().is(":visible")) {
+        this.$header().focus();
+      } else {
+        this.$filterInput().focus();
+      }
+    });
+  },
+
+  expand() {
+    if (this.get("isExpanded") === true) return;
+    this.setProperties({ isExpanded: true, renderedBodyOnce: true, isFocused: true });
+    this.focusFilterOrHeader();
+    this.autoHighlight();
+  },
+
+  collapse() {
+    this.set("isExpanded", false);
+    Ember.run.schedule("afterRender", () => this._removeFixedPosition() );
+  },
+
+  // lose focus of the component in two steps
+  // first collapse and keep focus and then remove focus
+  unfocus(event) {
+    if (this.get("isExpanded") === true) {
+      this.collapse(event);
+      this.focus(event);
+    } else {
+      this.close(event);
+    }
+  },
+
+  _destroyEvent(event) {
+    event.preventDefault();
+    event.stopPropagation();
+  },
+
+  _applyDirection() {
+    let options = { left: "auto", bottom: "auto", top: "auto" };
+
+    const discourseHeader = $(".d-header")[0];
+    const discourseHeaderHeight = discourseHeader ? (discourseHeader.getBoundingClientRect().top + this._computedStyle(discourseHeader, "height")) : 0;
+    const bodyHeight = this._computedStyle(this.$body()[0], "height");
+    const windowWidth = $(window).width();
+    const componentHeight = this._computedStyle(this.get("element"), "height");
+    const componentWidth = this._computedStyle(this.get("element"), "width");
+    const offsetTop = this.get("element").getBoundingClientRect().top;
+    const offsetBottom = this.get("element").getBoundingClientRect().bottom;
+
+    if (this.get("fullWidthOnMobile") && (this.site && this.site.isMobileDevice)) {
+      const margin = 10;
+      const relativeLeft = this.$().offset().left - $(window).scrollLeft();
+      options.left = margin - relativeLeft;
+      options.width = windowWidth - margin * 2;
+      options.maxWidth = options.minWidth = "unset";
+    } else {
+      const bodyWidth = this._computedStyle(this.$body()[0], "width");
+
+      if (this._isRTL()) {
+        const horizontalSpacing = this.get("element").getBoundingClientRect().right;
+        const hasHorizontalSpace = horizontalSpacing - (this.get("horizontalOffset") + bodyWidth) > 0;
+        if (hasHorizontalSpace) {
+          this.setProperties({ isLeftAligned: true, isRightAligned: false });
+          options.left = bodyWidth + this.get("horizontalOffset");
+        } else {
+          this.setProperties({ isLeftAligned: false, isRightAligned: true });
+          options.right = - (bodyWidth - componentWidth + this.get("horizontalOffset"));
+        }
+      } else {
+        const horizontalSpacing = this.get("element").getBoundingClientRect().left;
+        const hasHorizontalSpace = (windowWidth - (this.get("horizontalOffset") + horizontalSpacing + bodyWidth) > 0);
+        if (hasHorizontalSpace) {
+          this.setProperties({ isLeftAligned: true, isRightAligned: false });
+          options.left = this.get("horizontalOffset");
+        } else {
+          this.setProperties({ isLeftAligned: false, isRightAligned: true });
+          options.right = this.get("horizontalOffset");
+        }
+      }
+    }
+
+    const fullHeight = this.get("verticalOffset") + bodyHeight + componentHeight;
+    const hasBelowSpace = $(window).height() - offsetBottom - fullHeight > 0;
+    const hasAboveSpace = offsetTop - fullHeight - discourseHeaderHeight > 0;
+    const headerHeight = this._computedStyle(this.$header()[0], "height");
+    if (hasBelowSpace || (!hasBelowSpace && !hasAboveSpace)) {
+      this.setProperties({ isBelow: true, isAbove: false });
+      options.top = headerHeight + this.get("verticalOffset");
+    } else {
+      this.setProperties({ isBelow: false, isAbove: true });
+      options.bottom = headerHeight + this.get("verticalOffset");
+    }
+
+    this.$body().css(options);
+  },
+
+  _applyFixedPosition() {
+    if (this.get("isExpanded") !== true) return;
+    if (this.$fixedPlaceholder().length === 1) return;
+    if (this.$scrollableParent().length === 0) return;
+
+    const width =  this._computedStyle(this.get("element"), "width");
+    const height =  this._computedStyle(this.get("element"), "height");
+
+    this._previousScrollParentOverflow = this._previousScrollParentOverflow ||
+                                         this.$scrollableParent().css("overflow");
+
+    this._previousCSSContext = this._previousCSSContext || {
+      width,
+      minWidth: this.$().css("min-width"),
+      maxWidth: this.$().css("max-width"),
+      top: this.$().css("top"),
+      left: this.$().css("left"),
+      marginLeft: this.$().css("margin-left"),
+      marginRight: this.$().css("margin-right"),
+      position: this.$().css("position")
+    };
+
+    const componentStyles = {
+      top: this.get("element").getBoundingClientRect().top,
+      width,
+      left: this.get("element").getBoundingClientRect().left,
+      marginLeft: 0,
+      marginRight: 0,
+      minWidth: "unset",
+      maxWidth: "unset",
+      position: "fixed"
+    };
+
+    const $placeholderTemplate = $(`<div class='select-kit-fixed-placeholder-${this.elementId}'></div>`);
+    $placeholderTemplate.css({
+      display: "inline-block",
+      width,
+      height,
+      "vertical-align": "middle"
+    });
+
+    this.$()
+        .before($placeholderTemplate)
+        .css(componentStyles);
+
+    this.$scrollableParent().css({ overflow: "hidden" });
+  },
+
+  _removeFixedPosition() {
+    this.$fixedPlaceholder().remove();
+
+    if (!this.element || this.isDestroying || this.isDestroyed) return;
+    if (this.$scrollableParent().length === 0) return;
+
+    this.$().css(this._previousCSSContext || {});
+    this.$scrollableParent().css("overflow", this._previousScrollParentOverflow || {});
+  },
+
+  _positionWrapper() {
+    const elementWidth = this._computedStyle(this.get("element"), "width");
+    const headerHeight = this._computedStyle(this.$header()[0], "height");
+    const bodyHeight = this._computedStyle(this.$body()[0], "height");
+
+    this.$wrapper().css({
+      width: elementWidth,
+      height: headerHeight + bodyHeight
+    });
+  },
+
+  _isRTL() {
+    return $("html").css("direction") === "rtl";
+  },
+
+  _computedStyle(element, style) {
+    if (!element) return 0;
+
+    let value;
+
+    if (window.getComputedStyle) {
+      value = window.getComputedStyle(element, null)[style];
+    } else {
+      value = $(element).css(style);
+    }
+
+    return this._getFloat(value);
+  },
+
+  _getFloat(value) {
+    value = parseFloat(value);
+    return $.isNumeric(value) ? value : 0;
+  }
+});
diff --git a/app/assets/javascripts/select-kit/mixins/events.js.es6 b/app/assets/javascripts/select-kit/mixins/events.js.es6
new file mode 100644
index 0000000000..8490293e4a
--- /dev/null
+++ b/app/assets/javascripts/select-kit/mixins/events.js.es6
@@ -0,0 +1,236 @@
+export default Ember.Mixin.create({
+  init() {
+    this._super();
+
+    this.keys = {
+      TAB: 9,
+      ENTER: 13,
+      ESC: 27,
+      UP: 38,
+      DOWN: 40,
+      BACKSPACE: 8,
+    };
+  },
+
+  willDestroyElement() {
+    this._super();
+
+    $(document).off("mousedown.select-kit");
+
+    if (this.$header()) {
+      this.$header()
+        .off("blur.select-kit")
+        .off("focus.select-kit")
+        .off("keypress.select-kit")
+        .off("keydown.select-kit");
+    }
+
+    if (this.$filterInput()) {
+      this.$filterInput()
+        .off("change.select-kit")
+        .off("keydown.select-kit")
+        .off("keypress.select-kit");
+    }
+  },
+
+  didInsertElement() {
+    this._super();
+
+    $(document)
+      .on("mousedown.select-kit", event => {
+        event.stopPropagation();
+
+        if (!this.get("renderedBodyOnce")) return;
+        if (!this.get("isFocused")) return;
+        if (Ember.isNone(this.get("element"))) return;
+        if (Ember.$.contains(this.get("element"), event.target)) return;
+
+        this.didClickOutside(event);
+    });
+
+    this.$header()
+      .on("blur.select-kit", () => {
+        if (this.get("isExpanded") === false && this.get("isFocused") === true) {
+          this.close();
+        }
+      })
+      .on("focus.select-kit", (event) => {
+        this.set("isFocused", true);
+        this._destroyEvent(event);
+      })
+      .on("keydown.select-kit", (event) => {
+        const keyCode = event.keyCode || event.which;
+
+        if (document.activeElement !== this.$header()[0]) return event;
+
+        if (keyCode === this.keys.TAB) this.tabFromHeader(event);
+        if (keyCode === this.keys.BACKSPACE) this.backspaceFromHeader(event);
+        if (keyCode === this.keys.ESC) this.escapeFromHeader(event);
+        if (keyCode === this.keys.ENTER) this.enterFromHeader(event);
+        if ([this.keys.UP, this.keys.DOWN].includes(keyCode)) this.upAndDownFromHeader(event);
+        return event;
+      })
+      .on("keypress.select-kit", (event) => {
+        const keyCode = event.keyCode || event.which;
+
+        if (keyCode === this.keys.ENTER) { return true; }
+        if (keyCode === this.keys.TAB) { return true; }
+
+        this.expand(event);
+
+        if (this.get("filterable") === true || this.get("autoFilterable")) {
+          this.set("renderedFilterOnce", true);
+        }
+
+        if (keyCode >= 65 && keyCode <= 122) {
+          Ember.run.schedule("afterRender", () => {
+            this.$filterInput()
+                .focus()
+                .val(this.$filterInput().val() + String.fromCharCode(keyCode));
+          });
+        }
+
+        return false;
+      });
+
+    this.$filterInput()
+      .on("change.select-kit", (event) => {
+        this.send("onFilter", $(event.target).val());
+      })
+      .on("keypress.select-kit", (event) => {
+        event.stopPropagation();
+      })
+      .on("keydown.select-kit", (event) => {
+        const keyCode = event.keyCode || event.which;
+
+        if (keyCode === this.keys.TAB) this.tabFromFilter(event);
+        if (keyCode === this.keys.ESC) this.escapeFromFilter(event);
+        if (keyCode === this.keys.ENTER) this.enterFromFilter(event);
+        if ([this.keys.UP, this.keys.DOWN].includes(keyCode)) this.upAndDownFromFilter(event);
+      });
+  },
+
+  didPressTab(event) {
+    if (this.get("isExpanded") === false) {
+      this.unfocus(event);
+    } else if (this.$highlightedRow().length === 1) {
+      Ember.run.throttle(this, this._rowClick, this.$highlightedRow(), 150, 150, true);
+      this.unfocus(event);
+      return true;
+    } else {
+      this._destroyEvent(event);
+      this.unfocus(event);
+    }
+
+    return true;
+  },
+
+  didPressEscape(event) {
+    this._destroyEvent(event);
+    this.unfocus(event);
+  },
+
+  didPressUpAndDownArrows(event) {
+    this._destroyEvent(event);
+
+    const keyCode = event.keyCode || event.which;
+    const $rows = this.$rows();
+
+    if (this.get("isExpanded") === false) {
+      this.expand(event);
+
+      if (this.$selectedRow().length === 1) {
+        this._highlightRow(this.$selectedRow());
+        return;
+      }
+    }
+
+    if ($rows.length <= 0) { return; }
+    if ($rows.length === 1) {
+      this._rowSelection($rows, 0);
+      return;
+    }
+
+    const direction = keyCode === 38 ? -1 : 1;
+
+    Ember.run.throttle(this, this._moveHighlight, direction, $rows, 32);
+  },
+
+  didPressBackspace(event) {
+    this._destroyEvent(event);
+
+    this.expand(event);
+
+    if (this.$filterInput().is(":visible")) {
+      this.$filterInput().focus().trigger(event).trigger("change");
+    }
+  },
+
+  didPressEnter(event) {
+    this._destroyEvent(event);
+
+    if (this.get("isExpanded") === false) {
+      this.expand(event);
+    } else if (this.$highlightedRow().length === 1) {
+      Ember.run.throttle(this, this._rowClick, this.$highlightedRow(), 150, true);
+    }
+  },
+
+  didClickOutside(event) {
+    if ($(event.target).parents(".select-kit").length === 1) {
+      this.close(event);
+      return false;
+    }
+
+    this.close(event);
+    return;
+  },
+
+  // make sure we don’t propagate a click outside component
+  // to avoid closing a modal containing the component for example
+  click(event) {
+    this._destroyEvent(event);
+  },
+
+  tabFromHeader(event) { this.didPressTab(event); },
+  tabFromFilter(event) { this.didPressTab(event); },
+
+  escapeFromHeader(event) { this.didPressEscape(event); },
+  escapeFromFilter(event) { this.didPressEscape(event); },
+
+  upAndDownFromHeader(event) { this.didPressUpAndDownArrows(event); },
+  upAndDownFromFilter(event) { this.didPressUpAndDownArrows(event); },
+
+  backspaceFromHeader(event) { this.didPressBackspace(event); },
+
+  enterFromHeader(event) { this.didPressEnter(event); },
+  enterFromFilter(event) { this.didPressEnter(event); },
+
+  _moveHighlight(direction, $rows) {
+    const currentIndex = $rows.index(this.$highlightedRow());
+    let nextIndex = currentIndex + direction;
+
+    if (nextIndex < 0) {
+      nextIndex = $rows.length - 1;
+    } else if (nextIndex >= $rows.length) {
+      nextIndex = 0;
+    }
+
+    this._rowSelection($rows, nextIndex);
+  },
+
+  _rowClick($row) { $row.click(); },
+
+  _rowSelection($rows, nextIndex) {
+    const highlightableValue = $rows.eq(nextIndex).attr("data-value");
+    const $highlightableRow = this.$findRowByValue(highlightableValue);
+    this._highlightRow($highlightableRow);
+  },
+
+  _highlightRow($row) {
+    Ember.run.schedule("afterRender", () => {
+      $row.trigger("mouseover").focus();
+      this.focus();
+    });
+  }
+});
diff --git a/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6 b/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
new file mode 100644
index 0000000000..5fd32fcd1d
--- /dev/null
+++ b/app/assets/javascripts/select-kit/mixins/plugin-api.js.es6
@@ -0,0 +1,91 @@
+let _appendContentCallbacks = {};
+function appendContent(pluginApiIdentifiers, contentFunction) {
+  if (Ember.isNone(_appendContentCallbacks[pluginApiIdentifiers])) {
+    _appendContentCallbacks[pluginApiIdentifiers] = [];
+  }
+
+  _appendContentCallbacks[pluginApiIdentifiers].push(contentFunction);
+}
+
+let _prependContentCallbacks = {};
+function prependContent(pluginApiIdentifiers, contentFunction) {
+  if (Ember.isNone(_prependContentCallbacks[pluginApiIdentifiers])) {
+    _prependContentCallbacks[pluginApiIdentifiers] = [];
+  }
+
+  _prependContentCallbacks[pluginApiIdentifiers].push(contentFunction);
+}
+
+let _modifyContentCallbacks = {};
+function modifyContent(pluginApiIdentifiers, contentFunction) {
+  if (Ember.isNone(_modifyContentCallbacks[pluginApiIdentifiers])) {
+    _modifyContentCallbacks[pluginApiIdentifiers] = [];
+  }
+
+  _modifyContentCallbacks[pluginApiIdentifiers].push(contentFunction);
+}
+
+let _onSelectCallbacks = {};
+function onSelect(pluginApiIdentifiers, mutationFunction) {
+  if (Ember.isNone(_onSelectCallbacks[pluginApiIdentifiers])) {
+    _onSelectCallbacks[pluginApiIdentifiers] = [];
+  }
+
+  _onSelectCallbacks[pluginApiIdentifiers].push(mutationFunction);
+}
+
+export function applyContentPluginApiCallbacks(identifiers, content, context) {
+  identifiers.forEach((key) => {
+    (_prependContentCallbacks[key] || []).forEach((c) => {
+      content = c().concat(content);
+    });
+    (_appendContentCallbacks[key] || []).forEach((c) => {
+      content = content.concat(c());
+    });
+    (_modifyContentCallbacks[key] || []).forEach((c) => {
+      content = c(context, content);
+    });
+  });
+
+  return content;
+}
+
+export function applyOnSelectPluginApiCallbacks(identifiers, val, context) {
+  identifiers.forEach((key) => {
+    (_onSelectCallbacks[key] || []).forEach((c) => c(context, val));
+  });
+}
+
+export function modifySelectKit(pluginApiIdentifiers) {
+  return {
+    appendContent: (content) => {
+      appendContent(pluginApiIdentifiers, () => {return content;} );
+      return modifySelectKit(pluginApiIdentifiers);
+    },
+    prependContent: (content) => {
+      prependContent(pluginApiIdentifiers, () => {return content;} );
+      return modifySelectKit(pluginApiIdentifiers);
+    },
+    modifyContent: (callback) => {
+      modifyContent(pluginApiIdentifiers, callback);
+      return modifySelectKit(pluginApiIdentifiers);
+    },
+    onSelect: (callback) => {
+      onSelect(pluginApiIdentifiers, callback);
+      return modifySelectKit(pluginApiIdentifiers);
+    }
+  };
+}
+
+export function clearCallbacks() {
+  _appendContentCallbacks = {};
+  _prependContentCallbacks = {};
+  _modifyContentCallbacks = {};
+  _onSelectCallbacks = {};
+}
+
+const EMPTY_ARRAY = Object.freeze([]);
+export default Ember.Mixin.create({
+  concatenatedProperties: ["pluginApiIdentifiers"],
+  pluginApiIdentifiers: EMPTY_ARRAY
+});
diff --git a/app/assets/javascripts/select-kit/mixins/utils.js.es6 b/app/assets/javascripts/select-kit/mixins/utils.js.es6
new file mode 100644
index 0000000000..54f404b3b9
--- /dev/null
+++ b/app/assets/javascripts/select-kit/mixins/utils.js.es6
@@ -0,0 +1,47 @@
+const { get, isNone, guidFor } = Ember;
+
+export default Ember.Mixin.create({
+  valueForContentItem(content) {
+    switch (typeof content) {
+    case "string":
+    case "number":
+      return content;
+    default:
+      return get(content, this.get("valueAttribute"));
+    }
+  },
+
+  _nameForContent(content) {
+    if (isNone(content)) {
+      return null;
+    }
+
+    if (typeof content === "object") {
+      return get(content, this.get("nameProperty"));
+    }
+
+    return content;
+  },
+
+  _isNumeric(input) {
+    return !isNaN(parseFloat(input)) && isFinite(input);
+  },
+
+  _castInteger(value) {
+    if (this.get("castInteger") && Ember.isPresent(value) && this._isNumeric(value)) {
+      return parseInt(value, 10);
+    }
+
+    return value;
+  },
+
+  _findComputedContentItemByGuid(guid) {
+    return this.get("computedContent").find(c => {
+      return guidFor(c) === guid;
+    });
+  },
+
+  _filterRemovableComputedContents(computedContent) {
+    return computedContent.filter(c => c.created === true);
+  }
+});
diff --git a/app/assets/javascripts/select-kit/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
new file mode 100644
index 0000000000..6ea0bf428c
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
@@ -0,0 +1,19 @@
+{{#if category}}
+    {{#if hasParentCategory}}
+      <div class="category-status">
+        {{badgeForParentCategory}}&nbsp;{{badgeForCategory}}
+        &nbsp;<span class="topic-count">&times; {{topicCount}}</span>
+      </div>
+    {{else}}
+      <div class="category-status">
+        {{badgeForCategory}}
+        &nbsp;<span class="topic-count">&times; {{topicCount}}</span>
+      </div>
+    {{/if}}
+
+    {{#if shouldDisplayDescription}}
+      <div class="category-desc">{{{description}}}</div>
+    {{/if}}
+{{else}}
+  {{{label}}}
+{{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs b/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
new file mode 100644
index 0000000000..97a66905a9
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/combo-box/combo-box-header.hbs
@@ -0,0 +1,13 @@
+{{#each icons as |icon|}} {{d-icon icon}} {{/each}}
+
+<span class="selected-name">
+  {{{label}}}
+</span>
+
+{{#if shouldDisplayClearableButton}}
+  <button class="btn-clear" {{action onClear bubbles=false}}>
+    {{d-icon 'times'}}
+  </button>
+{{/if}}
+
+{{d-icon caretIcon class="caret-icon"}}
diff --git a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-header.hbs b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
new file mode 100644
index 0000000000..48af8fab95
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
@@ -0,0 +1,7 @@
+{{#each icons as |icon|}} {{d-icon icon}} {{/each}}
+
+{{#if options.showFullTitle}}
+  <span class="d-button-label selected-name">
+    {{label}}
+  </span>
+{{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
new file mode 100644
index 0000000000..d6884bd75a
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
@@ -0,0 +1,15 @@
+{{#if template}}
+  {{{template}}}
+{{else}}
+  {{#if icons}}
+    <div class="icons">
+      <span class="selection-indicator"></span>
+      {{#each icons as |icon|}} {{d-icon icon}} {{/each}}
+    </div>
+  {{/if}}
+
+  <div class="texts">
+    <span class="name">{{{label}}}</span>
+    <span class="desc">{{{description}}}</span>
+  </div>
+{{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs b/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
new file mode 100644
index 0000000000..caa167199e
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
@@ -0,0 +1,23 @@
+{{#if icons}}
+  <div class="future-date-input-selector-icons">
+    {{#each icons as |icon|}} {{d-icon icon}} {{/each}}
+  </div>
+{{/if}}
+
+<span class="selected-name" title={{title}}>
+  {{{label}}}
+</span>
+
+{{#if computedContent.datetime}}
+  <span class="future-date-input-selector-datetime">
+    {{computedContent.datetime}}
+  </span>
+{{/if}}
+
+{{#if shouldDisplayClearableButton}}
+  <button class="btn-clear" {{action onClear bubbles=false}}>
+    {{d-icon 'times'}}
+  </button>
+{{/if}}
+
+{{d-icon caretIcon class="caret-icon"}}
diff --git a/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-row.hbs b/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
new file mode 100644
index 0000000000..a0217afca1
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
@@ -0,0 +1,13 @@
+{{#if computedContent.icons}}
+  <div class="future-date-input-selector-icons">
+    {{#each computedContent.icons as |icon|}} {{d-icon icon}} {{/each}}
+  </div>
+{{/if}}
+
+<span class="name">{{label}}</span>
+
+{{#if computedContent.datetime}}
+  <span class="future-date-input-selector-datetime">
+    {{computedContent.datetime}}
+  </span>
+{{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select/multi-select-header.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select/multi-select-header.hbs
new file mode 100644
index 0000000000..5cfd580279
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/multi-select/multi-select-header.hbs
@@ -0,0 +1,13 @@
+<div class="choices">
+  {{#each computedContent.selectedComputedContents as |selectedComputedContent|}}
+    {{component selectedNameComponent onDeselect=onDeselect computedContent=selectedComputedContent}}
+  {{/each}}
+  <span class="filter choice" tabindex="-1">
+    {{component "select-kit/select-kit-filter"
+      onFilter=onFilter
+      shouldDisplayFilter=shouldDisplayFilter
+      isFocused=isFocused
+      filter=filter
+    }}
+  </span>
+</div>
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs
new file mode 100644
index 0000000000..d96b31245b
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-category.hbs
@@ -0,0 +1,7 @@
+<span class="name">
+  <span class="delete-icon" {{action onDeselect computedContent bubbles=false}}>
+    {{d-icon "times"}}
+  </span>
+
+  {{badge}}
+</span>
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-color.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-color.hbs
new file mode 100644
index 0000000000..2d70a3d7df
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-color.hbs
@@ -0,0 +1,13 @@
+<div class="selected-color-wrapper">
+  <span class="name">
+    {{#unless isLocked}}
+      <span class="delete-icon" {{action onDeselect computedContent bubbles=false}}>
+        {{d-icon "times"}}
+      </span>
+    {{/unless}}
+
+    #{{{label}}}
+  </span>
+
+  <span class="color-preview"></span>
+</div>
diff --git a/app/assets/javascripts/select-kit/templates/components/multi-select/selected-name.hbs b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-name.hbs
new file mode 100644
index 0000000000..a48a160ccc
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/multi-select/selected-name.hbs
@@ -0,0 +1,13 @@
+{{#if isLocked}}
+  <span class="delete-icon">
+    {{d-icon "lock"}}
+  </span>
+{{else}}
+  <span class="locked-icon" {{action onDeselect computedContent bubbles=false}}>
+    {{d-icon "times"}}
+  </span>
+{{/if}}
+
+<span class="name">
+  {{{label}}}
+</span>
diff --git a/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs b/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
new file mode 100644
index 0000000000..31fc07f1dc
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/pinned-button.hbs
@@ -0,0 +1,5 @@
+{{pinned-options value=pinned topic=topic}}
+
+<p class="reason">
+  {{{reasonText}}}
+</p>
diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit.hbs b/app/assets/javascripts/select-kit/templates/components/select-kit.hbs
new file mode 100644
index 0000000000..576cab2248
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/select-kit.hbs
@@ -0,0 +1,50 @@
+{{component headerComponent
+  tabindex=tabindex
+  isFocused=isFocused
+  isExpanded=isExpanded
+  computedContent=headerComputedContent
+  onDeselect=(action "onDeselect")
+  onToggle=(action "onToggle")
+  onFilter=(action "onFilter")
+  onClear=(action "onClear")
+  options=headerComponentOptions
+  shouldDisplayFilter=shouldDisplayFilter
+}}
+
+<div class="select-kit-body">
+  {{component filterComponent
+    onFilter=(action "onFilter")
+    icon=filterIcon
+    shouldDisplayFilter=shouldDisplayFilter
+    isFocused=isFocused
+    placeholder=(i18n filterPlaceholder)
+    filter=filter
+  }}
+
+  {{#if renderedBodyOnce}}
+    {{component collectionComponent
+      collectionHeader=collectionHeader
+      hasSelection=hasSelection
+      noneRowComputedContent=noneRowComputedContent
+      createRowComputedContent=createRowComputedContent
+      filteredComputedContent=filteredComputedContent
+      rowComponent=rowComponent
+      noneRowComponent=noneRowComponent
+      createRowComponent=createRowComponent
+      templateForRow=templateForRow
+      templateForNoneRow=templateForNoneRow
+      templateForCreateRow=templateForCreateRow
+      onClear=(action "onClear")
+      onSelect=(action "onSelect")
+      onHighlight=(action "onHighlight")
+      onCreate=(action "onCreate")
+      noContentLabel=noContentLabel
+      highlightedValue=highlightedValue
+      computedValue=computedValue
+      shouldDisplayNoContentRow=shouldDisplayNoContentRow
+      rowComponentOptions=rowComponentOptions
+    }}
+  {{/if}}
+</div>
+
+<div class="select-kit-wrapper"></div>
diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs
new file mode 100644
index 0000000000..f6cd9cf1a6
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-collection.hbs
@@ -0,0 +1,51 @@
+{{#if collectionHeader}}
+  <div class="collection-header">
+    {{{collectionHeader}}}
+  </div>
+{{/if}}
+
+{{#if hasSelection}}
+  {{#if noneRowComputedContent}}
+    {{component noneRowComponent
+      computedContent=noneRowComputedContent
+      templateForRow=templateForNoneRow
+      highlightedValue=highlightedValue
+      onClear=onClear
+      onHighlight=onHighlight
+      computedValue=computedValue
+      options=rowComponentOptions
+    }}
+  {{/if}}
+{{/if}}
+
+{{#if createRowComputedContent}}
+  {{component createRowComponent
+    computedContent=createRowComputedContent
+    templateForRow=templateForCreateRow
+    highlightedValue=highlightedValue
+    onHighlight=onHighlight
+    onCreate=onCreate
+    computedValue=computedValue
+    options=rowComponentOptions
+  }}
+{{/if}}
+
+{{#each filteredComputedContent as |computedContent|}}
+  {{component rowComponent
+    computedContent=computedContent
+    templateForRow=templateForRow
+    highlightedValue=highlightedValue
+    onSelect=onSelect
+    onHighlight=onHighlight
+    computedValue=computedValue
+    options=rowComponentOptions
+  }}
+{{/each}}
+
+{{#if shouldDisplayNoContentRow}}
+  {{#if noContentLabel}}
+    <li class="select-kit-row no-content">
+      {{i18n noContentLabel}}
+    </li>
+  {{/if}}
+{{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-filter.hbs b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-filter.hbs
new file mode 100644
index 0000000000..dd62fca94a
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-filter.hbs
@@ -0,0 +1,15 @@
+{{input
+  tabindex=-1
+  class="filter-input"
+  placeholder=placeholder
+  key-up=onFilter
+  autocomplete="off"
+  autocorrect="off"
+  autocapitalize="off"
+  spellcheck=false
+  value=filter
+}}
+
+{{#if icon}}
+  {{d-icon icon class="filter-icon"}}
+{{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-header.hbs b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-header.hbs
new file mode 100644
index 0000000000..e65ce13500
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-header.hbs
@@ -0,0 +1,5 @@
+{{#each icons as |icon|}} {{d-icon icon}} {{/each}}
+
+<span class="selected-name">
+  {{{label}}}
+</span>
diff --git a/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-row.hbs b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-row.hbs
new file mode 100644
index 0000000000..fc0df65835
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/select-kit/select-kit-row.hbs
@@ -0,0 +1,6 @@
+{{#if template}}
+  {{{template}}}
+{{else}}
+  {{#each icons as |icon|}} {{d-icon icon}} {{/each}}
+  <span class="name">{{{label}}}</span>
+{{/if}}
diff --git a/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
new file mode 100644
index 0000000000..2569ea0c86
--- /dev/null
+++ b/app/assets/javascripts/select-kit/templates/components/topic-notifications-button.hbs
@@ -0,0 +1,10 @@
+{{topic-notifications-options
+  value=notificationLevel
+  topic=topic
+  showFullTitle=showFullTitle}}
+
+{{#if appendReason}}
+  <p class="reason">
+    {{{topic.details.notificationReasonText}}}
+  </p>
+{{/if}}
diff --git a/app/assets/javascripts/service-worker.js.erb b/app/assets/javascripts/service-worker.js.erb
new file mode 100644
index 0000000000..43fb85a33e
--- /dev/null
+++ b/app/assets/javascripts/service-worker.js.erb
@@ -0,0 +1,92 @@
+'use strict';
+
+// Incrementing CACHE_VERSION will kick off the install event and force previously cached
+// resources to be cached again.
+const CACHE_VERSION = 1;
+
+const CURRENT_CACHES = {
+  offline: 'offline-v' + CACHE_VERSION
+};
+
+const OFFLINE_URL = 'offline.html';
+
+function createCacheBustedRequest(url) {
+  var request = new Request(url, {cache: 'reload'});
+  // See https://fetch.spec.whatwg.org/#concept-request-mode
+  // This is not yet supported in Chrome as of M48, so we need to explicitly check to see
+  // if the cache: 'reload' option had any effect.
+  if ('cache' in request) {
+    return request;
+  }
+
+  // If {cache: 'reload'} didn't have any effect, append a cache-busting URL parameter instead.
+  var bustedUrl = new URL(url, self.location.href);
+  bustedUrl.search += (bustedUrl.search ? '&' : '') + 'cachebust=' + Date.now();
+  return new Request(bustedUrl);
+}
+
+self.addEventListener('install', function(event) {
+  event.waitUntil(
+    // We can't use cache.add() here, since we want OFFLINE_URL to be the cache key, but
+    // the actual URL we end up requesting might include a cache-busting parameter.
+    fetch(createCacheBustedRequest(OFFLINE_URL)).then(function(response) {
+      return caches.open(CURRENT_CACHES.offline).then(function(cache) {
+        return cache.put(OFFLINE_URL, response);
+      });
+    })
+  );
+});
+
+self.addEventListener('activate', function(event) {
+  // Delete all caches that aren't named in CURRENT_CACHES.
+  // While there is only one cache in this example, the same logic will handle the case where
+  // there are multiple versioned caches.
+  var expectedCacheNames = Object.keys(CURRENT_CACHES).map(function(key) {
+    return CURRENT_CACHES[key];
+  });
+
+  event.waitUntil(
+    caches.keys().then(function(cacheNames) {
+      return Promise.all(
+        cacheNames.map(function(cacheName) {
+          if (expectedCacheNames.indexOf(cacheName) === -1) {
+            // If this cache name isn't present in the array of "expected" cache names,
+            // then delete it.
+            return caches.delete(cacheName);
+          }
+        })
+      );
+    })
+  );
+});
+
+self.addEventListener('fetch', function(event) {
+  // We only want to call event.respondWith() if this is a navigation request
+  // for an HTML page.
+  // request.mode of 'navigate' is unfortunately not supported in Chrome
+  // versions older than 49, so we need to include a less precise fallback,
+  // which checks for a GET request with an Accept: text/html header.
+  if (event.request.mode === 'navigate' ||
+      (event.request.method === 'GET' &&
+       event.request.headers.get('accept').includes('text/html'))) {
+    event.respondWith(
+      fetch(event.request).catch(function(error) {
+        // The catch is only triggered if fetch() throws an exception, which will most likely
+        // happen due to the server being unreachable.
+        // If fetch() returns a valid HTTP response with an response code in the 4xx or 5xx
+        // range, the catch() will NOT be called. If you need custom handling for 4xx or 5xx
+        // errors, see https://github.com/GoogleChrome/samples/tree/gh-pages/service-worker/fallback-response
+        return caches.match(OFFLINE_URL);
+      })
+    );
+  }
+
+  // If our if() condition is false, then this fetch handler won't intercept the request.
+  // If there are any other fetch handlers registered, they will get a chance to call
+  // event.respondWith(). If no fetch handlers call event.respondWith(), the request will be
+  // handled by the browser as if there were no service worker involvement.
+});
+
+<% DiscoursePluginRegistry.service_workers.each do |js| %>
+<%=raw "#{File.read(js)}" %>
+<% end %>
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index 4b500d18bc..6a7bd345ec 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -37,3 +37,4 @@
 //= require virtual-dom
 //= require virtual-dom-amd
 //= require highlight.js
+//= require htmlparser.js
diff --git a/app/assets/javascripts/wizard-application.js b/app/assets/javascripts/wizard-application.js
index e69ccaf616..ef61997351 100644
--- a/app/assets/javascripts/wizard-application.js
+++ b/app/assets/javascripts/wizard-application.js
@@ -3,6 +3,7 @@
 //= require ./ember-addons/macro-alias
 //= require ./ember-addons/ember-computed-decorators
 //= require_tree ./discourse-common
+//= require_tree ./select-kit
 //= require wizard/router
 //= require wizard/wizard
 //= require_tree ./wizard/templates
diff --git a/app/assets/javascripts/wizard-vendor.js b/app/assets/javascripts/wizard-vendor.js
index 2236d33669..ecb8d2bd7e 100644
--- a/app/assets/javascripts/wizard-vendor.js
+++ b/app/assets/javascripts/wizard-vendor.js
@@ -3,3 +3,5 @@
 //= require jquery.ui.widget.js
 //= require jquery.fileupload.js
 //= require sweetalert.js
+//= require virtual-dom
+//= require virtual-dom-amd
diff --git a/app/assets/javascripts/wizard/components/wizard-canvas.js.es6 b/app/assets/javascripts/wizard/components/wizard-canvas.js.es6
index bd8f9c53cb..d7f2db1b4f 100644
--- a/app/assets/javascripts/wizard/components/wizard-canvas.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-canvas.js.es6
@@ -4,7 +4,7 @@ const SIZE = 144;
 
 let width, height;
 
-const COLORS = ['#BF1E2E', '#F1592A', '#F7941D', '#9EB83B', '#3AB54A', '#12A89D', '#25AAE2', '#0E76BD', 
+const COLORS = ['#BF1E2E', '#F1592A', '#F7941D', '#9EB83B', '#3AB54A', '#12A89D', '#25AAE2', '#0E76BD',
                 '#652D90', '#92278F', '#ED207B', '#8C6238'];
 
 class Particle {
@@ -45,7 +45,7 @@ export default Ember.Component.extend({
   tagName: 'canvas',
   ctx: null,
   ready: false,
-  particles: null, 
+  particles: null,
 
   didInsertElement() {
     this._super();
diff --git a/app/assets/javascripts/wizard/initializers/load-helpers.js.es6 b/app/assets/javascripts/wizard/initializers/load-helpers.js.es6
index b2e05d0181..4ed645f4da 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 ebc83ec380..15abc15ff0 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/templates/components/invite-list-user.hbs b/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
index b957827ad1..c31d80349a 100644
--- a/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
+++ b/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
@@ -2,5 +2,5 @@
 <span class='role'>{{roleName}}</span>
 
 <button class="wizard-btn small danger remove-user" {{action "removeUser" user}}>
-  {{fa-icon "times"}}
+  {{d-icon "times"}}
 </button>
diff --git a/app/assets/javascripts/wizard/templates/components/invite-list.hbs b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
index 6b38377668..c966c8bc00 100644
--- a/app/assets/javascripts/wizard/templates/components/invite-list.hbs
+++ b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
@@ -12,9 +12,9 @@
     {{input class="invite-email wizard-focusable" value=inviteEmail placeholder="user@example.com" tabindex="9"}}
   </div>
 
-  {{combo-box value=inviteRole content=roles nameProperty="label" width="200px"}}
+  {{combo-box allowInitialValueMutation=true value=inviteRole content=roles nameProperty="label"}}
 
   <button class="wizard-btn small add-user" {{action "addUser"}}>
-    {{fa-icon "plus"}}{{i18n "wizard.invites.add_user"}}
+    {{d-icon "plus"}}{{i18n "wizard.invites.add_user"}}
   </button>
 </div>
diff --git a/app/assets/javascripts/wizard/templates/components/radio-button.hbs b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
index 3973d91324..e93347513a 100644
--- a/app/assets/javascripts/wizard/templates/components/radio-button.hbs
+++ b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
@@ -2,7 +2,7 @@
   <input type="radio" name={{label}} tabindex="9">
   <span class='radio-label'>
     {{#if icon}}
-      {{fa-icon icon}}
+      {{d-icon icon}}
     {{/if}}
     {{label}}
   </span>
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs
index 06e7034c14..f95625b7a8 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs
@@ -3,5 +3,4 @@
             value=field.value
             content=field.choices
             nameProperty="label"
-            width="400px"
             tabindex="9"}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
index 209f344e0f..05f1cb2951 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
@@ -7,7 +7,7 @@
     {{i18n "wizard.uploading"}}
   {{else}}
     {{i18n "wizard.upload"}}
-    {{fa-icon "picture-o"}}
+    {{d-icon "picture-o"}}
   {{/if}}
 
   <input disabled={{uploading}} type="file" accept="image/*" style="visibility: hidden; position: absolute;" />
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
index 9c945cf60a..b7371dc1b5 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
@@ -39,7 +39,7 @@
     {{#if showNextButton}}
       <button class='wizard-btn next primary' {{action "nextStep"}} disabled={{saving}} tabindex="10">
         {{i18n "wizard.next"}}
-        {{fa-icon "chevron-right"}}
+        {{d-icon "chevron-right"}}
       </button>
     {{/if}}
 
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 fb95fa7abf..97029c5eeb 100644
--- a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
+++ b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
@@ -1,12 +1,12 @@
 import startApp from 'wizard/test/helpers/start-app';
 
 var wizard;
-module("Acceptance: wizard", {
+QUnit.module("Acceptance: wizard", {
   beforeEach() {
     wizard = startApp();
   },
 
-  teardown() {
+  afterEach() {
     Ember.run(wizard, 'destroy');
   }
 });
@@ -56,7 +56,7 @@ test("Going back and forth in steps", assert => {
     assert.ok(!exists('.wizard-step-title'));
     assert.ok(!exists('.wizard-step-description'));
 
-    assert.ok(exists('select.field-snack'), "went to the next step");
+    assert.ok(exists('.select-kit.field-snack'), "went to the next step");
     assert.ok(exists('.preview-area'), "renders the component field");
 
     assert.ok(!exists('.wizard-btn.next'));
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 8e515c01c6..cdfe0fbe15 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 0cc731b1ea..21541d3413 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 46042a0e72..91abd402c9 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 466b656d83..7905a1df5b 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.scss b/app/assets/stylesheets/common.scss
index abb6e9bfa8..565e431744 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -6,6 +6,7 @@
 @import "vendor/select2";
 @import "common/foundation/mixins";
 @import "common/foundation/variables";
+@import "common/select-kit/*";
 @import "common/components/*";
 @import "common/input_tip";
 @import "common/topic-entrance";
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index a25115a691..e66c539e39 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -4,6 +4,9 @@
 @import "common/foundation/helpers";
 
 @import "common/admin/customize";
+@import "common/admin/flagging";
+@import "common/admin/moderation_history";
+@import "common/admin/suspend";
 
 $mobile-breakpoint: 700px;
 
@@ -36,8 +39,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;
@@ -51,8 +54,8 @@ $mobile-breakpoint: 700px;
         background-color: lighten($primary, 80%);
       }
 
-      i.fa-chevron-down,
-      i.fa-chevron-up {
+      .d-icon-chevron-down,
+      .d-icon-chevron-up {
         margin-left: 0.5em;
       }
     }
@@ -62,11 +65,6 @@ $mobile-breakpoint: 700px;
   .filters input { margin-bottom: 0; }
 }
 
-td.flaggers td {
-  border-bottom: none;
-  border-top: none;
-}
-
 .site-texts {
   .search-area {
     margin-bottom: 2em;
@@ -94,16 +92,16 @@ 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 {
       font-weight: normal;
-      font-size: 1.1em;
+      font-size: 1em;
     }
 
     button.edit {
@@ -112,7 +110,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 +134,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;
@@ -179,6 +177,16 @@ td.flaggers td {
   }
 }
 
+.full-reason {
+  white-space: pre-wrap;
+}
+
+.admin-users .users-list {
+  .username .fa {
+    color: dark-light-choose($primary-medium, $secondary-medium);
+  }
+}
+
 .ip-lookup {
   position: relative;
   display: inline-block;
@@ -193,6 +201,13 @@ td.flaggers td {
     background-color: $secondary;
     padding: 12px 12px 5px;
 
+    .powered-by {
+      font-size: 0.857em;
+      position: absolute;
+      bottom: -10px;
+      left: 10px;
+    }
+
     .other-accounts {
       margin: 5px 0 0;
       max-height: 200px;
@@ -207,6 +222,21 @@ td.flaggers td {
 
 .admin-container {
   margin-top: 20px;
+
+  .select-kit {
+    width: 350px;
+  }
+  .select-kit.multi-select {
+    width: 500px;
+  }
+  .select-box-kit.dropdown-select-box {
+    width: auto;
+  }
+
+  .search-logs-filter {
+    width: 200px;
+    float: right;
+  }
 }
 
 .admin-container .controls {
@@ -218,20 +248,20 @@ td.flaggers td {
 }
 
 .admin-title {
-  height: 45px;
+  margin-bottom: 0.5em;
 }
 
 .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;
         }
       }
     }
@@ -248,7 +278,6 @@ td.flaggers td {
   .controls .menu-toggle {
     display: none;
     float: left;
-    font-size: 24px;
     padding: 3px 6px;
     margin-right: 32px;
     border: 1px solid lighten($primary, 40%);
@@ -316,6 +345,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;
@@ -323,15 +363,18 @@ td.flaggers td {
 
 .groups, .badges, .web-hook-container {
   .form-horizontal {
-    label {
-      font-weight: bold;
-    }
-
     & > div {
-      margin-top: 10px;
+      margin-bottom: 20px;
     }
 
-    input, textarea, select {
+    .d-editor-textarea-wrapper {
+      max-width: 60%; 
+      .d-editor-button-bar {
+        overflow: hidden;
+      }
+    }
+
+    input, textarea, select, .select-box {
       width: 350px;
     }
 
@@ -356,23 +399,13 @@ td.flaggers td {
 .admin-nav {
   width: 18.018%;
   position: relative;
+
   // The admin-nav becomes a slide-out menu at the mobile-nav breakpoint
   @media (max-width: $mobile-breakpoint) {
     position: absolute;
     z-index: 0;
     width: 50%;
   }
-  margin-top: 30px;
-  .nav-stacked {
-    border-right: none;
-    @media (max-width: $mobile-breakpoint) {
-      //margin-right: 10px;
-    }
-  }
-  li a.active {
-    color: $secondary;
-    background-color: $quaternary;
-  }
 }
 
 .admin-detail {
@@ -385,7 +418,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;
@@ -437,7 +470,7 @@ td.flaggers td {
         width: 100%;
         padding-right: 0;
       }
-      .select2-container {
+      .select-kit {
         width: 100% !important; // Needs !important to override hard-coded value
         @media (max-width: $mobile-breakpoint) {
           width: 100% !important; // !important overrides hard-coded mobile width of 68px
@@ -450,7 +483,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 +491,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;
@@ -495,7 +531,7 @@ td.flaggers td {
 
     .desc, .validation-error {
       padding-top: 3px;
-      font-size: 80%;
+      font-size: .857em;
       line-height: 1.4em;
     }
 
@@ -504,40 +540,40 @@ td.flaggers td {
     }
 
     .desc {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
 
     h3 {
-      font-size: 0.929em;
+      font-size: 1em;
       font-weight: normal;
     }
   }
 
   .setting.overridden {
     h3 {
-      color: scale-color($highlight, $lightness: -50%);
+      color: $highlight-high;
     }
   }
 
   .setting.overridden.string {
-    input[type=text] {
-      background-color: dark-light-diff($highlight, $secondary, 50%, -60%);
+    input[type=text], textarea {
+      background-color: $highlight-medium;
     }
   }
 }
 
 section.details {
   h1 {
-    font-size: 1.286em;
+    font-size: 1.429em;
     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;
   }
 }
 
 #selected-controls {
-  background-color: scale-color($tertiary, $lightness: 75%);
+  background-color: $tertiary-low;
   padding: 8px;
   min-height: 27px;
   position: fixed;
@@ -573,9 +609,9 @@ section.details {
     border-top: 0;
   }
   &.highlight-danger {
-    background-color: scale-color($danger, $lightness: 50%);
+    background-color: $danger-low;
   }
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border-top: 1px solid $primary-low;
   &:before, &:after {
     display: table;
     content: "";
@@ -604,12 +640,16 @@ section.details {
       text-align: left;
       margin-left: 0;
     }
+
+    .select-kit {
+      width: inherit;
+    }
   }
   .long-value {
     width: 800px;
     float: left;
     margin-left: 12px;
-    font-size: 0.929em;
+    font-size: 0.857em;
 
     button {
       margin-left: 10px;
@@ -639,11 +679,11 @@ section.details {
 
     .list-badge {
       float: right;
-      font-size: 11px;
+      font-size: .857em;
       font-weight: normal;
       padding: 0 6px;
       color: $secondary;
-      background-color: scale-color($tertiary, $lightness: 50%);
+      background-color: $tertiary-medium;
       border-radius: 3px;
     }
   }
@@ -653,12 +693,45 @@ section.details {
 
     p.help {
       margin: 0;
-      color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
-      font-size: 0.9em;
+      color: dark-light-choose($primary-medium, $secondary-medium);
+      font-size: 0.857em;
     }
   }
 
   .form-horizontal {
+    .ace-wrapper {
+      position: relative;
+      height: 270px;
+      margin-bottom: 10px;
+
+      .ace_editor {
+        position: absolute;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        border: 1px solid #e9e9e9;
+        border-radius: 3px;
+
+        .ace_gutter {
+          border-right: 1px solid #e9e9e9;
+          background: #f4f4f4;
+        }
+      }
+
+      &[data-disabled="true"] {
+        cursor: not-allowed;
+        opacity: 0.5;
+
+        .ace_editor {
+          pointer-events:none;
+
+          .ace_cursor {
+            visibility: hidden;
+          }
+        }
+      }
+    }
     .delete-link {
       margin-left: 15px;
       margin-top: 5px;
@@ -671,7 +744,7 @@ section.details {
   .current-badge-actions {
     margin: 10px;
     padding: 10px;
-    border-top: 1px solid dark-light-choose(scale-color($primary, $lightness: 80%), scale-color($secondary, $lightness: 20%));
+    border-top: 1px solid dark-light-choose($primary-low, $secondary-high);
   }
 
   .buttons {
@@ -695,14 +768,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 {
@@ -724,7 +797,7 @@ section.details {
 .groups {
   .ac-wrap {
     width: 100% !important;
-    border-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+    border-color: dark-light-choose($primary-low-mid, $secondary-high);
     .item {
       margin-right: 10px;
     }
@@ -746,7 +819,7 @@ section.details {
   }
   .select2-choices {
     width: 100%;
-    border-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+    border-color: dark-light-choose($primary-low-mid, $secondary-high);
   }
 
   .content-list {
@@ -754,49 +827,6 @@ section.details {
   }
 }
 
-.admin-flags {
-  .hidden-post td.excerpt,
-  .hidden-post td.user {
-    opacity: 0.5;
-  }
-
-  .deleted td.excerpt,
-  .deleted td.user {
-    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%); }
-
-  .flagged-post-avatar {
-    margin-right: 10px;
-  }
-
-  .excerpt {
-    padding: 8px;
-    word-wrap: break-word;
-    .fa { display: inline-block; }
-    h3 {
-      margin-top: 0;
-      margin-bottom: 5px;
-    }
-    p:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  tr.message td {
-    padding-left: 60px;
-  }
-
-  .flagged-posts { background: $danger; }
-
-  .action {
-     button { margin: 4px; }
-     text-align: right;
-  }
-}
-
 /* Dashboard */
 
 .dashboard-left {
@@ -820,7 +850,7 @@ section.details {
   }
 
   .version-number {
-    font-size: 1.286em;
+    font-size: 1.429em;
     font-weight: bold;
   }
 
@@ -855,7 +885,7 @@ section.details {
 }
 
 .update-nag {
-  i.fa {
+  .d-icon {
     font-size: 1.429em;
   }
 }
@@ -890,10 +920,10 @@ table.api-keys {
     width: 100%;
 
     .title {
-      i.fa {
+      .d-icon {
         color: $primary;
       }
-      i.fa-heart {
+      .d-icon-heart {
         color: $love;
       }
     }
@@ -901,7 +931,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 +981,7 @@ table.api-keys {
   }
 
   &.detected-problems {
-    background: dark-light-diff($primary, $secondary, 90%, -75%);
+    background: $primary-low;
     margin-bottom: 20px;
 
     .look-here {
@@ -976,7 +1006,7 @@ table.api-keys {
         text-align: right;
       }
       .btn {
-        background: dark-light-diff($primary, $secondary, 80%, -85%);
+        background: $primary-low;
       }
       ul {
         margin-left: 0;
@@ -1025,102 +1055,6 @@ table.api-keys {
   }
 }
 
-.commits-widget {
-  border: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
-  height: 180px;
-  margin-bottom: 36px;
-
-  ul, li {
-    margin: 0;
-    padding: 0;
-  }
-  ul {
-    list-style: none;
-  }
-  a {
-    color: $primary;
-    text-decoration: none;
-  }
-  a:hover {
-    text-decoration: underline;
-  }
-
-  .header {
-    color: $primary;
-    font-weight: bold;
-    height: 30px;
-    background: dark-light-diff($primary, $secondary, 80%, -75%);
-    cursor: pointer;
-
-    h1 {
-      font-size: 1.286em;
-      margin: 5px 0 0 8px;
-      display: inline-block;
-      line-height: 1.0em;
-    }
-  }
-
-  .header:hover h1 {
-    color: $tertiary;
-  }
-
-  .commits-list {
-    height: 149px;
-    overflow-y:auto;
-
-    li {
-      @extend .clearfix;
-      line-height: 1.0em;
-      padding: 6px 8px;
-    background-color: dark-light-diff($primary, $secondary, 90%, -60%);
-      .left {
-        float: left;
-      }
-      .right {
-        margin-left: 52px;
-      }
-
-      img {
-        margin-top: 2px;
-        border: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
-        padding: 2px;
-        background-color: $secondary;
-      }
-
-      .commit-message {
-        color: $primary;
-        font-size: 0.857em;
-        font-weight: bold;
-      }
-
-      .commit-meta {
-        color: $primary;
-        font-size: 0.857em;
-      }
-
-      .committer-name {
-        font-weight: bold;
-        color: $primary;
-      }
-    }
-    li:last-child {
-      border: none;
-    }
-  }
-
-  // Always show the scrollbar:
-  ::-webkit-scrollbar {
-    width: 6px;
-  }
-  ::-webkit-scrollbar-thumb {
-    background: dark-light-diff($primary, $secondary, 90%, -75%);
-    -webkit-border-radius: 3px;
-  }
-  ::-webkit-scrollbar-track {
-    border-left: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
-  }
-}
-
 .content-editor {
   min-height: 500px;
 
@@ -1285,14 +1219,14 @@ table.api-keys {
   margin: 0 0 20px 6px;
   a.filter {
     display: inline-block;
-    background-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+    background-color: dark-light-choose($primary-low-mid, $secondary-high);
     padding: 3px 10px;
     border-radius: 3px;
 
     color: $primary;
     &:hover {
       color: $primary;
-      background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+      background-color: $primary-low;
 
 
     }
@@ -1316,13 +1250,13 @@ table.api-keys {
   position: absolute;
 }
 
-.staff-actions, .screened-emails, .screened-urls, .screened-ip-addresses, .permalinks, .web-hook-events {
+.staff-actions, .screened-emails, .screened-urls, .screened-ip-addresses, .permalinks, .search-logs-list, .web-hook-events {
 
-  border-bottom: dotted 1px dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+  border-bottom: dotted 1px dark-light-choose($primary-low-mid, $secondary);
 
   .heading-container {
     width: 100%;
-    background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+    background-color: $primary-low;
   }
   .col.heading {
     font-weight: bold;
@@ -1338,21 +1272,39 @@ 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;
+  }
+}
+
+.search-logs-list{
+  .col {
+    text-align: center;
+    width: 15%;
+  }
+
+  .col.term {
+    width: 45%;
+    text-align: left;
   }
 }
 
 .log-details-modal {
+
+  pre {
+    white-space: pre-wrap;
+    max-height: 250px;
+  }
+
   .modal-tab {
     width: 95%;
   }
 }
 
 .tl3-requirements {
-  .fa-check {
+  .d-icon-check {
     color: $success;
   }
-  .fa-times {
+  .d-icon-times {
     color: $danger;
   }
 }
@@ -1409,14 +1361,6 @@ button.ru {
   visibility: hidden;
 }
 
-.delete-flag-modal, .agree-flag-modal {
-  button {
-    display: block;
-    margin: 10px 0 10px 10px;
-    padding: 10px 15px;
-  }
-}
-
 .start-backup-modal {
   .btn {
     margin: 10px 0 10px 5px;
@@ -1426,14 +1370,6 @@ button.ru {
   }
 }
 
-@media all
-and (max-width : 850px) {
-  html:not(.mobile-view) .admin-content .nav-stacked {
-    .glyph {width: auto; position: relative;}
-    > li > a {padding: 13px}
-  }
-}
-
 @media all
 and (min-width : 320px)
 and (max-width : 500px) {
@@ -1458,9 +1394,6 @@ and (max-width : 500px) {
       .setting-value {
         width: 100%;
         }
-      label {
-        font-size: 0.929em;
-        }
     }
   }
 
@@ -1471,7 +1404,7 @@ and (max-width : 500px) {
   div.ac-wrap {
     width: 100% !important;
     box-sizing: border-box;
-    }
+  }
 
   .admin-container {
     h2 {
@@ -1528,7 +1461,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%;
@@ -1658,12 +1591,16 @@ table#user-badges {
   }
 
   p.description {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     margin-bottom: 1em;
     max-width: 700px;
   }
 }
 
+.embedding td input {
+  margin-bottom: 0;
+}
+
 // Emails
 
 .email-list {
@@ -1675,8 +1612,8 @@ table#user-badges {
   }
   .reply-key {
     display: block;
-    font-size: 12px;
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%));
+    font-size: .857em;
+    color: dark-light-choose($primary-medium, $secondary-high);
   }
   .username div {
     max-width: 180px;
@@ -1705,7 +1642,7 @@ table#user-badges {
   }
   .error-description {
     color: #919191;
-    font-size: 90%;
+    font-size: .857em;
   }
   hr {
     margin: 0;
@@ -1807,7 +1744,7 @@ table#user-badges {
     margin-top: 10px;
   }
   label {
-    font-size: 1.05em;
+    font-size: 1em;
   }
 }
 
@@ -1833,6 +1770,47 @@ table#user-badges {
   }
 }
 
+.watched-word-box {
+  display: inline-block;
+  width: 250px;
+  margin-bottom: 1em;
+  float: left;
+}
+
+.watched-words-list {
+  margin-top: 40px;
+}
+.watched-word {
+  display: inline-block;
+  cursor: pointer;
+  .d-icon {
+    margin-right: 0.25em;
+    color: dark-light-diff($primary, $secondary, 50%, -50%);
+  }
+  &:hover .d-icon {
+    color: $primary;
+  }
+}
+.watched-word-form {
+  display: inline-block;
+  .success-message {
+    margin-left: 1em;
+  }
+}
+.watched-words-uploader {
+  float: right;
+  text-align: right;
+  .instructions {
+    font-size: .857em;
+  }
+}
+.watched-words-detail {
+  .about {
+    margin-top: 24px;
+    margin-bottom: 40px;
+  }
+}
+
 // Mobile specific styles
 // Mobile view text-inputs need some padding
 .mobile-view .admin-contents {
@@ -1855,18 +1833,6 @@ table#user-badges {
   left: -100%;
 }
 
-.mobile-view .admin-flags {
-  .flaggers {
-    padding: 2px;
-    .avatar {
-      padding: 0;
-    }
-  }
-  tr.message td {
-    padding-left: 8px;
-  }
-}
-
 
 
 .cboxcontainer {
@@ -1918,11 +1884,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 9a62dcff91..d39b9ababe 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -1,16 +1,20 @@
 // Customise area
-.customize {
+.admin-customize {
   h1 {
     margin-bottom: 10px;
     input {
       margin-bottom: 0;
+      font-size: 1rem;
+    }
+    .btn-small {
+      font-size: 1rem;
     }
   }
 
   .field-error {
     margin-top: 10px;
     margin-bottom: 10px;
-    background-color: dark-light-diff($quaternary, $secondary, 70%, -70%);
+    background-color: $quaternary-low;
     padding: 5px;
   }
 
@@ -35,7 +39,7 @@
   .select2-chosen, .color-schemes li {
     .fa {
       margin-right: 6px;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
   }
   .show-current-style {
@@ -88,21 +92,27 @@
     }
 
     .nav.target {
+      margin-top: 15px;
+
       li {
         position: relative;
+
+        a {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+        }
       }
-      margin-top: 15px;
+
       .fa {
-        margin-left: 3px;
+        margin-left: 8px;
       }
-      li.mobile a {
-        padding-right: 25px;
-      }
-      .fa-mobile {
-        position: absolute;
-        right: 10px;
-        top: 3px;
+
+      .d-icon-mobile {
+        position: relative;
+        top: -3px;
         font-size: 1.5em;
+        max-height: 20px;
       }
     }
 
@@ -173,7 +183,7 @@
     td.actions     { width: 200px; }
     .hex-input     { width: 80px; margin-bottom: 0; }
     .hex           { text-align: center; }
-    .description   { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
+    .description   { color: dark-light-choose($primary-medium, $secondary-medium); }
 
     .invalid .hex input {
       background-color: white;
@@ -184,7 +194,7 @@
 
   .status-message {
     display: block;
-    font-size: 0.8em;
+    font-size: 0.857em;
     margin-top: 8px;
   }
 
@@ -210,4 +220,3 @@
     margin-top: 20px;
   }
 }
-
diff --git a/app/assets/stylesheets/common/admin/flagging.scss b/app/assets/stylesheets/common/admin/flagging.scss
new file mode 100644
index 0000000000..4574540c2a
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/flagging.scss
@@ -0,0 +1,207 @@
+.flagged-post.hidden-post {
+  .flagged-post-excerpt, .flagged-post-avatar {
+    opacity: 0.5;
+  }
+}
+
+.flagged-post.deleted {
+  .flagged-post-excerpt, .flagged-post-avatar {
+    background-color: $danger-low;
+  }
+}
+
+.flagged-post {
+  padding: 1em 0 0.55em 0;
+  border-bottom: 1px solid $primary-low;
+
+  .flagged-post-details {
+    display: flex;
+
+    .flagged-post-avatar {
+      margin-right: 1em;
+      position: relative;
+
+      img.avatar {
+        min-width: 45px;
+      }
+
+      .edited-after {
+        text-align: center;
+        margin-top: 0.5em;
+      }
+
+      .previous-flagged-posts {
+        position: absolute;
+        right: -5px;
+        top: -5px;
+        background-color: $danger;
+      }
+    }
+
+    .flagged-post-contents {
+      width: 100%;
+      word-wrap: break-word;
+
+      .flagged-post-user-details {
+        .username {
+          font-weight: bold;
+          color: $primary;
+        }
+        margin-bottom: 0.5em;
+      }
+
+      .d-icon {
+        display: inline-block;
+      }
+      h3 {
+        margin-top: 0;
+        margin-bottom: 0.5em;
+      }
+      p:last-child {
+        margin-bottom: 0;
+      }
+      margin-right: 1em;
+    }
+  }
+
+  .flag-user-lists {
+    display: flex;
+    align-items: flex-start;
+    margin-top: 1em;
+  }
+
+  .user-list-title {
+    font-weight: bold;
+    margin: 0;
+  }
+
+  .flag-users {
+    margin: 0.5em 0;
+    display: flex;
+    flex-wrap: wrap;
+  }
+
+  .flag-user {
+    display: flex;
+    margin-bottom: 1em;
+    margin-right: 2em;
+    align-items: center;
+    justify-content: space-between;
+
+    .flag-user-who {
+      display: flex;
+      width: 13em;
+    }
+    .flag-user-username {
+      font-weight: bold;
+      margin-right: 0.5em;
+    }
+    .flag-user-date {
+      color: $primary-medium;
+    }
+
+    .flag-user-avatar {
+      margin-right: 0.5em;
+    }
+  }
+
+  .flag-conversation {
+    padding: 1em;
+
+    .reply-conversation {
+      margin-left: 32px;
+    }
+  }
+
+  .suspended-message {
+    padding: 0.5em;
+    background-color: $danger;
+    margin-bottom: 1em;
+    color: $secondary;
+  }
+
+  .flagged-post-message {
+    padding: 0.5em 1em;
+    margin: 0.5em 0;
+    background-color: $highlight-medium;
+
+    .text {
+      margin-right: 1em;
+    }
+
+    &:hover {
+      background-color: dark-light-choose($highlight-low, $highlight-medium);
+    }
+  }
+
+  .flagged-post-response {
+    display: flex;
+    align-items: center;
+    margin-bottom: 0.5em;
+
+    .response-avatar {
+      margin-right: 0.5em;
+    }
+
+    .has-more {
+      margin-left: 1em;
+    }
+  }
+
+  .flagged-post-controls {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    justify-content: flex-start;
+
+    button {
+      margin-right: 0.5em;
+      margin-bottom: 0.5em;
+    }
+  }
+}
+
+.flag-counts {
+  display: inline-block;
+  margin-right: 0.5em;
+
+  .type-count {
+    color: $primary-medium;
+    font-size: 0.857em;
+  }
+}
+
+.flagged-topic {
+  td.topic-title {
+    width: 400px;
+    a {
+      width: 400px;
+      display: inline-block;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+    }
+  }
+}
+
+.flagged-topic-details {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 2em;
+}
+
+.mobile-view {
+  .flagged-posts {
+    .flagged-post {
+      .flag-user-lists {
+        display: block;
+      }
+    }
+  }
+}
+
+.show-details {
+  .d-icon {
+    padding-right: 0.25em;
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/moderation_history.scss b/app/assets/stylesheets/common/admin/moderation_history.scss
new file mode 100644
index 0000000000..aac258b92e
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/moderation_history.scss
@@ -0,0 +1,32 @@
+.moderation-history {
+  width: 100%;
+  th {
+    text-align: left;
+  }
+  td.date {
+    padding-right: 1em;
+  }
+  td, th {
+    padding-bottom: 0.5em;
+    vertical-align: top;
+  }
+  .history-item-action {
+    .action-details {
+      margin: 1em 0;
+      color: $primary-medium;
+      white-space: pre-wrap;
+      line-height: 1em;
+      width: 300px;
+    }
+  }
+
+  .history-item-actor {
+    a {
+      display: flex;
+      align-items: center;
+      span {
+        margin-left: 0.5em;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/admin/suspend.scss b/app/assets/stylesheets/common/admin/suspend.scss
new file mode 100644
index 0000000000..efdfb68f79
--- /dev/null
+++ b/app/assets/stylesheets/common/admin/suspend.scss
@@ -0,0 +1,23 @@
+.suspend-user-modal {
+
+  .until-controls {
+    margin-bottom: 1em;
+  }
+
+  .suspend-reason {
+    width: 100%;
+  }
+
+  .suspend-reason-label, .suspend-message-label {
+    margin-bottom: 0.5em;
+  }
+
+  .textarea, input[type=text] {
+    box-sizing: border-box;
+    height: 2.5em;
+  }
+
+  .inline-spinner {
+    float: right;
+  }
+}
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index cb1bccb1fc..57121a834b 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -8,16 +8,39 @@
 }
 
 .list-controls {
-  #navigation-bar {
-    .has-icon span:before {
-      margin-right: 4px;
-      font: 1.071em/0.9 "FontAwesome";
+  .select-kit {
+    align-self: center;
+
+    &.categories-admin-dropdown, &.category-notifications-button, &.tag-notifications-button {
+      float: right;
     }
   }
 }
 
-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%);}
+.topic-list-item.visited,
+.latest-topic-list-item.visited,
+.category-topic-link.visited {
+  a.title:not(.badge-notification) { color: $primary-medium; }
+}
+
+.topic-list-main-link {
+  font-size: 1.143em;
+  a.title {
+    padding: 15px 0;
+    word-break: break-word;
+    color: $primary;
+  }
+
+  .anon & {
+    a.title:visited:not(.badge-notification) {
+      color: $primary-medium;
+    }
+  }
+
+  a.title.visited:not(.badge-notification) {
+    color: $primary-medium;
+  }
+}
 
 .topic-list {
   width: 100%;
@@ -28,7 +51,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;
@@ -43,7 +66,7 @@ html.anon .topic-list a.title:visited:not(.badge-notification) {color: dark-ligh
     border: none;
 
     td {
-      border-bottom: 1px solid scale-color($danger, $lightness: 60%);
+      border-bottom: 1px solid $danger-low;
       line-height: 0.1em;
       padding: 0px;
       text-align: center;
@@ -51,14 +74,14 @@ html.anon .topic-list a.title:visited:not(.badge-notification) {color: dark-ligh
 
     td span {
       background-color: $secondary;
-      color: scale-color($danger, $lightness: 60%);
+      color: $danger-low;
       padding: 0px 8px;
       font-size: 0.929em;
     }
   }
 
   > tbody > tr:first-of-type {
-    border-top: 3px solid dark-light-diff($primary, $secondary, 90%, -75%);
+    border-top: 3px solid $primary-low;
   }
 
   th,
@@ -69,23 +92,19 @@ html.anon .topic-list a.title:visited:not(.badge-notification) {color: dark-ligh
 
   }
   th {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
     font-size: 1em;
-    button i.fa {color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));}
+    button .d-icon {color: dark-light-choose($primary-medium, $secondary-medium);}
 
   }
   td {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     font-size: 1em;
   }
 
   .main-link {
-    font-size: 1.143em;
-    a.title {
-      padding: 15px 0;
-      word-break: break-word;
-    }
+    @extend .topic-list-main-link;
   }
 
   .topic-featured-link {
@@ -95,7 +114,7 @@ html.anon .topic-list a.title:visited:not(.badge-notification) {color: dark-ligh
   .topic-excerpt {
     font-size: 0.929em;
     margin-top: 8px;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     word-wrap: break-word;
     line-height: 1.4;
     padding-right: 20px;
@@ -140,7 +159,7 @@ html.anon .topic-list a.title:visited:not(.badge-notification) {color: dark-ligh
 
   .category .badge-notification {
     background-color:transparent;
-    color: scale-color($primary, $lightness: 50%);
+    color: $primary-medium;
   }
 
   .subcategories .badge {
@@ -155,7 +174,7 @@ html.anon .topic-list a.title:visited:not(.badge-notification) {color: dark-ligh
   }
   td.stats {
     .unit {
-      font-size: 11px;
+      font-size: .857em;
     }
   }
 
@@ -197,8 +216,8 @@ html.anon .topic-list a.title:visited:not(.badge-notification) {color: dark-ligh
     background-color: transparent;
     padding: 0;
     border: 0;
-    color: scale-color($danger, $lightness: 20%);
-    font-size: 0.929em;
+    color: $danger-medium;
+    font-size: 1em;
     cursor: default;
   }
 }
@@ -238,7 +257,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;
 
@@ -247,8 +266,8 @@ ol.category-breadcrumb {
     overflow:hidden;
     margin-bottom: 0;
   }
-  a.badge-category {
-    font-size: 0.929em;
+  a.badge-category, .dropdown-header {
+    font-size: 0.857em;
     font-weight: bold;
     float: none;
     text-transform: none;
@@ -257,7 +276,7 @@ ol.category-breadcrumb {
   }
 }
 
-.fa-thumb-tack.unpinned {
+.d-icon-thumb-tack.unpinned {
   @include fa-icon-rotate(180deg, 1);
   color: $primary;
   /* because it is rotated, right becomes left! */
@@ -277,12 +296,12 @@ ol.category-breadcrumb {
     float: left;
     margin: 5px 0 10px;
     .top-date-string {
-      font-size: 0.7em;
+      font-size: 0.857em;
     }
   }
 
   .top-date-string {
-    color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+    color: dark-light-choose($primary-medium, $secondary-high);
     font-weight: normal;
     text-transform: uppercase;
   }
@@ -299,8 +318,8 @@ ol.category-breadcrumb {
 
     @include unselectable;
 
-    font-size: 1.2em;
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    font-size: 1.143em;
+    border: 1px solid $primary-low;
     padding: 5px;
     background: $secondary;
     position: absolute;
@@ -323,10 +342,10 @@ ol.category-breadcrumb {
         }
         .top-date-string {
           font-weight: normal;
-          font-size: 0.8em;
+          font-size: 0.857em;
         }
         &:hover {
-          background-color: dark-light-diff($highlight, $secondary, 50%, -70%);
+          background-color: $highlight-medium;
         }
       }
     }
@@ -342,5 +361,15 @@ ol.category-breadcrumb {
 }
 
 div.education {
-  color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+  color: dark-light-choose($primary-medium, $secondary-medium);
+}
+
+.list-cell {
+  padding: 12px 5px;
+  color: dark-light-choose($primary-medium, $secondary-high);
+}
+
+.table-heading {
+  @extend .list-cell;
+  border-bottom: 2px solid $primary-low;
 }
diff --git a/app/assets/stylesheets/common/base/activation.scss b/app/assets/stylesheets/common/base/activation.scss
index f82913205a..b6f45361d8 100644
--- a/app/assets/stylesheets/common/base/activation.scss
+++ b/app/assets/stylesheets/common/base/activation.scss
@@ -10,7 +10,7 @@
 
   .account-created {
     .ac-message {
-      font-size: 16px;
+      font-size: 1.143em;
       line-height: 24px;
     }
 
diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss
index 2afb3d10ed..397c7c9da8 100644
--- a/app/assets/stylesheets/common/base/alert.scss
+++ b/app/assets/stylesheets/common/base/alert.scss
@@ -1,6 +1,6 @@
 .alert {
   padding: 8px 35px 8px 14px;
-  background-color: scale-color($danger, $lightness: 75%);
+  background-color: $danger-low;
   color: #c09853;
 
   .close {
@@ -30,15 +30,15 @@
     -webkit-appearance: none;
   }
   &.alert-success {
-    background-color:  dark-light-diff($success, $secondary, 50%, -60%);
+    background-color:  $success-medium;
     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 477448dcda..1e01b6268d 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;
   }
@@ -69,8 +75,8 @@
   .description {
     padding: 0 1em 1em 1em;
     text-align: center;
-    font-size: 1.05em;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
+    font-size: 1em;
+    color: dark-light-choose($primary-medium, $secondary-high);
     .overflow {
       max-height: 6em;
       overflow: hidden;
@@ -79,19 +85,13 @@
   }
 
   h3 {
-    font-size: 1.2em;
+    font-size: 1.286em;
     margin-bottom: 0.5em;
     margin-top: 0.25em;
     line-height: 1.1em;
     text-align: center;
     color: $primary;
   }
-
-  &.no-logos {
-    .category-box a {
-      padding: 3em 1em;
-    }
-  }
 }
 
 .category-boxes-with-topics {
@@ -102,7 +102,7 @@
   }
 
   h3 {
-    font-size: 1.2em;
+    font-size: 1.286em;
     text-align: center;
   }
 
diff --git a/app/assets/stylesheets/common/base/code_highlighting.scss b/app/assets/stylesheets/common/base/code_highlighting.scss
index 763d7088a2..e8742feb4d 100644
--- a/app/assets/stylesheets/common/base/code_highlighting.scss
+++ b/app/assets/stylesheets/common/base/code_highlighting.scss
@@ -41,7 +41,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
 .hljs-name,
 .coffeescript .hljs-params,
 .scss .hljs-meta {
-  color: #900;
+  color: dark-light-choose(#d14, #f99);
   font-weight: bold;
 }
 
diff --git a/app/assets/stylesheets/common/base/colorpicker.scss b/app/assets/stylesheets/common/base/colorpicker.scss
index 6bcf8ae659..83f29f7853 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
deleted file mode 100644
index cd9f44b52c..0000000000
--- a/app/assets/stylesheets/common/base/combobox.scss
+++ /dev/null
@@ -1,88 +0,0 @@
-.select2-results .select2-highlighted {
-    background: dark-light-diff($highlight, $secondary, 50%, -80%);
-    color: $primary;
-}
-
-.category-combobox, .select2-drop {
-
-  .badge-category {
-    display: inline-block;
-  }
-  .topic-count {
-    font-size: 11px;
-    color: $primary;
-    display: inline-block;
-  }
-  .highlighted .topic-count, .select2-highlighted .category-desc {
-    color: $primary;
-  }
-  .category-desc {
-    color: $primary;
-    font-size: 0.857em;
-    line-height: 16px;
-  }
-}
-
-.select2-drop {
-  background: $secondary;
-  i.fa {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-  }
-}
-
-.select2-search input {
-  background: image-url("select2.png") no-repeat 100% -22px, $secondary 0 0
-}
-
-.select2-container {
-  border-radius: 3px;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-  min-width: 200px;
-
-  &.select2-dropdown-open {
-    border: 0;
-    margin-bottom: 2px;
-  }
-  &.select2-container-active {
-    border-color: $tertiary;
-  }
-  &.select2-container-disabled .select2-chosen {
-    color: blend-primary-secondary(50%);
-  }
-}
-
-.select2-container-multi .select2-choices {
-  background-color: $secondary;
-}
-.select2-container-multi .select2-choices .select2-search-field input.select2-active {
-  background: $secondary image-url("select2-spinner.gif") no-repeat 100% !important;
-}
-
-.select2-container a.select2-choice {
-  background: $secondary;
-  border-radius: 3px;
-  border-color: $secondary;
-  color: $primary;
-}
-
-.select2-dropdown-open a.select2-choice {
-  box-shadow: none;
-  border-radius: 3px 3px 0 0;
-  border-color: $tertiary;
-}
-.select2-drop {
-  color: dark-light-diff($primary, $secondary, -50%, 50%);
-}
-.select2-drop-active {
-  border: 1px solid $tertiary;
-  border-top: 0;
-}
-
-.select2-container-active {
-  box-shadow:  $tertiary 0px 0px 6px 0px;
-}
-
-.select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-selection-limit {
-  background: $secondary;
-  color: $primary;
-}
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 9f86c23d94..a5fe8a86ee 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -1,21 +1,293 @@
+#reply-control {
+  position: fixed;
+  display: flex;
+  flex-direction: column;
+  bottom: 0;
+  height: 0;
+  right: 0;
+  left: 0;
+  margin-left: auto;
+  margin-right: auto;
+  max-width: 1475px;
+  width: 100%;
+  &.hide-preview {
+    max-width:740px;  
+  }
+  @media screen and (max-width: 1200px) {
+    min-width: 0;
+  }
+  z-index: 999;
+  transition: height 250ms ease, background 250ms ease, transform 250ms ease, max-width 250ms ease;
+  background-color: $secondary;
+  box-shadow: 0 -1px 40px rgba(0,0,0, .12);
+
+  .reply-area {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .saving-text,
+  .draft-text {
+    display: none;
+    padding-left: 10px;   
+    .spinner {
+      margin-left: 5px;
+      border-color: $secondary;
+      border-right-color: transparent;
+    }
+    i {
+      color: $secondary;
+    }
+  }
+
+  &.open {
+    height: 300px;
+    &.edit-title {
+      height: 400px; // more room when editing the title
+    }
+  }
+
+  &.closed {
+    height: 0 !important;
+  }
+
+  &.draft,
+  &.saving {
+    height: 40px !important;
+    align-items: center;
+    background: $tertiary;
+    color: $secondary;
+    flex-direction: row;
+    width: 100%;
+    .composer-controls {
+      margin-left: auto;
+      display: flex;
+      padding-right: 5px;
+      .toggle-toolbar {
+        display: none;
+      }
+      .d-icon {
+        opacity: 1;
+      }
+    }
+  }
+
+  &.draft {
+    cursor: pointer;
+    display: flex;
+    .draft-text {
+      display: block;
+    }
+    .grippie, .saving-text {
+      display: none;
+    }
+  }
+
+  &.saving .saving-text {
+    display: flex;
+  }
+
+  .reply-to {
+    color: $primary-medium;
+    margin: 5px 0 10px 0;
+    display: flex;
+    align-items: center;
+    i {
+      color: $primary-medium;
+    }
+    .reply-details {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      max-width: calc(100% - 100px);
+    }
+    .composer-controls {
+      margin-left: auto;
+      margin-right: -5px;
+      button {
+        padding: 0 8px;
+      }
+    }
+  }
+
+  .whisper,
+  .display-edit-reason {
+    font-style: italic;
+  }
+
+  #edit-reason {
+    margin: 4px;
+  }
+
+  .user-selector,
+  .title-and-category {
+    display: flex;
+    flex-wrap: wrap;
+    width: 100%;
+    align-items: center;
+    margin-bottom: 5px;
+    position: relative;
+    &.with-preview {
+      width: 50%;
+    }
+  }
+
+  .title-input {
+    position: relative;
+    display: flex;
+    flex: 1 1 50%;
+
+    input {
+      flex-grow: 1;
+    }
+  }
+
+  .with-tags {
+    .title-input {
+      flex: 1 1 100%;
+    }
+  }
+
+  .category-input {
+    display: flex;
+    flex: 1 0 35%;
+    margin: 0 0 5px 10px;
+    @media screen and (max-width: 955px) {
+      flex: 1 0 100%;
+      margin-left: 0;
+    }
+    .category-chooser {
+      display: flex;
+      flex: 1;
+      width: auto;
+    }
+  }
+
+  .with-tags {
+    .category-input {
+      flex-basis: 25%;
+      margin-left: 0;
+    }
+  }
+
+  .add-warning {
+    margin-left: 1em;
+    display: flex;
+    input {
+      margin-right: 5px;
+    }
+  }
+
+  #reply-title {
+    padding: 6px 10px;
+    margin: 0 0 5px 0;
+    flex-basis: 50%;
+  }
+
+  .tag-chooser {
+    flex: 1 1 25%;
+    margin: 0 0 5px 10px;
+    border: 1px solid $primary-medium;
+    background: $secondary;
+    @media all and (max-width: 900px) {
+      margin: 0;
+      flex: 1 1 100%;
+    }
+    .select2-choices {
+      border: none;
+    }
+    &.select2-dropdown-open, &.select2-container-active {
+      border-color: $tertiary;
+    }
+  }
+
+  .wmd-controls {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    flex-grow: 1;
+    min-height: 0;
+  }
+
+  .d-editor-button-bar .btn {
+    padding: 3px 8px;
+    @media all and (max-width: 800px) {
+      padding: 5px;
+    }
+  }
+
+  .submit-panel {
+    display: flex;
+    flex-shrink: 0;
+    margin-top: 10px;
+  }
+
+  .save-or-cancel {
+    flex-basis: 50%;
+    display: flex;
+    align-items: center;
+    button {
+      flex: 0 0 auto;
+    }
+    .cancel {
+      margin-left: 10px;
+    }
+    #draft-status,
+    #file-uploading {
+      margin-left: 25px;
+    }
+    #file-uploading {
+      display: flex;
+      a {
+        margin-left: 5px;
+        color: $primary-medium;
+      }
+      .spinner {
+        margin-right: 5px;
+      }
+    }
+  }
+
+  .composer-bottom-right {
+    flex-basis: 50%;
+    display: flex;
+    flex-direction: row-reverse;
+    .toggle-preview {
+      order: 2;
+    }
+  }
+
+  .create {
+    margin-right: 5px;
+  }
+
+  #draft-status, #file-uploading {
+    color: $primary-medium;
+  }
+}
+
+.cooked > *:first-child {
+  margin-top: 0;
+}
+
 .autocomplete {
   z-index: 999999;
   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;
     margin: 0;
 
     li {
-      .fa-users {
+      .d-icon-users {
         color: lighten($primary, 40%);
         padding: 0 2px;
       }
 
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid $primary-low;
 
       a {
         padding: 5px;
@@ -25,17 +297,17 @@
         text-overflow: ellipsis;
 
         span.username {
-          color: darken($primary, 40%);
+          color: $primary;
         }
         span.name {
-          font-size: 11px;
+          font-size: .857em;
           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;
         }
       }
@@ -43,34 +315,6 @@
   }
 }
 
-#reply-control {
-  .d-editor-textarea-wrapper .spinner {
-    z-index: 1000;
-    margin-top: 5em;
-  }
-
-  .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%);
-    height: 33px;
-  }
-
-  textarea {
-    box-shadow: none;
-  }
-}
-
-
-.saving-text .spinner {
-  display: inline-block;
-  left: 5px;
-  top: 4px;
-}
-
 div.ac-wrap.disabled {
   input {
     display:none;
@@ -82,16 +326,16 @@ div.ac-wrap.disabled {
 
 div.ac-wrap div.item a.remove, .remove-link {
   margin-left: 4px;
-  font-size: 11px;
+  font-size: .857em;
   line-height: 10px;
   padding: 1.5px 1.5px 1.5px 2.5px;
   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%);
+    background-color: $danger-low;
+    border: 1px solid $danger-medium;
     text-decoration: none;
     color: $danger;
   }
@@ -101,8 +345,8 @@ div.ac-wrap {
   overflow: auto;
   max-height: 150px;
   background-color: $secondary;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-  padding: 5px 4px 1px 4px;
+  border: 1px solid $primary-medium;
+  padding: 5px 4px 1px 10px;
   div.item {
     float: left;
     margin-bottom: 4px;
@@ -133,48 +377,12 @@ div.ac-wrap {
   }
 }
 
-.auto-update-input {
+.future-date-input {
   .examples {
-    color: lighten($primary, 40%);
+    color: $primary-medium;
   }
 }
 
-#reply-control {
-  .composer-loading {
-    position: absolute;
-    left: 48%;
-    top: 20%;
-  }
-  .whisper {
-    margin-left: 1em;
-    font-style: italic;
-  }
-}
-
-#reply-control.topic-featured-link-only.open {
-  .wmd-controls { display: none; }
-}
-
-#cancel-file-upload {
-  font-size: 1.6em;
-}
-
-#draft-status, #file-uploading {
-  color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-}
-
-.composer-bottom-right {
-  .spinner.small {
-    width: 6px;
-    height: 6px;
-  }
-}
-
-// this removes the topmost margin from the first element in the topic post
-// if we don't do this, all posts would have extra space at the top
-.d-editor-preview > *:first-child {
-  margin-top: 0;
-}
-.cooked > *:first-child {
-  margin-top: 0;
-}
+.md-table {
+  overflow-y: auto;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/common/base/d-icon.scss b/app/assets/stylesheets/common/base/d-icon.scss
new file mode 100644
index 0000000000..bc7c952626
--- /dev/null
+++ b/app/assets/stylesheets/common/base/d-icon.scss
@@ -0,0 +1,11 @@
+.d-icon.d-icon-d-regular,
+.d-icon.d-icon-d-muted,
+.d-icon.d-icon-d-watching-first,
+.d-icon.d-icon-d-watching-first-post {
+  color: dark-light-choose($primary-medium, $secondary-medium);
+}
+
+.d-icon.d-icon-d-tracking,
+.d-icon.d-icon-d-watching {
+  color: $tertiary;
+}
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index 6af69033aa..c9092a03b7 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,20 +26,20 @@
     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%);
+        font-size: 1.429em;
+        color: $primary-medium; 
       }
     }
 
     tr.me {
       td {
-        background-color: dark-light-diff($highlight, $secondary, 70%, -80%);
+        background-color: dark-light-choose($highlight-low, $highlight-medium);
 
         .username a, .name, .title, .number, .time-read {
-          color: dark-light-choose(scale-color($highlight, $lightness: -50%), scale-color($highlight, $lightness: 50%));
+          color: $primary-medium;           
         }
       }
     }
@@ -49,16 +49,16 @@
       white-space: nowrap;
 
       width: 13%;
-      i.fa-heart {
+      .d-icon-heart {
         color: $love;
         margin-right: 0.5em;
       }
-      i.fa-chevron-down, i.fa-chevron-up {
+      .d-icon-chevron-down, .d-icon-chevron-up {
         margin-left: 0.5em;
       }
 
       &: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 1aeaf7cfe3..ce410bfb13 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -1,7 +1,247 @@
+// Common
+// global styles that apply to the Discourse application specifically
+// BEWARE: changing these styles implies they take effect anywhere they are seen
+// throughout the Discourse application
+
+// Animation Keyframes
+@keyframes ping {
+  from {
+    transform: scale(0.25);
+    opacity: 1;
+  }
+  to {
+    transform: scale(2);
+    opacity: 0;
+  }
+}
+
+@keyframes rotate-forever {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+@keyframes background-fade-highlight {
+  0% {
+    background-color: $tertiary-low;
+  }
+  100% {
+    background-color: transparent;
+  }
+}
+
+// Base Elements
+html {
+  height: 100%;
+}
+
+body {
+  background-attachment: fixed;
+  background-size: cover;
+  min-height: 100%;
+
+  @include clearfix;
+}
+
+big {
+  font-size: 2.286em;
+}
+
+small {
+  font-size: .786em;
+}
+
+//setting a static limit on big and small prevents nesting abuse
+blockquote {
+  @include post-aside;
+  clear: both;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin-top: 0;
+  margin-bottom: .5rem;
+}
+
+button {
+  &.ok {
+    background: $success;
+    color: $secondary;
+
+    @include hover {
+      background: lighten($success, 10%);
+      color: $secondary;
+    }
+  }
+
+  &.cancel {
+    background: $danger;
+    color: $secondary;
+
+    @include hover {
+      background: lighten($danger, 10%);
+      color: $secondary;
+    }
+  }
+}
+
+ul.breadcrumb {
+  margin: 0 10px 0 10px;
+}
+
+a.no-href {
+  cursor: pointer;
+}
+
 img.avatar {
   border-radius: 50%;
 }
 
+// don't wrap relative dates; we want Jul 26, '15, not: Jul
+//                                                      26,
+//                                                      '15
+span.relative-date {
+  white-space:nowrap;
+}
+
+label {
+  display: block;
+  margin-bottom: 5px;
+}
+
+input {
+  &[type="radio"],
+  &[type="checkbox"] {
+    margin: 3px 0;
+    line-height: normal;
+    cursor: pointer;
+  }
+  &[type="submit"],
+  &[type="reset"],
+  &[type="button"],
+  &[type="radio"],
+  &[type="checkbox"] {
+    width: auto;
+  }
+
+  &.invalid {
+    background-color: dark-light-choose($danger-low, scale-color($danger, $lightness: -60%));
+  }
+
+  .radio &[type="radio"],
+  .checkbox &[type="checkbox"] {
+    float: left;
+    margin-left: -18px;
+  }
+}
+
+input,
+select,
+textarea {
+  color: $primary;
+
+  &[class*="span"] {
+    float: none;
+    margin-left: 0;
+  }
+
+  &[disabled],
+  &[readonly] {
+    cursor: not-allowed;
+    background-color: $primary-low;
+    border-color: $primary-low;
+  }
+
+  &:focus:required:invalid {
+    color: $danger;
+    border-color: $danger;
+  }
+
+  &:focus:required:invalid:focus {
+    border-color: $danger;
+    box-shadow: 0 0 6px $danger;
+  }
+}
+
+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"] {
+    @include appearance-none;
+    display: inline-block;
+    height: 18px;
+    padding: 4px 10px;
+    margin-bottom: 9px;
+    font-size:  1em;
+    line-height: 1.25;
+    color: $primary;
+    background-color: $secondary;
+    border: 1px solid $primary-medium;
+    border-radius: 0;
+    &:focus {
+      border-color: $tertiary;
+      box-shadow: $tertiary 0px 0px 6px 0px;
+      outline: 0;
+    }
+  }
+}
+
+textarea {
+  height: auto;
+  background-color: $secondary;
+  border: 1px solid $primary-medium;
+  &:focus {
+    border-color: $tertiary;
+    box-shadow: $tertiary 0px 0px 6px 0px;    
+    outline: 0;
+  }
+}
+
+select {
+  border: 1px solid $primary-low;  
+}
+
+// Common Classes
+.radio,
+.checkbox {
+  min-height: 18px;
+  padding-left: 18px;
+
+  .controls > &:first-child {
+    padding-top: 5px;
+  }
+
+  &.inline {
+    display: inline-block;
+    padding-top: 5px;
+    margin-bottom: 0;
+    vertical-align: middle;
+  }
+}
+
+.radio.inline .radio.inline,
+.checkbox.inline .checkbox.inline {
+  margin-left: 10px;
+}
+
 .container {
   @extend .clearfix;
 }
@@ -11,186 +251,75 @@ img.avatar {
   margin-right: auto;
   margin-left: auto;
   padding: 0 8px;
+
   .contents {
     position: relative;
   }
 }
 
+.boxed {
+  &.white {
+    background-color: $secondary;
+  }
+}
+
 .full-width {
   margin-left: 12px;
 }
 
-big {
-  font-size: 28px;
+// the default for table cells in topic list
+// is $primary-medium
+// numbers get dimmer as they get colder
+.coldmap {
+  &-high {
+  color: dark-light-choose($primary-low-mid, $secondary-high) !important;
+  }
+
+  &-med {
+    color: dark-light-choose($primary-medium, $secondary-high) !important;
+  }
+
+  &-low {
+    color: dark-light-choose($primary-medium, $secondary-medium) !important;
+  }
 }
 
-small {
-  font-size: 9px;
+.top-space {
+  margin-top: 10px;
 }
 
-//setting a static limit on big and small prevents nesting abuse
+.message {
+  @include border-radius-all(8px);
+  background-color: $secondary;
+  padding: 14px;
 
-
-blockquote {
-  @include post-aside;
-  clear: both;
+  h2 {
+    margin-bottom: 20px;
+  }
 }
 
-a.no-href {
-  cursor: pointer;
+.clear-transitions {
+  transition:none !important;
 }
 
-html {
-  height: 100%;
+.tip {
+  display: inline-block;
+  &.good {
+    color: $success;
+  }
+  &.bad {
+    color: $danger;
+  }
 }
 
-body {
-  h1, h2, h3, h4, h5, h6 {
-    margin-top: 0;
-    margin-bottom: .5rem;
-  }
+.avatar-wrapper {
+  background-color: $secondary;
+  display: inline-block;
+  border-radius: 50%;
+}
 
-  background-attachment: fixed;
-  background-size: cover;
-  min-height: 100%;
-
-  @include clearfix;
-
-  button.ok {
-    background: $success;
-    color: $secondary;
-    @include hover {
-      background: lighten($success, 10%);
-      color: $secondary;
-    }
-  }
-  button.cancel {
-    background: $danger;
-    color: $secondary;
-    @include hover {
-      background: lighten($danger, 10%);
-      color: $secondary;
-    }
-  }
-
-  // the default for table cells in topic list
-  // is scale-color($primary, $lightness: 50%)
-  // numbers get dimmer as they get colder
-  .coldmap-high {
-    color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)) !important;
-  }
-  .coldmap-med {
-    color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)) !important;
-  }
-  .coldmap-low {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)) !important;
-  }
-
-  #loading-message {
-    position: absolute;
-    font-size: 2.143em;
-    text-align: center;
-    top: 120px;
-    left: 500px;
-    color: $primary;
-  }
-    .top-space {
-    margin-top: 10px;
-  }
-  ul.breadcrumb {
-    margin: 0 10px 0 10px;
-  }
-
-  .message {
-    @include border-radius-all(8px);
-    background-color: $secondary;
-    padding: 14px;
-
-    h2 {
-      margin-bottom: 20px;
-    }
-  }
-
-  #footer {
-    .container {
-      height: 50px;
-      .contents {
-        padding-top: 10px;
-        a[href] {
-          color: $secondary;
-        }
-      }
-    }
-  }
-
-  .clear-transitions {
-    transition:none !important;
-  }
-
-  .tip {
-    display: inline-block;
-    &.good {
-      color: $success;
-    }
-    &.bad {
-      color: $danger;
-    }
-  }
-
-  input[type].invalid {
-    background-color: dark-light-choose(scale-color($danger, $lightness: 80%), scale-color($danger, $lightness: -60%));
-  }
-
-  .d-editor-input {
-    resize: none;
-  }
-
-  .avatar-wrapper {
-    background-color: $secondary;
-    display: inline-block;
-    border-radius: 50%;
-  }
-
-  .profiler-results.profiler-left {
-    top: 60px !important;
-  }
-
-  label {
-    display: block;
-    margin-bottom: 5px;
-  }
-  input {
-    &[type="radio"], &[type="checkbox"] {
-      margin: 3px 0;
-      line-height: normal;
-      cursor: pointer;
-    }
-    &[type="submit"], &[type="reset"], &[type="button"], &[type="radio"], &[type="checkbox"] {
-      width: auto;
-    }
-  }
-  .radio, .checkbox {
-    min-height: 18px;
-    padding-left: 18px;
-  }
-  .radio input[type="radio"], .checkbox input[type="checkbox"] {
-    float: left;
-    margin-left: -18px;
-  }
-  .controls > {
-    .radio:first-child, .checkbox:first-child {
-      padding-top: 5px;
-    }
-  }
-  .radio.inline, .checkbox.inline {
-    display: inline-block;
-    padding-top: 5px;
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .radio.inline .radio.inline, .checkbox.inline .checkbox.inline {
-    margin-left: 10px;
-  }
+.profiler-results.profiler-left {
+  top: 60px !important;
 }
 
 .flex-center-align {
@@ -201,7 +330,10 @@ body {
 .unread-private-messages {
   color: $secondary;
   background: $success;
-  &.badge-notification[href] {color: $secondary;}
+
+  &.badge-notification[href] {
+    color: $secondary;
+  }
 }
 
 .ring-backdrop-spotlight {
@@ -255,50 +387,12 @@ body {
   -webkit-animation-name: ping;
 }
 
-@-webkit-keyframes ping {
-  from {
-    $scale: 0.25;
-    transform: scale($scale);
-    -ms-transform: scale($scale);
-    -webkit-transform: scale($scale);
-    -o-transform: scale($scale);
-    -moz-transform: scale($scale);
-    opacity: 1;
-  }
-  to {
-    $scale: 2;
-    transform: scale($scale);
-    -ms-transform: scale($scale);
-    -webkit-transform: scale($scale);
-    -o-transform: scale($scale);
-    -moz-transform: scale($scale);
-    opacity: 0;
-  }
-}
-
 .fade {
   opacity: 0;
   transition: opacity 0.15s linear;
-}
 
-.fade.in {
-  opacity: 1;
-}
-
-@-webkit-keyframes rotate-forever {
-  0% {
-    -webkit-transform: rotate(0deg);
-  }
-  100% {
-    -webkit-transform: rotate(360deg);
-  }
-}
-@keyframes rotate-forever {
-  0% {
-    transform: rotate(0deg);
-  }
-  100% {
-    transform: rotate(360deg);
+  &.in {
+    opacity: 1;
   }
 }
 
@@ -314,7 +408,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%;
 
@@ -327,10 +421,9 @@ body {
 }
 
 .content-list {
-
   h3 {
-    color: dark-light-diff($primary, $secondary, 50%, -20%);
-    font-size: 1.071em;
+    color: $primary-medium;
+    font-size: 1.143em;
     padding-left: 5px;
     margin-bottom: 10px;
   }
@@ -339,50 +432,106 @@ body {
     list-style: none;
     margin: 0;
 
-    li:first-of-type {
-      border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-    }
     li {
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-    }
+      border-bottom: 1px solid $primary-low;
 
-    li a {
-      display: block;
-      padding: 10px;
-      color: $primary;
-
-      &:hover {
-        background-color: dark-light-diff($primary, $secondary, 90%, -60%);
-        color: $primary;
+      &:first-of-type {
+        border-top: 1px solid $primary-low;
       }
 
-      &.active {
-        font-weight: bold;
+      a {
+        display: block;
+        padding: 10px;
         color: $primary;
+
+        &:hover {
+          background-color: $primary-low;
+          color: $primary;
+        }
+
+        &.active {
+          font-weight: bold;
+          color: $primary;
+        }
       }
     }
   }
 }
 
-// don't wrap relative dates, we want
-//
-// Jul 26, '15
-//
-// not
-//
-// Jul
-// 26,
-// '15
-//
-span.relative-date {
-  white-space:nowrap;
+.form-vertical {
+  input,
+  textarea,
+  select,
+  .input-prepend,
+  .input-append {
+    display: inline-block;
+    margin-bottom: 0;
+  }
+
+  .control-group {
+    @include clearfix;
+  }
+
+  .control-label {
+    font-weight: bold;
+    font-size: 1.286em;
+    line-height: 2;
+  }
+
+  .controls {
+    margin-left: 0;
+  }
 }
 
-@keyframes background-fade-highlight {
-  0% {
-    background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+// Special elements
+// Special elements
+#main {
+  img.avatar {
+    &.header {
+      width: 45px;
+      height: 45px;
+    }
+
+    &.medium {
+      width: 32px;
+      height: 32px;
+    }
+
+    &.small {
+      width: 25px;
+      height: 25px;
+    }
+
+    &.tiny {
+      width: 20px;
+      height: 20px;
+    }
   }
-  100% {
-    background-color: transparent;
+
+  .user-list {
+    .user {
+      padding-bottom: 5px;
+    }
+  }
+}
+
+#loading-message {
+  position: absolute;
+  font-size: 2.286em;
+  text-align: center;
+  top: 120px;
+  left: 500px;
+  color: $primary;
+}
+
+#footer {
+  .container {
+    height: 50px;
+    .contents {
+      padding-top: 10px;
+      a[href] {
+        color: $secondary;
+      }
+    }
   }
 }
diff --git a/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss b/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
index 25195f0edb..c842e1f711 100644
--- a/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
+++ b/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
@@ -3,20 +3,34 @@
     max-height: none;
   }
 
+  .select-kit {
+    width: 50%;
+  }
+
   input.date-picker, input[type="time"] {
     width: 150px;
     text-align: left;
   }
 
+  .radios {
+    margin-bottom: 10px;
+  }
+
   label {
+    vertical-align: middle;
     display: inline-block;
+    padding-right: 5px;
+
+    input {
+      vertical-align: middle;
+    }
   }
 
   .btn.pull-right {
     margin-right: 10px;
   }
 
-  .auto-update-input {
+  .future-date-input {
     input {
       margin: 0;
     }
@@ -35,7 +49,7 @@
 
       h3 {
         font-weight: normal;
-        font-size: 15px;
+        font-size: 1.143em;
       }
     }
   }
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index e97a2d186a..78595461bf 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -1,110 +1,253 @@
-body img.emoji {
+img.emoji {
   width: 20px;
   height: 20px;
   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($header_primary-medium, $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 .d-icon {
+  color: #fff;
+  font-size: 1em;
+  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;
+
+  input[type="text"] {
+    width: auto!important;
+  }
 }
 
-.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 .d-icon-search {
+  color: dark-light-choose($header_primary-medium, $header_primary);
+  font-size: 1.143em;
   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($header_primary-medium, $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/exception.scss b/app/assets/stylesheets/common/base/exception.scss
index c9a7087651..346a833432 100644
--- a/app/assets/stylesheets/common/base/exception.scss
+++ b/app/assets/stylesheets/common/base/exception.scss
@@ -3,20 +3,20 @@
   padding-top: 2em;
 
   .face {
-    font-size: 60px;
+    font-size: 4.286em;
     height: 60px;
   }
   .reason {
-    font-size: 1.714em;
+    font-size: 1.857em;
     height: 24px;
   }
   .url {
     font-style: italic;
-    font-size: 11px;
+    font-size: .857em;
   }
   .desc {
     margin-top: 16px;
-    .fa-check-circle {
+    .d-icon-check-circle {
       color: $success;
     }
   }
diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss
index 5287a777c3..3f04c28bf1 100644
--- a/app/assets/stylesheets/common/base/group.scss
+++ b/app/assets/stylesheets/common/base/group.scss
@@ -4,18 +4,57 @@
   margin-bottom: 15px;
 }
 
+.group-post {
+  .group-post-header {
+    display: flex;
+
+    .group-post-avatar {
+      margin-right: 0.5em;
+    }
+
+    .time,
+    .delete-info {
+      color: lighten($primary, 40%);
+      font-size: 0.857em;
+    }
+
+    .group-member-info {
+      display: flex;
+      color: lighten($primary, 40%);
+    }
+  }
+
+  .group-post-info {
+    display: flex;
+    width: 100%;
+    justify-content: space-between;
+    .group-post-title {
+      font-size: 1.143em;
+    }
+  }
+
+  .group-post-excerpt {
+    margin: 1em 0;
+    word-wrap: break-word;
+    color: $primary;
+  }
+
+  padding: 1em 0;
+  border-bottom: 1px solid $primary-low;
+}
+
 .group-info {
   width: 100%;
 
   .group-info-name {
-    font-size: 1.4em;
+    font-size: 1.429em;
     font-weight: bold;
     color: $primary;
   }
 
   .group-info-full-name {
-    font-size: 1.2em;
-    color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+    font-size: 1.286em;
+    color: dark-light-choose($primary-high, $secondary-low);
   }
 
   span {
@@ -51,7 +90,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 +106,7 @@ table.group-logs {
     cursor: pointer;
 
     i {
-      color: dark-light-diff($primary, $secondary, 50%, -50%);
+      color: blend-primary-secondary(50%);
     }
   }
 }
@@ -77,7 +116,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,10 +129,10 @@ 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%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
   }
 
@@ -104,7 +143,7 @@ table.group-members {
 
     &:hover {
       cursor: pointer;
-      background-color: dark-light-diff($primary, $secondary, 90%, -75%);
+      background-color: $primary-low;
     }
   }
 
@@ -119,7 +158,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;
     }
   }
@@ -165,15 +204,3 @@ table.group-members {
     }
   }
 }
-
-#add-user-to-group {
-  margin: 0px;
-
-  .ac-wrap {
-    width: 100% !important;
-  }
-
-  .add {
-    margin-top: 10px;
-  }
-}
diff --git a/app/assets/stylesheets/common/base/groups.scss b/app/assets/stylesheets/common/base/groups.scss
index f40697b01c..6ea6a1a8c9 100644
--- a/app/assets/stylesheets/common/base/groups.scss
+++ b/app/assets/stylesheets/common/base/groups.scss
@@ -8,21 +8,21 @@
   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;
     }
 
     td.groups-user-count {
-      font-size: 1.2em;
+      font-size: 1.286em;
     }
   }
 
@@ -30,16 +30,16 @@
     .groups-info-name {
       font-weight: bold;
       color: $primary;
-      color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+      color: dark-light-choose($primary-high, $secondary-low);
     }
 
     .groups-info-full-name {
-      color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+      color: dark-light-choose($primary-high, $secondary-low);
     }
 
     .groups-info-title {
-      font-size: 0.9em;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      font-size: 0.857em;
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
 
     span {
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 1991799767..79a23a404c 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -1,153 +1,166 @@
 .d-header {
-    width: 100%;
-    position: absolute;
-    top: 0;
-    z-index: 1001;
-    background-color: $header_background;
-    box-shadow: 0 2px 4px -1px rgba(0,0,0, .25);
+  width: 100%;
+  position: absolute;
+  top: 0;
+  z-index: 1001;
+  background-color: $header_background;
+  box-shadow: 0 2px 4px -1px rgba(0,0,0, .25);
 
-    .docked & {
-      position: fixed;
-      backface-visibility: hidden;  /** do magic for scrolling performance **/
+  .docked & {
+    position: fixed;
+    backface-visibility: hidden;  /** do magic for scrolling performance **/
+  }
+
+  .contents {
+    margin: 8px 0;
+  }
+
+  .title {
+    float: left;
+    a, a:visited {
+      color: $header_primary;
     }
+  }
 
-    .contents {
-      margin: 8px 0;
-    }
+  #site-logo {
+    max-height: 40px;
+  }
 
-    .title {
-      float: left;
-      a, a:visited {
-        color: $header_primary;
-      }
-    }
+  .d-icon-home {
+    font-size: 1.643em;
+  }
 
-    #site-logo {
-      max-height: 40px;
-    }
+  .panel {
+    float: right;
+    position: relative;
+  }
 
-    .fa-home {
-      font-size: 1.643em;
-    }
+  .login-button, button.sign-up-button {
+    float: left;
+    margin-top: 7px;
+    padding: 6px 10px;
+    .fa { margin-right: 3px; }
+  }
 
-    .panel {
-      float: right;
-      position: relative;
-    }
+  button.login-button {
+    margin-left: 7px;
+  }
 
-    .login-button, button.sign-up-button {
-      float: left;
-      margin-top: 7px;
-      padding: 6px 10px;
-      .fa { margin-right: 3px; }
-    }
-
-    button.login-button {
-      margin-left: 7px;
-    }
-
-    .icons {
-      float: right;
-      text-align: center;
-      margin: 0 0 0 5px;
-      list-style: none;
-
-      > li {
-        float: left;
-      }
-      .icon {
-        display: block;
-        padding: 3px;
-        color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
-        text-decoration: none;
-        cursor: pointer;
-        border-top: 1px solid transparent;
-        border-left: 1px solid transparent;
-        border-right: 1px solid transparent;
-        transition: all linear .15s;
-
-
-        &:hover {
-          color: $primary;
-          background-color:  dark-light-diff($primary, $secondary, 90%, -60%);
-          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%);
-        }
-      }
-      .drop-down-visible & {
-        .active .icon {
-          position: relative;
-          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%);
-
-          .badge-notification {
-            top: -10px;
-          }
-
-          .flagged-posts {
-            right: 24px;
-          }
-
-          &:after {
-            display: block;
-            position: absolute;
-            top: 100%;
-            left: 0;
-            z-index: 1101;
-            width: 100%;
-            height: 0;
-            content: "";
-            border-top: 1px solid $secondary;
-          }
-          &:hover {
-            border-bottom: none;
-          }
-        }
-      }
-      [class^="fa fa-"] {
-        width: 32px;
-        height: 32px;
-        font-size: 1.714em;
-        line-height: 32px;
-        display: inline-block;
-      }
-      .notifications {
-        position: relative;
-      }
-      .badge-notification, .ring {
-        position: absolute;
-        top: -9px;
-        z-index: 1;
-        margin-left: 0;
-      }
-      .unread-notifications {
-        right: 0;
-        background-color: scale-color($tertiary, $lightness: 50%);
-      }
-      .unread-private-messages, .ring {
-        right: 25px;
-      }
-      .flagged-posts {
-        right: 65px;
-      }
-    }
-    .flagged-posts, .queued-posts {
-      background: $danger;
-    }
+  .d-header-icons {
+    float: right;
+  }
 }
 
+.header-dropdown-toggle, .drop-down, .panel-body {
+  .flagged-posts, .queued-posts {
+    background: $danger;
+  }
+}
+
+.d-header-icons {
+  text-align: center;
+  margin: 0 0 0 5px;
+  list-style: none;
+
+
+  > li {
+    float: left;
+  }
+  .icon {
+    position: relative;
+    display: block;
+    padding: 3px;
+    color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
+    text-decoration: none;
+    cursor: pointer;
+    border-top: 1px solid transparent;
+    border-left: 1px solid transparent;
+    border-right: 1px solid transparent;
+    transition: all linear .15s;
+
+
+    &:hover {
+      color: $primary;
+      background-color:  $primary-low;
+      border-top: 1px solid transparent;
+      border-left: 1px solid transparent;
+      border-right: 1px solid transparent;
+    }
+    &:active {
+      color: $primary;
+      background-color: $primary-low;
+    }
+  }
+  .drop-down-visible & {
+    .active .icon {
+      position: relative;
+      color: #7b7b7b;
+      background-color: $secondary;
+      cursor: default;
+      border-top: 1px solid $primary-low;
+      border-left: 1px solid $primary-low;
+      border-right: 1px solid $primary-low;
+
+      .flagged-posts {
+        right: 24px;
+      }
+
+      &:after {
+        display: block;
+        position: absolute;
+        top: 100%;
+        left: 0;
+        z-index: 1101;
+        width: 100%;
+        height: 0;
+        content: "";
+        border-top: 1px solid $secondary;
+      }
+      &:hover {
+        border-bottom: none;
+      }
+    }
+  }
+
+  .d-icon {
+    width: 32px;
+    height: 32px;
+    font-size: 1.714em;
+    line-height: 32px;
+    display: inline-block;
+  }
+  .notifications {
+    position: relative;
+  }
+  .ring {
+    position: absolute;
+    top: -9px;
+    z-index: 1;
+    margin-left: 0;
+  }
+  .header-dropdown-toggle {
+    position: relative;
+  }
+  .badge-notification {
+    position: absolute;
+    z-index: 1;
+    left: 0;
+    top: -9px;
+    min-width: 6px;
+  }
+  .unread-notifications {
+    left: auto;
+    right: 0;
+    background-color: dark-light-choose($tertiary-medium, $tertiary);
+  }
+  .unread-private-messages, .ring {
+    left: auto;
+    right: 25px;
+  }
+}
 
 .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/history.scss b/app/assets/stylesheets/common/base/history.scss
index 23a094624f..138784a737 100644
--- a/app/assets/stylesheets/common/base/history.scss
+++ b/app/assets/stylesheets/common/base/history.scss
@@ -40,11 +40,11 @@
   }
   .diff-ins {
     color: dark-light-choose($primary, $secondary);
-    background: scale-color($success, $lightness: 90%);
+    background: $success-low;
   }
   ins {
     color: $success;
-    background: scale-color($success, $lightness: 90%);
+    background: $success-low;
   }
   del, .diff-del {
     code, img {
@@ -67,11 +67,11 @@
     filter: alpha(opacity=50);
   }
   .diff-del {
-    background: scale-color($danger, $lightness: 60%);
+    background: $danger-low;
   }
   del {
     color: $danger;
-    background: scale-color($danger, $lightness: 60%);
+    background: $danger-low;
   }
   span.date {
     font-weight: bold;
@@ -80,7 +80,7 @@
     background-color: lighten($highlight, 23%);
     padding: 3px 5px 5px 5px;
   }
-  .fa-ban {
+  .d-icon-ban {
     color: #f00;
   }
   .hidden-revision-either {
diff --git a/app/assets/stylesheets/common/base/lightbox.scss b/app/assets/stylesheets/common/base/lightbox.scss
index 61a93372f2..2570034d60 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 4c03017800..d774ad0fed 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -28,8 +28,8 @@ $input-width: 220px;
   }
 
   .disclaimer {
-    font-size: 0.9em;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    font-size: 0.857em;
+    color: dark-light-choose($primary-medium, $secondary-medium);
     clear: both;
   }
 
@@ -56,9 +56,9 @@ $input-width: 220px;
         float: auto;
       }
       .instructions {
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+        color: dark-light-choose($primary-medium, $secondary-medium);
         margin: 0;
-        font-size: 0.929em;
+        font-size: 0.857em;
         font-weight: normal;
         line-height: 18px;
       }
@@ -70,7 +70,7 @@ $input-width: 220px;
 .password-reset {
   .instructions {
     label {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
   }
 }
@@ -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($primary-medium, $secondary-medium);
+      margin: 0;
+      font-size: 0.857em;
+      font-weight: normal;
+      line-height: 18px;
+    }
   }
 }
 
@@ -103,5 +113,5 @@ $input-width: 220px;
 button#login-link, button#new-account-link
 {
   background: transparent;
-  color: dark-light-choose(scale-color($primary, $lightness: 35%), scale-color($secondary, $lightness: 65%));
+  color: dark-light-choose($primary-high, $secondary-low);
 }
diff --git a/app/assets/stylesheets/common/base/magnific-popup.scss b/app/assets/stylesheets/common/base/magnific-popup.scss
index b37047cb0c..c1dfab230b 100644
--- a/app/assets/stylesheets/common/base/magnific-popup.scss
+++ b/app/assets/stylesheets/common/base/magnific-popup.scss
@@ -285,7 +285,6 @@ button {
   }
   padding: 0 0 18px 10px;
   color: $controls-color;
-
   font-style: normal;
   font-size: 2em;
   font-family: Arial, Baskerville, monospace;
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index deb79628d5..4c4fe1279b 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,14 +60,14 @@
       padding: 0.25em 0.5em;
       display: block;
       &:hover {
-        background-color: dark-light-diff($highlight, $secondary, 50%, -55%);
+        background-color: $highlight-medium;
       }
     }
 
     .new {
-      font-size: 0.8em;
+      font-size: 0.857em;
       margin-left: 0.5em;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
 
   }
@@ -79,7 +79,7 @@
     margin: 5px 5px 0 8px;
     .box {margin-top: 0;}
     .badge-notification {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
       background-color: transparent;
       display: inline;
       padding: 0;
@@ -88,9 +88,9 @@
 
   // note these topic counts only appear for anons in the category hamburger drop down
   b.topics-count {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
-    font-size: 11px;
+    font-size: .786em;
   }
 
   span.badge-category {
@@ -103,6 +103,10 @@
 
 .search-menu {
 
+  .search-input {
+    position: relative;
+  }
+
   .search-context .show-help {
     float: right;
   }
@@ -129,18 +133,14 @@
 
   .searching {
     position: absolute;
+    top: 1.15em;
+    right: 1em;
 
-    top: -3px;
-    right: 0.75em;
-    .drop-down-visible & {
-      top: 0.2em;
-      right: 1.2em;
-    }
     .spinner {
       width: 10px;
       height: 10px;
       border-width: 2px;
-      margin: 20px 0 0 0;
+      margin: 0;
     }
   }
   // I am ghetto using this to display "Show More".. be warned
@@ -148,6 +148,7 @@
     padding: 5px;
     text-align: center;
   }
+
   .filter {
     padding: 0;
     &:hover {background: transparent;}
@@ -164,7 +165,7 @@
     .topic-statuses {
       float: none;
       display: inline-block;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
       margin: 0;
       .fa {
         margin: 0;
@@ -173,7 +174,7 @@
   }
 
   li:not(.category):not(.heading) {
-    font-size: 0.929em;
+    font-size: 1em;
     line-height: 16px;
 
     .fa {
@@ -181,17 +182,19 @@
     }
 
     a {
-      display: block;
-      padding: 5px;
+      &:not(.discourse-tag) {
+        display: block;
+        padding: 5px;
+      }
       transition: all linear .15s;
 
       .user-results {
-        color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+        color: dark-light-choose($primary-high, $secondary-low);
       }
     }
 
     &:hover a:not(.badge-notification) {
-      background-color: dark-light-diff($highlight, $secondary, 50%, -55%);
+      background-color: $highlight-medium;
     }
 
     button {margin-left: 5px;}
@@ -207,26 +210,35 @@
       margin: 0.5em 0;
     }
 
-    .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%)); }
+    .fa { color: dark-light-choose($primary-medium, $secondary-medium); }
+    .icon { color: dark-light-choose($primary-high, $secondary-low); }
     li {
-      background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
-      padding: 0.25em 0.5em;
-      i {
-        float: left;
-        margin-right: 5px;
-        padding-top: 2px;
+      background-color: $tertiary-low;
+
+      // This is until other languages remove the HTML from within
+      // notifications. It can then be removed
+      div i.fa {
+        display: none;
       }
+
       span { color: $primary; }
-      &:hover { background-color: dark-light-diff($highlight, $secondary, 50%, -55%); }
+      &:hover { background-color: $highlight-medium; }
       a { padding: 0; }
       p {
         margin: 0;
         overflow: hidden;
       }
     }
+    li:not(.show-all) {
+      padding: 0.25em 0.5em;
+      i {
+        float: left;
+        margin-right: 5px;
+        padding-top: 2px;
+      }
+    }
     .is-warning {
-      i.fa-envelope-o {
+      .d-icon-envelope-o {
         &:before {
           content: "\f0e0";
         }
@@ -248,15 +260,32 @@
       border-width: 2px;
       margin: 0 auto;
     }
+    .show-all .btn {
+      width: 100%;
+      padding: 2px 0;
+      color: dark-light-choose($primary-medium, $secondary-high);
+      background: blend-primary-secondary(5%);
+      &:hover {
+        color: $primary;
+        background: dark-light-diff($primary, $secondary, 90%, -80%);
+      }
+    }
     /* as a big ol' click target, don't let text inside be selected */
     @include unselectable;
   }
+
+  .logout-link, .dismiss-link {
+    display: inline-block;
+  }
+  .dismiss-link {
+    float: right;
+  }
 }
 
 .notifications .logout {
   padding: 0.25em;
   &:hover {
-    background-color: dark-light-diff($highlight, $secondary, 50%, -55%);
+    background-color: $highlight-medium;
   }
 }
 
@@ -269,7 +298,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;
@@ -295,13 +324,10 @@ div.menu-links-header {
     text-align: right;
   }
   .fa, a {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 
-  a {
-    font-size: 1.1em;
-  }
-  .fa-user {
+  .d-icon-user {
     margin-right: 0.2em;
   }
 }
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index c69d4a4058..30d2fc27e0 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-high;
 }
 
 .modal-header {
-  border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border-bottom: 1px solid $primary-low;
 }
 
 .modal-backdrop {
@@ -74,6 +74,10 @@
   margin: 0 auto;
   background-color: $secondary;
   background-clip: padding-box;
+
+  .select-kit {
+    width: 220px;
+  }
 }
 
 .create-account.in .modal-inner-container,
@@ -83,7 +87,13 @@
 }
 
 
-.modal {
+.inline-modal {
+  .modal-inner-container {
+    border: 1px solid $secondary-medium;
+  }
+}
+
+.fixed-modal {
   position: fixed;
   top: 0;
   width: 100%;
@@ -96,7 +106,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,15 +128,15 @@
 .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;
 
   }
 
-    &.hidden {
+  &.hidden {
     display: none;
   }
 
@@ -143,7 +153,7 @@
     }
     p {
       color: darken($primary, 40%);
-      font-size: 0.929em;
+      font-size: 1em;
     }
     .archetype-option {
       margin-bottom: 20px;
@@ -170,7 +180,7 @@
           color: rgb(255,255,255);
           position: absolute;
           top: 40%;
-          font-size: 36px;
+          font-size: 2.571em;
           text-align: center;
           line-height: 38px;
           margin-left: auto;
@@ -187,7 +197,7 @@
       .jsfu-separator {
         vertical-align: middle;
         display: table-cell;
-        font-size: 36px;
+        font-size: 2.571em;
         padding-left: 10px;
         padding-right: 10px;
       }
@@ -212,36 +222,46 @@
     display: inline-block;
     margin-right: 10px;
   }
+
+  // password reset modal
+  .modal-body.forgot-password-modal p {
+    font-size: 1em;
+  }
 }
 
 .reply-where-modal {
   .modal-footer {
+    a {
+      display: block;
+    }
+    .d-modal-cancel {
+      margin-top: 1em;
+    }
     .btn {
       text-align: left;
       font-size: 1.286em;
       line-height: 20px;
-      width: 310px;
+      width: auto;
       margin-bottom: 10px;
       display: block;
       margin-left: 0 !important; // override needed
       font-weight: bold;
       .topic-title {
-        font-size: 0.929em;
+        font-size: 1em;
         font-weight: normal;
       }
       &.btn-reply-here {
-        background: dark-light-diff($primary, $secondary, 90%, -60%);
+        background: $primary-low;
         text-shadow: none;
         color: $primary;
       }
     }
-    .cancel {
-      float: right;
-      margin-right: 5px;
-    }
   }
 }
-
+.d-modal-cancel {
+  margin-left: 5px;
+  color: $primary-medium;
+}
 
 .delete-user-modal {
   .modal-footer {
@@ -254,17 +274,9 @@
       display: inline-block;
       margin-left: 0;
     }
-    .cancel {
-      display: block;
-      margin-right: 5px;
-    }
   }
 }
 
-.modal-footer .cancel-inline {
-  margin-left: 10px;
-}
-
 .invite-modal {
   overflow: visible;
   .ember-text-field {
@@ -287,7 +299,7 @@
   .permission {
     margin-left: 20px;
   }
-  .fa-times-circle {
+  .d-icon-times-circle {
     margin-left: 5px;
   }
   li {
@@ -296,7 +308,7 @@
 }
 
 .edit-category-modal {
-  .auto-update-input, .num-featured-topics-fields, .position-fields {
+  .future-date-input, .num-featured-topics-fields, .position-fields {
     input[type=text] {
       width: 50px;
     }
@@ -319,8 +331,8 @@
 
     .cannot_delete_reason {
       position: absolute;
-      background: dark-light-choose(scale-color($primary, $lightness: 10%), scale-color($secondary, $lightness: 10%));
-      color: dark-light-choose(scale-color($primary, $lightness: 100%), scale-color($secondary, $lightness: 0%));
+      background: $primary;
+      color: $secondary;
       text-align: center;
       border-radius: 2px;
       padding: 12px 8px;
@@ -331,14 +343,13 @@
         border: solid transparent;
         content: " ";
         position: absolute;
-        border-top-color: dark-light-choose(scale-color($primary, $lightness: 10%), scale-color($secondary, $lightness: 10%));
+        border-top-color: $primary;
         border-width: 8px;
       }
     }
   }
 }
 
-
 .incoming-email-modal {
   .btn {
     transition: none;
@@ -351,7 +362,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 +373,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/not-found.scss b/app/assets/stylesheets/common/base/not-found.scss
new file mode 100644
index 0000000000..2229548007
--- /dev/null
+++ b/app/assets/stylesheets/common/base/not-found.scss
@@ -0,0 +1,50 @@
+// Page not found styles 
+
+h1.page-not-found {
+  font-size: 2.286em;
+  line-height: 1.25;
+}
+
+.page-not-found {
+  margin: 0 0 40px 0;
+  &-search {
+    margin-top: 20px;
+  }
+}
+
+.page-not-found-topics {
+  display: flex;
+  @media screen and (max-width: 600px) {
+    flex-wrap: wrap;
+  }
+}
+
+.popular-topics, .recent-topics {
+  box-sizing: border-box;
+  width: 50%;
+  max-width: 400px;
+  margin-bottom: 40px;  
+  padding-right: 20px;
+  @media screen and (max-width: 600px) {
+    width: 100%;
+  }
+  h2 {
+    margin-bottom: 10px;    
+  }
+}
+
+.not-found-topic {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: baseline;
+  margin-bottom: 15px;
+  @media screen and (max-width: 600px) {
+    &:nth-of-type(n+6) {
+      display: none;
+    }
+  }
+  .badge-wrapper {
+    flex-basis: 100%;
+  }
+}
+
diff --git a/app/assets/stylesheets/common/base/notification-options.scss b/app/assets/stylesheets/common/base/notification-options.scss
deleted file mode 100644
index 1e560fadf8..0000000000
--- a/app/assets/stylesheets/common/base/notification-options.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.fa.muted, .fa.watching-first-post {
-  color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
-}
-.fa.tracking, .fa.watching {
-  color: $tertiary;
-  font-weight: normal;
-}
diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 5b718047c7..8251835934 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;
@@ -97,7 +97,7 @@ aside.onebox {
   header {
     margin-bottom: 8px;
     a[href] {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
       text-decoration: none;
     }
   }
@@ -118,26 +118,80 @@ aside.onebox {
     clear: both;
 
     h3, h4 {
-      font-size: 1.17em;
+      font-size: 1.143em;
       margin: 0 0 10px 0;
     }
 
     a[href] {
-      color: dark-light-choose(scale-color($tertiary, $lightness: -20%), $tertiary);
+      color: dark-light-choose($tertiary, $tertiary);
       text-decoration: none;
     }
 
     a[href]:visited {
-      color: dark-light-choose(scale-color($tertiary, $lightness: -20%), $tertiary);
+      color: dark-light-choose($tertiary, $tertiary);
     }
 
     img {
       max-height: 170px;
       max-width: 20%;
+      @media all and (max-width: 600px) {
+        max-width: 35%;
+      }
       height: auto;
       width: auto;
       float: left;
       margin-right: 10px;
+      &.onebox-full-image {
+        max-height: none;
+        max-width: none;
+        width: initial;
+        height: initial;
+      }
+    }
+
+    [style*="--aspect-ratio"] > :first-child {
+      width: 100%;
+    }
+    [style*="--aspect-ratio"] > img {
+      height: auto;
+    }
+
+    // this allows us to load all onebox images without jiggle
+    // see: http://cssmojo.com/aspect-ratio-using-custom-properties-and-calc/
+    @supports (--custom:property) {
+
+      .aspect-image {
+        max-height: 170px;
+        --magic-ratio: calc(var(--aspect-ratio) + 0.15);
+        width: calc(128px * var(--magic-ratio));
+        max-width: 20%;
+        float: left;
+        margin-right: 10px;
+        height: auto;
+
+        img {
+          width: 100%;
+          height: inherit;
+          max-width: initial;
+          max-height: initial;
+          float: none;
+          margin-right: none;
+        }
+      }
+      [style*="--aspect-ratio"] {
+        position: relative;
+      }
+      [style*="--aspect-ratio"]::before {
+        content: "";
+        display: block;
+        padding-bottom: calc(100% / (var(--aspect-ratio)));
+      }
+      [style*="--aspect-ratio"] > :first-child {
+        position: absolute;
+        top: 0;
+        left: 0;
+        height: 100%;
+      }
     }
 
     // tighten bottom margin on last para
@@ -197,8 +251,8 @@ aside.onebox {
 aside.onebox .onebox-body .onebox-avatar {
   max-height: none;
   max-width: none;
-  height: 90px;
-  width: 90px;
+  height: 60px;
+  width: 60px;
 }
 
 blockquote {
@@ -216,7 +270,7 @@ pre.onebox code ol.lines li:before {
   color:#AFAFAF;
   text-align:right;
   padding-right:5px;
-  font-size:12px;
+  font-size:.857em;
   line-height: 1.9em;
   content: counter(li-counter);
   counter-increment: li-counter;
@@ -277,7 +331,7 @@ pre.onebox code {
 .onebox-body .build_status
 {
   padding: 2px;
-  font-size:12px;
+  font-size:.857em;
 }
 
 .onebox-body .status_tag.open {
@@ -310,12 +364,11 @@ aside.onebox.twitterstatus .onebox-body {
   p, .tweet {
     white-space: pre-wrap;
     padding-top: 3px;
-    margin-left: 58px;
+    margin-left: 70px;
   }
   .date {
     clear: left;
-    padding-top: 5px;
-    margin-left: 58px;
+    padding-top: 10px;
   }
 }
 
@@ -326,7 +379,7 @@ aside.onebox.twitterstatus .onebox-body {
     z-index: 935;
     height: 30px;
     overflow: hidden;
-    font-size: 12px;
+    font-size: .857em;
     color: #fff;
     background-color: rgba(0, 0, 0, 0.6);
     text-overflow: ellipsis;
@@ -342,7 +395,7 @@ aside.onebox.twitterstatus .onebox-body {
 
       .album-title {
         width: 100%;
-        font-size: 13px;
+        font-size: 1.143em;
         line-height: 30px;
         color: #ccc;
         text-decoration: none;
@@ -353,7 +406,7 @@ aside.onebox.twitterstatus .onebox-body {
 
 // resize stackexchange onebox image
 aside.onebox.stackexchange .onebox-body {
-  img {
+  img:not(.onebox-avatar) {
     max-height: 60%;
     max-width: 10%;
   }
@@ -364,7 +417,7 @@ aside.onebox.stackexchange .onebox-body {
 }
 
 .onebox-metadata {
-  color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+  color: dark-light-choose($primary-medium, $secondary-medium);
 }
 
 .onebox.xkcd .onebox-body {
@@ -389,6 +442,32 @@ aside.onebox.stackexchange .onebox-body {
   }
 }
 
+// whitelistedgeneric twitter labels
+.onebox.whitelistedgeneric {
+  .label1, .label2 {
+    color: dark-light-choose($primary-medium, $secondary-medium);
+  }
+  .label1 {
+    float: left;
+  }
+  .label2 {
+    float: right;
+  }
+  .site-icon {
+    width: 16px;
+    height: 16px;
+    margin-right: 3px;
+  }
+}
+
+.onebox.githubcommit {
+   pre.message {
+     clear: left;
+     padding: 0;
+     padding-top: 10px;
+   }
+}
+
 // mobile specific style
 .mobile-view article.onebox-body {
   border-top: none;
diff --git a/app/assets/stylesheets/common/base/request-group-membership-form.scss b/app/assets/stylesheets/common/base/request-group-membership-form.scss
new file mode 100644
index 0000000000..63dfd0aec7
--- /dev/null
+++ b/app/assets/stylesheets/common/base/request-group-membership-form.scss
@@ -0,0 +1,9 @@
+.request-group-membership-form {
+  label {
+    font-weight: bold;
+  }
+}
+
+.group-edit-membership-request-template {
+  width: 98%;
+}
diff --git a/app/assets/stylesheets/common/base/request_access.scss b/app/assets/stylesheets/common/base/request_access.scss
index 63c95bc7e5..77fd99202a 100644
--- a/app/assets/stylesheets/common/base/request_access.scss
+++ b/app/assets/stylesheets/common/base/request_access.scss
@@ -4,10 +4,10 @@
   input[type=text] {
     width: 320px;
     height: 30px;
-    font-size: 1.571em;
+    font-size: 1.429em;
   }
   input[type=submit] {
-    font-size: 1.571em;
+    font-size: 1.429em;
     padding: 10px;
   }
 }
diff --git a/app/assets/stylesheets/common/base/rtl.scss b/app/assets/stylesheets/common/base/rtl.scss
index 045df633a6..ad7e5c4af7 100644
--- a/app/assets/stylesheets/common/base/rtl.scss
+++ b/app/assets/stylesheets/common/base/rtl.scss
@@ -7,7 +7,7 @@
   right: 0 !important;
 }
 
-// This is used to flip the .fa-caret-right icon
+// This is used to flip the .d-icon-caret-right
 @mixin rotate( $degrees ) {
   -webkit-transform: rotate(#{$degrees}deg);
   -moz-transform: rotate(#{$degrees}deg);
@@ -21,13 +21,13 @@
 }
 
 // Get the right caret to point left
-.rtl .fa-caret-right {
+.rtl .d-icon-caret-right {
   @include rotate(180);
 }
 
 // Changes the triangle arrow direction in .nav-stacked .active
 // The 'left' and 'right' in these selectors is not being flipped by r2.
-.rtl .nav-stacked .active > a::after {
+.rtl .nav-stacked a.active::after {
   border-left-color: transparent !important;
   border-right-color: $secondary !important;
 }
@@ -38,15 +38,15 @@
 .rtl .pull-left {
   float: right !important;
 }
-.rtl .autocomplete { 
-  left: 27px; 
+.rtl .autocomplete {
+  left: 27px;
 }
 
-.rtl .customize .current-style .toggle-mobile {
+.rtl .admin-customize .current-style .toggle-mobile {
 position: static !important;
 float: left !important;
 }
-.rtl .customize .current-style .toggle-maximize {
+.rtl .admin-customize .current-style .toggle-maximize {
 position: static !important;
 float: left !important;
 }
diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss
index 7fa038db9c..e4a18b18ae 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -10,8 +10,8 @@
   }
 
   .like-count {
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
-    .fa { color: $love; font-size: 12px; }
+    color: dark-light-choose($primary-medium, $secondary-medium);
+    .fa { color: $love; font-size: .857em; }
   }
 
   .badge-wrapper span.badge-category {
@@ -32,18 +32,18 @@
     margin-right: 14px;
   }
   a.search-link:visited .topic-title {
-    color: scale-color($tertiary, $lightness: 15%);
+    color: $tertiary-high;
   }
   .search-link {
     .topic-statuses, .topic-title {
-      font-size: 1.3em;
+      font-size: 1.286em;
       line-height: 25px;
     }
 
     .topic-statuses {
       float: none;
       display: inline-block;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
       font-size: 1.0em;
     }
   }
@@ -52,18 +52,18 @@
     line-height: 20px;
     word-wrap: break-word;
     max-width: 640px;
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     .date {
-      color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+      color: dark-light-choose($primary-medium, $secondary-high);
     }
 
     .search-highlight {
-      color: dark-light-choose(scale-color($primary, $lightness: 10%), scale-color($secondary, $lightness: 90%));
+      color: dark-light-choose($primary, $secondary-low);
     }
   }
 
   .discourse-tag {
-    font-size: 0.8em;
+    font-size: 0.857em;
   }
 }
 
@@ -80,16 +80,22 @@
   }
   a {
     margin-right: 15px;
-    font-size: 12px;
+    font-size: .857em;
     padding: 2px 5px;
   }
 }
 
 .search.row {
   margin-bottom: 15px;
-  input {
-    height: 22px;
-    padding-left: 6px;
+
+  .search-bar {
+    display: flex; 
+    margin-bottom: 10px;
+    input {
+      height: 22px;
+      padding-left: 6px;
+      margin: 0 5px 0 0;
+    }
   }
 
   .new-topic-btn {
@@ -108,7 +114,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 {
@@ -121,6 +127,9 @@
   }
 }
 
+.no-results-suggestion {
+  margin-top: 30px;
+}
 .search-footer {
   margin-bottom: 30px;
 }
@@ -147,7 +156,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 {
@@ -162,3 +171,7 @@
     margin-bottom: 4px;
   }
 }
+
+.google-search-form {
+  margin-top: 2em;
+}
diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss
index 0f74cb0e76..b9c3694119 100644
--- a/app/assets/stylesheets/common/base/share_link.scss
+++ b/app/assets/stylesheets/common/base/share_link.scss
@@ -22,7 +22,7 @@
     margin: 14px 0;
   }
   h3 {
-    font-size: 0.929em;
+    font-size: 1em;
   }
   .copy-text {
     display: inline-block;
@@ -31,7 +31,7 @@
     color: $success;
     opacity: 1;
     transition: opacity 0.25s;
-    font-size: 13px;
+    font-size: 1em;
     &:not(.success) {
       opacity: 0;
     }
@@ -40,7 +40,7 @@
     margin-left: 2px;
     margin-right: 8px;
     float: left;
-    font-size: 1.571em;
+    font-size: 1.857em;
   }
   .reply-as-new-topic {
     float: left;
@@ -55,7 +55,7 @@
     float: right;
     font-size: 1.429em;
     a {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
   }
 
@@ -67,7 +67,7 @@
   .date {
     float: right;
     margin: 5px;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 
   input[type=text] {
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index f691175120..46a363c53a 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -23,7 +23,7 @@
   }
 
   .tag-count {
-    font-size: 0.9em;
+    font-size: 0.857em;
   }
 }
 
@@ -35,8 +35,8 @@
 .bullet + .topic-header-extra {
   display: block;
   line-height: 15px;
-  font-size: 12px;
-  .list-tags { font-size: 12px; }
+  font-size: .857em;
+  .list-tags { font-size: 1em; }
 }
 
 .bar + .topic-header-extra {
@@ -49,14 +49,44 @@
   padding-top: 5px;
 }
 
+.topic-category {
+  margin-top: 5px;
+
+  .topic-header-extra {
+    display: inline;
+    vertical-align: baseline;
+    margin: 0;
+  }
+
+  .badge-wrapper {
+    display: inline-block;
+    vertical-align: baseline;
+    margin-top: 0;
+
+    &.bullet .badge-category {
+      vertical-align: middle;
+    }
+
+    &.box, &.bullet {
+      vertical-align: middle;
+    }
+
+    &.box + .topic-header-extra,
+    &.bullet + .topic-header-extra,
+    &.bar + .topic-header-extra {
+      vertical-align: middle;
+    }
+  }
+}
+
 .add-tags .select2 {
   margin: 0;
 }
 
-$tag-color: scale-color($primary, $lightness: 40%);
+$tag-color: $primary-medium;
 
 .discourse-tag-count {
-  font-size: 0.8em;
+  font-size: 0.857em;
   color: $tag-color;
 }
 
@@ -79,18 +109,18 @@ $tag-color: scale-color($primary, $lightness: 40%);
   }
 
   &.box {
-    background-color: scale-color($primary, $lightness: 90%);
-    color: scale-color($primary, $lightness: 30%);
+    background-color: $primary-low;
+    color: $primary-high;
     padding: 2px 8px;
     .extra-info-wrapper & {
-      background-color: scale-color($header-primary, $lightness: 90%);
-      color: scale-color($header-primary, $lightness: 30%);
+      background-color: $header_primary-low;
+      color: $header_primary-medium;
     }
   }
 
   &.simple, &.simple:visited, &.simple:hover {
     margin-right: 0px;
-    color: scale-color($primary, $lightness: 30%);
+    color: $primary-high;
   }
 }
 
@@ -123,7 +153,7 @@ $tag-color: scale-color($primary, $lightness: 40%);
 
 .topic-list-item .discourse-tags {
   display: block;
-  font-size: 0.75em;
+  font-size: 0.786em;
   font-weight: normal;
   clear: both;
   margin-top: 5px;
@@ -140,7 +170,7 @@ $tag-color: scale-color($primary, $lightness: 40%);
 
 .mobile-view .topic-list-item .discourse-tags {
   display: inline-block;
-  font-size: 0.9em;
+  font-size: 0.857em;
   margin-top: 0;
   .discourse-tag.box {
     position:relative;
@@ -153,9 +183,9 @@ $tag-color: scale-color($primary, $lightness: 40%);
 .discourse-tag.bullet:before {
   content: "\f04d";
   font-family: FontAwesome;
-  color: scale-color($primary, $lightness: 70%);
+  color: $primary-low-mid;
   margin-right: 5px;
-  font-size: 0.7em;
+  font-size: 0.786em;
   position:relative;
   top: -0.1em;
 }
@@ -170,7 +200,12 @@ header .discourse-tag {color: $tag-color }
 
 .tag-chooser {
   width: 100%;
+  max-width: 100%;
   margin: 5px 0;
+  ul.select2-choices {
+    max-height: 30px;
+    overflow-y: auto;
+  }
 }
 
 .title-wrapper .tag-chooser {
@@ -183,18 +218,6 @@ header .discourse-tag {color: $tag-color }
   margin-right: 8px;
 }
 
-.notification-options.tag-notification-menu {
-  float: right;
-  margin-bottom: 10px;
-}
-
-.tag-notification-menu .dropdown-menu {
-  right: 0;
-  top: 30px;
-  bottom: auto;
-  left: auto;
-}
-
 .tag-sort-options {
   margin-bottom: 20px;
   a {
@@ -203,8 +226,8 @@ header .discourse-tag {color: $tag-color }
 }
 
 .autocomplete {
-  .fa-tag {
-   color: dark-light-choose($primary, scale-color($primary, $lightness: 70%));
+  .d-icon-tag {
+   color: dark-light-choose($primary, $primary-low-mid);
    padding-right: 5px;
   }
 
diff --git a/app/assets/stylesheets/common/base/topic-admin-menu.scss b/app/assets/stylesheets/common/base/topic-admin-menu.scss
index acabe8664a..7816086dc9 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 dc13058eee..9197ebfa73 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;
@@ -23,37 +23,39 @@
 
  span {
    font-size: 0.929em;
-   padding-right: 8px;
+   margin-right: 8px;
    display: inline-block;
    max-width: 280px;
    white-space: nowrap;
    overflow: hidden;
    text-overflow: ellipsis;
    a {
-     color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+     color: dark-light-choose($primary-high, $secondary-low);
    }
  }
  .fa {
-   font-size: 11px;
+   font-size: .786em;
    margin-left: 3px;
-   color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+   color: dark-light-choose($primary-medium, $secondary-medium);
  }
-  .new_user a, .user-title, .user-title a {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+ .new_user a, .user-title, .user-title a {
+    color: dark-light-choose($primary-medium, $secondary-medium);
  }
 }
 
 // global styles for the cooked HTML content in posts (and preview)
 .cooked, .d-editor-preview {
   word-wrap: break-word;
-  h1, h2, h3, h4, h5, h6 { margin: 30px 0 10px; }
-  h1 { line-height: 1em; } /* normalize.css sets h1 font size but not line height */
+  h1, h2, h3, h4, h5, h6 { 
+    margin: 30px 0 10px; 
+    line-height: 1.25; 
+  }
+  
   a { word-wrap: break-word; }
-  ins { background-color: dark-light-choose(scale-color($success, $lightness: 90%), scale-color($success, $lightness: -60%)); }
-  del { background-color: dark-light-choose(scale-color($danger, $lightness: 90%), scale-color($danger, $lightness: -60%)); }
+  ins { background-color: dark-light-choose($success-low, scale-color($success, $lightness: -60%)); }
+  del { background-color: dark-light-choose($danger-low, scale-color($danger, $lightness: -60%)); }
 }
 
-
 .cooked, .d-editor-preview {
   video {
     max-width: 100%;
@@ -62,6 +64,27 @@
     top: 0;
   }
 }
+
+// add staff color
+.moderator {
+  .regular > .cooked {
+    background-color: dark-light-choose($highlight-low, $highlight-medium);
+    padding: 10px;
+    img:not(.thumbnail) {
+      max-width: 100%;
+      height: auto;
+    }
+  }
+  .clearfix > .topic-meta-data > .names {
+    span.user-title {
+      background-color: dark-light-choose($highlight-low, $highlight-medium);
+      color: dark-light-choose($primary-high, $secondary-low);      
+      padding-left: 4px;
+      padding-right: 4px;
+    }
+  }
+}
+
 // we use aside to hold expandable quotes (versus, say, static blockquotes)
 aside.quote {
   margin-top: 1em;
@@ -72,7 +95,7 @@ aside.quote {
   .title {
     @include post-aside;
 
-    color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+    color: dark-light-choose($primary-high, $secondary-low);
     // IE will screw up the blockquote underneath if bottom padding is 0px
     padding: 12px 12px 1px 12px;
     // blockquote is underneath this and has top margin
@@ -87,12 +110,12 @@ aside.quote {
   }
 }
 
-.quote-controls, .quote-controls .back:before, .quote-controls .quote-other-topic:before {
-  color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
+.quote-controls, .quote-controls .d-icon {
+  color: dark-light-choose($primary-low-mid, $secondary-high);
 }
 
 .cooked .highlight {
-  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+  background-color: $tertiary-low;
   padding: 2px;
   margin: -2px;
 }
@@ -114,42 +137,27 @@ aside.quote {
 
 .quote-controls {
   float: right;
-  a {
-    margin: 0;
-  }
-
-  .back:before, .quote-other-topic:before
-  {
-    display: inline-block;
-    margin-left: 8px;
-    font-family: "FontAwesome";
-    position: relative;
-    z-index: 20;
-    content: "\f062";
-  }
-
-  .quote-other-topic:before
-  {
-    content: "\f061";
+  display: flex;
+  .d-icon {
+    margin-left: 0.2em;
   }
 }
 
 .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;
   opacity: 0.9;
 
-  &:before {
-    font-family: "FontAwesome";
-    content: "\f10d\00a0\00a0";
+  .d-icon {
+    display: inline-block;
   }
 
   &:hover {
-    background-color: dark-light-diff($primary, $secondary, 40%, -40%);
+    background-color: $primary-medium;
     cursor: pointer;
   }
 }
@@ -196,7 +204,7 @@ aside.quote {
     right: -4px;
   }
   .fa {
-    font-size: 24px;
+    font-size: 1.714em;
   }
 }
 .topic-map .poster .avatar-flair {
@@ -214,7 +222,7 @@ aside.quote {
     right: 0;
   }
   .fa {
-    font-size: 14px;
+    font-size: 1em;
   }
 }
 .topic-avatar .poster-avatar-extra {
@@ -242,17 +250,18 @@ aside.quote {
 .post-info {
   &.via-email, &.whisper {
     margin-right: 5px;
-    i.fa {
+    .d-icon {
       font-size: 1em;
     }
   }
 
-  .wiki {
+  .wiki,
+  .last-wiki-edit {
     color: green !important;
   }
 
   &.via-email {
-    color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
+    color: dark-light-choose($primary-low-mid, $secondary-high);
   }
   &.raw-email {
     cursor: pointer;
@@ -273,7 +282,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;
@@ -301,7 +310,7 @@ blockquote > *:last-child {
 
 .gap {
   padding: 0.25em 0 0.5em 4.3em;
-  color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+  color: dark-light-choose($primary-medium, $secondary-high);
   cursor: pointer;
   text-transform: uppercase;
   font-weight: bold;
@@ -317,7 +326,7 @@ blockquote > *:last-child {
 }
 
 
-table.md-table {
+.cooked table, .d-editor-preview table {
   thead {
     border-bottom: 2px solid lighten($primary, 80%);
     th {
@@ -335,34 +344,41 @@ table.md-table {
 }
 
 .small-action {
+  max-width: 755px;
+  border-top: 1px solid $primary-low;
   .topic-avatar {
     padding: 5px 0 3px;
     border-top: none;
     float: left;
     i {
-      font-size: 35px;
+      font-size: 2.500em;
       width: 45px;
       text-align: center;
-      color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+      color: dark-light-choose($primary-low-mid, $secondary-high);
     }
   }
 
-  .small-action-desc.timegap {
-      color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+  .small-action.deleted {
+    background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%);
   }
+
+  .small-action-desc.timegap {
+      color: dark-light-choose($primary-medium, $secondary-high);
+  }
+
   .small-action-desc {
     padding: 0.25em 0 0.5em 4.3em;
     margin-top: 6px;
     text-transform: uppercase;
     font-weight: bold;
-    font-size: 0.9em;
-    color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+    font-size: 0.857em;
+    color: dark-light-choose($primary-low-mid, $secondary-high);
 
     .custom-message {
       text-transform: none;
       margin: 15px 0px 5px;
       font-weight: normal;
-      font-size: 14px;
+      font-size: 1.143em;
       p {
         margin: 5px 0;
       }
@@ -395,15 +411,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($primary-high, $secondary-low);
+  background: $primary-low;
   border-radius: 8px;
   font-weight: bold;
   font-size: 0.93em;
@@ -420,3 +436,65 @@ a.mention, a.mention-group {
     padding-bottom: 15px;
   }
 }
+
+.large-image-placeholder {
+  > a {
+
+    &.link {
+      margin-right: 10px;
+    }
+
+    > * { overflow: hidden; }
+
+    > i.fa {
+      color: dark-light-choose($primary-medium, $secondary-medium);
+      margin-right: 6px;
+      font-size: $base-font-size;
+      line-height: $base-line-height;
+    }
+
+    > span.url {
+      display: inline-block;
+      max-width: 300px;
+      margin-right: 6px;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+
+    > span.help {
+      display: inline-block;
+      color: dark-light-choose($primary-medium, $secondary-medium);
+      font-size: 0.857em;
+      font-style: italic;
+      line-height: $base-line-height;
+      margin-bottom: 1px;
+    }
+
+    > span.badge-notification {
+      vertical-align: unset;
+    }
+  }
+}
+
+.broken-image, .large-image {
+  color: dark-light-choose($primary-low-mid, $secondary-high);
+  border: 1px solid $primary-low;
+  font-size: 2.286em;
+  padding: 16px;
+}
+
+/* below standard tablet portrait ----------- */
+
+@media all
+and (max-width : 767px) {
+  .reply-to-tab {
+    span {display: none;}
+  }
+  .names {
+    span {display: block;}
+  }
+  .user-title {
+    float: left;
+    clear: left;
+  }
+}
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index 196aa05e2e..9efde29e8d 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -21,16 +21,41 @@
   }
 }
 
+#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;
     width: 90%;
+
     .btn-small {
       margin: 0 6px 0 0;
     }
 
     .badge-wrapper {
-      float: left;
       margin-right: 12px;
     }
 
@@ -48,8 +73,46 @@
   }
 
   a.edit-topic i { font-size: 0.8em; }
+
+  .edit-topic-title {
+    display: flex;
+    flex-wrap: wrap;
+    box-sizing: border-box;
+    max-width: 758px;
+    #edit-title {
+      flex: 1 1 auto;
+    }
+    .private-message-glyph {
+      margin: 5px 5px 0 0;
+    }
+    .category-chooser, .tag-chooser {
+      flex: 1 1 49%;
+      margin: 0 0 9px 0;
+      @media all and (max-width: 500px) {
+        flex: 1 1 100%;        
+      }
+        
+    }
+    .tag-chooser {
+      margin-left: 2%;
+      @media all and (max-width: 500px) {
+        margin-left: 0;
+      }
+    }
+  }
 }
 
+.private_message {
+  #topic-title {
+    .edit-topic-title {
+      #edit-title {
+        width: calc(100% - 50px);
+      }
+    }
+  }
+}
+
+
 .topic-title-outlet {
   clear: both;
 }
@@ -66,10 +129,12 @@
 
 .has-pending-posts {
   padding: 0.5em;
-  background-color: dark-light-diff($highlight, $secondary, 50%, -70%);
+  background-color: $highlight-medium;
   a[href] {
     float: right;
   }
+  margin-top: 1em;
+  max-width: 757px;
 }
 
 // Target the .badge-category text, the bullet icon needs to maintain `display: block`
@@ -98,7 +163,7 @@
 }
 
 .topic-unsubscribe {
-  .notification-options {
+  .notifications-button {
     display: inline-block;
     float: none;
     line-height: 2em;
@@ -118,11 +183,11 @@
   .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 {
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 
   .track-link {
@@ -138,7 +203,7 @@
     li {
       margin-bottom: 0.5em;
       a[href] {
-        color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+        color: dark-light-choose($primary-medium, $secondary-medium);
       }
       .clicks {
         margin-left: 0.5em;
@@ -160,7 +225,7 @@
     &:hover {
       color: $tertiary;
       i {
-        background: dark-light-diff($tertiary, $secondary, 85%, -65%);
+        background: $tertiary-low;
       }
     }
   }
@@ -169,7 +234,7 @@
 a.topic-featured-link {
   display: inline-block;
   text-transform: lowercase;
-  color: #858585;
+  color: dark-light-choose($primary-medium, $secondary-medium);
   font-size: 0.875rem;
 
   &::before {
diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss
index 7c25c2652a..7deaf44cff 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;
@@ -30,6 +30,14 @@
   &.badge-type-bronze .fa {
     color: #cd7f32 !important;
   }
+
+  &.disabled {
+    color: $primary-medium;
+    background-color: $primary-very-low;
+    .fa {
+      opacity: 0.4;
+    }
+  }
 }
 
 @media all and (max-width: 750px) {
@@ -58,22 +66,9 @@
   }
 }
 
-.user-info.medium.badge-info {
-  min-height: 80px;
-
-  .granted-on {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-  }
-
-  .post-link {
-    display: block;
-    margin-top: 0.2em;
-  }
-}
-
 .show-badge .badge-user-info {
   .earned {
-    font-size: 1.3em;
+    font-size: 1.286em;
     margin-bottom: 1em;
   }
 }
@@ -84,7 +79,7 @@
   .load-more {
     padding-top: 30px;
     display: block;
-    font-size: 1.2em;
+    font-size: 1.286em;
   }
 }
 
@@ -99,11 +94,11 @@
   }
   .date {
     display: inline-block;
-    font-size: 1.1em;
+    font-size: 1.143em;
     margin-left: 10px;
   }
   .post-link {
-    font-size: 1.3em;
+    font-size: 1.286em;
     width: 500px;
     margin: 0;
     padding: 0;
@@ -126,7 +121,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,21 +137,22 @@
     right: 5px;
     top: 5px;
     font-weight: bold;
-    color: dark-light-diff($primary, $secondary, 50%, -15%);
-    font-size: 1.2em;
+    color: $primary-medium;
+    font-size: 1.286em;
   }
 
   .badge-contents {
     display: flex;
     flex-direction: row;
     min-height: 128px;
+    height: 100%;
 
     .badge-icon {
       min-width: 90px;
       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 {
@@ -208,7 +204,7 @@
 
 .badge-groups {
   margin: 20px 0;
-  color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+  color: dark-light-choose($primary-medium, $secondary-medium);
   h3 {
     margin-bottom: 1.0em;
   }
@@ -228,10 +224,21 @@
     display: flex;
     align-items: center;
     margin-left: 1em;
+    &.hidden {
+      display: none;
+    }
   }
   .grant-info-item {
     margin-bottom: 1em;
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
+  }
+
+  .badge-title .form-horizontal .controls {
+    margin-left: 20px;
+  }
+
+  .close-btn {
+    margin: -20px 0 0 20px;
   }
 }
 
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 60bb2aa800..97197207d2 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -1,38 +1,263 @@
-// styling of bottom section
-.user-stream .child-actions {
-  margin-top: 8px;
-  .avatar-link {
-    float: none;
-  }
-  .fa {
-    width: 15px;
-    display: inline-block;
-    color: $primary;
-  }
-  .avatar-link {
-    margin-right: 3px;
+// Common styles for "/user" section
+.user-right {
+  .list-actions {
+    margin-bottom: 10px;
+
+    .btn {
+      margin-right: 10px;
+    }
   }
 }
 
 .user-main {
-  i.fa-heart {
+  .d-icon-heart {
     color: $love !important;
   }
-  .nav-pills {
+
+  .about {
+    overflow: hidden;
+    width: 100%;
+
+    .secondary {
+
+      .btn {
+        padding: 3px 12px;
+      }
+
+      dl {
+        margin: 0;
+      }
+
+      dd {
+        padding: 0;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        color: $primary;
+
+        &.groups {
+          span:after {
+            content: ','
+          }
+          span:last-of-type:after {
+            content:''
+          }
+        }
+      }
+
+      dt {
+        color: $secondary-medium;
+        margin: 0;
+        display: inline-block;
+      }
+    }
+
+    .details {
+      background: rgba($secondary, .8);
+
+      blockquote {
+        background-color: $secondary-low;
+        border-left-color: $secondary-low;
+      }
+
+      h1 {
+        font-size: 2.286em;
+        font-weight: normal;
+        i {font-size: .8em;}
+      }
+
+      h2 {
+        font-size: 1.286em;
+        font-weight: normal;
+        margin-top: 10px;
+        max-width: 100%;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+
+      h3 {
+        font-weight: normal;
+        font-size: 1em;
+        margin: 5px 0;
+
+        .d-icon:not(:first-of-type) {
+          margin-left: 10px;
+        }
+      }
+
+      .groups {
+        margin-left: 10px;
+        display: inline;
+      }
+
+      img.avatar {
+        float: left;
+      }
+
+      .suspended {
+        color: $danger;
+      }
+
+      .primary {
+        width: 100%;
+        position: relative;
+        float: left;
+
+        h1 {
+          font-weight: bold;
+        }
+
+        .bio {
+          max-height: 300px;
+          overflow: auto;
+
+          a[href] {
+            text-decoration: underline;
+          }
+
+          img {
+            max-width: 100%;
+          }
+        }
+      }
+    }
+
+    .controls {
+      ul {
+        list-style-type: none;
+      }
+
+      a {
+        padding: 5px 10px;
+        margin-bottom: 10px;
+      }
+    }
+
+    &.collapsed-info {
+      .controls {
+        margin-top: 0;
+      }
+
+      .profile-image {
+        height: 0;
+      }
+
+      .details {
+        margin-top: 0;
+        background: rgba($secondary, .8);
+
+        .bio {
+          display: none;
+        }
+
+        .primary {
+          text-align: left;
+          margin-top: 0;
+          width: 100%;
+
+          .avatar {
+            float: left;
+            margin-right: 10px;
+            width: 45px;
+            height: 45px;
+          }
+
+          h1 {
+            font-size: 1.429em;
+          }
+
+          h2 {
+            font-size: 1.143em;
+            margin-top: 4px;
+          }
+
+          h3 {
+            display: none;
+          }
+        }
+      }
+    }
+  }
+
+  .staff-counters {
+    background: $primary;
+    color: $secondary;    
+    display: flex;
+    padding: 10px;    
+    > div, > div a {
+      display: flex;
+      align-items: baseline;
+      flex: 0 1 auto;
+      margin: 0 10px 0 0;
+      span {
+        padding: 1px 6px;
+        border-radius: 10px;
+        margin-right: 5px;        
+      }
+    }  
+
     a {
-      color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%));
-    }
-
-    a:hover i {
-      color: $quaternary;
-    }
-
-    a.active i {
       color: $secondary;
     }
 
-    i {
-      color: dark-light-choose(scale-color($primary, $lightness: 55%), scale-color($secondary, $lightness: 55%));
+    .active {
+      font-weight: bold;
+    }
+  }
+
+  .pill {
+    border-radius: 15px;
+    display: inline-block;
+    height: 30px;
+    width: 30px;
+    text-align: center;
+    vertical-align: middle;
+    line-height: 30px;
+  }
+
+  .helpful-flags {
+    background-color: green;
+  }
+
+  .flagged-posts {
+    background-color: #E49735;
+  }
+
+  .warnings-received {
+    background-color: #EC441B;
+  }
+
+  .deleted-posts {
+    background-color: #EC441B;
+  }
+
+  .suspensions {
+    background-color: #c22020;
+  }
+
+  .user-field {
+    clear: both;
+    margin-bottom: 10px;
+
+    &.text {
+      padding-top: 18px;
+    }
+
+    .controls {
+      label {
+        width: auto;
+        text-align: left;
+        font-weight: normal;
+        float: auto;
+      }
+
+      .instructions {
+      color: dark-light-choose($primary-medium, $secondary-medium);
+        margin-top: 5px;
+        margin-bottom: 10px;
+        font-size: .857em;
+        line-height: 1.4em;
+      }
     }
   }
 }
@@ -42,31 +267,33 @@
     text-align: top;
     color: $danger;
     font-weight: bold;
-    font-size: 1.3em;
+    font-size: 1.286em;
   }
 }
 
 .public-user-fields {
   margin-top: 8px;
   margin-bottom: 8px;
+
   .user-field-name {
     font-weight: bold;
   }
-}
 
-.collapsed-info .public-user-fields {
-  display: none;
+  .collapsed-info & {
+    display: none;
+  }
 }
 
 .user-navigation {
-
   .map {
     height: 50px;
   }
+
   .avatar {
     float: left;
     width: 45px;
   }
+
   nav.buttons {
     width: 180px;
     padding: 0;
@@ -76,6 +303,7 @@
       box-sizing: border-box;
     }
   }
+
   h2 {
     a {
       font-size: 1em;
@@ -83,10 +311,21 @@
       cursor: pointer;
     }
   }
+}
 
+.user-table {
+  position: relative;
+  margin-top: 20px;
 }
 
 .avatar-selector {
+  padding-bottom: 0 !important;
+  label.radio {
+    padding-left: 10px;
+  }
+  .avatar-choice {
+    min-height: 40px;
+  }
   label {
     display: inline-block;
     margin-right: 10px;
@@ -99,90 +338,21 @@
   .avatar {
     margin: 5px 10px 5px 0;
   }
+  p.error {
+    color: $danger;
+  }
 }
 
 .new-private-message {
   margin-bottom: 15px;
 }
 
-.user-info {
-  display: inline-block;
-  clear: both;
-  margin-bottom: 1em;
-
-  .user-image {
-    float: left;
-    padding-right: 4px;
-  }
-
-  .user-detail {
-    float: left;
-    width: 70%;
-    padding-left: 5px;
-    font-size: 13px;
-
-    .name-line {
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-
-    .username a {
-      font-weight: bold;
-      color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
-    }
-
-    .name {
-      margin-left: 5px;
-      color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
-    }
-
-    .title {
-      margin-top: 3px;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-    }
-  }
-}
-
-.user-info.small {
-  width: 333px;
-}
-
-.user-info.medium {
-  width: 480px;
-  min-height: 60px;
-
-  .user-image {
-    width: 55px;
-  }
-  .user-detail {
-    width: 380px;
-  }
-
-  .username, .name {
-    display: block;
-  }
-
-  .name {
-    margin-left: 0;
-  }
-}
-
 .user-nav {
   margin: 5px 0px;
   padding-top: 10px;
-  .fa {
-    margin-right: 5px;
-  }
-  .fa.fa-comment {
-    margin-right: 2px;
-  }
-}
 
-.user-right .list-actions {
-  margin-bottom: 10px;
-  .btn {
-    margin-right: 10px;
+  li a {
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 }
 
@@ -255,11 +425,11 @@
     &.linked-stat { // This makes the entire "box" (the li) clickable instead of a narrow area.
       padding: 0;
       a {
-        padding: 10px 14px;
+        padding: 10px 14px;        
         width: 100%;
         height: 100%;
         display: block;
-        color: black;
+        color: $primary;
       }
     }
   }
@@ -270,11 +440,17 @@
 
   .value {
     font-weight: bold;
-    font-size: 1.2em;
+    font-size: 1.286em;
   }
 
   .label {
-    color: dark-light-diff($primary, $secondary, 50%, -50%);
+    // TODO: Remove once all languages have been translated to remove icons from
+    // their user-stat labels
+    .fa:nth-of-type(2) {
+      display: none;
+    }
+
+    color: blend-primary-secondary(50%);
   }
 }
 
@@ -286,13 +462,18 @@
   }
 
   li {
-    border-left: dark-light-diff($primary, $secondary, 90%, -65%) solid 2px;
+    border-left: $primary-low solid 2px;
     padding: 5px 8px;
     margin: 10px 0;
   }
 
   .topic-info {
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%));
+    color: dark-light-choose($primary-medium, $secondary-high);
+  }
+
+  @media all and (max-width : 600px) {
+    float: none;
+    width: 100%;
   }
 }
 
@@ -306,30 +487,102 @@
 
 .links-section {
   .domain {
-    font-size: 0.714em;
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%));
+    font-size: 0.786em;
+    color: dark-light-choose($primary-medium, $secondary-high);
   }
 }
 
-.likes-section {
+.summary-user-list {
   li {
     height: 40px;
   }
 }
 
-@media all
-and (max-width : 600px) {
-  .top-sub-section {
-    float: none;
-    width: 100%;
+.groups {
+  .group-link {
+    color: $tertiary;
   }
 }
 
-.user-preferences .tags .select2-container-multi {
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-  width: 540px;
-  border-radius: 0;
-  .select2-choices {
-    border: none;
+.user-preferences {
+  textarea {
+    height: 100px;
+  }
+
+  .static {
+    color: $primary;
+    display: inline-block;
+  }
+
+  .instructions {
+    color: dark-light-choose($primary-medium, $secondary-medium);
+    margin-bottom: 10px;
+    font-size: .857em;
+    line-height: 1.4em;
+
+    a[href] {
+      color: $tertiary;
+    }
+  }
+
+  .avatar {
+    margin-left: 3px;
+  }
+
+  .warning {
+    background-color: $danger-medium;
+    padding: 5px 8px;
+    color: $secondary;
+    width: 520px;
+  }
+
+  .category-notifications .category-controls,
+  .tag-notifications .tag-controls {
+    margin-top: 24px;
+  }
+
+  .tags .select2-container-multi {
+    border: 1px solid $primary-low;
+    width: 540px;
+    border-radius: 0;
+    .select2-choices {
+      border: none;
+    }
   }
 }
+
+.paginated-topics-list {
+  .user-content {
+    width: 100%;
+    margin-top: 0;
+  }
+}
+
+.large-notification {
+  display: flex;
+  align-items: center;
+
+  a {
+    display: flex;
+    align-items: center;
+
+    .d-icon {
+      margin-right: 0.5em;
+    }
+
+    span {
+      color: $primary;
+    }
+
+    // Can remove this once other languages have removed html from i18n values
+    div  {
+      .fa {
+        display: none;
+      }
+      p {
+        margin: 0;
+      }
+    }
+  }
+}
+
diff --git a/app/assets/stylesheets/common/base/username_tagsinput.scss b/app/assets/stylesheets/common/base/username_tagsinput.scss
index c18494c18c..66e5b32ea1 100644
--- a/app/assets/stylesheets/common/base/username_tagsinput.scss
+++ b/app/assets/stylesheets/common/base/username_tagsinput.scss
@@ -20,10 +20,10 @@ div.tagsinput span.tag {
   margin-right: 5px;
   margin-bottom:5px;
   font-family: helvetica;
-  font-size:13px;
+  font-size: .929em;
 }
 
-div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: 11px;  }
+div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: .786em;  }
 div.tagsinput input {
   width:80px;
   font-family: helvetica;
diff --git a/app/assets/stylesheets/common/components/auto-update-input-selector.scss b/app/assets/stylesheets/common/components/auto-update-input-selector.scss
deleted file mode 100644
index 65207f3c1c..0000000000
--- a/app/assets/stylesheets/common/components/auto-update-input-selector.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-.auto-update-input-selector-datetime {
-  float: right;
-  color: lighten($primary, 40%);
-  font-size: 13px;
-}
-
-.auto-update-input-selector-icons {
-  margin-right: 10px;
-}
diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index 8273d97c8b..b988ed4094 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -28,7 +28,7 @@
     display: inline-flex;
 
     span.badge-category {
-      color: $primary !important;
+      color: $primary;
       padding: 3px;
       vertical-align: text-top;
       margin-top: -2px; //vertical alignment fix
@@ -37,7 +37,7 @@
       text-overflow: ellipsis;
 
       .extra-info-wrapper & {
-        color: $header-primary !important;
+        color: $header-primary;
       }
     }
 
@@ -51,15 +51,20 @@
     }
   }
 
+  &.none { // no category style
+    color: $primary;
+    margin-right: 5px;
+  }
+
   &.bullet { //bullet category style
     display: inline-flex;
     align-items: baseline;
     margin-right: 5px;
-    font-size: 12px;
+    font-size: .857em;
     line-height: 15px;
 
     span.badge-category {
-      color: $primary !important;
+      color: $primary;
       display: inline-block;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -69,7 +74,7 @@
       }
 
       .extra-info-wrapper & {
-        color: $header-primary !important;
+        color: $header-primary;
       }
     }
 
@@ -148,34 +153,36 @@
 
 
 .list-controls {
-.category-breadcrumb {
-  a.badge-category {
+  .category-breadcrumb {
+    a.badge-category, .dropdown-header {
       display: inline-block;
       padding: 5px 8px;
       line-height: 20px;
-    &.category-dropdown-button {
-      margin-left: -4px;
-      padding: 5px;
-      width: 13px;
 
-      .fa-caret-right {
-        margin-left: 2px;
+      &.category-dropdown-button {
+        margin-left: -4px;
+        padding: 5px;
+        width: 13px;
+
+        .d-icon-caret-right {
+          margin-left: 2px;
         }
       }
     }
 
-    li.bar>.badge-category:not(.home):first-child {
+    li.bar>.dropdown-header:not(.home):first-child {
       border-left: 5px solid;
+      font-size: 1em;
     }
 
-    li.bar>.badge-category {
-      background: dark-light-diff($primary, $secondary, 90%, -65%) !important;
-      color: $primary !important;
+    li.bar>.dropdown-header {
+      background: $primary-low;
+      color: $primary;
     }
 
-    li.bullet>.badge-category {
-      background: dark-light-diff($primary, $secondary, 90%, -65%) !important;
-      color: $primary !important;
+    li.bullet>.dropdown-header {
+      background: $primary-low;
+      color: $primary;
 
       .badge-category-bg {
         width: 10px;
@@ -184,12 +191,10 @@
         margin: 0 2px;
       }
     }
-
-
   }
 
   .category-dropdown-menu {
-    .badge-category {
+    .dropdown-header {
       &.home {
         margin-left: 4px;
         padding-left: 0;
@@ -208,6 +213,9 @@
           max-width: 100px;
         }
       }
+      &.none {
+        padding: 5px;
+      }
       &.bullet {
         padding: 5px;
         width: 100%;
@@ -243,10 +251,10 @@
   padding: 4px 5px 2px 5px;
   vertical-align: middle;
   color: $secondary;
-  font-size: 11px;
+  font-size: .786em;
   line-height: 1;
   text-align: center;
-  background-color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 70%));
+  background-color: dark-light-choose($primary-low-mid, $secondary-low);
   &[href] {
     color: $secondary;
   }
@@ -258,14 +266,14 @@
   // New posts
 
   &.new-posts, &.unread-posts {
-    background-color: dark-light-choose(scale-color($tertiary, $lightness: 50%), $tertiary);
+    background-color: dark-light-choose($tertiary-medium, $tertiary);
     color: dark-light-choose($secondary, $secondary);
     font-weight: dark-light-choose(normal, bold);
   }
 
   &.new-topic {
     background-color: transparent;
-    color: scale-color($tertiary, $lightness: 20%);
+    color: $tertiary-high;
     font-weight: normal;
     font-size: 0.929em;
   }
@@ -279,9 +287,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;
@@ -296,7 +304,7 @@
   font-size: 1em;
   line-height: 1;
   &[href] {
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 }
 
@@ -308,8 +316,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/banner.scss b/app/assets/stylesheets/common/components/banner.scss
index 5fe427df04..096c01e02a 100644
--- a/app/assets/stylesheets/common/components/banner.scss
+++ b/app/assets/stylesheets/common/components/banner.scss
@@ -4,10 +4,9 @@
 
 #banner {
   padding: 10px;
-  border-radius: 5px;
-  background: scale-color($tertiary, $lightness: 90%);
-  box-shadow: 0 1px 2px scale-color($tertiary, $lightness: 70%);
-  color: darken($tertiary, 45%);
+  background: $tertiary-low;
+  box-shadow: 0 2px 4px -1px rgba(0,0,0, .25);
+  color: $primary;
   z-index: 1001;
   overflow: auto;
 
@@ -18,7 +17,7 @@
   .close {
     font-size: 1.786em;
     margin-top: -5px;
-    color: scale-color($tertiary, $lightness: 70%);
+    color: dark-light-choose($primary-low-mid, $secondary-medium);
     padding-left: 5px;
     float: right;
   }
diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss
index a1a3f4bc6d..a3ce89e5c9 100644
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@@ -5,7 +5,6 @@
 // Base
 // --------------------------------------------------
 
-
 .btn {
   display: inline-block;
   margin: 0;
@@ -17,7 +16,7 @@
   cursor: pointer;
   transition: all .25s;
 
-  &:active {
+  &:active, &.btn-active {
     text-shadow: none;
   }
   &[disabled], &.disabled {
@@ -46,25 +45,25 @@
   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%);
+  &:hover, &.btn-hover {
+    background: $primary-medium; 
     color: $secondary;
   }
   &[disabled], &.disabled {
-    background: dark-light-diff($primary, $secondary, 90%, -60%);
-    &:hover { color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); }
+    background: $primary-low; 
+    &:hover { color: dark-light-choose($primary-low-mid, $secondary-high); }
     cursor: not-allowed;
   }
 
-  i.fa {
+  .d-icon {
     opacity: 0.7;
   }
-  &.btn-primary i.fa {
+  &.btn-primary .d-icon {
     opacity: 1;
   }
 }
@@ -75,18 +74,18 @@
 .btn-primary {
   border: none;
   font-weight: normal;
-  color: dark-light-choose(#fff, scale-color($primary, $lightness: 60%));
+  color: $secondary;
   background: $tertiary;
 
   &[href] {
     color: $secondary;
   }
-  &:hover {
+  &:hover, &.btn-hover {
     color: #fff;
-    background: dark-light-choose(scale-color($tertiary, $lightness: -20%), scale-color($tertiary, $lightness: -20%));
+    background: dark-light-choose($tertiary, $tertiary);
   }
-  &:active {
-    @include linear-gradient(scale-color($tertiary, $lightness: -20%), scale-color($tertiary, $lightness: -10%));
+  &:active, &.btn-active {
+    @include linear-gradient($tertiary, $tertiary);
     color: $secondary;
   }
   &[disabled], &.disabled {
@@ -104,10 +103,10 @@
   &[href] {
     color: $secondary;
   }
-  &:hover{
+  &:hover, &.btn-hover {
     background: scale-color($danger, $lightness: -20%);
   }
-  &:active {
+  &:active, &.btn-active {
     @include linear-gradient(scale-color($danger, $lightness: -20%), $danger);
   }
   &[disabled], &.disabled {
@@ -128,7 +127,7 @@
   &:before {
     margin-right: 9px;
     font-family: FontAwesome;
-    font-size: 17px;
+    font-size: 1.214em;
   }
   &.google, &.google_oauth2 {
     background: $google;
@@ -189,3 +188,12 @@
   font-size: 1.143em;
   line-height: 20px;
 }
+
+.btn-flat {
+  background: transparent;
+  border: 0;
+  outline: 0;
+  .d-icon {
+    opacity: 0.7;
+  }
+}
diff --git a/app/assets/stylesheets/common/components/hashtag.scss b/app/assets/stylesheets/common/components/hashtag.scss
index f3ae1052a5..4cf0903d44 100644
--- a/app/assets/stylesheets/common/components/hashtag.scss
+++ b/app/assets/stylesheets/common/components/hashtag.scss
@@ -1,9 +1,9 @@
 a.hashtag {
-  color: dark-light-choose($primary, scale-color($primary, $lightness: 70%));
+  color: dark-light-choose($primary, $primary-low-mid);
   font-weight: bold;
 
   &:visited, &:hover {
-    color: dark-light-choose($primary, scale-color($primary, $lightness: 70%));
+    color: dark-light-choose($primary, $primary-low-mid);
   }
 
   &:hover {
diff --git a/app/assets/stylesheets/common/components/navs.scss b/app/assets/stylesheets/common/components/navs.scss
index 59a34aad62..55477793a0 100644
--- a/app/assets/stylesheets/common/components/navs.scss
+++ b/app/assets/stylesheets/common/components/navs.scss
@@ -20,9 +20,11 @@
 .nav-pills {
   @extend %nav;
   @extend .clearfix;
+
   > li {
     float: left;
     margin-right: 5px;
+
     > a {
       border: none;
       padding: 5px 12px;
@@ -30,14 +32,26 @@
       font-size: 1.143em;
       line-height: 20px;
       transition: background .15s;
+
+      .d-icon {
+        margin-right: 5px;
+        opacity: .65;
+      }
+
       &:hover {
         color: $quaternary;
-        background-color: dark-light-diff($quaternary, $secondary, 70%, -70%);
+        background-color: $quaternary-low;
       }
     }
-    &.active > a, > a.active {
+
+    &.active > a,
+    > a.active {
       color: $secondary;
       background-color: $quaternary;
+
+      .d-icon {
+        opacity: 1;
+      }
     }
   }
 }
@@ -49,39 +63,42 @@
   @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;
     }
-    a {
-      margin: 0;
-      padding: 13px 13px 13px 30px;
-      font-size: 1.143em;
-      line-height: 20px;
-      cursor: pointer;
-      color: $primary;
+
+    &.indent {
+      padding-left: 15px;
     }
   }
-  > li.indent {
-    padding-left: 15px;
-  }
-  .active > a, & li > a.active
-  {
-    color: $secondary;
-    background-color: $quaternary;
-  }
 
-  .active > a::after, & li > a.active::after
-  {
-    left: 90%;
-    top: 33%;
-    content: " ";
-    position: absolute;
-    border: 8px solid transparent;
-    border-left-color: $secondary;
+  a {
+    margin: 0;
+    padding: 13px;
+    font-size: 1.143em;
+    line-height: 20px;
+    cursor: pointer;
+    color: $primary;
+
+    &.active {
+      color: $secondary;
+      background-color: $quaternary;
+
+      &::after {
+        left: 90%;
+        top: 33%;
+        content: " ";
+        position: absolute;
+        border: 8px solid transparent;
+        border-left-color: $secondary;
+      }
+    }
   }
 
   .count {
@@ -91,10 +108,9 @@
 
   .glyph {
     font-size: 0.857em;
-    width: 30px;
+    width: 1.25em;
     text-align: center;
-    position: absolute;
-    left: 2px;
+    margin-right: .5em;
     line-height: 20px;
   }
 }
diff --git a/app/assets/stylesheets/common/components/user-info.scss b/app/assets/stylesheets/common/components/user-info.scss
new file mode 100644
index 0000000000..b6e0b71ad1
--- /dev/null
+++ b/app/assets/stylesheets/common/components/user-info.scss
@@ -0,0 +1,71 @@
+// Common styles for "user-info" component
+.user-info {
+  display: inline-block;
+  clear: both;
+  margin-bottom: 1em;
+
+  .user-image {
+    float: left;
+    padding-right: 4px;
+  }
+
+  .user-detail {
+    float: left;
+    width: 70%;
+    padding-left: 5px;
+    font-size: .929em;
+
+    .name-line {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    .username a {
+      font-weight: bold;
+      color: dark-light-choose($primary-high, $secondary-low);
+    }
+
+    .name {
+      margin-left: 5px;
+      color: dark-light-choose($primary-high, $secondary-low);
+    }
+
+    .title {
+      margin-top: 3px;
+      color: dark-light-choose($primary-medium, $secondary-medium);
+    }
+  }
+
+  &.small {
+    width: 333px;
+    @media screen and (max-width: 600px) {
+      width: 100%;
+    }
+  }
+
+  &.medium {
+    min-height: 60px;
+
+    .username, .name {
+      display: block;
+    }
+
+    .name {
+      margin-left: 0;
+    }
+
+    &.badge-info {
+      min-height: 80px;
+
+      .granted-on {
+        color: dark-light-choose($primary-medium, $secondary-medium);
+      }
+
+      .post-link {
+        display: block;
+        margin-top: 0.2em;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/components/user-stream-item.scss b/app/assets/stylesheets/common/components/user-stream-item.scss
new file mode 100644
index 0000000000..5c98eff7d2
--- /dev/null
+++ b/app/assets/stylesheets/common/components/user-stream-item.scss
@@ -0,0 +1,135 @@
+// Common styles for "user-stream-item" component
+.user-stream {
+
+  // DEPRECATED:
+  // The ".item" class should be removed because it's too generic.
+  // Once ".item" has been removed, ".user-stream-item" can replace
+  // ".user-stream" as the top-level selector on this file as all other
+  // selectors below are its children
+  .item,
+  .user-stream-item {
+    background-color: $secondary;
+    border-bottom: 1px solid $primary-low;
+
+    &.moderator-action {
+      background-color: $highlight-medium;
+    }
+
+    &.deleted {
+      opacity: 0.8;
+      background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -10%);
+    }
+
+    &.hidden {
+      display: block;
+      opacity: 0.4;
+    }
+  }
+
+  .type,
+  span.name {
+    color: $primary;
+  }
+
+  .time,
+  .delete-info {
+    display: block;
+    float: right;
+    color: lighten($primary, 40%);
+    font-size: .786em;
+  }
+
+  .delete-info i {
+    font-size: 1em;
+  }
+
+  .expand-item, .collapse-item {
+    float: right;
+    margin-right: 0.5em;
+    color: lighten($primary, 40%);
+  }
+
+  .avatar-link {
+    float: left;
+    margin-right: 4px;
+  }
+
+  .title {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: block;
+  }
+
+  .name {
+    font-size: 1em;
+    max-width: 400px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .edit-reason {
+    background-color: dark-light-choose($highlight-medium, scale-color($highlight, $lightness: -50%));
+    padding: 3px 5px 5px 5px;
+  }
+
+  .remove-bookmark {
+    float: right;
+    margin-top: -4px;
+  }
+
+  .notification {
+    li {
+      display: inline-block;
+    }
+
+    p {
+      display: inline-block;
+      margin-left: 10px;
+      span {
+        color: $primary;
+      }
+    }
+
+    .time {
+      display: inline-block;
+      margin-left: 10px;
+      float: none;
+    }
+
+    // common/base/header.scss
+    .fa, .icon {
+      color: dark-light-choose($primary-medium, $secondary-medium);
+      font-size: 1.714em;
+    }
+  }
+
+  .excerpt {
+    margin: 5px 0;
+    font-size: 0.929em;
+    word-wrap: break-word;
+    color: $primary;
+
+    details.disabled {
+      color: $primary-medium;
+    }
+  }
+}
+
+.user-stream .child-actions, // DEPRECATED: '.user-stream .child-actions' selector
+.user-stream-item-actions {
+  margin-top: 8px;
+
+  .avatar-link {
+    float: none;
+    margin-right: 3px;
+  }
+
+  .fa {
+    width: 15px;
+    display: inline-block;
+    color: $primary;
+  }
+}
+
diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss
index 8d3d618390..046338d39d 100644
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@@ -1,9 +1,7 @@
-.d-editor {
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-}
-
 .d-editor-container {
-  padding: 0 10px 13px 10px;
+  display: flex;
+  flex-grow: 1;
+  max-width: 100%;
 }
 
 .d-editor-overlay {
@@ -18,34 +16,67 @@
   z-index: 1001;
 }
 
+.d-editor {
+  display: flex;
+  flex-grow: 1;
+  min-height: 0;
+}
+
 .d-editor .d-editor-modal {
   min-width: 400px;
+  @media screen and (max-width: 424px) {
+    min-width: 300px;
+  }
   position: absolute;
   background-color: $secondary;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low;
   padding: 1em;
   top: 25px;
 
   input {
-    width: 98%;
+    width: 95%;
   }
   h3 {
     margin-bottom: 0.5em;
   }
 }
 
-.d-editor-button-bar {
-  margin: 5px;
-  padding: 0;
-  height: 20px;
-  overflow: hidden;
+.d-editor-textarea-wrapper,
+.d-editor-preview-wrapper {
+  flex: 1;
+}
 
+.d-editor-textarea-wrapper {
+  display: flex;
+  flex-direction: column;
+  background-color: $secondary;
+  position: relative;
+  border: 1px solid $primary-medium;
+  
+  textarea {
+    background: transparent;
+  }
+
+}
+
+.d-editor-preview-wrapper {
+  max-width: 49%;
+  margin-left: 1%;
+  display: flex;
+  flex-direction: column;
+}
+
+.d-editor-button-bar {
+  display: flex;
+  align-items: center;
+  border-bottom: none;
+  min-height: 30px;
+  padding-left: 3px;
+  border-bottom: 1px solid $primary-low;
+  
   button {
     background-color: transparent;
-    padding: 2px 4px;
-    float: left;
-    margin-right: 6px;
-    min-width: 20px;
+    color: $primary-high;
   }
 
   .btn:not(.no-text) {
@@ -59,61 +90,95 @@
   .btn.italic {
     font-style: italic;
   }
-
-  .btn.heading {
-    font-family: Palatino, Cambria, Georgia, "Times New Roman", serif;
-    font-weight: bold;
-  }
 }
 
 .d-editor-spacer {
   width: 1px;
   height: 20px;
-  margin-right: 8px;
-  margin-left: 5px;
-  background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+  margin: 0 5px;
+  background-color: $primary-low;
   display: inline-block;
-  float: left;
+}
+
+.d-editor-preview-wrapper {
+  overflow: auto;
+  cursor: default;
+}
+
+.d-editor-input,
+.d-editor-preview {
+  box-sizing: border-box;
+  flex: 1 1 100%;  
+  width: 100%;  
+  margin: 0;
+  min-height: auto;
+  word-wrap: break-word;
+  -webkit-appearance: none;
+  border-radius: 0;  
+  &:focus {
+    box-shadow: none;
+    border: 0;
+    outline: 0;
+  }
 }
 
 .d-editor-input {
-  color: $primary;
-  width: 98%;
-  height: 200px;
-
-  &:disabled {
-    background-color: dark-light-diff($primary, $secondary, 90%, -60%);
-  }
+  border: 0;
+  padding: 10px;
+  height: 100%;
+  overflow-x: hidden;
+  resize: none; 
 }
 
 .d-editor-preview {
-  color: $primary;
-  border: 1px dashed dark-light-diff($primary, $secondary, 90%, -60%);
-  overflow: auto;
-  cursor: default;
-  margin-top: 8px;
-  padding: 8px 8px 0 8px;
-  video {
-    max-width: 100%;
-    max-height: 500px;
-    height: auto;
-  }
-  audio {
-    max-width: 100%;
-  }
-  &.hidden {
-    width: 0;
-    visibility: hidden;
-  }
-
+  height: auto;
 }
-.composing-whisper {
-  .d-editor-preview {
-    font-style: italic;
-    color: dark-light-diff($primary, $secondary, 55%, -40%) !important;
-  }
+
+.d-editor-plugin {
+  display: flex;
+  flex: 1 1;
+  overflow: auto;
+}
+
+.composing-whisper .d-editor-preview {
+  font-style: italic;
+  color: $primary-medium !important;
 }
 
 .d-editor-preview > *:first-child {
   margin-top: 0;
 }
+
+.hide-preview .d-editor-preview-wrapper {
+  display: none;
+  flex: 0;
+}
+
+.user-preferences .bio-composer,
+.edit-category-tab-topic-template {
+  textarea {
+    width: 100%;
+  }
+  .d-editor-container {
+    display: block;
+  }
+  .d-editor-textarea-wrapper {
+    border: 1px solid $primary-low;
+  }
+  .d-editor-button-bar .btn {
+    padding: 6px 8px;
+  }
+  .d-editor-preview-wrapper {
+    max-width: 100%;
+    margin: 10px 0 0 0;
+  }
+  .d-editor-preview {
+    background-color: $primary-very-low;
+    padding: 5px;
+  }
+}
+
+.user-preferences .bio-composer {
+  padding: 10px;
+  border: 1px solid $primary-low;
+}
diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss
index 35b0418187..bf08280bb1 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/helpers.scss b/app/assets/stylesheets/common/foundation/helpers.scss
index 2b540dca04..883c8926cf 100644
--- a/app/assets/stylesheets/common/foundation/helpers.scss
+++ b/app/assets/stylesheets/common/foundation/helpers.scss
@@ -81,6 +81,6 @@
 // Buttons
 // ---------------------------------------------------
 .disable-no-hover:hover {
-  background: dark-light-choose(scale-color($primary, $lightness: 90%), scale-color($secondary, $lightness: 60%));;
+  background: dark-light-choose($primary-low, $secondary-medium);;
   color: $primary;
 }
diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss
index f9c3ca2a5a..24d3a00a43 100644
--- a/app/assets/stylesheets/common/foundation/mixins.scss
+++ b/app/assets/stylesheets/common/foundation/mixins.scss
@@ -88,16 +88,20 @@
 
 // Unselectable (avoids unwanted selections with iPad, touch laptops, etc)
 
+@mixin user-select($mode) {
+  -webkit-user-select: $mode;
+     -moz-user-select: $mode;
+      -ms-user-select: $mode;
+}
+
 @mixin unselectable {
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
+  @include user-select(none);
 }
 
 
 // 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%);
 }
 
@@ -106,3 +110,10 @@
 	-webkit-transform: $transforms;
             transform: $transforms;
 }
+
+
+@mixin appearance-none() { // resets default browser styles
+  -webkit-appearance: none;
+  -moz-appearance:    none;
+  appearance:         none;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss
index 43eb44cdb2..e0cd65a646 100644
--- a/app/assets/stylesheets/common/foundation/variables.scss
+++ b/app/assets/stylesheets/common/foundation/variables.scss
@@ -35,8 +35,8 @@ $base-font-family: Helvetica, Arial, sans-serif !default;
 
 // Color Utilities
 
-// w3c definition of color brightness
-@function brightness($color) {
+// w3c definition of color brightness https://www.w3.org/TR/AERT#color-contrast
+@function dc-color-brightness($color) {
   @return ((red($color) * .299) + (green($color) * .587) + (blue($color) * .114));
 }
 
@@ -65,16 +65,60 @@ $base-font-family: Helvetica, Arial, sans-serif !default;
 }
 
 @function dark-light-diff($adjusted-color, $comparison-color, $lightness, $darkness) {
-  @if brightness($adjusted-color) < brightness($comparison-color) {
+  @if dc-color-brightness($adjusted-color) < dc-color-brightness($comparison-color) {
     @return scale-color($adjusted-color, $lightness: $lightness);
   } @else {
     @return scale-color($adjusted-color, $lightness: $darkness);
   }
 }
 @function dark-light-choose($light-theme-result, $dark-theme-result) {
-  @if brightness($primary) < brightness($secondary) {
+  @if dc-color-brightness($primary) < dc-color-brightness($secondary) {
     @return $light-theme-result;
   } @else {
     @return $dark-theme-result;
   }
 }
+
+// standard color transformations, use these if possible, and add any new dark-light-diffs here
+
+//primary
+$primary-very-low: dark-light-diff($primary, $secondary, 97%, -80%);
+$primary-low: dark-light-diff($primary, $secondary, 90%, -65%);
+$primary-low-mid: dark-light-diff($primary, $secondary, 70%, -45%);
+$primary-medium: dark-light-diff($primary, $secondary, 50%, -35%);
+$primary-high: dark-light-diff($primary, $secondary, 30%, -10%);
+
+//header_primary
+$header_primary-low: dark-light-diff($header_primary, $secondary, 90%, -65%);
+$header_primary-medium: dark-light-diff($header_primary, $secondary, 50%, -20%);
+$header_primary-high: dark-light-diff($header_primary, $secondary, 20%, 20%);
+
+
+//secondary
+$secondary-low: dark-light-diff($secondary, $primary, 70%, -70%);
+$secondary-medium: dark-light-diff($secondary, $primary, 50%, -50%);
+$secondary-high: dark-light-diff($secondary, $primary, 30%, -35%);
+
+//tertiary
+$tertiary-low: dark-light-diff($tertiary, $secondary, 85%, -65%);
+$tertiary-medium: dark-light-diff($tertiary, $secondary, 50%, -45%);
+$tertiary-high: dark-light-diff($tertiary, $secondary, 20%, -25%);
+
+//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%);
+$highlight-high: dark-light-diff($highlight, $secondary, -50%, -10%);
+
+//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, 80%, -60%);
+$success-medium: dark-light-diff($success, $secondary, 50%, -40%);
+
+//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 fae0176e2a..5f02aeb111 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/printer-friendly.scss b/app/assets/stylesheets/common/printer-friendly.scss
index d640737b47..dc7ad0e495 100644
--- a/app/assets/stylesheets/common/printer-friendly.scss
+++ b/app/assets/stylesheets/common/printer-friendly.scss
@@ -22,7 +22,7 @@
   .post-action,
   .saving-text,
   .draft-text,
-  #discourse-modal,
+  .discourse-modal,
   div.read-state,
   div.read-state.read,
   .edit-topic,
diff --git a/app/assets/stylesheets/common/select-kit/admin-agree-flag-dropdown.scss b/app/assets/stylesheets/common/select-kit/admin-agree-flag-dropdown.scss
new file mode 100644
index 0000000000..9c1e778499
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/admin-agree-flag-dropdown.scss
@@ -0,0 +1,17 @@
+.select-box-kit-body, .select-kit {
+  &.dropdown-select-box {
+
+    &.admin-agree-flag-dropdown {
+      .select-box-kit-body {
+        width: 485px;
+        max-width: 485px;
+      }
+      .select-box-kit-row[data-value="delete-spammer"] .texts .name,
+      .select-kit-row[data-value="delete-spammer"] .texts .name,
+      .select-box-kit-row[data-value="delete-spammer"] .icons .d-icon,
+      .select-kit-row[data-value="delete-spammer"] .icons .d-icon {
+        color: $danger;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/admin-delete-flag-dropdown.scss b/app/assets/stylesheets/common/select-kit/admin-delete-flag-dropdown.scss
new file mode 100644
index 0000000000..ffdf62634b
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/admin-delete-flag-dropdown.scss
@@ -0,0 +1,16 @@
+.select-box-kit {
+  &.dropdown-select-box {
+    width: auto;
+    &.admin-delete-flag-dropdown {
+      .dropdown-select-box-header .btn {
+        background: $danger;
+        color: white;
+      }
+
+      .select-box-kit-row[data-value="delete-spammer"] .texts .name,
+      .select-box-kit-row[data-value="delete-spammer"] .icons .d-icon {
+        color: $danger;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/categories-admin-dropdown.scss b/app/assets/stylesheets/common/select-kit/categories-admin-dropdown.scss
new file mode 100644
index 0000000000..9e3326dd0e
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/categories-admin-dropdown.scss
@@ -0,0 +1,12 @@
+.select-box-kit, .select-kit {
+  &.categories-admin-dropdown {
+    .select-box-kit-body, .select-kit-body {
+      min-width: auto;
+      width: 250px;
+    }
+
+    .select-box-kit-header .d-icon, .select-kit-header .d-icon {
+      justify-content: space-between;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/category-chooser.scss b/app/assets/stylesheets/common/select-kit/category-chooser.scss
new file mode 100644
index 0000000000..62da15be23
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/category-chooser.scss
@@ -0,0 +1,46 @@
+.select-box-kit, .select-kit {
+  &.combo-box {
+    &.category-chooser {
+      width: 300px;
+      .select-box-kit-row, .select-kit-row {
+        display: -webkit-box;
+        display: -ms-flexbox;
+        display: flex;
+        -webkit-box-align: flex-start;
+            -ms-flex-align: flex-start;
+                align-items: flex-start;
+        -webkit-box-orient: vertical;
+        -webkit-box-direction: normal;
+            -ms-flex-direction: column;
+                flex-direction: column;
+
+        &.none {
+          .topic-count {
+            display: none;
+          }
+        }
+
+        .topic-count {
+          font-size: .786em;
+          color: $primary;
+        }
+
+        .category-status {
+          color: $primary;
+          -webkit-box-flex: 0;
+              -ms-flex: 1 1 auto;
+                  flex: 1 1 auto;
+        }
+
+        .category-desc {
+          -webkit-box-flex: 0;
+              -ms-flex: 1 1 auto;
+                  flex: 1 1 auto;
+          color: #919191;
+          font-size: 0.857em;
+          line-height: 16px;
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/category-selector.scss b/app/assets/stylesheets/common/select-kit/category-selector.scss
new file mode 100644
index 0000000000..9dc274553e
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/category-selector.scss
@@ -0,0 +1,9 @@
+.select-kit, .select-kit-box {
+  .selected-name  {
+    .badge-wrapper {
+      display: inline-flex;
+      align-items: center;
+      line-height: inherit;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/combo-box.scss b/app/assets/stylesheets/common/select-kit/combo-box.scss
new file mode 100644
index 0000000000..f1f73828c5
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/combo-box.scss
@@ -0,0 +1,84 @@
+.select-box-kit, .select-kit {
+  &.combo-box {
+
+    .select-box-kit-body, .select-kit-body {
+      width: 100%;
+    }
+
+    .select-box-kit-row, .select-kit-row {
+      margin: 5px;
+      min-height: 1px;
+      padding: 5px;
+    }
+
+    .select-box-kit-filter, .select-kit-filter {
+      line-height: 18px;
+      padding: 6px 10px;
+      border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+
+      .filter-input {
+        margin-right: 5px;
+      }
+    }
+
+    .select-box-kit-header, .select-kit-header {
+      background: $secondary;
+      border: 1px solid $primary-medium;
+      padding: 6px 10px;
+      font-weight: 500;
+      font-size: 1em;
+      line-height: 18px;
+
+      &.is-focused {
+        border: 1px solid $tertiary;
+        -webkit-box-shadow: $tertiary 0px 0px 6px 0px;
+                box-shadow: $tertiary 0px 0px 6px 0px;
+      }
+    }
+
+    &.is-disabled {
+      .select-kit-header {
+        background: #e9e9e9;
+        border-color: #ddd;
+      }
+    }
+
+    &.is-highlighted {
+      .select-kit-header {
+        border: 1px solid $tertiary;
+        -webkit-box-shadow: $tertiary 0px 0px 6px 0px;
+                box-shadow: $tertiary 0px 0px 6px 0px;
+      }
+    }
+
+    &.is-expanded {
+      .select-kit-wrapper {
+        display: block;
+        border: 1px solid $tertiary;
+        -webkit-box-shadow: $tertiary 0px 0px 6px 0px;
+                box-shadow: $tertiary 0px 0px 6px 0px;
+      }
+
+      .select-kit-header {
+        border-color: transparent;
+        -webkit-box-shadow: none;
+                box-shadow: none;
+      }
+
+      .select-kit-body {
+        border-radius: 0 0 3px 3px ;
+      }
+    }
+
+    &.is-expanded.is-above {
+      .select-kit-header {
+        border-radius: 0 0 3px 3px;
+      }
+
+      .select-kit-body {
+        border-radius: 3px 3px 0 0;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
new file mode 100644
index 0000000000..a79b5909c0
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -0,0 +1,131 @@
+.select-box-kit, .select-kit {
+  &.dropdown-select-box {
+    display: -webkit-inline-box;
+    display: -ms-inline-flexbox;
+    display: inline-flex;
+    min-width: auto;
+    border: none;
+
+    &.is-expanded {
+      .select-box-kit-collection,
+      .select-box-kit-body,
+      .select-kit-collection,
+      .select-kit-body {
+        border-radius: 0;
+      }
+    }
+
+    .select-box-kit-body, .select-kit-body {
+      border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      background-clip: padding-box;
+      -webkit-box-shadow: 0 1px 5px rgba(0,0,0,0.4);
+              box-shadow: 0 1px 5px rgba(0,0,0,0.4);
+      max-width: 300px;
+      width: 300px;
+    }
+
+    .select-box-kit-row, .select-kit-row {
+      margin: 0;
+      padding: 10px 5px;
+
+      .icons {
+        display: -webkit-box;
+        display: -ms-flexbox;
+        display: flex;
+        -webkit-box-align: start;
+            -ms-flex-align: start;
+                align-items: flex-start;
+        -webkit-box-pack: center;
+            -ms-flex-pack: center;
+                justify-content: center;
+        -ms-flex-item-align: start;
+            align-self: flex-start;
+        margin-right: 10px;
+        margin-top: 2px;
+        width: 30px;
+
+        .d-icon {
+          font-size: 1.286em;
+          -ms-flex-item-align: center;
+              align-self: center;
+          margin-right: 0;
+          opacity: 1;
+        }
+      }
+
+      .texts {
+        line-height: 18px;
+        -webkit-box-flex: 1;
+            -ms-flex: 1;
+                flex: 1;
+        -webkit-box-align: start;
+            -ms-flex-align: start;
+                align-items: flex-start;
+        display: -webkit-box;
+        display: -ms-flexbox;
+        display: flex;
+        -ms-flex-wrap: wrap;
+            flex-wrap: wrap;
+        -webkit-box-orient: vertical;
+        -webkit-box-direction: normal;
+            -ms-flex-direction: column;
+                flex-direction: column;
+
+        .name {
+          -webkit-box-flex: 1;
+              -ms-flex: 1;
+                  flex: 1;
+          font-weight: bold;
+          font-size: 1em;
+          color: $primary;
+          padding: 0;
+        }
+
+        .desc {
+          -webkit-box-flex: 1;
+              -ms-flex: 1;
+                  flex: 1;
+          font-size: 0.857em;
+          font-weight: normal;
+          color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));;
+          white-space: normal;
+        }
+      }
+    }
+
+    .select-box-kit-collection, .select-kit-collection {
+      padding: 0;
+    }
+
+    .dropdown-select-box-header {
+      -webkit-box-sizing: border-box;
+         -moz-box-sizing: border-box;
+              box-sizing: border-box;
+      border: 0;
+      height: 30px;
+
+      -webkit-box-align: center;
+          -ms-flex-align: center;
+              align-items: center;
+      -webkit-box-pack: justify;
+          -ms-flex-pack: justify;
+              justify-content: space-between;
+      -webkit-box-orient: horizontal;
+      -webkit-box-direction: normal;
+          -ms-flex-direction: row;
+              flex-direction: row;
+      display: -webkit-inline-box;
+      display: -ms-inline-flexbox;
+      display: inline-flex;
+
+      .d-icon + .d-icon {
+        margin-left: 5px;
+      }
+
+      &.is-focused {
+        outline-style: auto;
+        outline-color: $tertiary;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss b/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss
new file mode 100644
index 0000000000..333b21d060
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/future-date-input-selector.scss
@@ -0,0 +1,22 @@
+.select-box-kit, .select-kit {
+  &.combobox {
+    &.future-date-input-selector {
+      min-width: 50%;
+
+      .future-date-input-selector-datetime {
+        color: lighten($primary, 40%);
+        font-size: .929em;
+      }
+
+      .future-date-input-selector-icons {
+        width: 25px;
+      }
+
+      .future-date-input-selector-row {
+        .future-date-input-selector-icons {
+          color: lighten($primary, 40%);
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/legacy-combo-box.scss b/app/assets/stylesheets/common/select-kit/legacy-combo-box.scss
new file mode 100644
index 0000000000..4f8aeb70bd
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/legacy-combo-box.scss
@@ -0,0 +1,88 @@
+// DO NOT MODIFY
+// TODO: remove when all select2 instances are gone
+.select2-results .select2-highlighted {
+  background: $highlight-medium;
+  color: $primary;
+}
+
+.select2-drop {
+  .badge-category {
+    display: inline-block;
+  }
+  .topic-count {
+    font-size: .786em;
+    color: $primary;
+    display: inline-block;
+  }
+  .highlighted .topic-count, .select2-highlighted .category-desc {
+    color: $primary;
+  }
+  .category-desc {
+    color: $primary;
+    font-size: 0.857em;
+    line-height: 16px;
+  }
+}
+
+.select2-drop {
+  background: $secondary;
+  .d-icon {
+    color: dark-light-choose($primary-medium, $secondary-medium);
+  }
+}
+
+.select2-search input {
+  background: image-url("select2.png") no-repeat 100% -22px, $secondary 0 0
+}
+
+.select2-container {
+  min-width: 200px;
+  
+  &.select2-dropdown-open {
+    border: 0;
+    margin-bottom: 2px;
+  }
+  &.select2-container-active {
+    border-color: $tertiary;
+  }
+  &.select2-container-disabled .select2-chosen {
+    color: blend-primary-secondary(50%);
+  }
+}
+
+.select2-container-multi .select2-choices .select2-search-field input.select2-active {
+  background: $secondary image-url("select2-spinner.gif") no-repeat 100% !important;
+}
+
+.select2-container-multi .select2-choices {
+  border: 1px solid $primary-medium;  
+}
+
+.select2-container a.select2-choice {
+  background: $secondary;
+  border-radius: 3px;
+  border-color: $secondary;
+  color: $primary;
+}
+
+.select2-dropdown-open a.select2-choice {
+  box-shadow: none;
+  border-radius: 3px 3px 0 0;
+  border-color: $tertiary;
+}
+.select2-drop {
+  color: $primary;
+}
+.select2-drop-active {
+  border: 1px solid $tertiary;
+  border-top: 0;
+}
+
+.select2-container-active {
+  box-shadow:  $tertiary 0px 0px 6px 0px;
+}
+
+.select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-selection-limit {
+  background: $secondary;
+  color: $primary;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/common/select-kit/list-setting.scss b/app/assets/stylesheets/common/select-kit/list-setting.scss
new file mode 100644
index 0000000000..1f7103ef98
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/list-setting.scss
@@ -0,0 +1,13 @@
+.select-box-kit, .select-kit {
+  &.multi-select {
+    &.list-setting {
+      .select-box-kit-row.create, .select-kit-row.create {
+        .square {
+          width: 12px;
+          height: 12px;
+          margin-left: 5px;
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/multi-select.scss b/app/assets/stylesheets/common/select-kit/multi-select.scss
new file mode 100644
index 0000000000..f841e4644f
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/multi-select.scss
@@ -0,0 +1,172 @@
+.select-box-kit, .select-kit {
+  &.multi-select {
+    width: 300px;
+    background: $secondary;
+    border-radius: 0;
+
+    .select-box-kit-body, .select-kit-body {
+      width: 100%;
+    }
+
+    .select-box-kit-row, .select-kit-row {
+      margin: 5px;
+      min-height: 1px;
+      padding: 5px;
+      border-radius: 0;
+    }
+
+    .select-box-kit-filter, .select-kit-filter {
+      border: 0;
+    }
+
+    .multi-select-header {
+      background: $secondary;
+      border: 1px solid $primary-medium;
+
+      &.is-focused {
+        box-shadow: $tertiary 0px 0px 6px 0px;
+        border-radius: 0;
+      }
+    }
+
+    &.is-disabled {
+      .multi-select-header {
+        background: #e9e9e9;
+        border-color: #ddd;
+      }
+    }
+
+    &.is-highlighted {
+      .multi-select-header {
+        border-radius: 0;
+        border-bottom: 1px solid transparent;
+        box-shadow: $tertiary 0px 0px 6px 0px;
+      }
+    }
+
+    &.is-expanded {
+      .select-box-kit-wrapper, .select-kit-wrapper {
+        display: block;
+        border: 1px solid $tertiary;
+        box-shadow: $tertiary 0px 0px 6px 0px;
+        border-radius: 0;
+      }
+
+      .multi-select-header {
+        border-radius: 0;
+        box-shadow: none;
+      }
+
+      .select-box-kit-body, .select-kit-body {
+        border-radius: 0;
+      }
+    }
+
+    .choices {
+      margin: 0;
+      padding: 2.5px;
+      box-sizing: border-box;
+      display: inline-flex;
+      justify-content: flex-start;
+      flex-wrap: wrap;
+
+      .choice {
+        display: inline-flex;
+        box-sizing: border-box;
+        padding: 0 5px;
+        border: 1px solid transparent;
+        align-items: center;
+        justify-content: space-between;
+        flex-wrap: wrap;
+        flex-direction: row;
+        margin: 2.5px;
+      }
+
+      .filter {
+        align-items: center;
+        justify-content: flex-start;
+        white-space: nowrap;
+        min-width: 50px;
+        padding: 0;
+        outline: none;
+
+        .filter-input, .filter-input:focus {
+          border: none;
+          background: none;
+          display: inline-block;
+          width: 100%;
+          outline: none;
+          min-width: auto;
+          padding: 0;
+          margin: 0;
+          outline: 0;
+          border: 0;
+          -webkit-box-shadow: none;
+          box-shadow: none;
+          border-radius: 0;
+          height: 21px;
+        }
+      }
+
+      .selected-color {
+        .selected-color-wrapper {
+          display: flex;
+          flex: 1;
+          flex-direction: column;
+        }
+
+        .color-preview {
+          height: 5px;
+          margin: 0 2px 2px 2px;
+          border-radius: 5px;
+        }
+      }
+
+      .selected-name {
+        align-items: center;
+        justify-content: flex-start;
+        color: $primary;
+        cursor: default;
+        border: 1px solid $primary-medium;
+        border-radius: 3px;
+        box-shadow: 0 0 2px $secondary inset, 0 1px 0 rgba(0,0,0,0.05);
+        background-clip: padding-box;
+        -webkit-touch-callout: none;
+        user-select: none;
+        background-color: $primary-low;
+        cursor: pointer;
+        outline: none;
+        line-height: normal;
+        overflow: hidden;
+        flex: 0 1 auto;
+        flex-wrap: nowrap;
+
+        .name {
+          padding: 0 5px;
+          line-height: 18px;
+        }
+
+        &.is-highlighted {
+          box-shadow: 0 0 2px $danger, 0 1px 0 rgba(0,0,0,0.05);
+        }
+
+        .locked-icon, .delete-icon {
+          justify-content: center;
+          align-items: center;
+          width: 21px;
+          height: 21px;
+          display: inline-flex;
+          .d-icon {
+            color: $primary-medium;
+            cursor: pointer;
+            font-size: 1em;
+
+            &:hover {
+              color: $primary;
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/notifications-button.scss b/app/assets/stylesheets/common/select-kit/notifications-button.scss
new file mode 100644
index 0000000000..78db012b79
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/notifications-button.scss
@@ -0,0 +1,17 @@
+.select-kit {
+  &.dropdown-select-box {
+    &.notifications-button {
+      .select-box-kit-body, .select-kit-body {
+        min-width: 550px;
+        max-width: 550px;
+      }
+
+      .select-box-kit-row, .select-kit-row {
+        .icons {
+          -ms-flex-item-align: start;
+              align-self: flex-start;
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/pinned-button.scss b/app/assets/stylesheets/common/select-kit/pinned-button.scss
new file mode 100644
index 0000000000..c96365a0e6
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/pinned-button.scss
@@ -0,0 +1,47 @@
+#topic-footer-buttons {
+  .pinned-button {
+    min-width: auto;
+    margin: 10px 0 5px 0;
+
+    &.is-hidden {
+      display: none;
+    }
+
+    .btn {
+      margin: 0;
+    }
+
+    .reason {
+      line-height: 16px;
+      margin: 0 0 0 10px;
+    }
+  }
+}
+
+.pinned-button {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: start;
+      -ms-flex-pack: start;
+          justify-content: flex-start;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  margin: 0;
+  min-width: auto;
+
+  .pinned-options {
+    display: -webkit-inline-box;
+    display: -ms-inline-flexbox;
+    display: inline-flex;
+  }
+
+  .pinned-options {
+    .select-box-kit-body, .select-kit-body {
+      min-width: unset;
+      max-width: unset;
+      width: 550px;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
new file mode 100644
index 0000000000..2f467745bd
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -0,0 +1,273 @@
+.mobile-view .select-kit.is-expanded {
+  z-index: 1000;
+}
+
+.select-box-kit, .select-kit {
+  border: none;
+  min-width: 220px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+  display: inline-block;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+      -ms-flex-direction: column;
+          flex-direction: column;
+  position: relative;
+  vertical-align: middle;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
+
+  &.is-hidden {
+    display: none;
+  }
+
+  &.is-disabled {
+    pointer-events: none;
+  }
+
+  &.is-expanded {
+    z-index: 999;
+
+    .select-kit-body {
+      display: -webkit-box;
+      display: -ms-flexbox;
+      display: flex;
+      -webkit-box-orient: vertical;
+      -webkit-box-direction: normal;
+          -ms-flex-direction: column;
+              flex-direction: column;
+      left: 0;
+      position: absolute;
+      top: 0;
+    }
+
+    .select-kit-collection, {
+      border-radius: inherit;
+    }
+  }
+
+  &.is-above {
+    .select-kit-body {
+      bottom: 0;
+      top: auto;
+    }
+
+    .select-kit-filter {
+      border-top: 0;
+    }
+
+    .select-kit-wrapper {
+      bottom: 0;
+      top: auto;
+    }
+  }
+
+  .d-icon {
+    opacity: 0.7;
+  }
+
+  .select-box-kit-header, .select-kit-header {
+    box-sizing: border-box;
+    overflow: hidden;
+    -webkit-transition: all .25s;
+    -o-transition: all .25s;
+    transition: all .25s;
+    cursor: pointer;
+    outline: none;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-align: center;
+        -ms-flex-align: center;
+            align-items: center;
+    justify-content: space-between;
+    -webkit-box-orient: horizontal;
+    -webkit-box-direction: normal;
+        -ms-flex-direction: row;
+            flex-direction: row;
+    -webkit-box-pack: justify;
+        -ms-flex-pack: justify;
+            justify-content: space-between;
+
+    .selected-name {
+      text-align: left;
+      -webkit-box-flex: 10;
+          -ms-flex: 10;
+              flex: 10;
+      -o-text-overflow: ellipsis;
+         text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
+      color: inherit;
+    }
+
+    .btn-clear {
+      padding: 0px 10px;
+      border: 0;
+      background: none;
+    }
+
+    .icon {
+      margin-right: 5px;
+    }
+
+    .caret-icon {
+      margin-left: 5px;
+      pointer-events: none;
+    }
+
+    .d-button-label {
+      display: -webkit-box;
+      display: -ms-flexbox;
+      display: flex;
+      -webkit-box-align: center;
+          -ms-flex-align: center;
+              align-items: center;
+      white-space: nowrap;
+      overflow: hidden;
+
+      .d-icon {
+        margin-left: 5px;
+        margin-right: 0;
+      }
+    }
+  }
+
+  .select-box-kit-body, .select-kit-body {
+    display: none;
+    background: $secondary;
+    -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+
+  .select-box-kit-row, .select-kit-row {
+    cursor: pointer;
+    line-height: normal;
+    outline: none;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+    -webkit-box-align: center;
+        -ms-flex-align: center;
+            align-items: center;
+    -webkit-box-pack: start;
+        -ms-flex-pack: start;
+            justify-content: flex-start;
+
+    .name {
+      margin: 0;
+      overflow: hidden;
+      -o-text-overflow: ellipsis;
+         text-overflow: ellipsis;
+      flex: 10;
+    }
+
+    .d-icon {
+      margin-right: 5px;
+    }
+
+    &.is-highlighted {
+      background: $tertiary-low;
+    }
+
+    &.is-selected {
+      background: $highlight-medium;
+    }
+
+    &.is-selected.is-highlighted {
+      background: $tertiary-low;
+    }
+  }
+
+  .select-box-kit-collection, .select-kit-collection {
+    background: $secondary;
+    overflow-x: hidden;
+    overflow-y: auto;
+    border-radius: inherit;
+    -webkit-overflow-scrolling: touch;
+    margin: 0;
+
+    .select-kit-collection {
+      padding: 0;
+      margin: 0;
+
+      &:hover .select-kit-row.is-highlighted:hover {
+        background: $tertiary-low;
+      }
+    }
+
+    &::-webkit-scrollbar {
+      -webkit-appearance: none;
+      width: 10px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      cursor: pointer;
+      border-radius: 5px;
+      background: dark-light-choose($primary-medium, $secondary-medium);
+    }
+
+    &::-webkit-scrollbar-track {
+      background: transparent;
+      border-radius: 0;
+    }
+  }
+
+  .select-box-kit-filter, .select-kit-filter {
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    box-sizing: border-box;
+    -webkit-box-align: center;
+        -ms-flex-align: center;
+            align-items: center;
+    -webkit-box-pack: justify;
+        -ms-flex-pack: justify;
+            justify-content: space-between;
+
+    .filter-input, .filter-input:focus, .filter-input:active {
+      background: none;
+      margin: 0;
+      padding: 0;
+      -webkit-box-flex: 1;
+          -ms-flex: 1;
+              flex: 1;
+      outline: none;
+      border: 0;
+      border-radius: 0;
+      -webkit-box-shadow: none;
+              box-shadow: none;
+      width: 100%;
+    }
+
+    &.is-hidden {
+      width: 1px;
+      height: 1px;
+      border: 0;
+      margin: -1px;
+      padding: 0;
+      overflow: hidden;
+      position: fixed;
+      outline: 0;
+      left: 0px;
+      top: 0px;
+    }
+  }
+
+  .select-box-kit-wrapper, .select-kit-wrapper {
+    position: absolute;
+    top: 0;
+    left: 0;
+    background: none;
+    display: none;
+    -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+    pointer-events: none;
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss b/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
new file mode 100644
index 0000000000..7323b6d815
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
@@ -0,0 +1,58 @@
+#reply-control .d-editor-button-bar .toolbar-popup-menu-options .btn.select-kit-header {
+  padding: 7px 8px;
+  height: auto;
+}
+
+.select-kit {
+  &.dropdown-select-box {
+    &.toolbar-popup-menu-options {
+      .select-kit-body {
+        box-shadow: none;
+        padding: 10px 10px 5px 10px;
+        width: 230px;
+      }
+
+      .select-kit-row {
+        border-radius: 4px;
+        margin-bottom: 5px;
+        padding: 6px 3px;
+        background: $primary-low;
+        transition: all .25s;
+
+        .name, .d-icon {
+          font-size: 1em;
+          font-weight: normal;
+          color: $primary;
+        }
+
+        .d-icon {
+          opacity: 0.7;
+        }
+
+        &.is-highlighted {
+          background: $primary-medium;
+
+          .name, .d-icon {
+            color: $secondary;
+            color: $secondary;
+          }
+        }
+
+        &:hover {
+          background: $primary-medium;
+          color: $secondary;
+        }
+
+        &.is-selected {
+          color: $primary;
+          background: $primary-low;
+        }
+
+        &.is-selected.is-highlighted {
+          background: $primary-medium;
+          color: $primary;
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss b/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
new file mode 100644
index 0000000000..c9a994089b
--- /dev/null
+++ b/app/assets/stylesheets/common/select-kit/topic-notifications-button.scss
@@ -0,0 +1,38 @@
+#topic-footer-buttons {
+  .topic-notifications-button {
+    min-width: auto;
+    margin: 10px 0 15px 0;
+
+    .btn {
+      margin: 0;
+    }
+
+    .reason {
+      line-height: 16px;
+      margin: 0 0 0 10px;
+    }
+  }
+}
+
+.topic-notifications-button .topic-notifications-options {
+  min-width: auto;
+}
+
+.topic-notifications-button {
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-box-pack: start;
+      -ms-flex-pack: start;
+          justify-content: flex-start;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  margin: 0;
+
+  .topic-notifications-options {
+    display: -webkit-inline-box;
+    display: -ms-inline-flexbox;
+    display: inline-flex;
+  }
+}
diff --git a/app/assets/stylesheets/common/topic-entrance.scss b/app/assets/stylesheets/common/topic-entrance.scss
index 847edc46a8..6e9e1aa209 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/common/topic-timeline.scss b/app/assets/stylesheets/common/topic-timeline.scss
index 42869627fd..3f5deb9df9 100644
--- a/app/assets/stylesheets/common/topic-timeline.scss
+++ b/app/assets/stylesheets/common/topic-timeline.scss
@@ -48,7 +48,7 @@
     bottom: 0;
     left: 0;
     right: 0;
-    border-top: 1px solid dark-light-choose(scale-color($primary, $lightness: 90%), scale-color($secondary, $lightness: 90%));
+    border-top: 1px solid dark-light-choose($primary-low, $secondary-low);
     box-shadow: 0px -2px 4px -1px rgba(0,0,0,.25);
     padding-top: 20px;
     z-index: 100000;
@@ -81,7 +81,7 @@
         -webkit-box-orient: vertical;
       }
       .username {
-        color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+        color: dark-light-choose($primary-high, $secondary-low);
         word-wrap: break-word;
         font-weight: bold;
       }
@@ -121,12 +121,6 @@
         bottom: 10px;
         left: 10px;
 
-        .dropdown-menu {
-          position: absolute;
-          left: 0;
-          bottom: 30px;
-        }
-
         button, .btn-group {
           float: none;
           display: inline-block;
@@ -177,18 +171,6 @@
 
   }
 
-  &.timeline-fullscreen .topic-timeline .timeline-footer-controls ul.dropdown-menu {
-    width: auto;
-    min-width: 250px;
-    right: auto;
-    .desc {
-      display: none;
-    }
-    .title {
-      padding-left: 0;
-    }
-  }
-
   .topic-timeline {
     margin-left: 3em;
     width: 150px;
@@ -197,6 +179,10 @@
 
     .timeline-controls {
       margin-bottom: 1em;
+
+      button {
+        margin-right: 0.5em;
+      }
     }
 
     .timeline-footer-controls {
@@ -208,24 +194,21 @@
         margin-right: 0.5em;
       }
 
-      ul.dropdown-menu {
-        right: 0.5em;
-        top: auto;
-        bottom: 25px;
-        left: auto;
+      button:last-child {
+        margin-right: 0;
       }
     }
 
     .start-date {
       @include unselectable;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
 
     .timeline-scrollarea {
       margin-top: 0.5em;
       margin-left: 0.5em;
       border-left: 1px solid;
-      border-color: dark-light-choose(scale-color($tertiary, $lightness: 80%), scale-color($tertiary, $lightness: 20%));
+      border-color: dark-light-choose($tertiary-low, $tertiary-high);
       position: relative;
       -webkit-transform: translate3d(0,0,0);
     }
@@ -241,7 +224,7 @@
     .timeline-handle {
       @include border-radius-all(0.8em);
       width: 0.35em;
-      background-color: dark-light-choose(scale-color($tertiary, $lightness: 80%), scale-color($tertiary, $lightness: 20%));
+      background-color: dark-light-choose($tertiary-low, $tertiary-high);
       height: 100%;
       float: left;
       z-index: 501;
@@ -252,7 +235,7 @@
     }
 
     .timeline-ago {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
 
     .timeline-scroller {
@@ -290,7 +273,7 @@
     .now-date {
       @include unselectable;
       display: inline-block;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
       margin-top: 0.5em;
       i {
         margin-left: 0.15em;
diff --git a/app/assets/stylesheets/desktop.scss b/app/assets/stylesheets/desktop.scss
index 71f19278ed..8534c2f783 100644
--- a/app/assets/stylesheets/desktop.scss
+++ b/app/assets/stylesheets/desktop.scss
@@ -11,6 +11,7 @@
 @import "desktop/modal";
 @import "desktop/user-card";
 @import "desktop/category-list";
+@import "desktop/latest-topic-list";
 @import "desktop/topic-list";
 @import "desktop/topic-post";
 @import "desktop/topic";
@@ -21,6 +22,9 @@
 @import "desktop/menu-panel";
 @import "desktop/group";
 
+// Import all component-specific files
+@import "desktop/components/*";
+
 /* These files doesn't actually exist, they are injected by Stylesheet::Compiler. */
 
 @import "plugins";
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index d33120135f..520ad06fa0 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -3,8 +3,7 @@
   width: 100%;
 
   td, th {
-    padding: 12px 5px;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
+    @extend .list-cell;
   }
 
   td {
@@ -28,7 +27,7 @@
   .topics .badge-notification,
   .category .badge-notification {
     background-color: transparent;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
+    color: dark-light-choose($primary-medium, $secondary-high);
   }
 
   .topics {
@@ -36,10 +35,10 @@
     text-align: right;
 
     .value {
-      font-size: 1.2em;
+      font-size: 1.143em;
     }
     .unit {
-      font-size: .8em;
+      font-size: .857em;
     }
     .badge-notification {
       display: block;
@@ -70,12 +69,12 @@
 
     a.last-posted-at,
     a.last-posted-at:visited {
-      font-size: 0.86em;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
+      font-size: 0.857em;
+      color: dark-light-choose($primary-medium, $secondary-high);
     }
 
     .topic-statuses .fa {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
+      color: dark-light-choose($primary-medium, $secondary-high);
     }
 
     .topic-post-badges {
@@ -90,16 +89,16 @@
 
   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 {
       border-left: 6px solid;
       h3 {
-        font-size: 1.2em;
+        font-size: 1.286em;
         a[href] {
           color: $primary;
         }
@@ -116,63 +115,33 @@
 }
 
 .categories-and-latest {
+  display: flex;
+  flex-flow: row wrap;
 
-  .category-list,
-  .topic-list-latest {
-    width: 48%;
-    float: left;
+  div.column {
+    flex: 1;
+    flex-direction: row;
+    min-width: 300px;
   }
 
-  .topic-list-latest {
-    margin-left: 4%;
-    th.latest {
-      line-height: 19px;
+  div.column.categories {
+    @media all and (max-width : 600px) {
+      margin-right: 0;
+    }
+    @media all and (min-width : 600px) {
+      margin-right: 1em;
+    }
+    @media all and (min-width : 700px) {
+      margin-right: 2em;
     }
   }
 
-  .main-link {
-    width: 100%;
-  }
-
-  .new-posts {
-    margin-left: 6px;
-  }
-
-  .topic-stats {
-    text-align: right;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
-  }
-
-  .topic-last-activity a {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
-  }
-
   .discourse-tag {
-    font-size: 0.75em;
+    font-size: 0.786em;
   }
 
   .topic-featured-link {
     padding-left: 8px;
   }
-
-  .topic-list {
-    .posts {
-      width: 100%;
-      text-align: right;
-      margin-bottom: 10px;
-    }
-
-    .num.posts a {
-      padding: 0;
-    }
-
-    .more-topics,
-    .no-topics {
-      border-bottom: none;
-      td {
-        padding-right: 0;
-        color: $primary;
-      }
-    }
-  }
 }
+
diff --git a/app/assets/stylesheets/desktop/components/user-info.scss b/app/assets/stylesheets/desktop/components/user-info.scss
new file mode 100644
index 0000000000..f1b7260d19
--- /dev/null
+++ b/app/assets/stylesheets/desktop/components/user-info.scss
@@ -0,0 +1,14 @@
+.user-info {
+  &.medium {
+    width: 480px;
+
+    .user-image {
+      width: 55px;
+    }
+
+    .user-detail {
+      width: 380px;
+    }
+
+  }
+}
diff --git a/app/assets/stylesheets/desktop/components/user-stream-item.scss b/app/assets/stylesheets/desktop/components/user-stream-item.scss
new file mode 100644
index 0000000000..fe116155cb
--- /dev/null
+++ b/app/assets/stylesheets/desktop/components/user-stream-item.scss
@@ -0,0 +1,24 @@
+// Desktop styles for "user-stream-item" component
+.user-stream {
+
+  // DEPRECATION:
+  // The ".item" class should be eventually removed because it's too generic.
+  // Once ".item" has been removed, ".user-stream-item" can replace
+  // ".user-stream" as the top-level selector on this file as all other
+  // selectors below are its children
+  .item,
+  .user-stream-item {
+    padding: 20px 8px 15px 8px;
+  }
+
+  .time,
+  .delete-info {
+    margin-right: 8px;
+  }
+
+  .notification {
+    &.unread {
+      background-color: $tertiary-low;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index c8aa5306ea..1e2b0af89c 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -1,17 +1,62 @@
-// styles that apply to the reply pane that slides up to compose replies
-
-// hack, this needs to be done cleaner
-#private-message-users {
-  width: 400px;
-  float: left;
+#reply-control {
+  .reply-area {
+    margin: 0 auto;
+    padding: 5px 15px;
+    box-sizing: border-box;
+    height: calc(100% - 11px);
+    width: 100%;
+    .submit-panel {
+      flex-wrap: wrap;
+      align-items: center;
+    }
+  }
 }
 
-.add-warning {
-  width: 300px;
-  display: inline-block;
-  position: relative;
-  top: -30px;
-  margin-left: 20px;
+.category-input {
+  margin-left: 10px;  
+}
+
+.edit-title {
+  .d-editor-preview-wrapper {
+    margin-top: -43px;
+  }
+  &:not(.private-message) {
+    .d-editor-preview-wrapper {
+      @media screen and (max-width: 955px) {
+        margin-top: -79px;
+      }
+    }
+  }
+  
+  .with-tags {
+    .d-editor-preview-wrapper {
+      margin-top: -79px;
+      @media screen and (max-width: 900px) {
+        margin-top: -116px;
+      }
+    }
+  }
+}
+
+.closed {
+  .grippie {
+    display: none;
+  }
+}
+
+.open {
+  .grippie {
+    cursor: row-resize;
+    padding: 4px 0px;
+    background: $tertiary;
+    &:before {
+      content: '';
+      display: block;
+      width: 27px;
+      margin: auto;
+      border-top: 3px double $secondary;
+    }
+  }
 }
 
 .composer-popup-container {
@@ -22,28 +67,23 @@
 
 .composer-popup {
   position: absolute;
-  width: calc(50% - 55px);
+  width: calc(50% - 45px);
   max-width: 724px;
-  top: 16px;
-  bottom: 16px;
-  left: 50%;
-  // The composer goes off-center at 1550px
-  @media (min-width: 1550px) {
-    left: calc(50% - 15px);
-  }
+  top: 20px;
+  bottom: 10px;
+  left: 51%;
   overflow-y: auto;
   z-index: 110;
-  padding: 10px;
-
+  padding: 10px 10px 35px 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 {
@@ -55,10 +95,17 @@
   }
 
   a.close {
-    float: right;
+    position: absolute;
+    right: 10px;
+    bottom: 10px;
     color: $primary;
     opacity: 0.5;
-    font-size: 1.071em;
+    font-size: 1.143em;
+    &:before {
+      content: 'esc';
+      font-size: 0.857em;
+      margin-right: 0.5em;
+    }
   }
 
   a.close:hover {
@@ -78,22 +125,28 @@
   }
 }
 
+.composer-controls {
+  .d-chevron-down {
+    vertical-align: text-top;
+  }
+}
+
 .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 {
-    background-color: dark-light-choose(scale-color($tertiary, $lightness: -40%), scale-color($tertiary, $lightness: 40%));
+    background-color: dark-light-choose($tertiary, $tertiary-medium);
   }
 
   ul {
@@ -103,7 +156,7 @@
   }
   .search-link {
     .fa, .blurb {
-      color: dark-light-choose(scale-color($primary, $lightness: 45%), scale-color($secondary, $lightness: 55%));
+      color: dark-light-choose($primary-high, $secondary-medium);
     }
   }
   .badge-wrapper {
@@ -116,393 +169,17 @@
   width: calc(50% - 65px);
 }
 
-// only disabled when the device is touch-only
-.touch.mobile-device #reply-control.open .grippie {
-  display: none;
-}
-
-#reply-control {
-  .toggle-preview, #draft-status, #file-uploading {
-    position: absolute;
-    bottom: -31px;
-    margin-top: 0;
-  }
-  .toggle-preview {
-    right: 5px;
-  }
-  #draft-status, #file-uploading {
-    right: 51%;
-  }
-  #file-uploading {
-    font-size: 0.857em;
-  }
-  transition: height 0.4s ease;
-  width: 100%;
-  z-index: 999;
-  height: 0;
-  background-color: dark-light-diff($primary, $secondary, 90%, -60%);
-  bottom: 0;
-  font-size: 1em;
-  position: fixed;
-  .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";
-    }
-  }
-  a.cancel {
-    padding-left: 7px;
-  }
-  .control-row {
-    margin: 0 0 0 5px;
-  }
-  .saving-text {
-    display: none;
-  }
-  .draft-text {
-    display: none;
-  }
-  .grippie {
-    display: none;
-  }
-  // The various states
-  &.open {
-    height: 300px;
-    .grippie {
-      display: block;
-    }
-  }
-  &.closed {
-    height: 0 !important;
-  }
-  &.draft {
-    height: 40px !important;
-    cursor: pointer;
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-    .draft-text {
-      display: block;
-
-      i {
-        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%);
-    .saving-text {
-      display: block;
-    }
-    .toggler {
-      &:before {
-        font-family: "FontAwesome";
-        content: "\f00d";
-      }
-    }
-  }
-  .reply-area {
-    max-width: 1500px;
-    margin-left: auto;
-    margin-right: auto;
-    float: none;
-    .ac-wrap {
-      padding-left: 10px;
-    }
-  }
-
-  // When the post is new (new topic) the sizings are different
-  &.edit-title {
-
-    &.open {
-      height: 400px;
-    }
-    .contents {
-      input#reply-title {
-        padding: 7px 10px;
-        margin: 6px 10px 3px 0;
-        color: $primary;
-
-      }
-      input#reply-title {
-        width: 400px;
-                color: $primary;
-
-      }
-      .wmd-controls {
-        transition: top 0.3s ease;
-        top: 100px;
-      }
-    }
-  }
-  .contents {
-    padding-left: 10px;
-    padding-top: 5px;
-    min-width: 1280px;
-    .form-element {
-      position: relative;
-      display: inline-block;
-      .select2-container {
-        width: 400px;
-        margin-top: 5px;
-        a {
-          padding-top: 4px;
-          height: 28px;
-        }
-        b {
-          margin-top: 4px;
-        }
-      }
-      .category-combobox {
-        width: 430px;
-        @include medium-width { width: 285px; }
-        @include small-width { width: 220px; }
-
-        .select2-drop {
-          left: -9000px;
-          width: 428px;
-          @include medium-width { width: 283px; }
-          @include small-width { width: 218px; }
-        }
-        .select2-search input {
-          width: 378px;
-          @include medium-width { width: 233px; }
-          @include small-width { width: 168px; }
-        }
-      }
-    }
-    .edit-reason-input {
-      display: inline-block;
-      position: absolute;
-      margin-left: 10px;
-      top: 18px;
-      #edit-reason {
-        margin: -7px 0 0;
-        padding: 5px;
-        float: left;
-        width: 300px;
-      }
-    }
-    #reply-title {
-      color: $primary;
-      margin-right: 10px;
-      float: left;
-      &:disabled {
-        background-color: dark-light-diff($primary, $secondary, 90%, -60%);
-      }
-    }
-    #topic-featured-link {
-      padding: 7px 10px;
-      margin: 6px 10px 3px 0;
-      width: 400px;
-    }
-    .d-editor-input:disabled {
-      background-color: dark-light-diff($primary, $secondary, 90%, -60%);
-    }
-    .d-editor-input, .d-editor-preview {
-      color: $primary;
-    }
-
-    .d-editor-preview {
-      border: 1px dashed dark-light-diff($primary, $secondary, 90%, -60%);
-      overflow: auto;
-      visibility: visible;
-      cursor: default;
-      video {
-        max-width: 100%;
-        max-height: 500px;
-        height: auto;
-      }
-      audio {
-        max-width: 100%;
-      }
-      &.hidden {
-        width: 0;
-        visibility: hidden;
-      }
-    }
-    .d-editor-input {
-      bottom: 35px;
-    }
-
-    .submit-panel {
-      width: 28%;
-      position: absolute;
-      display: block;
-      bottom: 8px;
-    }
-    .auto-update-input .examples {
-      margin-top: 0;
-      padding-bottom: 8px;
-    }
-  }
-  .title-input, .category-input, .show-admin-options {
-    display: inline;
-  }
-  .show-admin-options {
-    vertical-align: top;
-    margin-top: 8px;
-    background: dark-light-diff($primary, $secondary, 90%, -60%);
-  &:hover {
-    color: $secondary;
-    background: $primary;
-  }
-  }
-  .title-input .popup-tip {
-    width: 300px;
-    margin-top: 8px;
-    left: 150px;
-  }
-  .category-input .popup-tip {
-    width: 240px;
-    left: 432px;
-    top: -19px;
-  }
-}
-
-.reply-to {
-  margin-bottom: 10px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  color: $tertiary;
-
-  @media (min-width: 1101px) {
-    max-width: 80%;
-  }
-  @media (max-width: 1100px) {
-    max-width: 500px;
-  }
-  @media (max-width: 600px) {
-    max-width: 300px;
-  }
-
-  i {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-  }
-}
-
-#reply-control {
-  .wmd-controls.hide-preview {
-    .d-editor-input {
-      width: 100%;
-    }
-    .d-editor-button-bar {
-      width: 100%;
-    }
-    .d-editor-preview-wrapper {
-      display: none;
-    }
-    .d-editor-textarea-wrapper {
-      width: 100%;
-    }
-  }
-
-  .wmd-controls {
-    left: 30px;
-    right: 30px;
-    position: absolute;
-    bottom: 48px;
-    top: 50px;
-
-
-    .d-editor-input, .d-editor-preview {
-      -moz-box-sizing: border-box;
-      box-sizing: border-box;
-      width: 100%;
-      height: 100%;
-      min-height: auto;
-      padding: 7px;
-      margin: 0;
-      background-color: $secondary;
-      word-wrap: break-word;
-    }
-    .d-editor-input, .d-editor-preview-header {
-      position: absolute;
-      left: 0;
-      top: 0;
-      border: 0px;
-      border-top: 30px solid transparent;
-      @include border-radius-all(0);
-    }
-    .d-editor-preview-header {
-      font-size: 0.929em;
-      line-height: 18px;
-      font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-      overflow: scroll;
-      .marker, .caret {
-        display: inline-block;
-        vertical-align: top;
-      }
-    }
-    .d-editor, .d-editor-container, .d-editor-textarea-wrapper, .d-editor-preview-wrapper {
-      position: relative;
-      -moz-box-sizing: border-box;
-      box-sizing: border-box;
-      height: 100%;
-      min-height: 100%;
-      margin: 0;
-      padding: 0;
-    }
-    .d-editor-textarea-wrapper {
-      width: 50%;
-      padding-right: 5px;
-      float: left;
-      .popup-tip {
-        margin-top: 3px;
-        right: 4px;
-      }
-    }
-    .d-editor-preview-wrapper {
-      width: 50%;
-      padding-left: 5px;
-      float: right;
-    }
-  }
-  .d-editor-button-bar {
-    top: 0;
-    position: absolute;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-    background-color: $secondary;
-    z-index: 100;
-    overflow: hidden;
-    width: 50%;
-
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-
-    button {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+.composer-bottom-right {
+  a {
+    color: $primary-medium;
+    &:hover {
+      color: $tertiary;
     }
   }
 }
 
-#reply-control.topic-featured-link-only.open {
-  height: 200px;
-}
-
-.control-row.reply-area {
-  padding-left: 20px;
-  padding-right: 20px;
-}
-
-@media all and (min-width: 1550px) {
-  #reply-control {
-    .wmd-controls {
-      width: 1450px;
-      left: auto;
-      right: auto;
-    }
-  }
+#draft-status,
+#file-uploading {
+  flex-grow: 1;
+  text-align: right;
 }
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 20e1ebc1ee..d4e53b65c8 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -1,506 +1,435 @@
+// Desktop
 // global styles that apply to the Discourse application specifically
 // BEWARE: changing these styles implies they take effect anywhere they are seen
 // throughout the Discourse application
 
-@media all
-and (max-width : 570px) {
-  body {
-    min-width: 0;
-  }
-  .wrap,
-  .full-width {
-    min-width: 0;
-  }
+// Base Elements
+body.widget-dragging {
+  cursor: ns-resize;
 }
 
 header {
   margin-bottom: 15px;
 }
 
-body.widget-dragging {
-  cursor: ns-resize;
-}
-
-body {
-
-  .boxed {
-    height: 100%;
-    &.white {
-      background-color: $secondary;
-    }
-  }
-  #main {
-    a.star {
-      color: dark-light-diff($secondary, $primary, 80%, -20%);
-      &:before {
-        font-family: "FontAwesome";
-        content: "\f005";
-      }
-      @include hover {
-        opacity: 0.6;
-      }
-
-      &:active {
-        opacity: 1;
-      }
-    }
-    img.avatar {
-      &.header {
-        width: 45px;
-        height: 45px;
-      }
-      &.medium {
-        width: 32px;
-        height: 32px;
-      }
-      &.small {
-        width: 25px;
-        height: 25px;
-      }
-      &.tiny {
-        width: 20px;
-        height: 20px;
-      }
-    }
-    .user-list {
-      .user {
-        padding-bottom: 5px;
-      }
-    }
-  }
-
-  $grippie-border-color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 50%));
-
-  .grippie {
-    cursor: row-resize;
-    padding: 4px 0px;
-  }
-
-  .grippie:before {
-    content: '';
-    display: block;
-    width: 27px;
-    margin: auto;
-    border-top: 3px double $grippie-border-color;
-  }
+// Common classes
+.boxed {
+  height: 100%;
 }
 
 .topic-statuses {
   float: left;
   padding: 0;
+
   .topic-status {
     padding: 0 2px 0 0;
     margin: 0;
+
     i {
         font-size: 1.071em;
       }
   }
 
-  i.fa-envelope {
+  .d-icon-envelope {
     color: $danger;
   }
 }
 
-body {
-  .form-vertical input, .form-vertical textarea, .form-vertical select,  .form-vertical .input-prepend, .form-vertical .input-append {
-    display: inline-block;
-    margin-bottom: 0;
-  }
 
-  .form-vertical {
-    .control-group {
-      margin-bottom: 24px;
-      &:before {
-        display: table;
-        content: "";
-      }
-      &:after {
-        display: table;
-        content: "";
-        clear: both;
-      }
-    }
-    .control-label {
-      font-weight: bold;
-      font-size: 1.2em;
-      line-height: 2;
-    }
-    .controls {
-      margin-left: 0;
+.form-vertical {
+  .control-group {
+    margin-bottom: 24px;
+  }
+}
+
+
+/***********************/
+/* bootstrap carryover */
+/***********************/
+code,
+pre {
+  font-family: Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace;
+}
+
+// this removes the unwanted top margin on a paragraph under a heading
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  + p {
+    margin-top:0px;
+  }
+}
+
+form {
+  margin: 0 0 18px;
+}
+
+label,
+input,
+button,
+select,
+textarea {
+  font-size: 1em;
+  font-weight: normal;
+  line-height: 18px;
+}
+
+select,
+textarea {
+  display: inline-block;
+  padding: 4px;
+  margin-bottom: 9px;
+  font-size: 1em;
+  line-height: 18px;
+  color: $primary;
+}
+
+input, textarea {
+  width: 210px;
+}
+
+select,
+input[type="file"] {
+  line-height: 28px;
+}
+
+select {
+  width: 220px;
+  &[multiple],
+  &[size] {
+    height: auto;
+  }
+}
+
+input,
+textarea {
+  margin-left: 0;
+}
+
+input {
+  &[type="radio"],
+  &[type="checkbox"] {
+    &[disabled],
+    &[readonly] {
+      background-color: transparent;
     }
   }
 }
 
-/* bootstrap carryover */
-
-
-body {
-
-  input, textarea, select {
-    color: $primary;
-  }
-
-  code, pre {
-    font-family: Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  }
-
-  /* page not found styles */
-  h1.page-not-found {
-    line-height: 30px;
-  }
-
-  .page-not-found {
-    margin: 20px 0 40px 0;
-  }
-
-  .page-not-found-search {
-    margin-top: 20px;
-  }
-
-  .popular-topics-title, .recent-topics-title {
-    margin-bottom: 10px;
-  }
-
-  .not-found-topic {
-    > a { margin-right: 10px; line-height: 2;}
-  }
-
-  .page-not-found-topics .span8 {
-    line-height: 1.5em;
-    margin-right: 20px;
-  }
-
-  // this removes the unwanted top margin on a paragraph under a heading
-  h1+p, h2+p, h3+p, h4+p, h5+p, h6+p {
-    margin-top:0px;
-  }
-
-
-  form {
-    margin: 0 0 18px;
-  }
-  label, input, button, select, textarea {
-    font-size: 0.929em;
-    font-weight: normal;
-    line-height: 18px;
-  }
-  input, button, select, textarea {
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  }
-  select, textarea {
-    display: inline-block;
-    padding: 4px;
-    margin-bottom: 9px;
-    font-size: 0.929em;
-    line-height: 18px;
-    color: $primary;
-  }
-  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"] {
-      display: inline-block;
-      height: 18px;
-      padding: 4px;
-      margin-bottom: 9px;
-      font-size: 0.929em;
-      line-height: 18px;
-      color: $primary;
-    }
-  }
-  input {
-    width: 210px;
-  }
-  textarea {
-    width: 210px;
-    height: auto;
-    background-color:$secondary;
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-    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-radius: 3px;
-      box-shadow: inset 0 1px 1px rgba(0,0,0, .3);
-    }
-  }
-  textarea:focus {
-    border-color: $tertiary;
-    outline: 0;
-    box-shadow: inset 0 1px 1px rgba(0,0,0, .3), 0 0 8px $tertiary;
-  }
-  input {
-    &[type="text"]:focus, &[type="password"]:focus, &[type="datetime"]:focus, &[type="datetime-local"]:focus, &[type="date"]:focus, &[type="month"]:focus, &[type="time"]:focus, &[type="week"]:focus, &[type="number"]:focus, &[type="email"]:focus, &[type="url"]:focus, &[type="search"]:focus, &[type="tel"]:focus, &[type="color"]:focus {
-      border-color: $tertiary;
-      outline: 0;
-      box-shadow: inset 0 1px 1px rgba(0,0,0, .3), 0 0 8px $tertiary;
-    }
-  }
-
-  select, input[type="file"] {
-    line-height: 28px;
-  }
-
-  select {
-    width: 220px;
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-    &[multiple], &[size] {
-      height: auto;
-    }
-  }
-
-  .input-xxlarge {
+.input {
+  &-xxlarge {
     width: 530px;
   }
-  input[class*="span"], select[class*="span"], textarea[class*="span"] {
-    float: none;
-    margin-left: 0;
-  }
-  .input-append {
+
+  &-prepend,
+  &-append {
+    margin-bottom: 5px;
+
     input[class*="span"] {
       display: inline-block;
     }
-  }
-  .input-prepend {
-    input[class*="span"] {
+
+    input,
+    select {
+      position: relative;
+      margin-bottom: 0;
+      vertical-align: middle;
+
+      &:focus {
+        z-index: 2;
+      }
+    }
+
+    .add-on {
       display: inline-block;
+      width: auto;
+      height: 18px;
+      min-width: 16px;
+      padding: 4px 5px;
+      font-weight: normal;
+      line-height: 18px;
+      text-align: center;
+      vertical-align: middle;
+      background-color: $secondary;
+      border: 1px solid $primary-low;
+    }
+
+    .add-on,
+    .btn {
+      margin-left: -1px;
+      border-radius: 0;
+    }
+
+    .active {
+      background-color: $danger-medium;
+      border-color: $danger;
     }
   }
-  input, textarea {
-    margin-left: 0;
-  }
-  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%);
-  }
-  input {
-    &[type="radio"][disabled], &[type="checkbox"][disabled], &[type="radio"][readonly], &[type="checkbox"][readonly] {
-      background-color: transparent;
+
+  &-prepend {
+    .add-on,
+    .btn {
+      margin-right: -1px;
+
+      &:first-child {
+        border-radius: 3px 0 0 3px;
+      }
     }
   }
-  .controls-dropdown {
-    margin-bottom: 10px;
+
+  &-append {
+    input,
+    select {
+      border-radius: 3px 0 0 3px;
+    }
+
+    .add-on,
+    .btn {
+      &:last-child {
+        border-radius: 0 3px 3px 0;
+      }
+    }
   }
-  .control-group {
-    margin-bottom: 9px;
-    &.warning {
-      > label {
-        color: $danger;
-      }
-      .checkbox, .radio, input, select, textarea {
-        color: $danger;
-        border-color: $danger;
-      }
-      .checkbox:focus, .radio:focus, input:focus, select:focus, textarea:focus {
+}
+
+.input-prepend.input-append {
+  input,
+  select {
+    border-radius: 0;
+    background-color: $primary-low;
+    border-color: $primary-low;
+  }
+
+  .add-on,
+  .btn {
+    &:first-child {
+      margin-right: -1px;
+      border-radius: 3px 0 0 3px;
+    }
+  }
+
+  .add-on,
+  .btn {
+    &:last-child {
+      margin-left: -1px;
+      border-radius: 0 3px 3px 0;
+    }
+  }
+}
+
+.controls-dropdown {
+  margin-bottom: 10px;
+}
+
+.control-group {
+  margin-bottom: 9px;
+
+  &.warning,
+  &.error {
+    > label {
+      color: $danger;
+    }
+
+    .checkbox,
+    .radio,
+    input,
+    select,
+    textarea {
+      color: $danger;
+      border-color: $danger;
+
+      &:focus {
         border-color: scale-color($danger, $lightness: -30%);
         box-shadow: 0 0 6px $danger;
       }
-      .input-prepend .add-on, .input-append .add-on {
+    }
+
+  }
+
+  &.warning {
+    .input-prepend,
+    .input-append {
+      .add-on {
         color: $danger;
         background-color: $danger;
         border-color: $danger;
       }
     }
-    &.error {
-      > label {
+  }
+
+  &.error {
+    .input-prepend,
+    .input-append {
+      .add-on {
         color: $danger;
-      }
-      .checkbox, .radio, input, select, textarea {
-        color: $danger;
-        border-color: $danger;
-      }
-      .checkbox:focus, .radio:focus, input:focus, select:focus, textarea:focus {
-        border-color: scale-color($danger, $lightness: -30%);
-        box-shadow: 0 0 6px $danger;
-      }
-      .input-prepend .add-on, .input-append .add-on {
-        color: $danger;
-        background-color: scale-color($danger, $lightness: 30%);
+        background-color: $danger-medium;
         border-color: scale-color($danger, $lightness: -20%);
       }
     }
-    &.success {
-      > label {
-        color: $success;
-      }
-      .checkbox, .radio, input, select, textarea {
-        color: $success;
-        border-color: $success;
-      }
-      .checkbox:focus, .radio:focus, input:focus, select:focus, textarea:focus {
+  }
+
+  &.success {
+    > label {
+      color: $success;
+    }
+
+    .checkbox,
+    .radio,
+    input,
+    select,
+    textarea {
+      color: $success;
+      border-color: $success;
+
+      &:focus {
         border-color: $success;
         box-shadow: 0 0 6px $success;
       }
-      .input-prepend .add-on, .input-append .add-on {
+    }
+
+    .input-prepend,
+    .input-append {
+      .add-on {
         color: $success;
-        background-color:  scale-color($success, $lightness: 90%);
+        background-color:  $success-low;
         border-color: $success;
       }
     }
   }
-  input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid {
-    color: $danger;
-    border-color: $danger;
-  }
-  input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus {
-    border-color: $danger;
-    box-shadow: 0 0 6px $danger;
-  }
+}
 
-  .input-prepend, .input-append {
-    margin-bottom: 5px;
-  }
-  .input-prepend input, .input-append input, .input-prepend select, .input-append select {
-    position: relative;
-    margin-bottom: 0;
-    vertical-align: middle;
-    border-radius: 0 3px 3px 0;
-  }
-  .input-prepend input:focus, .input-append input:focus, .input-prepend select:focus, .input-append select:focus {
-    z-index: 2;
-  }
-  .input-prepend .add-on, .input-append .add-on {
-    display: inline-block;
-    width: auto;
-    height: 18px;
-    min-width: 16px;
-    padding: 4px 5px;
-    font-weight: normal;
-    line-height: 18px;
-    text-align: center;
-    vertical-align: middle;
-    background-color: $secondary;
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-  }
-  .input-prepend .add-on, .input-append .add-on, .input-prepend .btn, .input-append .btn {
-    margin-left: -1px;
-    border-radius: 0;
-  }
-  .input-prepend .active, .input-append .active {
-    background-color: scale-color($danger, $lightness: 30%);
-    border-color: $danger;
-  }
-  .input-prepend {
-    .add-on, .btn {
-      margin-right: -1px;
-    }
-    .add-on:first-child, .btn:first-child {
-      border-radius: 3px 0 0 3px;
-    }
-  }
-  .input-append {
-    input, select {
-      border-radius: 3px 0 0 3px;
-    }
-    .add-on:last-child, .btn:last-child {
-      border-radius: 0 3px 3px 0;
-    }
-  }
-  .input-prepend.input-append {
-    input, select {
-      border-radius: 0;
-    }
-    .add-on:first-child, .btn:first-child {
-      margin-right: -1px;
-      border-radius: 3px 0 0 3px;
-    }
-    .add-on:last-child, .btn:last-child {
-      margin-left: -1px;
-      border-radius: 0 3px 3px 0;
-    }
-  }
-
-  .form-horizontal input, .form-horizontal textarea, .form-horizontal select,  .form-horizontal .input-prepend, .form-horizontal .input-append {
-    display: inline-block;
-    margin-bottom: 0;
-  }
-  .form-horizontal .hide {
+.form-horizontal {
+  .hide {
     display: none;
   }
 
-  .form-horizontal {
-    .control-group {
-      margin-bottom: 18px;
-      &:before {
-        display: table;
-        content: "";
-      }
-      &:after {
-        display: table;
-        content: "";
-        clear: both;
-      }
-    }
-    .control-indent {
-      margin-left: 20px;
-      margin-bottom: 10px;
-    }
-    .control-label {
-      float: left;
-      width: 140px;
-      text-align: right;
-      font-weight: bold;
-    }
-    .controls {
-      margin-left: 160px;
-    }
+  input,
+  textarea,
+  select,
+  .input-prepend,
+  .input-append {
+    display: inline-block;
+    margin-bottom: 0;
   }
 
-  .bootbox.modal {
-    .modal-footer {
-      a.btn-primary {
-        color: $secondary;
-      }
+  .control-group {
+    @include clearfix;
+    margin-bottom: 18px;
+  }
+
+  .control-indent {
+    margin-left: 20px;
+    margin-bottom: 10px;
+  }
+
+  .control-label {
+    float: left;
+    width: 140px;
+    text-align: right;
+    font-weight: bold;
+  }
+
+  .controls {
+    margin-left: 160px;
+  }
+}
+
+.bootbox.modal {
+  .modal-footer {
+    a.btn-primary {
+      color: $secondary;
     }
   }
 }
 
 /* bootstrap columns */
-
-.row:before,
-.row:after {
-  display: table;
-  content: "";
-}
-.row:after {
-  clear: both;
+.row {
+  @include clearfix;
 }
 
-.span24 {
-  width: 1236px;
-  float: left;
+.span {
+  &4 {
+    width: 196px;
+    margin-right: 12px;
+    float: left;
+  }
+
+  &6 {
+    width: 27.027%;
+    float: left;
+  }
+
+  &8 {
+    width: 404px;
+    float: left;
+  }
+
+  &10 {
+    width: 508px;
+    float: left;
+  }
+
+  &13 {
+    width: 59.8198%;
+    float: left;
+  }
+
+  &15 {
+    /* intentionally no width set here, do not add one */
+    margin-left: 12px;
+    float: left;
+  }
+
+  &24 {
+    width: 1236px;
+    float: left;
+    color: amarillo;
+  }
 }
-.span15 {
-  /* intentionally no width set here, do not add one */
-  margin-left: 12px;
-  float: left;
+
+.offset {
+  &2 {
+    margin-left: 116px;
+  }
+
+  &1 {
+    margin-left: 64px;
+  }
 }
-.span13 {
-  width: 59.8198%;
-  float: left;
+
+// Special elements
+#main {
+  a.star {
+    color: $secondary-medium;
+
+    &:before {
+      font-family: "FontAwesome";
+      content: "\f005";
+    }
+
+    @include hover {
+      opacity: 0.6;
+    }
+
+    &:active {
+      opacity: 1;
+    }
+  }
 }
-.span10 {
-  width: 508px;
-  float: left;
-}
-.span8 {
-  width: 404px;
-  float: left;
-}
-.span6 {
-  width: 27.027%;
-  float: left;
-}
-.span4 {
-  width: 196px;
-  margin-right: 12px;
-  float: left;
-}
-.offset2 {
-  margin-left: 116px;
-}
-.offset1 {
-  margin-left: 64px;
+
+// Media Queries
+@media all
+and (max-width : 570px) {
+
+  body {
+    min-width: 0;
+  }
+
+  .wrap,
+  .full-width {
+    min-width: 0;
+  }
 }
diff --git a/app/assets/stylesheets/desktop/group.scss b/app/assets/stylesheets/desktop/group.scss
index 5c913eef7f..ea1378fd1e 100644
--- a/app/assets/stylesheets/desktop/group.scss
+++ b/app/assets/stylesheets/desktop/group.scss
@@ -1,9 +1,10 @@
+
 .group-nav {
   li {
     float: left;
 
     a, i {
-      color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%));
+      color: dark-light-choose($primary-medium, $secondary-high);
     }
 
     .active {
@@ -48,7 +49,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/header.scss b/app/assets/stylesheets/desktop/header.scss
index f4ce15a022..9a7f7ce4ab 100644
--- a/app/assets/stylesheets/desktop/header.scss
+++ b/app/assets/stylesheets/desktop/header.scss
@@ -4,10 +4,9 @@
 
 .d-header {
   left: 0;
-  z-index: 1000;
   padding-top: 3px;
   height: 60px;
-  .fa-home {
+  .d-icon-home {
     padding:8px;
     font-size: 2.1em;
   }
@@ -32,13 +31,13 @@ and (max-width : 570px) {
 }
 
 .search-link .blurb {
-  color: dark-light-choose(scale-color($primary, $lightness: 45%), scale-color($secondary, $lightness: 55%));
+  color: dark-light-choose($primary-high, $secondary-medium);
   display: block;
   word-wrap: break-word;
-  font-size: 11px;
+  font-size: .786em;
   line-height: 1.3em;
   .search-highlight {
-    color: dark-light-choose(scale-color($primary, $lightness: 25%), scale-color($secondary, $lightness: 75%));
+    color: dark-light-choose($primary-high, $secondary-low);
   }
 }
 
diff --git a/app/assets/stylesheets/desktop/history.scss b/app/assets/stylesheets/desktop/history.scss
index 858796f21b..4519450e1a 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/latest-topic-list.scss b/app/assets/stylesheets/desktop/latest-topic-list.scss
new file mode 100644
index 0000000000..8b17c33cf1
--- /dev/null
+++ b/app/assets/stylesheets/desktop/latest-topic-list.scss
@@ -0,0 +1,43 @@
+.latest-topic-list {
+  @extend .topic-list-icons;
+
+  .table-heading {
+    padding: 12px 5px;
+    color: dark-light-choose($primary-medium, $secondary-high);
+  }
+
+  .no-topics, .more-topics {
+    margin-top: 1em;
+  }
+}
+
+.latest-topic-list-item {
+  padding: 1em;
+  border-bottom: 1px solid $primary-low;
+  display: flex;
+
+  align-items: center;
+
+  .topic-poster {
+    width: 60px;
+  }
+  .main-link {
+    @extend .topic-list-main-link;
+    flex: 15;
+    font-size: 1em;
+
+    .top-row {
+      margin-bottom: 0.1em;
+      font-size: 1.143em;
+    }
+  }
+  .topic-stats {
+    flex: 1;
+    text-align: right;
+    color: dark-light-choose($primary-medium, $secondary-high);
+  }
+
+  .topic-last-activity a {
+    color: dark-light-choose($primary-medium, $secondary-high);
+  }
+}
diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss
index 8eafec8f20..23c933180f 100644
--- a/app/assets/stylesheets/desktop/login.scss
+++ b/app/assets/stylesheets/desktop/login.scss
@@ -14,7 +14,7 @@
 
 #login-form {
   a {
-    color: dark-light-choose(scale-color($primary, $lightness: 35%), scale-color($secondary, $lightness: 65%));
+    color: dark-light-choose($primary-high, $secondary-low);
   }
 }
 
@@ -53,10 +53,14 @@
 
   .instructions {
     label {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
   }
 
+  .user-fields {
+    border-top: 1px solid $primary-low;
+    padding-top: 20px;
+  }
 }
 
 .password-reset, .invites-show {
@@ -97,7 +101,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 c345acd0cd..e7d00fba8f 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;
@@ -62,7 +62,7 @@
 .close {
   font-size: 1.429em;
   text-decoration: none;
-  color: dark-light-choose(scale-color($primary, $lightness: 35%), scale-color($secondary, $lightness: 65%));
+  color: dark-light-choose($primary-high, $secondary-low);
   cursor: pointer;
   &:hover {
     color: $primary;
@@ -70,6 +70,10 @@
 }
 
 .modal {
+  .category-chooser {
+    width: 50%;
+  }
+
   .category-combobox {
     width: 430px;
 
@@ -88,14 +92,13 @@
 }
 
 .custom-message-length {
-  margin: -10px 0 10px 20px;
-  color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
-  font-size: 85%;
+  color: dark-light-choose($primary-low-mid, $secondary-high);
+  font-size: .857em;
 }
 
 .flag-message {
-  margin-left: 20px;
-  width: 95% !important;
+  width: 95%;
+  margin: 0;
 }
 
 .edit-category-modal {
@@ -112,11 +115,11 @@
       li {
         margin: 0 4px 8px 0;
         a {
-          color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+          color: dark-light-choose($primary-medium, $secondary-medium);
           cursor: pointer;
         }
         a:hover {
-          color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+          color: dark-light-choose($primary-medium, $secondary-medium);
         }
       }
     }
@@ -152,9 +155,11 @@
     flex-wrap: wrap;
 
     .btn {
-      width: 22%;
+      flex: 1 1 0;
       margin-bottom: 1em;
       margin-right: 1em;
+      white-space: nowrap;
+      max-width: 23%;
     }
   }
 
@@ -215,12 +220,6 @@
   margin-bottom: 10px;
 }
 
-.delete-flag-modal, .agree-flag-modal {
-  .modal-inner-container {
-    width: 400px;
-  }
-}
-
 .change-timestamp {
   min-height: 300px;
 
diff --git a/app/assets/stylesheets/desktop/queued-posts.scss b/app/assets/stylesheets/desktop/queued-posts.scss
index 6d306bae6e..38f48442b7 100644
--- a/app/assets/stylesheets/desktop/queued-posts.scss
+++ b/app/assets/stylesheets/desktop/queued-posts.scss
@@ -11,7 +11,7 @@
        float: right;
        font-size: 0.929em;
        margin-top: 1px;
-       span {color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
+       span {color: dark-light-choose($primary-medium, $secondary-medium); }
      }
 
     .cooked {
@@ -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 c59373c6ed..d8135d7412 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -23,8 +23,7 @@
     float: none;
   }
 
-
-  a.badge-category {
+  a.badge-category, .dropdown-header {
     padding: 3px 12px;
     font-size: 1.143em;
   }
@@ -34,12 +33,17 @@
 // Base list
 // --------------------------------------------------
 
-.topic-list {
-  margin: 0 0 10px;
-  .fa-thumb-tack { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
-  .fa-thumb-tack.unpinned { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
+.topic-list-icons {
+  .d-icon-thumb-tack { color: dark-light-choose($primary-medium, $secondary-medium); }
+  .d-icon-thumb-tack.unpinned { color: dark-light-choose($primary-medium, $secondary-medium); }
   a.title {color: $primary;}
-  .fa-bookmark { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
+  .d-icon-bookmark { color: dark-light-choose($primary-medium, $secondary-medium); }
+}
+
+.topic-list {
+  @extend .topic-list-icons;
+
+  margin: 0 0 10px;
   th,
   td {
     padding: 12px 5px;
@@ -51,7 +55,7 @@
     }
   }
   th {
-    button i.fa {color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
+    button .d-icon {color: dark-light-choose($primary-medium, $secondary-medium); }
   }
 
   > tbody > tr {
@@ -61,16 +65,13 @@
   }
   button.bulk-select {
     padding: 0;
-    background: transparent;
-    &:hover {
-      color: dark-light-diff($primary, $secondary, 90%, -60%);
-    }
+    margin-right: 0.3em;
   }
 
   .star {
     width: 20px;
     padding-right: 0;
-    .fa-star {
+    .d-icon-star {
       position: relative;
     }
     + .main-link {
@@ -90,8 +91,8 @@
   .posters {
     // we know there are up to 5 avatars of fixed size
     // will be overridden by media width queries on narrow displays to 1 avatar's width
-    width: 145px;
-    min-width: 145px;
+    width: 146px;
+    min-width: 146px;
   }
   .posters {
     > a {
@@ -104,8 +105,8 @@
   }
 
   .posters a:first-child .avatar.latest:not(.single) {
-     box-shadow: 0 0 3px 1px desaturate(scale-color($tertiary, $lightness: 65%), 35%);
-     border: 2px solid desaturate(scale-color($tertiary, $lightness: 50%), 40%);
+     box-shadow: 0 0 3px 1px desaturate($tertiary-medium, 35%);
+     border: 2px solid desaturate($tertiary-medium, 40%);
      position: relative;
      top: -2px;
      left: -2px;
@@ -115,7 +116,7 @@
   .sortable {
     cursor: pointer;
     &:hover {
-      background-color: dark-light-diff($primary, $secondary, 90%, -75%);
+      background-color: $primary-low;
     }
     @include unselectable;
   }
@@ -132,16 +133,15 @@
   .post-actions {
     clear: both;
     width: auto;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     text-align: left;
-    font-size: 12px;
+    font-size: .857em;
     margin-top: 5px;
     .fa {
       margin-right: 2px;
     }
     a {
-      font-size: 11px;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
       margin-right: 3px;
       line-height: 20px;
     }
@@ -171,7 +171,6 @@
 .topic-list.categories {
   a.title {
     color: $tertiary;
-    font-size: 0.929em;
   }
 
   th.posts {
@@ -218,15 +217,15 @@
     margin: 10px 0 0;
     /* topic status glyphs */
     i {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)) !important;
+      color: dark-light-choose($primary-medium, $secondary-medium) !important;
       font-size: 0.929em;
     }
     a.last-posted-at, a.last-posted-at:visited {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-      font-size: 0.88em;
+      color: dark-light-choose($primary-medium, $secondary-medium);
+      font-size: 0.857em;
     }
     .badge {
-      font-size: 0.714em;
+      font-size: 0.857em;
       top: -1px;
     }
   }
@@ -276,7 +275,7 @@ button.dismiss-read {
   margin-left: 10px;
 }
 
-.category-notification-menu, .tags-admin-menu {
+.tags-admin-menu {
   .dropdown-menu {
     right: 0;
     top: 30px;
@@ -289,7 +288,7 @@ button.dismiss-read {
   clear: both;
   p {
     line-height: 1.5em;
-    font-size: 1.5em;
+    font-size: 1.429em;
   }
 }
 
@@ -313,10 +312,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
@@ -326,10 +335,10 @@ and (max-width : 850px) {
    // smaller table cell font and cell spacing
    th, td {
       padding: 12px 2px;
-      font-size: 0.929em;
+      font-size: 1em;
      }
     .main-link {
-      font-size: 1.071em;
+      font-size: 1em;
       }
     .category {
       min-width: 0;
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 33a9bf1c5d..40ac5cb3d5 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -7,7 +7,7 @@
 }
 
 h1 .topic-statuses .topic-status i {
-  font-size: 0.8em;
+  font-size: 0.857em;
   vertical-align: middle;
 }
 
@@ -31,7 +31,7 @@ h1 .topic-statuses .topic-status i {
     font-size: 0.929em;
     float: right;
     margin: 1px 25px 0 0;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 
   .actions .fade-out {
@@ -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%));
+  .like-count {
+    font-size: inherit;
+    margin-right: -5px;
+  }
+
+  .highlight-action {
+    color: dark-light-choose($primary-medium, $secondary-high);
+  }
+
+  a, button {
+    color: dark-light-choose($primary-low-mid, $secondary-high);
+
+    .d-icon {
+      opacity: 1.0;
     }
-    a, button {
-    color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
     margin-right: 2px;
     display: inline-block;
   }
@@ -92,20 +98,20 @@ nav.post-controls {
   .show-replies {
     margin-left: -10px;
     font-size: inherit;
-    span.badge-posts {color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); }
+    span.badge-posts {color: dark-light-choose($primary-medium, $secondary-high); }
     &:hover {
-      background: dark-light-diff($primary, $secondary, 90%, -65%);
+      background: $primary-low;
       span.badge-posts {color: $primary;}
     }
     i {
       margin-left: 5px;
-      font-size: 90%;
+      font-size: .857em;
     }
   }
 
   button.create {
     margin-right: 0;
-    color: dark-light-choose(scale-color($primary, $lightness: 20%), scale-color($secondary, $lightness: 80%));
+    color: dark-light-choose($primary-high, $secondary-low);
     margin-left: 10px;
   }
 
@@ -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;}
@@ -155,22 +161,10 @@ nav.post-controls {
       box-shadow: none;
     }
 
-    &.bookmark {padding: 8px 11px; }
-
-    .read-icon {
-      &:before {
-        font-family: "FontAwesome";
-        content: "\f02e";
-      }
-      &.unseen {
-        &:before {
-          content: "\f097";
-        }
-      }
+    &.bookmark {
+      padding: 8px 11px;
       &.bookmarked {
-        &:before {
-          color: $tertiary;
-        }
+        color: $tertiary;
       }
     }
   }
@@ -179,7 +173,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;
@@ -201,7 +195,7 @@ nav.post-controls {
       width: 176px;
       margin-bottom: 5px;
 
-      i.fa {
+      .d-icon {
         width: 14px;
         margin-right: 14px;
       }
@@ -254,8 +248,8 @@ nav.post-controls {
     padding: 0;
   }
 
-  .post-date { color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); }
-  .fa-arrow-up, .fa-arrow-down { margin-left: 5px; }
+  .post-date { color: dark-light-choose($primary-medium, $secondary-high); }
+  .d-icon-arrow-up, .d-icon-arrow-down { margin-left: 5px; }
   .reply:first-of-type .row { border-top: none; }
 
   .topic-meta-data {
@@ -267,10 +261,10 @@ nav.post-controls {
     font-size: 0.929em;
     a {
       font-weight: bold;
-      color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
+      color: dark-light-choose($primary-low-mid, $secondary-high);
     }
   }
-  .arrow {color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); }
+  .arrow {color: dark-light-choose($primary-medium, $secondary-high); }
 }
 
 .post-action {
@@ -288,16 +282,16 @@ 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 {
     margin-bottom: 4px;
-    color: dark-light-choose(scale-color($primary, $lightness: 20%), scale-color($secondary, $lightness: 80%));
+    color: dark-light-choose($primary-high, $secondary-low);
     line-height: 23px;
     font-weight: normal;
     font-size: 1em;
@@ -305,7 +299,7 @@ a.star {
 
   h4 {
     margin: 1px 0 2px 0;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
     font-size: 0.857em;
     line-height: 15px;
@@ -317,8 +311,8 @@ a.star {
   }
 
   span.domain {
-    font-size: 0.714em;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    font-size: 0.786em;
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 
   .avatars {
@@ -334,7 +328,7 @@ a.star {
       padding: 4px 5px 2px 5px;
       text-align: center;
       font-weight: normal;
-      font-size: 11px;
+      font-size: .786em;
       line-height: 1;
     }
   }
@@ -358,8 +352,8 @@ a.star {
       line-height: 20px;
     }
     .number, i {
-      color: dark-light-choose(scale-color($primary, $lightness: 20%), scale-color($secondary, $lightness: 80%));
-      font-size: 130%;
+      color: dark-light-choose($primary-high, $secondary-low);
+      font-size: 1.286em;
     }
     .avatar  a {
       float: left;
@@ -375,12 +369,12 @@ a.star {
   .participants { // PMs //
     .user { float: left; margin: 7px 20px 7px 0; }
     .user a {
-      color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+      color: dark-light-choose($primary-high, $secondary-low);
       font-weight: bold;
       font-size: 0.929em;
     }
-    i.fa-times {
-      color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+    .d-icon-times {
+      color: dark-light-choose($primary-medium, $secondary-high);
     }
   }
 
@@ -400,13 +394,13 @@ a.star {
     .btn {
       border: 0;
       padding: 0 23px;
-      color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+      color: dark-light-choose($primary-medium, $secondary-high);
       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,27 +413,42 @@ a.star {
       }
     }
   }
+
+  .link-summary .btn {
+    color: dark-light-choose($primary-medium, $secondary-high);
+    background: blend-primary-secondary(5%);
+    width: 100%;
+    &:hover {
+      color: $primary;
+      background: dark-light-diff($primary, $secondary, 90%, -80%);
+    }
+  }
+}
+
+@mixin topic-footer-buttons-text {
+  line-height: 32px;
+  color: dark-light-choose($primary-medium, $secondary-medium);
+}
+
+@mixin topic-footer-button {
+  margin-bottom: 5px;
+  margin-right: 10px;
 }
 
 #topic-footer-buttons {
   padding: 10px 10px 0 0;
+  float: left;
   p {
-    line-height: 32px;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    @include topic-footer-buttons-text;
   }
   .btn {
-    margin-bottom: 5px;
-    margin-right: 10px;
-    .fa-bookmark.bookmarked { color: $tertiary; }
+    @include topic-footer-button;
+    .d-icon-bookmark.bookmarked { color: $tertiary; }
   }
 
-  .bookmark.bookmarked .fa-bookmark {
+  .bookmark.bookmarked .d-icon-bookmark {
     color: $tertiary;
   }
-
-  .notification-options p {
-    display: inline-block;
-  }
 }
 
 #topic-footer-button {
@@ -464,7 +473,7 @@ a.star {
 #suggested-topics .topic-statuses .topic-status {
   padding: 0;
   i {
-    font-size:15px;
+    font-size:1em;
   }
 }
 
@@ -510,7 +519,7 @@ video {
 
   .topic-statuses {
     i { color: $header_primary; }
-    i.fa-envelope { color: $danger; }
+    .d-icon-envelope { color: $danger; }
     .unpinned { color: $header_primary; }
   }
 
@@ -532,7 +541,7 @@ video {
 .extra-info {
   h1 {
     margin: 5px 0 0 0;
-    font-size: 1.6em;
+    font-size: 1.429em;
     line-height: 1.3em;
   }
 
@@ -563,11 +572,6 @@ video {
   position: relative;
 }
 
-.moderator {
-  .topic-body {
-    background-color: dark-light-diff($highlight, $secondary, 70%, -80%);
-  }
-}
 
 .deleted {
   .topic-body {
@@ -615,7 +619,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 {
@@ -635,12 +639,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;
@@ -651,15 +655,6 @@ $topic-avatar-width: 45px;
   width: calc(#{$topic-avatar-width} + #{$topic-body-width} + 2 * #{$topic-body-width-padding});
 }
 
-.small-action {
-  max-width: 755px;
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
-}
-
-.small-action.deleted {
-  background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%);
-}
-
 /* hide the reply border above the time gap notices */
 .time-gap + .topic-post .topic-body,
 .time-gap + .topic-post .topic-avatar {
@@ -696,12 +691,12 @@ $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 {
     font-size: 0.857em;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
   span.title {
     font-weight: bold;
@@ -728,7 +723,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;
 
 }
 
@@ -736,7 +731,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;
 }
 
@@ -755,7 +750,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;
@@ -788,7 +783,7 @@ $topic-avatar-width: 45px;
     margin: 10px 0 0 0;
   }
   h3 {
-    font-size: 1.786em;
+    font-size: 1.857em;
     color: $primary;
     margin-bottom: 5px;
     i {
@@ -800,7 +795,7 @@ $topic-avatar-width: 45px;
     color: $secondary;
     font-weight: normal;
     margin-bottom: 10px;
-    background: scale-color($tertiary, $lightness: 50%);
+    background: $tertiary-medium;
 
     &[href] {
       color: $secondary;
@@ -808,7 +803,7 @@ $topic-avatar-width: 45px;
     &:hover
     {
       color: $secondary;
-      background: scale-color($tertiary, $lightness: 20%);
+      background: $tertiary-high;
     }
     &:active {
       @include linear-gradient(darken($tertiary, 18%), darken($tertiary, 12%));
@@ -828,7 +823,7 @@ $topic-avatar-width: 45px;
     article.boxed {
       .select-posts {
         button.select-post {
-          background-color: scale-color($tertiary, $lightness: 50%);
+          background-color: $tertiary-medium;
           color: $secondary;
         }
       }
@@ -851,8 +846,8 @@ $topic-avatar-width: 45px;
 
       button {
         margin-left: 8px;
-        background-color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
-        border: 1px solid dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+        background-color: dark-light-choose($primary-low-mid, $secondary-high);
+        border: 1px solid dark-light-choose($primary-medium, $secondary-high);
         color: $primary;
       }
     }
@@ -874,7 +869,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;
@@ -896,7 +891,7 @@ a.attachment:before {
    float: right;
    font-size: 0.929em;
    margin-top: 1px;
-   a {color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
+   a {color: dark-light-choose($primary-medium, $secondary-medium); }
  }
 
 }
@@ -909,15 +904,15 @@ a.attachment:before {
 }
 
 span.highlighted {
-  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+  background-color: $tertiary-low;
 }
 
 .username.new-user a {
-  color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
+  color: dark-light-choose($primary-low-mid, $secondary-high);
 }
 
 .read-state {
-  color: scale-color($tertiary, $lightness: 50%);
+  color: $tertiary-medium;
   position: absolute;
   right: 0px;
   top: 13px;
@@ -941,7 +936,7 @@ span.highlighted {
 
 
 @media all
-and (max-width : 870px) {
+and (max-width : 775px) {
 
   .gutter {
     display: none;
@@ -970,19 +965,3 @@ and (max-width : 870px) {
   }
 
 }
-
-
-
-/* below standard tablet portrait ----------- */
-
-@media all
-and (max-width : 767px) {
-
-  .reply-to-tab {
-    span {display: none;}
-  }
-  .names {
-    span {display: block;}
-  }
-
-}
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index bd4b0c9f5f..d95273c0af 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -20,45 +20,35 @@
   z-index: 1000;
   padding-top: 14px;
   margin-bottom: 10px;
-  .star {
-    font-size: 1.429em;
-    margin-top: 6px;
-    margin-right: 6px;
-  }
-  #edit-title { width: 500px; }
-  .category-combobox {
-    width: 350px;
-    .select2-drop {
-      left: -9000px;
-      width: 248px;
-    }
-    .select2-search input {
-      width: 198px;
-    }
+
+  #edit-title, .category-chooser, .edit-controls {
+    width: 500px;
   }
   h1 {
-    font-size: 1.8em;
-    line-height: 1.2em;
+    font-size: 1.857em;
+    line-height: 1.25em;
     overflow: hidden;
     a {color: $primary;}
   }
-
-
   .topic-statuses {
     margin-top: -2px;
   }
   .select2-container {
     vertical-align: middle;
-    margin-right: 5px;
-    margin-bottom: 2px;
   }
   .private-message-glyph { display: none; }
+  .remove-featured-link {
+    float: right;
+    text-transform: lowercase;
+    color: dark-light-choose($primary-medium, $secondary-medium);
+    font-size: 0.857rem;
+  }
 }
 
 .private-message-glyph {
-  color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+  color: dark-light-choose($primary-low-mid, $secondary-high);
   float: left;
-  margin: 0 5px 0 0;
+  margin-right: 5px;
 }
 .private_message #topic-title .private-message-glyph { display: inline; }
 
@@ -67,7 +57,7 @@
   width: 60%;
   margin-left: auto;
   margin-right: auto;
-  font-size: 1.714em;
+  font-size: 1.857em;
   text-align: center;
   line-height: 1.1em;
 
@@ -80,8 +70,8 @@
 }
 
 .topic-status-info {
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
-  padding-top: 10px;
+  border-top: 1px solid $primary-low;
+  padding: 10px 0px;
   height: 20px;
   max-width: 757px;
 }
@@ -99,7 +89,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 +139,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;
@@ -167,7 +157,7 @@
     text-align: center;
     z-index: 1;
   }
-  i.fa {
+  .d-icon {
     position: absolute;
     right: 8px;
     bottom: 9px;
@@ -183,8 +173,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;
   }
 }
@@ -199,29 +189,29 @@
 
 
 #topic-filter {
-  background-color: scale-color($highlight, $lightness: 25%);
+  background-color: $highlight-medium;
   padding: 8px;
   bottom: 0;
   position: fixed;
   width: 100%;
-  font-size: 1.071em;
+  font-size: 1em;
   z-index: 495
 }
 
 @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;
+    right: 19vw;
   }
 
   #topic-progress-wrapper.docked {
-    right: 152px;
+    right: 19vw;
   }
 
   #topic-footer-main-buttons {
@@ -229,7 +219,6 @@ and (max-width : 1000px) {
   }
 }
 
-
 @media all
 and (max-width : 485px) {
 
diff --git a/app/assets/stylesheets/desktop/upload.scss b/app/assets/stylesheets/desktop/upload.scss
index 557bdbdbdd..07f68b1598 100644
--- a/app/assets/stylesheets/desktop/upload.scss
+++ b/app/assets/stylesheets/desktop/upload.scss
@@ -17,7 +17,7 @@
         line-height: 18px;
       }
       .description, .hint {
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+        color: dark-light-choose($primary-medium, $secondary-medium);
         display: block;
       }
       .hint {
diff --git a/app/assets/stylesheets/desktop/user-card.scss b/app/assets/stylesheets/desktop/user-card.scss
index 2d48ec8e00..2a73394fb7 100644
--- a/app/assets/stylesheets/desktop/user-card.scss
+++ b/app/assets/stylesheets/desktop/user-card.scss
@@ -41,6 +41,9 @@ $user_card_background: $secondary;
     a.card-huge-avatar {
       outline: none;
     }
+    .staged {
+      font-style: italic;
+    }
   }
 
   &.no-bg {
@@ -60,7 +63,7 @@ $user_card_background: $secondary;
 
   h1 {
     min-width: 120px;
-    font-size: 1.786em;
+    font-size: 1.857em;
     line-height: 1.25;
     display: block;
     max-width: 250px;
@@ -71,13 +74,13 @@ $user_card_background: $secondary;
       color: $user_card_primary;
     }
     i {
-      font-size: .8em;
+      font-size: .857em;
       color: $user_card_primary;
     }
   }
 
   h2 {
-    font-size: 1.071em;
+    font-size: 1.143em;
     line-height: 1.25;
     font-weight: normal;
     display: block;
@@ -193,7 +196,7 @@ $user_card_background: $secondary;
     float: right;
     margin: 0;
 
-    a {width: 100%; min-width: 150px;}
+    button { width: 100%; min-width: 150px; }
   }
 
   .new-user a {
@@ -205,17 +208,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 +224,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;
       }
 
@@ -257,7 +255,11 @@ $user_card_background: $secondary;
     position: absolute;
     right: 12px;
     bottom: 12px;
-    font-size: 2.143em;
+    font-size: 2.286em;
     i {color: $user_card_primary;}
   }
+
+  .metadata .email .btn {
+    padding: 2px 12px;
+  }
 }
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index f22c226d5c..c3fec738e9 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -1,8 +1,12 @@
-// styles that apply to the user page
+// Desktop styles for "/user" section
+.user-right {
+  display: table-cell;
 
-.groups {
-  .group-link {
-    color: $tertiary;
+  &,
+  > .user-stream {
+    > .alert:first-child {
+      margin-top: 10px;
+    }
   }
 }
 
@@ -19,188 +23,114 @@
   }
 }
 
-.user-preferences {
-  padding-top: 10px;
-
-  input.category-selector, input.user-selector, input.tag-chooser {
-    width: 530px;
-  }
-
-  textarea {
-    width: 530px;
-    height: 100px;
-  }
-
-  input[type=text] {
-    @include small-width {
-      width: 450px;
-    }
-  }
-
-  .static {
-    color: $primary;
-    display: inline-block;
-  }
-  .instructions {
-    display: inline-block;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-    margin-top: 0;
-    margin-bottom: 10px;
-    font-size: 80%;
-    line-height: 1.4em;
-  }
-  .avatar {
-    margin-left: 3px;
-  }
-  .instructions a[href] {
-    color: $tertiary;
-  }
-  .warning {
-    background-color: scale-color($danger, $lightness: 30%);
-    padding: 5px 8px;
-    color: $secondary;
-    width: 520px;
-  }
-
-  .pref-mailing-list-mode .controls {
-    select {
-      width: 400px;
-    }
-  }
-
-  .notifications, .category-notifications, .tag-notifications, .user-custom-preferences-outlet {
-    .controls select {
-      width: 280px;
-    }
-  }
-
-  .category-notifications .category-controls, .tag-notifications .tag-controls {
-    margin-top: 24px;
-  }
-}
-
-.user-main .user-preferences .user-field.text {
-  padding-top: 0;
-}
-
 .form-horizontal .control-group.category {
   margin-top: 18px;
 }
 
 .user-table {
-  margin-top: 30px;
   width: 100%;
+  display: table;
+  table-layout: fixed;
+
+  .wrapper {
+    display: table-row;
+  }
 }
 
-.user-navigation .nav-stacked .glyph {
-  display: none;
-  // float: right;
-  // display: block;
-  // position: static;
-}
-
-.user-navigation, .user-preferences {
+.user-navigation {
   display: table-cell;
   vertical-align: top;
   width: 170px;
-  padding-left: 30px;
 
-  h3 {
-    color: $primary;
-    margin: 20px 0 10px 0;
+  .nav-stacked {
+    background-color: transparent;
+
+    li {
+      border-bottom: none;
+
+      &.archive {
+        padding-left: 15px;
+      }
+    }
+
+    a {
+      color: dark-light-choose($primary-medium, $secondary-high);
+
+      &.active {
+        color: $primary;
+        font-weight: bold;
+        background-color: transparent;
+
+        &:after {
+          display: none;
+        }
+      }
+    }
   }
-
 }
 
-.viewing-self .user-main .about.collapsed-info {
-  .secondary, .staff-counters {
-    display: inherit;
+.user-content {
+  padding: 10px 8px;
+  background-color: $secondary;
+  margin-bottom: 10px;
+  box-sizing: border-box;
+
+  .btn.right {
+    float: right
   }
+
+  h2 {
+    margin-bottom: 10px;
+  }
+}
+
+.pref-avatar {
+  .avatar {
+    max-width: 45px;
+    max-height: 45px;
+  }
+}
+
+.user-invite-list {
+  width: 100%;
+  margin-top: 15px;
+
+  th {
+    text-align: left;
+    border-bottom: 3px solid $primary-low;
+    padding: 0 0 10px 0;
+    color: dark-light-choose($primary-medium, $secondary-medium);
+    font-weight: normal;
+  }
+
+  td {
+    padding: 10px 0 10px 0;
+    border-bottom: 1px solid $primary-low;
+  }
+}
+
+.user-invite-controls {
+  background-color: $primary-low;
+  padding: 5px 10px 0px 0;
+  height: 35px;
+}
+
+.user-invite-search {
+  clear: both;
+  margin: 15px 0px -15px 0px;
+}
+
+.user-invite-none {
+  clear: both;
+  padding: 15px;
 }
 
 .user-main {
   margin-bottom: 50px;
 
-  // name hacky so lastpass does not freak out
-  // -search- means it is bypassed
-  #add-user-to-group {
-    button, .ac-wrap {
-      float: left;
-    }
-    button {
-      margin-top: 5px;
-    }
-    #user-search-selector {
-      width: 400px;
-    }
-   }
-
-  .user-right {
-    width: 900px;
-    display: table-cell;
-  }
-
-  .user-content {
-    padding: 10px 8px;
-    background-color: $secondary;
-    margin-bottom: 10px;
-    box-sizing: border-box;
-
-    .btn.right {
-      float: right
-    }
-
-    h2 {
-      margin-bottom: 10px;
-    }
-
-    .user-invite-list {
-      width: 100%;
-      margin-top: 15px;
-
-      th {
-        text-align: left;
-        border-bottom: 3px solid dark-light-diff($primary, $secondary, 90%, -60%);
-        padding: 0 0 10px 0;
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-        font-weight: normal;
-      }
-
-      td {
-        padding: 10px 0 10px 0;
-        border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-      }
-    }
-
-    .pref-avatar {
-      .avatar {
-        max-width: 45px;
-        max-height: 45px;
-      }
-    }
-
-    .user-invite-controls {
-      background-color: dark-light-diff($primary, $secondary, 90%, -75%);
-      padding: 5px 10px 0px 0;
-      height: 35px;
-    }
-
-    .user-invite-search {
-      clear: both;
-      margin: 15px 0px -15px 0px;
-    }
-
-    .user-invite-none {
-      clear: both;
-      padding: 15px;
-    }
-  }
-
   .about {
     background-position: center center;
     background-size: cover;
-    width: 100%;
-    overflow: hidden;
 
     &.group {
       .details {
@@ -211,108 +141,36 @@
     }
 
   .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%);
-    font-size: 0.929em;
-      .btn { padding: 3px 12px; }
-
-      dl dd {
-        display: inline;
-        margin: 0 10px 0 0;
-        padding: 0;
-      }
-
-      dl dt {
-        display: inline-block;
-        margin: 0 5px 0 0;
-        padding: 0;
-      }
+    background: $secondary;
+    border-top: 1px solid $primary-low;
+    border-bottom: 1px solid $primary-low;
 
       dl {
-        margin: 0;
         padding: 8px 10px;
       }
 
       dd {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        color: $primary;
-      }
-
-      dd.groups {
-        span:after {
-          content: ','
-        }
-        span:last-of-type:after {
-          content:''
-        }
+        display: inline;
+        margin: 0 10px 0 0;
       }
 
       dt {
-        color: dark-light-diff($secondary, $primary, 50%, -40%);
-        margin: 0;
+        margin: 0 5px 0 0;
+        padding: 0;
       }
     }
 
     .details {
       padding: 0 0 4px 0;
-      background: rgba($secondary, .85);
       margin-top: -200px;
       transition: margin .15s linear;
 
-      blockquote {
-        background-color: dark-light-diff($secondary, $primary, 30%, -70%);
-        border-left-color: dark-light-diff($secondary, $primary, 50%, -50%);
-      }
-
-      h1 {
-        font-size: 2.143em;
-        font-weight: normal;
-        i {font-size: .8em;}
-      }
-
-      h2 {
-        font-size: 1.214em;
-        font-weight: normal;
-        margin-top: 10px;
-        max-width: 100%;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-
-      h3 {
-        font-weight: normal;
-        font-size: 1em;
-        margin: 5px 0;
-        i:not(:first-of-type) {
-          margin-left: 10px;
-        }
-      }
-
-      .groups {
-        margin-left: 10px;
-        display: inline;
-        }
-
       img.avatar {
         margin: 0 20px 10px 0;
-        float: left;
         transition: all .1s linear;
       }
 
-      .suspended {
-        color: $danger;
-      }
-
       .primary {
-        width: 100%;
-        position: relative;
-        float: left;
-
-        h1 {font-weight: bold;}
-
         .primary-textual {
           padding: 3px;
           a[href] {
@@ -321,38 +179,29 @@
         }
 
         .bio {
-          max-height: 300px;
-          overflow: auto;
           max-width: 750px;
 
-          a[href] {
-            text-decoration: underline;
-          }
-
           a.mention {
             text-decoration: none;
           }
-
-          img {
-            max-width: 100%;
-          }
         }
       }
     }
-        &.has-background {
-          .details { padding: 15px 15px 4px 15px;}
-        }
+
+    &.has-background {
+      .details {
+        padding: 15px 15px 4px 15px;
+      }
+    }
 
     .controls {
       padding: 0 0 12px 0;
       float: right;
       text-align: right;
       width: 180px;
-      ul {list-style-type: none;}
+
       a {
-        padding: 5px 10px;
         width: 140px;
-        margin-bottom: 10px;
       }
 
       .right {
@@ -360,294 +209,115 @@
         margin-left: 5px;
       }
     }
-  }
 
-  .about.collapsed-info {
-    .controls {
-      margin-top: 0;
-      width: auto;
-      ul {
-        li {display: inline;}
-        a {
-          padding: 5px 10px;
-          margin-bottom: 10px;
-          width: auto;
+    &.collapsed-info {
+      .controls {
+        width: auto;
+
+        ul {
+
+          li {
+            display: inline;
           }
-      }
-    }
 
-    .staff-counters {
-      display: none;
-    }
-
-    .secondary { display: none; }
-
-    .profile-image {
-      height: 0;
-    }
-
-    .details {
-      padding: 0 0 2px 0;
-      margin-top: 0;
-      background: rgba($secondary, .85);
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-      .bio { display: none; }
-
-      .primary {
-        text-align: left;
-        margin-top: 0;
-        width: 100%;
-
-        .avatar {
-          float: left;
-          margin-right: 10px;
-          width: 45px;
-          height: 45px;
-        }
-
-        h1 {
-          font-size: 1.429em;
-        }
-
-        h2 {
-          font-size: 1.071em;
-          margin-top: 4px;
-        }
-
-        h3 {
-          display: none;
+          a {
+            padding: 5px 10px;
+            margin-bottom: 10px;
+            width: auto;
+          }
         }
       }
-    }
 
-    &.has-background {
-      .details {  padding: 12px 15px 2px 15px;}
-    }
-
-  }
-
-  .user-stream {
-    .excerpt {
-      margin: 5px 0;
-      font-size: 0.929em;
-      word-wrap: break-word;
-      color: $primary;
-    }
-    .item.moderator-action {
-      background-color: dark-light-diff($highlight, $secondary, 50%, -10%);
-    }
-    .item.deleted {
-      opacity: 0.8;
-      background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -10%);
-    }
-    .item.hidden {
-      display: block;
-      opacity: 0.4;
-    }
-    .item {
-      padding: 20px 8px 15px 8px;
-      background-color: $secondary;
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-    }
-    .type {
-      color: $primary;
-    }
-    span.name {
-      color: $primary;
-    }
-    .time, .delete-info {
-      display: block;
-      float: right;
-      color: lighten($primary, 40%);
-      margin-right: 8px;
-      font-size: 11px;
-    }
-    .delete-info i {
-      font-size: 1em;
-    }
-    .avatar-link {
-      float: left;
-      margin-right: 4px;
-    }
-    .title {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      display: block;
-    }
-    .name {
-      font-size: 1em;
-      max-width: 400px;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-    .edit-reason {
-      background-color: dark-light-choose(scale-color($highlight, $lightness: 25%), scale-color($highlight, $lightness: -50%));
-      padding: 3px 5px 5px 5px;
-    }
-    .remove-bookmark {
-      float: right;
-      margin-top: -4px;
-    }
-    .notification {
-      &.unread {
-        background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+      .details {
+        padding: 0 0 2px 0;
+        border-bottom: 1px solid $primary-low;
       }
 
-      li { display: inline-block; }
-      p {
-        display: inline-block;
-        margin-left: 10px;
-        span {
-          color: $primary;
+      &.has-background {
+        .details {
+          padding: 12px 15px 2px 15px;
         }
       }
-      .time {
-        display: inline-block;
-        margin-left: 10px;
-        float: none;
-      }
-      // common/base/header.scss
-      .fa, .icon {
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-        font-size: 1.714em;
-      }
-    }
-    .group-member-info {
-      .name {
-        display: inline-block;
-        margin-top: 5px;
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-      }
-      .title {
-        display: inline-block;
-        margin-top: 5px;
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-      }
     }
   }
 
   .staff-counters {
-    text-align: left;
-    background: $primary;
-    color: $secondary;
     margin-bottom: 20px;
-    a {
-      color: $secondary;
-    }
-    > div {
-      margin: 0 10px 0 0;
-      display: inline-block;
-      padding: 5px 0;
-      &:first-of-type {
-        padding-left: 10px;
-      }
-      span {
-        padding: 1px 5px;
-        border-radius: 10px;
-      }
-    }
-    .active {
-      font-weight: bold;
-    }
-  }
-
-  .pill {
-    border-radius: 15px;
-    display: inline-block;
-    height: 30px;
-    width: 30px;
-    text-align: center;
-    vertical-align: middle;
-    line-height: 30px;
-  }
-  .helpful-flags {
-    background-color: green;
-  }
-  .flagged-posts {
-    background-color: #E49735;
-  }
-  .warnings-received {
-    background-color: #EC441B;
-  }
-  .deleted-posts {
-    background-color: #EC441B;
-  }
-  .suspensions {
-    background-color: #c22020;
-  }
-
-  .user-field.text {
-    padding-top: 18px;
   }
 
   .user-field {
     input[type=text] {
       width: 530px;
     }
+
     .controls {
-      label {
-        width: auto;
-        text-align: left;
-        font-weight: normal;
-        float: auto;
-      }
       .instructions {
         display: block;
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-        margin-top: 5px;
-        margin-bottom: 10px;
-        font-size: 80%;
-        line-height: 1.4em;
       }
     }
-    clear: both;
-    margin-bottom: 10px;
   }
-  .group-notification-menu .dropdown-menu {
-    top: 30px;
-    bottom: auto;
-    left: auto;
-    right: 10px;
+
+  .viewing-self & .about.collapsed-info {
+    .secondary, .staff-counters {
+      display: inherit;
+    }
   }
 }
 
-.paginated-topics-list {
-  .user-content {
-    width: 100%;
-    margin-top: 0;
+.user-preferences {
+  display: table-cell;
+  vertical-align: top;
+  padding-top: 10px;
+  padding-left: 30px;
+
+  h3 {
+    color: $primary;
+    margin: 20px 0 10px 0;
   }
-}
 
-.user-right .group-notification-menu {
-  float: right;
-  margin-bottom: 5px;
-}
-
-.user-main .nav-stacked {
-  &.activity-list {
-    padding-top: 20px;
+  textarea {
+    width: 530px;
   }
-  background-color: transparent;
 
-  li {
-    border-bottom: none;
-    > a {
-      padding: 8px 13px;
-      color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%));
+  input {
+    &.category-selector,
+    &.user-selector,
+    &.tag-chooser {
+      width: 530px;
+    }
+
+    &[type=text] {
+      @include small-width {
+        width: 450px;
+      }
     }
   }
 
-  li > a.active {
-    color: $primary;
-    font-weight: bold;
-    background-color: transparent;
-  }
-  li > a.active:after {
-    display: none;
+  .instructions {
+    display: inline-block;
+    margin-top: 0;
   }
 
-  li.archive {
-    padding-left: 15px;
+  .form-horizontal .instructions {
+    margin-left: 160px;
+  }
+
+  .pref-mailing-list-mode .controls {
+    select {
+      width: 400px;
+    }
+  }
+
+  .notifications,
+  .category-notifications,
+  .tag-notifications,
+  .user-custom-preferences-outlet {
+    .controls select {
+      width: 280px;
+    }
+  }
+
+  .user-main & .user-field.text {
+    padding-top: 0;
   }
 }
diff --git a/app/assets/stylesheets/embed.scss b/app/assets/stylesheets/embed.scss
index 66af74d3d0..0f48544c04 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;
     }
@@ -87,7 +87,7 @@ article.post {
   }
 
   a.new-user {
-    color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
+    color: dark-light-choose($primary-low-mid, $secondary-high);
   }
 
   span.title {
diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss
index b1592b6d6a..3924296243 100644
--- a/app/assets/stylesheets/mobile.scss
+++ b/app/assets/stylesheets/mobile.scss
@@ -24,6 +24,9 @@
 @import "mobile/ring";
 @import "mobile/group";
 
+// Import all component-specific files
+@import "mobile/components/*";
+
 /* These files doesn't actually exist, they are injected by Stylesheet::Compiler. */
 
 @import "plugins";
diff --git a/app/assets/stylesheets/mobile/alert.scss b/app/assets/stylesheets/mobile/alert.scss
index b7ff758af0..0e91f6f71d 100644
--- a/app/assets/stylesheets/mobile/alert.scss
+++ b/app/assets/stylesheets/mobile/alert.scss
@@ -8,5 +8,5 @@
     margin-bottom: -3px;
     margin-top: -5px;
     padding: 15px;
-    font-size: 1.1em;
+    font-size: 1em;
 }
diff --git a/app/assets/stylesheets/mobile/buttons.scss b/app/assets/stylesheets/mobile/buttons.scss
index 8a30ba692a..652f8a8601 100644
--- a/app/assets/stylesheets/mobile/buttons.scss
+++ b/app/assets/stylesheets/mobile/buttons.scss
@@ -2,4 +2,4 @@ h3 .top-title-buttons button {
   margin-right: 10px;
   clear: both;
   margin-top: 5px;
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/mobile/components/user-info.scss b/app/assets/stylesheets/mobile/components/user-info.scss
new file mode 100644
index 0000000000..8cf359ea18
--- /dev/null
+++ b/app/assets/stylesheets/mobile/components/user-info.scss
@@ -0,0 +1,14 @@
+// Mobile styles for "user-info" component
+.user-info {
+  &.medium {
+    width: 300px;
+
+    .user-image {
+      width: auto;
+    }
+
+    .user-detail {
+      width: 240px;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/mobile/components/user-stream-item.scss b/app/assets/stylesheets/mobile/components/user-stream-item.scss
new file mode 100644
index 0000000000..3727bbd76b
--- /dev/null
+++ b/app/assets/stylesheets/mobile/components/user-stream-item.scss
@@ -0,0 +1,33 @@
+// Mobile styles for "user-stream-item" component
+.user-stream {
+
+  // DEPRECATION:
+  // The ".item" class should be eventually removed because it's too generic.
+  // Once ".item" has been removed, ".user-stream-item" can replace
+  // ".user-stream" as the top-level selector on this file as all other
+  // selectors below are its children
+  .item,
+  .user-stream-item {
+    padding: 20px 0 15px 0;
+  }
+
+  .name {
+    vertical-align: middle;
+  }
+
+  .notification {
+    &.unread {
+      background-color: dark-light-choose($tertiary-low, srgb-scale($tertiary, $secondary, 15%));
+    }
+  }
+
+  .group-member-info {
+    .name {
+      vertical-align: inherit;
+    }
+  }
+
+  .topic-statuses {
+    float: left;
+  }
+}
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index e524dd2794..0afe0dcb05 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -1,353 +1,152 @@
-// styles that apply to the reply pane that slides up to compose replies
-
-// hack, this needs to be done cleaner
-.private-message input.span8 {
-  width: 47%;
-}
-
 .composer-popup-container {
-display: none !important; // can be removed if inline JS CSS is removed from composer-popup
+  display: none !important; // can be removed if inline JS CSS is removed from composer-popup
 }
 
 .composer-popup {
-display: none !important; // can be removed if inline JS CSS is removed from composer-popup
-}
-
-input {
-  background: $secondary;
-  color: $primary;
-  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%);
-}
-input[type=radio], input[type=checkbox] {
-  box-shadow: none;
+  display: none !important; // can be removed if inline JS CSS is removed from composer-popup
 }
 
 #reply-control {
-  // used for upload link
-  .composer-bottom-right {
-    float: right;
-    line-height: 3em;
-  }
-  #mobile-uploader { display: none; }
-  .mobile-file-upload.hidden { display: none; }
-  #draft-status, #file-uploading, .mobile-file-upload { display: inline-block; }
-  transition: height .4s ease;
-  width: 100%;
-  z-index: 1039;
-  height: 0;
-  background-color: dark-light-diff($primary, $secondary, 90%, -60%);
-  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 {
-    padding-left: 7px;
-    line-height: 30px;
-  }
-  .control-row {
-    margin: 0 0 0 5px;
-    .reply-to {
-      overflow: hidden;
-      max-width: 80%;
-      white-space: nowrap;
-      i {
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+  z-index: 1002; //d-header is 1001
+    .reply-area {
+      padding: 0 10px;
+      @media screen and (max-width: 374px) {
+        padding: 0 5px;
       }
+      flex-grow: 1;
     }
-  }
-  .saving-text {
-    display: none;
-  }
-  .draft-text {
-    display: none;
-  }
-  .grippie {
-    display: none;
-  }
-  // The various states
-  &.open {
-    max-height: 100%; // ensure no overflow e.g. on small Android
-    height: 270px;
-  }
-  &.closed {
-    height: 0 !important;
-  }
-  &.draft {
-    height: 35px !important;
-    cursor: pointer;
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-    .draft-text {
-      display: block;
-      position: absolute;
-      margin-right: 40px;
-      max-width: 80%;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
 
-      i {
-        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%);
-    .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
-  // a small screen mobile device
-  &.edit-title {
     &.open {
-      max-height: 100%; // ensure no overflow e.g. on small Android
       height: 250px;
-    }
-    .contents {
-      input#reply-title {
-        padding: 5px;
-        margin-top: 6px;
-        width: 99%;
-        box-sizing: border-box;
-        border: 1px solid $secondary;
-      }
-      .wmd-controls {
-        transition: top 0.3s ease;
-        top: 110px;
+      &.edit-title {
+        height: 100%;
       }
     }
-  }
-  .contents {
-    padding: 8px 5px 0 5px;
-    .form-element {
-      .select2-container {
-        width: 99%;
-        margin-top: 6px;
-        a {
-          padding-top: 4px;
-          height: 28px;
-        }
-        b {
-          margin-top: 4px;
-        }
-      }
 
+    .reply-to {
+      margin: 5px 0;
     }
-    .edit-reason-input, .display-edit-reason {
-      display: none;
-    }
-    .edit-reason-input {
-      display: inline-block;
-      margin-left: 2px;
-      #edit-reason {
-        margin: 0;
-        padding: 2px;
+
+    .toggler {
+      margin-left: -5px;
+      .d-icon-chevron-down {
+        vertical-align: text-top;
       }
     }
+
+    &.draft {
+      .toggle-toolbar,
+      .toggler {
+        top: 8px;
+      }
+      .draft-text {
+        width: calc(100% - 40px);
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+    }
+
     #reply-title {
-      margin-right: 10px;
-      &:disabled {
-        background-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+      width: calc(100% - 20px);
+    }
+
+    .category-input {
+      margin-bottom: 5px;
+      .category-chooser {
+        width: 100% !important;
       }
     }
-    .d-editor-input:disabled {
-      background-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
-    }
-    .d-editor-input {
-      color: dark-light-choose(darken($primary, 40%), blend-primary-secondary(90%));
-      bottom: 35px;
-      width: 100%;
-      height: 100%;
-      padding: 7px;
-      margin: 0;
-      background-color: $secondary;
-      word-wrap: break-word;
-      box-sizing: border-box;
-      border: 1px solid $secondary;
-    }
+
     .submit-panel {
-      // need minimum width that fits, or this'll wrap cancel under submit/create which is super bad
-      width: 180px;
-      position: absolute;
-      display: block;
-      bottom: 0;
-    }
-  }
-  .category-input {
-    // hack, select2 is using inline styles
-    .select2-container {
-      width: 99% !important;
-    }
-  }
-  .popup-tip .close {
-    padding: 0 2px 2px 8px; // so my fingers can touch the little x
-  }
-  .title-input .popup-tip {
-    width: 240px;
-    right: 5px;
-  }
-  .category-input .popup-tip {
-    width: 240px;
-    right: 5px;
-  }
-  .d-editor-textarea-wrapper .popup-tip {
-    top: 28px;
-  }
-  button.btn.no-text {
-    margin: 7px 0 0 5px;
-    position: absolute;
-  }
-  .btn-primary {
-    margin-bottom: 8px;
-  }
-}
-
-#reply-control.edit-title.private-message {
-  .wmd-controls {
-    transition: top 0.3s ease;
-    top: 120px;
-  }
-}
-
-#reply-control {
-
-  .d-editor {
-    height: 100%;
-  }
-
-  .d-editor-container {
-    height: 100%;
-  }
-
-  .wmd-controls {
-    left: 10px;
-    right: 10px;
-    position: absolute;
-    top: 40px;
-    bottom: 50px;
-    display: block;
-    .d-editor-container {
-      padding: 0;
-    }
-    .d-editor-preview-wrapper {
-      display: none;
-    }
-
-    .btn.hide-preview {
-      position: fixed;
-      right: 5px;
-      bottom: 5px;
-      z-index: 1000001;
-    }
-
-    .d-editor-preview-wrapper.force-preview {
-      display: block;
-      position: fixed;
-      z-index: 1000000;
-      top: 0;
-      bottom: 0;
-      left: 0;
-      right: 0;
-      background-color: $secondary;
-
-      .d-editor-preview {
-        height: 90%;
-        height: calc(100% - 60px);
-        border: 0;
-        overflow: auto;
+      margin-bottom: 5px;
+      align-items: baseline;
+      .save-or-cancel {
+        flex: 1 1 auto;
+        #draft-status,
+        #file-uploading {
+          margin-left: 15px;
+        }
+      }
+      .composer-bottom-right {
+        margin-left: auto;
+        flex: 1 1 auto;
       }
     }
+
     .d-editor-textarea-wrapper {
-      position: relative;
-      box-sizing: border-box;
-      height: 100%;
-      min-height: 100%;
-      margin: 0;
-      padding: 0;
-      .popup-tip {
-        margin-top: 3px;
-        right: 4px;
+      width: 100%;
+    }
+
+    &.show-preview {
+      .d-editor-preview-wrapper {
+        position: fixed;
+        z-index: 1000000;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        background-color: $secondary;
+        max-width: 100%;
+        margin: 0;
+        padding: 10px;
+        overflow: auto;        
+        .d-editor-preview {
+          margin-bottom: 40px;
+        }
+      }
+      .btn.hide-preview {
+        position: fixed;
+        right: 5px;
+        bottom: 5px;
+        z-index: 1000001;
       }
     }
-  }
-  .d-editor-button-bar {
-    display: none;
-  }
 
+    &.hide-preview {
+      .d-editor-preview-wrapper {
+        display: none;
+      }
+    }
 
-  .wmd-controls.toolbar-visible .d-editor-input {
-    padding-top: 40px;
-  }
-
-  .wmd-controls.toolbar-visible .d-editor-button-bar {
-
-    .btn.link, .btn.upload, .btn.rule, .btn.bullet, .btn.list, .btn.heading {
+    .d-editor-button-bar {
       display: none;
     }
 
-    display: block;
-    margin: 1px 4px;
-    position: absolute;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-    background-color: $secondary;
-    z-index: 100;
-    overflow: hidden;
-    width: 100%;
-    width: calc(100% - 10px);
-
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-
-    button {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    .toolbar-visible .d-editor-button-bar {
+      display: flex;
     }
-    button.btn.no-text {
-      margin: 0 2px;
-      padding: 2px 5px;
-      position: static;
+
+    .d-editor-button-bar .btn {
+      @media all and ( max-width: 350px) {
+        padding: 2px 4px;
+      }
+      &.preview {
+        margin: 0;
+      }
+    }
+
+    #mobile-uploader {
+      display: none;
+    }
+
+    .title-and-category,
+    .user-selector {
+      margin: 0;
+      .users-input {
+        margin-bottom: 5px;
+      }
+    }
+
+    .title-input,
+    .category-input,
+    .users-input,
+    .add-warning {
+      width: 100%;
+    }
+
+    .add-warning {
+      margin: 0 0 5px 5px;
     }
   }
-}
 
-// make sure the category selector *NEVER* gets focus by default on mobile anywhere
-.select2-hidden,
-.select2-search,
-.select2-focusser {
-  display:none !important;
-}
diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss
index bbdbf8cf02..d6cc24df05 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: dark-light-choose($highlight-low, $highlight-medium);
 
     .username a, .name, .title, .number, .time-read, .user-stat .label {
       color: scale-color($highlight, $lightness: -50%);
@@ -31,16 +31,15 @@
   }
   .user-stat {
     margin-left: 55px;
-    font-size: 13px;
 
     .value {
       font-weight: bold;
     }
     .label {
       margin-left: 0.2em;
-      color: dark-light-diff($primary, $secondary, 50%, -50%);
+      color: blend-primary-secondary(50%);
     }
-    i.fa-heart {
+    .d-icon-heart {
       color: $love;
     }
   }
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index 97c23d2427..110663e05e 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -1,98 +1,58 @@
+// Mobile
 // global styles that apply to the Discourse application specifically
 // BEWARE: changing these styles implies they take effect anywhere they are seen
 // throughout the Discourse application
 
+// Base Elements
 body {
   background-color: $secondary;
-  textarea {
-    background-color:$secondary;
-  }
 }
 
-// This sets the space between the application content and the edge of the
-// screen. This value is required in 'mobile/header.scss' to set the position
-// of the drop-down menu.
-$mobile-wrapper-padding: 10px;
-.wrap {
-  padding: 0 $mobile-wrapper-padding;
-}
-
-body {
-
-  .boxed {
-    .contents {
-      padding: 10px 0 0 0;
-    }
-    &.white {
-      background-color: $secondary;
-    }
-  }
-  #main {
-    position: relative;
-    img.avatar {
-      &.header {
-        width: 45px;
-        height: 45px;
-      }
-      &.medium {
-        width: 32px;
-        height: 32px;
-      }
-      &.small {
-        width: 25px;
-        height: 25px;
-      }
-      &.tiny {
-        width: 20px;
-        height: 20px;
-      }
-    }
-    .user-list {
-      .user {
-        padding-bottom: 5px;
-      }
-    }
-  }
-  .control-group {
-    margin-bottom: 9px;
-  }
+textarea {
+  background-color:$secondary;
 }
 
 blockquote {
   /* 13px left is intentional here to properly align with post quotes */
   padding: 10px 8px 10px 13px;
+
   p {
     margin: 0 0 10px 0;
+
+    &:last-of-type {
+      margin-bottom:0;
+    }
   }
-  p:last-of-type {
-    margin-bottom:0;
+
+}
+
+// Common classes
+.wrap {
+  padding: 0 10px;
+}
+
+.boxed {
+  .contents {
+    padding: 10px 0 0 0;
   }
 }
 
+.control-group {
+  margin-bottom: 9px;
+}
+
 .topic-statuses {
   display: inline-block;
+
   .topic-status {
     i {
-      color: dark-light-diff($secondary, $primary, 40%, -20%);
+      color: $secondary-high;
     }
   }
-}
-.topic-statuses:empty {
-  display: none;
-}
 
-// Styles used before the user is logged into discourse. For example, activating their
-// account or changing their email.
-
-#simple-container {
-  width: 90%;
-}
-
-// somehow the image logo assumption inherits margins from earlier in the CSS stack
-// we must remove margins for text site titles
-h2#site-text-logo
-{
-  margin: 0 0 0 10px;
+  &:empty {
+    display: none;
+  }
 }
 
 // categories should not be bold on mobile; they fight with the topic title too much
@@ -100,35 +60,33 @@ h2#site-text-logo
   font-weight: normal;
 }
 
-.user-table {
-  position: relative;
-}
-
 .mobile-view .mobile-nav {
-  &.messages-nav, &.notifications-nav, &.activity-nav, &.preferences-nav {
-    position: absolute;
-    right: 0px;
-    top: -55px;
-  }
-}
-
-
-.mobile-view .mobile-nav {
-  a .fa {
-    margin-right: 8px;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-  }
-  a {
-    color: $primary;
-  }
   margin: 0;
   padding: 0;
-  background: dark-light-diff($primary, $secondary, 90%, -65%);
+  background: $primary-low;
   list-style: none;
   overflow: visible;
   position: relative;
   width: 45%;
 
+  &.messages-nav,
+  &.notifications-nav,
+  &.activity-nav,
+  &.preferences-nav {
+    position: absolute;
+    right: 0px;
+    top: -55px;
+  }
+
+  a {
+    color: $primary;
+
+    .fa {
+      margin-right: 8px;
+      color: dark-light-choose($primary-medium, $secondary-medium);
+    }
+  }
+
   > li > a {
     padding: 8px 10px;
     height: 100%;
@@ -136,88 +94,60 @@ h2#site-text-logo
     box-sizing: border-box;
     display: block;
   }
-  .fa-caret-down {
+
+  .d-icon-caret-down {
     position: absolute;
     right: 0px;
   }
 
   .drop {
     display: none;
-  }
-  .drop.expanded {
-    left: 0;
-    display: block;
-    position: absolute;
-    z-index: 10000000;
-    background-color: $secondary;
-    width: 100%;
-    list-style: none;
-    margin: 0;
-    padding: 5px;
-    border: 1px solid #eaeaea;
-    box-sizing: border-box;
-    li {
-      margin: 5px 0;
-      padding: 0;
-      a {
-        height: 100%;
-        display: block;
-        padding: 5px 8px;
+    &.expanded {
+      left: 0;
+      display: block;
+      position: absolute;
+      z-index: 10000000;
+      background-color: $secondary;
+      width: 100%;
+      list-style: none;
+      margin: 0;
+      padding: 5px;
+      border: 1px solid #eaeaea;
+      box-sizing: border-box;
+
+      li {
+        margin: 5px 0;
+        padding: 0;
+
+        a {
+          height: 100%;
+          display: block;
+          padding: 5px 8px;
+        }
       }
     }
   }
 }
 
-/* page not found styles */
-h1.page-not-found {
-  line-height: 24px;
-  margin: 5px 0 -5px 0;
-}
-
-.page-not-found-topics a.badge-wrapper {
-  margin-left: 8px;
-}
-
-h2.popular-topics-title {
-  margin-bottom: 6px;
-  font-size: 1.2em;
-}
-
-h2.recent-topics-title {
-  margin-bottom: 6px;
-  font-size: 1.2em;
-}
-
-.page-not-found-search h2 {
-  font-size: 1.2em;
-}
-
-
-
 .form-vertical {
-  input, textarea, select, .input-prepend, .input-append {
-    display: inline-block;
-    margin-bottom: 0;
-  }
-
   .control-group {
     margin-bottom: 12px;
-    &:before {
-      display: table;
-      content: "";
-    }
-    &:after {
-      display: table;
-      content: "";
-      clear: both;
-    }
-  }
-  .control-label {
-    font-weight: bold;
-    font-size: 1.2em;
-    line-height: 2;
-  }
-  .controls {
-    margin-left: 0;
   }
 }
+
+// Special elements
+#main {
+  position: relative;
+}
+
+// Styles used before the user is logged into discourse. For example, activating
+// their account or changing their email.
+#simple-container {
+  width: 90%;
+}
+
+// somehow the image logo assumption inherits margins from earlier in the CSS
+// stack we must remove margins for text site titles
+h2#site-text-logo {
+  margin: 0 0 0 10px;
+}
diff --git a/app/assets/stylesheets/mobile/emoji.scss b/app/assets/stylesheets/mobile/emoji.scss
index 6d94493756..e69de29bb2 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/header.scss b/app/assets/stylesheets/mobile/header.scss
index ab112d8bda..e33cbf3c35 100644
--- a/app/assets/stylesheets/mobile/header.scss
+++ b/app/assets/stylesheets/mobile/header.scss
@@ -4,7 +4,7 @@
 
 @media only screen and (max-width: 320px) {
   #site-text-logo {
-    font-size: 18px;
+    font-size: 1.286em;
   }
 }
 
@@ -28,22 +28,21 @@
     }
   }
 
-  .icons {
-    .badge-notification {
-      top: -5px;
-      color: $secondary;
-    }
-
-    .active .icon {
-      &:after { margin-top: -1px; }
-    }
-  }
-
   button.sign-up-button {
     display:none;
   }
 }
 
+.d-header-icons {
+  .badge-notification {
+    top: -5px;
+  }
+
+  .active .icon {
+    &:after { margin-top: -1px; }
+  }
+}
+
 #main-outlet {
   padding-top: 60px;
 }
diff --git a/app/assets/stylesheets/mobile/history.scss b/app/assets/stylesheets/mobile/history.scss
index 0f52dbb84a..395f8ca956 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/login.scss b/app/assets/stylesheets/mobile/login.scss
index d6aa875ca2..7079f65604 100644
--- a/app/assets/stylesheets/mobile/login.scss
+++ b/app/assets/stylesheets/mobile/login.scss
@@ -16,7 +16,7 @@
 
 #login-form {
   a {
-    color: dark-light-choose(scale-color($primary, $lightness: 35%), scale-color($secondary, $lightness: 65%));
+    color: dark-light-choose($primary-high, $secondary-low);
   }
   label { float: left; display: block; }
   textarea, input, select {
@@ -40,7 +40,6 @@ a#forgot-password-link {clear: left; float: left; }
 .login-modal, .create-account {
   .btn-primary {
     margin-bottom: 10px;
-    font-size: 15;
     float: left;
   }
 }
@@ -59,7 +58,7 @@ $input-width: 184px;
 
   tr.instructions {
     label {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
   }
 
@@ -71,12 +70,18 @@ $input-width: 184px;
 }
 
 .create-account {
+  .user-fields {
+    margin-top: 10px;
+    padding-top: 15px;
+    border-top: 1px solid #e9e9e9;
+  }
+
   .user-field.confirm {
     margin-top: 10px;
     margin-bottom: 10px;
   }
+  
   .user-field {
-    margin-top: 10px;
     label {
       width: $label-width;
     }
@@ -128,4 +133,4 @@ $input-width: 184px;
   .col-image {
     display: none;
   }
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss
index 9cd00e091e..7c4e4305c3 100644
--- a/app/assets/stylesheets/mobile/modal.scss
+++ b/app/assets/stylesheets/mobile/modal.scss
@@ -64,7 +64,7 @@
   }
 }
 .close {
-  font-size: 1.714em;
+  font-size: 1.857em;
   padding: 10px 15px 5px 5px;
   color: $primary;
 }
@@ -91,20 +91,22 @@
       width: 100%;
     }
   }
-
-  .category-combobox {
-    width: 100%;
-  }
 }
 
 .flag-modal {
   max-height: 450px;
 }
 
+@media only screen and (max-device-width: 568px) {
+  .modal .flag-modal .flag-message {
+    height: 1.2em;
+  }
+}
+
 .custom-message-length {
   margin: -4px 0 10px 20px;
-  color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
-  font-size: 85%;
+  color: dark-light-choose($primary-high, $secondary-low);
+  font-size: .857em;
 }
 
 .flag-message {
@@ -114,6 +116,7 @@
 
 .edit-category-modal {
   .modal-body {
+    box-sizing: border-box;
     position: relative;
     height: 350px;
   }
@@ -162,20 +165,11 @@
 .alert {
   padding: 5px;
   &.alert-success {
-    background-color:  scale-color($success, $lightness: 90%);
+    background-color: $success-low;
     color: $success;
   }
 }
 
-.delete-flag-modal, .agree-flag-modal {
-  .modal-inner-container {
-    width: 300px;
-  }
-  .btn {
-    float: none !important;
-  }
-}
-
 #search-help {
   max-width: 98%;
 }
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index d66aa8115a..2fe9e9bb30 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,8 +47,8 @@
 
   }
   .nav-pills > li {
-    background: dark-light-diff($primary, $secondary, 90%, -65%);
-    i.fa-caret-down {
+    background: $primary-low;
+    .d-icon-caret-down {
       margin-left: 8px;
     }
   }
@@ -76,7 +76,7 @@
   th,
   td {
     padding: 7px 0;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     max-width: 300px;
   }
 
@@ -85,7 +85,7 @@
   .badge-notification, .category-topic-link td.num .badge-notification {
     position: relative;
     top: -1px;
-    font-size: 1.071em;
+    font-size: 1em;
     padding: 4px 6px 3px 6px;
     i {color: $secondary;}
 
@@ -113,7 +113,7 @@
       max-width: 160px;
     }
     .num .fa, a, a:visited {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
   }
 
@@ -123,7 +123,7 @@
     a {
       // let's make all ages dim on mobile so we're not
       // overwhelming people with info about each topic
-      color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)) !important;
+      color: dark-light-choose($primary-low-mid, $secondary-high) !important;
     }
   }
 }
@@ -136,7 +136,7 @@
 
   td {
     padding: 12px 5px;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
+    color: dark-light-choose($primary-medium, $secondary-high);
     vertical-align: top;
   }
 
@@ -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 {
@@ -206,7 +206,7 @@ tr.category-topic-link {
     .featured-topic {
       margin: 8px 0;
       a.last-posted-at, a.last-posted-at:visited {
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+        color: dark-light-choose($primary-medium, $secondary-medium);
       }
     }
   }
@@ -260,15 +260,11 @@ tr.category-topic-link {
 
   th .badge-category {
     margin: 0;
-    font-size: 110%;
   }
 
   .category-topic-link {
     .num {
       white-space: nowrap;
-      .number {
-        font-size: 1.071em;
-      }
     }
     .topic-excerpt {
       width: 110%;
@@ -285,7 +281,7 @@ tr.category-topic-link {
     figure {
       float: left;
       margin: 3px 7px 0 0;
-      color: dark-light-choose(scale-color($primary, $lightness: 10%), scale-color($secondary, $lightness: 90%));
+      color: dark-light-choose($primary, $secondary-low);
       font-weight: bold;
       font-size: 0.857em;
     }
@@ -313,7 +309,6 @@ tr.category-topic-link {
 
 // Misc. stuff
 // --------------------------------------------------
-
 .list-controls {
   .category-dropdown-button {
     padding: 4px 10px 4px 8px;
@@ -354,7 +349,7 @@ tr.category-topic-link {
   padding: 4px 0;
   list-style: none;
   background-color: $secondary;
-  border: 1px solid dark-light-choose(rgba(0, 0, 0, 0.2), scale-color($primary, $lightness: -60%));
+  border: 1px solid dark-light-choose(rgba(0, 0, 0, 0.2), $primary);
   border-radius: 5px;
   box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
   background-clip: padding-box;
@@ -374,7 +369,7 @@ tr.category-topic-link {
 .dropdown-menu .active > a:hover {
   color: $tertiary;
   text-decoration: none;
-  background-color: scale-color($tertiary, $lightness: 75%);
+  background-color: $tertiary-low;
 }
 .open > .dropdown-menu {
   display: block;
@@ -407,7 +402,7 @@ ol.category-breadcrumb {
   .btn-default.pull-right { margin-right: 10px; }
 }
 
-.category-notification-menu, .tags-admin-menu {
+.tags-admin-menu {
   display: none;
 }
 
@@ -439,7 +434,7 @@ td .main-link {
 }
 .topic-list {
   .posts-map {
-    font-size: 1.15em;
+    font-size: 1.143em;
   }
   // so the topic excerpt is full width
   // as the containing div is 80%
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 453f863efd..49ec7ce78e 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -1,34 +1,10 @@
-.gap {
-  /* may not need this */
-}
-
-.small-action {
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-  color: lighten($primary, 50%);
-  padding-bottom: 3px;
-  text-transform: uppercase;
-  font-weight: bold;
-
-  .topic-avatar {
-    margin-top: 5px;
-  }
-
-  .small-action-desc {
-    padding-top: 1em;
-
-    button {
-      padding-top: 0px;
-    }
-  }
-}
-
 /* hide the reply border above the time gap notices */
 .time-gap + .topic-post article {
   border-top: none;
 }
 
 .topic-post article {
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border-top: 1px solid $primary-low;
   padding: 8px 0;
 }
 
@@ -36,7 +12,6 @@
   padding-bottom: 30px;
 }
 
-
 span.badge-posts {
   margin-right: 5px;
 }
@@ -45,55 +20,49 @@ span.badge-posts {
   display: none;
 }
 
-nav.post-controls {
-  clear: both;
-}
-
 .who-liked {
   margin-left: 10px;
 }
 
 .topic-post {
-  button {
-    border: none;
-    font-size: 1.214em;
-    padding: 8px 10px;
-    vertical-align: top;
-    background: transparent;
-    color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
-    float: left;
-    &.hidden {
-      display: none;
+  nav.post-controls {
+    clear: both;
+    color: dark-light-choose($primary-low-mid, $secondary-high);        
+    .d-icon {
+      opacity: 1.0;
     }
-    &.admin {
-      position: relative;
-    }
-    &.expand-post {
-      margin:10px 0 10px 0;
-    }
-    &.has-like {color: $love;}
-
-    .read-icon {
-      &:before {
-        font-family: "FontAwesome";
-        content: "\f02e";
+    button {
+      border: none;
+      font-size: 1.286em;
+      padding: 8px 10px;
+      vertical-align: top;
+      background: transparent;
+      float: left;
+      &.hidden {
+        display: none;
       }
-      &.unseen {
-        &:before {
-          content: "\f097";
-        }
+      &.admin {
+        position: relative;
+      }
+      &.expand-post {
+        margin:10px 0 10px 0;
+      }
+      &.reply {
+        float: right;
+        color: $primary-high;        
+      }
+      &.has-like {
+        color: $love;
       }
       &.bookmarked {
-        &:before {
-          color: $tertiary;
-        }
+        color: $tertiary;
       }
     }
-  }
 
-  button.like-count {
-    font-size: 1em;
-    padding: 8px 4px;
+    button.like-count {
+      font-size: 1em;
+      padding: 8px 4px;
+    }
   }
 }
 
@@ -101,7 +70,7 @@ nav.post-controls {
 /* shift post reply button to the right and make it black */
 .post-controls button.create {
   float: right;
-  color: dark-light-choose(scale-color($primary, $lightness: 20%), scale-color($secondary, $lightness: 80%));
+  color: dark-light-choose($primary-high, $secondary-low);
 }
 
 
@@ -109,7 +78,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;
@@ -131,7 +100,7 @@ nav.post-controls {
     width: 176px;
     margin-bottom: 5px;
 
-    i.fa {
+    .d-icon {
       width: 14px;
       margin-right: 14px;
     }
@@ -163,14 +132,7 @@ a.reply-to-tab {
   position: absolute;
   z-index: 400;
   right: 80px;
-  color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-  span { display: none; }
-}
-
-a.star {
-  display: inline-block;
-  float: left;
-  font-size: 1.3em;
+  color: dark-light-choose($primary-medium, $secondary-medium);
 }
 
 .topic-post .boxed .contents {
@@ -181,17 +143,17 @@ 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 {
     margin-bottom: 4px;
     margin-top: 0;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     line-height: 23px;
     font-weight: normal;
     font-size: 1em;
@@ -199,7 +161,7 @@ a.star {
 
   h4 {
     margin: 0 0 3px 0;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
     font-size: 0.857em;
     line-height: 15px;
@@ -228,7 +190,7 @@ a.star {
       padding: 4px 5px 2px 5px;
       text-align: center;
       font-weight: normal;
-      font-size: 11px;
+      font-size: .857em;
       line-height: 1;
     }
   }
@@ -256,8 +218,8 @@ a.star {
       line-height: 20px;
     }
     .number, i {
-      color: dark-light-choose(scale-color($primary, $lightness: 20%), scale-color($secondary, $lightness: 80%));
-      font-size: 110%;
+      color: dark-light-choose($primary-high, $secondary-low);
+      font-size: 1.143em;
     }
 
     .avatar + a {
@@ -279,7 +241,7 @@ a.star {
   }
 
   .domain {
-    color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+    color: dark-light-choose($primary-low-mid, $secondary-high);
   }
 
   .topic-links {
@@ -298,10 +260,10 @@ a.star {
     .btn {
       border: 0;
       padding: 0 15px;
-      color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+      color: dark-light-choose($primary-medium, $secondary-high);
       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,12 +271,18 @@ a.star {
       }
     }
   }
+
+  .link-summary .btn {
+    color: dark-light-choose($primary-medium, $secondary-high);
+    background: blend-primary-secondary(5%);
+    width: 100%;
+  }
 }
 
 #topic-footer-buttons {
   @include clearfix;
   padding: 20px 0 0 0;
-  .fa-bookmark.bookmarked { color: $tertiary; }
+  .d-icon-bookmark.bookmarked { color: $tertiary; }
 
   .combobox {
     float: left;
@@ -328,7 +296,7 @@ a.star {
 #topic-footer-buttons p {
   clear: both; /* this is to force the drop-down notification state description para below the button */
   margin: 0;
-  color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+  color: dark-light-choose($primary-medium, $secondary-medium);
 }
 
 #topic-footer-button {
@@ -344,13 +312,11 @@ a.star {
     }
 
    a.badge-category, a.badge-category-parent {
-    font-size: 0.714em;
+    font-size: 0.857em;
     vertical-align: top;
     }
 }
 
-
-
 span.post-count {
   background: $primary;
   color: $secondary;
@@ -362,7 +328,7 @@ span.post-count {
   .btn {
     margin-bottom: 5px;
     margin-right: 10px;
-    .fa-star {margin-right: 5px;}
+    .d-icon-star {margin-right: 5px;}
   }
 }
 
@@ -385,10 +351,6 @@ span.post-count {
   line-height: $base-line-height + 2; /* bump up line height to match increased font */
 }
 
-.moderator .topic-body {
-  background-color: dark-light-diff($highlight, $secondary, 70%, -80%);
-}
-
 .quote-button.visible {
   display: block;
   z-index: 936;
@@ -414,7 +376,7 @@ iframe {
     padding-top: 1px;
   }
   span {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
   span.title {
     color: $primary;
@@ -482,7 +444,7 @@ button.select-post {
 }
 
 .deleted-user-avatar {
-  font-size: 2.571em;
+  font-size: 2.286em;
 }
 
 span.btn-text {display: none;}
@@ -499,7 +461,7 @@ blockquote {
 .posts-wrapper {  position: relative; }
 
 span.highlighted {
-  background-color: dark-light-choose(scale-color($highlight, $lightness: 70%), $highlight);
+  background-color: dark-light-choose($highlight-low, $highlight);
 }
 
 .topic-avatar {
@@ -513,9 +475,6 @@ span.highlighted {
   .names {
     margin: 5px 0 0 5px;
     line-height: 17px;
-    span.full-name, span.user-title, span.username {
-      display: block;
-    }
 
     .poster-icon {
       float: right;
@@ -523,14 +482,13 @@ span.highlighted {
   }
   .post-info {
     float: right;
-    font-size: 0.929em;
     margin: 4px 10px 0 0;
     .edits { margin-right: 5px; }
   }
 }
 
 .username.new-user a {
-  color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
+  color: dark-light-choose($primary-low-mid, $secondary-high);
 }
 
 .user-title {
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 2354605a9b..d5f302d179 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -17,8 +17,8 @@
   //margin-bottom: 20px;
   margin: 0 60px 10px 0;
   h1 {
-    font-size: 1.5em;
-    line-height: 1.25em;
+    font-size: 1.429em;
+    line-height: 1.25;
     a {
       color: $primary;
       vertical-align: middle;
@@ -31,7 +31,7 @@
   .private-message-glyph { display: none; }
 }
 
-.private-message-glyph { color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%)); }
+.private-message-glyph { color: dark-light-choose($primary-low-mid, $secondary-high); }
 .private_message #topic-title .private-message-glyph { display: inline; }
 
 
@@ -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;
@@ -133,7 +133,7 @@
     font-size: 1.286em;
     line-height: 15px;
   }
-  i.fa {
+  .d-icon {
     position: absolute;
     right: 8px;
     bottom: 9px;
@@ -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;
   }
 }
@@ -155,8 +155,8 @@
   width: 90%;
   margin-left: auto;
   margin-right: auto;
-  font-size: 1.714em;
-  line-height: 1.1em;
+  font-size: 1.857em;
+  line-height: 1.25;
 
   .topic-retry {
     display: block;
@@ -172,36 +172,49 @@
 
 .topic-post:last-of-type {padding-bottom: 40px;}
 
-.heatmap-high {color: scale-color($danger, $lightness: -25%) !important;}
-.heatmap-med {color: $danger !important;}
-.heatmap-low {color: scale-color($danger, $lightness: 25%) !important;}
+.heatmap-high {color: $danger !important;}
+.heatmap-med {color: $danger-medium !important;}
+.heatmap-low {color: $danger-low !important;}
 
 sup sup, sub sup, sup sub, sub sub { top: 0; }
 
 // inline editing of title on mobile
-.title-wrapper {
+#topic-title .title-wrapper {
+  position: relative;
+  float: none;
+  width: 100%;
+
   input#edit-title {
-    width: 95%;
-    padding: 5px;
+    box-sizing: border-box;
+    width: 100%;
+    height: 32px;
+  }
+
+  .select2-container {
+    box-sizing: border-box;
+    width: 100% !important;
   }
   .btn-small {
     padding: 8px 12px;
     margin: 6px 6px 0 0;
   }
-  .select2-container {
-    margin-top: 8px;
-    width: 95% !important;
+
+  .select-box-kit.combo-box.category-chooser {
+    width: 100%;
+    margin-top: 0;
   }
 }
 
 // make mobile timeline top and bottom dates easier to select
 .topic-timeline {
-  .start-date { font-size: 110%; padding: 5px; }
-  .now-date { font-size: 110%; padding: 5px; }
+  .start-date, .now-date { 
+    font-size: 1.143em; 
+    padding: 5px; 
+  }
 }
 
 .edit-topic-timer-modal {
-  .auto-update-input {
+  .future-date-input {
     .alert-info {
       margin: 0 -10px -10px -10px;
       padding: 10px;
diff --git a/app/assets/stylesheets/mobile/upload.scss b/app/assets/stylesheets/mobile/upload.scss
index 00797993b0..b9fb058267 100644
--- a/app/assets/stylesheets/mobile/upload.scss
+++ b/app/assets/stylesheets/mobile/upload.scss
@@ -7,7 +7,7 @@
     line-height: 18px;
   }
   .description {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 }
 
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index 7136d89613..390d5ce468 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -1,149 +1,11 @@
-// styles that apply to the user page
-
-.user-preferences {
-  .control-group {
-    padding: 8px 36px 8px 8px;
-  }
-  textarea {
-    width: 530px;
-    height: 100px;
-  }
-  .static {
-    color: $primary;
-    margin-top: 5px;
-    margin-left: 5px;
-    display: inline-block;
-  }
-  .instructions {
-    color: $primary;
-    margin-top: 5px;
-  }
-  .category-controls {
-    padding-top: 8px;
-  }
-  .avatar {
-    margin-left: 3px;
-  }
-  .instructions a[href] {
-    color: $primary;
-  }
-  .warning {
-    @include border-radius-all(6px);
-    background-color: $danger;
-    padding: 5px 8px;
-    color: $primary;
-    width: 520px;
-  }
-
-  .controls-dropdown {
-    margin-top: 10px;
-    margin-bottom: 15px;
-    padding-left: 5px;
-    select {
-      width: 280px;
+// Mobile styles for "/user" section
+.user-right {
+  &,
+  > .user-stream {
+    > .alert:first-child {
+      margin-top: 20px;
     }
   }
-
-  .save-button {
-    width: 100%;
-    overflow: auto;
-    max-width: 200px;
-    button {
-      display: block;
-    }
-  }
-
-  .delete-account {
-    overflow: hidden;
-  }
-
-  .checkbox-label {
-    overflow: auto;
-    display: block;
-    width: 100%;
-    padding: 5px 8px;
-  }
-
-  textarea {width: 100%;}
-
-  .desktop-notifications button {
-    float: none;
-  }
-  .apps .controls button {
-    float: right;
-  }
-  .category-notifications .category-controls, .tag-notifications .tag-controls {
-    margin-top: 24px;
-  }
-}
-
-.profile-image {
-  height: 25px;
-  width: 100%;
-}
-
-
-.groups {
-  .group-link {
-    color: $tertiary;
-  }
-}
-
-.hasBackground .details {margin-top: 200px;
-}
-
-.user-preferences {
-  input.category-selector {
-  }
-
-  textarea {
-    height: 100px;
-  }
-
-  input[type=text] {
-    @include small-width {
-    }
-  }
-
-  .static {
-    color: $primary;
-    display: inline-block;
-  }
-  .instructions {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-    margin-top: 5px;
-    margin-bottom: 10px;
-    font-size: 80%;
-    line-height: 1.4em;
-  }
-  .avatar {
-    margin-left: 3px;
-  }
-  .instructions a[href] {
-    color: $tertiary;
-  }
-  .warning {
-    background-color: scale-color($danger, $lightness: 30%);
-    padding: 5px 8px;
-    color: $secondary;
-  }
-
-}
-
-.form-horizontal .control-group.category {
-  margin-top: 18px;
-}
-
-.user-navigation {
-  width: 100%;
-  margin-top: 20px;
-  min-height: 20px;
-
-  h3 {
-    color: $primary;
-    margin: 10px;
-  }
-
 }
 
 .user-main {
@@ -159,11 +21,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;
       }
@@ -186,124 +48,75 @@
       float: right
     }
 
-    h2 {
-      margin-bottom: 10px;
-    }
-
     table {
       width: 100%;
       margin-top: 10px;
 
       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;
       }
     }
   }
 
   .about {
     background: dark-light-diff($primary, $secondary, 0%, -75%) center;
-    width: 100%;
     margin-bottom: 10px;
-    overflow: hidden;
     color: $secondary;
 
+    &.no-background {
+      .profile-image {
+        display: none;
+      }
+    }
+
     .secondary {
-      background: dark-light-diff($primary, $secondary, 90%, -65%);
-      font-size: 0.929em;
-
-      .btn { padding: 3px 12px; }
-
-      dl dd {
-        margin: 0 15px 0 5px;
-        padding: 0;
-      }
-
-      dl dt {
-        display: inline-block;
-      }
+      background: $primary-low;
 
       dl {
-        padding: 10px 15px;
-        margin: 0;
+        display: flex;
+        flex-wrap: wrap;
+        align-items: center;
+        padding: 10px;
+
       }
 
       dd {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        color: $primary;
-      }
-
-      dt {
-        color: dark-light-diff($secondary, $primary, 50%, -40%);
-        margin: 0;
+        margin: 0 15px 0 5px;
       }
     }
 
     .details {
-      padding: 15px 10px 4px 10px;
-      background: rgba($secondary, .85);
-
-      blockquote {
-        background-color: dark-light-diff($secondary, $primary, 30%, -70%);
-        border-left-color: dark-light-diff($secondary, $primary, 50%, -50%);
-      }
+      padding: 15px 5px 5px 5px;
 
       h1 {
-        font-size: 2.143em;
-        font-weight: normal;
-        margin: 10px 0 0 0;
+        margin: 0;
+        line-height: 1;
       }
 
       h2 {
-        font-size: 1.214em;
-        font-weight: normal;
-        margin-top: 10px;
-        max-width: 100%;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-
-      h3 {
-        font-weight: normal;
-        font-size: 1em;
-        margin: 5px 0;
-        i:not(:first-of-type) {
-          margin-left: 10px;
-        }
-      }
-
-      .groups {
-        margin-left: 10px;
-        display: inline;
-        }
-
-      img.avatar {
-        float: left;
-      }
-
-      .suspended {
-        color: $danger;
+        line-height: normal;
       }
 
       .primary {
-        width: 100%;
-        position: relative;
-        float: left;
+        display: flex;
+        flex-wrap: wrap;
         color: $primary;
 
-        h1 {font-weight: bold;}
+        .avatar {
+          margin: 0 5px 10px 5px;
+        }
 
         .primary-textual {
-          float: left;
-          padding-left: 15px;
+          flex: 1 1 40%;
+          padding-left: 5px;
+          word-break: break-word;
           a[href] {
             color: $primary;
           }
@@ -311,244 +124,60 @@
 
         .bio {
           color: $primary;
-          max-height: 300px;
-          overflow: auto;
           max-width: 700px;
-
-          a[href] {
-            text-decoration: underline;
-          }
-
-          img {
-            max-width: 100%;
-          }
         }
       }
     }
 
     .controls {
-      float: left;
-      padding-left: 15px;
+      order: 3;
+      flex: 1 1 25%;
+      margin-left: auto;
+
       ul {
-        list-style-type: none;
         margin: 0;
-      }
-      a {
-        padding: 5px 10px;
-        width: 120px;
-        margin-bottom: 10px;
-      }
-    }
-  }
-
-  .about.collapsed-info {
-    .controls {
-      margin-top: 0;
-
-    }
-
-    .staff-counters {
-      display: none;
-    }
-    .secondary { display: none; }
-
-    .profile-image {
-      height: 0;
-    }
-
-    .details {
-      padding: 12px 15px 2px 15px;
-      margin-top: 0;
-      background: rgba($secondary, .85);
-      .bio { display: none; }
-
-      .primary {
-        text-align: left;
-        margin-top: 0;
-        width: 100%;
-
-        .avatar {
-          float: left;
-          margin-right: 10px;
-          width: 45px;
-          height: 45px;
-        }
-
-        h1 {
-          font-size: 1.429em;
-        }
-
-        h2 {
-          font-size: 1.071em;
-          margin-top: 4px;
-        }
-
-        h3 {
-          display: none;
-        }
-      }
-    }
-  }
-
-
-  .user-stream {
-    .excerpt {
-      margin: 5px 0;
-      font-size: 0.929em;
-      word-wrap: break-word;
-      color: $primary;
-    }
-    .item.moderator-action {
-      background-color: dark-light-diff($highlight, $secondary, 50%, -10%);
-    }
-    .item.deleted {
-      opacity: 0.8;
-      background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -10%);
-    }
-    .item.hidden {
-      display: block;
-      opacity: 0.4;
-    }
-    .item {
-      padding: 20px 0 15px 0;
-      background-color: $secondary;
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-    }
-    .type {
-      color: $primary;
-    }
-    span.name {
-      color: $primary;
-    }
-    .time, .delete-info {
-      display: block;
-      float: right;
-      color: lighten($primary, 40%);
-      font-size: 11px;
-    }
-    .delete-info i {
-      font-size: 1em;
-    }
-    .avatar-link {
-      float: left;
-      margin-right: 4px;
-    }
-    .title {
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      display: block;
-    }
-    .name {
-      font-size: 1em;
-      max-width: 400px;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      vertical-align: middle;
-    }
-    .edit-reason {
-      background-color: scale-color($highlight, $lightness: 25%);
-      padding: 3px 5px 5px 5px;
-    }
-    .remove-bookmark {
-      float: right;
-      margin-top: -4px;
-    }
-    .notification {
-      &.unread {
-        background-color: dark-light-choose(scale-color($tertiary, $lightness: 85%), srgb-scale($tertiary, $secondary, 15%));
+        display: flex;
+        flex: 1 1 auto;
+        flex-wrap: wrap;
+        
       }
 
-      li { display: inline-block; }
-      p {
-        display: inline-block;
-        margin-left: 10px;
-        span {
-          color: $primary;
-        }
+      li {
+        display: flex;
+        flex: 1 1 auto; 
+        margin: 0 5px;       
       }
-      .time {
-        display: inline-block;
-        margin-left: 10px;
-        float: none;
-      }
-      // common/base/header.scss
-      .fa, .icon {
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-        font-size: 1.714em;
-      }
-    }
-    .group-member-info {
-      .name {
-        display: inline-block;
-        margin-top: 5px;
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-        vertical-align: inherit;
-      }
-      .title {
-        display: inline-block;
-        margin-top: 5px;
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-      }
-    }
-    .topic-statuses {
-      float: left;
-    }
-  }
 
-  .staff-counters {
-    text-align: left;
-    background: $primary;
-    padding: 7px 0;
-    display: inline;
-    > div {
-      margin: 0 10px 0 0;
-      display: inline-block;
-      padding: 5px 0;
-      &:first-of-type {
-        padding-left: 10px;
-        }
       span {
-        padding: 1px 5px;
-        border-radius: 10px;
+        flex: 0 1 100%;
+        margin: 0 5px;               
+      }
+      
+      .user-profile-controls-outlet {
+        margin: 0;
+        li {
+          margin: 0;
         }
+      }
 
+      a {
+        flex: 1 1 auto;        
+        min-width: 120px;
+      }
     }
-    a {
-      color: $secondary;
-    }
-    .active {
-      font-weight: bold;
-    }
-  }
-  .pill {
-    border-radius: 15px;
-    display: inline-block;
-    height: 30px;
-    width: 30px;
-    text-align: center;
-    vertical-align: middle;
-    line-height: 30px;
-  }
-  .helpful-flags {
-    background-color: green;
-  }
-  .flagged-posts {
-    background-color: #E49735;
-  }
-  .warnings-received {
-    background-color: #EC441B;
-  }
-  .deleted-posts {
-    background-color: #EC441B;
-  }
-  .suspensions {
-    background-color: #c22020;
-  }
 
-  .user-field.text {
-    padding-top: 18px;
+    &.collapsed-info {
+      .details {
+        .primary {
+          .primary-textual {
+            margin: 0 10px 5px 0;
+          }
+          .avatar {
+            margin: 0 5px 10px 5px;
+          }
+        }
+      }
+    }
   }
 
   .user-field {
@@ -557,65 +186,102 @@
       text-align: left;
       font-weight: bold;
     }
-    .controls {
-      label {
-        width: auto;
-        text-align: left;
-        font-weight: normal;
-        float: auto;
-      }
-      .instructions {
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-        margin-top: 5px;
-        margin-bottom: 10px;
-        font-size: 80%;
-        line-height: 1.4em;
-      }
-    }
-    clear: both;
-    margin-bottom: 10px;
   }
 }
 
+.profile-image {
+  height: 25px;
+  width: 100%;
+}
+
+.has-background .details {
+  margin-top: 200px;
+}
+
+.form-horizontal .control-group.category {
+  margin-top: 18px;
+}
+
 .paginated-topics-list {
   margin-top: 20px;
+}
 
-  .user-content {
-    width: 100%;
-    margin-top: 0;
+.stats-section {
+  li {    
+    margin: 0 15px 10px 0;
+    padding: 0;
+    &.linked-stat {
+      a {
+        padding: 0;
+      }
+    }
   }
 }
 
-.user-archive {
-  display: inline-block;
-}
-
 // mobile fixups for badges
-
 .badge-card.medium {
-  width: 300px;
-}
-
-.show-badge-details {
-  margin-bottom: 1em;
+  width: 100%;
 }
 
 .user-badges {
   margin-bottom: 2em;
 }
 
-.show-badge-details .badge-grant-info {
-  display: none;
+.show-badge-details {
+  margin-bottom: 1em;
+
+  .badge-grant-info {
+    display: none;
+  }
 }
 
-.user-info.medium {
-  width: 300px;
-}
+.user-preferences {
 
-.user-info.medium .user-detail {
-  width: 240px;
-}
+  .instructions {
+    margin-top: 5px;
+  }
 
-.user-info.medium .user-image {
-  width: auto;
+  .category-controls {
+    padding-top: 8px;
+  }
+
+  .controls-dropdown {
+    margin-top: 10px;
+    margin-bottom: 15px;
+
+    select {
+      width: 280px;
+    }
+  }
+
+  .save-button {
+    width: 100%;
+    overflow: auto;
+    max-width: 200px;
+
+    button {
+      display: block;
+    }
+  }
+
+  .delete-account {
+    overflow: hidden;
+  }
+
+  .checkbox-label {
+    display: flex;
+    overflow: auto;    
+    width: 100%;
+    padding: 5px 0;
+    input {
+      margin-right: 5px;
+    }
+  }
+
+  .desktop-notifications button {
+    float: none;
+  }
+  .apps .controls button {
+    float: right;
+  }
 }
diff --git a/app/assets/stylesheets/vendor/normalize.scss b/app/assets/stylesheets/vendor/normalize.scss
index af487ed139..22ed7c3794 100644
--- a/app/assets/stylesheets/vendor/normalize.scss
+++ b/app/assets/stylesheets/vendor/normalize.scss
@@ -101,11 +101,12 @@ a:hover {
    ========================================================================== */
 
 /**
- * Address styling not present in IE 8/9/10/11, Safari, and Chrome.
+ * Address styling not present in IE 8/9/10/11 & Edge
  */
 
-abbr[title] {
-  border-bottom: 1px dotted;
+ abbr[title], acronym[title] {
+  text-decoration: underline;
+  text-decoration-style: dotted; 
 }
 
 /**
diff --git a/app/assets/stylesheets/vendor/pikaday.scss b/app/assets/stylesheets/vendor/pikaday.scss
index 8465631879..7880b8bc65 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/assets/stylesheets/vendor/select2.scss b/app/assets/stylesheets/vendor/select2.scss
index 045b262fd5..2e2e4a5a07 100644
--- a/app/assets/stylesheets/vendor/select2.scss
+++ b/app/assets/stylesheets/vendor/select2.scss
@@ -129,7 +129,6 @@ Version: @@ver@@ Timestamp: @@timestamp@@
     border: 1px solid #aaa;
     border-top: 0;
 
-    border-radius: 0 0 4px 4px;
 
     -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
             box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
@@ -140,7 +139,6 @@ Version: @@ver@@ Timestamp: @@timestamp@@
     border-top: 1px solid #aaa;
     border-bottom: 0;
 
-    border-radius: 4px 4px 0 0;
 
     -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
             box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
@@ -408,12 +406,8 @@ disabled look for disabled choices in the results dropdown
     margin: 0;
     padding: 0 5px 0 0;
     position: relative;
-
-    border: 1px solid #aaa;
     cursor: text;
     overflow: hidden;
-
-    background-color: #fff;
 }
 
 .select2-locked {
@@ -446,11 +440,11 @@ html[dir="rtl"] .select2-container-multi .select2-choices li
 }
 
 .select2-container-multi .select2-choices .select2-search-field input {
-    padding: 5px;
+    padding: 5px 10px;
     margin: 1px 0;
 
     font-family: sans-serif;
-    font-size: 100%;
+    font-size: 1em;
     color: #666;
     outline: 0;
     border: 0;
diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss
index 245478866a..656b5006a9 100644
--- a/app/assets/stylesheets/wizard.scss
+++ b/app/assets/stylesheets/wizard.scss
@@ -2,6 +2,9 @@
 @import "vendor/font_awesome/font-awesome";
 @import "vendor/select2";
 @import "vendor/sweetalert";
+@import "common/foundation/colors";
+@import "common/foundation/variables";
+@import "common/select-kit/*";
 
 body.wizard {
   background-color: #fff;
@@ -168,7 +171,7 @@ body.wizard {
 
     span {
       position: absolute;
-      font-size: 15px;
+      font-size: 1.071em;
       mix-blend-mode: difference;
       color: white;
       z-index: 13;
@@ -224,11 +227,11 @@ body.wizard {
       background-color: #ccc;
     }
 
-    i.fa-chevron-right {
+    .d-icon-chevron-right {
       margin-left: 0.25em;
       font-size: 0.8em;
     }
-    i.fa-chevron-left {
+    .d-icon-chevron-left {
       margin-right: 0.25em;
       font-size: 0.8em;
     }
@@ -287,7 +290,7 @@ body.wizard {
     .wizard-btn.next {
       min-width: 70px;
 
-      i.fa-chevron-right {
+      .d-icon-chevron-right {
         margin-left: 0.25em;
         font-size: 0.8em;
       }
@@ -398,7 +401,6 @@ body.wizard {
     textarea {
       padding: 3px;
       border: 4px solid red;
-      border-radius: 3px;
     }
   }
 }
@@ -416,7 +418,6 @@ body.wizard {
     input {
       padding: 3px;
       border: 4px solid red;
-      border-radius: 3px;
     }
   }
 }
@@ -479,18 +480,18 @@ body.wizard {
 }
 
 /* fix wizard for mobile -- iPhone 5 default width */
-@media only screen and (max-device-width: 568px) {  
+@media only screen and (max-device-width: 568px) {
   h1 { font-size: 1.3em !important; }
   .wizard-column { margin: auto !important; }
   .wizard-step-contents { min-height: auto !important; }
   .wizard-step-banner { width: 100% !important; margin-bottom: 1em !important; }
   .select2-container { width: 100% !important; }
   .wizard-step-footer { display: block !important; }
-  .wizard-progress { margin-bottom: 10px !important; }  
+  .wizard-progress { margin-bottom: 10px !important; }
   .wizard-buttons { text-align: right !important; }
   .wizard-footer { display: none !important; }
   .wizard-field { margin-bottom: 1em !important; }
-  .wizard-step-description { margin-bottom: 1em !important; }  
+  .wizard-step-description { margin-bottom: 1em !important; }
   .wizard-column-contents { padding: 1em !important; }
   .emoji-preview img { width: 16px !important; height: 16px !important; }
   .invite-list .new-user { flex-direction: column !important; align-items: inherit !important; }
diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index 40608cc50d..0ca88b6945 100644
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -1,8 +1,8 @@
 require_dependency 'rate_limiter'
 
 class AboutController < ApplicationController
-  skip_before_filter :check_xhr, only: [:index]
-  before_filter :ensure_logged_in, only: [:live_post_counts]
+  skip_before_action :check_xhr, only: [:index]
+  before_action :ensure_logged_in, only: [:live_post_counts]
 
   def index
     return redirect_to path('/login') if SiteSetting.login_required? && current_user.nil?
diff --git a/app/controllers/admin/admin_controller.rb b/app/controllers/admin/admin_controller.rb
index 30785689e1..1b786ac0de 100644
--- a/app/controllers/admin/admin_controller.rb
+++ b/app/controllers/admin/admin_controller.rb
@@ -1,10 +1,10 @@
 class Admin::AdminController < ApplicationController
 
-  before_filter :ensure_logged_in
-  before_filter :ensure_staff
+  before_action :ensure_logged_in
+  before_action :ensure_staff
 
   def index
-    render nothing: true
+    render body: nil
   end
 
 end
diff --git a/app/controllers/admin/api_controller.rb b/app/controllers/admin/api_controller.rb
index 9fd25eecfb..0c39edc98b 100644
--- a/app/controllers/admin/api_controller.rb
+++ b/app/controllers/admin/api_controller.rb
@@ -17,7 +17,7 @@ class Admin::ApiController < Admin::AdminController
     raise Discourse::NotFound if api_key.blank?
 
     api_key.destroy
-    render nothing: true
+    render body: nil
   end
 
   def create_master_key
diff --git a/app/controllers/admin/backups_controller.rb b/app/controllers/admin/backups_controller.rb
index 199f3c4f0a..52b8403cdd 100644
--- a/app/controllers/admin/backups_controller.rb
+++ b/app/controllers/admin/backups_controller.rb
@@ -2,7 +2,8 @@ require "backup_restore/backup_restore"
 
 class Admin::BackupsController < Admin::AdminController
 
-  skip_before_filter :check_xhr, only: [:index, :show, :logs, :check_backup_chunk, :upload_backup_chunk]
+  before_action :ensure_backups_enabled
+  skip_before_action :check_xhr, only: [:index, :show, :logs, :check_backup_chunk, :upload_backup_chunk]
 
   def index
     respond_to do |format|
@@ -53,7 +54,7 @@ class Admin::BackupsController < Admin::AdminController
 
       render body: nil
     else
-      render nothing: true, status: 404
+      render body: nil, status: 404
     end
   end
 
@@ -71,7 +72,7 @@ class Admin::BackupsController < Admin::AdminController
       if @error
         render layout: 'no_ember', status: 422
       else
-        render nothing: true, status: 404
+        render body: nil, status: 404
       end
     end
   end
@@ -80,9 +81,9 @@ class Admin::BackupsController < Admin::AdminController
     if backup = Backup[params.fetch(:id)]
       StaffActionLogger.new(current_user).log_backup_destroy(backup)
       backup.remove
-      render nothing: true
+      render body: nil
     else
-      render nothing: true, status: 404
+      render body: nil, status: 404
     end
   end
 
@@ -126,7 +127,7 @@ class Admin::BackupsController < Admin::AdminController
 
     StaffActionLogger.new(current_user).log_change_readonly_mode(enable)
 
-    render nothing: true
+    render body: nil
   end
 
   def check_backup_chunk
@@ -140,16 +141,16 @@ class Admin::BackupsController < Admin::AdminController
     # check chunk upload status
     status = HandleChunkUpload.check_chunk(chunk, current_chunk_size: current_chunk_size)
 
-    render nothing: true, status: status
+    render body: nil, status: status
   end
 
   def upload_backup_chunk
     filename   = params.fetch(:resumableFilename)
     total_size = params.fetch(:resumableTotalSize).to_i
 
-    return render status: 415, text: I18n.t("backup.backup_file_should_be_tar_gz") unless /\.(tar\.gz|t?gz)$/i =~ filename
-    return render status: 415, text: I18n.t("backup.not_enough_space_on_disk")     unless has_enough_space_on_disk?(total_size)
-    return render status: 415, text: I18n.t("backup.invalid_filename") unless !!(/^[a-zA-Z0-9\._\-]+$/ =~ filename)
+    return render status: 415, plain: I18n.t("backup.backup_file_should_be_tar_gz") unless /\.(tar\.gz|t?gz)$/i =~ filename
+    return render status: 415, plain: I18n.t("backup.not_enough_space_on_disk")     unless has_enough_space_on_disk?(total_size)
+    return render status: 415, plain: I18n.t("backup.invalid_filename") unless !!(/^[a-zA-Z0-9\._\-]+$/ =~ filename)
 
     file               = params.fetch(:file)
     identifier         = params.fetch(:resumableIdentifier)
@@ -169,7 +170,7 @@ class Admin::BackupsController < Admin::AdminController
       Jobs.enqueue_in(5.seconds, :backup_chunks_merger, filename: filename, identifier: identifier, chunks: chunk_number)
     end
 
-    render nothing: true
+    render body: nil
   end
 
   private
@@ -178,4 +179,8 @@ class Admin::BackupsController < Admin::AdminController
     `df -Pk #{Rails.root}/public/backups | awk 'NR==2 {print $4 * 1024;}'`.to_i > size
   end
 
+  def ensure_backups_enabled
+    raise Discourse::InvalidAccess.new unless SiteSetting.enable_backups?
+  end
+
 end
diff --git a/app/controllers/admin/badges_controller.rb b/app/controllers/admin/badges_controller.rb
index e33a476586..e84a7dc65f 100644
--- a/app/controllers/admin/badges_controller.rb
+++ b/app/controllers/admin/badges_controller.rb
@@ -5,9 +5,9 @@ class Admin::BadgesController < Admin::AdminController
       badge_types: BadgeType.all.order(:id).to_a,
       badge_groupings: BadgeGrouping.all.order(:position).to_a,
       badges: Badge.includes(:badge_grouping)
-                    .includes(:badge_type)
-                    .references(:badge_grouping)
-                    .order('badge_groupings.position, badge_type_id, badges.name').to_a,
+        .includes(:badge_type)
+        .references(:badge_grouping)
+        .order('badge_groupings.position, badge_type_id, badges.name').to_a,
       protected_system_fields: Badge.protected_system_fields,
       triggers: Badge.trigger_hash
     }
@@ -43,9 +43,9 @@ class Admin::BadgesController < Admin::AdminController
     badge_groupings = BadgeGrouping.all.order(:position).to_a
     ids = params[:ids].map(&:to_i)
 
-    params[:names].each_with_index do |name,index|
+    params[:names].each_with_index do |name, index|
       id = ids[index].to_i
-      group = badge_groupings.find{|b| b.id == id} || BadgeGrouping.new()
+      group = badge_groupings.find { |b| b.id == id } || BadgeGrouping.new()
       group.name = name
       group.position = index
       group.save
@@ -84,7 +84,7 @@ class Admin::BadgesController < Admin::AdminController
 
   def destroy
     find_badge.destroy
-    render nothing: true
+    render body: nil
   end
 
   private
@@ -95,7 +95,7 @@ class Admin::BadgesController < Admin::AdminController
 
     # Options:
     #   :new - reset the badge id to nil before saving
-    def update_badge_from_params(badge, opts={})
+    def update_badge_from_params(badge, opts = {})
       errors = []
       Badge.transaction do
         allowed  = Badge.column_names.map(&:to_sym)
@@ -112,7 +112,7 @@ class Admin::BadgesController < Admin::AdminController
         # Badge query contract checks
         begin
           if SiteSetting.enable_badge_sql
-            BadgeGranter.contract_checks!(badge.query, { target_posts: badge.target_posts, trigger: badge.trigger })
+            BadgeGranter.contract_checks!(badge.query, target_posts: badge.target_posts, trigger: badge.trigger)
           end
         rescue => e
           errors << e.message
diff --git a/app/controllers/admin/color_schemes_controller.rb b/app/controllers/admin/color_schemes_controller.rb
index dda6c9f07c..a5caf3de62 100644
--- a/app/controllers/admin/color_schemes_controller.rb
+++ b/app/controllers/admin/color_schemes_controller.rb
@@ -1,6 +1,6 @@
 class Admin::ColorSchemesController < Admin::AdminController
 
-  before_filter :fetch_color_scheme, only: [:update, :destroy]
+  before_action :fetch_color_scheme, only: [:update, :destroy]
 
   def index
     render_serialized(ColorScheme.base_color_schemes + ColorScheme.order('id ASC').all.to_a, ColorSchemeSerializer)
@@ -29,7 +29,6 @@ class Admin::ColorSchemesController < Admin::AdminController
     render json: success_json
   end
 
-
   private
 
   def fetch_color_scheme
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index d7250ca826..ed021d9158 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -2,13 +2,13 @@ require 'disk_space'
 class Admin::DashboardController < Admin::AdminController
   def index
     dashboard_data = AdminDashboardData.fetch_cached_stats || Jobs::DashboardStats.new.execute({})
-    dashboard_data.merge!({version_check: DiscourseUpdates.check_version.as_json}) if SiteSetting.version_checks?
+    dashboard_data.merge!(version_check: DiscourseUpdates.check_version.as_json) if SiteSetting.version_checks?
 
     dashboard_data[:disk_space] = DiskSpace.cached_stats
     render json: dashboard_data
   end
 
   def problems
-    render_json_dump({problems: AdminDashboardData.fetch_problems})
+    render_json_dump(problems: AdminDashboardData.fetch_problems)
   end
 end
diff --git a/app/controllers/admin/diagnostics_controller.rb b/app/controllers/admin/diagnostics_controller.rb
index ba889837a3..d10c559b4c 100644
--- a/app/controllers/admin/diagnostics_controller.rb
+++ b/app/controllers/admin/diagnostics_controller.rb
@@ -2,7 +2,7 @@ require_dependency 'memory_diagnostics'
 
 class Admin::DiagnosticsController < Admin::AdminController
   layout false
-  skip_before_filter :check_xhr
+  skip_before_action :check_xhr
 
   def dump_statement_cache
     statements = Post.exec_sql("select * from pg_prepared_statements").to_a
@@ -42,8 +42,8 @@ class Admin::DiagnosticsController < Admin::AdminController
       GC.start(full_mark: true)
       require 'objspace'
 
-      io = File.open("discourse-heap-#{SecureRandom.hex(3)}.json",'w')
-      ObjectSpace.dump_all(:output => io)
+      io = File.open("discourse-heap-#{SecureRandom.hex(3)}.json", 'w')
+      ObjectSpace.dump_all(output: io)
       io.close
 
       render plain: "HEAP DUMP:\n#{io.path}"
diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb
index 455a22151e..e4e59c19f9 100644
--- a/app/controllers/admin/email_controller.rb
+++ b/app/controllers/admin/email_controller.rb
@@ -11,9 +11,9 @@ class Admin::EmailController < Admin::AdminController
     params.require(:email_address)
     begin
       Jobs::TestEmail.new.execute(to_address: params[:email_address])
-      render nothing: true
+      render body: nil
     rescue => e
-      render json: {errors: [e.message]}, status: 422
+      render json: { errors: [e.message] }, status: 422
     end
   end
 
@@ -55,17 +55,17 @@ class Admin::EmailController < Admin::AdminController
     params.require(:username)
     params.require(:email)
     user = User.find_by_username(params[:username])
-    message, skip_reason = UserNotifications.send(:digest, user, {since: params[:last_seen_at]})
+    message, skip_reason = UserNotifications.send(:digest, user, since: params[:last_seen_at])
     if message
       message.to = params[:email]
       begin
         Email::Sender.new(message, :digest).send
         render json: success_json
       rescue => e
-        render json: {errors: [e.message]}, status: 422
+        render json: { errors: [e.message] }, status: 422
       end
     else
-      render json: {errors: skip_reason}
+      render json: { errors: skip_reason }
     end
   end
 
@@ -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?" }
@@ -131,18 +131,18 @@ class Admin::EmailController < Admin::AdminController
       serializer = IncomingEmailDetailsSerializer.new(incoming_email, root: false)
       render_json_dump(serializer)
     rescue => e
-      render json: {errors: [e.message]}, status: 404
+      render json: { errors: [e.message] }, status: 404
     end
   end
 
   private
 
   def filter_email_logs(email_logs, params)
-    email_logs = email_logs.includes(:user, { post: :topic })
-                           .references(:user)
-                           .order(created_at: :desc)
-                           .offset(params[:offset] || 0)
-                           .limit(50)
+    email_logs = email_logs.includes(:user, post: :topic)
+      .references(:user)
+      .order(created_at: :desc)
+      .offset(params[:offset] || 0)
+      .limit(50)
 
     email_logs = email_logs.where("users.username ILIKE ?", "%#{params[:user]}%") if params[:user].present?
     email_logs = email_logs.where("email_logs.to_address ILIKE ?", "%#{params[:address]}%") if params[:address].present?
@@ -154,10 +154,10 @@ class Admin::EmailController < Admin::AdminController
   end
 
   def filter_incoming_emails(incoming_emails, params)
-    incoming_emails = incoming_emails.includes(:user, { post: :topic })
-                                     .order(created_at: :desc)
-                                     .offset(params[:offset] || 0)
-                                     .limit(50)
+    incoming_emails = incoming_emails.includes(:user, post: :topic)
+      .order(created_at: :desc)
+      .offset(params[:offset] || 0)
+      .limit(50)
 
     incoming_emails = incoming_emails.where("from_address ILIKE ?", "%#{params[:from]}%") if params[:from].present?
     incoming_emails = incoming_emails.where("to_addresses ILIKE :to OR cc_addresses ILIKE :to", to: "%#{params[:to]}%") if params[:to].present?
@@ -170,7 +170,7 @@ class Admin::EmailController < Admin::AdminController
   def delivery_settings
     action_mailer_settings
       .reject { |k, _| k == :password }
-      .map    { |k, v| { name: k, value: v }}
+      .map    { |k, v| { name: k, value: v } }
   end
 
   def delivery_method
diff --git a/app/controllers/admin/email_templates_controller.rb b/app/controllers/admin/email_templates_controller.rb
index d3d1e96328..3d83a71cd7 100644
--- a/app/controllers/admin/email_templates_controller.rb
+++ b/app/controllers/admin/email_templates_controller.rb
@@ -5,7 +5,7 @@ class Admin::EmailTemplatesController < Admin::AdminController
                      "custom_invite_mailer", "custom_invite_forum_mailer",
                      "new_version_mailer", "new_version_mailer_with_notes", "queued_posts_reminder",
                      "system_messages.backup_failed", "system_messages.backup_succeeded",
-                     "system_messages.blocked_by_staff", "system_messages.bulk_invite_failed",
+                     "system_messages.silenced_by_staff", "system_messages.bulk_invite_failed",
                      "system_messages.bulk_invite_succeeded", "system_messages.csv_export_failed",
                      "system_messages.csv_export_succeeded", "system_messages.download_remote_images_disabled",
                      "system_messages.email_error_notification", "system_messages.email_reject_auto_generated",
@@ -15,10 +15,11 @@ 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",
-                     "system_messages.unblocked", "system_messages.user_automatically_blocked",
+                     "system_messages.unsilenced", "system_messages.user_automatically_silenced",
                      "system_messages.welcome_invite", "system_messages.welcome_user", "test_mailer",
                      "user_notifications.account_created", "user_notifications.admin_login",
                      "user_notifications.confirm_new_email", "user_notifications.confirm_old_email",
@@ -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",
@@ -40,16 +42,35 @@ class Admin::EmailTemplatesController < Admin::AdminController
     key = params[:id]
     raise Discourse::NotFound unless self.class.email_keys.include?(params[:id])
 
-    TranslationOverride.upsert!(I18n.locale, "#{key}.subject_template", et[:subject])
-    TranslationOverride.upsert!(I18n.locale, "#{key}.text_body_template", et[:body])
+    subject_result = update_key("#{key}.subject_template", et[:subject])
+    body_result = update_key("#{key}.text_body_template", et[:body])
 
-    render_serialized(key, AdminEmailTemplateSerializer, root: 'email_template', rest_serializer: true)
+    error_messages = []
+    if subject_result[:error_messages].present?
+      error_messages << format_error_message(subject_result, "subject")
+    end
+    if body_result[:error_messages].present?
+      error_messages << format_error_message(body_result, "body")
+    end
+
+    if error_messages.blank?
+      log_site_text_change(subject_result)
+      log_site_text_change(body_result)
+
+      render_serialized(key, AdminEmailTemplateSerializer, root: 'email_template', rest_serializer: true)
+    else
+      TranslationOverride.upsert!(I18n.locale, "#{key}.subject_template", subject_result[:old_value])
+      TranslationOverride.upsert!(I18n.locale, "#{key}.text_body_template", body_result[:old_value])
+
+      render_json_error(error_messages)
+    end
   end
 
   def revert
     key = params[:id]
     raise Discourse::NotFound unless self.class.email_keys.include?(params[:id])
-    TranslationOverride.revert!(I18n.locale, "#{key}.subject_template", "#{key}.text_body_template")
+
+    revert_and_log("#{key}.subject_template", "#{key}.text_body_template")
     render_serialized(key, AdminEmailTemplateSerializer, root: 'email_template', rest_serializer: true)
   end
 
@@ -57,4 +78,41 @@ class Admin::EmailTemplatesController < Admin::AdminController
     render_serialized(self.class.email_keys, AdminEmailTemplateSerializer, root: 'email_templates', rest_serializer: true)
   end
 
+  private
+
+  def update_key(key, value)
+    old_value = I18n.t(key)
+    translation_override = TranslationOverride.upsert!(I18n.locale, key, value)
+
+    {
+      key: key,
+      old_value: old_value,
+      error_messages: translation_override.errors.full_messages
+    }
+  end
+
+  def revert_and_log(*keys)
+    old_values = {}
+    keys.each { |key| old_values[key] = I18n.t(key) }
+
+    TranslationOverride.revert!(I18n.locale, keys)
+
+    keys.each do |key|
+      old_value = old_values[key]
+      new_value = I18n.t(key)
+      StaffActionLogger.new(current_user).log_site_text_change(key, new_value, old_value)
+    end
+  end
+
+  def log_site_text_change(update_result)
+    new_value = I18n.t(update_result[:key])
+    StaffActionLogger.new(current_user).log_site_text_change(
+      update_result[:key], new_value, update_result[:old_value])
+  end
+
+  def format_error_message(update_result, attribute_key)
+    attribute = I18n.t("admin_js.admin.customize.email_templates.#{attribute_key}")
+    message = update_result[:error_messages].join("<br>")
+    I18n.t("errors.format_with_full_message", attribute: attribute, message: message)
+  end
 end
diff --git a/app/controllers/admin/embeddable_hosts_controller.rb b/app/controllers/admin/embeddable_hosts_controller.rb
index 60d24a310c..f43ff95505 100644
--- a/app/controllers/admin/embeddable_hosts_controller.rb
+++ b/app/controllers/admin/embeddable_hosts_controller.rb
@@ -1,6 +1,6 @@
 class Admin::EmbeddableHostsController < Admin::AdminController
 
-  before_filter :ensure_logged_in, :ensure_staff
+  before_action :ensure_logged_in, :ensure_staff
 
   def create
     save_host(EmbeddableHost.new)
diff --git a/app/controllers/admin/embedding_controller.rb b/app/controllers/admin/embedding_controller.rb
index 4c5f8548b5..ada7c668b9 100644
--- a/app/controllers/admin/embedding_controller.rb
+++ b/app/controllers/admin/embedding_controller.rb
@@ -2,7 +2,7 @@ require_dependency 'embedding'
 
 class Admin::EmbeddingController < Admin::AdminController
 
-  before_filter :ensure_logged_in, :ensure_staff, :fetch_embedding
+  before_action :ensure_logged_in, :ensure_staff, :fetch_embedding
 
   def show
     render_serialized(@embedding, EmbeddingSerializer, root: 'embedding', rest_serializer: true)
diff --git a/app/controllers/admin/emojis_controller.rb b/app/controllers/admin/emojis_controller.rb
index 8bd3f36ede..649ebec804 100644
--- a/app/controllers/admin/emojis_controller.rb
+++ b/app/controllers/admin/emojis_controller.rb
@@ -10,11 +10,11 @@ class Admin::EmojisController < Admin::AdminController
     file = params[:file] || params[:files].first
     name = params[:name] || File.basename(file.original_filename, ".*")
 
-    Scheduler::Defer.later("Upload Emoji") do
+    hijack do
       # fix the name
       name = name.gsub(/[^a-z0-9]+/i, '_')
-                 .gsub(/_{2,}/, '_')
-                 .downcase
+        .gsub(/_{2,}/, '_')
+        .downcase
 
       upload = UploadCreator.new(
         file.tempfile,
@@ -22,6 +22,8 @@ class Admin::EmojisController < Admin::AdminController
         type: 'custom_emoji'
       ).create_for(current_user.id)
 
+      good = true
+
       data =
         if upload.persisted?
           custom_emoji = CustomEmoji.new(name: name, upload: upload)
@@ -30,28 +32,23 @@ class Admin::EmojisController < Admin::AdminController
             Emoji.clear_cache
             { name: custom_emoji.name, url: custom_emoji.upload.url }
           else
+            good = false
             failed_json.merge(errors: custom_emoji.errors.full_messages)
           end
         else
+          good = false
           failed_json.merge(errors: upload.errors.full_messages)
         end
 
-      MessageBus.publish("/uploads/emoji", data.as_json, user_ids: [current_user.id])
+      render json: data.as_json, status: good ? 200 : 422
     end
-
-    render json: success_json
   end
 
   def destroy
     name = params.require(:id)
 
-    custom_emoji = CustomEmoji.find_by(name: name)
-    raise Discourse::InvalidParameters unless custom_emoji
-
-    CustomEmoji.transaction do
-      custom_emoji.upload.destroy!
-      custom_emoji.destroy!
-    end
+    # NOTE: the upload will automatically be removed by the 'clean_up_uploads' job
+    CustomEmoji.find_by(name: name)&.destroy!
 
     Emoji.clear_cache
 
@@ -61,4 +58,3 @@ class Admin::EmojisController < Admin::AdminController
   end
 
 end
-
diff --git a/app/controllers/admin/flagged_topics_controller.rb b/app/controllers/admin/flagged_topics_controller.rb
new file mode 100644
index 0000000000..82e7b68b27
--- /dev/null
+++ b/app/controllers/admin/flagged_topics_controller.rb
@@ -0,0 +1,17 @@
+require_dependency 'flag_query'
+
+class Admin::FlaggedTopicsController < Admin::AdminController
+
+  def index
+    result = FlagQuery.flagged_topics
+
+    render_json_dump(
+      {
+        flagged_topics: serialize_data(result[:flagged_topics], FlaggedTopicSummarySerializer),
+        users: serialize_data(result[:users], BasicUserSerializer),
+      },
+      rest_serializer: true
+    )
+  end
+
+end
diff --git a/app/controllers/admin/flags_controller.rb b/app/controllers/admin/flags_controller.rb
index 1385f958d5..702479e82a 100644
--- a/app/controllers/admin/flags_controller.rb
+++ b/app/controllers/admin/flags_controller.rb
@@ -2,26 +2,74 @@ require 'flag_query'
 
 class Admin::FlagsController < Admin::AdminController
 
+  def self.flags_per_page
+    10
+  end
+
   def index
     # we may get out of sync, fix it here
     PostAction.update_flagged_posts_count
-    posts, topics, users = FlagQuery.flagged_posts_report(current_user, params[:filter], params[:offset].to_i, 10)
 
-    if posts.blank?
-      render json: { posts: [], topics: [], users: [] }
+    offset = params[:offset].to_i
+    per_page = Admin::FlagsController.flags_per_page
+
+    posts, topics, users, post_actions, total_rows = FlagQuery.flagged_posts_report(
+      current_user,
+      filter: params[:filter],
+      offset: offset,
+      topic_id: params[:topic_id],
+      per_page: per_page,
+      rest_api: params[:rest_api].present?
+    )
+
+    if params[:rest_api]
+      meta = {
+        types: {
+          disposed_by: 'user'
+        }
+      }
+
+      if (total_rows || 0) > (offset + per_page)
+        meta[:total_rows_flagged_posts] = total_rows
+        meta[:load_more_flagged_posts] = admin_flags_filtered_path(
+          filter: params[:filter],
+          offset: offset + per_page,
+          rest_api: params[:rest_api],
+          topic_id: params[:topic_id]
+        )
+      end
+
+      render_json_dump(
+        {
+          flagged_posts: posts,
+          topics: serialize_data(topics, FlaggedTopicSerializer),
+          users: serialize_data(users, FlaggedUserSerializer),
+          post_actions: post_actions
+        },
+        rest_serializer: true,
+        meta: meta
+      )
     else
-      render json: MultiJson.dump({
+      render_json_dump(
         posts: posts,
         topics: serialize_data(topics, FlaggedTopicSerializer),
         users: serialize_data(users, FlaggedUserSerializer)
-      })
+      )
     end
   end
 
   def agree
     params.permit(:id, :action_on_post)
-
     post = Post.find(params[:id])
+
+    DiscourseEvent.trigger(
+      :before_staff_flag_action,
+      type: 'agree',
+      post: post,
+      action_on_post: params[:action_on_post],
+      user: current_user
+    )
+
     post_action_type = PostAction.post_action_type_for_post(post.id)
 
     keep_post = params[:action_on_post] == "keep"
@@ -38,29 +86,42 @@ class Admin::FlagsController < Admin::AdminController
       PostAction.hide_post!(post, post_action_type)
     end
 
-    render nothing: true
+    render body: nil
   end
 
   def disagree
     params.permit(:id)
     post = Post.find(params[:id])
 
+    DiscourseEvent.trigger(
+      :before_staff_flag_action,
+      type: 'disagree',
+      post: post,
+      user: current_user
+    )
+
     PostAction.clear_flags!(post, current_user)
 
     post.unhide!
 
-    render nothing: true
+    render body: nil
   end
 
   def defer
     params.permit(:id, :delete_post)
     post = Post.find(params[:id])
 
-    PostAction.defer_flags!(post, current_user, params[:delete_post])
+    DiscourseEvent.trigger(
+      :before_staff_flag_action,
+      type: 'defer',
+      post: post,
+      user: current_user
+    )
 
+    PostAction.defer_flags!(post, current_user, params[:delete_post])
     PostDestroyer.new(current_user, post).destroy if params[:delete_post]
 
-    render nothing: true
+    render body: nil
   end
 
 end
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index c93e287cee..8a6a7a7239 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -1,5 +1,4 @@
 class Admin::GroupsController < Admin::AdminController
-
   def index
     groups = Group.order(:name).where("groups.id <> ?", Group::AUTO_GROUPS[:everyone])
 
@@ -15,25 +14,30 @@ class Admin::GroupsController < Admin::AdminController
   end
 
   def show
-    render nothing: true
+    render body: nil
   end
 
   def bulk
-    render nothing: true
+    render body: nil
   end
 
   def bulk_perform
     group = Group.find(params[:group_id].to_i)
     users_added = 0
     if group.present?
-      users = (params[:users] || []).map {|u| u.downcase}
+      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
       end
+      valid_users.uniq!
       invalid_users = users.reject! { |u| valid_emails[u] || valid_usernames[u] }
       group.bulk_add(valid_users) if valid_users.present?
       users_added = valid_users.count
@@ -43,10 +47,7 @@ class Admin::GroupsController < Admin::AdminController
   end
 
   def create
-    group = Group.new
-
-    group.name = (group_params[:name] || '').strip
-    save_group(group)
+    save_group(Group.new)
   end
 
   def update
@@ -58,8 +59,14 @@ class Admin::GroupsController < Admin::AdminController
   end
 
   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"
+    group.name = group_params[:name] if group_params[:name].present? && !group.automatic
+    group.mentionable_level = group_params[:mentionable_level].to_i if group_params[:mentionable_level].present?
+    group.messageable_level = group_params[:messageable_level].to_i if group_params[:messageable_level].present?
+
+    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
 
@@ -76,7 +83,13 @@ class Admin::GroupsController < Admin::AdminController
     group.flair_url      = group_params[:flair_url].presence
     group.flair_bg_color = group_params[:flair_bg_color].presence
     group.flair_color    = group_params[:flair_color].presence
-    group.public = group_params[:public] if group_params[:public]
+
+    %i{public_admission public_exit}.each do |key|
+      if group_params[key]
+        group.public_send("#{key}=", group_params[key])
+      end
+    end
+
     group.bio_raw = group_params[:bio_raw] if group_params[:bio_raw]
     group.full_name = group_params[:full_name] if group_params[:full_name]
 
@@ -86,10 +99,30 @@ class Admin::GroupsController < Admin::AdminController
 
     if group_params[:allow_membership_requests]
       group.allow_membership_requests = group_params[:allow_membership_requests]
+      group.membership_request_template = group_params[:membership_request_template]
+    end
+
+    if group_params[:owner_usernames].present?
+      owner_ids = User.where(
+        username: group_params[:owner_usernames].split(",")
+      ).pluck(:id)
+
+      owner_ids.each do |user_id|
+        group.group_users.build(user_id: user_id, owner: true)
+      end
+    end
+
+    if group_params[:usernames].present?
+      user_ids = User.where(username: group_params[:usernames].split(",")).pluck(:id)
+      user_ids -= owner_ids if owner_ids
+
+      user_ids.each do |user_id|
+        group.group_users.build(user_id: user_id)
+      end
     end
 
     if group.save
-      Group.reset_counters(group.id, :group_users)
+      group.restore_user_count!
 
       yield(group) if block_given?
 
@@ -118,8 +151,7 @@ class Admin::GroupsController < Admin::AdminController
   def add_owners
     group = Group.find(params.require(:id))
     return can_not_modify_automatic if group.automatic
-
-    users = User.where(username: params[:usernames].split(","))
+    users = User.where(username: group_params[:usernames].split(","))
 
     users.each do |user|
       group_action_logger = GroupActionLogger.new(current_user, group)
@@ -132,7 +164,7 @@ class Admin::GroupsController < Admin::AdminController
       group_action_logger.log_make_user_group_owner(user)
     end
 
-    Group.reset_counters(group.id, :group_users)
+    group.restore_user_count!
 
     render json: success_json
   end
@@ -153,18 +185,35 @@ class Admin::GroupsController < Admin::AdminController
   protected
 
   def can_not_modify_automatic
-    render json: {errors: I18n.t('groups.errors.can_not_modify_automatic')}, status: 422
+    render json: { errors: I18n.t('groups.errors.can_not_modify_automatic') }, status: 422
   end
 
   private
 
   def group_params
     params.require(:group).permit(
-      :name, :alias_level, :visible, :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,
-      :default_notification_level
+      :name,
+      :mentionable_level,
+      :messageable_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_admission,
+      :public_exit,
+      :allow_membership_requests,
+      :full_name,
+      :default_notification_level,
+      :usernames,
+      :owner_usernames,
+      :membership_request_template
     )
   end
 end
diff --git a/app/controllers/admin/impersonate_controller.rb b/app/controllers/admin/impersonate_controller.rb
index f57692d923..1e109521b9 100644
--- a/app/controllers/admin/impersonate_controller.rb
+++ b/app/controllers/admin/impersonate_controller.rb
@@ -14,7 +14,7 @@ class Admin::ImpersonateController < Admin::AdminController
     # Log on as the user
     log_on_user(user)
 
-    render nothing: true
+    render body: nil
   end
 
 end
diff --git a/app/controllers/admin/moderation_history_controller.rb b/app/controllers/admin/moderation_history_controller.rb
new file mode 100644
index 0000000000..5bad39a842
--- /dev/null
+++ b/app/controllers/admin/moderation_history_controller.rb
@@ -0,0 +1,40 @@
+class Admin::ModerationHistoryController < Admin::AdminController
+
+  def index
+    history_filter = params[:filter]
+    raise Discourse::NotFound unless ['post', 'topic'].include?(history_filter)
+
+    query = UserHistory.where(
+      action: UserHistory.actions.only(
+        :delete_user,
+        :suspend_user,
+        :silence_user,
+        :delete_post,
+        :delete_topic
+      ).values
+    )
+
+    case history_filter
+    when 'post'
+      raise Discourse::NotFound if params[:post_id].blank?
+      query = query.where(post_id: params[:post_id])
+    when 'topic'
+      raise Discourse::NotFound if params[:topic_id].blank?
+      query = query.where(
+        "topic_id = ? OR post_id IN (?)",
+        params[:topic_id],
+        Post.with_deleted.where(topic_id: params[:topic_id]).pluck(:id)
+      )
+    end
+    query = query.includes(:acting_user)
+    query = query.order(:created_at)
+
+    render_serialized(
+      query,
+      UserHistorySerializer,
+      root: 'moderation_history',
+      rest_serializer: true
+    )
+  end
+
+end
diff --git a/app/controllers/admin/permalinks_controller.rb b/app/controllers/admin/permalinks_controller.rb
index 875110e87a..b00978f525 100644
--- a/app/controllers/admin/permalinks_controller.rb
+++ b/app/controllers/admin/permalinks_controller.rb
@@ -1,6 +1,6 @@
 class Admin::PermalinksController < Admin::AdminController
 
-  before_filter :fetch_permalink, only: [:destroy]
+  before_action :fetch_permalink, only: [:destroy]
 
   def index
     url = params[:filter]
diff --git a/app/controllers/admin/screened_ip_addresses_controller.rb b/app/controllers/admin/screened_ip_addresses_controller.rb
index 31df2a6b8e..775f115195 100644
--- a/app/controllers/admin/screened_ip_addresses_controller.rb
+++ b/app/controllers/admin/screened_ip_addresses_controller.rb
@@ -2,7 +2,7 @@ require_dependency 'ip_addr'
 
 class Admin::ScreenedIpAddressesController < Admin::AdminController
 
-  before_filter :fetch_screened_ip_address, only: [:update, :destroy]
+  before_action :fetch_screened_ip_address, only: [:update, :destroy]
 
   def index
     filter = params[:filter]
@@ -46,7 +46,7 @@ class Admin::ScreenedIpAddressesController < Admin::AdminController
 
   def roll_up
     subnets = ScreenedIpAddress.roll_up(current_user)
-    render json: success_json.merge!({ subnets: subnets })
+    render json: success_json.merge!(subnets: subnets)
   end
 
   private
diff --git a/app/controllers/admin/search_logs_controller.rb b/app/controllers/admin/search_logs_controller.rb
new file mode 100644
index 0000000000..515839b1b5
--- /dev/null
+++ b/app/controllers/admin/search_logs_controller.rb
@@ -0,0 +1,22 @@
+class Admin::SearchLogsController < Admin::AdminController
+
+  def index
+    period = params[:period] || "all"
+    search_type = params[:search_type] || "all"
+    render_serialized(SearchLog.trending(period&.to_sym, search_type&.to_sym), SearchLogsSerializer)
+  end
+
+  def term
+    params.require(:term)
+
+    term = params[:term]
+    period = params[:period] || "yearly"
+    search_type = params[:search_type] || "all"
+
+    details = SearchLog.term_details(term, period&.to_sym, search_type&.to_sym)
+    raise Discourse::NotFound if details.blank?
+
+    render_json_dump(term: details)
+  end
+
+end
diff --git a/app/controllers/admin/site_settings_controller.rb b/app/controllers/admin/site_settings_controller.rb
index 7f20c5d88e..4075f45545 100644
--- a/app/controllers/admin/site_settings_controller.rb
+++ b/app/controllers/admin/site_settings_controller.rb
@@ -1,4 +1,7 @@
 class Admin::SiteSettingsController < Admin::AdminController
+  rescue_from Discourse::InvalidParameters do |e|
+    render_json_error e.message, status: 422
+  end
 
   def index
     render_json_dump(site_settings: SiteSetting.all_settings, diags: SiteSetting.diags)
@@ -9,15 +12,17 @@ class Admin::SiteSettingsController < Admin::AdminController
     id = params[:id]
     value = params[id]
     value.strip! if value.is_a?(String)
-    begin
-      # note, as of Ruby 2.3 symbols are GC'd so this is considered safe
-      if SiteSetting.hidden_settings.include?(id.to_sym)
-        raise Discourse::InvalidParameters, "You are not allowed to change hidden settings"
-      end
-      SiteSetting.set_and_log(id, value, current_user)
-      render nothing: true
-    rescue Discourse::InvalidParameters => e
-      render json: {errors: [e.message]}, status: 422
+    raise_access_hidden_setting(id)
+    SiteSetting.set_and_log(id, value, current_user)
+    render body: nil
+  end
+
+  private
+
+  def raise_access_hidden_setting(id)
+    # note, as of Ruby 2.3 symbols are GC'd so this is considered safe
+    if SiteSetting.hidden_settings.include?(id.to_sym)
+      raise Discourse::InvalidParameters, "You are not allowed to change hidden settings"
     end
   end
 
diff --git a/app/controllers/admin/site_texts_controller.rb b/app/controllers/admin/site_texts_controller.rb
index 500968f953..8cdb0d9b19 100644
--- a/app/controllers/admin/site_texts_controller.rb
+++ b/app/controllers/admin/site_texts_controller.rb
@@ -14,7 +14,7 @@ class Admin::SiteTextsController < Admin::AdminController
     query = params[:q] || ""
     if query.blank? && !overridden
       extras[:recommended] = true
-      results = self.class.preferred_keys.map {|k| record_for(k) }
+      results = self.class.preferred_keys.map { |k| record_for(k) }
     else
       results = []
       translations = I18n.search(query, overridden: overridden)
@@ -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
@@ -62,14 +69,14 @@ class Admin::SiteTextsController < Admin::AdminController
 
   protected
 
-    def record_for(k, value=nil)
+    def record_for(k, value = nil)
       if k.ends_with?("_MF")
         ovr = TranslationOverride.where(translation_key: k).pluck(:value)
         value = ovr[0] if ovr.present?
       end
 
       value ||= I18n.t(k)
-      {id: k, value: value}
+      { id: k, value: value }
     end
 
     def find_site_text
diff --git a/app/controllers/admin/staff_action_logs_controller.rb b/app/controllers/admin/staff_action_logs_controller.rb
index 242cc4f402..2e72e2b86f 100644
--- a/app/controllers/admin/staff_action_logs_controller.rb
+++ b/app/controllers/admin/staff_action_logs_controller.rb
@@ -6,7 +6,7 @@ class Admin::StaffActionLogsController < Admin::AdminController
     staff_action_logs = UserHistory.staff_action_records(current_user, filters).to_a
     render json: StaffActionLogsSerializer.new({
       staff_action_logs: staff_action_logs,
-      user_history_actions: UserHistory.staff_actions.sort.map{|name| {id: UserHistory.actions[name], name: name}}
+      user_history_actions: UserHistory.staff_actions.sort.map { |name| { id: UserHistory.actions[name], name: name } }
     }, root: false)
   end
 
@@ -46,20 +46,18 @@ class Admin::StaffActionLogsController < Admin::AdminController
       cur: child_themes(cur)
     }
 
-
     load_diff(diff_fields, :cur, cur)
     load_diff(diff_fields, :prev, prev)
 
-    diff_fields.delete_if{|k,v| v[:cur] == v[:prev]}
+    diff_fields.delete_if { |k, v| v[:cur] == v[:prev] }
 
-
-    diff_fields.each do |k,v|
+    diff_fields.each do |k, v|
       output << "<h3>#{k}</h3><p></p>"
       diff = DiscourseDiff.new(v[:prev] || "", v[:cur] || "")
       output << diff.side_by_side_markdown
     end
 
-    render json: {side_by_side: output}
+    render json: { side_by_side: output }
   end
 
   protected
@@ -67,11 +65,11 @@ class Admin::StaffActionLogsController < Admin::AdminController
   def child_themes(theme)
     return "" unless children = theme["child_themes"]
 
-    children.map{|row| row["name"]}.join(" ").to_s
+    children.map { |row| row["name"] }.join(" ").to_s
   end
 
   def load_diff(hash, key, val)
-    if f=val["theme_fields"]
+    if f = val["theme_fields"]
       f.each do |row|
         entry = hash[row["target"] + " " + row["name"]] ||= {}
         entry[key] = row["value"]
diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb
index d6adf20741..b0f8d21f39 100644
--- a/app/controllers/admin/themes_controller.rb
+++ b/app/controllers/admin/themes_controller.rb
@@ -1,8 +1,9 @@
 require_dependency 'upload_creator'
+require 'base64'
 
 class Admin::ThemesController < Admin::AdminController
 
-  skip_before_filter :check_xhr, only: [:show, :preview]
+  skip_before_action :check_xhr, only: [:show, :preview]
 
   def preview
     @theme = Theme.find(params[:id])
@@ -12,13 +13,16 @@ class Admin::ThemesController < Admin::AdminController
 
   def upload_asset
     path = params[:file].path
-    File.open(path) do |file|
-      filename = params[:file]&.original_filename || File.basename(path)
-      upload = UploadCreator.new(file, filename, for_theme: true).create_for(current_user.id)
-      if upload.errors.count > 0
-        render_json_error upload
-      else
-        render json: { upload_id: upload.id }, status: :created
+
+    hijack do
+      File.open(path) do |file|
+        filename = params[:file]&.original_filename || File.basename(path)
+        upload = UploadCreator.new(file, filename, for_theme: true).create_for(current_user.id)
+        if upload.errors.count > 0
+          render_json_error upload
+        else
+          render json: { upload_id: upload.id }, status: :created
+        end
       end
     end
   end
@@ -31,7 +35,28 @@ class Admin::ThemesController < Admin::AdminController
 
       @theme = Theme.new(name: theme["name"], user_id: current_user.id)
       theme["theme_fields"]&.each do |field|
-        @theme.set_field(target: field["target"], name: field["name"], value: field["value"])
+
+        if field["raw_upload"]
+          begin
+            tmp = Tempfile.new
+            tmp.binmode
+            file = Base64.decode64(field["raw_upload"])
+            tmp.write(file)
+            tmp.rewind
+            upload = UploadCreator.new(tmp, field["filename"]).create_for(current_user.id)
+            field["upload_id"] = upload.id
+          ensure
+            tmp.unlink
+          end
+        end
+
+        @theme.set_field(
+          target: field["target"],
+          name: field["name"],
+          value: field["value"],
+          type_id: field["type_id"],
+          upload_id: field["upload_id"]
+        )
       end
 
       if @theme.save
@@ -62,7 +87,7 @@ class Admin::ThemesController < Admin::AdminController
     }
 
     respond_to do |format|
-      format.json { render json: payload}
+      format.json { render json: payload }
     end
   end
 
@@ -77,7 +102,7 @@ class Admin::ThemesController < Admin::AdminController
       if @theme.save
         update_default_theme
         log_theme_change(nil, @theme)
-        format.json { render json: @theme, status: :created}
+        format.json { render json: @theme, status: :created }
       else
         format.json { render json: @theme.errors, status: :unprocessable_entity }
       end
@@ -100,7 +125,7 @@ class Admin::ThemesController < Admin::AdminController
 
       @theme.child_theme_relation.to_a.each do |child|
         if expected.include?(child.child_theme_id)
-          expected.reject!{|id| id == child.child_theme_id}
+          expected.reject! { |id| id == child.child_theme_id }
         else
           child.destroy
         end
@@ -133,12 +158,12 @@ class Admin::ThemesController < Admin::AdminController
         update_default_theme
 
         log_theme_change(original_json, @theme)
-        format.json { render json: @theme, status: :created}
+        format.json { render json: @theme, status: :created }
       else
         format.json {
 
           error = @theme.errors[:color_scheme] ? I18n.t("themes.bad_color_scheme") : I18n.t("themes.other_error")
-          render json: {errors: [ error ]}, status: :unprocessable_entity
+          render json: { errors: [ error ] }, status: :unprocessable_entity
         }
       end
     end
@@ -168,7 +193,7 @@ class Admin::ThemesController < Admin::AdminController
 
         response.headers['Content-Disposition'] = "attachment; filename=#{@theme.name.parameterize}.dcstyle.json"
         response.sending_file = true
-        render json: ThemeSerializer.new(@theme)
+        render json: ThemeWithEmbeddedUploadsSerializer.new(@theme, root: 'theme')
       end
     end
 
@@ -178,7 +203,7 @@ class Admin::ThemesController < Admin::AdminController
 
     def update_default_theme
       if theme_params.key?(:default)
-        is_default = theme_params[:default]
+        is_default = theme_params[:default].to_s == "true"
         if @theme.key == SiteSetting.default_theme_key && !is_default
           Theme.clear_default!
         elsif is_default
@@ -192,13 +217,15 @@ class Admin::ThemesController < Admin::AdminController
         begin
           # deep munge is a train wreck, work around it for now
           params[:theme][:child_theme_ids] ||= [] if params[:theme].key?(:child_theme_ids)
-          params.require(:theme)
-            .permit(:name,
-                    :color_scheme_id,
-                    :default,
-                    :user_selectable,
-                    theme_fields: [:name, :target, :value, :upload_id, :type_id],
-                    child_theme_ids: [])
+
+          params.require(:theme).permit(
+            :name,
+            :color_scheme_id,
+            :default,
+            :user_selectable,
+            theme_fields: [:name, :target, :value, :upload_id, :type_id],
+            child_theme_ids: []
+          )
         end
     end
 
diff --git a/app/controllers/admin/user_fields_controller.rb b/app/controllers/admin/user_fields_controller.rb
index 596b53e4ee..2af8832e33 100644
--- a/app/controllers/admin/user_fields_controller.rb
+++ b/app/controllers/admin/user_fields_controller.rb
@@ -51,8 +51,7 @@ class Admin::UserFieldsController < Admin::AdminController
       options = params[:user_field][:options]
       if options.present?
         UserFieldOption.where(user_field_id: field.id).delete_all
-        field.user_field_options_attributes = options.map {|o| {value: o} }.uniq
+        field.user_field_options_attributes = options.map { |o| { value: o } }.uniq
       end
     end
 end
-
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 5db8236745..457b049d0d 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -4,7 +4,7 @@ require_dependency 'admin_confirmation'
 
 class Admin::UsersController < Admin::AdminController
 
-  before_filter :fetch_user, only: [:suspend,
+  before_action :fetch_user, only: [:suspend,
                                     :unsuspend,
                                     :refresh_browsers,
                                     :log_out,
@@ -15,8 +15,8 @@ class Admin::UsersController < Admin::AdminController
                                     :approve,
                                     :activate,
                                     :deactivate,
-                                    :block,
-                                    :unblock,
+                                    :silence,
+                                    :unsilence,
                                     :trust_level,
                                     :trust_level_lock,
                                     :add_group,
@@ -48,18 +48,48 @@ class Admin::UsersController < Admin::AdminController
     @user = User.find_by(id: params[:user_id])
     @user.delete_all_posts!(guardian)
     # staff action logs will have an entry for each post
-    render nothing: true
+    render body: nil
   end
 
   def suspend
     guardian.ensure_can_suspend!(@user)
-    @user.suspended_till = params[:duration].to_i.days.from_now
+    @user.suspended_till = params[:suspend_until]
     @user.suspended_at = DateTime.now
-    @user.save!
-    @user.revoke_api_key
-    StaffActionLogger.new(current_user).log_user_suspend(@user, params[:reason])
+
+    message = params[:message]
+
+    user_history = nil
+
+    User.transaction do
+      @user.save!
+      @user.revoke_api_key
+
+      user_history = StaffActionLogger.new(current_user).log_user_suspend(
+        @user,
+        params[:reason],
+        message: message,
+        post_id: params[:post_id]
+      )
+    end
     @user.logged_out
-    render nothing: true
+
+    if message.present?
+      Jobs.enqueue(
+        :critical_user_email,
+        type: :account_suspended,
+        user_id: @user.id,
+        user_history_id: user_history.id
+      )
+    end
+
+    render_json_dump(
+      suspension: {
+        suspended: true,
+        suspend_reason: params[:reason],
+        suspended_till: @user.suspended_till,
+        suspended_at: @user.suspended_at
+      }
+    )
   end
 
   def unsuspend
@@ -68,7 +98,12 @@ class Admin::UsersController < Admin::AdminController
     @user.suspended_at = nil
     @user.save!
     StaffActionLogger.new(current_user).log_user_unsuspend(@user)
-    render nothing: true
+
+    render_json_dump(
+      suspension: {
+        suspended: false
+      }
+    )
   end
 
   def log_out
@@ -77,20 +112,20 @@ class Admin::UsersController < Admin::AdminController
       @user.logged_out
       render json: success_json
     else
-      render json: {error: I18n.t('admin_js.admin.users.id_not_found')}, status: 404
+      render json: { error: I18n.t('admin_js.admin.users.id_not_found') }, status: 404
     end
   end
 
   def refresh_browsers
     refresh_browser @user
-    render nothing: true
+    render body: nil
   end
 
   def revoke_admin
     guardian.ensure_can_revoke_admin!(@user)
     @user.revoke_admin!
     StaffActionLogger.new(current_user).log_revoke_admin(@user)
-    render nothing: true
+    render body: nil
   end
 
   def generate_api_key
@@ -100,7 +135,7 @@ class Admin::UsersController < Admin::AdminController
 
   def revoke_api_key
     @user.revoke_api_key
-    render nothing: true
+    render body: nil
   end
 
   def grant_admin
@@ -112,7 +147,7 @@ class Admin::UsersController < Admin::AdminController
     guardian.ensure_can_revoke_moderation!(@user)
     @user.revoke_moderation!
     StaffActionLogger.new(current_user).log_revoke_moderation(@user)
-    render nothing: true
+    render body: nil
   end
 
   def grant_moderation
@@ -129,40 +164,50 @@ class Admin::UsersController < Admin::AdminController
     group.add(@user)
     GroupActionLogger.new(current_user, group).log_add_user_to_group(@user)
 
-    render nothing: true
+    render body: nil
   end
 
   def remove_group
     group = Group.find(params[:group_id].to_i)
     return render_json_error group unless group && !group.automatic
+
     group.remove(@user)
     GroupActionLogger.new(current_user, group).log_remove_user_from_group(@user)
-    render nothing: true
+
+    render body: nil
   end
 
   def primary_group
-    group = Group.find(params[:primary_group_id].to_i)
     guardian.ensure_can_change_primary_group!(@user)
-    if group.users.include?(@user)
-      @user.primary_group_id = params[:primary_group_id]
-      @user.save!
+
+    if params[:primary_group_id].present?
+      primary_group_id = params[:primary_group_id].to_i
+      if group = Group.find(primary_group_id)
+        if group.user_ids.include?(@user.id)
+          @user.primary_group_id = primary_group_id
+        end
+      end
+    else
+      @user.primary_group_id = nil
     end
-    render nothing: true
+
+    @user.save!
+
+    render body: nil
   end
 
   def trust_level
     guardian.ensure_can_change_trust_level!(@user)
     level = params[:level].to_i
 
-
-    if !@user.trust_level_locked && [0,1,2].include?(level) && Promotion.send("tl#{level+1}_met?", @user)
-      @user.trust_level_locked = true
-      @user.save
-    end
-
-    if !@user.trust_level_locked && level == 3 && Promotion.tl3_lost?(@user)
-      @user.trust_level_locked = true
-      @user.save
+    if @user.manual_locked_trust_level.nil?
+      if [0, 1, 2].include?(level) && Promotion.send("tl#{level + 1}_met?", @user)
+        @user.manual_locked_trust_level = level
+        @user.save
+      elsif level == 3 && Promotion.tl3_lost?(@user)
+        @user.manual_locked_trust_level = level
+        @user.save
+      end
     end
 
     @user.change_trust_level!(level, log_action_for: current_user)
@@ -180,38 +225,32 @@ class Admin::UsersController < Admin::AdminController
       return render_json_error I18n.t('errors.invalid_boolean')
     end
 
-    @user.trust_level_locked = new_lock == "true"
+    @user.manual_locked_trust_level = (new_lock == "true") ? @user.trust_level : nil
     @user.save
 
     StaffActionLogger.new(current_user).log_lock_trust_level(@user)
+    Promotion.recalculate(@user, current_user)
 
-    unless @user.trust_level_locked
-      p = Promotion.new(@user)
-      2.times{ p.review }
-      p.review_tl2
-      if @user.trust_level == 3 && Promotion.tl3_lost?(@user)
-        @user.change_trust_level!(2, log_action_for: current_user)
-      end
-    end
-
-    render nothing: true
+    render body: nil
   end
 
   def approve
     guardian.ensure_can_approve!(@user)
     @user.approve(current_user)
-    render nothing: true
+    render body: nil
   end
 
   def approve_bulk
     User.where(id: params[:users]).each do |u|
       u.approve(current_user) if guardian.can_approve?(u)
     end
-    render nothing: true
+    render body: nil
   end
 
   def activate
     guardian.ensure_can_activate!(@user)
+    # ensure there is an active email token
+    @user.email_tokens.create(email: @user.email) unless @user.email_tokens.active.exists?
     @user.activate
     StaffActionLogger.new(current_user).log_user_activate(@user, I18n.t('user.activated_by_staff'))
     render json: success_json
@@ -222,19 +261,53 @@ class Admin::UsersController < Admin::AdminController
     @user.deactivate
     StaffActionLogger.new(current_user).log_user_deactivate(@user, I18n.t('user.deactivated_by_staff'))
     refresh_browser @user
-    render nothing: true
+    render body: nil
   end
 
-  def block
-    guardian.ensure_can_block_user! @user
-    UserBlocker.block(@user, current_user, keep_posts: true)
-    render nothing: true
+  def silence
+    guardian.ensure_can_silence_user! @user
+
+    message = params[:message]
+
+    silencer = UserSilencer.new(
+      @user,
+      current_user,
+      silenced_till: params[:silenced_till],
+      reason: params[:reason],
+      message_body: message,
+      keep_posts: true
+    )
+    if silencer.silence && message.present?
+      Jobs.enqueue(
+        :critical_user_email,
+        type: :account_silenced,
+        user_id: @user.id,
+        user_history_id: silencer.user_history.id
+      )
+    end
+
+    render_json_dump(
+      silence: {
+        silenced: true,
+        silence_reason: params[:reason],
+        silenced_till: @user.silenced_till,
+        suspended_at: @user.silenced_at
+      }
+    )
   end
 
-  def unblock
-    guardian.ensure_can_unblock_user! @user
-    UserBlocker.unblock(@user, current_user)
-    render nothing: true
+  def unsilence
+    guardian.ensure_can_unsilence_user! @user
+    UserSilencer.unsilence(@user, current_user)
+
+    render_json_dump(
+      unsilence: {
+        silenced: false,
+        silence_reason: nil,
+        silenced_till: nil,
+        suspended_at: nil
+      }
+    )
   end
 
   def reject_bulk
@@ -242,7 +315,7 @@ class Admin::UsersController < Admin::AdminController
     d = UserDestroyer.new(current_user)
 
     User.where(id: params[:users]).each do |u|
-      success_count += 1 if guardian.can_delete_user?(u) and d.destroy(u, params.slice(:context)) rescue UserDestroyer::PostsExistError
+      success_count += 1 if guardian.can_delete_user?(u) && d.destroy(u, params.slice(:context)) rescue UserDestroyer::PostsExistError
     end
 
     render json: {
@@ -255,7 +328,9 @@ class Admin::UsersController < Admin::AdminController
     user = User.find_by(id: params[:id].to_i)
     guardian.ensure_can_delete_user!(user)
     begin
-      options = params.slice(:delete_posts, :block_email, :block_urls, :block_ip, :context, :delete_as_spammer)
+      options = params.slice(:block_email, :block_urls, :block_ip, :context, :delete_as_spammer)
+      options[:delete_posts] = ActiveModel::Type::Boolean.new.cast(params[:delete_posts])
+
       if UserDestroyer.new(current_user).destroy(user, options)
         render json: { deleted: true }
       else
@@ -280,13 +355,13 @@ class Admin::UsersController < Admin::AdminController
     ip = params[:ip]
 
     # should we cache results in redis?
-    location = Excon.get("http://ipinfo.io/#{ip}/json", read_timeout: 30, connect_timeout: 30).body rescue nil
+    location = Excon.get("https://ipinfo.io/#{ip}/json", read_timeout: 10, connect_timeout: 10).body rescue nil
 
     render json: location
   end
 
   def sync_sso
-    return render nothing: true, status: 404 unless SiteSetting.enable_sso
+    return render body: nil, status: 404 unless SiteSetting.enable_sso
 
     sso = DiscourseSingleSignOn.parse("sso=#{params[:sso]}&sig=#{params[:sig]}")
 
@@ -304,7 +379,14 @@ class Admin::UsersController < Admin::AdminController
     params.require(:order)
 
     user_destroyer = UserDestroyer.new(current_user)
-    options = { delete_posts: true, block_email: true, block_urls: true, block_ip: true, delete_as_spammer: true }
+    options = {
+      delete_posts: true,
+      block_email: true,
+      block_urls: true,
+      block_ip: true,
+      delete_as_spammer: true,
+      context: I18n.t("user.destroy_reasons.same_ip_address", ip_address: params[:ip])
+    }
 
     AdminUserIndexQuery.new(params).find_users(50).each do |user|
       user_destroyer.destroy(user, options) rescue nil
@@ -339,12 +421,12 @@ class Admin::UsersController < Admin::AdminController
     user.save!
     user.grant_admin!
     user.change_trust_level!(4)
-    user.email_tokens.update_all  confirmed: true
+    user.email_tokens.update_all confirmed: true
 
     email_token = user.email_tokens.create(email: user.email)
 
     unless params[:send_email] == '0' || params[:send_email] == 'false'
-      Jobs.enqueue( :critical_user_email,
+      Jobs.enqueue(:critical_user_email,
                     type: :account_created,
                     user_id: user.id,
                     email_token: email_token.token)
diff --git a/app/controllers/admin/watched_words_controller.rb b/app/controllers/admin/watched_words_controller.rb
new file mode 100644
index 0000000000..119562dc4e
--- /dev/null
+++ b/app/controllers/admin/watched_words_controller.rb
@@ -0,0 +1,47 @@
+class Admin::WatchedWordsController < Admin::AdminController
+
+  def index
+    render_json_dump WatchedWordListSerializer.new(WatchedWord.by_action, scope: guardian, root: false)
+  end
+
+  def create
+    watched_word = WatchedWord.create_or_update_word(watched_words_params)
+    if watched_word.valid?
+      render json: watched_word, root: false
+    else
+      render_json_error(watched_word)
+    end
+  end
+
+  def destroy
+    watched_word = WatchedWord.find(params[:id])
+    watched_word.destroy
+    render json: success_json
+  end
+
+  def upload
+    file = params[:file] || params[:files].first
+    action_key = params[:action_key].to_sym
+
+    Scheduler::Defer.later("Upload watched words") do
+      begin
+        File.open(file.tempfile, encoding: "ISO-8859-1").each_line do |line|
+          WatchedWord.create_or_update_word(word: line, action_key: action_key) unless line.empty?
+        end
+        data = { url: '/ok' }
+      rescue => e
+        data = failed_json.merge(errors: [e.message])
+      end
+      MessageBus.publish("/uploads/csv", data.as_json, client_ids: [params[:client_id]])
+    end
+
+    render json: success_json
+  end
+
+  private
+
+  def watched_words_params
+    params.permit(:id, :word, :action_key)
+  end
+
+end
diff --git a/app/controllers/admin/web_hooks_controller.rb b/app/controllers/admin/web_hooks_controller.rb
index 4deb554c8b..92ec8019c3 100644
--- a/app/controllers/admin/web_hooks_controller.rb
+++ b/app/controllers/admin/web_hooks_controller.rb
@@ -1,15 +1,15 @@
 class Admin::WebHooksController < Admin::AdminController
-  before_filter :fetch_web_hook, only: %i(show update destroy list_events bulk_events ping)
+  before_action :fetch_web_hook, only: %i(show update destroy list_events bulk_events ping)
 
   def index
     limit = 50
     offset = params[:offset].to_i
 
     web_hooks = WebHook.limit(limit)
-                       .offset(offset)
-                       .includes(:web_hook_event_types)
-                       .includes(:categories)
-                       .includes(:groups)
+      .offset(offset)
+      .includes(:web_hook_event_types)
+      .includes(:categories)
+      .includes(:groups)
 
     json = {
       web_hooks: serialize_data(web_hooks, AdminWebHookSerializer),
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7527f4a9ba..f91baa9c22 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -11,12 +11,14 @@ require_dependency 'distributed_cache'
 require_dependency 'global_path'
 require_dependency 'secure_session'
 require_dependency 'topic_query'
+require_dependency 'hijack'
 
 class ApplicationController < ActionController::Base
   include CurrentUser
   include CanonicalURL::ControllerExtensions
   include JsonError
   include GlobalPath
+  include Hijack
 
   attr_reader :theme_key
 
@@ -36,19 +38,20 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  before_filter :handle_theme
-  before_filter :set_current_user_for_logs
-  before_filter :clear_notifications
-  before_filter :set_locale
-  before_filter :set_mobile_view
-  before_filter :block_if_readonly_mode
-  before_filter :authorize_mini_profiler
-  before_filter :preload_json
-  before_filter :redirect_to_login_if_required
-  before_filter :check_xhr
-  after_filter  :add_readonly_header
-  after_filter  :perform_refresh_session
-  after_filter  :dont_cache_page
+  before_action :check_readonly_mode
+  before_action :handle_theme
+  before_action :set_current_user_for_logs
+  before_action :clear_notifications
+  before_action :set_locale
+  before_action :set_mobile_view
+  before_action :block_if_readonly_mode
+  before_action :authorize_mini_profiler
+  before_action :preload_json
+  before_action :redirect_to_login_if_required
+  before_action :check_xhr
+  after_action  :add_readonly_header
+  after_action  :perform_refresh_session
+  after_action  :dont_cache_page
 
   layout :set_layout
 
@@ -61,11 +64,11 @@ class ApplicationController < ActionController::Base
   end
 
   def add_readonly_header
-    response.headers['Discourse-Readonly'] = 'true' if Discourse.readonly_mode?
+    response.headers['Discourse-Readonly'] = 'true' if @readonly_mode
   end
 
   def perform_refresh_session
-    refresh_session(current_user)
+    refresh_session(current_user) unless @readonly_mode
   end
 
   def immutable_for(duration)
@@ -107,13 +110,14 @@ class ApplicationController < ActionController::Base
 
   rescue_from PG::ReadOnlySqlTransaction do |e|
     Discourse.received_readonly!
+    Rails.logger.error("#{e.class} #{e.message}: #{e.backtrace.join("\n")}")
     raise Discourse::ReadOnly
   end
 
   rescue_from Discourse::NotLoggedIn do |e|
     raise e if Rails.env.test?
     if (request.format && request.format.json?) || request.xhr? || !request.get?
-      rescue_discourse_actions(:not_logged_in, 403, true)
+      rescue_discourse_actions(:not_logged_in, 403, include_ember: true)
     else
       rescue_discourse_actions(:not_found, 404)
     end
@@ -127,8 +131,8 @@ class ApplicationController < ActionController::Base
   class PluginDisabled < StandardError; end
 
   # Handles requests for giant IDs that throw pg exceptions
-  rescue_from RangeError do |e|
-    if e.message =~ /ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer/
+  rescue_from ActiveModel::RangeError do |e|
+    if e.message =~ /ActiveModel::Type::Integer/
       rescue_discourse_actions(:not_found, 404)
     else
       raise e
@@ -139,16 +143,21 @@ class ApplicationController < ActionController::Base
     rescue_discourse_actions(:not_found, 404)
   end
 
-  rescue_from Discourse::InvalidAccess do
-    rescue_discourse_actions(:invalid_access, 403, true)
+  rescue_from Discourse::InvalidAccess do |e|
+    rescue_discourse_actions(
+      :invalid_access,
+      403,
+      include_ember: true,
+      custom_message: e.custom_message
+    )
   end
 
   rescue_from Discourse::ReadOnly do
     render_json_error I18n.t('read_only_mode_enabled'), type: :read_only, status: 503
   end
 
-  def rescue_discourse_actions(type, status_code, include_ember=false)
-
+  def rescue_discourse_actions(type, status_code, opts = nil)
+    opts ||= {}
     show_json_errors = (request.format && request.format.json?) ||
                        (request.xhr?) ||
                        ((params[:external_id] || '').ends_with? '.json')
@@ -156,33 +165,39 @@ class ApplicationController < ActionController::Base
     if show_json_errors
       # HACK: do not use render_json_error for topics#show
       if request.params[:controller] == 'topics' && request.params[:action] == 'show'
-        return render status: status_code, layout: false, text: (status_code == 404 || status_code == 410) ? build_not_found_page(status_code) : I18n.t(type)
+        return render status: status_code, layout: false, plain: (status_code == 404 || status_code == 410) ? build_not_found_page(status_code) : I18n.t(type)
       end
 
-      render_json_error I18n.t(type), type: type, status: status_code
+      render_json_error I18n.t(opts[:custom_message] || type), type: type, status: status_code
     else
-      render html: build_not_found_page(status_code, include_ember ? 'application' : 'no_ember')
+      begin
+        current_user
+      rescue Discourse::InvalidAccess
+        return render plain: I18n.t(opts[:custom_message] || type), status: status_code
+      end
+
+      render html: build_not_found_page(status_code, opts[:include_ember] ? 'application' : 'no_ember')
     end
   end
 
   # If a controller requires a plugin, it will raise an exception if that plugin is
   # disabled. This allows plugins to be disabled programatically.
   def self.requires_plugin(plugin_name)
-    before_filter do
+    before_action do
       raise PluginDisabled.new if Discourse.disabled_plugin_names.include?(plugin_name)
     end
   end
 
   def set_current_user_for_logs
     if current_user
-      Logster.add_to_env(request.env,"username",current_user.username)
+      Logster.add_to_env(request.env, "username", current_user.username)
       response.headers["X-Discourse-Username"] = current_user.username
     end
     response.headers["X-Discourse-Route"] = "#{controller_name}/#{action_name}"
   end
 
   def clear_notifications
-    if current_user && !Discourse.readonly_mode?
+    if current_user && !@readonly_mode
 
       cookie_notifications = cookies['cn'.freeze]
       notifications = request.headers['Discourse-Clear-Notifications'.freeze]
@@ -295,12 +310,12 @@ class ApplicationController < ActionController::Base
   end
 
   def current_homepage
-    current_user ? SiteSetting.homepage : SiteSetting.anonymous_homepage
+    current_user&.user_option&.homepage || SiteSetting.anonymous_homepage
   end
 
-  def serialize_data(obj, serializer, opts=nil)
+  def serialize_data(obj, serializer, opts = nil)
     # If it's an array, apply the serializer as an each_serializer to the elements
-    serializer_opts = {scope: guardian}.merge!(opts || {})
+    serializer_opts = { scope: guardian }.merge!(opts || {})
     if obj.respond_to?(:to_ary)
       serializer_opts[:each_serializer] = serializer
       ActiveModel::ArraySerializer.new(obj.to_ary, serializer_opts).as_json
@@ -313,11 +328,11 @@ class ApplicationController < ActionController::Base
   # 20% slower than calling MultiJSON.dump ourselves. I'm not sure why
   # Rails doesn't call MultiJson.dump when you pass it json: obj but
   # it seems we don't need whatever Rails is doing.
-  def render_serialized(obj, serializer, opts=nil)
+  def render_serialized(obj, serializer, opts = nil)
     render_json_dump(serialize_data(obj, serializer, opts), opts)
   end
 
-  def render_json_dump(obj, opts=nil)
+  def render_json_dump(obj, opts = nil)
     opts ||= {}
     if opts[:rest_serializer]
       obj['__rest_serializer'] = "1"
@@ -326,6 +341,7 @@ class ApplicationController < ActionController::Base
       end
 
       obj['extras'] = opts[:extras] if opts[:extras]
+      obj['meta'] = opts[:meta] if opts[:meta]
     end
 
     render json: MultiJson.dump(obj), status: opts[:status] || 200
@@ -341,7 +357,7 @@ class ApplicationController < ActionController::Base
     Middleware::AnonymousCache.anon_cache(request.env, time_length)
   end
 
-  def fetch_user_from_params(opts=nil, eager_load = [])
+  def fetch_user_from_params(opts = nil, eager_load = [])
     opts ||= {}
     user = if params[:username]
       username_lower = params[:username].downcase.chomp('.json')
@@ -361,9 +377,9 @@ class ApplicationController < ActionController::Base
   end
 
   def post_ids_including_replies
-    post_ids = params[:post_ids].map {|p| p.to_i}
+    post_ids = params[:post_ids].map { |p| p.to_i }
     if params[:reply_post_ids]
-      post_ids |= PostReply.where(post_id: params[:reply_post_ids].map {|p| p.to_i}).pluck(:reply_id)
+      post_ids |= PostReply.where(post_id: params[:reply_post_ids].map { |p| p.to_i }).pluck(:reply_id)
     end
     post_ids
   end
@@ -394,13 +410,16 @@ class ApplicationController < ActionController::Base
     end
   end
 
-
   def secure_session
     SecureSession.new(session["secure_session_id"] ||= SecureRandom.hex)
   end
 
   private
 
+    def check_readonly_mode
+      @readonly_mode = Discourse.readonly_mode?
+    end
+
     def locale_from_header
       begin
         # Rails I18n uses underscores between the locale and the region; the request
@@ -433,21 +452,25 @@ class ApplicationController < ActionController::Base
 
     def custom_html_json
       target = view_context.mobile_view? ? :mobile : :desktop
-      data = if @theme_key
-               {
-                top: Theme.lookup_field(@theme_key, target, "after_header"),
-                footer: Theme.lookup_field(@theme_key, target, "footer")
-               }
-             else
-                {}
-             end
+
+      data =
+        if @theme_key
+          {
+           top: Theme.lookup_field(@theme_key, target, "after_header"),
+           footer: Theme.lookup_field(@theme_key, target, "footer")
+          }
+        else
+          {}
+        end
 
       if DiscoursePluginRegistry.custom_html
         data.merge! DiscoursePluginRegistry.custom_html
       end
 
-      DiscoursePluginRegistry.html_builders.each do |name, blk|
-        data[name] = blk.call(self)
+      DiscoursePluginRegistry.html_builders.each do |name, _|
+        if name.start_with?("client:")
+          data[name.sub(/^client:/, '')] = DiscoursePluginRegistry.build_html(name, self)
+        end
       end
 
       MultiJson.dump(data)
@@ -480,9 +503,9 @@ class ApplicationController < ActionController::Base
     # opts:
     #   type   - a machine-readable description of the error
     #   status - HTTP status code to return
-    def render_json_error(obj, opts={})
+    def render_json_error(obj, opts = {})
       opts = { status: opts } if opts.is_a?(Integer)
-      render json: MultiJson.dump(create_errors_json(obj, opts[:type])), status: opts[:status] || 422
+      render json: MultiJson.dump(create_errors_json(obj, opts)), status: opts[:status] || 422
     end
 
     def success_json
@@ -493,7 +516,7 @@ class ApplicationController < ActionController::Base
       { failed: 'FAILED' }
     end
 
-    def json_result(obj, opts={})
+    def json_result(obj, opts = {})
       if yield(obj)
         json = success_json
 
@@ -564,31 +587,35 @@ class ApplicationController < ActionController::Base
         else
           # save original URL in a cookie (javascript redirects after login in this case)
           cookies[:destination_url] = destination_url
-          redirect_to :login
+          redirect_to "/login"
         end
       end
     end
 
     def block_if_readonly_mode
       return if request.fullpath.start_with?(path "/admin/backups")
-      raise Discourse::ReadOnly.new if !(request.get? || request.head?) && Discourse.readonly_mode?
+      raise Discourse::ReadOnly.new if !(request.get? || request.head?) && @readonly_mode
     end
 
-    def build_not_found_page(status=404, layout=false)
+    def build_not_found_page(status = 404, layout = false)
+      if SiteSetting.bootstrap_error_pages?
+        preload_json
+        layout = 'application' if layout == 'no_ember'
+      end
+
       category_topic_ids = Category.pluck(:topic_id).compact
       @container_class = "wrap not-found-container"
-      @top_viewed = TopicQuery.new(nil, {except_topic_ids: category_topic_ids}).list_top_for("monthly").topics.first(10)
-      @recent = Topic.where.not(id: category_topic_ids).recent(10)
+      @top_viewed = TopicQuery.new(nil, except_topic_ids: category_topic_ids).list_top_for("monthly").topics.first(10)
+      @recent = Topic.includes(:category).where.not(id: category_topic_ids).recent(10)
       @slug =  params[:slug].class == String ? params[:slug] : ''
       @slug =  (params[:id].class == String ? params[:id] : '') if @slug.blank?
-      @slug.tr!('-',' ')
+      @slug.tr!('-', ' ')
       render_to_string status: status, layout: layout, formats: [:html], template: '/exceptions/not_found'
     end
 
-
   protected
 
-    def render_post_json(post, add_raw=true)
+    def render_post_json(post, add_raw = true)
       post_serializer = PostSerializer.new(post, scope: guardian, root: false)
       post_serializer.add_raw = add_raw
 
diff --git a/app/controllers/badges_controller.rb b/app/controllers/badges_controller.rb
index 432489a3d4..7b11f78920 100644
--- a/app/controllers/badges_controller.rb
+++ b/app/controllers/badges_controller.rb
@@ -1,5 +1,5 @@
 class BadgesController < ApplicationController
-  skip_before_filter :check_xhr, only: [:index, :show]
+  skip_before_action :check_xhr, only: [:index, :show]
 
   def index
     raise Discourse::NotFound unless SiteSetting.enable_badges
@@ -14,7 +14,7 @@ class BadgesController < ApplicationController
     if (params[:only_listable] == "true") || !request.xhr?
       # NOTE: this is sorted client side if needed
       badges = badges.includes(:badge_grouping)
-                     .where(enabled: true, listable: true)
+        .where(enabled: true, listable: true)
 
     end
 
@@ -39,19 +39,26 @@ class BadgesController < ApplicationController
 
     params.require(:id)
     @badge = Badge.enabled.find(params[:id])
+    @rss_title = I18n.t('rss_description.badge', display_name: @badge.display_name, site_title: SiteSetting.title)
+    @rss_link = "#{Discourse.base_url}/badges/#{@badge.id}/#{@badge.slug}"
 
     if current_user
       user_badge = UserBadge.find_by(user_id: current_user.id, badge_id: @badge.id)
       if user_badge && user_badge.notification
         user_badge.notification.update_attributes read: true
       end
+      if user_badge
+        @badge.has_badge = true
+      end
     end
 
     serialized = MultiJson.dump(serialize_data(@badge, BadgeSerializer, root: "badge", include_long_description: true))
     respond_to do |format|
+      format.rss do
+        @rss_description = @badge.long_description
+      end
       format.html do
         store_preloaded "badge", serialized
-        render :show
       end
       format.json { render json: serialized }
     end
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index b7e85c72fe..56c49b9da9 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -2,10 +2,10 @@ require_dependency 'category_serializer'
 
 class CategoriesController < ApplicationController
 
-  before_filter :ensure_logged_in, except: [:index, :categories_and_latest, :show, :redirect, :find_by_slug]
-  before_filter :fetch_category, only: [:show, :update, :destroy]
-  before_filter :initialize_staff_action_logger, only: [:create, :update, :destroy]
-  skip_before_filter :check_xhr, only: [:index, :categories_and_latest, :redirect]
+  before_action :ensure_logged_in, except: [:index, :categories_and_latest, :show, :redirect, :find_by_slug]
+  before_action :fetch_category, only: [:show, :update, :destroy]
+  before_action :initialize_staff_action_logger, only: [:create, :update, :destroy]
+  skip_before_action :check_xhr, only: [:index, :categories_and_latest, :redirect]
 
   def redirect
     redirect_to path("/c/#{params[:path]}")
@@ -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
@@ -107,8 +107,9 @@ class CategoriesController < ApplicationController
 
     by_category.each do |cat, pos|
       cat.position = pos
-      cat.save if cat.position_changed?
+      cat.save! if cat.will_save_change_to_position?
     end
+
     render json: success_json
   end
 
@@ -154,7 +155,7 @@ class CategoriesController < ApplicationController
 
       old_permissions = cat.permissions_params
 
-      if result = cat.update_attributes(category_params)
+      if result = cat.update(category_params)
         Scheduler::Defer.later "Log staff action change category settings" do
           @staff_action_logger.log_category_settings_change(@category, category_params, old_permissions)
         end
@@ -218,7 +219,7 @@ class CategoriesController < ApplicationController
         end
 
         if p = params[:permissions]
-          p.each do |k,v|
+          p.each do |k, v|
             p[k] = v.to_i
           end
         end
@@ -232,6 +233,7 @@ class CategoriesController < ApplicationController
                         :position,
                         :email_in,
                         :email_in_allow_strangers,
+                        :mailinglist_mirror,
                         :suppress_from_homepage,
                         :all_topics_wiki,
                         :parent_category_id,
@@ -250,10 +252,10 @@ class CategoriesController < ApplicationController
                         :default_view,
                         :subcategory_list_style,
                         :default_top_period,
-                        :custom_fields => [params[:custom_fields].try(:keys)],
-                        :permissions => [*p.try(:keys)],
-                        :allowed_tags => [],
-                        :allowed_tag_groups => [])
+                        custom_fields: [params[:custom_fields].try(:keys)],
+                        permissions: [*p.try(:keys)],
+                        allowed_tags: [],
+                        allowed_tag_groups: [])
       end
     end
 
@@ -265,7 +267,7 @@ class CategoriesController < ApplicationController
       @staff_action_logger = StaffActionLogger.new(current_user)
     end
 
-    def include_topics(parent_category=nil)
+    def include_topics(parent_category = nil)
       view_context.mobile_view? ||
       params[:include_topics] ||
       (parent_category && parent_category.subcategory_list_includes_topics?) ||
diff --git a/app/controllers/category_hashtags_controller.rb b/app/controllers/category_hashtags_controller.rb
index e779391f37..e0b6f768d7 100644
--- a/app/controllers/category_hashtags_controller.rb
+++ b/app/controllers/category_hashtags_controller.rb
@@ -1,5 +1,5 @@
 class CategoryHashtagsController < ApplicationController
-  before_filter :ensure_logged_in
+  before_action :ensure_logged_in
 
   def check
     category_slugs = params[:category_slugs]
diff --git a/app/controllers/clicks_controller.rb b/app/controllers/clicks_controller.rb
index 4d7e186b0e..443196fe84 100644
--- a/app/controllers/clicks_controller.rb
+++ b/app/controllers/clicks_controller.rb
@@ -1,6 +1,6 @@
 class ClicksController < ApplicationController
 
-  skip_before_filter :check_xhr, :preload_json
+  skip_before_action :check_xhr, :preload_json
 
   def track
     raise Discourse::NotFound unless params[:url]
@@ -8,14 +8,19 @@ class ClicksController < ApplicationController
     params = track_params.merge(ip: request.remote_ip)
 
     if params[:topic_id].present? || params[:post_id].present?
-      params.merge!({ user_id: current_user.id }) if current_user.present?
+      params.merge!(user_id: current_user.id) if current_user.present?
       @redirect_url = TopicLinkClick.create_from(params)
     end
 
-    # Sometimes we want to record a link without a 302. Since XHR has to load the redirected
-    # URL we want it to not return a 302 in those cases.
-    if params[:redirect] == 'false' || @redirect_url.blank?
-      render nothing: true
+    # links in whispers aren't extracted, just allow the redirection to staff
+    if @redirect_url.blank? && current_user&.staff? && params[:post_id].present?
+      @redirect_url = params[:url] if Post.exists?(id: params[:post_id], post_type: Post.types[:whisper])
+    end
+
+    # Sometimes we want to record a link without a 302.
+    # Since XHR has to load the redirected URL we want it to not return a 302 in those cases.
+    if params[:redirect] == "false" || @redirect_url.blank?
+      render body: nil
     else
       redirect_to(@redirect_url)
     end
diff --git a/app/controllers/composer_controller.rb b/app/controllers/composer_controller.rb
new file mode 100644
index 0000000000..6eb78a5d06
--- /dev/null
+++ b/app/controllers/composer_controller.rb
@@ -0,0 +1,12 @@
+require_dependency 'html_to_markdown'
+
+class ComposerController < ApplicationController
+
+  before_action :ensure_logged_in
+
+  def parse_html
+    markdown_text = HtmlToMarkdown.new(params[:html]).to_markdown
+
+    render json: { markdown: markdown_text }
+  end
+end
diff --git a/app/controllers/composer_messages_controller.rb b/app/controllers/composer_messages_controller.rb
index ff1a51d2bd..60bc8a75ba 100644
--- a/app/controllers/composer_messages_controller.rb
+++ b/app/controllers/composer_messages_controller.rb
@@ -2,7 +2,7 @@ require_dependency 'composer_messages_finder'
 
 class ComposerMessagesController < ApplicationController
 
-  before_filter :ensure_logged_in
+  before_action :ensure_logged_in
 
   def index
     finder = ComposerMessagesFinder.new(current_user, params.slice(:composer_action, :topic_id, :post_id))
@@ -11,7 +11,7 @@ class ComposerMessagesController < ApplicationController
     if params[:topic_id].present?
       topic = Topic.where(id: params[:topic_id]).first
       if guardian.can_see?(topic)
-        json[:extras] = {duplicate_lookup: TopicLink.duplicate_lookup(topic)}
+        json[:extras] = { duplicate_lookup: TopicLink.duplicate_lookup(topic) }
       end
     end
 
diff --git a/app/controllers/directory_items_controller.rb b/app/controllers/directory_items_controller.rb
index 6158534b40..17f20ea338 100644
--- a/app/controllers/directory_items_controller.rb
+++ b/app/controllers/directory_items_controller.rb
@@ -23,10 +23,10 @@ class DirectoryItemsController < ApplicationController
 
     user_ids = nil
     if params[:name].present?
-      user_ids = UserSearch.new(params[:name]).search.pluck(:id)
+      user_ids = UserSearch.new(params[:name], include_staged_users: true).search.pluck(:id)
       if user_ids.present?
         # Add the current user if we have at least one other match
-        if current_user && result.dup.where(user_id: user_ids).count > 0
+        if current_user && result.dup.where(user_id: user_ids).exists?
           user_ids << current_user.id
         end
         result = result.where(user_id: user_ids)
@@ -47,13 +47,13 @@ class DirectoryItemsController < ApplicationController
     result_count = result.count
     result = result.limit(PAGE_SIZE).offset(PAGE_SIZE * page).to_a
 
-    more_params = params.slice(:period, :order, :asc)
+    more_params = params.slice(:period, :order, :asc).permit!
     more_params[:page] = page + 1
 
     # Put yourself at the top of the first page
     if result.present? && current_user.present? && page == 0
 
-      position = result.index {|r| r.user_id == current_user.id }
+      position = result.index { |r| r.user_id == current_user.id }
 
       # Don't show the record unless you're not in the top positions already
       if (position || 10) >= 10
diff --git a/app/controllers/draft_controller.rb b/app/controllers/draft_controller.rb
index 7af211db56..5734a0326a 100644
--- a/app/controllers/draft_controller.rb
+++ b/app/controllers/draft_controller.rb
@@ -1,11 +1,11 @@
 class DraftController < ApplicationController
-  before_filter :ensure_logged_in
+  before_action :ensure_logged_in
   # TODO really do we need to skip this?
-  skip_before_filter :check_xhr, :preload_json
+  skip_before_action :check_xhr, :preload_json
 
   def show
     seq = params[:sequence] || DraftSequence.current(current_user, params[:draft_key])
-    render json: {draft: Draft.get(current_user, params[:draft_key], seq), draft_sequence: seq}
+    render json: { draft: Draft.get(current_user, params[:draft_key], seq), draft_sequence: seq }
   end
 
   def update
diff --git a/app/controllers/email_controller.rb b/app/controllers/email_controller.rb
index 335afc4c67..9701cfc096 100644
--- a/app/controllers/email_controller.rb
+++ b/app/controllers/email_controller.rb
@@ -1,59 +1,50 @@
 class EmailController < ApplicationController
-  skip_before_filter :check_xhr, :preload_json, :redirect_to_login_if_required
+  skip_before_action :check_xhr, :preload_json, :redirect_to_login_if_required
   layout 'no_ember'
 
-  before_filter :ensure_logged_in, only: :preferences_redirect
+  before_action :ensure_logged_in, only: :preferences_redirect
 
   def preferences_redirect
     redirect_to(email_preferences_path(current_user.username_lower))
   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
@@ -61,28 +52,28 @@ class EmailController < ApplicationController
     if topic
       if params["unwatch_topic"]
         TopicUser.where(topic_id: topic.id, user_id: user.id)
-                 .update_all(notification_level: TopicUser.notification_levels[:tracking])
+          .update_all(notification_level: TopicUser.notification_levels[:tracking])
         updated = true
       end
 
       if params["unwatch_category"] && topic.category_id
         TopicUser.joins(:topic)
-                 .where(:user => user,
-                       :notification_level => TopicUser.notification_levels[:watching],
-                       "topics.category_id" => topic.category_id)
-                 .update_all(notification_level: TopicUser.notification_levels[:tracking])
+          .where(:user => user,
+                 :notification_level => TopicUser.notification_levels[:watching],
+                 "topics.category_id" => topic.category_id)
+          .update_all(notification_level: TopicUser.notification_levels[:tracking])
 
         CategoryUser.where(user_id: user.id,
-                          category_id: topic.category_id,
-                          notification_level: CategoryUser.watching_levels
+                           category_id: topic.category_id,
+                           notification_level: CategoryUser.watching_levels
                          )
-                 .destroy_all
+          .destroy_all
         updated = true
       end
 
       if params["mute_topic"]
         TopicUser.where(topic_id: topic.id, user_id: user.id)
-                 .update_all(notification_level: TopicUser.notification_levels[:muted])
+          .update_all(notification_level: TopicUser.notification_levels[:muted])
         updated = true
       end
     end
@@ -99,25 +90,27 @@ class EmailController < ApplicationController
 
     if params["unsubscribe_all"]
       user.user_option.update_columns(email_always: false,
-                                     email_digests: false,
-                                     email_direct: false,
-                                     email_private_messages: false)
+                                      email_digests: false,
+                                      email_direct: false,
+                                      email_private_messages: false)
       updated = true
     end
 
     unless updated
-      redirect_to :back
+      redirect_back fallback_location: path("/")
     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]
+    raise Discourse::NotFound if !User.find_by_email(params[:email])
     @topic = Topic.find_by(id: params[:topic_id].to_i) if params[:topic_id]
   end
 
diff --git a/app/controllers/embed_controller.rb b/app/controllers/embed_controller.rb
index f64cc8035c..fff17a578a 100644
--- a/app/controllers/embed_controller.rb
+++ b/app/controllers/embed_controller.rb
@@ -1,9 +1,9 @@
 class EmbedController < ApplicationController
-  skip_before_filter :check_xhr, :preload_json, :verify_authenticity_token
+  skip_before_action :check_xhr, :preload_json, :verify_authenticity_token
 
-  before_filter :ensure_embeddable, except: [ :info ]
-  before_filter :get_embeddable_css_class, except: [ :info ]
-  before_filter :ensure_api_request, only: [ :info ]
+  before_action :ensure_embeddable, except: [ :info ]
+  before_action :get_embeddable_css_class, except: [ :info ]
+  before_action :ensure_api_request, only: [ :info ]
 
   layout 'embed'
 
@@ -46,7 +46,6 @@ class EmbedController < ApplicationController
         @reply_count = @topic_view.topic.posts_count - 1
         @reply_count = 0 if @reply_count < 0
       end
-
     elsif embed_url.present?
       Jobs.enqueue(:retrieve_topic,
                       user_id: current_user.try(:id),
@@ -74,7 +73,7 @@ class EmbedController < ApplicationController
     by_url = {}
 
     if embed_urls.present?
-      urls = embed_urls.map {|u| u.sub(/#discourse-comments$/, '').sub(/\/$/, '') }
+      urls = embed_urls.map { |u| u.sub(/#discourse-comments$/, '').sub(/\/$/, '') }
       topic_embeds = TopicEmbed.where(embed_url: urls).includes(:topic).references(:topic)
 
       topic_embeds.each do |te|
@@ -88,7 +87,7 @@ class EmbedController < ApplicationController
       end
     end
 
-    render json: {counts: by_url}, callback: params[:callback]
+    render json: { counts: by_url }, callback: params[:callback]
   end
 
   private
@@ -96,7 +95,7 @@ class EmbedController < ApplicationController
     def get_embeddable_css_class
       @embeddable_css_class = ""
       embeddable_host = EmbeddableHost.record_for_url(request.referer)
-      @embeddable_css_class = " class=\"#{embeddable_host.class_name}\"" if embeddable_host.present? and embeddable_host.class_name.present?
+      @embeddable_css_class = " class=\"#{embeddable_host.class_name}\"" if embeddable_host.present? && embeddable_host.class_name.present?
     end
 
     def ensure_api_request
@@ -114,5 +113,4 @@ class EmbedController < ApplicationController
       raise Discourse::InvalidAccess.new('invalid referer host')
     end
 
-
 end
diff --git a/app/controllers/exceptions_controller.rb b/app/controllers/exceptions_controller.rb
index d5f21f8cb6..33cbad301b 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
+  skip_before_action :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/export_csv_controller.rb b/app/controllers/export_csv_controller.rb
index 8f407b92fa..4b74781dbd 100644
--- a/app/controllers/export_csv_controller.rb
+++ b/app/controllers/export_csv_controller.rb
@@ -1,6 +1,6 @@
 class ExportCsvController < ApplicationController
 
-  skip_before_filter :preload_json, :check_xhr, only: [:show]
+  skip_before_action :preload_json, :check_xhr, only: [:show]
 
   def export_entity
     guardian.ensure_can_export_entity!(export_params[:entity])
@@ -20,7 +20,7 @@ class ExportCsvController < ApplicationController
     if export_csv_path && current_user.present? && export_initiated_by_user_id == current_user.id
       send_file export_csv_path
     else
-      render nothing: true, status: 404
+      render body: nil, status: 404
     end
   end
 
@@ -29,7 +29,7 @@ class ExportCsvController < ApplicationController
     def export_params
       @_export_params ||= begin
         params.require(:entity)
-        params.permit(:entity, args: [:name, :start_date, :end_date, :category_id, :group_id, :trust_level])
+        params.permit(:entity, args: [:name, :start_date, :end_date, :category_id, :group_id, :trust_level]).to_h
       end
     end
 end
diff --git a/app/controllers/extra_locales_controller.rb b/app/controllers/extra_locales_controller.rb
index a3055b2add..bc8cf8c475 100644
--- a/app/controllers/extra_locales_controller.rb
+++ b/app/controllers/extra_locales_controller.rb
@@ -1,7 +1,7 @@
 class ExtraLocalesController < ApplicationController
 
   layout :false
-  skip_before_filter :check_xhr, :preload_json
+  skip_before_action :check_xhr, :preload_json
 
   def show
     bundle = params[:bundle]
@@ -32,6 +32,6 @@ class ExtraLocalesController < ApplicationController
       JS
     end
 
-    render text: js, content_type: "application/javascript"
+    render plain: js, content_type: "application/javascript"
   end
 end
diff --git a/app/controllers/finish_installation_controller.rb b/app/controllers/finish_installation_controller.rb
index c9a30724d4..848aa127f8 100644
--- a/app/controllers/finish_installation_controller.rb
+++ b/app/controllers/finish_installation_controller.rb
@@ -1,8 +1,8 @@
 class FinishInstallationController < ApplicationController
-  skip_before_filter :check_xhr, :preload_json, :redirect_to_login_if_required
+  skip_before_action :check_xhr, :preload_json, :redirect_to_login_if_required
   layout 'finish_installation'
 
-  before_filter :ensure_no_admins, except: ['confirm_email', 'resend_email']
+  before_action :ensure_no_admins, except: ['confirm_email', 'resend_email']
 
   def index
   end
@@ -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/forums_controller.rb b/app/controllers/forums_controller.rb
index 879fb27da7..00b1936628 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -1,8 +1,8 @@
 class ForumsController < ApplicationController
 
-  skip_before_filter :preload_json, :check_xhr
-  skip_before_filter :authorize_mini_profiler, only: [:status]
-  skip_before_filter :redirect_to_login_if_required, only: [:status]
+  skip_before_action :preload_json, :check_xhr
+  skip_before_action :authorize_mini_profiler, only: [:status]
+  skip_before_action :redirect_to_login_if_required, only: [:status]
 
   def status
     if $shutdown
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 292bfd104d..3fde94894c 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -1,15 +1,17 @@
 class GroupsController < ApplicationController
 
-  before_filter :ensure_logged_in, only: [
+  before_action :ensure_logged_in, only: [
     :set_notifications,
     :mentionable,
+    :messageable,
     :update,
     :messages,
     :histories,
-    :request_membership
+    :request_membership,
+    :search
   ]
 
-  skip_before_filter :preload_json, :check_xhr, only: [:posts_feed, :mentions_feed]
+  skip_before_action :preload_json, :check_xhr, only: [:posts_feed, :mentions_feed]
 
   def index
     unless SiteSetting.enable_group_directory?
@@ -20,9 +22,19 @@ 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)
 
+    if Group.preloaded_custom_field_names.present?
+      Group.preload_custom_fields(groups, Group.preloaded_custom_field_names)
+    end
+
     group_user_ids = GroupUser.where(group: groups, user: current_user).pluck(:group_id)
 
     render_json_dump(
@@ -57,13 +69,19 @@ class GroupsController < ApplicationController
 
   def posts
     group = find_group(:group_id)
-    posts = group.posts_for(guardian, params[:before_post_id]).limit(20)
+    posts = group.posts_for(
+      guardian,
+      params.permit(:before_post_id, :category_id)
+    ).limit(20)
     render_serialized posts.to_a, GroupPostSerializer
   end
 
   def posts_feed
     group = find_group(:group_id)
-    @posts = group.posts_for(guardian).limit(50)
+    @posts = group.posts_for(
+      guardian,
+      params.permit(:before_post_id, :category_id)
+    ).limit(50)
     @title = "#{SiteSetting.title} - #{I18n.t("rss_description.group_posts", group_name: group.name)}"
     @link = Discourse.base_url
     @description = I18n.t("rss_description.group_posts", group_name: group.name)
@@ -72,19 +90,30 @@ class GroupsController < ApplicationController
 
   def topics
     group = find_group(:group_id)
-    posts = group.posts_for(guardian, params[:before_post_id]).where(post_number: 1).limit(20)
+    posts = group.posts_for(
+      guardian,
+      params.permit(:before_post_id, :category_id)
+    ).where(post_number: 1).limit(20)
     render_serialized posts.to_a, GroupPostSerializer
   end
 
   def mentions
+    raise Discourse::NotFound unless SiteSetting.enable_mentions?
     group = find_group(:group_id)
-    posts = group.mentioned_posts_for(guardian, params[:before_post_id]).limit(20)
+    posts = group.mentioned_posts_for(
+      guardian,
+      params.permit(:before_post_id, :category_id)
+    ).limit(20)
     render_serialized posts.to_a, GroupPostSerializer
   end
 
   def mentions_feed
+    raise Discourse::NotFound unless SiteSetting.enable_mentions?
     group = find_group(:group_id)
-    @posts = group.mentioned_posts_for(guardian).limit(50)
+    @posts = group.mentioned_posts_for(
+      guardian,
+      params.permit(:before_post_id, :category_id)
+    ).limit(50)
     @title = "#{SiteSetting.title} - #{I18n.t("rss_description.group_mentions", group_name: group.name)}"
     @link = Discourse.base_url
     @description = I18n.t("rss_description.group_mentions", group_name: group.name)
@@ -94,7 +123,10 @@ class GroupsController < ApplicationController
   def messages
     group = find_group(:group_id)
     posts = if guardian.can_see_group_messages?(group)
-      group.messages_for(guardian, params[:before_post_id]).where(post_number: 1).limit(20).to_a
+      group.messages_for(
+        guardian,
+        params.permit(:before_post_id, :category_id)
+      ).where(post_number: 1).limit(20).to_a
     else
       []
     end
@@ -113,17 +145,19 @@ class GroupsController < ApplicationController
       order = "#{params[:order]} #{dir} NULLS LAST"
     end
 
-    total = group.users.count
-    members = group.users
+    users = group.users.human_users
+
+    total = users.count
+    members = users
       .order('NOT group_users.owner')
       .order(order)
-      .order(:username_lower => dir)
+      .order(username_lower: dir)
       .limit(limit)
       .offset(offset)
 
-    owners = group.users
+    owners = users
       .order(order)
-      .order(:username_lower => dir)
+      .order(username_lower: dir)
       .where('group_users.owner')
 
     render json: {
@@ -139,7 +173,7 @@ class GroupsController < ApplicationController
 
   def add_members
     group = Group.find(params[:id])
-    group.public ? ensure_logged_in : guardian.ensure_can_edit!(group)
+    group.public_admission ? ensure_logged_in : guardian.ensure_can_edit!(group)
 
     users =
       if params[:usernames].present?
@@ -147,7 +181,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'
@@ -156,7 +190,7 @@ class GroupsController < ApplicationController
 
     raise Discourse::NotFound if users.blank?
 
-    if group.public
+    if group.public_admission
       if !guardian.can_log_group_changes?(group) && current_user != users.first
         raise Discourse::InvalidAccess
       end
@@ -192,9 +226,19 @@ class GroupsController < ApplicationController
     end
   end
 
+  def messageable
+    group = find_group(:name)
+
+    if group
+      render json: { messageable: Group.messageable(current_user).where(id: group.id).present? }
+    else
+      raise Discourse::InvalidAccess.new
+    end
+  end
+
   def remove_member
     group = Group.find(params[:id])
-    group.public ? ensure_logged_in : guardian.ensure_can_edit!(group)
+    group.public_exit ? ensure_logged_in : guardian.ensure_can_edit!(group)
 
     user =
       if params[:user_id].present?
@@ -209,7 +253,7 @@ class GroupsController < ApplicationController
 
     raise Discourse::NotFound unless user
 
-    if group.public
+    if group.public_exit
       if !guardian.can_log_group_changes?(group) && current_user != user
         raise Discourse::InvalidAccess
       end
@@ -232,6 +276,8 @@ class GroupsController < ApplicationController
   end
 
   def request_membership
+    params.require(:reason)
+
     unless current_user.staff?
       RateLimiter.new(current_user, "request_group_membership", 1, 1.day).performed!
     end
@@ -248,7 +294,7 @@ class GroupsController < ApplicationController
 
     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),
+      raw: params[:reason],
       archetype: Archetype.private_message,
       target_usernames: usernames.join(','),
       skip_validations: true
@@ -267,8 +313,8 @@ class GroupsController < ApplicationController
     end
 
     GroupUser.where(group_id: group.id)
-             .where(user_id: user_id)
-             .update_all(notification_level: notification_level)
+      .where(user_id: user_id)
+      .update_all(notification_level: notification_level)
 
     render json: success_json
   end
@@ -290,6 +336,26 @@ 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
+
+    if Group.preloaded_custom_field_names.present?
+      Group.preload_custom_fields(groups, Group.preloaded_custom_field_names)
+    end
+
+    render_serialized(groups, BasicGroupSerializer)
+  end
+
   private
 
   def group_params
@@ -299,8 +365,10 @@ class GroupsController < ApplicationController
       :flair_color,
       :bio_raw,
       :full_name,
-      :public,
-      :allow_membership_requests
+      :public_admission,
+      :public_exit,
+      :allow_membership_requests,
+      :membership_request_template,
     )
   end
 
diff --git a/app/controllers/highlight_js_controller.rb b/app/controllers/highlight_js_controller.rb
index 86137be56e..31ba189e3b 100644
--- a/app/controllers/highlight_js_controller.rb
+++ b/app/controllers/highlight_js_controller.rb
@@ -1,5 +1,5 @@
 class HighlightJsController < ApplicationController
-  skip_before_filter :preload_json, :redirect_to_login_if_required, :check_xhr, :verify_authenticity_token, only: [:show]
+  skip_before_action :preload_json, :redirect_to_login_if_required, :check_xhr, :verify_authenticity_token, only: [:show]
 
   def show
 
@@ -22,8 +22,7 @@ class HighlightJsController < ApplicationController
       response.headers["Content-Length"] = highlight_js.bytesize.to_s
       immutable_for 1.year
 
-      render text: highlight_js, disposition: nil, content_type: 'application/javascript'
+      render plain: highlight_js, disposition: nil, content_type: 'application/javascript'
     end
   end
 end
-
diff --git a/app/controllers/inline_onebox_controller.rb b/app/controllers/inline_onebox_controller.rb
new file mode 100644
index 0000000000..c7f4e30f75
--- /dev/null
+++ b/app/controllers/inline_onebox_controller.rb
@@ -0,0 +1,10 @@
+require_dependency 'inline_oneboxer'
+
+class InlineOneboxController < ApplicationController
+  before_action :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 47b972d0d2..9bd0c0e391 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -2,13 +2,13 @@ require_dependency 'rate_limiter'
 
 class InvitesController < ApplicationController
 
-  skip_before_filter :check_xhr, except: [:perform_accept_invitation]
-  skip_before_filter :preload_json, except: [:show]
-  skip_before_filter :redirect_to_login_if_required
+  skip_before_action :check_xhr, except: [:perform_accept_invitation]
+  skip_before_action :preload_json, except: [:show]
+  skip_before_action :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]
-  before_filter :ensure_not_logged_in, only: [:show, :perform_accept_invitation]
+  before_action :ensure_logged_in, only: [:destroy, :create, :create_invite_link, :rescind_all_invites, :resend_invite, :resend_all_invites, :upload_csv]
+  before_action :ensure_new_registrations_allowed, only: [:show, :perform_accept_invitation]
+  before_action :ensure_not_logged_in, only: [:show, :perform_accept_invitation]
 
   def show
     expires_now
@@ -16,11 +16,12 @@ class InvitesController < ApplicationController
     invite = Invite.find_by(invite_key: params[:id])
 
     if invite.present?
-      store_preloaded("invite_info", MultiJson.dump({
+      store_preloaded("invite_info", MultiJson.dump(
         invited_by: UserNameSerializer.new(invite.invited_by, scope: guardian, root: false),
         email: invite.email,
-        username: UserNameSuggester.suggest(invite.email)
-      }))
+        username: UserNameSuggester.suggest(invite.email))
+      )
+
       render layout: 'application'
     else
       flash.now[:error] = I18n.t('invite.not_found')
@@ -30,12 +31,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 +62,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,23 +76,30 @@ 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
-      render json: {errors: [e.message]}, status: 422
+    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)
     guardian.ensure_can_invite_to!(topic) if topic.present?
 
+    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)
       return render json: failed_json, status: 422
@@ -101,7 +113,7 @@ class InvitesController < ApplicationController
         render json: failed_json, status: 422
       end
     rescue => e
-      render json: {errors: [e.message]}, status: 422
+      render json: { errors: [e.message] }, status: 422
     end
   end
 
@@ -112,7 +124,14 @@ class InvitesController < ApplicationController
     raise Discourse::InvalidParameters.new(:email) if invite.blank?
     invite.trash!(current_user)
 
-    render nothing: true
+    render body: nil
+  end
+
+  def rescind_all_invites
+    guardian.ensure_can_rescind_all_invites!(current_user)
+
+    Invite.rescind_all_invites_from(current_user)
+    render body: nil
   end
 
   def resend_invite
@@ -122,7 +141,7 @@ class InvitesController < ApplicationController
     invite = Invite.find_by(invited_by_id: current_user.id, email: params[:email])
     raise Discourse::InvalidParameters.new(:email) if invite.blank?
     invite.resend_invite
-    render nothing: true
+    render body: nil
 
   rescue RateLimiter::LimitExceeded
     render_json_error(I18n.t("rate_limiter.slow_down"))
@@ -132,7 +151,7 @@ class InvitesController < ApplicationController
     guardian.ensure_can_resend_all_invites!(current_user)
 
     Invite.resend_all_invites_from(current_user.id)
-    render nothing: true
+    render body: nil
   end
 
   def upload_csv
@@ -147,7 +166,7 @@ class InvitesController < ApplicationController
         data = if extension.downcase == ".csv"
           path = Invite.create_csv(file, name)
           Jobs.enqueue(:bulk_invite, filename: "#{name}#{extension}", current_user_id: current_user.id)
-          {url: path}
+          { url: path }
         else
           failed_json.merge(errors: [I18n.t("bulk_invite.file_should_be_csv")])
         end
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index f8ad2978ed..905f0077cb 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -3,9 +3,9 @@ require_dependency 'topic_list_responder'
 class ListController < ApplicationController
   include TopicListResponder
 
-  skip_before_filter :check_xhr
+  skip_before_action :check_xhr
 
-  before_filter :set_category, only: [
+  before_action :set_category, only: [
     :category_default,
     # filtered topics lists
     Discourse.filters.map { |f| :"category_#{f}" },
@@ -24,7 +24,7 @@ class ListController < ApplicationController
     :category_feed,
   ].flatten
 
-  before_filter :ensure_logged_in, except: [
+  before_action :ensure_logged_in, except: [
     :topics_by,
     # anonymous filters
     Discourse.anonymous_filters,
@@ -84,6 +84,7 @@ class ListController < ApplicationController
           else
             @title = I18n.t('js.filters.with_topics', filter: filter_title)
           end
+          @title << " - #{SiteSetting.title}"
         end
       end
 
@@ -123,7 +124,7 @@ class ListController < ApplicationController
 
   def topics_by
     list_opts = build_topic_list_options
-    target_user = fetch_user_from_params({ include_inactive: current_user.try(:staff?) }, [:user_stat, :user_option])
+    target_user = fetch_user_from_params({ include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts) }, [:user_stat, :user_option])
     list = generate_list_for("topics_by", target_user, list_opts)
     list.more_topics_url = url_for(construct_url_with(:next, list_opts))
     list.prev_topics_url = url_for(construct_url_with(:prev, list_opts))
@@ -182,11 +183,11 @@ 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}"
-    @topic_list = TopicQuery.new.list_new_in_category(@category)
+    @topic_list = TopicQuery.new(current_user).list_new_in_category(@category)
 
     render 'list', formats: [:rss]
   end
@@ -204,7 +205,7 @@ class ListController < ApplicationController
     render 'list', formats: [:rss]
   end
 
-  def top(options=nil)
+  def top(options = nil)
     options ||= {}
     period = ListController.best_period_for(current_user.try(:previous_visit_at), options[:category])
     send("top_#{period}", options)
@@ -240,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)
@@ -307,7 +308,7 @@ class ListController < ApplicationController
     parent_category_id = nil
     if parent_slug_or_id.present?
       parent_category_id = Category.query_parent_category(parent_slug_or_id)
-      permalink_redirect_or_not_found and return if parent_category_id.blank? && !id
+      permalink_redirect_or_not_found && (return) if parent_category_id.blank? && !id
     end
 
     @category = Category.query_category(slug_or_id, parent_category_id)
@@ -318,7 +319,7 @@ class ListController < ApplicationController
       (redirect_to category.url, status: 301) && return if category
     end
 
-    permalink_redirect_or_not_found and return if !@category
+    permalink_redirect_or_not_found && (return) if !@category
 
     @description_meta = @category.description_text
     raise Discourse::NotFound unless guardian.can_see?(@category)
@@ -330,6 +331,8 @@ class ListController < ApplicationController
 
   def build_topic_list_options
     options = {}
+    params[:page] = params[:page].to_i rescue 1
+
     TopicQuery.public_valid_options.each do |key|
       options[key] = params[key]
     end
@@ -361,23 +364,23 @@ class ListController < ApplicationController
     else # :next
       public_send(method, opts.merge(next_page_params(opts)))
     end
-    url.sub('.json?','?')
+    url.sub('.json?', '?')
   end
 
-  def get_excluded_category_ids(current_category=nil)
+  def get_excluded_category_ids(current_category = nil)
     exclude_category_ids = Category.where(suppress_from_homepage: true)
     exclude_category_ids = exclude_category_ids.where.not(id: current_category) if current_category
     exclude_category_ids.pluck(:id)
   end
 
-  def self.best_period_for(previous_visit_at, category_id=nil)
+  def self.best_period_for(previous_visit_at, category_id = nil)
     default_period = ((category_id && Category.where(id: category_id).pluck(:default_top_period).first) ||
           SiteSetting.top_page_default_timeframe).to_sym
 
     best_period_with_topics_for(previous_visit_at, category_id, default_period) || default_period
   end
 
-  def self.best_period_with_topics_for(previous_visit_at, category_id=nil, default_period=SiteSetting.top_page_default_timeframe)
+  def self.best_period_with_topics_for(previous_visit_at, category_id = nil, default_period = SiteSetting.top_page_default_timeframe)
     best_periods_for(previous_visit_at, default_period.to_sym).each do |period|
       top_topics = TopTopic.where("#{period}_score > 0")
       top_topics = top_topics.joins(:topic).where("topics.category_id = ?", category_id) if category_id
@@ -388,12 +391,12 @@ class ListController < ApplicationController
     false
   end
 
-  def self.best_periods_for(date, default_period=:all)
+  def self.best_periods_for(date, default_period = :all)
     date ||= 1.year.ago
     periods = []
     periods << default_period if :all     != default_period
-    periods << :daily         if :daily   != default_period && date >   8.days.ago
-    periods << :weekly        if :weekly  != default_period && date >  35.days.ago
+    periods << :daily         if :daily   != default_period && date > 8.days.ago
+    periods << :weekly        if :weekly  != default_period && date > 35.days.ago
     periods << :monthly       if :monthly != default_period && date > 180.days.ago
     periods << :yearly        if :yearly  != default_period
     periods
diff --git a/app/controllers/metadata_controller.rb b/app/controllers/metadata_controller.rb
index 04a5eaafd4..f8d75cfb3d 100644
--- a/app/controllers/metadata_controller.rb
+++ b/app/controllers/metadata_controller.rb
@@ -1,6 +1,6 @@
 class MetadataController < ApplicationController
   layout false
-  skip_before_filter :preload_json, :check_xhr, :redirect_to_login_if_required
+  skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required
 
   def manifest
     render json: default_manifest.to_json
@@ -13,6 +13,8 @@ class MetadataController < ApplicationController
   private
 
   def default_manifest
+    logo = SiteSetting.large_icon_url.presence || SiteSetting.logo_small_url.presence || SiteSetting.apple_touch_icon_url.presence
+
     manifest = {
       name: SiteSetting.title,
       short_name: SiteSetting.title,
@@ -23,15 +25,15 @@ class MetadataController < ApplicationController
       theme_color: "##{ColorScheme.hex_for_name('header_background')}",
       icons: [
         {
-          src: SiteSetting.apple_touch_icon_url,
-          sizes: "144x144",
+          src: logo,
+          sizes: "512x512",
           type: "image/png"
         }
       ]
     }
 
     if SiteSetting.native_app_install_banner
-      manifest = manifest.merge({
+      manifest = manifest.merge(
         prefer_related_applications: true,
         related_applications: [
           {
@@ -39,7 +41,7 @@ class MetadataController < ApplicationController
             id: "com.discourse"
           }
         ]
-      })
+      )
     end
 
     manifest
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 1415f78f57..bedfb6b515 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -2,7 +2,7 @@ require_dependency 'notification_serializer'
 
 class NotificationsController < ApplicationController
 
-  before_filter :ensure_logged_in
+  before_action :ensure_logged_in
 
   def index
     user =
@@ -37,9 +37,9 @@ class NotificationsController < ApplicationController
       offset = params[:offset].to_i
 
       notifications = Notification.where(user_id: user.id)
-                                  .visible
-                                  .includes(:topic)
-                                  .order(created_at: :desc)
+        .visible
+        .includes(:topic)
+        .order(created_at: :desc)
 
       total_rows = notifications.dup.count
       notifications = notifications.offset(offset).limit(60)
diff --git a/app/controllers/offline_controller.rb b/app/controllers/offline_controller.rb
new file mode 100644
index 0000000000..9ca5ac84cc
--- /dev/null
+++ b/app/controllers/offline_controller.rb
@@ -0,0 +1,8 @@
+class OfflineController < ApplicationController
+  layout false
+  skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required
+
+  def index
+    render :offline, content_type: 'text/html'
+  end
+end
diff --git a/app/controllers/onebox_controller.rb b/app/controllers/onebox_controller.rb
index c4e4fa47f4..15b99a7648 100644
--- a/app/controllers/onebox_controller.rb
+++ b/app/controllers/onebox_controller.rb
@@ -1,32 +1,35 @@
 require_dependency 'oneboxer'
 
 class OneboxController < ApplicationController
-  before_filter :ensure_logged_in
+  before_action :ensure_logged_in
 
   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])
+    return render(body: nil, status: 429) if Oneboxer.is_previewing?(current_user.id)
 
-    Oneboxer.preview_onebox!(params[:user_id])
+    user_id = current_user.id
+    invalidate = params[:refresh] == 'true'
+    url = params[:url]
 
-    preview = Oneboxer.preview(params[:url], invalidate_oneboxes: params[:refresh] == 'true')
-    preview.strip! if preview.present?
+    hijack do
+      Oneboxer.preview_onebox!(user_id)
 
-    Scheduler::Defer.later("Onebox previewed") {
-      Oneboxer.onebox_previewed!(params[:user_id])
-    }
+      preview = Oneboxer.preview(url, invalidate_oneboxes: invalidate)
+      preview.strip! if preview.present?
 
-    if preview.blank?
-      render nothing: true, status: 404
-    else
-      render plain: preview
+      Oneboxer.onebox_previewed!(user_id)
+
+      if preview.blank?
+        render body: nil, status: 404
+      else
+        render plain: preview
+      end
     end
   end
 
diff --git a/app/controllers/permalinks_controller.rb b/app/controllers/permalinks_controller.rb
index 05deaf0d6a..e88af68f5b 100644
--- a/app/controllers/permalinks_controller.rb
+++ b/app/controllers/permalinks_controller.rb
@@ -1,5 +1,5 @@
 class PermalinksController < ApplicationController
-  skip_before_filter :check_xhr, :preload_json
+  skip_before_action :check_xhr, :preload_json
 
   def show
     url = request.fullpath
diff --git a/app/controllers/post_action_users_controller.rb b/app/controllers/post_action_users_controller.rb
index 5ea95d3c32..e1bdf163df 100644
--- a/app/controllers/post_action_users_controller.rb
+++ b/app/controllers/post_action_users_controller.rb
@@ -6,17 +6,37 @@ class PostActionUsersController < ApplicationController
     params.require(:id)
     post_action_type_id = params[:post_action_type_id].to_i
 
+    page = params[:page].to_i
+    page_size = (params[:limit] || 200).to_i
+
     finder = Post.where(id: params[:id].to_i)
     finder = finder.with_deleted if guardian.is_staff?
 
     post = finder.first
     guardian.ensure_can_see!(post)
-    guardian.ensure_can_see_post_actors!(post.topic, post_action_type_id)
 
     post_actions = post.post_actions.where(post_action_type_id: post_action_type_id)
-                       .includes(:user)
-                       .order('post_actions.created_at asc')
+      .includes(:user)
+      .offset(page * page_size)
+      .order('post_actions.created_at asc')
+      .limit(page_size)
 
-    render_serialized(post_actions.to_a, PostActionUserSerializer, root: 'post_action_users')
+    if !guardian.can_see_post_actors?(post.topic, post_action_type_id)
+      if !current_user
+        raise Discourse::InvalidAccess
+      end
+      post_actions = post_actions.where(user_id: current_user.id)
+    end
+
+    action_type = PostActionType.types.key(post_action_type_id)
+    total_count = post["#{action_type}_count"]
+
+    data = { post_action_users: serialize_data(post_actions.to_a, PostActionUserSerializer) }
+
+    if total_count > page_size
+      data[:total_rows_post_action_users] = total_count
+    end
+
+    render_json_dump(data)
   end
 end
diff --git a/app/controllers/post_actions_controller.rb b/app/controllers/post_actions_controller.rb
index 3cef663c56..2bf6027ba2 100644
--- a/app/controllers/post_actions_controller.rb
+++ b/app/controllers/post_actions_controller.rb
@@ -1,9 +1,9 @@
 require_dependency 'discourse'
 
 class PostActionsController < ApplicationController
-  before_filter :ensure_logged_in
-  before_filter :fetch_post_from_params
-  before_filter :fetch_post_action_type_id_from_params
+  before_action :ensure_logged_in
+  before_action :fetch_post_from_params
+  before_action :fetch_post_action_type_id_from_params
 
   def create
     raise Discourse::NotFound if @post.blank?
@@ -13,8 +13,10 @@ class PostActionsController < ApplicationController
     guardian.ensure_post_can_act!(
       @post,
       PostActionType.types[@post_action_type_id],
-      is_warning: params[:is_warning],
-      taken_actions: taken
+      opts: {
+        is_warning: params[:is_warning],
+        taken_actions: taken
+      }
     )
 
     args = {}
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 5f74ecd57b..a091e7e69d 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -7,10 +7,9 @@ require_dependency 'new_post_result_serializer'
 
 class PostsController < ApplicationController
 
-  # Need to be logged in for all actions here
-  before_filter :ensure_logged_in, except: [:show, :replies, :by_number, :short_link, :reply_history, :revisions, :latest_revision, :expand_embed, :markdown_id, :markdown_num, :cooked, :latest, :user_posts_feed]
+  before_action :ensure_logged_in, except: [:show, :replies, :by_number, :short_link, :reply_history, :replyIids, :revisions, :latest_revision, :expand_embed, :markdown_id, :markdown_num, :cooked, :latest, :user_posts_feed]
 
-  skip_before_filter :preload_json, :check_xhr, only: [:markdown_id, :markdown_num, :short_link, :latest, :user_posts_feed]
+  skip_before_action :preload_json, :check_xhr, only: [:markdown_id, :markdown_num, :short_link, :latest, :user_posts_feed]
 
   def markdown_id
     markdown Post.find(params[:id].to_i)
@@ -41,23 +40,23 @@ class PostsController < ApplicationController
     if params[:id] == "private_posts"
       raise Discourse::NotFound if current_user.nil?
       posts = Post.private_posts
-                  .order(created_at: :desc)
-                  .where('posts.id <= ?', last_post_id)
-                  .where('posts.id > ?', last_post_id - 50)
-                  .includes(topic: :category)
-                  .includes(user: :primary_group)
-                  .includes(:reply_to_user)
-                  .limit(50)
+        .order(created_at: :desc)
+        .where('posts.id <= ?', last_post_id)
+        .where('posts.id > ?', last_post_id - 50)
+        .includes(topic: :category)
+        .includes(user: :primary_group)
+        .includes(:reply_to_user)
+        .limit(50)
       rss_description = I18n.t("rss_description.private_posts")
     else
       posts = Post.public_posts
-                  .order(created_at: :desc)
-                  .where('posts.id <= ?', last_post_id)
-                  .where('posts.id > ?', last_post_id - 50)
-                  .includes(topic: :category)
-                  .includes(user: :primary_group)
-                  .includes(:reply_to_user)
-                  .limit(50)
+        .order(created_at: :desc)
+        .where('posts.id <= ?', last_post_id)
+        .where('posts.id > ?', last_post_id - 50)
+        .includes(topic: :category)
+        .includes(user: :primary_group)
+        .includes(:reply_to_user)
+        .limit(50)
       rss_description = I18n.t("rss_description.posts")
     end
 
@@ -92,12 +91,12 @@ class PostsController < ApplicationController
     user = fetch_user_from_params
 
     posts = Post.public_posts
-                .where(user_id: user.id)
-                .where(post_type: Post.types[:regular])
-                .order(created_at: :desc)
-                .includes(:user)
-                .includes(topic: :category)
-                .limit(50)
+      .where(user_id: user.id)
+      .where(post_type: Post.types[:regular])
+      .order(created_at: :desc)
+      .includes(:user)
+      .includes(topic: :category)
+      .limit(50)
 
     posts = posts.reject { |post| !guardian.can_see?(post) || post.topic.blank? }
 
@@ -133,7 +132,6 @@ class PostsController < ApplicationController
   end
 
   def create
-
     @manager_params = create_params
     @manager_params[:first_post_checks] = !is_api?
 
@@ -225,25 +223,30 @@ class PostsController < ApplicationController
     render_serialized(post.reply_history(params[:max_replies].to_i, guardian), PostSerializer)
   end
 
+  def reply_ids
+    post = find_post_from_params
+    render json: post.reply_ids(guardian).to_json
+  end
+
   def destroy
     post = find_post_from_params
     RateLimiter.new(current_user, "delete_post", 3, 1.minute).performed! unless current_user.staff?
 
     if too_late_to(:delete_post, post)
-      render json: {errors: [I18n.t('too_late_to_edit')]}, status: 422
+      render json: { errors: [I18n.t('too_late_to_edit')] }, status: 422
       return
     end
 
     guardian.ensure_can_delete!(post)
 
-    destroyer = PostDestroyer.new(current_user, post, { context: params[:context] })
+    destroyer = PostDestroyer.new(current_user, post, context: params[:context])
     destroyer.destroy
 
-    render nothing: true
+    render body: nil
   end
 
   def expand_embed
-    render json: {cooked: TopicEmbed.expanded_for(find_post_from_params) }
+    render json: { cooked: TopicEmbed.expanded_for(find_post_from_params) }
   rescue
     render_json_error I18n.t('errors.embed.load_from_remote')
   end
@@ -266,13 +269,13 @@ class PostsController < ApplicationController
     raise Discourse::InvalidParameters.new(:post_ids) if posts.blank?
 
     # Make sure we can delete the posts
-    posts.each {|p| guardian.ensure_can_delete!(p) }
+    posts.each { |p| guardian.ensure_can_delete!(p) }
 
     Post.transaction do
-      posts.each {|p| PostDestroyer.new(current_user, p).destroy }
+      posts.each { |p| PostDestroyer.new(current_user, p).destroy }
     end
 
-    render nothing: true
+    render body: nil
   end
 
   def merge_posts
@@ -280,7 +283,7 @@ class PostsController < ApplicationController
     posts = Post.where(id: params[:post_ids]).order(:id)
     raise Discourse::InvalidParameters.new(:post_ids) if posts.pluck(:id) == params[:post_ids]
     PostMerger.new(current_user, posts).merge
-    render nothing: true
+    render body: nil
   end
 
   # Direct replies to this post
@@ -312,7 +315,7 @@ class PostsController < ApplicationController
     post.public_version -= 1
     post.save
 
-    render nothing: true
+    render body: nil
   end
 
   def show_revision
@@ -325,7 +328,7 @@ class PostsController < ApplicationController
     post.public_version += 1
     post.save
 
-    render nothing: true
+    render body: nil
   end
 
   def revert
@@ -365,6 +368,7 @@ class PostsController < ApplicationController
 
     post_serializer = PostSerializer.new(post, scope: guardian, root: false)
     post_serializer.draft_sequence = DraftSequence.current(current_user, topic.draft_key)
+
     link_counts = TopicLink.counts_for(guardian, topic, [post])
     post_serializer.single_post_link_counts = link_counts[post.id] if link_counts.present?
 
@@ -399,18 +403,18 @@ class PostsController < ApplicationController
     post = find_post_from_params
     guardian.ensure_can_wiki!(post)
 
-    post.revise(current_user, { wiki: params[:wiki] })
+    post.revise(current_user, wiki: params[:wiki])
 
-    render nothing: true
+    render body: nil
   end
 
   def post_type
     guardian.ensure_can_change_post_type!
 
     post = find_post_from_params
-    post.revise(current_user, { post_type: params[:post_type].to_i })
+    post.revise(current_user, post_type: params[:post_type].to_i)
 
-    render nothing: true
+    render body: nil
   end
 
   def rebake
@@ -419,7 +423,7 @@ class PostsController < ApplicationController
     post = find_post_from_params
     post.rebake!(invalidate_oneboxes: true)
 
-    render nothing: true
+    render body: nil
   end
 
   def unhide
@@ -429,7 +433,7 @@ class PostsController < ApplicationController
 
     post.unhide!
 
-    render nothing: true
+    render body: nil
   end
 
   def flagged_posts
@@ -441,11 +445,11 @@ class PostsController < ApplicationController
     limit = [(params[:limit] || 60).to_i, 100].min
 
     posts = user_posts(guardian, user.id, offset: offset, limit: limit)
-              .where(id: PostAction.where(post_action_type_id: PostActionType.notify_flag_type_ids)
+      .where(id: PostAction.where(post_action_type_id: PostActionType.notify_flag_type_ids)
                                    .where(disagreed_at: nil)
                                    .select(:post_id))
 
-    render_serialized(posts, AdminPostSerializer)
+    render_serialized(posts, AdminUserActionSerializer)
   end
 
   def deleted_posts
@@ -458,7 +462,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
@@ -479,7 +483,6 @@ class PostsController < ApplicationController
     render json: json_obj, status: (!!success) ? 200 : 422
   end
 
-
   def find_post_revision_from_params
     post_id = params[:id] || params[:post_id]
     revision = params[:revision].to_i
@@ -529,9 +532,9 @@ class PostsController < ApplicationController
 
   def user_posts(guardian, user_id, opts)
     posts = Post.includes(:user, :topic, :deleted_by, :user_actions)
-                .where(user_id: user_id)
-                .with_deleted
-                .order(created_at: :desc)
+      .where(user_id: user_id)
+      .with_deleted
+      .order(created_at: :desc)
 
     if guardian.user.moderator?
 
@@ -545,7 +548,7 @@ class PostsController < ApplicationController
     end
 
     posts.offset(opts[:offset])
-         .limit(opts[:limit])
+      .limit(opts[:limit])
   end
 
   def create_params
@@ -562,6 +565,10 @@ class PostsController < ApplicationController
       :visible
     ]
 
+    if Post.permitted_create_params.present?
+      permitted.concat(Post.permitted_create_params.to_a)
+    end
+
     # param munging for WordPress
     params[:auto_track] = !(params[:auto_track].to_s == "false") if params[:auto_track]
     params[:visible] = (params[:unlist_topic].to_s == "false") if params[:unlist_topic]
@@ -571,6 +578,9 @@ class PostsController < ApplicationController
       params[:skip_validations] = params[:skip_validations].to_s == "true"
       permitted << :skip_validations
 
+      params[:import_mode] = params[:import_mode].to_s == "true"
+      permitted << :import_mode
+
       # We allow `embed_url` via the API
       permitted << :embed_url
 
@@ -609,20 +619,25 @@ class PostsController < ApplicationController
 
     if usernames = result[:target_usernames]
       usernames = usernames.split(",")
-      groups = Group.mentionable(current_user).where('name in (?)', usernames).pluck('name')
+      groups = Group.messageable(current_user).where('name in (?)', usernames).pluck('name')
       usernames -= groups
+      emails = usernames.select { |user| user.match(/@/) }
+      usernames -= emails
       result[:target_usernames] = usernames.join(",")
+      result[:target_emails] = emails.join(",")
       result[:target_group_names] = groups.join(",")
     end
 
-    result
+    result.permit!
+    result.to_h
   end
 
   def signature_for(args)
     "post##" << Digest::SHA1.hexdigest(args
+      .to_h
       .to_a
       .concat([["user", current_user.id]])
-      .sort{|x,y| x[0] <=> y[0]}.join do |x,y|
+      .sort { |x, y| x[0] <=> y[0] }.join do |x, y|
         "#{x}:#{y}"
       end)
   end
@@ -651,8 +666,11 @@ class PostsController < ApplicationController
     finder = finder.with_deleted if current_user.try(:staff?)
     post = finder.first
     raise Discourse::NotFound unless post
+
     # load deleted topic
     post.topic = Topic.with_deleted.find(post.topic_id) if current_user.try(:staff?)
+    raise Discourse::NotFound unless post.topic
+
     guardian.ensure_can_see!(post)
     post
   end
diff --git a/app/controllers/queued_posts_controller.rb b/app/controllers/queued_posts_controller.rb
index 6b225b5e65..3360b41f7b 100644
--- a/app/controllers/queued_posts_controller.rb
+++ b/app/controllers/queued_posts_controller.rb
@@ -2,7 +2,7 @@ require_dependency 'queued_post_serializer'
 
 class QueuedPostsController < ApplicationController
 
-  before_filter :ensure_staff
+  before_action :ensure_staff
 
   def index
     state = QueuedPost.states[(params[:state] || 'new').to_sym]
@@ -20,10 +20,19 @@ class QueuedPostsController < ApplicationController
   def update
     qp = QueuedPost.where(id: params[:id]).first
 
-    if params[:queued_post][:raw].present?
-      qp.update_column(:raw, params[:queued_post][:raw])
+    return render_json_error I18n.t('queue.not_found') if qp.blank?
+
+    update_params = params[:queued_post]
+
+    qp.raw = update_params[:raw] if update_params[:raw].present?
+    unless qp.topic_id
+      qp.post_options['title'] = update_params[:title] if update_params[:title].present?
+      qp.post_options['category'] = update_params[:category_id].to_i if update_params[:category_id].present?
+      qp.post_options['tags'] = update_params[:tags] if update_params[:tags].present?
     end
 
+    qp.save(validate: false)
+
     state = params[:queued_post][:state]
     begin
       if state == 'approved'
@@ -41,18 +50,17 @@ class QueuedPostsController < ApplicationController
     render_serialized(qp, QueuedPostSerializer, root: :queued_posts)
   end
 
-
   private
 
     def user_deletion_opts
       base = {
-        context:           I18n.t('queue.delete_reason', {performed_by: current_user.username}),
+        context:           I18n.t('queue.delete_reason', performed_by: current_user.username),
         delete_posts:      true,
         delete_as_spammer: true
       }
 
       if Rails.env.production? && ENV["Staging"].nil?
-        base.merge!({block_email: true, block_ip: true})
+        base.merge!(block_email: true, block_ip: true)
       end
 
       base
diff --git a/app/controllers/robots_txt_controller.rb b/app/controllers/robots_txt_controller.rb
index 0919c254bd..4a8600774c 100644
--- a/app/controllers/robots_txt_controller.rb
+++ b/app/controllers/robots_txt_controller.rb
@@ -1,6 +1,6 @@
 class RobotsTxtController < ApplicationController
   layout false
-  skip_before_filter :preload_json, :check_xhr, :redirect_to_login_if_required
+  skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required
 
   def index
     path = SiteSetting.allow_index_in_robots_txt ? :index : :no_index
diff --git a/app/controllers/safe_mode_controller.rb b/app/controllers/safe_mode_controller.rb
index e52161cff2..0a0b6ab4ed 100644
--- a/app/controllers/safe_mode_controller.rb
+++ b/app/controllers/safe_mode_controller.rb
@@ -1,6 +1,6 @@
 class SafeModeController < ApplicationController
   layout 'no_ember'
-  skip_before_filter :preload_json, :check_xhr
+  skip_before_action :preload_json, :check_xhr
 
   def index
   end
@@ -14,6 +14,7 @@ class SafeModeController < ApplicationController
     if safe_mode.length > 0
       redirect_to path("/?safe_mode=#{safe_mode.join("%2C")}")
     else
+      flash[:must_select] = true
       redirect_to safe_mode_path
     end
   end
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index a88f578093..ad74f59574 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -2,7 +2,7 @@ require_dependency 'search'
 
 class SearchController < ApplicationController
 
-  skip_before_filter :check_xhr, only: :show
+  skip_before_action :check_xhr, only: :show
 
   def self.valid_context_types
     %w{user topic category private_messages}
@@ -13,7 +13,10 @@ class SearchController < ApplicationController
       type_filter: 'topic',
       guardian: guardian,
       include_blurbs: true,
-      blurb_length: 300
+      blurb_length: 300,
+      page: if params[:page].to_i <= 10
+              [params[:page].to_i, 1].max
+            end
     }
 
     context, type = lookup_search_context
@@ -22,7 +25,12 @@ class SearchController < ApplicationController
       search_args[:type_filter] = type if type
     end
 
-    search = Search.new(params[:q], search_args)
+    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_term = params[:q]
+    search = Search.new(@search_term, search_args)
     result = search.execute
 
     result.find_user_data(guardian) if result
@@ -37,7 +45,6 @@ class SearchController < ApplicationController
         render_json_dump(serializer)
       end
     end
-
   end
 
   def query
@@ -49,17 +56,51 @@ 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)
+
+    search_result_type = params[:search_result_type].downcase.to_sym
+    if SearchLog.search_result_types.has_key?(search_result_type)
+      attributes = { id: params[:search_log_id] }
+      if current_user.present?
+        attributes[:user_id] = current_user.id
+      else
+        attributes[:ip_address] = request.remote_ip
+      end
+
+      if search_result_type == :tag
+        search_result_id = Tag.find_by_name(params[:search_result_id])&.id
+      else
+        search_result_id = params[:search_result_id]
+      end
+
+      SearchLog.where(attributes).update_all(
+        search_result_type: SearchLog.search_result_types[search_result_type],
+        search_result_id: search_result_id
+      )
+    end
+
+    render json: success_json
+  end
+
   protected
 
   def lookup_search_context
@@ -69,7 +110,7 @@ class SearchController < ApplicationController
     search_context = params[:search_context]
     unless search_context
       if (context = params[:context]) && (id = params[:context_id])
-        search_context = {type: context, id: id}
+        search_context = { type: context, id: id }
       end
     end
 
@@ -79,7 +120,7 @@ class SearchController < ApplicationController
 
       # A user is found by username
       context_obj = nil
-      if ['user','private_messages'].include? search_context[:type]
+      if ['user', 'private_messages'].include? search_context[:type]
         context_obj = User.find_by(username_lower: search_context[:id].downcase)
       elsif 'category' == search_context[:type]
         context_obj = Category.find_by(id: search_context[:id].to_i)
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index 96259d430d..e96566fd25 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -2,14 +2,19 @@ require_dependency 'rate_limiter'
 require_dependency 'single_sign_on'
 
 class SessionController < ApplicationController
+  class LocalLoginNotAllowed < StandardError; end
+  rescue_from LocalLoginNotAllowed do
+    render body: nil, status: 500
+  end
 
-  skip_before_filter :redirect_to_login_if_required
-  skip_before_filter :preload_json, :check_xhr, only: ['sso', 'sso_login', 'become', 'sso_provider', 'destroy']
+  before_action :check_local_login_allowed, only: %i(create forgot_password)
+  skip_before_action :redirect_to_login_if_required
+  skip_before_action :preload_json, :check_xhr, only: ['sso', 'sso_login', 'become', 'sso_provider', 'destroy']
 
   ACTIVATE_USER_KEY = "activate_user"
 
   def csrf
-    render json: {csrf: form_authenticity_token }
+    render json: { csrf: form_authenticity_token }
   end
 
   def sso
@@ -31,11 +36,11 @@ class SessionController < ApplicationController
       end
       redirect_to sso.to_url
     else
-      render nothing: true, status: 404
+      render body: nil, status: 404
     end
   end
 
-  def sso_provider(payload=nil)
+  def sso_provider(payload = nil)
     payload ||= request.query_string
     if SiteSetting.enable_sso_provider
       sso = SingleSignOn.parse(payload, SiteSetting.sso_secret)
@@ -46,6 +51,7 @@ class SessionController < ApplicationController
         sso.external_id = current_user.id.to_s
         sso.admin = current_user.admin?
         sso.moderator = current_user.moderator?
+        sso.groups = current_user.groups.pluck(:name)
 
         if sso.return_sso_url.blank?
           render plain: "return_sso_url is blank, it must be provided", status: 400
@@ -62,7 +68,7 @@ class SessionController < ApplicationController
         redirect_to path('/login')
       end
     else
-      render nothing: true, status: 404
+      render body: nil, status: 404
     end
   end
 
@@ -101,6 +107,11 @@ class SessionController < ApplicationController
     begin
       if user = sso.lookup_or_create_user(request.remote_ip)
 
+        if user.suspended?
+          render_sso_error(text: I18n.t("login.suspended", date: user.suspended_till), status: 403)
+          return
+        end
+
         if SiteSetting.must_approve_users? && !user.approved?
           if SiteSetting.sso_not_approved_url.present?
             redirect_to SiteSetting.sso_not_approved_url
@@ -112,7 +123,7 @@ class SessionController < ApplicationController
           activation = UserActivator.new(user, request, session, cookies)
           activation.finish
           session["user_created_message"] = activation.message
-          redirect_to users_account_created_path and return
+          redirect_to(users_account_created_path) && (return)
         else
           if SiteSetting.verbose_sso_logging
             Rails.logger.warn("Verbose SSO log: User was logged on #{user.username}\n\n#{sso.diagnostics}")
@@ -164,10 +175,10 @@ class SessionController < ApplicationController
 
     rescue => e
       message = "Failed to create or lookup user: #{e}."
-      message << "\n\n" << "-" * 100 << "\n\n"
-      message << sso.diagnostics
-      message << "\n\n" << "-" * 100 << "\n\n"
-      message << e.backtrace.join("\n")
+      message << "  "
+      message << "  #{sso.diagnostics}"
+      message << "  "
+      message << "  #{e.backtrace.join("\n")}"
 
       Rails.logger.error(message)
 
@@ -176,12 +187,6 @@ class SessionController < ApplicationController
   end
 
   def create
-
-    unless allow_local_auth?
-      render nothing: true, status: 500
-      return
-    end
-
     RateLimiter.new(nil, "login-hr-#{request.remote_ip}", SiteSetting.max_logins_per_ip_per_hour, 1.hour).performed!
     RateLimiter.new(nil, "login-min-#{request.remote_ip}", SiteSetting.max_logins_per_ip_per_minute, 1.minute).performed!
 
@@ -234,11 +239,6 @@ class SessionController < ApplicationController
   def forgot_password
     params.require(:login)
 
-    unless allow_local_auth?
-      render nothing: true, status: 500
-      return
-    end
-
     RateLimiter.new(nil, "forgot-password-hr-#{request.remote_ip}", 6, 1.hour).performed!
     RateLimiter.new(nil, "forgot-password-min-#{request.remote_ip}", 3, 1.minute).performed!
 
@@ -253,7 +253,7 @@ class SessionController < ApplicationController
     end
 
     json = { result: "ok" }
-    unless SiteSetting.forgot_password_strict
+    unless SiteSetting.hide_email_address_taken
       json[:user_found] = user_presence
     end
 
@@ -267,7 +267,7 @@ class SessionController < ApplicationController
     if current_user.present?
       render_serialized(current_user, CurrentUserSerializer)
     else
-      render nothing: true, status: 404
+      render body: nil, status: 404
     end
   end
 
@@ -275,28 +275,32 @@ class SessionController < ApplicationController
     reset_session
     log_off_user
     if request.xhr?
-      render nothing: true
+      render body: nil
     else
       redirect_to (params[:return_url] || path("/"))
     end
   end
 
-  private
+  protected
 
-  def allow_local_auth?
-    !SiteSetting.enable_sso && SiteSetting.enable_local_logins
+  def check_local_login_allowed
+    if SiteSetting.enable_sso || !SiteSetting.enable_local_logins
+      raise LocalLoginNotAllowed, "SSO takes over local login or the local login is disallowed."
+    end
   end
 
+  private
+
   def login_not_approved_for?(user)
     SiteSetting.must_approve_users? && !user.approved? && !user.admin?
   end
 
   def invalid_credentials
-    render json: {error: I18n.t("login.incorrect_username_email_or_password")}
+    render json: { error: I18n.t("login.incorrect_username_email_or_password") }
   end
 
   def login_not_approved
-    render json: {error: I18n.t("login.not_approved")}
+    render json: { error: I18n.t("login.not_approved") }
   end
 
   def not_activated(user)
@@ -310,19 +314,19 @@ class SessionController < ApplicationController
   end
 
   def not_allowed_from_ip_address(user)
-    render json: {error: I18n.t("login.not_allowed_from_ip_address", username: user.username)}
+    render json: { error: I18n.t("login.not_allowed_from_ip_address", username: user.username) }
   end
 
   def admin_not_allowed_from_ip_address(user)
-    render json: {error: I18n.t("login.admin_not_allowed_from_ip_address", username: user.username)}
+    render json: { error: I18n.t("login.admin_not_allowed_from_ip_address", username: user.username) }
   end
 
   def failed_to_login(user)
     message = user.suspend_reason ? "login.suspended_with_reason" : "login.suspended"
 
     render json: {
-      error: I18n.t(message, { date: I18n.l(user.suspended_till, format: :date_only),
-                               reason: Rack::Utils.escape_html(user.suspend_reason) }),
+      error: I18n.t(message, date: I18n.l(user.suspended_till, format: :date_only),
+                             reason: Rack::Utils.escape_html(user.suspend_reason)),
       reason: 'suspended'
     }
   end
@@ -333,11 +337,11 @@ class SessionController < ApplicationController
 
     if payload = session.delete(:sso_payload)
       sso_provider(payload)
+    else
+      render_serialized(user, UserSerializer)
     end
-    render_serialized(user, UserSerializer)
   end
 
-
   def render_sso_error(status:, text:)
     @sso_error = text
     render status: status, layout: 'no_ember'
diff --git a/app/controllers/similar_topics_controller.rb b/app/controllers/similar_topics_controller.rb
index 1f0a84d84f..e6249cb4d4 100644
--- a/app/controllers/similar_topics_controller.rb
+++ b/app/controllers/similar_topics_controller.rb
@@ -16,25 +16,16 @@ class SimilarTopicsController < ApplicationController
   end
 
   def index
-    params.require(:title)
-    params.require(:raw)
-    title, raw = params[:title], params[:raw]
-    invalid_length = [:title, :raw].any? { |key| check_invalid_length(key, params[key]) }
+    title = params.require(:title)
+    raw = params[:raw]
 
-    # Only suggest similar topics if the site has a minimum amount of topics present
-    # and params are long enough.
-    return render json: [] if invalid_length || !Topic.count_exceeds_minimum?
+    if title.length < SiteSetting.min_title_similar_length || !Topic.count_exceeds_minimum?
+      return render json: []
+    end
 
     topics = Topic.similar_to(title, raw, current_user).to_a
-    topics.map! {|t| SimilarTopic.new(t) }
+    topics.map! { |t| SimilarTopic.new(t) }
     render_serialized(topics, SimilarTopicSerializer, root: :similar_topics, rest_serializer: true)
   end
 
-  protected
-
-    def check_invalid_length(key, attr)
-      str = (key == :raw) ? "body" : key.to_s
-      attr.length < SiteSetting.send("min_#{str}_similar_length")
-    end
-
 end
diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 587c9c7934..1e622449c9 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -2,8 +2,8 @@ require_dependency 'site_serializer'
 
 class SiteController < ApplicationController
   layout false
-  skip_before_filter :preload_json, :check_xhr
-  skip_before_filter :redirect_to_login_if_required, only: ['basic_info', 'statistics']
+  skip_before_action :preload_json, :check_xhr
+  skip_before_action :redirect_to_login_if_required, only: ['basic_info', 'statistics']
 
   def site
     render json: Site.json_for(guardian)
@@ -34,7 +34,7 @@ class SiteController < ApplicationController
       title: SiteSetting.title,
       description: SiteSetting.site_description
     }
-    results[:mobile_logo_url] = SiteSetting.mobile_logo_url if SiteSetting.mobile_logo_url.present?
+    results[:mobile_logo_url] = SiteSetting.mobile_logo_url.presence
 
     DiscourseHub.stats_fetched_at = Time.zone.now if request.user_agent == "Discourse Hub"
 
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index 1c88edee1e..993200edb3 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -3,8 +3,9 @@ require_dependency 'file_helper'
 
 class StaticController < ApplicationController
 
-  skip_before_filter :check_xhr, :redirect_to_login_if_required
-  skip_before_filter :verify_authenticity_token, only: [:brotli_asset, :cdn_asset, :enter, :favicon]
+  skip_before_action :check_xhr, :redirect_to_login_if_required
+  skip_before_action :verify_authenticity_token, only: [:brotli_asset, :cdn_asset, :enter, :favicon, :service_worker_asset]
+  skip_before_action :preload_json, only: [:brotli_asset, :cdn_asset, :enter, :favicon, :service_worker_asset]
 
   PAGES_WITH_EMAIL_PARAM = ['login', 'password_reset', 'signup']
 
@@ -13,9 +14,9 @@ class StaticController < ApplicationController
     return redirect_to path('/login') if SiteSetting.login_required? && current_user.nil? && (params[:id] == 'faq' || params[:id] == 'guidelines')
 
     map = {
-      "faq" => {redirect: "faq_url", topic_id: "guidelines_topic_id"},
-      "tos" => {redirect: "tos_url", topic_id: "tos_topic_id"},
-      "privacy" => {redirect: "privacy_policy_url", topic_id: "privacy_topic_id"}
+      "faq" => { redirect: "faq_url", topic_id: "guidelines_topic_id" },
+      "tos" => { redirect: "tos_url", topic_id: "tos_topic_id" },
+      "privacy" => { redirect: "privacy_policy_url", topic_id: "privacy_topic_id" }
     }
 
     @page = params[:id]
@@ -35,7 +36,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]
@@ -100,34 +101,36 @@ class StaticController < ApplicationController
   # a huge expiry, we also cache these assets in nginx so it bypassed if needed
   def favicon
 
-    data = DistributedMemoizer.memoize('favicon' + SiteSetting.favicon_url, 60*30) do
-      begin
-        file = FileHelper.download(
-          SiteSetting.favicon_url,
-          max_file_size: 50.kilobytes,
-          tmp_file_name: "favicon.png",
-          follow_redirect: true
-        )
-        data = file.read
-        file.unlink
-        data
-      rescue => e
-        AdminDashboardData.add_problem_message('dashboard.bad_favicon_url', 1800)
-        Rails.logger.debug("Invalid favicon_url #{SiteSetting.favicon_url}: #{e}\n#{e.backtrace}")
-        ""
+    hijack do
+      data = DistributedMemoizer.memoize('favicon' + SiteSetting.favicon_url, 60 * 30) do
+        begin
+          file = FileHelper.download(
+            SiteSetting.favicon_url,
+            max_file_size: 50.kilobytes,
+            tmp_file_name: "favicon.png",
+            follow_redirect: true
+          )
+          data = file.read
+          file.unlink
+          data
+        rescue => e
+          AdminDashboardData.add_problem_message('dashboard.bad_favicon_url', 1800)
+          Rails.logger.debug("Invalid favicon_url #{SiteSetting.favicon_url}: #{e}\n#{e.backtrace}")
+          ""
+        end
       end
-    end
 
-    if data.bytesize == 0
-      @@default_favicon ||= File.read(Rails.root + "public/images/default-favicon.png")
-      response.headers["Content-Length"] = @@default_favicon.bytesize.to_s
-      render text: @@default_favicon, content_type: "image/png"
-    else
-      immutable_for 1.year
-      response.headers["Expires"] = 1.year.from_now.httpdate
-      response.headers["Content-Length"] = data.bytesize.to_s
-      response.headers["Last-Modified"] = Time.new('2000-01-01').httpdate
-      render text: data, content_type: "image/png"
+      if data.bytesize == 0
+        @@default_favicon ||= File.read(Rails.root + "public/images/default-favicon.png")
+        response.headers["Content-Length"] = @@default_favicon.bytesize.to_s
+        render body: @@default_favicon, content_type: "image/png"
+      else
+        immutable_for 1.year
+        response.headers["Expires"] = 1.year.from_now.httpdate
+        response.headers["Content-Length"] = data.bytesize.to_s
+        response.headers["Last-Modified"] = Time.new('2000-01-01').httpdate
+        render body: data, content_type: "image/png"
+      end
     end
   end
 
@@ -137,21 +140,34 @@ class StaticController < ApplicationController
     end
   end
 
-
   def cdn_asset
     serve_asset
   end
 
+  def service_worker_asset
+    respond_to do |format|
+      format.js do
+
+        # we take 1 hour to give a new service worker to all users
+        immutable_for 1.hour
+
+        render(
+          plain: Rails.application.assets_manifest.find_sources('service-worker.js').first,
+          content_type: 'application/javascript'
+        )
+      end
+    end
+  end
+
   protected
 
-  def serve_asset(suffix=nil)
+  def serve_asset(suffix = nil)
 
     path = File.expand_path(Rails.root + "public/assets/#{params[:path]}#{suffix}")
 
     # SECURITY what if path has /../
     raise Discourse::NotFound unless path.start_with?(Rails.root.to_s + "/public/assets")
 
-
     response.headers["Expires"] = 1.year.from_now.httpdate
     response.headers["Access-Control-Allow-Origin"] = params[:origin] if params[:origin]
 
diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb
index 005d2d7d78..ebfd4b530d 100644
--- a/app/controllers/steps_controller.rb
+++ b/app/controllers/steps_controller.rb
@@ -4,9 +4,9 @@ require_dependency 'wizard/step_updater'
 
 class StepsController < ApplicationController
 
-  before_filter :ensure_wizard_enabled
-  before_filter :ensure_logged_in
-  before_filter :ensure_admin
+  before_action :ensure_wizard_enabled
+  before_action :ensure_logged_in
+  before_action :ensure_admin
 
   def update
     wizard = Wizard::Builder.new(current_user).build
@@ -20,7 +20,7 @@ class StepsController < ApplicationController
     else
       errors = []
       updater.errors.messages.each do |field, msg|
-        errors << {field: field, description: msg.join }
+        errors << { field: field, description: msg.join }
       end
       render json: { errors: errors }, status: 422
     end
diff --git a/app/controllers/stylesheets_controller.rb b/app/controllers/stylesheets_controller.rb
index dea3d5d34c..32b1f8be8e 100644
--- a/app/controllers/stylesheets_controller.rb
+++ b/app/controllers/stylesheets_controller.rb
@@ -1,5 +1,5 @@
 class StylesheetsController < ApplicationController
-  skip_before_filter :preload_json, :redirect_to_login_if_required, :check_xhr, :verify_authenticity_token, only: [:show, :show_source_map]
+  skip_before_action :preload_json, :redirect_to_login_if_required, :check_xhr, :verify_authenticity_token, only: [:show, :show_source_map]
 
   def show_source_map
     show_resource(source_map: true)
@@ -19,17 +19,17 @@ class StylesheetsController < ApplicationController
 
     no_cookies
 
-    target,digest = params[:name].split(/_([a-f0-9]{40})/)
+    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
       if target.include?("theme")
-        split_target,theme_id = target.split(/_(-?[0-9]+)/)
+        split_target, theme_id = target.split(/_(-?[0-9]+)/)
         theme = Theme.find(theme_id) if theme_id
       else
-        split_target,color_scheme_id = target.split(/_(-?[0-9]+)/)
+        split_target, color_scheme_id = target.split(/_(-?[0-9]+)/)
         theme = Theme.find_by(color_scheme_id: color_scheme_id)
       end
       Stylesheet::Manager.stylesheet_link_tag(split_target, nil, theme&.key)
@@ -56,10 +56,9 @@ class StylesheetsController < ApplicationController
     end
 
     if cache_time && stylesheet_time && stylesheet_time <= cache_time
-      return render nothing: true, status: 304
+      return render body: nil, status: 304
     end
 
-
     unless File.exist?(location)
       if current = query.limit(1).pluck(source_map ? :source_map : :content).first
         File.write(location, current)
@@ -90,4 +89,3 @@ class StylesheetsController < ApplicationController
   end
 
 end
-
diff --git a/app/controllers/tag_groups_controller.rb b/app/controllers/tag_groups_controller.rb
index 783839fd4d..b55120954e 100644
--- a/app/controllers/tag_groups_controller.rb
+++ b/app/controllers/tag_groups_controller.rb
@@ -1,7 +1,7 @@
 class TagGroupsController < ApplicationController
-  skip_before_filter :check_xhr, only: [:index, :show]
-  before_filter :ensure_logged_in, except: [:index, :show]
-  before_filter :fetch_tag_group, only: [:show, :update, :destroy]
+  skip_before_action :check_xhr, only: [:index, :show]
+  before_action :ensure_logged_in, except: [:index, :show]
+  before_action :fetch_tag_group, only: [:show, :update, :destroy]
 
   def index
     tag_groups = TagGroup.order('name ASC').includes(:parent_tag).preload(:tags).all
@@ -69,7 +69,7 @@ class TagGroupsController < ApplicationController
     end
 
     def tag_groups_params
-      result = params.permit(:id, :name, :one_per_topic, :tag_names => [], :parent_tag_name => [])
+      result = params.permit(:id, :name, :one_per_topic, tag_names: [], parent_tag_name: [])
       result[:tag_names] ||= []
       result[:parent_tag_name] ||= []
       result[:one_per_topic] = (params[:one_per_topic] == "true")
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 0af8be70a6..54115945e0 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -5,27 +5,27 @@ require_dependency 'topic_query'
 class TagsController < ::ApplicationController
   include TopicListResponder
 
-  before_filter :ensure_tags_enabled
+  before_action :ensure_tags_enabled
 
-  skip_before_filter :check_xhr, only: [:tag_feed, :show, :index]
-  before_filter :ensure_logged_in, except: [
+  skip_before_action :check_xhr, only: [:tag_feed, :show, :index]
+  before_action :ensure_logged_in, except: [
     :index,
     :show,
     :tag_feed,
     :search,
     :check_hashtag,
-    Discourse.anonymous_filters.map { |f| :"show_#{f}"}
+    Discourse.anonymous_filters.map { |f| :"show_#{f}" }
   ].flatten
-  before_filter :set_category_from_params, except: [:index, :update, :destroy, :tag_feed, :search, :notifications, :update_notifications]
+  before_action :set_category_from_params, except: [:index, :update, :destroy, :tag_feed, :search, :notifications, :update_notifications]
 
   def index
     categories = Category.where("id in (select category_id from category_tags)")
-                         .where("id in (?)", guardian.allowed_category_ids)
-                         .preload(:tags)
+      .where("id in (?)", guardian.allowed_category_ids)
+      .preload(:tags)
     category_tag_counts = categories.map do |c|
       h = Tag.category_tags_by_count_query(c, limit: 300).count(Tag::COUNT_ARG)
-      h.merge!(c.tags.where.not(name: h.keys).inject({}) { |sum,t| sum[t.name] = 0; sum }) # unused tags
-      {id: c.id, tags: self.class.tag_counts_json(h)}
+      h.merge!(c.tags.where.not(name: h.keys).inject({}) { |sum, t| sum[t.name] = 0; sum }) # unused tags
+      { id: c.id, tags: self.class.tag_counts_json(h) }
     end
 
     tag_counts = self.class.tags_by_count(guardian, limit: 300).count(Tag::COUNT_ARG)
@@ -49,8 +49,8 @@ class TagsController < ::ApplicationController
 
   Discourse.filters.each do |filter|
     define_method("show_#{filter}") do
-      @tag_id = params[:tag_id]
-      @additional_tags = params[:additional_tag_ids].to_s.split('/')
+      @tag_id = params[:tag_id].force_encoding("UTF-8")
+      @additional_tags = params[:additional_tag_ids].to_s.split('/').map { |t| t.force_encoding("UTF-8") }
 
       list_opts = build_topic_list_options
 
@@ -67,7 +67,7 @@ class TagsController < ::ApplicationController
       @title = @description_meta
 
       path_name = url_method(params.slice(:category, :parent_category))
-      canonical_url "#{Discourse.base_url_no_prefix}#{public_send(path_name, *(params.slice(:parent_category, :category, :tag_id).values))}"
+      canonical_url "#{Discourse.base_url_no_prefix}#{public_send(path_name, *(params.slice(:parent_category, :category, :tag_id).values.map { |t| t.force_encoding("UTF-8") }))}"
 
       if @list.topics.size == 0 && params[:tag_id] != 'none' && !Tag.where(name: @tag_id).exists?
         permalink_redirect_or_not_found
@@ -91,7 +91,7 @@ class TagsController < ::ApplicationController
     tag.name = new_tag_name
     if tag.save
       StaffActionLogger.new(current_user).log_custom('renamed_tag', previous_value: params[:tag_id], new_value: new_tag_name)
-      render json: { tag: { id: new_tag_name }}
+      render json: { tag: { id: new_tag_name } }
     else
       render_json_error tag.errors.full_messages
     end
@@ -100,8 +100,11 @@ class TagsController < ::ApplicationController
   def destroy
     guardian.ensure_can_admin_tags!
     tag_name = params[:tag_id]
+    tag = Tag.find_by_name(tag_name)
+    raise Discourse::NotFound if tag.nil?
+
     TopicCustomField.transaction do
-      Tag.find_by_name(tag_name).destroy
+      tag.destroy
       StaffActionLogger.new(current_user).log_custom('deleted_tag', subject: tag_name)
     end
     render json: success_json
@@ -116,7 +119,7 @@ class TagsController < ::ApplicationController
     @title = "#{SiteSetting.title} - #{@description}"
     @atom_link = "#{Discourse.base_url}/tags/#{tag_id}.rss"
 
-    query = TopicQuery.new(current_user, {tags: [tag_id]})
+    query = TopicQuery.new(current_user, tags: [tag_id])
     latest_results = query.latest_results
     @topic_list = query.create_list(:by_tag, {}, latest_results)
 
@@ -129,21 +132,19 @@ class TagsController < ::ApplicationController
     tags_with_counts = DiscourseTagging.filter_allowed_tags(
       Tag.tags_by_count_query(params.slice(:limit)),
       guardian,
-      {
-        for_input: params[:filterForInput],
-        term: params[:q],
-        category: category,
-        selected_tags: params[:selected_tags]
-      }
+      for_input: params[:filterForInput],
+      term: params[:q],
+      category: category,
+      selected_tags: params[:selected_tags]
     )
 
-    tags = tags_with_counts.count(Tag::COUNT_ARG).map {|t, c| { id: t, text: t, count: c } }
+    tags = tags_with_counts.count(Tag::COUNT_ARG).map { |t, c| { id: t, text: t, count: c } }
 
     json_response = { results: tags }
 
-    if Tag.where(name: params[:q]).exists? && !tags.find { |h| h[:id] == t }
+    if Tag.where(name: params[:q]).exists? && !tags.find { |h| h[:id] == params[:q] }
       # filter_allowed_tags determined that the tag entered is not allowed
-      json_response[:forbidden] = t
+      json_response[:forbidden] = params[:q]
     end
 
     render json: json_response
@@ -153,7 +154,7 @@ class TagsController < ::ApplicationController
     tag = Tag.find_by_name(params[:tag_id])
     raise Discourse::NotFound unless tag
     level = tag.tag_users.where(user: current_user).first.try(:notification_level) || TagUser.notification_levels[:regular]
-    render json: { tag_notification: { id: params[:tag_id], notification_level: level.to_i } }
+    render json: { tag_notification: { id: tag.name, notification_level: level.to_i } }
   end
 
   def update_notifications
@@ -161,7 +162,7 @@ class TagsController < ::ApplicationController
     raise Discourse::NotFound unless tag
     level = params[:tag_notification][:notification_level].to_i
     TagUser.change(current_user.id, tag.id, level)
-    render json: {notification_level: level}
+    render json: { notification_level: level }
   end
 
   def check_hashtag
@@ -180,12 +181,12 @@ class TagsController < ::ApplicationController
       raise Discourse::NotFound unless SiteSetting.tagging_enabled?
     end
 
-    def self.tags_by_count(guardian, opts={})
+    def self.tags_by_count(guardian, opts = {})
       guardian.filter_allowed_categories(Tag.tags_by_count_query(opts))
     end
 
     def self.tag_counts_json(tag_counts)
-      tag_counts.map {|t, c| { id: t, text: t, count: c } }
+      tag_counts.map { |t, c| { id: t, text: t, count: c } }
     end
 
     def set_category_from_params
@@ -201,13 +202,13 @@ class TagsController < ::ApplicationController
         parent_category_id = nil
         if parent_slug_or_id.present?
           parent_category_id = Category.query_parent_category(parent_slug_or_id)
-          category_redirect_or_not_found and return if parent_category_id.blank?
+          category_redirect_or_not_found && (return) if parent_category_id.blank?
         end
 
         @filter_on_category = Category.query_category(slug_or_id, parent_category_id)
       end
 
-      category_redirect_or_not_found and return if !@filter_on_category
+      category_redirect_or_not_found && (return) if !@filter_on_category
 
       guardian.ensure_can_see!(@filter_on_category)
     end
@@ -236,7 +237,7 @@ class TagsController < ::ApplicationController
       end
     end
 
-    def url_method(opts={})
+    def url_method(opts = {})
       if opts[:parent_category] && opts[:category]
         "tag_parent_category_category_#{action_name}_path"
       elsif opts[:category]
@@ -254,7 +255,7 @@ class TagsController < ::ApplicationController
       else # :next
         public_send(method, opts.merge(next_page_params(opts)))
       end
-      url.sub('.json?','?')
+      url.sub('.json?', '?')
     end
 
     def build_topic_list_options
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 0a75ffd98d..fa241cb543 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -6,7 +6,7 @@ require_dependency 'discourse_event'
 require_dependency 'rate_limiter'
 
 class TopicsController < ApplicationController
-  before_filter :ensure_logged_in, only: [:timings,
+  before_action :ensure_logged_in, only: [:timings,
                                           :destroy_timings,
                                           :update,
                                           :star,
@@ -32,15 +32,15 @@ class TopicsController < ApplicationController
                                           :convert_topic,
                                           :bookmark]
 
-  before_filter :consider_user_for_promotion, only: :show
+  before_action :consider_user_for_promotion, only: :show
 
-  skip_before_filter :check_xhr, only: [:show, :unsubscribe, :feed]
+  skip_before_action :check_xhr, only: [:show, :unsubscribe, :feed]
 
   def id_for_slug
     topic = Topic.find_by(slug: params[:slug].downcase)
     guardian.ensure_can_see!(topic)
     raise Discourse::NotFound unless topic
-    render json: {slug: topic.slug, topic_id: topic.id, url: topic.url}
+    render json: { slug: topic.slug, topic_id: topic.id, url: topic.url }
   end
 
   def show
@@ -67,7 +67,7 @@ class TopicsController < ApplicationController
     # up that particular number
     if params[:id] && params[:id] =~ /^\d+[^\d\\]+$/
       topic = Topic.find_by(slug: params[:id].downcase)
-      return redirect_to_correct_topic(topic, opts[:post_number]) if topic && topic.visible
+      return redirect_to_correct_topic(topic, opts[:post_number]) if topic
     end
 
     if opts[:print]
@@ -75,7 +75,7 @@ class TopicsController < ApplicationController
       begin
         RateLimiter.new(current_user, "print-topic-per-hour", SiteSetting.max_prints_per_hour_per_user, 1.hour).performed! unless @guardian.is_admin?
       rescue RateLimiter::LimitExceeded
-        render_json_error(I18n.t("rate_limiter.slow_down"))
+        return render_json_error I18n.t("rate_limiter.slow_down")
       end
     end
 
@@ -84,7 +84,7 @@ class TopicsController < ApplicationController
     rescue Discourse::NotFound
       if params[:id]
         topic = Topic.find_by(slug: params[:id].downcase)
-        return redirect_to_correct_topic(topic, opts[:post_number]) if topic && topic.visible
+        return redirect_to_correct_topic(topic, opts[:post_number]) if topic
       end
       raise Discourse::NotFound
     end
@@ -96,10 +96,6 @@ class TopicsController < ApplicationController
 
     discourse_expires_in 1.minute
 
-    if !@topic_view.topic.visible && @topic_view.topic.slug != params[:slug] && !request.format.json?
-      raise Discourse::NotFound
-    end
-
     if slugs_do_not_match || (!request.format.json? && params[:slug].nil?)
       redirect_to_correct_topic(@topic_view.topic, opts[:post_number])
       return
@@ -155,7 +151,6 @@ class TopicsController < ApplicationController
       TopicUser.change(current_user.id, params[:topic_id].to_i, notification_level: TopicUser.notification_levels[:muted])
     end
 
-
     perform_show_response
   end
 
@@ -164,7 +159,8 @@ class TopicsController < ApplicationController
     params.require(:topic_id)
     params.permit(:min_trust_level, :min_score, :min_replies, :bypass_trust_level_score, :only_moderator_liked)
 
-    opts = { best: params[:best].to_i,
+    opts = {
+      best: params[:best].to_i,
       min_trust_level: params[:min_trust_level] ? params[:min_trust_level].to_i : 1,
       min_score: params[:min_score].to_i,
       min_replies: params[:min_replies].to_i,
@@ -206,24 +202,23 @@ class TopicsController < ApplicationController
     guardian.ensure_can_see!(@topic)
 
     @posts = Post.where(hidden: false, deleted_at: nil, topic_id: @topic.id)
-        .where('posts.id in (?)', post_ids)
-        .joins("LEFT JOIN users u on u.id = posts.user_id")
-        .pluck(:id, :cooked, :username)
-        .map do |post_id, cooked, username|
-          {
-            post_id: post_id,
-            username: username,
-            excerpt: PrettyText.excerpt(cooked, 800, keep_emoji_images: true)
-          }
-         end
-
+      .where('posts.id in (?)', post_ids)
+      .joins("LEFT JOIN users u on u.id = posts.user_id")
+      .pluck(:id, :cooked, :username)
+      .map do |post_id, cooked, username|
+        {
+          post_id: post_id,
+          username: username,
+          excerpt: PrettyText.excerpt(cooked, 800, keep_emoji_images: true)
+        }
+      end
 
     render json: @posts.to_json
   end
 
   def destroy_timings
     PostTiming.destroy_for(current_user.id, [params[:topic_id].to_i])
-    render nothing: true
+    render body: nil
   end
 
   def update
@@ -239,6 +234,7 @@ class TopicsController < ApplicationController
     changes.delete(:category_id) if topic.category_id.to_i == changes[:category_id].to_i
 
     success = true
+
     if changes.length > 0
       first_post = topic.ordered_posts.first
       success = PostRevisor.new(first_post, topic).revise!(current_user, changes, validate_post: false)
@@ -266,7 +262,7 @@ class TopicsController < ApplicationController
     params.require(:enabled)
     params.permit(:until)
 
-    status  = params[:status]
+    status = params[:status]
     topic_id = params[:topic_id].to_i
     enabled = params[:enabled] == 'true'
 
@@ -291,7 +287,7 @@ class TopicsController < ApplicationController
   end
 
   def timer
-    params.permit(:time, :timezone_offset, :based_on_last_post, :category_id)
+    params.permit(:time, :based_on_last_post, :category_id)
     params.require(:status_type)
 
     status_type =
@@ -306,7 +302,6 @@ class TopicsController < ApplicationController
 
     options = {
       by_user: current_user,
-      timezone_offset: params[:timezone_offset]&.to_i,
       based_on_last_post: params[:based_on_last_post]
     }
 
@@ -319,13 +314,13 @@ class TopicsController < ApplicationController
     )
 
     if topic.save
-      render json: success_json.merge!({
+      render json: success_json.merge!(
         execute_at: topic_status_update&.execute_at,
         duration: topic_status_update&.duration,
         based_on_last_post: topic_status_update&.based_on_last_post,
         closed: topic.closed,
         category_id: topic_status_update&.category_id
-      })
+      )
     else
       render_json_error(topic)
     end
@@ -337,7 +332,7 @@ class TopicsController < ApplicationController
 
     topic.make_banner!(current_user)
 
-    render nothing: true
+    render body: nil
   end
 
   def remove_banner
@@ -346,20 +341,20 @@ class TopicsController < ApplicationController
 
     topic.remove_banner!(current_user)
 
-    render nothing: true
+    render body: nil
   end
 
   def remove_bookmarks
     topic = Topic.find(params[:topic_id].to_i)
 
     PostAction.joins(:post)
-              .where(user_id: current_user.id)
-              .where('topic_id = ?', topic.id).each do |pa|
+      .where(user_id: current_user.id)
+      .where('topic_id = ?', topic.id).each do |pa|
 
       PostAction.remove_act(current_user, pa.post, PostActionType.types[:bookmark])
     end
 
-    render nothing: true
+    render body: nil
   end
 
   def archive_message
@@ -378,7 +373,7 @@ class TopicsController < ApplicationController
     group_ids = current_user.groups.pluck(:id)
     if group_ids.present?
       allowed_groups = topic.allowed_groups
-                          .where('topic_allowed_groups.group_id IN (?)', group_ids).pluck(:id)
+        .where('topic_allowed_groups.group_id IN (?)', group_ids).pluck(:id)
       allowed_groups.each do |id|
         if archive
           GroupArchivedMessage.archive!(id, topic.id)
@@ -401,7 +396,7 @@ class TopicsController < ApplicationController
       name = Group.find_by(id: group_id).try(:name)
       render_json_dump(group_name: name)
     else
-      render nothing: true
+      render body: nil
     end
   end
 
@@ -413,7 +408,7 @@ class TopicsController < ApplicationController
 
     PostAction.act(current_user, first_post, PostActionType.types[:bookmark])
 
-    render nothing: true
+    render body: nil
   end
 
   def destroy
@@ -421,9 +416,9 @@ class TopicsController < ApplicationController
     guardian.ensure_can_delete!(topic)
 
     first_post = topic.ordered_posts.first
-    PostDestroyer.new(current_user, first_post, { context: params[:context] }).destroy
+    PostDestroyer.new(current_user, first_post, context: params[:context]).destroy
 
-    render nothing: true
+    render body: nil
   end
 
   def recover
@@ -433,19 +428,20 @@ class TopicsController < ApplicationController
     first_post = topic.posts.with_deleted.order(:post_number).first
     PostDestroyer.new(current_user, first_post).recover
 
-    render nothing: true
+    render body: nil
   end
 
   def excerpt
-    render nothing: true
+    render body: nil
   end
 
   def remove_allowed_user
     params.require(:username)
     topic = Topic.find_by(id: params[:topic_id])
-    guardian.ensure_can_remove_allowed_users!(topic)
+    user = User.find_by(username: params[:username])
+    guardian.ensure_can_remove_allowed_users!(topic, user)
 
-    if topic.remove_allowed_user(current_user, params[:username])
+    if topic.remove_allowed_user(current_user, user)
       render json: success_json
     else
       render json: failed_json, status: 422
@@ -484,8 +480,13 @@ 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])
@@ -499,7 +500,7 @@ class TopicsController < ApplicationController
         render json: failed_json, status: 422
       end
     rescue Topic::UserExists => e
-      render json: {errors: [e.message]}, status: 422
+      render json: { errors: [e.message] }, status: 422
     end
   end
 
@@ -541,10 +542,10 @@ class TopicsController < ApplicationController
     guardian.ensure_can_change_post_owner!
 
     begin
-      PostOwnerChanger.new( post_ids: params[:post_ids].to_a,
-                            topic_id: params[:topic_id].to_i,
-                            new_owner: User.find_by(username: params[:username]),
-                            acting_user: current_user ).change_owner!
+      PostOwnerChanger.new(post_ids: params[:post_ids].to_a,
+                           topic_id: params[:topic_id].to_i,
+                           new_owner: User.find_by(username: params[:username]),
+                           acting_user: current_user).change_owner!
       render json: success_json
     rescue ArgumentError
       render json: failed_json, status: 422
@@ -573,25 +574,25 @@ class TopicsController < ApplicationController
     topic = Topic.find_by(id: params[:topic_id].to_i)
     guardian.ensure_can_see!(topic)
     topic.clear_pin_for(current_user)
-    render nothing: true
+    render body: nil
   end
 
   def re_pin
     topic = Topic.find_by(id: params[:topic_id].to_i)
     guardian.ensure_can_see!(topic)
     topic.re_pin_for(current_user)
-    render nothing: true
+    render body: nil
   end
 
   def timings
     PostTiming.process_timings(
       current_user,
-      params[:topic_id].to_i,
-      params[:topic_time].to_i,
-      (params[:timings] || []).map{|post_number, t| [post_number.to_i, t.to_i]},
-      {mobile: view_context.mobile_view?}
+      topic_params[:topic_id].to_i,
+      topic_params[:topic_time].to_i,
+      (topic_params[:timings].to_h || {}).map { |post_number, t| [post_number.to_i, t.to_i] },
+      mobile: view_context.mobile_view?
     )
-    render nothing: true
+    render body: nil
   end
 
   def feed
@@ -602,7 +603,7 @@ class TopicsController < ApplicationController
 
   def bulk
     if params[:topic_ids].present?
-      topic_ids = params[:topic_ids].map {|t| t.to_i}
+      topic_ids = params[:topic_ids].map { |t| t.to_i }
     elsif params[:filter] == 'unread'
       tq = TopicQuery.new(current_user)
       topics = TopicQuery.unread_filter(tq.joined_topic_user, current_user.id, staff: guardian.is_staff?).listable_topics
@@ -612,7 +613,10 @@ class TopicsController < ApplicationController
       raise ActionController::ParameterMissing.new(:topic_ids)
     end
 
-    operation = params.require(:operation).symbolize_keys
+    operation = params.require(:operation)
+    operation.permit!
+    operation = operation.to_h.symbolize_keys
+
     raise ActionController::ParameterMissing.new(:operation_type) if operation[:type].blank?
     operator = TopicsBulkAction.new(current_user, topic_ids, operation, group: operation[:group])
     changed_topic_ids = operator.perform!
@@ -621,7 +625,7 @@ class TopicsController < ApplicationController
 
   def reset_new
     current_user.user_stat.update_column(:new_since, Time.now)
-    render nothing: true
+    render body: nil
   end
 
   def convert_topic
@@ -642,12 +646,20 @@ class TopicsController < ApplicationController
 
   private
 
+  def topic_params
+    params.permit(
+      :topic_id,
+      :topic_time,
+      timings: {}
+    )
+  end
+
   def toggle_mute
     @topic = Topic.find_by(id: params[:topic_id].to_i)
     guardian.ensure_can_see!(@topic)
 
     @topic.toggle_mute(current_user)
-    render nothing: true
+    render body: nil
   end
 
   def consider_user_for_promotion
@@ -658,7 +670,7 @@ class TopicsController < ApplicationController
     params[:slug] && @topic_view.topic.slug != params[:slug]
   end
 
-  def redirect_to_correct_topic(topic, post_number=nil)
+  def redirect_to_correct_topic(topic, post_number = nil)
     url = topic.relative_url
     url << "/#{post_number}" if post_number.to_i > 0
     url << ".json" if request.format.json?
@@ -705,11 +717,15 @@ class TopicsController < ApplicationController
       return
     end
 
-    topic_view_serializer = TopicViewSerializer.new(@topic_view, scope: guardian, root: false, include_raw: !!params[:include_raw])
+    topic_view_serializer = TopicViewSerializer.new(@topic_view,
+      scope: guardian,
+      root: false,
+      include_raw: !!params[:include_raw]
+    )
 
     respond_to do |format|
       format.html do
-        @description_meta = @topic_view.topic.excerpt
+        @description_meta = @topic_view.topic.excerpt || @topic_view.summary
         store_preloaded("topic_#{@topic_view.topic.id}", MultiJson.dump(topic_view_serializer))
         render :show
       end
@@ -722,9 +738,9 @@ class TopicsController < ApplicationController
 
   def render_topic_changes(dest_topic)
     if dest_topic.present?
-      render json: {success: true, url: dest_topic.relative_url}
+      render json: { success: true, url: dest_topic.relative_url }
     else
-      render json: {success: false}
+      render json: { success: false }
     end
   end
 
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 4ea747cedf..dcfaa4ed3c 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -1,47 +1,74 @@
+require "mini_mime"
 require_dependency 'upload_creator'
 
 class UploadsController < ApplicationController
-  before_filter :ensure_logged_in, except: [:show]
-  skip_before_filter :preload_json, :check_xhr, :redirect_to_login_if_required, only: [:show]
+  before_action :ensure_logged_in, except: [:show]
+  skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required, only: [:show]
 
   def create
+    # capture current user for block later on
+    me = current_user
+
     # 50 characters ought to be enough for the upload type
-    type = params.require(:type).parameterize("_")[0..50]
+    type = params.require(:type).parameterize(separator: "_")[0..50]
 
     if type == "avatar" && (SiteSetting.sso_overrides_avatar || !SiteSetting.allow_uploaded_avatars)
       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"
+    is_api = is_api?
+    retain_hours = params[:retain_hours].to_i
 
-    if params[:synchronous] && (current_user.staff? || is_api?)
-      data = create_upload(file, url, type)
-      render json: data.as_json
-    else
-      Scheduler::Defer.later("Create Upload") do
-        begin
-          data = create_upload(file, url, type)
-        ensure
-          MessageBus.publish("/uploads/#{type}", (data || {}).as_json, client_ids: [params[:client_id]])
-        end
+    # note, atm hijack is processed in its own context and has not access to controller
+    # longer term we may change this
+    hijack do
+      begin
+        info = UploadsController.create_upload(
+          current_user: me,
+          file: file,
+          url: url,
+          type: type,
+          for_private_message: for_private_message,
+          pasted: pasted,
+          is_api: is_api,
+          retain_hours: retain_hours
+        )
+      rescue => e
+        render json: failed_json.merge(message: e.message&.split("\n")&.first), status: 422
+      else
+        render json: UploadsController.serialize_upload(info), status: Upload === info ? 200 : 422
       end
-      render json: success_json
     end
   end
 
+  def lookup_urls
+    params.permit(short_urls: [])
+    uploads = []
+
+    if (params[:short_urls] && params[:short_urls].length > 0)
+      PrettyText::Helpers.lookup_image_urls(params[:short_urls]).each do |short_url, url|
+        uploads << { short_url: short_url, url: url }
+      end
+    end
+
+    render json: uploads.to_json
+  end
+
   def show
     return render_404 if !RailsMultisite::ConnectionManagement.has_db?(params[:site])
 
     RailsMultisite::ConnectionManagement.with_connection(params[:site]) do |db|
       return render_404 unless Discourse.store.internal?
       return render_404 if SiteSetting.prevent_anons_from_downloading_files && current_user.nil?
-      return render_404 if SiteSetting.login_required? && db == "default" && current_user.nil?
 
       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,9 +85,16 @@ class UploadsController < ApplicationController
     raise Discourse::NotFound
   end
 
-  def create_upload(file, url, type)
+  def self.serialize_upload(data)
+    # as_json.as_json is not a typo... as_json in AM serializer returns keys as symbols, we need them
+    # as strings here
+    serialized = UploadSerializer.new(data, root: nil).as_json.as_json if Upload === data
+    serialized ||= (data || {}).as_json
+  end
+
+  def self.create_upload(current_user:, file:, url:, type:, for_private_message:, pasted:, is_api:, retain_hours:)
     if file.nil?
-      if url.present? && is_api?
+      if url.present? && is_api
         maximum_upload_size = [SiteSetting.max_image_size_kb, SiteSetting.max_attachment_size_kb].max.kilobytes
         tempfile = FileHelper.download(
           url,
@@ -77,10 +111,16 @@ 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
       upload.update_columns(retain_hours: retain_hours) if retain_hours > 0
     end
 
diff --git a/app/controllers/user_actions_controller.rb b/app/controllers/user_actions_controller.rb
index 71dd2a5a12..417147ac5e 100644
--- a/app/controllers/user_actions_controller.rb
+++ b/app/controllers/user_actions_controller.rb
@@ -6,13 +6,14 @@ class UserActionsController < ApplicationController
 
     per_chunk = 30
 
-    user = fetch_user_from_params(include_inactive: current_user.try(:staff?))
+    user = fetch_user_from_params(include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts))
+    action_types = (params[:filter] || "").split(",").map(&:to_i)
 
     opts = { user_id: user.id,
              user: user,
              offset: params[:offset].to_i,
              limit: per_chunk,
-             action_types: (params[:filter] || "").split(",").map(&:to_i),
+             action_types: action_types,
              guardian: guardian,
              ignore_private_messages: params[:filter] ? false : true }
 
diff --git a/app/controllers/user_api_keys_controller.rb b/app/controllers/user_api_keys_controller.rb
index 8d11d46c1e..c6d41d2cc3 100644
--- a/app/controllers/user_api_keys_controller.rb
+++ b/app/controllers/user_api_keys_controller.rb
@@ -2,9 +2,9 @@ class UserApiKeysController < ApplicationController
 
   layout 'no_ember'
 
-  skip_before_filter :redirect_to_login_if_required, only: [:new]
-  skip_before_filter :check_xhr, :preload_json
-  before_filter :ensure_logged_in, only: [:create, :revoke, :undo_revoke]
+  skip_before_action :redirect_to_login_if_required, only: [:new]
+  skip_before_action :check_xhr, :preload_json
+  before_action :ensure_logged_in, only: [:create, :revoke, :undo_revoke]
 
   AUTH_API_VERSION ||= 2
 
@@ -40,7 +40,7 @@ class UserApiKeysController < ApplicationController
     @client_id = params[:client_id]
     @auth_redirect = params[:auth_redirect]
     @push_url = params[:push_url]
-    @localized_scopes = params[:scopes].split(",").map{|s| I18n.t("user_api_key.scopes.#{s}")}
+    @localized_scopes = params[:scopes].split(",").map { |s| I18n.t("user_api_key.scopes.#{s}") }
     @scopes = params[:scopes]
 
   rescue Discourse::InvalidAccess
@@ -52,10 +52,10 @@ class UserApiKeysController < ApplicationController
     require_params
 
     unless SiteSetting.allowed_user_api_auth_redirects
-                      .split('|')
-                      .any?{|u| params[:auth_redirect] == u}
+        .split('|')
+        .any? { |u| params[:auth_redirect] == u }
 
-        raise Discourse::InvalidAccess
+      raise Discourse::InvalidAccess
     end
 
     raise Discourse::InvalidAccess unless meets_tl?
@@ -126,7 +126,7 @@ class UserApiKeysController < ApplicationController
      :client_id,
      :auth_redirect,
      :application_name
-    ].each{|p| params.require(p)}
+    ].each { |p| params.require(p) }
   end
 
   def validate_params
diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb
index 30a3709c60..dc868d4805 100644
--- a/app/controllers/user_avatars_controller.rb
+++ b/app/controllers/user_avatars_controller.rb
@@ -2,20 +2,31 @@ require_dependency 'letter_avatar'
 
 class UserAvatarsController < ApplicationController
 
-  skip_before_filter :preload_json, :redirect_to_login_if_required, :check_xhr, :verify_authenticity_token, only: [:show, :show_letter, :show_proxy_letter]
+  skip_before_action :preload_json, :redirect_to_login_if_required, :check_xhr, :verify_authenticity_token, only: [:show, :show_letter, :show_proxy_letter]
 
   def refresh_gravatar
     user = User.find_by(username_lower: params[:username].downcase)
     guardian.ensure_can_edit!(user)
 
     if user
-      user.create_user_avatar(user_id: user.id) unless user.user_avatar
-      user.user_avatar.update_gravatar!
+      hijack do
+        user.create_user_avatar(user_id: user.id) unless user.user_avatar
+        user.user_avatar.update_gravatar!
 
-      render json: {
-        gravatar_upload_id: user.user_avatar.gravatar_upload_id,
-        gravatar_avatar_template: User.avatar_template(user.username, user.user_avatar.gravatar_upload_id)
-      }
+        gravatar = if user.user_avatar.gravatar_upload_id
+          {
+            gravatar_upload_id: user.user_avatar.gravatar_upload_id,
+            gravatar_avatar_template: User.avatar_template(user.username, user.user_avatar.gravatar_upload_id)
+          }
+        else
+          {
+            gravatar_upload_id: nil,
+            gravatar_avatar_template: nil
+          }
+        end
+
+        render json: gravatar
+      end
     else
       raise Discourse::NotFound
     end
@@ -31,17 +42,17 @@ class UserAvatarsController < ApplicationController
     params.require(:version)
     params.require(:size)
 
-    no_cookies
+    hijack do
+      identity = LetterAvatar::Identity.new
+      identity.letter = params[:letter].to_s[0].upcase
+      identity.color = params[:color].scan(/../).map(&:hex)
+      image = LetterAvatar.generate(params[:letter].to_s, params[:size].to_i, identity: identity)
 
-    identity = LetterAvatar::Identity.new
-    identity.letter = params[:letter].to_s[0].upcase
-    identity.color = params[:color].scan(/../).map(&:hex)
-    image = LetterAvatar.generate(params[:letter].to_s, params[:size].to_i, identity: identity)
-
-    response.headers["Last-Modified"] = File.ctime(image).httpdate
-    response.headers["Content-Length"] = File.size(image).to_s
-    immutable_for(1.year)
-    send_file image, disposition: nil
+      response.headers["Last-Modified"] = File.ctime(image).httpdate
+      response.headers["Content-Length"] = File.size(image).to_s
+      immutable_for(1.year)
+      send_file image, disposition: nil
+    end
   end
 
   def show_letter
@@ -53,20 +64,22 @@ class UserAvatarsController < ApplicationController
 
     return render_blank if params[:version] != LetterAvatar.version
 
-    image = LetterAvatar.generate(params[:username].to_s, params[:size].to_i)
+    hijack do
+      image = LetterAvatar.generate(params[:username].to_s, params[:size].to_i)
 
-    response.headers["Last-Modified"] = File.ctime(image).httpdate
-    response.headers["Content-Length"] = File.size(image).to_s
-    immutable_for(1.year)
-    send_file image, disposition: nil
+      response.headers["Last-Modified"] = File.ctime(image).httpdate
+      response.headers["Content-Length"] = File.size(image).to_s
+      immutable_for(1.year)
+      send_file image, disposition: nil
+    end
   end
 
   def show
-    no_cookies
-
     # we need multisite support to keep a single origin pull for CDNs
     RailsMultisite::ConnectionManagement.with_hostname(params[:hostname]) do
-      show_in_site(params[:hostname])
+      hijack do
+        show_in_site(params[:hostname])
+      end
     end
   end
 
@@ -83,18 +96,18 @@ class UserAvatarsController < ApplicationController
     return render_blank if version != OptimizedImage::VERSION
 
     upload_id = upload_id.to_i
-    return render_blank unless upload_id > 0 && user_avatar = user.user_avatar
+    return render_blank unless upload_id > 0
 
     size = params[:size].to_i
     return render_blank if size < 8 || size > 1000
 
     if !Discourse.avatar_sizes.include?(size) && Discourse.store.external?
-      closest = Discourse.avatar_sizes.to_a.min { |a,b| (size-a).abs <=> (size-b).abs }
+      closest = Discourse.avatar_sizes.to_a.min { |a, b| (size - a).abs <=> (size - b).abs }
       avatar_url = UserAvatar.local_avatar_url(hostname, user.username_lower, upload_id, closest)
       return redirect_to cdn_path(avatar_url)
     end
 
-    upload = Upload.find_by(id: upload_id) if user_avatar.contains_upload?(upload_id)
+    upload = Upload.find_by(id: upload_id) if user&.user_avatar&.contains_upload?(upload_id)
     upload ||= user.uploaded_avatar if user.uploaded_avatar_id == upload_id
 
     if user.uploaded_avatar && !upload
diff --git a/app/controllers/user_badges_controller.rb b/app/controllers/user_badges_controller.rb
index 7c9cfb0bee..cd456a8c40 100644
--- a/app/controllers/user_badges_controller.rb
+++ b/app/controllers/user_badges_controller.rb
@@ -1,4 +1,6 @@
 class UserBadgesController < ApplicationController
+  before_action :ensure_badges_enabled
+
   def index
     params.permit [:granted_before, :offset, :username]
 
@@ -28,17 +30,17 @@ class UserBadgesController < ApplicationController
   def username
     params.permit [:grouped]
 
-    user = fetch_user_from_params
+    user = fetch_user_from_params(include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts))
     user_badges = user.user_badges
 
     if params[:grouped]
       user_badges = user_badges.group(:badge_id)
-                               .select(UserBadge.attribute_names.map {|x| "MAX(#{x}) AS #{x}" }, 'COUNT(*) AS "count"')
+        .select(UserBadge.attribute_names.map { |x| "MAX(#{x}) AS #{x}" }, 'COUNT(*) AS "count"')
     end
 
     user_badges = user_badges.includes(badge: [:badge_grouping, :badge_type])
-                             .includes(post: :topic)
-                             .includes(:granted_by)
+      .includes(post: :topic)
+      .includes(:granted_by)
 
     render_serialized(user_badges, DetailedUserBadgeSerializer, root: :user_badges)
   end
@@ -104,6 +106,10 @@ class UserBadgesController < ApplicationController
 
     def can_assign_badge_to_user?(user)
       master_api_call = current_user.nil? && is_api?
-      master_api_call or guardian.can_grant_badges?(user)
+      master_api_call || guardian.can_grant_badges?(user)
+    end
+
+    def ensure_badges_enabled
+      raise Discourse::NotFound unless SiteSetting.enable_badges?
     end
 end
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 8809e94d4c..04ccf5fdf0 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -14,20 +14,20 @@ class Users::OmniauthCallbacksController < ApplicationController
     Auth::InstagramAuthenticator.new
   ]
 
-  skip_before_filter :redirect_to_login_if_required
+  skip_before_action :redirect_to_login_if_required
 
-  layout false
+  layout 'no_ember'
 
   def self.types
     @types ||= Enum.new(:facebook, :instagram, :twitter, :google, :yahoo, :github, :persona, :cas)
   end
 
   # need to be able to call this
-  skip_before_filter :check_xhr
+  skip_before_action :check_xhr
 
   # this is the only spot where we allow CSRF, our openid / oauth redirect
   # will not have a CSRF token, however the payload is all validated so its safe
-  skip_before_filter :verify_authenticity_token, only: :complete
+  skip_before_action :verify_authenticity_token, only: :complete
 
   def complete
     auth = request.env["omniauth.auth"]
@@ -36,7 +36,7 @@ class Users::OmniauthCallbacksController < ApplicationController
     auth[:session] = session
 
     authenticator = self.class.find_authenticator(params[:provider])
-    provider = Discourse.auth_providers && Discourse.auth_providers.find{|p| p.name == params[:provider]}
+    provider = Discourse.auth_providers && Discourse.auth_providers.find { |p| p.name == params[:provider] }
 
     @auth_result = authenticator.after_authenticate(auth)
 
@@ -80,10 +80,9 @@ class Users::OmniauthCallbacksController < ApplicationController
 
   def failure
     flash[:error] = I18n.t("login.omniauth_error")
-    render layout: 'no_ember'
+    render 'failure'
   end
 
-
   def self.find_authenticator(name)
     BUILTIN_AUTH.each do |authenticator|
       if authenticator.name == name
@@ -115,7 +114,10 @@ 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 EmailToken.where(email: user.email, confirmed: true).present? || user.email_tokens.active.where(email: user.email).exists?
       user.activate
+      user.update!(registration_ip_address: request.remote_ip) if user.registration_ip_address.blank?
     end
 
     if ScreenedIpAddress.should_block?(request.remote_ip)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index c407f24636..c81c28dc84 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -7,19 +7,19 @@ require_dependency 'admin_confirmation'
 
 class UsersController < ApplicationController
 
-  skip_before_filter :authorize_mini_profiler, only: [:avatar]
-  skip_before_filter :check_xhr, only: [:show, :password_reset, :update, :account_created, :activate_account, :perform_account_activation, :user_preferences_redirect, :avatar, :my_redirect, :toggle_anon, :admin_login, :confirm_admin]
+  skip_before_action :authorize_mini_profiler, only: [:avatar]
+  skip_before_action :check_xhr, only: [:show, :badges, :password_reset, :update, :account_created, :activate_account, :perform_account_activation, :user_preferences_redirect, :avatar, :my_redirect, :toggle_anon, :admin_login, :confirm_admin]
 
-  before_filter :ensure_logged_in, only: [:username, :update, :user_preferences_redirect, :upload_user_image,
+  before_action :ensure_logged_in, only: [:username, :update, :user_preferences_redirect, :upload_user_image,
                                           :pick_avatar, :destroy_user_image, :destroy, :check_emails, :topic_tracking_state]
 
-  before_filter :respond_to_suspicious_request, only: [:create]
+  before_action :respond_to_suspicious_request, only: [:create]
 
   # we need to allow account creation with bad CSRF tokens, if people are caching, the CSRF token on the
   #  page is going to be empty, this means that server will see an invalid CSRF and blow the session
   #  once that happens you can't log in with social
-  skip_before_filter :verify_authenticity_token, only: [:create]
-  skip_before_filter :redirect_to_login_if_required, only: [:check_username,
+  skip_before_action :verify_authenticity_token, only: [:create]
+  skip_before_action :redirect_to_login_if_required, only: [:check_username,
                                                             :create,
                                                             :get_honeypot_value,
                                                             :account_created,
@@ -39,7 +39,7 @@ class UsersController < ApplicationController
     return redirect_to path('/login') if SiteSetting.hide_user_profiles_from_public && !current_user
 
     @user = fetch_user_from_params(
-      { include_inactive: current_user.try(:staff?) },
+      { include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts) },
       [{ user_profile: :card_image_badge }]
     )
 
@@ -50,7 +50,7 @@ class UsersController < ApplicationController
 
     topic_id = params[:include_post_count_for].to_i
     if topic_id != 0
-      user_serializer.topic_post_count = {topic_id => Post.where(topic_id: topic_id, user_id: @user.id).count }
+      user_serializer.topic_post_count = { topic_id => Post.secured(guardian).where(topic_id: topic_id, user_id: @user.id).count }
     end
 
     if !params[:skip_track_visit] && (@user != current_user)
@@ -59,7 +59,7 @@ class UsersController < ApplicationController
 
     # This is a hack to get around a Rails issue where values with periods aren't handled correctly
     # when used as part of a route.
-    if params[:external_id] and params[:external_id].ends_with? '.json'
+    if params[:external_id] && params[:external_id].ends_with?('.json')
       return render_json_dump(user_serializer)
     end
 
@@ -67,6 +67,7 @@ class UsersController < ApplicationController
       format.html do
         @restrict_fields = guardian.restrict_user_fields?(@user)
         store_preloaded("user_#{@user.username}", MultiJson.dump(user_serializer))
+        render :show
       end
 
       format.json do
@@ -75,6 +76,11 @@ class UsersController < ApplicationController
     end
   end
 
+  def badges
+    raise Discourse::NotFound unless SiteSetting.enable_badges?
+    show
+  end
+
   def card_badge
   end
 
@@ -89,7 +95,7 @@ class UsersController < ApplicationController
       user.user_profile.update_column(:card_image_badge_id, nil)
     end
 
-    render nothing: true
+    render body: nil
   end
 
   def user_preferences_redirect
@@ -99,25 +105,29 @@ class UsersController < ApplicationController
   def update
     user = fetch_user_from_params
     guardian.ensure_can_edit!(user)
+    attributes = user_params.merge!(custom_fields: params[:custom_fields])
 
     if params[:user_fields].present?
-      params[:custom_fields] = {} unless params[:custom_fields].present?
+      attributes[:custom_fields] = {} unless params[:custom_fields].present?
 
       fields = UserField.all
       fields = fields.where(editable: true) unless current_user.staff?
       fields.each do |f|
-        val = params[:user_fields][f.id.to_s]
+        field_id = f.id.to_s
+        next unless params[:user_fields].has_key?(field_id)
+
+        val = params[:user_fields][field_id]
         val = nil if val === "false"
         val = val[0...UserField.max_length] if val
 
         return render_json_error(I18n.t("login.missing_user_field")) if val.blank? && f.required?
-        params[:custom_fields]["user_field_#{f.id}"] = val
+        attributes[:custom_fields]["user_field_#{f.id}"] = val
       end
     end
 
     json_result(user, serializer: UserSerializer, additional_errors: [:user_profile]) do |u|
       updater = UserUpdater.new(current_user, user)
-      updater.update(params)
+      updater.update(attributes.permit!)
     end
   end
 
@@ -127,14 +137,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
@@ -178,11 +187,11 @@ class UsersController < ApplicationController
       user.save!
     end
 
-    render nothing: true
+    render body: nil
   end
 
   def preferences
-    render nothing: true
+    render body: nil
   end
 
   def my_redirect
@@ -197,14 +206,14 @@ class UsersController < ApplicationController
   end
 
   def summary
-    user = fetch_user_from_params
+    user = fetch_user_from_params(include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts))
     summary = UserSummary.new(user, guardian)
     serializer = UserSummarySerializer.new(summary, scope: guardian)
     render_json_dump(serializer)
   end
 
   def invited
-    inviter = fetch_user_from_params
+    inviter = fetch_user_from_params(include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts))
     offset = params[:offset].to_i || 0
     filter_by = params[:filter]
 
@@ -220,13 +229,13 @@ class UsersController < ApplicationController
   end
 
   def invited_count
-    inviter = fetch_user_from_params
+    inviter = fetch_user_from_params(include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts))
 
     pending_count = Invite.find_pending_invites_count(inviter)
     redeemed_count = Invite.find_redeemed_invites_count(inviter)
 
-    render json: {counts: { pending: pending_count, redeemed: redeemed_count,
-                            total: (pending_count.to_i + redeemed_count.to_i) } }
+    render json: { counts: { pending: pending_count, redeemed: redeemed_count,
+                             total: (pending_count.to_i + redeemed_count.to_i) } }
   end
 
   def is_local_username
@@ -239,7 +248,12 @@ class UsersController < ApplicationController
         Group.mentionable(current_user)
           .where(name: usernames)
           .pluck(:name, :user_count)
-          .map{ |name,user_count| {name: name, user_count: user_count} }
+          .map do |name, user_count|
+          {
+            name: name,
+            user_count: user_count
+          }
+        end
       end
 
     usernames -= groups
@@ -251,14 +265,20 @@ class UsersController < ApplicationController
     topic_id = params[:topic_id]
     unless topic_id.blank?
       topic = Topic.find_by(id: topic_id)
-      usernames.each{ |username| cannot_see.push(username) unless Guardian.new(User.find_by_username(username)).can_see?(topic) }
+      usernames.each { |username| cannot_see.push(username) unless Guardian.new(User.find_by_username(username)).can_see?(topic) }
     end
 
     result = User.where(staged: false)
-                 .where(username_lower: usernames)
-                 .pluck(:username_lower)
+      .where(username_lower: usernames)
+      .pluck(:username_lower)
 
-    render json: {valid: result, valid_groups: groups, mentionable_groups: mentionable_groups, cannot_see: cannot_see}
+    render json: {
+      valid: result,
+      valid_groups: groups,
+      mentionable_groups: mentionable_groups,
+      cannot_see: cannot_see,
+      max_users_notified_per_group_mention: SiteSetting.max_users_notified_per_group_mention
+    }
   end
 
   def render_available_true
@@ -266,7 +286,7 @@ class UsersController < ApplicationController
   end
 
   def changing_case_of_own_username(target_user, username)
-    target_user and username.downcase == target_user.username.downcase
+    target_user && username.downcase == (target_user.username.downcase)
   end
 
   # Used for checking availability of a username and will return suggestions
@@ -292,9 +312,10 @@ class UsersController < ApplicationController
     params[:for_user_id] ? User.find(params[:for_user_id]) : current_user
   end
 
-  FROM_STAGED = "from_staged"
+  FROM_STAGED = "from_staged".freeze
 
   def create
+    params.require(:email)
     params.permit(:user_fields)
 
     unless SiteSetting.allow_new_registrations
@@ -305,7 +326,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
 
@@ -313,7 +334,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
       user.active = false
@@ -322,6 +343,12 @@ class UsersController < ApplicationController
       user = User.new(user_params)
     end
 
+    # Handle API approval
+    if user.approved
+      user.approved_by_id ||= current_user.id
+      user.approved_at ||= Time.zone.now
+    end
+
     # Handle custom fields
     user_fields = UserField.all
     if user_fields.present?
@@ -343,7 +370,7 @@ class UsersController < ApplicationController
     authentication = UserAuthenticator.new(user, session)
 
     if !authentication.has_authenticator? && !SiteSetting.enable_local_logins
-      return render nothing: true, status: 500
+      return render body: nil, status: 500
     end
 
     authentication.start
@@ -374,15 +401,35 @@ class UsersController < ApplicationController
         message: activation.message,
         user_id: user.id
       }
+    elsif SiteSetting.hide_email_address_taken && user.errors[:primary_email]&.include?(I18n.t('errors.messages.taken'))
+      session["user_created_message"] = activation.success_message
+
+      if existing_user = User.find_by_email(user.primary_email&.email)
+        Jobs.enqueue(:critical_user_email, type: :account_exists, user_id: existing_user.id)
+      end
+
+      render json: {
+        success: true,
+        active: user.active?,
+        message: activation.success_message,
+        user_id: user.id
+      }
     else
+      errors = user.errors.to_hash
+      errors[:email] = errors.delete(:primary_email) if errors[:primary_email]
+
       render json: {
         success: false,
         message: I18n.t(
           'login.errors',
           errors: user.errors.full_messages.join("\n")
         ),
-        errors: user.errors.to_hash,
-        values: user.attributes.slice('name', 'username', 'email'),
+        errors: errors,
+        values: {
+          name: user.name,
+          username: user.username,
+          email: user.primary_email&.email
+        },
         is_developer: UsernameCheckerService.is_developer?(user.email)
       }
     end
@@ -394,7 +441,7 @@ class UsersController < ApplicationController
   end
 
   def get_honeypot_value
-    render json: {value: honeypot_value, challenge: challenge_value}
+    render json: { value: honeypot_value, challenge: challenge_value }
   end
 
   def password_reset
@@ -442,9 +489,12 @@ class UsersController < ApplicationController
         if @error
           render layout: 'no_ember'
         else
-          store_preloaded("password_reset", MultiJson.dump({ is_developer: UsernameCheckerService.is_developer?(@user.email) }))
+          store_preloaded(
+            "password_reset",
+            MultiJson.dump(is_developer: UsernameCheckerService.is_developer?(@user.email), admin: @user.admin?)
+          )
         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
@@ -453,8 +503,9 @@ class UsersController < ApplicationController
             render json: {
               success: false,
               message: @error,
-              errors: @user&.errors.to_hash,
-              is_developer: UsernameCheckerService.is_developer?(@user.email)
+              errors: @user&.errors&.to_hash,
+              is_developer: UsernameCheckerService.is_developer?(@user.email),
+              admin: @user.admin?
             }
           else
             render json: {
@@ -465,7 +516,7 @@ class UsersController < ApplicationController
             }
           end
         else
-          render json: {is_developer: UsernameCheckerService.is_developer?(@user.email)}
+          render json: { is_developer: UsernameCheckerService.is_developer?(@user.email), admin: @user.admin? }
         end
       end
     end
@@ -478,14 +529,15 @@ class UsersController < ApplicationController
   end
 
   def logon_after_password_reset
-    message = if Guardian.new(@user).can_access_forum?
-                # Log in the user
-                log_on_user(@user)
-                'password_reset.success'
-              else
-                @requires_approval = true
-                'password_reset.success_unapproved'
-              end
+    message =
+      if Guardian.new(@user).can_access_forum?
+        # Log in the user
+        log_on_user(@user)
+        'password_reset.success'
+      else
+        @requires_approval = true
+        'password_reset.success_unapproved'
+      end
 
     @success = I18n.t(message)
   end
@@ -499,7 +551,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)
@@ -555,7 +607,7 @@ class UsersController < ApplicationController
       if user = User.where(id: session_user_id.to_i).first
         @account_created[:username] = user.username
         @account_created[:email] = user.email
-        @account_created[:show_controls] = true
+        @account_created[:show_controls] = !user.custom_fields[FROM_STAGED]
       end
     end
 
@@ -609,15 +661,22 @@ class UsersController < ApplicationController
       @user = User.where(id: user_key.to_i).first
     end
 
-    raise Discourse::InvalidAccess.new unless @user.present?
-    raise Discourse::InvalidAccess.new if @user.active?
-    raise Discourse::InvalidAccess.new if current_user.present?
-    raise Discourse::InvalidAccess.new if @user.custom_fields[FROM_STAGED]
+    if @user.blank? || @user.active? || current_user.present?
+      raise Discourse::InvalidAccess.new
+    end
+
+    if @user.custom_fields[FROM_STAGED]
+      raise Discourse::InvalidAccess.new
+    end
 
     User.transaction do
-      @user.email = params[:email]
-      if @user.save
-        @user.email_tokens.create(email: @user.email)
+      primary_email = @user.primary_email
+
+      primary_email.email = params[:email]
+      primary_email.skip_validate_email = false
+
+      if primary_email.save
+        @user.email_tokens.create!(email: @user.email)
         enqueue_activation_email
         render json: success_json
       else
@@ -652,13 +711,13 @@ class UsersController < ApplicationController
     else
       @email_token = @user.email_tokens.unconfirmed.active.first
       enqueue_activation_email
-      render nothing: true
+      render body: nil
     end
   end
 
   def enqueue_activation_email
-    @email_token ||= @user.email_tokens.create(email: @user.email)
-    Jobs.enqueue(:critical_user_email, type: :signup, user_id: @user.id, email_token: @email_token.token)
+    @email_token ||= @user.email_tokens.create!(email: @user.email)
+    Jobs.enqueue(:critical_user_email, type: :signup, user_id: @user.id, email_token: @email_token.token, to_address: @user.email)
   end
 
   def search_users
@@ -671,7 +730,6 @@ class UsersController < ApplicationController
       @group = Group.find_by(name: params[:group])
     end
 
-
     results = UserSearch.new(term,
                              topic_id: topic_id,
                              topic_allowed_users: topic_allowed_users,
@@ -684,16 +742,22 @@ class UsersController < ApplicationController
 
     to_render = { users: results.as_json(only: user_fields, methods: [:avatar_template]) }
 
-    if params[:include_groups] == "true"
-      to_render[:groups] = Group.search_group(term).map do |m|
-        { name: m.name, full_name: m.full_name }
+    groups =
+      if current_user
+        if params[:include_mentionable_groups] == 'true'
+          Group.mentionable(current_user)
+        elsif params[:include_messageable_groups] == 'true'
+          Group.messageable(current_user)
+        end
       end
-    end
 
-    if params[:include_mentionable_groups] == "true" && current_user
-      to_render[:groups] = Group.mentionable(current_user)
-                                .where("name ILIKE :term_like", term_like: "#{term}%")
-                                .map do |m|
+    include_groups = params[:include_groups] == "true"
+
+    if include_groups || groups
+      groups = Group.search_groups(term, groups: groups)
+      groups = groups.where(visibility_level: Group.visibility_levels[:public]) if include_groups
+
+      to_render[:groups] = groups.map do |m|
         { name: m.name, full_name: m.full_name }
       end
     end
@@ -761,7 +825,7 @@ class UsersController < ApplicationController
     @user = fetch_user_from_params
     guardian.ensure_can_delete_user!(@user)
 
-    UserDestroyer.new(current_user).destroy(@user, { delete_posts: true, context: params[:context] })
+    UserDestroyer.new(current_user).destroy(@user, delete_posts: true, context: params[:context])
 
     render json: success_json
   end
@@ -806,14 +870,14 @@ class UsersController < ApplicationController
   private
 
     def honeypot_value
-      Digest::SHA1::hexdigest("#{Discourse.current_hostname}:#{GlobalSetting.safe_secret_key_base}")[0,15]
+      Digest::SHA1::hexdigest("#{Discourse.current_hostname}:#{GlobalSetting.safe_secret_key_base}")[0, 15]
     end
 
     def challenge_value
       challenge = $redis.get('SECRET_CHALLENGE')
-      unless challenge && challenge.length == 16*2
+      unless challenge && challenge.length == 16 * 2
         challenge = SecureRandom.hex(16)
-        $redis.set('SECRET_CHALLENGE',challenge)
+        $redis.set('SECRET_CHALLENGE', challenge)
       end
 
       challenge
@@ -841,20 +905,44 @@ class UsersController < ApplicationController
     end
 
     def user_params
-      result = params.permit(:name, :email, :password, :username, :date_of_birth)
-                     .merge(ip_address: request.remote_ip,
-                            registration_ip_address: request.remote_ip,
-                            locale: user_locale)
+      permitted = [
+        :name,
+        :email,
+        :password,
+        :username,
+        :title,
+        :date_of_birth,
+        :muted_usernames,
+        :theme_key,
+        :locale,
+        :bio_raw,
+        :location,
+        :website,
+        :dismissed_banner_key,
+        :profile_background,
+        :card_background
+      ]
+
+      permitted.concat UserUpdater::OPTION_ATTR
+      permitted.concat UserUpdater::CATEGORY_IDS.keys.map { |k| { k => [] } }
+      permitted.concat UserUpdater::TAG_NAMES.keys.map { |k| { k => [] } }
+
+      result = params
+        .permit(permitted)
+        .reverse_merge(
+          ip_address: request.remote_ip,
+          registration_ip_address: request.remote_ip,
+          locale: user_locale
+        )
 
       if !UsernameCheckerService.is_developer?(result['email']) &&
           is_api? &&
           current_user.present? &&
           current_user.admin?
 
-        result.merge!(params.permit(:active, :staged))
+        result.merge!(params.permit(:active, :staged, :approved))
       end
 
-
       result
     end
 
diff --git a/app/controllers/users_email_controller.rb b/app/controllers/users_email_controller.rb
index a61fd57819..6e1e2a1f0c 100644
--- a/app/controllers/users_email_controller.rb
+++ b/app/controllers/users_email_controller.rb
@@ -4,10 +4,10 @@ require_dependency 'email_updater'
 
 class UsersEmailController < ApplicationController
 
-  before_filter :ensure_logged_in, only: [:index, :update]
+  before_action :ensure_logged_in, only: [:index, :update]
 
-  skip_before_filter :check_xhr, only: [:confirm]
-  skip_before_filter :redirect_to_login_if_required, only: [:confirm]
+  skip_before_action :check_xhr, only: [:confirm]
+  skip_before_action :redirect_to_login_if_required, only: [:confirm]
 
   def index
   end
@@ -26,7 +26,7 @@ class UsersEmailController < ApplicationController
       return render_json_error(updater.errors.full_messages)
     end
 
-    render nothing: true
+    render body: nil
   rescue RateLimiter::LimitExceeded
     render_json_error(I18n.t("rate_limiter.slow_down"))
   end
@@ -45,4 +45,3 @@ class UsersEmailController < ApplicationController
   end
 
 end
-
diff --git a/app/controllers/webhooks_controller.rb b/app/controllers/webhooks_controller.rb
index 07da9d0f2f..1c56b33dd1 100644
--- a/app/controllers/webhooks_controller.rb
+++ b/app/controllers/webhooks_controller.rb
@@ -54,7 +54,7 @@ class WebhooksController < ActionController::Base
       end
     end
 
-    render nothing: true, status: 200
+    render body: nil, status: 200
   end
 
   def mailjet
@@ -71,7 +71,7 @@ class WebhooksController < ActionController::Base
       end
     end
 
-    render nothing: true, status: 200
+    render body: nil, status: 200
   end
 
   def mandrill
@@ -88,7 +88,7 @@ class WebhooksController < ActionController::Base
       end
     end
 
-    render nothing: true, status: 200
+    render body: nil, status: 200
   end
 
   def sparkpost
@@ -114,17 +114,17 @@ class WebhooksController < ActionController::Base
       end
     end
 
-    render nothing: true, status: 200
+    render body: nil, status: 200
   end
 
   private
 
     def mailgun_failure
-      render nothing: true, status: 406
+      render body: nil, status: 406
     end
 
     def mailgun_success
-      render nothing: true, status: 200
+      render body: nil, status: 200
     end
 
     def mailgun_verify(timestamp, token, signature)
diff --git a/app/controllers/wizard_controller.rb b/app/controllers/wizard_controller.rb
index 4b7bc82faa..3c52ee68f3 100644
--- a/app/controllers/wizard_controller.rb
+++ b/app/controllers/wizard_controller.rb
@@ -2,11 +2,11 @@ require_dependency 'wizard'
 require_dependency 'wizard/builder'
 
 class WizardController < ApplicationController
-  before_filter :ensure_wizard_enabled, only: [:index]
-  before_filter :ensure_logged_in
-  before_filter :ensure_admin
+  before_action :ensure_wizard_enabled, only: [:index]
+  before_action :ensure_logged_in, except: [:qunit]
+  before_action :ensure_admin, except: [:qunit]
 
-  skip_before_filter :check_xhr, :preload_json
+  skip_before_action :check_xhr, :preload_json
 
   layout false
 
@@ -21,6 +21,7 @@ class WizardController < ApplicationController
   end
 
   def qunit
+    raise Discourse::InvalidAccess.new if Rails.env.production?
   end
 
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 404ed92bf4..cfc0006677 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -7,7 +7,7 @@ require_dependency 'configurable_urls'
 require_dependency 'mobile_detection'
 require_dependency 'category_badge'
 require_dependency 'global_path'
-require_dependency 'canonical_url'
+require_dependency 'emoji'
 
 module ApplicationHelper
   include CurrentUser
@@ -15,7 +15,11 @@ module ApplicationHelper
   include ConfigurableUrls
   include GlobalPath
 
-  def google_universal_analytics_json(ua_domain_name=nil)
+  def self.extra_body_classes
+    @extra_body_classes ||= Set.new
+  end
+
+  def google_universal_analytics_json(ua_domain_name = nil)
     result = {}
     if ua_domain_name
       result[:cookieDomain] = ua_domain_name.gsub(/^http(s)?:\/\//, '')
@@ -23,6 +27,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
 
@@ -45,15 +52,29 @@ module ApplicationHelper
     end
   end
 
+  def is_brotli_req?
+    ENV["COMPRESS_BROTLI"] == "1" &&
+    request.env["HTTP_ACCEPT_ENCODING"] =~ /br/
+  end
+
   def preload_script(script)
     path = asset_path("#{script}.js")
 
-    if  GlobalSetting.cdn_url &&
-        GlobalSetting.cdn_url.start_with?("https") &&
-        ENV["COMPRESS_BROTLI"] == "1" &&
-        request.env["HTTP_ACCEPT_ENCODING"] =~ /br/
-        path.gsub!("#{GlobalSetting.cdn_url}/assets/", "#{GlobalSetting.cdn_url}/brotli_asset/")
+    if GlobalSetting.use_s3? && GlobalSetting.s3_cdn_url
+      if GlobalSetting.cdn_url
+        path.gsub!(GlobalSetting.cdn_url, GlobalSetting.s3_cdn_url)
+      else
+        path = "#{GlobalSetting.s3_cdn_url}#{path}"
+      end
+
+      if is_brotli_req?
+        path.gsub!(/\.([^.]+)$/, '.br.\1')
+      end
+
+    elsif GlobalSetting.cdn_url&.start_with?("https") && is_brotli_req?
+      path.gsub!("#{GlobalSetting.cdn_url}/assets/", "#{GlobalSetting.cdn_url}/brotli_asset/")
     end
+
 "<link rel='preload' href='#{path}' as='script'/>
 <script src='#{path}'></script>".html_safe
   end
@@ -72,9 +93,17 @@ module ApplicationHelper
   end
 
   def body_classes
+    result = ApplicationHelper.extra_body_classes.to_a
+
     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
@@ -147,7 +176,7 @@ module ApplicationHelper
   end
 
   # Creates open graph and twitter card meta data
-  def crawlable_meta_data(opts=nil)
+  def crawlable_meta_data(opts = nil)
     opts ||= {}
     opts[:url] ||= "#{Discourse.base_url_no_prefix}#{request.fullpath}"
 
@@ -187,10 +216,9 @@ module ApplicationHelper
 
     [:url, :title, :description].each do |property|
       if opts[property].present?
-        escape = (property != :image)
         content = (property == :url ? opts[property] : gsub_emoji_to_unicode(opts[property]))
-        result << tag(:meta, { property: "og:#{property}", content: content }, nil, escape)
-        result << tag(:meta, { name: "twitter:#{property}", content: content }, nil, escape)
+        result << tag(:meta, { property: "og:#{property}", content: content }, nil, true)
+        result << tag(:meta, { name: "twitter:#{property}", content: content }, nil, true)
       end
     end
 
@@ -201,6 +229,10 @@ module ApplicationHelper
       result << tag(:meta, name: 'twitter:data2', value: "#{opts[:like_count]} ❤")
     end
 
+    if opts[:ignore_canonical]
+      result << tag(:meta, property: 'og:ignore_canonical', content: true)
+    end
+
     result.join("\n")
   end
 
@@ -219,9 +251,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
@@ -233,11 +263,11 @@ module ApplicationHelper
   end
 
   def mobile_view?
-    MobileDetection.resolve_mobile_view!(request.user_agent,params,session)
+    MobileDetection.resolve_mobile_view!(request.user_agent, params, session)
   end
 
   def crawler_layout?
-    controller.try(:use_crawler_layout?)
+    controller&.use_crawler_layout?
   end
 
   def include_crawler_content?
@@ -274,7 +304,7 @@ module ApplicationHelper
     controller.class.name.split("::").first == "Admin"
   end
 
-  def category_badge(category, opts=nil)
+  def category_badge(category, opts = nil)
     CategoryBadge.html_for(category, opts).html_safe
   end
 
@@ -288,11 +318,11 @@ module ApplicationHelper
     return "" if Rails.env.test?
 
     matcher = Regexp.new("/connectors/#{name}/.*\.html\.erb$")
-    erbs = ApplicationHelper.all_connectors.select {|c| c =~ matcher }
+    erbs = ApplicationHelper.all_connectors.select { |c| c =~ matcher }
     return "" if erbs.blank?
 
     result = ""
-    erbs.each {|erb| result << render(file: erb) }
+    erbs.each { |erb| result << render(file: erb) }
     result.html_safe
   end
 
@@ -316,17 +346,31 @@ module ApplicationHelper
     end
   end
 
+  def current_homepage
+    current_user&.user_option&.homepage || SiteSetting.anonymous_homepage
+  end
+
   def build_plugin_html(name)
     return "" unless allow_plugins?
     DiscoursePluginRegistry.build_html(name, controller) || ""
   end
 
+  # If there is plugin HTML return that, otherwise yield to the template
+  def replace_plugin_html(name)
+    if (html = build_plugin_html(name)).present?
+      html
+    else
+      yield
+      nil
+    end
+  end
+
   def theme_lookup(name)
     lookup = Theme.lookup_field(theme_key, mobile_view? ? :mobile : :desktop, name)
     lookup.html_safe if lookup
   end
 
-  def discourse_stylesheet_link_tag(name, opts={})
+  def discourse_stylesheet_link_tag(name, opts = {})
     if opts.key?(:theme_key)
       key = opts[:theme_key] unless customization_disabled?
     else
diff --git a/app/helpers/common_helper.rb b/app/helpers/common_helper.rb
index e610736903..1d8317554c 100644
--- a/app/helpers/common_helper.rb
+++ b/app/helpers/common_helper.rb
@@ -5,12 +5,6 @@ module CommonHelper
     end
   end
 
-  def render_google_analytics_code
-    if Rails.env.production? && SiteSetting.ga_tracking_code.present?
-      render partial: "common/google_analytics"
-    end
-  end
-
   def render_google_tag_manager_code
     if Rails.env.production? && SiteSetting.gtm_container_id.present?
       render partial: "common/google_tag_manager"
diff --git a/app/helpers/list_helper.rb b/app/helpers/list_helper.rb
index a7cf7766ac..9839401f9e 100644
--- a/app/helpers/list_helper.rb
+++ b/app/helpers/list_helper.rb
@@ -6,7 +6,7 @@ module ListHelper
 
     return if total_pages < 2
 
-    page = [total_pages - (max_pages+1), 2].max
+    page = [total_pages - (max_pages + 1), 2].max
 
     result = "("
     while page <= total_pages
diff --git a/app/helpers/topics_helper.rb b/app/helpers/topics_helper.rb
index ad96e94177..b50b923bb8 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/helpers/user_notifications_helper.rb b/app/helpers/user_notifications_helper.rb
index 044b4eb312..2e18c702ee 100644
--- a/app/helpers/user_notifications_helper.rb
+++ b/app/helpers/user_notifications_helper.rb
@@ -1,6 +1,6 @@
 module UserNotificationsHelper
 
-  def indent(text, by=2)
+  def indent(text, by = 2)
     spacer = " " * by
     result = ""
     text.each_line do |line|
@@ -48,9 +48,9 @@ module UserNotificationsHelper
     doc.css('div').first
   end
 
-  def email_excerpt(html_arg, posts_count=nil)
+  def email_excerpt(html_arg, posts_count = nil)
     # only include 1st paragraph when more than 1 posts
-    html = (posts_count.nil? || posts_count > 1) ? (first_paragraph_from(html_arg)||html_arg).to_s : html_arg
+    html = (posts_count.nil? || posts_count > 1) ? (first_paragraph_from(html_arg) || html_arg).to_s : html_arg
     PrettyText.format_for_email(html).html_safe
   end
 
diff --git a/app/jobs/base.rb b/app/jobs/base.rb
index 4445c78aa9..fa16e3179b 100644
--- a/app/jobs/base.rb
+++ b/app/jobs/base.rb
@@ -71,11 +71,11 @@ module Jobs
       ctx
     end
 
-    def self.delayed_perform(opts={})
+    def self.delayed_perform(opts = {})
       self.new.perform(opts)
     end
 
-    def execute(opts={})
+    def execute(opts = {})
       raise "Overwrite me!"
     end
 
@@ -114,7 +114,6 @@ module Jobs
         end
       end
 
-
       dbs =
         if opts[:current_site_id]
           [opts[:current_site_id]]
@@ -125,49 +124,28 @@ module Jobs
       exceptions = []
       dbs.each do |db|
         begin
-          thread_exception = {}
-          # NOTE: This looks odd, in fact it looks crazy but there is a reason
-          #  A bug in therubyracer means that under certain conditions running in a fiber
-          #  can cause the whole v8 context to corrupt so much that it will hang sidekiq
-          #
-          #  If you are brave and want to try to fix this either in celluloid or therubyracer, the repro is:
-          #
-          #  1. Create a big Discourse db: (you can start from script/profile_db_generator.rb)
-          #  2. Queue a ton of jobs, eg: User.pluck(:id).each{|id| Jobs.enqueue(:user_email, type: :digest, user_id: id)};
-          #  3. Run sidekiq
-          #
-          #  The issue only happens in Ruby 2.0 for some reason, you start getting V8::Error with no context
-          #
-          #  See: https://github.com/cowboyd/therubyracer/issues/206
-          #
-          #  The restricted stack space of fibers opens a bunch of risks up, by avoiding them altogether
-          #   we can mitigate giving up a very marginal amount of throughput
-          #
-          #  Ideally we could just tell sidekiq to avoid fibers
+          exception = {}
 
-          t = Thread.new do
+          RailsMultisite::ConnectionManagement.with_connection(db) do
             begin
-              RailsMultisite::ConnectionManagement.establish_connection(db: db)
               I18n.locale = SiteSetting.default_locale || "en"
               I18n.ensure_all_loaded!
               begin
                 execute(opts)
               rescue => e
-                thread_exception[:ex] = e
-                thread_exception[:other] = { problem_db: db }
+                exception[:ex] = e
+                exception[:other] = { problem_db: db }
               end
             rescue => e
-              thread_exception[:ex] = e
-              thread_exception[:message] = "While establishing database connection to #{db}"
-              thread_exception[:other] = { problem_db: db }
+              exception[:ex] = e
+              exception[:message] = "While establishing database connection to #{db}"
+              exception[:other] = { problem_db: db }
             ensure
-              ActiveRecord::Base.connection_handler.clear_active_connections!
               total_db_time += Instrumenter.stats.duration_ms
             end
           end
-          t.join
 
-          exceptions << thread_exception unless thread_exception.empty?
+          exceptions << exception unless exception.empty?
         end
       end
 
@@ -203,7 +181,7 @@ module Jobs
     end
   end
 
-  def self.enqueue(job_name, opts={})
+  def self.enqueue(job_name, opts = {})
     klass = "Jobs::#{job_name.to_s.camelcase}".constantize
 
     # Unless we want to work on all sites
@@ -222,25 +200,31 @@ module Jobs
       # Otherwise execute the job right away
       opts.delete(:delay_for)
       opts[:sync_exec] = true
-      klass.new.perform(opts)
+      if Rails.env == "development"
+        Scheduler::Defer.later("job") do
+          klass.new.perform(opts)
+        end
+      else
+        klass.new.perform(opts)
+      end
     end
 
   end
 
-  def self.enqueue_in(secs, job_name, opts={})
+  def self.enqueue_in(secs, job_name, opts = {})
     enqueue(job_name, opts.merge!(delay_for: secs))
   end
 
-  def self.enqueue_at(datetime, job_name, opts={})
+  def self.enqueue_at(datetime, job_name, opts = {})
     secs = [(datetime - Time.zone.now).to_i, 0].max
     enqueue_in(secs, job_name, opts)
   end
 
-  def self.cancel_scheduled_job(job_name, opts={})
+  def self.cancel_scheduled_job(job_name, opts = {})
     scheduled_for(job_name, opts).each(&:delete)
   end
 
-  def self.scheduled_for(job_name, opts={})
+  def self.scheduled_for(job_name, opts = {})
     opts = opts.with_indifferent_access
     unless opts.delete(:all_sites)
       opts[:current_site_id] ||= RailsMultisite::ConnectionManagement.current_db
@@ -265,6 +249,6 @@ module Jobs
   end
 end
 
-Dir["#{Rails.root}/app/jobs/onceoff/*.rb"].each {|file| require_dependency file }
-Dir["#{Rails.root}/app/jobs/regular/*.rb"].each {|file| require_dependency file }
-Dir["#{Rails.root}/app/jobs/scheduled/*.rb"].each {|file| require_dependency file }
+Dir["#{Rails.root}/app/jobs/onceoff/*.rb"].each { |file| require_dependency file }
+Dir["#{Rails.root}/app/jobs/regular/*.rb"].each { |file| require_dependency file }
+Dir["#{Rails.root}/app/jobs/scheduled/*.rb"].each { |file| require_dependency file }
diff --git a/app/jobs/onceoff/create_tags_search_index.rb b/app/jobs/onceoff/create_tags_search_index.rb
new file mode 100644
index 0000000000..3e673bf2e6
--- /dev/null
+++ b/app/jobs/onceoff/create_tags_search_index.rb
@@ -0,0 +1,9 @@
+module Jobs
+  class CreateTagsSearchIndex < Jobs::Onceoff
+    def execute_onceoff(args)
+      Tag.exec_sql('select id, name from tags').each do |t|
+        SearchIndexer.update_tags_index(t['id'], t['name'])
+      end
+    end
+  end
+end
diff --git a/app/jobs/onceoff/fix_featured_link_for_topics.rb b/app/jobs/onceoff/fix_featured_link_for_topics.rb
new file mode 100644
index 0000000000..3ccd0f29d6
--- /dev/null
+++ b/app/jobs/onceoff/fix_featured_link_for_topics.rb
@@ -0,0 +1,15 @@
+module Jobs
+  class FixFeaturedLinkForTopics < Jobs::Onceoff
+    def execute_onceoff(args)
+      Topic.where("featured_link IS NOT NULL").find_each do |topic|
+        featured_link = topic.featured_link
+
+        begin
+          URI.parse(featured_link)
+        rescue URI::InvalidURIError
+          topic.update_attributes(featured_link: URI.extract(featured_link).first)
+        end
+      end
+    end
+  end
+end
diff --git a/app/jobs/onceoff/fix_posts_read.rb b/app/jobs/onceoff/fix_posts_read.rb
new file mode 100644
index 0000000000..2505038723
--- /dev/null
+++ b/app/jobs/onceoff/fix_posts_read.rb
@@ -0,0 +1,21 @@
+module Jobs
+  class FixPostsRead < Jobs::Onceoff
+    def execute_onceoff(args)
+      # Skipping to the last post in a topic used to count all posts in the topic
+      # as read in user stats. Cap the posts read count to 50 * topics_entered.
+
+      sql = <<~SQL
+UPDATE user_stats
+   SET posts_read_count = topics_entered * 50
+ WHERE user_id IN (
+   SELECT us2.user_id
+     FROM user_stats us2
+    WHERE us2.topics_entered > 0
+      AND us2.posts_read_count / us2.topics_entered > 50
+ )
+      SQL
+
+      UserStat.exec_sql(sql)
+    end
+  end
+end
diff --git a/app/jobs/onceoff/fix_primary_emails_for_staged_users.rb b/app/jobs/onceoff/fix_primary_emails_for_staged_users.rb
new file mode 100644
index 0000000000..d024688da9
--- /dev/null
+++ b/app/jobs/onceoff/fix_primary_emails_for_staged_users.rb
@@ -0,0 +1,49 @@
+require_dependency 'user_destroyer'
+
+module Jobs
+  class FixPrimaryEmailsForStagedUsers < Jobs::Onceoff
+    def execute_onceoff(args)
+      users = User.where(active: false, staged: true).joins(:email_tokens)
+      acting_user = Discourse.system_user
+      destroyer = UserDestroyer.new(acting_user)
+
+      users.group("email_tokens.email")
+        .having("COUNT(email_tokens.email) > 1")
+        .count
+        .each_key do |email|
+
+        query = users.where("email_tokens.email = ?", email).order(id: :asc)
+
+        original_user = query.first
+
+        query.offset(1).each do |user|
+          user.posts.each do |post|
+            post.set_owner(original_user, acting_user)
+          end
+          destroyer.destroy(user, context: I18n.t("user.destroy_reasons.fixed_primary_email"))
+        end
+      end
+
+      User.exec_sql <<~SQL
+      INSERT INTO user_emails (
+        user_id,
+        email,
+        "primary",
+        created_at,
+        updated_at
+      ) SELECT DISTINCT
+        users.id,
+        email_tokens.email,
+        TRUE,
+        users.created_at,
+        users.updated_at
+      FROM users
+      LEFT JOIN user_emails ON user_emails.user_id = users.id
+      LEFT JOIN email_tokens ON email_tokens.user_id = users.id
+      WHERE staged
+      AND NOT active
+      AND user_emails.id IS NULL
+      SQL
+    end
+  end
+end
diff --git a/app/jobs/onceoff/grant_emoji.rb b/app/jobs/onceoff/grant_emoji.rb
index 696fd1f952..39d9ececf8 100644
--- a/app/jobs/onceoff/grant_emoji.rb
+++ b/app/jobs/onceoff/grant_emoji.rb
@@ -6,11 +6,11 @@ module Jobs
       to_award = {}
 
       Post.secured(Guardian.new)
-          .select(:id, :created_at, :cooked, :user_id)
-          .visible
-          .public_posts
-          .where("cooked LIKE '%emoji%'")
-          .find_in_batches do |group|
+        .select(:id, :created_at, :cooked, :user_id)
+        .visible
+        .public_posts
+        .where("cooked LIKE '%emoji%'")
+        .find_in_batches do |group|
         group.each do |p|
           doc = Nokogiri::HTML::fragment(p.cooked)
           if (doc.css("img.emoji") - doc.css(".quote img")).size > 0
diff --git a/app/jobs/onceoff/grant_first_reply_by_email.rb b/app/jobs/onceoff/grant_first_reply_by_email.rb
index ae769f681c..ef8bcc6469 100644
--- a/app/jobs/onceoff/grant_first_reply_by_email.rb
+++ b/app/jobs/onceoff/grant_first_reply_by_email.rb
@@ -7,12 +7,12 @@ module Jobs
       to_award = {}
 
       Post.select(:id, :created_at, :user_id)
-          .secured(Guardian.new)
-          .visible
-          .public_posts
-          .where(via_email: true)
-          .where("post_number > 1")
-          .find_in_batches do |group|
+        .secured(Guardian.new)
+        .visible
+        .public_posts
+        .where(via_email: true)
+        .where("post_number > 1")
+        .find_in_batches do |group|
         group.each do |p|
           to_award[p.user_id] ||= { post_id: p.id, created_at: p.created_at }
         end
diff --git a/app/jobs/onceoff/grant_onebox.rb b/app/jobs/onceoff/grant_onebox.rb
index 0c63e6b7b8..259dfe9702 100644
--- a/app/jobs/onceoff/grant_onebox.rb
+++ b/app/jobs/onceoff/grant_onebox.rb
@@ -8,11 +8,11 @@ module Jobs
       to_award = {}
 
       Post.secured(Guardian.new)
-          .select(:id, :created_at, :raw, :user_id)
-          .visible
-          .public_posts
-          .where("raw LIKE '%http%'")
-          .find_in_batches do |group|
+        .select(:id, :created_at, :raw, :user_id)
+        .visible
+        .public_posts
+        .where("raw LIKE '%http%'")
+        .find_in_batches do |group|
         group.each do |p|
           begin
             # Note we can't use `p.cooked` here because oneboxes have been cooked out
diff --git a/app/jobs/onceoff/migrate_censored_words.rb b/app/jobs/onceoff/migrate_censored_words.rb
new file mode 100644
index 0000000000..03ce4b358c
--- /dev/null
+++ b/app/jobs/onceoff/migrate_censored_words.rb
@@ -0,0 +1,12 @@
+module Jobs
+  class MigrateCensoredWords < Jobs::Onceoff
+    def execute_onceoff(args)
+      row = WatchedWord.exec_sql("SELECT value FROM site_settings WHERE name = 'censored_words'")
+      if row.count > 0
+        row.first["value"].split('|').each do |word|
+          WatchedWord.create(word: word, action: WatchedWord.actions[:censor])
+        end
+      end
+    end
+  end
+end
diff --git a/app/jobs/onceoff/migrate_tagging_plugin.rb b/app/jobs/onceoff/migrate_tagging_plugin.rb
index f0bb91e7e4..9d94b8e88f 100644
--- a/app/jobs/onceoff/migrate_tagging_plugin.rb
+++ b/app/jobs/onceoff/migrate_tagging_plugin.rb
@@ -4,7 +4,7 @@ module Jobs
 
     def execute_onceoff(args)
       all_tags = TopicCustomField.where(name: "tags").select('DISTINCT value').all.map(&:value)
-      tag_id_lookup = Tag.create(all_tags.map { |tag_name| {name: tag_name} }).inject({}) { |h,v| h[v.name] = v.id; h }
+      tag_id_lookup = Tag.create(all_tags.map { |tag_name| { name: tag_name } }).inject({}) { |h, v| h[v.name] = v.id; h }
 
       TopicCustomField.where(name: "tags").find_each do |tcf|
         TopicTag.create(topic_id: tcf.topic_id, tag_id: tag_id_lookup[tcf.value] || Tag.find_by_name(tcf.value).try(:id))
diff --git a/app/jobs/onceoff/migrate_upload_extensions.rb b/app/jobs/onceoff/migrate_upload_extensions.rb
new file mode 100644
index 0000000000..38bcd3a1ea
--- /dev/null
+++ b/app/jobs/onceoff/migrate_upload_extensions.rb
@@ -0,0 +1,11 @@
+module Jobs
+
+  class MigrateUploadExtensions < Jobs::Onceoff
+    def execute_onceoff(args)
+      Upload.find_each do |upload|
+        upload.extension = File.extname(upload.original_filename)[1..10]
+        upload.save
+      end
+    end
+  end
+end
diff --git a/app/jobs/onceoff/retro_grant_anniversary.rb b/app/jobs/onceoff/retro_grant_anniversary.rb
index 2b338e6dcd..9cbdddd810 100644
--- a/app/jobs/onceoff/retro_grant_anniversary.rb
+++ b/app/jobs/onceoff/retro_grant_anniversary.rb
@@ -14,4 +14,3 @@ module Jobs
   end
 
 end
-
diff --git a/app/jobs/onceoff/retro_recent_time_read.rb b/app/jobs/onceoff/retro_recent_time_read.rb
new file mode 100644
index 0000000000..1dd1ce0289
--- /dev/null
+++ b/app/jobs/onceoff/retro_recent_time_read.rb
@@ -0,0 +1,21 @@
+module Jobs
+  class RetroRecentTimeRead < Jobs::Onceoff
+    def execute_onceoff(args)
+      # update past records by evenly distributing total time reading among each post read
+      sql = <<~SQL
+      UPDATE user_visits uv1
+         SET time_read = (
+        SELECT (
+          uv1.posts_read
+          / (SELECT CAST(sum(uv2.posts_read) AS FLOAT) FROM user_visits uv2 where uv2.user_id = uv1.user_id)
+          * COALESCE((SELECT us.time_read FROM user_stats us WHERE us.user_id = uv1.user_id), 0)
+        )
+      )
+      WHERE EXISTS (SELECT 1 FROM user_stats stats WHERE stats.user_id = uv1.user_id AND stats.posts_read_count > 0 LIMIT 1)
+        AND EXISTS (SELECT 1 FROM user_visits visits WHERE visits.user_id = uv1.user_id AND visits.posts_read > 0 LIMIT 1)
+      SQL
+
+      UserVisit.exec_sql(sql)
+    end
+  end
+end
diff --git a/app/jobs/regular/automatic_group_membership.rb b/app/jobs/regular/automatic_group_membership.rb
index dbe679889b..4e688d8400 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})$'")
-          .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)
+      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|
+        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 0532108181..15c0c01ad0 100644
--- a/app/jobs/regular/crawl_topic_link.rb
+++ b/app/jobs/regular/crawl_topic_link.rb
@@ -1,50 +1,12 @@
 require 'open-uri'
 require 'nokogiri'
 require 'excon'
-require 'final_destination'
+require_dependency 'retrieve_title'
+require_dependency 'topic_link'
 
 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 +26,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 +34,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 651dd2b0f2..ef081cee95 100644
--- a/app/jobs/regular/create_avatar_thumbnails.rb
+++ b/app/jobs/regular/create_avatar_thumbnails.rb
@@ -3,12 +3,13 @@ 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?
 
       return unless upload = Upload.find_by(id: upload_id)
-      return unless user = User.find(args[:user_id] || upload.user_id)
+      return unless user = User.find_by(id: args[:user_id] || upload.user_id)
 
       Discourse.avatar_sizes.each do |size|
         OptimizedImage.create_for(upload, size, size, filename: upload.original_filename, allow_animation: SiteSetting.allow_animated_avatars)
diff --git a/app/jobs/regular/create_backup.rb b/app/jobs/regular/create_backup.rb
index 1f5313b071..f9327567c6 100644
--- a/app/jobs/regular/create_backup.rb
+++ b/app/jobs/regular/create_backup.rb
@@ -5,7 +5,7 @@ module Jobs
     sidekiq_options retry: false
 
     def execute(args)
-      BackupRestore.backup!(Discourse.system_user.id, publish_to_message_bus: false, with_uploads: SiteSetting.backup_with_uploads)
+      BackupRestore.backup!(Discourse.system_user.id, publish_to_message_bus: false, with_uploads: SiteSetting.backup_with_uploads, fork: false)
     end
   end
 end
diff --git a/app/jobs/regular/delete_topic.rb b/app/jobs/regular/delete_topic.rb
index e50cd9c2da..bfb23f568c 100644
--- a/app/jobs/regular/delete_topic.rb
+++ b/app/jobs/regular/delete_topic.rb
@@ -12,7 +12,7 @@ module Jobs
 
       if Guardian.new(topic_timer.user).can_delete?(topic)
         first_post = topic.ordered_posts.first
-        PostDestroyer.new(topic_timer.user, first_post, { context: I18n.t("topic_statuses.auto_deleted_by_timer") }).destroy
+        PostDestroyer.new(topic_timer.user, first_post, context: I18n.t("topic_statuses.auto_deleted_by_timer")).destroy
         topic_timer.trash!(Discourse.system_user)
       end
     end
diff --git a/app/jobs/regular/download_avatar_from_url.rb b/app/jobs/regular/download_avatar_from_url.rb
index 83e687fed9..be5f683986 100644
--- a/app/jobs/regular/download_avatar_from_url.rb
+++ b/app/jobs/regular/download_avatar_from_url.rb
@@ -12,7 +12,15 @@ module Jobs
 
       return unless user = User.find_by(id: user_id)
 
-      UserAvatar.import_url_for_user(url, user, override_gravatar: args[:override_gravatar])
+      begin
+        UserAvatar.import_url_for_user(
+          url,
+          user,
+          override_gravatar: args[:override_gravatar]
+        )
+      rescue Discourse::InvalidParameters => e
+        raise e unless e.message == 'url'
+      end
     end
 
   end
diff --git a/app/jobs/regular/emit_web_hook_event.rb b/app/jobs/regular/emit_web_hook_event.rb
index 46ce3f43bd..f58b558ebb 100644
--- a/app/jobs/regular/emit_web_hook_event.rb
+++ b/app/jobs/regular/emit_web_hook_event.rb
@@ -8,7 +8,7 @@ module Jobs
       end
 
       web_hook = WebHook.find_by(id: args[:web_hook_id])
-      raise Discourse::InvalidParameters(:web_hook_id) if web_hook.blank?
+      raise Discourse::InvalidParameters.new(:web_hook_id) if web_hook.blank?
 
       unless ping_event?(args[:event_type])
         return unless web_hook.active?
@@ -71,7 +71,7 @@ module Jobs
     end
 
     def web_hook_request(args, web_hook)
-      uri = URI(web_hook.payload_url)
+      uri = URI(web_hook.payload_url.strip)
 
       conn = Excon.new(
         uri.to_s,
@@ -83,12 +83,13 @@ module Jobs
       web_hook_event = WebHookEvent.create!(web_hook_id: web_hook.id)
 
       begin
-        content_type = case web_hook.content_type
-                       when WebHook.content_types['application/x-www-form-urlencoded']
-                         'application/x-www-form-urlencoded'
-                       else
-                         'application/json'
-                       end
+        content_type =
+          case web_hook.content_type
+          when WebHook.content_types['application/x-www-form-urlencoded']
+            'application/x-www-form-urlencoded'
+          else
+            'application/json'
+          end
 
         headers = {
           'Accept' => '*/*',
diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb
index 336c0bfdcc..5eca7dd91b 100644
--- a/app/jobs/regular/export_csv_file.rb
+++ b/app/jobs/regular/export_csv_file.rb
@@ -8,18 +8,18 @@ module Jobs
 
     sidekiq_options retry: false
 
-    HEADER_ATTRS_FOR ||= HashWithIndifferentAccess.new({
-      user_archive:   ['topic_title','category','sub_category','is_pm','post','like_count','reply_count','url','created_at'],
-      user_list:      ['id','name','username','email','title','created_at','last_seen_at','last_posted_at','last_emailed_at','trust_level','approved','suspended_at','suspended_till','blocked','active','admin','moderator','ip_address'],
-      user_stats:     ['topics_entered','posts_read_count','time_read','topic_count','post_count','likes_given','likes_received'],
-      user_profile:   ['location','website','views'],
-      user_sso:       ['external_id','external_email', 'external_username', 'external_name', 'external_avatar_url'],
-      staff_action:   ['staff_user','action','subject','created_at','details', 'context'],
-      screened_email: ['email','action','match_count','last_match_at','created_at','ip_address'],
-      screened_ip:    ['ip_address','action','match_count','last_match_at','created_at'],
-      screened_url:   ['domain','action','match_count','last_match_at','created_at'],
-      report:         ['date', 'value'],
-    })
+    HEADER_ATTRS_FOR ||= HashWithIndifferentAccess.new(
+      user_archive:   ['topic_title', 'category', 'sub_category', 'is_pm', 'post', 'like_count', 'reply_count', 'url', 'created_at'],
+      user_list:      ['id', 'name', 'username', 'email', 'title', 'created_at', 'last_seen_at', 'last_posted_at', 'last_emailed_at', 'trust_level', 'approved', 'suspended_at', 'suspended_till', 'silenced_till', 'active', 'admin', 'moderator', 'ip_address', 'staged'],
+      user_stats:     ['topics_entered', 'posts_read_count', 'time_read', 'topic_count', 'post_count', 'likes_given', 'likes_received'],
+      user_profile:   ['location', 'website', 'views'],
+      user_sso:       ['external_id', 'external_email', 'external_username', 'external_name', 'external_avatar_url'],
+      staff_action:   ['staff_user', 'action', 'subject', 'created_at', 'details', 'context'],
+      screened_email: ['email', 'action', 'match_count', 'last_match_at', 'created_at', 'ip_address'],
+      screened_ip:    ['ip_address', 'action', 'match_count', 'last_match_at', 'created_at'],
+      screened_url:   ['domain', 'action', 'match_count', 'last_match_at', 'created_at'],
+      report:         ['date', 'value']
+    )
 
     def execute(args)
       @entity = args[:entity]
@@ -58,11 +58,11 @@ module Jobs
       return enum_for(:user_archive_export) unless block_given?
 
       Post.includes(topic: :category)
-          .where(user_id: @current_user.id)
-          .select(:topic_id, :post_number, :raw, :like_count, :reply_count, :created_at)
-          .order(:created_at)
-          .with_deleted
-          .each do |user_archive|
+        .where(user_id: @current_user.id)
+        .select(:topic_id, :post_number, :raw, :like_count, :reply_count, :created_at)
+        .order(:created_at)
+        .with_deleted
+        .each do |user_archive|
         yield get_user_archive_fields(user_archive)
       end
     end
@@ -132,9 +132,9 @@ module Jobs
       return enum_for(:screened_url_export) unless block_given?
 
       ScreenedUrl.select("domain, sum(match_count) as match_count, max(last_match_at) as last_match_at, min(created_at) as created_at")
-                 .group(:domain)
-                 .order('last_match_at DESC')
-                 .each do |screened_url|
+        .group(:domain)
+        .order('last_match_at DESC')
+        .each do |screened_url|
         yield get_screened_url_fields(screened_url)
       end
     end
@@ -142,10 +142,10 @@ module Jobs
     def report_export
       return enum_for(:report_export) unless block_given?
 
-      @extra[:start_date]  = @extra[:start_date].to_date if @extra[:start_date].is_a?(String)
-      @extra[:end_date]    = @extra[:end_date].to_date   if @extra[:end_date].is_a?(String)
-      @extra[:category_id] = @extra[:category_id].to_i   if @extra[:category_id]
-      @extra[:group_id]    = @extra[:group_id].to_i      if @extra[:group_id]
+      @extra[:start_date] = @extra[:start_date].to_date if @extra[:start_date].is_a?(String)
+      @extra[:end_date] = @extra[:end_date].to_date if @extra[:end_date].is_a?(String)
+      @extra[:category_id] = @extra[:category_id].present? ? @extra[:category_id].to_i : nil
+      @extra[:group_id] = @extra[:group_id].present? ? @extra[:group_id].to_i : nil
       Report.find(@extra[:name], @extra).data.each do |row|
         yield [row[:x].to_s(:db), row[:y].to_s(:db)]
       end
@@ -181,14 +181,14 @@ module Jobs
 
       def get_base_user_array(user)
         user_array = []
-        user_array.push(user.id,escape_comma(user.name),user.username,user.email,escape_comma(user.title),user.created_at,user.last_seen_at,user.last_posted_at,user.last_emailed_at,user.trust_level,user.approved,user.suspended_at,user.suspended_till,user.blocked,user.active,user.admin,user.moderator,user.ip_address,user.user_stat.topics_entered,user.user_stat.posts_read_count,user.user_stat.time_read,user.user_stat.topic_count,user.user_stat.post_count,user.user_stat.likes_given,user.user_stat.likes_received,escape_comma(user.user_profile.location),user.user_profile.website,user.user_profile.views)
+        user_array.push(user.id, escape_comma(user.name), user.username, user.email, escape_comma(user.title), user.created_at, user.last_seen_at, user.last_posted_at, user.last_emailed_at, user.trust_level, user.approved, user.suspended_at, user.suspended_till, user.silenced_till, user.active, user.admin, user.moderator, user.ip_address, user.staged, user.user_stat.topics_entered, user.user_stat.posts_read_count, user.user_stat.time_read, user.user_stat.topic_count, user.user_stat.post_count, user.user_stat.likes_given, user.user_stat.likes_received, escape_comma(user.user_profile.location), user.user_profile.website, user.user_profile.views)
       end
 
       def add_single_sign_on(user, user_info_array)
         if user.single_sign_on_record
-          user_info_array.push(user.single_sign_on_record.external_id,user.single_sign_on_record.external_email,user.single_sign_on_record.external_username,escape_comma(user.single_sign_on_record.external_name),user.single_sign_on_record.external_avatar_url)
+          user_info_array.push(user.single_sign_on_record.external_id, user.single_sign_on_record.external_email, user.single_sign_on_record.external_username, escape_comma(user.single_sign_on_record.external_name), user.single_sign_on_record.external_avatar_url)
         else
-          user_info_array.push(nil,nil,nil,nil,nil)
+          user_info_array.push(nil, nil, nil, nil, nil)
         end
         user_info_array
       end
@@ -218,13 +218,15 @@ module Jobs
         topic_data = Topic.with_deleted.find_by(id: user_archive['topic_id']) if topic_data.nil?
         return user_archive_array if topic_data.nil?
         category = topic_data.category
-        sub_category = "-"
+        sub_category_name = "-"
         if category
           category_name = category.name
-          if !category.parent_category_id.nil?
+          if category.parent_category_id.present?
             # sub category
-            category_name = Category.find_by(id: category.parent_category_id).name
-            sub_category = category.name
+            if parent_category = Category.find_by(id: category.parent_category_id)
+              category_name = parent_category.name
+              sub_category_name = category.name
+            end
           end
         else
           # PM
@@ -233,7 +235,7 @@ module Jobs
         is_pm = topic_data.archetype == "private_message" ? I18n.t("csv_export.boolean_yes") : I18n.t("csv_export.boolean_no")
         url = "#{Discourse.base_url}/t/#{topic_data.slug}/#{topic_data.id}/#{user_archive['post_number']}"
 
-        topic_hash = {"post" => user_archive['raw'], "topic_title" => topic_data.title, "category" => category_name, "sub_category" => sub_category, "is_pm" => is_pm, "url" => url}
+        topic_hash = { "post" => user_archive['raw'], "topic_title" => topic_data.title, "category" => category_name, "sub_category" => sub_category_name, "is_pm" => is_pm, "url" => url }
         user_archive.merge!(topic_hash)
 
         HEADER_ATTRS_FOR['user_archive'].each do |attr|
diff --git a/app/jobs/regular/invite_email.rb b/app/jobs/regular/invite_email.rb
index cd8ecb91af..f373134a2b 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 393b324dc1..f966dbaa19 100644
--- a/app/jobs/regular/notify_mailing_list_subscribers.rb
+++ b/app/jobs/regular/notify_mailing_list_subscribers.rb
@@ -1,3 +1,5 @@
+require_dependency 'post'
+
 module Jobs
 
   class NotifyMailingListSubscribers < Jobs::Base
@@ -13,25 +15,30 @@ module Jobs
       return if !post || post.trashed? || post.user_deleted? || !post.topic
 
       users =
-          User.activated.not_blocked.not_suspended.real
-          .joins(:user_option)
-          .where('user_options.mailing_list_mode AND user_options.mailing_list_mode_frequency > 0')
-          .where('NOT EXISTS (
+          User.activated.not_silenced.not_suspended.real
+            .joins(:user_option)
+            .where('user_options.mailing_list_mode AND user_options.mailing_list_mode_frequency > 0')
+            .where('NOT EXISTS (
                       SELECT 1
                       FROM muted_users mu
                       WHERE mu.muted_user_id = ? AND mu.user_id = users.id
                   )', post.user_id)
-          .where('NOT EXISTS (
+            .where('NOT EXISTS (
                       SELECT 1
                       FROM topic_users tu
                       WHERE tu.topic_id = ? AND tu.user_id = users.id AND tu.notification_level = ?
                   )', post.topic_id, TopicUser.notification_levels[:muted])
-          .where('NOT EXISTS (
+            .where('NOT EXISTS (
                      SELECT 1
                      FROM category_users cu
                      WHERE cu.category_id = ? AND cu.user_id = users.id AND cu.notification_level = ?
                   )', post.topic.category_id, CategoryUser.notification_levels[:muted])
 
+      if SiteSetting.must_approve_users
+        users = users.where(approved: true)
+      end
+
+      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)
@@ -56,7 +63,7 @@ module Jobs
               end
             end
           rescue => e
-            Discourse.handle_job_exception(e, error_context(args, "Sending post to mailing list subscribers", { user_id: user.id, user_email: user.email }))
+            Discourse.handle_job_exception(e, error_context(args, "Sending post to mailing list subscribers", user_id: user.id, user_email: user.email))
           end
         end
       end
diff --git a/app/jobs/regular/notify_moved_posts.rb b/app/jobs/regular/notify_moved_posts.rb
index da1300e86c..9916bab8e7 100644
--- a/app/jobs/regular/notify_moved_posts.rb
+++ b/app/jobs/regular/notify_moved_posts.rb
@@ -17,8 +17,8 @@ module Jobs
             p.user.notifications.create(notification_type: Notification.types[:moved_post],
                                         topic_id: p.topic_id,
                                         post_number: p.post_number,
-                                        data: {topic_title: p.topic.title,
-                                               display_username: moved_by.username}.to_json)
+                                        data: { topic_title: p.topic.title,
+                                                display_username: moved_by.username }.to_json)
             users_notified << p.user_id
           end
         end
diff --git a/app/jobs/regular/post_alert.rb b/app/jobs/regular/post_alert.rb
index cc93aad285..6fb5fb0616 100644
--- a/app/jobs/regular/post_alert.rb
+++ b/app/jobs/regular/post_alert.rb
@@ -1,3 +1,5 @@
+require_dependency 'post_alerter'
+
 module Jobs
   class PostAlert < Jobs::Base
 
diff --git a/app/jobs/regular/process_post.rb b/app/jobs/regular/process_post.rb
index ddfb0ff3d5..88e340501a 100644
--- a/app/jobs/regular/process_post.rb
+++ b/app/jobs/regular/process_post.rb
@@ -37,6 +37,14 @@ module Jobs
           post.publish_change_to_clients! :revised
         end
       end
+
+      if !post.user&.staff? && !post.user&.staged?
+        s = post.cooked
+        s << " #{post.topic.title}" if post.post_number == 1
+        if !args[:bypass_bump] && WordWatcher.new(s).should_flag?
+          PostAction.act(Discourse.system_user, post, PostActionType.types[:inappropriate]) rescue PostAction::AlreadyActed
+        end
+      end
     end
 
     # onebox may have added some links, so extract them now
diff --git a/app/jobs/regular/publish_topic_to_category.rb b/app/jobs/regular/publish_topic_to_category.rb
index 9127b6841e..a98f0dddff 100644
--- a/app/jobs/regular/publish_topic_to_category.rb
+++ b/app/jobs/regular/publish_topic_to_category.rb
@@ -2,7 +2,7 @@ module Jobs
   class PublishTopicToCategory < Jobs::Base
     def execute(args)
       topic_timer = TopicTimer.find_by(id: args[:topic_timer_id] || args[:topic_status_update_id])
-      raise Discourse::InvalidParameters.new(:topic_timer_id) if topic_timer.blank?
+      return if topic_timer.blank?
 
       topic = topic_timer.topic
       return if topic.blank?
diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb
index c14dae92fe..b920c60590 100644
--- a/app/jobs/regular/pull_hotlinked_images.rb
+++ b/app/jobs/regular/pull_hotlinked_images.rb
@@ -5,14 +5,34 @@ require_dependency 'upload_creator'
 module Jobs
 
   class PullHotlinkedImages < Jobs::Base
-
     sidekiq_options queue: 'low'
 
     def initialize
-      # maximum size of the file in bytes
       @max_size = SiteSetting.max_image_size_kb.kilobytes
     end
 
+    def download(src)
+      downloaded = nil
+
+      begin
+        retries ||= 3
+
+        downloaded = FileHelper.download(
+          src,
+          max_file_size: @max_size,
+          tmp_file_name: "discourse-hotlinked",
+          follow_redirect: true
+        )
+      rescue
+        if (retries -= 1) > 0
+          sleep 1
+          retry
+        end
+      end
+
+      downloaded
+    end
+
     def execute(args)
       return unless SiteSetting.download_remote_images_to_local?
 
@@ -24,36 +44,44 @@ module Jobs
 
       raw = post.raw.dup
       start_raw = raw.dup
+
       downloaded_urls = {}
 
+      large_images = JSON.parse(post.custom_fields[Post::LARGE_IMAGES].presence || "[]") rescue []
+      broken_images = JSON.parse(post.custom_fields[Post::BROKEN_IMAGES].presence || "[]") rescue []
+      downloaded_images = JSON.parse(post.custom_fields[Post::DOWNLOADED_IMAGES].presence || "{}") rescue {}
+
+      has_new_large_image  = false
+      has_new_broken_image = false
+      has_downloaded_image = false
+
       extract_images_from(post.cooked).each do |image|
         src = original_src = image['src']
-        src = "http:" + src if src.start_with?("//")
+        src = "#{SiteSetting.force_https ? "https" : "http"}:#{src}" if src.start_with?("//")
 
         if is_valid_image_url(src)
-          hotlinked = nil
           begin
             # have we already downloaded that file?
-            unless downloaded_urls.include?(src)
-              begin
-                hotlinked = FileHelper.download(
-                  src,
-                  max_file_size: @max_size,
-                  tmp_file_name: "discourse-hotlinked",
-                  follow_redirect: true
-                )
-              rescue Discourse::InvalidParameters
-              end
-              if hotlinked
+            unless downloaded_images.include?(src) || large_images.include?(src) || broken_images.include?(src)
+              if hotlinked = download(src)
                 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
+                    downloaded_images[src.sub(/^https?:/i, "")] = upload.id
+                    has_downloaded_image = true
+                  else
+                    log(:info, "Failed to pull hotlinked image for post: #{post_id}: #{src} - #{upload.errors.full_messages.join("\n")}")
+                  end
                 else
-                  Rails.logger.info("Failed to pull hotlinked image for post: #{post_id}: #{src} - Image is bigger than #{@max_size}")
+                  large_images << original_src.sub(/^https?:/i, "")
+                  has_new_large_image = true
                 end
               else
-                Rails.logger.error("There was an error while downloading '#{src}' locally for post: #{post_id}")
+                broken_images << original_src.sub(/^https?:/i, "")
+                has_new_broken_image = true
               end
             end
             # have we successfully downloaded that file?
@@ -79,27 +107,33 @@ 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(:error, "Failed to pull hotlinked image (#{src}) post: #{post_id}\n" + e.message + "\n" + e.backtrace.join("\n"))
           end
         end
-
       end
 
+      large_images.uniq!
+      broken_images.uniq!
+
+      post.custom_fields[Post::LARGE_IMAGES]      = large_images.to_json      if large_images.present?
+      post.custom_fields[Post::BROKEN_IMAGES]     = broken_images.to_json     if broken_images.present?
+      post.custom_fields[Post::DOWNLOADED_IMAGES] = downloaded_images.to_json if downloaded_images.present?
+      # only save custom fields if there are any
+      post.save_custom_fields if large_images.present? || broken_images.present? || downloaded_images.present?
+
       post.reload
+
       if start_raw == post.raw && raw != post.raw
         changes = { raw: raw, edit_reason: I18n.t("upload.edit_reason") }
-        # we never want that job to bump the topic
-        options = { bypass_bump: true }
-        post.revise(Discourse.system_user, changes, options)
+        post.revise(Discourse.system_user, changes, bypass_bump: true)
+      elsif has_downloaded_image || has_new_large_image || has_new_broken_image
+        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 +143,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.Upload.s3_cdn_url.present? && URI.parse(SiteSetting.Upload.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 651a7486bb..965acb963b 100644
--- a/app/jobs/regular/push_notification.rb
+++ b/app/jobs/regular/push_notification.rb
@@ -13,15 +13,20 @@ module Jobs
       }
 
       clients = args["clients"]
-      clients.group_by{|r| r[1]}.each do |push_url, group|
+      clients.group_by { |r| r[1] }.each do |push_url, group|
         notifications = group.map do |client_id, _|
-          notification.merge({
-            client_id: client_id
-          })
+          notification.merge(client_id: client_id)
         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/regular/retrieve_topic.rb b/app/jobs/regular/retrieve_topic.rb
index 2820f05e31..9d5d4e248c 100644
--- a/app/jobs/regular/retrieve_topic.rb
+++ b/app/jobs/regular/retrieve_topic.rb
@@ -19,5 +19,3 @@ module Jobs
   end
 
 end
-
-
diff --git a/app/jobs/regular/send_system_message.rb b/app/jobs/regular/send_system_message.rb
index d0dc41ec6f..3eb9f002d7 100644
--- a/app/jobs/regular/send_system_message.rb
+++ b/app/jobs/regular/send_system_message.rb
@@ -13,7 +13,7 @@ module Jobs
       return if user.blank?
 
       system_message = SystemMessage.new(user)
-      system_message.create(args[:message_type])
+      system_message.create(args[:message_type], args[:message_options]&.symbolize_keys || {})
     end
 
   end
diff --git a/app/jobs/regular/update_top_redirection.rb b/app/jobs/regular/update_top_redirection.rb
index 776cdfca7d..592dc6b840 100644
--- a/app/jobs/regular/update_top_redirection.rb
+++ b/app/jobs/regular/update_top_redirection.rb
@@ -3,9 +3,12 @@ module Jobs
   class UpdateTopRedirection < Jobs::Base
 
     def execute(args)
-      if user = User.find_by(id: args[:user_id])
-        user.user_option.update_column(:last_redirected_to_top_at, args[:redirected_at])
-      end
+      return if args[:user_id].blank? || args[:redirected_at].blank?
+
+      UserOption
+        .where(user_id: args[:user_id])
+        .limit(1)
+        .update_all(last_redirected_to_top_at: args[:redirected_at])
     end
   end
 
diff --git a/app/jobs/regular/user_email.rb b/app/jobs/regular/user_email.rb
index f9def1f451..0eeea9ecbb 100644
--- a/app/jobs/regular/user_email.rb
+++ b/app/jobs/regular/user_email.rb
@@ -1,4 +1,5 @@
 require_dependency 'email/sender'
+require_dependency 'user_notifications'
 
 module Jobs
 
@@ -28,14 +29,13 @@ module Jobs
         notification = Notification.find_by(id: args[:notification_id])
       end
 
-      message, skip_reason = message_for_email(user,
-                                               post,
-                                               type,
-                                               notification,
-                                               args[:notification_type],
-                                               args[:notification_data_hash],
-                                               args[:email_token],
-                                               args[:to_address])
+      message, skip_reason = message_for_email(
+        user,
+        post,
+        type,
+        notification,
+        args
+      )
 
       if message
         Email::Sender.new(message, type, user).send
@@ -56,11 +56,21 @@ module Jobs
       quoted
     }
 
-    def message_for_email(user, post, type, notification, notification_type=nil, notification_data_hash=nil, email_token=nil, to_address=nil)
+    def message_for_email(user, post, type, notification, args = nil)
+      args ||= {}
+
+      notification_type = args[:notification_type]
+      notification_data_hash = args[:notification_data_hash]
+      email_token = args[:email_token]
+      to_address = args[:to_address]
+
       set_skip_context(type, user.id, to_address || user.email, post.try(:id))
 
       return skip_message(I18n.t("email_log.anonymous_user"))   if user.anonymous?
-      return skip_message(I18n.t("email_log.suspended_not_pm")) if user.suspended? && type.to_s != "user_private_message"
+
+      if user.suspended? && !["user_private_message", "account_suspended"].include?(type.to_s)
+        return skip_message(I18n.t("email_log.suspended_not_pm"))
+      end
 
       return if user.staged && type.to_s == "digest"
 
@@ -90,8 +100,8 @@ module Jobs
            user.user_option.mailing_list_mode_frequency > 0 && # don't catch notifications for users on daily mailing list mode
            (!post.try(:topic).try(:private_message?)) &&
            NOTIFICATIONS_SENT_BY_MAILING_LIST.include?(email_args[:notification_type])
-           # no need to log a reason when the mail was already sent via the mailing list job
-           return [nil, nil]
+          # no need to log a reason when the mail was already sent via the mailing list job
+          return [nil, nil]
         end
 
         unless user.user_option.email_always?
@@ -107,8 +117,8 @@ module Jobs
       # Make sure that mailer exists
       raise Discourse::InvalidParameters.new("type=#{type}") unless UserNotifications.respond_to?(type)
 
-      email_args[:email_token] = email_token  if email_token.present?
-      email_args[:new_email]   = user.email   if type.to_s == "notify_old_email"
+      email_args[:email_token] = email_token if email_token.present?
+      email_args[:new_email] = user.email if type.to_s == "notify_old_email"
 
       if EmailLog.reached_max_emails?(user, type.to_s)
         return skip_message(I18n.t('email_log.exceeded_emails_limit'))
@@ -118,6 +128,10 @@ module Jobs
         return skip_message(I18n.t('email_log.exceeded_bounces_limit'))
       end
 
+      if args[:user_history_id]
+        email_args[:user_history] = UserHistory.where(id: args[:user_history_id]).first
+      end
+
       message = EmailLog.unique_email_per_post(post, user) do
         UserNotifications.send(type, user, email_args)
       end
@@ -141,7 +155,7 @@ module Jobs
 
     # extracted from sidekiq
     def self.seconds_to_delay(count)
-      (count ** 4) + 15 + (rand(30) * (count + 1))
+      (count**4) + 15 + (rand(30) * (count + 1))
     end
 
     private
diff --git a/app/jobs/scheduled/auto_queue_handler.rb b/app/jobs/scheduled/auto_queue_handler.rb
new file mode 100644
index 0000000000..6e201b06ce
--- /dev/null
+++ b/app/jobs/scheduled/auto_queue_handler.rb
@@ -0,0 +1,31 @@
+# This job will automatically act on records that have gone unhandled on a
+# queue for a long time.
+module Jobs
+  class AutoQueueHandler < Jobs::Scheduled
+
+    every 1.day
+
+    def execute(args)
+      return unless SiteSetting.auto_handle_queued_age.to_i > 0
+
+      guardian = Guardian.new(Discourse.system_user)
+
+      # Flags
+      flags = FlagQuery.flagged_post_actions(filter: 'active')
+        .where('post_actions.created_at < ?', SiteSetting.auto_handle_queued_age.to_i.days.ago)
+
+      Post.where(id: flags.pluck(:post_id).uniq).each do |post|
+        PostAction.defer_flags!(post, Discourse.system_user)
+      end
+
+      # Posts
+      queued_posts = QueuedPost.visible
+        .where(state: QueuedPost.states[:new])
+        .where('created_at < ?', SiteSetting.auto_handle_queued_age.to_i.days.ago)
+
+      queued_posts.each do |queued_post|
+        queued_post.reject!(Discourse.system_user)
+      end
+    end
+  end
+end
diff --git a/app/jobs/scheduled/badge_grant.rb b/app/jobs/scheduled/badge_grant.rb
index dc5def0684..a9d9b915a7 100644
--- a/app/jobs/scheduled/badge_grant.rb
+++ b/app/jobs/scheduled/badge_grant.rb
@@ -15,7 +15,7 @@ module Jobs
           BadgeGranter.backfill(b)
         rescue => ex
           # TODO - expose errors in UI
-          Discourse.handle_job_exception(ex, error_context({}, code_desc: 'Exception granting badges', extra: {badge_id: b.id}))
+          Discourse.handle_job_exception(ex, error_context({}, code_desc: 'Exception granting badges', extra: { badge_id: b.id }))
         end
       end
 
diff --git a/app/jobs/scheduled/clean_up_email_logs.rb b/app/jobs/scheduled/clean_up_email_logs.rb
index 30305c4d9a..48421c1cfa 100644
--- a/app/jobs/scheduled/clean_up_email_logs.rb
+++ b/app/jobs/scheduled/clean_up_email_logs.rb
@@ -9,8 +9,8 @@ module Jobs
       threshold = SiteSetting.delete_email_logs_after_days.days.ago
 
       EmailLog.where(reply_key: nil)
-              .where("created_at < ?", threshold)
-              .delete_all
+        .where("created_at < ?", threshold)
+        .delete_all
     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 0000000000..bd3bc2e04a
--- /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_unmatched_emails.rb b/app/jobs/scheduled/clean_up_unmatched_emails.rb
index 6ce62f3f23..4fff997ef8 100644
--- a/app/jobs/scheduled/clean_up_unmatched_emails.rb
+++ b/app/jobs/scheduled/clean_up_unmatched_emails.rb
@@ -7,8 +7,8 @@ module Jobs
       last_match_threshold = SiteSetting.max_age_unmatched_emails.days.ago
 
       ScreenedEmail.where(action_type: ScreenedEmail.actions[:block])
-                   .where("last_match_at < ?", last_match_threshold)
-                   .destroy_all
+        .where("last_match_at < ?", last_match_threshold)
+        .destroy_all
     end
 
   end
diff --git a/app/jobs/scheduled/clean_up_unmatched_ips.rb b/app/jobs/scheduled/clean_up_unmatched_ips.rb
index abd3cdc442..a9b4e4d5d3 100644
--- a/app/jobs/scheduled/clean_up_unmatched_ips.rb
+++ b/app/jobs/scheduled/clean_up_unmatched_ips.rb
@@ -11,8 +11,8 @@ module Jobs
 
       # remove old unmatched IP addresses
       ScreenedIpAddress.where(action_type: ScreenedIpAddress.actions[:block])
-                       .where("last_match_at < ? OR (last_match_at IS NULL AND created_at < ?)", last_match_threshold, last_match_threshold)
-                       .destroy_all
+        .where("last_match_at < ? OR (last_match_at IS NULL AND created_at < ?)", last_match_threshold, last_match_threshold)
+        .destroy_all
     end
 
   end
diff --git a/app/jobs/scheduled/clean_up_unsubscribe_keys.rb b/app/jobs/scheduled/clean_up_unsubscribe_keys.rb
index 0535866671..606a13390b 100644
--- a/app/jobs/scheduled/clean_up_unsubscribe_keys.rb
+++ b/app/jobs/scheduled/clean_up_unsubscribe_keys.rb
@@ -10,4 +10,3 @@ module Jobs
   end
 
 end
-
diff --git a/app/jobs/scheduled/clean_up_unused_staged_users.rb b/app/jobs/scheduled/clean_up_unused_staged_users.rb
index 074b09e978..ad4f1b20d4 100644
--- a/app/jobs/scheduled/clean_up_unused_staged_users.rb
+++ b/app/jobs/scheduled/clean_up_unused_staged_users.rb
@@ -13,7 +13,7 @@ module Jobs
         .find_each do |user|
 
         begin
-          destroyer.destroy(user)
+          destroyer.destroy(user, context: I18n.t("user.destroy_reasons.unused_staged_user"))
         rescue => e
           Discourse.handle_job_exception(e,
             message: "Cleaning up unused staged user",
diff --git a/app/jobs/scheduled/clean_up_uploads.rb b/app/jobs/scheduled/clean_up_uploads.rb
index 87e4acad28..e2b9353ede 100644
--- a/app/jobs/scheduled/clean_up_uploads.rb
+++ b/app/jobs/scheduled/clean_up_uploads.rb
@@ -5,13 +5,29 @@ 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.Upload.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
+
+          if s3_cdn_hostname.present? && s3_hostname.present?
+            url.gsub!(s3_cdn_hostname, s3_hostname)
+          end
+
+          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
 
@@ -19,7 +35,7 @@ module Jobs
         .where("uploads.created_at < ?", grace_period.hour.ago)
         .joins("LEFT JOIN post_uploads pu ON pu.upload_id = uploads.id")
         .joins("LEFT JOIN users u ON u.uploaded_avatar_id = uploads.id")
-        .joins("LEFT JOIN user_avatars ua ON (ua.gravatar_upload_id = uploads.id OR ua.custom_upload_id = uploads.id)")
+        .joins("LEFT JOIN user_avatars ua ON ua.gravatar_upload_id = uploads.id OR ua.custom_upload_id = uploads.id")
         .joins("LEFT JOIN user_profiles up ON up.profile_background = uploads.url OR up.card_background = uploads.url")
         .joins("LEFT JOIN categories c ON c.uploaded_logo_id = uploads.id OR c.uploaded_background_id = uploads.id")
         .joins("LEFT JOIN custom_emojis ce ON ce.upload_id = uploads.id")
@@ -29,13 +45,20 @@ module Jobs
         .where("ua.gravatar_upload_id IS NULL AND ua.custom_upload_id IS NULL")
         .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)
+        .where("ce.upload_id IS NULL")
+        .where("tf.upload_id IS NULL")
+
+      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?
-        next if Draft.where("data LIKE '%#{upload.sha1}%'").exists?
-        upload.destroy
+        if upload.sha1.present?
+          encoded_sha = Base62.encode(upload.sha1.hex)
+          next if QueuedPost.where("raw LIKE '%#{upload.sha1}%' OR raw LIKE '%#{encoded_sha}%'").exists?
+          next if Draft.where("data LIKE '%#{upload.sha1}%' OR data LIKE '%#{encoded_sha}%'").exists?
+          upload.destroy
+        else
+          upload.delete
+        end
       end
     end
   end
diff --git a/app/jobs/scheduled/create_missing_avatars.rb b/app/jobs/scheduled/create_missing_avatars.rb
index 2d4befe245..d973e9a0be 100644
--- a/app/jobs/scheduled/create_missing_avatars.rb
+++ b/app/jobs/scheduled/create_missing_avatars.rb
@@ -5,11 +5,11 @@ module Jobs
     def execute(args)
       # backfill in batches of 5000 an hour
       UserAvatar.includes(:user)
-                .joins(:user)
-                .where(last_gravatar_download_attempt: nil)
-                .order("users.last_posted_at DESC")
-                .limit(5000)
-                .each do |u|
+        .joins(:user)
+        .where(last_gravatar_download_attempt: nil)
+        .order("users.last_posted_at DESC")
+        .limit(5000)
+        .each do |u|
         u.user.refresh_avatar
       end
     end
diff --git a/app/jobs/scheduled/dashboard_stats.rb b/app/jobs/scheduled/dashboard_stats.rb
index 2b35fc4380..9556bd7ea1 100644
--- a/app/jobs/scheduled/dashboard_stats.rb
+++ b/app/jobs/scheduled/dashboard_stats.rb
@@ -1,3 +1,7 @@
+require_dependency 'admin_dashboard_data'
+require_dependency 'group'
+require_dependency 'group_message'
+
 module Jobs
   class DashboardStats < Jobs::Scheduled
     every 30.minutes
@@ -7,7 +11,7 @@ module Jobs
       if problems_started_at && problems_started_at < 2.days.ago
         # If there have been problems reported on the dashboard for a while,
         # send a message to admins no more often than once per week.
-        GroupMessage.create(Group[:admins].name, :dashboard_problems, {limit_once_per: 7.days.to_i})
+        GroupMessage.create(Group[:admins].name, :dashboard_problems, limit_once_per: 7.days.to_i)
       end
 
       AdminDashboardData.refresh_stats
diff --git a/app/jobs/scheduled/directory_refresh_older.rb b/app/jobs/scheduled/directory_refresh_older.rb
index 3c25c8151f..93147d6c88 100644
--- a/app/jobs/scheduled/directory_refresh_older.rb
+++ b/app/jobs/scheduled/directory_refresh_older.rb
@@ -4,7 +4,7 @@ module Jobs
 
     def execute(args)
       periods = DirectoryItem.period_types.keys - [:daily]
-      periods.each {|p| DirectoryItem.refresh_period!(p)}
+      periods.each { |p| DirectoryItem.refresh_period!(p) }
     end
   end
 end
diff --git a/app/jobs/scheduled/enqueue_digest_emails.rb b/app/jobs/scheduled/enqueue_digest_emails.rb
index 1bd4ed4fdf..23db70d4e5 100644
--- a/app/jobs/scheduled/enqueue_digest_emails.rb
+++ b/app/jobs/scheduled/enqueue_digest_emails.rb
@@ -14,15 +14,15 @@ module Jobs
     def target_user_ids
       # Users who want to receive digest email within their chosen digest email frequency
       query = User.real
-                  .not_suspended
-                  .activated
-                  .where(staged: false)
-                  .joins(:user_option, :user_stat)
-                  .where("user_options.email_digests")
-                  .where("user_stats.bounce_score < #{SiteSetting.bounce_score_threshold}")
-                  .where("COALESCE(last_emailed_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * user_options.digest_after_minutes)")
-                  .where("COALESCE(last_seen_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * user_options.digest_after_minutes)")
-                  .where("COALESCE(last_seen_at, '2010-01-01') >= CURRENT_TIMESTAMP - ('1 DAY'::INTERVAL * #{SiteSetting.suppress_digest_email_after_days})")
+        .not_suspended
+        .activated
+        .where(staged: false)
+        .joins(:user_option, :user_stat)
+        .where("user_options.email_digests")
+        .where("user_stats.bounce_score < #{SiteSetting.bounce_score_threshold}")
+        .where("COALESCE(last_emailed_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * user_options.digest_after_minutes)")
+        .where("COALESCE(last_seen_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * user_options.digest_after_minutes)")
+        .where("COALESCE(last_seen_at, '2010-01-01') >= CURRENT_TIMESTAMP - ('1 DAY'::INTERVAL * #{SiteSetting.suppress_digest_email_after_days})")
 
       # If the site requires approval, make sure the user is approved
       query = query.where("approved OR moderator OR admin") if SiteSetting.must_approve_users?
diff --git a/app/jobs/scheduled/grant_anniversary_badges.rb b/app/jobs/scheduled/grant_anniversary_badges.rb
index e5e3287cb0..6d0e24bd12 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
@@ -20,7 +22,7 @@ module Jobs
           ub.badge_id = #{Badge::Anniversary} AND
           ub.granted_at BETWEEN '#{fmt_start_date}' AND '#{fmt_end_date}'
         WHERE u.active AND
-          NOT u.blocked AND
+          u.silenced_till IS NULL AND
           NOT p.hidden AND
           p.deleted_at IS NULL AND
           t.visible AND
@@ -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/jobs/scheduled/grant_new_user_of_the_month_badges.rb b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
index c2190d1605..c3db40fbf0 100644
--- a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
+++ b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
@@ -8,7 +8,7 @@ module Jobs
 
     def execute(args)
       badge = Badge.find(Badge::NewUserOfTheMonth)
-      return unless SiteSetting.enable_badges? and badge.enabled?
+      return unless SiteSetting.enable_badges? && badge.enabled?
 
       # Don't award it if a month hasn't gone by
       return if UserBadge.where("badge_id = ? AND granted_at >= ?",
@@ -22,9 +22,11 @@ module Jobs
           user = User.find(user_id)
           if user.badges.where(id: Badge::NewUserOfTheMonth).blank?
             BadgeGranter.grant(badge, user)
-            SystemMessage.new(user).create('new_user_of_the_month', {
-              month_year: Time.now.strftime("%B %Y")
-            })
+
+            SystemMessage.new(user).create('new_user_of_the_month',
+              month_year: Time.now.strftime("%B %Y"),
+              url: "#{Discourse.base_url}/badges"
+            )
           end
         end
       end
@@ -61,10 +63,12 @@ module Jobs
         LEFT OUTER JOIN post_actions AS pa ON
           pa.post_id = p.id AND pa.post_action_type_id = :like
         LEFT OUTER JOIN users AS liked_by ON liked_by.id = pa.user_id
+        LEFT OUTER JOIN topics AS t ON t.id = p.topic_id
         WHERE u.active AND
           u.id > 0 AND
           NOT(u.admin) AND
           NOT(u.moderator) AND
+          t.archetype <> '#{Archetype.private_message}' AND
           u.created_at >= CURRENT_TIMESTAMP - '1 month'::INTERVAL AND
           u.id NOT IN (#{current_owners.join(',')})
         GROUP BY u.id
@@ -75,10 +79,11 @@ module Jobs
         LIMIT :max_awarded
       SQL
 
-      User.exec_sql(sql, {
+      User.exec_sql(
+        sql,
         like: PostActionType.types[:like],
         max_awarded: MAX_AWARDED
-      }).each do |row|
+      ).each do |row|
         scores[row['id'].to_i] = row['score'].to_f
       end
       scores
diff --git a/app/jobs/scheduled/migrate_upload_scheme.rb b/app/jobs/scheduled/migrate_upload_scheme.rb
index a5e21f3e0d..6be51da699 100644
--- a/app/jobs/scheduled/migrate_upload_scheme.rb
+++ b/app/jobs/scheduled/migrate_upload_scheme.rb
@@ -9,8 +9,8 @@ module Jobs
 
       # clean up failed uploads
       Upload.where("created_at < ?", 1.hour.ago)
-            .where("LENGTH(COALESCE(url, '')) = 0")
-            .destroy_all
+        .where("LENGTH(COALESCE(url, '')) = 0")
+        .destroy_all
 
       # migrate uploads to new scheme
       problems = Upload.migrate_to_new_scheme(50)
diff --git a/app/jobs/scheduled/pending_flags_reminder.rb b/app/jobs/scheduled/pending_flags_reminder.rb
index 2a33c51785..817b735b1b 100644
--- a/app/jobs/scheduled/pending_flags_reminder.rb
+++ b/app/jobs/scheduled/pending_flags_reminder.rb
@@ -25,8 +25,8 @@ module Jobs
             target_group_names: Group[:moderators].name,
             archetype: Archetype.private_message,
             subtype: TopicSubtype.system_message,
-            title: I18n.t('flags_reminder.subject_template', { count: flagged_posts_count }),
-            raw: mentions + I18n.t('flags_reminder.flags_were_submitted', { count: SiteSetting.notify_about_flags_after })
+            title: I18n.t('flags_reminder.subject_template', count: flagged_posts_count),
+            raw: mentions + I18n.t('flags_reminder.flags_were_submitted', count: SiteSetting.notify_about_flags_after)
           )
 
           self.last_notified_id = flag_ids.max
@@ -35,7 +35,7 @@ module Jobs
     end
 
     def pending_flag_ids
-      FlagQuery.flagged_post_actions('active')
+      FlagQuery.flagged_post_actions(filter: 'active')
         .where('post_actions.created_at < ?', SiteSetting.notify_about_flags_after.to_i.hours.ago)
         .pluck(:id)
     end
@@ -54,10 +54,10 @@ module Jobs
 
     def active_moderator_usernames
       User.where(moderator: true)
-          .human_users
-          .order('last_seen_at DESC')
-          .limit(3)
-          .pluck(:username)
+        .human_users
+        .order('last_seen_at DESC')
+        .limit(3)
+        .pluck(:username)
     end
 
   end
diff --git a/app/jobs/scheduled/pending_queued_posts_reminder.rb b/app/jobs/scheduled/pending_queued_posts_reminder.rb
index 37b9afe6f4..867918dcef 100644
--- a/app/jobs/scheduled/pending_queued_posts_reminder.rb
+++ b/app/jobs/scheduled/pending_queued_posts_reminder.rb
@@ -4,13 +4,20 @@ module Jobs
     every 1.hour
 
     def execute(args)
-      return true unless SiteSetting.notify_about_queued_posts_after > 0 && SiteSetting.contact_email
+      return true unless SiteSetting.notify_about_queued_posts_after > 0
 
       queued_post_ids = should_notify_ids
 
       if queued_post_ids.size > 0 && last_notified_id.to_i < queued_post_ids.max
-        message = PendingQueuedPostsMailer.notify(count: queued_post_ids.size)
-        Email::Sender.new(message, :pending_queued_posts_reminder).send
+        PostCreator.create(
+          Discourse.system_user,
+          target_group_names: Group[:moderators].name,
+          archetype: Archetype.private_message,
+          subtype: TopicSubtype.system_message,
+          title: I18n.t('system_messages.queued_posts_reminder.subject_template', count: queued_post_ids.size),
+          raw: I18n.t('system_messages.queued_posts_reminder.text_body_template', base_url: Discourse.base_url)
+        )
+
         self.last_notified_id = queued_post_ids.max
       end
 
diff --git a/app/jobs/scheduled/pending_users_reminder.rb b/app/jobs/scheduled/pending_users_reminder.rb
index c2e392d65a..88c2fa4db3 100644
--- a/app/jobs/scheduled/pending_users_reminder.rb
+++ b/app/jobs/scheduled/pending_users_reminder.rb
@@ -7,24 +7,28 @@ module Jobs
 
     def execute(args)
       if SiteSetting.must_approve_users && SiteSetting.pending_users_reminder_delay >= 0
-        query = AdminUserIndexQuery.new({query: 'pending', stats: false}).find_users_query # default order is: users.created_at DESC
+        query = AdminUserIndexQuery.new(query: 'pending', stats: false).find_users_query # default order is: users.created_at DESC
         if SiteSetting.pending_users_reminder_delay > 0
           query = query.where('users.created_at < ?', SiteSetting.pending_users_reminder_delay.hours.ago)
         end
 
-        newest_username = query.limit(1).pluck(:username).first
+        newest_username = query.limit(1).select(:username).first&.username
 
         return true if newest_username == previous_newest_username # already notified
 
         count = query.count
 
         if count > 0
-          target_usernames = Group[:moderators].users.map do |u|
-            u.id > 0 && u.notifications.joins(:topic)
-                                       .where("notifications.id > ?", u.seen_notification_id)
-                                       .where("notifications.read = false")
-                                       .where("topics.subtype = '#{TopicSubtype.pending_users_reminder}'")
-                                       .count == 0 ? u.username : nil
+          target_usernames = Group[:moderators].users.map do |user|
+            next if user.id < 0
+
+            unseen_count = user.notifications.joins(:topic)
+              .where("notifications.id > ?", user.seen_notification_id)
+              .where("notifications.read = false")
+              .where("topics.subtype = ?", TopicSubtype.pending_users_reminder)
+              .count
+
+            unseen_count == 0 ? user.username : nil
           end.compact
 
           unless target_usernames.empty?
@@ -33,8 +37,8 @@ module Jobs
               target_usernames: target_usernames,
               archetype: Archetype.private_message,
               subtype: TopicSubtype.pending_users_reminder,
-              title: I18n.t("system_messages.pending_users_reminder.subject_template", {count: count}),
-              raw: I18n.t("system_messages.pending_users_reminder.text_body_template", {count: count, base_url: Discourse.base_url})
+              title: I18n.t("system_messages.pending_users_reminder.subject_template", count: count),
+              raw: I18n.t("system_messages.pending_users_reminder.text_body_template", count: count, base_url: Discourse.base_url)
             )
 
             self.previous_newest_username = newest_username
diff --git a/app/jobs/scheduled/periodical_updates.rb b/app/jobs/scheduled/periodical_updates.rb
index 98751dffc3..ca54bf3b18 100644
--- a/app/jobs/scheduled/periodical_updates.rb
+++ b/app/jobs/scheduled/periodical_updates.rb
@@ -17,10 +17,10 @@ module Jobs
 
     def execute(args)
       # Feature topics in categories
-      CategoryFeaturedTopic.feature_topics
+      CategoryFeaturedTopic.feature_topics(batched: true)
 
       # Update the scores of posts
-      args = {min_topic_age: 1.day.ago}
+      args = { min_topic_age: 1.day.ago }
       args[:max_topic_length] = 500 unless self.class.should_update_long_topics?
       ScoreCalculator.new.calculate(args)
 
diff --git a/app/jobs/scheduled/poll_feed.rb b/app/jobs/scheduled/poll_feed.rb
index fcd0243aae..2f885c69a2 100644
--- a/app/jobs/scheduled/poll_feed.rb
+++ b/app/jobs/scheduled/poll_feed.rb
@@ -2,9 +2,13 @@
 # Creates and Updates Topics based on an RSS or ATOM feed.
 #
 require 'digest/sha1'
+require 'excon'
+require 'rss'
+require_dependency 'feed_item_accessor'
+require_dependency 'feed_element_installer'
+require_dependency 'final_destination'
 require_dependency 'post_creator'
 require_dependency 'post_revisor'
-require 'open-uri'
 
 module Jobs
   class PollFeed < Jobs::Scheduled
@@ -46,17 +50,11 @@ module Jobs
 
     def import_topic(topic)
       if topic.user
-        TopicEmbed.import(topic.user, topic.url, topic.title, CGI.unescapeHTML(topic.content.scrub))
+        TopicEmbed.import(topic.user, topic.url, topic.title, CGI.unescapeHTML(topic.content))
       end
     end
 
     class Feed
-      require 'simple-rss'
-
-      if SiteSetting.embed_username_key_from_feed.present?
-        SimpleRSS.item_tags << SiteSetting.embed_username_key_from_feed.to_sym
-      end
-
       def initialize
         @feed_url = SiteSetting.feed_polling_url
         @feed_url = "http://#{@feed_url}" if @feed_url !~ /^https?\:\/\//
@@ -65,7 +63,7 @@ module Jobs
       def topics
         feed_topics = []
 
-        rss = fetch_rss
+        rss = parsed_feed
         return feed_topics unless rss.present?
 
         rss.items.each do |i|
@@ -78,34 +76,56 @@ module Jobs
 
       private
 
-      def fetch_rss
-        SimpleRSS.parse open(@feed_url, allow_redirections: :all)
-      rescue OpenURI::HTTPError, SimpleRSSError
+      def parsed_feed
+        raw_feed = fetch_rss
+        return nil if raw_feed.blank?
+
+        if SiteSetting.embed_username_key_from_feed.present?
+          FeedElementInstaller.install(SiteSetting.embed_username_key_from_feed, raw_feed)
+        end
+
+        RSS::Parser.parse(raw_feed)
+      rescue RSS::NotWellFormedError, RSS::InvalidRSSError
         nil
       end
 
+      def fetch_rss
+        final_destination = FinalDestination.new(@feed_url, verbose: true)
+        feed_final_url = final_destination.resolve
+        return nil unless final_destination.status == :resolved
+
+        Excon.new(feed_final_url.to_s).request(method: :get, expects: 200).body
+      rescue Excon::Error::HTTPStatus
+        nil
+      end
     end
 
     class FeedTopic
       def initialize(article_rss_item)
-        @article_rss_item = article_rss_item
+        @accessor = FeedItemAccessor.new(article_rss_item)
       end
 
       def url
-        link = @article_rss_item.link
+        link = @accessor.link
         if url?(link)
           return link
         else
-          return @article_rss_item.id
+          return @accessor.element_content(:id)
         end
       end
 
       def content
-        @article_rss_item.content.try(:force_encoding, "UTF-8").try(:scrub) || @article_rss_item.description.try(:force_encoding, "UTF-8").try(:scrub)
+        content = nil
+
+        %i[content_encoded content description].each do |content_element_name|
+          content ||= @accessor.element_content(content_element_name)
+        end
+
+        content&.force_encoding('UTF-8')&.scrub
       end
 
       def title
-        @article_rss_item.title.force_encoding("UTF-8").scrub
+        @accessor.element_content(:title).force_encoding('UTF-8').scrub
       end
 
       def user
@@ -123,11 +143,7 @@ module Jobs
       end
 
       def author_username
-        begin
-          @article_rss_item.send(SiteSetting.embed_username_key_from_feed.to_sym)
-        rescue
-          nil
-        end
+        @accessor.element_content(SiteSetting.embed_username_key_from_feed.sub(':', '_'))
       end
 
       def default_user
@@ -143,9 +159,6 @@ module Jobs
       def find_user(user_name)
         User.where(username_lower: user_name).first
       end
-
     end
-
   end
-
 end
diff --git a/app/jobs/scheduled/purge_inactive.rb b/app/jobs/scheduled/purge_inactive.rb
index a6615f5fe2..21417bef21 100644
--- a/app/jobs/scheduled/purge_inactive.rb
+++ b/app/jobs/scheduled/purge_inactive.rb
@@ -7,4 +7,3 @@ module Jobs
     end
   end
 end
-
diff --git a/app/jobs/scheduled/purge_old_web_hook_events.rb b/app/jobs/scheduled/purge_old_web_hook_events.rb
new file mode 100644
index 0000000000..4bb8c5b7ba
--- /dev/null
+++ b/app/jobs/scheduled/purge_old_web_hook_events.rb
@@ -0,0 +1,9 @@
+module Jobs
+  class PurgeOldWebHookEvents < Jobs::Scheduled
+    every 1.day
+
+    def execute(_)
+      WebHookEvent.purge_old
+    end
+  end
+end
diff --git a/app/jobs/scheduled/reindex_search.rb b/app/jobs/scheduled/reindex_search.rb
index bfeda3733a..e354b36d00 100644
--- a/app/jobs/scheduled/reindex_search.rb
+++ b/app/jobs/scheduled/reindex_search.rb
@@ -4,7 +4,102 @@ module Jobs
     every 1.day
 
     def execute(args)
-      Search.rebuild_problem_posts
+      rebuild_problem_topics
+      rebuild_problem_posts
+      rebuild_problem_categories
+      rebuild_problem_users
+      rebuild_problem_tags
+    end
+
+    def rebuild_problem_categories(limit = 500)
+      category_ids = load_problem_category_ids(limit)
+
+      category_ids.each do |id|
+        category = Category.find_by(id: id)
+        SearchIndexer.index(category, force: true) if category
+      end
+    end
+
+    def rebuild_problem_users(limit = 10000)
+      user_ids = load_problem_user_ids(limit)
+
+      user_ids.each do |id|
+        user = User.find_by(id: id)
+        SearchIndexer.index(user, force: true) if user
+      end
+    end
+
+    def rebuild_problem_topics(limit = 10000)
+      topic_ids = load_problem_topic_ids(limit)
+
+      topic_ids.each do |id|
+        topic = Topic.find_by(id: id)
+        SearchIndexer.index(topic, force: true) if topic
+      end
+    end
+
+    def rebuild_problem_posts(limit = 10000)
+      post_ids = load_problem_post_ids(limit)
+
+      post_ids.each do |id|
+        post = Post.find_by(id: id)
+        # could be deleted while iterating through batch
+        SearchIndexer.index(post, force: true) if post
+      end
+    end
+
+    def rebuild_problem_tags(limit = 10000)
+      tag_ids = load_problem_tag_ids(limit)
+
+      tag_ids.each do |id|
+        tag = Tag.find_by(id: id)
+        SearchIndexer.index(tag, force: true) if tag
+      end
+    end
+
+    private
+
+    def load_problem_post_ids(limit)
+      Post.joins(:topic)
+        .where('posts.id IN (
+                SELECT p2.id FROM posts p2
+                LEFT JOIN post_search_data pd ON pd.locale = ? AND pd.version = ? AND p2.id = pd.post_id
+                WHERE pd.post_id IS NULL
+                )', SiteSetting.default_locale, Search::INDEX_VERSION)
+        .limit(limit)
+        .pluck(:id)
+    end
+
+    def load_problem_category_ids(limit)
+      Category.joins(:category_search_data)
+        .where('category_search_data.locale != ?
+                OR category_search_data.version != ?', SiteSetting.default_locale, Search::INDEX_VERSION)
+        .limit(limit)
+        .pluck(:id)
+    end
+
+    def load_problem_topic_ids(limit)
+      Topic.joins(:topic_search_data)
+        .where('topic_search_data.locale != ?
+                OR topic_search_data.version != ?', SiteSetting.default_locale, Search::INDEX_VERSION)
+        .limit(limit)
+        .pluck(:id)
+    end
+
+    def load_problem_user_ids(limit)
+      User.joins(:user_search_data)
+        .where('user_search_data.locale != ?
+                OR user_search_data.version != ?', SiteSetting.default_locale, Search::INDEX_VERSION)
+        .limit(limit)
+        .pluck(:id)
+    end
+
+    def load_problem_tag_ids(limit)
+      Tag.joins(:tag_search_data)
+        .where('tag_search_data.locale != ?
+                OR tag_search_data.version != ?', SiteSetting.default_locale, Search::INDEX_VERSION)
+        .limit(limit)
+        .pluck(:id)
     end
   end
 end
diff --git a/app/jobs/scheduled/schedule_backup.rb b/app/jobs/scheduled/schedule_backup.rb
index 047c8a1141..48ebe73fc2 100644
--- a/app/jobs/scheduled/schedule_backup.rb
+++ b/app/jobs/scheduled/schedule_backup.rb
@@ -5,7 +5,7 @@ module Jobs
     sidekiq_options retry: false
 
     def execute(args)
-      return unless SiteSetting.automatic_backups_enabled?
+      return unless SiteSetting.enable_backups? && SiteSetting.automatic_backups_enabled?
 
       if latest_backup = Backup.all[0]
         date = File.ctime(latest_backup.path).getutc.to_date
diff --git a/app/jobs/scheduled/tl3_promotions.rb b/app/jobs/scheduled/tl3_promotions.rb
index 37acfcec15..94c3d42fc7 100644
--- a/app/jobs/scheduled/tl3_promotions.rb
+++ b/app/jobs/scheduled/tl3_promotions.rb
@@ -6,7 +6,11 @@ module Jobs
     def execute(args)
       # Demotions
       demoted_user_ids = []
-      User.real.where(trust_level: TrustLevel[3], trust_level_locked: false).find_each do |u|
+      User.real.where(
+        trust_level: TrustLevel[3],
+        manual_locked_trust_level: nil,
+        group_locked_trust_level: nil
+      ).find_each do |u|
         # Don't demote too soon after being promoted
         next if u.on_tl3_grace_period?
 
@@ -17,9 +21,11 @@ module Jobs
       end
 
       # Promotions
-      User.real.where(trust_level: TrustLevel[2],
-                      trust_level_locked: false)
-               .where.not(id: demoted_user_ids).find_each do |u|
+      User.real.where(
+        trust_level: TrustLevel[2],
+        manual_locked_trust_level: nil,
+        group_locked_trust_level: nil
+      ).where.not(id: demoted_user_ids).find_each do |u|
         Promotion.new(u).review_tl2
       end
     end
diff --git a/app/jobs/scheduled/version_check.rb b/app/jobs/scheduled/version_check.rb
index 9fb39252ee..51b08d379d 100644
--- a/app/jobs/scheduled/version_check.rb
+++ b/app/jobs/scheduled/version_check.rb
@@ -6,7 +6,7 @@ module Jobs
     every 1.day
 
     def execute(args)
-      if SiteSetting.version_checks? and (DiscourseUpdates.updated_at.nil? or DiscourseUpdates.updated_at < 1.minute.ago)
+      if SiteSetting.version_checks? && (DiscourseUpdates.updated_at.nil? || DiscourseUpdates.updated_at < (1.minute.ago))
         begin
           prev_missing_versions_count = DiscourseUpdates.missing_versions_count || 0
 
@@ -18,10 +18,10 @@ module Jobs
           DiscourseUpdates.updated_at = Time.zone.now
           DiscourseUpdates.missing_versions = json['versions']
 
-          if  GlobalSetting.new_version_emails and
-              SiteSetting.new_version_emails and
-              json['missingVersionsCount'] > 0 and
-              prev_missing_versions_count < json['missingVersionsCount'].to_i
+          if  GlobalSetting.new_version_emails &&
+              SiteSetting.new_version_emails &&
+              json['missingVersionsCount'] > (0) &&
+              prev_missing_versions_count < (json['missingVersionsCount'].to_i)
 
             message = VersionMailer.send_notice
             Email::Sender.new(message, :new_version).send
diff --git a/app/mailers/admin_confirmation_mailer.rb b/app/mailers/admin_confirmation_mailer.rb
index ea4d444ad8..4f7679d4bf 100644
--- a/app/mailers/admin_confirmation_mailer.rb
+++ b/app/mailers/admin_confirmation_mailer.rb
@@ -8,8 +8,7 @@ class AdminConfirmationMailer < ActionMailer::Base
       to_address,
       template: 'admin_confirmation_mailer',
       target_username: target_username,
-      admin_confirm_url: confirm_admin_url(token: token, host: Discourse.base_url_no_prefix)
+      admin_confirm_url: confirm_admin_url(token: token, host: Discourse.base_url)
     )
   end
 end
-
diff --git a/app/mailers/invite_mailer.rb b/app/mailers/invite_mailer.rb
index 3614123716..df371b79a3 100644
--- a/app/mailers/invite_mailer.rb
+++ b/app/mailers/invite_mailer.rb
@@ -8,14 +8,14 @@ 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
 
     # get invitee name (based on site setting)
-    invitee_name = invite.invited_by.username
+    inviter_name = invite.invited_by.username
     if SiteSetting.enable_names && invite.invited_by.name.present?
-      invitee_name = "#{invite.invited_by.name} (#{invite.invited_by.username})"
+      inviter_name = "#{invite.invited_by.name} (#{invite.invited_by.username})"
     end
 
     # If they were invited to a topic
@@ -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
 
@@ -39,28 +39,28 @@ class InviteMailer < ActionMailer::Base
 
       build_email(invite.email,
                   template: template,
-                  invitee_name: invitee_name,
+                  inviter_name: inviter_name,
                   site_domain_name: Discourse.current_hostname,
                   invite_link: "#{Discourse.base_url}/invites/#{invite.invite_key}",
                   topic_title: topic_title,
                   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
 
       build_email(invite.email,
                   template: template,
-                  invitee_name: invitee_name,
+                  inviter_name: inviter_name,
                   site_domain_name: Discourse.current_hostname,
                   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/pending_flags_mailer.rb b/app/mailers/pending_flags_mailer.rb
deleted file mode 100644
index c0f67d2bf2..0000000000
--- a/app/mailers/pending_flags_mailer.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require_dependency 'email/message_builder'
-require_dependency 'flag_query'
-
-class PendingFlagsMailer < ActionMailer::Base
-  include Email::BuildEmailHelper
-
-  def notify
-    return unless SiteSetting.contact_email
-
-    @posts, @topics, @users = FlagQuery.flagged_posts_report(Discourse.system_user, 'active', 0, 20)
-
-    @posts.each do |post| # Note: post is a Hash, not a Post.
-      topic = @topics.select { |t| t[:id] == post[:topic_id] }.first
-
-      post[:title] = topic[:title]
-      post[:url] = "#{Discourse.base_url}#{Post.url(topic[:slug], topic[:id], post[:post_number])}"
-      post[:user] = @users.select { |u| u[:id] == post[:user_id] }.first
-
-      counts = flag_reason_counts(post)
-      post[:reason_counts] = counts.map { |reason, count| "#{I18n.t('post_action_types.' + reason.to_s + '.title')}: #{count}" }.join(', ')
-      post[:html_reason_counts] = counts.map { |reason, count| "<strong>#{I18n.t('post_action_types.' + reason.to_s + '.title')}:</strong> #{count}" }.join(', ')
-    end
-
-    @hours = SiteSetting.notify_about_flags_after
-
-    subject = "[#{SiteSetting.title}] " + I18n.t('flags_reminder.subject_template', { count: PostAction.flagged_posts_count })
-    build_email(SiteSetting.contact_email, subject: subject)
-  end
-
-  private
-
-  def flag_reason_counts(post)
-    post[:post_actions].inject({}) do |h,v|
-      h[v[:name_key]] ||= 0
-      h[v[:name_key]] += 1
-      h
-    end
-  end
-end
diff --git a/app/mailers/pending_queued_posts_mailer.rb b/app/mailers/pending_queued_posts_mailer.rb
deleted file mode 100644
index fec7c3ba72..0000000000
--- a/app/mailers/pending_queued_posts_mailer.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require_dependency 'email/message_builder'
-
-class PendingQueuedPostsMailer < ActionMailer::Base
-  include Email::BuildEmailHelper
-
-  def notify(opts={})
-    return unless SiteSetting.contact_email
-    build_email(SiteSetting.contact_email, template: 'queued_posts_reminder', count: opts[:count])
-  end
-end
diff --git a/app/mailers/subscription_mailer.rb b/app/mailers/subscription_mailer.rb
index 51a66797a6..d8ea40d2fb 100644
--- a/app/mailers/subscription_mailer.rb
+++ b/app/mailers/subscription_mailer.rb
@@ -3,7 +3,7 @@ require_dependency 'email/message_builder'
 class SubscriptionMailer < ActionMailer::Base
   include Email::BuildEmailHelper
 
-  def confirm_unsubscribe(user, opts={})
+  def confirm_unsubscribe(user, opts = {})
     unsubscribe_key = UnsubscribeKey.create_key_for(user, "all")
     build_email user.email,
                 template: "unsubscribe_mailer",
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index 44d1cc7bd2..236acc0dab 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
@@ -10,14 +11,14 @@ class UserNotifications < ActionMailer::Base
 
   include Email::BuildEmailHelper
 
-  def signup(user, opts={})
+  def signup(user, opts = {})
     build_email(user.email,
                 template: "user_notifications.signup",
                 locale: user_locale(user),
                 email_token: opts[:email_token])
   end
 
-  def signup_after_approval(user, opts={})
+  def signup_after_approval(user, opts = {})
     build_email(user.email,
                 template: 'user_notifications.signup_after_approval',
                 locale: user_locale(user),
@@ -25,48 +26,87 @@ class UserNotifications < ActionMailer::Base
                 new_user_tips: I18n.t('system_messages.usage_tips.text_body_template', base_url: Discourse.base_url, locale: locale))
   end
 
-  def notify_old_email(user, opts={})
+  def notify_old_email(user, opts = {})
     build_email(user.email,
                 template: "user_notifications.notify_old_email",
                 locale: user_locale(user),
                 new_email: opts[:new_email])
   end
 
-  def confirm_old_email(user, opts={})
+  def confirm_old_email(user, opts = {})
     build_email(user.email,
                 template: "user_notifications.confirm_old_email",
                 locale: user_locale(user),
                 email_token: opts[:email_token])
   end
 
-  def confirm_new_email(user, opts={})
+  def confirm_new_email(user, opts = {})
     build_email(user.email,
                 template: "user_notifications.confirm_new_email",
                 locale: user_locale(user),
                 email_token: opts[:email_token])
   end
 
-  def forgot_password(user, opts={})
+  def forgot_password(user, opts = {})
     build_email(user.email,
                 template: user.has_password? ? "user_notifications.forgot_password" : "user_notifications.set_password",
                 locale: user_locale(user),
                 email_token: opts[:email_token])
   end
 
-  def admin_login(user, opts={})
+  def admin_login(user, opts = {})
     build_email(user.email,
                 template: "user_notifications.admin_login",
                 locale: user_locale(user),
                 email_token: opts[:email_token])
   end
 
-  def account_created(user, opts={})
+  def account_created(user, opts = {})
     build_email(user.email,
                 template: "user_notifications.account_created",
                 locale: user_locale(user),
                 email_token: opts[:email_token])
   end
 
+  def account_silenced(user, opts = nil)
+    opts ||= {}
+
+    return unless user_history = opts[:user_history]
+
+    build_email(
+      user.email,
+      template: "user_notifications.account_silenced",
+      locale: user_locale(user),
+      reason: user_history.details,
+      message: user_history.context,
+      silenced_till: I18n.l(user.silenced_till, format: :long)
+    )
+  end
+
+  def account_suspended(user, opts = nil)
+    opts ||= {}
+
+    return unless user_history = opts[:user_history]
+
+    build_email(
+      user.email,
+      template: "user_notifications.account_suspended",
+      locale: user_locale(user),
+      reason: user_history.details,
+      message: user_history.context,
+      suspended_till: I18n.l(user.suspended_till, format: :long)
+    )
+  end
+
+  def account_exists(user, opts = {})
+    build_email(
+      user.email,
+      template: 'user_notifications.account_exists',
+      locale: user_locale(user),
+      email: user.email
+    )
+  end
+
   def short_date(dt)
     if dt.year == Time.now.year
       I18n.l(dt, format: :short_no_year)
@@ -75,30 +115,31 @@ class UserNotifications < ActionMailer::Base
     end
   end
 
-  def digest(user, opts={})
+  def digest(user, opts = {})
     build_summary_for(user)
     min_date = opts[:since] || user.last_emailed_at || user.last_seen_at || 1.month.ago
 
     # Fetch some topics and posts to show
-    digest_opts = {limit: SiteSetting.digest_topics + SiteSetting.digest_other_topics, top_order: true}
+    digest_opts = { limit: SiteSetting.digest_topics + SiteSetting.digest_other_topics, top_order: true }
     topics_for_digest = Topic.for_digest(user, min_date, digest_opts).to_a
     if topics_for_digest.empty? && !user.user_option.try(:include_tl0_in_digests)
       # Find some topics from new users that are at least 24 hours old
       topics_for_digest = Topic.for_digest(user, min_date, digest_opts.merge(include_tl0: true)).where('topics.created_at < ?', 24.hours.ago).to_a
     end
 
-    @popular_topics = topics_for_digest[0,SiteSetting.digest_topics]
+    @popular_topics = topics_for_digest[0, SiteSetting.digest_topics]
 
     if @popular_topics.present?
       @other_new_for_you = topics_for_digest.size > SiteSetting.digest_topics ? topics_for_digest[SiteSetting.digest_topics..-1] : []
 
       @popular_posts = if SiteSetting.digest_posts > 0
         Post.order("posts.score DESC")
-            .for_mailing_list(user, min_date)
-            .where('posts.post_type = ?', Post.types[:regular])
-            .where('posts.deleted_at IS NULL AND posts.hidden = false AND posts.user_deleted = false')
-            .where("posts.post_number > ? AND posts.score > ?", 1, ScoreCalculator.default_score_weights[:like_score] * 5.0)
-            .limit(SiteSetting.digest_posts)
+          .for_mailing_list(user, min_date)
+          .where('posts.post_type = ?', Post.types[:regular])
+          .where('posts.deleted_at IS NULL AND posts.hidden = false AND posts.user_deleted = false')
+          .where("posts.post_number > ? AND posts.score > ?", 1, ScoreCalculator.default_score_weights[:like_score] * 5.0)
+          .where('posts.created_at < ?', (SiteSetting.editing_grace_period || 0).seconds.ago)
+          .limit(SiteSetting.digest_posts)
       else
         []
       end
@@ -116,19 +157,19 @@ class UserNotifications < ActionMailer::Base
         # We used topics from new users instead, so count should match
         new_topics_count = topics_for_digest.size
       end
-      @counts = [{label_key: 'user_notifications.digest.new_topics',
-                  value: new_topics_count,
-                  href: "#{Discourse.base_url}/new"}]
+      @counts = [{ label_key: 'user_notifications.digest.new_topics',
+                   value: new_topics_count,
+                   href: "#{Discourse.base_url}/new" }]
 
       value = user.unread_notifications
-      @counts << {label_key: 'user_notifications.digest.unread_notifications', value: value, href: "#{Discourse.base_url}/my/notifications"} if value > 0
+      @counts << { label_key: 'user_notifications.digest.unread_notifications', value: value, href: "#{Discourse.base_url}/my/notifications" } if value > 0
 
       value = user.unread_private_messages
-      @counts << {label_key: 'user_notifications.digest.unread_messages', value: value, href: "#{Discourse.base_url}/my/messages"} if value > 0
+      @counts << { label_key: 'user_notifications.digest.unread_messages', value: value, href: "#{Discourse.base_url}/my/messages" } if value > 0
 
       if @counts.size < 3
         value = user.unread_notifications_of_type(Notification.types[:liked])
-        @counts << {label_key: 'user_notifications.digest.liked_received', value: value, href: "#{Discourse.base_url}/my/notifications"} if value > 0
+        @counts << { label_key: 'user_notifications.digest.liked_received', value: value, href: "#{Discourse.base_url}/my/notifications" } if value > 0
       end
 
       if @counts.size < 3
@@ -156,7 +197,6 @@ class UserNotifications < ActionMailer::Base
     end
   end
 
-
   def user_replied(user, opts)
     opts[:allow_reply_by_email] = true
     opts[:use_site_subject] = true
@@ -251,7 +291,7 @@ class UserNotifications < ActionMailer::Base
     (user.locale.present? && I18n.available_locales.include?(user.locale.to_sym)) ? user.locale : nil
   end
 
-  def email_post_markdown(post, add_posted_by=false)
+  def email_post_markdown(post, add_posted_by = false)
     result = "#{post.raw}\n\n"
     if add_posted_by
       result << "#{I18n.t('user_notifications.posted_by', username: post.username, post_date: post.created_at.strftime("%m/%d/%Y"))}\n\n"
@@ -274,12 +314,12 @@ class UserNotifications < ActionMailer::Base
     allowed_post_types << Post.types[:whisper] if topic_user.try(:user).try(:staff?)
 
     context_posts = Post.where(topic_id: post.topic_id)
-                        .where("post_number < ?", post.post_number)
-                        .where(user_deleted: false)
-                        .where(hidden: false)
-                        .where(post_type: allowed_post_types)
-                        .order('created_at desc')
-                        .limit(SiteSetting.email_posts_context)
+      .where("post_number < ?", post.post_number)
+      .where(user_deleted: false)
+      .where(hidden: false)
+      .where(post_type: allowed_post_types)
+      .order('created_at desc')
+      .limit(SiteSetting.email_posts_context)
 
     if topic_user && topic_user.last_emailed_post_number && user.user_option.email_previous_replies == UserOption.previous_replies_type[:unless_emailed]
       context_posts = context_posts.where("post_number > ?", topic_user.last_emailed_post_number)
@@ -310,7 +350,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 +362,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 +382,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 +427,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
@@ -400,7 +468,7 @@ class UserNotifications < ActionMailer::Base
       reached_limit = SiteSetting.max_emails_per_day_per_user > 0
       reached_limit &&= (EmailLog.where(user_id: user.id, skipped: false)
                               .where('created_at > ?', 1.day.ago)
-                              .count) >= (SiteSetting.max_emails_per_day_per_user-1)
+                              .count) >= (SiteSetting.max_emails_per_day_per_user - 1)
 
       in_reply_to_post = post.reply_to_post if user.user_option.email_in_reply_to
       if SiteSetting.private_email?
@@ -409,7 +477,6 @@ class UserNotifications < ActionMailer::Base
         message = email_post_markdown(post) + (reached_limit ? "\n\n#{I18n.t "user_notifications.reached_limit", count: SiteSetting.max_emails_per_day_per_user}" : "");
       end
 
-
       unless translation_override_exists
         html = UserNotificationRenderer.new(Rails.configuration.paths["app/views"]).render(
           template: 'email/notification',
@@ -418,14 +485,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 +500,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/mailers/version_mailer.rb b/app/mailers/version_mailer.rb
index b39136933c..dad4dbd448 100644
--- a/app/mailers/version_mailer.rb
+++ b/app/mailers/version_mailer.rb
@@ -6,17 +6,17 @@ class VersionMailer < ActionMailer::Base
   def send_notice
     if SiteSetting.contact_email.present?
       missing_versions = DiscourseUpdates.missing_versions
-      if missing_versions.present? and missing_versions.first['notes'].present?
-        build_email( SiteSetting.contact_email,
+      if missing_versions.present? && missing_versions.first['notes'].present?
+        build_email(SiteSetting.contact_email,
                      template: 'new_version_mailer_with_notes',
                      notes: missing_versions.first['notes'],
                      new_version: DiscourseUpdates.latest_version,
-                     installed_version: Discourse::VERSION::STRING )
+                     installed_version: Discourse::VERSION::STRING)
       else
-        build_email( SiteSetting.contact_email,
+        build_email(SiteSetting.contact_email,
                      template: 'new_version_mailer',
                      new_version: DiscourseUpdates.latest_version,
-                     installed_version: Discourse::VERSION::STRING )
+                     installed_version: Discourse::VERSION::STRING)
       end
     end
   end
diff --git a/app/models/about.rb b/app/models/about.rb
index 0d670183ba..8392df3c48 100644
--- a/app/models/about.rb
+++ b/app/models/about.rb
@@ -35,8 +35,8 @@ class About
 
   def moderators
     @moderators ||= User.where(moderator: true, admin: false)
-                        .human_users
-                        .order(:username_lower)
+      .human_users
+      .order(:username_lower)
   end
 
   def admins
diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb
index b4113d609e..57a4394c27 100644
--- a/app/models/admin_dashboard_data.rb
+++ b/app/models/admin_dashboard_data.rb
@@ -31,7 +31,7 @@ class AdminDashboardData
 
   USER_REPORTS ||= ['users_by_trust_level']
 
-  MOBILE_REPORTS ||= ['mobile_visits'] + ApplicationRequest.req_types.keys.select {|r| r =~ /mobile/}.map { |r| r + "_reqs" }
+  MOBILE_REPORTS ||= ['mobile_visits'] + ApplicationRequest.req_types.keys.select { |r| r =~ /mobile/ }.map { |r| r + "_reqs" }
 
   def self.add_problem_check(*syms, &blk)
     @problem_syms.push(*syms) if syms
@@ -120,7 +120,7 @@ class AdminDashboardData
     $redis.get(problem_message_key(i18n_key)) ? I18n.t(i18n_key) : nil
   end
 
-  def self.add_problem_message(i18n_key, expire_seconds=nil)
+  def self.add_problem_message(i18n_key, expire_seconds = nil)
     if expire_seconds.to_i > 0
       $redis.setex problem_message_key(i18n_key), expire_seconds.to_i, 1
     else
@@ -147,7 +147,7 @@ class AdminDashboardData
       admins: User.admins.count,
       moderators: User.moderators.count,
       suspended: User.suspended.count,
-      blocked: User.blocked.count,
+      silenced: User.silenced.count,
       top_referrers: IncomingLinksReport.find('top_referrers').as_json,
       top_traffic_sources: IncomingLinksReport.find('top_traffic_sources').as_json,
       top_referred_topics: IncomingLinksReport.find('top_referred_topics').as_json,
diff --git a/app/models/api_key.rb b/app/models/api_key.rb
index 9145ce4372..b3a8a68bf0 100644
--- a/app/models/api_key.rb
+++ b/app/models/api_key.rb
@@ -1,7 +1,8 @@
 class ApiKey < ActiveRecord::Base
   belongs_to :user
-  belongs_to :created_by, class_name: 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/application_request.rb b/app/models/application_request.rb
index 8f146f10fd..f13e7275a7 100644
--- a/app/models/application_request.rb
+++ b/app/models/application_request.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class ApplicationRequest < ActiveRecord::Base
   enum req_type: %i(http_total
                     http_2xx
@@ -19,9 +20,13 @@ class ApplicationRequest < ActiveRecord::Base
   self.autoflush_seconds = 5.minutes
   self.last_flush = Time.now.utc
 
-  def self.increment!(type, opts=nil)
+  def self.increment!(type, opts = nil)
     key = redis_key(type)
     val = $redis.incr(key).to_i
+
+    # readonly mode it is going to be 0, skip
+    return if val == 0
+
     # 3.days, see: https://github.com/rails/rails/issues/21296
     $redis.expire(key, 259200)
 
@@ -36,7 +41,13 @@ class ApplicationRequest < ActiveRecord::Base
     end
   end
 
-  def self.write_cache!(date=nil)
+  GET_AND_RESET = <<~LUA
+    local val = redis.call('get', KEYS[1])
+    redis.call('set', KEYS[1], '0')
+    return val
+  LUA
+
+  def self.write_cache!(date = nil)
     if date.nil?
       write_cache!(Time.now.utc)
       write_cache!(Time.now.utc.yesterday)
@@ -49,42 +60,37 @@ class ApplicationRequest < ActiveRecord::Base
 
     # this may seem a bit fancy but in so it allows
     # for concurrent calls without double counting
-    req_types.each do |req_type,_|
-      key = redis_key(req_type,date)
-      val = $redis.get(key).to_i
+    req_types.each do |req_type, _|
+      key = redis_key(req_type, date)
 
+      namespaced_key = $redis.namespace_key(key)
+      val = $redis.without_namespace.eval(GET_AND_RESET, keys: [namespaced_key]).to_i
       next if val == 0
 
-      new_val = $redis.incrby(key, -val).to_i
-
-      if new_val < 0
-        # undo and flush next time
-        $redis.incrby(key, val)
-        next
-      end
-
-      id = req_id(date,req_type)
-
+      id = req_id(date, req_type)
       where(id: id).update_all(["count = count + ?", val])
     end
+  rescue Redis::CommandError => e
+    raise unless e.message =~ /READONLY/
+    nil
   end
 
-  def self.clear_cache!(date=nil)
+  def self.clear_cache!(date = nil)
     if date.nil?
       clear_cache!(Time.now.utc)
       clear_cache!(Time.now.utc.yesterday)
       return
     end
 
-    req_types.each do |req_type,_|
-      key = redis_key(req_type,date)
+    req_types.each do |req_type, _|
+      key = redis_key(req_type, date)
       $redis.del key
     end
   end
 
   protected
 
-  def self.req_id(date,req_type,retries=0)
+  def self.req_id(date, req_type, retries = 0)
 
     req_type_id = req_types[req_type]
 
@@ -94,13 +100,13 @@ class ApplicationRequest < ActiveRecord::Base
 
   rescue # primary key violation
     if retries == 0
-      req_id(date,req_type,1)
+      req_id(date, req_type, 1)
     else
       raise
     end
   end
 
-  def self.redis_key(req_type, time=Time.now.utc)
+  def self.redis_key(req_type, time = Time.now.utc)
     "app_req_#{req_type}#{time.strftime('%Y%m%d')}"
   end
 
diff --git a/app/models/backup.rb b/app/models/backup.rb
index d23d459d00..f8e6a6321f 100644
--- a/app/models/backup.rb
+++ b/app/models/backup.rb
@@ -10,9 +10,9 @@ class Backup
 
   def self.all
     Dir.glob(File.join(Backup.base_directory, "*.{gz,tgz}"))
-       .sort_by { |file| File.mtime(file) }
-       .reverse
-       .map { |backup| Backup.create_from_filename(File.basename(backup)) }
+      .sort_by { |file| File.mtime(file) }
+      .reverse
+      .map { |backup| Backup.create_from_filename(File.basename(backup)) }
   end
 
   def self.[](filename)
@@ -31,6 +31,7 @@ class Backup
 
   def after_create_hook
     upload_to_s3 if SiteSetting.enable_s3_backups?
+    DiscourseEvent.trigger(:backup_created)
   end
 
   def after_remove_hook
@@ -45,7 +46,7 @@ class Backup
 
   def s3
     require "s3_helper" unless defined? S3Helper
-    @s3_helper ||= S3Helper.new(s3_bucket)
+    @s3_helper ||= S3Helper.new(s3_bucket, '', S3Helper.s3_options(SiteSetting))
   end
 
   def upload_to_s3
diff --git a/app/models/badge.rb b/app/models/badge.rb
index ac1b3a4d49..a2f17409a7 100644
--- a/app/models/badge.rb
+++ b/app/models/badge.rb
@@ -56,14 +56,21 @@ class Badge < ActiveRecord::Base
   GivesBack = 32
   Empathetic = 39
 
+  Enthusiast = 45
+  Aficionado = 46
+  Devotee = 47
+
   NewUserOfTheMonth = 44
 
   # other consts
   AutobiographerMinBioLength = 10
 
+  # used by serializer
+  attr_accessor :has_badge
+
   def self.trigger_hash
     Hash[*(
-      Badge::Trigger.constants.map{|k|
+      Badge::Trigger.constants.map { |k|
         [k.to_s.underscore, Badge::Trigger.const_get(k)]
       }.flatten
     )]
@@ -100,7 +107,7 @@ class Badge < ActiveRecord::Base
   validates :allow_title, inclusion: [true, false]
   validates :multiple_grant, inclusion: [true, false]
 
-  scope :enabled, ->{ where(enabled: true) }
+  scope :enabled, -> { where(enabled: true) }
 
   before_create :ensure_not_system
 
@@ -190,7 +197,7 @@ class Badge < ActiveRecord::Base
 
   def long_description
     key = "badges.#{i18n_name}.long_description"
-    I18n.t(key, default: self[:long_description] || '')
+    I18n.t(key, default: self[:long_description] || '', base_uri: Discourse.base_uri)
   end
 
   def long_description=(val)
@@ -200,7 +207,7 @@ class Badge < ActiveRecord::Base
 
   def description
     key = "badges.#{i18n_name}.description"
-    I18n.t(key, default: self[:description] || '')
+    I18n.t(key, default: self[:description] || '', base_uri: Discourse.base_uri)
   end
 
   def description=(val)
@@ -208,7 +215,6 @@ class Badge < ActiveRecord::Base
     val
   end
 
-
   def slug
     Slug.for(self.display_name, '-')
   end
@@ -230,7 +236,7 @@ end
 # Table name: badges
 #
 #  id                :integer          not null, primary key
-#  name              :string           not null
+#  name              :string(255)      not null
 #  description       :text
 #  badge_type_id     :integer          not null
 #  grant_count       :integer          default(0), not null
@@ -238,7 +244,7 @@ end
 #  updated_at        :datetime         not null
 #  allow_title       :boolean          default(FALSE), not null
 #  multiple_grant    :boolean          default(FALSE), not null
-#  icon              :string           default("fa-certificate")
+#  icon              :string(255)      default("fa-certificate")
 #  listable          :boolean          default(TRUE)
 #  target_posts      :boolean          default(FALSE)
 #  query             :text
@@ -253,6 +259,5 @@ end
 #
 # Indexes
 #
-#  index_badges_on_badge_type_id  (badge_type_id)
-#  index_badges_on_name           (name) UNIQUE
+#  index_badges_on_name  (name) UNIQUE
 #
diff --git a/app/models/badge_grouping.rb b/app/models/badge_grouping.rb
index 4fdcef66e3..f1201e7214 100644
--- a/app/models/badge_grouping.rb
+++ b/app/models/badge_grouping.rb
@@ -22,7 +22,7 @@ end
 # Table name: badge_groupings
 #
 #  id          :integer          not null, primary key
-#  name        :string           not null
+#  name        :string(255)      not null
 #  description :text
 #  position    :integer          not null
 #  created_at  :datetime         not null
diff --git a/app/models/badge_type.rb b/app/models/badge_type.rb
index 11d4a4b655..4648e3ad58 100644
--- a/app/models/badge_type.rb
+++ b/app/models/badge_type.rb
@@ -3,7 +3,6 @@ class BadgeType < ActiveRecord::Base
   Silver = 2
   Bronze = 3
 
-
   has_many :badges
   validates :name, presence: true, uniqueness: true
 end
@@ -13,7 +12,7 @@ end
 # Table name: badge_types
 #
 #  id         :integer          not null, primary key
-#  name       :string           not null
+#  name       :string(255)      not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #
diff --git a/app/models/category.rb b/app/models/category.rb
index 02956b4eef..2589903c2c 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -1,7 +1,7 @@
 require_dependency 'distributed_cache'
 
 class Category < ActiveRecord::Base
-
+  include Searchable
   include Positionable
   include HasCustomFields
   include CategoryHashtag
@@ -32,7 +32,7 @@ class Category < ActiveRecord::Base
   has_and_belongs_to_many :web_hooks
 
   validates :user_id, presence: true
-  validates :name, if: Proc.new { |c| c.new_record? || c.name_changed? },
+  validates :name, if: Proc.new { |c| c.new_record? || c.will_save_change_to_name? },
                    presence: true,
                    uniqueness: { scope: :parent_category_id, case_sensitive: false },
                    length: { in: 1..50 }
@@ -60,10 +60,9 @@ class Category < ActiveRecord::Base
 
   after_create :delete_category_permalink
 
-  after_update :rename_category_definition, if: :name_changed?
-  after_update :create_category_permalink, if: :slug_changed?
+  after_update :rename_category_definition, if: :saved_change_to_name?
+  after_update :create_category_permalink, if: :saved_change_to_slug?
 
-  has_one :category_search_data
   belongs_to :parent_category, class_name: 'Category'
   has_many :subcategories, class_name: 'Category', foreign_key: 'parent_category_id'
 
@@ -72,11 +71,11 @@ class Category < ActiveRecord::Base
   has_many :category_tag_groups, dependent: :destroy
   has_many :tag_groups, through: :category_tag_groups
 
-
   scope :latest, -> { order('topic_count DESC') }
 
   scope :secured, -> (guardian = nil) {
     ids = guardian.secure_category_ids if guardian
+
     if ids.present?
       where("NOT categories.read_restricted OR categories.id IN (:cats)", cats: ids).references(:categories)
     else
@@ -109,10 +108,6 @@ class Category < ActiveRecord::Base
     Category.reset_topic_ids_cache
   end
 
-  def self.last_updated_at
-    order('updated_at desc').limit(1).pluck(:updated_at).first.to_i
-  end
-
   def self.scoped_to_permissions(guardian, permission_types)
     if guardian.try(:is_admin?)
       all
@@ -141,10 +136,10 @@ class Category < ActiveRecord::Base
 
   def self.update_stats
     topics_with_post_count = Topic
-                              .select("topics.category_id, COUNT(*) topic_count, SUM(topics.posts_count) post_count")
-                              .where("topics.id NOT IN (select cc.topic_id from categories cc WHERE topic_id IS NOT NULL)")
-                              .group("topics.category_id")
-                              .visible.to_sql
+      .select("topics.category_id, COUNT(*) topic_count, SUM(topics.posts_count) post_count")
+      .where("topics.id NOT IN (select cc.topic_id from categories cc WHERE topic_id IS NOT NULL)")
+      .group("topics.category_id")
+      .visible.to_sql
 
     Category.exec_sql <<-SQL
     UPDATE categories c
@@ -183,13 +178,12 @@ SQL
     end
   end
 
-
   def visible_posts
     query = Post.joins(:topic)
-                .where(['topics.category_id = ?', self.id])
-                .where('topics.visible = true')
-                .where('posts.deleted_at IS NULL')
-                .where('posts.user_deleted = false')
+      .where(['topics.category_id = ?', self.id])
+      .where('topics.visible = true')
+      .where('posts.deleted_at IS NULL')
+      .where('posts.user_deleted = false')
     self.topic_id ? query.where(['topics.id <> ?', self.topic_id]) : query
   end
 
@@ -202,7 +196,7 @@ SQL
     t = Topic.new(title: I18n.t("category.topic_prefix", category: name), user: user, pinned_at: Time.now, category_id: id)
     t.skip_callbacks = true
     t.ignore_category_auto_close = true
-    t.set_or_create_timer(TopicTimer.types[:close], nil)
+    t.delete_topic_timer(TopicTimer.types[:close])
     t.save!(validate: false)
     update_column(:topic_id, t.id)
     t.posts.create(raw: post_template, user: user)
@@ -256,11 +250,11 @@ SQL
 
   def publish_category
     group_ids = self.groups.pluck(:id) if self.read_restricted
-    MessageBus.publish('/categories', {categories: ActiveModel::ArraySerializer.new([self]).as_json}, group_ids: group_ids)
+    MessageBus.publish('/categories', { categories: ActiveModel::ArraySerializer.new([self]).as_json }, group_ids: group_ids)
   end
 
   def publish_category_deletion
-    MessageBus.publish('/categories', {deleted_categories: [self.id]})
+    MessageBus.publish('/categories', deleted_categories: [self.id])
   end
 
   def parent_category_validator
@@ -321,7 +315,7 @@ SQL
   end
 
   def allowed_tags=(tag_names_arg)
-    DiscourseTagging.add_or_create_tags_by_name(self, tag_names_arg, {unlimited: true})
+    DiscourseTagging.add_or_create_tags_by_name(self, tag_names_arg, unlimited: true)
   end
 
   def allowed_tag_groups=(group_names)
@@ -359,21 +353,21 @@ SQL
 
   def update_latest
     latest_post_id = Post
-                        .order("posts.created_at desc")
-                        .where("NOT hidden")
-                        .joins("join topics on topics.id = topic_id")
-                        .where("topics.category_id = :id", id: self.id)
-                        .limit(1)
-                        .pluck("posts.id")
-                        .first
+      .order("posts.created_at desc")
+      .where("NOT hidden")
+      .joins("join topics on topics.id = topic_id")
+      .where("topics.category_id = :id", id: self.id)
+      .limit(1)
+      .pluck("posts.id")
+      .first
 
     latest_topic_id = Topic
-                        .order("topics.created_at desc")
-                        .where("visible")
-                        .where("topics.category_id = :id", id: self.id)
-                        .limit(1)
-                        .pluck("topics.id")
-                        .first
+      .order("topics.created_at desc")
+      .where("visible")
+      .where("topics.category_id = :id", id: self.id)
+      .limit(1)
+      .pluck("topics.id")
+      .first
 
     self.update_attributes(latest_topic_id: latest_topic_id, latest_post_id: latest_post_id)
   end
@@ -384,7 +378,7 @@ SQL
     everyone = Group::AUTO_GROUPS[:everyone]
     full = CategoryGroup.permission_types[:full]
 
-    mapped = permissions.map do |group,permission|
+    mapped = permissions.map do |group, permission|
       group = group.id if group.is_a?(Group)
 
       # subtle, using Group[] ensures the group exists in the DB
@@ -459,7 +453,7 @@ SQL
   # If the name changes, try and update the category definition topic too if it's
   # an exact match
   def rename_category_definition
-    old_name = changed_attributes["name"]
+    old_name = saved_changes.transform_values(&:first)["name"]
     return unless topic.present?
     if topic.title == I18n.t("category.topic_prefix", category: old_name)
       topic.update_attribute(:title, I18n.t("category.topic_prefix", category: name))
@@ -467,7 +461,7 @@ SQL
   end
 
   def create_category_permalink
-    old_slug = changed_attributes["slug"]
+    old_slug = saved_changes.transform_values(&:first)["slug"]
     if self.parent_category
       url = "c/#{self.parent_category.slug}/#{old_slug}"
     else
@@ -498,7 +492,7 @@ SQL
     SearchIndexer.index(self)
   end
 
-  def self.find_by_slug(category_slug, parent_category_slug=nil)
+  def self.find_by_slug(category_slug, parent_category_slug = nil)
     if parent_category_slug
       parent_category_id = self.where(slug: parent_category_slug, parent_category_id: nil).pluck(:id).first
       self.where(slug: category_slug, parent_category_id: parent_category_id).first
@@ -527,7 +521,7 @@ end
 #  topics_year                   :integer          default(0)
 #  topics_month                  :integer          default(0)
 #  topics_week                   :integer          default(0)
-#  slug                          :string           not null
+#  slug                          :string(255)      not null
 #  description                   :text
 #  text_color                    :string(6)        default("FFFFFF"), not null
 #  read_restricted               :boolean          default(FALSE), not null
@@ -540,7 +534,7 @@ end
 #  posts_year                    :integer          default(0)
 #  posts_month                   :integer          default(0)
 #  posts_week                    :integer          default(0)
-#  email_in                      :string
+#  email_in                      :string(255)
 #  email_in_allow_strangers      :boolean          default(FALSE)
 #  topics_day                    :integer          default(0)
 #  posts_day                     :integer          default(0)
@@ -561,10 +555,11 @@ end
 #  default_view                  :string(50)
 #  subcategory_list_style        :string(50)       default("rows_with_featured_topics")
 #  default_top_period            :string(20)       default("all")
+#  mailinglist_mirror            :boolean          default(FALSE), not null
 #
 # Indexes
 #
-#  index_categories_on_email_in     (email_in) UNIQUE
-#  index_categories_on_topic_count  (topic_count)
-#  unique_index_categories_on_name  (name) UNIQUE
+#  index_categories_on_email_in            (email_in) UNIQUE
+#  index_categories_on_forum_thread_count  (topic_count)
+#  unique_index_categories_on_name         ((COALESCE(parent_category_id, '-1'::integer)), name) UNIQUE
 #
diff --git a/app/models/category_featured_topic.rb b/app/models/category_featured_topic.rb
index 78331574db..aef63075fa 100644
--- a/app/models/category_featured_topic.rb
+++ b/app/models/category_featured_topic.rb
@@ -2,18 +2,45 @@ class CategoryFeaturedTopic < ActiveRecord::Base
   belongs_to :category
   belongs_to :topic
 
-  # Populates the category featured topics
-  def self.feature_topics
+  NEXT_CATEGORY_ID_KEY = 'category-featured-topic:next-category-id'.freeze
+  DEFAULT_BATCH_SIZE = 100
+
+  # Populates the category featured topics.
+  def self.feature_topics(batched: false, batch_size: nil)
     current = {}
     CategoryFeaturedTopic.select(:topic_id, :category_id).order(:rank).each do |f|
       (current[f.category_id] ||= []) << f.topic_id
     end
-    Category.select(:id, :topic_id, :num_featured_topics).find_each do |c|
+
+    batch_size ||= DEFAULT_BATCH_SIZE
+
+    next_category_id = batched ? $redis.get(NEXT_CATEGORY_ID_KEY).to_i : 0
+
+    categories = Category.select(:id, :topic_id, :num_featured_topics)
+      .where('id >= ?', next_category_id)
+      .order('id ASC')
+      .limit(batch_size)
+      .to_a
+
+    if batched
+      if categories.length == batch_size
+        next_id = Category.where('id > ?', categories.last.id).order('id asc').limit(1).pluck(:id)[0]
+        next_id ? $redis.setex(NEXT_CATEGORY_ID_KEY, 1.day, next_id) : clear_batch!
+      else
+        clear_batch!
+      end
+    end
+
+    categories.each do |c|
       CategoryFeaturedTopic.feature_topics_for(c, current[c.id] || [])
     end
   end
 
-  def self.feature_topics_for(c, existing=nil)
+  def self.clear_batch!
+    $redis.del(NEXT_CATEGORY_ID_KEY)
+  end
+
+  def self.feature_topics_for(c, existing = nil)
     return if c.blank?
 
     query_opts = {
@@ -23,18 +50,24 @@ class CategoryFeaturedTopic < ActiveRecord::Base
       no_definitions: true
     }
 
-    # Add topics, even if they're in secured categories:
+    # It may seem a bit odd that we are running 2 queries here, when admin
+    # can clearly pull out all the topics needed.
+    # We do so, so anonymous will ALWAYS get some topics
+    # If we only fetched as admin we may have a situation where anon can see
+    # no featured topics (all the previous 2x topics are only visible to admins)
+
+    # Add topics, even if they're in secured categories or invisible
     query = TopicQuery.new(CategoryFeaturedTopic.fake_admin, query_opts)
     results = query.list_category_topic_ids(c).uniq
 
     # Add some topics that are visible to everyone:
-    anon_query = TopicQuery.new(nil, query_opts.merge({except_topic_ids: [c.topic_id] + results}))
+    anon_query = TopicQuery.new(nil, query_opts.merge(except_topic_ids: [c.topic_id] + results))
     results += anon_query.list_category_topic_ids(c).uniq
 
     return if results == existing
 
     CategoryFeaturedTopic.transaction do
-      CategoryFeaturedTopic.delete_all(category_id: c.id)
+      CategoryFeaturedTopic.where(category_id: c.id).delete_all
       if results
         results.each_with_index do |topic_id, idx|
           begin
diff --git a/app/models/category_featured_user.rb b/app/models/category_featured_user.rb
index fb75cca87b..638af79213 100644
--- a/app/models/category_featured_user.rb
+++ b/app/models/category_featured_user.rb
@@ -30,13 +30,14 @@ class CategoryFeaturedUser < ActiveRecord::Base
       LIMIT :max_featured_users;
     ", category_id: category_id, max_featured_users: max_featured_users
 
-    user_ids = most_recent_user_ids.map{|uc| uc['user_id'].to_i}
+    user_ids = most_recent_user_ids.map { |uc| uc['user_id'].to_i }
     current = CategoryFeaturedUser.where(category_id: category_id).order(:id).pluck(:user_id)
 
     return if current == user_ids
 
     transaction do
-      CategoryFeaturedUser.delete_all category_id: category_id
+      CategoryFeaturedUser.where(category_id: category_id).delete_all
+
       user_ids.each do |user_id|
         create(category_id: category_id, user_id: user_id)
       end
diff --git a/app/models/category_list.rb b/app/models/category_list.rb
index 39507a2a8a..ccc23d88b6 100644
--- a/app/models/category_list.rb
+++ b/app/models/category_list.rb
@@ -3,13 +3,16 @@ require_dependency 'pinned_check'
 class CategoryList
   include ActiveModel::Serialization
 
+  cattr_accessor :preloaded_topic_custom_fields
+  self.preloaded_topic_custom_fields = Set.new
+
   attr_accessor :categories,
                 :uncategorized,
                 :draft,
                 :draft_key,
                 :draft_sequence
 
-  def initialize(guardian=nil, options={})
+  def initialize(guardian = nil, options = {})
     @guardian = guardian || Guardian.new
     @options = options
 
@@ -20,6 +23,19 @@ class CategoryList
     find_user_data
     sort_unpinned
     trim_results
+
+    if preloaded_topic_custom_fields.present?
+      displayable_topics = @categories.map(&:displayable_topics)
+      displayable_topics.flatten!
+      displayable_topics.compact!
+
+      if displayable_topics.present?
+        Topic.preload_custom_fields(
+          displayable_topics,
+          preloaded_topic_custom_fields
+        )
+      end
+    end
   end
 
   def preload_key
@@ -63,21 +79,23 @@ class CategoryList
         @categories = @categories.order(:position, :id)
       else
         @categories = @categories.order('COALESCE(categories.posts_week, 0) DESC')
-                                 .order('COALESCE(categories.posts_month, 0) DESC')
-                                 .order('COALESCE(categories.posts_year, 0) DESC')
-                                 .order('id ASC')
+          .order('COALESCE(categories.posts_month, 0) DESC')
+          .order('COALESCE(categories.posts_year, 0) DESC')
+          .order('id ASC')
       end
 
       @categories = @categories.to_a
 
       category_user = {}
+      default_notification_level = nil
       unless @guardian.anonymous?
         category_user = Hash[*CategoryUser.where(user: @guardian.user).pluck(:category_id, :notification_level).flatten]
+        default_notification_level = CategoryUser.notification_levels[:regular]
       end
 
       allowed_topic_create = Set.new(Category.topic_create_allowed(@guardian).pluck(:id))
       @categories.each do |category|
-        category.notification_level = category_user[category.id]
+        category.notification_level = category_user[category.id] || default_notification_level
         category.permission = CategoryGroup.permission_types[:full] if allowed_topic_create.include?(category.id)
         category.has_children = category.subcategories.present?
       end
diff --git a/app/models/category_search_data.rb b/app/models/category_search_data.rb
index bfbd1b316a..b23bf93604 100644
--- a/app/models/category_search_data.rb
+++ b/app/models/category_search_data.rb
@@ -1,7 +1,5 @@
 class CategorySearchData < ActiveRecord::Base
-  belongs_to :category
-
-  validates_presence_of :search_data
+  include HasSearchData
 end
 
 # == Schema Information
@@ -12,6 +10,7 @@ end
 #  search_data :tsvector
 #  raw_data    :text
 #  locale      :text
+#  version     :integer          default(0)
 #
 # Indexes
 #
diff --git a/app/models/category_user.rb b/app/models/category_user.rb
index 1cb6f502b3..8d0cf15912 100644
--- a/app/models/category_user.rb
+++ b/app/models/category_user.rb
@@ -62,7 +62,7 @@ class CategoryUser < ActiveRecord::Base
     auto_track(user_id: user.id)
   end
 
-  def self.auto_track(opts={})
+  def self.auto_track(opts = {})
 
     builder = SqlBuilder.new <<SQL
     UPDATE topic_users tu
@@ -95,7 +95,7 @@ SQL
                  auto_track_category:  TopicUser.notification_reasons[:auto_track_category])
   end
 
-  def self.auto_watch(opts={})
+  def self.auto_watch(opts = {})
 
     builder = SqlBuilder.new <<SQL
     UPDATE topic_users tu
@@ -154,7 +154,6 @@ SQL
 
   end
 
-
   def self.ensure_consistency!
     exec_sql <<SQL
     DELETE FROM category_users
diff --git a/app/models/color_scheme.rb b/app/models/color_scheme.rb
index 3713d5299c..dbe60b1c76 100644
--- a/app/models/color_scheme.rb
+++ b/app/models/color_scheme.rb
@@ -9,7 +9,7 @@ class ColorScheme < ActiveRecord::Base
       "tertiary" =>          '0f82af',
       "quaternary" =>        'c14924',
       "header_background" => '111111',
-      "header_primary" =>    '333333',
+      "header_primary" =>    'dddddd',
       "highlight" =>         'a87137',
       "danger" =>            'e45735',
       "success" =>           '1ca551',
@@ -27,8 +27,8 @@ class ColorScheme < ActiveRecord::Base
       { id: 'default', colors: base_with_hash }
     ]
 
-    CUSTOM_SCHEMES.each do |k,v|
-      list.push({id: k.to_s, colors: v})
+    CUSTOM_SCHEMES.each do |k, v|
+      list.push(id: k.to_s, colors: v)
     end
     list
   end
@@ -75,7 +75,7 @@ class ColorScheme < ActiveRecord::Base
   def self.base_color_schemes
     base_color_scheme_colors.map do |hash|
       scheme = new(name: I18n.t("color_schemes.#{hash[:id]}"), base_scheme_id: hash[:id])
-      scheme.colors = hash[:colors].map{|k,v| {name: k.to_s, hex: v.sub("#","")}}
+      scheme.colors = hash[:colors].map { |k, v| { name: k.to_s, hex: v.sub("#", "") } }
       scheme.is_base = true
       scheme
     end
@@ -84,7 +84,7 @@ class ColorScheme < ActiveRecord::Base
   def self.base
     return @base_color_scheme if @base_color_scheme
     @base_color_scheme = new(name: I18n.t('color_schemes.base_theme_name'))
-    @base_color_scheme.colors = base_colors.map { |name, hex| {name: name, hex: hex} }
+    @base_color_scheme.colors = base_colors.map { |name, hex| { name: name, hex: hex } }
     @base_color_scheme.is_base = true
     @base_color_scheme
   end
@@ -96,13 +96,13 @@ class ColorScheme < ActiveRecord::Base
     new_color_scheme.base_scheme_id = params[:base_scheme_id]
 
     colors = CUSTOM_SCHEMES[params[:base_scheme_id].to_sym]&.map do |name, hex|
-      {name: name, hex: hex}
+      { name: name, hex: hex }
     end if params[:base_scheme_id]
     colors ||= base.colors_hashes
 
     # Override base values
     params[:colors].each do |name, hex|
-      c = colors.find {|x| x[:name].to_s == name.to_s}
+      c = colors.find { |x| x[:name].to_s == name.to_s }
       c[:hex] = hex
     end if params[:colors]
 
@@ -113,7 +113,7 @@ class ColorScheme < ActiveRecord::Base
 
   def self.lookup_hex_for_name(name)
     enabled_color_scheme = Theme.where(key: SiteSetting.default_theme_key).first&.color_scheme
-    (enabled_color_scheme || base).colors.find {|c| c.name == name }.try(:hex) || :nil
+    (enabled_color_scheme || base).colors.find { |c| c.name == name }.try(:hex) || :nil
   end
 
   def self.hex_for_name(name)
@@ -124,12 +124,12 @@ class ColorScheme < ActiveRecord::Base
   def colors=(arr)
     @colors_by_name = nil
     arr.each do |c|
-      self.color_scheme_colors << ColorSchemeColor.new( name: c[:name], hex: c[:hex] )
+      self.color_scheme_colors << ColorSchemeColor.new(name: c[:name], hex: c[:hex])
     end
   end
 
   def colors_by_name
-    @colors_by_name ||= self.colors.inject({}) { |sum,c| sum[c.name] = c; sum; }
+    @colors_by_name ||= self.colors.inject({}) { |sum, c| sum[c.name] = c; sum; }
   end
   def clear_colors_cache
     @colors_by_name = nil
@@ -137,7 +137,7 @@ class ColorScheme < ActiveRecord::Base
 
   def colors_hashes
     color_scheme_colors.map do |c|
-      {name: c.name, hex: c.hex}
+      { name: c.name, hex: c.hex }
     end
   end
 
@@ -187,7 +187,7 @@ end
 # Table name: color_schemes
 #
 #  id             :integer          not null, primary key
-#  name           :string           not null
+#  name           :string(255)      not null
 #  version        :integer          default(1), not null
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
diff --git a/app/models/color_scheme_color.rb b/app/models/color_scheme_color.rb
index 51e0c4ae8d..39a7b51eec 100644
--- a/app/models/color_scheme_color.rb
+++ b/app/models/color_scheme_color.rb
@@ -9,8 +9,8 @@ end
 # Table name: color_scheme_colors
 #
 #  id              :integer          not null, primary key
-#  name            :string           not null
-#  hex             :string           not null
+#  name            :string(255)      not null
+#  hex             :string(255)      not null
 #  color_scheme_id :integer          not null
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
diff --git a/app/models/concerns/has_custom_fields.rb b/app/models/concerns/has_custom_fields.rb
index f1c3ec2863..519f8deb51 100644
--- a/app/models/concerns/has_custom_fields.rb
+++ b/app/models/concerns/has_custom_fields.rb
@@ -18,8 +18,8 @@ module HasCustomFields
       return unless types
 
       sorted_types = types.keys.select { |k| k.end_with?("*") }
-                               .sort_by(&:length)
-                               .reverse
+        .sort_by(&:length)
+        .reverse
 
       sorted_types.each do |t|
         return types[t] if key =~ /^#{t}/i
@@ -32,9 +32,9 @@ module HasCustomFields
       return value unless type = get_custom_field_type(types, key)
 
       case type
-        when :boolean then !!CUSTOM_FIELD_TRUE.include?(value)
-        when :integer then value.to_i
-        when :json    then ::JSON.parse(value)
+      when :boolean then !!CUSTOM_FIELD_TRUE.include?(value)
+      when :integer then value.to_i
+      when :json    then ::JSON.parse(value)
       else
         value
       end
@@ -42,7 +42,7 @@ module HasCustomFields
   end
 
   included do
-    has_many :_custom_fields, dependent: :destroy, :class_name => "#{name}CustomField"
+    has_many :_custom_fields, dependent: :destroy, class_name: "#{name}CustomField"
     after_save :save_custom_fields
 
     attr_accessor :preloaded_custom_fields
@@ -58,7 +58,7 @@ module HasCustomFields
       return result if whitelisted_fields.blank?
 
       klass.where(foreign_key => ids, :name => whitelisted_fields)
-           .pluck(foreign_key, :name, :value).each do |cf|
+        .pluck(foreign_key, :name, :value).each do |cf|
         result[cf[0]] ||= {}
         append_custom_field(result[cf[0]], cf[1], cf[2])
       end
@@ -96,7 +96,7 @@ module HasCustomFields
           .where("name in (?)", fields)
           .pluck(fk, :name, :value).each do |id, name, value|
 
-            preloaded = map[id].preloaded_custom_fields
+          preloaded = map[id].preloaded_custom_fields
 
             if preloaded[name].nil?
               preloaded.delete(name)
@@ -139,7 +139,6 @@ module HasCustomFields
   end
 
   def custom_fields
-
     if @preloaded_custom_fields
       return @preloaded_proxy ||= PreloadedProxy.new(@preloaded_custom_fields)
     end
@@ -156,13 +155,13 @@ module HasCustomFields
     !@custom_fields || @custom_fields_orig == @custom_fields
   end
 
-  def save_custom_fields(force=false)
+  def save_custom_fields(force = false)
     if force || !custom_fields_clean?
       dup = @custom_fields.dup
 
       array_fields = {}
 
-      _custom_fields.each do |f|
+      _custom_fields.reload.each do |f|
         if dup[f.name].is_a? Array
           # we need to collect Arrays fully before we can compare them
           if !array_fields.has_key?(f.name)
@@ -172,13 +171,16 @@ module HasCustomFields
           end
         elsif dup[f.name].is_a? Hash
           if dup[f.name].to_json != f.value
-            f.destroy
+            f.destroy!
           else
             dup.delete(f.name)
           end
         else
-          if dup[f.name] != f.value
-            f.destroy
+          t = {}
+          self.class.append_custom_field(t, f.name, f.value)
+
+          if dup[f.name] != t[f.name]
+            f.destroy!
           else
             dup.delete(f.name)
           end
@@ -194,13 +196,14 @@ module HasCustomFields
         end
       end
 
-      dup.each do |k,v|
+      dup.each do |k, v|
         if v.is_a? Array
-          v.each { |subv| _custom_fields.create(name: k, value: subv) }
-        elsif v.is_a? Hash
-          _custom_fields.create(name: k, value: v.to_json)
+          v.each { |subv| _custom_fields.create!(name: k, value: subv) }
         else
-          _custom_fields.create(name: k, value: v)
+          _custom_fields.create!(
+            name: k,
+            value: v.is_a?(Hash) ? v.to_json : v
+          )
         end
       end
 
@@ -212,7 +215,7 @@ module HasCustomFields
 
   def refresh_custom_fields_from_db
     target = Hash.new
-    _custom_fields.pluck(:name,:value).each do |key, value|
+    _custom_fields.order('id asc').pluck(:name, :value).each do |key, value|
       self.class.append_custom_field(target, key, value)
     end
     @custom_fields_orig = target
diff --git a/app/models/concerns/has_search_data.rb b/app/models/concerns/has_search_data.rb
new file mode 100644
index 0000000000..acf8f2cf53
--- /dev/null
+++ b/app/models/concerns/has_search_data.rb
@@ -0,0 +1,10 @@
+module HasSearchData
+  extend ActiveSupport::Concern
+
+  included do
+    _asscoiated_record_name = self.name.sub('SearchData', '').underscore
+    self.primary_key = "#{_asscoiated_record_name}_id"
+    belongs_to _asscoiated_record_name.to_sym
+    validates_presence_of :search_data
+  end
+end
diff --git a/app/models/concerns/positionable.rb b/app/models/concerns/positionable.rb
index 335b8ce0ac..68e71f1b14 100644
--- a/app/models/concerns/positionable.rb
+++ b/app/models/concerns/positionable.rb
@@ -11,18 +11,18 @@ module Positionable
 
     position = [[position_arg, 0].max, self.class.count - 1].min
 
-    if self.position.nil? or position > self.position
+    if self.position.nil? || position > (self.position)
       self.exec_sql "
       UPDATE #{self.class.table_name}
       SET position = position - 1
       WHERE position > :current_position and position <= :new_position",
-      {current_position: self.position, new_position: position}
+      current_position: self.position, new_position: position
     elsif position < self.position
       self.exec_sql "
       UPDATE #{self.class.table_name}
       SET position = position + 1
       WHERE position >= :new_position and position < :current_position",
-      {current_position: self.position, new_position: position}
+      current_position: self.position, new_position: position
     else
       # Not moving to a new position
       return
@@ -31,6 +31,6 @@ module Positionable
     self.exec_sql "
     UPDATE #{self.class.table_name}
     SET position = :position
-    WHERE id = :id", {id: id, position: position}
+    WHERE id = :id", id: id, position: position
   end
 end
diff --git a/app/models/concerns/searchable.rb b/app/models/concerns/searchable.rb
new file mode 100644
index 0000000000..dd67af0547
--- /dev/null
+++ b/app/models/concerns/searchable.rb
@@ -0,0 +1,7 @@
+module Searchable
+  extend ActiveSupport::Concern
+
+  included do
+    has_one "#{self.name.underscore}_search_data".to_sym, dependent: :destroy
+  end
+end
diff --git a/app/models/concerns/trashable.rb b/app/models/concerns/trashable.rb
index 9325f6849e..ffd753a805 100644
--- a/app/models/concerns/trashable.rb
+++ b/app/models/concerns/trashable.rb
@@ -8,7 +8,6 @@ module Trashable
     belongs_to :deleted_by, class_name: 'User'
   end
 
-
   module ClassMethods
     def with_deleted
       # lifted from acts_as_paranoid, works around https://github.com/rails/rails/issues/4306
@@ -17,7 +16,7 @@ module Trashable
       #
       scope = self.all
 
-      scope.where_values.delete(with_deleted_scope_sql)
+      scope.where_clause.send(:predicates).delete(with_deleted_scope_sql)
       scope
     end
 
@@ -30,7 +29,7 @@ module Trashable
     deleted_at.present?
   end
 
-  def trash!(trashed_by=nil)
+  def trash!(trashed_by = nil)
     # note, an argument could be made that the column should probably called trashed_at
     # however, deleted_at is the terminology used in the UI
     #
@@ -44,7 +43,6 @@ module Trashable
     trash_update(nil, nil)
   end
 
-
   private
 
     def trash_update(deleted_at, deleted_by_id)
diff --git a/app/models/directory_item.rb b/app/models/directory_item.rb
index 9bdcdf50ac..a31453bc02 100644
--- a/app/models/directory_item.rb
+++ b/app/models/directory_item.rb
@@ -22,32 +22,34 @@ class DirectoryItem < ActiveRecord::Base
   end
 
   def self.refresh!
-    period_types.each_key {|p| refresh_period!(p)}
+    period_types.each_key { |p| refresh_period!(p) }
   end
 
-  def self.refresh_period!(period_type)
+  def self.refresh_period!(period_type, force: false)
 
     # Don't calculate it if the user directory is disabled
-    return unless SiteSetting.enable_user_directory?
+    return unless SiteSetting.enable_user_directory? || force
 
-    since = case period_type
-            when :daily then 1.day.ago
-            when :weekly then 1.week.ago
-            when :monthly then 1.month.ago
-            when :quarterly then 3.months.ago
-            when :yearly then 1.year.ago
-            else 1000.years.ago
-            end
+    since =
+      case period_type
+      when :daily then 1.day.ago
+      when :weekly then 1.week.ago
+      when :monthly then 1.month.ago
+      when :quarterly then 3.months.ago
+      when :yearly then 1.year.ago
+      else 1000.years.ago
+      end
 
     ActiveRecord::Base.transaction do
+      # Delete records that belonged to users who have been deleted
       exec_sql "DELETE FROM directory_items
                 USING directory_items di
-                LEFT JOIN users u ON u.id = user_id
+                LEFT JOIN users u ON (u.id = user_id AND u.active AND u.silenced_till IS NULL AND u.id > 0)
                 WHERE di.id = directory_items.id AND
                       u.id IS NULL AND
                       di.period_type = :period_type", period_type: period_types[period_type]
 
-
+      # Create new records for users who don't have one yet
       exec_sql "INSERT INTO directory_items(period_type, user_id, likes_received, likes_given, topics_entered, days_visited, posts_read, topic_count, post_count)
                 SELECT
                     :period_type,
@@ -61,31 +63,32 @@ class DirectoryItem < ActiveRecord::Base
                     0
                 FROM users u
                 LEFT JOIN directory_items di ON di.user_id = u.id AND di.period_type = :period_type
-                WHERE di.id IS NULL AND u.id > 0
+                WHERE di.id IS NULL AND u.id > 0 AND u.silenced_till IS NULL and u.active
       ", period_type: period_types[period_type]
 
+      # Calculate new values and update records
+      #
+      #
+      # TODO
+      # WARNING: post_count is a wrong name, it should be reply_count (excluding topic post)
+      #
       exec_sql "WITH x AS (SELECT
                     u.id user_id,
-                    SUM(CASE WHEN ua.action_type = :was_liked_type THEN 1 ELSE 0 END) likes_received,
-                    SUM(CASE WHEN ua.action_type = :like_type THEN 1 ELSE 0 END) likes_given,
+                    SUM(CASE WHEN p.id IS NOT NULL AND t.id IS NOT NULL AND ua.action_type = :was_liked_type THEN 1 ELSE 0 END) likes_received,
+                    SUM(CASE WHEN p.id IS NOT NULL AND t.id IS NOT NULL AND ua.action_type = :like_type THEN 1 ELSE 0 END) likes_given,
                     COALESCE((SELECT COUNT(topic_id) FROM topic_views AS v WHERE v.user_id = u.id AND v.viewed_at >= :since), 0) topics_entered,
                     COALESCE((SELECT COUNT(id) FROM user_visits AS uv WHERE uv.user_id = u.id AND uv.visited_at >= :since), 0) days_visited,
                     COALESCE((SELECT SUM(posts_read) FROM user_visits AS uv2 WHERE uv2.user_id = u.id AND uv2.visited_at >= :since), 0) posts_read,
-                    SUM(CASE WHEN ua.action_type = :new_topic_type THEN 1 ELSE 0 END) topic_count,
-                    SUM(CASE WHEN ua.action_type = :reply_type THEN 1 ELSE 0 END) post_count
+                    SUM(CASE WHEN t2.id IS NOT NULL AND ua.action_type = :new_topic_type THEN 1 ELSE 0 END) topic_count,
+                    SUM(CASE WHEN p.id IS NOT NULL AND t.id IS NOT NULL AND ua.action_type = :reply_type THEN 1 ELSE 0 END) post_count
                   FROM users AS u
-                  LEFT OUTER JOIN user_actions AS ua ON ua.user_id = u.id
-                  LEFT OUTER JOIN topics AS t ON ua.target_topic_id = t.id AND t.archetype = 'regular'
-                  LEFT OUTER JOIN posts AS p ON ua.target_post_id = p.id
+                  LEFT OUTER JOIN user_actions AS ua ON ua.user_id = u.id AND COALESCE(ua.created_at, :since) >= :since
+                  LEFT OUTER JOIN posts AS p ON ua.target_post_id = p.id AND p.deleted_at IS NULL AND p.post_type = :regular_post_type AND NOT p.hidden
+                  LEFT OUTER JOIN topics AS t ON p.topic_id = t.id AND t.archetype = 'regular' AND t.deleted_at IS NULL AND t.visible
+                  LEFT OUTER JOIN topics AS t2 ON t2.id = ua.target_topic_id AND t2.archetype = 'regular' AND t2.deleted_at IS NULL AND t2.visible
                   LEFT OUTER JOIN categories AS c ON t.category_id = c.id
                   WHERE u.active
-                    AND NOT u.blocked
-                    AND COALESCE(ua.created_at, :since) >= :since
-                    AND t.deleted_at IS NULL
-                    AND COALESCE(t.visible, true)
-                    AND p.deleted_at IS NULL
-                    AND (NOT (COALESCE(p.hidden, false)))
-                    AND COALESCE(p.post_type, :regular_post_type) = :regular_post_type
+                    AND u.silenced_till IS NULL
                     AND u.id > 0
                   GROUP BY u.id)
       UPDATE directory_items di SET
@@ -117,7 +120,6 @@ class DirectoryItem < ActiveRecord::Base
                   reply_type: UserAction::REPLY,
                   regular_post_type: Post.types[:regular]
 
-
       if period_type == :all
         exec_sql <<SQL
         UPDATE user_stats s
diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb
index 93c879b5df..3b976a57b3 100644
--- a/app/models/discourse_single_sign_on.rb
+++ b/app/models/discourse_single_sign_on.rb
@@ -10,7 +10,7 @@ class DiscourseSingleSignOn < SingleSignOn
     SiteSetting.sso_secret
   end
 
-  def self.generate_sso(return_path="/")
+  def self.generate_sso(return_path = "/")
     sso = new
     sso.nonce = SecureRandom.hex
     sso.register_nonce(return_path)
@@ -18,7 +18,7 @@ class DiscourseSingleSignOn < SingleSignOn
     sso
   end
 
-  def self.generate_url(return_path="/")
+  def self.generate_url(return_path = "/")
     generate_sso(return_path).to_url
   end
 
@@ -46,7 +46,7 @@ class DiscourseSingleSignOn < SingleSignOn
     "SSO_NONCE_#{nonce}"
   end
 
-  def lookup_or_create_user(ip_address=nil)
+  def lookup_or_create_user(ip_address = nil)
     sso_record = SingleSignOnRecord.find_by(external_id: external_id)
 
     if sso_record && (user = sso_record.user)
@@ -68,9 +68,10 @@ 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|
+    custom_fields.each do |k, v|
       user.custom_fields[k] = v
     end
 
@@ -107,9 +108,9 @@ class DiscourseSingleSignOn < SingleSignOn
 
   def apply_group_rules(user)
     if add_groups
-      split = add_groups.split(",")
+      split = add_groups.split(",").map(&:downcase)
       if split.length > 0
-        Group.where('name in (?) AND NOT automatic', split).pluck(:id).each do |id|
+        Group.where('LOWER(name) in (?) AND NOT automatic', split).pluck(:id).each do |id|
           unless GroupUser.where(group_id: id, user_id: user.id).exists?
             GroupUser.create(group_id: id, user_id: user.id)
           end
@@ -118,12 +119,12 @@ class DiscourseSingleSignOn < SingleSignOn
     end
 
     if remove_groups
-      split = remove_groups.split(",")
+      split = remove_groups.split(",").map(&:downcase)
       if split.length > 0
         GroupUser
-            .where(user_id: user.id)
-            .where('group_id IN (SELECT id FROM groups WHERE name in (?))',split)
-            .destroy_all
+          .where(user_id: user.id)
+          .where('group_id IN (SELECT id FROM groups WHERE LOWER(name) in (?))', split)
+          .destroy_all
       end
     end
   end
@@ -141,6 +142,10 @@ class DiscourseSingleSignOn < SingleSignOn
       }
 
       user = User.create!(user_params)
+
+      if SiteSetting.verbose_sso_logging
+        Rails.logger.warn("Verbose SSO log: New User (user_id: #{user.id}) Created with #{user_params}")
+      end
     end
 
     if user
@@ -148,8 +153,15 @@ class DiscourseSingleSignOn < SingleSignOn
         sso_record.last_payload = unsigned_payload
         sso_record.external_id = external_id
       else
-        Jobs.enqueue(:download_avatar_from_url, url: avatar_url, user_id: user.id, override_gravatar: SiteSetting.sso_overrides_avatar) if avatar_url.present?
-        user.create_single_sign_on_record(
+        if avatar_url.present?
+          Jobs.enqueue(:download_avatar_from_url,
+            url: avatar_url,
+            user_id: user.id,
+            override_gravatar: SiteSetting.sso_overrides_avatar
+          )
+        end
+
+        user.create_single_sign_on_record!(
           last_payload: unsigned_payload,
           external_id: external_id,
           external_username: username,
@@ -164,7 +176,7 @@ class DiscourseSingleSignOn < SingleSignOn
   end
 
   def change_external_attributes_and_override(sso_record, user)
-    if SiteSetting.sso_overrides_email && user.email != email
+    if SiteSetting.sso_overrides_email && user.email != Email.downcase(email)
       user.email = email
       user.active = false if require_activation
     end
diff --git a/app/models/discourse_version_check.rb b/app/models/discourse_version_check.rb
index 91aabe84c6..084c8dc6da 100644
--- a/app/models/discourse_version_check.rb
+++ b/app/models/discourse_version_check.rb
@@ -1,5 +1,14 @@
 class DiscourseVersionCheck
   include ActiveModel::Model
 
-  attr_accessor :latest_version, :critical_updates, :installed_version, :installed_sha, :installed_describe, :missing_versions_count, :git_branch, :updated_at, :version_check_pending
+  attr_accessor :latest_version,
+                :critical_updates,
+                :installed_version,
+                :installed_sha,
+                :installed_describe,
+                :missing_versions_count,
+                :git_branch,
+                :updated_at,
+                :version_check_pending,
+                :stale_data
 end
diff --git a/app/models/draft.rb b/app/models/draft.rb
index 437ad298fe..48bd38ce13 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -4,7 +4,7 @@ class Draft < ActiveRecord::Base
   EXISTING_TOPIC = 'topic_'
 
   def self.set(user, key, sequence, data)
-    d = find_draft(user,key)
+    d = find_draft(user, key)
     if d
       return if d.sequence > sequence
       exec_sql("UPDATE drafts
@@ -18,14 +18,14 @@ class Draft < ActiveRecord::Base
   end
 
   def self.get(user, key, sequence)
-    d = find_draft(user,key)
+    d = find_draft(user, key)
     if d && d.sequence == sequence
       d.data
     end
   end
 
   def self.clear(user, key, sequence)
-    d = find_draft(user,key)
+    d = find_draft(user, key)
     if d && d.sequence <= sequence
       d.destroy
     end
@@ -59,7 +59,7 @@ end
 #
 #  id         :integer          not null, primary key
 #  user_id    :integer          not null
-#  draft_key  :string           not null
+#  draft_key  :string(255)      not null
 #  data       :text             not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
diff --git a/app/models/draft_sequence.rb b/app/models/draft_sequence.rb
index af4eb647c9..863b00aa70 100644
--- a/app/models/draft_sequence.rb
+++ b/app/models/draft_sequence.rb
@@ -1,5 +1,5 @@
 class DraftSequence < ActiveRecord::Base
-  def self.next!(user,key)
+  def self.next!(user, key)
     user_id = user
     user_id = user.id unless user.is_a?(Integer)
 
@@ -10,7 +10,7 @@ class DraftSequence < ActiveRecord::Base
     c ||= DraftSequence.new(h)
     c.sequence ||= 0
     c.sequence += 1
-    c.save
+    c.save!
     exec_sql("DELETE FROM drafts WHERE user_id = :user_id AND draft_key = :draft_key AND sequence < :sequence", draft_key: key, user_id: user_id, sequence: c.sequence)
     c.sequence
   end
@@ -23,8 +23,7 @@ class DraftSequence < ActiveRecord::Base
 
     # perf critical path
     r = exec_sql('select sequence from draft_sequences where user_id = ? and draft_key = ?', user_id, key).values
-
-    r.length.zero? ? 0 : r[0][0].to_i
+    r.length.zero? ? 0 : r[0][0]
   end
 end
 
@@ -34,7 +33,7 @@ end
 #
 #  id        :integer          not null, primary key
 #  user_id   :integer          not null
-#  draft_key :string           not null
+#  draft_key :string(255)      not null
 #  sequence  :integer          not null
 #
 # Indexes
diff --git a/app/models/email_log.rb b/app/models/email_log.rb
index d17ec8c3a6..c17878c93d 100644
--- a/app/models/email_log.rb
+++ b/app/models/email_log.rb
@@ -39,21 +39,21 @@ class EmailLog < ActiveRecord::Base
     end
   end
 
-  def self.reached_max_emails?(user, email_type=nil)
+  def self.reached_max_emails?(user, email_type = nil)
     return false if SiteSetting.max_emails_per_day_per_user == 0 || CRITICAL_EMAIL_TYPES.include?(email_type)
 
     count = sent.where('created_at > ?', 1.day.ago)
-                .where(user_id: user.id)
-                .count
+      .where(user_id: user.id)
+      .count
 
     count >= SiteSetting.max_emails_per_day_per_user
   end
 
   def self.count_per_day(start_date, end_date)
     sent.where("created_at BETWEEN ? AND ?", start_date, end_date)
-        .group("DATE(created_at)")
-        .order("DATE(created_at)")
-        .count
+      .group("DATE(created_at)")
+      .order("DATE(created_at)")
+      .count
   end
 
   def self.for(reply_key)
@@ -62,9 +62,9 @@ class EmailLog < ActiveRecord::Base
 
   def self.last_sent_email_address
     self.where(email_type: "signup")
-        .order(created_at: :desc)
-        .first
-        .try(:to_address)
+      .order(created_at: :desc)
+      .first
+      .try(:to_address)
   end
 
 end
@@ -74,8 +74,8 @@ end
 # Table name: email_logs
 #
 #  id             :integer          not null, primary key
-#  to_address     :string           not null
-#  email_type     :string           not null
+#  to_address     :string(255)      not null
+#  email_type     :string(255)      not null
 #  user_id        :integer
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
@@ -83,7 +83,7 @@ end
 #  post_id        :integer
 #  topic_id       :integer
 #  skipped        :boolean          default(FALSE)
-#  skipped_reason :string
+#  skipped_reason :string(255)
 #  bounce_key     :string
 #  bounced        :boolean          default(FALSE), not null
 #  message_id     :string
diff --git a/app/models/email_token.rb b/app/models/email_token.rb
index 820ea078f9..2338108ac4 100644
--- a/app/models/email_token.rb
+++ b/app/models/email_token.rb
@@ -11,8 +11,8 @@ class EmailToken < ActiveRecord::Base
   after_create do
     # Expire the previous tokens
     EmailToken.where(user_id: self.user_id)
-              .where("id != ?", self.id)
-              .update_all(expired: true)
+      .where("id != ?", self.id)
+      .update_all(expired: true)
   end
 
   def self.token_length
@@ -36,7 +36,7 @@ class EmailToken < ActiveRecord::Base
   end
 
   def self.valid_token_format?(token)
-    token.present? && token =~ /\h{#{token.length/2}}/i
+    token.present? && token =~ /\h{#{token.length / 2}}/i
   end
 
   def self.atomic_confirm(token)
@@ -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
@@ -81,10 +81,10 @@ class EmailToken < ActiveRecord::Base
 
   def self.confirmable(token)
     EmailToken.where(token: token)
-              .where(expired: false, confirmed: false)
-              .where("created_at >= ?", EmailToken.valid_after)
-              .includes(:user)
-              .first
+      .where(expired: false, confirmed: false)
+      .where("created_at >= ?", EmailToken.valid_after)
+      .includes(:user)
+      .first
   end
 end
 
@@ -94,8 +94,8 @@ end
 #
 #  id         :integer          not null, primary key
 #  user_id    :integer          not null
-#  email      :string           not null
-#  token      :string           not null
+#  email      :string(255)      not null
+#  token      :string(255)      not null
 #  confirmed  :boolean          default(FALSE), not null
 #  expired    :boolean          default(FALSE), not null
 #  created_at :datetime         not null
diff --git a/app/models/embeddable_host.rb b/app/models/embeddable_host.rb
index 7c32a82879..b76a6725b8 100644
--- a/app/models/embeddable_host.rb
+++ b/app/models/embeddable_host.rb
@@ -1,3 +1,5 @@
+require_dependency 'url_helper'
+
 class EmbeddableHost < ActiveRecord::Base
   validate :host_must_be_valid
   belongs_to :category
@@ -10,7 +12,7 @@ class EmbeddableHost < ActiveRecord::Base
   def self.record_for_url(uri)
 
     if uri.is_a?(String)
-      uri = URI(URI.encode(uri)) rescue nil
+      uri = URI(UrlHelper.escape_uri(uri)) rescue nil
     end
     return false unless uri.present?
 
@@ -25,14 +27,20 @@ class EmbeddableHost < ActiveRecord::Base
     path << "?" << uri.query if uri.query.present?
 
     where("lower(host) = ?", host).each do |eh|
-      return eh if eh.path_whitelist.blank? || !Regexp.new(eh.path_whitelist).match(path).nil?
+      return eh if eh.path_whitelist.blank?
+
+      path_regexp = Regexp.new(eh.path_whitelist)
+      return eh if path_regexp.match(path) || path_regexp.match(URI.unescape(path))
     end
 
     nil
   end
 
   def self.url_allowed?(url)
-    uri = URI(URI.encode(url)) rescue nil
+    # Work around IFRAME reload on WebKit where the referer will be set to the Forum URL
+    return true if url&.starts_with?(Discourse.base_url)
+
+    uri = URI(UrlHelper.escape_uri(url)) rescue nil
     uri.present? && record_for_url(uri).present?
   end
 
@@ -52,7 +60,7 @@ end
 # Table name: embeddable_hosts
 #
 #  id             :integer          not null, primary key
-#  host           :string           not null
+#  host           :string(255)      not null
 #  category_id    :integer          not null
 #  created_at     :datetime
 #  updated_at     :datetime
diff --git a/app/models/embedding.rb b/app/models/embedding.rb
index f11de96f4f..a0be5ceea8 100644
--- a/app/models/embedding.rb
+++ b/app/models/embedding.rb
@@ -38,7 +38,7 @@ class Embedding < OpenStruct
   def self.find
     embedding_args = { id: 'default' }
 
-    Embedding.settings.each {|s| embedding_args[s] = SiteSetting.send(s) }
+    Embedding.settings.each { |s| embedding_args[s] = SiteSetting.send(s) }
     Embedding.new(embedding_args)
   end
 end
diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index ab61a60257..dd01b21ed8 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -1,15 +1,14 @@
 class Emoji
   # update this to clear the cache
-  EMOJI_VERSION = "v3"
+  EMOJI_VERSION = "5"
+
+  FITZPATRICK_SCALE ||= [ "1f3fb", "1f3fc", "1f3fd", "1f3fe", "1f3ff" ]
 
   include ActiveModel::SerializerSupport
 
   attr_reader :path
   attr_accessor :name, :url
 
-  # whitelist emojis so that new user can post emojis
-  Post::white_listed_image_classes << "emoji"
-
   def initialize(path = nil)
     @path = path
   end
@@ -23,13 +22,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,22 +43,25 @@ 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
-    Discourse.cache.delete(cache_key("custom_emojis"))
-    Discourse.cache.delete(cache_key("standard_emojis"))
-    Discourse.cache.delete(cache_key("aliases_emojis"))
-    Discourse.cache.delete(cache_key("all_emojis"))
+    %w{custom standard aliases all tonable}.each do |key|
+      Discourse.cache.delete(cache_key("#{key}_emojis"))
+    end
   end
 
   def self.db_file
@@ -63,36 +69,17 @@ 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
+    db['emojis'].map { |e| Emoji.create_from_db_item(e) }
   end
 
   def self.load_custom
     result = []
 
-    CustomEmoji.order(:name).all.each do |emoji|
+    CustomEmoji.includes(:upload).order(:name).each do |emoji|
       result << Emoji.new.tap do |e|
         e.name = emoji.name
         e.url = emoji.upload&.url
@@ -120,21 +107,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 +154,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 b930860ad2..952bd37a0d 100644
--- a/app/models/emoji_set_site_setting.rb
+++ b/app/models/emoji_set_site_setting.rb
@@ -7,7 +7,7 @@ class EmojiSetSiteSetting < EnumSiteSetting
     if site_setting.name.to_s == "emoji_set" && site_setting.value_changed?
       Emoji.clear_cache
 
-      previous_value = site_setting.value_was || SiteSetting.defaults[:emoji_set]
+      previous_value = site_setting.attribute_in_database(:value) || SiteSetting.defaults[:emoji_set]
       before = "/images/emoji/#{previous_value}/"
       after = "/images/emoji/#{site_setting.value}/"
 
@@ -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/facebook_user_info.rb b/app/models/facebook_user_info.rb
index eb99611310..7b099e03bb 100644
--- a/app/models/facebook_user_info.rb
+++ b/app/models/facebook_user_info.rb
@@ -9,13 +9,13 @@ end
 #  id               :integer          not null, primary key
 #  user_id          :integer          not null
 #  facebook_user_id :integer          not null
-#  username         :string
-#  first_name       :string
-#  last_name        :string
-#  email            :string
-#  gender           :string
-#  name             :string
-#  link             :string
+#  username         :string(255)
+#  first_name       :string(255)
+#  last_name        :string(255)
+#  email            :string(255)
+#  gender           :string(255)
+#  name             :string(255)
+#  link             :string(255)
 #  created_at       :datetime         not null
 #  updated_at       :datetime         not null
 #  avatar_url       :string
diff --git a/app/models/github_user_info.rb b/app/models/github_user_info.rb
index 8e776f33ab..c79a3b0e91 100644
--- a/app/models/github_user_info.rb
+++ b/app/models/github_user_info.rb
@@ -8,7 +8,7 @@ end
 #
 #  id             :integer          not null, primary key
 #  user_id        :integer          not null
-#  screen_name    :string           not null
+#  screen_name    :string(255)      not null
 #  github_user_id :integer          not null
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
diff --git a/app/models/given_daily_like.rb b/app/models/given_daily_like.rb
index 87da419453..ccc2974237 100644
--- a/app/models/given_daily_like.rb
+++ b/app/models/given_daily_like.rb
@@ -16,8 +16,8 @@ class GivenDailyLike < ActiveRecord::Base
       create(user_id: user_id, given_date: given_date, likes_given: 1)
     else
       find_for(user_id, given_date)
-              .where('limit_reached = false AND likes_given >= :limit', limit: SiteSetting.max_likes_per_day)
-              .update_all(limit_reached: true)
+        .where('limit_reached = false AND likes_given >= :limit', limit: SiteSetting.max_likes_per_day)
+        .update_all(limit_reached: true)
     end
   end
 
@@ -28,8 +28,8 @@ class GivenDailyLike < ActiveRecord::Base
 
     find_for(user_id, given_date).update_all('likes_given = likes_given - 1')
     find_for(user_id, given_date)
-            .where('limit_reached = true AND likes_given < :limit', limit: SiteSetting.max_likes_per_day)
-            .update_all(limit_reached: false)
+      .where('limit_reached = true AND likes_given < :limit', limit: SiteSetting.max_likes_per_day)
+      .update_all(limit_reached: false)
   end
 end
 
diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index 8ecfd75004..fabc777690 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
@@ -40,7 +40,7 @@ class GlobalSetting
         token = $redis.without_namespace.get(REDIS_SECRET_KEY)
         unless token && token =~ VALID_SECRET_KEY
           token = SecureRandom.hex(64)
-          $redis.without_namespace.set(REDIS_SECRET_KEY,token)
+          $redis.without_namespace.set(REDIS_SECRET_KEY, token)
         end
       end
       if !secret_key_base.blank? && token != secret_key_base
@@ -48,6 +48,8 @@ class GlobalSetting
       end
       token
     end
+  rescue Redis::CommandError => e
+    @safe_secret_key_base = SecureRandom.hex(64) if e.message =~ /READONLY/
   end
 
   def self.load_defaults
@@ -73,9 +75,24 @@ class GlobalSetting
     end
   end
 
+  def self.use_s3?
+    (@use_s3 ||=
+      begin
+        s3_bucket &&
+        s3_region && (
+          s3_use_iam_profile || (s3_access_key_id && s3_secret_access_key)
+        ) ? :true : :false
+      end) == :true
+  end
+
+  # for testing
+  def self.reset_s3_cache!
+    @use_s3 = nil
+  end
+
   def self.database_config
-    hash = {"adapter" => "postgresql"}
-    %w{pool timeout socket host port username password replica_host replica_port}.each do |s|
+    hash = { "adapter" => "postgresql" }
+    %w{pool connect_timeout timeout socket host port username password replica_host replica_port}.each do |s|
       if val = self.send("db_#{s}")
         hash[s] = val
       end
@@ -91,7 +108,7 @@ class GlobalSetting
 
     hash["prepared_statements"] = !!self.db_prepared_statements
 
-    {"production" => hash}
+    { "production" => hash }
   end
 
   # For testing purposes
@@ -116,17 +133,18 @@ class GlobalSetting
         c[:db] = redis_db if redis_db != 0
         c[:db] = 1 if Rails.env == "test"
 
-        if redis_sentinels.present?
-          c[:sentinels] = redis_sentinels.split(",").map do |address|
-            host,port = address.split(":")
-            {host: host, port: port}
-          end.to_a
-        end
-
         c.freeze
       end
   end
 
+  def self.add_default(name, default)
+    unless self.respond_to? name
+      define_singleton_method(name) do
+        default
+      end
+    end
+  end
+
   class BaseProvider
     def self.coerce(setting)
       return setting == "true" if setting == "true" || setting == "false"
@@ -134,7 +152,6 @@ class GlobalSetting
       setting
     end
 
-
     def resolve(current, default)
       BaseProvider.coerce(
         if current.present?
@@ -167,8 +184,7 @@ class GlobalSetting
       end
     end
 
-
-    def lookup(key,default)
+    def lookup(key, default)
       var = @data[key]
       resolve(var, var.nil? ? default : "")
     end
@@ -193,7 +209,7 @@ class GlobalSetting
     end
 
     def keys
-      ENV.keys.select{|k| k =~ /^DISCOURSE_/}.map{|k| k[10..-1].downcase.to_sym}
+      ENV.keys.select { |k| k =~ /^DISCOURSE_/ }.map { |k| k[10..-1].downcase.to_sym }
     end
   end
 
@@ -207,7 +223,6 @@ class GlobalSetting
     end
   end
 
-
   class << self
     attr_accessor :provider
   end
diff --git a/app/models/google_user_info.rb b/app/models/google_user_info.rb
index 343fe9945f..26f3dda50d 100644
--- a/app/models/google_user_info.rb
+++ b/app/models/google_user_info.rb
@@ -8,15 +8,15 @@ end
 #
 #  id             :integer          not null, primary key
 #  user_id        :integer          not null
-#  google_user_id :string           not null
-#  first_name     :string
-#  last_name      :string
-#  email          :string
-#  gender         :string
-#  name           :string
-#  link           :string
-#  profile_link   :string
-#  picture        :string
+#  google_user_id :string(255)      not null
+#  first_name     :string(255)
+#  last_name      :string(255)
+#  email          :string(255)
+#  gender         :string(255)
+#  name           :string(255)
+#  link           :string(255)
+#  profile_link   :string(255)
+#  picture        :string(255)
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
 #
diff --git a/app/models/group.rb b/app/models/group.rb
index 0ec202b94b..a86d60c581 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -1,7 +1,14 @@
+# frozen_string_literal: true
+
+require_dependency 'enum'
+
 class Group < ActiveRecord::Base
   include HasCustomFields
   include AnonCacheInvalidator
 
+  cattr_accessor :preloaded_custom_field_names
+  self.preloaded_custom_field_names = Set.new
+
   has_many :category_groups, dependent: :destroy
   has_many :group_users, dependent: :destroy
   has_many :group_mentions, dependent: :destroy
@@ -23,7 +30,7 @@ class Group < ActiveRecord::Base
   after_save :update_title
 
   after_save :enqueue_update_mentions_job,
-    if: Proc.new { |g| g.name_was && g.name_changed? }
+    if: Proc.new { |g| g.name_before_last_save && g.saved_change_to_name? }
 
   after_save :expire_cache
   after_destroy :expire_cache
@@ -33,52 +40,110 @@ class Group < ActiveRecord::Base
   end
 
   validate :name_format_validator
-  validates_uniqueness_of :name, case_sensitive: false
+  validates :name, presence: true, uniqueness: { case_sensitive: false }
   validate :automatic_membership_email_domains_format_validator
   validate :incoming_email_validator
-  validates :flair_url, url: true, if: Proc.new { |g| g.flair_url && g.flair_url[0,3] != 'fa-' }
+  validate :can_allow_membership_requests, if: :allow_membership_requests
+  validates :flair_url, url: true, if: Proc.new { |g| g.flair_url && g.flair_url[0, 3] != 'fa-' }
 
   AUTO_GROUPS = {
-    :everyone => 0,
-    :admins => 1,
-    :moderators => 2,
-    :staff => 3,
-    :trust_level_0 => 10,
-    :trust_level_1 => 11,
-    :trust_level_2 => 12,
-    :trust_level_3 => 13,
-    :trust_level_4 => 14
+    everyone: 0,
+    admins: 1,
+    moderators: 2,
+    staff: 3,
+    trust_level_0: 10,
+    trust_level_1: 11,
+    trust_level_2: 12,
+    trust_level_3: 13,
+    trust_level_4: 14
   }
 
   AUTO_GROUP_IDS = Hash[*AUTO_GROUPS.to_a.flatten.reverse]
   STAFF_GROUPS = [:admins, :moderators, :staff]
 
   ALIAS_LEVELS = {
-    :nobody => 0,
-    :only_admins => 1,
-    :mods_and_admins => 2,
-    :members_mods_and_admins => 3,
-    :everyone => 99
+    nobody: 0,
+    only_admins: 1,
+    mods_and_admins: 2,
+    members_mods_and_admins: 3,
+    everyone: 99
   }
 
-  validates :alias_level, inclusion: { in: ALIAS_LEVELS.values}
+  def self.visibility_levels
+    @visibility_levels = Enum.new(
+      public: 0,
+      members: 1,
+      staff: 2,
+      owners: 3
+    )
+  end
+
+  validates :mentionable_level, inclusion: { in: ALIAS_LEVELS.values }
+  validates :messageable_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
   }
 
-  scope :mentionable, lambda {|user|
+  scope :mentionable, lambda { |user|
 
+    where("mentionable_level in (:levels) OR
+          (
+            mentionable_level = #{ALIAS_LEVELS[:members_mods_and_admins]} AND id in (
+            SELECT group_id FROM group_users WHERE user_id = :user_id)
+          )", levels: alias_levels(user), user_id: user && user.id)
+  }
+
+  scope :messageable, lambda { |user|
+
+    where("messageable_level in (:levels) OR
+          (
+            messageable_level = #{ALIAS_LEVELS[:members_mods_and_admins]} AND id in (
+            SELECT group_id FROM group_users WHERE user_id = :user_id)
+          )", levels: alias_levels(user), user_id: user && user.id)
+  }
+
+  def self.alias_levels(user)
     levels = [ALIAS_LEVELS[:everyone]]
 
     if user && user.admin?
@@ -92,12 +157,8 @@ class Group < ActiveRecord::Base
                 ALIAS_LEVELS[:members_mods_and_admins]]
     end
 
-    where("alias_level in (:levels) OR
-          (
-            alias_level = #{ALIAS_LEVELS[:members_mods_and_admins]} AND id in (
-            SELECT group_id FROM group_users WHERE user_id = :user_id)
-          )", levels: levels, user_id: user && user.id )
-  }
+    levels
+  end
 
   def downcase_incoming_email
     self.incoming_email = (incoming_email || "").strip.downcase.presence
@@ -124,66 +185,57 @@ class Group < ActiveRecord::Base
     end
   end
 
-  def posts_for(guardian, before_post_id=nil)
+  def posts_for(guardian, opts = nil)
+    opts ||= {}
     user_ids = group_users.map { |gu| gu.user_id }
     result = Post.includes(:user, :topic, topic: :category)
-                 .references(:posts, :topics, :category)
-                 .where(user_id: user_ids)
-                 .where('topics.archetype <> ?', Archetype.private_message)
-                 .where(post_type: Post.types[:regular])
+      .references(:posts, :topics, :category)
+      .where(user_id: user_ids)
+      .where('topics.archetype <> ?', Archetype.private_message)
+      .where(post_type: Post.types[:regular])
+
+    if opts[:category_id].present?
+      result = result.where('topics.category_id = ?', opts[:category_id].to_i)
+    end
 
     result = guardian.filter_allowed_categories(result)
-    result = result.where('posts.id < ?', before_post_id) if before_post_id
+    result = result.where('posts.id < ?', opts[:before_post_id].to_i) if opts[:before_post_id]
     result.order('posts.created_at desc')
   end
 
-  def messages_for(guardian, before_post_id=nil)
+  def messages_for(guardian, opts = nil)
+    opts ||= {}
+
     result = Post.includes(:user, :topic, topic: :category)
-                 .references(:posts, :topics, :category)
-                 .where('topics.archetype = ?', Archetype.private_message)
-                 .where(post_type: Post.types[:regular])
-                 .where('topics.id IN (SELECT topic_id FROM topic_allowed_groups WHERE group_id = ?)', self.id)
+      .references(:posts, :topics, :category)
+      .where('topics.archetype = ?', Archetype.private_message)
+      .where(post_type: Post.types[:regular])
+      .where('topics.id IN (SELECT topic_id FROM topic_allowed_groups WHERE group_id = ?)', self.id)
+
+    if opts[:category_id].present?
+      result = result.where('topics.category_id = ?', opts[:category_id].to_i)
+    end
 
     result = guardian.filter_allowed_categories(result)
-    result = result.where('posts.id < ?', before_post_id) if before_post_id
+    result = result.where('posts.id < ?', opts[:before_post_id].to_i) if opts[:before_post_id]
     result.order('posts.created_at desc')
   end
 
-  def mentioned_posts_for(guardian, before_post_id=nil)
+  def mentioned_posts_for(guardian, opts = nil)
+    opts ||= {}
     result = Post.joins(:group_mentions)
-                 .includes(:user, :topic, topic: :category)
-                 .references(:posts, :topics, :category)
-                 .where('topics.archetype <> ?', Archetype.private_message)
-                 .where(post_type: Post.types[:regular])
-                 .where('group_mentions.group_id = ?', self.id)
+      .includes(:user, :topic, topic: :category)
+      .references(:posts, :topics, :category)
+      .where('topics.archetype <> ?', Archetype.private_message)
+      .where(post_type: Post.types[:regular])
+      .where('group_mentions.group_id = ?', self.id)
+
+    if opts[:category_id].present?
+      result = result.where('topics.category_id = ?', opts[:category_id].to_i)
+    end
 
     result = guardian.filter_allowed_categories(result)
-    result = result.where('posts.id < ?', before_post_id) if before_post_id
-    result.order('posts.created_at desc')
-  end
-
-  def messages_for(guardian, before_post_id=nil)
-    result = Post.includes(:user, :topic, topic: :category)
-                 .references(:posts, :topics, :category)
-                 .where('topics.archetype = ?', Archetype.private_message)
-                 .where(post_type: Post.types[:regular])
-                 .where('topics.id IN (SELECT topic_id FROM topic_allowed_groups WHERE group_id = ?)', self.id)
-
-    result = guardian.filter_allowed_categories(result)
-    result = result.where('posts.id < ?', before_post_id) if before_post_id
-    result.order('posts.created_at desc')
-  end
-
-  def mentioned_posts_for(guardian, before_post_id=nil)
-    result = Post.joins(:group_mentions)
-                 .includes(:user, :topic, topic: :category)
-                 .references(:posts, :topics, :category)
-                 .where('topics.archetype <> ?', Archetype.private_message)
-                 .where(post_type: Post.types[:regular])
-                 .where('group_mentions.group_id = ?', self.id)
-
-    result = guardian.filter_allowed_categories(result)
-    result = result.where('posts.id < ?', before_post_id) if before_post_id
+    result = result.where('posts.id < ?', opts[:before_post_id].to_i) if opts[:before_post_id]
     result.order('posts.created_at desc')
   end
 
@@ -196,7 +248,12 @@ class Group < ActiveRecord::Base
 
     unless group = self.lookup_group(name)
       group = Group.new(name: name.to_s, automatic: true)
-      group.default_notification_level = 2 if AUTO_GROUPS[:moderators] == id
+
+      if AUTO_GROUPS[:moderators] == id
+        group.default_notification_level = 2
+        group.messageable_level = ALIAS_LEVELS[:everyone]
+      end
+
       group.id = id
       group.save!
     end
@@ -211,23 +268,27 @@ class Group < ActiveRecord::Base
 
     # 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
+    case name
+    when :everyone
+      group.visibility_level = Group.visibility_levels[:owners]
       group.save!
       return group
+    when :moderators
+      group.update!(messageable_level: ALIAS_LEVELS[:everyone])
     end
 
     # Remove people from groups they don't belong in.
-    remove_subquery = case name
-                      when :admins
-                        "SELECT id FROM users WHERE NOT admin"
-                      when :moderators
-                        "SELECT id FROM users WHERE NOT moderator"
-                      when :staff
-                        "SELECT id FROM users WHERE NOT admin AND NOT moderator"
-                      when :trust_level_0, :trust_level_1, :trust_level_2, :trust_level_3, :trust_level_4
-                        "SELECT id FROM users WHERE trust_level < #{id - 10}"
-                      end
+    remove_subquery =
+      case name
+      when :admins
+        "SELECT id FROM users WHERE NOT admin"
+      when :moderators
+        "SELECT id FROM users WHERE NOT moderator"
+      when :staff
+        "SELECT id FROM users WHERE NOT admin AND NOT moderator"
+      when :trust_level_0, :trust_level_1, :trust_level_2, :trust_level_3, :trust_level_4
+        "SELECT id FROM users WHERE trust_level < #{id - 10}"
+      end
 
     exec_sql <<-SQL
       DELETE FROM group_users
@@ -237,18 +298,19 @@ class Group < ActiveRecord::Base
     SQL
 
     # Add people to groups
-    insert_subquery = case name
-                      when :admins
-                        "SELECT id FROM users WHERE admin"
-                      when :moderators
-                        "SELECT id FROM users WHERE moderator"
-                      when :staff
-                        "SELECT id FROM users WHERE moderator OR admin"
-                      when :trust_level_1, :trust_level_2, :trust_level_3, :trust_level_4
-                        "SELECT id FROM users WHERE trust_level >= #{id - 10}"
-                      when :trust_level_0
-                        "SELECT id FROM users"
-                      end
+    insert_subquery =
+      case name
+      when :admins
+        "SELECT id FROM users WHERE admin"
+      when :moderators
+        "SELECT id FROM users WHERE moderator"
+      when :staff
+        "SELECT id FROM users WHERE moderator OR admin"
+      when :trust_level_1, :trust_level_2, :trust_level_3, :trust_level_4
+        "SELECT id FROM users WHERE trust_level >= #{id - 10}"
+      when :trust_level_0
+        "SELECT id FROM users"
+      end
 
     exec_sql <<-SQL
       INSERT INTO group_users (group_id, user_id, created_at, updated_at)
@@ -269,6 +331,7 @@ class Group < ActiveRecord::Base
   def self.ensure_consistency!
     reset_all_counters!
     refresh_automatic_groups!
+    refresh_has_messages!
   end
 
   def self.reset_all_counters!
@@ -292,6 +355,18 @@ class Group < ActiveRecord::Base
     args.each { |group| refresh_automatic_group!(group) }
   end
 
+  def self.refresh_has_messages!
+    exec_sql <<-SQL
+      UPDATE groups g SET has_messages = false
+      WHERE NOT EXISTS (SELECT tg.id
+                          FROM topic_allowed_groups tg
+                    INNER JOIN topics t ON t.id = tg.topic_id
+                         WHERE tg.group_id = g.id
+                           AND t.deleted_at IS NULL)
+      AND g.has_messages = true
+    SQL
+  end
+
   def self.ensure_automatic_groups!
     AUTO_GROUPS.each_key do |name|
       refresh_automatic_group!(name) unless lookup_group(name)
@@ -302,8 +377,10 @@ class Group < ActiveRecord::Base
     lookup_group(name) || refresh_automatic_group!(name)
   end
 
-  def self.search_group(name)
-    Group.where(visible: true).where("name ILIKE :term_like", term_like: "#{name}%")
+  def self.search_groups(name, groups: nil)
+    (groups || Group).where(
+      "name ILIKE :term_like OR full_name ILIKE :term_like", term_like: "%#{name}%"
+    )
   end
 
   def self.lookup_group(name)
@@ -317,22 +394,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)
@@ -370,11 +444,11 @@ class Group < ActiveRecord::Base
     additions = expected - current
     deletions = current - expected
 
-    map = Hash[*User.where(username: additions+deletions)
-                 .select('id,username')
-                 .map{|u| [u.username,u.id]}.flatten]
+    map = Hash[*User.where(username: additions + deletions)
+      .select('id,username')
+      .map { |u| [u.username, u.id] }.flatten]
 
-    deletions = Set.new(deletions.map{|d| map[d]})
+    deletions = Set.new(deletions.map { |d| map[d] })
 
     @deletions = []
     group_users.each do |gu|
@@ -391,8 +465,19 @@ class Group < ActiveRecord::Base
     users.pluck(:username).join(",")
   end
 
+  PUBLISH_CATEGORIES_LIMIT = 10
+
   def add(user)
     self.users.push(user) unless self.users.include?(user)
+
+    if self.categories.count < PUBLISH_CATEGORIES_LIMIT
+      MessageBus.publish('/categories', {
+        categories: ActiveModel::ArraySerializer.new(self.categories).as_json
+      }, user_ids: [user.id])
+    else
+      Discourse.request_refresh!(user_ids: [user.id])
+    end
+
     self
   end
 
@@ -403,9 +488,9 @@ class Group < ActiveRecord::Base
 
   def add_owner(user)
     if group_user = self.group_users.find_by(user: user)
-      group_user.update_attributes!(owner: true) if !group_user.owner
+      group_user.update!(owner: true) if !group_user.owner
     else
-      GroupUser.create!(user: user, group: self, owner: true)
+      self.group_users.create!(user: user, owner: true)
     end
   end
 
@@ -414,32 +499,51 @@ class Group < ActiveRecord::Base
   end
 
   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})")
+    return unless user_ids.present?
+
+    Group.transaction do
+      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)
+
+      user_attributes = {}
 
       if self.primary_group?
-        User.where(id: user_ids).update_all(primary_group_id: self.id)
+        user_attributes[:primary_group_id] = self.id
       end
 
       if self.title.present?
-        User.where(id: user_ids).update_all(title: self.title)
+        user_attributes[:title] = self.title
       end
 
-      if self.grant_trust_level.present?
-        Jobs.enqueue(:bulk_grant_trust_level, user_ids: user_ids, trust_level: self.grant_trust_level)
+      if user_attributes.present?
+        User.where(id: user_ids).update_all(user_attributes)
       end
     end
-    true
+
+    if self.grant_trust_level.present?
+      Jobs.enqueue(:bulk_grant_trust_level,
+        user_ids: user_ids,
+        trust_level: self.grant_trust_level
+      )
+    end
+
+    self
   end
 
   def staff?
@@ -449,6 +553,7 @@ class Group < ActiveRecord::Base
   protected
 
     def name_format_validator
+      self.name.strip!
       UsernameValidator.perform_validation(self, 'name')
     end
 
@@ -484,7 +589,7 @@ class Group < ActiveRecord::Base
     def update_title
       return if new_record? && !self.title.present?
 
-      if self.title_changed?
+      if self.saved_change_to_title?
         sql = <<-SQL.squish
           UPDATE users
              SET title = :title
@@ -493,19 +598,19 @@ class Group < ActiveRecord::Base
              AND id IN (SELECT user_id FROM group_users WHERE group_id = :id)
         SQL
 
-        self.class.exec_sql(sql, title: title, title_was: title_was, id: id)
+        self.class.exec_sql(sql, title: title, title_was: title_before_last_save, id: id)
       end
     end
 
     def update_primary_group
       return if new_record? && !self.primary_group?
 
-      if self.primary_group_changed?
-        sql = <<SQL
-        UPDATE users
-        /*set*/
-        /*where*/
-SQL
+      if self.saved_change_to_primary_group?
+        sql = <<~SQL
+          UPDATE users
+          /*set*/
+          /*where*/
+        SQL
 
         builder = SqlBuilder.new(sql)
         builder.where("
@@ -528,9 +633,24 @@ SQL
 
   private
 
+    def can_allow_membership_requests
+      valid = true
+
+      valid =
+        if self.persisted?
+          self.group_users.where(owner: true).exists?
+        else
+          self.group_users.any?(&:owner)
+        end
+
+      if !valid
+        self.errors.add(:base, I18n.t('groups.errors.cant_allow_membership_requests'))
+      end
+    end
+
     def enqueue_update_mentions_job
       Jobs.enqueue(:update_group_mentions,
-        previous_name: self.name_was,
+        previous_name: self.name_before_last_save,
         group_id: self.id
       )
     end
@@ -541,17 +661,15 @@ end
 # Table name: groups
 #
 #  id                                 :integer          not null, primary key
-#  name                               :string           not null
+#  name                               :string(255)      not null
 #  created_at                         :datetime         not null
 #  updated_at                         :datetime         not null
 #  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
-#  title                              :string
+#  title                              :string(255)
 #  grant_trust_level                  :integer
 #  incoming_email                     :string
 #  has_messages                       :boolean          default(FALSE), not null
@@ -560,10 +678,15 @@ end
 #  flair_color                        :string
 #  bio_raw                            :text
 #  bio_cooked                         :text
-#  public                             :boolean          default(FALSE), not null
 #  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
+#  public_exit                        :boolean          default(FALSE), not null
+#  public_admission                   :boolean          default(FALSE), not null
+#  membership_request_template        :text
+#  messageable_level                  :integer          default(0)
+#  mentionable_level                  :integer          default(0)
 #
 # Indexes
 #
diff --git a/app/models/group_archived_message.rb b/app/models/group_archived_message.rb
index 190dce298c..91d2062cae 100644
--- a/app/models/group_archived_message.rb
+++ b/app/models/group_archived_message.rb
@@ -5,22 +5,21 @@ class GroupArchivedMessage < ActiveRecord::Base
   def self.move_to_inbox!(group_id, topic_id)
     GroupArchivedMessage.where(group_id: group_id, topic_id: topic_id).destroy_all
     trigger(:move_to_inbox, group_id, topic_id)
-    MessageBus.publish("/topic/#{topic_id}", {type: "move_to_inbox"}, group_ids: [group_id])
+    MessageBus.publish("/topic/#{topic_id}", { type: "move_to_inbox" }, group_ids: [group_id])
   end
 
   def self.archive!(group_id, topic_id)
     GroupArchivedMessage.where(group_id: group_id, topic_id: topic_id).destroy_all
     GroupArchivedMessage.create!(group_id: group_id, topic_id: topic_id)
     trigger(:archive_message, group_id, topic_id)
-    MessageBus.publish("/topic/#{topic_id}", {type: "archived"}, group_ids: [group_id])
+    MessageBus.publish("/topic/#{topic_id}", { type: "archived" }, group_ids: [group_id])
   end
 
-
   def self.trigger(event, group_id, topic_id)
     group = Group.find_by(id: group_id)
     topic = Topic.find_by(id: topic_id)
     if group && topic
-      DiscourseEvent.trigger(event, {group: group, topic: topic})
+      DiscourseEvent.trigger(event, group: group, topic: topic)
     end
   end
 
diff --git a/app/models/group_user.rb b/app/models/group_user.rb
index b559580390..5356933012 100644
--- a/app/models/group_user.rb
+++ b/app/models/group_user.rb
@@ -8,7 +8,7 @@ class GroupUser < ActiveRecord::Base
   after_destroy :remove_title
 
   after_save :set_primary_group
-  after_destroy :remove_primary_group
+  after_destroy :remove_primary_group, :recalculate_trust_level
 
   before_create :set_notification_level
   after_save :grant_trust_level
@@ -25,43 +25,74 @@ class GroupUser < ActiveRecord::Base
 
   def set_primary_group
     if group.primary_group
-        self.class.exec_sql("UPDATE users
-                             SET primary_group_id = :id
-                             WHERE id = :user_id",
-                          id: group.id, user_id: user_id)
+      self.class.exec_sql("
+        UPDATE users
+        SET primary_group_id = :id
+        WHERE id = :user_id",
+        id: group.id, user_id: user_id
+      )
     end
   end
 
   def remove_primary_group
-      self.class.exec_sql("UPDATE users
-                           SET primary_group_id = NULL
-                           WHERE id = :user_id AND primary_group_id = :id",
-                        id: group.id, user_id: user_id)
-
+    self.class.exec_sql("
+      UPDATE users
+      SET primary_group_id = NULL
+      WHERE id = :user_id AND primary_group_id = :id",
+      id: group.id, user_id: user_id
+    )
   end
 
   def remove_title
     if group.title.present?
-        self.class.exec_sql("UPDATE users SET title = NULL
-                          WHERE title = :title AND id = :id",
-                          id: user_id,
-                          title: group.title)
+      self.class.exec_sql("
+        UPDATE users SET title = NULL
+        WHERE title = :title AND id = :id",
+        id: user_id, title: group.title
+      )
     end
   end
 
   def update_title
     if group.title.present?
-      self.class.exec_sql("UPDATE users SET title = :title
-                          WHERE (title IS NULL OR title = '') AND id = :id",
-                          id: user_id,
-                          title: group.title)
+      self.class.exec_sql("
+        UPDATE users SET title = :title
+        WHERE (title IS NULL OR title = '') AND id = :id",
+        id: user_id, title: group.title
+      )
     end
   end
 
   def grant_trust_level
     return if group.grant_trust_level.nil?
+
+    if (user.group_locked_trust_level || 0) < group.grant_trust_level
+      user.update!(group_locked_trust_level: group.grant_trust_level)
+    end
+
     TrustLevelGranter.grant(group.grant_trust_level, user)
   end
+
+  def recalculate_trust_level
+    return if group.grant_trust_level.nil?
+
+    # Find the highest level of the user's remaining groups
+    highest_level = GroupUser
+      .where(user_id: user.id)
+      .includes(:group)
+      .maximum("groups.grant_trust_level")
+
+    if highest_level.nil?
+      # If the user no longer has a group with a trust level,
+      # unlock them, start at 0 and consider promotions.
+      user.update!(group_locked_trust_level: nil)
+      Promotion.recalculate(user)
+    else
+      user.update!(group_locked_trust_level: highest_level)
+      user.change_trust_level!(highest_level)
+    end
+  end
+
 end
 
 # == Schema Information
diff --git a/app/models/incoming_email.rb b/app/models/incoming_email.rb
index 97427699d9..be5bfdce60 100644
--- a/app/models/incoming_email.rb
+++ b/app/models/incoming_email.rb
@@ -3,7 +3,9 @@ class IncomingEmail < ActiveRecord::Base
   belongs_to :topic
   belongs_to :post
 
-  scope :errored,  -> { where("NOT is_bounce AND LENGTH(COALESCE(error,'')) > 0") }
+  scope :errored,  -> { where("NOT is_bounce AND error IS NOT NULL") }
+
+  scope :addressed_to, -> (email) { where('incoming_emails.to_addresses ILIKE :email OR incoming_emails.cc_addresses ILIKE :email', email: "%#{email}%") }
 end
 
 # == Schema Information
diff --git a/app/models/incoming_link.rb b/app/models/incoming_link.rb
index fd3e9e8e8d..0b7e7c0ed6 100644
--- a/app/models/incoming_link.rb
+++ b/app/models/incoming_link.rb
@@ -35,11 +35,10 @@ class IncomingLink < ActiveRecord::Base
       post_id = opts[:post_id]
       post_id ||= Post.where(topic_id: opts[:topic_id],
                              post_number: opts[:post_number] || 1)
-                            .pluck(:id).first
+        .pluck(:id).first
 
       cid = current_user ? (current_user.id) : (nil)
 
-
       unless cid && cid == user_id
 
         create(referer: referer,
@@ -53,7 +52,6 @@ class IncomingLink < ActiveRecord::Base
 
   end
 
-
   def referer=(referer)
     self.incoming_referer_id = nil
 
@@ -67,8 +65,8 @@ class IncomingLink < ActiveRecord::Base
     if parsed.scheme == "http" || parsed.scheme == "https"
       domain = IncomingDomain.add!(parsed)
 
-      referer = IncomingReferer.add!(path: parsed.path, incoming_domain: domain) if domain
-      self.incoming_referer_id = referer.id if referer
+      referer_record = IncomingReferer.add!(path: parsed.path, incoming_domain: domain) if domain
+      self.incoming_referer_id = referer_record.id if referer_record
     end
 
   rescue URI::InvalidURIError
@@ -87,7 +85,6 @@ class IncomingLink < ActiveRecord::Base
     end
   end
 
-
   # Internal: Update appropriate link counts.
   def update_link_counts
     exec_sql("UPDATE topics
diff --git a/app/models/incoming_links_report.rb b/app/models/incoming_links_report.rb
index 388ea57cc9..cf28011b8d 100644
--- a/app/models/incoming_links_report.rb
+++ b/app/models/incoming_links_report.rb
@@ -30,24 +30,24 @@ class IncomingLinksReport
 
   # Return top 10 users who brought traffic to the site within the last 30 days
   def self.report_top_referrers(report)
-    report.y_titles[:num_clicks]  = I18n.t("reports.#{report.type}.num_clicks")
+    report.y_titles[:num_clicks] = I18n.t("reports.#{report.type}.num_clicks")
     report.y_titles[:num_topics] = I18n.t("reports.#{report.type}.num_topics")
 
-    num_clicks  = link_count_per_user
+    num_clicks = link_count_per_user
     num_topics = topic_count_per_user
-    user_id_lookup = User.where(username: num_clicks.keys).select(:id, :username).inject({}) {|sum,v| sum[v.username] = v.id; sum;}
+    user_id_lookup = User.where(username: num_clicks.keys).select(:id, :username).inject({}) { |sum, v| sum[v.username] = v.id; sum; }
     report.data = []
     num_clicks.each_key do |username|
-      report.data << {username: username, user_id: user_id_lookup[username], num_clicks: num_clicks[username], num_topics: num_topics[username]}
+      report.data << { username: username, user_id: user_id_lookup[username], num_clicks: num_clicks[username], num_topics: num_topics[username] }
     end
-    report.data = report.data.sort_by {|x| x[:num_clicks]}.reverse[0,10]
+    report.data = report.data.sort_by { |x| x[:num_clicks] }.reverse[0, 10]
   end
 
   def self.per_user
     @per_user_query ||= IncomingLink
-        .where('incoming_links.created_at > ? AND incoming_links.user_id IS NOT NULL', 30.days.ago)
-        .joins(:user)
-        .group('users.username')
+      .where('incoming_links.created_at > ? AND incoming_links.user_id IS NOT NULL', 30.days.ago)
+      .joins(:user)
+      .group('users.username')
   end
 
   def self.link_count_per_user
@@ -58,35 +58,34 @@ class IncomingLinksReport
     per_user.joins(:post).count("DISTINCT posts.topic_id")
   end
 
-
   # Return top 10 domains that brought traffic to the site within the last 30 days
   def self.report_top_traffic_sources(report)
-    report.y_titles[:num_clicks]  = I18n.t("reports.#{report.type}.num_clicks")
+    report.y_titles[:num_clicks] = I18n.t("reports.#{report.type}.num_clicks")
     report.y_titles[:num_topics] = I18n.t("reports.#{report.type}.num_topics")
     report.y_titles[:num_users] = I18n.t("reports.#{report.type}.num_users")
 
-    num_clicks  = link_count_per_domain
+    num_clicks = link_count_per_domain
     num_topics = topic_count_per_domain(num_clicks.keys)
     report.data = []
     num_clicks.each_key do |domain|
-      report.data << {domain: domain, num_clicks: num_clicks[domain], num_topics: num_topics[domain]}
+      report.data << { domain: domain, num_clicks: num_clicks[domain], num_topics: num_topics[domain] }
     end
-    report.data = report.data.sort_by {|x| x[:num_clicks]}.reverse[0,10]
+    report.data = report.data.sort_by { |x| x[:num_clicks] }.reverse[0, 10]
   end
 
-  def self.link_count_per_domain(limit=10)
+  def self.link_count_per_domain(limit = 10)
     IncomingLink.where('incoming_links.created_at > ?', 30.days.ago)
-                .joins(:incoming_referer => :incoming_domain)
-                .group('incoming_domains.name')
-                .order('count_all DESC')
-                .limit(limit).count
+      .joins(incoming_referer: :incoming_domain)
+      .group('incoming_domains.name')
+      .order('count_all DESC')
+      .limit(limit).count
   end
 
   def self.per_domain(domains)
     IncomingLink
-        .joins(:incoming_referer => :incoming_domain)
-        .where('incoming_links.created_at > ? AND incoming_domains.name IN (?)', 30.days.ago, domains)
-        .group('incoming_domains.name')
+      .joins(incoming_referer: :incoming_domain)
+      .where('incoming_links.created_at > ? AND incoming_domains.name IN (?)', 30.days.ago, domains)
+      .group('incoming_domains.name')
   end
 
   def self.topic_count_per_domain(domains)
@@ -94,17 +93,16 @@ class IncomingLinksReport
     per_domain(domains).joins(:post).count("DISTINCT posts.topic_id")
   end
 
-
   def self.report_top_referred_topics(report)
-    report.y_titles[:num_clicks]  = I18n.t("reports.#{report.type}.num_clicks")
-    num_clicks  = link_count_per_topic
-    num_clicks = num_clicks.to_a.sort_by {|x| x[1]}.last(10).reverse # take the top 10
+    report.y_titles[:num_clicks] = I18n.t("reports.#{report.type}.num_clicks")
+    num_clicks = link_count_per_topic
+    num_clicks = num_clicks.to_a.sort_by { |x| x[1] }.last(10).reverse # take the top 10
     report.data = []
-    topics = Topic.select('id, slug, title').where('id in (?)', num_clicks.map {|z| z[0]})
+    topics = Topic.select('id, slug, title').where('id in (?)', num_clicks.map { |z| z[0] })
     num_clicks.each do |topic_id, num_clicks_element|
-      topic = topics.find {|t| t.id == topic_id}
+      topic = topics.find { |t| t.id == topic_id }
       if topic
-        report.data << {topic_id: topic_id, topic_title: topic.title, topic_slug: topic.slug, num_clicks: num_clicks_element}
+        report.data << { topic_id: topic_id, topic_title: topic.title, topic_slug: topic.slug, num_clicks: num_clicks_element }
       end
     end
     report.data
@@ -112,8 +110,8 @@ class IncomingLinksReport
 
   def self.link_count_per_topic
     IncomingLink.joins(:post)
-                .where('incoming_links.created_at > ? AND topic_id IS NOT NULL', 30.days.ago)
-                .group('topic_id')
-                .count
+      .where('incoming_links.created_at > ? AND topic_id IS NOT NULL', 30.days.ago)
+      .group('topic_id')
+      .count
   end
 end
diff --git a/app/models/invite.rb b/app/models/invite.rb
index c667cafc94..b9fcb44e24 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)
@@ -69,48 +70,47 @@ class Invite < ActiveRecord::Base
     end
   end
 
-  def self.invite_by_email(email, invited_by, topic=nil, group_ids=nil, custom_message=nil)
-    create_invite_by_email(email, invited_by, {
+  def self.invite_by_email(email, invited_by, topic = nil, group_ids = nil, custom_message = nil)
+    create_invite_by_email(email, invited_by,
       topic: topic,
       group_ids: group_ids,
       custom_message: custom_message,
       send_email: true
-    })
+    )
   end
 
   # generate invite link
-  def self.generate_invite_link(email, invited_by, topic=nil, group_ids=nil)
-    invite = create_invite_by_email(email, invited_by, {
+  def self.generate_invite_link(email, invited_by, topic = nil, group_ids = nil)
+    invite = create_invite_by_email(email, invited_by,
       topic: topic,
       group_ids: group_ids,
       send_email: false
-    })
-    return "#{Discourse.base_url}/invites/#{invite.invite_key}" if invite
+    )
+
+    "#{Discourse.base_url}/invites/#{invite.invite_key}" if invite
   end
 
   # Create an invite for a user, supplying an optional topic
   #
   # Return the previously existing invite if already exists. Returns nil if the invite can't be created.
-  def self.create_invite_by_email(email, invited_by, opts=nil)
+  def self.create_invite_by_email(email, invited_by, opts = nil)
     opts ||= {}
 
     topic = opts[:topic]
     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
 
     invite = Invite.with_deleted
-                   .where(email: lower_email, invited_by_id: invited_by.id)
-                   .order('created_at DESC')
-                   .first
+      .where(email: lower_email, invited_by_id: invited_by.id)
+      .order('created_at DESC')
+      .first
 
     if invite && (invite.expired? || invite.deleted_at)
       invite.destroy
@@ -122,6 +122,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,7 +144,7 @@ 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
@@ -161,32 +162,32 @@ class Invite < ActiveRecord::Base
     group_ids
   end
 
-  def self.find_all_invites_from(inviter, offset=0, limit=SiteSetting.invites_per_page)
+  def self.find_all_invites_from(inviter, offset = 0, limit = SiteSetting.invites_per_page)
     Invite.where(invited_by_id: inviter.id)
-          .where('invites.email IS NOT NULL')
-          .includes(:user => :user_stat)
-          .order('CASE WHEN invites.user_id IS NOT NULL THEN 0 ELSE 1 END',
+      .where('invites.email IS NOT NULL')
+      .includes(user: :user_stat)
+      .order('CASE WHEN invites.user_id IS NOT NULL THEN 0 ELSE 1 END',
                  'user_stats.time_read DESC',
                  'invites.redeemed_at DESC')
-          .limit(limit)
-          .offset(offset)
-          .references('user_stats')
+      .limit(limit)
+      .offset(offset)
+      .references('user_stats')
   end
 
-  def self.find_pending_invites_from(inviter, offset=0)
+  def self.find_pending_invites_from(inviter, offset = 0)
     find_all_invites_from(inviter, offset).where('invites.user_id IS NULL').order('invites.created_at DESC')
   end
 
-  def self.find_redeemed_invites_from(inviter, offset=0)
+  def self.find_redeemed_invites_from(inviter, offset = 0)
     find_all_invites_from(inviter, offset).where('invites.user_id IS NOT NULL').order('invites.redeemed_at DESC')
   end
 
   def self.find_pending_invites_count(inviter)
-    find_all_invites_from(inviter, 0, nil).where('invites.user_id IS NULL').count
+    find_all_invites_from(inviter, 0, nil).where('invites.user_id IS NULL').reorder(nil).count
   end
 
   def self.find_redeemed_invites_count(inviter)
-    find_all_invites_from(inviter, 0, nil).where('invites.user_id IS NOT NULL').count
+    find_all_invites_from(inviter, 0, nil).where('invites.user_id IS NOT NULL').reorder(nil).count
   end
 
   def self.filter_by(email_or_username)
@@ -217,16 +218,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)
@@ -234,7 +225,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
 
@@ -261,7 +258,7 @@ end
 #
 #  id             :integer          not null, primary key
 #  invite_key     :string(32)       not null
-#  email          :string
+#  email          :string(255)
 #  invited_by_id  :integer          not null
 #  user_id        :integer
 #  redeemed_at    :datetime
@@ -271,6 +268,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 8b60872d8b..37a37a978c 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.where(admin: false).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
@@ -31,21 +28,33 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password) do
 
     user = User.new(email: invite.email, username: available_username, name: available_name, active: true, trust_level: SiteSetting.default_invitee_trust_level)
 
-    if password
-      user.password_required!
-      user.password = password
-    end
-
     if !SiteSetting.must_approve_users? || (SiteSetting.must_approve_users? && invite.invited_by.staff?)
       user.approved = true
       user.approved_by_id = invite.invited_by_id
       user.approved_at = Time.zone.now
     end
 
-    user.moderator = true if invite.moderator? && invite.invited_by.staff?
-    user.save!
+    user_fields = UserField.all
+    if user_custom_fields.present? && user_fields.present?
+      field_params = user_custom_fields || {}
+      fields = user.custom_fields
 
-    user
+      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?
+
+    if password
+      user.password = password
+      user.password_required!
+    end
+
+    user.save!
+    User.find(user.id)
   end
 
   private
@@ -76,16 +85,15 @@ 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
 
-
   def add_to_private_topics_if_invited
     invite.topics.private_messages.each do |t|
       t.topic_allowed_users.create(user_id: invited_user.id)
@@ -93,7 +101,7 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password) do
   end
 
   def add_user_to_invited_topics
-    Invite.where('invites.email = ? and invites.id != ?', invite.email, invite.id).includes(:topics).where(topics: {archetype: Archetype::private_message}).each do |i|
+    Invite.where('invites.email = ? and invites.id != ?', invite.email, invite.id).includes(:topics).where(topics: { archetype: Archetype::private_message }).each do |i|
       i.topics.each do |t|
         t.topic_allowed_users.create(user_id: invited_user.id)
       end
@@ -121,8 +129,8 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password) do
 
   def notify_invitee
     if inviter = invite.invited_by
-        inviter.notifications.create(notification_type: Notification.types[:invitee_accepted],
-                                     data: {display_username: invited_user.username}.to_json)
+      inviter.notifications.create(notification_type: Notification.types[:invitee_accepted],
+                                   data: { display_username: invited_user.username }.to_json)
     end
   end
 
diff --git a/app/models/locale_site_setting.rb b/app/models/locale_site_setting.rb
index 1cd9246418..b38b5f85ac 100644
--- a/app/models/locale_site_setting.rb
+++ b/app/models/locale_site_setting.rb
@@ -9,7 +9,7 @@ class LocaleSiteSetting < EnumSiteSetting
   def self.values
     supported_locales.map do |l|
       lang = language_names[l] || language_names[l[0..1]]
-      {name: lang ? lang['nativeName'] : l, value: l}
+      { name: lang ? lang['nativeName'] : l, value: l }
     end
   end
 
@@ -25,8 +25,37 @@ class LocaleSiteSetting < EnumSiteSetting
 
   def self.supported_locales
     @lock.synchronize do
-      @supported_locales ||= Dir.glob( File.join(Rails.root, 'config', 'locales', 'client.*.yml') ).map {|x| x.split('.')[-2]}.sort
+      @supported_locales ||= begin
+        app_client_files = Dir.glob(
+          File.join(Rails.root, 'config', 'locales', 'client.*.yml')
+        )
+
+        unless ignore_plugins?
+          app_client_files += Dir.glob(
+            File.join(Rails.root, 'plugins', '*', 'config', 'locales', 'client.*.yml')
+          )
+        end
+
+        app_client_files.map { |x| x.split('.')[-2] }
+          .uniq
+          .select { |locale| valid_locale?(locale) }
+          .sort
+      end
     end
   end
 
+  def self.valid_locale?(locale)
+    assets = Rails.configuration.assets
+
+    assets.precompile.grep(/locales\/#{locale}(?:\.js)?/).present? &&
+      (Dir.glob(File.join(Rails.root, 'app', 'assets', 'javascripts', 'locales', "#{locale}.js.erb")).present? ||
+        Dir.glob(File.join(Rails.root, 'plugins', '*', 'assets', 'locales', "#{locale}.js.erb")).present?)
+  end
+
+  def self.ignore_plugins?
+    Rails.env.test? && ENV['LOAD_PLUGINS'] != "1"
+  end
+
+  private_class_method :valid_locale?
+  private_class_method :ignore_plugins?
 end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 7db7a5b8bd..48e3293c5c 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -1,4 +1,5 @@
 require_dependency 'enum'
+require_dependency 'notification_emailer'
 
 class Notification < ActiveRecord::Base
   belongs_to :user
@@ -8,17 +9,14 @@ class Notification < ActiveRecord::Base
   validates_presence_of :notification_type
 
   scope :unread, lambda { where(read: false) }
-  scope :recent, lambda { |n=nil| n ||= 10; order('notifications.created_at desc').limit(n) }
+  scope :recent, lambda { |n = nil| n ||= 10; order('notifications.created_at desc').limit(n) }
   scope :visible , lambda { joins('LEFT JOIN topics ON notifications.topic_id = topics.id')
-                            .where('topics.id IS NULL OR topics.deleted_at IS NULL') }
+    .where('topics.id IS NULL OR topics.deleted_at IS NULL') }
 
   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
-  after_commit :refresh_notification_count, on: :destroy
-  after_commit :refresh_notification_count, on: [:create, :update]
+  after_commit :refresh_notification_count, on: [:create, :update, :destroy]
 
   def self.ensure_consistency!
     Notification.exec_sql <<-SQL
@@ -76,20 +74,20 @@ class Notification < ActiveRecord::Base
 
   def self.read(user, notification_ids)
     count = Notification.where(user_id: user.id)
-                        .where(id: notification_ids)
-                        .where(read: false)
-                        .update_all(read: true)
+      .where(id: notification_ids)
+      .where(read: false)
+      .update_all(read: true)
 
     user.publish_notifications_state if count > 0
   end
 
   def self.interesting_after(min_date)
-    result =  where("created_at > ?", min_date)
-              .includes(:topic)
-              .visible
-              .unread
-              .limit(20)
-              .order("CASE WHEN notification_type = #{Notification.types[:replied]} THEN 1
+    result = where("created_at > ?", min_date)
+      .includes(:topic)
+      .visible
+      .unread
+      .limit(20)
+      .order("CASE WHEN notification_type = #{Notification.types[:replied]} THEN 1
                            WHEN notification_type = #{Notification.types[:mentioned]} THEN 2
                            ELSE 3
                       END, created_at DESC").to_a
@@ -107,7 +105,7 @@ class Notification < ActiveRecord::Base
           seen[r.notification_type] << r.topic_id
         end
       end
-      result.reject! {|r| to_remove.include?(r.id) }
+      result.reject! { |r| to_remove.include?(r.id) }
     end
 
     result
@@ -145,9 +143,9 @@ class Notification < ActiveRecord::Base
 
     count ||= 10
     notifications = user.notifications
-                        .visible
-                        .recent(count)
-                        .includes(:topic)
+      .visible
+      .recent(count)
+      .includes(:topic)
 
     if user.user_option.like_notification_frequency == UserOption.like_notification_frequency_type[:never]
       notifications = notifications.where('notification_type <> ?', Notification.types[:liked])
@@ -165,7 +163,7 @@ class Notification < ActiveRecord::Base
            NOT read
         ORDER BY n.id ASC
         LIMIT #{count.to_i}
-      ").values.map do |x,_|
+      ").values.map do |x, _|
         x.to_i
       end
 
@@ -178,7 +176,7 @@ class Notification < ActiveRecord::Base
           .limit(count)
       end
 
-      notifications.uniq(&:id).sort do |x,y|
+      notifications.uniq(&:id).sort do |x, y|
         if x.unread_pm? && !y.unread_pm?
           -1
         elsif y.unread_pm? && !x.unread_pm?
diff --git a/app/models/oauth2_user_info.rb b/app/models/oauth2_user_info.rb
index 5b27d0cf71..7ce0cace41 100644
--- a/app/models/oauth2_user_info.rb
+++ b/app/models/oauth2_user_info.rb
@@ -9,10 +9,10 @@ end
 #
 #  id         :integer          not null, primary key
 #  user_id    :integer          not null
-#  uid        :string           not null
-#  provider   :string           not null
-#  email      :string
-#  name       :string
+#  uid        :string(255)      not null
+#  provider   :string(255)      not null
+#  email      :string(255)
+#  name       :string(255)
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #
diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb
index ad3c025fa0..addf554b0f 100644
--- a/app/models/optimized_image.rb
+++ b/app/models/optimized_image.rb
@@ -9,7 +9,7 @@ class OptimizedImage < ActiveRecord::Base
   # BUMP UP if optimized image algorithm changes
   VERSION = 1
 
-  def self.create_for(upload, width, height, opts={})
+  def self.create_for(upload, width, height, opts = {})
     return unless width > 0 && height > 0
     return if upload.try(:sha1).blank?
 
@@ -90,7 +90,7 @@ class OptimizedImage < ActiveRecord::Base
   end
 
   def local?
-   !(url =~ /^(https?:)?\/\//)
+    !(url =~ /^(https?:)?\/\//)
   end
 
   def self.safe_path?(path)
@@ -107,8 +107,11 @@ 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={})
+  def self.resize_instructions(from, to, dimensions, opts = {})
     ensure_safe_paths!(from, to)
 
     # NOTE: ORDER is important!
@@ -118,17 +121,18 @@ class OptimizedImage < ActiveRecord::Base
       -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}
     }
   end
 
-  def self.resize_instructions_animated(from, to, dimensions, opts={})
+  def self.resize_instructions_animated(from, to, dimensions, opts = {})
     ensure_safe_paths!(from, to)
 
     %W{
@@ -141,7 +145,7 @@ class OptimizedImage < ActiveRecord::Base
     }
   end
 
-  def self.crop_instructions(from, to, dimensions, opts={})
+  def self.crop_instructions(from, to, dimensions, opts = {})
     ensure_safe_paths!(from, to)
 
     %W{
@@ -150,16 +154,17 @@ class OptimizedImage < ActiveRecord::Base
       -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}
     }
   end
 
-  def self.crop_instructions_animated(from, to, dimensions, opts={})
+  def self.crop_instructions_animated(from, to, dimensions, opts = {})
     ensure_safe_paths!(from, to)
 
     %W{
@@ -172,7 +177,7 @@ class OptimizedImage < ActiveRecord::Base
     }
   end
 
-  def self.downsize_instructions(from, to, dimensions, opts={})
+  def self.downsize_instructions(from, to, dimensions, opts = {})
     ensure_safe_paths!(from, to)
 
     %W{
@@ -181,30 +186,31 @@ class OptimizedImage < ActiveRecord::Base
       -auto-orient
       -gravity center
       -background transparent
+      -interlace none
       -resize #{dimensions}
       -profile #{File.join(Rails.root, 'vendor', 'data', 'RT_sRGB.icm')}
       #{to}
     }
   end
 
-  def self.downsize_instructions_animated(from, to, dimensions, opts={})
+  def self.downsize_instructions_animated(from, to, dimensions, opts = {})
     resize_instructions_animated(from, to, dimensions, opts)
   end
 
-  def self.resize(from, to, width, height, opts={})
+  def self.resize(from, to, width, height, opts = {})
     optimize("resize", from, to, "#{width}x#{height}", opts)
   end
 
-  def self.crop(from, to, width, height, opts={})
+  def self.crop(from, to, width, height, opts = {})
     opts[:width] = width
     optimize("crop", from, to, "#{width}x#{height}", opts)
   end
 
-  def self.downsize(from, to, dimensions, opts={})
+  def self.downsize(from, to, dimensions, opts = {})
     optimize("downsize", from, to, dimensions, opts)
   end
 
-  def self.optimize(operation, from, to, dimensions, opts={})
+  def self.optimize(operation, from, to, dimensions, opts = {})
     method_name = "#{operation}_instructions"
     if !!opts[:allow_animation] && (from =~ /\.GIF$/i || opts[:filename] =~ /\.GIF$/i)
       method_name += "_animated"
@@ -220,14 +226,14 @@ 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}")
     false
   end
 
-  def self.migrate_to_new_scheme(limit=nil)
+  def self.migrate_to_new_scheme(limit = nil)
     problems = []
 
     if SiteSetting.migrate_to_new_scheme
@@ -265,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)
@@ -304,7 +310,7 @@ end
 #  width     :integer          not null
 #  height    :integer          not null
 #  upload_id :integer          not null
-#  url       :string           not null
+#  url       :string(255)      not null
 #
 # Indexes
 #
diff --git a/app/models/permalink.rb b/app/models/permalink.rb
index e7427d20ba..4bfaa5a9cd 100644
--- a/app/models/permalink.rb
+++ b/app/models/permalink.rb
@@ -44,8 +44,8 @@ class Permalink < ActiveRecord::Base
 
     def normalize(url)
       return url unless @rules
-      @rules.each do |(regex,sub)|
-        url = url.sub(regex,sub)
+      @rules.each do |(regex, sub)|
+        url = url.sub(regex, sub)
       end
 
       url
@@ -56,10 +56,10 @@ class Permalink < ActiveRecord::Base
   def self.normalize_url(url)
     if url
       url = url.strip
-      url = url[1..-1] if url[0,1] == '/'
+      url = url[1..-1] if url[0, 1] == '/'
     end
 
-    normalizations =  SiteSetting.permalink_normalizations
+    normalizations = SiteSetting.permalink_normalizations
 
     @normalizer = Normalizer.new(normalizations) unless @normalizer && @normalizer.source == normalizations
     @normalizer.normalize(url)
@@ -81,10 +81,10 @@ class Permalink < ActiveRecord::Base
     nil
   end
 
-  def self.filter_by(url=nil)
+  def self.filter_by(url = nil)
     permalinks = Permalink
-                  .includes(:topic, :post, :category)
-                  .order('permalinks.created_at desc')
+      .includes(:topic, :post, :category)
+      .order('permalinks.created_at desc')
 
     permalinks.where!('url ILIKE :url OR external_url ILIKE :url', url: "%#{url}%") if url.present?
     permalinks.limit!(100)
diff --git a/app/models/plugin_store.rb b/app/models/plugin_store.rb
index 5a7675344e..72d9859e70 100644
--- a/app/models/plugin_store.rb
+++ b/app/models/plugin_store.rb
@@ -1,5 +1,23 @@
 # API to wrap up plugin store rows
 class PluginStore
+  attr_reader :plugin_name
+
+  def initialize(plugin_name)
+    @plugin_name = plugin_name
+  end
+
+  def get(key)
+    self.class.get(plugin_name, key)
+  end
+
+  def set(key, value)
+    self.class.set(plugin_name, key, value)
+  end
+
+  def remove(key)
+    self.class.remove(plugin_name, key)
+  end
+
   def self.get(plugin_name, key)
     if row = PluginStoreRow.find_by(plugin_name: plugin_name, key: key)
       cast_value(row.type_name, row.value)
@@ -7,7 +25,7 @@ class PluginStore
   end
 
   def self.set(plugin_name, key, value)
-    hash = {plugin_name: plugin_name, key: key}
+    hash = { plugin_name: plugin_name, key: key }
     row = PluginStoreRow.find_by(hash) || PluginStoreRow.new(hash)
 
     row.type_name = determine_type(value)
@@ -34,7 +52,7 @@ class PluginStore
     if item.is_a? Hash
       ActiveSupport::HashWithIndifferentAccess.new item
     elsif item.is_a? Array
-      item.map { |subitem| map_json subitem}
+      item.map { |subitem| map_json subitem }
     else
       item
     end
diff --git a/app/models/plugin_store_row.rb b/app/models/plugin_store_row.rb
index d9bb1c05db..db1d9d3fda 100644
--- a/app/models/plugin_store_row.rb
+++ b/app/models/plugin_store_row.rb
@@ -6,9 +6,9 @@ end
 # Table name: plugin_store_rows
 #
 #  id          :integer          not null, primary key
-#  plugin_name :string           not null
-#  key         :string           not null
-#  type_name   :string           not null
+#  plugin_name :string(255)      not null
+#  key         :string(255)      not null
+#  type_name   :string(255)      not null
 #  value       :text
 #
 # Indexes
diff --git a/app/models/post.rb b/app/models/post.rb
index 4f8ba9770f..8312129479 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -1,4 +1,3 @@
-require_dependency 'jobs/base'
 require_dependency 'pretty_text'
 require_dependency 'rate_limiter'
 require_dependency 'post_revisor'
@@ -6,7 +5,6 @@ require_dependency 'enum'
 require_dependency 'post_analyzer'
 require_dependency 'validators/post_validator'
 require_dependency 'plugin/filter'
-require_dependency 'email_cook'
 
 require 'archetype'
 require 'digest/sha1'
@@ -14,11 +12,17 @@ require 'digest/sha1'
 class Post < ActiveRecord::Base
   include RateLimiter::OnCreateRecord
   include Trashable
+  include Searchable
   include HasCustomFields
   include LimitedEdit
 
+  cattr_accessor :permitted_create_params
+  self.permitted_create_params = Set.new
+
   # increase this number to force a system wide post rebake
-  BAKED_VERSION = 1
+  # Version 1, was the initial version
+  # Version 2 15-12-2017, introduces CommonMark and a huge number of onebox fixes
+  BAKED_VERSION = 2
 
   rate_limit
   rate_limit :limit_posts_per_day
@@ -37,7 +41,6 @@ class Post < ActiveRecord::Base
   has_many :post_uploads
   has_many :uploads, through: :post_uploads
 
-  has_one :post_search_data
   has_one :post_stat
 
   has_one :incoming_email
@@ -57,7 +60,11 @@ class Post < ActiveRecord::Base
   # We can pass several creating options to a post via attributes
   attr_accessor :image_sizes, :quoted_post_numbers, :no_bump, :invalidate_oneboxes, :cooking_options, :skip_unique_check
 
-  SHORT_POST_CHARS = 1200
+  LARGE_IMAGES      ||= "large_images".freeze
+  BROKEN_IMAGES     ||= "broken_images".freeze
+  DOWNLOADED_IMAGES ||= "downloaded_images".freeze
+
+  SHORT_POST_CHARS ||= 1200
 
   scope :private_posts_for_user, ->(user) {
     where("posts.topic_id IN (SELECT topic_id
@@ -71,24 +78,34 @@ class Post < ActiveRecord::Base
                                               user_id: user.id)
   }
 
-  scope :by_newest, -> { order('created_at desc, id desc') }
+  scope :by_newest, -> { order('created_at DESC, id DESC') }
   scope :by_post_number, -> { order('post_number ASC') }
   scope :with_user, -> { includes(:user) }
-  scope :created_since, lambda { |time_ago| where('posts.created_at > ?', time_ago) }
+  scope :created_since, -> (time_ago) { where('posts.created_at > ?', time_ago) }
   scope :public_posts, -> { joins(:topic).where('topics.archetype <> ?', Archetype.private_message) }
   scope :private_posts, -> { joins(:topic).where('topics.archetype = ?', Archetype.private_message) }
   scope :with_topic_subtype, ->(subtype) { joins(:topic).where('topics.subtype = ?', subtype) }
   scope :visible, -> { joins(:topic).where('topics.visible = true').where(hidden: false) }
-  scope :secured, lambda { |guardian| where('posts.post_type in (?)', Topic.visible_post_types(guardian && guardian.user))}
+  scope :secured, -> (guardian) { where('posts.post_type IN (?)', Topic.visible_post_types(guardian&.user)) }
   scope :for_mailing_list, ->(user, since) {
     q = created_since(since)
       .joins(:topic)
-      .where(topic: Topic.for_digest(user, 100.years.ago)) # we want all topics with new content, regardless when they were created
+      .where(topic: Topic.for_digest(user, Time.at(0))) # we want all topics with new content, regardless when they were created
 
     q = q.where.not(post_type: Post.types[:whisper]) unless user.staff?
 
     q.order('posts.created_at ASC')
   }
+  scope :raw_match, -> (pattern, type = 'string') {
+    type = type&.downcase
+
+    case type
+    when 'string'
+      where('raw ILIKE ?', "%#{pattern}%")
+    when 'regex'
+      where('raw ~ ?', "(?n)#{pattern}")
+    end
+  }
 
   delegate :username, to: :user
 
@@ -160,7 +177,7 @@ class Post < ActiveRecord::Base
     end
   end
 
-  def trash!(trashed_by=nil)
+  def trash!(trashed_by = nil)
     self.topic_links.each(&:destroy)
     super(trashed_by)
   end
@@ -188,7 +205,7 @@ class Post < ActiveRecord::Base
 
   def matches_recent_post?
     post_id = $redis.get(unique_post_key)
-    post_id != nil and post_id.to_i != id
+    post_id != (nil) && post_id.to_i != (id)
   end
 
   def raw_hash
@@ -197,7 +214,7 @@ class Post < ActiveRecord::Base
   end
 
   def self.white_listed_image_classes
-    @white_listed_image_classes ||= ['avatar', 'favicon', 'thumbnail']
+    @white_listed_image_classes ||= ['avatar', 'favicon', 'thumbnail', 'emoji']
   end
 
   def post_analyzer
@@ -219,37 +236,32 @@ class Post < ActiveRecord::Base
     !add_nofollow?
   end
 
-  def cook(*args)
+  def cook(raw, opts = {})
     # For some posts, for example those imported via RSS, we support raw HTML. In that
     # case we can skip the rendering pipeline.
     return raw if cook_method == Post.cook_methods[:raw_html]
 
-    cooked = nil
-    if cook_method == Post.cook_methods[:email]
-      cooked = EmailCook.new(raw).cook
+    options = opts.dup
+    options[:cook_method] = cook_method
+
+    post_user = self.user
+    options[:user_id] = post_user.id if post_user
+
+    if add_nofollow?
+      cooked = post_analyzer.cook(raw, options)
     else
-      cloned = args.dup
-      cloned[1] ||= {}
-
-      post_user = self.user
-      cloned[1][:user_id] = post_user.id if post_user
-
-      cooked = if add_nofollow?
-                 post_analyzer.cook(*args)
-               else
-                 # At trust level 3, we don't apply nofollow to links
-                 cloned[1][:omit_nofollow] = true
-                 post_analyzer.cook(*cloned)
-               end
+      # At trust level 3, we don't apply nofollow to links
+      options[:omit_nofollow] = true
+      cooked = post_analyzer.cook(raw, options)
     end
 
     new_cooked = Plugin::Filter.apply(:after_post_cook, self, cooked)
 
     if post_type == Post.types[:regular]
       if new_cooked != cooked && new_cooked.blank?
-        Rails.logger.debug("Plugin is blanking out post: #{self.url}\nraw: #{self.raw}")
+        Rails.logger.debug("Plugin is blanking out post: #{self.url}\nraw: #{raw}")
       elsif new_cooked.blank?
-        Rails.logger.debug("Blank post detected post: #{self.url}\nraw: #{self.raw}")
+        Rails.logger.debug("Blank post detected post: #{self.url}\nraw: #{raw}")
       end
     end
 
@@ -273,10 +285,10 @@ class Post < ActiveRecord::Base
 
   def whitelisted_spam_hosts
     hosts = SiteSetting
-              .white_listed_spam_host_domains
-              .split('|')
-              .map{|h| h.strip}
-              .reject{|h| !h.include?('.')}
+      .white_listed_spam_host_domains
+      .split('|')
+      .map { |h| h.strip }
+      .reject { |h| !h.include?('.') }
 
     hosts << GlobalSetting.hostname
     hosts << RailsMultisite::ConnectionManagement.current_hostname
@@ -296,9 +308,9 @@ class Post < ActiveRecord::Base
     return hosts if hosts.length == 0
 
     TopicLink.where(domain: hosts.keys, user_id: acting_user.id)
-             .group(:domain, :post_id)
-             .count
-             .each_key do |tuple|
+      .group(:domain, :post_id)
+      .count
+      .each_key do |tuple|
       domain = tuple[0]
       hosts[domain] = (hosts[domain] || 0) + 1
     end
@@ -309,12 +321,13 @@ class Post < ActiveRecord::Base
   # Prevent new users from posting the same hosts too many times.
   def has_host_spam?
     return false if acting_user.present? && (acting_user.staged? || acting_user.has_trust_level?(TrustLevel[1]))
+    return false if topic&.private_message?
 
     total_hosts_usage.values.any? { |count| count >= SiteSetting.newuser_spam_host_threshold }
   end
 
   def archetype
-    topic.archetype
+    topic&.archetype
   end
 
   def self.regular_order
@@ -325,7 +338,7 @@ class Post < ActiveRecord::Base
     order('sort_order desc, post_number desc')
   end
 
-  def self.summary(topic_id=nil)
+  def self.summary(topic_id = nil)
     # PERF: if you pass in nil it is WAY slower
     #  pg chokes getting a reasonable plan
     topic_id = topic_id ? topic_id.to_i : "posts.topic_id"
@@ -398,11 +411,11 @@ class Post < ActiveRecord::Base
   end
 
   def is_flagged?
-    post_actions.where(post_action_type_id: PostActionType.flag_types.values, deleted_at: nil).count != 0
+    post_actions.where(post_action_type_id: PostActionType.flag_types_without_custom.values, deleted_at: nil).count != 0
   end
 
   def has_active_flag?
-    post_actions.active.where(post_action_type_id: PostActionType.flag_types.values).count != 0
+    post_actions.active.where(post_action_type_id: PostActionType.flag_types_without_custom.values).count != 0
   end
 
   def unhide!
@@ -416,7 +429,7 @@ class Post < ActiveRecord::Base
     "#{Discourse.base_url}#{url}"
   end
 
-  def url(opts=nil)
+  def url(opts = nil)
     opts ||= {}
 
     if topic
@@ -430,7 +443,7 @@ class Post < ActiveRecord::Base
     "#{Discourse.base_url}/email/unsubscribe/#{UnsubscribeKey.create_key_for(user, self)}"
   end
 
-  def self.url(slug, topic_id, post_number, opts=nil)
+  def self.url(slug, topic_id, post_number, opts = nil)
     opts ||= {}
 
     result = "/t/"
@@ -440,12 +453,12 @@ class Post < ActiveRecord::Base
   end
 
   def self.urls(post_ids)
-    ids = post_ids.map{|u| u}
+    ids = post_ids.map { |u| u }
     if ids.length > 0
       urls = {}
       Topic.joins(:posts).where('posts.id' => ids).
-        select(['posts.id as post_id','post_number', 'topics.slug', 'topics.title', 'topics.id']).
-      each do |t|
+        select(['posts.id as post_id', 'post_number', 'topics.slug', 'topics.title', 'topics.id']).
+        each do |t|
         urls[t.post_id.to_i] = url(t.slug, t.id, t.post_number)
       end
       urls
@@ -454,24 +467,36 @@ class Post < ActiveRecord::Base
     end
   end
 
-  def revise(updated_by, changes={}, opts={})
+  def revise(updated_by, changes = {}, opts = {})
     PostRevisor.new(self).revise!(updated_by, changes, opts)
   end
 
   def self.rebake_old(limit)
     problems = []
     Post.where('baked_version IS NULL OR baked_version < ?', BAKED_VERSION)
-        .limit(limit).each do |p|
+      .order('id desc')
+      .limit(limit).each do |p|
       begin
         p.rebake!
       rescue => e
-        problems << {post: p, ex: e}
+        problems << { post: p, ex: e }
+
+        attempts = p.custom_fields["rebake_attempts"].to_i
+
+        if attempts > 3
+          p.update_columns(baked_version: BAKED_VERSION)
+          Discourse.warn_exception(e, message: "Can not rebake post# #{p.id} after 3 attempts, giving up")
+        else
+          p.custom_fields["rebake_attempts"] = attempts + 1
+          p.save_custom_fields
+        end
+
       end
     end
     problems
   end
 
-  def rebake!(opts=nil)
+  def rebake!(opts = nil)
     opts ||= {}
 
     new_cooked = cook(raw, topic_id: topic_id, invalidate_oneboxes: opts.fetch(:invalidate_oneboxes, false))
@@ -491,19 +516,25 @@ class Post < ActiveRecord::Base
     new_cooked != old_cooked
   end
 
-  def set_owner(new_user, actor, skip_revision=false)
+  def set_owner(new_user, actor, skip_revision = false)
     return if user_id == new_user.id
 
-    edit_reason = I18n.t('change_owner.post_revision_text',
-      old_user: (self.user.username_lower rescue nil) || I18n.t('change_owner.deleted_user'),
-      new_user: new_user.username_lower
+    edit_reason = I18n.with_locale(SiteSetting.default_locale) do
+      I18n.t('change_owner.post_revision_text',
+             old_user: (self.user.username_lower rescue nil) || I18n.t('change_owner.deleted_user'),
+             new_user: new_user.username_lower
+      )
+    end
+
+    revise(
+      actor,
+      { raw: self.raw, user_id: new_user.id, edit_reason: edit_reason },
+      bypass_bump: true, skip_revision: skip_revision
     )
-    revise(actor, {raw: self.raw, user_id: new_user.id, edit_reason: edit_reason}, {bypass_bump: true, skip_revision: skip_revision})
 
     if post_number == topic.highest_post_number
       topic.update_columns(last_post_user_id: new_user.id)
     end
-
   end
 
   before_create do
@@ -522,7 +553,7 @@ class Post < ActiveRecord::Base
 
   # This calculates the geometric mean of the post timings and stores it along with
   # each post.
-  def self.calculate_avg_time(min_topic_age=nil)
+  def self.calculate_avg_time(min_topic_age = nil)
     retry_lock_error do
       builder = SqlBuilder.new("UPDATE posts
                 SET avg_time = (x.gmean / 1000)
@@ -553,7 +584,7 @@ class Post < ActiveRecord::Base
   before_save do
     self.last_editor_id ||= user_id
 
-    if !new_record? && raw_changed?
+    if !new_record? && will_save_change_to_raw?
       self.cooked = cook(raw, topic_id: topic_id)
     end
 
@@ -583,7 +614,6 @@ class Post < ActiveRecord::Base
     self.quote_count = temp_collector.size
   end
 
-
   def save_reply_relationships
     add_to_quoted_post_numbers(reply_to_post_number)
     return if self.quoted_post_numbers.blank?
@@ -608,8 +638,9 @@ class Post < ActiveRecord::Base
     DiscourseEvent.trigger(:after_trigger_post_process, self)
   end
 
-  def self.public_posts_count_per_day(start_date, end_date, category_id=nil)
+  def self.public_posts_count_per_day(start_date, end_date, category_id = nil)
     result = public_posts.where('posts.created_at >= ? AND posts.created_at <= ?', start_date, end_date)
+      .where(post_type: Post.types[:regular])
     result = result.where('topics.category_id = ?', category_id) if category_id
     result.group('date(posts.created_at)').order('date(posts.created_at)').count
   end
@@ -618,7 +649,7 @@ class Post < ActiveRecord::Base
     private_posts.with_topic_subtype(topic_subtype).where('posts.created_at >= ? AND posts.created_at <= ?', start_date, end_date).group('date(posts.created_at)').order('date(posts.created_at)').count
   end
 
-  def reply_history(max_replies=100, guardian=nil)
+  def reply_history(max_replies = 100, guardian = nil)
     post_ids = Post.exec_sql("WITH RECURSIVE breadcrumb(id, reply_to_post_number) AS (
                               SELECT p.id, p.reply_to_post_number FROM posts AS p
                                 WHERE p.id = :post_id
@@ -628,15 +659,44 @@ class Post < ActiveRecord::Base
                                      AND p.topic_id = :topic_id
                             ) SELECT id from breadcrumb ORDER by id", post_id: id, topic_id: topic_id).to_a
 
-    post_ids.map! {|r| r['id'].to_i }
-            .reject! {|post_id| post_id == id}
+    post_ids.map! { |r| r['id'].to_i }
+      .reject! { |post_id| post_id == id }
 
     # [1,2,3][-10,-1] => nil
-    post_ids = (post_ids[(0-max_replies)..-1] || post_ids)
+    post_ids = (post_ids[(0 - max_replies)..-1] || post_ids)
 
     Post.secured(guardian).where(id: post_ids).includes(:user, :topic).order(:id).to_a
   end
 
+  MAX_REPLY_LEVEL ||= 1000
+
+  def reply_ids(guardian = nil)
+    replies = Post.exec_sql("
+      WITH RECURSIVE breadcrumb(id, level) AS (
+        SELECT :post_id, 0
+        UNION
+        SELECT reply_id, level + 1
+          FROM post_replies, breadcrumb
+         WHERE post_id = id
+           AND post_id <> reply_id
+           AND level < #{MAX_REPLY_LEVEL}
+      ), breadcrumb_with_count AS (
+        SELECT id, level, COUNT(*)
+          FROM post_replies, breadcrumb
+         WHERE reply_id = id
+           AND reply_id <> post_id
+         GROUP BY id, level
+      )
+      SELECT id, level FROM breadcrumb_with_count WHERE level > 0 AND count = 1 ORDER BY id
+    ", post_id: id).to_a
+
+    replies.map! { |r| { id: r["id"].to_i, level: r["level"].to_i } }
+
+    secured_ids = Post.secured(guardian).where(id: replies.map { |r| r[:id] }).pluck(:id).to_set
+
+    replies.reject { |r| !secured_ids.include?(r[:id]) }
+  end
+
   def revert_to(number)
     return if number >= version
     post_revision = PostRevision.find_by(post_id: id, number: (number + 1))
@@ -743,7 +803,7 @@ end
 #  notify_user_count       :integer          default(0), not null
 #  like_score              :integer          default(0), not null
 #  deleted_by_id           :integer
-#  edit_reason             :string
+#  edit_reason             :string(255)
 #  word_count              :integer
 #  version                 :integer          default(1), not null
 #  cook_method             :integer          default(1), not null
@@ -756,7 +816,7 @@ end
 #  via_email               :boolean          default(FALSE), not null
 #  raw_email               :text
 #  public_version          :integer          default(1), not null
-#  action_code             :string
+#  action_code             :string(255)
 #  image_url               :string
 #
 # Indexes
diff --git a/app/models/post_action.rb b/app/models/post_action.rb
index 73fcf5ed37..617d0c72b3 100644
--- a/app/models/post_action.rb
+++ b/app/models/post_action.rb
@@ -42,27 +42,27 @@ class PostAction < ActiveRecord::Base
     nil
   end
 
-  def self.flag_count_by_date(start_date, end_date, category_id=nil)
+  def self.flag_count_by_date(start_date, end_date, category_id = nil)
     result = where('post_actions.created_at >= ? AND post_actions.created_at <= ?', start_date, end_date)
-    result = result.where(post_action_type_id: PostActionType.flag_types.values)
+    result = result.where(post_action_type_id: PostActionType.flag_types_without_custom.values)
     result = result.joins(post: :topic).where("topics.category_id = ?", category_id) if category_id
     result.group('date(post_actions.created_at)')
-          .order('date(post_actions.created_at)')
-          .count
+      .order('date(post_actions.created_at)')
+      .count
   end
 
   def self.update_flagged_posts_count
     posts_flagged_count = PostAction.active
-                                    .flags
-                                    .joins(post: :topic)
-                                    .where('posts.deleted_at' => nil)
-                                    .where('topics.deleted_at' => nil)
-                                    .where('posts.user_id > 0')
-                                    .count('DISTINCT posts.id')
+      .flags
+      .joins(post: :topic)
+      .where('posts.deleted_at' => nil)
+      .where('topics.deleted_at' => nil)
+      .where('posts.user_id > 0')
+      .count('DISTINCT posts.id')
 
     $redis.set('posts_flagged_count', posts_flagged_count)
     user_ids = User.staff.pluck(:id)
-    MessageBus.publish('/flagged_counts', { total: posts_flagged_count }, { user_ids: user_ids })
+    MessageBus.publish('/flagged_counts', { total: posts_flagged_count }, user_ids: user_ids)
   end
 
   def self.flagged_posts_count
@@ -107,7 +107,6 @@ SQL
       (map[row.topic_id] ||= []) << row.post_number
     end
 
-
     map
   end
 
@@ -128,21 +127,21 @@ SQL
     user_actions
   end
 
-  def self.count_per_day_for_type(post_action_type, opts=nil)
+  def self.count_per_day_for_type(post_action_type, opts = nil)
     opts ||= {}
     result = unscoped.where(post_action_type_id: post_action_type)
     result = result.where('post_actions.created_at >= ?', opts[:start_date] || (opts[:since_days_ago] || 30).days.ago)
     result = result.where('post_actions.created_at <= ?', opts[:end_date]) if opts[:end_date]
     result = result.joins(post: :topic).where('topics.category_id = ?', opts[:category_id]) if opts[:category_id]
     result.group('date(post_actions.created_at)')
-          .order('date(post_actions.created_at)')
-          .count
+      .order('date(post_actions.created_at)')
+      .count
   end
 
-  def self.agree_flags!(post, moderator, delete_post=false)
+  def self.agree_flags!(post, moderator, delete_post = false)
     actions = PostAction.active
-                        .where(post_id: post.id)
-                        .where(post_action_type_id: PostActionType.flag_types.values)
+      .where(post_id: post.id)
+      .where(post_action_type_id: PostActionType.flag_types.values)
 
     trigger_spam = false
     actions.each do |action|
@@ -165,11 +164,11 @@ SQL
       if moderator.id == Discourse::SYSTEM_USER_ID
         PostActionType.auto_action_flag_types.values
       else
-        PostActionType.flag_types.values
+        PostActionType.notify_flag_type_ids
       end
 
     actions = PostAction.where(post_id: post.id)
-                        .where(post_action_type_id: action_type_ids)
+      .where(post_action_type_id: action_type_ids)
 
     actions.each do |action|
       action.disagreed_at = Time.zone.now
@@ -180,16 +179,21 @@ SQL
     end
 
     # reset all cached counters
-    f = action_type_ids.map { |t| ["#{PostActionType.types[t]}_count", 0] }
-    Post.with_deleted.where(id: post.id).update_all(Hash[*f.flatten])
+    cached = {}
+    action_type_ids.each do |atid|
+      column = "#{PostActionType.types[atid]}_count"
+      cached[column] = 0 if ActiveRecord::Base.connection.column_exists?(:posts, column)
+    end
+
+    Post.with_deleted.where(id: post.id).update_all(cached)
 
     update_flagged_posts_count
   end
 
-  def self.defer_flags!(post, moderator, delete_post=false)
+  def self.defer_flags!(post, moderator, delete_post = false)
     actions = PostAction.active
-                        .where(post_id: post.id)
-                        .where(post_action_type_id: PostActionType.flag_types.values)
+      .where(post_id: post.id)
+      .where(post_action_type_id: PostActionType.notify_flag_type_ids)
 
     actions.each do |action|
       action.deferred_at = Time.zone.now
@@ -202,13 +206,16 @@ SQL
     update_flagged_posts_count
   end
 
-  def add_moderator_post_if_needed(moderator, disposition, delete_post=false)
+  def add_moderator_post_if_needed(moderator, disposition, delete_post = false)
     return if !SiteSetting.auto_respond_to_flag_actions
     return if related_post.nil? || related_post.topic.nil?
     return if staff_already_replied?(related_post.topic)
     message_key = "flags_dispositions.#{disposition}"
     message_key << "_and_deleted" if delete_post
-    related_post.topic.add_moderator_post(moderator, I18n.t(message_key))
+
+    I18n.with_locale(SiteSetting.default_locale) do
+      related_post.topic.add_moderator_post(moderator, I18n.t(message_key))
+    end
   end
 
   def staff_already_replied?(topic)
@@ -237,33 +244,34 @@ SQL
       opts[:target_group_names] = target_moderators
     else
       opts[:subtype] = TopicSubtype.notify_user
-      opts[:target_usernames] = if post_action_type == :notify_user
-                                  post.user.username
-                                elsif post_action_type != :notify_moderators
-                                  # this is a hack to allow a PM with no recipients, we should think through
-                                  # a cleaner technique, a PM with myself is valid for flagging
-                                  'x'
-                                end
+
+      opts[:target_usernames] =
+        if post_action_type == :notify_user
+          post.user.username
+        elsif post_action_type != :notify_moderators
+          # this is a hack to allow a PM with no recipients, we should think through
+          # a cleaner technique, a PM with myself is valid for flagging
+          'x'
+        end
     end
 
-    PostCreator.new(user, opts).create.try(:id)
+    PostCreator.new(user, opts).create!&.id
   end
 
-  def self.limit_action!(user,post,post_action_type_id)
+  def self.limit_action!(user, post, post_action_type_id)
     RateLimiter.new(user, "post_action-#{post.id}_#{post_action_type_id}", 4, 1.minute).performed!
   end
 
   def self.act(user, post, post_action_type_id, opts = {})
-
-    limit_action!(user,post,post_action_type_id)
+    limit_action!(user, post, post_action_type_id)
 
     related_post_id = create_message_for_post_action(user, post, post_action_type_id, opts)
     staff_took_action = opts[:take_action] || false
 
-    targets_topic = if opts[:flag_topic] && post.topic
-                      post.topic.reload
-                      post.topic.posts_count != 1
-                    end
+    targets_topic =
+      if opts[:flag_topic] && post.topic
+        post.topic.reload.posts_count != 1
+      end
 
     where_attrs = {
       post_id: post.id,
@@ -279,9 +287,9 @@ SQL
 
     # First try to revive a trashed record
     post_action = PostAction.where(where_attrs)
-                            .with_deleted
-                            .where("deleted_at IS NOT NULL")
-                            .first
+      .with_deleted
+      .where("deleted_at IS NOT NULL")
+      .first
 
     if post_action
       post_action.recover!
@@ -324,7 +332,7 @@ SQL
 
   def self.remove_act(user, post, post_action_type_id)
 
-    limit_action!(user,post,post_action_type_id)
+    limit_action!(user, post, post_action_type_id)
 
     finder = PostAction.where(post_id: post.id, user_id: user.id, post_action_type_id: post_action_type_id)
     finder = finder.with_deleted.includes(:post) if user.try(:staff?)
@@ -352,7 +360,7 @@ SQL
   end
 
   def is_flag?
-    PostActionType.flag_types.values.include?(post_action_type_id)
+    !!PostActionType.flag_types[post_action_type_id]
   end
 
   def is_private_message?
@@ -374,24 +382,24 @@ SQL
           multiplier = SiteSetting.send("tl#{user.trust_level}_additional_likes_per_day_multiplier").to_f
           multiplier = 1.0 if multiplier < 1.0
 
-          limit = (limit * multiplier ).to_i
+          limit = (limit * multiplier).to_i
         end
 
-        @rate_limiter = RateLimiter.new(user, "create_#{type}",limit, 1.day.to_i)
+        @rate_limiter = RateLimiter.new(user, "create_#{type}", limit, 1.day.to_i)
         return @rate_limiter
       end
     end
   end
 
   before_create do
-    post_action_type_ids = is_flag? ? PostActionType.flag_types.values : post_action_type_id
+    post_action_type_ids = is_flag? ? PostActionType.flag_types_without_custom.values : post_action_type_id
     raise AlreadyActed if PostAction.where(user_id: user_id)
-                                    .where(post_id: post_id)
-                                    .where(post_action_type_id: post_action_type_ids)
-                                    .where(deleted_at: nil)
-                                    .where(disagreed_at: nil)
-                                    .where(targets_topic: targets_topic)
-                                    .exists?
+        .where(post_id: post_id)
+        .where(post_action_type_id: post_action_type_ids)
+        .where(deleted_at: nil)
+        .where(disagreed_at: nil)
+        .where(targets_topic: targets_topic)
+        .exists?
   end
 
   # Returns the flag counts for a post, taking into account that some users
@@ -427,8 +435,8 @@ SQL
     # Update denormalized counts
     column = "#{post_action_type_key}_count"
     count = PostAction.where(post_id: post_id)
-                      .where(post_action_type_id: post_action_type_id)
-                      .count
+      .where(post_action_type_id: post_action_type_id)
+      .count
 
     # We probably want to refactor this method to something cleaner.
     case post_action_type_key
@@ -438,18 +446,19 @@ SQL
     when :like
       # 'like_score' is weighted higher for staff accounts
       score = PostAction.joins(:user)
-                        .where(post_id: post_id)
-                        .sum("CASE WHEN users.moderator OR users.admin THEN #{SiteSetting.staff_like_weight} ELSE 1 END")
+        .where(post_id: post_id)
+        .sum("CASE WHEN users.moderator OR users.admin THEN #{SiteSetting.staff_like_weight} ELSE 1 END")
       Post.where(id: post_id).update_all ["like_count = :count, like_score = :score", count: count, score: score]
     else
-      Post.where(id: post_id).update_all ["#{column} = ?", count]
+      if ActiveRecord::Base.connection.column_exists?(:posts, column)
+        Post.where(id: post_id).update_all ["#{column} = ?", count]
+      end
     end
 
-
     topic_id = Post.with_deleted.where(id: post_id).pluck(:topic_id).first
 
     # topic_user
-    if [:like,:bookmark].include? post_action_type_key
+    if [:like, :bookmark].include? post_action_type_key
       TopicUser.update_post_action_cache(user_id: user_id,
                                          topic_id: topic_id,
                                          post_action_type: post_action_type_key)
@@ -501,12 +510,12 @@ SQL
     return if topic.nil? || topic.closed?
 
     flags = PostAction.active
-                      .flags
-                      .joins(:post)
-                      .where("posts.topic_id = ?", topic.id)
-                      .where("post_actions.user_id > 0")
-                      .group("post_actions.user_id")
-                      .pluck("post_actions.user_id, COUNT(post_id)")
+      .flags
+      .joins(:post)
+      .where("posts.topic_id = ?", topic.id)
+      .where("post_actions.user_id > 0")
+      .group("post_actions.user_id")
+      .pluck("post_actions.user_id, COUNT(post_id)")
 
     # we need a minimum number of unique flaggers
     return if flags.count < SiteSetting.num_flaggers_to_close_topic
@@ -535,7 +544,7 @@ SQL
        acting_user.has_trust_level?(TrustLevel[3]) &&
        post.user.trust_level == TrustLevel[0]
 
-       hide_post!(post, post_action_type, Post.hidden_reasons[:flagged_by_tl3_user])
+      hide_post!(post, post_action_type, Post.hidden_reasons[:flagged_by_tl3_user])
 
     elsif PostActionType.auto_action_flag_types.include?(post_action_type) &&
           SiteSetting.flags_required_to_hide_post > 0
@@ -548,7 +557,7 @@ SQL
     end
   end
 
-  def self.hide_post!(post, post_action_type, reason=nil)
+  def self.hide_post!(post, post_action_type, reason = nil)
     return if post.hidden
 
     unless reason
@@ -569,7 +578,8 @@ SQL
         edit_delay: SiteSetting.cooldown_minutes_after_hiding_posts,
         flag_reason: I18n.t("flag_reasons.#{post_action_type}"),
       }
-      SystemMessage.create(post.user, :post_hidden, options)
+
+      Jobs.enqueue_in(5.seconds, :send_system_message, user_id: post.user.id, message_type: :post_hidden, message_options: options)
     end
   end
 
@@ -580,7 +590,7 @@ SQL
   end
 
   def self.post_action_type_for_post(post_id)
-    post_action = PostAction.find_by(deferred_at: nil, post_id: post_id, post_action_type_id: PostActionType.flag_types.values, deleted_at: nil)
+    post_action = PostAction.find_by(deferred_at: nil, post_id: post_id, post_action_type_id: PostActionType.notify_flag_types.values, deleted_at: nil)
     PostActionType.types[post_action.post_action_type_id]
   end
 
diff --git a/app/models/post_action_type.rb b/app/models/post_action_type.rb
index 6af07c53af..9f757aa013 100644
--- a/app/models/post_action_type.rb
+++ b/app/models/post_action_type.rb
@@ -1,5 +1,6 @@
 require_dependency 'enum'
 require_dependency 'distributed_cache'
+require_dependency 'flag_settings'
 
 class PostActionType < ActiveRecord::Base
   after_save :expire_cache
@@ -14,23 +15,72 @@ class PostActionType < ActiveRecord::Base
 
   class << self
 
+    def flag_settings
+      unless @flag_settings
+        @flag_settings = FlagSettings.new
+        @flag_settings.add(
+          3,
+          :off_topic,
+          notify_type: true,
+          auto_action_type: true
+        )
+        @flag_settings.add(
+          4,
+          :inappropriate,
+          topic_type: true,
+          notify_type: true,
+          auto_action_type: true
+        )
+        @flag_settings.add(
+          8,
+          :spam,
+          topic_type: true,
+          notify_type: true,
+          auto_action_type: true
+        )
+        @flag_settings.add(
+          6,
+          :notify_user,
+          topic_type: false,
+          notify_type: false,
+          custom_type: true
+        )
+        @flag_settings.add(
+          7,
+          :notify_moderators,
+          topic_type: true,
+          notify_type: true,
+          custom_type: true
+        )
+      end
+
+      @flag_settings
+    end
+
+    def replace_flag_settings(settings)
+      @flag_settings = settings
+      @types = nil
+    end
+
     def ordered
       order('position asc')
     end
 
     def types
-      @types ||= Enum.new(bookmark: 1,
-                          like: 2,
-                          off_topic: 3,
-                          inappropriate: 4,
-                          vote: 5,
-                          notify_user: 6,
-                          notify_moderators: 7,
-                          spam: 8)
+      unless @types
+        @types = Enum.new(
+          bookmark: 1,
+          like: 2,
+          vote: 5
+        )
+        @types.merge!(flag_settings.flag_types)
+      end
+
+      @types
     end
 
     def auto_action_flag_types
-      @auto_action_flag_types ||= flag_types.except(:notify_user, :notify_moderators)
+      flag_settings.auto_action_types
     end
 
     def public_types
@@ -41,17 +91,29 @@ class PostActionType < ActiveRecord::Base
       @public_type_ids ||= public_types.values
     end
 
+    def flag_types_without_custom
+      flag_settings.without_custom_types
+    end
+
     def flag_types
-      @flag_types ||= types.only(:off_topic, :spam, :inappropriate, :notify_moderators)
+      flag_settings.flag_types
     end
 
     # flags resulting in mod notifications
     def notify_flag_type_ids
-      @notify_flag_type_ids ||= types.only(:off_topic, :spam, :inappropriate, :notify_moderators).values
+      notify_flag_types.values
+    end
+
+    def notify_flag_types
+      flag_settings.notify_types
     end
 
     def topic_flag_types
-      @topic_flag_types ||= types.only(:spam, :inappropriate, :notify_moderators)
+      flag_settings.topic_flag_types
+    end
+
+    def custom_types
+      flag_settings.custom_types
     end
 
     def is_flag?(sym)
diff --git a/app/models/post_analyzer.rb b/app/models/post_analyzer.rb
index 53296c8e59..0d6c2120ae 100644
--- a/app/models/post_analyzer.rb
+++ b/app/models/post_analyzer.rb
@@ -1,9 +1,10 @@
 require_dependency 'oneboxer'
+require_dependency 'email_cook'
 
 class PostAnalyzer
 
   def initialize(raw, topic_id)
-    @raw  = raw
+    @raw = raw
     @topic_id = topic_id
     @found_oneboxes = false
   end
@@ -13,12 +14,19 @@ class PostAnalyzer
   end
 
   # What we use to cook posts
-  def cook(*args)
-    cooked = PrettyText.cook(*args)
+  def cook(raw, opts = {})
+    cook_method = opts[:cook_method]
+    return raw if cook_method == Post.cook_methods[:raw_html]
+
+    if cook_method == Post.cook_methods[:email]
+      cooked = EmailCook.new(raw).cook(opts)
+    else
+      cooked = PrettyText.cook(raw, opts)
+    end
 
     result = Oneboxer.apply(cooked, topic_id: @topic_id) do |url, _|
       @found_oneboxes = true
-      Oneboxer.invalidate(url) if args.last[:invalidate_oneboxes]
+      Oneboxer.invalidate(url) if opts[:invalidate_oneboxes]
       Oneboxer.cached_onebox(url)
     end
 
@@ -51,16 +59,16 @@ class PostAnalyzer
     return @raw_mentions if @raw_mentions.present?
 
     raw_mentions = cooked_stripped.css('.mention, .mention-group').map do |e|
-       if name = e.inner_text
-         name = name[1..-1]
-         name.downcase! if name
-         name
-       end
+      if name = e.inner_text
+        name = name[1..-1]
+        name.downcase! if name
+        name
+      end
     end
 
     raw_mentions.compact!
     raw_mentions.uniq!
-    @raw_mention = raw_mentions
+    @raw_mentions = raw_mentions
   end
 
   # from rack ... compat with ruby 2.2
diff --git a/app/models/post_custom_field.rb b/app/models/post_custom_field.rb
index 713d0affbc..999500de52 100644
--- a/app/models/post_custom_field.rb
+++ b/app/models/post_custom_field.rb
@@ -15,6 +15,6 @@ end
 #
 # Indexes
 #
-#  index_post_custom_fields_on_name_and_value    (name)
+#  index_post_custom_fields_on_name_and_value    (name, "left"(value, 200))
 #  index_post_custom_fields_on_post_id_and_name  (post_id,name)
 #
diff --git a/app/models/post_detail.rb b/app/models/post_detail.rb
index c43219749c..8f88851673 100644
--- a/app/models/post_detail.rb
+++ b/app/models/post_detail.rb
@@ -11,8 +11,8 @@ end
 #
 #  id         :integer          not null, primary key
 #  post_id    :integer
-#  key        :string
-#  value      :string
+#  key        :string(255)
+#  value      :string(255)
 #  extra      :text
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb
index 9dff1988fb..42e8ad42b5 100644
--- a/app/models/post_mover.rb
+++ b/app/models/post_mover.rb
@@ -19,7 +19,7 @@ class PostMover
     end
   end
 
-  def to_new_topic(title, category_id=nil)
+  def to_new_topic(title, category_id = nil)
     @move_type = PostMover.move_types[:new_topic]
 
     post = Post.find_by(id: post_ids.first)
@@ -79,7 +79,9 @@ class PostMover
 
     PostReply.where("reply_id IN (:post_ids) OR post_id IN (:post_ids)", post_ids: post_ids).each do |post_reply|
       if post_reply.post && post_reply.reply && post_reply.reply.topic_id != post_reply.post.topic_id
-        PostReply.delete_all(reply_id: post_reply.reply.id, post_id: post_reply.post.id)
+        PostReply
+          .where(reply_id: post_reply.reply.id, post_id: post_reply.post.id)
+          .delete_all
       end
     end
   end
@@ -90,35 +92,66 @@ class PostMover
       raw: post.raw,
       topic_id: destination_topic.id,
       acting_user: user,
-      skip_validations: true
+      cook_method: post.cook_method,
+      via_email: post.via_email,
+      raw_email: post.raw_email,
+      skip_validations: true,
+      guardian: Guardian.new(user)
     )
 
+    move_incoming_emails(post, new_post)
+    move_email_logs(post, new_post)
+
     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
+
+    DiscourseEvent.trigger(:post_moved, new_post, original_topic.id)
+
+    new_post
   end
 
   def move(post)
     @first_post_number_moved ||= post.post_number
 
-    Post.where(id: post.id, topic_id: original_topic.id).update_all(
-      [
-        ['post_number = :post_number',
-         'reply_to_post_number = :reply_to_post_number',
-         'topic_id    = :topic_id',
-         'sort_order  = :post_number',
-         'reply_count = :reply_count',
-        ].join(', '),
-        reply_count: @reply_count[post.post_number] || 0,
-        post_number: @move_map[post.post_number],
-        reply_to_post_number: @move_map[post.reply_to_post_number],
-        topic_id: destination_topic.id
-      ]
-    )
+    update = {
+      reply_count: @reply_count[post.post_number] || 0,
+      post_number: @move_map[post.post_number],
+      reply_to_post_number: @move_map[post.reply_to_post_number],
+      topic_id: destination_topic.id,
+      sort_order: @move_map[post.post_number]
+    }
+
+    unless @move_map[post.reply_to_post_number]
+      update[:reply_to_user_id] = nil
+    end
+
+    post.update(update)
+
+    move_incoming_emails(post, post)
+    move_email_logs(post, post)
+
+    DiscourseEvent.trigger(:post_moved, post, original_topic.id)
 
     # Move any links from the post to the new topic
     post.topic_links.update_all(topic_id: destination_topic.id)
   end
 
+  def move_incoming_emails(old_post, new_post)
+    return if old_post.incoming_email.nil?
+
+    email = old_post.incoming_email
+    email.update_columns(topic_id: new_post.topic_id, post_id: new_post.id)
+    new_post.incoming_email = email
+  end
+
+  def move_email_logs(old_post, new_post)
+    EmailLog
+      .where(post_id: old_post.id)
+      .update_all(topic_id: new_post.topic_id, post_id: new_post.id)
+  end
+
   def update_statistics
     destination_topic.update_statistics
     original_topic.update_statistics
@@ -146,11 +179,14 @@ class PostMover
   def create_moderator_post_in_original_topic
     move_type_str = PostMover.move_types[@move_type].to_s
 
-    original_topic.add_moderator_post(
-      user,
+    message = I18n.with_locale(SiteSetting.default_locale) do
       I18n.t("move_posts.#{move_type_str}_moderator_post",
-             count: post_ids.count,
-             topic_link: "[#{destination_topic.title}](#{destination_topic.relative_url})"),
+             count: posts.length,
+             topic_link: "[#{destination_topic.title}](#{destination_topic.relative_url})")
+    end
+
+    original_topic.add_moderator_post(
+      user, message,
       post_type: Post.types[:small_action],
       action_code: "split_topic",
       post_number: @first_post_number_moved
@@ -159,7 +195,10 @@ class PostMover
 
   def posts
     @posts ||= begin
-      Post.where(topic: @original_topic, id: post_ids).order(:created_at).tap do |posts|
+      Post.where(topic: @original_topic, id: post_ids)
+        .where.not(post_type: Post.types[:small_action])
+        .order(:created_at).tap do |posts|
+
         raise Discourse::InvalidParameters.new(:post_ids) if posts.empty?
       end
     end
diff --git a/app/models/post_search_data.rb b/app/models/post_search_data.rb
index f9ee72b885..e890e87547 100644
--- a/app/models/post_search_data.rb
+++ b/app/models/post_search_data.rb
@@ -1,7 +1,5 @@
 class PostSearchData < ActiveRecord::Base
-  belongs_to :post
-
-  validates_presence_of :search_data
+  include HasSearchData
 end
 
 # == Schema Information
@@ -11,7 +9,8 @@ end
 #  post_id     :integer          not null, primary key
 #  search_data :tsvector
 #  raw_data    :text
-#  locale      :string
+#  locale      :string(255)
+#  version     :integer          default(0)
 #
 # Indexes
 #
diff --git a/app/models/post_timing.rb b/app/models/post_timing.rb
index 8f68209020..b32c80ccfc 100644
--- a/app/models/post_timing.rb
+++ b/app/models/post_timing.rb
@@ -1,3 +1,5 @@
+require_dependency 'archetype'
+
 class PostTiming < ActiveRecord::Base
   belongs_to :topic
   belongs_to :user
@@ -5,7 +7,6 @@ class PostTiming < ActiveRecord::Base
   validates_presence_of :post_number
   validates_presence_of :msecs
 
-
   def self.pretend_read(topic_id, actual_read_post_number, pretend_read_post_number)
     # This is done in SQL cause the logic is quite tricky and we want to do this in one db hit
     #
@@ -39,9 +40,9 @@ class PostTiming < ActiveRecord::Base
                                   AND post_number = :post_number)",
              args)
     rescue PG::UniqueViolation
-       # concurrency is hard, we are not running serialized so this can possibly
-       # still happen, if it happens we just don't care, its an invalid record anyway
-       return
+      # concurrency is hard, we are not running serialized so this can possibly
+      # still happen, if it happens we just don't care, its an invalid record anyway
+      return
     end
 
     Post.where(['topic_id = :topic_id and post_number = :post_number', args]).update_all 'reads = reads + 1'
@@ -60,23 +61,28 @@ class PostTiming < ActiveRecord::Base
     record_new_timing(args) if rows == 0
   end
 
-
   def self.destroy_for(user_id, topic_ids)
     PostTiming.transaction do
-      PostTiming.delete_all(['user_id = ? and topic_id in (?)', user_id, topic_ids])
-      TopicUser.delete_all(['user_id = ? and topic_id in (?)', user_id, topic_ids])
+      PostTiming
+        .where('user_id = ? and topic_id in (?)', user_id, topic_ids)
+        .delete_all
+
+      TopicUser
+        .where('user_id = ? and topic_id in (?)', user_id, topic_ids)
+        .delete_all
     end
   end
 
-  MAX_READ_TIME_PER_BATCH = 60*1000.0
+  MAX_READ_TIME_PER_BATCH = 60 * 1000.0
 
-  def self.process_timings(current_user, topic_id, topic_time, timings, opts={})
+  def self.process_timings(current_user, topic_id, topic_time, timings, opts = {})
     current_user.user_stat.update_time_read!
 
     max_time_per_post = ((Time.now - current_user.created_at) * 1000.0)
     max_time_per_post = MAX_READ_TIME_PER_BATCH if max_time_per_post > MAX_READ_TIME_PER_BATCH
 
     highest_seen = 1
+    new_posts_read = 0
 
     join_table = []
 
@@ -89,9 +95,8 @@ class PostTiming < ActiveRecord::Base
 
     timings.each_with_index do |(post_number, time), index|
 
-        join_table << "SELECT #{topic_id.to_i} topic_id, #{post_number.to_i} post_number,
-                       #{current_user.id.to_i} user_id, #{time.to_i} msecs, #{index} idx"
-
+      join_table << "SELECT #{topic_id.to_i} topic_id, #{post_number.to_i} post_number,
+                     #{current_user.id.to_i} user_id, #{time.to_i} msecs, #{index} idx"
 
         highest_seen = post_number.to_i > highest_seen ?
                        post_number.to_i : highest_seen
@@ -112,25 +117,26 @@ SQL
       result = exec_sql(sql)
       result.type_map = SqlBuilder.pg_type_map
       existing = Set.new(result.column_values(0))
+      new_posts_read = timings.size - existing.size if Topic.where(id: topic_id, archetype: Archetype.default).exists?
 
-      timings.each_with_index do |(post_number, time),index|
+      timings.each_with_index do |(post_number, time), index|
         unless existing.include?(index)
           PostTiming.record_new_timing(topic_id: topic_id,
-                                 post_number: post_number,
-                                 user_id: current_user.id,
-                                 msecs: time)
+                                       post_number: post_number,
+                                       user_id: current_user.id,
+                                       msecs: time)
         end
       end
     end
 
     total_changed = 0
     if timings.length > 0
-      total_changed = Notification.mark_posts_read(current_user, topic_id, timings.map{|t| t[0]})
+      total_changed = Notification.mark_posts_read(current_user, topic_id, timings.map { |t| t[0] })
     end
 
     topic_time = max_time_per_post if topic_time > max_time_per_post
 
-    TopicUser.update_last_read(current_user, topic_id, highest_seen, topic_time, opts)
+    TopicUser.update_last_read(current_user, topic_id, highest_seen, new_posts_read, topic_time, opts)
 
     if total_changed > 0
       current_user.reload
diff --git a/app/models/queued_post.rb b/app/models/queued_post.rb
index e1736c8548..50f2997541 100644
--- a/app/models/queued_post.rb
+++ b/app/models/queued_post.rb
@@ -51,7 +51,7 @@ class QueuedPost < ActiveRecord::Base
   end
 
   def create_options
-    opts = {raw: raw}
+    opts = { raw: raw }
     opts.merge!(post_options.symbolize_keys)
 
     opts[:cooking_options].symbolize_keys! if opts[:cooking_options]
@@ -62,11 +62,16 @@ class QueuedPost < ActiveRecord::Base
   def approve!(approved_by)
     created_post = nil
 
-    creator = PostCreator.new(user, create_options.merge(skip_validations: true, skip_jobs: true))
+    creator = PostCreator.new(user, create_options.merge(
+      skip_validations: true,
+      skip_jobs: true,
+      skip_events: true
+    ))
+
     QueuedPost.transaction do
       change_to!(:approved, approved_by)
 
-      UserBlocker.unblock(user, approved_by) if user.blocked?
+      UserSilencer.unsilence(user, approved_by) if user.silenced?
 
       created_post = creator.create
 
@@ -77,6 +82,7 @@ class QueuedPost < ActiveRecord::Base
 
     # Do sidekiq work outside of the transaction
     creator.enqueue_jobs
+    creator.trigger_after_events
 
     DiscourseEvent.trigger(:approved_post, self, created_post)
     created_post
@@ -102,7 +108,7 @@ class QueuedPost < ActiveRecord::Base
       end
 
       # Update the record in memory too, and clear the dirty flag
-      updates.each {|k, v| send("#{k}=", v) }
+      updates.each { |k, v| send("#{k}=", v) }
       changes_applied
 
       QueuedPost.broadcast_new! if visible?
@@ -115,7 +121,7 @@ end
 # Table name: queued_posts
 #
 #  id             :integer          not null, primary key
-#  queue          :string           not null
+#  queue          :string(255)      not null
 #  state          :integer          not null
 #  user_id        :integer          not null
 #  raw            :text             not null
diff --git a/app/models/quoted_post.rb b/app/models/quoted_post.rb
index 2bd06fce81..ecfe19e73d 100644
--- a/app/models/quoted_post.rb
+++ b/app/models/quoted_post.rb
@@ -17,8 +17,8 @@ class QuotedPost < ActiveRecord::Base
       post_number = a['data-post'].to_i
 
       next if topic_id == 0 || post_number == 0
-      next if uniq[[topic_id,post_number]]
-      uniq[[topic_id,post_number]] = true
+      next if uniq[[topic_id, post_number]]
+      uniq[[topic_id, post_number]] = true
 
       begin
         # It would be so much nicer if we used post_id in quotes
diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb
index b426030dbe..3030b4aa22 100644
--- a/app/models/remote_theme.rb
+++ b/app/models/remote_theme.rb
@@ -7,7 +7,7 @@ class RemoteTheme < ActiveRecord::Base
 
   has_one :theme
 
-  def self.import_theme(url, user=Discourse.system_user)
+  def self.import_theme(url, user = Discourse.system_user)
     importer = GitImporter.new(url)
     importer.import!
 
@@ -37,7 +37,7 @@ class RemoteTheme < ActiveRecord::Base
     self.remote_version, self.commits_behind = importer.commits_since(remote_version)
   end
 
-  def update_from_remote(importer=nil)
+  def update_from_remote(importer = nil)
     return unless remote_url
     cleanup = false
 
@@ -70,9 +70,9 @@ class RemoteTheme < ActiveRecord::Base
       end
 
       theme.set_field(target: info["target"] || :common,
-                        name: name,
-                        value: info["value"],
-                        type: info["type"] || :theme_var)
+                      name: name,
+                      value: info["value"],
+                      type: info["type"] || :theme_var)
     end
 
     Theme.targets.keys.each do |target|
diff --git a/app/models/report.rb b/app/models/report.rb
index 76c162ffb1..83f046cc36 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -14,7 +14,7 @@ class Report
     @end_date ||= Time.zone.now.end_of_day
   end
 
-  def as_json(options=nil)
+  def as_json(options = nil)
     {
      type: type,
      title: I18n.t("reports.#{type}.title"),
@@ -34,7 +34,7 @@ class Report
     singleton_class.instance_eval { define_method("report_#{name}", &block) }
   end
 
-  def self.find(type, opts=nil)
+  def self.find(type, opts = nil)
     opts ||= {}
 
     # Load the report
@@ -56,11 +56,11 @@ class Report
     report
   end
 
-  def self.req_report(report, filter=nil)
+  def self.req_report(report, filter = nil)
     data =
       if filter == :page_view_total
         ApplicationRequest.where(req_type: [
-          ApplicationRequest.req_types.reject{|k,v| k =~ /mobile/}.map{|k,v| v if k =~ /page_view/}.compact
+          ApplicationRequest.req_types.reject { |k, v| k =~ /mobile/ }.map { |k, v| v if k =~ /page_view/ }.compact
         ].flatten)
       else
         ApplicationRequest.where(req_type:  ApplicationRequest.req_types[filter])
@@ -68,18 +68,18 @@ class Report
 
     report.data = []
     data.where('date >= ? AND date <= ?', report.start_date.to_date, report.end_date.to_date)
-                    .order(date: :asc)
-                    .group(:date)
-                    .sum(:count)
-                    .each do |date, count|
+      .order(date: :asc)
+      .group(:date)
+      .sum(:count)
+      .each do |date, count|
       report.data << { x: date, y: count }
     end
 
     report.total      = data.sum(:count)
     report.prev30Days = data.where('date >= ? AND date <= ?',
                                                (report.start_date - 31.days).to_date,
-                                               (report.end_date - 31.days).to_date )
-                                        .sum(:count)
+                                               (report.end_date - 31.days).to_date)
+      .sum(:count)
   end
 
   def self.report_visits(report)
@@ -128,7 +128,7 @@ class Report
 
   def self.report_time_to_first_response(report)
     report.data = []
-    Topic.time_to_first_response_per_day(report.start_date, report.end_date, {category_id: report.category_id}).each do |r|
+    Topic.time_to_first_response_per_day(report.start_date, report.end_date, category_id: report.category_id).each do |r|
       report.data << { x: Date.parse(r["date"]), y: r["hours"].to_f.round(2) }
     end
     report.total = Topic.time_to_first_response_total(category_id: report.category_id)
@@ -175,7 +175,7 @@ class Report
   # Post action counts:
   def self.report_flags(report)
     basic_report_about report, PostAction, :flag_count_by_date, report.start_date, report.end_date, report.category_id
-    countable = PostAction.where(post_action_type_id: PostActionType.flag_types.values)
+    countable = PostAction.where(post_action_type_id: PostActionType.flag_types_without_custom.values)
     countable = countable.joins(post: :topic).where("topics.category_id = ?", report.category_id) if report.category_id
     add_counts report, countable, 'post_actions.created_at'
   end
diff --git a/app/models/rtl.rb b/app/models/rtl.rb
deleted file mode 100644
index 79f48603e0..0000000000
--- a/app/models/rtl.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-class RTL
-
-  attr_reader :user
-
-  def initialize(user)
-    @user = user
-  end
-
-  def enabled?
-    site_locale_rtl? || current_user_rtl?
-  end
-
-  def current_user_rtl?
-    SiteSetting.allow_user_locale && user.try(:locale).in?(rtl_locales)
-  end
-
-  def site_locale_rtl?
-    !SiteSetting.allow_user_locale && SiteSetting.default_locale.in?(rtl_locales)
-  end
-
-  def rtl_locales
-    %w(he ar ur fa_IR)
-  end
-
-  def css_class
-    enabled? ? 'rtl' : ''
-  end
-
-end
diff --git a/app/models/s3_region_site_setting.rb b/app/models/s3_region_site_setting.rb
index 153f92171b..8bb9513fd2 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/screened_email.rb b/app/models/screened_email.rb
index ee8b005728..74c0c9593e 100644
--- a/app/models/screened_email.rb
+++ b/app/models/screened_email.rb
@@ -18,8 +18,8 @@ class ScreenedEmail < ActiveRecord::Base
     self.email = email.downcase
   end
 
-  def self.block(email, opts={})
-    find_by_email(Email.downcase(email)) || create(opts.slice(:action_type, :ip_address).merge({email: email}))
+  def self.block(email, opts = {})
+    find_by_email(Email.downcase(email)) || create(opts.slice(:action_type, :ip_address).merge(email: email))
   end
 
   def self.should_block?(email)
@@ -30,8 +30,8 @@ class ScreenedEmail < ActiveRecord::Base
 
     max_distance = SiteSetting.levenshtein_distance_spammer_emails
     screened_email = screened_emails.select { |se| distances[se.email] <= max_distance }
-                                    .sort   { |se| distances[se.email] }
-                                    .first
+      .sort   { |se| distances[se.email] }
+      .first
 
     screened_email.record_match! if screened_email
 
@@ -46,13 +46,13 @@ class ScreenedEmail < ActiveRecord::Base
 
     (1..second.length).each do |i|
       (1..first.length).each do |j|
-        if first[j-1] == second[i-1]
-          matrix[i][j] = matrix[i-1][j-1]
+        if first[j - 1] == second[i - 1]
+          matrix[i][j] = matrix[i - 1][j - 1]
         else
           matrix[i][j] = [
-            matrix[i-1][j],
-            matrix[i][j-1],
-            matrix[i-1][j-1],
+            matrix[i - 1][j],
+            matrix[i][j - 1],
+            matrix[i - 1][j - 1],
           ].min + 1
         end
       end
@@ -67,7 +67,7 @@ end
 # Table name: screened_emails
 #
 #  id            :integer          not null, primary key
-#  email         :string           not null
+#  email         :string(255)      not null
 #  action_type   :integer          not null
 #  match_count   :integer          default(0), not null
 #  last_match_at :datetime
@@ -77,6 +77,6 @@ end
 #
 # Indexes
 #
-#  index_screened_emails_on_email          (email) UNIQUE
-#  index_screened_emails_on_last_match_at  (last_match_at)
+#  index_blocked_emails_on_email          (email) UNIQUE
+#  index_blocked_emails_on_last_match_at  (last_match_at)
 #
diff --git a/app/models/screened_ip_address.rb b/app/models/screened_ip_address.rb
index 248ad97703..f0e51ab045 100644
--- a/app/models/screened_ip_address.rb
+++ b/app/models/screened_ip_address.rb
@@ -11,7 +11,7 @@ class ScreenedIpAddress < ActiveRecord::Base
 
   validates :ip_address, ip_address_format: true, presence: true
 
-  def self.watch(ip_address, opts={})
+  def self.watch(ip_address, opts = {})
     match_for_ip_address(ip_address) || create(opts.slice(:action_type).merge(ip_address: ip_address))
   end
 
@@ -67,10 +67,10 @@ class ScreenedIpAddress < ActiveRecord::Base
     exists_for_ip_address_and_action?(ip_address, actions[:do_nothing])
   end
 
-  def self.exists_for_ip_address_and_action?(ip_address, action_type, opts={})
+  def self.exists_for_ip_address_and_action?(ip_address, action_type, opts = {})
     b = match_for_ip_address(ip_address)
-    found = (!!b and b.action_type == action_type)
-    b.record_match! if found and opts[:record_match] != false
+    found = (!!b && b.action_type == (action_type))
+    b.record_match! if found && opts[:record_match] != (false)
     found
   end
 
@@ -125,7 +125,7 @@ class ScreenedIpAddress < ActiveRecord::Base
     ScreenedIpAddress.exec_sql(star_star_subnets_query, min_count: 10, roll_up_weight: weight).values.flatten
   end
 
-  def self.roll_up(current_user=Discourse.system_user)
+  def self.roll_up(current_user = Discourse.system_user)
     # 1 - retrieve all subnets that needs roll up
     subnets = [star_subnets, star_star_subnets].flatten
 
@@ -158,9 +158,9 @@ class ScreenedIpAddress < ActiveRecord::Base
 
       # 5 - remove old matches
       ScreenedIpAddress.where(action_type: ScreenedIpAddress.actions[:block])
-                       .where("family(ip_address) = 4")
-                       .where("ip_address << ?", subnet)
-                       .delete_all
+        .where("family(ip_address) = 4")
+        .where("ip_address << ?", subnet)
+        .delete_all
     end
 
     # return the subnets
diff --git a/app/models/screened_url.rb b/app/models/screened_url.rb
index 3bd7cc1b89..be97e0d842 100644
--- a/app/models/screened_url.rb
+++ b/app/models/screened_url.rb
@@ -21,7 +21,7 @@ class ScreenedUrl < ActiveRecord::Base
     self.domain = self.domain.downcase.sub(/^www\./, '') if self.domain
   end
 
-  def self.watch(url, domain, opts={})
+  def self.watch(url, domain, opts = {})
     find_match(url) || create(opts.slice(:action_type, :ip_address).merge(url: url, domain: domain))
   end
 
@@ -42,8 +42,8 @@ end
 # Table name: screened_urls
 #
 #  id            :integer          not null, primary key
-#  url           :string           not null
-#  domain        :string           not null
+#  url           :string(255)      not null
+#  domain        :string(255)      not null
 #  action_type   :integer          not null
 #  match_count   :integer          default(0), not null
 #  last_match_at :datetime
diff --git a/app/models/search_log.rb b/app/models/search_log.rb
new file mode 100644
index 0000000000..d91b1ae7a1
--- /dev/null
+++ b/app/models/search_log.rb
@@ -0,0 +1,131 @@
+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.search_result_types
+    @search_result_types ||= Enum.new(
+      topic: 1,
+      user: 2,
+      category: 3,
+      tag: 4
+    )
+  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.term_details(term, period = :weekly, search_type = :all)
+    details = []
+
+    result = SearchLog.select("COUNT(*) AS count, created_at::date AS date")
+      .where('term LIKE ?', term)
+      .where('created_at > ?', start_of(period))
+
+    result = result.where('search_type = ?', search_types[search_type]) if search_type == :header || search_type == :full_page
+    result = result.where('search_result_id IS NOT NULL') if search_type == :click_through_only
+
+    result.group(:term)
+      .order("date")
+      .group("date")
+      .each do |record|
+        details << { x: Date.parse(record['date'].to_s), y: record['count'] }
+      end
+
+    return {
+      type: "search_log_term",
+      title: I18n.t("search_logs.graph_title"),
+      data: details
+    }
+  end
+
+  def self.trending(period = :all, search_type = :all)
+    result = SearchLog.select("term,
+       COUNT(*) AS searches,
+       SUM(CASE
+               WHEN search_result_id IS NOT NULL THEN 1
+               ELSE 0
+           END) AS click_through,
+       COUNT(DISTINCT ip_address) AS unique")
+      .where('created_at > ?', start_of(period))
+
+    result = result.where('search_type = ?', search_types[search_type]) unless search_type == :all
+    result = result.group(:term)
+      .order('COUNT(DISTINCT ip_address) DESC, COUNT(*) DESC')
+      .limit(100).to_a
+  end
+
+  def self.start_of(period)
+    case period
+    when :yearly    then 1.year.ago
+    when :monthly   then 1.month.ago
+    when :quarterly then 3.months.ago
+    when :weekly    then 1.week.ago
+    when :daily     then 1.day.ago
+    else 1000.years.ago
+    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
+#  search_result_id   :integer
+#  search_type        :integer          not null
+#  created_at         :datetime         not null
+#  search_result_type :integer
+#
diff --git a/app/models/single_sign_on_record.rb b/app/models/single_sign_on_record.rb
index df2394dbda..f6acfa9ddc 100644
--- a/app/models/single_sign_on_record.rb
+++ b/app/models/single_sign_on_record.rb
@@ -1,5 +1,7 @@
 class SingleSignOnRecord < ActiveRecord::Base
   belongs_to :user
+
+  validates :external_id, uniqueness: true
 end
 
 # == Schema Information
@@ -8,13 +10,13 @@ end
 #
 #  id                  :integer          not null, primary key
 #  user_id             :integer          not null
-#  external_id         :string           not null
+#  external_id         :string(255)      not null
 #  last_payload        :text             not null
 #  created_at          :datetime         not null
 #  updated_at          :datetime         not null
-#  external_username   :string
-#  external_email      :string
-#  external_name       :string
+#  external_username   :string(255)
+#  external_email      :string(255)
+#  external_name       :string(255)
 #  external_avatar_url :string(1000)
 #
 # Indexes
diff --git a/app/models/site.rb b/app/models/site.rb
index 37312625ba..9d90b2c1bc 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -121,7 +121,7 @@ class Site
   def self.clear_anon_cache!
     # publishing forces the sequence up
     # the cache is validated based on the sequence
-    MessageBus.publish('/site_json','')
+    MessageBus.publish('/site_json', '')
   end
 
 end
diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb
index ef88e14516..46951fa379 100644
--- a/app/models/site_setting.rb
+++ b/app/models/site_setting.rb
@@ -14,11 +14,7 @@ class SiteSetting < ActiveRecord::Base
 
   def self.load_settings(file)
     SiteSettings::YamlLoader.new(file).load do |category, name, default, opts|
-      if opts.delete(:client)
-        client_setting(name, default, opts.merge(category: category))
-      else
-        setting(name, default, opts.merge(category: category))
-      end
+      setting(name, default, opts.merge(category: category))
     end
   end
 
@@ -34,7 +30,7 @@ class SiteSetting < ActiveRecord::Base
   client_settings << :available_locales
 
   def self.available_locales
-    LocaleSiteSetting.values.map{ |e| e[:value] }.join('|')
+    LocaleSiteSetting.values.to_json
   end
 
   def self.topic_title_length
@@ -71,8 +67,8 @@ class SiteSetting < ActiveRecord::Base
 
   def self.anonymous_homepage
     top_menu_items.map { |item| item.name }
-                  .select { |item| anonymous_menu_items.include?(item) }
-                  .first
+      .select { |item| anonymous_menu_items.include?(item) }
+      .first
   end
 
   def self.should_download_images?(src)
@@ -117,6 +113,43 @@ class SiteSetting < ActiveRecord::Base
   def self.attachment_filename_blacklist_regex
     @attachment_filename_blacklist_regex ||= Regexp.union(SiteSetting.attachment_filename_blacklist.split("|"))
   end
+
+  # helpers for getting s3 settings that fallback to global
+  class Upload
+    def self.s3_cdn_url
+      SiteSetting.enable_s3_uploads ? SiteSetting.s3_cdn_url : GlobalSetting.s3_cdn_url
+    end
+
+    def self.s3_region
+      SiteSetting.enable_s3_uploads ? SiteSetting.s3_region : GlobalSetting.s3_region
+    end
+
+    def self.s3_upload_bucket
+      SiteSetting.enable_s3_uploads ? SiteSetting.s3_upload_bucket : GlobalSetting.s3_bucket
+    end
+
+    def self.enable_s3_uploads
+      SiteSetting.enable_s3_uploads || GlobalSetting.use_s3?
+    end
+
+    def self.absolute_base_url
+      bucket = SiteSetting.enable_s3_uploads ? Discourse.store.s3_bucket_name : GlobalSetting.s3_bucket
+
+      # cf. http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
+      if SiteSetting.Upload.s3_region == "us-east-1"
+        "//#{bucket}.s3.amazonaws.com"
+      elsif SiteSetting.Upload.s3_region == 'cn-north-1'
+        "//#{bucket}.s3.cn-north-1.amazonaws.com.cn"
+      else
+        "//#{bucket}.s3-#{SiteSetting.Upload.s3_region}.amazonaws.com"
+      end
+    end
+  end
+
+  def self.Upload
+    SiteSetting::Upload
+  end
+
 end
 
 # == Schema Information
@@ -124,7 +157,7 @@ end
 # Table name: site_settings
 #
 #  id         :integer          not null, primary key
-#  name       :string           not null
+#  name       :string(255)      not null
 #  data_type  :integer          not null
 #  value      :text
 #  created_at :datetime         not null
diff --git a/app/models/slug_setting.rb b/app/models/slug_setting.rb
index b2be27fcbd..86dc666d91 100644
--- a/app/models/slug_setting.rb
+++ b/app/models/slug_setting.rb
@@ -10,7 +10,7 @@ class SlugSetting < EnumSiteSetting
 
   def self.values
     VALUES.map do |l|
-      {name: l, value: l}
+      { name: l, value: l }
     end
   end
 
diff --git a/app/models/stylesheet_cache.rb b/app/models/stylesheet_cache.rb
index 2c568072cb..0d318ce0db 100644
--- a/app/models/stylesheet_cache.rb
+++ b/app/models/stylesheet_cache.rb
@@ -3,21 +3,26 @@ class StylesheetCache < ActiveRecord::Base
 
   MAX_TO_KEEP = 50
 
-  def self.add(target,digest,content,source_map)
+  def self.add(target, digest, content, source_map)
+    old_logger = ActiveRecord::Base.logger
 
     return false if where(target: target, digest: digest).exists?
 
+    if Rails.env.development?
+      ActiveRecord::Base.logger = nil
+    end
+
     success = create(target: target, digest: digest, content: content, source_map: source_map)
 
     count = StylesheetCache.count
     if count > MAX_TO_KEEP
 
       remove_lower = StylesheetCache
-                     .where(target: target)
-                     .limit(MAX_TO_KEEP)
-                     .order('id desc')
-                     .pluck(:id)
-                     .last
+        .where(target: target)
+        .limit(MAX_TO_KEEP)
+        .order('id desc')
+        .pluck(:id)
+        .last
 
       exec_sql("DELETE FROM stylesheet_cache where id < :id", id: remove_lower)
     end
@@ -25,6 +30,10 @@ class StylesheetCache < ActiveRecord::Base
     success
   rescue ActiveRecord::RecordNotUnique
     false
+  ensure
+    if Rails.env.development? && old_logger
+      ActiveRecord::Base.logger = old_logger
+    end
   end
 
 end
@@ -34,8 +43,8 @@ end
 # Table name: stylesheet_cache
 #
 #  id         :integer          not null, primary key
-#  target     :string           not null
-#  digest     :string           not null
+#  target     :string(255)      not null
+#  digest     :string(255)      not null
 #  content    :text             not null
 #  created_at :datetime
 #  updated_at :datetime
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 95a944776c..7d5b4f4139 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -1,4 +1,6 @@
 class Tag < ActiveRecord::Base
+  include Searchable
+
   validates :name, presence: true, uniqueness: true
 
   has_many :tag_users # notification settings
@@ -12,29 +14,31 @@ class Tag < ActiveRecord::Base
   has_many :tag_group_memberships
   has_many :tag_groups, through: :tag_group_memberships
 
-  COUNT_ARG = "topic_tags.id"
+  after_save :index_search
+
+  COUNT_ARG = "topics.id"
 
   # Apply more activerecord filters to the tags_by_count_query, and then
   # fetch the result with .count(Tag::COUNT_ARG).
   #
   # e.g., Tag.tags_by_count_query.where("topics.category_id = ?", category.id).count(Tag::COUNT_ARG)
-  def self.tags_by_count_query(opts={})
+  def self.tags_by_count_query(opts = {})
     q = Tag.joins("LEFT JOIN topic_tags ON tags.id = topic_tags.tag_id")
-           .joins("LEFT JOIN topics ON topics.id = topic_tags.topic_id")
-           .group("tags.id, tags.name")
-           .order('count_topic_tags_id DESC')
+      .joins("LEFT JOIN topics ON topics.id = topic_tags.topic_id AND topics.deleted_at IS NULL")
+      .group("tags.id, tags.name")
+      .order('count_topics_id DESC')
     q = q.limit(opts[:limit]) if opts[:limit]
     q
   end
 
-  def self.category_tags_by_count_query(category, opts={})
+  def self.category_tags_by_count_query(category, opts = {})
     tags_by_count_query(opts).where("tags.id in (select tag_id from category_tags where category_id = ?)", category.id)
-                             .where("topics.category_id = ?", category.id)
+      .where("topics.category_id = ?", category.id)
   end
 
   def self.top_tags(limit_arg: nil, category: nil, guardian: nil)
     limit = limit_arg || SiteSetting.max_tags_in_filter_list
-    scope_category_ids = (guardian||Guardian.new).allowed_category_ids
+    scope_category_ids = (guardian || Guardian.new).allowed_category_ids
 
     if category
       scope_category_ids &= ([category.id] + category.subcategories.pluck(:id))
@@ -46,7 +50,7 @@ class Tag < ActiveRecord::Base
       category: category
     )
 
-    tags.count(COUNT_ARG).map {|name, _| name}
+    tags.count(COUNT_ARG).map { |name, _| name }
   end
 
   def self.include_tags?
@@ -56,6 +60,10 @@ class Tag < ActiveRecord::Base
   def full_url
     "#{Discourse.base_url}/tags/#{self.name}"
   end
+
+  def index_search
+    SearchIndexer.index(self)
+  end
 end
 
 # == Schema Information
diff --git a/app/models/tag_search_data.rb b/app/models/tag_search_data.rb
new file mode 100644
index 0000000000..d853da634b
--- /dev/null
+++ b/app/models/tag_search_data.rb
@@ -0,0 +1,18 @@
+class TagSearchData < ActiveRecord::Base
+  include HasSearchData
+end
+
+# == Schema Information
+#
+# Table name: tag_search_data
+#
+#  tag_id      :integer          not null, primary key
+#  search_data :tsvector
+#  raw_data    :text
+#  locale      :text
+#  version     :integer          default(0)
+#
+# Indexes
+#
+#  idx_search_tag  (search_data)
+#
diff --git a/app/models/theme.rb b/app/models/theme.rb
index ab1fceb91f..5fc90241d9 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -28,15 +28,13 @@ class Theme < ActiveRecord::Base
     changed_fields.each(&:save!)
     changed_fields.clear
 
-    Theme.expire_site_cache! if user_selectable_changed?
+    Theme.expire_site_cache! if saved_change_to_user_selectable? || saved_change_to_name?
 
     @dependant_themes = nil
     @included_themes = nil
-  end
 
-  after_save do
     remove_from_cache!
-    notify_scheme_change if color_scheme_id_changed?
+    notify_scheme_change if saved_change_to_color_scheme_id?
   end
 
   after_destroy do
@@ -46,16 +44,17 @@ class Theme < ActiveRecord::Base
     end
 
     if self.id
-
       ColorScheme
         .where(theme_id: self.id)
         .where("id NOT IN (SELECT color_scheme_id FROM themes where color_scheme_id IS NOT NULL)")
-               .destroy_all
+        .destroy_all
 
       ColorScheme
         .where(theme_id: self.id)
         .update_all(theme_id: nil)
     end
+
+    Theme.expire_site_cache!
   end
 
   after_commit ->(theme) do
@@ -114,7 +113,7 @@ class Theme < ActiveRecord::Base
     (@cache[cache_key] = val || "").html_safe
   end
 
-  def self.remove_from_cache!(themes=nil)
+  def self.remove_from_cache!(themes = nil)
     clear_cache!
   end
 
@@ -122,13 +121,11 @@ class Theme < ActiveRecord::Base
     @cache.clear
   end
 
-
   def self.targets
     @targets ||= Enum.new(common: 0, desktop: 1, mobile: 2)
   end
 
-
-  def notify_scheme_change(clear_manager_cache=true)
+  def notify_scheme_change(clear_manager_cache = true)
     Stylesheet::Manager.cache.clear if clear_manager_cache
     message = refresh_message_for_targets(["desktop", "mobile", "admin"], self)
     MessageBus.publish('/file-change', message)
@@ -140,7 +137,7 @@ class Theme < ActiveRecord::Base
     themes = [self] + dependant_themes
 
     message = themes.map do |theme|
-      refresh_message_for_targets([:mobile_theme,:desktop_theme], theme)
+      refresh_message_for_targets([:mobile_theme, :desktop_theme], theme)
     end.compact.flatten
     MessageBus.publish('/file-change', message)
   end
@@ -168,7 +165,7 @@ class Theme < ActiveRecord::Base
 
   def resolve_dependant_themes(direction)
 
-    select_field,where_field=nil
+    select_field, where_field = nil
 
     if direction == :up
       select_field = "parent_theme_id"
@@ -212,7 +209,7 @@ class Theme < ActiveRecord::Base
   end
 
   def resolve_baked_field(target, name)
-    list_baked_fields(target,name).map{|f| f.value_baked || f.value}.join("\n")
+    list_baked_fields(target, name).map { |f| f.value_baked || f.value }.join("\n")
   end
 
   def list_baked_fields(target, name)
@@ -221,12 +218,15 @@ class Theme < ActiveRecord::Base
 
     theme_ids = [self.id] + (included_themes.map(&:id) || [])
     fields = ThemeField.where(target_id: [Theme.targets[target], Theme.targets[:common]])
-                       .where(name: name.to_s)
-                       .includes(:theme)
-                       .joins("JOIN (
-                             SELECT #{theme_ids.map.with_index{|id,idx| "#{id} AS theme_id, #{idx} AS sort_column"}.join(" UNION ALL SELECT ")}
-                            ) as X ON X.theme_id = theme_fields.theme_id")
-                       .order('sort_column, target_id')
+      .where(name: name.to_s)
+      .includes(:theme)
+      .joins("
+        JOIN (
+          SELECT #{theme_ids.map.with_index { |id, idx| "#{id} AS theme_id, #{idx} AS sort_column" }.join(" UNION ALL SELECT ")}
+        ) as X ON X.theme_id = theme_fields.theme_id"
+      )
+      .order('sort_column, target_id')
+
     fields.each(&:ensure_baked!)
     fields
   end
@@ -254,7 +254,7 @@ class Theme < ActiveRecord::Base
 
     value ||= ""
 
-    field = theme_fields.find{|f| f.name==name && f.target_id == target_id && f.type_id == type_id}
+    field = theme_fields.find { |f| f.name == name && f.target_id == target_id && f.type_id == type_id }
     if field
       if value.blank? && !upload_id
         theme_fields.delete field.destroy
@@ -270,6 +270,18 @@ class Theme < ActiveRecord::Base
     end
   end
 
+  def all_theme_variables
+    fields = {}
+    ([self] + (included_themes || [])).each do |theme|
+      theme&.theme_fields.each do |field|
+        next unless ThemeField.theme_var_type_ids.include?(field.type_id)
+        next if fields.key?(field.name)
+        fields[field.name] = field
+      end
+    end
+    fields.values
+  end
+
   def add_child_theme!(theme)
     child_theme_relation.create!(child_theme_id: theme.id)
     @included_themes = nil
@@ -283,9 +295,9 @@ end
 # Table name: themes
 #
 #  id               :integer          not null, primary key
-#  name             :string           not null
+#  name             :string(255)      not null
 #  user_id          :integer          not null
-#  key              :string           not null
+#  key              :string(255)      not null
 #  created_at       :datetime         not null
 #  updated_at       :datetime         not null
 #  compiler_version :integer          default(0), not null
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index 928a175609..386b0fb903 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -11,15 +11,18 @@ class ThemeField < ActiveRecord::Base
   end
 
   def self.theme_var_type_ids
-    @theme_var_type_ids ||= [2,3,4]
+    @theme_var_type_ids ||= [2, 3, 4]
   end
 
+  validates :name, format: { with: /\A[a-z_][a-z0-9_-]*\z/i },
+                   if: Proc.new { |field| ThemeField.theme_var_type_ids.include?(field.type_id) }
+
   COMPILER_VERSION = 5
 
   belongs_to :theme
 
   def transpile(es6_source, version)
-    template  = Tilt::ES6ModuleTranspilerTemplate.new {}
+    template = Tilt::ES6ModuleTranspilerTemplate.new {}
     wrapped = <<PLUGIN_API_JS
 Discourse._registerPluginCode('#{version}', api => {
   #{es6_source}
@@ -37,7 +40,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() {
@@ -90,15 +93,16 @@ COMPILED
     @scss_fields ||= %w(scss embedded_scss)
   end
 
-
   def ensure_baked!
     if ThemeField.html_fields.include?(self.name)
       if !self.value_baked || compiler_version != COMPILER_VERSION
-
         self.value_baked, self.error = process_html(self.value)
         self.compiler_version = COMPILER_VERSION
 
-        if self.value_baked_changed? || compiler_version.changed? || self.error_changed?
+        if self.will_save_change_to_value_baked? ||
+           self.will_save_change_to_compiler_version? ||
+           self.will_save_change_to_error?
+
           self.update_columns(value_baked: value_baked,
                               compiler_version: compiler_version,
                               error: error)
@@ -120,10 +124,9 @@ COMPILED
         self.error = e.message
       end
 
-      if error_changed?
+      if will_save_change_to_error?
         update_columns(error: self.error)
       end
-
     end
   end
 
@@ -132,7 +135,7 @@ COMPILED
   end
 
   before_save do
-    if value_changed? && !value_baked_changed?
+    if will_save_change_to_value? && !will_save_change_to_value_baked?
       self.value_baked = nil
     end
   end
diff --git a/app/models/top_topic.rb b/app/models/top_topic.rb
index 6172f7cf0a..709148167c 100644
--- a/app/models/top_topic.rb
+++ b/app/models/top_topic.rb
@@ -16,7 +16,7 @@ class TopTopic < ActiveRecord::Base
 
   # We don't have to refresh these as often
   def self.refresh_older!
-    older_periods = periods - [:daily,:all]
+    older_periods = periods - [:daily, :all]
 
     transaction do
       older_periods.each do |period|
@@ -32,7 +32,6 @@ class TopTopic < ActiveRecord::Base
     refresh_older!
   end
 
-
   def self.periods
     @@periods ||= [:all, :yearly, :quarterly, :monthly, :weekly, :daily].freeze
   end
@@ -203,11 +202,11 @@ class TopTopic < ActiveRecord::Base
 
   def self.start_of(period)
     case period
-      when :yearly    then 1.year.ago
-      when :monthly   then 1.month.ago
-      when :quarterly then 3.months.ago
-      when :weekly    then 1.week.ago
-      when :daily     then 1.day.ago
+    when :yearly    then 1.year.ago
+    when :monthly   then 1.month.ago
+    when :quarterly then 3.months.ago
+    when :weekly    then 1.week.ago
+    when :daily     then 1.day.ago
     end
   end
 
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 8533894aa0..b6138ac975 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -7,7 +7,10 @@ require_dependency 'text_cleaner'
 require_dependency 'archetype'
 require_dependency 'html_prettify'
 require_dependency 'discourse_tagging'
-require_dependency 'search'
+require_dependency 'search_indexer'
+require_dependency 'list_controller'
+require_dependency 'topic_posters_summary'
+require_dependency 'topic_featured_users'
 
 class Topic < ActiveRecord::Base
   class UserExists < StandardError; end
@@ -15,6 +18,7 @@ class Topic < ActiveRecord::Base
   include RateLimiter::OnCreateRecord
   include HasCustomFields
   include Trashable
+  include Searchable
   include LimitedEdit
   extend Forwardable
 
@@ -29,15 +33,27 @@ class Topic < ActiveRecord::Base
 
   attr_accessor :allowed_user_ids, :tags_changed
 
+  DiscourseEvent.on(:site_setting_saved) do |site_setting|
+    if site_setting.name.to_s == "slug_generation_method" && site_setting.saved_change_to_value?
+      Scheduler::Defer.later("Null topic slug") do
+        Topic.update_all(slug: nil)
+      end
+    end
+  end
+
   def self.max_sort_order
-    @max_sort_order ||= (2 ** 31) - 1
+    @max_sort_order ||= (2**31) - 1
+  end
+
+  def self.max_fancy_title_length
+    400
   end
 
   def featured_users
     @featured_users ||= TopicFeaturedUsers.new(self)
   end
 
-  def trash!(trashed_by=nil)
+  def trash!(trashed_by = nil)
     update_category_topic_count_by(-1) if deleted_at.nil?
     super(trashed_by)
     update_flagged_posts_count
@@ -57,37 +73,38 @@ class Topic < ActiveRecord::Base
   rate_limit :limit_topics_per_day
   rate_limit :limit_private_messages_per_day
 
-  validates :title, :if => Proc.new { |t| t.new_record? || t.title_changed? },
-                    :presence => true,
-                    :topic_title_length => true,
-                    :censored_words => true,
-                    :quality_title => { :unless => :private_message? },
-                    :unique_among  => { :unless => Proc.new { |t| (SiteSetting.allow_duplicate_topic_titles? || t.private_message?) },
-                                        :message => :has_already_been_used,
-                                        :allow_blank => true,
-                                        :case_sensitive => false,
-                                        :collection => Proc.new{ Topic.listable_topics } }
+  validates :title, if: Proc.new { |t| t.new_record? || t.title_changed? },
+                    presence: true,
+                    topic_title_length: true,
+                    censored_words: true,
+                    quality_title: { unless: :private_message? },
+                    unique_among: { unless: Proc.new { |t| (SiteSetting.allow_duplicate_topic_titles? || t.private_message?) },
+                                    message: :has_already_been_used,
+                                    allow_blank: true,
+                                    case_sensitive: false,
+                                    collection: Proc.new { Topic.listable_topics } }
 
   validates :category_id,
-            :presence => true,
-            :exclusion => {
-              :in => Proc.new{[SiteSetting.uncategorized_category_id]}
+            presence: true,
+            exclusion: {
+              in: Proc.new { [SiteSetting.uncategorized_category_id] }
             },
-            :if => Proc.new { |t|
-                   (t.new_record? || t.category_id_changed?) &&
-                   !SiteSetting.allow_uncategorized_topics &&
-                   (t.archetype.nil? || t.archetype == Archetype.default) &&
-                   (!t.user_id || !t.user.staff?)
+            if: Proc.new { |t|
+              (t.new_record? || t.category_id_changed?) &&
+              !SiteSetting.allow_uncategorized_topics &&
+              (t.archetype.nil? || t.archetype == Archetype.default) &&
+              (!t.user_id || !t.user.staff?)
             }
 
-  validates :featured_link, allow_nil: true, format: URI::regexp(%w(http https))
+  validates :featured_link, allow_nil: true, url: true
   validate if: :featured_link do
-    errors.add(:featured_link, :invalid_category) unless !featured_link_changed? || Guardian.new.can_edit_featured_link?(category_id)
+    errors.add(:featured_link, :invalid_category) unless !featured_link_changed? ||
+      Guardian.new.can_edit_featured_link?(category_id)
   end
 
   before_validation do
     self.title = TextCleaner.clean_title(TextSentinel.title_sentinel(title).text) if errors[:title].empty?
-    self.featured_link.strip! if self.featured_link
+    self.featured_link = self.featured_link.strip.presence if self.featured_link
   end
 
   belongs_to :category
@@ -100,8 +117,8 @@ class Topic < ActiveRecord::Base
   has_many :group_archived_messages, dependent: :destroy
   has_many :user_archived_messages, dependent: :destroy
 
-  has_many :allowed_group_users, through: :allowed_groups, source: :users
   has_many :allowed_groups, through: :topic_allowed_groups, source: :group
+  has_many :allowed_group_users, through: :allowed_groups, source: :users
   has_many :allowed_users, through: :topic_allowed_users, source: :user
   has_many :queued_posts
 
@@ -124,8 +141,8 @@ class Topic < ActiveRecord::Base
   has_many :topic_timers, dependent: :destroy
 
   has_one :user_warning
-  has_one :first_post, -> {where post_number: 1}, class_name: Post
-
+  has_one :first_post, -> { where post_number: 1 }, class_name: 'Post'
+  has_one :topic_search_data
   has_one :topic_embed, dependent: :destroy
 
   # When we want to temporarily attach some data to a forum topic (usually before serialization)
@@ -152,7 +169,7 @@ class Topic < ActiveRecord::Base
 
   scope :created_since, lambda { |time_ago| where('topics.created_at > ?', time_ago) }
 
-  scope :secured, lambda { |guardian=nil|
+  scope :secured, lambda { |guardian = nil|
     ids = guardian.secure_category_ids if guardian
 
     # Query conditions
@@ -195,7 +212,7 @@ class Topic < ActiveRecord::Base
   after_save do
     banner = "banner".freeze
 
-    if archetype_was == banner || archetype == banner
+    if archetype_before_last_save == banner || archetype == banner
       ApplicationController.banner_json_cache.clear
     end
 
@@ -215,7 +232,8 @@ class Topic < ActiveRecord::Base
   end
 
   def inherit_auto_close_from_category
-    if !@ignore_category_auto_close &&
+    if !self.closed &&
+       !@ignore_category_auto_close &&
        self.category &&
        self.category.auto_close_hours &&
        !public_topic_timer&.execute_at
@@ -242,10 +260,10 @@ class Topic < ActiveRecord::Base
     end
   end
 
-  def self.visible_post_types(viewed_by=nil)
+  def self.visible_post_types(viewed_by = nil)
     types = Post.types
     result = [types[:regular], types[:moderator_action], types[:small_action]]
-    result << types[:whisper] if viewed_by.try(:staff?)
+    result << types[:whisper] if viewed_by&.staff?
     result
   end
 
@@ -266,9 +284,9 @@ class Topic < ActiveRecord::Base
   end
 
   def has_flags?
-    FlagQuery.flagged_post_actions("active")
-             .where("topics.id" => id)
-             .exists?
+    FlagQuery.flagged_post_actions(filter: "active")
+      .where("topics.id" => id)
+      .exists?
   end
 
   def is_official_warning?
@@ -298,18 +316,18 @@ class Topic < ActiveRecord::Base
   def self.fancy_title(title)
     escaped = ERB::Util.html_escape(title)
     return unless escaped
-    Emoji.unicode_unescape(HtmlPrettify.render(escaped))
+    fancy_title = Emoji.unicode_unescape(HtmlPrettify.render(escaped))
+    fancy_title.length > Topic.max_fancy_title_length ? title : fancy_title
   end
 
   def fancy_title
     return ERB::Util.html_escape(title) unless SiteSetting.title_fancy_entities?
 
     unless fancy_title = read_attribute(:fancy_title)
-
       fancy_title = Topic.fancy_title(title)
       write_attribute(:fancy_title, fancy_title)
 
-      unless new_record?
+      if !new_record? && !Discourse.readonly_mode?
         # make sure data is set in table, this also allows us to change algorithm
         # by simply nulling this column
         exec_sql("UPDATE topics SET fancy_title = :fancy_title where id = :id", id: self.id, fancy_title: fancy_title)
@@ -324,21 +342,22 @@ class Topic < ActiveRecord::Base
   end
 
   # Returns hot topics since a date for display in email digest.
-  def self.for_digest(user, since, opts=nil)
+  def self.for_digest(user, since, opts = nil)
     opts = opts || {}
     score = "#{ListController.best_period_for(since)}_score"
 
     topics = Topic
-              .visible
-              .secured(Guardian.new(user))
-              .joins("LEFT OUTER JOIN topic_users ON topic_users.topic_id = topics.id AND topic_users.user_id = #{user.id.to_i}")
-              .joins("LEFT OUTER JOIN category_users ON category_users.category_id = topics.category_id AND category_users.user_id = #{user.id.to_i}")
-              .joins("LEFT OUTER JOIN users ON users.id = topics.user_id")
-              .where(closed: false, archived: false)
-              .where("COALESCE(topic_users.notification_level, 1) <> ?", TopicUser.notification_levels[:muted])
-              .created_since(since)
-              .listable_topics
-              .includes(:category)
+      .visible
+      .secured(Guardian.new(user))
+      .joins("LEFT OUTER JOIN topic_users ON topic_users.topic_id = topics.id AND topic_users.user_id = #{user.id.to_i}")
+      .joins("LEFT OUTER JOIN category_users ON category_users.category_id = topics.category_id AND category_users.user_id = #{user.id.to_i}")
+      .joins("LEFT OUTER JOIN users ON users.id = topics.user_id")
+      .where(closed: false, archived: false)
+      .where("COALESCE(topic_users.notification_level, 1) <> ?", TopicUser.notification_levels[:muted])
+      .created_since(since)
+      .where('topics.created_at < ?', (SiteSetting.editing_grace_period || 0).seconds.ago)
+      .listable_topics
+      .includes(:category)
 
     unless opts[:include_tl0] || user.user_option.try(:include_tl0_in_digests)
       topics = topics.where("COALESCE(users.trust_level, 0) > 0")
@@ -346,7 +365,7 @@ class Topic < ActiveRecord::Base
 
     if !!opts[:top_order]
       topics = topics.joins("LEFT OUTER JOIN top_topics ON top_topics.topic_id = topics.id")
-                     .order(TopicQuerySQL.order_top_with_notification_levels(score))
+        .order(TopicQuerySQL.order_top_with_notification_levels(score))
     end
 
     if opts[:limit]
@@ -372,15 +391,18 @@ 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
   end
 
   # Using the digest query, figure out what's  new for a user since last seen
-  def self.new_since_last_seen(user, since, featured_topic_ids=nil)
+  def self.new_since_last_seen(user, since, featured_topic_ids = nil)
     topics = Topic.for_digest(user, since)
     featured_topic_ids ? topics.where("topics.id NOT IN (?)", featured_topic_ids) : topics
   end
@@ -398,9 +420,10 @@ class Topic < ActiveRecord::Base
     save
   end
 
-  def reload(options=nil)
+  def reload(options = nil)
     @post_numbers = nil
     @public_topic_timer = nil
+    @private_topic_timer = nil
     super(options)
   end
 
@@ -420,7 +443,7 @@ class Topic < ActiveRecord::Base
     custom_fields[key.to_s]
   end
 
-  def self.listable_count_per_day(start_date, end_date, category_id=nil)
+  def self.listable_count_per_day(start_date, end_date, category_id = nil)
     result = listable_topics.where('created_at >= ? and created_at <= ?', start_date, end_date)
     result = result.where(category_id: category_id) if category_id
     result.group('date(created_at)').order('date(created_at)').count
@@ -430,52 +453,56 @@ class Topic < ActiveRecord::Base
     archetype == Archetype.private_message
   end
 
-  MAX_SIMILAR_BODY_LENGTH = 200
-  # Search for similar topics
-  def self.similar_to(title, raw, user=nil)
-    return [] unless title.present?
-    return [] unless raw.present?
+  MAX_SIMILAR_BODY_LENGTH ||= 200
 
-    filter_words = Search.prepare_data(title + " " + raw[0...MAX_SIMILAR_BODY_LENGTH]);
+  def self.similar_to(title, raw, user = nil)
+    return [] if title.blank?
+    raw = raw.presence || ""
+
+    search_data = "#{title} #{raw[0...MAX_SIMILAR_BODY_LENGTH]}".strip
+    filter_words = Search.prepare_data(search_data)
     ts_query = Search.ts_query(filter_words, nil, "|")
 
-    # Exclude category definitions from similar topic suggestions
-
-    candidates = Topic.visible
-       .secured(Guardian.new(user))
-       .listable_topics
-       .joins('JOIN topic_search_data s ON topics.id = s.topic_id')
-       .where("search_data @@ #{ts_query}")
-       .order("ts_rank(search_data, #{ts_query}) DESC")
-       .limit(SiteSetting.max_similar_results * 3)
-
-    exclude_topic_ids = Category.pluck(:topic_id).compact!
-    if exclude_topic_ids.present?
-      candidates = candidates.where("topics.id NOT IN (?)", exclude_topic_ids)
-    end
+    candidates = Topic
+      .visible
+      .listable_topics
+      .secured(Guardian.new(user))
+      .joins("JOIN topic_search_data s ON topics.id = s.topic_id")
+      .joins("LEFT JOIN categories c ON topics.id = c.topic_id")
+      .where("search_data @@ #{ts_query}")
+      .where("c.topic_id IS NULL")
+      .order("ts_rank(search_data, #{ts_query}) DESC")
+      .limit(SiteSetting.max_similar_results * 3)
 
     candidate_ids = candidates.pluck(:id)
 
-    return [] unless candidate_ids.present?
+    return [] if candidate_ids.blank?
 
-    similar = Topic.select(sanitize_sql_array(["topics.*, similarity(topics.title, :title) + similarity(topics.title, :raw) AS similarity, p.cooked as blurb", title: title, raw: raw]))
-                     .joins("JOIN posts AS p ON p.topic_id = topics.id AND p.post_number = 1")
-                     .limit(SiteSetting.max_similar_results)
-                     .where("topics.id IN (?)", candidate_ids)
-                     .where("similarity(topics.title, :title) + similarity(topics.title, :raw) > 0.2", raw: raw, title: title)
-                     .order('similarity desc')
+    similars = Topic
+      .joins("JOIN posts AS p ON p.topic_id = topics.id AND p.post_number = 1")
+      .where("topics.id IN (?)", candidate_ids)
+      .order("similarity DESC")
+      .limit(SiteSetting.max_similar_results)
 
-    similar
+    if raw.present?
+      similars
+        .select(sanitize_sql_array(["topics.*, similarity(topics.title, :title) + similarity(p.raw, :raw) AS similarity, p.cooked AS blurb", title: title, raw: raw]))
+        .where("similarity(topics.title, :title) + similarity(p.raw, :raw) > 0.2", title: title, raw: raw)
+    else
+      similars
+        .select(sanitize_sql_array(["topics.*, similarity(topics.title, :title) AS similarity, p.cooked AS blurb", title: title]))
+        .where("similarity(topics.title, :title) > 0.2", title: title)
+    end
   end
 
-  def update_status(status, enabled, user, opts={})
+  def update_status(status, enabled, user, opts = {})
     TopicStatusUpdater.new(self, user).update!(status, enabled, opts)
     DiscourseEvent.trigger(:topic_status_updated, self.id, status, enabled)
   end
 
   # Atomically creates the next post number
   def self.next_post_number(topic_id, reply = false, whisper = false)
-    highest = exec_sql("select coalesce(max(post_number),0) as max from posts where topic_id = ?", topic_id).first['max'].to_i
+    highest = exec_sql("SELECT coalesce(max(post_number),0) AS max FROM posts WHERE topic_id = ?", topic_id).first['max'].to_i
 
     if whisper
 
@@ -501,7 +528,6 @@ class Topic < ActiveRecord::Base
     end
   end
 
-
   def self.reset_all_highest!
     exec_sql <<SQL
 WITH
@@ -539,7 +565,6 @@ WHERE
 SQL
   end
 
-
   # If a post is deleted we have to update our highest post counters
   def self.reset_highest(topic_id)
     result = exec_sql "UPDATE topics
@@ -589,7 +614,7 @@ SQL
   end
 
   # This calculates the geometric mean of the posts and stores it with the topic
-  def self.calculate_avg_time(min_topic_age=nil)
+  def self.calculate_avg_time(min_topic_age = nil)
     builder = SqlBuilder.new("UPDATE topics
               SET avg_time = x.gmean
               FROM (SELECT topic_id,
@@ -628,19 +653,19 @@ SQL
 
       Category.where(id: new_category.id).update_all("topic_count = topic_count + 1")
       CategoryFeaturedTopic.feature_topics_for(old_category) unless @import_mode
-      CategoryFeaturedTopic.feature_topics_for(new_category) unless @import_mode || old_category.id == new_category.id
+      CategoryFeaturedTopic.feature_topics_for(new_category) unless @import_mode || old_category.try(:id) == new_category.id
     end
 
     true
   end
 
-  def add_small_action(user, action_code, who=nil)
+  def add_small_action(user, action_code, who = nil)
     custom_fields = {}
     custom_fields["action_code_who"] = who if who.present?
     add_moderator_post(user, nil, post_type: Post.types[:small_action], action_code: action_code, custom_fields: custom_fields)
   end
 
-  def add_moderator_post(user, text, opts=nil)
+  def add_moderator_post(user, text, opts = nil)
     opts ||= {}
     new_post = nil
     creator = PostCreator.new(user,
@@ -696,14 +721,21 @@ SQL
   end
 
   def remove_allowed_user(removed_by, username)
-    if user = User.find_by(username: username)
+    user = username.is_a?(User) ? username : User.find_by(username: username)
+
+    if user
       topic_user = topic_allowed_users.find_by(user_id: user.id)
+
       if topic_user
         topic_user.destroy
-        # we can not remove ourselves cause then we will end up adding
-        # ourselves in add_small_action
-        removed_by = Discourse.system_user if user.id == removed_by&.id
-        add_small_action(removed_by, "removed_user", user.username)
+
+        if user.id == removed_by&.id
+          removed_by = Discourse.system_user
+          add_small_action(removed_by, "user_left", user.username)
+        else
+          add_small_action(removed_by, "removed_user", user.username)
+        end
+
         return true
       end
     end
@@ -719,16 +751,35 @@ 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
   end
 
   # 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)
+  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 +797,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
@@ -773,16 +833,16 @@ SQL
     end
   end
 
-  def invite_by_email(invited_by, email, group_ids=nil, custom_message=nil)
+  def invite_by_email(invited_by, email, group_ids = nil, custom_message = nil)
     Invite.invite_by_email(email, invited_by, self, group_ids, custom_message)
   end
 
   def email_already_exists_for?(invite)
-    invite.email_already_exists and private_message?
+    invite.email_already_exists && private_message?
   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
 
@@ -877,7 +937,7 @@ SQL
     slug = Slug.for(t.to_s)
     write_attribute(:slug, slug)
     write_attribute(:fancy_title, nil)
-    write_attribute(:title,t)
+    write_attribute(:title, t)
   end
 
   # NOTE: These are probably better off somewhere else.
@@ -886,7 +946,7 @@ SQL
     "#{Discourse.base_uri}/t/#{slug}/#{id}/#{posts_count}"
   end
 
-  def self.url(id, slug, post_number=nil)
+  def self.url(id, slug, post_number = nil)
     url = "#{Discourse.base_url}/t/#{slug}/#{id}"
     url << "/#{post_number}" if post_number.to_i > 1
     url
@@ -896,7 +956,7 @@ SQL
     self.class.url id, slug, post_number
   end
 
-  def self.relative_url(id, slug, post_number=nil)
+  def self.relative_url(id, slug, post_number = nil)
     url = "#{Discourse.base_uri}/t/"
     url << "#{slug}/" if slug.present?
     url << id.to_s
@@ -904,11 +964,11 @@ SQL
     url
   end
 
-  def slugless_url(post_number=nil)
+  def slugless_url(post_number = nil)
     Topic.relative_url(id, nil, post_number)
   end
 
-  def relative_url(post_number=nil)
+  def relative_url(post_number = nil)
     Topic.relative_url(id, slug, post_number)
   end
 
@@ -926,7 +986,7 @@ SQL
     TopicUser.change(user.id, id, cleared_pinned_at: nil)
   end
 
-  def update_pinned(status, global=false, pinned_until=nil)
+  def update_pinned(status, global = false, pinned_until = nil)
     pinned_until = Time.parse(pinned_until) rescue nil
 
     update_columns(
@@ -962,27 +1022,34 @@ SQL
     @public_topic_timer ||= topic_timers.find_by(deleted_at: nil, public_type: true)
   end
 
+  def private_topic_timer(user)
+    @private_topic_Timer ||= topic_timers.find_by(deleted_at: nil, public_type: false, user_id: user.id)
+  end
+
+  def delete_topic_timer(status_type, by_user: Discourse.system_user)
+    options = { status_type: status_type }
+    options.merge!(user: by_user) unless TopicTimer.public_types[status_type]
+    self.topic_timers.find_by(options)&.trash!(by_user)
+    nil
+  end
+
   # 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.
   # Options:
   #  * by_user: User who is setting the topic's status update.
-  #  * timezone_offset: (Integer) offset from UTC in minutes of the given argument.
   #  * 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.merge!(user: by_user) unless TopicTimer.public_types[status_type]
-    topic_timer = TopicTimer.find_or_initialize_by(topic_timer_options)
+  def set_or_create_timer(status_type, time, by_user: nil, based_on_last_post: false, category_id: SiteSetting.uncategorized_category_id)
+    return delete_topic_timer(status_type, by_user: by_user) if time.blank?
 
-    if time.blank?
-      topic_timer.trash!(trashed_by: by_user || Discourse.system_user)
-      return
-    end
+    public_topic_timer = !!TopicTimer.public_types[status_type]
+    topic_timer_options = { topic: self, public_type: public_topic_timer }
+    topic_timer_options.merge!(user: by_user) unless public_topic_timer
+    topic_timer = TopicTimer.find_or_initialize_by(topic_timer_options)
+    topic_timer.status_type = status_type
 
     time_now = Time.zone.now
     topic_timer.based_on_last_post = !based_on_last_post.blank?
@@ -1007,7 +1074,6 @@ SQL
       if is_timestamp && time.include?("-") && timestamp = utc.parse(time)
         # a timestamp in client's time zone, like "2015-5-27 12:00"
         topic_timer.execute_at = timestamp
-        topic_timer.execute_at += timezone_offset * 60 if timezone_offset
         topic_timer.errors.add(:execute_at, :invalid) if timestamp < now
       else
         num_hours = time.to_f
@@ -1106,7 +1172,7 @@ SQL
     ) t
   SQL
 
-  def self.time_to_first_response(sql, opts=nil)
+  def self.time_to_first_response(sql, opts = nil)
     opts ||= {}
     builder = SqlBuilder.new(sql)
     builder.where("t.created_at >= :start_date", start_date: opts[:start_date]) if opts[:start_date]
@@ -1117,17 +1183,17 @@ SQL
     builder.where("p.deleted_at IS NULL")
     builder.where("p.post_number > 1")
     builder.where("p.user_id != t.user_id")
-    builder.where("p.user_id in (:user_ids)", {user_ids: opts[:user_ids]}) if opts[:user_ids]
+    builder.where("p.user_id in (:user_ids)", user_ids: opts[:user_ids]) if opts[:user_ids]
     builder.where("p.post_type = :post_type", post_type: Post.types[:regular])
     builder.where("EXTRACT(EPOCH FROM p.created_at - t.created_at) > 0")
     builder.exec
   end
 
-  def self.time_to_first_response_per_day(start_date, end_date, opts={})
-    time_to_first_response(TIME_TO_FIRST_RESPONSE_SQL, opts.merge({start_date: start_date, end_date: end_date}))
+  def self.time_to_first_response_per_day(start_date, end_date, opts = {})
+    time_to_first_response(TIME_TO_FIRST_RESPONSE_SQL, opts.merge(start_date: start_date, end_date: end_date))
   end
 
-  def self.time_to_first_response_total(opts=nil)
+  def self.time_to_first_response_total(opts = nil)
     total = time_to_first_response(TIME_TO_FIRST_RESPONSE_TOTAL_SQL, opts)
     total.first["hours"].to_f.round(2)
   end
@@ -1146,7 +1212,7 @@ SQL
     ORDER BY tt.created_at
   SQL
 
-  def self.with_no_response_per_day(start_date, end_date, category_id=nil)
+  def self.with_no_response_per_day(start_date, end_date, category_id = nil)
     builder = SqlBuilder.new(WITH_NO_RESPONSE_SQL)
     builder.where("t.created_at >= :start_date", start_date: start_date) if start_date
     builder.where("t.created_at < :end_date", end_date: end_date) if end_date
@@ -1168,7 +1234,7 @@ SQL
     WHERE tt.first_reply IS NULL OR tt.first_reply < 2
   SQL
 
-  def self.with_no_response_total(opts={})
+  def self.with_no_response_total(opts = {})
     builder = SqlBuilder.new(WITH_NO_RESPONSE_TOTAL_SQL)
     builder.where("t.category_id = :category_id", category_id: opts[:category_id]) if opts[:category_id]
     builder.where("t.archetype <> '#{Archetype.private_message}'")
@@ -1189,12 +1255,25 @@ SQL
   end
 
   def pm_with_non_human_user?
-    Topic.private_messages
-      .joins("LEFT JOIN topic_allowed_groups ON topics.id = topic_allowed_groups.topic_id")
-      .where("topic_allowed_groups.topic_id IS NULL")
-      .where("topics.id = ?", self.id)
-      .where("(SELECT COUNT(*) FROM topic_allowed_users WHERE topic_allowed_users.topic_id = ? AND topic_allowed_users.user_id > 0) = 1", self.id)
-      .exists?
+    sql = <<~SQL
+    SELECT 1 FROM topics
+    LEFT JOIN topic_allowed_groups ON topics.id = topic_allowed_groups.topic_id
+    WHERE topic_allowed_groups.topic_id IS NULL
+    AND topics.archetype = :private_message
+    AND topics.id = :topic_id
+    AND (
+      SELECT COUNT(*) FROM topic_allowed_users
+      WHERE topic_allowed_users.topic_id = :topic_id
+      AND topic_allowed_users.user_id > 0
+    ) = 1
+    SQL
+
+    result = Topic.exec_sql(sql, private_message: Archetype.private_message, topic_id: self.id)
+    result.ntuples != 0
+  end
+
+  def featured_link_root_domain
+    MiniSuffix.domain(URI.parse(self.featured_link).hostname)
   end
 
   private
@@ -1215,69 +1294,65 @@ SQL
 
 end
 
-
 # == Schema Information
 #
 # Table name: topics
 #
-#  id                            :integer          not null, primary key
-#  title                         :string           not null
-#  last_posted_at                :datetime
-#  created_at                    :datetime         not null
-#  updated_at                    :datetime         not null
-#  views                         :integer          default(0), not null
-#  posts_count                   :integer          default(0), not null
-#  user_id                       :integer
-#  last_post_user_id             :integer          not null
-#  reply_count                   :integer          default(0), not null
-#  featured_user1_id             :integer
-#  featured_user2_id             :integer
-#  featured_user3_id             :integer
-#  avg_time                      :integer
-#  deleted_at                    :datetime
-#  highest_post_number           :integer          default(0), not null
-#  image_url                     :string
-#  like_count                    :integer          default(0), not null
-#  incoming_link_count           :integer          default(0), not null
-#  category_id                   :integer
-#  visible                       :boolean          default(TRUE), not null
-#  moderator_posts_count         :integer          default(0), not null
-#  closed                        :boolean          default(FALSE), not null
-#  archived                      :boolean          default(FALSE), not null
-#  bumped_at                     :datetime         not null
-#  has_summary                   :boolean          default(FALSE), not null
-#  vote_count                    :integer          default(0), not null
-#  archetype                     :string           default("regular"), not null
-#  featured_user4_id             :integer
-#  notify_moderators_count       :integer          default(0), not null
-#  spam_count                    :integer          default(0), not null
-#  pinned_at                     :datetime
-#  score                         :float
-#  percent_rank                  :float            default(1.0), not null
-#  subtype                       :string
-#  slug                          :string
-#  auto_close_at                 :datetime
-#  auto_close_user_id            :integer
-#  auto_close_started_at         :datetime
-#  deleted_by_id                 :integer
-#  participant_count             :integer          default(1)
-#  word_count                    :integer
-#  excerpt                       :string(1000)
-#  pinned_globally               :boolean          default(FALSE), not null
-#  auto_close_based_on_last_post :boolean          default(FALSE)
-#  auto_close_hours              :float
-#  pinned_until                  :datetime
-#  fancy_title                   :string(400)
-#  highest_staff_post_number     :integer          default(0), not null
-#  featured_link                 :string
+#  id                        :integer          not null, primary key
+#  title                     :string(255)      not null
+#  last_posted_at            :datetime
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
+#  views                     :integer          default(0), not null
+#  posts_count               :integer          default(0), not null
+#  user_id                   :integer
+#  last_post_user_id         :integer          not null
+#  reply_count               :integer          default(0), not null
+#  featured_user1_id         :integer
+#  featured_user2_id         :integer
+#  featured_user3_id         :integer
+#  avg_time                  :integer
+#  deleted_at                :datetime
+#  highest_post_number       :integer          default(0), not null
+#  image_url                 :string(255)
+#  like_count                :integer          default(0), not null
+#  incoming_link_count       :integer          default(0), not null
+#  category_id               :integer
+#  visible                   :boolean          default(TRUE), not null
+#  moderator_posts_count     :integer          default(0), not null
+#  closed                    :boolean          default(FALSE), not null
+#  archived                  :boolean          default(FALSE), not null
+#  bumped_at                 :datetime         not null
+#  has_summary               :boolean          default(FALSE), not null
+#  vote_count                :integer          default(0), not null
+#  archetype                 :string(255)      default("regular"), not null
+#  featured_user4_id         :integer
+#  notify_moderators_count   :integer          default(0), not null
+#  spam_count                :integer          default(0), not null
+#  pinned_at                 :datetime
+#  score                     :float
+#  percent_rank              :float            default(1.0), not null
+#  subtype                   :string(255)
+#  slug                      :string(255)
+#  deleted_by_id             :integer
+#  participant_count         :integer          default(1)
+#  word_count                :integer
+#  excerpt                   :string(1000)
+#  pinned_globally           :boolean          default(FALSE), not null
+#  pinned_until              :datetime
+#  fancy_title               :string(400)
+#  highest_staff_post_number :integer          default(0), not null
+#  featured_link             :string
 #
 # Indexes
 #
 #  idx_topics_front_page                   (deleted_at,visible,archetype,category_id,id)
 #  idx_topics_user_id_deleted_at           (user_id)
-#  index_topics_on_bumped_at               (bumped_at)
+#  idxtopicslug                            (slug)
+#  index_forum_threads_on_bumped_at        (bumped_at)
 #  index_topics_on_created_at_and_visible  (created_at,visible)
 #  index_topics_on_id_and_deleted_at       (id,deleted_at)
+#  index_topics_on_lower_title             (lower((title)::text))
 #  index_topics_on_pinned_at               (pinned_at)
 #  index_topics_on_pinned_globally         (pinned_globally)
 #
diff --git a/app/models/topic_converter.rb b/app/models/topic_converter.rb
index dd5bc30559..5ebe651625 100644
--- a/app/models/topic_converter.rb
+++ b/app/models/topic_converter.rb
@@ -17,12 +17,28 @@ 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
       @topic.save
       update_user_stats
+
+      # TODO: Every post in a PRIVATE MESSAGE looks the same: each is a UserAction::NEW_PRIVATE_MESSAGE.
+      #       So we need to remove all those user actions and re-log all the posts.
+      #       Post counting depends on the correct UserActions (NEW_TOPIC, REPLY), so once a private topic
+      #       becomes a public topic, post counts are wrong. The reverse is not so bad because
+      #       we don't count NEW_PRIVATE_MESSAGE in any public stats.
+      #       TBD: why do so many specs fail with this change?
+
+      # UserAction.where(target_topic_id: @topic.id, action_type: [UserAction::GOT_PRIVATE_MESSAGE, UserAction::NEW_PRIVATE_MESSAGE]).find_each do |ua|
+      #   UserAction.remove_action!(ua.attributes.symbolize_keys.slice(:action_type, :user_id, :acting_user_id, :target_topic_id, :target_post_id))
+      # end
+      # @topic.posts.each do |post|
+      #   UserActionCreator.log_post(post) unless post.post_number == 1
+      # end
+
       watch_topic(topic)
     end
     @topic
@@ -44,7 +60,7 @@ class TopicConverter
   def update_user_stats
     @topic.posts.where(deleted_at: nil).each do |p|
       user = User.find(p.user_id)
-      # update posts count
+      # update posts count. NOTE that DirectoryItem.refresh will overwrite this by counting UserAction records.
       user.user_stat.post_count += 1
       user.user_stat.save!
     end
@@ -57,7 +73,7 @@ class TopicConverter
     @topic.posts.where(deleted_at: nil).each do |p|
       user = User.find(p.user_id)
       @topic.topic_allowed_users.build(user_id: user.id) unless @topic.topic_allowed_users.where(user_id: user.id).exists?
-      # update posts count
+      # update posts count. NOTE that DirectoryItem.refresh will overwrite this by counting UserAction records.
       user.user_stat.post_count -= 1
       user.user_stat.save!
     end
@@ -70,7 +86,7 @@ class TopicConverter
   def watch_topic(topic)
     @topic.notifier.watch_topic!(topic.user_id)
 
-    @topic.topic_allowed_users(true).each do |tau|
+    @topic.reload.topic_allowed_users.each do |tau|
       next if tau.user_id < 0 || tau.user_id == topic.user_id
       topic.notifier.watch!(tau.user_id)
     end
diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index 0f1cc78f7d..1692b1a727 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -1,4 +1,5 @@
 require_dependency 'nokogiri'
+require_dependency 'url_helper'
 
 class TopicEmbed < ActiveRecord::Base
   include Trashable
@@ -77,7 +78,8 @@ class TopicEmbed < ActiveRecord::Base
   def self.find_remote(url)
     require 'ruby-readability'
 
-    original_uri = URI.parse(URI.encode(url))
+    url = UrlHelper.escape_uri(url)
+    original_uri = URI.parse(url)
     opts = {
       tags: %w[div p code pre h1 h2 h3 b em i strong a img ul li ol blockquote],
       attributes: %w[href src class],
@@ -90,8 +92,8 @@ class TopicEmbed < ActiveRecord::Base
 
     response = FetchResponse.new
     begin
-      html = open(URI.encode(url), allow_redirections: :safe).read
-    rescue OpenURI::HTTPError
+      html = open(url, allow_redirections: :safe).read
+    rescue OpenURI::HTTPError, Net::OpenTimeout
       return
     end
 
@@ -113,26 +115,26 @@ class TopicEmbed < ActiveRecord::Base
     response.title = title
     doc = Nokogiri::HTML(read_doc.content)
 
-    tags = {'img' => 'src', 'script' => 'src', 'a' => 'href'}
+    tags = { 'img' => 'src', 'script' => 'src', 'a' => 'href' }
     doc.search(tags.keys.join(',')).each do |node|
       url_param = tags[node.name]
       src = node[url_param]
       unless (src.nil? || src.empty?)
         begin
-          uri = URI.parse(URI.encode(src))
+          uri = URI.parse(UrlHelper.escape_uri(src))
           unless uri.host
             uri.scheme = original_uri.scheme
             uri.host = original_uri.host
             node[url_param] = uri.to_s
           end
-        rescue URI::InvalidURIError
+        rescue URI::InvalidURIError, URI::InvalidComponentError
           # If there is a mistyped URL, just do nothing
         end
       end
       # only allow classes in the whitelist
       allowed_classes = if embed_classname_whitelist.blank? then [] else embed_classname_whitelist.split(/[ ,]+/i) end
       doc.search('[class]:not([class=""])').each do |classnode|
-        classes = classnode[:class].split(' ').select{ |classname| allowed_classes.include?(classname) }
+        classes = classnode[:class].split(' ').select { |classname| allowed_classes.include?(classname) }
         if classes.length === 0
           classnode.delete('class')
         else
@@ -145,9 +147,11 @@ class TopicEmbed < ActiveRecord::Base
     response
   end
 
-  def self.import_remote(import_user, url, opts=nil)
+  def self.import_remote(import_user, url, opts = nil)
     opts = opts || {}
     response = find_remote(url)
+    return if response.nil?
+
     response.title = opts[:title] if opts[:title].present?
     import_user = response.author if response.author.present?
 
@@ -157,7 +161,7 @@ class TopicEmbed < ActiveRecord::Base
   # Convert any relative URLs to absolute. RSS is annoying for this.
   def self.absolutize_urls(url, contents)
     url = normalize_url(url)
-    uri = URI(URI.encode(url))
+    uri = URI(UrlHelper.escape_uri(url))
     prefix = "#{uri.scheme}://#{uri.host}"
     prefix << ":#{uri.port}" if uri.port != 80 && uri.port != 443
 
diff --git a/app/models/topic_featured_users.rb b/app/models/topic_featured_users.rb
index f28c555b4c..d3f705149b 100644
--- a/app/models/topic_featured_users.rb
+++ b/app/models/topic_featured_users.rb
@@ -10,7 +10,7 @@ class TopicFeaturedUsers
   end
 
   # Chooses which topic users to feature
-  def choose(args={})
+  def choose(args = {})
     self.class.ensure_consistency!(topic.id.to_i)
     update_participant_count
   end
@@ -22,7 +22,7 @@ class TopicFeaturedUsers
      topic.featured_user4_id].uniq.compact
   end
 
-  def self.ensure_consistency!(topic_id=nil)
+  def self.ensure_consistency!(topic_id = nil)
 
     filter = "#{"AND t.id = #{topic_id.to_i}" if topic_id}"
     filter2 = "#{"AND tt.id = #{topic_id.to_i}" if topic_id}"
diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb
index b5e186930f..a55cd5ca48 100644
--- a/app/models/topic_link.rb
+++ b/app/models/topic_link.rb
@@ -1,5 +1,6 @@
 require 'uri'
 require_dependency 'slug'
+require_dependency 'discourse'
 
 class TopicLink < ActiveRecord::Base
 
@@ -57,6 +58,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)
@@ -65,7 +68,7 @@ SQL
 
   end
 
-  def self.counts_for(guardian,topic, posts)
+  def self.counts_for(guardian, topic, posts)
     return {} if posts.blank?
 
     # Sam: I don't know how to write this cleanly in AR,
@@ -91,19 +94,18 @@ SQL
     builder.where('l.post_id IN (:post_ids)', post_ids: posts.map(&:id))
     builder.secure_category(guardian.secure_category_ids)
 
-    builder.map_exec(OpenStruct).each_with_object({}) do |l,result|
+    builder.map_exec(OpenStruct).each_with_object({}) do |l, result|
       result[l.post_id] ||= []
-      result[l.post_id] << {url: l.url,
-                            clicks: l.clicks,
-                            title: l.title,
-                            internal: l.internal,
-                            reflection: l.reflection}
+      result[l.post_id] << { url: l.url,
+                             clicks: l.clicks,
+                             title: l.title,
+                             internal: l.internal,
+                             reflection: l.reflection }
     end
   end
 
-  # Extract any urls in body
   def self.extract_from(post)
-    return unless post.present? && !post.whisper?
+    return if post.blank? || post.whisper?
 
     added_urls = []
     TopicLink.transaction do
@@ -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'
 
@@ -147,7 +144,6 @@ SQL
               url = "#{Discourse.base_url_no_prefix}#{topic.relative_url}"
               url << "/#{post_number}" if post_number.to_i > 1
             end
-
           end
 
           # Skip linking to ourselves
@@ -164,6 +160,7 @@ SQL
           added_urls << url
 
           unless TopicLink.exists?(topic_id: post.topic_id, post_id: post.id, url: url)
+            file_extension = File.extname(parsed.path)[1..10].downcase unless parsed.path.nil? || File.extname(parsed.path).empty?
             begin
               TopicLink.create!(post_id: post.id,
                                 user_id: post.user_id,
@@ -173,7 +170,8 @@ SQL
                                 internal: internal,
                                 link_topic_id: topic_id,
                                 link_post_id: reflected_post.try(:id),
-                                quote: link.is_quote)
+                                quote: link.is_quote,
+                                extension: file_extension)
             rescue ActiveRecord::RecordNotUnique, PG::UniqueViolation
               # it's fine
             end
@@ -183,7 +181,7 @@ SQL
           if topic_id.present?
             topic = Topic.find_by(id: topic_id)
 
-            if topic && post.topic && post.topic.archetype != 'private_message' && topic.archetype != 'private_message'
+            if topic && post.topic && topic.archetype != 'private_message' && post.topic.archetype != 'private_message' && post.topic.visible?
               prefix = Discourse.base_url_no_prefix
               reflected_url = "#{prefix}#{post.topic.relative_url(post.post_number)}"
               tl = TopicLink.find_by(topic_id: topic_id,
@@ -192,14 +190,14 @@ SQL
 
               unless tl
                 tl = TopicLink.create(user_id: post.user_id,
-                                    topic_id: topic_id,
-                                    post_id: reflected_post.try(:id),
-                                    url: reflected_url,
-                                    domain: Discourse.current_hostname,
-                                    reflection: true,
-                                    internal: true,
-                                    link_topic_id: post.topic_id,
-                                    link_post_id: post.id)
+                                      topic_id: topic_id,
+                                      post_id: reflected_post.try(:id),
+                                      url: reflected_url,
+                                      domain: Discourse.current_hostname,
+                                      reflection: true,
+                                      internal: true,
+                                      link_topic_id: post.topic_id,
+                                      link_post_id: post.id)
 
               end
 
@@ -216,17 +214,29 @@ SQL
 
       # Remove links that aren't there anymore
       if added_urls.present?
-        TopicLink.delete_all ["(url not in (:urls)) AND (post_id = :post_id AND NOT reflection)", urls: added_urls, post_id: post.id]
+        TopicLink.where(
+          "(url not in (:urls)) AND (post_id = :post_id AND NOT reflection)",
+          urls: added_urls, post_id: post.id
+        ).delete_all
 
         reflected_ids.compact!
         if reflected_ids.present?
-          TopicLink.delete_all ["(id not in (:reflected_ids)) AND (link_post_id = :post_id AND reflection)",
-                                reflected_ids: reflected_ids, post_id: post.id]
+          TopicLink.where(
+            "(id not in (:reflected_ids)) AND (link_post_id = :post_id AND reflection)",
+            reflected_ids: reflected_ids, post_id: post.id
+          ).delete_all
         else
-          TopicLink.delete_all ["link_post_id = :post_id AND reflection", post_id: post.id]
+          TopicLink
+            .where("link_post_id = :post_id AND reflection", post_id: post.id)
+            .delete_all
         end
       else
-        TopicLink.delete_all ["(post_id = :post_id AND NOT reflection) OR (link_post_id = :post_id AND reflection)", post_id: post.id]
+        TopicLink
+          .where(
+            "(post_id = :post_id AND NOT reflection) OR (link_post_id = :post_id AND reflection)",
+            post_id: post.id
+          )
+          .delete_all
       end
     end
   end
@@ -238,11 +248,11 @@ SQL
 
   def self.duplicate_lookup(topic)
     results = TopicLink
-                .includes(:post, :user)
-                .joins(:post, :user)
-                .where("posts.id IS NOT NULL AND users.id IS NOT NULL")
-                .where(topic_id: topic.id, reflection: false)
-                .last(200)
+      .includes(:post, :user)
+      .joins(:post, :user)
+      .where("posts.id IS NOT NULL AND users.id IS NOT NULL")
+      .where(topic_id: topic.id, reflection: false)
+      .last(200)
 
     lookup = {}
     results.each do |tl|
@@ -274,14 +284,16 @@ end
 #  reflection    :boolean          default(FALSE)
 #  clicks        :integer          default(0), not null
 #  link_post_id  :integer
-#  title         :string
+#  title         :string(255)
 #  crawled_at    :datetime
 #  quote         :boolean          default(FALSE), not null
+#  extension     :string(10)
 #
 # Indexes
 #
-#  index_topic_links_on_link_post_id_and_reflection  (link_post_id,reflection)
-#  index_topic_links_on_post_id                      (post_id)
-#  index_topic_links_on_topic_id                     (topic_id)
-#  unique_post_links                                 (topic_id,post_id,url) UNIQUE
+#  index_forum_thread_links_on_forum_thread_id                      (topic_id)
+#  index_forum_thread_links_on_forum_thread_id_and_post_id_and_url  (topic_id,post_id,url) UNIQUE
+#  index_topic_links_on_extension                                   (extension)
+#  index_topic_links_on_link_post_id_and_reflection                 (link_post_id,reflection)
+#  index_topic_links_on_post_id                                     (post_id)
 #
diff --git a/app/models/topic_link_click.rb b/app/models/topic_link_click.rb
index 6bd932c796..3afce0bfbd 100644
--- a/app/models/topic_link_click.rb
+++ b/app/models/topic_link_click.rb
@@ -12,7 +12,7 @@ class TopicLinkClick < ActiveRecord::Base
   WHITELISTED_REDIRECT_HOSTNAMES = Set.new(%W{www.youtube.com youtu.be})
 
   # Create a click from a URL and post_id
-  def self.create_from(args={})
+  def self.create_from(args = {})
     url = args[:url][0...TopicLink.max_url_length]
     return nil if url.blank?
 
@@ -31,7 +31,13 @@ class TopicLinkClick < ActiveRecord::Base
     query = url.index('?')
     unless query.nil?
       endpos = url.index('#') || url.size
-      urls << url[0..query-1] + url[endpos..-1]
+      urls << url[0..query - 1] + url[endpos..-1]
+    end
+
+    # link can have query params, and analytics can add more to the end:
+    i = url.length
+    while i = url.rindex('&', i - 1)
+      urls << url[0...i]
     end
 
     # add a cdn link
@@ -44,8 +50,8 @@ class TopicLinkClick < ActiveRecord::Base
         end
       end
 
-      if SiteSetting.s3_cdn_url.present?
-        cdn_uri = URI.parse(SiteSetting.s3_cdn_url) rescue nil
+      if SiteSetting.Upload.s3_cdn_url.present?
+        cdn_uri = URI.parse(SiteSetting.Upload.s3_cdn_url) rescue nil
         if cdn_uri && cdn_uri.hostname == uri.hostname && uri.path.starts_with?(cdn_uri.path)
           is_cdn_link = true
           path = uri.path[cdn_uri.path.length..-1]
@@ -112,5 +118,5 @@ end
 #
 # Indexes
 #
-#  by_link  (topic_link_id)
+#  index_forum_thread_link_clicks_on_forum_thread_link_id  (topic_link_id)
 #
diff --git a/app/models/topic_list.rb b/app/models/topic_list.rb
index efa8089202..375659dc5c 100644
--- a/app/models/topic_list.rb
+++ b/app/models/topic_list.rb
@@ -22,7 +22,7 @@ class TopicList
 
   def self.preload(topics, object)
     if @preload
-      @preload.each{|preload| preload.call(topics, object)}
+      @preload.each { |preload| preload.call(topics, object) }
     end
   end
 
@@ -37,7 +37,7 @@ class TopicList
                 :tags,
                 :current_user
 
-  def initialize(filter, current_user, topics, opts=nil)
+  def initialize(filter, current_user, topics, opts = nil)
     @filter = filter
     @current_user = current_user
     @topics_input = topics
@@ -86,7 +86,7 @@ class TopicList
 
     # Include bookmarks if you have bookmarked topics
     if @current_user && !post_action_type
-      post_action_type = PostActionType.types[:bookmark] if @topic_lookup.any?{|_,tu| tu && tu.bookmarked}
+      post_action_type = PostActionType.types[:bookmark] if @topic_lookup.any? { |_, tu| tu && tu.bookmarked }
     end
 
     # Data for bookmarks or likes
@@ -105,7 +105,7 @@ class TopicList
       ft.user_data = @topic_lookup[ft.id] if @topic_lookup.present?
 
       if ft.user_data && post_action_lookup && actions = post_action_lookup[ft.id]
-        ft.user_data.post_action_data = {post_action_type => actions}
+        ft.user_data.post_action_data = { post_action_type => actions }
       end
 
       ft.posters = ft.posters_summary(
@@ -127,6 +127,6 @@ class TopicList
   end
 
   def attributes
-    {'more_topics_url' => page}
+    { 'more_topics_url' => page }
   end
 end
diff --git a/app/models/topic_notifier.rb b/app/models/topic_notifier.rb
index db30a8e471..46d43c3755 100644
--- a/app/models/topic_notifier.rb
+++ b/app/models/topic_notifier.rb
@@ -3,10 +3,10 @@ class TopicNotifier
     @topic = topic
   end
 
-  { :watch!   => :watching,
-    :track!   => :tracking,
-    :regular! => :regular,
-    :mute!    => :muted }.each_pair do |method_name, level|
+  { watch!: :watching,
+    track!: :tracking,
+    regular!: :regular,
+    mute!: :muted }.each_pair do |method_name, level|
 
     define_method method_name do |user_id|
       change_level user_id, level
@@ -34,8 +34,8 @@ class TopicNotifier
     @notification_levels ||= TopicUser.notification_levels
   end
 
-  def change_level(user_id, level, reason=nil)
-    attrs = {notification_level: levels[level]}
+  def change_level(user_id, level, reason = nil)
+    attrs = { notification_level: levels[level] }
     attrs.merge!(notifications_reason_id: TopicUser.notification_reasons[reason]) if reason
     TopicUser.change(user_id, @topic.id, attrs)
   end
diff --git a/app/models/topic_posters_summary.rb b/app/models/topic_posters_summary.rb
index 7723bf338c..5fa5b2cefc 100644
--- a/app/models/topic_posters_summary.rb
+++ b/app/models/topic_posters_summary.rb
@@ -1,4 +1,6 @@
 # This is used in topic lists
+require_dependency 'topic_poster'
+
 class TopicPostersSummary
   attr_reader :topic, :options
 
@@ -40,7 +42,7 @@ class TopicPostersSummary
 
   def shuffle_last_poster_to_back_in(summary)
     unless last_poster_is_topic_creator?
-      summary.reject!{ |u| u.id == topic.last_post_user_id }
+      summary.reject! { |u| u.id == topic.last_post_user_id }
       summary << avatar_lookup[topic.last_post_user_id]
     end
     summary
diff --git a/app/models/topic_search_data.rb b/app/models/topic_search_data.rb
new file mode 100644
index 0000000000..641d79246c
--- /dev/null
+++ b/app/models/topic_search_data.rb
@@ -0,0 +1,18 @@
+class TopicSearchData < ActiveRecord::Base
+  include HasSearchData
+end
+
+# == Schema Information
+#
+# Table name: topic_search_data
+#
+#  topic_id    :integer          not null, primary key
+#  raw_data    :text
+#  locale      :string(255)      not null
+#  search_data :tsvector
+#  version     :integer          default(0)
+#
+# Indexes
+#
+#  idx_search_topic  (search_data)
+#
diff --git a/app/models/topic_timer.rb b/app/models/topic_timer.rb
index 2db32b4765..160f6c40a7 100644
--- a/app/models/topic_timer.rb
+++ b/app/models/topic_timer.rb
@@ -19,13 +19,16 @@ class TopicTimer < ActiveRecord::Base
     self.created_at ||= Time.zone.now if execute_at
     self.public_type = self.public_type?
 
-    if (execute_at_changed? && !execute_at_was.nil?) || user_id_changed?
+    if (will_save_change_to_execute_at? &&
+       !attribute_in_database(:execute_at).nil?) ||
+       will_save_change_to_user_id?
+
       self.send("cancel_auto_#{self.class.types[status_type]}_job")
     end
   end
 
   after_save do
-    if (execute_at_changed? || user_id_changed?)
+    if (saved_change_to_execute_at? || saved_change_to_user_id?)
       now = Time.zone.now
       time = execute_at < now ? now : execute_at
 
diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index ff30630353..a7d48758ba 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -38,7 +38,7 @@ class TopicTrackingState
     publish_read(topic.id, 1, topic.user_id)
   end
 
-  def self.publish_latest(topic, staff_only=false)
+  def self.publish_latest(topic, staff_only = false)
     return unless topic.archetype == "regular"
 
     message = {
@@ -73,9 +73,9 @@ class TopicTrackingState
       end
 
     TopicUser
-        .tracking(post.topic_id)
-        .select([:user_id,:last_read_post_number, :notification_level])
-        .each do |tu|
+      .tracking(post.topic_id)
+      .select([:user_id, :last_read_post_number, :notification_level])
+      .each do |tu|
 
       message = {
         topic_id: post.topic_id,
@@ -125,7 +125,7 @@ class TopicTrackingState
     MessageBus.publish("/delete", message.as_json, group_ids: group_ids)
   end
 
-  def self.publish_read(topic_id, last_read_post_number, user_id, notification_level=nil)
+  def self.publish_read(topic_id, last_read_post_number, user_id, notification_level = nil)
 
     highest_post_number = Topic.where(id: topic_id).pluck(:highest_post_number).first
 
@@ -155,7 +155,7 @@ class TopicTrackingState
                 always: User::NewTopicDuration::ALWAYS,
                 default_duration: SiteSetting.default_other_new_topic_duration_minutes,
                 min_date: Time.at(SiteSetting.min_new_topics_time).to_datetime
-              ).where_values[0]
+              ).where_clause.send(:predicates)[0]
   end
 
   def self.report(user, topic_id = nil)
@@ -179,21 +179,24 @@ class TopicTrackingState
 
   end
 
-
-  def self.report_raw_sql(opts=nil)
+  def self.report_raw_sql(opts = nil)
 
     unread =
       if opts && opts[:skip_unread]
         "1=0"
       else
-        TopicQuery.unread_filter(Topic, -999, staff: opts && opts[:staff]).where_values.join(" AND ").sub("-999", ":user_id")
+        TopicQuery
+          .unread_filter(Topic, -999, staff: opts && opts[:staff])
+          .where_clause.send(:predicates)
+          .join(" AND ")
+          .gsub("-999", ":user_id")
       end
 
     new =
       if opts && opts[:skip_new]
         "1=0"
       else
-        TopicQuery.new_filter(Topic, "xxx").where_values.join(" AND ").gsub!("'xxx'", treat_as_new_topic_clause)
+        TopicQuery.new_filter(Topic, "xxx").where_clause.send(:predicates).join(" AND ").gsub!("'xxx'", treat_as_new_topic_clause)
       end
 
     select = (opts && opts[:select]) || "
@@ -205,7 +208,6 @@ class TopicTrackingState
            c.id AS category_id,
            tu.notification_level"
 
-
     sql = <<SQL
     SELECT #{select}
     FROM topics
diff --git a/app/models/topic_user.rb b/app/models/topic_user.rb
index 924d012bca..1d5618fbaf 100644
--- a/app/models/topic_user.rb
+++ b/app/models/topic_user.rb
@@ -9,7 +9,7 @@ class TopicUser < ActiveRecord::Base
 
   scope :tracking, lambda { |topic_id|
     where(topic_id: topic_id)
-   .where("COALESCE(topic_users.notification_level, :regular) >= :tracking",
+      .where("COALESCE(topic_users.notification_level, :regular) >= :tracking",
      regular: TopicUser.notification_levels[:regular],
      tracking: TopicUser.notification_levels[:tracking])
   }
@@ -38,26 +38,19 @@ class TopicUser < ActiveRecord::Base
     end
 
     def auto_notification(user_id, topic_id, reason, notification_level)
-      if TopicUser.where("user_id = :user_id AND topic_id = :topic_id AND (notifications_reason_id IS NULL OR
-        (notification_level < :notification_level AND notification_level > :normal_notification_level))",
-                           user_id: user_id, topic_id: topic_id, notification_level: notification_level,
-                           normal_notification_level: notification_levels[:regular]).exists?
-        change(user_id, topic_id,
-          notification_level: notification_level,
-          notifications_reason_id: reason
-        )
-      end
+      should_change = TopicUser
+        .where(user_id: user_id, topic_id: topic_id)
+        .where("notifications_reason_id IS NULL OR (notification_level < :min AND notification_level > :max)", min: notification_level, max: notification_levels[:regular])
+        .exists?
+
+      change(user_id, topic_id, notification_level: notification_level, notifications_reason_id: reason) if should_change
     end
 
-    def auto_notification_for_staging(user_id, topic_id, reason)
-      topic_user = TopicUser.find_or_initialize_by(user_id: user_id, topic_id: topic_id)
-      topic_user.notification_level = notification_levels[:watching]
-      topic_user.notifications_reason_id = reason
-      topic_user.save
+    def auto_notification_for_staging(user_id, topic_id, reason, notification_level = notification_levels[:watching])
+      change(user_id, topic_id, notification_level: notification_level, notifications_reason_id: reason)
     end
 
     def unwatch_categories!(user, category_ids)
-
       track_threshold = user.user_option.auto_track_topics_after_msecs
 
       sql = <<SQL
@@ -159,22 +152,22 @@ SQL
 
       unless attrs[:notification_level]
         category_notification_level = CategoryUser.where(user_id: user_id)
-                    .where("category_id IN (SELECT category_id FROM topics WHERE id = :id)", id: topic_id)
-                    .where("notification_level IN (:levels)", levels: [CategoryUser.notification_levels[:watching],
+          .where("category_id IN (SELECT category_id FROM topics WHERE id = :id)", id: topic_id)
+          .where("notification_level IN (:levels)", levels: [CategoryUser.notification_levels[:watching],
                         CategoryUser.notification_levels[:tracking]])
-                    .order("notification_level DESC")
-                    .limit(1)
-                    .pluck(:notification_level)
-                    .first
+          .order("notification_level DESC")
+          .limit(1)
+          .pluck(:notification_level)
+          .first
 
         tag_notification_level = TagUser.where(user_id: user_id)
-                    .where("tag_id IN (SELECT tag_id FROM topic_tags WHERE topic_id = :id)", id: topic_id)
-                    .where("notification_level IN (:levels)", levels: [CategoryUser.notification_levels[:watching],
+          .where("tag_id IN (SELECT tag_id FROM topic_tags WHERE topic_id = :id)", id: topic_id)
+          .where("notification_level IN (:levels)", levels: [CategoryUser.notification_levels[:watching],
                         CategoryUser.notification_levels[:tracking]])
-                    .order("notification_level DESC")
-                    .limit(1)
-                    .pluck(:notification_level)
-                    .first
+          .order("notification_level DESC")
+          .limit(1)
+          .pluck(:notification_level)
+          .first
 
         if category_notification_level && !(tag_notification_level && (tag_notification_level > category_notification_level))
           attrs[:notification_level] = category_notification_level
@@ -191,7 +184,6 @@ SQL
               TopicUser.notification_reasons[:auto_track_tag]
         end
 
-
       end
 
       unless attrs[:notification_level]
@@ -203,7 +195,7 @@ SQL
         end
       end
 
-      TopicUser.create(attrs.merge!(user_id: user_id, topic_id: topic_id, first_visited_at: now ,last_visited_at: now))
+      TopicUser.create(attrs.merge!(user_id: user_id, topic_id: topic_id, first_visited_at: now , last_visited_at: now))
     end
 
     def track_visit!(topic_id, user_id)
@@ -256,7 +248,7 @@ SQL
 
     INSERT_TOPIC_USER_SQL_STAFF = INSERT_TOPIC_USER_SQL.gsub("highest_post_number", "highest_staff_post_number")
 
-    def update_last_read(user, topic_id, post_number, msecs, opts={})
+    def update_last_read(user, topic_id, post_number, new_posts_read, msecs, opts = {})
       return if post_number.blank?
       msecs = 0 if msecs.to_i < 0
 
@@ -276,11 +268,12 @@ SQL
       # ... user visited the topic but did not read the posts
       #
       # 86400000 = 1 day
-      rows = if user.staff?
-               exec_sql(UPDATE_TOPIC_USER_SQL_STAFF,args).values
-             else
-               exec_sql(UPDATE_TOPIC_USER_SQL,args).values
-             end
+      rows =
+        if user.staff?
+          exec_sql(UPDATE_TOPIC_USER_SQL_STAFF, args).values
+        else
+          exec_sql(UPDATE_TOPIC_USER_SQL, args).values
+        end
 
       if rows.length == 1
         before = rows[0][1].to_i
@@ -291,7 +284,10 @@ SQL
         if before_last_read < post_number
           # The user read at least one new post
           TopicTrackingState.publish_read(topic_id, post_number, user.id, after)
-          user.update_posts_read!(post_number - before_last_read, mobile: opts[:mobile])
+        end
+
+        if new_posts_read > 0
+          user.update_posts_read!(new_posts_read, mobile: opts[:mobile])
         end
 
         if before != after
@@ -307,7 +303,7 @@ SQL
         end
         TopicTrackingState.publish_read(topic_id, post_number, user.id, args[:new_status])
 
-        user.update_posts_read!(post_number, mobile: opts[:mobile])
+        user.update_posts_read!(new_posts_read, mobile: opts[:mobile])
 
         begin
           if user.staff?
@@ -322,7 +318,7 @@ SQL
             raise
           else
             opts[:retry] = true
-            update_last_read(user, topic_id, post_number, msecs, opts)
+            update_last_read(user, topic_id, post_number, new_posts_read, msecs, opts)
           end
         end
 
@@ -332,7 +328,7 @@ SQL
 
   end
 
-  def self.update_post_action_cache(opts={})
+  def self.update_post_action_cache(opts = {})
     user_id = opts[:user_id]
     post_id = opts[:post_id]
     topic_id = opts[:topic_id]
@@ -412,7 +408,7 @@ SQL
     TopicUser.exec_sql(sql, user_id: user_id, count: count)
   end
 
-  def self.ensure_consistency!(topic_id=nil)
+  def self.ensure_consistency!(topic_id = nil)
     update_post_action_cache(topic_id: topic_id)
 
     # TODO this needs some reworking, when we mark stuff skipped
@@ -478,6 +474,6 @@ end
 #
 # Indexes
 #
-#  index_topic_users_on_topic_id_and_user_id  (topic_id,user_id) UNIQUE
-#  index_topic_users_on_user_id_and_topic_id  (user_id,topic_id) UNIQUE
+#  index_forum_thread_users_on_forum_thread_id_and_user_id  (topic_id,user_id) UNIQUE
+#  index_topic_users_on_user_id_and_topic_id                (user_id,topic_id) UNIQUE
 #
diff --git a/app/models/topic_view_item.rb b/app/models/topic_view_item.rb
index 2b6fa6b49c..04b231fa9b 100644
--- a/app/models/topic_view_item.rb
+++ b/app/models/topic_view_item.rb
@@ -6,7 +6,7 @@ class TopicViewItem < ActiveRecord::Base
   belongs_to :user
   validates_presence_of :topic_id, :ip_address, :viewed_at
 
-  def self.add(topic_id, ip, user_id=nil, at=nil, skip_redis=false)
+  def self.add(topic_id, ip, user_id = nil, at = nil, skip_redis = false)
     # Only store a view once per day per thing per user per ip
     at ||= Date.today
     redis_key = "view:#{topic_id}:#{at}"
@@ -28,7 +28,6 @@ class TopicViewItem < ActiveRecord::Base
                  /*where*/
                )"
 
-
         builder = SqlBuilder.new(sql)
 
         if !user_id
diff --git a/app/models/translation_override.rb b/app/models/translation_override.rb
index d39c48221b..4c2ac9b82c 100644
--- a/app/models/translation_override.rb
+++ b/app/models/translation_override.rb
@@ -1,9 +1,21 @@
 require 'js_locale_helper'
+require "i18n/i18n_interpolation_keys_finder"
 
 class TranslationOverride < ActiveRecord::Base
+  # Whitelist i18n interpolation keys that can be included when customizing translations
+  CUSTOM_INTERPOLATION_KEYS_WHITELIST = {
+    "user_notifications.user_" => %w{
+      topic_title_url_encoded
+      site_title_url_encoded
+      context
+    }
+  }
+
   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 +24,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,11 +35,43 @@ class TranslationOverride < ActiveRecord::Base
     i18n_changed
   end
 
-  protected
+  private
 
     def self.i18n_changed
       I18n.reload!
-      MessageBus.publish('/i18n-flush', { refresh: true })
+      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)
+
+        custom_interpolation_keys = []
+
+        CUSTOM_INTERPOLATION_KEYS_WHITELIST.select do |key, value|
+          if self.translation_key.start_with?(key)
+            custom_interpolation_keys = value
+          end
+        end
+
+        invalid_keys = (original_interpolation_keys | new_interpolation_keys) -
+          original_interpolation_keys -
+          custom_interpolation_keys
+
+        if invalid_keys.present?
+          self.errors.add(:base, I18n.t(
+            'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
+            keys: invalid_keys.join(', ')
+          ))
+
+          return false
+        end
+      end
     end
 
 end
diff --git a/app/models/trust_level3_requirements.rb b/app/models/trust_level3_requirements.rb
index 2579216f86..6307e563b0 100644
--- a/app/models/trust_level3_requirements.rb
+++ b/app/models/trust_level3_requirements.rb
@@ -63,7 +63,7 @@ class TrustLevel3Requirements
   end
 
   def trust_level_locked
-    @user.trust_level_locked
+    !@user.manual_locked_trust_level.nil?
   end
 
   def on_grace_period
@@ -130,11 +130,11 @@ class TrustLevel3Requirements
 
   def num_flagged_posts
     PostAction.with_deleted
-              .where(post_id: flagged_post_ids)
-              .where.not(user_id: @user.id)
-              .where.not(agreed_at: nil)
-              .pluck(:post_id)
-              .uniq.count
+      .where(post_id: flagged_post_ids)
+      .where.not(user_id: @user.id)
+      .where.not(agreed_at: nil)
+      .pluck(:post_id)
+      .uniq.count
   end
 
   def max_flagged_posts
@@ -143,11 +143,11 @@ class TrustLevel3Requirements
 
   def num_flagged_by_users
     @_num_flagged_by_users ||= PostAction.with_deleted
-                                         .where(post_id: flagged_post_ids)
-                                         .where.not(user_id: @user.id)
-                                         .where.not(agreed_at: nil)
-                                         .pluck(:user_id)
-                                         .uniq.count
+      .where(post_id: flagged_post_ids)
+      .where.not(user_id: @user.id)
+      .where.not(agreed_at: nil)
+      .pluck(:user_id)
+      .uniq.count
   end
 
   def max_flagged_by_users
@@ -194,13 +194,11 @@ class TrustLevel3Requirements
     (min_likes_received.to_f / 4.0).ceil
   end
 
-
   def self.clear_cache
     $redis.del NUM_TOPICS_KEY
     $redis.del NUM_POSTS_KEY
   end
 
-
   CACHE_DURATION = 1.day.seconds - 60
   NUM_TOPICS_KEY = "tl3_num_topics"
   NUM_POSTS_KEY  = "tl3_num_posts"
@@ -223,8 +221,8 @@ class TrustLevel3Requirements
 
   def flagged_post_ids
     @_flagged_post_ids ||= @user.posts
-                                .with_deleted
-                                .where('created_at > ? AND (spam_count > 0 OR inappropriate_count > 0)', time_period.days.ago)
-                                .pluck(:id)
+      .with_deleted
+      .where('created_at > ? AND (spam_count > 0 OR inappropriate_count > 0)', time_period.days.ago)
+      .pluck(:id)
   end
 end
diff --git a/app/models/twitter_user_info.rb b/app/models/twitter_user_info.rb
index 0927c009ae..42d4f4d83c 100644
--- a/app/models/twitter_user_info.rb
+++ b/app/models/twitter_user_info.rb
@@ -8,7 +8,7 @@ end
 #
 #  id              :integer          not null, primary key
 #  user_id         :integer          not null
-#  screen_name     :string           not null
+#  screen_name     :string(255)      not null
 #  twitter_user_id :integer          not null
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
diff --git a/app/models/upload.rb b/app/models/upload.rb
index d6e1916c72..4d2e396a06 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -4,6 +4,7 @@ require_dependency "url_helper"
 require_dependency "db_helper"
 require_dependency "validators/upload_validator"
 require_dependency "file_store/local_store"
+require_dependency "base62"
 
 class Upload < ActiveRecord::Base
   belongs_to :user
@@ -13,8 +14,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
@@ -29,7 +31,7 @@ class Upload < ActiveRecord::Base
     thumbnail(width, height).present?
   end
 
-  def create_thumbnail!(width, height, crop=false)
+  def create_thumbnail!(width, height, crop = false)
     return unless SiteSetting.create_thumbnails?
 
     opts = {
@@ -52,8 +54,20 @@ class Upload < ActiveRecord::Base
     end
   end
 
-  def extension
-    File.extname(original_filename)
+  def short_url
+    "upload://#{Base62.encode(sha1.hex)}.#{extension}"
+  end
+
+  def self.sha1_from_short_url(url)
+    if url =~ /(upload:\/\/)?([a-zA-Z0-9]+)(\..*)?/
+      sha1 = Base62.decode($2).to_s(16)
+
+      if sha1.length > 40
+        nil
+      else
+        sha1.rjust(40, '0')
+      end
+    end
   end
 
   def self.generate_digest(path)
@@ -65,7 +79,7 @@ class Upload < ActiveRecord::Base
     # we store relative urls, so we need to remove any host/cdn
     url = url.sub(Discourse.asset_host, "") if Discourse.asset_host.present?
     # when using s3, we need to replace with the absolute base url
-    url = url.sub(SiteSetting.s3_cdn_url, Discourse.store.absolute_base_url) if SiteSetting.s3_cdn_url.present?
+    url = url.sub(SiteSetting.Upload.s3_cdn_url, Discourse.store.absolute_base_url) if SiteSetting.Upload.s3_cdn_url.present?
 
     # always try to get the path
     uri = URI(url) rescue nil
@@ -74,7 +88,7 @@ class Upload < ActiveRecord::Base
     Upload.find_by(url: url)
   end
 
-  def self.migrate_to_new_scheme(limit=nil)
+  def self.migrate_to_new_scheme(limit = nil)
     problems = []
 
     if SiteSetting.migrate_to_new_scheme
@@ -108,9 +122,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)
@@ -144,19 +156,21 @@ end
 #
 #  id                :integer          not null, primary key
 #  user_id           :integer          not null
-#  original_filename :string           not null
+#  original_filename :string(255)      not null
 #  filesize          :integer          not null
 #  width             :integer
 #  height            :integer
-#  url               :string           not null
+#  url               :string(255)      not null
 #  created_at        :datetime         not null
 #  updated_at        :datetime         not null
 #  sha1              :string(40)
 #  origin            :string(1000)
 #  retain_hours      :integer
+#  extension         :string(10)
 #
 # Indexes
 #
+#  index_uploads_on_extension   (lower((extension)::text))
 #  index_uploads_on_id_and_url  (id,url)
 #  index_uploads_on_sha1        (sha1) UNIQUE
 #  index_uploads_on_url         (url)
diff --git a/app/models/user.rb b/app/models/user.rb
index f3d7e325c6..28dc1e8552 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,3 +1,4 @@
+require_dependency 'jobs/base'
 require_dependency 'email'
 require_dependency 'email_token'
 require_dependency 'email_validator'
@@ -10,11 +11,17 @@ require_dependency 'pretty_text'
 require_dependency 'url_helper'
 require_dependency 'letter_avatar'
 require_dependency 'promotion'
+require_dependency 'password_validator'
+require_dependency 'notification_serializer'
 
 class User < ActiveRecord::Base
+  include Searchable
   include Roleable
   include HasCustomFields
 
+  # TODO: Remove this after 7th Jan 2018
+  self.ignored_columns = %w{email}
+
   has_many :posts
   has_many :notifications, dependent: :destroy
   has_many :topic_users, dependent: :destroy
@@ -42,7 +49,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
@@ -64,29 +73,27 @@ class User < ActiveRecord::Base
   has_many :muted_user_records, class_name: 'MutedUser'
   has_many :muted_users, through: :muted_user_records
 
-  has_one :user_search_data, dependent: :destroy
   has_one :api_key, dependent: :destroy
 
   belongs_to :uploaded_avatar, class_name: 'Upload'
 
-  has_many :acting_group_histories, dependent: :destroy, foreign_key: :acting_user_id, class_name: GroupHistory
-  has_many :targeted_group_histories, dependent: :destroy, foreign_key: :target_user_id, class_name: GroupHistory
+  has_many :acting_group_histories, dependent: :destroy, foreign_key: :acting_user_id, class_name: 'GroupHistory'
+  has_many :targeted_group_histories, dependent: :destroy, foreign_key: :target_user_id, class_name: 'GroupHistory'
 
-  delegate :last_sent_email_address, :to => :email_logs
-
-  before_validation :strip_downcase_email
+  delegate :last_sent_email_address, to: :email_logs
 
   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 :username_validator, if: :will_save_change_to_username?
   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 :name, user_full_name: true, if: :will_save_change_to_name?, length: { maximum: 255 }
+  validates :ip_address, allowed_ip_address: { on: :create, message: :signup_not_allowed }
+  validates :primary_email, presence: true
+  validates_associated :primary_email, message: -> (_, user_email) { user_email[:value]&.errors[:email]&.first }
 
   after_initialize :add_trust_level
 
+  before_validation :set_skip_validate_email
+
   after_create :create_email_token
   after_create :create_user_stat
   after_create :create_user_option
@@ -98,7 +105,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
@@ -108,8 +114,8 @@ class User < ActiveRecord::Base
 
   before_destroy do
     # These tables don't have primary keys, so destroying them with activerecord is tricky:
-    PostTiming.delete_all(user_id: self.id)
-    TopicViewItem.delete_all(user_id: self.id)
+    PostTiming.where(user_id: self.id).delete_all
+    TopicViewItem.where(user_id: self.id).delete_all
   end
 
   # Skip validating email, for example from a particular auth provider plugin
@@ -124,6 +130,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
@@ -136,13 +144,11 @@ class User < ActiveRecord::Base
                        ucf.value::int > 0
                   )', 'master_id') }
 
-  scope :staff, -> { where("admin OR moderator") }
-
   # TODO-PERF: There is no indexes on any of these
   # and NotifyMailingListSubscribers does a select-all-and-loop
-  # may want to create an index on (active, blocked, suspended_till)?
-  scope :blocked, -> { where(blocked: true) }
-  scope :not_blocked, -> { where(blocked: false) }
+  # may want to create an index on (active, silence, suspended_till)?
+  scope :silenced, -> { where("silenced_till IS NOT NULL AND silenced_till > ?", Time.zone.now) }
+  scope :not_silenced, -> { where("silenced_till IS NULL OR silenced_till <= ?", Time.zone.now) }
   scope :suspended, -> { where('suspended_till IS NOT NULL AND suspended_till > ?', Time.zone.now) }
   scope :not_suspended, -> { where('suspended_till IS NULL OR suspended_till <= ?', Time.zone.now) }
   scope :activated, -> { where(active: true) }
@@ -160,9 +166,12 @@ class User < ActiveRecord::Base
     SiteSetting.min_username_length.to_i..SiteSetting.max_username_length.to_i
   end
 
-  def self.username_available?(username)
+  def self.username_available?(username, email = nil)
     lower = username.downcase
-    !reserved_username?(lower) && !User.where(username_lower: lower).exists?
+    return false if reserved_username?(lower)
+    return true  if !User.exists?(username_lower: lower)
+    # staged users can use the same username since they will take over the account
+    email.present? && User.joins(:user_emails).exists?(staged: true, username_lower: lower, user_emails: { primary: true, email: email })
   end
 
   def self.reserved_username?(username)
@@ -233,20 +242,19 @@ 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)
     find_by(username_lower: username.downcase)
   end
 
-
   def enqueue_welcome_message(message_type)
     return unless SiteSetting.send_welcome_message?
     Jobs.enqueue(:send_system_message, user_id: id, message_type: message_type)
   end
 
-  def change_username(new_username, actor=nil)
+  def change_username(new_username, actor = nil)
     UsernameChanger.change(self, new_username, actor)
   end
 
@@ -268,12 +276,12 @@ class User < ActiveRecord::Base
     used_invite.try(:invited_by)
   end
 
-  def should_validate_email?
-    return !skip_email_validation && !staged? && email_changed?
+  def should_validate_email_address?
+    !skip_email_validation && !staged?
   end
 
   # Approve this user
-  def approve(approved_by, send_mail=true)
+  def approve(approved_by, send_mail = true)
     self.approved = true
 
     if approved_by.is_a?(Integer)
@@ -304,6 +312,7 @@ class User < ActiveRecord::Base
     @unread_notifications = nil
     @unread_total_notifications = nil
     @unread_pms = nil
+    @user_fields = nil
     super
   end
 
@@ -318,7 +327,7 @@ class User < ActiveRecord::Base
         n.user_id = :user_id AND
         NOT read"
 
-    User.exec_sql(sql, user_id: id, type: notification_type).getvalue(0,0).to_i
+    User.exec_sql(sql, user_id: id, type: notification_type).getvalue(0, 0).to_i
   end
 
   def unread_private_messages
@@ -342,7 +351,7 @@ class User < ActiveRecord::Base
         User.exec_sql(sql, user_id: id,
                            seen_notification_id: seen_notification_id,
                            pm:  Notification.types[:private_message])
-            .getvalue(0,0).to_i
+          .getvalue(0, 0).to_i
       end
   end
 
@@ -377,7 +386,6 @@ class User < ActiveRecord::Base
     notification = notifications.visible.order('notifications.id desc').first
     json = NotificationSerializer.new(notification).as_json if notification
 
-
     sql = "
        SELECT * FROM (
          SELECT n.id, n.read FROM notifications n
@@ -403,19 +411,21 @@ class User < ActiveRecord::Base
       ) AS y
     "
 
-    recent = User.exec_sql(sql, user_id: id,
-                       type:  Notification.types[:private_message]).values.map do |id, read|
-      [id.to_i, read == 't'.freeze]
+    recent = User.exec_sql(sql,
+      user_id: id,
+      type: Notification.types[:private_message]
+    ).values.map! do |id, read|
+      [id.to_i, read]
     end
 
     MessageBus.publish("/notification/#{id}",
-                       {unread_notifications: unread_notifications,
-                        unread_private_messages: unread_private_messages,
-                        total_unread_notifications: total_unread_notifications,
-                        read_first_notification: read_first_notification?,
-                        last_notification: json,
-                        recent: recent,
-                        seen_notification_id: seen_notification_id
+                       { unread_notifications: unread_notifications,
+                         unread_private_messages: unread_private_messages,
+                         total_unread_notifications: total_unread_notifications,
+                         read_first_notification: read_first_notification?,
+                         last_notification: json,
+                         recent: recent,
+                         seen_notification_id: seen_notification_id
                        },
                        user_ids: [id] # only publish the notification to this user
     )
@@ -446,6 +456,10 @@ class User < ActiveRecord::Base
     !!@password_required
   end
 
+  def password_validation_required?
+    password_required? || @raw_password.present?
+  end
+
   def has_password?
     password_hash.present?
   end
@@ -475,7 +489,7 @@ class User < ActiveRecord::Base
     last_seen_at.present?
   end
 
-  def create_visit_record!(date, opts={})
+  def create_visit_record!(date, opts = {})
     user_stat.update_column(:days_visited, user_stat.days_visited + 1)
     user_visits.create!(visited_at: date, posts_read: opts[:posts_read] || 0, mobile: opts[:mobile] || false)
   end
@@ -488,7 +502,7 @@ class User < ActiveRecord::Base
     create_visit_record!(date) unless visit_record_for(date)
   end
 
-  def update_posts_read!(num_posts, opts={})
+  def update_posts_read!(num_posts, opts = {})
     now = opts[:at] || Time.zone.now
     _retry = opts[:retry] || false
 
@@ -502,7 +516,7 @@ class User < ActiveRecord::Base
         create_visit_record!(now.to_date, posts_read: num_posts, mobile: opts.fetch(:mobile, false))
       rescue ActiveRecord::RecordNotUnique
         if !_retry
-          update_posts_read!(num_posts, opts.merge( retry: true ))
+          update_posts_read!(num_posts, opts.merge(retry: true))
         else
           raise
         end
@@ -516,7 +530,7 @@ class User < ActiveRecord::Base
     end
   end
 
-  def update_last_seen!(now=Time.zone.now)
+  def update_last_seen!(now = Time.zone.now)
     now_date = now.to_date
     # Only update last seen once every minute
     redis_key = "user:#{id}:#{now_date}"
@@ -574,6 +588,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
@@ -610,7 +625,7 @@ class User < ActiveRecord::Base
   end
 
   def flags_given_count
-    PostAction.where(user_id: id, post_action_type_id: PostActionType.flag_types.values).count
+    PostAction.where(user_id: id, post_action_type_id: PostActionType.flag_types_without_custom.values).count
   end
 
   def warnings_received_count
@@ -618,7 +633,7 @@ class User < ActiveRecord::Base
   end
 
   def flags_received_count
-    posts.includes(:post_actions).where('post_actions.post_action_type_id' => PostActionType.flag_types.values).count
+    posts.includes(:post_actions).where('post_actions.post_action_type_id' => PostActionType.flag_types_without_custom.values).count
   end
 
   def private_topics_count
@@ -650,15 +665,39 @@ class User < ActiveRecord::Base
   end
 
   def suspended?
-    suspended_till && suspended_till > DateTime.now
+    !!(suspended_till && suspended_till > Time.zone.now)
+  end
+
+  def silenced?
+    !!(silenced_till && silenced_till > Time.zone.now)
+  end
+
+  def silenced_record
+    UserHistory.for(self, :silence_user).order('id DESC').first
+  end
+
+  def silence_reason
+    silenced_record.try(:details) if silenced?
+  end
+
+  def silenced_at
+    silenced_record.try(:created_at) if silenced?
   end
 
   def suspend_record
     UserHistory.for(self, :suspend_user).order('id DESC').first
   end
 
+  def full_suspend_reason
+    return suspend_record.try(:details) if suspended?
+  end
+
   def suspend_reason
-    suspend_record.try(:details) if suspended?
+    if details = full_suspend_reason
+      return details.split("\n")[0]
+    end
+
+    nil
   end
 
   # Use this helper to determine if the user has a particular trust level.
@@ -689,21 +728,18 @@ class User < ActiveRecord::Base
   end
 
   def activate
-    email_token = self.email_tokens.active.first
-    if email_token
+    if email_token = self.email_tokens.active.where(email: self.email).first
       EmailToken.confirm(email_token.token)
     else
-      self.active = true
-      save
+      self.update!(active: true)
     end
   end
 
   def deactivate
-    self.active = false
-    save
+    self.update!(active: false)
   end
 
-  def change_trust_level!(level, opts=nil)
+  def change_trust_level!(level, opts = nil)
     Promotion.new(self).change_trust_level!(level, opts)
   end
 
@@ -716,26 +752,26 @@ class User < ActiveRecord::Base
     user_badges.select('distinct badge_id').count
   end
 
-  def featured_user_badges(limit=3)
+  def featured_user_badges(limit = 3)
     tl_badge_ids = Badge.trust_level_badge_ids
 
     query = user_badges
-              .group(:badge_id)
-              .select(UserBadge.attribute_names.map { |x| "MAX(user_badges.#{x}) AS #{x}" },
+      .group(:badge_id)
+      .select(UserBadge.attribute_names.map { |x| "MAX(user_badges.#{x}) AS #{x}" },
                       'COUNT(*) AS "count"',
                       'MAX(badges.badge_type_id) AS badges_badge_type_id',
                       'MAX(badges.grant_count) AS badges_grant_count')
-              .joins(:badge)
-              .order('badges_badge_type_id ASC, badges_grant_count ASC, badge_id DESC')
-              .includes(:user, :granted_by, { badge: :badge_type }, { post: :topic })
+      .joins(:badge)
+      .order('badges_badge_type_id ASC, badges_grant_count ASC, badge_id DESC')
+      .includes(:user, :granted_by, { badge: :badge_type }, post: :topic)
 
     tl_badge = query.where("user_badges.badge_id IN (:tl_badge_ids)",
                            tl_badge_ids: tl_badge_ids)
-                    .limit(1)
+      .limit(1)
 
     other_badges = query.where("user_badges.badge_id NOT IN (:tl_badge_ids)",
                                tl_badge_ids: tl_badge_ids)
-                        .limit(limit)
+      .limit(limit)
 
     (tl_badge + other_badges).take(limit)
   end
@@ -750,7 +786,6 @@ class User < ActiveRecord::Base
     result.group('date(users.created_at)').order('date(users.created_at)').count
   end
 
-
   def secure_category_ids
     cats = self.admin? ? Category.where(read_restricted: true) : secure_categories.references(:categories)
     cats.pluck('categories.id').sort
@@ -760,16 +795,15 @@ class User < ActiveRecord::Base
     Category.topic_create_allowed(self.id).select(:id)
   end
 
-
   # Flag all posts from a user as spam
   def flag_linked_posts_as_spam
     disagreed_flag_post_ids = PostAction.where(post_action_type_id: PostActionType.types[:spam])
-                                        .where.not(disagreed_at: nil)
-                                        .pluck(:post_id)
+      .where.not(disagreed_at: nil)
+      .pluck(:post_id)
 
     topic_links.includes(:post)
-               .where.not(post_id: disagreed_flag_post_ids)
-               .each do |tl|
+      .where.not(post_id: disagreed_flag_post_ids)
+      .each do |tl|
       begin
         message = I18n.t('flag_reason.spam_hosts', domain: tl.domain)
         PostAction.act(Discourse.system_user, tl.post, PostActionType.types[:spam], message: message)
@@ -812,7 +846,6 @@ class User < ActiveRecord::Base
       .exists?
   end
 
-
   def refresh_avatar
     return if @import_mode
 
@@ -824,7 +857,7 @@ class User < ActiveRecord::Base
     end
 
     # mark all the user's quoted posts as "needing a rebake"
-    Post.rebake_all_quoted_posts(self.id) if self.uploaded_avatar_id_changed?
+    Post.rebake_all_quoted_posts(self.id) if self.will_save_change_to_uploaded_avatar_id?
   end
 
   def first_post_created_at
@@ -868,25 +901,25 @@ class User < ActiveRecord::Base
 
   def number_of_deleted_posts
     Post.with_deleted
-        .where(user_id: self.id)
-        .where.not(deleted_at: nil)
-        .count
+      .where(user_id: self.id)
+      .where.not(deleted_at: nil)
+      .count
   end
 
   def number_of_flagged_posts
     Post.with_deleted
-        .where(user_id: self.id)
-        .where(id: PostAction.where(post_action_type_id: PostActionType.notify_flag_type_ids)
+      .where(user_id: self.id)
+      .where(id: PostAction.where(post_action_type_id: PostActionType.notify_flag_type_ids)
                              .where(disagreed_at: nil)
                              .select(:post_id))
-        .count
+      .count
   end
 
   def number_of_flags_given
     PostAction.where(user_id: self.id)
-              .where(disagreed_at: nil)
-              .where(post_action_type_id: PostActionType.notify_flag_type_ids)
-              .count
+      .where(disagreed_at: nil)
+      .where(post_action_type_id: PostActionType.notify_flag_type_ids)
+      .count
   end
 
   def number_of_suspensions
@@ -912,6 +945,48 @@ class User < ActiveRecord::Base
     DiscourseEvent.trigger(:user_logged_out, self)
   end
 
+  def logged_in
+    DiscourseEvent.trigger(:user_logged_in, self)
+
+    if !self.seen_before?
+      DiscourseEvent.trigger(:user_first_logged_in, self)
+    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
+      new_record? ? primary_email.email = email : primary_email.update(email: email)
+    else
+      build_primary_email(email: email)
+    end
+  end
+
+  def recent_time_read
+    self.created_at && self.created_at < 60.days.ago ?
+      self.user_visits.where('visited_at >= ?', 60.days.ago).sum(:time_read) :
+      self.user_stat&.time_read
+  end
+
   protected
 
   def badge_grant
@@ -919,7 +994,7 @@ class User < ActiveRecord::Base
   end
 
   def expire_old_email_tokens
-    if password_hash_changed? && !id_changed?
+    if saved_change_to_password_hash? && !saved_change_to_id?
       email_tokens.where('not expired').update_all(expired: true)
     end
   end
@@ -941,23 +1016,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
@@ -987,6 +1045,7 @@ class User < ActiveRecord::Base
       UserAuthToken.where(user_id: id).destroy_all
       # We should not carry this around after save
       @raw_password = nil
+      @password_required = false
     end
   end
 
@@ -1005,18 +1064,11 @@ 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
       existing = User.find_by(username_lower: lower)
-      if username_changed? && existing && existing.id != self.id
+      if will_save_change_to_username? && existing && existing.id != self.id
         errors.add(:username, I18n.t(:'user.username.unique'))
       end
     end
@@ -1051,11 +1103,13 @@ class User < ActiveRecord::Base
 
   # Delete unactivated accounts (without verified email) that are over a week old
   def self.purge_unactivated
+    return [] if SiteSetting.purge_unactivated_users_grace_period_days <= 0
+
     to_destroy = User.where(active: false)
-                     .joins('INNER JOIN user_stats AS us ON us.user_id = users.id')
-                     .where("created_at < ?", SiteSetting.purge_unactivated_users_grace_period_days.days.ago)
-                     .where('NOT admin AND NOT moderator')
-                     .limit(200)
+      .joins('INNER JOIN user_stats AS us ON us.user_id = users.id')
+      .where("created_at < ?", SiteSetting.purge_unactivated_users_grace_period_days.days.ago)
+      .where('NOT admin AND NOT moderator')
+      .limit(200)
 
     destroyer = UserDestroyer.new(Discourse.system_user)
     to_destroy.each do |u|
@@ -1085,48 +1139,56 @@ class User < ActiveRecord::Base
     true
   end
 
+  def set_skip_validate_email
+    if self.primary_email
+      self.primary_email.skip_validate_email = !should_validate_email_address?
+    end
+
+    true
+  end
+
 end
 
 # == Schema Information
 #
 # Table name: users
 #
-#  id                      :integer          not null, primary key
-#  username                :string(60)       not null
-#  created_at              :datetime         not null
-#  updated_at              :datetime         not null
-#  name                    :string
-#  seen_notification_id    :integer          default(0), not null
-#  last_posted_at          :datetime
-#  email                   :string(513)      not null
-#  password_hash           :string(64)
-#  salt                    :string(32)
-#  active                  :boolean          default(FALSE), not null
-#  username_lower          :string(60)       not null
-#  last_seen_at            :datetime
-#  admin                   :boolean          default(FALSE), not null
-#  last_emailed_at         :datetime
-#  trust_level             :integer          not null
-#  approved                :boolean          default(FALSE), not null
-#  approved_by_id          :integer
-#  approved_at             :datetime
-#  previous_visit_at       :datetime
-#  suspended_at            :datetime
-#  suspended_till          :datetime
-#  date_of_birth           :date
-#  views                   :integer          default(0), not null
-#  flag_level              :integer          default(0), not null
-#  ip_address              :inet
-#  moderator               :boolean          default(FALSE)
-#  blocked                 :boolean          default(FALSE)
-#  title                   :string
-#  uploaded_avatar_id      :integer
-#  locale                  :string(10)
-#  primary_group_id        :integer
-#  registration_ip_address :inet
-#  trust_level_locked      :boolean          default(FALSE), not null
-#  staged                  :boolean          default(FALSE), not null
-#  first_seen_at           :datetime
+#  id                        :integer          not null, primary key
+#  username                  :string(60)       not null
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
+#  name                      :string(255)
+#  seen_notification_id      :integer          default(0), not null
+#  last_posted_at            :datetime
+#  password_hash             :string(64)
+#  salt                      :string(32)
+#  active                    :boolean          default(FALSE), not null
+#  username_lower            :string(60)       not null
+#  last_seen_at              :datetime
+#  admin                     :boolean          default(FALSE), not null
+#  last_emailed_at           :datetime
+#  trust_level               :integer          not null
+#  approved                  :boolean          default(FALSE), not null
+#  approved_by_id            :integer
+#  approved_at               :datetime
+#  previous_visit_at         :datetime
+#  suspended_at              :datetime
+#  suspended_till            :datetime
+#  date_of_birth             :date
+#  views                     :integer          default(0), not null
+#  flag_level                :integer          default(0), not null
+#  ip_address                :inet
+#  moderator                 :boolean          default(FALSE)
+#  title                     :string(255)
+#  uploaded_avatar_id        :integer
+#  primary_group_id          :integer
+#  locale                    :string(10)
+#  registration_ip_address   :inet
+#  staged                    :boolean          default(FALSE), not null
+#  first_seen_at             :datetime
+#  silenced_till             :datetime
+#  group_locked_trust_level  :integer
+#  manual_locked_trust_level :integer
 #
 # Indexes
 #
diff --git a/app/models/user_action.rb b/app/models/user_action.rb
index 5e3599a381..02123a1d44 100644
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@@ -11,7 +11,7 @@ class UserAction < ActiveRecord::Base
   BOOKMARK = 3
   NEW_TOPIC = 4
   REPLY = 5
-  RESPONSE= 6
+  RESPONSE = 6
   MENTION = 7
   QUOTE = 9
   EDIT = 11
@@ -75,7 +75,7 @@ SQL
     apply_common_filters(builder, user_id, guardian)
 
     results = builder.exec.to_a
-    results.sort! { |a,b| ORDER[a.action_type] <=> ORDER[b.action_type] }
+    results.sort! { |a, b| ORDER[a.action_type] <=> ORDER[b.action_type] }
 
     results
   end
@@ -109,10 +109,10 @@ SQL
        GROUP BY g.name
     SQL
 
-    result = { all: all, mine: mine, unread: unread}
+    result = { all: all, mine: mine, unread: unread }
 
     exec_sql(sql, user_id: user_id).each do |row|
-      (result[:groups] ||= []) << {name: row["name"], count: row["count"].to_i}
+      (result[:groups] ||= []) << { name: row["name"], count: row["count"].to_i }
     end
 
     result
@@ -123,7 +123,7 @@ SQL
     stream(action_id: action_id, guardian: guardian).first
   end
 
-  def self.stream_queued(opts=nil)
+  def self.stream_queued(opts = nil)
     opts ||= {}
 
     offset = opts[:offset] || 0
@@ -156,7 +156,7 @@ SQL
       .map_exec(UserActionRow)
   end
 
-  def self.stream(opts=nil)
+  def self.stream(opts = nil)
     opts ||= {}
 
     action_types = opts[:action_types]
@@ -167,6 +167,18 @@ SQL
     offset = opts[:offset] || 0
     limit = opts[:limit] || 60
 
+    # Acting user columns. Can be extended by plugins to include custom avatar
+    # columns
+    acting_cols = [
+      'u.id AS acting_user_id',
+      'u.name AS acting_name'
+    ]
+
+    AvatarLookup.lookup_columns.each do |c|
+      next if c == :id || c['.']
+      acting_cols << "u.#{c} AS acting_#{c}"
+    end
+
     # The weird thing is that target_post_id can be null, so it makes everything
     #  ever so more complex. Should we allow this, not sure.
     builder = SqlBuilder.new <<-SQL
@@ -179,8 +191,7 @@ SQL
         p.reply_to_post_number,
         pu.username, pu.name, pu.id user_id,
         pu.uploaded_avatar_id,
-        u.username acting_username, u.name acting_name, u.id acting_user_id,
-        u.uploaded_avatar_id acting_uploaded_avatar_id,
+        #{acting_cols.join(', ')},
         coalesce(p.cooked, p2.cooked) cooked,
         CASE WHEN coalesce(p.deleted_at, p2.deleted_at, t.deleted_at) IS NULL THEN false ELSE true END deleted,
         p.hidden,
@@ -209,6 +220,11 @@ SQL
     else
       builder.where("a.user_id = :user_id", user_id: user_id.to_i)
       builder.where("a.action_type in (:action_types)", action_types: action_types) if action_types && action_types.length > 0
+
+      unless SiteSetting.enable_mentions?
+        builder.where("a.action_type <> :mention_type", mention_type: UserAction::MENTION)
+      end
+
       builder
         .order_by("a.created_at desc")
         .offset(offset.to_i)
@@ -276,7 +292,7 @@ SQL
     require_parameters(hash, :action_type, :user_id, :acting_user_id, :target_topic_id, :target_post_id)
     if action = UserAction.find_by(hash.except(:created_at))
       action.destroy
-      MessageBus.publish("/user/#{hash[:user_id]}", {user_action_id: action.id, remove: true})
+      MessageBus.publish("/user/#{hash[:user_id]}", user_action_id: action.id, remove: true)
     end
 
     if !Topic.where(id: hash[:target_topic_id], archetype: Archetype.private_message).exists?
@@ -331,7 +347,7 @@ SQL
     end
   end
 
-  def self.apply_common_filters(builder,user_id,guardian,ignore_private_messages=false)
+  def self.apply_common_filters(builder, user_id, guardian, ignore_private_messages = false)
     # We never return deleted topics in activity
     builder.where("t.deleted_at is null")
 
@@ -341,7 +357,7 @@ SQL
 
       current_user_id = -2
       current_user_id = guardian.user.id if guardian.user
-      builder.where("NOT COALESCE(p.hidden, false) OR p.user_id = :current_user_id", current_user_id: current_user_id )
+      builder.where("NOT COALESCE(p.hidden, false) OR p.user_id = :current_user_id", current_user_id: current_user_id)
     end
 
     visible_post_types = Topic.visible_post_types(guardian.user)
@@ -381,7 +397,7 @@ SQL
       if allowed.present?
         builder.where("( c.read_restricted IS NULL OR
                          NOT c.read_restricted OR
-                        (c.read_restricted and c.id in (:cats)) )", cats: guardian.secure_category_ids )
+                        (c.read_restricted and c.id in (:cats)) )", cats: guardian.secure_category_ids)
       else
         builder.where("(c.read_restricted IS NULL OR NOT c.read_restricted)")
       end
@@ -412,9 +428,9 @@ end
 #
 # Indexes
 #
-#  idx_unique_rows                                (action_type,user_id,target_topic_id,target_post_id,acting_user_id) UNIQUE
-#  idx_user_actions_speed_up_user_all             (user_id,created_at,action_type)
-#  index_user_actions_on_acting_user_id           (acting_user_id)
-#  index_user_actions_on_target_post_id           (target_post_id)
-#  index_user_actions_on_user_id_and_action_type  (user_id,action_type)
+#  idx_unique_rows                           (action_type,user_id,target_topic_id,target_post_id,acting_user_id) UNIQUE
+#  idx_user_actions_speed_up_user_all        (user_id,created_at,action_type)
+#  index_actions_on_acting_user_id           (acting_user_id)
+#  index_actions_on_user_id_and_action_type  (user_id,action_type)
+#  index_user_actions_on_target_post_id      (target_post_id)
 #
diff --git a/app/models/user_api_key.rb b/app/models/user_api_key.rb
index be0e85b7f8..39f8d4a80f 100644
--- a/app/models/user_api_key.rb
+++ b/app/models/user_api_key.rb
@@ -30,7 +30,7 @@ class UserApiKey < ActiveRecord::Base
     # not a rails route, special handling
     return true if action == "message_bus" && env["PATH_INFO"] =~ /^\/message-bus\/.*\/poll/
 
-    params  = env['action_dispatch.request.path_parameters']
+    params = env['action_dispatch.request.path_parameters']
 
     return false unless params
 
diff --git a/app/models/user_archived_message.rb b/app/models/user_archived_message.rb
index 1cb45c8165..36c3ccd1ac 100644
--- a/app/models/user_archived_message.rb
+++ b/app/models/user_archived_message.rb
@@ -11,21 +11,21 @@ class UserArchivedMessage < ActiveRecord::Base
 
     UserArchivedMessage.where(user_id: user_id, topic_id: topic_id).destroy_all
     trigger(:move_to_inbox, user_id, topic_id)
-    MessageBus.publish("/topic/#{topic_id}", {type: "move_to_inbox"}, user_ids: [user_id])
+    MessageBus.publish("/topic/#{topic_id}", { type: "move_to_inbox" }, user_ids: [user_id])
   end
 
   def self.archive!(user_id, topic_id)
     UserArchivedMessage.where(user_id: user_id, topic_id: topic_id).destroy_all
     UserArchivedMessage.create!(user_id: user_id, topic_id: topic_id)
     trigger(:archive_message, user_id, topic_id)
-    MessageBus.publish("/topic/#{topic_id}", {type: "archived"}, user_ids: [user_id])
+    MessageBus.publish("/topic/#{topic_id}", { type: "archived" }, user_ids: [user_id])
   end
 
   def self.trigger(event, user_id, topic_id)
     user = User.find_by(id: user_id)
     topic = Topic.find_by(id: topic_id)
     if user && topic
-      DiscourseEvent.trigger(event, {user: user, topic: topic})
+      DiscourseEvent.trigger(event, user: user, topic: topic)
     end
   end
 end
diff --git a/app/models/user_auth_token.rb b/app/models/user_auth_token.rb
index 7a22ea5931..5597d52367 100644
--- a/app/models/user_auth_token.rb
+++ b/app/models/user_auth_token.rb
@@ -40,7 +40,7 @@ class UserAuthToken < ActiveRecord::Base
     user_auth_token
   end
 
-  def self.lookup(unhashed_token, opts=nil)
+  def self.lookup(unhashed_token, opts = nil)
 
     mark_seen = opts && opts[:seen]
 
@@ -123,7 +123,7 @@ class UserAuthToken < ActiveRecord::Base
 
   end
 
-  def rotate!(info=nil)
+  def rotate!(info = nil)
     user_agent = (info && info[:user_agent] || self.user_agent)
     client_ip = (info && info[:client_ip] || self.client_ip)
 
diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
index 0c49693ddb..a247bb4752 100644
--- a/app/models/user_avatar.rb
+++ b/app/models/user_avatar.rb
@@ -19,13 +19,18 @@ class UserAvatar < ActiveRecord::Base
         self.last_gravatar_download_attempt = Time.new
 
         max = Discourse.avatar_sizes.max
-        gravatar_url = "http://www.gravatar.com/avatar/#{email_hash}.png?s=#{max}&d=404"
+        gravatar_url = "https://www.gravatar.com/avatar/#{email_hash}.png?s=#{max}&d=404"
+
+        # follow redirects in case gravatar change rules on us
         tempfile = FileHelper.download(
           gravatar_url,
           max_file_size: SiteSetting.max_image_size_kb.kilobytes,
           tmp_file_name: "gravatar",
-          skip_rate_limit: true
+          skip_rate_limit: true,
+          verbose: false,
+          follow_redirect: true
         )
+
         if tempfile
           upload = UploadCreator.new(tempfile, 'gravatar.png', origin: gravatar_url, type: "avatar").create_for(user_id)
 
@@ -67,7 +72,7 @@ class UserAvatar < ActiveRecord::Base
     "#{upload_id}_#{OptimizedImage::VERSION}"
   end
 
-  def self.import_url_for_user(avatar_url, user, options=nil)
+  def self.import_url_for_user(avatar_url, user, options = nil)
     tempfile = FileHelper.download(
       avatar_url,
       max_file_size: SiteSetting.max_image_size_kb.kilobytes,
diff --git a/app/models/user_badge.rb b/app/models/user_badge.rb
index a50bf1be72..71a065e0e0 100644
--- a/app/models/user_badge.rb
+++ b/app/models/user_badge.rb
@@ -5,7 +5,11 @@ class UserBadge < ActiveRecord::Base
   belongs_to :notification, dependent: :destroy
   belongs_to :post
 
-  validates :badge_id, presence: true, uniqueness: {scope: :user_id}, if: 'badge.single_grant?'
+  validates :badge_id,
+    presence: true,
+    uniqueness: { scope: :user_id },
+    if: :single_grant_badge?
+
   validates :user_id, presence: true
   validates :granted_at, presence: true
   validates :granted_by, presence: true
@@ -19,6 +23,12 @@ class UserBadge < ActiveRecord::Base
     Badge.decrement_counter 'grant_count', self.badge_id
     DiscourseEvent.trigger(:user_badge_removed, self.badge_id, self.user_id)
   end
+
+  private
+
+    def single_grant_badge?
+      self.badge.single_grant?
+    end
 end
 
 # == Schema Information
@@ -39,5 +49,4 @@ end
 #  index_user_badges_on_badge_id_and_user_id              (badge_id,user_id)
 #  index_user_badges_on_badge_id_and_user_id_and_post_id  (badge_id,user_id,post_id) UNIQUE
 #  index_user_badges_on_badge_id_and_user_id_and_seq      (badge_id,user_id,seq) UNIQUE
-#  index_user_badges_on_user_id                           (user_id)
 #
diff --git a/app/models/user_badges.rb b/app/models/user_badges.rb
index 187ee1bc9f..bd68c4c037 100644
--- a/app/models/user_badges.rb
+++ b/app/models/user_badges.rb
@@ -4,7 +4,7 @@ class UserBadges
 
   attr_accessor :user_badges, :username, :grant_count
 
-  def initialize(opts={})
+  def initialize(opts = {})
     @user_badges = opts[:user_badges]
     @username = opts[:username]
     @grant_count = opts[:grant_count]
diff --git a/app/models/user_email.rb b/app/models/user_email.rb
new file mode 100644
index 0000000000..426d2fe828
--- /dev/null
+++ b/app/models/user_email.rb
@@ -0,0 +1,48 @@
+require_dependency 'email_validator'
+
+class UserEmail < ActiveRecord::Base
+  belongs_to :user
+
+  attr_accessor :skip_validate_email
+
+  before_validation :strip_downcase_email
+
+  validates :email, presence: true, uniqueness: true
+
+  validates :email, email: true, format: { with: EmailValidator.email_regex },
+                    if: :validate_email?
+
+  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 validate_email?
+    return false if self.skip_validate_email
+    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_email                (lower((email)::text)) UNIQUE
+#  index_user_emails_on_user_id              (user_id)
+#  index_user_emails_on_user_id_and_primary  (user_id,primary) UNIQUE
+#
diff --git a/app/models/user_export.rb b/app/models/user_export.rb
index 71c1143bdf..20269d9b92 100644
--- a/app/models/user_export.rb
+++ b/app/models/user_export.rb
@@ -26,7 +26,7 @@ end
 # Table name: user_exports
 #
 #  id         :integer          not null, primary key
-#  file_name  :string           not null
+#  file_name  :string(255)      not null
 #  user_id    :integer          not null
 #  created_at :datetime
 #  updated_at :datetime
diff --git a/app/models/user_field.rb b/app/models/user_field.rb
index 6505982b9c..6183f63401 100644
--- a/app/models/user_field.rb
+++ b/app/models/user_field.rb
@@ -16,12 +16,12 @@ end
 # Table name: user_fields
 #
 #  id                :integer          not null, primary key
-#  name              :string           not null
-#  field_type        :string           not null
+#  name              :string(255)      not null
+#  field_type        :string(255)      not null
 #  created_at        :datetime
 #  updated_at        :datetime
 #  editable          :boolean          default(FALSE), not null
-#  description       :string           not null
+#  description       :string(255)      not null
 #  required          :boolean          default(TRUE), not null
 #  show_on_profile   :boolean          default(FALSE), not null
 #  position          :integer          default(0)
diff --git a/app/models/user_field_option.rb b/app/models/user_field_option.rb
index 56299f3ee9..2b3036fa40 100644
--- a/app/models/user_field_option.rb
+++ b/app/models/user_field_option.rb
@@ -7,7 +7,7 @@ end
 #
 #  id            :integer          not null, primary key
 #  user_field_id :integer          not null
-#  value         :string           not null
+#  value         :string(255)      not null
 #  created_at    :datetime
 #  updated_at    :datetime
 #
diff --git a/app/models/user_history.rb b/app/models/user_history.rb
index e177cd8de4..d2f7f25a94 100644
--- a/app/models/user_history.rb
+++ b/app/models/user_history.rb
@@ -11,7 +11,7 @@ class UserHistory < ActiveRecord::Base
 
   validates_presence_of :action
 
-  scope :only_staff_actions, ->{ where("action IN (?)", UserHistory.staff_action_ids) }
+  scope :only_staff_actions, -> { where("action IN (?)", UserHistory.staff_action_ids) }
 
   before_save :set_admin_only
 
@@ -45,8 +45,8 @@ class UserHistory < ActiveRecord::Base
                           delete_category: 27,
                           create_category: 28,
                           change_site_text: 29,
-                          block_user: 30,
-                          unblock_user: 31,
+                          silence_user: 30,
+                          unsilence_user: 31,
                           grant_admin: 32,
                           revoke_admin: 33,
                           grant_moderation: 34,
@@ -90,8 +90,8 @@ class UserHistory < ActiveRecord::Base
                         :change_category_settings,
                         :delete_category,
                         :create_category,
-                        :block_user,
-                        :unblock_user,
+                        :silence_user,
+                        :unsilence_user,
                         :grant_admin,
                         :revoke_admin,
                         :grant_moderation,
@@ -121,7 +121,7 @@ class UserHistory < ActiveRecord::Base
     query = query.where(custom_type: filters[:custom_type]) if filters[:custom_type].present?
 
     [:acting_user, :target_user].each do |key|
-      if filters[key] and obj_id = User.where(username_lower: filters[key].downcase).pluck(:id)
+      if filters[key] && (obj_id = User.where(username_lower: filters[key].downcase).pluck(:id))
         query = query.where("#{key}_id = ?", obj_id)
       end
     end
@@ -133,7 +133,7 @@ class UserHistory < ActiveRecord::Base
     self.where(target_user_id: user.id, action: UserHistory.actions[action_type])
   end
 
-  def self.exists_for_user?(user, action_type, opts=nil)
+  def self.exists_for_user?(user, action_type, opts = nil)
     opts = opts || {}
     result = self.where(target_user_id: user.id, action: UserHistory.actions[action_type])
     result = result.where(topic_id: opts[:topic_id]) if opts[:topic_id]
@@ -144,14 +144,13 @@ class UserHistory < ActiveRecord::Base
     [:action_id, :custom_type, :acting_user, :target_user, :subject]
   end
 
-  def self.staff_action_records(viewer, opts=nil)
+  def self.staff_action_records(viewer, opts = nil)
     opts ||= {}
     query = self.with_filters(opts.slice(*staff_filters)).only_staff_actions.limit(200).order('id DESC').includes(:acting_user, :target_user)
     query = query.where(admin_only: false) unless viewer && viewer.admin?
     query
   end
 
-
   def set_admin_only
     self.admin_only = UserHistory.admin_only_action_ids.include?(self.action)
     self
@@ -177,23 +176,23 @@ end
 #  details        :text
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
-#  context        :string
-#  ip_address     :string
-#  email          :string
+#  context        :string(255)
+#  ip_address     :string(255)
+#  email          :string(255)
 #  subject        :text
 #  previous_value :text
 #  new_value      :text
 #  topic_id       :integer
 #  admin_only     :boolean          default(FALSE)
 #  post_id        :integer
-#  custom_type    :string
+#  custom_type    :string(255)
 #  category_id    :integer
 #
 # Indexes
 #
+#  index_staff_action_logs_on_action_and_id                  (action,id)
+#  index_staff_action_logs_on_subject_and_id                 (subject,id)
+#  index_staff_action_logs_on_target_user_id_and_id          (target_user_id,id)
 #  index_user_histories_on_acting_user_id_and_action_and_id  (acting_user_id,action,id)
-#  index_user_histories_on_action_and_id                     (action,id)
 #  index_user_histories_on_category_id                       (category_id)
-#  index_user_histories_on_subject_and_id                    (subject,id)
-#  index_user_histories_on_target_user_id_and_id             (target_user_id,id)
 #
diff --git a/app/models/user_open_id.rb b/app/models/user_open_id.rb
index 188a04ef15..183f241482 100644
--- a/app/models/user_open_id.rb
+++ b/app/models/user_open_id.rb
@@ -11,8 +11,8 @@ end
 #
 #  id         :integer          not null, primary key
 #  user_id    :integer          not null
-#  email      :string           not null
-#  url        :string           not null
+#  email      :string(255)      not null
+#  url        :string(255)      not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #  active     :boolean          not null
diff --git a/app/models/user_option.rb b/app/models/user_option.rb
index 551380335d..e882e4ccf3 100644
--- a/app/models/user_option.rb
+++ b/app/models/user_option.rb
@@ -8,7 +8,7 @@ class UserOption < ActiveRecord::Base
   def self.ensure_consistency!
     exec_sql("SELECT u.id FROM users u
               LEFT JOIN user_options o ON o.user_id = u.id
-              WHERE o.user_id IS NULL").values.each do |id,_|
+              WHERE o.user_id IS NULL").values.each do |id, _|
       UserOption.create(user_id: id.to_i)
     end
   end
@@ -59,11 +59,6 @@ class UserOption < ActiveRecord::Base
     super
   end
 
-  def update_tracked_topics
-    return unless auto_track_topics_after_msecs_changed?
-    TrackedTopicsUpdater.new(id, auto_track_topics_after_msecs).call
-  end
-
   def redirected_to_top_yet?
     last_redirected_to_top_at.present?
   end
@@ -77,7 +72,7 @@ class UserOption < ActiveRecord::Base
     $redis.expire(key, delay)
 
     # delay the update
-    Jobs.enqueue_in(delay / 2, :update_top_redirection, user_id: self.id, redirected_at: Time.zone.now)
+    Jobs.enqueue_in(delay / 2, :update_top_redirection, user_id: self.user_id, redirected_at: Time.zone.now)
   end
 
   def should_be_redirected_to_top
@@ -92,11 +87,10 @@ class UserOption < ActiveRecord::Base
     return if user.trust_level > 0 && user.last_seen_at && user.last_seen_at > 1.month.ago
 
     # top must be in the top_menu
-    return unless SiteSetting.top_menu =~ /(^|\|)top(\||$)/i
-
+    return unless SiteSetting.top_menu[/\btop\b/i]
 
     # not enough topics
-    return unless period = SiteSetting.min_redirected_to_top_period(1.days.ago)
+    return unless period = SiteSetting.min_redirected_to_top_period(1.day.ago)
 
     if !user.seen_before? || (user.trust_level == 0 && !redirected_to_top_yet?)
       update_last_redirected_to_top!
@@ -118,18 +112,40 @@ class UserOption < ActiveRecord::Base
 
   def treat_as_new_topic_start_date
     duration = new_topic_duration_minutes || SiteSetting.default_other_new_topic_duration_minutes.to_i
-    times = [case duration
+    times = [
+      case duration
       when User::NewTopicDuration::ALWAYS
         user.created_at
       when User::NewTopicDuration::LAST_VISIT
         user.previous_visit_at || user.user_stat.new_since
       else
         duration.minutes.ago
-    end, user.user_stat.new_since, Time.at(SiteSetting.min_new_topics_time).to_datetime]
+      end,
+      user.user_stat.new_since,
+      Time.at(SiteSetting.min_new_topics_time).to_datetime
+    ]
 
     times.max
   end
 
+  def homepage
+    case homepage_id
+    when 1 then "latest"
+    when 2 then "categories"
+    when 3 then "unread"
+    when 4 then "new"
+    when 5 then "top"
+    else SiteSetting.homepage
+    end
+  end
+
+  private
+
+    def update_tracked_topics
+      return unless saved_change_to_auto_track_topics_after_msecs?
+      TrackedTopicsUpdater.new(id, auto_track_topics_after_msecs).call
+    end
+
 end
 
 # == Schema Information
@@ -159,6 +175,8 @@ end
 #  notification_level_when_replying :integer
 #  theme_key                        :string
 #  theme_key_seq                    :integer          default(0), not null
+#  allow_private_messages           :boolean          default(TRUE), not null
+#  homepage_id                      :integer
 #
 # Indexes
 #
diff --git a/app/models/user_profile.rb b/app/models/user_profile.rb
index a6ceec4858..d10b63f034 100644
--- a/app/models/user_profile.rb
+++ b/app/models/user_profile.rb
@@ -1,10 +1,8 @@
 class UserProfile < ActiveRecord::Base
   belongs_to :user, inverse_of: :user_profile
 
-  WEBSITE_REGEXP = /(^$)|(^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,10}(([0-9]{1,5})?\/.*)?$)/ix
-
   validates :bio_raw, length: { maximum: 3000 }
-  validates :website, format: { with: WEBSITE_REGEXP }, allow_blank: true, if: Proc.new { |c| c.new_record? || c.website_changed? }
+  validates :website, url: true, allow_blank: true, if: Proc.new { |c| c.new_record? || c.website_changed? }
   validates :user, presence: true
   before_save :cook
   after_save :trigger_badges
@@ -19,7 +17,7 @@ class UserProfile < ActiveRecord::Base
 
   BAKED_VERSION = 1
 
-  def bio_excerpt(length=350, opts={})
+  def bio_excerpt(length = 350, opts = {})
     excerpt = PrettyText.excerpt(bio_cooked, length, opts).sub(/<br>$/, '')
     return excerpt if excerpt.blank? || (user.has_trust_level?(TrustLevel[1]) && !user.suspended?)
     PrettyText.strip_links(excerpt)
@@ -63,11 +61,11 @@ class UserProfile < ActiveRecord::Base
   def self.rebake_old(limit)
     problems = []
     UserProfile.where('bio_cooked_version IS NULL OR bio_cooked_version < ?', BAKED_VERSION)
-        .limit(limit).each do |p|
+      .limit(limit).each do |p|
       begin
         p.rebake!
       rescue => e
-        problems << {profile: p, ex: e}
+        problems << { profile: p, ex: e }
       end
     end
     problems
@@ -119,12 +117,12 @@ end
 # Table name: user_profiles
 #
 #  user_id              :integer          not null, primary key
-#  location             :string
-#  website              :string
+#  location             :string(255)
+#  website              :string(255)
 #  bio_raw              :text
 #  bio_cooked           :text
-#  profile_background   :string(255)
 #  dismissed_banner_key :integer
+#  profile_background   :string(255)
 #  bio_cooked_version   :integer
 #  badge_granted_title  :boolean          default(FALSE)
 #  card_background      :string(255)
diff --git a/app/models/user_profile_view.rb b/app/models/user_profile_view.rb
index efe43cd42e..716b26c07c 100644
--- a/app/models/user_profile_view.rb
+++ b/app/models/user_profile_view.rb
@@ -3,7 +3,7 @@ class UserProfileView < ActiveRecord::Base
 
   belongs_to :user_profile
 
-  def self.add(user_profile_id, ip, user_id=nil, at=nil, skip_redis=false)
+  def self.add(user_profile_id, ip, user_id = nil, at = nil, skip_redis = false)
     at ||= Time.zone.now
     redis_key = "user-profile-view:#{user_profile_id}:#{at.to_date}"
     if user_id
@@ -41,7 +41,7 @@ class UserProfileView < ActiveRecord::Base
     end
   end
 
-  def self.profile_views_by_day(start_date, end_date, group_id=nil)
+  def self.profile_views_by_day(start_date, end_date, group_id = nil)
     profile_views = self.where("viewed_at >= ? AND viewed_at < ?", start_date, end_date + 1.day)
     if group_id
       profile_views = profile_views.joins("INNER JOIN users ON users.id = user_profile_views.user_id")
diff --git a/app/models/user_search.rb b/app/models/user_search.rb
index 9b6c02c6ac..8a2013b5b5 100644
--- a/app/models/user_search.rb
+++ b/app/models/user_search.rb
@@ -3,12 +3,13 @@ require_dependency 'search'
 
 class UserSearch
 
-  def initialize(term, opts={})
+  def initialize(term, opts = {})
     @term = term
     @term_like = "#{term.downcase.gsub("_", "\\_")}%"
     @topic_id = opts[:topic_id]
     @topic_allowed_users = opts[:topic_allowed_users]
     @searching_user = opts[:searching_user]
+    @include_staged_users = opts[:include_staged_users] || false
     @limit = opts[:limit] || 20
     @group = opts[:group]
     @guardian = Guardian.new(@searching_user)
@@ -16,7 +17,8 @@ class UserSearch
   end
 
   def scoped_users
-    users = User.where(active: true, staged: false)
+    users = User.where(active: true)
+    users = users.where(staged: false) unless @include_staged_users
 
     if @group
       users = users.where('users.id IN (
@@ -34,8 +36,8 @@ class UserSearch
 
       if topic.category && topic.category.read_restricted
         users = users.includes(:secure_categories)
-                     .where("users.admin = TRUE OR categories.id = ?", topic.category.id)
-                     .references(:categories)
+          .where("users.admin = TRUE OR categories.id = ?", topic.category.id)
+          .references(:categories)
       end
     end
 
@@ -50,9 +52,9 @@ class UserSearch
         query = Search.ts_query(@term, "simple")
 
         users = users.includes(:user_search_data)
-                     .references(:user_search_data)
-                     .where("user_search_data.search_data @@ #{query}")
-                     .order(User.sql_fragment("CASE WHEN username_lower LIKE ? THEN 0 ELSE 1 END ASC", @term_like))
+          .references(:user_search_data)
+          .where("user_search_data.search_data @@ #{query}")
+          .order(User.sql_fragment("CASE WHEN username_lower LIKE ? THEN 0 ELSE 1 END ASC", @term_like))
 
       else
         users = users.where("username_lower LIKE :term_like", term_like: @term_like)
@@ -68,9 +70,9 @@ class UserSearch
     # 1. exact username matches
     if @term.present?
       scoped_users.where(username_lower: @term.downcase)
-                  .limit(@limit)
-                  .pluck(:id)
-                  .each { |id| users << id }
+        .limit(@limit)
+        .pluck(:id)
+        .each { |id| users << id }
 
     end
 
@@ -79,19 +81,19 @@ class UserSearch
     # 2. in topic
     if @topic_id
       filtered_by_term_users.where('users.id IN (SELECT p.user_id FROM posts p WHERE topic_id = ?)', @topic_id)
-                            .order('last_seen_at DESC')
-                            .limit(@limit - users.length)
-                            .pluck(:id)
-                            .each { |id| users << id }
+        .order('last_seen_at DESC')
+        .limit(@limit - users.length)
+        .pluck(:id)
+        .each { |id| users << id }
     end
 
     return users.to_a if users.length >= @limit
 
     # 3. global matches
     filtered_by_term_users.order('last_seen_at DESC')
-                            .limit(@limit - users.length)
-                            .pluck(:id)
-                            .each { |id| users << id }
+      .limit(@limit - users.length)
+      .pluck(:id)
+      .each { |id| users << id }
 
     users.to_a
   end
@@ -103,7 +105,7 @@ class UserSearch
     User.joins("JOIN (SELECT unnest uid, row_number() OVER () AS rn
       FROM unnest('{#{ids.join(",")}}'::int[])
     ) x on uid = users.id")
-        .order("rn")
+      .order("rn")
   end
 
 end
diff --git a/app/models/user_search_data.rb b/app/models/user_search_data.rb
index fab5337291..2de3be31cb 100644
--- a/app/models/user_search_data.rb
+++ b/app/models/user_search_data.rb
@@ -1,6 +1,5 @@
 class UserSearchData < ActiveRecord::Base
-  belongs_to :user
-  validates_presence_of :search_data
+  include HasSearchData
 end
 
 # == Schema Information
@@ -11,6 +10,7 @@ end
 #  search_data :tsvector
 #  raw_data    :text
 #  locale      :text
+#  version     :integer          default(0)
 #
 # Indexes
 #
diff --git a/app/models/user_stat.rb b/app/models/user_stat.rb
index 50761737e3..8e7b3da43b 100644
--- a/app/models/user_stat.rb
+++ b/app/models/user_stat.rb
@@ -10,8 +10,8 @@ class UserStat < ActiveRecord::Base
 
   def self.reset_bounce_scores
     UserStat.where("reset_bounce_score_after < now()")
-            .where("bounce_score > 0")
-            .update_all(bounce_score: 0)
+      .where("bounce_score > 0")
+      .update_all(bounce_score: 0)
   end
 
   # Updates the denormalized view counts for all users
@@ -52,17 +52,18 @@ class UserStat < ActiveRecord::Base
     ", seen_at: last_seen
   end
 
+  # topic_reply_count is a count of posts in other users' topics
   def update_topic_reply_count
     self.topic_reply_count =
         Topic
-        .where(['id in (
+      .where(['id in (
               SELECT topic_id FROM posts p
               JOIN topics t2 ON t2.id = p.topic_id
               WHERE p.deleted_at IS NULL AND
                 t2.user_id <> p.user_id AND
                 p.user_id = ?
               )', self.user_id])
-        .count
+      .count
   end
 
   MAX_TIME_READ_DIFF = 100
@@ -71,7 +72,9 @@ class UserStat < ActiveRecord::Base
     if last_seen = last_seen_cached
       diff = (Time.now.to_f - last_seen.to_f).round
       if diff > 0 && diff < MAX_TIME_READ_DIFF
-        UserStat.where(user_id: id, time_read: time_read).update_all ["time_read = time_read + ?", diff]
+        update_args = ["time_read = time_read + ?", diff]
+        UserStat.where(user_id: id, time_read: time_read).update_all(update_args)
+        UserVisit.where(user_id: id, visited_at: Time.zone.now.to_date).update_all(update_args)
       end
     end
     cache_last_seen(Time.now.to_f)
diff --git a/app/models/user_summary.rb b/app/models/user_summary.rb
index abfc9b8f51..6eb177382d 100644
--- a/app/models/user_summary.rb
+++ b/app/models/user_summary.rb
@@ -53,18 +53,18 @@ class UserSummary
   def most_liked_by_users
     likers = {}
     UserAction.joins(:target_topic, :target_post)
-              .merge(Topic.listable_topics.visible.secured(@guardian))
-              .where(user: @user)
-              .where(action_type: UserAction::WAS_LIKED)
-              .group(:acting_user_id)
-              .order('COUNT(*) DESC')
-              .limit(MAX_SUMMARY_RESULTS)
-              .pluck('acting_user_id, COUNT(*)')
-              .each { |l| likers[l[0].to_s] = l[1] }
+      .merge(Topic.listable_topics.visible.secured(@guardian))
+      .where(user: @user)
+      .where(action_type: UserAction::WAS_LIKED)
+      .group(:acting_user_id)
+      .order('COUNT(*) DESC')
+      .limit(MAX_SUMMARY_RESULTS)
+      .pluck('acting_user_id, COUNT(*)')
+      .each { |l| likers[l[0].to_s] = l[1] }
 
     User.where(id: likers.keys)
-        .pluck(:id, :username, :name, :uploaded_avatar_id)
-        .map do |u|
+      .pluck(:id, :username, :name, :uploaded_avatar_id)
+      .map do |u|
       UserWithCount.new(
         id: u[0],
         username: u[1],
@@ -78,18 +78,18 @@ class UserSummary
   def most_liked_users
     liked_users = {}
     UserAction.joins(:target_topic, :target_post)
-              .merge(Topic.listable_topics.visible.secured(@guardian))
-              .where(action_type: UserAction::WAS_LIKED)
-              .where(acting_user_id: @user.id)
-              .group(:user_id)
-              .order('COUNT(*) DESC')
-              .limit(MAX_SUMMARY_RESULTS)
-              .pluck('user_actions.user_id, COUNT(*)')
-              .each { |l| liked_users[l[0].to_s] = l[1] }
+      .merge(Topic.listable_topics.visible.secured(@guardian))
+      .where(action_type: UserAction::WAS_LIKED)
+      .where(acting_user_id: @user.id)
+      .group(:user_id)
+      .order('COUNT(*) DESC')
+      .limit(MAX_SUMMARY_RESULTS)
+      .pluck('user_actions.user_id, COUNT(*)')
+      .each { |l| liked_users[l[0].to_s] = l[1] }
 
     User.where(id: liked_users.keys)
-        .pluck(:id, :username, :name, :uploaded_avatar_id)
-        .map do |u|
+      .pluck(:id, :username, :name, :uploaded_avatar_id)
+      .map do |u|
       UserWithCount.new(
         id: u[0],
         username: u[1],
@@ -120,8 +120,8 @@ class UserSummary
       .each { |r| replied_users[r[0].to_s] = r[1] }
 
     User.where(id: replied_users.keys)
-        .pluck(:id, :username, :name, :uploaded_avatar_id)
-        .map do |u|
+      .pluck(:id, :username, :name, :uploaded_avatar_id)
+      .map do |u|
       UserWithCount.new(
         id: u[0],
         username: u[1],
@@ -151,9 +151,14 @@ class UserSummary
       .count
   end
 
+  def recent_time_read
+    @user.recent_time_read
+  end
+
   delegate :likes_given,
            :likes_received,
            :days_visited,
+           :topics_entered,
            :posts_read_count,
            :topic_count,
            :post_count,
diff --git a/app/models/user_visit.rb b/app/models/user_visit.rb
index 5ebe059167..c0f5a46452 100644
--- a/app/models/user_visit.rb
+++ b/app/models/user_visit.rb
@@ -1,6 +1,6 @@
 class UserVisit < ActiveRecord::Base
 
-  def self.counts_by_day_query(start_date, end_date, group_id=nil)
+  def self.counts_by_day_query(start_date, end_date, group_id = nil)
     result = where('visited_at >= ? and visited_at <= ?', start_date.to_date, end_date.to_date)
 
     if group_id
@@ -12,11 +12,11 @@ class UserVisit < ActiveRecord::Base
   end
 
   # A count of visits in a date range by day
-  def self.by_day(start_date, end_date, group_id=nil)
+  def self.by_day(start_date, end_date, group_id = nil)
     counts_by_day_query(start_date, end_date, group_id).count
   end
 
-  def self.mobile_by_day(start_date, end_date, group_id=nil)
+  def self.mobile_by_day(start_date, end_date, group_id = nil)
     counts_by_day_query(start_date, end_date, group_id).where(mobile: true).count
   end
 
@@ -43,9 +43,11 @@ end
 #  visited_at :date             not null
 #  posts_read :integer          default(0)
 #  mobile     :boolean          default(FALSE)
+#  time_read  :integer          default(0), not null
 #
 # Indexes
 #
-#  index_user_visits_on_user_id_and_visited_at  (user_id,visited_at) UNIQUE
-#  index_user_visits_on_visited_at_and_mobile   (visited_at,mobile)
+#  index_user_visits_on_user_id_and_visited_at                (user_id,visited_at) UNIQUE
+#  index_user_visits_on_user_id_and_visited_at_and_time_read  (user_id,visited_at,time_read)
+#  index_user_visits_on_visited_at_and_mobile                 (visited_at,mobile)
 #
diff --git a/app/models/watched_word.rb b/app/models/watched_word.rb
new file mode 100644
index 0000000000..d9af0071de
--- /dev/null
+++ b/app/models/watched_word.rb
@@ -0,0 +1,68 @@
+require_dependency 'enum'
+
+class WatchedWord < ActiveRecord::Base
+
+  def self.actions
+    @actions ||= Enum.new(
+      block: 1,
+      censor: 2,
+      require_approval: 3,
+      flag: 4
+    )
+  end
+
+  MAX_WORDS_PER_ACTION = 1000
+
+  before_validation do
+    self.word = self.class.normalize_word(self.word)
+  end
+
+  validates :word,   presence: true, uniqueness: true, length: { maximum: 50 }
+  validates :action, presence: true
+  validates_each :word do |record, attr, val|
+    if WatchedWord.where(action: record.action).count >= MAX_WORDS_PER_ACTION
+      record.errors.add(:word, :too_many)
+    end
+  end
+
+  after_save    :clear_cache
+  after_destroy :clear_cache
+
+  scope :by_action, -> { order("action ASC, word ASC") }
+
+  def self.normalize_word(w)
+    w.strip.downcase.squeeze('*')
+  end
+
+  def self.create_or_update_word(params)
+    w = find_or_initialize_by(word: normalize_word(params[:word]))
+    w.action_key = params[:action_key] if params[:action_key]
+    w.action = params[:action] if params[:action]
+    w.save
+    w
+  end
+
+  def action_key=(arg)
+    self.action = self.class.actions[arg.to_sym]
+  end
+
+  def clear_cache
+    WordWatcher.clear_cache!
+  end
+
+end
+
+# == Schema Information
+#
+# Table name: watched_words
+#
+#  id         :integer          not null, primary key
+#  word       :string           not null
+#  action     :integer          not null
+#  created_at :datetime
+#  updated_at :datetime
+#
+# Indexes
+#
+#  index_watched_words_on_action_and_word  (action,word) UNIQUE
+#
diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb
index 40fed09de6..de0db8bbf9 100644
--- a/app/models/web_hook.rb
+++ b/app/models/web_hook.rb
@@ -13,6 +13,8 @@ class WebHook < ActiveRecord::Base
   validates_presence_of :last_delivery_status
   validates_presence_of :web_hook_event_types, unless: :wildcard_web_hook?
 
+  before_save :strip_url
+
   def self.content_types
     @content_types ||= Enum.new('application/json' => 1,
                                 'application/x-www-form-urlencoded' => 2)
@@ -30,8 +32,9 @@ class WebHook < ActiveRecord::Base
 
   def self.find_by_type(type)
     WebHook.where(active: true)
-           .joins(:web_hook_event_types)
-           .where("web_hooks.wildcard_web_hook = ? OR web_hook_event_types.name = ?", true, type.to_s)
+      .joins(:web_hook_event_types)
+      .where("web_hooks.wildcard_web_hook = ? OR web_hook_event_types.name = ?", true, type.to_s)
+      .uniq
   end
 
   def self.enqueue_hooks(type, opts = {})
@@ -40,13 +43,17 @@ class WebHook < ActiveRecord::Base
     end
   end
 
-  def self.enqueue_topic_hooks(event, topic, user=nil)
+  def self.enqueue_topic_hooks(event, topic, user = nil)
     WebHook.enqueue_hooks(:topic, topic_id: topic.id, category_id: topic&.category_id, event_name: event.to_s)
   end
 
-  def self.enqueue_post_hooks(event, post, user=nil)
+  def self.enqueue_post_hooks(event, post, user = nil)
     WebHook.enqueue_hooks(:post, post_id: post.id, category_id: post&.topic&.category_id, event_name: event.to_s)
   end
+
+  def strip_url
+    self.payload_url = (payload_url || "").strip.presence
+  end
 end
 
 # == Schema Information
diff --git a/app/models/web_hook_event.rb b/app/models/web_hook_event.rb
index f10b5cde31..dc3e56d28b 100644
--- a/app/models/web_hook_event.rb
+++ b/app/models/web_hook_event.rb
@@ -5,13 +5,21 @@ class WebHookEvent < ActiveRecord::Base
 
   default_scope { order('created_at DESC') }
 
+  def self.purge_old
+    where(
+      'created_at < ?', SiteSetting.retain_web_hook_events_period_days.days.ago
+    ).delete_all
+  end
+
   def update_web_hook_delivery_status
-    web_hook.last_delivery_status = case status
-                                    when 200..299
-                                      WebHook.last_delivery_statuses[:successful]
-                                    else
-                                      WebHook.last_delivery_statuses[:failed]
-                                    end
+    web_hook.last_delivery_status =
+      case status
+      when 200..299
+        WebHook.last_delivery_statuses[:successful]
+      else
+        WebHook.last_delivery_statuses[:failed]
+      end
+
     web_hook.save!
   end
 end
diff --git a/app/serializers/admin_badge_serializer.rb b/app/serializers/admin_badge_serializer.rb
index 535d27d1bd..4f57896d90 100644
--- a/app/serializers/admin_badge_serializer.rb
+++ b/app/serializers/admin_badge_serializer.rb
@@ -2,6 +2,6 @@ class AdminBadgeSerializer < BadgeSerializer
   attributes :query, :trigger, :target_posts, :auto_revoke, :show_posts
 
   def include_long_description?
-     true
+    true
   end
 end
diff --git a/app/serializers/admin_detailed_user_serializer.rb b/app/serializers/admin_detailed_user_serializer.rb
index 60c9ea55f2..8cc9316cb5 100644
--- a/app/serializers/admin_detailed_user_serializer.rb
+++ b/app/serializers/admin_detailed_user_serializer.rb
@@ -16,7 +16,9 @@ class AdminDetailedUserSerializer < AdminUserSerializer
              :can_delete_all_posts,
              :can_be_deleted,
              :can_be_anonymized,
-             :suspend_reason,
+             :full_suspend_reason,
+             :suspended_till,
+             :silence_reason,
              :primary_group_id,
              :badge_count,
              :warnings_received_count,
@@ -28,6 +30,7 @@ class AdminDetailedUserSerializer < AdminUserSerializer
   has_one :approved_by, serializer: BasicUserSerializer, embed: :objects
   has_one :api_key, serializer: ApiKeySerializer, embed: :objects
   has_one :suspended_by, serializer: BasicUserSerializer, embed: :objects
+  has_one :silenced_by, serializer: BasicUserSerializer, embed: :objects
   has_one :tl3_requirements, serializer: TrustLevel3RequirementsSerializer, embed: :objects
   has_many :groups, embed: :object, serializer: BasicGroupSerializer
 
@@ -71,6 +74,14 @@ class AdminDetailedUserSerializer < AdminUserSerializer
     object.suspend_record.try(:acting_user)
   end
 
+  def silence_reason
+    object.silence_reason
+  end
+
+  def silenced_by
+    object.silenced_record.try(:acting_user)
+  end
+
   def include_tl3_requirements?
     object.has_trust_level?(TrustLevel[2])
   end
diff --git a/app/serializers/admin_post_serializer.rb b/app/serializers/admin_post_serializer.rb
deleted file mode 100644
index a06328d832..0000000000
--- 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 0000000000..dfe2cbc631
--- /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_list_serializer.rb b/app/serializers/admin_user_list_serializer.rb
index ba3953e5bb..e4a95b3efb 100644
--- a/app/serializers/admin_user_list_serializer.rb
+++ b/app/serializers/admin_user_list_serializer.rb
@@ -12,7 +12,7 @@ class AdminUserListSerializer < BasicUserSerializer
              :created_at_age,
              :username_lower,
              :trust_level,
-             :trust_level_locked,
+             :manual_locked_trust_level,
              :flag_level,
              :username,
              :title,
@@ -22,7 +22,8 @@ class AdminUserListSerializer < BasicUserSerializer
              :suspended_at,
              :suspended_till,
              :suspended,
-             :blocked,
+             :silenced,
+             :silenced_till,
              :time_read,
              :staged
 
@@ -35,15 +36,40 @@ class AdminUserListSerializer < BasicUserSerializer
 
   def include_email?
     # staff members can always see their email
-    (scope.is_staff? && object.id == scope.user.id) || scope.can_see_emails?
+    (scope.is_staff? && object.id == scope.user.id) || scope.can_see_emails? ||
+      (scope.is_staff? && object.staged?)
   end
 
   alias_method :include_associated_accounts?, :include_email?
 
+  def silenced
+    object.silenced?
+  end
+
+  def include_silenced?
+    object.silenced?
+  end
+
+  def silenced_till
+    object.silenced_till
+  end
+
+  def include_silenced_till?
+    object.silenced_till?
+  end
+
   def suspended
     object.suspended?
   end
 
+  def include_suspended_at?
+    object.suspended?
+  end
+
+  def include_suspended_till?
+    object.suspended?
+  end
+
   def can_impersonate
     scope.can_impersonate?(object)
   end
@@ -55,7 +81,7 @@ class AdminUserListSerializer < BasicUserSerializer
 
   def last_emailed_age
     return nil if object.last_emailed_at.blank?
-    AgeWords.age_words(Time.now - object.last_emailed_at)
+    Time.now - object.last_emailed_at
   end
 
   def last_seen_at
@@ -65,16 +91,16 @@ class AdminUserListSerializer < BasicUserSerializer
 
   def last_seen_age
     return nil if object.last_seen_at.blank?
-    AgeWords.age_words(Time.now - object.last_seen_at)
+    Time.now - object.last_seen_at
   end
 
   def time_read
     return nil if object.user_stat.time_read.blank?
-    AgeWords.age_words(object.user_stat.time_read)
+    object.user_stat.time_read
   end
 
   def created_at_age
-    AgeWords.age_words(Time.now - object.created_at)
+    Time.now - object.created_at
   end
 
   def can_approve
diff --git a/app/serializers/admin_user_serializer.rb b/app/serializers/admin_user_serializer.rb
index 0fa30b658e..df7f279f61 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/badge_serializer.rb b/app/serializers/badge_serializer.rb
index a726a4dde4..d3bbd87339 100644
--- a/app/serializers/badge_serializer.rb
+++ b/app/serializers/badge_serializer.rb
@@ -1,10 +1,18 @@
 class BadgeSerializer < ApplicationSerializer
   attributes :id, :name, :description, :grant_count, :allow_title,
              :multiple_grant, :icon, :image, :listable, :enabled, :badge_grouping_id,
-             :system, :long_description, :slug
+             :system, :long_description, :slug, :has_badge
 
   has_one :badge_type
 
+  def include_has_badge?
+    object.has_badge
+  end
+
+  def has_badge
+    true
+  end
+
   def system
     object.system?
   end
diff --git a/app/serializers/basic_group_serializer.rb b/app/serializers/basic_group_serializer.rb
index d86d0606fc..a09bce0d3b 100644
--- a/app/serializers/basic_group_serializer.rb
+++ b/app/serializers/basic_group_serializer.rb
@@ -4,8 +4,9 @@ class BasicGroupSerializer < ApplicationSerializer
              :name,
              :display_name,
              :user_count,
-             :alias_level,
-             :visible,
+             :mentionable_level,
+             :messageable_level,
+             :visibility_level,
              :automatic_membership_email_domains,
              :automatic_membership_retroactive,
              :primary_group,
@@ -18,10 +19,12 @@ class BasicGroupSerializer < ApplicationSerializer
              :flair_color,
              :bio_raw,
              :bio_cooked,
-             :public,
+             :public_admission,
+             :public_exit,
              :allow_membership_requests,
              :full_name,
-             :default_notification_level
+             :default_notification_level,
+             :membership_request_template
 
   def include_display_name?
     object.automatic
@@ -37,7 +40,7 @@ class BasicGroupSerializer < ApplicationSerializer
     staff?
   end
 
-  def include_has_messsages
+  def include_has_messages
     staff?
   end
 
diff --git a/app/serializers/basic_group_user_serializer.rb b/app/serializers/basic_group_user_serializer.rb
index fa2015b8c4..3b40272470 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/basic_post_serializer.rb b/app/serializers/basic_post_serializer.rb
index 70153bca9b..bcc75f776e 100644
--- a/app/serializers/basic_post_serializer.rb
+++ b/app/serializers/basic_post_serializer.rb
@@ -31,7 +31,7 @@ class BasicPostSerializer < ApplicationSerializer
   def cooked
     if cooked_hidden
       if scope.current_user && object.user_id == scope.current_user.id
-        I18n.t('flagging.you_must_edit')
+        I18n.t('flagging.you_must_edit', path: "/my/messages")
       else
         I18n.t('flagging.user_must_edit')
       end
diff --git a/app/serializers/basic_user_serializer.rb b/app/serializers/basic_user_serializer.rb
index 8880c8dbd7..d14877e6da 100644
--- a/app/serializers/basic_user_serializer.rb
+++ b/app/serializers/basic_user_serializer.rb
@@ -9,7 +9,7 @@ class BasicUserSerializer < ApplicationSerializer
     if Hash === object
       User.avatar_template(user[:username], user[:uploaded_avatar_id])
     else
-      user.try(:avatar_template)
+      user&.avatar_template
     end
   end
 
diff --git a/app/serializers/category_and_topic_lists_serializer.rb b/app/serializers/category_and_topic_lists_serializer.rb
index 239bc07981..173b417d46 100644
--- a/app/serializers/category_and_topic_lists_serializer.rb
+++ b/app/serializers/category_and_topic_lists_serializer.rb
@@ -5,7 +5,7 @@ class CategoryAndTopicListsSerializer < ApplicationSerializer
 
   def users
     users = object.topic_list.topics.map do |t|
-      t.posters.map{|poster| poster.try(:user)}
+      t.posters.map { |poster| poster.try(:user) }
     end
     users.flatten!
     users.compact!
diff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rb
index beb7ae1d07..3c5f98a97b 100644
--- a/app/serializers/category_serializer.rb
+++ b/app/serializers/category_serializer.rb
@@ -8,6 +8,7 @@ class CategorySerializer < BasicCategorySerializer
              :position,
              :email_in,
              :email_in_allow_strangers,
+             :mailinglist_mirror,
              :suppress_from_homepage,
              :all_topics_wiki,
              :can_delete,
@@ -35,7 +36,7 @@ class CategorySerializer < BasicCategorySerializer
   end
 
   def available_groups
-    Group.order(:name).pluck(:name) - group_permissions.map{|g| g[:group_name]}
+    Group.order(:name).pluck(:name) - group_permissions.map { |g| g[:group_name] }
   end
 
   def can_delete
@@ -43,8 +44,8 @@ class CategorySerializer < BasicCategorySerializer
   end
 
   def include_is_special?
-    [SiteSetting.lounge_category_id, SiteSetting.meta_category_id, SiteSetting.staff_category_id, SiteSetting.uncategorized_category_id]
-    .include? object.id
+    [SiteSetting.meta_category_id, SiteSetting.staff_category_id, SiteSetting.uncategorized_category_id]
+      .include? object.id
   end
 
   def is_special
@@ -76,7 +77,7 @@ class CategorySerializer < BasicCategorySerializer
   end
 
   def notification_level
-   user = scope && scope.user
+    user = scope && scope.user
    object.notification_level ||
      (user && CategoryUser.where(user: user, category: object).first.try(:notification_level))
   end
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index 80de2e205c..46fa8fe05c 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -18,6 +18,7 @@ class CurrentUserSerializer < BasicUserSerializer
              :external_links_in_new_tab,
              :dynamic_favicon,
              :trust_level,
+             :can_send_private_email_messages,
              :can_edit,
              :can_invite_to_forum,
              :no_password,
@@ -35,7 +36,14 @@ class CurrentUserSerializer < BasicUserSerializer
              :automatically_unpin_topics,
              :mailing_list_mode,
              :previous_visit_at,
-             :seen_notification_id
+             :seen_notification_id,
+             :primary_group_id,
+             :primary_group_name,
+             :can_create_topic
+
+  def can_create_topic
+    scope.can_create_topic?(nil)
+  end
 
   def include_site_flagged_posts_count?
     object.staff?
@@ -85,6 +93,10 @@ class CurrentUserSerializer < BasicUserSerializer
     PostAction.flagged_posts_count
   end
 
+  def can_send_private_email_messages
+    scope.cand_send_private_messages_to_email?
+  end
+
   def can_edit
     true
   end
@@ -128,7 +140,7 @@ class CurrentUserSerializer < BasicUserSerializer
     end
 
     if fields.present?
-      User.custom_fields_for_ids([object.id], fields)[object.id]
+      User.custom_fields_for_ids([object.id], fields)[object.id] || {}
     else
       {}
     end
@@ -137,7 +149,7 @@ class CurrentUserSerializer < BasicUserSerializer
   def muted_category_ids
     @muted_category_ids ||= CategoryUser.where(user_id: object.id,
                                                notification_level: TopicUser.notification_levels[:muted])
-                                         .pluck(:category_id)
+      .pluck(:category_id)
   end
 
   def dismissed_banner_key
@@ -168,4 +180,16 @@ class CurrentUserSerializer < BasicUserSerializer
     object.user_option.mailing_list_mode
   end
 
+  def include_primary_group_id?
+    object.primary_group_id.present?
+  end
+
+  def primary_group_name
+    object.primary_group.name.downcase
+  end
+
+  def include_primary_group_name?
+    object.primary_group&.name.present?
+  end
+
 end
diff --git a/app/serializers/detailed_user_badge_serializer.rb b/app/serializers/detailed_user_badge_serializer.rb
index 1fa408844d..b32f72b6b8 100644
--- a/app/serializers/detailed_user_badge_serializer.rb
+++ b/app/serializers/detailed_user_badge_serializer.rb
@@ -10,7 +10,6 @@ class DetailedUserBadgeSerializer < BasicUserBadgeSerializer
   alias :include_topic_id? :include_post_number?
   alias :include_topic_title? :include_post_number?
 
-
   def post_number
     object.post.post_number if object.post
   end
diff --git a/app/serializers/directory_item_serializer.rb b/app/serializers/directory_item_serializer.rb
index e241dc6f6c..753d7a8ad7 100644
--- a/app/serializers/directory_item_serializer.rb
+++ b/app/serializers/directory_item_serializer.rb
@@ -11,7 +11,7 @@ class DirectoryItemSerializer < ApplicationSerializer
   end
 
   def time_read
-    AgeWords.age_words(object.user_stat.time_read)
+    object.user_stat.time_read
   end
 
   def include_time_read?
diff --git a/app/serializers/discourse_version_check_serializer.rb b/app/serializers/discourse_version_check_serializer.rb
index ef53a64615..e6f38e8698 100644
--- a/app/serializers/discourse_version_check_serializer.rb
+++ b/app/serializers/discourse_version_check_serializer.rb
@@ -1,5 +1,10 @@
 class DiscourseVersionCheckSerializer < ApplicationSerializer
-  attributes :latest_version, :critical_updates, :installed_version, :installed_sha, :missing_versions_count, :updated_at
+  attributes :latest_version,
+             :critical_updates,
+             :installed_version,
+             :installed_sha,
+             :missing_versions_count,
+             :updated_at
 
   self.root = false
 end
diff --git a/app/serializers/flagged_topic_summary_serializer.rb b/app/serializers/flagged_topic_summary_serializer.rb
new file mode 100644
index 0000000000..f29c365a46
--- /dev/null
+++ b/app/serializers/flagged_topic_summary_serializer.rb
@@ -0,0 +1,29 @@
+class FlaggedTopicSummarySerializer < ActiveModel::Serializer
+
+  attributes(
+    :id,
+    :flag_counts,
+    :user_ids,
+    :last_flag_at
+  )
+
+  has_one :topic, serializer: FlaggedTopicSerializer
+
+  def id
+    topic.id
+  end
+
+  def flag_counts
+    object.flag_counts.map do |k, v|
+      { post_action_type_id: k, count: v, name_key: PostActionType.types[k] }
+    end
+  end
+
+  def user_ids
+    object.user_ids
+  end
+
+  def last_flag_at
+    object.last_flag_at
+  end
+end
diff --git a/app/serializers/group_post_serializer.rb b/app/serializers/group_post_serializer.rb
index 1fb6305e59..f21802cfbd 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_id,
+             :post_number,
+             :topic_id
 
   has_one :user, serializer: GroupPostUserSerializer, embed: :object
   has_one :topic, serializer: BasicTopicSerializer, embed: :object
@@ -17,7 +22,7 @@ class GroupPostSerializer < ApplicationSerializer
     SiteSetting.enable_names?
   end
 
-  def category
-    object.topic.category
+  def category_id
+    object.topic.category_id
   end
 end
diff --git a/app/serializers/group_show_serializer.rb b/app/serializers/group_show_serializer.rb
index dc9e0c7649..e97d49e9eb 100644
--- a/app/serializers/group_show_serializer.rb
+++ b/app/serializers/group_show_serializer.rb
@@ -1,8 +1,8 @@
 class GroupShowSerializer < BasicGroupSerializer
-  attributes :is_group_user, :is_group_owner
+  attributes :is_group_user, :is_group_owner, :mentionable, :messageable
 
   def include_is_group_user?
-    scope.authenticated?
+    authenticated?
   end
 
   def is_group_user
@@ -10,15 +10,35 @@ class GroupShowSerializer < BasicGroupSerializer
   end
 
   def include_is_group_owner?
-    scope.authenticated?
+    authenticated?
   end
 
   def is_group_owner
     scope.is_admin? || fetch_group_user&.owner
   end
 
+  def include_mentionable?
+    authenticated?
+  end
+
+  def include_messageable?
+    authenticated?
+  end
+
+  def mentionable
+    Group.mentionable(scope.user).exists?(id: object.id)
+  end
+
+  def messageable
+    Group.messageable(scope.user).exists?(id: object.id)
+  end
+
   private
 
+  def authenticated?
+    scope.authenticated?
+  end
+
   def fetch_group_user
     @group_user ||= object.group_users.find_by(user: scope.user)
   end
diff --git a/app/serializers/grouped_search_result_serializer.rb b/app/serializers/grouped_search_result_serializer.rb
index ff216c8a23..b9dcb5b62c 100644
--- a/app/serializers/grouped_search_result_serializer.rb
+++ b/app/serializers/grouped_search_result_serializer.rb
@@ -2,5 +2,23 @@ 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
+  has_many :tags, serializer: TagSerializer
+  attributes :more_posts, :more_users, :more_categories, :term, :search_log_id, :more_full_page_results, :can_create_topic
+
+  def search_log_id
+    object.search_log_id
+  end
+
+  def include_search_log_id?
+    search_log_id.present?
+  end
+
+  def include_tags?
+    SiteSetting.tagging_enabled
+  end
+
+  def can_create_topic
+    scope.can_create?(Topic)
+  end
+
 end
diff --git a/app/serializers/incoming_email_details_serializer.rb b/app/serializers/incoming_email_details_serializer.rb
index 2ca27de78a..d147215a39 100644
--- a/app/serializers/incoming_email_details_serializer.rb
+++ b/app/serializers/incoming_email_details_serializer.rb
@@ -16,7 +16,7 @@ class IncomingEmailDetailsSerializer < ApplicationSerializer
   EMAIL_RECEIVER_ERROR_PREFIX = "Email::Receiver::".freeze
 
   def error
-    @error_string
+    @error_string.presence || I18n.t("emails.incoming.unrecognized_error")
   end
 
   def error_description
diff --git a/app/serializers/incoming_email_serializer.rb b/app/serializers/incoming_email_serializer.rb
index 53916e24cd..006ea9c330 100644
--- a/app/serializers/incoming_email_serializer.rb
+++ b/app/serializers/incoming_email_serializer.rb
@@ -29,4 +29,8 @@ class IncomingEmailSerializer < ApplicationSerializer
     object.cc_addresses.split(";")
   end
 
+  def error
+    @object.error.presence || I18n.t("emails.incoming.unrecognized_error")
+  end
+
 end
diff --git a/app/serializers/invited_user_serializer.rb b/app/serializers/invited_user_serializer.rb
index ce3fe90623..3c1cb69d3c 100644
--- a/app/serializers/invited_user_serializer.rb
+++ b/app/serializers/invited_user_serializer.rb
@@ -10,7 +10,7 @@ class InvitedUserSerializer < BasicUserSerializer
   attr_accessor :invited_by
 
   def time_read
-    AgeWords.age_words(object.user_stat.time_read)
+    object.user_stat.time_read
   end
 
   def include_time_read?
diff --git a/app/serializers/listable_topic_serializer.rb b/app/serializers/listable_topic_serializer.rb
index 13a87235c1..aeecddbeae 100644
--- a/app/serializers/listable_topic_serializer.rb
+++ b/app/serializers/listable_topic_serializer.rb
@@ -22,10 +22,19 @@ class ListableTopicSerializer < BasicTopicSerializer
              :is_warning,
              :notification_level,
              :bookmarked,
-             :liked
+             :liked,
+             :unicode_title
 
   has_one :last_poster, serializer: BasicUserSerializer, embed: :objects
 
+  def include_unicode_title?
+    object.title.match?(/:[\w\-+]+:/)
+  end
+
+  def unicode_title
+    Emoji.gsub_emoji_to_unicode(object.title)
+  end
+
   def highest_post_number
     (scope.is_staff? && object.highest_staff_post_number) || object.highest_post_number
   end
diff --git a/app/serializers/post_action_type_serializer.rb b/app/serializers/post_action_type_serializer.rb
index 4e66641105..718c84a5b7 100644
--- a/app/serializers/post_action_type_serializer.rb
+++ b/app/serializers/post_action_type_serializer.rb
@@ -2,13 +2,25 @@ require_dependency 'configurable_urls'
 
 class PostActionTypeSerializer < ApplicationSerializer
 
-  attributes :name_key, :name, :description, :short_description, :long_form, :is_flag, :icon, :id, :is_custom_flag
+  attributes(
+    :id,
+    :name_key,
+    :name,
+    :description,
+    :short_description,
+    :long_form,
+    :is_flag,
+    :is_custom_flag
+  )
 
   include ConfigurableUrls
 
   def is_custom_flag
-    object.id == PostActionType.types[:notify_user] ||
-    object.id == PostActionType.types[:notify_moderators] 
+    !!PostActionType.custom_types[object.id]
+  end
+
+  def is_flag
+    !!PostActionType.flag_types[object.id]
   end
 
   def name
@@ -20,17 +32,21 @@ class PostActionTypeSerializer < ApplicationSerializer
   end
 
   def description
-    i18n('description', {tos_url: tos_path})
+    i18n('description', tos_url: tos_path)
   end
 
   def short_description
-    i18n('short_description', {tos_url: tos_path})
+    i18n('short_description', tos_url: tos_path)
+  end
+
+  def name_key
+    PostActionType.types[object.id]
   end
 
   protected
 
-    def i18n(field, vars=nil)
-      key = "post_action_types.#{object.name_key}.#{field}"
+    def i18n(field, vars = nil)
+      key = "post_action_types.#{name_key}.#{field}"
       vars ? I18n.t(key, vars) : I18n.t(key)
     end
 
diff --git a/app/serializers/post_item_excerpt.rb b/app/serializers/post_item_excerpt.rb
new file mode 100644
index 0000000000..7f0cc6322b
--- /dev/null
+++ b/app/serializers/post_item_excerpt.rb
@@ -0,0 +1,24 @@
+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/post_revision_serializer.rb b/app/serializers/post_revision_serializer.rb
index 5c1a05f603..11b13677f4 100644
--- a/app/serializers/post_revision_serializer.rb
+++ b/app/serializers/post_revision_serializer.rb
@@ -27,7 +27,6 @@ class PostRevisionSerializer < ApplicationSerializer
              :wiki,
              :can_edit
 
-
   # Creates a field called field_name_changes with previous and
   # current members if a field has changed in this revision
   def self.add_compared_field(field)
@@ -59,8 +58,8 @@ class PostRevisionSerializer < ApplicationSerializer
 
   def previous_revision
     @previous_revision ||= revisions.select { |r| r["revision"] >= first_revision }
-                                    .select { |r| r["revision"] < current_revision }
-                                    .last.try(:[], "revision")
+      .select { |r| r["revision"] < current_revision }
+      .last.try(:[], "revision")
   end
 
   def current_revision
@@ -69,8 +68,8 @@ class PostRevisionSerializer < ApplicationSerializer
 
   def next_revision
     @next_revision ||= revisions.select { |r| r["revision"] <= last_revision }
-                                .select { |r| r["revision"] > current_revision }
-                                .first.try(:[], "revision")
+      .select { |r| r["revision"] > current_revision }
+      .first.try(:[], "revision")
   end
 
   def last_revision
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index ea2eec14b6..d756ee1dd3 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -1,7 +1,7 @@
 class PostSerializer < BasicPostSerializer
 
   # To pass in additional information we might need
-  INSTANCE_VARS = [
+  INSTANCE_VARS ||= [
     :topic_view,
     :parent_post,
     :add_raw,
@@ -68,7 +68,8 @@ class PostSerializer < BasicPostSerializer
              :via_email,
              :is_auto_generated,
              :action_code,
-             :action_code_who
+             :action_code_who,
+             :last_wiki_edit
 
   def initialize(object, opts)
     super(object, opts)
@@ -108,15 +109,15 @@ class PostSerializer < BasicPostSerializer
   end
 
   def moderator?
-    !!(object.try(:user).try(:moderator?))
+    !!(object&.user&.moderator?)
   end
 
   def admin?
-    !!(object.try(:user).try(:admin?))
+    !!(object&.user&.admin?)
   end
 
   def staff?
-    !!(object.try(:user).try(:staff?))
+    !!(object&.user&.staff?)
   end
 
   def yours
@@ -140,7 +141,7 @@ class PostSerializer < BasicPostSerializer
   end
 
   def display_username
-    object.user.try(:name)
+    object.user&.name
   end
 
   def primary_group_name
@@ -154,15 +155,15 @@ class PostSerializer < BasicPostSerializer
   end
 
   def primary_group_flair_url
-    object.user.try(:primary_group).try(:flair_url)
+    object.user&.primary_group&.flair_url
   end
 
   def primary_group_flair_bg_color
-    object.user.try(:primary_group).try(:flair_bg_color)
+    object.user&.primary_group&.flair_bg_color
   end
 
   def primary_group_flair_color
-    object.user.try(:primary_group).try(:flair_color)
+    object.user&.primary_group&.flair_color
   end
 
   def link_counts
@@ -189,11 +190,11 @@ class PostSerializer < BasicPostSerializer
   end
 
   def user_title
-    object.try(:user).try(:title)
+    object&.user&.title
   end
 
   def trust_level
-    object.try(:user).try(:trust_level)
+    object&.user&.trust_level
   end
 
   def reply_to_user
@@ -225,14 +226,18 @@ class PostSerializer < BasicPostSerializer
   # Summary of the actions taken on this post
   def actions_summary
     result = []
-    PostActionType.types.each do |sym, id|
-      next if [:bookmark].include?(sym)
+    can_see_post = scope.can_see_post?(object)
+
+    PostActionType.types.except(:bookmark).each do |sym, id|
       count_col = "#{sym}_count".to_sym
 
       count = object.send(count_col) if object.respond_to?(count_col)
       summary = { id: id, count: count }
       summary[:hidden] = true if sym == :vote
-      summary[:can_act] = true if scope.post_can_act?(object, sym, taken_actions: actions)
+
+      if scope.post_can_act?(object, sym, opts: { taken_actions: actions }, can_see_post: can_see_post)
+        summary[:can_act] = true
+      end
 
       if sym == :notify_user && scope.current_user.present? && scope.current_user == object.user
         summary.delete(:can_act)
@@ -241,7 +246,7 @@ class PostSerializer < BasicPostSerializer
       # The following only applies if you're logged in
       if summary[:can_act] && scope.current_user.present?
         summary[:can_defer_flags] = true if scope.is_staff? &&
-                                                   PostActionType.flag_types.values.include?(id) &&
+                                                   PostActionType.flag_types_without_custom.values.include?(id) &&
                                                    active_flags.present? && active_flags.has_key?(id) &&
                                                    active_flags[id].count > 0
       end
@@ -276,7 +281,7 @@ class PostSerializer < BasicPostSerializer
   end
 
   def include_raw?
-    @add_raw.present? && (!object.hidden || scope.user.try(:staff?) || yours)
+    @add_raw.present? && (!object.hidden || scope.user&.staff? || yours)
   end
 
   def include_link_counts?
@@ -310,9 +315,7 @@ class PostSerializer < BasicPostSerializer
   end
 
   def include_user_custom_fields?
-    return if @topic_view.blank?
-    custom_fields = @topic_view.user_custom_fields
-    custom_fields && custom_fields[object.user_id]
+    (@topic_view&.user_custom_fields || {})[object.user_id]
   end
 
   def static_doc
@@ -328,7 +331,7 @@ class PostSerializer < BasicPostSerializer
   end
 
   def is_auto_generated
-    object.incoming_email.try(:is_auto_generated)
+    object.incoming_email&.is_auto_generated
   end
 
   def include_is_auto_generated?
@@ -351,23 +354,32 @@ class PostSerializer < BasicPostSerializer
     include_action_code? && action_code_who.present?
   end
 
+  def last_wiki_edit
+    object.revisions.last.updated_at
+  end
+
+  def include_last_wiki_edit?
+    object.wiki &&
+    object.post_number == 1 &&
+    object.revisions.size > 0
+  end
+
   private
 
     def post_actions
-      @post_actions ||= (@topic_view.present? && @topic_view.all_post_actions.present?) ? @topic_view.all_post_actions[object.id] : nil
+      @post_actions ||= (@topic_view&.all_post_actions || {})[object.id]
     end
 
     def active_flags
-      @active_flags ||= (@topic_view.present? && @topic_view.all_active_flags.present?) ? @topic_view.all_active_flags[object.id] : nil
+      @active_flags ||= (@topic_view&.all_active_flags || {})[object.id]
     end
 
     def post_custom_fields
-      @post_custom_fields ||=
-        if @topic_view
-          (@topic_view.post_custom_fields && @topic_view.post_custom_fields[object.id]) || {}
-        else
-          object.custom_fields
-        end
+      @post_custom_fields ||= if @topic_view
+        (@topic_view.post_custom_fields || {})[object.id] || {}
+      else
+        object.custom_fields
+      end
     end
 
 end
diff --git a/app/serializers/post_stream_serializer_mixin.rb b/app/serializers/post_stream_serializer_mixin.rb
index d87f2feaa6..26213f059c 100644
--- a/app/serializers/post_stream_serializer_mixin.rb
+++ b/app/serializers/post_stream_serializer_mixin.rb
@@ -20,19 +20,17 @@ module PostStreamSerializerMixin
   end
 
   def posts
-    return @posts if @posts.present?
-    @posts = []
-    if object.posts
-      object.posts.each do |p|
-        ps = PostSerializer.new(p, scope: scope, root: false)
-        ps.add_raw = true if @options[:include_raw]
-        ps.topic_view = object
-        p.topic = object.topic
+    @posts ||= begin
+      (object.posts || []).map do |post|
+        post.topic = object.topic
 
-        @posts << ps.as_json
+        serializer = PostSerializer.new(post, scope: scope, root: false)
+        serializer.add_raw = true if @options[:include_raw]
+        serializer.topic_view = object
+
+        serializer.as_json
       end
     end
-    @posts
   end
 
 end
diff --git a/app/serializers/search_logs_serializer.rb b/app/serializers/search_logs_serializer.rb
new file mode 100644
index 0000000000..f059c33cb6
--- /dev/null
+++ b/app/serializers/search_logs_serializer.rb
@@ -0,0 +1,6 @@
+class SearchLogsSerializer < ApplicationSerializer
+  attributes :term,
+             :searches,
+             :click_through,
+             :unique
+end
diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb
index 5ea12e8cbe..850a8dd8dd 100644
--- a/app/serializers/site_serializer.rb
+++ b/app/serializers/site_serializer.rb
@@ -25,7 +25,8 @@ class SiteSerializer < ApplicationSerializer
              :top_tags,
              :wizard_required,
              :topic_featured_link_allowed_category_ids,
-             :user_themes
+             :user_themes,
+             :censored_words
 
   has_many :categories, serializer: BasicCategorySerializer, embed: :objects
   has_many :trust_levels, embed: :objects
@@ -36,29 +37,30 @@ class SiteSerializer < ApplicationSerializer
     cache_fragment("user_themes") do
       Theme.where('key = :default OR user_selectable',
                     default: SiteSetting.default_theme_key)
-           .order(:name)
-           .pluck(:key, :name)
-           .map{|k,n| {theme_key: k, name: n, default: k == SiteSetting.default_theme_key}}
-           .as_json
+        .order(:name)
+        .pluck(:key, :name)
+        .map { |k, n| { theme_key: k, name: n, default: k == SiteSetting.default_theme_key } }
+        .as_json
     end
   end
 
   def groups
     cache_fragment("group_names") do
-      Group.order(:name).pluck(:id,:name).map { |id,name| { id: id, name: name } }.as_json
+      Group.order(:name).pluck(:id, :name).map { |id, name| { id: id, name: name } }.as_json
     end
   end
 
   def post_action_types
     cache_fragment("post_action_types_#{I18n.locale}") do
-      ActiveModel::ArraySerializer.new(PostActionType.ordered).as_json
+      types = PostActionType.types.values.map { |id| PostActionType.new(id: id) }
+      ActiveModel::ArraySerializer.new(types).as_json
     end
   end
 
   def topic_flag_types
     cache_fragment("post_action_flag_types_#{I18n.locale}") do
-      flags = PostActionType.ordered.where(name_key: ['inappropriate', 'spam', 'notify_moderators'])
-      ActiveModel::ArraySerializer.new(flags, each_serializer: TopicFlagTypeSerializer).as_json
+      types = PostActionType.topic_flag_types.values.map { |id| PostActionType.new(id: id) }
+      ActiveModel::ArraySerializer.new(types, each_serializer: TopicFlagTypeSerializer).as_json
     end
 
   end
@@ -142,4 +144,8 @@ class SiteSerializer < ApplicationSerializer
   def topic_featured_link_allowed_category_ids
     scope.topic_featured_link_allowed_category_ids
   end
+
+  def censored_words
+    WordWatcher.words_for_action(:censor).join('|')
+  end
 end
diff --git a/app/serializers/site_text_serializer.rb b/app/serializers/site_text_serializer.rb
index c686a08008..f0e3c1e4c3 100644
--- a/app/serializers/site_text_serializer.rb
+++ b/app/serializers/site_text_serializer.rb
@@ -19,4 +19,3 @@ class SiteTextSerializer < ApplicationSerializer
 
   alias_method :can_revert?, :overridden?
 end
-
diff --git a/app/serializers/suggested_topics_mixin.rb b/app/serializers/suggested_topics_mixin.rb
new file mode 100644
index 0000000000..361a7f62a8
--- /dev/null
+++ b/app/serializers/suggested_topics_mixin.rb
@@ -0,0 +1,15 @@
+module SuggestedTopicsMixin
+  def self.included(klass)
+    klass.attributes :suggested_topics
+  end
+
+  def include_suggested_topics?
+    object.next_page.nil? && object.suggested_topics&.topics.present?
+  end
+
+  def suggested_topics
+    object.suggested_topics.topics.map do |t|
+      SuggestedTopicSerializer.new(t, scope: scope, root: false)
+    end
+  end
+end
diff --git a/app/serializers/tag_serializer.rb b/app/serializers/tag_serializer.rb
new file mode 100644
index 0000000000..206a0256fa
--- /dev/null
+++ b/app/serializers/tag_serializer.rb
@@ -0,0 +1,3 @@
+class TagSerializer < ApplicationSerializer
+  attributes :id, :name
+end
diff --git a/app/serializers/theme_serializer.rb b/app/serializers/theme_serializer.rb
index 4f8864158a..78532e399a 100644
--- a/app/serializers/theme_serializer.rb
+++ b/app/serializers/theme_serializer.rb
@@ -1,3 +1,5 @@
+require 'base64'
+
 class ThemeFieldSerializer < ApplicationSerializer
   attributes :name, :target, :value, :error, :type_id, :upload_id, :url, :filename
 
@@ -68,3 +70,28 @@ class ThemeSerializer < ChildThemeSerializer
     object.child_themes.order(:name)
   end
 end
+
+class ThemeFieldWithEmbeddedUploadsSerializer < ThemeFieldSerializer
+  attributes :raw_upload
+
+  def include_raw_upload?
+    object.upload
+  end
+
+  def raw_upload
+    filename = Discourse.store.path_for(object.upload)
+    raw = nil
+
+    if filename
+      raw = File.read(filename)
+    else
+      raw = Discourse.store.download(object.upload).read
+    end
+
+    Base64.encode64(raw)
+  end
+end
+
+class ThemeWithEmbeddedUploadsSerializer < ThemeSerializer
+  has_many :theme_fields, serializer: ThemeFieldWithEmbeddedUploadsSerializer, embed: :objects
+end
diff --git a/app/serializers/topic_flag_type_serializer.rb b/app/serializers/topic_flag_type_serializer.rb
index a764d1a820..c0ac6951bd 100644
--- a/app/serializers/topic_flag_type_serializer.rb
+++ b/app/serializers/topic_flag_type_serializer.rb
@@ -2,9 +2,9 @@ class TopicFlagTypeSerializer < PostActionTypeSerializer
 
   protected
 
-    def i18n(field, vars=nil)
-      key = "topic_flag_types.#{object.name_key}.#{field}"
-      vars ? I18n.t(key,vars) : I18n.t(key)
+    def i18n(field, vars = nil)
+      key = "topic_flag_types.#{name_key}.#{field}"
+      vars ? I18n.t(key, vars) : I18n.t(key)
     end
 
 end
diff --git a/app/serializers/topic_link_serializer.rb b/app/serializers/topic_link_serializer.rb
index 1f64aec4be..42367857c5 100644
--- a/app/serializers/topic_link_serializer.rb
+++ b/app/serializers/topic_link_serializer.rb
@@ -8,7 +8,8 @@ class TopicLinkSerializer < ApplicationSerializer
              :reflection,
              :clicks,
              :user_id,
-             :domain
+             :domain,
+             :root_domain,
 
   def url
     object['url']
@@ -50,4 +51,8 @@ class TopicLinkSerializer < ApplicationSerializer
     object['domain']
   end
 
+  def root_domain
+    MiniSuffix.domain(domain)
+  end
+
 end
diff --git a/app/serializers/topic_list_item_serializer.rb b/app/serializers/topic_list_item_serializer.rb
index 9e1e642a15..0ce4f4cd50 100644
--- a/app/serializers/topic_list_item_serializer.rb
+++ b/app/serializers/topic_list_item_serializer.rb
@@ -11,7 +11,8 @@ class TopicListItemSerializer < ListableTopicSerializer
              :bookmarked_post_numbers,
              :liked_post_numbers,
              :tags,
-             :featured_link
+             :featured_link,
+             :featured_link_root_domain
 
   has_many :posters, serializer: TopicPosterSerializer, embed: :objects
   has_many :participants, serializer: TopicPosterSerializer, embed: :objects
@@ -77,8 +78,8 @@ class TopicListItemSerializer < ListableTopicSerializer
     SiteSetting.topic_featured_link_enabled
   end
 
-  def featured_link
-    object.featured_link
+  def include_featured_link_root_domain?
+    SiteSetting.topic_featured_link_enabled && object.featured_link.present?
   end
 
 end
diff --git a/app/serializers/topic_view_posts_serializer.rb b/app/serializers/topic_view_posts_serializer.rb
index 0bba907794..98c6cabff7 100644
--- a/app/serializers/topic_view_posts_serializer.rb
+++ b/app/serializers/topic_view_posts_serializer.rb
@@ -1,5 +1,6 @@
 class TopicViewPostsSerializer < ApplicationSerializer
   include PostStreamSerializerMixin
+  include SuggestedTopicsMixin
 
   attributes :id
 
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index f9a548372e..839a931134 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -3,6 +3,7 @@ require_dependency 'new_post_manager'
 
 class TopicViewSerializer < ApplicationSerializer
   include PostStreamSerializerMixin
+  include SuggestedTopicsMixin
   include ApplicationHelper
 
   def self.attributes_from_topic(*list)
@@ -21,7 +22,6 @@ class TopicViewSerializer < ApplicationSerializer
                         :created_at,
                         :views,
                         :reply_count,
-                        :participant_count,
                         :like_count,
                         :last_posted_at,
                         :visible,
@@ -35,17 +35,19 @@ class TopicViewSerializer < ApplicationSerializer
                         :deleted_at,
                         :pending_posts_count,
                         :user_id,
-                        :pm_with_non_human_user?
+                        :pm_with_non_human_user?,
+                        :featured_link,
+                        :featured_link_root_domain,
+                        :pinned_globally,
+                        :pinned_at,
+                        :pinned_until
 
   attributes :draft,
              :draft_key,
              :draft_sequence,
              :posted,
              :unpinned,
-             :pinned_globally,
-             :pinned,    # Is topic pinned and viewer hasn't cleared the pin?
-             :pinned_at, # Ignores clear pin
-             :pinned_until,
+             :pinned,
              :details,
              :highest_post_number,
              :last_read_post_number,
@@ -59,10 +61,11 @@ class TopicViewSerializer < ApplicationSerializer
              :bookmarked,
              :message_archived,
              :tags,
-             :featured_link,
              :topic_timer,
+             :private_topic_timer,
              :unicode_title,
-             :message_bus_last_id
+             :message_bus_last_id,
+             :participant_count
 
   # TODO: Split off into proper object / serializer
   def details
@@ -83,21 +86,16 @@ class TopicViewSerializer < ApplicationSerializer
 
       result[:allowed_users] = object.topic.allowed_users.select do |user|
         !allowed_user_ids.include?(user.id)
-      end.map do |user|
+      end.map! do |user|
         BasicUserSerializer.new(user, scope: scope, root: false)
       end
     end
 
     if object.post_counts_by_user.present?
-      result[:participants] = object.post_counts_by_user.map do |pc|
-        TopicPostCountSerializer.new({user: object.participants[pc[0]], post_count: pc[1]}, scope: scope, root: false)
-      end
-    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)
+      participants = object.post_counts_by_user.reject { |p| object.participants[p].blank? }.map do |pc|
+        TopicPostCountSerializer.new({ user: object.participants[pc[0]], post_count: pc[1] }, scope: scope, root: false)
       end
+      result[:participants] = participants if participants.length > 0
     end
 
     if object.links.present?
@@ -118,11 +116,13 @@ class TopicViewSerializer < ApplicationSerializer
     result[:can_delete] = true if scope.can_delete?(object.topic)
     result[:can_recover] = true if scope.can_recover_topic?(object.topic)
     result[:can_remove_allowed_users] = true if scope.can_remove_allowed_users?(object.topic)
+    result[:can_remove_self_id] = scope.user.id if scope.can_remove_allowed_users?(object.topic, scope.user)
     result[:can_invite_to] = true if scope.can_invite_to?(object.topic)
     result[:can_invite_via_email] = true if scope.can_invite_via_email?(object.topic)
     result[:can_create_post] = true if scope.can_create?(Post, object.topic)
     result[:can_reply_as_new_topic] = true if scope.can_reply_as_new_topic?(object.topic)
     result[:can_flag_topic] = actions_summary.any? { |a| a[:can_act] }
+    result[:can_convert_topic] = true if scope.can_convert_topic?(object.topic)
     result
   end
 
@@ -193,10 +193,6 @@ class TopicViewSerializer < ApplicationSerializer
   end
   alias_method :include_posted?, :has_topic_user?
 
-  def pinned_globally
-    object.topic.pinned_globally
-  end
-
   def pinned
     PinnedCheck.pinned?(object.topic, object.topic_user)
   end
@@ -205,22 +201,14 @@ class TopicViewSerializer < ApplicationSerializer
     PinnedCheck.unpinned?(object.topic, object.topic_user)
   end
 
-  def pinned_at
-    object.topic.pinned_at
-  end
-
-  def pinned_until
-    object.topic.pinned_until
-  end
-
   def actions_summary
     result = []
-    return [] unless post = object.posts.try(:first)
+    return [] unless post = object.posts&.first
     PostActionType.topic_flag_types.each do |sym, id|
       result << { id: id,
                   count: 0,
                   hidden: false,
-                  can_act: scope.post_can_act?(post, sym)}
+                  can_act: scope.post_can_act?(post, sym) }
       # TODO: other keys? :can_defer_flags, :acted, :can_undo
     end
     result
@@ -243,7 +231,7 @@ class TopicViewSerializer < ApplicationSerializer
   end
 
   def bookmarked
-    object.topic_user.try(:bookmarked)
+    object.topic_user&.bookmarked
   end
 
   def include_pending_posts_count?
@@ -255,9 +243,16 @@ class TopicViewSerializer < ApplicationSerializer
   end
 
   def topic_timer
-    TopicTimerSerializer.new(
-      object.topic.public_topic_timer, root: false
-    )
+    TopicTimerSerializer.new(object.topic.public_topic_timer, root: false)
+  end
+
+  def include_private_topic_timer?
+    scope.user
+  end
+
+  def private_topic_timer
+    timer = object.topic.private_topic_timer(scope.user)
+    TopicTimerSerializer.new(timer, root: false)
   end
 
   def tags
@@ -268,22 +263,26 @@ class TopicViewSerializer < ApplicationSerializer
     SiteSetting.topic_featured_link_enabled
   end
 
-  def featured_link
-    object.topic.featured_link
+  def include_featured_link_root_domain?
+    SiteSetting.topic_featured_link_enabled && object.topic.featured_link
   end
 
   def include_unicode_title?
-    !!(object.topic.title =~ /:([\w\-+]*):/)
+    object.topic.title.match?(/:[\w\-+]+:/)
   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?
     private_message?(object.topic)
   end
 
+  def participant_count
+    object.participant_count
+  end
+
   private
 
     def private_message?(topic)
diff --git a/app/serializers/upload_serializer.rb b/app/serializers/upload_serializer.rb
index 9e0d866248..a02fbef9b0 100644
--- a/app/serializers/upload_serializer.rb
+++ b/app/serializers/upload_serializer.rb
@@ -1,5 +1,11 @@
 class UploadSerializer < ApplicationSerializer
-
-  attributes :id, :url, :original_filename, :filesize, :width, :height
-
+  attributes :id,
+             :url,
+             :original_filename,
+             :filesize,
+             :width,
+             :height,
+             :extension,
+             :short_url,
+             :retain_hours
 end
diff --git a/app/serializers/user_action_serializer.rb b/app/serializers/user_action_serializer.rb
index 965f4e61e4..c6abea6a5c 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,11 +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)
   end
diff --git a/app/serializers/user_option_serializer.rb b/app/serializers/user_option_serializer.rb
index a6a7caeb23..6bccbe8176 100644
--- a/app/serializers/user_option_serializer.rb
+++ b/app/serializers/user_option_serializer.rb
@@ -20,8 +20,9 @@ class UserOptionSerializer < ApplicationSerializer
              :like_notification_frequency,
              :include_tl0_in_digests,
              :theme_key,
-             :theme_key_seq
-
+             :theme_key_seq,
+             :allow_private_messages,
+             :homepage_id,
 
   def auto_track_topics_after_msecs
     object.auto_track_topics_after_msecs || SiteSetting.default_other_auto_track_topics_after_msecs
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index e7f6073ea3..30bb1038c6 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -66,10 +66,13 @@ class UserSerializer < BasicUserSerializer
              :topic_post_count,
              :pending_count,
              :profile_view_count,
+             :time_read,
+             :recent_time_read,
              :primary_group_name,
              :primary_group_flair_url,
              :primary_group_flair_bg_color,
-             :primary_group_flair_color
+             :primary_group_flair_color,
+             :staged
 
   has_one :invited_by, embed: :object, serializer: BasicUserSerializer
   has_many :groups, embed: :object, serializer: BasicGroupSerializer
@@ -115,6 +118,7 @@ class UserSerializer < BasicUserSerializer
                        :bio_excerpt,
                        :location,
                        :website,
+                       :website_name,
                        :profile_background,
                        :card_background
 
@@ -124,17 +128,12 @@ class UserSerializer < BasicUserSerializer
 
   def mailing_list_posts_per_day
     val = Post.estimate_posts_per_day
-    [val,SiteSetting.max_emails_per_day_per_user].min
+    [val, SiteSetting.max_emails_per_day_per_user].min
   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
@@ -142,20 +141,20 @@ class UserSerializer < BasicUserSerializer
   end
 
   def include_email?
-    object.id && object.id == scope.user.try(:id)
+    (object.id && object.id == scope.user.try(:id)) ||
+      (scope.is_staff? && object.staged?)
   end
 
   def can_change_bio
     !(SiteSetting.enable_sso && SiteSetting.sso_overrides_bio)
   end
 
-
   def user_api_keys
     keys = object.user_api_keys.where(revoked_at: nil).map do |k|
       {
         id: k.id,
         application_name: k.application_name,
-        scopes: k.scopes.map{|s| I18n.t("user_api_key.scopes.#{s}")},
+        scopes: k.scopes.map { |s| I18n.t("user_api_key.scopes.#{s}") },
         created_at: k.created_at
       }
     end
@@ -182,7 +181,7 @@ class UserSerializer < BasicUserSerializer
   def website_name
     uri = URI(website.to_s) rescue nil
     return if uri.nil? || uri.host.nil?
-    uri.host.sub(/^www\./,'') + uri.path
+    uri.host.sub(/^www\./, '') + uri.path
   end
 
   def include_website_name
@@ -248,15 +247,15 @@ 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
-    object.user_profile.bio_excerpt(350 , { keep_newlines: true, keep_emoji_images: true })
+    object.user_profile.bio_excerpt(350 , keep_newlines: true, keep_emoji_images: true)
   end
 
   def include_suspend_reason?
-    object.suspended?
+    scope.can_see_suspension_reason?(object) && object.suspended?
   end
 
   def include_suspended_till?
@@ -369,7 +368,7 @@ class UserSerializer < BasicUserSerializer
   end
 
   def has_title_badges
-    object.badges.where(allow_title: true).count > 0
+    object.badges.where(allow_title: true).exists?
   end
 
   def user_fields
@@ -392,7 +391,7 @@ class UserSerializer < BasicUserSerializer
     end
 
     if fields.present?
-      User.custom_fields_for_ids([object.id], fields)[object.id]
+      User.custom_fields_for_ids([object.id], fields)[object.id] || {}
     else
       {}
     end
@@ -406,4 +405,16 @@ class UserSerializer < BasicUserSerializer
     object.user_profile.views
   end
 
+  def time_read
+    object.user_stat&.time_read
+  end
+
+  def recent_time_read
+    time = object.recent_time_read
+  end
+
+  def include_staged?
+    scope.is_staff?
+  end
+
 end
diff --git a/app/serializers/user_summary_serializer.rb b/app/serializers/user_summary_serializer.rb
index dca6dc544d..c641843796 100644
--- a/app/serializers/user_summary_serializer.rb
+++ b/app/serializers/user_summary_serializer.rb
@@ -1,7 +1,7 @@
 class UserSummarySerializer < ApplicationSerializer
 
-  class TopicSerializer < ApplicationSerializer
-    attributes :id, :created_at, :fancy_title, :slug, :like_count
+  class TopicSerializer < ListableTopicSerializer
+    attributes :category_id, :like_count
   end
 
   class ReplySerializer < ApplicationSerializer
@@ -32,11 +32,13 @@ class UserSummarySerializer < ApplicationSerializer
 
   attributes :likes_given,
              :likes_received,
+             :topics_entered,
              :posts_read_count,
              :days_visited,
              :topic_count,
              :post_count,
              :time_read,
+             :recent_time_read,
              :bookmark_count
 
   def include_badges?
@@ -48,6 +50,10 @@ class UserSummarySerializer < ApplicationSerializer
   end
 
   def time_read
-    AgeWords.age_words(object.time_read)
+    object.time_read
+  end
+
+  def recent_time_read
+    object.recent_time_read
   end
 end
diff --git a/app/serializers/watched_word_list_serializer.rb b/app/serializers/watched_word_list_serializer.rb
new file mode 100644
index 0000000000..16fba3ea50
--- /dev/null
+++ b/app/serializers/watched_word_list_serializer.rb
@@ -0,0 +1,19 @@
+class WatchedWordListSerializer < ApplicationSerializer
+  attributes :actions, :words, :regular_expressions
+
+  def actions
+    WatchedWord.actions.keys
+  end
+
+  def words
+    object.map do |word|
+      WatchedWordSerializer.new(word, root: false)
+    end
+  end
+
+  # No point making this site setting `client: true` when it's only used
+  # in the admin section
+  def regular_expressions
+    SiteSetting.watched_words_regular_expressions?
+  end
+end
diff --git a/app/serializers/watched_word_serializer.rb b/app/serializers/watched_word_serializer.rb
new file mode 100644
index 0000000000..ffa46da512
--- /dev/null
+++ b/app/serializers/watched_word_serializer.rb
@@ -0,0 +1,7 @@
+class WatchedWordSerializer < ApplicationSerializer
+  attributes :id, :word, :action
+
+  def action
+    WatchedWord.actions[object.action]
+  end
+end
diff --git a/app/services/anonymous_shadow_creator.rb b/app/services/anonymous_shadow_creator.rb
index 08c1d6a338..7cb27438a6 100644
--- a/app/services/anonymous_shadow_creator.rb
+++ b/app/services/anonymous_shadow_creator.rb
@@ -17,7 +17,7 @@ class AnonymousShadowCreator
     if (shadow_id = user.custom_fields["shadow_id"].to_i) > 0
       shadow = User.find_by(id: shadow_id)
 
-      if shadow && shadow.post_count > 0 &&
+      if shadow && (shadow.post_count + shadow.topic_count) > 0 &&
           shadow.last_posted_at < SiteSetting.anonymous_account_duration_minutes.minutes.ago
         shadow = nil
       end
@@ -39,7 +39,7 @@ class AnonymousShadowCreator
         username: username,
         active: true,
         trust_level: 1,
-        trust_level_locked: true,
+        manual_locked_trust_level: 1,
         created_at: 1.day.ago # bypass new user restrictions
       )
 
diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index 33923050b2..5e88683cff 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -1,17 +1,17 @@
 class BadgeGranter
 
-  def initialize(badge, user, opts={})
+  def initialize(badge, user, opts = {})
     @badge, @user, @opts = badge, user, opts
     @granted_by = opts[:granted_by] || Discourse.system_user
     @post_id = opts[:post_id]
   end
 
-  def self.grant(badge, user, opts={})
+  def self.grant(badge, user, opts = {})
     BadgeGranter.new(badge, user, opts).grant
   end
 
   def grant
-    return if @granted_by and !Guardian.new(@granted_by).can_grant_badges?(@user)
+    return if @granted_by && !Guardian.new(@granted_by).can_grant_badges?(@user)
     return unless @badge.enabled?
 
     find_by = { badge_id: @badge.id, user_id: @user.id }
@@ -51,7 +51,8 @@ class BadgeGranter
                 data: { badge_id: @badge.id,
                         badge_name: @badge.display_name,
                         badge_slug: @badge.slug,
-                        username: @user.username}.to_json
+                        badge_title: @badge.allow_title,
+                        username: @user.username }.to_json
               )
               user_badge.update_attributes notification_id: notification.id
             end
@@ -63,7 +64,7 @@ class BadgeGranter
     user_badge
   end
 
-  def self.revoke(user_badge, options={})
+  def self.revoke(user_badge, options = {})
     UserBadge.transaction do
       user_badge.destroy!
       if options[:revoked_by]
@@ -178,7 +179,7 @@ class BadgeGranter
   #   :trigger - the Badge::Trigger id
   #   :explain - return the EXPLAIN query
   def self.preview(sql, opts = {})
-    params = {user_ids: [], post_ids: [], backfill: true}
+    params = { user_ids: [], post_ids: [], backfill: true }
 
     BadgeGranter.contract_checks!(sql, opts)
 
@@ -188,19 +189,19 @@ class BadgeGranter
 
     grants_sql =
      if opts[:target_posts]
-      "SELECT u.id, u.username, q.post_id, t.title, q.granted_at
-    FROM(#{sql}) q
-    JOIN users u on u.id = q.user_id
-    LEFT JOIN badge_posts p on p.id = q.post_id
-    LEFT JOIN topics t on t.id = p.topic_id
-    WHERE :backfill = :backfill
-    LIMIT 10"
+       "SELECT u.id, u.username, q.post_id, t.title, q.granted_at
+     FROM(#{sql}) q
+     JOIN users u on u.id = q.user_id
+     LEFT JOIN badge_posts p on p.id = q.post_id
+     LEFT JOIN topics t on t.id = p.topic_id
+     WHERE :backfill = :backfill
+     LIMIT 10"
      else
-      "SELECT u.id, u.username, q.granted_at
-    FROM(#{sql}) q
-    JOIN users u on u.id = q.user_id
-    WHERE :backfill = :backfill
-    LIMIT 10"
+       "SELECT u.id, u.username, q.granted_at
+     FROM(#{sql}) q
+     JOIN users u on u.id = q.user_id
+     WHERE :backfill = :backfill
+     LIMIT 10"
      end
 
     query_plan = nil
@@ -218,13 +219,13 @@ class BadgeGranter
       end
     end
 
-    {grant_count: grant_count, sample: sample, query_plan: query_plan}
+    { grant_count: grant_count, sample: sample, query_plan: query_plan }
   rescue => e
-    {errors: e.message}
+    { errors: e.message }
   end
 
-  MAX_ITEMS_FOR_DELTA = 200
-  def self.backfill(badge, opts=nil)
+  MAX_ITEMS_FOR_DELTA ||= 200
+  def self.backfill(badge, opts = nil)
     return unless SiteSetting.enable_badges
     return unless badge.enabled
     return unless badge.query.present?
@@ -304,14 +305,15 @@ class BadgeGranter
                                  user_ids: user_ids || [-2]).each do |row|
 
       # old bronze badges do not matter
-      next if badge.badge_type_id == BadgeType::Bronze and row.granted_at < 2.days.ago
+      next if badge.badge_type_id == (BadgeType::Bronze) && row.granted_at < (2.days.ago)
 
       # Try to use user locale in the badge notification if possible without too much resources
-      notification_locale = if SiteSetting.allow_user_locale && row.locale.present?
-                              row.locale
-                            else
-                              SiteSetting.default_locale
-                            end
+      notification_locale =
+        if SiteSetting.allow_user_locale && row.locale.present?
+          row.locale
+        else
+          SiteSetting.default_locale
+        end
 
       # Make this variable in this scope
       notification = nil
@@ -326,8 +328,9 @@ class BadgeGranter
                             badge_id: badge.id,
                             badge_name: badge.display_name,
                             badge_slug: badge.slug,
+                            badge_title: badge.allow_title,
                             username: row.username
-        }.to_json )
+        }.to_json)
       end
 
       Badge.exec_sql("UPDATE user_badges SET notification_id = :notification_id WHERE id = :id",
diff --git a/app/services/color_scheme_revisor.rb b/app/services/color_scheme_revisor.rb
index ce66c37332..0057dedfa5 100644
--- a/app/services/color_scheme_revisor.rb
+++ b/app/services/color_scheme_revisor.rb
@@ -1,6 +1,6 @@
 class ColorSchemeRevisor
 
-  def initialize(color_scheme, params={})
+  def initialize(color_scheme, params = {})
     @color_scheme = color_scheme
     @params = params
   end
@@ -12,7 +12,7 @@ class ColorSchemeRevisor
   def revise
     ColorScheme.transaction do
 
-      @color_scheme.name    = @params[:name]    if @params.has_key?(:name)
+      @color_scheme.name = @params[:name]    if @params.has_key?(:name)
       @color_scheme.base_scheme_id = @params[:base_scheme_id] if @params.has_key?(:base_scheme_id)
       has_colors = @params[:colors]
 
@@ -27,7 +27,12 @@ class ColorSchemeRevisor
         @color_scheme.clear_colors_cache
       end
 
-      @color_scheme.save if has_colors || @color_scheme.name_changed? || @color_scheme.base_scheme_id_changed?
+      if has_colors ||
+         @color_scheme.saved_change_to_name? ||
+         @color_scheme.saved_change_to_base_scheme_id?
+
+        @color_scheme.save
+      end
     end
     @color_scheme
   end
diff --git a/app/services/group_action_logger.rb b/app/services/group_action_logger.rb
index 9f1f429a8f..58674016c3 100644
--- a/app/services/group_action_logger.rb
+++ b/app/services/group_action_logger.rb
@@ -24,7 +24,7 @@ class GroupActionLogger
   end
 
   def log_add_user_to_group(target_user)
-    @group.public || can_edit?
+    (target_user == @acting_user && @group.public_admission) || can_edit?
 
     GroupHistory.create!(default_params.merge(
       action: GroupHistory.actions[:add_user_to_group],
@@ -33,7 +33,7 @@ class GroupActionLogger
   end
 
   def log_remove_user_from_group(target_user)
-    @group.public || can_edit?
+    (target_user == @acting_user && @group.public_exit) || can_edit?
 
     GroupHistory.create!(default_params.merge(
       action: GroupHistory.actions[:remove_user_from_group],
diff --git a/app/services/group_message.rb b/app/services/group_message.rb
index 16e18ddbb8..4e5a55f99a 100644
--- a/app/services/group_message.rb
+++ b/app/services/group_message.rb
@@ -16,11 +16,11 @@ class GroupMessage
 
   include Rails.application.routes.url_helpers
 
-  def self.create(group_name, message_type, opts={})
+  def self.create(group_name, message_type, opts = {})
     GroupMessage.new(group_name, message_type, opts).create
   end
 
-  def initialize(group_name, message_type, opts={})
+  def initialize(group_name, message_type, opts = {})
     @group_name = group_name
     @message_type = message_type
     @opts = opts
@@ -47,10 +47,8 @@ class GroupMessage
     @message_params ||= begin
       h = { base_url: Discourse.base_url }.merge(@opts[:message_params] || {})
       if @opts[:user]
-        h.merge!({
-          username: @opts[:user].username,
-          user_url: user_path(@opts[:user].username)
-        })
+        h.merge!(username: @opts[:user].username,
+                 user_url: user_path(@opts[:user].username))
       end
       h
     end
diff --git a/app/services/handle_chunk_upload.rb b/app/services/handle_chunk_upload.rb
index c71a656dad..de5bf7837d 100644
--- a/app/services/handle_chunk_upload.rb
+++ b/app/services/handle_chunk_upload.rb
@@ -1,6 +1,6 @@
 class HandleChunkUpload
 
-  def initialize(chunk, params={})
+  def initialize(chunk, params = {})
     @chunk = chunk
     @params = params
   end
diff --git a/app/services/notification_emailer.rb b/app/services/notification_emailer.rb
index 534d4037a1..9b593f3a17 100644
--- a/app/services/notification_emailer.rb
+++ b/app/services/notification_emailer.rb
@@ -66,12 +66,12 @@ class NotificationEmailer
 
     EMAILABLE_POST_TYPES ||= Set.new [Post.types[:regular], Post.types[:whisper]]
 
-    def enqueue(type, delay=default_delay)
+    def enqueue(type, delay = default_delay)
       return unless notification.user.user_option.email_direct?
       perform_enqueue(type, delay)
     end
 
-    def enqueue_private(type, delay=private_delay)
+    def enqueue_private(type, delay = private_delay)
       return unless notification.user.user_option.email_private_messages?
       perform_enqueue(type, delay)
     end
@@ -79,7 +79,7 @@ class NotificationEmailer
     def perform_enqueue(type, delay)
       user = notification.user
       return unless user.active? || user.staged?
-      return if SiteSetting.must_approve_users? && !user.approved?
+      return if SiteSetting.must_approve_users? && !user.approved? && !user.staged?
 
       return unless EMAILABLE_POST_TYPES.include?(post_type)
 
diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index 9672512e1b..63e33aa67b 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -1,4 +1,5 @@
 require_dependency 'distributed_mutex'
+require_dependency 'user_action_creator'
 
 class PostAlerter
   def self.post_created(post, opts = {})
@@ -37,6 +38,10 @@ class PostAlerter
     allowed_group_users(post)
   end
 
+  def notify_about_reply?(post)
+    post.post_type == Post.types[:regular] || post.post_type == Post.types[:whisper]
+  end
+
   def after_save_post(post, new_record = false)
     notified = [post.user]
 
@@ -48,11 +53,11 @@ class PostAlerter
       if post.last_editor_id != post.user_id
         # Mention comes from an edit by someone else, so notification should say who added the mention.
         editor = post.last_editor
-        mentioned_opts = {user_id: editor.id, original_username: editor.username, display_username: editor.username}
+        mentioned_opts = { user_id: editor.id, original_username: editor.username, display_username: editor.username }
       end
 
       expand_group_mentions(mentioned_groups, post) do |group, users|
-        notify_non_pm_users(users - notified, :group_mentioned, post, mentioned_opts.merge({group: group}))
+        notify_non_pm_users(users - notified, :group_mentioned, post, mentioned_opts.merge(group: group))
         notified += users
       end
 
@@ -65,7 +70,7 @@ class PostAlerter
     # replies
     reply_to_user = post.reply_notification_target
 
-    if new_record && reply_to_user && !notified.include?(reply_to_user) && post.post_type == Post.types[:regular]
+    if new_record && reply_to_user && !notified.include?(reply_to_user) && notify_about_reply?(post)
       notify_non_pm_users(reply_to_user, :replied, post)
       notified += [reply_to_user]
     end
@@ -84,14 +89,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]
+          if notified.include?(user) || notification_level == TopicUser.notification_levels[:watching] || user.staged?
             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)
 
@@ -118,17 +127,17 @@ class PostAlerter
 
       if topic.present?
         cat_watchers = topic.category_users
-                            .where(notification_level: CategoryUser.notification_levels[:watching_first_post])
-                            .pluck(:user_id)
+          .where(notification_level: CategoryUser.notification_levels[:watching_first_post])
+          .pluck(:user_id)
 
         tag_watchers = topic.tag_users
-                            .where(notification_level: TagUser.notification_levels[:watching_first_post])
-                            .pluck(:user_id)
+          .where(notification_level: TagUser.notification_levels[:watching_first_post])
+          .pluck(:user_id)
 
         group_ids = topic.allowed_groups.pluck(:group_id)
         group_watchers = GroupUser.where(group_id: group_ids,
                                          notification_level: GroupUser.notification_levels[:watching_first_post])
-                                  .pluck(:user_id)
+          .pluck(:user_id)
 
         watchers = [cat_watchers, tag_watchers, group_watchers].flatten
 
@@ -145,7 +154,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
@@ -161,17 +172,17 @@ class PostAlerter
 
   def unread_posts(user, topic)
     Post.secured(Guardian.new(user))
-        .where('post_number > COALESCE((
+      .where('post_number > COALESCE((
                SELECT last_read_post_number FROM topic_users tu
                WHERE tu.user_id = ? AND tu.topic_id = ? ),0)',
                 user.id, topic.id)
-        .where('reply_to_user_id = ? OR exists(
+      .where('reply_to_user_id = ? OR exists(
             SELECT 1 from topic_users tu
             WHERE tu.user_id = ? AND
               tu.topic_id = ? AND
               notification_level = ?
             )', user.id, user.id, topic.id, TopicUser.notification_levels[:watching])
-        .where(topic_id: topic.id)
+      .where(topic_id: topic.id)
   end
 
   def first_unread_post(user, topic)
@@ -192,7 +203,7 @@ class PostAlerter
     user.reload
   end
 
-  NOTIFIABLE_TYPES = [:mentioned, :replied, :quoted, :posted, :linked, :private_message, :group_mentioned].map{ |t|
+  NOTIFIABLE_TYPES = [:mentioned, :replied, :quoted, :posted, :linked, :private_message, :group_mentioned].map { |t|
     Notification.types[t]
   }
 
@@ -211,18 +222,18 @@ class PostAlerter
     end
   end
 
-  def notify_group_summary(user,post)
+  def notify_group_summary(user, post)
 
     @group_stats ||= {}
     stats = (@group_stats[post.topic_id] ||= group_stats(post.topic))
     return unless stats
 
     group_id = post.topic
-                   .topic_allowed_groups
-                   .where(group_id: user.groups.pluck(:id))
-                   .pluck(:group_id).first
+      .topic_allowed_groups
+      .where(group_id: user.groups.pluck(:id))
+      .pluck(:group_id).first
 
-    stat = stats.find{|s| s[:group_id] == group_id}
+    stat = stats.find { |s| s[:group_id] == group_id }
     return unless stat && stat[:inbox_count] > 0
 
     notification_type = Notification.types[:group_message_summary]
@@ -277,6 +288,8 @@ class PostAlerter
   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
 
@@ -285,13 +298,15 @@ class PostAlerter
     # Make sure the user can see the post
     return unless Guardian.new(user).can_see?(post)
 
+    return if user.staged? && post.topic.category&.mailinglist_mirror?
+
     notifier_id = opts[:user_id] || post.user_id # xxxxx look at revision history
 
     # apply muting here
     return if notifier_id && MutedUser.where(user_id: user.id, muted_user_id: notifier_id)
-                                      .joins(:muted_user)
-                                      .where('NOT admin AND NOT moderator')
-                                      .exists?
+        .joins(:muted_user)
+        .where('NOT admin AND NOT moderator')
+        .exists?
 
     # skip if muted on the topic
     return if TopicUser.where(
@@ -311,10 +326,10 @@ class PostAlerter
 
     # Don't notify the same user about the same notification on the same post
     existing_notification = user.notifications
-                                .order("notifications.id DESC")
-                                .find_by(topic_id: post.topic_id,
-                                         post_number: post.post_number,
-                                         notification_type: type)
+      .order("notifications.id DESC")
+      .find_by(topic_id: post.topic_id,
+               post_number: post.post_number,
+               notification_type: type)
 
     return if existing_notification && !should_notify_previous?(user, existing_notification, opts)
 
@@ -368,40 +383,45 @@ class PostAlerter
       end
     end
 
-    notification_data.merge!({
-      topic_title: topic_title,
-      original_post_id: original_post.id,
-      original_post_type: original_post.post_type,
-      original_username: original_username,
-      display_username: opts[:display_username] || post.user.username
-    })
+    notification_data.merge!(topic_title: topic_title,
+                             original_post_id: original_post.id,
+                             original_post_type: original_post.post_type,
+                             original_username: original_username,
+                             display_username: opts[:display_username] || post.user.username)
 
     if group = opts[:group]
       notification_data[:group_id] = group.id
       notification_data[:group_name] = group.name
     end
 
+    if original_post.via_email && (incoming_email = original_post.incoming_email)
+      skip_send_email = contains_email_address?(incoming_email.to_addresses, user) ||
+        contains_email_address?(incoming_email.cc_addresses, user)
+    else
+      skip_send_email = opts[:skip_send_email]
+    end
+
     # Create the notification
     user.notifications.create(notification_type: type,
                               topic_id: post.topic_id,
                               post_number: post.post_number,
                               post_action_id: opts[:post_action_id],
                               data: notification_data.to_json,
-                              skip_send_email: opts[:skip_send_email])
+                              skip_send_email: skip_send_email)
 
    if !existing_notification && NOTIFIABLE_TYPES.include?(type) && !user.suspended?
      # we may have an invalid post somehow, dont blow up
      post_url = original_post.url rescue nil
      if post_url
-        payload = {
-          notification_type: type,
-          post_number: original_post.post_number,
-          topic_title: original_post.topic.title,
-          topic_id: original_post.topic.id,
-          excerpt: original_post.excerpt(400, text_entities: true, strip_links: true, remap_emoji: true),
-          username: original_username,
-          post_url: post_url
-        }
+       payload = {
+         notification_type: type,
+         post_number: original_post.post_number,
+         topic_title: original_post.topic.title,
+         topic_id: original_post.topic.id,
+         excerpt: original_post.excerpt(400, text_entities: true, strip_links: true, remap_emoji: true),
+         username: original_username,
+         post_url: post_url
+       }
 
         MessageBus.publish("/notification-alert/#{user.id}", payload, user_ids: [user.id])
         push_notification(user, payload)
@@ -411,12 +431,17 @@ class PostAlerter
 
   end
 
+  def contains_email_address?(addresses, user)
+    return false if addresses.blank?
+    addresses.split(";").include?(user.email)
+  end
+
   def push_notification(user, payload)
     if SiteSetting.allow_user_api_key_scopes.split("|").include?("push") && SiteSetting.allowed_user_api_push_urls.present?
       clients = user.user_api_keys
-          .where("('push' = ANY(scopes) OR 'notifications' = ANY(scopes)) AND push_url IS NOT NULL AND position(push_url in ?) > 0 AND revoked_at IS NULL",
+        .where("('push' = ANY(scopes) OR 'notifications' = ANY(scopes)) AND push_url IS NOT NULL AND position(push_url in ?) > 0 AND revoked_at IS NULL",
                   SiteSetting.allowed_user_api_push_urls)
-          .pluck(:client_id, :push_url)
+        .pluck(:client_id, :push_url)
 
       if clients.length > 0
         Jobs.enqueue(:push_notification, clients: clients, payload: payload, user_id: user.id)
@@ -450,7 +475,6 @@ class PostAlerter
     [groups, users]
   end
 
-
   # TODO: Move to post-analyzer?
   # Returns a list of users who were quoted in the post
   def extract_quoted_users(post)
@@ -463,7 +487,7 @@ class PostAlerter
     post.topic_links.where(reflection: false).map do |link|
       linked_post = link.link_post
       if !linked_post && topic = link.link_topic
-        linked_post = topic.posts(post_number: 1).first
+        linked_post = topic.posts.find_by(post_number: 1)
       end
       (linked_post && post.user_id != linked_post.user_id && linked_post.user) || nil
     end.compact
@@ -476,6 +500,7 @@ class PostAlerter
 
     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
@@ -521,6 +546,7 @@ 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/post_owner_changer.rb b/app/services/post_owner_changer.rb
index 2a9c71b21e..f419289faa 100644
--- a/app/services/post_owner_changer.rb
+++ b/app/services/post_owner_changer.rb
@@ -22,10 +22,15 @@ class PostOwnerChanger
         end
         post.topic = @topic
         post.set_owner(@new_owner, @acting_user, @skip_revision)
+        PostAction.remove_act(@new_owner, post, PostActionType.types[:like])
       end
 
       @topic.update_statistics
-      @new_owner.user_stat.update(first_post_created_at: @new_owner.posts(true).order('created_at ASC').first.try(:created_at))
+
+      @new_owner.user_stat.update(
+        first_post_created_at: @new_owner.reload.posts.order('created_at ASC').first&.created_at
+      )
+
       @topic.save!
     end
   end
diff --git a/app/services/random_topic_selector.rb b/app/services/random_topic_selector.rb
index 9446c4fcbb..4aaa7d3343 100644
--- a/app/services/random_topic_selector.rb
+++ b/app/services/random_topic_selector.rb
@@ -3,8 +3,8 @@ class RandomTopicSelector
   BACKFILL_SIZE = 3000
   BACKFILL_LOW_WATER_MARK = 500
 
-  def self.backfill(category=nil)
-    exclude = category.try(:topic_id)
+  def self.backfill(category = nil)
+    exclude = category&.topic_id
 
     # don't leak private categories into the "everything" group
     user = category ? CategoryFeaturedTopic.fake_admin : nil
@@ -20,24 +20,26 @@ class RandomTopicSelector
 
     query = TopicQuery.new(user, options)
 
-
     results = query.latest_results.order('RANDOM()')
-                   .where(closed: false, archived: false)
-                   .where("topics.created_at > ?", SiteSetting.suggested_topics_max_days_old.days.ago)
-                   .limit(BACKFILL_SIZE)
-                   .reorder('RANDOM()')
-                   .pluck(:id)
+      .where(closed: false, archived: false)
+      .where("topics.created_at > ?", SiteSetting.suggested_topics_max_days_old.days.ago)
+      .limit(BACKFILL_SIZE)
+      .reorder('RANDOM()')
+      .pluck(:id)
 
     key = cache_key(category)
-    results.each do |id|
-      $redis.rpush(key, id)
+
+    if results.present?
+      $redis.multi do
+        $redis.rpush(key, results)
+        $redis.expire(key, 2.days)
+      end
     end
-    $redis.expire(key, 2.days)
 
     results
   end
 
-  def self.next(count, category=nil)
+  def self.next(count, category = nil)
     key = cache_key(category)
 
     results = []
@@ -45,12 +47,12 @@ class RandomTopicSelector
     return results if count < 1
 
     results = $redis.multi do
-      $redis.lrange(key, 0, count-1)
+      $redis.lrange(key, 0, count - 1)
       $redis.ltrim(key, count, -1)
     end
 
     if !results.is_a?(Array) # Redis is in readonly mode
-      results = $redis.lrange(key, 0, count-1)
+      results = $redis.lrange(key, 0, count - 1)
     else
       results = results[0]
     end
@@ -77,8 +79,8 @@ class RandomTopicSelector
     results
   end
 
-  def self.cache_key(category=nil)
-    "random_topic_cache_#{category.try(:id)}"
+  def self.cache_key(category = nil)
+    "random_topic_cache_#{category&.id}"
   end
 
 end
diff --git a/app/services/search_indexer.rb b/app/services/search_indexer.rb
index 0847826567..fdf6b50669 100644
--- a/app/services/search_indexer.rb
+++ b/app/services/search_indexer.rb
@@ -15,13 +15,14 @@ class SearchIndexer
   end
 
   def self.update_index(table, id, raw_data)
-    raw_data = Search.prepare_data(raw_data)
+    raw_data = Search.prepare_data(raw_data, :index)
 
     table_name = "#{table}_search_data"
     foreign_key = "#{table}_id"
 
     # insert some extra words for I.am.a.word so "word" is tokenized
-    search_data = raw_data.gsub(/\p{L}*\.\p{L}*/) do |with_dot|
+    # I.am.a.word becomes I.am.a.word am a word
+    search_data = raw_data.gsub(/[^[:space:]]*[\.]+[^[:space:]]*/) do |with_dot|
       split = with_dot.split(".")
       if split.length > 1
         with_dot + (" " << split[1..-1].join(" "))
@@ -31,7 +32,7 @@ class SearchIndexer
     end
 
     # for user login and name use "simple" lowercase stemmer
-    stemmer = table == "user" ? "simple" : Search.long_locale
+    stemmer = table == "user" ? "simple" : Search.ts_config
 
     # Would be nice to use AR here but not sure how to execut Postgres functions
     # when inserting data like this.
@@ -39,20 +40,23 @@ class SearchIndexer
                                    SET
                                       raw_data = :raw_data,
                                       locale = :locale,
-                                      search_data = TO_TSVECTOR('#{stemmer}', :search_data)
+                                      search_data = TO_TSVECTOR('#{stemmer}', :search_data),
+                                      version = :version
                                    WHERE #{foreign_key} = :id",
                                     raw_data: raw_data,
                                     search_data: search_data,
                                     id: id,
-                                    locale: SiteSetting.default_locale)
+                                    locale: SiteSetting.default_locale,
+                                    version: Search::INDEX_VERSION)
     if rows == 0
       Post.exec_sql("INSERT INTO #{table_name}
-                    (#{foreign_key}, search_data, locale, raw_data)
-                    VALUES (:id, TO_TSVECTOR('#{stemmer}', :search_data), :locale, :raw_data)",
+                    (#{foreign_key}, search_data, locale, raw_data, version)
+                    VALUES (:id, TO_TSVECTOR('#{stemmer}', :search_data), :locale, :raw_data, :version)",
                                     raw_data: raw_data,
                                     search_data: search_data,
                                     id: id,
-                                    locale: SiteSetting.default_locale)
+                                    locale: SiteSetting.default_locale,
+                                    version: Search::INDEX_VERSION)
     end
   rescue
     # don't allow concurrency to mess up saving a post
@@ -78,10 +82,14 @@ class SearchIndexer
     update_index('category', category_id, name)
   end
 
-  def self.index(obj)
+  def self.update_tags_index(tag_id, name)
+    update_index('tag', tag_id, name)
+  end
+
+  def self.index(obj, force: false)
     return if @disabled
 
-    if obj.class == Post && obj.cooked_changed?
+    if obj.class == Post && (obj.saved_change_to_cooked? || force)
       if obj.topic
         category_name = obj.topic.category.name if obj.topic.category
         SearchIndexer.update_posts_index(obj.id, obj.cooked, obj.topic.title, category_name)
@@ -90,11 +98,12 @@ class SearchIndexer
         Rails.logger.warn("Orphan post skipped in search_indexer, topic_id: #{obj.topic_id} post_id: #{obj.id} raw: #{obj.raw}")
       end
     end
-    if obj.class == User && (obj.username_changed? || obj.name_changed?)
+
+    if obj.class == User && (obj.saved_change_to_username? || obj.saved_change_to_name? || force)
       SearchIndexer.update_users_index(obj.id, obj.username_lower || '', obj.name ? obj.name.downcase : '')
     end
 
-    if obj.class == Topic && obj.title_changed?
+    if obj.class == Topic && (obj.saved_change_to_title? || force)
       if obj.posts
         post = obj.posts.find_by(post_number: 1)
         if post
@@ -105,11 +114,14 @@ class SearchIndexer
       end
     end
 
-    if obj.class == Category && obj.name_changed?
+    if obj.class == Category && (obj.saved_change_to_name? || force)
       SearchIndexer.update_categories_index(obj.id, obj.name)
     end
-  end
 
+    if obj.class == Tag && (obj.saved_change_to_name? || force)
+      SearchIndexer.update_tags_index(obj.id, obj.name)
+    end
+  end
 
   class HtmlScrubber < Nokogiri::XML::SAX::Document
     attr_reader :scrubbed
@@ -130,7 +142,7 @@ class SearchIndexer
       me.scrubbed
     end
 
-    def start_element(name, attributes=[])
+    def start_element(name, attributes = [])
       attributes = Hash[*attributes.flatten]
       if attributes["alt"]
         scrubbed << " "
@@ -151,4 +163,3 @@ class SearchIndexer
     end
   end
 end
-
diff --git a/app/services/spam_rule/auto_block.rb b/app/services/spam_rule/auto_block.rb
deleted file mode 100644
index a44ac9a115..0000000000
--- a/app/services/spam_rule/auto_block.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-class SpamRule::AutoBlock
-
-  def initialize(user)
-    @user = user
-  end
-
-  def self.block?(user)
-    self.new(user).block?
-  end
-
-  def self.punish!(user)
-    self.new(user).block_user
-  end
-
-  def perform
-    block_user if block?
-  end
-
-  def block?
-    return true if @user.blocked?
-    return false if @user.staged?
-    return false if @user.has_trust_level?(TrustLevel[1])
-
-    if SiteSetting.num_spam_flags_to_block_new_user > 0 and
-        SiteSetting.num_users_to_block_new_user > 0 and
-        num_spam_flags_against_user >= SiteSetting.num_spam_flags_to_block_new_user and
-        num_users_who_flagged_spam_against_user >= SiteSetting.num_users_to_block_new_user
-      return true
-    end
-
-    if SiteSetting.num_tl3_flags_to_block_new_user > 0 and
-        SiteSetting.num_tl3_users_to_block_new_user > 0 and
-        num_tl3_flags_against_user >= SiteSetting.num_tl3_flags_to_block_new_user and
-        num_tl3_users_who_flagged >= SiteSetting.num_tl3_users_to_block_new_user
-      return true
-    end
-
-    false
-  end
-
-  def num_spam_flags_against_user
-    Post.where(user_id: @user.id).sum(:spam_count)
-  end
-
-  def num_users_who_flagged_spam_against_user
-    post_ids = Post.where('user_id = ? and spam_count > 0', @user.id).pluck(:id)
-    return 0 if post_ids.empty?
-    PostAction.spam_flags.where(post_id: post_ids).uniq.pluck(:user_id).size
-  end
-
-  def num_tl3_flags_against_user
-    if flagged_post_ids.empty?
-      0
-    else
-      PostAction.where(post_id: flagged_post_ids).joins(:user).where('users.trust_level >= ?', 3).count
-    end
-  end
-
-  def num_tl3_users_who_flagged
-    if flagged_post_ids.empty?
-      0
-    else
-      PostAction.where(post_id: flagged_post_ids).joins(:user).where('users.trust_level >= ?', 3).pluck(:user_id).uniq.size
-    end
-  end
-
-  def flagged_post_ids
-    Post.where(user_id: @user.id)
-        .where('spam_count > ? OR off_topic_count > ? OR inappropriate_count > ?', 0, 0, 0)
-        .pluck(:id)
-  end
-
-  def block_user
-    Post.transaction do
-      if UserBlocker.block(@user, Discourse.system_user, message: :too_many_spam_flags) && SiteSetting.notify_mods_when_user_blocked
-        GroupMessage.create(Group[:moderators].name, :user_automatically_blocked, {user: @user, limit_once_per: false})
-      end
-    end
-  end
-end
diff --git a/app/services/spam_rule/auto_silence.rb b/app/services/spam_rule/auto_silence.rb
new file mode 100644
index 0000000000..ac5173ef2c
--- /dev/null
+++ b/app/services/spam_rule/auto_silence.rb
@@ -0,0 +1,80 @@
+class SpamRule::AutoSilence
+
+  def initialize(user)
+    @user = user
+  end
+
+  def self.silence?(user)
+    self.new(user).silence?
+  end
+
+  def self.punish!(user)
+    self.new(user).silence_user
+  end
+
+  def perform
+    silence_user if silence?
+  end
+
+  def silence?
+    return true if @user.silenced?
+    return false if @user.staged?
+    return false if @user.has_trust_level?(TrustLevel[1])
+
+    if SiteSetting.num_spam_flags_to_silence_new_user > (0) &&
+        SiteSetting.num_users_to_silence_new_user > (0) &&
+        num_spam_flags_against_user >= (SiteSetting.num_spam_flags_to_silence_new_user) &&
+        num_users_who_flagged_spam_against_user >= (SiteSetting.num_users_to_silence_new_user)
+      return true
+    end
+
+    if SiteSetting.num_tl3_flags_to_silence_new_user > (0) &&
+        SiteSetting.num_tl3_users_to_silence_new_user > (0) &&
+        num_tl3_flags_against_user >= (SiteSetting.num_tl3_flags_to_silence_new_user) &&
+        num_tl3_users_who_flagged >= (SiteSetting.num_tl3_users_to_silence_new_user)
+      return true
+    end
+
+    false
+  end
+
+  def num_spam_flags_against_user
+    Post.where(user_id: @user.id).sum(:spam_count)
+  end
+
+  def num_users_who_flagged_spam_against_user
+    post_ids = Post.where('user_id = ? and spam_count > 0', @user.id).pluck(:id)
+    return 0 if post_ids.empty?
+    PostAction.spam_flags.where(post_id: post_ids).pluck(:user_id).uniq.size
+  end
+
+  def num_tl3_flags_against_user
+    if flagged_post_ids.empty?
+      0
+    else
+      PostAction.where(post_id: flagged_post_ids).joins(:user).where('users.trust_level >= ?', 3).count
+    end
+  end
+
+  def num_tl3_users_who_flagged
+    if flagged_post_ids.empty?
+      0
+    else
+      PostAction.where(post_id: flagged_post_ids).joins(:user).where('users.trust_level >= ?', 3).pluck(:user_id).uniq.size
+    end
+  end
+
+  def flagged_post_ids
+    Post.where(user_id: @user.id)
+      .where('spam_count > 0 OR off_topic_count > 0 OR inappropriate_count > 0')
+      .pluck(:id)
+  end
+
+  def silence_user
+    Post.transaction do
+      if UserSilencer.silence(@user, Discourse.system_user, message: :too_many_spam_flags) && SiteSetting.notify_mods_when_user_silenced
+        GroupMessage.create(Group[:moderators].name, :user_automatically_silenced, user: @user, limit_once_per: false)
+      end
+    end
+  end
+end
diff --git a/app/services/spam_rules_enforcer.rb b/app/services/spam_rules_enforcer.rb
index f306cfdc57..ecfc2a1f6e 100644
--- a/app/services/spam_rules_enforcer.rb
+++ b/app/services/spam_rules_enforcer.rb
@@ -12,7 +12,7 @@ class SpamRulesEnforcer
   end
 
   def enforce!
-    SpamRule::AutoBlock.new(@user).perform if @user
+    SpamRule::AutoSilence.new(@user).perform if @user
     SpamRule::FlagSockpuppets.new(@post).perform if @post
     true
   end
diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb
index 1cd09176af..924bed26ef 100644
--- a/app/services/staff_action_logger.rb
+++ b/app/services/staff_action_logger.rb
@@ -10,16 +10,14 @@ class StaffActionLogger
     raise Discourse::InvalidParameters.new(:admin) unless @admin && @admin.is_a?(User)
   end
 
-  def log_user_deletion(deleted_user, opts={})
+  def log_user_deletion(deleted_user, opts = {})
     raise Discourse::InvalidParameters.new(:deleted_user) unless deleted_user && deleted_user.is_a?(User)
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:delete_user],
-      ip_address: deleted_user.ip_address.to_s,
-      details: [:id, :username, :name, :created_at, :trust_level, :last_seen_at, :last_emailed_at].map { |x| "#{x}: #{deleted_user.send(x)}" }.join("\n")
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:delete_user],
+                                          ip_address: deleted_user.ip_address.to_s,
+                                          details: [:id, :username, :name, :created_at, :trust_level, :last_seen_at, :last_emailed_at].map { |x| "#{x}: #{deleted_user.send(x)}" }.join("\n")))
   end
 
-  def log_custom(custom_type, details=nil)
+  def log_custom(custom_type, details = nil)
     raise Discourse::InvalidParameters.new(:custom_type) unless custom_type
 
     details ||= {}
@@ -28,7 +26,7 @@ class StaffActionLogger
     StaffActionLogger.base_attrs.each do |attr|
       attrs[attr] = details.delete(attr) if details.has_key?(attr)
     end
-    attrs[:details] = details.map {|r| "#{r[0]}: #{r[1]}"}.join("\n")
+    attrs[:details] = details.map { |r| "#{r[0]}: #{r[1]}" }.join("\n")
     attrs[:acting_user_id] = @admin.id
     attrs[:action] = UserHistory.actions[:custom_staff]
     attrs[:custom_type] = custom_type
@@ -36,7 +34,7 @@ class StaffActionLogger
     UserHistory.create(attrs)
   end
 
-  def log_post_deletion(deleted_post, opts={})
+  def log_post_deletion(deleted_post, opts = {})
     raise Discourse::InvalidParameters.new(:deleted_post) unless deleted_post && deleted_post.is_a?(Post)
 
     topic = deleted_post.topic || Topic.with_deleted.find_by(id: deleted_post.topic_id)
@@ -54,14 +52,12 @@ class StaffActionLogger
       "raw: #{deleted_post.raw}"
     ]
 
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:delete_post],
-      post_id: deleted_post.id,
-      details: details.join("\n")
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:delete_post],
+                                          post_id: deleted_post.id,
+                                          details: details.join("\n")))
   end
 
-  def log_topic_deletion(deleted_topic, opts={})
+  def log_topic_deletion(deleted_topic, opts = {})
     raise Discourse::InvalidParameters.new(:deleted_topic) unless deleted_topic && deleted_topic.is_a?(Topic)
 
     user = deleted_topic.user ? "#{deleted_topic.user.username} (#{deleted_topic.user.name})" : "(deleted user)"
@@ -77,48 +73,40 @@ class StaffActionLogger
       details << "raw: #{first_post.raw}"
     end
 
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:delete_topic],
-      topic_id: deleted_topic.id,
-      details: details.join("\n")
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:delete_topic],
+                                          topic_id: deleted_topic.id,
+                                          details: details.join("\n")))
   end
 
-  def log_trust_level_change(user, old_trust_level, new_trust_level, opts={})
+  def log_trust_level_change(user, old_trust_level, new_trust_level, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user && user.is_a?(User)
     raise Discourse::InvalidParameters.new(:old_trust_level) unless TrustLevel.valid? old_trust_level
     raise Discourse::InvalidParameters.new(:new_trust_level) unless TrustLevel.valid? new_trust_level
-    UserHistory.create!( params(opts).merge({
-      action: UserHistory.actions[:change_trust_level],
-      target_user_id: user.id,
-      details: "old trust level: #{old_trust_level}\nnew trust level: #{new_trust_level}"
-    }))
+    UserHistory.create!(params(opts).merge(action: UserHistory.actions[:change_trust_level],
+                                           target_user_id: user.id,
+                                           details: "old trust level: #{old_trust_level}\nnew trust level: #{new_trust_level}"))
   end
 
-  def log_lock_trust_level(user, opts={})
+  def log_lock_trust_level(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user && user.is_a?(User)
-    UserHistory.create!( params(opts).merge({
-      action: UserHistory.actions[user.trust_level_locked ? :lock_trust_level : :unlock_trust_level],
-      target_user_id: user.id
-    }))
+    UserHistory.create!(params(opts).merge(action: UserHistory.actions[user.manual_locked_trust_level.nil? ? :unlock_trust_level : :lock_trust_level],
+                                           target_user_id: user.id))
   end
 
-  def log_site_setting_change(setting_name, previous_value, new_value, opts={})
+  def log_site_setting_change(setting_name, previous_value, new_value, opts = {})
     raise Discourse::InvalidParameters.new(:setting_name) unless setting_name.present? && SiteSetting.respond_to?(setting_name)
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:change_site_setting],
-      subject: setting_name,
-      previous_value: previous_value,
-      new_value: new_value
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:change_site_setting],
+                                          subject: setting_name,
+                                          previous_value: previous_value,
+                                          new_value: new_value))
   end
 
   def theme_json(theme)
-    ThemeSerializer.new(theme, root:false).to_json
+    ThemeSerializer.new(theme, root: false).to_json
   end
 
-  def strip_duplicates(old,cur)
-    return [old,cur] unless old && cur
+  def strip_duplicates(old, cur)
+    return [old, cur] unless old && cur
 
     old = JSON.parse(old)
     cur = JSON.parse(cur)
@@ -135,144 +123,124 @@ class StaffActionLogger
     [old.to_json, cur.to_json]
   end
 
-  def log_theme_change(old_json, new_theme, opts={})
+  def log_theme_change(old_json, new_theme, opts = {})
     raise Discourse::InvalidParameters.new(:new_theme) unless new_theme
 
     new_json = theme_json(new_theme)
 
-    old_json,new_json = strip_duplicates(old_json,new_json)
+    old_json, new_json = strip_duplicates(old_json, new_json)
 
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:change_theme],
-      subject: new_theme.name,
-      previous_value: old_json,
-      new_value: new_json
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:change_theme],
+                                          subject: new_theme.name,
+                                          previous_value: old_json,
+                                          new_value: new_json))
   end
 
-  def log_theme_destroy(theme, opts={})
+  def log_theme_destroy(theme, opts = {})
     raise Discourse::InvalidParameters.new(:theme) unless theme
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:delete_theme],
-      subject: theme.name,
-      previous_value: theme_json(theme)
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:delete_theme],
+                                          subject: theme.name,
+                                          previous_value: theme_json(theme)))
   end
 
-  def log_site_text_change(subject, new_text=nil, old_text=nil, opts={})
+  def log_site_text_change(subject, new_text = nil, old_text = nil, opts = {})
     raise Discourse::InvalidParameters.new(:subject) unless subject.present?
-    UserHistory.create!( params(opts).merge({
-      action: UserHistory.actions[:change_site_text],
-      subject: subject,
-      previous_value: old_text,
-      new_value: new_text
-    }))
+    UserHistory.create!(params(opts).merge(action: UserHistory.actions[:change_site_text],
+                                           subject: subject,
+                                           previous_value: old_text,
+                                           new_value: new_text))
   end
 
-  def log_username_change(user, old_username, new_username, opts={})
+  def log_username_change(user, old_username, new_username, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:change_username],
-      target_user_id: user.id,
-      previous_value: old_username,
-      new_value: new_username
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:change_username],
+                                          target_user_id: user.id,
+                                          previous_value: old_username,
+                                          new_value: new_username))
   end
 
-  def log_name_change(user_id, old_name, new_name, opts={})
+  def log_name_change(user_id, old_name, new_name, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user_id
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:change_name],
-      target_user_id: user_id,
-      previous_value: old_name,
-      new_value: new_name
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:change_name],
+                                          target_user_id: user_id,
+                                          previous_value: old_name,
+                                          new_value: new_name))
   end
 
-  def log_user_suspend(user, reason, opts={})
+  def log_user_suspend(user, reason, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create( params(opts).merge({
+
+    details = (reason || '').dup
+    details << "\n\n#{opts[:message]}" if opts[:message].present?
+
+    args = params(opts).merge(
       action: UserHistory.actions[:suspend_user],
       target_user_id: user.id,
-      details: reason
-    }))
+      details: details
+    )
+    args[:post_id] = opts[:post_id] if opts[:post_id]
+    UserHistory.create(args)
   end
 
-  def log_user_unsuspend(user, opts={})
+  def log_user_unsuspend(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:unsuspend_user],
-      target_user_id: user.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:unsuspend_user],
+                                          target_user_id: user.id))
   end
 
-  def log_badge_grant(user_badge, opts={})
+  def log_badge_grant(user_badge, opts = {})
     raise Discourse::InvalidParameters.new(:user_badge) unless user_badge
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:grant_badge],
-      target_user_id: user_badge.user_id,
-      details: user_badge.badge.name
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:grant_badge],
+                                          target_user_id: user_badge.user_id,
+                                          details: user_badge.badge.name))
   end
 
-  def log_badge_revoke(user_badge, opts={})
+  def log_badge_revoke(user_badge, opts = {})
     raise Discourse::InvalidParameters.new(:user_badge) unless user_badge
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:revoke_badge],
-      target_user_id: user_badge.user_id,
-      details: user_badge.badge.name
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:revoke_badge],
+                                          target_user_id: user_badge.user_id,
+                                          details: user_badge.badge.name))
   end
 
-  def log_check_email(user, opts={})
+  def log_check_email(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:check_email],
-      target_user_id: user.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:check_email],
+                                          target_user_id: user.id))
   end
 
-  def log_show_emails(users, opts={})
+  def log_show_emails(users, opts = {})
     return if users.blank?
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:check_email],
-      details: users.map { |u| "[#{u.id}] #{u.username}"}.join("\n")
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:check_email],
+                                          details: users.map { |u| "[#{u.id}] #{u.username}" }.join("\n")))
   end
 
-  def log_impersonate(user, opts={})
+  def log_impersonate(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:impersonate],
-      target_user_id: user.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:impersonate],
+                                          target_user_id: user.id))
   end
 
-  def log_roll_up(subnets, opts={})
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:roll_up],
-      details: subnets.join(", ")
-    }))
+  def log_roll_up(subnets, opts = {})
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:roll_up],
+                                          details: subnets.join(", ")))
   end
 
-  def log_category_settings_change(category, category_params, old_permissions=nil)
+  def log_category_settings_change(category, category_params, old_permissions = nil)
     validate_category(category)
 
     changed_attributes = category.previous_changes.slice(*category_params.keys)
 
     if !old_permissions.empty? && (old_permissions != category_params[:permissions])
-      changed_attributes.merge!({ permissions: [old_permissions.to_json, category_params[:permissions].to_json] })
+      changed_attributes.merge!(permissions: [old_permissions.to_json, category_params[:permissions].to_json])
     end
 
     changed_attributes.each do |key, value|
-      UserHistory.create(params.merge({
-        action: UserHistory.actions[:change_category_settings],
-        category_id: category.id,
-        context: category.url,
-        subject: key,
-        previous_value: value[0],
-        new_value: value[1]
-      }))
+      UserHistory.create(params.merge(action: UserHistory.actions[:change_category_settings],
+                                      category_id: category.id,
+                                      context: category.url,
+                                      subject: key,
+                                      previous_value: value[0],
+                                      new_value: value[1]))
     end
   end
 
@@ -289,12 +257,10 @@ class StaffActionLogger
       details << "parent_category: #{parent_category.name}"
     end
 
-    UserHistory.create(params.merge({
-      action: UserHistory.actions[:delete_category],
-      category_id: category.id,
-      details: details.join("\n"),
-      context: category.url
-    }))
+    UserHistory.create(params.merge(action: UserHistory.actions[:delete_category],
+                                    category_id: category.id,
+                                    details: details.join("\n"),
+                                    context: category.url))
   end
 
   def log_category_creation(category)
@@ -305,132 +271,108 @@ class StaffActionLogger
       "name: #{category.name}"
     ]
 
-    UserHistory.create(params.merge({
-      action: UserHistory.actions[:create_category],
-      details: details.join("\n"),
-      category_id: category.id,
-      context: category.url
-    }))
+    UserHistory.create(params.merge(action: UserHistory.actions[:create_category],
+                                    details: details.join("\n"),
+                                    category_id: category.id,
+                                    context: category.url))
   end
 
-  def log_block_user(user, opts={})
+  def log_silence_user(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:block_user],
-      target_user_id: user.id
-    }))
+
+    UserHistory.create(
+      params(opts).merge(
+        action: UserHistory.actions[:silence_user],
+        target_user_id: user.id,
+        details: opts[:details]
+      )
+    )
   end
 
-  def log_unblock_user(user, opts={})
+  def log_unsilence_user(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:unblock_user],
-      target_user_id: user.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:unsilence_user],
+                                          target_user_id: user.id))
   end
 
-  def log_grant_admin(user, opts={})
+  def log_grant_admin(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:grant_admin],
-      target_user_id: user.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:grant_admin],
+                                          target_user_id: user.id))
   end
 
-  def log_revoke_admin(user, opts={})
+  def log_revoke_admin(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:revoke_admin],
-      target_user_id: user.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:revoke_admin],
+                                          target_user_id: user.id))
   end
 
-  def log_grant_moderation(user, opts={})
+  def log_grant_moderation(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:grant_moderation],
-      target_user_id: user.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:grant_moderation],
+                                          target_user_id: user.id))
   end
 
-  def log_revoke_moderation(user, opts={})
+  def log_revoke_moderation(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:revoke_moderation],
-      target_user_id: user.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:revoke_moderation],
+                                          target_user_id: user.id))
   end
 
-  def log_backup_create(opts={})
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:backup_create],
-      ip_address: @admin.ip_address.to_s
-    }))
+  def log_backup_create(opts = {})
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:backup_create],
+                                          ip_address: @admin.ip_address.to_s))
   end
 
-  def log_backup_download(backup, opts={})
+  def log_backup_download(backup, opts = {})
     raise Discourse::InvalidParameters.new(:backup) unless backup
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:backup_download],
-      ip_address: @admin.ip_address.to_s,
-      details: backup.filename
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:backup_download],
+                                          ip_address: @admin.ip_address.to_s,
+                                          details: backup.filename))
   end
 
-  def log_backup_destroy(backup, opts={})
+  def log_backup_destroy(backup, opts = {})
     raise Discourse::InvalidParameters.new(:backup) unless backup
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:backup_destroy],
-      ip_address: @admin.ip_address.to_s,
-      details: backup.filename
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:backup_destroy],
+                                          ip_address: @admin.ip_address.to_s,
+                                          details: backup.filename))
   end
 
-  def log_revoke_email(user, reason, opts={})
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:revoke_email],
-      target_user_id: user.id,
-      details: reason
-    }))
+  def log_revoke_email(user, reason, opts = {})
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:revoke_email],
+                                          target_user_id: user.id,
+                                          details: reason))
   end
 
-  def log_user_deactivate(user, reason, opts={})
+  def log_user_deactivate(user, reason, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:deactivate_user],
-      target_user_id: user.id,
-      details: reason
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:deactivate_user],
+                                          target_user_id: user.id,
+                                          details: reason))
   end
 
-  def log_user_activate(user, reason, opts={})
+  def log_user_activate(user, reason, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:activate_user],
-      target_user_id: user.id,
-      details: reason
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:activate_user],
+                                          target_user_id: user.id,
+                                          details: reason))
   end
 
-  def log_wizard_step(step, opts={})
+  def log_wizard_step(step, opts = {})
     raise Discourse::InvalidParameters.new(:step) unless step
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:wizard_step],
-      context: step.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:wizard_step],
+                                          context: step.id))
   end
 
   def log_change_readonly_mode(state)
-    UserHistory.create(params.merge({
-      action: UserHistory.actions[:change_readonly_mode],
-      previous_value: !state,
-      new_value: state
-    }))
+    UserHistory.create(params.merge(action: UserHistory.actions[:change_readonly_mode],
+                                    previous_value: !state,
+                                    new_value: state))
   end
 
   private
 
-    def params(opts=nil)
+    def params(opts = nil)
       opts ||= {}
       { acting_user_id: @admin.id, context: opts[:context] }
     end
diff --git a/app/services/topic_status_updater.rb b/app/services/topic_status_updater.rb
index a2fc8f4dd6..cd1ea0d94f 100644
--- a/app/services/topic_status_updater.rb
+++ b/app/services/topic_status_updater.rb
@@ -1,5 +1,5 @@
 TopicStatusUpdater = Struct.new(:topic, :user) do
-  def update!(status, enabled, opts={})
+  def update!(status, enabled, opts = {})
     status = Status.new(status, enabled)
 
     @topic_status_update = topic.public_topic_timer
@@ -19,7 +19,7 @@ TopicStatusUpdater = Struct.new(:topic, :user) do
 
   private
 
-  def change(status, opts={})
+  def change(status, opts = {})
     result = true
 
     if status.pinned? || status.pinned_globally?
@@ -30,17 +30,21 @@ TopicStatusUpdater = Struct.new(:topic, :user) do
       result = false if rc == 0
     else
       rc = Topic.where(:id => topic.id, status.name => !status.enabled)
-                .update_all(status.name => status.enabled?)
+        .update_all(status.name => status.enabled?)
 
       topic.send("#{status.name}=", status.enabled?)
       result = false if rc == 0
     end
 
+    if status.manually_closing_topic?
+      DiscourseEvent.trigger(:topic_closed, topic)
+    end
+
     if @topic_status_update
       if status.manually_closing_topic? || status.closing_topic?
-        topic.set_or_create_timer(TopicTimer.types[:close], nil)
+        topic.delete_topic_timer(TopicTimer.types[:close])
       elsif status.manually_opening_topic? || status.opening_topic?
-        topic.set_or_create_timer(TopicTimer.types[:open], nil)
+        topic.delete_topic_timer(TopicTimer.types[:open])
       end
     end
 
@@ -55,7 +59,7 @@ TopicStatusUpdater = Struct.new(:topic, :user) do
     result
   end
 
-  def create_moderator_post_for(status, message=nil)
+  def create_moderator_post_for(status, message = nil)
     topic.add_moderator_post(user, message || message_for(status), options_for(status))
     topic.reload
   end
diff --git a/app/services/tracked_topics_updater.rb b/app/services/tracked_topics_updater.rb
index 2222fc4c63..0ffb32e7e7 100644
--- a/app/services/tracked_topics_updater.rb
+++ b/app/services/tracked_topics_updater.rb
@@ -8,11 +8,10 @@ class TrackedTopicsUpdater
   def call
     topic_users = TopicUser.where(notifications_reason_id: nil, user_id: @id)
     if @threshold < 0
-      topic_users.update_all({notification_level: TopicUser.notification_levels[:regular]})
+      topic_users.update_all(notification_level: TopicUser.notification_levels[:regular])
     else
       topic_users.update_all(["notification_level = CASE WHEN total_msecs_viewed < ? THEN ? ELSE ? END",
                             @threshold, TopicUser.notification_levels[:regular], TopicUser.notification_levels[:tracking]])
     end
   end
 end
-
diff --git a/app/services/trust_level_granter.rb b/app/services/trust_level_granter.rb
index 1a826ba18d..23e9ef50ff 100644
--- a/app/services/trust_level_granter.rb
+++ b/app/services/trust_level_granter.rb
@@ -11,7 +11,6 @@ class TrustLevelGranter
   def grant
     if @user.trust_level < @trust_level
       @user.change_trust_level!(@trust_level)
-      @user.trust_level_locked = true
       @user.save!
     end
   end
diff --git a/app/services/user_action_creator.rb b/app/services/user_action_creator.rb
index bbf21f9fb9..7b1c92562b 100644
--- a/app/services/user_action_creator.rb
+++ b/app/services/user_action_creator.rb
@@ -7,19 +7,19 @@ class UserActionCreator
     @disabled = false
   end
 
-  def self.log_notification(post, user, notification_type, acting_user_id=nil)
+  def self.log_notification(post, user, notification_type, acting_user_id = nil)
     return if @disabled
 
     action =
       case notification_type
-        when Notification.types[:quoted]
-          UserAction::QUOTE
-        when Notification.types[:replied]
-          UserAction::RESPONSE
-        when Notification.types[:mentioned]
-          UserAction::MENTION
-        when Notification.types[:edited]
-          UserAction::EDIT
+      when Notification.types[:quoted]
+        UserAction::QUOTE
+      when Notification.types[:replied]
+        UserAction::RESPONSE
+      when Notification.types[:mentioned]
+        UserAction::MENTION
+      when Notification.types[:edited]
+        UserAction::EDIT
       end
 
     # skip any invalid items, eg failed to save post and so on
@@ -93,6 +93,10 @@ class UserActionCreator
       created_at: model.created_at
     }
 
+    UserAction.remove_action!(row.merge(
+      action_type: model.archetype == Archetype.private_message ? UserAction::NEW_TOPIC : UserAction::NEW_PRIVATE_MESSAGE
+    ))
+
     rows = [row]
 
     if model.private_message?
diff --git a/app/services/user_activator.rb b/app/services/user_activator.rb
index 6b151874c5..d65fba83c2 100644
--- a/app/services/user_activator.rb
+++ b/app/services/user_activator.rb
@@ -16,6 +16,10 @@ class UserActivator
     @message = activator.activate
   end
 
+  def success_message
+    activator.success_message
+  end
+
   private
 
   def activator
@@ -24,10 +28,11 @@ class UserActivator
 
   def factory
     invite = Invite.find_by(email: Email.downcase(@user.email))
-    if SiteSetting.must_approve_users? && !(invite.present? && !invite.expired? && !invite.destroyed? && invite.link_valid?)
-      ApprovalActivator
-    elsif !user.active?
+
+    if !user.active?
       EmailActivator
+    elsif SiteSetting.must_approve_users? && !(invite.present? && !invite.expired? && !invite.destroyed? && invite.link_valid?)
+      ApprovalActivator
     else
       LoginActivator
     end
@@ -37,6 +42,10 @@ end
 
 class ApprovalActivator < UserActivator
   def activate
+    success_message
+  end
+
+  def success_message
     I18n.t("login.wait_approval")
   end
 end
@@ -51,6 +60,11 @@ class EmailActivator < UserActivator
       user_id: user.id,
       email_token: email_token.token
     )
+
+    success_message
+  end
+
+  def success_message
     I18n.t("login.activate_email", email: Rack::Utils.escape_html(user.email))
   end
 end
@@ -61,6 +75,10 @@ class LoginActivator < UserActivator
   def activate
     log_on_user(user)
     user.enqueue_welcome_message('welcome_user')
+    success_message
+  end
+
+  def success_message
     I18n.t("login.active")
   end
 end
diff --git a/app/services/user_anonymizer.rb b/app/services/user_anonymizer.rb
index ac692d28d7..dbd58624bf 100644
--- a/app/services/user_anonymizer.rb
+++ b/app/services/user_anonymizer.rb
@@ -1,10 +1,10 @@
 class UserAnonymizer
-  def initialize(user, actor=nil)
+  def initialize(user, actor = nil)
     @user = user
     @actor = actor
   end
 
-  def self.make_anonymous(user, actor=nil)
+  def self.make_anonymous(user, actor = nil)
     self.new(user, actor).make_anonymous
   end
 
@@ -48,11 +48,11 @@ class UserAnonymizer
       @user.user_open_ids.find_each { |x| x.destroy }
       @user.api_key.try(:destroy)
 
-      UserHistory.create( action: UserHistory.actions[:anonymize_user],
-                          target_user_id: @user.id,
-                          acting_user_id: @actor ? @actor.id : @user.id,
-                          email: prev_email,
-                          details: "username: #{prev_username}" )
+      UserHistory.create(action: UserHistory.actions[:anonymize_user],
+                         target_user_id: @user.id,
+                         acting_user_id: @actor ? @actor.id : @user.id,
+                         email: prev_email,
+                         details: "username: #{prev_username}")
     end
     @user
   end
diff --git a/app/services/user_blocker.rb b/app/services/user_blocker.rb
deleted file mode 100644
index fe0091425e..0000000000
--- a/app/services/user_blocker.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-class UserBlocker
-
-  def initialize(user, by_user=nil, opts={})
-    @user, @by_user, @opts = user, by_user, opts
-  end
-
-  def self.block(user, by_user=nil, opts={})
-    UserBlocker.new(user, by_user, opts).block
-  end
-
-  def self.unblock(user, by_user=nil, opts={})
-    UserBlocker.new(user, by_user, opts).unblock
-  end
-
-  def block
-    hide_posts unless @opts[:keep_posts]
-    unless @user.blocked?
-      @user.blocked = true
-      if @user.save
-        message_type = @opts[:message] || :blocked_by_staff
-        post = SystemMessage.create(@user, message_type)
-        if post && @by_user
-          StaffActionLogger.new(@by_user).log_block_user(@user, {context: "#{message_type}: '#{post.topic&.title rescue ''}' #{@opts[:reason]}"})
-        end
-      end
-    else
-      false
-    end
-  end
-
-  def hide_posts
-    return unless @user.trust_level == TrustLevel[0]
-
-    Post.where(user_id: @user.id).where("created_at > ?", 24.hours.ago).update_all(["hidden = true, hidden_reason_id = COALESCE(hidden_reason_id, ?)", Post.hidden_reasons[:new_user_spam_threshold_reached]])
-    topic_ids = Post.where(user_id: @user.id, post_number: 1).where("created_at > ?", 24.hours.ago).pluck(:topic_id)
-    Topic.where(id: topic_ids).update_all(visible: false) unless topic_ids.empty?
-  end
-
-  def unblock
-    @user.blocked = false
-    if @user.save
-      SystemMessage.create(@user, :unblocked)
-      StaffActionLogger.new(@by_user).log_unblock_user(@user) if @by_user
-    end
-  end
-
-end
diff --git a/app/services/user_destroyer.rb b/app/services/user_destroyer.rb
index 9af5731fc9..b245bd32d8 100644
--- a/app/services/user_destroyer.rb
+++ b/app/services/user_destroyer.rb
@@ -7,14 +7,14 @@ class UserDestroyer
 
   def initialize(actor)
     @actor = actor
-    raise Discourse::InvalidParameters.new('acting user is nil') unless @actor and @actor.is_a?(User)
+    raise Discourse::InvalidParameters.new('acting user is nil') unless @actor && @actor.is_a?(User)
     @guardian = Guardian.new(actor)
   end
 
   # Returns false if the user failed to be deleted.
   # Returns a frozen instance of the User if the delete succeeded.
-  def destroy(user, opts={})
-    raise Discourse::InvalidParameters.new('user is nil') unless user and user.is_a?(User)
+  def destroy(user, opts = {})
+    raise Discourse::InvalidParameters.new('user is nil') unless user && user.is_a?(User)
     raise PostsExistError if !opts[:delete_posts] && user.posts.count != 0
     @guardian.ensure_can_delete_user!(user)
 
@@ -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,42 @@ 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]
+          unless opts[:quiet]
+            StaffActionLogger.new(@actor == user ? Discourse.system_user : @actor).log_user_deletion(user, opts.slice(:context))
+          end
+
+          MessageBus.publish "/file-change", ["refresh"], user_ids: [u.id]
         end
       end
     end
diff --git a/app/services/user_silencer.rb b/app/services/user_silencer.rb
new file mode 100644
index 0000000000..9858c75f9d
--- /dev/null
+++ b/app/services/user_silencer.rb
@@ -0,0 +1,60 @@
+class UserSilencer
+
+  attr_reader :user_history
+
+  def initialize(user, by_user = nil, opts = {})
+    @user, @by_user, @opts = user, by_user, opts
+  end
+
+  def self.silence(user, by_user = nil, opts = {})
+    UserSilencer.new(user, by_user, opts).silence
+  end
+
+  def self.unsilence(user, by_user = nil, opts = {})
+    UserSilencer.new(user, by_user, opts).unsilence
+  end
+
+  def silence
+    hide_posts unless @opts[:keep_posts]
+    unless @user.silenced_till.present?
+      @user.silenced_till = @opts[:silenced_till] || 1000.years.from_now
+      if @user.save
+        message_type = @opts[:message] || :silenced_by_staff
+
+        details = (@opts[:reason] || '').dup
+        details << "\n\n#{@opts[:message_body]}" if @opts[:message_body].present?
+
+        context = "#{message_type}: '#{post.topic&.title rescue ''}' #{@opts[:reason]}"
+        SystemMessage.create(@user, message_type)
+
+        if @by_user
+          @user_history = StaffActionLogger.new(@by_user).log_silence_user(
+            @user,
+            context: context,
+            details: details
+          )
+        end
+        return true
+      end
+    else
+      false
+    end
+  end
+
+  def hide_posts
+    return unless @user.trust_level == TrustLevel[0]
+
+    Post.where(user_id: @user.id).where("created_at > ?", 24.hours.ago).update_all(["hidden = true, hidden_reason_id = COALESCE(hidden_reason_id, ?)", Post.hidden_reasons[:new_user_spam_threshold_reached]])
+    topic_ids = Post.where(user_id: @user.id, post_number: 1).where("created_at > ?", 24.hours.ago).pluck(:topic_id)
+    Topic.where(id: topic_ids).update_all(visible: false) unless topic_ids.empty?
+  end
+
+  def unsilence
+    @user.silenced_till = nil
+    if @user.save
+      SystemMessage.create(@user, :unsilenced)
+      StaffActionLogger.new(@by_user).log_unsilence_user(@user) if @by_user
+    end
+  end
+
+end
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index 758c019c2a..305f96fddc 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -34,7 +34,9 @@ class UserUpdater
     :email_in_reply_to,
     :like_notification_frequency,
     :include_tl0_in_digests,
-    :theme_key
+    :theme_key,
+    :allow_private_messages,
+    :homepage_id,
   ]
 
   def initialize(actor, user)
@@ -109,15 +111,15 @@ class UserUpdater
         update_muted_users(attributes[:muted_usernames])
       end
 
-      saved = (!save_options || user.user_option.save) && user_profile.save && user.save
+      if (saved = (!save_options || user.user_option.save) && user_profile.save && user.save) &&
+         (attributes[:name].present? && old_user_name.casecmp(attributes.fetch(:name)) != 0) ||
+         (attributes[:name].blank? && old_user_name.present?)
 
-      if saved
-        # log name changes
-        if attributes[:name].present? && old_user_name.downcase != attributes.fetch(:name).downcase
-          StaffActionLogger.new(@actor).log_name_change(user.id, old_user_name, attributes.fetch(:name))
-        elsif attributes[:name].blank? && old_user_name.present?
-          StaffActionLogger.new(@actor).log_name_change(user.id, old_user_name, "")
-        end
+        StaffActionLogger.new(@actor).log_name_change(
+          user.id,
+          old_user_name,
+          attributes.fetch(:name) { '' }
+        )
       end
     end
 
diff --git a/app/services/username_changer.rb b/app/services/username_changer.rb
index 990534e282..a81f089415 100644
--- a/app/services/username_changer.rb
+++ b/app/services/username_changer.rb
@@ -1,12 +1,12 @@
 class UsernameChanger
 
-  def initialize(user, new_username, actor=nil)
+  def initialize(user, new_username, actor = nil)
     @user = user
     @new_username = new_username
     @actor = actor
   end
 
-  def self.change(user, new_username, actor=nil)
+  def self.change(user, new_username, actor = nil)
     self.new(user, new_username, actor).change
   end
 
diff --git a/app/services/username_checker_service.rb b/app/services/username_checker_service.rb
index 91bfe42de9..539e07e39c 100644
--- a/app/services/username_checker_service.rb
+++ b/app/services/username_checker_service.rb
@@ -4,7 +4,7 @@ class UsernameCheckerService
     if username && username.length > 0
       validator = UsernameValidator.new(username)
       if !validator.valid_format?
-        {errors: validator.errors}
+        { errors: validator.errors }
       else
         check_username_availability(username, email)
       end
@@ -12,7 +12,7 @@ class UsernameCheckerService
   end
 
   def check_username_availability(username, email)
-    if User.username_available?(username)
+    if User.username_available?(username, email)
       { available: true, is_developer: is_developer?(email) }
     else
       { available: false, suggestion: UserNameSuggester.suggest(username) }
@@ -23,7 +23,6 @@ class UsernameCheckerService
     Rails.configuration.respond_to?(:developer_emails) && Rails.configuration.developer_emails.include?(value)
   end
 
-
   def self.is_developer?(email)
     UsernameCheckerService.new.is_developer?(email)
   end
diff --git a/app/services/word_watcher.rb b/app/services/word_watcher.rb
new file mode 100644
index 0000000000..ff82f36bd5
--- /dev/null
+++ b/app/services/word_watcher.rb
@@ -0,0 +1,64 @@
+class WordWatcher
+
+  def initialize(raw)
+    @raw = raw
+  end
+
+  def self.words_for_action(action)
+    WatchedWord.where(action: WatchedWord.actions[action.to_sym]).limit(1000).pluck(:word)
+  end
+
+  def self.words_for_action_exists?(action)
+    WatchedWord.where(action: WatchedWord.actions[action.to_sym]).exists?
+  end
+
+  def self.word_matcher_regexp(action)
+    s = Discourse.cache.fetch(word_matcher_regexp_key(action), expires_in: 1.day) do
+      words = words_for_action(action)
+      if words.empty?
+        nil
+      else
+        regexp = '(' + words.map { |w| word_to_regexp(w) }.join('|'.freeze) + ')'
+        SiteSetting.watched_words_regular_expressions? ? regexp : "\\b(#{regexp})\\b"
+      end
+    end
+    s.present? ? Regexp.new(s, Regexp::IGNORECASE) : nil
+  end
+
+  def self.word_to_regexp(word)
+    if SiteSetting.watched_words_regular_expressions?
+      # Strip ruby regexp format if present, we're going to make the whole thing
+      # case insensitive anyway
+      return word.start_with?("(?-mix:") ? word[7..-2] : word
+    end
+    Regexp.escape(word).gsub("\\*", '\S*')
+  end
+
+  def self.word_matcher_regexp_key(action)
+    "watched-words-regexp:#{action}"
+  end
+
+  def self.clear_cache!
+    WatchedWord.actions.sum do |a, i|
+      Discourse.cache.delete word_matcher_regexp_key(a)
+    end
+  end
+
+  def requires_approval?
+    word_matches_for_action?(:require_approval)
+  end
+
+  def should_flag?
+    word_matches_for_action?(:flag)
+  end
+
+  def should_block?
+    word_matches_for_action?(:block)
+  end
+
+  def word_matches_for_action?(action)
+    r = self.class.word_matcher_regexp(action)
+    r ? r.match(@raw) : false
+  end
+
+end
diff --git a/app/views/about/index.html.erb b/app/views/about/index.html.erb
index 67b9d3240f..563a9600c8 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/application/_header.html.erb b/app/views/application/_header.html.erb
index a179dbc0c8..82305d1eba 100644
--- a/app/views/application/_header.html.erb
+++ b/app/views/application/_header.html.erb
@@ -1,22 +1,24 @@
-<header class="d-header">
-  <div class="wrap">
-    <div class="contents">
-      <div class="row">
-        <div class="title span13">
-          <a href="<%= path "/" %>">
-            <%- if application_logo_url.present? %>
-              <img src="<%= application_logo_url %>" alt="<%= SiteSetting.title %>" id="site-logo">
-            <%- else %>
-              <h2 id='site-text-logo'><%= SiteSetting.title %></h2>
-            <%- end %>
-          </a>
+<%= replace_plugin_html('server:simple-header') do %>
+  <header class="d-header">
+    <div class="wrap">
+      <div class="contents">
+        <div class="row">
+          <div class="title span13">
+            <a href="<%= path "/" %>">
+              <%- if application_logo_url.present? %>
+                <img src="<%= application_logo_url %>" alt="<%= SiteSetting.title %>" id="site-logo">
+              <%- else %>
+                <h2 id='site-text-logo'><%= SiteSetting.title %></h2>
+              <%- end %>
+            </a>
+          </div>
+          <% unless current_user %>
+              <div class='panel clearfix'>
+                <a href="<%= path "/login"%>" class='btn btn-primary btn-small login-button'><i class="fa fa-user"></i> <%= I18n.t('log_in') %></a>
+              </div>
+          <% end %>
         </div>
-        <% unless current_user %>
-            <div class='panel clearfix'>
-              <a href="<%= path "/login"%>" class='btn btn-primary btn-small login-button'><i class="fa fa-user"></i> <%= I18n.t('log_in') %></a>
-            </div>
-        <% end %>
       </div>
     </div>
-  </div>
-</header>
+  </header>
+<% end %>
diff --git a/app/views/badges/show.html.erb b/app/views/badges/show.html.erb
index 6fc281b9dd..1022d59a0d 100644
--- a/app/views/badges/show.html.erb
+++ b/app/views/badges/show.html.erb
@@ -1,3 +1,4 @@
 <% content_for :head do %>
   <%= raw crawlable_meta_data(title: I18n.t('badges.badge_title_metadata', display_name: @badge.display_name, site_title: SiteSetting.title), description: @badge.long_description) %>
+  <%= auto_discovery_link_tag(:rss, "#{@rss_link}.rss", title: @rss_title) %>
 <% end %>
diff --git a/app/views/badges/show.rss.erb b/app/views/badges/show.rss.erb
new file mode 100644
index 0000000000..ca74f8091a
--- /dev/null
+++ b/app/views/badges/show.rss.erb
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<rss version="2.0" xmlns:discourse="http://www.discourse.org/" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <channel>
+    <% lang = SiteSetting.find_by_name('default_locale').try(:value) %>
+    <% site_email = SiteSetting.find_by_name('contact_email').try(:value) %>
+    <title><%= @rss_title %></title>
+    <link><%= @rss_link %></link>
+    <description><![CDATA[<%= @rss_description %>]]></description>
+    <% if @badge.user_badges.first.present? %>
+      <atom:link href="<%= "#{@rss_link}.rss" %>" rel="self" type="application/rss+xml" />
+      <% @badge.user_badges.last(50).reverse_each do |user_badge| %>
+        <item>
+          <title><![CDATA[<%= "@#{user_badge.user.username}#{" #{user_badge.user.name}" if (user_badge.user.name.present? && SiteSetting.enable_names?)}" -%>]]></title>
+          <discourse:grantedAt><%= user_badge.granted_at.rfc2822 %></discourse:grantedAt>
+          <discourse:grantedBy><![CDATA[<%= "@#{user_badge.granted_by.username}#{" #{user_badge.granted_by.name}" if (user_badge.granted_by.name.present? && SiteSetting.enable_names?)}" -%>]]></discourse:grantedBy>
+          <guid><%= "#{@rss_link}?username=#{user_badge.user.username}" %></guid>
+        </item>
+      <% end %>
+    <% end %>
+  </channel>
+</rss>
diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb
index f30438dd2f..2733cc8167 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 05e0a95f94..3ee86fa4d4 100644
--- a/app/views/common/_discourse_javascript.html.erb
+++ b/app/views/common/_discourse_javascript.html.erb
@@ -17,16 +17,11 @@
     <% 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>
   <%- if !current_user && flash[:authentication_data] %>
+    Discourse.showingSignup = true
     require('discourse/routes/application').default.reopen({
       actions: {
         didTransition: function() {
@@ -48,19 +43,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 %>';
+    <%- if SiteSetting.Upload.enable_s3_uploads %>
+      <%- if SiteSetting.Upload.s3_cdn_url.present? %>
+    Discourse.S3CDN = '<%= SiteSetting.Upload.s3_cdn_url %>';
       <%- end %>
-      Discourse.S3BaseUrl = '<%= Discourse.store.absolute_base_url %>';
+    Discourse.S3BaseUrl = '<%= SiteSetting.Upload.absolute_base_url %>';
     <%- end %>
   })();
 </script>
diff --git a/app/views/common/_google_analytics.html.erb b/app/views/common/_google_analytics.html.erb
deleted file mode 100644
index c8a7f41740..0000000000
--- a/app/views/common/_google_analytics.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '<%= SiteSetting.ga_tracking_code %>']);
-
-  <% if SiteSetting.ga_domain_name.present? %>
-    _gaq.push(['_setDomainName', '<%= SiteSetting.ga_domain_name.gsub(/^http(s)?:\/\//, '') %>']);
-  <% end %>
-
-  _gaq.push(['_setCustomVar', 1, 'Anonymous', <%= !current_user %>, 2]);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
-</script>
diff --git a/app/views/common/_google_universal_analytics.html.erb b/app/views/common/_google_universal_analytics.html.erb
index 9067c94cb3..7c03711df4 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 b4d543a16b..762cd8afae 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 cfa7ed31ab..a593bfed31 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 64ffd293f9..899c231514 100644
--- a/app/views/exceptions/not_found.html.erb
+++ b/app/views/exceptions/not_found.html.erb
@@ -1,40 +1,40 @@
-<% local_domain = "#{request.protocol}#{request.host_with_port}" %>
-
 <h1 class="page-not-found"><%= t 'page_not_found.title' %></h1>
 
+<%= build_plugin_html 'server:not-found-before-topics' %>
+
 <% unless SiteSetting.login_required? && current_user.nil? %>
   <div class="row page-not-found-topics">
-    <div class="span8 popular-topics">
+    <div class="popular-topics">
       <h2 class="popular-topics-title"><%= t 'page_not_found.popular_topics' %></h2>
       <% @top_viewed.each do |t| %>
         <div class='not-found-topic'>
           <%= link_to t.title, t.relative_url %><%= category_badge(t.category) %>
         </div>
       <% end %>
-      <br/>
       <a href="<%= path "/top" %>" class="btn"><%= t 'page_not_found.see_more' %>&hellip;</a>
     </div>
-    <div class="span8 recent-topics">
+    <div class="recent-topics">
       <h2 class="recent-topics-title"><%= t 'page_not_found.recent_topics' %></h2>
       <% @recent.each do |t| %>
         <div class='not-found-topic'>
           <%= link_to t.title, t.relative_url %><%= category_badge(t.category) %>
         </div>
       <% end %>
-      <br/>
       <a href="<%= path "/latest" %>" class="btn"><%= t 'page_not_found.see_more' %>&hellip;</a>
     </div>
   </div>
 <% end %>
 
 <%- unless @hide_google %>
+  <% local_domain = "#{request.protocol}#{request.host_with_port}" %>
+
   <div class="row">
-    <div class="span10 page-not-found-search">
+    <div class="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>
@@ -42,12 +42,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/finish_installation/register.html.erb b/app/views/finish_installation/register.html.erb
index b691465732..8fa60e3e38 100644
--- a/app/views/finish_installation/register.html.erb
+++ b/app/views/finish_installation/register.html.erb
@@ -9,7 +9,9 @@
       </label>
 
       <div class='input-area'>
+        <!--email_off-->
         <%= select_tag :email, options_for_select(@allowed_emails, selected: params[:email]), class: 'combobox' %>
+        <!--/email_off-->
       </div>
     </div>
 
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 1d1d10c3c3..ee36992e6c 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -7,7 +7,7 @@
 <link rel="apple-touch-icon" type="image/png" href="<%=SiteSetting.apple_touch_icon_url%>">
 <%- end %>
 <%- if (SiteSetting.apple_touch_icon_url != "/images/default-apple-touch-icon.png") && SiteSetting.apple_touch_icon_url.present? %>
-<link rel="icon" sizes="144x144" href="<%=SiteSetting.apple_touch_icon_url%>">
+<link rel="icon" type="image/png" sizes="144x144" href="<%=SiteSetting.apple_touch_icon_url%>">
 <%- end %>
 <meta name="theme-color" content="#<%= ColorScheme.hex_for_name('header_background') %>">
 <% if mobile_view? %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 984b0e198a..4eb4c3f275 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -2,9 +2,10 @@
 <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 %>">
+    <meta name="discourse_current_homepage" content="<%= current_homepage %>">
     <%= render partial: "layouts/head" %>
     <%= discourse_csrf_tags %>
 
@@ -55,7 +56,7 @@
 
     <%= yield :head %>
 
-    <%= raw build_plugin_html 'before-head-close' %>
+    <%= build_plugin_html 'server:before-head-close' %>
   </head>
 
   <body class="<%= body_classes %>">
@@ -87,6 +88,7 @@
 
     <%- unless customization_disabled? || loading_admin? %>
       <%= theme_lookup("header") %>
+      <%= build_plugin_html 'server:header' %>
     <%- end %>
 
     <section id='main'>
@@ -119,11 +121,9 @@
 
     <%= render :partial => "common/discourse_javascript" %>
 
-    <%= render_google_analytics_code %>
-
     <%- unless customization_disabled? %>
       <%= raw theme_lookup("body_tag") %>
     <%- end %>
-    <%= raw build_plugin_html 'before-body-close' %>
+    <%= build_plugin_html 'server:before-body-close' %>
   </body>
 </html>
diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb
index ac757cc8c2..ab98695c27 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? %>
@@ -32,7 +32,6 @@
       </nav>
       <p><%= t 'powered_by_html' %></p>
     </footer>
-    <%= render_google_analytics_code %>
     <%= theme_lookup("body_tag") %>
   </body>
   <%= yield :after_body %>
diff --git a/app/views/layouts/no_ember.html.erb b/app/views/layouts/no_ember.html.erb
index 035a84027b..eb8c6fabdf 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" %>
@@ -11,9 +11,11 @@
 
   <%= theme_lookup("head_tag") %>
   <%= yield(:no_ember_head) %>
+  <%= build_plugin_html 'server:before-head-close' %>
 </head>
 <body <% if @custom_body_class %>class="<%= @custom_body_class %>"<% end %>>
   <%= theme_lookup("header") %>
+  <%= build_plugin_html 'server:header' %>
   <section id='main'>
     <%= render partial: 'header' %>
     <div id="main-outlet" class="<%= @container_class ? @container_class : 'wrap' %>">
@@ -21,5 +23,7 @@
     </div>
   </section>
   <%= theme_lookup("footer") %>
+  <%= build_plugin_html 'no-client:footer' %>
+  <%= build_plugin_html 'server:before-body-close' %>
 </body>
 </html>
diff --git a/app/views/list/list.erb b/app/views/list/list.erb
index ba4b1dff31..7d1179c746 100644
--- a/app/views/list/list.erb
+++ b/app/views/list/list.erb
@@ -90,6 +90,10 @@
     <%= auto_discovery_link_tag(:rss, { action: :category_feed }, title: t('rss_topics_in_category', category: @category.name)) %>
     <%= raw crawlable_meta_data(title: @category.name, description: @category.description) %>
   <% end %>
+<% elsif @tag_id %>
+  <% content_for :head do %>
+    <%= raw crawlable_meta_data(title: @title, description: @description_meta) %>
+  <% end %>
 <% else %>
   <% content_for :head do %>
     <%= raw crawlable_meta_data(title: SiteSetting.title, description: SiteSetting.site_description) %>
@@ -99,7 +103,7 @@
 <% if @title %>
   <% content_for :title do %><%= @title %><% end %>
 <% elsif @category %>
-  <% content_for :title do %><%= @category.name %><% end %>
-<% elsif params[:page] %>
-  <% content_for :title do %><%=t 'page_num', num: params[:page].to_i + 1 %><% end %>
+  <% content_for :title do %><%= @category.name %> - <%= SiteSetting.title %><% end %>
+<% elsif params[:page].to_i > 1 %>
+  <% content_for :title do %><%=t 'page_num', num: params[:page].to_i + 1 %> - <%= SiteSetting.title %><% end %>
 <% end %>
diff --git a/app/views/offline/offline.html.erb b/app/views/offline/offline.html.erb
new file mode 100644
index 0000000000..8e3115986a
--- /dev/null
+++ b/app/views/offline/offline.html.erb
@@ -0,0 +1,17 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="<%= SiteSetting.default_locale %>" xml:lang="<%= SiteSetting.default_locale %>">
+
+<head>
+  <meta http-equiv="Content-type" name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no, width=device-width">
+  <title><%= SiteSetting.title %></title>
+</head>
+<body>
+<div style="padding:100px 40px; text-align:center; font-family: Helvetica, Arial, sans-serif;">
+  <h1 style="font-size: 36px; color: #333;"><%= t 'offline.title' %></h1>
+  <p style="margin: 40px; font-size: 18px; color: #555;">
+    <%= t 'offline.offline_page_message' %>
+  </p>
+</div>
+</body>
+
+</html>
diff --git a/app/views/pending_flags_mailer/notify.html.erb b/app/views/pending_flags_mailer/notify.html.erb
index 63e6573f3e..940fc6c6e6 100644
--- a/app/views/pending_flags_mailer/notify.html.erb
+++ b/app/views/pending_flags_mailer/notify.html.erb
@@ -1,6 +1,6 @@
 <p>
   <%= t 'flags_reminder.flags_were_submitted', count: @hours %>
-  <a href="<%= Discourse.base_url + '/admin/flags/active' %>"><%= t 'flags_reminder.please_review' %></a>
+  <a href="<%= Discourse.base_url + '/admin/flags' %>"><%= t 'flags_reminder.please_review' %></a>
 </p>
 
 <table style="border-collapse: collapse; border-spacing: 0;">
diff --git a/app/views/pending_flags_mailer/notify.text.erb b/app/views/pending_flags_mailer/notify.text.erb
index c4564fddc0..ca10b097b4 100644
--- a/app/views/pending_flags_mailer/notify.text.erb
+++ b/app/views/pending_flags_mailer/notify.text.erb
@@ -1,6 +1,6 @@
 <%=t 'flags_reminder.flags_were_submitted', count: @hours %> <%=t 'flags_reminder.please_review' %>
 
-<%= Discourse.base_url + '/admin/flags/active' %>
+<%= Discourse.base_url + '/admin/flags' %>
 
 <% @posts.each do |post| %>
  - <%= post[:title] %>: <%=t 'flags_reminder.post_number' %> <%= post[:post_number] %> - <%= post[:reason_counts] %>
diff --git a/app/views/robots_txt/no_index.erb b/app/views/robots_txt/no_index.erb
index 867036ff28..09e665facd 100644
--- a/app/views/robots_txt/no_index.erb
+++ b/app/views/robots_txt/no_index.erb
@@ -1,6 +1,4 @@
 # See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
 #
-User-Agent: *
+User-agent: *
 Disallow: /
-
-
diff --git a/app/views/safe_mode/index.html.erb b/app/views/safe_mode/index.html.erb
index 4908bf23b3..4a9700cf9a 100644
--- a/app/views/safe_mode/index.html.erb
+++ b/app/views/safe_mode/index.html.erb
@@ -6,24 +6,29 @@
     </p>
     <p>
     <label>
-    <%= check_box_tag 'no_customizations', true, true %>
+    <%= check_box_tag 'no_customizations', true, !flash[:must_select]%>
     <%= t 'safe_mode.no_customizations' %>
     </label>
     </p>
     <p>
     <label>
-    <%= check_box_tag 'only_official', true, true %>
+    <%= check_box_tag 'only_official', true, !flash[:must_select] %>
     <%= t 'safe_mode.only_official' %>
     </label>
     </p>
     <p>
     <label>
-    <%= check_box_tag 'no_plugins', true, true %>
+    <%= check_box_tag 'no_plugins', true, !flash[:must_select] %>
     <%= t 'safe_mode.no_plugins' %>
     </label>
     </p>
     <p>
       <%= submit_tag t('safe_mode.enter'), class: 'btn btn-danger' %>
+      <%- if flash[:must_select] %>
+        <span class='safe-mode-warning'>
+          <i class='fa fa-warning'></i> <%= t 'safe_mode.must_select' %>
+        </span>
+      <%- end %>
     </p>
   <% end %>
 </div>
diff --git a/app/views/search/show.html.erb b/app/views/search/show.html.erb
index 4bc06c6f46..809e0011e4 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 %><%= I18n.t('search.results_page', term: @search_term) %> - <%= SiteSetting.title %><% end %>
diff --git a/app/views/static/login.html.erb b/app/views/static/login.html.erb
index ed8badab6f..c08a7661b1 100644
--- a/app/views/static/login.html.erb
+++ b/app/views/static/login.html.erb
@@ -1,3 +1,5 @@
 <% if SiteSetting.login_required %>
-  <%= PrettyText.cook(I18n.t('login_required.welcome_message', title: SiteSetting.title)).html_safe %>
+  <div class='login-required'>
+    <%= PrettyText.cook(I18n.t('login_required.welcome_message', title: SiteSetting.title)).html_safe %>
+  </div>
 <% end %>
diff --git a/app/views/static/show.html.erb b/app/views/static/show.html.erb
index ba7592c959..8ee6ca8b41 100644
--- a/app/views/static/show.html.erb
+++ b/app/views/static/show.html.erb
@@ -2,7 +2,7 @@
   <meta itemprop='lastReviewed' content='<%= @topic.first_post.updated_at.to_date.to_formatted_s(:iso_8601) %>'>
   <ul class='nav-pills' role='navigation' itemscope itemtype='http://schema.org/SiteNavigationElement'>
     <% unless SiteSetting.login_required? && current_user.nil? %>
-      <li class="nav-item-about"><%= link_to t('about'), '/about' %></a></li>
+      <li class="nav-item-about"><%= link_to t('about'), about_index_path %></a></li>
       <% if @faq_overriden %>
         <li class='nav-item-guidelines'><a class='<%= @page == 'faq' ? 'active' : '' %>' href='<%= guidelines_path %>'><%= t 'guidelines' %></a></li>
         <li class='nav-item-faq'><a href='<%= faq_path %>'><%= t 'js.faq' %></a></li>
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 0ffd169cb5..41f18eeb7b 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>
 
@@ -18,3 +18,7 @@
 </div>
 
 <% end %>
+
+<% content_for :head do %>
+  <%= raw crawlable_meta_data(title: @title, description: @description_meta) %>
+<% end %>
diff --git a/app/views/topics/plain.html.erb b/app/views/topics/plain.html.erb
index b6d9a3f865..7e7e31bd02 100644
--- a/app/views/topics/plain.html.erb
+++ b/app/views/topics/plain.html.erb
@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <title><%= @topic_view.topic.title %></title>
-  <%= raw crawlable_meta_data(title: @topic_view.title, description: @topic_view.summary, image: @topic_view.image_url, read_time: @topic_view.read_time, like_count: @topic_view.like_count) %>
+  <%= raw crawlable_meta_data(title: @topic_view.title, description: @topic_view.summary(strip_images: true), image: @topic_view.image_url, read_time: @topic_view.read_time, like_count: @topic_view.like_count) %>
   <% if @topic_view.prev_page %>
     <link rel="prev" href="<%= @topic_view.prev_page_path -%>">
   <% end %>
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index 606485c7ca..c67fd23ecf 100644
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -88,7 +88,7 @@
 
 <% content_for :head do %>
   <%= auto_discovery_link_tag(@topic_view, {action: :feed, slug: @topic_view.topic.slug, topic_id: @topic_view.topic.id}, title: t('rss_posts_in_topic', topic: @topic_view.title), type: 'application/rss+xml') %>
-  <%= raw crawlable_meta_data(title: @topic_view.title, description: @topic_view.summary, image: @topic_view.image_url, read_time: @topic_view.read_time, like_count: @topic_view.like_count) %>
+  <%= raw crawlable_meta_data(title: @topic_view.title, description: @topic_view.summary(strip_images: true), image: @topic_view.image_url, read_time: @topic_view.read_time, like_count: @topic_view.like_count, ignore_canonical: true) %>
 
   <% if @topic_view.prev_page || @topic_view.next_page %>
     <% if @topic_view.prev_page %>
@@ -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 44c83df06c..b09bc3b736 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,13 +119,13 @@ 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>
+            <strong><%= gsub_emoji_to_unicode(t.title.truncate(100, separator: /\s/)) -%></strong>
           </a>
         </h2>
         <%- if SiteSetting.show_topic_featured_link_in_digest && t.featured_link %>
@@ -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(100, 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>
+          <strong><%= gsub_emoji_to_unicode(t.title.truncate(100, 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,10 +416,11 @@ 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),
-           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}"}))  %>
+           email_preferences_link: link_to(t('user_notifications.digest.your_email_settings'), Discourse.base_url + '/my/preferences/emails'),
+           unsubscribe_link: link_to(t('user_notifications.digest.click_here'), email_unsubscribe_url(host: Discourse.base_url, key: @unsubscribe_key), {:style=>"color: ##{@anchor_color}"}))  %>
 </div>
 
 <%= digest_custom_html("below_footer") %>
diff --git a/app/views/user_notifications/digest.text.erb b/app/views/user_notifications/digest.text.erb
index ec9278df89..e3bbc1f818 100644
--- a/app/views/user_notifications/digest.text.erb
+++ b/app/views/user_notifications/digest.text.erb
@@ -52,6 +52,7 @@
 <%= digest_custom_text("above_footer") %>
 <%=raw(t :'user_notifications.digest.unsubscribe',
      site_link: site_link,
+     email_preferences_link: raw(@markdown_linker.create(t('user_notifications.digest.your_email_settings'), '/my/preferences/emails')),
      unsubscribe_link: raw(@markdown_linker.create(t('user_notifications.digest.click_here'), email_unsubscribe_url(key: @unsubscribe_key, only_path: true))))  %>
 
 <%= raw(@markdown_linker.references) %>
diff --git a/app/views/users/activate_account.html.erb b/app/views/users/activate_account.html.erb
index 44aac1f420..b481df62ae 100644
--- a/app/views/users/activate_account.html.erb
+++ b/app/views/users/activate_account.html.erb
@@ -40,5 +40,3 @@
     });
   })();
 </script>
-
-<%= render_google_analytics_code %>
diff --git a/app/views/users/confirm_admin.html.erb b/app/views/users/confirm_admin.html.erb
index 4e996da74a..2f9d3cdd4a 100644
--- a/app/views/users/confirm_admin.html.erb
+++ b/app/views/users/confirm_admin.html.erb
@@ -14,7 +14,7 @@
     <%=raw (t('activation.admin_confirm.complete', target_username: @confirmation.target_user.username)) %>
     <br/>
     <br/>
-    <%= link_to t("activation.admin_confirm.back_to", title: SiteSetting.title), "/", class: 'btn btn-primary' %>
+    <%= link_to t("activation.admin_confirm.back_to", title: SiteSetting.title), Discourse.base_url, class: 'btn btn-primary' %>
   <% end %>
 
 </div>
diff --git a/app/views/users/omniauth_callbacks/complete.html.erb b/app/views/users/omniauth_callbacks/complete.html.erb
index ac190f5555..c4dd3c9db4 100644
--- a/app/views/users/omniauth_callbacks/complete.html.erb
+++ b/app/views/users/omniauth_callbacks/complete.html.erb
@@ -19,13 +19,14 @@
 
 <body>
   <div class="dialog">
-    <p><%=t "login.close_window" %></p>
+    <p>
+      <%=t "login.auth_complete" %>
+      <a href="<%= Discourse.base_url.html_safe %>?authComplete=true"><%= t("login.click_to_continue") %></a>
+    </p>
 
     <script type="text/javascript">
        var authResult = <%=@auth_result.to_client_hash.to_json.html_safe%>;
 
-       // On facebook browser, just redirect and don't close
-       var ua = navigator.userAgent || navigator.vendor || window.opera;
        if (!window.opener) {
          localStorage.setItem('lastAuthResult', JSON.stringify(authResult));
          window.location.href = '<%= Discourse.base_url.html_safe %>?authComplete=true';
diff --git a/app/views/users/omniauth_callbacks/failure.html.erb b/app/views/users/omniauth_callbacks/failure.html.erb
index c83169acb3..ea34e2fa24 100644
--- a/app/views/users/omniauth_callbacks/failure.html.erb
+++ b/app/views/users/omniauth_callbacks/failure.html.erb
@@ -1,20 +1,11 @@
-<html>
-  <head>
-    <%= render partial: "layouts/head" %>
-    <%= render partial: "common/special_font_face" %>
-    <%= render partial: "common/discourse_stylesheet" %>
-  </head>
-  <body>
-    <div id="simple-container">
-      <%if flash[:error].present? %>
-        <div class='alert alert-error'>
-          <%=flash[:error]%>
-        </div>
-      <%else%>
-        <div class='alert alert-error'>
-          <%= t 'login.omniauth_error_unknown' %>
-        </div>
-      <%end%>
+<div id="simple-container">
+  <%if flash[:error].present? %>
+    <div class='alert alert-error'>
+      <%=flash[:error]%>
     </div>
-  </body>
-</html>
+  <%else%>
+    <div class='alert alert-error'>
+      <%= t 'login.omniauth_error_unknown' %>
+    </div>
+  <%end%>
+</div>
diff --git a/app/views/users/password_reset.html.erb b/app/views/users/password_reset.html.erb
index a7d6aedca4..3a3c4338bf 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">
@@ -24,5 +24,3 @@
 <%- content_for(:head) do %>
   <meta name="referrer" content="never">
 <%- end %>
-
-<%= render_google_analytics_code %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 2616716c05..c0479dfb04 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/app/views/users_email/confirm.html.erb b/app/views/users_email/confirm.html.erb
index f02bb9fbe9..0538ddfaac 100644
--- a/app/views/users_email/confirm.html.erb
+++ b/app/views/users_email/confirm.html.erb
@@ -9,7 +9,7 @@
     <a class="btn" href="/"><%= t('change_email.please_continue', site_name: SiteSetting.title) %></a>
   <% else %>
     <div class='alert alert-error'>
-      <%=t 'change_email.error' %>
+      <%=t 'change_email.already_done' %>
     </div>
   <% end %>
 </div>
diff --git a/bin/docker/README.md b/bin/docker/README.md
old mode 100644
new mode 100755
diff --git a/bin/docker/boot_dev b/bin/docker/boot_dev
index 30b721cef2..0a80ac638a 100755
--- a/bin/docker/boot_dev
+++ b/bin/docker/boot_dev
@@ -1,6 +1,8 @@
 #!/bin/bash
-SCRIPTPATH=$(cd "$(dirname "$0")"; pwd -P)
-SOURCE_DIR=$(cd "$SCRIPTPATH" && cd ../.. && pwd -P)
+set -e
+
+SCRIPTPATH=$(cd "$(dirname "$0")" > /dev/null; pwd -P)
+SOURCE_DIR=$(cd "$SCRIPTPATH" > /dev/null; cd ../.. > /dev/null; pwd -P)
 DATA_DIR="$SOURCE_DIR/data/postgres"
 
 show_help() {
diff --git a/bin/notify_file_change b/bin/notify_file_change
index 354aa6ae67..1ece7a0f33 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/bin/puma b/bin/puma
index 26523fced3..3249ddee00 100755
--- a/bin/puma
+++ b/bin/puma
@@ -12,7 +12,7 @@ if ARGV[0] == '--kill-existing'
   pids = `ps aux | grep puma | grep discourse | grep -v grep | awk '{print $2;}'`.strip
     .split("\n")
     .map(&:to_i)
-    .reject{|pid| pid == Process.pid}
+    .reject { |pid| pid == Process.pid }
 
   if pids.length > 0
     STDERR.puts "Terminating old version of puma at pid #{pids[0]}"
diff --git a/bin/rails b/bin/rails
index 728cd85aa5..0739660237 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'
diff --git a/config.ru b/config.ru
index c74954f4f4..3c73b82bb1 100644
--- a/config.ru
+++ b/config.ru
@@ -1,6 +1,8 @@
 # This file is used by Rack-based servers to start the application.
+ENV["DISCOURSE_RUNNING_IN_RACK"] = "1"
+
 require ::File.expand_path('../config/environment',  __FILE__)
+
 map ActionController::Base.config.try(:relative_url_root) || "/" do
   run Discourse::Application
 end
-
diff --git a/config/application.rb b/config/application.rb
index 4ef778ab19..7ca36a951a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -22,7 +22,6 @@ if defined?(Bundler)
   Bundler.require(*Rails.groups(assets: %w(development test profile)))
 end
 
-
 module Discourse
   class Application < Rails::Application
 
@@ -64,6 +63,10 @@ module Discourse
     config.autoload_paths += Dir["#{config.root}/lib/validators/"]
     config.autoload_paths += Dir["#{config.root}/app"]
 
+    if Rails.env.development? && !Sidekiq.server?
+      config.autoload_paths += Dir["#{config.root}/lib"]
+    end
+
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
     # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
@@ -79,11 +82,20 @@ module Discourse
     end]
 
     config.assets.precompile += %w{
-                                 vendor.js admin.js preload-store.js
-                                 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
-                                 }
+      vendor.js
+      admin.js
+      preload-store.js
+      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
+      service-worker.js
+    }
 
     # Precompile all available locales
     Dir.glob("#{config.root}/app/assets/javascripts/locales/*.js.erb").each do |file|
@@ -130,14 +142,9 @@ module Discourse
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.2.4'
 
-    # We need to be able to spin threads
-    config.active_record.thread_safe!
-
     # see: http://stackoverflow.com/questions/11894180/how-does-one-correctly-add-custom-sql-dml-in-migrations/11894420#11894420
     config.active_record.schema_format = :sql
 
-    config.active_record.raise_in_transactional_callbacks = true
-
     # per https://www.owasp.org/index.php/Password_Storage_Cheat_Sheet
     config.pbkdf2_iterations = 64000
     config.pbkdf2_algorithm = "sha256"
@@ -168,7 +175,7 @@ module Discourse
 
     # we configure rack cache on demand in an initializer
     # our setup does not use rack cache and instead defers to nginx
-    config.action_dispatch.rack_cache =  nil
+    config.action_dispatch.rack_cache = nil
 
     # ember stuff only used for asset precompliation, production variant plays up
     config.ember.variant = :development
@@ -176,7 +183,7 @@ module Discourse
     config.ember.handlebars_location = "#{Rails.root}/vendor/assets/javascripts/handlebars.js"
 
     require 'auth'
-    Discourse.activate_plugins! unless Rails.env.test? and ENV['LOAD_PLUGINS'] != "1"
+    Discourse.activate_plugins! unless Rails.env.test? && ENV['LOAD_PLUGINS'] != "1"
 
     if GlobalSetting.relative_url_root.present?
       config.relative_url_root = GlobalSetting.relative_url_root
@@ -197,6 +204,8 @@ module Discourse
       require_dependency 'post_revision'
       require_dependency 'notification'
       require_dependency 'topic_user'
+      require_dependency 'topic_view'
+      require_dependency 'topic_list'
       require_dependency 'group'
       require_dependency 'user_field'
       require_dependency 'post_action_type'
@@ -205,8 +214,22 @@ module Discourse
 
       # So open id logs somewhere sane
       OpenID::Util.logger = Rails.logger
-      if plugins = Discourse.plugins
-        plugins.each{|plugin| plugin.notify_after_initialize}
+
+      # Load plugins
+      Discourse.plugins.each(&:notify_after_initialize)
+
+      # we got to clear the pool in case plugins connect
+      ActiveRecord::Base.connection_handler.clear_active_connections!
+
+      # This nasty hack is required for not precompiling QUnit assets
+      # in test mode. see: https://github.com/rails/sprockets-rails/issues/299#issuecomment-167701012
+      ActiveSupport.on_load(:action_view) do
+        default_checker = ActionView::Base.precompiled_asset_checker
+
+        ActionView::Base.precompiled_asset_checker = -> logical_path do
+          default_checker[logical_path] ||
+            %w{qunit.js qunit.css test_helper.css test_helper.js wizard/test/test_helper.js}.include?(logical_path)
+        end
       end
     end
 
diff --git a/config/boot.rb b/config/boot.rb
index 7180eb1fbb..929f1a62fe 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -10,7 +10,6 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
 
-
 if ENV['RAILS_ENV'] != 'production'
   require 'bootsnap'
 
diff --git a/config/cloud/cloud66/files/production.rb b/config/cloud/cloud66/files/production.rb
index db662574be..42d9caa9fc 100644
--- a/config/cloud/cloud66/files/production.rb
+++ b/config/cloud/cloud66/files/production.rb
@@ -27,13 +27,13 @@ Discourse::Application.configure do
 
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.smtp_settings = {
-     :address              => ENV['SMTP_ADDRESS'],
-     :port                 => ENV['SMTP_PORT'],
-     :domain               => ENV['SMTP_DOMAIN'],
-     :user_name            => ENV['SMTP_USERNAME'],
-     :password             => ENV['SMTP_PASSWORD'],
-     :authentication       => 'plain',
-     :enable_starttls_auto => true  }
+     address: ENV['SMTP_ADDRESS'],
+     port: ENV['SMTP_PORT'],
+     domain: ENV['SMTP_DOMAIN'],
+     user_name: ENV['SMTP_USERNAME'],
+     password: ENV['SMTP_PASSWORD'],
+     authentication: 'plain',
+     enable_starttls_auto: true  }
 
   #config.action_mailer.delivery_method = :sendmail
   #config.action_mailer.sendmail_settings = {arguments: '-i'}
diff --git a/config/database.yml b/config/database.yml
index e9a2a50369..f3983ad493 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,10 +1,11 @@
 development:
   prepared_statements: false
   adapter: postgresql
-  database: discourse_development
+  database: <%= ENV['DISCOURSE_DEV_DB'] || 'discourse_development' %>
   min_messages: warning
   pool: 5
   timeout: 5000
+  checkout_timeout: <%= ENV['CHECKOUT_TIMEOUT'] || 5 %>
   host_names:
     ### Don't include the port number here. Change the "port" site setting instead, at /admin/site_settings.
     ### If you change this setting you will need to
@@ -18,7 +19,7 @@ development:
 test:
   prepared_statements: false
   adapter: postgresql
-  database: discourse_test
+  database: discourse_test<%= ENV['MULTISITE'] ? "_#{ENV['MULTISITE']}" : '' %>
   min_messages: warning
   pool: 5
   timeout: 5000
diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf
index 3d8e096ab9..2945e77236 100644
--- a/config/discourse_defaults.conf
+++ b/config/discourse_defaults.conf
@@ -17,9 +17,12 @@
 # connection pool size, sidekiq is set to 5, allowing an extra 3 for bg threads
 db_pool = 8
 
-# database timeout in milliseconds
+# ActiveRecord connection pool timeout in milliseconds
 db_timeout = 5000
 
+# Database connection timeout in seconds
+db_connect_timeout = 5
+
 # socket file used to access db
 db_socket =
 
@@ -156,3 +159,24 @@ secret_key_base =
 # in multi host setups this allows you to have old unicorn instances serve
 # newly compiled assets
 fallback_assets_path =
+
+# S3 settings used for serving ALL public files
+# be sure to configre a CDN as well per cdn_url
+s3_bucket =
+s3_region =
+s3_access_key_id =
+s3_secret_access_key =
+s3_use_iam_profile = false
+s3_cdn_url =
+
+
+### rate limits apply to all sites
+max_user_api_reqs_per_minute = 20
+max_user_api_reqs_per_day = 2880
+
+max_admin_api_reqs_per_key_per_minute = 60
+
+max_requests_per_ip_per_minute = 200
+max_requests_per_ip_per_10_seconds = 50
+# global rate limiter will simply warn if the limit is exceeded, can be warn, block or none
+max_requests_per_ip_mode = none
diff --git a/config/environments/development.rb b/config/environments/development.rb
index bc345547ab..d9c10db2e8 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -48,17 +48,16 @@ Discourse::Application.configure do
   config.enable_anon_caching = false
   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/production.rb b/config/environments/production.rb
index b4331f15ac..c6b0d6eb84 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -10,7 +10,7 @@ Discourse::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_files = GlobalSetting.serve_static_assets
+  config.public_file_server.enabled = GlobalSetting.serve_static_assets || false
 
   config.assets.js_compressor = :uglifier
 
@@ -35,10 +35,10 @@ Discourse::Application.configure do
 
     settings[:openssl_verify_mode] = GlobalSetting.smtp_openssl_verify_mode if GlobalSetting.smtp_openssl_verify_mode
 
-    config.action_mailer.smtp_settings = settings.reject{|_, y| y.nil?}
+    config.action_mailer.smtp_settings = settings.reject { |_, y| y.nil? }
   else
     config.action_mailer.delivery_method = :sendmail
-    config.action_mailer.sendmail_settings = {arguments: '-i'}
+    config.action_mailer.sendmail_settings = { arguments: '-i' }
   end
 
   # Send deprecation notices to registered listeners
diff --git a/config/environments/profile.rb b/config/environments/profile.rb
index 3f672a9c47..e29421d57e 100644
--- a/config/environments/profile.rb
+++ b/config/environments/profile.rb
@@ -13,7 +13,7 @@ Discourse::Application.configure do
   config.action_controller.perform_caching = true
 
   # in profile mode we serve static assets
-  config.serve_static_files = true
+  config.public_file_server.enabled = true
 
   # Compress JavaScripts and CSS
   config.assets.compress = true
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 16cab97ce1..2397915f3a 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -8,7 +8,7 @@ Discourse::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_files = true
+  config.public_file_server.enabled = true
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
@@ -18,7 +18,7 @@ Discourse::Application.configure do
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
@@ -41,4 +41,27 @@ 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
+
+  config.after_initialize do
+    SiteSetting.defaults.tap do |s|
+      s.set_regardless_of_locale(:s3_upload_bucket, 'bucket')
+      s.set_regardless_of_locale(:min_post_length, 5)
+      s.set_regardless_of_locale(:min_first_post_length, 5)
+      s.set_regardless_of_locale(:min_private_message_post_length, 10)
+      s.set_regardless_of_locale(:crawl_images, false)
+      s.set_regardless_of_locale(:download_remote_images_to_local, false)
+      s.set_regardless_of_locale(:unique_posts_mins, 0)
+      s.set_regardless_of_locale(:queue_jobs, false)
+      # disable plugins
+      if ENV['LOAD_PLUGINS'] == '1'
+        s.set_regardless_of_locale(:discourse_narrative_bot_enabled, false)
+      end
+    end
+    SiteSetting.refresh!
+  end
 end
diff --git a/config/initializers/000-rails-master-polyfills.rb b/config/initializers/000-rails-master-polyfills.rb
deleted file mode 100644
index baa94c3732..0000000000
--- a/config/initializers/000-rails-master-polyfills.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-if Rails.version < "4.2.0"
-  class Mail::Message
-    alias_method :deliver_now,  :deliver
-    alias_method :deliver_now!, :deliver!
-  end
-end
diff --git a/config/initializers/001-redis.rb b/config/initializers/001-redis.rb
index 73340cc49d..af3e829842 100644
--- a/config/initializers/001-redis.rb
+++ b/config/initializers/001-redis.rb
@@ -4,12 +4,11 @@ if Rails.env.development? && ENV['DISCOURSE_FLUSH_REDIS']
 end
 
 if defined?(PhusionPassenger)
-    PhusionPassenger.on_event(:starting_worker_process) do |forked|
-        if forked
-            Discourse.after_fork
-        else
-            # We're in conservative spawning mode. We don't need to do anything.
-        end
+  PhusionPassenger.on_event(:starting_worker_process) do |forked|
+    if forked
+      Discourse.after_fork
+    else
+      # We're in conservative spawning mode. We don't need to do anything.
     end
+  end
 end
-
diff --git a/config/initializers/004-message_bus.rb b/config/initializers/004-message_bus.rb
index 5faf89f9e8..fabada48a0 100644
--- a/config/initializers/004-message_bus.rb
+++ b/config/initializers/004-message_bus.rb
@@ -1,4 +1,4 @@
-MessageBus.site_id_lookup do |env=nil|
+MessageBus.site_id_lookup do |env = nil|
   if env
     setup_message_bus_env(env)
     env["__mb"][:site_id]
diff --git a/config/initializers/005-site_settings.rb b/config/initializers/005-site_settings.rb
index f53f168464..9209ff55e4 100644
--- a/config/initializers/005-site_settings.rb
+++ b/config/initializers/005-site_settings.rb
@@ -11,11 +11,11 @@ reload_settings = lambda {
       unless String === SiteSetting.push_api_secret_key && SiteSetting.push_api_secret_key.length == 32
         SiteSetting.push_api_secret_key = SecureRandom.hex
       end
-
     rescue ActiveRecord::StatementInvalid
       # This will happen when migrating a new database
     rescue => e
-      STDERR.puts "URGENT: #{e} Failed to initialize site #{RailsMultisite::ConnectionManagement.current_db}"
+      STDERR.puts "URGENT: Failed to initialize site #{RailsMultisite::ConnectionManagement.current_db}:"\
+        "#{e.message}\n#{e.backtrace.join("\n")}"
       # the show must go on, don't stop startup if multisite fails
     end
   end
@@ -24,7 +24,7 @@ reload_settings = lambda {
 reload_settings.call
 
 if !Rails.configuration.cache_classes
-  ActionDispatch::Reloader.to_prepare do
+  ActiveSupport::Reloader.to_prepare do
     reload_settings.call
   end
 end
diff --git a/config/initializers/006-ensure_login_hint.rb b/config/initializers/006-ensure_login_hint.rb
index e177601737..1cc7b51429 100644
--- a/config/initializers/006-ensure_login_hint.rb
+++ b/config/initializers/006-ensure_login_hint.rb
@@ -18,5 +18,5 @@ if User.limit(20).count < 20 && User.where(admin: true).human_users.count == 0
     SiteSetting.has_login_hint = true
   end
 
-# we may be booting with no User table eg: first migration, just skip
+  # we may be booting with no User table eg: first migration, just skip
 end rescue nil
diff --git a/config/initializers/006-mini_profiler.rb b/config/initializers/006-mini_profiler.rb
index e39b1a33de..8a0ceb8a1a 100644
--- a/config/initializers/006-mini_profiler.rb
+++ b/config/initializers/006-mini_profiler.rb
@@ -6,7 +6,7 @@ if Rails.configuration.respond_to?(:load_mini_profiler) && Rails.configuration.l
   begin
     require 'memory_profiler'
   rescue => e
-     STDERR.put "#{e} failed to require mini profiler"
+    STDERR.put "#{e} failed to require mini profiler"
   end
 
   # initialization is skipped so trigger it
@@ -19,7 +19,9 @@ if defined?(Rack::MiniProfiler)
   #   raw_connection means results are not namespaced
   #
   # namespacing gets complex, cause mini profiler is in the rack chain way before multisite
-  Rack::MiniProfiler.config.storage_instance = Rack::MiniProfiler::RedisStore.new(connection:  DiscourseRedis.raw_connection)
+  Rack::MiniProfiler.config.storage_instance = Rack::MiniProfiler::RedisStore.new(
+    connection:  DiscourseRedis.new(nil, namespace: false)
+  )
 
   skip = [
     /^\/message-bus/,
@@ -48,7 +50,7 @@ if defined?(Rack::MiniProfiler)
     path = env['PATH_INFO']
 
     (env['HTTP_USER_AGENT'] !~ /iPad|iPhone|Android/) &&
-    !skip.any?{|re| re =~ path}
+    !skip.any? { |re| re =~ path }
   end
 
   # without a user provider our results will use the ip address for namespacing
@@ -68,7 +70,6 @@ if defined?(Rack::MiniProfiler)
   Rack::MiniProfiler.config.backtrace_ignores << /config\/initializers\/silence_logger/
   Rack::MiniProfiler.config.backtrace_ignores << /config\/initializers\/quiet_logger/
 
-
   # Rack::MiniProfiler.counter_method(ActiveRecord::QueryMethods, 'build_arel')
   # Rack::MiniProfiler.counter_method(Array, 'uniq')
   # require "#{Rails.root}/vendor/backports/notification"
@@ -97,9 +98,8 @@ if defined?(Rack::MiniProfiler)
   # Rack::MiniProfiler.profile_method ActionView::PathResolver, 'find_templates'
 end
 
-
 if ENV["PRINT_EXCEPTIONS"]
-  trace      = TracePoint.new(:raise) do |tp|
+  trace = TracePoint.new(:raise) do |tp|
     puts tp.raised_exception
     puts tp.raised_exception.backtrace.join("\n")
     puts
diff --git a/config/initializers/008-rack-cors.rb b/config/initializers/008-rack-cors.rb
index 4864b961f6..689cdd3e2e 100644
--- a/config/initializers/008-rack-cors.rb
+++ b/config/initializers/008-rack-cors.rb
@@ -1,41 +1,52 @@
-if GlobalSetting.enable_cors
-  class Discourse::Cors
-    def initialize(app, options = nil)
-      @app = app
-      if GlobalSetting.enable_cors && GlobalSetting.cors_origin.present?
-        @global_origins = GlobalSetting.cors_origin.split(',').map(&:strip)
-      end
-    end
+# frozen_string_literal: true
 
-    def call(env)
-      if env['REQUEST_METHOD'] == 'OPTIONS' and env['HTTP_ACCESS_CONTROL_REQUEST_METHOD']
-        return [200, apply_headers(env), []]
-      end
+class Discourse::Cors
+  ORIGINS_ENV = "Discourse_Cors_Origins"
 
-      status, headers, body = @app.call(env)
-      [status, apply_headers(env, headers), body]
-    end
-
-    def apply_headers(env, headers=nil)
-      headers ||= {}
-
-      origin = nil
-      cors_origins = @global_origins || []
-      cors_origins += SiteSetting.cors_origins.split('|') if SiteSetting.cors_origins
-
-      if cors_origins
-        if origin = env['HTTP_ORIGIN']
-          origin = nil unless cors_origins.include?(origin)
-        end
-
-        headers['Access-Control-Allow-Origin'] = origin || cors_origins[0]
-        headers['Access-Control-Allow-Headers'] = 'X-Requested-With, X-CSRF-Token, Discourse-Visible'
-        headers['Access-Control-Allow-Credentials'] = 'true'
-      end
-
-      headers
+  def initialize(app, options = nil)
+    @app = app
+    if GlobalSetting.enable_cors && GlobalSetting.cors_origin.present?
+      @global_origins = GlobalSetting.cors_origin.split(',').map(&:strip)
     end
   end
 
+  def call(env)
+
+    cors_origins = @global_origins || []
+    cors_origins += SiteSetting.cors_origins.split('|') if SiteSetting.cors_origins.present?
+    cors_origins = cors_origins.presence
+
+    if env['REQUEST_METHOD'] == ('OPTIONS') && env['HTTP_ACCESS_CONTROL_REQUEST_METHOD']
+      return [200, Discourse::Cors.apply_headers(cors_origins, env, {}), []]
+    end
+
+    env[Discourse::Cors::ORIGINS_ENV] = cors_origins if cors_origins
+
+    status, headers, body = @app.call(env)
+    headers ||= {}
+
+    Discourse::Cors.apply_headers(cors_origins, env, headers) if cors_origins
+
+    [status, headers, body]
+  end
+
+  def self.apply_headers(cors_origins, env, headers)
+    origin = nil
+
+    if cors_origins
+      if origin = env['HTTP_ORIGIN']
+        origin = nil unless cors_origins.include?(origin)
+      end
+
+      headers['Access-Control-Allow-Origin'] = origin || cors_origins[0]
+      headers['Access-Control-Allow-Headers'] = 'X-Requested-With, X-CSRF-Token, Discourse-Visible'
+      headers['Access-Control-Allow-Credentials'] = 'true'
+    end
+
+    headers
+  end
+end
+
+if GlobalSetting.enable_cors
   Rails.configuration.middleware.insert_before ActionDispatch::Flash, Discourse::Cors
 end
diff --git a/config/initializers/012-web_hook_events.rb b/config/initializers/012-web_hook_events.rb
index 93edb4e00e..ad5d94dcce 100644
--- a/config/initializers/012-web_hook_events.rb
+++ b/config/initializers/012-web_hook_events.rb
@@ -22,7 +22,13 @@ DiscourseEvent.on(:post_edited) do |post, topic_changed|
   WebHook.enqueue_topic_hooks(:topic_edited, post.topic) if post.is_first_post? && topic_changed
 end
 
-%i(user_created user_approved user_updated).each do |event|
+%i(
+  user_logged_out
+  user_created
+  user_logged_in
+  user_approved
+  user_updated
+).each do |event|
   DiscourseEvent.on(event) do |user|
     WebHook.enqueue_hooks(:user, user_id: user.id, event_name: event.to_s)
   end
diff --git a/config/initializers/013-excon_defaults.rb b/config/initializers/013-excon_defaults.rb
new file mode 100644
index 0000000000..32ab36b4cb
--- /dev/null
+++ b/config/initializers/013-excon_defaults.rb
@@ -0,0 +1 @@
+Excon::DEFAULTS[:omit_default_port] = true
diff --git a/config/initializers/014-rails_multisite.rb b/config/initializers/014-rails_multisite.rb
new file mode 100644
index 0000000000..fba7ec79da
--- /dev/null
+++ b/config/initializers/014-rails_multisite.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class RailsMultisite::DiscoursePatches
+  def self.config
+    {
+      db_lookup: lambda do |env|
+        env["PATH_INFO"] == "/srv/status" ? "default" : nil
+      end
+    }
+  end
+end
+
+if Rails.configuration.multisite
+  Rails.configuration.middleware.swap(
+    RailsMultisite::ConnectionManagement,
+    RailsMultisite::ConnectionManagement,
+    RailsMultisite::DiscoursePatches.config
+  )
+end
diff --git a/config/initializers/050-force_https.rb b/config/initializers/050-force_https.rb
index 7ac71e1135..0185fbd742 100644
--- a/config/initializers/050-force_https.rb
+++ b/config/initializers/050-force_https.rb
@@ -1,7 +1,7 @@
 # tiny middleware to force https if needed
 class Discourse::ForceHttpsMiddleware
 
-  def initialize(app, config={})
+  def initialize(app, config = {})
     @app = app
   end
 
@@ -11,4 +11,3 @@ class Discourse::ForceHttpsMiddleware
   end
 
 end
-
diff --git a/config/initializers/099-anon-cache.rb b/config/initializers/099-anon-cache.rb
index d2c90beee8..1b8165511e 100644
--- a/config/initializers/099-anon-cache.rb
+++ b/config/initializers/099-anon-cache.rb
@@ -1,13 +1,13 @@
 require_dependency "middleware/anonymous_cache"
 
-enabled = if Rails.configuration.respond_to?(:enable_anon_caching)
-            Rails.configuration.enable_anon_caching
-          else
-            Rails.env.production?
-          end
+enabled =
+  if Rails.configuration.respond_to?(:enable_anon_caching)
+    Rails.configuration.enable_anon_caching
+  else
+    Rails.env.production?
+  end
 
 if !ENV['DISCOURSE_DISABLE_ANON_CACHE'] && enabled
   # in an ideal world this is position 0, but mobile detection uses ... session and request and params
-  Rails.configuration.middleware.insert_after ActionDispatch::ParamsParser, Middleware::AnonymousCache
+  Rails.configuration.middleware.insert_after ActionDispatch::Flash, Middleware::AnonymousCache
 end
-
diff --git a/config/initializers/099-defer.rb b/config/initializers/099-defer.rb
new file mode 100644
index 0000000000..9d020433c1
--- /dev/null
+++ b/config/initializers/099-defer.rb
@@ -0,0 +1 @@
+require_dependency 'scheduler/defer'
diff --git a/config/initializers/099-unicorn.rb b/config/initializers/099-unicorn.rb
deleted file mode 100644
index e6152b69d7..0000000000
--- a/config/initializers/099-unicorn.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require_dependency 'scheduler/defer'
-
-if defined? Unicorn::HttpServer
-  ObjectSpace.each_object(Unicorn::HttpServer) do |s|
-    s.extend(Scheduler::Defer::Unicorn)
-  end
-end
diff --git a/config/initializers/100-lograge.rb b/config/initializers/100-lograge.rb
new file mode 100644
index 0000000000..a1089a7b27
--- /dev/null
+++ b/config/initializers/100-lograge.rb
@@ -0,0 +1,85 @@
+if (Rails.env.production? && SiteSetting.logging_provider == 'lograge') || ENV["ENABLE_LOGRAGE"]
+  require 'lograge'
+
+  if Rails.configuration.multisite
+    Rails.logger.formatter = ActiveSupport::Logger::SimpleFormatter.new
+  end
+
+  Rails.application.configure do
+    config.lograge.enabled = true
+
+    config.lograge.custom_payload do |controller|
+      begin
+        username =
+          begin
+            controller.current_user&.username
+          rescue Discourse::InvalidAccess
+            nil
+          end
+
+        ip =
+          begin
+            controller.request.remote_ip
+          rescue ActionDispatch::RemoteIp::IpSpoofAttackError
+            nil
+          end
+
+        {
+          ip: ip,
+          username: username,
+        }
+      rescue => e
+        Rails.logger.warn("Failed to append custom payload: #{e.message}\n#{e.backtrace.join("\n")}")
+        {}
+      end
+    end
+
+    config.lograge.custom_options = lambda do |event|
+      begin
+        exceptions = %w(controller action format id)
+
+        params = event.payload[:params].except(*exceptions)
+        params[:files].map!(&:headers) if params[:files]
+
+        output = {
+          params: params.to_query,
+          database: RailsMultisite::ConnectionManagement.current_db,
+        }
+
+        if data = Thread.current[:_method_profiler]
+          sql = data[:sql]
+
+          if sql
+            output[:db] = sql[:duration] * 1000
+            output[:db_calls] = sql[:calls]
+          end
+
+          redis = data[:redis]
+
+          if redis
+            output[:redis] = redis[:duration] * 1000
+            output[:redis_calls] = redis[:calls]
+          end
+        end
+
+        output
+      rescue RateLimiter::LimitExceeded
+        # no idea who this is, but they are limited
+        {}
+      rescue => e
+        Rails.logger.warn("Failed to append custom options: #{e.message}\n#{e.backtrace.join("\n")}")
+        {}
+      end
+    end
+
+    if ENV["LOGSTASH_URI"]
+      config.lograge.formatter = Lograge::Formatters::Logstash.new
+
+      require 'discourse_logstash_logger'
+
+      config.lograge.logger = DiscourseLogstashLogger.logger(
+        uri: ENV['LOGSTASH_URI'], type: :rails
+      )
+    end
+  end
+end
diff --git a/config/initializers/100-logster.rb b/config/initializers/100-logster.rb
index d913051336..a3ba1e860a 100644
--- a/config/initializers/100-logster.rb
+++ b/config/initializers/100-logster.rb
@@ -8,11 +8,6 @@ if Rails.env.production?
     /^ActionController::UnknownFormat/,
     /^ActionController::UnknownHttpMethod/,
     /^AbstractController::ActionNotFound/,
-
-    # alihack is really annoying, nothing really we can do about this
-    # (795: unexpected token at 'alihack<%eval request("alihack.com")%> '):
-    /^ActionDispatch::ParamsParser::ParseError/,
-
     # ignore any empty JS errors that contain blanks or zeros for line and column fields
     #
     # Line:
@@ -25,7 +20,7 @@ if Rails.env.production?
 
     # CSRF errors are not providing enough data
     # suppress unconditionally for now
-    /^Can't verify CSRF token authenticity$/,
+    /^Can't verify CSRF token authenticity.$/,
 
     # Yandex bot triggers this JS error a lot
     /^Uncaught ReferenceError: I18n is not defined/,
@@ -37,19 +32,26 @@ if Rails.env.production?
     /^ActiveRecord::RecordNotFound/,
 
     # bad asset requested, no need to log
-    /^ActionController::BadRequest/
+    /^ActionController::BadRequest/,
+
+    # we can't do anything about invalid parameters
+    /Rack::QueryParser::InvalidParameterError/,
+
+    # we handle this cleanly in the message bus middleware
+    # no point logging to logster
+    /RateLimiter::LimitExceeded.*/m
   ]
 end
 
 # middleware that logs errors sits before multisite
 # we need to establish a connection so redis connection is good
 # and db connection is good
-Logster.config.current_context = lambda{|env,&blk|
+Logster.config.current_context = lambda { |env, &blk|
   begin
     if Rails.configuration.multisite
       request = Rack::Request.new(env)
       ActiveRecord::Base.connection_handler.clear_active_connections!
-      RailsMultisite::ConnectionManagement.establish_connection(:host => request['__ws'] || request.host)
+      RailsMultisite::ConnectionManagement.establish_connection(host: request['__ws'] || request.host)
     end
     blk.call
   ensure
@@ -73,7 +75,7 @@ RailsMultisite::ConnectionManagement.each_connection do
 
   if (error_rate_per_minute || 0) > 0
     store.register_rate_limit_per_minute(severities, error_rate_per_minute) do |rate|
-      MessageBus.publish("/logs_error_rate_exceeded", { rate: rate, duration: 'minute', publish_at: Time.current.to_i })
+      MessageBus.publish("/logs_error_rate_exceeded", rate: rate, duration: 'minute', publish_at: Time.current.to_i)
     end
   end
 
@@ -81,7 +83,7 @@ RailsMultisite::ConnectionManagement.each_connection do
 
   if (error_rate_per_hour || 0) > 0
     store.register_rate_limit_per_hour(severities, error_rate_per_hour) do |rate|
-      MessageBus.publish("/logs_error_rate_exceeded", { rate: rate, duration: 'hour', publish_at: Time.current.to_i })
+      MessageBus.publish("/logs_error_rate_exceeded", rate: rate, duration: 'hour', publish_at: Time.current.to_i)
     end
   end
 end
diff --git a/config/initializers/100-onebox_options.rb b/config/initializers/100-onebox_options.rb
index fadcc49228..55ba15ddf6 100644
--- a/config/initializers/100-onebox_options.rb
+++ b/config/initializers/100-onebox_options.rb
@@ -2,6 +2,6 @@ require_dependency 'twitter_api'
 
 Onebox.options = {
   twitter_client: TwitterApi,
-  redirect_limit: 1,
+  redirect_limit: 3,
   user_agent: "Discourse Forum Onebox v#{Discourse::VERSION::STRING}"
 }
diff --git a/config/initializers/100-quiet_logger.rb b/config/initializers/100-quiet_logger.rb
index 55c0dfcb4c..e4106607c2 100644
--- a/config/initializers/100-quiet_logger.rb
+++ b/config/initializers/100-quiet_logger.rb
@@ -2,11 +2,10 @@ Rails.application.config.assets.configure do |env|
   env.logger = Logger.new('/dev/null')
 end
 
-Rails::Rack::Logger.class_eval do
-  def call_with_quiet_assets(env)
-
+module DiscourseRackQuietAssetsLogger
+  def call(env)
     override = false
-    if (env['PATH_INFO'].index("/assets/") == 0) or
+    if (env['PATH_INFO'].index("/assets/") == 0) ||
        (env['PATH_INFO'].index("mini-profiler-resources") == 0)
       if ::Logster::Logger === Rails.logger
         override = true
@@ -14,11 +13,12 @@ Rails::Rack::Logger.class_eval do
       end
     end
 
-    call_without_quiet_assets(env).tap do
+    super(env).tap do
       if override
         Rails.logger.override_level = nil
       end
     end
   end
-  alias_method_chain :call, :quiet_assets
 end
+
+Rails::Rack::Logger.prepend DiscourseRackQuietAssetsLogger
diff --git a/config/initializers/100-rails3_ar_after_commit_tests.rb b/config/initializers/100-rails3_ar_after_commit_tests.rb
deleted file mode 100644
index d8d8caed85..0000000000
--- a/config/initializers/100-rails3_ar_after_commit_tests.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# Allow after commits to work in test mode
-if Rails.env.test?
-
-  class ActiveRecord::Base
-    class << self
-      def after_commit(*args, &block)
-        opts = args.extract_options! || {}
-
-        case opts[:on]
-        when :create
-          after_create(*args, &block)
-        when :update
-          after_update(*args, &block)
-        when :destroy
-          after_destroy(*args, &block)
-        else
-          after_save(*args, &block)
-        end
-      end
-    end
-  end
-
-end
diff --git a/config/initializers/100-sidekiq.rb b/config/initializers/100-sidekiq.rb
index 515898fb01..a45ec085f7 100644
--- a/config/initializers/100-sidekiq.rb
+++ b/config/initializers/100-sidekiq.rb
@@ -23,9 +23,9 @@ 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
+      manager = Scheduler::Manager.new($redis.without_namespace)
       Scheduler::Manager.discover_schedules.each do |schedule|
         manager.ensure_schedule!(schedule)
       end
@@ -35,7 +35,7 @@ if Sidekiq.server?
             manager.tick
           rescue => e
             # the show must go on
-            Discourse.handle_job_exception(e, {message: "While ticking scheduling manager"})
+            Discourse.handle_job_exception(e, message: "While ticking scheduling manager")
           end
           sleep 1
         end
diff --git a/config/initializers/100-verify_config.rb b/config/initializers/100-verify_config.rb
index c0c0a8965a..2d91431db6 100644
--- a/config/initializers/100-verify_config.rb
+++ b/config/initializers/100-verify_config.rb
@@ -1,6 +1,6 @@
 # Check that the app is configured correctly. Raise some helpful errors if something is wrong.
 
-if defined?(Rails::Server) and Rails.env.production? # Only run these checks when starting up a production server
+if defined?(Rails::Server) && Rails.env.production? # Only run these checks when starting up a production server
 
   if ['localhost', 'production.localhost'].include?(Discourse.current_hostname)
     puts <<END
@@ -16,7 +16,7 @@ END
     raise "Invalid host_names in database.yml"
   end
 
-  if !Dir.glob(File.join(Rails.root,'public','assets','application*.js')).present?
+  if !Dir.glob(File.join(Rails.root, 'public', 'assets', 'application*.js')).present?
     puts <<END
 
       Assets have not been precompiled. Please run the following command
diff --git a/config/initializers/200-message_bus_request_tracker.rb b/config/initializers/200-message_bus_request_tracker.rb
index 203c8d2711..dd58419e15 100644
--- a/config/initializers/200-message_bus_request_tracker.rb
+++ b/config/initializers/200-message_bus_request_tracker.rb
@@ -1,8 +1,13 @@
 # we want MesageBus in the absolute front
 # this is important cause the vast majority of web requests go to it
 # this allows us to avoid full middleware crawls each time
-Rails.configuration.middleware.delete MessageBus::Rack::Middleware
-Rails.configuration.middleware.unshift MessageBus::Rack::Middleware
+# Pending https://github.com/rails/rails/pull/27936
+session_operations = Rails::Configuration::MiddlewareStackProxy.new([
+   [:delete, MessageBus::Rack::Middleware],
+   [:unshift, MessageBus::Rack::Middleware],
+])
+
+Rails.configuration.middleware = Rails.configuration.middleware + session_operations
 
 # no reason to track this in development, that is 300+ redis calls saved per
 # page view (we serve all assets out of thin in development)
@@ -10,4 +15,3 @@ if Rails.env != 'development' || ENV['TRACK_REQUESTS']
   require 'middleware/request_tracker'
   Rails.configuration.middleware.unshift Middleware::RequestTracker
 end
-
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 3879d9e80e..e6ac8182f4 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -10,9 +10,10 @@ ar:
     number:
       format:
         separator: "."
+        delimiter: "’"
       human:
         storage_units:
-          format: '%n% u'
+          format: '%n %u'
           units:
             byte:
               zero: بايت
@@ -44,11 +45,11 @@ ar:
       long_date_with_year_with_linebreak: "D MMM YYYY <br/>LT"
       wrap_ago: "منذ %{date}"
       tiny:
-        half_a_minute: "< 1دق"
+        half_a_minute: "< دقيقة"
         less_than_x_seconds:
-          zero: "< %{count}ث"
-          one: "< %{count}ث"
-          two: "< %{count}ث"
+          zero: "< 0 ثانية"
+          one: "< 1 ثانية"
+          two: "< ثانيتين"
           few: "< %{count}ث"
           many: "< %{count}ث"
           other: "< %{count}ث"
@@ -60,19 +61,19 @@ ar:
           many: "%{count}ث"
           other: "%{count}ث"
         x_minutes:
-          zero: "%{count}دق"
-          one: "%{count}دق"
-          two: "%{count}دق"
-          few: "%{count}دق"
-          many: "%{count}دق"
-          other: "%{count}دق"
+          zero: "%{count}د"
+          one: "%{count}د"
+          two: "%{count}د"
+          few: "%{count}د"
+          many: "%{count}د"
+          other: "%{count}د"
         about_x_hours:
-          zero: "%{count}سا"
-          one: "%{count}سا"
-          two: "%{count}سا"
-          few: "%{count}سا"
-          many: "%{count}سا"
-          other: "%{count}سا"
+          zero: "%{count}س"
+          one: "%{count}س"
+          two: "%{count}س"
+          few: "%{count}س"
+          many: "%{count}س"
+          other: "%{count}س"
         x_days:
           zero: "%{count}ي"
           one: "%{count}ي"
@@ -81,26 +82,26 @@ ar:
           many: "%{count}ي"
           other: "%{count}ي"
         about_x_years:
-          zero: "%{count}س"
-          one: "%{count}س"
-          two: "%{count}س"
-          few: "%{count}س"
-          many: "%{count}س"
-          other: "%{count}س"
+          zero: "%{count}ع"
+          one: "%{count}ع"
+          two: "%{count}ع"
+          few: "%{count}ع"
+          many: "%{count}ع"
+          other: "%{count}ع"
         over_x_years:
-          zero: "> %{count}س"
-          one: "> %{count}س"
-          two: "> %{count}س"
-          few: "> %{count}س"
-          many: "> %{count}س"
-          other: "> %{count}س"
+          zero: "> %{count}ع"
+          one: "> %{count}ع"
+          two: "> %{count}ع"
+          few: "> %{count}ع"
+          many: "> %{count}ع"
+          other: "> %{count}ع"
         almost_x_years:
-          zero: "%{count}س"
-          one: "%{count}س"
-          two: "%{count}س"
-          few: "%{count}س"
-          many: "%{count}س"
-          other: "%{count}س"
+          zero: "%{count}ع"
+          one: "%{count}ع"
+          two: "%{count}ع"
+          few: "%{count}ع"
+          many: "%{count}ع"
+          other: "%{count}ع"
         date_month: "[في] D MMM"
         date_year: "[في] MMM YYYY"
       medium:
@@ -164,76 +165,83 @@ ar:
           many: "بعد %{count} شهرا"
           other: "بعد %{count} شهر"
         x_years:
-          zero: "بعد أقل من سنة"
-          one: "بعد سنة واحدة"
-          two: "بعد سنتين"
-          few: "بعد %{count}  سنوات"
-          many: "بعد %{count}  سنة"
-          other: "بعد %{count}  سنة"
+          zero: "بعد أقل من عام"
+          one: "بعد عام واحدة"
+          two: "بعد عامين"
+          few: "بعد %{count}  عام"
+          many: "بعد %{count}  عام"
+          other: "بعد %{count} عام"
       previous_month: 'الشهر السابق'
       next_month: 'الشهر التالي'
-      placeholder: انتقِ تاريخًا
+      placeholder: التاريخ
     share:
       topic: 'شارك رابط هذا الموضوع'
-      post: 'المشاركة رقم %{postNumber}'
+      post: 'المنشور رقم %{postNumber}'
       close: 'أغلق'
-      twitter: 'شارك هذا الرابط في تويتر'
-      facebook: 'شارك هذا الرابط في فيس بوك'
-      google+: 'شارك هذا الرابط في جوجل+'
-      email: 'شارك هذا الرابط في بريد إلكتروني'
+      twitter: 'شارك هذا الرابط علي تويتر'
+      facebook: 'شارك هذا الرابط علي الفيسبوك'
+      google+: 'شارك هذا الرابط علي جوجل+'
+      email: 'شارك هذا الرابط علي بريد إلكتروني'
     action_codes:
-      public_topic: "جعل هذا الموضوع عامًّا %{when}"
+      public_topic: "أجعل هذا الموضوع عامًّا %{when}"
       private_topic: "جعل هذا الموضوع خاصًّا %{when}"
       split_topic: "قسَم هذا الموضوع %{when}"
-      invited_user: "دعى %{who} %{when}"
-      invited_group: "دعى %{who} %{when}"
-      removed_user: "أزال %{who} %{when}"
-      removed_group: "أزال %{who} %{when}"
+      invited_user: "دُعي %{who} %{when}"
+      invited_group: "دُعي %{who} %{when}"
+      removed_user: "اُقصي %{who} %{when}"
+      removed_group: "اُقصي %{who} %{when}"
       autoclosed:
         enabled: 'أُغلق %{when}'
         disabled: 'فُتح %{when}'
       closed:
-        enabled: 'أغلقه %{when}'
-        disabled: 'فتحه %{when}'
+        enabled: 'أغلق %{when}'
+        disabled: 'فُتح %{when}'
       archived:
-        enabled: 'أرشفه %{when}'
-        disabled: 'أزال أرشفته %{when}'
+        enabled: 'أُرشف %{when}'
+        disabled: 'أُزال أرشفتة %{when}'
       pinned:
-        enabled: 'ثبّته %{when}'
-        disabled: 'أزال تثبيته %{when}'
+        enabled: 'ثُبت %{when}'
+        disabled: 'أُزال تثبيته %{when}'
       pinned_globally:
-        enabled: 'ثبّته عموميا %{when}'
-        disabled: 'أزال تثبيته %{when}'
+        enabled: 'ثُبّته عموميا %{when}'
+        disabled: 'أُزال تثبيته %{when}'
       visible:
-        enabled: 'أدرجه %{when}'
-        disabled: 'أزال إدراجه %{when}'
-    topic_admin_menu: "عمليات المدير"
-    wizard_required: "مرحبًا في دسكورس الجديد! فلنبدأ مستخدمين <a href='%{url}' data-auto-route='true'>مرشد الإعداد</a> ✨"
+        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 ساعة القادمة"
+    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: "الصين (بكين)"
-    edit: 'عدّل عنوان هذا الموضوع وفئته'
-    not_implemented: "لم تُنجز هذه الميزة بعد، نأسف."
+        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: "لا"
     yes_value: "نعم"
     generic_error: "نأسف، حدث عطل ما."
     generic_error_with_reason: "حدث عطل ما: %{error}"
-    sign_up: "سجّل حسابا"
+    sign_up: "أنشأ حسابا"
     log_in: "تسجل الدخول"
     age: "العمر"
     joined: "انضم في"
@@ -248,9 +256,9 @@ ar:
       two: "الروابط"
       few: "الروابط"
       many: "الروابط"
-      other: "الروابط"
+      other: "روابط"
     faq: "الأسئلة الشائعة"
-    guidelines: "توجيهات "
+    guidelines: "القواعد العامة"
     privacy_policy: "سياسة الخصوصية "
     privacy: "الخصوصية "
     terms_of_service: "شروط الخدمة"
@@ -277,47 +285,47 @@ ar:
       two: "محرفان"
       few: "{{count}} محارف"
       many: "{{count}} محرفا"
-      other: "{{count}} محرف"
+      other: "{{count}} حرف"
     suggested_topics:
-      title: "مواضيع مقترحة"
+      title: "الموضوعات المقترحة"
       pm_title: "رسائل مقترحة "
     about:
       simple_title: "عنّا"
       title: "عن %{title}"
-      stats: "إحصائيات الموقع "
-      our_admins: "مدراؤنا"
-      our_moderators: "مشرفونا"
+      stats: "إحصاءات الموقع "
+      our_admins: "المدراء"
+      our_moderators: "المشرفين"
       stat:
-        all_time: "يوم التأسيس"
+        all_time: "منذ التأسيس"
         last_7_days: "آخر 7 أيام "
         last_30_days: "آخر 30 يوما"
       like_count: "الإعجابات"
-      topic_count: "المواضيع"
-      post_count: "المشاركات"
-      user_count: "المستخدمون"
-      active_user_count: "المستخدمون النشطون"
+      topic_count: "الموضوعات"
+      post_count: "المنشورات"
+      user_count: "الأعضاء"
+      active_user_count: "الأعضاء النشطون"
       contact: "اتصل بنا"
       contact_info: "في حال حدوث مشكلة حرجة أو أمر عاجل يؤثّر على الموقع، من فضلك راسلنا على %{contact_info}."
     bookmarked:
-      title: "علّم"
-      clear_bookmarks: "أزل العلامة"
+      title: "ضع علامة مرجعية"
+      clear_bookmarks: "أزل العلامات المرجعية"
       help:
-        bookmark: "انقر لتعليم أوّل مشاركة في هذا الموضوع"
-        unbookmark: "انقر لإزالة كلّ العلامات في هذا الموضوع"
+        bookmark: "انقر لوضع علامة مرجعية علي أوّل منشور في هذا الموضوع"
+        unbookmark: "انقر لإزالة كلّ العلامات المرجعية في هذا الموضوع"
     bookmarks:
-      not_logged_in: "نأسف، عليك الدخول لتعليم المشاركات"
-      created: "لقد علّمت هذه المشاركة"
-      not_bookmarked: "لقد قرأتَ هذه المشاركة، انقر لتعليمها"
-      last_read: "هذا آخر مشاركة قرأتها، انقر لتعليمها"
-      remove: "أزل العلامة"
-      confirm_clear: "أمتأكّد من إزالة كلّ العلامات في هذا الموضوع؟"
+      not_logged_in: "عذرا، عليك تسجيل الدخول لتضع علامات مرجعية علي المنشورات"
+      created: "لقد وضعت علامة مرجعية علي هذا المنشور"
+      not_bookmarked: "لقد قرأت هذا المنشور، انقر لوضع علامة مرجعية علية"
+      last_read: "هذا آخر منشور قرأته، انقر لوضع علامة مرجعية علية"
+      remove: "أزل العلامة المرجعية"
+      confirm_clear: "أمتأكد من إزالة كل العلامات لمرجعية من هذا الموضوع؟"
     topic_count_latest:
       zero: "لا مواضيع جديدة أو محدّثة."
       one: "موضوع واحد جديد أو محدّث."
       two: "موضوعان جديدان أو محدّثان."
       few: "{{count}} مواضيع جديدة أو محدّثة."
       many: "{{count}} موضوعا جديدا أو محدّثا."
-      other: "{{count}} موضوع جديد أو محدّث."
+      other: "{{count}} موضوع جديد أو محدث."
     topic_count_unread:
       zero: "لا مواضيع غير مقروءة"
       one: "موضوع واحد غير مقروء."
@@ -351,11 +359,11 @@ ar:
     switch_from_anon: "اخرج من وضع التّخفي"
     banner:
       close: "تجاهل هذا الإعلان."
-      edit: "حرر هذا الإعلان >>"
+      edit: "عدل هذا الإعلان >>"
     choose_topic:
-      none_found: "لا مواضيع."
+      none_found: "لم نجد اي موضوعات."
       title:
-        search: "ابحث عن موضوع باسمه أو عنوانه أو معرّفه:"
+        search: "أبحث عن موضوع بالعنوان أو الـ URL أو الـ Id:"
         placeholder: "اكتب عنوان الموضوع هنا"
     queue:
       topic: "الموضوع:"
@@ -363,29 +371,29 @@ ar:
       reject: 'ارفض'
       delete_user: 'احذف المستخدم'
       title: "تحتاج موافقة"
-      none: "لا مشاركات لمراجعتها."
-      edit: "حرر"
+      none: "لا يوجد منشورات تحتاج مراجعة."
+      edit: "عدّل"
       cancel: "ألغِ"
-      view_pending: "اعرض المشاركات المعلّقة"
+      view_pending: "اعرض المنشورات المعلّقة"
       has_pending_posts:
         zero: "ليس في هذا الموضوع <b>أيّة</b> مشاركات تحتاج مراجعة"
         one: "في هذا الموضوع <b>مشاركة واحدة</b> تحتاج مراجعة"
         two: "في هذا الموضوع <b>مشاركتين</b> تحتاج مراجعة"
         few: "في هذا الموضوع <b>{{count}}</b> مشاركات تحتاج مراجعة"
         many: "في هذا الموضوع <b>{{count}}</b> مشاركة تحتاج مراجعة"
-        other: "في هذا الموضوع <b>{{count}}</b> مشاركة تحتاج مراجعة"
+        other: "في هذا الموضوع <b>{{count}}</b> منشور يحتاج إلي مراجعة"
       confirm: "احفظ التعديلات"
-      delete_prompt: "أمتأكد من حذف <b>%{username}</b>؟ ستُحذف كل مشاركاته وسيُمنع بريده الإلكتروني وعنوان IP."
+      delete_prompt: "أمتأكد من حذف <b>%{username}</b>؟ ستُحذف كل منشوراتة وسيُمنع بريده الإلكتروني وعنوان الـ IP."
       approval:
-        title: "المشاركة تحتاج موافقة"
-        description: "لقد وصلتنا مشاركتك لكنها تحتاج موافقة المشرف قبل ظهورها. نرجو منك الصبر."
+        title: "المنشور يحتاج موافقة"
+        description: "لقد وصلنا منشورك ولكنة يحتاج موافقة المشرف قبل ظهورها. نرجو منك الصبر."
         pending_posts:
           zero: "<strong>لا</strong> مشاركات معلّقة."
           one: "لديك <strong>مشاركة واحدة</strong> معلّقة."
           two: "لديك <strong>مشاركتين</strong> معلّقتين."
           few: "لديك <strong>{{count}}</strong> مشاركات معلّقة."
           many: "لديك <strong>{{count}}</strong> مشاركة معلّقة."
-          other: "لديك <strong>{{count}}</strong> مشاركة معلّقة."
+          other: "لديك <strong>{{count}}</strong> منشور معلّق."
         ok: "حسنا"
     user_action:
       user_posted_topic: "نشر <a href='{{userUrl}}'>{{user}}</a> <a href='{{topicUrl}}'>الموضوع</a>"
@@ -397,27 +405,27 @@ ar:
       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}}'>{{user}}</a>"
-      posted_by_you: "شاركتها <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}}'>{{user}}</a>"
       sent_by_you: "أرسلته <a href='{{userUrl}}'>أنت</a>"
     directory:
       filter_name: "رشّح باسم المستخدم"
       title: "الأعضاء"
       likes_given: "المعطاة"
-      likes_received: "المستلمة"
-      topics_entered: "المعروضة"
-      topics_entered_long: "المواضيع المعروضة"
+      likes_received: "المتلقاة"
+      topics_entered: "المُشاهدة"
+      topics_entered_long: "الموضوعات المُشاهدة"
       time_read: "وقت القراءة"
-      topic_count: "المواضيع"
-      topic_count_long: "المواضيع المنشأة"
+      topic_count: "الموضوعات"
+      topic_count_long: "الموضوعات المنشورة"
       post_count: "الردود"
       post_count_long: "الردود المنشورة"
       no_results: "لا نتائج."
       days_visited: "الزيارات"
       days_visited_long: "أيام الزيارة"
       posts_read: "المقروءة"
-      posts_read_long: "المشاركات المقروءة"
+      posts_read_long: "المنشورات المقروءة"
       total_rows:
         zero: "لا أعضاء"
         one: "عضو واحد"
@@ -428,7 +436,7 @@ ar:
     group_histories:
       actions:
         change_group_setting: "تغيير إعدادات المجموعة"
-        add_user_to_group: "إضافة مستخدم"
+        add_user_to_group: "إضافة عضو"
         remove_user_from_group: "حذف العضو"
         make_user_group_owner: "تعيين كمالك"
         remove_user_as_group_owner: "سحب صلاحية المالك"
@@ -447,51 +455,63 @@ ar:
         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_admission: "السماح للاعضاء بالانضمام إلى المجموعة بحرية (يتطلب أن تكون المجموعة مرئية للجميع )"
+      public_exit: "السماح للأعضاء بمغادرة المجموعة بحرية"
       empty:
-        posts: "لا مشاركات من أعضاء هذه المجموعة."
+        posts: "لا منشورات من أعضاء هذه المجموعة."
         members: "لا أعضاء في هذه المجموعة."
         mentions: "لم يُشِر أحد إلى هذه المجموعة."
         messages: "لا رسائل لهذه المجموعة."
-        topics: "لا مواضيع من أعضاء هذه المجموعة."
+        topics: "لا موضوعات من أعضاء هذه المجموعة."
         logs: "لا سجلّات لهذه المجموعة."
       add: "أضف"
-      join: "انضمّ للمجموعة"
+      join: "انضم للمجموعة"
       leave: "غادر المجموعة"
       request: "اطلب الانضمام للمجموعة"
+      message: "رسالة"
       automatic_group: مجموعة تلقائية
       closed_group: مجموعة مغلقة
       is_group_user: "أنت عضو في هذه المجموعة"
+      allow_membership_requests: "السماح للأعضاء بأرسال طلب انضمام لمدراء المجموعة"
+      membership_request_template: "لوحة مخصص تظهر للأعضاء عندما يرسلون طلب عضوية"
+      membership_request:
+        submit: "ارسل الطلب"
+        title: "اطلب الانضمام للمجموعة @%{group_name}"
+        reason: "دع مدراء المجموعة يعرفون لماذا انت تنتمي لهذه المجموعة"
       membership: "العضوية"
       name: "الاسم"
       user_count: "عدد اﻷعضاء"
       bio: "عن المجموعة"
       selector_placeholder: "أضف أعضاء"
       owner: "المالك"
-      visible: "المجموعة مرئية لكل المستخدمين"
       index:
         title: "المجموعات"
         empty: "لا توجد مجموعات ظاهرة"
       title:
-        zero: "المجموعة"
-        one: "المجموعة"
-        two: "المجموعتان"
+        zero: "مجموعة"
+        one: "مجموعة"
+        two: "مجموعتان"
         few: "المجموعات"
         many: "المجموعات"
         other: "المجموعات"
-      activity: "النّشاط"
+      activity: "النشاط"
       members: "الأعضاء"
-      topics: "المواضيع"
-      posts: "المشاركات"
+      topics: "الموضوعات"
+      posts: "المنشورات"
       mentions: "الإشارات"
       messages: "الرسائل"
+      notification_level: "المستوى الأفتراضي لإشعارات رسائل المجموعة"
+      visibility_levels:
+        title: "من يستطيع رؤية هذه المجموعة؟"
+        public: "الكل"
+        members: "مالكي المجموعة و الأعضاء و المديرين"
+        staff: "مالكي المجموعة و طاقم العمل"
+        owners: "مالكي المجموعة و المديرين"
       alias_levels:
-        title: "مَن يمكنه مراسلة هذه المجموعة و@الإشارة إليها؟"
+        mentionable: "من يستطيع @الاشارة الى هذه المجموعة؟"
+        messageable: "من يستطيع ارسال رسالة الى هذه المجموعة؟"
         nobody: "لا أحد"
         only_admins: "المدراء فقط"
         mods_and_admins: "المدراء والمشرفون فقط"
@@ -502,34 +522,34 @@ ar:
         none: "لا شيء"
       notifications:
         watching:
-          title: "جاري المشاهدة"
-          description: "سنرسل لك إشعارا عن كل مشاركة لكل رسالة، كما وسترى عددًا من الردود الجديدة."
+          title: "مُراقب"
+          description: "سنرسل لك إشعارا عن كل منشور جديد في كل رسالة، وسترى عداد للردود الجديدة."
         watching_first_post:
-          title: "المراقبة فيها أول مشاركة"
-          description: "سنرسل لك إشعارا فقط لأول مشاركة في كل موضوع جديد في هذه المجموعة."
+          title: "مراقبة اول منشور"
+          description: "سنرسل لك إشعارا لاول منشور فقط في كل موضوع في هذة المجموعة."
         tracking:
-          title: "جاري المتابعة"
-          description: "سنرسل لك إشعارا إن أشار أحد إلى اسمك أو ردّ عليك، كما ويترى عددًا من الردود الجديدة."
+          title: "مُتابع"
+          description: "سنرسل لك إشعارا إن أشار أحد إلى @اسمك أو ردّ عليك، وستري عداد للردود الجديدة."
         regular:
-          title: "طبيعي"
+          title: "عادي"
           description: "سنرسل لك إشعارا إن أشار أحد إليك أو ردّ عليك."
         muted:
           title: "مكتوم"
           description: "لن نرسل لك أي إشعار لأي من المواضيع الجديدة في هذه المجموعة."
       flair_url: "الصورة الرمزية المميزة"
-      flair_url_placeholder: "(إختياري) رابط الصورة أو صنف Font Awesome"
-      flair_bg_color: "خلفية الصورة الرمزية المميزة"
-      flair_bg_color_placeholder: "(إختياري) اللون برقم الهكس"
+      flair_url_placeholder: "(إختياري) عنوان الـ URL للصورة أو اسم رمز في Font Awesome"
+      flair_bg_color: "لون خلفية الصورة الرمزية"
+      flair_bg_color_placeholder: "(إختياري) اللون بترميز Hexadecimal"
       flair_color: "لون الصورة الرمزية"
-      flair_color_placeholder: "(إختياري) اللون برقم الهكس"
+      flair_color_placeholder: "(إختياري) اللون بترميز Hexadecimal"
       flair_preview_icon: "معاينة الأيقونة"
       flair_preview_image: "معاينة الصورة"
-      flair_note: "ملاحظة: الصورة المميزة تظهر فقط لمجموعة العضو الرئيسية."
+      flair_note: "ملحوظة: الصورة المميزة سوف تظهر فقط لمجموعة العضو الرئيسية."
     user_action_groups:
       '1': "الإعجابات المعطاة"
-      '2': "الإعجابات المستلمة"
-      '3': "العلامات"
-      '4': "المواضيع"
+      '2': "الإعجابات المتلقاة"
+      '3': "العلامات المرجعية"
+      '4': "الموضوعات"
       '5': "الردود"
       '6': "الردود"
       '7': "الإشارات"
@@ -540,21 +560,21 @@ ar:
       '14': "قيد الانتظار"
     categories:
       all: "كل الأقسام"
-      all_subcategories: "جميع"
+      all_subcategories: "الكل"
       no_subcategory: "لا شيء"
-      category: "القسم"
-      category_list: "أعرض قائمة الأقسام."
+      category: "قسم"
+      category_list: "أعرض قائمة الأقسام"
       reorder:
         title: "إعادة ترتيب الأقسام"
-        title_long: "إعادة تنظيم الأقسام"
-        fix_order: "تثبيت الأماكن"
-        fix_order_tooltip: "ليس كل الأقسام لديها رقم مكان فريد، ربما يسبب نتيجة غير متوقعة."
+        title_long: "إعادة تنظيم قائمة الأقسام"
+        fix_order: "ثبّت الترتيب"
+        fix_order_tooltip: "ليست كل الأقسام لديها رقم فريد لترتيبها في القائمة، ربما يتسبب هذا في نتيجة غير متوقعة."
         save: "حفظ الترتيب"
         apply_all: "تطبيق"
         position: "مكان"
-      posts: "مشاركات"
-      topics: "المواضيع"
-      latest: "آخر"
+      posts: "المنشورات"
+      topics: "الموضوعات"
+      latest: "آخر الموضوعات"
       latest_by: "الاحدث بـ"
       toggle_ordering: "تبديل التحكم في الترتيب"
       subcategories: "أقسام فرعية"
@@ -573,117 +593,125 @@ ar:
         many: "%{count} موضوعًا جديدًا في ال%{unit} الماضي."
         other: "%{count} موضوع جديد في ال%{unit} الماضي."
     ip_lookup:
-      title: 'جدول العناوين '
+      title: جدول عناوين الIP
       hostname: اسم المضيف
-      location: الموقع
-      location_not_found: (غيرمعرف)
+      location: الموقع الجغرافي
+      location_not_found: (غير معرف)
       organisation: المنظمات
-      phone: هاتف
-      other_accounts: "حساب آخر بنفس العنوان"
-      delete_other_accounts: "حذف %{count}"
+      phone: الهاتف
+      other_accounts: "الحسابات الأخرى بعنوان IP هذا:"
+      delete_other_accounts: "أحذف %{count}"
       username: "إسم المستخدم"
       trust_level: "TL"
       read_time: "وقت القراءة"
-      topics_entered: " مواضيع شوهدت"
-      post_count: "# مشاركات"
+      topics_entered: " مواضيع فُتحت"
+      post_count: "# المنشورات"
       confirm_delete_other_accounts: "أمتأكد من حذف هذه الحسابات؟"
+      powered_by: "مقدم من قبل <a href='https://ipinfo.io'>ipinfo.io</a>"
     user_fields:
       none: "(إختر خيار )"
     user:
       said: "{{username}}:"
-      profile: "اللاحة"
+      profile: "الملف الشخصي"
       mute: "كتم"
       edit: "تعديل التفضيلات"
       download_archive:
-        button_text: "نزّل مشاركاتي"
-        confirm: "أمتأكّد من تنزيل مشاركاتك؟"
+        button_text: "تحميل الكل"
+        confirm: "أمتأكد من تحميل منشوراتك؟"
         success: "بدأ التحميل, سيتم إعلامك برسالة عند اكتمال العملية."
-        rate_limit_error: "يمكن تنزيل المشاركات مرّة واحدة يوميًّا فقط. رجاءً أعد المحاولة غدًا."
+        rate_limit_error: "يمكن تنزيل المنشورات مرة واحدة يوميا فقط. رجاء أعد المحاولة غدًا."
       new_private_message: "رسالة جديدة"
       private_message: "رسالة خاصة"
       private_messages: "الرسائل"
       activity_stream: "النّشاط"
       preferences: " التّفضيلات"
       expand_profile: "توسيع"
-      bookmarks: "العلامات"
+      bookmarks: "العلامات المرجعية"
       bio: "معلومات عنّي"
       invited_by: "مدعو بواسطة"
       trust_level: "مستوى الثقة"
       notifications: "الإشعارات"
-      statistics: "احصائيات"
+      statistics: "الأحصائيات"
       desktop_notifications:
         label: "إشعارات سطح المكتب"
         not_supported: "نأسف، لا يدعم المتصفّح الإشعارات."
         perm_default: "فعّل الإشعارات"
         perm_denied_btn: "رُفض التّصريح"
-        perm_denied_expl: "لقد رفضت تصريح عرض الإشعارات. اسمح بظهور الإشعارات وذلك من إعدادات المتصفّح."
+        perm_denied_expl: "لقد رفضت تصريح عرض الإشعارات. اسمح بظهور الإشعارات من إعدادات المتصفّح."
         disable: "عطّل الإشعارات"
         enable: "فعّل الإشعارات"
         each_browser_note: "ملاحظة: عليك تغيير هذا الإعداد في كل متصفح تستخدمه."
+      dismiss: 'تجاهل'
       dismiss_notifications: "تجاهل الكل"
-      dismiss_notifications_tooltip: "علّم كلّ الإشعارات غير المقروءة بمقروءة"
+      dismiss_notifications_tooltip: "اجعل كل الإشعارات مقروءة"
       first_notification: "إشعارك الأول! قم بالضغط عليه للبدء."
-      disable_jump_reply: "لا تنتقل إلى مشاركتي بعدما أردّ"
-      dynamic_favicon: "أظهر عدد المواضيع الجديدة/المحدّثة في أيقونة المتصفّح"
-      external_links_in_new_tab: "فتح الروابط الخارجية في ألسنة جديدة"
+      disable_jump_reply: "لا تنتقل إلى منشوري بعد النشر"
+      dynamic_favicon: "أظهر عدد الموضوعات الجديدة/المحدّثة في أيقونة المتصفح"
+      theme_default_on_all_devices: "اجعل هذة الواجهة افتراضية على جميع اجهزتي"
+      allow_private_messages: "السماح للأعضاء الاخرين بإرسال رسالة خاصة لي"
+      external_links_in_new_tab: "فتح الروابط الخارجية في تبويب جديد"
       enable_quoting: "فعل خاصية إقتباس النصوص المظللة"
-      change: "تغيير"
-      moderator: "{{user}} مشرف"
-      admin: "{{user}} مدير"
+      change: "غيّر"
+      moderator: "{{user}} هو مشرف"
+      admin: "{{user}} هو مدير"
       moderator_tooltip: "هذا المستخدم مشرف"
       admin_tooltip: "هذا المستخدم مدير"
-      blocked_tooltip: "هذا المستخدم محظور"
       suspended_notice: "هذا المستخدم موقوف حتى تاريخ  {{date}}"
+      suspended_permanently: "هذا العضو موقوف."
       suspended_reason: "السبب:"
-      github_profile: "غِت‌هَب"
+      github_profile: "Github"
       email_activity_summary: "ملخص النشاط"
       mailing_list_mode:
         label: "وضع القائمة البريدية"
         enabled: "فعّل وضع القائمة البريدية"
         instructions: |
-          يمحي هذا الإعداد إعداد "ملخص النشاط".<br />
-          هذه الرسائل لا تشمل المواضيع والفئات المكتومة.
-        individual: "أرسل لي بريدا لكل مشاركة جديدة"
-        individual_no_echo: "أرسل بريدًا لكلّ مشاركة جديدة عدا مشاركاتي"
-        many_per_day: "أرسل لي بريدا لكل مشاركة جديدة (تقريبا {{dailyEmailEstimate}} يوميا)"
-        few_per_day: "أرسل لي بريدا لكل مشاركة جديدة (تقريبا إثنتان يوميا)"
-      tag_settings: "الوسوم"
-      watched_tags: "المراقبة"
-      watched_tags_instructions: "ستراقب آليا كل مواضيع هذه الوسوم. ستصلك إشعارات للمشاركات والمواضيع الجديدة، وسيظهر أيضا عدّاد للمشاركات الجديدة بجانب الموضوع."
-      tracked_tags: "المتابعة"
-      tracked_tags_instructions: "ستتابع آليا كل مواضيع هذه الوسوم. سيظهر عدّاد للمشاركات الجديدة بجانب الموضوع."
-      muted_tags: "المكتومة"
-      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: "لن يتم إشعارك بأي جديد عن المواضيع الجديدة في هذه التصنيفات، ولن تظهر مواضيع هذه التصنيفات في قائمة المواضيع المنشورة مؤخراً."
-      delete_account: "حذف الحساب"
+          يطغي هذا الخيار علي خيار "ملخص الأنشطة".<br />
+          هذه الرسائل لا تشمل الموضوعات و الأقسام المكتومة.
+        individual: "أرسل لي رسالة لكل منشور جديد"
+        individual_no_echo: "أرسل رسالة لكل منشور جديد عدا منشوراتي"
+        many_per_day: "أرسل لي رسالة لكل منشور جديد (تقريبا {{dailyEmailEstimate}} يوميا)"
+        few_per_day: "أرسل لي رسالة لكل منشور جديد (تقريبا إثنتان يوميا)"
+      tag_settings: "الأوسمة"
+      watched_tags: "مراقب"
+      watched_tags_instructions: "ستراقب آليا كل الموضوعات التي تستخدم هذه الأوسمة. ستصلك إشعارات بالمنشورات و الموضوعات الجديدة، وسيظهر أيضا عدّاد للمنشورات الجديدة بجانب كل موضوع."
+      tracked_tags: "متابع"
+      tracked_tags_instructions: "ستتابع آليا كل الموضوعات التي تستخدم هذه الأوسمة. وسيظهر أيضا عدّاد للمنشورات الجديدة بجانب كل موضوع."
+      muted_tags: "مكتوم"
+      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: "لن يتم إشعارك بأي جديد عن الموضوعات الجديدة في هذا القسم، ولن تظهر موضوعات هذا القسم في قائمة الموضوعات المنشورة مؤخراً."
+      no_category_access: "كمشرف لديك صلاحيات وصول محدودة للأقسام, الحفظ معطل"
+      delete_account: "أحذف الحسابي"
       delete_account_confirm: "أمتأكّد من حذف حسابك للأبد؟ هذا إجراء لا عودة فيه!"
       deleted_yourself: "حُذف حسابك بنجاح."
       delete_yourself_not_allowed: "لا يمكنك حذف حسابك الآن. راسل أحد المدراء لحذف حسابك."
       unread_message_count: "الرسائل"
-      admin_delete: "حذف"
+      admin_delete: "أحذف"
       users: "الأعضاء"
       muted_users: "المكتومون"
-      muted_users_instructions: "تجاهل الإشعارات من هؤلاء المستخدمين."
-      muted_topics_link: "أظهر المواضيع المكتومة"
-      watched_topics_link: "أظهر المواضيع المراقبة"
-      automatically_unpin_topics: "ألغِ تثبيت المواضيع آليا عندما أصل إلى أسفلها."
-      apps: "برامج"
-      revoke_access: "توقيف صلاحيات الوصول"
-      undo_revoke_access: "رفع توقيف صلاحيات الوصول"
+      muted_users_instructions: "تجاهل الإشعارات من هؤلاء الأعضاء."
+      muted_topics_link: "أعرض الموضوعات المكتومة"
+      watched_topics_link: "أعرض الموضوعات المراقبة"
+      tracked_topics_link: "أعرض الموضوعات المتابعة"
+      automatically_unpin_topics: "ألغِ تثبيت الموضوعات آليا عندما أصل إلى آخرها."
+      apps: "تطبيقات"
+      revoke_access: "سحب صلاحيات الوصول"
+      undo_revoke_access: "ايقاف سحب صلاحيات الوصول"
       api_approved: "موافق عليه:"
-      theme: "السّم"
+      theme: "الواجهة"
       staff_counters:
-        deleted_posts: "حذف جميع المشاركات"
-        suspensions: "موقوف"
+        flags_given: "البلاغات المفيدة"
+        flagged_posts: "المنشورات المبلغ عنها "
+        deleted_posts: "المنشورات المحذوفة"
+        suspensions: "موقوفون"
         warnings_received: "تحذيرات"
       messages:
         all: "الكل"
@@ -691,58 +719,67 @@ ar:
         sent: "الصّادر"
         archive: "الأرشيف"
         groups: "مجموعاتي"
-        bulk_select: "إختيار رسائل"
+        bulk_select: "حدد الرسائل"
         move_to_inbox: "الذهاب إلى الرسائل الواردة"
         move_to_archive: "الارشيف"
         failed_to_move: "فشل في نقل الرسائل المحددة (ربما يكون اتصالك ضعيفاً)"
-        select_all: "إختيار الكل"
+        select_all: "تحديد الكل"
+      preferences_nav:
+        account: "الحساب"
+        profile: "الملف الشخصي"
+        emails: "البريد الإلكتروني"
+        notifications: "التنبيهات"
+        categories: "الأقسام"
+        tags: "الأوسمة"
+        interface: "واجهة المستخدم"
+        apps: "التطبيقات"
       change_password:
-        success: "(تم ارسال الرسالة)"
-        in_progress: "(يتم ارسال رسالة)"
+        success: "(تم إرسال الرسالة)"
+        in_progress: "(يتم إرسال الرسالة)"
         error: "(خطأ)"
-        action: "أرسل بريدًا لتصفير كلمة السّرّ"
-        set_password: " إعادة تعين الرمز السري"
-        choose_new: "اختر كلمة سرّ جديدة"
-        choose: "اختر كلمة سرّ"
+        action: "ارسل رسالة إعادة تعيين كلمة المرور"
+        set_password: " إعادة تعين كلمة المرور"
+        choose_new: "اختر كلمة المرور الجديدة"
+        choose: "اختر كلمة المرور"
       change_about:
-        title: "تعديل ملفي الشخصي"
+        title: "تعديل عني"
         error: "حدث عطل أثناء تغيير هذه القيمة."
       change_username:
         title: "تغيير اسم المستخدم"
-        confirm: "إن غيّرت اسم المستخدم فستعطب كلّ اقتباسات مشاركاتك إضافة إلى الإشارات إلى @اسمك. أواثق تمام الثّقة من ذلك؟"
-        taken: "نأسف، اسم المستخدم مأخوذ."
-        error: "حدث عطل أثناء تغيير اسم المستخدم."
-        invalid: "اسم المستخدم غير صالح. يمكنه احتواء الأرقام والأحرف فحسب"
+        confirm: "إن غيّرت اسم المستخدم ستتعطل كل الاقتباسات من منشوراتك و كل الاشارات إلي @اسمك. أواثق تمام الثّقة من ذلك؟"
+        taken: "عذرا، اسم المستخدم غير متاح."
+        invalid: "اسم المستخدم غير صالح. يمكنه احتواء احرف و ارقام انجليزية فحسب"
       change_email:
-        title: "غيّر البريد الإلكترونيّ"
-        taken: "نأسف، البريد الإلكترونيّ غير متوفّر."
-        error: "حدث عطل أثناء تغيير البريد الإلكترونيّ. لربّما هناك من يستخدم هذا العنوان بالفعل؟"
-        success: "لقد أرسلنا بريدا إلى هذا البريد. من فضلك اتّبع تعليمات التأكيد."
+        title: "غيّر البريد الإلكتروني"
+        taken: "عذرا، البريد الإلكتروني غير متوفر."
+        error: "حدث عطل أثناء تغيير البريد الإلكتروني. ربما هناك من يستخدم هذا العنوان بالفعل؟"
+        success: "لقد أرسلنا بريد إلكتروني إلى هذا العنوان. من فضلك اتّبع تعليمات التأكيد."
+        success_staff: "لقد قمنا بأرسال بريدا إلكتروني الى عنوانك الحالي, رجاء اتبع تعليمات التأكيد."
       change_avatar:
-        title: "غيّر صورة اللاحة"
-        gravatar: "<a href='//gravatar.com/emails' target='_blank'>غرافاتار/Gravatar</a>، من"
+        title: "غيّر صورة الملفك الشخصي"
+        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>، من"
         gravatar_title: "غير صورتك الشخصية على موقع  Gravatar's."
-        refresh_gravatar_title: "أنعش صورة غرافاتار"
-        letter_based: "صورة لاحة يصنعها النّظام"
-        uploaded_avatar: "تخصيص صورة"
-        uploaded_avatar_empty: "اضافة صورة "
-        upload_title: "رفع صورتك "
-        upload_picture: "رفع الصورة"
-        image_is_not_a_square: "تحذير: لقد قصصنا الصورة، إذ أن عرضها وارتفاعها لا يتطابقان."
-        cache_notice: "لقد غيّرت صورة ملفّك بنجاح، ولكنّها قد تأخذ وقتًا حتّى تظهر بسبب خبيئة المتصفّح."
+        refresh_gravatar_title: "حدث صورة Gravatar"
+        letter_based: "صورة الملف الشخصي الافتراضية"
+        uploaded_avatar: "صورة مخصصة"
+        uploaded_avatar_empty: "اضافة صورة مخصصة"
+        upload_title: "ارفع صورتك "
+        upload_picture: "ارفع صورة"
+        image_is_not_a_square: "تحذير: لقد قصصنا صورتك، لأن عرضها وارتفاعها غير متساويان."
+        cache_notice: "لقد غيّرت صورة الملفك الشخصي بنجاح، ولكن تحديث الصورة قد ياخد وقتا نتيجة تسجيل الصورة القديمة بالمتصفح."
       change_profile_background:
-        title: "خلفيّة اللاحة"
-        instructions: "سيتم وضع خلفية الحساب في المنتصف بعرض 850px"
+        title: "خلفية الملف الشخصي"
+        instructions: "سيتم وضع خلفية الملف الشخصي في المنتصف بعرض افتراضي يصل الى 850px"
       change_card_background:
-        title: "خلفية المستخدم"
-        instructions: "سيتم وضع الخلفية في المنتصف بعرض 590px"
+        title: "خلفية بطاقة العضو"
+        instructions: "سيتم وضع صورة الخلفية في المنتصف بعرض 590px"
       email:
         title: "البريد الإلكتروني"
         instructions: "لا يظهر للعموم"
         ok: "سنرسل لك بريدا للتأكيد"
         invalid: "من فضلك أدخل بريدا إلكترونيا صالحا"
         authenticated: "تم توثيق بريدك الإلكتروني بواسطة {{provider}}"
-        frequency_immediately: "سنرسل لك تذكير في حالة انك لم تقراً المشاركات التي ارسلناها لك سابقاً."
+        frequency_immediately: "سيتم ارسال رسالة الكترونية فورا في حال أنك لم تقرأ الرسائل السابقة التي كنا نرسلها لك."
         frequency:
           zero: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة."
           one: "سنراسلك على بريدك فقط في حال لم تزر الموقع منذ {{count}} دقيقة."
@@ -758,9 +795,9 @@ ar:
         ok: "يبدو اسمك جيدا"
       username:
         title: "اسم المستخدم"
-        instructions: "فريد دون مسافات وقصير"
+        instructions: "باللغة الإنجليزية و دون مسافات و قصير و غير مكرر"
         short_instructions: "يمكن للغير الإشارة إليك ب‍@{{username}}"
-        available: "اسم المستخدم متاح."
+        available: "اسم المستخدم متاح"
         not_available: "غير متاح. جرّب {{suggestion}} ؟"
         not_available_no_suggestion: "غير متاح"
         too_short: "اسم المستخدم قصير جدًّا"
@@ -769,69 +806,69 @@ ar:
         prefilled: "البريد الالكتروني مطابق لـ اسم المستخدم المسّجل."
       locale:
         title: "لغة الواجهة"
-        instructions: "لغة الواجهة الرّسومية. ستتغيّر عندما تُنعش الصّفحة."
+        instructions: "لغة واجهة المستخدم. ستتغيّر عندما تحدث الصفحة."
         default: "(الافتراضية)"
         any: "أي"
       password_confirmation:
-        title: "أعد كتابة كلمة السّرّ"
-      last_posted: "آخر مشاركة"
-      last_emailed: "أخر مراسلة"
+        title: "أعد كتابة كلمة المرور"
+      last_posted: "آخر منشور"
+      last_emailed: "اخر ما تم ارساله"
       last_seen: "كان هنا"
       created: "انضم"
-      log_out: "اخرج"
-      location: "الموقع"
+      log_out: "سجل خروج"
+      location: "الموقع الجغرافي"
       card_badge:
-        title: "شارة بطاقة المستخدم"
-      website: "موقع الكتروني"
-      email_settings: "البريد الإلكترونيّ"
+        title: "شارة بطاقة العضو"
+      website: "الموقع الكتروني"
+      email_settings: "البريد الإلكتروني"
       like_notification_frequency:
         title: "أرسل إشعارا عند الإعجاب"
         always: "دوما"
-        first_time_and_daily: "أول إعجاب بالمشاركة ويوميا"
-        first_time: "أول إعجاب بالمشاركة"
+        first_time_and_daily: "أول إعجاب بالمنشور يوميا"
+        first_time: "أول إعجاب بالمنشور"
         never: "أبدا"
       email_previous_replies:
-        title: "ضمّن الردود السابقة أسفل البُرد الإلكترونية"
+        title: "ضع الردود السابقة في نهاية الرسائل الإلكترونية"
         unless_emailed: "في حال لم تُرسل"
         always: "دائما"
         never: "أبدا"
       email_digests:
-        title: "إن لم أزر الموقع، أرسل إلي بريدا إلكترونيا يلخص المواضيع والردود الشعبية"
+        title: "إن لم أزر الموقع، أرسل إلي بريدا إلكترونيا يلخص الموضوعات والردود الشائعة"
         every_30_minutes: "كل 30 دقيقة"
         every_hour: "كل ساعة"
         daily: "يوميا"
         every_three_days: "كل ثلاثة أيام"
         weekly: "أسبوعيا"
         every_two_weeks: "كل أسبوعين"
-      include_tl0_in_digests: "في إيميلات تلخيص المحتوى إرفق مشاركات الأعضاء الجدد."
-      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: "اعتبر المواضيع جديدة إن"
+        label: "اعتبر الموضوعات جديدة لو"
         not_viewed: "لم أطالعها بعد"
         last_here: "تم إنشائها منذ اخر زيارة لي. "
         after_1_day: "أُنشئت في اليوم الماضي"
         after_2_days: "أُنشئت في اليومين الماضيين"
         after_1_week: "أُنشئت في الأسبوع الماضي"
         after_2_weeks: "أُنشئت في الأسبوعين الماضيين"
-      auto_track_topics: "تابع آليا المواضيع التي أدخلها"
+      auto_track_topics: "تابع آليا الموضوعات التي افتحها"
       auto_track_options:
         never: "أبدًا"
         immediately: "حالًا"
         after_30_seconds: "بعد 30 ثانية"
         after_1_minute: "بعد دقيقة واحدة"
         after_2_minutes: "بعد دقيقتين"
-        after_3_minutes: "بعد 3 دقائق"
-        after_4_minutes: "بعد 4 دقائق"
-        after_5_minutes: "بعد 5 دقائق"
+        after_3_minutes: "بعد ثلاث دقائق"
+        after_4_minutes: "بعد اربع دقائق"
+        after_5_minutes: "بعد خمس دقائق"
         after_10_minutes: "بعد 10 دقائق"
-      notification_level_when_replying: "إن شاركت في موضوع ما، اجعله"
+      notification_level_when_replying: "إذا نشرت في موضوع ما، اجعله"
       invited:
-        search: "نوع البحث عن الدعوات"
+        search: "اكتب للبحث عن الدعوات..."
         title: "الدّعوات"
         user: "المستخدمين المدعويين"
         sent: "تم الإرسال"
@@ -843,20 +880,24 @@ ar:
           few: "عرض الدعوات الأولية."
           many: "عرض الدعوات {{count}} الأولى."
           other: "عرض الدعوات  {{count}} الأولى."
-        redeemed: "دعوات مستخدمة"
+        redeemed: "دعوات محررة"
         redeemed_tab: "محررة"
         redeemed_tab_with_count: "({{count}}) محررة"
-        redeemed_at: "مستخدمة"
+        redeemed_at: "محررة"
         pending: "دعوات قيد الإنتضار"
         pending_tab: "قيد الانتظار"
         pending_tab_with_count: "معلق ({{count}})"
-        topics_entered: " مواضيع شُوهِدت"
-        posts_read_count: "مشاركات شُوهِدت"
+        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: "وقت القراءة"
@@ -864,24 +905,24 @@ ar:
         account_age_days: "عمر الحساب بالأيام"
         create: "أرسل دعوة"
         generate_link: "انسخ رابط الدعوة"
-        link_generated: "وُلّد رابط الدّعوة بنجاح!"
+        link_generated: "وُلّد رابط الدعوة بنجاح!"
         valid_for: "رابط الدعوة صالح للبريد الإلكترونيّ هذا فقط: %{email}"
         bulk_invite:
           none: "لم تدعُ أحدًا إلى هنا بعد. أرسل الدّعوات إمّا فرديّة، أو إلى مجموعة أشخاص عبر <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>رفع ملفّ CSV</a>."
-          text: "الدعوة من ملف"
+          text: "دعوة جماعية بواسطة ملف"
           success: "رُفع الملف بنجاح. سيصلك إشعارا عبر رسالة عند اكتمال العملية."
-          error: "نأسف، يجب أن يكون الملفّ بنسق CSV."
+          error: "عذرا، يجب أن يكون الملفّ بنسق CSV."
       password:
-        title: "كلمة السّرّ"
-        too_short: "كلمة السّرّ قصيرة جدًّا."
-        common: "كلمة السّرّ هذه شائعة."
-        same_as_username: "كلمة السّرّ تطابق اسم المستخدم."
-        same_as_email: "كلمة السّر تطابق البريد الإلكترونيّ."
-        ok: "تبدو كلمة السّر جيّدة."
-        instructions: "%{count} من المحارف على الأقلّ"
+        title: "كلمة المرور"
+        too_short: "كلمة المرور قصيرة جدًّا."
+        common: "كلمة المرور هذه شائعة."
+        same_as_username: "كلمة المرور تطابق اسم المستخدم."
+        same_as_email: "كلمة المرور تطابق البريد الإلكتروني."
+        ok: "تبدو كلمة المرور جيّدة."
+        instructions: "علي الأقل %{count} حرفا"
       summary:
         title: "ملخص"
-        stats: "إحصائيّات"
+        stats: "إحصائيات"
         time_read: "وقت القراءة"
         topic_count:
           zero: "عدد المواضيع المنشأة"
@@ -891,86 +932,72 @@ ar:
           many: "عدد المواضيع المنشأة"
           other: "عدد المواضيع المنشأة"
         post_count:
-          zero: "عدد المشاركات"
-          one: "عدد المشاركات"
-          two: "عدد المشاركات"
-          few: "عدد المشاركات"
-          many: "عدد المشاركات"
-          other: "عدد المشاركات"
-        likes_given:
-          zero: "ما أعطى من <i class='fa fa-heart'></i>"
-          one: "ما أعطى من <i class='fa fa-heart'></i>"
-          two: "ما أعطى من <i class='fa fa-heart'></i>"
-          few: "ما أعطى من <i class='fa fa-heart'></i>"
-          many: "ما أعطى من <i class='fa fa-heart'></i>"
-          other: "ما أعطى من <i class='fa fa-heart'></i>"
-        likes_received:
-          zero: "ما استقبل من <i class='fa fa-heart'></i>"
-          one: "ما استقبل من <i class='fa fa-heart'></i>"
-          two: "ما استقبل من <i class='fa fa-heart'></i>"
-          few: "ما استقبل من <i class='fa fa-heart'></i>"
-          many: "ما استقبل من <i class='fa fa-heart'></i>"
-          other: "ما استقبل من <i class='fa fa-heart'></i>"
+          zero: "المنشورات المنشأة"
+          one: "المنشورات المنشأة"
+          two: "المنشورات المنشأة"
+          few: "المنشورات المنشأة"
+          many: "المنشورات المنشأة"
+          other: "المنشورات المنشأة"
         days_visited:
           zero: "أيّام الزّيارة"
           one: "أيّام الزّيارة"
           two: "أيّام الزّيارة"
           few: "أيّام الزّيارة"
           many: "أيّام الزّيارة"
-          other: "أيّام الزّيارة"
+          other: "أيام الزيارة"
         posts_read:
-          zero: "المشاركات المقروءة"
-          one: "المشاركات المقروءة"
-          two: "المشاركات المقروءة"
-          few: "المشاركات المقروءة"
-          many: "المشاركات المقروءة"
-          other: "المشاركات المقروءة"
+          zero: "المنشورات المقروءة"
+          one: "المنشورات المقروءة"
+          two: "المنشورات المقروءة"
+          few: "المنشورات المقروءة"
+          many: "المنشورات المقروءة"
+          other: "المنشورات المقروءة"
         bookmark_count:
-          zero: "عدد العلامات"
-          one: "عدد العلامات"
-          two: "عدد العلامات"
-          few: "عدد العلامات"
-          many: "عدد العلامات"
-          other: "عدد العلامات"
+          zero: "العلامات المرجعية"
+          one: "العلامات المرجعية"
+          two: "العلامات المرجعية"
+          few: "العلامات المرجعية"
+          many: "العلامات المرجعية"
+          other: "العلامات المرجعية"
         top_replies: "أفضل الردود"
-        no_replies: "لا ردود بعد."
+        no_replies: "لا يوجد ردود بعد."
         more_replies: "ردود أخرى"
-        top_topics: "أفضل المواضيع"
-        no_topics: "لا مواضيع بعد."
-        more_topics: "مواضيع أخرى"
-        top_badges: "أفضل الشّارات"
-        no_badges: "لا شارات بعد."
+        top_topics: "أفضل الموضوعات"
+        no_topics: "لا يوجد موضوعات بعد."
+        more_topics: "موضوعات أخرى"
+        top_badges: "أفضل الشارات"
+        no_badges: "لا يوجد شارات بعد."
         more_badges: "شارات أخرى"
-        top_links: "أفضل الرّوابط"
-        no_links: "لا روابط بعد."
+        top_links: "أفضل الروابط"
+        no_links: "لا يوجد روابط بعد."
         most_liked_by: "أكثر المعجبين به"
         most_liked_users: "أكثر من أعجبه"
-        most_replied_to_users: "أكثر من رَدّ عليه"
-        no_likes: "لا إعجابات بعد."
-      associated_accounts: "جلسات الدخول"
+        most_replied_to_users: "أكثر من رد عليه"
+        no_likes: "لا يوجد إعجابات بعد."
+      associated_accounts: "تسجيلات الدخول"
       ip_address:
         title: "عنوان IP الأخير"
       registration_ip_address:
         title: "عنوان IP التسجيل"
       avatar:
-        title: "صورة اللاحة"
-        header_title: "اللاحة، والرّسائل، والعلامات والتّفضيلات"
+        title: "صورة الملف الشخصي"
+        header_title: "الملف الشخصي و  الرسائل و العلامات المرجعية و التفضيلات"
       title:
         title: "عنوان"
       filters:
         all: "الكل"
       stream:
-        posted_by: "ارسلت بواسطة"
+        posted_by: "نُشرت بواسطة"
         sent_by: " أرسلت بواسطة"
-        private_message: "رسالة خاصة"
-        the_topic: "موضوع جديد"
+        private_message: "رسالة"
+        the_topic: "الموضوع"
     loading: "يتم التحميل..."
     errors:
-      prev_page: "محاولة تحميل"
+      prev_page: "اثناء محاولة التحميل"
       reasons:
         network: "خطأ في الشبكة"
-        server: "خطأ في السيرفر"
-        forbidden: "غير مصرح"
+        server: "خطأ في الخادم"
+        forbidden: "الوصول غير مصرح"
         unknown: "خطأ"
         not_found: "الصفحة غير متوفرة"
       desc:
@@ -978,26 +1005,33 @@ ar:
         network_fixed: "أنت الآن متصل بالانترنت"
         server: "رمز الخطأ: {{status}}"
         forbidden: "ليس مسموحًا لك عرض هذا."
-        not_found: "آخ! حاول التّطبيق تحميل عنوان غير موجود."
+        not_found: "اوو! حاول التّطبيق تحميل عنوان غير موجود."
         unknown: "حدث خطب ما."
       buttons:
         back: "الرجوع"
         again: "أعد المحاولة"
-        fixed: "تحميل"
-    close: "اغلاق"
-    assets_changed_confirm: "حُدّث الموقع لتوّه. أتريد إنعاش الصّفحة ورؤية أحدث إصدارة؟"
-    logout: "لقد خرجت."
+        fixed: "حمل الصفحة"
+    close: "اغلق"
+    assets_changed_confirm: "حُدث الموقع لتوّه. أتريد تحديث الصفحة ورؤية أحدث إصدار؟"
+    logout: "لقد سجلت خروج."
     refresh: "تحديث"
     read_only_mode:
-      enabled: "هذا الموقع في وضع القراءة فقط. نأمل أن تتابع تصفّحه، ولكنّ الرّدّ، والإعجاب وغيرها من إجراءات معطّلة حاليًّا."
-      login_disabled: "الدخول معطّل في حال كان الموقع في وضع القراءة فقط."
-      logout_disabled: "الخروج معطّل في حال كان الموقع في وضع القراءة فقط."
-    too_few_topics_and_posts_notice: " يوجد حاليا<strong>%{currentTopics} / %{requiredTopics}</strong> المواضيع و <strong>%{currentPosts} / %{requiredPosts}</strong> المشاركات. "
-    too_few_topics_notice: "قم بإنشاء على الاقل 5 مواضيع عامة و %{posts} عامة للبدء بالمناقشة , المستخدمين الجدد لايمكن أن يحصلوا على مستوى الثقة حتى يكون هناك محتوى لهم , هذه الرسالة تظهر فقط للمدير"
-    too_few_posts_notice: "دعونا <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>الحصول على هذه المناقشة التي بدأت!</a> يوجد حاليا <strong>%{currentPosts} / %{requiredPosts}</strong> مشاركات. الزوار الجديدة بحاجة إلى بعض الأحاديث قراءة والرد عليها."
+      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}."
+      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:
+        zero: "خطا واحد / %{duration}"
+        one: "خطا واحد / %{duration}"
+        two: "%{count} خطا / %{duration}"
+        few: "%{count} خطا / %{duration}"
+        many: "%{count} خطا /%{duration}"
+        other: "%{count} خطا /%{duration}"
     learn_more: "اطّلع على المزيد..."
     all_time: 'المجموع'
     all_time_desc: 'عدد المواضيع المنشأة'
@@ -1008,11 +1042,12 @@ ar:
     week: 'أسبوع'
     week_desc: ' المواضيع التي كتبت خلال 7 أيام الماضية'
     day: 'يوم'
-    first_post: أوّل مشاركة
+    first_post: أوّل منشور
     mute: كتم
     unmute: إلغاء الكتم
-    last_post: آخر مشاركة
-    last_reply_lowercase: آخر ردّ
+    last_post: المُرسَلة
+    time_read: المقروءة
+    last_reply_lowercase: آخر رد
     replies_lowercase:
       zero: الردود
       one: الردود
@@ -1021,16 +1056,16 @@ ar:
       many: الردود
       other: الردود
     signup_cta:
-      sign_up: "إشترك"
+      sign_up: "إنشاء حساب"
       hide_session: "ذكرني غدا"
       hide_forever: "لا شكرا"
-      hidden_for_session: "لا بأس، سأسلك غدًا. يمكنك دومًا استخدام ’تسجل الدخول‘ لإنشاء حساب."
-      intro: "يا مرحبًا! :heart_eyes: يبدو أنّك مستمتع بقراءة هذا النّقاش، ولكنّك لم تسجّل حسابًا بعد."
-      value_prop: "عندما تنتهي من إنشاء الحساب، سترجع إلى حيث توقّفت، فنحن نتذكّر  دومًا المكان الذي توقّفت عنده. يمكنك أيضًا استقبال الإشعارات عبر الموقع والبريد الإلكترونيّ متى ما نُشرت مشاركات جديدة. ولا تنسَ إبداء إعجابك بتلك المشاركات التي تحبّها. :heartbeat:"
+      hidden_for_session: "لا بأس، سأسلك غدًا. يمكنك دوما استخدام 'تسجيل الدخول' لإنشاء حساب ايضا."
+      intro: "مرحبًا! :heart_eyes: يبدو أنك مستمتع بقراءة هذا النقاش، يمكنك إنشاء حساب و مشاركتهم اطراف الحديث."
+      value_prop: "عندما تنتهي من إنشاء الحساب، سنعيدك بالضبط إلي النقطه التي توقفت عندها و سوف تتلقي إشعارات هنا و عبر البريد الإلكتروني بكل رد جديد ينشر. و سيمكنك الإعجاب بالمنشورات :heartbeat:"
     summary:
-      enabled_description: "أنت تطالع ملخّصًا لهذا الموضوع، أي أكثر المشاركات الجديرة بالاهتمام حسب نظرة المجتمع."
-      description: "هناك <b>{{replyCount}}</b> من الرّدود."
-      description_time: "هناك <b>{{replyCount}}</b> من الرّدود، ووقت القراءة المتوقّع هو <b>{{readingTime}} من الدّقائق</b>."
+      enabled_description: "أنت تطالع ملخّصًا لهذا الموضوع، أي أكثر المنشورات الجديرة بالاهتمام حسب نظرة المجتمع."
+      description: "هناك <b>{{replyCount}}</b> من الردود."
+      description_time: "هناك <b>{{replyCount}}</b> من الردود، ووقت القراءة المتوقّع هو <b>{{readingTime}} من الدّقائق</b>."
       enable: 'لخّص هذا الموضوع'
       disable: 'أظهر كل المشاركات'
     deleted_filter:
@@ -1039,108 +1074,142 @@ ar:
       enable: "أخفِ المشاركات المحذوفة"
       disable: "أظهر المشاركات المحذوفة"
     private_message_info:
-      title: " رسالة خاصة"
+      title: "رسالة"
       invite: " إدعو اخرين"
       remove_allowed_user: "أمتأكّد من إزالة {{name}} من هذه الرّسالة؟"
       remove_allowed_group: "أمتأكّد من إزالة {{name}} من هذه الرّسالة؟"
     email: 'البريد الإلكتروني'
     username: 'اسم المستخدم'
     last_seen: 'كان هنا'
-    created: 'مكتوبة'
-    created_lowercase: 'الإنشاء'
-    trust_level: 'مستوى التقة'
-    search_hint: 'اسم المستخدم، أو بريد إلكترونيّ أو عنوان IP'
+    created: 'انشات'
+    created_lowercase: 'انشات'
+    trust_level: 'مستوى الثقة'
+    search_hint: 'اسم المستخدم أو البريد إلكتروني أو عنوان الـ IP'
     create_account:
       disclaimer: "التّسجيل يعني موافقتك على <a href='{{privacy_link}}'>سياسة الخصوصيّة</a> و<a href='{{tos_link}}'>بنود الخدمة</a>."
       title: "إنشاء حساب جديد"
-      failed: "حدث خطب ما. لربّما يكون البريد الإلكترونيّ مسجّلًا بالفعل. جرّب رابط نسيان كلمة السّرّ"
+      failed: "حدث خطب ما. لربّما يكون البريد الإلكتروني مسجلًا بالفعل. جرب رابط نسيان كلمة المرور"
     forgot_password:
       title: " إعادة تعيين كلمة المرور"
-      action: "نسيتُ كلمة السّرّ"
-      invite: "أدخل اسم المستخدم أو البريد الإلكترونيّ وسنرسل بريدًا لتصفير كلمة السّرّ."
-      reset: " إعادة تعين الرمز السري"
-      complete_username: "إن تطابق حساب ما مع اسم المستخدم <b>%{username}</b>، فيفترض أن تستلم قريبًا بريدًا به إرشادات تصفير كلمة السّرّ."
-      complete_email: "إن تطابق حساب ما مع <b>%{email}</b>، فيفترض أن تستلم قريبًا بريدًا به إرشادات تصفير كلمة السّرّ."
-      complete_username_found: "عثرنا على حساب يطابق اسم المستخدم <b>%{username}</b>. يفترض أن تستلم قريبًا بريدًا به إرشادات تصفير كلمة السّرّ."
-      complete_email_found: "عثرنا على حساب يطابق <b>%{email}</b>. يفترض أن تستلم قريبًا بريدًا به إرشادات تصفير كلمة السر."
-      complete_username_not_found: "لا حساب يطابق اسم المستخدم <b>%{username}</b>"
+      action: "نسيتُ كلمة المرور"
+      invite: "أدخل اسم المستخدم أو البريد الإلكتروني وسنرسل بريدًا لإعادة تعيين كلمة المرور."
+      reset: " إعادة تعين كلمة المرور"
+      complete_username: "إن تطابق حساب ما مع اسم المستخدم <b>%{username}</b>، يفترض أن تستلم قريبًا بريدًا به إرشادات إعادة تعيين كلمة المرور."
+      complete_email: "إن تطابق حساب ما مع <b>%{email}</b>، يفترض أن تستلم قريبًا بريدًا به إرشادات إعادة تعيين كلمة المرور."
+      complete_username_found: "عثرنا على حساب يطابق اسم المستخدم <b>%{username}</b>. يفترض أن تستلم قريبًا بريدًا به إرشادات إعادة تعيين كلمة المرور."
+      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: "المستخدم"
-      password: "كلمة السّرّ"
+      title: "تسجيل دخول"
+      username: "اسم المستخدم"
+      password: "كلمة المرور"
       email_placeholder: "البريد الإلكتروني أو اسم المستخدم"
       caps_lock_warning: "مفتاح Caps Lock مفعّل"
       error: "خطأ مجهول"
-      rate_limit: "رجاءً انتظر قبل أن تسجل الدخول مرّة أخرى."
-      blank_username_or_password: "رجاءً أدخل اسم المستخدم (أو البريد الإلكترونيّ) وكلمة السّرّ."
-      reset_password: 'صفّر كلمة السّرّ'
-      logging_in: "يلج..."
+      rate_limit: "رجاء انتظر قبل تسجيل دخول مرة أخرى."
+      blank_username_or_password: "رجاء أدخل اسم المستخدم أو البريد الإلكتروني و كلمة المرور."
+      reset_password: 'اعد تعيين كلمة المرور'
+      logging_in: "تسجيل دخول..."
       or: "أو "
-      authenticating: "يستوثق..."
-      awaiting_approval: "لم يوافق أيّ من أعضاء الطّاقم على حسابك بعد. سيُرسل إليك بريد حالما يتمّ ذلك."
-      requires_invite: "المَعذرة، الوصول لهذا الموقع خاص بالمدعويين فقط."
-      not_activated: "لا يمكنك الدخول بعد. لقد أرسلنا سابقًا بريدًا إلى <b>{{sentTo}}</b>. رجاء اتّبع الإرشادات فيه لتفعيل حسابك."
-      not_allowed_from_ip_address: "لا يمكنك الدخول من عنوان IP هذا."
-      admin_not_allowed_from_ip_address: "لا يمكنك تسجيل الدخول كمدير من عنوان IP هذا."
-      resend_activation_email: "انقر هنا لإرسال بريد التّفعيل مرّة أخرى."
-      sent_activation_email_again: "لقد أرسلنا بريد تفعيل آخر إلى <b>{{currentEmail}}</b>. قد يستغرق وصوله بضعة دقائق. تحقّق من فحص مجلّد السّخام."
-      to_continue: "رجاءً سجل دخولك"
-      preferences: "عليك تسجيل الدخول لتغيير تفضيلاتك الشّخصيّة."
-      forgot: "لا أذكر معلومات حسابي"
-      not_approved: "لم تتمّ الموافقة على حسابك بعد. سيصلك إشعار عبر البريد عندما يجهز لتسجل دخولك."
+      authenticating: "يوثق..."
+      awaiting_activation: "ما زال حسابك غير مفعّل، استخدم رابط نسيان كلمة المرور لإرسال بريد إلكتروني تفعيلي آخر."
+      awaiting_approval: "لم يوافق أي من أعضاء طاقم العمل على حسابك بعد. سيُرسل إليك بريد إلكتروني حالما يتمّ ذلك."
+      requires_invite: "عذرا، الدخول لهذا الموقع خاص بالمدعويين فقط."
+      not_activated: "لا يمكنك تسجيل دخول بعد. لقد أرسلنا سابقًا بريدًا إلى <b>{{sentTo}}</b>. رجاء اتّبع الإرشادات فيه لتفعيل حسابك."
+      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: "عليك تسجل الدخول لتغيير تفضيلاتك الشخصية."
+      forgot: "لا أتذكر معلومات حسابي"
+      not_approved: "لم تتمّ الموافقة على حسابك بعد. سيصلك إشعار عبر البريد عندما تكون مستعدا لتسجيل الدخول."
       google:
-        title: "عبر غوغل"
-        message: "يستوثق عبر غوغل (تأكّد من تعطيل مانعات المنبثقات)"
+        title: "عبر Google"
+        message: "تسجيل الدخول عبر Google (تأكد من السماح للـ pop up)"
       google_oauth2:
-        title: "عبر غوغل"
-        message: "يستوثق عبر غوغل (تأكّد من تعطيل مانعات المنبثقات)"
+        title: "عبر Google "
+        message: "تسجيل الدخول عبر Google (تأكد من السماح للـ pop up)"
       twitter:
-        title: "عبر تويتر"
-        message: "يستوثق عبر تويتر (تأكّد من تعطيل مانعات المنبثقات)"
+        title: "عبر Twitter"
+        message: "تسجيل الدخول عبر Twitter (تأكد من السماح للـ pop up)"
       instagram:
-        title: "عبر إنستغرام"
-        message: "يستوثق عبر إنستغرام (تأكّد من تعطيل مانعات المنبثقات)"
+        title: "عبر Instagram"
+        message: "تسجيل الدخول عبر Instagram (تأكد من السماح للـ pop up)"
       facebook:
-        title: "عبر فيس‌بوك"
-        message: "يستوثق عبر فيس‌بوك (تأكّد من تعطيل مانعات المنبثقات)"
+        title: "عبر Facebook"
+        message: "تسجيل الدخول عبر Facebook (تأكد من السماح للـ pop up)"
       yahoo:
-        title: "عبر ياهو"
-        message: "يستوثق عبر ياهو (تأكّد من تعطيل مانعات المنبثقات)"
+        title: "عبر Yahoo"
+        message: "تسجيل الدخول عبر Yahoo (تأكد من السماح للـ pop up)"
       github:
-        title: "عبر غِت‌هَب"
-        message: "يستوثق عبر غِت‌هَب (تأكّد من تعطيل مانعات المنبثقات)"
+        title: "عبر GitHub"
+        message: "تسجيل الدخول عبر GitHub (تأكد من السماح للـ pop up)"
     invites:
       accept_title: "دعوة"
       welcome_to: "مرحباً بك في %{site_name}!"
       invited_by: "لقد دعاك:"
-      social_login_available: "يمكنك أيضًا الدخول عبر أيّ شبكة اجتماعيّة مستخدمًا هذا البريد."
-      your_email: "بريدك الإلكتروني  <b>%{email}</b>."
+      social_login_available: "يمكنك أيضا تسجيل الدخول عبر أي شبكة اجتماعية مستخدما هذا البريد."
+      your_email: "البريد الالكتروني الخاص بحسابك هو  <b>%{email}</b>."
       accept_invite: "قُبول الدعوة "
-      success: "أُنشئ حسابك وقد سجلت الدخول الآن."
-      password_label: "تعيين رمز سري (اختياري)"
+      success: "تم إنشاء حسابك و تسجيل دخولك للموقع"
+      name_label: "الإسم"
+      password_label: "حدد كلمة المرور"
+      optional_description: "(إختياري)"
     password_reset:
       continue: "تابع نحو %{site_name}"
     emoji_set:
-      apple_international: "آبل/عالمي"
-      google: "غوغل"
-      twitter: "تويتر"
-      emoji_one: "إموجي واحد"
-      win10: "وندوز10"
+      apple_international: "Apple/International"
+      google: "Google"
+      twitter: "Twitter"
+      emoji_one: "Emoji One"
+      win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "الأقسام فقط"
-      categories_with_featured_topics: "أقسام ذات مواضيع متميزة"
-      categories_and_latest_topics: "الأقسام والمواضيع الاخيرة"
+      categories_with_featured_topics: "أقسام ذات مواضيع مُميزة"
+      categories_and_latest_topics: "الأقسام و الموضوعات الأخيرة"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: اختر...
+      no_content: لا يوجد نتائج مطابقة
+      filter_placeholder: بحث...
+    emoji_picker:
+      filter_placeholder: بحث عن الرموز التعبيرية
+      people: الاشخاص
+      nature: طبيعة
+      food: طعام
+      activity: نشاط
+      travel: سفر
+      objects: اشياء
+      celebration: احتفال
+      custom: الرموز التعبيرية المخصصة
+      recent: تم استخدامه مؤخراً
+      default_tone: لون البشرة إفتراضي
+      light_tone: لون البشرة أبيض
+      medium_light_tone: لون البشرة قمحي
+      medium_tone: لون بشرة اسمر
+      medium_dark_tone: لون البشرة اسمر قاتم
+      dark_tone: لون البشرة داكن
     composer:
-      emoji: "الإيموجي :)"
+      emoji: "الرموز التعبيرية :)"
       more_emoji: "أكثر..."
       options: "خيارات"
       whisper: "همس"
       unlist: "غير مدرج"
+      blockquote_text: "اقتبس الفقرة"
       add_warning: "هذا تحذير رسمي."
       toggle_whisper: "تبديل الهمس"
       toggle_unlisted: "تبديل الغير مدرج"
@@ -1156,42 +1225,50 @@ ar:
         two: "الإشارة إلى {{group}} تعني إخطار <a href='{{group_link}}'>شخصين</a>. أمتأكّد؟"
         few: "الإشارة إلى {{group}} تعني إخطار <a href='{{group_link}}'>{{count}} أشخاص</a>. أمتأكّد؟"
         many: "الإشارة إلى {{group}} تعني إخطار <a href='{{group_link}}'>{{count}} شخصًا</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}} حرف"
+        title_too_short: "العنوان يجب أن يكون علي الاقل {{min}} حرف"
+        title_too_long: "العنوان يجب أن لا يزيد عن {{max}} حرف"
+        post_missing: "لا يمكن أن يكون المنشور فارغ"
+        post_length: "المنشور يجب أن يكون علي الاقل {{min}} حرف"
         try_like: 'هل جرّبت زرّ <i class="fa fa-heart"></i>؟'
-        category_missing: "يجب اختيار احد الأقسام"
-      save_edit: "حفظ التحرير"
-      reply_original: "التعليق على الموضوع الاصلي"
+        category_missing: "يجب عليك إختيار احد الأقسام"
+      save_edit: "أحفظ التعديل"
+      reply_original: "التعليق على الموضوع الأصلي"
       reply_here: "الرد هنا"
       reply: "الرد"
       cancel: "إلغاء"
       create_topic: "إنشاء موضوع"
       create_pm: "رسالة"
       title: "أو اضغط Ctrl+Enter"
-      users_placeholder: "أضف مستخدما"
-      title_placeholder: "بجملة واحدة، ما الذي تود النقاش عنه؟"
+      users_placeholder: "أضف عضوا"
+      title_placeholder: "بجملة واحدة، صف ما الذي تود المناقشة فية؟"
       title_or_link_placeholder: "اكتب عنوانًا أو ألصق رابطًا"
-      edit_reason_placeholder: "لماذا تعدّل النص؟"
+      edit_reason_placeholder: "لماذا تقوم بالتعديل؟"
       show_edit_reason: "(أضف سبب التعديل)"
+      topic_featured_link_placeholder: "ضع رابطاً يظهر مع العنوان"
+      remove_featured_link: "حذف الرابط من الموضوع"
       reply_placeholder: "اكتب ما تريد هنا. استخدم Markdown، أو BBCode، أو HTML للتنسيق. اسحب الصور أو ألصقها."
-      view_new_post: "اعرض المشاركة الجديدة."
+      view_new_post: "شاهد منشورك الجديد."
       saving: "يحفظ"
       saved: "حُفظ!"
-      saved_draft: "ثمّة مسودّة لمشاركة. انقر لاستكمالها."
+      saved_draft: "ثمّة مسودّة للمنشور. انقر لاستكمالها."
       uploading: "يرفع..."
       show_preview: 'أظهر المعاينة &raquo;'
       hide_preview: '&laquo; أخفِ المعاينة'
       quote_post_title: "اقتبس كامل المشاركة"
+      bold_label: "B"
       bold_title: "عريض"
       bold_text: "نص عريض"
+      italic_label: "I"
       italic_title: "مائل"
       italic_text: "نص مائل"
-      link_title: "الرابط"
+      link_title: "رابط"
       link_description: "ادخل وصف الرابط هنا "
       link_dialog_title: "اضف الرابط"
       link_optional_text: "عنوان اختياري"
@@ -1200,67 +1277,81 @@ ar:
       quote_text: "اقتباس فقرة"
       code_title: "المحافظة على التنسيق"
       code_text: "اضف 4 مسافات اول السطر قبل النص المنسق"
-      paste_code_text: "اطبع أو الصق الكود هنا"
+      paste_code_text: "اكتب أو الصق الكود هنا"
       upload_title: "رفع"
       upload_description: "ادخل وصف الرفع هنا"
       olist_title: "قائمة مرقمة"
-      ulist_title: "قائمة "
+      ulist_title: "قائمة نقطية"
       list_item: "قائمة العناصر"
-      heading_title: "عنوان"
-      heading_text: "عنوان"
-      hr_title: "خط افقي"
       help: "مساعدة في رموز التنسيق"
-      toggler: "اخف او اظهر صندوق التحرير"
       modal_ok: "حسنا"
-      modal_cancel: "ألغِ"
-      cant_send_pm: "نأسف، لا يمكنك إرسال الرّسائل إلى %{username}."
+      modal_cancel: "إلغاء"
+      cant_send_pm: "نأسف، لا يمكنك إرسال الرسائل إلى %{username}."
       yourself_confirm:
         title: "أنسيت إضافة المستلمين؟"
         body: "حاليا هذة الرسالة مرسلة اليك فقط!"
-      admin_options_title: "إعدادات الطّاقم الاختياريّة لهذا الموضوع"
+      admin_options_title: "إعدادات طاقم العمل الاختيارية لهذا الموضوع"
     notifications:
-      title: "إشعارات الإشارات إلى @اسمك، والردود على مواضيعك ومشاركاتك، والرسائل، وغيرها"
+      title: "إشعارات الإشارة إلى @اسمك، والردود على موضوعاتك و منشوراتك ، والرسائل، وغيرها"
       none: "تعذّر تحميل الإشعارات الآن."
       empty: "لا إشعارات."
       more: "اعرض الإشعارات الأقدم من هذه"
-      mentioned: "<i title='إشارة إليك' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
-      group_mentioned: "<i title='إشارة إلى مجموعة' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
-      quoted: "<i title='اقتباس لكلامك' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      replied: "<i title='ردّ عليك' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='نشر' 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='إعجاب' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
-      liked_2: "<i title='إعجاب' class='fa fa-heart'></i><p><span>{{username}}، {{username2}}</span> {{description}}</p>"
-      private_message: "<i title='رسالة خاصّة' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_private_message: "<i title='رسالة خاصّة' 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> نقل{{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>"
+      total_flagged: "مجموع المنشورات المبلغ عنها"
+      mentioned: "<span>{{username}}</span>{{description}}"
+      group_mentioned: "<span>{{username}}</span>{{description}} "
+      quoted: "<span>{{username}}</span>{{description}} "
+      replied: "<span>{{username}}</span>{{description}} "
+      posted: "<span>{{username}}</span>{{description}} "
+      edited: "<span>{{username}}</span>{{description}} "
+      liked: "<span>{{username}}</span>{{description}} "
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      liked_many:
+        zero: "<span>{{username}}, {{username2}}</span> {{description}}"
+        one: "<span>{{username}}, {{username2}} و وواحد اخر</span> {{description}}"
+        two: "<span>{{username}}, {{username2}} و اثنين اخرون</span> {{description}}"
+        few: "<span>{{username}}, {{username2}} و {{count}} اخرون</span> {{description}}"
+        many: "<span>{{username}}, {{username2}} و {{count}} اخرون</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} و {{count}} اخرون</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> قبل دعوتك"
+      moved_post: "<span>{{username}}</span> نقل {{description}}"
+      linked: "<span>{{username}}</span>{{description}} "
+      granted_badge: "تم منحك شارة '{{description}}'"
+      topic_reminder: "<span>{{username}}</span>{{description}} "
+      watching_first_post: "<span>موضوع جديد</span> {{description}}"
+      group_message_summary:
+        zero: "لا يوجد رسائل في صندوق رسائل {{group_name}} "
+        one: "رسالة واحدة في صندوق رسائل {{group_name}} "
+        two: "{{count}} رسالة في صندوق رسائل {{group_name}} "
+        few: "{{count}} رسالة في صندوق رسائل {{group_name}} "
+        many: "{{count}} رسالة في صندوق رسائل {{group_name}} "
+        other: "{{count}} رسالة في صندوق رسائل {{group_name}} "
       alt:
-        mentioned: "مَن أشار إليك"
-        quoted: "مَن اقتبس كلامك"
+        mentioned: "أُشير إليك من"
+        quoted: "أُقتبس كلامك من"
         replied: "مجاب"
-        posted: "مشاركة بواسطة"
-        edited: "مَن عدّل مشاركتك"
-        liked: "أُعجب بمشاركتك"
+        posted: "منشور من"
+        edited: "تم تعديل منشورك من"
+        liked: "أُعجب بمنشورك"
         private_message: "رسالة خاصة من"
-        invited_to_private_message: "تمت الدعوة لرسالة خاصة من "
-        invited_to_topic: "تمت الدعوة لموضوع من "
-        invitee_accepted: "قبلت الدعوة بواسطة"
-        moved_post: "مشاركتك نقلت بواسطة"
-        linked: "رابط لمشاركتك"
+        invited_to_private_message: "تمت دعوتك لرسالة خاصة من "
+        invited_to_topic: "تمت دعوتك لموضوع من "
+        invitee_accepted: "قبلت دعوتك من"
+        moved_post: "منشورك نقل بواسطة"
+        linked: "وضع رابطا لمنشورك"
         granted_badge: "تم منح الوسام"
-        group_message_summary: "الرسائل في صندوق رسائل  المجموعه"
+        group_message_summary: "رسائل صندوق المجموعة"
+        topic_reminder: "تذكير"
       popup:
         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}}'
+        posted: 'نشر {{username}} في "{{topic}}" - {{site_title}}'
         private_message: 'أرسل {{username}} إليك رسالة خاصة في "{{topic}}" - {{site_title}}'
-        linked: '{{username}} رتبط بمشاركتك من "{{topic}}" - {{site_title}}'
+        linked: '{{username}} وضع رابطا لمنشورك في "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "أضف صورة"
       title_with_attachments: "أضف صورة أو ملفّ"
@@ -1270,75 +1361,76 @@ ar:
       remote_tip_with_attachments: "رابط لصورة أو ملف {{authorized_extensions}}"
       local_tip: "إختر صور من جهازك ."
       local_tip_with_attachments: "حدّد صورا أو ملفات من جهازك {{authorized_extensions}}"
-      hint: "(يمكنك أيضا السحب والإفلات على المحرر لرفعها)"
+      hint: "(يمكنك أيضا السحب والإفلات في المحرر لرفعها)"
       hint_for_supported_browsers: "يمكنك أيضا سحب وإفلات الصور أو لصقها في المحرر"
       uploading: "يرفع"
       select_file: "اختر ملفا"
-      image_link: "رابط ستشير له الصورة"
+      image_link: "رابط سيفتح عند الضغط علي الصورة"
+      default_image_alt_text: صورة
     search:
-      sort_by: "ترتيب حسب"
-      relevance: "أهمية"
-      latest_post: "آخر مشاركات"
+      sort_by: "رتب حسب"
+      relevance: "الملاءمة"
+      latest_post: "آخر المنشورات"
+      latest_topic: "آخر الموضوعات"
       most_viewed: "الأكثر مشاهدة"
       most_liked: "الأكثر إعجابا"
       select_all: "أختر الكل"
       clear_all: "إلغ إختيار الكل"
       too_short: "عبارة البحث قصيرة جدًّا."
-      result_count:
-        zero: "لا نتائج ل‍ <span class='term'>\"{{term}}\"</span>"
-        one: "نتيجة واحدة ل‍ <span class='term'>\"{{term}}\"</span>"
-        two: "نتيجتان ل‍ <span class='term'>\"{{term}}\"</span>"
-        few: "{{count}} نتائج ل‍ <span class='term'>\"{{term}}\"</span>"
-        many: "{{count}} نتيجة ل‍ <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} نتيجة ل‍ <span class='term'>\"{{term}}\"</span>"
-      title: "ابحث في المواضيع أو المشاركات أو المستخدمين أو الفئات"
-      no_results: "لا نتائج."
-      no_more_results: "لا نتائج أخرى."
+      title: "أبحث في الموضوعات أو المنشورات أو الأعضاء أو الأقسام"
+      no_results: "لا يوجد نتائج."
+      no_more_results: "لا يوجد نتائج أخرى."
       searching: "يبحث..."
       post_format: "#{{post_number}} كتبها {{username}}"
+      more_results: "يوجد عدد كبير من النتائج, يرجى تضييق نطاق البحث."
+      cant_find: "لا تستطيع ايجاد ما تبحث عنة؟"
+      start_new_topic: "افتح موضوع جديد."
+      or_search_google: "او حاول البحث باستخدام google:"
+      search_google: "حاول البحث باستخدام google:"
+      search_google_button: "جوجل"
+      search_google_title: "ابحث في هذا الموقع"
       context:
-        user: "ابحث عن مواضيع @{{username}}"
-        category: "ابحث في فئة #{{category}}"
+        user: "ابحث في منشورات @{{username}}"
+        category: "أبحث في قسم #{{category}}"
         topic: "ابحث في هذا الموضوع"
         private_messages: "البحث في الرسائل الخاصة"
       advanced:
         title: بحث متقدّم
         posted_by:
           label: نشرها
-        in_category:
-          label: في الفئة
         in_group:
           label: في المجموعة
         with_badge:
-          label: مع الشعارات
+          label: عليها شارة
         with_tags:
-          label: مع أوسمة
+          label: موسوم
         filters:
-          label: ابحث عن المواضيع والمشاركات التي...
           likes: أعجبتني
-          posted: شاركت فيها
+          posted: نشرت بها
           watching: أراقبها
           tracking: أتابعها
-          private: موجودة في رسائلي
-          bookmarks: علّمتُها
-          first: تلك المشاركة الاولى
-          seen: قرأتها
+          bookmarks: وضعت علية علامة مرجعية
+          first: اول منشور في الموضوعات
+          pinned: مثبتة
+          unpinned: غير مثبتة
+          seen: قراءته
           unseen: لم أقرأها
+          wiki: من النوع wiki
         statuses:
           label: بشرط أن تكون المواضيع
           open: مفتوحة
           closed: مغلقة
           archived: مؤرشفة
           noreplies: ليس فيها أيّ ردّ
-          single_user: تحتوي مستخدما واحدا
+          single_user: تحتوي عضوا واحدا
         post:
           count:
-            label: أدنى عدد للمشاركات
+            label: أدنى عدد للمنشورات
           time:
             label: المُرسَلة
             before: قبل
             after: بعد
-    hamburger_menu: "انتقل إلى قائمة مواضيع أو فئة أخرى"
+    hamburger_menu: "إنتقل إلى قائمة موضوعات أو قسم أخر."
     new_item: "جديد"
     go_back: 'الرجوع'
     not_logged_in_user: 'صفحة المستخدم مع ملخص عن نشاطه و إعداداته'
@@ -1348,20 +1440,23 @@ ar:
       bulk:
         select_all: "حدّد الكلّ"
         clear_all: "مسح الكل"
-        unlist_topics: "ازالة المواضيع من القائمة"
-        reset_read: "تصفير القراءات"
-        delete: "المواضيع المحذوفة"
-        dismiss: "أزل"
-        dismiss_read: "تجاهل المشاركات غير المقروءة"
+        unlist_topics: "ازل الموضوعات من القائمة"
+        relist_topics: "ادرج الموضوعات بالقائمة"
+        reset_read: "عين كغير مقروءة"
+        delete: "أحذف الموضوعات"
+        dismiss: "تجاهل"
+        dismiss_read: "تجاهل المنشورات غير المقروءة"
         dismiss_button: "تجاهل..."
-        dismiss_tooltip: "تجاهل فقط المشاركات الجديدة او توقف عن تتبع المواضيع"
-        also_dismiss_topics: "التوقف عن متابعه المواضيع حتي لا تظهر كغير مقروء مره اخرى "
-        dismiss_new: "أزل الجديد"
-        toggle: "إيقاف/تشغيل الاختيار المتعدد للمواضيع"
+        dismiss_tooltip: "تجاهل فقط المنشورات الجديدة او توقف عن تتبع الموضوعات"
+        also_dismiss_topics: "التوقف عن متابعه الموضوعات حتي لا تظهر كغير مقروءة مره اخرى "
+        dismiss_new: "تجاهل الجديد"
+        toggle: "إيقاف/تشغيل التحديد الكمي للموضوعات"
         actions: "عمليات تنفذ دفعة واحدة"
-        close_topics: "إغلاق المواضيع"
-        archive_topics: "أرشفة المواضيع"
-        choose_new_category: "اختر القسم الجديد للمواضيع:"
+        change_category: "حدد القسم"
+        close_topics: "إغلاق الموضوعات"
+        archive_topics: "أرشفة الموضوعات"
+        notification_level: "الاشعارات"
+        choose_new_category: "اختر القسم الجديد للموضوعات:"
         selected:
           zero: "لم تحدد شيئا."
           one: "حددت موضوع <b>واحد</b>."
@@ -1369,8 +1464,11 @@ ar:
           few: "حددت <b>{{count}}</b> مواضيع."
           many: "حددت <b>{{count}}</b> موضوعا."
           other: "حددت <b>{{count}}</b> موضوع."
-        choose_new_tags: "اختر وسوم جديدة لهذه المواضيع:"
-        changed_tags: "تغيرت وسوم هذه المواضيع."
+        change_tags: "غيّر الأوسمة"
+        append_tags: "اضف الأوسمة"
+        choose_new_tags: "اختر أوسمة جديدة لهذه الموضوعات:"
+        choose_append_tags: "اختر أوسمة جديدة لإضافتها لهذة الموضوعات"
+        changed_tags: "تغيرت أوسمة هذه الموضوعات."
       none:
         unread: "ليست هناك مواضيع غير مقروءة."
         new: "ليست هناك مواضيع جديدة."
@@ -1379,34 +1477,34 @@ ar:
         latest: "لا مواضيع حديثة. يا للأسف."
         hot: "لايُوجد مواضيع نَشطة"
         bookmarks: "لا مواضيع معلّمة بعد."
-        category: "لا مواضيع في فئة ’{{category}}‘."
-        top: "لا يوجد مواضيع تستحق أن تكون ضمن الأفضل مع الأسف."
-        search: "لا نتائج للبحث."
+        category: "لا يوجد موضوعات في قسم ’{{category}}‘."
+        top: "لا يوجد موضوعات مشاهدة بكثرة"
+        search: "لا يوجد نتائج للبحث."
         educate:
-          new: '<p>ستظهر المواضيع الجديدة هنا</p><p>تُعتبر المواضيع (افتراضيا) جديدة وتعرض مؤشّر <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">جديد</span> إن أُنشئت في اليومين الماضيين.</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>'
+          new: '<p>سوف تظهر موضوعاتك هنا.</p><p>بشكل افتراضي تعتبر الموضوعات جديدة و يظهر بجانبها كلمه <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">جديد</span> إذا لم يمضي علي نشرها اكثر من يومين.</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>قرأت الموضوع لاكثر من اربع دقائق</li></ul><p>او قمت بضبط مستوي اشعارات الموضوع إلي مراقب او متابع.</p><p>زور صفحة <a href="%{userPrefsUrl}">التفضيلات</a> لتغيير هذا السلوك.</p>'
       bottom:
-        latest: "لا مواضيع حديثة أخرى."
-        hot: "هذه كل المواضيع التي عليها إقبال عالي حتى هذه اللحظة"
-        posted: "لا يوجد مواضيع أخرى."
-        read: "ليست هناك مواضيع مقروءة أخرى."
-        new: "ليست هناك مواضيع جديدة أخرى."
-        unread: "ليست هناك مواضيع غير مقروءة أخرى."
-        category: "ليست هناك مواضيع أخرى في فئة \"{{category}}\"."
-        top: "لقد اطلعت على كل المواضيع المميزة حتى هذه اللحظة."
-        bookmarks: "لايوجد المزيد من المواضيع في المفضلة"
-        search: "ليست هناك نتائج بحث أخرى."
+        latest: "لا يوجد موضوعات حديثة أخرى."
+        hot: "لا يوجد موضوعات نشطة اخري."
+        posted: "لا يوجد مواضيع منشورة أخرى."
+        read: "لا يوجد موضوعات مقروءة أخرى."
+        new: "لا يوجد مواضيع جديدة أخرى."
+        unread: "لا يوجد موضوعات غير مقروءة أخرى."
+        category: "لا يوجد مواضيع أخرى في قسم \"{{category}}\"."
+        top: "لا يوجد موضوعات مشاهدة بكثرة اخري."
+        bookmarks: "لا يوجد موضوعات عليها علامة مرجعية اخري."
+        search: "لا يوجد نتائج بحث أخرى."
     topic:
       unsubscribe:
-        stop_notifications: "ستستقبل الأن إشعارات أقل لـ<strong>{{title}}</strong>"
-        change_notification_state: "حالة إشعارك الحالي هي "
+        stop_notifications: "انت الأن تستقبل اشعارات اقل عن<strong>{{title}}</strong>"
+        change_notification_state: "حالة اشعاراتك الحالية هي "
       filter_to:
-        zero: "لا مشاركات في الموضوع"
-        one: "مشاركة واحدة في الموضوع"
-        two: "مشاركتان في الموضوع"
-        few: "{{count}} مشاركات في الموضوع"
-        many: "{{count}} مشاركة في الموضوع"
-        other: "{{count}} مشاركة في الموضوع"
+        zero: "لا يوجد منشورات في الموضوع"
+        one: "منشور واحد في الموضوع"
+        two: "منشورين في الموضوع"
+        few: "{{count}} منشور في الموضوع"
+        many: "{{count}} منشور في الموضوع"
+        other: "{{count}} منشور في الموضوع"
       create: 'موضوع جديد'
       create_long: 'كتابة موضوع جديد'
       private_message: 'أرسل رسالة خاصة'
@@ -1416,7 +1514,7 @@ ar:
       move_to_inbox:
         title: 'انقل إلى البريد الوارد'
         help: 'انقل الرسالة للبريد الوارد'
-      list: 'المواضيع'
+      list: 'الموضوعات'
       new: 'موضوع جديد'
       unread: 'غير مقروء'
       new_topics:
@@ -1436,21 +1534,21 @@ ar:
       title: 'الموضوع'
       invalid_access:
         title: "الموضوع خاص"
-        description: "لا تملك صلاحيات للوصول لهذا الموضوع"
-        login_required: "عليك بتسجيل الدخول لمشاهدة هذا الموضوع."
+        description: "عذرا, لا تملك صلاحيات الوصول لهذا الموضوع"
+        login_required: "عليك تسجيل الدخول لرؤية هذا الموضوع."
       server_error:
         title: "فشل تحميل الموضوع"
-        description: "آسفون، تعذر علينا تحميل هذا الموضوع، قد يرجع ذلك إلى مشكلة بالاتصال. من فضلك حاول مجددا. أخبرنا بالمشكلة إن استمر حدوثها."
+        description: "عذرا، تعذر علينا تحميل هذا الموضوع، قد يرجع ذلك إلى مشكلة بالاتصال. من فضلك حاول مجددا. أخبرنا بالمشكلة إن استمر حدوثها."
       not_found:
         title: "لم يُعثر على الموضوع"
-        description: "آسفون، لم نجد هذا الموضوع. ربما أزاله أحد المشرفين؟"
+        description: "عذرا، لم نجد هذا الموضوع. ربما أزاله أحد المشرفين؟"
       total_unread_posts:
-        zero: "لا مشاركات غير مقروءة في هذا الموضوع"
-        one: "لديك مشاركة واحدة غير مقروءة في هذا الموضوع"
-        two: "لديك مشاركتين غير مقروءتين في هذا الموضوع"
-        few: "لديك {{count}} مشاركات غير مقروءة في هذا الموضوع"
-        many: "لديك {{count}} مشاركة غير مقروءة في هذا الموضوع"
-        other: "لديك {{count}} مشاركة غير مقروءة في هذا الموضوع"
+        zero: "لا يوجد منشورات غير مقروء في هذا الموضوع"
+        one: "لديك منشور واحد غير مقروء في هذا الموضوع"
+        two: "لديك {{count}} منشور غير مقروء في هذا الموضوع"
+        few: "لديك {{count}} منشور غير مقروء في هذا الموضوع"
+        many: "لديك {{count}} منشور غير مقروء في هذا الموضوع"
+        other: "لديك {{count}} منشور غير مقروء في هذا الموضوع"
       unread_posts:
         zero: "لا مشاركات قديمة غير مقروءة في هذا الموضوع"
         one: "لديك مشاركة واحدة قديمة غير مقروءة في هذا الموضوع"
@@ -1459,12 +1557,12 @@ ar:
         many: "لديك {{count}} مشاركة قديمة غير مقروءة في هذا الموضوع"
         other: "لديك {{count}} مشاركة قديمة غير مقروءة في هذا الموضوع"
       new_posts:
-        zero: "لا مشاركات جديدة في هذا الموضوع منذ قرأته"
-        one: "هناك مشاركة جديدة واحدة في هذا الموضوع منذ قرأته"
-        two: "هناك مشاركتين جديدتين في هذا الموضوع منذ قرأته"
-        few: "هناك {{count}} مشاركات جديدة في هذا الموضوع منذ قرأته"
-        many: "هناك {{count}} مشاركة جديدة في هذا الموضوع منذ قرأته"
-        other: "هناك {{count}} مشاركة جديدة في هذا الموضوع منذ قرأته"
+        zero: "لا يوجد منشورات جديد في هذا الموضوع منذ اخر مرة قرأته"
+        one: "هناك منشور واحد جديد في هذا الموضوع منذ اخر مرة قرأته"
+        two: "هناك منشورين جديدين في هذا الموضوع منذ اخر مرة قرأته"
+        few: "هناك {{count}} منشور جديد في هذا الموضوع منذ اخر مرة قرأته"
+        many: "هناك {{count}} منشور جديد في هذا الموضوع منذ اخر مرة قرأته"
+        other: "هناك {{count}} منشور جديد في هذا الموضوع منذ اخر مرة قرأته"
       likes:
         zero: "لا إعجابات في هذا الموضوع"
         one: "هناك إعجاب واحد في هذا الموضوع"
@@ -1472,101 +1570,148 @@ ar:
         few: "هناك {{count}} إعجابات في هذا الموضوع"
         many: "هناك {{count}} إعجابا في هذا الموضوع"
         other: "هناك {{count}} إعجاب في هذا الموضوع"
-      back_to_list: "عُد إلى قائمة المواضيع"
-      options: "خيارات الموضوع"
-      show_links: "أظهر الوصلات في الموضوع"
+      back_to_list: "عد إلى قائمة الموضوعات"
+      options: "خيارات الموضوعات"
+      show_links: "اظهر الروابط في هذا الموضوع"
       toggle_information: "أظهر/أخف تفاصيل الموضوع"
       read_more_in_category: "أتريد قراءة المزيد؟ تصفح المواضيع الأخرى في {{catLink}} أو {{latestLink}}."
       read_more: "أتريد قراءة المزيد؟ {{catLink}} أو {{latestLink}}."
       read_more_MF: "{UNREAD, plural, zero {} one {تبقى <a href='/unread'>موضوع واحد غير مقروء</a>} two {تبقى <a href='/unread'>موضوعان غير مقروءان</a>} few {تبقت <a href='/unread'># مواضيع غير مقروءة</a>} many {تبقى <a href='/unread'># موضوعا غير مقروء</a>} other {تبقى <a href='/unread'># موضوع غير مقروء</a>}} {BOTH, select, true { و} false {} other {}}{NEW, plural, zero {} one {{UNREAD, plural, zero {تبقى } one {} two {} few {} many {} other {}}<a href='/new'>موضوع واحد جديد</a>} two {{UNREAD, plural, zero {تبقى } one {} two {} few {} many {} other {}}<a href='/new'>موضوعان جديدان</a>} few {{UNREAD, plural, zero {تبقت } one {} two {} few {} many {} other {}}<a href='/new'># مواضيع جديدة</a>} many {{UNREAD, plural, zero {تبقى } one {} two {} few {} many {} other {}}<a href='/new'># موضوعا جديدا</a>} other {{UNREAD, plural, zero {تبقى } one {} two {} few {} many {} other {}}<a href='/new'># موضوع جديد</a>}}، أو {CATEGORY, select, true {تصفّح المواضيع الأخرى في {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: تصفّح كل الأقسام
-      view_latest_topics: اعرض أحدث المواضيع
+      view_latest_topics: اعرض اخر الموضوعات
       suggest_create_topic: لمَ لا تكتب موضوعًا؟
       jump_reply_up: انتقل إلى أول رد
       jump_reply_down: انتقل إلى آخر رد
       deleted: "الموضوع محذوف"
+      topic_status_update:
+        save: "ضع مؤقت"
+        num_of_hours: "عدد الساعات:"
+        remove: "ازل المؤقت"
+        publish_to: "انشر في:"
+        when: "متى:"
+      auto_update_input:
+        later_today: "في وقت لاحق اليوم"
+        tomorrow: "غداً"
+        later_this_week: "في وقت لاحق هذا الاسبوع"
+        this_weekend: "هذا الأسبوع"
+        next_week: "الاسبوع القادم"
+        next_month: "الشهر القادم"
+        one_year: "سنة واحدة"
+        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:
+        zero: "اخر منشور بهذا الموضوع نشر بالفعل منذ اقل من ساعة, لذا سيتم غلق الموضوع الأن."
+        one: "اخر منشور بهذا الموضوع نشر بالفعل منذ ساعة واحدة, لذا سيتم غلق الموضوع الأن."
+        two: "اخر منشور بهذا الموضوع نشر بالفعل منذ ساعتين, لذا سيتم غلق الموضوع الأن."
+        few: "اخر منشور بهذا الموضوع نشر بالفعل منذ %{count} ساعة, لذا سيتم غلق الموضوع الأن."
+        many: "اخر منشور بهذا الموضوع نشر بالفعل منذ %{count} ساعة, لذا سيتم غلق الموضوع الأن."
+        other: "اخر منشور بهذا الموضوع نشر بالفعل منذ %{count} ساعة, لذا سيتم غلق الموضوع الأن."
       timeline:
         back: "الرجوع"
-        back_description: "عُد إلى آخر مشاركة غير مقروءة"
+        back_description: "عد إلى آخر منشور غير مقروء"
         replies_short: "%{current} / %{total}"
       progress:
         title: حالة الموضوع
         go_top: "أعلى"
         go_bottom: "أسفل"
         go: "اذهب"
-        jump_bottom: "انتقل لآخر مشاركة"
+        jump_bottom: "انتقل لآخر منشور"
         jump_prompt: "انتقل إلى..."
+        jump_prompt_of: "من %{count} منشورات"
         jump_prompt_long: "إلى أي مشاركة تريد الانتقال؟"
-        jump_bottom_with_number: "انتقل إلى المشاركة %{post_number}"
-        total: مجموع المشاركات
-        current: المشاركة الحالية
+        jump_bottom_with_number: "انتقل إلى المنشور %{post_number}"
+        total: مجموع المنشورات
+        current: المنشورات الحالية
       notifications:
-        title: غير عدد مرات اشعارك عن هذا الموضوع
+        title: غير معدل الاشعارات التي تصلك من هذا الموضوع
         reasons:
-          mailing_list_mode: "وضع القائمة البريدية لديك مفعّل، لذلك ستصلك إشعارات الردود على هذا الموضوع عبر البريد الإلكتروني."
-          '3_10': 'ستصلك إشعارات لأنك تراقب وسما وُسم به هذا الموضوع.'
+          mailing_list_mode: "وضع القائمة البريدية لديك مفعّل، لذلك ستصلك إشعارات بالردود على هذا الموضوع عبر البريد الإلكتروني."
+          '3_10': 'ستصلك إشعارات لأنك تراقب وسما يحملة هذا الموضوع.'
           '3_6': 'ستصلك إشعارات لأنك تراقب هذا القسم.'
-          '3_5': 'ستصلك إشعارات لأنك بدأت بمراقبة هذا الموضوع آليا.'
+          '3_5': 'ستصلك إشعارات لأنك تحولت لمراقبة هذا الموضوع آليا.'
           '3_2': 'ستصلك إشعارات لأنك تراقب هذا الموضوع.'
           '3_1': 'ستصلك إشعارات لأنك أنشأت هذا الموضوع.'
           '3': 'ستصلك إشعارات لأنك تراقب هذا الموضوع.'
-          '2': 'سترى عدد الرّدود الجديدة لأنّك <a href="/u/{{username}}/preferences">قرأت هذا الموضوع</a>.'
+          '2_8': 'سوف تشاهد عداد للردود الجديدة لانك تتابع هذا القسم.'
+          '2_4': 'سوف تشاهد عداد للردود الجديدة لانك قمت بالمشاركة برد في هذا الموضوع.'
+          '2_2': 'سوف تشاهد عداد للردود الجديدة لانك تتابع هذا الموضوع.'
+          '2': 'سوف تشاهد عداد للردود الجديدة لأنّك <a href="/u/{{username}}/preferences">قرأت هذا الموضوع</a>.'
           '1_2': 'سيصلك إشعار إن أشار أحد إلى @اسمك أو رد عليك.'
           '1': 'سيصلك إشعار إن أشار أحد إلى @اسمك أو رد عليك.'
-          '0_7': 'لن يصلك أي إشعار يخص هذا القسم بناء على طلبك.'
+          '0_7': 'لن يصلك أي إشعار يخص هذا القسم.'
           '0_2': 'لن يصلك أي إشعار يخص هذا الموضوع بناء على طلبك.'
           '0': 'لن يصلك أي إشعار يخص هذا الموضوع بناء على طلبك.'
         watching_pm:
           title: "مُراقب"
-          description: "سيصلك إشعار لكل رد جديد لهذه الرسالة، وسيظهر عدد الردود الجديدة."
+          description: "سيصلك إشعار لكل رد جديد علي هذه الرسالة، وسيظهر عداد للردود الجديدة."
         watching:
           title: "مراقَب"
-          description: "سيصلك إشعار لكل رد جديد لهذا الموضوع، وسيظهر عدد الردود الجديدة."
+          description: "سيصلك إشعار لكل رد جديد علي هذا الموضوع، وسيظهر عداد اللردود الجديدة."
         tracking_pm:
           title: "مُتابع"
-          description: "سيظهر عدد الردود الجديدة لهذه الرسالة. سيصلك إشعار إن أشار أحد إلى @اسمك أو رد عليك."
+          description: "سيظهر عداد للردود الجديدة علي هذه الرسالة. سيصلك إشعار إن أشار أحد إلى @اسمك أو رد عليك."
         tracking:
           title: "متابَع"
-          description: "سيظهر عدد الردود الجديدة لهذا الموضوع. سيصلك إشعار إن أشار أحد إلى @اسمك أو رد عليك."
+          description: "سيظهر عداد للردود الجديدة علي هذه الرسالة. سيصلك إشعار إن أشار أحد إلى @اسمك أو رد عليك."
         regular:
-          title: "الوضع العادي"
+          title: "عادي"
           description: "سيصلك إشعارا إن أشار أحد إلى @اسمك أو رد عليك."
         regular_pm:
-          title: "الوضع العادي"
+          title: "عادي"
           description: "سيصلك إشعارا إن أشار أحد إلى @اسمك أو رد عليك."
         muted_pm:
-          title: "كتم"
-          description: "لن تصلك أية إشعارات لهذه الرسالة."
+          title: "مكتوم"
+          description: "لن تصلك أية إشعارات علي هذه الرسالة."
         muted:
           title: "مكتوم"
-          description: "لن تصلك أية إشعارات لهذا الموضوع، ولن يظهر في المواضيع الأخيرة."
+          description: "لن تصلك أية إشعارات عن هذا الموضوع، ولن يظهر في اخر الموضوعات."
       actions:
-        recover: "استرجاع الموضوع"
+        recover: "إلغاء حذف الموضوع"
         delete: "احذف الموضوع"
-        open: "افتح موضوع"
+        open: "افتح الموضوع"
         close: "أغلق الموضوع"
-        multi_select: "حدد مشاركات..."
+        multi_select: "حدد المنشورات..."
+        timed_update: "ضع مؤقت للموضوع..."
         pin: "ثبّت الموضوع..."
         unpin: "ألغِ تثبيت الموضوع"
         unarchive: "أخرج الموضوع من الأرشيف"
         archive: "أرشف الموضوع"
-        invisible: "إزالة من القائمة"
-        visible: "إضافة ضمن القائمة"
-        reset_read: "تصفير القراءات"
+        invisible: "إزل من القائمة"
+        visible: "إضاف إلي القائمة"
+        reset_read: "تصفير بيانات القراءة"
         make_public: "اجعل الموضوع للعموم"
         make_private: "اجعل الرسالة خاصة"
       feature:
-        pin: "تثبيت مواضيع"
-        unpin: "إلغاء تثبيت مواضيع"
+        pin: "تثبيت الموضوع"
+        unpin: "إلغاء تثبيت الموضوع"
         pin_globally: "تثبيت الموضوع على عموم الموقع"
-        make_banner: "موضوع دعائي"
-        remove_banner: "إزالة موضوع دعائي"
+        make_banner: "اجعلة إعلان"
+        remove_banner: "ازل الإعلان"
       reply:
         title: 'رُدّ'
         help: 'اكتب ردًّا على هذه الموضوع'
@@ -1575,417 +1720,399 @@ ar:
         help: "إلغاء تثبيت الموضوع حتى لا يظهر في أعلى القائمة"
       share:
         title: 'مشاركة'
-        help: 'شارك برابط يشير لهذا الموضوع'
+        help: 'شارك رابط هذا الموضوع'
       print:
-        title: 'طباعة'
+        title: 'اطبع'
+        help: 'افتح نسخة متوافقة مع الطابعة من هذا الموضوع'
       flag_topic:
         title: 'أبلغ'
         help: 'بلَغ عن هذا الموضوع او ارسل تنبيه خاص لأدارة الموقع.'
         success_message: 'لقد أبلغت عن هذا الموضوع بنجاح.'
       feature_topic:
-        title: "ترشيح هذا الموضوع"
-        pin: "اجعل هذا الموضوع يظهر أعلى فئة {{categoryLink}} حتى"
-        confirm_pin: "لديك مسبقاً {{count}} مواضيع معلقة. قد تكون كثرة المواضيع المعلقة عبئاً على لمستخدمين الجدد والزوار. هل أنت متأكد أنك تريد تعليق موضوع آخر في هذه الفئة؟"
-        unpin: "أزل هذا الموضوع من أعلى فئة \"{{categoryLink}}\"."
-        unpin_until: "أزل هذا الموضوع من أعلى فئة \"{{categoryLink}}\" أو انتظر حتى <strong>%{until}</strong>."
-        pin_note: "المستخدمون يستطعون إزالة تثبيت الموضوع بشكل خاص بهم."
+        title: "مميز هذا الموضوع"
+        pin: "اجعل هذا الموضوع يظهر أعلى قسم {{categoryLink}} حتى"
+        confirm_pin: "لديك مسبقاً {{count}} موضوع مثبت. قد تكون كثرة المواضيع المثبتة عبئاً على الأعضاء الجدد والزوار. هل أنت متأكد أنك تريد تثبيت موضوع آخر في هذا القسم؟"
+        unpin: "أزل هذا الموضوع من أعلى قسم \"{{categoryLink}}\"."
+        unpin_until: "أزل هذا الموضوع من أعلى قسم \"{{categoryLink}}\" أو انتظر حتى <strong>%{until}</strong>."
+        pin_note: "الاعضاء يستطعون إزالة تثبيت الموضوع لأنفسهم."
         pin_validation: "التاريخ مطلوب لتثبيت هذا الموضوع."
-        not_pinned: "لا مواضيع مثبتة في {{categoryLink}}."
+        not_pinned: "لا يوجد موضوعات مثبتة في {{categoryLink}}."
         already_pinned:
           zero: "المواضيع مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
           one: "المواضيع مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
           two: "المواضيع مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
           few: "المواضيع مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
           many: "المواضيع مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "المواضيع مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-        pin_globally: "اعرض هذا الموضوع أعلى كلّ قوائم المواضيع حتّى"
-        confirm_pin_globally: "لديك  {{count}} مواضيع مثبتة على المستوى الكلى للموقع مما قد يشكل عبئ على الأعضاء الجدد أو الغير مسجلين. هل أنت واثق أنك تريد تثبيت موضوع أخر على المستوى الكلى للموقع؟"
-        unpin_globally: "أزل هذا الموضوع من أعلى كل قوائم المواضيع."
+          other: "الموضوعات مثبتة حالياً في {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+        pin_globally: "اعرض هذا الموضوع أعلى كل قوائم الموضوعات حتى"
+        confirm_pin_globally: "لديك {{count}} موضوع مثبت علي عموم الموقع مما قد يشكل عبئ على الأعضاء الجدد و الزوار. هل أنت واثق أنك تريد تثبيت موضوع أخر على عموم الموقع؟"
+        unpin_globally: "أزل هذا الموضوع من أعلى كل قوائم الموضوعات."
         unpin_globally_until: "أزل هذا الموضوع من أعلى قوائم الموضوعات أو انتظر حتى <strong>%{until}</strong>."
-        global_pin_note: "يمكن للمستخدمين بفصل موضوع على حدة لأنفسهم. "
-        not_pinned_globally: "لا مواضيع مثبتة للعموم."
+        global_pin_note: "يمكن للاعضاء إذالة تثبيت الموضوع لأنفسهم. "
+        not_pinned_globally: "لا يوجد موضوعات مثبتة للعموم."
         already_pinned_globally:
-          zero: "مواضيع مثبتة حاليا : <strong class='badge badge-notification unread'>{{count}}</strong>"
-          one: "مواضيع مثبتة حاليا : <strong class='badge badge-notification unread'>1</strong>"
-          two: "مواضيع مثبتة حاليا : <strong class='badge badge-notification unread'>{{count}}</strong>"
-          few: "مواضيع مثبتة حاليا : <strong class='badge badge-notification unread'>{{count}}</strong>"
-          many: "مواضيع مثبتة حاليا : <strong class='badge badge-notification unread'>{{count}}</strong>"
-          other: "المواضيع المثبتة للعموم حاليا: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          zero: "الموضوعات المثبتة علي عموم الموقع حاليا: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          one: "الموضوعات المثبتة علي عموم الموقع حاليا: <strong class='badge badge-notification unread'>1</strong>"
+          two: "الموضوعات المثبتة علي عموم الموقع حاليا: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          few: "الموضوعات المثبتة علي عموم الموقع حاليا: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          many: "الموضوعات المثبتة علي عموم الموقع حاليا: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "الموضوعات المثبتة علي عموم الموقع حاليا: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "اجعل هذا الموضوع إعلانا يظهر أعلى كل الصفحات."
         remove_banner: "أزل الإعلان الذي يظهر أعلى كل الصفحات."
-        banner_note: "المستخدمون يستطعون إبعاد الشعار بأغلاقه. موضوع واحد فقط يبقى كشعار لأي وقت معطى."
-        no_banner_exists: "لا يوجد اشعار للموضوع"
-        banner_exists: "شعار الموضوع <strong class='badge badge-notification unread'>هناك</strong> حاليا."
+        banner_note: "الأعضاء يستطيعون تجاهل الموضوع المثبت كإعلان بإغلاقه. لا تمكن تعيين اكثر من موضوع في نفس الوقت كإعلان."
+        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: "دعوات عن طريق البريد الإلكتروني او اسم المستخدم"
         email_or_username_placeholder: "البريد الإلكتروني أو إسم المستخدم"
         action: "دعوة"
-        success: "لقد دعونا ذلك المستخدم للمشاركة في هذه الرسالة."
+        success: "لقد دعونا ذلك العضو للمشاركة في هذه الرسالة."
         success_group: "لقد دعونا تلك المجموعة للمشاركة في هذه الرسالة."
-        error: "نأسف، حدث عطل أثناء دعوة هذا المستخدم."
+        error: "عذرا، حدث عطل أثناء دعوة هذا المستخدم."
         group_name: "اسم المجموعة"
-      controls: "خصائص  الموضوع"
+      controls: "لوحة تحكم الموضوع"
       invite_reply:
         title: 'دعوة'
         username_placeholder: "اسم المستخدم"
         action: 'أرسل دعوة'
         help: 'ادعُ الغير إلى هذا الموضوع عبر البريد الإلكترونيّ أو الإشعارات'
-        to_forum: "سنُرسل بريدًا يتيح لصديقك الانضمام مباشرةً بنقر رابط ما، الدخول غير مطلوب."
+        to_forum: "سنُرسل بريد إلكترني يتيح لصديقك الانضمام مباشرةً بنقر رابط فيه، تسجيل الدخول غير مطلوب."
         sso_enabled: "أدخل اسم مَن تريد دعوته إلى هذا الموضوع."
-        to_topic_blank: "أدخل اسم مَن تريد دعوته إلى هذا الموضوع أو بريده."
-        to_topic_email: "لقد أدخلت عنوان بريد إلكترونيّ. سنرسل بريدًا يحتوي دعوة تتيح لصديقك الرّد مباشرة على هذا الموضوع."
+        to_topic_blank: "أدخل اسم او عنوان بريد الشخص الذي تريد دعوته إلى هذا الموضوع."
+        to_topic_email: "لقد أدخلت عنوان بريد إلكترونيّ. سنرسل بريدً إلكترونياً يحتوي دعوة تتيح لصديقك الرّد مباشرة على هذا الموضوع."
         to_topic_username: "لقد أدخلت اسم مستخدم. سنرسل إشعارًا يحتوي رابطًا يدعوهم إلى هذا الموضوع."
         to_username: "أدخل اسم المستخدم للشخص الذي تريد دعوته. سنرسل إشعارًا يحتوي رابطًا يدعوهم إلى هذا الموضوع."
         email_placeholder: 'name@example.com'
         success_email: "قمنا بإرسال دعوة بالبريد لـ <b>{{emailOrUsername}}</b> . سيتم تنبيهك عند قبول الدعوة , تحقق من تبويب الدعوات في صفحتك الشخصية لمتابعة دعوتك."
         success_username: "دعونا هذا العضو للمشاركة في هذا الموضوع."
-        error: "نأسف لا يمكنك دعوة هذا المُستَخدم , ربما لأنه مُسَجِل لدينا مسبقاً (الدعوات محدودة)"
-      login_reply: 'عليك تسجيل الدخول للرّدّ'
+        error: "عذرا, لا يمكنك دعوة هذا الشخص, ربما لأن تم دعوتة مسبقا؟ (الدعوات محدودة)"
+        success_existing_email: "العضو ذو عنوان البريد الإلكتروني <b>{{emailOrUsername}}</b> مسجل بالفعل. لقد قمنا بدعوتة للمشاركة بهذا الموضوع."
+      login_reply: 'عليك تسجيل الدخول للرد'
       filters:
         n_posts:
-          zero: "لا مشاركات"
-          one: "مشاركة واحدة"
-          two: "مشاركتان"
-          few: "{{count}} مشاركات"
-          many: "{{count}} مشاركة"
-          other: "{{count}} مشاركة"
-        cancel: "حذف التخصيص"
+          zero: "لا يوجد منشورات"
+          one: "منشور واحد"
+          two: "منشوران"
+          few: "{{count}} منشور"
+          many: "{{count}} منشور"
+          other: "{{count}} منشور"
+        cancel: "إزالة الترشيح"
       split_topic:
         title: "نقل الى موضوع جديد"
         action: "نقل الى موضوع جديد"
         topic_name: "اسم الموضوع الجديد"
-        error: "حدث عطل أثناء نقل المشاركات إلى موضوع جديد."
+        error: "حدث عطل أثناء نقل المنشورات إلى موضوع جديد."
         instructions:
-          zero: "أنت على وشك انشاء موضوع جديد, ولم يتم اختيار أي مشاركة لتعبئته."
-          one: "أنت على وشك انشاء موضوع جديد وتعبئته بمشاركة اخترتها."
-          two: "أنت على وشك انشاء موضوع جديد وتعبئته بـمشاركاتين اخترتها."
-          few: "أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> مشاركات اخترتها."
-          many: "أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> مشاركة اخترتها."
-          other: "أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> مشاركة اخترتها."
+          zero: "أنت على وشك انشاء موضوع جديد, ولم تقم باختيار أي منشور لتعبئته."
+          one: "أنت على وشك انشاء موضوع جديد وتعبئته بمنشورم اخترتة."
+          two: "أنت على وشك انشاء موضوع جديد وتعبئته منشورين اخترتهما."
+          few: "أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> منشور اخترتة."
+          many: "أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> منشور اخترتة."
+          other: "أنت على وشك انشاء موضوع جديد وتعبئته بـ <b>{{count}}</b> منشور اخترتة."
       merge_topic:
-        title: "الانتقال الى موضوع موجود"
-        action: "الانتقال الى موضوع موجود"
-        error: "حدث عطل أثناء نقل المشاركات إلى الموضوع ذاك."
+        title: "نقل الى موضوع موجود"
+        action: "نقل الى موضوع موجود"
+        error: "حدث عطل أثناء نقل المنشورات إلى الموضوع ذاك."
         instructions:
-          zero: "لم يتم اختيار أي مشاركة لنقلها !"
-          one: "الرجاء اختيار الموضوع الذي تود نقل المشاركة إليه."
-          two: "الرجاء اختيار الموضوع الذي تود نقل المشاركتين إليه."
-          few: "الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> مشاركات إليه."
-          many: "الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> مشاركة إليه."
-          other: "الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> مشاركة إليه."
+          zero: "لم يتم اختيار أي منشورات لنقلها !"
+          one: "الرجاء اختيار الموضوع الذي تود نقل منشور واحد إليه."
+          two: "الرجاء اختيار الموضوع الذي تود نقل منشورين إليه."
+          few: "الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> منشور إليه."
+          many: "الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> منشور إليه."
+          other: "الرجاء اختيار الموضوع الذي تود نقل الـ<b>{{count}}</b> منشور إليه."
       merge_posts:
-        title: "ادمج المشاركات المحدّدة"
-        action: "ادمج المشاركات المحددة"
-        error: "حدث عطل أثناء دمج المشاركات المحدّدة."
+        title: "ادمج المنشورات المحدّدة"
+        action: "ادمج المنشورات المحددة"
+        error: "حدث عطل أثناء دمج المنشورات المحدّدة."
       change_owner:
-        title: "تغيير صاحب المشاركة"
-        action: "تغيير العضوية "
-        error: "حدث عطل أثناء تغيير مالك المشاركات."
-        label: "عضوية جديدة للمشاركات"
-        placeholder: "اسم مستخدم المالك الجديد"
+        title: "تغيير كاتب المنشور"
+        action: "تغيير الكاتب"
+        error: "حدث عطل أثناء تغيير كاتب هذة المنشورات."
+        label: "الكاتب الجديد للمنشورات"
+        placeholder: "اسم مستخدم الكاتب الجديد"
         instructions:
-          zero: "لم يتم تحديد أي مشاركة!"
-          one: "الرجاء اختيار المالك الجديد لمشاركة نُشرت بواسطة <b>{{old_user}}</b>."
-          two: "الرجاء اختيار المالك الجديد لمشاركتين نُشرت بواسطة <b>{{old_user}}</b>."
-          few: "الرجاء اختيار المالك الجديد لـ {{count}} مشاركات نُشرت بواسطة <b>{{old_user}}</b>."
-          many: "الرجاء اختيار المالك الجديد لـ {{count}} مشاركة نُشرت بواسطة <b>{{old_user}}</b>."
-          other: "الرجاء اختيار المالك الجديد لـ {{count}} مشاركة نُشرت بواسطة <b>{{old_user}}</b>."
-        instructions_warn: "ملاحطة لن يتم نقل الاشعارت القديمة  للمشاركة  للمسخدم الجديد <br>تحذير: اي بيانات تتعلق بالمشاركة هذه لن يتم نقلها للمستخدم الجديد. استعملها بحذر."
+          zero: "لم يتم تحديد أي منشورات!"
+          one: "الرجاء اختيار المالك الجديد لمنشور نُشر بواسطة <b>{{old_user}}</b>."
+          two: "الرجاء اختيار المالك الجديد لمنشورين نُشروا بواسطة <b>{{old_user}}</b>."
+          few: "الرجاء اختيار المالك الجديد لـ {{count}} منشور نُشر بواسطة <b>{{old_user}}</b>."
+          many: "الرجاء اختيار المالك الجديد لـ {{count}} منشور نُشر بواسطة <b>{{old_user}}</b>."
+          other: "الرجاء اختيار الكاتب الجديد لـ {{count}} منشور نُشر بواسطة <b>{{old_user}}</b>."
+        instructions_warn: "ملاحطة لن يتم نقل الاشعارت القديمة الخاصة بالمنشور للكاتب الجديد <br>تحذير:لن يتم نقل اي بيانات عن المنشور للكاتب الجديد. استعملها بحذر."
       change_timestamp:
-        action: "غيّر الختم الزّمنيّ"
-        invalid_timestamp: "لا يمكن أن يكون الختم الزمنيّ مستقبليّ."
-        error: "حدث عطل أثناء تغيير ختم الموضوع الزّمنيّ."
-        instructions: "من فضلك اختر الطابع الزمني الجديد للموضوع. ستُحدّث المشاركات فيه لألا يختلف فرق تاريخ نشرها ووقته."
+        title: "غير تاريخ النشر..."
+        action: "غير تاريخ النشر..."
+        invalid_timestamp: "لا يمكن أن يكون تاريخ النشر في المستقبل."
+        error: "حدث عطل أثناء تغيير تاريخ النشر."
+        instructions: "من فضلك اختر تاريخ النشر الجديد للموضوع. سيتم تحديث تاريخ نشر منشورات الموضوع حتي يتم الحفاظ علي نفس الفارق الزمني."
       multi_select:
-        select: 'حددها'
+        select: 'حدد'
         selected: 'محددة ({{count}})'
-        select_replies: 'حددها مع الردود عليها'
         delete: احذف المحدد
         cancel: ألغِ التحديد
         select_all: حدد الكل
         deselect_all: أزل تحديد الكل
         description:
-          zero: لم تحدّد أي مشاركة.
-          one: لقد حدّدت مشاركة <b>واحدة</b>.
-          two: لقد حدّدت <b>مشاركتين</b>.
-          few: لقد حدّدت <b>{{count}}</b> مشاركات.
-          many: لقد حدّدت <b>{{count}}</b> مشاركة.
-          other: لقد حدّدت <b>{{count}}</b> مشاركة.
+          zero: لم تحدّد أي منشورات.
+          one: لقد حدّدت منشور<b>واحد</b>.
+          two: لقد حدّدت <b>منشورين</b>.
+          few: لقد حدّدت <b>{{count}}</b> منشور.
+          many: لقد حدّدت <b>{{count}}</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}} ."
+      quote_reply: "اقتبس"
       edit_reason: "السبب:"
-      post_number: "المشاركة {{number}}"
-      last_edited_on: "آخر تعديل على المشاركة في "
+      post_number: "المنشور {{number}}"
+      wiki_last_edited_on: "آخر تعديل على الـ wiki في "
+      last_edited_on: "آخر تعديل على المنشور في "
       reply_as_new_topic: "التعليق على الموضوع الاصلي"
-      continue_discussion: "إكمالا للنّقاش في {{postLink}}:"
-      follow_quote: "انتقل إلى المشاركة المقتبَس منها"
-      show_full: "عرض كامل المشاركة"
+      reply_as_new_private_message: "الرد في رسالة جديدة علي نفس المستلم"
+      continue_discussion: "تكملة النقاش من {{postLink}}:"
+      follow_quote: "انتقل إلى المنشور المقتبَس منه"
+      show_full: "عرض كامل المنشور"
       show_hidden: 'اعرض المحتوى المخفيّ.'
       deleted_by_author:
-        zero: "(سحب الكاتب المشاركة، ستُحذف آليًّا خلال أقلّ من ساعة ما لم يُبلّغ عنها)"
-        one: "(سحب الكاتب المشاركة، ستُحذف آليًّا خلال ساعة واحدة ما لم يُبلّغ عنها)"
-        two: "(سحب الكاتب المشاركة، ستُحذف آليًّا خلال ساعتين ما لم يُبلّغ عنها)"
-        few: "(سحب الكاتب المشاركة، ستُحذف آليًّا خلال %{count} ساعات ما لم يُبلّغ عنها)"
-        many: "(سحب الكاتب المشاركة، ستُحذف آليًّا خلال %{count} ساعة ما لم يُبلّغ عنها)"
-        other: "(سحب الكاتب المشاركة، ستُحذف آليًّا خلال %{count} ساعة ما لم يُبلّغ عنها)"
-      expand_collapse: "وسّع/اطوِ"
+        zero: "(سحب الكاتب المنشور، سيحذف آليًّا الأن ما لم يُبلّغ عنه)"
+        one: "(سحب الكاتب المنشور، سيحذف آليًّا خلال ساعة واحدة ما لم يُبلّغ عنه)"
+        two: "(سحب الكاتب المنشور، سيحذف آليًّا خلال %{count} ساعة ما لم يُبلّغ عنه)"
+        few: "(سحب الكاتب المنشور، سيحذف آليًّا خلال %{count} ساعة ما لم يُبلّغ عنه)"
+        many: "(سحب الكاتب المنشور، سيحذف آليًّا خلال %{count} ساعة ما لم يُبلّغ عنه)"
+        other: "(سحب الكاتب المنشور، سيحذف آليًّا خلال %{count} ساعة ما لم يُبلّغ عنه)"
+      expand_collapse: "إظهار/إخفاء"
       gap:
-        zero: "لا ردود مخفيّة"
-        one: "اعرض الرّدّ المخفيّ"
-        two: "اعرض الرّدّين المخفيّين"
-        few: "اعرض ال‍ {{count}} ردود المخفيّة"
-        many: "اعرض ال‍ {{count}} ردًّا المخفيّة"
-        other: "اعرض ال‍ {{count}} ردّ المخفيّ"
-      unread: "المشاركة غير مقروءة"
+        zero: "لا يوجد ردود مخفية"
+        one: "اعرض رد واحد مخفي"
+        two: "اعرض ال‍ {{count}} رد مخفي"
+        few: "اعرض ال‍ {{count}} رد مخفي"
+        many: "اعرض ال‍ {{count}} رد مخفي"
+        other: "اعرض ال‍ {{count}} رد مخفي"
+      unread: "المنشور غير مقروء"
       has_replies:
         zero: "لا ردود"
         one: "رد واحد"
-        two: "ردان"
-        few: "{{count}} ردود"
-        many: "{{count}} ردا"
+        two: "{{count}} رد"
+        few: "{{count}} رد"
+        many: "{{count}} رد"
         other: "{{count}} رد"
       has_likes:
         zero: "لا إعجابات"
         one: "إعجاب واحد"
-        two: "إعجابان"
-        few: "{{count}} إعجابات"
-        many: "{{count}} إعجابا"
+        two: "{{count}} إعجاب"
+        few: "{{count}} إعجاب"
+        many: "{{count}} إعجاب"
         other: "{{count}} إعجاب"
       has_likes_title:
-        zero: "لم تُعجب هذه المشاركة أحد"
-        one: "أعجبت هذه المشاركة شخصا واحدا"
-        two: "أعجبت هذه المشاركة شخصين"
-        few: "أعجبت هذه المشاركة {{count}} أشخاص"
-        many: "أعجبت هذه المشاركة {{count}} شخصا"
-        other: "أعجبت هذه المشاركة {{count}} شخص"
-      has_likes_title_only_you: "أعجبتك هذه المشاركة"
+        zero: "{{count}} عضو اعجب بهذا المشروع"
+        one: "عضو واحد اعجب بهذا المشروع"
+        two: "{{count}} عضو اعجب بهذا المشروع"
+        few: "{{count}} عضو اعجب بهذا المشروع"
+        many: "{{count}} عضو اعجب بهذا المشروع"
+        other: "{{count}} عضو اعجب بهذا المشروع"
+      has_likes_title_only_you: "اعجبك هذا المنشور"
       has_likes_title_you:
-        zero: "أعجبتك هذه المشاركة"
-        one: "أعجبت هذه المشاركة شخصًا واحدًا غيرك"
-        two: "أعجبت هذه المشاركة شخصين غيرك"
-        few: "أعجبت هذه المشاركة {{count}} أشخاص غيرك"
-        many: "أعجبت هذه المشاركة {{count}} شخصًا غيرك"
-        other: "أعجبت هذه المشاركة {{count}} شخص غيرك"
+        zero: "لم يعجب احد غيرك بهذا المنشور"
+        one: "انت و عضو واحد غيرك اعجبكم هذا المنشور."
+        two: "انت و عضوين غيرك اعجبكم هذا المنشور."
+        few: "انت و {{count}} غيرك اعجبكم هذا المنشور."
+        many: "انت و {{count}} غيرك اعجبكم هذا المنشور."
+        other: "انت و {{count}} غيرك اعجبكم هذا المنشور."
       errors:
-        create: "آسفون، حدثت مشكلة في إنشاء المشاركة. من فضلك حاول مجددا."
-        edit: "آسفون، حدثت مشكلة في تعديل المشاركة. من فضلك حاول مجددا."
-        upload: "آسفون، حدثت مشكلة في رفع الملف. من فضلك حاول مجددا."
-        file_too_large: "آسفون، الملف هذا كبير جدا (أقصى حجم هو {{max_size_kb}}ك.بايت). ما رأيك برفع الملف على خدمة سحابيّة، ومن ثمّ تشارك الوصلة؟"
-        too_many_uploads: "آسفون، يمكنك فقط رفع ملفّ واحد كلّ مرة."
-        too_many_dragged_and_dropped_files: "آسفون، يمكنك فقط رفع 10 ملفّات كلّ مرة."
-        image_upload_not_allowed_for_new_user: "نأسف، لا يمكن للمستخدمين الجدد رفع الصّور."
-        attachment_upload_not_allowed_for_new_user: "نأسف، لا يمكن للمستخدمين الجدد رفع المرفقات."
-        attachment_download_requires_login: "نأسف، عليك تسجيل الدخول لتنزيل المرفقات."
+        create: "عذرا، حدثت مشكلة اثناء إنشاء منشورك. من فضلك حاول مجددا."
+        edit: "عذرا، حدثت مشكلة اثناء تعديل منشورك. من فضلك حاول مجددا."
+        upload: "عذرا، حدثت مشكلة اثناء رفع الملف. من فضلك حاول مجددا."
+        file_too_large: "عذرا، هذا الملف كبير جدا (أقصى حجم هو {{max_size_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: "عذرا، عليك تسجيل الدخول لتحميل المرفقات."
       abandon:
-        confirm: "أمتأكد من التخلي عن المشاركة؟"
+        confirm: "أمتأكد من التخلي عن المنشور؟"
         no_value: "لا، أبقها"
         yes_value: "نعم، لا أريدها"
-      via_email: "وصلت هذه المشاركة عبر البريد"
-      via_auto_generated_email: "وصلت هذه المشاركة عبر بريد مولّد آليًّا"
-      whisper: "هذه المشاركة همسة خاصة للمشرفين"
+      via_email: "وصل هذا المنشور عبر البريد"
+      via_auto_generated_email: "وصل هذا المنشور عبر بريد مولّد آلياً"
+      whisper: "هذا المنشور سري خاص بالمشرفين"
+      wiki:
+        about: "هذا المنشور نوعة wiki"
       archetypes:
         save: 'احفظ الخيارات'
-      few_likes_left: "نشكرك على مشاركة حبّك! تبقّت لديك بضعة إعجابات لليوم فقط."
+      few_likes_left: "نشكرك على نشر المحبة في المجتمع! و لكن للأسف لقد اقتربت من حد الاعجابات اليومي المسموح بة."
       controls:
-        reply: "اكتب ردا على المشاركة"
-        like: "أعجبتني المشاركة"
-        has_liked: "أعجبتك هذه المشاركة"
-        undo_like: "ألغِ الإعجاب"
-        edit: "عدّل المشاركة"
-        edit_anonymous: "نأسف، عليك تسجيل الدخول لتعديل المشاركة."
-        flag: "بلَغ عن هذا الموضوع او ارسل تنبيه خاص لأدارة الموقع."
-        delete: "احذف المشاركة"
-        undelete: "التراجع عن حذف المشاركة"
-        share: "شارك رابط هذه المشاركة"
+        reply: "ابدا في كتابة رد علي هذا المنشور"
+        like: "اعجبني هذا المنشور"
+        has_liked: "اعجبت بهذا المنشور"
+        undo_like: "إلغاء الإعجاب"
+        edit: "عدّل المنشور"
+        edit_action: "عدّل"
+        edit_anonymous: "عذرا، عليك تسجيل الدخول لتعديل المنشور."
+        flag: "ابلَغ عن هذا الموضوع او ارسل تنبيه خاص لأدارة الموقع."
+        delete: "احذف المنشور"
+        undelete: "تراجع عن حذف المنشور"
+        share: "شارك رابط هذا المنشور"
         more: "المزيد"
-        delete_replies:
-          confirm:
-            zero: "لا ردود مباشرة على هذه المشاركة لتُحذف."
-            one: "أتريد أيضًا حذف الرّدّ المباشر على هذه المشاركة؟"
-            two: "أتريد أيضًا حذف الرّدّين المباشرين على هذه المشاركة؟"
-            few: "أتريد أيضًا حذف ال‍ {{count}} ردود المباشرة على هذه المشاركة؟"
-            many: "أتريد أيضًا حذف ال‍ {{count}} ردًّا المباشر على هذه المشاركة؟"
-            other: "أتريد أيضًا حذف ال‍ {{count}} ردّ المباشر على هذه المشاركة؟"
-          yes_value: "نعم، احذف الردود أيضا"
-          no_value: "لا، المشاركة فحسب"
-        admin: "عمليات المدير"
-        wiki: "اجعلها ويكي"
-        unwiki: "أزلها من الويكي"
-        convert_to_moderator: "إضافة لون للموظف"
-        revert_to_regular: "حذف اللون الوظيفي"
+        admin: "صلاحيات المدير"
+        wiki: "اجعل المنشور wiki"
+        unwiki: "اجعل المنشور عادي"
+        convert_to_moderator: "اجعل لون المنشور مميز"
+        revert_to_regular: "اجعل لون المنشور عادي"
         rebake: "أعد بناء HTML"
         unhide: "إظهار"
-        change_owner: "غيّر الملكيّة"
+        change_owner: "غير الكاتب"
       actions:
-        flag: 'التبليغات'
-        defer_flags:
-          zero: "أجّل الإعلام"
-          one: "أجّل الإعلام"
-          two: "أجّل الإعلامات"
-          few: "أجّل الإعلامات"
-          many: "أجّل الإعلامات"
-          other: "أجّل الإعلامات"
+        flag: 'ابلاغ'
         undo:
           off_topic: "تراجع عن التبليغ"
-          spam: "تراجع عن التبليغ"
-          inappropriate: "تراجع عن التبليغ"
-          bookmark: "التراجع عن التفضيل"
-          like: "التراجع عن الإعجاب"
-          vote: "التراجع عن التصويت"
+          spam: "تراجع عن البلاغ"
+          inappropriate: "تراجع عن البلاغ"
+          bookmark: "تراجع عن البلاغ"
+          like: "تراجع عن الإعجاب"
+          vote: "تراجع عن التصويت"
         people:
-          off_topic: "أبلغ أن هذا خارج الموضوع."
-          spam: "علّم على أنّه سبام"
-          inappropriate: "ابلغ انه غير ملائم "
-          notify_moderators: "اشعر المشرفين"
-          notify_user: "ارسل رساله"
-          bookmark: "اضف الى المفضله"
+          off_topic: "ابلغ عنه انه خارج الموضوع"
+          spam: "ابلغ عنه انه سبام"
+          inappropriate: "ابلغ عنه انه غير لائق"
+          notify_moderators: "تم تنبية المشرفين"
+          notify_user: "ارسلت رساله"
+          bookmark: "وضع علية علامة مرجعية"
           like: "أعجبهم هذا"
           vote: "صوت لهذا"
         by_you:
-          off_topic: "لقد تم الإبلاغ عن الموضوع على أنه ليس في المكان الصحيح"
-          spam: "تم الإبلاغ عن الموضوع على أنه سبام"
-          inappropriate: "تم الإبلاغ عن الموضوع على أنه غير لائق"
-          notify_moderators: "تم الإبلاغ عن الموضوع ليشاهده المشرف"
-          notify_user: "لقد أرسلت رسالة إلى هذا المستخدم"
-          bookmark: "لقد علّمت هذه المشاركة"
-          like: "أعجبك هذا"
-          vote: "لقد صوّتّ على هذه المشاركة"
+          off_topic: "لقد ابلغت ان هذا المنشور خارج الموضوع"
+          spam: "لقد ابلغت ان هذا المنشور سبام"
+          inappropriate: "لقد ابلغت ان هذا المنشور غير لائق"
+          notify_moderators: "لقد ابلغت المشرفين عن هذا المنشور"
+          notify_user: "لقد أرسلت رسالة إلى هذا العضو"
+          bookmark: "لقد وضعت علامة مرجعية علي هذا المنشور"
+          like: "أعجبت بهذا المنشور"
+          vote: "لقد صوّت على هذا المنشور"
         by_you_and_others:
           off_topic:
-            zero: "أنت بلّغت بأن هذا خارج عن الموضوع."
-            one: "أنت وآخر بلّغتما بأن هذا خارج عن الموضوع."
-            two: "أنت و {{count}} آخرون بلّغتم بأن هذا خارج عن الموضوع."
-            few: "أنت و {{count}} آخرون بلّغتم بأن هذا خارج عن الموضوع."
-            many: "أنت و {{count}} آخرون بلّغتم بأن هذا خارج عن الموضوع."
-            other: "أنت و {{count}} آخرون بلّغتم بأن هذا خارج عن الموضوع."
+            zero: "أنت أبلّغت بأن هذا المنشور خارج الموضوع."
+            one: "أنت وشخص اخر أبلّغتما بأن هذا المنشور خارج الموضوع."
+            two: "أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع"
+            few: "أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع"
+            many: "أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع"
+            other: "أنت و {{count}} آخرون أبلغتم بأن هذا المنشور خارج الموضوع"
           spam:
-            zero: "أنت أبلّغت بأن هذا غير مرغوب فيه."
-            one: "أنت وآخر أبلّغتما بأن هذا غير مرغوب فيه."
-            two: "أنت و {{count}} آخرون أبلّغتم بأن هذا غير مرغوب فيه."
-            few: "أنت و {{count}} آخرون أبلّغتم بأن هذا غير مرغوب فيه."
-            many: "أنت و {{count}} آخرون أبلّغتم بأن هذا غير مرغوب فيه."
-            other: "أنت و {{count}} آخرون أبلّغتم بأن هذا غير مرغوب فيه."
+            zero: "أنت أبلّغت بأن هذا هذا المنشور سبام."
+            one: "أنت وشخص آخر أبلّغتما بأن هذا المنشور سبام."
+            two: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام."
+            few: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام."
+            many: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام."
+            other: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور سبام."
           inappropriate:
-            zero: "أنت أشرت لهذا كغير ملائم."
-            one: "أنت و شخص آخر أشرتُما لهذا كغير ملائم."
-            two: "أنت و {{count}} آخران أشرتُم لهذا كغير ملائم."
-            few: "أنت و {{count}} آخرون أشرتُم لهذا كغير ملائم."
-            many: "أنت و {{count}} آخرون أشرتُم لهذا كغير ملائم."
-            other: "أنت و {{count}} آخرون أشرتُم لهذا كغير ملائم."
+            zero: "أنت أبلّغت بأن هذا المنشور غير لائق."
+            one: "أنت و شخص آخر أبلّغتما بأن هذا المنشور غير لائق."
+            two: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق."
+            few: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق."
+            many: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق."
+            other: "أنت و {{count}} آخرون أبلّغتم بأن هذا المنشور غير لائق."
           notify_moderators:
-            zero: "أنت و 1 آخر علّمتم هذا للمراقبين"
-            one: "أنت و 1 آخر علّمتم هذا للمراقبين"
-            two: "أنت و {{count}} آخرون علّمتما هذا للمراقبين"
-            few: "أنت و {{count}} آخرون علّمتم هذا للمراقبين"
-            many: "أنت و {{count}} آخرون علّمتم هذا للمراقبين"
-            other: "أنت و {{count}} آخرون علّمتم هذا للمراقبين"
+            zero: "أنت أبلّغت المشرفين  عن هذا المنشور."
+            one: "أنت و شخص آخر أبلّغتما المشرفين عن هذا المنشور."
+            two: "أنت و {{count}} آخرون أبلّغتم المشرفين عن هذا المنشور."
+            few: "أنت و {{count}} آخرون أبلّغتم المشرفين عن هذا المنشور."
+            many: "أنت و {{count}} آخرون أبلّغتم المشرفين عن هذا المنشور."
+            other: "أنت و {{count}} آخرون أبلّغتم المشرفين عن هذا المنشور."
           notify_user:
-            zero: "أنت أرسلت رسالة لهذا المستخدم."
-            one: "أنت و شخص آخر أرسلتما رسالة لهذا المستخدم."
-            two: "أنت و {{count}} آخران أرسلتم رسالة لهذا المستخدم."
-            few: "أنت و {{count}} آخرون أرسلتم رسالة لهذا المستخدم."
-            many: "أنت و {{count}} آخرون أرسلتم رسالة لهذا المستخدم."
-            other: "أنت و {{count}} آخرون أرسلتم رسالة لهذا المستخدم."
+            zero: "أنت أرسلت رسالة لهذا العضو."
+            one: "أنت و شخص اخر ارسلتما رسالة لهذا العضو."
+            two: "أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو."
+            few: "أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو."
+            many: "أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو."
+            other: "أنت و {{count}} آخرون ارسلتم رسالة لهذا العضو."
           bookmark:
-            zero: "أنت عَلَّمتَ هذه المشاركة."
-            one: "أنت و شخص آخر عَلَّمتُما هذه المشاركة."
-            two: "أنت و {{count}} آخران عَلَّمتُم هذه المشاركة."
-            few: "أنت و {{count}} آخرون عَلَّمتُم هذه المشاركة."
-            many: "أنت و {{count}} آخرون عَلَّمتُم هذه المشاركة."
-            other: "أنت و {{count}} آخرون عَلَّمتُم هذه المشاركة."
+            zero: "أنت وضعت علامة مرجعية علي هذا المنشور"
+            one: "أنت و شخص آخر وضعتما علامة مرجعية علي هذا المنشور"
+            two: "أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور"
+            few: "أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور"
+            many: "أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور"
+            other: "أنت و {{count}} آخرون وضعتم علامة مرجعية علي هذا المنشور"
           like:
-            zero: "أعجبك هذا"
-            one: "أعجب هذا شخصا واحدا غيرك"
-            two: "أعجب هذا شخصين غيرك"
-            few: "أعجب هذا {{count}} أشخاص غيرك"
-            many: "أعجب هذا {{count}} شخصا غيرك"
-            other: "أعجب هذا {{count}} شخص غيرك"
+            zero: "أنت اعجبت بهذا المنشور"
+            one: "أنت و شخص آخر اعجبتما بهذا المنشور"
+            two: "أنت و {{count}} آخرون اعجبتم بهذا المنشور"
+            few: "أنت و {{count}} آخرون اعجبتم بهذا المنشور"
+            many: "أنت و {{count}} آخرون اعجبتم بهذا المنشور"
+            other: "أنت و {{count}} آخرون اعجبتم بهذا المنشور"
           vote:
-            zero: "أنت و {{count}} أشخاص أخرين صوتو لهذا الموضوع"
-            one: "أنت و {{count}} أشخاص أخرين صوتو لهذا الموضوع"
-            two: "أنت و {{count}} أشخاص أخرين صوتو لهذا الموضوع"
-            few: "أنت و {{count}} أشخاص أخرين صوتو لهذا الموضوع"
-            many: "أنت و {{count}} أشخاص أخرين صوتو لهذا الموضوع"
-            other: "أنت و {{count}} أشخاص أخرين صوتو لهذا الموضوع"
+            zero: "أنت صوت علي هذا المنشور"
+            one: "أنت و شخص آخر صوتما علي هذا المنشور"
+            two: "أنت و {{count}} آخرون صوتم علي هذا المنشور"
+            few: "أنت و {{count}} آخرون صوتم علي هذا المنشور"
+            many: "أنت و {{count}} آخرون صوتم علي هذا المنشور"
+            other: "أنت و {{count}} آخرون صوتم علي هذا المنشور"
         by_others:
           off_topic:
-            zero: "لم يتم الاشارة لهذا كخارج عن الموضوع."
-            one: "شخص أشار لهذا كخارج عن الموضوع."
-            two: "شخصان أشارا لهذا كخارج عن الموضوع."
-            few: "{{count}} أشخاص أشاروا لهذا كخارج عن الموضوع."
-            many: "{{count}} شخص أشار لهذا كخارج عن الموضوع."
-            other: "{{count}} شخص أشار لهذا كخارج عن الموضوع."
+            zero: "لم يبلغ احد بأن هذا المنشور خارج الموضوع"
+            one: "عضو واحد أبلغ بأن هذا المنشور خارج الموضوع"
+            two: "{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع"
+            few: "{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع"
+            many: "{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع"
+            other: "{{count}} عضو أبلغ بأن هذا المنشور خارج الموضوع"
           spam:
-            zero: "لم يتم الاشارة لهذا كغير مفيد,"
-            one: "شخص أشار لهذا كغير مفيد."
-            two: "شخصان أشارا لهذا كغير مفيد."
-            few: "{{count}} أشخاص أشاروا لهذا كغير مفيد."
-            many: "{{count}} شخص أشار لهذا كغير مفيد."
-            other: "{{count}} شخص أشار لهذا كغير مفيد."
+            zero: "لم يبلّغ احد بأن هذا المنشور سبام."
+            one: "عضو واحد أبلّغ بأن هذا المنشور سبام."
+            two: "{{count}} عضو أبلّغ بأن هذا المنشور سبام."
+            few: "{{count}} عضو أبلّغ بأن هذا المنشور سبام."
+            many: "{{count}} عضو أبلّغ بأن هذا المنشور سبام."
+            other: "{{count}} عضو أبلّغ بأن هذا المنشور سبام."
           inappropriate:
-            zero: "لم تتم الإشارة لهذا كغير ملائم."
-            one: "شخص أشار لهذا كغير ملائم."
-            two: "شخصان أشارا لهذا كغير ملائم."
-            few: "{{count}} أشخاص أشاروا لهذا كغير ملائم."
-            many: "{{count}} شخص أشاروا لهذا كغير ملائم."
-            other: "{{count}} شخص أشاروا لهذا كغير ملائم."
+            zero: "لم يبلغ احد بأن هذا المنشور غير لائق."
+            one: "عضو واحد أبلّغ بأن هذا المنشور غير لائق."
+            two: "{{count}} عضو أبلّغ بأن هذا المنشور غير لائق."
+            few: "{{count}} عضو أبلّغ بأن هذا المنشور غير لائق."
+            many: "{{count}} عضو أبلّغ بأن هذا المنشور غير لائق."
+            other: "{{count}} عضو أبلّغ بأن هذا المنشور غير لائق."
           notify_moderators:
-            zero: "1 عضو علّم هذا للمراقبين"
-            one: "1 عضو علّم هذا للمراقبين"
-            two: "{{count}} أعضاء علّمو هذا للمراقبين"
-            few: "{{count}} أعضاء علّمو هذا للمراقبين"
-            many: "{{count}} أعضاء علّمو هذا للمراقبين"
-            other: "{{count}} أعضاء علّمو هذا للمراقبين"
+            zero: "لم يبلغ احد المشرفين عن هذا المنشور"
+            one: "عضو واحد أبلّغ المشرفين عن هذا المنشور"
+            two: "{{count}} عضو أبلّغ المشرفين عن هذا المنشور"
+            few: "{{count}} عضو أبلّغ المشرفين عن هذا المنشور"
+            many: "{{count}} عضو أبلّغ المشرفين عن هذا المنشور"
+            other: "{{count}} عضو أبلّغ المشرفين عن هذا المنشور"
           notify_user:
-            zero: "لم يُرسل شيء لهذا المستخدم"
-            one: "أرسل شخص واحد رسالة لهذا المستخدم"
-            two: "أرسل شخصين رسالة لهذا المستخدم"
-            few: "أرسل {{count}} أشخاص رسالة لهذا المستخدم"
-            many: "أرسل {{count}} شخصا رسالة لهذا المستخدم"
-            other: "أرسل {{count}} شخص رسالة لهذا المستخدم"
+            zero: "لم يرسل احد رسالة لهذا العضو"
+            one: "عضو واحد ارسل رسالة لهذا العضو"
+            two: "{{count}} عضو ارسل رسالة لهذا العضو"
+            few: "{{count}} عضو ارسل رسالة لهذا العضو"
+            many: "{{count}} عضو ارسل رسالة لهذا العضو"
+            other: "{{count}} عضو ارسل رسالة لهذا العضو"
           bookmark:
-            zero: "لم يعلّم أحد هذه المشاركة"
-            one: "شخص واحد علّم هذه المشاركة"
-            two: "شخصان علّما هذه المشاركة"
-            few: "{{count}} أشخاص علّموا هذه المشاركة"
-            many: "{{count}} شخصًا علّموا هذه المشاركة"
-            other: "{{count}} شخص علّموا هذه المشاركة"
+            zero: "لم يضع احد علامة مرجعية علي هذا المنشور"
+            one: "عضو واحد وضع علامة مرجعية علي هذا المنشور"
+            two: "{{count}} عضو وضع علامة مرجعية علي هذا المنشور"
+            few: "{{count}} عضو وضع علامة مرجعية علي هذا المنشور"
+            many: "{{count}} عضو وضع علامة مرجعية علي هذا المنشور"
+            other: "{{count}} عضو وضع علامة مرجعية علي هذا المنشور"
           like:
-            zero: "لم يعجب هذا أحدا"
-            one: "أعجب هذا شخص واحد"
-            two: "أعجب هذا شخصان"
-            few: "أعجب هذا {{count}} أشخاص"
-            many: "أعجب هذا {{count}} شخصا"
-            other: "أعجب هذا {{count}} شخص"
+            zero: "لم يعجب احد بهذا المنشور"
+            one: "عضو واحد اعجب بهذا المنشور"
+            two: "{{count}} عضو اعجب بهذا المنشور"
+            few: "{{count}} عضو اعجب بهذا المنشور"
+            many: "{{count}} عضو اعجب بهذا المنشور"
+            other: "{{count}} عضو اعجب بهذا المنشور"
           vote:
-            zero: "لم يصوّت أحد على هذه المشاركة"
-            one: "صوّت شخص واحد على هذه المشاركة"
-            two: "صوّت شخصان على هذه المشاركة"
-            few: "صوّت {{count}} أشخاص على هذه المشاركة"
-            many: "صوّت {{count}} شخصا على هذه المشاركة"
-            other: "صوّت {{count}} شخص على هذه المشاركة"
-      delete:
-        confirm:
-          zero: "لا شيء لحذفه."
-          one: "أمتأكد من حذف المشاركة؟"
-          two: "أمتأكد من حذف المشاركتين؟"
-          few: "أمتأكد من حذف المشاركات هذه؟"
-          many: "أمتأكد من حذف المشاركات هذه؟"
-          other: "أمتأكد من حذف المشاركات هذه؟"
+            zero: "لم يصوت احد علي هذا المنشور"
+            one: "عضو واحد صوت علي هذا المنشور"
+            two: "{{count}} عضو صوت علي هذا المنشور"
+            few: "{{count}} عضو صوت علي هذا المنشور"
+            many: "{{count}} عضو صوت علي هذا المنشور"
+            other: "{{count}} عضو صوت علي هذا المنشور"
       merge:
         confirm:
-          zero: "لا شيء لدمجه."
-          one: "أمتأكد من دمج هذه المشاركة؟"
-          two: "أمتأكد من دمج هتين المشاركتين؟"
-          few: "أمتأكد من دمج هذه المشاركات ال‍{{count}} مشاركات هذه؟"
-          many: "أمتأكد من دمج هذه المشاركات ال‍{{count}} مشاركة هذه؟"
-          other: "أمتأكد من دمج هذه المشاركات ال‍{{count}} مشاركة هذه؟"
+          zero: "لا يوجد منشورات لدمجها"
+          one: "هل انت متاكد انك تريد دمج هذا المنشور؟"
+          two: "هل انت متاكد انك تريد دمج هذان المنشوران؟"
+          few: "هل انت متاكد انك تريد دمج الـ {{count}} منشور؟"
+          many: "هل انت متاكد انك تريد دمج الـ {{count}} منشور؟"
+          other: "هل انت متاكد انك تريد دمج الـ {{count}} منشور؟"
       revisions:
         controls:
           first: "أول مراجعة"
@@ -1995,140 +2122,180 @@ ar:
           hide: "أخفِ المراجعة"
           show: "أظهر المراجعة"
           revert: "ارجع إلى هذه المراجعة"
-          edit_wiki: "حرّر الويكي"
+          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:
-            button: 'HTML'
+            title: "اعرض النسخة المنسقة في عمود واحد مع تمييز الاسطر المضافة و المحذوفة"
+            button: 'عمود واحد'
           side_by_side:
-            title: "أظهر فروقات الخرج المصيّر جنبًا إلى جنب"
-            button: 'HTML'
+            title: "اعرض الفروقات في النسخة المنسقة جنبا إلي جنب"
+            button: 'عمودين'
           side_by_side_markdown:
-            title: "أظهر فروقات المصدر الخامّ جنبًا إلى جنب"
+            title: "اعرض الفروقات في النسخة الخام جنبا إلي جنب"
+            button: 'عمودين خام'
+      raw_email:
+        displays:
+          raw:
+            title: "اعرض نص الرساله الخام"
+            button: 'خام'
+          text_part:
+            title: "اظهر الجزء النصي من رسالة البريد الالكتروني"
+            button: 'نص'
+          html_part:
+            title: "اظهر جزء الـ HTML من رسالة البريد الالكتروني"
+            button: 'HTML'
     category:
-      can: 'يمكنها&hellip;'
+      can: 'قادر علي&hellip;'
       none: '(غير مصنف)'
       all: 'كل الأقسام'
-      choose: 'اختر فئة&hellip;'
+      choose: 'اختر قسم &hellip;'
       edit: 'تعديل'
       edit_long: "تعديل"
-      view: 'اظهار المواضيع في القسم'
+      view: 'أظهار الموضوعات في القسم'
       general: 'عام'
       settings: 'اعدادات'
       topic_template: "إطار الموضوع"
-      tags: "الوسوم"
-      tags_allowed_tags: "ما يمكن استخدامه من وسوم في هذه الفئة فقط:"
-      tags_allowed_tag_groups: "مجموعات العلامات الوصفية التي تستخدم فقط في هذا القسم:"
-      tags_placeholder: "(اختياري) قائمة العلامات الوصفية المسموح بها"
-      tag_groups_placeholder: "(اختياريّ) قائمة مجموعات الوسوم المسموح بها"
+      tags: "الأوسمة"
+      tags_allowed_tags: "اسمح فقط بإستخدام هذة الأوسمة في هذا القسم."
+      tags_allowed_tag_groups: "اسمح فقط بإستخدام مجموعات الأوسمة هذة في هذا القسم."
+      tags_placeholder: "(اختياري) قائمة الأوسمة المسموح بها"
+      tag_groups_placeholder: "(اختياريّ) قائمة مجموعات الأوسمة المسموح بها"
+      topic_featured_link_allowed: "اسمح بالروابط المُميزة بهذا القسم."
       delete: 'احذف القسم'
       create: 'قسم جديد'
-      create_long: 'أنشء قسم جديدة'
+      create_long: 'أنشئ قسم جديد'
       save: 'احفظ القسم'
-      slug: 'عنوان التصنيف/Slug'
-      slug_placeholder: '(اختياريّ) كلمات مفصولة بشَرطة للعنوان'
-      creation_error: حدثت مشكلة أثناء إنشاء الفئة.
-      save_error: حدث خطأ في حفظ الفئة.
-      name: "اسم الفئة"
+      slug: 'عنوان القسم في الURL'
+      slug_placeholder: '(اختياريّ) كلمات مفصولة-بشرطة للعنوان'
+      creation_error: حدثت مشكلة أثناء إنشاء القسم.
+      save_error: حدث خطأ في حفظ القسم.
+      name: "اسم القسم"
       description: "الوصف"
-      topic: "موضوع التصنيف"
+      topic: "موضوع القسم"
       logo: "صورة القسم"
       background_image: "خلفية القسم"
-      badge_colors: "ألوان الشارة"
+      badge_colors: "ألوان الشارات"
       background_color: "لون الخلفية"
       foreground_color: "لون المقدمة"
       name_placeholder: "كلمة أو كلمتين على الأكثر"
-      color_placeholder: "أيّ لون وبّ"
+      color_placeholder: "أيّ لون متوافق مع الانترنت"
       delete_confirm: "هل تريد فعلاً حذف هذا القسم؟"
       delete_error: "حدث خطأ في حذف القسم."
       list: "عرض الأقسام"
-      no_description: "من فضلك أضف وصفا لهذه القسم."
+      no_description: "من فضلك أضف وصفا لهذا القسم."
       change_in_category_topic: "عدّل الوصف"
       already_used: 'هذا اللون تم استخدامه سابقا في قسم آخر'
       security: "الأمن"
-      special_warning: "تحذير: هذه الفئة هي فئة قبل التصنيف وإعدادات الحماية لا يمكن تعديلها. إذا لم تكن تريد استخدام هذه الفئة، احذفها بدلا من تطويعها لأغراض أخرى."
+      special_warning: "تحذير: هذا القسم هو قسم اصلي إعدادات الحماية له لا يمكن تعديلها. إذا لم تكن تريد استخدام هذا القسم، قم بحذفة بدلا من تطويعة لأغراض اخري."
       images: "الصور"
       email_in: "تعيين بريد إلكتروني خاص:"
-      email_in_allow_strangers: "قبول بريد إلكتروني من مستخدمين لا يملكون حسابات"
+      email_in_allow_strangers: "قبول بريد إلكتروني من زوار لا يملكون حسابات"
       email_in_disabled: "عُطّل إرسال المشاركات عبر البريد الإلكترونيّ من إعدادات الموقع. لتفعيل نشر المشاركات الجديدة عبر البريد،"
       email_in_disabled_click: 'قم بتفعيل خيار "email in" في الإعدادات'
-      suppress_from_homepage: "كتم هذه الفئة من الصفحة الرئيسية"
-      num_featured_topics: "عدد المواضيع المعروضة في صفحة الفئات:"
+      suppress_from_homepage: "امنع هذا القسم من الظهور في الصفحة الرئيسية."
+      show_subcategory_list: "أظهر الأقسام الفرعية فوق الموضوعات من هذا القسم."
+      num_featured_topics: "عدد الموضوعات المعروضة في صفحة الأقسام:"
+      subcategory_num_featured_topics: "عدد الموضوعات المُميزة في صفحة القسم الرئيسي."
       all_topics_wiki: "اجعل المواضيع الجديدة \"ويكي\" افتراضيًّا."
-      allow_badges_label: "السماح بالحصول على الأوسمة في هذا التصنيف"
-      edit_permissions: "حرّر التّصاريح"
+      subcategory_list_style: "أسلوب عرض قائمة الأقسام الفرعية:"
+      sort_order: "رتب قائمة الموضوعات حسب:"
+      default_view: "قائمة الموضوعات الإفتراضية"
+      default_top_period: "فترة الاكثر مشاهدة الافتراضية"
+      allow_badges_label: "السماح بالحصول على الأوسمة في هذا القسم"
+      edit_permissions: "عدل التصاريح"
       add_permission: "أضف تصريحًا"
       this_year: "هذه السنة"
       position: "المكان"
       default_position: "المكان الافتراضي"
-      position_disabled: "تُعرض الفئات بترتيب نشاطها. للتّحكّم بترتيب الفئات في القائمة،"
-      position_disabled_click: 'فعّل إعداد "أماكن الفئات ثابتة".'
-      parent: "التصنيف الأب"
+      position_disabled: "سوف تُعرض الاقسام بترتيب نشاطها. للتّحكّم بترتيب الأقسام في القائمة،"
+      position_disabled_click: 'فعّل خاصية "تثبيت ترتيب الأقسام".'
+      parent: "القسم الرئيسي"
       notifications:
         watching:
           title: "مُراقبة"
-          description: "ستراقب آليا كل مواضيع هذه الفئات. ستصلك إشعارات لكل مشاركة أو موضوع جديد، وسيظهر أيضا عدّاد للمشاركات الجديدة."
+          description: "ستراقب آليا كل الموضوعات بهذا القسم. ستصلك إشعارات لكل منشور أو موضوع جديد، وسيظهر أيضا عدّاد الردود الجديدة."
         watching_first_post:
           title: "يُراقب فيها أول مشاركة"
-          description: "سنرسل لك إشعارا فقط لأول مشاركة في كل موضوع جديد في هذه المجموعات."
+          description: "سنرسل لك إشعارا بأول منشور فقط في كل موضوع جديد بهذة الاقسام."
         tracking:
           title: "مُتابعة"
-          description: "ستتابع آليا كل مواضيع هذه الفئات. ستصلك إشعارات إن أشار أحدهم إلى @اسمك أو رد عليك، وسيظهر عدّاد للمشاركات الجديدة."
+          description: "ستتابع آليا كل موضوعات هذا القسم. ستصلك إشعارات إن أشار أحدهم إلى @اسمك أو رد عليك، وسيظهر عدّاد الردود الجديدة."
         regular:
           title: "منتظم"
           description: "ستستقبل إشعارًا إن أشار أحد إلى @اسمك أو ردّ عليك."
         muted:
           title: "مكتومة"
-          description: "لن يتم إشعارك بأي مشاركات جديدة في هذه التصنيفات ولن يتم عرضها في قائمة المواضيع المنشورة مؤخراً."
+          description: "لن يتم إشعارك بأي موضوعات جديدة في هذه الأقسام ولن يتم عرضها في قائمة الموضوعات المنشورة مؤخراً."
       sort_options:
         default: "افترضى"
-        likes: "اعجاب"
-        op_likes: "الاعجابات الاساسية للمنشور"
+        likes: "الاعجابات"
+        op_likes: "الاعجابات علي المنشور الاساسي"
         views: "المشاهدات"
         posts: "المنشورات"
         activity: "النشاط"
-        posters: "البوستر"
-        category: "التصنيف"
-        created: "انشئ "
-      sort_ascending: 'تنازلى'
+        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: "أجراء العمليه "
+      title: 'شكرا لمساعدتك في إبقاء مجتمعنا متحضرا.'
+      action: 'ابلغ عن المنشور'
+      take_action: "اتخذ اجراء"
       notify_action: 'رسالة'
       official_warning: 'تحذير رسمي'
-      delete_spammer: "احذف ناشر السخام"
+      delete_spammer: "احذف ناشر السبام"
       delete_confirm_MF: "{posts, plural,\n    zero {ليس للمستخدم أيّة مشاركات}\n    other {}\n}\n{topics, plural,\n    zero {\n        {posts, plural,\n            zero {أو مواضيع.}\n            other {ليس للمستخدم أيّة مواضيع.}\n        }\n    }\n    other {{posts, plural, zero{.} other{}}}\n}\nأنت على وشك\n{posts, plural,\n    zero {{topics, plural, zero {} other {حذف}}}\n    other {حذف}\n}\n{posts, plural,\n    zero {}\n    one {مشاركة واحدة}\n    two {مشاركتين}\n    few {# مشاركات}\n    many {# مشاركة}\n    other {# مشاركة}\n}\n{posts, plural, zero {} other {{topics, plural, zero {} other {و}}}}\n{topics, plural,\n    zero {}\n    one {موضوع واحد}\n    two {موضوعين}\n    few {# مواضيع}\n    many {# موضوعًا}\n    other {# موضوع}\n}\n{posts, plural,\n    zero {{topics, plural, zero {} other {له، و}}}\n    other {{topics, plural, zero {له، و} other {للمستخدم، و}}}\n}\nإزالة حسابه، ومنع التّسجيل من عنوان IP هذا <b>{ip_address}</b>، وإضافة عنوان البريد الإلكترونيّ <b>{email}</b> إلى قائمة منع دائم. أمتأكّد حقًّا من أنّ هذا المستخدم ناشر سخام؟"
-      yes_delete_spammer: "نعم، احذف ناشر السخام"
+      yes_delete_spammer: "نعم، احذف ناشر السبام"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(مخفي)"
-      submit_tooltip: "إرسال تبليغ"
-      take_action_tooltip: "الوصول إلى الحد الأعلى للتبليغات دون انتظار تبليغات أكثر من أعضاء الموقع."
-      cant: "المعذرة، لا يمكنك التبليغ عن هذه المشاركة في هذه اللحظة."
-      notify_staff: 'أعلِم الطّاقم بسريّة'
+      submit_tooltip: "إرسال البلاغ"
+      take_action_tooltip: "الوصول إلى الحد الأعلى للبلاغات دون انتظار بلاغات أكثر من أعضاء الموقع."
+      cant: "عذرا، لا يمكنك الابلاغ عن هذا المنشور في هذه اللحظة."
+      notify_staff: 'ابلغ طاقم العمل بسرية'
       formatted_name:
         off_topic: "خارج عن الموضوع"
         inappropriate: "غير لائق"
         spam: "هذا سبام"
-      custom_placeholder_notify_user: "كن محدد, استدلالي ودائما حسن الاخلاق"
-      custom_placeholder_notify_moderators: "ممكن تزودنا بمعلومات أكثر عن سبب عدم ارتياحك حول هذه المشاركة؟ زودنا ببعض الروابط و الأمثلة قدر الإمكان."
+      custom_placeholder_notify_user: "كن محدد و كن بناء و دائما كن حسن الخلق"
+      custom_placeholder_notify_moderators: "يمكنك تزودنا بمعلومات أكثر عن سبب عدم ارتياحك إلي هذا المنشور؟ زودنا ببعض الروابط و الأمثلة قدر الإمكان."
       custom_message:
         at_least:
           zero: "لا تُدخل أيّ محرف"
-          one: "أدخل محرفًا واحدًا على الأقلّ"
-          two: "أدخل محرفين على الأقلّ"
-          few: "أدخل {{count}} محارف على الأقلّ"
-          many: "أدخل {{count}} محرفًا على الأقلّ"
-          other: "أدخل {{count}} محرف على الأقلّ"
+          one: "أدخل حرف واحد على الأقل"
+          two: "أدخل {{count}} احرف على الأقل"
+          few: "أدخل {{count}} احرف على الأقل"
+          many: "أدخل {{count}} احرف على الأقل"
+          other: "أدخل {{count}} احرف على الأقل"
+        more:
+          zero: "{{count}} حرف متبقي علي الحد الادني..."
+          one: "حرف واحد متبقي علي الحد الادني..."
+          two: "{{count}} حرف متبقي علي الحد الادني..."
+          few: "{{count}} حرف متبقي علي الحد الادني..."
+          many: "{{count}} حرف متبقي علي الحد الادني..."
+          other: "{{count}} حرف متبقي علي الحد الادني..."
+        left:
+          zero: "{{count}} حرف متبقي علي الحد الاقصي..."
+          one: "حرف واحد متبقي علي الحد الاقصي..."
+          two: "{{count}} حرف متبقي علي الحد الاقصي..."
+          few: "{{count}} حرف متبقي علي الحد الاقصي..."
+          many: "{{count}} حرف متبقي علي الحد الاقصي..."
+          other: "{{count}} حرف متبقي علي الحد الاقصي..."
     flagging_topic:
-      title: "شكرا لمساعدتنا في ابقاء مجتمعنا نضيفا"
+      title: "شكرا لمساعدتنا في ابقاء المجمتع متحضر"
       action: "التبليغ عن الموضوع"
       notify_action: "رسالة"
     topic_map:
       title: "ملخص الموضوع"
-      participants_title: "المشاركون المعتادون"
-      links_title: "روابط شائعة"
+      participants_title: "الناشرون المترددون"
+      links_title: "روابط مشهورة"
       links_shown: "أظهر روابط أخرى..."
       clicks:
         zero: "لا نقرات"
@@ -2145,38 +2312,38 @@ ar:
         two: "إثنتان أخريتان"
         few: "%{count} أخرى"
         many: "%{count} أخرى"
-        other: "%{count} أخرى"
+        other: "%{count} أكثر"
     topic_statuses:
       warning:
         help: "هذا تحذير رسمي."
       bookmarked:
-        help: "لقد علّمت هذا الموضوع"
+        help: "لقد وضعت علامة مرجعية علي هذا الموضوع"
       locked:
-        help: "هذا الموضوع مغلق ولم يعد يستقبل ردودا"
+        help: "هذا الموضوع مغلق, لذا فهو لم يعد يستقبل ردودا"
       archived:
-        help: "هذا الموضوع مؤرشف، لذا فهو مجمّد ولا يمكن تعديله"
+        help: "هذا الموضوع مؤرشف، لذا فهو مجمد ولا يمكن تعديله"
       locked_and_archived:
-        help: "هذا الموضوع مغلق ومؤرشف، لذا لم يعد يستقبل ردودًا ولا يمكن تغييره"
+        help: "هذا الموضوع مغلق ومؤرشف، لذا فهو لم يعد يستقبل ردودًا ولا يمكن تغييره"
       unpinned:
         title: "غير مثبّت"
-        help: "هذا الموضوع غير مثبّت لك، وسيُعرض بالترتيب العاديّ"
+        help: "هذا الموضوع غير مثبّت لك، وسيُعرض بالترتيب العادي"
       pinned_globally:
         title: "مثبّت للعموم"
-        help: "هذا الموضوع مثبت بشكل عام, سوف يظهر في مقدمة المواضيع بآخر المشاركات وفي الأقسام الخاصة به"
+        help: "هذا الموضوع مثبت بشكل عام, سوف يظهر في مقدمة قائمة اخر الموضوعات وفي القسم الخاصة به."
       pinned:
         title: "مثبّت"
-        help: "هذا الموضوع مثبّت لك، وسيُعرض أعلى فئته"
+        help: "هذا الموضوع مثبّت لك، وسيُعرض أعلى قسمة"
       invisible:
-        help: "هذا الموضوع غير مصنف لن يظهر في قائمة التصانيف ولايمكن الدخول عليه الابرابط مباشر."
-    posts: "مشاركات"
-    posts_long: "هناك {{number}} مشاركات في هذا الموضوع"
+        help: "هذا الموضوع غير مدرج, لن يظهر في قائمة الموضوعات ولا يمكن الوصول إلية إلا برابط مباشر"
+    posts: "منشورات"
+    posts_long: "هناك {{number}} منشور في هذا الموضوع"
     posts_likes_MF: |
       {count, plural, zero {ليس في هذا الموضوع أي رد} one {في هذا الموضوع رد واحد} two {في هذا الموضوع ردان} few {في هذا الموضوع # ردود} many {في هذا الموضوع # ردا} other {في هذا الموضوع # رد}} {ratio, select,
       low {ونسبة الإعجاب إلى المشاركة عالية}
       med {ونسبة الإعجاب إلى المشاركة عالية جدا}
       high {ونسبة الإعجاب إلى المشاركة مهولة}
       other {}}
-    original_post: "المشاركة الاصلية"
+    original_post: "المنشور الاصلي"
     views: "المشاهدات"
     views_lowercase:
       zero: "المشاهدات"
@@ -2186,6 +2353,13 @@ ar:
       many: "المشاهدات"
       other: "المشاهدات"
     replies: "الردود"
+    views_long:
+      zero: "تم مشاهدة هذا الموضوع {{number}} مرة"
+      one: "تم مشاهدة هذا الموضوع مرة واحدة"
+      two: "تم مشاهدة هذا الموضوع {{number}} مرة"
+      few: "تم مشاهدة هذا الموضوع {{number}} مرة"
+      many: "تم مشاهدة هذا الموضوع {{number}} مرة"
+      other: "تم مشاهدة هذا الموضوع {{number}} مرة"
     activity: "النشاط"
     likes: "اعجابات"
     likes_lowercase:
@@ -2196,23 +2370,24 @@ ar:
       many: "اﻹعجابات"
       other: "اﻹعجابات"
     likes_long: "هناك {{number}} اعجابات في هذا الموضوع"
-    users: "المستخدمون"
+    users: "الأعضاء"
     users_lowercase:
-      zero: "المستخدمون"
-      one: "المستخدمون"
-      two: "المستخدمون"
-      few: "المستخدمون"
-      many: "المستخدمون"
-      other: "المستخدمون"
-    category_title: "الفئة"
+      zero: "عضو"
+      one: "عضو واحد"
+      two: "عضوين"
+      few: "الأعضاء"
+      many: "الأعضاء"
+      other: "الأعضاء"
+    category_title: "قسم"
     history: "تاريخ"
     changed_by: "الكاتب {{author}}"
     raw_email:
+      title: "البريد الإلكتروني الوارد"
       not_available: "غير متوفر!"
-    categories_list: "قائمة الاقسام"
+    categories_list: "قائمة الأقسام"
     filters:
-      with_topics: "المواضيع %{filter}"
-      with_category: "المواضيع %{filter} في %{category}"
+      with_topics: "الموضوعات %{filter}"
+      with_category: "الموضوعات%{filter} في %{category}"
       latest:
         title: "الأخيرة"
         title_with_count:
@@ -2222,20 +2397,20 @@ ar:
           few: "الأخيرة ({{count}})"
           many: "الأخيرة ({{count}})"
           other: "الأخيرة ({{count}})"
-        help: "المواضيع التي فيها مشاركات حديثة"
+        help: "الموضوعات التي بها منشورات حديثة"
       hot:
         title: "نَشط"
-        help: "مختارات من مواضيع ساخنة"
+        help: "مختارات من انشط الموضوعات"
       read:
         title: "المقروءة"
-        help: "المواضيع التي قرأتها بترتيب آخر قراءة لها"
+        help: "المواضيع التي قرأتها بترتيب قرائتك لها"
       search:
         title: "بحث"
-        help: "بحث في كل المواضيع"
+        help: "بحث في كل الموضوعات"
       categories:
         title: "الأقسام"
         title_in: "قسم - {{categoryName}}"
-        help: "كلّ المواضيع مجمّعة حسب الفئة"
+        help: "كلّ الموضوعات مجمّعة حسب القسم"
       unread:
         title: "غير المقروءة"
         title_with_count:
@@ -2245,7 +2420,7 @@ ar:
           few: "غير المقروءة ({{count}})"
           many: "غير المقروءة ({{count}})"
           other: "غير المقروءة ({{count}})"
-        help: "المواضيع التي تتابعها (أو تراقبها) والتي فيها مشاركات غير مقروءة"
+        help: "الموضوعات التي تتابعها (أو تراقبها) والتي فيها منشورات غير مقروءة"
         lower_title_with_count:
           zero: "1 غير مقررء "
           one: "1 غير مقروء"
@@ -2260,8 +2435,8 @@ ar:
           two: "{{count}} جديد"
           few: "{{count}} جديد"
           many: "{{count}} جديد"
-          other: "{{count}} جديد"
-        lower_title: "جديد"
+          other: "{{count}} جديدة"
+        lower_title: "الجديدة"
         title: "الجديدة"
         title_with_count:
           zero: "الجديدة ({{count}})"
@@ -2272,11 +2447,11 @@ ar:
           other: "الجديدة ({{count}})"
         help: "المواضيع المنشأة في الأيّام القليلة الماضية"
       posted:
-        title: "مشاركاتي"
-        help: "مواضيع شاركت بها "
+        title: "منشوراتي"
+        help: "مواضيع نشرت بها "
       bookmarks:
-        title: "العلامات"
-        help: "مواضيع قمت بتفضيلها"
+        title: "العلامات المرجعية"
+        help: "موضوعات وضعت عليها علامة مرجعية"
       category:
         title: "{{categoryName}}"
         title_with_count:
@@ -2286,30 +2461,30 @@ ar:
           few: "{{categoryName}} ({{count}})"
           many: "{{categoryName}} ({{count}})"
           other: "{{categoryName}} ({{count}})"
-        help: "آخر المواضيع في فئة {{categoryName}}"
+        help: "آخر الموضوعات في قسم {{categoryName}}"
       top:
         title: "الأكثر مُشاهدة"
-        help: "أكثر المواضيع نشاطًا في آخر عام، أو شهر أو أسبوع أو يوم"
+        help: "أكثر المواضيع نشاطًا في آخر عام أو شهر أو أسبوع أو يوم"
         all:
-          title: "كلّها"
+          title: "كل الوقت"
         yearly:
-          title: "السّنويّة"
+          title: "سنة"
         quarterly:
-          title: "الرّبعيّة"
+          title: "ربع سنة"
         monthly:
-          title: "الشّهريّة"
+          title: "شهر"
         weekly:
-          title: "الأسبوعيّة"
+          title: "اسبوع"
         daily:
-          title: "اليوميّة"
-        all_time: "على مرّ الزّمن"
+          title: "يوم"
+        all_time: "كل الوقت"
         this_year: "سنة"
         this_quarter: "ربع"
         this_month: "شهر"
         this_week: "أسبوع"
         today: "يوم"
-        other_periods: "مشاهدة الأفضل"
-    browser_update: 'للأسف، <a href="http://www.discourse.org/faq/#browser">متصفّحك قديم جدًّا ليعمل عليه هذا الموقع</a>. من فضلك <a href="http://browsehappy.com">رقّه</a>.'
+        other_periods: "اعرض الاكثر مشاهدة"
+    browser_update: 'للأسف، <a href="http://www.discourse.org/faq/#browser">متصفّحك قديم جدًّا ليعمل عليه هذا الموقع</a>. من فضلك <a href="http://browsehappy.com">حدث المتصفح خاصتك</a>.'
     permission_types:
       full: "انشاء / رد / مشاهدة"
       create_post: "رد / مشاهدة"
@@ -2319,19 +2494,19 @@ ar:
     keyboard_shortcuts_help:
       title: 'اختصارات لوحة المفاتيح'
       jump_to:
-        title: 'الانتقال'
+        title: 'الانتقال إلي'
         home: '<b>g</b>، <b>h</b> الرّئيسيّة'
         latest: '<b>g</b>، <b>l</b> الأخيرة'
-        new: '<b>g</b>، <b>n</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> اللاحة'
+        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> الانتقال الى المشاركة #'
+        jump: '<b>#</b> الانتقال الى المنشور#'
         back: '<b>u</b> العودة'
         up_down: '<b>k</b>/<b>j</b> نقل المحدد &uarr; &darr;'
         open: '<b>o</b> أو <b>Enter</b> فتح الموضوع المحدد'
@@ -2342,63 +2517,78 @@ ar:
         notifications: '<b>n</b> فتح الإشعارات'
         hamburger_menu: '<b>=</b> فتح القائمة الرّئيسيّة'
         user_profile_menu: '<b>p</b>فتح قائمة المستخدم'
-        show_incoming_updated_topics: '<b>.</b> عرض المواضيع المحدثة'
-        search: '<b>/</b> البحث'
+        show_incoming_updated_topics: '<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> الخروج'
+        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> تثبيت الموضوع أو إلغاء تثبيته'
+        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>'
+        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> حذف المشاركة'
+        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:
-      granted_on: "ممنوح في  %{date}"
-      others_count: "اخرون بنفس الدرع (%{count})"
+      earned_n_times:
+        zero: "لم تمنح هذه الشارة ابدا"
+        one: "مُنحت هذة الشارة مرة واحدة"
+        two: "مُنحت هذة الشارة مرتان"
+        few: "مُنحت هذه الشارة %{count} مرة"
+        many: "مُنحت هذه الشارة %{count} مرة"
+        other: "مُنحت هذه الشارة %{count} مرة"
+      granted_on: "ممنوح منذ %{date}"
+      others_count: "عدد من حصل علي نفس الشارة (%{count})"
       title: الشارات
+      allow_title: "يمكنك استخدام هذة الشارة كلقب"
+      multiple_grant: "يُمكن ان تُمنح هذة الشارة اكثر من مرة"
       badge_count:
         zero: "لا شارات"
         one: "شارة واحدة"
         two: "شارتان"
-        few: "%{count} شارات"
+        few: "%{count} شارة"
         many: "%{count} شارة"
         other: "%{count} شارة"
+      more_badges:
+        zero: "بدون شارات"
+        one: "شارة واحدة اكثر"
+        two: "شارتان اكثر"
+        few: "+%{count} اكثر"
+        many: "+%{count} اكثر"
+        other: "+%{count} اكثر"
       granted:
-        zero: "%{count} مونحَ."
-        one: "1 مونحَ."
-        two: "%{count} مونحَ."
-        few: "%{count} مونحَ."
-        many: "%{count} مونحَ."
-        other: "%{count} مونحَ."
-      select_badge_for_title: حدد وسام لتستخدمه كعنوانك
+        zero: "لا يوجد ممنوحين"
+        one: "ممنوح واحد"
+        two: "%{count} ممنوح"
+        few: "%{count} ممنوح."
+        many: "%{count} ممنوح."
+        other: "%{count} ممنوح."
+      select_badge_for_title: اختر شارة لتستخدمها كلقب لك.
       none: "لا شئ"
       badge_grouping:
         getting_started:
-          name: البداية
+          name: الاساسية
         community:
-          name: مجتمع
+          name: المجتمعية
         trust_level:
-          name: مستوى الثقة
+          name: مستويات الثقة
         other:
           name: أخرى
         posting:
-          name: نشر
+          name: النشر
     google_search: |
       <h3>ابحث باستخدام غوغل</h3>
       <p>
@@ -2409,30 +2599,36 @@ ar:
       </form>
       </p>
     tagging:
-      all_tags: "كل الوسوم"
-      selector_all_tags: "كل الوسوم"
-      selector_no_tags: "لا وسوم"
-      changed: "الوسوم المعدلة:"
-      tags: "الوسوم"
-      choose_for_topic: "اختر (إن أردت) وسوما لهذا الموضوع"
+      all_tags: "كل الأوسمة"
+      selector_all_tags: "كل الأوسمة"
+      selector_no_tags: "لا أوسمة"
+      changed: "الأوسمة المعدلة:"
+      tags: "الأوسمة"
       delete_tag: "احذف الوسم"
-      delete_confirm: "أمتأكد من حذف هذا الوسم؟"
+      delete_confirm:
+        zero: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
+        one: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من موضوع واحد؟"
+        two: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
+        few: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
+        many: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
+        other: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
+      delete_confirm_no_topics: "هل أنت متاكد انك تريد حذف هذا الوسم؟"
       rename_tag: "أعد تسمية الوسم"
       rename_instructions: "اختر اسما جديدا للوسم:"
       sort_by: "افرز ب‍:"
       sort_by_count: "العدد"
       sort_by_name: "الاسم"
-      manage_groups: "أدر مجموعات الوسوم"
-      manage_groups_description: "اصنع مجموعات لتنظيم الوسوم"
+      manage_groups: "أدرج مجموعات الأوسمة"
+      manage_groups_description: "أنشئ مجموعات لتنظيم الأوسمة"
       filters:
         without_category: "مواضيع %{tag} %{filter}"
-        with_category: "مواضيع %{tag} %{filter} في %{category}"
+        with_category: "موضوعات %{filter}%{tag}  في %{category}"
         untagged_without_category: "مواضيع %{filter} غير الموسومة"
-        untagged_with_category: "مواضيع %{filter} غير الموسومة في %{category}"
+        untagged_with_category: "الموضوعات%{filter} غير الموسومة في %{category}"
       notifications:
         watching:
           title: "مُراقب"
-          description: "ستتابع بشكل تلقائي جديد هذه التصنيفات. سيتم إشعارك بكل مشاركة او موضوع، بالإضافة لذلك سيتم عرض عدد  المشاركات الغير مقروءة و الجديدة بجانب الموضوع."
+          description: "ستتابع بشكل تلقائي جديد هذه الأقسام. سيتم إشعارك بكل منشور او موضوع، بالإضافة لذلك سيتم عرض عدد  المنشورات الغير مقروءة و الجديدة بجانب الموضوع."
         watching_first_post:
           title: "يُراقب فيه أول مشاركة"
           description: "ستستقبل إشعارًا لأوّل مشاركة في كلّ موضوع في هذا الوسم."
@@ -2446,15 +2642,15 @@ ar:
           title: "مكتوم"
           description: "لن تستقبل أيّ إشعار لأيّ موضوع جديد في هذا الوسم، ولن تظهر هذه المواضيع في لسان المواضيع غير المقروءة."
       groups:
-        title: "مجموعات الوسوم"
-        about: "أضف وسوما للمجموعات ليسهل عليك إدارتها."
+        title: "مجموعات الأوسمة"
+        about: "ضع الأوسمة في مجموعات ليسهل عليك إدارتها."
         new: "مجموعة جديدة"
-        tags_label: "الوسوم في هذه المجموعة:"
+        tags_label: "الأوسمة في هذه المجموعة:"
         parent_tag_label: "التصنيف الأب"
         parent_tag_placeholder: "اختياري"
-        parent_tag_description: "لا يمكن استخدام الوسوم في هذه المجموعة ما لم يوجد الوسم الأب."
-        one_per_topic_label: "اختر علامة وصفية واحدة لكل موضوع من هذه المجموعة"
-        new_name: "مجموعة وسوم جديدة"
+        parent_tag_description: "لا يمكن استخدام الأوسمة في هذه المجموعة ما لم يوجد الوسم الأب."
+        one_per_topic_label: "السماح بوسم واحد فقط من هذة المجموعة لكل موضوع"
+        new_name: "مجموعة أوسمة جديدة"
         save: "حفظ"
         delete: "حذف"
         confirm_delete: "أمتأكد من حذف مجموعة الوسوم هذه؟"
@@ -2463,27 +2659,27 @@ ar:
           unread: "ليست هناك مواضيع غير مقروءة."
           new: "ليست هناك مواضيع جديدة."
           read: "لم تقرأ أيّ موضوع بعد."
-          posted: "لم تشارك في أيّ موضوع بعد."
-          latest: "ليست هناك مواضيع حديثة."
-          hot: "لا يوجد المزيد من المواضيع النشطة"
-          bookmarks: "لا مواضيع معلّمة بعد."
-          top: "لا يوجد المزيد من المواضيع العليا"
-          search: "لا نتائج للبحث."
+          posted: "لم تنشر في أيّ موضوع بعد.."
+          latest: "لا يوجد موضوعات حديثة."
+          hot: "لا يوجد موضوعات نشطة."
+          bookmarks: "لم تقم بوضع علامات مرجعية علي اي موضوع بعد."
+          top: "لا يوجد موضوعات الاكثر مشاهدة."
+          search: "لا يوجد نتائج للبحث."
         bottom:
-          latest: "ليست هناك مواضيع حديثة أخرى."
-          hot: "لا يوجد المزيد من المواضيع النشطة"
-          posted: "لا يوجد مواضيع أخرى."
-          read: "لا مواضيع مقروءة أخرى."
-          new: "لا مواضيع جديدة أخرى."
-          unread: "لا مواضيع غير مقروءة أخرى."
-          top: "لقد اطلعت على كل المواضيع المميزة حتى هذه اللحظة."
-          bookmarks: "لايوجد المزيد من المواضيع في المفضلة"
+          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_forum: "مرحبا. عليك الانضمام إلى هذا المجتمع!"
       custom_message_template_topic: "مرحبا. أظن أن هذا الموضوع سيسعدك!"
     safe_mode:
       enabled: "الوضع الآمن مفعّل، لتخرج منه أغلق نافذة المتصفّح هذه"
@@ -2491,18 +2687,18 @@ ar:
     type_to_filter: "اكتب للتّرشيح..."
     admin:
       title: 'مدير المجتمع'
-      moderator: 'مراقب'
+      moderator: 'مشرف'
       dashboard:
         title: "لوحة التحكم"
         last_updated: "أخر تحديث للوحة التحكم:"
-        version: "الإصدارة"
-        up_to_date: "لديك أحدث إصدارة!"
-        critical_available: "يتوفّر تحديث لمشاكل حرجة."
+        version: "الإصدار"
+        up_to_date: "لديك أحدث إصدار!"
+        critical_available: "يتوفّر تحديث لمشكلات حرجة."
         updates_available: "التحديثات متوفرة."
         please_upgrade: "من فضلك رقّ البرمجية!"
-        no_check_performed: "لم يجرِ التماس التّحديثات. تحقّق من عمل sidekiq."
-        stale_data: "لم يجرِ التماس التّحديثات حديثًا. تحقّق من عمل sidekiq."
-        version_check_pending: "يبدو أنك رقّيت الموقع مؤخرا. مذهل!"
+        no_check_performed: "لم يتم التحقق من التحديثات. تأكد أن sidekiq قيد التشغيل."
+        stale_data: "لم يتم التحقق من التحديثات مؤخراً. تاكد أن sidekiq قيد التشغيل."
+        version_check_pending: "يبدو أنك قمت بتحديث الموقع مؤخرا. رائع!"
         installed_version: "المثبتة"
         latest_version: "الأخيرة"
         problems_found: "عُثر على مشاكل في تثبيت نسخة دسكورس هذه:"
@@ -2511,12 +2707,11 @@ ar:
         no_problems: "لا مشاكل."
         moderators: 'المشرفون:'
         admins: 'المدراء:'
-        blocked: 'محظور:'
-        suspended: 'موقوف:'
+        suspended: 'موقوفون:'
         private_messages_short: "الرسائل"
         private_messages_title: "الرسائل"
         mobile_title: "متنقل"
-        space_free: "{{size}} حرّ"
+        space_free: "{{size}} فارغ"
         uploads: "عمليات الرفع"
         backups: "النسخ الاحتياطية"
         traffic_short: "المرور"
@@ -2534,49 +2729,41 @@ ar:
           30_days_ago: "منذ ٣٠ يوم"
           all: "الكل"
           view_table: "جدول"
-          view_graph: "شكل رسومي"
+          view_graph: "رسم بياني"
           refresh_report: "تحديث التقرير "
           start_date: "تاريخ البدء"
           end_date: "تاريخ الإنتهاء"
-          groups: "جميع الفئات"
+          groups: "كل المجموعات"
       commits:
         latest_changes: "آخر تغيير: يرجى التحديث"
         by: "بواسطة"
       flags:
-        title: "التبليغات"
-        old: "قديم"
-        active: "نشط"
+        title: "البلاغات"
+        active_posts: "المنشورات المبلغ عنها "
+        old_posts: "المنشورات القديمة المبلغ عنها "
+        topics: "الموشوعات المبلغ عنها "
         agree: "أوافق"
-        agree_title: "أكد هذا البلاغ لكونه صحيح وصالح"
-        agree_flag_modal_title: "أوافق مع ..."
-        agree_flag_hide_post: "اوافق (اخفاء المشاركة + ارسال ر.خ)"
-        agree_flag_hide_post_title: "أخفي هذه المشاركة وَ تلقائيا بإرسال رسالة للمستخدم وحثهم على تحريرها"
-        agree_flag_restore_post: "موافق (استعادة المشاركة)"
-        agree_flag_restore_post_title: "استعد هذه المشاركة."
-        agree_flag: "الموافقه على التبليغ"
-        agree_flag_title: "الموافقة مع التَعَلّيم وحفظ المشاركة دون تغيير."
-        defer_flag: "تأجيل"
-        defer_flag_title: "إزالة البلاغ، لا يتطلب منك إجراء في الوقت الحالي."
-        delete: "حذف"
-        delete_title: "حذف المشاركة المرتبطة بهذا البلاغ"
-        delete_post_defer_flag: "حذف المشاركة مع تأجيل البلاغ"
-        delete_post_defer_flag_title: "حذف المشاركة. اذا كانت المشاركة الاولى, احذف الموضوع"
-        delete_post_agree_flag: "حذف المشاركة مع الموافقة على البلاغ"
-        delete_post_agree_flag_title: "حذف المشاركة. اذا كانت المشاركة الاولى, احذف الموضوع"
-        delete_flag_modal_title: "حذف مع ..."
-        delete_spammer: "احذف ناشر السخام"
-        delete_spammer_title: "احذف المستخدم مع مشاركاته ومواضيعه."
-        disagree_flag_unhide_post: "أختلف مع البلاغ، إعادة إظهار المشاركة."
-        disagree_flag_unhide_post_title: "حذف أي بلاغ يخص هذه المشاركة مع إظهارها مرة أخرى"
-        disagree_flag: "أختلف"
+        agree_title: "أكد هذا البلاغ كونه صحيح وصالح"
+        defer_flag_title: "ازل هذا البلاغ، لا يتطلب منك إجراء في الوقت الحالي."
+        delete: "احذف"
+        delete_title: "احذف المنشور المرتبط بهذا البلاغ"
+        delete_post_defer_flag_title: "احذف المنشور. اذا كان المنشور الاول, احذف الموضوع"
+        delete_post_agree_flag_title: "احذف المنشور. اذا كان المنشور الاول, احذف الموضوع"
+        delete_flag_modal_title: "احذف و..."
+        delete_spammer: "احذف ناشر السبام"
+        delete_spammer_title: "احذف العضو و كل منشوراتة و موضوعاتة."
+        disagree_flag_unhide_post: "لا اوافق (اعد اظهار المنشور)"
+        disagree_flag_unhide_post_title: "احذف أي بلاغ يخص هذا المنشور و اظهر المنشور مرة اخري"
+        disagree_flag: "لا اوافق"
         disagree_flag_title: "رفض هذا البلاغ لكونه خاطئ"
         clear_topic_flags: "إتمام العملية"
         clear_topic_flags_title: "تم فحص الموضوع وحل المشاكل المتعلقة به. إضغط على إتمام العملية لحذف هذه البلاغات."
-        more: "ردود أكثر..."
+        more: "(ردود أكثر...)"
+        suspend_user: "عضو موقوف"
+        suspend_user_title: "اوقف عضو عن هذا المنشور"
         dispositions:
           agreed: "متفق"
           disagreed: "أختلف"
-          deferred: "مؤجل"
         flagged_by: "مُبلّغ عنه بواسطة"
         resolved_by: "تم حلّه بواسطة"
         took_action: "اجريت العمليات"
@@ -2584,80 +2771,61 @@ ar:
         error: "حدث خطب ما"
         reply_message: "الرد"
         no_results: "لا يوجد بلاغات."
-        topic_flagged: "هذا  <strong>الموضوع</strong> قد عُلِّم."
-        visit_topic: "زيارة الموضوع لاتخاذ قرار"
-        was_edited: "تم تعديل المشاركة بعد أول بلاغ"
-        previous_flags_count: "هذه المشاركة قد سبق الإشارة إليها {{count}} مرات."
-        summary:
-          action_type_3:
-            zero: "خارج عن الموضوع"
-            one: "خارج عن الموضوع"
-            two: "خارج عن الموضوع x{{count}}"
-            few: "خارج عن الموضوع x{{count}}"
-            many: "خارج عن الموضوع x{{count}}"
-            other: "خارج عن الموضوع x{{count}}"
-          action_type_4:
-            zero: "غير ملائم"
-            one: "غير ملائم"
-            two: "غير ملائم x{{count}}"
-            few: "غير ملائم x{{count}}"
-            many: "غير ملائم x{{count}}"
-            other: "غير ملائم x{{count}}"
-          action_type_6:
-            zero: "مخصص"
-            one: "مخصص"
-            two: "مخصص x{{count}}"
-            few: "مخصص x{{count}}"
-            many: "مخصص x{{count}}"
-            other: "مخصص x{{count}}"
-          action_type_7:
-            zero: "مخصص"
-            one: "مخصص"
-            two: "مخصص x{{count}}"
-            few: "مخصص x{{count}}"
-            many: "مخصص x{{count}}"
-            other: "مخصص x{{count}}"
-          action_type_8:
-            zero: "رسائل مزعجة"
-            one: "رسائل مزعجة"
-            two: "رسائل مزعجة x{{count}}"
-            few: "رسائل مزعجة x{{count}}"
-            many: "رسائل مزعجة x{{count}}"
-            other: "رسائل مزعجة x{{count}}"
+        topic_flagged: "هذا <strong>الموضوع</strong> قد ابلغ عنة."
+        show_full: "عرض المنشور كاملاًَ"
+        visit_topic: "انتقل إلى الموضوع لاتخاذ إجراء"
+        was_edited: "تم تعديل المنشور بعد أول بلاغ"
+        previous_flags_count: "هذا المنشور قد سبق الإبلاغ عنه {{count}} مرة."
+        show_details: "اظهر تفاصيل البلاغ"
+        details: "التفاصيل"
+        flagged_topics:
+          topic: "موضوع"
+          type: "النوع"
+          users: "الأعضاء"
+          last_flagged: "اخر البلاغات"
+        short_names:
+          off_topic: "خارج الموضوع"
+          inappropriate: "غير لائق"
+          spam: "مزعج"
+          notify_user: "مخصص"
+          notify_moderators: "مخصص"
       groups:
         primary: "المجموعة الأساسية"
-        no_primary: "(لايوجد مجموعة أساسية)"
+        no_primary: "(لا يوجد مجموعة أساسية)"
         title: "مجموعات"
         edit: "تعديل المجموعة"
         refresh: "تحديث"
         new: "جديد"
         selector_placeholder: "أدخل اسم المستخدم"
-        about: "هنا عدّل على عضوية المجموعة والاسماء"
+        about: "عدل عضوية المجموعة وأسماءها هنا"
         group_members: "أعضاء المجموعة"
-        delete: "حذف"
-        delete_confirm: "أأحذف هذه المجموعة؟"
+        delete: "احذف"
+        delete_confirm: "هل تريد حذف هذه المجموعة؟"
         delete_failed: "تعذّر حذف المجموعة. إن كانت مجموعة آليّة، فلا يمكن تدميرها."
         delete_owner_confirm: "هل تريد إزالة صلاحيات الإدارة من '%{username} ؟"
         add: "اضافة"
-        add_members: "اضافة عضو"
+        add_members: "اضافة اعضاء"
         custom: "مخصص"
-        bulk_complete: "أُضيف المستخدمون إلى المجموعة."
-        bulk: "اضافة بالجملة للمجموعة"
-        bulk_paste: "ألصق قائمة بأسماء المستخدمين أو عناوين البريد، واحد في كلّ سطر:"
+        bulk_complete: "تمت إضافة الاعضاء إلى المجموعة."
+        bulk_complete_users_not_added: "هؤلاء الاعضاء لم يتم اضافتهم (تأكد انهم يملكون حساب)"
+        bulk: "إضافة متعددة إلى المجموعة"
+        bulk_paste: "الصق قائمة بأسماء الاعضاء أو عناوين البريد الإلكتروني، واحد لكل سطر:"
         bulk_select: "(اختر مجموعة)"
         automatic: "تلقائي"
         automatic_membership_email_domains: "المستخدمين الذين يمتلكون بريد الالكتروني عنوانه مطابق للعنوان الذي في القائمة سيتم تلقائيا اضافتهم للمجموعة."
-        automatic_membership_retroactive: "اضافة الاعضاء الذين يمتكلون عنوان ايميل مطابق للعنوان الموجود في القائمة."
+        automatic_membership_retroactive: "تطبيق نفس قاعدة عنوان البريد الإلكتروني لإضافة الاعضاء المسجلين الحاليين"
         default_title: "العنوان الافتراضي لكل أعضاء هذه المجموعة"
-        primary_group: "تلقيائاً ضعها كمجموعة أساسية."
+        primary_group: "تعيين تلقائيا كمجموعة أساسية"
         group_owners: الملّاك
         add_owners: اضف ملّاكً
         incoming_email: "تعيين بريد إلكتروني خاص:"
         incoming_email_placeholder: "يرجى إدخال بريد الكتروني فعّال."
+        none_selected: "اختر مجموعة للبدء"
+        no_custom_groups: "انشئ مجموعة جديدة مخصصة"
       api:
         generate_master: "توليد مفتاح  API رئيسى"
         none: "لا مفاتيح API نشطة حاليًّا."
-        user: "مستخدمين"
+        user: "الاعضاء"
         title: "API"
         key: "مفتاح API"
         generate: "إنشاء"
@@ -2666,22 +2834,37 @@ ar:
         confirm_regen: "أمتأكّد من استبدال مفتاح API هذا بواحد جديد؟"
         confirm_revoke: "هل أنت متأكد من رغبتك في تعطيل هذا المفتاح؟"
         info_html: "مفتاح API الخاص بك سيسمح لك بانشاء أو تعديل مواضيع باستخدام أليات رسائل JSON."
-        all_users: "جميع المستخدمين"
+        all_users: "جميع الاعضاء"
         note_html: "حافظ على <strong>سرية</strong> هذا المفتاح، اي شخص يحصل عليه يستطيع انشاء مواضيع باسم اي مستخدم اخر"
       web_hooks:
-        detailed_instruction: "سيُرسل طلب POST إلى العنوان الموفّر عندما يحدث الحدث المنتقى."
+        title: "Webhooks"
+        none: "لا يوجد Webhooks حاليا."
+        instruction: "Webhooks تسمح للموقع باشعار خدمات خارجية عند حدوث حدث محدد في الموقع. عندما يتم تفعيل ال Webhooks سوف يتم ارسال  POST request لعنوان ال URL للخدمة."
+        detailed_instruction: "سيُرسل POST request إلى العنوان الURL للموفر عند حدوث الحدث المنشود."
+        new: "Webhook جديد"
         create: "أنشئ"
-        save: "حفظ"
-        destroy: "مسح"
+        save: "احفظ"
+        destroy: "أحذف"
         description: "الوصف"
         controls: "التحكم"
+        go_back: "العودة إلي القائمة"
+        payload_url: "الURL المستهدف"
+        payload_url_placeholder: "https://example.com/postreceive"
+        warn_local_payload_url: "يبدو أنك تحاول إعداد الwebhook علي عنوان محلي. ارسال الاحداث إلي عنوان محلي قد يؤدي إلى حدوث آثار جانبية أو سلوكيات غير متوقعة. استمر؟"
+        secret_invalid: "يجب ألا يحتوي الرمز السري على أية فواصل."
+        secret_too_short: "يجب أن يكون الرمز السري 12 حرفا على الأقل."
+        secret_placeholder: "كلمة اختيارية، تستخدم لتوليد توقيع إلكتروني"
+        event_type_missing: "يجب ان تحدد علي الاقل نوع واحد من الاحداث."
         content_type: "نوع المحتوى"
-        secret: "سر"
-        wildcard_event: "ارسل إلى أى شئ."
+        secret: "الرمز السري"
+        event_chooser: "اي احداي يجب ان تفعل هذا الwebhook؟"
+        wildcard_event: "ارسل إلى كل شئ."
+        individual_event: "حدد احداث مفردة."
+        verify_certificate: "تحقق من شهادة  TLS لعنوان الURL المستهدف"
         active: "فعل"
+        active_notice: "سوف يتم ارسال تفاصيل الحدث عند حدوثة."
         user_event:
           name: "أحداث المستخدم"
-          details: "عندما مستخدم ينشئ، يؤكد او يُحدث."
         delivery_status:
           title: "حالة التوصيل"
           inactive: "قيد التفعيل"
@@ -2712,8 +2895,8 @@ ar:
         title: "الإضافات"
         installed: "الإضافات المثبتة"
         name: "الاسم"
-        none_installed: "لا إضافات مثبّتة."
-        version: "الاصدارة"
+        none_installed: "ليس لديك أي إضافات مثبتة."
+        version: "الإصدار"
         enabled: "مفعّلة؟"
         is_enabled: "نعم"
         not_enabled: "لا"
@@ -2725,7 +2908,7 @@ ar:
         menu:
           backups: "النسخ الاحتياطية"
           logs: "السّجلّات"
-        none: "لا نسخ احتياطية."
+        none: "لا تتوفر نسخة إحتياطية."
         read_only:
           enable:
             title: "فعّل وضع القراءة فقط"
@@ -2743,42 +2926,42 @@ ar:
           label: "رفع"
           title: "رفع نسخة احتياطية لهذه الحالة."
           uploading: "يرفع..."
-          success: "رُفع '{{filename}}' بنجاح."
+          success: "تم رفع '{{filename}}' بنجاح."
           error: "حصلت مشكلة أثناء رفع '{{filename}}': {{message}}"
         operations:
           is_running: "هناك عمليّة تجري حاليًّا..."
           failed: "الـ {{operation}} فشلت. الرجاء التحقق من logs."
           cancel:
-            label: "ألغِ"
-            title: "ألغِ العمليّة الحاليّة"
-            confirm: "أمتأكّد من إلغاء العمليّة الحاليّة؟"
+            label: "إلغاء"
+            title: "قم بإلغاء العملية الحالية"
+            confirm: "هل تريد إلغاء العملية الحالية؟"
           backup:
             label: "أجرِ نسخ احتياطي"
             title: "أنشئ نسخة احتياطية"
             confirm: "أتريد إجراء نسخة احتياطية جديدة؟"
             without_uploads: "نعم (لا تضمن الملفات)"
           download:
-            label: "نزّل"
-            title: "أرسل بريدًا فيه رابط التّنزيل"
-            alert: "أُرسل بريد إلكترونيّ إليك فيه رابط لتنزيل النّسخة الاحتياطيّة هذه."
+            label: "حمل"
+            title: "أرسل بريدًا إلكترونيا فيه رابط التحميل"
+            alert: "تم إرسال بريد إلكتروني إليك به رابط لتنزيل هذه النسخة الاحتياطية."
           destroy:
-            title: "أزل النسخة الاحتياطية"
+            title: "احذف النسخة الاحتياطية"
             confirm: "هل أنت متأكد من رغبتك في حذف النسخة الاحتياطية؟"
           restore:
             is_disabled: "الاستعادة معطّلة في إعدادات الموقع."
             label: "استعادة"
-            title: "اعادة تخزين النسخة الاحتياطية"
-            confirm: "أمتأكد من استعادة النسخة الاحتياطية هذه؟"
+            title: "اعادة استخدام النسخة الاحتياطية"
+            confirm: "هل انت متاكد من اعادة إستخدام هذه النسخة الاحتياطية؟"
           rollback:
-            label: "اعادة السنخة السابقة"
-            title: "Rollback the database to previous working state"
+            label: "اعادة النسخة السابقة"
+            title: "إعادة قاعدة البيانات إلى حالة العمل السابقة"
             confirm: "هل انت متاكد انك تريد اعاده قواعد البيانات الى الحاله السابقه؟"
       export_csv:
         success: "بدأ التصدير, سيتم إعلامك برسالة عند اكتمال العملية."
         failed: "فشل التصدير. من فضلك افحص السجلات."
         button_text: "التصدير"
         button_title:
-          user: "صدّر كامل قائمة المستخدمين بنسق CSV."
+          user: "صدّر كامل قائمة الاعضاء بنسق CSV."
           staff_action: "صدّر كامل سجلّ إجراءات الطّاقم بنسق CSV."
           screened_email: "Export full screened email list in CSV format."
           screened_ip: "Export full screened IP list in CSV format."
@@ -2792,13 +2975,20 @@ ar:
         title: "تخصيص"
         long_title: "تخصيص الموقع"
         preview: "معاينة"
-        save: "حفظ"
+        explain_preview: "عاين الموقع مع تفعيل هذة الواجهة"
+        save: "احفظ"
         new: "جديد"
-        new_style: "تصميم جديد"
+        new_style: "واجهة جديدة"
         import: "استيراد"
-        delete: "حذف"
-        delete_confirm: "أأحذف هذه السّمة؟"
+        delete: "أحذف"
+        delete_confirm: "هل احذف هذة الواجهة؟"
+        color: "لون"
+        opacity: "الشفافية"
         copy: "نسخ"
+        copy_to_clipboard: "نسخ الى لوحة العمل"
+        copied_to_clipboard: "تم نسخه الى لوحة العمل"
+        copy_to_clipboard_error: "خطأ في نسخ البيانات الى لوحة العمل"
+        theme_owner: "غير قابل للتعديل ، مملوك بواسطة : "
         email_templates:
           title: "قالب البريد الالكتروني "
           subject: "الموضوع"
@@ -2807,8 +2997,64 @@ ar:
           none_selected: "اختر أحد قوالب البريد لتعدله."
           revert: "اعاده التغيرات "
           revert_confirm: "هل انت متاكد من انك تريد اعاده التغيرات؟ "
+        theme:
+          import_theme: "استيراد الواجهة"
+          customize_desc: "تخصيص:"
+          title: "الواجهات"
+          edit: "عدل"
+          common: "شائع"
+          desktop: "سطح المكتب"
+          mobile: "هاتف محمول"
+          preview: "معاينة"
+          is_default: "الواجهة مفعلة إفتراضيا"
+          user_selectable: "يستطيع الأعضاء اختيار واجهة المستخدم"
+          color_scheme: "نظام الألوان"
+          color_scheme_select: "حدد الألوان لاستخدامها في الواجهة"
+          custom_sections: "أقسام مخصصة:"
+          theme_components: "مكونات المواجهة"
+          uploads: "الملفات المساعدة"
+          no_uploads: "يمكنك رفع ملفات خاصة بواجهة المستخدم الخاصة بك مثل الخطوط و الصور"
+          add_upload: "اضف ملف"
+          upload_file_tip: "اختر ملف للرفع ( png او woff2... إلخ )"
+          variable_name: "SCSS var name:"
+          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: "المخزن يحتوي على واجهة مستخدم"
+          import_file_tip: "ملف الـ .dcstyle.json يحتوي على واجهة"
+          about_theme: "عن الواجهة"
+          license: "الرخصة"
+          component_of: "الواجهة مكونة من:"
+          update_to_latest: "حدث لاحدث اصدار"
+          check_for_updates: "تحقق من التحديثات"
+          updating: "تحديث..."
+          up_to_date: "الواجة محدثة, اخر مره تم التحقق من التحديث:"
+          add: "اضافة"
+          scss:
+            text: "CSS"
+          header:
+            text: "Header"
+            title: "ادخل الـ HTML لعرضه فوق هيدر الموقع"
+          after_header:
+            text: "بعد الـ Header"
+          footer:
+            text: "تذييل "
+            title: "ادخل نص الـ HTML ليتم عرضه في ذيل الصفحة (الفوتر)"
+          embedded_scss:
+            text: "CSS مضمن"
+          head_tag:
+            text: "</head>"
+          body_tag:
+            text: "</body>"
         colors:
+          select_base:
+            title: "اختر مخطط الالوان الاساسي"
+            description: "مخطط اساسي"
           title: "الألوان"
+          edit: "عدل مخططات الألوان"
           long_title: "مخططات الألوان"
           new_name: "مخطط ألوان جديد"
           copy_name_prefix: "نسخة من"
@@ -2848,7 +3094,7 @@ ar:
             name: 'إعجاب'
             description: "لون زر الإعجاب."
       email:
-        title: "البُرد الإلكترونية"
+        title: "البريد الالكتروني"
         settings: "إعدادات"
         templates: "القوالب"
         preview_digest: "ملخص المعاينة."
@@ -2910,6 +3156,10 @@ ar:
             type_placeholder: "الخلاصة، إنشاء حساب..."
             reply_key_placeholder: "مفتاح الرد"
             skipped_reason_placeholder: "السبب"
+      moderation_history:
+        actions:
+          delete_user: "حُذف المستخدم."
+          suspend_user: "العضو موقوف."
       logs:
         title: "السجلات"
         action: "الإجراء"
@@ -2919,7 +3169,7 @@ ar:
         ip_address: "IP"
         topic_id: "معرّف الموضوع"
         post_id: "معرّف المشاركة"
-        category_id: "معرّف الفئة"
+        category_id: "رقم القسم"
         delete: 'حذف'
         edit: 'تعديل'
         save: 'حفظ'
@@ -2927,6 +3177,8 @@ ar:
           block: "حظر"
           do_nothing: "لا تفعل شيء"
         staff_actions:
+          all: "الكل"
+          filter: "رشح:"
           title: "عمليات المشرفين"
           clear_filters: "إظهار كل شيء"
           staff_user: "عضو  إداري"
@@ -2947,6 +3199,8 @@ ar:
             change_trust_level: "تغيير مستوى الثقة"
             change_username: "تغيير اسم المستخدم"
             change_site_setting: "تغيير اعدادات الموقع"
+            change_theme: "غيّر السمة"
+            delete_theme: "أحذف السمة"
             change_site_text: "تغيير نص الموقع."
             suspend_user: "حظر المستخدم"
             unsuspend_user: "رفع الحظر "
@@ -2958,18 +3212,16 @@ ar:
             impersonate: "إنتحال"
             anonymize_user: "مستخدم مجهول"
             roll_up: "عناوين IP المتغيرة المحظورة"
-            change_category_settings: "تغيير إعدادات الفئة"
-            delete_category: "حذف الفئة"
-            create_category: "أنشئ فئة"
-            block_user: "حظر"
-            unblock_user: "رفع الحظر"
+            change_category_settings: "تغيير إعدادات القسم"
+            delete_category: "حذف القسم"
+            create_category: "أنشئ قسم"
             grant_admin: "منح صلاحيات ادارية"
             revoke_admin: "سحب الصلاحيات الادارية"
             grant_moderation: "عين كمشرف"
             revoke_moderation: "سحب صلاحيات المشرف"
             backup_create: "أنشئ نسخة احتياطية"
-            deleted_tag: "علامة وصفية محذوفة"
-            renamed_tag: "اعادة تسمية العلامة الوصفية"
+            deleted_tag: "وسم محذوف"
+            renamed_tag: "إعادة تسمية الوسم"
             revoke_email: "حذف البريد الالكتروني"
             lock_trust_level: "قفل مستوى الثقة"
             unlock_trust_level: "فتح مستوى الثقة "
@@ -2978,6 +3230,7 @@ ar:
             change_readonly_mode: "غير وضع القراءة فقط"
             backup_download: "حَمل النسخة الاحتياطية"
             backup_destroy: "دمر النسخة الاحتياطية"
+            reviewed_post: "مشاركة مراجعة"
         screened_emails:
           title: "عناوين بريد إلكتروني محجوبة."
           description: "عندما يحاول أحدهم إنشاء حساب جديد، ستُفحص عناوين البريد الإلكتروني وسيُمنع التسجيل إن تطابق إحداها، أو أن يُتّخذ أي إجراء آخر."
@@ -3007,19 +3260,43 @@ ar:
           roll_up:
             text: "متغير"
             title: "أنشئ مدخلات فرعية جديدة إذا كانت هذه على الأقل مدخلات 'min_ban_entries_for_roll_up'."
+        search_logs:
+          types:
+            all_search_types: "بحث في جميع الأنواع"
+            full_page: "صفحة كاملة"
         logster:
           title: "سجلات الخطأ."
+      watched_words:
+        title: "مراقب الكلمات"
+        search: "بحث"
+        clear_filter: "امسح"
+        show_words: "اظهر الكلمات"
+        actions:
+          block: 'احجب'
+          censor: 'راقب (ضلل)'
+          require_approval: 'يحتاج لموافقة'
+          flag: 'علم'
+        action_descriptions:
+          require_approval: 'المنشورات التي تحتوي على هذه الكلمات تحتاج الى موافقة الطاقم قبل ان يتم رؤيتهم.'
+          flag: 'اسمح للمنشورات التي تحتوي على هذه الكلمات, ولكن علمهم كـ غير مناسب لكي يتمكن المشرف من مراجعتهم.'
+        form:
+          label: 'كلمة جديدة:'
+          placeholder_regexp: "تعبير اعتيادي"
+          add: 'اضف'
+          success: 'نجاح'
+          upload: "حمل"
+          upload_successful: "تم الرفع بنجاح. تم اضافة الكلمات"
       impersonate:
         title: "انتحال الشخصية"
         help: "استخدم هذه الأداة لانتحال شخصية حساب مستخدم لأغراض التصحيح. سيتم تسجيل خروجك عندما تنتهي."
         not_found: "تعذر إيجاد المستخدم."
         invalid: "عذراً , لايمكنك تمثل شخصية ذلك العضو."
       users:
-        title: 'المستخدمون'
+        title: 'الأعضاء'
         create: 'اضافة مدير'
         last_emailed: "آخر بريد الكتروني"
-        not_found: "آسفون، اسم هذا المستخدم غير موجود في النظام."
-        id_not_found: "آسفون، معرّف هذا المستخدم غير موجود في النظام."
+        not_found: "عذرا، اسم المستخدم غير موجود في النظام."
+        id_not_found: "عذرا، هذا الرقم التعريفي غير موجود في النظام."
         active: "نشط"
         show_emails: "عرض الرسائل"
         nav:
@@ -3028,7 +3305,6 @@ ar:
           pending: "قيد الانتظار"
           staff: 'الطاقم'
           suspended: 'موقوف'
-          blocked: 'محظور'
           suspect: 'المريبون'
         approved: "موافقة؟"
         approved_selected:
@@ -3046,8 +3322,8 @@ ar:
           many: "رفض المستخدمين ({{count}})"
           other: "رفض المستخدمين ({{count}})"
         titles:
-          active: 'المستخدمون النشطون'
-          new: 'المستخدمون الجدد'
+          active: 'الأعضاء النشطون'
+          new: 'الأعضاء الجدد'
           pending: 'أعضاء بانتظار المراجعة'
           newuser: 'أعضاء في مستوى الثقة 0 (عضو جديد)'
           basic: 'أعضاء في مستوى الثقة 1 (عضو أساسي)'
@@ -3055,25 +3331,24 @@ ar:
           regular: 'الاعضاء في مستوى الثقة رقم 3 (عاديين)'
           leader: 'الاعضاء في مستوى الثقة رقم 4 (قادة)'
           staff: "الطاقم"
-          admins: 'المستخدمون المدراء'
+          admins: 'الأعضاء المدراء'
           moderators: 'المشرفون'
-          blocked: 'مستخدمين محظورين:'
           suspended: 'أعضاء موقوفين'
-          suspect: 'المستخدمون المريبون'
+          suspect: 'الأعضاء المريبون'
         reject_successful:
-          zero: "رفض بنجاح 1 مستخدم"
-          one: "رفض بنجاح 1 مستخدم"
-          two: "رفض بنجاح %{count} مستخدمين."
-          few: "رفض بنجاح %{count} مستخدمين."
-          many: "رفض بنجاح %{count} مستخدمين."
-          other: "رفض بنجاح %{count} مستخدمين."
+          zero: "رفض بنجاح 1 عضو"
+          one: "رفض بنجاح 1 عضو"
+          two: "رفض بنجاح %{count} عضو."
+          few: "رفض بنجاح %{count} عضو."
+          many: "رفض بنجاح %{count} عضو."
+          other: "رفض بنجاح %{count} عضو."
         reject_failures:
-          zero: "فشل لرفض 1 مستخدم."
-          one: "فشل لرفض 1 مستخدم."
-          two: "فشل لرفض %{count} مستخدمين."
-          few: "فشل لرفض %{count} مستخدمين."
-          many: "فشل لرفض %{count} مستخدمين."
-          other: "فشل لرفض %{count} مستخدمين."
+          zero: "فشل لرفض 1 عضو."
+          one: "فشل لرفض 1 عضو."
+          two: "فشل لرفض %{count} عضو."
+          few: "فشل لرفض %{count} عضو."
+          many: "فشل لرفض %{count} عضو."
+          other: "فشل لرفض %{count} عضو."
         not_verified: "لم يتم التحقق"
         check_email:
           title: "اكشف عنوان البريد الإلكتروني لهذا العضو"
@@ -3082,18 +3357,22 @@ ar:
         suspend_failed: "حدث خطب ما أثناء إيقاف هذا المستخدم {{error}}"
         unsuspend_failed: "حدث خطب ما أثناء إلغاء إيقاف هذا المستخدم {{error}}"
         suspend_duration: "ما المدّة التي سيُوقف هذا المستخدم خلالها؟"
-        suspend_duration_units: "(أيام)"
         suspend_reason_label: "لماذا هل أنت عالق؟ هذا النص <b>سيكون ظاهراً للكل</b> على صفحة تعريف هذا العضو, وسيكون ظاهراً للعضو عندما يحاول تسجل الدخول. احفظها قصيرة."
+        suspend_reason_hidden_label: "لماذا انت موقوف؟ هذا النص سيظهر للعضو حين يحاول الولوج. اجعله قصيراً."
         suspend_reason: "سبب"
+        suspend_reason_placeholder: "سبب التوقيف"
+        suspend_message: "رسالة بريد الكتروني"
+        suspend_message_placeholder: "اختياري. وفر المزيد من المعلومات حول التوقيف و سيتم ارساله عبر البريد الالكتروني الى العضو."
         suspended_by: "محظور من قبل"
+        silence_reason: "السبب"
+        silence_message: "رسالة بريد الكتروني"
+        suspended_until: "(حتى %{until})"
+        cant_suspend: "لا يمكن ايقاف هذا العضو"
         delete_all_posts: "احذف كل مشاركاته"
         delete_all_posts_confirm_MF: "أنت على وشك {POSTS, plural, zero {عدم حذف شيء} one {حذف مشاركة واحدة} two {حذف مشاركتين} few {حذف # مشاركات} many {حذف # مشاركة} other {حذف # مشاركة}}{TOPICS, plural, zero {} one { وموضوع واحد} two { وموضوعين} few { و# مواضيع} many {و# موضوعا} other {و# موضوع}}. أمتأكد؟"
-        suspend: "علّق"
-        unsuspend: "إلقاء التعليق"
-        suspended: "معلّق؟"
         moderator: "مراقب؟"
         admin: "مدير؟"
-        blocked: "محظور؟"
+        suspended: "معلّق؟"
         staged: "تنظيم؟"
         show_admin_profile: "مدير"
         refresh_browsers: "أجبر إنعاش المتصفح"
@@ -3106,10 +3385,11 @@ ar:
         logged_out: "أخرجنا العضو من كلّ أجهزته"
         revoke_admin: 'سحب الإدارة'
         grant_admin: 'منحة إدارية'
+        grant_admin_confirm: "لقد ارسلنا بريداً الكترونياً لتأكيد المدير الجديد. رجاء افتح الرسالة و اتبع التعلميات."
         revoke_moderation: 'سحب المراقبة'
         grant_moderation: 'منحة مراقبة'
-        unblock: 'إلغاء حظر'
-        block: 'حظر'
+        unsuspend: 'إلقاء التعليق'
+        suspend: 'علّق'
         reputation: شهرة
         permissions: التّصاريح
         activity: أنشطة
@@ -3147,7 +3427,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)"
@@ -3168,17 +3448,12 @@ ar:
         activate_failed: "حدث خطأ عند تفعيل هذا المستخدم."
         deactivate_account: "تعطيل الحساب"
         deactivate_failed: "حدث خطأ عند تعطيل هذا المستخدم."
-        unblock_failed: 'حدثت مشكلة في رفع المنع عن المستخدم.'
-        block_failed: 'حدثت مشكلة في منع المستخدم.'
-        block_confirm: 'هل انت متأكد من حظر هذا المستخدم؟ لن يستطيع انشاء مواضيع او ردود جديدة'
-        block_accept: 'نعم، امنع هذا المستخدم'
         bounce_score: "سجل الترويج"
         reset_bounce_score:
           label: "اعادة تعيين"
           title: "اعادة تعيين سجل الترويج  الى 0"
         deactivate_explanation: "المستخدم الغير نشط يحب أن يتأكد من البريد الالكتروني"
         suspended_explanation: "المستخدم الموقوف لايملك صلاحية تسجيل الدخول"
-        block_explanation: "المستخدم الموقوف لايستطيع أن يشارك"
         staged_explanation: "العضو المنظم يمكنه فقط النشر عن طريق البريد الالكتروني في المواضيع المخصصه ."
         bounce_score_explanation:
           none: "لا ترويجات تم استلامها من هذا البريد الالكتروني"
@@ -3204,11 +3479,11 @@ ar:
           posts_read: "المنشورات المقروءة"
           posts_read_all_time: "المشاركات المقروءة (جميع الاوقات)"
           flagged_posts: "المشاركات المبلغ عنها "
-          flagged_by_users: "المستخدمين الذين بلغوا"
+          flagged_by_users: "الأعضاء الذين بلغوا"
           likes_given: "الإعجابات المعطاة"
           likes_received: "الإعجابات المستلمة"
           likes_received_days: "الإعجابات المستلمة : الايام الغير عادية"
-          likes_received_users: "الإعجابات المستلمة : المستخدمين المميزين"
+          likes_received_users: "الإعجابات المستلمة : الأعضاء المميزين"
           qualifies: "مستوى الثقة الممنوحة للمستوى "
           does_not_qualify: "غير مستحق للمستوى"
           will_be_promoted: "سيتم الترقية عنه قريبا"
@@ -3268,86 +3543,88 @@ ar:
         recommended: "نوصيك بتخصيص النص التالي ليلائم احتياجاتك:"
         show_overriden: 'اظهر التجاوزات فقط'
       site_settings:
-        title: 'إعدادات'
+        show_overriden: 'اظهر فقط الاعدادات المعدلة'
+        title: 'الإعدادات'
         reset: 'إعادة تعيين'
         none: 'لا شيء'
         no_results: "لا نتائج."
         clear_filter: "مسح"
-        add_url: "أضافة رابط"
-        add_host: "أضافة نطاق"
+        add_url: "اضافة رابط"
+        add_host: "اضافة نطاق"
         categories:
-          all_results: 'كل'
-          required: 'مطلوب'
-          basic: 'الإعداد الأساسي'
-          users: 'مستخدمون'
-          posting: 'مشاركة'
+          all_results: 'الكل'
+          required: 'المعلومات الأساسية'
+          basic: 'الإعدادات العامة'
+          users: 'الأعضاء'
+          posting: 'المنشورات'
           email: 'البريد الإلكتروني'
-          files: 'ملفات'
-          trust: 'المستويات الموثوقة'
-          security: 'أمن'
-          onebox: "رابط تفصيلي"
+          files: 'الملفات'
+          trust: 'مستويات الثقة'
+          security: 'الأمن'
+          onebox: "لوحة المُعاينة"
           seo: 'SEO'
-          spam: 'سخام'
-          rate_limits: 'حدود المعدل'
-          developer: 'المطور'
+          spam: 'سبام'
+          rate_limits: 'الحدود'
+          developer: 'المطورون'
           embedding: "تضمين"
-          legal: "قانوني"
+          legal: "الأمور القانونية"
+          user_api: 'API المستخدمين'
           uncategorized: 'أخرى'
-          backups: "النسخ الإحتياطية"
+          backups: "النُسخ الإحتياطية"
           login: "تسجيل الدخول"
           plugins: "الإضافات "
           user_preferences: "تفضيلات العضو"
-          tags: "الوسوم"
+          tags: "الأوسمة"
           search: "البحث"
-          groups: "مجموعات"
+          groups: "المجموعات"
       badges:
         title: الشارات
-        new_badge: شعار جديد
+        new_badge: شارة جديدة
         new: 'جديد '
-        name: 'إسم '
-        badge: 'شعار '
+        name: الإسم
+        badge: الشارة
         display_name: إسم العرض
         description: الوصف
-        long_description: وصف طويل
-        badge_type: نوع الشعار
+        long_description: الوصف المفصل
+        badge_type: نوع الشارة
         badge_grouping: المجموعة
         badge_groupings:
-          modal_title: 'تجميع الشعارات '
+          modal_title: تجميع الشارات
         granted_by: 'ممنوح بواسطة '
         granted_at: ممنوح في
-        reason_help: ( رابط إلى مشاركة أو موضوع )
+        reason_help: ( رابط إلى منشور أو موضوع )
         save: حفظ
         delete: حذف
         delete_confirm: أمتأكد من حذف هذه الشارة؟
         revoke: تعطيل
         reason: السبب
-        expand: توسيع &مساعدة;
-        revoke_confirm: هل أنت متأكد أنك تريد سحب هذه الشارة؟
-        edit_badges: 'تعديل الشعارات '
+        expand: توسيع &hellip;
+        revoke_confirm: هل أنت متأكد أنك تريد تعطيل هذه الشارة؟
+        edit_badges: تعديل الشارات
         grant_badge: منح شارة
-        granted_badges: أوسمة ممنوحة.
-        grant: منحة
+        granted_badges: الشارات الممنوحة.
+        grant: منح
         no_user_badges: "%{name} لم يمنح أي شارة."
         no_badges: لا يوجد أي شارة يمكن منحها.
-        none_selected: "حدد شارة البدء"
-        allow_title: اسمح للشارة أن تستخدم كعنوان.
-        multiple_grant: 'يمكن منحه عدة مرات. '
-        listable: اظهار الوسام على صفحة الأوسمة العامة
-        enabled: تفعيل الشعار
+        none_selected: "حدد شارة للبدء"
+        allow_title: اسمح للشارة أن تستخدم كلقب.
+        multiple_grant: 'يمكن منحها عدة مرات. '
+        listable: اظهار الشارة في صفحة الشارات العامة
+        enabled: تفعيل الشارة
         icon: أيقونة
         image: صورة
-        icon_help: "استخدم صنف Font Awesome أو عنوانًا إلى صورة"
-        query: علامة استفهام (SQL)
-        target_posts: إستعلام يستهدف المشاركات
+        icon_help: "استخدم اسم ايقونة منFont Awesome أو عنوانًا URL إلى صورة"
+        query: إستعلام عن شارة (SQL)
+        target_posts: إستعلام عن المنشورات
         auto_revoke: إلغاء الاستعلام اليومي
         show_posts: عرض مشاركة الوسام الممنوح على صفحة الوسام.
-        trigger: مطلق
+        trigger: إشارة
         trigger_type:
           none: "تحديث يومي"
           post_action: "عندما يعمل عضو على مشاركة."
-          post_revision: "عندما يقوم عضو بتعديل أو إنشاء مشاركة."
+          post_revision: "عندما يقوم عضو بتعديل أو إنشاء منشور."
           trust_level_change: "عندما يقوم شخص بتغير مستوى الثقة."
-          user_change: "عندما يتم تعديل عضو أو انشاءه."
+          user_change: "عندما يتم تعديل عضو أو انشاءة."
           post_processed: "بعد تنفيذ المشاركة"
         preview:
           link_text: "معاينة الأوسمة الممنوحة."
@@ -3382,16 +3659,16 @@ ar:
       embedding:
         get_started: "إذا أردت تضمين Discourse في موقع اخر، أبدأ بإضافة مضيف."
         confirm_delete: "أمتأكّد من حذف هذا المضيف؟"
-        sample: "استخدم كود HTML التالي لموقعك لإنشاء وتضمين موضوع discourse. استبدل <b>REPLACE_ME</b> مع canonical URL لصفحة قمت بتضمينها فيه."
+        sample: "استخدم كود HTML التالي لموقعك لإنشاء وتضمين موضوع discourse. استبدل <b>REPLACE_ME</b> مع الرابط الاساسي لصفحة قمت بتضمينها فيه."
         title: "تضمين"
-        host: "أسمع بالمضيفين"
+        host: "المُظيفين المسموح بهم"
         edit: "تعديل"
-        category: "مشاركة لفئة"
+        category: "انشر في قسم"
         add_host: "أضف مضيف"
         settings: "تضمين إعدادات"
         feed_settings: "إعدادات التغذية "
         feed_description: " توفير مغذي RSS/ATOM لموقعك سيطور قدرة Discourse على استيراد المحتوى الخاص بك."
-        crawling_settings: "إعدادات المتقدم ببطء."
+        crawling_settings: "اعدادات الزاحف"
         crawling_description: "عندما ينشأ Discourse مواضيع لمشاركتك، إذا لم يتوفر مغذي RSS/ATOM سيحاول تحليل محتواك من HTML الخاص بك. أحيانا يمكن أن يكون تحديا استخراج محتواك، لذا نمنحك القدرة لتحديد قواعد CSS لجعل الاستخراج أسهل."
         embed_by_username: "اسم العضو للموضوع المنشأ"
         embed_post_limit: "أقصى عدد مشاركات مضمنة"
@@ -3401,7 +3678,7 @@ ar:
         embed_blacklist_selector: "منتقي CSS للعناصر التي حذفت من التضمينات."
         embed_classname_whitelist: "اسماء  اصناف المظاهر الجمالية المسموح بها"
         feed_polling_enabled: "استورد المشاركات عبر RSS/ATOM"
-        feed_polling_url: "URL مغذي RSS/ATOM يتقدم ببطء."
+        feed_polling_url: "رابط مغذي RSS/ATOM للزحف"
         save: "أحفظ الإعدادات المضمنة"
       permalink:
         title: "الرابط الثابت"
@@ -3410,8 +3687,8 @@ ar:
         topic_title: "موضوع"
         post_id: "رقم المشاركة"
         post_title: "مشاركة"
-        category_id: "رقم الفئة"
-        category_title: "تصنيف"
+        category_id: "رقم القسم"
+        category_title: "قسم"
         external_url: "رابط خارجي"
         delete_confirm: هل أنت متأكد من حذف هذا الرابط الثابت ؟
         form:
@@ -3427,13 +3704,6 @@ ar:
       upload: "رفع"
       uploading: "يرفع..."
       quit: "ربما لاحقا"
-      staff_count:
-        zero: "ليس في المجتمع أيّ أعضاء طاقم."
-        one: "في المجتمع عضو طاقم واحد."
-        two: "في المجتمع عضوا طاقم."
-        few: "في المجتمع %{count} أعضاء طاقم."
-        many: "في المجتمع %{count} عضو طاقم."
-        other: "في المجتمع %{count} عضو طاقم."
       invites:
         add_user: "أضف"
         none_added: "لم تدعو أيّ عضو طاقم. أمتأكّد من المتابعة؟"
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 5562568835..2658bab513 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,14 +370,9 @@ 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."
-      title:
-        one: "grupa"
-        few: "grupe"
-        other: "grupe"
       activity: "Aktivnost"
       members: "Članovi"
       topics: "Teme"
@@ -389,7 +380,6 @@ bs_BA:
       mentions: "Spomenuto"
       messages: "Poruke"
       alias_levels:
-        title: "Ko može @spominjati i slati poruke ovoj grupi?"
         nobody: "Niko"
         only_admins: "Samo admini"
         mods_and_admins: "Samo moderatori i Admini"
@@ -479,7 +469,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."
@@ -516,7 +505,6 @@ bs_BA:
       admin: "{{user}} je admin"
       moderator_tooltip: "This user is a moderator"
       admin_tooltip: "This user is an admin"
-      blocked_tooltip: "Korisnik je blokiran"
       suspended_notice: "This user is suspended until {{date}}."
       suspended_reason: "Reason: "
       github_profile: "Github"
@@ -597,7 +585,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"
@@ -836,7 +823,6 @@ bs_BA:
     first_post: Prvi post
     mute: Mutiraj
     unmute: Odmutiraj
-    last_post: Zadnji post
     last_reply_lowercase: zadnji odgovor
     signup_cta:
       sign_up: "Registruj se"
@@ -1018,12 +1004,7 @@ bs_BA:
       olist_title: "Numbered List"
       ulist_title: "Bulleted List"
       list_item: "List item"
-      heading_label: "H"
-      heading_title: "Naslov"
-      heading_text: "Naslov"
-      hr_title: "Horizontalna Crta"
       help: "Markdown Editing Help"
-      toggler: "sakrij ili pokaži komposer"
       modal_ok: "OK"
       modal_cancel: "Otkaži"
       cant_send_pm: "Neuspješno, ne možete slati poruke ka %{username}."
@@ -1037,17 +1018,6 @@ bs_BA:
       empty: "Nema obavještenja."
       more: "pogledaj starija obaviještenja"
       total_flagged: "ukupno opomenutih postova"
-      mentioned: "<i title='spomenut' class='icon'>@</i><p><span>{{username}}</span> {{description}}</p>"
-      quoted: "<i title='citiran' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      replied: "<i title='odgovoren' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      edited: "<i title='izmjenjen' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
-      liked: "<i title='lajkovan' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
-      private_message: "<i title='privatna poruka' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_private_message: "<i title='privatna poruka' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invitee_accepted: "<i title='prihvatio pozivnicu' class='fa fa-user'></i><p><span>{{username}}</span> accepted your invitation</p>"
-      moved_post: "<i title='pomjerio post' class='fa fa-sign-out'></i><p><span>{{username}}</span> moved {{description}}</p>"
-      granted_badge: "<i title='bedž dobijen' class='fa fa-certificate'></i><p>Zaslužen '{{description}}'</p>"
-      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Nova Tema</span> {{description}}</p>"
       alt:
         mentioned: "Spomenut od"
         quoted: "Citiran od"
@@ -1108,22 +1078,15 @@ bs_BA:
         title: Napredna tražilica
         posted_by:
           label: Objavljeno od
-        in_category:
-          label: U kategoriji
         in_group:
           label: U grupi
         with_badge:
           label: Sa bedžom
-        with_tags:
-          label: Sa tagovima
         filters:
-          label: Izlistaj samo teme/objave koje...
           likes: Moji lajkovi
           posted: Moje objave
           watching: Pratim
           tracking: Pratim
-          private: su u mojim porukama
-          bookmarks: Boji bookmark-ci
           first: su friške prve objave
           pinned: su okačene
           unpinned: nisu okačene
@@ -1412,14 +1375,12 @@ bs_BA:
       multi_select:
         select: 'select'
         selected: 'selected ({{count}})'
-        select_replies: 'select +replies'
         delete: delete selected
         cancel: cancel selecting
         select_all: select all
         deselect_all: deselect all
     post:
       quote_reply: "Citat"
-      edit: "Editing {{link}} by {{replyAvatar}} {{username}}"
       edit_reason: "Razlog: "
       post_number: "post {{number}}"
       last_edited_on: "post last edited on"
@@ -1458,9 +1419,6 @@ bs_BA:
         undelete: "povrati obrisan post"
         share: "podijeli link do ovog posta"
         more: "Još"
-        delete_replies:
-          yes_value: "Yes, delete the replies too"
-          no_value: "No, just this post"
         admin: "post admin actions"
         wiki: "Make Wiki"
         unwiki: "Remove Wiki"
@@ -1694,7 +1652,6 @@ bs_BA:
         no_problems: "No problems were found."
         moderators: 'Moderators:'
         admins: 'Admins:'
-        blocked: 'Blocked:'
         suspended: 'Suspended:'
         private_messages_short: "PP"
         private_messages_title: "Privatne Poruke"
@@ -1718,24 +1675,12 @@ bs_BA:
         by: "by"
       flags:
         title: "Opomene"
-        old: "Stare"
-        active: "Aktivne"
         agree: "Slažem se"
         agree_title: "Confirm this flag as valid and correct"
-        agree_flag_modal_title: "Agree and..."
-        agree_flag_hide_post: "Agree (hide post + send PM)"
-        agree_flag_hide_post_title: "Hide this post and automatically send the user a private message urging them to edit it"
-        agree_flag_restore_post: "Agree (restore post)"
-        agree_flag_restore_post_title: "Restore this post"
-        agree_flag: "Agree with flag"
-        agree_flag_title: "Agree with flag and keep the post unchanged"
-        defer_flag: "Defer"
         defer_flag_title: "Remove this flag; it requires no action at this time."
         delete: "Delete"
         delete_title: "Delete the post this flag refers to."
-        delete_post_defer_flag: "Delete post and Defer flag"
         delete_post_defer_flag_title: "Delete post; if the first post, delete the topic"
-        delete_post_agree_flag: "Delete post and Agree with flag"
         delete_post_agree_flag_title: "Delete post; if the first post, delete the topic"
         delete_flag_modal_title: "Delete and..."
         delete_spammer: "Delete Spammer"
@@ -1750,14 +1695,12 @@ bs_BA:
         dispositions:
           agreed: "agreed"
           disagreed: "disagreed"
-          deferred: "deferred"
         flagged_by: "Flagged by"
         resolved_by: "Resolved by"
         took_action: "Took action"
         system: "System"
         error: "Something went wrong"
         reply_message: "Odgovori"
-        no_results: "There are no flags."
         topic_flagged: "This <strong>topic</strong> has been flagged."
         visit_topic: "Visit the topic to take action"
         was_edited: "Post was edited after the first flag"
@@ -2033,7 +1976,6 @@ bs_BA:
           active: "Active"
           pending: "Pending"
           suspended: 'Suspended'
-          blocked: 'Blocked'
         approved: "Approved?"
         titles:
           active: 'Active Users'
@@ -2044,7 +1986,6 @@ bs_BA:
           staff: "Zaposleni"
           admins: 'Admin Users'
           moderators: 'Moderators'
-          blocked: 'Blocked Users'
           suspended: 'Suspended Users'
         not_verified: "Not verified"
         check_email:
@@ -2054,17 +1995,13 @@ bs_BA:
         suspend_failed: "Something went wrong suspending this user {{error}}"
         unsuspend_failed: "Something went wrong unsuspending this user {{error}}"
         suspend_duration: "How long will the user be suspended for?"
-        suspend_duration_units: "(days)"
         suspend_reason_label: "Why are you suspending? This text <b>will be visible to everyone</b> on this user's profile page, and will be shown to the user when they try to log in. Keep it short."
         suspend_reason: "Reason"
         suspended_by: "Suspended by"
         delete_all_posts: "Delete all posts"
-        suspend: "Suspend"
-        unsuspend: "Unsuspend"
-        suspended: "Suspended?"
         moderator: "Moderator?"
         admin: "Admin?"
-        blocked: "Blocked?"
+        suspended: "Suspended?"
         show_admin_profile: "Admin"
         refresh_browsers: "Force browser refresh"
         refresh_browsers_message: "Message sent to all clients!"
@@ -2077,8 +2014,8 @@ bs_BA:
         grant_admin: 'Grant Admin'
         revoke_moderation: 'Revoke Moderation'
         grant_moderation: 'Grant Moderation'
-        unblock: 'Unblock'
-        block: 'Block'
+        unsuspend: 'Unsuspend'
+        suspend: 'Suspend'
         reputation: Reputation
         permissions: Permissions
         activity: Activity
@@ -2111,11 +2048,8 @@ bs_BA:
         activate_failed: "There was a problem activating the user."
         deactivate_account: "Deactivate Account"
         deactivate_failed: "There was a problem deactivating the user."
-        unblock_failed: 'There was a problem unblocking the user.'
-        block_failed: 'There was a problem blocking the user.'
         deactivate_explanation: "A deactivated user must re-validate their email."
         suspended_explanation: "A suspended user can't log in."
-        block_explanation: "A blocked user can't post or start topics."
         trust_level_change_failed: "There was a problem changing the user's trust level."
         suspend_modal_title: "Suspend User"
         trust_level_2_users: "Trust Level 2 Users"
@@ -2301,10 +2235,6 @@ bs_BA:
       upload: "Učitaj"
       uploading: "Učitavanje..."
       quit: "Možda kasnije"
-      staff_count:
-        one: "Vaša zajednica ima 1 člana osoblja."
-        few: "Vaša zajednica ima 2 člana osoblja."
-        other: "Vaša zajednica ima %{count} članova osoblja."
       invites:
         add_user: "Dodaj"
         none_added: "Niste pozvali ni jednog admina/moderatora. Jeste li sigurni da želite nastaviti?"
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
new file mode 100644
index 0000000000..39c9005649
--- /dev/null
+++ b/config/locales/client.ca.yml
@@ -0,0 +1,3008 @@
+# 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/
+
+ca:
+  js:
+    number:
+      format:
+        separator: "."
+        delimiter: ","
+      human:
+        storage_units:
+          format: '%n %u'
+          units:
+            byte:
+              one: Byte
+              other: Bytes
+            gb: GB
+            kb: KB
+            mb: MB
+            tb: TB
+      short:
+        thousands: "{{number}}k"
+        millions: "{{number}}M"
+    dates:
+      time: "h:mm a"
+      timeline_date: "MMM AAAA"
+      long_no_year: "MMM D h:mm a"
+      long_no_year_no_time: "MMM D"
+      full_no_year_no_time: "MMMM Do"
+      long_with_year: "MMM D, AAAA h:mm a"
+      long_with_year_no_time: "MMM D, AAAA"
+      full_with_year_no_time: "MMMM Do, AAAA"
+      long_date_with_year: "MMM D, 'YY LT"
+      long_date_without_year: "MMM D, LT"
+      long_date_with_year_without_time: "MMM D, 'YY"
+      long_date_without_year_with_linebreak: "MMM D <br/>LT"
+      long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
+      wrap_ago: "fa %{date} "
+      tiny:
+        half_a_minute: "< 1m"
+        less_than_x_seconds:
+          one: "< 1s"
+          other: "< %{count}s"
+        x_seconds:
+          one: "1s"
+          other: "%{count}s"
+        less_than_x_minutes:
+          one: "< 1m"
+          other: "< %{count}m"
+        x_minutes:
+          one: "1m"
+          other: "%{count}m"
+        about_x_hours:
+          one: "1h"
+          other: "%{count}h"
+        x_days:
+          one: "1d"
+          other: "%{count}d"
+        x_months:
+          one: "1mes"
+          other: "%{count}mes"
+        about_x_years:
+          one: "1a"
+          other: "%{count}a"
+        over_x_years:
+          one: "> 1a"
+          other: "> %{count}a"
+        almost_x_years:
+          one: "1a"
+          other: "%{count}a"
+        date_month: "MMM D"
+        date_year: "MMM 'AA"
+      medium:
+        x_minutes:
+          one: "1 min"
+          other: "%{count} mins"
+        x_hours:
+          one: "1 hora"
+          other: "%{count} hores"
+        x_days:
+          one: "1 dia"
+          other: "%{count} dies"
+        date_year: "MMM D, 'AA"
+      medium_with_ago:
+        x_minutes:
+          one: "fa 1 min"
+          other: "fa %{count} mins"
+        x_hours:
+          one: "fa 1 hora"
+          other: "fa %{count} hores"
+        x_days:
+          one: "fa 1 dia"
+          other: "fa %{count} dies"
+      later:
+        x_days:
+          one: "1 dia després"
+          other: "%{count} dies després"
+        x_months:
+          one: "1 mes després"
+          other: "%{count} mesos després"
+        x_years:
+          one: "1 any després"
+          other: "%{count} anys després"
+      previous_month: 'Mes anterior'
+      next_month: 'Següent mes'
+      placeholder: data
+    share:
+      topic: 'compartir un enllaç a aquest tema'
+      post: 'publica #%{postNumber}'
+      close: 'tanca'
+      twitter: 'comparteix aquest enllaç a Twitter'
+      facebook: 'comparteix aquest enllaç a Facebook'
+      google+: 'comparteix aquest enllaç a Google+'
+      email: 'envia aquest enllaç per correu electrònic'
+    action_codes:
+      public_topic: "va fer públic aquest tema %{when}"
+      private_topic: "va fer privat aquest tema %{when}"
+      split_topic: "va dividir aquest tema %{when}"
+      invited_user: "va invitar %{who} %{when}"
+      invited_group: "va invitar %{who} %{when}"
+      removed_user: "va eliminar %{who} %{when}"
+      removed_group: "va eliminar %{who} %{when}"
+      autoclosed:
+        enabled: 'va tancar %{when}'
+        disabled: 'va obrir %{when}'
+      closed:
+        enabled: 'va tancar %{when}'
+        disabled: 'va obrir %{when}'
+      archived:
+        enabled: 'va arxivar %{when}'
+        disabled: 'va desarxivar %{when}'
+      pinned:
+        enabled: 'va clavar %{when}'
+        disabled: 'va desclavar %{when}'
+      pinned_globally:
+        enabled: 'va clavar globalment %{when}'
+        disabled: 'va desclavar %{when}'
+      visible:
+        enabled: 'va llistar %{when}'
+        disabled: 'va desllistar %{when}'
+      banner:
+        enabled: 'ha fet un bàner %{when}. Apareixerà a dalt de cada pàgina fins que sigui descartat per la persona usuària.'
+        disabled: 'ha tret aquest bàner %{when}. No apareixerà més a dalt de cada pàgina.'
+    topic_admin_menu: "accions d'administració de tema"
+    wizard_required: "Et donem la benvinguda al teu nou Discourse! Comencem amb <a href='%{url}' data-auto-route='true'>l'assistent de configuració</a> ✨"
+    emails_are_disabled: "Tots els correus sortints han estat globalment inhabilitats per un administrador. No s'enviarà cap  notificació de cap tipus per correu electrònic."
+    bootstrap_mode_enabled: "Per llançar el teu nou lloc més fàcilment, ets en mode d'arrencada. Tots les noves persones usuàries obtindran el nivell 1 de confiança i tindran activats els avisos diaris via correu electrònic sobre actualitzacions. Es cancel·len automàticament quan el recompte total supera %{min_users} persones usuàries."
+    bootstrap_mode_disabled: "El mode <i>Bootstrap</i> es desactivarà durant les properes 24 hores."
+    themes:
+      default_description: "Per defecte"
+    s3:
+      regions:
+        ap_northeast_1: "Àsia Pacífic (Tòquio)"
+        ap_northeast_2: "Àsia Pacífic (Seül)"
+        ap_south_1: "Àsia Pacífic (Mumbai)"
+        ap_southeast_1: "Àsia Pacífic (Singapur)"
+        ap_southeast_2: "Àsia Pacífic (Sídnei)"
+        cn_north_1: "Xina (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irlanda)"
+        eu_west_2: "EU (Londres)"
+        sa_east_1: "Sudamèrica (São Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_east_2: "EEUU Est (Ohio)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
+    edit: 'edita el títol i categoria d''aquest tema'
+    not_implemented: "Ho sentim! Aquesta funcionalitat encara no s'ha implementat."
+    no_value: "No"
+    yes_value: "Sí"
+    generic_error: "Ho sentim, s'ha produït un error."
+    generic_error_with_reason: "Hi ha hagut una errada: "
+    sign_up: "Registra't"
+    log_in: "Inicia sessió"
+    age: "Edat"
+    joined: "T'hi has afegit"
+    admin_title: "Admin"
+    flags_title: "Avisos"
+    show_more: "mostrar més"
+    show_help: "opcions"
+    links: "Enllaços"
+    links_lowercase:
+      one: "enllaç"
+      other: "enllaços"
+    faq: "PMF"
+    guidelines: "Directrius"
+    privacy_policy: "Política de privadesa"
+    privacy: "Privadesa"
+    terms_of_service: "Condicions generals d'ús"
+    mobile_view: "Visió Mòbil"
+    desktop_view: "Visió d'Escriptori"
+    you: "Tu"
+    or: "o"
+    now: "ara mateix"
+    read_more: 'llegir més'
+    more: "Més"
+    less: "Menys"
+    never: "mai"
+    every_30_minutes: "cada 30 minuts"
+    every_hour: "cada hora"
+    daily: "diari"
+    weekly: "setmanal"
+    every_two_weeks: "cada dues setmanes"
+    every_three_days: "cada tres dies"
+    max_of_count: "màx de {{count}}"
+    alternation: "o"
+    character_count:
+      one: "{{count}} caràcter"
+      other: "{{count}} caràcters"
+    suggested_topics:
+      title: "Temes suggerits"
+      pm_title: "Missatges proposats"
+    about:
+      simple_title: "Quant a"
+      title: "Quant a %{title}"
+      stats: "Estadístiques del lloc web"
+      our_admins: "El nostre equip administrador"
+      our_moderators: "El nostre equip moderador"
+      stat:
+        all_time: "Sempre"
+        last_7_days: "Els darrers 7 dies"
+        last_30_days: "Els darrers 30 dies"
+      like_count: "M'agrades"
+      topic_count: "Temes"
+      post_count: "Publicacions"
+      user_count: "Persones usuàries"
+      active_user_count: "Persones usuàries actives"
+      contact: "Contacta amb nosaltres"
+      contact_info: "En cas de qualsevol qüestió urgent o greu que afecti aquest lloc, si us plau contacta amb nosaltres a: %{contact_info}."
+    bookmarked:
+      title: "Preferit"
+      clear_bookmarks: "Neteja preferits"
+      help:
+        bookmark: "Clica per marcar com a preferit la primera publicació d'aquest tema"
+        unbookmark: "Clica per eliminar tots els preferits d'aquest tema"
+    bookmarks:
+      not_logged_in: "disculpa, ha d'identificar-te per marcar publicacions com a preferits"
+      created: "has marcat aquesta publicació com a preferit"
+      not_bookmarked: "has llegit aquesta publicació; cilca per marcar-la com a preferit"
+      last_read: "aquesta és la darrera publicació que has llegit; clica per marcar-la com a preferit"
+      remove: "Elimina Preferit"
+      confirm_clear: "Segur que vols eliminar tots els preferits d'aquest tema?"
+    topic_count_latest:
+      one: "{{count}} tema nou o actualitzat."
+      other: "{{count}} temes nous o actualitzats."
+    topic_count_unread:
+      one: "{{count}} tema sense llegir."
+      other: "{{count}} temes sense llegir."
+    topic_count_new:
+      one: "{{count}} nou tema."
+      other: "{{count}} nous temes."
+    click_to_show: "Clica per mostrar-ho"
+    preview: "previsualitza"
+    cancel: "cancel·la"
+    save: "Desa els canvis"
+    saving: "Desant..."
+    saved: "Desat!"
+    upload: "Actualitza"
+    uploading: "Actualitzant..."
+    uploading_filename: "Actualitzant {{filename}}..."
+    uploaded: "Actualitzat!"
+    pasting: "Enganxant..."
+    enable: "Activa"
+    disable: "Desactiva"
+    undo: "Desfés"
+    revert: "Reverteix"
+    failed: "Ha fallat"
+    switch_to_anon: "Entra al Mode Anònim"
+    switch_from_anon: "Surt del Mode Anònim"
+    banner:
+      close: "Descarta aquesta bandera."
+      edit: "Edita aquesta bandera >>"
+    choose_topic:
+      none_found: "No s'ha trobat temes."
+      title:
+        search: "Cercar un tema per nom, url o id:"
+        placeholder: "escriu el títol del tema aquí"
+    queue:
+      topic: "Tema:"
+      approve: 'Aprova'
+      reject: 'Rebutja'
+      delete_user: 'Eliminia persona usuària'
+      title: "Cal aprovació"
+      none: "No hi ha publicacions per revisar"
+      edit: "Edita"
+      cancel: "Cancel·la"
+      view_pending: "mira publicacions pendents"
+      has_pending_posts:
+        one: "Aquest tema té <b>1</b> publicació esperant l'aprovació"
+        other: "Aquest tema té <b>{{count}}</b> publicacions esperant l'aprovació"
+      confirm: "Desa els canvis"
+      delete_prompt: "Segur que vols esborrar <b>%{username}</b>? Això eliminarà totes les seves publicacions i blocarà el correu electrònic i l'adreça IP."
+      approval:
+        title: "La publicació necessita ser aprovada"
+        description: "Hem rebut la teva nova publicació, però cal que sigui aprovada per una persona moderadora abans d'aparèixer. Si us plau, una mica de paciència."
+        pending_posts:
+          one: "Tens <strong>1</strong> publicació pendent."
+          other: "Tens <strong>{{count}}</strong> publicacions pendents."
+        ok: "D'acord"
+    user_action:
+      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> va enviar <a href='{{topicUrl}}'>el tema</a>"
+      you_posted_topic: "<a href='{{userUrl}}'>Tu</a> has publicat <a href='{{topicUrl}}'>el tema</a>"
+      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> ha espost <a href='{{postUrl}}'>{{post_number}}</a>"
+      you_replied_to_post: "<a href='{{userUrl}}'>Tu</a> has respost <a href='{{postUrl}}'>{{post_number}}</a>"
+      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> ha respost <a href='{{topicUrl}}'>el tema</a>"
+      you_replied_to_topic: "<a href='{{userUrl}}'>Tu</a> has respost <a href='{{topicUrl}}'>el tema</a>"
+      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> ha mencionat <a href='{{user2Url}}'>{{another_user}}</a>"
+      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> ha fet una menció a <a href='{{user2Url}}'>tu</a>"
+      you_mentioned_user: "<a href='{{user1Url}}'>Tu</a> has fet una menció a <a href='{{user2Url}}'>{{another_user}}</a>"
+      posted_by_user: "Publicat per <a href='{{userUrl}}'>{{user}}</a>"
+      posted_by_you: "Publicat per <a href='{{userUrl}}'>tu</a>"
+      sent_by_user: "Enviat per <a href='{{userUrl}}'>{{user}}</a>"
+      sent_by_you: "Enviat per <a href='{{userUrl}}'>tu</a>"
+    directory:
+      filter_name: "filtrar segons persona usuària"
+      title: "Persones usuàries"
+      likes_given: "Lliurat"
+      likes_received: "Rebut"
+      topics_entered: "Vist"
+      topics_entered_long: "Temes vistos"
+      time_read: "Temps llegit"
+      topic_count: "Temes"
+      topic_count_long: "Temes creats"
+      post_count: "Respostes"
+      post_count_long: "Respostes publicades"
+      no_results: "No s'han trobat resultats"
+      days_visited: "Visites"
+      days_visited_long: "Dies visitats"
+      posts_read: "Llegit"
+      posts_read_long: "Publicacions llegides"
+      total_rows:
+        one: "1 persona usuària"
+        other: "%{count} persones usuàries"
+    group_histories:
+      actions:
+        change_group_setting: "Canvia la configuració del grup"
+        add_user_to_group: "Afegeix persona usuària"
+        remove_user_from_group: "Elimina persona usuària"
+        make_user_group_owner: "Crea persona propietària"
+        remove_user_as_group_owner: "Elimina persona propietària"
+    groups:
+      logs:
+        title: "Registres"
+        when: "Quan"
+        action: "Acció"
+        acting_user: "Persona usuària activa"
+        target_user: "Persona usuària destinatària"
+        subject: "Tema"
+        details: "Detalls"
+        from: "De"
+        to: "A"
+      edit:
+        title: 'Edita grup'
+        full_name: 'Nom complet'
+        add_members: "Afegeix membres"
+        delete_member_confirm: "Elimina '%{username}' del '%{group}' grup?"
+      name_placeholder: "Nom del grup, sense espais, igual que la regla del nom de la identitat"
+      empty:
+        posts: "No hi ha publicacions de membres d'aquest grup."
+        members: "No hi ha membres a aquest grup."
+        mentions: "No hi ha mencions d'aquest grup."
+        messages: "No hi ha missatges per a aquest grup."
+        topics: "No hi ha temes de membres d'aquest grup."
+        logs: "No hi ha registres per a aquest grup."
+      add: "Afegegix"
+      join: "Uneix-te al grup"
+      leave: "Abandona el grup"
+      request: "Demana afegir-te al grup"
+      message: "Missatge"
+      automatic_group: Grup Automàtic
+      closed_group: Grup Tancat
+      is_group_user: "Ets membre d'aquest grup"
+      membership: "Afiliació"
+      name: "Nom"
+      user_count: "Quantitat de membres"
+      bio: "Sobre el Grup"
+      selector_placeholder: "Afegeix membres"
+      owner: "propietari"
+      index:
+        title: "Grups"
+        empty: "No hi ha grups visibles"
+      title:
+        one: "Grup"
+        other: "Grups"
+      activity: "Activitat"
+      members: "Membres"
+      topics: "Temes"
+      posts: "Publicacions"
+      mentions: "Mencions"
+      messages: "Missatges"
+      visibility_levels:
+        title: "Qui pot veure aquest grup?"
+        public: "Tothom"
+      alias_levels:
+        nobody: "Ningú"
+        only_admins: "Només persones administradores"
+        mods_and_admins: "Només persones moderadores o administradores"
+        members_mods_and_admins: "Només mebres de grups, persones moderadores i administradores"
+        everyone: "Tothom"
+      trust_levels:
+        title: "El nivell de confiança atorgat automàticament a membres quan s'afegeixen:"
+        none: "Cap"
+      notifications:
+        watching:
+          title: "Mirant"
+          description: "Se't notificarà cada nova publicació a tot missatge i es mostrarà un recompte de respostes"
+        watching_first_post:
+          title: "Mirant la primera publicació"
+          description: "Només se't notificarà de la primera publicació per cada nou tema a aquest grup."
+        tracking:
+          title: "Rastreig"
+          description: "Se't notificarà si algú menciona el teu @nom o et respòn, i se't mostrarà un recompte de noves respostes."
+        regular:
+          title: "Normal"
+          description: "Se't notificarà si algú menciona el teu @nom o et respòn."
+        muted:
+          title: "Silenciat"
+          description: "Mai no se't notificarà res sobre nous temes a aquest grup."
+      flair_url: "Imatge d'Avatar"
+      flair_url_placeholder: "(Opcional) Imatge URL o classe Font Awesome "
+      flair_bg_color: "Color de fons d'Avatar "
+      flair_bg_color_placeholder: "(Opcional) Valor de color Hex"
+      flair_color: "Color d'Avatar"
+      flair_color_placeholder: "(Opcional) Valor de color Hex"
+      flair_preview_icon: "Vista prèvia d'icona"
+      flair_preview_image: "Vista prèvia d'imatge"
+      flair_note: "Nota: l'adornament només es mostrarà per a un grup primari de persones usuàries."
+    user_action_groups:
+      '1': "Donats"
+      '2': "Rebuts"
+      '3': "Preferits"
+      '4': "Temes"
+      '5': "Respostes"
+      '6': "Reaccions"
+      '7': "Mencions"
+      '9': "Cites"
+      '11': "Edicions"
+      '12': "Elements enviats"
+      '13': "Safata d'entrada"
+      '14': "Pendents"
+    categories:
+      all: "totes les categories"
+      all_subcategories: "tot"
+      no_subcategory: "cap"
+      category: "Categoria"
+      category_list: "Mostra la llista de categories"
+      reorder:
+        title: "Reordena categories"
+        title_long: "Reorganitza la llista de categories"
+        fix_order: "Fixa posicions"
+        fix_order_tooltip: "No totes les categories tenen una xifra de posició única, perquè això podria causar resultats inesperats."
+        save: "Desa ordre"
+        apply_all: "Executa"
+        position: "Posició"
+      posts: "Publicacions"
+      topics: "Temes"
+      latest: "Darrers"
+      latest_by: "el darrer per"
+      toggle_ordering: "alterna el control de l'ordre"
+      subcategories: "Subcategories"
+      topic_sentence:
+        one: "1 tema"
+        other: "%{count} temes"
+      topic_stat_sentence:
+        one: "%{count} nou tema als passats %{unit}."
+        other: "%{count} nous temes als passats %{unit}."
+    ip_lookup:
+      title: Explora adreça IP
+      hostname: Nom d'amfitrió
+      location: Ubicació
+      location_not_found: (desconegut)
+      organisation: Organització
+      phone: Telèfon
+      other_accounts: "Altres comptes amb aquesta adreça IP:"
+      delete_other_accounts: "Esborra %{count}"
+      username: "nom de persona usuària"
+      trust_level: "TL"
+      read_time: "temps de lectura"
+      topics_entered: "temes intruduïts"
+      post_count: "# publicacions"
+      confirm_delete_other_accounts: "Segur que vols esborrar aquests comptes?"
+    user_fields:
+      none: "(tria una opció)"
+    user:
+      said: "{{username}}:"
+      profile: "Perfil"
+      mute: "Silenci"
+      edit: "Editar preferències"
+      download_archive:
+        confirm: "Segur que vols descarregat les teves publicacions?"
+        success: "Descàrrega inciada, quan el procés s'acabi t'ho notificarem amb un missatge."
+        rate_limit_error: "Les publicacions es poden descarregar un cop al dia, si us plau torna a provar-ho demà."
+      new_private_message: "Nou missatge"
+      private_message: "Missatge"
+      private_messages: "Missatges"
+      activity_stream: "Activitat"
+      preferences: "Preferències"
+      expand_profile: "Expandeix"
+      bookmarks: "Preferits"
+      bio: "Quant a mi"
+      invited_by: "Convidat per"
+      trust_level: "Nivell de confiança"
+      notifications: "Notificacions"
+      statistics: "Estats"
+      desktop_notifications:
+        label: "Notificacions d'escriptori"
+        not_supported: "Aquest navegador no suporta les notificacions. Disculpa."
+        perm_default: "Apaga les notificacions"
+        perm_denied_btn: "Permís denegat"
+        perm_denied_expl: "Has denegat el permís per a les notificacions. Permet-les amb les preferències del teu navegador."
+        disable: "Desactiva les notificacions"
+        enable: "Activa les notificacions"
+        each_browser_note: "Nota: has de canviar aquesta configuració a cada navegador que facis servir."
+      dismiss: 'Descarta-ho'
+      dismiss_notifications: "Descarta-ho tot"
+      dismiss_notifications_tooltip: "Marca totes les notificacions no llegides com a llegides"
+      first_notification: "La teva primera notificació! Selecciona-la per començar."
+      disable_jump_reply: "No saltis a la meva publicació després de la meva resposta"
+      dynamic_favicon: "Mostra el recompte de publicacions noves/actualitzades a una icona del navegador"
+      external_links_in_new_tab: "Obre tots els enllaços externs a una nova pestanya"
+      enable_quoting: "Permet citar la resposta en el text destacat"
+      change: "canvia"
+      moderator: "{{user}} és qui modera"
+      admin: "{{user}} és qui administra"
+      moderator_tooltip: "Aquesta persona modera"
+      admin_tooltip: "Aquesta persona administra"
+      suspended_notice: "Aquesta persona està suspesa fins {{date}}."
+      suspended_reason: "Motiu:"
+      github_profile: "Github"
+      email_activity_summary: "Resum d'activitat"
+      mailing_list_mode:
+        label: "Mode de llistat de correu"
+        enabled: "Activa el mode de listat de correu"
+        instructions: |
+          Aquesta configuració anul·la la configuració del resum d'activitat.<br />
+          Els temes i categories en silenci no s'inclouen a aquests correus electrònics.
+        individual: "Envia un correu per a cada nova publicació"
+        individual_no_echo: "Envia un correu per a cada nova publicació excepte les meves"
+        many_per_day: "Envia un correu per a cada nova publicació (aproximadament {{dailyEmailEstimate}} cada dia)"
+        few_per_day: "Envia un correu per a cada nova publicació (aproximadament 2 cada dia)"
+      tag_settings: "Etiquetes"
+      watched_tags: "Mirat"
+      watched_tags_instructions: "Miraràs automàticament tots els temes amb aquestes etiquetes. Et notificarem totes les noves publicacions i els nous temes, així com un recompte de noves publicacions que apareixerà al costat del tema."
+      tracked_tags: "Seguit"
+      tracked_tags_instructions: "Seguiràs automàticament tots els temes amb aquestes etiquetes. Apareixerà al costat del tema un recompte de noves publicacions."
+      muted_tags: "Silenciat"
+      muted_tags_instructions: "No et notificarem res sobre nous temes amb aquestes etiquetes i no apareixeran a les darreres.."
+      watched_categories: "Mirat"
+      watched_categories_instructions: "Miraràs automàticament tots els temes amb aquestes categories. Et notificarem totes les noves publicacions i els nous temes, així com un recompte de noves publicacions que apareixerà al costat del tema."
+      tracked_categories: "Seguides"
+      tracked_categories_instructions: "Seguiràs automàticament tots els temes amb aquestes categories. Apareixerà al costat del tema un recompte de noves publicacions."
+      watched_first_post_categories: "Mirant la primera publicació"
+      watched_first_post_categories_instructions: "Et notificarem la primera publicació per cada nou tema a aquestes categories."
+      watched_first_post_tags: "Mirant la primera publicació"
+      watched_first_post_tags_instructions: "Et notificarem la primera publicació per cada nou tema a aquestes etqieuetes."
+      muted_categories: "Silenciades"
+      muted_categories_instructions: "No et notificarem res sobre nous temes amb aquestes categories i no apareixeran a les darreres.."
+      delete_account: "Esborra el meu compte"
+      delete_account_confirm: "Segur que vols esborrar el teu compte permanentment? Aquesta acció no es pot desfer!"
+      deleted_yourself: "El teu compte ha estat esborrat amb èxit."
+      delete_yourself_not_allowed: "No pots esborrar el teu compte ara mateix. Posa't en contacte amb la persona administradora per fer-ho."
+      unread_message_count: "Missatges"
+      admin_delete: "Esborra"
+      users: "Persones usuàries"
+      muted_users: "Silenciat"
+      muted_users_instructions: "Suprimeix totes les notificacions d'aquestes persones usuàries"
+      muted_topics_link: "Mostra temes silenciats"
+      watched_topics_link: "Mostra temes mirats"
+      automatically_unpin_topics: "Desclava automàticament els temes quan jo arribi al final."
+      apps: "Aplicacions"
+      revoke_access: "Revoca l'accés"
+      undo_revoke_access: "Desfes revocar l'accés"
+      api_approved: "Aprovat:"
+      theme: "Tema"
+      staff_counters:
+        flags_given: "banderes útils"
+        flagged_posts: "publicacions amb banderes"
+        deleted_posts: "publicacions esborrades"
+        suspensions: "suspensions"
+        warnings_received: "avisos"
+      messages:
+        all: "Tot"
+        inbox: "Safata d'entrada"
+        sent: "Enviats"
+        archive: "Arxivats"
+        groups: "Els meus grups"
+        bulk_select: "Tria missatges"
+        move_to_inbox: "Mou a la safata d'entrada"
+        move_to_archive: "Arxiu"
+        failed_to_move: "Ha fallat en moure els missatges seleccionats (potser ha caigut la teva xarxa)"
+        select_all: "Selecciona-ho tot"
+      preferences_nav:
+        account: "Compte"
+        profile: "Perfil"
+        emails: "Correus"
+        notifications: "Notificacions"
+        categories: "Categories"
+        tags: "Etiquetes"
+        interface: "Interfície"
+        apps: "Aplicacions"
+      change_password:
+        success: "(correu electrònic enviat)"
+        in_progress: "(enviant correu electrònic)"
+        error: "(error)"
+        action: "Envia'm un correu per canviar de contrassenya"
+        set_password: "Estableix la contrasenya"
+        choose_new: "Tria una nova contrasenya"
+        choose: "Tria una contrasenya"
+      change_about:
+        title: "Canvia Sobre mi"
+        error: "Hi ha hagut una errada en canviar aquest valor"
+      change_username:
+        title: "Canvia nom de persona usuària"
+        confirm: "Si canvies el teu nom de persona usuària, les cites a les teves entrades i les mencions de @nom es trencaran. Estàs completament segur que vols fer-ho?"
+        taken: "Disculpa, aquesta identitat usuària ja està agafada."
+        invalid: "Aquest nom de persona usuària no és vàlid. Ha d'incloure només xifres i lletres."
+      change_email:
+        title: "Canvia el correu electrònic"
+        taken: "Disculpa, aquest correu electrònic no està disponible."
+        error: "Hi ha hagut un error en canviar el teu correu electrònic. Que potser aquesta adreça ja és en ús?"
+        success: "Hem enviat un correu electrònic a aquesta adreça- Si us plau, segueix les instruccions de confirmació."
+      change_avatar:
+        title: "Canvia la teva foto de perfil"
+        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basat en"
+        gravatar_title: "Canvia el teu avatar al lloc web de Gravatar"
+        refresh_gravatar_title: "Actualitza el teu Gravatar"
+        letter_based: "Foto de perfil assignada pel sistema"
+        uploaded_avatar: "Foto personalitzada"
+        uploaded_avatar_empty: "Afegeix una foto personalitzada"
+        upload_title: "Carrega la teva foto"
+        upload_picture: "Actualitza la foto"
+        image_is_not_a_square: "Atenció: hem retallat la teva imatge; l'amplada i l'alçada no són igual."
+        cache_notice: "Has canviat amb èxit la teva foto de perfil, però la seva aparició trigarà una mica a causa de la memòria cau del navegador."
+      change_profile_background:
+        title: "Fons del perfil"
+        instructions: "Els fons de perfil se centraran i tindran una amplada per defecte de 850px."
+      change_card_background:
+        title: "Fes servir un fons de targeta"
+        instructions: "Les imatges de fons se centraran i tindran una amplada per defecte de 590px."
+      email:
+        title: "Correu electrònic"
+        instructions: "no es mostra mai en públic"
+        ok: "T'enviarem un correu electrònic de confirmació"
+        invalid: "Si us plau, introdueix una adreça vàlida de correu electrònic"
+        authenticated: "El teu correu electrònic ha estat autenticat per {{provider}}"
+        frequency_immediately: "T'enviarem un correu electrònic immediatament si no has llegit el que t'hem fet arribar."
+        frequency:
+          one: "Només t'enviarem un correu electrònic si no t'hem vist en el darrer minut."
+          other: "Només t'enviarem un correu electrònic si no t'hem vist en els darrers {{count}} minuts."
+      name:
+        title: "Nom"
+        instructions: "el teu nom complet (opcional)"
+        instructions_required: "El teu nom complert"
+        too_short: "El teu nom és massa curt"
+        ok: "El teu nom sona bé"
+      username:
+        title: "Identitat usuària"
+        instructions: "únic, sense espais, breu"
+        short_instructions: "La gent no pot mencionar-te com a @{{username}}"
+        available: "La teva identitat usuària està disponible"
+        not_available: "No està disponible. I si proves amb {{suggestion}}?"
+        not_available_no_suggestion: "No disponible"
+        too_short: "La teva identitat usuària és massa breu"
+        too_long: "La teva identitat usuària és massa llarga"
+        checking: "Comprovant si aquesta identitat usuària està disponible..."
+        prefilled: "El correu electrònic coincideix amb aquesta identitat usuària registrada"
+      locale:
+        title: "Llengua de la interfície. Canviarà en actualitzar la pàgina."
+        instructions: "Llengua de la interfície usuària. Canviarà en actualitzar la pàgina."
+        default: "(per defecte)"
+        any: "qualsevol"
+      password_confirmation:
+        title: "Contrasenya un cop més"
+      last_posted: "Darrer missatge"
+      last_emailed: "Darrer correu"
+      last_seen: "Mirat"
+      created: "Es va regsitrar"
+      log_out: "Sortir"
+      location: "Ubicació"
+      card_badge:
+        title: "Targeta distintiva de persona usuària"
+      website: "Lloc web"
+      email_settings: "Correu electrònic"
+      like_notification_frequency:
+        title: "Notifica'm quan sigui apreciat"
+        always: "Sempre"
+        first_time_and_daily: "El primer cop que agradi una publicació i a diari "
+        first_time: "El primer cop que agradi una publicació"
+        never: "Mai"
+      email_previous_replies:
+        title: "Inclou respostes prèvies al finals dels correus electrònics"
+        unless_emailed: "menys els enviats anteriorment"
+        always: "sempre"
+        never: "mai"
+      email_digests:
+        title: "Quan no ho visiti, envieu-me un correu electrònic amb un resum dels temes i respostes populars "
+        every_30_minutes: "cada 30 minuts"
+        every_hour: "cada hora"
+        daily: "cada dia"
+        every_three_days: "cada tres dies"
+        weekly: "cada setmana"
+        every_two_weeks: "cada dues setmanes"
+      include_tl0_in_digests: "Inclou contingut de noves persones usuàries als correus electrònics de resum  "
+      email_in_reply_to: "Envia'm un extracte de les publicacions respostes als correus electrònics"
+      email_direct: "Envia'm u ncorreu quan algú em citi, contesti una entrada, mencioni el meu @nomdusuari, o m'inviti a un tema"
+      email_private_messages: "Envia'm un correu quan algú m'envii un missatge"
+      email_always: "Envia'm notificacions per correu electrònic fins i tot quan jo tingui activitat al lloc web"
+      other_settings: "Altres"
+      categories_settings: "Categories"
+      new_topic_duration:
+        label: "Considera un tema com a nou quan"
+        not_viewed: "encara no l'hagi vist"
+        last_here: "hagi estat creat després de la meva darrera visita"
+        after_1_day: "creats durant el darrer dia"
+        after_2_days: "creats durant els darrers 2 dies"
+        after_1_week: "creats durant la darrera setmana"
+        after_2_weeks: "creats durant les darreres 2 setmanes"
+      auto_track_topics: "Segueix automàticament els temes que jo introdueixi"
+      auto_track_options:
+        never: "mai"
+        immediately: "immediatament"
+        after_30_seconds: "després de 30 segons"
+        after_1_minute: "després d'1 minut"
+        after_2_minutes: "després de 2 minuts"
+        after_3_minutes: "després de 3 minuts"
+        after_4_minutes: "després de 4 minuts"
+        after_5_minutes: "després de 5 minuts"
+        after_10_minutes: "després de 10 minuts"
+      notification_level_when_replying: "Quan publiqui a un nou tema, estableix aquest tema com a"
+      invited:
+        search: "escriu aquí per buscar invitacions..."
+        title: "Invitacions"
+        user: "Persona usuària convidada"
+        sent: "Enviat"
+        none: "No hi ha invitacions pendents per mostrar"
+        truncated:
+          one: "Mostrant la primera invitació."
+          other: "Mostrant les primeres {{count}} invitacions."
+        redeemed: "Invitacions recuperades"
+        redeemed_tab: "Recuperada"
+        redeemed_tab_with_count: "Recuperades ({{count}})"
+        redeemed_at: "Recuperada"
+        pending: "Invitacions pendents"
+        pending_tab: "Pendent"
+        pending_tab_with_count: "Pendent ({{count}})"
+        topics_entered: "Temes vistos"
+        posts_read_count: "Publicacions llegides"
+        expired: "Aquesta invitació ha caducat."
+        rescind: "Elimina"
+        rescinded: "Invitació eliminada"
+        reinvite: "Reenvia la invitació"
+        reinvite_all: "Reenvia totes les invitacions"
+        reinvited: "Invitació reenviada"
+        reinvited_all: "Totes les invitacions reenviades!"
+        time_read: "Temps de lectura."
+        days_visited: "Dies visitats"
+        account_age_days: "Antiguitat del compte en dies"
+        create: "Envia la invitació"
+        generate_link: "Copia l'enllaç d'invitació"
+        link_generated: "Enllaç d'invitació generat emb èxit!"
+        valid_for: "L'enllaç d'invitació només és vàlid per a aquesta adreça de correu: %{email}"
+        bulk_invite:
+          none: "Encara no hi has convidat ningú. Envia invitacions individuals o convida molta gent d'un sol cop <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>enviant un fitxer CSV</a>."
+          text: "Invitació massiva des d'arxiu"
+          success: "Fitxer carregat amb èxit, et notificarem amb un missatge quan s'hagi completat el procés."
+          error: "Disculpa, el fitxer hauria de tenir format CSV."
+      password:
+        title: "Contrasenya"
+        too_short: "La teva contrasenya és massa curta."
+        common: "La teva contrasenya és massa freqüent."
+        same_as_username: "La teva contrasenya és la mateixa que el teu nom de persona usuària."
+        same_as_email: "La teva contrasenya és la mateixa que el teu correu electrònic."
+        ok: "La teva contrasenya té bon aspecte."
+        instructions: "com a mínim %{count} caràcters"
+      summary:
+        title: "Resum"
+        stats: "Estadístiques"
+        time_read: "temps de lectura"
+        topic_count:
+          one: "tema creat"
+          other: "temes creats"
+        post_count:
+          one: "publicació creada"
+          other: "publicacions creades"
+        likes_given:
+          one: "donada"
+          other: "donada"
+        likes_received:
+          one: "Rebuda"
+          other: "Rebudes"
+        days_visited:
+          one: "dia visitat"
+          other: "dies visitats"
+        posts_read:
+          one: "publicació llegida"
+          other: "publicacions llegides"
+        bookmark_count:
+          one: "preferit"
+          other: "preferits"
+        top_replies: "Principals respostes"
+        no_replies: "Encara sense respostes"
+        more_replies: "Més respostes"
+        top_topics: "Principals temes"
+        no_topics: "Encara sense temes"
+        more_topics: "Més temes"
+        top_badges: "Principals distintius"
+        no_badges: "Encara sense distintius"
+        more_badges: "Més distintius"
+        top_links: "Principals enllaços"
+        no_links: "Encara sense enllaços"
+        most_liked_by: "Més apreciat per"
+        most_liked_users: "Més agradat"
+        most_replied_to_users: "Més respost a "
+        no_likes: "Encara sense :heart:"
+      associated_accounts: "Sessions iniciades"
+      ip_address:
+        title: "Darrera adreça IP"
+      registration_ip_address:
+        title: "Registre d'adeça IP"
+      avatar:
+        title: "Foto de perfil"
+        header_title: "perfil, missatges, preferits i preferències"
+      title:
+        title: "Títol"
+      filters:
+        all: "Tot"
+      stream:
+        posted_by: "Publicat per"
+        sent_by: "Enviat per"
+        private_message: "missatge"
+        the_topic: "el tema"
+    loading: "Carregant..."
+    errors:
+      prev_page: "mentre es prova de carregar"
+      reasons:
+        network: "Error de xarxa"
+        server: "Error de servidor"
+        forbidden: "Accés denegat"
+        unknown: "Error"
+        not_found: "Pàgina no trobada"
+      desc:
+        network: "Si us plau, revisa la teva connexió"
+        network_fixed: "Sembla que ja ha tornat"
+        server: "Codi d'error: {{status}}"
+        forbidden: "No tens permís per veure això."
+        not_found: "Ups, l'aplicació ha provat de carregar una URL que no existeix."
+        unknown: "Alguna cosa ha anat malament"
+      buttons:
+        back: "Vés enrere"
+        again: "Torna-ho a provar"
+        fixed: "Carrega la pàgina"
+    close: "Tanca"
+    assets_changed_confirm: "El lloc web s'ha actualitzat. Tornes a carregar la pàgina per a la darrera versió?"
+    logout: "T'has desconnectat."
+    refresh: "Actualitza"
+    read_only_mode:
+      enabled: "El lloc web es troba en mode només de lectura. Si us plau, continua navegant però per ara estan desactivades respondre i altres accions."
+      login_disabled: "S'ha desactivat l'inici de sessió mentre aquest lloc es trobi en mode només de lectura."
+      logout_disabled: "S'ha desactivat el tancament de sessió mentre aquest lloc es trobi en mode només de lectura."
+    too_few_topics_and_posts_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>Comencem aquesta discussió!</a> Actualment hi ha <strong>%{currentTopics} / %{requiredTopics}</strong> temes i <strong>%{currentPosts} / %{requiredPosts}</strong> entrades. Les noves visites necessiten algunes converses per llegir i respondre."
+    too_few_topics_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>Comencem aquesta discussió!</a> Actualment hi ha <strong>%{currentTopics} / %{requiredTopics}</strong> temes. Les noves visites necessiten algunes converses per llegir i respondre."
+    too_few_posts_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>Comencem aquesta discussió!</a> Actualment hi ha <strong>%{currentPosts} / %{requiredPosts}</strong> entrades. Les noves visites necessiten algunes converses per llegir i respondre."
+    logs_error_rate_notice:
+      reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> ha arribat al límit de configuració de %{siteSettingRate}."
+      exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> ha superat el límit de configuració de %{siteSettingRate}."
+      rate:
+        one: "1 error/%{duration}"
+        other: "%{count} errors/%{duration}"
+    learn_more: "saber-ne més..."
+    all_time: 'total'
+    all_time_desc: 'total de temes creats'
+    year: 'any'
+    year_desc: 'temes creats durant els darrers 365 dies'
+    month: 'mes'
+    month_desc: 'temes creats durant els darrers 30 dies'
+    week: 'setmana'
+    week_desc: 'temes creats durant els darrers 7 dies'
+    day: 'dia'
+    first_post: Primera publicació
+    mute: Silenciar
+    unmute: Reanudar
+    last_post: Publicat
+    time_read: Llegit
+    time_read_recently: '%{time_read} recentment'
+    last_reply_lowercase: darrera resposta
+    replies_lowercase:
+      one: resposta
+      other: respostes
+    signup_cta:
+      sign_up: "Registra-t'hi"
+      hide_session: "Recorda-m'ho demà"
+      hide_forever: "no, gràcies"
+      hidden_for_session: "D'acord, to demanarem demà. També podràs fer servir sempre <i>Iniciar sessió</i> per crear un compte."
+      intro: "Hola! :heart_eyes: Sembla que estàs gaudint amb la conversa, però no t'hi has registrat."
+      value_prop: "En crear un compte, et recordem exactament el que has llegit, i així sempre arribes just on ho has deixat. També pots obtenir notificacions, aquí i per correu electrònic, sempre que hi hagi nous missatges. I pots rebre missatges de compartir l'amor. :heartbeat:"
+    summary:
+      enabled_description: "Estàs mirant un resum d'aquest tema: les publicacions més interessants segons determina la comunitat."
+      description: "Hi ha <b>{{replyCount}}</b> respostes."
+      description_time: "Hi ha <b>{{replyCount}}</b> respostes amb un temps de lectura estimat de <b>{{readingTime}} minuts</b>."
+      enable: 'Resumeix aquest tema'
+      disable: 'Mostra totes les publicacions'
+    deleted_filter:
+      enabled_description: "Aquest tema conté publicacions esborrades, que han estat amagades."
+      disabled_description: "Es mostren les publicacions esborrades al tema."
+      enable: "Amaga publicacions esborrades"
+      disable: "Mostra publicacions esborrades"
+    private_message_info:
+      title: "Missatge"
+      invite: "Convida altres..."
+      remove_allowed_user: "De debò vols esborrar {{name}} d'aquest missatge?"
+      remove_allowed_group: "De debò vols esborrar {{name}} d'aquest missatge?"
+    email: 'Correu electrònic'
+    username: 'Nom de persona usuària'
+    last_seen: 'Vist'
+    created: 'Creat'
+    created_lowercase: 'creat'
+    trust_level: 'Nivell de confiança'
+    search_hint: 'nom de persona usuària, correu electrònic o adreça IP'
+    create_account:
+      disclaimer: "En registrar-te, acceptes la <a href='{{privacy_link}}'>política de privacitat</a> i les<a href='{{tos_link}}'>condicions del servei</a>."
+      title: "Crear un compte nou"
+      failed: "Alguna cosa ha anat malament, potser aquest correu electrònic ja ha estat registrar; prova-ho amb l'enllaç de contrasenya oblidada"
+    forgot_password:
+      title: "Restableix la contrasenya"
+      action: "He oblidat la meva contrasenya"
+      invite: "Introdueix el teu nom de persona usuària o correu electrònic i t'enviarem un correu per restablir la contrasenya."
+      reset: "Restableix la contrasenya"
+      complete_username: "Si hi ha algun compte que correspongui a l'usuari <b>%{username}</b>, hauries de rebre en breu un correu amb instruccions per restablir la teva contrassenya."
+      complete_email: "Si hi ha algun compte que correspongui a l'adreça <b>%{email}</b>, hauries de rebre en breu un correu amb instruccions per restablir la teva contrasenya."
+      complete_username_found: "Hem trobat el compte corresponent al nom d'usuari <b>%{username}</b>, hauries de rebre en breu un correu amb instruccions per restablir la teva contrassenya."
+      complete_email_found: "Hem trobat el compte corresponent a l'adreça <b>%{email}</b>, hauries de rebre en breu un correu amb instruccions per restablir la teva contrasenya."
+      complete_username_not_found: "Cap compte no coincideix amb la identitat usuària <b>%{username}</b>"
+      complete_email_not_found: "Cap compte no coincideix amb <b>%{email}</b>"
+      button_ok: "D'acord"
+      button_help: "Ajuda"
+    login:
+      title: "Entrar"
+      username: "Persona usuària"
+      password: "Contrasenya"
+      email_placeholder: "correu electrònic o nom de persona usuària"
+      caps_lock_warning: "El bloqueig de majúscula està activat"
+      error: "Error desconegut"
+      rate_limit: "Si us plau, espera abans de tornar a connectar-te"
+      blank_username_or_password: "Si us plau, introdueix el teu correu electrònic o identitat usuària i la teva contrasenya."
+      reset_password: 'Restableix la contrasenya'
+      logging_in: "Connectant-te..."
+      or: "O"
+      authenticating: "Autenticant..."
+      awaiting_approval: "El teu compte encara no ha estat aprovat per l'equip. T'enviarem un correu quan sigui aprovat."
+      requires_invite: "Disculpa, l'accés a aquest fòrum només és amb invitació."
+      not_activated: "Encara no pots iniciar sessió. Abans t'hem enviat un correu d'activació a <b>{{sentTo}}</b>. Si us plau, segueix les instruccions del correu per activar el teu compte."
+      not_allowed_from_ip_address: "No pots iniciar sessió des d'aquesta adreça IP."
+      admin_not_allowed_from_ip_address: "No pots iniciar sessió com a persona administradora des d'aquesta adreça IP."
+      resend_activation_email: "Clica aquí per enviar un cop més un correu d'activació."
+      sent_activation_email_again: "T'hem enviat un altre correu d'activació a <b>{{currentEmail}}</b>. Potser triga en arribar-te uns pocs minuts; assegura't de comprovar la teva carpeta de correu brossa."
+      to_continue: "Si us plau, identifica't"
+      preferences: "Cal que t'identifiquis per canviar les teves preferències"
+      forgot: "No recordo els detalls del meu compte"
+      not_approved: "El teu compte encara no ha estat aprovat. Et notificarem per correu quan puguis connectar-t'hi."
+      google:
+        title: "amb Google"
+        message: "Autenticar amb Google (assegura't que no tens activats els bloquejadors de finestres emergents)"
+      google_oauth2:
+        title: "amb Google"
+        message: "Autenticar amb Google (assegura't que no tens activats els bloquejadors de finestres emergents)"
+      twitter:
+        title: "amb Twitter"
+        message: "Autenticar amb Twitter (assegura't que no tens activats els bloquejadors de finestres emergents)"
+      instagram:
+        title: "amb Instagram"
+        message: "Autenticar amb Instagram (assegura't que no tens activats els bloquejadors de finestres emergents)"
+      facebook:
+        title: "amb Facebook"
+        message: "Autenticar amb Facebook (assegura't que no tens activats els bloquejadors de finestres emergents)"
+      yahoo:
+        title: "amb Yahoo"
+        message: "Autenticar amb Yahoo (assegura't que no tens activats els bloquejadors de finestres emergents)"
+      github:
+        title: "amb GitHub"
+        message: "Autenticar amb GitHub (assegura't que no tens activats els bloquejadors de finestres emergents)"
+    invites:
+      accept_title: "Invitació"
+      welcome_to: "Et donem la benvinguda a %{site_name}!"
+      invited_by: "Aquesta persona t'hi ha convidat:"
+      social_login_available: "També podràs iniciar sessió amb qualsevol xarxa social fent servir aquest correu."
+      your_email: "El teu compte de correu és <b>%{email}</b>"
+      accept_invite: "Accepta invitació"
+      success: "El teu comte ha estat creat i ara t'hi has connectat."
+      name_label: "Nom"
+      password_label: "Estableix la contrasenya"
+      optional_description: "(opcional)"
+    password_reset:
+      continue: "Continua cap a %{site_name}"
+    emoji_set:
+      apple_international: "Apple/Internacional"
+      google: "Google"
+      twitter: "Twitter"
+      emoji_one: "Emoji One"
+      win10: "Win10"
+    category_page_style:
+      categories_only: "Només categories"
+      categories_with_featured_topics: "Categories amb temes destacats"
+      categories_and_latest_topics: "Categories i darrers temes"
+    shortcut_modifier_key:
+      shift: 'Canvia'
+      ctrl: 'Control'
+      alt: 'Alt'
+    composer:
+      emoji: "Emoji :)"
+      more_emoji: "més..."
+      options: "Opcions"
+      whisper: "xiuxiueig"
+      unlist: "sense llistar"
+      add_warning: "Aquest és un avís oficial."
+      toggle_whisper: "Canvia xiuxiueig"
+      toggle_unlisted: "Canvia sense llistar"
+      posting_not_on_topic: "Quin tema vols respondre?"
+      saving_draft_tip: "desant..."
+      saved_draft_tip: "desat"
+      saved_local_draft_tip: "desat localment"
+      similar_topics: "El teu tema és semblant a..."
+      drafts_offline: "esborranys fora de línia"
+      group_mentioned:
+        one: "En mencionar {{group}}, estàs a punt de notificar-ho a <a href='{{group_link}}'>{{count}} aquesta persona</a> – Segur?"
+        other: "En mencionar {{group}}, estàs a punt de notificar-ho a <a href='{{group_link}}'>{{count}} aquestes persones</a> – Segur?"
+      cannot_see_mention:
+        category: "Has mencionat {{username}} però no es notificarà res perquè aquesta gent no gaudeix d'accés a aquesta categoria. Et caldrà afegir-la a un grup que tingui accés a aquesta categoria."
+        private: "Has mencionat {{username}} però no es notificarà res perquè aquesta gent no pot veure aquest missatge. Et caldrà convidar aquesta gent a aquest Missatge Personal."
+      error:
+        title_missing: "Això és necessari"
+        title_too_short: "El títol ha de tenir un mínim de {{min}} caràcters"
+        title_too_long: "El títol ha de tenir un màxim de {{max}} caràcters"
+        post_missing: "La publicació no pot estar buida"
+        post_length: "La publicació ha de tenir un mínim de {{min}} caràcters"
+        try_like: 'Ja has provat amb el botó <i class="fa fa-heart"></i>?'
+        category_missing: "Has de triar una categoria"
+      save_edit: "Desa l'edició"
+      reply_original: "Respon a un tema original"
+      reply_here: "Respon aquí"
+      reply: "Respon"
+      cancel: "Cancel·la"
+      create_topic: "Crea un tema"
+      create_pm: "Misssatge"
+      title: "O prem Control+Retorn"
+      users_placeholder: "Afegeix persona usuària"
+      title_placeholder: "De què tracta aquesta discussió (en una frase curta)?"
+      title_or_link_placeholder: "Escriu aquí el títol o enganxa-hi un enllaç"
+      edit_reason_placeholder: "per què ho estàs editant?"
+      show_edit_reason: "(afegeix un motiu)"
+      topic_featured_link_placeholder: "Introdueix un enllaç mostrat amb títol"
+      reply_placeholder: "Escriu aquí. Fes servir Markdown, BBCode o HTML per formatar. Arrossega o enganxa imatges."
+      view_new_post: "Mira la teva nova publicació."
+      saving: "Desant"
+      saved: "Desat!"
+      saved_draft: "Esborrany d'entrada en progrés. Selecciona per a continuar-lo."
+      uploading: "Carregant..."
+      show_preview: 'mostra vista prèvia '
+      hide_preview: '&laquo; amaga vista prèvia'
+      quote_post_title: "Cita tota la publicació"
+      bold_label: "B"
+      bold_title: "Negreta"
+      bold_text: "text en negreta"
+      italic_label: "I"
+      italic_title: "Cursiva"
+      italic_text: "text en cursiva"
+      link_title: "Enllaç"
+      link_description: "introdueix una descripció de l'enllaç"
+      link_dialog_title: "Insereix un enllaç"
+      link_optional_text: "títol opcional"
+      link_url_placeholder: "http://exemple.com"
+      quote_title: "Cita en bloc"
+      quote_text: "Cita en bloc"
+      code_title: "Text preformatat"
+      code_text: "Text amb sagnat preformatat de 4 espais"
+      paste_code_text: "escriu o enganxa el codi aquí"
+      upload_title: "Carrega"
+      upload_description: "escriu aquí una descripció de l'adjunt"
+      olist_title: "Llista numerada"
+      ulist_title: "Llista amb vinyetes"
+      list_item: "Ítem de llista"
+      help: "Ajuda d'edició Markdown"
+      modal_ok: "D'acord"
+      modal_cancel: "Cancel·la"
+      cant_send_pm: "Disculpa, no pots enviar un misatge a "
+      yourself_confirm:
+        title: "Has oblidat afegir persones destinatàries?"
+        body: "Ara mateix aquest missatge només s'està enviant a la teva bústia!"
+      admin_options_title: "Configuracions opcionals de l'equip per a aquest tema"
+    notifications:
+      title: "notificacions de mencions via @nom, respostes a les teves entrades, missatges, etc"
+      none: "Impossible carregar ara mateix les notificacions"
+      empty: "No s'hi han trobat notificacions."
+      more: "mira notificacions més antigues"
+      total_flagged: "total publicacions amb bandera"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      alt:
+        mentioned: "Mencionat per"
+        quoted: "Citat per"
+        replied: "Respost"
+        posted: "Publicat per"
+        edited: "Edita la teva publicació per"
+        liked: "Ha agradat la teva publicació"
+        private_message: "Missatge privat de"
+        invited_to_private_message: "Ha convidat a un missatge privat de"
+        invited_to_topic: "Ha convidat a un tema de"
+        invitee_accepted: "Invitació acceptada per"
+        moved_post: "La teva publicació ha estat moguda per"
+        linked: "Enllaç a la teva publicació"
+        granted_badge: "Distintiu atorgat"
+        group_message_summary: "Missatges a la bústia d'entrada del grup"
+      popup:
+        mentioned: '{{username}} t''ha mencionat a "{{topic}}" - {{site_title}}'
+        group_mentioned: '{{username}} t''ha mencionat a "{{topic}}" - {{site_title}}'
+        quoted: '{{username}} t''ha citat a "{{topic}}" - {{site_title}}'
+        replied: '{{username}} t''ha respost a "{{topic}}" - {{site_title}}'
+        posted: '{{username}} publicat a "{{topic}}" - {{site_title}}'
+        private_message: '{{username}} t''ha enviat un missatge privat a "{{topic}}" - {{site_title}}'
+        linked: 'A {{username}} li ha agradat la teva publicació de "{{topic}}" - {{site_title}}'
+    upload_selector:
+      title: "Afegeix una imatge"
+      title_with_attachments: "Afegeix una imatge o arxiu"
+      from_my_computer: "Des del meu dispositiu"
+      from_the_web: "Des de la web"
+      remote_tip: "enllaç a imatge"
+      remote_tip_with_attachments: "enllaç a imatge o arxiu "
+      local_tip: "tria imatges des del teu dispositiu"
+      local_tip_with_attachments: "tria imatges o arxius des del teu dispositiu {{authorized_extensions}}"
+      hint: "(per carregar-ho, també pots arrossegar i deixar a l'editor)"
+      hint_for_supported_browsers: "per carregar-ho, també pots arrossegar i deixar o enganxar a l'editor"
+      uploading: "Carregant"
+      select_file: "Tria fitxer"
+      image_link: "enllaç a qual assenyalarà la teva imatge"
+      default_image_alt_text: imatge
+    search:
+      sort_by: "Ordena per"
+      relevance: "Importància"
+      latest_post: "Darreres publicacions"
+      latest_topic: "Darrers temes"
+      most_viewed: "Més vistos"
+      most_liked: "Més agradats"
+      select_all: "Selecciona-ho tot"
+      clear_all: "Neteja-ho tot"
+      too_short: "El terme de la teva cerca és massa curt"
+      title: "busca temes, publicacions, persones usuàries o categories"
+      no_results: "No s'hi han trobat resultats"
+      no_more_results: "No s'hi han trobat més resultats"
+      searching: "Buscant..."
+      post_format: "#{{post_number}} per {{username}}"
+      context:
+        user: "Busca publicacions per @{{username}}"
+        category: "Busca la categoria #{{category}} "
+        topic: "Busca aquest tema"
+        private_messages: "Busca missatges"
+      advanced:
+        title: Cerca avançada
+        posted_by:
+          label: Publicat per
+        in_group:
+          label: Al grup
+        with_badge:
+          label: Amb distintiu
+        filters:
+          likes: M'han agradat
+          posted: He publicat a
+          watching: Estic mirant
+          tracking: Estic seguint
+          first: són la primera publicació
+          pinned: estan clavats
+          unpinned: no estan clavats
+          wiki: són viqui
+        statuses:
+          label: On els temes
+          open: estan oberts
+          closed: estan tancats
+          archived: estan arxivats
+          noreplies: tenen zero respostes
+          single_user: tenen una única persona usuària
+        post:
+          count:
+            label: Recompte mínim de publicacions
+          time:
+            label: Publicat
+            before: abans
+            after: després
+    hamburger_menu: "vés a una altra llista de temes o categories"
+    new_item: "nou"
+    go_back: 'vés enrrere'
+    not_logged_in_user: 'pàgina de persona usuària amb resum de l''activitat actual i preferències '
+    current_user: 'vés a la teva pàgina de persona usuària'
+    topics:
+      new_messages_marker: "darrera visita"
+      bulk:
+        select_all: "Selecciona-ho tot"
+        clear_all: "Neteja-ho tot"
+        unlist_topics: "Desllista temes"
+        reset_read: "Reinicia la la lectura"
+        delete: "Esborra temes"
+        dismiss: "Descarta-ho"
+        dismiss_read: "Descarta tots els llegits"
+        dismiss_button: "Descarta-ho..."
+        dismiss_tooltip: "Descarta només les noves publicacions o atura el seguiment de temes"
+        also_dismiss_topics: "Deixa de seguir aquests temes perquè mai no es mostrin com a no llegits per a mi"
+        dismiss_new: "Descarta'n els nous"
+        toggle: "canvia la selecció massiva de temes"
+        actions: "Accions massives"
+        close_topics: "Tanca temes"
+        archive_topics: "Arxiva temes"
+        choose_new_category: "Tria la nova categoria per als temes:"
+        selected:
+          one: "Has triat <b>1</b> tema."
+          other: "Has triat <b>{{count}}</b> temes."
+        change_tags: "Reemplaçar Etiquetes"
+        append_tags: "Annexar Etiquetes"
+        choose_new_tags: "Tria noves etiquetes per a aquests temes:"
+        choose_append_tags: "Escollir noves etiquetes per annexar a aquest topics:"
+        changed_tags: "Les etiquetes d'aquests temes han estat canviades."
+      none:
+        unread: "No tens cap tema no llegit."
+        new: "No tens cap tema nou."
+        read: "Encara no has llegit cap tema."
+        posted: "Encara no has publicat cap tema."
+        latest: "No hi ha darrers temes. És una llàstima."
+        hot: "No hi ha temes candents."
+        bookmarks: "Encara no has marcat temes com a preferits."
+        category: "No hi ha temes de {{category}}."
+        top: "No hi ha temes principals."
+        search: "No hi ha resultats de la cerca."
+        educate:
+          new: '<p>Els teus nous temes són aquí.</p><p>Per defecte, els temes es consideren nous i  mostraran una <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">nova</span> indicació si han estat creats durant els passats 2 dies.</p><p>Visita les teves your <a href="%{userPrefsUrl}">preferències</a> per canviar-ho.</p>'
+          unread: '<p>Els teus nous temes són aquí.</p><p>Per defecte, els temes es consideren sense llegir i  mostraran recomptes de no llegits <span class="badge new-posts badge-notification">1</span> si tu:</p><ul><li>Vas crear el tema</li><li>Respost al tema</li><li>Vas llegir el tema durant més de 4 minuts</li></ul><p>O si vas marcar explícitament el tema com a Seguit o Vist amb el control d''alerta al final de cada tema.</p><p>Visita les teves <a href="%{userPrefsUrl}">preferències</a> per canviar-ho.</p>'
+      bottom:
+        latest: "No hi ha més darrers temes."
+        hot: "No hi ha més temes candents."
+        posted: "No hi ha més temes publicats."
+        read: "No hi ha més temes llegits."
+        new: "No hi ha més temes nous."
+        unread: "No hi ha més temes sense llegir."
+        category: "No hi ha més temes de {{category}}."
+        top: "No hi ha més temes destacats."
+        bookmarks: "No hi ha més temes marcats com a preferits."
+        search: "No hi ha més resultats de la cerca."
+    topic:
+      unsubscribe:
+        stop_notifications: "Ara rebràs menys alertes per a <strong>{{title}}</strong>"
+        change_notification_state: "L'estat actual d'alerta és"
+      filter_to:
+        one: "1 publicació al tema"
+        other: "{{count}} publicacions al tema"
+      create: 'Nou tema'
+      create_long: 'Crea un tema nou'
+      private_message: 'Comença un missatge'
+      archive_message:
+        help: 'Mou el missatge al teu arxiu'
+        title: 'Arxiva'
+      move_to_inbox:
+        title: 'Mou a la safata d''entrada'
+        help: 'Torna el missatge a la safata d''entrada'
+      list: 'Temes'
+      new: 'nou tema'
+      unread: 'sense llegir'
+      new_topics:
+        one: '1 tema nou'
+        other: '{{count}} temes nous '
+      unread_topics:
+        one: '1 tema sense llegir'
+        other: '{{count}} temes sense llegir'
+      title: 'Tema'
+      invalid_access:
+        title: "El tema és privat"
+        description: "Disculpa, no tens accés a aquest tema!"
+        login_required: "Et cal iniciar sessió per veure aquest tema."
+      server_error:
+        title: "La càrrega del tema ha fallat"
+        description: "Disculpa, no hem pogut carregat aquest tema, possiblement és per un problema de connexió. Si us plau, torna a provar-ho i si el problema continua, fes-nos-ho saber."
+      not_found:
+        title: "Tema no trobat"
+        description: "Disculpa, no hem pogut trobar aquest tema. Que potser ha estat esborrat per una persona moderadora?"
+      total_unread_posts:
+        one: "tens 1 missatge sense llegir a aquest tema"
+        other: "tens {{count}} missatges sense llegir a aquest tema"
+      unread_posts:
+        one: "tens 1 publicació antiga sense llegir a aquest tema"
+        other: "tens {{count}} publicacions antigues sense llegir a aquest tema"
+      new_posts:
+        one: "hi ha 1 nova publicació a aquest tema des de la teva darrera lectura"
+        other: "hi ha {{count}} noves publicacions a aquest tema des de la teva darrera lectura"
+      likes:
+        one: "hi ha 1 <i>M'agrada</i> a aquest tema"
+        other: "hi ha {{count}} m'agrades en aquest tema"
+      back_to_list: "Torna al llistat de temes"
+      options: "Opcions de tema"
+      show_links: "mostra enllaços dins d'aquest tema"
+      toggle_information: "canvia els detalls del tema"
+      read_more_in_category: "Vols llegir-ne més? Navega per altres temes a {{catLink}} o {{latestLink}}."
+      read_more: "Vols llegir-ne més? {{catLink}} o {{latestLink}}."
+      read_more_MF: "Hi ha { UNREAD, plural, =0 {} one { <a href='/unread'>1 no llegit</a> } other { <a href='/unread'># no llegits</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{i } false {i } other{}} <a href='/new'>1 nou</a> topic} other { {BOTH, select, true{i } false {són } other{}} <a href='/new'># nous</a> topics} } restants, o {CATEGORY, select, true {navega altres temes a {catLink}} false {{latestLink}} other {}}"
+      browse_all_categories: Navega per totes les categories
+      view_latest_topics: mostra els darrers temes
+      suggest_create_topic: Per què no crear un tema?
+      jump_reply_up: salta a la resposta anterior
+      jump_reply_down: salta a la darrera resposta
+      deleted: "El tema ha estat esborrat"
+      auto_close_title: 'Configuració del tancament automàtic'
+      auto_close_immediate:
+        one: "La darrera publicació al tema ja té 1 hora, per això el tema es tancarà immediatament."
+        other: "La darrera publicació al tema ja té %{count} hores, per això el tema es tancarà immediatament."
+      timeline:
+        back: "Enrere"
+        back_description: "Torna a la teva darrera publicació sense llegir"
+        replies_short: "%{current} / %{total}"
+      progress:
+        title: progrés del tema
+        go_top: "principal"
+        go_bottom: "final"
+        go: "vés"
+        jump_bottom: "salta a la darrera publicació"
+        jump_prompt: "salta a..."
+        jump_prompt_of: "de %{count} publicacions"
+        jump_prompt_long: "A quina publicació voldries saltar?"
+        jump_bottom_with_number: "salta a la publicació "
+        total: total de publicacions
+        current: publicació actual
+      notifications:
+        title: canvia la freqüència d'alertes que reps sobre aquest tema
+        reasons:
+          mailing_list_mode: "Tens activat el mode de llista de correu, així et notificarem les respostes a aquest tema per correu electrònic."
+          '3_10': 'Rebràs alertes perquè estàs mirant una etiqueta sobre aquest tema.'
+          '3_6': 'Rebràs alertes perquè estàs mirant aquesta categoria.'
+          '3_5': 'Rebràs alertes perquè has començat a veure aquest tema automàticament.'
+          '3_2': 'Rebràs alertes perquè estàs mirant aquest tema.'
+          '3_1': 'Rebràs alertes perquè has creat aquest tema.'
+          '3': 'Rebràs alertes perquè estàs mirant aquest tema.'
+          '1_2': 'Només se''t notificarà si algú menciona el teu @nom o contesta la teva entrada.'
+          '1': 'Se''t notificarà si algú menciona el teu @nom o contesta la teva entrada.'
+          '0_7': 'No estàs fent cas de les alertes d''aquesta categoria.'
+          '0_2': 'No estàs fent cas de les alertes d''aquest tema.'
+          '0': 'No estàs fent cas de les alertes sobre aquest tema.'
+        watching_pm:
+          title: "Vigilant-lo"
+          description: "Et notificarem cada resposta nova a aquest missatge i et mostrarem un nou recompte de respostes."
+        watching:
+          title: "Vigilant-lo"
+          description: "Et notificarem cada resposta nova a aquest tema i i et mostrarem un nou recompte de respostes."
+        tracking_pm:
+          title: "Seguint"
+          description: "Se't mostrarà un recompte de noves respostes a aquest missatge. Se't notificara si algú menciona el teu @nom o et contesta."
+        tracking:
+          title: "Seguint"
+          description: "Se't mostrarà un recompte de noves respostes a aquest tema. Se't notificara si algú menciona el teu @nom o et contesta."
+        regular:
+          title: "Normal"
+          description: "Se't notificarà si algú menciona el teu @nom o et contesta."
+        regular_pm:
+          title: "Normal"
+          description: "Se't notificarà si algú menciona el teu @nom o et contesta."
+        muted_pm:
+          title: "Silenciat"
+          description: "Mai no et notificarem res sobre aquest missatge."
+        muted:
+          title: "Silenciat"
+          description: "No et notificarem res sobre aquest tema i no apareixerà a les darreres.."
+      actions:
+        recover: "Desfes esborraa temes"
+        delete: "Esborra tema"
+        open: "Obre tema"
+        close: "Tanca tema"
+        multi_select: "Tria publicacions..."
+        pin: "Clava tema"
+        unpin: "Desclava tema"
+        unarchive: "Desarxiva tema"
+        archive: "Arxiva tema"
+        invisible: "Desllista"
+        visible: "Fes llistats"
+        reset_read: "Reinicia la lectura de dades"
+        make_public: "Fes públic el tema"
+        make_private: "Fes un missatge privat"
+      feature:
+        pin: "Clava tema"
+        unpin: "Desclava tema"
+        pin_globally: "Clava tema globalment"
+        make_banner: "Bandera de tema"
+        remove_banner: "Elimina bandera de tema"
+      reply:
+        title: 'Respon'
+        help: 'comença a redactar una resposta al tema'
+      clear_pin:
+        title: "Neteja clavat"
+        help: "Neteja l'estat clavat d'aquest tema perquè no torni a aparèixer al principi de la teva llista de temes"
+      share:
+        title: 'Comparteix'
+        help: 'comparteix un enllaç a aquest tema'
+      print:
+        title: 'Imprimeix'
+        help: 'Obre una versió imprimible d''aquest tema'
+      flag_topic:
+        title: 'Banderes'
+        help: 'posa bandera en privat a aquest tema per parar-hi atenció o envia un missatge privat d''alerta sobre el mateix'
+        success_message: 'Has posat amb èxit la bandera a aquest tema.'
+      feature_topic:
+        title: "Distingeix aquest tema"
+        pin: "Fes que aquest tema aparegui al principi de la categoria {{categoryLink}} fins"
+        confirm_pin: "Ja tens {{count}} temes clavats. Massa temes clavats poden carregar les persones usuàries noves o anònimes. Segur que vols clavar un altre tema a aquesta categoria?"
+        unpin: "Eiimina aquest tema del principi de la categoria {{categoryLink}}."
+        unpin_until: "Elimina aquest tema del principi de la categoria {{categoryLink}} o espera fins <strong>%{until}</strong>."
+        pin_note: "Individualment, les mateixes persones usuàries poden desclavar el tema."
+        pin_validation: "Cal una data per clavar aquest tema."
+        not_pinned: "No hi ha temes clavats a {{categoryLink}}."
+        already_pinned:
+          one: "Temes clavats a hores d'ara{{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Temes clavats a hores d'ara{{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+        pin_globally: "Fes que aquest tema aparegui al començament de tots fins "
+        confirm_pin_globally: "Ja has arribat globalment a {{count}} temes clavats. Massa temes clavats poden carregar les persones usuàries noves o anònimes. Segur que vols clavar un altre tema globalment?"
+        unpin_globally: "Eiimina aquest tema del principi del començament de tots."
+        unpin_globally_until: "Elimina aquest tema del començament de totes les llistes fins "
+        global_pin_note: "Individualment, les mateixes persones usuàries poden desclavar el tema."
+        not_pinned_globally: "No hi ha temes clavats globalment."
+        already_pinned_globally:
+          one: "Temes globalment clavats a hores d'ara{{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Temes globalment clavats a hores d'ara{{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+        make_banner: "Fes que aquest tema aparegui emmarcat al començament de totes les pàgines."
+        remove_banner: "Eiimina el marc que apareix al començament de totes les pàgines."
+        banner_note: "Les persones usuàries poden descartar el marc en tancar-lo. Només es pot emmarcar un tema en qualsevol moment."
+        no_banner_exists: "No hi ha tema emmarcat."
+        banner_exists: "Hores d'ara <strong class='badge badge-notification unread'>hi ha</strong> un tema emmarcat."
+      inviting: "Convidant..."
+      automatically_add_to_groups: "La invitació també inclou accés a aquests grups:"
+      invite_private:
+        title: 'Convida al missatge'
+        email_or_username: "Nom de persona usuària o correu electrònic"
+        email_or_username_placeholder: "correu electrònic o nom de persona usuària"
+        action: "Convida"
+        success: "Hem convidat aquesta persona a participar d'aquest missatge."
+        success_group: "Hem convidat aquest grup a participar d'aquest missatge."
+        error: "Disculpa, hi ha hagut una errada en convidar aquesta."
+        group_name: "nom del grup"
+      controls: "Controls del tema"
+      invite_reply:
+        title: 'Convida'
+        username_placeholder: "nom de persona usuària"
+        action: 'Envia la invitació'
+        help: 'Convida altres a aquest tema per correu o amb alertes.'
+        to_forum: "Enviarem un breu correu electrònic al teu contacte amb una autorització per afegir-s'hi immediatament en clicar un enllaç, no cal identificar-se."
+        sso_enabled: "Escriu el teu nom de la persona usuària a qui vulguis convidar a aquest tema."
+        to_topic_blank: "Escriu el nom de la persona o el correu electrònic de qui vulguis convidar a aquest tema."
+        to_topic_email: "Has introduït una adreça de correu electrònic. T'enviarem una invitació que permetrà al teu contacte respondre immediatament aquest tema."
+        to_topic_username: "Has introduït un nom de persona usuària. Li enviarem una alerta amb l'enllaç d'invitació a aquest tema."
+        to_username: "Escriu el teu nom de la persona usuària a qui vulguis convidar. Li enviarem una alerta amb l'enllaç d'invitació a aquest tema."
+        email_placeholder: 'nom@exemple.com'
+        success_email: "Hem enviat una invitació a <b>{{emailOrUsername}}</b>. Li notificarem quan s'accepti. Consulta la pestanya d'invitacions de la teva pàgina personal per tal de mantenir el seguiment de les teves invitacions."
+        success_username: "Hem convidat aquesta persona a participar d'aquest tema."
+        error: "Disculpa, no hem pogut convidar aquesta persona. Que potser ja ha estat convidada? (les invitacions són de tipus limitat)"
+      login_reply: 'Identifica''t per respondre'
+      filters:
+        n_posts:
+          one: "1 publicació"
+          other: "{{count}} publicacions"
+        cancel: "Filtre remot"
+      split_topic:
+        title: "Mou a un nou tema"
+        action: "mou a un nou tema"
+        topic_name: "Nom del nou tema"
+        error: "Hi ha hagut una errada en moure publicacions a aquest nou tema."
+        instructions:
+          one: "Estàs a punt de crear un nou tema i difondre'l amb la publicació que has triat."
+          other: "Estàs a punt de crear un nou tema i difondre'l amb les <b>{{count}}</b> publicacions que has triat."
+      merge_topic:
+        title: "Mou a un tema existent"
+        action: "mou a un tema existent"
+        error: "Hi ha hagut una errada en moure publicacions a aquest tema."
+        instructions:
+          one: "Si us plau, tria el tema al qual t'agradaria moure aquesta publicació."
+          other: "Si us plau, tria el tema al qual t'agradaria moure aquestes <b>{{count}}</b> publicacions."
+      merge_posts:
+        title: "Uneix les publicacions seleccionades"
+        action: "uneix les publicacions seleccionades"
+        error: "Hi ha hagut una errada en unir les publicacions seleccionades."
+      change_owner:
+        title: "Canvia la persona propietària de les publicacions"
+        action: "canvia la propietat"
+        error: "Hi ha hagut una errada en canviar la propietat de les publicacions."
+        label: "Nova persona propietària de les publicacions"
+        placeholder: "identitat de la nova persona propietària"
+        instructions:
+          one: "Si us plau, selecciona la nova persona propietària de la publicació per <b>{{old_user}}</b>."
+          other: "Si us plau, selecciona la nova persona propietària de les {{count}} publicacions per <b>{{old_user}}</b>."
+        instructions_warn: "Fixa't que qualsevol alerta sobre aquesta publicació no serà transferida a la nova persona usuària retroactivament. <br>Atenció: hores d'ara, no hi ha dades post-dependents transferides a la nova persona usuària. Fes-ho servir amb prudència."
+      change_timestamp:
+        action: "canvia la marca de temps"
+        invalid_timestamp: "La hi haurà marca en el futur."
+        error: "Hi ha hagut una errada en canviar la marca de temps del tema."
+        instructions: "Si us plau, tria la nova marca de temps del tema. Les publicacions del tema s'actualitzaran per tenir la mateixa diferència de temps."
+      multi_select:
+        select: 'selecciona'
+        selected: 'seleccionat ({{count}})'
+        delete: esborra seleccionat
+        cancel: cencel·la seleccionat
+        select_all: selecciona-ho tot
+        deselect_all: desmarca-ho tot
+        description:
+          one: Has seleccionat <b>1</b> publicació
+          other: Has seleccionat <b>{{count}}</b> publicacions.
+    post:
+      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
+      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
+      quote_reply: "Cita"
+      edit_reason: "Motiu:"
+      post_number: "publicació {{number}}"
+      wiki_last_edited_on: "wiki editada per darrer cop el"
+      last_edited_on: "puublicació editada per darrer cop el"
+      reply_as_new_topic: "Respon com a tema enllaçat"
+      reply_as_new_private_message: "Respon amb un missatge nou a les mateixes persones"
+      continue_discussion: "Continuant la discussió de {{postLink}}:"
+      follow_quote: "vés a la publicació citada"
+      show_full: "Mostra la publicació sencera"
+      show_hidden: 'Mostra el contingut amagat.'
+      deleted_by_author:
+        one: "(publicació retirada per la persona autora, s'esborrarà automàticament en 1 hora, si no és marcada amb bandera)"
+        other: "(publicació retirada per la persona autora, s'esborrarà automàticament en %{count} hores, si no és marcada amb bandera)"
+      expand_collapse: "eixampla/contrau"
+      gap:
+        one: "mira 1 resposta amagada"
+        other: "mira {{count}} respostes amagades"
+      unread: "Publicació no llegida"
+      has_replies:
+        one: "{{count}} Resposta"
+        other: "{{count}} Respostes"
+      has_likes:
+        one: "{{count}}  <i>M'agrada</i>"
+        other: "{{count}} M'agrades"
+      has_likes_title:
+        one: "La publicació agrada a 1 persona"
+        other: "La publicació agrada a {{count}} persones"
+      has_likes_title_only_you: "t'ha agradat aquesta publicació"
+      has_likes_title_you:
+        one: "La publicació t'agrada a tu i a 1 persona"
+        other: "La publicació t'agrada a tu i a {{count}} persones"
+      errors:
+        create: "Disculpa, s'ha produït una errada en crear la teva publicació. Si us plau, torna-ho a provar."
+        edit: "Disculpa, s'ha produït una errada en editar la teva publicació. Si us plau, torna-ho a provar."
+        upload: "Disculpa, s'ha produït una errada en carregar aquest fitxer. Si us plau, torna-ho a provar."
+        file_too_large: "Disculpa, el fitxer és massa gran (la mida màxima és de {{max_size_kb}}kb). Per què no ho carregues a un servei de núvol, per compartir-ne l'enllaç?"
+        too_many_uploads: "Disculpa, només pots carregar un fitxer d'un cop."
+        too_many_dragged_and_dropped_files: "Disculpa, només pots carregar 10 fitxers d'un cop."
+        upload_not_authorized: "Disculpa, el fitxer que estàs provant de carregar no està autoritzat (les extensions autoritzades són: {{authorized_extensions}})."
+        image_upload_not_allowed_for_new_user: "Disculpa, les noves persones usuàries no poden carregar imatges."
+        attachment_upload_not_allowed_for_new_user: "Disculpa, les noves persones usuàries no poden adjuntar fitxers."
+        attachment_download_requires_login: "Disculpa, et cal identificar-te per fer descarregar adjunts."
+      abandon:
+        confirm: "Segur que vols abandonar la teva publicació?"
+        no_value: "No, segueix"
+        yes_value: "Sí, abandona"
+      via_email: "aquesta publicació ha arribat per correu electrònic"
+      via_auto_generated_email: "aquesta publicació ha arribat per correu electrònic automàtic"
+      whisper: "aquesta publicació és un xiuxiueg privat per a l'equip moderador"
+      wiki:
+        about: "aquesta publicació és una wiki"
+      archetypes:
+        save: 'Desa opcions'
+      few_likes_left: "Gràcies per compartir l'amor! Et queden poquets m'agrades per donar avui."
+      controls:
+        reply: "comença a redactar una resposta a aquesta publicació"
+        like: "m'agrada aquesta publicació"
+        has_liked: "t'ha agradat aquesta publicació"
+        undo_like: "desfés m'agrada"
+        edit: "edita aquesta publicació"
+        edit_anonymous: "Disculpa, et cal identificar-te per fer editar aquesta publicació."
+        flag: "posa bandera en privat a aquesta publicació per destacar-la o envia una alerta privada sobre el mateix"
+        delete: "esborra aquesta publicació"
+        undelete: "desfés esborrar aquesta publicació"
+        share: "comparteix un enllaç sobre aquesta publicació"
+        more: "Més"
+        admin: "accions d'administració de publicació"
+        wiki: "Fes una wiki"
+        unwiki: "Esborra la wiki"
+        convert_to_moderator: "Afegeix un color d'equip"
+        revert_to_regular: "Esborra el color d'equip"
+        rebake: "Refés HTML"
+        unhide: "Desfés amagar"
+        change_owner: "Canviar la propietat"
+      actions:
+        flag: 'Bandera'
+        undo:
+          off_topic: "Desfés bandera"
+          spam: "Desfés bandera"
+          inappropriate: "Desfés bandera"
+          bookmark: "Desfés preferit"
+          like: "Desfés m'agrada"
+          vote: "Desfés votar"
+        people:
+          off_topic: "Marca amb bandera de fora de context"
+          spam: "Marca amb bandera de brossa"
+          inappropriate: "Marca amb bandera d'inapropiat"
+          notify_moderators: "alerta l'equip moderador"
+          notify_user: "missatge enviat"
+          bookmark: "marcat com a preferit"
+          like: "ha agradat"
+          vote: "votat per això"
+        by_you:
+          off_topic: "Ho has marcat amb bandera de fora de context"
+          spam: "Ho has marcat amb bandera de brossa"
+          inappropriate: "Ho has marcat amb bandera d'inapropiat"
+          notify_moderators: "Ho has marcat amb bandera per moderar"
+          notify_user: "Has enviat un missatge a aquesta persona"
+          bookmark: "Has marcat aquesta publicació com a preferit"
+          like: "Això t'ha agradat"
+          vote: "Has votat per aquesta publicació"
+        by_you_and_others:
+          off_topic:
+            one: "Tu i 1 altra persona més heu marcat això amb bandera de fora de context"
+            other: "Tu i {{count}} persones més heu marcat això amb bandera de fora de context"
+          spam:
+            one: "Tu i 1 persona més heu marcat això amb bandera de brossa"
+            other: "Tu i {{count}} persones més heu marcat això amb bandera de brossa"
+          inappropriate:
+            one: "Tu i 1 persona més heu marcat això amb bandera d'inapropiat"
+            other: "Tu i {{count}} persones més heu marcat això amb bandera d'inapropiat"
+          notify_moderators:
+            one: "Tu i 1 persona més heu marcat això amb bandera per moderar"
+            other: "Tu i {{count}} persones més heu marcat això amb bandera per moderar"
+          notify_user:
+            one: "Tu i 1 persona més li heu enviat un missatge"
+            other: "Tu i {{count}} persones més li heu enviat un missatge"
+          bookmark:
+            one: "Tu i 1 persona més heu marcat aquesta publicació com a preferit"
+            other: "Tu i {{count}} persones més heu marcat aquesta publicació com a preferit"
+          like:
+            one: "Aquesta publicació us ha agradat a tu i a 1 persona més"
+            other: "Aquesta publicació us ha agradat a tu i a {{count}} persones més"
+          vote:
+            one: "Tu i 1 persona més heu votat per aquesta publicació"
+            other: "Tu i {{count}} persones més heu votat per aquesta publicació"
+        by_others:
+          off_topic:
+            one: "1 person ha marcat aquesta publicació amb bandera de fora de context"
+            other: "{{count}} persones han marcat aquesta publicació amb bandera de fora de context"
+          spam:
+            one: "1 persona ha marcat aquesta publicació amb bandera de brossa"
+            other: "{{count}} persones han marcat aquesta publicació amb bandera de brossa"
+          inappropriate:
+            one: "1 persona ha marcat aquesta publicació amb bandera d'inapropiat"
+            other: "{{count}} persones han marcat aquesta publicació amb bandera d'inapropiat"
+          notify_moderators:
+            one: "1 persona ha marcat aquesta publicació per moderar"
+            other: "{{count}} persones han marcat aquesta publicació per moderar"
+          notify_user:
+            one: "1 ha enviat un missatge a aquesta persona"
+            other: "{{count}} han enviat un missatge a aquesta persona"
+          bookmark:
+            one: "1 persona ha marcat aquesta publicació com a preferit"
+            other: "{{count}} persones han marcat aquesta publicació com a preferit"
+          like:
+            one: "això ha agradat a 1 persona"
+            other: "això ha agradat a {{count}} persones"
+          vote:
+            one: "1 persona ha votat per aquesta publicació"
+            other: "{{count}} persones han votat per aquesta publicació"
+      revisions:
+        controls:
+          first: "Primera revisió"
+          previous: "Revisió anterior"
+          next: "Següent revisió"
+          last: "Darrera revisió"
+          hide: "Amaga la revisió"
+          show: "Mostra la revisió"
+          revert: "Reverteix a aquesta revisió"
+          edit_wiki: "Edita Wiki"
+          edit_post: "Edita publicació"
+          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> <i class='fa fa-arrows-h'></i> <strong>{{current}}</strong> / {{total}}"
+        displays:
+          inline:
+            title: "Mostra la sortida renderitzada amb afegits i eliminacions interiors"
+            button: 'HTML'
+          side_by_side:
+            title: "Mostra als costats les diferències entre versions"
+            button: 'HTML'
+          side_by_side_markdown:
+            title: "Mostra als costats les diferències del codi en brut "
+            button: 'En brut'
+    category:
+      can: 'pot&hellip; '
+      none: '(sense categoria)'
+      all: 'Totes les categories'
+      choose: 'Tria una categoria&hellip;'
+      edit: 'edita'
+      edit_long: "Edita"
+      view: 'Mira temes per categories'
+      general: 'General'
+      settings: 'Configuracions'
+      topic_template: "Plantilla de tema"
+      tags: "Etiquetes"
+      tags_placeholder: "Llista (opcional) d'etiquetes permeses"
+      tag_groups_placeholder: "Llista (opcional) d'etiquetes de grup permeses"
+      topic_featured_link_allowed: "Permet enllaços destacats dins aquesta categoria"
+      delete: 'Esborra categoria'
+      create: 'Nova categoria'
+      create_long: 'Crea una nova categoria'
+      save: 'Desa la categoria'
+      slug: 'Categoria simplificada'
+      slug_placeholder: 'Paraules discontínues (opcional) per a url'
+      creation_error: Hi ha hagut un error en crear aquesta categoria.
+      save_error: Hi ha hagut un error en desar la categoria.
+      name: "Nom de la categoria"
+      description: "Descripció"
+      topic: "tema de la categoria"
+      logo: "Imatge del logo de la categoria"
+      background_image: "Imatge de fons de la categoria"
+      badge_colors: "Colors distintius"
+      background_color: "Color de fons"
+      foreground_color: "Color del primer plànol"
+      name_placeholder: "Màxim d'una o dues paraules"
+      color_placeholder: "Qualsevol color web"
+      delete_confirm: "Segur que vols esborrar aquesta categoria?"
+      delete_error: "Hi ha hagut un error en esborrar aquesta categoria"
+      list: "Llista categories"
+      no_description: "Si us plau, introdueix una descripció per a aquesta categoria."
+      change_in_category_topic: "Edita la descripció"
+      already_used: 'Aquest color ha estar fet servir per una altra categoria'
+      security: "Seguretat"
+      special_warning: "Atenció: aquesta categoria està preseleccionada i no es pot editar la seva configuració de seguretat. Si no la vols fer servir, esborra-la en comptes de reposar-la."
+      images: "Imatges"
+      email_in: "Personalitza l'adreça de correu electrònic entrant:"
+      email_in_allow_strangers: "Accepta correus des de persones usuàries anònimes sense compte"
+      email_in_disabled: "Les publicacions des del correu electrònic estan desactivades a les preferències del lloc. Per activar les publicacions des del correu electrònic, "
+      email_in_disabled_click: 'activa l''opció "email in".'
+      suppress_from_homepage: "Suprimeix aquesta categoria des de la pàgina principal."
+      show_subcategory_list: "Mostrar les publicacions de les subcategories llistades a continuació d'aquesta categoria."
+      all_topics_wiki: "Fes nou temes de wiki per defecte."
+      allow_badges_label: "Permet concedir distintius dins aquesta categoria"
+      edit_permissions: "Edita permisos"
+      add_permission: "Afegeix permisos"
+      this_year: "aquest any"
+      position: "posició"
+      default_position: "Posició per defecte"
+      position_disabled: "Les categories es mostraran per ordre d'activitat. Per controlar l'ordre de les categories en llistes, "
+      position_disabled_click: 'activa la configuració "posicions fixes de categories"'
+      parent: "Categoria relacionada"
+      notifications:
+        watching:
+          title: "Vigilant-lo"
+          description: "Veuràs automàticament tots els temes dins aquestes categories. Et notificarem cada publicació nova a cada tema i et mostrarem un recompte de noves respostes."
+        watching_first_post:
+          title: "Mirant la primera publicació"
+          description: "Només et notificarem sobre la primera publicació a cada nou tema dins aquestes categories."
+        tracking:
+          title: "Seguint"
+          description: "Automàticament observaràs tots els nous temes en aquestes categories. Se't notificarà si algú menciona el teu @nom o et respòn, i se't mostrarà un recompte de noves respostes."
+        regular:
+          title: "Normal"
+          description: "Se't notificarà si algú menciona el teu @nom o et contesta."
+        muted:
+          title: "Silenciat"
+          description: "Mai no et notificarem res sobre nous temes dins aquestes categories i no apareixeran al final."
+      sort_options:
+        default: "per defecte"
+        likes: "Agrada"
+        op_likes: "M'agrades a publicacions originals"
+        views: "Vistes"
+        posts: "Publicacions"
+        activity: "Activitat"
+        posters: "Persones que han publicat"
+        category: "Categoria"
+        created: "Creat"
+      sort_ascending: 'Ascendent'
+      sort_descending: 'Descendent'
+    flagging:
+      title: 'Gràcies per ajudar-nos a mantenir polida la nostra comunitat!'
+      action: 'Marca la publicació amb bandera '
+      take_action: "Fes una acció"
+      notify_action: 'Missatge'
+      official_warning: 'Avís oficial'
+      delete_spammer: "Esborra brossa"
+      delete_confirm_MF: "Estàs a punt d'esborrar {POSTS, plural, one {<b>1</b> publicació} other {<b>#</b> publicacions}} and {TOPICS, plural, one {<b>1</b> tema} other {<b>#</b> temes}} d'aquesta persona usuària, esborrar el seu compte, blocar identificacions des de l'adreça IP <b>{ip_address}</b> i afegir l'adreça de correu electrònic <b>{email}</b> a un llistat de bloqueig permanent. Segur que aquesta persona realment genera brossa?"
+      yes_delete_spammer: "Sí, esborra brossa"
+      ip_address_missing: "(N/A)"
+      hidden_email_address: "(amagat)"
+      submit_tooltip: "Envia la bandera privada"
+      take_action_tooltip: "Arriba al límit de banderes immediatament, més que no pas esperar més banderes de la comunitat"
+      cant: "Disculpa, per ara no pots marcar amb bandera aquesta publicació."
+      notify_staff: 'Notifica a l''equip en privat'
+      formatted_name:
+        off_topic: "Això és fora de context"
+        inappropriate: "Això és inapropiat"
+        spam: "Això és brossa"
+      custom_placeholder_notify_user: "Especifica, amb ànim constructiu i sempre amb amabilitat."
+      custom_placeholder_notify_moderators: "Deixa'ns saber que t'amoïna i passa'ns tants enllaços rellevants i exemples com sigui possible."
+      custom_message:
+        at_least:
+          one: "introdueix almenys 1 caràcter"
+          other: "introdueix almenys {{count}} caràcters"
+        more:
+          one: "1 per anar..."
+          other: "{{count}} per anar..."
+        left:
+          one: "1 restant"
+          other: "{{count}} restants"
+    flagging_topic:
+      title: "Gràcies per ajudar-nos a mantenir polida la nostra comunitat!"
+      action: "Marca el tema amb bandera "
+      notify_action: "Misssatge"
+    topic_map:
+      title: "Resum de tema"
+      participants_title: "Persones que han publicat amb freqüència"
+      links_title: "Enllaços populars"
+      links_shown: "mostra més enllaços..."
+      clicks:
+        one: "1 clic"
+        other: "%{count} clics"
+    post_links:
+      about: "eixampla més enllaços per a aquesta publicació"
+      title:
+        one: "1 més"
+        other: "%{count} més"
+    topic_statuses:
+      warning:
+        help: "Aquest és un avís oficial."
+      bookmarked:
+        help: "Has marcat aquest tema com a preferit"
+      locked:
+        help: "Aquest tema està tancat; ja no s'hi accepten noves respostes"
+      archived:
+        help: "Aquest tema està arxivat; està congelat i no es pot canviar"
+      locked_and_archived:
+        help: "Aquest tema està tancat i arxivat; ja no s'hi accepten noves respostes i no es pot canviar"
+      unpinned:
+        title: "Desclavat"
+        help: "Aquest tema està desclavat per a tu; es mostrarà en ordre normal"
+      pinned_globally:
+        title: "Clavat globalment"
+        help: "Aquest tema està clavat globalment; es mostrarà al començament dels darrers i de la seva categoria"
+      pinned:
+        title: "Clavat"
+        help: "Aquest tema està desclavat per a tu; es mostrarà al començament de la seva categoria"
+      invisible:
+        help: "Aquest tems no està llistat; no es mostrarà a la llista de temes i només pot ser accessible amb un enllaç directa"
+    posts: "Publicacions"
+    posts_long: "hi ha {{number}} publicacions a aquest tema"
+    posts_likes_MF: |
+      Aquest tema té {count, plural, one {1 resposta} other {# respostes}} {ratio, select,
+      low {ha agradat força}
+      med {ha agradat molt}
+      high {ha agradat moltíssim}
+      other {}}
+    original_post: "Publicació original"
+    views: "Vistes"
+    views_lowercase:
+      one: "vista"
+      other: "vistes"
+    replies: "Respostes"
+    views_long:
+      one: "aquest tema ha estat vist 1 cop"
+      other: "aquest tema ha estat vist {{number}} cops"
+    activity: "Activitat"
+    likes: "Ha agradat"
+    likes_lowercase:
+      one: "agrada"
+      other: "Agrada"
+    likes_long: "aquest tema ha agradat {{number}} cops"
+    users: "Persones usuàries"
+    users_lowercase:
+      one: "persona usuària"
+      other: "persones usuàries"
+    category_title: "Categoria"
+    history: "Història"
+    changed_by: "per {{author}}"
+    raw_email:
+      not_available: "No disponible!"
+    categories_list: "Llista de categories"
+    filters:
+      with_topics: "%{filter} temes"
+      with_category: "%{filter} %{category} temes"
+      latest:
+        title: "Darrers"
+        title_with_count:
+          one: "Darrer (1)"
+          other: "Darrers ({{count}})"
+        help: "temes amb publicacions recents"
+      hot:
+        title: "Candent"
+        help: "una selecció dels temes més candents"
+      read:
+        title: "Llegit"
+        help: "temes que has llegit, segons l'ordre de lectura"
+      search:
+        title: "Cerca"
+        help: "cerca tots els temes"
+      categories:
+        title: "Categories"
+        title_in: "Categoria - {{categoryName}}"
+        help: "tots els temes agrupats per categoria"
+      unread:
+        title: "No llegits"
+        title_with_count:
+          one: "No llegit (1)"
+          other: "No llegits ({{count}})"
+        help: "temes que estàs mirant o seguint amb publicacions no llegides"
+        lower_title_with_count:
+          one: "1 no llegit"
+          other: "{{count}} no llegits"
+      new:
+        lower_title_with_count:
+          one: "1 nou"
+          other: "{{count}} nous"
+        lower_title: "nou"
+        title: "Nous"
+        title_with_count:
+          one: "Nou (1)"
+          other: "Nous ({{count}})"
+        help: "temes creats durant els darrers dies"
+      posted:
+        title: "Les meves publicacions"
+        help: "temes que has publicat"
+      bookmarks:
+        title: "Preferits"
+        help: "temes que has marcat com a preferits"
+      category:
+        title: "{{categoryName}}"
+        title_with_count:
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
+        help: "darrers temes a la categoria {{categoryName}} "
+      top:
+        title: "Més actius"
+        help: "els temes més actius durant el darrer any, mes, setmana o dia"
+        all:
+          title: "Sempre"
+        yearly:
+          title: "Anualment"
+        quarterly:
+          title: "Trimestralment"
+        monthly:
+          title: "Mensualment"
+        weekly:
+          title: "Setmanalment"
+        daily:
+          title: "Diàriament"
+        all_time: "Sempre"
+        this_year: "Any"
+        this_quarter: "Trimestre"
+        this_month: "Mes"
+        this_week: "Setmana"
+        today: "D'avui"
+        other_periods: "mira amunt"
+    browser_update: 'Malauradament, <a href="http://www.discourse.org/faq/#browser">el teu navegador és massa vell per treballar amb aquest lloc web</a>. Si us plau <a href="http://browsehappy.com">actualitza el teu navegador</a>.'
+    permission_types:
+      full: "Crea / Respon / Mira"
+      create_post: "Respon / Mira"
+      readonly: "Mira"
+    lightbox:
+      download: "descarrega"
+    keyboard_shortcuts_help:
+      title: 'Dreceres de teclat'
+      jump_to:
+        title: 'Salta a'
+        home: '<b>g</b>, <b>h</b> Pàgina principal'
+        latest: '<b>g</b>, <b>l</b> Darrers'
+        new: '<b>g</b>, <b>n</b> Nous'
+        unread: '<b>g</b>, <b>u</b> No llegits'
+        categories: '<b>g</b>, <b>c</b> Categories'
+        top: '<b>g</b>, <b>t</b> Amunt'
+        bookmarks: '<b>g</b>, <b>b</b> Preferits'
+        profile: '<b>g</b>, <b>p</b> Perfil'
+        messages: '<b>g</b>, <b>m</b> Missatges'
+      navigation:
+        title: 'Navegació'
+        jump: '<b>#</b> Vés a la publicació #'
+        back: '<b>u</b> Enrere'
+        up_down: '<b>k</b>/<b>j</b> Mou selecció &uarr; &darr;'
+        open: '<b>o</b> or <b>Retorn</b> Obre el tema seleccionat'
+        next_prev: '<b>majúscula</b>+<b>j</b>/<b>shift</b>+<b>k</b> Secció següent/prèvia'
+      application:
+        title: 'Aplicació'
+        create: '<b>c</b> Crea un nou tema'
+        notifications: '<b>n</b> Obre notificacions'
+        hamburger_menu: '<b>=</b> Open menú hamburguesa'
+        user_profile_menu: '<b>p</b> Obre menú usuari'
+        show_incoming_updated_topics: '<b>.</b> Mostra temes actualitzats'
+        help: '<b>?</b> Obre l''ajuda de teclat'
+        dismiss_new_posts: '<b>x</b>, <b>r</b> Descatra Nous/Publicacions'
+        dismiss_topics: '<b>x</b>, <b>t</b> Descarta temes'
+        log_out: '<b>majúscula</b>+<b>z</b> <b>majúscula</b>+<b>z</b> Surt'
+      actions:
+        title: 'Accions'
+        bookmark_topic: '<b>f</b> Canvia tema de preferit'
+        pin_unpin_topic: '<b>majúscula</b>+<b>p</b> Clava/Desclava tema'
+        share_topic: '<b>majúscula</b>+<b>s</b> Comparteix tema'
+        share_post: '<b>s</b> Comparteix publicació'
+        reply_as_new_topic: '<b>t</b> Respon com a tema agradat'
+        reply_topic: '<b>majúscula</b>+<b>r</b> Respon a tema'
+        reply_post: '<b>r</b> Respon a la publicació'
+        quote_post: '<b>q</b> Cita publicació'
+        like: '<b>l</b> M''agrada la publicació'
+        flag: '<b>!</b> Marca la publicació amb bandera'
+        bookmark: '<b>b</b> Marca la publicació com a preferida'
+        edit: '<b>e</b> Edita la publicació'
+        delete: '<b>d</b> Esborra la publicació'
+        mark_muted: '<b>m</b>, <b>m</b> Silencia el tema'
+        mark_regular: '<b>m</b>, <b>r</b> Tema normal (per defecte)'
+        mark_tracking: '<b>m</b>, <b>t</b> Segueix tema'
+        mark_watching: '<b>m</b>, <b>w</b> Mira tema'
+        print: '<b>ctrl</b>+<b>p</b> Imprimeix tema'
+    badges:
+      earned_n_times:
+        one: "Ha rebut distintiu 1 cop"
+        other: "Ha rebut distintiu %{count} cops"
+      granted_on: "Concedit %{date}"
+      others_count: "Altres amb aquest distintiu (%{count})"
+      title: Distintius
+      badge_count:
+        one: "1 Distintiu"
+        other: "%{count} Distintius"
+      more_badges:
+        one: "+1 Més"
+        other: "+%{count} Més"
+      granted:
+        one: "1 concedit"
+        other: "%{count} concedits"
+      select_badge_for_title: Tria un distintiu per fer-lo servir com al teu títol
+      none: "<none>"
+      badge_grouping:
+        getting_started:
+          name: Començant
+        community:
+          name: Comunitat
+        trust_level:
+          name: Nivell de confiança
+        other:
+          name: Altres
+        posting:
+          name: Publicant
+    google_search: |
+      <h3>Cerca amb 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: "Totes les etiquetes"
+      selector_all_tags: "totes les etiquetes"
+      selector_no_tags: "sense etiquetes"
+      changed: "etiquetes canviades:"
+      tags: "Etiquetes"
+      delete_tag: "Esborra etiqueta"
+      rename_tag: "Reanomena etiqueta"
+      rename_instructions: "Tria un nou nom per a l'etiqueta:"
+      sort_by: "Ordena per:"
+      sort_by_count: "comptabilitza"
+      sort_by_name: "nom"
+      manage_groups: "Gestiona grups d'etiquetes"
+      manage_groups_description: "Defineix grups per organitzar etiquetes"
+      filters:
+        without_category: "%{filter} %{tag} temes"
+        with_category: "%{filter} %{tag} temes a %{category}"
+        untagged_without_category: "%{filter} temes sense etiquetar"
+        untagged_with_category: "%{filter} temes sense etiquetar a %{category}"
+      notifications:
+        watching:
+          title: "Mirant"
+          description: "Miraràs automàticament tots els temes amb aquesta etiqueta. Et notificarem totes les noves publicacions i els nous temes, així com un recompte de noves publicacions que apareixerà al costat del tema."
+        watching_first_post:
+          title: "Mirant la primera publicació"
+          description: "Només et notificarem la primera publicació per cada nou tema amb aquesta etiqueta."
+        tracking:
+          title: "Seguint"
+          description: "Seguiràs automàticament tots els temes amb aquesta etiqueta. Apareixerà al costat del tema un recompte de publicacions noves i no llegides."
+        regular:
+          title: "Ordinari"
+          description: "Rebràs alertes si una persona menciona el teu @nom o respon la teva publicació."
+        muted:
+          title: "Silenciat"
+          description: "No et notificarem res sobre nous temes amb aquesta etiqueta i no apareixeran a la teva pestanya de no llegits."
+      groups:
+        title: "Grups d'etiquetes"
+        about: "Afegeix etiquetes a grups per gestionar-ho més fàcilment."
+        new: "Nou grup"
+        tags_label: "Etiquetes a aquest grup:"
+        parent_tag_label: "Etiqueta relacionada:"
+        parent_tag_placeholder: "Opcional"
+        parent_tag_description: "Les etiquetes d'aquest grup no es poden fer servir si no hi és l'etiqueta principal."
+        one_per_topic_label: "Limita una etiqueta per cada tema d'aquest grup"
+        new_name: "Nou grup d'etiquetes"
+        save: "Desa"
+        delete: "Esborra"
+        confirm_delete: "Segur que vols esborrar aquest grup d'etiquetes?"
+      topics:
+        none:
+          unread: "No tens temes sense llegir."
+          new: "No tens nous temes."
+          read: "Encara no has llegit cap tema."
+          posted: "Encara no has publicat cap tema."
+          latest: "No hi ha temes recents."
+          hot: "No hi ha temes candents."
+          bookmarks: "Encara no has marcat temes com a preferits."
+          top: "No hi ha temes principals."
+          search: "No hi ha resultats de la cerca."
+        bottom:
+          latest: "No hi ha més darrers temes."
+          hot: "No hi ha més temes candents."
+          posted: "No hi ha més temes publicats."
+          read: "No hi ha més temes llegits."
+          new: "No hi ha més temes nous."
+          unread: "No hi ha més temes sense llegir."
+          top: "No hi ha més temes destacats."
+          bookmarks: "No hi ha més temes marcats com a preferits."
+          search: "No hi ha més resultats de la cerca."
+    invite:
+      custom_message: "Personalitza una mica més la teva invitació tot escrivint "
+      custom_message_link: "un missatge personalitzat"
+      custom_message_placeholder: "Introdueix el teu missatge personalizat"
+      custom_message_template_forum: "Ep! Hauries d'unir-te a aquest fòrum!"
+      custom_message_template_topic: "Ep! Crec que gaudiràs d'aquest tema!"
+    safe_mode:
+      enabled: "El mode segur està activat, per sortir-ne tanca aquesta finestra del navegador"
+  admin_js:
+    type_to_filter: "escriu per filtrar..."
+    admin:
+      title: 'Administració de Discourse'
+      moderator: 'Moderació'
+      dashboard:
+        title: "Tauler de control"
+        last_updated: "Darrera actualització del tauler de control"
+        version: "Versió"
+        up_to_date: "Estàs al dia!"
+        critical_available: "Hi ha una actualització important."
+        updates_available: "Hi ha actualitzacions."
+        please_upgrade: "Si us plau, actualitza!"
+        no_check_performed: "No s'ha executat la comprovació d'actualitzacions. Assegura't que funciona sidekiq."
+        stale_data: "Darrerament no s'ha executat la comprovació d'actualitzacions. Assegura't que funciona sidekiq."
+        version_check_pending: "Sembla que has actualitzat fa poc. Genial!"
+        installed_version: "Instal·lat"
+        latest_version: "Darrers"
+        problems_found: "S'han trobat alguns problemes amb la teva instal·lació de Discourse:"
+        last_checked: "Comprovat per darrer cop"
+        refresh_problems: "Actualitza"
+        no_problems: "No s'hi han trobat problemes."
+        moderators: 'Moderació'
+        admins: 'Administració:'
+        suspended: 'Suspès: '
+        private_messages_short: "Mtgs"
+        private_messages_title: "Missatges"
+        mobile_title: "Mòbil"
+        space_free: "{{size}} gratis"
+        uploads: "actualitzacions"
+        backups: "còpies de seguretat"
+        traffic_short: "Trànsit"
+        traffic: "Peticions d'aplicació web"
+        page_views: "Vistes de pàgina"
+        page_views_short: "Vistes de pàgina"
+        show_traffic_report: "Mostra l'informe detallat de trànsit"
+        reports:
+          today: "Avui"
+          yesterday: "Ahir"
+          last_7_days: "Els darrers 7 dies"
+          last_30_days: "Els darrers 30 dies"
+          all_time: "Sempre"
+          7_days_ago: "Fa 7 dies"
+          30_days_ago: "Fa 30 dies"
+          all: "Tot"
+          view_table: "taula"
+          view_graph: "gràfica"
+          refresh_report: "Actualitza l'informe"
+          start_date: "Data d'inici"
+          end_date: "Finalitza data"
+          groups: "Tots els grups"
+      commits:
+        latest_changes: "Darrers canvis: si us plau actualitza sovint!"
+        by: "per"
+      flags:
+        title: "Avisos"
+        agree: "D'acord"
+        agree_title: "Confirma aquesta bandera com a vàlida i correcta"
+        defer_flag_title: "Esborra aquesta bandera; no necessita cap acció hores d'ara."
+        delete: "Esborra"
+        delete_title: "Esborra la publicació a la qual es refereix aquesta bandera."
+        delete_post_defer_flag_title: "Esborra la publicació; si és la primera publicació, esborra el tema"
+        delete_post_agree_flag_title: "Esborra la publicació; si és la primera publicació, esborra el tema"
+        delete_flag_modal_title: "Esborra i..."
+        delete_spammer: "Esborra brossa"
+        delete_spammer_title: "Esborra la persona usuària i totes les publicacions i temes d'aquesta persona usuària."
+        disagree_flag_unhide_post: "En desacord (desfer amagar publicació)"
+        disagree_flag_unhide_post_title: "Esborra qualsevol bandera d'aquesta publicació i torna a fer visible la publicació"
+        disagree_flag: "En desacord"
+        disagree_flag_title: "Nega aquesta bandera per invàlida i incorrecta"
+        clear_topic_flags: "Fet"
+        clear_topic_flags_title: "El tema ha estat investigat i els fets han estat resolts. Clica Fet per esborrar les banderes."
+        more: "(més respostes... )"
+        dispositions:
+          agreed: "d'acord"
+          disagreed: "en desacord"
+        flagged_by: "Abanderat per"
+        resolved_by: "Resolt per"
+        took_action: "Actuat"
+        system: "Sistema"
+        error: "Alguna cosa ha anat malament"
+        reply_message: "Respon"
+        topic_flagged: "Aquest <strong>tema</strong> ha estat abanderat."
+        visit_topic: "Visita el tema per actuar"
+        was_edited: "La publicació va ser editada després de la primera bandera"
+        previous_flags_count: "Aquesta publicació ha estat abanderada {{count}} cops."
+      groups:
+        primary: "Grup primari"
+        no_primary: "(grup no primari)"
+        title: "Grups"
+        edit: "Edita grups"
+        refresh: "Actualitza"
+        new: "Nou"
+        selector_placeholder: "escriu nom de persona usuària"
+        about: "Edita aquí la teva pertinença de grup i noms"
+        group_members: "Membres de grup"
+        delete: "Esborra"
+        delete_confirm: "Esborra aquest grup?"
+        delete_failed: "Impossible esborrar aquest grup. Si és un grup automàtic, no pot ser destruït."
+        delete_owner_confirm: "Esborra privilegis propietaris per a '%{username}'?"
+        add: "Afegegix"
+        add_members: "Afegeix membres"
+        custom: "Personalitza"
+        bulk_complete: "Les persones usuàries s'han afegit al grup."
+        bulk: "Afegeix a grup massivament"
+        bulk_paste: "Enganxa una llista de persones o correus, un per línia:"
+        bulk_select: "(tria un grup)"
+        automatic: "Automàtic"
+        automatic_membership_email_domains: "Les persones registrades amb un domini de correu que coincideix amb un de la llista s'afegiran automàticament a aquest grup:"
+        automatic_membership_retroactive: "Aplica la mateixa regla de domini de correu per afegir persones registrades existents"
+        default_title: "Títol per defecte per a totes les persones a aquest grup"
+        primary_group: "Estableix automàticament com a grup primari"
+        group_owners: Persones propietàries
+        add_owners: Afegeix persones propietàries
+        incoming_email: "Personalitza l'adreça de correu electrònic entrant:"
+        incoming_email_placeholder: "introdueix una adreça de correu electrònic"
+      api:
+        generate_master: "Genera una clau mestra API"
+        none: "No hi ha claus API actives ara mateix"
+        user: "Persona usuària"
+        title: "API"
+        key: "Clau API"
+        generate: "Genera"
+        regenerate: "Regenera"
+        revoke: "Revoca"
+        confirm_regen: "Segur que vols reemplaçar aquesta clau API amb una de nova?"
+        confirm_revoke: "Segur que vols revocar aquesta clau?"
+        info_html: "La teva clau API et permetrà crear i actualitzar temes fent servir crides JSON."
+        all_users: "Totes les persones usuàries"
+        note_html: "Conserva aquesta clau <strong>secreta</strong>, totes les persones que la tinguin podrien crear publicacions arbitràries com a qualsevol identitat."
+      web_hooks:
+        title: "Ganxo de web"
+        none: "Ara no hi ha ganxos de web."
+        instruction: "Els ganxos de web permeten a Discourse notificar els serveis externs quan passen alguns esdeveniments al teu lloc. Quan s'engega el ganxo de web, s'envia una petició POST a les URL facilitades."
+        detailed_instruction: "S'enviarà una petició POST a la URL facilitada quan passi l'esdeveniment."
+        new: "Nou ganxo de web"
+        create: "Crea"
+        save: "Desa"
+        destroy: "Esborra"
+        description: "Descripció"
+        controls: "Controls"
+        go_back: "Torna al llistat"
+        payload_url: "URL de càrrega útil"
+        payload_url_placeholder: "https://exemple.com/postreceive"
+        warn_local_payload_url: "Sembla que estàs provant de fer un ganxo de web a una URL local. L'esdeveniment lliurat a una adreça local pot provocar efectes secundaris o comportaments inesperats. Continua?"
+        secret_invalid: "El secret no ha de tenir espais en blanc."
+        secret_too_short: "El secret hauria de tenir un mínim de 12 caràcters."
+        secret_placeholder: "Una cadena opcional, emprada per generar una signatura"
+        event_type_missing: "Et cal establir com a mínim un tipus d'esdeveniment."
+        content_type: "Tipus de contingut"
+        secret: "Secret"
+        wildcard_event: "Envia-m'ho tot."
+        individual_event: "Tria esdeveniments individuals."
+        verify_certificate: "Comprova el certificat TLS de la URL de càrrega útil"
+        active: "Actiu"
+        active_notice: "Lliurarem detalls de l'esdeveniment quan succeeixi."
+        categories_filter_instructions: "Els ganxos de web rellevants només funcionaran si l'esdeveniment està relacionat amb categories específiques. Deixa-ho en blanc per activar ganxos web per a totes les categories."
+        categories_filter: "Categories desencadenades"
+        groups_filter_instructions: "Els ganxos de web rellevants només funcionaran si l'esdeveniment està relacionat amb grups. Deixa-ho en blanc per activar ganxos web per a tots els grups."
+        groups_filter: "Grups desencadenats"
+        delete_confirm: "Esborra aquest ganxo de web?"
+        topic_event:
+          name: "Esdeveniment de tema"
+          details: "Quan hi ha un nou tema, revisat, canviat o esborrat."
+        post_event:
+          name: "Esdeveniment de publicació"
+          details: "Quan hi ha una nova resposta, editada, esborrada o recuperada."
+        user_event:
+          name: "Esdeveniment de persona usuària"
+        delivery_status:
+          title: "Estat de lliurament"
+          inactive: "Inactiu"
+          failed: "Ha fallat"
+          successful: "Amb èxit"
+        events:
+          none: "No hi ha esdeveniments relacionats"
+          redeliver: "Relliura"
+          incoming:
+            one: "Hi ha un nou esdeveniment."
+            other: "Hi ha {{count}} esdeveniments nous."
+          completed_in:
+            one: "Completat en 1 segon."
+            other: "Completat en {{count}} segons."
+          request: "Sol·licita"
+          response: "Reacció"
+          redeliver_confirm: "Segur que vols tornar a lliurar la mateixa càrrega útil?"
+          headers: "Encapçalaments"
+          payload: "Càrrega útil"
+          body: "Cos"
+          go_list: "Vés a la llista"
+          go_details: "Edita ganxo de web"
+          go_events: "Vés a esdeveniments"
+          ping: "Xiulada"
+          status: "Codi d'estat"
+          event_id: "ID"
+          timestamp: "Creat"
+          completion: "Temps de finalització"
+          actions: "Accions"
+      plugins:
+        title: "Complements"
+        installed: "Complements instal·lats"
+        name: "Nom"
+        none_installed: "No tens cap complement instal·lat."
+        version: "Versió"
+        enabled: "Activat?"
+        is_enabled: "S"
+        not_enabled: "N"
+        change_settings: "Canvia configuració"
+        change_settings_short: "Configuració"
+        howto: "Com instal·lo complements?"
+      backups:
+        title: "Còpies de seguretat"
+        menu:
+          backups: "Còpies de seguretat"
+          logs: "Registres"
+        none: "No hi ha còpia de seguretat disponible."
+        read_only:
+          enable:
+            title: "Activa el mode només de lectura"
+            label: "Activa només de lectura"
+            confirm: "Segur que vols activar el mode només de lectura?"
+          disable:
+            title: "Desactiva només de lectura"
+            label: "Desactiva només de lectura"
+        logs:
+          none: "Encara sense registres..."
+        columns:
+          filename: "Nom del fitxer"
+          size: "Mida"
+        upload:
+          label: "Carrega"
+          title: "Carrega una còpia de seguretat a aquesta instància"
+          uploading: "Carregant..."
+          success: "S'ha carregat '{{filename}}' amb èxit."
+          error: "S'ha produït un error en carregar '{{filename}}': {{message}}"
+        operations:
+          is_running: "Ara hi ha una operació en marxa..."
+          failed: "Ha fallat {{operation}}. Si us plau, consulta els registres."
+          cancel:
+            label: "Cancel·la"
+            title: "Cancel·la l'operació actual"
+            confirm: "Segur que vols cancel·lar l'operació actual?"
+          backup:
+            label: "Còpia de seguretat"
+            title: "Crea una còpia de seguretat"
+            confirm: "Vols iniciar una nova còpia de seguretat?"
+            without_uploads: "Sí (no hi incloguis fitxers)"
+          download:
+            label: "Descarrega"
+          destroy:
+            title: "Esborra la còpia de seguretat"
+            confirm: "Segur que vols destruir aquesta còpia de seguetat?"
+          restore:
+            is_disabled: "S'ha desactivat la restauració a la configuració del lloc web."
+            label: "Restaura"
+            title: "Restaura la còpia de seguretat"
+            confirm: "Segur que vols restaurar aquesta còpia de seguetat?"
+          rollback:
+            label: "Reverteix"
+            title: "Reverteix la base de dades a l'estat de treball previ"
+            confirm: "Segur que vols revertir la base de dades a l'estat previ de treball?"
+      export_csv:
+        success: "Exporta l'iniciat, et notificarem amb un missatge quan el procés hagi acabat."
+        failed: "Ha fallat l'exportació. Si us plau, consulta els registres."
+        button_text: "Exporta"
+        button_title:
+          user: "Exporta la llista completa de persones usuàries en format CSV."
+          staff_action: "Exporta l'acció d'equip completa en format CSV."
+          screened_email: "Exporta la llista completa de correu revisat en format CSV."
+          screened_ip: "Exporta la llista completa d'IP revisades en format CSV."
+          screened_url: "Exporta la llista completa d'URL revisades en format CSV."
+      export_json:
+        button_text: "Exporta"
+      invite:
+        button_text: "Envia invitacions"
+        button_title: "Envia la invitació"
+      customize:
+        title: "Personalitza"
+        long_title: "Personalitzacions del lloc"
+        preview: "vista prèvia"
+        save: "Desa"
+        new: "Nou"
+        new_style: "Nou estil"
+        import: "Importa"
+        delete: "Esborra"
+        about: "Modifica les fulles d'estil CSS i els encapçalaments HTML a aquest lloc web. Afegeix una personalització per començar."
+        color: "Color"
+        opacity: "Opacitat"
+        copy: "Còpia"
+        email_templates:
+          title: "Esborranys de correu"
+          subject: "Tema"
+          multiple_subjects: "Aquest esborrany de correu té múltiples temes"
+          body: "Cos"
+          none_selected: "Tria un esborrany de correu per començar a editar."
+          revert: "Reverteix canvis"
+          revert_confirm: "Segur que vols revertir els teus canvis?"
+        colors:
+          title: "Colors"
+          long_title: "Esquemes de color"
+          new_name: "Nou esquema de color"
+          copy_name_prefix: "Còpia de"
+          delete_confirm: "Esborra aquest esquema de color?"
+          undo: "desfés"
+          undo_title: "Desfés els teus canvis a aquest color des del darrer cop que va ser desat."
+          revert: "reverteix"
+          revert_title: "Restableix aquest color a l'esquema de color per defecte de Discourse."
+          primary:
+            name: 'primari'
+            description: 'Majoria de text, icones i vores.'
+          secondary:
+            name: 'secundari'
+            description: 'El color de fons principal i el olor de text d''alguns botons.'
+          tertiary:
+            name: 'terciari'
+            description: 'Enllaços, alguns botons, alertes i color destacat.'
+          quaternary:
+            name: "quaternari"
+            description: "Enllaços de navegació"
+          header_background:
+            name: "color de fons de la capçalera"
+            description: "Color de fons de la capçalera del lloc."
+          header_primary:
+            name: "capçalera primària"
+            description: "Text i icones a la capçalera del lloc."
+          highlight:
+            name: 'destaca'
+            description: 'El color de fons dels elements destacats a la pàgina, com ara publicacions i temes.'
+          danger:
+            name: 'perill'
+            description: 'Color destacat per a accions com ara esborrar publicacions i temes.'
+          success:
+            name: 'èxit'
+            description: 'Emprat per indicar que una acció ha estat reeixida.'
+          love:
+            name: 'amor'
+            description: "El color del botó M'agrada"
+      email:
+        title: "Correus"
+        settings: "Configuracions"
+        templates: "Esborranys"
+        preview_digest: "Resum de vista prèvia"
+        sending_test: "Enviant aquest correu..."
+        error: "<b>ERROR</b> - %{server_error}"
+        test_error: "Hi ha hagut un problema en enviar aquest correu. Si us plau torna a revisar la configuració del teu correu, verifica que el teu amfitrió no bloqui les connexions i prova-ho un cop més."
+        sent: "Enviat"
+        skipped: "Saltat"
+        bounced: "Rebotat"
+        received: "Rebut"
+        rejected: "Rebutjat"
+        sent_at: "Enviat a"
+        time: "Temps"
+        user: "Persona usuària"
+        email_type: "Tipus de correu"
+        to_address: "A l'adreça"
+        test_email_address: "adreça de correu per provar"
+        send_test: "Envia correu de prova"
+        sent_test: "enviat!"
+        delivery_method: "Mètode de lliurament"
+        preview_digest_desc: "Vista prèvia del contingut del resum de correus enviats a persones inactives."
+        refresh: "Actualitza"
+        send_digest_label: "Envia aquest resultat a:"
+        send_digest: "Envia"
+        sending_email: "Enviant correu..."
+        format: "Format"
+        html: "html"
+        text: "text"
+        last_seen_user: "Darrera persona usuària vista:"
+        no_result: "No s'han trobat resultats per resumir."
+        reply_key: "Clau de resposta"
+        skipped_reason: "Motiu de salt"
+        incoming_emails:
+          from_address: "De"
+          to_addresses: "A"
+          cc_addresses: "CC"
+          subject: "Tema"
+          error: "Error"
+          none: "No s'han trobat correus entrants"
+          modal:
+            title: "Detalls de correu entrant"
+            error: "Error"
+            headers: "Encapçalaments"
+            subject: "Tema"
+            body: "Cos"
+            rejection_message: "Correu de rebuig"
+          filters:
+            from_placeholder: "from@example.com"
+            to_placeholder: "to@example.com"
+            cc_placeholder: "cc@example.com"
+            subject_placeholder: "Tema..."
+            error_placeholder: "Error"
+        logs:
+          none: "No s'hi han trobat registres."
+          filters:
+            title: "Filtre"
+            user_placeholder: "identitat"
+            address_placeholder: "name@example.com"
+            type_placeholder: "resum, registre..."
+            reply_key_placeholder: "clau de resposta"
+            skipped_reason_placeholder: "motiu"
+      logs:
+        title: "Registres"
+        action: "Acció"
+        created_at: "Creat"
+        last_match_at: "Darrera coincidència"
+        match_count: "Coincidències"
+        ip_address: "IP"
+        topic_id: "ID de tema"
+        post_id: "ID de publicació"
+        category_id: "ID de categoria"
+        delete: 'Esborra'
+        edit: 'Edita'
+        save: 'Desa'
+        screened_actions:
+          block: "bloca"
+          do_nothing: "no facis res"
+        staff_actions:
+          title: "Accions d'equip"
+          clear_filters: "Mostra-ho tot"
+          staff_user: "Persona de l'equip"
+          target_user: "Identitat objectiu"
+          subject: "Tema"
+          when: "Quan"
+          context: "Context"
+          details: "Detalls"
+          previous_value: "Previ"
+          new_value: "Nou"
+          diff: "Diferències"
+          show: "Mostra"
+          modal_title: "Detalls"
+          no_previous: "No hi ha valor previ."
+          deleted: "No hi ha valor. S'ha esborrat el registre."
+          actions:
+            delete_user: "elimina persona usuària"
+            change_trust_level: "canvia el nivell de confiança"
+            change_username: "canvia nom de persona usuària"
+            change_site_setting: "canvia la configuració del lloc"
+            change_site_text: "canvia el text del lloc"
+            suspend_user: "suspèn persona usuària"
+            unsuspend_user: "desfés suspendre persona usuària"
+            grant_badge: "atorga distinció"
+            revoke_badge: "revoca distinció"
+            check_email: "comprova correu"
+            delete_topic: "esborra tema"
+            delete_post: "esborra publicació"
+            impersonate: "suplanta"
+            anonymize_user: "fes la identitat anònima"
+            roll_up: "enrotlla blocs d'IP"
+            change_category_settings: "canvia la configuració de categoria"
+            delete_category: "esborra categoria"
+            create_category: "crea categoria"
+            grant_admin: "atorga administració"
+            revoke_admin: "revoca administració"
+            grant_moderation: "atorga moderació"
+            revoke_moderation: "revoca moderació"
+            backup_create: "crea còpia de seguretat"
+            deleted_tag: "etiqueta esborrada"
+            renamed_tag: "etiqueta reanomenada"
+            revoke_email: "revoca correu"
+            lock_trust_level: "bloca nivell de confiança"
+            unlock_trust_level: "desbloca nivell de confiança"
+            activate_user: "activa persona usuària"
+            deactivate_user: "desactiva persona usuària"
+            change_readonly_mode: "canvia el mode de només lectura"
+            backup_download: "descarrega còpia de seguretat"
+            backup_destroy: "destrueix la còpia de seguretat"
+        screened_emails:
+          title: "Correus revisats"
+          description: "Quan es prova de crear un nou compte, es revisaran les següents adreces i es blocarà el registre o es durà a terme algun tipus d'acció."
+          email: "Adreça de correu"
+          actions:
+            allow: "Permet"
+        screened_urls:
+          title: "URL revisades"
+          description: "Les URL llistades aquí han estat emprades a publicacions per persones identificades com a generadores de brossa."
+          url: "URL"
+          domain: "Domini"
+        screened_ips:
+          title: "IP revisades"
+          description: 'Adreces IP que s''estan observant. Fes servir "Permet" per blanquejar les adreces IP.'
+          delete_confirm: "Segur que vols esborrar la regla per a %{ip_address}?"
+          roll_up_confirm: "Segur que vols enrotllar dins de subxarxes les adreces IP revisades més comuns?"
+          rolled_up_some_subnets: "Entrades d'IP prohibides enrotllades amb èxit dins aquestes subxarxes: %{subnets}."
+          rolled_up_no_subnet: "No hi ha res per enrotllar."
+          actions:
+            block: "Bloca"
+            do_nothing: "Permet"
+            allow_admin: "Permet administració"
+          form:
+            label: "Nou:"
+            ip_address: "Adreça IP"
+            add: "Afegegix"
+            filter: "Cerca"
+          roll_up:
+            text: "Enrotlla"
+            title: "Crea entrades prohibides d'una nova subxarxa si com a mínim hi ha 'min_ban_entries_for_roll_up' entrades."
+        logster:
+          title: "Error de registres"
+      impersonate:
+        title: "Suplanta"
+        help: "Fes servir aquesta eina per suplantar comptes amb l'objectiu de depurar. Hauràs de desconnectar quan acabis."
+        not_found: "No s'ha trobat aquesta persona."
+        invalid: "Disculpa, no pots suplantar aquesta persona."
+      users:
+        title: 'Persones usuàries'
+        create: 'Afegeix identitat d''administració'
+        last_emailed: "Darrer correu"
+        not_found: "Disculpa, aquesta nom de persona usuària no existeix al nostre sistema."
+        id_not_found: "Disculpa, aquesta identitat usuària no existeix al nostre sistema."
+        active: "Actiu"
+        show_emails: "Mostra correus"
+        nav:
+          new: "Nou"
+          active: "Actiu"
+          pending: "Pendent"
+          staff: 'Equip'
+          suspended: 'Suspès'
+          suspect: 'Sospita'
+        approved: "Aprovat?"
+        approved_selected:
+          one: "Aprova persona usuària"
+          other: "Aprova persones usuàries ({{count}})"
+        reject_selected:
+          one: "Refusa persona usuària"
+          other: "Refusa persones usuàries ({{count}})"
+        titles:
+          active: 'Persones usuàries actives'
+          new: 'Nova persones usuàries'
+          pending: 'Persones usuàries per revisar'
+          newuser: 'Persones usuàries amb nivell confiança 0 (Nouvingudes)'
+          basic: 'Persones usuàries amb nivell confiança 1 (Bàsiques)'
+          member: 'Persones usuàries amb nivell confiança 2 (Membres)'
+          regular: 'Persones usuàries amb nivell confiança 3 (Ordinàries)'
+          leader: 'Persones usuàries amb nivell confiança 4 (Líders)'
+          staff: "Equip"
+          admins: 'Administra persones usuàries'
+          moderators: 'Persones moderadores'
+          suspended: 'Persones usuàries suspeses'
+          suspect: 'Persones usuàries sospitoses'
+        reject_successful:
+          one: "1 persona usuària refusada amb èxit"
+          other: "%{count} persones usuàries refusades amb èxit"
+        reject_failures:
+          one: "Ha fallat en refusar 1 persona usuària."
+          other: "Ha fallat en refusar %{count} persones usuàries."
+        not_verified: "No verificat"
+        check_email:
+          title: "Mostra correu electrònic d'aquesta persona"
+          text: "Mostra"
+      user:
+        suspend_failed: "Alguna cosa ha fallat en suspendre aquesta persona {{error}}"
+        unsuspend_failed: "Alguna cosa ha fallat en desfer la suspensió d'aquesta persona {{error}}"
+        suspend_duration: "Quant de temps durarà la suspensió d'aquesta persona?"
+        suspend_reason_label: "Per què suspens aquesta persona? Aquest text <b>serà visible per a tothom</b> a la pàgina del seu perfil i es mostrarà quan aquesta persona s'hi vulgui connectar. Fes-ho breu."
+        suspend_reason: "Motiu"
+        suspended_by: "Persona suspesa per"
+        delete_all_posts: "Esborra totes les publicacions"
+        delete_all_posts_confirm_MF: "Estàs a punt d'esborrar {POSTS, plural, one {1 publicació} other {# publicacions}} i {TOPICS, plural, one {1 tema} other {# temes}}. Segur?"
+        moderator: "Moderador?"
+        admin: "Admin?"
+        suspended: "Suspès?"
+        staged: "Escenificat?"
+        show_admin_profile: "Administració"
+        refresh_browsers: "Força l'actualització del navegador"
+        refresh_browsers_message: "Missatge enviat a totes les persones clientes!"
+        show_public_profile: "Mostra perfil públic"
+        impersonate: 'Personifica'
+        action_logs: "Registres d'accions"
+        ip_lookup: "Cerca IP"
+        log_out: "Surt"
+        logged_out: "La persona ha sortit a tots els dispositius"
+        revoke_admin: 'Revoca admin'
+        grant_admin: 'Concedeix admin'
+        revoke_moderation: 'Revoca moderació'
+        grant_moderation: 'Concedeix moderació'
+        unsuspend: 'Desfés suspendre'
+        suspend: 'Suspèn'
+        reputation: Reputació
+        permissions: Permisos
+        activity: Activitat
+        like_count: M'agrades donats / rebuts
+        last_100_days: 'durant els darrers 100 dies'
+        private_topics_count: Temes privats
+        posts_read_count: Publicacions llegides
+        post_count: Publicacions creades
+        topics_entered: Temes vistos
+        flags_given_count: Banderes donades
+        flags_received_count: Banderes rebudes
+        warnings_received_count: Avisos rebuts
+        flags_given_received_count: 'Banderes donades / rebudes'
+        approve: 'Aprova'
+        approved_by: "aprovat per"
+        approve_success: "Persona aprovada i correu enviat amb instruccions d'activació"
+        approve_bulk_success: "Èxit! Totes les persones seleccionades han estat aprovades i avisades."
+        time_read: "Temps de lectura"
+        anonymize: "Fes anònima la persona usuària"
+        anonymize_confirm: "Segur que vols fer anònim aquest compte? Això canviarà el nom de persona usuària i el correu electrònic, així com restablir tota la informació de perfil."
+        anonymize_yes: "Sí, fes anònim aquest compte"
+        anonymize_failed: "Hi ha hagut un problema en fer anònim aquest compte."
+        delete: "Esborra persona usuària"
+        delete_forbidden_because_staff: "No es poden esborrar les persones administradores i moderadores."
+        delete_posts_forbidden_because_staff: "No es poden esborrar totes les publicacions de les persones administradores i moderadores."
+        delete_forbidden:
+          one: "No es poden esborrar les persones usuàries si tenen publicacions. Esborra totes les publicacions abans d'eliminar una persona usuària. (No es poden esborrar les publicacions amb més d'%{count} dia)"
+          other: "No es poden esborrar les persones usuàries si tenen publicacions. Esborra totes les publicacions abans d'eliminar una persona usuària. (No es poden esborrar les publicacions amb més de %{count} dies)"
+        cant_delete_all_posts:
+          one: "No es poden esborrar totes les publicacions. Algunes publicacions tenen més d'%{count} dia. (La configuració delete_user_max_post_age)"
+          other: "No es poden esborrar totes les publicacions. Algunes publicacions tenen més de %{count} dies. (La configuració delete_user_max_post_age)"
+        cant_delete_all_too_many_posts:
+          one: "No es poden esborrar totes les publicacions perquè la persona usuària té més d'1 publicació.  (delete_all_posts_max)"
+          other: "No es poden esborrar totes les publicacions perquè la persona usuària té més de %{count} publicacions.  (delete_all_posts_max)"
+        delete_confirm: "Segur que vols esborrar aquesta persona? Això és permanent!"
+        delete_and_block: "Esborra i <b>bloca</i> aquest correu electrònic i adreça IP"
+        delete_dont_block: "Només esborra"
+        deleted: "La persona usuària ha estat eliminada."
+        delete_failed: "Hi ha hagut un error en esborrar aquesta persona. Assegura't que s'esborren totes les publicacions abans de provar d'esborrar aquesta persona usuària. "
+        send_activation_email: "Envia un correu d'activació"
+        activation_email_sent: "S'ha enviat un correu d'activació"
+        send_activation_email_failed: "Hi ha hagut un problema en enviar un altre correu d'activació. %{error}"
+        activate: "Activa compte"
+        activate_failed: "Hi ha hagut un problema en activar aquesta persona usuària."
+        deactivate_account: "Desactiva compte"
+        deactivate_failed: "Hi ha hagut un problema en desactivar aquesta persona."
+        bounce_score: "Puntuació de rebots"
+        reset_bounce_score:
+          label: "Reinicia"
+          title: "Reinicia la puntuació de rebots a 0"
+        deactivate_explanation: "Una persona desactivada ha de revalidar el correu."
+        suspended_explanation: "Una persona suspesa no pot connectar-s'hi."
+        staged_explanation: "Una persona escenificada només pot publica per correu a alguns temes."
+        bounce_score_explanation:
+          none: "Recentment no s'han rebut rebots d'aquest correu."
+          some: "S'han rebut alguns rebots des d'aquest correu."
+          threshold_reached: "S'han rebut massa rebots des d'aquest correu."
+        trust_level_change_failed: "Hi ha hagut un problema en canviar el nivell de confiança d'aquesta persona."
+        suspend_modal_title: "Suspèn persona usuària"
+        trust_level_2_users: "Nivell de confiança 2 persones usuàries"
+        trust_level_3_requirements: "Nivell de confiança 3 requisits"
+        trust_level_locked_tip: "el nivell de confiança està bloquejat, el sistema no promourà o degradarà la persona usuària"
+        trust_level_unlocked_tip: "el nivell de confiança està desbloquejat, el sistema pot promoure o degradar la persona usuària"
+        lock_trust_level: "Bloqueja el nivell de confiança"
+        unlock_trust_level: "Desbloqueja el nivell de confiança"
+        tl3_requirements:
+          title: "Requisits per al nivell de confiança 3"
+          table_title:
+            one: "durant el darrer dia:"
+            other: "durant els darrers %{count} dies:"
+          value_heading: "Valor"
+          requirement_heading: "Requisit"
+          visits: "Visites"
+          days: "dies"
+          topics_replied_to: "Temes resposts a"
+          topics_viewed: "Temes vistos"
+          topics_viewed_all_time: "Temes vists (sempre)"
+          posts_read: "Publicacions llegides"
+          posts_read_all_time: "Publicacions llegides (sempre)"
+          flagged_posts: "Publicacions amb bandera"
+          flagged_by_users: "Persones que han abanderat"
+          likes_given: "M'agrades donats"
+          likes_received: "M'agrades rebuts"
+          likes_received_days: "M'agrades rebuts: dies únics"
+          likes_received_users: "M'agrada rebuts: persones úniques"
+          qualifies: "Qualificacions per al nivell de confiança 3"
+          does_not_qualify: "No qualifica per al nivell de confiança 3"
+          will_be_promoted: "Es promourà aviat."
+          will_be_demoted: "Es degradarà aviat."
+          on_grace_period: "Hores d'ara en període de promoció, no es degradarà."
+          locked_will_not_be_promoted: "Nivell de confiança bloquejat. Mai no es promourà"
+          locked_will_not_be_demoted: "Nivell de confiança bloquejat. Mai no es degradarà."
+        sso:
+          title: "Inscripció simple"
+          external_id: "ID externa"
+          external_username: "Nom de persona usuària"
+          external_name: "Nom"
+          external_email: "Correu electrònic"
+          external_avatar_url: "URL de la imatge de perfil"
+      user_fields:
+        title: "Camps de persona usuària"
+        help: "Afegeix camps que les teves persones puguin emplenar."
+        create: "Crea un camp de persona usuària"
+        untitled: "Sense títol"
+        name: "Nom del camp"
+        type: "Tipus de camp"
+        description: "Descripció del camp"
+        save: "Desa"
+        edit: "Edita"
+        delete: "Esborra"
+        cancel: "Cancel·la"
+        delete_confirm: "Segur que vols esborrar aquest camp de persona usuària?"
+        options: "Opcions"
+        required:
+          title: "Necessari en identificar-se?"
+          enabled: "necessari"
+          disabled: "no necessari"
+        editable:
+          title: "Editable després d'identificar-se?"
+          enabled: "editable"
+          disabled: "no editable"
+        show_on_profile:
+          title: "Mostra al perfil públic?"
+          enabled: "mostrat al perfil"
+          disabled: "no mostrat al perfil"
+        show_on_user_card:
+          title: "Mostra a la targeta de la persona?"
+          enabled: "mostrat a la targeta de la persona"
+          disabled: "no mostrat a la targeta de la persona"
+        field_types:
+          text: 'Camp de text'
+          confirm: 'Confirmació'
+          dropdown: "Desplega"
+      site_text:
+        description: "Pots personalitzar qualsevol text al teu fòrum. Si us plau comença cercant tot seguit:"
+        search: "Cerca el text que t'agradaria editar"
+        title: 'Contingut del text'
+        edit: 'edita'
+        revert: "Reverteix els canvis"
+        revert_confirm: "Segur que vols revertir els canvis?"
+        go_back: "Torna a la cerca"
+        recommended: "Recomanem personalitzar el següent text segons les teves necessitats:"
+        show_overriden: 'Només mostra anul·lat'
+      site_settings:
+        show_overriden: 'Només mostra anul·lat'
+        title: 'Configuració'
+        reset: 'restableix'
+        none: 'cap'
+        no_results: "Sense resultats"
+        clear_filter: "Neteja"
+        add_url: "afegeix URL"
+        add_host: "afegeix amfitrió"
+        categories:
+          all_results: 'Tot'
+          required: 'Necessari'
+          basic: 'Configuració bàsica'
+          users: 'Persones usuàries'
+          posting: 'Publicant'
+          email: 'Correu electrònic'
+          files: 'Fitxers'
+          trust: 'Nivells de confiança'
+          security: 'Seguretat'
+          onebox: "Caixa"
+          seo: 'SEO'
+          spam: 'Brossa'
+          rate_limits: 'Límits de ritme'
+          developer: 'Desenvolupador'
+          embedding: "Incrustant"
+          legal: "Legal"
+          user_api: 'API de persona usuària'
+          uncategorized: 'Altres'
+          backups: "Còpies de seguretat"
+          login: "Iniciar sessió"
+          plugins: "Complements"
+          user_preferences: "Preferències personals"
+          tags: "Etiquetes"
+          search: "Cerca"
+          groups: "Grups"
+      badges:
+        title: Distintius
+        new_badge: Nou distintiu
+        new: Nou
+        name: Nom
+        badge: Distintiu
+        display_name: Mostra el nom
+        description: Descripció
+        long_description: Descripció llarga
+        badge_type: Tipus de distintiu
+        badge_grouping: Grups
+        badge_groupings:
+          modal_title: Agrupacions de distintius
+        granted_by: Concedit per
+        granted_at: Concedit a
+        reason_help: (Un enllaç a una publicació o un tema)
+        save: Desa
+        delete: Esborra
+        delete_confirm: Segur que vols esborrar aquest distintiu?
+        revoke: Revoca
+        reason: Motiu
+        expand: 'Expandeix &hellip; '
+        revoke_confirm: Segur que vols revocar aquest distintiu?
+        edit_badges: Edita distintius
+        grant_badge: Atorga distintiu
+        granted_badges: Distintius concedits
+        grant: Atorga
+        no_user_badges: "%{name} no ha atorgat cap distintiu"
+        no_badges: No hi ha distintius que puguin atorgar-se.
+        none_selected: "Tria un distintiu per començar"
+        allow_title: Permet que es faci servir el distintiu com a títol
+        multiple_grant: Pot atorgar-se molts cops
+        listable: Mostra distintiu a la pàgina pública de distintius
+        enabled: Activa distintiu
+        icon: Icona
+        image: Imatge
+        icon_help: "Fes servir la classe Font Awesome o una URL a una imatge"
+        query: Consulta distintius (SQL)
+        target_posts: La consulta apunta les publicacions
+        auto_revoke: Executa la consulta diària de revocacions
+        show_posts: Mostra el distintiu atorgat a la publicació a la pàgina de distintius
+        trigger: Desencadenar
+        trigger_type:
+          none: "Actualitza cada dia"
+          post_action: "Quan una persona actua a una publicació"
+          post_revision: "Quan una persona edita o crea una publicació"
+          trust_level_change: "Quan una persona canvia el nivell de confiança"
+          user_change: "Quan una persona és editada o creada"
+          post_processed: "Després de processar una publicació "
+        preview:
+          link_text: "Previsualitza distintius concedits"
+          plan_text: "Previsualitza amb esquema de consulta"
+          modal_title: "Previsualitzar la consulta de distintius"
+          sql_error_header: "Hi ha hagut un error amb la consulta"
+          error_help: "Mira els següents enllaços per ajuda amb les consultes de distintius"
+          bad_count_warning:
+            header: "ATENCIÓ!"
+            text: "Hi ha mostres perdudes de concessions. Això passa quan la consulta de distintius retorna ID de persona usuària o de publicacions que no existeixen. Després això pot provocar resultats inesperats - si us plau, torna a revisar la teva consulta."
+          no_grant_count: "No hi ha distintius per assignar."
+          grant_count:
+            one: "<b>1</b> distintiu per assignar."
+            other: "<b>%{count}</b> distintius per assignar."
+          sample: "Exemple:"
+          grant:
+            with: <span class="username">%{username}</span>
+            with_post: <span class="username">%{username}</span> per a publicació dins %{link}
+            with_post_time: <span class="username">%{username}</span> per a publicació dins %{link} a <span class="time">%{time}</span>
+            with_time: <span class="username">%{username}</span> a <span class="time">%{time}</span>
+      emoji:
+        title: "Emoji"
+        help: "Afegeix un nou emoji que serà disponible per a tothom. (GRAN CONSELL: arrossega i deixa anar molts fitxers d'un sol cop)"
+        add: "Afegeix emoji nou"
+        name: "Nom"
+        image: "Imatge"
+        delete_confirm: "Segur que vols esborrar l'emoji :%{name}:?"
+      embedding:
+        get_started: "Si vols incrustar Discourse a un altre web, comença per afegir-hi el seu amfitrió."
+        confirm_delete: "Segur que vols esborrar aquest amfitrió?"
+        sample: "Fes servir el següent codi HTML al teu lloc per crear i incrustar temes de Discourse. Reemplaça <b>REEMPLAÇA'M</b> amb la URL canònica de la pàgina a la qual ho estàs incrustant."
+        title: "Incrustant"
+        host: "Amfitrions permesos"
+        path_whitelist: "Llista blanca de camins"
+        edit: "edita"
+        category: "Publicar a categoria"
+        add_host: "Afegeix amfitrió"
+        settings: "Configuració d'incrustacions"
+        feed_settings: "Configuració de sindicació"
+        feed_description: "Si proporciones una sindicació RSS/ATOM al teu lloc milloraràs la capacitat de Discourse per importar els teus continguts."
+        crawling_settings: "Configuració d'aranya"
+        crawling_description: "Quan el Discourse crea temes per a les teves publicacions, si no hi ha sindicació RSS/ATOM es provarà d'analitzar els teus continguts a banda del teu HTML. A vegades, això pot comportar l'extracció dels teus continguts i per això t'oferim la possibilitat d'especificar les regles de CSS per tal de fer més fàcil l'extracció."
+        embed_by_username: "Nom de persona usuària per crear un tema"
+        embed_post_limit: "Quantitat màxima de publicacions per incrustar"
+        embed_username_key_from_feed: "Clau per treure el nom de persona usuària de la sindicació"
+        embed_title_scrubber: "Expressió regular emprada per depurar el títol de les publicacions"
+        embed_truncate: "Separa les publicacions incrustades"
+        embed_whitelist_selector: "Selector de CSS per a elements permesos a les incrustacions"
+        embed_blacklist_selector: "Selector de CSS per a elements que han estat eliminats de les incrustacions"
+        embed_classname_whitelist: "Noms permesos de classes de CSS"
+        feed_polling_enabled: "Importa publicacions amb RSS/ATOM"
+        feed_polling_url: "URL de la sindicació RSS/ATOM per rastrejar"
+        save: "Desa la configuració d'incrustacions"
+      permalink:
+        title: "Enllaços permanents"
+        url: "URL"
+        topic_id: "ID de tema"
+        topic_title: "Tema"
+        post_id: "ID de publicació"
+        post_title: "Publicació"
+        category_id: "ID de categoria"
+        category_title: "Categoria"
+        external_url: "URL externa"
+        delete_confirm: Segur que vols esborrar aquest enllaç permanent?
+        form:
+          label: "Nou:"
+          add: "Afegegix"
+          filter: "Cerca (URL o URL externa)"
+  wizard_js:
+    wizard:
+      done: "Fet"
+      back: "Enrere"
+      next: "Següent"
+      step: "%{current} de %{total}"
+      upload: "Carrega"
+      uploading: "Actualitzant..."
+      quit: "Potser més tard"
+      invites:
+        add_user: "afegegix"
+        none_added: "No hi has convidat cap equip. Segur que vols continuar?"
+        roles:
+          admin: "Admin"
+          moderator: "Moderació"
+          regular: "Persona usuària ordinària"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index c4e4a7ee82..2681c52dfc 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -153,25 +153,30 @@ cs:
       visible:
         enabled: 'uvedeno %{when}'
         disabled: 'neuvedeno %{when}'
+      banner:
+        enabled: 'vytvořil(a) tento banner %{when}. Bude se zobrazovat nahoře na každé stránce, dokud nebude uživatelem odmítnut.'
     topic_admin_menu: "akce administrátora tématu"
     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 +356,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,29 +371,36 @@ 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."
-      title:
-        one: "skupina"
-        few: "skupiny"
-        other: "skupiny"
       activity: "Aktivita"
       members: "Členové"
       topics: "Témata"
       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"
         only_admins: "Pouze správci"
         mods_and_admins: "Pouze moderátoři a správci"
@@ -477,7 +491,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"
@@ -499,6 +516,7 @@ cs:
         disable: "Vypnout upozornění"
         enable: "Povolit upozornění"
         each_browser_note: "Poznámka: Musíš změnit tuto volbu v každém prohlížeči, který používáš."
+      dismiss: 'Odbýt'
       dismiss_notifications: "Odbýt vše"
       dismiss_notifications_tooltip: "Označit všechny nepřečtené notifikace jako přečtené"
       first_notification: "Vaše první notifikace! Klikněte zde a začněte."
@@ -511,7 +529,6 @@ cs:
       admin: "{{user}} je administrátor"
       moderator_tooltip: "Tento uživatel je moderátor"
       admin_tooltip: "Tento uživatel je admi"
-      blocked_tooltip: "Tento uživatel je zablokován."
       suspended_notice: "Uživatel je suspendován do {{date}}."
       suspended_reason: "Důvod: "
       github_profile: "Github"
@@ -575,12 +592,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 +616,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 +658,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 +752,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 +774,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"
@@ -755,14 +787,6 @@ cs:
           one: "příspěvek vytvořen"
           few: "příspěvky vytvořeny"
           other: "příspěvků vytvořeno"
-        likes_given:
-          one: "<i class='fa fa-heart'></i> dán"
-          few: "<i class='fa fa-heart'></i> dány"
-          other: "<i class='fa fa-heart'></i> dáno"
-        likes_received:
-          one: "<i class='fa fa-heart'></i> obdržen"
-          few: "<i class='fa fa-heart'></i> obdrženy"
-          other: "<i class='fa fa-heart'></i> obdrženo"
         days_visited:
           one: "den navštíven"
           few: "dny navštíveno"
@@ -855,7 +879,6 @@ cs:
     first_post: První příspěvek
     mute: Ignorovat
     unmute: Zrušit ignorování
-    last_post: Poslední příspěvek
     last_reply_lowercase: poslední odpověď
     replies_lowercase:
       one: odpověď
@@ -905,6 +928,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 +949,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 +977,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 +1007,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é"
@@ -1037,12 +1072,7 @@ cs:
       olist_title: "Číslovaný seznam"
       ulist_title: "Odrážkový seznam"
       list_item: "Položka seznam"
-      heading_label: "H"
-      heading_title: "Nadpis"
-      heading_text: "Nadpis"
-      hr_title: "Horizontální oddělovač"
       help: "Nápověda pro Markdown"
-      toggler: "zobrazit nebo skrýt editor příspěvku"
       modal_ok: "OK"
       modal_cancel: "Zrušit"
       cant_send_pm: "Bohužel, nemůžete poslat zprávu uživateli %{username}."
@@ -1056,30 +1086,6 @@ cs:
       empty: "Žádné upozornění nenalezeny."
       more: "zobrazit starší oznámení"
       total_flagged: "celkem nahlášeno příspěvků"
-      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:
-        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} a 1 dalšího</span> {{description}}</p>"
-        few: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} a {{count}} další</span> {{description}}</p>"
-        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} a {{count}} dalších</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řijal vaši pozvánku</p>"
-      moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> přesunul {{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>Získáno '{{description}}'</p>"
-      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Nové téma</span> {{description}}</p>"
-      group_message_summary:
-        one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} zpráva ve tvé {{group_name}} schránce</p>"
-        few: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} zprávy ve tvé {{group_name}} schránce</p>"
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} zpráv ve tvé {{group_name}} schránce</p>"
       alt:
         mentioned: "Zmíněno"
         quoted: "Citováno"
@@ -1121,15 +1127,12 @@ 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"
       clear_all: "Vymazat vše"
       too_short: "Hledaný výraz je příliš krátký."
-      result_count:
-        one: "1 výsledek pro <span class='term'>\"{{term}}\"</span>"
-        few: "{{count}} výsledků pro <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} výsledků pro <span class='term'>\"{{term}}\"</span>"
       title: "vyhledávat témata, příspěvky, uživatele nebo kategorie"
       no_results: "Nenalezeny žádné výsledky."
       no_more_results: "Nenalezeny žádné další výsledky."
@@ -1144,26 +1147,18 @@ cs:
         title: Pokročilé hledání
         posted_by:
           label: Zaslal
-        in_category:
-          label: V kategorii
         in_group:
           label: Ve skupině
         with_badge:
           label: S odznakem
-        with_tags:
-          label: Se štítky
         filters:
-          label: Zobraz jen témata/příspěvky, které...
           likes: líbí se mi
           posted: Přidal jsem příspěvek
           watching: Sleduji
           tracking: Sleduji.
-          private: jsou v mých zprávách
-          bookmarks: Mám v záložkách
           first: jsou první příspěvek v tématu
           pinned: jsou připnuty
           unpinned: nejsou připnuty
-          seen: jsem četl
           unseen: jsem nečetl
           wiki: jsou wiki
         statuses:
@@ -1201,8 +1196,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 +1318,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ů
@@ -1501,7 +1499,6 @@ cs:
       multi_select:
         select: 'vybrat'
         selected: 'vybráno ({{count}})'
-        select_replies: 'vybrat +odpovědi'
         delete: smazat označené
         cancel: zrušit označování
         select_all: vybrat vše
@@ -1513,9 +1510,10 @@ cs:
     post:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
-      edit: "Editujete {{link}} {{replyAvatar}} {{username}}"
+      quote_reply: "Cituj"
       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 +1564,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,19 +1575,13 @@ 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"
         undelete: "obnovit příspěvek"
         share: "sdílet odkaz na tento příspěvek"
         more: "Více"
-        delete_replies:
-          confirm:
-            one: "Do you also want to delete the direct reply to this post?"
-            few: "Do you also want to delete the {{count}} direct replies to this post?"
-            other: "Do you also want to delete the {{count}} direct replies to this post?"
-          yes_value: "Ano, smazat i odpovědi"
-          no_value: "Ne, jenom tento příspěvek"
         admin: "post admin actions"
         wiki: "Vytvořte Wiki"
         unwiki: "Odtraňte Wiki"
@@ -1598,10 +1592,6 @@ cs:
         change_owner: "Změna autora"
       actions:
         flag: 'Nahlásit'
-        defer_flags:
-          one: "Odložit nahlášení"
-          few: "Odložit nahlášení"
-          other: "Odložit nahlášení"
         undo:
           off_topic: "Zrušit nahlášení"
           spam: "Zrušit nahlášení"
@@ -1693,16 +1683,11 @@ cs:
             one: "1 člověk hlasoval pro tento příspěvek"
             few: "{{count}} lidé hlasovali pro tento příspěvek"
             other: "{{count}} lidí hlasovalo pro tento příspěvek"
-      delete:
-        confirm:
-          one: "Opravdu chcete odstranit tento příspěvek?"
-          few: "Opravdu chcete odstranit všechny tyto příspěvky?"
-          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 +1697,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 +1729,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 +1800,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'
@@ -2028,8 +2025,9 @@ cs:
         hamburger_menu: '<b>=</b> Otevře hamburgerové menu'
         user_profile_menu: '<b>p</b> Otevře uživatelské menu'
         show_incoming_updated_topics: '<b>.</b> Ukáže aktualizovaná témata'
-        search: '<b>/</b> Hledání'
         help: '<b>?</b> Otevře seznam klávesových zkratek'
+        dismiss_new_posts: '<b>x</b>, <b>r</b> Odbýt nové/příspěvky'
+        dismiss_topics: '<b>x</b>, <b>t</b> Odbýt témata'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Odhlásit se'
       actions:
         title: 'Akce'
@@ -2094,9 +2092,7 @@ cs:
       selector_no_tags: "bez štítků"
       changed: "změněné štítky:"
       tags: "Štítky"
-      choose_for_topic: "zvolte volitelné štítky pro toto téma"
       delete_tag: "Smaž štítek"
-      delete_confirm: "Opravdu chcete smazat tento štítek?"
       rename_tag: "Přejmenovat štítek"
       rename_instructions: "Vyber název nového štítku:"
       sort_by: "Seřadit dle:"
@@ -2186,7 +2182,6 @@ cs:
         no_problems: "Nenalezeny žádné problémy."
         moderators: 'Moderátoři:'
         admins: 'Administrátoři:'
-        blocked: 'Blokováno:'
         suspended: 'Zakázáno:'
         private_messages_short: "Zpráv"
         private_messages_title: "Zprávy"
@@ -2217,24 +2212,12 @@ cs:
         by: "od"
       flags:
         title: "Nahlášení"
-        old: "Stará"
-        active: "Aktivní"
         agree: "Schválit"
         agree_title: "Potvrdit toto hlášení jako právoplatné a korektní"
-        agree_flag_modal_title: "Schvaluji a..."
-        agree_flag_hide_post: "Schvaluji (skrýt příspěvek + poslat soukromou zprávu)"
-        agree_flag_hide_post_title: "Skrýt tento příspěvek a automaticky odeslat zprávu, která uživatele žádá o editaci"
-        agree_flag_restore_post: "Schvaluji (obnovit příspěvek)"
-        agree_flag_restore_post_title: "Obnovit tento příspěvek"
-        agree_flag: "Souhlasit s hlášením"
-        agree_flag_title: "Schválit hlášení a nechat příspěvek nezměněný"
-        defer_flag: "Odložit"
         defer_flag_title: "Odstranit nahlášení; teď nevyžaduje žádné opatření."
         delete: "Smazat"
         delete_title: "Smazat příspěvek, na který toto hlášení odkazuje."
-        delete_post_defer_flag: "Smazat příspěvek a odložit nahlášení"
         delete_post_defer_flag_title: "Smazat příspěvek; pokud je to první příspěvek, tak smazat téma"
-        delete_post_agree_flag: "Smazat příspěvek a Schválit hlášení"
         delete_post_agree_flag_title: "Smazat příspěvek; pokud je to první příspěvek, tak smazat téma"
         delete_flag_modal_title: "Smazat a..."
         delete_spammer: "Odstranit spamera"
@@ -2249,39 +2232,16 @@ cs:
         dispositions:
           agreed: "schváleno"
           disagreed: "neschváleno"
-          deferred: "odloženo"
         flagged_by: "Nahlásil"
         resolved_by: "Vyřešeno"
         took_action: "Zakročit"
         system: "Systémové soukromé zprávy"
         error: "Něco se pokazilo"
         reply_message: "Odpovědět"
-        no_results: "Nejsou zde žádná nahlášení."
         topic_flagged: "Tohle <strong>téma</strong> bylo označeno."
         visit_topic: "Zobrazit téma pro přijmutí opatření."
         was_edited: "Příspěvek byl upraven po prvním nahlášení"
         previous_flags_count: "Tento příspěvek byl již nahlášen {{count}} krát."
-        summary:
-          action_type_3:
-            one: "off-topic"
-            few: "off-topic x{{count}}"
-            other: "off-topic x{{count}}"
-          action_type_4:
-            one: "nevhodné"
-            few: "nevhodné x{{count}}"
-            other: "nevhodné x{{count}}"
-          action_type_6:
-            one: "spam"
-            few: "spam x{{count}}"
-            other: "spam x{{count}}"
-          action_type_7:
-            one: "vlastní"
-            few: "vlastní x{{count}}"
-            other: "vlastní x{{count}}"
-          action_type_8:
-            one: "spam"
-            few: "spam x{{count}}"
-            other: "spam x{{count}}"
       groups:
         primary: "Hlavní skupina"
         no_primary: "(žádná hlavní skupina)"
@@ -2335,6 +2295,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 +2407,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 +2418,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 +2487,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 +2541,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"
@@ -2601,15 +2576,18 @@ cs:
             change_category_settings: "změnit nastavení kategorie"
             delete_category: "smazat kategorii"
             create_category: "vytvořit kategorii"
-            block_user: "zablokuj uživatele"
-            unblock_user: "odblokuj uživatele"
             grant_admin: "udělit administrátorská práva"
             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."
@@ -2654,7 +2632,6 @@ cs:
           pending: "Čeká na schválení"
           staff: 'Redakce'
           suspended: 'Zakázaní'
-          blocked: 'Blokovaní'
           suspect: 'Podezřelí'
         approved: "Schválen?"
         approved_selected:
@@ -2677,7 +2654,6 @@ cs:
           staff: "Redakce"
           admins: 'Administrátoři'
           moderators: 'Moderátoři'
-          blocked: 'Blokovaní uživatelé'
           suspended: 'Zakázaní uživatelé'
           suspect: 'Podezřelí uživatelé'
         reject_successful:
@@ -2696,18 +2672,14 @@ cs:
         suspend_failed: "Nastala chyba při zakazování uživatele {{error}}"
         unsuspend_failed: "Nastala chyba při povolování uživatele {{error}}"
         suspend_duration: "Jak dlouho má zákaz platit? (dny)"
-        suspend_duration_units: "(days)"
         suspend_reason_label: "Why are you suspending? This text <b>will be visible to everyone</b> on this user's profile page, and will be shown to the user when they try to log in. Keep it short."
         suspend_reason: "Reason"
         suspended_by: "Suspended by"
         delete_all_posts: "Smazat všechny příspěvky"
         delete_all_posts_confirm_MF: "Chystáte se smazat {POSTS, plural, one {1 příspěvek} other {# příspěvků}} and {TOPICS, plural, one {1 téma} other {# témat}}. Jste si jistí?"
-        suspend: "Zakázat"
-        unsuspend: "Povolit"
-        suspended: "Zakázán?"
         moderator: "Moderátor?"
         admin: "Administrátor?"
-        blocked: "Zablokovaný?"
+        suspended: "Zakázán?"
         show_admin_profile: "Administrace"
         refresh_browsers: "Vynutit obnovení prohlížeče"
         refresh_browsers_message: "Zpráva odeslána všem klientům!"
@@ -2720,8 +2692,8 @@ cs:
         grant_admin: 'Udělit administrátorská práva'
         revoke_moderation: 'Odebrat moderátorská práva'
         grant_moderation: 'Udělit moderátorská práva'
-        unblock: 'Odblokovat'
-        block: 'Zablokovat'
+        unsuspend: 'Povolit'
+        suspend: 'Zakázat'
         reputation: Reputace
         permissions: Oprávnění
         activity: Aktivita
@@ -2771,17 +2743,12 @@ cs:
         activate_failed: "Nasstal problém při aktivování tohoto uživatele."
         deactivate_account: "Deaktivovat účet"
         deactivate_failed: "Nastal problém při deaktivování tohoto uživatele."
-        unblock_failed: 'Nastal problém při odblokování uživatele.'
-        block_failed: 'Nastal problém při blokování uživatele.'
-        block_confirm: 'Jste si jistí, že chcete zablokovat tohoto uživatele? Nebudou poté oprávněni vytvářet žádné témata ani příspěvky.'
-        block_accept: 'Ano, zablokuj tohoto uživatele:'
         bounce_score: "Bounce skóre"
         reset_bounce_score:
           label: "obnovit výchozí"
           title: "Resetovat bounce skóre zpět na 0"
         deactivate_explanation: "Uživatel bude muset znovu potvrdit emailovou adresu."
         suspended_explanation: "Zakázaný uživatel se nemůže přihlásit."
-        block_explanation: "Zablokovaný uživatel nemůže přispívat nebo vytvářet nová témata."
         trust_level_change_failed: "Nastal problém při změně důveryhodnosti uživatele."
         suspend_modal_title: "Suspend User"
         trust_level_2_users: "Uživatelé důvěryhodnosti 2"
@@ -2902,6 +2869,7 @@ cs:
           user_preferences: "Uživatelká nastavení"
           tags: "Tagy"
           search: "Vyhledávání"
+          groups: "Skupiny"
       badges:
         title: Odznaky
         new_badge: Nový odznak
@@ -3015,10 +2983,6 @@ cs:
       upload: "Nahrát"
       uploading: "Nahrává se..."
       quit: "Možná později"
-      staff_count:
-        one: "Vaše komunita má 1 redakčního člena."
-        few: "Vaše komunita má %{count} redakční členy."
-        other: "Vaše komunita má %{count} členů v redakci."
       invites:
         add_user: "přidat"
         none_added: "Nepozvali jste nikoho z redakce. Určitě chcete pokračovat?"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 540f1c0679..a2e70cf9a9 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -30,7 +30,7 @@ da:
       timeline_date: "MMM YYYY"
       long_no_year: "MMM D h:mm a"
       long_no_year_no_time: "MMM D"
-      full_no_year_no_time: "MMMM Do"
+      full_no_year_no_time: "D. MMMM"
       long_with_year: "MMM D, YYYY h:mm a"
       long_with_year_no_time: "MMM D, YYYY"
       full_with_year_no_time: "MMMM Do, YYYY"
@@ -101,7 +101,6 @@ da:
           other: "%{count} år senere"
       previous_month: 'Forrige måned'
       next_month: 'Næste måned'
-      placeholder: Vælg en dato
     share:
       topic: 'del et link til dette emne'
       post: 'indlæg #%{postNumber}'
@@ -113,17 +112,17 @@ da:
     action_codes:
       public_topic: "offentliggjorde dette emne %{when}"
       private_topic: "gjorde dette emne privat %{when}"
-      split_topic: "delte dette emne op %{when}"
+      split_topic: "del dette emne op %{when}"
       invited_user: "Inviterede %{who} %{when}"
       invited_group: "inviterede %{who} %{when}"
       removed_user: "fjernede %{who} %{when}"
       removed_group: "fjernede %{who} %{when}"
       autoclosed:
         enabled: 'lukket %{when}'
-        disabled: 'åbnet %{when}'
+        disabled: 'åbnede %{when}'
       closed:
         enabled: 'lukket %{when}'
-        disabled: 'åbnet %{when}'
+        disabled: 'åbnede %{when}'
       archived:
         enabled: 'arkiveret %{when}'
         disabled: 'dearkiveret %{when}'
@@ -148,20 +147,21 @@ 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_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: 'redigér titel og kategori for dette emne'
     not_implemented: "Beklager, denne feature er ikke blevet implementeret endnu."
     no_value: "Nej"
@@ -255,7 +255,7 @@ da:
     saved: "Gemt!"
     upload: "Upload"
     uploading: "Uploader…"
-    uploading_filename: "Uploader {{filename}}..."
+    uploading_filename: "Overfører {{filename}}..."
     uploaded: "Uploadet!"
     enable: "Aktiver"
     disable: "Deaktiver"
@@ -351,11 +351,9 @@ 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)"
+      name_placeholder: "Gruppenavn uden mellemrum, samme som reglen for brugernavn"
+      public_admission: "Tillad brugere frit at tilmelde sig gruppen (Kræver at det er en offentlig synlig gruppe)"
+      public_exit: "Tillad brugere frit at forlade gruppen"
       empty:
         posts: "Der er ingen indlæg skrevet af medlemmer i denne gruppe."
         members: "Der er ingen medlemmer i denne gruppe."
@@ -367,23 +365,25 @@ da:
       join: "Bliv medlem af gruppen"
       leave: "Forlad gruppen"
       request: "Anmod om indmeldelse i gruppen"
+      message: "Besked"
       automatic_group: Automatisk gruppe
       closed_group: Lukket gruppe
       is_group_user: "Du er medlem af denne gruppe"
       allow_membership_requests: "Tillad at brugere sender medlemsanmodninger til gruppeejere"
+      membership_request_template: "Brugerdefineret skabelon, der skal vises til brugere, når der sendes en medlemskabsanmodning"
+      membership_request:
+        submit: "Send forespørgsel"
+        title: "Anmod om medlemskab af gruppen @%{group_name}"
+        reason: "Fortæl gruppeejerne, hvorfor du tilhører denne gruppe"
       membership: "Medlemskab"
       name: "Navn"
       user_count: "Antal medlemmer"
       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"
-      title:
-        one: "gruppe"
-        other: "grupper"
       activity: "Aktivitet"
       members: "Medlemmer"
       topics: "Emner"
@@ -391,8 +391,15 @@ da:
       mentions: "Omtaler"
       messages: "Beskeder"
       notification_level: "Standard notifikationsniveau for gruppebeskeder"
+      visibility_levels:
+        title: "Hvem kan se denne gruppe?"
+        public: "Alle"
+        members: "Gruppeejer, medlemmer og admins"
+        staff: "Gruppeejer og hjælpeteam"
+        owners: "Gruppeejer og admins"
       alias_levels:
-        title: "Hvem kan sende beskeder til og @nævne denne gruppe?"
+        mentionable: "Hvem kan @gruppenavn denne gruppe?"
+        messageable: "Hvem kan sende en besked til denne gruppe?"
         nobody: "Ingen"
         only_admins: "Kun administratore"
         mods_and_admins: "Kun moderatore og administratore"
@@ -488,7 +495,7 @@ da:
       mute: "Mute"
       edit: "Redigér indstillinger"
       download_archive:
-        button_text: "Download Mine Indlæg"
+        button_text: "Hent alle"
         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."
@@ -513,11 +520,14 @@ da:
         disable: "Deaktiver notifikationer"
         enable: "Aktiver notifikationer"
         each_browser_note: "Bemærk: Du skal ændre indstillingen i alle dine browsere."
+      dismiss: 'Afvist'
       dismiss_notifications: "Afvis alle"
       dismiss_notifications_tooltip: "Marker alle ulæste notifikationer som læst"
       first_notification: "Din første notifikation! Vælg den for at begynde."
       disable_jump_reply: "Ikke hop til mit indlæg efter jeg svarer"
       dynamic_favicon: "Vis nyt / opdateret emnetal på browserikon"
+      theme_default_on_all_devices: "Gør dette til mit standard design på alle mine enheder"
+      allow_private_messages: "Tillad andre brugere at sende mig private beskeder"
       external_links_in_new_tab: "Åbn alle eksterne links i en ny fane"
       enable_quoting: "Tillad citering af markeret tekst"
       change: "skift"
@@ -525,8 +535,9 @@ da:
       admin: "{{user}} er admin"
       moderator_tooltip: "Denne bruger er moderator"
       admin_tooltip: "Denne bruger er administrator"
-      blocked_tooltip: "Brugeren er blokeret"
+      silenced_tooltip: "Denne bruger er gjort stum"
       suspended_notice: "Denne bruger er suspenderet indtil {{date}}."
+      suspended_permanently: "Denne bruger er udelukket."
       suspended_reason: "Begrundelse: "
       github_profile: "Github"
       email_activity_summary: "Resumé over aktivitet"
@@ -557,6 +568,7 @@ da:
       watched_first_post_tags_instructions: "Du får besked om første indlæg i hvert nyt emne med disse tags."
       muted_categories: "Ignoreret"
       muted_categories_instructions: "Du får ikke beskeder om nye emner i disse kategorier og de fremstår ikke i seneste."
+      no_category_access: "Som moderator har du begrænset kategori-adgang, at gemme er slået fra. "
       delete_account: "Slet min konto"
       delete_account_confirm: "Er du sikker på du vil slette din konto permanent? Dette kan ikke fortrydes!"
       deleted_yourself: "Din konto er nu slettet."
@@ -575,6 +587,7 @@ da:
       undo_revoke_access: "Revider tilbagekald adgang"
       api_approved: "Godkendt:"
       theme: "Tema"
+      home: "Standard hjemmeside"
       staff_counters:
         flags_given: "hjælpsomme markeringer"
         flagged_posts: "markerede indlæg"
@@ -616,7 +629,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"
@@ -752,6 +764,9 @@ da:
         expired: "Denne invitation er forældet"
         rescind: "Fjern"
         rescinded: "Invitation fjernet"
+        rescind_all: "Fjern alle inviterede"
+        rescinded_all: "Alle inviterede fjernet!"
+        rescind_all_confirm: "Er du sikker på du ønsker at fjerne alle inviterede?"
         reinvite: "Gensend invitation"
         reinvite_all: "Gensend alle invitationer"
         reinvited: "Invitation gensendt"
@@ -786,12 +801,6 @@ da:
         post_count:
           one: "Indlæg oprettet"
           other: "Indlæg oprettet"
-        likes_given:
-          one: "<i class='fa fa-heart'></i> givet"
-          other: "<i class='fa fa-heart'></i> givet"
-        likes_received:
-          one: "<i class='fa fa-heart'></i> modtaget"
-          other: "<i class='fa fa-heart'></i> modtaget"
         days_visited:
           one: "dag besøgt"
           other: "dage besøgt"
@@ -883,7 +892,6 @@ da:
     first_post: Første indlæg
     mute: Mute
     unmute: Unmute
-    last_post: Sidste indlæg
     last_reply_lowercase: seneste svar
     replies_lowercase:
       one: svar
@@ -991,7 +999,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:
@@ -1081,12 +1088,7 @@ da:
       olist_title: "Nummereret liste"
       ulist_title: "Punktopstilling"
       list_item: "Listepunkt"
-      heading_label: "T"
-      heading_title: "Overskrift"
-      heading_text: "Overskrift"
-      hr_title: "Vandret streg"
       help: "Hjælp til Markdown-redigering"
-      toggler: "skjul eller vis editor-panelet"
       modal_ok: "OK"
       modal_cancel: "Annuller"
       cant_send_pm: "Beklager, du kan ikke sende en besked til %{username}."
@@ -1100,28 +1102,6 @@ da:
       empty: "Ingen notifikationer fundet."
       more: "se ældre notifikationer"
       total_flagged: "total markerede indlæg"
-      mentioned: "<i title='nævnte' 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='citeret' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      replied: "<i title='svaret' 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='redigeret' 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:
-        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} og 1 mere</span> {{description}}</p>"
-        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} og {{count}} andre</span> {{description}}</p>"
-      private_message: "<i title='privat besked' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_private_message: "<i title='privat besked' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_topic: "<i title='inviteret til emne' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      invitee_accepted: "<i title='accepterede din invitation' class='fa fa-user'></i><p><span>{{username}}</span> accepted your invitation</p>"
-      moved_post: "<i title='indlæg flyttet' 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 givet' class='fa fa-certificate'></i><p>Du blev tildelt '{{description}}'</p>"
-      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Nyt Emne</span> {{description}}</p>"
-      group_message_summary:
-        one: "<i title='beskeder i din gruppes indbakke' class='fa fa-group'></i><p> {{count}} besked i din {{group_name}} inbox</p>"
-        other: "<i title='beskeder i gruppens indbakke' class='fa fa-group'></i><p> {{count}} beskeder i din {{group_name}} inbox</p>"
       alt:
         mentioned: "Nævnt af"
         quoted: "Citeret af"
@@ -1169,15 +1149,11 @@ da:
       select_all: "Vælg alle"
       clear_all: "Ryd alle"
       too_short: "Dit søgekriterie er for kort."
-      result_count:
-        one: "1 resultat for <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} resultater for <span class='term'>\"{{term}}\"</span>"
       title: "søg efter emner, indlæg, brugere eller kategorier"
       no_results: "Ingen resultater fundet."
       no_more_results: "Ikke flere resultater."
       searching: "Søger…"
       post_format: "#{{post_number}} af {{username}}"
-      results_page: "Søgeresultater"
       context:
         user: "Søg i indlæg fra @{{username}}"
         category: "Søg i #{{category}} kategorien"
@@ -1187,26 +1163,18 @@ da:
         title: Avanceret Søgning
         posted_by:
           label: Skrevet af
-        in_category:
-          label: I Kategorien
         in_group:
           label: I Gruppen
         with_badge:
           label: Med Badge
-        with_tags:
-          label: Med Tags
         filters:
-          label: Returnér kun emner/indlæg som...
           likes: Jeg syntes om
           posted: Jeg skrev i
           watching: Jeg overvåger
           tracking: Jeg følger
-          private: er i mine beskeder
-          bookmarks: Jeg har bogmærket
           first: er det allerførste indlæg
           pinned: er fastgjort
           unpinned: er ikke fastgjort
-          seen: Jeg har læst
           unseen: Jeg har ikke læst
           wiki: er wiki
         statuses:
@@ -1342,7 +1310,6 @@ da:
       jump_reply_down: hop til senere svar
       deleted: "Emnet er blevet slettet"
       topic_status_update:
-        title: "Angiv timerfunktion for emne"
         save: "Indstil timerfunktion"
         num_of_hours: "Antal timer:"
         remove: "Fjern timerfunktion"
@@ -1572,7 +1539,6 @@ da:
       multi_select:
         select: 'vælg'
         selected: 'valgt ({{count}})'
-        select_replies: 'vælg +svar'
         delete: slet valgte
         cancel: glem valg
         select_all: marker alle
@@ -1584,7 +1550,6 @@ da:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citér"
-      edit: "Redigerer {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Reason: "
       post_number: "indlæg {{number}}"
       wiki_last_edited_on: "wiki sidst redigeret den"
@@ -1651,12 +1616,6 @@ da:
         undelete: "annullér sletning"
         share: "del et link til dette indlæg"
         more: "Mere"
-        delete_replies:
-          confirm:
-            one: "Ønsker du også at slette svaret på dette indlæg?"
-            other: "Ønsker du også at slette de {{count}} svar på dette indlæg?"
-          yes_value: "Ja, slet også svarene"
-          no_value: "Nej, kun dette indlæg"
         admin: "indlæg administrator handlinger"
         wiki: "Opret Wiki"
         unwiki: "Fjern Wiki"
@@ -1667,9 +1626,6 @@ da:
         change_owner: "Skift ejerskab"
       actions:
         flag: 'Flag'
-        defer_flags:
-          one: "Udsæt markering"
-          other: "Udsæt markeringer"
         undo:
           off_topic: "Undo flag"
           spam: "Undo flag"
@@ -1745,14 +1701,6 @@ da:
           vote:
             one: "1 person stemte for dette indlæg"
             other: "{{count}} personer stemte for dette indlæg"
-      delete:
-        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 +1746,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"
@@ -2098,7 +2044,6 @@ da:
         hamburger_menu: '<b>=</b> Åben hamburger menu'
         user_profile_menu: '<b>p</b> Åben bruger menu'
         show_incoming_updated_topics: '<b>.</b> Vis opdaterede emner'
-        search: '<b>/</b> Søg'
         help: '<b>?</b> Åben tastaturhjælp'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Afvis Nyt/Indlæg'
         dismiss_topics: '<b>x</b>, <b>t</b> Afvis emner'
@@ -2167,9 +2112,7 @@ da:
       selector_no_tags: "ingen tags"
       changed: "tags skiftet:"
       tags: "Tags"
-      choose_for_topic: "vælg tags for dette emne (valgfrit)"
       delete_tag: "Slet tag"
-      delete_confirm: "Er du sikker på at du vil slette dette tag?"
       rename_tag: "Omdøb tag"
       rename_instructions: "Vælg et nyt navn for det tag:"
       sort_by: "Sortér efter:"
@@ -2264,7 +2207,6 @@ da:
         no_problems: "Ingen problemer fundet."
         moderators: 'Moderatorer:'
         admins: 'Admins:'
-        blocked: 'Blokeret:'
         suspended: 'Suspenderet:'
         private_messages_short: "Beskeder"
         private_messages_title: "Beskeder"
@@ -2297,24 +2239,12 @@ da:
         by: "af"
       flags:
         title: "Flag"
-        old: "Gamle"
-        active: "Aktive"
         agree: "Enig"
         agree_title: "Bekræft dette flag er gyldigt og korrekt"
-        agree_flag_modal_title: "Enig og..."
-        agree_flag_hide_post: "Enig (skjul indlæg + send PM)"
-        agree_flag_hide_post_title: "Gem dette indlæg og send automatisk brugeren en besked der opfordrer dem til at redigere det."
-        agree_flag_restore_post: "Enig (gendan indlæg)"
-        agree_flag_restore_post_title: "Gendan dette indlæg"
-        agree_flag: "sæt markeringen til \"enig\""
-        agree_flag_title: "Sæt flaget til \"enig\" og behold indlægget uændret"
-        defer_flag: "Udsæt"
         defer_flag_title: "Fjern dette flag; Det kræver ingen handling på nuværende tidspunkt."
         delete: "Slet"
         delete_title: "Slet det indlæg, som flaget refererer til."
-        delete_post_defer_flag: "Slet indlægget og udsæt flaget"
         delete_post_defer_flag_title: "Slet indlægget; hvis det er det første, så slet hele emnet"
-        delete_post_agree_flag: "Slet indlæg og sæt flaget til \"enig\""
         delete_post_agree_flag_title: "Slet indlæg; hvis det er det første indlæg, slet emnet"
         delete_flag_modal_title: "Slet og..."
         delete_spammer: "Slet spammer"
@@ -2329,34 +2259,16 @@ da:
         dispositions:
           agreed: "enig"
           disagreed: "uenig"
-          deferred: "udsat"
         flagged_by: "Flaget af"
         resolved_by: "Løst af"
         took_action: "Reagerede"
         system: "System"
         error: "Noget gik galt"
         reply_message: "Svar"
-        no_results: "Der er ingen flag."
         topic_flagged: "Dette <strong>emne</strong> er blevet rapporteret til administrator."
         visit_topic: "Besøg emnet for at gøre noget ved det"
         was_edited: "Indlægget blev redigeret efter det første gang blev flagget"
         previous_flags_count: "Dette indlæg er allerede blevet markeret {{count}} gange."
-        summary:
-          action_type_3:
-            one: "off-topic"
-            other: "off-topic x{{count}}"
-          action_type_4:
-            one: "upassende"
-            other: "upassende x{{count}}"
-          action_type_6:
-            one: "brugerdefineret"
-            other: "brugerdefinerede x{{count}}"
-          action_type_7:
-            one: "brugerdefineret"
-            other: "brugerdefinerede x{{count}}"
-          action_type_8:
-            one: "spam"
-            other: "spam x{{count}}"
       groups:
         primary: "Primær gruppe"
         no_primary: "(ingen primær gruppe)"
@@ -2443,7 +2355,6 @@ da:
           details: "Når der er et nyt svar, redigering, sletning eller gendannelse."
         user_event:
           name: "Bruger-event"
-          details: "Når en bruger oprettes, godkendes eller opdateres."
         delivery_status:
           title: "Leveringsstatus"
           inactive: "Inaktiv"
@@ -2611,9 +2522,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"
@@ -2796,8 +2704,6 @@ da:
             change_category_settings: "ret kategori-indstillinger"
             delete_category: "slet kategori"
             create_category: "opret kategori"
-            block_user: "bloker bruger"
-            unblock_user: "fjern blokering af bruger"
             grant_admin: "tildel admin"
             revoke_admin: "fjern admin"
             grant_moderation: "tildel moderation"
@@ -2864,7 +2770,6 @@ da:
           pending: "Afventer"
           staff: 'Personale'
           suspended: 'Suspenderet'
-          blocked: 'Blokeret'
           suspect: 'Mistænkt'
         approved: "Godkendt?"
         approved_selected:
@@ -2885,7 +2790,6 @@ da:
           staff: "Personale"
           admins: 'Admin-brugere'
           moderators: 'Moderatorer'
-          blocked: 'Blokerede brugere'
           suspended: 'Suspenderede brugere'
           suspect: 'Mistænkte brugere'
         reject_successful:
@@ -2902,18 +2806,14 @@ da:
         suspend_failed: "Noget gik galt ved suspenderingen af denne bruger {{error}}"
         unsuspend_failed: "Noget gik galt ved ophævningen af denne brugers suspendering {{error}}"
         suspend_duration: "Hvor lang tid skal brugeren være suspenderet?"
-        suspend_duration_units: "(dage)"
         suspend_reason_label: "Hvorfor suspenderer du? Denne tekst <b>er synlig for alle</b> på brugerens profilside, og vises til brugeren når de prøver at logge ind. Fat dig i korthed."
         suspend_reason: "Begrundelse"
         suspended_by: "Suspenderet af"
         delete_all_posts: "Slet alle indlæg"
         delete_all_posts_confirm_MF: "Du er ved at slette {POSTS, plural, one {1 post} other {# posts}} og {TOPICS, plural, one {1 topic} other {# topics}}. Er du sikker?"
-        suspend: "Suspendér"
-        unsuspend: "Ophæv suspendering"
-        suspended: "Suspenderet?"
         moderator: "Moderator?"
         admin: "Admin?"
-        blocked: "Blokeret?"
+        suspended: "Suspenderet?"
         staged: "Midlertidig?"
         show_admin_profile: "Admin"
         refresh_browsers: "Gennemtving browser refresh"
@@ -2929,8 +2829,8 @@ da:
         grant_admin_confirm: "Vi har sendt dig en e-mail for at bekræfte den ny administrator. Åbn den venligst og følg instrukserne."
         revoke_moderation: 'Fratag moderation'
         grant_moderation: 'Tildel moderation'
-        unblock: 'Ophæv blokering'
-        block: 'Blokér'
+        unsuspend: 'Ophæv suspendering'
+        suspend: 'Suspendér'
         reputation: Omdømme
         permissions: Tilladelser
         activity: Aktivitet
@@ -2977,17 +2877,12 @@ da:
         activate_failed: "Der opstod et problem ved aktivering af brugeren."
         deactivate_account: "Deaktivér konto"
         deactivate_failed: "Der opstod et problem ved deaktivering af brugeren."
-        unblock_failed: 'Der opstod et problem ved ophævelsen af brugerens blokering.'
-        block_failed: 'Der opstod et problem ved blokering af brugeren.'
-        block_confirm: 'Er du sikker på, at du vil blokere brugeren? Bruger kan ikke længere oprette emner eller indlæg.'
-        block_accept: 'Ja, bloker brugeren'
         bounce_score: "Bounce Score"
         reset_bounce_score:
           label: "Nulstil"
           title: "Nulstil \"bounce score\" til 0"
         deactivate_explanation: "En deaktiveret bruger skal genvalidere deres e-mail."
         suspended_explanation: "En suspenderet bruger kan ikke logge ind."
-        block_explanation: "En blokeret bruger kan ikke oprette indlæg eller starte emner."
         staged_explanation: "En midlertidig bruger kan kun svare via email i bestemte emner."
         bounce_score_explanation:
           none: "Ingen \"bounces\" er for nyligt modtaget fra denne email."
@@ -3239,9 +3134,6 @@ da:
       upload: "Upload"
       uploading: "Uploader..."
       quit: "Måske senere"
-      staff_count:
-        one: "Dit fællesskab har 1 hjælper"
-        other: "Dit fællesskab har %{count} hjælpere."
       invites:
         add_user: "tilføj"
         none_added: "Du har ikke inviteret nogen til hjælperteamet. Er du sikker på, at du vil fortsætte?"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 89fb7c995d..34969a65be 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -48,6 +48,9 @@ de:
         x_seconds:
           one: "1s"
           other: "%{count}s"
+        less_than_x_minutes:
+          one: "< 1 Min."
+          other: "< %{count} Min."
         x_minutes:
           one: "1min"
           other: "%{count}min"
@@ -57,6 +60,9 @@ de:
         x_days:
           one: "1d"
           other: "%{count}d"
+        x_months:
+          one: "1 Monat"
+          other: "%{count}Monate"
         about_x_years:
           one: "1a"
           other: "%{count}a"
@@ -101,7 +107,7 @@ de:
           other: "%{count} Jahre später"
       previous_month: 'Vormonat'
       next_month: 'Nächster Monat'
-      placeholder: Datum auswählen
+      placeholder: Datum
     share:
       topic: 'Teile einen Link zu diesem Thema'
       post: 'Beitrag #%{postNumber}'
@@ -116,6 +122,7 @@ de:
       split_topic: "Thema aufgeteilt, %{when}"
       invited_user: "%{who} eingeladen, %{when}"
       invited_group: "%{who} eingeladen, %{when}"
+      user_left: "%{who} hat sich selbst von dieser Nachricht entfernt %{when}"
       removed_user: "%{who} entfernt, %{when}"
       removed_group: "%{who} entfernt, %{when}"
       autoclosed:
@@ -148,20 +155,21 @@ 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_east_2: "USA West (Ohio)"
+        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"
@@ -257,6 +265,7 @@ de:
     uploading: "Wird hochgeladen…"
     uploading_filename: "{{filename}} wird hochgeladen…"
     uploaded: "Hochgeladen!"
+    pasting: "Einfügen..."
     enable: "Aktivieren"
     disable: "Deaktivieren"
     undo: "Rückgängig machen"
@@ -351,11 +360,9 @@ 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_admission: "Erlaube Benutzern, die Gruppe eigenständig zu betreten (Erfordert, dass die Gruppe öffentlich sichtbar ist)"
+      public_exit: "Erlaube Benutzern, die Gruppe eigenständig zu verlassen"
       empty:
         posts: "Es gibt keine Beiträge von Mitgliedern dieser Gruppe."
         members: "Es gibt keine Mitglieder in dieser Gruppe."
@@ -367,17 +374,22 @@ de:
       join: "Gruppe beitreten"
       leave: "Gruppe verlassen"
       request: "Gruppenbeitritt beantragen"
+      message: "Nachricht"
       automatic_group: Automatische Gruppe
       closed_group: Geschlossene Gruppe
       is_group_user: "Du bist ein Mitglied in dieser Gruppe."
       allow_membership_requests: "Erlaube Benutzern, eine Mitgliedschaftsanfrage an Gruppen-Eigentümer zu senden."
+      membership_request_template: "Benutzerdefinierte Vorlage, das Benutzern angezeigt wird, die eine Mitgliedschaftsanfrage senden"
+      membership_request:
+        submit: "Anfrage abschicken"
+        title: "Anfrage, um @%{group_name} beizutreten"
+        reason: "Lass’ die Gruppenbesitzer wissen, warum du in diese Gruppe gehörst"
       membership: "Mitgliedschaft"
       name: "Name"
       user_count: "Anzahl der Mitglieder"
       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,8 +403,15 @@ 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?"
+        mentionable: "Wer kann diese Gruppe @erwähnen?"
+        messageable: "Wer cann dieser Gruppe eine Nachricht schicken?"
         nobody: "Niemand"
         only_admins: "Nur Administratoren"
         mods_and_admins: "Nur Moderatoren und Administratoren"
@@ -480,6 +499,7 @@ de:
       topics_entered: "betrachtete Themen"
       post_count: "# Beiträge"
       confirm_delete_other_accounts: "Bist du sicher, dass du diese Konten löschen willst?"
+      powered_by: "powered by <a href='https://ipinfo.io'>ipinfo.io</a>"
     user_fields:
       none: "(wähle eine Option aus)"
     user:
@@ -488,7 +508,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."
@@ -513,12 +533,14 @@ de:
         disable: "Benachrichtigungen deaktivieren"
         enable: "Benachrichtigungen aktivieren"
         each_browser_note: "Hinweis: Du musst diese Einstellung in jedem von dir verwendeten Browser ändern."
-      dismiss_notifications: "Alles ausblenden"
+      dismiss: 'Alles gelesen'
+      dismiss_notifications: "Alles gelesen"
       dismiss_notifications_tooltip: "Alle ungelesenen Benachrichtigungen als gelesen markieren"
       first_notification: "Deine erste Benachrichtigung! Wähle sie aus um fortzufahren."
       disable_jump_reply: "Springe nicht zu meinem Beitrag, nachdem ich geantwortet habe"
       dynamic_favicon: "Zeige die Anzahl der neuen und geänderten Themen im Browser-Symbol an"
       theme_default_on_all_devices: "Übernehme dieses Theme für alle meine Geräte."
+      allow_private_messages: "Erlaube anderen Benutzern, mir Nachrichten zu schicken"
       external_links_in_new_tab: "Öffne alle externen Links in einem neuen Tab"
       enable_quoting: "Aktiviere Zitatantwort mit dem hervorgehobenen Text"
       change: "ändern"
@@ -526,8 +548,9 @@ de:
       admin: "{{user}} ist ein Administrator"
       moderator_tooltip: "Dieser Benutzer ist ein Moderator"
       admin_tooltip: "Dieser Benutzer ist ein Administrator"
-      blocked_tooltip: "Dieser Benutzer wird blockiert."
+      silenced_tooltip: "Der Benutzer ist stummgeschaltet"
       suspended_notice: "Dieser Benutzer ist bis zum {{date}} gesperrt."
+      suspended_permanently: "Der Benutzer ist gesperrt."
       suspended_reason: "Grund: "
       github_profile: "Github"
       email_activity_summary: "Aktivitäts-Übersicht"
@@ -558,6 +581,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."
@@ -576,6 +600,8 @@ de:
       undo_revoke_access: "Entziehe Zugriffsrecht widerrufen"
       api_approved: "Genehmigt:"
       theme: "Design"
+      home: "Standard-Startseite"
+      staged: "Vorbereitet"
       staff_counters:
         flags_given: "hilfreiche Meldungen"
         flagged_posts: "gemeldete Beiträge"
@@ -617,17 +643,18 @@ 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"
         taken: "Entschuldige, diese E-Mail-Adresse ist nicht verfügbar."
         error: "Beim Ändern der E-Mail-Adresse ist ein Fehler aufgetreten. Möglicherweise wird diese Adresse schon benutzt."
         success: "Wir haben eine E-Mail an die angegebene E-Mail-Adresse gesendet. Folge zur Bestätigung der Adresse bitte den darin enthaltenen Anweisungen."
+        success_staff: "Wir haben eine E-Mail an deine aktuelle Adresse geschickt. Bitte folge den Bestätigungsanweisungen."
       change_avatar:
         title: "Ändere dein Profilbild"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basierend auf"
         gravatar_title: "Ändere deinen Avatar auf der Gravatar-Webseite"
+        gravatar_failed: "Konnte Gravatar nicht abrufen. Ist mit dieser E-Mail-Adresse eines verknüpft?"
         refresh_gravatar_title: "Deinen Gravatar aktualisieren"
         letter_based: "ein vom System zugewiesenes Profilbild"
         uploaded_avatar: "Eigenes Bild"
@@ -753,6 +780,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?"
@@ -766,7 +796,7 @@ de:
         link_generated: "Der Einladungslink wurde erfolgreich generiert!"
         valid_for: "Der Einladungslink ist nur für die Adresse %{email} gültig"
         bulk_invite:
-          none: "Du hast noch niemanden eingeladen. Verschicke eine individuelle Einladung, oder lade gleich mehrere Leute auf einmal durch <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>Hochladen einer CSV-Datei</a>ein."
+          none: "Du hast noch niemanden eingeladen. Verschicke eine individuelle Einladung, oder lade gleich mehrere Leute auf einmal durch <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>Hochladen einer CSV-Datei</a> ein."
           text: "Masseneinladung aus Datei"
           success: "Die Datei wurde erfolgreich hochgeladen. Du erhältst eine Nachricht, sobald der Vorgang abgeschlossen ist."
           error: "Die Datei sollte im CSV Format vorliegen."
@@ -782,6 +812,7 @@ de:
         title: "Übersicht"
         stats: "Statistiken"
         time_read: "Lesezeit"
+        recent_time_read: "aktuelle Lesezeit"
         topic_count:
           one: "Thema erstellt"
           other: "Themen erstellt"
@@ -789,14 +820,17 @@ de:
           one: "Beitrag erstellt"
           other: "Beiträge erstellt"
         likes_given:
-          one: "<i class='fa fa-heart'></i> gegeben"
-          other: "<i class='fa fa-heart'></i> gegeben"
+          one: "gegeben"
+          other: "gegeben"
         likes_received:
-          one: "<i class='fa fa-heart'></i> erhalten"
-          other: "<i class='fa fa-heart'></i> erhalten"
+          one: "vergeben"
+          other: "vergeben"
         days_visited:
           one: "Tag vorbeigekommen"
           other: "Tage vorbeigekommen"
+        topics_entered:
+          one: "betrachtetes Thema"
+          other: "betrachtete Themen"
         posts_read:
           one: "Beitrag gelesen"
           other: "Beiträge gelesen"
@@ -885,7 +919,11 @@ de:
     first_post: Erster Beitrag
     mute: Stummschalten
     unmute: Stummschaltung aufheben
-    last_post: Letzter Beitrag
+    last_post: Geschrieben
+    time_read: Gelesen
+    time_read_recently: '%{time_read} aktuell'
+    time_read_tooltip: '%{time_read} Lesezeit insgesamt'
+    time_read_recently_tooltip: '%{time_read} Lesezeit insgesamt (%{recent_time_read} in den letzten 60 Tagen)'
     last_reply_lowercase: letzte Antwort
     replies_lowercase:
       one: Antwort
@@ -911,6 +949,7 @@ de:
     private_message_info:
       title: "Nachricht"
       invite: "Andere einladen…"
+      leave_message: "Möchtest du diese Nachricht wirklich verlassen?"
       remove_allowed_user: "Willst du {{name}} wirklich aus dieser Unterhaltung entfernen?"
       remove_allowed_group: "Willst du {{name}} wirklich aus dieser Unterhaltung entfernen?"
     email: 'E-Mail-Adresse'
@@ -935,6 +974,9 @@ 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>"
+      help: "E-Mail nicht angekommen? Bitte prüfe zuerst deinen Spam-Ordner. <p>Nicht sicher, welche E-Mail-Adresse du verwendet hast? Gib eine E-Mail-Adresse ein und wir werden dir sagen, ob sie hier existiert.</p><p>Falls du keinen Zugriff mehr auf die hinterlegte E-Mail-Adresse deines Kontos hast, kontaktiere bitte <a href='/about'>unser hilfsbereites Team. </a></p>"
+      button_ok: "OK"
+      button_help: "Hilfe"
     login:
       title: "Anmelden"
       username: "Benutzername"
@@ -993,7 +1035,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 +1046,8 @@ de:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Windows 10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "nur Kategorien"
       categories_with_featured_topics: "Kategorien mit empfohlenen Themen"
@@ -1010,12 +1056,35 @@ de:
       shift: 'Umschalt'
       ctrl: 'Strg'
       alt: 'Alt'
+    select_kit:
+      default_header_text: Auswählen…
+      no_content: Keine Treffer gefunden
+      filter_placeholder: Suchen…
+      create: "Erstelle {{content}}"
+    emoji_picker:
+      filter_placeholder: Emoji suchen
+      people: Personen
+      nature: Natur
+      food: Lebensmittel
+      activity: Aktivität
+      travel: Reisen
+      objects: Objekte
+      celebration: Feiern
+      custom: Benutzerdefinierte Emojis
+      recent: Zuletzt verwendet
+      default_tone: Keine Hautfarbe
+      light_tone: Helle Hautfarbe
+      medium_light_tone: Mittel-helle Hautfarbe
+      medium_tone: Mittlere Hautfarbe
+      medium_dark_tone: Mittel-dunkle Hautfarbe
+      dark_tone: Dunkle Hautfarbe
     composer:
       emoji: "Emoji :)"
       more_emoji: "mehr…"
       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"
@@ -1025,6 +1094,7 @@ de:
       saved_local_draft_tip: "lokal gespeichert"
       similar_topics: "Dein Thema hat Ähnlichkeit mit…"
       drafts_offline: "Entwürfe offline"
+      group_mentioned_limit: "<b>Warnung!</b> Du erwähnst <a href='{{group_link}}'>{{group}}</a>, aber diese Gruppe hat mehr Mitglieder als der Administrator als die maximale Anzahl von {{max}} Benutzern eingestellt hat, die gleichzeitig erwähnt werden können. Keiner davon wird benachrichtigt."
       group_mentioned:
         one: "Indem du {{group}} erwähnst, bist du dabei, <a href='{{group_link}}'>eine Person</a> zu benachrichtigen – bist du dir sicher?"
         other: "Indem du {{group}} erwähnst, bist du dabei, <a href='{{group_link}}'>{{count}} Personen</a> zu benachrichtigen – bist du dir sicher?"
@@ -1047,6 +1117,7 @@ de:
       cancel: "Abbrechen"
       create_topic: "Thema erstellen"
       create_pm: "Nachricht"
+      create_whisper: "Flüstern"
       title: "Oder drücke Strg+Eingabetaste"
       users_placeholder: "Benutzer hinzufügen"
       title_placeholder: "Um was geht es in dieser Diskussion? Schreib einen kurzen Satz."
@@ -1054,6 +1125,7 @@ de:
       edit_reason_placeholder: "Warum bearbeitest du?"
       show_edit_reason: "(Bearbeitungsgrund hinzufügen)"
       topic_featured_link_placeholder: "Gib einen Link, der mit dem Titel angezeigt wird."
+      remove_featured_link: "Link aus Thema entfernen."
       reply_placeholder: "Schreib hier. Verwende Markdown, BBCode oder HTML zur Formatierung. Füge Bilder ein oder ziehe sie herein."
       view_new_post: "Sieh deinen neuen Beitrag an."
       saving: "Wird gespeichert"
@@ -1084,12 +1156,9 @@ de:
       olist_title: "Nummerierte Liste"
       ulist_title: "Liste mit Aufzählungszeichen"
       list_item: "Listenelement"
-      heading_label: "Ü"
-      heading_title: "Überschrift"
-      heading_text: "Überschrift"
-      hr_title: "Horizontale Linie"
       help: "Hilfe zur Markdown-Formatierung"
-      toggler: "Eingabebereich aus- oder einblenden"
+      collapse: "Editor minimieren"
+      abandon: "Editor schließen und Entwurf verwerfen"
       modal_ok: "OK"
       modal_cancel: "Abbrechen"
       cant_send_pm: "Entschuldige, aber du kannst keine Nachricht an %{username} senden."
@@ -1098,34 +1167,41 @@ de:
         body: "Im Augenblick wird diese Nachricht nur an dich selbst gesendet!"
       admin_options_title: "Optionale Team-Einstellungen für dieses Thema"
     notifications:
+      tooltip:
+        regular:
+          one: "1 nicht gesehene Benachrichtigung"
+          other: "{{count}} nicht gesehene Benachrichtigungen"
+        message:
+          one: "1 ungelesene Nachricht"
+          other: "{{count}} ungelesene Nachrichten"
       title: "Benachrichtigung über @Name-Erwähnungen, Antworten auf deine Beiträge und Themen, Nachrichten, usw."
       none: "Die Benachrichtigungen können derzeit nicht geladen werden."
       empty: "Keine Benachrichtigungen gefunden."
       more: "ältere Benachrichtigungen anzeigen"
       total_flagged: "Anzahl der gemeldeten Beiträge"
-      mentioned: "<i title='erwähnt' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
-      group_mentioned: "<i title='Gruppe erwähnt' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
-      quoted: "<i title='zitiert' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      replied: "<i title='geantwortet' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='geantwortet' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      edited: "<i title='bearbeitet' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
-      liked: "<i title='gefällt' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
-      liked_2: "<i title='gefällt' class='fa fa-heart'></i><p><span>{{username}}, {{username2}}</span> {{description}}</p>"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<i title='gefällt' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} und 1 anderer</span> {{description}}</p>"
-        other: "<i title='gefällt' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} und {{count}} andere</span> {{description}}</p>"
-      private_message: "<i title='Nachricht' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_private_message: "<i title='Nachricht' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_topic: "<i title='zu Thema eingeladen' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      invitee_accepted: "<i title='Einladung angenommen' class='fa fa-user'></i><p><span>{{username}}</span> hat deine Einladung angenommen</p>"
-      moved_post: "<i title='Beitrag verschoben' class='fa fa-sign-out'></i><p><span>{{username}}</span> hat {{description}} verschoben</p>"
-      linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
-      granted_badge: "<i title='Abzeichen verliehen' class='fa fa-certificate'></i><p>Abzeichen '{{description}}' erhalten</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>Neues Thema</span> {{description}}</p>"
+        one: "<span>{{username}}, {{username2}} und jemand anderes</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} und {{count}} andere</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> hat deine Einladung angenommen"
+      moved_post: "<span>{{username}}</span> hat {{description}} verschoben"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "Hat '{{description}}' verliehen bekommen"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>New Topic</span> {{description}}"
       group_message_summary:
-        one: "<i title='messages in group inbox' class='fa fa-group'></i><p> Eine Nachricht in deinem {{group_name}} Postfach</p>"
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} Nachrichten in deinem {{group_name}} Postfach</p>"
+        one: "{{count}} Nachricht in deinem {{group_name}} Posteingang"
+        other: "{{count}} Nachrichten in deinem {{group_name}} Posteingang"
       alt:
         mentioned: "Erwähnt von"
         quoted: "Zitiert von"
@@ -1141,6 +1217,7 @@ de:
         linked: "Link zu deinem Beitrag"
         granted_badge: "Abzeichen erhalten"
         group_message_summary: "Nachrichten im Gruppenpostfach"
+        topic_reminder: "Eine Erinnerung"
       popup:
         mentioned: '{{username}} hat dich in "{{topic}}" - {{site_title}} erwähnt'
         group_mentioned: '{{username}} hat dich in "{{topic}}" - {{site_title}} erwähnt'
@@ -1163,6 +1240,7 @@ de:
       uploading: "Wird hochgeladen"
       select_file: "Datei auswählen"
       image_link: "Der Link deines Bildes verweist auf"
+      default_image_alt_text: Bild
     search:
       sort_by: "Sortieren nach"
       relevance: "Relevanz"
@@ -1174,14 +1252,21 @@ de:
       clear_all: "Auswahl aufheben"
       too_short: "Der Suchbegriff ist zu kurz."
       result_count:
-        one: "1 Ergebnis für <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} Ergebnisse für <span class='term'>\"{{term}}\"</span>"
+        one: "1 Ergebnis für <span class='term'>{{term}}</span>"
+        other: "{{count}}{{plus}} Ergebnisse für <span class='term'>{{term}}</span>"
       title: "suche nach Themen, Beiträgen, Benutzern oder Kategorien"
       no_results: "Keine Ergebnisse gefunden."
       no_more_results: "Es wurde keine weiteren Ergebnisse gefunden."
       searching: "Suche …"
       post_format: "#{{post_number}} von {{username}}"
-      results_page: "Suchergebnisse"
+      results_page: "Suchergebnisse für '{{term}}'"
+      more_results: "Es gibt mehr Ergebnisse. Bitte grenze deine Suchkriterien weiter ein."
+      cant_find: "Nicht gefunden, wonach du suchst?"
+      start_new_topic: "Wie wär’s mit einem neuen Thema?"
+      or_search_google: "Oder versuche stattdessen mit Google zu suchen:"
+      search_google: "Versuche stattdessen mit Google zu suchen:"
+      search_google_button: "Google"
+      search_google_title: "Durchsuche diese Seite"
       context:
         user: "Beiträge von @{{username}} durchsuchen"
         category: "Kategorie #{{category}} durchsuchen"
@@ -1198,7 +1283,7 @@ de:
         with_badge:
           label: Mit dem Abzeichen
         with_tags:
-          label: Mit den Schlagwörtern
+          label: Mit dem Schlagwort
         filters:
           label: 'Themen/Beiträge einschränken:'
           likes: Themen/Beiträge, die mir gefallen
@@ -1206,13 +1291,15 @@ de:
           watching: Themen, die ich beobachte
           tracking: Themen, denen ich folge
           private: Beiträge in meinen Unterhaltungen
-          bookmarks: Gemerkte Themen/Beiträge
+          bookmarks: Themen/Beiträge mit Lesezeichen
           first: Erste Beiträge in Themen
           pinned: Angeheftete Themen
           unpinned: Nicht angeheftete Themen
           seen: Gelesene Themen/Beiträge
           unseen: Ungelesene Themen/Beiträge
           wiki: Wikis
+          images: Mit Bild(ern)
+          all_tags: Enthält alle Schlagwörter
         statuses:
           label: 'Themen einschränken:'
           open: Offene Themen
@@ -1349,19 +1436,27 @@ de:
       jump_reply_down: zur nachfolgenden Antwort springen
       deleted: "Das Thema wurde gelöscht"
       topic_status_update:
-        title: "Setzte die Themen-Stoppuhr"
-        save: "Stoppuhr setzen"
+        title: "Zeitschaltuhren"
+        save: "Zeitschaltuhr aktivieren"
         num_of_hours: "Stunden:"
-        remove: "Stoppuhr löschen"
+        remove: "Zeitschaltuhr deaktivieren"
         publish_to: "Veröffentlichen in:"
         when: "Wann:"
+        public_timer_types: Globale Zeitschaltuhren
+        private_timer_types: Zeitschaltuhren für Benutzer
       auto_update_input:
+        none: "Wähle einen Zeitbereich aus"
         later_today: "Im Laufe des Tages"
         tomorrow: "Morgen"
         later_this_week: "Später in dieser Woche"
         this_weekend: "Dieses Wochenende"
         next_week: "Nächste Woche"
+        two_weeks: "Zwei Wochen"
         next_month: "Nächster Monat"
+        three_months: "Drei Monate"
+        six_months: "Sechs Monate"
+        one_year: "Ein Jahr"
+        forever: "Für immer"
         pick_date_and_time: "Datum und Zeit wählen"
         set_based_on_last_post: "Schließen basierend auf dem letzten Beitrag"
       publish_to_category:
@@ -1457,7 +1552,7 @@ de:
         open: "Thema öffnen"
         close: "Thema schließen"
         multi_select: "Beiträge auswählen..."
-        timed_update: "Themen-Timer setzen…"
+        timed_update: "Zeitschaltuhren…"
         pin: "Thema anheften..."
         unpin: "Thema loslösen..."
         unarchive: "Thema aus Archiv holen"
@@ -1542,6 +1637,7 @@ de:
         success_email: "Wir haben an <b>{{emailOrUsername}}</b> eine Einladung verschickt und werden dich benachrichtigen, sobald die Einladung angenommen wurde. In deinem Benutzerprofil kannst du alle deine Einladungen überwachen."
         success_username: "Wir haben den Benutzer gebeten, sich an diesem Thema zu beteiligen."
         error: "Es tut uns leid, wir konnten diese Person nicht einladen. Wurde diese Person vielleicht schon eingeladen? (Einladungen sind in ihrer Zahl beschränkt)"
+        success_existing_email: "Ein Benutzer mit der E-Mail-Adresse <b>{{emailOrUsername}}</b> existiert bereits. Wir haben den Benutzer eingeladen, sich an diesem Thema zu beteiligen."
       login_reply: 'Anmelden, um zu antworten'
       filters:
         n_posts:
@@ -1586,7 +1682,18 @@ de:
       multi_select:
         select: 'auswählen'
         selected: 'ausgewählt ({{count}})'
-        select_replies: 'samt Antworten auswählen'
+        select_post:
+          label: 'auswählen'
+          title: 'Beitrag zu Auswahl hinzufügen'
+        selected_post:
+          label: 'ausgewählt'
+          title: 'Klicke, um den Beitrag aus der Auswahl zu entfernen'
+        select_replies:
+          label: 'auswählen inkl. Antworten'
+          title: 'Beitrag und alle Antworten zu Auswahl hinzufügen'
+        select_below:
+          label: 'auswählen inkl. folgende'
+          title: 'Beitrag und alle folgende zu Auswahl hinzufügen'
         delete: ausgewählte löschen
         cancel: Auswahlvorgang abbrechen
         select_all: alle auswählen
@@ -1598,7 +1705,7 @@ de:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Zitat"
-      edit: "Du bearbeitest {{link}} {{replyAvatar}} {{username}}"
+      edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Grund: "
       post_number: "Beitrag {{number}}"
       wiki_last_edited_on: "Wiki zuletzt bearbeitet am"
@@ -1659,6 +1766,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"
@@ -1666,11 +1774,14 @@ de:
         share: "Link zu diesem Beitrag teilen"
         more: "Mehr"
         delete_replies:
-          confirm:
-            one: "Willst du auch die direkte Antwort auf diesen Beitrag löschen?"
-            other: "Willst du auch die {{count}} direkten Antworten auf diesen Beitrag löschen?"
-          yes_value: "Ja, auch die Antworten löschen"
-          no_value: "Nein, nur diesen Beitrag"
+          confirm: "Möchtest du auch die Antworten auf diese Beiträge löschen?"
+          direct_replies:
+            one: "Ja, und eine direkte Antwort"
+            other: "Ja, und {{count}} direkte Antworten"
+          all_replies:
+            one: "Ja, und eine Antwort"
+            other: "Ja, und {{count}} Antworten"
+          just_the_post: "Nein, nur diesen Beitrag"
         admin: "Administrative Aktionen"
         wiki: "Wiki erstellen"
         unwiki: "Wiki entfernen"
@@ -1699,6 +1810,9 @@ de:
           notify_user: "hat eine Nachricht gesendet"
           bookmark: "hat/haben ein Lesezeichen gesetzt"
           like: "gefällt dies"
+          like_capped:
+            one: "und {{count}} anderen gefällt das"
+            other: "und {{count}} anderen gefällt das"
           vote: "hat/haben dafür gestimmt"
         by_you:
           off_topic: "Du hast das als „am Thema vorbei“ gemeldet"
@@ -1762,7 +1876,7 @@ de:
       delete:
         confirm:
           one: "Möchtest du wirklich diesen Beitrag löschen?"
-          other: "Möchtest du wirklich all diese Beiträge löschen?"
+          other: "Möchtest du wirklich diese {{count}} Beiträge löschen?"
       merge:
         confirm:
           one: "Möchtest du diese Beiträge wirklich zusammenführen?"
@@ -1812,8 +1926,8 @@ 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_allowed_tags: "Erlaube in dieser Kategorie nur folgende Schlagwörter:"
+      tags_allowed_tag_groups: "Erlaube in dieser Kategorie nur Schlagwörter aus folgenden Schlagwortgruppen:"
       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"
@@ -1848,6 +1962,7 @@ de:
       email_in_allow_strangers: "Akzeptiere E-Mails von anonymen Benutzern."
       email_in_disabled: "Das Erstellen von neuen Themen per E-Mail ist in den Website-Einstellungen deaktiviert. Um das Erstellen von neuen Themen per E-Mail zu erlauben,"
       email_in_disabled_click: 'aktiviere die Einstellung „email in“.'
+      mailinglist_mirror: "Kategorie spiegelt eine Mailingliste"
       suppress_from_homepage: "Löse diese Kategorie von der Startseite."
       show_subcategory_list: "Zeige Liste von Unterkategorien oberhalb von Themen in dieser Kategorie"
       num_featured_topics: "Anzahl der Themen, die auf der Kategorien-Seite angezeigt werden"
@@ -2108,7 +2223,7 @@ de:
         hamburger_menu: '<b>=</b> „Hamburger“-Menü öffnen'
         user_profile_menu: '<b>p</b> Benutzermenü öffnen'
         show_incoming_updated_topics: '<b>.</b> Aktualisierte Themen anzeigen'
-        search: '<b>/</b> Suche'
+        search: '<b>/</b> oder <b>Strg</b>+<b>Alt</b>+<b>f</b> Suche'
         help: '<b>?</b> Tastaturhilfe öffnen'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Neue/ausgewählte Beiträge ausblenden'
         dismiss_topics: '<b>x</b>, <b>t</b> Themen ausblenden'
@@ -2179,9 +2294,12 @@ de:
       selector_no_tags: "keine Schlagwörter"
       changed: "Geänderte Schlagwörter:"
       tags: "Schlagwörter"
-      choose_for_topic: "Optionale Schlagwörter für dieses Thema wählen"
+      choose_for_topic: "optionale Schlagwörter"
       delete_tag: "Schlagwört löschen"
-      delete_confirm: "Möchtest du wirklich dieses Schlagwort löschen?"
+      delete_confirm:
+        one: "Bist du sicher, dass du dieses Schlagwort löschen und von einem zugeordneten Thema entfernen möchtest?"
+        other: "Bist du sicher, dass du dieses Schlagwort löschen und von {{count}} zugeordneten Themen entfernen möchtest?"
+      delete_confirm_no_topics: "Bist du sicher, dass du dieses Schlagwort löschen möchtest?"
       rename_tag: "Schlagwort umbenennen"
       rename_instructions: "Neuen Namen für das Schlagwort wählen:"
       sort_by: "Sortieren nach:"
@@ -2276,7 +2394,7 @@ de:
         no_problems: "Es wurden keine Probleme gefunden."
         moderators: 'Moderatoren:'
         admins: 'Administratoren:'
-        blocked: 'Blockiert:'
+        silenced: 'Stummgeschaltet:'
         suspended: 'Gesperrt:'
         private_messages_short: "Nachr."
         private_messages_title: "Nachrichten"
@@ -2309,24 +2427,25 @@ de:
         by: "von"
       flags:
         title: "Meldungen"
-        old: "Alt"
-        active: "Aktiv"
+        active_posts: "Gemeldete Beiträge"
+        old_posts: "Alte gemeldete Beiträge"
+        topics: "Gemeldete Themen"
+        moderation_history: "Moderationshistorie"
         agree: "Zustimmen"
         agree_title: "Meldung bestätigen, weil diese gültig und richtig ist"
-        agree_flag_modal_title: "Zustimmen und…"
-        agree_flag_hide_post: "Zustimmen (Beitrag ausblenden + PN senden)"
-        agree_flag_hide_post_title: "Diesen Beitrag ausblenden und den Benutzer mit einer automatisch gesendeten Nachricht zum Bearbeiten des Beitrags auffordern."
-        agree_flag_restore_post: "Zustimmen (Beitrag wiederherstellen)"
-        agree_flag_restore_post_title: "Diesen Beitrag wiederherstellen"
-        agree_flag: "Meldung zustimmen"
-        agree_flag_title: "Der Meldung zustimmen und den Beitrag unverändert lassen."
+        agree_flag_hide_post: "Zustimmen und Beitrag verstecken"
+        agree_flag_hide_post_title: "Verstecke diesen Beitrag und sende dem Benutzer/der Benutzerin eine Nachricht mit der Bitte, ihn zu bearbeiten."
+        agree_flag_restore_post: "Zustimmen und Beitrag wiederherstellen"
+        agree_flag_restore_post_title: "Beitrag wiederherstellen, sodass alle Benutzer/-innen ihn sehen können."
+        agree_flag: "Zustimmen und Beitrag behalten"
+        agree_flag_title: "Meldung zustimmen und den Beitrag unbearbeitet lassen."
         defer_flag: "Ignorieren"
         defer_flag_title: "Entferne diese Meldung. Derzeit besteht kein Handlungsbedarf."
         delete: "Löschen"
         delete_title: "Lösche den Beitrag, auf den diese Meldung verweist."
         delete_post_defer_flag: "Beitrag löschen und Meldung ignorieren"
         delete_post_defer_flag_title: "Beitrag löschen; das Thema löschen, wenn es sich um den ersten Beitrag handelt"
-        delete_post_agree_flag: "Beitrag löschen und der Meldung zustimmen"
+        delete_post_agree_flag: "Beitrag löschen und Meldung zustimmen"
         delete_post_agree_flag_title: "Beitrag löschen; das Thema löschen, wenn es sich um den ersten Beitrag handelt"
         delete_flag_modal_title: "Löschen und…"
         delete_spammer: "Spammer löschen"
@@ -2338,6 +2457,8 @@ de:
         clear_topic_flags: "Erledigt"
         clear_topic_flags_title: "Das Thema wurde untersucht und Probleme wurden beseitigt. Klicke auf „Erledigt“, um die Meldungen zu entfernen."
         more: "(weitere Antworten…)"
+        suspend_user: "Benutzer sperren"
+        suspend_user_title: "Benutzer für diesen Beitrag sperren"
         dispositions:
           agreed: "zugestimmt"
           disagreed: "abgelehnt"
@@ -2348,27 +2469,25 @@ de:
         system: "System"
         error: "Etwas ist schief gelaufen"
         reply_message: "Antworten"
-        no_results: "Es gibt keine Meldungen."
+        no_results: "Es gibt keine gemeldeten Beiträge."
         topic_flagged: "Dieses <strong>Thema</strong> wurde gemeldet."
+        show_full: "zeige vollständigen Beitrag"
         visit_topic: "Besuche das Thema, um zu reagieren"
         was_edited: "Beitrag wurde nach der ersten Meldung bearbeitet"
         previous_flags_count: "Dieses Thema wurde bereits {{count}} mal gemeldet."
-        summary:
-          action_type_3:
-            one: "„am Thema vorbei“"
-            other: "„am Thema vorbei“ x{{count}}"
-          action_type_4:
-            one: "unangemessen"
-            other: "unangemessen x{{count}}"
-          action_type_6:
-            one: "benutzerdefiniert"
-            other: "benutzerdefiniert x{{count}}"
-          action_type_7:
-            one: "benutzerdefiniert"
-            other: "benutzerdefiniert x{{count}}"
-          action_type_8:
-            one: "Spam"
-            other: "Spam x{{count}}"
+        show_details: "Zeige Meldungsdetails"
+        details: "Details"
+        flagged_topics:
+          topic: "Thema"
+          type: "Art"
+          users: "Benutzer"
+          last_flagged: "Zuletzt gemeldet"
+        short_names:
+          off_topic: "off-topic"
+          inappropriate: "unangemessen"
+          spam: "spam"
+          notify_user: "benutzerdefiniert"
+          notify_moderators: "benutzerdefiniert"
       groups:
         primary: "Hauptgruppe"
         no_primary: "(keine Hauptgruppe)"
@@ -2456,7 +2575,7 @@ de:
           details: "Wenn auf einen Beitrag geantwortet wird oder der Beitrag geändert, gelöscht oder wiederhergestellt wird."
         user_event:
           name: "Benutzer Ereignis"
-          details: "Wenn ein Benutzer erstellt, genehmigt oder aktualisiert wird."
+          details: "Wenn sich ein Benutzer anmeldet, abmeldet, erstellt, genehmigt oder aktualisiert wird."
         delivery_status:
           title: "Versandstatus"
           inactive: "Inaktiv"
@@ -2632,8 +2751,8 @@ de:
           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!"
+            one: "Theme liegt 1 Commit zurück!"
+            other: "Theme liegt {{count}} Commits zurück!"
           scss:
             text: "CSS"
             title: "Gib benutzerdefiniertes CSS ein, wir akzeptieren alle gültigen CSS und SCSS-Stile"
@@ -2763,6 +2882,15 @@ de:
             type_placeholder: "zusammenfassen, registrieren…"
             reply_key_placeholder: "Antwort-Schlüssel"
             skipped_reason_placeholder: "Grund"
+      moderation_history:
+        performed_by: "Durchgeführt von"
+        no_results: "Es ist keine Moderationshistorie verfügbar."
+        actions:
+          delete_user: "Benutzer gelöscht"
+          suspend_user: "Benutzer gesperrt"
+          silence_user: "Benutzer stummgeschaltet"
+          delete_post: "Beitrag gelöscht"
+          delete_topic: "Thema gelöscht"
       logs:
         title: "Logs"
         action: "Aktion"
@@ -2780,6 +2908,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"
@@ -2816,8 +2946,8 @@ de:
             change_category_settings: "Kategorieeinstellungen ändern"
             delete_category: "Kategorie löschen"
             create_category: "Kategorie erstellen"
-            block_user: "Benutzer blockieren"
-            unblock_user: "Blockierung von Benutzer aufheben"
+            silence_user: "Benutzer stummschalten"
+            unsilence_user: "Benutzer nicht mehr stummschalten"
             grant_admin: "Administration gewähren"
             revoke_admin: "Administration entziehen"
             grant_moderation: "Moderation gewähren"
@@ -2833,6 +2963,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."
@@ -2863,8 +2995,46 @@ de:
           roll_up:
             text: "Zusammenfassen"
             title: "Erzeugt neue Einträge zum Blockieren von Subnetzen, wenn mindestens 'min_ban_entries_for_roll_up' Einträge vorhanden sind."
+        search_logs:
+          title: "Protokolle durchsuchen"
+          term: "Suchbegriff"
+          searches: "Suchen"
+          click_through: "Durchklicken"
+          unique: "Eindeutig"
+          unique_title: "einzelne Benutzer mit dieser Suche"
+          types:
+            all_search_types: "Alle Sucharten"
+            header: "Überschrift"
+            full_page: "Desktop-Seite"
+            click_through_only: "Alle (nur durcklicken)"
         logster:
           title: "Fehlerprotokolle"
+      watched_words:
+        title: "Beobachtete Wörter"
+        search: "Suchen"
+        clear_filter: "Zurücksetzen"
+        show_words: "Wörter anzeigen"
+        word_count:
+          one: "1 Wort"
+          other: "%{count} Wörter"
+        actions:
+          block: 'Blockieren'
+          censor: 'Zensieren'
+          require_approval: 'Erfordert Genehmigung'
+          flag: 'Melden'
+        action_descriptions:
+          block: 'Verhindert, dass Beiträge mit diesen Wörtern abgeschickt werden. Benutzer werden eine Fehlermeldung sehen, wenn sie ihren Beitrag abschicken.'
+          censor: 'Erlaube Beiträge mit diesen Wörtern, aber ersetze sie mit Zeichen, die die zensierten Wörter verstecken.'
+          require_approval: 'Beitärge mit diesen Wörtern werden eine Genehmigung vom Team erfordern, bevor sie sichtbar sind.'
+          flag: 'Erlaube Beiträge mit diesen Wörtern, aber markiere sie als unangemessen, damit Moderatoren sie überprüfen können.'
+        form:
+          label: 'Neues Wort:'
+          placeholder: 'vollständiges Wort oder * als Platzhalter'
+          placeholder_regexp: "regulärer Ausdruck"
+          add: 'Hinzufügen'
+          success: 'Erfolg'
+          upload: "Hochladen"
+          upload_successful: "Hochladen erfolgreich. Wörter wurden hinzugefügt."
       impersonate:
         title: "Als Benutzer ausgeben"
         help: "Benutze dieses Werkzeug, um zur Fehlersuche in die Rolle eines anderen Benutzers zu schlüpfen. Du musst dich abmelden, wenn du fertig bist."
@@ -2884,7 +3054,7 @@ de:
           pending: "Genehmigung"
           staff: 'Team'
           suspended: 'Gesperrt'
-          blocked: 'Blockiert'
+          silenced: 'Stummgeschaltet'
           suspect: 'Verdächtig'
         approved: "Genehmigt?"
         approved_selected:
@@ -2905,7 +3075,7 @@ de:
           staff: "Team"
           admins: 'Administratoren'
           moderators: 'Moderatoren'
-          blocked: 'Blockierte Benutzer'
+          silenced: 'Stummgeschaltete Benutzer'
           suspended: 'Gesperrte Benutzer'
           suspect: 'Verdächtige Benutzer'
         reject_successful:
@@ -2922,18 +3092,31 @@ de:
         suspend_failed: "Beim Sperren dieses Benutzers ist etwas schief gegangen {{error}}"
         unsuspend_failed: "Beim Entsperren dieses Benutzers ist etwas schief gegangen {{error}}"
         suspend_duration: "Wie lange soll dieser Benutzer gesperrt werden?"
-        suspend_duration_units: "(Tage)"
         suspend_reason_label: "Warum sperrst du? Dieser Text ist auf der Profilseite des Benutzers <b>für jeden sichtbar</b> und wird dem Benutzer angezeigt, wenn sich dieser anmelden will. Bitte kurz halten."
+        suspend_reason_hidden_label: "Warum sperrst du? Dieser Text wird dem Benutzer angezeigt, wenn er versucht, sich anzumelden. Fasse dich kurz."
         suspend_reason: "Grund"
+        suspend_reason_placeholder: "Grund der Sperre"
+        suspend_message: "E-Mail-Nachricht"
+        suspend_message_placeholder: "Optional: Gib weitere Informationen über deine Sperrung an und sie wird dem Benutzer per E-Mail geschickt."
         suspended_by: "Gesperrt von"
+        silence_reason: "Grund"
+        silenced_by: "Stummgeschaltet von"
+        silence_modal_title: "Benutzer stummschalten"
+        silence_duration: "Wie lange wird der Benutzer/die Benutzerin stummgeschaltet?"
+        silence_reason_label: "Warum schaltest du diesen Benutzer/diese Benutzerin stumm?"
+        silence_reason_placeholder: "Grund der Stummschaltung"
+        silence_message: "E-Mail-Nachricht"
+        silence_message_placeholder: "(leer lassen um Standardnachricht zu schicken)"
+        suspended_until: "(bis %{until})"
+        cant_suspend: "Der Benutzer kann nicht gesperrt werden."
         delete_all_posts: "Lösche alle Beiträge"
         delete_all_posts_confirm_MF: "Du wirst {POSTS, plural, one {einen Beitrag} other {# Beiträge}} und {TOPICS, plural, one {ein Thema} other {# Themen}} löschen. Bist du dir sicher?"
-        suspend: "Sperren"
-        unsuspend: "Entsperren"
-        suspended: "Gesperrt?"
+        silence: "Stummschalten"
+        unsilence: "Stummschaltung aufheben"
+        silenced: "Stummgeschaltet?"
         moderator: "Moderator?"
         admin: "Administrator?"
-        blocked: "Geblockt?"
+        suspended: "Gesperrt?"
         staged: "Vorbereitet?"
         show_admin_profile: "Administration"
         refresh_browsers: "Aktualisierung im Browser erzwingen"
@@ -2949,8 +3132,8 @@ de:
         grant_admin_confirm: "Wir haben dir eine E-Mail geschickt, um den neuen Administrator zu überprüfen. Bitte öffne sie und folge den Anweisungen."
         revoke_moderation: 'Moderationsrechte entziehen'
         grant_moderation: 'Moderationsrechte vergeben'
-        unblock: 'Blockierung aufheben'
-        block: 'Blockieren'
+        unsuspend: 'Entsperren'
+        suspend: 'Sperren'
         reputation: Reputation
         permissions: Berechtigungen
         activity: Aktivität
@@ -2997,17 +3180,18 @@ de:
         activate_failed: "Beim Aktivieren des Benutzers ist ein Fehler aufgetreten."
         deactivate_account: "Benutzer deaktivieren"
         deactivate_failed: "Beim Deaktivieren des Benutzers ist ein Fehler aufgetreten."
-        unblock_failed: 'Beim Aufheben der Blockierung des Benutzers ist ein Fehler aufgetreten.'
-        block_failed: 'Beim Blocken des Benutzers ist ein Fehler aufgetreten.'
-        block_confirm: 'Bist du sicher, dass du diesen Benutzer blockieren willst? Der Benutzer wird keine Möglichkeit mehr haben, Themen oder Beiträge zu erstellen.'
-        block_accept: 'Ja, diesen Benutzer blockieren.'
+        unsilence_failed: 'Beim Aufheben der Stummschaltung ist ein Fehler aufgetreten.'
+        silence_failed: 'Bei der Stummschaltung des Benutzers/der Benutzerin ist ein Fehler aufgetreten.'
+        silence_confirm: 'Bist du sicher, dass du diesen Benutzer stummschalten möchtest? Der Benutzer wird keine Möglichkeit mehr haben, Themen oder Beiträge zu erstellen.'
+        silence_accept: 'Ja, diesen Benutzer stummschalten'
         bounce_score: "Anzahl unzustellbarer E-Mails"
         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."
+        silence_explanation: "Ein stummgeschalteter Benutzer kann keine Beiträge schreiben oder Themen beginnen."
         staged_explanation: "Ein vorbereiteter Benutzer kann nur per E-Mail und nur in bestimmten Themen schreiben."
         bounce_score_explanation:
           none: "Keine unzustellbaren E-Mails an diese Adresse in letzter Zeit."
@@ -3125,6 +3309,7 @@ de:
           developer: 'Entwickler'
           embedding: "Einbettung"
           legal: "Rechtliches"
+          api: 'API-Schnittstelle'
           user_api: 'Benutzer API'
           uncategorized: 'Sonstiges'
           backups: "Backups"
@@ -3262,8 +3447,8 @@ de:
       uploading: "Hochladen..."
       quit: "Vielleicht später"
       staff_count:
-        one: "Deine Community hat 1 Team-Mitglied."
-        other: "Deine Community hat %{count} Team-Mitglieder."
+        one: "Deine Community hat ein Team-Mitglied (du)."
+        other: "Deine Community hat %{count} Team-Mitglieder, einschließlich dir."
       invites:
         add_user: "Hinzufügen"
         none_added: "Du hast bisher kein Team eingeladen. Möchtest du wirklich fortfahren?"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 243923621a..0e4da15cb9 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -9,15 +9,15 @@ el:
   js:
     number:
       format:
-        separator: "."
-        delimiter: ","
+        separator: ","
+        delimiter: "."
       human:
         storage_units:
           format: '%n %u'
           units:
             byte:
               one: Byte
-              other: Byte
+              other: Bytes
             gb: GB
             kb: KB
             mb: MB
@@ -48,6 +48,9 @@ el:
         x_seconds:
           one: "1δ"
           other: "%{count}δ"
+        less_than_x_minutes:
+          one: "< 1λ"
+          other: "< %{count}λ"
         x_minutes:
           one: "1λ"
           other: "%{count}λ"
@@ -57,6 +60,9 @@ el:
         x_days:
           one: "1η"
           other: "%{count}η"
+        x_months:
+          one: "1μην"
+          other: "%{count}μην"
         about_x_years:
           one: "1χ"
           other: "%{count}έ"
@@ -66,8 +72,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 +84,7 @@ el:
         x_days:
           one: "1 ημέρα"
           other: "%{count} ημέρες"
-        date_year: "ΜΜΜ Η, 'ΕΕ"
+        date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
           one: "πριν από 1 λεπτό "
@@ -101,22 +107,23 @@ el:
           other: "%{count} χρόνια μετά"
       previous_month: 'Προηγούμενος μήνας'
       next_month: 'Επόμενος μήνας'
+      placeholder: ημερομηνία
     share:
       topic: 'κοινοποίησε έναν σύνδεσμο προς αυτό το νήμα'
-      post: 'Ανάρτηση #%{postNumber}'
+      post: 'ανάρτηση #%{postNumber}'
       close: 'κλείσιμο'
       twitter: 'κοινοποίησε τον σύνδεσμο στο Twitter'
       facebook: 'κοινοποίησε τον σύνδεσμο στο Facebook'
       google+: 'κοινοποίησε τον σύνδεσμο στο Google+'
-      email: 'στείλε αυτόν τον σύνδεσμο με ένα μήνυμα ηλεκτρονικού ταχυδρομείου'
+      email: 'στείλε αυτόν τον σύνδεσμο με email'
     action_codes:
-      public_topic: "έκανε το θέμα δημόσιο στις ${when}"
-      private_topic: "έκανε το θέμα ιδιωτικό στις %{when}"
-      split_topic: "διαχώρισε αυτό το θέμα στις %{when}"
+      public_topic: "έκανε το νήμα δημόσιο στις %{when}"
+      private_topic: "έκανε το νήμα ιδιωτικό στις %{when}"
+      split_topic: "διαχώρισε αυτό το νήμα %{when}"
       invited_user: "προσκάλεσε τον χρήστη %{who} στις %{when}"
-      invited_group: "προσκάλεσε τον χρήστη %{who} στις %{when}"
+      invited_group: "προσκάλεσε την ομάδα %{who} στις %{when}"
       removed_user: "αφαίρεσε τον χρήστη %{who} στις %{when}"
-      removed_group: "αφαίρεσε τον χρήστη %{who} στις %{when}"
+      removed_group: "αφαίρεσε την ομάδα %{who} στις %{when}"
       autoclosed:
         enabled: 'έκλεισε στις %{when}'
         disabled: 'άνοιξε στις %{when}'
@@ -130,35 +137,39 @@ el:
         enabled: 'καρφιτσώθηκε στις %{when}'
         disabled: 'ξεκαρφιτσώθηκε στις %{when}'
       pinned_globally:
-        enabled: 'καρφιτσώθηκε παντού %{when}'
+        enabled: 'καρφιτσώθηκε καθολικά %{when}'
         disabled: 'ξεκαρφιτσώθηκε %{when}'
       visible:
-        enabled: 'καταχωρήθηκε %{when}'
-        disabled: 'μη καταχωρημένο %{when}'
+        enabled: 'ορατό στις %{when}'
+        disabled: 'κρυφό στις %{when}'
       banner:
-        enabled: 'έγινε μπάνερ %{when}. Θα εμφανίζεται στην κορυφή κάθε σελίδας μέχρι να απορριφθεί από τον χρήστη.'
-        disabled: 'αφαιρέθηκε μπάνερ %{when}. Δεν θα εμφανίζεται πια στην κορυφή κάθε σελίδας.'
-    topic_admin_menu: "Διαχείριση νήματος"
+        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} χρήστες."
+    emails_are_disabled: "Τα εξερχόμενα emails έχουν απενεργοποιηθεί καθολικά από κάποιον διαχειριστή. Δε θα σταλεί κανένα email."
+    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: "Κίνα(Πεκίνο)"
-    edit: 'αλλαγή του τίτλου και την κατηγορίας του νήματος'
+        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: "Όχι"
     yes_value: "Ναι"
@@ -175,20 +186,20 @@ el:
     links: "Σύνδεσμοι"
     links_lowercase:
       one: "Σύνδεσμος"
-      other: "Σύνδεσμοι"
+      other: "σύνδεσμοι"
     faq: "Συχνές ερωτήσεις"
     guidelines: "Οδηγίες"
-    privacy_policy: "Πολιτική προστασίας δεδομένων"
-    privacy: "Προστασία δεδομένων"
-    terms_of_service: "Όροι χρήσης"
-    mobile_view: "Προβολή για κινητό"
-    desktop_view: "Προβολή για σταθερό υπολογιστή"
+    privacy_policy: "Πολιτική Ιδιωτικότητας"
+    privacy: "Ιδιωτικότητα"
+    terms_of_service: "Όροι Χρήσης"
+    mobile_view: "Προβολή Κινητού"
+    desktop_view: "Προβολή Υπολογιστή"
     you: "Εσύ"
     or: "ή"
     now: "μόλις τώρα"
     read_more: 'διάβασε περισσότερα'
-    more: "περισσότερα"
-    less: "λιγότερα"
+    more: "Περισσότερα"
+    less: "Λιγότερα"
     never: "ποτέ"
     every_30_minutes: "κάθε 30 λεπτά"
     every_hour: "κάθε ώρα"
@@ -202,51 +213,51 @@ el:
       one: "{{count}} χαρακτήρα"
       other: "{{count}} χαρακτήρες"
     suggested_topics:
-      title: "Προτεινόμενα νήματα"
-      pm_title: "Προτεινόμενα μηνύματα"
+      title: "Προτεινόμενα Νήματα"
+      pm_title: "Προτεινόμενα Μηνύματα"
     about:
       simple_title: "Σχετικά"
       title: "Σχετικά με %{title}"
-      stats: "Στατιστικές ιστοσελίδας"
+      stats: "Στατιστικά Ιστοσελίδας"
       our_admins: "Οι διαχειριστές μας"
       our_moderators: "Οι συντονιστές μας"
       stat:
         all_time: "Συνολικά"
-        last_7_days: "Τελευταίες 7 ημέρες"
-        last_30_days: "Τελευταίες 30 ημέρες"
-      like_count: "«Μου αρέσει»"
+        last_7_days: "Τελευταίες 7 Ημέρες"
+        last_30_days: "Τελευταίες 30 Ημέρες"
+      like_count: "Αρέσει"
       topic_count: "Νήματα"
       post_count: "Αναρτήσεις"
       user_count: "Χρήστες"
-      active_user_count: "Ενεργός χρήστης"
+      active_user_count: "Ενεργοί Χρήστες"
       contact: "Επικοινώνησε μαζί μας"
       contact_info: "Σε περίπτωση που προκύψει κάποιο κρίσιμο πρόβλημα ή κάποιο επείγον θέμα που αφορά αυτόν τον ιστότοπο, παρακαλούμε να επικοινωνήσεις μαζί μας στο %{contact_info}."
     bookmarked:
       title: "Σελιδοδείκτης"
-      clear_bookmarks: "Διαγραφή σελιδοδεικτών"
+      clear_bookmarks: "Διαγραφή Σελιδοδεικτών"
       help:
         bookmark: "Πάτα εδώ για να μπεί σελιδοδείκτης στην πρώτη ανάρτηση του νήματος."
-        unbookmark: "Πάτα εδώ να αφαιρεθούν όλοι οι σελιδοδείκτες από αυτό το θέμα."
+        unbookmark: "Πάτα εδώ για να αφαιρεθούν όλοι οι σελιδοδείκτες από αυτό το νήμα."
     bookmarks:
-      not_logged_in: "Λυπούμαστε, για να τοποθετήσεις έναν σελιδοδείκτη θα πρέπει να συνδεθείς πρώτα"
+      not_logged_in: "λυπούμαστε, για να τοποθετήσεις έναν σελιδοδείκτη θα πρέπει να συνδεθείς πρώτα"
       created: "έχεις προσθέσει σελιδοδείκτη σε αυτή την ανάρτηση"
-      not_bookmarked: "έχεις διαβάσει αυτή την ανάρτηση. Πάτησε για να προστεθεί σελιδοδείκτης"
-      last_read: "αυτή είναι η τελευταία ανάρτηση που διάβασες. Πάτησε για να προστεθεί σελιδοδείκτης"
-      remove: "Αφαίρεση σελιδοδείκτη"
-      confirm_clear: "Είστε σίγουρος ότι θέλετε να σβηστούν όλα τα αγαπημένα από αυτό το θέμα;"
+      not_bookmarked: "έχεις διαβάσει αυτή την ανάρτηση, πάτησε για να προστεθεί σελιδοδείκτης"
+      last_read: "αυτή είναι η τελευταία ανάρτηση που διάβασες, πάτησε για να προστεθεί σελιδοδείκτης"
+      remove: "Αφαίρεση Σελιδοδείκτη"
+      confirm_clear: "Είστε σίγουρος ότι θέλετε να αφαιρεθούν όλοι οι σελιδοδείκτες από αυτό το νήμα;"
     topic_count_latest:
-      one: "{{count}} νέο ενημερωμένο νήμα"
+      one: "{{count}} νέο ή ενημερωμένο νήμα"
       other: "{{count}} νέα ή ενημερωμένα νήματα."
     topic_count_unread:
-      one: "{{count}} μη αναγνωσμένο νήμα."
+      one: "{{count}} αδιάβαστο νήμα."
       other: "{{count}} αδιάβαστα νήματα."
     topic_count_new:
       one: "{{count}} νέο νήμα."
       other: "{{count}} νέα νήματα."
-    click_to_show: "Κάνε κλικ για να δείς."
+    click_to_show: "Κλικ εδώ για να τα δεις."
     preview: "προεπισκόπιση"
     cancel: "ακύρωση"
-    save: "Αποθήκευση αλλαγών"
+    save: "Αποθήκευση Αλλαγών"
     saving: "Αποθήκευση σε εξέλιξη..."
     saved: "Αποθηκεύτηκε!"
     upload: "Ανέβασμα"
@@ -258,48 +269,48 @@ el:
     undo: "Αναίρεση"
     revert: "Επαναφορά"
     failed: "Απέτυχε"
-    switch_to_anon: "Έναρξη κατάστασης ανωνυμίας"
-    switch_from_anon: "Τερματισμός κατάστασης ανωνυμίας"
+    switch_to_anon: "Έναρξη Κατάστασης Ανωνυμίας"
+    switch_from_anon: "Τερματισμός Κατάστασης Ανωνυμίας"
     banner:
-      close: "Απομάκρυνε αυτή την εικόνα"
-      edit: "Επεξεργάσου αυτό το banner >>"
+      close: "Απόρριψη αυτής της ανακοίνωσης."
+      edit: "Επεξεργασία αυτής της ανακοίνωσης >>"
     choose_topic:
       none_found: "Δεν βρέθηκαν νήματα."
       title:
-        search: "Ψάξε για νήμα με το όνομά του, το url ή το id του:"
-        placeholder: "δώσε τον τίτλο του νήματος"
+        search: "Ψάξε για ένα Νήμα με το όνομα, το url ή το id του:"
+        placeholder: "γράψε εδώ τον τίτλο του νήματος"
     queue:
       topic: "Νήμα:"
       approve: 'Έγκριση'
       reject: 'Απόρριψη'
-      delete_user: 'Διαγραφή χρήστη'
-      title: "Χρειάζεται έγκριση"
+      delete_user: 'Διαγραφή Χρήστη'
+      title: "Χρειάζεται Έγκριση"
       none: "Δεν υπάρχουν αναρτήσεις για έλεγχο."
       edit: "Επεξεργασία"
       cancel: "Ακύρωση"
       view_pending: "προβολή εκκρεμών αναρτήσεων"
       has_pending_posts:
         one: "Αυτό το θέμα έχει <b>1</b> ανάρτηση που αναμένει έγκριση"
-        other: "Αυτό το θέμα έχει <b>{{count}}</b> αναρτήσεις που αναμένουν έγκριση"
-      confirm: "Αποθήκευση αλλαγών"
-      delete_prompt: "Είστε σίγουρος πως θέλετε να διαγράψετε τον/την <b>%{username}</b>? Αυτό θα διαγράψει όλες τους τις αναρτήσεις και θα μπλοκάρει την διεύθυνση ηλεκτρονικού ταχυδρομείου τους και την IP διεύθυνσή τους."
+        other: "Αυτό το νήμα έχει <b>{{count}}</b> αναρτήσεις που αναμένουν έγκριση"
+      confirm: "Αποθήκευση Αλλαγών"
+      delete_prompt: "Είστε σίγουρος πως θέλετε να διαγράψετε τον/την <b>%{username}</b>; Αυτό θα διαγράψει όλες τις αναρτήσεις και θα μπλοκάρει την διεύθυνση email καθώς και την IP διεύθυνση."
       approval:
-        title: "Η ανάρτηση χρειάζεται έγκριση"
-        description: "Η νέα σου ανάρτηση καταχωρήθηκε αλλά χρειάζεται να εγκριθεί από έναν συντονιστή. Παρακαλώ περιμένετε."
+        title: "Απαιτείται Έγκριση Ανάρτησης"
+        description: "Λάβαμε την ανάρτησή σου, αλλά πρέπει πρώτα να εγκριθεί από έναν συντονιστή πριν εμφανιστεί. Παρακαλώ περιμένετε."
         pending_posts:
           one: "Έχεις <strong>1</strong> εκκρεμή ανάρτηση."
           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>"
-      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>"
+      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_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}}'>{{user}}</a>"
       posted_by_you: "Αναρτήθηκε από <a href='{{userUrl}}'>εσένα</a>"
       sent_by_user: "Στάλθηκε από τον/την <a href='{{userUrl}}'>{{user}}</a>"
@@ -308,121 +319,133 @@ el:
       filter_name: "φιλτράρισμα με βάση το όνομα χρήστη"
       title: "Χρήστες"
       likes_given: "Δόθηκαν"
-      likes_received: "Λήφθηκαν"
+      likes_received: "Λήφθησαν"
       topics_entered: "Προβλήθηκαν"
-      topics_entered_long: "Θέματα που προβλήθηκαν"
-      time_read: "Ωρα ανάγνωσης"
-      topic_count: "Θέματα"
-      topic_count_long: "Νήματα που δημιουργήθηκαν"
+      topics_entered_long: "Προβεβλημένα Νήματα"
+      time_read: "Χρόνος Ανάγνωσης"
+      topic_count: "Νήματα"
+      topic_count_long: "Δημιουργημένα Νήματα"
       post_count: "Απαντήσεις"
-      post_count_long: "Απαντήσεις που δημοσιεύθηκαν"
-      no_results: "Δεν βρέθηκαν αποτελέσματα"
+      post_count_long: "Αναρτημένες Απαντήσεις"
+      no_results: "Δεν βρέθηκαν αποτελέσματα."
       days_visited: "Επισκέψεις"
-      days_visited_long: "Μέρες επίσκεψης"
+      days_visited_long: "Ημέρες Επίσκεψης"
       posts_read: "Διαβασμένο"
-      posts_read_long: "Διαβασμένες αναρτήσεις"
+      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: "Χρήστης στόχος"
+        title: "Logs"
+        when: "Πότε"
+        action: "Ενέργεια"
+        acting_user: "Ενέργεια από"
+        target_user: "Αποδέκτης"
         subject: "Θέμα"
         details: "Λεπτομέρειες"
         from: "Από"
         to: "Προς"
       edit:
-        title: 'Επεξεργασία ομάδας'
-        full_name: 'Ονοματεπώνυμο'
-        add_members: "Προσθήκη μελών"
-        delete_member_confirm: "Ναι αφαιρεθεί ο/η '%{username}' από την '%{group}' ομάδα;"
-      request_membership_pm:
-        title: "Αίτηση μέλους"
-        body: "Θα ήθελα να κάνω αίτηση για να γίνω μέλος στο @% {groupname}"
+        title: 'Επεξεργασία Ομάδας'
+        full_name: 'Πλήρες Όνομα'
+        add_members: "Προσθήκη Μελών"
+        delete_member_confirm: "Να αφαιρεθεί ο/η '%{username}' από την ομάδα '%{group}' ;"
       name_placeholder: "Όνομα ομάδας, χωρίς κενά, ίδιοι κανόνες με τους κανόνες για το όνομα χρήστη"
-      public: "'Ολοι οι χρήστες μπορούν να συμετάσχουν/ αποχωρίσουν απο την ομάδα ελεύθερα. (Η ομάδα πρέπει να είναι φανερή)"
+      public_admission: "Επίτρεψε στους χρήστες να προσχωρήσουν στην ομάδα (Απαιτεί δημόσια ορατή ομάδα)"
+      public_exit: "Επίτρεψε στους χρήστες να αποχωρήσουν από την ομάδα"
       empty:
-        posts: "Δεν υπάρχουν δημοσιεύσεις από μέλη της ομάδας."
+        posts: "Δεν υπάρχουν αναρτήσεις από μέλη της ομάδας."
         members: "Δεν υπάρχουν μέλη σε αυτή την ομάδα."
-        mentions: "Δεν υπάρχει καμία αναφορά για αυτή την ομάδα."
+        mentions: "Δεν υπάρχουν αναφορές αυτής της ομάδας."
         messages: "Δεν υπάρχουν μηνύματα για αυτή την ομάδα."
-        topics: "Δεν υπάρχουν θέματα από μέλη της ομάδας."
-        logs: "Δεν υπάρχουν αρχεία καταγραφής για αυτή την ομάδα."
+        topics: "Δεν υπάρχουν νήματα από μέλη της ομάδας."
+        logs: "Δεν υπάρχουν logs για αυτή την ομάδα."
       add: "Προσθήκη"
-      join: "Συμμετοχή στην ομάδα"
-      leave: "Απομάκρυνση από την ομάδα"
-      request: "Αίτημα για συμμετοχή στην ομάδα"
-      automatic_group: Αυτόματη ομάδα
-      closed_group: Κλειστή ομάδα
+      join: "Συμμετοχή στην Ομάδα"
+      leave: "Αποχώρηση από την Ομάδα"
+      request: "Αίτημα Συμμετοχής στην Ομάδα"
+      message: "Μήνυμα"
+      automatic_group: Αυτόματη Ομάδα
+      closed_group: Κλειστή Ομάδα
       is_group_user: "Είσαι μέλος αυτής της ομάδας"
-      membership: "Ιδιότητα μέλους"
+      allow_membership_requests: "Επιτρέψτε στα μέλη να στέλνουν αιτήματα συμμετοχής στους ιδιοκτήτες ομάδων"
+      membership_request_template: "Προσαρμοσμένο πρότυπο που θα εμφανίζεται στους χρήστες όταν αποστέλλεται αίτημα συμμετοχής"
+      membership_request:
+        submit: "Αποστολή Αιτήματος"
+        title: "Αιτήματα για συμετοχή @%{group_name}"
+        reason: "Ενημέρωσε τους ιδιοκτήτες της ομάδας για τον λόγο που θέλεις να συμμετέχεις σε αυτήν"
+      membership: "Συνδρομή"
       name: "Όνομα"
-      user_count: "Αριθμός μελών"
-      bio: "Σχετικά με την ομάδα"
+      user_count: "Αριθμός Μελών"
+      bio: "Σχετικά με την Ομάδα"
       selector_placeholder: "Προσθήκη μελών"
       owner: "ιδιοκτήτης"
-      visible: "Η ομάδα είναι ορατή σε όλους τους χρήστες"
       index:
         title: "Ομάδες"
         empty: "Δεν υπάρχουν ορατές ομάδες."
       title:
-        one: "ομάδα"
-        other: "ομάδες"
+        one: "Ομάδα"
+        other: "Ομάδες"
       activity: "Δραστηριότητα"
       members: "Μέλη"
-      topics: "Θέματα"
+      topics: "Νήματα"
       posts: "Αναρτήσεις"
       mentions: "Αναφορές"
       messages: "Μηνύματα"
+      notification_level: "Προκαθορισμένο επίπεδο ειδοποιήσεων για μηνύματα ομάδων"
+      visibility_levels:
+        title: "Ποιος μπορεί να δει αυτή την ομάδα;"
+        public: "Όλοι"
+        members: "Ιδιοκτήτες ομάδας, μέλη και διαχειριστές"
+        staff: "Ιδιοκτήτες ομάδας και συνεργάτες"
+        owners: "Ιδιοκτήτες ομάδας και διαχειριστές"
       alias_levels:
-        title: "Ποιός μπορεί να στείλει μήνυμα και να @αναφέρει αυτή την ομάδα?"
+        mentionable: "Ποιός μπορεί να @αναφέρει αυτή την ομάδα;"
+        messageable: "Ποιός μπορεί να στείλει μήνυμα σε αυτή την ομάδα;"
         nobody: "Κανένας"
         only_admins: "Μόνο διαχειριστές"
         mods_and_admins: "Μόνο συντονιστές και διαχειριστές"
-        members_mods_and_admins: "Μόνο τα μέλη μιας ομάδας, οι συντονιστές και οι διαχειριστές"
+        members_mods_and_admins: "Μόνο τα μέλη της ομάδας, οι συντονιστές και οι διαχειριστές"
         everyone: "Όλοι"
       trust_levels:
         title: "Επίπεδο εμπιστοσύνης που δίνεται αυτόματα στα μέλη όταν προστίθενται:"
         none: "Κανένα"
       notifications:
         watching:
-          title: "Παρατηρείται"
-          description: "Θα λαμβάνεις ειδοποιήσεις για κάθε καινούρια δημοσίευση σε κάθε μήνυμα, και η καταμέτρηση των καινούριων απαντήσεων θα εμφανίζεται."
+          title: "Επιτηρείται"
+          description: "Θα λαμβάνεις ειδοποιήσεις για κάθε καινούρια ανάρτηση σε κάθε μήνυμα και θα εμφανίζεται ο αριθμός των καινούριων απαντήσεων ."
         watching_first_post:
-          title: "Παρακολούθηση της πρώτης ανάρτησης"
-          description: "Θα ειδοποιήστε μόνο για την πρώτη ανάρτηση σε κάθε νέο θέμα σε αυτή την ομάδα."
+          title: "Επιτήρηση Πρώτης Ανάρτησης"
+          description: "Θα λαμβάνεις ειδοποιήσεις μόνο για την πρώτη ανάρτηση σε κάθε νέο νήμα σε αυτή την ομάδα."
         tracking:
           title: "Παρακολουθείται"
-          description: "Θα λαμβάνεις ειδοποιήσεις εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα, και η καταμέτρηση των καινούριων απαντήσεων θα εμφανίζεται."
+          description: "Θα λαμβάνεις ειδοποιήσεις εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα και θα εμφανίζεται ο αριθμός των καινούριων απαντήσεων."
         regular:
           title: "Κανονικό"
-          description: "Θα ειδοποιηθείτε αν κάποιος αναφέρει το @name σας ή σας απαντήσει"
+          description: "Θα λαμβάνεις ειδοποιήσεις αν κάποιος αναφέρει το @name σου ή σου απαντήσει"
         muted:
           title: "Σε σιγή"
-          description: "Δε θα λαμβάνεις ποτέ ειδοποιήσεις για οτιδήποτε σχετικά με τις καινούριες δημοσιεύσεις της ομάδας."
-      flair_url: "Avatar Flair εικόνα"
-      flair_url_placeholder: "( προαιρετικό) Εικόνα URL ή Font Awesome κατηγορία "
-      flair_bg_color: "Avatar Flair χρώμα φόντου"
+          description: "Δε θα λαμβάνεις ποτέ ειδοποιήσεις για οτιδήποτε σχετικά με νέα νήματα σε αυτήν την ομάδα."
+      flair_url: "Avatar Flair Εικόνα"
+      flair_url_placeholder: "(Προαιρετικό) URL εικόνας ή Font Awesome class "
+      flair_bg_color: "Avatar Flair Χρώμα Φόντου"
       flair_bg_color_placeholder: "(Προαιρετικό) Τιμή χρώματος Hex"
-      flair_color: "Avatar Flair χρώμα"
+      flair_color: "Avatar Flair Χρώμα"
       flair_color_placeholder: "(Προαιρετικό) Τιμή χρώματος Hex"
-      flair_preview_icon: "Προεπισκόπηση εικονίσματος"
-      flair_preview_image: "Προεπισκόπηση εικόνας"
+      flair_preview_icon: "Εικονίδιο Προεπισκόπησης"
+      flair_preview_image: "Εικόνα Προεπισκόπησης"
       flair_note: "Σημείωση: Το Flair θα εμφανιστεί μονο για την κύρια ομάδα του χρήστη"
     user_action_groups:
-      '1': "«Μου αρέσει» που έδωσα"
-      '2': "«Μου αρέσει» που πήρα"
+      '1': "Αρέσει που Έδωσα"
+      '2': "Αρέσει που Έλαβα"
       '3': "Σελιδοδείκτες"
       '4': "Νήματα"
       '5': "Απαντήσεις"
@@ -442,50 +465,51 @@ el:
       reorder:
         title: "Επαναταξινόμησε τις κατηγορίες"
         title_long: "Αναδιοργάνωση της λίστας κατηγοριών"
-        fix_order: "Σταθερές θέσεις"
-        fix_order_tooltip: "Δε έχουν όλες οι κατηγορίες μοναδικό νούμερο θέσης, το οποίο ίσως προκαλέσει αναπάντεχα αποτελέσματα."
-        save: "Αποθήκευση εντολής"
+        fix_order: "Σταθερές Θέσεις"
+        fix_order_tooltip: "Δεν έχουν όλες οι κατηγορίες μοναδικό νούμερο θέσης, το οποίο ίσως προκαλέσει αναπάντεχα αποτελέσματα."
+        save: "Αποθήκευση Κατάταξης"
         apply_all: "Εφαρμογή"
         position: "Θέση"
       posts: "Αναρτήσεις"
       topics: "Νήματα"
-      latest: "Τελευταία νήματα"
-      latest_by: "τελευταία ανάρτηση από τον/την"
-      toggle_ordering: "Αλλαγή ταξινόμησης"
+      latest: "Πρόσφατες"
+      latest_by: "πρόσφατες από"
+      toggle_ordering: "εναλλαγή ταξινόμησης"
       subcategories: "Υποκατηγορίες"
       topic_sentence:
         one: "1 θέμα"
-        other: "%{count} θέματα"
+        other: "%{count} νήματα"
       topic_stat_sentence:
         one: "%{count} νέο νήμα στα τελευταία %{unit}."
         other: "%{count} νέα νήματα στα τελευταία %{unit}."
     ip_lookup:
-      title: Αναζήτηση διεύθυνσης IP
-      hostname: Όνομα εξυπηρετητή
-      location: Διεύθυνση
+      title: Αναζήτηση Διεύθυνσης IP
+      hostname: Hostname
+      location: Τοποθεσία
       location_not_found: (άγνωστο)
-      organisation: Οργάνωση
+      organisation: Οργανισμός
       phone: Τηλέφωνο
       other_accounts: "Άλλοι λογαριασμοί με αυτή την IP διεύθυνση:"
       delete_other_accounts: "Διαγραφή %{count}"
-      username: "Όνομα χρήστη"
+      username: "όνομα χρήστη"
       trust_level: "TL"
       read_time: "χρόνος ανάγνωσης"
-      topics_entered: "νήματα που είδες"
+      topics_entered: "νήματα που προβλήθηκαν"
       post_count: "# αναρτήσεις"
       confirm_delete_other_accounts: "Είσε σίγουρος ότι θέλεις να διαγράψεις αυτούς τους λογαριασμούς;"
+      powered_by: "powered by <a href='https://ipinfo.io'>ipinfo.io</a>"
     user_fields:
       none: "(διαλέξτε μία επιλογή)"
     user:
       said: "{{username}}:"
       profile: "Προφίλ"
       mute: "Σίγαση"
-      edit: "Επεξεργασία ρυθμίσεων"
+      edit: "Επεξεργασία Ρυθμίσεων"
       download_archive:
-        button_text: "Κάνω λήψη των δημοσιεύσεων μου"
-        confirm: "Είσαι σίγουρος πως θέλεις να κάνεις λήψη των δημοσιεύσεων σου;"
-        success: "Όταν θα αρχίσει να κατεβαίνει το αρχείο, θα ειδοποιηθείται μέσω μυνήματος μόλις ολοκληρωθεί η διαδικασία."
-        rate_limit_error: "Μπορείς να κάνεις λήψη των δημοσιεύσεών σου μια φορά την ημέρα, προσπάθησε ξανά αύριο."
+        button_text: "Λήψη Όλων"
+        confirm: "Είσαι σίγουρος πως θέλεις να κάνεις λήψη των αναρτήσεών σου;"
+        success: "Ξεκίνησε η διαδικασία λήψης. Θα ειδοποιηθείτε μόλις ολοκληρωθεί η διαδικασία."
+        rate_limit_error: "Μπορείς να κάνεις λήψη των αναρτήσεών σου μια φορά την ημέρα, προσπάθησε ξανά αύριο."
       new_private_message: "Νέο Μήνυμα"
       private_message: "Μήνυμα"
       private_messages: "Μηνύματα"
@@ -494,24 +518,27 @@ el:
       expand_profile: "Επέκτεινε"
       bookmarks: "Σελιδοδείκτες"
       bio: "Σχετικά με εμένα"
-      invited_by: "Προσκλήθηκε από τον/την"
-      trust_level: "Επίπεδο εμπιστοσύνης"
+      invited_by: "Προσκλήθηκε Από"
+      trust_level: "Επίπεδο Εμπιστοσύνης"
       notifications: "Ειδοποιήσεις"
-      statistics: "Αναλυτικά στοιχεία"
+      statistics: "Στατιστικά"
       desktop_notifications:
-        label: "Ειδοποιήσεις στην επιφάνεια εργασίας"
+        label: "Ειδοποιήσεις Επιφάνειας Εργασίας"
         not_supported: "Οι ειδοποιήσεις δεν υποστηρίζονται από αυτό το πρόγραμμα περιήγησης. Λυπάμαι."
-        perm_default: "Ενεργοποίησε τις ειδοποιήσεις"
+        perm_default: "Ενεργοποίησε τις Ειδοποιήσεις"
         perm_denied_btn: "Η άδεια απορρίφθηκε"
-        perm_denied_expl: "Απορρίψατε την άδεια για ειδοποιήσεις. Επιτρέψτε τις ειδοποιήσεις μέσω των ρυθμίσεων του φυλλομετρητή σας."
-        disable: "Απενεργοποίηση ειδοποιήσεων"
-        enable: "Ενεργοποίηση ειδοποιήσεων"
-        each_browser_note: "Σημείωση: Έχετε αλλάξει αυτή τη ρύθμιση σε κάθε φυλλομετρητή που χρησιμοποιείτε."
-      dismiss_notifications: "Διώξτα όλα"
+        perm_denied_expl: "Απορρίψατε την άδεια για ειδοποιήσεις. Επιτρέψτε τις ειδοποιήσεις μέσω των ρυθμίσεων του browser σας."
+        disable: "Απενεργοποίηση Ειδοποιήσεων"
+        enable: "Ενεργοποίηση Ειδοποιήσεων"
+        each_browser_note: "Σημείωση: Θα πρέπει να αλλάξετε αυτή τη ρύθμιση σε κάθε browser που χρησιμοποιείτε."
+      dismiss: 'Απόρριψη'
+      dismiss_notifications: "Απόρριψη Όλων"
       dismiss_notifications_tooltip: "Όλες οι αδιάβαστες ειδοποιήσεις να χαρακτηριστούν διαβασμένες"
       first_notification: "Η πρώτη σου ειδοποίηση! Επίλεξε την για να ξεκινήσεις."
-      disable_jump_reply: "Να μην εστιάζεται η ανάρτηση μου αφ' ότου απαντήσω"
-      dynamic_favicon: "Δείξε τον αριθμό νέων/ενημερωμένων αναρτήσεων στο εικονίδιο του προγράμματος περιήγησης"
+      disable_jump_reply: "Να μην εστιάζεται η ανάρτηση μου αφού απαντήσω"
+      dynamic_favicon: "Δείξε τον αριθμό νέων/ενημερωμένων νημάτων στο εικονίδιο του προγράμματος περιήγησης"
+      theme_default_on_all_devices: "Αυτό να γίνει το προεπιλεγμένο θέμα σε όλες μου τις συσκευές"
+      allow_private_messages: "Επίτρεψε στους χρήστες να μου στέλνουν προσωπικά μηνύματα"
       external_links_in_new_tab: "Άνοιγε όλους τους εξωτερικούς συνδέσμους σε νέα καρτέλα"
       enable_quoting: "Το κείμενο που επισημαίνεται να παρατίθεται στην απάντηση "
       change: "αλλαγή"
@@ -519,11 +546,12 @@ el:
       admin: "Ο/Η {{user}} είναι διαχειριστής"
       moderator_tooltip: "Αυτός ο χρήστης είναι συντονιστής"
       admin_tooltip: "Αυτός ο χρήστης είναι διαχειριστής"
-      blocked_tooltip: "Ο χρήστης είναι μπλοκαρισμένος"
-      suspended_notice: "Αυτός ο χρήστης είναι αποκλεισμένος μέχρι τις {{date}}."
+      silenced_tooltip: "Χρήστης σε σιγή"
+      suspended_notice: "Αυτός ο χρήστης είναι σε αποβολή μέχρι τις {{date}}."
+      suspended_permanently: "Ο χρήστης είναι αποβλημένος."
       suspended_reason: "Αιτιολογία:"
       github_profile: "Github"
-      email_activity_summary: "Περίληψη ενεργειών"
+      email_activity_summary: "Περίληψη Ενεργειών"
       mailing_list_mode:
         label: "Λειτουργία ταχυδρομικής λίστας"
         enabled: "Ενεργοποίησε λειτουργία ταχυδρομικής λίστας"
@@ -535,122 +563,135 @@ el:
         many_per_day: "Στείλε μου ένα email για κάθε νέα ανάρτηση (περίπου {{dailyEmailEstimate}} τη μέρα)"
         few_per_day: "Στείλε μου ένα email για κάθε νέα ανάρτηση (περίπου 2 τη μέρα)"
       tag_settings: "Ετικέτες"
-      watched_tags: "Εθεάθη"
-      watched_tags_instructions: "Θα παρακολουθείς αυτόματα όλα τα νήματα με αυτές τις ετικέτες. Θα λαμβάνεις ειδοποιήσεις για όλες τις καινούριες δημοσιεύσεις και νήματα, και η καταμέτρηση των καινούριων δημοσιεύσεων θα εμφανίζεται επίσης δίπλα στο νήμα."
+      watched_tags: "Επιτηρείται"
+      watched_tags_instructions: "Θα επιτηρείς αυτόματα όλα τα νήματα με αυτές τις ετικέτες. Θα λαμβάνεις ειδοποιήσεις για όλες τις καινούριες αναρτήσεις και νήματα και η καταμέτρηση των καινούριων αναρτήσεων θα εμφανίζεται επίσης δίπλα στο νήμα."
       tracked_tags: "Παρακολουθείται"
-      tracked_tags_instructions: "Θα παρακολουθείς αυτόματα όλα τα νήματα με αυτές τις ετικέτες. Η καταμέτρηση των καινούριων δημοσιεύσεων θα εμφανίζεται δίπλα σε αυτό το νήμα."
+      tracked_tags_instructions: "Θα παρακολουθείς αυτόματα όλα τα νήματα με αυτές τις ετικέτες. Η καταμέτρηση των καινούριων αναρτήσεων θα εμφανίζεται δίπλα στο νήμα."
       muted_tags: "Σίγαση"
-      muted_tags_instructions: "Δε θα λαμβάνεις ειδοποιήσεις για τίποτα σχετικά με τα καινούρια νήματα, και δε θα εμφανίζονται στα τελευταία. "
-      watched_categories: "Παρατηρείται"
-      watched_categories_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: "Θα ειδοποιηθείς για την πρώτη δημοσίευση του κάθε καινούριου θέματος με αυτές τις ετικέτες. "
+      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: "Δε θα λαμβάνεις ειδοποιήσεις για τίποτα σχετικά με τις καινούριες δημοσιεύσεις σε αυτές τις κατηγορίες, και δε θα εμφανίζονται στα τελευταία."
-      delete_account: "Διαγραφή του λογαριασμού μου "
-      delete_account_confirm: "Είσαι σίγουρος πως θέλεις να διαγράψεις μόνιμα τον λογαριασμό σου; Αυτή η πράξη είναι μη αναστρέψιμη."
+      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: "Δείξε τα νήματα που παρακολουθούνται"
+      watched_topics_link: "Δείξε τα νήματα που επιτηρούνται"
+      tracked_topics_link: "Δείξτε τα νήματα που παρακολουθούνται"
       automatically_unpin_topics: "Τα νήματα ξεκαρφιτσώνονται αυτόματα όταν φτάνω στο κάτω μέρος."
       apps: "Εφαρμογές"
-      revoke_access: "Ανάκληση πρόσβασης"
-      undo_revoke_access: "Απενεργοποίηση ανάκλησης πρόσβασης"
+      revoke_access: "Ανάκληση Πρόσβασης"
+      undo_revoke_access: "Απενεργοποίηση Ανάκλησης Πρόσβασης"
       api_approved: "Εγκεκριμένο:"
+      theme: "Θέμα"
+      home: "Προεπιλεγμένη Αρχική Σελίδα"
       staff_counters:
         flags_given: "χρήσιμες σημάνσεις"
-        flagged_posts: "Επισημασμένες αναρτήσεις"
-        deleted_posts: "σβησμένες αναρτήσεις"
-        suspensions: "αποκλεισμοί"
+        flagged_posts: "επισημασμένες αναρτήσεις"
+        deleted_posts: "διαγραμμένες αναρτήσεις"
+        suspensions: "αποβολές"
         warnings_received: "προειδοποιήσεις"
       messages:
         all: "Όλα"
         inbox: "Εισερχόμενα"
         sent: "Απεσταλμένα"
         archive: "Αρχείο"
-        groups: "Οι ομάδες μου"
+        groups: "Οι Ομάδες Μου"
         bulk_select: "Επιλογή μηνυμάτων"
         move_to_inbox: "Μετακίνηση στα Εισερχόμενα"
-        move_to_archive: "Αρχείο"
+        move_to_archive: "Αρχειοθέτηση"
         failed_to_move: "Αποτυχία μετακίνησης των επιλεγμένων μηνυμάτων (πιθανόν δεν υπάρχει σύνδεση στο δίκτυο)"
-        select_all: "Επιλογή όλων"
+        select_all: "Επιλογή Όλων"
+      preferences_nav:
+        account: "Λογαριασμός"
+        profile: "Προφίλ"
+        emails: "Emails"
+        notifications: "Ειδοποιήσεις"
+        categories: "Κατηγορίες"
+        tags: "Ετικέτες"
+        interface: "Διεπαφή"
+        apps: "Εφαρμογές"
       change_password:
-        success: "(το μήνυμα ηλεκτρονικού ταχυδρομείου στάλθηκε)"
-        in_progress: "(αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου)"
+        success: "(το email στάλθηκε)"
+        in_progress: "(αποστολή email)"
         error: "(σφάλμα)"
-        action: "Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου για την δημιουργία καινούργιου συνθηματικού"
-        set_password: "Ορισμός συνθηματικού"
+        action: "Αποστολή Email Επαναφοράς Συνθηματικού"
+        set_password: "Ορισμός Συνθηματικού"
         choose_new: "Επιλέξτε νέο κωδικό πρόσβασης"
         choose: "Επιλέξτε έναν κωδικό πρόσβασης"
       change_about:
         title: "Άλλαξε τα «σχετικά με εμένα»"
         error: "Προέκυψε σφάλμα στην αλλαγή της αξίας."
       change_username:
-        title: "Αλλαγή χρηστώνυμου"
-        confirm: "Εάν αλλάξεις το όνομα χρήστη σου, όλες οι προηγούμενες παραθέσεις των δημοσιεύσεων σου και οι αναφορές στο @όνομά σου θα χαθούν. Είσαι απόλυτα βέβαιος πως θέλεις;"
-        taken: "Λυπούμαστε, αυτό το χρηστώνυμο χρησιμοποιείται ήδη."
-        error: "Παρουσιάστηκε σφάλμα κατά την αλλαγή του χρηστώνυμου."
-        invalid: "Αυτό το χρηστώνυμο δεν είναι έγκυρο. Θα πρέπει να αποτελείται μόνο από αριθμούς και γράμματα"
+        title: "Αλλαγή Ονόματος Χρήστη"
+        confirm: "Εάν αλλάξεις το όνομα χρήστη σου, όλες οι προηγούμενες παραθέσεις των αναρτήσεων σου και οι αναφορές στο @όνομά σου θα χαθούν. Είσαι απόλυτα βέβαιος πως θέλεις;"
+        taken: "Λυπούμαστε, αυτό το όνομα χρήστη χρησιμοποιείται ήδη."
+        invalid: "Αυτό το όνομα χρήστη δεν είναι έγκυρο. Θα πρέπει να αποτελείται μόνο από αριθμούς και γράμματα"
       change_email:
-        title: "Αλλαγή διεύθυνσης ηλεκτρονικού ταχυδρομείου"
-        taken: "Λυπούμαστε, αυτή η διεύθυνση ηλεκτρονικού ταχυδρομείου δεν είναι διαθέσιμη."
-        error: "Υπήρξε ένα σφάλμα κατά την αλλαγή της διεύθυνσης ηλεκτρονικού ταχυδρομείου σου. Ίσως αυτή η διεύθυνση είναι ήδη σε χρήση;"
-        success: "Έχουμε στείλει ένα μήνυμα ηλεκτρονικού ταχυδρομείου σε αυτή τη διεύθυνση. Παρακαλούμε ακολούθησε τις οδηγίες επιβεβαίωσης που περιέχει."
+        title: "Αλλαγή διεύθυνσης Email"
+        taken: "Λυπούμαστε, αυτή η διεύθυνση email δεν είναι διαθέσιμη."
+        error: "Υπήρξε ένα σφάλμα κατά την αλλαγή της διεύθυνσης email σου. Ίσως αυτή η διεύθυνση είναι ήδη σε χρήση;"
+        success: "Έχουμε στείλει ένα email σε αυτή τη διεύθυνση. Παρακαλούμε ακολούθησε τις οδηγίες επιβεβαίωσης που περιέχει."
+        success_staff: "Στείλαμε ένα email στην τρέχουσα διεύθυνσή σας. Παρακαλούμε ακολουθήστε τις οδηγίες επικύρωσης."
       change_avatar:
         title: "Αλλαγή της φωτογραφίας του προφίλ σου"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, που βασίζεται σε"
         gravatar_title: "Άλλαξε το άβατάρ σου στην ιστοσελίδα Gravatar "
         refresh_gravatar_title: "Ανανέωσε το Gravatar σου"
         letter_based: "Εικόνα προφίλ που ανέθεσε το σύστημα"
-        uploaded_avatar: "Δική μου εικόνα"
+        uploaded_avatar: "Προσαρμοσμένη εικόνα"
         uploaded_avatar_empty: "Πρόσθεσε μια δική σου εικόνα"
         upload_title: "Ανέβασε την εικόνα σου"
-        upload_picture: "Ανέβασμα εικόνας"
+        upload_picture: "Ανέβασμα Εικόνας"
         image_is_not_a_square: "Προσοχή: Περικόψαμε την εικόνα σου γιατί το ύψος και το πλάτος δεν ήταν ίσα."
         cache_notice: "Έχεις αλλάξει επιτυχώς την εικόνα του προφίλ σου αλλά ίσως πάρει λίγο χρόνο μέχρι να εμφανιστεί εξαιτίας της κρυφής μνήμης του προγράμματος περιήγησης."
       change_profile_background:
-        title: "Φόντο προφίλ"
+        title: "Φόντο Προφίλ"
         instructions: "Οι εικόνες που μπαίνουν στο φόντο του προφίλ σου θα κεντραρίζονται και το προκαθορισμένο πλάτος τους είναι 850px."
       change_card_background:
-        title: "Φόντο της καρτέλας χρήστη"
+        title: "Φόντο Καρτέλας Χρήστη"
         instructions: "Οι εικόνες στο φόντο θα κεντραρίζονται και το προκαθορισμένο πλάτος τους είναι 590px."
       email:
-        title: "Διεύθυνση ηλεκτρονικού ταχυδρομείου"
-        instructions: "Να μην εμφανίζεται ποτέ δημόσια"
-        ok: "Για επιβεβαίωση θα σου στείλουμε ένα μήνυμα ηλεκτρονικού ταχυδρομείου"
-        invalid: "Παρακαλώ δώσε μία έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου"
-        authenticated: "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σου ταυτοποιήθηκε από τον πάροχο {{provider}}"
-        frequency_immediately: "Θα σου στείλουμε αμέσως ηλεκτρονικό μήνυμα, εάν δεν έχεις διαβάσει το θέμα για το οποίο σου στέλνουμε το μήνυμα."
+        title: "Email"
+        instructions: "δεν εμφανίζεται ποτέ δημόσια"
+        ok: "Για επιβεβαίωση θα σου στείλουμε ένα email"
+        invalid: "Παρακαλώ δώσε μία έγκυρη διεύθυνση email"
+        authenticated: "Η διεύθυνση email σου ταυτοποιήθηκε από τον πάροχο {{provider}}"
+        frequency_immediately: "Θα σου στείλουμε αμέσως email, εάν δεν έχεις διαβάσει αυτό για το οποίο σου στέλνουμε το μήνυμα."
         frequency:
           one: "Θα σου στείλουμε ηλεκτρονικό μήνυμα μόνο εάν δε σε έχουμε δει το τελευταίο λεπτό."
           other: "Θα σου στείλουμε ηλεκτρονικό μήνυμα μόνο εάν δεν σε έχουμε δει τα τελευταία {{count}} λεπτά."
       name:
         title: "Όνομα"
-        instructions: "Το ονοματεπώνυμό σου (προαιρετικό)"
-        instructions_required: "Το πλήρες όνομά σου"
+        instructions: "το ονοματεπώνυμό σου (προαιρετικό)"
+        instructions_required: "Το ονοματεπώνυμό σου"
         too_short: "Το όνομά σου είναι πολύ μικρό"
         ok: "Το όνομά σου είναι καλό"
       username:
-        title: "Χρηστώνυμο"
-        instructions: "Μοναδικό, χωρίς κενά, σύντομο"
+        title: "Όνομα Χρήστη"
+        instructions: "μοναδικό, χωρίς κενά, σύντομο"
         short_instructions: "Οι άλλοι μπορούν να αναφερθούν σε σένα με το @{{username}} "
-        available: "Το χρηστώνυμο είναι διαθέσιμο"
-        not_available: "Δεν είναι διαθέσιμο. Τι θα έλεγες για {{suggestion}};"
+        available: "Το όνομα χρήστη είναι διαθέσιμο"
+        not_available: "Δεν είναι διαθέσιμο. Δοκίμασε {{suggestion}};"
         not_available_no_suggestion: "Μη διαθέσιμο "
-        too_short: "Το χρηστώνυμο είναι μικρό"
-        too_long: "Το χρηστώνυμο είναι μεγάλο"
-        checking: "Έλεγχεται αν είναι διαθέσιμο το χρηστώνυμο..."
-        prefilled: "Η διεύθυνση ηλεκτρονικού ταχυδρομείου ταιριάζει με το εγγεγραμμένο χρηστώνυμο"
+        too_short: "Το όνομα χρήστη σου είναι μικρό"
+        too_long: "Το όνομα χρήστη σου είναι μεγάλο"
+        checking: "Έλεγχεται αν το όνομα χρήστη είναι διαθέσιμο..."
+        prefilled: "Η διεύθυνση email ταιριάζει με το εγγεγραμμένο όνομα χρήστη"
       locale:
         title: "Γλώσσα διεπαφής"
         instructions: "Η γλώσσα της διεπαφής. Θα αλλάξει μόλις ανανεωθεί η σελίδα"
@@ -658,51 +699,51 @@ el:
         any: "καθένα"
       password_confirmation:
         title: "Επανάληψη του κωδικού πρόσβασης"
-      last_posted: "Τελευταία ανάρτηση"
-      last_emailed: "Τελευταίο μήνυμα ηλεκτρονικού ταχυδρομείου"
-      last_seen: "Ειδώθηκε"
+      last_posted: "Τελευταία Ανάρτηση"
+      last_emailed: "Τελευταίο email"
+      last_seen: "Εθεάθη"
       created: "Μέλος από"
       log_out: "Αποσύνδεση"
-      location: "Διεύθυνση"
+      location: "Τοποθεσία"
       card_badge:
-        title: "Παράσημο καρτέλας χρήστη"
+        title: "Παράσημο Καρτέλας Χρήστη"
       website: "Ιστοσελίδα"
-      email_settings: "Διεύθυνση ηλεκτρονικού ταχυδρομείου"
+      email_settings: "Email"
       like_notification_frequency:
-        title: "Ειδοποίησε με όταν έχω \"μου αρέσει\""
+        title: "Ειδοποίησέ με όταν έχω \"μου αρέσει\""
         always: "Πάντα"
-        first_time_and_daily: "Πρώτη φορά που η δημοσίευση έχει \"μου αρέσει\" και καθημερινά"
-        first_time: "Πρώτη φορά που η δημοσίευση έχει \"μου αρέσει\""
+        first_time_and_daily: "Πρώτη φορά που μια ανάρτησή έχει \"μου αρέσει\" και καθημερινά"
+        first_time: "Πρώτη φορά που μια ανάρτηση έχει \"μου αρέσει\""
         never: "Ποτέ"
       email_previous_replies:
-        title: "Συμπερίλαβε προηγούμενες απαντήσεις στο κάτω μέρος των ηλεκτρονικών μηνυμάτων"
-        unless_emailed: "Εάν δεν έχει σταλεί προηγουμένως"
+        title: "Συμπερίλαβε προηγούμενες απαντήσεις στο κάτω μέρος των email"
+        unless_emailed: "εάν δεν έχει σταλεί προηγουμένως"
         always: "πάντα"
         never: "ποτέ"
       email_digests:
-        title: "Όταν δεν επισκέπτομαι αυτή τη σελίδα, στείλε μου με ηλεκτρονικό μήνυμα την περίληψη των δημοφιλών νημάτων και απαντήσεων"
+        title: "Όταν δεν επισκέπτομαι αυτή τη σελίδα, στείλε μου με email την περίληψη των δημοφιλών νημάτων και απαντήσεων"
         every_30_minutes: "κάθε 30 λεπτά"
         every_hour: "ωριαία"
         daily: "καθημερινά"
-        every_three_days: "Κάθε τρεις μέρες"
+        every_three_days: "κάθε τρεις μέρες"
         weekly: "εβδομαδιαία"
-        every_two_weeks: "Κάθε τρεις μέρες"
-      include_tl0_in_digests: "Συμπεριλάμβανε περιεχόμενο από νέους χρήστες σε περιληπτικά μηνύματα"
-      email_in_reply_to: "Συμπερίλαβε ένα απόσπασμα της απάντησης για να το δημοσιεύσεις σέ ηλεκτρονικό μήνυμα"
-      email_direct: "Στείλε μου ένα μήνυμα ηλεκτρονικού ταχυδρομείου όταν κάποιος παραθέσει ανάρτησή μου, απαντήσει σε ανάρτησή μου, αναφέρει το @username μου ή με προσκαλεί σε ένα νήμα."
-      email_private_messages: "Στείλε μου ένα μήνυμα ηλεκτρονικού ταχυδρομείου όταν κάποιος που στείλει προσωπικό μήνυμα."
-      email_always: "Στείλε μου ειδοποιήσεις μέσω ηλεκτρονικού μηνύματος όταν είμαι ενεργός στην ιστοσελίδα"
-      other_settings: "Διάφορα"
+        every_two_weeks: "κάθε δύο εβδομάδες"
+      include_tl0_in_digests: "Συμπερίλαβε περιεχόμενο από νέους χρήστες σε περιληπτικά email"
+      email_in_reply_to: "Συμπερίλαβε ένα απόσπασμα της απαντημένης ανάρτησης στο email"
+      email_direct: "Στείλε μου ένα email όταν κάποιος παραθέσει ανάρτησή μου, απαντήσει σε ανάρτησή μου, αναφέρει το @username μου ή με προσκαλεί σε ένα νήμα."
+      email_private_messages: "Στείλε μου ένα email όταν κάποιος μου στείλει προσωπικό μήνυμα."
+      email_always: "Στείλε μου ειδοποιήσεις μέσω email όταν είμαι ενεργός στην ιστοσελίδα"
+      other_settings: "Λοιπά"
       categories_settings: "Κατηγορίες"
       new_topic_duration:
         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 τελευταίες εβδομάδες"
-      auto_track_topics: "Τα νήματα που βλέπω να παρακολουθούνται αυτόματα "
+        after_2_weeks: "δημιουργήθηκαν τις 2 τελευταίες εβδομάδες"
+      auto_track_topics: "Τα νήματα που επισκέπτομαι να παρακολουθούνται αυτόματα "
       auto_track_options:
         never: "ποτέ"
         immediately: "αμέσως"
@@ -713,97 +754,105 @@ el:
         after_4_minutes: "μετά από 4 λεπτά"
         after_5_minutes: "μετά από 5 λεπτά"
         after_10_minutes: "μετά από 10 λεπτά"
-      notification_level_when_replying: "Όταν δημοσιοποιώ ένα νήμα, τοποθέτησε αυτό το νήμα σε"
+      notification_level_when_replying: "Όταν αναρτώ σε ένα νήμα, τοποθέτησε αυτό το νήμα σε"
       invited:
         search: "γράψε για να αναζητήσεις προσκλήσεις..."
         title: "Προσκλήσεις"
-        user: "Προσκεκλημένος χρήστης"
+        user: "Προσκεκλημένος Χρήστης"
         sent: "Απεσταλμένα"
-        none: "Δεν υπάρχουν προσκλήσεις σε εκκρεμότητα να σου δείξω."
+        none: "Δεν υπάρχουν προσκλήσεις σε εκκρεμότητα για προβολή."
         truncated:
           one: "Δείχνοντας την πρώτη πρόσκληση."
-          other: "Δείχνοντας την πρώτη {{count}} προσκλήσεις."
-        redeemed: "Προσκλήσεις που έγιναν αποδεκτές"
-        redeemed_tab: "Εξοφλήθηκε"
-        redeemed_tab_with_count: "Εξοφλήθηκε ({{count}})"
+          other: "Προβάλονται οι πρώτες {{count}} προσκλήσεις."
+        redeemed: "Αποδεκτές Προσκλήσεις"
+        redeemed_tab: "Αποδεκτές"
+        redeemed_tab_with_count: "Αποδεκτές ({{count}})"
         redeemed_at: "Αποδεκτές"
         pending: "Εκρεμείς προσκλήσεις"
-        pending_tab: "Σε εκκρεμότητα"
-        pending_tab_with_count: "Σε εκκρεμότητα ({{count}})"
-        topics_entered: "Νήματα που ειδώθηκαν"
-        posts_read_count: "Διαβασμένες αναρτήσεις"
+        pending_tab: "Εκρεμείς"
+        pending_tab_with_count: "Εκρεμείς ({{count}})"
+        topics_entered: "Προβεβλημένα Νήματα"
+        posts_read_count: "Διαβασμένες Αναρτήσεις"
         expired: "Αυτή η πρόσκληση έχει λήξει."
-        rescind: "Αναίρεση πρόσκλησης"
+        rescind: "Αναίρεση Πρόσκλησης"
         rescinded: "Η πρόσκληση αναιρέθηκε"
-        reinvite: "Επαναποστολή πρόσκλησης"
-        reinvite_all: "Αποστολή ξανά όλων των προσκλήσεων"
+        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}"
+        time_read: "Χρόνος Ανάγνωσης"
+        days_visited: "Μέρες Επίσκεψης"
+        account_age_days: "Ηλικία λογαριασμού σε ημέρες"
+        create: "Αποστολή Πρόσκλησης"
+        generate_link: "Αντιγραφή Συνδέσμου Πρόσκλησης"
+        link_generated: "Η δημιουργία του συνδέσμου πρόσκλησης έγινε επιτυχώς!"
+        valid_for: "Ο σύνδεσμος πρόσκλησης είναι έγκυρος μόνο για αυτή τη διεύθυνση email: %{email}"
         bulk_invite:
-          none: "Δεν έχετε προσκαλέσει κανέναν ακόμα. Στείλτε ατομικές προσκλήσεις, ή καλέστε πολλά άτομα με τη μία <a href='https://meta.discourse.org/t/send-bulk-invites/16468'> μεταφορτώνοντας ένα αρχείο CSV </a>."
+          none: "Δεν έχετε προσκαλέσει κανέναν ακόμα. Στείλτε ατομικές προσκλήσεις ή καλέστε πολλά άτομα με τη μία <a href='https://meta.discourse.org/t/send-bulk-invites/16468'> μεταφορτώνοντας ένα αρχείο CSV</a>."
           text: "Ομαδική πρόσκληση από αρχείο"
           success: "Το αρχείο ανέβηκε. Θα ενημερωθείς με ένα μήνυμα όταν ολοκληρωθεί η διαδικασία."
           error: "Λυπούμαστε, το αρχείο πρέπει να έχει την μορφή CSV."
       password:
-        title: "Κωδικός πρόσβασης"
+        title: "Κωδικός Πρόσβασης"
         too_short: "Ο κωδικός πρόσβασης είναι μικρός."
         common: "Ο κωδικός πρόσβασης είναι πολύ κοινός."
-        same_as_username: "Ο κωδικός πρόσβασης που έδωσες είναι ο ίδιος με το χρηστώνυμο."
-        same_as_email: "Ο κωδικός πρόσβασής σου είναι ίδιος με τη διεύθυνση ηλεκτρονικού ταχυδρομείου σου."
+        same_as_username: "Ο κωδικός πρόσβασης που έδωσες είναι ο ίδιος με το όνομα χρήστη."
+        same_as_email: "Ο κωδικός πρόσβασής σου είναι ίδιος με τη διεύθυνση email σου."
         ok: "Ο κωδικός πρόσβασης φαίνεται καλός."
         instructions: "τουλάχιστον %{count} χαρακτήρες"
       summary:
         title: "Περίληψη"
         stats: "Στατιστικά"
         time_read: "χρόνος ανάγνωσης"
+        recent_time_read: "πρόσφατος χρόνος ανάγνωσης"
         topic_count:
-          one: "τα θέματα"
-          other: "τα θέματα δημιουργήθηκαν"
+          one: "δημιουργημένο θέμα"
+          other: "δημιουργημένα θέματα"
         post_count:
-          one: "οι δημοσιεύσεις"
-          other: "οι δημοσιεύσεις δημιουργήθηκαν"
+          one: "δημιουργημένη ανάρτηση"
+          other: "δημιουργημένες αναρτήσεις"
         likes_given:
-          one: "<i class='fa fa-heart'></i> δεδομένο"
-          other: "<i class='fa fa-heart'></i> δεδομένο"
+          one: "δόθηκε"
+          other: "δόθηκαν"
         likes_received:
-          one: "<i class='fa fa-heart'></i> ελήφθη"
-          other: "<i class='fa fa-heart'></i> ελήφθη"
+          one: "ελήφθη"
+          other: "ελήφθησαν"
         days_visited:
-          one: "ημέρα που επισκέφτηκες"
-          other: "ημέρες που επισκέφτηκες"
+          one: "ημέρα επίσκεψης"
+          other: "ημέρες επίσκεψης"
+        topics_entered:
+          one: "νήμα προβλήθηκε"
+          other: "νήματα προβλήθηκαν"
         posts_read:
-          one: "η δημοσίευση διαβάστηκε"
-          other: "οι δημοσιεύσεις διαβάστηκαν"
+          one: "διαβασμένη ανάρτηση"
+          other: "διαβασμένες αναρτήσεις"
         bookmark_count:
           one: "σελιδοδείκτης"
           other: "σελιδοδείκτες"
-        top_replies: "Κορυφαίες απαντήσεις"
+        top_replies: "Κορυφαίες Απαντήσεις"
         no_replies: "Καμία απάντηση ακόμα."
         more_replies: "Περισσότερες Απαντήσεις"
-        top_topics: "Κορυφαία Θέματα"
-        no_topics: "Κανένα θέμα ακόμα."
-        more_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: "Περισσότερα απαντήθηκαν προς"
+        most_liked_by: "Περισσότερα \"Μου αρέσει\" από"
+        most_liked_users: "Περισσότερα \"Μου αρέσει\""
+        most_replied_to_users: "Περισσότερες απαντήσεις προς"
         no_likes: "Κανένα μου αρέσει ακόμα."
-      associated_accounts: "Συνδέσεις χρηστών"
+      associated_accounts: "Συνδέσεις"
       ip_address:
         title: "Τελευταία διεύθυνση IP"
       registration_ip_address:
-        title: "Καταχώρηση διεύθυνσης IP"
+        title: "Διεύθυνσης IP Εγγραφής"
       avatar:
         title: "Εικόνα προφίλ"
         header_title: "προφίλ, μηνύματα, σελιδοδείκτες και προτιμήσεις"
@@ -814,15 +863,15 @@ el:
       stream:
         posted_by: "Αναρτήθηκε από"
         sent_by: "Στάλθηκε από"
-        private_message: "Μήνυμα"
+        private_message: "μήνυμα"
         the_topic: "το νήμα"
     loading: "Φόρτωση... "
     errors:
-      prev_page: "στο ανέβασμα"
+      prev_page: "κατά το φόρτωμα"
       reasons:
-        network: "Σφάλμα δικτύου"
-        server: "Σφάλμα διακομιστή"
-        forbidden: "Άρνηση πρόβασης"
+        network: "Σφάλμα Δικτύου"
+        server: "Σφάλμα Διακομιστή"
+        forbidden: "Άρνηση Πρόσβασης"
         unknown: "Σφάλμα"
         not_found: "Η σελίδα δεν βρέθηκε"
       desc:
@@ -835,27 +884,27 @@ el:
       buttons:
         back: "Πίσω"
         again: "Δοκίμασε ξανά"
-        fixed: "Φόρτωση σελίδας"
+        fixed: "Φόρτωση Σελίδας"
     close: "Κλείσιμο"
     assets_changed_confirm: "Αυτή η ιστοσελίδα μόλις ενημερώθηκε. Να ανανεωθεί τώρα για να φανεί η τελευταία έκδοση;"
     logout: "Αποσυνδέθηκες."
     refresh: "Ανανέωση"
     read_only_mode:
       enabled: "Αυτή η ιστοσελίδα είναι σε λειτουργία μόνο ανάγνωσης. Παρακαλώ συνέχισε να κάνεις περιήγηση, όμως το να απαντάς να πατάς \"μου αρέσει\" και κάποιες άλλες λειτουργίες δεν είναι διαθέσιμες τώρα."
-      login_disabled: "Η δυνατότητα σύνδεσης έχει απενεργοποιηθεί για όσο το φόρουμ είναι σε κατάσταση μόνο ανάγνωσης."
+      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_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}. "
+      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:
         one: "1 σφάλματα/%{duration}"
         other: "%{count} σφάλματα/%{duration}"
     learn_more: "μάθε περισσότερα..."
     all_time: 'σύνολο'
-    all_time_desc: 'δημιουργήθηκαν συνολικά νήματα'
+    all_time_desc: 'συνολικά δημιουργημένα νήματα'
     year: 'έτος'
     year_desc: 'νήματα που έχουν δημιουργηθεί τις τελευταίες 365 ημέρες'
     month: 'μήνας'
@@ -866,7 +915,11 @@ el:
     first_post: Πρώτη ανάρτηση
     mute: Σίγαση
     unmute: Αναίρεση σίγασης
-    last_post: Τελευταία ανάρτηση
+    last_post: Αναρτήθηκε
+    time_read: Διαβάστηκε
+    time_read_recently: '%{time_read} πρόσφατα'
+    time_read_tooltip: '%{time_read} συνολικός χρόνος ανάγνωσης'
+    time_read_recently_tooltip: '%{time_read}συνολικός χρόνος ανάγνωσης (%{recent_time_read} τις τελευταίες 60 ημέρες)'
     last_reply_lowercase: τελευταία απάντηση
     replies_lowercase:
       one: απάντηση
@@ -875,14 +928,14 @@ el:
       sign_up: "Εγγραφή"
       hide_session: "Υπενθύμιση αύριο"
       hide_forever: "όχι ευχαριστώ"
-      hidden_for_session: "Εντάξει, θα σε ρωτήσω αύριο. Μπορείς πάντα να χρησιμοποιείς τη \"Σύνδεση\" και για να δημιουργήσεις ένα λογαριασμό."
-      intro: "Γεια σου! :heart_eyes: Φαίνεται να απολαμβάνεις τη συζήτηση, όμως δεν έχεις εγγραφεί σε ένα λογαριασμό."
-      value_prop: "Όταν δημιουργείς έναν λογαριασμό, θυμόμαστε ακριβώς τι έχεις διαβάσει, έτσι ώστε πάντα να επιστρέφεις όπου είχες μείνει. Επίσης, λαμβάνεις ειδοποιήσεις, εδώ και μέσω ηλεκτρονικού μηνύματος, κάθε φορά που δημιουργούνται καινούριες δημοσιεύσεις. Και μπορείς να πατήσεις \"μου αρέσει\" στις δημοσιεύσεις για να μοιραστείς την αγάπη. :heartbeat:"
+      hidden_for_session: "Εντάξει, θα σε ρωτήσω αύριο. Μπορείς πάντα να χρησιμοποιείς τη \"Σύνδεση\" για να δημιουργήσεις ένα λογαριασμό."
+      intro: "Γεια σου! :heart_eyes: Φαίνεται να απολαμβάνεις τη συζήτηση, όμως δεν έχεις δημιουργήσει ακόμα δικό σου λογαριασμό."
+      value_prop: "Όταν δημιουργείς έναν λογαριασμό, θυμόμαστε ακριβώς τι έχεις διαβάσει, έτσι ώστε πάντα να επιστρέφεις όπου είχες μείνει. Επίσης, λαμβάνεις ειδοποιήσεις, εδώ και μέσω email, κάθε φορά που δημιουργούνται καινούριες αναρτήσεις. Επίσης μπορείς να πατήσεις \"μου αρέσει\" στις αναρτήσεις για να μοιραστείς την αγάπη. :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: "Αυτό το νήμα περιέχει σβησμένες αναρτήσεις, οι οποίες αποκρύπτονται."
@@ -892,52 +945,60 @@ el:
     private_message_info:
       title: "Μήνυμα"
       invite: "Προσκάλεσε άλλους..."
-      remove_allowed_user: "Θες στ' αλήθεια να αφαιρέσεις τον/την {{name}} από αυτή τη συζήτηση;"
-      remove_allowed_group: "Θέλεις πραγματικά να απομακρύνεις {{name}} από αυτό το μήνυμα;"
-    email: 'Διεύθυνση ηλεκτρονικού ταχυδρομείου'
-    username: 'Χρηστώνυμο'
-    last_seen: 'Ειδώθηκε'
+      leave_message: "Σίγουρα θελετε να αφήσετε αυτό το μήνυμα;"
+      remove_allowed_user: "Θέλεις σίγουρα να αφαιρέσεις τον/την {{name}} από αυτή τη συζήτηση;"
+      remove_allowed_group: "Θέλεις σίγουρα να αφαιρέσεις τον/την {{name}} από αυτό το μήνυμα;"
+    email: 'Email'
+    username: 'Όνομα Χρήστη'
+    last_seen: 'Εθεάθη'
     created: 'Δημιουργήθηκε'
     created_lowercase: 'δημιουργήθηκε'
-    trust_level: 'Επίπεδο εμπιστοσύνης'
-    search_hint: 'χρηστώνυμο, διεύθυνση ηλεκτρονικού ταχυδρομείου ή IP διεύθυνση'
+    trust_level: 'Επίπεδο Εμπιστοσύνης'
+    search_hint: 'όνομα χρήστη, email ή IP διεύθυνση'
     create_account:
-      disclaimer: "Κάνοντας εγγραφή συμφωνείς με την <a href='{{privacy_link}}'> πολιτική προστασίας προσωπικών δεδομένων</a> και <ahref='{{tos_link}}'> με τους όρους υπηρεσίας</a>."
-      title: "Δημιουργία νέου λογαριασμού"
-      failed: "Κάτι πήγε στραβά. Ίσως αυτή η διεύθυνση ηλεκτρονικού ταχυδρομείου να είναι ήδη δηλωμένη. Δοκίμασε το σύνδεσμο «ξέχασα τον κωδικό μου»."
+      disclaimer: "Κάνοντας εγγραφή συμφωνείς με την <a href='{{privacy_link}}'>πολιτική ιδιωτικότητας</a> και με τους <a href='{{tos_link}}'>όρους χρήσης</a>."
+      title: "Δημιουργία Λογαριασμού"
+      failed: "Κάτι πήγε στραβά. Ίσως αυτή η διεύθυνση email να είναι ήδη δηλωμένη. Δοκίμασε την λειτουργία «ξέχασα τον κωδικό μου»."
     forgot_password:
       title: "Επαναφορά Κωδικού"
       action: "Ξέχασα τον κωδικό πρόσβασής μου"
-      invite: "Δώσε το χρηστώνυμό σου ή την διεύθυνση ηλεκτρονικού ταχυδρομείου σου, και θα σου στείλουμε ένα μήνυμα ηλεκτρονικού ταχυδρομείου για να ορίσεις νέο κωδικό πρόσβασης."
-      reset: "Επαναφορά κωδικού πρόσβασης"
-      complete_username: "Αν υπάρχει λογαριασμός με το χρηστώνυμο <b>%{username}</b>, σε λίγο θα λάβεις ένα μήνυμα ηλεκτρονικού ταχυδρομείου με οδηγίες για το πως να ορίσεις νέο κωδικό πρόσβασης."
-      complete_email: "Αν υπάρχει λογαριασμός με τη διεύθυνση <b>%{email}</b>, σε λίγο θα λάβεις ένα μήνυμα ηλεκτρονικού ταχυδρομείου με οδηγίες για το πως να ορίσεις νέο κωδικό πρόσβασης."
-      complete_username_found: "Βρήκαμε έναν λογαριασμό με το χρηστώνυμο <b>%{username}</b>. Σε λίγο θα λάβεις ένα μήνυμα ηλεκτρονικού ταχυδρομείου με οδηγίες για το πως να ορίσεις νέο κωδικό πρόσβασης."
-      complete_email_found: "Βρήκαμε έναν λογαριασμό με τη διεύθυνση <b>%{email}</b>. Σε λίγο θα λάβεις ένα μήνυμα ηλεκτρονικού ταχυδρομείου με οδηγίες για το πως να ορίσεις νέο κωδικό πρόσβασης."
-      complete_username_not_found: "Δεν υπάρχει λογαριασμός με το χρηστώνυμο <b>%{username}</b>"
+      invite: "Δώσε το όνομα χρήστη σου ή την διεύθυνση email σου και θα σου στείλουμε ένα email για να ορίσεις νέο κωδικό πρόσβασης."
+      reset: "Επαναφορά Κωδικού Πρόσβασης"
+      complete_username: "Αν βρεθεί λογαριασμός με το όνομα χρήστη <b>%{username}</b>, σύντομα θα λάβεις ένα email με οδηγίες για το πως να ορίσεις νέο κωδικό πρόσβασης."
+      complete_email: "Αν υπάρχει λογαριασμός με τη διεύθυνση <b>%{email}</b>, σε λίγο θα λάβεις ένα email με οδηγίες για το πως να ορίσεις νέο κωδικό πρόσβασης."
+      complete_username_found: "Βρήκαμε έναν λογαριασμό με το όνομα χρήστη <b>%{username}</b>. Σύντομα θα λάβεις ένα email με οδηγίες για το πως να ορίσεις νέο κωδικό πρόσβασης."
+      complete_email_found: "Βρήκαμε έναν λογαριασμό με τη διεύθυνση <b>%{email}</b>. Σε λίγο θα λάβεις ένα email με οδηγίες για το πως να ορίσεις νέο κωδικό πρόσβασης."
+      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: "Χρηστώνυμο"
-      password: "Κωδικός πρόσβασης"
-      email_placeholder: "διεύθυνση ηλεκτρονικού ταχυδρομείου ή χρηστώνυμο"
+      username: "Όνομα Χρήστη"
+      password: "Κωδικός Πρόσβασης"
+      email_placeholder: "διεύθυνση email ή όνομα χρήστη"
       caps_lock_warning: "Είναι ενεργά τα ΚΕΦΑΛΑΙΑ"
       error: "Άγνωστο σφάλμα"
       rate_limit: "Παρακαλώ περιμένετε προτού προσπαθήσετε ξανά να συνδεθείτε."
-      blank_username_or_password: "Παρακαλώ δώσε την διεύθυνση ηλεκτρονικού ταχυδρομείου σου ή το χρηστώνυμό σου και τον κωδικό πρόσβασής σου."
-      reset_password: 'Επαναφορά κωδικού πρόσβασης'
-      logging_in: "Συνδέεσε..."
+      blank_username_or_password: "Παρακαλώ δώσε την διεύθυνση email σου ή το όνομα χρήστη σου καθώς και τον κωδικό πρόσβασής σου."
+      reset_password: 'Επαναφορά Κωδικού Πρόσβασης'
+      logging_in: "Σύνδεση..."
       or: "Ή"
       authenticating: "Ταυτοποιώ..."
       awaiting_activation: "Ο λογαριασμός σας αναμένει ενεργοποίηση, χρησιμοποιήστε τον σύνδεσμο ξεχασμένου συνθηματικού για δημιουργία νέου email ενεργοποίησης."
-      awaiting_approval: "Ο λογαριασμός σου δεν έχει εγκριθεί από κανέναν συνεργάτη ακόμη. Θα λάβεις ένα μήνυμα ηλεκτρονικού ταχυδρομείου όταν γίνει αυτό."
+      awaiting_approval: "Ο λογαριασμός σου δεν έχει εγκριθεί από κανέναν συνεργάτη ακόμη. Θα λάβεις ένα email όταν εγκριθεί."
       requires_invite: "Λυπούμαστε, αλλά η πρόσβαση σε αυτό το φόρουμ είναι δυνατή μόνο με πρόσκληση."
-      not_activated: "Δεν γίνεται να συνδεθείς ακόμη. Έχουμε ήδη στείλει ένα μήνυμα με οδηγίες στη διεύθυνση <b>{{sentTo}}</b>. Ακολούθησε τις οδηγίες σε αυτό το μήνυμα για να ενεργοποιήσεις το λογαριασμό σου."
+      not_activated: "Δεν γίνεται να συνδεθείς ακόμη. Έχουμε ήδη στείλει ένα email με οδηγίες ενεργοποίησης στη διεύθυνση <b>{{sentTo}}</b>. Ακολούθησε τις οδηγίες σε αυτό το μήνυμα για να ενεργοποιήσεις το λογαριασμό σου."
       not_allowed_from_ip_address: "Δεν μπορείς να συνδεθείς από αυτή τη διεύθυνση IP."
       admin_not_allowed_from_ip_address: "Από αυτή τη διεύθυνση IP δεν επιτρέπεται να συνδεθείς ως διαχειριστής."
-      resend_activation_email: "Πάτησε εδώ για να σταλεί ξανά το μήνυμα ενεργοποίησης."
-      sent_activation_email_again: "Στάλθηκε ένα ακόμα μήνυμα ενεργοποίησης στο <b>{{currentEmail}}</b>. Θα χρειαστούν κάποια λεπτά για να το λάβεις, βεβαιώσου ότι έλεγξες και το φάκελο ανεπιθύμητης αλληλογραφίας."
-      to_continue: "Παρακαλώ συνδεθείτε"
+      resend_activation_email: "Πάτησε εδώ για να σταλεί ξανά το email ενεργοποίησης."
+      resend_title: "Επαναποστολή Email Ενεργοποίησης"
+      change_email: "Αλλαγή Διεύθυνσης Email"
+      provide_new_email: "Καταχωρήστε μια νέα διεύθυνση και θα σας στείλουμε εκ νέου το email ενεργοποίησης."
+      submit_new_email: "Ενημέρωση Διεύθυνσης Email"
+      sent_activation_email_again: "Στάλθηκε ένα ακόμα email ενεργοποίησης στο <b>{{currentEmail}}</b>. Θα χρειαστούν κάποια λεπτά για να το λάβεις, βεβαιώσου ότι έλεγξες και το φάκελο ανεπιθύμητης αλληλογραφίας."
+      to_continue: "Παρακαλώ Συνδεθείτε"
       preferences: "Πρέπει να συνδεθείς για να αλλάξεις τις προτιμήσεις χρήστη."
       forgot: "Δεν θυμάμαι τις λεπτομέρειες του λογαριασμού μου"
       not_approved: "Ο λογαριασμός σας δεν έχει εγκριθεί ακόμα. Θα ειδοποιηθείτε με email όταν είστε έτοιμοι να συνδεθείτε."
@@ -951,8 +1012,8 @@ el:
         title: "μέσω του Twitter"
         message: "Ταυτοποίηση μέσω του Twitter (βεβαιώσου πως δεν έχει ενεργοποιηθεί το μπλοκάρισμα των αναδυόμενων παραθύρων)"
       instagram:
-        title: "με το Instagram"
-        message: "Πιστοποίηση της αυθεντικότητας μέσω του Instagram (βεβαίωσε ότι το μπλοκάρισμα αναδυόμενων παραθύρων δεν είναι ενεργό)"
+        title: "μέσω του Instagram"
+        message: "Ταυτοποίηση μέσω του Instagram (βεβαιώσου πως δεν έχει ενεργοποιηθεί το μπλοκάρισμα των αναδυόμενων παραθύρων)"
       facebook:
         title: "μέσω του Facebook"
         message: "Ταυτοποίηση μέσω του Facebook (βεβαιώσου πως δεν έχει ενεργοποιηθεί το μπλοκάρισμα των αναδυόμενων παραθύρων)"
@@ -964,38 +1025,65 @@ el:
         message: "Ταυτοποίηση μέσω του Github (βεβαιώσου πως δεν έχει ενεργοποιηθεί το μπλοκάρισμα των αναδυόμενων παραθύρων)"
     invites:
       accept_title: "Πρόσκληση"
-      welcome_to: "Καλώς ήλθατε στο %{site_name}!"
+      welcome_to: "Καλώς ήλθατε στην %{site_name}!"
       invited_by: "Προσκληθήκατε από:"
-      social_login_available: "Θα μπορούσατε επίσεις να συνδεθείτε μέσω οποιοδήποτε μέσoυ κοινωνικής δικτύωσης χρησημοποιώντας αυτή την διεύθυνση ηλεκτρονικού ταχυδρομείου."
-      your_email: "Η διεύθυνση ηλεκτρονικού ταχυδρομείου του λογαριασμού σας είναι <b>%{email}</b>."
-      accept_invite: "Αποδοχή πρόσκλησης"
+      social_login_available: "Μπορείτε επίσης να συνδεθείτε μέσω λογαριασμών κοινωνικής δικτύωσης στους οποίους χρησιμοποιείτε αυτό το email."
+      your_email: "Η διεύθυνση 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: "Κατηγορίες με Προτεινόμενα Θέματα"
-      categories_and_latest_topics: "Κατηγορίες και Τελευταία Θέματα"
+      categories_with_featured_topics: "Κατηγορίες με Προτεινόμενα Νήματα"
+      categories_and_latest_topics: "Κατηγορίες και Τελευταία Νήματα"
     shortcut_modifier_key:
       shift: ' Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: Επιλογή...
+      no_content: Δεν βρέθηκαν αποτελέσματα
+      filter_placeholder: Αναζήτηση...
+      create: "Δημιουργία {{content}}"
+    emoji_picker:
+      filter_placeholder: Αναζήτηση για emoji
+      people: Άνθρωποι
+      nature: Φύση
+      food: Τροφή
+      activity: Δραστηριότητα
+      travel: Ταξίδια
+      objects: Αντικείμενα
+      celebration: Γιορτή
+      custom: Προσαρμοσμένα emojis
+      recent: Πρόσφατα χρησιμοποιημένα
+      default_tone: Χωρίς απόχρωση επιδερμίδας
+      light_tone: Λευκή απόχρωση επιδερμίδας
+      medium_light_tone: Ανοιχτόχρωμη απόχρωση επιδερμίδας
+      medium_tone: Μέτρια απόχρωση επιδερμίδας
+      medium_dark_tone: Σκουρόχρωμη απόχρωση επιδερμίδας
+      dark_tone: Σκούρη απόχρωση επιδερμίδας
     composer:
       emoji: "Emoji :)"
       more_emoji: "περισσότερα..."
       options: "Επιλογές"
-      whisper: "ψιθυρίζω"
-      unlist: "μη καταχωρημένος"
+      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,200 +1092,196 @@ 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}} αλλά δεν θα λάβουν ειδοποίηση, επειδή δεν μπορούν να δουν αυτό το προσωπικό μήνυμα. Πρέπει να τους προσκαλέσεις σε αυτό το ιδιωτικό μήνυμα."
+        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: "Απάντηση στο αρχικό νήμα"
-      reply_here: "Απάντησε εδώ"
+      reply_here: "Απάντησε Εδώ"
       reply: "Απάντηση"
       cancel: "Ακύρωση"
-      create_topic: "Δημιουργία Θέματος"
+      create_topic: "Δημιουργία Νήματος"
       create_pm: "Μήνυμα"
+      create_whisper: "Ψυθίρισμα"
       title: "Ή πάτα Ctrl+Enter"
       users_placeholder: "Προσθήκη χρήστη"
-      title_placeholder: "Ποίο είναι το περιεχόμενο της συζήτησης σε μία σύντομη πρόταση;"
+      title_placeholder: "Τι αφορά αυτή η συζήτησης σε μία σύντομη πρόταση;"
       title_or_link_placeholder: "Πληκτρολόγησε τίτλο, ή κάνε επικόλληση ένα σύνδεσμο εδώ"
       edit_reason_placeholder: "γιατί αναθεωρείς;"
       show_edit_reason: "(δώσε αιτιολόγηση για την επεξεργασία) "
       topic_featured_link_placeholder: "Εισάγετε τον συνδέσμο που εμφανίζεται με τον τίτλο"
-      reply_placeholder: "Πληκτρολόγισε εδώ. Χρησιμοποίησε την μορφή Markdown, BBCode, ή HTML. Σύρε ή κόλλησε εικόνες."
+      reply_placeholder: "Πληκτρολόγησε εδώ. Χρησιμοποίησε την μορφή Markdown, BBCode, ή HTML. Σύρε ή επικόλλησε εικόνες."
       view_new_post: "Δες τη νέα σου ανάρτηση."
       saving: "Αποθηκεύεται"
       saved: "Αποθηκεύτηκε!"
-      saved_draft: "Μια ανάρτηση είναι σε φάση επεξεργασίας. Πάτα εδώ για να συνεχίσεις."
+      saved_draft: "Η ανάρτηση είναι σε φάση επεξεργασίας. Πάτα εδώ για να συνεχίσεις."
       uploading: "Ανεβαίνει..."
-      show_preview: 'εμφάνιση της προεπισκόπησης &raquo;'
-      hide_preview: '&laquo; απόκρυψη της προεπισκόπησης'
+      show_preview: 'εμφάνιση προεπισκόπησης &raquo;'
+      hide_preview: '&laquo; απόκρυψη προεπισκόπησης'
       quote_post_title: "Παράθεση ολόκληρης την ανάρτησης"
-      bold_label: "Β"
+      bold_label: "B"
       bold_title: "Έντονα"
-      bold_text: "Έντονη γραφή"
-      italic_label: "Ι"
+      bold_text: "έντονη γραφή"
+      italic_label: "I"
       italic_title: "Έμφαση"
       italic_text: "κείμενο σε έμφαση"
-      link_title: "Σύνδεσμος"
+      link_title: "Υπερσύνδεσμος"
       link_description: "δώσε εδώ μια περιγραφή για το σύνδεσμο"
-      link_dialog_title: "Εισαγωγή υπερσύνδεσμου"
+      link_dialog_title: "Εισαγωγή Υπερσύνδεσμου"
       link_optional_text: "προαιρετικός τίτλος"
       link_url_placeholder: "http://example.com"
-      quote_title: "Παράθεση"
-      quote_text: "Παράθεση"
+      quote_title: "Μπλοκ Κειμένου"
+      quote_text: "Μπλοκ κειμένου σε παράθεση"
       code_title: "Προ-διαμορφωμένο κείμενο"
       code_text: "το προ-διαμορφωμένο κείμενο να μπει σε εσοχή με 4 κενά"
-      paste_code_text: "Πληκτρολογήστε ή επικολλήστε τον κώδικα εδώ"
+      paste_code_text: "πληκτρολογήστε ή επικολλήστε τον κώδικα εδώ"
       upload_title: "Ανέβασμα"
-      upload_description: "δώσε μια περιγραφή του ανεβάσματος"
+      upload_description: "δώσε μια περιγραφή για την μεταφόρτωση"
       olist_title: "Αριθμημένη λίστα"
       ulist_title: "Κουκίδες"
       list_item: "Στοιχείο Λίστας"
-      heading_label: "Η"
-      heading_title: "Επικεφαλίδα"
-      heading_text: "Επικεφαλίδα"
-      hr_title: "Οριζόντια γραμμή"
-      help: "Βοήθεια για το Markdown"
-      toggler: "Εμφάνιση ή απόκρυψη του παραθύρου συγγραφής"
-      modal_ok: "Εντάξει"
+      help: "Βοήθεια Επεξεργασίας Markdown"
+      modal_ok: "OK"
       modal_cancel: "Ακύρωση"
       cant_send_pm: "Λυπούμαστε, δεν μπορείτε να στείλετε μήνυμα στο χρήστη %{username}."
       yourself_confirm:
         title: "Ξεχάσατε να προσθέσετε αποδέκτες;"
-        body: "Αυτή τη στιγμή το ηλεκτρονικό μήνυμα στέλνεται μόνο σε εσάς!"
-      admin_options_title: "Προαιρετικές ρυθμίσεις προσωπικού για αυτό το θέμα"
+        body: "Αυτή τη στιγμή το μήνυμα στέλνεται μόνο σε εσάς!"
+      admin_options_title: "Προαιρετικές ρυθμίσεις συνεργατών για αυτό το νήμα"
     notifications:
       title: "ειδοποιήσεις για αναφορές στο @name, απαντήσεις στις αναρτήσεις σου και στα νήματά σου, προσωπικά μηνύματα, κλπ."
       none: "Αυτή τη στιγμή δεν είναι δυνατόν να φορτωθούν οι ειδοποιήσεις."
       empty: "Δεν βρέθηκαν ειδοποιήσεις."
-      more: "Εμφάνιση παλιότερων ειδοποιήσεων"
+      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> "
-      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> "
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} και 1 άλλος</span> {{description}}</p>"
-        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> αποδέχτηκε την πρόσκληση</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> "
+        one: "<span>{{username}}, {{username2}} και 1 ακόμα</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} και {{count}} ακόμα</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> αποδέχτηκε την  πρόσκλησή σου"
+      moved_post: "<span>{{username}}</span> μετακίνησε {{description}}"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "Έλαβες '{{description}}'"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>Νέο Νήμα</span> {{description}}"
       group_message_summary:
-        one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} μηνύματα στα {{group_name}} εισερχόμενά σου</p>"
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} μηνύματα στα {{group_name}} εισερχόμενά σου</p> "
+        one: "{{count}} μήνυμα στα εισερχόμενα της ομάδας {{group_name}}"
+        other: "{{count}} μηνύματα στα εισερχόμενα της ομάδας {{group_name}} "
       alt:
         mentioned: "Αναφέρθηκε από"
-        quoted: "Απόσπασμα από "
+        quoted: "Παράθεση από "
         replied: "Απαντήθηκε"
-        posted: "Δημοσίευση από"
-        edited: "Επεξεργασία της δημοσίευσης από"
-        liked: "Η δημοσίευσή σου έχει \"μου αρέσει\""
+        posted: "Ανάρτηση από"
+        edited: "Επεξεργασία της ανάρτησής σου από"
+        liked: "Η ανάρτησή σου έχει \"μου αρέσει\""
         private_message: "Προσωπικό μήνυμα από"
-        invited_to_private_message: "Πρόσκληση σε προσωπικό μήνυμα από"
-        invited_to_topic: "Πρόσκληση σε θέμα από"
+        invited_to_private_message: "Προσκλήθηκε σε προσωπικό μήνυμα από"
+        invited_to_topic: "Προσκλήθηκε στο νήμα από"
         invitee_accepted: "Η πρόσκληση έγινε δεκτή από"
-        moved_post: "Η δημοσίευση σου μετακινήθηκε από"
-        linked: "Σύνδεση στη δημοσίευσή σου"
-        granted_badge: "Χορηγήθηκε σήμα"
+        moved_post: "Η ανάρτησή σου μετακινήθηκε από"
+        linked: "Σύνδεση στην ανάρτησή σου"
+        granted_badge: "Χορηγήθηκε παράσημο"
         group_message_summary: "Μηνύματα στα εισερχόμενα ομάδας"
       popup:
-        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}}'
+        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: "Προσθήκη εικόνας ή αρχείου"
       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: "μπορείς επίσης να μεταφέρεις ή να επικόλλησεις εικόνες από τον συντάκτη"
+      local_tip_with_attachments: "επίλεξε εικόνες ή αρχεία από τη συσκευή σου {{authorized_extensions}}"
+      hint: "(μπορείς επίσης να τα σύρεις με το ποντίκι στον editor για να τα ανεβάσεις)"
+      hint_for_supported_browsers: "μπορείς επίσης να σύρεις ή να επικόλλησεις εικόνες στον editor"
       uploading: "Ανεβαίνει"
-      select_file: "Επιλογή Φακέλου"
+      select_file: "Επιλογή Αρχείου"
       image_link: "υπερσύνδεσμος στον οποίο θα δείχνει η εικόνα σου"
     search:
       sort_by: "Ταξινόμηση κατά"
-      relevance: "συνάφεια"
-      latest_post: "Τελευταίες Δημοσιεύσεις"
-      most_viewed: "Περισσότερες εμφανίσεις"
-      most_liked: "Περισσότερα \"μου αρέσει\""
-      select_all: "Επιλογή όλων"
-      clear_all: "Καθαρισμός όλων"
-      too_short: "Ο όρος στην αναζήτησή σου είναι πολύ μικρός."
-      result_count:
-        one: "1 αποτέλεσμα για <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} αποτελέσματα για <span class='term'>\"{{term}}\"</span>"
+      relevance: "Συνάφεια"
+      latest_post: "Νεότερη Ανάρτηση"
+      latest_topic: "Νεότερο Νήμα"
+      most_viewed: "Περισσότερες Εμφανίσεις"
+      most_liked: "Περισσότερα \"Μου Αρέσει\""
+      select_all: "Επιλογή Όλων"
+      clear_all: "Καθαρισμός Όλων"
+      too_short: "Ο όρος αναζήτησής σου είναι πολύ μικρός."
       title: "ψάξε σε νήματα, αναρτήσεις, χρήστες ή κατηγορίες"
-      no_results: "Δε βρέθηκε κάτι."
-      no_more_results: "Δε βρέθηκαν αποτελέσματα"
+      no_results: "Δε βρέθηκαν αποτελέσματα."
+      no_more_results: "Δε βρέθηκαν άλλα αποτελέσματα"
       searching: "Ψάχνω ..."
       post_format: "#{{post_number}} από {{username}}"
+      results_page: "Αποτελέσματα αναζήτησης για '{{term}}'"
+      more_results: "Υπάρχουν περισσότερα αποτελέσματα. Παρακαλούμε περιορίστε την αναζήτησή σας."
+      cant_find: "Δεν μπορείτε να βρείτε αυτό που ψάχνετε;"
+      start_new_topic: "Ίσως να ξεκινούσατε ένα νέο νήμα;"
+      or_search_google: "Ή προσπαθήστε να κάνετε αναζήτηση με το Google:"
+      search_google: "Προσπαθήστε να κάνετε αναζήτηση με το Google:"
+      search_google_button: "Google"
+      search_google_title: "Αναζήτηση στην ιστοσελίδα"
       context:
         user: "Ψάξε στις αναρτήσεις του χρήστη @{{username}}"
-        category: "Αναζήτηση στην #{{category}} κατηγορία"
+        category: "Αναζήτηση στην κατηγορία #{{category}} "
         topic: "Ψάξε σε αυτό το νήμα"
         private_messages: "Αναζήτηση στα μηνύματα"
       advanced:
         title: Προηγμένη Αναζήτηση
         posted_by:
-          label: Δημοσιεύθηκε από
-        in_category:
-          label: Σε κατηγορία
+          label: Αναρτήθηκε από
         in_group:
           label: Σε ομάδα
         with_badge:
-          label: Με σήμα
-        with_tags:
-          label: Με ετικέτες
+          label: Με Παράσημο
         filters:
-          label: Να επιστρέψεις μόνο νήματα/δημοσιεύσεις που...
-          likes: Μου αρέσει
-          posted: Δημοσίευσα σε
-          watching: Παρακολουθώ
-          tracking: Παρακολουθώ
-          private: είναι στα μηνύματα μου
-          bookmarks: Έχω βάλει σελιδοδείκτη
-          first: είναι η πρώτη πρώτη δημοσίευση
-          pinned: καρφιτσώθηκαν
-          unpinned: δεν καρφιτσώθηκαν
-          seen: Διάβασα
-          unseen: Δεν διάβασα
+          likes: μου άρεσαν
+          posted: απάντησα
+          watching: επιτηρώ
+          tracking: παρακολουθώ
+          first: είναι η πρώτη ανάρτηση
+          pinned: είναι καρφιτσωμένα
+          unpinned: δεν είναι καρφιτσωμένα
+          unseen: δεν διάβασα
           wiki: ' είναι βίκι'
         statuses:
-          label: όπου θέματα
+          label: Τα οποία νήματα
           open: είναι ανοιχτά
           closed: είναι κλειστά
           archived: είναι αρχειοθετημένα
           noreplies: έχουν μηδέν απαντήσεις
-          single_user: περιέχει ένα μόνο χρήστη
+          single_user: περιέχουν ένα μόνο χρήστη
         post:
           count:
-            label: Ελάχιστη καταμέτρηση δημοσιεύσεων
+            label: Ελάχιστος αριθμός αναρτήσεων
           time:
-            label: Δημοσιεύθηκε
+            label: Αναρτήθηκε
             before: πριν
             after: μετά
     hamburger_menu: "πήγαινε σε άλλη καταχώρηση νήματος ή κατηγορία"
@@ -1208,68 +1292,71 @@ el:
     topics:
       new_messages_marker: "τελευταία επίσκεψη"
       bulk:
-        select_all: "Επιλογή όλων"
-        clear_all: "Καθαρισμός όλων"
-        unlist_topics: "Μη καταχωρημένα θέματα"
-        reset_read: "Επαναφορά διαβασμένων"
-        delete: "Διαγραφή νημάτων"
+        select_all: "Επιλογή Όλων"
+        clear_all: "Καθαρισμός Όλων"
+        unlist_topics: "Απόκρυψη Νημάτων"
+        relist_topics: "Εμφάνιση Νημάτων"
+        reset_read: "Μηδενισμός Διαβασμένων"
+        delete: "Διαγραφή Νημάτων"
         dismiss: "Απόρριψη"
         dismiss_read: "Απόρριψη όλων των μη αναγνωσμένων"
         dismiss_button: "Απόρριψη..."
-        dismiss_tooltip: "Απόρριψη μόνο των καινούριων δημοσιεύσεων ή διακοπή των νημάτων που παρακολουθούνται"
+        dismiss_tooltip: "Απόρριψη μόνο των νέων αναρτήσεων ή διακοπή της παρακολούθησης νημάτων"
         also_dismiss_topics: "Διακοπή παρακολούθησης αυτών των νημάτων ώστε να μην εμφανιστούν ξανά ως μη αναγνωσμένα σε εμένα"
         dismiss_new: "Αγνόησε τα νέα"
-        toggle: "μαζική επιλογή νημάτων"
-        actions: "Μαζικές ενέργειες"
-        close_topics: "Κλείσιμο νημάτων"
-        archive_topics: "Αρχειοθέτηση νημάτων"
-        choose_new_category: "Διάλεξε τη νέα κατηγορία για τα νήματα:"
+        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: "Επίλεξε καινούριες ετικέτες από αυτά τα θέματα:"
+        change_tags: "Αντικατάσταση Ετικετών "
+        append_tags: "Προσάρτηση Ετικετών "
+        choose_new_tags: "Επίλεξε καινούριες ετικέτες για αυτά τα νήματα:"
         choose_append_tags: "Επιλογή νέων ετικετών για την προσάρτηση τους σε αυτά τα νήματα"
-        changed_tags: "Οι ετικέτες αυτών των θεμάτων έχουν αλλάξει."
+        changed_tags: "Οι ετικέτες αυτών των νημάτων έχουν αλλάξει."
       none:
         unread: "Έχεις διαβάσει όλα τα νήματα."
         new: "Δεν υπάρχουν νέα νήματα."
         read: "Δεν έχεις διαβάσει κανένα νήμα ακόμη."
-        posted: "Δεν έχεις αναρτήσει τίποτε ακόμη."
-        latest: "Δεν υπάρχουν νεότερα νήματα. Αυτό είναι λυπηρό."
+        posted: "Δεν έχεις αναρτήσει σε κάποιο νήμα ακόμη."
+        latest: "Δεν υπάρχουν νέα νήματα. Αυτό είναι λυπηρό."
         hot: "Δεν υπάρχουν δημοφιλή νήματα."
         bookmarks: "Δεν έχεις βάλει σελιδοδείκτη σε κανένα νήμα."
         category: "Δεν υπάρχουν νήματα στην κατηγορία {{category}}."
         top: "Δεν υπάρχουν κορυφαία νήματα."
-        search: "Δεν υπάρχουν αποτελέσματα σε αυτή την αναζήτηση."
+        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>'
+          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>'
       bottom:
-        latest: "Αυτά ήταν τα πρόσφατα νήματα."
-        hot: "Αυτά ήταν όλα τα δημοφιλή νήματα."
-        posted: "Αυτά ήταν όλα τα νήματα."
-        read: "Αυτά ήταν όλα τα διαβασμένα νήματα."
-        new: "Αυτά ήταν όλα τα νέα νήματα."
-        unread: "Αυτά ήταν όλα τα αδιάβαστα νήματα."
-        category: "Αυτά ήταν όλα τα νήματα στην κατηγορία {{category}}."
-        top: "Αυτά ήταν όλα τα κορυφαία νήματα."
-        bookmarks: "Αυτά ήταν όλα τα νήματα με σελιδοδείκτη."
-        search: "Δεν υπάρχουν άλλα αποτελέσματα σε αυτή την αναζήτηση."
+        latest: "Δεν υπάρχουν άλλα πρόσφατα νήματα."
+        hot: "Δεν υπάρχουν άλλα δημοφιλή νήματα."
+        posted: "Δεν υπάρχουν άλλα αναρτημένα νήματα."
+        read: "Δεν υπάρχουν άλλα διαβασμένα νήματα."
+        new: "Δεν υπάρχουν άλλα νέα νήματα."
+        unread: "Δεν υπάρχουν άλλα αδιάβαστα νήματα."
+        category: "Δεν υπάρχουν άλλα νήματα στην κατηγορία {{category}}."
+        top: "Δεν υπάρχουν άλλα κορυφαία νήματα."
+        bookmarks: "Δεν υπάρχουν άλλα νήματα με σελιδοδείκτη."
+        search: "Δεν υπάρχουν άλλα αποτελέσματα για αυτή την αναζήτηση."
     topic:
       unsubscribe:
         stop_notifications: "Τώρα θα λαμβάνεις λιγότερες ειδοποιήσεις για <strong>{{title}}</strong>"
         change_notification_state: "Η τρέχουσα κατάσταση των ειδοποιήσεων σου είναι"
       filter_to:
         one: "1 δημοσίευση σε νήματα"
-        other: "{{count}} δημοσιεύσεις σε νήματα"
-      create: 'Νέο νήμα'
-      create_long: 'Δημιουργία νέου νήματος'
-      private_message: 'Ξεκίνα ένα προσωπικό μήνυμα'
+        other: "{{count}} αναρτήσεις σε νήματα"
+      create: 'Νέο Νήμα'
+      create_long: 'Δημιουργία νέου Νήματος'
+      private_message: 'Στείλε ένα προσωπικό μήνυμα'
       archive_message:
-        help: 'Μετακίνηση μηνύματος στα αρχεία'
-        title: 'Αρχεία'
+        help: 'Αρχειοθέτηση μηνύματος'
+        title: 'Αρχειοθέτηση'
       move_to_inbox:
         title: 'Μετακίνηση στα Εισερχόμενα'
         help: 'Μετακίνηση μηνύματος πίσω στα Εισερχόμενα'
@@ -1281,7 +1368,7 @@ el:
         other: '{{count}} νέα νήματα'
       unread_topics:
         one: '1 μη αναγνωσμένο νήμα'
-        other: '{{count}} μη αναγνωσμένα νήματα'
+        other: '{{count}} αδιάβαστα νήματα'
       title: 'Νήμα'
       invalid_access:
         title: "Το νήμα είναι ιδιωτικό"
@@ -1305,66 +1392,118 @@ el:
       likes:
         one: "υπάρχει 1 «Μου αρέσει» σε αυτό το νήμα"
         other: "υπάρχουν {{count}} «μου αρέσει» σε αυτό το νήμα"
-      back_to_list: "Επιστροφή στη λίστα νημάτων"
-      options: "Ρυθμίσεις νήματος"
-      show_links: "Εμφάνιση συνδέσμων εντός του νήματος"
-      toggle_information: "Εμφάνιση ή απόκρυψη λεπτομερειών νήματος"
+      back_to_list: "Επιστροφή στη Λίστα Νημάτων"
+      options: "Ρυθμίσεις Νήματος"
+      show_links: "εμφάνιση συνδέσμων εντός του νήματος"
+      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{και } false {έχεις } other{}} <a href='/new'>1 νέο</a> νήμα} other { {BOTH, select, true{και } 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: "Αφαίρεση Χρονοδιακόπτη"
+        publish_to: "Δημοσίευση Σε:"
+        when: "Πότε:"
+        public_timer_types: Χρονοδιακόπτες Νημάτων
+        private_timer_types: Χρονοδιακόπτες Νημάτων Χρήστη
+      auto_update_input:
+        none: "Επιλέξτε χρονικό περιθώριο"
+        later_today: "Αργότερα σήμερα"
+        tomorrow: "Αύριο"
+        later_this_week: "Αργότερα αυτή την εβδομάδα"
+        this_weekend: "Αυτό το Σαββατοκύριακο"
+        next_week: "Την άλλη εβδομάδα"
+        two_weeks: "Δύο Εβδομάδες"
+        next_month: "Τον άλλο μήνα"
+        three_months: "Τρεις Μήνες"
+        six_months: "Έξη Μήνες"
+        one_year: "Ένα Έτος"
+        forever: "Για Πάντα"
+        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:
         one: "Η τελευταία δημοσίευση στο νήμα είναι ήδη 1 ώρα παλιό, έτσι το νήμα θα κλείσει αμέσως."
-        other: "Η τελευταία δημοσίευση είναι ήδη %{count} ώρες παλιό, έτσι το νήμα θα κλείσει αμέσως."
+        other: "Η τελευταία ανάρτηση είναι ήδη %{count} ώρες παλιά, έτσι το νήμα θα κλείσει αμέσως."
       timeline:
         back: "Πίσω"
-        back_description: "Πήγαινε πίσω στην τελευταία μη αναγνωσμένη δημοσιεύση"
+        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: "μετάβαση στην τελευταία ανάρτηση"
+        jump_prompt: "μετάβαση σε..."
+        jump_prompt_of: "των %{count} αναρτήσεων"
+        jump_prompt_long: "Σε ποια ανάρτηση θα ήθελες να μεταβείς;"
         jump_bottom_with_number: "μετάβαση στην ανάρτηση %{post_number}"
         total: σύνολο αναρτήσεων
         current: τρέχουσα ανάρτηση
       notifications:
         title: άλλαξε το πόσο συχνά ειδοποιείσαι για αυτό το θέμα
         reasons:
-          mailing_list_mode: "Έχεις ενεργοποιημένη τη λειτουργία λίστας αποδεκτών αλληλογραφίας, έτσι θα λαμβάνεις ενημερώσεις για τις απαντήσεις για το νήμα μέσω ηλεκτρονικών μηνυμάτων."
-          '3_10': 'Θα λάβεις ειδοποιήσεις, επειδή παρακολουθείς μια ετικέτα πάνω σε αυτό το θέμα.'
-          '3_6': 'Θα λαμβάνεις ειδοποιήσεις επειδή παρακολουθείς αυτή την κατηγορία.'
-          '3_5': 'Θα λαμβάνεις ειδοποιήσεις επειδή ξεκίνησες να παρακολουθείς αυτόματα αυτό το νήμα.'
-          '3_2': 'Θα λαμβάνεις ειδοποιήσεις επειδή παρακολουθείς αυτό το νήμα.'
+          mailing_list_mode: "Έχεις ενεργοποιημένη τη λειτουργία λίστας αποδεκτών αλληλογραφίας, έτσι θα λαμβάνεις ενημερώσεις για τις απαντήσεις για το νήμα μέσω email."
+          '3_10': 'Θα λαμβάνεις ειδοποιήσεις επειδή επιτηρείς μια ετικέτα σε αυτό το νήμα.'
+          '3_6': 'Θα λαμβάνεις ειδοποιήσεις επειδή επιτηρείς αυτήν την κατηγορία.'
+          '3_5': 'Θα λαμβάνεις ειδοποιήσεις επειδή ξεκίνησες να επιτηρείς αυτόματα αυτό το νήμα.'
+          '3_2': 'Θα λαμβάνεις ειδοποιήσεις επειδή επιτηρείς αυτό το νήμα.'
           '3_1': 'Θα λαμβάνεις ειδοποιήσεις επειδή δημιούργησες αυτό το νήμα.'
-          '3': 'Θα λαμβάνεις ειδοποιήσεις επειδή παρακολουθείς αυτό το νήμα.'
+          '3': 'Θα λαμβάνεις ειδοποιήσεις επειδή επιτηρείς αυτό το νήμα.'
+          '2_8': 'Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή παρακολουθείς αυτήν την κατηγορία.'
+          '2_4': 'Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή απάντησες σε αυτό το νήμα.'
+          '2_2': 'Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή παρακολουθείς αυτό το νήμα.'
+          '2': 'Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή <a href="/u/{{username}}/preferences">διάβασες αυτό το νήμα</a>.'
           '1_2': 'Θα λαμβάνεις ειδοποιήσεις εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα.'
-          '1': 'Θα λαμβάνεις ειδοποιήσεις, εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα.'
-          '0_7': 'Θα αγνοούνται όλες οι ειδοποιήσεις από αυτή την κατηγορία.'
+          '1': 'Θα λαμβάνεις ειδοποιήσεις εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα.'
+          '0_7': 'Αγνοείς όλες τις ειδοποιήσεις αυτής της κατηγορίας.'
           '0_2': 'Αγνοείς όλες τις ειδοποιήσεις αυτού του νήματος.'
           '0': 'Αγνοείς όλες τις ειδοποιήσεις αυτού του νήματος.'
         watching_pm:
-          title: "Παρατηρείται"
-          description: "Θα λαμβάνεις ειδοποιήσεις για κάθε καινούρια απάντηση σε αυτό το μήνυμα, και το πλήθος των καινούριων απαντήσεων θα εμφανίζεται."
+          title: "Επιτηρείται"
+          description: "Θα λαμβάνεις ειδοποιήσεις για κάθε νέα απάντηση σε αυτό το μήνυμα και ένας μετρητής νέων απαντήσεων θα εμφανίζεται."
         watching:
-          title: "Παρατηρείται"
-          description: "Θα λαμβάνεις ειδοποιήσεις για κάθε καινούρια απάντηση σε αυτό το νήμα, και καταμέτρηση καινούριων απαντήσεων θα εμφανίζεται."
+          title: "Επιτηρείται"
+          description: "Θα λαμβάνεις ειδοποιήσεις για κάθε νέα απάντηση σε αυτό το νήμα και ένας μετρητής νέων απαντήσεων θα εμφανίζεται."
         tracking_pm:
           title: "Παρακολουθείται"
-          description: "Το πλήθος των καινούριων απαντήσεων θα εμφανίζεται για αυτό το μήνυμα. Θα λαμβάνεις ειδοποιήσεις εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα."
+          description: "Ένας μετρητής νέων απαντήσεων θα εμφανίζεται για αυτό το μήνυμα. Θα λαμβάνεις ειδοποιήσεις εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα."
         tracking:
           title: "Παρακολουθείται"
-          description: "Το πλήθος των καινούριων απαντήσεων γι αυτό το νήμα θα εμφανίζεται. Θα λαμβάνεις ειδοποιήσεις, εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα."
+          description: "Ένας μετρητής νέων απαντήσεων θα εμφανίζεται για αυτό το νήμα. Θα λαμβάνεις ειδοποιήσεις εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα."
         regular:
           title: "Φυσιολογικό"
           description: "Θα ειδοποιηθείς εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα."
@@ -1376,31 +1515,32 @@ el:
           description: "Δε θα ειδοποιείσαι ποτέ για οτιδήποτε σχετικά με αυτό το μήνυμα."
         muted:
           title: "Σε σίγαση"
-          description: "Δε θα ειδοποιείσαι ποτέ για οτιδήποτε σχετικά με αυτό το θέμα, και δε θα εμφανίζεται στα τελευταία."
+          description: "Δε θα ειδοποιείσαι ποτέ για οτιδήποτε σχετικά με αυτό το θέμα και δε θα εμφανίζεται στα τελευταία."
       actions:
         recover: "Επαναφορά του νήματος"
-        delete: "Σβήσε το νήμα"
-        open: "Νέο νήμα"
-        close: "Κλείσε το νήμα"
-        multi_select: "Διάλεξε αναρτήσεις..."
-        pin: "Καρφίτσωσε το νήμα..."
-        unpin: "Ξεκαρφίτσωσε το νήμα..."
-        unarchive: "Επανέφερε το νήμα από το αρχείο"
-        archive: "Βάλε το νήμα στο αρχείο"
-        invisible: "Κάντο αόρατο"
-        visible: "Κάντο ορατό"
-        reset_read: "Επαναφορά «διαβασμένων»"
-        make_public: "Κάνε Δημόσιο το θέμα"
-        make_private: "Γράψε προσωπικό μήνυμα"
+        delete: "Διαγραφή Νήματος"
+        open: "Νέο Νήμα"
+        close: "Κλείσιμο Νήματος"
+        multi_select: "Διάλεξε Αναρτήσεις..."
+        timed_update: "Θέσε Χρονοδιακόπτη Νήματος..."
+        pin: "Καρφίτσωμα Νήματος..."
+        unpin: "Ξεκαρφίτσωμα Νήματος..."
+        unarchive: "Επαναφορά Νήματος από Αρχείο"
+        archive: "Αρχειοθέτηση Νήματος"
+        invisible: "Απόκρυψη Νήματος"
+        visible: "Εμφάνιση Νήματος"
+        reset_read: "Μηδενισμός Διαβασμένων"
+        make_public: "Κάνε Δημόσιο το Νήμα"
+        make_private: "Κάνε Προσωπικό Μήνυμα"
       feature:
-        pin: "Καρφίτσωσε το νήμα"
-        unpin: "Ξεκαρφίτσωσε το νήμα"
-        pin_globally: "Καρφίτσωσε το νήμα καθολικά"
-        make_banner: "Νήμα ανακοίνωσης"
-        remove_banner: "Να αφαιρεθεί η ιδιότητα του νήματος ανακοίνωσης"
+        pin: "Καρφίτσωμα Νήματος"
+        unpin: "Ξεκαρφίτσωμα Νήματος"
+        pin_globally: "Καθολικό Καρφίτσωμα Νήματος"
+        make_banner: "Νήμα Ανακοίνωσης"
+        remove_banner: "Αφαίρεση Νήματος Ανακοίνωσης"
       reply:
         title: 'Απάντηση'
-        help: 'Ξεκινήστε να συνθέτετε μια απάντηση σε αυτό το θέμα'
+        help: 'ξεκινήστε να συνθέτετε μια απάντηση σε αυτό το νήμα'
       clear_pin:
         title: "Ξεκαρφίτσωμα"
         help: "Ξεκαρφίτσωσε αυτό το νήμα ώστε να μην εμφανίζεται πια στην κορυφή της λίστας."
@@ -1412,61 +1552,62 @@ el:
         help: 'Άνοιξε μια φιλική έκδοση εκτυπωτή αυτού του νήματος'
       flag_topic:
         title: 'Σήμανση'
-        help: 'Επισήμανε αυτό το νήμα στους συντονιστές ή στείλε ένα προσωπικό μήνυμα για αυτό.'
-        success_message: 'Σήμανες αυτό το νήμα.'
+        help: 'επισήμανε ιδιωτικά αυτό το νήμα για έλεγχο ή στείλε μια προσωπική ειδοποίηση σχετικά με αυτό'
+        success_message: 'Επισήμανες αυτό το νήμα.'
       feature_topic:
-        title: "Το νήμα να γίνει προεξέχον"
+        title: "Θέσε το νήμα σε προβολή"
         pin: "Το νήμα αυτό να εμφανίζεται στην κορυφή της {{categoryLink}} κατηγορίας μέχρι"
         confirm_pin: "Υπάρχουν ήδη {{count}} καρφιτσωμένα νήματα. Τόσα πολλά καρφιτσωμένα νήματα μπορεί να είναι υπερβολικός φόρτος για νέους και ανώνυμους χρήστες. Θες στ' αλήθεια να καρφιτσώσεις ακόμη ένα νήμα σε αυτή την κατηγορία;"
         unpin: "Απομάκρυνε το νήμα από την κορυφή της κατηγορίας {{categoryLink}}."
         unpin_until: "Απομάκρυνε το νήμα από την κορυφή της {{categoryLink}} κατηγορίας ή περίμενε μέχρι <strong>%{until}</strong>."
         pin_note: "Οι χρήστες μπορούν να ξεκαρφιτσώσουν αυτό το νήμα ο καθένας για τον εαυτό του."
-        pin_validation: "Απαιτείται ημερομηνία για να καρφιτσώσεις το θέμα."
+        pin_validation: "Απαιτείται ημερομηνία για να καρφιτσώσεις το νήμα."
         not_pinned: "Δεν υπάρχουν νήματα καρφιτσωμένα σε {{categoryLink}}."
         already_pinned:
-          one: "Νήματα προσωρινά καρφιτσωμένα σε {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-          other: "Νήματα προσωρινά καρφιτσωμένα σε {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-        pin_globally: "Εμφάνισε αυτό το νήμα στην κορυφή όλων των καταχωρήσεων νημάτων μέχρι"
+          one: "Νήμα καρφιτσωμένο σε {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Νήματα καρφιτσωμένα σε {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+        pin_globally: "Εμφάνισε αυτό το νήμα στην κορυφή όλων των λιστών νημάτων μέχρι"
         confirm_pin_globally: "Υπάρχουν ήδη {{count}} καθολικά καρφιτσωμένα νήματα. Τόσα πολλά καρφιτσωμένα νήματα μπορεί να είναι υπερβολικός φόρτος για νέους και ανώνυμους χρήστες. Θες στ' αλήθεια να καρφιτσώσεις καθολικά ακόμη ένα νήμα;"
-        unpin_globally: "Αφαίρεσε αυτό το θέμα από την κορυφή όλων των λίστων θεμάτων"
-        unpin_globally_until: "Απομάκρυνε το νήμα από την κορυφή όλων των καταχωρήσεων των νημάτων ή περίμενε μέχρι <strong>%{until}</strong>."
+        unpin_globally: "Αφαίρεσε αυτό το νήμα από την κορυφή όλων των λίστων νημάτων"
+        unpin_globally_until: "Αφαίρεσε αυτό το νήμα από την κορυφή όλων των λίστων νημάτων ή περίμενε μέχρι <strong>%{until}</strong>."
         global_pin_note: "Οι χρήστες μπορούν να ξεκαρφιτσώσουν το νήμα ο καθένας για τον εαυτό του."
-        not_pinned_globally: "Δεν υπάρχουν καρφιτσωμένα θέματα παγκοσμίως."
+        not_pinned_globally: "Δεν υπάρχουν καθολικά καρφιτσωμένα νήματα."
         already_pinned_globally:
-          one: "Τα νήματα πρόσφατα καρφιτσώθηκαν παγκοσμίως:<strong class='badge badge-notification unread'>1</strong>"
-          other: "Τα νήματα πρόσφατα καρφιτσώθηκαν παγκοσμίως: <strong class='badge badge-notification unread'>{{count}}</strong>"
-        make_banner: "Αυτό το νήμα να γίνει νήμα ανακοίνωσης που θα φαίνεται στην αρχή όλων των σελίδων."
-        remove_banner: "Απομακρύνει το νήμα ανακοίνωσης από την αρχή όλων των σελίδων."
+          one: "Πρόσφατα καθολικά καρφιτσωμένα νήματα:<strong class='badge badge-notification unread'>1</strong>"
+          other: "Πρόσφατα καθολικά καρφιτσωμένα νήματα: <strong class='badge badge-notification unread'>{{count}}</strong>"
+        make_banner: "Αυτό το νήμα να γίνει νήμα ανακοίνωσης και να εμφανίζεται στην κορυφή όλων των σελίδων."
+        remove_banner: "Αφαίρεσε το νήμα ανακοίνωσης το οποίο εμφανίζεται στην κορυφή όλων των σελίδων."
         banner_note: "Οι χρήστες μπορούν να κλείσουν την ανακοίνωση έτσι ώστε να μην εμφανίζεται σε αυτούς. Ένα μόνο νήμα μπορεί να είναι νήμα ανακοίνωσης κάθε φορά."
         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: "διεύθυνση ηλεκτρονικού ταχυδρομείου ή χρηστώνυμο"
+        title: 'Πρόσκληση σε Μήνυμα'
+        email_or_username: "Διεύθυνση email ή όνομα χρήστη του προσκεκλημένου"
+        email_or_username_placeholder: "διεύθυνση email ή όνομα χρήστη"
         action: "Πρόσκληση"
-        success: "Προσκαλέσαμε το χρήστη να συμμετέχει σε αυτή την προσωπική συζήτηση."
-        success_group: "Έχουμε προσκαλέσει αυτή την ομάδα να συμμετάσχει σε αυτό το μήνυμα."
+        success: "Προσκαλέσαμε το χρήστη να συμμετέχει σε αυτό το μήνυμα."
+        success_group: "Προσκαλέσαμε την ομάδα να συμμετέχει σε αυτό το μήνυμα."
         error: "Συγγνώμη, παρουσιάστηκε σφάλμα κατά την πρόσκληση αυτού του χρήστη."
         group_name: "όνομα ομάδας"
-      controls: "Έλεγχοι νήματος"
+      controls: "Λειτουργίες Νήματος"
       invite_reply:
         title: 'Πρόσκληση'
-        username_placeholder: "χρηστώνυμο"
-        action: 'Αποστολή πρόσκλησης'
-        help: 'να προσκληθούν και άλλοι σε αυτό το νήμα με ηλεκτρονικό ταχυδρομείο ή με ειδοποίηση'
-        to_forum: "Θα στείλουμε ένα σύντομο μήνυμα ηλεκτρονικού ταχυδρομείου στον φίλο σας για να μπορέσει να απαντήσει σε αυτό το νήμα κάνοντας κλικ σε ένα σύνδεσμο. Δεν θα χρειαστεί να συνδεθεί."
-        sso_enabled: "Δώσε το χρηστώνυμο του προσώπου που θα ήθελες να προσκαλέσεις σε αυτό το νήμα."
-        to_topic_blank: "Δώσε το χρηστώνυμο ή τη διεύθυνση ηλεκτρονικού ταχυδρομείου του προσώπου που θα ήθελες να προσκαλέσεις σε αυτό το νήμα."
-        to_topic_email: "Έδωσες μια διεύθυνση ηλεκτρονικού ταχυδρομείου. Θα στείλουμε μια πρόσκληση που θα επιτρέπει στον παραλήπτη να απαντήσει απευθείας σε αυτό το νήμα."
-        to_topic_username: "Έχεις εισαγάγει όνομα χρήστη. Θα σου στείλουμε ειδοποίηση με ένα σύνδεσμο προσκαλώντας τους σε αυτό το νήμα."
-        to_username: "Δώσε το όνομα χρήστη του ατόμου που θα ήθελες να προσκαλέσεις. Θα σου στείλουμε ειδοποίηση με ένα σύνδεσμο προσκαλώντας τους σε αυτό το νήμα."
+        username_placeholder: "όνομα χρήστη"
+        action: 'Αποστολή Πρόσκλησης'
+        help: 'να προσκληθούν και άλλοι σε αυτό το νήμα με email ή με ειδοποίηση'
+        to_forum: "Θα στείλουμε ένα σύντομο email στον φίλο σας για να συμμετέχει άμεσα κάνοντας κλικ σε ένα σύνδεσμο. Δεν θα χρειαστεί να συνδεθεί."
+        sso_enabled: "Δώσε το όνομα χρήστη του ατόμου που θα ήθελες να προσκαλέσεις σε αυτό το νήμα."
+        to_topic_blank: "Δώσε το όνομα χρήστη ή το email του ατόμου που θα ήθελες να προσκαλέσεις σε αυτό το νήμα."
+        to_topic_email: "Έδωσες μια διεύθυνση email. Θα στείλουμε μια πρόσκληση που θα επιτρέπει στον παραλήπτη να απαντήσει άμεσα σε αυτό το νήμα."
+        to_topic_username: "Έδωσες όνομα χρήστη. Θα στείλουμε ειδοποίηση με ένα σύνδεσμο πρόσκλησης προς αυτό το νήμα."
+        to_username: "Δώσε το όνομα χρήστη του ατόμου που θα ήθελες να προσκαλέσεις. Θα στείλουμε ειδοποίηση με ένα σύνδεσμο πρόσκλησης προς αυτό το νήμα."
         email_placeholder: 'name@example.com'
         success_email: "Στείλαμε μια πρόσκληση στον/στην <b>{{emailOrUsername}}</b>. Θα σε ειδοποιήσουμε όταν η πρόσκληση γίνει αποδεκτή. Στη σελίδα του προφίλ σου μπορείς να παρακολουθήσεις την εξέλιξη όλων των προσκλήσεών σου."
         success_username: "Προσκαλέσαμε τον χρήστη να συμμετέχει σε αυτό το νήμα."
-        error: "Λυπούμαστε αλλά δεν μπορέσαμε να προσκαλέσουμε αυτό το πρόσωπο. Μήπως έχει ήδη προσκληθεί; (ο ρυθμός αποστολής προσκλήσεων είναι περιορισμένος)"
+        error: "Λυπούμαστε αλλά δεν μπορέσαμε να προσκαλέσουμε αυτό το άτομο. Μήπως έχει ήδη προσκληθεί; (ο ρυθμός αποστολής προσκλήσεων είναι περιορισμένος)"
+        success_existing_email: "Ο χρήστης με email <b>{{emailOrUsername}}</b> υπάρχει ήδη. Προσκαλέσαμε αυτόν τον χρήστης να συμμετέχει στο νήμα."
       login_reply: 'Συνδέσου για να απαντήσεις'
       filters:
         n_posts:
@@ -1474,43 +1615,43 @@ el:
           other: "{{count}} αναρτήσεις"
         cancel: "Αφαίρεση φίλτρου"
       split_topic:
-        title: "Μεταφορά σε νέο νήμα "
+        title: "Μεταφορά σε Νέο Νήμα "
         action: "μεταφορά σε νέο νήμα "
-        topic_name: "Τίτλος νέου νήματος"
+        topic_name: "Τίτλος Νέου Νήματος"
         error: "Παρουσιάστηκε σφάλμα κατά τη μεταφορά των αναρτήσεων στο νέο νήμα."
         instructions:
           one: "Ετοιμάζεσαι να δημιουργήσεις ένα νέο νήμα και να μεταφέρεις σε αυτό την επιλεγμένη ανάρτηση."
           other: "Ετοιμάζεσαι να δημιουργήσεις ένα νέο νήμα και να μεταφέρεις σε αυτό τις <b>{{count}}</b> επιλεγμένες αναρτήσεις."
       merge_topic:
-        title: "Μεταφορά σε υφιστάμενο νήμα"
-        action: "μεταφορά σε ένα υφιστάμενο νήμα"
+        title: "Μεταφορά σε Υφιστάμενο Νήμα"
+        action: "μεταφορά σε υφιστάμενο νήμα"
         error: "Παρουσιάστηκε σφάλμα κατά τη μεταφορά των αναρτήσεων σε αυτό το νήμα. "
         instructions:
           one: "Παρακαλώ επίλεξε το νήμα στο οποίο θέλεις να μεταφέρεις την ανάρτηση."
           other: "Παρακαλώ επίλεξε το νήμα στο οποίο θέλεις να μεταφέρεις τις <b>{{count}}</b> αυτές αναρτήσεις."
       merge_posts:
-        title: "Συγχώνευσε επιλεγμένες δημοσιεύσεις"
-        action: "συγχώνευσε επιλεγμένες δημοσιεύσεις"
-        error: "Προέκυψε σφάλμα κατά τη συγχώνευση των επιλεγμένων δημοσιεύσεων."
+        title: "Συγχώνευσε Επιλεγμένες Αναρτήσεις"
+        action: "συγχώνευσε επιλεγμένες αναρτήσεις"
+        error: "Προέκυψε σφάλμα κατά τη συγχώνευση των επιλεγμένων αναρτήσεων."
       change_owner:
-        title: "Άλλαξε τους ιδιοκτήτες των αναρτήσεων"
-        action: "Αλλαγή ιδιοκτήτη"
+        title: "Άλλαξε Ιδιοκτήτη των Αναρτήσεων"
+        action: "αλλαγή ιδιοκτήτη"
         error: "Παρουσιάστηκε ένα σφάλμα κατά την αλλαγή του ιδιοκτήτη των αναρτήσεων."
-        label: "Νέος ιδιοκτήτης των αναρτήσεων"
-        placeholder: "Χρηστώνυμο του νέου ιδιοκτήτη"
+        label: "Νέος Ιδιοκτήτης των Αναρτήσεων"
+        placeholder: "όνομα χρήστη του νέου ιδιοκτήτη"
         instructions:
           one: "Παρακαλώ επίλεξε τον νέο ιδιοκτήτη της ανάρτησης του <b>{{old_user}}</b>."
           other: "Παρακαλώ επίλεξε τον νέο ιδιοκτήτη των {{count}} αναρτήσεων του <b>{{old_user}}</b>."
-        instructions_warn: "Έχε υπόψη πως δεν θα μεταφερθούν αναδρομικά όλες οι ειδοποιήσεις για αυτή την ανάρτηση στο νέο χρήστη.<br/>Προειδοποίηση: Τώρα κανένα δεδομένο σχετικό με την ανάρτηση δε θα μεταφερθεί στο νέο χρήστη. Χρησιμοποίησέ το με προσοχή."
+        instructions_warn: "Τυχόν ειδοποιήσεις σχετικές με την ανάρτηση δεν θα μεταφερθούν στον νέο χρήστη.<br>Προειδοποίηση: Στην παρούσα φάση κανένα δεδομένο σχετικό με την ανάρτηση δε θα μεταφερθεί στο νέο χρήστη. Χρησιμοποίησέ το με προσοχή."
       change_timestamp:
+        title: "Αλλαγή Χρονοσήμανσης..."
         action: "αλλαγή χρονοσήμανσης"
         invalid_timestamp: "Η χρονοσήμανση δεν μπορεί να υπάρξει στο μέλλον."
         error: "Προέκυψε σφάλμα κατά την αλλαγή χρονοσήμανσης του νήματος."
-        instructions: "Παρακαλώ επίλεξε τη νέα χρονοσήμανση του νήματος. Οι δημοσιεύσεις του νήματος θα ενημερωθούν να έχουν την ίδια διαφορά ώρας."
+        instructions: "Παρακαλώ επίλεξε τη νέα χρονοσήμανση του νήματος. Οι αναρτήσεις του νήματος θα ενημερωθούν ώστε να έχουν την ίδια διαφορά ώρας."
       multi_select:
         select: 'επίλεξε'
         selected: 'επιλεγμένες ({{count}})'
-        select_replies: 'επίλεξε και συμπερίλαβε τις απαντήσεις'
         delete: διαγραφή επιλεγμένων
         cancel: ακύρωση επιλογής
         select_all: επιλογή όλων
@@ -1521,22 +1662,21 @@ el:
     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}}"
+      quote_reply: "Παράθεση"
       edit_reason: "Αιτία:"
       post_number: "ανάρτηση {{number}}"
       wiki_last_edited_on: "το βίκι επεξεργάστηκε τελευταία φορά στις"
-      last_edited_on: "Η τελευταία φορά που άλλαξε η ανάρτηση ήταν "
+      last_edited_on: "η ανάρτηση  επεξεργάστηκε τελευταία φορά στις"
       reply_as_new_topic: "Απάντηση με διασυνδεδεμένο νήμα"
       reply_as_new_private_message: "Απάντηση ως νέο μήνυμα στον ίδιο παραλήπτη"
       continue_discussion: "Συνέχιση της συζήτησης από το {{postLink}}:"
-      follow_quote: "πήγαινε στην παρατεθιμένη ανάρτηση"
-      show_full: "Δείξε όλη την ανάρτηση "
+      follow_quote: "πήγαινε στην παρατεθειμένη ανάρτηση"
+      show_full: "Δείξε Πλήρη Ανάρτηση "
       show_hidden: 'Δείξε το κρυφό περιεχόμενο.'
       deleted_by_author:
         one: "(η ανάρτηση ανακλήθηκε από το συγγραφέα της και θα σβηστεί αυτόματα σε %{count} ώρα, εκτός και αν κάποιος την επισημάνει στους συντοντιστές)"
         other: "(η ανάρτηση ανακλήθηκε από το συγγραφέα της και θα σβηστεί αυτόματα σε %{count} ώρες, εκτός και αν κάποιος την επισημάνει στους συντοντιστές)"
-      expand_collapse: "επέκταση/σύμπτηξη"
+      expand_collapse: "επέκταση/σύμπτυξη"
       gap:
         one: "δες 1 κρυφή απάντηση"
         other: "δες {{count}} κρυφές απαντήσεις"
@@ -1549,131 +1689,129 @@ el:
         other: "{{count}} \"Μου αρέσει\""
       has_likes_title:
         one: "1 άτομο πάτησε \"μου αρέσει\" στη δημοσίευση"
-        other: "{{count}} άτομα που πάτησαν \"Μου αρέσει\" στη δημοσίευση"
-      has_likes_title_only_you: "Σου αρέσει αυτή η δημοσίευση"
+        other: "{{count}} άτομα πάτησαν \"Μου αρέσει\" στην ανάρτηση"
+      has_likes_title_only_you: "σου αρέσει αυτή η ανάρτηση"
       has_likes_title_you:
         one: "εσύ και 1 άλλο άτομο πάτησε \"Μου αρέσει\" στη δημοσίευση"
-        other: "εσύ και {{count}} άλλα άτομα πατήσατε \"Μου αρέσει\" στη δημοσίευση"
+        other: "εσύ και {{count}} ακόμα άτομα πατήσατε \"Μου αρέσει\" στην ανάρτηση"
       errors:
         create: "Λυπούμαστε, παρουσιάστηκε σφάλμα κατά την δημιουργία της ανάρτησης. Προσπάθησε πάλι."
         edit: "Λυπούμαστε, παρουσιάστηκε σφάλμα κατά την επεξεργασία της ανάρτησης. Προσπάθησε πάλι."
         upload: "Λυπούμαστε, παρουσιάστηκε σφάλμα κατά το ανέβασμα του αρχείου. Προσπάθησε πάλι."
-        file_too_large: "Λυπούμαστε, αυτός ο φάκελος είναι πολύ μεγάλος (το μέγιστο μέγεθος είναι {{max_size_kb}}kb). Γιατί δεν μεταφορτώνεις τον μεγάλο σου φάκελο σε μια υπηρεσία ανταλλαγής cloud κι έπειτα να μοιραστείς τον σύνδεσμο;"
+        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: "Λυπούμαστε, για να κατεβάζεις συνημμένα πρέπει πρώτα να συνδεθείς."
+        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: "Λυπούμαστε, για να κατεβάσεις συνημμένα αρχεία, πρέπει πρώτα να συνδεθείς."
       abandon:
         confirm: "Σίγουρα θέλεις να απορρίψεις την ανάρτησή σου;"
         no_value: "Όχι, κράτησέ τη"
         yes_value: "Ναί, απέρριψέ τη"
-      via_email: "αυτή η ανάρτηση έγινε μέσω ηλεκτρονικού ταχυδρομείου"
-      via_auto_generated_email: "αυτή η δημοσίευση έφτασε μέσω ενός ηλεκτρονικού μηνύματος που δημιουργήθηκε αυτόματα"
-      whisper: "αυτή η δημοσίευση λέγεται εμπιστευτικά στους συντονιστές"
+      via_email: "αυτή η ανάρτηση ήρθε μέσω email"
+      via_auto_generated_email: "αυτή η ανάρτηση ήρθε μέσω ενός email που δημιουργήθηκε αυτόματα"
+      whisper: "αυτή η ανάρτηση είναι εμπιστευτική προς τους συντονιστές"
       wiki:
-        about: "αυτή η δημοσίευση είναι βίκι"
+        about: "αυτή η ανάρτηση είναι βίκι"
       archetypes:
-        save: 'Αποθήκευση επιλογών'
+        save: 'Αποθήκευση Επιλογών'
       few_likes_left: "Ευχαριστούμε που μοιράστηκες την αγάπη σου! Έχεις μόνο μερικά \"μου αρέσει\" ακόμα να χρησιμοποιήσεις σήμερα."
       controls:
         reply: "απάντησε σε αυτή την ανάρτηση"
         like: "αυτή η ανάρτηση μου αρέσει"
-        has_liked: "αυτή η ανάρτηση σου αρέσει"
-        undo_like: "δεν «μου αρέσει» πια"
+        has_liked: "σου άρεσε αυτή η ανάρτηση"
+        undo_like: "δεν μου αρέσει πια"
         edit: "επεξεργασία ανάρτησης"
+        edit_action: "Επεξεργασία"
         edit_anonymous: "Λυπούμαστε, αλλά για να επεξεργαστείς αυτή την ανάρτηση πρέπει πρώτα να συνδεθείς."
-        flag: "Ανάφερε αυτή την ανάρτηση στους συντονιστές ή στείλε ένα προσωπικό μήνυμα"
-        delete: "Σβήσε αυτή την ανάρτηση"
-        undelete: "επανάφερε αυτή την ανάρτηση "
+        flag: "ανέφερε την ανάρτηση στους συντονιστές ή στείλε μια προσωπική ειδοποίηση σχετικά με αυτή"
+        delete: "διαγραφή ανάρτησης"
+        undelete: "επαναφορά ανάρτησης"
         share: "κοινοποίησε έναν σύνδεσμο προς αυτή την ανάρτηση "
         more: "Περισσότερα"
-        delete_replies:
-          confirm:
-            one: "Θέλεις επίσης να σβήσεις την άμεση απάντηση σε αυτή την ανάρτηση;"
-            other: "Θέλεις επίσης να σβήσεις τις {{count}} άμεσες απαντήσεις σε αυτή την ανάρτηση;"
-          yes_value: "Ναι, σβήσε και τις απαντήσεις"
-          no_value: "Όχι, μόνο αυτή την ανάρτηση"
-        admin: "Δράσεις διαχειριστών"
-        wiki: "Δημιουργία βίκι"
-        unwiki: "Αφαίρεση βίκι"
-        convert_to_moderator: "Πρόσθεσε χρωματισμό στους συνεργάτες"
-        revert_to_regular: "Αφαίρεσε το χρωματισμό από τους συνεργάτες"
+        admin: "ενέργειες διαχειριστή ανάρτησης"
+        wiki: "Δημιουργία Βίκι"
+        unwiki: "Αφαίρεση Βίκι"
+        convert_to_moderator: "Πρόσθεσε Χρώμα Συνεργάτη"
+        revert_to_regular: "Αφαίρεσε Χρώμα Συνεργάτη"
         rebake: "Ανανέωση HTML"
         unhide: "Επανεμφάνιση"
-        change_owner: "Αλλαγή ιδιοκτησίας"
+        change_owner: "Αλλαγή Ιδιοκτησίας"
       actions:
         flag: 'Επισήμανση'
         defer_flags:
-          one: "Αγνόησε την επισήμανση"
-          other: "Αγνόησε τις επισημάνσεις"
+          one: "Αγνόηση επισήμανσης"
+          other: "Αγνόηση επισημάνσεων"
         undo:
           off_topic: "Αναίρεση σήμανσης"
           spam: "Αναίρεση σήμανσης"
           inappropriate: "Αναίρεση σήμανσης"
           bookmark: "Αφαίρεση σελιδοδείκτη"
-          like: "δεν «μου αρέσει» πια"
+          like: "Αναίρεση «μου αρέσει»"
           vote: "Αναίρεση ψήφου"
         people:
-          off_topic: "μαρκαρισμένο σαν εκτός θέματος"
-          spam: "μαρκαρισμένο σαν ανεπιθύμητη αλληλογραφία"
-          inappropriate: "μαρκαρισμένο σαν ακατάλληλο"
+          off_topic: "επισήμαναν ως εκτός θέματος"
+          spam: "επισήμαναν ως ανεπιθύμητη αλληλογραφία"
+          inappropriate: "επισήμαναν ως ακατάλληλο"
           notify_moderators: "ειδοποιήθηκαν οι συντονιστές"
-          notify_user: "έστειλε ένα μήνυμα"
-          bookmark: "του έβαλαν σελιδοδείκτη"
-          like: "Σου άρεσε αυτό"
-          vote: "Ψήφισες για αυτό"
+          notify_user: "έστειλαν ένα μήνυμα"
+          bookmark: "έβαλαν σελιδοδείκτη"
+          like: "άρεσαν αυτό"
+          like_capped:
+            one: "και {{count}} άλλος το άρεσε αυτό "
+            other: "και {{count}} άλλοι το άρεσαν αυτό "
+          vote: "ψήφισαν για αυτό"
         by_you:
           off_topic: "Το επισήμανες σαν εκτός θέματος"
           spam: "Το επισήμανες σαν ανεπιθύμητο"
           inappropriate: "Το επισήμανες σαν ανάρμοστο"
           notify_moderators: "Το επισήμανες στους συντονιστές"
           notify_user: "Έστειλες ένα μήνυμα σε αυτόν τον χρήστη"
-          bookmark: "Τοποθέτησες σελιδοδείκτη σε αυτή την ανάρτηση"
-          like: "«Σου άρεσε» η ανάρτηση"
+          bookmark: "Τοποθέτησες σελιδοδείκτη στην ανάρτηση"
+          like: "Σου άρεσε η ανάρτηση"
           vote: "Ψήφισες για αυτή την ανάρτηση"
         by_you_and_others:
           off_topic:
-            one: "Εσύ και άλλος ένας το επισημάνατε σαν εκτός θέματος "
-            other: "Εσύ και άλλοι {{count}}  το επισημάνατε σαν εκτός θέματος "
+            one: "Εσύ και 1 ακόμα το επισημάνατε ως εκτός θέματος "
+            other: "Εσύ και {{count}} ακόμα το επισημάνατε ως εκτός θέματος "
           spam:
-            one: "Εσύ και άλλος ένας το επισημάνατε ως ανεπιθύμητο  "
-            other: "Εσύ και άλλοι {{count}} το επισημάνατε ως ανεπιθύμητο  "
+            one: "Εσύ και 1 ακόμα το επισημάνατε ως ανεπιθύμητο  "
+            other: "Εσύ και {{count}} ακόμα το επισημάνατε ως ανεπιθύμητο  "
           inappropriate:
-            one: "Εσύ και άλλος ένας το επισημάνατε ως ανάρμοστο"
-            other: "Εσύ και άλλοι {{count}}  το επισημάνατε ως ανάρμοστο"
+            one: "Εσύ και 1 ακόμα το επισημάνατε ως ανάρμοστο"
+            other: "Εσύ και {{count}} ακόμα το επισημάνατε ως ανάρμοστο"
           notify_moderators:
-            one: "Εσύ και άλλος ένας το επισημάνατε στους συντονιστές"
-            other: "Εσύ και άλλοι {{count}}  το επισημάνατε στους συντονιστές"
+            one: "Εσύ και 1 ακόμα το επισημάνατε στους συντονιστές"
+            other: "Εσύ και {{count}} ακόμα το επισημάνατε στους συντονιστές"
           notify_user:
-            one: "Εσύ και ένα ακόμη πρόσωπο στείλατε ένα μήνυμα σε αυτόν τον χρήστη"
-            other: "Εσύ και {{count}} άλλοι στείλατε ένα μήνυμα σε αυτόν τον χρήστη"
+            one: "Εσύ και 1 ακόμα στείλατε ένα μήνυμα σε αυτόν τον χρήστη"
+            other: "Εσύ και {{count}} ακόμα στείλατε ένα μήνυμα σε αυτόν τον χρήστη"
           bookmark:
-            one: "Εσύ και άλλος ένας τοποθετήσατε σελιδοδείκτη στην ανάρτηση"
-            other: "Εσύ και άλλοι {{count}} τοποθετήσατε σελιδοδείκτη στην ανάρτηση"
+            one: "Εσύ και 1 ακόμα τοποθετήσατε σελιδοδείκτη στην ανάρτηση"
+            other: "Εσύ και {{count}} ακόμα τοποθετήσατε σελιδοδείκτη στην ανάρτηση"
           like:
-            one: "Εσένα και ενός άλλου «σας άρεσε»"
-            other: "Εσένα και {{count}} άλλων «σας άρεσε»"
+            one: "Εσένα και 1 ακόμα σας άρεσε"
+            other: "Εσένα και {{count}} ακόμα σας άρεσε"
           vote:
-            one: "Εσύ και άλλος ένας ψηφίσατε για την ανάρτηση"
-            other: "Εσύ και άλλοι {{count}} ψηφίσατε για την ανάρτηση"
+            one: "Εσύ και 1 ακόμα ψηφίσατε για την ανάρτηση"
+            other: "Εσύ και {{count}} ακόμα ψηφίσατε για την ανάρτηση"
         by_others:
           off_topic:
-            one: "Ένα άτομο το επισήμανε σαν εκτός θέματος"
-            other: "{{count}} άτομα το επισημάνανε σαν εκτός θέματος"
+            one: "Ένα άτομο το επισήμανε ως εκτός θέματος"
+            other: "{{count}} άτομα το επισημάνανε ως εκτός θέματος"
           spam:
-            one: "Ένα άτομο το επισήμανε σαν ανεπιθύμητο"
-            other: "{{count}} άτομα το επισημάνανε σαν ανεπιθύμητο"
+            one: "Ένα άτομο το επισήμανε ως ανεπιθύμητο"
+            other: "{{count}} άτομα το επισημάνανε ως ανεπιθύμητο"
           inappropriate:
-            one: "Ένα άτομο το επισήμανε σαν ανάρμοστο"
-            other: "{{count}} άτομα το επισημάνανε σαν ανάρμοστο"
+            one: "Ένα άτομο το επισήμανε ως ανάρμοστο"
+            other: "{{count}} άτομα το επισημάνανε ως ανάρμοστο"
           notify_moderators:
             one: "Ένα άτομο το επισήμανε στους συντονιστές"
             other: "{{count}} άτομα το επισημάνανε στους συντονιστές"
           notify_user:
             one: "1 πρόσωπο έστειλε ένα μήνυμα σε αυτόν τον χρήστη"
-            other: "{{count}} πρόσωπα έστειλαν ένα μήνυμα σε αυτόν τον χρήστη"
+            other: "{{count}} άτομα έστειλαν ένα μήνυμα σε αυτόν τον χρήστη"
           bookmark:
             one: "Ένα άτομο τοποθέτησε σελιδοδείκτη στην ανάρτηση"
             other: "{{count}} άτομα τοποθέτησαν σελιδοδείκτη στην ανάρτηση"
@@ -1683,14 +1821,10 @@ el:
           vote:
             one: "Ένα άτομο ψήφισε για την ανάρτηση"
             other: "{{count}} άτομα ψήφισαν για την ανάρτηση"
-      delete:
-        confirm:
-          one: "Είσαι σίγουρος ότι θέλεις να σβήσεις αυτή την ανάρτηση;"
-          other: "Είσαι σίγουρος ότι θέλεις να σβήσεις όλες αυτές τις αναρτήσεις;"
       merge:
         confirm:
-          one: "Είσαι βέβαιος πως θέλεις να συγχωνεύσεις αυτές τις δημοσιεύσεις;"
-          other: "Είσαι βέβαιος πως θέλεις να συγχωνεύσεις αυτές {{count}} τις δημοσιεύσεις;"
+          one: "Είσαι σίγουρος πως θέλεις να συγχωνεύσεις αυτές τις δημοσιεύσεις;"
+          other: "Είσαι σίγουρος πως θέλεις να συγχωνεύσεις αυτές τις {{count}} αναρτήσεις;"
       revisions:
         controls:
           first: "Πρώτη αναθεώρηση"
@@ -1699,19 +1833,19 @@ el:
           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}}"
+          revert: "Επιστροφή σε αυτήν την αναθεώρηση"
+          edit_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: "Δείξε τις αλλαγές ανάμεσα στο κείμενο"
+            title: "Δείξε το φορμαρισμένο κείμενο με τις αλλαγές και προσθηκες ενσωματωμένες σε αυτό"
             button: 'HTML'
           side_by_side:
-            title: "Δείξε τις αλλαγές δίπλα στο κείμενο"
+            title: "Δείξε τις αλλαγές στο φορμαρισμένο κείμενο δίπλα-δίπλα"
             button: 'HTML'
           side_by_side_markdown:
-            title: "Δείξε τα αρχικά κείμενα δίπλα-δίπλα για σύγκριση"
+            title: "Δείξε τις αλλαγές στο αρχικό κείμενο δίπλα-δίπλα"
             button: 'Ακατέργαστο'
       raw_email:
         displays:
@@ -1731,88 +1865,89 @@ el:
       choose: 'Επιλογή κατηγορίας&hellip;'
       edit: 'επεξεργασία'
       edit_long: "Επεξεργασία"
-      view: 'Δείξε τα νήματα αυτής της κατηγορίας'
+      view: 'Προβολή Νημάτων στην Κατηγορία'
       general: 'Γενικά'
       settings: 'Ρυθμίσεις'
-      topic_template: "Δείγμα νήματος"
+      topic_template: "Πρότυπο Νήματος"
       tags: "Ετικέτες"
-      tags_allowed_tags: "Ετικέτες που μπορούν να χρησιμοποιηθούν μόνο σε αυτή την κατηγορία:"
-      tags_allowed_tag_groups: "Βάλε ετικέτα σε ομάδες που μπορούν να χρησιμοποιηθούν μόνο σε αυτή την κατηγορία:"
+      tags_allowed_tags: "Επέτρεψε μόνο σε αυτές τις ετικέτες να χρησιμοποιηθούν σε αυτή την κατηγορία."
+      tags_allowed_tag_groups: "Επέτρεψε μόνο ετικέτες από αυτές τις ομάδες να χρησιμοποιηθούν σε αυτή την κατηγορία."
       tags_placeholder: "(Προαιρετική) λίστα επιτρεπόμενων ετικετών"
-      tag_groups_placeholder: "(Προαιρετική) λίστα επιτρεπόμενων ετικετών σε ομάδες"
+      tag_groups_placeholder: "(Προαιρετική) λίστα επιτρεπόμενων ομάδων ετικετών"
       topic_featured_link_allowed: "Επίτρεψε προτεινόμενους συνδέσμους σε αυτή την κατηγορία"
-      delete: 'Διαγραφή κατηγορίας'
-      create: 'Νέα κατηγορία'
-      create_long: 'Δημιουργία καινούριας κατηγορίας'
-      save: 'Αποθήκευση κατηγορίας'
-      slug: 'Μνημονικό για το URL'
-      slug_placeholder: '(Προαιρετικά) με λέξεις ενωμένες με παύλα για το URL'
+      delete: 'Διαγραφή Κατηγορίας'
+      create: 'Νέα Κατηγορία'
+      create_long: 'Δημιουργία νέας κατηγορίας'
+      save: 'Αποθήκευση Κατηγορίας'
+      slug: 'Φιλικό Όνομα Κατηγορίας'
+      slug_placeholder: '(Προαιρετικά) λέξεις ενωμένες με παύλα για το URL'
       creation_error: Παρουσιάστηκε κάποιο σφάλμα κατά την δημιουργία της κατηγορίας
       save_error: Παρουσιάστηκε κάποιο σφάλμα κατά την αποθήκευση της κατηγορίας.
-      name: "Όνομα κατηγορίας"
+      name: "Όνομα Κατηγορίας"
       description: "Περιγραφή"
-      topic: "Κατηγορία νήματος"
-      logo: "Εικονίδιο κατηγορίας"
-      background_image: "Εικόνα φόντου κατηγορίας"
-      badge_colors: "Χρώματα παράσημου"
+      topic: "νήμα κατηγορίας"
+      logo: "Εικονίδιο Κατηγορίας"
+      background_image: "Εικόνα Φόντου Κατηγορίας"
+      badge_colors: "Χρώματα παρασήμων"
       background_color: "Χρώμα φόντου"
       foreground_color: "Χρώμα στο προσκήνιο"
       name_placeholder: "Μια ή δύο λέξεις το πολύ"
       color_placeholder: "Οποιοδήποτε χρώμα"
       delete_confirm: "Είσαι σίγουρος ότι θέλεις να διαγράψεις αυτή την κατηγορία;"
       delete_error: "Παρουσιάστηκε κάποιο σφάλμα κατά τη διαγραφή της κατηγορίας."
-      list: "Λίστα κατηγοριών"
-      no_description: "Παρακαλώ δώσε μια περιγραφή για την κατηγορία"
-      change_in_category_topic: "Επεξεργασία περιγραφής"
-      already_used: 'Αυτό το χρώμα έχει χρησιμοποιηθεί για άλλη κατηγορία'
+      list: "Λίστα Κατηγοριών"
+      no_description: "Παρακαλώ πρόσθεσε μια περιγραφή στην κατηγορία"
+      change_in_category_topic: "Επεξεργασία Περιγραφής"
+      already_used: 'Αυτό το χρώμα έχει χρησιμοποιηθεί σε άλλη κατηγορία'
       security: "Ασφάλεια"
-      special_warning: "Προσοχή: Αυτή η κατηγορία είναι pre-seeded και οι ρυθμίσεις προστασίας δεν μπορούν να επεξεργαστούν. Εάν δεν επιθυμείτε να χρησιμοποιήσετε αυτήν την κατηγορία, διαγράψτε την αντί να τη επαναχρησιμοποιήσετε για άλλο σκοπό. "
+      special_warning: "Προσοχή: Αυτή η κατηγορία είναι pre-seeded και οι ρυθμίσεις προστασίας δεν μπορούν να επεξεργαστούν. Εάν δεν επιθυμείτε να χρησιμοποιήσετε αυτήν την κατηγορία, διαγράψτε την αντί να την επαναχρησιμοποιήσετε."
       images: "Εικόνες"
-      email_in: "Προσαρμοσμένη διεύθυνση για εισερχόμενα μηνύματα ηλεκτρονικού ταχυδρομείου:"
-      email_in_allow_strangers: "Αποδοχή μηνυμάτων ηλεκτρονικού ταχυδρομείου από ανώνυμους χρήστες, χωρίς λογαριασμούς"
-      email_in_disabled: "Η δημιουργία νέων νημάτων μέσω ηλεκτρονικού ταχυδρομείου είναι απενεργοποιημένη στις ρυθμίσεις. Για να επιτραπεί η δημιουργία νέων νημάτων μέσω ηλεκτρονικού ταχυδρομείου,"
-      email_in_disabled_click: 'ενεργοποίσε τη ρύθμιση «είσοδος με ηλ. ταχυδρομείο»'
+      email_in: "Προσαρμοσμένη διεύθυνση εισερχόμενων email:"
+      email_in_allow_strangers: "Αποδοχή emails από ανώνυμους χρήστες χωρίς λογαριασμό"
+      email_in_disabled: "Η δημιουργία νέων νημάτων μέσω email είναι απενεργοποιημένη στις ρυθμίσεις ιστοσελίδας. Για να επιτραπεί η δημιουργία νέων νημάτων μέσω email,"
+      email_in_disabled_click: 'ενεργοποίησε τη ρύθμιση «εισερχόμενα email».'
       suppress_from_homepage: "Αποσιώπηση αυτής της κατηγορίας από την αρχική σελίδα."
-      show_subcategory_list: "Προβολή υποκατηγοριών κάτω απο τα νήματα αυτής της κατηγορίας "
+      show_subcategory_list: "Προβολή λίστας υποκατηγοριών πάνω απο τα νήματα αυτής της κατηγορίας "
       num_featured_topics: "Αριθμός νημάτων που εμφανίζονται στην σελίδα κατηγοριών:"
       subcategory_num_featured_topics: "Αριθμός προτεινόμενων νημάτων στην σελίδα της γονικής κατηγορίας:"
       all_topics_wiki: "Φτιάξε καινούρια νήματα βίκι από προεπιλογή. "
-      subcategory_list_style: "Στυλ λίστας υποκατηγορίας:"
-      sort_order: "Ταξινόμηση λίστας νημάτων κατά:"
-      default_view: "Προκαθορισμένη λίστα νημάτων:"
+      subcategory_list_style: "Μορφή Λίστας Υποκατηγορίων:"
+      sort_order: "Ταξινόμηση Λίστας Νημάτων Κατά:"
+      default_view: "Προκαθορισμένη Λίστα Νημάτων:"
+      default_top_period: "Προκαθορισμένη Περίοδος Κορυφαίων:"
       allow_badges_label: "Να επιτρέπεται η απονομή παράσημων σε αυτή την κατηγορία"
-      edit_permissions: "Επεξεργασία δικαιωμάτων"
-      add_permission: "Προσθήκη δικαιώματος"
+      edit_permissions: "Επεξεργασία Δικαιωμάτων"
+      add_permission: "Προσθήκη Δικαιώματος"
       this_year: "φέτος"
       position: "θέση"
-      default_position: "Προκαθορισμένη θέση"
+      default_position: "Προκαθορισμένη Θέση"
       position_disabled: "Οι κατηγορίες εμφανίζονται ανάλογα με το πόσο ενεργές είναι. Για να αλλάξει η σειρά εμφάνισης των κατηγοριών, "
       position_disabled_click: 'ενεργοποίησε τη ρύθμιση «σταθερές θεσεις κατηγοριών»'
-      parent: "Μητρική κατηγορία"
+      parent: "Μητρική Κατηγορία"
       notifications:
         watching:
-          title: "Παρατηρείται"
-          description: "Θα παρακολουθείς αυτόματα όλα τα νήματα σε αυτές τις κατηγορίες. Θα λαμβάνεις ειδοποιήσεις για κάθε καινούρια δημοσίευση, και το πλήθος των νέων απαντήσεων θα εμφανίζεται."
+          title: "Επιτηρείται"
+          description: "Θα επιτηρείς αυτόματα όλα τα νήματα σε αυτές τις κατηγορίες. Θα λαμβάνεις ειδοποιήσεις για κάθε νέα ανάρτηση και ένας μετρητής για το πλήθος των νέων απαντήσεων θα εμφανίζεται."
         watching_first_post:
-          title: "Παρακολούθηση πρώτης δημοσίευσης"
-          description: "Θα λαμβάνεις ειδοποίηση μόνο για την πρώτη δημοσίευση των καινούριων θεμάτων σε αυτές τις κατηγορίες."
+          title: "Επιτήρηση Πρώτης Ανάρτησης"
+          description: "Θα λαμβάνεις ειδοποίηση μόνο για την πρώτη ανάρτηση σε κάθε νέο νήμα σε αυτές τις κατηγορίες."
         tracking:
           title: "Παρακολουθείται"
-          description: "Θα παρακολουθείς αυτόματα όλα τα νήματα σε αυτές τις κατηγορίες. Θα λαμβάνεις ειδοποιήσεις, εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα, και το πλήθος των νέων απαντήσεων θα εμφανίζεται."
+          description: "Θα παρακολουθείς αυτόματα όλα τα νήματα σε αυτές τις κατηγορίες. Θα λαμβάνεις ειδοποιήσεις εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα και ένας μετρητής για το πλήθος των νέων απαντήσεων θα εμφανίζεται."
         regular:
           title: "Φυσιολογικά"
-          description: "Θα ειδοποιείσαι εάν κάποιος αναφέρει το @όνομά σου ή απαντά σε εσένα."
+          description: "Θα ειδοποιείσαι εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα."
         muted:
           title: "Σε σιγή"
-          description: "Δε θα λαμβάνεις ποτέ ειδοποιήσεις για οτιδήποτε σχετικό με τα νέα νήματα σε αυτές τις κατηγορίες, και δε θα εμφανίζονται στα τελευταία."
+          description: "Δε θα λαμβάνεις ποτέ ειδοποιήσεις για οτιδήποτε σχετικό με τα νέα νήματα σε αυτές τις κατηγορίες και δε θα εμφανίζονται στα τελευταία."
       sort_options:
         default: "προεπιλογή"
         likes: "Αρέσει"
-        op_likes: "Πρωτότυπο Δημοσίευση \"Μου αρέσει\""
+        op_likes: "\"Μου αρέσει\" Αρχικής Ανάρτησης"
         views: "Προβολές"
-        posts: "Δημοσιεύσεις"
+        posts: "Αναρτήσεις"
         activity: "Δραστηριότητα"
-        posters: "Αφίσες"
+        posters: "Συμμετέχοντες"
         category: "Κατηγορία"
         created: "Δημιουργήθηκε"
       sort_ascending: 'Αύξουσα'
@@ -1824,19 +1959,19 @@ el:
         boxes_with_featured_topics: "Κουτιά με προτεινόμενα νήματα"
     flagging:
       title: 'Ευχαριστούμε για τη συνεισφορά σου!'
-      action: 'Επισήμανση ανάρτησης'
-      take_action: "Κάνε κάτι"
+      action: 'Επισήμανση Ανάρτησης'
+      take_action: "Λάβε Δράση"
       notify_action: 'Μήνυμα'
       official_warning: 'Επίσημη Προειδοποίηση'
-      delete_spammer: "Διαγραφή του ανεπιθύμητου χρήστη"
-      delete_confirm_MF: "Πρόκειται να διαγράψεις {POSTS, plural, one {<b>1</b> post} άλλα {<b>#</b> δημοσιεύσεις}} και{TOPICS,plural, one {<b>1</b> topic} άλλα {<b>#</b> topics}} από το χρήστη, αφαίρεσε το λογαριασμό τους, μπλόκαρε τις εγγραφές από τη διεύθυνση IP <b>{ip_address}</b>, και πρόσθεσε τη διεύθυνση του ηλεκτρονικού ταχυδρομείου τους <b>{email}</b> σε μια μόνιμη καταχώρηση μπλοκαρισμένων. Είσαι βέβαιος πως αυτός ο χρήστης είναι ανεπιθύμητος;"
+      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> και να πρόσθεσεις την διεύθυνση email <b>{email}</b> στην λίστα ανεπιθύμητων. Είσαι βέβαιος πως αυτός ο χρήστης είναι ανεπιθύμητος;"
       yes_delete_spammer: "Ναι, σβήσε τον ανεπιθύμητο χρήστη"
       ip_address_missing: "(μη διαθέσιμο)"
       hidden_email_address: "(κρυφό)"
       submit_tooltip: "Στείλε την κρυφή επισήμανση"
       take_action_tooltip: "Να φτάσει αμέσως στο όριο των απαραίτητων ειδοποιήσεων, αντί να περιμένει και άλλες ειδοποιήσεις από την κοινότητα."
       cant: "Λυπούμαστε, αυτή τη στιγμή δεν γίνεται να επισημάνεις την ανάρτηση."
-      notify_staff: 'Ειδοποίηση του προσωπικού ιδιωτικά'
+      notify_staff: 'Ιδιωτική ειδοποίηση συνεργατών'
       formatted_name:
         off_topic: "Είναι εκτός θέματος"
         inappropriate: "Είναι ανάρμοστο"
@@ -1846,27 +1981,27 @@ el:
       custom_message:
         at_least:
           one: "βάλε τουλάχιστον 1 χαρακτήρα"
-          other: "βάλε τουλάχιστον {{count}} χαρακτήρες"
+          other: "γράψε τουλάχιστον {{count}} χαρακτήρες"
         more:
           one: "1 να πας..."
-          other: "{{count}} να πας..."
+          other: "{{count}} ακόμα..."
         left:
           one: "1 απομένει"
-          other: "{{count}} απομένει"
+          other: "{{count}} απομένουν"
     flagging_topic:
       title: "Ευχαριστούμε για τη συνεισφρορά σου..."
-      action: "Επισήμανση του νήματος"
+      action: "Επισήμανση Νήματος"
       notify_action: "Μήνυμα"
     topic_map:
-      title: "Περίληψη νήματος"
-      participants_title: "Συχνές δημοσιεύσεις"
+      title: "Περίληψη Νήματος"
+      participants_title: "Συχνοί Συμμετέχοντες"
       links_title: "Δημοφιλείς Σύνδεσμοι"
-      links_shown: "εμφάνισε περισσότερες συνδέσεις"
+      links_shown: "εμφάνισε περισσότερους συνδέσμους..."
       clicks:
         one: "1 κλικ"
         other: "%{count} κλικ"
     post_links:
-      about: "επέκτεινε περισσότερους συνδέσμους για αυτή τη δημοσίευση"
+      about: "ανάπτυξε περισσότερους συνδέσμους για αυτή την ανάρτηση"
       title:
         one: "1 περισσότερο"
         other: "%{count} περισσότερα"
@@ -1878,29 +2013,29 @@ el:
       locked:
         help: "Αυτό το νήμα είναι πια κλειστό. Οι απαντήσεις δεν είναι πλέον δυνατές"
       archived:
-        help: "Αυτό το νήμα είναι αρχικοποιημένο. Έχει παγώσει και δεν μπορεί πλέον να τροποποιηθεί"
+        help: "Αυτό το νήμα είναι αρχειοθετημένο. Έχει παγώσει και δεν μπορεί πλέον να τροποποιηθεί"
       locked_and_archived:
-        help: "Αυτό το θέμα είναι κλειστό και αρχειοθετημένο. Δε δέχεται πια καινούριες απαντήσεις και δεν μπορεί να αλλάξει."
+        help: "Αυτό το νήμα είναι κλειστό και αρχειοθετημένο. Δε δέχεται πια καινούριες απαντήσεις και δεν μπορεί να τροποποιηθεί"
       unpinned:
         title: "Ξεκαρφιτσωμένο"
         help: "Για σένα αυτό το νήμα είναι ξεκαρφιτσωμένο. Θα εμφανίζεται στην κανονική του σειρά."
       pinned_globally:
-        title: "Παντού καρφιτσωμένο"
-        help: "Αυτό το νήμα είναι καρφιτσωμένο παγκοσμίως. Θα εμφανίζεται στην κορυφή των τελευταίων και στην κατηγορία του"
+        title: "Καρφιτσωμένο Καθολικά"
+        help: "Αυτό το νήμα είναι καρφιτσωμένο καθολικά. Θα εμφανίζεται στην κορυφή των τελευταίων και στην κατηγορία του"
       pinned:
         title: "Καρφιτσωμένο"
         help: "Αυτό το νήμα είναι καρφιτσωμένο για σένα. Θα εμφανίζεται πάντα στην κορυφή της κατηγορίας του "
       invisible:
-        help: "Αυτό το νήμα είναι αόρατο. Δε θα εμφανίζεται σε καμια λίστα νημάτων και μπορεί να φάνε μόνο αν ακολουθήσεις ένα άμεσο σύνδεσμο προς αυτό."
+        help: "Αυτό το νήμα είναι αόρατο. Δε θα εμφανίζεται σε καμια λίστα νημάτων και μπορεί να εμφανιστεί μόνο αν ακολουθήσεις ένα άμεσο σύνδεσμο προς αυτό."
     posts: "Αναρτήσεις"
     posts_long: "υπάρχουν {{number}} αναρτήσεις σε αυτό το νήμα"
     posts_likes_MF: |
       Αυτό το νήμα έχει {count, plural, one {1 απάντηση} other {# απαντήσεις}} {ratio, select,
-      χαμηλό {με μεγάλη αναλογία «μου αρέσει» στις αναρτήσεις}
-      μέτριο {με πολύ μεγάλη αναλογία «μου αρέσει» στις αναρτήσεις}
-      ψηλό
-      {με εξαιρετικά μεγάλη αναλογία «μου αρέσει» στις αναρτήσεις} other {}}
-    original_post: "Αρχική ανάρτηση"
+      low {με μεγάλη αναλογία «μου αρέσει» στις αναρτήσεις}
+      med {με πολύ μεγάλη αναλογία «μου αρέσει» στις αναρτήσεις}
+      high {με εξαιρετικά μεγάλη αναλογία «μου αρέσει» στις αναρτήσεις}
+      other {}}
+    original_post: "Αρχική Ανάρτηση"
     views: "Προβολές"
     views_lowercase:
       one: "προβολή"
@@ -1925,10 +2060,10 @@ el:
     raw_email:
       title: "Εισερχόμενα email"
       not_available: "Μη διαθέσιμο!"
-    categories_list: "Λίστα κατηγοριών"
+    categories_list: "Λίστα Κατηγοριών"
     filters:
       with_topics: "%{filter} νήματα"
-      with_category: "%{filter}ε νήματα στην %{category}"
+      with_category: "%{filter} %{category} νήματα"
       latest:
         title: "Τελευταία"
         title_with_count:
@@ -1936,10 +2071,10 @@ el:
           other: "Τελευταία ({{count}})"
         help: "νήματα με πρόσφατες αναρτήσεις"
       hot:
-        title: "Δημοφιλές"
+        title: "Δημοφιλή"
         help: "μια επιλογή από δημοφιλή νήματα"
       read:
-        title: "Διαβασμένο"
+        title: "Διαβασμένα"
         help: "νήματα που έχεις διαβάσει, με τη σειρά που τα έχεις διαβάσει"
       search:
         title: "Αναζήτηση"
@@ -1949,20 +2084,20 @@ el:
         title_in: "Κατηγορία - {{categoryName}}"
         help: "όλα τα νήματα ομαδοποιημένα ανά κατηγορία"
       unread:
-        title: "Μη αναγνωσμένο"
+        title: "Αδιάβαστα"
         title_with_count:
           one: "Μη αναγνωσμένα (1)"
-          other: "Μη αναγνωσμένα ({{count}})"
-        help: "νήματα που παρακολουθείς και που έχουν αδιάβαστες αναρτήσεις"
+          other: "Αδιάβαστα ({{count}})"
+        help: "νήματα που επιτηρείς ή παρακολουθείς και που έχουν αδιάβαστες αναρτήσεις"
         lower_title_with_count:
           one: "1 μη αναγνωσμένο"
-          other: "{{count}} μη αναγνωσμένα"
+          other: "{{count}} αδιάβαστα"
       new:
         lower_title_with_count:
           one: "1 νέο"
           other: "{{count}} νέα"
-        lower_title: "νέο"
-        title: "Καινούριο"
+        lower_title: "νέα"
+        title: "Νέα"
         title_with_count:
           one: "Νέα (1)"
           other: "Νέα ({{count}})"
@@ -1972,7 +2107,7 @@ el:
         help: "νήματα στα οποία έχεις αναρτήσεις"
       bookmarks:
         title: "Σελιδοδείκτες"
-        help: "νήματα όπου έχεις σελιδοδείκτη"
+        help: "νήματα στα οποία έχεις βάλει σελιδοδείκτη"
       category:
         title: "{{categoryName}}"
         title_with_count:
@@ -1985,23 +2120,23 @@ el:
         all:
           title: "Από πάντα"
         yearly:
-          title: "Ανά έτος"
+          title: "Ετήσια"
         quarterly:
-          title: "Τριμηνιαία έκδοση"
+          title: "Τριμηνιαία"
         monthly:
-          title: "Ανά μήνα"
+          title: "Μηνιαία"
         weekly:
-          title: "Ανά εβδομάδα"
+          title: "Εβδομαδιαία"
         daily:
-          title: "Ανά μέρα"
+          title: "Ημερήσια"
         all_time: "Από πάντα"
         this_year: "Χρόνος"
         this_quarter: "Τέταρτο"
         this_month: "Μήνας"
-        this_week: "εβδομάδα"
+        this_week: "Εβδομάδα"
         today: "Σήμερα"
         other_periods: "δες τα κορυφαία"
-    browser_update: 'Δυστυχώς, <a href="http://www.discourse.org/faq/#browser">το πρόγραμμα περιήγησής σου είναι πολύ παλιό για να δουλέψει σε αυτό τον ιστότοπο</a>. Παρακαλώ <a href="http://browsehappy.com">ενημέρωσέ το</a>.'
+    browser_update: 'Δυστυχώς, <a href="http://www.discourse.org/faq/#browser">το πρόγραμμα περιήγησής σου είναι πολύ παλιό για να δουλέψει σε αυτό τον ιστότοπο</a>. Παρακαλώ <a href="http://browsehappy.com">αναβάθμισέ το</a>.'
     permission_types:
       full: "Δημιούργησε / Απάντησε / Δες"
       create_post: "Απάντησε / Δες"
@@ -2009,13 +2144,13 @@ el:
     lightbox:
       download: "λήψη"
     keyboard_shortcuts_help:
-      title: 'Συντόμευση Πληκτρολογίου'
+      title: 'Συντομεύσεις Πληκτρολογίου'
       jump_to:
-        title: 'Μεταπήδηση σε'
+        title: 'Μετάβαση Προς'
         home: '<b>g</b>, <b>h</b> Αρχική'
         latest: '<b>g</b>, <b>I</b> Τελευταία'
         new: '<b>g</b>, <b>n</b> Νέα'
-        unread: '<b>g</b>, <b>u</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> Σελιδοδείκτες'
@@ -2023,42 +2158,42 @@ el:
         messages: '<b>g</b>, <b>m</b> Μηνύματα'
       navigation:
         title: 'Πλοήγηση'
-        jump: '<b>#</b> Πήγαινε στη δημοσίευση #'
+        jump: '<b>#</b> Πήγαινε στην ανάρτηση #'
         back: '<b>u</b> Πίσω'
         up_down: '<b>k</b>j</b> Μετακίνηση επιλογής &uarr; &darr;'
-        open: '<b>o</b> ή <b>Εισαγωγή</b> Άνοιξε το επιλεγμένο νήμα'
+        open: '<b>o</b> ή <b>Enter</b> Άνοιξε το επιλεγμένο νήμα'
         next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Επόμενη/Προηγούμενη ενότητα'
       application:
         title: 'Εφαρμογή'
-        create: 'Δημιουργία νέου νήματος'
+        create: '<b>c</b> Δημιουργία νέου νήματος'
         notifications: '<b>n</b> Άνοιγμα ειδοποιήσεων'
-        hamburger_menu: '<b>=</b>''Ανοιξε το μενού χάμπουρκερ'
-        user_profile_menu: '<b>p</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> Απόρριψη νημάτων'
+        search: '<b>/</b> or <b>ctrl</b>+<b>alt</b>+<b>f</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: 'Τοποθέτηση σελιδοδείκτη στο νήμα'
+        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> Κοινοποίηση δημοσίευσης'
+        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>I</b> "Μου αρέσει" η δημοσίευση'
-        flag: '<b>!</b> Επισήμανση δημοσίευσης'
-        bookmark: '<b>b</b> Τοποθέτηση σελιδοδείκτη στη δημοσίευση'
-        edit: '<b>e</b> Επεξεργασία δημοσίευσης'
+        reply_post: '<b>r</b> Απάντηση στην ανάρτηση'
+        quote_post: '<b>q</b> Παράθεση ανάρτησης'
+        like: '<b>I</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_regular: '<b>m</b>, <b>r</b> Κανονικό (προεπιλογή) νήμα'
         mark_tracking: '<b>m</b>, <b>t</b> Παρακολούθηση νήματος'
-        mark_watching: '<b>m</b>, <b>w</b> Παρατήρηση νήματος'
+        mark_watching: '<b>m</b>, <b>w</b> Επιτήρηση Νήματος'
         print: '<b>ctrl</b>+<b>p</b> Εκτύπωση νήματος'
     badges:
       earned_n_times:
@@ -2067,6 +2202,8 @@ el:
       granted_on: "Χορηγήθηκε στις %{date}"
       others_count: "Άλλοι με αυτό το παράσημο (%{count})"
       title: Παράσημα
+      allow_title: "Μπορείς να χρησιμοποιήσεις αυτό το παράσημο σαν τίτλο"
+      multiple_grant: "Μπορείς να το κερδίσεις πολλές φορές"
       badge_count:
         one: "1 Παράσημο"
         other: "%{count} Παράσημα"
@@ -2088,100 +2225,101 @@ el:
         other:
           name: Άλλο
         posting:
-          name: Δημοσιεύεται
+          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;">
+      <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>
+      <button class="btn btn-primary">Google</button>
       </form>
       </p>
     tagging:
       all_tags: "Όλες οι Ετικέτες"
       selector_all_tags: "όλες οι ετικέτες"
       selector_no_tags: "καμία ετικέτα"
-      changed: "οι ετικέτες άλλαξαν"
+      changed: "αλλαγμένες ετικέτες:"
       tags: "Ετικέτες"
-      choose_for_topic: "επίλεξε προαιρετικές ετικέτες για αυτό το νήμα"
       delete_tag: "Αφαίρεση Ετικέτας"
-      delete_confirm: "Είσαι σίγουρος πως θέλεις να αφαιρέσεις την ετικέτα;"
+      delete_confirm:
+        one: "Είσαι βέβαιος πως θέλεις να διαγράψεις αυτήν την ετικέτα και να την αφαιρέσεις από το 1 νήμα στο οποίο είναι προσαρτημένη;"
+        other: "Είσαι βέβαιος πως θέλεις να διαγράψεις αυτήν την ετικέτα και να την αφαιρέσεις από τα {{count}} νήματα στα οποία είναι προσαρτημένη;"
+      delete_confirm_no_topics: "Είσαι βέβαιος πως θέλεις να διαγράψεις αυτήν την ετικέτα;"
       rename_tag: "Μετονομασία Ετικέτας"
       rename_instructions: "Επίλεξε ένα καινούριο όνομα για την ετικέτα:"
-      sort_by: "Ταξινόμηση κατά"
-      sort_by_count: "μετρώ"
+      sort_by: "Ταξινόμηση κατά:"
+      sort_by_count: "άθροισμα"
       sort_by_name: "όνομα"
       manage_groups: "Διαχείριση Ομάδων Ετικέτας"
       manage_groups_description: "Καθορισμός ομάδων για την οργάνωση ετικετών"
       filters:
         without_category: "%{filter} %{tag} νήματα"
-        with_category: "%{filter} %{tag} θέματα στην %{category}"
+        with_category: "%{filter} %{tag} νήματα στην %{category}"
         untagged_without_category: "%{filter} νήματα χωρίς ετικέτες"
         untagged_with_category: "%{filter} νήματα χωρίς ετικέτες σε %{category}"
       notifications:
         watching:
-          title: "Παρακολούθηση"
-          description: "Θα παρακολουθείς αυτόματα όλα τα νήματα με αυτή την ετικέτα. Θα λαμβάνεις ειδοποιήσεις όλων των καινούριων δημοσιεύσεων και νημάτων, και το πλήθος των μη αναγνωσμένων και καινούριων δημοσιεύσεων θα εμφανίζεται επίσης δίπλα στο νήμα."
+          title: "Επιτηρείται"
+          description: "Θα επιτηρείς αυτόματα όλα τα νήματα με αυτή την ετικέτα. Θα λαμβάνεις ειδοποιήσεις για όλες τις νέες αναρτήσεις και νήματα και ένας μετρητής αδιάβαστων και νέων αναρτήσεων θα εμφανίζεται επίσης δίπλα στο νήμα."
         watching_first_post:
-          title: "Παρακολούθηση πρώτης δημοσίευσης"
-          description: "Θα λαμβάνεις ειδοποιήσεις μόνο για την πρώτη δημοσίευση του κάθε καινούριου νήματος με αυτή την ετικέτα."
+          title: "Επιτήρηση Πρώτης Ανάρτησης"
+          description: "Θα λαμβάνεις ειδοποιήσεις για την πρώτη ανάρτηση για κάθε νέο νήμα με αυτή την ετικέτα."
         tracking:
           title: "Παρακολουθείται"
-          description: "Θα παρακολουθείς αυτόματα όλα τα νήματα με αυτή την ετικέτα. Το πλήθος των μη αναγνωσμένων δημοσιεύσεων θα εμφανίζεται δίπλα στο νήμα."
+          description: "Θα παρακολουθείς αυτόματα όλα τα νήματα με αυτή την ετικέτα. Ένας μετρητής αδιάβαστων αναρτήσεων θα εμφανίζεται δίπλα στο νήμα."
         regular:
-          title: "Κανονικός"
-          description: "Θα λαμβάνεις ειδοποίηση εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε αυτή τη δημοσίευση."
+          title: "Τακτικός"
+          description: "Θα λαμβάνεις ειδοποίηση εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε αυτή τη ανάρτηση."
         muted:
           title: "Σίγαση"
-          description: "Δε θα λαμβάνεις ειδοποιήσεις για οτιδήποτε σχετικά με τα καινούρια νήματα με αυτή την ετικέτα, και δε θα εμφανίζονται στην καρτέλα με τα μη αναγνωσμένα."
+          description: "Δε θα λαμβάνεις ειδοποιήσεις για νέα νήματα με αυτή την ετικέτα και δε θα εμφανίζονται στην καρτέλα με τα αδιάβαστα."
       groups:
-        title: "Ομάδες ετικέτας"
-        about: "Πρόσθεσε ετικέτες στις ομάδες για να τις διαχειριστείς με περισσότερη ευκολία."
-        new: "Καινούρια ομάδα"
+        title: "Ομάδες Ετικετών"
+        about: "Πρόσθεσε ετικέτες σε ομάδες για να τις διαχειριστείς με περισσότερη ευκολία."
+        new: "Νέα Ομάδα"
         tags_label: "Ετικέτες σε αυτή την ομάδα:"
-        parent_tag_label: "Μητρική Ετικέτα:"
+        parent_tag_label: "Μητρική ετικέτα:"
         parent_tag_placeholder: "Προαιρετικό"
         parent_tag_description: "Οι ετικέτες από αυτή την ομάδα δεν μπορούν να χρησιμοποιηθούν αν δεν είναι παρούσα η μητρική ετικέτα."
         one_per_topic_label: "Περιορισμός μιας ετικέτας για κάθε νήμα από αυτή την ομάδα"
-        new_name: "Νέα ομαδική ετικέτα"
+        new_name: "Νέα Ομάδα Ετικετών"
         save: "Αποθήκευση"
         delete: "Διαγραφή"
-        confirm_delete: "Είσαι βέβαιος πως θέλεις να διαγράψεις αυτή την ομαδική ετικέτα;"
+        confirm_delete: "Είσαι βέβαιος πως θέλεις να διαγράψεις αυτή την ομάδα ετικετών;"
       topics:
         none:
-          unread: "Δεν υπάρχουν μη αναγνωσμένα νήματα."
-          new: "Δεν υπάρχουν νέα νήματα."
+          unread: "Δεν έχεις αδιάβαστα νήματα."
+          new: "Δεν έχεις νέα νήματα."
           read: "Δεν έχεις διαβάσει κανένα νήμα ακόμα."
-          posted: "Δεν έχεις δημοσιεύσει σε κανένα νήμα ακόμα."
+          posted: "Δεν έχεις αναρτήσει σε κανένα νήμα ακόμα."
           latest: "Δεν υπάρχουν τελευταία νήματα."
           hot: "Δεν υπάρχουν δημοφιλή νήματα."
           bookmarks: "Δεν υπάρχουν νήματα με σελιδοδείκτη ακόμα."
           top: "Δεν υπάρχουν κορυφαία νήματα."
-          search: "Δεν υπάρχουν αποτελέσματα από την αναζήτηση."
+          search: "Δεν υπάρχουν αποτελέσματα αναζήτησης."
         bottom:
-          latest: "Δεν υπάρχουν πια τελευταία νήματα."
+          latest: "Δεν υπάρχουν άλλα τελευταία νήματα."
           hot: "Δεν υπάρχουν άλλα κορυφαία μυνήματα"
-          posted: "Δεν υπάρχουν πια νήματα που έχουν δημοσιευθεί."
-          read: "Δεν υπάρχουν πια διαβασμένα νήματα."
-          new: "Αυτά ήταν όλα τα νέα νήματα."
-          unread: "Δεν υπάρχουν πια μη αναγνωσμένα νήματα."
-          top: "Δεν υπάρχουν πια κορυφαία νήματα."
-          bookmarks: "Δεν υπάρχουν πια νήματα με σελιδοδείκτη."
-          search: "Δεν υπάρχουν αποτελέσματα για αυτή την αναζήτηση."
+          posted: "Δεν υπάρχουν άλλα νήματα που έχουν δημοσιευθεί."
+          read: "Δεν υπάρχουν άλλα διαβασμένα νήματα."
+          new: "Δεν υπάρχουν άλλα νέα νήματα."
+          unread: "Δεν υπάρχουν άλλα αδιάβαστα νήματα."
+          top: "Δεν υπάρχουν άλλα κορυφαία νήματα."
+          bookmarks: "Δεν υπάρχουν άλλα νήματα με σελιδοδείκτη."
+          search: "Δεν υπάρχουν άλλα αποτελέσματα για αυτή την αναζήτηση."
     invite:
-      custom_message: "Κάνε την πρόσκλησή σου λίγο πιο προσωπική γράφοντας ένα/μια"
+      custom_message: "Κάνε την πρόσκλησή σου λίγο πιο προσωπική γράφοντας ένα"
       custom_message_link: "προσαρμοσμένο μήνυμα"
       custom_message_placeholder: "Πρόσθεσε το προσαρμοσμένο μήνυμά σου"
-      custom_message_template_forum: "Γεια, θα πρέπει να λάβεις μέρος σε αυτό το φόρουμ/χώρο συζητήσεων!"
+      custom_message_template_forum: "Γεια, θα πρέπει να λάβεις μέρος σε αυτό το χώρο συζητήσεων!"
       custom_message_template_topic: "Γεια, νομίζω ότι θα απολαύσεις αυτό το νήμα!"
     safe_mode:
       enabled: "Η λειτουργία ασφαλείας είναι ενεργοποιημένη, για να εξέλθεις από τη λειτουργία ασφαλείας κλείσε το παράθυρο περιήγησης"
   admin_js:
     type_to_filter: "γράψε εδώ για φιλτράρισμα..."
     admin:
-      title: 'Διαχειριστής του Discourse'
+      title: 'Διαχειριστής'
       moderator: 'Συντονιστής'
       dashboard:
         title: "Πίνακας ελέγχου"
@@ -2202,8 +2340,8 @@ el:
         no_problems: "Δεν βρέθηκε κανένα πρόβλημα."
         moderators: 'Συντονιστές: '
         admins: 'Διαχειριστές:'
-        blocked: 'Αποκλεισμένοι:'
-        suspended: 'Αποκλεισμένα:'
+        silenced: 'Σιγήθηκαν:'
+        suspended: 'Αποβλημένοι:'
         private_messages_short: "Μνμτ."
         private_messages_title: "Μηνύματα"
         mobile_title: "Κινητό"
@@ -2225,84 +2363,84 @@ el:
           30_days_ago: "Πριν από 30 μέρες"
           all: "Όλα"
           view_table: "πίνακας"
-          view_graph: "Γραφική παράσταση"
+          view_graph: "γράφημα"
           refresh_report: "Ανανέωση αναφοράς"
-          start_date: "Ημερομηνία έναρξης"
-          end_date: "Ημερομηνία λήξης"
+          start_date: "Ημερομηνία Έναρξης"
+          end_date: "Ημερομηνία Λήξης"
           groups: "Όλες οι ομάδες"
       commits:
-        latest_changes: "Τελευταίες αλλαγές: παρακαλούμε ανανεώνεται συχνά τη σελίδα σας!!!"
+        latest_changes: "Τελευταίες αλλαγές: παρακαλούμε ανανεώνετε συχνά!"
         by: "από"
       flags:
         title: "Σημάνσεις"
-        old: "Παλιά"
-        active: "Ενεργά"
+        active_posts: "Επισημασμένες Αναρτήσεις"
+        old_posts: "Παλιές Επισημασμένες Αναρτήσεις"
+        topics: "Επισημασμένα Νήματα"
         agree: "Συμφωνώ"
         agree_title: "Επιβεβαίωσε αυτή τη σήμανση ως έγκυρη και σωστή"
-        agree_flag_modal_title: "Συμφωνώ και..."
-        agree_flag_hide_post: "Συμφωνώ (κρύψε την ανάρτηση και στείλε ΠΜ)"
-        agree_flag_hide_post_title: "Κρύψε αυτή την ανάρτηση και ειδοποίησε το χρήστη με ένα αυτόματο μήνυμα που τον προτρέπει να το επεξεργαστεί"
-        agree_flag_restore_post: "Συμφωνώ (επανάφερε την ανάρτηση)"
-        agree_flag_restore_post_title: "Επανάφερε την ανάρτηση"
-        agree_flag: "Συμφωνώ με τη επισήμανση "
-        agree_flag_title: "Συμφωνώ με την επισήμανση και κρατάω την ανάρτηση αμετάβλητη"
-        defer_flag: "Παρέπεμψέ το"
+        agree_flag_hide_post: "Αποδοχή και απόκρυψη ανάρτησης"
+        agree_flag_hide_post_title: "Κρύψε αυτή την ανάρτηση και αυτόματα στείλε στον χρήστη ένα μήνυμα που θα τους προτρέπει να το επεξεργαστούν."
+        agree_flag_restore_post: "Αποδοχή και επαναφορά ανάρτησης"
+        agree_flag_restore_post_title: "Επαναφορά της ανάρτησης ώστε όλοι οι χρήστες να μπορούν να το δουν."
+        agree_flag: "Αποδοχή και διατήρηση της ανάρτησης"
+        agree_flag_title: "Αποδοχή επισήμανσης και διατήρηση της ανάρτησης αμετάβλητης."
+        defer_flag: "Αγνόηση"
         defer_flag_title: "Αφαίρεσε αυτή την επισήμανση. Δεν χρειάζεται να γίνει κάποια ενέργεια αυτή τη στιγμή"
-        delete: "Σβήστη"
-        delete_title: "Σβήσε την ανάρτηση στην οποία αναφέρεται αυτή η επισήμανση."
-        delete_post_defer_flag: "Σβήσε την ανάρτηση και αγνόησε την επισήμανση"
-        delete_post_defer_flag_title: "Σβήσε την ανάρτηση. Αν είναι η πρώτη στο νήμα, σβήστο και αυτό"
-        delete_post_agree_flag: "Σβήσε την ανάρτηση και συμφώνησε με την επισήμανση"
-        delete_post_agree_flag_title: "Σβήσε την ανάρτηση. Αν είναι η πρώτη, σβήστο και αυτό"
-        delete_flag_modal_title: "Σβήσε και..."
+        delete: "Διαγραφή"
+        delete_title: "Διέγραψε την ανάρτηση στην οποία αναφέρεται αυτή η επισήμανση."
+        delete_post_defer_flag: "Διαγραφή ανάρτησης και αγνόηση επισήμανσης"
+        delete_post_defer_flag_title: "Διέγραψε την ανάρτηση. Αν είναι η πρώτη στο νήμα, διέγραψε και αυτό"
+        delete_post_agree_flag: "Διαγραφή ανάρτησης και αποδοχή επισήμανσης"
+        delete_post_agree_flag_title: "Διέγραψε την ανάρτηση. Αν είναι η πρώτη στο νήμα, διέγραψε και αυτό"
+        delete_flag_modal_title: "Διέγραψε και..."
         delete_spammer: "Διαγραφή ανεπιθύμητου χρήστη"
         delete_spammer_title: "Διέγραψε το χρήστη και όλες τις αναρτήσεις και τα νήματά του"
         disagree_flag_unhide_post: "Διαφωνώ (εμφάνισε την ανάρτηση)"
         disagree_flag_unhide_post_title: "Απόρριψε όλες τις επισημάνσεις για την ανάρτηση και κάντη και πάλι ορατή"
-        disagree_flag: "Απόρριψη"
-        disagree_flag_title: "Απόρριψε την επισήμανση ως άκυρη ή εσφαλμένη"
+        disagree_flag: "Διαφωνώ"
+        disagree_flag_title: "Αρνήσου την επισήμανση ως άκυρη ή εσφαλμένη"
         clear_topic_flags: "Έγινε"
         clear_topic_flags_title: "Το νήμα ελέγχθηκε και τα προβλήματα επιλύθηκαν. Κάνε κλίκ στο «έγινε» για να αφαιρέσεις τις επισημάνσεις."
         more: "(περισσότερες απαντήσεις...)"
+        suspend_user: "Αποβολή Χρήστη"
+        suspend_user_title: "Αποβολή χρήστη για αυτή την ανάρτηση"
         dispositions:
-          agreed: "συμφωνώ"
-          disagreed: "απορρίπτω"
-          deferred: "αγνοώ"
-        flagged_by: "Επισημάνθηκε από τον"
-        resolved_by: "Επιλύθηκα από τον"
-        took_action: "Αντέδρασε"
+          agreed: "συμφώνησε"
+          disagreed: "διαφώνησε"
+          deferred: "Αγνοήθηκε"
+        flagged_by: "Επισημάνθηκε από"
+        resolved_by: "Επιλύθηκε από"
+        took_action: "Ενήργησε"
         system: "Σύστημα"
         error: "Κάτι πήγε λάθος"
         reply_message: "Απάντηση"
-        no_results: "Δεν υπάρχουν επισημάνσεις."
+        no_results: "Δεν υπάρχουν επισημασμένες αναρτήσεις."
         topic_flagged: "Αυτό το <strong>νήμα</strong> έχει επισημανθεί."
-        visit_topic: "Επισκέψου το νήμα για να αντιδράσεις"
+        show_full: "εμφάνιση πλήρους ανάρτησης"
+        visit_topic: "Επισκέψου το νήμα για να ενεργήσεις"
         was_edited: "Η ανάρτηση έχει υποστεί επεξεργασία μετά την πρώτη επισήμανση"
         previous_flags_count: "Αυτό το νήμα έχει επισημανθεί ήδη {{count}} φορές"
-        summary:
-          action_type_3:
-            one: "εκτός θέματος"
-            other: "εκτός θέματος x{{count}}"
-          action_type_4:
-            one: "ανάρμοστο"
-            other: "ανάρμοστο x{{count}}"
-          action_type_6:
-            one: "προσπαρμοσμένο"
-            other: "προσαρμοσμένο x{{count}}"
-          action_type_7:
-            one: "προσαρμοσμένο"
-            other: "προσαρμοσμένο x{{count}}"
-          action_type_8:
-            one: "ανεπιθύμητο"
-            other: "ανεπιθύμητο x{{count}}"
+        show_details: "Εμφάνιση λεπτομερειών επισήμανσης"
+        details: "λεπτομέρειες"
+        flagged_topics:
+          topic: "Νήμα"
+          type: "Τύπος"
+          users: "Χρήστες"
+          last_flagged: "Τελευταίες Επισημάνσεις"
+        short_names:
+          off_topic: "εκτός θέματος"
+          inappropriate: "ακατάλληλο"
+          spam: "spam"
+          notify_user: "προσαρμοσμένο"
+          notify_moderators: "προσαρμοσμένο"
       groups:
         primary: "Κύρια ομάδα"
-        no_primary: "(καμια κύρια ομάδα)"
+        no_primary: "(χωρίς κύρια ομάδα)"
         title: "Ομάδες"
-        edit: "Επεξεργασία ομάδων"
+        edit: "Επεξεργασία Ομάδων"
         refresh: "Ανανέωση "
         new: "Νέα"
-        selector_placeholder: "εισαγωγή χρηστώνυμου"
+        selector_placeholder: "εισαγωγή ονόματος χρήστη"
         about: "Επεξεργασία των μελών και των ονομάτων της ομάδας εδώ"
         group_members: "Μέλη ομάδας"
         delete: "Διαγραφή"
@@ -2313,39 +2451,40 @@ el:
         add_members: "Προσθήκη μελών"
         custom: "Προσαρμοσμένο"
         bulk_complete: "Οι χρήστες έχουν προστεθεί στην ομάδα."
-        bulk: "Προσθήκη ομαδικής αποστολής αλληλογραφίας σε ομάδα"
-        bulk_paste: "Κάνε επικόλληση μια λίστα με ονόματα χρηστών η διευθύνσεις ηλεκτρονικών μηνυμάτων, ένα σε κάθε σειρά:"
+        bulk_complete_users_not_added: "Αυτοί οι χρήστες δεν προστέθηκαν (βεβαιώσου ότι έχουν λογαριασμό χρήστη):"
+        bulk: "Μαζική Προσθήκη σε Ομάδα"
+        bulk_paste: "Κάνε επικόλληση μια λίστα με ονόματα χρηστών η διευθύνσεις email, ένα σε κάθε σειρά:"
         bulk_select: "(επέλεξε μια ομάδα)"
         automatic: "Αυτόματα"
-        automatic_membership_email_domains: "Οι χρήστης των οποίων το ηλεκτρονικό ταχυδρομείο ταιριάζει με κάποιο από αυτά της λίστας, θα προστίθενται αυτόματα σε αυτή την ομάδα:"
+        automatic_membership_email_domains: "Οι χρήστης των οποίων το email domain ταιριάζει με κάποιο από αυτά της λίστας, θα προστίθενται αυτόματα σε αυτή την ομάδα:"
         automatic_membership_retroactive: "Εφάρμοσε αυτόν τον κανόνα και σε υπάρχοντες χρήστες, για να τους προσθέσεις στην ομάδα:"
         default_title: "Προκαθορισμένος τίτλος για όλους τους χρήστες αυτής της ομάδας"
         primary_group: "Να οριστεί αυτόματα σαν η κύρια ομάδα"
         group_owners: Ιδιοκτήτες
         add_owners: Προσθήκη ιδιοκτητών
-        incoming_email: "Προσαρμοσμένη διεύθυνση ηλεκτρονικού ταχυδρομείου για εισερχόμενα μηνύματα"
-        incoming_email_placeholder: "πρόσθεσε διεύθυνση ηλεκτρονικού ταχυδρομείου"
-        none_selected: "Επέλεξε ομάδα για να ξεκινήσεις"
+        incoming_email: "Προσαρμοσμένη διεύθυνση email για εισερχόμενα μηνύματα"
+        incoming_email_placeholder: "πρόσθεσε διεύθυνση email"
+        none_selected: "Επίλεξε ομάδα για να ξεκινήσεις"
         no_custom_groups: "Δημιουργία νέας προσαρμοσμένης ομάδας"
       api:
-        generate_master: "Δημιουγία κλειδιού Master API"
+        generate_master: "Δημιουργία Master API Key"
         none: "Δεν υπάρχουν ενεργά κλειδιά API αυτή την στιγμή."
         user: "Χρήστης"
         title: "API"
-        key: "Κλειδί API"
+        key: "API Key"
         generate: "Δημιουργία"
         regenerate: "Αναδημιουγία"
         revoke: "Ανάκληση"
-        confirm_regen: "Θες στ' αλήθεια να αντικαταστήσεις το κλειδί API με ένα καινούργιο;"
-        confirm_revoke: "Θες στ' αλήθεια να ανακαλέσεις το κλειδί API;"
-        info_html: "Το κλειδί API σου δίνει τη δυνατότητα να δημιουργήσεις και να επεξεργαστείς νήματα μέσω κλήσεων JSON."
+        confirm_regen: "Θέλεις να αντικαταστήσεις το API Key με ένα καινούργιο;"
+        confirm_revoke: "Θέλεις σίγουρα να ανακαλέσεις το API Key;"
+        info_html: "Το API Key σου δίνει τη δυνατότητα να δημιουργήσεις και να επεξεργαστείς νήματα μέσω κλήσεων JSON."
         all_users: "Όλοι οι χρήστες"
-        note_html: "Αυτό το κλειδί κράτα το <strong>κρυφό</strong>. Όλοι οι χρήστες που το κατέχουν μπορούν να δημιουργήσουν αναρτήσεις υποδυόμενοι οποιονδήποτε χρήστη χωρίς κανέναν περιορισμό."
+        note_html: "Κράτα αυτό το κλειδί <strong>κρυφό</strong>. Όλοι οι χρήστες που το κατέχουν μπορούν να δημιουργήσουν αναρτήσεις υποδυόμενοι οποιονδήποτε χρήστη χωρίς κανέναν περιορισμό."
       web_hooks:
         title: "Webhooks"
         none: "Δεν υπάρχουν Webhooks αυτή τη στιγμή."
-        instruction: "Τα \"Webhooks\" επιτρέπουν στην Discourse να ειδοποιεί εξωτερικές υπηρεσίες όταν ένα συμβάν λαμβάνει χώρα στον ιστότοπό σας. Όταν το \"webhook\"  τεθεί σε λειτουργία θα στείλει ένα αίτημα τύπου POST στα URLs τα οποία δόθηκαν. "
-        detailed_instruction: "Ένα αίτημα δημοσίευσης θα σταλεί στο παρεχόμενο URL όταν συμβεί η εκδήλωση που έχει επιλεγεί."
+        instruction: "Τα \"Webhooks\" επιτρέπουν στην ιστοσελίδα να ειδοποιεί εξωτερικές υπηρεσίες όταν ένα γεγονός συμβεί στον ιστότοπό σας. Όταν το \"webhook\"  τεθεί σε λειτουργία θα στείλει ένα αίτημα τύπου POST στα URLs τα οποία δόθηκαν. "
+        detailed_instruction: "Ένα POST request θα σταλεί στο παρεχόμενο URL όταν συμβεί το γεγονός που έχει επιλεγεί."
         new: "Νέο Webhook"
         create: "Δημιουργία"
         save: "Αποθήκευση"
@@ -2353,73 +2492,73 @@ el:
         description: "Περιγραφή"
         controls: "Έλεγχοι"
         go_back: "Πίσω στη λίστα"
-        payload_url: "Φορτίο URL"
+        payload_url: "Payload URL"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "Φαίνεται ότι προσπαθείς να εγκαταστήσεις το webhook σε ένα τοπικό url. Η εκδήλωση που διανέμεται σε μια τοπική διεύθυνση ενδέχεται να προκαλέσει παρενέργειες ή απρόσμενες συμπεριφορές. Συνέχεια;"
+        warn_local_payload_url: "Φαίνεται ότι προσπαθείς να εγκαταστήσεις το webhook σε ένα τοπικό url. Το γεγονός που διανέμεται σε μια τοπική διεύθυνση ενδέχεται να προκαλέσει παρενέργειες ή απρόσμενες συμπεριφορές. Συνέχεια;"
         secret_invalid: "Ο μυστικός κωδικός δεν πρέπει να έχει κενούς χαρακτήρες."
         secret_too_short: "Ο μυστικός κωδικός πρέπει να έχει τουλάχιστον 12 χαρακτήρες."
         secret_placeholder: "Χρήση ενός προαιρετικού string, για τη δημιουργία υπογραφής. "
-        event_type_missing: "Πρέπει να εγκαταστήσεις τουλάχιστον ένα είδος εκδήλωσης."
+        event_type_missing: "Πρέπει να ρυθμίσεις τουλάχιστον ένα είδος γεγονότος."
         content_type: "Είδος περιεχομένου"
         secret: "Μυστικός κωδικός"
+        event_chooser: "Ποια γεγονότα θα ενεργοποιήσουν αυτό το webhook?"
         wildcard_event: "Στείλε μου τα πάντα."
-        individual_event: "Επίλεξε ατομικές εκδηλώσεις."
-        verify_certificate: "Έλεγχος TLS για το πιστοποιητικό του URL του payload. "
-        active: "Ενργός"
-        active_notice: "Θα διανέμουμε λεπτομέρεις για την εκδήλωση όταν αυτή θα λαμβάνει μέρος"
-        categories_filter_instructions: "Τα σχετικά webhooks θα τεθούν σε λειτουργεία μόνο εαν το συμβάν σχετίζεται με τις προσδιορισμένες κατηγορίες. Για να ενεργοποιήσετε τα webhooks για όλες της κατηγορίες, αφήστε κενό. "
+        individual_event: "Επίλεξε μεμονομένα γεγονότα."
+        verify_certificate: "Έλεγχος TLS certificate για το payload url"
+        active: "Ενεργός"
+        active_notice: "Θα στείλουμε λεπτομέρεις για το γεγονός όταν αυτό συμβεί"
+        categories_filter_instructions: "Τα σχετικά webhooks θα τεθούν σε λειτουργεία μόνο εαν το γεγονός σχετίζεται με τις προσδιορισμένες κατηγορίες. Για να ενεργοποιήσετε τα webhooks για όλες της κατηγορίες, αφήστε κενό. "
         categories_filter: "Ενεργοποιημένες Κατηγορίες"
-        groups_filter_instructions: "Τα σχετικά webhooks θα τεθούν σε λειτουργεία μόνο εαν το συμβάν σχετίζεται με τις προσδιορισμένες όμάδες. Για να ενεργοποιήσετε τα webhooks για όλες της ομάδες, αφήστε κενό. "
+        groups_filter_instructions: "Τα σχετικά webhooks θα τεθούν σε λειτουργεία μόνο εαν το γεγονός σχετίζεται με τις προσδιορισμένες όμάδες. Για να ενεργοποιήσετε τα webhooks για όλες της ομάδες, αφήστε κενό. "
         groups_filter: "Ενεργοποιημένες Ομάδες"
         delete_confirm: "Διαγραφή αυτού του webhook;"
         topic_event:
-          name: "Εκδήλωση νήματος"
+          name: "Γεγονός Νήματος"
           details: "Όταν υπάρχει ένα καινούριο νήμα, αναθεωρημένο, αλλαγμένο ή διαγραμμένο."
         post_event:
-          name: "Δημοσίευση Εκδήλωσης"
+          name: "Post Event"
           details: "Όταν υπάρχει μια καινούρια απάντηση, επεξεργασμένη, διαγραμμένη ή ανακτημένη."
         user_event:
-          name: "Εκδήλωση Χρήστη"
-          details: "Όταν ένας χρήστης δημιουργείται, εγκρίνεται ή ενημερώνεται."
+          name: "Γεγονός Χρήστη"
         delivery_status:
           title: "Κατάσταση διανομής"
-          inactive: "Ανενεργός"
+          inactive: "Ανενεργό"
           failed: "Απέτυχε"
           successful: "Επιτυχής"
         events:
-          none: "Δεν υπάρχουν σχετικές εκδηλώσεις."
+          none: "Δεν υπάρχουν σχετικά γεγονότα."
           redeliver: "Διανομή ξανά"
           incoming:
             one: "Υπάρχει μία καινούρια εκδήλωση."
-            other: "Υπάρχουν {{count}} καινούριες εκδηλώσεις."
+            other: "Υπάρχουν {{count}} καινούρια γεγονότα."
           completed_in:
             one: "Ολοκληρώνεται σε 1 δευτερόλεπτο."
-            other: "Ολοκληρώνεται σε {{count}} δευτερόλεπτα."
+            other: "Ολοκληρώθηκε σε {{count}} δευτερόλεπτα."
           request: "Αίτημα"
           response: "Απάντηση"
           redeliver_confirm: "Είστε σιγουρος/η ότι θέλετε να παραδώσετε εκ νέου το ίδιο payload;"
-          headers: "Επικεφαλίδες"
-          payload: "Φορτίο επί πληρωμή"
-          body: "Σώμα"
+          headers: "Headers"
+          payload: "Payload"
+          body: "Body"
           go_list: "Πήγαινε στη λίστα"
           go_details: "Επεξεργασία Webhook"
-          go_events: "Πήγαινε στις εκδηλώσεις"
+          go_events: "Πήγαινε στα γεγονότα"
           ping: "Ping"
-          status: "Κωδικός κατάστασης"
-          event_id: "Ταυτότητα"
+          status: "Status Code"
+          event_id: "ID"
           timestamp: "Δημιουργήθηκε"
-          completion: "Ώρα ολοκλήρωσης"
-          actions: "Δράσεις"
+          completion: "Χρόνος Ολοκλήρωσης"
+          actions: "Ενέργειες"
       plugins:
-        title: "Πρόσθετα"
-        installed: "Εγκατεστημένα πρόσθετα"
+        title: "Plugins"
+        installed: "Εγκατεστημένα Plugins"
         name: "Όνομα"
         none_installed: "Δεν έχεις εγκαταστήσει πρόσθετα"
         version: "Έκδοση"
         enabled: "Ενεργοποιημένο;"
         is_enabled: "Υ"
         not_enabled: "Ν"
-        change_settings: "Αλλαγή ρυθμίσεων"
+        change_settings: "Αλλαγή Ρυθμίσεων"
         change_settings_short: "Ρυθμίσεις"
         howto: "Πως εγκαθιστώ πρόσθετα;"
       backups:
@@ -2464,17 +2603,17 @@ el:
             title: "Αποστολή email με σύνδεσμο λήψης"
             alert: "Σας στάλθηκε με email ένας σύνδεσμος για να κάνετε λήψη αυτού του αντιγράφου ασφαλείας."
           destroy:
-            title: "Σβήσιμο αντίγραφου ασφαλείας"
+            title: "Διαγραφή αντιγράφου ασφαλείας"
             confirm: "Είσαι σίγουρος ότι θέλεις να σβήσεις  αυτό το αντίγραφο ασφαλείας;"
           restore:
             is_disabled: "Η επαναφορά είναι απενεργοποιημένη στις ρυθμίσεις του ιστότοπου."
             label: "Επαναφορά"
-            title: "Επαναφορά αντίγραφου ασφαλείας"
+            title: "Επαναφορά αντιγράφου ασφαλείας"
             confirm: "Είσαι βέβαιος πως θέλεις να επαναφέρεις αυτό το αντίγραφο;"
           rollback:
             label: "Επαναφορά"
-            title: "Επανάφερε τη βάση δεδομένων στην τελευταία λειτουργούσα κατάσταση"
-            confirm: "Είσαι βέβαιος πως θέλεις να επαναφέρεις τη βάση δεδομένων στην προηγούμενη λειτουργούσα κατάσταση;"
+            title: "Επαναφορά της βάσης δεδομένων στην προηγούμενη λειτουργική κατάσταση"
+            confirm: "Είσαι βέβαιος πως θέλεις να επαναφέρεις τη βάση δεδομένων στην προηγούμενη λειτουργική κατάσταση;"
       export_csv:
         success: "Η εξαγωγή ξεκίνησε. Θα ειδοποιηθείς με ένα μήνυμα όταν τελειώσει αυτή η διαδικασία."
         failed: "Η εξαγωγή απέτυχε. Παρακαλώ έλεγξε τα αρχεία καταγραφής."
@@ -2488,39 +2627,112 @@ el:
       export_json:
         button_text: "Εξαγωγή"
       invite:
-        button_text: "Αποστολή προσκλήσεων"
-        button_title: "Αποστολή προσκλήσεων"
+        button_text: "Αποστολή Προσκλήσεων"
+        button_title: "Αποστολή Προσκλήσεων"
       customize:
         title: "Προσαρμογή"
-        long_title: "Προσαρμογές ιστότοπου"
+        long_title: "Προσαρμογές Ιστότοπου"
         preview: "προεπισκόπηση "
+        explain_preview: "Δες την ιστοσελίδα με αυτό το θέμα ενεργό"
         save: "Αποθήκευση"
         new: "Νέο"
-        new_style: "Νέο στυλ"
+        new_style: "Νέα Μορφή"
         import: "Εισαγωγή"
         delete: "Σβήσιμο"
-        about: "Προσάρμοσε τα αρχεία στυλ CSS και την κεφαλίδα HTML του ιστότοπου. Πρόσθεσε μια προσαρμογή για να ξεκινήσεις."
+        delete_confirm: "Διαγραφή αυτού του θέματος;"
+        about: "Προσάρμοσε τα CSS stylesheets και τα HTML headers της ιστοσελίδας. Πρόσθεσε μια προσαρμογή για να ξεκινήσεις."
         color: "Χρώμα"
         opacity: "Αδιαφάνεια"
         copy: "Αντιγραφή"
+        copy_to_clipboard: "Αντιγραφή στο Clipboard"
+        copied_to_clipboard: "Αντιγράφτηκε στο Clipboard"
+        copy_to_clipboard_error: "Σφάλμα αντιγραφής δεδομένων στο Clipboard"
+        theme_owner: "Μη επεξεργάσιμο, ανήκει σε:"
         email_templates:
-          title: "Τύπος ηλεκτρονικού ταχυδρομείου"
+          title: "Πρότυπα Email"
           subject: "Θέμα"
-          multiple_subjects: "Αυτό το πρότυπο ηλεκτρονικού μηνύματος έχει πολλά θέματα."
+          multiple_subjects: "Αυτό το πρότυπο email έχει πολλά θέματα."
           body: "Σώμα"
-          none_selected: "Επίλεξε ένα πρότυπο ηλεκτρονικού μηνύματος να ξεκινήσεις την επεξεργασία."
-          revert: "Επαναφορά αλλαγών"
+          none_selected: "Επίλεξε ένα πρότυπο email για να ξεκινήσεις την επεξεργασία."
+          revert: "Επαναφορά Αλλαγών"
           revert_confirm: "Είσαι βέβαιος πως θέλεις να επαναφέρεις τις αλλαγές;"
+        theme:
+          import_theme: "Εισαγωγή Θέματος"
+          customize_desc: "Προσαρμογή:"
+          title: "Θέματα"
+          long_title: "Τροποποίησε τα χρώματα, CSS και HTML περιεχόμενο της ιστοσελίδας"
+          edit: "Επεξεργασία"
+          edit_confirm: "Αυτό είναι ένα απομακρυσμένο θέμα. Αν επεξεργαστείτε το CSS/HTML οι αλλαγές σας θα διαγραφούν την επόμενη φορά που θα ενημερώσετε το θέμα."
+          common: "Κοινό"
+          desktop: "Desktop"
+          mobile: "Mobile"
+          preview: "Προεπισκόπηση"
+          is_default: "Το θέμα είναι ενεργό εξ ορισμού"
+          user_selectable: "Το θέμα μπορεί να επιλεχθεί από τους χρήστες"
+          color_scheme: "Χρωματική Παλέτα"
+          color_scheme_select: "Επιλέξτε τα χρώματα που θα χρησιμοποιούνται από το θέμα"
+          custom_sections: "Προσαρμοσμένα τμήματα:"
+          theme_components: "Στοιχεία Θέματος"
+          uploads: "Μεταφορτώσεις"
+          no_uploads: "Μπορείτε να μεταφορτώσετε στοιχεία σχετικά με το θέμα σας, όπως γραμματοσειρές και εικόνες."
+          add_upload: "Προσθήκη Αρχείου"
+          upload_file_tip: "Επιλέξτε στοιχείο για μεταφόρτωση (png, woff2, etc...)"
+          variable_name: "SCSS var name:"
+          upload: "Μεταφόρτωση"
+          child_themes_check: "Το θέμα περιλαμβάνει άλλα υποθέματα"
+          css_html: "Custom CSS/HTML"
+          edit_css_html: "Edit 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 έκδοση πίσω!"
+            other: "Το θέμα είναι {{count}} εκδόσεις πίσω!"
+          scss:
+            text: "CSS"
+            title: "Καταχώρησε custom CSS, γίνονται δεκτά όλα τα valid CSS και SCSS styles"
+          header:
+            text: "Header"
+            title: "Καταχώρησε HTML το οποίο θα εμφανίζεται πάνω από το header της ιστοσελίδας"
+          after_header:
+            text: "Μετά το Header"
+            title: "Καταχώρησε HTML το οποίο θα εμφανίζεται σε όλες τις σελίδες μετά το header"
+          footer:
+            text: "Footer"
+            title: "Καταχώρησε HTML το οποίο θα εμφανίζεται στο footer"
+          embedded_scss:
+            text: "Embedded CSS"
+            title: "Καταχώρησε custom CSS to deliver with embedded version of comments"
+          head_tag:
+            text: "</head>"
+            title: "HTML το οποίο θα προστίθεται πριν το </head> tag"
+          body_tag:
+            text: "</body>"
+            title: "HTML το οποίο θα προστίθεται πριν το </body> tag"
         colors:
+          select_base:
+            title: "Επέλεξε βασική χρωματική παλέτα"
+            description: "Βασική παλέτα:"
           title: "Χρώματα"
-          long_title: "Χρωματικά σύνολα"
-          new_name: "Νέο χρωματικό σύνολο"
+          edit: "Επεξεργασία Χρωματικής Παλέτας"
+          long_title: "Χρωματική Παλέτα"
+          about: "Αλλάξτε τα χρώματα που χρησιμοποιούν τα θέματά σας. Δημιουργήστε μια νέα χρωματική παλέτα για να ξεκινήσετε."
+          new_name: "Νέα Χρωματική Παλέτα"
           copy_name_prefix: "Αντίγραφο του"
-          delete_confirm: "Να διαγραφεί αυτό το χρωματικό σύνολο;"
+          delete_confirm: "Να διαγραφεί αυτή η χρωματική παλέτα;"
           undo: "αναίρεση"
           undo_title: "Να αναιρεθούν οι αλλαγές που έγιναν σε αυτό το χρώμα από την τελευταία αποθήκευσή του και έπειτα."
           revert: "απόρριψη"
-          revert_title: "Επανέφερε αυτό το χρώμα στο προκαθορισμένο χρωματικό σύνολο του Discourse."
+          revert_title: "Επανέφερε αυτό το χρώμα στην προκαθορισμένη χρωματική παλέτα του Discourse."
           primary:
             name: 'κύριο'
             description: 'Τα περισσότερα κείμενα, εικονίδια και πλαίσια.'
@@ -2552,14 +2764,14 @@ el:
             name: 'αγάπη'
             description: "Το χρώμα του κουμπιού «μου αρέσει»."
       email:
-        title: "Μήνυμα Ηλεκτρονικού Ταχυδρομείου"
+        title: "Emails"
         settings: "Ρυθμίσεις"
         templates: "Πρότυπα"
-        preview_digest: "Προεπισκόπηση σύνοψης"
-        sending_test: "Στέλνω δοκιμαστικό μήνυμα ηλεκτρονικού ταχυδρομείου..."
+        preview_digest: "Προεπισκόπηση Σύνοψης"
+        sending_test: "Στέλνω δοκιμαστικό μήνυμα email..."
         error: "<b>ΣΦΑΛΜΑ</b> - %{server_error}"
-        test_error: "Υπήρξε πρόβλημα με την αποστολή του δοκιμαστικού μηνύματος ηλεκτρονικού ταχυδρομείου. Έλεγξε τις ρυθμίσεις ηλεκτρονικού ταχυδρομείου, βεβαιώσου πως ο πάροχός σου δεν μπλοκάρει τις συνδέσεις ηλεκτρονικού ταχυδρομείου και δοκίμασε πάλι."
-        sent: "Αποστολή"
+        test_error: "Υπήρξε πρόβλημα με την αποστολή του δοκιμαστικού μηνύματος email. Έλεγξε τις ρυθμίσεις email, βεβαιώσου πως ο πάροχός σου δεν μπλοκάρει τις συνδέσεις email και δοκίμασε πάλι."
+        sent: "Στάλθηκε"
         skipped: "Παραβλέφθηκε"
         bounced: "Επιστρεφόμενα μηνύματα"
         received: "Ελήφθη"
@@ -2567,20 +2779,20 @@ el:
         sent_at: "Στάλθηκε στις"
         time: "Ώρα"
         user: "Χρήστης"
-        email_type: "Τύπος ηλεκτρονικού ταχυδρομείου"
+        email_type: "Τύπος Email"
         to_address: "Παραλήπτης"
-        test_email_address: "Διεύθυνση ηλεκτρονικού ταχυδρομείου για δοκιμή"
-        send_test: "Στείλε δοκιμαστικό μήνυμα"
+        test_email_address: "διεύθυνση email για δοκιμή"
+        send_test: "Στείλε δοκιμαστικό email"
         sent_test: "στάλθηκε!"
         delivery_method: "Τρόπος αποστολής"
-        preview_digest_desc: "Προεπισκόπηση του περιεχομένου της σύνοψης των ηλεκτρονικών μηνυμάτων που στάλθηκε στους χρήστες που δεν ήταν ενεργοί."
+        preview_digest_desc: "Προεπισκόπηση του περιεχομένου των συνοπτικών email που στάλθηκαν στους χρήστες που δεν ήταν ενεργοί."
         refresh: "Ανανέωση"
         send_digest_label: "Στείλε αυτό το αποτέλεσμα στον/στην:"
         send_digest: "Αποστολή"
-        sending_email: "Αποστολή ηλεκτρονικού μηνύματος..."
+        sending_email: "Αποστολή email..."
         format: "Μορφή"
         html: "html"
-        text: "κείμενο"
+        text: "text"
         last_seen_user: "Τελευταίος χρήστης:"
         no_result: "Δεν βρέθηκαν αποτελέσματα για περίληψη."
         reply_key: "Κλειδί απάντησης"
@@ -2590,12 +2802,12 @@ el:
           to_addresses: "Προς"
           cc_addresses: "Cc"
           subject: "Θέμα"
-          error: "Λάθος"
-          none: "Δε βρέθηκε κανένα εισερχόμενο μήνυμα."
+          error: "Σφάλμα"
+          none: "Δε βρέθηκε κανένα εισερχόμενο email."
           modal:
-            title: "Λεπτομέρειες εισερχόμενων μηνυμάτων"
+            title: "Λεπτομέρειες εισερχόμενων email"
             error: "Σφάλμα"
-            headers: "Επικεφαλίδες"
+            headers: "Headers"
             subject: "Θέμα"
             body: "Σώμα"
             rejection_message: "Μήνυμα απόρριψης"
@@ -2609,72 +2821,76 @@ el:
           none: "Δεν βρέθηκαν αρχεία καταγραφής"
           filters:
             title: "Φίλτρο"
-            user_placeholder: "χρηστώνυμο"
+            user_placeholder: "όνομα χρήστη"
             address_placeholder: "name@example.com"
             type_placeholder: "σύνοψη, εγγραφή..."
             reply_key_placeholder: "κλειδί απάντησης"
             skipped_reason_placeholder: "λόγος"
       logs:
         title: "Αρχεία καταγραφής"
-        action: "Δράση"
+        action: "Ενέργεια"
         created_at: "Δημιουργήθηκε"
-        last_match_at: "Τελευταίο αποτέλεσμα"
-        match_count: "Αποτελέσματα"
+        last_match_at: "Τελευταία Αντιστοίχιση"
+        match_count: "Αντιστοιχίσεις"
         ip_address: "IP"
-        topic_id: "Ταυτότητα νήματος"
-        post_id: "Ταυτότητα ανάρτησης"
-        category_id: "Ταυτότητα Κατηγορίας"
-        delete: 'Σβήσιμο'
+        topic_id: "ID Νήματος"
+        post_id: "ID Ανάρτησης"
+        category_id: "ID Κατηγορίας"
+        delete: 'Διαγραφή'
         edit: 'Επεξεργασία'
         save: 'Αποθήκευση'
         screened_actions:
           block: "αποκλεισμός"
           do_nothing: "μην κάνεις τίποτα"
         staff_actions:
-          title: "Δράσεις συνεργατών"
+          all: "όλα"
+          filter: "Φίλτρο:"
+          title: "Ενέργειες Συνεργατών"
           clear_filters: "Δείξτα όλα"
           staff_user: "Συνεργάτης"
-          target_user: "Χρήστη που τον αφορά"
+          target_user: "Χρήστη που αφορά"
           subject: "Αντικείμενο"
           when: "Πότε"
           context: "Πλαίσιο αναφοράς"
           details: "Λεπτομέρειες"
-          previous_value: "Παλιότερο"
-          new_value: "Νέο"
+          previous_value: "Προηγούμενο"
+          new_value: "Νέα"
           diff: "Σύγκριση"
           show: "Δείξε"
           modal_title: "Λεπτομέρειες"
           no_previous: "Δεν υπάρχει προηγούμενη τιμή."
-          deleted: "Καμία νέα τιμή. Η εγγραφή σβήστηκε."
+          deleted: "Δεν υπάρχει νέα τιμή. Η εγγραφή διεγράφη."
           actions:
             delete_user: "διαγραφή χρήστη"
             change_trust_level: "αλλαγή επιπέδου εμπιστοσύνης"
-            change_username: "αλλαγή χρηστώνυμου"
+            change_username: "αλλαγή ονόματος χρήστη"
             change_site_setting: "αλλαγή ρυθμίσεων ιστότοπου"
-            change_site_text: "αλλαγή θέσης κειμένου"
-            suspend_user: "Αποκλεισμός του χρήστη"
-            unsuspend_user: "Αναίρεση αποκλεισμού χρήστη"
-            grant_badge: "Απονομή παράσημου"
+            change_theme: "αλλαγή θέματος"
+            delete_theme: "διαγραφή θέματος"
+            change_site_text: "αλλαγή κειμένου ιστοσελίδας"
+            suspend_user: "αποβολή του χρήστη"
+            unsuspend_user: "αναίρεση αποβολής χρήστη"
+            grant_badge: "απονομή παράσημου"
             revoke_badge: "απόσυρση παράσημου"
-            check_email: "Κοίτα στο ηλεκτρονικό σου ταχυδρομείο"
-            delete_topic: "Σβήσε το νήμα"
-            delete_post: "Σβήσε την ανάρτηση"
+            check_email: "έλεγχος email"
+            delete_topic: "διαγραφή νήματος"
+            delete_post: "διαγραφή ανάρτησης"
             impersonate: "υποδύσου"
             anonymize_user: "ανωνυμοποίηση χρήστη"
-            roll_up: "Τυλιγμένα IP εμπόδια"
+            roll_up: "roll up IP blocks"
             change_category_settings: "αλλαγή ρυθμίσεων κατηγορίας"
             delete_category: "διαγραφή κατηγορίας"
             create_category: "δημιουργία κατηγορίας"
-            block_user: "αποκλεισμός χρήστη"
-            unblock_user: "κατάργηση αποκλεισμού χρήστη"
+            silence_user: "σίγαση χρήστη"
+            unsilence_user: "αναίρεση σίγασης"
             grant_admin: "χορήγηση διαχειριστή"
             revoke_admin: "ανάκληση διαχειριστή"
             grant_moderation: "χορήγηση συντονιστή"
             revoke_moderation: "ανάκληση συντονιστή"
-            backup_create: "δημιουργία αντίγραφου"
-            deleted_tag: "η ετικέτα διαγράφηκε"
-            renamed_tag: "η ετικέτα μετονομάστηκε"
-            revoke_email: "Ανακάλεσε το email"
+            backup_create: "δημιουργία αντιγράφου"
+            deleted_tag: "διεγραμμένη ετικέτα"
+            renamed_tag: "μετονομασμένη ετικέτα"
+            revoke_email: "ανακάλεσε το email"
             lock_trust_level: "κλείδωσε το επίπεδο εμπιστοσύνης"
             unlock_trust_level: "ξεκλείδωσε το επίπεδο εμπιστοσύνης"
             activate_user: "ενεργοποίηση χρήστη"
@@ -2682,20 +2898,22 @@ el:
             change_readonly_mode: "αλλαγή λειτουργίας \"μόνο-ανάγνωση\""
             backup_download: "λήψη αντίγραφου"
             backup_destroy: "καταστροφή αντίγραφου"
+            reviewed_post: "έλεγξε ανάρτηση"
+            custom_staff: "προσαρμοσμένη ενέργεια προσθέτου"
         screened_emails:
-          title: "Ελεγμένες διευθύνσεις ηλεκτρονικού ταχυδρομείου"
-          description: "Όταν κάποιος φτιάξει έναν λογαριασμό, οι παρακάτω διευθύνσεις ηλεκτρονικού ταχυδρομείου θα ελεγχθούν και η εγγραφή θα αποκλειστεί, ή θα συμβεί κάποια άλλη πράξη."
-          email: "Διεύθυνση ηλεκτρονικού ταχυδρομείου"
+          title: "Ελεγχόμενα Emails"
+          description: "Όταν κάποιος φτιάξει έναν λογαριασμό, οι παρακάτω διευθύνσεις email θα ελεγχθούν και η εγγραφή θα αποκλειστεί ή θα συμβεί κάποια άλλη ενέργεια."
+          email: "Διεύθυνση Email"
           actions:
             allow: "Επίτρεψε"
         screened_urls:
-          title: "Ελεγμένα URL"
+          title: "Ελεγχόμενα URL"
           description: "Τα URL της λίστας χρησιμοποιήθηκαν σε αναρτήσεις από χρήστες που έχουν εντοπιστεί πως αναρτούν ανεπιθύμητα μηνύματα."
           url: "URL"
           domain: "Domain"
         screened_ips:
-          title: "Ελεγμένες IP"
-          description: 'Διευθύνσεις IP που παρακολουθούνται. Χρησιμοποίησε το «επίτρεψε» για να τις βάλεις στη λίστα επιτρεπόμενων.'
+          title: "Ελεγχόμενες IP"
+          description: 'Διευθύνσεις IP που επιτηρούνται. Χρησιμοποίησε το «επίτρεψε» για να τις βάλεις στη λίστα επιτρεπόμενων.'
           delete_confirm: "Σίγουρα θέλεις να αφαιρέσεις τον κανόνα για τη διεύθυνση %{ip_address};"
           roll_up_confirm: "Σίγουρα θες να συνοψίσεις σε υποδίκτυα τις συχνά αποκλεισμένες διευθύνσεις IP;"
           rolled_up_some_subnets: "Οι αποκλεισμένες διευθύνσεις IP συνοψίστηκαν επιτυχώς στα παρακάτω υποδίκτυα: %{subnets}."
@@ -2706,34 +2924,65 @@ el:
             allow_admin: "Να επιτρέπεται στο διαχειριστή"
           form:
             label: "Νέο:"
-            ip_address: "διεύθυνση IP"
+            ip_address: "IP διεύθυνση"
             add: "Προσθήκη"
             filter: "Αναζήτηση"
           roll_up:
             text: "Σύνοψη"
             title: "Δημιουργεί νέες εγγραφές για τον αποκλεισμό υποδικτύων αν υπάρχουν τουλάχιστον  'min_ban_entries_for_roll_up' εγγραφές."
+        search_logs:
+          title: "Αναζήτηση καταγραφών"
+          term: "Όρος"
+          searches: "Αναζητήσεις"
+          unique: "Μοναδικό"
         logster:
-          title: "Αρχεία καταγραφής σφαλμάτων"
+          title: "Error Logs"
+      watched_words:
+        title: "Επιτηρούμενες Λέξεις"
+        search: "αναζήτηση"
+        clear_filter: "Καθαρισμός"
+        show_words: "προβολή λέξεων"
+        word_count:
+          one: "1 λέξη"
+          other: "%{count} λέξεις"
+        actions:
+          block: 'Αποκλεισμός'
+          censor: 'Λογοκρισία'
+          require_approval: 'Απαιτεί Έγκριση'
+          flag: 'Σήμανση'
+        action_descriptions:
+          block: 'Αποτροπή της καταχώρησης αναρτήσεων που περιέχουν αυτές τις λέξεις. Ο χρήστης θα ενημερωθεί με μήνυμα λάθους όταν προσπαθήσει να καταχωρήσει την αναρτηση.'
+          censor: 'Επίτρεψε τις αναρτήσεις με αυτές τις λέξεις, αλλά αντικατέστησε τις λογοκριμένες λέξεις με άλλους χαρακτήρες.'
+          require_approval: 'Οι αναρτήσεις που περιέχουν αυτές τις λέξεις, χρειάζονται έγκριση από το προσωπικό πριν αναρτηθούν.'
+          flag: 'Επίτρεψε τις αναρτήσεις που περιέχουν αυτές τις λέξεις, αλλά επισήμανέ τες ως ανάρμοστες για έλεγχο από συντονιστή.'
+        form:
+          label: 'Νέα Λέξη:'
+          placeholder: 'ολόκληρη λέξη ή * ως μπαλαντέρ'
+          placeholder_regexp: "regular expression"
+          add: 'Προσθήκη'
+          success: 'Επιτυχία'
+          upload: "Μεταφόρτωση"
+          upload_successful: "Επιτυχημένη μεταφόρτωση. Οι λέξεις προστέθηκαν."
       impersonate:
-        title: "Να υποδυθώ"
+        title: "Υποδυθείτε"
         help: "Χρησιμοποίησε αυτό το εργαλείο για να εντοπίσεις λάθη υποδυόμενος κάποιον άλλο χρήστη. Θα πρέπει να αποσυνδεθείς όταν τελειώσεις."
         not_found: "Ο χρήστης δεν μπορεί να βρεθεί"
-        invalid: "Συγγνώμη, δεν μπορείς να εκπροσωπήσεις αυτό τον χρήστη"
+        invalid: "Συγγνώμη, δεν μπορείς να υποδυθείς αυτό τον χρήστη"
       users:
         title: 'Χρήστες'
-        create: 'Προσθήκη διαχειριστή'
-        last_emailed: "Τελευταίο μήνυμα ηλεκτρονικού ταχυδρομείου"
-        not_found: "Λυπούμαστε αλλά αυτό το χρηστώνυμο δεν υπάρχει στο σύστημα."
+        create: 'Προσθήκη Διαχειριστή'
+        last_emailed: "Τελευταίο μήνυμα email"
+        not_found: "Λυπούμαστε αλλά αυτό το όνομα χρήστη δεν υπάρχει στο σύστημα."
         id_not_found: "Λυπούμαστε αλλά αυτή η ταυτότητα χρήστη δεν υπάρχει στο σύστημα."
-        active: "Ενεργά"
-        show_emails: "Δείξε τα μηνύματα ηλεκτρονικού ταχυδρομείου"
+        active: "Ενεργοί"
+        show_emails: "Προβολή Emails"
         nav:
-          new: "Νέο"
-          active: "Ενεργό"
-          pending: "Εκκρεμεί"
-          staff: 'Προσωπικό'
-          suspended: 'Αποκλεισμένοι'
-          blocked: 'Αποκλεισμένο'
+          new: "Νέα"
+          active: "Ενεργοί"
+          pending: "Εκκρεμή"
+          staff: 'Συνεργάτες'
+          suspended: 'Αποβλημένοι'
+          silenced: 'Σιγήθηκαν'
           suspect: 'Ύποπτο'
         approved: "Εγκεκριμένο;"
         approved_selected:
@@ -2743,82 +2992,96 @@ el:
           one: "απόρριψη χρήστη"
           other: "απόρριψη χρηστών ({{count}})"
         titles:
-          active: 'Ενεργοί χρήστες'
-          new: 'Νέοι χρήστες'
-          pending: 'Χρήστες που πρέπει να ελεχθούν'
-          newuser: 'Χρήστες με επίπεδο εμπιστοσύνης 0 (Νέος χρήστης)'
-          basic: 'Χρήστες με επίπεδο εμπιστοσύνης 1 (Αρχάριος)'
-          member: 'Χρήστες με επίπεδο εμπιστοσύνης 2 (Μέλος)'
-          regular: 'Χρήστες με επίπεδο εμπιστοσύνης 3 (Κανονικός)'
-          leader: 'Χρήστες με επίπεδο εμπιστοσύνης 4 (Αρχηγός)'
-          staff: "Προσωπικό"
+          active: 'Ενεργοί Χρήστες'
+          new: 'Νέοι Χρήστες'
+          pending: 'Χρήστες σε αναμονή για έλεγχο'
+          newuser: 'Χρήστες με Επίπεδο Εμπιστοσύνης 0 (Νέος χρήστης)'
+          basic: 'Χρήστες με Επίπεδο Εμπιστοσύνης 1 (Αρχάριος)'
+          member: 'Χρήστες με Επίπεδο Εμπιστοσύνης 2 (Μέλος)'
+          regular: 'Χρήστες με Επίπεδο Εμπιστοσύνης 3 (Τακτικός)'
+          leader: 'Χρήστες με Επίπεδο Εμπιστοσύνης 4 (Αρχηγός)'
+          staff: "Συνεργάτες"
           admins: 'Διαχειριστές'
           moderators: 'Συντονιστές'
-          blocked: 'Αποκλεισμένοι χρήστες'
-          suspended: 'Απενεργοποιημένοι Χρήστες'
+          silenced: 'Σιγημένοι Χρήστες'
+          suspended: 'Αποβλημένοι Χρήστες'
           suspect: 'Ύποπτοι χρήστες'
         reject_successful:
           one: "Επιτυχώς απορρίφθηκε 1 χρήστης."
           other: "Επιτυχώς απορρίφθησαν %{count} χρήστες."
         reject_failures:
           one: "Αποτυχία απόρριψης 1 χρήστη."
-          other: "Αποτυχία απόρριψης %{count} χρηστών."
+          other: "Αποτυχία απόρριψης %{count}χρήστες."
         not_verified: "Μη επαληθευμένος"
         check_email:
           title: "Εμφάνισε το email αυτού του χρήστη"
           text: "Εμφάνιση"
       user:
-        suspend_failed: "Κάποιο λάθος εμφανίστηκε κατά την αναστολή αυτού του χρήστη {{error}}"
-        unsuspend_failed: "Κάτι πήγε στραβά κατά την αναίρεση του αποκλεισμού αυτού του χρήστη {{error}}"
-        suspend_duration: "Για πόσο χρονικό διάστημα θα γίνει αναστολή του συγκεκριμένου χρήστη;"
-        suspend_duration_units: "(ημέρες)"
-        suspend_reason_label: "Γιατί απενεργοποιείες; Αυτό το κείμενο <b>θα είναι ορατό σε όλους</b> στη σελίδα προφίλ αυτού του χρήστη και θα εμφανίζεται στο χρήστη όταν αυτός προσπαθήσει να συνδεθεί. Φρόντισε να είναι σύντομο."
+        suspend_failed: "Κάποιο λάθος εμφανίστηκε κατά την αποβολή αυτού του χρήστη {{error}}"
+        unsuspend_failed: "Κάτι πήγε στραβά κατά την αναίρεση της αποβολής αυτού του χρήστη {{error}}"
+        suspend_duration: "Πόσο χρονικό διάστημα θα κρατήσει η αποβολή του χρήστη;"
+        suspend_reason_label: "Γιατί αποβάλεις τον χρήστη; Αυτό το κείμενο <b>θα είναι ορατό σε όλους</b> στη σελίδα προφίλ αυτού του χρήστη και θα εμφανίζεται στο χρήστη όταν αυτός προσπαθήσει να συνδεθεί. Φρόντισε να είναι σύντομο."
+        suspend_reason_hidden_label: "Ποιος είναι ο λόγος της αποβολής; Το κείμενο αυτό θα εμφανίζεται στον χρήστη όταν προσπαθήσει να συνδεθεί. Φροντίστε να είναι σύντομο."
         suspend_reason: "Αιτία"
-        suspended_by: "Απενεργοποιήθηκε από τον/την"
+        suspend_reason_placeholder: "Αιτιολόγηση Αποβολής"
+        suspend_message: "Μήνυμα Email"
+        suspend_message_placeholder: "Προεραιτικά συμπληρώστε αναλυτική αιτιολόγηση για τον λόγο αποβολής και αυτή θα σταλεί με email στον χρήστη."
+        suspended_by: "Αποβλήθηκε από τον/την"
+        silence_reason: "Αιτία"
+        silenced_by: "Σίγαση Από"
+        silence_modal_title: "Σίγαση Χρήστη"
+        silence_duration: "Για πόσο χρονικό διάστημα ο χρήστης θα σιωπηθεί;"
+        silence_reason_label: "Γιατί εσείς σιωπάτε αυτό τον χρήστη;"
+        silence_reason_placeholder: "Αιτία σιώπησης"
+        silence_message: "Μήνυμα email"
+        silence_message_placeholder: "(αφήστε κενό για να στείλετε το προκαθορισμένο μήνυμα)"
+        suspended_until: "(έως %{until})"
+        cant_suspend: "Ο χρήστης αυτός δεν μπορεί να αποβληθεί."
         delete_all_posts: "Σβήσε όλες τις αναρτήσεις"
-        delete_all_posts_confirm_MF: "Είσαι έτοιμος να σβήσεις %{posts} αναρτήσεις και %{topics} νήματα. Επιβεβαίωση;"
-        suspend: "Απενεργοποίηση"
-        unsuspend: "Αναίρεση απενεργοποίησης"
-        suspended: "Απενεργοποιημένος;"
+        delete_all_posts_confirm_MF: "Πρόκειται να διαγράψεις {POSTS, plural, one {1 ανάρτηση} other {# αναρτήσεις}} and {TOPICS, plural, one {1 νήμα} other {# νήματα}}. Είσαι σίγουρος;"
+        silence: "Σίγαση"
+        unsilence: "Αναίρεση Σίγασης"
+        silenced: "Σε Σιγή;"
         moderator: "Συντονιστής;"
         admin: "Διαχειριστής;"
-        blocked: "Αποκλείστηκε; "
-        staged: "Σταδιακή?"
+        suspended: "Αποβλημένος;"
+        staged: "Στάδιο Μετάβασης;"
         show_admin_profile: "Διαχείριση"
         refresh_browsers: "Να ανανεωθεί αναγκαστικά η σελίδα"
-        refresh_browsers_message: "Το μήνυμα στάλθηκε σε όλους τους πελάτες!"
+        refresh_browsers_message: "Το μήνυμα στάλθηκε σε όλους τους χρήστες!"
         show_public_profile: "Εμφάνισε το Δημόσιο Προφίλ"
-        impersonate: 'Να υποδυθώ'
-        action_logs: "Καταγραφές ενεργειών"
+        impersonate: 'Υποδυθείτε'
+        action_logs: "Καταγραφές Ενεργειών"
         ip_lookup: "Αναζήτηση διεύθυνσης IP"
         log_out: "Αποσύνδεση"
         logged_out: "Ο χρήστης αποσυνδέθηκε από όλες τις συσκευές"
         revoke_admin: 'Ανάκληση δικαιωμάτων διαχειριστή'
         grant_admin: 'Απόδοση δικαιωμάτων διαχειριστή'
+        grant_admin_confirm: "Έχουμε στείλει ένα email για να επιβεβαιώσουμε τον νέο διαχειριστή. Παρακαλούμε ανοίξτε το και ακολουθήστε τις οδηγίες."
         revoke_moderation: 'Ανάκληση δικαιωμάτων συντονιστή'
-        grant_moderation: 'Ανάκληση δικαιωμάτων συντονιστή'
-        unblock: 'Αναίρεση αποκλεισμού'
-        block: 'Αποκλεισμός'
+        grant_moderation: 'Απόδοση δικαιωμάτων συντονιστή'
+        unsuspend: 'Αναίρεση αποβολής'
+        suspend: 'Αποβολή'
         reputation: Φήμη
         permissions: Δικαιώματα
         activity: Δραστηριότητα
-        like_count: Μου αρέσει που έδωσα / πήρα
+        like_count: Μου αρέσει που δόθηκαν / λήφθηκαν
         last_100_days: 'τις τελευταίες 100 ημέρες'
-        private_topics_count: Ιδιωτικά νήματα
-        posts_read_count: Αναρτήσεις που διάβασες
-        post_count: Αναρτήσεις που δημιούργησες
-        topics_entered: Νήματα που προβλήθηκαν
-        flags_given_count: Σημάνσεις που έδωσες
-        flags_received_count: Σημάνσεις που έλαβες
-        warnings_received_count: Προειδοποιήσεις που έλαβες
-        flags_given_received_count: 'Σημάνσεις που έλαβες / έδωσες'
+        private_topics_count: Ιδιωτικά Νήματα
+        posts_read_count: Διαβασμένες Αναρτήσεις
+        post_count: Δημιουργημένες Αναρτήσεις
+        topics_entered: Προβεβλημένα Νήματα
+        flags_given_count: Δοσμένες Σημάνσεις
+        flags_received_count: Ληφθείσες Σημάνσεις
+        warnings_received_count: Ληφθείσες Προειδοποιήσεις
+        flags_given_received_count: 'Δοσμένες / Ληφθείσες Σημάνσεις'
         approve: 'Έγκριση'
         approved_by: "εγκρίθηκε από τον/την"
-        approve_success: "Ο χρήστης εγκρίθηκε και του αποστάλθηκε ένα μήνυμα ηλεκτρονικού ταχυδρομείου με οδηγίες για την ενεργοποίηση του λογαριασμού του."
+        approve_success: "Ο χρήστης εγκρίθηκε και του αποστάλθηκε ένα email με οδηγίες για την ενεργοποίηση του λογαριασμού του."
         approve_bulk_success: "Επιτυχία! Όλοι οι επιλεγμένοι χρήστες εγκρίθηκαν και ειδοποιήθηκαν."
-        time_read: "Χρόνος διαβάσματος"
-        anonymize: "Ανωνυμοποίηση χρήστη"
-        anonymize_confirm: "Είσαι ΣΙΓΟΥΡΟΣ πως θέλεις να ανωνυμοποιήσεις αυτό το λογαριασμό; Αυτό θα αλλάξει το χρηστώνυμο και τη διεύθυνση ηλεκτρονικού ταχυδρομείου και θα αφαιρέσει όλες τις πληροφορίες στο προφίλ."
+        time_read: "Χρόνος Ανάγνωσης"
+        anonymize: "Ανωνυμοποίηση Χρήστη"
+        anonymize_confirm: "Είσαι ΣΙΓΟΥΡΟΣ πως θέλεις να ανωνυμοποιήσεις αυτό το λογαριασμό; Αυτό θα αλλάξει το όνομα χρήστη και τη διεύθυνση email και θα αφαιρέσει όλες τις πληροφορίες στο προφίλ."
         anonymize_yes: "Ναι, ανωνυμοποίησε αυτόν τον λογαριασμό"
         anonymize_failed: "Παρουσιάστηκε ένα σφάλμα κατά την ανωνυμοποίηση του λογαριασμού."
         delete: "Διαγραφή χρήστη"
@@ -2826,7 +3089,7 @@ el:
         delete_posts_forbidden_because_staff: "Δεν μπορείς να διαγράψεις όλες τις αναρτήσεις διαχειριστών και συντονιστών."
         delete_forbidden:
           one: "Οι χρήστες δεν γίνεται να διαγραφούν εάν έχουν αναρτήσεις. Σβήσε όλες τις αναρτήσεις του πριν διαγράψεις το χρήστη. (Δεν γίνεται να σβηστούν αναρτήσεις που είναι παλαιότερες από %{count} ημέρα)"
-          other: "Οι χρήστες δεν γίνεται να διαγραφούν εάν έχουν αναρτήσεις. Σβήσε όλες τις αναρτήσεις του πριν διαγράψεις το χρήστη. (Δεν γίνεται να σβηστούν αναρτήσεις που είναι παλαιότερες από %{count} ημέρες)"
+          other: "Οι χρήστες δεν γίνεται να διαγραφούν εάν έχουν αναρτήσεις. Σβήσε όλες τις αναρτήσεις τους πριν τους διαγράψεις. (Δεν γίνεται να σβηστούν αναρτήσεις που είναι παλαιότερες από %{count} ημέρες)"
         cant_delete_all_posts:
           one: "Δεν γίνεται να σβήσεις όλες τις αναρτήσεις. Κάποιες αναρτήσεις είναι παλαιότερες από %{count} ημέρα. (Η ρύθμιση «delete_user_max_post_age setting»)"
           other: "Δεν γίνεται να σβήσεις όλες τις αναρτήσεις. Κάποιες αναρτήσεις είναι παλαιότερες από %{count} ημέρες. (Η ρύθμιση «delete_user_max_post_age setting»)"
@@ -2834,37 +3097,38 @@ el:
           one: "Δεν γίνεται να σβήσεις όλες τις αναρτήσεις επειδή ο χρήστης έχει περισσότερες από %{count} αναρτήσεις. (Η ρύθμιση «delete_all_posts_max»)"
           other: "Δεν γίνεται να σβήσεις όλες τις αναρτήσεις επειδή ο χρήστης έχει περισσότερες από %{count} αναρτήσεις. (Η ρύθμιση «delete_all_posts_max»)"
         delete_confirm: "Είσαι ΣΙΓΟΥΡΟΣ ότι θέλεις να διαγράψεις αυτό το χρήστη; Αυτό δεν μπορεί να αναιρεθεί!"
-        delete_and_block: "Σβήσε και <b>απόκλεισε</b> αυτή την διεύθυνση ηλεκτρονικού ταχυδρομείου και τη διεύθυνση IP  "
+        delete_and_block: "Σβήσε και <b>απόκλεισε</b> αυτή την διεύθυνση email και τη διεύθυνση IP  "
         delete_dont_block: "Μόνο διαγραφή"
         deleted: "Ο χρήστης διαγράφτηκε."
         delete_failed: "Παρουσιάστηκε ένα σφάλμα κατά τη διαγραφή αυτού του χρήστη. Βεβαιώσου πρώτα πως έχουν σβηστεί όλες οι αναρτήσεις του."
-        send_activation_email: "Αποστολή μηνύματος ενεργοποίησης"
-        activation_email_sent: "Στάλθηκε ένα μήνυμα ενεργοποίησης."
-        send_activation_email_failed: "Παρουσιάστηκε ένα σφάλμα κατά την αποστολή του μηνύματος ενεργοποίησης. %{error}"
-        activate: "Ενεργοποίηση λογαριασμού"
+        send_activation_email: "Αποστολή Email Ενεργοποίησης"
+        activation_email_sent: "Στάλθηκε ένα email ενεργοποίησης."
+        send_activation_email_failed: "Παρουσιάστηκε ένα σφάλμα κατά την αποστολή του email ενεργοποίησης. %{error}"
+        activate: "Ενεργοποίηση Λογαριασμού"
         activate_failed: "Παρουσιάστηκε πρόβλημα κατά την ενεργοποίηση του χρήστη."
-        deactivate_account: "Απενεργοποίηση του λογαριασμού"
+        deactivate_account: "Απενεργοποίηση Λογαριασμού"
         deactivate_failed: "Παρουσιάστηκε πρόβλημα κατά την απενεργοποίηση του χρήστη."
-        unblock_failed: 'Παρουσιάστηκε πρόβλημα κατά την ενεργοποίηση του χρήστη.'
-        block_failed: 'Παρουσιάστηκε πρόβλημα κατά την απενεργοποίηση του χρήστη.'
-        block_confirm: 'Είσαι βέβαιος πως θέλεις να αποκλείσεις αυτόν τον χρήστη; Δε θα μπορεί να δημιουργήσει καινούρια νήματα ή δημοσιεύσεις.'
-        block_accept: 'Ναι, αποκλεισμός του χρήστη'
-        bounce_score: "Βαθμολόγηση επιστρεφόμενων"
+        unsilence_failed: 'Υπήρξε ένα πρόβλημα κατά την αναίρεση της σίγασης του χρήστη.'
+        silence_failed: 'Υπήρξε ένα πρόβλημα κατά την σίγαση του χρήστη.'
+        silence_confirm: 'Θέλετε σίγουρα να σιγήσετε τον χρήστη; Δεν θα μπορεί να δημιουργήσει νέα νήματα ή αναρτήσεις.'
+        silence_accept: 'Ναι, σίγαση του χρήστη'
+        bounce_score: "Bounce Score"
         reset_bounce_score:
           label: "Επαναφορά"
           title: "Επαναφορά βαθμολόγησης επιστρεφόμενων πίσω στο 0"
+        visit_profile: "Επισκεφθείτε <a href='%{url}'>την σελίδα προτιμήσεων του χρήστη</a> για να επεξεργαστείτε το προφίλ του"
         deactivate_explanation: "Ένας απενεργοποιημένος χρήστης πρέπει να επιβεβαιώσει ξανά τη διεύθυνση του ηλεκτρονικού του ταχυδρομείου."
-        suspended_explanation: "Ένας χρήστης που έχει απενεργοποιηθεί δεν γίνεται να συνδεθεί."
-        block_explanation: "Ένας απενεργοποιημένος χρήστης δεν μπορεί να δημοσιεύει ή να δημιουργεί νήματα"
-        staged_explanation: "Ένας staged χρήστης μπορεί να κάνει αναρτήσεις μέσω ηλεκτρονικου ταχυδρομίου και σε συγκεκριμένα θέματα. "
+        suspended_explanation: "Ένας χρήστης που έχει αποβληθεί δεν γίνεται να συνδεθεί."
+        silence_explanation: "Ένας χρήστης σε σιγή δεν μπορεί να αναρτήσει ή να ξεκινήσει νήματα."
+        staged_explanation: "Ένας χρήστης σε στάδιο μετάβασης μπορεί να κάνει αναρτήσεις μέσω email και σε συγκεκριμένα θέματα. "
         bounce_score_explanation:
-          none: "Κανένα επιστρεφόμενο μήνυμα δεν ελήφθη από αυτή τη διεύθυνση ηλεκτρονικού ταχυδρομείου."
-          some: "Μερικά επιστρεφόμενα μηνύματα ελήφθησαν πρόσφατα από αυτή τη διεύθυνση ηλεκτρονικού ταχυδρομείου."
-          threshold_reached: "Ελήφθησαν πολλά επιστρεφόμενα μηνύματα από αυτή τη διεύθυνση ηλεκτρονικού ταχυδρομείου."
+          none: "Κανένα επιστρεφόμενο μήνυμα δεν ελήφθη από αυτή τη διεύθυνση email."
+          some: "Μερικά επιστρεφόμενα μηνύματα ελήφθησαν πρόσφατα από αυτή τη διεύθυνση email."
+          threshold_reached: "Ελήφθησαν πολλά επιστρεφόμενα μηνύματα από αυτή τη διεύθυνση email."
         trust_level_change_failed: "Παρουσιάστηκε πρόβλημα κατά την αλλαγή του επιπέδου εμπιστοσύνης του χρήστη."
-        suspend_modal_title: "Απενεργοποίηση χρήστη."
-        trust_level_2_users: "Χρήστες στο επιπέδου εμπιστοσύνης 2"
-        trust_level_3_requirements: "Χρήστες στο επιπέδου εμπιστοσύνης 3"
+        suspend_modal_title: "Αποβολή Χρήστη."
+        trust_level_2_users: "Χρήστες Επιπέδου Εμπιστοσύνης 2"
+        trust_level_3_requirements: "Προϋποθέσεις Επιπέδου Εμπιστοσύνης 3"
         trust_level_locked_tip: "το επίπεδο εμπιστοσύνης κλειδώθηκε, το σύστημα δεν θα προβιβάσει ή υποβιβάσει τον χρήστη"
         trust_level_unlocked_tip: "το επίπεδο εμπιστοσύνης ξεκλειδώθηκε, το σύστημα μπορεί να προβιβάσει ή υποβιβάσει τον χρήστη"
         lock_trust_level: "Κλείδωσε το επίπεδο εμπιστοσύνης"
@@ -2875,34 +3139,34 @@ el:
             one: "Την τελευταία μέρα:"
             other: "Τις τελευταίες %{count} μέρες:"
           value_heading: "Τιμή"
-          requirement_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: "Αναρτήσεις που επισημάνθηκαν"
           flagged_by_users: "Χρήστες που επισήμαναν"
           likes_given: "Μου αρέσει που αποδόθηκαν"
-          likes_received: "«Μου αρέσει» που δεχτήκες."
-          likes_received_days: "Μου αρέσει που έλαβα: ξεχωριστές μέρες"
-          likes_received_users: "Μου αρέσει που έλαβα: ξεχωριστοί χρήστες"
+          likes_received: "Μου αρέσει που λήφθησαν"
+          likes_received_days: "Μου αρέσει που ελήφθησαν: ξεχωριστές μέρες"
+          likes_received_users: "Μου αρέσει που ελήφθησαν: ξεχωριστοί χρήστες"
           qualifies: "Πληροί τις προϋποθέσεις για το επίπεδο εμπιστοσύνης 3."
           does_not_qualify: "Δεν πληροί τις προϋποθέσεις για το επίπεδο εμπιστοσύνης 3."
           will_be_promoted: "Θα προβιβαστεί σύντομα."
           will_be_demoted: "Θα υποβιβαστεί σύντομα."
           on_grace_period: "Δεν θα υποβιβαστεί. Ισχύει ακόμη η περίοδος χάριτος του τελευταίου προβιβασμού."
           locked_will_not_be_promoted: "Το επίπεδο εμπιστοσύνης είναι κλειδωμένο. Δε θα προβιβαστεί ποτέ."
-          locked_will_not_be_demoted: "Το επίπεδο εμπιστοσύνης κλειδώθηκε. Δεν πρόκειται ποτέ να υποβιβαστεί. "
+          locked_will_not_be_demoted: "Το επίπεδο εμπιστοσύνης είναι κλειδωμένο. Δεν θα υποβιβαστεί ποτέ. "
         sso:
           title: "Single Sign On"
-          external_id: "Εξωτερικό ID"
-          external_username: "Χρηστώνυμο"
-          external_name: "Όνομα"
-          external_email: "Διεύθυνση ηλεκτρονικού ταχυδρομείου"
-          external_avatar_url: "URL για την εικόνα προφίλ"
+          external_id: "External ID"
+          external_username: "Όνομα Χρήστη"
+          external_name: "Πλήρες Όνομα"
+          external_email: "Διεύθυνση Email"
+          external_avatar_url: "URL Εικόνας Προφίλ"
       user_fields:
         title: "Πεδία Χρήστη"
         help: "Προσθέστε πεδία που οι χρήστες μπορουν να συμπληρώσουν."
@@ -2936,7 +3200,7 @@ el:
         field_types:
           text: 'Πεδίο κειμένου'
           confirm: 'Επιβεβαίωση'
-          dropdown: "Άνοιγμα"
+          dropdown: "Dropdown"
       site_text:
         description: "Μπορείς να προσαρμόσεις οποιοδήποτε κείμενο στο χώρο συζητήσεων σου. Παρακαλώ ξεκίνησε κάνοντας αναζήτηση παρακάτω:"
         search: "Αναζήτησε το κείμενο που θα ήθελες να επεξεργαστείς"
@@ -2946,7 +3210,7 @@ el:
         revert_confirm: "Είσαι βέβαιος πως θέλεις να επαναφέρεις τις αλλαγές;"
         go_back: "Πίσω στην αναζήτηση"
         recommended: "Σου προτείνουμε να προσαρμόσεις το ακόλουθο κείμενο στις ανάγκες σου:"
-        show_overriden: 'Δείξε μόνο τα πιο σημαντικά'
+        show_overriden: 'Δείξε μόνο αυτά που άλλαξαν'
       site_settings:
         show_overriden: 'Δείξε μόνο αυτά που άλλαξαν'
         title: 'Ρυθμίσεις'
@@ -2954,7 +3218,7 @@ el:
         none: 'κανένα'
         no_results: "Δεν βρέθηκαν αποτελέσματα."
         clear_filter: "Καθάρισμα φίλτρου"
-        add_url: "δώσε URL"
+        add_url: "προσθήκη URL"
         add_host: "προσθήκη host"
         categories:
           all_results: 'Όλα'
@@ -2962,39 +3226,40 @@ el:
           basic: 'Βασική εγκατάσταση'
           users: 'Χρήστες'
           posting: 'Αναρτήσεις'
-          email: 'Ηλεκτρονικό ταχυδρομείο'
+          email: 'Email'
           files: 'Αρχεία'
-          trust: 'Επίπεδα εμπιστοσύνης'
+          trust: 'Επίπεδα Εμπιστοσύνης'
           security: 'Ασφάλεια'
           onebox: "Onebox"
           seo: 'SEO'
           spam: 'Ανεπιθύμητο'
-          rate_limits: 'Περιορισμοί'
-          developer: 'Κατασκευαστής λογισμικού'
+          rate_limits: 'Όριο Συχνότητας'
+          developer: 'Developer'
           embedding: "Ενσωμάτωση"
           legal: "Νομικά"
-          user_api: 'Χρήστης API'
+          api: 'API'
+          user_api: 'User API'
           uncategorized: 'Άλλα'
           backups: "Αντίγραφα ασφαλέιας"
           login: "Σύνδεση"
           plugins: "Πρόσθετα"
-          user_preferences: "Προτημήσεις χρήστη"
+          user_preferences: "Προτιμήσεις Χρήστη"
           tags: "Ετικέτες"
           search: "Αναζήτηση"
           groups: "Ομάδες"
       badges:
         title: Παράσημα
-        new_badge: Νέο παράσημο
+        new_badge: Νέο Παράσημο
         new: Νέο
         name: Όνομα
         badge: Παράσημο
         display_name: Όνομα που θα φαίνεται
         description: Περιγραφή
         long_description: Μακρά Περιγραφή
-        badge_type: Τύπος παράσημου
+        badge_type: Τύπος Παράσημου
         badge_grouping: Ομάδα
         badge_groupings:
-          modal_title: Ομαδοποίηση παράσημων
+          modal_title: Ομαδοποίηση Παράσημων
         granted_by: Απονεμήθηκε από
         granted_at: Απονεμήθηκε στις
         reason_help: (ένας σύνδεσμος προς μια ανάρτηση ή ένα νήμα)
@@ -3005,10 +3270,10 @@ el:
         reason: Αιτία
         expand: Επέκταση &hellip;
         revoke_confirm: Είσαι σίγουρος πως θέλεις να ανακαλέσεις αυτό το παράσημο;
-        edit_badges: Επεξεργασία παράσημου
-        grant_badge: Απονομή παράσημου
-        granted_badges: Απονεμηθέντα παράσημα
-        grant: Απόνεμε
+        edit_badges: Επεξεργασία Παρασήμων
+        grant_badge: Απονομή Παράσημου
+        granted_badges: Απονεμηθέντα Παράσημα
+        grant: Απονομή
         no_user_badges: "Στο χρήστη %{name} δεν έχουν απονεμηθεί παράσημα."
         no_badges: Δεν υπάρχουν παράσημα που να μπορούν να απονεμηθούν.
         none_selected: "Διάλεξε ένα παράσημο για να ξεκινήσεις"
@@ -3030,7 +3295,7 @@ el:
           post_revision: "Όταν ένας χρήστης επεξεργάζεται ή δημιουργεί μια ανάρτηση"
           trust_level_change: "Όταν το επίπεδο εμπιστοσύνης ενός χρήστη αλλάξει"
           user_change: "Όταν ένας χρήστης δημιουργείται ή υφίσταται επεξεργασία  "
-          post_processed: "Αφού μια δημοσίευση έχει δεχτεί επεξεργασία"
+          post_processed: "Αφού μια ανάρτηση έχει δεχτεί επεξεργασία"
         preview:
           link_text: "Προεπισκόπηση απονεμηθέντων παράσημων"
           plan_text: "Προεπισκόπηση του ερωτήματος"
@@ -3040,16 +3305,16 @@ el:
           bad_count_warning:
             header: "ΠΡΟΣΟΧΗ!"
             text: "Λείπουν δεδομένα για το υπόδειγμα. Αυτό συμβαίνει όταν το ερώτημα παρασήμων επιστρέφει δεδομένα για αναρτήσεις ή χρήστες που δεν υπάρχουν. Αυτό μπορεί να έχει ανεπιθύμητα αποτελέσματα αργότερα. Παρακαλούμε έλεγξε ξανά το ερώτημά σου."
-          no_grant_count: "Δεν θα αποδοθεί κανένα έμβλημα/παράσημο"
+          no_grant_count: "Δεν θα αποδοθεί κανένα παράσημο"
           grant_count:
-            one: "<b>1</b> παράσημο να κατανεμηθεί"
-            other: "<b>%{count}</b> παράσημα να κατανεμηθούν"
+            one: "<b>1</b> παράσημο για να αποδοθεί"
+            other: "<b>%{count}</b> παράσημα για να αποδοθούν"
           sample: "Δείγμα:"
           grant:
             with: <span class="username">%{username}</span>
             with_post: <span class="username">%{username}</span> για την ανάρτηση στο %{link}
-            with_post_time: <span class="username">%{username}</span> για την ανάρτηση στο %{link} σε <span class="time">%{time}</span>
-            with_time: <span class="username">%{username}</span> σε <span class="time">%{time}</span>
+            with_post_time: <span class="username">%{username}</span> για την ανάρτηση στο %{link} στις <span class="time">%{time}</span>
+            with_time: <span class="username">%{username}</span> στις <span class="time">%{time}</span>
       emoji:
         title: "Emoji"
         help: "Πρόσθεσε ένα νέο emoji που θα είναι διαθέσιμο σε όλους. (Συμβουλή: μπορείς να σύρεις πολλά αρχεία ταυτόχρονα)"
@@ -3063,39 +3328,41 @@ el:
         sample: "Χρησιμοποιήστε τον ακόλουθο HTML κώδικα στον ιστότοπό σας για να ενθέσετε θέματα. Αντικαταστήστε <b>REPLACE_ME</b> με το κανονικό URL της σελίδας στην οποία θα ενθέσετε το θέμα. "
         title: "Ενσωμάτωση"
         host: "Επιτρεπόμενα hosts"
-        path_whitelist: "Μονοπάτι Λίστας Επιτρεπομένων"
+        class_name: "Class Name"
+        path_whitelist: "Path Whitelist"
         edit: "επεξεργασία"
-        category: "Δημοσίευση στην κατηγορία"
+        category: "Ανάρτηση στην Κατηγορία"
         add_host: "Προσθήκη host"
-        settings: "Ενσωματωμένες ρυθμίσεις"
-        feed_settings: "Ρυθμίσεις τροφοδοσίας"
+        settings: "Ρυθμίσεις Ενσωμάτωσης"
+        feed_settings: "Ρυθμίσεις Τροφοδοσίας"
         feed_description: "Με το να συμπεριλαμβάνετε ένα  RSS/ATOM feed για τον ιστότοπό σας βελτιώνετε την δυνατότητα του Discourse να εισάγει τα περιεχόμενά σας. "
-        crawling_settings: "Ρυθμίσεις ανίχνευσης"
-        crawling_description: "Όταν η ομιλία δημιουργεί νήματα για τις δημοσιεύσεις σου, εάν δεν είναι κανένα από τα RSS/ATOM παρούσα θα προσπαθήσει να αναλύσει το περιεχόμενο του HTML σου. Κάποιες φορές μπορεί να αποτελεί πρόκληση το να εξάγεις το περιεχόμενο σου, έτσι σου παρέχουμε την ικανότητα να προσδιορίσεις τους νόμους CSS για να κάνεις την εξαγωγή σου ευκολότερη."
+        crawling_settings: "Ρυθμίσεις Crawler "
+        crawling_description: "Όταν η ιστοσελίδα δημιουργεί νήματα για τις αναρτήσεις σου, άν δεν υπάρχει RSS/ATOM feed θα προσπαθήσει να αναλύσει το περιεχόμενο του HTML σου. Κάποιες φορές μπορεί να αποτελεί πρόκληση το να εξάγει το περιεχόμενο σου, έτσι σου παρέχουμε την ικανότητα να προσδιορίσεις τα CSS rules για να κάνεις την εξαγωγή ευκολότερη."
         embed_by_username: "Όνομα χρήστη για δημιουργία νήματος"
-        embed_post_limit: "Μέγιστος αριθμός δημοσιεύσεων για συγχώνευση"
-        embed_username_key_from_feed: "Κλειδή για έλξη του ονόματος χρήστη του discource από τη τροφή"
-        embed_title_scrubber: "Κανονική έκφραση χρησιμοποιείται για τον τίτλο της δημοσίευσης"
-        embed_truncate: "Κόψιμο των ενσωματωμένων δημοσιεύσεων"
-        embed_whitelist_selector: "CSS διαλογέας για στοιχεία που επιτρέπονται στα συγχωνευμένα"
-        embed_blacklist_selector: "CSS διαλογέας για στοιχεία που έχουν απομακρυνθεί από τα συγχωνευμένα"
-        embed_classname_whitelist: "Επιτρεπόμενα CSS ονόματα τάξης"
-        feed_polling_enabled: "Εισαγωγή δημοσιεύσεων μέσω RSS/ATOM"
-        feed_polling_url: "Η διεύθυνση URL του RSS/ATOM τροφοδοτεί την ανιχνεύση"
-        save: "Αποθήκευση ενσωματωμένων αλλαγών"
+        embed_post_limit: "Μέγιστος αριθμός αναρτήσεων για συγχώνευση"
+        embed_username_key_from_feed: "Κλειδί για λήψη του ονόματος χρήστη από το feed"
+        embed_title_scrubber: "Regular expression που χρησιμοποιείται για την λήψη των τίτλων των αναρτήσεων"
+        embed_truncate: "Truncate the embedded posts"
+        embed_whitelist_selector: "CSS selector για στοιχεία που επιτρέπονται στα συγχωνευμένα"
+        embed_blacklist_selector: "CSS selector για στοιχεία που έχουν απομακρυνθεί από τα συγχωνευμένα"
+        embed_classname_whitelist: "Επιτρεπόμενα CSS class names"
+        feed_polling_enabled: "Εισαγωγή αναρτήσεων μέσω RSS/ATOM"
+        feed_polling_url: "URL of RSS/ATOM feed to crawl"
+        feed_polling_frequency_mins: "Συχνότητα του feed polling (σε λεπτά)"
+        save: "Αποθήκευση των ρυθμίσεων Embedding "
       permalink:
-        title: "Μόνιμοι Σύνδεσμοι"
-        url: "διεύθυνση URL"
-        topic_id: "Ταυτότητα νήματος"
+        title: "Permalinks"
+        url: "URL"
+        topic_id: "Topic ID"
         topic_title: "Νήμα"
-        post_id: "Ταυτότητα δημοσίευσης"
-        post_title: "Δημοσίευση"
-        category_id: "Ταυτότητα Κατηγορίας"
+        post_id: "Post ID"
+        post_title: "Ανάρτηση"
+        category_id: "ID Κατηγορίας"
         category_title: "Κατηγορία"
         external_url: "Εξωτερική διεύθυνση URL"
         delete_confirm: Είσαι βέβαιος πως θέλεις να διαγράψεις αυτόν τον μόνιμο σύνδεσμο;
         form:
-          label: "Καινούριο:"
+          label: "Νέο:"
           add: "Προσθήκη"
           filter: "Αναζήτηση (διεύθυνση URL ή εξωτερική διεύθυνση URL)"
   wizard_js:
@@ -3103,17 +3370,17 @@ el:
       done: "Ολοκληρώθηκε"
       back: "Πίσω"
       next: "Επόμενο"
-      step: "%{current} του %{total}"
-      upload: "Μεταφόρτωση"
-      uploading: "Μεταφορτώνεται..."
+      step: "%{current} από %{total}"
+      upload: "Ανέβασμα"
+      uploading: "Ανεβαίνει..."
       quit: "Ίσως αργότερα"
       staff_count:
-        one: "Η κοινότητά σου έχει 1 μέλος του προσωπικού."
-        other: "Η κοινότητά σου έχει %{count} μέλη του προσωπικού."
+        one: "Η κοινότητα έχει 1 συνεργάτη (εσένα). "
+        other: "Η κοινότητά σας έχει %{count} συνεργάτες, μαζί με σένα."
       invites:
-        add_user: "προσθέτω"
-        none_added: "Δεν έχεις προσκαλέσει το προσωπικό. Είσαι βέβαιος πως θέλεις να συνεχίσεις;"
+        add_user: "προσθήκη"
+        none_added: "Δεν έχεις προσκαλέσει συνεργάτες. Είσαι βέβαιος πως θέλεις να συνεχίσεις;"
         roles:
           admin: "Διαχειριστής"
-          moderator: "Μεσολαβιτής"
+          moderator: "Συντονιστής"
           regular: "Τακτικός χρήστης"
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index f4f4143496..88c4b93c1e 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -6,7 +6,7 @@
 # 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, ift needs to be pushed by a maintainer to Transifex:
+# After this file is changed, it needs to be pushed by a maintainer to Transifex:
 #
 #   tx push -s
 #
@@ -74,6 +74,9 @@ en:
         x_seconds:
           one:   "1s"
           other: "%{count}s"
+        less_than_x_minutes:
+          one:   "< 1m"
+          other: "< %{count}m"
         x_minutes:
           one:   "1m"
           other: "%{count}m"
@@ -83,6 +86,9 @@ en:
         x_days:
           one:   "1d"
           other: "%{count}d"
+        x_months:
+          one:   "1mon"
+          other: "%{count}mon"
         about_x_years:
           one:   "1y"
           other: "%{count}y"
@@ -127,7 +133,7 @@ en:
           other: "%{count} years later"
       previous_month: 'Previous Month'
       next_month: 'Next Month'
-      placeholder: Pick a date
+      placeholder: date
     share:
       topic: 'share a link to this topic'
       post: 'post #%{postNumber}'
@@ -143,6 +149,7 @@ en:
       split_topic: "split this topic %{when}"
       invited_user: "invited %{who} %{when}"
       invited_group: "invited %{who} %{when}"
+      user_left: "%{who} removed themselves from this message %{when}"
       removed_user: "removed %{who} %{when}"
       removed_group: "removed %{who} %{when}"
       autoclosed:
@@ -180,20 +187,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!"
@@ -301,6 +309,8 @@ en:
     uploading_filename: "Uploading {{filename}}..."
     uploaded: "Uploaded!"
 
+    pasting: "Pasting..."
+
     enable: "Enable"
     disable: "Disable"
     undo: "Undo"
@@ -408,7 +418,8 @@ en:
         add_members: "Add Members"
         delete_member_confirm: "Remove '%{username}' from the '%{group}' group?"
       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_admission: "Allow users to join the group freely (Requires publicly visible group)"
+      public_exit: "Allow users to leave the group freely"
       empty:
         posts: "There are no posts by members of this group."
         members: "There are no members in this group."
@@ -420,23 +431,29 @@ en:
       join: "Join Group"
       leave: "Leave Group"
       request: "Request to Join Group"
+      message: "Message"
       automatic_group: Automatic Group
       closed_group: Closed Group
       is_group_user: "You are a member of this group"
       allow_membership_requests: "Allow users to send membership requests to group owners"
+      membership_request_template: "Custom template to display to users when sending a membership request"
+      membership_request:
+        submit: "Submit Request"
+        title: "Request to join @%{group_name}"
+        reason: "Let the group owners know why you belong in this group"
+
       membership: "Membership"
       name: "Name"
       user_count: "Number of Members"
       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."
       title:
-        one: "group"
-        other: "groups"
+        one: "Group"
+        other: "Groups"
       activity: "Activity"
       members: "Members"
       topics: "Topics"
@@ -444,8 +461,15 @@ 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?"
+        mentionable: "Who can @mention this group?"
+        messageable: "Who can message this group?"
         nobody: "Nobody"
         only_admins: "Only admins"
         mods_and_admins: "Only moderators and Admins"
@@ -536,6 +560,7 @@ en:
       topics_entered: "topics entered"
       post_count: "# posts"
       confirm_delete_other_accounts: "Are you sure you want to delete these accounts?"
+      powered_by: "powered by <a href='https://ipinfo.io'>ipinfo.io</a>"
 
     user_fields:
       none: "(select an option)"
@@ -546,7 +571,7 @@ en:
       mute: "Mute"
       edit: "Edit Preferences"
       download_archive:
-        button_text: "Download My Posts"
+        button_text: "Download All"
         confirm: "Are you sure you want to download your posts?"
         success: "Download initiated, you will be notified via message when the process is complete."
         rate_limit_error: "Posts can be downloaded once per day, please try again tomorrow."
@@ -573,12 +598,14 @@ en:
         enable: "Enable Notifications"
         currently_disabled: ""
         each_browser_note: "Note: You have to change this setting on every browser you use."
+      dismiss: 'Dismiss'
       dismiss_notifications: "Dismiss All"
       dismiss_notifications_tooltip: "Mark all unread notifications as read"
       first_notification: "Your first notification! Select it to begin."
       disable_jump_reply: "Don't jump to my post after I reply"
       dynamic_favicon: "Show new / updated topic count on browser icon"
       theme_default_on_all_devices: "Make this my default theme on all my devices"
+      allow_private_messages: "Allow other users to send me private messages"
       external_links_in_new_tab: "Open all external links in a new tab"
       enable_quoting: "Enable quote reply for highlighted text"
       change: "change"
@@ -586,8 +613,9 @@ en:
       admin: "{{user}} is an admin"
       moderator_tooltip: "This user is a moderator"
       admin_tooltip: "This user is an admin"
-      blocked_tooltip: "This user is blocked"
+      silenced_tooltip: "This user is silenced"
       suspended_notice: "This user is suspended until {{date}}."
+      suspended_permanently: "This user is suspended."
       suspended_reason: "Reason: "
       github_profile: "Github"
       email_activity_summary: "Activity Summary"
@@ -619,6 +647,7 @@ en:
 
       muted_categories: "Muted"
       muted_categories_instructions: "You will not be notified of anything about new topics in these categories, and they will not appear in latest."
+      no_category_access: "As a moderator you have limited category access, save is disabled."
       delete_account: "Delete My Account"
       delete_account_confirm: "Are you sure you want to permanently delete your account? This action cannot be undone!"
       deleted_yourself: "Your account has been deleted successfully."
@@ -637,6 +666,8 @@ en:
       undo_revoke_access: "Undo Revoke Access"
       api_approved: "Approved:"
       theme: "Theme"
+      home: "Default Home Page"
+      staged: "Staged"
 
       staff_counters:
         flags_given: "helpful flags"
@@ -684,7 +715,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:
@@ -692,11 +722,13 @@ en:
         taken: "Sorry, that email is not available."
         error: "There was an error changing your email. Perhaps that address is already in use?"
         success: "We've sent an email to that address. Please follow the confirmation instructions."
+        success_staff: "We've sent an email to your current address. Please follow the confirmation instructions."
 
       change_avatar:
         title: "Change your profile picture"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, based on"
         gravatar_title: "Change your avatar on Gravatar's website"
+        gravatar_failed: "Could not fetch the Gravatar. Is there one associated to that email address?"
         refresh_gravatar_title: "Refresh your Gravatar"
         letter_based: "System assigned profile picture"
         uploaded_avatar: "Custom picture"
@@ -836,6 +868,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?"
@@ -867,6 +902,7 @@ en:
         title: "Summary"
         stats: "Stats"
         time_read: "read time"
+        recent_time_read: "recent read time"
         topic_count:
           one: "topic created"
           other: "topics created"
@@ -874,14 +910,17 @@ en:
           one: "post created"
           other: "posts created"
         likes_given:
-          one: "<i class='fa fa-heart'></i> given"
-          other: "<i class='fa fa-heart'></i> given"
+          one: "given"
+          other: "given"
         likes_received:
-          one: "<i class='fa fa-heart'></i> received"
-          other: "<i class='fa fa-heart'></i> received"
+          one: "received"
+          other: "received"
         days_visited:
           one: "day visited"
           other: "days visited"
+        topics_entered:
+          one: "topic viewed"
+          other: "topics viewed"
         posts_read:
           one: "post read"
           other: "posts read"
@@ -978,7 +1017,11 @@ en:
     first_post: First post
     mute: Mute
     unmute: Unmute
-    last_post: Last post
+    last_post: Posted
+    time_read: Read
+    time_read_recently: '%{time_read} recently'
+    time_read_tooltip: '%{time_read} total time read'
+    time_read_recently_tooltip: '%{time_read} total time read (%{recent_time_read} in the last 60 days)'
     last_reply_lowercase: last reply
     replies_lowercase:
       one: reply
@@ -1008,6 +1051,7 @@ en:
     private_message_info:
       title: "Message"
       invite: "Invite Others..."
+      leave_message: "Do you really want to leave this message?"
       remove_allowed_user: "Do you really want to remove {{name}} from this message?"
       remove_allowed_group: "Do you really want to remove {{name}} from this message?"
 
@@ -1036,6 +1080,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"
@@ -1097,8 +1144,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}"
@@ -1109,6 +1156,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"
@@ -1120,12 +1169,37 @@ en:
       ctrl: 'Ctrl'
       alt: 'Alt'
 
+    select_kit:
+      default_header_text: Select...
+      no_content: No matches found
+      filter_placeholder: Search...
+      create: "Create {{content}}"
+
+    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"
@@ -1137,6 +1211,7 @@ en:
       similar_topics: "Your topic is similar to..."
       drafts_offline: "drafts offline"
 
+      group_mentioned_limit: "<b>Warning!</b> You mentioned <a href='{{group_link}}'>{{group}}</a>, however this group has more members than the administrator configured mention limit of {{max}} users. Nobody will be notified. "
       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?"
@@ -1161,6 +1236,7 @@ en:
       cancel: "Cancel"
       create_topic: "Create Topic"
       create_pm: "Message"
+      create_whisper: "Whisper"
       title: "Or press Ctrl+Enter"
 
       users_placeholder: "Add a user"
@@ -1169,6 +1245,7 @@ en:
       edit_reason_placeholder: "why are you editing?"
       show_edit_reason: "(add edit reason)"
       topic_featured_link_placeholder: "Enter link shown with title."
+      remove_featured_link: "Remove link from topic."
       reply_placeholder: "Type here. Use Markdown, BBCode, or HTML to format. Drag or paste images."
       view_new_post: "View your new post."
       saving: "Saving"
@@ -1200,12 +1277,9 @@ en:
       olist_title: "Numbered List"
       ulist_title: "Bulleted List"
       list_item: "List item"
-      heading_label: "H"
-      heading_title: "Heading"
-      heading_text: "Heading"
-      hr_title: "Horizontal Rule"
       help: "Markdown Editing Help"
-      toggler: "hide or show the composer panel"
+      collapse: "minimize the composer panel"
+      abandon: "close composer and discard draft"
       modal_ok: "OK"
       modal_cancel: "Cancel"
       cant_send_pm: "Sorry, you can't send a message to %{username}."
@@ -1216,36 +1290,42 @@ en:
       admin_options_title: "Optional staff settings for this topic"
 
     notifications:
+      tooltip:
+        regular:
+          one: "1 unseen notification"
+          other: "{{count}} unseen notifications"
+        message:
+          one: "1 unread message"
+          other: "{{count}} unread messages"
       title: "notifications of @name mentions, replies to your posts and topics, messages, etc"
       none: "Unable to load notifications at this time."
       empty: "No notifications found."
       more: "view older notifications"
       total_flagged: "total flagged posts"
-      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>"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} and 1 other</span> {{description}}</p>"
-        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} and {{count}} others</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>Earned '{{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>New Topic</span> {{description}}</p>"
+        one: "<span>{{username}}, {{username2}} and 1 other</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} and {{count}} others</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> accepted your invitation"
+      moved_post: "<span>{{username}}</span> moved {{description}}"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "Earned '{{description}}'"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>New Topic</span> {{description}}"
 
       group_message_summary:
-          one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} message in your {{group_name}} inbox</p>"
-          other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} messages in your {{group_name}} inbox</p>"
+          one: "{{count}} message in your {{group_name}} inbox"
+          other: "{{count}} messages in your {{group_name}} inbox"
 
       alt:
         mentioned: "Mentioned by"
@@ -1262,6 +1342,7 @@ en:
         linked: "Link to your post"
         granted_badge: "Badge granted"
         group_message_summary: "Messages in group inbox"
+        topic_reminder: "A reminder"
 
       popup:
         mentioned: '{{username}} mentioned you in "{{topic}}" - {{site_title}}'
@@ -1286,6 +1367,7 @@ en:
       uploading: "Uploading"
       select_file: "Select File"
       image_link: "link your image will point to"
+      default_image_alt_text: image
 
     search:
       sort_by: "Sort by"
@@ -1298,14 +1380,21 @@ 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}}{{plus}} 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."
       searching: "Searching ..."
       post_format: "#{{post_number}} by {{username}}"
-      results_page: "Search Results"
+      results_page: "Search results for '{{term}}'"
+      more_results: "There are more results. Please narrow your search criteria."
+      cant_find: "Can’t find what you’re looking for?"
+      start_new_topic: "Perhaps start a new topic?"
+      or_search_google: "Or try searching with Google instead:"
+      search_google: "Try searching with Google instead:"
+      search_google_button: "Google"
+      search_google_title: "Search this site"
 
       context:
         user: "Search posts by @{{username}}"
@@ -1318,27 +1407,29 @@ en:
         posted_by:
           label: Posted by
         in_category:
-          label: In Category
+          label: Categorized
         in_group:
           label: In Group
         with_badge:
           label: With Badge
         with_tags:
-          label: With Tags
+          label: Tagged
         filters:
-          label: Only return topics/posts that...
+          label: Only return topics/posts...
           likes: I liked
           posted: I posted in
           watching: I'm watching
           tracking: I'm tracking
-          private: are in my messages
-          bookmarks: I've bookmarked
+          private: In my messages
+          bookmarks: I bookmarked
           first: are the very first post
           pinned: are pinned
           unpinned: are not pinned
-          seen: I've read
+          seen: I read
           unseen: I've not read
           wiki: are wiki
+          images: include image(s)
+          all_tags: All the above tags
         statuses:
           label: Where topics
           open: are open
@@ -1497,20 +1588,27 @@ en:
       deleted: "The topic has been deleted"
 
       topic_status_update:
-        title: "Set Topic Timer"
+        title: "Topic Timer"
         save: "Set Timer"
         num_of_hours: "Number of hours:"
         remove: "Remove Timer"
         publish_to: "Publish To:"
         when: "When:"
+        public_timer_types: Topic Timers
+        private_timer_types: User Topic Timers
       auto_update_input:
-        none: ""
+        none: "Select a timeframe"
         later_today: "Later today"
         tomorrow: "Tomorrow"
         later_this_week: "Later this week"
         this_weekend: "This weekend"
         next_week: "Next week"
+        two_weeks: "Two Weeks"
         next_month: "Next month"
+        three_months: "Three Months"
+        six_months: "Six Months"
+        one_year: "One Year"
+        forever: "Forever"
         pick_date_and_time: "Pick date and time"
         set_based_on_last_post: "Close based on last post"
       publish_to_category:
@@ -1708,6 +1806,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'
 
@@ -1760,7 +1859,18 @@ en:
       multi_select:
         select: 'select'
         selected: 'selected ({{count}})'
-        select_replies: 'select +replies'
+        select_post:
+          label: 'select'
+          title: 'Add post to selection'
+        selected_post:
+          label: 'selected'
+          title: 'Click to remove post from selection'
+        select_replies:
+          label: 'select +replies'
+          title: 'Add post and all its replies to selection'
+        select_below:
+          label: 'select +below'
+          title: 'Add post and all after it to selection'
         delete: delete selected
         cancel: cancel selecting
         select_all: select all
@@ -1773,7 +1883,7 @@ en:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Quote"
-      edit: "Editing {{link}} {{replyAvatar}} {{username}}"
+      edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Reason: "
       post_number: "post {{number}}"
       wiki_last_edited_on: "wiki last edited on"
@@ -1844,6 +1954,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"
@@ -1851,11 +1962,14 @@ en:
         share: "share a link to this post"
         more: "More"
         delete_replies:
-          confirm:
-            one: "Do you also want to delete the direct reply to this post?"
-            other: "Do you also want to delete the {{count}} direct replies to this post?"
-          yes_value: "Yes, delete the replies too"
-          no_value: "No, just this post"
+          confirm: "Do you also want to delete the replies to this post?"
+          direct_replies:
+            one: "Yes, and 1 direct reply"
+            other: "Yes, and {{count}} direct replies"
+          all_replies:
+            one: "Yes, and 1 reply"
+            other: "Yes, and all {{count}} replies"
+          just_the_post: "No, just this post"
         admin: "post admin actions"
         wiki: "Make Wiki"
         unwiki: "Remove Wiki"
@@ -1868,8 +1982,8 @@ en:
       actions:
         flag: 'Flag'
         defer_flags:
-          one: "Defer flag"
-          other: "Defer flags"
+          one: "Ignore flag"
+          other: "Ignore flags"
         undo:
           off_topic: "Undo flag"
           spam: "Undo flag"
@@ -1885,6 +1999,9 @@ en:
           notify_user: "sent a message"
           bookmark: "bookmarked this"
           like: "liked this"
+          like_capped:
+            one: "and {{count}} other liked this"
+            other: "and {{count}} others liked this"
           vote: "voted for this"
         by_you:
           off_topic: "You flagged this as off-topic"
@@ -1949,11 +2066,11 @@ en:
       delete:
         confirm:
           one: "Are you sure you want to delete that post?"
-          other: "Are you sure you want to delete all those posts?"
+          other: "Are you sure you want to delete those {{count}} posts?"
 
       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:
@@ -2003,8 +2120,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"
@@ -2039,6 +2156,7 @@ en:
       email_in_allow_strangers: "Accept emails from anonymous users with no accounts"
       email_in_disabled: "Posting new topics via email is disabled in the Site Settings. To enable posting new topics via email, "
       email_in_disabled_click: 'enable the "email in" setting.'
+      mailinglist_mirror: "Category mirrors a mailing list"
       suppress_from_homepage: "Suppress this category from the homepage."
       show_subcategory_list: "Show subcategory list above topics in this category."
       num_featured_topics: "Number of topics shown on the categories page:"
@@ -2319,7 +2437,7 @@ en:
         hamburger_menu: '<b>=</b> Open hamburger menu'
         user_profile_menu: '<b>p</b> Open user menu'
         show_incoming_updated_topics: '<b>.</b> Show updated topics'
-        search: '<b>/</b> Search'
+        search: '<b>/</b> or <b>ctrl</b>+<b>alt</b>+<b>f</b> Search'
         help: '<b>?</b> Open keyboard help'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Dismiss New/Posts'
         dismiss_topics: '<b>x</b>, <b>t</b> Dismiss Topics'
@@ -2393,9 +2511,12 @@ en:
       selector_no_tags: "no tags"
       changed: "tags changed:"
       tags: "Tags"
-      choose_for_topic: "choose optional tags for this topic"
+      choose_for_topic: "optional tags"
       delete_tag: "Delete Tag"
-      delete_confirm: "Are you sure you want to delete that tag?"
+      delete_confirm:
+        one: "Are you sure you want to delete this tag and remove it from 1 topic it is assigned to?"
+        other: "Are you sure you want to delete this tag and remove it from {{count}} topics it is assigned to?"
+      delete_confirm_no_topics: "Are you sure you want to delete this tag?"
       rename_tag: "Rename Tag"
       rename_instructions: "Choose a new name for the tag:"
       sort_by: "Sort by:"
@@ -2501,7 +2622,7 @@ en:
         no_problems: "No problems were found."
         moderators: 'Moderators:'
         admins: 'Admins:'
-        blocked: 'Blocked:'
+        silenced: 'Silenced:'
         suspended: 'Suspended:'
         private_messages_short: "Msgs"
         private_messages_title: "Messages"
@@ -2537,25 +2658,26 @@ en:
 
       flags:
         title: "Flags"
-        old: "Old"
-        active: "Active"
+        active_posts: "Flagged Posts"
+        old_posts: "Old Flagged Posts"
+        topics: "Flagged Topics"
+        moderation_history: "Moderation History"
 
         agree: "Agree"
         agree_title: "Confirm this flag as valid and correct"
-        agree_flag_modal_title: "Agree and..."
-        agree_flag_hide_post: "Agree (hide post + send PM)"
-        agree_flag_hide_post_title: "Hide this post and automatically send the user a message urging them to edit it"
-        agree_flag_restore_post: "Agree (restore post)"
-        agree_flag_restore_post_title: "Restore this post"
-        agree_flag: "Agree with flag"
-        agree_flag_title: "Agree with flag and keep the post unchanged"
-        defer_flag: "Defer"
+        agree_flag_hide_post: "Agree and Hide Post"
+        agree_flag_hide_post_title: "Hide this post and automatically send the user a message urging them to edit it."
+        agree_flag_restore_post: "Agree and Restore Post"
+        agree_flag_restore_post_title: "Restore the post so that all users can see it."
+        agree_flag: "Agree and Keep Post"
+        agree_flag_title: "Agree with flag and keep the post unchanged."
+        defer_flag: "Ignore"
         defer_flag_title: "Remove this flag; it requires no action at this time."
         delete: "Delete"
         delete_title: "Delete the post this flag refers to."
-        delete_post_defer_flag: "Delete post and Defer flag"
+        delete_post_defer_flag: "Delete Post and Ignore flag"
         delete_post_defer_flag_title: "Delete post; if the first post, delete the topic"
-        delete_post_agree_flag: "Delete post and Agree with flag"
+        delete_post_agree_flag: "Delete Post and Agree with flag"
         delete_post_agree_flag_title: "Delete post; if the first post, delete the topic"
         delete_flag_modal_title: "Delete and..."
         delete_spammer: "Delete Spammer"
@@ -2567,11 +2689,13 @@ en:
         clear_topic_flags: "Done"
         clear_topic_flags_title: "The topic has been investigated and issues have been resolved. Click Done to remove the flags."
         more: "(more replies...)"
+        suspend_user: "Suspend User"
+        suspend_user_title: "Suspend user for this post"
 
         dispositions:
           agreed: "agreed"
           disagreed: "disagreed"
-          deferred: "deferred"
+          deferred: "ignored"
 
         flagged_by: "Flagged by"
         resolved_by: "Resolved by"
@@ -2579,28 +2703,27 @@ en:
         system: "System"
         error: "Something went wrong"
         reply_message: "Reply"
-        no_results: "There are no flags."
+        no_results: "There are no flagged posts."
         topic_flagged: "This <strong>topic</strong> has been flagged."
+        show_full: "show full post"
         visit_topic: "Visit the topic to take action"
         was_edited: "Post was edited after the first flag"
         previous_flags_count: "This post has already been flagged {{count}} times."
+        show_details: "Show flag details"
+        details: "details"
 
-        summary:
-          action_type_3:
-            one: "off-topic"
-            other: "off-topic x{{count}}"
-          action_type_4:
-            one: "inappropriate"
-            other: "inappropriate x{{count}}"
-          action_type_6:
-            one: "custom"
-            other: "custom x{{count}}"
-          action_type_7:
-            one: "custom"
-            other: "custom x{{count}}"
-          action_type_8:
-            one: "spam"
-            other: "spam x{{count}}"
+        flagged_topics:
+          topic: "Topic"
+          type: "Type"
+          users: "Users"
+          last_flagged: "Last Flagged"
+
+        short_names:
+          off_topic: "off-topic"
+          inappropriate: "inappropriate"
+          spam: "spam"
+          notify_user: "custom"
+          notify_moderators: "custom"
 
       groups:
         primary: "Primary Group"
@@ -2691,7 +2814,7 @@ en:
           details: "When there is a new reply, edit, deleted or recovered."
         user_event:
           name: "User Event"
-          details: "When a user is created, approved or updated."
+          details: "When a user logs in, logs out, is created, approved or updated."
         delivery_status:
           title: "Delivery Status"
           inactive: "Inactive"
@@ -2873,7 +2996,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"
@@ -3005,6 +3128,16 @@ en:
             reply_key_placeholder: "reply key"
             skipped_reason_placeholder: "reason"
 
+      moderation_history:
+        performed_by: "Performed By"
+        no_results: "There is no moderation history available."
+        actions:
+          delete_user: "User Deleted"
+          suspend_user: "User Suspended"
+          silence_user: "User Silenced"
+          delete_post: "Post Deleted"
+          delete_topic: "Topic Deleted"
+
       logs:
         title: "Logs"
         action: "Action"
@@ -3060,8 +3193,8 @@ en:
             change_category_settings: "change category settings"
             delete_category: "delete category"
             create_category: "create category"
-            block_user: "block user"
-            unblock_user: "unblock user"
+            silence_user: "silence user"
+            unsilence_user: "unsilence user"
             grant_admin: "grant admin"
             revoke_admin: "revoke admin"
             grant_moderation: "grant moderation"
@@ -3109,9 +3242,48 @@ en:
           roll_up:
             text: "Roll up"
             title: "Creates new subnet ban entries if there are at least 'min_ban_entries_for_roll_up' entries."
+        search_logs:
+          title: "Search Logs"
+          term: "Term"
+          searches: "Searches"
+          click_through: "Click Through"
+          unique: "Unique"
+          unique_title: "unique users performing the search"
+          types:
+            all_search_types: "All search types"
+            header: "Header"
+            full_page: "Full Page"
+            click_through_only: "All (click through only)"
         logster:
           title: "Error Logs"
 
+      watched_words:
+        title: "Watched Words"
+        search: "search"
+        clear_filter: "Clear"
+        show_words: "show words"
+        word_count:
+          one: "1 word"
+          other: "%{count} words"
+        actions:
+          block: 'Block'
+          censor: 'Censor'
+          require_approval: 'Require Approval'
+          flag: 'Flag'
+        action_descriptions:
+          block: 'Prevent posts containing these words from being posted. The user will see an error message when they try to submit their post.'
+          censor: 'Allow posts containing these words, but replace them with characters that hide the censored words.'
+          require_approval: 'Posts containing these words will require approval by staff before they can be seen.'
+          flag: 'Allow posts containing these words, but flag them as inappropriate so moderators can review them.'
+        form:
+          label: 'New Word:'
+          placeholder: 'full word or * as wildcard'
+          placeholder_regexp: "regular expression"
+          add: 'Add'
+          success: 'Success'
+          upload: "Upload"
+          upload_successful: "Upload successful. Words have been added."
+
       impersonate:
         title: "Impersonate"
         help: "Use this tool to impersonate a user account for debugging purposes. You will have to log out once finished."
@@ -3132,7 +3304,7 @@ en:
           pending: "Pending"
           staff: 'Staff'
           suspended: 'Suspended'
-          blocked: 'Blocked'
+          silenced: 'Silenced'
           suspect: 'Suspect'
         approved: "Approved?"
         approved_selected:
@@ -3153,7 +3325,7 @@ en:
           staff: "Staff"
           admins: 'Admin Users'
           moderators: 'Moderators'
-          blocked: 'Blocked Users'
+          silenced: 'Silenced Users'
           suspended: 'Suspended Users'
           suspect: 'Suspect Users'
         reject_successful:
@@ -3171,20 +3343,33 @@ en:
         suspend_failed: "Something went wrong suspending this user {{error}}"
         unsuspend_failed: "Something went wrong unsuspending this user {{error}}"
         suspend_duration: "How long will the user be suspended for?"
-        suspend_duration_units: "(days)"
         suspend_reason_label: "Why are you suspending? This text <b>will be visible to everyone</b> on this user's profile page, and will be shown to the user when they try to log in. Keep it short."
+        suspend_reason_hidden_label: "Why are you suspending? This text will be shown to the user when they try to log in. Keep it short."
         suspend_reason: "Reason"
+        suspend_reason_placeholder: "Suspension Reason"
+        suspend_message: "Email Message"
+        suspend_message_placeholder: "Optionally, provide more information about the suspension and it will be emailed to the user."
         suspended_by: "Suspended by"
+        silence_reason: "Reason"
+        silenced_by: "Silenced By"
+        silence_modal_title: "Silence User"
+        silence_duration: "How long will the user be silenced for?"
+        silence_reason_label: "Why are you silencing this user?"
+        silence_reason_placeholder: "Silence Reason"
+        silence_message: "Email Message"
+        silence_message_placeholder: "(leave blank to send default message)"
+        suspended_until: "(until %{until})"
+        cant_suspend: "This user cannot be suspended."
         delete_all_posts: "Delete all posts"
 
         # keys ending with _MF use message format, see https://meta.discourse.org/t/message-format-support-for-localization/7035 for details
         delete_all_posts_confirm_MF: "You are about to delete {POSTS, plural, one {1 post} other {# posts}} and {TOPICS, plural, one {1 topic} other {# topics}}. Are you sure?"
-        suspend: "Suspend"
-        unsuspend: "Unsuspend"
-        suspended: "Suspended?"
+        silence: "Silence"
+        unsilence: "Unsilence"
+        silenced: "Silenced?"
         moderator: "Moderator?"
         admin: "Admin?"
-        blocked: "Blocked?"
+        suspended: "Suspended?"
         staged: "Staged?"
         show_admin_profile: "Admin"
         refresh_browsers: "Force browser refresh"
@@ -3200,8 +3385,8 @@ en:
         grant_admin_confirm: "We've sent you an email to verify the new administrator. Please open it and follow the instructions."
         revoke_moderation: 'Revoke Moderation'
         grant_moderation: 'Grant Moderation'
-        unblock: 'Unblock'
-        block: 'Block'
+        unsuspend: 'Unsuspend'
+        suspend: 'Suspend'
         reputation: Reputation
         permissions: Permissions
         activity: Activity
@@ -3248,10 +3433,10 @@ en:
         activate_failed: "There was a problem activating the user."
         deactivate_account: "Deactivate Account"
         deactivate_failed: "There was a problem deactivating the user."
-        unblock_failed: 'There was a problem unblocking the user.'
-        block_failed: 'There was a problem blocking the user.'
-        block_confirm: 'Are you sure you want to block this user? They will not be able to create any new topics or posts.'
-        block_accept: 'Yes, block this user'
+        unsilence_failed: 'There was a problem unsilencing the user.'
+        silence_failed: 'There was a problem silencing the user.'
+        silence_confirm: 'Are you sure you want to silence this user? They will not be able to create any new topics or posts.'
+        silence_accept: 'Yes, silence this user'
         bounce_score: "Bounce Score"
         reset_bounce_score:
           label: "Reset"
@@ -3260,7 +3445,7 @@ en:
 
         deactivate_explanation: "A deactivated user must re-validate their email."
         suspended_explanation: "A suspended user can't log in."
-        block_explanation: "A blocked user can't post or start topics."
+        silence_explanation: "A silenced user can't post or start topics."
         staged_explanation: "A staged user can only post via email in specific topics."
         bounce_score_explanation:
           none: "No bounces were received recently from that email."
@@ -3382,6 +3567,7 @@ en:
           developer: 'Developer'
           embedding: "Embedding"
           legal: "Legal"
+          api: 'API'
           user_api: 'User API'
           uncategorized: 'Other'
           backups: "Backups"
@@ -3526,8 +3712,8 @@ en:
       quit: "Maybe Later"
 
       staff_count:
-        one: "Your community has 1 staff member. "
-        other: "Your community has %{count} staff members."
+        one: "Your community has 1 staff (you). "
+        other: "Your community has %{count} staff, including you."
 
       invites:
         add_user: "add"
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index bdfb49b905..f38923daae 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -30,10 +30,10 @@ es:
       timeline_date: "MMM YYYY"
       long_no_year: "MMM D h:mm a"
       long_no_year_no_time: "MMM D"
-      full_no_year_no_time: "D MMMM"
+      full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
       long_with_year_no_time: "MMM D, YYYY"
-      full_with_year_no_time: "D MMMM YYYY"
+      full_with_year_no_time: "MMMM Do, YYYY"
       long_date_with_year: "D MMM, 'YY LT"
       long_date_without_year: "D MMM, LT"
       long_date_with_year_without_time: "D MMM, 'YY"
@@ -48,6 +48,9 @@ es:
         x_seconds:
           one: "1s"
           other: "%{count}s"
+        less_than_x_minutes:
+          one: "< 1m"
+          other: "< %{count}m"
         x_minutes:
           one: "1m"
           other: "%{count}m"
@@ -57,6 +60,9 @@ es:
         x_days:
           one: "1d"
           other: "%{count}d"
+        x_months:
+          one: "1 mes"
+          other: "%{count}meses"
         about_x_years:
           one: "1a"
           other: "%{count}a"
@@ -101,7 +107,7 @@ es:
           other: "%{count} años después"
       previous_month: 'Mes anterior'
       next_month: 'Próximo mes'
-      placeholder: Escoge una fecha
+      placeholder: fecha
     share:
       topic: 'comparte un enlace a este tema'
       post: 'post #%{postNumber}'
@@ -116,6 +122,7 @@ es:
       split_topic: "separó este tema %{when}"
       invited_user: "invitó a %{who} %{when}"
       invited_group: "invitó a %{who} %{when}"
+      user_left: "%{who} se han eliminado de este mensaje %{when}"
       removed_user: "eliminó a %{who} %{when}"
       removed_group: "eliminó a %{who} %{when}"
       autoclosed:
@@ -137,10 +144,10 @@ es:
         enabled: 'listado %{when}'
         disabled: 'quitado de la lista, invisible %{when}'
       banner:
-        enabled: 'hizo de esto un banner %{when}. Aparecerá en la parte superior de cada página hasta que sea descartada por el usuario.'
-        disabled: 'eliminado este banner %{when}. Ya no aparecerá en la parte superior de cada página.'
+        enabled: 'hazlo un banner %{when}. Aparecerá arriba en cada página hasta que el usuario lo deje de destacar.'
+        disabled: 'eliminar este banner %{when}. Ya no aparecerá en la parte superior de cada página.'
     topic_admin_menu: "acciones de administrador para el tema"
-    wizard_required: "¡Bienvenido a tu nuevo Discourse! Empecemos con <a href='%{url}' data-auto-route='true'>el asistente de configuración</a>  ✨"
+    wizard_required: "¡Bienvenido a tu nuevo Discourse! Empezaremos con <a href='%{url}' data-auto-route='true'>el asistente de configuración</a>  ✨"
     emails_are_disabled: "Todos los emails salientes han sido desactivados por un administrador. No se enviará ninguna notificación por email."
     bootstrap_mode_enabled: "Para lanzar tu nuevo sitio más fácilmente, estás en modo de arranque. A todos los nuevos usuarios se les concederá el nivel 1 de confianza y recibirán resúmenes diarios por email. Esto se desactivará automáticamente cuando el número total de usuarios exceda los %{min_users}."
     bootstrap_mode_disabled: "El modo de arranque se desactivará en las próximas 24 horas."
@@ -148,20 +155,21 @@ 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_east_2: "US East (Ohio)"
+        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 +214,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"
@@ -257,6 +265,7 @@ es:
     uploading: "Subiendo..."
     uploading_filename: "Subiendo {{filename}}..."
     uploaded: "¡Subido!"
+    pasting: "Copiando..."
     enable: "Activar"
     disable: "Desactivar"
     undo: "Deshacer"
@@ -270,7 +279,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:"
@@ -297,12 +306,12 @@ es:
     user_action:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> publicó <a href='{{topicUrl}}'>el tema</a>"
       you_posted_topic: "<a href='{{userUrl}}'>Tú</a> publicaste <a href='{{topicUrl}}'>el tema</a>"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> contestó a <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Tú</a> contestaste a <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> contestó a <a href='{{topicUrl}}'>el tema</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Tú</a> contestaste a <a href='{{topicUrl}}'>el tema</a>"
+      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> contestó <a href='{{postUrl}}'>{{post_number}}</a>"
+      you_replied_to_post: "<a href='{{userUrl}}'>Tú</a> contestaste <a href='{{postUrl}}'>{{post_number}}</a>"
+      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> contestó al <a href='{{topicUrl}}'>tema</a>"
+      you_replied_to_topic: "<a href='{{userUrl}}'>Tú</a> contestaste al <a href='{{topicUrl}}'>tema</a>"
       user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> mencionó a <a href='{{user2Url}}'>{{another_user}}</a>"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> <a href='{{user2Url}}'>te</a> mencionó"
+      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> <a href='{{user2Url}}'>te mencionó</a>"
       you_mentioned_user: "<a href='{{user1Url}}'>Tú</a> mencionaste a <a href='{{user2Url}}'>{{another_user}}</a>"
       posted_by_user: "Publicado por <a href='{{userUrl}}'>{{user}}</a>"
       posted_by_you: "Publicado por <a href='{{userUrl}}'>ti</a>"
@@ -342,7 +351,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,48 +360,58 @@ 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_admission: "Permitir a los usuarios unirse al grupo cuando quieran (Requiere que el grupo sea visible)"
+      public_exit: "Permitir a los usuarios dejar el grupo libremente"
       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"
       join: "Unirse al grupo"
       leave: "Salir del grupo"
       request: "Solicitar unirse al grupo"
+      message: "Mensaje"
       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_request_template: "Template personalizado para mostrar a los usuarios cuando envían una solicitud de membresía"
+      membership_request:
+        submit: "Enviar solicitud"
+        title: "Solicitar unirse a @%{group_name}"
+        reason: "Permitir a los propietarios del grupo saber por qué perteneces a este 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."
       title:
-        one: "grupo"
-        other: "grupos"
+        one: "Grupo"
+        other: "Grupos"
       activity: "Actividad"
       members: "Miembros"
       topics: "Temas"
       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 administradores"
+        staff: "Propietarios del grupo, y staff"
+        owners: "Propietarios del grupo y administradores"
       alias_levels:
-        title: "¿Quién puede emviar mensajes y @mencionar a este grupo?"
+        mentionable: "¿Quién puede @mencionar este grupo?"
+        messageable: "¿Quién puede mensajear este grupo?"
         nobody: "Nadie"
         only_admins: "Solo administradores"
         mods_and_admins: "Solo moderadores y administradores"
@@ -417,18 +436,18 @@ es:
         muted:
           title: "Silenciado"
           description: "Nunca se te notificará de nada sobre temas en este grupo."
-      flair_url: "Adorno de imagen de usuario"
+      flair_url: "Sub-avatar del grupo"
       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 +455,7 @@ es:
       '7': "Menciones"
       '9': "Citas"
       '11': "Ediciones"
-      '12': "Elementos enviados"
+      '12': "Elementos Enviados"
       '13': "Bandeja de entrada"
       '14': "Pendiente"
     categories:
@@ -480,6 +499,7 @@ es:
       topics_entered: "temas vistos"
       post_count: "# posts"
       confirm_delete_other_accounts: "¿Seguro que quieres eliminar estas cuentas?"
+      powered_by: "powered by <a href='https://ipinfo.io'>ipinfo.io</a>"
     user_fields:
       none: "(selecciona una opción)"
     user:
@@ -488,10 +508,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 +520,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:
@@ -512,12 +532,15 @@ es:
         perm_denied_expl: "Has denegado los permisos para las notificaciones en tu navegador web. Configura tu navegador para permitir notificaciones. "
         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"
+        each_browser_note: "Nota: Tendrás que cambiar esta opción para cada navegador que uses."
+      dismiss: 'Descartar'
+      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"
+      allow_private_messages: "Permitir a otros usuarios enviarme mensajes privados"
       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"
@@ -525,8 +548,9 @@ es:
       admin: "{{user}} es un administrador"
       moderator_tooltip: "Este usuario es un moderador"
       admin_tooltip: "Este usuario es un administrador"
-      blocked_tooltip: "El usuario está bloqueado"
+      silenced_tooltip: "Este usuario está silenciado"
       suspended_notice: "Este usuario ha sido suspendido hasta {{date}}."
+      suspended_permanently: "Este usuario está suspendido."
       suspended_reason: "Causa: "
       github_profile: "Github"
       email_activity_summary: "Resumen de actividad"
@@ -557,9 +581,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 +593,15 @@ 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"
+      home: "Página de inicio por defecto"
+      staged: "Temporal"
       staff_counters:
         flags_given: "reportes útiles"
         flagged_posts: "posts reportados"
@@ -613,38 +640,39 @@ 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."
+        success_staff: "Te hemos enviado un email a la dirección actual. 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"
         gravatar_title: "Cambia tu avatar en la web de Gravatar"
+        gravatar_failed: "No se pudo obtener el Gravatar. ¿Hay alguno asociado a esa dirección de correo electrónico?"
         refresh_gravatar_title: "Actualizar tu Gravatar"
         letter_based: "Imagen de perfil asignada por el sistema"
         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"
-        instructions: "Imágenes de fondo serán centrados y tendrán un ancho por defecto de 590px."
+        title: "Fondo de Tarjeta de Usuario"
+        instructions: "Imágenes de fondo serán centrados y tendrán un ancho por default 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."
@@ -656,7 +684,7 @@ es:
         instructions: "tu nombre completo (opcional)"
         instructions_required: "Tu nombre completo"
         too_short: "Tu nombre es demasiado corto"
-        ok: "Tu nombre es válido"
+        ok: "Tu nombre parece bueno"
       username:
         title: "Nombre de usuario"
         instructions: "único, sin espacios y corto"
@@ -682,22 +710,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 +736,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 +762,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 +772,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"
+        rescind: "Eliminar"
         rescinded: "Invitación eliminada"
-        reinvite: "Reenviar invitación"
+        rescind_all: "Eliminar todas las invitaciones"
+        rescinded_all: "Todas las invitaciones eliminadas!"
+        rescind_all_confirm: "¿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?"
+        reinvite_all_confirm: "¿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."
@@ -781,6 +812,7 @@ es:
         title: "Resumen"
         stats: "Estadísticas"
         time_read: "tiempo de lectura"
+        recent_time_read: "tiempo de lectura reciente"
         topic_count:
           one: "tema creado"
           other: "temas creados"
@@ -788,14 +820,17 @@ es:
           one: "post publicado"
           other: "posts publicados"
         likes_given:
-          one: "<i class='fa fa-heart'></i> dado"
-          other: "<i class='fa fa-heart'></i> dados"
+          one: "dado"
+          other: "dados"
         likes_received:
-          one: "<i class='fa fa-heart'></i> recibido"
-          other: "<i class='fa fa-heart'></i> recibidos"
+          one: "recibido"
+          other: "recibidos"
         days_visited:
           one: "día visitado"
           other: "días visitados"
+        topics_entered:
+          one: "tema visto"
+          other: "temas vistos"
         posts_read:
           one: "post leído"
           other: "posts leídos"
@@ -814,7 +849,7 @@ es:
         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_users: "Más gustado"
         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 +873,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 +894,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."
@@ -884,7 +919,11 @@ es:
     first_post: Primer post
     mute: Silenciar
     unmute: No silenciar
-    last_post: Último post
+    last_post: Publicado
+    time_read: Leído
+    time_read_recently: '%{time_read} recientemente'
+    time_read_tooltip: '%{time_read} tiempo de lectura total'
+    time_read_recently_tooltip: '%{time_read} tiempo de lectura total (%{recent_time_read} en los últimos 60 días)'
     last_reply_lowercase: última respuesta
     replies_lowercase:
       one: respuesta
@@ -910,9 +949,10 @@ es:
     private_message_info:
       title: "Mensaje"
       invite: "Invitar a Otros..."
+      leave_message: "¿Realmente quieres dejar este mensaje?"
       remove_allowed_user: "¿Seguro que quieres eliminar a {{name}} de este mensaje?"
       remove_allowed_group: "¿Seguro que quieres eliminar a {{name}} de este mensaje?"
-    email: 'E-mail'
+    email: 'Email'
     username: 'Nombre de usuario'
     last_seen: 'Visto por última vez'
     created: 'Creado'
@@ -921,7 +961,7 @@ es:
     search_hint: 'usuario, email o dirección IP'
     create_account:
       disclaimer: "Al registrarte, aceptas la <a href='{{privacy_link}}'>política de privacidad</a> y los <a href='{{tos_link}}'>términos de servicio</a>."
-      title: "Crear nueva cuenta"
+      title: "Crear Cuenta Nueva"
       failed: "Algo ha salido mal, tal vez este e-mail ya fue registrado, intenta con el enlace 'olvidé la contraseña'"
     forgot_password:
       title: "Restablecer contraseña"
@@ -934,6 +974,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,9 +985,9 @@ 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"
+      logging_in: "Iniciando Sesión..."
       or: "O"
       authenticating: "Autenticando..."
       awaiting_activation: "Tu cuenta está pendiente de activación, usa el enlace de 'olvidé contraseña' para recibir otro e-mail de activación."
@@ -952,12 +995,12 @@ 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"
+      resend_title: "Volver a enviar email de activación"
       change_email: "Cambiar dirección de email"
-      provide_new_email: "Escribe una nueva dirección y le reenviaremos el correo de confirmación."
-      submit_new_email: "Actualizar dirección de email"
+      provide_new_email: "Poner un nuevo email, y te reenviaremos una confirmación de email."
+      submit_new_email: "Actualizar Dirección de Email"
       sent_activation_email_again: "Te hemos enviado otro e-mail de activación a <b>{{currentemail}}</b>. Podría tardar algunos minutos en llegar; asegúrate de revisar tu carpeta de spam."
       to_continue: "Por favor, inicia sesión"
       preferences: "Debes tener una sesión iniciada para cambiar tus preferencias de usuario."
@@ -989,10 +1032,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,20 +1046,45 @@ es:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
-      categories_only: "Solo categorías"
-      categories_with_featured_topics: "Categorías con temas destacados"
+      categories_only: "Sólo categorías"
+      categories_with_featured_topics: "Categorías y temas destacados"
       categories_and_latest_topics: "Categorías y temas recientes"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: Seleccionar...
+      no_content: Ninguna coincidencia encontrada
+      filter_placeholder: Buscar...
+      create: "Crear {{content}}"
+    emoji_picker:
+      filter_placeholder: Buscar emoji
+      people: People
+      nature: Nature
+      food: Food
+      activity: Activity
+      travel: Travel
+      objects: Objects
+      celebration: Celebration
+      custom: Emojis personalizados
+      recent: Recientemente usados
+      default_tone: Sin tono de piel
+      light_tone: Tono de piel claro
+      medium_light_tone: Tono de piel medio claro
+      medium_tone: Tono de piel medio
+      medium_dark_tone: Tono de piel medio oscuro
+      dark_tone: Tono de piel oscuro
     composer:
       emoji: "Emoji :)"
       more_emoji: "más..."
       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"
@@ -1024,13 +1094,14 @@ es:
       saved_local_draft_tip: "guardado localmente"
       similar_topics: "Tu tema es similar a..."
       drafts_offline: "borradores offline"
+      group_mentioned_limit: "<b>¡Advertencia!</b> Has mencionado <a href='{{group_link}}'>{{group}}</a>, pero este grupo tiene más miembros que el límite de menciones fijado por los administradores, que es de {{max}} usuarios. No se notificará a nadie."
       group_mentioned:
         one: "Al mencionar a {{group}}, estás a punto de notificar a <a href='{{group_link}}'>1 persona</a> – ¿seguro que quieres hacerlo?"
         other: "Al mencionar a {{group}}, estás a punto de notificar a <a href='{{group_link}}'>{{count}} personas</a> – ¿seguro que quieres hacerlo?"
       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."
@@ -1046,6 +1117,7 @@ es:
       cancel: "Cancelar"
       create_topic: "Crear tema"
       create_pm: "Mensaje"
+      create_whisper: "Susurrar"
       title: "O pulsa Ctrl+Intro"
       users_placeholder: "Añadir usuario"
       title_placeholder: "En una frase breve, ¿de qué trata este tema?"
@@ -1053,6 +1125,7 @@ es:
       edit_reason_placeholder: "¿Por qué lo estás editando?"
       show_edit_reason: "(añadir motivo de edición)"
       topic_featured_link_placeholder: "Introduce el enlace mostrado con el título."
+      remove_featured_link: "Eliminar enlace del tema."
       reply_placeholder: "Escribe aquí. Usa Markdown, BBCode o HTML para darle formato. Arrastra o pega imágenes."
       view_new_post: "Ver tu nuevo post."
       saving: "Guardando"
@@ -1083,12 +1156,9 @@ es:
       olist_title: "Lista numerada"
       ulist_title: "Lista con viñetas"
       list_item: "Lista de ítems"
-      heading_label: "H"
-      heading_title: "Encabezado"
-      heading_text: "Encabezado"
-      hr_title: "Linea Horizontal"
       help: "Ayuda de Edición con Markdown"
-      toggler: "ocultar o mostrar el panel de edición"
+      collapse: "minimizar el panel de edición"
+      abandon: "cerrar el editor y descartar borrador"
       modal_ok: "OK"
       modal_cancel: "Cancelar"
       cant_send_pm: "Lo sentimos, no puedes enviar un mensaje a %{username}."
@@ -1097,34 +1167,41 @@ es:
         body: "¡Vas a enviarte este mensaje a ti mismo!"
       admin_options_title: "Opciones de moderación para este tema"
     notifications:
+      tooltip:
+        regular:
+          one: "1 notificación sin leer"
+          other: "{{count}} notificaciones no leídas"
+        message:
+          one: "1 mensaje sin leer"
+          other: "{{count}} mensajes sin leer"
       title: "notificaciones por menciones a tu @nombre, respuestas a tus posts y temas, mensajes, etc"
       none: "No se han podido cargar las notificaciones."
       empty: "No se han encontrado notificaciones."
       more: "ver notificaciones antiguas"
       total_flagged: "total de posts reportados"
-      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>"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} y otro</span> {{description}}</p>"
-        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} y {{count}} otros</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> ha aceptado tu invitación</p>"
-      moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> movió {{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>Se te ha concedido '{{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>Nuevo Tema</span> {{description}}</p>"
+        one: "<span>{{username}}, {{username2}} and 1 mas</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} y otros {{count}} </span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> ha aceptado tu invitación"
+      moved_post: "<span>{{username}}</span> movió {{description}}"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "Ganó '{{description}}'"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>Nuevo Tema</span> {{description}}"
       group_message_summary:
-        one: "<i title='mensaje en tu bandeja de grupo' class='fa fa-group'></i><p> {{count}} mensaje en la bandeja del grupo {{group_name}}</p>"
-        other: "<i title='mensajes en tu bandeja de grupo' class='fa fa-group'></i><p> {{count}} mensajes en la bandeja del grupo {{group_name}}</p>"
+        one: "{{count}} mensaje en tu bandeja de {{group_name}}"
+        other: "{{count}} mensajes en tu bandeja de {{group_name}} "
       alt:
         mentioned: "Mencionado por"
         quoted: "Citado por"
@@ -1140,6 +1217,7 @@ es:
         linked: "Enlace a tu post"
         granted_badge: "Distintivo concedido"
         group_message_summary: "Mensajes en la bandeja del grupo"
+        topic_reminder: "Un recordatorio"
       popup:
         mentioned: '{{username}} te mencionó en "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} te ha mencionado en "{{topic}}" - {{site_title}}'
@@ -1162,25 +1240,33 @@ es:
       uploading: "Subiendo"
       select_file: "Selecciona Archivo"
       image_link: "el link de tu imagen apuntará a"
+      default_image_alt_text: imagen
     search:
       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"
       clear_all: "Limpiar todo"
       too_short: "El término de búsqueda es demasiado corto."
       result_count:
-        one: "1 resultado para <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} resultados para <span class='term'>\"{{term}}\"</span>"
+        one: "1 resultado para <span class='term'>{{term}}</span>"
+        other: "{{count}}{{plus}} resultados para <span class='term'>{{term}}</span>"
       title: "buscar temas, posts, usuarios o categorías"
       no_results: "No se ha encontrado ningún resultado."
       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: "Resultados de búsqueda para '{{term}}'"
+      more_results: "Hay más resultados. Por favor, restringe los criterios de búsqueda."
+      cant_find: "¿No puedes encontrar lo que estás buscando?"
+      start_new_topic: "¿Y si creas un nuevo tema?"
+      or_search_google: "O prueba buscar con Google:"
+      search_google: "Intenta buscar con Google:"
+      search_google_button: "Google"
+      search_google_title: "Busca en este sitio"
       context:
         user: "Buscar posts por @{{username}}"
         category: "Buscar la categoría #{{category}}"
@@ -1191,27 +1277,29 @@ es:
         posted_by:
           label: Publicado por
         in_category:
-          label: En la categoría
+          label: Categorizado
         in_group:
           label: En el Grupo
         with_badge:
           label: Con el Distintivo
         with_tags:
-          label: Con las Etiquetas
+          label: Etiquetado
         filters:
-          label: Muéstrame sólo temas/posts que...
+          label: Sólo devolver temas/mensajes...
           likes: Me han gustado
           posted: He publicado en ellos
           watching: Estoy vigilando
           tracking: Estoy siguiendo
-          private: están en mis mensajes directos
-          bookmarks: he guardado en marcadores
+          private: En mis mensajes
+          bookmarks: He guardado
           first: son el primer post del tema
           pinned: están destacados con pin
           unpinned: no están destacados con pin
-          seen: Leídos
+          seen: He leído
           unseen: No leídos
           wiki: son tipo wiki
+          images: incluye imagen(es)
+          all_tags: Todas las etiquetas anteriores
         statuses:
           label: Donde los temas
           open: están abiertos
@@ -1237,7 +1325,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 +1336,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,16 +1345,16 @@ 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."
         new: "No tienes temas nuevos por leer."
         read: "Todavía no has leído ningún tema."
         posted: "Todavía no has publicado en ningún tema."
-        latest: "No hay temas recientes. Qué pena..."
+        latest: "No hay temas recientes. Qué pena."
         hot: "No hay temas candentes nuevos."
         bookmarks: "No tienes temas guardados en marcadores todavía."
         category: "No hay temas en la categoría {{category}}."
@@ -1337,7 +1425,7 @@ es:
       back_to_list: "Volver a la Lista de Temas"
       options: "Opciones del Tema"
       show_links: "mostrar enlaces dentro de este tema"
-      toggle_information: "detalles del tema"
+      toggle_information: "alternar detalles del tema"
       read_more_in_category: "¿Quieres leer más? Consulta otros temas en {{catLink}} o {{latestLink}}."
       read_more: "¿Quieres leer más? {{catLink}} o {{latestLink}}."
       read_more_MF: "Hay { UNREAD, plural, =0 {} one { <a href='/unread'>1 no leído</a> } other { <a href='/unread'># no leídos</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{y } false { } other{}} <a href='/new'>1 nuevo</a> tema} other { {BOTH, select, true{y } false { } other{}} <a href='/new'># nuevos</a> temas} } restantes, o {CATEGORY, select, true {explora otros temas en {catLink}} false {{latestLink}} other {}}"
@@ -1348,44 +1436,52 @@ 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: "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:"
+        public_timer_types: Temporizadores de Temas
+        private_timer_types: Temporizador de temas del usuario
       auto_update_input:
-        later_today: "Hoy, más tarde"
+        none: "Selecciona el tiempo"
+        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"
+        two_weeks: "Dos Semanas"
         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"
+        three_months: "Tres Meses"
+        six_months: "Seis Meses"
+        one_year: "Un Año"
+        forever: "Para siempre"
+        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 +1513,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 +1552,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"
@@ -1541,6 +1637,7 @@ es:
         success_email: "Hemos enviado un email con tu invitación a <b>{{emailOrUsername}}</b>. Te notificaremos cuando se acepte. Puedes revisar la pestaña invitaciones en tu perfil de usuario para consultar el estado de tus invitaciones."
         success_username: "Hemos invitado a ese usuario a participar en este tema."
         error: "Lo sentimos, no pudimos invitar a esa persona. Tal vez ya haya sido invitada. (La tasa de invitaciones es limitada)"
+        success_existing_email: "Ya existe un usuario con el correo <b>{{emailOrUsername}}</b>. Invitamos a ese usuario a participar en este tema."
       login_reply: 'Inicia Sesión para Responder'
       filters:
         n_posts:
@@ -1577,7 +1674,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."
@@ -1585,7 +1682,18 @@ es:
       multi_select:
         select: 'seleccionar'
         selected: 'seleccionado ({{count}})'
-        select_replies: 'seleccionar más respuestas'
+        select_post:
+          label: 'seleccionar'
+          title: 'Añadir mensaje a la selección'
+        selected_post:
+          label: 'seleccionado'
+          title: 'Haz clic para quitar el mensaje de la selección'
+        select_replies:
+          label: 'seleccionar +respuestas'
+          title: 'Añadir mensaje y todas sus respuestas a la selección'
+        select_below:
+          label: 'Seleccionar +abajo'
+          title: 'Añdir mensaje y todos los de debajo a la selección'
         delete: eliminar seleccionado
         cancel: cancelar selección
         select_all: seleccionar todo
@@ -1597,7 +1705,7 @@ es:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citar"
-      edit: "Editando {{link}} {{replyAvatar}} {{username}}"
+      edit: "<i class='fa fa-pencil'></i>{{link}} {{replyAvatar}} {{username}} "
       edit_reason: "Motivo:"
       post_number: "post {{number}}"
       wiki_last_edited_on: "wiki editada por última vez"
@@ -1658,6 +1766,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"
@@ -1665,11 +1774,14 @@ es:
         share: "comparte un enlace a este post"
         more: "Más"
         delete_replies:
-          confirm:
-            one: "¿Quieres eliminar también la respuesta directa a este post?"
-            other: "¿Quieres eliminar también las {{count}} respuestas directas a este post?"
-          yes_value: "Sí, borrar también las respuestas"
-          no_value: "No, solo este post"
+          confirm: "¿También quieres borrar las respuestas a este mensaje?"
+          direct_replies:
+            one: "Sí, y 1 respuesta direct"
+            other: "Sí, y {{count}} respuestas directas"
+          all_replies:
+            one: "Sí, y 1 respuesta"
+            other: "Sí, y {{count}} respuestas"
+          just_the_post: "No, solo este mensaje"
         admin: "acciones de administrador para el post"
         wiki: "Formato wiki"
         unwiki: "Deshacer formato wiki"
@@ -1681,8 +1793,8 @@ es:
       actions:
         flag: 'Reportar'
         defer_flags:
-          one: "Aplazar reporte"
-          other: "Aplazar reportes"
+          one: "Ignorar reporte"
+          other: "Ignorar reportes"
         undo:
           off_topic: "Deshacer reporte"
           spam: "Deshacer reporte"
@@ -1698,6 +1810,9 @@ es:
           notify_user: "envió un mensaje"
           bookmark: "guardó esto en marcadores"
           like: "le gustó esto"
+          like_capped:
+            one: "y {{count}} otro le gustó esto"
+            other: "y {{count}} otros les gustó esto"
           vote: "votó por esto"
         by_you:
           off_topic: "Has reportado esto como off-topic"
@@ -1760,12 +1875,12 @@ es:
             other: "{{count}} personas votaron este post"
       delete:
         confirm:
-          one: "¿Seguro que quieres eliminar ese post?"
-          other: "¿Seguro que quieres eliminar todos esos posts?"
+          one: "¿Seguro que quieres borrar 1 mensaje?"
+          other: "¿Seguro que quieres borrar {{count}} mensajes?"
       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 +1926,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"
@@ -1847,15 +1962,16 @@ es:
       email_in_allow_strangers: "Aceptar emails de usuarios anónimos sin cuenta"
       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".'
+      mailinglist_mirror: "La categoría refleja una lista de correo"
       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 +2012,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!'
@@ -2111,7 +2227,7 @@ es:
         hamburger_menu: '<b>=</b> Abrir menú hamburguesa'
         user_profile_menu: '<b>p</b> Abrir menú de usuario'
         show_incoming_updated_topics: '<b>.</b> Mostrar temas actualizados'
-        search: '<b>/</b> Buscar'
+        search: '<b>/</b> o <b>ctrl</b>+<b>alt</b>+<b>f</b> Buscar'
         help: '<b>?</b> Abrir guía de atajos de teclado'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Descartar Nuevos/Posts'
         dismiss_topics: '<b>x</b>, <b>t</b> Descartar temas'
@@ -2143,7 +2259,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"
@@ -2182,9 +2298,12 @@ es:
       selector_no_tags: "sin etiquetas"
       changed: "etiquetas cambiadas:"
       tags: "Etiquetas"
-      choose_for_topic: "elegir etiquetas para este tema (opcional)"
+      choose_for_topic: "etiquetas opcionales"
       delete_tag: "Eliminar etiqueta"
-      delete_confirm: "¿Seguro que quieres eliminar esa etiqueta?"
+      delete_confirm:
+        one: "¿Estás seguro de querer borrar esta etiqueta y eliminarla de 1 tema asignado?"
+        other: "¿Estás seguro de querer borrar esta etiqueta y eliminarla de {{count}} temas asignados?"
+      delete_confirm_no_topics: "¿Estás seguro de querer borrar esta etiqueta?"
       rename_tag: "Renombrar etiqueta"
       rename_instructions: "Elige un nuevo nombre para la etiqueta:"
       sort_by: "Ordenar por:"
@@ -2279,7 +2398,7 @@ es:
         no_problems: "Ningún problema ha sido encontrado."
         moderators: 'Moderadores:'
         admins: 'Administradores:'
-        blocked: 'Bloqueados:'
+        silenced: 'Silenciado:'
         suspended: 'Suspendidos:'
         private_messages_short: "Mensajes privados"
         private_messages_title: "Mensajes"
@@ -2312,24 +2431,25 @@ es:
         by: "por"
       flags:
         title: "Reportes"
-        old: "Antiguo"
-        active: "Activo"
+        active_posts: "Posts Reportados"
+        old_posts: "Post reportados antiguos"
+        topics: "Temas Reportados"
+        moderation_history: "Histórico de moderación"
         agree: "De acuerdo"
         agree_title: "Confirmar esta indicación como válido y correcto."
-        agree_flag_modal_title: "Estar de acuerdo y..."
-        agree_flag_hide_post: "Coincido (ocultar post + enviar MP)"
+        agree_flag_hide_post: "Coincidir y Ocultar Mensaje"
         agree_flag_hide_post_title: "Ocultar este post y enviar automáticamente un mensaje al usuario para que lo edite de forma urgente"
-        agree_flag_restore_post: "De acuerdo (restaurar post)"
-        agree_flag_restore_post_title: "Restaurar este post"
-        agree_flag: "Estar de acuerdo con la indicación"
-        agree_flag_title: "Estar de acuerdo con la indicación y mantener la publicación intacta"
-        defer_flag: "Aplazar"
+        agree_flag_restore_post: "Coincidir y Restaurar Mensaje"
+        agree_flag_restore_post_title: "Restaurar el post para que todos los usuarios puedan verlo."
+        agree_flag: "Estar de acuerdo y mantener post"
+        agree_flag_title: "Estar de acuerdo con el reporte y mantener la publicación intacta."
+        defer_flag: "Ignorar"
         defer_flag_title: "Eliminar este indicador; no es necesaria ninguna acción en este momento."
         delete: "Eliminar"
         delete_title: "Eliminar el post referido por este indicador."
-        delete_post_defer_flag: "Eliminar post y aplazar reporte"
+        delete_post_defer_flag: "Eliminar post e ignorar reporte"
         delete_post_defer_flag_title: "Eliminar post; si era el primero de un tema, eliminar el tema"
-        delete_post_agree_flag: "Eliminar post y estar de acuerdo con la indicación"
+        delete_post_agree_flag: "Eliminar post y estar de acuerdo con el reporte"
         delete_post_agree_flag_title: "Eliminar post; si era el primero de un tema, eliminar el tema"
         delete_flag_modal_title: "Borrar y..."
         delete_spammer: "Eliminar spammer"
@@ -2341,37 +2461,37 @@ es:
         clear_topic_flags: "Hecho"
         clear_topic_flags_title: "Este tema ha sido investigado y los problemas han sido resueltos. Haz clic en Hecho para eliminar los reportes."
         more: "(más respuestas...)"
+        suspend_user: "Suspender Usuario"
+        suspend_user_title: "Suspender usuario de este post"
         dispositions:
           agreed: "coincidió"
           disagreed: "no coincidió"
-          deferred: "aplazado"
+          deferred: "ignorado"
         flagged_by: "Reportado por"
         resolved_by: "Resuelto por"
         took_action: "Tomó medidas"
         system: "Sistema"
         error: "Algo salió mal"
         reply_message: "Responder"
-        no_results: "No hay reportes."
+        no_results: "No hay mensajes reportados."
         topic_flagged: "Este <strong>tema</strong> ha sido reportado."
+        show_full: "mostrar mensaje completo"
         visit_topic: "Visita el tema para tomar medidas"
         was_edited: "El post fue editado después del primer reporte"
         previous_flags_count: "Este post ya fue marcado {{count}} veces."
-        summary:
-          action_type_3:
-            one: "fuera de tema"
-            other: "fuera de tema x{{count}}"
-          action_type_4:
-            one: "inapropiado"
-            other: "inapropiado x{{count}}"
-          action_type_6:
-            one: "personalizado"
-            other: "personalizado x{{count}}"
-          action_type_7:
-            one: "personalizado"
-            other: "personalizado x{{count}}"
-          action_type_8:
-            one: "spam"
-            other: "spam x{{count}}"
+        show_details: "Mostrar detalles del reporte"
+        details: "detalles"
+        flagged_topics:
+          topic: "Tema"
+          type: "Tipo"
+          users: "Usuarios"
+          last_flagged: "Último reporte"
+        short_names:
+          off_topic: "off-topic"
+          inappropriate: "inapropiado"
+          spam: "spam"
+          notify_user: "personalizado"
+          notify_moderators: "personalizado"
       groups:
         primary: "Grupo principal"
         no_primary: "(ningún grupo principal)"
@@ -2390,7 +2510,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 +2560,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"
@@ -2459,7 +2579,7 @@ es:
           details: "Cuando se publique, edite, elimine o recupere una respuesta."
         user_event:
           name: "Evento de usuario"
-          details: "Cuando un usuario es creado, aprobado o actualizado."
+          details: "Cuando un usuario inicia sesión, la cierra o es creado, aprobado o actualizado."
         delivery_status:
           title: "Estado de entrega"
           inactive: "Inactivo"
@@ -2573,21 +2693,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 +2717,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?"
@@ -2766,6 +2886,15 @@ es:
             type_placeholder: "resumen, registro..."
             reply_key_placeholder: "clave de respuesta"
             skipped_reason_placeholder: "motivo"
+      moderation_history:
+        performed_by: "Realizado por"
+        no_results: "Histórico de moderación no disponible."
+        actions:
+          delete_user: "Usuario eliminado"
+          suspend_user: "Usuario suspendido"
+          silence_user: "Usuario silenciado"
+          delete_post: "Post eliminado"
+          delete_topic: "Tema eliminado"
       logs:
         title: "Logs"
         action: "Acción"
@@ -2783,6 +2912,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 +2934,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"
@@ -2819,8 +2950,8 @@ es:
             change_category_settings: "cambiar opciones de categoría"
             delete_category: "eliminar categoría"
             create_category: "crear categoría"
-            block_user: "bloquear usuario"
-            unblock_user: "desbloquear usuario"
+            silence_user: "silenciar usuario"
+            unsilence_user: "no-silenciar usuario"
             grant_admin: "conceder administración"
             revoke_admin: "revocar administración"
             grant_moderation: "conceder moderación"
@@ -2836,6 +2967,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."
@@ -2866,8 +2999,46 @@ es:
           roll_up:
             text: "Agrupar"
             title: "Crea un nuevo rango de entradas para banear si hay al menos 'min_ban_entries_for_roll_up' entradas."
+        search_logs:
+          title: "Logs de búsqueda"
+          term: "Término"
+          searches: "Búsquedas"
+          click_through: "Click Through"
+          unique: "Único"
+          unique_title: "usuarios únicos realizando la búsqueda"
+          types:
+            all_search_types: "Todos los tipos de búsqueda"
+            header: "Encabezado"
+            full_page: "Página Completa"
+            click_through_only: "Todo (solo entrados)"
         logster:
           title: "Registros de errores"
+      watched_words:
+        title: "Palabras vigiladas"
+        search: "buscar"
+        clear_filter: "Limpiar"
+        show_words: "mostrar palabras"
+        word_count:
+          one: "1 palabra"
+          other: "%{count} palabras"
+        actions:
+          block: 'Bloquear'
+          censor: 'Censurar'
+          require_approval: 'Necesita aprobación'
+          flag: 'Reportar'
+        action_descriptions:
+          block: 'Previene publicación de mensajes que contengan estas palabras. El usuario verá un mensaje de error cuando trate de publicar su post.'
+          censor: 'Permitir mensajes que contengan estas palabras, pero reemplaza las palabras con caracteres que esconden la palabra censurada.'
+          require_approval: 'Mensajes que contengan estas palabras deberán ser aprobadas por el staff antes de que puedan ser visualizadas.'
+          flag: 'Permitir mensajes que contengan estas palabras, pero reportar el mensaje como inapropiado para que los moderadores puedan revisarlo.'
+        form:
+          label: 'Nueva palabra:'
+          placeholder: 'palabra completa o * como comodín'
+          placeholder_regexp: "regular expression"
+          add: 'Agregar'
+          success: 'Terminado'
+          upload: "Subir"
+          upload_successful: "Subida completada. Las palabras han sido agregadas."
       impersonate:
         title: "Impersonar"
         help: "Utiliza esta herramienta para personificar una cuenta de usuario con fines de depuración. Tendrás que cerrar sesión al terminar."
@@ -2887,7 +3058,7 @@ es:
           pending: "Pendiente"
           staff: 'Staff'
           suspended: 'Suspendidos'
-          blocked: 'Bloqueados'
+          silenced: 'Silenciado'
           suspect: 'Sospechoso'
         approved: "Aprobado/s?"
         approved_selected:
@@ -2908,7 +3079,7 @@ es:
           staff: "Staff"
           admins: 'Administradores'
           moderators: 'Moderadores'
-          blocked: 'Usuarios bloqueados'
+          silenced: 'Usuarios Silenciados'
           suspended: 'Usuarios suspendidos'
           suspect: 'Usuarios sospechados'
         reject_successful:
@@ -2925,35 +3096,48 @@ es:
         suspend_failed: "Algo salió mal baneando este usuario {{error}}"
         unsuspend_failed: "Algo salió mal quitando ban a este usuario {{error}}"
         suspend_duration: "¿Cuánto tiempo le gustaría aplicar ban al usuario? (days)"
-        suspend_duration_units: "(días)"
         suspend_reason_label: "¿Por qué lo suspendes? Este texto <b>será visible para todos</b> en la página de perfil del usuario y se mostrará al usuario cuando intente iniciar sesión. Sé conciso."
+        suspend_reason_hidden_label: "¿Por qué estás suspendiendo? Este texto se mostrará al usuario cuando trate de ingresar. Sé breve."
         suspend_reason: "Causa"
+        suspend_reason_placeholder: "Razón de Suspensión"
+        suspend_message: "Mensaje por Email"
+        suspend_message_placeholder: "Opcionalmente, brinda más información sobre la suspensión y será enviada por correo al usuario."
         suspended_by: "Suspendido por"
+        silence_reason: "Razón"
+        silenced_by: "Silenciado por"
+        silence_modal_title: "Silenciar Usuario"
+        silence_duration: "¿Por cuánto tiempo estará el usuario silenciado?"
+        silence_reason_label: "¿Por qué estás silenciando este usuario?"
+        silence_reason_placeholder: "Razón de Silenciar"
+        silence_message: "Mensaje por Email"
+        silence_message_placeholder: "(dejar en blanco para enviar mensaje por defecto)"
+        suspended_until: "(hasta %{until})"
+        cant_suspend: "Este usuario no puede ser suspendido."
         delete_all_posts: "Eliminar todos los posts"
         delete_all_posts_confirm_MF: "Estás a punto de eliminar {POSTS, plural, one {1 post} other {# posts}} y {TOPICS, plural, one {1 topic} other {# topics}}. ¿Seguro?"
-        suspend: "Suspender"
-        unsuspend: "Quitar suspensión"
-        suspended: "¿Suspendido?"
+        silence: "Silenciar"
+        unsilence: "No silenciar"
+        silenced: "¿Silenciado?"
         moderator: "¿Moderador?"
         admin: "¿Administrador?"
-        blocked: "¿Bloqueado?"
+        suspended: "¿Suspendido?"
         staged: "¿Provisional?"
         show_admin_profile: "Administrador"
         refresh_browsers: "Forzar recarga del navegador"
         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'
-        block: 'Bloquear'
+        unsuspend: 'Quitar suspensión'
+        suspend: 'Suspender'
         reputation: Reputación
         permissions: Permisos
         activity: Actividad
@@ -3000,18 +3184,18 @@ es:
         activate_failed: "Ha habido un problem activando el usuario."
         deactivate_account: "Desactivar cuenta"
         deactivate_failed: "Ha habido un problema desactivando el usuario."
-        unblock_failed: 'Ha habido un problema desbloqueando el usuario.'
-        block_failed: 'Ha habido un problema bloqueando el usuario.'
-        block_confirm: '¿Seguro que quieres bloquear a este usuario? No podrá crear nuevos temas ni publicar posts.'
-        block_accept: 'Sí, bloquear este usuario'
+        unsilence_failed: 'Hubo un problema al dejar de silenciar al usuario.'
+        silence_failed: 'Hubo un problema silenciando al usuario.'
+        silence_confirm: '¿Estás seguro de querer silenciar este usuario? No podrá crear temas ni mensajes.'
+        silence_accept: 'Sí, silenciar este usuario'
         bounce_score: "Puntuación de rebote"
         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."
+        silence_explanation: "Un usuario silenciado no puede publicar ni empezar temas."
         staged_explanation: "Un usuario provisional solo puede publicar por email en temas específicos."
         bounce_score_explanation:
           none: "No se han recibido rebotes recientemente desde ese email."
@@ -3129,6 +3313,7 @@ es:
           developer: 'Desarrollador'
           embedding: "Embebido"
           legal: "Legal"
+          api: 'API'
           user_api: 'API de usuario'
           uncategorized: 'Otros'
           backups: "Copias de seguridad"
@@ -3219,7 +3404,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 +3424,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"
@@ -3265,8 +3451,8 @@ es:
       uploading: "Subiendo..."
       quit: "Tal vez más tarde"
       staff_count:
-        one: "Tu comunidad tiene 1 miembro como staff."
-        other: "Tu comunidad tiene %{count} miembros como staff."
+        one: "Tu comunidad tiene 1 staff (tú). "
+        other: "Tu comunidad tiene %{count} staff, incluyéndote."
       invites:
         add_user: "añadir"
         none_added: "No has invitado a nadie como staff. ¿Seguro que quieres continuar?"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 1c5b92042e..1a5134206b 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,13 +364,9 @@ 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."
-      title:
-        one: "grupp"
-        other: "grupid"
       activity: "Tegevused"
       members: "Liikmed"
       topics: "Teemat"
@@ -382,7 +374,6 @@ et:
       mentions: "Mainimisi"
       messages: "Sõnumid"
       alias_levels:
-        title: "Kes saab siia gruppi sõnumeid saata ja @mention?"
         nobody: "Mitte keegi"
         only_admins: "Vaid adminid"
         mods_and_admins: "Vaid moderaatorid ja adminnid"
@@ -478,7 +469,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."
@@ -515,7 +505,6 @@ et:
       admin: "{{user}} on admin"
       moderator_tooltip: "See kasutaja on moderaator"
       admin_tooltip: "See kasutaja on admin"
-      blocked_tooltip: "See kasutaja on blokeeritud"
       suspended_notice: "Selle kasutaja ligipääs on ajutiselt peatatud kuni {{date}}."
       suspended_reason: "Põhjus:"
       github_profile: "Github"
@@ -595,7 +584,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"
@@ -765,12 +753,6 @@ et:
         post_count:
           one: "postitus loodud"
           other: "postitust loodud"
-        likes_given:
-          one: "<i class='fa fa-heart'></i> antud"
-          other: "<i class='fa fa-heart'></i> antud"
-        likes_received:
-          one: "<i class='fa fa-heart'></i> saadud"
-          other: "<i class='fa fa-heart'></i> saadud"
         days_visited:
           one: "päev külastatud"
           other: "päevi külastatud"
@@ -862,7 +844,6 @@ et:
     first_post: Esimene postitus
     mute: Vaigista
     unmute: Tühista vaigistus
-    last_post: Viimane postitus
     last_reply_lowercase: viimane vastus
     replies_lowercase:
       one: vastus
@@ -965,7 +946,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:
@@ -1055,12 +1035,7 @@ et:
       olist_title: "Numberloend"
       ulist_title: "Täpploend"
       list_item: "Loendi element"
-      heading_label: "H"
-      heading_title: "Päis"
-      heading_text: "Päis"
-      hr_title: "Rõhtjoon "
       help: "Markdown-i redaktori spikker"
-      toggler: "peida või ava ladumispaneel"
       modal_ok: "OK"
       modal_cancel: "Tühista"
       cant_send_pm: "Kahjuks ei saa sa kasutajale %{username} sõnumit saata."
@@ -1074,28 +1049,6 @@ et:
       empty: "Teavitusi ei leitud."
       more: "vaata vanemaid teavitusi"
       total_flagged: "tähistatud postitusi kokku"
-      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:
-        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} ja veel 1</span> {{description}}</p>"
-        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} ja veel {{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> võttis Sinu kutse vastu</p>"
-      moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> liigutas {{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>Teenisid '{{description}}'</p>"
-      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Uus teema</span> {{description}}</p>"
-      group_message_summary:
-        one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} sõnum Sinu {{group_name}} postkastis</p>"
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} sõnumit Sinu {{group_name}} postkastis</p>"
       alt:
         mentioned: "Mainis"
         quoted: "Tsiteeris"
@@ -1142,9 +1095,6 @@ et:
       select_all: "Vali kõik"
       clear_all: "Puhasta kõik"
       too_short: "Otsitav tekst on liiga lühike."
-      result_count:
-        one: "1 tulemus <span class='term'>\"{{term}}\"</span> kohta"
-        other: "{{count}} tulemust <span class='term'>\"{{term}}\"</span> kohta"
       title: "otsi teemasid, postitusi, kasutajaid, või foorumeid"
       no_results: "Ei leidnud midagi."
       no_more_results: "Rohkem vasteid pole."
@@ -1159,22 +1109,15 @@ et:
         title: Täpsem otsing
         posted_by:
           label: Postitaja
-        in_category:
-          label: Foorumis
         in_group:
           label: Grupis
         with_badge:
           label: Märgisega
-        with_tags:
-          label: Sildiga
         filters:
-          label: Tagasta ainult need postitused, mis
           likes: mulle meeldisid
           posted: sisaldavad minu postitust
           watching: on minu vaatlemise nimekirjas
           tracking: on minu jälgimise nimekirjas
-          private: on minu sõnumite hulgas
-          bookmarks: on minu järjehoidjaga
           first: on teema esimesed postitused
           pinned: on esile tõstetud
           unpinned: ei ole esile tõstetud
@@ -1503,7 +1446,6 @@ et:
       multi_select:
         select: 'vali'
         selected: 'valitud ({{count}})'
-        select_replies: 'vali +vastused'
         delete: kustuta valitud
         cancel: tühista valimine
         select_all: vali kõik
@@ -1515,7 +1457,6 @@ et:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Tsitaat"
-      edit: "Redigeerin {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Põhjus:"
       post_number: "postitus {{number}}"
       wiki_last_edited_on: "viimati muudeti wikit"
@@ -1582,12 +1523,6 @@ et:
         undelete: "ennista see postitus"
         share: "jaga viidet sellele postitusele"
         more: "Veel"
-        delete_replies:
-          confirm:
-            one: "Kas soovid ühtlasi kustutada vahetu vastuse sellele postitusele?"
-            other: "Kas soovid ühtlasi kustutada {{count}} vahetut vastust sellele postitusele?"
-          yes_value: "Jah, kustuta ka vastused"
-          no_value: "Ei, ainult see postitus"
         admin: "postituse administreerimise tegevused"
         wiki: "Loo Wiki"
         unwiki: "Eemalda Wiki"
@@ -1598,9 +1533,6 @@ et:
         change_owner: "Omanikuvahetus"
       actions:
         flag: 'Tähis'
-        defer_flags:
-          one: "Lükka tähis edasi"
-          other: "Lükka tähised edasi"
         undo:
           off_topic: "Tühista tähise andmine"
           spam: "Tühista tähise andmine"
@@ -1676,14 +1608,6 @@ et:
           vote:
             one: "1 kasutaja hääletas selle postituse poolt"
             other: "{{count}} kasutajat hääletasid selle postituse poolt"
-      delete:
-        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 +1642,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 "
@@ -2006,7 +1928,6 @@ et:
         hamburger_menu: '<b>=</b> Ava rippmenüü'
         user_profile_menu: '<b>p</b> Ava kasutajamenüü'
         show_incoming_updated_topics: '<b>.</b> Näita uuendatud teemasid'
-        search: '<b>/</b> Otsi'
         help: '<b>?</b> Ava klaviatuuri abimenüü'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Ignoreeri uusi/postitusi'
         dismiss_topics: '<b>x</b>, <b>t</b> Ignoreeri teemasid'
@@ -2077,9 +1998,7 @@ et:
       selector_no_tags: "sildid puuduvad"
       changed: "muudetud sildid:"
       tags: "Sildid"
-      choose_for_topic: "Vali teemadele valikulised sildid:"
       delete_tag: "Kustuta silt"
-      delete_confirm: "Oled Sa kindel, et soovid selle sildi kustutada?"
       rename_tag: "Nimeta silt ümber"
       rename_instructions: "Vali sildile uus nimi:"
       sort_by: "Järjesta:"
@@ -2174,7 +2093,6 @@ et:
         no_problems: "Probleeme ei tuvastatud."
         moderators: 'Moderaatorid:'
         admins: 'Adminnid:'
-        blocked: 'Blokeeritud:'
         suspended: 'Peatatud:'
         private_messages_short: "Sõnumid"
         private_messages_title: "Sõnumid"
@@ -2207,24 +2125,12 @@ et:
         by: "autor"
       flags:
         title: "Lipud"
-        old: "Vana"
-        active: "Aktiivne"
         agree: "Nõustun"
         agree_title: "Kinnita see tähis kui korrektne ja kehtiv"
-        agree_flag_modal_title: "Nõustun ning..."
-        agree_flag_hide_post: "Nõustun (peida postitus + saada PS)"
-        agree_flag_hide_post_title: "Peida see postitus ja saada kasutajale automaatselt teade soovitusega see üle vaadata"
-        agree_flag_restore_post: "Nõustun (taasta postitus)"
-        agree_flag_restore_post_title: "Taasta see postitus"
-        agree_flag: "Nõustu tähisega"
-        agree_flag_title: "Nõustu tähisega ja ära postitust muuda"
-        defer_flag: "Lükka edasi"
         defer_flag_title: "Eemalda see tähis: praegu ei ole vaja sekkuda."
         delete: "Kustuta"
         delete_title: "Kustuta postitus, millele see tähis viitab."
-        delete_post_defer_flag: "Kustuta postitus ja lükka tähis edasi"
         delete_post_defer_flag_title: "Kustuta postitus; kui on ainus, kustuta teema"
-        delete_post_agree_flag: "Kustuta postitus ja nõustu tähisega"
         delete_post_agree_flag_title: "Kustuta postitus; kui on ainus, kustuta teema"
         delete_flag_modal_title: "Kustuta ning..."
         delete_spammer: "Kustuta spämmija"
@@ -2239,34 +2145,16 @@ et:
         dispositions:
           agreed: "nõustumisi"
           disagreed: "mittenõustumisi"
-          deferred: "edasilükkamisi"
         flagged_by: "Tähistatud kasutaja poolt"
         resolved_by: "Lahendatud kasutaja poolt"
         took_action: "Reageeris"
         system: "Süsteem"
         error: "Miskit läks nihu"
         reply_message: "Vasta"
-        no_results: "Tähised puuduvad."
         topic_flagged: "See <strong>teema</strong> on tähistatud."
         visit_topic: "Reageerimiseks külasta teemat"
         was_edited: "Postitust on peale esimest tähist muudetud"
         previous_flags_count: "Seda postitust on tähistatud juba {{count}} korda."
-        summary:
-          action_type_3:
-            one: "teemaväline"
-            other: "teemaväline x{{count}}"
-          action_type_4:
-            one: "sobimatu"
-            other: "sobimatu x{{count}}"
-          action_type_6:
-            one: "individuaalne"
-            other: "individuaalne x{{count}}"
-          action_type_7:
-            one: "individuaalne"
-            other: "individuaalne x{{count}}"
-          action_type_8:
-            one: "spämm"
-            other: "spämm x{{count}}"
       groups:
         primary: "Peamine grupp"
         no_primary: "(peamine grupp puudub)"
@@ -2350,7 +2238,6 @@ et:
           details: "Kui teemas on uus vastus, muudatus, kustutamine või taastamine."
         user_event:
           name: "Kasutaja sündmus"
-          details: "Kui kasutaja luuakse, kinnitatakse või muudetakse."
         delivery_status:
           title: "Kättetoimetamise staatus"
           inactive: "Mitteaktiivne"
@@ -2633,8 +2520,6 @@ et:
             change_category_settings: "muuda foorumi sätteid"
             delete_category: "kustuta foorum"
             create_category: "loo foorum"
-            block_user: "blokeeri kasutaja"
-            unblock_user: "vabasta kasutaja blokeeringust"
             grant_admin: "anna admin-õigus"
             revoke_admin: "võta admin-õigus ära"
             grant_moderation: "anna modereerimisõigus"
@@ -2701,7 +2586,6 @@ et:
           pending: "Ootel"
           staff: 'Meeskond'
           suspended: 'Peatatud'
-          blocked: 'Blokeeritud'
           suspect: 'Kahtlane'
         approved: "Heakskiidetud?"
         approved_selected:
@@ -2722,7 +2606,6 @@ et:
           staff: "Meeskond"
           admins: 'Admin-kasutajad'
           moderators: 'Moderaatorid'
-          blocked: 'Blokeeritud kasutajad'
           suspended: 'Peatatud kasutajad'
           suspect: 'Kahtlased kasutajad'
         reject_successful:
@@ -2739,18 +2622,14 @@ et:
         suspend_failed: "Selle kasutaja peatamisel tekkis viga {{error}}"
         unsuspend_failed: "Selle kasutaja taaslubamisel tekkis viga {{error}}"
         suspend_duration: "Kauaks see kasutaja peatatakse?"
-        suspend_duration_units: "(päeva)"
         suspend_reason_label: "Peatamise põhjus? See tekst <b>on nähtav kõigile</b> selle kasutaja profiililehel, samuti kuvatakse kasutajale, kui ta üritab sisse logida. Tee lühidalt."
         suspend_reason: "Põhjus"
         suspended_by: "Peatati kasutaja poolt"
         delete_all_posts: "Kustuta kõik postitused"
         delete_all_posts_confirm_MF: "Sa oled kustutamas {POSTS, plural, one {1 post} other {# posts}} and {TOPICS, plural, one {1 topic} other {# topics}}. Oled Sa kindel?"
-        suspend: "Peata"
-        unsuspend: "Taasluba"
-        suspended: "Peatatud?"
         moderator: "Moderaator?"
         admin: "Admin?"
-        blocked: "Blokeeritud?"
+        suspended: "Peatatud?"
         staged: "Ettevalmistamisel?"
         show_admin_profile: "Admin"
         refresh_browsers: "Sunni brauserit värskendama"
@@ -2765,8 +2644,8 @@ et:
         grant_admin: 'Anna admini õigused'
         revoke_moderation: 'Eemalda modereerimise õigused'
         grant_moderation: 'Anna modereerimise õigused'
-        unblock: 'Eemalda blokeering'
-        block: 'Blokeeri'
+        unsuspend: 'Taasluba'
+        suspend: 'Peata'
         reputation: Maine
         permissions: Õigused
         activity: Tegevused
@@ -2813,17 +2692,12 @@ et:
         activate_failed: "Viga kasutaja aktiveerimisel."
         deactivate_account: "Deaktiveeri konto"
         deactivate_failed: "Viga kasutaja deaktiveerimisel."
-        unblock_failed: 'Viga kasutaja blokeeringu eemaldamisel.'
-        block_failed: 'Viga kasutaja blokeerimisel.'
-        block_confirm: 'Oled Sa kindel, et soovid seda kasutajat blokeerida? Kasutaja ei saa peale seda luua ühtegi teemat ega postitust.'
-        block_accept: 'Jah, blokeeri see kasutaja'
         bounce_score: "Väljaviskamiste skoor"
         reset_bounce_score:
           label: "Lähtesta"
           title: "Lähtesta väljaviskamiste skoor tagasi 0"
         deactivate_explanation: "Deaktiveeritud kasutaja peab valideerima oma meiliaadressi."
         suspended_explanation: "Peatatud kasutaja ei saa sisse logida."
-        block_explanation: "Blokeeritud kasutaja ei saa postitada ega alustada teemasid."
         staged_explanation: "Ettevalmistamisel oleval kasutajal on lubatud postitada ettemääratud teemadesse vaid meili teel."
         bounce_score_explanation:
           none: "Sellelt meiliaadressilt pole viimasel ajal tagasipõrgatusi saabunud."
@@ -3075,9 +2949,6 @@ et:
       upload: "Lae üles"
       uploading: "Laen üles..."
       quit: "Võib-olla hiljem"
-      staff_count:
-        one: "Sinu kommuunis on 1 tiimi liige."
-        other: "Sinu kommuunis on %{count} tiimi liiget."
       invites:
         add_user: "lisa"
         none_added: "Sa ei ole kutsunud ühtegi tiimi liiget. Oled Sa kindel, et soovid jätkata?"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index fd1aa2b5c9..7db29db301 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -83,7 +83,6 @@ fa_IR:
           other: "%{count} سال بعد"
       previous_month: 'ماه قبل'
       next_month: 'ماه بعد'
-      placeholder: انتخاب تاریخ
     share:
       topic: 'پیوندی به این موضوع را به اشتراک بگذارید'
       post: 'ارسال #%{postNumber}'
@@ -95,7 +94,7 @@ fa_IR:
     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} حذف شد"
@@ -130,20 +129,21 @@ 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_east_2: "شرق ایالات متحده (اوهایو)"
+        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: "این گروه هیچ عضوی ندارد"
@@ -341,22 +337,25 @@ fa_IR:
       join: "پیوستن به گروه"
       leave: "ترک گروه"
       request: "درخواست پیوستن به گروه"
+      message: "پیام"
       automatic_group: گروه خودکار
       closed_group: گروه بسته شده
       is_group_user: "شما عضو این گروه هستید"
       allow_membership_requests: "اجازه ارسال درخواست عضویت در گروه به کاربران"
+      membership_request:
+        submit: "ارسال درخواست"
+        title: "درخواست پیوستن به @%{group_name}"
       membership: "عضویت"
       name: "نام"
       user_count: "تعداد اعضا"
       bio: "درباره گروه"
       selector_placeholder: "افزودن عضو"
       owner: "مالک"
-      visible: "همه‌ی کاربران گروه را می‌بینند"
       index:
         title: "گروه‌ها"
         empty: "هیچ گروه قابل نمایشی وجود ندارد."
       title:
-        other: "گروه‌ها"
+        other: "گروه ها"
       activity: "فعالیت"
       members: "اعضا"
       topics: "موضوعات"
@@ -364,8 +363,13 @@ fa_IR:
       mentions: "اشاره‌ها"
       messages: "پیام‌ها"
       notification_level: "سطح آگاه‌سازی پیش‌فرض برای پیام‌های گروهی"
+      visibility_levels:
+        title: "چه کسی می‌تواند این گروه را ببیند؟"
+        public: "همه"
+        members: "صاحبان گروه، اعضا، و مدیران"
+        staff: "صاحبان گروه و کارکنان"
+        owners: "صاحبان گروه و مدیران"
       alias_levels:
-        title: "چه کسی میتواند پیام بفرستد و به این گروه @اشاره کند؟"
         nobody: "هیچ‌کس"
         only_admins: "فقط مدیران ارشد"
         mods_and_admins: "فقط مدیران و مدیران ارشد"
@@ -459,7 +463,7 @@ fa_IR:
       mute: "بی صدا"
       edit: "ویرایش تنظیمات"
       download_archive:
-        button_text: "دانلود نوشته‌های من"
+        button_text: "دانلود همه"
         confirm: "آیا مطمئنید که می‌خواهید نوشته‌هایتان را دانلود کنید؟"
         success: "شروع فرایند دانلود، وقتی این فرایند تکمیل شود به شما از طریق پیام، اطلاع رسانی خواهد شد."
         rate_limit_error: "نوشته‌ها را می توانید فقط یک بار در روز می‌توانید دانلود کنید. لطفا فردا دوباره امتحان کنید."
@@ -497,8 +501,8 @@ fa_IR:
       admin: "{{user}} یک مدیر ارشد است"
       moderator_tooltip: "این کاربر یک مدیر است"
       admin_tooltip: "این کاربر یک ادمین است"
-      blocked_tooltip: "این کاربر مسدود شده است"
       suspended_notice: "این کاربر تا {{date}} در وضعیت معلق است."
+      suspended_permanently: "این کاربر معلق شده."
       suspended_reason: "دلیل: "
       github_profile: "Github"
       email_activity_summary: "چکیده‌ی فعالیت"
@@ -588,7 +592,6 @@ fa_IR:
         title: "تغییر نام‌کاربری"
         confirm: "در صورت تغییر نام‌کاربری تمامی نقل‌قول‌ها و اشارات به @نام شما از بین خواهد رفت. از انجام این‌کار اطمینان دارید؟"
         taken: "متأسفیم، آن نام کاربری  قبلا گرفته شده است."
-        error: "در فرآیند تغییر نام کاربری شما خطایی روی داد."
         invalid: "آن نام کاربری نامعتبر است. تنها باید عددها و حرف‌ها را در بر بگیرد."
       change_email:
         title: "تغییر ایمیل"
@@ -722,6 +725,9 @@ fa_IR:
         expired: "این دعوت منقضی شده است."
         rescind: "پاک کردن"
         rescinded: "دعوت حذف شد"
+        rescind_all: "پاکسازی تمام دعوت‌ها"
+        rescinded_all: "تمام دعوت‌ها پاک شدند!"
+        rescind_all_confirm: "آیا مطمئنید که می‌خواهید تمام دعوت‌ها را پاک کنید؟"
         reinvite: "ارسال دوباره دعوت"
         reinvite_all: "ارسال مجدد تمام دعوت‌ها"
         reinvite_all_confirm: "آیا از ارسال مجدد تمامی دعوت‌ها اطمینان دارید؟"
@@ -755,10 +761,6 @@ fa_IR:
           other: "موضوعات ساخته شدند"
         post_count:
           other: "نوشته‌ها ساخته شدند"
-        likes_given:
-          other: "<i class='fa fa-heart'></i> داده"
-        likes_received:
-          other: "<i class='fa fa-heart'></i> دریافت کرده"
         days_visited:
           other: "روز‌هایی که بازدید شده"
         posts_read:
@@ -846,7 +848,6 @@ fa_IR:
     first_post: نوشته نخست
     mute: بی صدا
     unmute: صدادار
-    last_post: آخرین نوشته
     last_reply_lowercase: آخرین پاسخ
     replies_lowercase:
       other: 'پاسخ‌ها '
@@ -895,6 +896,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 +956,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:
@@ -970,12 +975,22 @@ fa_IR:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      people: مردم
+      nature: طبیعت
+      food: غذا
+      activity: فعالیت
+      travel: سفر
+      objects: اشیا
+      celebration: جشن
+      recent: اخیرا استفاده شده
     composer:
       emoji: "شکلک :)"
       more_emoji: "بیشتر..."
       options: "گزینه‌ها"
       whisper: "زمزمه"
       unlist: "از فهرست  پاک شده"
+      blockquote_text: "نقل‌قول"
       add_warning: "این یک هشدار رسمی است."
       toggle_whisper: "تغییر وضعیت زمزمه"
       toggle_unlisted: "تغییر وضعیت از لیست خارج شده"
@@ -1042,12 +1057,7 @@ fa_IR:
       olist_title: "فهرست شماره گذاری شده"
       ulist_title: "فهرست نقطه‌ای"
       list_item: "فهرست موارد"
-      heading_label: "H"
-      heading_title: "عنوان"
-      heading_text: "عنوان"
-      hr_title: "خط‌کش افقی"
       help: "راهنمای ویرایش با Markdown"
-      toggler: "مخفی‌سازی یا نمایش پنل نوشتن"
       modal_ok: "تایید"
       modal_cancel: "لغو"
       cant_send_pm: "متاسفانه , شما نمیتوانید به %{username}  پیام بفرستید."
@@ -1061,27 +1071,6 @@ fa_IR:
       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> {{count}} پیام در صندوق دریافتی  {{group_name}}</p>"
       alt:
         mentioned: "اشاره شده توسط"
         quoted: "نقل‌قول شده توسط"
@@ -1129,14 +1118,11 @@ fa_IR:
       select_all: "انتخاب همه"
       clear_all: "پاک کردن همه"
       too_short: "کلمه جستجو شده بسیار کوتاه است"
-      result_count:
-        other: "{{count}} نتایج برای <span class='term'>\"{{term}}\"</span>"
       title: "جستجوی موضوعات، نوشته‌ها، کاربران یا دسته‌‌بندی‌ها"
       no_results: "چیزی یافت نشد."
       no_more_results: "نتایجی بیشتری یافت نشد."
       searching: "در حال جستجو..."
       post_format: "#{{post_number}} توسط {{username}}"
-      results_page: "نتایج جستجو"
       context:
         user: "جستجوی نوشته‌ها با @{{username}}"
         category: "جستجوی دسته‌بندی #{{category}}"
@@ -1146,26 +1132,18 @@ fa_IR:
         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: دانشنامه هستند
         statuses:
@@ -1270,7 +1248,7 @@ fa_IR:
         login_required: "برای مشاهده‌ی موضوع باید وارد سیستم شوید."
       server_error:
         title: "بارگذاری موضوع ناموفق بود"
-        description: "متأسفیم، نتوانستیم موضوع را بار‌گیری کنیم، احتمالا دلیل آن مشکل اتصال اینترنت است. لطفاً دوباره تلاش کنید. اگر مشکل پابرجا بود، ما به ما اطلاع دهید."
+        description: "متأسفیم، نتوانستیم موضوع را بار‌گیری کنیم، احتمالا دلیل آن مشکل اتصال اینترنت است. لطفاً دوباره تلاش کنید. اگر مشکل پابرجا بود، به ما اطلاع دهید."
       not_found:
         title: "موضوع پیدا نشد"
         description: "متأسفیم، نتوانستیم آن موضوع را پیدا کنیم. شاید یکی از همکاران آن را پاک کرده؟"
@@ -1288,7 +1266,7 @@ fa_IR:
       toggle_information: " تغییر وضعیت جزئیات موضوع"
       read_more_in_category: "می‌خواهید بیشتر بخوانید؟موضوعات دیگر را در {{catLink}} یا {{latestLink}} مرور کنید."
       read_more: "می‌خواهید بیشتر بخوانید؟ {{catLink}} یا {{latestLink}}."
-      read_more_MF: "{ UNREAD, plural, =0 {} one { <a href='/unread'>یک پیام خوانده نشده</a> وجود دارد } other { <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> } } remaining, or {CATEGORY, select, true {نمایش سایر موضوعات دسته‌بندی {catLink}} false {{latestLink}} other {}}"
+      read_more_MF: "{ UNREAD, plural, =0 {} one { <a href='/unread'>یک پیام خوانده نشده</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}} other {}}"
       browse_all_categories: جستوجوی همه‌ی دسته‌‌بندی‌ها
       view_latest_topics: مشاهده آخرین موضوع
       suggest_create_topic: چرا یک موضوع ایجاد نمی‌کنید؟
@@ -1296,7 +1274,6 @@ fa_IR:
       jump_reply_down: رفتن به پاسخ بعدی
       deleted: "موضوع پاک شده است"
       topic_status_update:
-        title: "تنظیم زمان‌سنج موضوع"
         save: "تنظیم زمان‌سنج"
         num_of_hours: "تعداد ساعت:"
         remove: "حذف زمان‌سنج"
@@ -1369,7 +1346,7 @@ fa_IR:
           '2_2': 'به دلیل پیگیری این موضوع، تعداد پاسخ‌های جدید را خواهید دید.'
           '2': 'شما به دلیل <a href="/u/{{username}}/preferences">خواندن این موضوع</a>. تعداد پاسخ‌های جدید آن را خواهید دید.'
           '1_2': 'در صورتی که فردی با @نام به شما اشاره کند یا پاسخی دهد به شما اطلاع داده خواهد شد.'
-          '1': 'در صورتی که فردی با @نام به شما اشاره کند یا به پاسخی دهد به شما اطلاع داده خواهد شد.'
+          '1': 'در صورتی که فردی با @نام به شما اشاره کند یا پاسخی دهد، به شما اطلاع داده خواهد شد.'
           '0_7': 'شما تمام اعلان‌های این دسته‌بندی را نادیده گرفته اید'
           '0_2': 'شما تمام اعلان‌های این موضوع را نادیده گرفته اید'
           '0': 'شما تمام اعلان‌های این موضوع را نادیده گرفته اید'
@@ -1526,7 +1503,6 @@ fa_IR:
       multi_select:
         select: 'انتخاب'
         selected: 'انتخاب شده ({{count}}) '
-        select_replies: 'انتخاب کردن + جواب دادن'
         delete: حذف انتخاب شده ها
         cancel: لغو انتخاب
         select_all: انتخاب همه
@@ -1537,7 +1513,6 @@ fa_IR:
       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}}"
       wiki_last_edited_on: "دانشنامه آخرین بار در این زمان ویرایش شده"
@@ -1598,11 +1573,6 @@ fa_IR:
         undelete: "بازگردانی این نوشته"
         share: "اشتراک گذاری یک پیوند در این نوشته"
         more: "بیشتر"
-        delete_replies:
-          confirm:
-            other: "آیا شما می خواهید {{count}} پاسخ مستقیم را از این نوشته حذف کنید؟"
-          yes_value: "بله، پاسخ‌ها را نیز حذف کن"
-          no_value: "نه، تنها این نوشته"
         admin: "عملیات مدیریت نوشته"
         wiki: "ساخت دانشنامه"
         unwiki: "حذف دانشنامه"
@@ -1613,8 +1583,6 @@ fa_IR:
         change_owner: "تغییر مالکیت"
       actions:
         flag: 'پرچم'
-        defer_flags:
-          other: "پرچم تاخیر"
         undo:
           off_topic: "برداشتن پرچم"
           spam: "برداشتن پرچم"
@@ -1674,12 +1642,6 @@ fa_IR:
             other: "{{count}} کاربر این مورد را پسند کردند"
           vote:
             other: "{{count}} کاربر به این نوشته رأی دادند"
-      delete:
-        confirm:
-          other: "آیا مطمئنید که می‌خواهید همه‌ی آن نوشته ها را پاک کنید؟"
-      merge:
-        confirm:
-          other: "آیا از ادغام  {{count}}  نوشته اطمینان دارید؟"
       revisions:
         controls:
           first: "بازبینی نخست"
@@ -1725,8 +1687,6 @@ fa_IR:
       settings: 'تنظیمات'
       topic_template: "قالب موضوع"
       tags: "برچسب‌ها"
-      tags_allowed_tags: "برچسب‌هایی که فقط در این دسته‌بندی می‌توانند استفاده شوند:"
-      tags_allowed_tag_groups: "گروه‌های برچسب که فقط در این دسته‌بندی استفاده می‌شوند"
       tags_placeholder: "(اختیاری) فهرست برچسب‌های قابل استفاده"
       tag_groups_placeholder: "(اختیاری) لیست برچسب‌های قابل استفاده‌ی گروه"
       topic_featured_link_allowed: "اجازه‌ی لینک‌های برجسته در این دسته‌بندی"
@@ -1880,10 +1840,10 @@ fa_IR:
     posts: "نوشته‌ها"
     posts_long: "این موضوع {{number}} نوشته دارد"
     posts_likes_MF: |
-      این موضوع {count, plural, one {1 پاسخ} other {# پاسخ}} با {ratio, select,
-      low {تعداد پسند به نوشته بالایی دارد}
-      med {تعداد پسند به نوشته بسیار بالایی دارد}
-      high {تعداد پسند به نوشته بشدت بالایی دارد}
+      این موضوع دارای {count, plural, one {1 پاسخ} other {# پاسخ}} است {ratio, select,
+      low {و مورد پسند دیگران واقع شده است}
+      med {و بسیار مورد پسند دیگران واقع شده است}
+      high {و به شدت مورد پسند دیگران واقع شده است}
       other {}}
     original_post: "نوشته اصلی"
     views: "نمایش‌ها"
@@ -2010,7 +1970,6 @@ fa_IR:
         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> بستن موضوعات'
@@ -2077,9 +2036,7 @@ fa_IR:
       selector_no_tags: "بدون برچسب"
       changed: "برچسب‌های تغییر یافته:"
       tags: "برچسب‌ها"
-      choose_for_topic: "انتخاب برچسب‌های اختیاری برای موضوع"
       delete_tag: "حذف برچسب"
-      delete_confirm: "آیا از حذف برچسب اطمینان دارید؟"
       rename_tag: "تغییر نام برچسب"
       rename_instructions: "انتخاب نام جدید برای برچسب:"
       sort_by: "مرتب سازی بر اساس:"
@@ -2174,7 +2131,6 @@ fa_IR:
         no_problems: "هیچ مشکلات پیدا نشد."
         moderators: 'مدیران:'
         admins: 'مدیران ارشد:'
-        blocked: 'مسدود شده‌ها:'
         suspended: 'تعلیق شده:'
         private_messages_short: "پیام‌ها"
         private_messages_title: "پیام‌ها"
@@ -2207,24 +2163,13 @@ fa_IR:
         by: "توسط"
       flags:
         title: "پرچم‌ها"
-        old: "قدیمی"
-        active: "فعال"
         agree: "موافقت کردن"
         agree_title: "تایید این پرچم به عنوان معتبر و صحیح"
-        agree_flag_modal_title: "موافقت کردن و..."
-        agree_flag_hide_post: "موافقت با (مخفی کردن نوشته + ارسال پیام خصوصی)"
-        agree_flag_hide_post_title: "این نوشته را مخفی کن و به کاربر به صورت خودکار پیام ارسال کن تا این نوشته را ویرایش کند"
-        agree_flag_restore_post: "موافقم (بازگرداندن نوشته)"
-        agree_flag_restore_post_title: "بازگرداندن این نوشته"
-        agree_flag: "موافقت با پرچم گذاری"
-        agree_flag_title: "موافقت با پرچم و نگه داشتن نوشته بدون تغییر"
-        defer_flag: " واگذار کردن"
+        defer_flag: "چشم پوشی"
         defer_flag_title: "حذف این پرچم; بدون نیاز به اقدام در این زمان"
         delete: "حذف"
         delete_title: "نوشته‌ای که پرچم به آن اشاره دارد حذف کن."
-        delete_post_defer_flag: "حذف نوشته و تاثیر در پرچم"
         delete_post_defer_flag_title: "حذف نوشته; اگر اولین نوشته است، موضوع را حذف نمایید."
-        delete_post_agree_flag: "حذف نوشته و موافقت با پرچم"
         delete_post_agree_flag_title: "حذف نوشته; اگر اولین نوشته است، موضوع را حذف نمایید."
         delete_flag_modal_title: "حذف و..."
         delete_spammer: "حذف هرزنگار"
@@ -2239,29 +2184,16 @@ fa_IR:
         dispositions:
           agreed: "موافقت شد"
           disagreed: "مخالفت شد"
-          deferred: "به تعویق افتاد"
         flagged_by: "پرچم شده توسط"
         resolved_by: "حل شده توسط"
         took_action: "زمان عمل"
         system: "سیستم"
         error: "اشتباهی روی داد"
         reply_message: "پاسخ دادن"
-        no_results: "هیچ پرچمی نیست"
         topic_flagged: "این <strong>موضوع</strong> پرچم خورده است."
         visit_topic: " موضوع را برای اقدام لازم ببینید"
         was_edited: "نوشته پس از پرچم اول ویرایش شد"
         previous_flags_count: "این موضوع در حال حاضر {{count}} بار پرچم گذاری شده است."
-        summary:
-          action_type_3:
-            other: "x{{count}} خارج از بحث"
-          action_type_4:
-            other: "X{{count}} نامناسب"
-          action_type_6:
-            other: "x{{count}} سفارشی"
-          action_type_7:
-            other: "x{{count}} دلخواه"
-          action_type_8:
-            other: " x{{count}} هرزنامه"
       groups:
         primary: "گروه اصلی"
         no_primary: "(بدون گروه اصلی)"
@@ -2349,7 +2281,6 @@ fa_IR:
           details: "وقتی یک پاسخ، ویرایش، حذف یا بازگردانده شده."
         user_event:
           name: "رویداد کاربر"
-          details: "وقتی کاربر ایجاد تایید یا به‌روز می‌شود."
         delivery_status:
           title: "وضعیت تحویل"
           inactive: "غیر‌فعال"
@@ -2522,8 +2453,6 @@ fa_IR:
           updating: "در حال به‌روز‌رسانی"
           up_to_date: "قالب به روز است،‌ آخرین بررسی در:"
           add: "افزودن"
-          commits_behind:
-            other: "قالب {{count}} تغییر دیگر نیاز دارد."
           scss:
             text: "سی اس اس"
             title: "کد CSS مد نظرتان را وارد کنید، از تمام کد‌های CSS و SCSS معتبر پشتیبانی می‌شود."
@@ -2670,6 +2599,7 @@ fa_IR:
           block: "بستن"
           do_nothing: "هیچ کاری نکن"
         staff_actions:
+          all: "همه"
           title: "عملیات همکارا"
           clear_filters: "همه چیز را نشان بده "
           staff_user: "کاربر همکار"
@@ -2706,8 +2636,6 @@ fa_IR:
             change_category_settings: "تغییر تنظیمات دسته‌بندی"
             delete_category: "حذف دسته‌بندی"
             create_category: "ساخت دسته‌بندی"
-            block_user: "بستن دسترسی کاربر"
-            unblock_user: "باز کردن دسترسی کاربر"
             grant_admin: "اعطای مقام مدیر ارشد"
             revoke_admin: "برداشتن مقام مدیر ارشد"
             grant_moderation: "اعطای مقام مدیریت"
@@ -2774,7 +2702,6 @@ fa_IR:
           pending: "در انتظار"
           staff: 'همکاران'
           suspended: 'تعلیق شد '
-          blocked: 'مسدود شده'
           suspect: 'مشکوک'
         approved: "تایید شده ؟"
         approved_selected:
@@ -2793,7 +2720,6 @@ fa_IR:
           staff: "همکار"
           admins: 'مدیران ارشد'
           moderators: 'مدیران'
-          blocked: 'کاربران مسدود شده'
           suspended: 'کاربران تعلیق شده'
           suspect: 'کاربران مشکوک'
         reject_successful:
@@ -2808,18 +2734,14 @@ fa_IR:
         suspend_failed: "در جریان به تعلیق درآوردن این کاربر اشتباهی رخ داد. {{error}}"
         unsuspend_failed: "در جریان خارج کردن این کاربر از تعلیق، اشتباهی رخ داد {{error}}"
         suspend_duration: "کاربر چه مدت در تعلیق خواهد بود؟"
-        suspend_duration_units: "(روزا)"
         suspend_reason_label: "شما چرا معلق شده‌اید؟ این متن بر روی صفحه‌ی نمایه‌ی کاربر <b/>برای همه قابل مشاهده خواهد بود<b>، و در هنگام ورود به سیستم نیز به خود کاربر نشان داده خواهد شد. لطفاً خلاصه بنویسید."
         suspend_reason: "دلیل"
         suspended_by: "تعلیق شده توسط"
         delete_all_posts: "پاک کردن همه‌ی نوشته‌ها"
         delete_all_posts_confirm_MF: "شما در حال حذف {POSTS, plural, one {1 نوشته} other {# نوشته}} and {TOPICS, plural, one {1 نوشته} other {# موضوع}} هستید. ادامه می‌دهید؟"
-        suspend: "تعلیق"
-        unsuspend: "خارج کردن از تعلیق"
-        suspended: "تعلیق شد؟"
         moderator: "مدیر؟ "
         admin: "مدیر ارشد؟"
-        blocked: "مسدود شد؟"
+        suspended: "تعلیق شد؟"
         staged: "کاربر خودکار؟"
         show_admin_profile: "مدیر ارشد"
         refresh_browsers: "تازه کردن اجباری مرورگر"
@@ -2835,8 +2757,8 @@ fa_IR:
         grant_admin_confirm: "برای تایید مدیر ارشد جدید ایمیلی ارسال کردیم. لطفا ایمیل را باز کرده و دستور‌العمل آن را دنبال کنید."
         revoke_moderation: 'پس گرفتن مدیریت'
         grant_moderation: 'اعطای مدیریت'
-        unblock: 'باز کردن'
-        block: 'بستن'
+        unsuspend: 'خارج کردن از تعلیق'
+        suspend: 'تعلیق'
         reputation: ' اعتبار'
         permissions: دسترسی‌ها
         activity: فعالیت
@@ -2880,17 +2802,12 @@ fa_IR:
         activate_failed: "در فعال‌سازی این کاربر مشکلی پیش آمد."
         deactivate_account: "غیرفعال‌کردن حساب‌کاربری"
         deactivate_failed: "در غیرفعال کردن این کاربر مشکلی وجود دارد."
-        unblock_failed: 'در رفع مسدودی این کاربر مشکلی وجود دارد.'
-        block_failed: 'در مسدودی این کاربر مشکلی وجود دارد.'
-        block_confirm: 'آیا از بستن دسترسی کاربر اطمینان دارید؟ بعد از انجام این کار امکان ایجاد موضوع یا ارسال پست نخواهند داشت.'
-        block_accept: 'بله، این کاربر را مسدود کن'
         bounce_score: "امتیاز ویژه"
         reset_bounce_score:
           label: "بازنشانی"
           title: "بازنشانی امتیاز ویژه به 0"
         deactivate_explanation: "کاربر غیر فعال باید دوباره ایمیل خود را تایید کند."
         suspended_explanation: "کاربر تعلیق شده نمی‌تواند وارد سیستم شود."
-        block_explanation: "کاربر مسدود شده نمی‌تواند نوشته‌ای بگذارد یا موضوعی آغاز کند."
         staged_explanation: "کاربر خودکار فقط در بخش های خاص و با ایمیل می‌تواند پست ارسال کند."
         bounce_score_explanation:
           none: "بازتابی به تازگی از آن ایمیل دریافت نشده."
@@ -3143,7 +3060,7 @@ fa_IR:
       uploading: "در حال بار گذاری..."
       quit: "شاید بعدا"
       staff_count:
-        other: "انجمن شما دارای %{count} عضو همکار است."
+        other: "انجمن شما %{count} کارکن، شامل خودتان، دارد."
       invites:
         add_user: "اضافه کردن"
         none_added: "هیچ کدام از همکاران را دعوت نکردید. ادامه می‌دهید؟"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 15deb5364c..ef7000ef8a 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -48,6 +48,9 @@ fi:
         x_seconds:
           one: "1 s"
           other: "%{count} s"
+        less_than_x_minutes:
+          one: "< 1 min"
+          other: "< %{count}min"
         x_minutes:
           one: "1 min"
           other: "%{count} min"
@@ -57,6 +60,9 @@ fi:
         x_days:
           one: "1 pv"
           other: "%{count} pv"
+        x_months:
+          one: "1 kk"
+          other: "%{count} kk"
         about_x_years:
           one: "1 v"
           other: "%{count} v"
@@ -101,7 +107,7 @@ fi:
           other: "%{count} vuotta myöhemmin"
       previous_month: 'Edellinen kuukausi'
       next_month: 'Seuraava kuukausi'
-      placeholder: Valitse päivämäärä
+      placeholder: päivämäärä
     share:
       topic: 'jaa linkki tähän ketjuun'
       post: '%{postNumber}. viesti'
@@ -116,6 +122,7 @@ fi:
       split_topic: "pilkkoi tämän ketjun %{when}"
       invited_user: "kutsui käyttäjän %{who} %{when}"
       invited_group: "kutsui käyttäjän %{who} %{when}"
+      user_left: "%{who} poisti itsensä tästä yksityiskeskustelusta %{when}"
       removed_user: "poisti käyttäjän %{who} %{when}"
       removed_group: "poisti käyttäjän %{who} %{when}"
       autoclosed:
@@ -148,20 +155,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"
@@ -206,8 +214,8 @@ fi:
       one: "{{count}} merkki"
       other: "{{count}} merkkiä"
     suggested_topics:
-      title: "Ehdotetut ketjut"
-      pm_title: "Ehdotetut viestit"
+      title: "Ketjuehdotuksia"
+      pm_title: "Keskusteluehdotuksia"
     about:
       simple_title: "Tietoja"
       title: "Tietoja sivustosta %{title}"
@@ -247,7 +255,7 @@ fi:
     topic_count_new:
       one: "{{count}} uusi ketju."
       other: "{{count}} uutta ketjua."
-    click_to_show: "Klikkaa nähdäksesi."
+    click_to_show: "Klikkaa niin näet."
     preview: "esikatselu"
     cancel: "peruuta"
     save: "Tallenna muutokset"
@@ -257,6 +265,7 @@ fi:
     uploading: "Lähettää..."
     uploading_filename: "Lähettää {{filename}}..."
     uploaded: "Lähetetty!"
+    pasting: "Liitetään..."
     enable: "Ota käyttöön"
     disable: "Poista käytöstä"
     undo: "Peru"
@@ -317,7 +326,7 @@ fi:
       topics_entered_long: "Katseltuja ketjuja"
       time_read: "Lukuaika"
       topic_count: "Ketjut"
-      topic_count_long: "Luotuja ketjuja"
+      topic_count_long: "Ketjunaloituksia"
       post_count: "Vastauksia"
       post_count_long: "Kirjoitettuja vastauksia"
       no_results: "Ei tuloksia."
@@ -351,39 +360,42 @@ 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_admission: "Salli käyttäjien liittyä ryhmään vapaasti (Ryhmän täytyy olla julkinen)"
+      public_exit: "Salli käyttäjien poistua ryhmästä vapaasti"
       empty:
         posts: "Ryhmän jäsenet eivät ole lähettäneet viestejä."
         members: "Ryhmässä ei ole jäseniä."
         mentions: "Ryhmää ei ole mainittu."
         messages: "Ryhmälle ei ole yksityisviestejä."
-        topics: "Ryhmän jäsenet eivät ole luoneet ketjuja."
+        topics: "Ryhmän jäsenet eivät ole aloittaneet ketjuja."
         logs: "Ryhmälle ei ole lokitietoja."
       add: "Lisää"
       join: "Liity ryhmään"
       leave: "Poistu ryhmästä"
       request: "Hae ryhmään"
+      message: "Viesti"
       automatic_group: Automaattinen ryhmä
       closed_group: Suljettu ryhmä
       is_group_user: "Olet tämän ryhmän jäsen"
       allow_membership_requests: "Salli käyttäjän lähettää jäsenhakemuksia ryhmien isännille"
+      membership_request_template: "Viestipohja, joka näytetään käyttäjälle, kun hän lähettää jäsenhakemusta ryhmään."
+      membership_request:
+        submit: "Lähetä hakemus"
+        title: "Hakemus ryhmään @%{group_name}"
+        reason: "Kerro ryhmän isännille, miksi haluat kuulua tähän ryhmään"
       membership: "Jäsenyys"
       name: "Nimi"
       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."
       title:
-        one: "ryhmä"
-        other: "ryhmät"
+        one: "Ryhmä"
+        other: "Ryhmät"
       activity: "Toiminta"
       members: "Jäsenet"
       topics: "Ketjut"
@@ -391,8 +403,15 @@ 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?"
+        mentionable: "Ketkä voivat @mainita ryhmän?"
+        messageable: "Ketkä voivat lähettää ryhmälle viestin?"
         nobody: "Ei kukaan"
         only_admins: "Vain ylläpitäjät"
         mods_and_admins: "Vain ylläpitäjät ja valvojat"
@@ -480,6 +499,7 @@ fi:
       topics_entered: "katseltuja ketjuja"
       post_count: "# viestiä"
       confirm_delete_other_accounts: "Oletko varma, että haluat poistaa nämä tunnukset?"
+      powered_by: "voimanlähteenä <a href='https://ipinfo.io'>1ipinfo.io</a>"
     user_fields:
       none: "(valitse vaihtoehto)"
     user:
@@ -488,7 +508,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."
@@ -513,12 +533,14 @@ fi:
         disable: "Poista ilmoitukset käytöstä"
         enable: "Näytä ilmoituksia"
         each_browser_note: "Huom: Asetus on säädettävä erikseen jokaisessa selaimessa, jota käytät."
+      dismiss: 'Unohda'
       dismiss_notifications: "Unohda kaikki"
       dismiss_notifications_tooltip: "Merkitse kaikki lukemattomat ilmoitukset luetuiksi"
       first_notification: "Ensimmäinen ilmoitus sinulle! Valitse se niin aloitetaan."
       disable_jump_reply: "Älä siirry uuteen viestiini lähetettyäni sen"
       dynamic_favicon: "Näytä uusien / päivittyneiden ketjujen määrä selaimen ikonissa"
       theme_default_on_all_devices: "Tee tästä oletusteema kaikille laitteilleni"
+      allow_private_messages: "Salli muiden lähettää minulle yksityisviestejä"
       external_links_in_new_tab: "Avaa sivuston ulkopuoliset linkit uudessa välilehdessä"
       enable_quoting: "Ota käyttöön viestin lainaaminen tekstiä valitsemalla"
       change: "vaihda"
@@ -526,8 +548,9 @@ fi:
       admin: "{{user}} on ylläpitäjä"
       moderator_tooltip: "Tämä käyttäjä on valvoja"
       admin_tooltip: "Tämä käyttäjä on ylläpitäjä"
-      blocked_tooltip: "Tämä käyttäjä on estetty"
+      silenced_tooltip: "Käyttäjä on hiljennetty"
       suspended_notice: "Tämä käyttäjätili on hyllytetty {{date}} asti."
+      suspended_permanently: "Käyttäjä on hyllytetty."
       suspended_reason: "Syy:"
       github_profile: "GitHub"
       email_activity_summary: "Kooste tapahtumista"
@@ -559,6 +582,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."
@@ -577,6 +601,8 @@ fi:
       undo_revoke_access: "Peru käyttöoikeuden peruminen"
       api_approved: "Sallittu:"
       theme: "Teema"
+      home: "Oletusnäkymä"
+      staged: "Esikäyttäjä"
       staff_counters:
         flags_given: "hyödyllistä liputusta"
         flagged_posts: "liputettua viestiä"
@@ -618,17 +644,18 @@ 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"
         taken: "Pahoittelut, tämä sähköpostiosoite ei ole saatavilla."
         error: "Sähköpostiosoitteen vaihdossa tapahtui virhe. Ehkäpä sama sähköpostiosoite on jo käytössä?"
         success: "Annettuun osoitteeseen on lähetetty viesti. Seuraa sen ohjeita sähköpostiosoitteen varmentamiseksi."
+        success_staff: "Lähetimme sähköpostia nykyiseen osoitteeseesi. Noudata vahvistusohjeita."
       change_avatar:
         title: "Vaihda profiilikuvasi"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, osoitteesta"
         gravatar_title: "Vaihda profiilikuvasi Gravatar-sivustolla"
+        gravatar_failed: "Gravataria ei löytynyt. Liittyykö tähän sähköpostiosoitteeseen sellainen?"
         refresh_gravatar_title: "Päivitä Gravatar"
         letter_based: "Sivuston luoma profiilikuva"
         uploaded_avatar: "Oma kuva"
@@ -754,6 +781,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?"
@@ -783,21 +813,25 @@ fi:
         title: "Yhteenveto"
         stats: "Tilastot"
         time_read: "lukenut palstaa"
+        recent_time_read: "lukenut hiljattain"
         topic_count:
           one: "avattu ketju"
-          other: "luotua ketjua"
+          other: "aloitettua ketjua"
         post_count:
           one: "kirjoitettu viesti"
           other: "kirjoitettua viestiä"
         likes_given:
-          one: "<i class='fa fa-heart'></i> annettu"
-          other: "<i class='fa fa-heart'></i> annettu"
+          one: "annettu"
+          other: "annettu"
         likes_received:
-          one: "<i class='fa fa-heart'></i> saatu"
-          other: "<i class='fa fa-heart'></i> saatu"
+          one: "saatu"
+          other: "saatu"
         days_visited:
           one: "päivänä vieraillut"
           other: "päivänä vieraillut"
+        topics_entered:
+          one: "ketjua lukenut"
+          other: "ketjua lukenut"
         posts_read:
           one: "luettu viesti"
           other: "luettua viestiä"
@@ -875,18 +909,22 @@ fi:
         other: "%{count} virhettä/%{duration}"
     learn_more: "opi lisää..."
     all_time: 'yhteensä'
-    all_time_desc: 'ketjuja luotu yhteensä'
+    all_time_desc: 'ketjuja aloitettu yhteensä'
     year: 'vuosi'
-    year_desc: 'viimeisen 365 päivän aikana luodut ketjut'
+    year_desc: 'viimeisen 365 päivän aikana aloitetut ketjut'
     month: 'kuukausi'
-    month_desc: 'viimeisen 30 päivän aikana luodut ketjut'
+    month_desc: 'viimeisen 30 päivän aikana aloitetut ketjut'
     week: 'viikko'
-    week_desc: 'viimeisen 7 päivän aikana luodut ketjut'
+    week_desc: 'viimeisen 7 päivän aikana aloitetut ketjut'
     day: 'päivä'
     first_post: Ensimmäinen viesti
     mute: Vaienna
     unmute: Poista vaimennus
-    last_post: Viimeisin viesti
+    last_post: Kirjoitti
+    time_read: Lukenut
+    time_read_recently: '%{time_read} viime aikoina'
+    time_read_tooltip: '%{time_read} lukenut kaikkiaan'
+    time_read_recently_tooltip: '%{time_read} lukenut kaikkiaan (%{recent_time_read} edellisen 60 päivän aikana)'
     last_reply_lowercase: edellinen vastaus
     replies_lowercase:
       one: vastaus
@@ -912,6 +950,7 @@ fi:
     private_message_info:
       title: "Viesti"
       invite: "Kutsu muita..."
+      leave_message: "Haluatko varmasti poistua yksityiskeskustelusta?"
       remove_allowed_user: "Haluatko varmasti poistaa käyttäjän {{name}} tästä keskustelusta?"
       remove_allowed_group: "Haluatko varmasti poistaa käyttäjän {{name}} tästä viestiketjusta?"
     email: 'Sähköposti'
@@ -936,6 +975,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 +1037,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 +1047,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,12 +1057,35 @@ fi:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: Valitse...
+      no_content: Ei osumia
+      filter_placeholder: Hae...
+      create: "Luo {{content}}"
+    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äytetyt
+      default_tone: Ei ihonsävyä
+      light_tone: Vaalea ihonväri
+      medium_light_tone: Vaaleanruskea ihonväri
+      medium_tone: Ruskea ihonväri
+      medium_dark_tone: Tummanruskea ihonväri
+      dark_tone: Tumma ihonväri
     composer:
       emoji: "Emoji :)"
       more_emoji: "lisää..."
       options: "Asetukset"
       whisper: "kuiskaus"
       unlist: "listaamaton"
+      blockquote_text: "Sitaatti"
       add_warning: "Tämä on virallinen varoitus."
       toggle_whisper: "Vaihda kuiskaus"
       toggle_unlisted: "Listauksissa näkyminen"
@@ -1043,13 +1110,14 @@ 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"
       cancel: "Peruuta"
-      create_topic: "Luo ketju"
+      create_topic: "Aloita ketju"
       create_pm: "Viesti"
+      create_whisper: "Kuiskaa"
       title: "Tai paina Ctrl+Enter"
       users_placeholder: "Lisää käyttäjä"
       title_placeholder: "Kuvaile lyhyesti mistä tässä ketjussa on kyse?"
@@ -1057,6 +1125,7 @@ fi:
       edit_reason_placeholder: "miksi muokkaat viestiä?"
       show_edit_reason: "(lisää syy muokkaukselle)"
       topic_featured_link_placeholder: "Tähän linkki, joka näytetään otsikon yhteydessä."
+      remove_featured_link: "Poista ketjulinkki"
       reply_placeholder: "Kirjoita tähän. Käytä Markdownia, BBCodea tai HTML:ää muotoiluun. Raahaa tai liitä kuvia."
       view_new_post: "Katsele uutta viestiäsi."
       saving: "Tallennetaan"
@@ -1087,12 +1156,9 @@ fi:
       olist_title: "Numeroitu lista"
       ulist_title: "Luettelomerkillinen luettelo"
       list_item: "Listan alkio"
-      heading_label: "H"
-      heading_title: "Otsikko"
-      heading_text: "Otsikko"
-      hr_title: "Vaakaviiva"
       help: "Markdown apu"
-      toggler: "näytä tai piilota kirjoitusalue"
+      collapse: "pienennä kirjoitusalue"
+      abandon: "sulje kirjoitusalue ja poista luonnos"
       modal_ok: "OK"
       modal_cancel: "Peruuta"
       cant_send_pm: "Et voi lähettää viestiä käyttäjälle  %{username}."
@@ -1101,34 +1167,41 @@ fi:
         body: "Olet lähettämässä viestiä vain itsellesi!"
       admin_options_title: "Tämän ketjun vain henkilökunnalle näytettävät asetukset"
     notifications:
+      tooltip:
+        regular:
+          one: "Uusi ilmoitus"
+          other: "{{count}} uutta ilmoitusta"
+        message:
+          one: "Uusi yksityisviesti"
+          other: "{{count}} uutta yksityisviestiä"
       title: "ilmoitukset @nimeen viittauksista, vastauksista omiin viesteihin ja ketjuihin, viesteistä ym."
       none: "Ilmoitusten lataaminen ei onnistunut."
       empty: "Ilmoituksia ei löydetty."
       more: "vanhat ilmoitukset"
       total_flagged: "yhteensä liputettuja viestejä"
-      mentioned: "<i title='viittasi' 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='lainasi' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      replied: "<i title='vastasi' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='kirjoitti' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      edited: "<i title='muokkasi' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
-      liked: "<i title='tykkäsi' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
-      liked_2: "<i title='tykkäsi' class='fa fa-heart'></i><p><span>{{username}}, {{username2}}</span> {{description}}</p>"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<i title='tykkäsi' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} ja 1 muu</span> {{description}}</p>"
-        other: "<i title='tykkäsi' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} ja {{count}} muuta</span> {{description}}</p>"
-      private_message: "<i title='yksityisviesti' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_private_message: "<i title='yksityisviesti' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_topic: "<i title='kutsui ketjuun' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      invitee_accepted: "<i title='hyväksyi kutsusi' class='fa fa-user'></i><p><span>{{username}}</span> hyväksyi kutsusi</p>"
-      moved_post: "<i title='siirsi viestin' class='fa fa-sign-out'></i><p><span>{{username}}</span> siirsi {{description}}</p>"
-      linked: "<i title='linkkasi viestiin' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
-      granted_badge: "<i title='ansiomerkki myönnetty' class='fa fa-certificate'></i><p>Ansaitsit '{{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>Uusi ketju</span> {{description}}</p>"
+        one: "<span>{{username}}, {{username2}} ja 1 muu</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} ja {{count}} muuta</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> hyväksyi kutsusi"
+      moved_post: "<span>{{username}}</span> siirsi {{description}}"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "Ansaitsit '{{description}}'"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>Uusi ketju</span> {{description}}"
       group_message_summary:
-        one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} viesti ryhmän {{group_name}} saapuneissa</p>"
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} viestiä ryhmän {{group_name}} saapuneissa</p>"
+        one: "{{count}} viesti ryhmän {{group_name}} saapuneissa"
+        other: "{{count}} viestiä ryhmän {{group_name}} saapuneissa"
       alt:
         mentioned: "Mainitsija"
         quoted: "Lainaaja"
@@ -1144,6 +1217,7 @@ fi:
         linked: "Linkki viestiisi"
         granted_badge: "Ansiomerkki myönnetty"
         group_message_summary: "Viestejä ryhmän saapuneissa viesteissä."
+        topic_reminder: "Muistutus"
       popup:
         mentioned: '{{username}} mainitsi sinut ketjussa "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} mainitsi sinut ketjussa "{{topic}}" - {{site_title}}'
@@ -1166,6 +1240,7 @@ fi:
       uploading: "Lähettää"
       select_file: "Valitse tiedosto"
       image_link: "linkki, johon kuvasi osoittaa"
+      default_image_alt_text: kuva
     search:
       sort_by: "Järjestä"
       relevance: "Osuvuus"
@@ -1176,15 +1251,19 @@ fi:
       select_all: "Valitse kaikki"
       clear_all: "Tyhjennä kaikki"
       too_short: "Hakusana on liian lyhyt."
-      result_count:
-        one: "1 tulos haulle <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} tulosta haulle <span class='term'>\"{{term}}\"</span>"
       title: "etsi ketjuja, viestejä, käyttäjiä tai alueita"
       no_results: "Ei tuloksia."
       no_more_results: "Enempää tuloksia ei löytynyt."
       searching: "Etsitään ..."
       post_format: "#{{post_number}} käyttäjältä {{username}}"
-      results_page: "Hakutulokset"
+      results_page: "Tulokset hakusanalle '{{term}}'"
+      more_results: "Tuloksia olisi enemmänkin. Rajaa hakuasi."
+      cant_find: "Etkö löydä etsimääsi?"
+      start_new_topic: "Haluaisitko aloittaa uuden ketjun?"
+      or_search_google: "Tai kokeile Google-hakua:"
+      search_google: "Kokeile Google-hakua:"
+      search_google_button: "Google"
+      search_google_title: "Hae tältä sivustolta"
       context:
         user: "Etsi @{{username}} viestejä"
         category: "Etsi alueelta #{{category}}"
@@ -1195,27 +1274,29 @@ fi:
         posted_by:
           label: Kirjoittaja
         in_category:
-          label: Alue
+          label: Sijaitsee alueella
         in_group:
           label: Kirjoittajan ryhmä
         with_badge:
           label: Kirjoittajalla ansiomerkki
         with_tags:
-          label: Tunniste
+          label: Ketjulla on tunniste
         filters:
-          label: Tuloksiin vain ketjuja/viestejä, ...
+          label: Tuloksiin vain ketjuja/viestejä...
           likes: joista olen tykännyt
           posted: joihin olen kirjoittanut
           watching: joita tarkkailen
           tracking: joita seuraan
-          private: jotka ovat yksityisviesteistäni
-          bookmarks: jotka olen lisännyt kirjanmerkkeihini
+          private: yksityiskeskusteluistani
+          bookmarks: kirjanmerkeistäni
           first: jotka ovat ketjun avausviestejä
           pinned: jotka on kiinnitettyjä
           unpinned: jotka eivät ole kiinnitettyjä
           seen: jotka olen lukenut
           unseen: joita en ole lukenut
           wiki: ovat wiki-viestejä
+          images: joissa on kuv(i)a
+          all_tags: Ketjulla on kaikki nämä tunnisteet
         statuses:
           label: Ketju/Ketjuun
           open: on avoin
@@ -1277,8 +1358,8 @@ fi:
         top: "Huippuketjuja ei ole."
         search: "Hakutuloksia ei löytynyt."
         educate:
-          new: '<p>Sinulle uudet ketjut näytetään tässä.</p><p>Ketjut tulkitaan uusiksi ja niiden yhteydessä näytetään <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">uusi</span>-merkintä, jos ne on luotu edellisten kahden päivän aikana.</p><p>Aikarajaa voit muuttaa <a href="%{userPrefsUrl}">käyttäjäasetuksissasi</a>.</p>'
-          unread: '<p>Lukemattomia viestejä sisältävät ketjut näytetään tässä.</p><p>Ketjun yhteydessä näytetään lukemattomien viestien lukumäärä <span class="badge new-posts badge-notification">1</span> jos olet:</p><ul><li>luonut ketjun</li><li>vastannut ketjuun</li><li>lukenut ketjua pidempään, kuin 4 minuuttia</li></ul><p>tai, jos olet erikseen merkannut ketjun seurattavaksi tai tarkkailtavaksi ketjun lopusta löytyvästä painikkeesta.</p><p>Voit muuttaa tätä <a href="%{userPrefsUrl}">käyttäjäasetuksistasi</a>.</p>'
+          new: '<p>Sinulle uudet ketjut näytetään tässä.</p><p>Ketju tulkitaan uudeksi ja sen yhteydessä näytetään <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">uusi</span>-merkintä, jos se on aloitettu edellisten kahden päivän aikana.</p><p>Aikarajaa voit muuttaa <a href="%{userPrefsUrl}">käyttäjäasetuksissasi</a>.</p>'
+          unread: '<p>Lukemattomia viestejä sisältävät ketjut näytetään tässä.</p><p>Ketjun yhteydessä näytetään lukemattomien viestien lukumäärä <span class="badge new-posts badge-notification">1</span>, jos olet:</p><ul><li>aloittanut ketjun</li><li>vastannut ketjuun</li><li>lukenut ketjua pidempään, kuin 4 minuuttia</li></ul><p>tai, jos olet erikseen merkannut ketjun seurattavaksi tai tarkkailtavaksi ketjun lopusta löytyvästä painikkeesta.</p><p>Voit muuttaa tätä <a href="%{userPrefsUrl}">käyttäjäasetuksistasi</a>.</p>'
       bottom:
         latest: "Tuoreimpia ketjuja ei ole enempää."
         hot: "Kuumia ketjuja ei ole enempää."
@@ -1298,7 +1379,7 @@ fi:
         one: "1 viesti ketjussa"
         other: "{{count}} viestiä ketjussa"
       create: 'Uusi ketju'
-      create_long: 'Luo uusi ketju'
+      create_long: 'Aloita uusi ketju'
       private_message: 'Luo viesti'
       archive_message:
         help: 'Siirrä viesti arkistoosi'
@@ -1352,19 +1433,27 @@ fi:
       jump_reply_down: hyppää myöhempään vastaukseen
       deleted: "Tämä ketju on poistettu"
       topic_status_update:
-        title: "Aseta ajastin ketjulle"
+        title: "Ketjun ajastin"
         save: "Aseta ajastin"
         num_of_hours: "Kuinka monta tuntia:"
         remove: "Poista ajastin"
         publish_to: "Mihin julkaistaan:"
         when: "Milloin:"
+        public_timer_types: Ketjuajastimet
+        private_timer_types: Käyttäjän ketjuajastimet
       auto_update_input:
+        none: "Valitse ajanjakso"
         later_today: "Myöhemmin tänään"
         tomorrow: "Huomenna"
         later_this_week: "Myöhemmin tällä viikolla"
         this_weekend: "Viikonloppuna"
         next_week: "Ensi viikolla"
+        two_weeks: "Kahden viikon kuluttua"
         next_month: "Ensi kuussa"
+        three_months: "Kolme kuukautta"
+        six_months: "Kuusi kuukautta"
+        one_year: "Yksi vuosi"
+        forever: "Ikuisesti"
         pick_date_and_time: "Valitse päivämäärä ja kellonaika"
         set_based_on_last_post: "Sulje viimeisimmän viestin mukaan"
       publish_to_category:
@@ -1388,7 +1477,7 @@ fi:
         auto_open: "Ketju avautuu automaattisesti %{timeLeft}."
         auto_close: "Ketju suljetaan ajastetusti %{timeLeft}."
         auto_publish_to_category: "Ketju julkaistaan alueella <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
-        auto_close_based_on_last_post: "Ketju sulkeutuu %{duration} viimeisimmästä viestistä."
+        auto_close_based_on_last_post: "Ketju sulkeutuu %{duration} kuluttua viimeisimmästä viestistä."
         auto_delete: "Ketju poistetaan ajastetusti %{timeLeft} kuluttua."
         auto_reminder: "Sinua muistutetaan tästä ketjusta %{timeLeft}."
       auto_close_title: 'Automaattisen sulkemisen asetukset'
@@ -1419,7 +1508,7 @@ fi:
           '3_6': 'Saat ilmoituksia, koska olet asettanut tämän alueen tarkkailuun.'
           '3_5': 'Saat ilmoituksia, koska ketju on asetettu tarkkailuun automaattisesti.'
           '3_2': 'Saat ilmoituksia, koska olet asettanut ketjun tarkkailuun.'
-          '3_1': 'Saat ilmoituksia, koska loit tämän ketjun.'
+          '3_1': 'Saat ilmoituksia, koska aloitit tämän ketjun.'
           '3': 'Saat ilmoituksia, koska olet asettanut ketjun tarkkailuun.'
           '2_8': 'Näet uusien vastausten määrän, koska olet asettanut tämän alueen seurantaan.'
           '2_4': 'Näet uusien vastausten määrän, koska olet kirjoittanut ketjuun.'
@@ -1545,6 +1634,7 @@ fi:
         success_email: "Olemme lähettäneet kutsun osoitteeseen <b>{{emailOrUsername}}</b>. Ilmoitamme, kun kutsuun on vastattu. Voit seurata käyttäjäsivusi kutsut-välilehdeltä kutsujesi tilannetta."
         success_username: "Olemme kutsuneet käyttäjän osallistumaan tähän ketjuun."
         error: "Pahoittelut, emme onnistuneet kutsumaan tätä henkilöä. Ehkäpä hänet on jo kutsuttu? (Huomaa, että kutsumistiheyttä rajoitetaan)"
+        success_existing_email: "On jo olemassa käyttäjä sähköpostiosoitteella <b>{{emailOrUsername}}</b>. Hänet kutsuttiin osallistumaan tähän ketjuun."
       login_reply: 'Kirjaudu sisään vastataksesi'
       filters:
         n_posts:
@@ -1558,7 +1648,7 @@ fi:
         error: "Viestien siirtämisessä uuteen ketjuun tapahtui virhe."
         instructions:
           one: "Olet luomassa uutta ketjua valitsemastasi viestistä."
-          other: "Olet luomassa uutta ketjua valitsemistasi <b>{{count}}</b> viestistä."
+          other: "Olet aloittamassa uutta ketjua valitsemistasi <b>{{count}}</b> viestistä."
       merge_topic:
         title: "Siirrä olemassa olevaan ketjuun"
         action: "siirrä olemassa olevaan ketjuun"
@@ -1589,7 +1679,18 @@ fi:
       multi_select:
         select: 'valitse'
         selected: 'valittuna ({{count}})'
-        select_replies: 'valitse +vastausta'
+        select_post:
+          label: 'valitse'
+          title: 'Lisää viesti valittuihin'
+        selected_post:
+          label: 'valittu'
+          title: 'Poista valituista klikkaamalla'
+        select_replies:
+          label: 'valitse +vastaukset'
+          title: 'Lisää viesti ja vastaukset siihen valittuihin'
+        select_below:
+          label: 'valitse +myöhemmät'
+          title: 'Lisää viesti ja kaikki myöhemmät valittuihin'
         delete: poista valitut
         cancel: kumoa valinta
         select_all: valitse kaikki
@@ -1601,7 +1702,7 @@ fi:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Lainaa"
-      edit: "Muokataan {{link}} {{replyAvatar}} {{username}}"
+      edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Syy:"
       post_number: "viesti {{number}}"
       wiki_last_edited_on: "wikiä muokattiin viimeksi"
@@ -1662,6 +1763,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"
@@ -1669,11 +1771,14 @@ fi:
         share: "jaa linkki tähän viestiin"
         more: "Lisää"
         delete_replies:
-          confirm:
-            one: "Haluatko poistaa myös yhden suoran vastauksen tähän viestiin."
-            other: "Haluatko poistaa myös {{count}} suoraa vastausta tähän viestiin?"
-          yes_value: "Kyllä, poista myös vastaukset"
-          no_value: "En, poista vain tämä viesti"
+          confirm: "Haluatko poistaa myös tähän viestiin liittyvät vastaukset?"
+          direct_replies:
+            one: "Kyllä, ja yksi suora vastaus"
+            other: "Kyllä, ja {{count}} suoraa vastausta"
+          all_replies:
+            one: "Kyllä, ja yksi vastaus"
+            other: "Kyllä, ja kaikki {{count}} vastausta"
+          just_the_post: "Ei, vain tämä viesti"
         admin: "viestin ylläpitotoimet"
         wiki: "Tee wiki"
         unwiki: "Poista wiki"
@@ -1685,8 +1790,8 @@ fi:
       actions:
         flag: 'Liputa'
         defer_flags:
-          one: "Lykkää lippua"
-          other: "Lykkää lippuja"
+          one: "Sivuuta lippu"
+          other: "Sivuuta liput"
         undo:
           off_topic: "Peru lippu"
           spam: "Peru lippu"
@@ -1702,6 +1807,9 @@ fi:
           notify_user: "lähetti viestin"
           bookmark: "lisäsi tämän kirjanmerkkeihin"
           like: "tykkäsi tästä"
+          like_capped:
+            one: "ja {{count}} muu tykkäsi tästä"
+            other: "ja {{count}} muuta tykkäsi tästä"
           vote: "äänesti tätä"
         by_you:
           off_topic: "Liputit tämän eksyvän aiheesta"
@@ -1764,12 +1872,12 @@ fi:
             other: "{{count}} käyttäjää äänesti tätä viestiä"
       delete:
         confirm:
-          one: "Oletko varma, että haluat poistaa tämän viestin?"
-          other: "Oletko varma, että haluat poistaa kaikki nämä viestit?"
+          one: "Oletko varma, että haluat poistaa viestin?"
+          other: "Oletko varma, että haluat poistaa {{count}} viestiä?"
       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 +1923,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"
@@ -1849,8 +1957,9 @@ fi:
       images: "Kuvat"
       email_in: "Saapuvan postin sähköpostiosoite:"
       email_in_allow_strangers: "Hyväksy viestejä anonyymeiltä käyttäjiltä joilla ei ole tiliä"
-      email_in_disabled: "Uusien ketjujen luominen sähköpostitse on otettu pois käytöstä sivuston asetuksissa. Salliaksesi uusien ketjujen luomisen sähköpostilla, "
+      email_in_disabled: "Uusien ketjujen aloittaminen sähköpostitse on otettu pois käytöstä sivuston asetuksissa. Salliaksesi uusien ketjujen luomisen sähköpostilla, "
       email_in_disabled_click: 'ota käyttöön "email in" asetus.'
+      mailinglist_mirror: "Alue jäljittelee postituslistaa"
       suppress_from_homepage: "Vaimenna alue kotisivulta."
       show_subcategory_list: "Näytä lista tytäralueista ketjujen yläpuolella tällä alueella."
       num_featured_topics: "Kuinka monta ketjua näytetään Keskustelualueet-sivulla:"
@@ -1875,7 +1984,7 @@ fi:
           description: "Tarkkailet kaikkia ketjuja näillä alueilla. Saat ilmoituksen jokaisesta uudesta viestistä missä tahansa ketjussa, ja uusien vastausten määrä näytetään."
         watching_first_post:
           title: "Tarkkaile uusia ketjuja"
-          description: "Saat ilmoituksen näille alueille luoduista ketjuista."
+          description: "Saat ilmoituksen näillä alueilla aloitetuista ketjuista."
         tracking:
           title: "Seuraa"
           description: "Seuraat kaikkia ketjuja näillä alueilla. Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle, ja uusien vastausten määrä näytetään."
@@ -1916,7 +2025,7 @@ fi:
       submit_tooltip: "Toimita lippu"
       take_action_tooltip: "Saavuta liputusraja välittömästi; ei tarvetta odottaa muiden käyttäjien liputuksia."
       cant: "Pahoittelut, et pysty liputtamaan tätä viestiä tällä hetkellä."
-      notify_staff: 'Ilmoita ylläpidolle yksityisesti'
+      notify_staff: 'Ilmoita henkilökunnalle yksityisesti'
       formatted_name:
         off_topic: "Se eksyy aiheesta"
         inappropriate: "Se on sopimaton"
@@ -2046,7 +2155,7 @@ fi:
         title_with_count:
           one: "Uudet (1)"
           other: "Uudet ({{count}})"
-        help: "viime päivinä luodut ketjut"
+        help: "viime päivinä aloitetut ketjut"
       posted:
         title: "Viestini"
         help: "ketjut, joihin olet kirjoittanut"
@@ -2110,12 +2219,12 @@ fi:
         next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Seuraava/edellinen valinta'
       application:
         title: 'Ohjelma'
-        create: '<b>c</b> Luo uusi ketju'
+        create: '<b>c</b> Aloita uusi ketju'
         notifications: '<b>n</b> Avaa ilmoitukset'
         hamburger_menu: '<b>=</b> Avaa hampurilaisvalikko'
         user_profile_menu: '<b>p</b> Avaa käyttäjävalikko'
         show_incoming_updated_topics: '<b>.</b> Näytä päivttyneet ketjut'
-        search: '<b>/</b> Haku'
+        search: '<b>/</b> or <b>ctrl</b>+<b>alt</b>+<b>f</b> Haku'
         help: '<b>?</b> Näytä näppäimistöoikotiet'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Unohda Uudet/Viestit'
         dismiss_topics: '<b>x</b>, <b>t</b> Unohda ketjut'
@@ -2186,9 +2295,12 @@ fi:
       selector_no_tags: "ei tunnisteita"
       changed: "muutetut tunnisteet"
       tags: "Tunnisteet"
-      choose_for_topic: "valitse valinnaiset tunnisteet tälle ketjulle"
+      choose_for_topic: "valinnaiset tunnisteet"
       delete_tag: "Poista tunniste"
-      delete_confirm: "Oletko varma, että haluat poistaa tunnisteen?"
+      delete_confirm:
+        one: "Haluatko varmasti poistaa tunnisteen, mikä poistaa sen myös yhdeltä ketjulta, jolla tunniste on?"
+        other: "Haluatko varmasti poistaa tunnisteen, mikä poistaa sen myös {{count}} ketjulta, joilla tunniste on?"
+      delete_confirm_no_topics: "Haluatko varmasti poistaa tunnisteen?"
       rename_tag: "Uudelleennimeä tunniste"
       rename_instructions: "Valitse uusi nimi tälle tunnisteelle:"
       sort_by: "Järjestä:"
@@ -2207,7 +2319,7 @@ fi:
           description: "Ketjut, joilla on tämä tunniste, asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista, ja uusien ja lukemattomien viestien lukumäärä näytetään ketjujen yhteydessä. "
         watching_first_post:
           title: "Tarkkaile uusia ketjuja"
-          description: "Saat ilmoituksen luoduista ketjuista, joilla on joku näistä tunnisteista."
+          description: "Saat ilmoituksen aloitetuista ketjuista, joilla on joku näistä tunnisteista."
         tracking:
           title: "Seuraa"
           description: "Seuraat kaikkia ketjuja, joilla on tämä tunniste. Lukemattomien ja uusien viestien lukumäärä näytetään ketjun yhteydessä."
@@ -2283,7 +2395,7 @@ fi:
         no_problems: "Ongelmia ei löytynyt."
         moderators: 'Valvojat:'
         admins: 'Ylläpitäjät:'
-        blocked: 'Estetyt:'
+        silenced: 'Hiljennetty:'
         suspended: 'Hyllytetyt:'
         private_messages_short: "YV:t"
         private_messages_title: "Viestit"
@@ -2316,24 +2428,25 @@ fi:
         by: "käyttäjältä"
       flags:
         title: "Liput"
-        old: "Vanhat"
-        active: "Aktiiviset"
+        active_posts: "Liputetut viestit"
+        old_posts: "Aiemmin liputetut viestit"
+        topics: "Liputetut ketjut"
+        moderation_history: "Valvontahistoria"
         agree: "Ole samaa mieltä"
         agree_title: "Vahvista, että lippu on annettu oikeasta syystä"
-        agree_flag_modal_title: "Ole samaa mieltä ja..."
-        agree_flag_hide_post: "Samaa mieltä (piilota viesti ja lähetä YV)"
-        agree_flag_hide_post_title: "Piilota tämä viesti automaattisesti ja lähetä käyttäjälle muokkaamaan hoputtava viesti"
-        agree_flag_restore_post: "Ole samaa mieltä (palauta viesti)"
-        agree_flag_restore_post_title: "Palauta tämä viesti"
-        agree_flag: "Ole samaa mieltä lipun kanssa"
-        agree_flag_title: "Ole samaa mieltä lipun kanssa ja älä muokkaa viestiä"
-        defer_flag: "Lykkää"
+        agree_flag_hide_post: "Ole samaa mieltä ja piilota viesti"
+        agree_flag_hide_post_title: "Piilota viesti ja lähetä automaattinen yksityisviesti, joka kehottaa käyttäjää muokkaamaan viestiä."
+        agree_flag_restore_post: "Ole samaa mieltä ja palauta viesti"
+        agree_flag_restore_post_title: "Palauta viesti niin että kaikki käyttäjät näkevät sen."
+        agree_flag: "Ole samaa mieltä ja säilytä viesti"
+        agree_flag_title: "Ole samaa mieltä lipun kanssa ja pidä viesti ennallaan"
+        defer_flag: "Sivuuta"
         defer_flag_title: "Poista lippu; se ei vaadi toimenpiteitä tällä hetkellä."
         delete: "Poista"
         delete_title: "Poista viesti, johon lippu viittaa."
-        delete_post_defer_flag: "Poista viesti ja lykkää lipun käsittelyä"
+        delete_post_defer_flag: "Poista viesti ja sivuuta lippu"
         delete_post_defer_flag_title: "Poista viesti; jos se on aloitusviesti, niin poista koko ketju"
-        delete_post_agree_flag: "Poista viesti ja ole sama mieltä lipun kanssa"
+        delete_post_agree_flag: "Poista viesti ja ole samaa mieltä lipun kanssa"
         delete_post_agree_flag_title: "Poista viesti; jos se on aloitusviesti, niin poista koko ketju"
         delete_flag_modal_title: "Poista ja..."
         delete_spammer: "Poista roskapostittaja"
@@ -2345,37 +2458,37 @@ fi:
         clear_topic_flags: "Valmis"
         clear_topic_flags_title: "Tämä ketju on tutkittu ja sitä koskeneet ongelmat ratkaistu. Klikkaa Valmis poistaaksesi liput."
         more: "(lisää vastauksia...)"
+        suspend_user: "Hyllytä käyttäjä"
+        suspend_user_title: "Hyllytä käyttäjä tämän viestin vuoksi"
         dispositions:
           agreed: "samaa mieltä"
           disagreed: "eri mieltä"
-          deferred: "lykätty"
+          deferred: "sivuutettu"
         flagged_by: "Liputtajat"
         resolved_by: "Selvittäjä"
         took_action: "Ryhtyi toimenpiteisiin"
         system: "Järjestelmä"
         error: "Jotain meni pieleen"
         reply_message: "Vastaa"
-        no_results: "Lippuja ei ole."
+        no_results: "Liputettuja viestejä ei ole."
         topic_flagged: "Tämä <strong>ketju</strong> on liputettu."
+        show_full: "näytä koko viesti"
         visit_topic: "Vieraile ketjussa ryhtyäksesi toimiin"
         was_edited: "Viestiä muokattiin ensimmäisen lipun jälkeen"
         previous_flags_count: "Tämä viesti on liputettu {{count}} kertaa."
-        summary:
-          action_type_3:
-            one: "asiaankuulumaton"
-            other: "eksyy aiheesta x{{count}}"
-          action_type_4:
-            one: "sopimaton"
-            other: "sopimaton x{{count}}"
-          action_type_6:
-            one: "mukautettu"
-            other: "mukautettu x{{count}}"
-          action_type_7:
-            one: "mukautettu"
-            other: "mukautettu x{{count}}"
-          action_type_8:
-            one: "roskaposti"
-            other: "roskapostia x {{count}}"
+        show_details: "Näytä lipun yksityiskohdat"
+        details: "yksityiskohdat"
+        flagged_topics:
+          topic: "Ketju"
+          type: "Tyyppi"
+          users: "Käyttäjät"
+          last_flagged: "Viimeksi liputettu"
+        short_names:
+          off_topic: "eksyy aiheesta"
+          inappropriate: "sopimaton"
+          spam: "roskaposti"
+          notify_user: "mukautettu"
+          notify_moderators: "mukautettu"
       groups:
         primary: "Ensisijainen ryhmä"
         no_primary: "(ei ensisijaista ryhmää)"
@@ -2420,7 +2533,7 @@ fi:
         revoke: "Peruuta"
         confirm_regen: "Oletko varma, että haluat korvata tämän API avaimen uudella?"
         confirm_revoke: "Oletko varma, että haluat peruuttaa tämän avaimen?"
-        info_html: "API avaimen avulla voi luoda ja pävittää ketjuja käyttämällä JSON kutsuja."
+        info_html: "Rajapinta-avaimen avulla voi aloittaa ja päivittää ketjuja JSON-pyynnöillä."
         all_users: "Kaikki käyttäjät"
         note_html: "Pidä tämä avain <strong>salaisena</strong>, sen haltija voi luoda viestejä esiintyen minä hyvänsä käyttäjänä."
       web_hooks:
@@ -2457,13 +2570,12 @@ fi:
         delete_confirm: "Poista tämä webhook?"
         topic_event:
           name: "Ketjutapahtuma"
-          details: "Luodaan uusi ketju, ketju päivitetään, muutetaan tai poistetaan"
+          details: "Kun aloitetaan uusi ketju, ketju päivitetään, muutetaan tai poistetaan"
         post_event:
           name: "Viestitapahtuma"
           details: "Luodaan uusi vastaus, muokataan, poistetaan tai palautetaan."
         user_event:
           name: "Käyttäjätapahtuma"
-          details: "Luodaan uusi käyttäjä, käyttäjä hyväksytään tai päivittyy."
         delivery_status:
           title: "Toimituksen tila"
           inactive: "Ei toiminnassa"
@@ -2614,7 +2726,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"
@@ -2768,6 +2880,15 @@ fi:
             type_placeholder: "tiivistelmä, kirjautuminen..."
             reply_key_placeholder: "vastausavain"
             skipped_reason_placeholder: "syy"
+      moderation_history:
+        performed_by: "Toimija"
+        no_results: "Ei valvontahistoriaa"
+        actions:
+          delete_user: "Käyttäjä poistettiin"
+          suspend_user: "Käyttäjä hyllytettiin"
+          silence_user: "Käyttäjä hiljennettiin"
+          delete_post: "Viesti poistettiin"
+          delete_topic: "Ketju poistettiin"
       logs:
         title: "Lokit"
         action: "Toiminto"
@@ -2785,6 +2906,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"
@@ -2821,8 +2944,8 @@ fi:
             change_category_settings: "muuta alueen asetuksia"
             delete_category: "poista alue"
             create_category: "luo alue"
-            block_user: "estä käyttäjä"
-            unblock_user: "poista esto"
+            silence_user: "hiljennä käyttäjä"
+            unsilence_user: "kumoa käyttäjän hiljennys"
             grant_admin: "myönnä ylläpitäjän oikeudet"
             revoke_admin: "peru ylläpitäjän oikeudet"
             grant_moderation: "myönnä valvojan oikeudet"
@@ -2838,6 +2961,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ä."
@@ -2868,8 +2993,45 @@ fi:
           roll_up:
             text: "Kääri"
             title: "Luo uusia aliverkkojen laajuisia porttikieltoja, jos kieltoja on asetettu vähintään 'min_ban_entries_for_roll_up' asetuksen määrä."
+        search_logs:
+          title: "Hakuloki"
+          term: "Hakusana"
+          searches: "Haut"
+          click_through: "Klikkaussuhde"
+          unique: "Uniikki"
+          unique_title: "uniikit käyttäjät, jotka hakivat"
+          types:
+            all_search_types: "Kaikki hakutyypit"
+            header: "Otsikko"
+            full_page: "Koko sivu"
         logster:
           title: "Virhelokit"
+      watched_words:
+        title: "Tarkkaillut sanat"
+        search: "haku"
+        clear_filter: "Tyhjennä"
+        show_words: "näytä sanat"
+        word_count:
+          one: "1 sana"
+          other: "%{count} sanaa"
+        actions:
+          block: 'Estä'
+          censor: 'Sensuroi'
+          require_approval: 'Vie hyväksyttäväksi'
+          flag: 'Liputa'
+        action_descriptions:
+          block: 'Estä lähettämästä viestiä, jossa esiintyy joku näistä sanoista. Käyttäjälle näytetään virheilmoitus, kun hän yrittää lähettää viestinsä.'
+          censor: 'Salli viesti, jossa esiintyy joku näistä sanoista, mutta korvaa ne merkeillä, jotka piilottavat sensuroidut sanat.'
+          require_approval: 'Viesti, jossa esiintyy joku näistä sanoista, tarvitsee henkilökunnan hyväksynnän ennen sen julkaisemista.'
+          flag: 'Salli viesti, jossa esiintyy joku näistä sanoista, mutta liputa se sopimattomaksi, jotta valvojat voivat tarkastella sitä.'
+        form:
+          label: 'Uusi sana:'
+          placeholder: 'kokonainen sana tai * jokerimerkkinä'
+          placeholder_regexp: "säännöllinen lauseke"
+          add: 'Lisää'
+          success: 'Onnistui'
+          upload: "Lataa"
+          upload_successful: "Lataus onnistui. Sanoja lisättiin."
       impersonate:
         title: "Esiinny käyttäjänä"
         help: "Tällä työkalulla voi esiintyä toisena käyttäjänä virheiden paikantamista varten. Sinun täytyy kirjautua ulos, kun olet valmis."
@@ -2889,7 +3051,7 @@ fi:
           pending: "Odottaa"
           staff: 'Henkilökunta'
           suspended: 'Hyllytetyt'
-          blocked: 'Estetyt'
+          silenced: 'Hiljennetty'
           suspect: 'Epäilty'
         approved: "Hyväksytty?"
         approved_selected:
@@ -2910,7 +3072,7 @@ fi:
           staff: "Henkilökunta"
           admins: 'Ylläpitäjät'
           moderators: 'Valvojat'
-          blocked: 'Estetyt käyttäjät'
+          silenced: 'Hiljennetyt käyttäjät'
           suspended: 'Hyllytetyt käyttäjät'
           suspect: 'Epäillyt käyttäjät'
         reject_successful:
@@ -2927,19 +3089,32 @@ fi:
         suspend_failed: "Jotain meni vikaan tätä käyttäjää hyllyttäessä: {{error}}"
         unsuspend_failed: "Jotain meni vikaan hyllytystä poistettaessa: {{error}}"
         suspend_duration: "Kuinka pitkäksi aikaa käyttäjä hyllytetään?"
-        suspend_duration_units: "(päivää)"
         suspend_reason_label: "Miksi hyllytät käyttäjän? Tämä teksti <b>on näkyvillä julkisesti</b> käyttäjän profiilisivulla ja näytetään käyttäjälle kun hän kirjautuu sisään. Pidä siis viesti lyhyenä."
+        suspend_reason_hidden_label: "Miksi hyllytät? Tämä teksti näytetään käyttäjälle, kun hän yrittää kirjautua sisään. Pidä lyhyenä."
         suspend_reason: "Syy"
+        suspend_reason_placeholder: "Syy hyllytykselle:"
+        suspend_message: "Sähköpostiviesti"
+        suspend_message_placeholder: "Voit halutessasi kertoa enemmän hyllytyksen syystä, jolloin kertomus lähetetään käyttäjälle sähköpostitse."
         suspended_by: "Käyttäjän hyllytti"
+        silence_reason: "Syy"
+        silenced_by: "Hiljentäjä"
+        silence_modal_title: "Hiljennä käyttäjä"
+        silence_duration: "Kuinka pitkäksi aikaa hiljennetään?"
+        silence_reason_label: "Miksi hiljennät käyttäjän?"
+        silence_reason_placeholder: "Hiljennyksen syy"
+        silence_message: "Sähköpostiviesti"
+        silence_message_placeholder: "(jätä tyhjäksi ja lähetä oletusviesti)"
+        suspended_until: "(%{until} asti)"
+        cant_suspend: "Käyttäjää ei voi hyllyttää."
         delete_all_posts: "Poista kaikki viestit"
         delete_all_posts_confirm_MF: "Olet poistamassa {POSTS, plural, one {1 viestin} other {# viestiä}} ja {TOPICS, plural, one {1 ketjun} other {# ketjua}}. Oletko varma?"
-        suspend: "Hyllytä"
-        unsuspend: "Poista hyllytys"
-        suspended: "Hyllytetty?"
+        silence: "Hiljennä"
+        unsilence: "Kumoa hiljennys"
+        silenced: "Hiljennetty?"
         moderator: "Valvoja?"
         admin: "Ylläpitäjä?"
-        blocked: "Estetty?"
-        staged: "Luotu?"
+        suspended: "Hyllytetty?"
+        staged: "Esikäyttäjä?"
         show_admin_profile: "Ylläpito"
         refresh_browsers: "Pakota sivun uudelleen lataus"
         refresh_browsers_message: "Sanoma lähetettiin kaikille päätelaitteille!"
@@ -2954,8 +3129,8 @@ fi:
         grant_admin_confirm: "Vahvistaaksemme uuden ylläpitäjän lähetimme sinulle sähköpostin. Avaa se ja noudata ohjeita."
         revoke_moderation: 'Peru valvojan oikeudet'
         grant_moderation: 'Myönnä valvojan oikeudet'
-        unblock: 'Poista esto'
-        block: 'Estä'
+        unsuspend: 'Poista hyllytys'
+        suspend: 'Hyllytä'
         reputation: Maine
         permissions: Oikeudet
         activity: Toiminta
@@ -3002,10 +3177,10 @@ fi:
         activate_failed: "Käyttäjätilin vahvistaminen ei onnistunut."
         deactivate_account: "Poista käyttäjätili käytöstä"
         deactivate_failed: "Käyttäjätilin poistaminen käytöstä ei onnistunut."
-        unblock_failed: 'Käyttäjätilin eston poistaminen ei onnistunut.'
-        block_failed: 'Käyttäjätilin estäminen ei onnistunut.'
-        block_confirm: 'Oletko varma, että haluat estää tämän käyttäjän? He eivät voi luoda uusia aiheita tai viestejä.'
-        block_accept: 'Kyllä, estä tämä käyttäjä'
+        unsilence_failed: 'Hiljennyksen kumoaminen ei onnistunut'
+        silence_failed: 'Käyttäjän hiljentäminen ei onnistunut.'
+        silence_confirm: 'Haluatko varmasti hiljentää käyttäjän? Hiljennetty käyttäjä ei voi aloittaa ketjuja eikä vastauksia.'
+        silence_accept: 'Kyllä, hiljennä käyttäjä'
         bounce_score: "Palautuspisteet"
         reset_bounce_score:
           label: "Palauta"
@@ -3013,8 +3188,8 @@ fi:
         visit_profile: "Muokkaa <a href='%{url}'>tämän käyttäjän käyttäjäasetuksia</a> hänen profiilissaan"
         deactivate_explanation: "Käytöstä poistetun käyttäjän täytyy uudelleen vahvistaa sähköpostiosoitteensa."
         suspended_explanation: "Hyllytetty käyttäjä ei voi kirjautua sisään."
-        block_explanation: "Estetty käyttäjä ei voi luoda viestejä tai ketjuja."
-        staged_explanation: "Automaattisesti luotu käyttäjä voi kirjoittaa vain tiettyihin ketjuihin sähköpostin välityksellä."
+        silence_explanation: "Hiljennetty käyttäjä ei voi kirjoittaa eikä aloittaa ketjuja."
+        staged_explanation: "Esikäyttäjä voi kirjoittaa vain tiettyihin ketjuihin sähköpostin välityksellä."
         bounce_score_explanation:
           none: "Tästä sähköpostiosoitteesta ei ole tullut palautuksia viime aikoina"
           some: "Tästä sähköpostiosoitteesta on tullut joitakin palautuksia viime aikoina"
@@ -3052,7 +3227,7 @@ fi:
           will_be_promoted: "Ylennetään piakkoin."
           will_be_demoted: "Alennetaan piakkoin."
           on_grace_period: "Tällä hetkellä siirtymäajalla, ei alenneta"
-          locked_will_not_be_promoted: "Luottamsutaso lukittu. Ei koskaan ylennetä."
+          locked_will_not_be_promoted: "Luottamustaso lukittu. Ei koskaan ylennetä."
           locked_will_not_be_demoted: "Luottamustaso lukittu. Ei koskaan alenneta."
         sso:
           title: "Kertakirjautuminen"
@@ -3131,6 +3306,7 @@ fi:
           developer: 'Kehittäjä'
           embedding: "Upottaminen"
           legal: "Säännöt"
+          api: 'Rajapinta'
           user_api: 'Käyttäjärajapinta'
           uncategorized: 'Muut'
           backups: "Varmuuskopiot"
@@ -3218,9 +3394,10 @@ fi:
       embedding:
         get_started: "Jos haluat upottaa Discoursen toiselle sivustolle, aloita lisäämällä isäntä."
         confirm_delete: "Oletko varma, että haluat poistaa tämän isännän?"
-        sample: "Käytä alla olevaa HTML-koodia sivustollasi luodaksesi ja upottaaksesi discourse ketjuja. Korvaa <b>REPLACE_ME</b> upotettavan sivun kanonisella URL-osoitteella."
+        sample: "Käytä alla olevaa HTML-koodia sivustollasi aloittaaksesi ja upottaaksesi discourse ketjuja. Korvaa <b>REPLACE_ME</b> upotettavan sivun kanonisella URL-osoitteella."
         title: "Upottaminen"
         host: "Sallitut isännät"
+        class_name: "Luokan nimi"
         path_whitelist: "Sallitut polut"
         edit: "muokkaa"
         category: "Julkaise alueelle"
@@ -3229,8 +3406,8 @@ fi:
         feed_settings: "Syötteen asetukset"
         feed_description: "Tarjoamalla RSS/ATOM syötteen sivustollesi, voit lisätä Discoursen kykyä tuoda sisältöä."
         crawling_settings: "Crawlerin asetukset"
-        crawling_description: "Kun Discourse luo ketjuja kirjoituksistasi, se yrittää jäsentää kirjoitustesi sisältöä HTML:stä, jos RSS/ATOM syötettä ei ole tarjolla,  Joskus kirjoitusten sisällön poimiminen on haastavaa, joten tarjoamme mahdollisuuden määrittää CSS sääntöjä sen helpottamiseksi."
-        embed_by_username: "Käyttäjänimi ketjun luomiseksi"
+        crawling_description: "Kun Discourse aloittaa ketjuja kirjoituksistasi, se yrittää jäsentää kirjoitustesi sisältöä HTML:stä, jos RSS/ATOM-syötettä ei ole tarjolla,  Joskus kirjoitusten sisällön poimiminen on haastavaa, joten tarjoamme mahdollisuuden määrittää CSS-sääntöjä sen helpottamiseksi."
+        embed_by_username: "Käyttäjänimi, jonka nimissä ketjut aloitetaan"
         embed_post_limit: "Upotettavien viestien maksimimäärä"
         embed_username_key_from_feed: "Avain, jolla erotetaan Discourse-käyttäjänimi syötteestä"
         embed_title_scrubber: "Säännöllinen lauseke, jolla riisutaan viestien otsikkoja"
@@ -3267,8 +3444,8 @@ fi:
       uploading: "Ladataan..."
       quit: "Ehkä myöhemmin"
       staff_count:
-        one: "Yhteisöllä on 1 henkilökuntalainen."
-        other: "Yhteisöllä on %{count} henkilökuntalaista."
+        one: "Henkilökuntalaisia on 1 (eli sinä)"
+        other: "Henkilökuntalaisia on %{count}, sinä mukaan lukien."
       invites:
         add_user: "lisää"
         none_added: "Et ole kutsunut lainkaan henkilökuntaa. Haluatko todella jatkaa?"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 96307b38c5..b91eda1c6e 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -48,6 +48,9 @@ fr:
         x_seconds:
           one: "1s"
           other: "%{count}s"
+        less_than_x_minutes:
+          one: "< 1m"
+          other: "< %{count}m"
         x_minutes:
           one: "1m"
           other: "%{count}m"
@@ -57,6 +60,9 @@ fr:
         x_days:
           one: "1j"
           other: "%{count}j"
+        x_months:
+          one: "1 mois"
+          other: "%{count} mois"
         about_x_years:
           one: "1a"
           other: "%{count}a"
@@ -101,7 +107,7 @@ fr:
           other: "%{count} années plus tard"
       previous_month: 'Mois précédent'
       next_month: 'Mois suivant'
-      placeholder: Sélectionner une date
+      placeholder: date
     share:
       topic: 'partager ce sujet'
       post: 'message #%{postNumber}'
@@ -116,6 +122,7 @@ fr:
       split_topic: "a scindé ce sujet %{when}"
       invited_user: "a invité %{who} %{when}"
       invited_group: "a invité %{who} %{when}"
+      user_left: "%{who}a quitté cette conversation %{when}"
       removed_user: "a retiré %{who} %{when}"
       removed_group: "a retiré %{who} %{when}"
       autoclosed:
@@ -148,20 +155,21 @@ 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_east_2: "États-Unis est (Ohio)"
+        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"
@@ -257,6 +265,7 @@ fr:
     uploading: "Envoi en cours…"
     uploading_filename: "Envoi de {{filename}}…"
     uploaded: "Envoyé !"
+    pasting: "Coller..."
     enable: "Activer"
     disable: "Désactiver"
     undo: "Annuler"
@@ -351,11 +360,9 @@ 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)"
+      public_admission: "Autoriser les utilisateurs à rejoindre le groupe librement (nécessite que le groupe soit visible)"
+      public_exit: "Autoriser les utilisateurs à quitter librement le groupe"
       empty:
         posts: "Il n'y a aucun message de membres de ce groupe."
         members: "Il n' y a aucun membre dans ce groupe."
@@ -367,23 +374,28 @@ fr:
       join: "Rejoindre le groupe"
       leave: "Quitter le groupe"
       request: "Demander à rejoindre le groupe"
+      message: "Message"
       automatic_group: Groupe automatique
       closed_group: Groupe fermé
       is_group_user: "Vous êtes membre de ce groupe"
       allow_membership_requests: "Autoriser les utilisateurs à envoyer des demandes d'adhésion aux propriétaires de groupe"
+      membership_request_template: "Modèle personnalisé à afficher aux utilisateurs lors de l'envoi d'une demande d'adhésion"
+      membership_request:
+        submit: "Soumettre la demande"
+        title: "Demander à rejoindre %{group_name}"
+        reason: "Expliquez au propriétaire du groupe pourquoi vous avez votre place dans ce groupe"
       membership: "Adhésion"
       name: "Nom"
       user_count: "Nombre de membres"
       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."
       title:
-        one: "groupe"
-        other: "groupes"
+        one: "Groupe"
+        other: "Groupes"
       activity: "Activité"
       members: "Membres"
       topics: "Sujets"
@@ -391,8 +403,15 @@ 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 ?"
+        mentionable: "Qui peut @mentionner ce groupe ?"
+        messageable: "Qui peut envoyer un message à ce groupe ?"
         nobody: "Personne"
         only_admins: "Seulement les administrateurs "
         mods_and_admins: "Seulement les modérateurs et les administrateurs "
@@ -480,6 +499,7 @@ fr:
       topics_entered: "sujets visités"
       post_count: "# messages"
       confirm_delete_other_accounts: "Êtes-vous sûr de vouloir supprimer tous ces comptes ?"
+      powered_by: "propulsé par <a href='https://ipinfo.io'>ipinfo.io</a>"
     user_fields:
       none: "(choisir une option)"
     user:
@@ -488,7 +508,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."
@@ -513,12 +533,14 @@ fr:
         disable: "Désactiver les notifications"
         enable: "Activer les notifications"
         each_browser_note: "Note : Vous devez changer ce paramètre sur chaque navigateur que vous utilisez."
+      dismiss: 'Ignorer'
       dismiss_notifications: "Tout ignorer"
       dismiss_notifications_tooltip: "Marquer les notifications comme lues"
       first_notification: "Votre première notification ! Cliquez-la pour démarrer."
       disable_jump_reply: "Ne pas aller à mon nouveau message après avoir répondu"
       dynamic_favicon: "Faire apparaître le nombre de sujets récemment créés ou mis à jour sur l'icône navigateur"
       theme_default_on_all_devices: "En faire mon thème par défaut sur tous mes périphériques"
+      allow_private_messages: "Autoriser les autres utilisateurs à m'envoyer des messages privés"
       external_links_in_new_tab: "Ouvrir tous les liens externes dans un nouvel onglet"
       enable_quoting: "Proposer de citer le texte sélectionné"
       change: "modifier"
@@ -526,8 +548,9 @@ fr:
       admin: "{{user}} est un administrateur"
       moderator_tooltip: "Cet utilisateur est un modérateur"
       admin_tooltip: "Cet utilisateur est un administrateur"
-      blocked_tooltip: "Cet utilisateur est bloqué"
+      silenced_tooltip: "Cet utilisateur est mis sous silence"
       suspended_notice: "L'utilisateur est suspendu jusqu'au {{date}}."
+      suspended_permanently: "Cet utilisateur est suspendu."
       suspended_reason: "Raison :"
       github_profile: "GitHub"
       email_activity_summary: "Résumé d'activité"
@@ -558,6 +581,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."
@@ -576,6 +600,8 @@ fr:
       undo_revoke_access: "Annuler la révocation d'accès"
       api_approved: "Approuvé :"
       theme: "Thème"
+      home: "Page d'accueil par défaut"
+      staged: "En attente"
       staff_counters:
         flags_given: "signalements utiles"
         flagged_posts: "messages signalés"
@@ -617,17 +643,18 @@ 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"
         taken: "Désolé, cette adresse de courriel est indisponible."
         error: "Il y a eu une erreur lors du changement d'adresse de courriel. Cette adresse est peut-être déjà utilisée ?"
         success: "Nous avons envoyé un courriel à cette adresse. Merci de suivre les instructions."
+        success_staff: "Nous avons envoyé un courriel à votre adresse actuelle. Merci de suivre les instructions."
       change_avatar:
         title: "Modifier votre image de profil"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basé sur"
         gravatar_title: "Modifier votre avatar sur le site de Gravatar"
+        gravatar_failed: "Impossible de récupérer le Gravatar. En existe-t-il un associé à cette adresse courriel ?"
         refresh_gravatar_title: "Actualiser votre Gravatar"
         letter_based: "Image de profil attribuée par le système"
         uploaded_avatar: "Avatar personnalisé"
@@ -753,6 +780,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 ?"
@@ -782,6 +812,7 @@ fr:
         title: "Résumé"
         stats: "Statistiques"
         time_read: "de lecture"
+        recent_time_read: "temps de lecture récent"
         topic_count:
           one: "sujets créés"
           other: "sujets créés"
@@ -789,14 +820,17 @@ fr:
           one: "message créé"
           other: "messages créés"
         likes_given:
-          one: "<i class='fa fa-heart'></i> donné"
-          other: "<i class='fa fa-heart'></i> donnés"
+          one: "donné"
+          other: "donnés"
         likes_received:
-          one: "<i class='fa fa-heart'></i> reçu"
-          other: "<i class='fa fa-heart'></i> reçus"
+          one: "reçu"
+          other: "reçus"
         days_visited:
           one: "jour visité"
           other: "jours visités"
+        topics_entered:
+          one: "sujet vu"
+          other: "sujets vus"
         posts_read:
           one: "message lu"
           other: "messages lus"
@@ -886,6 +920,10 @@ fr:
     mute: Désactiver
     unmute: Activer
     last_post: Dernier message
+    time_read: Temps de lecture
+    time_read_recently: '%{time_read} récemment'
+    time_read_tooltip: '%{time_read} temps de lecture total'
+    time_read_recently_tooltip: '%{time_read} temps de lecture total (%{recent_time_read} durant les 60 derniers jours)'
     last_reply_lowercase: dernière réponse
     replies_lowercase:
       one: réponse
@@ -911,6 +949,7 @@ fr:
     private_message_info:
       title: "Message privé"
       invite: "Inviter d'autres utilisateurs…"
+      leave_message: "Êtes-vous sûr de vouloir quitter cette conversation ?"
       remove_allowed_user: "Êtes-vous sûr de vouloir supprimer {{name}} de ce message privé ?"
       remove_allowed_group: "Êtes-vous sûr de vouloir supprimer {{name}} de ce message privé ?"
     email: 'Courriel'
@@ -935,6 +974,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 +1035,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 +1046,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"
@@ -1010,12 +1056,35 @@ fr:
       shift: 'Maj'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: Sélectionner…
+      no_content: Aucune correspondance trouvée
+      filter_placeholder: Rechercher...
+      create: "Créer {{content}}"
+    emoji_picker:
+      filter_placeholder: Chercher un emoji
+      people: Personnes
+      nature: Nature
+      food: Nourriture
+      activity: Activité
+      travel: Voyage
+      objects: Objets
+      celebration: Fête
+      custom: Emojis personnalisés
+      recent: Utilisés récemment
+      default_tone: Aucun teint
+      light_tone: Teint clair
+      medium_light_tone: Teint légèrement clair
+      medium_tone: Teint moyen
+      medium_dark_tone: Teint légèrement foncé
+      dark_tone: Teint foncé
     composer:
       emoji: "Emoji :)"
       more_emoji: "plus…"
       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é"
@@ -1025,12 +1094,14 @@ fr:
       saved_local_draft_tip: "sauvegardé en local"
       similar_topics: "Votre sujet est similaire à…"
       drafts_offline: "sauvegardé hors ligne"
+      group_mentioned_limit: "<b>Attention !</b> Vous avez mentionné <a href='{{group_link}}'>{{group}}</a>, cependant ce groupe a plus de membres que le nombre de mentions limite de {{max}} utilisateurs configuré par l'administrateur. Personne ne sera notifié."
       group_mentioned:
         one: "En mentionnant {{group}}, vous êtes sur le point de notifier <a href='{{group_link}}'>1 personne</a> – êtes-vous sûr ?"
         other: "En mentionnant {{group}}, vous êtes sur le point de notifier <a href='{{group_link}}'>{{count}} personnes</a> – êtes-vous sûr ?"
       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"
@@ -1046,6 +1117,7 @@ fr:
       cancel: "Annuler"
       create_topic: "Créer le sujet"
       create_pm: "Message privé"
+      create_whisper: "Murmurer"
       title: "ou appuyez sur Ctrl+Entrée"
       users_placeholder: "Ajouter un utilisateur"
       title_placeholder: "Quel est le sujet en une courte phrase ?"
@@ -1053,6 +1125,7 @@ fr:
       edit_reason_placeholder: "pourquoi modifiez-vous le message ?"
       show_edit_reason: "(ajouter la raison de la modification)"
       topic_featured_link_placeholder: "Entrez un lien affiché avec le titre."
+      remove_featured_link: "Retirer le lien du sujet"
       reply_placeholder: "Écrivez ici. Utilisez Markdown, BBCode, ou HTML pour mettre en forme. Glissez ou collez des images."
       view_new_post: "Voir votre nouveau message."
       saving: "Sauvegarde"
@@ -1083,12 +1156,9 @@ fr:
       olist_title: "Liste numérotée"
       ulist_title: "Liste à puces"
       list_item: "Élément"
-      heading_label: "T"
-      heading_title: "Titre"
-      heading_text: "Titre"
-      hr_title: "Barre horizontale"
       help: "Aide Markdown"
-      toggler: "cacher ou afficher le panneau d'édition"
+      collapse: "réduire le panneau d'édition"
+      abandon: "fermer le panneau d'édition et supprimer le brouillon"
       modal_ok: "OK"
       modal_cancel: "Annuler"
       cant_send_pm: "Désolé, vous ne pouvez pas envoyer de message à l'utilisateur %{username}."
@@ -1097,33 +1167,41 @@ fr:
         body: "Pour le moment, ce message est uniquement envoyé à vous-même !"
       admin_options_title: "Paramètres optionnels pour ce sujet"
     notifications:
+      tooltip:
+        regular:
+          one: "1 notification non vue"
+          other: "{{count}} notifications non vues"
+        message:
+          one: "1 message non lu"
+          other: "{{count}} messages non lus"
       title: "notifications des mentions de votre @pseudo, des réponses à vos messages, à vos sujets, etc."
       none: "Impossible de charger les notifications pour le moment."
       empty: "Aucune notification trouvée."
       more: "voir les anciennes notifications"
       total_flagged: "nombre total de messages signalés"
-      mentioned: "<i title='mentionné' 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='cité' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      replied: "<i title='avec réponse' 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='édité' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
-      liked: "<i title='aimé' 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>"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} et 1 autre</span> {{description}}</p>"
-        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} et {{count}} autres</span> {{description}}</p>"
-      private_message: "<i title='message privé' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_private_message: "<i title='message privé' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_topic: "<i title='invité' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      invitee_accepted: "<i title='invitation accepté' class='fa fa-user'></i><p><span>{{username}}</span> a accepté votre invitation</p>"
-      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>"
-      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Nouveau sujet</span> {{description}}</p>"
+        one: "<span>{{username}}, {{username2}} et 1 autre</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} et {{count}} autres</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> a accepté votre invitation"
+      moved_post: "<span>{{username}}</span> a deplacé {{description}}"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "Vous avez gagné « {{description}} »"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>Nouveau sujet</span> {{description}}"
       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>"
-        other: "<i title='messages dans la boite de réception de groupe' class='fa fa-group'></i><p> {{count}} messages dans votre boite de réception {{group_name}} </p>"
+        one: "{{count}} message dans la boîte de réception de {{group_name}}"
+        other: "{{count}} messages dans la boîte de réception de {{group_name}}"
       alt:
         mentioned: "Mentionné par"
         quoted: "Cité par"
@@ -1139,6 +1217,7 @@ fr:
         linked: "Lien vers votre message"
         granted_badge: "Badge attribué"
         group_message_summary: "Messages dans la boite de réception du groupe"
+        topic_reminder: "Un rappel"
       popup:
         mentioned: '{{username}} vous a mentionné dans « {{topic}} » - {{site_title}}'
         group_mentioned: '{{username}} vous a mentionné dans « {{topic}} » - {{site_title}}'
@@ -1161,6 +1240,7 @@ fr:
       uploading: "En cours d'envoi"
       select_file: "Sélectionner un fichier"
       image_link: "lien vers lequel l'image pointera"
+      default_image_alt_text: image
     search:
       sort_by: "Trier par"
       relevance: "Pertinence"
@@ -1172,14 +1252,21 @@ fr:
       clear_all: "Tout désélectionner"
       too_short: "Votre terme de recherche est trop court."
       result_count:
-        one: "1 résultat pour « <span class='term'>{{term}}</span> »"
-        other: "{{count}} résultats pour « <span class='term'>{{term}}</span> »"
+        one: "1 résultat pour <span class='term'>{{term}}</span>"
+        other: "{{count}}{{plus}} résultats pour <span class='term'>{{term}}</span>"
       title: "rechercher des sujets, messages, utilisateurs ou catégories"
       no_results: "Aucun résultat."
       no_more_results: "Aucun résultat supplémentaire."
       searching: "Recherche en cours…"
       post_format: "#{{post_number}} par {{username}}"
-      results_page: "Résultats de votre recherche"
+      results_page: "Résultats de recherche pour « {{term}} »"
+      more_results: "Il y a d'autres résultats. Merci de préciser vos critères de recherche."
+      cant_find: "Vous ne trouvez pas ce que vous cherchez ?"
+      start_new_topic: "Voulez-vous commencer un nouveau sujet ?"
+      or_search_google: "Ou essayez plutôt de chercher avec Google :"
+      search_google: "Essayez plutôt de chercher avec Google :"
+      search_google_button: "Google"
+      search_google_title: "Rechercher dans ce site"
       context:
         user: "Chercher dans les messages de @{{username}}"
         category: "Rechercher dans la catégorie #{{category}}"
@@ -1208,9 +1295,11 @@ fr:
           first: qui sont les premiers messages
           pinned: qui sont épinglés
           unpinned: qui ne sont pas épinglés
-          seen: j'ai lu
+          seen: que j'ai lu
           unseen: je n'ai pas lu
           wiki: qui sont des wikis
+          images: inclure le(s) images(s)
+          all_tags: Contient tous les tags
         statuses:
           label: Dont les sujets
           open: sont ouverts
@@ -1236,6 +1325,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"
@@ -1346,19 +1436,27 @@ fr:
       jump_reply_down: allez à des réponses ultérieures
       deleted: "Ce sujet a été supprimé"
       topic_status_update:
-        title: "Planifier une action"
+        title: "Action planifiée du sujet"
         save: "Planifier"
         num_of_hours: "Nombre d'heures :"
         remove: "Supprimer la planification"
         publish_to: "Publier dans :"
         when: "Quand :"
+        public_timer_types: Actions planifiées du sujet
+        private_timer_types: Actions utilisateur planifiées du sujet
       auto_update_input:
+        none: "Sélectionner un intervalle de temps"
         later_today: "Plus tard aujourd'hui"
         tomorrow: "Demain"
         later_this_week: "Plus tard cette semaine"
         this_weekend: "Ce weekend"
         next_week: "Semaine prochaine"
+        two_weeks: "Deux semaines"
         next_month: "Mois prochai"
+        three_months: "Trois mois"
+        six_months: "Six mois"
+        one_year: "Une année"
+        forever: "Toujours"
         pick_date_and_time: "Sélectionner une date et heure"
         set_based_on_last_post: "Fermer par rapport au dernier message"
       publish_to_category:
@@ -1539,6 +1637,7 @@ fr:
         success_email: "Nous avons envoyé une invitation à <b>{{emailOrUsername}}</b>. Nous vous avertirons lorsqu'il l'aura acceptée. Suivez l'état de vos invitations dans l'onglet prévu à cet effet sur votre page utilisateur."
         success_username: "Nous avons invité cet utilisateur à participer à ce sujet."
         error: "Désolé, nous n'avons pas pu inviter cette personne. Elle a peut-être déjà été invitée ? (Le nombre d'invitations est limité)"
+        success_existing_email: "Un utilisateur avec le courriel <b>{{emailOrUsername}}</b> existe déjà. Nous avons invité cet utilisateur à participer à ce sujet."
       login_reply: 'Se connecter pour répondre'
       filters:
         n_posts:
@@ -1583,7 +1682,18 @@ fr:
       multi_select:
         select: 'sélectionner'
         selected: 'sélectionnés ({{count}})'
-        select_replies: 'selectionner +réponses'
+        select_post:
+          label: 'sélectionner'
+          title: 'Ajouter le message à la sélection'
+        selected_post:
+          label: 'sélectionné'
+          title: 'Cliquer pour retirer le message de la sélection'
+        select_replies:
+          label: 'sélectionner + les réponses'
+          title: 'Ajouter le message et toutes ses réponses à la sélection'
+        select_below:
+          label: 'sélectionner + le reste'
+          title: 'Ajouter un message et tout ceux qui suivent à la sélection'
         delete: supprimer la sélection
         cancel: annuler la sélection
         select_all: tout sélectionner
@@ -1595,7 +1705,7 @@ fr:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citer"
-      edit: "Modifier {{link}} par {{replyAvatar}} {{username}}"
+      edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Raison :"
       post_number: "message {{number}}"
       wiki_last_edited_on: "Wiki dernièrement modifié le"
@@ -1656,6 +1766,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"
@@ -1663,11 +1774,14 @@ fr:
         share: "partager ce message"
         more: "Plus"
         delete_replies:
-          confirm:
-            one: "Voulez-vous aussi supprimer la réponse qui suit directement ce message ?"
-            other: "Voulez-vous aussi supprimer les  {{count}} réponses qui suivent directement ce message ?"
-          yes_value: "Oui, supprimer les réponses également"
-          no_value: "Non, juste ce message"
+          confirm: "Voulez-vous aussi supprimer les réponses à ce message ?"
+          direct_replies:
+            one: "Oui et 1 réponse directe"
+            other: "Oui et {{count}} réponses directes"
+          all_replies:
+            one: "Oui et la réponse"
+            other: "Oui et les {{count}} réponses"
+          just_the_post: "Non, uniquement ce message"
         admin: "actions d'administration sur le message"
         wiki: "Basculer en mode Wiki"
         unwiki: "Retirer le mode Wiki"
@@ -1679,8 +1793,8 @@ fr:
       actions:
         flag: 'Signaler'
         defer_flags:
-          one: "Reporter le signalement"
-          other: "Reporter les signalements"
+          one: "Ignorer le signalement"
+          other: "Ignorer les signalements"
         undo:
           off_topic: "Annuler le signalement"
           spam: "Annuler le signalement"
@@ -1696,6 +1810,9 @@ fr:
           notify_user: "a envoyé un message"
           bookmark: "signet ajouté"
           like: "a aimé ceci"
+          like_capped:
+            one: "et {{count}} autre a aimé ça"
+            other: "et {{count}} autres ont aimé ça"
           vote: "a voté pour ceci"
         by_you:
           off_topic: "Vous l'avez signalé comme étant hors-sujet"
@@ -1759,7 +1876,7 @@ fr:
       delete:
         confirm:
           one: "Êtes-vous sûr de vouloir supprimer ce message ?"
-          other: "Êtes-vous sûr de vouloir supprimer tous ces messages ?"
+          other: "Êtes-vous sûr de vouloir supprimer ces {{count}} messages ?"
       merge:
         confirm:
           one: "Êtes-vous sûr de vouloir fusionner ces messages ?"
@@ -1809,8 +1926,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 +1961,8 @@ 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 ».'
+      mailinglist_mirror: "La catégorie reflète une liste de diffusion"
       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 :"
@@ -2109,7 +2227,7 @@ fr:
         hamburger_menu: '<b>=</b> Ouvrir le menu hamburger'
         user_profile_menu: '<b>p</b>Ouvrir le menu utilisateur'
         show_incoming_updated_topics: '<b>.</b> Montrer les sujets mis à jour récemment'
-        search: '<b>/</b> Rechercher'
+        search: '<b>/</b> ou <b>Ctrl</b>+<b>Alt</b>+<b>f</b> Rechercher'
         help: '<b>?</b> Ouvrir l''aide du clavier'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Ignorer les nouveaux messages'
         dismiss_topics: '<b>x</b>, <b>t</b> Ignorer les sujets'
@@ -2180,9 +2298,12 @@ fr:
       selector_no_tags: "aucun tag"
       changed: "tags modifiés :"
       tags: "Tags"
-      choose_for_topic: "choisir des tags optionnels pour ce sujet"
+      choose_for_topic: "tags optionnels"
       delete_tag: "Supprimer le tag"
-      delete_confirm: "Êtes-vous sûr de vouloir supprimer ce tag ?"
+      delete_confirm:
+        one: "Êtes-vous sûr de vouloir supprimer ce tag et l'enlever de 1 sujet auquel il est assigné ?"
+        other: "Êtes-vous sûr de vouloir supprimer ce tag et l'enlever de {{count}} sujets auxquels il est assigné ?"
+      delete_confirm_no_topics: "Êtes-vous sûr de vouloir supprimer ce tag ?"
       rename_tag: "Renommer le tag"
       rename_instructions: "Choisir un nouveau nom pour ce tag :"
       sort_by: "Trier par :"
@@ -2277,7 +2398,7 @@ fr:
         no_problems: "Aucun problème n'a été trouvé."
         moderators: 'Modérateurs :'
         admins: 'Administateurs :'
-        blocked: 'Bloqués :'
+        silenced: 'Mis sous silence :'
         suspended: 'Suspendus :'
         private_messages_short: "Msgs"
         private_messages_title: "Messages"
@@ -2310,22 +2431,23 @@ fr:
         by: "par"
       flags:
         title: "Signalements"
-        old: "Anciens"
-        active: "Actifs"
+        active_posts: "Messages signalés"
+        old_posts: "Anciens messages signalés"
+        topics: "Sujets signalés"
+        moderation_history: "Historique de la modération"
         agree: "Accepter"
         agree_title: "Confirmer que le signalement est valide et correcte"
-        agree_flag_modal_title: "Accepter et…"
-        agree_flag_hide_post: "Accepter (cacher le message + envoi d'un MP)"
-        agree_flag_hide_post_title: "Masquer ce message et envoyer automatiquement un message à l'utilisateur afin qu'il le modifie rapidement"
-        agree_flag_restore_post: "Accepter (rétablir le message)"
-        agree_flag_restore_post_title: "Restaurer ce message"
-        agree_flag: "Accepter le signalement"
-        agree_flag_title: "Accepter le signalement et garder le message inchangé"
-        defer_flag: "Reporter"
+        agree_flag_hide_post: "Accepter et cacher le message"
+        agree_flag_hide_post_title: "Cacher le message et envoyer automatiquement un message à l'utilisateur l'incitant à le modifier."
+        agree_flag_restore_post: "Accepter et rétablir le message"
+        agree_flag_restore_post_title: "Rétablir le message afin que tous les utilisateurs puissent le voir."
+        agree_flag: "Accepter et conserver le message"
+        agree_flag_title: "Accepter le signalement et conserver le message tel quel."
+        defer_flag: "Ignorer"
         defer_flag_title: "Retirer le signalement ; il ne nécessite aucune action pour le moment."
         delete: "Supprimer"
         delete_title: "Supprimer le message signalé."
-        delete_post_defer_flag: "Supprimer le message et reporter le signalement"
+        delete_post_defer_flag: "Supprimer le message et ignorer le signalement"
         delete_post_defer_flag_title: "Supprimer le message ; si c'est le premier message, le sujet sera supprimé"
         delete_post_agree_flag: "Supprimer le message et accepter le signalement"
         delete_post_agree_flag_title: "Supprimer le message ; si c'est le premier message, le sujet sera supprimé"
@@ -2339,37 +2461,37 @@ fr:
         clear_topic_flags: "Terminer"
         clear_topic_flags_title: "Ce sujet a été étudié et les problèmes ont été résolus. Cliquez sur Terminer pour enlever les signalements."
         more: "(plus de réponses…)"
+        suspend_user: "Suspendre l'utilisateur"
+        suspend_user_title: "Suspendre l'utilisateur pour ce message"
         dispositions:
           agreed: "accepté"
           disagreed: "refusé"
-          deferred: "reporté"
+          deferred: "ignoré"
         flagged_by: "Signalé par"
         resolved_by: "Résolu par"
         took_action: "Intervenu"
         system: "Système"
         error: "Quelque chose s'est mal passé"
         reply_message: "Répondre"
-        no_results: "Il n'y a aucun signalement."
+        no_results: "Il n'y a pas de messages signalés."
         topic_flagged: "Ce <strong>sujet</strong> a été signalé."
+        show_full: "afficher le message complet"
         visit_topic: "Consulter le sujet pour intervenir"
         was_edited: "Le message a été modifié après le premier signalement"
         previous_flags_count: "Ce message a déjà été signalé {{count}} fois."
-        summary:
-          action_type_3:
-            one: "hors sujet"
-            other: "hors sujet x{{count}}"
-          action_type_4:
-            one: "inaproprié"
-            other: "inaproprié x{{count}}"
-          action_type_6:
-            one: "personnalisé"
-            other: "personnalisé x{{count}}"
-          action_type_7:
-            one: "personnalisé"
-            other: "personnalisé x{{count}}"
-          action_type_8:
-            one: "spam"
-            other: "spam x{{count}}"
+        show_details: "Afficher les détails du signalement"
+        details: "détails"
+        flagged_topics:
+          topic: "Sujet"
+          type: "Type"
+          users: "Utilisateurs"
+          last_flagged: "Dernier signalés"
+        short_names:
+          off_topic: "hors-sujet"
+          inappropriate: "inapproprié"
+          spam: "spam"
+          notify_user: "personnalisé"
+          notify_moderators: "personnalisé"
       groups:
         primary: "Groupe principal"
         no_primary: "(pas de groupe principal)"
@@ -2457,7 +2579,7 @@ fr:
           details: "Quand il y a une réponse nouvelle, modifiée, supprimée ou rétablie."
         user_event:
           name: "Événement d'utilisateur"
-          details: "Quand un utilisateur est créé, approuvé ou mis à jour."
+          details: "Quand un utilisateur se connecte, se déconnecte, est créé, approuvé ou mis à jour."
         delivery_status:
           title: "État de l'envoi"
           inactive: "Inactif"
@@ -2612,6 +2734,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"
@@ -2761,6 +2886,15 @@ fr:
             type_placeholder: "résumé, inscription…"
             reply_key_placeholder: "clé de réponse"
             skipped_reason_placeholder: "raison"
+      moderation_history:
+        performed_by: "Réalisé par"
+        no_results: "Il n'y a pas d'historique de modération disponible."
+        actions:
+          delete_user: "Utilisateur Supprimé"
+          suspend_user: "Utilisateur Suspendu"
+          silence_user: "Utilisateur mis sous silence"
+          delete_post: "Message Supprimé"
+          delete_topic: "Sujet supprimé"
       logs:
         title: "Journaux"
         action: "Action"
@@ -2778,6 +2912,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"
@@ -2814,8 +2950,8 @@ fr:
             change_category_settings: "modifier les paramètres de la catégorie"
             delete_category: "supprimer la catégorie"
             create_category: "créer une catégorie"
-            block_user: "bloquer l'utilisateur"
-            unblock_user: "débloquer l'utilisateur"
+            silence_user: "mettre l'utilisateur sous silence"
+            unsilence_user: "annuler la mise sous silence de l'utilisateur"
             grant_admin: "accorder les droits d'administration"
             revoke_admin: "révoquer les droits d'administration"
             grant_moderation: "Accorder les droits de modération"
@@ -2831,6 +2967,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."
@@ -2861,8 +2999,46 @@ fr:
           roll_up:
             text: "Consolider"
             title: "Créer de nouvelles plages de sous réseaux à bannir s'il y a au moins 'min_ban_entries_for_roll_up' entrées."
+        search_logs:
+          title: "Rechercher dans les journaux"
+          term: "Terme"
+          searches: "Recherches"
+          click_through: "Taux de clics"
+          unique: "Unique"
+          unique_title: "utilisateurs uniques ayant recherché"
+          types:
+            all_search_types: "Tous les types de recherche"
+            header: "Entête"
+            full_page: "Page complète"
+            click_through_only: "Tous (clics uniquement)"
         logster:
           title: "Journal d'erreurs"
+      watched_words:
+        title: "Mots surveillés"
+        search: "recherche"
+        clear_filter: "Vider"
+        show_words: "Afficher les mots"
+        word_count:
+          one: "1 mot"
+          other: "%{count} mots"
+        actions:
+          block: 'Bloquer'
+          censor: 'Censurer'
+          require_approval: 'Nécessite l''approbation'
+          flag: 'Signaler'
+        action_descriptions:
+          block: 'Empêcher les messages contenant ces mots d''être publiés. L''utilisateur verra un message d''erreur lorsqu''il essaiera de publier son message.'
+          censor: 'Autoriser les messages contenant ces mots, mais les remplacer par des caractères qui cachent les mots censurés.'
+          require_approval: 'Les messages qui contiennent ces mots devront être approuvés par un responsable avant de pouvoir être publiés.'
+          flag: 'Autoriser les messages contenant ces mots, mais les signaler comme inapproprié pour que les modérateurs puisse les vérifier.'
+        form:
+          label: 'Nouveau mot :'
+          placeholder: 'mot complet ou * comme signe générique'
+          placeholder_regexp: "expression régulière"
+          add: 'Ajouter'
+          success: 'Succès'
+          upload: "Envoyer"
+          upload_successful: "Envoi réussi. Les mots ont été ajoutés."
       impersonate:
         title: "Incarner"
         help: "Utiliser cet outil pour incarner un compte utilisateur à des fins de tests.\nVous devrez vous déconnecter une fois terminé."
@@ -2882,7 +3058,7 @@ fr:
           pending: "En attente"
           staff: 'Responsables'
           suspended: 'Suspendus'
-          blocked: 'Bloqués'
+          silenced: 'Sous silence'
           suspect: 'Suspects'
         approved: "Approuvé ?"
         approved_selected:
@@ -2903,7 +3079,7 @@ fr:
           staff: "Responsables"
           admins: 'Administrateurs'
           moderators: 'Modérateurs'
-          blocked: 'Utilisateurs bloqués'
+          silenced: 'Utilisateurs sous silence'
           suspended: 'Utilisateurs suspendus'
           suspect: 'Utilisateurs suspects'
         reject_successful:
@@ -2920,18 +3096,31 @@ fr:
         suspend_failed: "Il y a eu un problème pendant la suspension de cet utilisateur {{error}}"
         unsuspend_failed: "Il y a eu un problème pendant le retrait de la suspension de cet utilisateur {{error}}"
         suspend_duration: "Combien de temps l'utilisateur sera suspendu ?"
-        suspend_duration_units: "(jours)"
         suspend_reason_label: "Pourquoi suspendez-vous ? Ce texte <b>sera visible par tout le monde</ b> sur la page du profil de cet utilisateur, et sera affiché à l'utilisateur quand ils essaient de se connecter. Soyez bref."
+        suspend_reason_hidden_label: "Pourquoi le suspendez-vous ? Ce texte sera affiché à l'utilisateur quand il essaie de se connecter. Soyez bref."
         suspend_reason: "Raison"
+        suspend_reason_placeholder: "Raison de la suspension"
+        suspend_message: "Message courriel"
+        suspend_message_placeholder: "Donner plus d'informations au sujet de la suspension qui seront envoyées à l'utilisateur par courriel."
         suspended_by: "Suspendu par"
+        silence_reason: "Raison"
+        silenced_by: "Mis sous silence par"
+        silence_modal_title: "Mettre l'utilisateur sous silence"
+        silence_duration: "Combien de temps sera l'utilisateur mis sous silence ?"
+        silence_reason_label: "Pourquoi mettez-vous l'utilisateur sous silence ?"
+        silence_reason_placeholder: "Raison de la mise sous silence"
+        silence_message: "Message courriel"
+        silence_message_placeholder: "(laisser vide pour envoyer un message par défaut)"
+        suspended_until: "(jusqu'à %{until})"
+        cant_suspend: "Cet utilisateur ne peut pas être suspendu."
         delete_all_posts: "Supprimer tous les messages"
         delete_all_posts_confirm_MF: "Vous êtes sur le point de supprimer {POSTS, plural, one {1 message} other {# messages}} et {TOPICS, plural, one {1 sujet} other {# sujets}}. Êtes-vous sûr ?"
-        suspend: "Suspendre"
-        unsuspend: "Annuler la suspension"
-        suspended: "Suspendu ?"
+        silence: "Mettre sous silence"
+        unsilence: "Ne pas mettre sous silence"
+        silenced: "Mis sous silence ?"
         moderator: "Modérateur ?"
         admin: "Administrateur ?"
-        blocked: "Bloqué ?"
+        suspended: "Suspendu ?"
         staged: "En attente ?"
         show_admin_profile: "Administration"
         refresh_browsers: "Forcer le rafraîchissement du navigateur"
@@ -2947,8 +3136,8 @@ fr:
         grant_admin_confirm: "Nous vous avons envoyé un courriel pour vérifier le nouvel administrateur. Veuillez le lire et suivre les instructions."
         revoke_moderation: 'Révoquer les droits de modération'
         grant_moderation: 'Accorder les droits de modération'
-        unblock: 'Débloquer'
-        block: 'Bloquer'
+        unsuspend: 'Annuler la suspension'
+        suspend: 'Suspendre'
         reputation: Réputation
         permissions: Permissions
         activity: Activité
@@ -2995,17 +3184,18 @@ fr:
         activate_failed: "Il y a eu un problème lors de l'activation du compte."
         deactivate_account: "Désactiver le compte"
         deactivate_failed: "Il y a eu un problème lors de la désactivation du compte."
-        unblock_failed: 'Il y a eu un problème lors du déblocage de l''utilisateur.'
-        block_failed: 'Il y a eu un problème lors du blocage de l''utilisateur.'
-        block_confirm: 'Êtes-vous sûr de vouloir bloquer cet utilisateur ? Il ne pourra plus créer de sujets ou messages.'
-        block_accept: 'Oui, bloquer cet utilisateur'
+        unsilence_failed: 'Il y a eu un problème en supprimant la mise sous silence de l''utilisateur.'
+        silence_failed: 'Il y a eu un problème en mettant l''utilisateur sous silence.'
+        silence_confirm: 'Êtes-vous sûr de vouloir mettre l’utilisateur sous silence ? Il ne sera plus capable de créer de nouveaux sujets ou messages.'
+        silence_accept: 'Oui, mettre cet utilisateur sous silence'
         bounce_score: "Score de rejet"
         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."
+        silence_explanation: "Un utilisateur mis sous silence ne peut pas créer des messages ou sujets."
         staged_explanation: "Un utilisateur en attente ne peut envoyer des messages par courriel que pour des sujets spécifiques."
         bounce_score_explanation:
           none: "Aucune rejet récent pour cette adresse courriel."
@@ -3123,6 +3313,7 @@ fr:
           developer: 'Développeur'
           embedding: "Externe"
           legal: "Légal"
+          api: 'API'
           user_api: 'API utilisateur'
           uncategorized: 'Autre'
           backups: "Sauvegardes"
@@ -3222,7 +3413,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 +3424,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"
@@ -3259,8 +3451,8 @@ fr:
       uploading: "Envoi en cours…"
       quit: "Peut-être plus tard"
       staff_count:
-        one: "Votre communauté a 1 responsable."
-        other: "Votre communauté a %{count} responsables."
+        one: "Votre communauté a 1 responsable (vous)."
+        other: "Votre communauté a %{count} responsables, dont vous."
       invites:
         add_user: "ajouter"
         none_added: "Vous n'avez invité aucun responsable. Êtes-vous sûr de vouloir continuer ?"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 790ac4744e..737fec2810 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -101,7 +101,6 @@ gl:
           other: "%{count} anos despois"
       previous_month: 'Mes anterior'
       next_month: 'Mes seguinte'
-      placeholder: Escolla unha data
     share:
       topic: 'compartir unha ligazón a este tema'
       post: 'publicación %{postNumber}'
@@ -138,19 +137,23 @@ gl:
         disabled: 'retirado da lista o %{when}'
     topic_admin_menu: "accións do administrador de temas"
     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."
+    themes:
+      default_description: "Predeterminado"
     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_south_1: "Asia Pacífico (Mumbai)"
+        ap_southeast_1: "Asia Pacífico (Singapur)"
+        ap_southeast_2: "Asia Pacífico (Sidney)"
+        cn_north_1: "China (Beijing)"
+        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"
@@ -210,6 +213,7 @@ gl:
       like_count: "Gústames"
       topic_count: "Temas"
       post_count: "Publicacións"
+      user_count: "Usuarios"
       active_user_count: "Usuarios activos"
       contact: "Contacta connosco"
       contact_info: "No caso dunha incidencia crítica ou asunto urxente que afecte este sitio, contacta connosco en %{contact_info}."
@@ -316,17 +320,13 @@ gl:
       add: "Engadir"
       selector_placeholder: "Engadir membros"
       owner: "propietario"
-      visible: "O grupo é visíbel para todos os usuarios."
-      title:
-        one: "grupo"
-        other: "grupos"
+      activity: "Actividade"
       members: "Membros"
       topics: "Temas"
       posts: "Publicacións"
       mentions: "Mencións"
       messages: "Mensaxes"
       alias_levels:
-        title: "Quen pode enviar mensaxes e @mención a este grupo?"
         nobody: "Ninguén"
         only_admins: "Só administradores"
         mods_and_admins: "Só moderadores e administradores"
@@ -437,7 +437,6 @@ gl:
       admin: "{{user}} é administrador"
       moderator_tooltip: "Este usuario é  un moderador"
       admin_tooltip: "Este usuario é un administrador"
-      blocked_tooltip: "Este usuario está bloqueado"
       suspended_notice: "Este usuario está suspendido até o {{date}}."
       suspended_reason: "Razón:"
       github_profile: "Github"
@@ -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"
@@ -697,7 +695,6 @@ gl:
     first_post: Publicación inicial
     mute: Silenciar
     unmute: Non silenciar
-    last_post: Última publicación
     last_reply_lowercase: última resposta
     replies_lowercase:
       one: resposta
@@ -852,11 +849,7 @@ gl:
       olist_title: "Lista numerada"
       ulist_title: "Lista con símbolos"
       list_item: "Elemento da lista"
-      heading_title: "Cabeceira"
-      heading_text: "Cabeceira"
-      hr_title: "Regra horizontal"
       help: "Axuda para edición con Markdown"
-      toggler: "agochar ou amosar o panel de composición"
       modal_ok: "De acordo"
       modal_cancel: "Cancelar"
       cant_send_pm: "Sentímolo pero non podes enviar unha mensaxe a %{username}."
@@ -866,26 +859,6 @@ gl:
       none: "Non é posíbel cargar as notificacións neste intre"
       more: "ver notificacións anteriores"
       total_flagged: "total de publicacións denunciadas"
-      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:
-        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} and 1 máis</span> {{description}}</p>"
-        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} e {{count}} máis</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> aceptou o teu convite</p>"
-      moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> moveu {{description}}</p>"
-      granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Obtiveches «{{description}}»</p>"
-      group_message_summary:
-        one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} mensaxe na caixa do correo de {{group_name}} </p>"
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} mensaxes na caixa do correo de {{group_name}} </p>"
       alt:
         mentioned: "Mencionado por"
         quoted: "Citado por"
@@ -931,9 +904,6 @@ gl:
       most_liked: "Con máis Gústames"
       select_all: "Seleccionar todo"
       clear_all: "Borrar todo"
-      result_count:
-        one: "Un resultado para <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} resultados para <span class='term'>\"{{term}}\"</span>"
       title: "buscar temas, publicacións, usuarios ou categorías"
       no_results: "Non se atoparon resultados."
       no_more_results: "Non se atoparon máis resultados."
@@ -1215,7 +1185,6 @@ gl:
       multi_select:
         select: 'seleccionar'
         selected: 'seleccionados ({{count}})'
-        select_replies: 'seleccionar +respostas'
         delete: eliminar seleccionados
         cancel: 'cancelar selección '
         select_all: seleccionar todo
@@ -1226,7 +1195,6 @@ gl:
     post:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
-      edit: "Editando {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Razón:"
       post_number: "publicación {{number}}"
       last_edited_on: "última edición da publicación"
@@ -1284,12 +1252,6 @@ gl:
         undelete: "recuperar publicación"
         share: "compartir ligazón á publicación"
         more: "Máis"
-        delete_replies:
-          confirm:
-            one: "Tamén desexas eliminar a resposta directa desta publicación?"
-            other: "Tamén desexas eliminar as {{count}} respostas directas desta publicación?"
-          yes_value: "Si, eliminar tamén as respostas"
-          no_value: "Non, só esta publicación"
         admin: "accións admin. nas publicacións"
         wiki: "Crear wiki"
         unwiki: "Eliminar wiki"
@@ -1300,9 +1262,6 @@ gl:
         change_owner: "Cambiar propietario"
       actions:
         flag: 'Denunciar'
-        defer_flags:
-          one: "Pospor denuncia"
-          other: "Pospor denuncias"
         undo:
           off_topic: "Desfacer denuncia"
           spam: "Desfacer denuncia"
@@ -1378,10 +1337,6 @@ gl:
           vote:
             one: "Unha persoa votou por esta publicación"
             other: "{{count}} persoas votaron por esta publicación"
-      delete:
-        confirm:
-          one: "Confirmas a eliminación desta publicación?"
-          other: "Confirmas a eliminación de todas estas publicacións?"
       revisions:
         controls:
           first: "Primeira revisión"
@@ -1648,7 +1603,6 @@ gl:
         no_problems: "Non se atoparon problemas."
         moderators: 'Moderadores:'
         admins: 'Administradores:'
-        blocked: 'Bloqueados:'
         suspended: 'Suspendidos:'
         private_messages_short: "Mensaxes"
         private_messages_title: "Mensaxes"
@@ -1678,24 +1632,12 @@ gl:
         by: "por"
       flags:
         title: "Denuncias"
-        old: "Antigo"
-        active: "Activo"
         agree: "Aceptar"
         agree_title: "Confirmar esta denuncia como válida"
-        agree_flag_modal_title: "Aceptar e..."
-        agree_flag_hide_post: "Aceptar (ocultar publicación + enviar msx. privada)"
-        agree_flag_hide_post_title: "Ocultar esta publicación e enviar automaticamente unha mensaxe ao usuario para que a edite axiña"
-        agree_flag_restore_post: "Aceptar (restabelecer publicación)"
-        agree_flag_restore_post_title: "Restabelecer esta publicación"
-        agree_flag: "Aceptar denuncia"
-        agree_flag_title: "Aceptar a denuncia e manter a publicación sen cambios"
-        defer_flag: "Pospor"
         defer_flag_title: "Eliminar esta denuncia; non precisa medidas neste momento."
         delete: "Eliminar"
         delete_title: "Eliminar a publicación á que se refire esta denuncia."
-        delete_post_defer_flag: "Eliminar publicación e pospor a denuncia"
         delete_post_defer_flag_title: "Eliminar publicación. Se é a inicial, eliminar tamén o tema"
-        delete_post_agree_flag: "Eliminar a publicación e aceptar a denuncia"
         delete_post_agree_flag_title: "Eliminar publicación. Se é a inicial, eliminar tamén o tema."
         delete_flag_modal_title: "Eliminar e..."
         delete_spammer: "Eliminar spammer"
@@ -1710,34 +1652,16 @@ gl:
         dispositions:
           agreed: "aceptar"
           disagreed: "non aceptar"
-          deferred: "posposta"
         flagged_by: "Denunciado por"
         resolved_by: "Arranxado por"
         took_action: "Tomadas medidas"
         system: "Sistema"
         error: "Algo foi mal"
         reply_message: "Responder"
-        no_results: "Non hai denuncias"
         topic_flagged: "Este <strong>tema</strong> foi denunciado."
         visit_topic: "Visite o tema para actuar"
         was_edited: "A publicación editouse despois da primeira denuncia"
         previous_flags_count: "Esta publicación xa se denunciou {{count}} veces."
-        summary:
-          action_type_3:
-            one: "sen relación"
-            other: "sen relación x{{count}}"
-          action_type_4:
-            one: "inapropiado"
-            other: "inapropiados x{{count}}"
-          action_type_6:
-            one: "personalizar"
-            other: "personalizar x{{count}}"
-          action_type_7:
-            one: "personalizar"
-            other: "personalizar x{{count}}"
-          action_type_8:
-            one: "spam"
-            other: "spam x{{count}}"
       groups:
         primary: "Grupo primario"
         no_primary: "(non hai un grupo primario)"
@@ -2021,8 +1945,6 @@ gl:
             change_category_settings: "cambiar axustes da categoría"
             delete_category: "eliminar categoría"
             create_category: "crear categoría"
-            block_user: "bloquear usuario"
-            unblock_user: "desbloquear usuario"
             grant_admin: "conceder administración"
             revoke_admin: "revogar administración"
             grant_moderation: "conceder moderación"
@@ -2078,7 +2000,6 @@ gl:
           pending: "Pendente"
           staff: 'Equipo'
           suspended: 'Suspendido'
-          blocked: 'Bloqueado'
           suspect: 'Sospeitoso'
         approved: "Aprobado?"
         approved_selected:
@@ -2099,7 +2020,6 @@ gl:
           staff: "Equipo"
           admins: 'Usuarios administradores'
           moderators: 'Moderadores'
-          blocked: 'Usuarios bloqueados'
           suspended: 'Usuarios suspendidos'
           suspect: 'Usuarios sospeitosos'
         reject_successful:
@@ -2116,17 +2036,13 @@ gl:
         suspend_failed: "Algo fallou rexeitando este usuario {{error}}"
         unsuspend_failed: "Algo foi mal levantando a suspensión deste usuario {{error}}"
         suspend_duration: "Canto tempo estará suspendido o usuario?"
-        suspend_duration_units: "(días)"
         suspend_reason_label: "Cal é o motivo da suspensión? Este texto <b>será visíbel para todo o mundo</b> na páxina do perfil deste usuario e amosaráselle ao usuario cando tente iniciar sesión. Procura ser breve."
         suspend_reason: "Razón"
         suspended_by: "Suspendido por"
         delete_all_posts: "Eliminar todas as publicacións"
-        suspend: "Suspender"
-        unsuspend: "Non suspender"
-        suspended: "Suspendido?"
         moderator: "Moderador?"
         admin: "Administrador?"
-        blocked: "Bloqueado?"
+        suspended: "Suspendido?"
         staged: "Transitorio?"
         show_admin_profile: "Administración"
         refresh_browsers: "Forzar a actualización do navegador"
@@ -2140,8 +2056,8 @@ gl:
         grant_admin: 'Facer administrador'
         revoke_moderation: 'Revogar moderación'
         grant_moderation: 'Conceder moderación'
-        unblock: 'Desbloquear'
-        block: 'Bloquear'
+        unsuspend: 'Non suspender'
+        suspend: 'Suspender'
         reputation: Reputación
         permissions: Permisos
         activity: Actividade
@@ -2188,13 +2104,8 @@ gl:
         activate_failed: "Produciuse un problema activando o usuario."
         deactivate_account: "Desactivar a conta"
         deactivate_failed: "Produciuse un problema desactivando o usuario."
-        unblock_failed: 'Produciuse un problema desbloqueando o usuario.'
-        block_failed: 'Produciuse un problema bloqueando o usuario.'
-        block_confirm: 'Confirmas o bloqueo deste usuario? Non poderá crear máis temas nin publicacións.'
-        block_accept: 'Si, bloquealo'
         deactivate_explanation: "Un usuario desactivado debe revalidar o seu correo-e."
         suspended_explanation: "Un usuario suspendido non pode iniciar sesión."
-        block_explanation: "Un usuario bloquedo non pode publicar nin iniciar temas."
         trust_level_change_failed: "Produciuse un problema cambiando o nivel de confianza do usuario."
         suspend_modal_title: "Suspender usuario"
         trust_level_2_users: "Usuarios con nivel 2 de confianza"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 68b30d2fad..575aba48d9 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} שנים"
@@ -101,7 +101,6 @@ he:
           other: "אחרי %{count} שנים"
       previous_month: 'חודש קודם'
       next_month: 'חודש הבא'
-      placeholder: בחרו תאריך
     share:
       topic: 'שתפו קישור לנושא זה'
       post: 'פוסט #%{postNumber}'
@@ -109,7 +108,7 @@ he:
       twitter: 'שתפו קישור זה בטוויטר'
       facebook: 'שתפו קישור זה בפייסבוק'
       google+: 'שתפו קישור זה בגוגל+'
-      email: 'שלח קישור בדוא"ל'
+      email: 'שליחת קישור בדוא״ל'
     action_codes:
       public_topic: "הפכו נושא זה לפומבי %{when}"
       private_topic: "הפכו נושא זה לפרטי %{when}"
@@ -137,31 +136,32 @@ 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_east_2: "ארה״ב מזרח (אוהיו)"
+        us_gov_west_1: "AWS GovCloud (ארה״ב)"
+        us_west_1: "מערב ארה\"ב (צפון קליפורניה)"
+        us_west_2: "מערב ארה\"ב (ארגון)"
     edit: 'עירכו את הכותרת והקטגוריה של נושא זה'
     not_implemented: "סליחה, תכונה זו עדיין לא מומשה!"
     no_value: "לא"
@@ -351,11 +351,9 @@ he:
         full_name: 'שם מלא'
         add_members: "הוספת חברים"
         delete_member_confirm: "הסרת '%{username}' מהקבוצה '%{group}'?"
-      request_membership_pm:
-        title: "בקשת חברות"
-        body: "הייתי מעוניין להגיש בקשת חברות ב-@%{groupName}."
       name_placeholder: "שם קבוצה, ללא רווחים, לפי הכללים של שמות משתמשים"
-      public: "אפשרו למשתמשים להצטרף/לעזוב את הקבוצה בחופשיות (על הקבוצה להיות נראית)"
+      public_admission: "אפשרו למשתמשים להצטרף לקבוצה בחופשיות (דורש קבוצה פומבית)"
+      public_exit: "אפשרו למשתמשים לעזוב את הקבוצה בחופשיות"
       empty:
         posts: "אין פוסטים של חברי קבוצה זו."
         members: "אין חברים בקבוצה זו."
@@ -367,6 +365,7 @@ he:
       join: "הצטרפות לקבוצה"
       leave: "עזיבת קבוצה"
       request: "בקשה להצטרפות לקבוצה"
+      message: "הודעה"
       automatic_group: קבוצה אוטומטית
       closed_group: קבוצה סגורה
       is_group_user: "אתם חברים בקבוצה זו."
@@ -377,13 +376,9 @@ he:
       bio: "אודות הקבוצה"
       selector_placeholder: "הוספת חברים וחברות"
       owner: "מנהל"
-      visible: "הקבוצה זמינה לכל המשתמשים"
       index:
         title: "קבוצות"
         empty: "אין קבוצות נראות."
-      title:
-        one: "קבוצה"
-        other: "קבוצות"
       activity: "פעילות"
       members: "חברים"
       topics: "נושאים"
@@ -391,8 +386,13 @@ he:
       mentions: "אזכורים"
       messages: "הודעות"
       notification_level: "ברירת מחדל של רמת התראות להודעות קבוצה"
+      visibility_levels:
+        title: "מי יכול לראות קבוצה זו?"
+        public: "כולם"
+        members: "בעלי קבוצה, חברים ואדמיניסטרטורים"
+        staff: "בעלי קבוצה וצוות"
+        owners: "בעלי קבוצה ואדמיניסטרטורים"
       alias_levels:
-        title: "מי יכולים לשלוח מסרים ו@לאזכר בקבוצה זו?"
         nobody: "אף אחד"
         only_admins: "רק מנהלים"
         mods_and_admins: "רק מנחים ומנהלים"
@@ -488,7 +488,7 @@ he:
       mute: "השתק"
       edit: "עריכת העדפות"
       download_archive:
-        button_text: "הורדת פוסטים שלי"
+        button_text: "להוריד הכל"
         confirm: "האם אתם בטוחים שאתם מעוניינים להוריד אליכם את הפוסטים שלכם?"
         success: "הורדה החלה, תקבלו הודעה כאשר התהליך הסתיים."
         rate_limit_error: "ניתן להוריד פוסטים פעם ביום, אנא נסו שוב מחר."
@@ -526,7 +526,6 @@ he:
       admin: "{{user}} הוא מנהל מערכת"
       moderator_tooltip: "משתמש זה הינו מנחה (Moderator)"
       admin_tooltip: "משתמש זה הינו אדמיניסטרטור"
-      blocked_tooltip: "משתמש זה חסום"
       suspended_notice: "המשתמש הזה מושעה עד לתאריך: {{date}}."
       suspended_reason: "הסיבה: "
       github_profile: "גיטהאב"
@@ -558,6 +557,7 @@ he:
       watched_first_post_tags_instructions: "אתם תיודעו לגבי הפוסט הראשון בכל נושא חדש בתגיות אלו."
       muted_categories: "מושתק"
       muted_categories_instructions: "אתם לא תיודעו על שום דבר לגבי נושאים חדשים בקטגוריות אלו, והם לא יופיעו ב״אחרונים״."
+      no_category_access: "בתור מנחים יש לכם גישה מוגבלת לקטגוריות, שמירה מנוטרלת."
       delete_account: "מחק את החשבון שלי"
       delete_account_confirm: "אתם בטוחים שברצונכם למחוק את החשבון? לא ניתן לבטל פעולה זו!"
       deleted_yourself: "חשבונך נמחק בהצלחה."
@@ -617,7 +617,6 @@ he:
         title: "שנה שם משתמש"
         confirm: "אם תשנו את שם המשתמש שלכם, כל הציטוטים הקודמים של פוסטים שלכם ואזכורי @שמות ישברו. האם אתם בטוחים לחלוטין שזה מה שתרצו לעשות?"
         taken: "סליחה, שם המשתמש הזה תפוס."
-        error: "ארעה שגיאה בשינוי שם המשתמש שלך."
         invalid: "שם המשתמש אינו תקין. עליו לכלול רק אותיות באנגלית ומספרים."
       change_email:
         title: "שנה דואר אלקטרוני"
@@ -753,6 +752,9 @@ he:
         expired: "פג תוקף ההזמנה."
         rescind: "הסרה"
         rescinded: "הזמנה הוסרה"
+        rescind_all: "הסירו את כל ההזמנות"
+        rescinded_all: "כל ההזמנות הוסרו!"
+        rescind_all_confirm: "האם אתם בטוחים שאתם מעוניינים להסיר את כל ההזמנות?"
         reinvite: "משלוח חוזר של הזמנה"
         reinvite_all: "שלח מחדש את כל ההזמנות"
         reinvite_all_confirm: "האם אתם בטוחים שאתם מעוניינים לשלוח מחדש את כל ההזמנות?"
@@ -788,12 +790,6 @@ he:
         post_count:
           one: "פוסט נוצר"
           other: "פוסטים נוצרו"
-        likes_given:
-          one: "ניתן <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>"
         days_visited:
           one: "יום שבוקר"
           other: "ימים שבוקרו"
@@ -885,7 +881,6 @@ he:
     first_post: פוסט ראשון
     mute: השתק
     unmute: בטל השתקה
-    last_post: פוסט אחרון
     last_reply_lowercase: תגובה אחרונה
     replies_lowercase:
       one: תגובה
@@ -935,6 +930,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 +990,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:
@@ -1010,6 +1009,20 @@ he:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      filter_placeholder: חיפוש אחר אימוג׳י
+      people: אנשים
+      nature: טבע
+      food: אוכל
+      activity: פעילות
+      custom: אימוג׳יז מותאמים
+      recent: בשימוש לאחרונה
+      default_tone: ללא גוון עור
+      light_tone: גוון עור בהיר
+      medium_light_tone: גוון עור בהיר בינוני
+      medium_tone: גוון עור בינוני
+      medium_dark_tone: גוון עור כהה בינוני
+      dark_tone: גוון עור כהה
     composer:
       emoji: "אמוג׳י :)"
       more_emoji: "עוד..."
@@ -1083,12 +1096,7 @@ he:
       olist_title: "רשימה ממוספרת"
       ulist_title: "רשימת נקודות"
       list_item: "פריט ברשימה"
-      heading_label: "H"
-      heading_title: "כותרת"
-      heading_text: "כותרת"
-      hr_title: "קו אופקי"
       help: "עזרה על כתיבה ב-Markdown"
-      toggler: "הסתר או הצג את פאנל העריכה"
       modal_ok: "אישור"
       modal_cancel: "ביטול"
       cant_send_pm: "מצטערים, אינכם יכולים לשלוח הודעה ל-%{username}."
@@ -1102,29 +1110,6 @@ he:
       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:
-        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} ו 1 אחר</span> {{description}}</p>"
-        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> אישר/ה את הזמנתך</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='עיטור הוענק' 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>"
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} הודעות בתיבת הודעות הקבוצה {{group_name}}</p>"
       alt:
         mentioned: "הוזכר על ידי"
         quoted: "צוטט על ידי"
@@ -1172,15 +1157,11 @@ he:
       select_all: "בחירה של הכל"
       clear_all: "נקוי של הכל"
       too_short: "מילת החיפוש שלכם קצרה מידי."
-      result_count:
-        one: "תוצאה אחת ל <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} תוצאות ל <span class='term'>\"{{term}}\"</span>"
       title: "חיפוש נושאים, פוסטים, משתמשים או קטגוריות"
       no_results: "אין תוצאות."
       no_more_results: "לא נמצאו עוד תוצאות."
       searching: "מחפש ..."
       post_format: "#{{post_number}} מאת {{username}}"
-      results_page: "תוצאות חיפוש"
       context:
         user: "חיפוש פוסטים לפי @{{username}}"
         category: "חפשו את הקטגוריה #{{category}}"
@@ -1190,26 +1171,18 @@ he:
         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: הם ויקי
         statuses:
@@ -1350,7 +1323,6 @@ he:
       jump_reply_down: קפיצה לתגובה מאוחרת
       deleted: "הנושא הזה נמחק"
       topic_status_update:
-        title: "קביעת שעון עצר לנושא"
         save: "קביעת שעון עצר"
         num_of_hours: "מספר שעות:"
         remove: "הסרת שעון עצר"
@@ -1587,7 +1559,6 @@ he:
       multi_select:
         select: 'בחירה'
         selected: 'נבחרו ({{count}})'
-        select_replies: 'נבחרו +תגובות'
         delete: מחק נבחרים
         cancel: בטל בחירה
         select_all: בחר הכל
@@ -1599,7 +1570,6 @@ he:
       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}}"
       wiki_last_edited_on: "וויקי נערך לאחרונה ב"
@@ -1660,18 +1630,13 @@ he:
         has_liked: "אהבת פוסט זה"
         undo_like: "בטל 'אהוב'"
         edit: "עירכו פוסט זה"
+        edit_action: "עריכה"
         edit_anonymous: "מצטערים, אך עליכם להיות מחוברים בכדי לערוך פוסט זה."
         flag: "דגלו פוסט זה באופן פרטי לתשומת לב או שלחו התראה פרטית עליו"
         delete: "מחק פוסט זה"
         undelete: "שחזר פוסט זה"
         share: "שיתוף קישור לפוסט זה"
         more: "עוד"
-        delete_replies:
-          confirm:
-            one: "אתם רוצים למחוק את התגובה הישירה לפוסט זה?"
-            other: "אתם רוצים למחוק את {{count}} התגובות הישירות לפוסט זה?"
-          yes_value: "כן, מחק גם את התגובות"
-          no_value: "לא, רק את הפוסט"
         admin: "פעולות ניהול של הפוסט"
         wiki: "יצירת wiki"
         unwiki: "הסרת ה-Wiki"
@@ -1682,9 +1647,6 @@ he:
         change_owner: "שינוי בעלות"
       actions:
         flag: 'דיגול'
-        defer_flags:
-          one: "דחיית סימון"
-          other: "דחיית דגלים"
         undo:
           off_topic: "ביטול דיגול"
           spam: "ביטול דיגול"
@@ -1760,14 +1722,10 @@ he:
           vote:
             one: "אדם אחד הצביע לפוסט זה"
             other: "{{count}} אנשים הצביעו לפוסט זה"
-      delete:
-        confirm:
-          one: "האם אתם בטוחים שאתם מעוניינים למחוק פוסט זה?"
-          other: "האם אתם בטוחים שאתם מעוניינים למחוק את כל הפוסטים האלו?"
       merge:
         confirm:
-          one: "אתם בטוחים שאתם מעוניינים למזג את הפוסטים האלו?"
-          other: "אתם בטוחים שאתם מעוניינים למזג את {{count}} הפוסטים האלו?"
+          one: "האם אתם בטוחים שאתם מעוניינים למזג פוסטים אלו?"
+          other: "האם אתם בטוחים שאתם מעוניינים למזג {{count}} פוסטים אלו?"
       revisions:
         controls:
           first: "מהדורה ראשונה"
@@ -1813,8 +1771,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: "אפשרו קישורים מומלצים בקטגוריה זו"
@@ -2113,7 +2070,6 @@ he:
         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> בטלו נושאים'
@@ -2184,9 +2140,7 @@ he:
       selector_no_tags: "ללא תגיות"
       changed: "תגיות ששונו:"
       tags: "תגיות"
-      choose_for_topic: "בחרו תגים אופציונליים לנושא זה"
       delete_tag: "מחק תגית"
-      delete_confirm: "האם אתם בטוחים שאתם מעוניינים למחוק את התגית הזו?"
       rename_tag: "שנו תגית"
       rename_instructions: "בחרו שם חדש לתגית:"
       sort_by: "סידור לפי:"
@@ -2281,7 +2235,6 @@ he:
         no_problems: "לא נמצאו בעיות."
         moderators: 'מנהלים:'
         admins: 'מנהלים ראשיים:'
-        blocked: 'חסומים:'
         suspended: 'מושעים:'
         private_messages_short: "הודעות"
         private_messages_title: "הודעות"
@@ -2314,24 +2267,12 @@ he:
         by: "על ידי"
       flags:
         title: "דגלים"
-        old: "ישן"
-        active: "פעיל"
         agree: "הסכמה"
         agree_title: "אישור דגל זה כתקין ונכון"
-        agree_flag_modal_title: "הסכמה ו..."
-        agree_flag_hide_post: "קבלה (הסתרת פוסט + שליחת מסר פרטי)"
-        agree_flag_hide_post_title: "הסתרת פוסט זה ושליחה אוטומטית של הודעה פרטית למשתמשים שמאיצה בהם לערוך אותו"
-        agree_flag_restore_post: "הסכמה (שחזור הפוסט)"
-        agree_flag_restore_post_title: "שחזור פוסט זה"
-        agree_flag: "הסכמה עם הדגל"
-        agree_flag_title: "הסכמה עם הדגל ושמירת הפוסט ללא שינוי"
-        defer_flag: "דחייה"
         defer_flag_title: "הסרה של דגל זה; הוא אינו דורש פעולה כעת."
         delete: "מחיקה"
         delete_title: "מחיקת הפוסט שהדגל מצביע עליו."
-        delete_post_defer_flag: "מחיקת הפוסט ודחיית הדגל"
         delete_post_defer_flag_title: "מחיקת הפוסט; אם זהו הפוסט הראשון, מחיקת הנושא"
-        delete_post_agree_flag: "מחיקת הפוסט והסכמה עם הדגל"
         delete_post_agree_flag_title: "מחיקת פוסט; אם זהו הפוסט הראשון, מחיקת הנושא"
         delete_flag_modal_title: "מחיקה ו..."
         delete_spammer: "מחיקת ספאמר"
@@ -2346,34 +2287,16 @@ he:
         dispositions:
           agreed: "התקבל"
           disagreed: "לא התקבל"
-          deferred: "נדחה"
         flagged_by: "דוגל על ידי"
         resolved_by: "נפתר על ידי"
         took_action: "ננקטה פעולה"
         system: "מערכת"
         error: "משהו השתבש"
         reply_message: "תגובה"
-        no_results: "אין דגלים."
         topic_flagged: "<strong>נושא</strong> זה דוגל."
         visit_topic: "בקרו בנושא כדי לנקוט פעולה"
         was_edited: "הפוסט נערך לאחר הדיגול הראשון"
         previous_flags_count: "פוסט זה כבר דוגל {{count}} פעמים."
-        summary:
-          action_type_3:
-            one: "אוף-טופיק"
-            other: "אוף-טופיק x{{count}}"
-          action_type_4:
-            one: "לא ראוי"
-            other: "לא ראוי x{{count}}"
-          action_type_6:
-            one: "מותאם אישית"
-            other: "מותאם אישית x{{count}}"
-          action_type_7:
-            one: "מותאם אישית"
-            other: "מותאם אישית x{{count}}"
-          action_type_8:
-            one: "ספאם"
-            other: "ספאם x{{count}}"
       groups:
         primary: "קבוצה ראשית"
         no_primary: "(אין קבוצה ראשית)"
@@ -2461,7 +2384,6 @@ he:
           details: "כאשר יש תגובה חדשה, עריכה, מחיקה או שחזור."
         user_event:
           name: "אירוע משתמש"
-          details: "כאשר משתמש נוצר, מאושר, או מעודכן."
         delivery_status:
           title: "מצב שליחה"
           inactive: "לא פעיל"
@@ -2637,8 +2559,8 @@ he:
           up_to_date: "התמה מעודכנת, נבדקה לאחרונה ב:"
           add: "הוספה"
           commits_behind:
-            one: "התמה נמצאת 1 עדכונים מאחור!"
-            other: "התמה נמצאת {{count}} עדכונים מאחור!"
+            one: "התמה נמצאת קומיט 1 מאחור!"
+            other: "התמה נמצאת {{count}} קומיטים מאחור!"
           scss:
             text: "CSS"
             title: "עריכת CSS מותאם, אנחנו מקבלים כל סגנון CSS ו SCSS תקני"
@@ -2823,8 +2745,6 @@ he:
             change_category_settings: "שינוי הגדרות קטגוריה"
             delete_category: "מחיקת קטגוריה"
             create_category: "יצירת קטגוריה"
-            block_user: "חסום משתמש"
-            unblock_user: "בטל חסימת משתמש"
             grant_admin: "הענקת ניהול"
             revoke_admin: "שללו אדמיניסטרציה"
             grant_moderation: "הענקת הנחיה"
@@ -2873,6 +2793,28 @@ he:
             title: "יוצר ערכי איסור משנה חדשים, אם יש לפחות 'min_ban_entries_for_roll_up' ערכים."
         logster:
           title: "רישום תקלות"
+      watched_words:
+        search: "חיפוש"
+        clear_filter: "ניקוי"
+        show_words: "הצגת מילים"
+        word_count:
+          one: "מילה 1"
+          other: "%{count} מילים"
+        actions:
+          block: 'חסימה'
+          censor: 'צינזור'
+          require_approval: 'דרישת אישור'
+          flag: 'דגל'
+        action_descriptions:
+          censor: 'הרשו פוסטים שמכילים מילים אלו, אבל החליפו אותן עם תווים שמסתירים את המילים המצונזרות.'
+          require_approval: 'פוסטים שמכילים מילים אלו ידרשו אישור על ידי הצוות לפני שניתן יהיה לראות אותם.'
+          flag: 'אפשרו פוסטים שמכילים אלו, אך דגלו אותם כלא-ראויים כדי שמנחים יוכלו לסקור אותם.'
+        form:
+          label: 'מילה חדשה:'
+          add: 'הוספה'
+          success: 'הצלחה'
+          upload: "העלאה"
+          upload_successful: "העלאה הצליחה. מילים נוספו."
       impersonate:
         title: "התחזות"
         help: "השתמשו בכלי זה כדי להתחזות לחשבון משתמש לצרכי דיבוג. עליכם להתנתק ברגע שתסיימו."
@@ -2892,7 +2834,6 @@ he:
           pending: "ממתין"
           staff: 'צוות'
           suspended: 'מושעים'
-          blocked: 'חסומים'
           suspect: 'חשודים'
         approved: "מאושר?"
         approved_selected:
@@ -2913,7 +2854,6 @@ he:
           staff: "צוות"
           admins: 'מנהלים ראשיים'
           moderators: 'מנהלים'
-          blocked: 'משתמשים חסומים'
           suspended: 'משתמשים מושעים'
           suspect: 'משתמשים חשודים'
         reject_successful:
@@ -2930,18 +2870,14 @@ he:
         suspend_failed: "משהו נכשל בהשעיית המשתמש הזה {{error}}"
         unsuspend_failed: "משהו נכשל בביטול השהיית המשתמש הזה {{error}}"
         suspend_duration: "למשך כמה זמן יהיה המשתמש מושעה?"
-        suspend_duration_units: "(ימים)"
         suspend_reason_label: "מדוע אתם משעים? הטקסט הזה <b>יהיה נראה לכולם</b> בעמוד המשתמש הזה, ויוצג למשתמש כשינסה להתחבר. נסו לשמור עליו קצר."
         suspend_reason: "סיבה"
         suspended_by: "הושעה על ידי"
         delete_all_posts: "מחק את כל הפוסטים"
         delete_all_posts_confirm_MF: "אתם עומדים למחוק {POSTS, plural, one {פוסט אחד} other {# פסוטים}} ו{TOPICS, plural, one {נושא אחד} other {# נושאים}}. האם אתם בטוחים?"
-        suspend: "השעה"
-        unsuspend: "בטל השעייה"
-        suspended: "מושעה?"
         moderator: "מנהל?"
         admin: "מנהל ראשי?"
-        blocked: "חסום?"
+        suspended: "מושעה?"
         staged: "מועמד?"
         show_admin_profile: "מנהל ראשי"
         refresh_browsers: "הכרח רענון דפדפן"
@@ -2957,8 +2893,8 @@ he:
         grant_admin_confirm: "שלחנו אליכם מייל כדי לוודא את האדמיניסטרטור החדש. בבקשה פיתחו אותו ועיקבו אחר ההוראות."
         revoke_moderation: 'שללו הנחיה'
         grant_moderation: 'הענקת הנחיה'
-        unblock: 'ביטול חסימה'
-        block: 'חסום'
+        unsuspend: 'בטל השעייה'
+        suspend: 'השעה'
         reputation: מוניטין
         permissions: הרשאות
         activity: פעילות
@@ -3005,17 +2941,13 @@ he:
         activate_failed: "הייתה בעיה בהפעלת המשתמש."
         deactivate_account: "נטרל חשבון"
         deactivate_failed: "הייתה בעיה בנטרול חשבון המשתמש."
-        unblock_failed: 'הייתה בעיה בביטול חסימת המשתמש.'
-        block_failed: 'הייתה בעיה בחסימת המשתמש.'
-        block_confirm: 'האם אתם בטוחים שאתם מעוניינים לחסום משתמש זה? הם לא יוכלו ליצור נושאים חדשים או פוסטים.'
-        block_accept: 'כן, חסום משתמש זה'
         bounce_score: "ניקוד-החזר"
         reset_bounce_score:
           label: "איפוס"
           title: "איפוס ניקוד-החזר"
+        visit_profile: "בקרו <a href='%{url}'>בדף ההעדפות של משתמש/ת זה/זו</a> כדי לערוך את הפרופיל שלהם"
         deactivate_explanation: "חשבון משתמש מנוטרל נדרש לוודא דואר אלקטרוני מחדש."
         suspended_explanation: "משתמש מושעה לא יכול להתחבר."
-        block_explanation: "משתמש חסום לא יכול לפרסם או להתחיל נושאים."
         staged_explanation: "משתמש מועמד יכול לפרסם רק באמצעות מייל בנושאים ספציפיים."
         bounce_score_explanation:
           none: "לא התקבלו החזרים לאחרונה מהמייל הזה."
@@ -3269,9 +3201,6 @@ he:
       upload: "העלאה"
       uploading: "מעלה..."
       quit: "אולי מאוחר יותר"
-      staff_count:
-        one: "לקהילה שלכם יש חבר צוות 1."
-        other: "לקהילה שלכם יש %{count} חברי צוות."
       invites:
         add_user: "הוספה"
         none_added: "טרם הזמנתם חברי צוות. האם אתם בטוחים שאתם מעוניינים להמשיך?"
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index f864c8d833..8c6c91ca12 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"
@@ -191,6 +191,7 @@ id:
       like_count: "Suka"
       topic_count: "Topik"
       post_count: "Pos"
+      user_count: "Pengguna"
       active_user_count: "Pengguna Aktif"
       contact: "Kontak kami"
       contact_info: "Pada kegiatan dari sebuah isu kritikal atau penting terjadi pada situs ini, silahkan kontak kami di %{contact_info}."
@@ -288,21 +289,52 @@ id:
       posts_read: "baca"
       total_rows:
         other: "%{count} pengguna"
+    group_histories:
+      actions:
+        add_user_to_group: "Tambahkan pengguna"
+        remove_user_from_group: "Hapus pengguna"
+        make_user_group_owner: "Jadikan pemilik"
     groups:
+      logs:
+        action: "Aksi"
+        subject: "Subyek"
+        details: "Detil"
+        from: "Dari"
+        to: "Kepada"
+      edit:
+        full_name: 'Nama Lengkap'
+        add_members: "Tambah Anggota"
+        delete_member_confirm: "Hapus '%{username}' dari grup '%{group}'?"
+      name_placeholder: "Nama grup, tidak boleh menggunakan spasi, sama seperti aturan username"
+      empty:
+        members: "Tidak ada anggota dalam kelompok ini."
+        messages: "Tidak ada pesan untuk kelompok ini."
+        topics: "Tidak ada topik oleh anggota kelompok ini."
       add: "Menambahkan"
+      join: "Gabung dengan grup"
+      message: "Pesan"
+      automatic_group: Kelompok Otomatis
+      closed_group: Kelompok Tertutup
+      is_group_user: "Anda adalah anggota dari kelompok ini."
+      membership: "Keanggotaan"
+      name: "Nama"
+      user_count: "Jumlah Anggota"
+      bio: "Tentang Kelompok"
       selector_placeholder: "Menambahkan anggota"
       owner: "pemilik"
-      visible: "Grup terlihat oleh semua pengguna"
-      title:
-        other: "Grup"
+      activity: "Aktifitas"
       members: "Anggota"
       topics: "Topik-topik"
-      posts: "Post"
       mentions: "Balasan-balasan"
       messages: "Pesan-pesan"
+      visibility_levels:
+        title: "Siapa yang bisa melihat kelompok ini?"
+        public: "Semua orang"
+        members: "Pemilik kelompok, anggota, dan admin"
+        staff: "Pemilik kelompok dan staf"
+        owners: "Pemilik grup dan admin"
       alias_levels:
-        title: "Siapa yang mendapat pesan dan membalas kelompok ini?"
-        nobody: "Tak seorangpun"
+        messageable: "Siapa yang bisa mengirim pesan pada kelompok ini?"
         only_admins: "Hanya admin"
         mods_and_admins: "Hanya moderator dan Admin"
         members_mods_and_admins: "Hanya anggota grup, moderator dan admin"
@@ -382,6 +414,8 @@ id:
       profile: "Profil"
       mute: "Redam"
       edit: "Ubah Preferensi"
+      download_archive:
+        button_text: "Unduh Semua"
       new_private_message: "Pesan Baru"
       private_message: "pesan"
       private_messages: "Messages"
@@ -413,7 +447,6 @@ id:
       admin: "{{user}} adalah admin"
       moderator_tooltip: "Pengguna ini adalah moderator"
       admin_tooltip: "Pengguna ini adalah admin"
-      blocked_tooltip: "Pengguna ini yang diblokir"
       suspended_notice: "Pengguna ini ditangguhkan sampai {{date}}"
       suspended_reason: "Alasan:"
       github_profile: "Github"
@@ -453,19 +486,28 @@ id:
         move_to_archive: "Arsip"
         failed_to_move: "Gagal memindahkan pesan terpilih (mungkin internet kamu putus ?)"
         select_all: "Pilih Semua"
+      preferences_nav:
+        account: "Akun"
+        profile: "Profil"
+        emails: "Surel"
+        notifications: "Pemberitahuan"
+        categories: "Kategori"
+        interface: "Antarmuka"
+        apps: "Aplikasi"
       change_password:
         success: "(surel terkirim)"
         in_progress: "(mengirimkan surel)"
         error: "(galat)"
         action: "Kirim Email Reset Kata Sandi"
         set_password: "Atur Kata Sandi"
+        choose_new: "Pilih kata sandi baru"
+        choose: "Pilih kata sandi"
       change_about:
         title: "Ganti Tentang Saya"
         error: "Ada kesalahan saat mengganti nilai ini"
       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"
@@ -498,14 +540,17 @@ id:
           other: "Kami akan mengirimkan email kepada anda jika kami tidak melihat anda selama {{count}} menit."
       name:
         title: "Name"
+        instructions: "Nama lengkap anda (opsional)"
         instructions_required: "Nama lengkap anda"
         too_short: "Nama anda terlalu pendek"
         ok: "Nama anda terlihat bagus"
       username:
         title: "Nama Pengguna"
+        instructions: "unik, tidak ada spasi, pendek"
         short_instructions: "Orang dapat menyebut anda sebagai @{{username}}"
         available: "Nama pengguna anda tersedia"
         not_available: "Tidak tersedia. Coba {{suggestion}}?"
+        not_available_no_suggestion: "Tidak tersedia"
         too_short: "Nama pengguna anda terlalu pendek"
         too_long: "Nama pengguna anda terlalu panjang"
         checking: "Memeriksa ketersediaan nama pengguna..."
@@ -540,6 +585,7 @@ id:
       other_settings: "Lainnya"
       categories_settings: "Kategori"
       new_topic_duration:
+        after_1_day: "dibuat hari ini"
         after_2_days: "dibuat 2 hari ini"
         after_1_week: "dibuat minggu ini"
         after_2_weeks: "dibuat 2 minggu ini"
@@ -554,6 +600,9 @@ id:
         after_5_minutes: "setelah 5 menit"
         after_10_minutes: "setelah 10 menit"
       invited:
+        search: "ketik untuk mecari undangan..."
+        title: "Undangan"
+        user: "Pengguna yang telah diundang"
         sent: "Terkirim"
         pending: "Undangan yang tertunda"
         pending_tab: "Tertunda"
@@ -563,6 +612,7 @@ id:
         expired: "Undangan ini sudah kadaluarsa"
         rescind: "Hapus"
         rescinded: "Undangan dihapus"
+        rescind_all: "Hapus semua undangan"
         reinvite: "Kirim Ulang Undangan"
         reinvite_all: "Kirim ulang semua Undangan"
         reinvited: "Undangan sudah dikirim ulang"
@@ -572,8 +622,12 @@ id:
         account_age_days: "Umur akun dalam hari"
         create: "Kirim Undangan"
         generate_link: "Salin Tautan Undangan"
+        link_generated: "Tautan undangan telah sukses dibuat!"
+        valid_for: "Tautan undangan hanya berlaku untuk alamat surel: %{email}"
         bulk_invite:
           text: "Undangan Massal dari Berkas"
+          success: "File telah sukses diunggah, anda akan mendapat pesan pemberitahuan saat proses telah selesai."
+          error: "Maaf, file harus dalam format CSV"
       password:
         title: "Kata sandi"
         too_short: "Password kamu terlalu pendek."
@@ -581,9 +635,14 @@ id:
         same_as_username: "Password dan nama pengguna kamu sama"
         same_as_email: "Password dan email kamu sama"
         ok: "Kata sandi Anda terlihat baik."
+        instructions: "paling tidak %{count} karakter"
       summary:
         title: "Ringkasan"
         stats: "Statistik"
+        topic_count:
+          other: "topik dibuat"
+        post_count:
+          other: "tulisan dibuat"
         days_visited:
           other: "hari berkunjung"
         top_replies: "Balasan Teratas"
@@ -628,7 +687,10 @@ id:
     signup_cta:
       hide_forever: "tidak, terima kasih"
     summary:
+      enable: 'Rangkum Topik Ini'
       disable: 'Tampilkan Semua Postingan'
+    deleted_filter:
+      enable: "Sembunyikan Tulisan Terhapus"
     private_message_info:
       title: "Pesan"
     email: 'Surel'
@@ -652,22 +714,103 @@ id:
       blank_username_or_password: "Silahkan masukkan email atau nama pengguna dan kata sandi anda"
       reset_password: 'Atur Ulang Kata Sandi'
       or: "atau"
+      submit_new_email: "Perbarui Alamat Email"
+      google:
+        title: "dengan Google"
+        message: "Autentikasi dengan Google (pastikan pop up blockers tidak dinyalakan)"
+      google_oauth2:
+        title: "dengan Google"
+        message: "Autentikasi dengan Google (pastikan pop up blockers tidak dinyalakan)"
       twitter:
         title: "dengan Twitter"
+        message: "Autentikasi dengan Twitter (pastikan pop up blockers tidak dinyalakan)"
+      instagram:
+        title: "dengan Instagram"
+        message: "Autentikasi dengan Instagram (pastikan pop up blockers tidak dinyalakan)"
       facebook:
         title: "dengan Facebook"
+        message: "Autentikasi dengan Facebook (pastikan pop up blockers tidak dinyalakan)"
+      yahoo:
+        title: "dengan Yahoo"
+        message: "Autentikasi dengan Yahoo (pastikan pop up blockers tidak dinyalakan)"
+      github:
+        title: "dengan GitHub"
+        message: "Autentikasi dengan GitHub (pastikan pop up blockers tidak dinyalakan)"
+    invites:
+      accept_title: "Undangan"
+      welcome_to: "Selamat datang di %{site_name}!"
+      invited_by: "Anda telah diundang oleh:"
+      accept_invite: "Terima Undangan"
+      name_label: "Nama"
+      password_label: "Atur Kata Sandi"
+    select_kit:
+      filter_placeholder: Cari...
+      create: "Buat {{konten}}"
+    emoji_picker:
+      filter_placeholder: Cari emoji
+      people: Orang
+      nature: Alam
+      food: Makanan
+      activity: Aktifitas
+      objects: Objek
+      celebration: Perayaan
     composer:
+      options: "Pilihan"
+      add_warning: "Ini adalah peringatan resmi."
+      saving_draft_tip: "menyimpan..."
+      saved_draft_tip: "tersimpan"
+      similar_topics: "Topik anda mirip dengan..."
+      error:
+        title_missing: "Judul harus ada"
+        title_too_short: "Judul setidaknya {{min}} karakter"
+        title_too_long: "Judul tidak boleh lebih dari {{max}} karakter"
+        post_missing: "Tulisan tidak boleh kosong"
+        post_length: "Tulisan setidaknya harus {{min}} karakter"
+        try_like: 'Pernahkan anda mencoba tombol <i class="fa fa-heart"></i>?'
+        category_missing: "Anda harus memilih kategori"
+      save_edit: "Simpah Ubahan"
+      reply_original: "Balas pada Topik Asal"
       reply_here: "Balas Disini"
       reply: "Balas"
       cancel: "Batal"
+      create_topic: "Buat Topik"
+      create_pm: "Pesan"
+      title: "Atau tekan Ctrl+Enter"
       users_placeholder: "Tambahkan pengguna"
+      title_placeholder: "Tentang apa diskusi ini dalam satu kalimat pendek?"
+      title_or_link_placeholder: "Ketik judul, atau tempel tautan disini"
+      show_edit_reason: "(tambahkan alasan pengubahan)"
+      topic_featured_link_placeholder: "Masukkan tautan yang terlihat dengan judul."
+      remove_featured_link: "Hapus tautan dari topik"
+      reply_placeholder: "Ketik disini. Gunakan Markdown, BBCode, atau HTML untuk memformat. Tarik atau tempel gambar."
       view_new_post: "Lihat posting baru Anda"
+      saving: "Menyimpan"
+      saved: "Tersimpan!"
+      uploading: "Mengunggah..."
+      show_preview: 'tunjukkan pratinjau &raquo;'
+      hide_preview: '&laquo; sembunyikan pratinjau'
+      bold_label: "B"
       bold_title: "Strong"
+      italic_label: "I"
       italic_title: "Emphasis"
       link_title: "Hyperlink"
+      upload_title: "Unggah"
+      modal_ok: "OK"
       modal_cancel: "Batal"
+      cant_send_pm: "Maaf, anda tidak dapat mengirim pesan kepada %{username}"
+      yourself_confirm:
+        title: "Apakah anda lupa menambahkan penerima?"
     notifications:
+      empty: "Tidak ada pemberitahuan."
       more: "lihat notifikasi sebelumnya"
+      alt:
+        mentioned: "Disebut oleh"
+        replied: "Telah dibalas"
+        posted: "Tulisan oleh"
+        private_message: "Pesan pribadi dari"
+        invited_to_private_message: "Diundang untuk pesan pribadi dari"
+        linked: "Tautkan pada tulisan anda"
+        group_message_summary: "Pesan di kotak pesan grup"
     new_item: "baru"
     topics:
       bulk:
@@ -794,7 +937,6 @@ id:
         check_email:
           title: "Tampilkan alamat email pengguna ini"
       user:
-        suspend_duration_units: "(hari)"
         suspend_reason: "Alasan"
         approve: 'Terima'
         delete: "Hapus Pengguna"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 7ac84a42c8..3b0f445512 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -48,6 +48,9 @@ it:
         x_seconds:
           one: "1s"
           other: "%{count}s"
+        less_than_x_minutes:
+          one: "< 1m"
+          other: "< %{count}m"
         x_minutes:
           one: "1m"
           other: "%{count}m"
@@ -57,6 +60,9 @@ it:
         x_days:
           one: "1g"
           other: "%{count}gg"
+        x_months:
+          one: "1mese"
+          other: "%{count}mesi"
         about_x_years:
           one: "1a"
           other: "%{count}a"
@@ -101,7 +107,6 @@ it:
           other: "%{count} anni dopo"
       previous_month: 'Mese Precedente'
       next_month: 'Mese Successivo'
-      placeholder: Seleziona una data
     share:
       topic: 'Condividi un link a questa conversazione'
       post: 'messaggio n°%{postNumber}'
@@ -148,20 +153,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 +357,9 @@ 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_admission: "Consenti agli utenti di unirsi al gruppo liberamente (Richiede che il gruppo sia visibile a tutti)"
+      public_exit: "Consenti agli utenti di lasciare il gruppo liberamente"
       empty:
         posts: "Non ci sono messaggi da membri di questo gruppo."
         members: "Non ci sono membri in questo gruppo."
@@ -367,31 +371,44 @@ it:
       join: "Partecipa al Gruppo"
       leave: "Abbandona il Gruppo"
       request: "Richiedi di partecipare al gruppo"
+      message: "Messaggio"
       automatic_group: Gruppo Automatico
       closed_group: Gruppo Chiuso
       is_group_user: "Sei un membro di questo gruppo"
       allow_membership_requests: "Permetti agli utenti di richiedere l'invito ai proprietari del gruppo"
+      membership_request_template: "Template personalizzato da mostrare agli utenti quando inviano una richiesta di adesione"
+      membership_request:
+        submit: "Invia Richiesta"
+        title: "Richiesta di adesione a @%{group_name}"
+        reason: "Spiega ai proprietari del gruppo perché vuoi entrare a far parte di questo gruppo"
       membership: "Iscrizione"
       name: "Nome"
       user_count: "Numero di Membri"
       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."
       title:
-        one: "gruppo"
-        other: "gruppi"
+        one: "Group"
+        other: "Gruppi"
       activity: "Attività"
       members: "Membri"
       topics: "Argomenti"
       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?"
+        mentionable: "Chi può @menzionare questo gruppo?"
+        messageable: "Chi può inviare messaggi a questo gruppo?"
         nobody: "Nessuno"
         only_admins: "Solo gli amministratori"
         mods_and_admins: "Solo i moderatori e gli amministratori"
@@ -479,6 +496,7 @@ it:
       topics_entered: "argomenti visualizzati"
       post_count: "n° messaggi"
       confirm_delete_other_accounts: "Sicuro di voler cancellare questi account?"
+      powered_by: "powered by <a href='https://ipinfo.io'>ipinfo.io</a>"
     user_fields:
       none: "(scegli un'opzione)"
     user:
@@ -487,7 +505,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."
@@ -512,12 +530,14 @@ it:
         disable: "Disabilita Notifiche"
         enable: "Abilita Notifiche"
         each_browser_note: "Nota: devi modificare questa impostazione per ogni browser che utilizzi."
+      dismiss: 'Chiudi'
       dismiss_notifications: "Chiudi Tutti"
       dismiss_notifications_tooltip: "Imposta tutte le notifiche non lette come lette "
       first_notification: "La tua prima notifica! Selezionala per iniziare."
       disable_jump_reply: "Non saltare al mio messaggio dopo la mia risposta"
       dynamic_favicon: "Visualizza il conteggio degli argomenti nuovi / aggiornati sull'icona del browser"
       theme_default_on_all_devices: "Rendi questo il mio tema di default su tutti i miei dispositivi"
+      allow_private_messages: "Consenti agli altri utenti di inviarmi messaggi privati"
       external_links_in_new_tab: "Apri tutti i link esterni in nuove schede"
       enable_quoting: "Abilita \"rispondi quotando\" per il testo evidenziato"
       change: "cambia"
@@ -525,8 +545,9 @@ it:
       admin: "{{user}} è un amministratore"
       moderator_tooltip: "Questo utente è un moderatore"
       admin_tooltip: "Questo utente è un amministratore"
-      blocked_tooltip: "Questo utente è bloccato"
+      silenced_tooltip: "Questo utente è  silenziato"
       suspended_notice: "Questo utente è sospeso fino al {{date}}."
+      suspended_permanently: "Questo utente è sospeso."
       suspended_reason: "Motivo: "
       github_profile: "Github"
       email_activity_summary: "Riassunto Attività"
@@ -557,6 +578,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."
@@ -575,6 +597,8 @@ it:
       undo_revoke_access: "Annullare Revoca Accesso"
       api_approved: "Approvato:"
       theme: "Tema"
+      home: "Home Page Predefinita"
+      staged: "Temporaneo"
       staff_counters:
         flags_given: "segnalazioni utili"
         flagged_posts: "messaggi segnalati"
@@ -616,13 +640,13 @@ 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"
         taken: "Spiacenti, questa email non è disponibile."
         error: "C'è stato un errore nel cambio dell'email; potrebbe essere già usata da un altro utente."
         success: "Abbiamo inviato una email a questo indirizzo. Segui le indicazioni di conferma."
+        success_staff: "Abbiamo inviato una email al tuo indirizzo corrente. Segui le istruzioni di conferma."
       change_avatar:
         title: "Cambia l'immagine del tuo profilo"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basato su"
@@ -752,8 +776,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 +792,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."
@@ -778,6 +808,7 @@ it:
         title: "Riepilogo"
         stats: "Statistiche"
         time_read: "tempo di lettura"
+        recent_time_read: "tempo di lettura recente"
         topic_count:
           one: "argomento creato"
           other: "argomenti creati"
@@ -785,14 +816,17 @@ it:
           one: "messaggio creato"
           other: "messaggi creati"
         likes_given:
-          one: "<i class='fa fa-heart'></i> assegnato"
-          other: "<i class='fa fa-heart'></i> assegnati"
+          one: "assegnati"
+          other: "assegnati"
         likes_received:
-          one: "<i class='fa fa-heart'></i> ricevuto"
-          other: "<i class='fa fa-heart'></i> ricevuti"
+          one: "ricevuti"
+          other: "ricevuti"
         days_visited:
           one: "giorno di frequenza"
           other: "giorni di frequenza"
+        topics_entered:
+          one: "argomenti visualizzati"
+          other: "argomenti visualizzati"
         posts_read:
           one: "messaggio letto"
           other: "messaggi letti"
@@ -882,6 +916,10 @@ it:
     mute: Ignora
     unmute: Attiva
     last_post: Ultimo messaggio
+    time_read: Letti
+    time_read_recently: '%{time_read} recentemente'
+    time_read_tooltip: '%{time_read} tempo totale di lettura'
+    time_read_recently_tooltip: '%{time_read} tempo totale di lettura (%{recent_time_read} negli ultimi 60 giorni)'
     last_reply_lowercase: ultima risposta
     replies_lowercase:
       one: risposta
@@ -907,6 +945,7 @@ it:
     private_message_info:
       title: "Messaggio"
       invite: "Invita altri utenti..."
+      leave_message: "Vuoi veramente abbandonare questo messaggio?"
       remove_allowed_user: "Davvero vuoi rimuovere {{name}} da questo messaggio?"
       remove_allowed_group: "Vuoi veramente rimuovere {{name}} da questo messaggio?"
     email: 'Email'
@@ -931,6 +970,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 +986,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 +1024,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 stato 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 +1042,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"
@@ -994,12 +1052,35 @@ it:
       shift: 'Maiusc'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: Selezione...
+      no_content: Nessun risultato trovato
+      filter_placeholder: Ricerca...
+      create: "Crea {{content}}"
+    emoji_picker:
+      filter_placeholder: Ricerca per emoji
+      people: Persone
+      nature: Natura
+      food: Cibo
+      activity: Attività
+      travel: Viaggio
+      objects: Oggetti
+      celebration: Celebrazione
+      custom: Emoji personalizzate
+      recent: Usate recentemente
+      default_tone: Nessun tono della pelle
+      light_tone: Tono della pelle chiaro
+      medium_light_tone: Tono della pelle medio chiaro
+      medium_tone: Tono della pelle medio
+      medium_dark_tone: Tono della pelle medio scuro
+      dark_tone: Tono della pelle scuro
     composer:
       emoji: "Emoji :)"
       more_emoji: "altro..."
       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 +1096,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"
@@ -1030,12 +1112,15 @@ it:
       cancel: "Annulla"
       create_topic: "Crea Argomento"
       create_pm: "Messaggio"
+      create_whisper: "Sussurro"
       title: "O premi Ctrl+Enter"
       users_placeholder: "Aggiunti un utente"
       title_placeholder: "In breve, di cosa tratta questo argomento?"
       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."
+      remove_featured_link: "Rimuovi il collegamento dall'argomento."
       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,12 +1151,7 @@ it:
       olist_title: "Elenco Numerato"
       ulist_title: "Elenco Puntato"
       list_item: "Elemento lista"
-      heading_label: "I"
-      heading_title: "Intestazione"
-      heading_text: "Intestazione"
-      hr_title: "Linea Orizzontale"
       help: "Aiuto Inserimento Markdown"
-      toggler: "nascondi o mostra il pannello di editing"
       modal_ok: "OK"
       modal_cancel: "Annulla"
       cant_send_pm: "Spiacenti, non puoi inviare un messaggio a %{username}."
@@ -1085,28 +1165,29 @@ it:
       empty: "Nessuna notifica trovata."
       more: "visualizza le notifiche precedenti"
       total_flagged: "totale argomenti segnalati"
-      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>"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} e 1 altro</span> {{description}}</p>"
-        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} e {{count}} altri</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>ha accettato il tuo invito</p>"
-      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>"
-      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Nuovo Argomento</span> {{description}}</p>"
+        one: "<span>{{username}}, {{username2}} e {{count}} altri</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} e {{count}} altri</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> ha accettato il tuo invito"
+      moved_post: "<span>{{username}}</span> spostato {{description}}"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "Guadagnato '{{description}}'"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>Nuovo Argomento</span> {{description}}"
       group_message_summary:
-        one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} messaggio nella tua casella {{group_name}}</p>"
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} messaggi nella tua casella {{group_name}}</p>"
+        one: "{{count}} messaggi in arrivo nella casella {{group_name}}"
+        other: "{{count}} messaggi in arrivo nella casella {{group_name}}"
       alt:
         mentioned: "Menzionato da"
         quoted: "Citato da"
@@ -1148,19 +1229,25 @@ 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"
       clear_all: "Cancella Tutto"
       too_short: "La tua chiave di ricerca è troppo corta."
-      result_count:
-        one: "1 risultato per <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} risultati per <span class='term'>\"{{term}}\"</span>"
       title: "cerca argomenti, messaggi, utenti o categorie"
       no_results: "Nessun risultato trovato."
       no_more_results: "Nessun altro risultato trovato."
       searching: "Ricerca in corso..."
       post_format: "#{{post_number}} da {{username}}"
+      results_page: "Risultati della ricerca per '{{term}}'"
+      more_results: "Ci sono più risultati. Restringi i criteri di ricerca."
+      cant_find: "Non riesci a trovare quello che stai cercando?"
+      start_new_topic: "Forse vuoi avviare un nuovo argomento?"
+      or_search_google: "O prova a cercare con Google invece:"
+      search_google: "Prova a cercare con Google invece:"
+      search_google_button: "Google"
+      search_google_title: "Cerca nel sito"
       context:
         user: "Cerca messaggi di @{{username}}"
         category: "Cerca nella categoria #{{category}}"
@@ -1170,25 +1257,19 @@ it:
         title: Ricerca Avanzata
         posted_by:
           label: Pubblicato da
-        in_category:
-          label: Nella Categoria
         in_group:
           label: Nel Gruppo
         with_badge:
           label: Con Distintivo
-        with_tags:
-          label: Con Etichette
         filters:
-          label: 'Mostra solamente argomenti/messaggi:'
           likes: su cui ho messo "Mi Piace"
           posted: ho pubblicato in
           watching: sto osservando
           tracking: sto seguendo
-          private: sono messaggi scritti da me
-          bookmarks: ho aggiunto ai segnalibri
           first: sono il primissimo post
           pinned: sono appuntati
           unpinned: non sono appuntati
+          unseen: non ho letto
           wiki: sono wiki
         statuses:
           label: In cui gli argomenti
@@ -1215,6 +1296,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 +1307,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 +1406,54 @@ 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: "Timer Argomento"
+        save: "Imposta Timer"
+        num_of_hours: "Numero di ore:"
+        remove: "Rimuovi Timer"
+        publish_to: "Pubblica Su:"
+        when: "Quando:"
+        public_timer_types: Timer Argomento
+        private_timer_types: Timer Argomento per Utente
       auto_update_input:
+        none: "Seleziona un lasso di tempo"
+        later_today: "Più tardi oggi"
+        tomorrow: "Domani"
+        later_this_week: "Più tardi questa settimana"
+        this_weekend: "Questo fine settimana"
+        next_week: "La prossima settimana"
+        two_weeks: "Due Settimane"
+        next_month: "Il prossimo mese"
+        three_months: "Tre Mesi"
+        six_months: "Sei Mesi"
+        one_year: "Un Anno"
+        forever: "Per sempre"
+        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 +1484,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 +1523,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 +1541,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 +1608,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:
@@ -1522,7 +1653,6 @@ it:
       multi_select:
         select: 'scegli'
         selected: 'selezionati ({{count}})'
-        select_replies: 'seleziona +risposte'
         delete: elimina i selezionati
         cancel: annulla selezione
         select_all: seleziona tutto
@@ -1534,12 +1664,12 @@ it:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Cita"
-      edit: "Modifica in corso {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Motivo:"
       post_number: "messaggio {{number}}"
       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,18 +1724,13 @@ 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"
         undelete: "recupera questo messaggio"
         share: "condividi un collegamento a questo messaggio"
         more: "Di più"
-        delete_replies:
-          confirm:
-            one: "Vuoi anche cancellare la risposta diretta a questo post?"
-            other: "Vuoi anche cancellare le {{count}} risposte dirette a questo messaggio?"
-          yes_value: "Si, cancella anche le risposte"
-          no_value: "No, solo questo messaggio"
         admin: "azioni post-amministrazione"
         wiki: "Rendi Wiki"
         unwiki: "Rimuovi Wiki"
@@ -1617,8 +1742,8 @@ it:
       actions:
         flag: 'Segnala'
         defer_flags:
-          one: "Ignora segnalazione"
-          other: "Annulla segnalazioni"
+          one: "Ignore flag"
+          other: "Ignora le segnalazioni"
         undo:
           off_topic: "Rimuovi segnalazione"
           spam: "Rimuovi segnalazione"
@@ -1634,6 +1759,9 @@ it:
           notify_user: "hanno inviato un messaggio"
           bookmark: "l'hanno aggiunto ai segnalibri"
           like: "hanno messo \"Mi piace\""
+          like_capped:
+            one: "e a {{count}} persona è piaciuto"
+            other: "e ad altre {{count}} persone è piaciuto"
           vote: "hanno votato"
         by_you:
           off_topic: "L'hai segnalato come fuori tema"
@@ -1694,10 +1822,6 @@ it:
           vote:
             one: "Una persona ha votato per questo post"
             other: "{{count}} persone hanno votato per questo post"
-      delete:
-        confirm:
-          one: "Sei sicuro di voler cancellare questo messaggio?"
-          other: "Sei sicuro di voler cancellare tutti questi messaggi?"
       merge:
         confirm:
           one: "Sicuro di voler unire questi messaggi?"
@@ -1724,6 +1848,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 +1871,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 +1908,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 +1953,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 +1965,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 +2002,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 +2055,7 @@ it:
     history: "Storia"
     changed_by: "da {{author}}"
     raw_email:
+      title: "Email In Arrivo"
       not_available: "Non disponibile!"
     categories_list: "Lista Categorie"
     filters:
@@ -2016,7 +2167,7 @@ it:
         hamburger_menu: '<b>=</b> Apri il menu hamburger'
         user_profile_menu: '<b>p</b> Apri menu utente'
         show_incoming_updated_topics: '<b>.</b> Mostra argomenti aggiornati'
-        search: '<b>/</b> Cerca'
+        search: '<b>/</b> o <b>ctrl</b>+<b>alt</b>+<b>f</b> Cerca'
         help: '<b>?</b> Apri la legenda tasti'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Chiudi Nuovi Messaggi'
         dismiss_topics: '<b>x</b>, <b>t</b> Chiudi Argomenti'
@@ -2049,6 +2200,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"
@@ -2086,9 +2238,11 @@ it:
       selector_no_tags: "nessuna etichetta"
       changed: "etichette cambiate:"
       tags: "Etichette"
-      choose_for_topic: "scegli delle etichette opzionali per questo argomento"
       delete_tag: "Cancella Etichetta"
-      delete_confirm: "Sicuro di voler cancellare questa etichetta?"
+      delete_confirm:
+        one: "Sei sicuro di voler eliminare questa etichetta e rimuoverla da {{count}} argomenti a cui è assegnata?"
+        other: "Sei sicuro di voler eliminare questa etichetta e rimuoverla da {{count}} argomenti a cui è assegnata?"
+      delete_confirm_no_topics: "Sei sicuro di voler eliminare questa etichetta?"
       rename_tag: "Rinomina Etichetta"
       rename_instructions: "Scegli un altro nome per l'etichetta:"
       sort_by: "Ordina per:"
@@ -2183,7 +2337,7 @@ it:
         no_problems: "Nessun problema rilevato."
         moderators: 'Moderatori:'
         admins: 'Amministratori:'
-        blocked: 'Bloccati:'
+        silenced: 'Silenziati:'
         suspended: 'Sospesi: '
         private_messages_short: "MP"
         private_messages_title: "Messaggi"
@@ -2216,24 +2370,24 @@ it:
         by: "da"
       flags:
         title: "Segnalazioni"
-        old: "Vecchi"
-        active: "Attivi"
+        active_posts: "Messaggi Segnalati"
+        old_posts: "Vecchi Messaggi Segnalati"
+        topics: "Argomenti Segnalati"
         agree: "Acconsento"
         agree_title: "Conferma che questa segnalazione è valida e corretta"
-        agree_flag_modal_title: "Acconsento e..."
-        agree_flag_hide_post: "D'accordo (nascondi il messaggio e invia MP)"
-        agree_flag_hide_post_title: "Nascondi questo messaggio e invia automaticamente all'utente un messaggio chiedendogli di modificarlo"
-        agree_flag_restore_post: "D'accordo (ripristina messaggio)"
-        agree_flag_restore_post_title: "Ripristina questo messaggio"
-        agree_flag: "Accetta la segnalazione"
-        agree_flag_title: "Accetta la segnalazione e non modificare il messaggio"
+        agree_flag_hide_post: "Accetta e Nascondi il Messaggio"
+        agree_flag_hide_post_title: "Nascondi questo messaggio e invia automaticamente all'utente un messaggio privato che lo invita a modificarlo."
+        agree_flag_restore_post: "Accetta e Ripristina il Messaggio"
+        agree_flag_restore_post_title: "Ripristina il messaggio in modo che tutti gli utenti possano vederlo."
+        agree_flag: "Accetto e Mantieni il Messaggio"
+        agree_flag_title: "Accetta la segnalazione e mantieni invariato il messaggio."
         defer_flag: "Ignora"
         defer_flag_title: "Rimuovi segnalazione; non è necessaria alcuna azione questa volta."
         delete: "Cancella"
         delete_title: "Cancella il messaggio a cui si riferisce la segnalazione."
-        delete_post_defer_flag: "Cancella il messaggio e Ignora la segnalazione"
+        delete_post_defer_flag: "Elimina il Messaggio e Ignora la segnalazione"
         delete_post_defer_flag_title: "Cancella il messaggio: se è il primo, cancella l'argomento"
-        delete_post_agree_flag: "Elimina messaggio e Accetta la segnalazione"
+        delete_post_agree_flag: "Elimina il Messaggio e Accetta la segnalazione"
         delete_post_agree_flag_title: "Cancella il messaggio: se è il primo, cancella l'argomento"
         delete_flag_modal_title: "Cancella e..."
         delete_spammer: "Cancella lo Spammer"
@@ -2245,6 +2399,8 @@ it:
         clear_topic_flags: "Fatto"
         clear_topic_flags_title: "L'argomento è stato esaminato e i problemi risolti. Clicca su Fatto per rimuovere le segnalazioni."
         more: "(altre risposte...)"
+        suspend_user: "Sospendi Utente"
+        suspend_user_title: "Sospendi l'utente per questo messaggio"
         dispositions:
           agreed: "accettate"
           disagreed: "non accettate"
@@ -2255,27 +2411,25 @@ it:
         system: "Sistema"
         error: "Qualcosa non ha funzionato"
         reply_message: "Rispondi"
-        no_results: "Non ci sono segnalazioni."
+        no_results: "Non ci sono messaggi segnalati."
         topic_flagged: "Questo <strong>argomento</strong> è stato segnalato."
+        show_full: "mostra messaggio completo"
         visit_topic: "Visita l'argomento per intervenire"
         was_edited: "Il messaggio è stato modificato dopo la prima segnalazione"
         previous_flags_count: "Questo messaggio è stato già segnalato {{count}} volte."
-        summary:
-          action_type_3:
-            one: "off-topic "
-            other: "fuori tema x{{count}}"
-          action_type_4:
-            one: "inappropriato"
-            other: "inappropriati x{{count}}"
-          action_type_6:
-            one: "personalizzato"
-            other: "personalizzati x{{count}}"
-          action_type_7:
-            one: "personalizzato"
-            other: "personalizzati x{{count}}"
-          action_type_8:
-            one: "spam"
-            other: "spam x{{count}}"
+        show_details: "Mostra i dettagli della segnalazione"
+        details: "dettagli"
+        flagged_topics:
+          topic: "Argomento"
+          type: "Tipo"
+          users: "Utenti"
+          last_flagged: "Ultima Segnalazione"
+        short_names:
+          off_topic: "fuori tema"
+          inappropriate: "inappropriato"
+          spam: "spam"
+          notify_user: "personalizzato"
+          notify_moderators: "personalizzato"
       groups:
         primary: "Gruppo Primario"
         no_primary: "(nessun gruppo primario)"
@@ -2294,6 +2448,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 +2461,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 +2494,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:
@@ -2354,7 +2517,6 @@ it:
           details: "Quando c'è una nuova risposta, modifica, cancellazione o recupero."
         user_event:
           name: "Evento Utente"
-          details: "Quando un utente viene creato, approvato o aggiornato."
         delivery_status:
           title: "Stato di Consegna"
           inactive: "Non attivo"
@@ -2435,6 +2597,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 +2630,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 +2664,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 modificato 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 +2840,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"
@@ -2657,8 +2878,8 @@ it:
             change_category_settings: "cambia le impostazioni della categoria"
             delete_category: "cancella categoria"
             create_category: "crea categoria"
-            block_user: "blocca utente"
-            unblock_user: "sblocca utente"
+            silence_user: "utente in silenzio"
+            unsilence_user: "utente non silenziato"
             grant_admin: "assegna amministrazione"
             revoke_admin: "revoca amministrazione"
             grant_moderation: "assegna moderazione"
@@ -2674,6 +2895,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."
@@ -2690,8 +2913,8 @@ it:
           description: 'Gli indirizzi IP che sono sotto controllo. Usa "Permetti" per inserirli nella lista bianca.'
           delete_confirm: "Davvero vuoi rimuovere la regola per %{ip_address}?"
           roll_up_confirm: "Sicuro di voler raggruppare in sottoreti gli indirizzi IP schermati normalmente?"
-          rolled_up_some_subnets: "L'elenco di indirizzi IP interdetti sono stati sintetizzati con successo: %{subnets}."
-          rolled_up_no_subnet: "Non c'era nulla da sintetizzare."
+          rolled_up_some_subnets: " L'elenco di indirizzi IP interdetti sono stati sintetizzati correttamente:  %{subnets}."
+          rolled_up_no_subnet: "Non c'era nulla da sintetizzare"
           actions:
             block: "Blocca"
             do_nothing: "Permetti"
@@ -2704,8 +2927,40 @@ it:
           roll_up:
             text: "Sintetizza"
             title: "Crea nuovi elenchi di indirizzi IP interdetti se ci sono almeno 'min_ban_entries_for_roll_up' elementi."
+        search_logs:
+          title: "Log Ricerca"
+          term: "Termine"
+          searches: "Ricerche"
+          click_through: "Cliccate"
+          unique: "Unico"
         logster:
           title: "Log Errori"
+      watched_words:
+        title: "Parole Osservate"
+        search: "ricerca"
+        clear_filter: "Pulisci"
+        show_words: "mostra le parole"
+        word_count:
+          one: "1 word"
+          other: "%{count} parole"
+        actions:
+          block: 'Blocca'
+          censor: 'Censura'
+          require_approval: 'Richiede Approvazione'
+          flag: 'Segnala'
+        action_descriptions:
+          block: 'Impedisci che i messaggi contenenti queste parole siano pubblicati. L''utente visualizzerà un messaggio di errore quando cercherà di pubblicare il messaggio.'
+          censor: 'Consenti i messaggi contenenti queste parole, ma sostituiscile con caratteri che nascondono le parole censurate.'
+          require_approval: 'I messaggi contenenti queste parole richiederanno l''approvazione dello staff prima di poter essere visualizzati.'
+          flag: 'Consenti i messaggi contenenti queste parole, ma segnalale come inappropriate in modo che i moderatori possano revisionarle.'
+        form:
+          label: 'Nuova Parola:'
+          placeholder: 'parola completa o * come carattere jolly'
+          placeholder_regexp: "espressione regolare"
+          add: 'Aggiungi'
+          success: 'Successo'
+          upload: "Carica"
+          upload_successful: "Caricamento andato a buon fine. Le parole sono state aggiunte."
       impersonate:
         title: "Impersona"
         help: "Usa questo strumento per impersonare un account utente ai fini del debugging. Una volta finito dovrai disconnetterti."
@@ -2725,7 +2980,7 @@ it:
           pending: "In attesa"
           staff: 'Staff'
           suspended: 'Sospesi'
-          blocked: 'Bloccati'
+          silenced: 'Silenziato'
           suspect: 'Sospetti'
         approved: "Approvato?"
         approved_selected:
@@ -2746,7 +3001,7 @@ it:
           staff: "Staff"
           admins: 'Utenti Amministratori'
           moderators: 'Moderatori'
-          blocked: 'Utenti Bloccati'
+          silenced: 'Utenti Silenziati'
           suspended: 'Utenti Sospesi'
           suspect: 'Utenti Sospetti'
         reject_successful:
@@ -2763,33 +3018,48 @@ it:
         suspend_failed: "Si è verificato un errore sospendendo questo utente {{error}}"
         unsuspend_failed: "Si è verificato un errore riabilitando questo utente {{error}}"
         suspend_duration: "Per quanto tempo l'utente sarà sospeso?"
-        suspend_duration_units: "(giorni)"
         suspend_reason_label: "Perché lo stai sospendendo? Questo testo <b>sarà visibile a tutti</b> nella pagina del profilo dell'utente, e gli verrà mostrato tutte le volte che si connetterà. Scrivi il meno possibile."
+        suspend_reason_hidden_label: "Perché stai sospendendo l'utente? Questo testo verrà mostrato all'utente quando cercherà di accedere. Mantienilo breve."
         suspend_reason: "Motivo"
+        suspend_reason_placeholder: "Motivo Sospensione"
+        suspend_message: "Messaggio Email"
+        suspend_message_placeholder: "Facoltativamente, fornisci ulteriori informazioni sulla sospensione e verranno inviate via email all'utente."
         suspended_by: "Sospeso da"
+        silence_reason: "Motivo"
+        silenced_by: "Silenziato Da"
+        silence_modal_title: "Utente in Silenzio"
+        silence_duration: "Per quanto tempo l'utente sarà silenziato? "
+        silence_reason_label: "Perché stai silenziando questo utente?"
+        silence_reason_placeholder: "Motivo Silenzio"
+        silence_message: "Messaggio Email"
+        silence_message_placeholder: "(lasciare vuoto per inviare il messaggio predefinito)"
+        suspended_until: "(fino %{until})"
+        cant_suspend: "Questo utente non può essere sospeso."
         delete_all_posts: "Cancella tutti i messaggi"
         delete_all_posts_confirm_MF: "Stai per cancellare {POSTS, plural, one {1 messaggio} other {# messaggi}} e {TOPICS, plural, one {1 argomento} other {# argomenti}}. Sei sicuro?"
-        suspend: "Sospendi"
-        unsuspend: "Riabilita"
-        suspended: "Sospeso?"
+        silence: "Silenzio"
+        unsilence: "Non in silenzio"
+        silenced: "Silenziato?"
         moderator: "Moderatore?"
         admin: "Amministratore?"
-        blocked: "Bloccato?"
+        suspended: "Sospeso?"
         staged: "Temporaneo?"
         show_admin_profile: "Amministratore"
         refresh_browsers: "Forza l'aggiornamento del browser"
         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'
-        block: 'Blocca'
+        unsuspend: 'Riabilita'
+        suspend: 'Sospendi'
         reputation: Reputazione
         permissions: Permessi
         activity: Attività
@@ -2836,17 +3106,18 @@ it:
         activate_failed: "Si è verificato un problema nell'attivazione dell'utente."
         deactivate_account: "Disattiva Account"
         deactivate_failed: "Si è verificato un errore durante la disattivazione dell'utente."
-        unblock_failed: 'Si è verificato un errore durante lo sblocco dell''utente.'
-        block_failed: 'Si è verificato un errore durante il blocco dell''utente.'
-        block_confirm: 'Sei sicuro di voler bloccare questo utente? Non sarà più in grado di creare alcun nuovo argomento o messaggio.'
-        block_accept: 'Sì, blocca questo utente'
+        unsilence_failed: 'Si è verificato un errore mentre si de-silenziava l''utente.'
+        silence_failed: 'Si è verificato un errore mentre si silenziava l''utente'
+        silence_confirm: 'Sei sicuro di voler silenziare questo utente? Non sarà più in grado di creare alcun nuovo argomento o messaggio.'
+        silence_accept: 'Sì, silenzia questo utente'
         bounce_score: "Errori di Ritorno"
         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."
+        silence_explanation: "Un utente silenziato non può pubblicare messaggi o iniziare argomenti. "
         staged_explanation: "Un utente temporaneo può pubblicare via email solo in alcuni argomenti."
         bounce_score_explanation:
           none: "L'indirizzo email non ha causato nessun errore di ritorno recentemente."
@@ -2964,6 +3235,7 @@ it:
           developer: 'Sviluppatore'
           embedding: "Incorporo"
           legal: "Legale"
+          api: 'API'
           user_api: 'API Utente'
           uncategorized: 'Altro'
           backups: "Backup"
@@ -3054,6 +3326,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 +3346,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"
@@ -3098,8 +3373,8 @@ it:
       uploading: "Caricamento..."
       quit: "Forse Dopo"
       staff_count:
-        one: "La tua comunità ha 1 membro dello staff."
-        other: "La tua comunità ha %{count} membri dello staff."
+        one: "Your community has 1 staff (you). "
+        other: "La tua comunità ha %{count} membri dello staff, te incluso."
       invites:
         add_user: "aggiungi"
         none_added: "Non hai invitato nessuno dello staff. Sicuro di voler proseguire?"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index fad82ec410..9083af4c3a 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -25,40 +25,44 @@ ja:
         thousands: "{{number}}k"
         millions: "{{number}}M"
     dates:
-      time: "h:mm a"
-      timeline_date: "YYYY MMM"
-      long_no_year: "MMM D h:mm a"
-      long_no_year_no_time: "MMM D"
+      time: "a h:mm"
+      timeline_date: "YYYY年 MMM"
+      long_no_year: "MMM Do a h:mm"
+      long_no_year_no_time: "MMM Do"
       full_no_year_no_time: "MMMM Do"
-      long_with_year: "YYYY, MMM D h:mm a"
-      long_with_year_no_time: "YYYY, MMM D"
-      full_with_year_no_time: "MMMM Do, YYYY"
-      long_date_with_year: "MMM D, 'YY LT"
-      long_date_without_year: "MMM D, LT"
-      long_date_with_year_without_time: "MMM D, 'YY"
-      long_date_without_year_with_linebreak: "MMM D <br/>LT"
-      long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
+      long_with_year: "YYYY年 MMM Do a h:mm"
+      long_with_year_no_time: "YYYY年 MMM Do"
+      full_with_year_no_time: "YYYY年 MMMM Do"
+      long_date_with_year: "'YY MMM Do LT"
+      long_date_without_year: "MMM Do LT"
+      long_date_with_year_without_time: "'YY MMM Do"
+      long_date_without_year_with_linebreak: "MMM Do <br/>LT"
+      long_date_with_year_with_linebreak: "'YY MMM Do <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}秒"
+        less_than_x_minutes:
+          other: "%{count}分以内"
         x_minutes:
-          other: "%{count}分前"
+          other: "%{count}分"
         about_x_hours:
           other: "%{count}時間"
         x_days:
           other: "%{count}日"
+        x_months:
+          other: "%{count}月"
         about_x_years:
           other: "%{count}年"
         over_x_years:
-          other: "%{count}年以上前"
+          other: "%{count}年以上"
         almost_x_years:
-          other: "%{count}年"
-        date_month: "MMM D日"
-        date_year: "MMM 'YY"
+          other: "約%{count}年"
+        date_month: "MMM Do"
+        date_year: "'YY MMM"
       medium:
         x_minutes:
           other: "%{count}分"
@@ -83,6 +87,7 @@ ja:
           other: "%{count}年後"
       previous_month: '前の月'
       next_month: '次の月'
+      placeholder: 日付
     share:
       topic: 'このトピックのリンクをシェアする'
       post: '投稿 #%{postNumber}'
@@ -94,8 +99,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}にオープンしました'
@@ -106,31 +114,41 @@ ja:
         enabled: '%{when}にアーカイブしました'
         disabled: '%{when}にアーカイブを解除しました'
       pinned:
-        enabled: '固定しました: %{when}'
-        disabled: '%{when}に固定を解除しました'
+        enabled: '固定表示しました: %{when}'
+        disabled: '%{when}に固定表示を解除しました'
       pinned_globally:
-        enabled: '%{when}に全体への固定をしました'
-        disabled: '%{when}に全体への固定を解除しました'
+        enabled: '%{when}に全体での固定表示をしました'
+        disabled: '%{when}に全体での固定表示を解除しました'
       visible:
         enabled: 'リストに表示: %{when}'
         disabled: 'リストから非表示: %{when}'
+      banner:
+        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を付与し、毎日更新がメールで届けられます。これらの機能は総ユーザー数が%{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 (Ohio)"
+        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: "いいえ"
@@ -159,11 +177,11 @@ ja:
     or: "あるいは"
     now: "たった今"
     read_more: 'もっと読む'
-    more: "もっと見る"
-    less: "Less"
+    more: "増やす"
+    less: "減らす"
     never: "never"
     every_30_minutes: "30分毎"
-    every_hour: "1時間毎"
+    every_hour: "毎時"
     daily: "毎日"
     weekly: "毎週"
     every_two_weeks: "隔週"
@@ -188,6 +206,7 @@ ja:
       like_count: "いいね！"
       topic_count: "トピック"
       post_count: "投稿"
+      user_count: "ユーザー"
       active_user_count: "アクティブユーザー"
       contact: "お問い合わせ"
       contact_info: "このサイトに影響を与える重要な問題や緊急の問題が発生した場合は、 %{contact_info}までご連絡ください"
@@ -225,6 +244,8 @@ ja:
     undo: "取り消す"
     revert: "戻す"
     failed: "失敗"
+    switch_to_anon: "匿名モードにする"
+    switch_from_anon: "匿名モードから抜ける"
     banner:
       close: "バナーを閉じる。"
       edit: "このバナーを編集 >>"
@@ -286,29 +307,80 @@ 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_admission: "ユーザーがグループへ自由に参加できるようにする (一般公開グループである必要があります)"
+      public_exit: "ユーザーがグループから自由に離脱できるようにする"
+      empty:
+        posts: "このグループのメンバーによる投稿はありません。"
+        members: "このグループにはメンバーがいません。"
+        mentions: "このグループに対するメンションはありません。"
+        messages: "このグループへのメッセージはありません。"
+        topics: "このグループのメンバーによるトピックはありません。"
+        logs: "このグループに関するログはありません。"
       add: "追加"
+      join: "グループに参加"
+      leave: "グループから離脱"
+      request: "グループへの参加をリクエスト"
+      message: "メッセージ"
       automatic_group: 自動作成グループ
       closed_group: クローズドグループ
+      is_group_user: "このグループのメンバーです"
+      allow_membership_requests: "ユーザーがグループオーナーにメンバーシップリクエストを送信できるようにする"
+      membership_request_template: "メンバーシップリクエスト送信時に表示するカスタムテンプレート"
+      membership_request:
+        submit: "リクエストを送信"
+        title: "参加をリクエスト @%{group_name}"
+        reason: "グループに参加したい旨をグループオーナーに伝える"
       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: "誰がこのグループにメッセージや@メンションが送れますか?"
+        mentionable: "誰がこのグループに@メンションを送れますか?"
+        messageable: "誰がこのグループにメッセージを送れますか?"
         nobody: "無し"
         only_admins: "管理者のみ"
         mods_and_admins: "管理者とモデレータのみ"
@@ -320,12 +392,28 @@ ja:
       notifications:
         watching:
           title: "ウォッチ中"
+          description: "全てのメッセージについて通知があり、新規返信数が表示されます。"
+        watching_first_post:
+          title: "最初の投稿をウォッチする"
+          description: "グループ内の新規トピックに対する最初の投稿のみ通知されます。"
         tracking:
           title: "追跡中"
+          description: "誰かがあなた宛に返信をすると通知があり、新規返信数が表示されます。"
         regular:
           title: "デフォルト"
+          description: "他のユーザからメンションされた場合か、メッセージ内の投稿に返信された場合に通知されます。"
         muted:
           title: "ミュート"
+          description: "グループ内の新規トピックについては何も通知されません。"
+      flair_url: "アバター画像"
+      flair_url_placeholder: "(オプション) 画像URL or Font Awesomeのクラス名"
+      flair_bg_color: "アバターの背景色"
+      flair_bg_color_placeholder: "(オプション) HEXカラー値"
+      flair_color: "アバター色"
+      flair_color_placeholder: "(オプション) HEXカラー値"
+      flair_preview_icon: "アイコンプレビュー"
+      flair_preview_image: "画像プレビュー"
+      flair_note: "アバターはユーザーのプライマリーグループにだけ表示されます。"
     user_action_groups:
       '1': "「いいね！」 "
       '2': "「いいね！」 された"
@@ -349,6 +437,7 @@ ja:
         title: "カテゴリの並び替え"
         title_long: "カテゴリリストを並べ直します"
         fix_order: "位置を修正"
+        fix_order_tooltip: "全てのカテゴリーは唯一である番地を持っていないので、予期せぬ結果を引き起こすかもしれません。"
         save: "順番を保存"
         apply_all: "適用"
         position: "位置"
@@ -358,6 +447,8 @@ ja:
       latest_by: "最新投稿: "
       toggle_ordering: "カテゴリの並び替えモードを切り替え"
       subcategories: "サブカテゴリ:"
+      topic_sentence:
+        other: "%{count}トピック群"
       topic_stat_sentence:
         other: "過去 %{unit} 間 %{count} 個の新着トピック。"
     ip_lookup:
@@ -367,7 +458,7 @@ ja:
       location_not_found: （不明）
       organisation: 組織
       phone: 電話
-      other_accounts: "同じIPアドレスを持つアカウント"
+      other_accounts: "同じIPアドレスを持つアカウント:"
       delete_other_accounts: "%{count}件削除"
       username: "ユーザー名"
       trust_level: "トラストレベル"
@@ -375,6 +466,7 @@ ja:
       topics_entered: "入力したトピック"
       post_count: "# 投稿"
       confirm_delete_other_accounts: "これらのアカウントを削除してもよろしいですか?"
+      powered_by: "powered by <a href='https://ipinfo.io'>ipinfo.io</a>"
     user_fields:
       none: "(オプションを選択)"
     user:
@@ -382,6 +474,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 +502,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: "変更"
@@ -414,7 +513,6 @@ ja:
       admin: "{{user}} は管理者です"
       moderator_tooltip: "このユーザーはモデレータです"
       admin_tooltip: "このユーザーは管理者です"
-      blocked_tooltip: "このユーザーはブロックされています"
       suspended_notice: "このユーザーは {{date}} まで凍結状態です。"
       suspended_reason: "理由: "
       github_profile: "Github"
@@ -426,9 +524,25 @@ ja:
           この設定は、アクティビティの情報機能を無効化します。<br />
           ミュートしているトピックやカテゴリはこれらのメールには含まれません。
         individual: "新しい投稿がある場合にメールで送る"
+        individual_no_echo: "自分以外の新しい投稿がある場合にメールで送る"
+        many_per_day: "投稿される度にメールで通知を受け取る (日に {{dailyEmailEstimate}} 回程度)"
+        few_per_day: "投稿される度にメールで通知を受け取る (日に2回程度)"
+      tag_settings: "タグ"
+      watched_tags: "ウォッチ中"
+      watched_tags_instructions: "自動的にこれらのタグが付いた全てのトピックをウォッチします。全ての新規投稿と新規トピックが通知されまた、新規投稿数がトピックの隣に表示されます。"
+      muted_tags: "通知しない"
+      muted_tags_instructions: "これらのタグが付いたトピックについて何も通知されず、また新着にも表示されません。"
       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,9 +553,17 @@ ja:
       muted_users: "ミュート"
       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: "通報した投稿"
+        flagged_posts: "通報された投稿"
         deleted_posts: "削除された投稿"
         suspensions: "凍結"
         warnings_received: "警告"
@@ -456,25 +578,37 @@ ja:
         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: "メールアドレスを変更"
         taken: "このメールアドレスは既に使われています。"
         error: "メールアドレス変更中にエラーが発生しました。既にこのアドレスが使われているのかもしれません。"
         success: "このアドレスにメールを送信しました。メールの指示に従って確認処理を行ってください。"
+        success_staff: "現在のメールアドレスにメールを送信しました。メールに従い手続きをおこなってください。"
       change_avatar:
         title: "プロフィール画像を変更"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>から取得、基準は"
@@ -495,21 +629,26 @@ ja:
         instructions: "背景画像は、幅590pxで中央揃えになります"
       email:
         title: "メールアドレス"
+        instructions: "外部には公開されません"
         ok: "確認用メールを送信します"
         invalid: "正しいメールアドレスを入力してください"
         authenticated: "あなたのメールアドレスは {{provider}} によって認証されています"
+        frequency_immediately: "あなたがまだ読んでいない未送信分の内容について今すぐメールを送ります。"
         frequency:
           other: "最後に利用されてから{{count}}分以上経過した場合にメールを送ります。"
       name:
         title: "名前"
+        instructions: "氏名(任意)"
         instructions_required: "氏名"
         too_short: "名前が短いです"
         ok: "問題ありません"
       username:
         title: "ユーザー名"
+        instructions: "被らず、空白を含まず、短い名前を入力してください。"
         short_instructions: "@{{username}} であなたにメンションを送ることができます"
         available: "ユーザ名は利用可能です"
-        not_available: "利用出来ない名前です。 {{suggestion}} などはどうでしょうか？"
+        not_available: "利用できない名前です。 {{suggestion}} などはどうでしょうか？"
+        not_available_no_suggestion: "そのユーザー名は利用できません"
         too_short: "ユーザ名が短すぎます"
         too_long: "ユーザ名が長すぎます"
         checking: "ユーザ名が利用可能か確認しています..."
@@ -518,6 +657,7 @@ ja:
         title: "表示する言語"
         instructions: "ユーザインターフェイスの言語です。ページを再読み込みした際に変更されます。"
         default: "(デフォルト)"
+        any: "任意"
       password_confirmation:
         title: "もう一度パスワードを入力してください。"
       last_posted: "最後の投稿"
@@ -533,21 +673,29 @@ ja:
       like_notification_frequency:
         title: "いいねされた時に通知"
         always: "常時"
+        first_time_and_daily: "その日の最初の「いいね！」"
+        first_time: "最初の「いいね！」"
+        never: "通知しない"
       email_previous_replies:
         title: "メールの文章の下部に以前の返信を含める"
-        always: "常に"
+        unless_emailed: "最初だけ"
+        always: "常に含める"
+        never: "含めない"
       email_digests:
+        title: "しばらくここを訪れなかったときは、人気のトピックと返信のサマリーをメールで送信する。"
         every_30_minutes: "30分毎"
         every_hour: "1時間毎"
         daily: "毎日"
         every_three_days: "3日毎"
         weekly: "毎週"
         every_two_weeks: "2週間に1回"
+      include_tl0_in_digests: "サマリーをメールする際、新しいユーザーのコンテンツを含める"
+      email_in_reply_to: "メールに投稿への返信の抜粋を含める"
       email_direct: "誰かが投稿を引用した時、投稿に返信があった時、私のユーザ名にメンションがあった時、またはトピックへの招待があった時にメールで通知を受け取る。"
       email_private_messages: "メッセージを受け取ったときにメールで通知を受け取る。"
       email_always: "常にメールへ通知を送る"
       other_settings: "その他"
-      categories_settings: "カテゴリ設定"
+      categories_settings: "カテゴリの設定"
       new_topic_duration:
         label: "以下の条件でトピックを新規と見なす"
         not_viewed: "未読"
@@ -567,33 +715,47 @@ ja:
         after_4_minutes: "4分後"
         after_5_minutes: "5分後"
         after_10_minutes: "10分後"
+      notification_level_when_replying: "トピックに投稿するときは、トピックを"
       invited:
         search: "招待履歴を検索"
         title: "招待"
         user: "招待したユーザ"
+        sent: "送信済み"
         none: "保留中の招待はありません。"
         truncated:
           other: "{{count}} 件の招待を表示しています。"
-        redeemed: "受け取られた招待"
-        redeemed_tab: "受け取られた"
-        redeemed_at: "受け取り日"
+        redeemed: "招待を確認する"
+        redeemed_tab: "確認済み"
+        redeemed_tab_with_count: "確認済み ({{count}})"
+        redeemed_at: "確認済み"
         pending: "保留中の招待"
         pending_tab: "保留中"
+        pending_tab_with_count: "保留中 ({{count}})"
         topics_entered: "閲覧したトピックの数"
         posts_read_count: "読んだ投稿"
         expired: "この招待の有効期限が切れました。"
         rescind: "削除"
         rescinded: "取り消された招待"
-        reinvite: "招待を再送信する"
-        reinvited: "招待を再度送りました。"
-        time_read: "リード時間"
-        days_visited: "訪問日数"
+        rescind_all: "全ての招待の取り消し"
+        rescinded_all: "全ての招待を取り消しました!"
+        rescind_all_confirm: "本当にすべての招待を取り消したいですか？"
+        reinvite: "もう一度招待する"
+        reinvite_all: "全ての招待をもう一度"
+        reinvite_all_confirm: "本当に全ての招待を再送したいですか?"
+        reinvited: "再度招待しました"
+        reinvited_all: "全ての招待をもう一度行いました"
+        time_read: "リードタイム"
+        days_visited: "閲覧された日数"
         account_age_days: "アカウント有効日数"
-        create: "招待を送る"
+        create: "招待する"
         generate_link: "招待リンクをコピー"
+        link_generated: "招待リンクが生成されました！"
+        valid_for: "招待リンクはこのメールアドレスにだけ有効です。%{email}"
         bulk_invite:
-          text: "ファイルからまとめて招待をする"
-          success: "ファイルは無事にアップロードされました。完了されましたらメッセージでお知らせをさせていただきます。"
+          none: "まだ誰も招待していません。個々に招待するか、<a href='https://meta.discourse.org/t/send-bulk-invites/16468'>CSVファイルをアップロード</a>して、まとめて招待しましょう。"
+          text: "ファイルからまとめて招待する"
+          success: "ファイルは無事にアップロードされました。処理が完了したらメッセージでお知らせします。"
+          error: "申し訳ありません、ファイルはCSV形式である必要があります。"
       password:
         title: "パスワード"
         too_short: "パスワードが短すぎます。"
@@ -601,30 +763,37 @@ ja:
         same_as_username: "パスワードがユーザ名と一致しています"
         same_as_email: "パスワードとメールアドレスが一致しています"
         ok: "パスワード OK。"
+        instructions: "最低 %{count} 文字以上"
       summary:
-        title: "情報"
+        title: "サマリー"
         stats: "統計"
         time_read: "読んだ時間"
         topic_count:
           other: "つのトピックを作成"
         post_count:
           other: "つの投稿"
-        likes_given:
-          other: "あげた <i class='fa fa-heart'></i>"
-        likes_received:
-          other: "もらった <i class='fa fa-heart'></i>"
         days_visited:
           other: "訪問日数"
         posts_read:
           other: "読んだ投稿"
         bookmark_count:
           other: "つのブックマーク"
+        top_replies: "返信上位"
         no_replies: "まだ返信はありません。"
+        more_replies: "その他の返信"
+        top_topics: "トピック上位"
         no_topics: "まだトピックはありません。"
+        more_topics: "その他のトピック"
         top_badges: "最近ゲットしたバッジ"
         no_badges: "まだバッジはありません。"
         more_badges: "バッジをもっと見る"
-      associated_accounts: "関連アカウント"
+        top_links: "リンク上位"
+        no_links: "まだリンクはありません。"
+        most_liked_by: "最も「いいね！」してくれた"
+        most_liked_users: "最も「いいね！」した"
+        most_replied_to_users: "最も返信した"
+        no_likes: "「いいね！」はまだありません。"
+      associated_accounts: "ログイン"
       ip_address:
         title: "最後のIPアドレス"
       registration_ip_address:
@@ -667,8 +836,19 @@ ja:
     refresh: "更新"
     read_only_mode:
       enabled: "このサイトは閲覧専用モードになっています。閲覧し続けられますが、返信したりいいねを付けるなどのアクションは現在出来ません。"
-      login_disabled: "読み取り専用モードにされています。ログインできません。"
+      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: '過去一年間に投稿されたトピック'
     month: '月'
@@ -679,18 +859,20 @@ ja:
     first_post: 最初の投稿
     mute: ミュート
     unmute: ミュート解除
-    last_post: 最終投稿時刻
     last_reply_lowercase: 最後の返信
     replies_lowercase:
       other: 返信
     signup_cta:
       sign_up: "新しいアカウントを作成"
+      hide_session: "明日私に思い出させてください。"
       hide_forever: "いいえ、結構です"
+      hidden_for_session: "わかりました、明日お尋ねします。あなたは「ログイン」からいつでもアカウントを作成できます。"
       intro: "こんにちは！ :heart_eyes: エンジョイしていますね。 ですが、サインアップしていないようです。"
       value_prop: "アカウントを作成した後、いま読んでいるページへ戻ります。また、新しい投稿があった場合はこことメールにてお知らせします。 いいね！を使って好きな投稿をみんなに教えましょう。 :heartbeat:"
     summary:
       enabled_description: "トピックのまとめを表示されています。"
       description: "<b>{{replyCount}}</b>件の返信があります。"
+      description_time: "<b>{{replyCount}}</b> 件の返信があります。 概ね <b>{{readingTime}} 分</b>で読める文量です。"
       enable: 'このトピックを要訳する'
       disable: 'すべての投稿を表示する'
     deleted_filter:
@@ -702,6 +884,7 @@ ja:
       title: "メッセージ"
       invite: "他の人を招待する..."
       remove_allowed_user: "このメッセージから {{name}} を削除してもよろしいですか？"
+      remove_allowed_group: "このメッセージから {{name}} を削除してもよろしいですか？"
     email: 'メール'
     username: 'ユーザ名'
     last_seen: '最終アクティビティ'
@@ -710,6 +893,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 +907,9 @@ ja:
       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: "OK"
+      button_help: "ヘルプ"
     login:
       title: "ログイン"
       username: "ユーザ名"
@@ -736,20 +923,27 @@ ja:
       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: "そのIPアドレスからは管理者としてログインできません"
       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で"
+        title: "Google"
         message: "Google による認証 (ポップアップがブロックされていないことを確認してください)"
       google_oauth2:
-        title: "Googleで"
+        title: "Google"
         message: "Googleによる認証 (ポップアップがブロックされていないことを確認してください)"
       twitter:
         title: "Twitter"
@@ -758,31 +952,82 @@ ja:
         title: "Instagram"
         message: "Instagram による認証 (ポップアップがブロックされていないことを確認してください)"
       facebook:
-        title: "Facebookで"
+        title: "Facebook"
         message: "Facebook による認証 (ポップアップがブロックされていないことを確認してください)"
       yahoo:
-        title: "with Yahoo"
+        title: "Yahoo"
         message: "Yahoo による認証 (ポップアップがブロックされていないことを確認してください)"
       github:
-        title: "with 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"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebookメッセンジャー"
+    category_page_style:
+      categories_only: "カテゴリのみ"
+      categories_with_featured_topics: "おすすめのトピックのカテゴリ"
+      categories_and_latest_topics: "カテゴリと最新トピック"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      filter_placeholder: 絵文字を探す
+      people: ピープル
+      nature: ネイチャー
+      food: フード
+      activity: アクティビティ
+      travel: トラベル
+      objects: オブジェクト
+      celebration: セレブレーション
+      custom: カスタム絵文字
+      recent: 最近使ったもの
+      default_tone: スキントーンなし
+      light_tone: ライトスキントーン
+      medium_light_tone: ミディアムライトスキントーン
+      medium_tone: ミディアムスキントーン
+      medium_dark_tone: ミディアムダークスキントーン
+      dark_tone: ダークスキントーン
     composer:
       emoji: "絵文字 :)"
       more_emoji: "もっと..."
       options: "オプション"
       whisper: "ささやき"
+      unlist: "リストから非表示"
+      blockquote_text: "引用"
       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}}文字以上必要です。"
@@ -801,8 +1046,10 @@ ja:
       title: "Ctrl+Enterでも投稿できます"
       users_placeholder: "追加するユーザ"
       title_placeholder: "トピックのタイトルを入力してください。"
+      title_or_link_placeholder: "タイトルを記入するか、リンクを貼ってください"
       edit_reason_placeholder: "編集する理由は何ですか?"
       show_edit_reason: "(編集理由を追加)"
+      topic_featured_link_placeholder: "タイトルにリンクを入力してください。"
       reply_placeholder: "文章を入力してください。 Markdown, BBコード, HTMLが使用出来ます。 画像はドラッグアンドドロップで貼り付けられます。"
       view_new_post: "新しい投稿を見る。"
       saving: "保存中"
@@ -812,8 +1059,10 @@ ja:
       show_preview: 'プレビューを表示する &raquo;'
       hide_preview: '&laquo; プレビューを隠す'
       quote_post_title: "投稿全体を引用"
+      bold_label: "B"
       bold_title: "太字"
       bold_text: "太字にしたテキスト"
+      italic_label: "斜体"
       italic_title: "斜体"
       italic_text: "斜体のテキスト"
       link_title: "ハイパーリンク"
@@ -825,42 +1074,47 @@ ja:
       quote_text: "引用"
       code_title: "整形済みテキスト"
       code_text: "4文字スペースでインデント"
+      paste_code_text: "コードをここに入力"
       upload_title: "アップロード"
       upload_description: "アップロード内容の説明文をここに入力"
       olist_title: "番号付きリスト"
       ulist_title: "箇条書き"
       list_item: "リストアイテム"
-      heading_title: "見出し"
-      heading_text: "見出し"
-      hr_title: "水平線"
       help: "Markdown 編集のヘルプ"
-      toggler: "編集パネルの表示/非表示"
       modal_ok: "OK"
       modal_cancel: "キャンセル"
       cant_send_pm: "%{username}へメッセージを送ることはできません。"
+      yourself_confirm:
+        title: "受信者の追加を忘れましたか？"
+        body: "たった今このメッセージはあなただけに送られました。"
       admin_options_title: "このトピックの詳細設定"
     notifications:
       title: "@ユーザ名 のメンション、投稿やトピックへの返信、メッセージなどの通知"
-      none: "通知はありません"
+      none: "通知を読み込むことができませんでした。"
+      empty: "通知はありません。"
       more: "通知をすべて確認する"
       total_flagged: "通報された投稿の合計"
-      mentioned: "<i title='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='投稿しました' 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}}<span>をいいね！しました</span></p>"
-      liked_2: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}}</span> {{description}}<span>をいいね！しました</span></p>"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}}と他{{count}}人</span> {{description}}<span>をいいね！しました</span></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>"
-      granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p> '{{description}}' バッジをゲット！</p>"
+        other: "<span>{{username}}, {{username2}} 、他 {{count}} 人</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> があなたの招待を受理しました"
+      moved_post: "<span>{{username}}</span> は {{description}} を移動しました"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "'{{description}}'バッジをゲット！"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>新しいトピック</span> {{description}}"
       group_message_summary:
-        other: "<i title='グループ宛にメッセージが届いています' class='fa fa-group'></i><p> {{count}}件のメッセージが{{group_name}}へ着ています</p>"
+        other: "{{group_name}} 宛のメッセージが {{count}} 通あります"
       alt:
         mentioned: "メンションされました: "
         quoted: "引用されました: "
@@ -877,7 +1131,8 @@ ja:
         granted_badge: "バッジを付与"
         group_message_summary: "グループ宛のメッセージがあります"
       popup:
-        mentioned: '"{{topic}}"で{{username}} がタグ付けしました - {{site_title}}'
+        mentioned: '"{{topic}}"で{{username}} にメンションされました - {{site_title}}'
+        group_mentioned: '"{{topic}}"で{{username}} にメンションされました - {{site_title}}'
         quoted: '"{{topic}}"で{{username}}が引用しました - {{site_title}}'
         replied: '{{username}}が"{{topic}}"へ返信しました - {{site_title}}'
         posted: '{{username}} が投稿しました "{{topic}}" - {{site_title}}'
@@ -889,9 +1144,11 @@ ja:
       from_my_computer: "このデバイスから"
       from_the_web: "Web から"
       remote_tip: "画像へのリンク"
+      remote_tip_with_attachments: "画像かファイルへのリンク {{authorized_extensions}}"
       local_tip: "ローカルからアップロードする画像を選択"
       local_tip_with_attachments: "デバイスから画像/ファイルを選択する {{authorized_extensions}}"
       hint: "(アップロードする画像をエディタにドラッグ&ドロップすることもできます)"
+      hint_for_supported_browsers: "ドラッグ＆ドロップあるいはエディター内に画像を貼り付けてください。"
       uploading: "アップロード中"
       select_file: "ファイル選択"
       image_link: "イメージのリンク先"
@@ -899,28 +1156,72 @@ 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}}から"
+      more_results: "検索結果が多数あります。検索条件を絞ってください。"
+      cant_find: "探しているものが見つかりませんか？"
+      start_new_topic: "新しいトピックを始めてみては？"
+      or_search_google: "あるいは、Google検索で試してみてください:"
+      search_google: "Google検索で試してみてください:"
+      search_google_button: "Google"
+      search_google_title: "サイトを検索"
       context:
         user: "@{{username}}の投稿を検索"
         category: "#{{category}} から検索する"
         topic: "このトピックを探す"
         private_messages: "メッセージ検索"
+      advanced:
+        title: 高度な検索
+        posted_by:
+          label: 投稿者
+        in_group:
+          label: グループ内
+        with_badge:
+          label: バッヂ指定
+        filters:
+          likes: 「いいね！」したもの
+          posted: 投稿済
+          watching: ウォッチ中
+          first: 最初の投稿
+          pinned: 固定表示されている
+          unpinned: 固定表示されていない
+          unseen: 未読
+          wiki: wiki
+        statuses:
+          label: トピックのうち
+          open: オープンされている
+          closed: クローズされている
+          archived: アーカイブされている
+          noreplies: 返信がまったくない
+          single_user: 一人しか参加者がいない
+        post:
+          count:
+            label: 投稿数の下限
+          time:
+            label: 投稿されたタイミング
+            before: より前
+            after: より後
     hamburger_menu: "他のトピック一覧やカテゴリを見る"
     new_item: "新着"
     go_back: '戻る'
     not_logged_in_user: 'ユーザアクティビティと設定ページ'
     current_user: 'ユーザページに移動'
     topics:
+      new_messages_marker: "最後の訪問"
       bulk:
+        select_all: "すべて選択する"
+        clear_all: "すべてクリア"
         unlist_topics: "トピックをリストから非表示にする"
+        relist_topics: "トピックをリストに再表示する"
         reset_read: "未読に設定"
         delete: "トピックを削除"
         dismiss: "既読"
@@ -930,11 +1231,18 @@ ja:
         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: "新しいトピックはありません。"
@@ -961,13 +1269,20 @@ ja:
         bookmarks: "ブックマーク済みのトピックはこれ以上ありません。"
         search: "検索結果は以上です。"
     topic:
+      unsubscribe:
+        stop_notifications: " <strong>{{title}}</strong>の通知を受け取らなくなります"
+        change_notification_state: "あなたへの通知状況は"
+      filter_to:
+        other: "トピック内の {{count}} 件を表示"
       create: '新規トピック'
       create_long: '新しいトピックの作成'
       private_message: 'メッセージを書く'
       archive_message:
+        help: 'アーカイブにメセージを移しました'
         title: 'アーカイブ'
       move_to_inbox:
         title: '受信ボックスへ移動'
+        help: '受信ボックスへメッセージを戻しました'
       list: 'トピック'
       new: '新着トピック'
       unread: '未読'
@@ -1007,28 +1322,78 @@ ja:
       jump_reply_up: 以前の返信へジャンプ
       jump_reply_down: 以後の返信へジャンプ
       deleted: "トピックは削除されました"
+      topic_status_update:
+        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: "このトピックはあと %{timeLeft} で、<a href=%{categoryUrl}>#%{categoryName}</a> にて公開されます。"
+        auto_close_based_on_last_post: "このトピックは最後の返信から%{duration} 後にクローズされます"
+        auto_delete: "このトピックはあと%{timeLeft}で自動的に削除されます。"
+        auto_reminder: "このトピックについて、%{timeLeft} 後にリマインドします。"
       auto_close_title: 'オートクローズの設定'
+      auto_close_immediate:
+        other: "このトピックは最終投稿からすでに%{count}時間経過しているため、すぐにクローズされます。"
       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: "%{post_number}番へジャンプ"
         total: 投稿の合計
         current: 現在の投稿
       notifications:
+        title: このトピックに関する通知頻度を変更
         reasons:
-          '3_6': 'このカテゴリに参加中のため通知されます'
-          '3_5': 'このトピックに参加中のため通知されます'
-          '3_2': 'このトピックに参加中のため通知されます。'
+          mailing_list_mode: "メーリングリストモードになっているため、このトピックへの返信はメールで送られます。"
+          '3_10': 'このトピックのタグをウォッチしているため通知されます。'
+          '3_6': 'このカテゴリをウォッチしているため通知されます。'
+          '3_5': 'このトピックをウォッチし始めたため通知されます。'
+          '3_2': 'このトピックをウォッチしているため通知されます。'
           '3_1': 'このトピックを作成したため通知されます。'
-          '3': 'このトピックに参加中のため通知されます。'
-          '1_2': '他のユーザからメンションされた場合、投稿へ返信された場合に通知します。'
-          '1': '他のユーザからメンションされた場合、投稿へ返信された場合に通知します。'
+          '3': 'このトピックをウォッチしているため通知されます。'
+          '2_4': 'このトピックに返信したので、新たな返信のカウント数が表示されます。'
+          '2': '<a href="/u/{{username}}/preferences">このトピックを購読中なので</a>、新たな返信のカウント数が表示されます。'
+          '1_2': '他のユーザからメンションされた場合か、メッセージ内の投稿に返信された場合に通知されます。'
+          '1': '他のユーザからメンションされた場合か、メッセージ内の投稿に返信された場合に通知されます。'
           '0_7': 'このカテゴリに関して一切通知を受け取りません。'
           '0_2': 'このトピックに関して一切通知を受け取りません。'
           '0': 'このトピックに関して一切通知を受け取りません。'
@@ -1062,8 +1427,9 @@ ja:
         open: "トピックをオープン"
         close: "トピックをクローズする"
         multi_select: "投稿を選択"
-        pin: "トピックを固定"
-        unpin: "トピックの固定を解除"
+        timed_update: "トピックにタイマーをセット..."
+        pin: "トピックを固定表示"
+        unpin: "トピックの固定表示を解除"
         unarchive: "トピックのアーカイブ解除"
         archive: "トピックのアーカイブ"
         invisible: "リストから非表示にする"
@@ -1072,45 +1438,60 @@ ja:
         make_public: "公開トピックへ変更"
         make_private: "プライベートメッセージへ変更"
       feature:
-        pin: "トピックをピン留めする..."
-        unpin: "トピックの固定を解除"
-        pin_globally: "トピックを全サイト的にピン留めする"
+        pin: "トピックを固定表示"
+        unpin: "トピックの固定表示を解除"
+        pin_globally: "トピックを全体で固定表示する"
         make_banner: "バナートピック"
         remove_banner: "バナートピックを削除"
+      reply:
+        title: '返信する'
+        help: 'このトピックに返信する'
       clear_pin:
-        title: "ピンを解除する"
-        help: "このトピックのピンを外し、トピックリストの先頭に表示されないようにする"
+        title: "固定表示を解除する"
+        help: "このトピックの固定表示を解除し、トピックリストの先頭に表示されないようにする"
       share:
         title: 'シェア'
         help: 'このトピックのリンクをシェアする'
+      print:
+        title: '印刷'
+        help: '印刷用の表示にする'
       flag_topic:
         title: '通報'
-        help: 'スタッフに知らせたいトピックを通報することにより、それについての通知をプライベートメッセージで受け取ることが出来ます'
+        help: 'このトピックを通報するか、またはプライベート通知を送る'
         success_message: 'このトピックを通報しました。'
       feature_topic:
         title: "トピックを特集"
         pin: "{{categoryLink}} カテゴリのトップに表示する"
-        confirm_pin: "既に {{count}} 個ピン留めしています。多すぎるピン留めは新規、及び匿名ユーザの負担になる場合があります。このカテゴリの別のトピックのピン留めを続けますか？"
+        confirm_pin: "既に {{count}} トピックを固定表示しています。固定表示が多すぎると、新規あるいは匿名ユーザの負担になる場合があります。このカテゴリにおいてさらに固定表示設定してもよいですか？"
         unpin: "{{categoryLink}} カテゴリのトップからトピックを削除"
         unpin_until: "{{categoryLink}} カテゴリのトップからこのトピックを削除するか、<strong>%{until}</strong> まで待つ。"
-        pin_note: "ユーザはトピックを個別にピン留め解除することができます"
-        not_pinned: "{{categoryLink}}でピン留めされているトピックはありません。"
+        pin_note: "ユーザはトピックを個別に固定表示解除することができます。"
+        pin_validation: "このトピックを固定表示するためには日付を指定してください。"
+        not_pinned: "{{categoryLink}}で固定表示されているトピックはありません。"
+        already_pinned:
+          other: "{{categoryLink}}で固定表示されているトピック: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "このトピックをすべてのトピックリストのトップに表示する"
-        confirm_pin_globally: "既に{{count}} 個ピン留めしています。　多すぎるピン留めは新規ユーザと匿名ユーザの負担になる場合があります。ピン留めを続けますか？"
+        confirm_pin_globally: "全体で既に {{count}} トピックを固定表示しています。固定表示が多すぎると、新規あるいは匿名ユーザの負担になる場合があります。このカテゴリにおいてさらに固定表示設定してもよいですか？"
         unpin_globally: "トピック一覧のトップからこのトピックを削除します"
         unpin_globally_until: "このトピックをすべてのトピックリストのトップから削除するか、<strong>%{until}</strong> まで待つ。"
-        global_pin_note: "ユーザはトピックを個別にピン留め解除することができます"
-        not_pinned_globally: "すべてのトピックリストでピン留めされたトピックはありません。"
+        global_pin_note: "ユーザはトピックを個別に固定表示解除することができます。"
+        not_pinned_globally: "全体で固定表示されているトピックはありません。"
+        already_pinned_globally:
+          other: "全体で固定表示されているトピック: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "このトピックを全てのページのバナーに表示します"
         remove_banner: "全てのページのバナーを削除します"
         banner_note: "ユーザはバナーを閉じることができます。常に１つのトピックだけがバナー表示されます"
+        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: "ユーザをこのメッセージへ招待しました。"
+        success_group: "グループをこのメッセージへ招待しました。"
         error: "申し訳ありません、ユーザ招待中にエラーが発生しました。"
         group_name: "グループ名"
       controls: "オプション"
@@ -1129,6 +1510,7 @@ ja:
         success_email: "<b>{{emailOrUsername}}</b>に招待を送信しました。招待が受理されたらお知らせします。招待した人はユーザページの招待タブにて確認できます。"
         success_username: "ユーザをこのトピックへ招待しました。"
         error: "申し訳ありません。その人を招待できませんでした。すでに招待を送信していませんか？ (招待できる数には限りがあります)"
+        success_existing_email: "<b>{{emailOrUsername}}</b>はすでにこのトピックへ招待済みです。"
       login_reply: 'ログインして返信'
       filters:
         n_posts:
@@ -1147,6 +1529,10 @@ ja:
         error: "指定されたトピックへの投稿移動中にエラーが発生しました。"
         instructions:
           other: "<b>{{count}}</b>個の投稿をどのトピックに移動するか選択してください。"
+      merge_posts:
+        title: "選択した投稿を統合"
+        action: "選択した投稿を統合"
+        error: "選択した投稿の統合に失敗しました。"
       change_owner:
         title: "投稿者を変更する"
         action: "オーナーシップを変更"
@@ -1157,11 +1543,14 @@ ja:
           other: "この {{count}} つの投稿の新しいオーナーを選択してください。（前のオーナー：<b>{{old_user}}</b>）"
         instructions_warn: "この投稿についての通知が新しいユーザにさかのぼって移動されることはないので注意してください。<br>警告: 投稿の関連データの所有権は、新しいユーザに転送されません。 注意して使用してください。"
       change_timestamp:
+        title: "タイムスタンプを変更してください。"
         action: "タイムスタンプを変更"
+        invalid_timestamp: "タイムスタンプは未来時刻にすることが出来ません。"
+        error: "トピックのタイムスタンプ変更にエラーがありました。"
+        instructions: "トピックの新たなタイムスタンプを設定してください。トピック内の各投稿時間はその時間を起点に再計算されます。"
       multi_select:
         select: '選択'
         selected: '選択中 ({{count}})'
-        select_replies: '返信と選択'
         delete: 選択中のものを削除
         cancel: 選択を外す
         select_all: すべて選択する
@@ -1171,17 +1560,19 @@ ja:
     post:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
-      edit: "編集中 {{link}} {{replyAvatar}} {{username}}"
+      quote_reply: "引用"
       edit_reason: "理由: "
       post_number: "投稿{{number}}"
+      wiki_last_edited_on: "wikiの最終編集日"
       last_edited_on: "投稿の最終編集日"
       reply_as_new_topic: "トピックのリンクを付けて返信"
+      reply_as_new_private_message: "同じ受信者へ新しいメッセージとして返信"
       continue_discussion: "{{postLink}} から:"
       follow_quote: "引用した投稿に移動"
       show_full: "全て表示"
       show_hidden: '隠されたコンテンツを表示する'
       deleted_by_author:
-        other: "(投稿は投稿者により削除されました。フラグがついていない場合、%{count}時間後に自動的に削除されます)"
+        other: "(投稿は投稿者により削除されました。何らかの通報がされていない限り、%{count}時間後に自動的に削除されます)"
       expand_collapse: "開く/折りたたみ"
       gap:
         other: "{{count}}個の返信をすべて表示する"
@@ -1193,11 +1584,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: "ファイルをダウンロードするには、ログインする必要があります"
@@ -1207,6 +1603,8 @@ ja:
         yes_value: "はい"
       via_email: "メールで投稿されました。"
       whisper: "この投稿はモデレーターへのプライベートメッセージです"
+      wiki:
+        about: "この投稿はWiki形式です"
       archetypes:
         save: '保存オプション'
       controls:
@@ -1215,17 +1613,13 @@ ja:
         has_liked: "この投稿に「いいね！」しました。"
         undo_like: "「いいね！」を取り消す"
         edit: "この投稿を編集"
+        edit_action: "編集"
         edit_anonymous: "投稿を編集するには、ログインする必要があります"
         flag: "この投稿を通報する、またはプライベート通知を送る"
         delete: "投稿を削除する"
         undelete: "投稿を元に戻す"
         share: "投稿のリンクを共有する"
         more: "もっと読む"
-        delete_replies:
-          confirm:
-            other: "この投稿への{{count}}件の返信を削除しますか?"
-          yes_value: "返信も一緒に削除します"
-          no_value: "投稿のみを削除する"
         admin: "投稿の管理"
         wiki: "wiki投稿にする"
         unwiki: "wiki投稿から外す"
@@ -1236,8 +1630,6 @@ ja:
         change_owner: "オーナーシップを変更"
       actions:
         flag: '通報'
-        defer_flags:
-          other: "取り下げた通報"
         undo:
           off_topic: "通報を取り消す"
           spam: "通報を取り消す"
@@ -1249,6 +1641,11 @@ ja:
           off_topic: "関係無い話題として通報"
           spam: "スパムとして通報"
           inappropriate: "不適切な発言として通報"
+          notify_moderators: "モデレータに通知"
+          notify_user: "メッセージを送信しました。"
+          bookmark: "これをブックマークしました。"
+          like: "「いいね！」しました"
+          vote: "投票しました"
         by_you:
           off_topic: "関係のない話題として通報しました"
           spam: "スパム報告として通報しました"
@@ -1292,9 +1689,9 @@ ja:
             other: "{{count}}人のユーザが「いいね！」しました"
           vote:
             other: "{{count}}人のユーザがこのポストに投票しました"
-      delete:
+      merge:
         confirm:
-          other: "これらの投稿を削除してもよろしいですか？"
+          other: "これらの{{count}}の投稿を統合したいですか?"
       revisions:
         controls:
           first: "最初のリビジョン"
@@ -1303,14 +1700,31 @@ ja:
           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: "追加・削除箇所をインラインで表示"
+            button: 'HTML'
           side_by_side:
             title: "差分を横に並べて表示"
+            button: 'HTML'
           side_by_side_markdown:
-            title: "ソース文書で表示する"
+            title: "ソースの差分を横に並べて表示"
+            button: 'Raw'
+      raw_email:
+        displays:
+          raw:
+            title: "メールをソース表示"
+            button: 'Raw'
+          text_part:
+            title: "メールのテキスト部分を表示"
+            button: 'Text'
+          html_part:
+            title: "メールのHTML部分を表示"
+            button: 'HTML'
     category:
       can: 'can&hellip; '
       none: '(カテゴリなし)'
@@ -1322,6 +1736,11 @@ ja:
       general: '一般'
       settings: '設定'
       topic_template: "トピックテンプレート"
+      tags: "タグ"
+      tags_allowed_tags: "このカテゴリで使用を許可するタグ:"
+      tags_allowed_tag_groups: "このカテゴリで使用を許可するタググループ:"
+      tags_placeholder: "(オプション) 許可されたタグのリスト"
+      tag_groups_placeholder: "(オプション) 許可されたタググループのリスト"
       delete: 'カテゴリを削除する'
       create: '新規カテゴリ'
       create_long: '新しくカテゴリを作ります'
@@ -1364,6 +1783,9 @@ ja:
       notifications:
         watching:
           title: "ウォッチ中"
+        watching_first_post:
+          title: "最初の投稿をウォッチする"
+          description: "カテゴリー内の新規トピックに対する最初の投稿のみ通知されます。"
         tracking:
           title: "追跡中"
         regular:
@@ -1376,6 +1798,7 @@ ja:
       action: '投稿を通報'
       take_action: "アクションをする"
       notify_action: 'メッセージ'
+      official_warning: '運営スタッフからの警告'
       delete_spammer: "スパムの削除"
       yes_delete_spammer: "はい、スパムを削除する"
       ip_address_missing: "(N/A)"
@@ -1383,12 +1806,20 @@ ja:
       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: "トピックを通報"
@@ -1397,11 +1828,16 @@ ja:
       title: "トピックの情報"
       participants_title: "よく投稿する人"
       links_title: "人気のリンク"
+      links_shown: "さらにリンクを表示する"
       clicks:
         other: "%{count} クリック"
+    post_links:
+      about: "この投稿のリンクをもっと見る"
+      title:
+        other: "%{count} リンク"
     topic_statuses:
       warning:
-        help: "これは公式の警告です。"
+        help: "これは運営スタッフからの警告です。"
       bookmarked:
         help: "このトピックをブックマークしました"
       locked:
@@ -1411,13 +1847,14 @@ ja:
       locked_and_archived:
         help: "このトピックは閉じられ、アーカイブされます。新しい返信を受け入れず、変更することはできません"
       unpinned:
-        title: "ピン留めされていません"
-        help: "このトピックはピン留めされていません。 既定の順番に表示されます。"
+        title: "固定表示されていません"
+        help: "このトピックは固定表示されていません。 既定の順番で表示されます"
       pinned_globally:
-        title: "全体でピン留めされました"
+        title: "全体で固定表示されました"
+        help: "このトピックは全体で固定表示されています。常に新着とカテゴリのトップに表示されます"
       pinned:
-        title: "ピン留め"
-        help: "このトピックはピン留めされています。常にカテゴリのトップに表示されます"
+        title: "固定表示"
+        help: "このトピックは固定表示されています。常にカテゴリのトップに表示されます"
       invisible:
         help: "このトピックはリストされていません。トピックリストには表示されません。直接リンクでのみアクセス可能です"
     posts: "投稿"
@@ -1433,6 +1870,8 @@ ja:
     views_lowercase:
       other: " 閲覧"
     replies: "返信"
+    views_long:
+      other: "このトピックは{{number}}回閲覧されました"
     activity: "アクティビティ"
     likes: "いいね！"
     likes_lowercase:
@@ -1445,6 +1884,7 @@ ja:
     history: "History"
     changed_by: "by {{author}}"
     raw_email:
+      title: "受信メール"
       not_available: "利用不可"
     categories_list: "カテゴリ一覧"
     filters:
@@ -1452,6 +1892,8 @@ ja:
       with_category: "%{filter} %{category} トピック"
       latest:
         title: "最新"
+        title_with_count:
+          other: "最新の投稿 ({{count}})"
         help: "最新のトピック"
       hot:
         title: "ホット"
@@ -1519,6 +1961,8 @@ ja:
       full: "作成 / 返信 / 閲覧"
       create_post: "返信 / 閲覧"
       readonly: "閲覧できる"
+    lightbox:
+      download: "ダウンロード"
     keyboard_shortcuts_help:
       title: 'ショートカットキー'
       jump_to:
@@ -1546,7 +1990,6 @@ ja:
         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> トピックを既読にする'
@@ -1554,7 +1997,7 @@ ja:
       actions:
         title: 'アクション'
         bookmark_topic: '<b>f</b> トピックのブックマークを切り替え'
-        pin_unpin_topic: '<b>shift</b>+<b>p</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> トピックへリンクして返信'
@@ -1565,16 +2008,34 @@ ja:
         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:
       granted_on: "%{date}にゲット!"
+      others_count: "その他のバッジ所有者(%{count})"
       title: バッジ
       badge_count:
         other: "%{count}個のバッジ"
+    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:
+      notifications:
+        watching:
+          title: "ウォッチ中"
+        watching_first_post:
+          title: "最初の投稿をウォッチする"
+          description: "このタグの新規トピックに対する最初の投稿のみ通知されます。"
       topics:
         none:
           latest: "最新のトピックはありません。"
@@ -1604,17 +2065,18 @@ ja:
         no_problems: "問題は見つかりませんでした。"
         moderators: 'モデレータ:'
         admins: '管理者:'
-        blocked: 'ブロック中:'
         suspended: '停止中:'
         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: "昨日"
@@ -1634,24 +2096,12 @@ ja:
         by: "by"
       flags:
         title: "通報"
-        old: "古い通報"
-        active: "アクティブな通報"
         agree: "賛成する"
-        agree_title: "有効で、間違いが無いものとして通報を行う"
-        agree_flag_modal_title: "Agree and..."
-        agree_flag_hide_post: "賛成(ポスト非表示 + プライベートメッセージ送信)"
-        agree_flag_hide_post_title: "この投稿を非表示にし、編集を促すプライベートメッセージを自動的に送信する"
-        agree_flag_restore_post: "賛成(投稿を復元)"
-        agree_flag_restore_post_title: "この投稿を復元"
-        agree_flag: "通報に賛成"
-        agree_flag_title: "投稿を変更できなくする事に賛成"
-        defer_flag: "取り下げる"
+        agree_title: "この通報が有効で正しいことを確認してください"
         defer_flag_title: "通報を削除します。何も行いません。"
         delete: "削除する"
         delete_title: "この通報で通報されている投稿を削除します"
-        delete_post_defer_flag: "投稿を削除し、通報を取り下げます"
         delete_post_defer_flag_title: "投稿を削除します。最初の投稿を削除した場合、トピックも削除されます。"
-        delete_post_agree_flag: "投稿を削除することに賛成します"
         delete_post_agree_flag_title: "投稿を削除します。最初の投稿を削除した場合、トピックも削除されます。"
         delete_flag_modal_title: "Delete and..."
         delete_spammer: "スパムユーザーを削除"
@@ -1663,32 +2113,22 @@ ja:
         clear_topic_flags: "完了"
         clear_topic_flags_title: "このトピックについての問題が解決されました。「完了」をクリックして通報の対応を完了します。"
         more: "(more replies...)"
+        suspend_user: "ユーザを凍結"
+        suspend_user_title: "この投稿においてユーザを凍結"
         dispositions:
           agreed: "賛成しました。"
           disagreed: "反対する"
-          deferred: "取り下げられた"
         flagged_by: "通報者: "
         resolved_by: "解決方法"
         took_action: "Took action"
         system: "システム"
         error: "何らかの理由でうまくいきませんでした"
         reply_message: "返信する"
-        no_results: "通報はありません。"
+        no_results: "通報された投稿はありません。"
         topic_flagged: "この <strong>トピック</strong> は通報されました。"
         visit_topic: "トピックを確認"
         was_edited: "最初の通報後に編集された投稿"
         previous_flags_count: "この投稿は既に {{count}} 回通報されています"
-        summary:
-          action_type_3:
-            other: "オフトピック x{{count}}"
-          action_type_4:
-            other: "不適切 x{{count}}"
-          action_type_6:
-            other: "カスタム x{{count}}"
-          action_type_7:
-            other: "カスタム x{{count}}"
-          action_type_8:
-            other: "スパム x{{count}}"
       groups:
         primary: "プライマリーグループ"
         no_primary: "（プライマリーグループなし）"
@@ -1734,6 +2174,7 @@ ja:
         title: "Webhooks"
         none: "現在、Webhooksはありません。"
         events:
+          ping: "Ping"
           actions: "アクション"
       plugins:
         title: "プラグイン"
@@ -1786,6 +2227,8 @@ ja:
             without_uploads: "はい(ファイルは含まない)"
           download:
             label: "ダウンロード"
+            title: "ダウンロードリンクをメールで送る"
+            alert: "バックアップのダウンロードリンクがメールで送られました。"
           destroy:
             title: "バックアップを削除"
             confirm: "このバックアップを削除しますか？"
@@ -1821,6 +2264,7 @@ ja:
         new_style: "新しいスタイル"
         import: "インポート"
         delete: "削除"
+        delete_confirm: "このテーマを削除しますか?"
         about: "サイトカスタマイズ設定により、サイトのヘッダとスタイルシートを変更できます。設定を選択するか、編集を開始して新たな設定を追加してください。"
         color: "カラー"
         opacity: "透明度"
@@ -1830,8 +2274,25 @@ ja:
           subject: "件名"
           multiple_subjects: "このメールのテンプレートは複数の件名があります。"
           none_selected: "編集するメールテンプレートを選択してください。"
+          revert: "変更を元に戻す"
+        theme:
+          edit: "編集"
+          desktop: "デスクトップ"
+          mobile: "モバイル"
+          preview: "プレビュー"
+          upload: "アップロード"
+          license: "ライセンス"
+          check_for_updates: "アップデートを確認"
+          updating: "アップデート中..."
+          scss:
+            text: "CSS"
+          head_tag:
+            text: "</head>"
+          body_tag:
+            text: "</body>"
         colors:
           title: "カラー"
+          edit: "カラースキームの編集"
           long_title: "カラースキーム"
           new_name: "カラースキームを作成"
           copy_name_prefix: "のコピー"
@@ -1869,16 +2330,18 @@ ja:
             description: '操作が成功したことを示すために使用します'
           love:
             name: 'love'
-            description: "いいねボタンの色"
+            description: "「いいね！」ボタンの色"
       email:
         title: "メール"
         settings: "設定"
+        templates: "テンプレート"
         preview_digest: "まとめのプレビュー"
         sending_test: "テストメールを送信中..."
         error: "<b>ERROR</b> - %{server_error}"
         test_error: "テストメールを送れませんでした。メール設定、またはホストをメールコネクションをブロックされていないようを確認してください。"
         sent: "送信したメール"
         skipped: "スキップ済み"
+        bounced: "バウンス"
         received: "受信したメール"
         rejected: "拒否されたメール"
         sent_at: "送信時間"
@@ -1892,6 +2355,9 @@ ja:
         delivery_method: "送信方法"
         preview_digest_desc: "しばらくログインしていないユーザーに送られるまとめメールです。"
         refresh: "更新"
+        send_digest_label: "この結果を送信:"
+        send_digest: "送信"
+        sending_email: "メールを送信しています..."
         format: "フォーマット"
         html: "html"
         text: "text"
@@ -1901,11 +2367,20 @@ ja:
         incoming_emails:
           from_address: "送信者"
           to_addresses: "宛先"
+          cc_addresses: "CC"
           subject: "件名"
           error: "エラー"
+          none: "受信メールはありません。"
           modal:
+            title: "受信メールの詳細"
+            error: "エラー"
+            headers: "ヘッダ"
             subject: "件名"
+            body: "本文"
           filters:
+            from_placeholder: "from@example.com"
+            to_placeholder: "to@example.com"
+            cc_placeholder: "cc@example.com"
             subject_placeholder: "件名..."
             error_placeholder: "エラー"
         logs:
@@ -1934,6 +2409,8 @@ ja:
           block: "ブロック"
           do_nothing: "何もしない"
         staff_actions:
+          all: "すべて"
+          filter: "フィルタ:"
           title: "スタッフ操作"
           clear_filters: "すべて表示する"
           staff_user: "スタッフユーザ"
@@ -1954,6 +2431,9 @@ ja:
             change_trust_level: "トラストレベルを変更"
             change_username: "ユーザ名変更"
             change_site_setting: "サイトの設定を変更"
+            change_theme: "テーマを変更"
+            delete_theme: "テーマを削除"
+            change_site_text: "サイトテキストを変更"
             suspend_user: "ユーザを凍結する"
             unsuspend_user: "ユーザの凍結を解除する"
             grant_badge: "バッジを付与"
@@ -1964,14 +2444,19 @@ ja:
             impersonate: "なりすまし"
             anonymize_user: "匿名ユーザ"
             roll_up: "IPブロックをロールアップ"
+            change_category_settings: "カテゴリ設定を変更"
             delete_category: "カテゴリを削除する"
             create_category: "カテゴリを作る"
-            block_user: "ユーザをブロック"
-            unblock_user: "ユーザをブロック解除"
             grant_admin: "管理者権限を付与"
             revoke_admin: "管理者権限を剥奪"
             grant_moderation: "モデレータ権限を付与"
             revoke_moderation: "モデレータ権限を剥奪"
+            backup_create: "バックアップを生成"
+            deleted_tag: "タグを削除"
+            renamed_tag: "タグ名変更"
+            change_readonly_mode: "閲覧専用モードに変更する"
+            backup_download: "バックアップをダウンロード"
+            backup_destroy: "バックアップを消去"
         screened_emails:
           title: "ブロック対象アドレス"
           description: "新規アカウント作成時、次のメールアドレスからの登録をブロックする。"
@@ -2004,6 +2489,19 @@ ja:
             title: "Creates new subnet ban entries if there are at least 'min_ban_entries_for_roll_up' entries."
         logster:
           title: "エラーログ"
+      watched_words:
+        title: "監視ワード"
+        actions:
+          flag: '通報'
+        action_descriptions:
+          flag: 'これらの言葉を含む投稿を許可しますが、仲裁者がこれをレビューできるよう、不適切であると通報されます。'
+        form:
+          label: '新しい単語:'
+          placeholder_regexp: "正規表現"
+          add: '追加'
+          success: '成功'
+          upload: "アップロード"
+          upload_successful: "アップロードが成功し、単語が追加されました。"
       impersonate:
         title: "このユーザに切り替える"
         help: "Use this tool to impersonate a user account for debugging purposes. You will have to log out once finished."
@@ -2023,7 +2521,6 @@ ja:
           pending: "保留中"
           staff: 'スタッフ'
           suspended: '凍結中'
-          blocked: 'ブロック中'
           suspect: 'マーク中'
         approved: "承認?"
         approved_selected:
@@ -2036,10 +2533,12 @@ ja:
           pending: '保留中のユーザ'
           newuser: 'トラストレベル0のユーザ (新しいユーザ)'
           basic: 'トラストレベル1のユーザ (ベーシックユーザ)'
+          member: 'トラストレベル2のユーザ (メンバー)'
+          regular: 'トラストレベル3のユーザ (レギュラー)'
+          leader: 'トラストレベル4のユーザ (リーダー)'
           staff: "スタッフ"
           admins: '管理者ユーザ'
           moderators: 'モデレータ'
-          blocked: 'ブロック中のユーザ'
           suspended: '凍結中のユーザ'
           suspect: 'マーク中のユーザ'
         reject_successful:
@@ -2054,23 +2553,21 @@ ja:
         suspend_failed: "ユーザの凍結に失敗しました: {{error}}"
         unsuspend_failed: "ユーザの凍結解除に失敗しました: {{error}}"
         suspend_duration: "ユーザを何日間凍結しますか?"
-        suspend_duration_units: "(日)"
         suspend_reason_label: "アカウントを凍結する理由を説明してください。ここに書いた理由は、このユーザのプロファイルページにおいて<b>全員が閲覧可能な状態</b>で公開されます。またこのユーザがログインを試みた際にも表示されます。"
         suspend_reason: "理由"
+        suspend_reason_placeholder: "凍結理由"
         suspended_by: "凍結したユーザ"
         delete_all_posts: "全ての投稿を削除"
-        suspend: "凍結"
-        unsuspend: "凍結解除"
-        suspended: "凍結状態"
         moderator: "モデレータ権限の所有"
         admin: "管理者権限の所有"
-        blocked: "ブロック状態"
+        suspended: "凍結状態"
         staged: "ステージドモードの状態"
         show_admin_profile: "アカウントの管理"
         refresh_browsers: "ブラウザを強制更新"
         refresh_browsers_message: "全てのクライアントにメッセージが送信されました！"
         show_public_profile: "パブリックプロフィールを見る"
         impersonate: 'このユーザになりすます'
+        action_logs: "アクションログ"
         ip_lookup: "IPアドレスを検索"
         log_out: "ログアウト"
         logged_out: "すべてのデバイスでログアウトしました"
@@ -2078,8 +2575,8 @@ ja:
         grant_admin: '管理者権限を付与'
         revoke_moderation: 'モデレータ権限を剥奪'
         grant_moderation: 'モデレータ権限を付与'
-        unblock: 'ブロック解除'
-        block: 'ブロック'
+        unsuspend: '凍結解除'
+        suspend: '凍結'
         reputation: レピュテーション
         permissions: パーミッション
         activity: アクティビティ
@@ -2123,13 +2620,18 @@ ja:
         activate_failed: "ユーザのアクティベートに失敗しました。"
         deactivate_account: "アカウントのアクティベート解除"
         deactivate_failed: "ユーザのアクティベート解除に失敗しました。"
-        unblock_failed: 'ユーザのブロック解除に失敗しました。'
-        block_failed: 'ユーザのブロックに失敗しました。'
-        block_confirm: 'このユーザをブロックしてもよろしいですか? ユーザは新しくトピックを作成したり、投稿する事ができなくなります。'
+        bounce_score: "バウンススコア"
+        reset_bounce_score:
+          label: "リセット"
+          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のユーザ"
@@ -2142,7 +2644,7 @@ ja:
           title: "トラストレベル3の条件"
           value_heading: "値"
           requirement_heading: "条件"
-          visits: "訪問"
+          visits: "アクセス"
           days: "日"
           topics_replied_to: "返信したトピック"
           topics_viewed: "閲覧したトピックの数"
@@ -2197,6 +2699,8 @@ ja:
           disabled: "プロフィール非表示"
         show_on_user_card:
           title: "ユーザカードに表示しますか？"
+          enabled: "ユーザーカードに表示する"
+          disabled: "ユーザーカードに表示しない"
         field_types:
           text: 'テキストフィールド'
           confirm: '確認'
@@ -2206,6 +2710,8 @@ ja:
         search: "編集したいものを入力して検索"
         title: 'テキストコンテンツ'
         edit: '編集'
+        revert: "変更を元に戻す"
+        revert_confirm: "本当に変更を元に戻しますか?"
         go_back: "戻る"
         recommended: "それぞれにあわせて、文章を変えることをオススメします:"
         show_overriden: '上書き部分のみ表示'
@@ -2235,11 +2741,14 @@ ja:
           developer: '開発者向け'
           embedding: "埋め込む"
           legal: "法律に基づく情報"
+          user_api: 'ユーザーAPI'
           uncategorized: 'その他'
           backups: "バックアップ"
           login: "ログイン"
           plugins: "プラグイン"
           user_preferences: "ユーザ設定"
+          tags: "タグ"
+          search: "検索"
           groups: "グループ"
       badges:
         title: バッジ
@@ -2316,10 +2825,21 @@ ja:
         image: "画像"
         delete_confirm: "Are you sure you want to delete the :%{name}: emoji?"
       embedding:
+        confirm_delete: "本当にこのホストを削除してもよろしいですか?"
         title: "埋め込み"
+        host: "許可されたホスト"
+        class_name: "クラス名"
         edit: "編集"
         category: "カテゴリへ投稿"
+        add_host: "ホストの追加"
         settings: "埋め込みの設定"
+        feed_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 +2856,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 92557ba3e1..581fbf42b5 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -45,12 +45,16 @@ ko:
           other: "< %{count}초"
         x_seconds:
           other: "%{count}초 전"
+        less_than_x_minutes:
+          other: "< %{count}분"
         x_minutes:
           other: "%{count}분 전"
         about_x_hours:
           other: "%{count}시간"
         x_days:
           other: "%{count}일 전"
+        x_months:
+          other: "%{count}달"
         about_x_years:
           other: "%{count}년"
         over_x_years:
@@ -81,10 +85,10 @@ ko:
           other: "%{count}달 후"
         x_years:
           other: "%{count}년 후"
-      previous_month: '이전 달'
+      previous_month: '지난 달'
       next_month: '다음 달'
     share:
-      topic: '주제를 공유합니다.'
+      topic: '토픽을 공유합니다'
       post: '게시글 #%{postNumber}'
       close: '닫기'
       twitter: 'twitter로 공유'
@@ -94,7 +98,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 +121,34 @@ 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_east_2: "미국 동부 (오하이오)"
+        us_gov_west_1: "AWS GovCloud(US)"
+        us_west_1: "미국 서부 (N. 캘리포니아)"
+        us_west_2: "미국 서부 (오레곤)"
+    edit: '이 토픽의 제목과 카테고리 편집'
     not_implemented: "죄송합니다. 아직 사용할 수 없는 기능입니다."
     no_value: "아니오"
     yes_value: "예"
@@ -178,7 +190,7 @@ ko:
     character_count:
       other: "{{count}} 자"
     suggested_topics:
-      title: "추천 주제"
+      title: "추천 토픽"
       pm_title: "추천 메세지"
     about:
       simple_title: "About"
@@ -191,7 +203,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 +213,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 +249,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 +264,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 +274,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 +293,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 +318,9 @@ ko:
         title: "로그"
         when: "언제"
         action: "액션"
+        acting_user: "활동하는 사용자"
         target_user: "대상 사용자"
-        subject: "주제"
+        subject: "제목"
         details: "자세한 내용"
         from: "부터"
         to: "까지"
@@ -316,43 +329,57 @@ ko:
         full_name: '전체 이름'
         add_members: "구성원 추가"
         delete_member_confirm: "'%{username}'를 '%{group}' 그룹에서 삭제하겠습니까?"
-      request_membership_pm:
-        title: "멤버십 요청"
-        body: "@%{groupName} 에 멤버십을 요청합니다."
       name_placeholder: "그룹 이름, 공백 없이 username 규칙과 동일하게 입력하세요."
-      public: "사용자들이 그룹을 자유롭게 참여/탈퇴 가능하게 합니다. (그룹은 반드시 공개되어야 함)"
+      public_admission: "사용자가 그룹에 자유롭게 가입할 수 있도록 허용합니다. (그룹이 공개되어야 함)"
+      public_exit: "사용자가 그룹을 자유롭게 탈퇴할 수 있도록 허용합니다."
       empty:
         posts: "이 그룹에는 아직 멤버들이 포스트를 작성하지 않았습니다."
         members: "이 그룹에는 구성원이 없습니다."
         mentions: "이 그룹에서는 언급이 없습니다."
         messages: "이 그룹에 대한 메시지는 없습니다."
-        topics: "이 그룹의 구성원이 작성한 주제글이 없습니다."
+        topics: "이 그룹의 멤버가 작성한 토픽이 없습니다."
         logs: "이 그룹에 대한 기록이 없습니다."
       add: "추가"
       join: "그룹 참여하기"
       leave: "그룹 나가기"
       request: "그룹 참여 요청하기"
+      message: "메세지"
+      automatic_group: 자동 그룹
       closed_group: 닫힌 그룹
       is_group_user: "당신은 이 그룹의 구성원입니다."
+      allow_membership_requests: "사용자가 그룹 소유자에게 가입신청을 할 수 있도록 허용합니다"
+      membership_request_template: "가입 요청을 전송할 때 사용자에게 표시할 커스텀 템플릿"
+      membership_request:
+        submit: "요청 보내기"
+        title: "@%{group_name}에 가입 요청하기"
+        reason: "그룹 소유자에게 왜 이 그룹에 속해야하는지 알립니다."
       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: "누가 이 그룹에 메시지와 @멘션을 보낼 수 있습니까?"
+        mentionable: "누가 이 그룹에 @멘션을 할 수 있나요?"
+        messageable: "누가 이 그룹에 메시지를 보낼 수 있나요?"
         nobody: "0명"
         only_admins: "관리자 전용"
         mods_and_admins: "운영자 및 관리자만"
@@ -367,8 +394,9 @@ ko:
           description: "이 메시지에 새로운 답글이 있을 때 알림을 받게 되며 새로운 답글의 개수는 표시됩니다."
         watching_first_post:
           title: "첫번째 글 보기"
+          description: "이 그룹의 신규 토픽에 대해서만 알림을 받게 됩니다."
         tracking:
-          title: "알림 : 새 글 표시 중"
+          title: "추적 중"
           description: "누군가 당신의 @아이디 로 언급했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다."
         regular:
           title: "알림 : 일반"
@@ -376,12 +404,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 +441,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: (알수없음)
@@ -429,6 +465,7 @@ ko:
       topics_entered: "입력된 제목:"
       post_count: "포스트 개수"
       confirm_delete_other_accounts: "정말 이 계정들을 삭제하시겠습니까?"
+      powered_by: "powered by <a href='https://ipinfo.io'>ipinfo.io</a>"
     user_fields:
       none: "(옵션을 선택하세요)"
     user:
@@ -436,6 +473,11 @@ ko:
       profile: "프로필"
       mute: "알림 끄기"
       edit: "환경 설정 편집"
+      download_archive:
+        button_text: "모두 다운로드하기"
+        confirm: "정말로 작성한 모든 글을 다운로드할까요?"
+        success: "다운로드가 시작되었습니다. 다운로드 과정이 완료되면 메시지로 알려드리겠습니다."
+        rate_limit_error: "게시글은 하루에 한번만 다운로드할 수 있습니다. 내일 다시 시도해보세요."
       new_private_message: "새로운 메시지"
       private_message: "메시지"
       private_messages: "메시지"
@@ -453,14 +495,18 @@ ko:
         not_supported: "안타깝게도 지금 사용하고 계시는 브라우저는 알림을 지원하지 않습니다."
         perm_default: "알림 켜기"
         perm_denied_btn: "권한 거부"
-        perm_denied_expl: "통지를 위한 허용을 거절했었습니다. 브라우저 설정을 통해서 통지를 허용해주세요."
+        perm_denied_expl: "알림을 허가하지 않으셨군요. 브라우저 설정을 통해서 알림을 허용해주세요."
         disable: "알림 비활성화"
         enable: "알림 활성화"
         each_browser_note: "노트: 사용하시는 모든 브라우저에서 이 설정을 변경해야합니다."
+      dismiss: '해지'
       dismiss_notifications: "모두 해지"
       dismiss_notifications_tooltip: "읽지 않은 알림을 모두 읽음으로 표시"
+      first_notification: "당신의 첫 번째 알림입니다! 시작하려면 선택해보세요."
       disable_jump_reply: "댓글을 작성했을 때, 새로 작성한 댓글로 화면을 이동하지 않습니다."
       dynamic_favicon: "새 글이나 업데이트된 글 수를 브라우저 아이콘에 보이기"
+      theme_default_on_all_devices: "이 테마를 모든 기기의 기본 테마로 설정합니다."
+      allow_private_messages: "다른 사용자가 개인 메시지를 보내도록 허용합니다."
       external_links_in_new_tab: "모든 외부 링크를 새 탭에 열기"
       enable_quoting: "강조 표시된 텍스트에 대한 알림을 사용합니다"
       change: "변경"
@@ -468,25 +514,40 @@ ko:
       admin: "{{user}}님은 관리자 입니다"
       moderator_tooltip: "이 회원은 운영자 입니다"
       admin_tooltip: "이 회원은 관리자입니다."
-      blocked_tooltip: "이 회원은 차단되었습니다"
+      silenced_tooltip: "이 회원은 차단되었습니다"
       suspended_notice: "이 회원은 {{date}}까지 접근 금지 되었습니다."
-      suspended_reason: "이유: "
+      suspended_permanently: "이 회원은 일시정지되었습니다."
+      suspended_reason: "사유: "
       github_profile: "Github"
       email_activity_summary: "활동 요약"
       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 +557,17 @@ 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: "테마"
+      home: "기본 홈페이지"
+      staged: "격리됨"
       staff_counters:
         flags_given: "유용한 신고"
         flagged_posts: "신고된 글"
@@ -516,25 +585,37 @@ 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: "이메일 변경"
         taken: "죄송합니다. 해당 이메일은 사용 할 수 없습니다."
         error: "이메일 변경 중 오류가 발생했습니다. 이미 사용 중인 이메일인지 확인해주세요."
         success: "이메일 발송이 완료되었습니다. 확인하신 후 절차에 따라주세요."
+        success_staff: "현재 주소로 이메일을 보냈습니다. 확인 절차에 따라 진행해 주세요."
       change_avatar:
         title: "프로필 사진 변경"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a> 기반"
@@ -555,6 +636,7 @@ ko:
         instructions: "배경 이미지는 가운데를 기준으로 표시되며 590px이 기본 가로 사이즈 입니다."
       email:
         title: "이메일"
+        instructions: "절대로 공개되지 않습니다"
         ok: "내 이메일로 확인 메일이 전송됩니다."
         invalid: "유효한 이메일 주소를 입력해주세요."
         authenticated: "내 이메일이 {{provider}}에 의해 인증되었습니다."
@@ -563,14 +645,17 @@ ko:
           other: "최근  {{count}}분 동안접속하지 않을 경우에만 메일이 전송됩니다."
       name:
         title: "이름"
+        instructions: "이름 (선택사항)"
         instructions_required: "이름"
         too_short: "이름이 너무 짧습니다."
         ok: "사용 가능한 이름입니다."
       username:
         title: "아이디"
+        instructions: "공백없이, 짧고 특이하게"
         short_instructions: "@{{username}}으로 멘션이 가능합니다."
-        available: "아이디\x1D로 사용가능합니다."
+        available: "아이디로 사용가능합니다."
         not_available: "사용할 수 없는 아이디입니다. 다시 시도해보세요. {{suggestion}}"
+        not_available_no_suggestion: "불가합니다"
         too_short: "아이디가 너무 짧습니다"
         too_long: "아이디가 너무 깁니다."
         checking: "사용가능한지 확인 중..."
@@ -579,6 +664,7 @@ ko:
         title: "인터페이스 언어"
         instructions: "UI 언어. 변경 후 새로 고침하면 반영됩니다."
         default: "(기본)"
+        any: "무관"
       password_confirmation:
         title: "비밀번호를 재입력해주세요."
       last_posted: "마지막글"
@@ -592,36 +678,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 +722,7 @@ ko:
         after_4_minutes: "4분 후"
         after_5_minutes: "5분 후"
         after_10_minutes: "10분 후"
+      notification_level_when_replying: "토픽에 포스트를 쓰면 그 토픽을 다음으로 설정"
       invited:
         search: "검색"
         title: "초대"
@@ -647,21 +738,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,27 +770,43 @@ ko:
         same_as_username: "비밀번호가 아이디와 동일합니다."
         same_as_email: "비밀번호가 이메일과 동일합니다."
         ok: "적절한 암호입니다."
+        instructions: "최소 %{count} 자"
       summary:
         title: "요약"
         stats: "통계"
         time_read: "읽은 시간"
+        recent_time_read: "최근 읽은 시간"
         topic_count:
           other: "작성 시간"
         post_count:
           other: "작성 시간"
         likes_given:
-          other: "좋아요"
+          other: "누름"
         likes_received:
           other: "받음"
+        days_visited:
+          other: "방문일수"
+        topics_entered:
+          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 +851,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: '월'
@@ -748,7 +873,8 @@ ko:
     first_post: 첫 번째 글
     mute: 음소거
     unmute: 음소거 해제
-    last_post: 최근 글
+    last_post: 게시날짜
+    time_read: 읽음
     last_reply_lowercase: 마지막 답글
     replies_lowercase:
       other: 답글
@@ -773,7 +899,9 @@ ko:
     private_message_info:
       title: "메시지"
       invite: "다른 사람 초대"
+      leave_message: "정말로 이 메시지를 남길까요?"
       remove_allowed_user: "{{name}}에게서 온 메시지를 삭제할까요?"
+      remove_allowed_group: "{{name}}에게서 온 메시지를 삭제할까요?"
     email: '이메일'
     username: '아이디'
     last_seen: '마지막 접속'
@@ -782,6 +910,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 +924,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 +940,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 +965,9 @@ ko:
       twitter:
         title: "with Twitter"
         message: "Twitter 인증 중(팝업 차단을 해제 하세요)"
+      instagram:
+        title: "인스타그램"
+        message: "인스타그램으로 인증 중 (팝업이 허용되어 있는지 확인해주세요)"
       facebook:
         title: "with Facebook"
         message: "Facebook 인증 중(팝업 차단을 해제 하세요)"
@@ -836,23 +977,74 @@ 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"
+      google_classic: "Google 클래식"
+      facebook_messenger: "Facebook 메신저"
+    category_page_style:
+      categories_only: "카테고리만"
+      categories_with_featured_topics: "주요 토픽이 있는 카테고리"
+      categories_and_latest_topics: "카테고리와 최신 토픽"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      filter_placeholder: 이모지 찾기
+      people: 인물
+      nature: 자연
+      food: 음식
+      activity: 활동
+      travel: 여행
+      objects: 사물
+      celebration: 축하
+      custom: 커스텀 emoji
+      recent: 최근 사용
+      default_tone: 피부색 없음
+      light_tone: 밝은 피부색
+      medium_light_tone: 약간 밝은 피부색
+      medium_tone: 중간 피부색
+      medium_dark_tone: 약간 어두운 피부색
+      dark_tone: 어두운 피부색
     composer:
       emoji: "이모지 :)"
       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 +1063,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,51 +1076,62 @@ 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_title: "표제"
-      heading_text: "표제"
-      hr_title: "수평선"
       help: "마크다운 편집 도움말"
-      toggler: "작성 패널을 숨기거나 표시"
       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>"
-      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>"
-      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>"
-      granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>'{{description}}' 배지를 받았습니다.</p>"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}} "
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      liked_many:
+        other: "<span>{{username}}, {{username2}} 외 {{count}} 명의 사용자가</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> 님이 초대를 수락했습니다"
+      moved_post: "<span>{{username}}</span> 님이 {{description}} (을)를 이동했습니다"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "'{{description}}' 를 받았습니다"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>새 토픽</span> {{description}}"
       group_message_summary:
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{group_name}} 메시지상자에 {{count}}개의 메시지가 있습니다</p>"
+        other: " {{group_name}} 사서함에 {{count}} 개의 메시지가 있습니다"
       alt:
         mentioned: "멘션 by"
         quoted: "인용  by"
@@ -968,29 +1173,73 @@ ko:
       sort_by: "다음으로 정렬"
       relevance: "관련성"
       latest_post: "가장 최근 글"
+      latest_topic: "최신 토픽"
       most_viewed: "가장 많이 본"
       most_liked: "가장 많이 좋아요를 받은"
       select_all: "모두 선택"
       clear_all: "다 지우기"
-      result_count:
-        other: "<span class='term'>\"{{term}}\"</span> 검색결과 {{count}} 개"
+      too_short: "검색 단어가 너무 짧습니다."
       title: "주제, 글, 사용자, 카테고리 검색"
       no_results: "검색 결과가 없습니다"
       no_more_results: "더 이상 결과가 없습니다."
       searching: "검색중..."
       post_format: "#{{post_number}} by {{username}}"
+      more_results: "검색 결과가 많습니다. 검색 조건을 좁혀보세요."
+      cant_find: "원하는 걸 찾을 수 없으신가요?"
+      start_new_topic: "새 토픽을 만들어볼까요?"
+      or_search_google: "혹은 구글에서 검색해볼 수도 있습니다."
+      search_google: "대신 구글에서 검색해보세요."
+      search_google_button: "Google"
+      search_google_title: "이 사이트 검색"
       context:
         user: "@{{username}}의 글 검색"
+        category: "#{{category}} 카테고리에서 검색"
         topic: "이 주제를 검색"
         private_messages: "메시지 검색"
+      advanced:
+        title: 고급 검색
+        posted_by:
+          label: 글쓴이
+        in_group:
+          label: 그룹에 속한
+        with_badge:
+          label: 배지가 있는
+        filters:
+          likes: 내가 좋아요 누른
+          posted: 내가 게시글을 쓴
+          watching: 내가 주시하는
+          tracking: 내가 추적하는
+          first: 가 가장 첫 포스트입니다.
+          pinned: 핀고정된
+          unpinned: 핀고정 되지 않은
+          unseen: 읽지 않은 것
+          wiki: 은(는) 위키입니다.
+        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 +1250,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 +1291,8 @@ ko:
       unsubscribe:
         stop_notifications: "<strong>{{title}}</strong>에 대한 알림은 이제 덜 받게 됩니다."
         change_notification_state: "현재 당신의 알림 설정 : "
+      filter_to:
+        other: "이 토픽에 {{count}}개 게시글"
       create: '새 주제 만들기'
       create_long: '새로운 주제 만들기'
       private_message: '메시지 시작'
@@ -1076,30 +1334,91 @@ 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 { 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 {}}"
       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: "게시일:"
+        public_timer_types: 토픽 타이머
+        private_timer_types: 사용자 토픽 타이머
+      auto_update_input:
+        none: "시간대 선택"
+        later_today: "오늘 늦게"
+        tomorrow: "내일"
+        later_this_week: "이번 주 후반"
+        this_weekend: "이번 주말"
+        next_week: "다음 주"
+        two_weeks: "2주"
+        next_month: "다음 달"
+        forever: "영구적"
+        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 +1431,10 @@ ko:
           title: "주시 중"
           description: "이 주제에 새로운 답글이 있을 때 알림을 받게 되며 새로운 답글의 개수는 표시됩니다."
         tracking_pm:
-          title: "알림 : 새 글 표시 중"
+          title: "추적 중"
           description: "이 메시지의 읽지않은 응답의 수가 표시됩니다. 누군가 내 @아이디를 멘션했거나 내게 답글을 작성하면 알림을 받습니다."
         tracking:
-          title: "새 글 표시 중"
+          title: "추적 중"
           description: "이 주제의 새로운 답글의 수가 표시됩니다. 누군가 내 @아이디를 멘션했거나 내게 답글을 작성하면 알림을 받습니다."
         regular:
           title: "알림 : 일반"
@@ -1135,6 +1454,7 @@ ko:
         open: "주제 열기"
         close: "주제 닫기"
         multi_select: "글 선택"
+        timed_update: "토픽 타이머 설정..."
         pin: "주제 고정..."
         unpin: "주제 고정 취소..."
         unarchive: "주제 보관 취소"
@@ -1142,18 +1462,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 +1511,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: "아이디"
@@ -1206,6 +1537,7 @@ ko:
         success_email: "<b>{{emailOrUsername}}</b>로 초대장을 발송했습니다. 초대를 수락하면 알려 드리겠습니다. 초대상태를 확인하려면 사용자 페이지에서 '초대장' 탭을 선택하세요."
         success_username: "사용자가 이 주제에 참여할 수 있도록 초대했습니다."
         error: "그 사람을 초대할 수 없습니다. 혹시 이미 초대하진 않았나요?  (Invites are rate limited)"
+        success_existing_email: "해당 email을 사용하고 있는 사용자 <b>{{emailOrUsername}}</b> 가 이미 존재합니다. 그 사용자를 이 토픽에 참여하도록 초청했습니다."
       login_reply: '로그인하고 답글 쓰기'
       filters:
         n_posts:
@@ -1224,6 +1556,10 @@ ko:
         error: "이 주제를 이동시키는데 문제가 발생하였습니다."
         instructions:
           other: " <b>{{count}}</b>개의 글을 옮길 주제를 선택해주세요."
+      merge_posts:
+        title: "선택한 게시글 합치기"
+        action: "선택한 게시글 합치기"
+        error: "선택한 게시글을 합치는 중 에러가 발생했습니다."
       change_owner:
         title: "글 소유자 변경"
         action: "작성자 바꾸기"
@@ -1234,13 +1570,14 @@ ko:
           other: "<b>{{old_user}}</b>(이)가 작성한 글의 새로운 작성자를 선택해주세요."
         instructions_warn: "이 글에 대한 알림이 새 사용자에게 자동으로 이전되지 않습니다.\n<br>경고: 글과 연관된 데이터가 새로운 사용자로 이전되지 않습니다. 주의해서 사용하세요."
       change_timestamp:
+        title: "타임스탬프 변경하기..."
         action: "타임스탬프 변경"
         invalid_timestamp: "타임스탬프는 미래값으로 할 수 없습니다."
         error: "주제의 시간을 변경하는 중 오류가 발생하였습니다."
+        instructions: "토픽의 새로운 타임스탬프를 선택해주세요. 토픽에 속한 게시글은 같은 시간 간격으로 조정됩니다."
       multi_select:
         select: '선택'
         selected: '({{count}})개가 선택됨'
-        select_replies: '선택 + 답글'
         delete: 선택 삭제
         cancel: 선택을 취소
         select_all: 전체 선택
@@ -1250,11 +1587,13 @@ ko:
     post:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
-      edit: "{{link}} {{replyAvatar}} {{username}} 편집"
+      quote_reply: "인용하기"
       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 +1617,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,26 +1629,26 @@ 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: "이 글을 삭제합니다."
         undelete: "이 글 삭제를 취소합니다."
         share: "이 글에 대한 링크를 공유합니다."
         more: "더"
-        delete_replies:
-          confirm:
-            other: "이 글에 작성된 {{count}}개의 댓글도 삭제하시겠습니까?"
-          yes_value: "예, 답글도 삭제합니다."
-          no_value: "아니오, 글만 삭제합니다."
         admin: "관리자 기능"
         wiki: "위키 만들기"
         unwiki: "위키 제거하기"
@@ -1317,8 +1659,6 @@ ko:
         change_owner: "소유자 변경"
       actions:
         flag: '신고하기'
-        defer_flags:
-          other: "신고 보류하기"
         undo:
           off_topic: "신고 취소"
           spam: "신고 취소"
@@ -1378,9 +1718,9 @@ ko:
             other: "{{count}}명이 좋아합니다"
           vote:
             other: "{{count}}명이 이 글에 투표했습니다"
-      delete:
+      merge:
         confirm:
-          other: "모든 글들을 삭제하시겠습니까?"
+          other: "정말로 이 {{count}}개의 게시글을 합칠까요?"
       revisions:
         controls:
           first: "초판"
@@ -1389,14 +1729,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 +1765,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 +1796,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 +1823,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 +1889,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 +1905,14 @@ ko:
         help: "이 주제는 폐쇄되었습니다. 더 이상 새 답글을 받을 수 없습니다."
       archived:
         help: "이 주제는 보관중입니다. 고정되어 변경이 불가능합니다."
+      locked_and_archived:
+        help: "이 토픽은 폐쇄되어 보관중입니다. 새로운 답글을 달거나 수정할 수 없습니다."
       unpinned:
         title: "핀 제거"
         help: "이 주제는 핀 제거 되었습니다. 목록에서 일반적인 순서대로 표시됩니다."
       pinned_globally:
         title: "핀 지정됨 (전역적)"
+        help: "이 토픽은 전체 핀고정되었습니다. 최신 토픽과 이 토픽이 속한 카테고리 최상단에 표시됩니다."
       pinned:
         title: "핀 지정됨"
         help: "이 주제는 고정되었습니다. 카테고리의 상단에 표시됩니다."
@@ -1508,16 +1921,18 @@ ko:
     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 {}}
+      이 토픽에는 {ratio, select,
+      low {포스트 대비 높은 좋아요를 받은}
+      med {포스트 대비 매우 높은 좋아요를 받은}
+      high {포스트 대비 엄청나게 높은 좋아요를 받은}
+      other {}} {count, plural, one {1 개} other {# 개의 답글이 있습니다.}}
     original_post: "원본 글"
     views: "조회수"
     views_lowercase:
       other: "조회"
     replies: "답변"
+    views_long:
+      other: "이 토픽은 {{number}}번 조회되었습니다."
     activity: "활동"
     likes: "좋아요"
     likes_lowercase:
@@ -1530,6 +1945,7 @@ ko:
     history: "기록"
     changed_by: "{{author}}에 의해"
     raw_email:
+      title: "수신 이메일"
       not_available: "Raw 이메일이 가능하지 않습니다."
     categories_list: "카테고리 목록"
     filters:
@@ -1606,17 +2022,180 @@ 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> 또는 <b>ctrl</b>+<b>alt</b>+<b>f</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: "태그"
+      delete_tag: "태그 삭제"
+      delete_confirm:
+        other: "정말로 이 태그를 삭제하고 이 태그가 붙은 {{count}} 개의 토픽에서 태그를 제거할까요?"
+      delete_confirm_no_topics: "정말로 이 태그를 삭제할까요?"
+      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: "대시보드"
@@ -1637,7 +2216,6 @@ ko:
         no_problems: "아무런 문제가 발견되지 않았습니다."
         moderators: '운영자:'
         admins: '관리자:'
-        blocked: '블락됨:'
         suspended: '접근금지:'
         private_messages_short: "메시지"
         private_messages_title: "메시지"
@@ -1647,6 +2225,8 @@ ko:
         backups: "백업"
         traffic_short: "트래픽"
         traffic: "어플리케이션 웹 요청"
+        page_views: "페이지뷰"
+        page_views_short: "페이지뷰"
         show_traffic_report: "자세한 트래픽 리포트 보기"
         reports:
           today: "오늘"
@@ -1658,6 +2238,7 @@ ko:
           30_days_ago: "30일"
           all: "전체"
           view_table: "테이블"
+          view_graph: "그래프"
           refresh_report: "보고서 새로고침"
           start_date: "시작일"
           end_date: "종료일"
@@ -1667,24 +2248,15 @@ ko:
         by: "에 의해"
       flags:
         title: "신고"
-        old: "지난"
-        active: "활성화된"
+        active_posts: "신고된 포스트"
+        old_posts: "오래된 신고 포스트"
+        topics: "신고된 토픽"
         agree: "동의"
         agree_title: "이 신고가 올바르고 타당함을 확인합니다"
-        agree_flag_modal_title: "동의 및 ..."
-        agree_flag_hide_post: "동의 (글 숨기기 + 개인 메시지 보내기)"
-        agree_flag_hide_post_title: "이 글을 숨기고 글쓴이에게 글을 수정하라고 개인메시지 자동발송하기"
-        agree_flag_restore_post: "동의 (글 복원)"
-        agree_flag_restore_post_title: "글을 복원하기"
-        agree_flag: "신고에 동의함"
-        agree_flag_title: "신고에 동의하며 글이 수정되지 않도록 유지하기"
-        defer_flag: "연기"
         defer_flag_title: "신고 제거하기. 별도추가조치는 더이상 필요없습니다"
         delete: "삭제"
         delete_title: "신고에서 멘션된 글 삭제하기"
-        delete_post_defer_flag: "글을 삭제하고 신고를 보류함"
         delete_post_defer_flag_title: "글을 삭제하고 첫번째 글이면 주제 삭제하기"
-        delete_post_agree_flag: "글을 삭제하고 신고에 동의함"
         delete_post_agree_flag_title: "글을 삭제하고 첫번째 글이면 주제 삭제하기"
         delete_flag_modal_title: "삭제하고.."
         delete_spammer: "스패머 삭제"
@@ -1696,32 +2268,35 @@ ko:
         clear_topic_flags: "완료"
         clear_topic_flags_title: "주제 조사를 끝냈고 이슈를 해결했습니다. 신고를 지우기 위해 완료를 클릭하세요"
         more: "(더 많은 답글...)"
+        suspend_user: "정지된 사용자"
+        suspend_user_title: "이 포스트에 한하여 사용자 일시정지"
         dispositions:
-          agreed: "agreed"
-          disagreed: "disagreed"
-          deferred: "유예 중인"
+          agreed: "동의"
+          disagreed: "반대"
         flagged_by: "신고 한 사람"
         resolved_by: "해결 by"
         took_action: "처리하기"
         system: "System"
         error: "뭔가 잘못 됐어요"
         reply_message: "답글"
-        no_results: "신고가 없습니다."
+        no_results: "신고된 포스트가 없습니다."
         topic_flagged: "이 <strong> 주제 </strong>는 신고 되었습니다."
+        show_full: "전체 포스트 보기"
         visit_topic: "처리하기 위해 주제로 이동"
         was_edited: "첫 신고 이후에 글이 수정되었음"
         previous_flags_count: "이 글은 이미 {{count}}번 이상 신고 되었습니다."
-        summary:
-          action_type_3:
-            other: "off-topic x{{count}}"
-          action_type_4:
-            other: "부적절한 x{{count}}"
-          action_type_6:
-            other: "custom x{{count}}"
-          action_type_7:
-            other: "custom x{{count}}"
-          action_type_8:
-            other: "스팸 x{{count}}"
+        show_details: "신고내용 자세히 보기"
+        flagged_topics:
+          topic: "토픽"
+          type: "타입"
+          users: "사용자"
+          last_flagged: "마지막으로 신고받은 때"
+        short_names:
+          off_topic: "주제 벗어남"
+          inappropriate: "부적절"
+          spam: "스팸"
+          notify_user: "커스텀"
+          notify_moderators: "커스텀"
       groups:
         primary: "주 그룹"
         no_primary: "(주 그룹이 없습니다.)"
@@ -1740,17 +2315,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 +2341,76 @@ 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: "사용자 이벤트"
+        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 +2429,14 @@ ko:
           backups: "백업"
           logs: "로그"
         none: "가능한 백업이 없습니다."
+        read_only:
+          enable:
+            title: "읽기 전용 모드 활성화하기"
+            label: "읽기 전용 활성화하기"
+            confirm: "정말로 읽기 전용 모드를 활성화할까요?"
+          disable:
+            title: "읽기 전용 모드 비활성화 하기"
+            label: "읽기 전용 비활성화하기"
         logs:
           none: "아직 로그가 없어요."
         columns:
@@ -1808,6 +2462,8 @@ ko:
             without_uploads: "예 (파일을 포함하지 않음)"
           download:
             label: "다운로드"
+            title: "다운로드 링크를 붙여서 이메일 보내기"
+            alert: "이 백업의 다운로드 링크를 당신에게 이메일로 보냈습니다"
           destroy:
             title: "백업 삭제"
             confirm: "정말 이 백업을 삭제할까요?"
@@ -1839,15 +2495,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 +2518,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 +2614,7 @@ ko:
             description: "사이트 헤더에 텍스트와 아이콘"
           highlight:
             name: '하이라이트'
-            description: '페이지 내에 강조된 글 및 주제 등의 배경색'
+            description: '포스트나 토픽과 같은 페이지 내에서 강조된 요소의 배경색'
           danger:
             name: '위험'
             description: '글 삭제 등에 사용되는 강조색'
@@ -1906,6 +2634,7 @@ ko:
         test_error: "테스트 메일을 전송하는데 문제가 있습니다. 메일 설정을 다시한번 체크해보고 메일 전송이 정상인지 다시 확인하고 시도해주세요."
         sent: "보냄"
         skipped: "생략됨"
+        bounced: "반송됨"
         received: "전송받음"
         rejected: "거부됨"
         sent_at: "보냄"
@@ -1919,10 +2648,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 +2666,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 +2694,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 +2704,8 @@ ko:
           block: "블락"
           do_nothing: "아무것도 하지 않음"
         staff_actions:
+          all: "전체"
+          filter: "필터:"
           title: "스태프 기록"
           clear_filters: "전체 보기"
           staff_user: "스태프 사용자"
@@ -1988,13 +2726,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"
@@ -2002,12 +2742,23 @@ ko:
             change_category_settings: "카테고리 설정 변경"
             delete_category: "카테고리 지우기"
             create_category: "카테고리 만들기"
-            block_user: "사용자 차단"
-            unblock_user: "사용자 차단 해제"
             grant_admin: "관리자권한 부여"
             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: "누군가가 새로운 계정을 만들면 아래 이메일 주소는 체크되고 등록은 블락됩니다, 또는 다른 조치가 취해집니다."
@@ -2040,6 +2791,31 @@ ko:
             title: "Creates new subnet ban entries if there are at least 'min_ban_entries_for_roll_up' entries."
         logster:
           title: "에러 로그"
+      watched_words:
+        title: "\b감시 단어"
+        search: "검색"
+        clear_filter: "지우기"
+        show_words: "단어 보이기"
+        word_count:
+          other: "%{count}개 단어"
+        actions:
+          block: '차단'
+          censor: '가리기'
+          require_approval: '승인 필요'
+          flag: '신고'
+        action_descriptions:
+          block: '이 단어를 포함한 포스트는 게시되지 못하게 합니다. 사용자가 포스트를 올리려할 때 에러 메시지를 표시합니다.'
+          censor: '이 단어를 포함해도 포스트는 올라가지만, 가리기 설정된 단어는 다른 글자로 교체됩니다.'
+          require_approval: '이 단어를 포함한 포스트가 올라가려면 스탭의 허가가 필요합니다.'
+          flag: '이 단어를 포함해도 포스트의 게시는 허용되지만, 부적절한 포스트로 자동신고되어 운영자가 리뷰할 수 있습니다.'
+        form:
+          label: '새 단어:'
+          placeholder: '전체 단어 또는 * 을 와일드카드로 사용'
+          placeholder_regexp: "정규표현식"
+          add: '추가'
+          success: '성공'
+          upload: "업로드"
+          upload_successful: "성공적으로 업로드되었습니다. 단어가 추가되었습니다."
       impersonate:
         title: "이 사용자 행세하기"
         help: "디버깅 목적으로 사용자 계정으로 로그인 할 수 있습니다. 사용이 끝나면 로그아웃하여야 합니다."
@@ -2059,7 +2835,6 @@ ko:
           pending: "보류된 사용자"
           staff: '스태프'
           suspended: '접근 금지 사용자'
-          blocked: '블락된 사용자'
           suspect: '의심스러운 사용자'
         approved: "승인?"
         approved_selected:
@@ -2078,7 +2853,6 @@ ko:
           staff: "스태프"
           admins: '관리자'
           moderators: '운영자'
-          blocked: '블락된 사용자들'
           suspended: '접근 금지된 사용자들'
           suspect: '의심스러운 사용자들'
         reject_successful:
@@ -2093,41 +2867,46 @@ ko:
         suspend_failed: "이 사용자를 접근 금지하는데 오류 발생 {{error}}"
         unsuspend_failed: "이 사용자를 접근 허용 하는데 오류 발생 {{error}}"
         suspend_duration: "사용자를 몇일 접근 금지 하시겠습니까?"
-        suspend_duration_units: "(일)"
         suspend_reason_label: "Why are you suspending? This text <b>will be visible to everyone</b> on this user's profile page, and will be shown to the user when they try to log in. Keep it short."
+        suspend_reason_hidden_label: "이 사용자를 일시정지하는 사유는 무엇인가요? 이 텍스트는 해당 사용자가 로그인할 때 보이게 됩니다. 짧게 적어주세요."
         suspend_reason: "Reason"
+        suspend_reason_placeholder: "일시정지 사유"
+        suspend_message: "이메일 메시지"
+        suspend_message_placeholder: "필요한 경우, 사용자에게 이메일을 통하여 일시정지에 대한 더 많은 정보를 제공할 수 있습니다."
         suspended_by: "접근 금지자"
+        suspended_until: "(%{until} 까지)"
+        cant_suspend: "이 사용자는 일시정지할 수 없습니다."
         delete_all_posts: "모든 글을 삭제합니다"
-        suspend: "접근 금지"
-        unsuspend: "접근 허용"
-        suspended: "접근 금지?"
+        delete_all_posts_confirm_MF: " {POSTS, plural, one {1개의 포스트} other {#개의 포스트}} 와 {TOPICS, plural, one {1개의 토픽} other {#개의 토픽}}을 삭제하려고 합니다. 정말로 삭제할까요?"
         moderator: "운영자?"
         admin: "관리자?"
-        blocked: "블락"
+        suspended: "접근 금지?"
         staged: "격리조치?"
         show_admin_profile: "관리자"
         refresh_browsers: "브라우저 새로 고침"
         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: '언블락'
-        block: '블락'
+        unsuspend: '접근 허용'
+        suspend: '접근 금지'
         reputation: 평판
         permissions: 권한
         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: 받은 경고
@@ -2162,13 +2941,18 @@ ko:
         activate_failed: "사용자 활성화에 문제가 있습니다."
         deactivate_account: "계정 비활성화"
         deactivate_failed: "사용자 비활성에 문제가 있습니다."
-        unblock_failed: '사용자 언블락에 문제가 있습니다.'
-        block_failed: '사용자 블락에 문제가 있습니다.'
-        block_confirm: '정말로 이 사용자를 차단하겠습니까? 차단된 사용자는 어떠한 주제나나 글도 작성할 수 없습니다.'
-        block_accept: '네, 이 사용자를 차단합니다.'
+        bounce_score: "반송 스코어"
+        reset_bounce_score:
+          label: "리셋"
+          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등급 회원들"
@@ -2179,13 +2963,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 +3020,10 @@ ko:
           title: "다른 사람이 프로필을 볼수 있게할까요?"
           enabled: "프로필에 표시"
           disabled: "프로필에 표시하지 않기"
+        show_on_user_card:
+          title: "사용자 카드에 표시할까요?"
+          enabled: "사용자 카드에 표시하기"
+          disabled: "사용자 카드에 표시하지 않기"
         field_types:
           text: '텍스트 필드'
           confirm: '확인'
@@ -2274,11 +3064,15 @@ ko:
           developer: '개발자'
           embedding: "Embedding"
           legal: "법률조항"
+          user_api: '사용자 API'
           uncategorized: '카테고리 없음'
           backups: "백업"
           login: "로그인"
           plugins: "플러그인"
           user_preferences: "회원 환경설정"
+          tags: "태그"
+          search: "검색"
+          groups: "그룹"
       badges:
         title: 배지
         new_badge: 새 배지
@@ -2287,13 +3081,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 +3121,7 @@ ko:
           post_revision: "회원이 새글을 쓰거나 글을 수정할 때"
           trust_level_change: "회원등급이 바뀔 때"
           user_change: "회원이 생성되거나 수정될 때"
+          post_processed: "이 게시글 처리 후 소요됨"
         preview:
           link_text: "수여된 배지 미리보기"
           plan_text: "쿼리 플랜 미리보기"
@@ -2354,9 +3150,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 +3163,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 +3190,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.lv.yml b/config/locales/client.lv.yml
new file mode 100644
index 0000000000..f3e61363c7
--- /dev/null
+++ b/config/locales/client.lv.yml
@@ -0,0 +1,3215 @@
+# 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/
+
+lv:
+  js:
+    number:
+      format:
+        separator: ","
+        delimiter: ","
+      human:
+        storage_units:
+          format: '%n %u'
+          units:
+            byte:
+              zero: baiti
+              one: baits
+              other: baiti
+            gb: GB
+            kb: KB
+            mb: MB
+            tb: TB
+      short:
+        thousands: "{{number}} tūkst."
+        millions: "{{number}} milj."
+    dates:
+      time: "hh:mm"
+      timeline_date: "MMM YYYY"
+      long_no_year: "MMM D hh:mm"
+      long_no_year_no_time: "MMM D"
+      full_no_year_no_time: "MMMM Do"
+      long_with_year: "MMM D, YYYY hh:mm"
+      long_with_year_no_time: "MMM D, YYYY"
+      full_with_year_no_time: "MMMM Do, YYYY"
+      long_date_with_year: "MMM D, 'YY LT"
+      long_date_without_year: "MMM D, LT"
+      long_date_with_year_without_time: "MMM D, 'YY"
+      long_date_without_year_with_linebreak: "MMM D <br/>LT"
+      long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
+      wrap_ago: "pirms %{date}"
+      tiny:
+        half_a_minute: "< 1 m"
+        less_than_x_seconds:
+          zero: "< 0 s"
+          one: "< 1 s"
+          other: "< %{count} s"
+        x_seconds:
+          zero: "0 s"
+          one: "1 s"
+          other: "%{count} s"
+        x_minutes:
+          zero: "0 m"
+          one: "1 m"
+          other: "%{count} m"
+        about_x_hours:
+          zero: "0 h"
+          one: "1 h"
+          other: "%{count} h"
+        x_days:
+          zero: "0 d"
+          one: "1 d"
+          other: "%{count} d"
+        about_x_years:
+          zero: "0 g"
+          one: "1 g"
+          other: "%{count} g"
+        over_x_years:
+          zero: "> 0 g"
+          one: "> 1 g"
+          other: "> %{count} g"
+        almost_x_years:
+          zero: "0 g"
+          one: "1 g"
+          other: "%{count} g"
+        date_month: "MMM D"
+        date_year: "MMM 'YY"
+      medium:
+        x_minutes:
+          zero: "0 minūtes"
+          one: "1 minūtes"
+          other: "%{count} minūtes"
+        x_hours:
+          zero: "0 stundas"
+          one: "1 stunda"
+          other: "%{count} stundas"
+        x_days:
+          zero: "0 dienas"
+          one: "1 diena"
+          other: "%{count} dienas"
+        date_year: "D MMM, YYYY"
+      medium_with_ago:
+        x_minutes:
+          zero: "pirms 0 minūtēm"
+          one: "pirms 1 minūtes"
+          other: "pirms %{count} minūtēm"
+        x_hours:
+          zero: "pirms 0 stundām"
+          one: "pirms 1 stundas"
+          other: "pirms %{count} stundām"
+        x_days:
+          zero: "pirms 0 dienām"
+          one: "pirms 1 dienas"
+          other: "pirms %{count} dienām"
+      later:
+        x_days:
+          zero: "pēc 0 dienām"
+          one: "pēc 1 dienas"
+          other: "pēc %{count} dienām"
+        x_months:
+          zero: "pēc 0 mēnešiem"
+          one: "pēc 1 mēneša"
+          other: "pēc %{count} mēnešiem"
+        x_years:
+          zero: "pēc 0 gadiem"
+          one: "pēc 1 gada"
+          other: "pēc %{count} gadiem"
+      previous_month: 'Iepriekšējais mēnesis'
+      next_month: 'Nākamais mēnesis'
+    share:
+      topic: 'padalīties ar saiti uz šo tēmu'
+      post: 'ieraksts #%{postNumber}'
+      close: 'aizvērt'
+      twitter: 'padalīties ar šo saiti Twitter'
+      facebook: 'padalīties ar šo saiti Facebook'
+      google+: 'padalīties ar šo saiti Google+'
+      email: 'nosūtīt šo saiti e-pastā'
+    action_codes:
+      public_topic: "padarīja tēmu publisku %{when}"
+      private_topic: "padarīja šo tēmu privātu %{when}"
+      split_topic: "sadalīja šo tēmu %{when}"
+      invited_user: "uzaicināja %{who} %{when}"
+      invited_group: "uzaicināja %{who} %{when}"
+      removed_user: "izdzēsa %{who} %{when}"
+      removed_group: "izdzēsa %{who} %{when}"
+      autoclosed:
+        enabled: 'slēdza %{when}'
+        disabled: 'atvēra %{when}'
+      closed:
+        enabled: 'slēdza %{when}'
+        disabled: 'atvēra %{when}'
+      archived:
+        enabled: 'pievienoja arhīvam %{when}'
+        disabled: 'izņēma no arhīva %{when}'
+      pinned:
+        enabled: 'piesprauda %{when}'
+        disabled: 'atsprauda %{when}'
+      pinned_globally:
+        enabled: 'piesprauda globāli %{when}'
+        disabled: 'atsprauda globāli %{when}'
+      visible:
+        enabled: 'pievienoja uzskaitei %{when}'
+        disabled: 'izņēma no uzskaites %{when}'
+      banner:
+        enabled: 'padarīja šo par baneri %{when}. Tas parādīsies katras lapas augšā, līdz lietotājs to aizvērs.'
+        disabled: 'noņēma šo baneri %{when}. Tas vairs neparādīsies katras lapas augšā.'
+    topic_admin_menu: "tēmas pārvaldīšana"
+    wizard_required: "Laipni lūgti jūsu jaunajā Discourse! Sāksim ar <a href='%{url}' data-auto-route='true'>uzstādīšanas palīgu</a> ✨"
+    emails_are_disabled: "Administrators ir globāli izslēdzis visus izejošos e-pastus. Netiks nosūtīti nekāda veida paziņojumi."
+    bootstrap_mode_enabled: "Lai atvieglotu jūsu jaunās vietnes iedarbināšanu, esat sāknēšanas režīmā. Visiem jauniem lietotājiem būs piešķirts 1. uzticības līmenis un aktivizēts katras dienas kopsavilkums e-pastā. Tas automātiski izslēgsies, kad kopējais lietotāju skaits pārsniegs %{min_users} lietotājus."
+    bootstrap_mode_disabled: "Sāknēšanas režīms tiks izslēgts nākamo 24 stundu laikā."
+    themes:
+      default_description: "Noklusējums"
+    s3:
+      regions:
+        ap_northeast_1: "Āzijas un Klusā okeāna reģions (Tokija)"
+        ap_northeast_2: "Āzijas un Klusā okeāna reģions (Seula)"
+        ap_south_1: "Āzijas un Klusā okeāna reģions (Mumbaja)"
+        ap_southeast_1: "Āzijas un Klusā okeāna reģions (Singapūra)"
+        ap_southeast_2: "Āzijas un Klusā okeāna reģions (Sidneja)"
+        cn_north_1: "Ķīna (Pekina)"
+        eu_central_1: "ES (Frankfurte)"
+        eu_west_1: "ES (Īrija)"
+        eu_west_2: "ES (Londona)"
+        sa_east_1: "Dienvidamerika (Sanpaulu)"
+        us_east_1: "ASV austrumi (Z-Virdžīnija)"
+        us_east_2: "ASV austrumi (Ohaijo)"
+        us_gov_west_1: "AWS GovCloud (ASV)"
+        us_west_1: "ASV rietumi (Z-Kalifornija)"
+        us_west_2: "ASV rietumi (Oregona)"
+    edit: 'labot šīs tēmas nosaukumu un sadaļu'
+    not_implemented: "Šī funkcionalitāte vēl nav ieviesta, atvainojiet!"
+    no_value: "Nē"
+    yes_value: "Jā"
+    generic_error: "Atvainojiet, ir notikusi kļūda."
+    generic_error_with_reason: "Notikusi kļūda: %{error}"
+    sign_up: "Reģistrēties"
+    log_in: "Ienākt"
+    age: "Vecums"
+    joined: "Pievienojās"
+    admin_title: "Administrators"
+    flags_title: "Sūdzības"
+    show_more: "parādīt vairāk"
+    show_help: "iespējas"
+    links: "Saites"
+    links_lowercase:
+      zero: "saite"
+      one: "saite"
+      other: "saites"
+    faq: "BUJ"
+    guidelines: "Vadlīnijas"
+    privacy_policy: "Privātuma politika"
+    privacy: "Privātums"
+    terms_of_service: "Pakalpojuma noteikumi"
+    mobile_view: "Mobilais skats"
+    desktop_view: "Datora skats"
+    you: "Tu"
+    or: "vai"
+    now: "tikko"
+    read_more: 'lasīt vairāk'
+    more: "Vairāk"
+    less: "Mazāk"
+    never: "nekad"
+    every_30_minutes: "katras 30 minūtes"
+    every_hour: "katru stundu"
+    daily: "katru dienu"
+    weekly: "katru nedēļu"
+    every_two_weeks: "katras divas nedēļas"
+    every_three_days: "katras trīs dienas"
+    max_of_count: "ne vairāk kā {{count}}"
+    alternation: "vai"
+    character_count:
+      zero: "{{count}} zīmes"
+      one: "{{count}} zīme"
+      other: "{{count}} zīmes"
+    suggested_topics:
+      title: "Ieteiktās tēmas"
+      pm_title: "Ieteiktās ziņas"
+    about:
+      simple_title: "Par"
+      title: "Par %{title}"
+      stats: "Vietnes statistika"
+      our_admins: "Mūsu administratori"
+      our_moderators: "Mūsu moderatori"
+      stat:
+        all_time: "Visi"
+        last_7_days: "Pēdējās 7 dienas"
+        last_30_days: "Pēdējās 30 dienas"
+      like_count: "Atzinības"
+      topic_count: "Tēmas"
+      post_count: "Ieraksti"
+      user_count: "Lietotāji"
+      active_user_count: "Aktīvi lietotāji"
+      contact: "Sazinies ar mums"
+      contact_info: "Ar šo vietni saistītu kritisku problēmu gadījumā lūdzu sazinieties ar mums %{contact_info}."
+    bookmarked:
+      title: "Grāmatzīmes"
+      clear_bookmarks: "Noņemt grāmatzīmi"
+      help:
+        bookmark: "Uzklikšķiniet, lai pievienot šīs tēmas pirmo ierakstu grāmatzīmēm"
+        unbookmark: "Uzklikšķiniet, lai noņemtu visas grāmatzīmes šai temā"
+    bookmarks:
+      not_logged_in: "atvainojiet, tev jāienāk sistēmā, lai pievienotu ierakstu grāmatzīmēm"
+      created: "tu esi pievienojies šim ierakstam grāmatzīmi"
+      not_bookmarked: "tu esi izlasījis šo ierakstu; klikšķini, lai pievienotu grāmatzīmēm"
+      last_read: "šis ir pēdējais ieraksts, ko lasīji; klikšķini, lai pievienotu grāmatzīmēm"
+      remove: "Noņemt grāmatzīmi"
+      confirm_clear: "Vai esi pārliecināts, ka vēlies noņemt visas grāmatzīmes šajā tēmā?"
+    topic_count_latest:
+      zero: "{{count}} jaunas vai papildinātas tēmas."
+      one: "{{count}} jauna vai papildināta tēma."
+      other: "{{count}} jaunas vai papildinātas tēmas."
+    topic_count_unread:
+      zero: "{{count}} nelasītas tēmas."
+      one: "{{count}} nelasīta tēma."
+      other: "{{count}} nelasītas tēmas."
+    topic_count_new:
+      zero: "{{count}} jaunas tēmas."
+      one: "{{count}} jauna tēma."
+      other: "{{count}} jaunas tēmas."
+    click_to_show: "Noklikšķiniet, lai parādītu."
+    preview: "priekšskatījums"
+    cancel: "atcelt"
+    save: "Saglabāt izmaiņas"
+    saving: "Saglabāju..."
+    saved: "Saglabāts!"
+    upload: "Augšuplādēt"
+    uploading: "Augšuplādēju..."
+    uploading_filename: "Augšuplādēju {{filename}}..."
+    uploaded: "Augšuplādēts!"
+    enable: "Ieslēgt"
+    disable: "Atslēgt"
+    undo: "Atsaukt"
+    revert: "Atgriezt"
+    failed: "Neizdevās"
+    switch_to_anon: "Ieiet anonīmajā režīmā"
+    switch_from_anon: "Iziet no anonīmā režīma"
+    banner:
+      close: "Aizvērt šo baneri."
+      edit: "Rediģēt šo banneri >>"
+    choose_topic:
+      none_found: "Tēmas netika atrastas."
+      title:
+        search: "Meklē tēmu pēc vārda, URL vai ID:"
+        placeholder: "ierakstiet tēmas nosaukumu šeit"
+    queue:
+      topic: "Tēma:"
+      approve: 'Apstiprināt'
+      reject: 'Noraidīt'
+      delete_user: 'Dzēst lietotāju'
+      title: "Nepieciešama apstiprināšana"
+      none: "Šobrīd nav pārbaudāmu ierakstu"
+      edit: "Labot"
+      cancel: "Atcelt"
+      view_pending: "aplūkot vēl nepārbaudītos ierakstus"
+      has_pending_posts:
+        zero: "Šai tēmā nav ierakstu, kuri gaida apstiprinājumu"
+        one: "Šai tēmā ir <b>{{count}}</b> ieraksts, kurš gaida apstiprinājumu"
+        other: "Šai tēmā ir <b>{{count}}</b> ieraksti, kuri gaida apstiprinājumu"
+      confirm: "Saglabāt izmaiņas"
+      delete_prompt: "Vai tiešām vēlaties dzēst <b>%{username}</b>? Tas izdzēsīs visus lietotāja ierakstus un bloķēs e-pastu un IP adresi."
+      approval:
+        title: "Ieraksts gaida apstiprinājumu"
+        description: "Mēs saņēmām jūsu ierakstu, taču vispirms to jāapstiprina moderatoram. Lūdzu, esiet pacietīgi."
+        pending_posts:
+          zero: "Šai tēmā nav ierakstu, kuri gaida gaida apstiprinājumu."
+          one: "Šai tēmā ir <strong>1</strong> ieraksts, kurš gaida apstiprinājumu."
+          other: "Šai temā ir <strong>{{count}}</strong> ieraksti, kuri gaida apstiprinājumu."
+        ok: "OK"
+    user_action:
+      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> pievienoja ierakstus <a href='{{topicUrl}}'>tēmai</a>"
+      you_posted_topic: "<a href='{{userUrl}}'>Jūs</a> pievienojāt ierakstu <a href='{{topicUrl}}'>tēmai</a>"
+      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> atbildēja <a href='{{postUrl}}'>{{post_number}}</a>"
+      you_replied_to_post: "<a href='{{userUrl}}'>Jūs</a> atbildējāt <a href='{{postUrl}}'>{{post_number}}</a>"
+      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> atbildēja <a href='{{topicUrl}}'>temā</a>"
+      you_replied_to_topic: "<a href='{{userUrl}}'>Jūs</a> atbildējāt <a href='{{topicUrl}}'>temā</a>"
+      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> pieminēja <a href='{{user2Url}}'>{{another_user}}</a>"
+      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> pieminēja <a href='{{user2Url}}'>Jūs</a>"
+      you_mentioned_user: "<a href='{{user1Url}}'>Jūs</a> pieminējāt <a href='{{user2Url}}'>{{another_user}}</a>"
+      posted_by_user: "Ierakstīja <a href='{{userUrl}}'>{{user}}</a>"
+      posted_by_you: "Ierakstījāt <a href='{{userUrl}}'>Jūs</a>"
+      sent_by_user: "Nosūtīja <a href='{{userUrl}}'>{{user}}</a>"
+      sent_by_you: "Nosūtījāt <a href='{{userUrl}}'>Jūs</a>"
+    directory:
+      filter_name: "atlasīt pēc lietotājvārda"
+      title: "Lietotāji"
+      likes_given: "Dots"
+      likes_received: "Saņemts"
+      topics_entered: "Skatīts"
+      topics_entered_long: "Skatītās tēmas"
+      time_read: "Lasīšanas laiks"
+      topic_count: "Tēmas"
+      topic_count_long: "Izveidotās tēmas"
+      post_count: "Atbildes"
+      post_count_long: "Ierakstītās atbildes"
+      no_results: "Nav rezultātu."
+      days_visited: "Apmeklējumi"
+      days_visited_long: "Apmeklējuma dienas"
+      posts_read: "Lasīts"
+      posts_read_long: "Lasītie ieraksti"
+      total_rows:
+        zero: "Nav lietotāju"
+        one: "1 lietotājs"
+        other: "%{count} lietotāji"
+    group_histories:
+      actions:
+        change_group_setting: "Mainīt grupas iestatījumus"
+        add_user_to_group: "Pievienot lietotāju"
+        remove_user_from_group: "Noņemt lietotāju"
+        make_user_group_owner: "Padarīt par īpašnieku"
+        remove_user_as_group_owner: "Noņemt īpašnieka tiesības"
+    groups:
+      logs:
+        title: "Žurnāls"
+        when: "Kad"
+        action: "Darbība"
+        acting_user: "Lietotājs, kas veica darbību"
+        target_user: "Mērķa lietotājs"
+        subject: "Tēma"
+        details: "Papildus informācija"
+        from: "No"
+        to: "Kam"
+      edit:
+        title: 'Labot grupu'
+        full_name: 'Pilns vārds'
+        add_members: "Pievienot dalībniekus"
+        delete_member_confirm: "Izņemt '%{username}' no grupas '%{group}'?"
+      name_placeholder: "Grupas nosaukums, bez atstarpēm, tādi paši noteikumi kā lietotāja vārdam"
+      public_admission: "Atļaut lietotājiem brīvi pievienoties grupai (šai grupai jābūt publiski redzamai)"
+      public_exit: "Ļaut lietotājiem brīvi pamest grupu"
+      empty:
+        posts: "Grupas dalībnieki nav veikuši nevienu ierakstu."
+        members: "Šai grupā nav dalībnieku."
+        mentions: "Neviens nav pieminējis šo grupu."
+        messages: "Nav šai grupai adresētu ziņu."
+        topics: "Grupas dalībnieki nav izveidojuši nevienu tēmu."
+        logs: "Par šo grupu nav žurnāla ierakstu."
+      add: "Pievienot"
+      join: "Pievienoties grupai"
+      leave: "Pamest grupu"
+      request: "Pieprasīt pievienošanu grupai"
+      message: "Ziņa"
+      automatic_group: Automātiska grupa
+      closed_group: Slēgta grupa
+      is_group_user: "Jūs esat šīs grupas dalībnieks"
+      allow_membership_requests: "Ļauj lietotājiem sūtīt dalības pieprasījumus grupu īpašniekiem"
+      membership: "Piederība"
+      name: "Vārds"
+      user_count: "Dalībnieku skaits"
+      bio: "Par grupu"
+      selector_placeholder: "Pievienot dalībniekus"
+      owner: "īpašnieks"
+      index:
+        title: "Grupas"
+        empty: "Nav redzamu grupu."
+      activity: "Aktivitāte"
+      members: "Dalībnieki"
+      topics: "Tēmas"
+      posts: "Ieraksti"
+      mentions: "Pieminēšanas"
+      messages: "Ziņas"
+      notification_level: "Noklusējuma līmenis paziņojumiem par jaunām grupas ziņām"
+      visibility_levels:
+        title: "Kas var redzēt grupu?"
+        public: "Ikviens"
+        members: "Grupu īpašnieki, biedri un administratori"
+        staff: "Grupu īpašnieki un personāls"
+        owners: "Grupu īpašnieki un administratori"
+      alias_levels:
+        nobody: "Neviens"
+        only_admins: "Tikai administratori"
+        mods_and_admins: "Tikai moderatori un administratori"
+        members_mods_and_admins: "Tikai grupu biedri, moderatori un administratori"
+        everyone: "Ikviens"
+      trust_levels:
+        title: "Uzticamības līmenis, ko automātiski piešķir visiem dalībniekiem pievienošanas brīdī:"
+        none: "Nav"
+      notifications:
+        watching:
+          title: "Skatās"
+          description: "Jums paziņos par katru jaunu ierakstu katrā ziņā, kā arī parādīs jauno atbilžu skaitu."
+        watching_first_post:
+          title: "Seko pirmajam ierakstam"
+          description: "Jums paziņos tikai par pirmo ierakstu katrā jaunajā tēmā šai grupā."
+        tracking:
+          title: "Sekošana"
+          description: "Jums paziņos, ja kāds pieminēs jūsu @vārdu vai atbildēs jums. Jūs redzēsiet jauno atbilžu skaitu."
+        regular:
+          title: "Normāls"
+          description: "Jums paziņos, ja kāds pieminēs jūsu @vārdu vai atbildēs Jums."
+        muted:
+          title: "Noklusināts"
+          description: "Jums nekad neko neziņos par jauniem ierakstiem šajā grupā."
+      flair_url: "Avatāra attēls"
+      flair_url_placeholder: "(Neobligāti) Saite uz attēlu vai Font Awesome klasi"
+      flair_bg_color: "Avatāra attēla fona krāsa"
+      flair_bg_color_placeholder: "(Neobligāti) Heksadecimālā krāsas vērtība"
+      flair_color: "Avatāra attēla krāsa"
+      flair_color_placeholder: "(Neobligāti) Heksadecimālā krāsas vērtība"
+      flair_preview_icon: "Priekšskatījuma ikona"
+      flair_preview_image: "Priekšskatījuma attēls"
+      flair_note: "Piezīme: attēls parādīsies tikai lietotāja primārai grupai."
+    user_action_groups:
+      '1': "Veiktās atzinības"
+      '2': "Saņemtās atzinības"
+      '3': "Grāmatzīmes"
+      '4': "Tēmas"
+      '5': "Atbildes"
+      '6': "Reakcijas"
+      '7': "Pieminēšanas"
+      '9': "Citāti"
+      '11': "Labojumi"
+      '12': "Nosūtne"
+      '13': "Iesūtne"
+      '14': "Gaida apstiprinājumu"
+    categories:
+      all: "visas sadaļas"
+      all_subcategories: "viss"
+      no_subcategory: "nekas"
+      category: "Sadaļa"
+      category_list: "Parādīt sadaļu sarakstu"
+      reorder:
+        title: "Pārkārtot sadaļas"
+        title_long: "Pārkārtot sadaļu sarakstu"
+        fix_order: "Nofiksēt pozīcijas"
+        fix_order_tooltip: "Ne visām kategorijām ir unikāls pozīcijas numurs, un tas var izraisīt negaidītus rezultātus."
+        save: "Saglabāt kārtību"
+        apply_all: "Pielietot"
+        position: "Pozīcija"
+      posts: "Raksti"
+      topics: "Tēmas"
+      latest: "Jaunākie"
+      latest_by: "jaunāks par"
+      toggle_ordering: "mainīt secības kontroli"
+      subcategories: "Apakšsadaļas"
+      topic_sentence:
+        zero: "Nav tēmu"
+        one: "1 tēma"
+        other: "%{count} tēmas"
+      topic_stat_sentence:
+        zero: "Nav jaunu tēmu."
+        one: "%{count} jauna tēma pēdējā %{unit}."
+        other: "%{count} jaunas tēmas pēdējā %{unit}."
+    ip_lookup:
+      title: IP adreses meklēšana
+      hostname: Resursdatora nosaukums
+      location: Atrašanās vieta
+      location_not_found: (nezināms)
+      organisation: Organizācija
+      phone: Tālrunis
+      other_accounts: "Citi profili ar šo IP adresi:"
+      delete_other_accounts: "Izdzēst %{count}"
+      username: "lietotājvārds"
+      trust_level: "Uzticības līmenis"
+      read_time: "lasīšanas laiks"
+      topics_entered: "pievienotās tēmas"
+      post_count: "# ieraksti"
+      confirm_delete_other_accounts: "Vai esat pārliecināti, ka vēlaties dzēst šos profilus?"
+    user_fields:
+      none: "(izvēlieties opciju)"
+    user:
+      said: "{{username}}:"
+      profile: "Profils"
+      mute: "Klusināt"
+      edit: "Mainīt iestatījumus"
+      download_archive:
+        button_text: "Lejupielādēt visu"
+        confirm: "Vai esat droši, ka vēlaties lejuplādēt savus ierakstus?"
+        success: "Lejuplāde uzsākta; pavēstīsim jums ziņā, kad šis process būs beidzies."
+        rate_limit_error: "Ierakstus var lejuplādēt reizi dienā, lūdzu mēģiniet atkal rītdien."
+      new_private_message: "Jauns ziņa"
+      private_message: "Ziņa"
+      private_messages: "Ziņas"
+      activity_stream: "Aktivitāte"
+      preferences: "Iestatījumi"
+      expand_profile: "Paplašināt"
+      bookmarks: "Grāmatzīmes"
+      bio: "Par mani"
+      invited_by: "Uzaicināja"
+      trust_level: "Uzticības līmenis"
+      notifications: "Paziņojumi"
+      statistics: "Statistika"
+      desktop_notifications:
+        label: "Darbvirsmas paziņojumi"
+        not_supported: "Atvainojiet, bet šī pārlūkprogramma neatbalsta paziņojumus."
+        perm_default: "Ieslēgt paziņojumus"
+        perm_denied_btn: "Piekļuve liegta"
+        perm_denied_expl: "Jūs neatļāvāt paziņojumus. Atļaujiet paziņojumus jūsu pārlūkprogrammas iestatījumos."
+        disable: "Atslēgt paziņojumus"
+        enable: "Ieslēgt paziņojumus"
+        each_browser_note: "Piezīme: šis iestatījums jānomaina katrā pārlūkprogrammā. kuru izmantojat."
+      dismiss_notifications: "Vairs nerādīt visus"
+      dismiss_notifications_tooltip: "Atzīmēt visus nelasītos paziņojumus kā izlasītus"
+      first_notification: "Jūsu pirmais paziņojums! Izvēlieties to, lai sāktu."
+      disable_jump_reply: "Nepāriet uz manu ierakstu pēc atbildēšanas"
+      dynamic_favicon: "Rādīt jauno / papildināto tēmu skaitu pārlūkprogrammas ikonā"
+      theme_default_on_all_devices: "Padarīt šo par manu noklusējuma motīvu visās manās ierīcēs"
+      external_links_in_new_tab: "Atvērt visas saites jaunā cilnē"
+      enable_quoting: "Ieslēgt atbildi ar iezīmētā teksta citēšanu"
+      change: "mainīt"
+      moderator: "{{user}} ir moderators"
+      admin: "{{user}} ir administrators"
+      moderator_tooltip: "Šis lietotājs ir moderators"
+      admin_tooltip: "Šis lietotājs ir administrators"
+      suspended_notice: "Lietotājs ir īslaicīgi bloķēts līdz {{date}}."
+      suspended_reason: "Iemesls:"
+      github_profile: "Github"
+      email_activity_summary: "Aktivitātes atskaite"
+      mailing_list_mode:
+        label: "Vēstkopas režīms"
+        enabled: "Ieslēgt vēstkopas režīmu"
+        instructions: |
+          Šis iestatījums neievēro aktivitātes atskaiti.<br />
+          Klusinātās tēmas un sadaļas nav iekļautas šajos e-pastos.
+        individual: "Sūtīt e-pastu par katru jauno ierakstu"
+        individual_no_echo: "Sūtīt e-pastu par katru jauno ierakstu, izņemot manus"
+        many_per_day: "Sūtīt e-pastu par katru jauno ierakstu (apmēram {{dailyEmailEstimate}} dienā)"
+        few_per_day: "Sūtīt e-pastu par katru jauno ierakstu (apmēram divus dienā)"
+      tag_settings: "Tagi"
+      watched_tags: "Skatīts"
+      watched_tags_instructions: "Jūs automātiski sekosiet visām tēmām ar šiem tagiem. Jums paziņos par visām jaunām tēmām un ierakstiem, un pie tēmas redzēsiet jauno ierakstu skaitu."
+      tracked_tags: "Sekots"
+      tracked_tags_instructions: "Jūs automātiski sekosiet visām tēmām ar šiem tagiem. Pie tēmas redzēsiet jauno ierakstu skaitu."
+      muted_tags: "Klusināts"
+      muted_tags_instructions: "Jums neko neziņos par jaunām tēmām ar šiem tagiem, un tās neparādīsies starp tēmām ar pēdējām izmaiņām."
+      watched_categories: "Skatīts"
+      watched_categories_instructions: "Jūs automātiski sekosiet visām tēmām šajās sadaļās. Jums paziņos par visām jaunajām tēmām un ierakstiem, un pie tēmas redzēsiet jauno ierakstu skaitu."
+      tracked_categories: "Sekots"
+      tracked_categories_instructions: "Jūs automātiski sekosiet visām tēmām šajās sadaļās. Pie tēmas redzēsiet jauno ierakstu skaitu."
+      watched_first_post_categories: "Seko pirmajam ierakstam"
+      watched_first_post_categories_instructions: "Jums paziņos par pirmo ierakstu katrā jaunajā tēmā šajās sadaļās."
+      watched_first_post_tags: "Seko pirmajam ierakstam"
+      watched_first_post_tags_instructions: "Jums paziņos par pirmo ierakstu katrā jaunajā tēmā ar šiem tagiem."
+      muted_categories: "Klusināts"
+      muted_categories_instructions: "Jums nepaziņos neko par jaunām tēmām šajās sadaļās, un tās neparādīsies starp tēmām ar pēdējām izmaiņām."
+      no_category_access: "Kā moderatoram jums ir ierobežota kategoriju piekļuve, saglabāšana ir atspējota."
+      delete_account: "Izdzēst manu profilu"
+      delete_account_confirm: "Vai esat drošs, ka vēlaties neatgriezeniski dzēst savu profilu? Šo darbību nevar atcelt!"
+      deleted_yourself: "Jūsu profils ir veiksmīgi izdzēsts."
+      delete_yourself_not_allowed: "Pašlaik jūs nevarat izdzēst savu profilu. Lūdzu sazinieties ar administratoru, lai izdzēstu jūsu profilu."
+      unread_message_count: "Ziņas"
+      admin_delete: "Dzēst"
+      users: "Lietotāji"
+      muted_users: "Klusināts"
+      muted_users_instructions: "Nerādīt paziņojumus no šiem lietotājiem."
+      muted_topics_link: "Rādīt klusinātās tēmas"
+      watched_topics_link: "Rādīt skatītās tēmas"
+      tracked_topics_link: "Radīt tēmas, kurām seko"
+      automatically_unpin_topics: "Automātiski atspraust tēmas, kad sasniedzu beigas."
+      apps: "Lietotnes"
+      revoke_access: "Liegt piekļuvi"
+      undo_revoke_access: "Atcelt piekļuves liegšanu"
+      api_approved: "Apstiprināts:"
+      theme: "Tēma"
+      staff_counters:
+        flags_given: "noderīgas sūdzības"
+        flagged_posts: "ieraksti ar sūdzībām"
+        deleted_posts: "izdzēstie ieraksti"
+        suspensions: "īslaicīgās bloķēšanas"
+        warnings_received: "brīdinājumi"
+      messages:
+        all: "Viss"
+        inbox: "Iesūtne"
+        sent: "Nosūtne"
+        archive: "Arhīvs"
+        groups: "Manas grupas"
+        bulk_select: "Atlasīt ziņas"
+        move_to_inbox: "Pārvietot uz iesūtni"
+        move_to_archive: "Arhivēt"
+        failed_to_move: "Neizdevās pārvietot izvēlētas ziņas (varbūt pazudis pieslēgums internetam)"
+        select_all: "Izvēlēties visu"
+      preferences_nav:
+        account: "Konts"
+        profile: "Profils"
+        emails: "E-pasti"
+        notifications: "Paziņojumi"
+        categories: "Sadaļas"
+        tags: "Tagi"
+        interface: "Saskarne"
+        apps: "Lietotnes"
+      change_password:
+        success: "(e-pasts nosūtīts)"
+        in_progress: "(sūta e-pastu)"
+        error: "(kļūda)"
+        action: "Sūtīt paroles atjaunošanas e-pastu"
+        set_password: "Uzstādīt paroli"
+        choose_new: "Izvēlēties jaunu paroli"
+        choose: "Izvēlēties paroli"
+      change_about:
+        title: "Mainīt aprakstu par mani"
+        error: "Mainot šo vērtību, notika kļūda."
+      change_username:
+        title: "Mainīt lietotājvārdu"
+        confirm: "Ja jūs nomainīsiet jūsu lietotājvārdu, visi iepriekšējie ierakstu citāti un jūsu @vārda pieminēšanas vairs nedarbosies. Vai esat pavisam droši, ka to vēlaties?"
+        taken: "Atvainojiet, šis lietotājvārds ir aizņemts."
+        invalid: "Šis lietotājvārds ir nederīgs. Izmantojiet tikai ciparus un burtus"
+      change_email:
+        title: "Mainīt e-pastu"
+        taken: "Atvainojiet, šis e-pasts nav pieejams."
+        error: "Mainot jūsu e-pasta adresi, notika kļūda. Varbūt šī adrese jau tiek izmantota?"
+        success: "Mēs aizsūtījām e-pastu uz šo adresi. Lūdzu sekojiet apstiprināšanas instrukcijām vēstulē."
+      change_avatar:
+        title: "Nomainīt savu profila bildi"
+        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, balstīts uz"
+        gravatar_title: "Nomainiet jūsu avatāra attēlu Gravatar lapā"
+        refresh_gravatar_title: "Atjaunot jūsu Gravatar attēlu"
+        letter_based: "Sistēmas piešķirtais profila attēls"
+        uploaded_avatar: "Savs attēls"
+        uploaded_avatar_empty: "Pievienot savu attēlu"
+        upload_title: "Augšupielādēt savu attēlu"
+        upload_picture: "Augšupielādēt attēlu"
+        image_is_not_a_square: "Uzmanību: mēs apgriezām jūsu attēlu; platums un augstums nebija vienādi."
+        cache_notice: "Jūs veiksmīgi nomainījāt savu profila attēlu, bet var paiet kāds laiks, līdz tas parādīsies, pārlūkprogrammas kešošanas dēļ."
+      change_profile_background:
+        title: "Profila fons"
+        instructions: "Profila fons būs centrēts un ar noklusējuma platumu 850px."
+      change_card_background:
+        title: "Lietotāja kartiņas fons"
+        instructions: "Fona attēli būs centrēti un ar noklusējuma platumu 590px."
+      email:
+        title: "E-pasts"
+        instructions: "nekad nerādīs publiski"
+        ok: "Mēs jums nosūtīsim apstiprinājuma e-pastu"
+        invalid: "Lūdzu ievadiet derīgu e-pasta adresi"
+        authenticated: "Jūsu e-pastu autentificēja {{provider}}"
+        frequency_immediately: "Mēs nekavējoties sūtīsim jums epastu par jaunām neizlasītām ziņām."
+        frequency:
+          zero: "Mēs sūtīsim jums e-pastu tikai tad, ja nebūsim jūs redzējuši pēdējo {{count}} minūšu laikā."
+          one: "Mēs sūtīsim jums e-pastu tikai tad, ja nebūsim jūs redzējuši pēdējās minūtes laikā."
+          other: "Mēs sūtīsim jums e-pastu tikai tad, ja nebūsim jūs redzējuši pēdējo {{count}} minūšu laikā."
+      name:
+        title: "Vārds"
+        instructions: "jūsu pilnais vārds (neobligāti)"
+        instructions_required: "Jūsu pilnais vārds"
+        too_short: "Jūsu vārds ir pārāk īss"
+        ok: "Jūsu vārds izskatās labi"
+      username:
+        title: "Lietotājvārds"
+        instructions: "unikāls, bez atstarpēm, īss"
+        short_instructions: "Cilvēki var pieminēt jūs kā @{{username}}"
+        available: "Jūsu lietotājvārds ir pieejams"
+        not_available: "Nav pieejams. Mēģiniet {{suggestion}}?"
+        not_available_no_suggestion: "Nav pieejams"
+        too_short: "Jūsu lietotājvārds ir parāk īss"
+        too_long: "Jūsu lietotājvārds ir pārāk garš"
+        checking: "Pārbauda lietotājvārda pieejamību..."
+        prefilled: "E-pasts atbilst šim reģistrētajam lietotājvārdam"
+      locale:
+        title: "Saskarnes valoda"
+        instructions: "Lietotāja saskarnes valoda. Tā mainīsies pēc lapas atsvaidzināšanas."
+        default: "(noklusējums)"
+        any: "jebkura"
+      password_confirmation:
+        title: "Parole vēlreiz"
+      last_posted: "Pēdējais ieraksts"
+      last_emailed: "Pēdējais e-pasts"
+      last_seen: "Redzēts"
+      created: "Pievienojās"
+      log_out: "Iziet"
+      location: "Atrašanās vieta"
+      card_badge:
+        title: "Lietotāja kartiņas žetons"
+      website: "Tīmekļa vietne"
+      email_settings: "E-pasts"
+      like_notification_frequency:
+        title: "Paziņot, ja saņemta atzinība"
+        always: "Vienmēr"
+        first_time_and_daily: "Pirmo reizi, kad izteikta atzinība, un katru dienu"
+        first_time: "Pirmo reizi, kad izteikta atzinība par ierakstu"
+        never: "Nekad"
+      email_previous_replies:
+        title: "Iekļaut iepriekšējās atbildes epasta beigās"
+        unless_emailed: "izņemot, ja iepriekš sūtīts"
+        always: "vienmēr"
+        never: "nekad"
+      email_digests:
+        title: "Kad es neapmeklēju šo vietni, sūtīt man kopsavilkumu par populārām tēmām un atbildēm"
+        every_30_minutes: "katras 30 minūtes"
+        every_hour: "katru stundu"
+        daily: "katru dienu"
+        every_three_days: "katras trīs dienas"
+        weekly: "katru nedēļu"
+        every_two_weeks: "katras divas nedēļas"
+      include_tl0_in_digests: "Iekļaut kopsavilkuma e-pastos saturu no jaunajiem lietotājiem"
+      email_in_reply_to: "Iekļaut e-pastā citātu no atbildes uz ierakstu"
+      email_direct: "Sūtīt man e-pastu, kad kāds citē mani, atbild manam ierakstam, piemin manu @lietotājvārdu vai ielūdz mani kādā tēmā"
+      email_private_messages: "Sūtīt man e-pastu, kad kāds sūta man ziņu"
+      email_always: "Sūtīt man e-pasta paziņojumus pat tad, kad esmu aktīvs vietnē"
+      other_settings: "Citi"
+      categories_settings: "Sadaļas"
+      new_topic_duration:
+        label: "Uzskatīt tēmas par jaunām, ja"
+        not_viewed: "Es vēl neesmu tās skatījis"
+        last_here: "izveidotas, kopš es šeit pēdējo reizi biju"
+        after_1_day: "izveidots pēdējā dienā"
+        after_2_days: "izveidots pēdējās 2 dienās"
+        after_1_week: "izveidots pēdējā nedēļā"
+        after_2_weeks: "izveidots pēdējās 2 nedēļās"
+      auto_track_topics: "Automātiski sekot tēmām, kuras ievadu"
+      auto_track_options:
+        never: "nekad"
+        immediately: "tūlīt"
+        after_30_seconds: "pēc 30 sekundēm"
+        after_1_minute: "pēc 1 minūtes"
+        after_2_minutes: "pēc 2 minūtēm"
+        after_3_minutes: "pēc 3 minūtēm"
+        after_4_minutes: "pēc 4 minūtēm"
+        after_5_minutes: "pēc 5 minūtēm"
+        after_10_minutes: "pēc 10 minūtēm"
+      notification_level_when_replying: "Kad es ierakstu tēmā, iestatīt tēmai"
+      invited:
+        search: "raksti, lai meklētu ielūgumos..."
+        title: "Ielūgumi"
+        user: "Ielūgtie lietotāji"
+        sent: "Nosūtīts"
+        none: "Ielūgumu, kas gaidītu apstiprinājumu, nav."
+        truncated:
+          zero: "Nav ielūgumu."
+          one: "Pirmais ielūgums."
+          other: "Pirmie {{count}} ielūgumi."
+        redeemed: "Pieņemtie ielūgumi"
+        redeemed_tab: "Pieņemti"
+        redeemed_tab_with_count: "Pieņemti ({{count}})"
+        redeemed_at: "Pieņemti"
+        pending: "Gaidošie ielūgumi"
+        pending_tab: "Gaidošie"
+        pending_tab_with_count: "Gaidošie ({{count}})"
+        topics_entered: "Apskatītās tēmas"
+        posts_read_count: "Izlasītie ieraksti"
+        expired: "Šis ielūgums ir izbeidzies."
+        rescind: "Atcelt"
+        rescinded: "Ielūgums atcelts"
+        rescind_all: "Atcelt visus ielūgumus"
+        rescinded_all: "Visi uzaicinājumi ir atcelti!"
+        rescind_all_confirm: "Vai tiešām atcelt visus uzaicinājumus?"
+        reinvite: "Atkārtot ielūgumu"
+        reinvite_all: "Atkārtot visus ielūgumus"
+        reinvite_all_confirm: "Vai tiešām vēlaties atkārtot visus ielūgumus?"
+        reinvited: "Ielūgums atkārtots"
+        reinvited_all: "Visi ielūgumi atkārtoti!"
+        time_read: "Laiks, ko lasīja"
+        days_visited: "Dienas, kurās apmeklēja"
+        account_age_days: "Konta vecums dienās"
+        create: "Nosūtīt ielūgumu"
+        generate_link: "Kopēt ielūguma saiti"
+        link_generated: "Ielūguma saite gatava!"
+        valid_for: "Ielūguma saite ir derīga tikai šai e-pasta adresei: %{email}"
+        bulk_invite:
+          none: "Jūs vēl šeit neesat nevienu ielūdzis. Nosūtiet atsevišķus ielūgumus vai ielūdziet daudzus lietotājus vienlaicīgi,<a href='https://meta.discourse.org/t/send-bulk-invites/16468'> augšupielādējot CSV failu</a>"
+          text: "Ielūgt visus no faila"
+          success: "Fails veiksmīgi lejuplādēts, jums paziņos, kad process beidzies."
+          error: "Atvainojiet, failam jābūt CSV formātā."
+      password:
+        title: "Parole"
+        too_short: "Jūsu parole ir pārāk īsa."
+        common: "Šī parole ir pārāk vienkārša."
+        same_as_username: "Jūsu parole ir tāda pati, kā jūsu lietotājvārds."
+        same_as_email: "Jūsu parole ir tāda pati, kā jūsu e-pasts."
+        ok: "Jūsu parole izskatās labi."
+        instructions: "vismaz %{count} rakstzīmes"
+      summary:
+        title: "Kopsavilkums"
+        stats: "Statistika"
+        time_read: "lasīšanas laiks"
+        topic_count:
+          zero: "nav izveidotu tēmu"
+          one: "viena tēma izveidota"
+          other: "izveidotās tēmas"
+        post_count:
+          zero: "ierakstu izveidoti"
+          one: "ieraksts izveidots"
+          other: "izveidotie ieraksti"
+        days_visited:
+          zero: "apmeklētas dienas"
+          one: " apmeklēta diena"
+          other: "apmeklējuma dienas"
+        posts_read:
+          zero: "ierakstu izlasīti"
+          one: "ieraksts izlasīts"
+          other: "izlasītie ieraksti"
+        bookmark_count:
+          zero: "atzīmes"
+          one: "atzīme"
+          other: "grāmatzīmes"
+        top_replies: "Labākās atbildes"
+        no_replies: "Vēl nav atbilžu."
+        more_replies: "Vairāk atbilžu"
+        top_topics: "Labākās tēmas"
+        no_topics: "Vēl nav tēmu."
+        more_topics: "Vairāk tēmu"
+        top_badges: "Labākie žetoni"
+        no_badges: "Vēl nav žetonu."
+        more_badges: "Vairāk žetonu"
+        top_links: "Labākās saites"
+        no_links: "Vēl nav saišu."
+        most_liked_by: "Visvairāk atzinību no"
+        most_liked_users: "Visvairāk atzinību"
+        most_replied_to_users: "Visvairāk atbildēja"
+        no_likes: "Pagaidām atzinību nav."
+      associated_accounts: "Pieslēgšanās"
+      ip_address:
+        title: "Pēdējā IP adrese"
+      registration_ip_address:
+        title: "Reģistrēšanās IP adrese"
+      avatar:
+        title: "Profila attēls"
+        header_title: "profils, ziņas, grāmatzīmes un iestatījumi"
+      title:
+        title: "Virsraksts"
+      filters:
+        all: "Visi"
+      stream:
+        posted_by: "Ierakstīja"
+        sent_by: "Nosūtīja"
+        private_message: "ziņa"
+        the_topic: "tēma"
+    loading: "Ielādē..."
+    errors:
+      prev_page: "mēģinot ielādēt"
+      reasons:
+        network: "Tīkla kļūda"
+        server: "Servera kļūda"
+        forbidden: "Piekļuve liegta"
+        unknown: "Kļūda"
+        not_found: "Lapa nav atrasta"
+      desc:
+        network: "Lūdzu, pārbaudiet jūsu savienojumu."
+        network_fixed: "Šķiet, tīkls atkal pieslēgts."
+        server: "Kļūdas kods: {{status}}"
+        forbidden: "Jums nav pieejas šai lapai."
+        not_found: "Upss, aplikācija mēģināja ielādēt saiti, kura neeksistē."
+        unknown: "Kaut kas nogāja greizi."
+      buttons:
+        back: "Atgriezties"
+        again: "Mēģināt vēlreiz"
+        fixed: "Ielādēt lapu"
+    close: "Aizvērt"
+    assets_changed_confirm: "Šī vietne tikko bija atjaunota. Pārlādēt lapu, lai pārietu uz jaunāko versiju?"
+    logout: "Jūs izgājāt."
+    refresh: "Pārlādēt"
+    read_only_mode:
+      enabled: "Vietne ir \"tikai lasīšanas\" režīmā. Lūdzu turpiniet lasīt, taču atbildēšana, atzinības izteikšana un citas funkcijas šobrīd ir atslēgtas."
+      login_disabled: "Pieslēgšanās ir atslēgta, kamēr vietne ir \"tikai lasīšanas\" režīmā."
+      logout_disabled: "Iziešana ir atslēgta, kamēr vietne ir \"tikai lasīšanas\" režīmā."
+    too_few_topics_and_posts_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>Sāksim šo diskusiju!</a> Pašlaik ir <strong>%{currentTopics} / %{requiredTopics}</strong> tēmas un <strong>%{currentPosts} / %{requiredPosts}</strong> ieraksti. Jauniem apmeklētājiem vajag vairāk sarunu, kuras lasīt un komentēt."
+    too_few_topics_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>Sāksim šo diskusiju!</a> Pašlaik ir <strong>%{currentTopics} / %{requiredTopics}</strong> tēmas. Jauniem apmeklētājiem vajag vairāk sarunu, kuras lasīt un komentēt."
+    too_few_posts_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>Sāksim šo diskusiju!</a> Pašlaik ir <strong>%{currentPosts} / %{requiredPosts}</strong> ieraksti. Jauniem apmeklētājiem vajag vairāk sarunu, kuras lasīt un komentēt."
+    logs_error_rate_notice:
+      reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> sasniegts vietnes limits %{siteSettingRate}."
+      exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> pārsniegts vietnes limits %{siteSettingRate}."
+      rate:
+        zero: "nav kļūdu"
+        one: "%{count} kļūda/%{duration}"
+        other: "%{count} kļūdas/%{duration}"
+    learn_more: "uzzināt vairāk..."
+    all_time: 'kopā'
+    all_time_desc: 'pavisam izveidotas tēmas'
+    year: 'gads'
+    year_desc: 'pēdējās 365 dienās izveidotie ieraksti'
+    month: 'mēnesis'
+    month_desc: 'pēdējās 30 dienās izveidotās tēmas'
+    week: 'nedēļa'
+    week_desc: 'pēdējās 7 dienās izveidotās tēmas'
+    day: 'diena'
+    first_post: Pirmais ieraksts
+    mute: Noklusināt
+    unmute: Pārtraukt klusināšanu
+    last_reply_lowercase: pēdējā atbilde
+    replies_lowercase:
+      zero: atbildes
+      one: atbilde
+      other: atbildes
+    signup_cta:
+      sign_up: "Pierakstīties"
+      hide_session: "Atgādināt man rīt"
+      hide_forever: "nē, paldies"
+      hidden_for_session: "Labi, pajautāšu jums rīt. Starp citu, vienmēr var piereģistrēties, spiežot \"Ieiet sistēmā\"."
+      intro: "Hei! :heart_eyes: Šķiet, jums patīk diskusija, bet jums vēl nav profila."
+      value_prop: "Kad esat izveidojuši profilu, mēs precīzi atceramies, cik tālu esat lasījuši, tāpēc jūs vienmēr varat turpināt no turienes, kur pārtraucāt. Jūs arī saņemsiet paziņojumus šeit un e-pastā, kad tiks izveidoti jauni ieraksti. Un jūs varat izteikt atzinību ierakstiem, lai atbalstītu autoru. :heartbeat:"
+    summary:
+      enabled_description: "Jūs skatāties šīs tēmas kopsavilkumu: pašus interesantākos ierakstus, pēc kopienas domām."
+      description: "Ir <b>{{replyCount}}</b> atbildes."
+      description_time: "Ir <b>{{replyCount}}</b> atbildes ar paredzamo lasīšanas laiku: <b>{{readingTime}} minūtes</b>."
+      enable: 'Tēmas kopsavilkums'
+      disable: 'Parādīt visus ierakstus'
+    deleted_filter:
+      enabled_description: "Šī tēma satur dzēstus ierakstus, kuri ir paslēpti."
+      disabled_description: "Dzēstie ieraksti šajā tēmā ir redzami."
+      enable: "Paslēpt dzēstos ierakstus "
+      disable: "Rādīt dzēstos ierakstus"
+    private_message_info:
+      title: "Ziņa"
+      invite: "Ielūgt citus..."
+      remove_allowed_user: "Vai jūs tiešām gribat dzēst {{name}} no šīs ziņas?"
+      remove_allowed_group: "Vai jūs tiešām gribat dzēst {{name}} no šīs ziņas?"
+    email: 'E-pasts'
+    username: 'Lietotājvārds'
+    last_seen: 'Redzēts'
+    created: 'Izveidots'
+    created_lowercase: 'izveidots'
+    trust_level: 'Uzticības līmenis'
+    search_hint: 'lietotājvārds, e-pasts vai IP adrese'
+    create_account:
+      disclaimer: "Reģistrējoties jūs piekrītat <a href='{{privacy_link}}'>konfidencialitātes politikai</a> un <a href='{{tos_link}}'>pakalpojumu sniegšanas noteikumiem</a>."
+      title: "Izveidot jaunu profilu"
+      failed: "Notika neparedzēta kļūda; varbūt šis e-pasts ir jau reģistrēts, pamēģiniet izmantot \"aizmirsu paroli\""
+    forgot_password:
+      title: "Paroles atjaunošana"
+      action: "Es aizmirsu savu paroli "
+      invite: "Ievadiet jūsu lietotājvārdu vai e-pasta adresi, un mēs jums nosūtīsim paroles atjaunošanas e-pastu."
+      reset: "Atjaunot paroli"
+      complete_username: "Ja konts atbildīs lietotājvārdam <b>%{username}</b>, jūs drīz saņemsiet e-pastu ar paroles atjaunošanas instrukcijām."
+      complete_email: "Ja konts atbildīs<b>%{email}</b>, Jūs drīz saņemsiet e-pastu ar paroles atjaunošanas instrukcijām."
+      complete_username_found: "Mēs atradām kontu, kas atbilst lietotājvārdam <b>%{username}</b>. Jūs drīz saņemsiet e-pastu ar paroles atjaunošanas instrukcijām."
+      complete_email_found: "Mēs atradām kontu, kas atbilst <b>%{email}</b>. Jūs drīz saņemsiet e-pastu ar paroles atjaunošanas instrukcijām."
+      complete_username_not_found: "Neviens konts neatbilst lietotājvārdam <b>%{username}</b>"
+      complete_email_not_found: "Neviens konts neatbilst <b>%{email}</b>"
+      help: "Nesaņēmāt e-pastu? Pārbaudiet savu surogātpasta mapi. <p>Neesat drošs par to, kuru e-pasta adresi izmantojāt? Ievadiet e-pasta adresi, un mēs paziņosim, ja tā ir izmantota.</p> <p>Ja jums vairs nav piekļuves sava konta e-pasta adresei, lūdzu, sazinieties <a href='/about'>ar mūsu izpalīdzīgajiem darbiniekiem.</a></p>"
+      button_ok: "Labi"
+      button_help: "Palīdzība"
+    login:
+      title: "Ieiet sistēmā"
+      username: "Lietotājs"
+      password: "Parole"
+      email_placeholder: "e-pasts vai lietotājvārds"
+      caps_lock_warning: "Ir ieslēgts Caps Lock"
+      error: "Nezināma kļūda"
+      rate_limit: "Lūdzu uzgaidiet pirms nākamā mēģinājuma ieiet sistēmā"
+      blank_username_or_password: "Lūdzu ievadiet savu e-pastu vai lietotājvārdu un paroli"
+      reset_password: 'Atjaunot paroli'
+      logging_in: "Ieejam sistēmā..."
+      or: "Vai"
+      authenticating: "Autorizējam..."
+      awaiting_activation: "Jūsu profils gaida aktivizāciju; izmantojiet saiti \"aizmirsu paroli\", lai izsūtītu citu aktivizācijas e-pastu."
+      awaiting_approval: "Darbinieki pagaidām nav apstiprinājuši jūsu profilu. Jums nosūtīs e-pastu, kad tas notiks."
+      requires_invite: "Atvainojiet, šim forumam var piekļūt tikai ar ielūgumiem."
+      not_activated: "Lai ieietu forumā, nepieciešams aktivizēt jūsu profilu. Mēs nosūtījām uz e-pastu {{sentTo}} instrukcijas, kā to paveikt."
+      not_allowed_from_ip_address: "Jūs nevarat ieiet no šīs IP adreses."
+      admin_not_allowed_from_ip_address: "Jūs nevarat ieiet kā administrators no šīs IP adreses."
+      resend_activation_email: "Klikšķiniet šeit, lai saņemtu aktivācijas e-pastu atkārtoti."
+      resend_title: "Atkārtoti nosūtīt aktivācijas e-pastu"
+      change_email: "Mainīt e-pasta adresi"
+      provide_new_email: "Norādiet jaunu adresi, un mēs atkārtoti nosūtīsim jūsu apstiprinājuma e-pastu."
+      submit_new_email: "Atjaunināt e-pasta adresi"
+      sent_activation_email_again: "Mēs nosūtijām vēl vienu aktivācijas epastu uz <b>{{currentEmail}}</b>. Tas var pienākt dažu minūšu laikā; atcerieties pārbaudīt jūsu surogātpasta mapi."
+      to_continue: "Lūdzu ieejiet"
+      preferences: "Jums ir jāieiet, lai izmainītu savus iestatījumus."
+      forgot: "Es nevaru atcerēties sava konta informāciju."
+      not_approved: "Jūsu konts vēl nav apstiprināts. Jums tiks paziņots e-pastā, kad varēsiet pieslēgties."
+      google:
+        title: "ar Google."
+        message: "Autorizēšanās ar Google (pārliecinieties, ka nav bloķēti uznirstošie logi)"
+      google_oauth2:
+        title: "ar Google"
+        message: "Autorizēšanās ar Google (pārliecinieties, ka nav bloķēti uznirstošie logi)"
+      twitter:
+        title: "ar Twitter"
+        message: "Autorizēšanās ar Twitter (pārliecinieties, ka nav bloķēti uznirstošie logi)"
+      instagram:
+        title: "ar Instagram"
+        message: "Autorizēšanās ar Instagram (pārliecinieties, ka nav bloķēti uznirstošie logi)"
+      facebook:
+        title: "ar Facebook"
+        message: "Autorizēšanās ar Facebook (pārliecinieties, ka nav bloķēti uznirstošie logi)"
+      yahoo:
+        title: "ar Yahoo"
+        message: "Autorizēšanās ar Yahoo (pārliecinieties, ka nav bloķēti uznirstošie logi)"
+      github:
+        title: "ar GitHub"
+        message: "Autorizēšanās ar GitHub (pārliecinieties, ka nav bloķēti uznirstošie logi)"
+    invites:
+      accept_title: "Ielūgums"
+      welcome_to: "Laipni lūdzam %{site_name}!"
+      invited_by: "Jūs uzaicināja: "
+      social_login_available: "Jūs varēsiet ieiet ar šo e-pastu, arī izmantojot sociālo tīklu profilus."
+      your_email: "Jūsu konta e-pasta adrese ir <b>%{email}</b>."
+      accept_invite: "Pieņemt ielūgumu"
+      success: "Jūsu konts ir izveidots un jūs esat ielogojies "
+      name_label: "Vārds"
+      password_label: "Iestatīt paroli"
+      optional_description: "(pēc izvēles)"
+    password_reset:
+      continue: "Turpināt %{site_name}"
+    emoji_set:
+      apple_international: "Apple/International"
+      google: "Google"
+      twitter: "Twitter"
+      emoji_one: "Emoji One"
+      win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
+    category_page_style:
+      categories_only: "Tikai sadaļas"
+      categories_with_featured_topics: "Sadaļas un to labākās tēmas"
+      categories_and_latest_topics: "Sadaļas un jaunākās tēmas"
+    shortcut_modifier_key:
+      shift: 'Shift'
+      ctrl: 'Ctrl'
+      alt: 'Alt'
+    emoji_picker:
+      filter_placeholder: Meklēt emoji
+      people: Cilvēki
+      nature: Daba
+      food: Ēdiens
+      activity: Aktivitātes
+      travel: Ceļojumi
+      objects: Priekšmeti
+      celebration: Svinības
+      custom: Lietotāja emoji
+      recent: Nesen izmantotie
+      default_tone: Noklusējuma ādas krāsa
+      light_tone: Gaiša ādas krāsa
+      medium_light_tone: Vidēji gaiša ādas krāsa
+      medium_tone: Vidēja ādas krāsa
+      medium_dark_tone: Vidēji tumša ādas krāsa
+      dark_tone: Tumša ādas krāsa
+    composer:
+      emoji: "Emoji :)"
+      more_emoji: "vairāk..."
+      options: "Iespējas"
+      whisper: "čuksts"
+      unlist: "paslēpts"
+      blockquote_text: "Bloka citāts"
+      add_warning: "Šis ir oficiāls brīdinājums."
+      toggle_whisper: "Čukstēšana"
+      toggle_unlisted: "Paslēpšana no tēmu saraksta"
+      posting_not_on_topic: "Kurā tēmā vēlaties komentēt?"
+      saving_draft_tip: "saglabā..."
+      saved_draft_tip: "saglabāts"
+      saved_local_draft_tip: "saglabāts lokāli"
+      similar_topics: "Jūsu tēma ir līdzīga..."
+      drafts_offline: "lokāls melnraksts"
+      group_mentioned:
+        zero: "Pieminot {{group}}, neviens nesaņems paziņojumu, jo grupa ir tukša."
+        one: "Pieminot {{group}}, šis cilvēks saņems paziņojumu – esat pārliecināti?"
+        other: "Pieminot {{group}}, šiem <a href='{{group_link}}'>{{count}} cilvēki</a> saņems paziņojumu – esat pārliecināti?"
+      cannot_see_mention:
+        category: "Jūs pieminējāt {{username}}, kas ir bez piekļuves šai sadaļai un tāpēc nesaņems nekādu paziņojumu. Lai to izlabotu, pievieno viņus grupai ar pieeju šai sadaļai."
+        private: "Jūsu pieminējāt {{username}}, kas neredzēs šo privāto ziņu un tāpēc nesaņems nekādu paziņojumu. Lai to izlabotu, pievieno viņus šai ziņai."
+      duplicate_link: "Izskatās, ka jūsu saiti uz <b>{{domain}}</b> tēmā jau ievietoja <b>@{{username}}</b> <a href='{{post_url}}'>ierakstā {{ago}}</a> - vai jūs tiešām vēlaties to ievietot vēlreiz?"
+      error:
+        title_missing: "Vajadzīgs nosaukums"
+        title_too_short: "Nosaukumā jābūt vismaz {{min}} burtiem"
+        title_too_long: "Nosaukums nevar būt garāks par {{max}} burtiem"
+        post_missing: "Ieraksts nevar būt tukšs"
+        post_length: "Ierakstā jābūt vismaz {{min}} burtiem"
+        try_like: 'Vai jūs mēģinājāt izteikt atzinību ar <i class="fa fa-heart"></i> pogu?'
+        category_missing: "Jums ir jāizvēlas sadaļa"
+      save_edit: "Saglabāt izmaiņas"
+      reply_original: "Atbildēt sākotnējā tēmā"
+      reply_here: "Atbildēt šeit"
+      reply: "Atbildēt"
+      cancel: "Atcelt"
+      create_topic: "Izveidot tēmu"
+      create_pm: "Ziņa"
+      title: "Vai nospiediet Ctrl+Enter"
+      users_placeholder: "Pievienot lietotāju"
+      title_placeholder: "Aprakstiet šis diskusijas saturu īsā teikumā!"
+      title_or_link_placeholder: "Ierakstiet nosaukumu vai ievietojiet šeit saiti"
+      edit_reason_placeholder: "kāpēc jūs rediģējat?"
+      show_edit_reason: "(pievienot rediģēšanas iemeslu)"
+      topic_featured_link_placeholder: "Ievadiet saiti, kas redzama virsrakstā."
+      reply_placeholder: "Rakstiet šeit. Izmantojiet Markdown, BBCode, vai HTML formatēšanai. Velciet vai ielīmējiet bildes."
+      view_new_post: "Apskatīt jūsu jauno ierakstu."
+      saving: "Saglabā"
+      saved: "Saglabāts!"
+      saved_draft: "Ieraksta melnraksts. Spiediet šeit, lai turpinātu."
+      uploading: "Augšuplādē..."
+      show_preview: 'rādīt priekšskatījumu &raquo;'
+      hide_preview: '&laquo; slēpt priekšskatījumu'
+      quote_post_title: "Citēt visu ierakstu"
+      bold_label: "B"
+      bold_title: "Treknraksts"
+      bold_text: "treknrakstā"
+      italic_label: "I"
+      italic_title: "Uzsvars"
+      italic_text: "Uzsvērts teksts"
+      link_title: "Saite"
+      link_description: "ievadiet saites aprakstu šeit"
+      link_dialog_title: "Ievietojiet saiti"
+      link_optional_text: "neobligāts nosaukums"
+      link_url_placeholder: "http://example.com"
+      quote_title: "Bloka citāts"
+      quote_text: "Ierakstiet bloka citāta saturu"
+      code_title: "Formatēts teksts"
+      code_text: "piešķirt formatētajam tekstam 4 atstarpju atkāpi"
+      paste_code_text: "ierakstiet vai ielīmējiet formatēto tekstu šeit"
+      upload_title: "Augšupielādēt"
+      upload_description: "pievienojiet faila aprakstu"
+      olist_title: "Numurēts saraksts"
+      ulist_title: "Nenumurēts saraksts"
+      list_item: "Saraksta punkts"
+      help: "Palīdzība ar formatēšanu, izmantojot Markdown"
+      modal_ok: "Labi"
+      modal_cancel: "Atcelt"
+      cant_send_pm: "Atvainojiet, jūs nevarat sūtīt ziņu %{username}."
+      yourself_confirm:
+        title: "Vai jūs aizmirsāt pievienot saņēmējus?"
+        body: "Šobrīd šī ziņa tiek sūtīta tikai jums!"
+      admin_options_title: "Papildus tēmas iestatījumi darbiniekiem"
+    notifications:
+      title: "paziņojumi par @vārda pieminēšanu, atbildēm uz jūsu ierakstiem un tēmām, ziņām, utt."
+      none: "Pašlaik neizdodas ielādēt paziņojumus."
+      empty: "Nav atrasti paziņojumi."
+      more: "skatīt senākus paziņojumus"
+      total_flagged: "pavisam ieraksti ar sūdzībam"
+      alt:
+        mentioned: "Pieminēja"
+        quoted: "Citēja"
+        replied: "Atbildēja"
+        posted: "Ieraksts"
+        edited: "Korektētēja"
+        liked: "Pauda atzinību jūsu ierakstam"
+        private_message: "Privāta ziņa no"
+        invited_to_private_message: "Ielūgums uz privāto ziņu no"
+        invited_to_topic: "Ielūgums uz tēmu no"
+        invitee_accepted: "Ielūgumu pieņēma "
+        moved_post: "Jūsu ierakstu pārvietoja"
+        linked: "Saite uz jūsu ierakstu"
+        granted_badge: "Žetonu piešķīra"
+        group_message_summary: "Ziņas grupas iesūtnē"
+      popup:
+        mentioned: '{{username}} pieminēja jūs "{{topic}}" - {{site_title}}'
+        group_mentioned: '{{username}} pieminēja jūs "{{topic}}" - {{site_title}}'
+        quoted: '{{username}} citēja jūs "{{topic}}" - {{site_title}}'
+        replied: '{{username}} atbildēja jums "{{topic}}" - {{site_title}}'
+        posted: '{{username}} ierakstīja "{{topic}}" - {{site_title}}'
+        private_message: '{{username}} nosūtīja jums privātu ziņu "{{topic}}" - {{site_title}}'
+        linked: '{{username}} ievietoja saiti uz jūsu ierakstu no "{{topic}}" - {{site_title}}'
+    upload_selector:
+      title: "Pievienot attēlu"
+      title_with_attachments: "Pievienot attēlu vai failu"
+      from_my_computer: "No manas ierīces"
+      from_the_web: "No interneta"
+      remote_tip: "saite uz attēlu"
+      remote_tip_with_attachments: "saite uz attēlu vai failu {{authorized_extensions}}"
+      local_tip: "izvēlēties attēlus no jūsu ierīces"
+      local_tip_with_attachments: "izvēlēties attēlus vai failus no jūsu ierīces {{authorized_extensions}}"
+      hint: "(Jūs varat arī augšuplādēt failus, ievelkot tos redaktorā)"
+      hint_for_supported_browsers: "Jūs varat arī ievilkt vai ielīmēt redaktorā attēlus"
+      uploading: "Augšuplādē"
+      select_file: "Izvēlēties failu"
+      image_link: "saite, uz kuru norādīs jūsu attēls"
+    search:
+      sort_by: "Kārtot pēc"
+      relevance: "Nozīmīgums"
+      latest_post: "Jaunākais ieraksts"
+      latest_topic: "Jaunākā tēma"
+      most_viewed: "Visvairāk skatīts"
+      most_liked: "Visvairāk atzinību"
+      select_all: "Izvēlēties visu"
+      clear_all: "Noņemt visus"
+      too_short: "Jūsu meklēšanas frāze ir pārāk īsa."
+      title: "meklēt tēmās, ierakstos, lietotājos vai kategorijās"
+      no_results: "Nav rezultātu."
+      no_more_results: "Vairāk nav rezultātu."
+      searching: "Meklējam..."
+      post_format: "#{{post_number}} - {{username}}"
+      more_results: "Ir vēl vairāk rezultātu. Lūdzu precizējiet meklēšanas kritērijus."
+      context:
+        user: "Meklēt ierakstus ar @{{username}}"
+        category: "Meklēt #{{category}} sadaļā"
+        topic: "Meklēt šai tēmā"
+        private_messages: "Meklēt ziņās"
+      advanced:
+        title: Izvērstā meklēšana
+        posted_by:
+          label: Ierakstīja
+        in_group:
+          label: Grupā
+        with_badge:
+          label: Ar žetonu
+        filters:
+          likes: Man patika
+          posted: Es ierakstīju
+          watching: Es skatos
+          tracking: Es sekoju
+          first: ir tēmas pirmais ieraksts
+          pinned: ir piesprausts
+          unpinned: nav piesprausts
+          unseen: neesmu izlasījis
+          wiki: ir wiki
+        statuses:
+          label: Kur tēmas
+          open: ir atvērtas
+          closed: ir slēgtas
+          archived: ir arhivētas
+          noreplies: ir bez atbildēm
+          single_user: ir rakstījis tikai viens lietotājs
+        post:
+          count:
+            label: Minimālais ierakstu skaits
+          time:
+            label: Ierakstīts
+            before: līdz
+            after: pēc
+    hamburger_menu: "iet uz citu tēmu sarakstu vai sadaļu"
+    new_item: "jauns"
+    go_back: 'atgriezties'
+    not_logged_in_user: 'lietotāja lapa ar pēdējo aktivitāšu un iestatījumu vēsturi'
+    current_user: 'doties uz jūsu lietotāja lapu'
+    topics:
+      new_messages_marker: "pēdējais apmeklējums"
+      bulk:
+        select_all: "Izvēlēties visu"
+        clear_all: "Noņemt visu"
+        unlist_topics: "Izņemt no sarakstiem tēmas"
+        relist_topics: "Atkal padarīt tēmas redzamas sarakstiem"
+        reset_read: "Noņemt statusus \"lasīts\""
+        delete: "Dzēst tēmas"
+        dismiss: "Nerādīt"
+        dismiss_read: "Nerādīt visu neizlasīto"
+        dismiss_button: "Nerādīt..."
+        dismiss_tooltip: "Nerādīt tikai jaunos ierakstus vai pārtraukt sekot tēmām"
+        also_dismiss_topics: "Pārtraukt sekot šīm tēmām, lai tās man vairs nekad nerādītos kā neizlasītas"
+        dismiss_new: "Nerādīt jaunus"
+        toggle: "darbības ar vairākām tēmām"
+        actions: "Darbības ar vairumu"
+        change_category: "Norādīt sadaļu"
+        close_topics: "Slēgt tēmas"
+        archive_topics: "Arhivēt tēmas"
+        notification_level: "Paziņojumi"
+        choose_new_category: "Izvēlēties jaunu sadaļu šīm tēmām:"
+        selected:
+          zero: "Jūs izvēlējāties <b>0.</b> tēmas."
+          one: "Jūs izvēlējāties <b>1.</b> tēmu."
+          other: "Jūs izvēlējāties <b>{{count}}</b> tēmas."
+        change_tags: "Aizvietot tagus"
+        append_tags: "Pievienot tagus"
+        choose_new_tags: "Izvēlēties jaunus tagus šīm tēmām:"
+        choose_append_tags: "Izvēlēties jaunas birkas, ko pievienot šīm tēmām:"
+        changed_tags: "Šo tēmu tagi tika mainīti."
+      none:
+        unread: "Jums nav nelasītu tēmu."
+        new: "Jums nav jaunu tēmu."
+        read: "Jūs vēl neesat izlasījuši nevienu tēmu."
+        posted: "Jūs vel neesat rakstījuši nevienā tēmā."
+        latest: "Nav jaunu tēmu. Neraža."
+        hot: "Nav populāru tēmu."
+        bookmarks: "Jūs vēl neesat pievienojuši grāmatzīmēm nevienu tēmu."
+        category: "Sadaļā {{category}} nav tēmu."
+        top: "Nav svarīgu tēmu."
+        search: "Nekas netika atrasts."
+        educate:
+          new: '<p>Jūsu jaunās tēmas parādās šeit.</p> <p>Pēc noklusējuma tēmas tiek uzskatītas par jaunām un parādīsies <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">jauns</span> indikators, ja tās tika izveidotas pēdējo 2 dienu laikā.</p> <p>To var izmainīt jūsu <a href="%{userPrefsUrl}">iestatījumos</a>.</p>'
+          unread: '<p>Jūsu nelasītās tēmas parādās šeit.</p><p>Pēc noklusējuma tēmas tiek uzskatītas par nelasītām un tiks uzskaitītas <span class="badge new-posts badge-notification">1</span> ja jūs:</p><ul><li>Izveidojāt tēmu</li><li>Atbildējāt tēmā</li><li>Lasījāt tēmu vairāk nekā 4 minūtes</li></ul><p>Vai jūs atzīmējāt Sekot vai Skatī tēmas apakšā.</p><p>To var izmainīt jūsu <a href="%{userPrefsUrl}">iestatījumos</a>.</p>'
+      bottom:
+        latest: "Vairāk jaunāko tēmu nav. "
+        hot: "Vairāk populāro tēmu nav. "
+        posted: "Vairāk publicēto tēmu nav. "
+        read: "Vairāk lasīto tēmu nav. "
+        new: "Vairāk jauno tēmu nav. "
+        unread: "Vairāk nelasīto tēmu nav. "
+        category: "Vairāk sadaļās {{category}} tēmu nav. "
+        top: "Vairāk svarīgu tēmu nav. "
+        bookmarks: "Vairāk grāmatzīmēs ievietoto tēmu nav. "
+        search: "Nekas netika atrasts."
+    topic:
+      unsubscribe:
+        stop_notifications: "Tagad saņemsi mazāk paziņojumus no <strong>{{title}}</strong>"
+        change_notification_state: "Tavs šī brīža paziņojumu statuss ir"
+      filter_to:
+        zero: "tēmā ziņu nav"
+        one: "1 ziņa tēmā"
+        other: "{{count}} ziņas tēmā"
+      create: 'Jauna tēma'
+      create_long: 'Izveidot jaunu tēmu '
+      private_message: 'Rakstīt ziņu '
+      archive_message:
+        help: 'Pārvietot ziņu uz arhīvu '
+        title: 'Arhīvs'
+      move_to_inbox:
+        title: 'Pārvietot uz iesūtni'
+        help: 'Atgriezt ziņu uz iesūtni '
+      list: 'Tēmas'
+      new: 'Jauna tēma'
+      unread: 'nelasīti'
+      new_topics:
+        zero: 'Jaunu tēmu nav'
+        one: '1 jauna tēma'
+        other: '{{count}} jaunas tēmas '
+      unread_topics:
+        zero: 'Nelasītu tēmu nav'
+        one: '1 nelasīta tēma'
+        other: '{{count}} nelasītas tēmas'
+      title: 'Tēma'
+      invalid_access:
+        title: "Šī tēma ir privāta "
+        description: "Atvainojiet, jums nav pieejas šai tēmai!"
+        login_required: "Jums jāieiet forumā, lai redzētu tēmu."
+      server_error:
+        title: "Tēmu neizdevās ielādēt"
+        description: "Atvainojiet, nevarējām ielādēt šo tēmu, iespējams, saistībā ar savienojuma problēmu. Lūdzu mēģiniet vēlreiz. Ja problēma atkārtojas, dodiet mums ziņu."
+      not_found:
+        title: "Tēma nav atrasta "
+        description: "Atvainojiet, šo tēmu neatradām. Varbūt to noņēma moderators? "
+      total_unread_posts:
+        zero: "Tev šajā tēmā nav neizlasītu ziņojumu"
+        one: "Tev šajā tēmā ir 1 neizlasīts ziņojums"
+        other: "Tev šajā tēmā ir {{count}} neizlasītu ziņojumu "
+      unread_posts:
+        zero: "Tev šajā tēmā nav vecu neizlasītu ziņojumu"
+        one: "Tev šajā tēmā ir 1 vecs neizlasīts ziņojums"
+        other: "Tev šajā tēmā ir {{count}} vecu neizlasītu ziņojumu. "
+      new_posts:
+        zero: "Šajā tēmā nav jaunu nelasītu ziņojumu"
+        one: "Šajā tēmā ir 1 jauns nelasīts ziņojums"
+        other: "Šajā tēmā ir {{count}} jauni nelasīti ziņojumi"
+      likes:
+        zero: "Šai tēmai nav \"patīk\""
+        one: "Šai tēmai ir viens \"patīk\""
+        other: "Šai tēmā ir {{count}} atzinības"
+      back_to_list: "Atpakaļ pie tēmu saraksta "
+      options: "Tēmas iestatījumi "
+      show_links: "rādīt saites šajā tēmā"
+      toggle_information: "rādīt / slēpt tēmas informāciju "
+      read_more_in_category: "Vēlies lasīt vēl? Pārlūko citas tēmas: {{catLink}} vai {{latestLink}}."
+      read_more: "Vēlies lasīt vēl? {{catLink}} or {{latestLink}}."
+      read_more_MF: "{ UNREAD, plural, =0 {} one { Palikusi <a href='/unread'>1 nelasīta</a> } other { Palikušas <a href='/unread'># nelasītas</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 jauna</a> tēma} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># jaunas</a> tēmas} } remaining, or {CATEGORY, select, true {pārlūkot citas tēmas iekš {catLink}} false {{latestLink}} other {}}"
+      browse_all_categories: Pārlūkot visas sadaļas
+      view_latest_topics: Skatīt jaunākās tēmas
+      suggest_create_topic: 'Kādēļ gan neizveidot jaunu tēmu? '
+      jump_reply_up: pāriet uz agrāku atbildi
+      jump_reply_down: 'pāriet uz vēlāku atbildi '
+      deleted: "Tēma ir dzēsta "
+      topic_status_update:
+        save: "Uzstādīt taimeri "
+        num_of_hours: "Stundu skaits:"
+        remove: "Noņemt taimeri"
+        publish_to: "Publicēt: "
+        when: "Kad:"
+      auto_update_input:
+        later_today: "Vēlāk šodien"
+        tomorrow: "Rītdien"
+        later_this_week: "Vēlāk šonedēļ"
+        this_weekend: "Šajā nedēļas nogalē"
+        next_week: "Nākamā nedēļā"
+        next_month: "Nākamā mēnesī"
+        pick_date_and_time: "Izvēlēties datumu un laiku "
+        set_based_on_last_post: "Aizvērt, balstoties uz pēdējo ziņojumu "
+      publish_to_category:
+        title: "Ieplānot publicēšanu "
+      temp_open:
+        title: "Atvērts uz laiku "
+      auto_reopen:
+        title: "Automātiski atvērt tēmu "
+      temp_close:
+        title: "Aizvērt uz laiku "
+      auto_close:
+        title: "Automātiski aizvērt tēmu "
+        label: "Automātiski aizvērt tēmas stundas"
+        error: "Lūdzu ievadiet derīgu vērtību "
+        based_on_last_post: "Neaizvērt, līdz pēdējais ziņojums šajā tēmā ir vismaz tik vecs. "
+      auto_delete:
+        title: "Automātiski dzēst tēmu "
+      reminder:
+        title: "Atgādināt man"
+      status_update_notice:
+        auto_open: "Šo tēmu automātiski atvērs %{timeLeft}."
+        auto_close: "Šo tēmu automātiski slēgs %{timeLeft}."
+        auto_publish_to_category: "Šo tēmu publicēs <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
+        auto_close_based_on_last_post: "Šo tēmu slēgs %{duration} pēc pēdējās atbildes."
+        auto_delete: "Šo tēmu automātiski dzēsīs pēc %{timeLeft}."
+        auto_reminder: "Jums atgādinās par šo tēmu pēc %{timeLeft}."
+      auto_close_title: 'Automātiskās slēgšanas iestatījumi'
+      auto_close_immediate:
+        zero: "Pēdējais ieraksts tēmā ir %{count} stundas vecs, tāpēc tēma tiks slēgta nekavējoties."
+        one: "Pēdējais ieraksts tēmā ir 1 stundu vecs, tāpēc tēma tiks slēgta nekavējoties."
+        other: "Pēdējais ieraksts tēmā ir %{count} stundas vecs, tāpēc tēma tiks slēgta nekavējoties."
+      timeline:
+        back: "Atpakaļ"
+        back_description: "Atgriezties pie pēdējā nelasītā ieraksta"
+        replies_short: "%{current} / %{total}"
+      progress:
+        title: tēmas progress
+        go_top: "pāriet uz augšu"
+        go_bottom: "pāriet uz leju"
+        go: "doties"
+        jump_bottom: "pāriet pie pēdējā ieraksta"
+        jump_prompt: "pāriet pie..."
+        jump_prompt_of: "no %{count} ierakstiem"
+        jump_prompt_long: "Pie kura ieraksta jūs vēlētos pāriet?"
+        jump_bottom_with_number: "pāriet pie ieraksta %{post_number}"
+        total: kopējais ierakstu skaits
+        current: šis ieraksts
+      notifications:
+        title: izmainīt to, cik bieži jūs saņemsiet paziņojumus par šo temu
+        reasons:
+          mailing_list_mode: "Jums ir ieslēgts vēstkopas ieraksts, tāpēc par atbildēm šai tēmā ziņosim e-pastā."
+          '3_10': 'Jūs saņemsiet paziņojumus, jo novērojat tagu, kas ir šai tēmai.'
+          '3_6': 'Jūs saņemsiet paziņojumus, jo novērojat šo sadaļu.'
+          '3_5': 'Jūs saņemsiet paziņojumus, jo sākāt novērot šo tēmu automātiski.'
+          '3_2': 'Jūs saņemsiet paziņojumus, jo novērojat šo tēmu.'
+          '3_1': 'Jūs saņemsiet paziņojumus, jo izveidojāt šo tēmu.'
+          '3': 'Jūs saņemsiet paziņojumus, jo jūs novērojat šo tēmu.'
+          '2_8': 'Jūs redzēsiet jauno atbilžu skaitu, jo sekojat šai sadaļai.'
+          '2_4': 'Jūs redzēsiet jauno atbilžu skaitu, jo atbildējāt šajā tēmā.'
+          '2_2': 'Jūs redzēsiet jauno atbilžu skaitu, jo jūs sekojat šai tēmai.'
+          '2': 'Jūs redzēsiet jauno atbilžu skaitu, jo jūs <a href="/u/{{username}}/preferences">lasījāt šo tēmu</a>.'
+          '1_2': 'Jūs saņemsiet paziņojumu, ja kāds pieminēs jūsu vārdu paziņos, ja @pseidonīmu vai atbildēs jums.'
+          '1': 'Jūs saņemsiet paziņojumu, ja kāds pieminēs jūsu vārdu paziņos, ja @pseidonīmu vai atbildēs jums.'
+          '0_7': 'Nesaņemt nekādus paziņojumus par šo sadaļu.'
+          '0_2': 'Nesaņemt nekādus paziņojumus par šo tēmu.'
+          '0': 'Nesaņemt nekādus paziņojumus par šo tēmu.'
+        watching_pm:
+          title: "Novērot"
+          description: "Jums paziņos par katru jaunu atbildi šai ziņai un rādīs jauno atbilžu skaitu."
+        watching:
+          title: "Novērot"
+          description: "Jums paziņos par katru jaunu atbildi šai tēmā un rādīs jauno atbilžu skaitu."
+        tracking_pm:
+          title: "Sekot"
+          description: "Parādīs jauno atbilžu skaitu šai ziņai. Jums paziņos, ja kāds pieminēs jūsu @lietotājvārdu vai atbildēs jums."
+        tracking:
+          title: "Sekot"
+          description: "Parādīs jauno atbilžu skaitu šai tēmā. Jums paziņos, ja kāds pieminēs jūsu @lietotājvārdu vai atbildēs jums."
+        regular:
+          title: "Normāls"
+          description: "Jums paziņos, ja kāds pieminēs jūsu @lietotājvārdu vai atbildēs jums."
+        regular_pm:
+          title: "Normāls"
+          description: "Jums paziņos, ja kāds pieminēs jūsu @lietotājvārdu vai atbildēs jums."
+        muted_pm:
+          title: "Klusināts"
+          description: "Jūs par šo ziņu nesaņemsiet nekādus paziņojumus."
+        muted:
+          title: "Klusināts"
+          description: "Jūs par šo tēmu nesanemsiet nekādus paziņojumus, un tā neparādīsies pēdējās tēmās."
+      actions:
+        recover: "Atcelt tēmas dzēšanu"
+        delete: "Dzēst tēmu"
+        open: "Atvērt tēmu"
+        close: "Slēgt tēmu"
+        multi_select: "Izvēlēties ierakstus..."
+        timed_update: "Iestatīt tēmas taimeri"
+        pin: "Piespraust tēmu..."
+        unpin: "Atspraust tēmu..."
+        unarchive: "Izņemt tēmu no arhīva"
+        archive: "Arhivēt tēmu"
+        invisible: "Izņemt tēmu no sarakstiem"
+        visible: "Atgriezt tēmu sarakstos"
+        reset_read: "Atstatīt visu kā nelasītu"
+        make_public: "Izveidot publisku tēmu"
+        make_private: "Izveidot privātu ziņu"
+      feature:
+        pin: "Piespraust tēmu"
+        unpin: "Atspraust tēmu"
+        pin_globally: "Piespraust tēmu globāli"
+        make_banner: "Banera tēma"
+        remove_banner: "Noņemt banera tēmu"
+      reply:
+        title: 'Atbildēt'
+        help: 'sākt rakstīt atbildi šai tēmai'
+      clear_pin:
+        title: "Noņemt piespraušanu"
+        help: "Noņemt šai tēmai statusu 'piesprausta', lai tā vairs neparādītos jūsu tēmu saraksta augšgalā"
+      share:
+        title: 'Dalīties'
+        help: 'dalīties ar saiti uz so tēmu'
+      print:
+        title: 'Drukāt'
+        help: 'Atvērt šīs tēmas drukas versiju'
+      flag_topic:
+        title: 'Ziņot'
+        help: 'privāti atzīmēt šo tēmu vai nosūtīt privāti ziņojumu par to'
+        success_message: 'Jūs veiksmīgi ziņojāt par šo tēmu.'
+      feature_topic:
+        title: "Novietot šo tēmu augšgalā"
+        pin: "Nostiprināt šo tēmu sadaļas {{categoryLink}} augšgalā līdz"
+        confirm_pin: "Jums jau ir {{count}} piespraustas tēmas. Pārāk daudz piespraustu tēmu ir apgrūtinājums jauniem un anonīmiem lietotājiem. Vai jūs esat drošs, ka vēlaties piespraust vēl vienu tēmu šajā sadaļā."
+        unpin: "Noņemt šo tēmu no sadaļas {{categoryLink}} augšgala."
+        unpin_until: "Noņemt šo tēmu no sadaļas {{categoryLink}} augšgala vai gaidīt līdz <strong>%{until}</strong>."
+        pin_note: "Lietotāji var atspraust tēmu, katrs sev personīgi."
+        pin_validation: "Lai piespraustu šo tēmu, ir nepieciešams datums."
+        not_pinned: "Sadaļā {{categoryLink}} nav piespraustu tēmu."
+        already_pinned:
+          zero: "Sadaļā {{categoryLink}} šobrīd nav piespraustu tēmu"
+          one: "Sadaļā {{categoryLink}} šobrīd piesprausta {{count}} tēma"
+          other: "Sadaļā {{categoryLink}} šobrīd piespraustas <strong class='badge badge-notification unread'>{{count}}</strong> tēmas"
+        pin_globally: "Likt šai tēmai parādīties visu tēmu sarakstu augšgalos līdz"
+        confirm_pin_globally: "Jums jau ir {{count}} globāli piespraustas tēmas. Pārāk daudz piespraustu tēmu ir apgrūtinājums jauniem un anonīmiem lietotājiem. Vai jūs esat drošs, ka vēlaties globāli piespraust vēl vienu tēmu."
+        unpin_globally: "Noņemt šo tēmu no visu tēmu sarakstu augšgaliem."
+        unpin_globally_until: "Noņemt šo tēmu no visu tēmu sarakstu augšgaliem vai gaidīt līdz <strong>%{until}</strong>."
+        global_pin_note: "Lietotāji var atspraust tēmu, katrs sev personīgi."
+        not_pinned_globally: "Nav nevienas globāli piespraustas tēmas."
+        already_pinned_globally:
+          zero: "Šobrīd globāli piespraustas <strong class='badge badge-notification unread'>{{count}}</strong> tēmas"
+          one: "Šobrīd globāli piesprausta <strong class='badge badge-notification unread'>1</strong> tēma"
+          other: "Šobrīd globāli piespraustas <strong class='badge badge-notification unread'>{{count}}</strong> tēmas"
+        make_banner: "Pārveidot šo tēmu par baneri, kas parādīsies visu lapu augšpusē."
+        remove_banner: "Noņemt baneri, kas parādās visu lapu augšpusē."
+        banner_note: "Lietotāji var noņemt baneri, aizverot to. Jebkurā brīdī tikai viena tēma var būt par baneri."
+        no_banner_exists: "Nav tēmas, kas būtu baneris."
+        banner_exists: "Šobrīd <strong class='badge badge-notification unread'>ir</strong> tēma, ko izmanto banerī."
+      inviting: "Ielūdzam..."
+      automatically_add_to_groups: "Šis ielūgums ietver arī piekļuvi šīm grupām:"
+      invite_private:
+        title: 'Ielūgums rakstīt ziņas'
+        email_or_username: "Ielūdzamā e-pasts vai lietotājvārds"
+        email_or_username_placeholder: "e-pasta adrese vai lietotāja vārds"
+        action: "Ielūgt"
+        success: "Mēs esam ielūguši šo lietotāju piedalīties šai diskusijā."
+        success_group: "Mēs esam ielūguši šo grupu piedalīties šai diskusijā."
+        error: "Atvainojiet, ielūdzot šo lietotāju, notika kļūda."
+        group_name: "grupas nosaukums"
+      controls: "Tēmas pārvaldīšana"
+      invite_reply:
+        title: 'Ielūgt'
+        username_placeholder: "lietotājvārds"
+        action: 'Nosūtīt ielūgumu'
+        help: 'Ielūgt citus uz šo tēmu, izmantojot e-pastu vai paziņojumus'
+        to_forum: "Mēs nosūtīsim īsu e-pastu, kas ļaus jūsu draugam nekavējoties pievienoties, uzklikšķinot uz saites un bez ienākšanas forumā."
+        sso_enabled: "Ievadiet personas, ko vēlētos ielūgt šai tēmā, lietotājvārdu."
+        to_topic_blank: "Ievadiet personas, ko vēlētos ielūgt šai tēmā, lietotājvārdu vai e-pastu."
+        to_topic_email: "Jūs esat ievadījis e-pasta adresi. Mēs nosūtīsim e-pastā ielūgumu, kas ļaus jūsu draugam nekavējoties atbildēt šai tēmā."
+        to_topic_username: "Jūs esat ievadījis lietotājvārdu. Mēs nosūtīsim paziņojumu ar saiti, kas ļaus pievienoties šai tēmai."
+        to_username: "Ievadiet personas, ko vēlētos ielūgt, lietotājvārdu. Mēs nosūtīsim paziņojumu ar saiti, kas ļaus pievienoties šai tēmai."
+        email_placeholder: 'vards@piemers.com'
+        success_email: "Mēs nosūtījām ielūguma e-pastu uz <b>{{emailOrUsername}}</b>. Mēs paziņosim jums, kad ielūgums būs izmantots. Pārbaudiet ielūgumu cilni jūsu lietotāja lapā, lai sekotu līdzi savu ielūgumu statusiem."
+        success_username: "Mēs ielūdzām šo lietotāju piedalīties šai tēmā."
+        error: "Atvainojiet, mēs nevarējām ielūgt šo cilvēku. Varbūt jau ir nosūtīts ielūgums?"
+        success_existing_email: "Jau pastāv lietotājs ar e-pastu <b>{{emailOrUsername}}</b>. Mēs ielūdzām šo lietotāju piedalīties šai tēmā."
+      login_reply: 'Lai atbildētu, ienāc forumā'
+      filters:
+        n_posts:
+          zero: "{{count}} ieraksti"
+          one: "1 ieraksts"
+          other: "{{count}} ieraksti"
+        cancel: "Noņemt filtru"
+      split_topic:
+        title: "Pārvietot uz jaunu tēmu"
+        action: "pārvietot uz jaunu tēmu"
+        topic_name: "Jaunās tēmas nosaukums"
+        error: "Pārvietojot ierakstus uz jauno tēmu, notika kļūda."
+        instructions:
+          zero: "Jūs tūlīt izveidosiet jaunu tēmu bez ierakstiem."
+          one: "Jūs tūlīt izveidosiet jaunu tēmu ar izvēlēto ierakstu."
+          other: "Jūs tūlīt izveidosiet jaunu tēmu un aizpildīsiet to ar <b>{{count}}</b> izvēlētajiem ierakstiem."
+      merge_topic:
+        title: "Pārvietot uz esošu tēmu"
+        action: "pārvietot uz esošu tēmu"
+        error: "Pārvietojot ierakstus uz šo tēmu, notika kļūda."
+        instructions:
+          zero: "Lūdzu izvēlieties tēmu, uz kuru vēlaties pārvietot šos ierakstus."
+          one: "Lūdzu izvēlieties tēmu, uz kuru vēlaties pārvietot šo ierakstu."
+          other: "Lūdzu izvēlieties tēmu, uz kuru vēlaties pārvietot šos <b>{{count}}</b> ierakstus."
+      merge_posts:
+        title: "Apvienot izvēlētos ierakstus"
+        action: "apvienot izvēlētos ierakstus"
+        error: "Apvienojot izvēlētos ierakstus, notika kļūda."
+      change_owner:
+        title: "Nomainīt ierakstu īpašnieku"
+        action: "nomainīt īpašnieku"
+        error: "Mainot ierakstu īpašnieku, notika kļūda."
+        label: "Jaunais ierakstu īpašnieks"
+        placeholder: "jaunā īpašnieka lietotājvārds"
+        instructions:
+          zero: "Lūdzu, izvēlieties jauno īpašnieku <b>{{old_user}}</b> ierakstiem."
+          one: "Lūdzu, izvēlieties jauno īpašnieku <b>{{old_user}}</b> ierakstam."
+          other: "Lūdzu, izvēlieties jauno īpašnieku {{count}} <b>{{old_user}}</b> ierakstiem."
+        instructions_warn: "Ņemiet vērā, ka pagātnes paziņojumi par šo ieraksti netiks pārsūtīti jaunajam lietotājam. Uzmanību: šobrīd nekādi no ieraksta atkarīgi dati netiek pārsūtīti jaunajam lietotājam. Lietojiet uzmanīgi."
+      change_timestamp:
+        title: "Nomainīt laika zīmogu..."
+        action: "nomainīt laika zīmogu"
+        invalid_timestamp: "Laika zīmogs nevar būt nākotnē."
+        error: "Mainot ieraksta laika zīmogu, notika kļūda."
+        instructions: "Lūdzu izvēlieties tēmas jauno laika zīmogu. Tēmas ieraksti tiks atjaunināti, ņemot vērā attiecīgo laika starpību."
+      multi_select:
+        select: 'izvēlēties'
+        selected: 'izvēlēti ({{count}})'
+        delete: dzēst izvēlētos
+        cancel: atcelt izvēlēšanos
+        select_all: izvēlēties visu
+        deselect_all: visiem noņemt izvēli
+        description:
+          zero: Jūs esat izvēlējies <b>0</b> ierakstu.
+          one: Jūs esat izvēlējies <b>1</b> ierakstu.
+          other: Jūs esat izvēlējies <b>{{count}}</b> ierakstus.
+    post:
+      reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
+      reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
+      quote_reply: "Citāts"
+      edit_reason: "Iemesls:"
+      post_number: "ieraksts {{number}}"
+      wiki_last_edited_on: "wiki pēdējo reizi rediģēta"
+      last_edited_on: "ieraksts pēdējo reizi rediģēts"
+      reply_as_new_topic: "Atbildēt jaunā saistītā tēmā"
+      reply_as_new_private_message: "Atbildēt jaunā vēstulē tiem pašiem adresātiem"
+      continue_discussion: "Turpinot diskusiju no {{postLink}}:"
+      follow_quote: "doties uz citēto ierakstu"
+      show_full: "Parādīt visu ierakstu"
+      show_hidden: 'Skatīt slēpto saturu.'
+      deleted_by_author:
+        zero: "(autors atcēlis ierakstu, tas tiks automātiski dzēsts pēc %{count} stundām, ja neviens nav ziņojis par to)"
+        one: "(autors atcēlis ierakstu, tas tiks automātiski dzēsts pēc %{count} stundas, ja neviens nav ziņojis par to)"
+        other: "(autors atcēlis ierakstu, tas tiks automātiski dzēsts pēc %{count} stundām, ja neviens nav ziņojis par to)"
+      expand_collapse: "paplašināt/minimizēt"
+      gap:
+        zero: "apslēpt {{count}} slēptās atbildes"
+        one: "aplūjot 1 slēpto atbildi"
+        other: "aplūkot {{count}} slēptās atbildes"
+      unread: "Ieraksts nav lasīts"
+      has_replies:
+        zero: "{{count}} atbildes"
+        one: "{{count}} atbilde"
+        other: "{{count}} atbildes"
+      has_likes:
+        zero: "{{count}} atzinības"
+        one: "{{count}} atzinība"
+        other: "{{count}} atzinības"
+      has_likes_title:
+        zero: "{{count}} cilvēkiem patika šis ieraksts"
+        one: "1 cilvēkam patika šis ieraksts"
+        other: "{{count}} cilvēkiem patika šis ieraksts"
+      has_likes_title_only_you: "jums patika šis ieraksts"
+      has_likes_title_you:
+        zero: "jums patika šis ieraksts"
+        one: "jums un 1 citam cilvēkam patika šis ieraksts"
+        other: "jums un {{count}} citiem cilvēkiem patika šis ieraksts"
+      errors:
+        create: "Atvainojiet, izveidojot jūsu ierakstu, notika kļūda. Lūdzu, mēģiniet vēlreiz."
+        edit: "Atvainojiet, rediģējot jūsu ierakstu, notika kļūda. Lūdzu, mēģiniet vēlreiz."
+        upload: "Atvainojiet, augšuplādējot šo failu, notika kļūda. Lūdzu, mēģiniet vēlreiz."
+        file_too_large: "Atvainojiet, šis fails ir pārāk liels (maksimālais izmērs ir {{max_size_kb}} kb). Varbūt augšuplādējiet jūsu lielo failu uz kādu mākoņservisu, bet pēc tam padalieties ar saiti?"
+        too_many_uploads: "Atvainojiet, jūs varat augšuplādēt tikai vienu failu vienā reizē."
+        too_many_dragged_and_dropped_files: "Atvainojiet, jūs varat augšuplādēt tikai 10 failus vienā reizē."
+        upload_not_authorized: "Atvainojiet, fails, ko mēģināt augšuplādēt, nav atļauts (atļautie paplašinājumi: {{authorized_extensions}})."
+        image_upload_not_allowed_for_new_user: "Atvainojiet, jaunie lietotāji nevar augšuplādēt attēlus."
+        attachment_upload_not_allowed_for_new_user: "Atvainojiet, jaunie lietotāji nevar augšuplādēt pielikumus."
+        attachment_download_requires_login: "Atvainojiet, jums jābūt ienākušam forumā, lai varētu lejuplādēt pielikumus."
+      abandon:
+        confirm: "Vai esat drošs, ka vēlaties atteikties no sava ieraksta?"
+        no_value: "Nē, paturēt"
+        yes_value: "Jā, pamest"
+      via_email: "šis ieraksts atnāca e-pastā"
+      via_auto_generated_email: "šis ieraksts atnāca automātiski ģenerētā e-pastā"
+      whisper: "šis ieraksts ir privāts čuksts moderatoriem"
+      wiki:
+        about: "šis ieraksts ir wiki"
+      archetypes:
+        save: 'Saglabāšanas iespējas'
+      few_likes_left: "Paldies par dalīšanos ar atzinību! Jums šodien ir palikušas tikai dažas iespējas izteikt atzinību."
+      controls:
+        reply: "sākt rakstīt atbildi šim ierakstam"
+        like: "patīk šis ieraksts"
+        has_liked: "jums patika šis ieraksts"
+        undo_like: "atcelt atzinību"
+        edit: "rediģēt šo ierakstu"
+        edit_action: "Rediģēt"
+        edit_anonymous: "Atvainojiet, bet jums jāienāk forumā, lai rediģētu šo ierakstu."
+        flag: "privāti ziņot par šo ierakstu vai nosūtīt privātu paziņojumu par to"
+        delete: "dzēst šo ierakstu"
+        undelete: "atcelt šī ieraksta dzēšanu"
+        share: "dalīties ar saiti uz šo ierakstu"
+        more: "Vairāk"
+        admin: "ieraksta administratora darbības"
+        wiki: "Pārveidot par wiki ierakstu"
+        unwiki: "Noņemt wiki statusu"
+        convert_to_moderator: "Pievienot darbinieka krāsu"
+        revert_to_regular: "Noņemt darbinieka krāsu"
+        rebake: "Pārbūvēt HTML"
+        unhide: "Noņemt slēpšanu"
+        change_owner: "Mainīt īpašnieku"
+      actions:
+        flag: 'Ziņot'
+        undo:
+          off_topic: "Atcelt ziņošanu"
+          spam: "Atcelt ziņošanu"
+          inappropriate: "Atcelt ziņošanu"
+          bookmark: "Atcelt grāmatzīmi"
+          like: "Atcelt atzinību"
+          vote: "Atcelt nobalsošanu"
+        people:
+          off_topic: "ziņot par šo kā novirzīšanos no tēmas"
+          spam: "ziņot par šo kā spamu"
+          inappropriate: "ziņot par šo kā nepiedienīgu"
+          notify_moderators: "paziņoja moderatoriem"
+          notify_user: "nosūtīja ziņu"
+          bookmark: "pievienoja grāmatzīmēm"
+          like: "izteica atzinību par šo"
+          vote: "nobalsoja par šo"
+        by_you:
+          off_topic: "Jūs ziņojāt par šo kā novirzīšanos no tēmas"
+          spam: "Jūs ziņojāt par šo kā spamu"
+          inappropriate: "Jūs ziņojāt par šo kā nepiedienīgu"
+          notify_moderators: "Jūs ziņojāt par šo moderācijai"
+          notify_user: "Jūs nosūtījāt ziņu šim lietotājam"
+          bookmark: "Jūs pievienojāt šo ierakstu grāmatzīmēm"
+          like: "Jūs izteicāt atzinību šim"
+          vote: "Jūs nobalsojāt par šo ierakstu"
+        by_you_and_others:
+          off_topic:
+            zero: "Jūs un {{count}} citi cilvēki ziņoja par šo kā novirzīšanos no tēmas"
+            one: "Jūs un 1 cits cilvēks ziņoja par šo kā novirzīšanos no tēmas"
+            other: "Jūs un {{count}} citi cilvēki ziņoja par šo kā novirzīšanos no tēmas"
+          spam:
+            zero: "Jūs un {{count}} citi cilvēki ziņoja par šo kā spamu"
+            one: "Jūs un 1 cits cilvēks ziņoja par šo kā spamu"
+            other: "Jūs un {{count}} citi cilvēki ziņoja par šo kā spamu"
+          inappropriate:
+            zero: "Jūs un {{count}} citi cilvēki ziņoja par šo kā nepiedienīgu"
+            one: "Jūs un 1 cits cilvēks ziņoja par šo kā nepiedienīgu"
+            other: "Jūs un {{count}} citi cilvēki ziņoja par šo kā nepiedienīgu"
+          notify_moderators:
+            zero: "Jūs un {{count}} citi cilvēki ziņoja par šo moderācijai"
+            one: "Jūs un 1 cits cilvēks ziņoja par šo moderācijai"
+            other: "Jūs un {{count}} citi cilvēki ziņoja par šo moderācijai"
+          notify_user:
+            zero: "Jūs un {{count}} citi cilvēki nosūtīja ziņu šim lietotājam"
+            one: "Jūs un 1 cits cilvēks nosūtīja ziņu šim lietotājam"
+            other: "Jūs un {{count}} citi cilvēki nosūtīja ziņu šim lietotājam"
+          bookmark:
+            zero: "Jūs un {{count}} citi cilvēki pievienoja šo ierakstu grāmatzīmēm"
+            one: "Jūs un 1 cits cilvēks pievienoja šo ierakstu grāmatzīmēm"
+            other: "Jūs un {{count}} citi cilvēki pievienoja šo ierakstu grāmatzīmēm"
+          like:
+            zero: "Jūs un {{count}} citiem cilvēkiem patika šis"
+            one: "Jūs un 1 citam cilvēkam patika šis"
+            other: "Jūs un {{count}} citiem cilvēkiem patika šis"
+          vote:
+            zero: "Jūs un {{count}} citi cilvēki nobalsoja par šo ierakstu"
+            one: "Jūs un 1 cits cilvēks nobalsoja par šo ierakstu"
+            other: "Jūs un {{count}} citi cilvēki nobalsoja par šo ierakstu"
+        by_others:
+          off_topic:
+            zero: "{{count}} cilvēki ziņoja par šo kā novirzīšanos no tēmas"
+            one: "1 cilvēks ziņoja par šo kā novirzīšanos no tēmas"
+            other: "{{count}} cilvēki ziņoja par šo kā novirzīšanos no tēmas"
+          spam:
+            zero: "{{count}} cilvēki ziņoja par šo kā spamu"
+            one: "1 cilvēks ziņoja par šo kā spamu"
+            other: "{{count}} cilvēki ziņoja par šo kā spamu"
+          inappropriate:
+            zero: "{{count}} cilvēki ziņoja par šo kā nepiedienīgu"
+            one: "1 cilvēks ziņoja par šo kā nepiedienīgu"
+            other: "{{count}} cilvēki ziņoja par šo kā nepiedienīgu"
+          notify_moderators:
+            zero: "{{count}} cilvēki ziņoja par šo moderācijai"
+            one: "1 cilvēks ziņoja par šo moderācijai"
+            other: "{{count}} cilvēki ziņoja par šo moderācijai"
+          notify_user:
+            zero: "{{count}} cilvēki nosūtīja ziņu šim lietotājam"
+            one: "1 cilvēks nosūtīja ziņu šim lietotājam"
+            other: "{{count}} cilvēki nosūtīja ziņu šim lietotājam"
+          bookmark:
+            zero: "{{count}} cilvēki pievienoja šo ierakstu grāmatzīmēm"
+            one: "1 cilvēks pievienoja šo ierakstu grāmatzīmēm"
+            other: "{{count}} cilvēki pievienoja šo ierakstu grāmatzīmēm"
+          like:
+            zero: "{{count}} cilvēkiem patika šis"
+            one: "1 cilvēkam patika šis"
+            other: "{{count}} cilvēkiem patika šis"
+          vote:
+            zero: "{{count}} cilvēki balsoja par šo ierakstu"
+            one: "1 cilvēks balsoja par šo ierakstu"
+            other: "{{count}} cilvēki balsoja par šo ierakstu"
+      merge:
+        confirm:
+          zero: "Vai jūs esat drošs, ka vēlaties apvienot šos {{count}} ierakstus?"
+          one: "Vai jūs esat drošs, ka vēlaties apvienot šos ierakstus?"
+          other: "Vai jūs esat drošs, ka vēlaties apvienot šos {{count}} ierakstus?"
+      revisions:
+        controls:
+          first: "Pirmā versija"
+          previous: "Iepriekšējā versija"
+          next: "Nākamā versija"
+          last: "Pēdējā versija"
+          hide: "Paslēpt versiju"
+          show: "Parādīt versiju"
+          revert: "Atgriezties pie šīs versijas"
+          edit_wiki: "Rediģēt wiki"
+          edit_post: "Rediģēt ierakstu"
+          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> <i class='fa fa-arrows-h'></i> <strong>{{current}}</strong> / {{total}}"
+        displays:
+          inline:
+            button: 'HTML'
+          side_by_side:
+            button: 'HTML'
+          side_by_side_markdown:
+            title: "Parādīt izejas koda atšķirības"
+      raw_email:
+        displays:
+          text_part:
+            title: "Parādīt e-pasta teksta daļu"
+            button: 'Teksts'
+          html_part:
+            title: "Parādīt e-pasta html daļu"
+            button: 'HTML'
+    category:
+      can: 'var&hellip;'
+      none: '(nav sadaļas)'
+      all: 'Visas sadaļas'
+      choose: 'Izvēlēties sadaļu&hellip;'
+      edit: 'rediģēt'
+      edit_long: "Rediģēt"
+      view: 'Aplūkot sadaļas ierakstus'
+      general: 'Vispārīgi'
+      settings: 'Iestatījumi'
+      topic_template: "Tēmas šablons"
+      tags: "Tagi"
+      tags_allowed_tags: "Šai sadaļā atļaut izmantot tikai šos tagus:"
+      tags_allowed_tag_groups: "Šai sadaļā atļaut izmantot tikai tagus no šīm grupām:"
+      tags_placeholder: "(Pēc izvēles) atļauto tagu saraksts"
+      tag_groups_placeholder: "(Pēc izvēles) atļauto tagu grupu saraksts"
+      delete: 'Dzēst sadaļu'
+      create: 'Jauna sadaļa'
+      create_long: 'Izveidot jaunu sadaļu'
+      save: 'Saglabāt sadaļu'
+      creation_error: Izveidojot šo sadaļu, notika kļūda.
+      save_error: Saglabājot šo sadaļu, notika kļūda.
+      name: "Sadaļas nosaukums"
+      description: "Apraksts"
+      topic: "sadaļas tema"
+      logo: "Sadaļas logo attēls"
+      background_image: "Sadaļas fona attēls"
+      badge_colors: "Žetona krāsas"
+      background_color: "Fona krāsa"
+      foreground_color: "Priekšplāna krāsa"
+      name_placeholder: "Ne vairāk par vienu vai diviem vārdiem"
+      color_placeholder: "Jebkura interneta krāsa"
+      delete_confirm: "Vai tiešām vēlies dzēst šo kategoriju?"
+      delete_error: "Dzēšot šo sadaļu, notika kļūda."
+      list: "Uzskaitīt sadaļas"
+      no_description: "Lūdzu, pievieno aprakstu šai sadaļai."
+      change_in_category_topic: "Rediģēt aprakstu"
+      already_used: 'Šī krāsa ir izmantota citai sadaļai'
+      security: "Drošība"
+      special_warning: "Brīdinājums: šī sadaļa ir automātiski izveidota un tās drošības uzstādījumi nav maināmi. Ja jūs nevēlaties šo sadaļu izmantot, izdzēsiet to, nevis pielietojiet citiem mērķiem."
+      images: "Attēli"
+      email_in_allow_strangers: "Pieņemt e-pastus no anonīmiem lietotājiem bez profiliem"
+      email_in_disabled: "Jaunu tēmu ievietošana, izmantojot e-pastu, ir atcelta foruma iestatījumos. Lai atļautu ievietot jaunas tēmas, izmantojot e-pastu,"
+      suppress_from_homepage: "Nerādīt šo sadaļu mājas lapā."
+      show_subcategory_list: "Rādīt apakšsadaļu sarakstu virs tēmām šai sadaļā."
+      num_featured_topics: "Sadaļu lapā parādīto tēmu skaits:"
+      all_topics_wiki: "Pārveidot jaunās tēmas par wiki pēc noklusējuma."
+      subcategory_list_style: "Apakšsadaļu saraksta stils:"
+      sort_order: "Kārtot tēmu sarakstu pēc:"
+      default_view: "Noklusējuma tēmu saraksts:"
+      default_top_period: "Noklusējuma topa periods:"
+      allow_badges_label: "Atļaut apbalvot ar žetoniem šai sadaļā"
+      edit_permissions: "Mainīt atļaujas"
+      add_permission: "Pievienot atļauju"
+      this_year: "šogad"
+      position: "pozīcija"
+      default_position: "Noklusētā pozīcija"
+      position_disabled: "Sadaļas tiks sakārtotas pēc aktivitātes. Lai kontrolētu sadaļu secību sarakstos,"
+      position_disabled_click: 'ieslēgt iestatījumu "fiksētas sadaļu pozīcijas".'
+      parent: "Vecāksadaļa"
+      notifications:
+        watching:
+          title: "Novērošana"
+          description: "Jūs automātiski novērosiet visas tēmas šajās sadaļās. Jums paziņos par katru jaunu ierakstu katrā tēmā, kā arī parādīs jauno atbilžu skaitu."
+        watching_first_post:
+          title: "Novērot pirmo ierakstu"
+          description: "Jums paziņos tikai par pirmo ierakstu katrā šo sadaļu jaunajā tēmā."
+        tracking:
+          title: "Sekošana"
+          description: "Jūs automātiski sekosiet visām tēmām šajās sadaļās. Jums paziņos, ja kāds pieminēs jūsu @lietotājvārdu vai atbildēs jums, kā arī parādīs jauno atbilžu skaitu."
+        regular:
+          title: "Normāls"
+          description: "Jums paziņos, ja kāds pieminēs jūsu @lietotājvārdu vai atbildēs jums."
+        muted:
+          title: "Noklusināts"
+          description: "Jums neko neziņos par jaunajām tēmām šajās sadaļās, kā arī tās neparādīsies starp pēdējām izmaiņām."
+      sort_options:
+        default: "noklusējuma"
+        likes: "Atzinības"
+        op_likes: "Oriģinālā ieraksta atzinības"
+        views: "Skatījumi"
+        posts: "Ieraksti"
+        activity: "Aktivitāte"
+        posters: "Plakāti"
+        category: "Sadaļas"
+        created: "Izveidots"
+      sort_ascending: 'Augoši'
+      sort_descending: 'Dilstoši'
+      subcategory_list_styles:
+        rows: "Rindas"
+        rows_with_featured_topics: "Rindas ar labākajām tēmām"
+        boxes: "Kastes"
+        boxes_with_featured_topics: "Kastes ar labākajām tēmām"
+    flagging:
+      title: 'Paldies, ka palīdzat uzturēt mūsu forumu civilizētu!'
+      action: 'Ziņot par ierakstu'
+      notify_action: 'Ziņa'
+      official_warning: 'Oficiāls brīdinājums'
+      delete_spammer: "Dzēst spamotāju"
+      delete_confirm_MF: "Jūs grasāties izdzēst šī lietotāja {IERAKSTUS, plural, one {<b>1</b> ierakstu} other {<b>#</b> ierakstus}} un {TĒMAS, plural, one {<b>1</b> tēmu} other {<b>#</b> tēmas}}, izdzēst viņa profilu, bloķēt reģistrēšanos no viņa IP adreses <b>{ip_address}</b> un pievienot viņa e-pasta adresi <b>{email}</b> pastāvīgajam bloķēto sarakstam. Vai jūs esat pārliecināts, ka šis lietotājs patiešām ir spameris?"
+      yes_delete_spammer: "Jā, izdzēst spameri"
+      ip_address_missing: "(N/A)"
+      hidden_email_address: "(paslēpts)"
+      submit_tooltip: "Paziņot privāti"
+      take_action_tooltip: "Sasniegt ziņojumu robežu uzreiz, nevis gaidīt vēl ziņojumus no lietotājiem"
+      cant: "Atvainojiet, šobrīd jūs nevarat ziņot par šo ierakstu."
+      notify_staff: 'Ziņot darbiniekiem privāti'
+      formatted_name:
+        off_topic: "Nav saistīts ar tēmu"
+        inappropriate: "Tas ir nepiedienīgs"
+        spam: "Spams"
+      custom_placeholder_notify_user: "Esi specifisks, konstruktīvs un vienmēr esi laipns."
+      custom_placeholder_notify_moderators: "Ļaujiet mums uzzināt, kādu problēmu saredzat, un sniedziet būtiskās saites un piemērus, ja iespējams."
+      custom_message:
+        at_least:
+          zero: "ievadiet vismaz {{count}} simbolus"
+          one: "ievadiet vismaz 1 simbolu"
+          other: "ievadiet vismaz {{count}} simbolus"
+        more:
+          zero: "vēl {{count}}..."
+          one: "vēl 1"
+          other: "vēl {{count}}..."
+        left:
+          zero: "palikuši {{count}}"
+          one: "palicis 1"
+          other: "palikuši {{count}}"
+    flagging_topic:
+      title: "Paldies, ka palīdzat uzturēt mūsu forumu civilizētu!"
+      action: "Ziņot par tēmu"
+      notify_action: "Ziņa"
+    topic_map:
+      title: "Tēmas kopsavilkums"
+      participants_title: "Bieži rakstītāji"
+      links_title: "Populāras saites"
+      links_shown: "parādīt papildus saites..."
+      clicks:
+        zero: "%{count} klikšķi"
+        one: "1 klikšķis"
+        other: "%{count} klikšķi"
+    post_links:
+      title:
+        zero: "vēl %{count}"
+        one: "vēl 1"
+        other: "vēl %{count}"
+    topic_statuses:
+      warning:
+        help: "Šis ir oficiāls brīdinājums."
+      bookmarked:
+        help: "Jūs pievienojāt šo ierakstu grāmatzīmēm"
+      locked:
+        help: "Šī tēma ir slēgta; tā vairs nepieņem jaunas atbildes"
+      archived:
+        help: "Šī tēma ir arhivēta; tā ir iesaldēta un nevar tikt mainīta"
+      locked_and_archived:
+        help: "Šī tēma ir slēgta un arhivēta; tā vairs nepieņem jaunas atbildes un nevar tikt mainīta"
+      unpinned:
+        title: "Atsprausts"
+        help: "Jums šī tēma ir atsprausta; tā parādīsies parastajā secībā"
+      pinned_globally:
+        title: "Piesprausts globāli"
+        help: "Šī tēma ir piesprausta globāli; tā parādīsies pēdējo tēmu saraksta un savas sadaļas augšgalā"
+      pinned:
+        title: "Piesprausts"
+        help: "Jums šī tēma ir piesprausta; tā parādīsies savas sadaļas augšgalā"
+      invisible:
+        help: "Šī tēma nav iekļauta sarakstos; tā netiks attēlota tēmu sarakstos, un piekļūt tai varēs, tikai izmantojot tiešu saiti"
+    posts: "Ieraksti"
+    posts_long: "šai tēmā ir {{number}} ieraksts"
+    posts_likes_MF: |
+      Šai tēmā ir {count, plural, one {1 atbilde} other {# atbildes}} {ratio, select,
+      low {ar nedaudzām atzinībām}
+      med {ar vidēji daudzām atzinībām}
+      high {ar ļoti daudzām atzinībām}
+      other {}}
+    original_post: "Oriģinālais ieraksts"
+    views: "Skatījumi"
+    views_lowercase:
+      zero: "skatījumi"
+      one: "skatījums"
+      other: "skatījumi"
+    replies: "Atbildes"
+    views_long:
+      zero: "šo tēmu ir apskatījuši {{number}} reizes"
+      one: "šo tēmu ir apskatījuši 1 reizi"
+      other: "šo tēmu ir apskatījuši {{number}} reizes"
+    activity: "Aktivitāte"
+    likes: "Patīk"
+    likes_lowercase:
+      zero: "atzinības"
+      one: "atzinība"
+      other: "atzinības"
+    likes_long: "šajā tēmā ir {{number}} atzinības"
+    users: "Lietotāji"
+    users_lowercase:
+      zero: "lietotāji"
+      one: "lietotājs"
+      other: "lietotāji"
+    category_title: "Sadaļa"
+    history: "Vēsture"
+    changed_by: "{{author}}"
+    raw_email:
+      title: "Ienākošie e-pasti"
+      not_available: "Nav pieejams!"
+    categories_list: "Sadaļu saraksts"
+    filters:
+      with_topics: "%{filter} tēmas"
+      with_category: "%{filter} Sadaļas %{category} tēmas"
+      latest:
+        title: "Pēdējie"
+        title_with_count:
+          zero: "Pēdējie ({{count}})"
+          one: "Pēdējais (1)"
+          other: "Pēdējie ({{count}})"
+        help: "tēmas ar neseniem ierakstiem"
+      hot:
+        title: "Populārs"
+        help: "populārāko tēmu apkopojums"
+      read:
+        title: "Lasīts"
+        help: "Jūsu lasītās tēmas tajā secībā, kādā lasījāt"
+      search:
+        title: "Meklēt"
+        help: "meklēt visās tēmās"
+      categories:
+        title: "Sadaļas"
+        title_in: "Kategorija - {{categoryName}}"
+        help: "visas tēmas, sagrupētas pēc sadaļām"
+      unread:
+        title: "Nelasīts"
+        title_with_count:
+          zero: "Nelasīti ({{count}})"
+          one: "Nelasīts (1)"
+          other: "Nelasīti ({{count}})"
+        help: "tēmas, kuras novērojat vai kurām sekojat, ar nelasītiem ierakstiem"
+        lower_title_with_count:
+          zero: "{{count}} nelasītas"
+          one: "1 nelasīta"
+          other: "{{count}} nelasītas"
+      new:
+        lower_title_with_count:
+          zero: "{{count}} jaunas"
+          one: "1 jauna"
+          other: "{{count}} jaunas"
+        lower_title: "jaunie"
+        title: "Jaunie"
+        title_with_count:
+          zero: "Jaunie ({{count}})"
+          one: "Jauns (1)"
+          other: "Jaunie ({{count}})"
+        help: "pēdējās dažās dienās izveidotās tēmas"
+      posted:
+        title: "Mani ieraksti"
+        help: "tēmas, kurās esat rakstījis"
+      bookmarks:
+        title: "Grāmatzīmes"
+        help: "tēmas, kurās esat veicis grāmatzīmes"
+      category:
+        title: "{{categoryName}}"
+        title_with_count:
+          zero: "{{categoryName}} ({{count}})"
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
+        help: "pēdējās tēmas sadaļā {{categoryName}}"
+      top:
+        title: "Populārākās"
+        help: "visaktīvākās tēmas pēdējā gada, mēneša, nedēļas vai dienas laikā"
+        all:
+          title: "Visa laika"
+        yearly:
+          title: "Gada"
+        quarterly:
+          title: "Ceturkšņa"
+        monthly:
+          title: "Mēneša"
+        weekly:
+          title: "Nedēļas"
+        daily:
+          title: "Dienas"
+        all_time: "Visa laika"
+        this_year: "Gada"
+        this_quarter: "Ceturkšņa"
+        this_month: "Mēneša"
+        this_week: "Nedēļas"
+        today: "Šodienas"
+        other_periods: "skatīt topu"
+    browser_update: 'Par nelaimi, <a href="http://www.discourse.org/faq/#browser">jūsu pārlūkprogramma ir pārāk veca šai vietnei</a>. Lūdzu, <a href="http://browsehappy.com">atjauniniet jūsu pārlūkprogrammu</a>.'
+    permission_types:
+      full: "Izveidot / Atbildēt / Skatīt"
+      create_post: "Atbildēt / Skatīt"
+      readonly: "Skatīt"
+    lightbox:
+      download: "lejuplādēt"
+    keyboard_shortcuts_help:
+      title: 'Klaviatūras saīsnes'
+      jump_to:
+        title: 'Pāriet uz'
+        home: '<b>g</b>, <b>h</b> Sākums'
+        latest: '<b>g</b>, <b>l</b> Pēdējais'
+        new: '<b>g</b>, <b>n</b> Jaunākais'
+        unread: '<b>g</b>, <b>u</b> Nelasītais'
+        categories: '<b>g</b>, <b>c</b> Sadaļas'
+        top: '<b>g</b>, <b>t</b> Populārākais'
+        bookmarks: '<b>g</b>, <b>b</b> Grāmatzīmes'
+        profile: '<b>g</b>, <b>p</b> Profils'
+        messages: '<b>g</b>, <b>m</b> Ziņas'
+      navigation:
+        title: 'Pārvietošanās'
+        jump: '<b>#</b> Doties uz ierakstu #'
+        back: '<b>u</b> Atgriezties'
+        up_down: '<b>k</b>/<b>j</b> Pārvietot atlasīto &uarr; &darr;'
+        open: '<b>o</b> vai <b>Enter</b> Atvērt izvēlēto tēmu'
+        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Nākamā/iepriekšējā sadaļa'
+      application:
+        title: 'Lietotne'
+        create: '<b>c</b> Izveidot jaunu tēmu'
+        notifications: '<b>n</b> Atvērt paziņojumus'
+        user_profile_menu: '<b>p</b> Atvērt lietotaja menu'
+        show_incoming_updated_topics: '<b>.</b> Parādīt tēmas ar izmaiņām'
+        help: '<b>?</b> Atvērt klaviatūras palīdzību'
+        dismiss_new_posts: '<b>x</b>, <b>r</b> Ignorēt jauno/ierakstus'
+        dismiss_topics: '<b>x</b>, <b>t</b> Ignorēt tēmas'
+        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Iziet no foruma'
+      actions:
+        title: 'Darbības'
+        bookmark_topic: '<b>f</b> Mainīt tēmas grāmatzīmes statusu'
+        pin_unpin_topic: '<b>shift</b>+<b>p</b> Piespraust/atspraust tēmu'
+        share_topic: '<b>shift</b>+<b>s</b> Dalīties ar tēmu'
+        share_post: '<b>s</b> Dalīties ar ierakstu'
+        reply_as_new_topic: '<b>t</b> Atbildēt ar saistītu tēmu'
+        reply_topic: '<b>shift</b>+<b>r</b> Atbildēt tēmai'
+        reply_post: '<b>r</b> Atbildēt ierakstam'
+        quote_post: '<b>q</b> Citēt ierakstu'
+        like: '<b>l</b> Izteikt atzinību ierakstam'
+        flag: '<b>!</b> Ziņot par ierakstu'
+        bookmark: '<b>b</b> Pievienot ierakstu grāmatzīmēm'
+        edit: '<b>e</b> Rediģēt ierakstu'
+        delete: '<b>d</b> Dzēst ierakstu'
+        mark_muted: '<b>m</b>, <b>m</b> Klusināt ierakstu'
+        mark_regular: '<b>m</b>, <b>r</b> Parasta tēma'
+        mark_tracking: '<b>m</b>, <b>t</b> Sekot tēmai'
+        mark_watching: '<b>m</b>, <b>w</b> Novērot tēmu'
+        print: '<b>ctrl</b>+<b>p</b> Drukāt tēmu'
+    badges:
+      earned_n_times:
+        zero: "Nopelnīja šo žetonu %{count} reizes"
+        one: "Nopelnīja šo žetonu 1 reizi"
+        other: "Nopelnīja šo žetonu %{count} reizes"
+      granted_on: "Piešķirts %{date}"
+      others_count: "Citi ar šo žetonu (%{count})"
+      title: Žetoni
+      allow_title: "Jūs varat izmantot šo žetonu kā titulu"
+      multiple_grant: "Jūs esat nopelnījis šo vairākkārt"
+      badge_count:
+        zero: "%{count} žetoni"
+        one: "1 žetons"
+        other: "%{count} žetoni"
+      granted:
+        zero: "%{count} piešķirti"
+        one: "1 piešķirts"
+        other: "%{count} piešķirti"
+      select_badge_for_title: Izvēlieties žetonu, ko lietot kā jūsu titulu
+      none: "<none>"
+      badge_grouping:
+        getting_started:
+          name: Uzsākt darbu
+        community:
+          name: Kopiena
+        trust_level:
+          name: Uzticības līmenis
+        other:
+          name: Citi
+        posting:
+          name: Ieraksti
+    google_search: |
+      <h3>Meklēt ar 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: "Visi tagi"
+      selector_all_tags: "visi tagi"
+      selector_no_tags: "bez tagiem"
+      changed: "mainītie tagi:"
+      tags: "Tagi"
+      delete_tag: "Dzēst tagu"
+      rename_tag: "Pārsaukt tagu"
+      rename_instructions: "Izvēlēties jaunu nosaukumu tagam:"
+      sort_by: "Kārtot pēc:"
+      sort_by_count: "skaita"
+      sort_by_name: "vārda"
+      manage_groups: "Pārvaldīt tagu grupas"
+      manage_groups_description: "Izveidot grupas, lai organizētu tagus"
+      filters:
+        without_category: "%{filter} %{tag} tēmas"
+        with_category: "%{filter} %{tag} tēmas sadaļā %{category}"
+        untagged_without_category: "%{filter} tēmas bez tagiem"
+        untagged_with_category: "%{filter} tēmas bez tagiem sadaļā %{category}"
+      notifications:
+        watching:
+          title: "Novērošana"
+          description: "Jūs automātiski sekosiet visām tēmām ar šiem tagiem. Jums paziņos par visiem jauniem ierakstiem un tēmām, kā arī blakus tēmai parādīsies nelasīto un jauno ierakstu skaits."
+        watching_first_post:
+          title: "Pirmā ieraksta novērošana"
+          description: "Jums paziņos tikai par pirmo ierakstu katrā jaunā tēmā ar šo tagu."
+        tracking:
+          title: "Sekošana"
+          description: "Jūs automātiski sekosiet visām tēmām ar šiem tagiem. Blakus tēmai parādīsies nelasīto un jauno ierakstu skaits."
+        regular:
+          title: "Regulārs"
+          description: "Jums paziņos, ja kāds pieminēs jūsu @lietotājvārdu vai atbildēs uz jūsu ierakstu."
+        muted:
+          title: "Klusināts"
+          description: "Jums neko neziņos par jaunām tēmā ar šo tagu, un tās neparādīsies jūsu cilnē ar neizlasīto."
+      groups:
+        title: "Tagu grupas"
+        about: "Pievieno tagus grupām, lai vieglāk tos pārvaldītu."
+        new: "Jauna grupa"
+        tags_label: "Tagi šai grupā:"
+        parent_tag_label: "Vecāktags:"
+        parent_tag_placeholder: "Pēc izvēles"
+        parent_tag_description: "Tagus no šīs grupas nevar izmantot, ja vien neizmanto arī vecāktagu"
+        one_per_topic_label: "No šīs grupas atļaut tikai vienu tagu vienā tēmā"
+        new_name: "Jauna tagu grupa"
+        save: "Saglabāt"
+        delete: "Dzēst"
+        confirm_delete: "Vai jūs esat drošs, ka vēlaties dzēst šo tagu grupu?"
+      topics:
+        none:
+          unread: "Jums nav nelasītu tēmu."
+          new: "Jums nav jaunu tēmu."
+          read: "Jūs vēl neesat lasījis nevienu tēmu."
+          posted: "Jūs vēl neesat rakstījis nevienā tēmā."
+          latest: "Nav pēdējo tēmu."
+          hot: "Nav populāru tēmu."
+          bookmarks: "Jūs vēl neesat pievienojis nevienu tēmu grāmatzīmēm."
+          top: "Nav populāru tēmu."
+          search: "Nekas netika atrasts."
+        bottom:
+          latest: "Vairāk pēdējo tēmu nav."
+          hot: "Vairāk populāru tēmu nav."
+          posted: "Vairāk publicētu tēmu nav."
+          read: "Vairāk lasītu tēmu nav."
+          new: "Vairāk jaunu tēmu nav."
+          unread: "Vairāk nelasītu tēmu nav."
+          top: "Vairāk populāru tēmu nav."
+          bookmarks: "Vairāk tēmu grāmatzīmēs nav."
+          search: "Vairāk nekas netika atrasts."
+    invite:
+      custom_message: "Padari savu ielūgumu nedaudz personiskāku, rakstot"
+      custom_message_link: "individuālu ziņu"
+      custom_message_placeholder: "Ievadi savu ziņas tekstu"
+      custom_message_template_forum: "Sveiks, Tev ir jāpievienojas šim forumam!"
+      custom_message_template_topic: "Sveiks, man šķiet, ka Tu varētu izbaudīt šo tēmu!"
+    safe_mode:
+      enabled: "Ir ieslēgts drošais režīms; lai pamestu drošo režīmu, aizveriet šo pārlūkprogrammas logu"
+  admin_js:
+    type_to_filter: "ievadiet, lai atlasītu..."
+    admin:
+      title: 'Discourse administrators'
+      moderator: 'Moderators'
+      dashboard:
+        title: "Administrācijas panelis"
+        last_updated: "Pēdējais administrācijas paneļa atjauninājums:"
+        version: "Versija"
+        up_to_date: "Tu seko līdzi laikam!"
+        critical_available: "Ir pieejams kritisks atjauninājums."
+        updates_available: "Ir pieejami atjauninājumi."
+        please_upgrade: "Lūdzu atjauniniet!"
+        no_check_performed: "Nav veikta atjauninājumu pārbaude. Pārliecinieties, ka sidekiq darbojas."
+        stale_data: "Pēdējā laikā nav veikta atjauninājumu pārbaude. Pārliecinieties, ka sidekiq darbojas."
+        version_check_pending: "Izskatās, ka nesen esat veicies atjauninājumus. Lieliski!"
+        installed_version: "Uzinstalēts"
+        latest_version: "Pēdējais"
+        problems_found: "Jūsu Discourse instalācijā ir atrastas dažas problēmas:"
+        last_checked: "Pēdējā pārbaude"
+        refresh_problems: "Pārlādēt"
+        no_problems: "Problēmas nav atrastas."
+        moderators: 'Moderatori:'
+        admins: 'Administratori:'
+        suspended: 'Īslaicīgi bloķētie:'
+        private_messages_short: "Ziņas"
+        private_messages_title: "Ziņās"
+        mobile_title: "Mobilais"
+        space_free: "{{size}} par brīvu"
+        uploads: "augšuplādes"
+        backups: "rezerves kopijas"
+        traffic_short: "Datu plūsma"
+        page_views: "Lapu skatījumi"
+        page_views_short: "Lapu skatījumi"
+        show_traffic_report: "Parādīt detalizētu ziņojumu par datu plūsmu"
+        reports:
+          today: "Šodien"
+          yesterday: "Vakar"
+          last_7_days: "Pēdējās 7 dienās"
+          last_30_days: "Pēdējās 30 dienās"
+          all_time: "Vienmēr"
+          7_days_ago: "Pirms 7 dienām"
+          30_days_ago: "Pirms 30 dienām"
+          all: "Visi"
+          view_table: "tabula"
+          view_graph: "grafiks"
+          refresh_report: "Pārlādēt ziņojumu"
+          start_date: "Sākuma datums"
+          end_date: "Beigu datums"
+          groups: "Visas grupas"
+      commits:
+        latest_changes: "Pēdējās izmaiņas: lūdzu atjauniniet bieži!"
+        by: " "
+      flags:
+        title: "Sūdzības"
+        agree: "Piekrist"
+        agree_title: "Apstiprināt šo ziņojumu kā pamatotu un korektu"
+        defer_flag_title: "Dzēst šo sūdzību; šoreiz nav jāveic nekādas darbības."
+        delete: "Dzēst"
+        delete_title: "Dzēst ierakstu, par ko ir šī sūdzība."
+        delete_post_defer_flag_title: "Dzēst ierakstu; ja tas ir tēmas pirmais ieraksts, dzēst arī tēmu"
+        delete_post_agree_flag_title: "Dzēst ierakstu; ja tas ir tēmas pirmais ieraksts, dzēst arī tēmu"
+        delete_flag_modal_title: "Dzēst un..."
+        delete_spammer: "Izdzēst spamotāju"
+        delete_spammer_title: "Dzēst lietotāju un visus šī lietotāja ierakstus un tēmas."
+        disagree_flag_unhide_post: "Nepiekrist (padarīt ierakstu atkal redzamu)"
+        disagree_flag_unhide_post_title: "Noņemt visas sūdzības par šo ierakstu un padarīt to atkal redzamu"
+        disagree_flag: "Nepiekrist"
+        disagree_flag_title: "Atteikt šo sūdzību kā nederīgu vai aplamu"
+        clear_topic_flags: "Darīts"
+        clear_topic_flags_title: "Šī tēma tika aplūkota, un problēmas ir atrisinātas. Uzspiediet \"Darīts\", lai dzēstu sūdzības."
+        more: "(pārējās atbildes...)"
+        dispositions:
+          agreed: "piekrita"
+          disagreed: "nepiekrita"
+        flagged_by: "Sūdzība no"
+        resolved_by: "Atrisināja"
+        took_action: "Rīkojās"
+        system: "Sistēma"
+        error: "Kaut kur notika kļūda"
+        reply_message: "Atbilde"
+        topic_flagged: "Par šo <strong>tēmu</strong> ir saņemta sūdzība."
+        visit_topic: "Apmeklēt tēmu, lai rīkotos."
+        was_edited: "Ieraksts tika rediģēts pēc pirmās sūdzības"
+        previous_flags_count: "Par šo ierakstu jau saņemtas {{count}} sūdzības."
+      groups:
+        primary: "Galvenā grupa"
+        no_primary: "(nav galvenās grupas)"
+        title: "Grupas"
+        edit: "Labot grupas"
+        refresh: "Pārlādēt"
+        new: "Jauns"
+        selector_placeholder: "ievadi lietotājvārdu"
+        about: "Labot jūsu piederīgu grupām un to nosaukumus"
+        group_members: "Grupas biedri"
+        delete: "Dzēst"
+        delete_confirm: "Dzēst šo grupu?"
+        delete_failed: "Neizdevās izdzēst grupu. Ja šī ir automātiski izveidota grupa, to nav iespējams iznīcināt."
+        delete_owner_confirm: "Noņemt lietotāja privilēģijas '%{username}'?"
+        add: "Pievienot"
+        add_members: "Pievienot biedrus"
+        bulk_complete: "Šie lietotāji ir pievienoti grupai."
+        bulk_complete_users_not_added: "Šie lietotāji nav pievienoti (pārliecinieties, ka viņiem ir profili):"
+        bulk: "Pievienot grupai vairākus"
+        bulk_paste: "Kopēt lietotājvārdu vai e-pastu sarakstu, vienu katrā rindiņā:"
+        bulk_select: "(izvēlēties grupu)"
+        automatic: "Automātiski"
+        automatic_membership_email_domains: "Lietotāji, kas reģistrējas ar e-pasta domēnu, kas precīzi sakrīt ar kādu no šī saraksta, tiks automātiski pievienoti šai grupai:"
+        automatic_membership_retroactive: "Izmantot viena e-pasta domēna noteikumu, lai pievienotu esošus lietotājus"
+        default_title: "Noklusējuma apzīmējums visiem lietotājiem šajā grupā"
+        primary_group: "Automātiski padarīt par galveno grupu"
+        group_owners: Īpašnieki
+        add_owners: Pievienot īpašniekus
+        incoming_email: "Īpašas ienākošā e-pasta adreses"
+        incoming_email_placeholder: "ievadi e-pasta adresi"
+        none_selected: "Izvēlēties grupu, lai uzsāktu"
+        no_custom_groups: "Izveidot jaunu specifisku grupu"
+      api:
+        generate_master: "Radīt jaunu Master API atslēgu"
+        none: "Šobrīd nav aktīvu API atslēgu."
+        user: "Lietotājs"
+        title: "API"
+        key: "API atslēga"
+        generate: "Radīt"
+        regenerate: "Atkārtoti radīt"
+        revoke: "Atsaukt"
+        confirm_regen: "Vai jūs esat drošs, ka vēlaties aizstāt šo API atslēgu ar jaunu?"
+        confirm_revoke: "Vai jūs esat drošs, ka vēlaties atsaukt šo atslēgu?"
+        info_html: "Jūsu API atslēga ļaus jums izveidot un atjaunināt tēmas, izmantojot JSON izsaukumus."
+        all_users: "Visi lietotāji"
+        note_html: "Saglabājiet šo atslēgu <strong>slepenu</strong>, jo ikviens lietotājs, kam tā ir zināma, var izveidot jebkādus ierakstus ar jebkuru lietotāju kā autoru."
+      web_hooks:
+        detailed_instruction: "Ja būs signāls par izvēlēto notikumu, uz norādīto URL tiks nosūtīts POST pieprasījums."
+        create: "Izveidot"
+        save: "Saglabāt"
+        destroy: "Dzēst"
+        description: "Apraksts"
+        controls: "Pārvaldīšana"
+        go_back: "Atgriezties pie saraksta"
+        secret_invalid: "Noslēpums nedrīkst saturēt tukšus simbolus."
+        secret_too_short: "Noslēpumam jāsatur vismaz 12 simboli."
+        secret_placeholder: "Neobligāta simbolu virkne, ko izmanto paraksta radīšanai"
+        event_type_missing: "Jums ir jānorāda vismaz viens notikumu tips."
+        content_type: "Satura tips."
+        secret: "Noslēpums"
+        wildcard_event: "Sūtīt man visu."
+        individual_event: "Izvēlēties individuālus notikumus."
+        active: "Aktīvs"
+        active_notice: "Mēs nosūtīsim detalizētu informāciju par notikumu, tiklīdz būs signāls."
+        topic_event:
+          name: "Tēmas notikums"
+          details: "Kad ir izveidota jauna tēma, vai arī tā ir labota, izmainīta vai dzēsta."
+        post_event:
+          name: "Ieraksta notikums"
+          details: "Kad ir jauna, labota, dzēsta vai atjaunota atbilde."
+        user_event:
+          name: "Lietotāja notikums"
+        delivery_status:
+          title: "Piegādes statuss"
+          inactive: "Neaktīvs"
+          failed: "Neizdevies"
+          successful: "Veiksmīgs"
+        events:
+          none: "Nav saistītu notikumu."
+          redeliver: "Atkārtot piegādi"
+          incoming:
+            zero: "Ir {{count}} jauni notikumi."
+            one: "Ir viens jauns notikums."
+            other: "Ir {{count}} notikumi."
+          completed_in:
+            zero: "Pabeigts {{count}} sekundēs."
+            one: "Pabeigts 1 sekundē."
+            other: "Pabeigts {{count}} sekundēs."
+          request: "Pieprasījums"
+          response: "Atbilde"
+          body: "Ķermenis"
+          go_list: "Doties uz sarakstu"
+          go_events: "Pāriet pie notikumiem"
+          status: "Statusa kods"
+          event_id: "ID"
+          timestamp: "Izveidots"
+          completion: "Pabeigšanas laiks"
+          actions: "Darbības"
+      plugins:
+        title: "Spraudņi"
+        installed: "Uzinstalētie spraudņi"
+        name: "Nosaukums"
+        none_installed: "Jums nav instalētu spraudņu."
+        version: "Versij"
+        enabled: "Ieslēgts?"
+        is_enabled: "Jā"
+        not_enabled: "Nē"
+        change_settings: "Mainīt iestatījumus"
+        change_settings_short: "Iestatījumi"
+        howto: "Kā instalēt spraudņus?"
+      backups:
+        title: "Rezerves kopijas"
+        menu:
+          backups: "Rezerves kopijas"
+          logs: "Žurnāls"
+        none: "Nav pieejamas rezerves kopijas."
+        read_only:
+          enable:
+            title: "Ieslēgt tikai lasīšanas režīmu"
+            label: "Atļaut tikai lasīšanu"
+            confirm: "Vai jūs esat drošs, ka vēlaties ieslēgt tikai lasīšanas režīmu."
+          disable:
+            title: "Pārtraukt tikai lasīšanas režīmu"
+            label: "Pārtraukt tikai lasīšanas režīmu"
+        logs:
+          none: "Pagaidām nav žurnāla ierakstu..."
+        columns:
+          filename: "Faila nosaukums"
+          size: "Izmērs"
+        upload:
+          label: "Augšupielādēt"
+          title: "Augšupielādēt rezerves kopiju uz šo instanci"
+          uploading: "Augšupielādē..."
+          success: "'{{filename}}' ir veiksmīgi augšupielādēts."
+          error: "Augšupielādējot '{{filename}}', notika kļūda: {{message}}"
+        operations:
+          failed: "{{operation}} neizdevās. Lūdzu pārbaudīt žurnāla ierakstus."
+          cancel:
+            label: "Atcelt"
+            title: "Atcelt šī brīža procesu"
+            confirm: "Vai jūs esat drošs, ka vēlaties pārtraukt šī brīža procesu?"
+          backup:
+            label: "Rezerves kopija"
+            title: "Izveidot rezerves kopiju"
+            confirm: "Vai jūs vēlaties uzsākt jaunas rezerves kopijas veidošanu?"
+            without_uploads: "Jā (neiekļaut failus)"
+          download:
+            label: "Lejuplādēt"
+            title: "Nosūtīt e-pastu ar lejuplādes saiti"
+            alert: "Saite, kas ļauj lejuplādēt šo rezerves kopiju, ir nosūtīta uz jūsu e-pastu."
+          destroy:
+            title: "Izdzēst rezerves kopiju"
+            confirm: "Vai jūs esat drošs, ka vēlaties iznīcināt šo rezerves kopiju?"
+          restore:
+            is_disabled: "Atjaunošana ir izslēgta vietnes iestatījumos."
+            label: "Atjaunot"
+            title: "Atjaunot no rezerves kopijas"
+            confirm: "Vai jūs esat drošs, ka vēlaties atjaunot no rezerves kopijas?"
+      export_csv:
+        success: "Eksportēšana ir uzsākta; jums nosūtīs paziņojumu, kas šis process būs pabeigts."
+        failed: "Eksportēšana neizdevās. Lūdzu pārbaudiet žurnāla ierakstus."
+        button_text: "Eksportēt"
+        button_title:
+          user: "Eksportēt pilnu lietotāju sarakstu CSV formātā."
+          staff_action: "Eksportēt pilnu darbinieku darbību sarakstu CSV formātā."
+      export_json:
+        button_text: "Eksportēt"
+      invite:
+        button_text: "Nosūtīt ielūgumus"
+        button_title: "Nosūtīt ielūgumus"
+      customize:
+        title: "Pielāgot"
+        long_title: "Vietnes pielāgojumi"
+        preview: "priekšskatījums"
+        explain_preview: "Aplūkot vietni ar ieslēgtu šo dizainu"
+        save: "Saglabāt"
+        new: "Jauns"
+        new_style: "Jauns stils"
+        import: "Importēt"
+        delete: "Dzēst"
+        delete_confirm: "Dzēst šo dizainu?"
+        about: "Pārveido vietnes CSS stila failus un HTML hederus. Lai to darītu, uzsāciet jaunu pielāgojumu."
+        color: "Krāsa"
+        opacity: "Caurspīdīgums"
+        copy: "Kopēt"
+        copy_to_clipboard: "Kopēt uz starpliktuvi (clipboard)"
+        copied_to_clipboard: "Nokopēts uz starpliktuvi (clipboard)"
+        copy_to_clipboard_error: "Radās kļūda, kopējot uz starpliktuvi (clipboard)"
+        theme_owner: "Nevar labot; īpašnieks ir"
+        email_templates:
+          title: "E-pasta šabloni"
+          subject: "Virsraksts"
+          multiple_subjects: "Šim e-pasta šablonam ir vairāki virsraksti"
+          body: "Saturs"
+          none_selected: "Izvēlieties e-pasta šablonu, lai uzsāktu rediģēšanu."
+          revert: "Atcelt izmaiņas"
+          revert_confirm: "Vai jūs esat drošs, ka vēlaties atcelt jūsu veiktās izmaiņas"
+        theme:
+          import_theme: "Importēt dizainu"
+          customize_desc: "Pielāgot:"
+          title: "Dizaini"
+          long_title: "Labot jūsu vietnes krāsas, CSS un HTML saturu"
+          edit: "Labot"
+          edit_confirm: "Šis ir attālināts dizains; ja jūs mainīsiet CSS/HTML, jūsu veiktās izmaiņas tiks izdzēsta nākošajā atjaunināšanas reizē."
+          desktop: "Personālais dators"
+          mobile: "Mobilais"
+          preview: "Priekšskatījums"
+          is_default: "Šis ir noklusējuma dizains"
+          user_selectable: "Šo dizainu var izvēlēties lietotāji"
+          color_scheme: "Krāsu shēma"
+          color_scheme_select: "Izvēlieties krāsas, kuras lietos šis dizains"
+          custom_sections: "Specifiskas sadaļas:"
+          theme_components: "Dizaina komponenti"
+          uploads: "Augšupielādes"
+          no_uploads: "Jūs varat augšupielādēt resursus, kas ir saistīti ar jūsu dizainu, piemēram, fontus un attēlus"
+          add_upload: "Pievienot augšupielādējamu resursu"
+          upload_file_tip: "Izvēlēties resursu augšupielādei (png, woff2, u.c...)"
+          upload: "Augšupielādēt"
+          child_themes_check: "Dizains ietver citus apakšdizainus"
+          css_html: "Specifisks CSS/HTML"
+          edit_css_html: "Labot CSS/HTML"
+          edit_css_html_help: "Jūs neesat izmainījis nekādus CSS vai HTML failus"
+          delete_upload_confirm: "Dzēst šo resursu? (Dizaina CSS var pārtraukt darboties!)"
+          import_web_tip: "Repozitorijs, kas satur dizainu"
+          import_file_tip: ".dcstyle.json fails, kas satur dizainu"
+          about_theme: "Par dizainu"
+          license: "Licence"
+          component_of: "Tēma ir sastāvdaļa:"
+          update_to_latest: "Atjaunināt uz pēdējo"
+          check_for_updates: "Pārbaudīt, vai nav atjauninājumi"
+          updating: "Atjaunina..."
+          up_to_date: "Dizains ir pilnībā atjaunināts, pēdējā parbaude:"
+          add: "Pievienot"
+          scss:
+            text: "CSS"
+        colors:
+          love:
+            description: "Atzinības pogas krāsa."
+      email:
+        title: "E-pasti"
+        settings: "Iestatījumi"
+        templates: "Veidnes"
+        sending_test: "Nosūtām testa e-pastu..."
+        error: "<b>KĻŪDA</b> - %{server_error}"
+        test_error: "Sūtot testa e-pastu, notika kļūda. Lūdzu uzmanīgi pārbaudiet jūsu e-pasta iestatījumus, pārliecinieties, ka jūsu izvietotājs nebloķē e-pasta savienojumus un mēģiniet vēlreiz."
+        sent: "Nosūtīts"
+        skipped: "Izlaists"
+        bounced: "Pārsūtīts"
+        received: "Saņemts"
+        rejected: "Noraidīts"
+        sent_at: "Izsūtīts"
+        time: "Laiks"
+        user: "Lietotājs"
+        email_type: "E-pasta veids"
+        to_address: "Saņēmēja adreses"
+        test_email_address: "E-pasta adreses testiem"
+        send_test: "Nosūtīt Testa Epastu"
+        sent_test: "nosūtīts!"
+        delivery_method: "Piegādes veids"
+        preview_digest_desc: "Pārskatīt saturu e-pastam kas tiks sūtīts neaktīviem lietotājiem."
+        refresh: "Pārlādēt"
+        send_digest_label: "Sūtīt rezultātus:"
+        send_digest: "Sūtīt"
+        sending_email: "Sūta e-pastu..."
+        format: "Formāts"
+        html: "html"
+        text: "teksts"
+        last_seen_user: "Lietotājs pēdējo reizi manīts:"
+        no_result: "Nav atrasts neviens paziņojums"
+        reply_key: "Atbildes atslēga"
+        skipped_reason: "Izlaist Iemeslus"
+        incoming_emails:
+          from_address: "No"
+          to_addresses: "Kam"
+          cc_addresses: "Cc"
+          subject: "Tēma"
+          error: "Kļūda"
+          none: "Nav atrasts neviens saņemtais e-pasts"
+          modal:
+            title: "Saņemtā e-pasta detaļas"
+            error: "Kļūda"
+            headers: "Virsraksts"
+            subject: "Tēma"
+            body: "Saturs"
+            rejection_message: "Atteikuma e-pasts"
+          filters:
+            from_placeholder: "no@piemers.lv"
+            to_placeholder: "sanemejs@piemers.lv"
+            cc_placeholder: "cc@piemers.lv"
+            subject_placeholder: "Tēma..."
+            error_placeholder: "Kļūda..."
+        logs:
+          none: "Nav atrasts neviens ieraksts."
+          filters:
+            title: "Filtrs"
+            user_placeholder: "lietotājvārds"
+            address_placeholder: "Vārds@epasts.lv"
+            type_placeholder: "apkopojums, reģistrācija ..."
+            reply_key_placeholder: "atbildes atslēga"
+            skipped_reason_placeholder: "iemesls"
+      logs:
+        title: "Žurnāls"
+        action: "Darbība"
+        created_at: "Radīts"
+        last_match_at: "Pēdējo reizi atbilst"
+        match_count: "Atbilst"
+        ip_address: "IP"
+        topic_id: "Tēmas ID"
+        post_id: "Ieraksta ID"
+        category_id: "Kategorijas ID"
+        delete: 'Dzēst'
+        edit: 'Labot'
+        save: 'Saglabāt'
+        screened_actions:
+          block: "Bloķēt"
+          do_nothing: "Nedarīt neko"
+        staff_actions:
+          all: "Viss"
+          filter: "Filtri:"
+          title: "Personāla darbības"
+          clear_filters: "Rādīt visu"
+          staff_user: "Personāla lietotājs"
+          target_user: "Mērķa lietotājs"
+          subject: "Tēma"
+          when: "Kad"
+          context: "Konteksts"
+          details: "Detaļas"
+          previous_value: "Iepriekšējais"
+          new_value: "jauns"
+          diff: "Starpība (Diff)"
+          show: "Parādīt"
+          modal_title: "Detaļas"
+          no_previous: "Nav iepriekšējās vērtības."
+          deleted: "Nav jaunu vērtību. Atskaite tika dzēsta."
+          actions:
+            delete_user: "Dzēst lietotāju"
+            change_trust_level: "Mainīt uzticības pakāpi"
+            change_username: "Mainīt lietotāj-vārdu"
+            change_site_setting: "Mainīt lapas iestatījumus"
+            change_theme: "Mainīt tēmu"
+            delete_theme: "Dzēst tēmu"
+            change_site_text: "Mainīt lapas tekstu"
+            suspend_user: "Apturēt lietotāju"
+            unsuspend_user: "Atsaukt lietotāja apturēšanu"
+            grant_badge: "Pasniegt žetonu"
+            revoke_badge: "Atsaukt žetonu"
+            check_email: "Pārbaudīt e-pastu"
+            delete_topic: "Dzēst tēmu"
+            delete_post: "Dzēst ierakstu"
+            impersonate: "Izlikties (impersonate)"
+            anonymize_user: "anonimizēt (anonymize) lietotāju"
+            roll_up: "(roll up) IP bloki"
+            change_category_settings: "Mainīt kategorijas iestatījumus"
+            delete_category: "Dzēst kategoriju"
+            create_category: "Radīt kategoriju"
+            grant_admin: "piešķirt admina tiesības"
+            revoke_admin: "atsaukt adminu"
+            grant_moderation: "piešķirt moderātora tiesības"
+            revoke_moderation: "atsaukt moderēšanu"
+            backup_create: "radīt dublējumu (backup)"
+            deleted_tag: "dzēst birku"
+            renamed_tag: "pārsaukt birku"
+            revoke_email: "atsaukt e-pastu"
+            lock_trust_level: "slēgt uzticības pakāpi"
+            unlock_trust_level: "atslēgt uzticības pakāpi"
+            activate_user: "aktivizēt lietotāju"
+            deactivate_user: "deaktivizēt lietotāju"
+            change_readonly_mode: "izmanīt \"tikai lasīt\" skatu"
+            backup_download: "lejuplādēt dublējumu (backup)"
+            backup_destroy: "iznīcināt dublējumu (backup)"
+            reviewed_post: "pārbaudītie ieraksti"
+            custom_staff: "Iestatīt darbību"
+        screened_emails:
+          title: "Pārbaudītie e-pasti"
+          description: "Kad kāds mēģina izveidot jaunu kontu sekojošās e-pasta adreses tiks pārbaudītas, un reģistrācija tiks apturēta, vai kāda cita darbība tiks veikta."
+          email: "E-pasta adreses"
+          actions:
+            allow: "Atļaut"
+        screened_urls:
+          title: "Pārbaudītie URL"
+          description: "URL kas ir šajā sarakstā tika publicēti no lietotājiem, kas ir identificēti kā spameri."
+          url: "URL"
+          domain: "Domains"
+        screened_ips:
+          title: "Pārbaudītās IP"
+          description: 'IP kuras novēro. Izmanto "Atļaut" lai "whitelistotu" IP adresi.'
+          delete_confirm: "Vai esi drošs, ka vēlies noņemt šo noteikumu priekš %{ip_address}?"
+          roll_up_confirm: "Are you sure you want to roll up commonly screened IP addresses into subnets?\nVai esi drošs ka vēlies (roll up) nesen paŗbaudīt IP adresi iekš \"subneta\"?"
+          rolled_up_some_subnets: "Sveiksmīgi augšuplādēja IP \"banotās\" adreses šajos \"subnetos\"%{subnets}"
+          rolled_up_no_subnet: "Nebija nekas ko (roll up)"
+          actions:
+            block: "Bloķēt"
+            do_nothing: "Atļaut"
+            allow_admin: "Atļaut administrēt"
+          form:
+            label: "Jauns:"
+            ip_address: "IP adrese"
+            add: "Pievienot"
+            filter: "Meklēt"
+          roll_up:
+            text: "Roll up"
+            title: "Radīt jaunu \"subnet ban\" ierakstu ja ir vismaz 'min_ban_entries_for_roll_up' ieraskti."
+        logster:
+          title: "Kļūdu saraksts (log)"
+      watched_words:
+        title: "Vārdi, kas tiek novēroti"
+        search: "meklēt"
+        clear_filter: "Notīrīt"
+        show_words: "parādīt vārdus"
+        word_count:
+          zero: "%{count} vārdi"
+          one: "1 vārds"
+          other: "%{count} vārdi"
+        actions:
+          block: 'Bloķēt'
+          censor: 'Cenzēt'
+          require_approval: 'Pieprasīt apstiprinājumu'
+          flag: 'Sūdzība'
+        action_descriptions:
+          block: 'Neļaut publicēt ierakstus, kas satur šos vārdus. Lietotājs redzēs kļūdas paziņojumu, kad mēģinās nosūtīt savu ierakstu.'
+          censor: 'Atļaut ierakstus, kas satur šos vārdus, taču aizvietot tos ar simboliem, kas tos paslēps.'
+          require_approval: 'Ierakstiem, kas satur šos vārdus, būs nepieciešams darbinieku apstiprinājums, pirms tos varēs redzēt citi.'
+          flag: 'Atļaut ierakstus, kas satur šos vārdus, taču atzīmēt tos kā nepiedienīgus, lai moderatori var tos pārbaudīt.'
+        form:
+          label: 'Jauns vārds:'
+          add: 'Pievienot'
+          success: 'Veiksmīgi'
+          upload: "Augšupielādēt"
+          upload_successful: "Augšupielāde ir veiksmīga. Vārdi ir pievienoti."
+      impersonate:
+        title: "Izlikties (impersonate)"
+        help: "Use this tool to impersonate a user account for debugging purposes. You will have to log out once finished.\nIzmanto šo rīku lai izkliktos (impersonate) par lietotāju priekš kļūdu (bugs) meklēšanas. Vajadzēs izlogoties pēc sesijas beigām."
+        not_found: "Šāds lietotājs nav atrasts."
+        invalid: "Piedod, tu nevari izlikties (impersonate) par šo lietotāju."
+      users:
+        title: 'Lietotāji'
+        create: 'Pievienot administratoru'
+        last_emailed: "Pēdējo reizi saņēmis e-pastu"
+        not_found: "Piedod, šāds lietotājvārds neeksistē mūsu sistēmā."
+        id_not_found: "Piedod, šāds lietotāja ID neeksistē mūsu sistēmā."
+        active: "Aktīvi"
+        show_emails: "Parādīt E-pastus"
+        nav:
+          new: "Jauns"
+          active: "Aktīvi"
+          pending: "Neizlemts"
+          staff: 'Personāls'
+          suspended: 'Apturēts'
+          suspect: 'Novērot'
+        approved: "Apstiprināt?"
+        approved_selected:
+          zero: "Apstiprināt lietotāju"
+          one: "Apstiprināt lietotāju"
+          other: "Apstiprināt lietotājus ({{count}})"
+        reject_selected:
+          zero: "Atteikt lietotāju"
+          one: "Atteikt lietotāju"
+          other: "Atteikt lietotājus ({{count}})"
+        titles:
+          active: 'Aktīvi lietotāji'
+          new: 'Jauni lietotāji'
+          pending: 'Lietotāji, kas jāizskata'
+          newuser: 'Lietotāji ar 0. uzticības pakāpi (Jauns lietotājs)'
+          basic: 'Lietotāji ar 1. uzticības pakāpi (Biedri)'
+          member: 'Lietotāji ar 2. uzticības pakāpi (Biedri)'
+          regular: 'Lietotāji ar 3. uzticības pakāpi (Aktīvie atbalstītāji)'
+          leader: 'Lietotāji ar 4. uzticības pakāpi (Vadītāji)'
+          staff: "Personāls"
+          admins: 'Administratori'
+          moderators: 'Moderātori'
+          suspended: 'Atceltie lietotāji'
+          suspect: 'Novēroti (suspect) lietotāji'
+        reject_successful:
+          zero: "Veiksmīgi atteikts 1 lietotājs."
+          one: "Veiksmīgi atteikts 1 lietotājs."
+          other: "Veiksmīgi atteikts %{count} lietotājs."
+        reject_failures:
+          zero: "Neizdevās atteikt 1 lietotāju."
+          one: "Neizdevās atteikt 1 lietotāju."
+          other: "Neizdevās atteikt %{count} lietotājus."
+        not_verified: "Nav apstiprināts"
+        check_email:
+          title: "Atklāt šī lietotāja e-pasta adresi"
+          text: "Parādīt"
+      user:
+        suspend_failed: "Kaut kas nenostrādāj apturot šo lietotāju {{error}}"
+        unsuspend_failed: "Kaut kas nenostrādāj atjaunojot šo lietotāju {{error}}"
+        suspend_duration: "Uz cik ilgu laiku lietotājs tiks atstādināts?"
+        suspend_reason_label: "Kādēļ apturēt? Šis texts <b>būt redzams visiem</b> šajā lietotāja profila lapā, un tiks rādīts visiem, kas \"ielogojas\"."
+        suspend_reason: "Iemesls"
+        suspended_by: "Apturēja"
+        delete_all_posts: "Dzēst visus ierakstus"
+        delete_all_posts_confirm_MF: "Jūs grasaties dzēst šos ierakstus. Vai est drošs?"
+        moderator: "Moderātors?"
+        admin: "Administrators?"
+        suspended: "Neapturēts?"
+        staged: "Izveidots?"
+        show_admin_profile: "Administrators"
+        refresh_browsers: "Piespiest pārlūka atsvaidzināšanu (Force browser refresh)"
+        refresh_browsers_message: "Ziņa nosūtīta visiem klientiem!"
+        show_public_profile: "Parādīt publisko profilu"
+        impersonate: 'Izlikties (Impersonate)'
+        action_logs: "Aktivitāšu saraksts"
+        ip_lookup: "IP meklēšana"
+        log_out: "Iziet"
+        logged_out: "Lietotājs tika atslēgts no visām ierīcēm"
+        revoke_admin: 'Atsaukt Administratora pakāpi'
+        grant_admin: 'Piešķirt Administratora pakāpi'
+        grant_admin_confirm: "Mēs nosūtījām jums e-pastu, lai jūs apstiprinātu jauno administratoru. Lūdzu atver e-pastu un seko instrukcijām."
+        revoke_moderation: 'Atsaukt Moderātora pakāpi'
+        grant_moderation: 'Piešķirt Moderātora pakāpi'
+        unsuspend: 'Neapturēt'
+        suspend: 'Apturēt'
+        reputation: Reputācija
+        permissions: Atļaujas / Pieejas
+        activity: Aktivitāte
+        like_count: '"Patīk" doti / saņemti'
+        last_100_days: 'Pēdējās 100 dienās'
+        private_topics_count: Privātas tēmas
+        posts_read_count: Ieraksti izlasīti
+        post_count: Ieraksti
+        topics_entered: Tēmas apskatītas.
+        flags_given_count: Atzīmes izveidotas
+        flags_received_count: Atzīmes saņemtas
+        warnings_received_count: Brīdinājumi saņemti
+        flags_given_received_count: 'Atzīmes Izdotas / Saņemtas'
+        approve: 'Apstiprināt'
+        approved_by: "apstiprināja"
+        approve_success: "Lietotāji tika apstiprināti un tika nosūtīts e-pasts ar autorizēšanās instrukciju."
+        approve_bulk_success: "Visi izvēlētie lietotāji tika apstiprināti un informēti."
+        time_read: "Kopējais lasīšanas laiks"
+        anonymize: "Anonimizēt lietotāju (anonymize)"
+        anonymize_confirm: "Vai esi drošs ka vēlies anonimizēt šo kontu (anonymize)? Šis mainīs lietotājvārdu un e-pastu, un visu profila informāciju."
+        anonymize_yes: "Jā, anonimizēt kontu. (anonymize)"
+        anonymize_failed: "Radās problēma ar konta anonimizēšanu (anonymizing)."
+        delete: "Dzēst lietotāju."
+        delete_forbidden_because_staff: "Administratori un moderatori nevar tikt dzēsti."
+        delete_posts_forbidden_because_staff: "Nevar izdzēst visus administratoru un moderatoru ierakstus."
+        delete_forbidden:
+          zero: "Lietotāji nevar tikt dzēsti ja viņiem ir ieraksti. Izdzēs visus ierakstus pirms dzēs lietotāju. (ieraksti vecāki kā %{count} dienas nevar tikt izdzēsti.)"
+          one: "Lietotāji nevar tikt dzēsti ja viņiem ir ieraksti. Izdzēs visus ierakstus pirms dzēs lietotāju. (ieraksti vecāki kā %{count} dienas nevar tikt izdzēsti.)"
+          other: "Lietotāji nevar tikt dzēsti ja viņiem ir ieraksti. Izdzēs visus ierakstus pirms dzēs lietotāju. (ieraksti vecāki kā %{count} dienas nevar tikt izdzēsti.)"
+        cant_delete_all_posts:
+          zero: "Nevar izdzēst visus ierakstus. Daži ieraksti ir vecāki kā %{count} dienas. (The delete_user_max_post_age setting.)"
+          one: "Nevar izdzēst visus ierakstus. Daži ieraksti ir vecāki kā %{count} dienas. (The delete_user_max_post_age setting.)"
+          other: "Nevar izdzēst visus ierakstus. Daži ieraksti ir vecāki kā %{count} dienas. (The delete_user_max_post_age setting.)"
+        cant_delete_all_too_many_posts:
+          zero: "Nevar dzēst visus ierakstus jo lietotājam ir vairāk kā 1 ieraksts. (delete_all_posts_max)"
+          one: "Nevar dzēst visus ierakstus jo lietotājam ir vairāk kā 1 ieraksts. (delete_all_posts_max)"
+          other: "Nevar dzēst visus ierakstus jo lietotājam ir vairāk kā %{count} ieraksti. (delete_all_posts_max)"
+        delete_confirm: "Vai esi drošs, ka vēlies dzēst šo lietotāju? Šis ir neatgriezeniski."
+        delete_and_block: "Dzēst un <b>bloķēt</b> e-pastu un IP adresi"
+        delete_dont_block: "Tikai Dzēst"
+        deleted: "Lietotājs tika dzēsts."
+        delete_failed: "Radās kļūda dzēšot šo lietotāju. Pārbaudi vai visi ieraksti un tēmas no šī lietotāja ir dzēstas."
+        send_activation_email: "Nosūtīt aktivizēšanas e-pastu."
+        activation_email_sent: "Aktivizēšanas e-pasts nosūtīts."
+        send_activation_email_failed: "Radās problēma nosūtot vēl vienu aktivizēšanas e-pastu.%{error}"
+        activate: "Aktīvs konts"
+        activate_failed: "Radās problēma aktivizējot šo lietotāju."
+        deactivate_account: "Deaktivizēts konts"
+        deactivate_failed: "Radās problēma deaktivizējot šo lietotāju."
+        bounce_score: "Pieprasījumu \"Score\""
+        reset_bounce_score:
+          label: "Atlikt"
+          title: "Atlikt pieprasījumus atpakāl uz 0"
+        visit_profile: "Apskati<a href='%{url}'>lietotāja iestatījumu lapu </a> lai labotu viņu profilu"
+        deactivate_explanation: "Deaktivizētam lietotājam jā-apstiprina sava e-pasta adrese."
+        suspended_explanation: "Apturēts lietotājs nevar pieslēgties."
+        staged_explanation: "Lietotājs caur iepastu var veikt ierakstus tikai specifiskās tēmās."
+        bounce_score_explanation:
+          none: "Neviens pieprasījums nesen nav saņemts."
+          some: "Daži pieprasījumi saņemti nesen no šī e-pasta adreses."
+          threshold_reached: "Pārāk daudzi pieprasījumi no šīs e-pasta adreses."
+        trust_level_change_failed: "Radās problēma mainot lietotāja uzticamības līmeni."
+        suspend_modal_title: "Apturētie lietotāji"
+        trust_level_2_users: "Uzticības 2. līmeņa lietotāji"
+        trust_level_3_requirements: "Uzticības 3. līmeņa prasības:"
+        trust_level_locked_tip: "Uzticības līmenis ir slēgts, sistēma nepaaugstinās vai nepazeminās lietotāju"
+        trust_level_unlocked_tip: "Uzticības līmenis ir atslēgts, sistēma paaugstinās vai pazeminās lietotāju"
+        lock_trust_level: "Slēgt Uzticības līmeni"
+        unlock_trust_level: "Atslēgt Uzticības līmeni"
+        tl3_requirements:
+          title: "Prasības uzticības 3. līmenim"
+          table_title:
+            zero: "Pēdējā dienā:"
+            one: "Pēdējā dienā:"
+            other: "Pēdējās %{count} dienās:"
+          value_heading: "Vērtība"
+          requirement_heading: "Prasības"
+          visits: "Apmeklējumi"
+          days: "dienas"
+          topics_replied_to: "Tēmās atbildēts / rakstīts"
+          topics_viewed: "Tēmas izskatītas"
+          topics_viewed_all_time: "Tēmas izskatītas (visas)"
+          posts_read: "Ieraksti izlasīti"
+          posts_read_all_time: "Ieraksti izlasīti (visi)"
+          flagged_posts: "Marķētie ieraksti"
+          flagged_by_users: "Lietotāji, kas marķēja"
+          likes_given: "Dotās atzinības"
+          likes_received: "Saņemtās atzinības"
+          likes_received_days: "Saņemtās atzinības: no unikālām dienām"
+          likes_received_users: "Saņemtās atzinības: no unikāliem lietotājiem"
+          qualifies: "Kvalificējās uzticības 3. līmenim."
+          does_not_qualify: "Nav kvalificēts uzticības 3. līmenim."
+          will_be_promoted: "Tiks paaugstināts drīz."
+          will_be_demoted: "Tiks pazemināts drīz."
+          on_grace_period: "Currently in promotion grace period, will not be demoted."
+          locked_will_not_be_promoted: "Uzticības līmenis noslēgts. Nevar tikt paaugstināts."
+          locked_will_not_be_demoted: "Uzticības līmenis noslēgts. Nevar tikt pazemināts."
+        sso:
+          title: "Vienreizēja pierakstīšanās (Single Sign On)"
+          external_id: "Ārējs ID"
+          external_username: "Lietotājvārds"
+          external_name: "Vārds"
+          external_email: "E-pasts"
+          external_avatar_url: "Profila Bildes URL"
+      user_fields:
+        title: "Lietotāja Lauki"
+        help: "Pievienot lauku, kuru lietotāji var aizpildīt."
+        create: "Izveidot Lietotāja lauku"
+        untitled: "Bez nosaukuma"
+        name: "Lauka Nosaukums"
+        type: "Lauka Tips"
+        description: "Lauka Apraksts"
+        save: "Saglabāt"
+        edit: "Labot"
+        delete: "Dzēst"
+        cancel: "Atcelt"
+        delete_confirm: "Vai tiešām vēlaties dzēst šo lietotāju laukā?"
+        options: "Opcijas"
+        required:
+          title: "Nepieciešams pierakstoties?"
+          enabled: "obligāts"
+          disabled: "nav obligāts"
+        editable:
+          title: "Labot pēc pierakstīšanās?"
+          enabled: "labojams"
+          disabled: "nav labojams"
+        show_on_profile:
+          title: "Rādīt publiskajā profilā?"
+          enabled: "redzams profilā"
+          disabled: "nav redzams profilā"
+        show_on_user_card:
+          title: "Parādīt leitotāja kartē?"
+          enabled: "redzams lietotāja kartē"
+          disabled: "nav redzams lietotāja kartē"
+        field_types:
+          text: 'Teksta Lauks'
+          confirm: 'Apstiprinājums'
+          dropdown: "Nolaižams izvēļu saraksts"
+      site_text:
+        description: "Jūs varat pielāgot jebkuru tekstu jūsu forumā. Sāciet, meklējot sekojošo:"
+        search: "Meklēt tekstu, kuru vēlies rediģēt"
+        title: 'Teksta Saturs'
+        edit: 'labot'
+        revert: "Atsaukt Izmaiņas"
+        revert_confirm: "Vai tiešām vēlies atsaukt izmaiņas?"
+        go_back: "Atpakaļ pie meklētāja"
+        recommended: "Iesakām pielāgot šo tekstu jūsu vajadzībām:"
+        show_overriden: 'Rādīt tikai aizstātos'
+      site_settings:
+        show_overriden: 'Rādīt tikai aizstātos'
+        title: 'Iestatījumi'
+        reset: 'atiestatīt'
+        none: 'nekas'
+        no_results: "Nekas nav atrasts."
+        clear_filter: "Noņemt"
+        add_url: "Pievienot URL"
+        add_host: "Pievienot \"Hostu\""
+        categories:
+          all_results: 'Viss'
+          required: 'Nepieciešams'
+          basic: 'Pamata Iestatījumi'
+          users: 'Lietotāji'
+          posting: 'Ieraksti'
+          email: 'E-pasts'
+          files: 'Faili'
+          trust: 'Uzticības Līmenis'
+          security: 'Drošība'
+          onebox: "Onebox"
+          seo: 'SEO'
+          spam: 'Spams'
+          rate_limits: '(Rate Limits)'
+          developer: 'Izstrādātājs'
+          embedding: "Ieguldīšana"
+          legal: "Jurid."
+          user_api: 'Lietotāja API'
+          uncategorized: 'Citi'
+          backups: "Dublējums (Backups)"
+          login: "Ielogoties"
+          plugins: "Spraudņi"
+          user_preferences: "Lietotāja Uzstādījumi"
+          tags: "Birkas"
+          search: "Meklēt"
+          groups: "Grupas"
+      badges:
+        title: Žetoni
+        new_badge: Jauns Žetons
+        new: Jauns
+        name: Nosaukums
+        badge: Žetons
+        display_name: Rādīt Nosaukumu
+        description: Apraksts
+        long_description: Garais Apraksts
+        badge_type: Žetona Tips
+        badge_grouping: Grupa
+        badge_groupings:
+          modal_title: Žetonu Grupa
+        granted_by: Piešķīra
+        granted_at: Piešķirta
+        reason_help: (Saite uz ierakstu vai tēmu)
+        save: Saglabāt
+        delete: Dzēst
+        delete_confirm: Vai tiešām vēlies dzēst šo žetonu?
+        revoke: Atsaukt
+        reason: Pamatojums
+        expand: Paplašināt &hellip;
+        revoke_confirm: Vai tiešām vēlies atsaukt šo žetonu?
+        edit_badges: Labot Žetonus
+        grant_badge: Piešķirt Žetonu
+        granted_badges: Piešķirtie Žetoni
+        grant: Piešķirt
+        no_user_badges: "%{name} nav piešķirts neviens žetons."
+        no_badges: Nav žetonu, kas var tikt piešķirti.
+        none_selected: "Izvēlieties žetonu, lai sāktu"
+        allow_title: Atļaut žetonam parādīties titulā
+        multiple_grant: Var tikt piešķirts vairākas reizes
+        listable: Rādīt žetonu publisko žeotnu lapā
+        enabled: Atļaut žetonu
+        icon: Ikona
+        image: Bilde
+        icon_help: "Izmanto vainu Fontu klasi vai URL uz bildi"
+        query: Vaicājums Žetons  (SQL)
+        target_posts: Vaicājums ir vērsts uz ierakstiem
+        auto_revoke: Palaist anulēšanas vaicājumu ikdienā
+        show_posts: Rādīt ierakstus žetonu iekš žetonu lapas
+        trigger: Aktivizēt
+        trigger_type:
+          none: "Atjaunināt ikdienā"
+          post_action: "Kad lietotājs ziņo par ierakstu"
+          post_revision: "Kad lietotājs labo vai rada ierakstu"
+          trust_level_change: "Kad lietotājam maina uzticamības līmeni"
+          user_change: "Kad lietotājs ir labots vai radīts"
+          post_processed: "Pēc tam, kad ieraksts ir apstrādāts"
+        preview:
+          link_text: "Ieskats piešķirtajos Žetonos"
+          plan_text: "Ieskats vaicājumu plānā"
+          modal_title: "Žetons vaicājumu Ieskats"
+          sql_error_header: "Radās kļūda ar vaicājumu."
+          error_help: "Skatīt sekojošās saiksnes palīdzībai ar žetoniem."
+          bad_count_warning:
+            header: "BRĪDINĀJUMS!"
+            text: "(There are missing grant samples. This happens when the badge query returns user IDs or post IDs that do not exist. This may cause unexpected results later on - please double-check your query.)"
+          no_grant_count: "Nav peišķiramu žetonu."
+          grant_count:
+            zero: "<b>%{count}</b> Žetons nav piešķirts."
+            one: "<b>%{count}</b> Žetons nav piešķirts."
+            other: "<b>%{count}</b> Žetoni nav piešķirti."
+          sample: "Paraugs:"
+          grant:
+            with: <span class="username">%{username}</span>
+            with_post: <span class="username">%{username}</span> ieraksti %{link}
+            with_post_time: <span class="username">%{username}</span> ieraksti %{link} pulksten <span class="time">%{time}</span>
+            with_time: <span class="username">%{username}</span> <span class="time">%{time}</span>
+      emoji:
+        title: "Smaidiņi"
+        help: "Pievienot jaunu smaidiņu, kas būs pieejams visiem."
+        add: "Pievienot Jaunu Smaidiņu"
+        name: "Nosaukums"
+        image: "Attēls"
+        delete_confirm: "Vai tiešām vēlies dzēst šo :%{name}: smaidiņu?"
+      embedding:
+        get_started: "Ja tu vēlies ieguldīt Discourse citā mājas lapā, sāc ar \"hosta\" pievienošanu.\n\nIf you'd like to embed Discourse on another website, begin by adding its host."
+        confirm_delete: "Vai tiešām vēlies dzēst šo?"
+        sample: "(Use the following HTML code into your site to create and embed discourse topics. Replace <b>REPLACE_ME</b> with the canonical URL of the page you are embedding it on.)"
+        title: "Ieguldīšana"
+        host: "Atļautie lietotāji"
+        class_name: "Klases Nosaukums"
+        path_whitelist: "(Path Whitelist)"
+        edit: "labot"
+        category: "Ieraksti kategorijā"
+        add_host: "Pievienot lietotāju"
+        settings: "Ierakstu iestatījumi"
+        feed_settings: "Ierakstu iestatījumi"
+        feed_description: "(Providing an RSS/ATOM feed for your site can improve Discourse's ability to import your content.)"
+        crawling_settings: "(Crawler Settings)"
+        crawling_description: "(Kad diskurss rada tēmas par savu amatu, ja nav RSS / ATOM padeves ir klāt tā mēģinās parsēt jūsu saturu no jūsu HTML. Dažreiz tas var būt grūti, lai iegūtu savu saturu, tāpēc mēs piedāvājam iespēju noteikt CSS noteikumus, lai padarītu ieguve vieglāk.)"
+        embed_by_username: "Lietotājvārds tēmas radīšanai"
+        embed_post_limit: "Maksimālais iegulto ierakstu skaits"
+        embed_username_key_from_feed: "(Key to pull discourse username from feed)"
+        embed_title_scrubber: "(Regular expression used to scrub the title of posts)"
+        embed_truncate: "Saīsināt iegultos ierakstus"
+        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: "Atļautie CSS nosaukumi (Allowed CSS class names)"
+        feed_polling_enabled: "Importēt ierakstus ar RSS/ATOM"
+        feed_polling_url: "(URL of RSS/ATOM feed to crawl)"
+        feed_polling_frequency_mins: "Aptauju biežums (minūtēs)"
+        save: "Saglabāt iegulšanas iestatījumus"
+      permalink:
+        title: "Patstāvīgā saite"
+        url: "URL"
+        topic_id: "Tēmas ID"
+        topic_title: "Tēma"
+        post_id: "Ieraksta ID"
+        post_title: "Ieraksts"
+        category_id: "Kategorijas ID"
+        category_title: "Kategorija"
+        external_url: "Ārējs URL"
+        delete_confirm: Vai tiešām vēlies dzēst šo ierakstu?
+        form:
+          label: "Jauns:"
+          add: "Pievienot"
+          filter: "Meklēt (URL)"
+  wizard_js:
+    wizard:
+      done: "Pabeigt"
+      back: "Atpakaļ"
+      next: "Nākamais"
+      step: "%{current} no %{total}"
+      upload: "Augšupielādēt"
+      uploading: "Notiek ielāde..."
+      quit: "Varbūt vēlāk"
+      invites:
+        add_user: "Pievienot"
+        none_added: "Neesi nevienu uzaicinājis. Droši zini ka vēlies turpināt?"
+        roles:
+          admin: "Administrators"
+          moderator: "Moderātors"
+          regular: "Lietotājs"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 3765c61cb0..122535a6ab 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -48,6 +48,9 @@ nb_NO:
         x_seconds:
           one: "1s"
           other: "%{count}s"
+        less_than_x_minutes:
+          one: "< 1m"
+          other: "< %{count}m"
         x_minutes:
           one: "1m"
           other: "%{count}m"
@@ -57,6 +60,9 @@ nb_NO:
         x_days:
           one: "1d"
           other: "%{count}d"
+        x_months:
+          one: "1mnd"
+          other: "%{count}mnd"
         about_x_years:
           one: "1år"
           other: "%{count}år"
@@ -101,7 +107,7 @@ nb_NO:
           other: "%{count} år senere"
       previous_month: 'Forrige måned'
       next_month: 'Neste måned'
-      placeholder: Velg en dato
+      placeholder: dato
     share:
       topic: 'del en lenke til dette emnet'
       post: 'innlegg #%{postNumber}'
@@ -116,6 +122,7 @@ nb_NO:
       split_topic: "splittet dette emnet %{when}"
       invited_user: "inviterte %{who} %{when}"
       invited_group: "inviterte %{who} %{when}"
+      user_left: "%{who} fjernet seg fra denne meldingen %{when}"
       removed_user: "fjernet %{who} %{when}"
       removed_group: "fjernet %{who} %{when}"
       autoclosed:
@@ -148,20 +155,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 +226,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"
@@ -257,6 +265,7 @@ nb_NO:
     uploading: "Laster opp…"
     uploading_filename: "Laster opp {{filename}}…"
     uploaded: "Lastet opp!"
+    pasting: "Limer inn…"
     enable: "Aktiver"
     disable: "Deaktiver"
     undo: "Angre"
@@ -351,11 +360,9 @@ 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_admission: "Tillat brukere å ta del i gruppen fritt (krever offentlig synlig gruppe)"
+      public_exit: "Tillat brukere å fritt forlate gruppen"
       empty:
         posts: "Det er ingen innlegg av medlemmer i denne gruppen."
         members: "Det er ingen medlemmer av denne gruppen."
@@ -367,23 +374,28 @@ nb_NO:
       join: "Bli medlem av gruppe"
       leave: "Forlat gruppe"
       request: "Be om gruppemedlemskap"
+      message: "Melding"
       automatic_group: Automatisk gruppe
       closed_group: Lukket gruppe
       is_group_user: "Du er medlem av denne gruppen"
       allow_membership_requests: "Tillat brukere å sende forespørsler om medlemskap av gruppen til eiere"
+      membership_request_template: "Egendefinert mal å vise brukere når du sender en medlemskapsforespørsel."
+      membership_request:
+        submit: "Send inn forespørsel"
+        title: "Spør om å ta del i @%{group_name}"
+        reason: "La gruppeeierne vite hvorfor du ønsker å ta del i denne gruppen"
       membership: "Medlemskap"
       name: "Navn"
       user_count: "Antall medlemmer"
       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"
       title:
-        one: "gruppe"
-        other: "grupper"
+        one: "Gruppe"
+        other: "Grupper"
       activity: "Aktivitet"
       members: "Medlemmer"
       topics: "Emner"
@@ -391,8 +403,15 @@ 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?"
+        mentionable: "Hvem kan @nevne denne gruppen?"
+        messageable: "Hvem kan sende meldinger til denne gruppen?"
         nobody: "Ingen"
         only_admins: "Kun administratorer"
         mods_and_admins: "Kun moderatorer og administratorer"
@@ -427,8 +446,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"
@@ -480,6 +499,7 @@ nb_NO:
       topics_entered: "emner laget"
       post_count: "# innlegg"
       confirm_delete_other_accounts: "Er du sikker på at du vil slette disse kontoene?"
+      powered_by: "drevet av <a href='https://ipinfo.io'>ipinfo.io</a>"
     user_fields:
       none: "(velg et alternativ)"
     user:
@@ -488,7 +508,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."
@@ -513,12 +533,14 @@ nb_NO:
         disable: "Slå av varslinger"
         enable: "Slå på varslinger"
         each_browser_note: "Merk: Du må endre denne innstillinger for hver nettleser du bruker."
+      dismiss: 'Avslå'
       dismiss_notifications: "Avslå alt"
       dismiss_notifications_tooltip: "Merk alle uleste varslinger som lest"
       first_notification: "Ditt første varsel! Velg det for å komme i gang."
       disable_jump_reply: "Ikke hopp til ditt nye innlegg etter svar"
       dynamic_favicon: "Vis antall nye / oppdaterte emner på nettleser ikonet"
       theme_default_on_all_devices: "Gjør dette til forvalgt drakt på alle mine enheter"
+      allow_private_messages: "Tillat andre brukere å sende meg private meldinger"
       external_links_in_new_tab: "Åpne alle eksterne lenker i ny fane"
       enable_quoting: "Aktiver svar med sitat for uthevet tekst"
       change: "Endre"
@@ -526,8 +548,9 @@ nb_NO:
       admin: "{{user}} er en admin"
       moderator_tooltip: "Denne brukeren er en moderator"
       admin_tooltip: "Denne brukeren er en administrator"
-      blocked_tooltip: "Denne brukeren er blokkert"
+      silenced_tooltip: "Brukeren er forstummet"
       suspended_notice: "Denne brukeren er bannlyst til {{date}}."
+      suspended_permanently: "Brukeren er bannlyst."
       suspended_reason: "Begrunnelse:"
       github_profile: "Github"
       email_activity_summary: "Oppsummering av aktivitet"
@@ -558,6 +581,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."
@@ -576,6 +600,8 @@ nb_NO:
       undo_revoke_access: "Angre \"trekk tilbake tilgang\""
       api_approved: "Godkjent:"
       theme: "Drakt"
+      home: "Forvalgt hjemmeside"
+      staged: "Arrangert"
       staff_counters:
         flags_given: "nyttige rapporteringer"
         flagged_posts: "rapporterte innlegg"
@@ -617,24 +643,25 @@ 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"
         taken: "Beklager, den e-postadressen er ikke tilgjengelig."
         error: "Det oppsto en feil ved endring av din e-postadresse. Kanskje den adressen allerede er i bruk?"
         success: "Vi har sendt en e-post til den adressen. Følg instruksjonene i meldingen."
+        success_staff: "Vi har sendt en e-post til den gjeldende adressen. Følg bekreftelsesinstruksjonene."
       change_avatar:
         title: "Bytt profilbilde"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basert på"
         gravatar_title: "Endre din avatar på Gravatars nettside"
+        gravatar_failed: "Kunne ikke hente Gravatar-bilde. Er det et tilknyttet den e-postadressen?"
         refresh_gravatar_title: "Oppdater din Gravatar"
         letter_based: "Systemtildelt profilbilde"
         uploaded_avatar: "Egendefinert bilde"
         uploaded_avatar_empty: "Legg til egendefinert bilde"
         upload_title: "Last opp bilde"
         upload_picture: "Last opp bilde"
-        image_is_not_a_square: "Vi har beskjært bildet ditt, høyde og bredde er ikke lik"
+        image_is_not_a_square: "Vi har beskåret bildet ditt, høyde og bredde er ikke lik"
         cache_notice: "Profilbildet ditt er oppdatert, men på grunn av mellomlagring i nettlesere kan det ta litt tid før det synes."
       change_profile_background:
         title: "Profilbakgrunn"
@@ -753,6 +780,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?"
@@ -782,6 +812,7 @@ nb_NO:
         title: "Oppsummering"
         stats: "Statistikk"
         time_read: "lesetid"
+        recent_time_read: "nylig lesetid"
         topic_count:
           one: "emne opprettet"
           other: "emner opprettet"
@@ -789,14 +820,17 @@ nb_NO:
           one: "innlegg skrevet"
           other: "innlegg skrevet"
         likes_given:
-          one: "<i class='fa fa-heart'></i> gitt"
-          other: "<i class='fa fa-heart'></i> gitt"
+          one: "gitt"
+          other: "gitt"
         likes_received:
-          one: "<i class='fa fa-heart'></i> mottatt"
-          other: "<i class='fa fa-heart'></i> mottatt"
+          one: "mottatt"
+          other: "mottatt"
         days_visited:
           one: "dag besøkt"
           other: "dager besøkt"
+        topics_entered:
+          one: "emne vist"
+          other: "emner vist"
         posts_read:
           one: "innlegg lest"
           other: "innlegg lest"
@@ -817,7 +851,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 +894,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å."
@@ -885,7 +919,11 @@ nb_NO:
     first_post: Første innlegg
     mute: Ignorer
     unmute: Fjern ignorering
-    last_post: Siste innlegg
+    last_post: Postet
+    time_read: Les
+    time_read_recently: '%{time_read} nylig'
+    time_read_tooltip: '%{time_read} total tidsforbruk på lesning'
+    time_read_recently_tooltip: '%{time_read} total tidsforbruk på lesning (%{recent_time_read} i løpet av de siste 60 dagene)'
     last_reply_lowercase: siste svar
     replies_lowercase:
       one: svar
@@ -911,6 +949,7 @@ nb_NO:
     private_message_info:
       title: "Send"
       invite: "Inviter andre…"
+      leave_message: "Ønsker du virkelig å legge igjen denne meldingen?"
       remove_allowed_user: "Er du sikker på at du vil fjerne {{name}} fra denne meldingen?"
       remove_allowed_group: "Vil du virkelig fjerne {{name}} fra denne meldingen?"
     email: 'E-post'
@@ -935,6 +974,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 +1036,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 +1046,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 +1056,35 @@ nb_NO:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: Velg…
+      no_content: Ingen treff funnet
+      filter_placeholder: Søk…
+      create: "Opprett {{content}}"
+    emoji_picker:
+      filter_placeholder: Søk etter emoji
+      people: Folk
+      nature: Natur
+      food: Mat
+      activity: Aktivitet
+      travel: Reise
+      objects: Objekter
+      celebration: Feiring
+      custom: Egendefinerte emoji-er
+      recent: Nylig brukt
+      default_tone: Ingen hudtone
+      light_tone: Lys hudtone
+      medium_light_tone: Middels lys hudtone
+      medium_tone: Middels hudtone
+      medium_dark_tone: Middels mørk hudtone
+      dark_tone: Mørk hudtone
     composer:
       emoji: "Emoji :)"
       more_emoji: "mer…"
       options: "Alternativer"
-      whisper: "hvisker"
+      whisper: "hvisk"
       unlist: "skjult"
+      blockquote_text: "Sitatramme"
       add_warning: "Dette er en offisiell advarsel."
       toggle_whisper: "Veksle hvisking"
       toggle_unlisted: "Skjul eller gjør synlig"
@@ -1027,12 +1094,14 @@ nb_NO:
       saved_local_draft_tip: "lagret lokalt"
       similar_topics: "Emnet ditt har likheter med…"
       drafts_offline: "utkast offline"
+      group_mentioned_limit: "<b>Warning!</b> Du varslet <a href='{{group_link}}'>{{group}}</a>, dog har denne gruppen flere medlemmer en administratoren har satt opp som grense for varseling, {{max}} brukere. Ingen vil bli varslet."
       group_mentioned:
         one: "Ved å nevne {{group}}, er du i ferd med å henvende deg til <a href='{{group_link}}'>{{count}} én person</a> – er du sikker?"
         other: "Ved å nevne {{group}}, er du i ferd med å henvende deg til <a href='{{group_link}}'>{{count}} folk</a> – er du sikker?"
       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"
@@ -1048,6 +1117,7 @@ nb_NO:
       cancel: "Avbryt"
       create_topic: "Opprett emne"
       create_pm: "Melding"
+      create_whisper: "Hvisk"
       title: "Eller trykk Ctrl+Enter"
       users_placeholder: "Legg til en bruker"
       title_placeholder: "Oppsummert i en setning, hva handler denne diskusjonen om?"
@@ -1055,6 +1125,7 @@ nb_NO:
       edit_reason_placeholder: "hvorfor endrer du?"
       show_edit_reason: "(legg till endringsbegrunnelse)"
       topic_featured_link_placeholder: "Skriv inn lenke vist med tittel."
+      remove_featured_link: "Fjern lenken fra emnet."
       reply_placeholder: "Skriv her. Bruk Markdown, BBCode eller HTML for å formattere. Dra og slipp bilder."
       view_new_post: "Se ditt nye innlegg."
       saving: "Lagrer"
@@ -1085,12 +1156,9 @@ nb_NO:
       olist_title: "Nummerert liste"
       ulist_title: "Kulepunktliste"
       list_item: "Listeelement"
-      heading_label: "O"
-      heading_title: "Overskrift"
-      heading_text: "Overskrift"
-      hr_title: "Horisontalt skille"
       help: "Hjelp for redigering i Markdown"
-      toggler: "gjem eller vis redigeringspanelet"
+      collapse: "minimer redigeringspanelet"
+      abandon: "lukk redigeringspanel og forkast utkast"
       modal_ok: "OK"
       modal_cancel: "Avbryt"
       cant_send_pm: "Beklager, du kan ikke sende privat melding til %{username}."
@@ -1099,33 +1167,41 @@ nb_NO:
         body: "Nå sender du denne meldingen bare til deg selv!"
       admin_options_title: "Valgfrie emne-instillinger for stab"
     notifications:
+      tooltip:
+        regular:
+          one: "Én usett merknad"
+          other: "{{count}} usette merknader"
+        message:
+          one: "Én ulest melding"
+          other: "{{count}} uleste meldinger"
       title: "varsler om at ditt @navn blir nevnt, svar på dine innlegg, emner, meldinger, osv"
       none: "Notifikasjoner er ikke tilgjengelig for øyeblikket."
       empty: "Ingen varsler funnet."
       more: "se gamle varsler"
       total_flagged: "totalt rapporterte innlegg"
-      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>"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} og 1 anne</span> {{description}}</p>"
-        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} og {{count}} andre</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>Ble tildelt '{{description}}'</p>"
-      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Nytt emne</span> {{description}}</p>"
+        one: "<span>{{username}}, {{username2}} og én annen</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} og {{count}} andre</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> godtok din invitasjon"
+      moved_post: "<span>{{username}}</span> flyttet {{description}}"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "Gjorde seg fortjent til '{{description}}'"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>Nytt emne</span> {{description}}"
       group_message_summary:
-        one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} melding i {{group_name}}-gruppens innboks</p>"
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} meldinger i {{group_name}}-gruppens innboks</p>"
+        one: "{{count}} melding i din {{group_name}} innboks"
+        other: "{{count}} meldinger i din {{group_name}} innboks"
       alt:
         mentioned: "Nevnt av"
         quoted: "Sitert av"
@@ -1141,6 +1217,7 @@ nb_NO:
         linked: "Link til innlegget ditt"
         granted_badge: "Merke innvilget"
         group_message_summary: "Meldinger i gruppeinnboks"
+        topic_reminder: "En påminnelse"
       popup:
         mentioned: '{{username}} nevnte deg i "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} nevnte deg i "{{topic}}" - {{site_title}}'
@@ -1163,6 +1240,7 @@ nb_NO:
       uploading: "Laster opp bilde"
       select_file: "Velg fil"
       image_link: "lenken som bildet skal peke til"
+      default_image_alt_text: bilde
     search:
       sort_by: "Sorter etter"
       relevance: "Relevanse"
@@ -1173,15 +1251,19 @@ nb_NO:
       select_all: "Velg alle"
       clear_all: "Fjern Alle"
       too_short: "Din søketekst er for kort."
-      result_count:
-        one: "Ett resultat for <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} resultater for <span class='term'>\"{{term}}\"</span>"
       title: "søk etter emner, innlegg, brukere eller kategorier"
       no_results: "Ingen resultater funnet."
       no_more_results: "Ingen flere resultater funnet."
       searching: "Søker…"
       post_format: "#{{post_number}} av {{username}}"
-      results_page: "Søkeresultater"
+      results_page: "Søkeresultater for \"{{term}}\""
+      more_results: "Det er flere resultater. Begrens søket ditt."
+      cant_find: "Finner du ikke det du leter etter?"
+      start_new_topic: "Kanskje du ønsker å starte et nytt emne?"
+      or_search_google: "Eller prøv å søke på Google istedenfor:"
+      search_google: "Prøv å søke på Google istedenfor:"
+      search_google_button: "Google"
+      search_google_title: "Søk på denne siden"
       context:
         user: "Søk i innleggene av @{{username}}"
         category: "Søk i kategorien #{{category}}"
@@ -1192,27 +1274,29 @@ nb_NO:
         posted_by:
           label: Skrevet av
         in_category:
-          label: I kategorien
+          label: Kategorisert
         in_group:
           label: I gruppen
         with_badge:
           label: Med merke
         with_tags:
-          label: Med stikkord
+          label: Merket
         filters:
-          label: Bare returner emner/innlegg som…
+          label: Kun kom med emner/innlegg…
           likes: Jeg likte
           posted: jeg skrev innlegg i
           watching: Jeg følger
           tracking: Jeg overvåker
-          private: er i mine meldinger
-          bookmarks: Jeg har bokmerket
+          private: I mine meldinger
+          bookmarks: Jeg bokmerket
           first: er det første innlegget
           pinned: er festet
           unpinned: er ikke festet
-          seen: Jeg har lest
+          seen: Jeg leste
           unseen: Jeg har ikke lest
           wiki: er wiki
+          images: inkluder bilde(r)
+          all_tags: Alle ovennevnte stikkord
         statuses:
           label: Der emner
           open: er åpen
@@ -1333,8 +1417,8 @@ nb_NO:
         one: "Det er 1 nytt innlegg i dette emnet siden sist du leste det"
         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"
+        one: "det er én like i dette emnet"
+        other: "det er {{number}} likes i dette emnet"
       back_to_list: "Tilbake til emnelisten"
       options: "Valg for emner"
       show_links: "vis lenker i dette emnet"
@@ -1355,13 +1439,21 @@ nb_NO:
         remove: "Fjern utløp"
         publish_to: "Publiser til:"
         when: "Når:"
+        public_timer_types: Emneutløp
+        private_timer_types: Brukerstyrte emneutløp
       auto_update_input:
+        none: "Velg et tidsrom"
         later_today: "Senere i dag"
         tomorrow: "I morgen"
         later_this_week: "Senere denne uken"
         this_weekend: "Denne uken"
         next_week: "Neste uke"
+        two_weeks: "To uker"
         next_month: "Neste måned"
+        three_months: "Tre måneder"
+        six_months: "Seks måneder"
+        one_year: "Ett år"
+        forever: "For alltid"
         pick_date_and_time: "Velg dato og tid"
         set_based_on_last_post: "Lukk basert på siste post"
       publish_to_category:
@@ -1542,6 +1634,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:
@@ -1586,7 +1679,18 @@ nb_NO:
       multi_select:
         select: 'velg'
         selected: 'valgte ({{count}})'
-        select_replies: 'velg +svar'
+        select_post:
+          label: 'velg'
+          title: 'Legg til innlegg i utvalg'
+        selected_post:
+          label: 'valgt'
+          title: 'Klikk for å fjerne innlegg fra utvalg'
+        select_replies:
+          label: 'velg + svar'
+          title: 'Legg til innlegg og alle dets svar i utvalg'
+        select_below:
+          label: 'velg + under'
+          title: 'Legg til innlegg og alle etter det til utvalget'
         delete: fjern valgte
         cancel: avbryt valg
         select_all: velg alle
@@ -1598,7 +1702,7 @@ nb_NO:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Sitat"
-      edit: "Redigerer {{link}} {{replyAvatar}} {{username}}"
+      edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Begrunnelse:"
       post_number: "innlegg {{number}}"
       wiki_last_edited_on: "wikien sist redigert"
@@ -1621,8 +1725,8 @@ nb_NO:
         one: "{{count}} svar"
         other: "{{count}} svar"
       has_likes:
-        one: "{{count}} kjærtegn"
-        other: "{{count}} kjærtegn"
+        one: "{{count}} like"
+        other: "{{count}} likes"
       has_likes_title:
         one: "{{count}} bruker likte dette innlegget"
         other: "{{count}} brukere likte dette innlegget"
@@ -1652,13 +1756,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 gir likes! 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"
@@ -1666,11 +1771,14 @@ nb_NO:
         share: "del en lenke til dette innlegget"
         more: "Mer"
         delete_replies:
-          confirm:
-            one: "Vil du også slette det direkte svaret til dette innlegget?"
-            other: "Vil du også slette de {{count}} direkte svarene til dette innlegget?"
-          yes_value: "Ja, slett svarene også."
-          no_value: "Nei, kun dette innlegget."
+          confirm: "Ønsker du å slette svarene på dette innlegget?"
+          direct_replies:
+            one: "Ja, og ett direkte svar"
+            other: "Ja, og {{count}} direkte svar"
+          all_replies:
+            one: "Ja, og ett svar"
+            other: "Ja, og alle {{count}} svar"
+          just_the_post: "Nei, kun dette innlegget"
         admin: "Innleggsadministrasjon"
         wiki: "Opprett wiki"
         unwiki: "Fjern Wiki"
@@ -1682,8 +1790,8 @@ nb_NO:
       actions:
         flag: 'Rapportering'
         defer_flags:
-          one: "Utsett rapportering"
-          other: "Utsett rapporteringer"
+          one: "Ignorer flagg"
+          other: "Ignorer flagg"
         undo:
           off_topic: "Angre rapportering"
           spam: "Angre rapportering"
@@ -1699,6 +1807,9 @@ nb_NO:
           notify_user: "sendte en melding"
           bookmark: "bokmerket dette"
           like: "likte dette"
+          like_capped:
+            one: "og {{count}} annen likte dette"
+            other: "og {{count}} andre likte dette"
           vote: "stemte for dette"
         by_you:
           off_topic: "Du rapporterte dette som irrelevant"
@@ -1761,12 +1872,12 @@ nb_NO:
             other: "{{count}} brukere stemte på dette innlegget"
       delete:
         confirm:
-          one: "Er du sikker på at du vil slette det innlegget?"
-          other: "Er du sikker på at du vil slette alle de innleggene?"
+          one: "Er du sikker på at du ønsker å slette dette innlegget?"
+          other: "Er du sikker på at du ønsker å slette disse {{count}} 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 +1923,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 stikkord 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"
@@ -1848,6 +1959,7 @@ nb_NO:
       email_in_allow_strangers: "Godta e-post fra anonyme brukere uten brukerkonto"
       email_in_disabled: "Posting av nye emner via e-post er deaktivert i nettstedsinstillingene. For å aktivere posting av nye emner via e-post,"
       email_in_disabled_click: 'aktiver innstillingen "e-post inn".'
+      mailinglist_mirror: "Kategorien gjenspeiler en e-postliste"
       suppress_from_homepage: "Utelat denne kategorien fra hjemmesiden."
       show_subcategory_list: "Vis underkategoriliste over emner i denne kategorien."
       num_featured_topics: "Antall emner vist på kategori-siden:"
@@ -1884,8 +1996,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 +2099,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"
+      one: "like"
+      other: "likes"
+    likes_long: "det er {{number}} likes i dette emnet"
     users: "Deltakere"
     users_lowercase:
       one: "bruker"
@@ -2112,7 +2224,7 @@ nb_NO:
         hamburger_menu: '<b>=</b> Åpne hamburgermeny'
         user_profile_menu: '<b>p</b> Åpne brukermenyen'
         show_incoming_updated_topics: '<b>.</b> Vis oppdaterte emner'
-        search: '<b>/</b> Søk'
+        search: '<b>/</b> eller <b>Ctrl</b>+<b>Alt</b>+<b>f</b> Søk'
         help: '<b>?</b> Åpne tastaturhjelp'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Avvis Nye/Innlegg'
         dismiss_topics: '<b>x</b>, <b>t</b> Avvis emner'
@@ -2183,9 +2295,12 @@ nb_NO:
       selector_no_tags: "ingen stikkord"
       changed: "stikkord endret:"
       tags: "Stikkord"
-      choose_for_topic: "velg alternative stikkord for dette emnet"
+      choose_for_topic: "valgfrie stikkord"
       delete_tag: "Slett stikkord"
-      delete_confirm: "Er du sikker på at du vil slette det stikkordet?"
+      delete_confirm:
+        one: "Er du sikker på at du ønsker å slette dette stikkordet og fjerne det fra emnet det er tilknyttet?"
+        other: "Er du sikker på at du ønsker å slette dette stikkordet og fjerne det fra {{count}} emner det er tilknyttet?"
+      delete_confirm_no_topics: "Er du sikker på at du ønsker å slette dette stikkordet?"
       rename_tag: "Gi stikkord nytt navn"
       rename_instructions: "Velg et nytt navn for dette stikkordet:"
       sort_by: "Sorter etter:"
@@ -2280,7 +2395,7 @@ nb_NO:
         no_problems: "Ingen problemer ble funnet."
         moderators: 'Moderatorer:'
         admins: 'Adminer:'
-        blocked: 'sperret:'
+        silenced: 'Forstummet:'
         suspended: 'Bannlyst:'
         private_messages_short: "Meldinger"
         private_messages_title: "Meldinger"
@@ -2313,24 +2428,25 @@ nb_NO:
         by: "av"
       flags:
         title: "Rapporteringer"
-        old: "Gamle"
-        active: "Aktive"
+        active_posts: "Rapporterte innlegg"
+        old_posts: "Gamle rapporterte innlegg"
+        topics: "Rapporterte innlegg"
+        moderation_history: "Moderatorhistorikk"
         agree: "Godta"
         agree_title: "Bekreft at denne rapporteringen er gyldig og korrekt"
-        agree_flag_modal_title: "Godta og…"
-        agree_flag_hide_post: "Godta (skjul innlegg + send PM)"
-        agree_flag_hide_post_title: "Skjul dette innlegget og automatisk send brukeren en melding som oppfordrer vedkommende til å foreta endringer"
-        agree_flag_restore_post: "Gi medhold (gjenopprett innlegg)"
-        agree_flag_restore_post_title: "Gjenopprett dette innlegget"
-        agree_flag: "Si deg enig med rapportering"
-        agree_flag_title: "Si deg enig med rapportering og la innlegget stå urørt"
-        defer_flag: "Utsett"
+        agree_flag_hide_post: "Samtykk og skjul innlegg"
+        agree_flag_hide_post_title: "Gjem dette innlegget og send en melding til brukeren automatisk med en forespørsel om gjøre endringer."
+        agree_flag_restore_post: "Samtykk og gjenopprett innlegg"
+        agree_flag_restore_post_title: "Gjenopprett innlegget slik at alle brukere kan se det."
+        agree_flag: "Samtykk og behold innlegg"
+        agree_flag_title: "Samtykk med flagg og behold innlegget uendret."
+        defer_flag: "Ignorer"
         defer_flag_title: "Fjern denne rapporteringen; den krever ingen handling på dette tidspunktet."
         delete: "Slett"
         delete_title: "Fjern innlegget denne rapporteringen refererer til."
-        delete_post_defer_flag: "Slett innlegg og utsett rapportering"
+        delete_post_defer_flag: "Slett innlegg og ingorer flagg"
         delete_post_defer_flag_title: "Slett innlegg; hvis det er første innlegg, slett emnet"
-        delete_post_agree_flag: "Slett innlegg og si deg enig med rapportering"
+        delete_post_agree_flag: "Slett innlegg og samtykk med flagg"
         delete_post_agree_flag_title: "Slett innlegg; hvis det er første innlegg, slett emnet"
         delete_flag_modal_title: "Slett og…"
         delete_spammer: "Slett spammer"
@@ -2342,37 +2458,37 @@ nb_NO:
         clear_topic_flags: "Ferdig"
         clear_topic_flags_title: "Emnet har blitt undersøkt og problemer har blitt løst. Klikk Ferdig for å fjerne rapporteringene."
         more: "(flere svar…)"
+        suspend_user: "Bannlys bruker"
+        suspend_user_title: "Bannlys bruker for dette innlegget"
         dispositions:
           agreed: "enig"
           disagreed: "uenig"
-          deferred: "utsatt"
+          deferred: "ignorert"
         flagged_by: "Rapportert av"
         resolved_by: "Løst av"
         took_action: "Tok Handling"
         system: "System"
         error: "Noe gikk galt"
         reply_message: "Svar"
-        no_results: "Det er ingen rapporteringer."
+        no_results: "Det er ingen rapporterte innlegg."
         topic_flagged: "Dette emnet har blitt rapportert."
+        show_full: "vis hele innlegget"
         visit_topic: "Besøk emnet for å utføre handling"
         was_edited: "Innlegget ble redigert etter første rapportering"
         previous_flags_count: "Dette innlegget har allerede blitt rapportert {{count}} ganger."
-        summary:
-          action_type_3:
-            one: "irrelevant"
-            other: "irrelevant x{{count}}"
-          action_type_4:
-            one: "upassende"
-            other: "upassende x{{count}}"
-          action_type_6:
-            one: "tilpasset"
-            other: "tilpasset x{{count}}"
-          action_type_7:
-            one: "tilpasset"
-            other: "tilpasset x{{count}}"
-          action_type_8:
-            one: "nettsøppel"
-            other: "nettsøppel x{{count}}"
+        show_details: "Vis rapportdetaljer"
+        details: "detaljer"
+        flagged_topics:
+          topic: "Emne"
+          type: "Type"
+          users: "Brukere"
+          last_flagged: "Sist rapporter"
+        short_names:
+          off_topic: "urelatert"
+          inappropriate: "upassende"
+          spam: "spam"
+          notify_user: "egendefinert"
+          notify_moderators: "egendefinert"
       groups:
         primary: "Primærgruppe"
         no_primary: "(ingen primærgruppe)"
@@ -2460,7 +2576,7 @@ nb_NO:
           details: "Når det er et nytt, redigert, slettet eller gjenopprettet innlegg."
         user_event:
           name: "Brukerhendelse"
-          details: "Når en bruker blir opprettet, godkjent eller oppdatert."
+          details: "Når en bruker logger inn, logger ut, blir opprettet, godkjent eller oppdatert."
         delivery_status:
           title: "Sendingsstatus"
           inactive: "Inaktiv"
@@ -2478,7 +2594,7 @@ nb_NO:
           request: "Forespørsel"
           response: "Svar"
           redeliver_confirm: "Er du sikker på at du vil sende samme payload på nytt?"
-          headers: "Headere"
+          headers: "Hoder"
           payload: "Payload"
           body: "Body"
           go_list: "Gå til liste"
@@ -2581,7 +2697,7 @@ nb_NO:
         import: "Importer"
         delete: "Slett"
         delete_confirm: "Slett denne drakten?"
-        about: "Endre CSS og HTML-headere på nettstedet. Legg til en tilpasning for å starte."
+        about: "Endre CSS og HTML-hoder på nettstedet. Legg til en tilpasning for å starte."
         color: "Farge"
         opacity: "Opacity"
         copy: "Kopier"
@@ -2636,7 +2752,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"
@@ -2687,11 +2803,11 @@ nb_NO:
             name: "kvartær"
             description: "Navigasjonslenker."
           header_background:
-            name: "bakgrunn i header"
-            description: "Bakgrunnsfarge i nettstedets header"
+            name: "hodebakgrunn"
+            description: "Bakgrunnsfarge i nettstedets hode"
           header_primary:
-            name: "primær header"
-            description: "Tekst og ikoner i nettstedets header"
+            name: "primærhode"
+            description: "Tekst og ikoner i nettstedets hode."
           highlight:
             name: 'utheving'
             description: 'Bakgrunnsfarge på uthevede elementer på siden, som innlegg og emner.'
@@ -2767,6 +2883,15 @@ nb_NO:
             type_placeholder: "oppsummering, registrering…"
             reply_key_placeholder: "svarnøkkel"
             skipped_reason_placeholder: "grunn"
+      moderation_history:
+        performed_by: "Utført av"
+        no_results: "Ingen moderatorhistorikk tilgjengelig."
+        actions:
+          delete_user: "Bruker slettet"
+          suspend_user: "Bruker suspendert"
+          silence_user: "Bruker forstummet"
+          delete_post: "Innlegg slettet"
+          delete_topic: "Emne slettet"
       logs:
         title: "Logger"
         action: "Handling"
@@ -2784,6 +2909,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"
@@ -2820,8 +2947,8 @@ nb_NO:
             change_category_settings: "endre kategori-innstillinger"
             delete_category: "slett kategori"
             create_category: "opprett kategori"
-            block_user: "blokker bruker"
-            unblock_user: "fjern blokkering av bruker"
+            silence_user: "forstum bruker"
+            unsilence_user: "fjern forstumming av bruker"
             grant_admin: "innvilg admin"
             revoke_admin: "tilbakekall admin"
             grant_moderation: "innvilg moderering"
@@ -2837,6 +2964,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."
@@ -2867,8 +2996,46 @@ nb_NO:
           roll_up:
             text: "Slå sammen."
             title: "Lager nye blokkeringsoppføringer for subnett hvis det er minst 'min_ban_entries_for_roll_up' oppføringer."
+        search_logs:
+          title: "Søkelogger"
+          term: "Term"
+          searches: "Søk"
+          click_through: "Klikk gjennom"
+          unique: "Unike"
+          unique_title: "unike brukere som har utført søket"
+          types:
+            all_search_types: "Alle søketyper"
+            header: "Hode"
+            full_page: "Full side"
+            click_through_only: "Alle (kun klikk gjennom)"
         logster:
           title: "Feillogg"
+      watched_words:
+        title: "Ord som holdes oppsyn med"
+        search: "søk"
+        clear_filter: "Tøm"
+        show_words: "vis ord"
+        word_count:
+          one: "ett ord"
+          other: "%{count} ord"
+        actions:
+          block: 'Blokker'
+          censor: 'Sensurer'
+          require_approval: 'Krev godkjenning'
+          flag: 'Flagg'
+        action_descriptions:
+          block: 'Forhindre innlegg som inneholder disse ordene fra å bli postet. Brukeren vil se en feilmelding når vedkommende prøver å sende inn innlegget sitt.'
+          censor: 'Tillat innlegg som inneholder disse ordene, men erstatt dem med bokstaver som skjuler de sensurerte ordene.'
+          require_approval: 'Det kreves at innlegg som inneholder disse ordene godkjennes av staben før de kan ses.'
+          flag: 'Tillat innlegg som inneholder disse ordene, men flagg dem som upassende slik at moderatorer kan se over dem.'
+        form:
+          label: 'Nytt ord:'
+          placeholder: 'helt ord eller * som jokertegn'
+          placeholder_regexp: "regulært uttrykk"
+          add: 'Legg til'
+          success: 'Suksess'
+          upload: "Last opp"
+          upload_successful: "Opplastet. Ord lagt til."
       impersonate:
         title: "Fremstå som"
         help: "Bruk dette verktøyet for å fremstå som en annen bruker for feilsøking. Du må logge ut når du er ferdig."
@@ -2888,7 +3055,7 @@ nb_NO:
           pending: "Ventende"
           staff: 'Stab'
           suspended: 'Bannlyst'
-          blocked: 'Blokkert'
+          silenced: 'Forstummet'
           suspect: 'Mistenkt'
         approved: "Godkjent?"
         approved_selected:
@@ -2909,7 +3076,7 @@ nb_NO:
           staff: "Stab"
           admins: 'Admin-brukere'
           moderators: 'Moderatorer'
-          blocked: 'Blokkerte brukere'
+          silenced: 'Forstummede brukere'
           suspended: 'Bannlyste brukere'
           suspect: 'Mistenkte brukere'
         reject_successful:
@@ -2926,18 +3093,31 @@ nb_NO:
         suspend_failed: "Noe gikk galt ved bannlysing av denne brukeren {{error}}"
         unsuspend_failed: "Noe gikk galt ved gjeninnsetting av denne brukeren {{error}}"
         suspend_duration: "Hvor lenge vil du bannlyse denne brukeren? (dager)"
-        suspend_duration_units: "(dager)"
         suspend_reason_label: "Hvorfor vil du bannlyse? Denne teksten <b>vil være synlig for alle</b> på denne brukerens profilside, og blir vist til brukeren om de skulle forsøke å logge inn. Fatt deg i korthet."
+        suspend_reason_hidden_label: "Hvorfor vil du bannlyse? Denne teksten vil bli vist til brukeren når vedkommende prøver å logge inn. Fatt deg i korthet."
         suspend_reason: "Begrunnelse"
+        suspend_reason_placeholder: "Bannlysningsgrunn"
+        suspend_message: "E-postmelding"
+        suspend_message_placeholder: "Alternativt, kan du detaljere bannlysningen og det vil bli sendt per e-post til brukeren."
         suspended_by: "Bannlyst av"
+        silence_reason: "Grunn"
+        silenced_by: "Forstummet av"
+        silence_modal_title: "Forstum bruker"
+        silence_duration: "Hvor lenge vil du forstumme denne brukeren?"
+        silence_reason_label: "Hvorfor forstummer du denne brukeren?"
+        silence_reason_placeholder: "Grunn til forstumming"
+        silence_message: "E-postmelding"
+        silence_message_placeholder: "(la stå tom for forvalgt melding)"
+        suspended_until: "(til %{until})"
+        cant_suspend: "Brukeren kan ikke bannlyses."
         delete_all_posts: "Slett alle innlegg"
         delete_all_posts_confirm_MF: "Du er i ferd med å slette {INNLEGG, flertall, ett {ett innlegg} andre {# innlegg}} og {INNLEGG, flertall, ett {ett emne} andre {# emner}}. Er du sikker?"
-        suspend: "Bannlyst"
-        unsuspend: "Gjeninnsett"
-        suspended: "Bannlyst?"
+        silence: "Forstum"
+        unsilence: "Fjern forstumming"
+        silenced: "Forstummet?"
         moderator: "Moderator?"
         admin: "Admin?"
-        blocked: "Blokkert?"
+        suspended: "Bannlyst?"
         staged: "Arrangert?"
         show_admin_profile: "Admin"
         refresh_browsers: "Tving gjenoffrisking av nettleser"
@@ -2953,12 +3133,12 @@ nb_NO:
         grant_admin_confirm: "Vi har sendt deg en e-post for å bekrefte den nye administratoren. Følg instruksjonene i meldingen."
         revoke_moderation: 'Tilbakedra moderering'
         grant_moderation: 'Innvilg moderering'
-        unblock: 'Opphev blokkering'
-        block: 'Blokker'
+        unsuspend: 'Gjeninnsett'
+        suspend: 'Bannlyst'
         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
@@ -3001,10 +3181,10 @@ nb_NO:
         activate_failed: "Det oppstod et problem ved aktiveringen av den brukeren."
         deactivate_account: "Skru av konto"
         deactivate_failed: "Det oppstod et problem ved deaktiveringen av den brukeren."
-        unblock_failed: 'Det oppstod et problem med å oppheve blokkeringen av brukeren.'
-        block_failed: 'Det oppstod et problem med blokkeringen av brukeren.'
-        block_confirm: 'Er du sikker på at du vil blokkere denne brukeren? Vedkommende vil ikke kunne opprette nye emner eller innlegg.'
-        block_accept: 'Ja, blokker denne brukeren'
+        unsilence_failed: 'Feil ved fjerning av forstumming av bruker.'
+        silence_failed: 'Feil ved forstumming av bruker.'
+        silence_confirm: 'Er du sikker på at du vil forstumme denne brukeren? Vedkommende vil ikke kunne opprette nye emner eller innlegg.'
+        silence_accept: 'Ja, forstum denne brukeren'
         bounce_score: "Antall tilbakesendinger"
         reset_bounce_score:
           label: "Tilbakestill"
@@ -3012,7 +3192,7 @@ nb_NO:
         visit_profile: "Besøk <a href='%{url}'>denne brukerinnstillingssiden</a> for å redigere profilen deres"
         deactivate_explanation: "En deaktivert bruker må re-validere sin e-post."
         suspended_explanation: "En bannlyst bruker kan ikke logge inn."
-        block_explanation: "En blokkert bruker kan ikke poste eller starte emner."
+        silence_explanation: "En forstummet bruker kan ikke poste eller starte emner."
         staged_explanation: "En arrangert bruker kan bare skrive innlegg via e-post i gitte emner."
         bounce_score_explanation:
           none: "Ingen tilbakesendinger ble mottatt nylig fra den e-posten."
@@ -3042,10 +3222,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."
@@ -3130,6 +3310,7 @@ nb_NO:
           developer: 'Utvikler'
           embedding: "Innebygging"
           legal: "Juridisk"
+          api: 'API'
           user_api: 'Bruker-API'
           uncategorized: 'Annet'
           backups: "Sikkerhetskopier"
@@ -3240,6 +3421,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"
@@ -3266,8 +3448,8 @@ nb_NO:
       uploading: "Laster opp…"
       quit: "Kanskje senere"
       staff_count:
-        one: "Din gemenskap har ett stabsmedlem."
-        other: "Din gemenskap har %{count} stabsmedlemmer."
+        one: "Din gemenskap har ett stabsmedlem (deg)."
+        other: "Din gemenskap har %{count} stab, inkludert deg selv."
       invites:
         add_user: "legg til"
         none_added: "Du har ikke invitert noen til staben. Er du sikker på at du vil fortsette?"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 8b4ea106a6..c5bfc95ea3 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -28,14 +28,14 @@ nl:
     dates:
       time: "HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM [om] HH:mm"
+      long_no_year: "D MMM HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D MMMM"
-      long_with_year: "D MMM YYYY [om] HH:mm"
+      long_with_year: "D MMM YYYY HH:mm"
       long_with_year_no_time: "D MMM YYYY"
       full_with_year_no_time: "D MMMM YYYY"
-      long_date_with_year: "D MMM 'YY [om] HH:mm"
-      long_date_without_year: "D MMM [om] HH:mm"
+      long_date_with_year: "D MMM 'YY HH:mm"
+      long_date_without_year: "D MMM HH:mm"
       long_date_with_year_without_time: "D MMM 'YY"
       long_date_without_year_with_linebreak: "D MMM <br/>HH:mm"
       long_date_with_year_with_linebreak: "D MMM 'YY <br/>HH:mm"
@@ -101,7 +101,6 @@ nl:
           other: "%{count} jaar later"
       previous_month: 'Vorige maand'
       next_month: 'Volgende maand'
-      placeholder: Kies een datum
     share:
       topic: 'een koppeling naar dit topic delen'
       post: 'bericht #%{postNumber}'
@@ -140,36 +139,37 @@ nl:
         enabled: 'heeft deze banner gemaakt op %{when}. De banner verschijnt bovenaan elke pagina, totdat de gebruiker deze verbergt.'
         disabled: 'heeft deze banner verwijderd op %{when}. De banner zal niet meer bovenaan elke pagina verschijnen.'
     topic_admin_menu: "beheeracties voor topic"
-    wizard_required: "Welkom bij uw nieuwe Discourse! Laten we beginnen met <a href='%{url}' data-auto-route='true'>de configuratiewizard</a> ✨"
+    wizard_required: "Welkom bij je nieuwe Discourse! Laten we beginnen met <a href='%{url}' data-auto-route='true'>de configuratiewizard</a> ✨"
     emails_are_disabled: "Alle uitgaande e-mail is uitgeschakeld door een beheerder. Er zal geen enkele e-mailmelding worden verstuurd."
-    bootstrap_mode_enabled: "Om het lanceren van uw website makkelijker te maken, bevindt u zich in bootstrapmodus. Aan alle nieuwe gebruikers wordt vertrouwensniveau 1 toegekend, en dagelijkse e-mailsamenvattingen zijn voor hen ingeschakeld. Dit wordt automatisch uitgeschakeld wanneer het totale gebruikersaantal %{min_users} gebruikers overschrijdt."
+    bootstrap_mode_enabled: "Om het lanceren van je website makkelijker te maken, bevind je je in bootstrapmodus. Aan alle nieuwe gebruikers wordt vertrouwensniveau 1 toegekend en dagelijkse e-mailsamenvattingen zijn voor hen ingeschakeld. Dit wordt automatisch uitgeschakeld wanneer het totale gebruikersaantal %{min_users} gebruikers overschrijdt."
     bootstrap_mode_disabled: "De bootstrapmodus zal in de komende 24 uur worden uitgeschakeld."
     themes:
       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."
     generic_error_with_reason: "Er is iets fout gegaan: %{error}"
     sign_up: "Registreren"
-    log_in: "Aanmelden"
+    log_in: "Inloggen"
     age: "Leeftijd"
     joined: "Lid sinds"
     admin_title: "Beheer"
@@ -184,10 +184,10 @@ nl:
     guidelines: "Richtlijnen"
     privacy_policy: "Privacybeleid"
     privacy: "Privacy"
-    terms_of_service: "Servicevoorwaarden"
+    terms_of_service: "Algemene Voorwaarden"
     mobile_view: "Mobiele weergave"
     desktop_view: "Desktopweergave"
-    you: "U"
+    you: "Jij"
     or: "of"
     now: "zojuist"
     read_more: 'meer info'
@@ -232,12 +232,12 @@ nl:
         bookmark: "Klik om een bladwijzer voor het eerste bericht van dit topic te maken"
         unbookmark: "Klik om alle bladwijzers in dit topic te verwijderen"
     bookmarks:
-      not_logged_in: "sorry, u moet aangemeld zijn om bladwijzers voor berichten te maken"
-      created: "u hebt een bladwijzer voor dit bericht gemaakt"
-      not_bookmarked: "u hebt dit bericht gelezen; klik om er een bladwijzer voor te maken"
-      last_read: "dit is het laatste bericht dat u hebt gelezen; klik om er een bladwijzer voor te maken"
+      not_logged_in: "sorry, je moet ingelogd zijn om berichten aan je favorieten toe te kunnen voegen"
+      created: "je hebt een bladwijzer voor dit bericht gemaakt"
+      not_bookmarked: "je hebt dit bericht gelezen; klik om er een bladwijzer voor te maken"
+      last_read: "dit is het laatste bericht dat je hebt gelezen; klik om er een bladwijzer voor te maken"
       remove: "Bladwijzer verwijderen"
-      confirm_clear: "Weet u zeker dat u alle bladwijzers van dit topic wilt verwijderen?"
+      confirm_clear: "Weet je zeker dat je alle bladwijzers van dit topic wilt verwijderen?"
     topic_count_latest:
       one: "{{count}} nieuwe of aangepaste discussie."
       other: "{{count}} nieuwe of bijgewerkte topics."
@@ -249,7 +249,7 @@ nl:
       other: "{{count}} nieuwe topics."
     click_to_show: "Klik om te bekijken."
     preview: "voorbeeld"
-    cancel: "annuleren"
+    cancel: "annuleer"
     save: "Wijzigingen opslaan"
     saving: "Opslaan..."
     saved: "Opgeslagen!"
@@ -351,11 +351,9 @@ 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_admission: "Gebruikers toestaan om vrij aan de groep deel te nemen (Groep moet hiervoor zichtbaar zijn)"
+      public_exit: "Gebruikers toestaan om vrij de groep te verlaten"
       empty:
         posts: "Er zijn geen berichten van leden van deze groep."
         members: "Er zijn geen leden in deze groep."
@@ -367,17 +365,22 @@ nl:
       join: "Deelnemen aan groep"
       leave: "Groep verlaten"
       request: "Verzoek voor deelname aan groep"
+      message: "Bericht"
       automatic_group: Automatische groep
       closed_group: Besloten groep
       is_group_user: "U bent een lid van deze groep"
       allow_membership_requests: "Gebruikers toestaan om lidmaatschapsverzoeken naar groepseigenaren te sturen"
+      membership_request_template: "Aangepaste template om aan gebruikers te laten zien bij het sturen van een lidmaatschap verzoek"
+      membership_request:
+        submit: "Verstuur Aanvraag"
+        title: "Verzoek voor deelname aan @%{group_name}"
+        reason: "Laat de groepbeheerders weten waarom je in deze groep hoort"
       membership: "Lidmaatschap"
       name: "Naam"
       user_count: "Aantal leden"
       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,8 +394,15 @@ 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?"
+        mentionable: "Wie kan deze groep taggen?"
+        messageable: "Wie kan deze groep een bericht sturen?"
         nobody: "Niemand"
         only_admins: "Alleen beheerders"
         mods_and_admins: "Alleen moderators en beheerders"
@@ -480,6 +490,7 @@ nl:
       topics_entered: "topics ingevoerd"
       post_count: "# berichten"
       confirm_delete_other_accounts: "Weet u zeker dat u deze accounts wilt verwijderen?"
+      powered_by: "powered by <a href='https://ipinfo.io'>ipinfo.io</a>"
     user_fields:
       none: "(selecteer een optie)"
     user:
@@ -488,7 +499,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."
@@ -526,8 +537,8 @@ nl:
       admin: "{{user}} is een beheerder"
       moderator_tooltip: "Deze gebruiker is een moderator"
       admin_tooltip: "Deze gebruiker is een beheerder"
-      blocked_tooltip: "Deze gebruiker is geblokkeerd"
       suspended_notice: "Deze gebruiker is geschorst tot {{date}}."
+      suspended_permanently: "Deze gebruiker is geschorst."
       suspended_reason: "Reden: "
       github_profile: "Github"
       email_activity_summary: "Activiteitsamenvatting"
@@ -558,6 +569,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,13 +629,13 @@ 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"
         taken: "Sorry, dat e-mailadres is niet beschikbaar."
         error: "Er is een fout opgetreden bij het wijzigen van uw e-mailadres. Misschien is dat adres al in gebruik?"
         success: "We hebben een e-mail naar dat adres gestuurd. Volg de instructies voor bevestiging."
+        success_staff: "Er is een e-mail naar je huidige addres verzonden. Volg de bevestigings instructies op."
       change_avatar:
         title: "Uw profielafbeelding wijzigen"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, gebaseerd op"
@@ -753,6 +765,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?"
@@ -789,11 +804,11 @@ nl:
           one: "bericht gemaakt"
           other: "berichten gemaakt"
         likes_given:
-          one: "<i class='fa fa-heart'></i> gegeven"
-          other: "<i class='fa fa-heart'></i> gegeven"
+          one: "gegeven"
+          other: "gegeven"
         likes_received:
-          one: "<i class='fa fa-heart'></i> ontvangen"
-          other: "<i class='fa fa-heart'></i> ontvangen"
+          one: "ontvangen"
+          other: "ontvangen"
         days_visited:
           one: "dag bezocht"
           other: "dagen bezocht"
@@ -885,7 +900,6 @@ nl:
     first_post: Eerste bericht
     mute: Negeren
     unmute: Tonen
-    last_post: Laatste bericht
     last_reply_lowercase: laatste antwoord
     replies_lowercase:
       one: antwoord
@@ -935,6 +949,9 @@ 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"
+      help: "Komt de e-mail niet aan? Controleer eerst je spam map.<p>Weet je niet zeker welk e-mailadres je gebruikt hebt? Voer een e-mailadres in en we laten je weten of het hier bestaat.</p><p>Als je niet langer toegang hebt tot het e-mailadres van je account, neem alsjeblieft contact op met <a href='/about'>onze hulpvolle staf.</a></p>"
+      button_ok: "OK"
+      button_help: "Help"
     login:
       title: "Aanmelden"
       username: "Gebruiker"
@@ -993,7 +1010,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 +1021,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"
@@ -1010,12 +1031,30 @@ nl:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      filter_placeholder: Zoek naar emoji
+      people: Mensen
+      nature: Natuur
+      food: Voeding
+      activity: Activiteit
+      travel: Reizen
+      objects: Objecten
+      celebration: Viering
+      custom: Eigen emojis
+      recent: Recent gebruikt
+      default_tone: Geen huidskleur
+      light_tone: Lichte huidskleur
+      medium_light_tone: Licht gemiddelde huidskleur
+      medium_tone: Gemiddilde huidskleur
+      medium_dark_tone: Donker gemiddelde huidskleur
+      dark_tone: Donkere huidskleur
     composer:
       emoji: "Emoji :)"
       more_emoji: "meer..."
       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"
@@ -1084,12 +1123,7 @@ nl:
       olist_title: "Genummerde lijst"
       ulist_title: "Opsommingslijst"
       list_item: "Lijstitem"
-      heading_label: "H"
-      heading_title: "Kop"
-      heading_text: "Kop"
-      hr_title: "Horizontale lijn"
       help: "Hulp voor Markdown"
-      toggler: "editorpaneel verbergen of tonen"
       modal_ok: "OK"
       modal_cancel: "Annuleren"
       cant_send_pm: "Sorry, u kunt geen bericht naar %{username} sturen."
@@ -1103,29 +1137,29 @@ nl:
       empty: "Geen meldingen gevonden."
       more: "oudere meldingen bekijken"
       total_flagged: "aantal gemarkeerde berichten"
-      mentioned: "<i title='genoemd' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
-      group_mentioned: "<i title='groep genoemd' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
-      quoted: "<i title='geciteerd' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      replied: "<i title='beantwoord' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='geplaatst' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      edited: "<i title='bewerkt' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
-      liked: "<i title='geliket' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
-      liked_2: "<i title='geliket' class='fa fa-heart'></i><p><span>{{username}}, {{username2}}</span> {{description}}</p>"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<i title='geliket' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} en 1 ander</span> {{description}}</p>"
-        other: "<i title='geliket' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} en {{count}} anderen</span> {{description}}</p>"
-      private_message: "<i title='privébericht' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_private_message: "<i title='privébericht' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_topic: "<i title='uitgenodigd voor topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      invitee_accepted: "<i title='uw uitnodiging geaccepteerd' class='fa fa-user'></i><p><span>{{username}}</span> heeft uw uitnodiging geaccepteerd</p>"
-      moved_post: "<i title='bericht verplaatst' class='fa fa-sign-out'></i><p><span>{{username}}</span> heeft {{description}} verplaatst</p>"
-      linked: "<i title='bericht gekoppeld' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
-      granted_badge: "<i title='badge toegekend' class='fa fa-certificate'></i><p>'{{description}}' ontvangen</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='nieuw topic' class='fa fa-dot-circle-o'></i><p><span>Nieuw topic</span> {{description}}</p>"
+        one: "<span>{{username}}, {{username2}} en 1 anderen</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} en {{count}} anderen</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> heeft je uitnodiging geaccepteerd"
+      moved_post: "<span>{{username}}</span> heeft {{description}} verplaatst"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "'{{description}}' ontvangen"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>Nieuw Topic</span> {{description}}"
       group_message_summary:
-        one: "<i title='berichten in groepspostvak' class='fa fa-group'></i><p> {{count}} bericht in uw Postvak IN voor {{group_name}}</p>"
-        other: "<i title='berichten in groepspostvak' class='fa fa-group'></i><p> {{count}} berichten in uw Postvak IN voor {{group_name}}</p>"
+        one: "{{count}} bericht in je Postvak IN voor {{group_name}}"
+        other: "{{count}} berichten in je Postvak IN voor {{group_name}}"
       alt:
         mentioned: "Genoemd door"
         quoted: "Geciteerd door"
@@ -1173,15 +1207,18 @@ nl:
       select_all: "Alles selecteren"
       clear_all: "Alles wissen"
       too_short: "Uw zoekterm is te kort."
-      result_count:
-        one: "1 resultaat voor <span class='term'>'{{term}}'</span>"
-        other: "{{count}} resultaten voor <span class='term'>'{{term}}'</span>"
       title: "zoeken naar topics, berichten, gebruikers of categorieën"
       no_results: "Geen resultaten gevonden."
       no_more_results: "Geen resultaten meer gevonden."
       searching: "Zoeken..."
       post_format: "#{{post_number}} door {{username}}"
-      results_page: "Zoekresultaten"
+      more_results: "Er zijn meer resultaten. Verfijn je zoek criteria."
+      cant_find: "Kun je niet vinden wat je zoekt?"
+      start_new_topic: "Misschien een nieuw topic starten?"
+      or_search_google: "Of probeer in plaats hiervan te zoeken met Google:"
+      search_google: "Probeer in plaats hiervan te zoeken met Google:"
+      search_google_button: "Google"
+      search_google_title: "Zoeken op deze website"
       context:
         user: "Berichten van @{{username}} doorzoeken"
         category: "De categorie #{{category}} doorzoeken"
@@ -1191,26 +1228,18 @@ nl:
         title: Geavanceerd zoeken
         posted_by:
           label: Geplaatst door
-        in_category:
-          label: In categorie
         in_group:
           label: In groep
         with_badge:
           label: Met badge
-        with_tags:
-          label: Met tags
         filters:
-          label: Alleen topics/berichten tonen...
           likes: die ik heb geliket
           posted: waarin ik iets heb geplaatst
           watching: die ik in de gaten houd
           tracking: die ik volg
-          private: die in mijn berichten staan
-          bookmarks: waarvoor ik een bladwijzer heb gemaakt
           first: die het eerste bericht zijn
           pinned: die zijn vastgemaakt
           unpinned: die niet zijn vastgemaakt
-          seen: die ik heb gelezen
           unseen: die ik niet heb gelezen
           wiki: die een wiki zijn
         statuses:
@@ -1349,19 +1378,23 @@ nl:
       jump_reply_down: naar later antwoord springen
       deleted: "Het topic is verwijderd"
       topic_status_update:
-        title: "Topictimer instellen"
+        title: "Topic Timer"
         save: "Timer instellen"
         num_of_hours: "Aantal uren:"
         remove: "Timer verwijderen"
         publish_to: "Publiceren naar:"
         when: "Wanneer:"
+        public_timer_types: Topic Timers
+        private_timer_types: Gebruiker Topic Timers
       auto_update_input:
         later_today: "Later vandaag"
         tomorrow: "Morgen"
         later_this_week: "Later deze week"
         this_weekend: "Dit weekend"
         next_week: "Volgende week"
+        two_weeks: "Twee Weken"
         next_month: "Volgende maand"
+        forever: "Voor altijd"
         pick_date_and_time: "Kies datum en tijd"
         set_based_on_last_post: "Sluiten op basis van laatste bericht"
       publish_to_category:
@@ -1542,6 +1575,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:
@@ -1586,7 +1620,6 @@ nl:
       multi_select:
         select: 'selecteren'
         selected: 'geselecteerd ({{count}})'
-        select_replies: 'selecteren +antwoorden'
         delete: geselecteerde verwijderen
         cancel: selecteren annuleren
         select_all: alles selecteren
@@ -1598,7 +1631,6 @@ nl:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citeren"
-      edit: "Bewerken: {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Reden: "
       post_number: "bericht {{number}}"
       wiki_last_edited_on: "wiki laatst bewerkt op"
@@ -1659,18 +1691,13 @@ 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"
         undelete: "dit bericht herstellen"
         share: "een koppeling naar dit bericht delen"
         more: "Meer"
-        delete_replies:
-          confirm:
-            one: "Wilt u ook het directe antwoord op dit bericht verwijderen?"
-            other: "Wilt u ook de {{count}} directe antwoorden op dit bericht verwijderen?"
-          yes_value: "Ja, de antwoorden ook verwijderen"
-          no_value: "Nee, alleen dit bericht"
         admin: "beheeracties voor bericht"
         wiki: "Wiki maken"
         unwiki: "Wiki verwijderen"
@@ -1681,9 +1708,6 @@ nl:
         change_owner: "Eigendom wijzigen "
       actions:
         flag: 'Markeren'
-        defer_flags:
-          one: "Markering negeren"
-          other: "Markeringen negeren"
         undo:
           off_topic: "Markering verwijderen"
           spam: "Markering verwijderen"
@@ -1759,14 +1783,10 @@ nl:
           vote:
             one: "1 persoon heeft op dit bericht gestemd"
             other: "{{count}} personen hebben op dit bericht gestemd"
-      delete:
-        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?"
+          one: "Weet je zeker dat je die berichten wilt samenvoegen?"
+          other: "Weet je zeker dat je die {{count}} berichten wilt samenvoegen?"
       revisions:
         controls:
           first: "Eerste revisie"
@@ -1812,8 +1832,8 @@ 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_allowed_tag_groups: "Alleen tags uit deze groepen zijn toegestaan om gebruikt te worden in deze categorie:"
       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"
@@ -2112,7 +2132,6 @@ nl:
         hamburger_menu: '<b>=</b> Hamburgermenu openen'
         user_profile_menu: '<b>p</b> Gebruikersmenu openen'
         show_incoming_updated_topics: '<b>.</b> Bijgewerkte topics tonen'
-        search: '<b>/</b> Zoeken'
         help: '<b>?</b> Hulp voor sneltoetsen openen'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Nieuwe/Berichten negeren'
         dismiss_topics: '<b>x</b>, <b>t</b> Topics negeren'
@@ -2183,9 +2202,11 @@ nl:
       selector_no_tags: "geen tags"
       changed: "gewijzigde tags:"
       tags: "Tags"
-      choose_for_topic: "Kies optionele tags voor dit topic"
       delete_tag: "Tag verwijderen"
-      delete_confirm: "Weet u zeker dat u die tag wilt verwijderen?"
+      delete_confirm:
+        one: "Weet je zeker dat je deze tag wilt verwijderen en loskoppelen van 1 topic waar het aan toegewezen is?"
+        other: "Weet je zeker dat je deze tag wilt verwijderen en loskoppelen van {{count}} topics waar het aan toegewezen is?"
+      delete_confirm_no_topics: "Weet je zeker dat je deze tag wilt verwijderen?"
       rename_tag: "Tag hernoemen"
       rename_instructions: "Kies een nieuwe naam voor de tag:"
       sort_by: "Sorteren op:"
@@ -2271,7 +2292,7 @@ nl:
         please_upgrade: "Voer een upgrade uit!"
         no_check_performed: "Er is nog niet op updates gecontroleerd. Zorg dat sidekiq actief is."
         stale_data: "Er is de laatste tijd niet op updates gecontroleerd. Zorg dat sidekiq actief is."
-        version_check_pending: "Blijkbaar hebt u onlangs een upgrade uitgevoerd. Fantastisch!"
+        version_check_pending: "Je hebt de software recentelijk bijgewerkt. Mooi!"
         installed_version: "Geïnstalleerd"
         latest_version: "Nieuwste"
         problems_found: "Er zijn een aantal problemen met uw installatie van Discourse gevonden:"
@@ -2280,7 +2301,6 @@ nl:
         no_problems: "Er zijn geen problemen gevonden."
         moderators: 'Moderators:'
         admins: 'Beheerders:'
-        blocked: 'Geblokkeerd:'
         suspended: 'Geschorst:'
         private_messages_short: "PB's"
         private_messages_title: "Berichten"
@@ -2313,24 +2333,15 @@ nl:
         by: "door"
       flags:
         title: "Meldingen"
-        old: "Oud"
-        active: "Actief"
+        active_posts: "Germarkeerde berichten"
+        old_posts: "Oude gemarkeerde berichten"
+        topics: "Gemarkeerde Topics"
         agree: "Akkoord"
         agree_title: "Bevestig dat deze melding geldig en correct is"
-        agree_flag_modal_title: "Akkoord en ..."
-        agree_flag_hide_post: "Akkoord (bericht verbergen en privébericht sturen)"
-        agree_flag_hide_post_title: "Dit bericht verbergen en de gebruiker automatisch een bericht sturen met het dringende verzoek om het te bewerken"
-        agree_flag_restore_post: "Akkoord (bericht herstellen)"
-        agree_flag_restore_post_title: "Dit bericht herstellen"
-        agree_flag: "Akkoord met melding"
-        agree_flag_title: "Akkoord gaan met melding en het bericht ongewijzigd laten"
-        defer_flag: "Negeren"
         defer_flag_title: "Deze melding verwijderen; er is nu geen actie nodig."
         delete: "Verwijderen"
         delete_title: "Het bericht waarnaar deze melding verwijst verwijderen."
-        delete_post_defer_flag: "Bericht verwijderen en melding negeren"
         delete_post_defer_flag_title: "Bericht verwijderen; als dit het eerste bericht is, het topic verwijderen"
-        delete_post_agree_flag: "Bericht verwijderen en akkoord gaan met melding"
         delete_post_agree_flag_title: "Bericht verwijderen; als dit het eerste bericht is, het topic verwijderen"
         delete_flag_modal_title: "Verwijderen en ..."
         delete_spammer: "Spammer verwijderen"
@@ -2342,37 +2353,29 @@ nl:
         clear_topic_flags: "Gereed"
         clear_topic_flags_title: "Het topic is onderzocht en problemen zijn opgelost. Klik op Gereed om de meldingen te verwijderen."
         more: "(meer antwoorden...)"
+        suspend_user: "Schors gebruiker"
+        suspend_user_title: "Schors gebruiker voor dit bericht"
         dispositions:
           agreed: "akkoord"
           disagreed: "niet akkoord"
-          deferred: "genegeerd"
         flagged_by: "Gemarkeerd door"
         resolved_by: "Opgelost door"
         took_action: "Heeft actie ondernomen"
         system: "Systeem"
         error: "Er is iets misgegaan"
         reply_message: "Antwoorden"
-        no_results: "Er zijn geen markeringen."
+        no_results: "Er zijn geen gemarkeerde berichten"
         topic_flagged: "Dit <strong>topic</strong> is gemarkeerd."
+        show_full: "volledige berichten tonen"
         visit_topic: "Bezoek het topic om actie te ondernemen"
         was_edited: "Bericht is na de eerste melding bewerkt"
         previous_flags_count: "Dit bericht is al {{count}} keer gemarkeerd."
-        summary:
-          action_type_3:
-            one: "off-topic"
-            other: "off-topic x{{count}}"
-          action_type_4:
-            one: "ongepast"
-            other: "ongepast x{{count}}"
-          action_type_6:
-            one: "aangepast"
-            other: "aangepast x{{count}}"
-          action_type_7:
-            one: "aangepast"
-            other: "aangepast x{{count}}"
-          action_type_8:
-            one: "spam"
-            other: "spam x{{count}}"
+        show_details: "Bekijk markering details"
+        flagged_topics:
+          topic: "Topic"
+          type: "Type"
+          users: "Gebruikers"
+          last_flagged: "Laatst gemarkeerd"
       groups:
         primary: "Primaire groep"
         no_primary: "(geen primaire groep)"
@@ -2460,7 +2463,6 @@ nl:
           details: "Wanneer een (nieuw) bericht wordt geplaatst, bewerkt, verwijderd of hersteld."
         user_event:
           name: "Gebruikersgebeurtenis"
-          details: "Wanneer een gebruiker wordt aangemaakt, goedgekeurd of bijgewerkt."
         delivery_status:
           title: "Afleveringsstatus"
           inactive: "Inactief"
@@ -2636,8 +2638,8 @@ nl:
           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!"
+            one: "Thema loopt 1 commit achter!"
+            other: "Thema loopt {{count}} commits achter!"
           scss:
             text: "CSS"
             title: "Voer aangepaste CSS in; we accepteren alle geldige CSS- en SCSS-stijlen"
@@ -2784,6 +2786,8 @@ nl:
           block: "blokkeren"
           do_nothing: "niets doen"
         staff_actions:
+          all: "alle"
+          filter: "Filter:"
           title: "Stafacties"
           clear_filters: "Alles tonen"
           staff_user: "Staflid"
@@ -2820,8 +2824,6 @@ nl:
             change_category_settings: "categorie-instellingen wijzigen"
             delete_category: "categorie verwijderen"
             create_category: "categorie maken"
-            block_user: "gebruiker blokkeren"
-            unblock_user: "gebruiker deblokkeren"
             grant_admin: "beheerdersrechten toekennen"
             revoke_admin: "beheerdersrechten intrekken"
             grant_moderation: "moderatierechten toekennen"
@@ -2837,6 +2839,8 @@ nl:
             change_readonly_mode: "alleen-lezenmodus wijzigen"
             backup_download: "back-up downloaden"
             backup_destroy: "back-up verwijderen"
+            reviewed_post: "beoordeeld bericht"
+            custom_staff: "aangepaste plugin actie"
         screened_emails:
           title: "Gecontroleerde e-mails"
           description: "Als iemand een nieuwe account probeert aan te maken, worden de volgende e-mailadressen gecontroleerd en de registratie geblokkeerd, of een andere actie uitgevoerd."
@@ -2869,6 +2873,31 @@ nl:
             title: "Maakt nieuwe subnet-banvermeldingen als er minstens 'min_ban_entries_for_roll_up'-vermeldingen zijn."
         logster:
           title: "Foutlogboeken"
+      watched_words:
+        search: "zoeken"
+        clear_filter: "Wis"
+        show_words: "laat woorden zien"
+        word_count:
+          one: "1 woord"
+          other: "%{count} woorden"
+        actions:
+          block: 'Blokkeren'
+          censor: 'Censuur'
+          require_approval: 'Heeft goedkeuring nodig'
+          flag: 'Markeren'
+        action_descriptions:
+          block: 'Voorkom het plaatsen van berichten die deze woorden bevatten. De gebruiker ziet een foutmelding wanneer ze hun bericht versturen.'
+          censor: 'Sta berichten toe met deze woorden, maar vervang ze met karakters die de gecensureerde woorden verbergen.'
+          require_approval: 'Berichten die deze woorden bevatten vereisen goedkeuring door personeel voordat ze gezien kunnen worden.'
+          flag: 'Sta berichten toe met deze woorden, maar markeer ze als ongepast zodat moderator ze kunnen beoordelen.'
+        form:
+          label: 'Nieuw Woord:'
+          placeholder: 'Volledig woord of * als wildcard'
+          placeholder_regexp: "reguliere expressie"
+          add: 'Toevoegen'
+          success: 'succes'
+          upload: "Upload"
+          upload_successful: "Upload geslaagd. Woorden zijn toegevoegd."
       impersonate:
         title: "Aanmelden als gebruiker"
         help: "Gebruik dit hulpmiddel om een gebruikersaccount voor debugdoeleinden te imiteren. U moet zich afmelden als u klaar bent."
@@ -2888,7 +2917,6 @@ nl:
           pending: "Te beoordelen"
           staff: 'Stafleden'
           suspended: 'Geschorst'
-          blocked: 'Geblokkeerd'
           suspect: 'Verdacht'
         approved: "Goedgekeurd?"
         approved_selected:
@@ -2909,7 +2937,6 @@ nl:
           staff: "Stafleden"
           admins: 'Beheerders'
           moderators: 'Moderators'
-          blocked: 'Geblokkeerde gebruikers'
           suspended: 'Geschorste gebruikers'
           suspect: 'Verdachte gebruikers'
         reject_successful:
@@ -2926,18 +2953,20 @@ nl:
         suspend_failed: "Er is iets misgegaan bij het schorsen van deze gebruiker: {{error}}"
         unsuspend_failed: "Er is iets misgegaan bij het opheffen van de schorsing van deze gebruiker: {{error}}"
         suspend_duration: "Hoe lang wilt u deze gebruiker schorsen?"
-        suspend_duration_units: "(dagen)"
         suspend_reason_label: "Waarom schorst u deze gebruiker? Deze tekst <b>zal voor iedereen zichtbaar zijn</b> op de profielpagina van deze gebruiker, en zal aan de gebruiker worden getoond als deze zich probeert aan te melden. Houd het kort."
+        suspend_reason_hidden_label: "Waarom schors je deze gebruiker? Deze tekst zal zichtbaar zijn voor de gebruiker wanneer deze zich probeert aan te melden. Hou het kort."
         suspend_reason: "Reden"
+        suspend_reason_placeholder: "Reden van schorsing"
+        suspend_message: "E-mail bericht"
+        suspend_message_placeholder: "Vrijblijvend kun je meer informatie geven over de schorsing. Dit zal worden gemaild naar de gebruiker."
         suspended_by: "Geschorst door"
+        suspended_until: "(tot %{until})"
+        cant_suspend: "Deze gebruiker kan niet worden geschorst."
         delete_all_posts: "Alle berichten verwijderen"
         delete_all_posts_confirm_MF: "U gaat {POSTS, plural, one {1 bericht} other {# berichten}} en {TOPICS, plural, one {1 topic} other {# topics}} verwijderen. Weet u het zeker?"
-        suspend: "Schorsen"
-        unsuspend: "Schorsing opheffen"
-        suspended: "Geschorst?"
         moderator: "Moderator?"
         admin: "Beheerder?"
-        blocked: "Geblokkeerd?"
+        suspended: "Geschorst?"
         staged: "Staged?"
         show_admin_profile: "Beheerder"
         refresh_browsers: "Vernieuwen in browser forceren"
@@ -2953,8 +2982,8 @@ nl:
         grant_admin_confirm: "We hebben u een e-mail gestuurd om de nieuwe beheerder te verifiëren. Open deze en volg de instructies."
         revoke_moderation: 'Moderatierechten intrekken'
         grant_moderation: 'Moderatierechten toekennen'
-        unblock: 'Deblokkeren'
-        block: 'Blokkeren'
+        unsuspend: 'Schorsing opheffen'
+        suspend: 'Schorsen'
         reputation: Reputatie
         permissions: Toestemmingen
         activity: Activiteit
@@ -3001,17 +3030,13 @@ nl:
         activate_failed: "Er is een probleem opgetreden bij het activeren van de gebruiker."
         deactivate_account: "Deactiveer account"
         deactivate_failed: "Er is een probleem opgetreden bij het deactiveren van de gebruiker."
-        unblock_failed: 'Er is een probleem opgetreden bij het deblokkeren van de gebruiker.'
-        block_failed: 'Er is een probleem opgetreden bij het blokkeren van de gebruiker.'
-        block_confirm: 'Weet u zeker dat u deze gebruiker wilt blokkeren? De gebruiker zal dan geen nieuwe topics of berichten kunnen plaatsen.'
-        block_accept: 'Ja, blokkeer deze gebruiker'
         bounce_score: "Bouncescore"
         reset_bounce_score:
           label: "Terugzetten"
           title: "Bouncescore terugzetten naar 0"
+        visit_profile: "Ga naar <a href='%{url}'>de instellingen van deze gebruiker</a> om hun profiel te bewerken"
         deactivate_explanation: "Een gedeactiveerde gebruiker moet zijn of haar e-mailadres opnieuw valideren."
         suspended_explanation: "Een geschorste gebruiker kan zich niet aanmelden."
-        block_explanation: "Een geblokkeerde gebruiker kan geen berichten plaatsen of topics maken."
         staged_explanation: "Een staged gebruiker kan alleen in bepaalde topics berichten plaatsen via e-mail."
         bounce_score_explanation:
           none: "Er zijn onlangs geen bounceberichten van dat e-mailadres ontvangen."
@@ -3266,8 +3291,8 @@ nl:
       uploading: "Uploaden..."
       quit: "Misschien later"
       staff_count:
-        one: "Uw gemeenschap heeft 1 staflid."
-        other: "Jouw community heeft %{count} stafleden."
+        one: "Jouw community heeft 1 personeelslids (jij)."
+        other: "Jouw community heeft %{count} personeelsleden, inclusief jij."
       invites:
         add_user: "toevoegen"
         none_added: "Je hebt geen stafleden uitgenodigd. Weet je zeker dat je verder wilt gaan?"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index b04479c681..3bbb08e58b 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -69,6 +69,11 @@ pl_PL:
           few: "%{count}d"
           many: "%{count}d"
           other: "%{count}d"
+        x_months:
+          one: "1mies"
+          few: "%{count}mies"
+          many: "%{count}mies"
+          other: "%{count}mies"
         about_x_years:
           one: "1r"
           few: "%{count}r"
@@ -137,7 +142,6 @@ pl_PL:
           other: "%{count} lat później"
       previous_month: 'Poprzedni miesiąc'
       next_month: 'Następny miesiąc'
-      placeholder: Wybierz datę
     share:
       topic: 'udostępnij odnośnik do tego tematu'
       post: 'wpis #%{postNumber}'
@@ -173,10 +177,10 @@ pl_PL:
         enabled: 'wylistowanie %{when}'
         disabled: 'odlistowanie %{when}'
       banner:
-        enabled: 'Ten temat został ustawiony jako baner. Będzie widoczny na górze każdej strony, dopóki nie zostanie zamknięty przez użytkownika.'
-        disabled: 'Baner został usunięty. Nie będzie więcej widoczny na górze każdej strony.'
+        enabled: 'Ten temat został ustawiony jako baner %{when}. Będzie widoczny na górze każdej strony, póki nie zostanie ukryty przez użytkownika.'
+        disabled: 'Ten temat nie jest już banerem. Nie będzie dalej wyświetlany na górze każdej strony.'
     topic_admin_menu: "akcje administratora"
-    wizard_required: "Witaj na Twoim nowym Discourse! Zacznij od <a href='%{url}' data-auto-route='true'>kreatora konfiguracji</a> ✨"
+    wizard_required: "Witaj na Twoim na nowym forum opartym na Discourse! Rozpocznij konfigurację w <a href='%{url}' data-auto-route='true'>panelu konfiguracyjnym</a> ✨"
     emails_are_disabled: "Wysyłanie e-maili zostało globalnie wyłączone przez administrację. Powiadomienia e-mail nie będą dostarczane."
     bootstrap_mode_enabled: "Aby ułatwić uruchomienie Twojego nowego serwisu, znajdujesz się w trybie bootstrap. Wszyscy nowi użytkownicy otrzymają 1. poziom zaufania i będą otrzymywać codzienne podsumowania drogą mailową. To się zmieni, gdy liczba użytkowników przekroczy liczbę %{min_users}."
     bootstrap_mode_disabled: "Tryb Bootstrap zostanie wyłączony w ciągu najbliższych 24 godzin."
@@ -184,20 +188,21 @@ 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: "Europa (Londyn)"
+        sa_east_1: "Ameryka Południowa (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_east_2: "Wschodnie USA (Ohio)"
+        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"
@@ -303,6 +308,7 @@ pl_PL:
     uploading: "Wysyłam…"
     uploading_filename: "Wysyłanie {{filename}}..."
     uploaded: "Wgrano!"
+    pasting: "Wklejanie..."
     enable: "Włącz"
     disable: "Wyłącz"
     undo: "Cofnij"
@@ -403,11 +409,9 @@ 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)"
+      public_admission: "Zezwól wszystkim użytkownikom na dołączanie do tej grupy (widoczność grupy musi być ustawiona na publiczną)"
+      public_exit: "Zezwól wszystkim użytkownikom na opuszczanie tej grupy"
       empty:
         posts: "Członkowie tej grupy nie opublikowali żadnych postów."
         members: "Nie ma użytkowników w tej grupie"
@@ -419,25 +423,30 @@ pl_PL:
       join: "Dołącz do grupy"
       leave: "Opuść grupę"
       request: "Żądanie dołączenia do grupy"
+      message: "Wiadomość"
       automatic_group: Automatyczna grupa
       closed_group: Zamknięta grupa
       is_group_user: "Jesteś członkiem tej grupy"
       allow_membership_requests: "Zezwól użytkownikom na wysyłanie zaproszeń do właścicieli grupy."
+      membership_request_template: "Wyświetl niestandardowy szablon użytkownikom, w momencie wysyłania wniosku o członkostwo."
+      membership_request:
+        submit: "Złóż wniosek"
+        title: "Prośba o dołączenie @%{group_name}"
+        reason: "Poinformuj właścicieli grupy dlaczego do niej należysz."
       membership: "Członkostwo"
       name: "Nazwa"
       user_count: "Ilość użytkowników"
       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"
       title:
-        one: "grupa"
-        few: "grupy"
-        many: "grupy"
-        other: "grupy"
+        one: "Grupa"
+        few: "Grupy"
+        many: "Grup"
+        other: "Grup"
       activity: "Aktywność"
       members: "Członkowie"
       topics: "Tematy"
@@ -445,8 +454,15 @@ 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?"
+        mentionable: "Kto może @wspomnieć tę grupę?"
+        messageable: "Kto może wysyłać wiadomości do tej grupy?"
         nobody: "Nikt"
         only_admins: "Tylko administratorzy"
         mods_and_admins: "Tylko moderatorzy i administratorzy"
@@ -472,7 +488,7 @@ pl_PL:
           title: "Wyciszony"
           description: "Nie otrzymasz powiadomień o nowych tematach w tej grupie."
       flair_url: "Awatar "
-      flair_url_placeholder: "(Opconalne) Link do obrazka lub klasa Font Awesome"
+      flair_url_placeholder: "(Opcjonalne) Link do obrazka lub klasa Font Awesome"
       flair_bg_color: "Kolor tła odznaki grupowej"
       flair_bg_color_placeholder: "(Opcjonalne) Kolor w formacie Hex"
       flair_color: "Kolor odznaki grupowej "
@@ -538,6 +554,7 @@ pl_PL:
       topics_entered: "wprowadzone tematy:"
       post_count: "# wpisów"
       confirm_delete_other_accounts: "Czy na pewno chcesz usunąć wybrane konta?"
+      powered_by: "obsługiwane przez <a href='https://ipinfo.io'>ipinfo.io</a>"
     user_fields:
       none: "(wybierz opcję)"
     user:
@@ -546,7 +563,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."
@@ -571,11 +588,14 @@ pl_PL:
         disable: "Wyłącz powiadomienia"
         enable: "Włącz powiadomienia"
         each_browser_note: "Uwaga: to ustawienie musisz zmienić w każdej przeglądarce której używasz."
+      dismiss: 'Odrzuć'
       dismiss_notifications: "Odrzuć wszystkie"
       dismiss_notifications_tooltip: "Oznacz wszystkie powiadomienia jako przeczytane"
       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"
+      allow_private_messages: "Zezwól aby użytkownicy wysyłali mi wiadomości prywatne"
       external_links_in_new_tab: "Otwieraj wszystkie zewnętrzne odnośniki w nowej karcie"
       enable_quoting: "Włącz cytowanie zaznaczonego tekstu"
       change: "zmień"
@@ -583,8 +603,9 @@ pl_PL:
       admin: "{{user}} jest adminem"
       moderator_tooltip: "Ten użytkownik jest moderatorem"
       admin_tooltip: "Ten użytkownik jest administratorem"
-      blocked_tooltip: "Ten użytkownik jest zablokowany"
+      silenced_tooltip: "Ten użytkownik jest wyciszony"
       suspended_notice: "ten użytkownik jest zawieszony do {{date}}."
+      suspended_permanently: "Ten użytkownik jest zawieszony"
       suspended_reason: "Powód: "
       github_profile: "Github"
       email_activity_summary: "Podsumowanie aktywności"
@@ -614,6 +635,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."
@@ -632,6 +654,7 @@ pl_PL:
       undo_revoke_access: "Cofnij zablokowanie dostępu"
       api_approved: "Zatwierdzony:"
       theme: "Motyw"
+      home: "Domyślna strona domowa"
       staff_counters:
         flags_given: "uczynnych oflagowań"
         flagged_posts: "oflagowane wpisy"
@@ -673,13 +696,13 @@ 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"
         taken: "Przykro nam, ale ten adres email nie jest dostępny."
         error: "Wystąpił błąd podczas próby zmiany twojego adresu email. Być może ten email jest już zarejestrowany?"
         success: "Wysłaliśmy wiadomość do potwierdzenia na podany adres email."
+        success_staff: "Wysłaliśmy wiadomość na bieżący adres. Proszę przestrzegać informacji dotyczących potwierdzenia adresu."
       change_avatar:
         title: "Zmień swój awatar"
         gravatar: "bazujący na <a href='//gravatar.com/emails' target='_blank'>Gravatar</a>"
@@ -813,8 +836,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"
@@ -945,6 +972,7 @@ pl_PL:
       rate:
         one: "1 błąd/%{duration}"
         few: "%{count} błędy/%{duration}"
+        many: "%{count} błędów/%{duration}"
         other: "%{count} błędów/%{duration}"
     learn_more: "dowiedz się więcej…"
     all_time: 'łącznie'
@@ -959,7 +987,8 @@ pl_PL:
     first_post: Pierwszy wpis
     mute: Wycisz
     unmute: Wyłącz wyciszenie
-    last_post: Ostatni wpis
+    last_post: Opublikowano
+    time_read: Przeczytane
     last_reply_lowercase: ostatnia odpowiedź
     replies_lowercase:
       one: odpowiedź
@@ -997,7 +1026,7 @@ pl_PL:
     trust_level: 'Poziom zaufania'
     search_hint: 'nazwa użytkownika, email lub IP'
     create_account:
-      disclaimer: "Rejestrując się zgadzasz się z <a href='{{privacy_link}}'>polityką prywatności</a> i <a href='{{tos_link}}'>warunkami świadczenia usług /a>."
+      disclaimer: "Rejestrując się zgadzasz się z <a href='{{privacy_link}}'>polityką prywatności</a> i <a href='{{tos_link}}'>warunkami świadczenia usług</a>."
       title: "Utwórz konto"
       failed: "Coś poszło nie tak, możliwe, że wybrany adres email jest już zarejestrowany, spróbuj użyć odnośnika przypomnienia hasła"
     forgot_password:
@@ -1011,6 +1040,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"
@@ -1065,10 +1097,13 @@ pl_PL:
       accept_title: "Zaproszenie"
       welcome_to: "Witaj na %{site_name}!"
       invited_by: "Zostałeś zaproszony przez:"
+      social_login_available: "Będziesz mógł zalogować się za pomocą dowolnej platformy społecznościowej używając tego adresu e-mail."
       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_label: "Ustaw hasło"
+      optional_description: "(opcjonalne)"
     password_reset:
       continue: "Przejdź do %{site_name}"
     emoji_set:
@@ -1077,6 +1112,8 @@ pl_PL:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Tylko kategorie"
       categories_with_featured_topics: "Kategorie z wybranymi tematami"
@@ -1085,12 +1122,35 @@ pl_PL:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: Wybierz...
+      no_content: Nie znaleziono dopasowań
+      filter_placeholder: Wyszukiwanie...
+      create: "Utwórz {{content}}"
+    emoji_picker:
+      filter_placeholder: Szukaj emoji
+      people: Ludzie
+      nature: Natura
+      food: Jedzenie
+      activity: Aktywność
+      travel: Podróż
+      objects: Obiekty
+      celebration: Celebracja
+      custom: Spersonalizowane emoji
+      recent: Ostatnio używane
+      default_tone: Brak koloru skóry
+      light_tone: Jasny kolor skóry
+      medium_light_tone: Średnio jasny kolor skóry
+      medium_tone: Średni kolor skóry
+      medium_dark_tone: Średnio ciemny kolor skóry
+      dark_tone: Ciemny kolor skóry
     composer:
       emoji: "Emoji :)"
       more_emoji: "więcej…"
       options: "Opcje"
       whisper: "szept"
       unlist: "nie widoczny"
+      blockquote_text: "Cytat"
       add_warning: "To jest oficjalne ostrzeżenie."
       toggle_whisper: "Przełącz szept"
       toggle_unlisted: "Przycisk ukrywania"
@@ -1101,12 +1161,14 @@ pl_PL:
       similar_topics: "Twój temat jest podobny do…"
       drafts_offline: "szkice offline"
       group_mentioned:
-        one: "Wspomiinając {{group}}, powiadomisz <a href='{{group_link}}'>1 osobę</a> – czy jesteś pewien ?"
-        few: "Wspominając  {{group}}, powiadomisz <a href='{{group_link}}'>{{count}} osoby</a> –czy jesteś pewien ?"
-        other: "Wspominając  {{group}}, powiadomisz <a href='{{group_link}}'>{{count}} osób</a> –czy jesteś pewien ?"
+        one: "Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>1 osobę</a> – czy jesteś pewien?"
+        few: "Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>{{count}} osoby</a> – czy jesteś pewien?"
+        many: "Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>{{count}} osób</a> – czy jesteś pewien?"
+        other: "Wspominając {{group}}, powiadomisz <a href='{{group_link}}'>{{count}} osób</a> –czy jesteś pewien?"
       cannot_see_mention:
         category: "Wspomniałeś o {{username}} lecz nie zostaną oni powiadomieni ponieważ nie mają dostępu do tej kategorii. Dodaj ich do grupy która ma dostęp do tej kategorii."
         private: "Wspomniałeś o {{username}} lecz nie zostaną powiadomieni ponieważ nie mogą odczytać tej wiadomości . Będziesz musiał ich zaprosić do odczytania tej wiadomości "
+      duplicate_link: "Wygląda na to, że Twój link do <b>{{domain}}</b> został już wcześniej przesłany w tym wątku przez <b>@{{username}}</b> w <a href='{{post_url}}'>odpowiedzi przesłanej {{ago}}</a> - jesteś pewien, że chcesz go wysłać ponownie?"
       error:
         title_missing: "tytuł jest wymagany"
         title_too_short: "tytuł musi zawierać co najmniej {{min}} znaków"
@@ -1129,6 +1191,7 @@ pl_PL:
       edit_reason_placeholder: "powód edycji?"
       show_edit_reason: "(dodaj powód edycji)"
       topic_featured_link_placeholder: "Wstaw link pod nazwą "
+      remove_featured_link: "Usuń link z tematu."
       reply_placeholder: "Pisz w tym miejscu. Wspierane formatowanie to Markdown, BBCode lub HTML.  Możesz też przeciągnąć tu obrazek."
       view_new_post: "Zobacz Twój nowy wpis."
       saving: "Zapisywanie"
@@ -1159,12 +1222,7 @@ pl_PL:
       olist_title: "Lista numerowana"
       ulist_title: "Lista wypunktowana"
       list_item: "Element listy"
-      heading_label: "Nagłówek"
-      heading_title: "Nagłówek"
-      heading_text: "Nagłówek"
-      hr_title: "Pozioma linia"
       help: "Pomoc formatowania Markdown"
-      toggler: "ukryj lub pokaż panel kompozytora tekstu"
       modal_ok: "OK"
       modal_cancel: "Anuluj"
       cant_send_pm: "Przepraszamy, niestety nie możesz wysłać prywatnej wiadomości do %{username}."
@@ -1173,37 +1231,49 @@ pl_PL:
         body: "Aktualnie ta wiadomość będzie wysłana tylko do ciebie!"
       admin_options_title: "Opcjonalne ustawienia obsługi dla tego tematu"
     notifications:
+      tooltip:
+        regular:
+          one: "1 nieprzeczytane powiadomienie"
+          few: "Nieprzeczytanych powiadomień: {{count}}"
+          many: "Nieprzeczytanych powiadomień: {{count}}"
+          other: "Nieprzeczytanych powiadomień: {{count}}"
+        message:
+          one: "Nieodczytane wiadomości: {{count}}"
+          few: "Nieodczytane wiadomości: {{count}}"
+          many: "Nieodczytane wiadomości: {{count}}"
+          other: "Nieodczytane wiadomości: 1"
       title: "powiadomienia o wywołanej @nazwie, odpowiedzi do twoich wpisów i tematów, prywatne wiadomości, itp"
       none: "Nie udało się załadować listy powiadomień."
       empty: "Nie znaleziono powiadomień."
       more: "pokaż starsze powiadomienia"
       total_flagged: "wszystkie oflagowane wpisy"
-      mentioned: "<i title='wspomniano' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
-      group_mentioned: "<i title='wywołanie grupy' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
-      quoted: "<i title='cytat' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      replied: "<i title='odpowiedź' 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='edycja' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
-      liked: "<i title='polubienie' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
-      liked_2: "<i title='polubienie' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} oraz 1 inna osoba</span> {{description}}</p>"
-        few: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} i {{count}} innych osób</span> {{description}}</p>"
-        many: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} i {{count}} innych osób</span> {{description}}</p>"
-        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} i {{count}} innych osób</span> {{description}}</p>"
-      private_message: "<i title='prywatna wiadomość' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_private_message: "<i title='prywatna wiadomość' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_topic: "<i title='zaproszenie do tematu' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      invitee_accepted: "<i title='przyjęcie twojego zaproszenia' class='fa fa-user'></i><p><span>{{username}}</span> przyjmuje twoje zaproszenie</p>"
-      moved_post: "<i title='przeniesienie wpisu' class='fa fa-sign-out'></i><p><span>{{username}}</span> przenosi {{description}}</p>"
-      linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
-      granted_badge: "<i title='otrzymano odznakę' class='fa fa-certificate'></i><p>Otrzymujesz '{{description}}'</p>"
-      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Nowy temat</span> {{description}}</p>"
+        one: "<span>{{username}}, {{username2}} i 1 inna osoba</span> {{description}}"
+        few: "<span>{{username}}, {{username2}} i {{count}} inne osoby</span> {{description}}"
+        many: "<span>{{username}}, {{username2}} i {{count}} innych osób</span> {{description}}"
+        other: "<span>{{username}}, {{username2}} i {{count}} innych osób</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> przyjmuje twoje zaproszenie"
+      moved_post: "<span>{{username}}</span> przenosi {{description}}"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "Otrzymujesz '{{description}}'"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>Nowy temat</span> {{description}}"
       group_message_summary:
-        one: "<i title='messages in group inbox' class='fa fa-group'></i><p> masz {{count}} wiadomość w skrzynce odbiorczej {{group_name}} </p>"
-        few: "<i title='messages in group inbox' class='fa fa-group'></i><p> masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}} </p>"
-        many: "<i title='messages in group inbox' class='fa fa-group'></i><p> masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}</p>"
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}</p>"
+        one: "masz {{count}} wiadomość w skrzynce odbiorczej {{group_name}}"
+        few: "masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}"
+        many: "masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}"
+        other: "masz {{count}} wiadomości w skrzynce odbiorczej {{group_name}}"
       alt:
         mentioned: "Wywołanie przez"
         quoted: "Cytowanie przez"
@@ -1219,6 +1289,7 @@ pl_PL:
         linked: "Linkownie do twojego wpisu"
         granted_badge: "Przyznanie odznaki"
         group_message_summary: "Wiadomości w grupowej skrzynce odbiorczej"
+        topic_reminder: "Przypomnienie"
       popup:
         mentioned: '{{username}} wspomina o tobie w "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} wspomniał o Tobie w "{{topic}}" - {{site_title}}'
@@ -1241,6 +1312,7 @@ pl_PL:
       uploading: "Wgrywanie"
       select_file: "Wybierz plik"
       image_link: "odnośnik do którego Twój obraz będzie kierował"
+      default_image_alt_text: Obraz
     search:
       sort_by: "Sortuj po"
       relevance: "Trafność"
@@ -1250,18 +1322,20 @@ pl_PL:
       most_liked: "Najbardziej lajkowane"
       select_all: "Zaznacz wszystkie"
       clear_all: "Wyczyść wszystkie"
-      too_short: "Wyszukiwane określenie jest zbyt krótkie."
-      result_count:
-        one: "1 wynik dla <span class='term'>\"{{term}}\"</span>"
-        few: "{{count}} wyniki dla <span class='term'>\"{{term}}\"</span>"
-        many: "{{count}} wyników dla <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} wyników dla <span class='term'>\"{{term}}\"</span>"
+      too_short: "Wyszukiwana fraza jest zbyt krótka."
       title: "szukaj tematów, wpisów, użytkowników lub kategorii"
       no_results: "Brak wyników wyszukiwania"
       no_more_results: "Nie znaleziono więcej wyników."
       searching: "Szukam…"
       post_format: "#{{post_number}} za {{username}}"
-      results_page: "Wyniki wyszukiwania"
+      results_page: "Wyniki wyszukiwania dla '{{term}}'"
+      more_results: "Istnieje więcej wyników wyszukiwania. Doprecyzuj kryteria wyszukiwania."
+      cant_find: "Nie możesz znaleźć tego, czego szukasz?"
+      start_new_topic: "Może utwórz nowy temat?"
+      or_search_google: "Albo spróbuj wyszukać w Google:"
+      search_google: "Spróbuj wyszukać w Google:"
+      search_google_button: "Google"
+      search_google_title: "Przeszukaj tę stronę"
       context:
         user: "Szukaj wpisów @{{username}}"
         category: "Szukaj w kategorii #{{category}}"
@@ -1271,21 +1345,18 @@ pl_PL:
         title: Zaawansowane wyszukiwanie
         posted_by:
           label: Wysłane przez
-        in_category:
-          label: W kategorii
         in_group:
           label: W grupie
         with_badge:
           label: Z odnaką
         with_tags:
-          label: Z tagami
+          label: Otagowane
         filters:
-          label: Pokaż tylko tematy/posty które...
           likes: Lubię
           posted: Opublikowałem w
           watching: Obserwuję
           tracking: Śledzę
-          private: są w moich wiadomościach
+          private: W moich wiadomościach
           bookmarks: Dodałeś do zakładek
           first: 'tylko najnowsze posty '
           pinned: są przypięte
@@ -1293,6 +1364,8 @@ pl_PL:
           seen: Przeczytałem
           unseen: Nie przeczytałem
           wiki: są postami wiki
+          images: Zawiera obrazki
+          all_tags: Zawiera wszystkie tagi
         statuses:
           label: Tematy gdzie
           open: są otwarte
@@ -1318,6 +1391,7 @@ pl_PL:
         select_all: "Zaznacz wszystkie"
         clear_all: "Wyczyść wszystko"
         unlist_topics: "Ukryj tematy"
+        relist_topics: "Odśwież listę tematów"
         reset_read: "Wyzeruj przeczytane"
         delete: "Usuń tematy"
         dismiss: "Wyczyść"
@@ -1328,8 +1402,10 @@ pl_PL:
         dismiss_new: "Wyczyść nowe"
         toggle: "włącz grupowe zaznaczanie tematów"
         actions: "Operacje grupowe"
+        change_category: "Ustaw kategorię"
         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."
@@ -1373,6 +1449,7 @@ pl_PL:
       filter_to:
         one: "1 post w temacie"
         few: "{{count}} posty w temacie"
+        many: "{{count}} postów w temacie"
         other: "{{count}} postów w temacie"
       create: 'Nowy temat'
       create_long: 'Utwórz nowy temat'
@@ -1441,15 +1518,26 @@ pl_PL:
       jump_reply_down: przeskocz do późniejszej odpowiedzi
       deleted: "Temat został usunięty"
       topic_status_update:
-        title: "Ustaw ważność wątku"
-        save: "Ustaw czasd"
+        save: "Ustaw czas"
         num_of_hours: "Liczba godzin:"
         remove: "Usuń czas"
         publish_to: "Opublikuj do:"
         when: "Kiedy:"
       auto_update_input:
+        none: "Wybierz przedział czasowy"
+        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ń"
+        two_weeks: "Dwa tygodnie"
+        next_month: "Następny miesiąc"
+        three_months: "Trzy miesiące"
+        six_months: "Sześć miesięcy"
+        one_year: "Jeden rok"
+        forever: "Zawsze"
         pick_date_and_time: "Wybierz datę i czas"
+        set_based_on_last_post: "Zamknij na podstawie ostatniego postu"
       publish_to_category:
         title: "Zaplanuj publikację"
       temp_open:
@@ -1462,15 +1550,23 @@ 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"
+      reminder:
+        title: "Przypomnij mi"
       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_reminder: "Otrzymasz przypomnienie o tym temacie %{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."
-        few: "Ostatni wpis w tym temacie został zamieszczony %{hours} godzin temu, więc zostanie on natychmiastowo zamknięty."
+        few: "Ostatni wpis w tym temacie został zamieszczony %{hours} godziny temu, więc zostanie on natychmiastowo zamknięty."
+        many: "Ostatni wpis w tym temacie został zamieszczony %{count} godzin temu, więc zostanie on natychmiastowo zamknięty."
         other: "Ostatni wpis w tym temacie został zamieszczony %{hours} godzin temu, więc zostanie on natychmiastowo zamknięty."
       timeline:
         back: "Wstecz"
@@ -1626,6 +1722,7 @@ pl_PL:
         success_email: "Wysłaliśmy zaproszenie do <b>{{emailOrUsername}}</b>. Otrzymasz powiadomienie, gdy zaproszenie zostanie przyjęte. Sprawdź zakładkę zaproszenia w swoim profilu, aby śledzić status tego i innych zaproszeń."
         success_username: "Wskazany użytkownik został zaproszony do udziału w tym temacie."
         error: "Przepraszamy, nie udało się zaprosić wskazanej osoby. Być może została już zaproszona? (Lub wysyłasz zbyt wiele zaproszeń)"
+        success_existing_email: "Użytkownik o e-mailu <b>{{emailOrUsername}}</b> już istnieje. Zaprosiliśmu tego użytkownika do udziału w tym temacie."
       login_reply: 'Zaloguj się, aby odpowiedzieć'
       filters:
         n_posts:
@@ -1678,7 +1775,12 @@ pl_PL:
       multi_select:
         select: 'wybierz'
         selected: 'wybrano ({{count}})'
-        select_replies: 'wybierz +replies'
+        select_post:
+          label: 'wybierz'
+          title: 'Dodaj wpis do zaznaczenia'
+        selected_post:
+          label: 'zaznaczone'
+          title: 'Kliknij aby usunąć post z zaznaczenia'
         delete: usuń wybrane
         cancel: anuluj wybieranie
         select_all: zaznacz wszystkie
@@ -1692,7 +1794,6 @@ pl_PL:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Cytuj"
-      edit: "Edycja {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Powód"
       post_number: "wpis {{number}}"
       wiki_last_edited_on: "wiki ostatnio edytowane w"
@@ -1765,6 +1866,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"
@@ -1772,13 +1874,7 @@ pl_PL:
         share: "udostępnij odnośnik do tego wpisu"
         more: "Więcej"
         delete_replies:
-          confirm:
-            one: "Czy chcesz usunąć również bezpośrednią odpowiedź na ten wpis?"
-            few: "Czy chcesz usunąć również {{count}} bezpośrednie odpowiedzi na ten wpis?"
-            many: "Czy chcesz usunąć również {{count}} bezpośrednich odpowiedzi na ten wpis?"
-            other: "Czy chcesz usunąć również {{count}} bezpośrednich odpowiedzi na ten wpis?"
-          yes_value: "Tak, usuń też odpowiedzi"
-          no_value: "Nie, tylko ten wpis"
+          just_the_post: "Nie, tylko ten post"
         admin: "administracja wpisem (tryb wiki itp)"
         wiki: "Włącz tryb Wiki"
         unwiki: "Wyłącz tryb Wiki"
@@ -1790,10 +1886,10 @@ pl_PL:
       actions:
         flag: 'Oflaguj'
         defer_flags:
-          one: "Odrocz flagę"
-          few: "Odrocz flagi"
-          many: "Odrocz flagi"
-          other: "Odrocz flagi"
+          one: "Ignoruj flagę"
+          few: "Ignoruj oflagowanie"
+          many: "Ignoruj flagi"
+          other: "Ignoruj flagi"
         undo:
           off_topic: "Cofnij flagę"
           spam: "Cofnij flagę"
@@ -1901,18 +1997,12 @@ pl_PL:
             few: "{{count}} osoby zagłosowały za tym wpisem"
             many: "{{count}} osób zagłosowało za tym wpisem"
             other: "{{count}} osób zagłosowało za tym wpisem"
-      delete:
-        confirm:
-          one: "Jesteś pewny(-a), że chcesz usunąć ten wpis?"
-          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?"
+          one: "Czy na pewno chcesz połączyć te posty?"
+          few: "Czy na pewno chcesz połączyć te {{count}} postów?"
+          many: "Czy na pewno chcesz połączyć te {{count}} postów?"
+          other: "Czy na pewno chcesz połączyć te {{count}} postów?"
       revisions:
         controls:
           first: "Pierwsza wersja"
@@ -1958,8 +2048,8 @@ 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_allowed_tags: "Zezwól jedynie na użycie następujących tagów w tej kategorii:"
+      tags_allowed_tag_groups: "Zezwól jedynie na użycie tagów z następujących grup 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"
@@ -2002,6 +2092,7 @@ pl_PL:
       subcategory_list_style: "Styl listy podkategorii:"
       sort_order: "Sortuj listę wątków po:"
       default_view: "Domyślna lista wątków:"
+      default_top_period: "Domyślny okres wyświetlania najlepszych postów:"
       allow_badges_label: "Włącz przyznawanie odznak na podstawie aktywności w tej kategorii"
       edit_permissions: "Edytuj uprawnienia"
       add_permission: "Dodaj uprawnienie"
@@ -2042,6 +2133,7 @@ pl_PL:
       subcategory_list_styles:
         rows: "Rzędy"
         rows_with_featured_topics: "Rzędy z wybranymi tematami"
+        boxes: "Pudełka"
         boxes_with_featured_topics: "Ramki z wybranymi tematami"
     flagging:
       title: 'Dziękujemy za pomoc w utrzymaniu porządku w naszej społeczności!'
@@ -2066,16 +2158,19 @@ pl_PL:
       custom_placeholder_notify_moderators: "Dlaczego ten wpis wymaga uwagi moderatora? Opisz co konkretnie Cię zaniepokoiło i jeśli to możliwe umieść odpowiednie odnośniki."
       custom_message:
         at_least:
-          one: "wprowadz co najmniej 1 znak"
-          few: "wprowadz co najmniej {{count}} znaki"
-          other: "wprowadz co najmniej {{count}} znaków"
+          one: "wprowadź co najmniej 1 znak"
+          few: "wprowadź co najmniej {{count}} znaki"
+          many: "wprowadź co najmniej {{count}} znaków"
+          other: "wprowadź co najmniej {{count}} znaków"
         more:
           one: " pozostał 1"
           few: "pozostały {{count}}"
+          many: "pozostało {{count}}"
           other: "pozostało {{count}} "
         left:
           one: "1 pozostał"
           few: "{{count}} pozostało"
+          many: "{{count}} pozostało"
           other: "{{count}} pozostało"
     flagging_topic:
       title: "Dziękujemy za pomoc w utrzymaniu porządku w naszej społeczności!"
@@ -2096,6 +2191,7 @@ pl_PL:
       title:
         one: "jeszcze 1"
         few: "%{count} jeszcze"
+        many: "%{count} jeszcze"
         other: "%{count} jeszcze"
     topic_statuses:
       warning:
@@ -2138,6 +2234,7 @@ pl_PL:
     views_long:
       one: "ten temat był przeglądany 1 raz"
       few: "ten temat był przeglądany {{number}} razy"
+      many: "ten temat był przeglądany {{number}} razy"
       other: "ten temat był przeglądany {{number}} razy"
     activity: "Aktywność"
     likes: "Lajki"
@@ -2281,7 +2378,7 @@ pl_PL:
         hamburger_menu: '<b>=</b> Otwórz menu'
         user_profile_menu: '<b>p</b> Otwórz menu użytkownika'
         show_incoming_updated_topics: '<b>.</b> Pokaż zaktualizowane tematy'
-        search: '<b>/</b> Wyszukaj'
+        search: '<b>/</b> lub <b>ctrl</b>+<b>alt</b>+<b>f</b> Wyszukaj'
         help: '<b>?</b> Pokaż skróty klawiszowe'
         dismiss_new_posts: '<b>x</b>, <b>r</b> wyczyść listę wpisów'
         dismiss_topics: '<b>x</b>, <b>t</b> wyczyść listę tematów'
@@ -2315,6 +2412,8 @@ pl_PL:
       granted_on: "Przyznano %{date}"
       others_count: "Inni użytkownicy z tą odznaką (%{count})"
       title: Odznaki
+      allow_title: "Możesz użyc tej odznaki jako tytułu"
+      multiple_grant: "Możesz zdobyć tą odznakę wiele razy"
       badge_count:
         one: "1 odznaka"
         few: "%{count} odznak"
@@ -2358,9 +2457,8 @@ pl_PL:
       selector_no_tags: "brak tagów"
       changed: "zmienione tagi:"
       tags: "Tagi"
-      choose_for_topic: "Wybierz opcjonalne tagi dla tych tematów:"
+      choose_for_topic: "tagi opcjonalne"
       delete_tag: "Usuń Tag"
-      delete_confirm: "Czy na pewno chcesz usunąć ten tag?"
       rename_tag: "Zmień nazwę taga"
       rename_instructions: "Wybierz nową nazwę dla tego taga:"
       sort_by: "Sortuj po:"
@@ -2455,7 +2553,6 @@ pl_PL:
         no_problems: "Nie znaleziono problemów."
         moderators: 'Moderatorzy:'
         admins: 'Adminstratorzy:'
-        blocked: 'Zablokowani:'
         suspended: 'Zawieszeni:'
         private_messages_short: "Wiad."
         private_messages_title: "Wiadomości"
@@ -2488,24 +2585,21 @@ pl_PL:
         by: "przez"
       flags:
         title: "Flagi"
-        old: "Stare"
-        active: "Aktywność"
+        active_posts: "Ofllagowane wpisy"
+        old_posts: "Stare oflagowane wpisy"
+        topics: "Oflagowane tematy"
+        moderation_history: "Historia moderacji"
         agree: "Potwierdź"
         agree_title: "Potwierdź to zgłoszenie jako uzasadnione i poprawne"
-        agree_flag_modal_title: "Potwierdź i…"
-        agree_flag_hide_post: "Potwierdź (ukryj post i wyślij PW)"
-        agree_flag_hide_post_title: "Ukryj ten wpis i automatycznie wyślij użytkownikowi  wiadomość informującą, że wpis wymaga przeredagowania"
-        agree_flag_restore_post: "Zgoda (przywróć wpis)"
-        agree_flag_restore_post_title: "Przywróć ten wpis"
-        agree_flag: "Potwierdź flagę"
-        agree_flag_title: "Potwierdź flagę i zostaw wpis bez zmian"
-        defer_flag: "Zignoruj"
+        agree_flag_hide_post: "Potwierdź i ukryj post"
+        agree_flag_restore_post: "Potwierdź i przywróć post"
+        agree_flag: "Potwierdź i zachowaj post"
+        defer_flag: "Ignoruj"
         defer_flag_title: "Usunięcie flagi z twojej listy, nie wymaga dalszych działań."
         delete: "Usuń"
         delete_title: "Usuń wpis do którego odnosi się flaga."
-        delete_post_defer_flag: "Usuń wpis i zignoruj flagę"
+        delete_post_defer_flag: "Usuń post i ignoruj flagę"
         delete_post_defer_flag_title: "Usuń wpis. Jeśli jest pierwszym w temacie, usuń temat."
-        delete_post_agree_flag: "Usuń post i potwierdź flagę"
         delete_post_agree_flag_title: "Usuń wpis. Jeśli jest pierwszym w temacie, usuń temat."
         delete_flag_modal_title: "Usuń i…"
         delete_spammer: "Usuń spamera"
@@ -2517,47 +2611,36 @@ pl_PL:
         clear_topic_flags: "Zrobione"
         clear_topic_flags_title: "Ten temat został sprawdzony i związane z nim problemy zostały rozwiązane. Kliknij Zrobione, aby usunąć flagi."
         more: "(więcej odpowiedzi…)"
+        suspend_user: "Zawieszony użytkownik"
+        suspend_user_title: "Zawieś użytkownika za ten wpis"
         dispositions:
           agreed: "potwierdzono"
           disagreed: "wycofano"
-          deferred: "zignorowano"
+          deferred: "ignorowane"
         flagged_by: "Oflagowano przez"
         resolved_by: "Rozwiązano przez"
         took_action: "Podjęto działanie"
         system: "System"
         error: "Coś poszło nie tak"
         reply_message: "Odpowiedz"
-        no_results: "Nie ma flag."
+        no_results: "Nie ma żadnych oflagowanych wpisów."
         topic_flagged: "Ten <strong>temat</strong> został oflagowany."
+        show_full: "pokaż cały wpis"
         visit_topic: "Odwiedź temat by podjąć działania."
         was_edited: "Wpis został zmieniony po pierwszej fladze"
         previous_flags_count: "Ten wpis został do tej pory oznaczony flagą {{count}} razy."
-        summary:
-          action_type_3:
-            one: "nie-na-temat"
-            few: "nie-na-temat x{{count}}"
-            many: "nie-na-temat x{{count}}"
-            other: "nie-na-temat x{{count}}"
-          action_type_4:
-            one: "nieodpowiednie"
-            few: "nieodpowiednie x{{count}}"
-            many: "nieodpowiednie x{{count}}"
-            other: "nieodpowiednie x{{count}}"
-          action_type_6:
-            one: "niestandardowy"
-            few: "niestandardowe x{{count}}"
-            many: "niestandardowych x{{count}}"
-            other: "niestandardowych x{{count}}"
-          action_type_7:
-            one: "niestandardowy"
-            few: "niestandardowe x{{count}}"
-            many: "niestandardowych x{{count}} "
-            other: "niestandardowych x{{count}} "
-          action_type_8:
-            one: "spam"
-            few: "spam x{{count}}"
-            many: "spam x{{count}}"
-            other: "spam x{{count}}"
+        show_details: "Pokaż szczegóły oflagowania"
+        details: "szczegóły"
+        flagged_topics:
+          topic: "Temat"
+          type: "Typ"
+          users: "Użytkownicy"
+          last_flagged: "Ostatnio Oflagowane"
+        short_names:
+          inappropriate: "niewłaściwy"
+          spam: "spam"
+          notify_user: "niestandardowe"
+          notify_moderators: "niestandardowe"
       groups:
         primary: "Główna grupa"
         no_primary: "(brak podstawowej grupy)"
@@ -2626,6 +2709,7 @@ pl_PL:
         event_type_missing: "Musisz ustawić co najmniej jeden typ wydarzenia."
         content_type: "Typ zawartości "
         secret: "Tajemnica"
+        event_chooser: "Jakie zdarzenia powinny wywołać uruchomienie tego webhooka?"
         wildcard_event: "Wysyłaj mi wszystko."
         individual_event: "Wybierz indywidualne zdarzenia"
         verify_certificate: "Sprawdź certyfikat TLS zawarty w url"
@@ -2644,7 +2728,6 @@ pl_PL:
           details: "Kiedy pojawia się nowa odpowiedź, edytuj, usuń lub odzyskaj."
         user_event:
           name: "Wydarzenie użytkownika"
-          details: "Gdy użytkownik jest utworzony, zatwierdzony lub zaktualizowany. "
         delivery_status:
           title: "Status dostarczenia"
           inactive: "Nieaktywny"
@@ -2656,14 +2739,16 @@ pl_PL:
           incoming:
             one: "Istnieje nowe wydarzenie "
             few: "Istnieją {{count}} nowe wydarzenia. "
+            many: "Istnieje {{count}} nowych wydarzeń."
             other: "Istnieje {{count}} nowych wydarzeń. "
           completed_in:
             one: "Ukończono w 1 sekundę."
-            few: "Ukończono w  {{count}} sekundy."
-            other: "Ukończono w  {{count}} sekund."
+            few: "Ukończono w {{count}} sekundy."
+            many: "Ukończono w {{count}} sekund."
+            other: "Ukończono w {{count}} sekund."
           request: "Żądanie"
           response: "Odpowiedź"
-          redeliver_confirm: "Czy jesteś pewien, że chcesz dostarczyć ponownie tą samą zawartość ?"
+          redeliver_confirm: "Czy jesteś pewien, że chcesz dostarczyć ponownie tą samą zawartość?"
           headers: "Nagłówki"
           payload: "Zawartość"
           body: "Body"
@@ -2682,7 +2767,7 @@ pl_PL:
         name: "Nazwa"
         none_installed: "Brak zainstalowanych wtyczek."
         version: "Wersja"
-        enabled: "Włączono?"
+        enabled: "Włączona?"
         is_enabled: "T"
         not_enabled: "N"
         change_settings: "Zmień ustawienia"
@@ -2774,6 +2859,7 @@ pl_PL:
         copy_to_clipboard: "Skopiuj do schowka"
         copied_to_clipboard: "Tekst skopiowany do schowka."
         copy_to_clipboard_error: "Wystąpił błąd w trakcie kopiowania do schowka."
+        theme_owner: "Nie możliwe do edycji, należy do:"
         email_templates:
           title: "Szablony email"
           subject: "Temat"
@@ -2786,8 +2872,10 @@ pl_PL:
           import_theme: "Importuj motyw"
           customize_desc: "Personalizacja:"
           title: "Motywy"
+          long_title: "Zmodyfikuj kolory, kod CSS i kod HTML zawartości Twojej strony"
           edit: "Edytuj"
           edit_confirm: "To jest zdalny styl. Jeśli edytujesz CSS/HTML, twoje zmiany zostaną usunięte po ponownej aktualizacji motywu."
+          common: "Częste"
           desktop: "Komputer"
           mobile: "Mobilnie"
           preview: "Podgląd"
@@ -2795,24 +2883,34 @@ pl_PL:
           user_selectable: "Motyw może być ustawiany przez użytkowników"
           color_scheme: "Schemat kolorów"
           color_scheme_select: "Wybierz kolory, jakie mają być użyte w motywie"
+          custom_sections: "Spersonalizowane sekcje:"
           theme_components: "Komponenty motywu"
+          uploads: "Pliki"
           no_uploads: "Możesz załadować zasoby do swojego motywu np. fonty lub obrazy"
+          add_upload: "Dodaj plik"
+          upload_file_tip: "Wybierz plik do wysłania (png, woff2, itp.)"
+          variable_name: "Nazwa zmiennej SCSS:"
+          upload: "Plik"
+          child_themes_check: "Motyw importuje zawartość innych motywów"
           css_html: "Własny CSS/HTML"
           edit_css_html: "Edytuj CSS/HTML"
           edit_css_html_help: "Nie modyfikowałeś CSS ani HTML"
           delete_upload_confirm: "Czy usunąć ten plik? (CSS motywu może przestać działać!)"
+          import_web_tip: "Repozytorium zawierające motyw"
+          import_file_tip: "Plik .dcstyle.json zawierający motyw"
           about_theme: "O motywie"
           license: "Licencja"
+          component_of: "Motyw jest częścią:"
           update_to_latest: "Aktualizuj do najnowszego"
           check_for_updates: "Sprawdź dostępność aktualizacji"
           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!"
+            one: "Motyw jest 1 aktualizację w tyle!"
+            few: "Motyw jest {{count}} aktualizacji w tyle!"
+            many: "Motyw jest {{count}} aktualizacji w tyle!"
+            other: "Motyw jest {{count}} aktualizacji w tyle!"
           scss:
             text: "CSS"
             title: "Wstaw własny CSS, przyjmujemy wszystkie prawidłowe style CSS i SCSS"
@@ -2827,6 +2925,7 @@ pl_PL:
             title: "Wstaw kod HTML do wyświetlenia w stopce strony"
           embedded_scss:
             text: "Osadzony CSS"
+            title: "Podaj spersonalizowany kod CSS dostarczany w ramkowej wersji komentarzy"
           head_tag:
             text: "</head>"
             title: "HTML, który zostanie umieszczony przed tagiem </head>"
@@ -2941,6 +3040,15 @@ pl_PL:
             type_placeholder: "streszczenie, rejestracja…"
             reply_key_placeholder: "klucz odpowiedzi"
             skipped_reason_placeholder: "powód"
+      moderation_history:
+        performed_by: "Wykonane przez"
+        no_results: "Brak dostępnej historii moderacji."
+        actions:
+          delete_user: "Użytkownik usunięty"
+          suspend_user: "Użytkownik zawieszony"
+          silence_user: "Użytkownik wyciszony"
+          delete_post: "Wpis usunięty"
+          delete_topic: "Temat usunięty"
       logs:
         title: "Logi"
         action: "Działanie"
@@ -2958,6 +3066,8 @@ pl_PL:
           block: "blok"
           do_nothing: "nic nie rób"
         staff_actions:
+          all: "wszystkie"
+          filter: "Filtruj:"
           title: "Działania obsługi"
           clear_filters: "Pokaż wszystko"
           staff_user: "Użytkownik obsługi"
@@ -2994,8 +3104,7 @@ pl_PL:
             change_category_settings: "zmiana ustawień kategorii"
             delete_category: "Usuń kategorię"
             create_category: "Dodaj nową kategorię"
-            block_user: "zablokuj użytkownika"
-            unblock_user: "odblokuj użytkownika"
+            silence_user: "wycisz użytkownika"
             grant_admin: "nadaj prawa admina"
             revoke_admin: "odbierz prawa admina"
             grant_moderation: "Przyznaj status moderatora"
@@ -3011,6 +3120,8 @@ pl_PL:
             change_readonly_mode: "Zmień tryb tylko do otczytu"
             backup_download: "Pobierz kopię zapasową"
             backup_destroy: "Zniszcz kopię zapasową "
+            reviewed_post: "przejrzane posty"
+            custom_staff: "spersonalizowana akcja wtyczki"
         screened_emails:
           title: "Ekranowane emaile"
           description: "Kiedy ktoś próbuje założyć nowe konto, jego adres email zostaje sprawdzony i rejestracja zostaje zablokowana, lub inna akcja jest podejmowana."
@@ -3041,8 +3152,46 @@ pl_PL:
           roll_up:
             text: "Zgrupuj"
             title: "Tworzy nowy ban dla podsieci jeśli jest co najmniej  'min_ban_entries_for_roll_up' pozycji."
+        search_logs:
+          title: "Logi wyszukiwań"
+          term: "Szukana fraza"
+          searches: "Wyszukiwania"
+          click_through: "Kliknij przez"
+          unique: "Unikalny"
+          types:
+            all_search_types: "Wszystkie typy wyszukiwania"
+            header: "Nagłówek"
+            full_page: "Pełna strona"
         logster:
           title: "Logi błędów"
+      watched_words:
+        title: "Obserwowane słowa"
+        search: "szukaj"
+        clear_filter: "Wyczyść"
+        show_words: "pokaż słowa"
+        word_count:
+          one: "1 słowo"
+          few: "%{count} słówa"
+          many: "%{count} słów"
+          other: "%{count} słów"
+        actions:
+          block: 'Zablokuj'
+          censor: 'Cenzuruj'
+          require_approval: 'Wymaga zatwierdzenia'
+          flag: 'Oflaguj'
+        action_descriptions:
+          block: 'Zapobiegaj publikacji postów zawierających te słowa. Użytkownicy zobaczą błąd próbując wysłać taki post.'
+          censor: 'Zezwalaj na wysyłanie postów zawierających te słowa, ale zamień na znaki ukrywające ocenzurowane słowa.'
+          require_approval: 'Posty zawierające te słowa będą wymagały zatwierdzenia przez moderatora zanim zostaną opublikowane.'
+          flag: 'Zezwalaj na publikację takich postów, ale oflaguj je jako nieodpowiednie, aby moderatorzy mogli przejrzeć ich zawartość.'
+        form:
+          label: 'Nowe słowo:'
+          placeholder: 'pełne słowo lub jako dzika karta'
+          placeholder_regexp: "wyrażenie regularne"
+          add: 'Dodaj'
+          success: 'Sukces'
+          upload: "Prześlij"
+          upload_successful: "Przesyłanie zakończone sukcesem. Słowa zostały dodane."
       impersonate:
         title: "Zaloguj się na to konto"
         help: "Użyj tego narzędzia, aby logować się jako dowolny użytkownik w celach diagnozy problemów."
@@ -3062,7 +3211,7 @@ pl_PL:
           pending: "Oczekujący"
           staff: 'Zespół'
           suspended: 'Zawieszeni'
-          blocked: 'Zablokowani'
+          silenced: 'Wyciszony'
           suspect: 'Podejrzani'
         approved: "Zatwierdzam?"
         approved_selected:
@@ -3087,7 +3236,7 @@ pl_PL:
           staff: "Zespół"
           admins: 'Administratorzy'
           moderators: 'Moderatoratorzy'
-          blocked: 'Zablokowane konta'
+          silenced: 'Wyciszeni użytkownicy'
           suspended: 'Zawieszone konta'
           suspect: 'Podejrzani użytkownicy'
         reject_successful:
@@ -3108,18 +3257,30 @@ pl_PL:
         suspend_failed: "Coś poszło nie tak podczas zawieszania użytkownika {{error}}"
         unsuspend_failed: "Coś poszło nie tak podczas odwieszania użytkownika {{error}}"
         suspend_duration: "Jak długo użytkownik ma być zawieszony?"
-        suspend_duration_units: "(dni)"
         suspend_reason_label: "Dlaczego zawieszasz? Ten tekst <b>będzie widoczny dla wszystkich</b> na stronie profilu użytkownika i będzie wyświetlany użytkownikowi gdy ten będzie próbował się zalogować. Zachowaj zwięzłość."
+        suspend_reason_hidden_label: "Dlaczego zawieszasz użytkownika? Ten krótki tekst zostanie wyświetlony, gdy zawieszony użytkownik spróbuje się zalogować. "
         suspend_reason: "Powód"
+        suspend_reason_placeholder: "Powód zawieszenia"
+        suspend_message: "Wiadomość Email"
+        suspend_message_placeholder: "Ewentualnie podaj więcej informacji o zawieszeniu użytkownika, a zostaną wysłane do niego poprzez email."
         suspended_by: "Zawieszony przez"
+        silence_reason: "Powód"
+        silenced_by: "Wyciszony przez"
+        silence_modal_title: "Wycisz użytkownika"
+        silence_duration: "Jak długo użytkownik będzie wyciszany?"
+        silence_reason_label: "Dlaczego uciszasz tego użytkownika?"
+        silence_reason_placeholder: "Powód wyciszenia"
+        silence_message: "Wiadomość Email"
+        silence_message_placeholder: "(zostaw puste aby wysłać domyślną wiadomość)"
+        suspended_until: "(do %{until})"
+        cant_suspend: "Nie można zawiesić tego użytkownika."
         delete_all_posts: "Usuń wszystkie wpisy"
-        delete_all_posts_confirm_MF: "Żamierzasz usunąć {POSTS, plural, one {1 post} other {# posts}} i {TOPICS, plural, one {1 topic} other {# topics}}. Czy jesteś pewien ?"
-        suspend: "Zawieś"
-        unsuspend: "Odwieś"
-        suspended: "Zawieszony?"
+        delete_all_posts_confirm_MF: "Zamierzasz usunąć {POSTS, plural, one {1 post} few {# posty} many {# postów} other {# postów}} i {TOPICS, plural, one {1 temat} few {# tematy} many {# tematów} other {# tematów}}. Czy jesteś pewien?"
+        silence: "Wycisz"
+        silenced: "Wyciszony?"
         moderator: "Moderator?"
         admin: "Admin?"
-        blocked: "Zablokowany?"
+        suspended: "Zawieszony?"
         staged: "Wystawiony?"
         show_admin_profile: "Admin"
         refresh_browsers: "Wymuś odświeżenie przeglądarki"
@@ -3135,8 +3296,8 @@ pl_PL:
         grant_admin_confirm: "Wysłaliśmy adres email, aby zweryfikować nowego administratora. Zapoznaj się z instrukcjami w nim zawartymi."
         revoke_moderation: 'Odbierz status moderatora'
         grant_moderation: 'Przyznaj status moderatora'
-        unblock: 'Odblokuj'
-        block: 'Blokuj'
+        unsuspend: 'Odwieś'
+        suspend: 'Zawieś'
         reputation: Reputacja
         permissions: Uprawnienia
         activity: Aktywność
@@ -3189,17 +3350,16 @@ pl_PL:
         activate_failed: "Wystąpił problem przy aktywacji konta użytkownika."
         deactivate_account: "Deaktywuj konto"
         deactivate_failed: "Wystąpił problem przy deaktywacji konta użytkownika."
-        unblock_failed: 'Wystąpił problem podczaj odblokowania użytkownika.'
-        block_failed: 'Wystąpił problem podczas blokowania użytkownika.'
-        block_confirm: 'Czy na pewno chcesz zablokować tego użytkownika ? Nie będzie już mógł tworzyć nowych tematów ani pisać postów.'
-        block_accept: 'Tak, zablokuj tego użytkownika'
+        silence_failed: 'Wystąpił problem podczas wyciszania użytkownika.'
+        silence_accept: 'Tak, ucisz tego użytkownika'
         bounce_score: "Wskaźnik odbić"
         reset_bounce_score:
           label: "Przywróć"
           title: "Przywróć stan licznika zwrotów z powrotem do wartości 0"
+        visit_profile: "Odwiedź <a href='%{url}'>ustawienia tego użytkownika</a>, aby zedytować jego profil."
         deactivate_explanation: "Wymusza ponowne potwierdzenie adresu email tego konta."
         suspended_explanation: "Zawieszony użytkownik nie może się logować."
-        block_explanation: "Zablokowany użytkownik nie może tworzyć wpisów ani zaczynać tematów."
+        silence_explanation: "Wyciszony użytkownik nie może publikować ani tworzyć tematów."
         staged_explanation: "Etapowy użytkownik może pisać tylko za pośrednictwem poczty email w konkretnych tematach."
         bounce_score_explanation:
           none: "Z tego adresu email nie otrzymano ostatnio żadnych wiadomości zwrotnych."
@@ -3319,6 +3479,7 @@ pl_PL:
           developer: 'Deweloperskie'
           embedding: "Osadzanie"
           legal: "Prawne"
+          api: 'API'
           user_api: 'API użytkownika'
           uncategorized: 'Inne'
           backups: "Kopie zapasowe"
@@ -3411,6 +3572,7 @@ pl_PL:
         sample: "Użyj poniższego kodu HTML na swojej stronie, aby osadzić tematy z Discourse. Zastąp <b>REPLACE_ME</b> domyślnym adresem URL strony na której osadzasz."
         title: "Osadzanie"
         host: "Dozwolone hosty"
+        class_name: "Nazwa klasy"
         path_whitelist: "Ścieżka białej listy"
         edit: "edytuj"
         category: "Publikuj w kategorii"
@@ -3430,6 +3592,7 @@ pl_PL:
         embed_classname_whitelist: "Dozwolone nazwy klas CSS"
         feed_polling_enabled: "Importowanie wpisów via RSS/ATOM"
         feed_polling_url: "URL kanału RSS/ATOM"
+        feed_polling_frequency_mins: "Częstotliwość aktualizacji strony (w minutach)"
         save: "Zapisz"
       permalink:
         title: "Permalinki"
@@ -3456,10 +3619,10 @@ pl_PL:
       uploading: "Wysyłanie…"
       quit: "Może później"
       staff_count:
-        one: "W twojej społeczności jest 1 pracownik."
-        few: "W twojej społeczności jest %{count} pracowników."
-        many: "W twojej społeczności jest %{count} pracowników."
-        other: "W twojej społeczności jest %{count} pracowników."
+        one: "W twojej społeczności jest 1 członek załogi (Ty)."
+        few: "W twojej społeczności jest %{count} członków załogi, w tym Ty."
+        many: "W twojej społeczności jest %{count} członków załogi, w tym Ty."
+        other: "W twojej społeczności jest %{count}członków załogi, w tym  Ty."
       invites:
         add_user: "dodaj"
         none_added: "Nie zaprosiłeś nikogo. Czy na pewno chcesz kontynuować?"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 769b991754..08e25bb819 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -101,7 +101,6 @@ pt:
           other: "%{count} anos mais tarde"
       previous_month: 'Mês Anterior'
       next_month: 'Mês Seguinte'
-      placeholder: Escolha uma data
     share:
       topic: 'partilhar uma ligação para este tópico'
       post: 'publicação #%{postNumber}'
@@ -145,20 +144,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,48 +347,51 @@ 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)"
+      public_exit: "Permitir que os utilizadores deixem o grupo livremente"
       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"
-      leave: "Sair do Grupo"
-      request: "Pedir para Entrar no Grupo."
+      join: "Aderir ao Grupo"
+      leave: "Deixar o Grupo"
+      request: "Pedir para Aderir ao Grupo"
+      message: "Mensagem"
       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_request:
+        submit: "Submeter Pedido"
+        title: "Peça para aderir ao @%{group_name}"
+        reason: "Permita que os donos de grupo saibam porque é que pertence a este 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"
         only_admins: "Apenas administradores"
         mods_and_admins: "Apenas moderadores e Administradores"
@@ -416,9 +418,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"
@@ -473,6 +477,7 @@ pt:
       topics_entered: "tópicos inseridos"
       post_count: "# publicações"
       confirm_delete_other_accounts: "Tem a certeza que quer apagar estas contas?"
+      powered_by: "desenvolvido por <a href='https://ipinfo.io'>ipinfo.io</a>"
     user_fields:
       none: "(selecione uma opção)"
     user:
@@ -481,10 +486,10 @@ pt:
       mute: "Silenciar"
       edit: "Editar Preferências"
       download_archive:
-        button_text: "Descarregar As Minhas Publicações"
-        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ã."
+        button_text: "Transferir Tudo"
+        confirm: "Tem a certeza que deseja transferir as suas publicações?"
+        success: "Transferência iniciada, será notificado via mensagem assim que o processo estiver concluído."
+        rate_limit_error: "As publicações podem ser transferidas uma vez por dia, por favor, tente novamente amanhã."
       new_private_message: "Nova Mensagem"
       private_message: "Mensagem"
       private_messages: "Mensagens"
@@ -518,7 +523,6 @@ pt:
       admin: "{{user}} é um administrador"
       moderator_tooltip: "Este utilizador é um moderador"
       admin_tooltip: "Este utilizador é um administrador"
-      blocked_tooltip: "Este utilizador está bloqueado"
       suspended_notice: "Este utilizador está suspenso até {{date}}."
       suspended_reason: "Motivo: "
       github_profile: "Github"
@@ -561,6 +565,7 @@ pt:
       muted_users_instructions: "Suprimir todas as notificações destes utilizadores."
       muted_topics_link: "Mostrar tópicos silenciados"
       watched_topics_link: "Mostrar tópicos vigiados"
+      tracked_topics_link: "Mostrar tópicos monitorizados"
       automatically_unpin_topics: "Desafixar tópicos automaticamente quando eu chegar ao final."
       apps: "Aplicações"
       revoke_access: "Rescindir Acesso"
@@ -584,6 +589,15 @@ pt:
         move_to_archive: "Arquivo"
         failed_to_move: "Falha ao mover as mensagens selecionadas (talvez a sua rede esteja em baixo)"
         select_all: "Selecionar Tudo"
+      preferences_nav:
+        account: "Conta"
+        profile: "Perfil"
+        emails: "E-mails"
+        notifications: "Notificações"
+        categories: "Categorias"
+        tags: "Etiquetas"
+        interface: "Interface"
+        apps: "Aplicações"
       change_password:
         success: "(email enviado)"
         in_progress: "(a enviar email)"
@@ -599,13 +613,13 @@ 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"
         taken: "Pedimos desculpa, esse email não está disponível."
         error: "Ocorreu um erro ao alterar o email. Talvez esse endereço já esteja a ser utilizado neste fórum?"
         success: "Enviámos um email para esse endereço. Por favor siga as instruções de confirmação."
+        success_staff: "Nós enviámos uma mensagem para o seu endereço atual. Por favor, siga as instruções de confirmação."
       change_avatar:
         title: "Alterar a sua imagem de perfil"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baseado em"
@@ -735,8 +749,12 @@ pt:
         expired: "Este convite expirou."
         rescind: "Remover"
         rescinded: "Convite Removido"
+        rescind_all: "Remover todos os Convites"
+        rescinded_all: "Todos os Convites removidos!"
+        rescind_all_confirm: "Tem a certeza que deseja remover todos os convites?"
         reinvite: "Reenviar convite"
         reinvite_all: "Reenviar todos os Convites"
+        reinvite_all_confirm: "Tem a certeza que deseja reenviar todos os convites?"
         reinvited: "Convite reenviado"
         reinvited_all: "Todos os Convites reenviados!"
         time_read: "Tempo de Leitura"
@@ -749,6 +767,7 @@ pt:
         bulk_invite:
           text: "Convite em massa a partir de ficheiro"
           success: "Ficheiro carregado corretamente, será notificado via mensagem assim que o processo esteja concluído."
+          error: "Desculpe, o ficheiro deverá estar no formato CSV."
       password:
         title: "Palavra-passe"
         too_short: "A sua palavra-passe é muito curta."
@@ -756,6 +775,7 @@ pt:
         same_as_username: "A sua palavra-passe é a mesma que o seu nome de utilizador."
         same_as_email: "A sua palavra-passe é a mesma que o seu email."
         ok: "A sua palavra-passe parece correta."
+        instructions: "pelo menos %{count} carateres"
       summary:
         title: "Sumário"
         stats: "Estatísticas"
@@ -766,12 +786,6 @@ pt:
         post_count:
           one: "publicação criada"
           other: "publicações criadas"
-        likes_given:
-          one: "<i class='fa fa-heart'></i> dado"
-          other: "<i class='fa fa-heart'></i> dados"
-        likes_received:
-          one: "<i class='fa fa-heart'></i> recebido"
-          other: "<i class='fa fa-heart'></i> recebidos"
         days_visited:
           one: "dia visitado"
           other: "dias visitados"
@@ -863,7 +877,6 @@ pt:
     first_post: Primeira publicação
     mute: Silenciar
     unmute: Desactivar silenciamento
-    last_post: Última publicação
     last_reply_lowercase: última resposta
     replies_lowercase:
       one: resposta
@@ -913,6 +926,8 @@ pt:
       complete_email_found: "Encontrámos uma conta correspondente a <b>%{email}</b>, deverá receber em breve um email com instruções para repor a sua palavra-passe."
       complete_username_not_found: "Não existe nenhuma conta correspondente ao nome de utilizador <b>%{username}</b>"
       complete_email_not_found: "Não existe nenhuma conta correspondente a <b>%{email}</b>"
+      button_ok: "CONFIRMAR"
+      button_help: "Ajuda"
     login:
       title: "Entrar"
       username: "Utilizador"
@@ -932,6 +947,9 @@ pt:
       not_allowed_from_ip_address: "Não pode iniciar sessão a partir desse endereço IP."
       admin_not_allowed_from_ip_address: "Não pode iniciar sessão como administrador a partir desse endereço IP."
       resend_activation_email: "Clique aqui para enviar o email de ativação novamente."
+      resend_title: "Reenviar Mensagem de Ativação"
+      change_email: "Alterar Endereço de E-mail"
+      submit_new_email: "Atualizar Endereço de E-mail"
       sent_activation_email_again: "Enviámos mais um email de ativação para o endereço <b>{{currentEmail}}</b>. Pode ser que demore alguns minutos; certifique-se que verifica a sua pasta de spam ou lixo."
       to_continue: "Por favor Inicie Sessão"
       preferences: "Necessita de ter sessão iniciada para alterar as suas preferências de utilizador."
@@ -957,12 +975,25 @@ pt:
       github:
         title: "com GitHub"
         message: "A autenticar com GitHub (certifique-se de que os bloqueadores de popup estão desativados)"
+    invites:
+      accept_title: "Convite"
+      welcome_to: "Bem-vindo a %{site_name}!"
+      invited_by: "Foi convidado por:"
+      accept_invite: "Aceitar Convite"
+      success: "A sua conta foi criada e está agora com a sessão iniciada."
+      name_label: "Nome"
+      password_label: "Definir Palavra-passe"
+      optional_description: "(opcional)"
+    password_reset:
+      continue: "Continuar para %{site_name}"
     emoji_set:
       apple_international: "Apple/International"
       google: "Google"
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Apenas Categorias"
       categories_with_featured_topics: "Categorias com Tópicos Destacados"
@@ -971,6 +1002,17 @@ pt:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      filter_placeholder: Pesquisar por emoji
+      people: Pessoas
+      nature: Natureza
+      food: Comida
+      activity: Atividade
+      travel: Viagem
+      objects: Objetos
+      celebration: Celebração
+      custom: Emojis Personalizados
+      recent: Utilizado recentemente
     composer:
       emoji: "Emoji :)"
       more_emoji: "mais..."
@@ -1010,6 +1052,7 @@ pt:
       title: "Ou prima Ctrl+Enter"
       users_placeholder: "Adicionar um utilizador"
       title_placeholder: "Numa breve frase, de que se trata esta discussão?"
+      title_or_link_placeholder: "Digite o título, ou cole aqui uma hiperligação"
       edit_reason_placeholder: "Porque está a editar?"
       show_edit_reason: "(adicione a razão para a edição)"
       topic_featured_link_placeholder: "Inserir ligação mostrada com o título."
@@ -1043,12 +1086,7 @@ pt:
       olist_title: "Lista numerada"
       ulist_title: "Lista de items"
       list_item: "Item da Lista"
-      heading_label: "H"
-      heading_title: "Título"
-      heading_text: "Título"
-      hr_title: "Barra horizontal"
       help: "Ajuda de Edição Markdown"
-      toggler: "esconder ou exibir o painel de composição"
       modal_ok: "OK"
       modal_cancel: "Cancelar"
       cant_send_pm: "Desculpe, não pode enviar uma mensagem para %{username}."
@@ -1062,28 +1100,6 @@ pt:
       empty: "Nenhumas notificações encontradas."
       more: "ver notificações antigas"
       total_flagged: "total de publicações denunciadas"
-      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='publicou' 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:
-        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} e 1 outro</span> {{description}}</p>"
-        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} e {{count}} outros</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> aceitou o seu convite</p>"
-      moved_post: "<i title='publicação movida' class='fa fa-sign-out'></i><p><span>{{username}}</span> moveu {{description}}</p>"
-      linked: "<i title='publicação ligada' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
-      granted_badge: "<i title='distintivo concedido' class='fa fa-certificate'></i><p>Ganhou '{{description}}'</p>"
-      watching_first_post: "<i title='novo tópico' class='fa fa-dot-circle-o'></i><p><span>Novo Tópico</span> {{description}}</p>"
-      group_message_summary:
-        one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} mensagem na caixa de entrada do seu grupo {{group_name}}</p>"
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} mensagens na caixa de entrada do seu grupo {{group_name}}</p>"
       alt:
         mentioned: "Mencionado por"
         quoted: "Citado por"
@@ -1125,14 +1141,12 @@ pt:
       sort_by: "Ordenar por"
       relevance: "Relevância"
       latest_post: "Publicação Mais Recente"
+      latest_topic: "Tópico Recente"
       most_viewed: "Mais Visto"
       most_liked: "Mais Gostos"
       select_all: "Selecionar Tudo"
       clear_all: "Remover Tudo"
       too_short: "O seu termo de pesquisa é demasiado curto."
-      result_count:
-        one: "1 resultado para <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} resultados para <span class='term'>\"{{term}}\"</span>"
       title: "pesquisar tópicos, publicações, utilizadores, ou categorias"
       no_results: "Não foi encontrado nenhum resultado."
       no_more_results: "Mais nenhum resultado encontrado."
@@ -1147,25 +1161,19 @@ pt:
         title: Pesquisa Avançada
         posted_by:
           label: Publicado por
-        in_category:
-          label: Na Categoria
         in_group:
           label: No Grupo
         with_badge:
           label: Com Distintivo
-        with_tags:
-          label: Com Etiquetas
         filters:
-          label: Apenas devolver tópicos/respostas que...
           likes: eu gostei
           posted: Eu publiquei em
           watching: estou a vigiar
           tracking: estou a seguir
-          private: estão nas minhas mensagens
-          bookmarks: eu adicionei marcadores
           first: são a primeira publicação
           pinned: estão afixados
           unpinned: não estão afixados
+          unseen: Eu não li
           wiki: são wiki
         statuses:
           label: Aonde tópicos
@@ -1192,6 +1200,7 @@ pt:
         select_all: "Selecionar Tudo"
         clear_all: "Remover Tudo"
         unlist_topics: "Remover Tópicos da Lista"
+        relist_topics: "Voltar a Listar Tópicos"
         reset_read: "Repor Leitura"
         delete: "Eliminar Tópicos"
         dismiss: "Marcar Visto"
@@ -1202,12 +1211,16 @@ pt:
         dismiss_new: "Marcar Visto Novos"
         toggle: "ativar seleção em massa de tópicos"
         actions: "Ações em Massa"
+        change_category: "Definir Categoria"
         close_topics: "Fechar Tópicos"
         archive_topics: "Arquivar tópicos"
+        notification_level: "Notificações"
         choose_new_category: "Escolha a nova categoria para os tópicos:"
         selected:
           one: "Selecionou  <b>1</b> tópico."
           other: "Selecionou <b>{{count}}</b> tópicos."
+        change_tags: "Substituir Etiquetas"
+        append_tags: "Anexar Etiquetas"
         choose_new_tags: "Escolha novas etiquetas para estes tópicos:"
         changed_tags: "As etiquetas para esses tópicos foram mudadas."
       none:
@@ -1296,6 +1309,18 @@ pt:
       jump_reply_up: avançar para resposta mais recente
       jump_reply_down: avançar para resposta mais antiga
       deleted: "Este tópico foi eliminado"
+      topic_status_update:
+        num_of_hours: "Número de horas:"
+        publish_to: "Publicar para:"
+        when: "Quando:"
+      auto_update_input:
+        later_today: "Hoje, mais tarde"
+        tomorrow: "Amanhã"
+        this_weekend: "Este fim de semana"
+        next_week: "Próxima semana"
+        next_month: "Próximo mês"
+      reminder:
+        title: "Lembrar-me"
       auto_close_title: 'Configurações para Fechar Automaticamente'
       auto_close_immediate:
         one: "A última publicação neste tópico já tem 1 hora, por isso o tópico será fechado imediatamente."
@@ -1310,7 +1335,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}"
@@ -1487,7 +1512,6 @@ pt:
       multi_select:
         select: 'selecionar'
         selected: '({{count}}) selecionados'
-        select_replies: 'selecione +respostas'
         delete: eliminar selecionados
         cancel: cancelar seleção
         select_all: 'selecionar tudo '
@@ -1499,7 +1523,6 @@ pt:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citar"
-      edit: "Editar {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Motivo:"
       post_number: "publicação {{number}}"
       last_edited_on: "publicação editada pela última vez em"
@@ -1538,7 +1561,7 @@ pt:
         too_many_dragged_and_dropped_files: "Lamentamos mas só pode carregar 10 ficheiros de cada vez."
         image_upload_not_allowed_for_new_user: "Pedimos desculpa, os novos utilizadores não podem carregar imagens."
         attachment_upload_not_allowed_for_new_user: "Pedimos desculpa, os novos utilizadores não podem carregar anexos."
-        attachment_download_requires_login: "Pedimos desculpa, os novos utilizadores não podem carregar anexos."
+        attachment_download_requires_login: "Desculpe, precisa de iniciar a sessão para transferir anexos."
       abandon:
         confirm: "Tem a certeza que deseja abandonar a sua publicação?"
         no_value: "Não, manter"
@@ -1561,12 +1584,6 @@ pt:
         undelete: "repor esta publicação"
         share: "partilhar uma ligação a esta publicação"
         more: "Mais"
-        delete_replies:
-          confirm:
-            one: "Também quer eliminar a {{count}} resposta direta a esta publicação?"
-            other: "Também quer eliminar as {{count}} respostas diretas a esta publicação?"
-          yes_value: "Sim, eliminar as respostas também"
-          no_value: "Não, somente esta publicação"
         admin: "ações administrativas de publicação"
         wiki: "Fazer Wiki"
         unwiki: "Remover Wiki"
@@ -1577,9 +1594,6 @@ pt:
         change_owner: "Mudar Titularidade"
       actions:
         flag: 'Denunciar'
-        defer_flags:
-          one: "Diferir denúncia"
-          other: "Diferir denúncias"
         undo:
           off_topic: "Retirar denúncia"
           spam: "Retirar denúncia"
@@ -1655,14 +1669,6 @@ pt:
           vote:
             one: "1 pessoa votou nesta publicação"
             other: "{{count}} pessoas votaram nesta publicação"
-      delete:
-        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 +1679,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 +1703,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'
@@ -1951,7 +1955,7 @@ pt:
       create_post: "Responder / Ver"
       readonly: "Ver"
     lightbox:
-      download: "descarregar"
+      download: "transferir"
     keyboard_shortcuts_help:
       title: 'Atalhos de Teclado'
       jump_to:
@@ -1979,7 +1983,6 @@ pt:
         hamburger_menu: '<b>=</b> Abrir menu hamburger'
         user_profile_menu: '<b>p</b> Abrir menu de utilizador'
         show_incoming_updated_topics: '<b>.</b> Mostrar tópicos atualizados'
-        search: '<b>/</b> Pesquisar'
         help: '<b>?</b> Abrir ajuda do teclado'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Marcar Visto Novos/Publicações'
         dismiss_topics: '<b>x</b>, <b>t</b> Marcar Visto Tópicos'
@@ -2048,9 +2051,7 @@ pt:
       selector_no_tags: "sem etiquetas"
       changed: "etiquetas modificadas:"
       tags: "Etiquetas"
-      choose_for_topic: "escolha etiquetas opcionais para este tópico"
       delete_tag: "Remover Etiqueta"
-      delete_confirm: "Tem a certeza que deseja remover esta etiqueta?"
       rename_tag: "Renomear Etiqueta"
       rename_instructions: "Escolha o novo nome para a etiqueta:"
       sort_by: "Ordenar por:"
@@ -2145,7 +2146,6 @@ pt:
         no_problems: "Nenhum problema encontrado."
         moderators: 'Moderadores:'
         admins: 'Administradores:'
-        blocked: 'Bloqueado:'
         suspended: 'Suspenso: '
         private_messages_short: "Msgs"
         private_messages_title: "Mensagens"
@@ -2176,24 +2176,12 @@ pt:
         by: "por"
       flags:
         title: "Denúncias"
-        old: "Antigo"
-        active: "Ativo"
         agree: "Aceitar"
         agree_title: "Confirmar esta denúncia como válida e correta"
-        agree_flag_modal_title: "Aceitar e..."
-        agree_flag_hide_post: "Aceitar (esconder publicação + enviar MP)"
-        agree_flag_hide_post_title: "Esconder esta publicação e enviar automaticamente uma mensagem ao utilizador solicitando a edição urgente da mesma"
-        agree_flag_restore_post: "Concordar (restaurar publicação)"
-        agree_flag_restore_post_title: "Restaurar esta publicação"
-        agree_flag: "Concordar com a denúncia"
-        agree_flag_title: "Concordar com a denúncia e manter a publicação inalterada"
-        defer_flag: "Diferir"
         defer_flag_title: "Remover esta denúncia; não requer qualquer ação de momento."
         delete: "Eliminar"
         delete_title: "Eliminar a publicação associada a esta denúncia."
-        delete_post_defer_flag: "Eliminar publicação e diferir a denúncia."
         delete_post_defer_flag_title: "Eliminar publicação; se é a primeira do tópico então eliminar o tópico"
-        delete_post_agree_flag: "Eliminar publicação e Concordar com a denúncia"
         delete_post_agree_flag_title: "Eliminar publicação; se é a primeira do tópico então eliminar o tópico"
         delete_flag_modal_title: "Eliminar e…"
         delete_spammer: "Eliminar Spammer"
@@ -2208,34 +2196,16 @@ pt:
         dispositions:
           agreed: "concordado"
           disagreed: "discordado"
-          deferred: "diferido"
         flagged_by: "Denunciado por"
         resolved_by: "Resolvido por"
         took_action: "Realizou uma ação"
         system: "Sistema"
         error: "Aconteceu um erro"
         reply_message: "Responder"
-        no_results: "Não há denúncias."
         topic_flagged: "Este <strong>tópico</strong> foi denunciado."
         visit_topic: "Visitar tópico para acionar medidas"
         was_edited: "A publicação foi editada após a primeira denúncia"
         previous_flags_count: "Esta publicação já foi denunciada {{count}} vezes."
-        summary:
-          action_type_3:
-            one: "fora do contexto"
-            other: "fora do contexto x{{count}}"
-          action_type_4:
-            one: "inapropriado"
-            other: "inapropriado x{{count}}"
-          action_type_6:
-            one: "personalizado"
-            other: "personalizado x{{count}}"
-          action_type_7:
-            one: "personalizado"
-            other: "personalizado x{{count}}"
-          action_type_8:
-            one: "spam"
-            other: "spam x{{count}}"
       groups:
         primary: "Grupo Primário"
         no_primary: "(nenhum grupo primário)"
@@ -2397,7 +2367,9 @@ pt:
             confirm: "Deseja criar uma nova cópia de segurança?"
             without_uploads: "Sim (não incluir ficheiros)"
           download:
-            label: "Descarregar"
+            label: "Transferir"
+            title: "Enviar mensagem com hiperligação de transferência"
+            alert: "Foi-lhe enviada por e-mail uma hiperligação para transferir esta cópia de segurança."
           destroy:
             title: "Remover a cópia de segurança"
             confirm: "Tem a certeza que deseja destruir esta cópia de segurança?"
@@ -2600,8 +2572,6 @@ pt:
             change_category_settings: "alterar configurações de categoria"
             delete_category: "eliminar categoria"
             create_category: "criar categoria"
-            block_user: "utilizador bloqueado"
-            unblock_user: "Desbloquear utilizador"
             grant_admin: "conceder administração"
             revoke_admin: "revogar administração"
             grant_moderation: "conceder moderação"
@@ -2610,6 +2580,7 @@ pt:
             deleted_tag: "etiqueta removida"
             renamed_tag: "etiqueta renomeada"
             revoke_email: "revogar email"
+            backup_download: "transferir cópia de segurança"
         screened_emails:
           title: "Emails Filtrados"
           description: "Quando alguém tenta criar uma nova conta, os seguintes endereços de email serão verificados e o registo será bloqueado, ou outra ação será executada."
@@ -2661,7 +2632,6 @@ pt:
           pending: "Pendente"
           staff: 'Pessoal'
           suspended: 'Suspenso'
-          blocked: 'Bloqueado'
           suspect: 'Suspeito'
         approved: "Aprovado?"
         approved_selected:
@@ -2682,7 +2652,6 @@ pt:
           staff: "Pessoal"
           admins: 'Utilizadores da Administração'
           moderators: 'Moderadores'
-          blocked: 'Utilizadores Bloqueados'
           suspended: 'Utilizadores Suspensos'
           suspect: 'Utilizadores Suspeitos'
         reject_successful:
@@ -2699,18 +2668,14 @@ pt:
         suspend_failed: "Ocorreu um erro ao suspender este utilizador {{error}}"
         unsuspend_failed: "Ocorreu um erro ao retirar a suspensão deste utilizador {{error}}"
         suspend_duration: "Durante quanto tempo o utilizador estará suspenso?"
-        suspend_duration_units: "(dias)"
         suspend_reason_label: "Qual é o motivo da sua suspensão? Este texto <b>estará visível para todos</b> na página do perfil deste utilizador, e será mostrada ao utilizador quando tentar iniciar sessão. Mantenha-o breve."
         suspend_reason: "Motivo"
         suspended_by: "Suspendido por"
         delete_all_posts: "Eliminar todas as publicações"
         delete_all_posts_confirm_MF: "Está prestes a apagar {POSTS, plural, one {1  publicação} other {# publicações}}  e {TOPICS, plural, one {1 tópico} other {# tópicos}}. Tem a certeza de que quer continuar?"
-        suspend: "Suspender"
-        unsuspend: "Retirar a suspensão"
-        suspended: "Suspendido?"
         moderator: "Moderador?"
         admin: "Administração?"
-        blocked: "Bloqueado?"
+        suspended: "Suspendido?"
         staged: "Temporário?"
         show_admin_profile: "Administração"
         refresh_browsers: "Forçar atualização da página no browser"
@@ -2724,8 +2689,8 @@ pt:
         grant_admin: 'Conceder Administração'
         revoke_moderation: 'Revogar Moderação'
         grant_moderation: 'Conceder Moderação'
-        unblock: 'Desbloquear'
-        block: 'Bloquear'
+        unsuspend: 'Retirar a suspensão'
+        suspend: 'Suspender'
         reputation: Reputação
         permissions: Permissões
         activity: Atividade
@@ -2772,17 +2737,12 @@ pt:
         activate_failed: "Ocorreu um problema ao ativar o utilizador."
         deactivate_account: "Desativar Conta"
         deactivate_failed: "Ocorreu um problema ao desativar o utilizador."
-        unblock_failed: 'Ocorreu um problema ao desbloquear o utilizador.'
-        block_failed: 'Ocorreu um problema ao bloquear o utilizador.'
-        block_confirm: 'Tem a certeza que pretende bloquear este utilizador? Este não será capaz de criar novos tópicos ou publicações.'
-        block_accept: 'Sim, bloquear este utilizador'
         bounce_score: "Pontuação de Redirecionamento"
         reset_bounce_score:
           label: "Repor"
           title: "Repor pontuação de redirecionamento a 0"
         deactivate_explanation: "Um utilizador desativado deve revalidar o seu email."
         suspended_explanation: "Um utilizador suspenso não pode iniciar sessão."
-        block_explanation: "Um utilizador bloqueado não pode publicar publicações ou iniciar tópicos."
         staged_explanation: "Um utilizador temporário pode apenas publicar por email em tópicos específicos."
         bounce_score_explanation:
           none: "Nenhum redirecionamento foi recebido recentemente desse email."
@@ -3033,9 +2993,6 @@ pt:
       upload: "Carregar"
       uploading: "A carregar…"
       quit: "Talvez Mais Tarde"
-      staff_count:
-        one: "A sua comunidade tem 1 membro na equipa de apoio."
-        other: "A sua comunidade tem %{count} membros na equipa de apoio."
       invites:
         add_user: "adicionar"
         none_added: "Não convidou ninguém para a equipa de apio. Tem a certeza de que quer continuar?"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 8e3bd85ecd..b6a8c9da67 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -101,7 +101,6 @@ pt_BR:
           other: "%{count} anos depois"
       previous_month: 'Mês Anterior'
       next_month: 'Mês Seguinte'
-      placeholder: Escolha uma data
     share:
       topic: 'compartilhe o link desse tópico'
       post: 'mensagem #%{postNumber}'
@@ -148,20 +147,21 @@ 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_east_2: "Leste dos EUA (Ohio)"
+        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"
@@ -257,6 +257,7 @@ pt_BR:
     uploading: "Enviando..."
     uploading_filename: "Enviando {{filename}}"
     uploaded: "Enviado!"
+    pasting: "Colando..."
     enable: "Habilitar"
     disable: "Desabilitar"
     undo: "Desfazer"
@@ -351,11 +352,9 @@ 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)"
+      public_admission: "Permitir que os usuários se juntem ao grupo livremente (Requer grupo visível ao público)"
+      public_exit: "Permitir que os usuários deixem o grupo livremente"
       empty:
         posts: "Não há publicações de membros deste grupo."
         members: "Não há membros neste grupo."
@@ -367,23 +366,23 @@ pt_BR:
       join: "Entrar no Grupo"
       leave: "Sair do Grupo"
       request: "Pedir para Entrar no Grupo"
+      message: "Mensagem"
       automatic_group: Grupo Automático
       closed_group: Grupo Fechado
       is_group_user: "Você é membro deste grupo"
       allow_membership_requests: "Permitir usuários enviar pedidos de adesão a proprietários de grupos"
+      membership_request:
+        submit: "Enviar Pedido"
+        title: "Pedir para entrar no grupo @%{group_name}"
       membership: "Adesão"
       name: "Nom"
       user_count: "Número de Membros"
       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."
-      title:
-        one: "grupo"
-        other: "grupos"
       activity: "Atividade"
       members: "Membros"
       topics: "Tópicos"
@@ -391,8 +390,12 @@ pt_BR:
       mentions: "Menções"
       messages: "Mensagens"
       notification_level: "Nível de notificação padrão para mensagens de grupo"
+      visibility_levels:
+        title: "Quem pode ver este grupo?"
+        public: "Todo mundo"
       alias_levels:
-        title: "Quem pode enviar mensagem e @mention a este grupo?"
+        mentionable: "Quem pode @mencionar este grupo?"
+        messageable: "Quem pode enviar mensagens a este grupo?"
         nobody: "Ninguém"
         only_admins: "Somente administradores"
         mods_and_admins: "Somente moderadores e Administradores"
@@ -488,7 +491,7 @@ pt_BR:
       mute: "Silenciar"
       edit: "Editar Preferências"
       download_archive:
-        button_text: "Baixar Minhas Publicações"
+        button_text: "Baixar Tudo"
         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ã."
@@ -513,11 +516,14 @@ pt_BR:
         disable: "Desativar Notificações"
         enable: "Ativar Notificações"
         each_browser_note: "Nota: Você deve modificar essa configuração em todos navegadores que você usa."
+      dismiss: 'Descartar'
       dismiss_notifications: "Descartar tudo"
       dismiss_notifications_tooltip: "Marcar todas as notificações não lidas como lidos"
       first_notification: "Sua primeira notificação! Selecione-a para começar."
       disable_jump_reply: "Não pular para o meu tópico depois que eu respondo"
       dynamic_favicon: "Exibir ícone no navegador de tópicos novos / atualizados."
+      theme_default_on_all_devices: "Definir este tema como padrão em todos os meus dispositivos"
+      allow_private_messages: "Permitir que outros usuários me mandem mensagens privadas"
       external_links_in_new_tab: "Abrir todos os links externos em uma nova aba"
       enable_quoting: "Ativar resposta citando o texto destacado"
       change: "alterar"
@@ -525,7 +531,7 @@ pt_BR:
       admin: "{{user}} é um administrador"
       moderator_tooltip: "Esse usuário é da moderação"
       admin_tooltip: "Esse usuário é da administração"
-      blocked_tooltip: "Esse usuário está bloqueado."
+      silenced_tooltip: "Este usuário está silenciado"
       suspended_notice: "Esse usuário está suspenso até {{date}}."
       suspended_reason: "Motivo:"
       github_profile: "Github"
@@ -561,7 +567,7 @@ pt_BR:
       delete_account_confirm: "Tem certeza de que deseja excluir permanentemente a sua conta? Essa ação não pode ser desfeita!"
       deleted_yourself: "Sua conta foi excluída com sucesso."
       delete_yourself_not_allowed: "Você não pode excluir a sua conta agora. Contate um administrador para apagar a sua conta para você."
-      unread_message_count: "Mensagens Privadas"
+      unread_message_count: "Mensagens"
       admin_delete: "Apagar"
       users: "Usuários"
       muted_users: "Silenciado"
@@ -574,6 +580,7 @@ pt_BR:
       undo_revoke_access: "Desfazer a Revogação de Acesso"
       api_approved: "Aprovada:"
       theme: "Tema"
+      home: "Página Inicial Padrão"
       staff_counters:
         flags_given: "sinalizadas úteis"
         flagged_posts: "posts sinalizados"
@@ -615,13 +622,13 @@ 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"
         taken: "Desculpe, esse email não é válido."
         error: "Houve um erro ao alterar seu email. Talvez ele já esteja sendo usado neste forum?"
         success: "Enviamos um email para esse endereço. Por favor, siga as instruções de confirmação."
+        success_staff: "Enviamos um e-mail ao seu endereço atual. Por favor, siga as instruções de confirmação."
       change_avatar:
         title: "Alterar sua imagem de perfil"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baseado em"
@@ -754,8 +761,12 @@ pt_BR:
         expired: "Este convite expirou."
         rescind: "Remover"
         rescinded: "Convite removido"
+        rescind_all: "Remover todos os convites"
+        rescinded_all: "Todos os convites foram removidos!"
+        rescind_all_confirm: "Tem certeza de que deseja remover todos os convites?"
         reinvite: "Reenviar convite"
         reinvite_all: "Reenviar todos os convites"
+        reinvite_all_confirm: "Tem certeza de que deseja reenviar todos os convites?"
         reinvited: "Convite reenviado"
         reinvited_all: "Todos os convites foram reenviados!"
         time_read: "Tempo de leitura"
@@ -788,12 +799,6 @@ pt_BR:
         post_count:
           one: "post criado"
           other: "posts criados"
-        likes_given:
-          one: "<i class='fa fa-heart'></i> dada"
-          other: "<i class='fa fa-heart'></i> dadas"
-        likes_received:
-          one: "<i class='fa fa-heart'></i> recebida"
-          other: "<i class='fa fa-heart'></i> recebidas"
         days_visited:
           one: "dia visitado"
           other: "dias visitados"
@@ -885,7 +890,7 @@ pt_BR:
     first_post: Primeira resposta
     mute: Silenciar
     unmute: Reativar
-    last_post: Última resposta
+    time_read: Lido
     last_reply_lowercase: última resposta
     replies_lowercase:
       one: resposta
@@ -911,6 +916,7 @@ pt_BR:
     private_message_info:
       title: "Mensagem"
       invite: "Convidar outros..."
+      leave_message: "Você quer mesmo deixar esta mensagem?"
       remove_allowed_user: "Tem a certeza que deseja remover {{name}} desta mensagem?"
       remove_allowed_group: "Tem a certeza que deseja remover {{name}} desta mensagem?"
     email: 'Email'
@@ -935,6 +941,8 @@ pt_BR:
       complete_email_found: "Encontramos uma conta com <b>%{email}</b>, você deve receber um email com instruções em como resetar sua senha em breve."
       complete_username_not_found: "Nenhuma conta com usuário <b>%{username}</b>"
       complete_email_not_found: "Nenhuma conta com <b>%{email}</b>"
+      button_ok: "OK"
+      button_help: "Ajuda"
     login:
       title: "Log In"
       username: "Usuário"
@@ -993,7 +1001,9 @@ 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)"
+      name_label: "Nome"
+      password_label: "Definir Senha"
+      optional_description: "(opcional)"
     password_reset:
       continue: "Continuar para %{site_name}"
     emoji_set:
@@ -1002,6 +1012,8 @@ pt_BR:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Categorias Apenas"
       categories_with_featured_topics: "Categorias com Tópicos em Destaque"
@@ -1010,6 +1022,17 @@ pt_BR:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: Selecionar...
+      filter_placeholder: Buscar...
+    emoji_picker:
+      people: Pessoas
+      nature: Natureza
+      food: Comida
+      activity: Atividade
+      travel: Viagem
+      objects: Objetos
+      custom: Emojis personalizados
     composer:
       emoji: "Emoji :)"
       more_emoji: "mais..."
@@ -1046,6 +1069,7 @@ pt_BR:
       cancel: "Cancelar"
       create_topic: "Criar Tópico"
       create_pm: "Mensagem"
+      create_whisper: "Sussurrar"
       title: "Ou pressione Ctrl+Enter"
       users_placeholder: "Adicionar um usuário"
       title_placeholder: "Sobre o que é esta discussão em uma pequena frase?"
@@ -1053,6 +1077,7 @@ pt_BR:
       edit_reason_placeholder: "por que você está editando?"
       show_edit_reason: "(adicione motivo da edição)"
       topic_featured_link_placeholder: "Entre com o link mostrado no título."
+      remove_featured_link: "Remover link do tópico."
       reply_placeholder: "Escreva aqui. Use Markdown, BBCode ou HTML para formatar. Arraste ou cole uma imagens."
       view_new_post: "Ver sua nova resposta."
       saving: "Salvando"
@@ -1083,12 +1108,7 @@ pt_BR:
       olist_title: "Lista numerada"
       ulist_title: "Lista de itens"
       list_item: "Item da lista"
-      heading_label: "H"
-      heading_title: "Título"
-      heading_text: "Título"
-      hr_title: "Barra horizontal"
       help: "Ajuda da edição Markdown"
-      toggler: "esconder ou exibir o painel de composição"
       modal_ok: "OK"
       modal_cancel: "Cancelar"
       cant_send_pm: "Desculpe, você não pode enviar uma mensagem para %{username}."
@@ -1102,28 +1122,23 @@ pt_BR:
       empty: "Não foi encontrada nenhuma notificação."
       more: "ver notificações antigas"
       total_flagged: "total de mensagens sinalizadas"
-      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:
-        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} e mais 1 pessoa</span> {{description}}</p>"
-        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} e outras {{count}} pessoas</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>Adquirido '{{description}}'</p>"
-      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Novo Tópico</span> {{description}}</p>"
-      group_message_summary:
-        one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} mensagem na caixa de entrada de {{group_name}}</p>"
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} mensagens na caixa de entrada de {{group_name}}</p>"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> aceitou o seu convite"
+      moved_post: "<span>{{username}}</span> moveu {{description}}"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "Adquiriu '{{description}}'"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>Novo Tópico</span> {{description}}"
       alt:
         mentioned: "Mencionado por"
         quoted: "Citado por"
@@ -1139,6 +1154,7 @@ pt_BR:
         linked: "Link para sua mensagem"
         granted_badge: "Emblema concedido"
         group_message_summary: "Mensagens na caixa de entrada do grupo"
+        topic_reminder: "Um lembrete"
       popup:
         mentioned: '{{username}} mencionou você em "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} mencionou você em "{{topic}}" - {{site_title}}'
@@ -1161,6 +1177,7 @@ pt_BR:
       uploading: "Enviando"
       select_file: "Selecionar Arquivo"
       image_link: "link da sua imagem"
+      default_image_alt_text: imagem
     search:
       sort_by: "Ordenar por"
       relevance: "Relevância"
@@ -1171,15 +1188,15 @@ pt_BR:
       select_all: "Selecionar Todos"
       clear_all: "Limpar Todos"
       too_short: "Seu termo de pesquisa é muito curto."
-      result_count:
-        one: "1 resultado para <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} resultados para <span class='term'>\"{{term}}\"</span>"
       title: "procurar em tópicos, respostas, usuários ou categorias"
       no_results: "Nenhum resultado encontrado."
       no_more_results: "Sem mais resultados encontrados."
       searching: "Procurando..."
       post_format: "#{{post_number}} por {{username}}"
-      results_page: "Resultados da pesquisa"
+      cant_find: "Não está conseguindo achar o que você quer?"
+      start_new_topic: "Que tal começar um novo tópico?"
+      search_google_button: "Google"
+      search_google_title: "Buscar neste site"
       context:
         user: "Procurar respostas de @{{username}}"
         category: "Procurar a categoria #{{category}}"
@@ -1189,26 +1206,18 @@ pt_BR:
         title: Busca avançada
         posted_by:
           label: Postado por
-        in_category:
-          label: Em Categoria
         in_group:
           label: Em Grupo
         with_badge:
           label: Com Emblema
-        with_tags:
-          label: Com Etiquetas
         filters:
-          label: Retornar apenas tópicos/publicações que...
           likes: Eu gostei
           posted: Eu publiquei em
           watching: Eu estou assistindo
           tracking: Eu estou rastreando
-          private: estão em minhas mensagens
-          bookmarks: Eu marquei
           first: são a primeira publicação
           pinned: está fixado
           unpinned: não está fixado
-          seen: Eu li
           unseen: Eu não li
           wiki: é uma wiki
         statuses:
@@ -1248,6 +1257,7 @@ pt_BR:
         actions: "Ações em Massa"
         close_topics: "Fechar Tópicos"
         archive_topics: "Arquivar Tópicos"
+        notification_level: "Notificações"
         choose_new_category: "Escolha a nova categoria para os tópicos:"
         selected:
           one: "Você selecionou <b>1</b> tópico."
@@ -1354,6 +1364,12 @@ pt_BR:
         later_this_week: "Mais tarde esta semana"
         this_weekend: "Este fim de semana"
         next_week: "Próxima semana"
+        two_weeks: "Duas Semanas"
+        next_month: "Mês que vem"
+        three_months: "Três Meses"
+        six_months: "Seis Meses"
+        one_year: "Um Ano"
+        forever: "Para Sempre"
         pick_date_and_time: "Escolha uma data e uma hora"
         set_based_on_last_post: "Fechar baseado na última postagem"
       publish_to_category:
@@ -1368,9 +1384,13 @@ pt_BR:
         title: "Fechar tópico automaticamente"
         label: "Horas para fechar tópico automaticamente:"
         error: "Por favor insira um valor válido."
+      reminder:
+        title: "Lembrar-me"
       status_update_notice:
         auto_open: "Este tópico irá abrir automaticamente em %{timeLeft}"
         auto_close: "Este tópico irá fechar automaticamente em %{timeLeft}"
+        auto_publish_to_category: "Este tópico será publicado em <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
+        auto_delete: "Este tópico será automaticamente apagado %{timeLeft}."
       auto_close_title: 'Configurações para fechar automaticamente'
       auto_close_immediate:
         one: "A última publicação no tópico já tem 1 hora, portanto ele será fechado imediatamente."
@@ -1563,7 +1583,6 @@ pt_BR:
       multi_select:
         select: 'selecionar'
         selected: '({{count}}) selecionados'
-        select_replies: 'selecione +respostas'
         delete: apagar selecionados
         cancel: cancelar seleção
         select_all: selecionar tudo
@@ -1575,7 +1594,6 @@ pt_BR:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citação"
-      edit: "Em resposta a {{link}} por {{replyAvatar}} {{username}}"
       edit_reason: "Motivo:"
       post_number: "resposta {{number}}"
       wiki_last_edited_on: "wiki última vez editada em"
@@ -1636,18 +1654,13 @@ pt_BR:
         has_liked: "você curtiu essa resposta"
         undo_like: "desfazer curtida"
         edit: "editar esta resposta"
+        edit_action: "Editar"
         edit_anonymous: "Você precisa estar conectado para editar essa resposta."
         flag: "sinalize privativamente esta resposta para chamar atenção ou enviar uma notificação privada sobre ela"
         delete: "apagar esta resposta"
         undelete: "recuperar esta resposta"
         share: "compartilhar o link desta resposta"
         more: "Mais"
-        delete_replies:
-          confirm:
-            one: "Você também quer remover a resposta direta a esta resposta?"
-            other: "Você também quer remover as {{count}} respostas diretas a esta resposta?"
-          yes_value: "Sim, remover as respostas também"
-          no_value: "Não, somente esta resposta"
         admin: "ações de mensagens do admin"
         wiki: "Tornar Wiki"
         unwiki: "Remover Wiki"
@@ -1658,9 +1671,6 @@ pt_BR:
         change_owner: "Trocar autor"
       actions:
         flag: 'Sinalização'
-        defer_flags:
-          one: "Delegar denuncia"
-          other: "Delegar denúncias"
         undo:
           off_topic: "Desfazer sinalização"
           spam: "Desfazer sinalização"
@@ -1736,14 +1746,6 @@ pt_BR:
           vote:
             one: "1 pessoa votou nesta resposta"
             other: "{{count}} pessoas votaram nesta resposta"
-      delete:
-        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"
@@ -1789,8 +1791,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"
@@ -2088,7 +2088,6 @@ pt_BR:
         hamburger_menu: '<b>=</b> Abrir o menu hambúrguer'
         user_profile_menu: '<b>p</b> Abrir menu do usuário'
         show_incoming_updated_topics: '<b>.</b> Exibir tópicos atualizados'
-        search: '<b>/</b> Pesquisa'
         help: '<b>?</b> Abrir ajuda de teclado'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Descartar Novas Postagens'
         dismiss_topics: '<b>x</b>, <b>t</b> Descartar Tópicos'
@@ -2157,9 +2156,7 @@ pt_BR:
       selector_no_tags: "sem etiquetas"
       changed: "etiquetas alteradas:"
       tags: "Etiquetas"
-      choose_for_topic: "Escolha marcadores opcionais para este tópico"
       delete_tag: "Apagar marcação"
-      delete_confirm: "Você tem certeza que deseja apagar essa marcação?"
       rename_tag: "Renomear marcador"
       rename_instructions: "Escolha um novo nome para o marcador"
       sort_by: "Ordenar por"
@@ -2254,7 +2251,7 @@ pt_BR:
         no_problems: "Nenhum problema encontrado."
         moderators: 'Moderadores:'
         admins: 'Admins:'
-        blocked: 'Bloqueado:'
+        silenced: 'Silenciado:'
         suspended: 'Suspenso:'
         private_messages_short: "Msgs"
         private_messages_title: "Mensagens"
@@ -2287,24 +2284,13 @@ pt_BR:
         by: "por"
       flags:
         title: "Sinalizações"
-        old: "Antigo"
-        active: "Ativo"
         agree: "Concordo"
         agree_title: "Confirmar esta marcação como válida e correta"
-        agree_flag_modal_title: "Concordar e..."
-        agree_flag_hide_post: "Aceitar (esconder post + enviar MP)"
-        agree_flag_hide_post_title: "Esconder este post e enviar automaticamente uma mensagem particular para o usuário solicitando que ele edite este post urgentemente"
-        agree_flag_restore_post: "Concordar (restaurar post)"
-        agree_flag_restore_post_title: "Restaurar este post"
-        agree_flag: "Concordar com a marcação"
-        agree_flag_title: "Concordar com a marcação e manter o post inalterado"
-        defer_flag: "Delegar"
+        defer_flag: "Ignorar"
         defer_flag_title: "Remover esta marcação; ela não requer nenhuma ação neste momento."
         delete: "Apagar"
         delete_title: "Apagar o post ao qual a marcação se refere."
-        delete_post_defer_flag: "Apagar o post e postergar a marcação"
         delete_post_defer_flag_title: "Apaga a resposta; se for a primeira, apagar o tópico"
-        delete_post_agree_flag: "Deletar o post e Concordar com a marcação"
         delete_post_agree_flag_title: "Apagar resposta; se for a primeira, deletar o tópico"
         delete_flag_modal_title: "Apagar e ..."
         delete_spammer: "Deletar Spammer"
@@ -2319,34 +2305,25 @@ pt_BR:
         dispositions:
           agreed: "concordar"
           disagreed: "discordar"
-          deferred: "deferida"
         flagged_by: "Sinalizado por"
         resolved_by: "Resolvido por"
         took_action: "Tomar ação"
         system: "Sistema"
         error: "Algo deu errado"
         reply_message: "Responder"
-        no_results: "Não há sinalizações."
         topic_flagged: "Este <strong>tópico</strong> foi sinalizado."
         visit_topic: "Visitar o tópico para tomar ações"
         was_edited: "Resposta foi editada após uma primeira sinalização"
         previous_flags_count: "Este post já foi marcado {{count}} vezes."
-        summary:
-          action_type_3:
-            one: "off-topic"
-            other: "off-topic x{{count}}"
-          action_type_4:
-            one: "inapropriado"
-            other: "inapropriado x{{count}}"
-          action_type_6:
-            one: "customizado"
-            other: "customizados x{{count}}"
-          action_type_7:
-            one: "personalizado"
-            other: "personalizado x{{count}}"
-          action_type_8:
-            one: "spam"
-            other: "spam x{{count}}"
+        details: "detalhes"
+        flagged_topics:
+          topic: "Tópico"
+          users: "Usuários"
+        short_names:
+          inappropriate: "impróprio"
+          spam: "spam"
+          notify_user: "personalizado"
+          notify_moderators: "personalizado"
       groups:
         primary: "Grupo Primário"
         no_primary: "(sem grupo primário)"
@@ -2432,7 +2409,6 @@ pt_BR:
           details: "Quando existir uma nova resposta, edição, deleção ou recuperação."
         user_event:
           name: "Evento de Usuário"
-          details: "Quando um usuário é criado, aprovado ou atualizado."
         delivery_status:
           title: "Status de Entrega"
           inactive: "Inativo"
@@ -2551,6 +2527,7 @@ pt_BR:
         new_style: "Novo Estilo"
         import: "Importar"
         delete: "Apagar"
+        delete_confirm: "Apagar este tema?"
         about: "Modificar o CSS e HTML do cabeçalho do site. Adicione uma customização para começar."
         color: "Cor"
         opacity: "Opacidade"
@@ -2566,12 +2543,20 @@ pt_BR:
           revert: "Reverter Alterações"
           revert_confirm: "Tem certeza de que deseja reverter as alterações?"
         theme:
+          import_theme: "Importar Tema"
+          customize_desc: "Personalizar:"
+          title: "Temas"
           edit: "Editar"
           desktop: "Desktop"
           mobile: "Mobile"
           preview: "Prévia"
           color_scheme_select: "Selecione as cores a serem usadas pelo tema"
+          custom_sections: "Seções personalizadas:"
           edit_css_html: "Editar CSS/HTML"
+          about_theme: "Sobre o Tema"
+          license: "Licença"
+          check_for_updates: "Verificar Atualizações"
+          updating: "Atualizando..."
           add: "Adicionar"
           scss:
             text: "CSS"
@@ -2731,8 +2716,6 @@ pt_BR:
             change_category_settings: "mudas configurações da categoria"
             delete_category: "apagar a categoria"
             create_category: "criar uma categoria"
-            block_user: "bloquear usuário"
-            unblock_user: "desbloquear usuário"
             grant_admin: "conceder admin"
             revoke_admin: "revogar admin"
             grant_moderation: "conceder moderação"
@@ -2780,6 +2763,10 @@ pt_BR:
             title: "Cria novas entradas de banimento por subnet caso existam no mínimo 'min_ban_entries_for_roll_up' entradas."
         logster:
           title: "Registro de erros"
+      watched_words:
+        form:
+          add: 'Adicionar'
+          success: 'Sucesso'
       impersonate:
         title: "Personificar"
         help: "Utilize esta ferramenta para personificar uma conta de usuário para efeitos de depuração. Você terá que sair dela assim que terminar."
@@ -2799,7 +2786,6 @@ pt_BR:
           pending: "Pendentes"
           staff: 'Equipe'
           suspended: 'Suspenso'
-          blocked: 'Bloqueados'
           suspect: 'Suspeito'
         approved: "Aprovado?"
         approved_selected:
@@ -2820,7 +2806,7 @@ pt_BR:
           staff: "Equipe de apoio"
           admins: 'Usuários Administradores'
           moderators: 'Moderadores'
-          blocked: 'Usuários Boqueados'
+          silenced: 'Usuários Silenciados'
           suspended: 'Usuários Suspensos'
           suspect: 'Usuários suspeitos'
         reject_successful:
@@ -2837,18 +2823,16 @@ pt_BR:
         suspend_failed: "Algo deu errado suspendendo este usuário {{error}}"
         unsuspend_failed: "Algo deu errado reativando este usuário {{error}}"
         suspend_duration: "Por quanto tempo o usuário deverá ser suspenso?"
-        suspend_duration_units: "(dias)"
         suspend_reason_label: "Por que você está suspendendo? Esse texto <b>será visível para todos</b> na página de perfil desse usuário, e será mostrado ao usuário quando ele tentar se logar. Seja breve."
         suspend_reason: "Motivo"
         suspended_by: "Suspenso por"
+        silence_reason: "Motivo"
         delete_all_posts: "Apagar todas mensagens"
         delete_all_posts_confirm_MF: "Você está prestes a apagar {POSTS, plural, one {1 publicação} other {# publicações}} and {TOPICS, plural, one {1 tópico} other {# tópicos}}. Você tem certeza?"
-        suspend: "Suspender"
-        unsuspend: "Readmitir"
-        suspended: "Suspenso?"
+        silence: "Silenciar"
         moderator: "Moderador?"
         admin: "Admin?"
-        blocked: "Bloqueado?"
+        suspended: "Suspenso?"
         staged: "Testado?"
         show_admin_profile: "Admin"
         refresh_browsers: "Forçar atualização da página no browser"
@@ -2864,8 +2848,8 @@ pt_BR:
         grant_admin_confirm: "Nós o enviamos um email para verificar o novo administrador. Por favor abra-o e siga as instruções."
         revoke_moderation: 'Revogar Moderação'
         grant_moderation: 'Conceder Moderação'
-        unblock: 'Desbloquear'
-        block: 'Bloquear'
+        unsuspend: 'Readmitir'
+        suspend: 'Suspender'
         reputation: Reputação
         permissions: Permissões
         activity: Atividade
@@ -2912,17 +2896,13 @@ pt_BR:
         activate_failed: "Houve um problema ao tornar o usuário ativo."
         deactivate_account: "Desativar Conta"
         deactivate_failed: "Houve um problema ao desativar o usuário."
-        unblock_failed: 'Houve um problema ao desbloquear o usuário.'
-        block_failed: 'Houve um problema ao bloquear o usuário.'
-        block_confirm: 'Você tem certeza que quer bloquear este usuário? Ele não vai poder criar nenhum tópico ou postagem nova.'
-        block_accept: 'Sim, bloquear este usuário'
+        silence_accept: 'Sim, silenciar este usuário'
         bounce_score: "Pontuação de Devolução"
         reset_bounce_score:
           label: "Redefinir"
           title: "Redefinir pontuação de devolução para 0"
         deactivate_explanation: "Um usuário desativado deve revalidar seu email."
         suspended_explanation: "Um usuário suspenso não pode entrar."
-        block_explanation: "Um usuário bloqueado não pode postar ou iniciar tópicos."
         staged_explanation: "Um usuário de teste só pode postar por email em tópicos específicos."
         bounce_score_explanation:
           none: "Nenhuma devolução foi recebida recentemente daquele email."
@@ -3040,6 +3020,7 @@ pt_BR:
           developer: 'Desenvolvedor'
           embedding: "Incorporação"
           legal: "Jurídico"
+          api: 'API'
           user_api: 'API de Usuário'
           uncategorized: 'Outros'
           backups: "Backups"
@@ -3174,9 +3155,6 @@ pt_BR:
       upload: "Enviar"
       uploading: "Enviando..."
       quit: "Talvez Depois"
-      staff_count:
-        one: "Sua comunidade tem 1 membro na equipe."
-        other: "Sua comunidade tem %{count} membros na equipe."
       invites:
         add_user: "adicionar"
         none_added: "Você ainda não convidou ninguém para a equipe. Tem certeza que deseja continuar?"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 7ef45a5d20..a313c055dd 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,14 +392,9 @@ 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."
-      title:
-        one: "Grup"
-        few: "Grupuri"
-        other: "de grupuri"
       activity: "Activitate"
       members: "Membri"
       topics: "Subiecte"
@@ -411,7 +402,6 @@ ro:
       mentions: "Mențiuni"
       messages: "Mesaje"
       alias_levels:
-        title: "Cine poate trimite mesaje către acest grup sau să îl @menționeze?"
         nobody: "Nimeni"
         only_admins: "Doar adminii"
         mods_and_admins: "Doar moderatorii și adminii"
@@ -509,7 +499,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."
@@ -546,7 +535,6 @@ ro:
       admin: "{{user}} este admin"
       moderator_tooltip: "Acest utilizator este moderator"
       admin_tooltip: "Acest utilizator este admin"
-      blocked_tooltip: "Acest utilizator este blocat."
       suspended_notice: "Acest utilizator este suspendat până la {{date}}."
       suspended_reason: "Motiv: "
       github_profile: "Github"
@@ -626,7 +614,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"
@@ -796,14 +783,6 @@ ro:
           one: "o postare creată"
           few: "postări create"
           other: "de postări create"
-        likes_given:
-          one: "<i class='fa fa-heart'></i> dată"
-          few: "<i class='fa fa-heart'></i> date"
-          other: "de <i class='fa fa-heart'></i> date"
-        likes_received:
-          one: "<i class='fa fa-heart'></i> primită"
-          few: "<i class='fa fa-heart'></i> primite"
-          other: "de <i class='fa fa-heart'></i> primite"
         days_visited:
           one: "vizită"
           few: "vizite"
@@ -899,7 +878,6 @@ ro:
     first_post: Prima postare
     mute: Blochează
     unmute: Deblochează
-    last_post: Ultima postare
     last_reply_lowercase: Ultimul răspuns
     replies_lowercase:
       one: răspuns
@@ -1084,12 +1062,7 @@ ro:
       olist_title: "Listă numerotată"
       ulist_title: "Listă cu marcatori"
       list_item: "Element listă"
-      heading_label: "H"
-      heading_title: "Titlu"
-      heading_text: "Titlu"
-      hr_title: "Riglă orizontală"
       help: "Ajutor pentru formatarea cu Markdown"
-      toggler: "ascunde sau arată editorul"
       modal_ok: "Ok"
       modal_cancel: "Anulare"
       cant_send_pm: "Nu poți trimite mesaje către %{username}"
@@ -1103,30 +1076,6 @@ ro:
       empty: "Nu au fost găsite notificări."
       more: "vezi notificările mai vechi"
       total_flagged: "toate postările marcate"
-      mentioned: "<i title='menționat' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
-      group_mentioned: "<i title='grup menționat' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
-      quoted: "<i title='citat' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      replied: "<i title='răspuns' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='postat' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      edited: "<i title='a editat' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
-      liked: "<i title='a apreciat' 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:
-        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} și încă cineva</span> {{description}}</p>"
-        few: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} și alți {{count}}</span> {{description}}</p>"
-        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} și alți {{count}}</span> {{description}}</p>"
-      private_message: "<i title='Mesaj privat' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_private_message: "<i title='Mesaj privat' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_topic: "<i title='a invitat la discuţie' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      invitee_accepted: "<i title='a acceptat invitația ta' class='fa fa-user'></i><p><span>{{username}}</span> a acceptat invitația ta</p>"
-      moved_post: "<i title='postare mutată' class='fa fa-sign-out'></i><p><span>{{username}}</span> mutată {{description}}</p>"
-      linked: "<i title='postare link-uita' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
-      granted_badge: "<i title='ecuson acordat' class='fa fa-certificate'></i><p> Ţi s-a acordat {{description}}</p>"
-      watching_first_post: "<i title='postare nouă' class='fa fa-dot-circle-o'></i><p><span>Postare nouă</span> {{description}}</p>"
-      group_message_summary:
-        one: "<i title='mesaje în căsuța poștală a grupului' class='fa fa-group'></i><p>Există un mesaj în căsuța poștală a grupului {{group_name}}</p>"
-        few: "<i title='mesaje în căsuța poștală a grupului' class='fa fa-group'></i><p>Există {{count}} mesaje în căsuța poștală a grupului {{group_name}}</p>"
-        other: "<i title='mesaje în căsuța poștală a grupului' class='fa fa-group'></i><p>Există {{count}} de mesaje în căsuța poștală a grupului {{group_name}}</p>"
       alt:
         mentioned: "Menționat de"
         quoted: "Citat de"
@@ -1173,10 +1122,6 @@ ro:
       select_all: "Selectează tot"
       clear_all: "Șterge tot"
       too_short: "Termenul căutat este prea scurt."
-      result_count:
-        one: "Un rezultat pentru <span class='term'>\"{{term}}\"</span>"
-        few: "{{count}} rezultate pentru <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} de rezultate pentru <span class='term'>\"{{term}}\"</span>"
       title: "Caută subiecte, postări, utilizatori sau categorii"
       no_results: "Nici un rezultat."
       no_more_results: "Nu s-au mai găsit alte rezultate."
@@ -1191,22 +1136,15 @@ ro:
         title: Căutare avansată
         posted_by:
           label: Postat de
-        in_category:
-          label: În categoria
         in_group:
           label: În grupul
         with_badge:
           label: Cu ecusonul
-        with_tags:
-          label: Cu etichetele
         filters:
-          label: Afișează doar postările/subiectele ...
           likes: pe care le-am apreciat
           posted: în care am postat
           watching: pe care le urmăresc activ
           tracking: le urmăresc
-          private: sunt în mesajele mele
-          bookmarks: le-am adăugat la semne de carte
           first: sunt chiar pe primul loc în listă
           pinned: sunt fixate
           unpinned: nu sunt fixate
@@ -1380,6 +1318,7 @@ ro:
           '3_2': 'Vei primi notificări deoarece urmărești activ acest subiect.'
           '3_1': 'Vei primi notificări deoarece ai creat acest subiect.'
           '3': 'Vei primi notificări deoarece urmărești activ acest subiect.'
+          '2': 'Vei vedea numărul răspunsurilor noi deoarece <a href="/u/{{username}}/preferences">citești acest subiect</a>'
           '1_2': 'Vei fi notificat dacă cineva îți menționează @numele sau îți scrie un răspuns.'
           '1': 'Vei fi notificat dacă cineva îți menționează @numele sau îți scrie un răspuns.'
           '0_7': 'Ignori toate notificările din această categorie.'
@@ -1545,7 +1484,6 @@ ro:
       multi_select:
         select: 'selectează'
         selected: 'selectate ({{count}})'
-        select_replies: 'selectează +răspunsuri'
         delete: șterge selecția
         cancel: anulare selecție
         select_all: selectează tot
@@ -1558,7 +1496,6 @@ ro:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citează"
-      edit: "Editează {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Motivul edit[rii: "
       post_number: "postarea {{number}}"
       last_edited_on: "postare editată ultima oară la"
@@ -1626,13 +1563,6 @@ ro:
         undelete: "restaurează această postare"
         share: "distribuie un link către această postare"
         more: "Mai mult"
-        delete_replies:
-          confirm:
-            one: "Vrei să ștergi răspunsul direct la acest mesaj?"
-            few: "Vrei să ștergi cele {{count}} răspunsuri directe la acest mesaj?"
-            other: "Vrei să ștergi cele {{count}} de răspunsuri directe la acest mesaj?"
-          yes_value: "Da, șterge și răspunsurile"
-          no_value: "Nu, doar postarea"
         admin: "acțiuni administrative pentru postare"
         wiki: "Fă postarea Wiki"
         unwiki: "Nu mai fă Wiki din postare"
@@ -1643,10 +1573,6 @@ ro:
         change_owner: "Schimbă proprietarul"
       actions:
         flag: 'Marchează cu marcaj de avertizare'
-        defer_flags:
-          one: "Amână marcarea"
-          few: "Amână marcările"
-          other: "Amână marcările"
         undo:
           off_topic: "Retrage marcaj de avertizare"
           spam: "Retrage marcaj de avertizare"
@@ -1738,16 +1664,6 @@ ro:
             one: "O persoană a votat pentru acest mesaj"
             few: "{{count}} persoane au votat pentru acest mesaj"
             other: "{{count}} de persoane au votat pentru acest mesaj"
-      delete:
-        confirm:
-          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 +1693,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."
@@ -2075,7 +1989,6 @@ ro:
         hamburger_menu: '<b>=</b> Deschide meniu hamburger'
         user_profile_menu: '<b>p</b> Deschide meniu utilizator'
         show_incoming_updated_topics: '<b>.</b> Arată subiectele actualizate'
-        search: '<b>/</b> Caută'
         help: '<b>?</b> Deschide ajutor tastatură'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Abandonează postări noi'
         dismiss_topics: '<b>x</b>, <b>t</b> Abandonează subiecte'
@@ -2148,9 +2061,7 @@ ro:
       selector_no_tags: "fără etichete"
       changed: "etichete schimbate:"
       tags: "Etichete"
-      choose_for_topic: "alege etichetele opționale pentru acest subiect"
       delete_tag: "Șterge etichetă"
-      delete_confirm: "Ești sigur că vrei să ștergi această etichetă?"
       rename_tag: "Redenumire etichetă"
       rename_instructions: "Alege un nume nou pentru etichetă:"
       sort_by: "Sortat după:"
@@ -2245,7 +2156,6 @@ ro:
         no_problems: "Nu a apărut nicio problemă."
         moderators: 'Moderatori:'
         admins: 'Admini:'
-        blocked: 'Blocați:'
         suspended: 'Suspendați:'
         private_messages_short: "Mesje"
         private_messages_title: "Mesaje"
@@ -2276,24 +2186,12 @@ ro:
         by: "de către"
       flags:
         title: "Marcaje de avertizare"
-        old: "Vechi"
-        active: "Active"
         agree: "De acord"
         agree_title: "Confirmă acest marcaj ca valid și corect"
-        agree_flag_modal_title: "De acord și..."
-        agree_flag_hide_post: "De acord (ascunde postarea + trimite MP)"
-        agree_flag_hide_post_title: "Ascunde această postare și trimite automat un mesaj utilizatorului, cerându-i insistent să îl editeze."
-        agree_flag_restore_post: "De acord (restaurare postare)"
-        agree_flag_restore_post_title: "Restaurează această postare"
-        agree_flag: "De acord cu marcajul de avertizare"
-        agree_flag_title: "De acord cu marcajul de avertizare și menține postarea neschimbată"
-        defer_flag: "Amânare"
         defer_flag_title: "Scoate marcajul de avertizare; Nu necesită nicio acțiune deocamdată."
         delete: "Șterge"
         delete_title: "Șterge postarea la care se referă marcajul de avertizare."
-        delete_post_defer_flag: "Șterge postarea și amână decizia privind marcajul de avertizare"
         delete_post_defer_flag_title: "Șterge postarea; dacă este prima, șterge subiectul"
-        delete_post_agree_flag: "Șterge postarea și aprobă marcajul de avertizare"
         delete_post_agree_flag_title: "Șterge postarea; dacă este prima, șterge subiectul"
         delete_flag_modal_title: "Șterge și..."
         delete_spammer: "Șterge spammer"
@@ -2308,39 +2206,16 @@ ro:
         dispositions:
           agreed: "aprobate"
           disagreed: "respinse"
-          deferred: "amânate"
         flagged_by: "Marcat de către"
         resolved_by: "Rezolvat de "
         took_action: "A luat măsuri"
         system: "Sistem"
         error: "Ceva nu a funcționat"
         reply_message: "Răspunde"
-        no_results: "Nu există marcaje."
         topic_flagged: "Aceast <strong>subiect</strong> a fost marcat cu marcaj de avertizare."
         visit_topic: "Vizualizează subiectul pentru a acționa."
         was_edited: "Mesajul a fost editat după primul marcaj"
         previous_flags_count: "Acest mesaj a fost deja marcat de {{count}} (de) ori."
-        summary:
-          action_type_3:
-            one: "în afara subiectului"
-            few: "în afara subiectului x{{count}}"
-            other: "în afara subiectului x{{count}}"
-          action_type_4:
-            one: "inadecvat"
-            few: "inadecvat x{{count}}"
-            other: "inadecvat x{{count}}"
-          action_type_6:
-            one: "personalizat"
-            few: "personalizat x{{count}}"
-            other: "personalizat x{{count}}"
-          action_type_7:
-            one: "personalizat"
-            few: "personalizat x{{count}}"
-            other: "personalizat x{{count}}"
-          action_type_8:
-            one: "spam"
-            few: "spam x{{count}}"
-            other: "spam x{{count}}"
       groups:
         primary: "Grup primar"
         no_primary: "(nu există grup primar)"
@@ -2423,7 +2298,6 @@ ro:
           details: "Atunci când exista un răspuns nou, editat, șters sau recuperat."
         user_event:
           name: "Eveniment utilizator"
-          details: "Când un utilizator este creat, aprobat sau actualizat."
         delivery_status:
           title: "Starea livrării"
           inactive: "Inactivă"
@@ -2708,8 +2582,6 @@ ro:
             change_category_settings: "schimbă setările categoriei"
             delete_category: "șterge categorie"
             create_category: "creează categorie"
-            block_user: "blochează utilizator"
-            unblock_user: "deblochează utilizator"
             grant_admin: "Acordă titlul de Admin"
             revoke_admin: "Revocă titlul de Admin"
             grant_moderation: "Acordă titlul de Moderator"
@@ -2768,7 +2640,6 @@ ro:
           pending: "În așteptare"
           staff: 'Membrii echipei'
           suspended: 'Suspendați'
-          blocked: 'Blocați'
           suspect: 'Suspecți'
         approved: "Aprobați?"
         approved_selected:
@@ -2791,7 +2662,6 @@ ro:
           staff: "Echipa"
           admins: 'Administratori'
           moderators: 'Moderatori'
-          blocked: 'Utilizatori blocați'
           suspended: 'Utilizatori suspendați'
           suspect: 'Utilizatori suspecţi'
         reject_successful:
@@ -2810,18 +2680,14 @@ ro:
         suspend_failed: "Ceva nu a funcționat la suspendarea acestui utilizator {{error}}"
         unsuspend_failed: "Ceva nu a funcționat la activarea acestui utilizator {{error}}"
         suspend_duration: "Pentru cât timp va fi suspendat utilizatorul?"
-        suspend_duration_units: "(zile)"
         suspend_reason_label: "Motivul suspendării? Acest text <b>va fi vizibil</b> pe pagina de profil a utilizatorului, și va fi arătat utilizatorului  atunci când încearcă să se autentifice. Încearcă să fii succint."
         suspend_reason: "Motiv"
         suspended_by: "Suspendat de"
         delete_all_posts: "Șterge toate postările"
         delete_all_posts_confirm_MF: "Ești pe cale să ștergi {POSTS, plural, one {1 postare} other {# postări}} și {TOPICS, plural, one {1 subiect} other {# subiecte}}. Ești sigur?"
-        suspend: "Suspendă"
-        unsuspend: "Reactivează"
-        suspended: "Suspendat?"
         moderator: "Moderator?"
         admin: "Admin?"
-        blocked: "Blocat?"
+        suspended: "Suspendat?"
         staged: "În așteptare?"
         show_admin_profile: "Admin"
         refresh_browsers: "Forțează reîmprospătarea browserului"
@@ -2835,8 +2701,8 @@ ro:
         grant_admin: 'Acordă titlu de admin'
         revoke_moderation: 'Revocă titlu de moderator'
         grant_moderation: 'Acordă titlu de moderator'
-        unblock: 'Deblochează'
-        block: 'Blochează'
+        unsuspend: 'Reactivează'
+        suspend: 'Suspendă'
         reputation: Reputație
         permissions: Permisiuni
         activity: Activitate
@@ -2886,17 +2752,12 @@ ro:
         activate_failed: "A apărut o problemă la activarea utilizatorului."
         deactivate_account: "Dezactivează cont"
         deactivate_failed: "A apărut o problemă la dezactivarea contului."
-        unblock_failed: 'A apărut o problemă la deblocarea contului.'
-        block_failed: 'A apărut o problemă la blocarea contului.'
-        block_confirm: 'Ești sigur că vrei să blochezi acest utilizator? Nu va mai putea să creeze niciun subiect sau postare.'
-        block_accept: 'Blochează utilizatorul'
         bounce_score: "Rata de ricoșeu"
         reset_bounce_score:
           label: "Resetează"
           title: "Resetează rata de ricoșeu înapoi la 0"
         deactivate_explanation: "Un utilizator dezactivat va trebui să-și revalideze email-ul."
         suspended_explanation: "Un utilizator suspendat nu se poate autentifica"
-        block_explanation: "Un utilizator blocat nu poate posta sau scrie un subiect."
         staged_explanation: "Un utilizator în așteptare poate posta numai prin email la subiectele specifice."
         bounce_score_explanation:
           none: "În ultimul timp nu au fost primite ricoșeuri de acest email."
@@ -3149,10 +3010,6 @@ ro:
       upload: "Încărcare"
       uploading: "Se încarcă..."
       quit: "Poate mai târziu"
-      staff_count:
-        one: "Comunitatea ta are un membru al echipei."
-        few: "Comunitatea ta are %{count} membri ai echipei."
-        other: "Comunitatea ta are %{count} de membri ai echipei."
       invites:
         add_user: "adaugă"
         none_added: "Nu ați invitat nici un membru al echipei. Ești sigur că vrei să continui?"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index bd625875cd..9c9298f8d0 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -171,6 +171,8 @@ ru:
       visible:
         enabled: 'Включил в списки %{when}'
         disabled: 'Исключил из списков %{when}'
+      banner:
+        enabled: 'создал(а) из этого баннер %{when}. Он будет виден вверху каждой страницы пока пользователь не закроет его.'
     topic_admin_menu: "действия администратора над темой"
     wizard_required: "Добро пожаловать в ваш новый Discourse! Начните с <a href='%{url}' data-auto-route='true'>мастера настройки</a> ✨"
     emails_are_disabled: "Все исходящие письма были глобально отключены администратором. Уведомления любого вида не будут отправляться на почту."
@@ -180,20 +182,21 @@ 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_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: 'отредактировать название и раздел темы'
     not_implemented: "Извините, эта функция еще не реализована!"
     no_value: "Нет"
@@ -298,6 +301,7 @@ ru:
     uploading: "Загрузка..."
     uploading_filename: "Загрузка файла {{filename}}..."
     uploaded: "Загружено!"
+    pasting: "Вставка..."
     enable: "Включить"
     disable: "Отключить"
     undo: "Отменить"
@@ -398,11 +402,9 @@ ru:
         full_name: 'Полное Имя'
         add_members: "Добавить Участников"
         delete_member_confirm: "Удалить '%{username}' из группы '%{group}'?"
-      request_membership_pm:
-        title: "Запрос на Вступление"
-        body: "Я бы хотел вступить в @%{groupName}."
       name_placeholder: "Название группы, без пробелов, по тем же правилам, что и для псевдонимов."
-      public: "Позволить пользователям свободно вступать/покидать группу (Группа должна быть видимой)"
+      public_admission: "Разрешить пользователям свободно присоединяться к группе (требуется общедоступная группа)"
+      public_exit: "Разрешить пользователям свободно покидать группу"
       empty:
         posts: "Участниками этой группы не создано ни одной записи."
         members: "Нет участников в этой группе."
@@ -414,32 +416,40 @@ ru:
       join: "Вступить в Группу"
       leave: "Покинуть Группу"
       request: "Попроситься в Группу"
+      message: "Сообщение"
       automatic_group: Автоматическая Группа
       closed_group: Закрытая Группа
       is_group_user: "Вы участник этой группы"
+      allow_membership_requests: "Разрешить пользователям отправлять запросы на вступление в группу владельцев"
+      membership_request:
+        submit: "Подтвердить запрос"
+        title: "Запрос на вступление в группу %{group_name}"
       membership: "Участие"
       name: "Название"
       user_count: "Количество Участников"
       bio: "О Группе"
       selector_placeholder: "Добавить участников"
       owner: "владелец"
-      visible: "Группа видима всем пользователям"
       index:
         title: "Группы"
         empty: "Нет видимых групп."
       title:
-        one: "группа"
-        few: "группы"
-        many: "групп"
-        other: "групп"
+        one: "Группа"
+        few: "Группы"
+        many: "Группы"
+        other: "Группы"
       activity: "Деятельность"
       members: "Участники"
       topics: "Темы"
       posts: "Сообщения"
       mentions: "Упоминания"
       messages: "Сообщения"
+      visibility_levels:
+        title: "Кто может видеть эту группу?"
+        public: "Все"
+        members: "Владельцы группы, участники и администраторы"
+        owners: "Владельцы группы и администраторы"
       alias_levels:
-        title: "Кто может отправлять сообщения и @упоминать эту группу?"
         nobody: "Никто"
         only_admins: "Только администраторы"
         mods_and_admins: "Только модераторы и администраторы"
@@ -451,7 +461,7 @@ ru:
       notifications:
         watching:
           title: "Наблюдать"
-          description: "Уведомлять по каждому ответу на это сообщение и показывать счетчик новых непрочитанных ответов."
+          description: "Уведомлять по каждому ответу на это сообщение и показывать счётчик новых непрочитанных ответов."
         watching_first_post:
           title: "Просмотр Первого сообщения"
           description: "Уведомлять только о первом сообщении в каждой новой теме в этой группе."
@@ -523,7 +533,7 @@ ru:
       location_not_found: (неизвестно)
       organisation: Организация
       phone: Телефон
-      other_accounts: "Другие учетные записи с этим IP адресом"
+      other_accounts: "Другие учётные записи с этим IP адресом"
       delete_other_accounts: "Удалить %{count}"
       username: "псевдоним"
       trust_level: "Уровень"
@@ -539,7 +549,7 @@ ru:
       mute: "Отключить"
       edit: "Настройки"
       download_archive:
-        button_text: "Скачать мои сообщения"
+        button_text: "Скачать всё"
         confirm: "Вы уверены, что хотите скачать свои сообщения?"
         success: "Скачивание началось, вы будете уведомлены, когда процесс завершится."
         rate_limit_error: "Сообщения могут быть скачаны лишь раз в день, попробуйте завтра."
@@ -560,7 +570,7 @@ ru:
         not_supported: "К сожалению, оповещения не поддерживаются этим браузером."
         perm_default: "Включить оповещения"
         perm_denied_btn: "Отказано в разрешении"
-        perm_denied_expl: "Вы запретили оповещения в вашем браузере. Вначале возобновите разрешение, а затем попробуйте еще раз."
+        perm_denied_expl: "Вы запретили оповещения в вашем браузере. Вначале возобновите разрешение, а затем попробуйте ещё раз."
         disable: "Отключить оповещения"
         enable: "Включить оповещения"
         each_browser_note: "Примечание: эта настройка устанавливается в каждом браузере индивидуально."
@@ -568,16 +578,17 @@ ru:
       dismiss_notifications_tooltip: "Пометить все непрочитанные уведомления прочитанными"
       first_notification: "Ваше первое уведомление! Выберите его, чтобы начать."
       disable_jump_reply: "Не переходить к вашему новому сообщению после ответа"
-      dynamic_favicon: "Показывать количество новых / обновленных тем на иконке сообщений"
+      dynamic_favicon: "Показывать количество новых / обновлённых тем на иконке сообщений"
+      theme_default_on_all_devices: "Поставить этот стиль по умолчанию на всех моих устройствах"
       external_links_in_new_tab: "Открывать все внешние ссылки в новой вкладке"
       enable_quoting: "Позволить отвечать с цитированием выделенного текста"
       change: "изменить"
-      moderator: "{{user}} - модератор"
-      admin: "{{user}} - админ"
+      moderator: "{{user}} — модератор"
+      admin: "{{user}} — админ"
       moderator_tooltip: "Этот пользователь модератор"
-      admin_tooltip: "{{user}} - админ"
-      blocked_tooltip: "Этот пользователь заблокирован"
+      admin_tooltip: "{{user}} — админ"
       suspended_notice: "Пользователь заморожен до {{date}}."
+      suspended_permanently: "Этот пользователь заморожен."
       suspended_reason: "Причина:"
       github_profile: "Github"
       email_activity_summary: "Сводка Активности"
@@ -619,6 +630,7 @@ ru:
       muted_users_instructions: "Не отображать уведомления от этих пользователей."
       muted_topics_link: "Показать темы \"Без уведомлений\""
       watched_topics_link: "Показать наблюдаемые темы"
+      tracked_topics_link: "Показать отслеживаемые темы"
       automatically_unpin_topics: "Автоматически откреплять топики после прочтения."
       apps: "Приложения"
       revoke_access: "Лишить прав доступа"
@@ -628,7 +640,7 @@ ru:
       staff_counters:
         flags_given: "полезные жалобы"
         flagged_posts: "сообщения с жалобами"
-        deleted_posts: "удаленные сообщения"
+        deleted_posts: "удалённые сообщения"
         suspensions: "приостановки"
         warnings_received: "предупреждения"
       messages:
@@ -642,6 +654,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 +678,6 @@ ru:
         title: "Изменить псевдоним"
         confirm: "Если вы измените имя пользователя, то все предыдущие цитирования и обращения по @name станут неработоспособными. Вы уверены, что вы хотите это сделать?"
         taken: "Этот псевдоним уже занят."
-        error: "При изменении псевдонима произошла ошибка."
         invalid: "Псевдоним должен состоять только из цифр и латинских букв"
       change_email:
         title: "Изменить E-mail"
@@ -717,7 +737,7 @@ ru:
         default: "(по умолчанию)"
         any: "любой"
       password_confirmation:
-        title: "Пароль еще раз"
+        title: "Пароль ещё раз"
       last_posted: "Последнее сообщение"
       last_emailed: "Последнее письмо"
       last_seen: "Был"
@@ -797,8 +817,12 @@ ru:
         expired: "Это приглашение истекло."
         rescind: "Отозвать"
         rescinded: "Приглашение отозвано"
+        rescind_all: "Удалить все приглашения"
+        rescinded_all: "Все приглашения были удалены!"
+        rescind_all_confirm: "Вы уверены, что хотите удалить все приглашения?"
         reinvite: "Повторить приглашение"
         reinvite_all: "Повторить все приглашения"
+        reinvite_all_confirm: "Вы действительно хотите отправить все приглашения повторно?"
         reinvited: "Приглашение выслано повторно"
         reinvited_all: "Все приглашения высланы повторно!"
         time_read: "Времени читал"
@@ -809,6 +833,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."
@@ -834,21 +859,21 @@ ru:
           few: "сообщения написал"
           many: "сообщений написал"
           other: "сообщений написал"
-        likes_given:
-          one: "<i class='fa fa-heart'></i> поставил"
-          few: "<i class='fa fa-heart'></i> given"
-          many: "<i class='fa fa-heart'></i> given"
-          other: "<i class='fa fa-heart'></i> given"
         likes_received:
-          one: "<i class='fa fa-heart'></i> получил"
-          few: "<i class='fa fa-heart'></i> получил"
-          many: "<i class='fa fa-heart'></i> получил"
-          other: "<i class='fa fa-heart'></i> получил"
+          one: "получил"
+          few: "получил"
+          many: "получил"
+          other: "получил"
         days_visited:
           one: "день заходил"
           few: "дня заходил"
           many: "дней заходил"
           other: "дней заходил"
+        topics_entered:
+          one: "посмотрел тему"
+          few: "посмотрел тем"
+          many: "просмотрено тем"
+          other: "просмотрено тем"
         posts_read:
           one: "сообщение прочел"
           few: "сообщения прочел"
@@ -909,10 +934,10 @@ ru:
         unknown: "Что-то пошло не так."
       buttons:
         back: "Вернуться"
-        again: "Попытаться еще раз"
+        again: "Попытаться ещё раз"
         fixed: "Загрузить страницу"
     close: "Закрыть"
-    assets_changed_confirm: "Сайт только что был обновлен. Перезагрузить страницу для перехода к новой версии?"
+    assets_changed_confirm: "Сайт только что был обновлён. Перезагрузить страницу для перехода к новой версии?"
     logout: "Вы вышли."
     refresh: "Обновить"
     read_only_mode:
@@ -943,7 +968,6 @@ ru:
     first_post: Первое сообщение
     mute: Отключить
     unmute: Включить
-    last_post: Последнее сообщение
     last_reply_lowercase: последний ответ
     replies_lowercase:
       one: ответ
@@ -963,9 +987,9 @@ ru:
       enable: 'Сводка по теме'
       disable: 'Показать все сообщения'
     deleted_filter:
-      enabled_description: "Этам тема содержит удаленные сообщения, которые сейчас скрыты."
-      disabled_description: "Удаленные сообщения темы показаны."
-      enable: "Скрыть удаленные сообщения"
+      enabled_description: "Этам тема содержит удалённые сообщения, которые сейчас скрыты."
+      disabled_description: "Удалённые сообщения темы показаны."
+      enable: "Скрыть удалённые сообщения"
       disable: "Показать удаленные сообщения"
     private_message_info:
       title: "Сообщение"
@@ -988,12 +1012,15 @@ ru:
       action: "Я забыл свой пароль"
       invite: "Введите ваш псевдоним или адрес электронной почты, и мы отправим вам ссылку для сброса пароля."
       reset: "Сброс пароля"
-      complete_username: "Если учетная запись совпадает с псевдонимом <b>%{username}</b>, вы скоро получите письмо с инструкциями о том, как сбросить пароль."
-      complete_email: "Если учетная запись совпадает с <b>%{email}</b>, вы должны получить письмо с инструкциями о том, как быстро сбросить ваш пароль."
+      complete_username: "Если учётная запись совпадает с псевдонимом <b>%{username}</b>, вы скоро получите письмо с инструкциями о том, как сбросить пароль."
+      complete_email: "Если учётная запись совпадает с <b>%{email}</b>, вы должны получить письмо с инструкциями о том, как быстро сбросить ваш пароль."
       complete_username_found: "Мы нашли учетную запись с псевдонимом <b>%{username}</b> и выслали вам на e-mail инструкции по сбросу пароля."
       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: "Пользователь"
@@ -1008,7 +1035,7 @@ ru:
       or: "или"
       authenticating: "Проверка..."
       awaiting_activation: "Ваша учетная запись ожидает активации через ссылку из письма. Чтобы повторно выслать активационное письмо, используйте кнопку сброса пароля."
-      awaiting_approval: "Ваша учетная запись еще не одобрена персоналом. Мы вышлем вам письмо, как только это произойдет."
+      awaiting_approval: "Ваша учётная запись ещё не одобрена персоналом. Мы вышлем вам письмо, как только это произойдет."
       requires_invite: "К сожалению, доступ к этому форуму только по приглашениям."
       not_activated: "Прежде, чем вы сможете войти на форум, понадобиться активировать свою учетную запись. Мы отправили на почту <b>{{sentTo}}</b> подробные инструкции, как это cделать."
       not_allowed_from_ip_address: "С этого IP адреса вход запрещен."
@@ -1048,10 +1075,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:
@@ -1060,6 +1090,8 @@ ru:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Только разделы"
       categories_with_featured_topics: "Разделы и их лучшие темы"
@@ -1068,12 +1100,23 @@ ru:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      filter_placeholder: Искать emoji
+      people: People
+      nature: Nature
+      food: Food
+      activity: Activity
+      travel: Travel
+      objects: Objects
+      celebration: Celebration
+      recent: Недавно использованные
     composer:
       emoji: "Смайлики :)"
       more_emoji: "еще..."
       options: "Дополнительные опции"
       whisper: "внутреннее сообщение"
       unlist: "исключена из списков тем"
+      blockquote_text: "Цитата"
       add_warning: "Это официальное предупреждение."
       toggle_whisper: "Внутреннее сообщение"
       toggle_unlisted: "Спрятать из списков тем"
@@ -1091,6 +1134,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}} символов"
@@ -1143,12 +1187,7 @@ ru:
       olist_title: "Нумерованный список"
       ulist_title: "Ненумерованный список"
       list_item: "Пункт первый"
-      heading_label: "А"
-      heading_title: "Заголовок"
-      heading_text: "Заголовок"
-      hr_title: "Горизонтальный разделитель"
       help: "Справка по форматированию (Markdown)"
-      toggler: "Закрыть / открыть панель редактирования"
       modal_ok: "OK"
       modal_cancel: "Отмена"
       cant_send_pm: "К сожалению, вы не можете отправлять сообщения пользователю %{username}."
@@ -1162,32 +1201,7 @@ ru:
       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:
-        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} и ещё {{count}}</span> {{description}}</p>"
-        few: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} и ещё {{count}}</span> {{description}}</p>"
-        many: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} и ещё {{count}}</span> {{description}}</p>"
-        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='приглашен в тему' 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> {{count}} входящее сообщение в Вашей группе {{group_name}}</p>"
-        few: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} входящих сообщения в Вашей группе {{group_name}}</p>"
-        many: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} входящих сообщений в Вашей группе {{group_name}}</p>"
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} входящих сообщений в Вашей группе {{group_name}}</p>"
+      granted_badge: "Заслужил(а) '{{description}}'"
       alt:
         mentioned: "Упомянуто"
         quoted: "Процитировано пользователем"
@@ -1229,21 +1243,21 @@ ru:
       sort_by: "Сортировка"
       relevance: "По смыслу"
       latest_post: "С недавними сообщениями"
+      latest_topic: "Последняя тема"
       most_viewed: "Самые просматриваемые"
       most_liked: "Больше всего симпатий"
       select_all: "Выбрать все"
       clear_all: "Сбросить все"
       too_short: "Слишком короткое слово для поиска."
-      result_count:
-        one: "Найдено 1: <span class='term'>\"{{term}}\"</span>"
-        few: "Найдено {{count}}: <span class='term'>\"{{term}}\"</span>"
-        many: "Найдено {{count}}: <span class='term'>\"{{term}}\"</span>"
-        other: "Найдено {{count}}: <span class='term'>\"{{term}}\"</span>"
       title: "Поиск по темам, сообщениям, псевдонимам и разделам"
       no_results: "Ничего не найдено."
       no_more_results: "Больше ничего не найдено."
       searching: "Поиск ..."
       post_format: "#{{post_number}} от {{username}}"
+      results_page: "Результаты поиска для '{{term}}'"
+      more_results: "Найдено множество результатов. Пожалуйста, уточните, критерии поиска."
+      cant_find: "Не можете найти нужную информацию?"
+      start_new_topic: "Создать новую тему?"
       context:
         user: "Искать сообщения от @{{username}}"
         category: "Искать в разделе #{{category}}"
@@ -1253,26 +1267,18 @@ ru:
         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: Являются вики
         statuses:
@@ -1310,8 +1316,10 @@ ru:
         dismiss_new: "Отложить новые"
         toggle: "Вкл./выкл. выбор нескольких тем"
         actions: "Массовые действия"
+        change_category: "Задать раздел"
         close_topics: "Закрыть темы"
         archive_topics: "Архивировать темы"
+        notification_level: "Уведомления"
         choose_new_category: "Выберите новый раздел для этих тем:"
         selected:
           one: "Вы выбрали <b>{{count}}</b> тему."
@@ -1326,7 +1334,7 @@ ru:
       none:
         unread: "У вас нет непрочитанных тем."
         new: "У вас нет новых тем."
-        read: "Вы еще не прочитали ни одной темы."
+        read: "Вы ещё не прочитали ни одной темы."
         posted: "Вы не принимали участие в обсуждении."
         latest: "Новых тем нет."
         hot: "Популярных тем нет."
@@ -1336,7 +1344,7 @@ ru:
         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: "Популярных тем больше нет."
@@ -1386,7 +1394,7 @@ ru:
         login_required: "Вам необходимо войти на сайт, чтобы получить доступ к этой теме."
       server_error:
         title: "Не удалось загрузить тему"
-        description: "К сожалению, мы не смогли загрузить тему, возможно, из-за проблемы подключения. Попробуйте еще раз. Если проблема повторится, пожалуйста, сообщите нам об этом."
+        description: "К сожалению, мы не смогли загрузить тему, возможно, из-за проблемы подключения. Попробуйте ещё раз. Если проблема повторится, пожалуйста, сообщите нам об этом."
       not_found:
         title: "Тема не найдена"
         description: "К сожалению, запрошенная тема не найдена. Возможно, она была удалена модератором."
@@ -1414,8 +1422,8 @@ ru:
       options: "Опции темы"
       show_links: "показать ссылки в теме"
       toggle_information: "скрыть / показать подробную информацию о теме"
-      read_more_in_category: "Хотите почитать что-нибудь еще? Можно посмотреть темы в {{catLink}} или {{latestLink}}."
-      read_more: "Хотите почитать что-нибудь еще? {{catLink}} или {{latestLink}}."
+      read_more_in_category: "Хотите почитать что-нибудь ещё? Можно посмотреть темы в {{catLink}} или {{latestLink}}."
+      read_more: "Хотите почитать что-нибудь ещё? {{catLink}} или {{latestLink}}."
       read_more_MF: "У вас осталось { UNREAD, plural, =0 {} one { <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}} other {}}"
       browse_all_categories: Просмотреть все разделы
       view_latest_topics: посмотреть последние темы
@@ -1423,6 +1431,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 +1489,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': 'Не получать уведомлений из этого раздела.'
@@ -1490,6 +1528,7 @@ ru:
         open: "Открыть тему"
         close: "Закрыть тему"
         multi_select: "Выбрать сообщения..."
+        timed_update: "Действие по таймеру..."
         pin: "Закрепить тему..."
         unpin: "Открепить тему..."
         unarchive: "Разархивировать тему"
@@ -1577,7 +1616,7 @@ ru:
         email_placeholder: 'name@example.com'
         success_email: "Приглашение отправлено по адресу <b>{{emailOrUsername}}</b>. Мы уведомим Вас, когда этим приглашением воспользуются. Проверьте вкладку Приглашения на вашей странице пользователя, чтобы узнать состояние всех ваших приглашений."
         success_username: "Мы пригласили этого пользователя принять участие в теме."
-        error: "К сожалению, мы не смогли пригласить этого человека. Возможно, он уже был приглашен? (Приглашения ограничены рейтингом)"
+        error: "К сожалению, мы не смогли пригласить этого человека. Возможно, он уже был приглашён? (Приглашения ограничены рейтингом)"
       login_reply: 'Войти и ответить'
       filters:
         n_posts:
@@ -1622,6 +1661,7 @@ ru:
           other: "Пожалуйста, выберите нового владельца {{count}} сообщений от <b>{{old_user}}</b>."
         instructions_warn: "Обратите внимание, что все уведомления об этом сообщении не будут переданы новому пользователю задним числом. <br>Внимание: В настоящее время никакие данные, имеющие отношение к сообщению, не передаются новому пользователю. Используйте с осторожностью."
       change_timestamp:
+        title: "Изменить временную метку..."
         action: "изменить временную метку"
         invalid_timestamp: "Временная метка не может быть в будущем"
         error: "При изменении временной метки темы возникла ошибка"
@@ -1629,7 +1669,6 @@ ru:
       multi_select:
         select: 'выбрать'
         selected: 'выбрано ({{count}})'
-        select_replies: 'выбрать +ответы'
         delete: удалить выбранные
         cancel: отменить выделение
         select_all: выбрать все
@@ -1643,7 +1682,6 @@ ru:
       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}}"
       wiki_last_edited_on: "вики редактировалось"
@@ -1683,18 +1721,18 @@ ru:
         other: "Это сообщение понравилось {{count}} людям"
       has_likes_title_only_you: "Вам понравилось это сообщение"
       has_likes_title_you:
-        one: "Вам и еще 1 человеку понравилось это сообщение"
-        few: "Вам и еще {{count}} людям понравилось это сообщение"
-        many: "Вам и еще {{count}} людям понравилось это сообщение"
-        other: "Вам и еще {{count}} людям понравилось это сообщение"
+        one: "Вам и ещё 1 человеку понравилось это сообщение"
+        few: "Вам и ещё {{count}} людям понравилось это сообщение"
+        many: "Вам и ещё {{count}} людям понравилось это сообщение"
+        other: "Вам и ещё {{count}} людям понравилось это сообщение"
       errors:
-        create: "К сожалению, не удалось создать сообщение из-за ошибки. Попробуйте еще раз."
-        edit: "К сожалению, не удалось изменить сообщение. Попробуйте еще раз."
-        upload: "К сожалению, не удалось загрузить файл. Попробуйте еще раз."
+        create: "К сожалению, не удалось создать сообщение из-за ошибки. Попробуйте ещё раз."
+        edit: "К сожалению, не удалось изменить сообщение. Попробуйте ещё раз."
+        upload: "К сожалению, не удалось загрузить файл. Попробуйте ещё раз."
         file_too_large: "К сожалению, этот файл слишком большой (максимально допустимый размер {{max_size_kb}} КБ). Почему бы не загрузить Ваш большой файл в службу облачного обмена, а затем поделиться ссылкой?"
         too_many_uploads: "К сожалению, за один раз можно загрузить только одно изображение."
         too_many_dragged_and_dropped_files: "К сожалению, за один раз можно загрузить только 10 файлов."
-        upload_not_authorized: "К сожалению, вы не можете загрузить файл данного типа (список разрешенных типов файлов: {{authorized_extensions}})."
+        upload_not_authorized: "К сожалению, вы не можете загрузить файл данного типа (список разрешённых типов файлов: {{authorized_extensions}})."
         image_upload_not_allowed_for_new_user: "К сожалению, загрузка изображений недоступна новым пользователям."
         attachment_upload_not_allowed_for_new_user: "К сожалению, загрузка файлов недоступна новым пользователям."
         attachment_download_requires_login: "Войдите, чтобы скачивать прикрепленные файлы."
@@ -1722,14 +1760,6 @@ ru:
         undelete: "отменить удаление"
         share: "поделиться ссылкой на сообщение"
         more: "Ещё"
-        delete_replies:
-          confirm:
-            one: "Хотите ли вы удалить также и {{count}} прямой ответ к этому сообщению?"
-            few: "Хотите ли вы удалить также и {{count}} прямых ответа к этому сообщению?"
-            many: "Хотите ли вы удалить также и {{count}} прямых ответов к этому сообщению?"
-            other: "Хотите ли вы удалить также и {{count}} прямых ответов к этому сообщению?"
-          yes_value: "Да, так же удалить ответы"
-          no_value: "Нет, удалить только сообщение"
         admin: "действия администратора над сообщением"
         wiki: "Сделать вики-сообщением"
         unwiki: "Отменить вики-сообщение"
@@ -1740,11 +1770,6 @@ ru:
         change_owner: "Изменить владельца"
       actions:
         flag: 'Жалоба'
-        defer_flags:
-          one: "Отложить жалобу"
-          few: "Отложить жалобы"
-          many: "Отложить жалобы"
-          other: "Отложить жалобы"
         undo:
           off_topic: "Отозвать жалобу"
           spam: "Отозвать жалобу"
@@ -1772,44 +1797,44 @@ ru:
           vote: "Вы проголосовали за данное сообщение"
         by_you_and_others:
           off_topic:
-            one: "Вы и еще {{count}} человек отметили это как не относящееся к теме"
-            few: "Вы и еще {{count}} человека отметили это как не относящееся к теме"
-            many: "Вы и еще {{count}} человек отметили это как не относящееся к теме"
-            other: "Вы и еще {{count}} человек отметили это как не относящееся к теме"
+            one: "Вы и ещё {{count}} человек отметили это как не относящееся к теме"
+            few: "Вы и ещё {{count}} человека отметили это как не относящееся к теме"
+            many: "Вы и ещё {{count}} человек отметили это как не относящееся к теме"
+            other: "Вы и ещё {{count}} человек отметили это как не относящееся к теме"
           spam:
-            one: "Вы и еще {{count}} человек отметили это как спам"
-            few: "Вы и еще {{count}} человека отметили это как спам"
-            many: "Вы и еще {{count}} человек отметили это как спам"
-            other: "Вы и еще {{count}} человек отметили это как спам"
+            one: "Вы и ещё {{count}} человек отметили это как спам"
+            few: "Вы и ещё {{count}} человека отметили это как спам"
+            many: "Вы и ещё {{count}} человек отметили это как спам"
+            other: "Вы и ещё {{count}} человек отметили это как спам"
           inappropriate:
-            one: "Вы и еще {{count}} человек отметили это как неуместное"
-            few: "Вы и еще {{count}} человека отметили это как неуместное"
-            many: "Вы и еще {{count}} человек отметили это как неуместное"
-            other: "Вы и еще {{count}} человек отметили это как неуместное"
+            one: "Вы и ещё {{count}} человек отметили это как неуместное"
+            few: "Вы и ещё {{count}} человека отметили это как неуместное"
+            many: "Вы и ещё {{count}} человек отметили это как неуместное"
+            other: "Вы и ещё {{count}} человек отметили это как неуместное"
           notify_moderators:
-            one: "Вы и еще {{count}} человек отметили это как требующее модерации"
-            few: "Вы и еще {{count}} человека отметили это как требующее модерации"
-            many: "Вы и еще {{count}} человек отметили это как требующее модерации"
-            other: "Вы и еще {{count}} человек отметили это как требующее модерации"
+            one: "Вы и ещё {{count}} человек отметили это как требующее модерации"
+            few: "Вы и ещё {{count}} человека отметили это как требующее модерации"
+            many: "Вы и ещё {{count}} человек отметили это как требующее модерации"
+            other: "Вы и ещё {{count}} человек отметили это как требующее модерации"
           notify_user:
             one: "Вы и еще 1 человек отправили сообщение этому пользователю"
             few: "Вы и еще {{count}} человека отправили сообщение этому пользователю"
             other: "Вы и еще {{count}} человек отправили сообщение этому пользователю"
           bookmark:
-            one: "Вы и еще {{count}} человек добавили это сообщение в закладки"
-            few: "Вы и еще {{count}} человека добавили это сообщение в закладки"
-            many: "Вы и еще {{count}} человек добавили это сообщение в закладки"
-            other: "Вы и еще {{count}} человек добавили это сообщение в закладки"
+            one: "Вы и ещё {{count}} человек добавили это сообщение в закладки"
+            few: "Вы и ещё {{count}} человека добавили это сообщение в закладки"
+            many: "Вы и ещё {{count}} человек добавили это сообщение в закладки"
+            other: "Вы и ещё {{count}} человек добавили это сообщение в закладки"
           like:
-            one: "Вам и еще {{count}} человеку понравилось"
-            few: "Вам и еще {{count}} людям понравилось"
-            many: "Вам и еще {{count}} людям понравилось"
-            other: "Вам и еще {{count}} людям понравилось"
+            one: "Вам и ещё {{count}} человеку понравилось"
+            few: "Вам и ещё {{count}} людям понравилось"
+            many: "Вам и ещё {{count}} людям понравилось"
+            other: "Вам и ещё {{count}} людям понравилось"
           vote:
-            one: "Вы и еще {{count}} человек проголосовали за это сообщение"
-            few: "Вы и еще {{count}} человека проголосовали за это сообщение"
-            many: "Вы и еще {{count}} человек проголосовали за это сообщение"
-            other: "Вы и еще {{count}} человек проголосовали за это сообщение"
+            one: "Вы и ещё {{count}} человек проголосовали за это сообщение"
+            few: "Вы и ещё {{count}} человека проголосовали за это сообщение"
+            many: "Вы и ещё {{count}} человек проголосовали за это сообщение"
+            other: "Вы и ещё {{count}} человек проголосовали за это сообщение"
         by_others:
           off_topic:
             one: "{{count}} человек отметил это как не относящееся к теме"
@@ -1850,18 +1875,6 @@ ru:
             few: "{{count}} человека проголосовали за это сообщение"
             many: "{{count}} человек проголосовали за это сообщение"
             other: "{{count}} человек проголосовали за это сообщение"
-      delete:
-        confirm:
-          one: "Вы уверены, что хотите удалить это сообщение?"
-          few: "Вы уверены, что хотите удалить все эти сообщения?"
-          many: "Вы уверены, что хотите удалить все эти сообщения?"
-          other: "Вы уверены, что хотите удалить все эти сообщения?"
-      merge:
-        confirm:
-          one: "Вы уверены, что хотите объединить эти сообщения?"
-          few: "Вы уверены, что хотите объединить эти {{count}} сообщений?"
-          many: "Вы уверены, что хотите объединить эти {{count}} сообщений?"
-          other: "Вы уверены, что хотите объединить эти {{count}} сообщений?"
       revisions:
         controls:
           first: "Начальная версия"
@@ -1907,8 +1920,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: "Разрешить популярные ссылки в этой категории"
@@ -1940,12 +1953,16 @@ ru:
       special_warning: "Внимание: данный раздел был предустановлен и настройки безопасности не могут быть изменены. Если не хотите использовать этот раздел, удалите его вместо изменения."
       images: "Изображения"
       email_in: "Индивидуальный адрес входящей почты:"
-      email_in_allow_strangers: "Принимать письма от анонимных пользователей без учетных записей"
+      email_in_allow_strangers: "Принимать письма от анонимных пользователей без учётных записей"
       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: "Добавить права"
@@ -1958,13 +1975,13 @@ ru:
       notifications:
         watching:
           title: "Наблюдать"
-          description: "Наблюдать за всеми темами этого раздела. Уведомлять о каждом новом сообщении в любой из тем и показывать счетчик новых ответов."
+          description: "Наблюдать за всеми темами этого раздела. Уведомлять о каждом новом сообщении в любой из тем и показывать счётчик новых ответов."
         watching_first_post:
           title: "Наблюдать за первым сообщением"
           description: "Вы будете уведомлены только о первом сообщении в каждой новой теме этого раздела."
         tracking:
           title: "Следить"
-          description: "Отслеживать все темы этого раздела. Уведомлять если кто-то упомянет ваше @name или ответит вам, показывать счетчик новых ответов."
+          description: "Отслеживать все темы этого раздела. Уведомлять если кто-то упомянет ваше @name или ответит вам, показывать счётчик новых ответов."
         regular:
           title: "Уведомлять"
           description: "Уведомлять, если кто-нибудь упомянет мой @псевдоним или ответит на мое сообщение."
@@ -1983,6 +2000,9 @@ ru:
         created: "Дата создания"
       sort_ascending: 'По возрастанию'
       sort_descending: 'По убыванию'
+      subcategory_list_styles:
+        rows: "Строки"
+        rows_with_featured_topics: "Строки с обсуждаемыми темами"
     flagging:
       title: 'Спасибо за вашу помощь в поддержании порядка!'
       action: 'Пожаловаться на сообщение'
@@ -1990,7 +2010,7 @@ ru:
       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> в черный список. Вы действительно уверены, что ваши помыслы чисты и действия не продиктованы гневом?"
+      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: "(скрыто)"
@@ -2223,7 +2243,6 @@ ru:
         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> Отложить темы'
@@ -2257,16 +2276,18 @@ ru:
       granted_on: "Выдана %{date}"
       others_count: "Другие с этой наградой (%{count})"
       title: Награды
+      allow_title: "Вы можете использовать эту награду в качестве титула."
+      multiple_grant: "Вы можете получить её несколько раз"
       badge_count:
         one: "1 награда"
         few: "%{count} наград"
         many: "%{count} наград"
         other: "%{count} наград"
       more_badges:
-        one: "еще +1"
-        few: "+ еще %{count}"
-        many: "+ еще %{count}"
-        other: "+ еще %{count}"
+        one: "ещё +1"
+        few: "+ ещё %{count}"
+        many: "+ ещё %{count}"
+        other: "+ ещё %{count}"
       granted:
         one: "выдано 1"
         few: "выдано %{count}"
@@ -2300,9 +2321,7 @@ ru:
       selector_no_tags: "Нет тегов"
       changed: "Теги изменены:"
       tags: "Теги"
-      choose_for_topic: "Выберите теги для этой темы (опционально)"
       delete_tag: "Удалить тег"
-      delete_confirm: "Вы уверены, что хотите удалить этот тег?"
       rename_tag: "Редактировать тег"
       rename_instructions: "Выберите новое название тега:"
       sort_by: "Сортировка:"
@@ -2372,7 +2391,7 @@ ru:
       custom_message_template_forum: "Привет. Подумал, что тебе будет интересно зарегистрироваться на этом форуме!"
       custom_message_template_topic: "Привет! Подумал, что тебя может заинтересовать эта тема!"
     safe_mode:
-      enabled: "Включен безопасный режим, чтобы выйти из безопасного режима, закройте текущее окно браузера"
+      enabled: "Включён безопасный режим, чтобы выйти из безопасного режима, закройте текущее окно браузера"
   admin_js:
     type_to_filter: "Введите текст для фильтрации..."
     admin:
@@ -2397,8 +2416,7 @@ ru:
         no_problems: "Проблем не обнаружено."
         moderators: 'Модераторы:'
         admins: 'Администраторы:'
-        blocked: 'Заблокированы:'
-        suspended: 'Заморожены:'
+        suspended: 'Заморожен:'
         private_messages_short: "Сообщ."
         private_messages_title: "Сообщений"
         mobile_title: "Мобильный"
@@ -2430,24 +2448,13 @@ ru:
         by: "от"
       flags:
         title: "Жалобы"
-        old: "Старые"
-        active: "Активные"
+        moderation_history: "История модерации"
         agree: "Принять"
         agree_title: "Подтвердить корректность жалобы"
-        agree_flag_modal_title: "Принять и..."
-        agree_flag_hide_post: "Принять (скрыть сообщение и послать личное сообщение)"
-        agree_flag_hide_post_title: "Скрыть сообщение и автоматически отправить пользователю сообщение с просьбой исправить его"
-        agree_flag_restore_post: "Согласиться (восстановить сообщение)"
-        agree_flag_restore_post_title: "Восстановить это сообщение"
-        agree_flag: "Принять жалобу"
-        agree_flag_title: "Принять жалобу, оставить сообщение без изменений"
-        defer_flag: "Отложить"
-        defer_flag_title: "Удалить эту жалобу - никаких действий на данный момент не требуется."
+        defer_flag_title: "Удалить эту жалобу — никаких действий на данный момент не требуется."
         delete: "Удалить"
         delete_title: "Удалить обжалованное сообщение."
-        delete_post_defer_flag: "Удалить сообщение и отложить жалобу"
         delete_post_defer_flag_title: "Удалить сообщение; если это первое сообщение, удалить тему целиком"
-        delete_post_agree_flag: "Принять жалобу, удалить сообщение"
         delete_post_agree_flag_title: "Удалить сообщение; если это первое сообщение, удалить тему целиком"
         delete_flag_modal_title: "Удалить и..."
         delete_spammer: "Удалить спамера"
@@ -2458,48 +2465,20 @@ ru:
         disagree_flag_title: "Отклонить эту жалобу как некорректную"
         clear_topic_flags: "Готово"
         clear_topic_flags_title: "Тема была просмотрена, и все проблемы были решены. Нажмите Готово, чтобы удалить все жалобы."
-        more: "(еще ответы...)"
+        more: "(ещё ответы...)"
         dispositions:
           agreed: "принято"
           disagreed: "отклонено"
-          deferred: "отложено"
         flagged_by: "Отмечено"
         resolved_by: "Разрешено"
         took_action: "Принята мера"
         system: "Системные"
         error: "что-то пошло не так"
         reply_message: "Ответить"
-        no_results: "Жалоб нет."
         topic_flagged: "Эта <strong>тема</strong> была помечена."
         visit_topic: "Посетите тему чтобы принять меры"
         was_edited: "Сообщение было отредактировано после первой жалобы"
         previous_flags_count: "На это сообщение уже пожаловались {{count}} раз(а)."
-        summary:
-          action_type_3:
-            one: "вне темы"
-            few: "вне темы x{{count}}"
-            many: "вне темы x{{count}}"
-            other: "вне темы x{{count}}"
-          action_type_4:
-            one: "неуместно"
-            few: "неуместно x{{count}}"
-            many: "неуместно x{{count}}"
-            other: "неуместно x{{count}}"
-          action_type_6:
-            one: "другое"
-            few: "других x{{count}}"
-            many: "других x{{count}}"
-            other: "других x{{count}}"
-          action_type_7:
-            one: "другое"
-            few: "других x{{count}}"
-            many: "других x{{count}}"
-            other: "других x{{count}}"
-          action_type_8:
-            one: "спам"
-            few: "спам x{{count}}"
-            many: "спам x{{count}}"
-            other: "спам x{{count}}"
       groups:
         primary: "Основная группа"
         no_primary: "(нет основной группы)"
@@ -2518,6 +2497,7 @@ ru:
         add_members: "Добавить участников"
         custom: "Настраиваемые"
         bulk_complete: "Пользователи успешно добавлены в группу."
+        bulk_complete_users_not_added: "Эти пользователи не были добавлены (убедитесь, что у них есть учётная запись):"
         bulk: "Массовое добавление в группу"
         bulk_paste: "Впишите список пользователей или адресов e-mail, по одному на строчку:"
         bulk_select: "(выберите группу)"
@@ -2549,7 +2529,7 @@ ru:
       web_hooks:
         title: "Webhooks"
         none: "Сейчас нет веб-перехватчиков."
-        instruction: "Webhooks позволяют Discourse уведомлять внешние службы, когда определенное событие происходит на вашем сайте. При срабатывании webhook, на соответствующий URL будет отправлен POST-запрос."
+        instruction: "Webhooks позволяют Discourse уведомлять внешние службы, когда определённое событие происходит на вашем сайте. При срабатывании webhook, на соответствующий URL будет отправлен POST-запрос."
         detailed_instruction: "При наступлении выбранного события, на соответствующий URL будет отправлен POST-запрос."
         new: "Добавить Webhook"
         create: "Создать"
@@ -2567,6 +2547,7 @@ ru:
         event_type_missing: "Вам необходимо настроить по крайней мере один тип событий."
         content_type: "Тип Содержимого"
         secret: "Ключ"
+        event_chooser: "Какие события должны вызывать срабатывание этого Webhook?"
         wildcard_event: "Присылать мне всё."
         individual_event: "Выбрать отдельные события."
         verify_certificate: "Проверять TLS сертификат ссылки для отправки данных"
@@ -2585,7 +2566,6 @@ ru:
           details: "Происходит, когда сообщение создается, редактируется, удаляется или восстанавливается."
         user_event:
           name: "Событие пользователя"
-          details: "Когда пользователь создаётся, утверждается или обновляется."
         delivery_status:
           title: "Статус передачи"
           inactive: "Неактивна"
@@ -2625,7 +2605,7 @@ ru:
         name: "Название"
         none_installed: "Нет ни одного установленного плагина."
         version: "Версия"
-        enabled: "Включен?"
+        enabled: "Включён?"
         is_enabled: "Y"
         not_enabled: "N"
         change_settings: "Настроить"
@@ -2685,7 +2665,7 @@ ru:
             title: "Откатить базу данных к предыдущему рабочему состоянию"
             confirm: "Вы уверены, что хотите откатить базу данных до предыдущего рабочего состояния?"
       export_csv:
-        success: "Процедура экспорта начата, мы отправим вам сообщение, когда процесс будет завершен."
+        success: "Процедура экспорта начата, мы отправим вам сообщение, когда процесс будет завершён."
         failed: "Экспорт не удался. Пожалуйста, проверьте логи."
         button_text: "Экспорт"
         button_title:
@@ -2714,6 +2694,10 @@ ru:
         color: "Цвет"
         opacity: "Прозрачность"
         copy: "Копировать"
+        copy_to_clipboard: "Скопировать в буфер"
+        copied_to_clipboard: "Скопировано в буфер"
+        copy_to_clipboard_error: "Ошибка при копировании данных в буфер омена"
+        theme_owner: "Нередактируемо, владелец: "
         email_templates:
           title: "Шаблоны писем"
           subject: "Тема"
@@ -2738,24 +2722,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 +2888,8 @@ ru:
           block: "заблокировать"
           do_nothing: "ничего не делать"
         staff_actions:
+          all: "всё"
+          filter: "Фильтр:"
           title: "Действия персонала"
           clear_filters: "Показать все"
           staff_user: "Персонал"
@@ -2938,14 +2926,12 @@ ru:
             change_category_settings: "изменена настройка раздела"
             delete_category: "удален раздел"
             create_category: "создан раздел"
-            block_user: "пользователь заблокирован"
-            unblock_user: "пользователь разблокирован"
             grant_admin: "выданы права администратора"
             revoke_admin: "отозваны права администратора"
             grant_moderation: "выданы права модератора"
             revoke_moderation: "отозваны права модератора"
             backup_create: "создать резервную копию"
-            deleted_tag: "удаленный тег"
+            deleted_tag: "удалённый тег"
             renamed_tag: "переименованный тэг"
             revoke_email: "отозвать e-mail"
             lock_trust_level: "заморозка уровня доверия"
@@ -2957,7 +2943,7 @@ ru:
             backup_destroy: "удалить резервную копию"
         screened_emails:
           title: "Почтовые адреса"
-          description: "Когда кто-то создает новую учетную запись, проверяется данный почтовый адрес и регистрация блокируется или производятся другие дополнительные действия."
+          description: "Когда кто-то создаёт новую учётную запись, проверяется данный почтовый адрес и регистрация блокируется или производятся другие дополнительные действия."
           email: "Почтовый адрес"
           actions:
             allow: "Разрешить"
@@ -2987,6 +2973,9 @@ ru:
             title: "Создание новой записи бана целой подсети если уже имеется хотя бы 'min_ban_entries_for_roll_up' записей отдельных IP адресов."
         logster:
           title: "Журнал ошибок"
+      watched_words:
+        form:
+          placeholder_regexp: "Регулярное выражение"
       impersonate:
         title: "Войти от имени пользователя"
         help: "Используйте этот инструмент, чтобы войти от имени пользователя. Может быть полезно для отладки. После этого необходимо выйти и зайти под своей учетной записью снова."
@@ -3006,7 +2995,6 @@ ru:
           pending: "Ожидает одобрения"
           staff: 'Персонал'
           suspended: 'Замороженные'
-          blocked: 'Заблокированные'
           suspect: 'Подозрительные'
         approved: "Подтвердить?"
         approved_selected:
@@ -3031,11 +3019,10 @@ ru:
           staff: "Персонал"
           admins: 'Администраторы'
           moderators: 'Модераторы'
-          blocked: 'Заблокированные пользователи'
           suspended: 'Замороженные пользователи'
           suspect: 'Подозрительные пользователи'
         reject_successful:
-          one: "Успешно отклонен %{count} пользователь."
+          one: "Успешно отклонён %{count} пользователь."
           few: "Успешно отклонены %{count} пользователя."
           many: "Успешно отклонены %{count} пользователей."
           other: "Успешно отклонены %{count} пользователей."
@@ -3051,19 +3038,16 @@ ru:
       user:
         suspend_failed: "Ошибка заморозки пользователя {{error}}"
         unsuspend_failed: "Ошибка разморозки пользователя {{error}}"
-        suspend_duration: "На сколько времени вы хотите заморозить пользователя?"
-        suspend_duration_units: "(дней)"
+        suspend_duration: "На сколько времени заморозить пользователя?"
         suspend_reason_label: "Причина заморозки? Данный текст <b>будет виден всем</b> на странице профиля пользователя и будет отображаться, когда пользователь пытается войти. Введите краткое описание."
         suspend_reason: "Причина"
-        suspended_by: "Заморожен"
+        suspended_by: "Заморожен (кем)"
+        cant_suspend: "Этого пользователя нельзя заморозить."
         delete_all_posts: "Удалить все сообщения"
         delete_all_posts_confirm_MF: "Вы собираетесь удалить {POSTS, plural, one {1 сообщение} other {# сообщений}} и {TOPICS, plural, one {1 тему} other {# тем}}. Вы уверены?"
-        suspend: "Заморозить"
-        unsuspend: "Разморозить"
-        suspended: "Заморожен?"
         moderator: "Модератор?"
         admin: "Администратор?"
-        blocked: "Заблокирован?"
+        suspended: "Заморожен?"
         staged: "Имитация?"
         show_admin_profile: "Администратор"
         refresh_browsers: "Выполнить перезагрузку браузера"
@@ -3079,8 +3063,8 @@ ru:
         grant_admin_confirm: "Мы отправили вам письмо с инструкциями для активации нового администратора."
         revoke_moderation: 'Лишить прав Модератора'
         grant_moderation: 'Выдать права Модератора'
-        unblock: 'Разблокировать'
-        block: 'Заблокировать'
+        unsuspend: 'Разморозить'
+        suspend: 'Заморозить'
         reputation: Репутация
         permissions: Права
         activity: Активность
@@ -3112,19 +3096,19 @@ ru:
           many: "Пользователи не могут быть удалены, если у них есть сообщения. Перед удалением пользователя удалите все его сообщения. (Сообщения старше %{count} дней не могут быть удалены.)"
           other: "Пользователи не могут быть удалены, если у них есть сообщения. Перед удалением пользователя удалите все его сообщения. (Сообщения старше %{count} дней не могут быть удалены.)"
         cant_delete_all_posts:
-          one: "Не удается удалить все сообщения. Некоторые сообщения старше %{count} дня. (Настройка delete_user_max_post_age.)"
-          few: "Не удается удалить все сообщения. Некоторые сообщения старше %{count} дней. (Настройка delete_user_max_post_age.)"
-          many: "Не удается удалить все сообщения. Некоторые сообщения старше %{count} дней. (Настройка delete_user_max_post_age.)"
-          other: "Не удается удалить все сообщения. Некоторые сообщения старше %{count} дней. (Настройка delete_user_max_post_age.)"
+          one: "Не удаётся удалить все сообщения. Некоторые сообщения старше %{count} дня. (Настройка delete_user_max_post_age.)"
+          few: "Не удаётся удалить все сообщения. Некоторые сообщения старше %{count} дней. (Настройка delete_user_max_post_age.)"
+          many: "Не удаётся удалить все сообщения. Некоторые сообщения старше %{count} дней. (Настройка delete_user_max_post_age.)"
+          other: "Не удаётся удалить все сообщения. Некоторые сообщения старше %{count} дней. (Настройка delete_user_max_post_age.)"
         cant_delete_all_too_many_posts:
-          one: "Не удается удалить все сообщения, потому что у пользователя более %{count} сообщения.  (Настройка delete_all_posts_max.)"
-          few: "Не удается удалить все сообщения, потому что у пользователя более %{count} сообщений.  (Настройка delete_all_posts_max.)"
-          many: "Не удается удалить все сообщения, потому что у пользователя более %{count} сообщений.  (Настройка delete_all_posts_max.)"
-          other: "Не удается удалить все сообщения, потому что у пользователя более %{count} сообщений.  (Настройка delete_all_posts_max.)"
+          one: "Не удаётся удалить все сообщения, потому что у пользователя более %{count} сообщения.  (Настройка delete_all_posts_max.)"
+          few: "Не удаётся удалить все сообщения, потому что у пользователя более %{count} сообщений.  (Настройка delete_all_posts_max.)"
+          many: "Не удаётся удалить все сообщения, потому что у пользователя более %{count} сообщений.  (Настройка delete_all_posts_max.)"
+          other: "Не удаётся удалить все сообщения, потому что у пользователя более %{count} сообщений.  (Настройка delete_all_posts_max.)"
         delete_confirm: "Вы УВЕРЕНЫ, что хотите удалить этого пользователя? Это действие необратимо!"
         delete_and_block: "Удалить и <b>заблокировать</b> этот e-mail и IP адрес"
         delete_dont_block: "Только удалить"
-        deleted: "Пользователь удален."
+        deleted: "Пользователь удалён."
         delete_failed: "При удалении пользователя возникла ошибка. Для удаления пользователя необходимо сначала удалить все его сообщения."
         send_activation_email: "Послать активационное письмо"
         activation_email_sent: "Активационное письмо отправлено."
@@ -3133,17 +3117,12 @@ ru:
         activate_failed: "Во время активации пользователя произошла ошибка."
         deactivate_account: "Деактивировать"
         deactivate_failed: "Во время деактивации пользователя произошла ошибка."
-        unblock_failed: 'Не удалось разблокировать пользователя.'
-        block_failed: 'Не удалось заблокировать пользователя.'
-        block_confirm: 'Вы уверены что хотите заблокировать этого пользователя? Он больше не сможет создавать темы и отправлять сообщения.'
-        block_accept: 'Подтвердить блокировку'
         bounce_score: "Возвратов Писем"
         reset_bounce_score:
           label: "Сбросить"
           title: "сбросить карму к 0"
         deactivate_explanation: "Дезактивированные пользователи должны заново подтвердить свой e-mail."
-        suspended_explanation: "Замороженный пользователь не может войти."
-        block_explanation: "Заблокированный не может отвечать и создавать новые темы."
+        suspended_explanation: "Замороженный пользователь не может войти (авторизоваться)."
         staged_explanation: "Имитированный пользователь может отправлять сообщения только по эл.почте в определённые темы."
         bounce_score_explanation:
           none: "Нет возвратов полученных недавно от этой эл.почты."
@@ -3236,7 +3215,7 @@ ru:
         revert_confirm: "Вы уверены что хите отменить ваши изменения?"
         go_back: "Вернуться к поиску"
         recommended: "Мы рекомендуем изменить следующий текст под ваши нужды:"
-        show_overriden: 'Показывать только измененные'
+        show_overriden: 'Показывать только изменённые'
       site_settings:
         show_overriden: 'Показывать только измененные'
         title: 'Настройки'
@@ -3263,6 +3242,7 @@ ru:
           developer: 'Программистам'
           embedding: "Встраивание"
           legal: "Юридическое"
+          api: 'API'
           user_api: 'Пользовательский API'
           uncategorized: 'Вне разделов'
           backups: "Резервные копии"
@@ -3317,7 +3297,7 @@ ru:
         trigger_type:
           none: "Обновлять ежедневно"
           post_action: "Когда пользователь совершает действие над сообщением"
-          post_revision: "Когда пользователь редактирует или создает сообщение"
+          post_revision: "Когда пользователь редактирует или создаёт сообщение"
           trust_level_change: "Когда пользователь меняет уровень доверия"
           user_change: "Когда создается или редактируется пользователь"
           post_processed: "После обработки сообщения"
@@ -3352,7 +3332,7 @@ ru:
       embedding:
         get_started: "Для встраивания на другой сайт необходимо добавить соответствующий хост."
         confirm_delete: "Вы уверены, что хотите удалить это поле?"
-        sample: "Используйте следующий HTML-код на своем сайте, для возможности создания связанных тем. Замените <b>REPLACE_ME</b> канонической ссылкой страницы, куда производится встраивание."
+        sample: "Используйте следующий HTML-код на своём сайте, для возможности создания связанных тем. Замените <b>REPLACE_ME</b> канонической ссылкой страницы, куда производится встраивание."
         title: "Встраивание"
         host: "Разрешённые Хосты"
         path_whitelist: "Разрешённый Путь"
@@ -3399,11 +3379,6 @@ ru:
       upload: "Загрузить"
       uploading: "Загрузка..."
       quit: "Может быть позже"
-      staff_count:
-        one: "В Вашем сообществе 1 сотрудник."
-        few: "В Вашем сообществе %{count} сотрудника."
-        many: "В Вашем сообществе %{count} сотрудников."
-        other: "В Вашем сообществе %{count} сотрудников."
       invites:
         add_user: "добавить"
         none_added: "Вы ещё не пригласили сотрудников. Вы уверены, что хотите продолжить?"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 95c423f83c..b8525ef964 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -119,7 +119,7 @@ sk:
           other: "%{count} rokov neskôr"
       previous_month: 'Predchádzajúci mesiac'
       next_month: 'Nasledujúci mesiac'
-      placeholder: Zvoľte dátum
+      placeholder: Dátum
     share:
       topic: 'zdieľaj odkaz na túto tému'
       post: 'príspevok #%{postNumber}'
@@ -129,9 +129,13 @@ sk:
       google+: 'zdieľaj odkaz na Google+'
       email: 'pošli odkaz emailom'
     action_codes:
+      public_topic: "téma je verejná%{when}"
+      private_topic: "téma je súkromná  %{when}"
       split_topic: "rozdeľ tému %{when}"
       invited_user: "pozvaný %{who} %{when}"
+      invited_group: "pozvaný %{who} %{when}"
       removed_user: "odstránený %{who} %{when}"
+      removed_group: "odstránený %{who} %{when}"
       autoclosed:
         enabled: 'uzavreté %{when}'
         disabled: 'otvorené %{when}'
@@ -150,24 +154,26 @@ sk:
       visible:
         enabled: 'zverejnené %{when}'
         disabled: 'stiahnuté %{when}'
+      banner:
+        enabled: 'Téma je odteraz baner %{when} Bude sa zobrazovať navrchu každej stránky, pokiaľ ju používateľ nezavrie.'
     topic_admin_menu: "akcie administrátora témy"
     emails_are_disabled: "Odosielanie emailov bolo globálne vypnuté administrátorom. Žiadne emailové notifikácie nebudú odoslané."
     bootstrap_mode_enabled: "Pre zjednodušenie spustenia Vašej novej stránky sa nachádzate v zavádzacom režime. Všetci noví používatelia budú mať pridelený stupeň dôvery 1 a budú mať zapnutý denný emailový výber aktualít. Toto bude automaticky vypnuté keď celkový počet používateľov presiahne %{min_users}."
     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 +369,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,14 +377,9 @@ 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."
-      title:
-        one: "skupina"
-        few: "skupiny"
-        other: "skupiny"
       activity: "Aktivita"
       members: "Členovia"
       topics: "Témy"
@@ -389,7 +387,6 @@ sk:
       mentions: "Zmienky"
       messages: "Správy"
       alias_levels:
-        title: "Kto môže poslať správu a @zmieniť túto skupinu?"
         nobody: "Nikto"
         only_admins: "Iba administrátori"
         mods_and_admins: "Iba moderátori a administrátori"
@@ -478,7 +475,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."
@@ -514,7 +510,6 @@ sk:
       admin: "{{user}} je administrátor"
       moderator_tooltip: "Tento používateľ je moderátor"
       admin_tooltip: "Tento používateľ je administrátor"
-      blocked_tooltip: "Tento používateľ je zablokovaný"
       suspended_notice: "Tento  používateľ je suspendovaný do {{date}}"
       suspended_reason: "Dôvod:"
       github_profile: "Github"
@@ -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"
@@ -754,14 +748,6 @@ sk:
           one: "vytvorený príspevok"
           few: "vytvorené príspevky"
           other: "vytvorených príspevkov"
-        likes_given:
-          one: "<i class='fa fa-heart'></i> rozdaný"
-          few: "<i class='fa fa-heart'></i> rozdané"
-          other: "<i class='fa fa-heart'></i> rozdaných"
-        likes_received:
-          one: "<i class='fa fa-heart'></i> získaný"
-          few: "<i class='fa fa-heart'></i> získané"
-          other: "<i class='fa fa-heart'></i> získaných"
         days_visited:
           one: "deň na stránke"
           few: "dni na stránke"
@@ -850,7 +836,6 @@ sk:
     first_post: Prvý príspevok
     mute: Ignorovať
     unmute: Prestať ignorovať
-    last_post: Posledný príspevok
     last_reply_lowercase: posledná odpoveď
     replies_lowercase:
       one: odpoveď
@@ -947,7 +932,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"
@@ -1028,12 +1012,7 @@ sk:
       olist_title: "Číslované odrážky"
       ulist_title: "Odrážky"
       list_item: "Položka zoznamu"
-      heading_label: "H"
-      heading_title: "Nadpis"
-      heading_text: "Nadpis"
-      hr_title: "Horizonálny oddeľovač"
       help: "Nápoveda úprav pre Markdown"
-      toggler: "skryť alebo zobraziť panel úprav"
       modal_ok: "OK"
       modal_cancel: "Zrušiť"
       cant_send_pm: "Ľutujeme, nemôžete poslať správu používateľovi %{username}."
@@ -1044,22 +1023,6 @@ sk:
       empty: "Žiadne upozornenia sa nenašli."
       more: "zobraziť staršie upozornenia"
       total_flagged: "označených príspevkov celkom"
-      mentioned: "<i title='zmienený' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
-      group_mentioned: "<i title='zmienená skupina' 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>"
-      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>"
-      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> prijal Vaše pozvanie</p>"
-      moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> presunul {{description}}</p>"
-      granted_badge: "<i title='udelený odznak' class='fa fa-certificate'></i><p>Získal '{{description}}'</p>"
-      group_message_summary:
-        one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} správa vo vašej {{group_name}} schránke</p>"
-        few: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} správy vo vašej {{group_name}} schránke</p>"
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} správ vo vašej {{group_name}} schránke</p>"
       alt:
         mentioned: "Zmienený od"
         quoted: "Citovaný používateľom"
@@ -1106,10 +1069,6 @@ sk:
       select_all: "Označ všetky"
       clear_all: "Odznač všetky"
       too_short: "Vyhladávací termín je príliš krátky."
-      result_count:
-        one: "1 výsledok pre <span class='term'>\"{{term}}\"</span>"
-        few: "{{count}} výsledky pre <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} výsledkov pre <span class='term'>\"{{term}}\"</span>"
       title: "hľadaj témy, príspevky, používateľov, alebo kategórie"
       no_results: "Žiadne výsledky"
       no_more_results: "Nenašlo sa viac výsledkov"
@@ -1124,18 +1083,11 @@ sk:
         title: Rozširené vyhľadávanie
         posted_by:
           label: Autor príspevku
-        in_category:
-          label: V kategórii
-        with_tags:
-          label: Má štítky
         filters:
-          label: Hľadaj iba v témach/prispevkoch, ktoré...
           likes: sa mi páčia
           posted: obsahujú môj príspevok
           watching: Sledujem
           tracking: Pozorujem
-          private: sú v mojich správach
-          seen: som čítal
           unseen: som nečítal
         statuses:
           label: Kde témy
@@ -1454,7 +1406,6 @@ sk:
       multi_select:
         select: 'označ'
         selected: 'označených ({{count}})'
-        select_replies: 'označ +odpovede'
         delete: zmaž označené
         cancel: zrušiť výber
         select_all: označ všetko
@@ -1467,7 +1418,6 @@ sk:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citácia"
-      edit: "Upravujete {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Dôvod:"
       post_number: "príspevok {{number}}"
       last_edited_on: "príspevok naposledy upravený"
@@ -1533,13 +1483,6 @@ sk:
         undelete: "vrátiť späť odstránenie príspevku"
         share: "zdieľať odkaz na tento príspevok"
         more: "Viac"
-        delete_replies:
-          confirm:
-            one: "Chcete tiež odstrániť {{count}} priamu reakciu na tento príspevok?"
-            few: "Chcete tiež odstrániť {{count}} priame reakcie na tento príspevok?"
-            other: "Chcete tiež odstrániť {{count}} priamych reakcií na tento príspevok?"
-          yes_value: "Áno, odstrániť aj reakcie."
-          no_value: "Nie, len tento príspevok."
         admin: "akcie administrátora príspevku"
         wiki: "Spraviť Wiki"
         unwiki: "Odstrániť Wiki"
@@ -1550,10 +1493,6 @@ sk:
         change_owner: "Zmeniť vlastníctvo"
       actions:
         flag: 'Označ'
-        defer_flags:
-          one: "Zrušiť označenie"
-          few: "Zrušiť označenia"
-          other: "Zrušiť označenia"
         undo:
           off_topic: "Zruš označenie"
           spam: "Zruš označenie"
@@ -1638,11 +1577,6 @@ sk:
             one: "1 osoba hlasovala za tento príspevok"
             few: "{{count}} osoby hlasovali za tento príspevok"
             other: "{{count}} osôb hlasovalo za tento príspevok"
-      delete:
-        confirm:
-          one: "Ste si istý že chcete zmazať tento príspevok?"
-          few: "Ste si istý že chcete zmazať všetky tieto príspevky?"
-          other: "Ste si istý že chcete zmazať všetky tieto príspevky?"
       revisions:
         controls:
           first: "Prvá revízia"
@@ -1671,8 +1605,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'
@@ -1948,7 +1880,6 @@ sk:
         hamburger_menu: '<b>=</b> Otvoriť hamburger menu'
         user_profile_menu: '<b>p</b> Otvor užívateľské menu'
         show_incoming_updated_topics: '<b>.</b> Zobraz aktualizované témy'
-        search: '<b>/</b> Hľadať'
         help: '<b>?</b> Pomoc s klávesovými skratkami'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Zahodiť Nové/Príspevky'
         dismiss_topics: '<b>x</b>, <b>t</b> Zahodiť témy'
@@ -2002,9 +1933,7 @@ sk:
       selector_no_tags: "žiadne štítky"
       changed: "zmenené štítky:"
       tags: "Štítky"
-      choose_for_topic: "Zvoľte voliteľné štítky pre túto tému"
       delete_tag: "Zmazať štítok"
-      delete_confirm: "Ste si istý, že chcete zmazať tento štítok?"
       rename_tag: "Premenovať štítok"
       rename_instructions: "Vyberte nové meno pre štítok:"
       sort_by: "Zoradiť podľa:"
@@ -2089,7 +2018,6 @@ sk:
         no_problems: "Nenašli sa žiadne problémy."
         moderators: 'Moderátori:'
         admins: 'Administrátori:'
-        blocked: 'Zablokované:'
         suspended: 'Odobraté:'
         private_messages_short: "Správy"
         private_messages_title: "Správy"
@@ -2120,24 +2048,12 @@ sk:
         by: "podľa"
       flags:
         title: "Označenia"
-        old: "Staré"
-        active: "Aktívny"
         agree: "Súhlasiť"
         agree_title: "Akceptovať toto označenie ako platné a správne"
-        agree_flag_modal_title: "Súhlasiť a ...."
-        agree_flag_hide_post: "Súhlasiť (skryť príspevok a poslať súkromnú správu)"
-        agree_flag_hide_post_title: "Skryť tento príspevok a automaticky poslať súkromnú správu s výzvou na úpravu príspevku."
-        agree_flag_restore_post: "Súhlasiť (obnoviť príspevok)"
-        agree_flag_restore_post_title: "Obnoviť tento príspevok"
-        agree_flag: "Súhlasiť s označením"
-        agree_flag_title: "Súhlasiť s označením, ale nemeníť príspevok"
-        defer_flag: "Odložiť"
         defer_flag_title: "Zrušíť označenie. Žiadna akcia nie je nateraz potrebná."
         delete: "Odstrániť"
         delete_title: "Zmazať príspevok na ktorý označenie odkazuje ."
-        delete_post_defer_flag: "Zmazať príspevok a zrušiť označenie"
         delete_post_defer_flag_title: "Zmazať prípspevok; ak ide o prvý príspevok, zmazať aj tému"
-        delete_post_agree_flag: "Zmazať príspevok a súhlasiť s označením"
         delete_post_agree_flag_title: "Zmazať prípspevok; ak ide o prvý príspevok, zmazať aj tému"
         delete_flag_modal_title: "Zmazať a..."
         delete_spammer: "Zmazať spammera"
@@ -2152,39 +2068,16 @@ sk:
         dispositions:
           agreed: "odsúhlasené"
           disagreed: "neodsúhlasené"
-          deferred: "odložené"
         flagged_by: "Označené "
         resolved_by: "Vyriešené"
         took_action: "Prijal opatrenia"
         system: "Systém"
         error: "Niečo sa pokazilo"
         reply_message: "Odpovedať"
-        no_results: "Žiadne označenia."
         topic_flagged: "Táto <strong>téma</strong> bola označená. "
         visit_topic: "Navšťívte tému pre prijatie opatrení"
         was_edited: "Príspevok bol upravený po prvom označení"
         previous_flags_count: "Tento príspevok bol už označený {{count}} krát."
-        summary:
-          action_type_3:
-            one: "mimo tému"
-            few: "mimo tému x{{count}}"
-            other: "mimo tému x{{count}}"
-          action_type_4:
-            one: "nevhodný"
-            few: "nevhodné x{{count}}"
-            other: "nevhodných x{{count}}"
-          action_type_6:
-            one: "vlastná"
-            few: "vlastné x{{count}}"
-            other: "vlastných x{{count}}"
-          action_type_7:
-            one: "vlastný"
-            few: "vlastné x{{count}}"
-            other: "vlastných x{{count}}"
-          action_type_8:
-            one: "spam"
-            few: "spam x{{count}}"
-            other: "spam x{{count}}"
       groups:
         primary: "Hlavná skupina"
         no_primary: "(bez hlavnej skupiny)"
@@ -2473,8 +2366,6 @@ sk:
             change_category_settings: "zmeniť nastavenia kategórie"
             delete_category: "odstrániť kategóriu"
             create_category: "vytvoriť kategóriu"
-            block_user: "blokovať používateľa"
-            unblock_user: "odblokovať používateľa"
             grant_admin: "udeliť administrátorské práva"
             revoke_admin: "odobrať admin"
             grant_moderation: "udeliť moderátorské práva"
@@ -2532,7 +2423,6 @@ sk:
           pending: "Čakajúci"
           staff: 'Zamestnanci'
           suspended: 'Odobrate práva'
-          blocked: 'Zablokovaný'
           suspect: 'Podozrivý'
         approved: "Schválený?"
         approved_selected:
@@ -2555,7 +2445,6 @@ sk:
           staff: "Zamestnanci"
           admins: 'Admin používatelia'
           moderators: 'Moderátori'
-          blocked: 'Zablokovaní užívatelia'
           suspended: 'Užívatelia s odobratými právami'
           suspect: 'Podozriví užívatelia'
         reject_successful:
@@ -2574,17 +2463,13 @@ sk:
         suspend_failed: "Niečo sa pokazilo pri odoberaní práv tomuto používateľovi {{error}}"
         unsuspend_failed: "Niečo sa pokazilo pri obnovovaní práv tomuto používateľovi {{error}}"
         suspend_duration: "Ako dlho budú používateľovi odobrate práva?"
-        suspend_duration_units: "(dni)"
         suspend_reason_label: "Prečo mu odoberáte práva? Tento text <b>sa zobrazí každému</b> na stránke profilu používateľa a bude zobrazený užívateľovi pri pokuse o prihlásenie. Buďte strucný."
         suspend_reason: "Dôvod"
         suspended_by: "Práva odobraté"
         delete_all_posts: "Zmazať všetky príspevky"
-        suspend: "Odobrať"
-        unsuspend: "Obnoviť"
-        suspended: "Odobrate práva?"
         moderator: "Moderátor?"
         admin: "Admin?"
-        blocked: "Blokovaný?"
+        suspended: "Odobrate práva?"
         staged: "Dočasný?"
         show_admin_profile: "Admin"
         refresh_browsers: "Vynútiť refresh browsera."
@@ -2598,8 +2483,8 @@ sk:
         grant_admin: 'Udeliť admin'
         revoke_moderation: 'Odobrať moderovanie'
         grant_moderation: 'Udeliť moderovanie'
-        unblock: 'Odblokovať'
-        block: 'Blokovať'
+        unsuspend: 'Obnoviť'
+        suspend: 'Odobrať'
         reputation: Reputácia
         permissions: Práva
         activity: Aktivita
@@ -2649,13 +2534,8 @@ sk:
         activate_failed: "Počas aktivácie používateľa nastala chyba."
         deactivate_account: "Deaktivovať účet"
         deactivate_failed: "Počas deaktivácie používateľa nastala chyba."
-        unblock_failed: 'Nastala chyba pri odblokovaní používateľa.'
-        block_failed: 'Nastala chyba pri zablokovaní používateľa.'
-        block_confirm: 'Ste si istý tým, že chcete zablokovať tohoto používateľa? Nebude môcť vytvárať žiadne nové témy alebo príspevky.'
-        block_accept: 'Ano, zablokovať používateľa'
         deactivate_explanation: "Deaktivovaý používateľ musí znovu overiť svoj email"
         suspended_explanation: "Suspendovaní užívatelia sa nemôžu prihlasovať."
-        block_explanation: "Zablokovaní používatelia nemôžu zakladať témy ani pridávať príspevky."
         staged_explanation: "Dočasný používateľ môže iba prispievať emailom do vybraných tém."
         trust_level_change_failed: "Nastala chyba pri zmene stupňa dôvery používateľa."
         suspend_modal_title: "Zruš práva používateľovi"
@@ -2891,10 +2771,6 @@ sk:
       upload: "Načítať"
       uploading: "Načítavam..."
       quit: "Možno neskôr"
-      staff_count:
-        one: "Vaša komunita má 1 člena. "
-        few: "Vaša komunita má %{count} členov. "
-        other: "Vaša komunita má %{count} členov. "
       invites:
         add_user: "pridať"
         none_added: "Neprizvali ste žiadnych členov. Určite chcete pokračovať?"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index d968ad7925..81b758a2b1 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -101,7 +101,6 @@ sq:
           other: "%{count} vjet më vonë"
       previous_month: 'Muaji i kaluar'
       next_month: 'Muaji i ardhshëm'
-      placeholder: Zgjidh një datë
     share:
       topic: 'shpërnda një lidhje tek kjo temë'
       post: 'postim #%{postNumber}'
@@ -144,20 +143,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,22 +346,21 @@ 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:
-        one: "grup"
-        other: "grupe"
       activity: "Aktiviteti"
       members: "Anëtarë"
       topics: "Tema"
@@ -370,7 +368,6 @@ sq:
       mentions: "Përmendje"
       messages: "Mesazhet"
       alias_levels:
-        title: "Kush mund ti bëjë mesazh dhe @permendje këtij grupi?"
         nobody: "Asnjëri"
         only_admins: "Vetëm adminët"
         mods_and_admins: "Vetëm moderatorët dhe adminët"
@@ -458,7 +455,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. "
@@ -495,7 +491,6 @@ sq:
       admin: "{{user}} është admin"
       moderator_tooltip: "Ky anëtar është moderator"
       admin_tooltip: "Ky anëtar është administrator"
-      blocked_tooltip: "Ky anëtar është i bllokuar"
       suspended_notice: "Ky anëtar është përjashtuar deri më {{date}}."
       suspended_reason: "Arsyeja:"
       github_profile: "Github"
@@ -579,13 +574,13 @@ 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"
         taken: "Na vjen keq, por ky email nuk është i disponueshëm."
         error: "Hasëm një gabim gjatë ndryshimit të adresës email. Mos vallë është në përdorim nga dikush tjetër?"
         success: "Ju dërguam një email tek adresa që shkruajtët. Ju ftojmë të ndiqni udhëzimet e konfirmimit."
+        success_staff: "Ju dërguam një email tek adresa që shkruajtët. Ju ftojmë të ndiqni udhëzimet e konfirmimit."
       change_avatar:
         title: "Ndrysho fotografinë e profilit"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, bazur në"
@@ -744,12 +739,6 @@ sq:
         post_count:
           one: "postim i krijuar"
           other: "postime të krijuara"
-        likes_given:
-          one: "<i class='fa fa-heart'></i> dhënë"
-          other: "<i class='fa fa-heart'></i> dhënë"
-        likes_received:
-          one: "<i class='fa fa-heart'></i> marrë"
-          other: "<i class='fa fa-heart'></i> marrë"
         days_visited:
           one: "ditë që viziton faqen"
           other: "ditë që viziton faqen"
@@ -839,7 +828,6 @@ sq:
     first_post: Postimi i parë
     mute: Hesht
     unmute: Çaktivizo heshtjen
-    last_post: Postimi i fundit
     last_reply_lowercase: përgjigja e fundit
     replies_lowercase:
       one: përgjigje
@@ -946,7 +934,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 +957,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 +968,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."
@@ -1032,12 +1021,7 @@ sq:
       olist_title: "Listë e numëruar"
       ulist_title: "Listë me pika"
       list_item: "Element liste"
-      heading_label: "T"
-      heading_title: "Titull"
-      heading_text: "Titull"
-      hr_title: "Vizë ndarëse horizontale"
       help: "Ndihmë mbi Markdown"
-      toggler: "trego ose fshih panelin e shkrimit"
       modal_ok: "OK"
       modal_cancel: "Anulo"
       cant_send_pm: "Na vjen keq, nuk mund t'i dërgoni mesazh privat anëtarit %{username}."
@@ -1051,28 +1035,6 @@ sq:
       empty: "Nuk u gjet asnjë njoftim. "
       more: "shiko njoftimet e kaluara"
       total_flagged: "totali i postimeve të sinjalizuar"
-      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='pëlqeu' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
-      liked_2: "<i title='pëlqeu' class='fa fa-heart'></i><p><span>{{username}}, {{username2}}</span> {{description}}</p>"
-      liked_many:
-        one: "<i title='pëlqeu' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} dhe 1 tjetër</span> {{description}}</p>"
-        other: "<i title='pëlqeu' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} dhe {{count}} të tjerë</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> pranoi ftesën tuaj</p>"
-      moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> transferoi {{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>Fituat '{{description}}'</p>"
-      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Temë e re</span> {{description}}</p>"
-      group_message_summary:
-        one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} message in your {{group_name}} inbox</p>"
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} mesazhe në inboxin e {{group_name}}</p>"
       alt:
         mentioned: "Përmendur nga"
         quoted: "Cituar nga"
@@ -1120,15 +1082,11 @@ sq:
       select_all: "Zgjidhni Gjithçka"
       clear_all: "Pastro kriteret"
       too_short: "Fraza e kërkuar është shumë e shkurtër. "
-      result_count:
-        one: "1 rezultat për <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} rezultate për <span class='term'>\"{{term}}\"</span>"
       title: "kërko në faqe"
       no_results: "Nuk u gjet asnjë rezultat."
       no_more_results: "Nuk gjetëm rezultate të tjera. "
       searching: "Duke kërkuar..."
       post_format: "#{{post_number}} nga {{username}}"
-      results_page: "Rezultatet e kërkimit"
       context:
         user: "Kërko postime nga @{{username}}"
         category: "Kërkoni kategorinë #{{category}}"
@@ -1138,14 +1096,10 @@ sq:
         title: Kërkim i avancuar
         posted_by:
           label: Postuar nga
-        in_category:
-          label: Në kategorinë
         in_group:
           label: Në grupin
         with_badge:
           label: Me stemën
-        with_tags:
-          label: Me etiketat
     hamburger_menu: "shko tek një kategori ose një listë e re temash"
     new_item: "e re"
     go_back: 'kthehu mbrapa'
@@ -1252,6 +1206,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 +1237,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. '
@@ -1441,7 +1399,6 @@ sq:
     post:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
-      edit: "Duke modifikuar {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Arsyeja:"
       post_number: "postimi {{number}}"
       last_edited_on: "redaktimi i fundit u krye më"
@@ -1503,12 +1460,6 @@ sq:
         undelete: "anuloni fshirjen e postimit"
         share: "shpërndani një link tek ky postim"
         more: "Më shumë"
-        delete_replies:
-          confirm:
-            one: "A doni të fshini edhe 1 përgjigje direkte ndaj këtij postimi?"
-            other: "A doni të fshini edhe {{count}} përgjigjet direkte ndaj këtij postimi?"
-          yes_value: "Po, fshi edhe përgjigjet"
-          no_value: "Jo, vetëm këtë postim"
         admin: "veprimet administrative mbi postimin"
         wiki: "Bëje Wiki"
         unwiki: "Hiqe Wiki"
@@ -1519,9 +1470,6 @@ sq:
         change_owner: "Ndrysho zotëruesin"
       actions:
         flag: 'Sinjalizoni'
-        defer_flags:
-          one: "Shty sinjalizimin"
-          other: "Shty sinjalizimet"
         undo:
           off_topic: "Anulo sinjalizimin"
           spam: "Anulo sinjalizimin"
@@ -1597,10 +1545,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 +1558,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 +1582,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 +1691,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 +1831,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'
@@ -1884,7 +1840,6 @@ sq:
         hamburger_menu: '<b>=</b> Hap menunë hamburger'
         user_profile_menu: '<b>p</b> Hap menunë e përdoruesit'
         show_incoming_updated_topics: '<b>.</b> Shiko temat e përditësuara'
-        search: '<b>/</b> Kërko'
         help: '<b>?</b> Trego shkurtimet e tastierës'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Hiq Të Rejat/Postimet'
         dismiss_topics: '<b>x</b>, <b>t</b> Hiq temat'
@@ -1908,6 +1863,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 +1871,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"
@@ -1952,9 +1910,7 @@ sq:
       selector_no_tags: "asnjë etiketë"
       changed: "etiketat e ndryshuara:"
       tags: "Etiketat"
-      choose_for_topic: "zgjidhni etiketat fakultative për këtë temë"
       delete_tag: "Fshi etiketën"
-      delete_confirm: "Jeni të sigurtë që doni të fshini këtë etiketë?"
       rename_tag: "Riemëro etiketën"
       rename_instructions: "Zgjidhni një emër të ri për këtë etiketë"
       sort_by: "Rendit sipas:"
@@ -2044,7 +2000,6 @@ sq:
         no_problems: "Nuk u gjet asnjë gabim."
         moderators: 'Moderatorët:'
         admins: 'Administratorët:'
-        blocked: 'Bllokuar:'
         suspended: 'Përjashtuar:'
         private_messages_short: "Msgs"
         private_messages_title: "Mesazhet"
@@ -2074,24 +2029,12 @@ sq:
         by: "nga"
       flags:
         title: "Sinjalizimet"
-        old: "Të Vjetra"
-        active: "Aktive"
         agree: "Pranoj"
         agree_title: "Konfirmo këtë sinjalizim si të vlefshëm do korrekt"
-        agree_flag_modal_title: "Prano dhe..."
-        agree_flag_hide_post: "Dakord (fshi postimin + ço MP)"
-        agree_flag_hide_post_title: "Fshihe këtë postim automatikisht dhe çoi postuesit një mesazh që t'a redaktojë postimin"
-        agree_flag_restore_post: "Dakord (rikthe postimin)"
-        agree_flag_restore_post_title: "Rikthe këtë postim"
-        agree_flag: "Bi dakord me sinjalizimin"
-        agree_flag_title: "Dakord me sinjalizimin dhe lini postimin të pandryshuar"
-        defer_flag: "Shty"
         defer_flag_title: "Hiqe këtë sinjalizim; nuk ka nevojë për veprime në këtë moment. "
         delete: "Fshij"
         delete_title: "Fshini postimin e sinjalizuar."
-        delete_post_defer_flag: "Fshini postimin dhe shtyni për më vonë sinjalizimin"
         delete_post_defer_flag_title: "Fshini postimin; në qoftë postim i parë, fshihet tema"
-        delete_post_agree_flag: "Fshini postimin dhe bini dakord me sinjalizimin"
         delete_post_agree_flag_title: "Fshini postimin; në qoftë postim i parë, fshihet tema"
         delete_flag_modal_title: "Fshi dhe..."
         delete_spammer: "Elimino Spammer"
@@ -2106,34 +2049,16 @@ sq:
         dispositions:
           agreed: "dakort"
           disagreed: "nuk ishte dakord"
-          deferred: "shtyu"
         flagged_by: "Sinjalizuar nga"
         resolved_by: "Zgjidhur nga"
         took_action: "Mori veprimin"
         system: "Sistemi"
         error: "Pati një gabim"
         reply_message: "Përgjigju"
-        no_results: "Nuk ka sinjalizime."
         topic_flagged: "Kjo <strong>temë</strong> është sinjalizuar."
         visit_topic: "Vizito temën për të vepruar"
         was_edited: "Postimi është redaktuar pas sinjalizimit të parë"
         previous_flags_count: "Ky postim është sinjalizuar {{count}} herë."
-        summary:
-          action_type_3:
-            one: "jashtë teme"
-            other: "jashtë teme x{{count}}"
-          action_type_4:
-            one: "e papërshtatshme"
-            other: "e papërshtatshme x{{count}}"
-          action_type_6:
-            one: "tjetër"
-            other: "tjetër x{{count}}"
-          action_type_7:
-            one: "tjetër"
-            other: "tjetër x{{count}}"
-          action_type_8:
-            one: "spam"
-            other: "spam x{{count}}"
       groups:
         primary: "Grupi Parësor"
         no_primary: "(asnjë grup parësor)"
@@ -2378,8 +2303,6 @@ sq:
             change_category_settings: "ndrysho parametrat e kategorisë"
             delete_category: "fshi kategorinë"
             create_category: "krijo një kategori"
-            block_user: "blloko anëtarin"
-            unblock_user: "çblloko anëtarin"
             grant_admin: "jepi rolin admin"
             revoke_admin: "hiq rolin admin"
             grant_moderation: "jepi rolin moderator"
@@ -2429,7 +2352,6 @@ sq:
           pending: "Pezulluar"
           staff: 'Stafi'
           suspended: 'Të pezulluar'
-          blocked: 'Të bllokuar'
           suspect: 'Të dyshimtë'
         approved: "Aprovuar?"
         approved_selected:
@@ -2450,7 +2372,6 @@ sq:
           staff: "Stafi"
           admins: 'Administratorë'
           moderators: 'Moderatorë'
-          blocked: 'Përdorues të Bllokuar'
           suspended: 'Përdorues të Pezulluar'
           suspect: 'Përdorues të Dyshimtë'
         reject_successful:
@@ -2467,17 +2388,13 @@ sq:
         suspend_failed: "Pati një problem gjatë pezullimit të anëtarit. {{error}}"
         unsuspend_failed: "Pati një problem gjatë çpezullimit të anëtarit. {{error}}"
         suspend_duration: "Për sa kohë do të pezullohet anëtari?"
-        suspend_duration_units: "(ditë)"
         suspend_reason_label: "Pse po e pezulloni? Ky tekst <b>do të shfaqet publikisht</b> në profilin e këtij anëtari, dhe do t'i shfaqet vetë anëtarit si mesazh kur ky i fundit do tentojë të futet në faqe. Shkruani shkurt."
         suspend_reason: "Arsye"
         suspended_by: "Përjashtuar nga:"
         delete_all_posts: "Fshi gjithë postimet"
-        suspend: "Pezullo"
-        unsuspend: "Çpezullo"
-        suspended: "Pezulluar?"
         moderator: "Moderator?"
         admin: "Admin?"
-        blocked: "Bllokuar?"
+        suspended: "Pezulluar?"
         staged: "Staged?"
         show_admin_profile: "Admin"
         refresh_browsers: "Forco rifreskimin e shfletuesit"
@@ -2491,8 +2408,8 @@ sq:
         grant_admin: 'Jepi rolin admin'
         revoke_moderation: 'Hiqi rolin moderator'
         grant_moderation: 'Jepi rolin moderator'
-        unblock: 'Çblloko'
-        block: 'Blloko'
+        unsuspend: 'Çpezullo'
+        suspend: 'Pezullo'
         reputation: Reputacioni
         permissions: Të drejtat
         activity: Aktiviteti
@@ -2526,17 +2443,12 @@ sq:
         activate_failed: "Pati një problem gjatë aktivizimit të anëtarit."
         deactivate_account: "Çaktivizo llogarinë"
         deactivate_failed: "Pati një problem gjatë çaktivizimit të anëtarit."
-        unblock_failed: 'Pati një problem gjatë çbllokimit të anëtarit.'
-        block_failed: 'Pati një problem gjatë bllokimit të anëtarit.'
-        block_confirm: 'A jeni të sigurtë që doni të bllokoni këtë anëtar? Anëtari nuk do të ketë më të drejtën të krijojë postime ose tema të reja.'
-        block_accept: 'Po, blloko anëtarin'
         bounce_score: "Rezultati \"bounce\""
         reset_bounce_score:
           label: "Rivendos"
           title: "Rivendos në 0 rezultatin \"bounce\""
         deactivate_explanation: "Një anëtar i çaktivizuar duhet të ri-verifikojë adresën email."
         suspended_explanation: "Një anëtar i pezulluar nuk ka të drejtë të identifikohet. "
-        block_explanation: "Një anëtar i bllokuar nuk mund të përgjigjet apo të hapë tema të reja. "
         staged_explanation: "Një anëtar \"staged\" mund të postojë vetëm me email në tema të caktuara. "
         bounce_score_explanation:
           none: "Nuk ka patur mesazhe email të kthyera për këtë anëtar."
@@ -2586,6 +2498,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 +2519,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 +2540,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 +2566,7 @@ sq:
           user_preferences: "Rregullimet e përdoruesit"
           tags: "Etiketat"
           search: "Kërko"
+          groups: "Grupet"
       badges:
         title: Stemat
         new_badge: Stemë e Re
@@ -2730,9 +2645,6 @@ sq:
       upload: "Ngarko"
       uploading: "Duke ngarkuar..."
       quit: "Mbase më vonë"
-      staff_count:
-        one: "Komuniteti juaj ka 1 anëtar stafi."
-        other: "Komuniteti juaj ka %{count} anëtarë stafi."
       invites:
         add_user: "shto"
         none_added: "Nuk keni ftuar asnjë staf. Doni të vazhdoni?"
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
new file mode 100644
index 0000000000..c871946ff1
--- /dev/null
+++ b/config/locales/client.sr.yml
@@ -0,0 +1,2045 @@
+# 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/
+
+sr:
+  js:
+    number:
+      format:
+        separator: "."
+        delimiter: ","
+      human:
+        storage_units:
+          format: '%n %u'
+          units:
+            byte:
+              one: Bajt
+              few: Bajta
+              other: Bajta
+            gb: GB
+            kb: KB
+            mb: MB
+            tb: TB
+      short:
+        thousands: "{{number}}k"
+        millions: "{{number}}M"
+    dates:
+      time: "HH:mm"
+      timeline_date: "MMM YYYY"
+      long_no_year: "D MMM HH:mm"
+      long_no_year_no_time: "D MMM"
+      full_no_year_no_time: "MMMM Do"
+      long_with_year: "D MMM YYYY HH:mm"
+      long_with_year_no_time: "D MMM YYYY"
+      full_with_year_no_time: "MMMM Do, YYYY"
+      long_date_with_year: "MMM D, 'YY LT"
+      long_date_without_year: "MMM D, LT"
+      long_date_with_year_without_time: "MMM D, 'YY"
+      long_date_without_year_with_linebreak: "MMM D <br/>LT"
+      long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
+      wrap_ago: "%{date} ranije"
+      tiny:
+        half_a_minute: "< 1m"
+        less_than_x_seconds:
+          one: "< %{count} s"
+          few: "< %{count} s"
+          other: "< %{count} s"
+        x_seconds:
+          one: "%{count} sek."
+          few: "%{count} sek."
+          other: "%{count} sek."
+        less_than_x_minutes:
+          one: "< %{count}m"
+          few: "< %{count}m"
+          other: "< %{count}m"
+        x_minutes:
+          one: "%{count} min"
+          few: "%{count} min"
+          other: "%{count} min"
+        about_x_hours:
+          one: "%{count}sat"
+          few: "%{count} sata"
+          other: "%{count}sati"
+        x_days:
+          one: "%{count} dan"
+          few: "%{count} dana"
+          other: "%{count} dana"
+        x_months:
+          one: "%{count} mes"
+          few: "%{count}mes"
+          other: "%{count}mes"
+        about_x_years:
+          one: "%{count} godina"
+          few: "%{count} godine"
+          other: "%{count} godina"
+        over_x_years:
+          one: "> %{count} godina"
+          few: "> %{count} godine"
+          other: "> %{count} godina"
+        almost_x_years:
+          one: "%{count} godina"
+          few: "%{count} godine"
+          other: "%{count} godina"
+        date_month: "D MMM"
+        date_year: "MMM 'YY"
+      medium:
+        x_minutes:
+          one: "%{count} min"
+          few: "%{count} min"
+          other: "%{count} min"
+        x_hours:
+          one: "%{count} sat"
+          few: "%{count} sata"
+          other: "%{count} sati"
+        x_days:
+          one: "%{count} dan"
+          few: "%{count} dana"
+          other: "%{count} dana"
+        date_year: "D MMM 'YY"
+      medium_with_ago:
+        x_minutes:
+          one: "pre %{count} minut"
+          few: "pre %{count} minuta"
+          other: "pre %{count} minuta"
+        x_hours:
+          one: "pre %{count} sat"
+          few: "pre %{count} sata"
+          other: "pre %{count} sati"
+        x_days:
+          one: "pre %{count} dan"
+          few: "pre %{count} dana"
+          other: "pre %{count} dana"
+      later:
+        x_days:
+          one: "%{count} dan kasnije"
+          few: "%{count} dana kasnije"
+          other: "%{count} dana kasnije"
+        x_months:
+          one: "%{count} mesec kasnije"
+          few: "%{count} meseca kasnije"
+          other: "%{count} meseci kasnije"
+        x_years:
+          one: "%{count} godina kasnije"
+          few: "%{count} godine kasnije"
+          other: "%{count} godina kasnije"
+      previous_month: 'Prethodni mesec'
+      next_month: 'Sledeći mesec'
+      placeholder: datum
+    share:
+      topic: 'podeli link na ovu temu'
+      post: 'poruka #%{postNumber}'
+      close: 'zatvori'
+      twitter: 'podeli ovaj link na Twitteru'
+      facebook: 'podeli ovaj link na Facebooku'
+      google+: 'podeli ovaj link na Google+'
+      email: 'podeli ovaj link preko e-pošte'
+    action_codes:
+      public_topic: "objavi ovu temu javno %{when}"
+      private_topic: "objavi ovu temu privatno %{when}"
+      split_topic: "podeli ovu temu %{when}"
+      invited_user: "pozvan %{who} %{when}"
+      invited_group: "pozvan%{who}%{when}"
+      user_left: "%{who} je sam sebe obrisao iz ove poruke %{when}"
+      removed_user: "uklonjen %{who} %{when}"
+      removed_group: "uklonjen%{who}%{when}"
+      autoclosed:
+        enabled: 'zatvoreno %{when}'
+        disabled: 'otvoreno %{when}'
+      closed:
+        enabled: 'zatvoreno %{when}'
+        disabled: 'otvoreno %{when}'
+      archived:
+        enabled: 'zapakovano %{when}'
+        disabled: 'raspakovano %{when}'
+      pinned:
+        enabled: 'prikačen%{when}'
+        disabled: 'otkačen%{when}'
+      pinned_globally:
+        enabled: 'Globalno prikačeno%{when}'
+        disabled: 'otkačen%{when}'
+      visible:
+        enabled: 'ulistano %{when}'
+        disabled: 'izlistano %{when}'
+      banner:
+        enabled: 'je ovo načinio banerom%{when}. Pojavljivaće se na vrhu svake stranice dok ga korisnik ne ukloni.'
+        disabled: 'je uklonio ovaj baner%{when}. Više se neće pojavljivati na vrhu svake stranice.'
+    topic_admin_menu: "tema admin akcije"
+    wizard_required: "Dobrodošli na Vaš novi Discourse! Počnimo sa <a href='%{url}' data-auto-route='true'>instalacijom</a>"
+    emails_are_disabled: "Sva odlazeća epošta je onemogućena globalno od strane administratora. Ni jedna notifikacija neće biti poslata."
+    bootstrap_mode_enabled: "Ne bi li olakšali lansiranje Vašeg novoj sajta, trenutno ste u bootstrap modu. Svim novim korisnicima će biti dodeljen nivo poverljivosti 1 i imaće omogućene dnevne e-mail preglede. Ovo će automatski biti isključeno kada ukupni broj korisnika pređe %{min_users}korisnika."
+    bootstrap_mode_disabled: "Bootstrap mod će biti isključen u naredna 24 časa."
+    themes:
+      default_description: "zadato"
+    s3:
+      regions:
+        ap_northeast_1: "Azija Pacifik (Tokio)"
+        ap_northeast_2: "Azija Pacifik (Seul)"
+        ap_south_1: "Azija Pacifik (Mumbai)"
+        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)"
+        eu_west_2: "EU (London)"
+        sa_east_1: "Južna Amerika (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: 'Izmeni naziv i kategoriju ove teme'
+    not_implemented: "Ova stavka nije jos omogućena za sad, izvinjavamo se."
+    no_value: "Ne"
+    yes_value: "Da"
+    generic_error: "Izvinite, pojavila se greška."
+    generic_error_with_reason: "Došlo je do greške: %{error}"
+    sign_up: "Registrujte se"
+    log_in: "Prijavi se"
+    age: "Godine"
+    joined: "Pridružen"
+    admin_title: "Admin"
+    flags_title: "Zastave"
+    show_more: "prikaži više"
+    show_help: "opcije"
+    links: "Linkovi"
+    links_lowercase:
+      one: "link"
+      few: "linkovi"
+      other: "linkovi"
+    faq: "ČPP"
+    guidelines: "Smernice"
+    privacy_policy: "Politika Privatnosti"
+    privacy: "Privatnost"
+    terms_of_service: "Uslovi Korišćenja"
+    mobile_view: "Mobilni pogled"
+    desktop_view: "Računarski pogled"
+    you: "Ti"
+    or: "ili"
+    now: "upravo sad"
+    read_more: 'pročitaj više'
+    more: "Više"
+    less: "Manje"
+    never: "nikad"
+    every_30_minutes: "svakih 30 minuta"
+    every_hour: "svakog sata"
+    daily: "svakodnevno"
+    weekly: "nedeljno"
+    every_two_weeks: "svake dve nedelje"
+    every_three_days: "svaka tri dana"
+    max_of_count: "maksimalno od {{count}}"
+    alternation: "ili"
+    character_count:
+      one: "{{count}} karakter"
+      few: "{{count}} karaktera"
+      other: "{{count}} karaktera"
+    suggested_topics:
+      title: "Predložene Teme"
+      pm_title: "Predložene poruke"
+    about:
+      simple_title: "O nama"
+      title: "O %{title}"
+      stats: "Statistike sajta"
+      our_admins: "Naši admini"
+      our_moderators: "Naši moderatori"
+      stat:
+        all_time: "Sve vreme"
+        last_7_days: "Posledjih 7 dana"
+        last_30_days: "Poslednjih 30 dana"
+      like_count: "Sviđanja"
+      topic_count: "Teme"
+      post_count: "Poruka"
+      user_count: "Korisnici"
+      active_user_count: "Aktivni korisnici"
+      contact: "Kontaktirajte nas"
+      contact_info: "U trenutku kritičnog problema ili hitnog slučaja koji utiče na sajt, molimo vas kontaktirajte nas na %{contact_info}."
+    bookmarked:
+      title: "Markiraj"
+      clear_bookmarks: "Očisti markere"
+      help:
+        bookmark: "Klikni da markiraš prvi post u ovoj temi"
+        unbookmark: "Klikni da bi obirsao sve markere sa ove teme"
+    bookmarks:
+      not_logged_in: "izvini, morate biti prijavljeni da bi markirali ovu temu"
+      created: "ti si markirao ovu poruku"
+      not_bookmarked: "ti si pročitao ovu poruku; klikni da bi je markirao"
+      last_read: "ovo je zadnja poruka koju si pročitao; klikni da bi je markirao"
+      remove: "Obriši marker"
+      confirm_clear: "Jeste li sigurni da želite izbrisati sve markere sa ove teme?"
+    topic_count_latest:
+      one: "{{count}} nova ili izmenjena tema."
+      few: "{{count}} nove ili izmenjene teme."
+      other: "{{count}} novih ili izmenjenih tema."
+    topic_count_unread:
+      one: "{{count}} nepročitana tema"
+      few: "{{count}} nepročitane teme"
+      other: "{{count}} nepročitanih tema"
+    topic_count_new:
+      one: "{{count}} nova tema."
+      few: "{{count}} nove teme."
+      other: "{{count}} novih tema."
+    click_to_show: "Klikni da pogledaš"
+    preview: "prikaži"
+    cancel: "otkaži"
+    save: "Sačuvaj izmene"
+    saving: "Čuvanje..."
+    saved: "Sačuvano!"
+    upload: "Učitaj"
+    uploading: "Učitava se..."
+    uploading_filename: "Slanje {{filename}}..."
+    uploaded: "Učitano!"
+    pasting: "Nalepljivanje..."
+    enable: "Omogući"
+    disable: "Onemogući"
+    undo: "Vrati na prethodno"
+    revert: "Vrati nazad"
+    failed: "Neuspešno"
+    switch_to_anon: "Uključi Anonimni režim"
+    switch_from_anon: "Izađi iz Anonimnog režima"
+    banner:
+      close: "Sakrij ovaj element."
+      edit: "Promeni ovaj baner >>"
+    choose_topic:
+      none_found: "Nema pronađenih tema."
+      title:
+        search: "Traži temu prema imenu, adresi ili id-u."
+        placeholder: "unesite naslov teme ovde"
+    queue:
+      topic: "Tema:"
+      approve: 'Odobri'
+      reject: 'Odbij'
+      delete_user: 'Obriši korisnika'
+      title: "Potrebno odobrenje"
+      none: "Nema poruka za kontrolni pregled."
+      edit: "Izmeni"
+      cancel: "Otkaži"
+      view_pending: "vidi poruke na čekanju"
+      has_pending_posts:
+        one: "Ova tema ima <b>{{count}}</b> poruku koje čekaju na odobrenje"
+        few: "Ova tema ima <b>{{count}}</b> poruke koje čekaju na odobrenje"
+        other: "Ova tema ima <b>{{count}}</b> poruka koje čekaju na odobrenje"
+      confirm: "Sačuvaj izmene"
+      delete_prompt: "Da li si siguran da želiš obrisati <b>%{username}</b>? Ovim ćeš obrisati sve njegove postove i blokirati njegov email i IP adresu."
+      approval:
+        title: "Potrebno odobrenje"
+        description: "Primili smo tvoj novi post ali on najpre mora biti odobren od strane moderatora. Budi strpljiv."
+        ok: "OK"
+    user_action:
+      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> je objavio <a href='{{topicUrl}}'>temu</a>"
+      you_posted_topic: "<a href='{{userUrl}}'>Objavio si <a href='{{topicUrl}}'>temu</a>"
+      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> je odgovorio na <a href='{{postUrl}}'>{{post_number}}</a>"
+      you_replied_to_post: "<a href='{{userUrl}}'>Ti</a> si odgovorio na <a href='{{postUrl}}'>{{post_number}}</a>"
+      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> je odgovorio <a href='{{topicUrl}}'>na temu</a>"
+      you_replied_to_topic: "<a href='{{userUrl}}'>Ti</a>si odgovorio <a href='{{topicUrl}}'>na temu</a>"
+      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> je spomenuo <a href='{{user2Url}}'>{{another_user}}</a>"
+      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> je spomenuo <a href='{{user2Url}}'>tebe</a>"
+      you_mentioned_user: "<a href='{{user1Url}}'>Ti</a> si spomenuo <a href='{{user2Url}}'>{{another_user}}</a>"
+      posted_by_user: "Objavio <a href='{{userUrl}}'>{{user}}</a>"
+      posted_by_you: "Objavio <a href='{{userUrl}}'>ti</a>"
+      sent_by_user: "Poslao <a href='{{userUrl}}'>{{user}}</a>"
+      sent_by_you: "Poslao <a href='{{userUrl}}'>ti</a>"
+    directory:
+      filter_name: "filtriraj po korisničkom imenu"
+      title: "Korisnici"
+      likes_given: "Dato"
+      likes_received: "Primljeno"
+      topics_entered: "Pregledano"
+      topics_entered_long: "Tema pregledao"
+      time_read: "Vreme Čitanja"
+      topic_count: "Teme"
+      topic_count_long: "Tema kreirano"
+      post_count: "Odgovori"
+      post_count_long: "Odgovora poslato"
+      no_results: "Rezultati nisu pronađeni"
+      days_visited: "Poseta"
+      days_visited_long: "Dana posećivano"
+      posts_read: "Pročitano"
+      posts_read_long: "Postova pročitano"
+      total_rows:
+        one: "{count} korisnik"
+        few: "%{count} korisnika"
+        other: "%{count} korisnika"
+    groups:
+      logs:
+        action: "Akcije"
+      owner: "vlasnik"
+      index:
+        title: "Grupe"
+      members: "Članovi"
+      topics: "Teme"
+      posts: "Poruka"
+      mentions: "Spominjanja"
+      messages: "Poruke"
+      alias_levels:
+        nobody: "Niko"
+        only_admins: "Samo administratori"
+        mods_and_admins: "Samo moderatori i Administratori"
+        members_mods_and_admins: "Samo članovi grupe, moderatori i administratori"
+        everyone: "Svi"
+      trust_levels:
+        none: "Ništa"
+      flair_bg_color_placeholder: "(Opciono) Hex vrednost boje"
+    user_action_groups:
+      '1': "Sviđanja Dodata"
+      '2': "Primljena Sviđanja"
+      '3': "Markiraj"
+      '4': "Teme"
+      '5': "Odgovori"
+      '7': "Spomeni"
+      '9': "Citati"
+      '11': "Izmene"
+      '12': "Poslato"
+      '13': "Primljeno"
+      '14': "U toku"
+    categories:
+      all: "sve kategorije"
+      all_subcategories: "sve"
+      no_subcategory: "ništa"
+      category: "Kategorija"
+      reorder:
+        title: "Promeni redosled katergorija"
+        title_long: "Reorganizuj listu kategorija"
+        save: "Sačuvaj redosled"
+        apply_all: "Primeni"
+      posts: "Poruka"
+      topics: "Teme"
+      latest: "Poslednje"
+      latest_by: "poslednje od"
+      toggle_ordering: "odredi kontrolu smera"
+      subcategories: "Podkategorije"
+      topic_stat_sentence:
+        one: "%{count} nova tema u poslednjih %{unit}."
+        few: "%{count} novih tema u poslednjih %{unit}."
+        other: "%{count} novih tema u poslednjih %{unit}."
+    ip_lookup:
+      title: Pretraga po IP adresi
+      hostname: Ime računara
+      location: Lokacija
+      location_not_found: (nepoznato)
+      organisation: Organizacija
+      phone: Telefon
+      other_accounts: "Ostali računari s istom IP adresom"
+      delete_other_accounts: "Obriši %{count}"
+      username: "Korisničko ime"
+      trust_level: "Nivo poverenja"
+      read_time: "vreme čitanja"
+      topics_entered: "tema posećeno"
+      post_count: "# poruka"
+      confirm_delete_other_accounts: "Jeste li sigurni da želite obrisati ove naloge?"
+    user:
+      said: "{{username}}:"
+      profile: "Profil"
+      mute: "Utišaj"
+      edit: "Uredi postavke"
+      new_private_message: "Nova privatna poruka"
+      private_message: "Privatna poruka"
+      private_messages: "Poruke"
+      activity_stream: "Aktivnost"
+      preferences: "Postavke"
+      expand_profile: "Proširi"
+      bookmarks: "Markiraj"
+      bio: "O meni"
+      invited_by: "Pozvan od"
+      trust_level: "Nivo poverenja"
+      notifications: "Obaveštenja"
+      statistics: "Statistike"
+      desktop_notifications:
+        label: "Obaveštenja na radnoj površini"
+      dismiss_notifications_tooltip: "Označi sve nepročitana obavestenja kao pročitana"
+      disable_jump_reply: "Ne uskači u moju poruku nakon mog odgovora"
+      external_links_in_new_tab: "Otvori sve spoljne linkove u novom tabu"
+      enable_quoting: "Omogući citirani odgovor označenog teksta"
+      change: "promeni"
+      moderator: "{{user}} je moderator"
+      admin: "{{user}} je administrator"
+      moderator_tooltip: "Ovaj korisnik je moderator."
+      admin_tooltip: "Ovaj korisnik je administrator"
+      suspended_notice: "Ovaj korisnik je suspendovan do {{date}}."
+      suspended_reason: "Razlog:"
+      github_profile: "Github"
+      email_activity_summary: "Sažetak aktivnosti"
+      watched_categories: "Pregledano"
+      tracked_categories: "Praćeno"
+      muted_categories: "Utišano"
+      delete_account: "Obriši moj Nalog"
+      delete_account_confirm: "Jeste li sigurni da želite trajno obrisati svoj nalog? Ova se akcija ne može poništiti!"
+      deleted_yourself: "Vaš nalog je uspešno obrisan."
+      delete_yourself_not_allowed: "Trenutno ne možete obrisati svoj nalog. Kontaktirajte administratora da ga obriše umesto vas."
+      unread_message_count: "Poruke"
+      admin_delete: "Obriši"
+      staff_counters:
+        flags_given: "pomoćne oznake"
+        flagged_posts: "označene poruke"
+        deleted_posts: "obrisane poruke"
+        suspensions: "suspenzije"
+        warnings_received: "upozorenja"
+      messages:
+        all: "sve"
+      change_password:
+        success: "(email je poslat)"
+        in_progress: "(email se šalje)"
+        error: "(greška)"
+        action: "Pošalj e-mail za povratak šifre."
+        set_password: "Postavi Šifru"
+      change_about:
+        title: "Promijeni O meni"
+      change_username:
+        title: "Promijeni Korisničko ime"
+        taken: "Žao nam je, to je ime zauzeto."
+        invalid: "Korisničko ime je nevažeće. Može sadržati samo slova i brojeve."
+      change_email:
+        title: "Promijeni E-mail"
+        taken: "Žao nam je, taj e-mail nije dostupan"
+        error: "Dogodila se greška u promeni tvog e-maila. Možda ta adresa već postoji?"
+        success: "Poslali smo e-mail na tu adresu. Molimo vas sledite uputstva za potvrdu."
+      change_avatar:
+        title: "Promeni tvoju profilnu sliku"
+        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baziran na"
+        refresh_gravatar_title: "Obnovi svoj Gravatar"
+        letter_based: "Sistemski dodata profilna slika"
+        uploaded_avatar: "Vaša slika"
+        uploaded_avatar_empty: "Dodajte vašu sliku"
+        upload_title: "Učitajte vašu sliku"
+        upload_picture: "Učitajte sliku"
+      change_profile_background:
+        title: "Pozadina Profila"
+        instructions: "Profilne pozadine će biti centrirane i imati standardnu širinu 850px "
+      change_card_background:
+        title: "Pozadina Korisničke Kartice"
+        instructions: "Pozadinske slike će biti centrirane i imati standardu širinu od 590px."
+      email:
+        title: "E-mail"
+        ok: "Poslati ćemo vam e-mail za potvrdu"
+        invalid: "Molimo unesite validnu e-mail adresu"
+        authenticated: "E-mail vam je potvrđen od {{provider}}"
+      name:
+        title: "Ime"
+        too_short: "Ime vam je prekratko"
+        ok: "Vaše ime dobro izgleda"
+      username:
+        title: "Korisničko ime"
+        short_instructions: "Ljudi vas mogu spominjati kao @{{username}}"
+        available: "Vaše korisničko ime slobodno"
+        not_available: "Nije dostupno. Pokušajte {{suggestion}}?"
+        too_short: "Vaše korisničko ime prekratko"
+        too_long: "Vaše korisničko ime je predugačko"
+        checking: "Proveravamo dostupnost korisničkog imena..."
+        prefilled: "E-mail odgovara ovom registrovanom korisničkom imenu"
+      locale:
+        title: "Jezik interfejsa"
+        instructions: "Jezik korisničkog okruženja. Promeniće se kad se ponovo učita stranica."
+        default: "(zadano)"
+      password_confirmation:
+        title: "Ponoviti šifru"
+      last_posted: "Poslednja poruka"
+      last_emailed: "Poslednji e-mail"
+      last_seen: "Viđen"
+      created: "Pridružio"
+      log_out: "Odjavi se"
+      location: "Lokacija"
+      card_badge:
+        title: "Značka Korisničke Kartice"
+      website: "Web Stranica"
+      email_settings: "E-mail"
+      like_notification_frequency:
+        always: "Uvek"
+        never: "Nikada"
+      email_previous_replies:
+        title: "Uključi prethodne odgovore na dnu email poruka"
+        always: "uvek"
+        never: "nikada"
+      email_digests:
+        every_30_minutes: "svakih 30 minuta"
+        daily: "dnevno"
+        every_three_days: "svaka tri dana"
+        weekly: "nedeljno"
+        every_two_weeks: "svake dve nedelje"
+      email_private_messages: "Pošalji mi email kada mi neko pošalje poruku"
+      email_always: "Šalji mi email notifikacije i kada sam aktivan na sajtu"
+      other_settings: "Drugo"
+      categories_settings: "Kategorije"
+      new_topic_duration:
+        label: "Teme smatrati novim kad"
+        not_viewed: "Nisam ih pregledao još"
+        last_here: "otvoreno od zadnjeg puta kada sam bio ovde"
+      auto_track_topics: "Automatski prati teme gde ja uđem"
+      auto_track_options:
+        never: "nikad"
+        after_30_seconds: "posle 30 sekundi"
+        after_1_minute: "posle 1 minut"
+        after_2_minutes: "posle 2 minuta"
+        after_3_minutes: "posle 3 minuta"
+        after_4_minutes: "posle 4 minuta"
+        after_5_minutes: "posle 5 minuta"
+        after_10_minutes: "posle 10 minuta"
+      invited:
+        search: "pišite da pregledate pozivnice"
+        title: "Pozivnice"
+        user: "Pozvani Korisnici"
+        redeemed: "Nadoknadi Pozivnice"
+        redeemed_at: "Nadoknadi"
+        pending: "Tekuće pozivnice"
+        topics_entered: "Pogledane Teme"
+        posts_read_count: "Pročitane poruke"
+        expired: "Ova je pozivnica istekla."
+        rescind: "Ukloni"
+        rescinded: "Pozivnica uklonjena"
+        reinvite: "Ponovno pošalji pozivnicu"
+        reinvite_all: "Ponovo pošalji sve pozivnice"
+        reinvite_all_confirm: "Da li ste sigurni da želite ponovo da pošaljete sve pozivnice?"
+        reinvited: "Pozivnica ponovno poslata"
+        reinvited_all: "Sve pozivnice su ponovo poslate!"
+        time_read: "Vreme Čitanja"
+        days_visited: "Dana posećeno"
+        account_age_days: "Starost naloga u danima"
+        create: "Pošalji pozivnicu"
+        generate_link: "Kopiraj link pozivnice"
+        link_generated: "Link pozivnice je uspešno kreiran!"
+        bulk_invite:
+          text: "Skupno pozvati iz datoteke"
+      password:
+        title: "Šifra"
+        too_short: "Vaša šifra je prekratka."
+        common: "Ta šifra je pre česta."
+        same_as_username: "Tvoja šifra je ista kao i tvoje korisničko ime."
+        same_as_email: "Tvoja šifra je ista kao i tvoj email."
+        ok: "Vaša šifra izgleda dobro."
+      summary:
+        title: "Rezime"
+        stats: "Statistike"
+        time_read: "vreme čitanja"
+        recent_time_read: "vreme nedavnih čitanja"
+        topic_count:
+          one: "kreirana tema"
+          few: "kreirane teme"
+          other: "kreiranih tema"
+        post_count:
+          one: "kreiran post"
+          few: "kreirana posta"
+          other: "kreiranih postova"
+        likes_given:
+          one: "dato"
+          few: "dato"
+          other: "dato"
+        likes_received:
+          one: "primljeno"
+          few: "primljeno"
+          other: "primljeno"
+        days_visited:
+          one: "dan posećivao"
+          few: "dana posećivao"
+          other: "dana posećivao"
+        topics_entered:
+          one: "temu pregledao"
+          few: "tema pregledao"
+          other: "tema pregledao"
+        posts_read:
+          one: "postova pročitao"
+          few: "postova pročitao"
+          other: "postova pročitao"
+        bookmark_count:
+          one: "označena"
+          few: "označene"
+          other: "označenih"
+        top_replies: "Top odgovori"
+        no_replies: "Bez odgovora, još uvek."
+        more_replies: "Još odgovora"
+        top_topics: "Top teme"
+        no_topics: "Bez tema, još uvek"
+        more_topics: "Više tema"
+        top_badges: "Top znački"
+        no_badges: "Bez znački, još uvek"
+        more_badges: "Više znački"
+        top_links: "Top likovi"
+        no_links: "Bez linkova, još uvek"
+        most_liked_by: "Najviše sviđanja od"
+        most_liked_users: "Najviše sviđanja"
+        most_replied_to_users: "Najviše odgovora ka"
+        no_likes: "Bez sviđanja, još uvek"
+      associated_accounts: "Logovanja"
+      ip_address:
+        title: "Posljednja IP adresa"
+      registration_ip_address:
+        title: "Registarska IP adresa"
+      avatar:
+        title: "Profilna Slika"
+      title:
+        title: "Naslov"
+      filters:
+        all: "Sve"
+      stream:
+        posted_by: "Postavio "
+        sent_by: "Poslao"
+        the_topic: "tema"
+    loading: "Učitavanje..."
+    errors:
+      prev_page: "pri pokušaju očitavanja"
+      reasons:
+        network: "Greška mreže"
+        server: "Greška servera"
+        forbidden: "Pristup odbijen"
+        unknown: "Greška"
+      desc:
+        network: "Molimo proverite vašu internet konekciju."
+        network_fixed: "Izlgeda da se vratila."
+        server: "Vrsta greške: {{status}}"
+        forbidden: "Nemate dozvolu da pogledate to."
+        unknown: "Nešto nije bilo u redu."
+      buttons:
+        back: "Idi nazad"
+        again: "Pokušaj ponovno"
+        fixed: "Učitaj stranicu"
+    close: "Zatvori"
+    assets_changed_confirm: "Ova stranica je upravo ažurirana. Osveži sada za najnoviju verziju?"
+    logout: "Odjavljeni ste."
+    refresh: "Osveži"
+    read_only_mode:
+      login_disabled: "Prijave su onemogućene dok je stranica u modulu \"samo čitanje\"."
+    learn_more: "saznaj više..."
+    all_time: 'ukupno'
+    year: 'godina'
+    year_desc: 'teme otvorene u zadnjih 365 dana'
+    month: 'mesec'
+    month_desc: 'teme otvorene u zadnjih 30 dana'
+    week: 'nedelja'
+    week_desc: 'teme otvorene u zadnjih 7 dana'
+    day: 'dan'
+    first_post: Prva poruka
+    mute: Utišaj
+    unmute: Poništi utišanje
+    last_reply_lowercase: poslednji odgovor
+    summary:
+      enabled_description: "Gledate pregled ove teme: najzanimljivije poruke su odabrane od strane zajednice."
+      enable: 'Sumirajte Ovu Temu'
+      disable: 'Prikaži Sve Poruke'
+    deleted_filter:
+      enabled_description: "Ova tema sadrži brisane poruke, koji su skriveni."
+      disabled_description: "Obrisane poruke u temi su prikazane."
+      enable: "Sakrij Obrisane Poruke"
+      disable: "Prikaži Obrisane Poruke"
+    private_message_info:
+      invite: "Pozovi Druge..."
+    email: 'E-mail'
+    username: 'Korisničko Ime'
+    last_seen: 'Viđen'
+    created: 'Napravljeno'
+    created_lowercase: 'napravljeno'
+    trust_level: 'Nivo poverenja'
+    search_hint: 'korisničko ime, e-mail ili IP adresa'
+    create_account:
+      title: "Napravi Novi Nalog"
+      failed: "Nešto nije u redu, možda je ovaj e-mail već registrovan, pokušajte s linkom za zaboravljenu šifru."
+    forgot_password:
+      action: "Zaboravio/la sam šifru"
+      invite: "Upišite svoje korisničko ime ili e-mail adresu, pa ćemo vam poslati e-mail za ponovno postavljanje šifre."
+      reset: "Resetujete Šifru"
+      complete_username: "Ako nalog odgovara korisničkom imenu <b>%{username}</b>, trebali bi ste uskoro dobiti e-mail sa uputstvima kako da restartujete vašu šifru."
+      complete_email: "Ako nalog odgovara <b>%{email}</b>, trebali bi ste uskoro dobiti e-mail s uputima za ponovno postavljanje šifre."
+      complete_username_found: "Pronašli smo nalog  koji odgovara korisničkom imenu <b>%{username}</b> trebali bi ste uskoro dobiti e-mail s daljnim uputstvima."
+      complete_email_found: "Pronašli smo nalog koji odgovara  <b>%{email}</b> trebali bi ste uskoro dobiti e-mail s daljnim uputstvima."
+      complete_username_not_found: "Nema naloga koji odgovara korisničkom imenu <b>%{username}</b>"
+      complete_email_not_found: "Nema naloga koji odgovara <b>%{email}</b>"
+    login:
+      title: "Prijava"
+      username: "Korisnik"
+      password: "Šifra"
+      email_placeholder: "e-mail ili korisničko ime"
+      caps_lock_warning: "Caps Lock vam je uključen"
+      error: "Nepoznata greška"
+      blank_username_or_password: "Molimo unesite e-mail ili korisničko ime i šifru."
+      reset_password: 'Resetujte Šifru'
+      logging_in: "Prijavljivanje..."
+      or: "Ili"
+      authenticating: "Autentifikaciranje..."
+      awaiting_approval: "Vaš nalog nije odobren od osoblja. Poslaćemo vam e-mail kad bude odobren."
+      requires_invite: "Žao nam je, pristup ovoj zajednici je moguć samo uz pozivnicu."
+      not_activated: "Ne možete se još prijaviti. Ranije smo vam poslali e-mail na <b>{{sentTo}}</b>. Molimo sledite uputstva da aktivirate nalog."
+      not_allowed_from_ip_address: "Ne možete se prijaviti s te IP adrese."
+      admin_not_allowed_from_ip_address: "Ne možete se prijaviti kao admin sa te IP adrese."
+      resend_activation_email: "Pritisnite ovde da ponovno pošaljemo aktivacijski e-mail."
+      sent_activation_email_again: "Poslali smo vam drugi aktivacijski e-mail na: <b>{{currentEmail}}</b>. Možda zatreba par minuta da stigne; svakako proverite nepoželjnu poštu."
+      google:
+        title: "pomoću Google"
+        message: "Autentifikacija pomoću Google (isključite pop-up blokere)"
+      google_oauth2:
+        title: "pomoću Googlea"
+        message: "Autentifikacija pomoću Googlea (isključite pop-up blokere)"
+      twitter:
+        title: "pomoću Twittera"
+        message: "Autentifikacija preko Twittera (isključite pop-up blokere)"
+      facebook:
+        title: "pomoću Facebooka"
+        message: "Autentifikacija preko Facebooka (isključite pop-up blokere)"
+      yahoo:
+        title: "pomoću Yahooa"
+        message: "Autentifikacija preko Yahooa (isključite pop-up blokere)"
+      github:
+        title: "pomoću GitHuba"
+        message: "Autentifikacija preko GitHuba (isključite pop-up blokere)"
+    emoji_set:
+      google: "Google"
+      twitter: "Twitter"
+    shortcut_modifier_key:
+      alt: 'Alt'
+    composer:
+      emoji: "Emotikoni :)"
+      more_emoji: "više..."
+      options: "Opcije"
+      add_warning: "Ovo je službeno upozorenje."
+      posting_not_on_topic: "U kojoj temi želite odgovoriti?"
+      saving_draft_tip: "sačuvavam"
+      saved_draft_tip: "sačuvano"
+      saved_local_draft_tip: "sačuvano lokalno"
+      similar_topics: "Vaša tema je slična..."
+      drafts_offline: "nacrti offline"
+      error:
+        title_missing: "Naslov je obavezan"
+        title_too_short: "Naslov mora biti barem {{min}} karaktera"
+        title_too_long: "Naslov ne može biti više od {{max}} karaktera"
+        post_missing: "Poruka ne može biti prazna"
+        post_length: "Poruka mora imati barem {{min}} karaktera"
+        try_like: 'Da li ste probali <i class="fa fa-heart"></i> dugme?'
+        category_missing: "Morate odabrati kategoriju"
+      save_edit: "Sačuvaj izmenu"
+      reply_original: "Odgovori na originalnu temu"
+      reply_here: "Odgovori ovde"
+      reply: "Odgovori"
+      cancel: "Odustani"
+      create_topic: "Kreiraj temu"
+      title: "Ili pritisnite Ctrl+Enter"
+      users_placeholder: "Dodaj korisnika"
+      title_placeholder: "O čemu je ova diskusija u jednoj kratkoj rečenici?"
+      edit_reason_placeholder: "zašto izmenjujete?"
+      show_edit_reason: "(dodaj razlog izmene)"
+      reply_placeholder: "Kucaj ovde. Koristi Markdown, BBCode ili HTML za formatiranje teksta. Prevuci ili nalepi slike"
+      view_new_post: "Pogledajte svoju novu poruku."
+      saving: "Čuvanje"
+      saved: "Sačuvano!"
+      saved_draft: "Nacrt trenutne poruke. Odaberi za nastavak."
+      uploading: "Učitavanje..."
+      show_preview: 'prikaži prikaz &raquo;'
+      hide_preview: '&laquo; sakrij prikaz'
+      quote_post_title: "Citiraj celu poruku"
+      bold_label: "B"
+      bold_title: "Bold"
+      bold_text: "boldovan tekst"
+      italic_label: "I"
+      italic_title: "Italic"
+      italic_text: "italic tekst"
+      link_title: "Hiperlink"
+      link_description: "Unesite opis linka ovde"
+      link_dialog_title: "Ubacite Hiperlink"
+      link_optional_text: "neobavezan naslov"
+      link_url_placeholder: "http://example.com"
+      quote_title: "izdvojeni citat"
+      quote_text: "izdvojeni citat"
+      code_title: "Pred-formatirani tekst"
+      code_text: "uvuci pred-formatirani tekst za 4 mesta"
+      paste_code_text: "unesi ili nalepi kod ovde"
+      upload_title: "Učitaj"
+      upload_description: "Ovde opišite stvar koju učitavate"
+      olist_title: "Brojčani popis"
+      ulist_title: "Tačkasti popis"
+      list_item: "Predmet popisa"
+      help: "Markdown pomoć pri izmenama"
+      modal_ok: "U redu"
+      modal_cancel: "Odustani"
+      yourself_confirm:
+        title: "Da li ste zaboravili da dodate primaoce?"
+        body: "Trenutno se ova poruka šalje samo Vama!"
+      admin_options_title: "Neobavezna pravila osoblja za ovu temu"
+    notifications:
+      none: "Nemoguće je učitati notifikacije ovog trenutka."
+      empty: "Nisu pronađene notifikacije"
+      more: "pogledaj starije notifikacije"
+      total_flagged: "sve ukupno označenih poruka"
+      alt:
+        replied: "Odgovoreno"
+        private_message: "Privatna poruka od"
+    upload_selector:
+      title: "Dodaj sliku"
+      title_with_attachments: "Dodaj sliku ili datoteku"
+      from_my_computer: "S mog uređaja"
+      from_the_web: "S interneta"
+      remote_tip: "link za sliku"
+      local_tip: "Izaberite slike sa Vašeg uređaja"
+      hint: "(možete i povući i pustiti datoteke u ovaj prozor da ih učitate)"
+      hint_for_supported_browsers: "možete takođe prevući ili nalepiti  slike u editor"
+      uploading: "Učitavanje"
+      image_link: "link na koju vodi vaša slika"
+    search:
+      select_all: "Izaberi sve"
+      too_short: "Vaš termin za pretragu je previše kratak."
+      title: "pretražite teme, poruke, korisnike ili kategorije"
+      no_results: "Nema rezultata"
+      no_more_results: "Nije pronađeno više rezultata"
+      searching: "Pretraživanje..."
+      post_format: "#{{post_number}} od {{username}}"
+      context:
+        user: "Pretražite poruke od @{{username}}"
+        topic: "Pretražite ovu temu"
+      advanced:
+        title: Napredna pretraga
+    go_back: 'idi nazad'
+    not_logged_in_user: 'stranica korisnika sa sažetkom trenutnih aktivnosti i postavki'
+    current_user: 'idi na korisničku stranicu'
+    topics:
+      new_messages_marker: "poslednja poseta"
+      bulk:
+        reset_read: "Poništi Pročitano"
+        delete: "Obriši Teme"
+        dismiss_new: "Odbaci Novo"
+        toggle: "uključi/isključi grupni odabir tema"
+        actions: "Grupne aktivnosti"
+        close_topics: "Zatvori Teme"
+        archive_topics: "Arhiviraj Teme"
+        choose_new_category: "Izaberite novu kategoriju za vašu temu."
+        selected:
+          one: "Odabrali ste <b>{{count}}</b> temu."
+          few: "Odabrali ste <b>{{count}}</b> tema."
+          other: "Odabrali ste <b>{{count}}</b> tema."
+      none:
+        unread: "Nemate nepročitanih tema."
+        new: "Nemate novih tema."
+        read: "Niste još pročitali ni jednu temu."
+        posted: "Niste se još objavljivali ni u jendoj temi."
+        latest: "Nema poslednjih tema. To je tužno."
+        hot: "Nema vrućih tema."
+        bookmarks: "Nemate markiranih tema još."
+        category: "Nema tema u {{category}}."
+        top: "Nema glavnih tema."
+      bottom:
+        latest: "Nema više najnovijih tema."
+        hot: "Nema više vrućih tema."
+        posted: "Nema više objavljenih tema."
+        read: "Nema više pročitanih tema."
+        new: "Nema više novih tema."
+        unread: "Nema više nepročitanih tema."
+        category: "Nema više {{category}} tema."
+        top: "Nema više glavnih tema."
+        bookmarks: "Nema više markiranih tema."
+    topic:
+      create: 'Nova Tema'
+      create_long: 'Otvori novu Temu'
+      list: 'Teme'
+      new: 'nova tema'
+      unread: 'nepročitano'
+      new_topics:
+        one: '1 nova tema'
+        few: '{{count}} nove teme'
+        other: '{{count}} nove teme'
+      unread_topics:
+        one: '{{count}} nepročitana tema'
+        few: '{{count}} nepročitanih tema'
+        other: '{{count}} nepročitane teme'
+      title: 'Tema'
+      invalid_access:
+        title: "Tema je privatna"
+        description: "Žao nam je, nemate pristup temi!"
+        login_required: "Morate se prijaviti da vidite temu."
+      server_error:
+        title: "Očitavanje teme nije uspelo"
+        description: "Žao nam je, nije uspelo učitavanje ove teme, verovatno zbog problema sa konekcijom. Molimo pokušajte ponovno. Ako problem i dalje postoji, javite nam."
+      not_found:
+        title: "Tema nije pronađena"
+        description: "Žao nam je, nismo mogli pronaći temu. Možda ju je moderator uklonio?"
+      total_unread_posts:
+        one: "Imate {{count}} nepročitanu poruku u ovoj temi"
+        few: "Imate {{count}} nepročitanih poruka u ovoj temi"
+        other: "Imate {{count}} nepročitanih poruka u ovoj temi"
+      unread_posts:
+        one: "Imate {{count}} staru nepročitanu poruku u ovoj temi"
+        few: "Imate {{count}} starih nepročitanih poruka u ovoj temi"
+        other: "Imate {{count}} starih nepročitanih poruka u ovoj temi"
+      new_posts:
+        one: "Ima {{count}} novih poruka u temi od kad ste je zadnji put pročitali"
+        few: "Ima {{count}} novih poruka u temi od kad ste je zadnji put pročitali"
+        other: "Ima {{count}} novih poruka u temi od kad ste je zadnji put pročitali"
+      likes:
+        one: "Ima {{count}} sviđanja u temi"
+        few: "Ima {{count}} sviđanja u temi"
+        other: "Ima {{count}} sviđanja u temi"
+      back_to_list: "Nazad na listu tema"
+      options: "Opcije Teme"
+      show_links: "Prikaži linkove u ovoj temi"
+      toggle_information: "uključi/isključi detalje teme"
+      read_more_in_category: "Želite da pročitate više? Pregledaj druge teme u  {{catLink}} ili {{latestLink}}."
+      read_more: "Želite da pročitate više? {{catLink}} ili {{latestLink}}."
+      browse_all_categories: Pregledaj sve kategorije
+      view_latest_topics: pogledaj najnovije teme
+      suggest_create_topic: Zašto ne otvorite temu?
+      jump_reply_up: skoči na raniji odgovor
+      jump_reply_down: skoči na kasniji odgovor
+      deleted: "Tema je obrisana"
+      auto_close_title: 'Postavke Automatskog Zatvaranja'
+      timeline:
+        replies_short: "%{current} / %{total}"
+      progress:
+        title: napredak teme
+        go_top: "vrh"
+        go_bottom: "dno"
+        go: "idi"
+        jump_bottom_with_number: "skoči na poruku %{post_number}"
+        total: ukupno poruka
+        current: trenutna poruka
+      notifications:
+        reasons:
+          '3_6': 'Primaćete obaveštenja jer posmatrate ovu kategoriju.'
+          '3_5': 'Primaćete obaveštenja jer ste automatski počeli posmatrati temu.'
+          '3_2': 'Primaćete obaveštenja jer posmatrate temu.'
+          '3_1': 'Primaćete obaveštenja jer ste vi otvorili temu.'
+          '3': 'Primaćete obaveštenja jer posmatrate temu.'
+          '0_7': 'Ignorirate sva obaveštenja iz ove kategorije.'
+          '0_2': 'Ignorirate sva obaveštenja iz ove teme.'
+          '0': 'Ignorirate sva obaveštenja iz ove teme.'
+        watching_pm:
+          title: "Posmatram"
+        watching:
+          title: "Posmatram"
+        tracking_pm:
+          title: "Praćeno"
+        tracking:
+          title: "Praćeno"
+        muted_pm:
+          title: "Utišano"
+        muted:
+          title: "Utišano"
+      actions:
+        recover: "Vrati obrisanu temu"
+        delete: "Obriši temu"
+        open: "Otvori temu"
+        close: "Zatvori temu"
+        unarchive: "Vrati temu iz arhiva"
+        archive: "Arhiviraj temu"
+        invisible: "Ukloni temu s popisa"
+        visible: "Stavi na popis"
+        reset_read: "Poništi podatke o pročitanom"
+        make_public: "Napravi javnu temu"
+        make_private: "Napravi privatnu poruku"
+      feature:
+        pin: "Zakači temu"
+      reply:
+        title: 'Odgovori'
+        help: 'Počni pravljenje odgovora na ovu temu'
+      clear_pin:
+        title: "Obriši zakačku"
+        help: "Ukloni status zakačenog s ove teme da se vise ne pojavljuje na vrhu liste tema"
+      share:
+        title: 'Podeli'
+        help: 'podeli link na ovu temu'
+      print:
+        title: 'Štampaj'
+        help: 'Otvori verziju pogodnu za štampanje'
+      flag_topic:
+        title: 'Zastava'
+        help: 'privatno označi ovu temu za pozornost, ili pošalji privatno obaveštenje o njoj'
+        success_message: 'Uspešno ste označili ovu temu zastavicom'
+      feature_topic:
+        title: "Prikaži ovu temu"
+        unpin: "Ukloni ovu temu sa vrha {{categoryLink}} kategorije."
+        pin_validation: "Neophodan je datum da zakačite ovu temu"
+        unpin_globally: "Ukloni ovu temu sa vrha svih lista"
+      inviting: "Pozivanje..."
+      invite_private:
+        email_or_username: "E-mail ili korisničko ime pozivanog"
+        email_or_username_placeholder: "e-mail adresa ili korisničko ime"
+        action: "Pozovi"
+        error: "Žao nam je, dogodila se greška u pozivanju."
+        group_name: "ime grupe"
+      invite_reply:
+        title: 'Pozovite'
+        to_forum: "Poslaćemo kratak e-mail dopuštajući tvom prijatelju da se odmah učlani jednim klikom na link, bez potrebe prijave."
+        email_placeholder: 'ime@primer.com'
+      login_reply: 'Prijavi se da bi odgovorio'
+      filters:
+        n_posts:
+          one: "1 poruka"
+          few: "{{count}} poruka"
+          other: "{{count}} poruka"
+        cancel: "Uklonite filter"
+      split_topic:
+        title: "Prebaci u Novu Temu"
+        action: "prebacu u novu temu"
+        topic_name: "Ime Nove Teme"
+        error: "Dogodila se greška pri prebacivanju poruka u novu temu."
+        instructions:
+          one: "Otvorićete novu temu popunjenu s <b>{{count}}</b> poruka koje ste izabrali."
+          few: "Otvorićete novu temu popunjenu s <b>{{count}}</b> poruka koje ste izabrali."
+          other: "Otvorićete novu temu popunjenu s <b>{{count}}</b> poruka koje ste izabrali."
+      merge_topic:
+        title: "Prebaci u Postojeću Temu"
+        action: "prebaci u postojeću temu"
+        error: "Dogodili se greška prilikom prebacivanju poruka u tu temu."
+        instructions:
+          one: "Molimo odaberite temu u koju želite prebaciti <b>{{count}}</b> poruka."
+          few: "Molimo odaberite temu u koju želite prebaciti <b>{{count}}</b> poruka."
+          other: "Molimo odaberite temu u koju želite prebaciti <b>{{count}}</b> poruka."
+      change_owner:
+        title: "promena vlasnika poruke"
+        action: "promena vlasništva"
+        error: "Dogodila se greška u promeni vlasništva nad ovom porukom."
+        label: "Novi vlasnik poruke"
+        placeholder: "korisničko ime novog vlasnika"
+        instructions:
+          one: "Molimo vas odaberete novog vlasnika {{count}} poruka od <b>{{old_user}}</b>."
+          few: "Molimo vas odaberete novog vlasnika {{count}} poruka od <b>{{old_user}}</b>."
+          other: "Molimo vas odaberete novog vlasnika {{count}} poruka od <b>{{old_user}}</b>."
+        instructions_warn: "Primetite da se obaveštenja o ovoj poruci neće retroaktivno preneti novom korisniku. <br> Upozorenje: Trenutno se nikakvi podaci vezani uz poruke ne prenose novom korisniku. Koristiti pažljivo."
+      multi_select:
+        select: 'odaberi'
+        selected: 'odabrano ({{count}})'
+        delete: obriši odabrano
+        cancel: odustani od odabranog
+        select_all: odaberi sve
+        deselect_all: odustani od odabira
+        description:
+          one: Odabrali ste <b>{{count}}</b> poruka.
+          few: Odabrali ste <b>{{count}}</b> poruka.
+          other: Odabrali ste <b>{{count}}</b> poruka.
+    post:
+      edit_reason: "Razlog:"
+      post_number: "poruka {{number}}"
+      last_edited_on: "poruka zadnji puta izmjenjena"
+      reply_as_new_topic: "Odgovori u linkovanoj Temi"
+      continue_discussion: "Nastavak diskusije iz {{postLink}}:"
+      follow_quote: "idi na citiranu poruku"
+      show_full: "Prikaži Celu Poruku"
+      show_hidden: 'Vidi skriven sadržaj.'
+      deleted_by_author:
+        one: "(autor je povukao poruku, biće automatski obrisana za %{count} sati osim ako bude označena zastavicom)"
+        few: "(autor je povukao poruku, biće automatski obrisana za %{count} sati osim ako bude označena zastavicom)"
+        other: "(autor je povukao poruku, biće automatski obrisana za %{count} sati osim ako bude označena zastavicom)"
+      expand_collapse: "proširi/sruši"
+      unread: "Poruka je nepročitana"
+      errors:
+        create: "Žao nam je, dogodila se greška pri otvaranju tvoje poruke. Molimo pokušajte ponovo."
+        edit: "Žao nam je, dogodila se greška pri izmenjivanju tvoje poruke. Molimo pokušajte ponovo."
+        upload: "Žao nam je, dogodila se greška pri učitavanju te datoteke. Molimo pokušajte ponovo."
+        too_many_uploads: "Žao nam je, možete učitati samo jednu datoteku od jednom."
+        image_upload_not_allowed_for_new_user: "Žao nam je, novi korisnici ne mogu učitavati slike."
+        attachment_upload_not_allowed_for_new_user: "Žao nam je, novi korisnici ne mogu učitavati priloge."
+        attachment_download_requires_login: "Žao nam je, morate biti prijavljeni da biste preuzimali priloge."
+      abandon:
+        confirm: "Jeste li sigurni da želite odustati od vaše poruke?"
+        no_value: "Ne, zadrži"
+        yes_value: "Da, odustani"
+      via_email: "ova poruka stigla je preko e-maila"
+      archetypes:
+        save: 'Sačuvaj postavke'
+      controls:
+        reply: "počnite sa sastavljanjem odgovora na ovu poruku"
+        like: "Lajkuj ovu poruku"
+        has_liked: "Ti si lajkovao ovu poruku"
+        undo_like: "poništi lajk"
+        edit: "izmeni ovu poruku"
+        edit_anonymous: "Žao nam je, morate biti prijavljeni da bi ste izmjenili ovu poruku."
+        flag: "privatno označi poruku za pozornost ili pošalji privatno obaveštenje o njoj"
+        delete: "obriši ovu poruku"
+        undelete: "poništi brisanje poruke"
+        share: "podeli link za ovu poruku"
+        more: "Više"
+        admin: "admin akcije na objavi"
+        wiki: "Napravi Wiki"
+        unwiki: "Ukloni Wiki"
+        convert_to_moderator: "Dodaj Boje Osoblja"
+        revert_to_regular: "Ukloni Boje Osoblja"
+        rebake: "Popravi HTML"
+        unhide: "Poništi sakrivanje"
+      actions:
+        flag: 'Označi Zastavom'
+        undo:
+          off_topic: "Poništi oznaku zastavom"
+          spam: "Poništi oznaku zastavom"
+          inappropriate: "Poništi oznaku zastavom"
+          bookmark: "Poništi Marker"
+          like: "Poništi Lajk"
+          vote: "Poništi Glas"
+        by_you:
+          off_topic: "Označili ste ovo kao van teme"
+          spam: "Označili ste ovo kao nepoželjno."
+          inappropriate: "Označili ste ovo kao neprikladno"
+          notify_moderators: "Označili ste ovo za moderatore"
+          bookmark: "Markirali ste ovu poruku"
+          like: "Sviđa vam se ovo"
+          vote: "Glasali ste za ovu poruku"
+        by_you_and_others:
+          off_topic:
+            one: "Ti i {{count}} drugi korisnik označili ste ovo kao van teme"
+            few: "Ti i {{count}} drugih korisnika označili ste ovo kao van teme"
+            other: "Ti i {{count}} drugih korisnika označili ste ovo kao van teme"
+          spam:
+            one: "Ti i {{count}} drugi korisnik označili ste ovo kao nepoželjno."
+            few: "Ti i {{count}} drugih korisnika označili ste ovo kao nepoželjno."
+            other: "Ti i {{count}} drugih korisnika označili ste ovo kao nepoželjno."
+          inappropriate:
+            one: "Ti i {{count}} drugi korisnik označili ste ovo kao neprikladno"
+            few: "Ti i {{count}} drugih korisnika označili ste ovo kao neprikladno"
+            other: "Ti i {{count}} drugih korisnika označili ste ovo kao neprikladno"
+          notify_moderators:
+            one: "Ti i {{count}} drugi korisnik označili ste ovo za moderatore."
+            few: "Ti i {{count}} druga korisnika označili ste ovo za moderatore."
+            other: "Ti i {{count}} druga korisnika označili ste ovo za moderatore."
+          bookmark:
+            one: "Ti i {{count}} drugi korisnik ste markirali ovu objavu"
+            few: "Ti i {{count}} drugih korisnika ste markirali ovu objavu"
+            other: "Ti i {{count}} drugih korisnika ste markirali ovu objavu"
+          like:
+            one: "Tebi i {{count}} drugom korisniku se ovo sviđa."
+            few: "Tebi i {{count}} drugih korisnika se ovo sviđa."
+            other: "Tebi i {{count}} drugih korisnika se ovo sviđa."
+          vote:
+            one: "Ti i {{count}} drugi korisnik ste glasali za ovu poruku"
+            few: "Ti i {{count}} drugih korisnika ste glasali za ovu poruku"
+            other: "Ti i {{count}} drugih korisnika ste glasali za ovu poruku"
+        by_others:
+          off_topic:
+            one: "{{count}} korisnika označilo je ovo kao van teme"
+            few: "{{count}} korisnika označilo je ovo kao van teme"
+            other: "{{count}} korisnika označilo je ovo kao van teme"
+          spam:
+            one: "{{count}} korisnik označilo je ovo kao nepoželjno"
+            few: "{{count}} korisnika označilo je ovo kao nepoželjno"
+            other: "{{count}} korisnika označilo je ovo kao nepoželjno"
+          inappropriate:
+            one: "{count}} korisnik označilo je ovo kao neprikladno"
+            few: "{count}} korisnika označilo je ovo kao neprikladno"
+            other: "{{count}} korisnika označilo je ovo kao neprikladno"
+          notify_moderators:
+            one: "{{count}} korisnik označilo je ovo za moderatora"
+            few: "{{count}} korisnika označilo je ovo za moderatora"
+            other: "{{count}} korisnika označilo je ovo za moderatora"
+          bookmark:
+            one: "{{count}} korisnik je markiralo ovu objavu"
+            few: "{{count}} korisnika je markiralo ovu objavu"
+            other: "{{count}} korisnika je markiralo ovu objavu"
+          like:
+            one: "{{count}} korisnik se ovo sviđa"
+            few: "{{count}} korisnika se ovo sviđa"
+            other: "{{count}} korisnika se ovo sviđa"
+          vote:
+            one: "{{count}} korisnik je glasalo za ovu poruku"
+            few: "{{count}} korisnika je glasalo za ovu poruku"
+            other: "{{count}} korisnika je glasalo za ovu poruku"
+      revisions:
+        controls:
+          first: "Prva revizija"
+          previous: "Prethodna revizija"
+          next: "Sedeća revizija"
+          last: "Poslednja revizija"
+          hide: "Sakrij reviziju"
+          show: "Prikaži reviziju"
+        displays:
+          inline:
+            title: "Prikaži izvedeni ispis  s dodavanjima i oduzimanjima u liniji."
+          side_by_side:
+            title: "Prikaži izračunate odlazne podatke s razlikama nasuprot."
+          side_by_side_markdown:
+            title: "Prikaži razlike u sirovom izvoru jednu nasuprot druge."
+    category:
+      can: 'može&hellip'
+      none: '(nema kategorije)'
+      choose: 'Odaberi kategoriju&hellip;'
+      edit: 'izmeni'
+      edit_long: "Izmeni"
+      view: 'Prikaži Teme u Kategoriji'
+      general: 'Opšti'
+      settings: 'Podešavanje'
+      delete: 'Obriši Kategoriju'
+      create: 'Nova Kategorija'
+      save: 'Sačuvaj Kategoriju'
+      slug: 'Kod Kategorije'
+      slug_placeholder: '(Neobavezno) spojene-rieči za url'
+      creation_error: Dogodila se greška pri otvaranju kategorije.
+      save_error: Dogodila se greška pri čuvanju kategorije.
+      name: "Ime Kategorije"
+      description: "Opis"
+      topic: "tema kategorije"
+      logo: "Logo Kategorije "
+      background_image: "Pozadinska Slika Kategorije"
+      badge_colors: "Boje značke"
+      background_color: "Pozadinska boja"
+      foreground_color: "Istaknuta boja."
+      name_placeholder: "Jedna ili dve reči maksimalno"
+      color_placeholder: "bilo koja boja"
+      delete_confirm: "Jeste li sigurni da želite izbrisati ovu kategoriju?"
+      delete_error: "Dogodila se greška pri brisanju kategorije."
+      list: "Lista Kategorija"
+      no_description: "Molimo dodajte opis ovoj kategoriji."
+      change_in_category_topic: "Izmena Opisa"
+      already_used: 'Ova boja se koristi u drugoj kategoriji.'
+      security: "Sigurnost"
+      images: "Slike"
+      email_in: "Prilagođena adresa dolaznog e-maila."
+      email_in_allow_strangers: "Prihvati emailove anonimnih korisnika bez naloga"
+      email_in_disabled: "Objavljivanje novih tema preko emaila je onemogućeno u podešavanjima stranice. Da omogućite objavljivanje tema preko emaila,"
+      email_in_disabled_click: 'omogućite "pošalji email u" podešavanjima.'
+      allow_badges_label: "Dozvoli dodjeljivanje značaka u ovoj kategoriji."
+      edit_permissions: "Izmeni dozvole"
+      add_permission: "Dodaj dozvole"
+      this_year: "ove godine"
+      position: "pozicija"
+      default_position: "Zadana pozicija"
+      position_disabled: "Kategorije će u nizu biti prikazivane po nivou aktivnosti. Za kontrolu redosleda kategorija u listi,"
+      position_disabled_click: 'omogućite postavku "fiksiranje pozicija kategorija" u podešavanjima.'
+      parent: "Nadkategorija"
+      notifications:
+        watching:
+          title: "Posmatrano"
+        tracking:
+          title: "Praćeno"
+        regular:
+          title: "Normalno"
+          description: "Bićete obavešteni kada neko pomene vaše @ime ili vam odgovori"
+        muted:
+          title: "Utišano"
+    flagging:
+      title: 'Hvala što pomažete u održavanju naše zajednice pristojnom.'
+      action: 'Označi Poruku Zastavom'
+      take_action: "Preduzmi Akciju"
+      delete_spammer: "Obriši korisnika zbog nepoželjnih poruka"
+      yes_delete_spammer: "Da, Obriši Korisnika"
+      ip_address_missing: "(N/A)"
+      hidden_email_address: "(sakriveno)"
+      submit_tooltip: "Priložite privatnu zastavu."
+      take_action_tooltip: "Dođite odmah do praga za zastave, umesto da čekate još zastava od zajednice."
+      cant: "Žao nam je, trenutno ne možete označiti ovu poruku zastavom."
+      formatted_name:
+        off_topic: "Van Teme je."
+        inappropriate: "Neprikladno je."
+        spam: "Nepoželjno je."
+      custom_placeholder_notify_user: "Budite specifični, konstruktivni i uvek ljubazni."
+      custom_placeholder_notify_moderators: "Recite nam tačno šta vas brine, i gde je moguće dajte relevantne linkove i primere ako je moguće."
+    flagging_topic:
+      title: "Hvala što pomažete u održavanju i našu zajednicu pristojnom."
+      action: "Označi Temu Zastavom"
+    topic_map:
+      title: "Sažetak teme"
+      clicks:
+        one: "%{count} klik"
+        few: "%{count} klikova"
+        other: "%{count} klikova"
+    topic_statuses:
+      warning:
+        help: "Ovo je službeno upozorenje."
+      bookmarked:
+        help: "Markirali ste ovu temu"
+      locked:
+        help: "Ova je tema zatvorena; više ne prihvata nove odgovore"
+      archived:
+        help: "Ova tema je arhivirana; zamrznuta je i ne može se menjati."
+      unpinned:
+        title: "Odkvačeno"
+        help: "Ova tema je odkvačena, prikazivaće se u standardnom redosledu."
+      pinned_globally:
+        title: "Globalno zakvačeno"
+      pinned:
+        title: "Zakvačeno"
+        help: "Ova tema je zakvačena, prikazivati će se na vrhu svoje kategorije."
+      invisible:
+        help: "Ova tema je ne-listovana; neće se prikazivati na listi tema i može joj se pristupiti samo preko direktnog linka."
+    posts: "Poruke"
+    posts_long: "Ima {{number}} poruka u ovoj temi"
+    original_post: "Originalna Poruka"
+    views: "Pregledi"
+    replies: "Odgovori"
+    activity: "Aktivnosti"
+    likes: "Lajkova"
+    likes_long: "ima {{number}} like-ova u ovoj temi"
+    users: "Korisnici"
+    category_title: "Kategorija"
+    history: "Istorija"
+    changed_by: "od {{author}}"
+    raw_email:
+      not_available: "Nije dostupno!"
+    categories_list: "Lista Kategorija"
+    filters:
+      with_topics: "%{filter} teme"
+      with_category: "%{filter} %{category} teme"
+      latest:
+        title: "Poslednje"
+        title_with_count:
+          one: "Poslednje ({{count}})"
+          few: "Poslednje ({{count}})"
+          other: "Poslednje ({{count}})"
+        help: "teme sa nedavnim porukama"
+      hot:
+        title: "Vruće"
+        help: "izbor vrućih tema"
+      read:
+        title: "Pročitano"
+        help: "Teme koje ste pročitali, po redu po kojem ste ih zadnji put čitali"
+      categories:
+        title: "Kategorije"
+        title_in: "Kategorija - {{categoryName}}"
+        help: "sve teme grupirane po kategorijama"
+      unread:
+        title: "Nepročitano"
+        title_with_count:
+          one: "Nepročitane ({{count}})"
+          few: "Nepročitane ({{count}})"
+          other: "Nepročitane ({{count}})"
+        help: "teme koje trenutno posmatrate ili pratite s nepročitanim porukama"
+        lower_title_with_count:
+          one: "1 nepročitana"
+          few: "{{count}} nepročitanih"
+          other: "{{count}} nepročitanih"
+      new:
+        lower_title_with_count:
+          one: "1 nova"
+          few: "{{count}} novih"
+          other: "{{count}} novih"
+        lower_title: "novo"
+        title: "Novo"
+        title_with_count:
+          one: "Nove (1)"
+          few: "Nove ({{count}})"
+          other: "Nove ({{count}})"
+        help: "teme otvorene u zadnjih par dana"
+      posted:
+        title: "Moje poruke"
+        help: "teme u kojima si pisao poruke"
+      bookmarks:
+        title: "Markiraj"
+        help: "teme koje ste markirali"
+      category:
+        help: "poslednje teme u {{categoryName}} kategoriji"
+      top:
+        title: "Top"
+        help: "najaktivnije teme u poslednjih godinu, mesec, nedelju ili dan"
+        all:
+          title: "Top svih vremena"
+        yearly:
+          title: "Top godišnje"
+        quarterly:
+          title: "Top kvartalne"
+        monthly:
+          title: "Top mesečne"
+        weekly:
+          title: "Top nedeljne"
+        daily:
+          title: "Top dnevne"
+        all_time: "Svih vremena"
+        this_year: "Godina"
+        this_quarter: "Kvartal"
+        this_month: "Mesec"
+        this_week: "Nedelja"
+        today: "Danas"
+        other_periods: "vidi top teme"
+    browser_update: 'Nažalost, <a href="http://www.discourse.org/faq/#browser">vaš  pretraživač je prestar da radi na ovoj stranici</a>. Molimo <a href="http://browsehappy.com"> nadogradite si pretraživač</a>'
+    permission_types:
+      full: "Otvoriti / Odgovori / Pogledaj"
+      create_post: "Odgovori / Pogledaj"
+      readonly: "Pogledaj"
+    keyboard_shortcuts_help:
+      title: 'Prečice na tastaturi'
+  admin_js:
+    type_to_filter: "upiši za filtriranje"
+    admin:
+      title: 'Administrator'
+      moderator: 'Moderator'
+      dashboard:
+        title: "Komandna Tabla"
+        last_updated: "Kontrolna Tabla zadnje promene:"
+        version: "Verzija"
+        up_to_date: "Imate trenutnu verziju!"
+        critical_available: "Dostupno je kritično ažuriranje."
+        updates_available: "Ažuriranje je dostupno."
+        please_upgrade: "Molimo nadogradite!"
+        no_check_performed: "Nije učinjena provera za nadogradnju. Proverite radi li pomoćnik."
+        stale_data: "Nije dugo učinjena provera za nadogradnju. Proverite radi li pomoćnik."
+        version_check_pending: "Čini se da ste nedavno nadogradili. Fantastično!"
+        installed_version: "Instalirano"
+        latest_version: "Poslednje"
+        problems_found: "Pronađeni su neki problemi s vašom instalacijom Discourse-a:"
+        last_checked: "Zadnje provereno"
+        refresh_problems: "Osveži"
+        no_problems: "Nisu pronađeni problemi."
+        moderators: 'Moderatori:'
+        admins: 'Admini:'
+        suspended: 'Suspendovani:'
+        reports:
+          today: "Danas"
+          yesterday: "Juče"
+          last_7_days: "Zadnjih 7 Dana"
+          last_30_days: "Zadnjih 30 Dana"
+          all_time: "Oduvek"
+          7_days_ago: "Pre 7 Dana"
+          30_days_ago: "Pre 30 Dana"
+          all: "Sve"
+          view_table: "tablica"
+          refresh_report: "Osveži Prijave"
+          start_date: "Datum početka"
+          end_date: "Datum kraja"
+      commits:
+        latest_changes: "Posljednje promene: molimo često nadograđujte!"
+        by: "od"
+      flags:
+        title: "Zastave"
+        agree: "Slažem se"
+        agree_title: "Potvrdite ovu zastavu kao validnu i tačnu"
+        defer_flag_title: "Ukloni zastavu; trenutno nema potrebe za akcijom."
+        delete: "Obriši"
+        delete_title: "Obriši poruku na koju ova zastava referira."
+        delete_post_defer_flag_title: "Obriši poruku; ako je prva, obriši temu"
+        delete_post_agree_flag_title: "Obriši poruku; ako je prva, obriši temu"
+        delete_flag_modal_title: "Obriši i..."
+        delete_spammer: "Obriši korisnika"
+        delete_spammer_title: "Ukloni korisnika i sve njegove teme i poruke."
+        disagree_flag_unhide_post: "Odbaci (ponovo prikaži poruku)"
+        disagree_flag_unhide_post_title: "Ukloni zastavu sa ove poruke i učini poruku vidljivom"
+        disagree_flag: "Odbaci"
+        disagree_flag_title: "Poništi ovu poruku kao netačnu"
+        clear_topic_flags: "Gotovo"
+        clear_topic_flags_title: "Ova je tema istražena i problemi su rešeni. Klikni Gotovo da ukloniš zastave."
+        more: "(više odgovora...)"
+        dispositions:
+          agreed: "Slažem se"
+          disagreed: "Odbačeno"
+        flagged_by: "Označio"
+        resolved_by: "Rešeno"
+        took_action: "Preduzeo akciju"
+        system: "Sistem"
+        error: "Nešto nije u redu"
+        reply_message: "Odgovori"
+        topic_flagged: "Ova <strong>tema</strong> je označena zastavom."
+        visit_topic: "Poseti temu da preduzmeš akciju."
+        was_edited: "Poruka je izmenjena nakon prve zastave."
+        previous_flags_count: "Ova je poruka je već označena zastavom {{count}} puta."
+      groups:
+        primary: "Primarna Grupa"
+        no_primary: "(nema primarne grupe)"
+        title: "Grupe"
+        edit: "Izmeni Grupe"
+        refresh: "Osveži"
+        new: "Novo"
+        selector_placeholder: "unesite korisničko ime"
+        about: "Ovde izmenite svoje članstvo u grupama i imenima grupa"
+        group_members: "Članovi grupe"
+        delete: "Obriši"
+        delete_confirm: "Obriši ovu grupu?"
+        delete_failed: "Nemoguće obrisati grupu. Ako je ovo automatska grupa, ne možete je obrisati."
+        add: "Dodaj"
+        add_members: "Dodaj članove"
+        automatic_membership_email_domains: "Korisnici koji se registruju sa email domenom koja tačno odgovora jednoj na ovoj listi biće automatski dodani u ovu grupu:"
+        automatic_membership_retroactive: "Primeni isto pravilo o email domeni za dodavanje postojećih registrovanih korisnika"
+      api:
+        generate_master: "Generiši glavni API ključ"
+        none: "Nema aktivnih API ključeva"
+        user: "Korisnik"
+        title: "API"
+        key: "API Ključ"
+        generate: "Generiši"
+        regenerate: "Regeneriši"
+        revoke: "Povuci"
+        confirm_regen: "Jeste li sigurni da želite zameniti taj API ključ sa novim?"
+        confirm_revoke: "Jeste li sigurni da želite povući taj ključ?"
+        info_html: "Vaš API ključ će vam dozvoliti da otvarate i nadograđujete teme koristeći JSON pozive."
+        all_users: "Svi korisnici"
+        note_html: "Čuvajte ovaj ključ <strong>tajnim</strong>, svi korisnici koji ga imaju mogu stvarati proizvoljne poruke kao bilo koji korisnici."
+      backups:
+        title: "Sigurnosne kopije"
+        menu:
+          backups: "Sigurnosne kopije"
+          logs: "Logovi"
+        none: "Nema dostupne kopije."
+        logs:
+          none: "Još nema logova..."
+        columns:
+          filename: "Ime datoteke"
+          size: "Veličina"
+        upload:
+          uploading: "Učitavanje..."
+          success: "'{{filename}}' je uspešno učitano."
+          error: "Dogodila se greška pri učitavanju '{{filename}}': {{message}}"
+        operations:
+          is_running: "Operacija je trenutno u toku..."
+          failed: "{{operation}} neuspješna. Molimo proverite logove."
+          cancel:
+            title: "Odustani od trenutne operacije."
+            confirm: "Jeste li sigurni da želite odustati od trenutne operacije?"
+          backup:
+            title: "Napravi sigurnosnu kopiju"
+            confirm: "Želite li pokrenuti novu sigurnosnu kopiju?"
+            without_uploads: "Da (ne uključuj datoteke)"
+          destroy:
+            title: "Ukloni kopiju"
+            confirm: "Jeste li sigurni da želite uništiti ovu sigurnosnu kopiju?"
+          restore:
+            is_disabled: "Obnova je onemogućena u podešavanjima stranice."
+            title: "Obnovi sigurnosnu kopiju"
+          rollback:
+            title: "Vrati bazu podataka na prethodno radno stanje"
+      export_csv:
+        failed: "Izvoz neuspešan. Molimo proverite logove."
+        button_text: "Izvoz"
+        button_title:
+          user: "Izvezi celu listu korisnika u CSV formatu."
+          staff_action: "Izvezi celi log akcija osoblja u CSV formatu."
+          screened_email: "Izvezi listu svih proverenih emailova u CSV formatu."
+          screened_ip: "Izvezi listu svih proverenih IP-eva u CSV formatu."
+          screened_url: "Izvezi listu svih proverenih URL-ova u CSV formatu."
+      customize:
+        title: "Prilagođavanje"
+        long_title: "Prilagođavanje Stranice"
+        preview: "Prikaz"
+        save: "Sačuvaj"
+        new: "Novo"
+        new_style: "Novi Stil"
+        delete: "Obriši"
+        about: "Izmjeni CSS stylesheet i HTML zaglavlja na stranici. Dodaj prilagođenost za početak."
+        color: "Boja"
+        opacity: "Prozirnost"
+        copy: "Kopija"
+        colors:
+          title: "Boje"
+          long_title: "Šema Boja"
+          new_name: "Nova šema boja"
+          copy_name_prefix: "Kopija od"
+          delete_confirm: "Obriši ovu šemu?"
+          undo: "Poništi"
+          undo_title: "Poništi promene ovoj boji od zadnjeg puta kad su sačuvane."
+          revert: "vrati"
+          revert_title: "Postavi ovu boju na Discourse standard šemu boja."
+          primary:
+            name: 'primarna'
+            description: 'Većina teksta, ikonica i granica.'
+          secondary:
+            name: 'sekundarna'
+            description: 'Glavna pozadinska boja, i boja teksta na nekim dugmićima.'
+          tertiary:
+            name: 'tercijarna'
+            description: 'Linkovi, neki dugmići, obaveštenja i boja naglaska.'
+          quaternary:
+            name: "kvartarna"
+            description: "Linkovi za navigaciju"
+          header_background:
+            name: "Pozadina headera"
+            description: "Pozadinska boja headera stranice."
+          header_primary:
+            name: "header primarna"
+            description: "Tekst i ikonice u headeru."
+          highlight:
+            name: 'naglasak'
+            description: 'Pozadinska boja naglašenih elemenata na stranici, kao što su poruke i teme.'
+          danger:
+            name: 'opasnost'
+            description: 'Boja naglaska za akcije kao što su brisanje teme ili poruka.'
+          success:
+            name: 'uspešno'
+            description: 'Koristi se da pokaže da je neka akcija bila uspešna.'
+          love:
+            name: 'lajk'
+            description: "Boja dugmeta za lajk"
+      email:
+        settings: "Podešavanje"
+        preview_digest: "Pregled sažetka"
+        sending_test: "Šaljem test Email"
+        error: "<b>GREŠKA</b> - %{server_error}"
+        test_error: "Dogodio se problem pri slanju test emaila. Molimo proverite  podešavanja emaila, potvrdite da domaćin ne blokira email veze i pokušajte ponovo."
+        sent: "Poslato"
+        skipped: "Preskočeno"
+        sent_at: "Poslato na"
+        time: "Vreme"
+        user: "Korisnik"
+        email_type: "Vrsta Email-a"
+        to_address: "Na Adresu"
+        test_email_address: "email adresa za test"
+        send_test: "Pošalji Test Email"
+        sent_test: "poslato!"
+        delivery_method: "Metoda dostave"
+        refresh: "Osveži"
+        format: "Format"
+        html: "html"
+        text: "tekst"
+        last_seen_user: "Posljednji Viđeni Korisnik:"
+        reply_key: "Ključ odgovora"
+        skipped_reason: "Preskoči razlog"
+        logs:
+          none: "Nema pronađenih logova."
+          filters:
+            title: "Filter"
+            user_placeholder: "korisničko ime"
+            address_placeholder: "name@example.com"
+            type_placeholder: "sažetak, prijava..."
+            reply_key_placeholder: "ključ odgovora"
+            skipped_reason_placeholder: "razlog"
+      logs:
+        title: "Logovi"
+        action: "Akcije"
+        created_at: "Otvoreno"
+        last_match_at: "Zadnji usklađeni"
+        match_count: "Usklađeni"
+        ip_address: "IP"
+        topic_id: "ID Teme"
+        post_id: "ID Poruke"
+        delete: 'Obriši'
+        edit: 'Izmeni'
+        save: 'Sačuvaj'
+        screened_actions:
+          block: "blokiraj"
+          do_nothing: "Ne čini ništa"
+        staff_actions:
+          title: "Akcije Osoblja"
+          clear_filters: "Prikaži sve"
+          staff_user: "Korisnik Osoblja"
+          target_user: "Ciljani korisnik"
+          subject: "Predmet"
+          when: "Kada"
+          context: "Kontekst"
+          details: "Detalji"
+          previous_value: "Prethodno"
+          new_value: "Novo"
+          diff: "Razlike"
+          show: "Prikaži"
+          modal_title: "Detalji"
+          no_previous: "Nema prethodne vrednosti."
+          deleted: "Nema nove vrednosti. Zapis je obrisan."
+          actions:
+            delete_user: "obriši korisnika"
+            change_trust_level: "promeni nivo poverenja"
+            change_username: "promeni korisničko ime"
+            change_site_setting: "promeni podešavanja stranice"
+            suspend_user: "supsenduj korisnika"
+            unsuspend_user: "od-suspenduj korisnika"
+            grant_badge: "dodeli značku"
+            revoke_badge: "povuci značku"
+            check_email: "proveri email"
+            delete_topic: "obriši temu"
+            delete_post: "obriši poruku"
+            impersonate: "predstavi se kao"
+        screened_emails:
+          title: "Provereni emailovi"
+          description: "Kad neko pokuša otvoriti nalog, sledeće email adrese će biti proverene i registracija će biti blokirana ili će neke druge akcije biti poduzete."
+          email: "Email adresa"
+          actions:
+            allow: "Dozvoli"
+        screened_urls:
+          title: "Provereni URL-ovi"
+          description: "URL-ovi s ove liste su korišteni u porukama korisnika koji su identifikovani kao nepoželjni."
+          url: "URL"
+          domain: "Domen"
+        screened_ips:
+          title: "Provereni IP-ovi"
+          description: 'IP adrese koje se posmatraju. Upotrebi "Dozvoli" da staviš IP adrese na belu listu.'
+          delete_confirm: "Jeste li sigruni da želite ukloniti pravilo za %{ip_address}?"
+          roll_up_confirm: "Jeste li sigurni da želite zaokružiti često proveraavnje IP adrese u pod-mreže?"
+          rolled_up_some_subnets: "Uspešno zaokruženi zabranjeni IP unosi u ove pod-mreže:  %{subnets}."
+          rolled_up_no_subnet: "Nema ničega za zaokružiti."
+          actions:
+            block: "Blokiraj"
+            do_nothing: "Dozvoli"
+            allow_admin: "Dozvoli Administratoru"
+          form:
+            label: "Novo:"
+            ip_address: "IP adrese"
+            add: "Dodaj"
+          roll_up:
+            text: "Zaokruži"
+            title: "Otvori nove unose zabrana za podmreže ako ima barem 'min_ban_entries_for_roll_up' unosa."
+        logster:
+          title: "Logovi Grešaka"
+      impersonate:
+        title: "Predstavi se kao"
+        help: "Koristite ovaj alat da se predstavite kao određeni korisnički nalog za potrebe ispravljanja grešaka. Moraćete se odjaviti kad završite."
+      users:
+        title: 'Korisnici'
+        create: 'Dodaj Administratora'
+        last_emailed: "Zadnji Email-an"
+        not_found: "Žao nam je, taj korisnik ne postoji u našem sistemu."
+        id_not_found: "Žao nam je, taj korisnički ID ne postoji u našem sistemu."
+        active: "Aktivni"
+        show_emails: "Pokaži Email-ove"
+        nav:
+          new: "Novo"
+          active: "Aktivno"
+          pending: "U toku"
+          staff: 'Osoblje'
+          suspended: 'Suspendovani'
+          suspect: 'Sumljivi'
+        approved: "Potvrđenji?"
+        approved_selected:
+          one: "Potvrdi korisnika"
+          few: "Potvrdi korisnike ({{count}})"
+          other: "Potvrdi korisnike ({{count}})"
+        reject_selected:
+          one: "odbij korisnika"
+          few: "odbij korisnike ({{count}})"
+          other: "odbij korisnike ({{count}})"
+        titles:
+          active: 'Aktivni Korisnici'
+          new: 'Novi Korisnici'
+          pending: 'Korisnici koji čekaju reviziju'
+          newuser: 'Korisnici na nivou poverenja 0 (Novi Korisnik)'
+          basic: 'Korisnici na nivou poverenja 1 (Osnovni Korisnik)'
+          staff: "Osoblje"
+          admins: 'Administratori'
+          moderators: 'Moderatori'
+          suspended: 'Suspendovani Korisnici'
+          suspect: 'Sumljivi Korisnici'
+        reject_successful:
+          one: "Uspešno odbio %{count} koriniska."
+          few: "Uspešno odbio %{count} koriniska."
+          other: "Uspešno odbio %{count} koriniska."
+        reject_failures:
+          one: "Neuspešno odbio %{count} korisnika."
+          few: "Neuspešno odbio %{count} korisnika."
+          other: "Neuspešno odbio %{count} korisnika."
+        not_verified: "Nije verifikovano"
+        check_email:
+          title: "Otkrij korisnikovu email adresu"
+          text: "Pokaži"
+      user:
+        suspend_failed: "Nešto nije pošlo kako treba pri suspenziji ovog korisnika {{error}}"
+        unsuspend_failed: "Nešto nije u redu,  pri ukidanju suspenzije ovog korisnika {{error}}"
+        suspend_duration: "Koliko dugo će ovaj korisnik biti suspendovan?"
+        suspend_reason_label: "Zažto ga suspendiraš? Ovaj tekst <b>će biti vidljiv svima</b> na korisničkom profilu korisnika, i biće prikazan korisniku kad se pokuša prijaviti. Neka  bude kratak."
+        suspend_reason: "Razlog"
+        suspended_by: "Suspendovan od"
+        delete_all_posts: "Obriši sve poruke"
+        moderator: "Moderator?"
+        admin: "Administrator?"
+        suspended: "Suspendovan?"
+        show_admin_profile: "Administrator"
+        refresh_browsers: "Forsiraj osveživanje pretraživača"
+        refresh_browsers_message: "Poruka poslata svim klijentima!"
+        show_public_profile: "Pokaži javni profil"
+        impersonate: 'Predstavi se kao'
+        ip_lookup: "IP Pregled"
+        log_out: "Odjava"
+        logged_out: "Korisnik je odjavljen sa svih uređaja"
+        revoke_admin: 'Poništi Administratora'
+        grant_admin: 'Dodijeli Administratora'
+        revoke_moderation: 'Poništi Moderatora'
+        grant_moderation: 'Dodijeli Moderatora'
+        unsuspend: 'Poništi suspenziju'
+        suspend: 'Suspendiraj'
+        reputation: Reputacija
+        permissions: Dozvole
+        activity: Aktivnost
+        like_count: Like-ovi Dati / Primljeni
+        last_100_days: 'U zadnjih 100 dana'
+        private_topics_count: Privatne Teme
+        posts_read_count: Poruka Pročitano
+        post_count: Poruka Otvoreno
+        topics_entered: Tema Pregledano
+        flags_given_count: Dato Zastava
+        flags_received_count: Zastava Primljeno
+        warnings_received_count: Upozorenja Primljeno
+        flags_given_received_count: 'Zastavica primljeno / Dato'
+        approve: 'Dozvoli'
+        approved_by: "Dozvolio"
+        approve_success: "Korisnik odobren i email sa aktivacionim upustvima  poslat."
+        approve_bulk_success: "Uspeh! Svi označeni korisnici su odobreni i obavešteni."
+        time_read: "Vreme Čitanja"
+        delete: "Obriši Korisnika"
+        delete_forbidden_because_staff: "Admini i moderatori ne mogu biti obrisani."
+        delete_forbidden:
+          one: "Korisnici ne mogu biti obrisani ako imaju poruka. Obrišite sve njihove poruke pre nego pokušate obrisati korisnika. (Poruke starije od %{dana} ne mogu biti obrisane.)"
+          few: "Korisnici ne mogu biti obrisani ako imaju poruka. Obrišite sve njihove poruke pre nego pokušate obrisati korisnika. (Poruke starije od %{dana} ne mogu biti obrisane.)"
+          other: "Korisnici ne mogu biti obrisani ako imaju poruka. Obrišite sve njihove poruke pre nego pokušate obrisati korisnika. (Poruke starije od %{dana} ne mogu biti obrisane.)"
+        cant_delete_all_posts:
+          one: "Ne možete obrisati sve poruke. Neke su starije od %{count} dana. ( delete_user_max_post_age podešavanja.)"
+          few: "Ne možete obrisati sve poruke. Neke su starije od %{count} dana. ( delete_user_max_post_age podešavanja.)"
+          other: "Ne možete obrisati sve poruke. Neke su starije od %{count} dana. ( delete_user_max_post_age podešavanja.)"
+        cant_delete_all_too_many_posts:
+          one: "Ne možete obrisati sve objave jer korisnik ima više od  %{count} poruka. (delete_all_posts_max)"
+          few: "Ne možete obrisati sve objave jer korisnik ima više od  %{count} poruka. (delete_all_posts_max)"
+          other: "Ne možete obrisati sve objave jer korisnik ima više od  %{count} poruka. (delete_all_posts_max)"
+        delete_confirm: "Jeste li SIGURNI da želite obrisati ovog korisnika? Ovo je trajno!"
+        delete_and_block: "Obriši i <b>block</b> ovaj email i IP adresu"
+        delete_dont_block: "Samo obriši"
+        deleted: "Korisnik je obrisan."
+        delete_failed: "Dogodila se greška pri brisanju korisnika. Proverite da li ste obrisali sve njegove poruke pre nego što ponovo pokušate brisati."
+        send_activation_email: "Pošalji Aktivacijski Email"
+        activation_email_sent: "Aktivacioni email je poslat."
+        send_activation_email_failed: "Dogodila se greška pri slanju još jednog aktivacionog emaila. %{error}"
+        activate: "Aktiviraj Nalog"
+        activate_failed: "Dogodio se problem sa aktiviranjem korisnika."
+        deactivate_account: "Deaktiviraj Nalog"
+        deactivate_failed: "Dogodio se problem sa deaktivacijom korisnika."
+        deactivate_explanation: "Deaktivirani korisnik mora ponovo potvrditi svoj email."
+        suspended_explanation: "Suspendovani korisnik se ne može prijaviti."
+        trust_level_change_failed: "Dogodio se problem sa promenom nivoa poverenja korisnika."
+        suspend_modal_title: "Suspenduj Korisnika"
+        trust_level_2_users: "Korisnici Na Nivou Poverenja 2"
+        trust_level_3_requirements: "Predispozicije Za Nivo Poverenja 3"
+        trust_level_locked_tip: "Nivo poverenja zaključan, sistem neće unapređivati ili skidati korisnika"
+        trust_level_unlocked_tip: "Nivo poverenja zaključan, sistem neće unapređivati ili skidati korisnika"
+        lock_trust_level: "Zaključaj Nivo Poverenja"
+        unlock_trust_level: "Odključaj Nivo Poverenja"
+        tl3_requirements:
+          title: "Predispozicije Za Nivo Poverenja 3"
+          value_heading: "Vriednost"
+          requirement_heading: "Predispozicija"
+          visits: "Poseta"
+          days: "dana"
+          topics_replied_to: "Teme Odgovrene U"
+          topics_viewed: "Tema Pregledano"
+          topics_viewed_all_time: "Tema pogledano (sve vreme)"
+          posts_read: "Poruka Pročitano"
+          posts_read_all_time: "Poruka pročitano (sve vreme)"
+          flagged_posts: "Poruka Označeno Zastavom"
+          flagged_by_users: "Korisnici Koji Su Označili Zastavom"
+          likes_given: "Lajkova Dato"
+          likes_received: "Primljeno Lajkova"
+          likes_received_days: "Lajkova Primljeno: jedinsteni dani"
+          likes_received_users: "Lajkova Primljeno: jedinstveni korisnici"
+          qualifies: "Kvalifikovao se za nivo poverenja 3."
+          does_not_qualify: "Ne kvalificira se za nivo poverenja 3."
+          will_be_promoted: "Uskoro će biti unapređen."
+          will_be_demoted: "Uskoro će biti skinut."
+          on_grace_period: "Trenutno u periodu milosti zbog promocije, neće biti skinut."
+          locked_will_not_be_promoted: "Nivo poverenja zaključan. Neće biti unapređivan."
+          locked_will_not_be_demoted: "Nivo poverenja zaključan. Neće biti skinut."
+        sso:
+          title: "SSO"
+          external_id: "Spoljašni ID"
+          external_username: "Korisničko ime"
+          external_name: "Ime"
+          external_email: "Email"
+          external_avatar_url: "URL Profilne Slike"
+      user_fields:
+        title: "Korisnička polja"
+        help: "Dodaj polja koja korisnici mogu popuniti."
+        create: "Otvori Korisnička Polja"
+        untitled: "Nenaslovljeno"
+        name: "Ime Polja"
+        type: "Tip Polja"
+        description: "Opis Polja"
+        save: "Sačuvaj"
+        edit: "Izmeni"
+        delete: "Obriši"
+        cancel: "Odustani"
+        delete_confirm: "Jeste li sigurni da želite obrisati to korisničko polje?"
+        required:
+          title: "Potrebno pri registraciji?"
+          enabled: "potrebno"
+          disabled: "nepotrebno"
+        editable:
+          title: "Izmenljivo nakon registracije?"
+          enabled: "izmenljivo"
+          disabled: "nije izmenljivo"
+        show_on_profile:
+          title: "Pokaži na javnom profilu?"
+          enabled: "pokaži na profilu"
+          disabled: "nije prikazano na profilu"
+        field_types:
+          text: 'Tekst Polja'
+          confirm: 'Potvrda'
+      site_text:
+        title: 'Sadžaj Teksta'
+      site_settings:
+        show_overriden: 'Pokazuj samo promenjeno'
+        title: 'Podešavanja'
+        reset: 'resetuj'
+        none: 'ništa'
+        no_results: "Nema pronađenih rezultata."
+        clear_filter: "Čisto"
+        categories:
+          all_results: 'Sve'
+          required: 'Potrebno'
+          basic: 'Osnovne Postavke'
+          users: 'Korisnici'
+          posting: 'Poruke'
+          email: 'Email'
+          files: 'Datoteke'
+          trust: 'Nivo poverenja'
+          security: 'Sigurnost'
+          onebox: "Onebox"
+          seo: 'SEO'
+          spam: 'Nepoželjno'
+          rate_limits: 'Granica Nivoa'
+          developer: 'Programer'
+          embedding: "Ugrađivanje"
+          legal: "Legalno"
+          uncategorized: 'Ostalo'
+          backups: "Sigurnosne kopije"
+          login: "Prijava"
+      badges:
+        title: Značke
+        new_badge: Nova Značka
+        new: Nova
+        name: Ime
+        badge: Značka
+        display_name: Ime Prikaza
+        description: Opis
+        badge_type: Tip Značke
+        badge_grouping: Grupa
+        badge_groupings:
+          modal_title: Grupiranja Znački
+        granted_by: Dodeljno od
+        granted_at: Dodeljeno Pri
+        save: Sačuvaj
+        delete: Obriši
+        delete_confirm: Jeste li sigurni da želite izbrisati ovu značku?
+        revoke: Povuci
+        revoke_confirm: Jeste li sigurni da želite povući ovu značku?
+        edit_badges: Izmeni Značke
+        grant_badge: Dodeli Značku
+        granted_badges: Dodeli Značke
+        grant: Dodeli
+        no_user_badges: "%{name} nije dodeljena ni jedna značka."
+        no_badges: Nema znački koje bi mogle biti dodeljene.
+        none_selected: "Odaberite značku da počnete"
+        allow_title: Dopusti da se značka koristi kao titula
+        multiple_grant: Može biti dodeljena više puta
+        listable: Prikaži značku na javnoj stranici sa značkama
+        enabled: Omogući značku
+        icon: Ikona
+        image: Slika
+        icon_help: "Koristite ili Font Awesome klase ili URL za neku sliku"
+        query: Upitnik Značke (SQL)
+        target_posts: Upitnik cilja poruke
+        auto_revoke: Svakodnevno pokreni upitnik o povlačenju
+        show_posts: Prikaži poruke zbog kojih je značka dodeljena na stranici značke
+        trigger: Okidač
+        trigger_type:
+          none: "Ažuriraj dnevno"
+          post_action: "Kad korisnik reaguje na poruku"
+          post_revision: "Kad korisnik izmeni ili objavi poruku"
+          trust_level_change: "Kad korisnik promeni nivo poverenja"
+          user_change: "Kad je korisnik izmenjen ili stvoren"
+        preview:
+          link_text: "Pregledaj dodeljene značke"
+          plan_text: "Pregled s planom upita"
+          modal_title: "Pregled Upita Značke"
+          sql_error_header: "Dogodila se greška s upitom."
+          error_help: "Pogledaj slijedeće linkove za pomoć s upitima znački."
+          bad_count_warning:
+            header: "UPOZORENJE!"
+            text: "Postoje izgubljeni uzorci dodele. Ovo se dogodi kad upit značke vrati korisnički ID ili ID poruke koja ne postoji. Ovo može prouzrokovati nepredviđene probleme kasnije - molimo provjerite svoj upit."
+          sample: "Uzorak:"
+          grant:
+            with: <span class="username">%{username}</span>
+            with_post: <span class="username">%{username}</span> za poruku u %{link}
+            with_post_time: <span class="username">%{username}</span> za poruku u %{link} u <span class="time">%{time}</span>
+            with_time: <span class="username">%{username}</span> u <span class="time">%{time}</span>
+      emoji:
+        title: "Emoji"
+        help: "Dodajte nove Emoji-e koji će biti dostupni svima. (Savet:  povuci i ispusti više datoteka odjednom)"
+        add: "Dodaj Novi Emoji"
+        name: "Ime"
+        image: "Slika"
+        delete_confirm: "Jeste li sigurni da želite izbrisati :%{name}: emoji?"
+  wizard_js:
+    wizard:
+      done: "Gotovo"
+      back: "Nazad"
+      next: "Dalje"
+      step: "%{current} od %{total}"
+      upload: "Upload"
+      uploading: "Uploading..."
+      quit: "Možda kasnije"
+      staff_count:
+        one: "Tvoja zajednica ima 1 člana tima (tebe). "
+        few: "Vaša zajednica ima  %{count} članova tima, uključujući i vas."
+        other: "Vaša zajednica ima %{count} članova tima, uključujući i vas."
+      invites:
+        add_user: "dodaj"
+        none_added: "Nikoga još niste pozvali za člana tima. Jesi li siguran da želiš da nastaviš dalje?"
+        roles:
+          admin: "Admin"
+          moderator: "Moderator"
+          regular: "Običan korisnik"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 412af73d90..dba0cfdc2f 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -101,6 +101,7 @@ sv:
           other: "%{count} år senare"
       previous_month: 'Föregående månad'
       next_month: 'Nästkommande månad'
+      placeholder: datum
     share:
       topic: 'dela en länk till detta ämne'
       post: 'inlägg #%{postNumber}'
@@ -115,6 +116,7 @@ sv:
       split_topic: "splitta det här ämnet %{when}"
       invited_user: "bjöd in %{who} %{when}"
       invited_group: "bjöd in %{who} %{when}"
+      user_left: "%{who} tog bort sig själva från detta meddelande %{when}"
       removed_user: "tog bort %{who} %{when}"
       removed_group: "tog bort %{who} %{when}"
       autoclosed:
@@ -139,24 +141,29 @@ sv:
         enabled: 'gjorde detta till en banderoll %{when}. Den kommer att visas högst upp på varje sida tills den blir avfärdad av användaren.'
         disabled: 'tog bort denna banderoll %{when}. Den kommer inte längre att visas högst upp på varje sida.'
     topic_admin_menu: "administratörsåtgärder för ämne"
+    wizard_required: "Välkommen till din nya Discourse! Låt oss komma igång genom <a href='%{url}' data-auto-route='true'>uppsättnings guiden</a> ✨"
     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"
@@ -252,6 +259,7 @@ sv:
     uploading: "Laddar upp..."
     uploading_filename: "Laddar upp {{filename}}..."
     uploaded: "Uppladdad!"
+    pasting: "Klistrar in..."
     enable: "Aktivera"
     disable: "Inaktivera"
     undo: "Ångra"
@@ -346,11 +354,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,13 +376,9 @@ 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"
-      title:
-        one: "grupp"
-        other: "grupper"
       activity: "Aktivitet"
       members: "Medlemmar"
       topics: "Ämnen"
@@ -386,7 +386,6 @@ sv:
       mentions: "Omnämnaden"
       messages: "Meddelanden"
       alias_levels:
-        title: "Vem kan meddela och @omnämna den här gruppen?"
         nobody: "Ingen"
         only_admins: "Bara administratörer"
         mods_and_admins: "Bara moderatorer och administratörer"
@@ -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."
@@ -515,7 +513,6 @@ sv:
       admin: "{{user}} är en admin"
       moderator_tooltip: "Den här användaren är moderator"
       admin_tooltip: "Den här användaren är administrator"
-      blocked_tooltip: "Den här användaren är blockerad"
       suspended_notice: "Den här användaren är avstängd till {{date}}."
       suspended_reason: "Anledning:"
       github_profile: "Github"
@@ -596,7 +593,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"
@@ -614,7 +610,7 @@ sv:
         upload_title: "Ladda upp din bild"
         upload_picture: "Ladda upp bild"
         image_is_not_a_square: "Varning: vi beskar din bild; bredden och höjden var inte samma."
-        cache_notice: "Du har nu bytt profilbild med det kan ta lite tid innan den visas på grund av webbläsar-cachen."
+        cache_notice: "Du har nu bytt profilbild men det kan ta lite tid innan den visas på grund av webbläsarens s.k. cache."
       change_profile_background:
         title: "Profilbakgrund"
         instructions: "Bakgrunderna är centrerade och har en förinställd bredd på 850px"
@@ -623,7 +619,7 @@ sv:
         instructions: "Bakgrundsbilder kommer att vara centrerade och ha en standardbredd på 590 px."
       email:
         title: "E-post"
-        instructions: "aldrig visat för allmänheten"
+        instructions: "visas aldrig publikt"
         ok: "Vi skickar e-post till dig för bekräftelse"
         invalid: "Vänligen ange en giltig e-postadress"
         authenticated: "Din e-postadress har blivit verifierad av {{provider}}"
@@ -640,7 +636,7 @@ sv:
       username:
         title: "Användarnamn"
         instructions: "unikt, inga mellanrum, kort"
-        short_instructions: "Folk kan nämna dig som @{{username}}"
+        short_instructions: "Du kan omnämnas som @{{username}}"
         available: "Ditt användarnamn är tillgängligt"
         not_available: "Inte tillgängligt. Prova {{suggestion}}?"
         not_available_no_suggestion: "Inte tillgänglig"
@@ -766,12 +762,6 @@ sv:
         post_count:
           one: "inlägg skapat"
           other: "inlägg skapade"
-        likes_given:
-          one: "<i class='fa fa-heart'></i> given"
-          other: "<i class='fa fa-heart'></i> given"
-        likes_received:
-          one: "<i class='fa fa-heart'></i> mottagen"
-          other: "<i class='fa fa-heart'></i> mottagen"
         days_visited:
           one: "dag besökt"
           other: "dagar besökta"
@@ -863,7 +853,6 @@ sv:
     first_post: Första inlägget
     mute: Tysta
     unmute: Avtysta
-    last_post: Senaste inlägg
     last_reply_lowercase: senaste svar
     replies_lowercase:
       one: svar
@@ -971,7 +960,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:
@@ -1061,12 +1049,7 @@ sv:
       olist_title: "Numrerad lista"
       ulist_title: "Punktlista"
       list_item: "Listobjekt"
-      heading_label: "H"
-      heading_title: "Rubrik"
-      heading_text: "Rubrik"
-      hr_title: "Horisontell linje"
       help: "Markdown redigeringshjälp"
-      toggler: "Dölj eller visa composer-panelen"
       modal_ok: "OK"
       modal_cancel: "Avbryt"
       cant_send_pm: "Tyvärr, du kan inte skicka ett meddelande till %{username}."
@@ -1080,28 +1063,6 @@ sv:
       empty: "Inga notifieringar hittades."
       more: "visa äldre notifikationer"
       total_flagged: "totalt antal flaggade inlägg"
-      mentioned: "<i title='omnämnd' 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:
-        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} och en annan</span> {{description}}</p>"
-        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} och {{count}} andra</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='inbjuden till ämne' 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> accepterade din inbjudan</p>"
-      moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> flyttade {{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>Förtjänade '{{description}}'</p>"
-      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Nytt ämne</span> {{description}}</p>"
-      group_message_summary:
-        one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} meddelande i din {{group_name}}-inkorg</p>"
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} meddelanden i din {{group_name}}-inkorg</p>"
       alt:
         mentioned: "Omnämnd av"
         quoted: "Citerad av"
@@ -1149,9 +1110,6 @@ sv:
       select_all: "Markera alla"
       clear_all: "Rensa allt"
       too_short: "Din sökterm är för kort."
-      result_count:
-        one: "1 resultat för <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} resultat för <span class='term'>\"{{term}}\"</span>"
       title: "sök efter ämnen, inlägg, användare, eller kategorier"
       no_results: "Inga resultat hittades."
       no_more_results: "Inga fler resultat hittades."
@@ -1166,26 +1124,18 @@ sv:
         title: Avancerad sökning
         posted_by:
           label: Postat av
-        in_category:
-          label: I kategorin
         in_group:
           label: I gruppen
         with_badge:
           label: Med märke
-        with_tags:
-          label: Med taggar
         filters:
-          label: Sänd bara tillbaka ämnen/inlägg som...
           likes: Jag gillade
           posted: Jag postade i
           watching: Jag tittar
           tracking: Jag bevakar
-          private: finns i mitt meddelande
-          bookmarks: Jag har bokmärkt
           first: är den första posten
           pinned: är pinnade
           unpinned: är inte pinnade
-          seen: Jag har läst
           unseen: Jag har inte läst
           wiki: är wiki
         statuses:
@@ -1247,7 +1197,7 @@ sv:
         search: "Inga sökresultat hittades."
         educate:
           new: '<p>Dina nya ämnen hamnar här.</p><p>Standard är att ämnen anses nya och kommer att visa en <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">ny</span> indikator om de skapades de senaste 2 dagarna.</p><p>Besök dina <a href="%{userPrefsUrl}">användarinställningar</a> för att ändra det.</p>'
-          unread: '<p>Dina olästa ämnen hamnar här.</p><p>Standard är att inlägg anses olästa och kommer att visa antal olästa inlägg <span class="badge new-posts badge-notification">1</span> om du:</p><ul><li>Skapade ämnet</li><li>Svarade på ämnet</li><li>Läste ämnet i mer än 4 minuter</li></ul><p>Eller om du explicit har markerat ämnet som Följd eller Bekvakad via notifieringspanelen längst ned i varje ämne.</p><p>Besök dina <a href="%{userPrefsUrl}">användarinställningar</a> för att ändra det.</p>'
+          unread: '<p>Dina olästa ämnen hamnar här.</p><p>Standard är att inlägg anses olästa och kommer att visa antal olästa inlägg <span class="badge new-posts badge-notification">1</span> om du:</p><ul><li>Skapade ämnet</li><li>Svarade på ämnet</li><li>Läste ämnet i mer än 4 minuter</li></ul><p>Eller om du explicit har markerat ämnet som Följd eller Bevakad via notifieringspanelen längst ned i varje ämne.</p><p>Besök dina <a href="%{userPrefsUrl}">användarinställningar</a> för att ändra det.</p>'
       bottom:
         latest: "Det finns inga fler senaste ämnen."
         hot: "Det finns inga fler heta ämnen."
@@ -1533,7 +1483,6 @@ sv:
       multi_select:
         select: 'markera'
         selected: 'markerade ({{count}})'
-        select_replies: 'välj +svar'
         delete: radera markerade
         cancel: avbryt markering
         select_all: markera alla
@@ -1545,7 +1494,6 @@ sv:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Citat"
-      edit: "Redigerar {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Anledning:"
       post_number: "inlägg {{number}}"
       wiki_last_edited_on: "Senast gången som wiki redigerades"
@@ -1554,7 +1502,7 @@ sv:
       reply_as_new_private_message: "Svara som nytt meddelande till samma mottagare"
       continue_discussion: "Fortsätter diskussionen från {{postLink}}:"
       follow_quote: "gå till det citerade inlägget"
-      show_full: "Via hela inlägget"
+      show_full: "Visa hela inlägget"
       show_hidden: 'Visa dolt innehåll.'
       deleted_by_author:
         one: "(inlägg tillbakadraget av skaparen, kommer att raderas automatiskt om 1 timme om det inte flaggas)"
@@ -1612,12 +1560,6 @@ sv:
         undelete: "återställ detta inlägg"
         share: "dela en länk till detta inlägg"
         more: "Mer"
-        delete_replies:
-          confirm:
-            one: "Vill du radera det direkta svaret till det här inlägget också?"
-            other: "Vill du radera de {{count}} direkta svaren på det här inlägget också?"
-          yes_value: "Ja, radera även svaren"
-          no_value: "Nej, bara det här inlägget"
         admin: "administratörsåtgärder för inlägg"
         wiki: "Skapa wiki"
         unwiki: "Ta bort wiki"
@@ -1628,9 +1570,6 @@ sv:
         change_owner: "Ändra ägare"
       actions:
         flag: 'Flagga'
-        defer_flags:
-          one: "Skjut upp"
-          other: "Skjut upp"
         undo:
           off_topic: "Ångra flaggning"
           spam: "Ångra flaggning"
@@ -1706,14 +1645,6 @@ sv:
           vote:
             one: "1 person röstade för detta inlägg"
             other: "{{count}} personer röstade för detta inlägg"
-      delete:
-        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 +1687,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"
@@ -2052,7 +1981,6 @@ sv:
         hamburger_menu: '<b>=</b> Öppna hamburgarmenyn'
         user_profile_menu: '<b>p</b> Öppna användarmeny'
         show_incoming_updated_topics: '<b>.</b> Visa uppdaterade ämnen'
-        search: '<b>/</b> Sök'
         help: '<b>?</b> Öppna tangentbordshjälp'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Avfärda nya/inlägg'
         dismiss_topics: '<b>x</b>, <b>t</b> Avfärda ämnen'
@@ -2121,9 +2049,7 @@ sv:
       selector_no_tags: "inga taggar"
       changed: "taggar ändrade:"
       tags: "Taggar"
-      choose_for_topic: "välj valfria taggar för det här ämnet"
       delete_tag: "Radera tag"
-      delete_confirm: "Är du säker på att du vill ta bort den taggen?"
       rename_tag: "Döp om taggen"
       rename_instructions: "Välj ett nytt namn för taggen:"
       sort_by: "Sortera efter:"
@@ -2218,7 +2144,6 @@ sv:
         no_problems: "Inga problem upptäcktes."
         moderators: 'Moderatorer:'
         admins: 'Administratörer:'
-        blocked: 'Blockerad:'
         suspended: 'Avstängd:'
         private_messages_short: "Meddelanden"
         private_messages_title: "Meddelanden"
@@ -2251,24 +2176,12 @@ sv:
         by: "av"
       flags:
         title: "Flaggningar"
-        old: "Gamla"
-        active: "Aktiva"
         agree: "Godkänn"
         agree_title: "Bekräfta att den här flaggan är giltig och korrekt"
-        agree_flag_modal_title: "Bekräfta och..."
-        agree_flag_hide_post: "Godkänn (dölj inlägg + skicka PM)"
-        agree_flag_hide_post_title: "Dölj detta inlägg och sänd användaren ett meddelande automatiskt som uppmanar att redigera det"
-        agree_flag_restore_post: "Godkänn (återställ inlägg)"
-        agree_flag_restore_post_title: "Återställ detta inlägg"
-        agree_flag: "Godkänn flaggning"
-        agree_flag_title: "Godkänn flaggning och behåll inlägget oförändrat"
-        defer_flag: "Skjut upp"
         defer_flag_title: "Ta bort den här flaggan; den kräver ingen åtgärd för tillfället."
         delete: "Ta bort"
         delete_title: "Ta bort inlägget som den här flaggan refererar till."
-        delete_post_defer_flag: "Ta bort inlägg och skjut upp flagga"
         delete_post_defer_flag_title: "Ta bort inlägg; om det är det första inlägget, ta bort ämnet"
-        delete_post_agree_flag: "Ta bort inlägg och godkänn flaggning."
         delete_post_agree_flag_title: "Ta bort inlägg; om det är det första inlägget, ta bort ämnet"
         delete_flag_modal_title: "Ta bort och..."
         delete_spammer: "Radera spammare"
@@ -2283,34 +2196,16 @@ sv:
         dispositions:
           agreed: "godkände"
           disagreed: "godkände ej"
-          deferred: "sköt upp"
         flagged_by: "Flaggad av"
         resolved_by: "Löst av"
         took_action: "Agerade"
         system: "System"
         error: "Någonting gick snett"
         reply_message: "Svara"
-        no_results: "Det finns inga flaggor."
         topic_flagged: "Detta <strong>ämne</strong> har blivit flaggad."
         visit_topic: "Besök ämnet för att vidta åtgärder"
         was_edited: "Inlägget redigerades efter den första flaggningen"
         previous_flags_count: "Det här inlägget har redan flaggats {{count}} gånger."
-        summary:
-          action_type_3:
-            one: "orelevant"
-            other: "orelevant x{{count}}"
-          action_type_4:
-            one: "olämpligt"
-            other: "olämpligt x{{count}}"
-          action_type_6:
-            one: "custom"
-            other: "custom x{{count}}"
-          action_type_7:
-            one: "anpassad"
-            other: "anpassad x{{count}}"
-          action_type_8:
-            one: "spam"
-            other: "spam x{{count}}"
       groups:
         primary: "Primär grupp"
         no_primary: "(ingen primär grupp)"
@@ -2395,7 +2290,6 @@ sv:
           details: "När det finns ett nytt svar, redigerat, borttaget eller återskapat."
         user_event:
           name: "Användarevent"
-          details: "När en användare är skapad, godkänd eller uppdaterad."
         delivery_status:
           title: "Leveransstatus"
           inactive: "Inaktiv"
@@ -2680,8 +2574,6 @@ sv:
             change_category_settings: "ändra kategori-inställningarna"
             delete_category: "radera kategori"
             create_category: "skapa kategori"
-            block_user: "blockera användare"
-            unblock_user: "häv blockering av användare"
             grant_admin: "bevlija administratör"
             revoke_admin: "återkalla administratör"
             grant_moderation: "bevilja moderering"
@@ -2748,7 +2640,6 @@ sv:
           pending: "Avvaktar"
           staff: 'Medarbetare'
           suspended: 'Avstängd'
-          blocked: 'Blockerad'
           suspect: 'Misstänkt'
         approved: "Godkänd?"
         approved_selected:
@@ -2769,7 +2660,6 @@ sv:
           staff: "Medarbetare"
           admins: 'Admin-användare'
           moderators: 'Moderatorer'
-          blocked: 'Blockerade användare'
           suspended: 'Avstängda användare'
           suspect: 'Misstänkta användare'
         reject_successful:
@@ -2786,18 +2676,14 @@ sv:
         suspend_failed: "Någonting gick fel under avstängningen av denna användare {{error}}"
         unsuspend_failed: "Någonting gick fel under upplåsningen av denna användare {{error}}"
         suspend_duration: "Hur länge ska användaren vara avstängd?"
-        suspend_duration_units: "(dagar)"
         suspend_reason_label: "Varför stänger du av användaren? Denna text <b>kommer att vara synlig för alla</b> på användarens profilsida, och kommer att visas för användaren när han/hon försöker logga in. Håll den kort."
         suspend_reason: "Anledning"
         suspended_by: "Avstängd av"
         delete_all_posts: "Radera alla inlägg"
         delete_all_posts_confirm_MF: "Du håller på att radera {POSTS, plural, one {1 inlägg} other {# inlägg}} och {TOPICS, plural, one {1 ämne} other {# ämnen}}. Är du säker?"
-        suspend: "Stäng av användare"
-        unsuspend: "Lås upp användare"
-        suspended: "Avstängd?"
         moderator: "Moderator?"
         admin: "Administratör?"
-        blocked: "Blockerad?"
+        suspended: "Avstängd?"
         staged: "Arrangerad?"
         show_admin_profile: "Administratör"
         refresh_browsers: "Tvinga webbläsaruppdatering"
@@ -2813,8 +2699,8 @@ sv:
         grant_admin_confirm: "Vi har skickat ett mail till dig för att bekräfta den nya administratören. Vänligen öppna det och följ instruktionerna."
         revoke_moderation: 'Återkalla Moderering'
         grant_moderation: 'Bevilja Moderering'
-        unblock: 'Avblockera'
-        block: 'Blockera'
+        unsuspend: 'Lås upp användare'
+        suspend: 'Stäng av användare'
         reputation: Rykte
         permissions: Rättigheter
         activity: Aktivitet
@@ -2861,17 +2747,12 @@ sv:
         activate_failed: "Ett problem uppstod då användaren skulle aktiveras."
         deactivate_account: "Inaktivera Konto"
         deactivate_failed: "Det uppstod ett problem vid inaktiveringen av användaren."
-        unblock_failed: 'Ett problem uppstod vid avblockeringen av användaren.'
-        block_failed: 'Ett problem uppstod vid blockering av användaren.'
-        block_confirm: 'Är du säker på att du vill blockera den här användaren? Användaren kommer inte att kunna skapa några nya ämnen eller inlägg.'
-        block_accept: 'Ja, blockera den här användaren'
         bounce_score: "Antal studs"
         reset_bounce_score:
           label: "Återställ"
           title: "Återställ studsantalet till 0"
         deactivate_explanation: "En avaktiverad användare måste bekräfta sin e-postadress igen."
         suspended_explanation: "En avstängd användare kan inte logga in."
-        block_explanation: "En blockerad användare kan inte skriva inlägg eller starta ämnen."
         staged_explanation: "En arrangerad användare kan endast skriva inlägg via e-post i specifika ämnen."
         bounce_score_explanation:
           none: "Inga studsar har mottagits nyligen från den e-posten."
@@ -3123,9 +3004,6 @@ sv:
       upload: "Ladda upp"
       uploading: "Laddar upp..."
       quit: "Kanske senare"
-      staff_count:
-        one: "Ditt forum har 1 personalmedlem."
-        other: "Ditt forum har %{count} personalmedlemmar."
       invites:
         add_user: "lägg till"
         none_added: "Du har inte bjudit in någon personal. Är du säker på att du vill fortsätta?"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index cc90ff4344..befa20c434 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -209,10 +209,6 @@ te:
     directory:
       title: "వాడుకరులు"
     groups:
-      visible: "గుంపు అందరు సభ్యులకు కనిపిస్తుంది"
-      title:
-        one: "గుంపు"
-        other: "గుంపులు"
       members: "సభ్యులు"
       posts: "టపాలు"
       alias_levels:
@@ -314,7 +310,6 @@ te:
       change_username:
         title: "సభ్యనామం మార్చు"
         taken: "క్షమించాలి, ఆ సభ్యనామం వేరొకరు తీసుకున్నారు."
-        error: "మీ సభ్యనామం మార్చడంలో దోషం."
         invalid: "ఆ సభ్యనామం చెల్లనిది. కేవలం సంఖ్యలు, అక్షరాలు మాత్రమే కలిగి ఉండాలి. "
       change_email:
         title: "ఈమెయిల్ మార్చు"
@@ -461,7 +456,6 @@ te:
     first_post: తొలి టపా
     mute: నిశ్శబ్దం
     unmute: వినిశ్శబ్దం
-    last_post: చివరి టపా
     summary:
       enabled_description: "మీరు ఈ విషయపు సారాంశము చదువుతున్నారు. ఆసక్తికర టపాలు కమ్యునిటీ ఎంచుకుంటుంది. "
       enable: 'ఈ విషయాన్ని సంగ్రహించు'
@@ -578,25 +572,12 @@ te:
       olist_title: "సంఖ్యా జాబితా"
       ulist_title: "చుక్కల జాబితా"
       list_item: "జాబితా అంశం"
-      heading_title: "తలకట్టు"
-      heading_text: "తలకట్టు"
-      hr_title: "అడ్డు గీత"
       help: "మార్క్ డైన్ సవరణ సహాయం"
-      toggler: "దాచు లేదా చూపు కంపోజరు ఫలకం"
       admin_options_title: "ఈ విషయానికి ఐచ్చిక సిబ్బంది అమరికలు"
     notifications:
       none: "ఈ సమయంలో ప్రకటనలు చూపలేకున్నాము."
       more: "పాత ప్రకటనలు చూడు"
       total_flagged: "మొత్తం కేతనించిన టపాలు"
-      quoted: "<i title='కోట్ చేసారు' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      replied: "<i title='జవాబిచ్చారు' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      edited: "<i title=' సవరించారు' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
-      liked: "<i title='ఇష్టపడ్డారు' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
-      private_message: "<i title='ప్రైవేటు సందేశం' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_private_message: "<i title='ప్రైవేటు సందేశం' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invitee_accepted: "<i title='మీ ఆహ్వానాన్ని మన్నించారు' class='fa fa-user'></i><p><span>{{username}}</span> accepted your invitation</p>"
-      moved_post: "<i title='టపా జరిపారు' class='fa fa-sign-out'></i><p><span>{{username}}</span> moved {{description}}</p>"
-      granted_badge: "<i title='బ్యాడ్జ్ ప్రసాదించారు' class='fa fa-certificate'></i><p>Earned '{{description}}'</p>"
     upload_selector:
       title: "ఒక బొమ్మ కలుపు"
       title_with_attachments: "ఒక బొమ్మ లేదా దస్త్రం కలుపు"
@@ -794,7 +775,6 @@ te:
       multi_select:
         select: 'ఎంచుకో'
         selected: 'ఎంచుకున్నవి  ({{count}})'
-        select_replies: 'ఎంచుకున్నవి +జవాబులు'
         delete: ఎంచుకున్నవి తొలగించు
         cancel: ఎంపిక రద్దు
         select_all: అన్నీ ఎంచుకో
@@ -843,12 +823,6 @@ te:
         undelete: "ఈ టపాను పునస్తాపించు"
         share: "ఈ టపా లంకెను పంచు"
         more: "మరింత"
-        delete_replies:
-          confirm:
-            one: "ఈ టపా యొక్క నేరు జవాబు కూడా తొలగించాలనుకుంటున్నారా?"
-            other: "ఈ టపా యొక్క {{count}} నేరు జవాబులు కూడా తొలగించాలనుకుంటున్నారా?"
-          yes_value: "అవును, జవాబులు కూడా తొలగించు."
-          no_value: "లేదు, కేవలం ఈ టపానే"
         admin: "టపా అధికారి చర్యలు"
         wiki: "వికీ చేయి"
         unwiki: "వికీ తొలగించు"
@@ -858,9 +832,6 @@ te:
         unhide: "చూపు"
       actions:
         flag: 'కేతనం'
-        defer_flags:
-          one: "కేతనం వాయిదావేయి"
-          other: "కేతనాలు వాయిదావేయి"
         undo:
           off_topic: "కేతనం రద్దు"
           spam: "కేతనం రద్దు"
@@ -920,10 +891,6 @@ te:
           vote:
             one: "ఒకరు దీనికి ఓటు వేశారు"
             other: "{{count}} గురు దీనికి ఓటు వేసారు"
-      delete:
-        confirm:
-          one: "మీరు నిజ్జంగా ఈ టపాను తొలగించాలనుకుంటున్నారా?"
-          other: "మీరు నిజ్జంగానే ఈ టపాలన్నీ తొలగించాలనుకుంటున్నారా?"
       revisions:
         controls:
           first: "తొలి దిద్దుబాటు"
@@ -1113,7 +1080,6 @@ te:
         no_problems: "ఎటువంటి సమస్యలూ కనిపించలేదు"
         moderators: 'నిర్వాహకులు:'
         admins: 'అధికారులు:'
-        blocked: 'నిలిపిన:'
         suspended: 'సస్పెండయిన:'
         space_free: "{{size}} ఖాలీ"
         uploads: "ఎగుమతులు"
@@ -1139,23 +1105,12 @@ te:
         by: "నుండి"
       flags:
         title: "కేతనాలు"
-        old: "పాత"
-        active: "చేతన"
         agree: "ఒప్పుకోండి"
         agree_title: "ఈ కేతనం సరైనదిగా చెప్పండి"
-        agree_flag_modal_title: "ఒప్పుకొను మరియు"
-        agree_flag_hide_post: "ఒప్పుకొని (టపా దాచు మరియు ప్రైవేటు సందేశం పంపు)"
-        agree_flag_restore_post: "ఒప్పుకొను (టపా పునస్తాపించు)"
-        agree_flag_restore_post_title: "ఈ టపా పునస్తాపించు"
-        agree_flag: "కేతనంతో ఒప్పుకో"
-        agree_flag_title: "కేతనంతో ఒప్పుకో మరియు టపాను మార్చకుండా ఉంచు"
-        defer_flag: "వాయిదావేయి"
         defer_flag_title: "ఈ కేతనం తొలగించు; ఇప్పుడు ఎటువంటి చర్య అవసరంలేదు."
         delete: "తొలగించు"
         delete_title: "ఈ కేతనం వర్తించే టపా తొలగించు"
-        delete_post_defer_flag: "టపా తొలగించు మరియు కేతనం వాయిదా వేయి"
         delete_post_defer_flag_title: "టపా తొలగించు; ఇదే తొలి టపా అయితే ఈ విషయాన్ని తొలగించు"
-        delete_post_agree_flag: "టపా తొలగించు మరియు కేతనంతో అంగీకరించు"
         delete_post_agree_flag_title: "టపా తొలగించు; తొలగి టపా అయితే, విషయాన్ని కూడా తొలగించు"
         delete_flag_modal_title: "తొలగించు మరియు..."
         delete_spammer: "స్పామరును తొలగించు"
@@ -1170,34 +1125,16 @@ te:
         dispositions:
           agreed: "ఒప్పుకున్నారు"
           disagreed: "ఒప్పుకోలేదు"
-          deferred: "వాయిదా వేసారు"
         flagged_by: "కేతనించినవారు"
         resolved_by: "సరిచేసినవారు"
         took_action: "చర్య తీసుకున్నారు"
         system: "వ్యవస్థ"
         error: "ఏదే తేడా జరిగింది"
         reply_message: "జవాబు"
-        no_results: "ఎట్టి కేతనాలూ లేవు"
         topic_flagged: "ఈ <strong>విషయం</strong> కేతనించబడింది."
         visit_topic: "చర్య తీసుకోడానికి విషయం దర్శించు"
         was_edited: "తొలి కేతనం తర్వాత టపా సవరించబడింది"
         previous_flags_count: "ఈ టపా ఇప్పటికే {{count}}  కేతనించబడింది."
-        summary:
-          action_type_3:
-            one: "విషయాంతరం"
-            other: "విషయాంతరం x{{count}}"
-          action_type_4:
-            one: "అసమంజసం "
-            other: "అసమంజసం x{{count}}"
-          action_type_6:
-            one: "అనురూపం"
-            other: "అనురూప x{{count}}"
-          action_type_7:
-            one: "అనురూపం"
-            other: "అనురూపం x{{count}}"
-          action_type_8:
-            one: "స్పాము"
-            other: "స్పామ్ x{{count}}"
       groups:
         primary: "ప్రాథమిక గుంపు"
         no_primary: "(ప్రాథమిక గుంపు లేదు)"
@@ -1458,7 +1395,6 @@ te:
           pending: "పెండింగు"
           staff: 'సిబ్బంది'
           suspended: 'సస్పెడయ్యాడు'
-          blocked: 'నిలిపాడు'
           suspect: 'అనుమానించు'
         approved: "అంగీకరించు"
         approved_selected:
@@ -1476,12 +1412,11 @@ te:
           staff: "సిబ్బంది"
           admins: 'అధికారి సభ్యులు'
           moderators: 'నిర్వాహకులు'
-          blocked: 'నిలిపిన సభ్యులు'
           suspended: 'సస్పెండయిన సభ్యులు'
           suspect: 'అనుమానిత సభ్యులు'
         reject_successful:
           one: "వినియోగదారులు విజయవంతంగా "
-          other: "వినియోగదారులు విజయవంతంగా %{సంఖ్య} తిరస్కరింపబడ్డారు.."
+          other: "వినియోగదారులు విజయవంతంగా %{count} తిరస్కరింపబడ్డారు.."
         reject_failures:
           one: "వినియోగదారులు 1 ని తిరస్కరించుటలో వైఫల్యం."
         not_verified: "ద్రువీకరించలేదు"
@@ -1490,19 +1425,15 @@ te:
           text: "చూపు"
       user:
         suspend_failed: "ఈ సభ్యుడిని సస్పెండ్ చేసేప్పుడు ఏదో తేడా జరిగింది.  {{error}}"
-        unsuspend_failed: "ఈ వినియోగదారు వలన ఏదో తొలగింపబడని తప్పు జరిగింది {{దోషం}}"
+        unsuspend_failed: "ఈ వినియోగదారు వలన ఏదో తొలగింపబడని తప్పు జరిగింది {{error}}"
         suspend_duration: "వినియోగదారు ఎంతకాలం నిలిపివేయబడ్డాడు?"
-        suspend_duration_units: "(రోజులు)"
         suspend_reason_label: "మీరు ఎందుకు తొలగించబడ్డారు? ఈ పాఠ్యం <b> వినియోగదారును ప్రొఫైల్ పుట మీద ప్రతివారికి </b> కనబడుతుంది, మరియు వినియోగదారుడు లాగిన్‌కు ప్రయత్నించినపుడు చూస్తారు.చిన్నదిగా ఉంచండి."
         suspend_reason: "కారణం"
         suspended_by: "సస్పెండు చేసినవారు"
         delete_all_posts: "అన్ని టపాలూ తొలగించు"
-        suspend: "సస్పెండు"
-        unsuspend: "సస్పెండు తొలగించు"
-        suspended: "సస్పెండయ్యాడా? "
         moderator: "నిర్వాహకుడు?"
         admin: "అధికారి?"
-        blocked: "నిలిపిన?"
+        suspended: "సస్పెండయ్యాడా? "
         show_admin_profile: "అధికారి"
         refresh_browsers: "బ్రౌజరు తాజాకరణ బలవంతంచేయి"
         refresh_browsers_message: "అన్ని క్లైంటులకు సందేశం పంపబడింది!"
@@ -1515,8 +1446,8 @@ te:
         grant_admin: 'నిర్వాహకులు సమ్మతించారు'
         revoke_moderation: 'సమన్వయం నిలిపివేశారు'
         grant_moderation: 'సమన్వయం అనుమతించారు'
-        unblock: 'అడ్డగింపలేదు'
-        block: 'నిలుపు'
+        unsuspend: 'సస్పెండు తొలగించు'
+        suspend: 'సస్పెండు'
         reputation: ప్రసిధ్ధ
         permissions: అనుమతులు
         activity: కలాపం
@@ -1550,11 +1481,8 @@ te:
         activate_failed: "సభ్యుడిని చేతనం చేయుటలో దోషం"
         deactivate_account: "ఖాతా అక్రియాశీలం చేయి"
         deactivate_failed: "వినియోగదారుని నిర్వీర్యం చేసే ఒక సమస్య ఉంది."
-        unblock_failed: 'వినియోగదారుని అనుమతించడంలో ఒక సమస్య ఉంది.'
-        block_failed: 'వినియోగదారుని ఒక సమస్య నిరోధిస్తుంది.'
         deactivate_explanation: "క్రియారహిత వినియోగదారు తప్పనిసరిగా వారి ఈ-మెయిల్ ను సరిదిద్దాలి."
         suspended_explanation: "నిలిపివేయబడ్డ వినియోగదారు లాగిన్ కాలేరు."
-        block_explanation: "అడ్డగింపబడ్డ వినియోగదారు టపాలు చేయలేరు లేదా విషయాలు మొదలుపెట్టలేరు."
         trust_level_change_failed: "వినియోగదారు నమ్మకపు స్థాయి మార్చడానికి సమస్య ఉంది."
         suspend_modal_title: "సభ్యుడిని సస్పెండు చేయి"
         trust_level_2_users: "నమ్మకం స్థాయి 2 సభ్యులు"
@@ -1678,7 +1606,7 @@ te:
         grant_badge: బ్యాడ్జి ఇవ్వు
         granted_badges: ఇచ్చిన బ్యాడ్జీలు
         grant: ఇవ్వు
-        no_user_badges: "%{పేరు} ఏ చిహ్నాలు మంజూరు చేయలేదు."
+        no_user_badges: "%{name} ఏ చిహ్నాలు మంజూరు చేయలేదు."
         no_badges: మంజూరు చేసే చిహ్నాలు లేవు.
         none_selected: "ఆరంభించడానికి ఒక బ్యాడ్జీని ఎంచుకోండి."
         allow_title: చిహ్నాన్ని శీర్షికగా వాడుకోవడానికి అనుమతి ఇవ్వండి.
@@ -1704,11 +1632,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.th.yml b/config/locales/client.th.yml
new file mode 100644
index 0000000000..694907eaff
--- /dev/null
+++ b/config/locales/client.th.yml
@@ -0,0 +1,1678 @@
+# 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/
+
+th:
+  js:
+    number:
+      format:
+        separator: "."
+        delimiter: ","
+      human:
+        storage_units:
+          format: '%n %u'
+          units:
+            byte:
+              other: ไบต์
+            gb: GB
+            kb: KB
+            mb: MB
+            tb: TB
+      short:
+        thousands: "{{number}}พัน"
+        millions: "{{number}}ล้าน"
+    dates:
+      time: "h:mm a"
+      timeline_date: "MMM YYYY"
+      long_no_year: "MMM D h:mm a"
+      long_no_year_no_time: "MMM D"
+      full_no_year_no_time: "MMMM Do"
+      long_with_year: "MMM D, YYYY h:mm a"
+      long_with_year_no_time: "MMM D, YYYY"
+      full_with_year_no_time: "MMMM Do, YYYY"
+      long_date_with_year: "MMM D, 'YY LT"
+      long_date_without_year: "MMM D, LT"
+      long_date_with_year_without_time: "MMM D, 'YY"
+      long_date_without_year_with_linebreak: "MMM D <br/>LT"
+      long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
+      wrap_ago: "%{date} วันก่อน"
+      tiny:
+        half_a_minute: "< 1 นาที"
+        less_than_x_seconds:
+          other: "< %{count} วินาที"
+        x_seconds:
+          other: "%{count} วินาที"
+        x_minutes:
+          other: "%{count} นาที"
+        about_x_hours:
+          other: "%{count} ชั่วโมง"
+        x_days:
+          other: "%{count} วัน"
+        about_x_years:
+          other: "%{count} ปี"
+        over_x_years:
+          other: "> %{count} ปี"
+        almost_x_years:
+          other: "%{count} ปี"
+        date_month: "MMM D"
+        date_year: "MMM 'YY"
+      medium:
+        x_minutes:
+          other: "%{count} นาที"
+        x_hours:
+          other: "%{count} ชั่วโมง"
+        x_days:
+          other: "%{count} วัน"
+        date_year: "MMM D, 'YY"
+      medium_with_ago:
+        x_minutes:
+          other: "%{count} นาทีที่แล้ว"
+        x_hours:
+          other: "%{count} ชั่วโมงที่แล้ว"
+        x_days:
+          other: "%{count} วันที่แล้ว"
+      later:
+        x_days:
+          other: "%{count} วันหลังจากนั้น"
+        x_months:
+          other: "%{count} เดือนหลังจากนั้น"
+        x_years:
+          other: "%{count} ปีหลังจากนั้น"
+      previous_month: 'เดือนที่แล้ว'
+      next_month: 'เดือนถัดไป'
+    share:
+      topic: 'แบ่งปันลิงก์ไปยังกระทู้นี้'
+      post: 'โพส #%{postNumber}'
+      close: 'ปิด'
+      twitter: 'แบ่งปันลิงก์นี้บน Twitter'
+      facebook: 'แบ่งปันลิงก์นี้บน Facebook'
+      google+: 'แบ่งปันลิงก์บน Google+'
+      email: 'ส่งลิงก์นี้ทางอีเมล'
+    action_codes:
+      public_topic: "ทำให้กระทู้นี้เป็นสาธารณะ %{when} "
+      private_topic: "ทำให้กระทู้นี้ส่วนตัว %{when} "
+      split_topic: "แบ่งกระทู้นี้เมื่อ %{when}"
+      invited_user: "ได้เชิญ %{who} %{when}"
+      invited_group: "ได้เชิญ %{who} %{when}"
+      removed_user: "ลบ %{who} %{when}"
+      removed_group: "ลบ %{who} %{when}"
+      autoclosed:
+        enabled: 'ปิดเมื่อ %{when}'
+        disabled: 'เปิดเมื่อ %{when}'
+      closed:
+        enabled: 'ปิดเมื่อ %{when}'
+        disabled: 'เปิดเมื่อ %{when}'
+      archived:
+        enabled: 'ถูกเก็บเข้าคลังเมื่อ %{when}'
+        disabled: 'ถูกเอกออกจากคลังเมื่อ %{when}'
+      pinned:
+        enabled: 'ถูกปักหมุดเมื่อ %{when}'
+        disabled: 'ถึงปลดหมุดเมื่อ %{when}'
+      pinned_globally:
+        enabled: 'ถูกปักหมุดแบบรวมเมื่อ %{when}'
+        disabled: 'ถูกปลดหมุดเมื่อ %{when}'
+      visible:
+        enabled: 'ถูกแสดงเมื่อ %{when}'
+        disabled: 'ถูกซ่อนเมื่อ %{when}'
+    topic_admin_menu: "จัดการกระทู้ "
+    emails_are_disabled: "อีเมลขาออกทั้งหมดจะถูกปิดโดยผู้ดูแลระบบ ไม่มีอีเมลแจ้งเตือนใดๆจะถูกส่งออกไป"
+    bootstrap_mode_enabled: "ตอนนี้คุณอยู่ในการใช้งานแบบ Bootstrap เพื่อให้การเปิดเว็บไซต์ใหม่ง่ายขึ้น ผู้ใช้งานใหม่ทุกคนจะได้ระบบความเชื่อถือที่ 1 และจะได้รับอีเมลสรุปทุกวัน แล้วจะเลิกส่งต่อเมื่อจำนวนผู้ใช้งานทั้งหมดเกิน %{min_users} คน"
+    bootstrap_mode_disabled: "การใช้งานแบบ Bootstrap ในอีก 24 ชั่วโมง"
+    s3:
+      regions:
+        ap_northeast_1: "เอเชียแปซิฟิก (โตเกียว)"
+        ap_northeast_2: "เอเชียแปซิฟิก (โซล)"
+        ap_southeast_1: "เอเชียแปซิฟิก (สิงคโปร)"
+        ap_southeast_2: "เอเชียแปซิฟิก (ซิสนี่)"
+        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: "ไม่ใช่"
+    yes_value: "ใช่"
+    generic_error: "เสียใจด้วย, มีความผิดพลาดขึ้น"
+    generic_error_with_reason: "มีข้อผิดพลาดเกิดขึ้น: %{error}"
+    sign_up: "สมัครสมาชิก"
+    log_in: "เข้าสู่ระบบ"
+    age: "อายุ"
+    joined: "เข้าร่วม"
+    admin_title: "ผู้ดูแลระบบ"
+    flags_title: "ธง"
+    show_more: "แสดงเพิ่มเติม"
+    show_help: "ตัวเลือก"
+    links: "ลิงก์"
+    links_lowercase:
+      other: "ลิงค์"
+    faq: "ถามตอบ"
+    guidelines: "คู่มือ"
+    privacy_policy: "นโยบายความเป็นส่วนตัว"
+    privacy: "ความเป็นส่วนตัว"
+    terms_of_service: "เงื่อนไขการบริการ"
+    mobile_view: "เปิดหน้าสำหรับอุปกรณ์เคลื่อนที่"
+    desktop_view: "เปิดหน้าสำหรับเดสท๊อป"
+    you: "คุณ"
+    or: "หรือ"
+    now: "เมื่อสักครู่นี้"
+    read_more: 'อ่านเพิ่มเติม'
+    more: "เพิ่มเติม"
+    less: "น้อย"
+    never: "ไม่เคย"
+    every_30_minutes: "ทุก 30 นาที"
+    every_hour: "ทุกชั่วโมง"
+    daily: "ทุกวัน"
+    weekly: "รายสัปดาห์"
+    every_two_weeks: "ทุกสองอาทิตย์"
+    every_three_days: "ทุกสามวัน"
+    max_of_count: "สูงสุดของ  {{count}}"
+    alternation: "หรือ"
+    character_count:
+      other: "{{count}} ตัวอักษร"
+    suggested_topics:
+      title: "กระทู้แนะนำ"
+      pm_title: "ข้อความที่แนะนำ"
+    about:
+      simple_title: "เกี่ยวกับ"
+      title: "เกี่ยวกับ %{title}"
+      stats: "สถิติเว็บไซต์"
+      our_admins: "แอดมินของพวกเรา"
+      our_moderators: "พิธีกรของพวกเรา"
+      stat:
+        all_time: "ทุกเวลา"
+        last_7_days: "7 วันที่แล้ว"
+        last_30_days: "30 วันที่แล้ว"
+      like_count: "ถูกใจ"
+      topic_count: "กระทู้"
+      post_count: "โพส"
+      active_user_count: "ผู้ใช้ที่ใช้งานอยู่"
+      contact: "ติดต่อเรา"
+      contact_info: "ในกรณีที่เกิดเหตุฉุกเฉินหรือเกิดความผิดพลาดร้ายแรงเกี่ยวกับเว็บไซต์นี้ โปรดติดต่อเราได้ที่ %{contact_info}"
+    bookmarked:
+      title: "บุ๊คมาร์ค"
+      clear_bookmarks: "ล้างบุ๊คมาร์ค"
+      help:
+        bookmark: "คลิกเพื่อ บุ๊คมาร์ค ที่โพสแรกของกระทู้นี้"
+        unbookmark: "คลิกเพื่อลบบุ๊คมาร์คทั้งหมดในกระทู้นี้"
+    bookmarks:
+      not_logged_in: "เสียใจด้วย, คุณต้องเข้าระบบก่อนถึงจะทำบุ๊คม๊าคโพสได้"
+      created: "คุณได้ทำบุ๊คม๊าคโพสแล้ว"
+      not_bookmarked: "คุณได้อ่านโพสนี้แล้ว; คลิกเพื่อทำบุ๊คม๊าค"
+      last_read: "นี่เป็นโพสสุดท้ายที่คุณอ่าน คลิกเพื่อทำบุ๊คม๊าค"
+      remove: "ลบบุ๊คม๊าค"
+      confirm_clear: "คุณแน่ใจไหม ที่จะลบบุ๊คมาร์กในกระทู้นี้ทั้งหมด"
+    topic_count_latest:
+      other: "{{count}} กระทู้ใหม่หรือกระทู้อัพเดต"
+    topic_count_unread:
+      other: "{{count}} กระทู้ยังไม่อ่าน"
+    topic_count_new:
+      other: "{{count}} กระทู้ใหม่"
+    click_to_show: "กดเพื่อเปิด"
+    preview: "แสดงตัวอย่าง"
+    cancel: "ยกเลิก"
+    save: "บันทึกการเปลี่ยนแปลง"
+    saving: "กำลังบันทึก..."
+    saved: "บันทึกแล้ว!"
+    upload: "อัปโหลด"
+    uploading: "กำลังอัปโหลด..."
+    uploading_filename: "กำลังอัพโหลด {{filename}}..."
+    uploaded: "อัปโหลดเสร็จสมบูรณ์"
+    enable: "เปิดใช้งาน"
+    disable: "ปิดใช้งาน"
+    undo: "เลิกทำ"
+    revert: "ย้อนกลับ"
+    failed: "ล้มเหลว"
+    switch_to_anon: "เข้าสู่โหมดไม่ระบุชื่อ"
+    switch_from_anon: "ออกจากโหมดไม่ระบุชื่อ"
+    banner:
+      close: "ปิดแบนเนอร์นี้"
+      edit: "แก้ไขป้ายนี้ >>"
+    choose_topic:
+      none_found: "ไม่พบกระทู้ใดๆ"
+      title:
+        search: "ค้นหากระทู้โดยชื่อ url หรือ id"
+        placeholder: "ระบุชื่อกระทู้ที่นี่"
+    queue:
+      topic: "กระทู้:"
+      approve: 'อนุมัติ'
+      reject: 'ละทิ้ง'
+      delete_user: 'ลบผู้ใช้'
+      title: "ต้องการอนุมัติ"
+      none: "ไม่มีโพสให้คุณตรวจสอบ"
+      edit: "แก้ไข"
+      cancel: "ยกเลิก"
+      view_pending: "ดูโพสที่กำลังรออยู่"
+      has_pending_posts:
+        other: "กระทู้นี้มีโพสอีก <b>{{count}}</b> โพสที่รอบตรวจสอบอยู่"
+      confirm: "บันทึกการเปลี่ยนแปลง"
+      delete_prompt: "คุณแน่ใจหรือว่าจะลบ <b>%{username}</b>? นี่จะทำให้เราลบโพสและบล็อกอีเมลและไอพีของคนนี้"
+      approval:
+        title: "โพสต์นี้ต้องได้รับการอนุมัติ"
+        description: "เราได้รับโพสของคุณแล้วแต่จำเป็นต้องมีการอนุมัตโดยผู้ดูแลก่อนจึงจะปรากฎขึ้น กรุณารอสักครู่"
+        pending_posts:
+          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_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_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}}'>{{user}}</a>"
+      posted_by_you: "โพสโดย <a href='{{userUrl}}'>คุณ</a>"
+      sent_by_user: "ถูกส่งโดย <a href='{{userUrl}}'>{{user}}</a>"
+      sent_by_you: "ถูกส่งโดย <a href='{{userUrl}}'>คุณ</a>"
+    directory:
+      filter_name: "กรองด้วยชื่อผู้ใช้"
+      title: "ชื่อผู้ใช้"
+      likes_given: "ให้"
+      likes_received: "รับ"
+      topics_entered: "ดู"
+      topics_entered_long: "กระทู้ที่ดู"
+      time_read: "เวลาที่อ่าน"
+      topic_count: "กระทู้"
+      topic_count_long: "กระทู้สร้าง"
+      post_count: "ตอบ"
+      post_count_long: "ตอบกลับแล้ว"
+      no_results: "ไม่มีผลการค้นหา"
+      days_visited: "เยี่ยมชม"
+      days_visited_long: "วันที่ดู"
+      posts_read: "อ่าน"
+      posts_read_long: "อ่านโพส"
+      total_rows:
+        other: "%{count} ผู้ใช้"
+    group_histories:
+      actions:
+        add_user_to_group: "เพิ่มผู้ใช้"
+        remove_user_from_group: "ลบผู้ใช้"
+    groups:
+      logs:
+        acting_user: "ผู้ใช้ชั่วคราว"
+        target_user: "ผู้ใช้เป้าหมาย"
+        subject: "หัวข้อ"
+        details: "รายละเอียด"
+        from: "จาก"
+        to: "ถึง"
+      edit:
+        title: 'แก้ไขกลุ่ม'
+        full_name: 'ชื่อ-นามสกุล'
+        add_members: "เพิ่มสมาชิก"
+        delete_member_confirm: "ลบ '%{username}' ออกจาก '%{group}' กลุ่ม?"
+      add: "เพิ่ม"
+      join: "เข้าร่วมกลุ่ม"
+      leave: "ออกจากกลุ่ม"
+      request: "ส่งคำขอเข้าร่วมกลุ่ม"
+      automatic_group: กลุ่มอัตโนมัติ
+      closed_group: กลุ่มปิด
+      is_group_user: "คุณเป็นสมาชิกของกลุ่มนี้"
+      membership: "การเป็นสมาชิก"
+      name: "ชื่อ"
+      user_count: "จำนวนสมาชิก"
+      bio: "เกี่ยวกับกลุ่ม"
+      selector_placeholder: "เพิ่มสมาชิก"
+      owner: "เจ้าของ"
+      index:
+        title: "กลุ่ม"
+        empty: "ไม่มีกลุ่มที่เห็นได้"
+      activity: "กิจกรรม"
+      members: "สมาชิก"
+      topics: "กระทู้"
+      posts: "โพสต์"
+      mentions: "พูดถึง"
+      messages: "ข้อความ"
+      alias_levels:
+        nobody: "ไม่มี"
+        only_admins: "เฉพาะผู้ดูแลระบบ"
+        mods_and_admins: "ผู้ดูแลระบบและผู้ตรวจสอบ"
+        members_mods_and_admins: "สมาชิกกลุ่ม ผู้ดูแลกระทู้ และผู้ดูแลเว็บ"
+        everyone: "ทุกคน"
+      trust_levels:
+        title: "ระดับความไว้ใจจะถูกให้ไปยังผู้ใช้โดยอัตโนมัติเมื่อพวกเขาเพิ่ม:"
+        none: "ไม่มี"
+      notifications:
+        watching:
+          title: "กำลังดู"
+          description: "คุณจะถูกแจ้งเตือนทุกๆโพสใหม่ในทุกๆข้อความและจำนวนใหม่จะถูกนับอละแสดง"
+        watching_first_post:
+          title: "ดูโพสต์แรก"
+          description: "คุณได้รับการแจ้งเตือนเกี่ยวกับโพสต์ใหม่ในกระทู้ในกลุ่มนี้"
+        tracking:
+          title: "ติดตาม"
+          description: "คุณจะได้รับการแจ้งเตือนเมื่อใครก็ตามเอ่ยชื่อของคุณ @name หรือตอบคุณ และจำนวนของการตอบจะถูกแสดง"
+        regular:
+          title: "ปกติ"
+          description: "คุณจะได้รับการแจ้งเตือนเมื่อใครก็ตามเอ่ยชื่อของคุณ @name หรือตอบคุณ"
+        muted:
+          title: "ปิด"
+          description: "คุณจะไม่ได้รับการแจ้งเตือนเกี่ยวกับกระทู้ใหม่ๆในกลุ่มนี้"
+    user_action_groups:
+      '1': "ให้ถูกใจ"
+      '2': "ได้รับการถูกใจ"
+      '3': "บุ๊คมาร์ค"
+      '4': "กระทู้"
+      '5': "ตอบ"
+      '6': "ตอบสนอง"
+      '7': "พูดถึง"
+      '9': "อ้างอิง"
+      '11': "แก้ไข"
+      '12': "รายการที่ส่งแล้ว"
+      '13': "กล่องข้อความ"
+      '14': "อยู่ระหว่างการพิจารณา"
+    categories:
+      all: "ดูทุกหมวดหมู่"
+      all_subcategories: "ทั้งหมด"
+      no_subcategory: "ไม่มี"
+      category: "หมวดหมู่"
+      category_list: "แสดงหมวดหมู่ทั้งหมด"
+      reorder:
+        title: "เรียงหมวดหมู่ใหม่"
+        title_long: "จัดการรายชื่อหมวดหมู่"
+        fix_order: "ตรึงตำแหน่ง"
+        fix_order_tooltip: "ไม่ใช่หมวดหมู่ทุกอันจะมีเลขตำแหน่งของตัวเอง ซึ่งนั่นอาจส่งผลให้เกิดผลที่ไม่ได้คาดหวังไว้"
+        save: "บันทึกตำแหน่ง"
+        apply_all: "นำไปใช้"
+        position: "ตำแหน่ง"
+      posts: "โพสต์"
+      topics: "กระทู้"
+      latest: "ล่าสุด"
+      latest_by: "ล่าสุดโดย"
+      toggle_ordering: "เปลี่ยนวิธีการจัดลำดับ"
+      subcategories: "หมวดหมู่ย่อย"
+      topic_stat_sentence:
+        other: "%{count} กระทู้ใหม่ในเวลาที่ผ่านมา %{unit}."
+    ip_lookup:
+      title: มองหาที่อยู่ไอพี
+      hostname: ชื่อโฮสต์
+      location: สถานที่
+      location_not_found: (ไม่ทราบ)
+      organisation: องค์กร
+      phone: โทรศัพท์
+      other_accounts: "บัญชีอื่นที่ใช้ไอพีนี้"
+      delete_other_accounts: "ลบ %{count}"
+      username: "ผู้ใช้"
+      trust_level: "TL"
+      read_time: "เวลาที่อ่าน"
+      topics_entered: "กระทู้ที่เข้า"
+      post_count: "# โพส"
+      confirm_delete_other_accounts: "คุณแน่ใจแล้วหรือว่าจะลบบัญชีเหล่านี้จริงๆ?"
+    user_fields:
+      none: "(เลือกตัวเลือก)"
+    user:
+      said: "{{username}}:"
+      profile: "ข้อมูลส่วนตัว"
+      mute: "ปิด"
+      edit: "แก้ไขการตั้งค่า"
+      new_private_message: "สร้างข้อความส่วนตัวใหม่"
+      private_message: "ข้อความส่วนตัว"
+      private_messages: "ข้อความ"
+      activity_stream: "กิจกรรม"
+      preferences: "การตั้งค่า"
+      expand_profile: "ขยาย"
+      bookmarks: "บุ๊คมาร์ค"
+      bio: "เกี่ยวกับฉัน"
+      invited_by: "แนะนำโดย"
+      trust_level: "ระดับความถูกต้อง"
+      notifications: "การแจ้งเตือน"
+      statistics: "สถิติ"
+      desktop_notifications:
+        label: "การแจ้งเตือนบนเดสท๊อป"
+        not_supported: "การแจ้งเตือนยังไม่สนับสนุนบนบาวเซอร์นี้ ขอโทษด้วย"
+        perm_default: "เปิดการแจ้งเตือน"
+        perm_denied_btn: "ไม่มีสิทธิ์เข้าถึง"
+        perm_denied_expl: "คุณปฎิเสทเพื่อรับการแจ้งเตือน เปิดการแจ้งเตือนในบาวเซอร์ของคุณ"
+        disable: "ปิดการแจ้งเตือน"
+        enable: "เปิดการแจ้งเตือน"
+        each_browser_note: "โปรดทราบ: คุณต้องเปลี่ยนการตั้วค่านี้บนทุกบาวเซอร์ของคุณ"
+      dismiss_notifications: "ซ่อนทั้งหมด"
+      dismiss_notifications_tooltip: "ทำการแจ้งเตือนทั้งหมดที่ยังไม่อ่านเป็นอ่านแล้ว"
+      disable_jump_reply: "อย่าข้ามไปโพสของฉันหลังจากตอบ"
+      dynamic_favicon: "แสดงจำนวนกระทู้ใหม่/ที่มีการอัพเดตบนไอค่อนบาวเซอร์"
+      external_links_in_new_tab: "เปิดลิงก์ภายนอกทั้งหมดในแท็บใหม่"
+      enable_quoting: "เปิดการตอบกลับการอ้างอิงโดยไฮไลท์ข้อความ"
+      change: "เปลี่ยนแปลง"
+      moderator: "{{user}} เป็นผู้ตรวจสอบ"
+      admin: "{{user}} เป็นผู้ดูแลระบบ"
+      moderator_tooltip: "ผู้ใช้นี้เป็นผู้ตรวจสอบ"
+      admin_tooltip: "ผู้ใช้นี้เป็นผู้ดูแลระบบ"
+      suspended_notice: "ผู้ใช้นี้ถูกระงับตั้งแต่ {{date}}"
+      suspended_reason: "เหตุผล:"
+      github_profile: "Github"
+      email_activity_summary: "สรุปกิจกรรม"
+      mailing_list_mode:
+        label: "โหมดจดหมายข่าว"
+        enabled: "เปิดใช้งานโหมดจดหมายข่าว"
+        instructions: |
+          การตั้งค่านี้จะเปลี่ยนแปลงการสรุปกิจกรรม<br />
+          กระทู้และหมวดที่ปิดการแจ้งเตือนจะไม่มีในอีเมลเหล่านี้
+        individual: "ส่งอีเมลทุกครั้งที่โพสต์ใหม่"
+        many_per_day: "ส่งอีเมลหาฉันทุกๆโพสใหม่ (เกี่ยวกับ {{dailyEmailEstimate}} ต่อวัน)"
+        few_per_day: "ส่งอีเมลหาฉันทุกๆโพสใหม่ (เกี่ยวกับ 2 ต่อวัน)"
+      tag_settings: "แท็ก"
+      watched_tags: "ดูแล้ว"
+      tracked_tags: "ติดตาม"
+      watched_categories: "ดูแล้ว"
+      tracked_categories: "ติดตาม"
+      muted_categories: "ปิดเสียง"
+      muted_categories_instructions: "คุณจะไม่ได้รับการแจ้งเตือนใดๆเกี่ยวกับกระทู้ใหม่ในหมวดนี้ และจะไม่แสดงในเมนูยังไม่ได้อ่าน"
+      delete_account: "ลบบัญชีของคุณ"
+      delete_account_confirm: "คุณแน่ใจใหม่ที่จะลบบัญชีอย่างถาวร? การกระทำนี้ไม่สามารถยกเลิกได้"
+      deleted_yourself: "คุณลบบัญชีเสร็จเเรียบร้อยแล้ว"
+      delete_yourself_not_allowed: "คุณไม่สามารถลบบัญชีได้ในขณะนี้ กรุณาติดต่อผู้ดูแลระบบเพื่อลบบัญชีของคุณ"
+      unread_message_count: "ข้อความ"
+      admin_delete: "ลบ"
+      users: "ผู้ใช้"
+      muted_users: "ปิดการแจ้งเตือน"
+      muted_users_instructions: "ยกเลิกการแจ้งเตือนทุกอย่างกับบัญชีผู้ใช้นี้"
+      muted_topics_link: "แสดงกระทู้ที่ถูกปิดการแจ้งเตือน"
+      automatically_unpin_topics: "ยกเลิกกระทู้ปกหมุดอัตโนมัติเมื่อถึงท้ายของหน้า"
+      staff_counters:
+        flags_given: "ธงที่เป็นประโยชน์"
+        flagged_posts: "โพสปักธง"
+        deleted_posts: "ลบโพส"
+        suspensions: "ระงับการใช้งาน"
+        warnings_received: "คำเตือน"
+      messages:
+        all: "ทั้งหมด"
+        inbox: "กล่องจดหมายเข้า"
+        sent: "ส่ง"
+        archive: "คลัง"
+        groups: "กลุ่มของฉัน"
+        bulk_select: "เลือกข้อความ"
+        move_to_inbox: "ย้ายไปกล่องขาเข้า"
+        move_to_archive: "เก็บ"
+        failed_to_move: "เกิดความผิดพลาดในการย้ายหัวข้อที่เลือก (อาจเกิดจาดเครือข่ายของคุณล่ม)"
+        select_all: "เลือกทั้งหมด"
+      change_password:
+        success: "(อีเมลที่ส่งแล้ว)"
+        in_progress: "(กำลังส่งอีเมล)"
+        error: "(ผิดพลาด)"
+        action: "ส่งอีเมลรีเซ็ทรหัสผ่าน"
+        set_password: "ตั้งรหัสผ่าน"
+      change_about:
+        title: "เปลี่ยนข้อมูลเกี่ยวกับฉัน"
+        error: "เกิดความผิดพลาดในการแก้ไขค่านี้"
+      change_username:
+        title: "เปลี่ยน Username"
+        taken: "ขออภัย มีคนใช้ชื่อนี้แล้ว"
+        invalid: "ชื่อผู้ใช้ไม่ถูกต้อง จะต้องมีเพียงแค่ตัวอักษรและตัวเลขเท่านั้น"
+      change_email:
+        title: "เปลี่ยนอีเมล์"
+        taken: "อีเมล์ไม่ถูกต้อง"
+        error: "มีปัญหาในการเปลี่ยนอีเมล์ บางทีอีเมล์นี้อาจจะถูกใช้แล้ว?"
+        success: "เราส่งอีเมลไปยังที่อยู่อีเมลดังกล่าวแล้ว กรุณาทำตามขั้นตอนยืนยัน"
+      change_avatar:
+        title: "เปลี่ยนรูปโพรไฟล์"
+        gravatar: "ทำงานด้วย <a href='//gravatar.com/emails' target='_blank'>Gravatar</a>"
+        gravatar_title: "เปลี่ยนภาพแทนตัวของคุณบนเว็บไซต์ Gravatar"
+        refresh_gravatar_title: "เรียกของคุณ Gravatar ใหม่"
+        letter_based: "รูปโพรไฟล์ที่ระบบทำให้อัตโนมัติ"
+        uploaded_avatar: "รูปกำหนดเอง"
+        uploaded_avatar_empty: "เพิ่มรูปกำหนดเอง"
+        upload_title: "อัปโหลดรูปภาพของคุณ"
+        upload_picture: "อัปโหลดรูปภาพ"
+        image_is_not_a_square: "ระวัง: เราได้ตัวรูปภาพบางส่วนของคุณ; ความยาวและความสูงจะไม่เท่ากัน"
+        cache_notice: "คุณได้เปลี่ยนรูปภาพประจำตัวเรียบร้อยแล้วแต่อาจใช้เวลาในการเปลี่ยนแปลงบ้างเนื่องจากแคชของบาวเซอร์"
+      change_profile_background:
+        title: "พื้นหลังโปรไฟล์"
+        instructions: "พื้นหลังโปรไฟล์จะถูกจัดให้อยู่กึ่งกลางและมีค่าปริยายของความกว้างเท่ากับ 850 พิกเซล"
+      change_card_background:
+        title: "พื้นหลังผู้ใช้"
+        instructions: "รูปพื้นหลังจะถูกจัดกลางและมีความกว้างมาตราฐานที่ 590px"
+      email:
+        title: "อีเมล"
+        ok: "เราจะส่งอีเมลไปหาคุณเพื่อยืนยันอีกครั้ง"
+        invalid: "กรุณาใส่อีเมลที่ถูกต้อง"
+        authenticated: "อีเมลของคุณได้รับการยืนยันโดย {{provider}}"
+        frequency_immediately: "เราจะอีเมลถึงคุณทันทีหากคุณยังไม่ได้อ่านสิ่งที่เราอีเมลหาคุณ"
+        frequency:
+          other: "เราจะอีเมลหาคุณเฉพาะสิ่งที่คุณไม่ได้เห็นในช่วง {{count}} นาที"
+      name:
+        title: "ชื่อ"
+        instructions_required: "ชื่อเต็มของคุณ"
+        too_short: "ชื่อของคุณสั้นไป"
+        ok: "ชื่อของคุณมีลักษณะที่ดี"
+      username:
+        title: "ชื่อผู้ใช้"
+        short_instructions: "ผู้คนสามารถพูดถึงคุณ @{{username}}"
+        available: "ชื่อผู้ใช้ของคุณสามารถใช้ได้"
+        not_available: "ใช้การไม่ได้ ลอง{{suggestion}}?"
+        too_short: "ชื่อผู้ใช้สั้นไป"
+        too_long: "ชื่อผู้ใช้ยาวไป"
+        checking: "กำลังตรวจสอบชื่อผู้ใช้"
+        prefilled: "อีเมลที่ตรงกับผู้ใช้ที่ลงทะเบียนนี้"
+      locale:
+        title: "ภาษา"
+        instructions: "ภาษา จะเปลี่ยนเมื่อคุณรีเฟรชหน้า"
+        default: "(ค่าเริ่มต้น)"
+      password_confirmation:
+        title: "ยืนยันรหัสผ่าน"
+      last_posted: "โพสล่าสุด"
+      last_emailed: "อีเมลล่าสุด"
+      last_seen: "เห็น"
+      created: "สมัครสมาชิกเมื่อ"
+      log_out: "ออกจากระบบ"
+      location: "ที่อยู่"
+      card_badge:
+        title: "ตราประจำบัตร"
+      website: "เว็บไซต์"
+      email_settings: "อีเมล์"
+      like_notification_frequency:
+        title: "แจ้งเตือนเมื่อมีคนกดถูกใจ"
+        always: "เสมอ"
+        first_time_and_daily: "ครั้งแรกที่โพสโดนชอบในวันนี้"
+        first_time: "ครั้งแรกที่โพสต์โดนชอบ"
+        never: "ไม่เคย"
+      email_previous_replies:
+        title: "เพิ่มข้อความตอบรับเก่าในอีเมล"
+        unless_emailed: "นอกจากว่าเคยส่งมาก่อน"
+        always: "เสมอ"
+        never: "ไม่เคย"
+      email_digests:
+        every_30_minutes: "ทุก 30 นาที"
+        every_hour: "ทุกชั่วโมง"
+        daily: "ทุกวัน"
+        every_three_days: "ทุกๆสามวัน"
+        weekly: "ทุกสัปดาห์"
+        every_two_weeks: "ทุกๆสองอาทิตย์"
+      include_tl0_in_digests: "รวมถึงเนื้อหาจากผู้ใช้ใหม่ในอีเมลสรุป"
+      email_in_reply_to: "เพิ่มการตอบในโพสท์ที่คัดกรองแล้วในอีเมล"
+      email_direct: "ส่งอีเมลเมื่อมี การอ้างอิงถึง ตอบโพสท์ พูดถึง @username หรือ ถูกเชิญเข้าไปในกระทู้"
+      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: "ตรวจกระทู้ที่ฉันเข้าอัตโนมัติ"
+      auto_track_options:
+        never: "ไม่เลย"
+        immediately: "ทันที"
+        after_30_seconds: "หลังจาก 30 วินาที"
+        after_1_minute: "หลังจาก 1 นาที"
+        after_2_minutes: "หลังจาก 2 นาที"
+        after_3_minutes: "หลังจาก 3 นาที"
+        after_4_minutes: "หลังจาก 4 นาที"
+        after_5_minutes: "หลังจาก 5 นาที"
+        after_10_minutes: "หลังจาก 10 นาที"
+      invited:
+        search: "พิมพ์เพื่อค้นหาการเชิญ..."
+        title: "เชิญชวน"
+        user: "เชิญชวนผู้ใช้"
+        sent: "ส่ง"
+        none: "ไม่มีคำเชิญที่รออยู่ให้แสดง"
+        truncated:
+          other: "กำลังแสดงคำเชิญ {{count}} รายการแรก"
+        redeemed: "ยืนยันการเชิญชวน"
+        redeemed_tab: "ยืนยัน"
+        redeemed_tab_with_count: "ยืนยันแล้ว ({{count}})"
+        redeemed_at: "ยืนยัน"
+        pending: "รอการเชิญ"
+        pending_tab: "กำลังรอ"
+        pending_tab_with_count: "กำลังรออยู่ ({{count}})"
+        topics_entered: "ดูกระทู้แล้ว"
+        posts_read_count: "อ่านโพส"
+        expired: "การเชิญหมดอายุ"
+        rescind: "ลบ"
+        rescinded: "การชวนถูกนำออก"
+        reinvite: "ส่งการเชิญชวนอีกครั้ง"
+        reinvite_all: "ส่งการเชิญชวนทั้งหมดอีกครั้ง"
+        reinvited: "ส่งการเชิญชวนอีกครั้ง"
+        reinvited_all: "ส่งการเชิญชวนทั้งหมดอีกครั้งแล้ว"
+        time_read: "เวลาอ่าน"
+        days_visited: "วันที่ดู"
+        account_age_days: "อายุบัญชีผู้ใช้ในหน่วยวัน"
+        create: "ส่งการเชิญชวน"
+        generate_link: "คัดลอกลิงค์เชิญชวน"
+        link_generated: "สร้างลิงค์เชิญชวนสำเร็จ!"
+        bulk_invite:
+          text: "เชิญชวนจากไฟล์"
+          success: "ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว คุณจะได้รับการแจ้งเตือนทางข้อความหลังจากที่ทุกอย่างเรียบร้อยแล้ว"
+      password:
+        title: "รหัสผ่าน"
+        too_short: "รหัสผ่านสั้นเกินไป"
+        common: "รหัสผ่านง่ายเกินไป"
+        same_as_username: "รหัสเหมือนกับชื่อผู้ใช้ของคุณ"
+        same_as_email: "รหัสผ่านเหมือนกับอีเมล์ของคุณ"
+        ok: "รหัสผ่านของคุณดูดี"
+      summary:
+        title: "ภาพรวม"
+        stats: "สถิติ"
+        time_read: "เวลาอ่าน"
+        topic_count:
+          other: "กระทู้สร้าง"
+        post_count:
+          other: "โพสถูกสร้าง"
+        days_visited:
+          other: "วันที่ดู"
+        posts_read:
+          other: "โพสที่อ่าน"
+        bookmark_count:
+          other: "บุ๊คมาร์ค"
+        top_replies: "ตอบสูงสุด"
+        no_replies: "ยังไม่มีใครตอบ"
+        more_replies: "การตอบอื่น"
+        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: "ไอพีล่าสุด"
+      registration_ip_address:
+        title: "ไอพีที่ลงทะเบียน"
+      avatar:
+        title: "ภาพแทนตัว"
+        header_title: "ข้อมูลส่วนตัว,ข้อความ,บุ๊คมาร์คและการตั้งค่า"
+      title:
+        title: "ชื่อเรื่อง"
+      filters:
+        all: "ทั้งหมด"
+      stream:
+        posted_by: "โพสต์โดย"
+        sent_by: "ส่งโดย"
+        private_message: "ข้อความส่วนตัว"
+        the_topic: "กระทู้"
+    loading: "กำลังโหลด..."
+    errors:
+      prev_page: "พยายามที่จะโหลด"
+      reasons:
+        network: "เครือข่ายมีปัญหา"
+        server: "เซิร์ฟเวอร์มีปัญหา"
+        forbidden: "การเข้าถึงถูกปฏิเสธ"
+        unknown: "ผิดพลาด"
+        not_found: "ไม่หน้าดังกล่าว"
+      desc:
+        network: "โปรดตรวจสอบการเชื่อมต่อของคุณ"
+        network_fixed: "ดูเหมือนว่ามันจะกลับมา"
+        server: "รหัสข้อผิดพลาด: {{status}}"
+        forbidden: "คุณไม่ได้รับอนุญาคิให้ดูมัน"
+        not_found: "อ๊ะ, ระบบพยายามโหลดหน้าที่ไม่มีอยู่"
+        unknown: "มีบางอย่างผิดปกติไป"
+      buttons:
+        back: "ย้อนกลับ"
+        again: "ลองอีกครั้ง"
+        fixed: "โหลดหน้า"
+    close: "ปิด"
+    assets_changed_confirm: "เว็บนี้พึ่งได้รับการอัปเดต รีเฟรชเพื่อเข้าหน้าเว็บล่าสุด?"
+    logout: "คุณได้ออกจากระบบ"
+    refresh: "รีเฟรช"
+    read_only_mode:
+      enabled: "หน้าเว็บนี้อยู่ในสถานะอ่านเท่านั้น คุณสามารถดูได้แต่การตอบ ชอบ หรือการกระทำอื่นๆถูกปิดอยู่ในขณะนี้"
+      login_disabled: "การลงชื่อเข้าใช้จะไม่สามารถใช้งานได้เมื่อเว็บนี้ถูกตั้งเป็นรูปแบบอ่านอย่างเดียว"
+      logout_disabled: "การออกจากระบบนั้นไม่สามารถทำได้ในเวลาที่เว็บนั้นอยู่ในโหมด read only"
+    logs_error_rate_notice:
+      rate:
+        other: "%{count} ผิดพลาด/%{duration}"
+    learn_more: "เรียนรู้เพิ่มเติม..."
+    year: 'ปี'
+    year_desc: 'กระทู้ที่ถูกตั้งเมื่อ365 วันที่ผ่านมา'
+    month: 'เดือน'
+    month_desc: 'กระทู้ที่ถูกตั้งเมื่อ 30 วันที่ผ่านมา'
+    week: 'สัปดาห์'
+    week_desc: 'กระทู้ที่ถูกตั้งในรอบ 7 วันที่ผ่านมา'
+    day: 'วัน'
+    first_post: โพสแรก
+    mute: ปิดเสียง
+    unmute: เลิกปิดเสียง
+    last_reply_lowercase: การตอบล่าสุด
+    replies_lowercase:
+      other: ตอบ
+    signup_cta:
+      sign_up: "สมัคร"
+      hide_session: "แจ้งเตือนฉันอีกทีพรุ่งนี้"
+      hide_forever: "ไม่เป็นไร"
+      hidden_for_session: "โอเค ฉันจะถามคุณอีกทีพรุ่งนี้ คุณสามารถใช้เมนู เข้าสู่ระบบ เพื่อสร้างบัญชีได้เหมือนกันนะ"
+      intro: "เอาล่ะ! :heart_eyes: ดูเหมือนคุณจะถูกใช้หัวข้อมากเลยนะ แต่คุณยังไม่ได้สร้างบัญชีเลย"
+      value_prop: "ถ้าคุณสร้างบัญชี เราจะสามารถจำได้แปะๆเลยว่าคุณกำลังอ่านอะไรและเมื่อคุณไม่อยู่ คุณจะได้รับการแจ้งเตือนทั้งจากที่นี่ จากอีเมล เมื่อใดก็ตามที่โพสถูกสร้าง และนอกจากนี้คุณยังสามารถถูกใจโพสเพื่อแบ่งปันความรักได้ด้วยนะ :heartbeat:"
+    summary:
+      enabled_description: "คุณกำลังดูสรุปของกระทู้นี้ : นี่คือโพสที่น่าสนใจที่สุดที่หลายๆคนแนะนำ"
+      description: "ตอบทั้งหมด  <b>{{replyCount}}</b> ครั้ง"
+      description_time: "ตอบทั้งหมด <b>{{replyCount}}</b> ครั้งโดยมีเวลาการอ่านประมาณ <b>{{readingTime}} นาที</b>."
+      enable: 'สรุปกระทู้นี้'
+      disable: 'แสดงโพสต์ทั้งหมด'
+    deleted_filter:
+      enabled_description: "กระทู้นี้ซ่อนโพสต์ที่ถูกลบไปแล้ว"
+      disabled_description: "ลบโพสต์ที่แสดงทั้งหมดในกระทู้"
+      enable: "ซ่อนโพสต์ที่ถูกลบ"
+      disable: "แสดงโพสต์ที่ถูกลบ"
+    private_message_info:
+      title: "ข้อความ"
+      invite: "เชิญชวนอื่นๆ..."
+      remove_allowed_user: "คุณต้องการจะลบ {{name}} จากข้อความนี้ใช้หรือไม่"
+    email: 'อีเมล'
+    username: 'ชื่อผู้ใช้'
+    last_seen: 'เห็น'
+    created: 'สร้างเมื่อ'
+    created_lowercase: 'ตั้งเมื่อ'
+    trust_level: 'ระดับความน่าไว้ใจ'
+    search_hint: 'ชื่อผู้ใช้ อีเมล หรือที่อยู่ไอพี'
+    create_account:
+      title: "สร้างบัญชีใหม่"
+      failed: "มีบางอย่างผิดพลาด อีเมลนี้อาจจะลงทะเบียนไว้แล้ว หากลืมรหัสให้กดลิงค์ลืมรหัสผ่าน"
+    forgot_password:
+      title: "ขอรหัสใหม่"
+      action: "ฉันลืมรหัสผ่าน"
+      invite: "กรอกชื่อผู้ใช้หรืออีเมลของท่าน, ทางเราจะส่งอีเมลสำหรับรีเซตรหัสผ่านให้"
+      reset: "รีเซ็ทรหัสผ่าน"
+      complete_username: "ถ้าบัญชีนี้ตรงกับชื่อผู้ใช้ <b>%{username}</b> คุณควรจะได้รับอีเมลเร็วๆนี้ ในอีเมลจะเป็นขั้นตอนการรีเซตรหัสผ่าน"
+      complete_email: "ถ้าบัญชีตรงกับ <b>%{email}</b> คุณจะได้รับอีเมลสำหรับขั้นตอนในการรีเซ็ตรหัสผ่านในเร็วๆนี้"
+      complete_username_found: "เราพบบัญชีที่ใช้ชื่อผู้ใช้ <b>%{username}</b> คุณจะได้รับอีเมลวิธีการรีเซ็ตรหัสผ่านในเร็วๆนี้"
+      complete_email_found: "เราพบบัญชีที่ใช้ชื่อผู้ใช้ <b>%{email}</b> คุณจะได้รับอีเมลวิธีการรีเซ็ตรหัสผ่านในเร็วๆนี้"
+      complete_username_not_found: "ไม่มีบัญชีตรงกับชื่อผู้ใช้ <b>%{username}</b>"
+      complete_email_not_found: "ไม่มีบัญชีตรงกับอีเมล <b>%{email}</b>"
+    login:
+      title: "เข้าสู่ระบบ"
+      username: "ชื่อผู้ใช้"
+      password: "รหัสผ่าน"
+      email_placeholder: "อีเมล์หรือชื่อผู้ใช้"
+      caps_lock_warning: "เปิดแคปล็อคอยู่"
+      error: "ข้อผิดพลาดไม่ทราบสาเหตุ"
+      rate_limit: "กรุณารอสักครู่ก่อนเข้าสู่ระบบอีกครั้ง"
+      blank_username_or_password: "กรุณากรอกอีเมลหรือชื่อผู้ใช้ และรหัสผ่าน"
+      reset_password: 'รีเซ็ทรหัสผ่าน'
+      logging_in: "กำลังลงชื่อเข้าใช้"
+      or: "หรือ"
+      authenticating: "กำลังตรวจสอบ ..."
+      awaiting_approval: "บัญชีของคุณยังไม่ได้รับการยืนยันโดยทีมงาน คุณจะได้รับอีเมลแจ้งเมื่อคุณได้รับการยืนยันแล้ว"
+      requires_invite: "ขออภัย, สามารถเข้าถึงได้เฉพาะผู้ที่ได้รับเชิญเท่านั้น"
+      not_activated: "คุณไม่สามารถเข้าสู่ระบบได้ เราได้ส่งอีเมลยืนยันตัวตนไปหาคุณที่  <b>{{sentTo}}</b> กรุณาทำตามขั้นตอนในอีเมลเพื่อยืนยันตัวตนของคุณ"
+      not_allowed_from_ip_address: "คุณไม่สามารถเข้าสู่ระบบด้วยไอพีนี้ได้"
+      admin_not_allowed_from_ip_address: "คุณไม่สามารถเข้าสู่ระบบด้วยผู้ดูแลระบบด้วยไอพีนี้"
+      resend_activation_email: "คลิกเพื่อส่งอีเมลยืนยันตัวตนอีกครั้ง"
+      sent_activation_email_again: "เราส่งอีเมลยืนยันตัวตนใหม่ไปให้คุณที่ <b>{{currentEmail}}</b> กรุณารอสักครู่และตรวจสอบในถังขยะอีเมลของคุณ"
+      to_continue: "โปรดเข้าสู่ระบบ"
+      preferences: "คุณจำเป็นต้องเข้าสู่ระบบจึงจะสามารถเปลี่ยนการตั้งค่าส่วนตัวของคุณได้"
+      forgot: "ฉันจำรายละเอียดบัญชีของตัวเองไม่ได้"
+      google:
+        title: "ด้วย Google"
+        message: "กำลังตรวจสอบกับ Google (ต้องไม่ปิดกั้นป๊อปอัพ)"
+      google_oauth2:
+        title: "ด้วย Google"
+        message: "กำลังตรวจสอบกับ Google (ต้องไม่ปิดกั้นป๊อปอัพ)"
+      twitter:
+        title: "ด้วย Twitter"
+        message: "กำลังตรวจสอบกับ Twitter (ต้องไม่ปิดกั้นป๊อปอัพ)"
+      instagram:
+        title: "ด้วย Instragram"
+        message: "เข้าใช้งานด้วย Instragram (โปรดแน่ใจว่าไม่ได้เปิดใช้งานการป้องกัน pop up)"
+      facebook:
+        title: "ด้วย Facebook"
+        message: "กำลังตรวจสอบกับ Facebook (ต้องไม่ปิดกั้นป๊อปอัพ)"
+      yahoo:
+        title: "ด้วย Yahoo"
+        message: "กำลังตรวจสอบกับ Yahoo (ต้องไม่ปิดกั้นป๊อปอัพ)"
+      github:
+        title: "ด้วย GitHub"
+        message: "กำลังตรวจสอบกับ Github (ต้องไม่ปิดกั้นป๊อปอัพ)"
+    shortcut_modifier_key:
+      shift: 'Shift'
+      ctrl: 'Ctrl'
+      alt: 'Alt'
+    composer:
+      emoji: "อีโมจิ :)"
+      more_emoji: "อื่นๆ..."
+      options: "ตัวเลือก"
+      whisper: "กระซิบ"
+      add_warning: "นี่คือคำเตือนอย่างเป็นทางการ"
+      toggle_whisper: "เปิดกระซิบ"
+      posting_not_on_topic: "กระทู้ไหนที่คุณต้องการตอบ?"
+      saving_draft_tip: "กำลังบันทึก..."
+      saved_draft_tip: "บันทึกแล้ว"
+      saved_local_draft_tip: "บันทึกบนอุปกรณ์"
+      similar_topics: "กระทู้ของคุณ ใกล้เคียงกับ ..."
+      drafts_offline: "ร่างออฟไลน์"
+      error:
+        title_missing: "ต้องมีชื่อเรื่อง"
+        title_too_short: "ชื่อเรื่องต้องมีอย่างน้อย {{min}} ตัวอักษร"
+        title_too_long: "ชื่อเรื่องต้องไม่ยาวเกิน {{max}} ตัวอักษร"
+        post_missing: "โพสไม่สามารถว่างได้"
+        post_length: "โพสต้องมีอย่างน้อย {{min}} ตัวอักษร"
+        try_like: 'คุณได้ลองปุ่ม <i class="fa fa-heart"></i> หรือยัง? '
+        category_missing: "คุณต้องเลือกหมวดหมู่"
+      save_edit: "บันทึกการแก้ไข"
+      reply_original: "ตอบบนกระทู้ต้นฉบับ"
+      reply_here: "ตอบที่นี่"
+      reply: "ตอบกลับ"
+      cancel: "ยกเลิก"
+      create_topic: "สร้างกระทู้"
+      create_pm: "ข้อความ"
+      title: "หรือกด Ctrl+Enter"
+      users_placeholder: "เพิ่มผู้ใช้"
+      title_placeholder: "บทสนทนานี้เกี่ยวกับอะไร ขอสั้นๆ 1  ประโยค"
+      edit_reason_placeholder: "ทำไมคุณถึงแก้ไข?"
+      show_edit_reason: "(เพิ่มสาเหตุที่แก้ไข)"
+      reply_placeholder: "พิมพ์ที่นี่. ใช้ Markdown, BBCode หรือ HTML เพื่อจัดรูปแบบ สามารถลากหรือวางรูปภาพได้"
+      view_new_post: "ดูโพสต์ใหม่ของคุณ"
+      saving: "กำลังบันทึก"
+      saved: "บันทึกแล้ว!"
+      saved_draft: "มีร่างโพส เลือกเพื่อทำต่อ"
+      uploading: "กำลังอัปโหลด..."
+      show_preview: 'แสดงตัวอย่าง &raquo;'
+      hide_preview: '&raquo; ซ่อนตัวอย่าง'
+      quote_post_title: "อ้างถึงโพสทั้งหมด"
+      bold_title: "หนา"
+      bold_text: "ตัวอักษรหนา"
+      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 เคาะ"
+      upload_title: "อัปโหลด"
+      upload_description: "กรอกรายละเอียดการอัปโหลดที่นี่"
+      olist_title: "รายการลำดับ"
+      ulist_title: "รายการดอกจันทร์"
+      list_item: "รายการ"
+      help: "ช่วยเหลือการจัดรูปแบบ"
+      modal_ok: "ตกลง"
+      modal_cancel: "ยกเลิก"
+      cant_send_pm: "ขอโทษด้วย คุณไม่สามารถส่งข้อความหา %{username} ได้"
+      admin_options_title: "ตั้งค่าทางเลือกทีมงานสำหรับกระทู้นี้"
+    notifications:
+      title: "การแจ้งเตือนการพูดถึง,การตอบกลับไปยังโพส กระทู้ หรือข้อความส่วนตัว และอื่นๆของ @name "
+      none: "ไม่สามารถโหลดการแจ้งเตือนในขณะนี้"
+      more: "ดูการแจ้งเตือนก่อนหน้านี้"
+      total_flagged: "โพสที่ปักธงทั้งหมด"
+      alt:
+        mentioned: "ถูกพูดถึงโดย"
+        quoted: "ถูกอ้างอิงโดย"
+        replied: "ตอบแล้ว"
+        posted: "โพสโดย"
+        edited: "แก้ไขโพสของคุณโดย"
+        liked: "ได้ถูกใจโพสของคุณ"
+        private_message: "ข้อความส่วนตัวจาก"
+        invited_to_private_message: "ได้รับคำเชิญเพื่อข้อความส่วนตัวจาก"
+        invited_to_topic: "เชิญไปยังกระทู้จาก"
+        invitee_accepted: "การเชิญได้ตอบรับโดย"
+        moved_post: "โพสของคุณได้ถูกย้ายโดย"
+        linked: "ลิงค์ไปยังโพสของคุณ"
+        granted_badge: "ได้รับป้าย"
+        group_message_summary: "ข้อความในกล่องข้อความกลุ่ม"
+      popup:
+        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: "เพิ่มรูปภาพหรือไฟล์"
+      from_my_computer: "จากอุปกรณ์"
+      from_the_web: "จากเว็บ"
+      remote_tip: "ลิงค์ไปยังรูปภาพ"
+      remote_tip_with_attachments: "ลิงค์ไปยังรูปหรือไฟล์ {{authorized_extensions}}"
+      local_tip: "เลือกภาพจากอุปกรณ์ของคุณ"
+      local_tip_with_attachments: "เลือกภาพหรือไฟล์จากอุปกรณ์ของคุณ {{authorized_extensions}}"
+      hint: "(คุณสามารถใช้เมาส์ลากไปวางในตัวแก้ไขข้อความเพื่ออัพโหลดได้ด้วย)"
+      hint_for_supported_browsers: "คุณยังสามารถลากหรือวางไฟล์ในช่องแก้ไขโดยตรงได้ด้วย"
+      uploading: "กำลังอัปโหลด"
+      select_file: "เลือกไฟล์"
+      image_link: "ลิงค์รูปของคุณจะชี้ไปที่"
+    search:
+      sort_by: "เรียงโดย"
+      relevance: "เกี่ยวข้อง"
+      latest_post: "โพสล่าสุด"
+      most_viewed: "ดูเยอะสุด"
+      most_liked: "ไลค์เยอะสุด"
+      select_all: "เลือกทั้งหมด"
+      clear_all: "ล้างทั้งหมด"
+      title: "ค้นหากระทู้, โพสต์, ผู้ใช้ หรือ หมวดหมู่"
+      no_results: "ไม่มีผลการค้นหา"
+      no_more_results: "ไม่พบการค้นหาเพิ่มเติมแล้ว"
+      searching: "กำลังค้นหา..."
+      post_format: "#{{post_number}} ด้วย {{username}}"
+      context:
+        user: "ค้นหาโพสต์ด้วย @{{username}}"
+        category: "ค้นหาหมวด #{{category}}"
+        topic: "ค้นหากระทู้นี้"
+        private_messages: "ค้นหาข้อความ"
+    hamburger_menu: "ไปยังกระทู้อื่นหรือหมวดหมู่อื่น"
+    new_item: "ใหม่"
+    go_back: 'ย้อนกลับ'
+    not_logged_in_user: 'หน้าผู้ใช้สำหรับสรุปกิจกรรมล่าสุดและการปรับแต่ง'
+    current_user: 'ไปยังหน้าผู้ใช้'
+    topics:
+      bulk:
+        unlist_topics: "กระทู้ที่ไม่ได้แสดง"
+        reset_read: "ล้างจำนวนการอ่าน"
+        delete: "ลบกระทู้นี้"
+        dismiss: "ซ่อน"
+        dismiss_read: "ซ่อนทั้งหมดที่ไม่ได้อ่าน"
+        dismiss_button: "ซ่อน..."
+        dismiss_tooltip: "ซ่อนเฉพาะโพสใหม่หรือหยุดติดตามกระทู้"
+        also_dismiss_topics: "หยุดติดตามกระทู้เหล่านี้และอย่าแสดงพวกนั้นให้ฉันเห็นเป็นหัวข้อที่ยังไม่ได้อ่านอีก"
+        dismiss_new: "ซ่อนใหม่"
+        toggle: "สลับการเลือกกระทู้จำนวนมาก"
+        actions: "การดำเนินการจำนวนมาก"
+        close_topics: "ลบกระทู้นี้"
+        archive_topics: "คลังกระทู้"
+        choose_new_category: "เลือกหมวดใหม่ให้กระทู้"
+        selected:
+          other: "คุณได้เลือก <b>{{count}}</b> กระทู้"
+      none:
+        unread: "คุณไม่มีกระทู้ที่ยังไม่ได้อ่าน"
+        new: "คุณไม่มีกระทู้ใหม่"
+        read: "คุณยังไม่ได้อ่านกระทู้เลย"
+        posted: "คุณยังไม่ได้โพสในกระทู้ใดๆ"
+        latest: "ไม่มีกระทู้ล่าสุด น่าเสียใจจริงๆ"
+        hot: "ไม่มีกระทู้ที่น่าสนใจ"
+        bookmarks: "คุณยังไม่ได้บุ๊คมาร์คกระทู้ใดๆเลย"
+        category: "ยังไม่ในกระทู้ในหมวด {{category}}"
+        search: "ไม่พบผลการค้นหา"
+      bottom:
+        latest: "ไม่มีกระทู้ล่าสุด"
+        hot: "ไม่มีกระทู้ที่น่าสนใจ"
+        new: "ไม่มีกระทู้ใหม่"
+        bookmarks: "ไม่มีบุ๊คมาร์คในหัวข้อใดอีกแล้ว"
+    topic:
+      create: 'กระทู้ใหม่'
+      create_long: 'สร้างกระทู้ใหม่'
+      private_message: 'สร้างข้อความใหม่'
+      archive_message:
+        help: 'ย้ายข้อความไปกล่องเก็บข้อความ'
+        title: 'คลัง'
+      move_to_inbox:
+        title: 'ย้ายไปกล่องขาเข้า'
+        help: 'ย้ายข้อความกลับไปกล่องข้อความ'
+      list: 'กระทู้'
+      new: 'สร้างกระทู้'
+      unread: 'ยังไม่ได้อ่าน'
+      new_topics:
+        other: '{{count}} กระทู้ใหม่'
+      unread_topics:
+        other: '{{count}} กระทู้ที่ยังไม่ได้อ่าน'
+      title: 'กระทู้'
+      invalid_access:
+        title: "กระทู้นี้เป็นกระทู้ส่วนตัว"
+        description: "ขออภัยคุณไม่สามารถเข้าถึงกระทู้ที่ต้องการได้!"
+        login_required: "คุณจำเป็นต้องเข้าสู่ระบบเพื่อดูกระทู้นี้"
+      server_error:
+        title: "ไม่สามารถโหลดกระทู้ได้"
+      not_found:
+        title: "ไม่พบกระทู้"
+      total_unread_posts:
+        other: "คุณมี {{count}} ความคิดเห็น ที่ยังไม่ได้อ่านในกระทู้นี้"
+      unread_posts:
+        other: "คุณมี {{count}} ความคิดเห็นเก่า ที่ยังไม่ได้อ่านในกระทู้นี้"
+      back_to_list: "กลับไปที่รายชื่อกระทู้"
+      show_links: "แสดงลิงค์ในกระทู้นี้"
+      read_more_in_category: "ต้องการจะอ่านเพิ่มเหรอ? ลองดูกระทู้อื่นใน {{catLink}} หรือ {{latestLink}}"
+      read_more: "ต้องการจะอ่านเพิ่ม? {{catLink}} หรือ {{latestLink}}."
+      view_latest_topics: ดูกระทู้ล่าสุด
+      suggest_create_topic: ทำไมไม่สร้างกระทู้ละ
+      deleted: "หัวข้อถูกลบ"
+      auto_close_title: 'ปิดการตั้งค่าอัตโนมัติ'
+      timeline:
+        back: "กลับ"
+      notifications:
+        reasons:
+          '3_2': 'คุณจะได้รับการแจ้งเตือนเพราะคุณดูกระทู้นี้'
+          '3_1': 'คุณจะได้รับการแจ้งเตือนเพราะคุณสร้างกระทู้นี้'
+          '3': 'คุณจะได้รับการแจ้งเตือนเพราะคุณดูกระทู้นี้'
+          '0_2': 'คุณไม่ต้องการรับการแจ้งเตือนของกระทู้นี้'
+          '0': 'คุณไม่ต้องการรับการแจ้งเตือนของกระทู้นี้'
+        watching_pm:
+          title: "กำลังดู"
+        watching:
+          title: "กำลังดู"
+        tracking_pm:
+          title: "ติดตาม"
+        tracking:
+          title: "ติดตาม"
+        regular:
+          title: "ปกติ"
+        regular_pm:
+          title: "ปกติ"
+        muted_pm:
+          title: "ปิด"
+        muted:
+          title: "ปิดการแจ้งเตือน"
+      actions:
+        recover: "เลิกลบกระทู้"
+        delete: "ลบกระทู้"
+        open: "เปิดกระทู้"
+        close: "ปิดกระทู้"
+        multi_select: "เลือกโพส..."
+        pin: "ปักหมุดกระทู้"
+        unpin: "ยกเลิกปักหมุดกระทู้"
+        unarchive: "เลิกเก็บกระทู้เข้าคลัง"
+        archive: "เก็บกระทู้เข้าคลัง"
+        invisible: "ทำให้ไม่แสดงในรายชื่อ"
+        visible: "ทำให้แสดงในรายชื่อ"
+        reset_read: "ล้างข้อมูลวันที่"
+        make_public: "ทำให้กระทู้เป็นสาธารณะ"
+        make_private: "ทำเป็นข้อความส่วนตัว"
+      feature:
+        pin: "ปักหมุดกระทู้"
+        unpin: "ยกเลิกปักหมุดกระทู้"
+        pin_globally: "ปักหมุดกระทู้ทั้งหมด"
+        make_banner: "ป้ายกระทู้"
+        remove_banner: "ยกเลิกป้ายกระทู้"
+      share:
+        title: 'แบ่งปัน'
+        help: 'แบ่งปันลิงค์ไปยังกระทู้นี้'
+      flag_topic:
+        title: 'ธง'
+        help: 'ปังธงกระทู้นี้เพื่อติดตามหรือรับการแจ้งเตือนเกี่ยวกับกระทู้'
+        success_message: 'คุณปักธงกระทู้นี้แล้ว'
+      feature_topic:
+        title: "แนะนำกระทู้นี้"
+        confirm_pin: "ตอนนี้คุณมีกระทู้ที่ปักหมุดทั้งหมด {{count}} กระทู้ การมีกระทู้ที่ปักหมุดมากๆจะทำให้ผู้ใช้ใหม่และผู้ใช้ที่ไม่ระบุชื่อรำคาญ คุณแน่ใจจริงๆหรือว่าจะปักหมุกกระทู้เพิ่มอีก?"
+        confirm_pin_globally: "ตอนนี้คุณมีหัวข้อที่ปักหมุดแบบรวม {{count}} หัวข้อ การมีหัวข้อที่ปักหมุดมากๆจะทำให้ผู้ใช้ใหม่และผู้ใช้ที่ไม่ระบุชื่อรำคาญ คุณแน่ใจจริงๆหรือว่าจะปักหมุกหัวข้อเพิ่มอีก?"
+      inviting: "กำลังเชิญ..."
+      invite_private:
+        title: 'ข้อความที่ใช้เชิญ'
+        email_or_username: "อีเมลหรือชื่อผู้ใช้ที่ถูกเชิญ"
+        email_or_username_placeholder: "อีเมลหรือชื่อผู้ใช้"
+        action: "เชิญ"
+        success: "เราได้เชิญผู้ใช้นั้นให้มีส่วนร่วมในข้อความนี้แล้ว"
+        error: "ขออภัย เกิดความผิดพลาดในการเชิญผู้ใช้ท่านนี้"
+        group_name: "ชื่อกลุ่ม"
+      controls: "การควบคุมหัวข้อ"
+      invite_reply:
+        title: 'เชิญ'
+        username_placeholder: "ชื่อผู้ใช้"
+        action: 'ส่งคำเชิญ'
+        email_placeholder: 'name@example.com'
+      login_reply: 'เข้าสู่ระบบเพื่อตอบ'
+      filters:
+        n_posts:
+          other: "{{count}} โพส"
+        cancel: "เอาการกรองออก"
+      split_topic:
+        title: "ย้ายไปหัวข้อใหม่"
+        action: "ย้ายไปหัวข้อใหม่"
+        topic_name: "ชื่อหัวข้อใหม่"
+      merge_topic:
+        title: "ย้ายไปหัวข้อที่มีอยู่แล้ว"
+        action: "ย้ายไปหัวข้อที่มีอยู่แล้ว"
+      change_owner:
+        title: "เลือกเจ้าของโพส"
+        action: "เปลี่ยนความเป็นเจ้าของ"
+        error: "มีความผิดพลาดขณะเปลี่ยนความเป็นเจ้าของโพส"
+        label: "เจ้าของใหม่ของโพส"
+        placeholder: "ชื่อผู้ใช้ของเจ้าของใหม่"
+      change_timestamp:
+        action: "เปลี่ยนแปลงเวลา"
+      multi_select:
+        select: 'เลือก'
+        selected: 'เลือกแล้ว ({{count}})'
+        delete: ลบที่เลือก
+        cancel: ยกเลิกการเลือก
+        select_all: เลือกทั้งหมด
+        deselect_all: ไม่เลือกทั้งหมด
+        description:
+          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}}"
+      edit_reason: "เหตุผล:"
+      post_number: "โพสต์ {{number}}"
+      last_edited_on: "โพสแก้ไขล่าสุดเมื่อ"
+      reply_as_new_topic: "ตอบด้วยหัวข้อที่ลิงค์ไว้"
+      follow_quote: "ไปยังโพสที่ถูกอ้างถึง"
+      show_full: "แสดงโพสแบบเต็ม"
+      show_hidden: 'ดูเนื้อหาที่ถูกซ่อน'
+      deleted_by_author:
+        other: "(โพสถูกแจ้งลบโดยเจ้าของ และจะถูกลบใน %{count} ชั่วโมงเว้นแต่จะถูกปักธง)"
+      expand_collapse: "ขยาย/หด"
+      unread: "โพสนี้ยังไม่ถูกอ่าน"
+      has_replies:
+        other: "{{count}} ตอบ"
+      has_likes:
+        other: "{{count}} ชอบ"
+      has_likes_title:
+        other: "{{count}} ผู้คนที่ชอบโพสนี้"
+      has_likes_title_only_you: "คุณชอบโพสนี้"
+      errors:
+        create: "ขอโทษ, เกิดความผิดพลาดขณะกำลังสร้างโพสของคุณ โปรดลองใหม่อีกครั้ง"
+        edit: "ขอโทษ, เกิดความผิดพลาดขณะกำลังแก้ไขโพสต์ของคุณ โปรดลองใหม่อีกครั้ง"
+        upload: "ขอโทษ, เกิดความผิดพลาดขณะกำลังอัพโหลดไฟล์ โปรดลองใหม่อีกครั้ง"
+        too_many_uploads: "ขอโทษ, คุณสามารถอัพโหลดไฟล์ได้ครั้งล่ะหนึ่งไฟล์"
+        image_upload_not_allowed_for_new_user: "ขออภัย, ผู้ใช้ใหม่ไม่สามารถอัพโหลดรูปภาพได้"
+        attachment_upload_not_allowed_for_new_user: "ขออภัย, ผู้ใช้ใหม่ไม่สามารถอัพโหลดไฟล์แนบได้"
+        attachment_download_requires_login: "ขออภัย, คุณต้องเข้าสู่ระบบเพื่อดาวห์โหลดไฟล์แนบ"
+      abandon:
+        confirm: "คุณต้องการทิ้งโพสของคุณจริงๆเหรอ?"
+        no_value: "ไม่ เก็บไว้"
+        yes_value: "ใช่ ทิ้งไป"
+      via_email: "โพสนี้ถูกเก็บโดยอีเมล"
+      whisper: "โพสนี้คือการกระซิบจากผู้ดูแล"
+      archetypes:
+        save: 'บันทึกการตั้งค่า'
+      controls:
+        like: "ชอบโพสนี้"
+        has_liked: "คุณได้ชอบโพสนี้แล้ว"
+        undo_like: "ย้อนคืนการชอบ"
+        edit: "แก้ไขโพสนี้"
+        edit_anonymous: "ขอโทษแต่คุณต้องเข้าสู่ระบบเพื่อแก้ไขโพสนี้"
+        delete: "ลบโพสนี้"
+        undelete: "เลือกลบโพสนี้"
+        more: "อื่น"
+        unhide: "เลิกซ่อน"
+      actions:
+        undo:
+          bookmark: "ย้อนคืนการบุ๊คมาร์ค"
+        by_you:
+          bookmark: "บุ๊คมาร์คโพสนี้"
+        by_you_and_others:
+          bookmark:
+            other: "คุณและอีก {{count}} คนได้บุ๊คมาร์คโพสนี้"
+        by_others:
+          bookmark:
+            other: "{{count}} คน ได้บุ๊คมาร์คโพสนี้"
+    category:
+      delete: 'ลบหมวดหมู่'
+      delete_confirm: "คุณแน่ใจหรือว่าจะลบหมวดหมู่นี้ออก?"
+      email_in_allow_strangers: "ยอมรับอีเมลจากผู้ใช้ที่ไม่ระบุชื่อและไม่มีบัญชี"
+      notifications:
+        watching:
+          title: "กำลังดู"
+        tracking:
+          title: "ติดตาม"
+        regular:
+          title: "ปกติ"
+        muted:
+          title: "ปิด"
+    flagging:
+      notify_action: 'ข้อความส่วนตัว'
+      delete_spammer: "ลบสแปมเมอร์"
+      yes_delete_spammer: "ใช่ ลบสแปมเมอร์ออก"
+    flagging_topic:
+      notify_action: "ข้อความส่วนตัว"
+    topic_map:
+      title: "ภาครวมหัวข้อ"
+    topic_statuses:
+      bookmarked:
+        help: "คุณได้บุ๊คมาร์คหัวข้อนี้แล้ว"
+      archived:
+        help: "หัวข้อนี้ถูกจัดเก้บแล้ว; นั่นหมายความว่ามันถูกแช่แข็งและไม่สามารถเปลี่ยนแปลงได้"
+      locked_and_archived:
+        help: "หัวข้อนี้ถูกปิดและถูกจัดเก็บแล้ว; นั่นหมายความว่ามันไม่รับข้อความใหม่และไม่สามารถเปลี่ยนแปลงได้"
+    posts: "โพส"
+    original_post: "โพสต้นฉบับ"
+    views: "ดู"
+    views_lowercase:
+      other: "ดู"
+    replies: "ตอบ"
+    activity: "กิจกรรม"
+    likes: "ชอบ"
+    likes_lowercase:
+      other: "ชอบ"
+    users: "ผู้ใช้"
+    users_lowercase:
+      other: "ผู้ใช้"
+    category_title: "หมวดหมู่"
+    history: "ประวัติ"
+    changed_by: "โดย {{author}}"
+    raw_email:
+      not_available: "ไม่พร้อม!"
+    categories_list: "รายการหมวดหมู่"
+    filters:
+      with_topics: "%{filter} หัวข้อ"
+      with_category: "%{filter} %{category} หัวข้อ"
+      latest:
+        title: "ล่าสุด"
+        title_with_count:
+          other: "ล่าสุด ({{count}})"
+        help: "หัวข้อพร้อมโพสล่าสุด"
+      hot:
+        title: "ร้อนแรง"
+      read:
+        title: "อ่าน"
+      search:
+        title: "ค้นหา"
+        help: "ค้นหาทุกหัวข้อ"
+      categories:
+        title: "หมวดหมู่"
+        title_in: "หมวดหมู่ - {{categoryName}}"
+        help: "ทุกหัวข้อจัดกลุ่มโดยหมวดหมู่"
+      unread:
+        title: "ยังไม่อ่าน"
+        title_with_count:
+          other: "ยังไม่ได้อ่าน ({{count}})"
+        help: "หัวข้อที่คุณกำลังจับตาหรือติดตามพร้อมโพสที่ยังไม่อ่าน"
+        lower_title_with_count:
+          other: "{{count}} ไม่ได้อ่าน"
+      new:
+        lower_title_with_count:
+          other: "{{count}} ใหม่"
+        lower_title: "ใหม่"
+        title: "ใหม่"
+        title_with_count:
+          other: "ใหม่ ({{count}})"
+        help: "หัวข้อที่ถูกสร้างในช่วงไม่กี่วัน"
+      posted:
+        title: "โพสของฉัน"
+        help: "หัวข้อที่คุณโพส"
+      bookmarks:
+        title: "บุ๊คมาร์ค"
+        help: "หัวข้อของคุณได้รับการบุ๊คมาร์ค"
+      category:
+        title: "{{categoryName}}"
+        title_with_count:
+          other: "{{categoryName}} ({{count}})"
+        help: "หัวข้อล่าสุดในหมวดหมู่ {{categoryName}}"
+      top:
+        title: "บน"
+        help: "หัวข้อที่มีการเลือกไหวมากที่สุดในปี เดือน อาทิตย์ หรือวันที่ผ่านมา"
+        all:
+          title: "ตลอดเวลา"
+        yearly:
+          title: "ปี"
+        quarterly:
+          title: "สามเดือน"
+        monthly:
+          title: "เดือน"
+        weekly:
+          title: "อาทิตย์"
+        daily:
+          title: "วัน"
+        all_time: "ตลอดเวลา"
+        this_year: "ปี"
+        this_quarter: "สามเดือน"
+        this_month: "เดือน"
+        this_week: "อาทิตย์"
+        today: "วันนี้"
+        other_periods: "ดูสูงสุด"
+    browser_update: 'ไม่เสียดาย, <a href="http://www.discourse.org/faq/#browser">บาวเซอร์ของคุณเก่าเกินไป</a>. โปรด <a href="http://browsehappy.com">เปลี่ยนบาวเซอร์ของคุณ</a>.'
+    permission_types:
+      full: "สร้าง / ตอบ / ดู"
+      create_post: "ตอบ / ดู"
+      readonly: "ดู"
+  admin_js:
+    type_to_filter: "พิมพ์เพื่อกรอง..."
+    admin:
+      title: 'ผู้ดูแลระบบดิสคอส'
+      moderator: 'ผู้ดูแล'
+      dashboard:
+        title: "แดชบอร์ด"
+        last_updated: "แดชบอร์ดพร้อมกับแก้ไขล่าสุด:"
+        version: "เวอร์ชั่น"
+        up_to_date: "คุณเป็นเวอร์ชั่นล่าสุด!"
+        critical_available: "การอัพเดตที่สำคัญมีให้อัพเดต"
+        updates_available: "มีการอัพเดต"
+        please_upgrade: "โปรดอัพเดต!"
+        installed_version: "ติดตั้งแล้ว"
+        latest_version: "ล่าสุด"
+        problems_found: "เกิดปัญหาบางประการกับการติดตั้งดิสคอสของคุณ:"
+        last_checked: "ตรวจล่าสุด"
+        refresh_problems: "รีเฟรช"
+        no_problems: "ไม่พบปัญหา"
+        moderators: 'ผู้ดูแล:'
+        admins: 'ผู้ดูแลระบบ:'
+        suspended: 'ถูกปิด:'
+        private_messages_short: "ข้อความ"
+        private_messages_title: "ข้อความ"
+        mobile_title: "โทรศัพท์"
+        space_free: "{{size}} ว่าง"
+        uploads: "อัพโหลด"
+        backups: "สำรอง"
+        traffic_short: "การจราจร"
+        reports:
+          today: "วันนี้"
+          yesterday: "เมื่อวาน"
+          last_7_days: "เมื่อ 7 วันที่ผ่านมา"
+          last_30_days: "เมื่อ 30 วันที่ผ่านมา"
+          all_time: "ตลอดเวลา"
+          7_days_ago: "7 วันที่แล้ว"
+          30_days_ago: "30 วันที่แล้ว"
+          all: "ทั้งหมด"
+          view_table: "ตาราง"
+          view_graph: "กราฟ"
+          refresh_report: "โหลดรายงานใหม่"
+          start_date: "วันที่เริ่ม"
+          end_date: "วันที่จบ"
+          groups: "กลุ่มทั้งหมด"
+      commits:
+        latest_changes: "การเปลี่ยนแปลงล่าสุด: โปรดอัพเดตบ่อยๆ"
+        by: "โดย"
+      flags:
+        title: "ธง"
+        agree: "เห็นด้วย"
+        agree_title: "ยืนยันว่าธงนี้ว่าถูกต้อง"
+        delete: "ลบ"
+        delete_title: "ลบโพสที่ถูกติดป้ายแสดงไว้"
+        delete_post_defer_flag_title: "ลบโพส ถ้าโพสนั้นเป็นโพสแรกให้ลบหัวข้อออก"
+        delete_post_agree_flag_title: "ลบโพส ถ้าเป็นโพสแรกให้ลบหัวข้อออก"
+        delete_flag_modal_title: "ลบและ..."
+        delete_spammer: "ลบสแปมเมอร์"
+        disagree_flag_unhide_post: "ไม่เห็นด้วย (ยกเลิกการซ่อนโพส)"
+        disagree_flag: "ไม่เห็นด้วย"
+        clear_topic_flags: "เสร็จ"
+        dispositions:
+          agreed: "เห็นด้วย"
+          disagreed: "ไม่เห็นด้วย"
+        system: "ระบบ"
+        error: "มีบางอย่างผิดปกติไป"
+        reply_message: "ตอบ"
+        topic_flagged: "ใน <strong>หัวข้อนี้</strong> ถูกปักธงแล้ว"
+        visit_topic: "ดูหัวข้อเพื่อกระทำบางอย่าง"
+      groups:
+        primary: "กลุ่มหลัก"
+        no_primary: "(ไม่มีกลุ่มหลัก)"
+        title: "กลุ่ม"
+        edit: "แก้กลุ่ม"
+        refresh: "รีโหลด"
+        new: "ใหม่"
+        selector_placeholder: "ชื่อผู้ใช้ใหม่"
+        about: "แก้ไขสมาชิกและชื่อกลุ่มของคุณได้ที่นี่"
+        group_members: "ชื่อสมาชิก"
+        delete: "ลบ"
+        delete_confirm: "ลบกลุ่มนี้?"
+        delete_failed: "ไม่สามารถลงกลุ่มได้ ถ้ากลุ่มนี้เป็นกลุ่มอัตโนมัติมันจะไม่สามารถถูกทำลายได้"
+        delete_owner_confirm: "ลบสิทธิ์การเป็นเจ้าของ ของ '%{username}'?"
+        add: "เพิ่ม"
+        add_members: "เพิ่มสมาชิก"
+        group_owners: เจ้าของ
+        add_owners: เพิ่มเจ้าของ
+        incoming_email: "ตั้งที่อยู่สำหรับอีเมลขาเข้า"
+        incoming_email_placeholder: "ใส่อีเมล"
+      api:
+        user: "ผู้ใช้"
+        title: "API"
+        key: "API Key"
+        revoke: "เอาออก"
+      plugins:
+        title: "ปลั้กอิน"
+        installed: "ปลั้กอินที่ติดตั้งแล้ว"
+        name: "ชื่อ"
+        none_installed: "คุณยังไม่มีปลั้กอินใดๆติดตั้ง"
+        version: "เวอร์ชั่น"
+        enabled: "เปิดใช้?"
+        is_enabled: "Y"
+        not_enabled: "N"
+      backups:
+        title: "สำรอง"
+        menu:
+          backups: "สำรอง"
+        operations:
+          cancel:
+            label: "ยกเลิก"
+      export_csv:
+        button_text: "ส่งออก"
+      export_json:
+        button_text: "ส่งออก"
+      invite:
+        button_text: "ส่งคำเชิญ"
+        button_title: "ส่งคำเชิญ"
+      customize:
+        title: "การปรับแต่ง"
+        delete: "ลบ"
+        colors:
+          delete_confirm: "ลบชุดสีนี้?"
+      email:
+        sent: "ส่ง"
+        incoming_emails:
+          filters:
+            from_placeholder: "from@example.com"
+            to_placeholder: "to@example.com"
+            cc_placeholder: "cc@example.com"
+            subject_placeholder: "เรื่อง"
+            error_placeholder: "ผิดพลาด"
+        logs:
+          filters:
+            user_placeholder: "ผู้ใช้"
+            address_placeholder: "name@example.com"
+      logs:
+        ip_address: "ไอพี"
+        topic_id: "หมายเลขหัวข้อ"
+        post_id: "หมายเลยโพสต์"
+        delete: 'ลบ'
+        edit: 'แก้ไข'
+        save: 'บันทึก'
+        staff_actions:
+          clear_filters: "แสดงทั้งหมด"
+          when: "เมื่อ"
+          deleted: "ไม่มีค่าใหม่ การบันทึกถูกลบ"
+          actions:
+            delete_user: "ลบผู้ใช้"
+            change_trust_level: "เปลี่ยนระดับความไว้ใจ"
+            delete_topic: "ลบหัวข้อ"
+            delete_post: "ลบโพส"
+            delete_category: "ลบหมวดหมู่"
+        screened_ips:
+          form:
+            add: "เพิ่ม"
+      users:
+        title: 'ผู้ใช้'
+        nav:
+          active: "ใช้งานอยู่"
+          pending: "กำลังรอ"
+          staff: 'ทีมงาน'
+          suspended: 'ระงับการใช้งาน'
+          suspect: 'ต้องสงสัย'
+        approved: "ยืนยันหรือไม่"
+        approved_selected:
+          other: "ผู้ใช้งานที่ได้รับยืนยันแล้ว ({{count}})"
+        reject_selected:
+          other: "ผู้ใช้งานที่ไม่ได้รับยืนยันแล้ว ({{count}})"
+        titles:
+          active: 'ผู้ใช้ที่ใช้งานอยู่'
+          new: 'ผู้ใช้งานใหม่'
+          pending: 'ผู้ใช้งานที่รอการยืนยัน'
+          newuser: 'ผู้ใช้ที่ระดับความไว้ใจ 0 (ผู้ใช้ใหม่)'
+          basic: 'ผู้ใช้ที่ระดับความไว้ใจ 1 (ผู้ใช้ทั่วไป)'
+          member: 'ผู้ใช้ที่ระดับความไว้ใจ 2 (สมาชิก)'
+          regular: 'ผู้ใช้ที่ระดับความไว้ใจ 3 (ทั่วไป)'
+          leader: 'ผู้ใช้ที่ระดับความไว้ใจ 4 (ผู้นำ)'
+          staff: "ทีมงาน"
+          suspended: 'ผู้ใช้งานที่ถูกระงับ'
+          suspect: 'ผู้ใช้งานที่ต้องสงสัย'
+        not_verified: "ยังไม่ได้รับการตรวจสอบ"
+        check_email:
+          title: "แสดงอีเมลผู้ใช้งาน"
+          text: "แสดง"
+      user:
+        suspend_failed: "มีข้อผิดพลาดในการระงับการใช้งาน {{error}}"
+        unsuspend_failed: "มีข้อผิดพลาดในเปิดการใช้งาน {{error}}"
+        suspend_duration: "ระงับการใช้งานถึงเมื่อไร"
+        suspended_by: "ระงับการใช้งานโดย"
+        delete_all_posts: "ลบโพสทั้งหมด"
+        suspended: "ระงับการใช้งานหรือไม่"
+        ip_lookup: "ค้นหา IP"
+        unsuspend: 'เปิดการใช้งาน'
+        suspend: 'ระงับการใช้งาน'
+        last_100_days: 'ใน 100 วันที่ผ่านมา'
+        private_topics_count: หัวข้อส่วนตัว
+        posts_read_count: อ่านโพส
+        post_count: โพสถูกสร้างแล้ว
+        topics_entered: หัวข้อที่ได้ดูแล้ว
+        approve: 'อนุมัติ'
+        approved_by: "อนุมัติโดย"
+        time_read: "เวลาอ่าน"
+        delete: "ลบผู้ใช้"
+        delete_forbidden_because_staff: "ผู้ดูแลระบบและผู้ดูแลไม่สามารถถูกลบได้"
+        delete_posts_forbidden_because_staff: "ไม่สามารถลบโพสทั้งหมดของผู้ดูแลระบบและผู้ดูแลได้"
+        delete_confirm: "คุณแน่ใจหรือที่จะลบผู้ใช้นี้ออก? นี้เป็นการกระทำที่ย้อนคืนไม่ได้!"
+        delete_and_block: "ลบและ <b>บล็อก</b> อีเมลและไอพีนี้"
+        delete_dont_block: "ลบเท่านั้น"
+        deleted: "ผู้ใช้ถูกลบแล้ว"
+        trust_level_change_failed: "มีความผิดพลาดขณะกำลังเปลี่ยนระดับความไว้ใจของผู้ใช้"
+        trust_level_2_users: "ระดับความไว้ใจ 2 ผู้ใช้"
+        trust_level_3_requirements: "ระดับความไว้ใจ 3 ความต้องการ"
+        trust_level_locked_tip: "ระดับความไว้ใจถูกล็อกไว้ระบบจะไม่ปรับระดับความไว้ใจของผู้ใช้ขึ้นหรือลง"
+        trust_level_unlocked_tip: "ระดับความไว้ใจถูกปลดล็อก ระบบจะปรับระดับความไว้ใจขึ้นหรือลงของผู้ใช้ตามปกติ"
+        lock_trust_level: "ล็อกระดับความไว้ใจ"
+        unlock_trust_level: "ปลดล็อกระดับความไว้ใจ"
+        tl3_requirements:
+          title: "ความต้องการเพิ่มปรับระดับความไว้ใจเป็น 3"
+          value_heading: "ค่า"
+          requirement_heading: "ความต้องการ"
+          visits: "เยี่ยมชม"
+          days: "วัน"
+          posts_read: "อ่านโพส"
+          likes_given: "ได้ชอบ"
+          likes_received: "ได้รับการชอบ"
+          qualifies: "คุณสมบัติเพียงพอสำหรับระดับความไว้ใจที่ 3"
+          does_not_qualify: "คุณสมบัติไม่เพียงพอสำหรับระดับความไว้ใจที่ 3"
+          locked_will_not_be_promoted: "ระดับความไว้ใจถูกล็อก จะไม่ถูกปรับระดับความไว้ใจขึ้น"
+          locked_will_not_be_demoted: "ระดับความไว้ใจถูกล็อก จะไม่ถูกปรับระดับความไว้ใจลง"
+        sso:
+          external_id: "รหัสภายนอก"
+          external_username: "ชื่อผู้ใช้"
+          external_name: "ชื่อ"
+          external_email: "อีเมล"
+          external_avatar_url: "ที่อยู่ภาพประจำตัว"
+      user_fields:
+        title: "ช่องข้อมูลผู้ใช้"
+        help: "เพิ่มช่องที่คุณสามารถใส่ข้อมูลเพิ่มได้"
+        create: "สร้างช่องข้อมูลผู้ใช้"
+        untitled: "ไม่ได้ตั้งชื่อ"
+        name: "ชื่อช่อง"
+        type: "ประเภทช่อง"
+        description: "รายละเอียดช่อง"
+        save: "บันทึก"
+        edit: "แก้ไข"
+        delete: "ลบ"
+        cancel: "ยกเลิก"
+        delete_confirm: "คุณแน่ใจหรือว่าจะลบฟิวส์ของผู้ใช้นี้?"
+        options: "ตัวเลือก"
+        required:
+          title: "ต้องการเมื่อลงทะเบียน?"
+          enabled: "ต้องการ"
+          disabled: "ไม่ต้องการ"
+        editable:
+          title: "แก้ไขได้หลังลงทะเบียน?"
+          enabled: "แก้ไขได้"
+          disabled: "แก้ไขไม่ได้"
+        show_on_profile:
+          title: "แสดงในข้อมูลสาธารณะ?"
+          enabled: "แสดงแสดงในข้อมูลส่วนตัว"
+          disabled: "ไม่แสดงในข้อมูลส่วนตัว"
+        show_on_user_card:
+          title: "แสดงบนการ์ดผู้ใช้?"
+          enabled: "แสดงบนการ์ดผู้ใช้"
+          disabled: "ไม่แสดงบนการ์ดผู้ใช้"
+        field_types:
+          text: 'ช่องข้อความ'
+          confirm: 'การยืนยัน'
+          dropdown: "ดร็อปดาวน์"
+      site_text:
+        description: "คุณสามารถปรับแต่งข้อความบนฟอรั่มของคุณได้คุณอย่าง เริ่มได้โดยการค้นหาข้างล่างนี่"
+        search: "ค้นหาข้อความที่คุณต้องการแก้ไข"
+        title: 'เนื้อความของข้อความ'
+        edit: 'แก้ไข'
+        revert: "ย้อนกลับการแก้ไข"
+        revert_confirm: "คุณแน่ใจหรือว่าจะย้อนกลับการแก้ไข"
+        go_back: "กลับไปค้นหา"
+        recommended: "เราแนะนำให้คุณแก้ไขข้อความให้ตรงกับความต้องการของคุณ:"
+      site_settings:
+        title: 'การตั้งค่า'
+        reset: 'ล้าง'
+        none: 'ไม่มี'
+        no_results: "ไม่มีผลการค้นหา"
+        clear_filter: "ล้าง"
+        add_url: "เพิ่ม URL"
+        add_host: "เพิ่มโฮส"
+        categories:
+          all_results: 'ทั้งหมด'
+          required: 'ต้องการ'
+          basic: 'การตั้งค่าพื้นฐาน'
+          users: 'ผู้ใช้'
+          posting: 'โพส'
+          email: 'อีเมล'
+          files: 'ไฟล์'
+          trust: 'ระดับความไว้ใจ'
+          security: 'ความปลอดภัย'
+          seo: 'SEO'
+          spam: 'ขยะ'
+          rate_limits: 'ข้อจำกัด'
+          developer: 'นักพัฒนา'
+          embedding: "การฝั่ง"
+          legal: "กฎ"
+          uncategorized: 'อื่นๆ'
+          backups: "สำรองข้อมูล"
+          login: "เข้าสู่ระบบ"
+          plugins: "ตัวเสริม"
+          user_preferences: "การตั้งค่าของผู้ใช้"
+          tags: "แท็ก"
+      badges:
+        new: ใหม่
+        name: ชื่อ
+        display_name: ชื่อที่ใช้แสดง
+        description: รายละเอียด
+        long_description: รายละเอียดแบบยาว
+        badge_grouping: กลุ่ม
+        granted_by: อนุญาตโดย
+        granted_at: อนุญาตเมื่อ
+        reason_help: (ลิงก์ไปยังหัวข้อหรือโพส)
+        save: บันทึก
+        delete: ลบ
+        revoke: เอาออก
+        reason: เหตุผล
+        icon: ไอค่อน
+        image: ภาพ
+        trigger_type:
+          trust_level_change: "เมื่อผู้ใช้เปลี่ยนระดับความไว้ใจ"
+        preview:
+          bad_count_warning:
+            header: "อันตราย!"
+          sample: "ตัวอย่าง:"
+          grant:
+            with: <span class="username">%{username}</span>
+            with_post: <span class="username">%{username}</span> สำหรับโพสต์ใน %{link}
+            with_post_time: <span class="username">%{username}</span> สำหรับโพสต์ใน %{link} เมื่อ <span class="time">%{time}</span>
+            with_time: <span class="username">%{username}</span> เมื่อ <span class="time">%{time}</span>
+      emoji:
+        title: "Emoji"
+        add: "เพิ่ม Emoji ใหม่"
+        name: "ชื่อ"
+        image: "ภาพ"
+        delete_confirm: "คุณแน่ใจหรือว่าจะลบ Emoji :%{name}: ออก?"
+      embedding:
+        confirm_delete: "คุณแน่ใจหรือว่าจะลบโพสนั้น?"
+        title: "ฝั่ง"
+        host: "อนุญาตโฮส"
+        edit: "แก้ไข"
+        category: "โพสไปยังหมวดหมู่"
+        add_host: "เพิ่มโฮส"
+        settings: "การตั้งการการฝั่ง"
+        feed_settings: "การตั้งค่าฟีด"
+        save: "บันทึกการตั้งค่าการฝั่ง"
+      permalink:
+        title: "ลิงค์ถาวร"
+        url: "URL"
+        topic_id: "เลขที่หัวข้อ"
+        topic_title: "หัวข้อ"
+        post_id: "เลขที่โพส"
+        post_title: "โพส"
+        category_id: "เลขที่หมวดหมู่"
+        category_title: "หมวดหมู่"
+        external_url: "ลิงก์ภายนอก"
+        delete_confirm: คุณแน่ใจหรือว่าจะลบลิงค์ถาวรนี้?
+        form:
+          label: "ใหม่:"
+          add: "เพิ่ม"
+          filter: "ค้นหา (URL หรือ ลิงก์ภายนอก)"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 64748676da..90631af3f3 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -118,24 +118,29 @@ tr_TR:
         enabled: '%{when} listelendi'
         disabled: '%{when} listelenmedi'
     topic_admin_menu: "konuyla alakalı yönetici eylemleri"
+    wizard_required: "Yeni Discourse'unuza hoşgeldiniz!  Hadi kuruluma başlayalım! <a href='%{url}' data-auto-route='true'>Kurulum Sihirbazı</a> ✨"
     emails_are_disabled: "Tüm giden e-postalar yönetici tarafından genel olarak devre dışı bırakıldı. Herhangi bir e-posta bildirimi gönderilmeyecek."
     bootstrap_mode_enabled: "Yeni sitenizi kolayca çalıştırmak için bootstrap modundasınız. Tüm yeni kullanıcılar güven seviyesi 1den başlar ve e-posta uyarıcıları açıksa günlük mail alırlar. Bu özellik kullanıcı sayısı %{min_users} rakamına ulaştığında otomatik kapatılacaktır."
     bootstrap_mode_disabled: "Bootstrap modu önümüzdeki 24 saat içinde edilgen olacaktır."
+    themes:
+      default_description: "Varsayılan "
     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)"
+        eu_west_2: "AB (Londra)"
+        sa_east_1: "South America (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_east_2: "ABD Doğu (Ohio)"
+        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 +322,9 @@ 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)"
+      public_admission: "Kullanıcıların gruba özgürce katılmalarına izin ver (Herkese açık olarak görünür grup gerektirir)"
+      public_exit: "Kullanıcıların grubu özgürce terk etmesine izin ver"
       empty:
         posts: "Bu grubun üyelerinden konu yok."
         members: "Bu grupta üye bulunmamaktır."
@@ -333,29 +336,42 @@ tr_TR:
       join: "Gruba katıl"
       leave: "Gruptan ayrıl"
       request: "Gruba katılmak için istek yolla"
+      message: "ileti"
       automatic_group: Otomatik Grup
       closed_group: Kapanmış Grup
       is_group_user: "Bu grubun bir üyesisiniz."
+      allow_membership_requests: "Kullanıcıların grup sahiplerine üyelik talepleri göndermesine izin ver"
+      membership_request:
+        submit: "İstek Gönderin"
+        title: "@%{group_name}  için Katılma isteği "
+        reason: "Grup sahiplerine bu gruba neden üye olduğunuzu bildirin"
       membership: "Üyelik"
       name: "İsim"
       user_count: "Grup Sayısı"
       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."
       title:
-        other: "gruplar"
+        other: "Gruplar"
       activity: "Etkinlik"
       members: "Üyeler"
       topics: "Konular"
       posts: "Gönderiler"
       mentions: "Bahsetmeler"
       messages: "İletiler"
+      notification_level: "Grup mesajları için varsayılan bildirim düzeyi"
+      visibility_levels:
+        title: "Bu grubu kim görebilir?"
+        public: "Herkes"
+        members: "Grup sahipleri, üyeler ve yöneticiler"
+        staff: "Grup sahipleri ve yetkili"
+        owners: "Grup sahipleri ve yöneticileri"
       alias_levels:
-        title: "Kimler bu gruba ileti gönderebilir ve gruptan @bahsedebilir?"
+        mentionable: "Bu gruptan kimler @bahsedebilir?"
+        messageable: "Bu gruba kimler ileti gönderebilir?"
         nobody: " Hiç Kimse"
         only_admins: "Sadece Yöneticiler"
         mods_and_admins: "Sadece Moderatörler ve Yöneticiler"
@@ -449,7 +465,7 @@ tr_TR:
       mute: "Sustur"
       edit: "Tercihleri Düzenle"
       download_archive:
-        button_text: "Gönderilerimi İndir"
+        button_text: "Hepsini İ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."
@@ -474,11 +490,14 @@ tr_TR:
         disable: "Bildirimleri Devre Dışı Bırakın"
         enable: "Bildirimleri Etkinleştirin"
         each_browser_note: "Not: Bu ayarı kullandığınız her tarayıcıda değiştirmelisiniz."
+      dismiss: 'Yoksay'
       dismiss_notifications: "Tümünü Yoksay"
       dismiss_notifications_tooltip: "Tüm okunmamış bildirileri okunmuş olarak işaretle"
       first_notification: "İlk bilidiriminiz! Başlamak için seçiniz"
       disable_jump_reply: "Cevapladıktan sonra gönderime atlama"
       dynamic_favicon: "Tarayıcı simgesinde yeni / güncellenen konu sayısını göster"
+      theme_default_on_all_devices: "Seçilen temayı bütün cihazlarımda varsayılan yap"
+      allow_private_messages: "Diğer kullanıcıların bana özel mesaj göndermelerine izin ver"
       external_links_in_new_tab: "Tüm dış bağlantıları yeni sekmede aç"
       enable_quoting: "Vurgulanan yazıyı alıntılayarak cevaplama özelliğini etkinleştir"
       change: "değiştir"
@@ -486,8 +505,9 @@ tr_TR:
       admin: "{{user}} bir yöneticidir"
       moderator_tooltip: "Bu kullanıcı bir moderatör"
       admin_tooltip: "Bu kullanıcı bir yönetici."
-      blocked_tooltip: "Bu kullanıcı engellendi"
+      silenced_tooltip: "Bu kullanıcı susturuldu"
       suspended_notice: "Bu kullanıcı {{tarih}} tarihine kadar uzaklaştırıldı."
+      suspended_permanently: "Bu kullanıcı askıya alındı."
       suspended_reason: "Neden:"
       github_profile: "Github"
       email_activity_summary: "Etkinlik özeti"
@@ -518,6 +538,7 @@ tr_TR:
       watched_first_post_tags_instructions: "Bu etiketlerdeki her yeni konudaki ilk gönderi için bildirim alacaksınız."
       muted_categories: "Susturuldu"
       muted_categories_instructions: "Bu kategorilerdeki yeni konular hakkında herhangi bir bildiri almayacaksınız ve en son gönderilerde gözükmeyecekler. "
+      no_category_access: "Bir moderatör olarak kategori erişiminiz sınırlıdır, kaydetme devre dışıdır."
       delete_account: "Hesabımı Sil"
       delete_account_confirm: "Hesabınızı kalıcı olarak silmek istediğinize emin misiniz? Bu eylemi geri alamazsınız!"
       deleted_yourself: "Hesabınız başarıyla silindi."
@@ -529,11 +550,14 @@ tr_TR:
       muted_users_instructions: "Bu kullanıcılardan gelen tüm bildirileri kapa."
       muted_topics_link: "Susturulmuş konuları göster"
       watched_topics_link: "Gözlenen konuları göster"
+      tracked_topics_link: "İzlenen konuları göster"
       automatically_unpin_topics: "En alta ulaşınca otomatik olarak başlıkların tutturulmasını kaldır."
       apps: "Uygulamalar"
       revoke_access: "Erişimi İptal Et"
       undo_revoke_access: "Erişim İptalini Geri Al"
       api_approved: "Onaylanmış:"
+      theme: "Tema"
+      home: "Varsayılan Anasayfa"
       staff_counters:
         flags_given: "yardımcı bildirimler"
         flagged_posts: "bildirilen gönderiler"
@@ -552,7 +576,14 @@ tr_TR:
         failed_to_move: "Seçilen iletileri taşımak başarısız oldu (muhtemelen ağınız çöktü)"
         select_all: "Tümünü seç"
       preferences_nav:
+        account: "Hesap"
+        profile: "Profil"
+        emails: "E-postalar"
+        notifications: "Bildirimler"
+        categories: "Kategoriler"
+        tags: "Etiketler"
         interface: "Arayüz"
+        apps: "Uygulamalar"
       change_password:
         success: "(e-posta gönderildi)"
         in_progress: "(e-posta yollanıyor)"
@@ -568,13 +599,13 @@ 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"
         taken: "Üzgünüz, bu e-posta kullanılabilir değil."
         error: "E-posta adresinizi değiştirirken bir hata oluştu. Belki bu adres zaten kullanımdadır?"
         success: "Adresinize bir e-posta gönderdik. Lütfen onaylama talimatlarını uygulayınız."
+        success_staff: "Şu anki adresinize bir eposta gönderdik. Lütfen doğrulama yönergelerini takip edin."
       change_avatar:
         title: "Profil görselinizi değiştirin"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baz alındı"
@@ -702,8 +733,12 @@ tr_TR:
         expired: "Bu davetin süresi doldu."
         rescind: "Kaldır"
         rescinded: "Davet kaldırıldı"
+        rescind_all: "Tüm davetiyeleri kaldır"
+        rescinded_all: "Tüm davetiyeler kaldırıldı!"
+        rescind_all_confirm: "Tüm davetiyeleri kaldırmak istediğinizden emin misiniz?"
         reinvite: "Davetiyeyi Tekrar Yolla"
         reinvite_all: "Tüm davetleri tekrar gönder"
+        reinvite_all_confirm: "Tüm davetiyeleri tekrar göndermek istediğinizden emin misiniz?"
         reinvited: "Davetiye tekrar yollandı"
         reinvited_all: "Tüm davetler tekrar gönderildi!"
         time_read: "Okunma Zamanı"
@@ -735,9 +770,9 @@ tr_TR:
         post_count:
           other: "oluşturulan gönderiler"
         likes_given:
-          other: "<i class='fa fa-heart'></i> verilen"
+          other: "verilen"
         likes_received:
-          other: "<i class='fa fa-heart'></i> alınan "
+          other: "alınan"
         days_visited:
           other: "ziyaret edilen gün"
         posts_read:
@@ -825,7 +860,8 @@ tr_TR:
     first_post: İlk gönderi
     mute: Sustur
     unmute: Susturma
-    last_post: Son gönderi
+    last_post: Gönderilme
+    time_read: Okuma
     last_reply_lowercase: son cevap
     replies_lowercase:
       other: cevap
@@ -850,6 +886,7 @@ tr_TR:
     private_message_info:
       title: "İleti"
       invite: "Diğerlerini Davet Et..."
+      leave_message: "Bu mesajı gerçekten bırakmak mı istiyorsun?"
       remove_allowed_user: "Bu iletiden {{name}} isimli kullanıcıyı çıkarmak istediğinize emin misiniz?"
       remove_allowed_group: "{{name}} bunu gerçekten iletiden kaldırmak istiyor musunuz?"
     email: 'E-posta'
@@ -874,6 +911,8 @@ tr_TR:
       complete_email_found: "<b>%{email}</b> adresi ile eşleşen bir hesap bulduk, kısa bir süre içerisinde parolanızı nasıl sıfırlayacağınızı açıklayan bir e-posta alacaksınız."
       complete_username_not_found: "Hiçbir hesap kullanıcı adı <b>%{username}</b> ile eşleşmiyor"
       complete_email_not_found: "Hiçbir hesap <b>%{email}</b> adresi ile eşleşmiyor"
+      button_ok: "Tamam"
+      button_help: "Yardım"
     login:
       title: "Giriş Yap"
       username: "Kullanıcı"
@@ -887,12 +926,17 @@ tr_TR:
       logging_in: "Oturum açılıyor..."
       or: "ya da"
       authenticating: "Kimliğiniz doğrulanıyor..."
+      awaiting_activation: "Hesabınız etkinleştirme işlemini bekliyor, başka bir etkinleştirme e-postası göndermek için şifremi unuttum bağlantısını kullanın."
       awaiting_approval: "Hesabınız henüz bir görevli tarafından onaylanmadı. Onaylandığında e-posta ile haberdar edileceksiniz."
       requires_invite: "Üzgünüz, bu foruma sadece davetliler erişebilir."
       not_activated: "Henüz oturum açamazsınız. Hesabınızı etkinleştirmek için lütfen daha önceden <b>{{sentTo}}</b> adresine yollanan etkinleştirme e-postasındaki açıklamaları okuyun."
       not_allowed_from_ip_address: "Bu IP adresiyle oturum açamazsınız."
       admin_not_allowed_from_ip_address: "Bu IP adresinden yönetici olarak oturum açamazsınız."
       resend_activation_email: "Etkinleştirme e-postasını tekrar yollamak için buraya tıklayın. "
+      resend_title: "Etkinleştirme epostasını tekrar gönder"
+      change_email: "Eposta adresini değiştir"
+      provide_new_email: "Yeni bir e posta adresi girerek aktivasyon maili gönderin."
+      submit_new_email: "Eposta adresi güncelle"
       sent_activation_email_again: "<b>{{currentEmail}}</b> adresine yeni bir etkinleştirme e-postası yolladık. Bu e-postanın size ulaşması bir kaç dakika sürebilir; istenmeyen klasörüzü kontrol etmeyi unutmayın."
       to_continue: "Lütfen Giriş Yap"
       preferences: "Tercihlerinizi değiştirebilmek için giriş yapmanız gerekiyor."
@@ -923,6 +967,12 @@ tr_TR:
       accept_title: "Davet"
       welcome_to: "%{site_name} topluluğuna hoş geldiniz!"
       invited_by: "Davet gönderen:"
+      your_email: "Hesap e-posta adresiniz <b>%{email}</b>."
+      accept_invite: "Daveti kabul et"
+      success: "Hesabınız oluşturuldu ve şimdi giriş yaptınız."
+      name_label: "İsim"
+      password_label: "Parola Belirle"
+      optional_description: "(isteğe bağlı)"
     password_reset:
       continue: "%{site_name} devam edin"
     emoji_set:
@@ -931,6 +981,8 @@ tr_TR:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Yalnızca Kategoriler"
       categories_with_featured_topics: "Kategoriler ve Öne Çıkarılan Konular"
@@ -939,12 +991,29 @@ tr_TR:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      no_content: Hiçbir sonuç bulunamadı
+      filter_placeholder: Ara...
+      create: "{{content}} oluştur"
+    emoji_picker:
+      filter_placeholder: Emoji ara
+      people: İnsanlar
+      nature: Doğa
+      food: Gıda
+      activity: Etkinlik
+      travel: Seyahat
+      celebration: Kutlama
+      recent: Son zamanlarda kullanılmış
+      default_tone: Cilt rengi yok
+      light_tone: Açık cilt tonu
+      dark_tone: Koyu cilt tonu
     composer:
       emoji: "Emoji :)"
       more_emoji: "dahası..."
       options: "Seçenekler"
       whisper: "fısıltı"
       unlist: "listelenmedi"
+      blockquote_text: "Blok-alıntı"
       add_warning: "Bu resmi bir uyarıdır."
       toggle_whisper: "Fısıldamayı Aç/Kapa"
       toggle_unlisted: "Listelenmeme aç/kapa"
@@ -974,6 +1043,7 @@ tr_TR:
       cancel: "İptal et"
       create_topic: "Konu Oluştur"
       create_pm: "İleti"
+      create_whisper: "Fısılda"
       title: "Ya da Ctrl+Enter'a bas"
       users_placeholder: "Kullanıcı ekle"
       title_placeholder: "Bir cümlede açıklamak gerekirse bu tartışmanın konusu nedir?"
@@ -1011,12 +1081,7 @@ tr_TR:
       olist_title: "Numaralandırılmış Liste"
       ulist_title: "Madde İşaretli Liste"
       list_item: "Liste öğesi"
-      heading_label: "H"
-      heading_title: "Başlık"
-      heading_text: "Başlık"
-      hr_title: "Yatay Çizgi"
       help: "Markdown Düzenleme Yardımı"
-      toggler: "yazım alanını gizle veya göster"
       modal_ok: "Tamam"
       modal_cancel: "İptal"
       cant_send_pm: "Üzgünüz, %{username} kullanıcısına ileti gönderemezsiniz."
@@ -1030,26 +1095,6 @@ tr_TR:
       empty: "Bildirim yok."
       more: "daha eski bildirimleri görüntüle"
       total_flagged: "toplam bildirilen gönderiler"
-      mentioned: "<i title='bahsetti' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
-      group_mentioned: "<i title='bahsetti' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
-      quoted: "<i title='alıntıladı' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      replied: "<i title='cevapladı' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='yazdı' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      edited: "<i title='düzenledi' 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='beğendi' class='fa fa-heart'></i><p><span>{{username}}, {{username2}}</span> {{description}}</p>"
-      liked_many:
-        other: "<i title='beğendi' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} ve diğer {{count}} kişi</span> {{description}}</p>"
-      private_message: "<i title='özel ileti' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_private_message: "<i title='özel ileti' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
-      invited_to_topic: "<i title='konuya davet edildi' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      invitee_accepted: "<i title='davetiyeni kabul etti' class='fa fa-user'></i><p><span>{{username}}</span> davetini kabul etti!</p>"
-      moved_post: "<i title='gönderiyi taşıdı' class='fa fa-sign-out'></i><p><span>{{username}}</span> taşıdı {{description}}</p>"
-      linked: "<i title='bağlanmış gönderi' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
-      granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p><strong>{{description}}</strong> rozeti kazandınız!</p>"
-      watching_first_post: "<i title='yeni konu' class='fa fa-dot-circle-o'></i><p><span>Yeni Konu</span> {{description}}</p>"
-      group_message_summary:
-        other: "<i title='grup gelen kutusundaki iletiler' class='fa fa-group'></i><p> {{group_name}} isimli grubunuzun gelen kutusunda {{count}} adet ileti var</p>"
       alt:
         mentioned: "Bahsedildi, şu kişi tarafından"
         quoted: "Alıntılandı, şu kişi tarafından"
@@ -1091,18 +1136,20 @@ tr_TR:
       sort_by: "Sırala"
       relevance: "Alaka"
       latest_post: "Son Gönderi"
+      latest_topic: "Güncel konu"
       most_viewed: "En Çok Görüntülenen"
       most_liked: "En Çok Beğenilen"
       select_all: "Tümünü Seç"
       clear_all: "Tümünü Temizle"
       too_short: "Aradığın terim çok kısa."
-      result_count:
-        other: "<span class='term'>\"{{term}}\"</span> için {{count}} sonuç "
       title: "konu, gönderi, kullanıcı veya kategori ara"
       no_results: "Hiç bir sonuç bulunamadı."
       no_more_results: "Başka sonuç yok."
       searching: "Aranıyor..."
       post_format: "{{username}} tarafından #{{post_number}}"
+      more_results: "Daha fazla sonuç var. Lütfen arama kriterlerini daraltın."
+      search_google_button: "Google"
+      search_google_title: "Bu sitede ara"
       context:
         user: "@{{username}} kullancısına ait gönderilerde ara"
         category: "#{{category}} kategorisini ara"
@@ -1112,25 +1159,19 @@ tr_TR:
         title: Gelişmiş Arama
         posted_by:
           label: Gönderen
-        in_category:
-          label: Şu Kategoride
         in_group:
           label: Şu Grupta
         with_badge:
           label: Rozetle
-        with_tags:
-          label: Şu Etiketli
         filters:
-          label: Yalnızca bu özelliğe sahip konuları/gönderileri göster...
           likes: beğendiğim
           posted: gönderide bulunduğum
           watching: gözlediğim
           tracking: takip ettiğim
-          private: iletilerimde olan
-          bookmarks: imlediğim
           first: en ilk gönderidir.
           pinned: tutturulmuş
           unpinned: tutturulmamış
+          unseen: Okumadım
           wiki: wiki olan
         statuses:
           label: Şöyle olan konular
@@ -1157,6 +1198,7 @@ tr_TR:
         select_all: "Tümünü Seç"
         clear_all: "Tümünü Temizle"
         unlist_topics: "Konuları Listeleme"
+        relist_topics: "Konuları sırala"
         reset_read: "Okunmuşları Sıfırla"
         delete: "Konuları Sil"
         dismiss: "Yoksay"
@@ -1167,11 +1209,15 @@ tr_TR:
         dismiss_new: "Yenileri Yoksay"
         toggle: "konuların toplu seçimini aç/kapa"
         actions: "Toplu Eylemler"
+        change_category: "Kategori düzenle"
         close_topics: "Konuları Kapat"
         archive_topics: "Konuları Arşivle"
+        notification_level: "Bildirimler"
         choose_new_category: "Konular için yeni bir kategori seçin:"
         selected:
           other: "<b>{{count}}</b> konu seçtiniz."
+        change_tags: "Etiketleri Değiştir"
+        append_tags: "Etiketleri Ekle"
         choose_new_tags: "Konular için yeni etiketler seçin:"
         changed_tags: "Bu konuların etiketleri değiştirildi."
       none:
@@ -1253,6 +1299,23 @@ tr_TR:
       jump_reply_up: Daha önceki cevaba geç
       jump_reply_down: Daha sonraki cevaba geç
       deleted: "Konu silindi "
+      topic_status_update:
+        when: "Ne zaman:"
+        public_timer_types: Konu Zamanlayıcıları
+        private_timer_types: Kullanıcı Konusu Zamanlayıcılar
+      auto_update_input:
+        none: "Bir zaman çerçevesi seçin"
+        tomorrow: "Yarın"
+        this_weekend: "Bu hafta sonu"
+        next_week: "Gelecek hafta"
+        next_month: "Gelecek ay"
+        one_year: "Bir Yıl"
+        forever: "Sonsuza dek"
+        pick_date_and_time: "Tarih ve saat seç"
+      auto_close:
+        error: "Lütfen geçerli bir değer giriniz."
+      reminder:
+        title: "Bana hatırlat"
       auto_close_title: 'Otomatik Kapatma Ayarları'
       auto_close_immediate:
         other: "Konudaki son gönderi zaten %{count} saat eski, bu yüzden konu hemen kapatılacak."
@@ -1438,7 +1501,6 @@ tr_TR:
       multi_select:
         select: 'seç'
         selected: '({{count}}) seçildi'
-        select_replies: 'cevaplarıyla seç'
         delete: seçilenleri sil
         cancel: seçimi iptal et
         select_all: hepsini seç
@@ -1449,7 +1511,6 @@ tr_TR:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Alıntı"
-      edit: "{{link}} {{replyAvatar}} {{username}} düzenleniyor"
       edit_reason: "Neden: "
       post_number: "gönderi {{number}}"
       wiki_last_edited_on: "wiki en son düzenlendi"
@@ -1504,17 +1565,13 @@ tr_TR:
         has_liked: "bu gönderiyi beğendiniz"
         undo_like: "beğenmekten vazgeç"
         edit: "bu gönderiyi düzenle"
+        edit_action: "Düzenle"
         edit_anonymous: "Üzgünüz, ama bu gönderiyi düzenleyebilmek için oturum açmalısınız."
         flag: "bu gönderiyi kontrol edilmesi için özel olarak bildirin ya da bununla ilgili özel bir bildirim yollayın"
         delete: "bu gönderiyi sil"
         undelete: "bu gönderinin silinmesini geri al"
         share: "bu gönderinin bağlantısını paylaşın"
         more: "Daha fazla"
-        delete_replies:
-          confirm:
-            other: "Bu gönderiye verilen {{count}} direk cevabı da silmek istiyor musunuz?"
-          yes_value: "Evet, cevapları da sil"
-          no_value: "Hayır, sadece bu gönderiyi"
         admin: "gönderiyle alakalı yönetici eylemleri"
         wiki: "Wiki Yap"
         unwiki: "Wiki'yi Kaldır"
@@ -1525,8 +1582,6 @@ tr_TR:
         change_owner: "Sahipliğini Değiştir"
       actions:
         flag: 'Bildir'
-        defer_flags:
-          other: "Bildirimi ertele"
         undo:
           off_topic: "Bildirimi geri al"
           spam: "Bildirimi geri al"
@@ -1586,12 +1641,6 @@ tr_TR:
             other: "{{count}} kişi bunu beğendi"
           vote:
             other: "{{count}} kişi bu gönderiyi oyladı"
-      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"
@@ -1602,6 +1651,7 @@ tr_TR:
           show: "Düzenlemeyi göster"
           revert: "Bu sürüme geri dön"
           edit_wiki: "Wiki'yi düzenle"
+          edit_post: "İletiyi düzenle"
           comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> <i class='fa fa-arrows-h'></i> <strong>{{current}}</strong> / {{total}}"
         displays:
           inline:
@@ -1613,6 +1663,10 @@ tr_TR:
           side_by_side_markdown:
             title: "İşlenmemiş diff kaynaklarını yan yana göster"
             button: 'Raw'
+      raw_email:
+        displays:
+          html_part:
+            button: 'HTML'
     category:
       can: 'yapabilir&hellip;'
       none: '(kategori yok)'
@@ -1625,8 +1679,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"
@@ -1897,7 +1949,6 @@ tr_TR:
         hamburger_menu: '<b>=</b> Hamburger menüyü aç'
         user_profile_menu: '<b>p</b> Kullanıcı menüsünü aç'
         show_incoming_updated_topics: '<b>.</b> Güncellenmiş konuları göster'
-        search: '<b>/</b> Ara'
         help: '<b>?</b> Klavye yardım sayfasını aç'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Yeni Konuları/Gönderileri Yoksay'
         dismiss_topics: '<b>x</b>, <b>t</b> Konuları yoksay'
@@ -1962,9 +2013,7 @@ tr_TR:
       selector_no_tags: "etiket yok"
       changed: "değişen etiketler:"
       tags: "Etiketler"
-      choose_for_topic: "bu konu için etiket seçiniz"
       delete_tag: "Etiketi Sil"
-      delete_confirm: "Bu etiketi silmek istiyor musunuz?"
       rename_tag: "Etiketi Yeniden Adlandır"
       rename_instructions: "Bu etiket için yeni bir ad seçin:"
       sort_by: "Sırala:"
@@ -2059,7 +2108,6 @@ tr_TR:
         no_problems: "Herhangi bir sorun bulunamadı."
         moderators: 'Moderatörler:'
         admins: 'Yöneticiler:'
-        blocked: 'Engellenmiş:'
         suspended: 'Uzaklaştırılmışlar:'
         private_messages_short: "İletiler"
         private_messages_title: "İletiler"
@@ -2092,24 +2140,13 @@ tr_TR:
         by: "tarafından"
       flags:
         title: "Bildirilenler"
-        old: "Eski"
-        active: "Etkin"
         agree: "Onayla"
         agree_title: "Bu bildirimi geçerli ve doğru olarak onayla"
-        agree_flag_modal_title: "Onayla ve..."
-        agree_flag_hide_post: "Onayla (gönderiyi gizle + özel ileti yolla)"
-        agree_flag_hide_post_title: "Bu gönderiyi gizle ve otomatik olarak kullanıcıya acilen düzenleme yapmasını belirten bir ileti gönder"
-        agree_flag_restore_post: "Kabul ediyorum (gönderiyi geri getir)"
-        agree_flag_restore_post_title: "Gönderiyi geri getir"
-        agree_flag: "Bildirimi onayla"
-        agree_flag_title: "Bildirimi onayla ve gönderide değişiklik yapma"
-        defer_flag: "Ertele"
+        defer_flag: "Yoksay"
         defer_flag_title: "Bu bildirimi kaldır; şu an için bir şey yapmak gerekmiyor."
         delete: "Sil"
         delete_title: "Bu bildirimin ait olduğu gönderiyi sil."
-        delete_post_defer_flag: "Gönderiyi sil ve bildirimi ertele"
         delete_post_defer_flag_title: "Gönderiyi sil; başka gönderi yoksa, konuyu da sil."
-        delete_post_agree_flag: "Gönderiyi sil ve bildirimi onayla"
         delete_post_agree_flag_title: "Gönderiyi sil; başka gönderi yoksa, konuyu da sil."
         delete_flag_modal_title: "Sil ve..."
         delete_spammer: "Spamcıyı Sil"
@@ -2124,29 +2161,28 @@ tr_TR:
         dispositions:
           agreed: "onaylandı"
           disagreed: "onaylanmadı"
-          deferred: "ertelendi"
+          deferred: "Yoksayıldı"
         flagged_by: "Bildiren"
         resolved_by: "Çözen"
         took_action: "İşlem uygulandı"
         system: "Sistem"
         error: "Bir şeyler ters gitti"
         reply_message: "Cevapla"
-        no_results: "Bildirilen içerik yok."
         topic_flagged: "Bu <strong>konu</strong> bildirildi."
         visit_topic: "Harekete geçmek için konuyu ziyaret edin"
         was_edited: "İlk bildirimden sonra gönderi düzenlendi"
         previous_flags_count: "Bu gönderi daha önce {{count}} defa bildirilmiş."
-        summary:
-          action_type_3:
-            other: "konu dışı x{{count}}"
-          action_type_4:
-            other: "uygunsuz x{{count}}"
-          action_type_6:
-            other: "özel x{{count}}"
-          action_type_7:
-            other: "özel x{{count}}"
-          action_type_8:
-            other: "istenmeyen x{{count}}"
+        details: "ayrıntılar"
+        flagged_topics:
+          topic: "Konu"
+          type: "Tür"
+          users: "Kullanıcılar"
+        short_names:
+          off_topic: "konu-dışı"
+          inappropriate: "uygunsuz"
+          spam: "istenmeyen"
+          notify_user: "özel"
+          notify_moderators: "özel"
       groups:
         primary: "Ana Grup"
         no_primary: "(ana grup yok)"
@@ -2230,7 +2266,6 @@ tr_TR:
           details: "Yeni bir cevap oluşturulduğunda, düzenlendiğinde veya silindiğinde."
         user_event:
           name: "Kullanıcı Olayı"
-          details: "Bir kullanıcı oluşturulduğunda, onaylandığında veya güncellendiğinde"
         delivery_status:
           title: "Teslim Durumu"
           inactive: "Etkin Değil"
@@ -2345,6 +2380,7 @@ tr_TR:
         new_style: "Yeni Biçim"
         import: "İçeri Aktar"
         delete: "Sil"
+        delete_confirm: "Bu tema silinsin mi?"
         about: "Sitedeki CSS biçim sayfalarını ve HTML başlıklarını değiştir. Özelleştirme ekleyerek başla."
         color: "Renk"
         opacity: "Opaklık"
@@ -2357,6 +2393,32 @@ tr_TR:
           none_selected: "Düzenlemeye başlamak için bir e-posta şablonu seçin. "
           revert: "Değişiklikleri Geri Al"
           revert_confirm: "Değişikliklerinizi geri almak istediğinize emin misiniz?"
+        theme:
+          customize_desc: "Özelleştir:"
+          title: "Temalar"
+          edit: "Düzenle"
+          common: "Ortak"
+          desktop: "Masaüstü"
+          mobile: "Mobil"
+          preview: "Önizleme"
+          is_default: "Tema varsayılan olarak etkinleştirildi"
+          uploads: "Yüklemeler"
+          upload: "Yükle"
+          css_html: "Özel CSS/HTML"
+          edit_css_html: "CSS/HTML Düzenle"
+          about_theme: "Tema Hakkında"
+          license: "Lisans"
+          check_for_updates: "Güncellemeleri kontrol et"
+          updating: "Güncelleniyor..."
+          add: "Ekle"
+          scss:
+            text: "CSS"
+          header:
+            text: "Başlık"
+          after_header:
+            text: "Başlıktan Sonra"
+          footer:
+            text: "Alt Kısım"
         colors:
           title: "Renkler"
           long_title: "Renk Düzenleri"
@@ -2477,6 +2539,7 @@ tr_TR:
           block: "engelle"
           do_nothing: "hiçbir şey yapma"
         staff_actions:
+          all: "hepsi"
           title: "Görevli Eylemleri"
           clear_filters: "Hepsini Göster"
           staff_user: "Görevli Kullanıcı"
@@ -2511,8 +2574,6 @@ tr_TR:
             change_category_settings: "kategori ayarlarını değiştir"
             delete_category: "kategoriyi sil"
             create_category: "kategori oluştur"
-            block_user: "kullanıcıyı engelle"
-            unblock_user: "kullanıcı engelini kaldır"
             grant_admin: "yönetici yetkisi ver"
             revoke_admin: "yönetici yetkisini kaldır"
             grant_moderation: "moderasyon yetkisi ver"
@@ -2560,6 +2621,16 @@ tr_TR:
             title: "En az 'min_ban_entries_for_roll_up' adet giriş olduğu takdirde yeni subnet engelleme girişleri yaratır."
         logster:
           title: "Hata Kayıtları"
+      watched_words:
+        search: "ara"
+        clear_filter: "Temizle"
+        actions:
+          flag: 'Bildir'
+        form:
+          label: 'Yeni Kelime: '
+          add: 'Ekle'
+          upload: "Yükle"
+          upload_successful: "Yükleme başarılı oldu. Kelimeler eklendi."
       impersonate:
         title: "Rolüne gir"
         help: "Hata bulma ve giderme amaçları için, bu aracı kullanarak kullanıcının rolüne girin. İşiniz bitince sistemdne çıkış yapmanız gerekecek."
@@ -2579,7 +2650,6 @@ tr_TR:
           pending: "Bekleyen"
           staff: 'Görevli'
           suspended: 'Uzaklaştırılmış'
-          blocked: 'Engellenmiş'
           suspect: 'Kuşkulanılan'
         approved: "Onaylanmış mı?"
         approved_selected:
@@ -2598,7 +2668,6 @@ tr_TR:
           staff: "Görevli"
           admins: 'Yöneticiler'
           moderators: 'Moderatörler'
-          blocked: 'Engellenen Kullanıcılar'
           suspended: 'Uzaklaştırılmış Kullanıcılar'
           suspect: 'Kuşkulanılan Kullanıcılar'
         reject_successful:
@@ -2613,24 +2682,24 @@ tr_TR:
         suspend_failed: "Bu kullanıcı uzaklaştırılırken bir şeyler ters gitti {{error}}"
         unsuspend_failed: "Bu kullanıcının uzaklaştırması kaldırılırken bir şeyler ters gitti {{error}}"
         suspend_duration: "Kullanıcı ne kadar uzun bir süre için uzaklaştırılacak?"
-        suspend_duration_units: "(günler)"
         suspend_reason_label: "Neden uzaklaştırıyorsunuz? Buraya yazdıklarınız bu kullanıcının profil sayfasında <b>herkese gözükecek<b> ve sistemde oturum açtığı anda kullanıcıya gösterilecek. Lütfen yazıyı kısa tutun."
         suspend_reason: "Neden"
+        suspend_reason_placeholder: "Askıya alma sebebi"
+        suspend_message: "E Posta Mesajı"
         suspended_by: "Uzaklaştıran"
+        cant_suspend: "Bu kullanıcı askıya alınamaz."
         delete_all_posts: "Tüm gönderileri sil"
         delete_all_posts_confirm_MF: "{POSTS, plural, one {1 gönderi} other {# gönderi}} ve {TOPICS, plural, one {1 konu} other {# konu}} silmek üzeresiniz. Emin misiniz?"
-        suspend: "Uzaklaştır"
-        unsuspend: "Uzaklaştırmayı geri al"
-        suspended: "Uzaklaştırıldı mı?"
         moderator: "Moderatör mü?"
         admin: "Yönetici mi?"
-        blocked: "Engellendi mi?"
+        suspended: "Uzaklaştırıldı mı?"
         staged: "Aşamalı?"
         show_admin_profile: "Yönetici"
         refresh_browsers: "Tarayıcıyı sayfa yenilemesine zorla"
         refresh_browsers_message: "İleti tüm kullanıcılara gönderildi!"
         show_public_profile: "Herkese Açık Profili Görüntüle"
         impersonate: 'Rolüne gir'
+        action_logs: "İşlem Kayıtları"
         ip_lookup: "IP Arama"
         log_out: "Çıkış Yap"
         logged_out: "Kullanıcının tüm cihazlarda oturumu kapatılmış"
@@ -2638,8 +2707,8 @@ tr_TR:
         grant_admin: 'Yönetici Yetkisi Ver'
         revoke_moderation: 'Moderasyonu İptal Et'
         grant_moderation: 'Moderasyon Yetkisi Ver'
-        unblock: 'Engeli Kaldır'
-        block: 'Engelle'
+        unsuspend: 'Uzaklaştırmayı geri al'
+        suspend: 'Uzaklaştır'
         reputation: İtibar
         permissions: İzinler
         activity: Etkinlik
@@ -2683,17 +2752,13 @@ tr_TR:
         activate_failed: "Kullanıcı etkinleştirilirken bir sorun yaşandı."
         deactivate_account: "Hesabı Pasifleştir"
         deactivate_failed: "Kullanıcı deaktive edilirken bir sorun yaşandı."
-        unblock_failed: 'Kullanıcının engeli kaldırılırken bir sorun yaşandı.'
-        block_failed: 'Kullanıcı engellenirken bir sorun yaşandı.'
-        block_confirm: 'Bu kullanıcıyı engellemek istediğinize emin misiniz? Bunu yaparsanız yeni başlık ya da gönderi oluşturamayacak.'
-        block_accept: 'Evet, bu kullanıcıyı engelle'
         bounce_score: "Geri Sekme Skoru"
         reset_bounce_score:
           label: "Sıfırla"
           title: "Geri sekme skorunu 0'a çek"
+        visit_profile: "Profilini güncellemek için <a href='%{url}'>kullanıcı tercihleri sayfası</a> 'nı ziyaret edebilirsin"
         deactivate_explanation: "Deaktive edilmiş bir kullanıcı e-postasını tekrar doğrulamalı."
         suspended_explanation: "Uzaklaştırılmış kullanıcılar sistemde oturum açamaz."
-        block_explanation: "Engellenmiş bir kullanıcı gönderi oluşturamaz veya konu başlatamaz."
         staged_explanation: "Aşamalı bir kullanıcı sadece belirli konularda e-posta ile gönderide bulunabilir."
         bounce_score_explanation:
           none: "Bu e-posta adresinden yakın zamanda hiç geri sekme alınmadı."
@@ -2899,6 +2964,7 @@ tr_TR:
         sample: "Discourse konuları oluşturmak ve gömmek için aşağıdaki HTML kodunu sitenizde kullanın. <b>REPLACE_ME</b>'yi Discourse'u gömdüğünüz sayfanın tam URL'i ile değiştirin."
         title: "Gömme"
         host: "İzin Verilen Sunucular"
+        class_name: "Sınıf adı"
         path_whitelist: "Kabul edilen yol listesi"
         edit: "düzenle"
         category: "Kategoriye Gönder"
@@ -2943,8 +3009,6 @@ tr_TR:
       upload: "Yükle"
       uploading: "Yükleniyor..."
       quit: "Belki Sonra"
-      staff_count:
-        other: "Topluluğunuzda %{count} görevli üye var."
       invites:
         add_user: "ekle"
         none_added: "Herhangi bir görevli davet etmediniz. Devam etmek istediğinize emin misiniz?"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 6830ab3370..d2fcdb8f6d 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -67,16 +67,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,11 +251,6 @@ uk:
       add: "Додати"
       closed_group: Закрита Група
       selector_placeholder: "Додати учасників"
-      visible: "Група видна всім користувачам"
-      title:
-        one: "група"
-        few: "групи"
-        other: "групи"
       members: "Учасники"
       topics: "Теми"
       posts: "Дописи"
@@ -317,8 +312,6 @@ uk:
       profile: "Профіль"
       mute: "Mute"
       edit: "Редагувати налаштування"
-      download_archive:
-        button_text: "Завантажити мої дописи"
       new_private_message: "Нове повідомлення"
       private_message: "Повідомлення"
       private_messages: "Повідомлення"
@@ -345,7 +338,6 @@ uk:
       admin: "{{user}} є адміном"
       moderator_tooltip: "Цей користувач є модератором"
       admin_tooltip: "Цей користувач є адміністратором"
-      blocked_tooltip: "Цього користувача заблоковано"
       suspended_notice: "Цього користувача призупинено до {{date}}."
       suspended_reason: "Причина: "
       github_profile: "Github"
@@ -391,7 +383,6 @@ uk:
       change_username:
         title: "Зміна імені користувача"
         taken: "Даруйте, це ім'я користувача вже зайняте."
-        error: "Під час зміни імені користувача трапилася помилка."
         invalid: "Таке ім'я користувача не підійде. Воно має містити лише цифри та літери"
       change_email:
         title: "Зміна адреси електронної пошти"
@@ -549,7 +540,6 @@ uk:
     first_post: Перший допис
     mute: Mute
     unmute: Unmute
-    last_post: Останній допис
     signup_cta:
       sign_up: "Зареєструватись"
       hide_session: "Нагадати мені завтра"
@@ -678,19 +668,13 @@ uk:
       olist_title: "Нумерований список"
       ulist_title: "Маркований список"
       list_item: "Елемент списку"
-      heading_title: "Заголовок"
-      heading_text: "Заголовок"
-      hr_title: "Горизонтальна лінія"
       help: "Markdown Editing Help"
-      toggler: "показати або сховати панель редагування"
       modal_ok: "OK"
       modal_cancel: "Скасувати"
       admin_options_title: "Необов'язкові налаштування персоналу для цієї теми"
     notifications:
       more: "переглянути старіші сповіщення"
       total_flagged: "всього дописів, на які поскаржилися"
-      quoted: "<i title='Цитування' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      replied: "<i title='Відповідь від' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       alt:
         posted: "Опубліковано"
     upload_selector:
@@ -714,8 +698,6 @@ uk:
         title: Розширений пошук
         posted_by:
           label: Опубліковано
-        in_category:
-          label: У категорії
         in_group:
           label: У групі
         post:
@@ -870,7 +852,6 @@ uk:
       multi_select:
         select: 'вибрати'
         selected: 'вибрано ({{count}})'
-        select_replies: 'select +replies'
         delete: видалити вибрані
         cancel: скасувати вибір
         select_all: обрати усе
@@ -913,9 +894,6 @@ uk:
         undelete: "скасувати видалення цього допису"
         share: "поширити посилання на цей допис"
         more: "Більше"
-        delete_replies:
-          yes_value: "Так, відповіді також видалити"
-          no_value: "Ні, тільки цей допис"
         rebake: "Перебудувати HTML"
       actions:
         flag: 'Поскаржитися'
@@ -936,11 +914,6 @@ uk:
           bookmark: "Ви лишили тут закладку"
           like: "Ви це вподобали"
           vote: "Ви проголосували за цей допис"
-      delete:
-        confirm:
-          one: "Ви впевнені, що хочете видалити цей допис?"
-          few: "Ви впевнені, що хочете видалити всі ці дописи?"
-          other: "Ви впевнені, що хочете видалити всі ці дописи?"
       revisions:
         controls:
           first: "Перша версія"
@@ -1149,7 +1122,6 @@ uk:
         no_problems: "Не виявлено жодних проблем."
         moderators: 'Модератори:'
         admins: 'Адміни:'
-        blocked: 'Заблоковані:'
         suspended: 'Призупинені:'
         private_messages_short: "Пвдмл"
         private_messages_title: "Повідомлення"
@@ -1170,12 +1142,8 @@ uk:
         by: "від"
       flags:
         title: "Скарги"
-        old: "Старі"
-        active: "Активні"
         agree: "Погодитися"
         agree_title: "Підтвердити, що ця позначка дійсна та коректна"
-        agree_flag_modal_title: "Погодитися та..."
-        agree_flag: "Погодитися з позначкою"
         delete: "Видалити"
         delete_title: "Видалити допис, до якого відноситься ця позначка"
         delete_post_defer_flag_title: "Видалити допис; якщо допис перший, видалити тему"
@@ -1191,13 +1159,7 @@ uk:
         system: "System"
         error: "Щось трапилося"
         reply_message: "Відповісти"
-        no_results: "Скарг немає."
         topic_flagged: "This <strong>topic</strong> has been flagged."
-        summary:
-          action_type_8:
-            one: "спам"
-            few: "спаму: x{{count}}"
-            other: "спаму: x{{count}}"
       groups:
         primary: "Primary Group"
         no_primary: "(no primary group)"
@@ -1324,6 +1286,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 +1306,7 @@ uk:
           delete_confirm: "Видалити цю кольорову схему?"
           undo: "скасувати"
           undo_title: "Скасувати ваші зміни цього кольору з часу останнього збереження."
+          revert: "Повернути"
           primary:
             name: 'основний'
           secondary:
@@ -1349,6 +1324,7 @@ uk:
           success:
             name: 'успіх'
           love:
+            name: 'любов'
             description: "Колір кнопки \"Подобається\"."
       email:
         title: "Листів"
@@ -1419,6 +1395,8 @@ uk:
           block: "block"
           do_nothing: "do nothing"
         staff_actions:
+          all: "всі"
+          filter: "Filter:"
           title: "Дії персоналу"
           clear_filters: "Показати все"
           staff_user: "Член персоналу"
@@ -1439,6 +1417,8 @@ uk:
             change_trust_level: "зміна рівня довіри"
             change_username: "зміна імені користувача"
             change_site_setting: "зміна налаштування сайта"
+            change_theme: "змінити тему"
+            delete_theme: "видалити тему"
             change_site_text: "змінити текст сайту"
             suspend_user: "призупинення користувача"
             unsuspend_user: "скасування призупинення"
@@ -1451,12 +1431,12 @@ uk:
             change_category_settings: "змінити налаштування категорії"
             delete_category: "видалити категорію"
             create_category: "створити категорію"
-            block_user: "заблокувати користувача"
-            unblock_user: "розблокувати користувача"
             grant_admin: "зробити адміністратором"
             revoke_admin: "відкликати адміністраторство"
             grant_moderation: "зробити модератором"
             revoke_moderation: "відкликати модераторство"
+            deleted_tag: "видалити тег"
+            lock_trust_level: "заблокувати рівень довіри"
         screened_emails:
           title: "Screened Emails"
           description: "Коли хтось намагатиметься створити новий обліковий запис, наступні електронні скриньки буде перевірено, і реєстрацію заблоковано, або вжито якихось інших дій."
@@ -1480,6 +1460,15 @@ uk:
             ip_address: "IP-адреса"
             add: "Додати"
             filter: "Пошук"
+      watched_words:
+        search: "Пошук"
+        clear_filter: "Очистити"
+        actions:
+          block: 'Заблокувати'
+        form:
+          add: 'Додати'
+          success: 'Успіх'
+          upload: "Вивантажити"
       impersonate:
         not_found: "Цього користувача не вдалося знайти."
       users:
@@ -1487,6 +1476,7 @@ uk:
         create: 'Додати адміністратора'
         last_emailed: "Останній ел. лист"
         not_found: "Даруйте, такого імені користувача немає в нашій системі."
+        id_not_found: "Даруйте, користувача за таким номером немає в нашій системі."
         active: "Активний(а)"
         show_emails: "Показати електронну пошту"
         nav:
@@ -1495,7 +1485,6 @@ uk:
           pending: "Очікують"
           staff: 'Персонал'
           suspended: 'Призупинені'
-          blocked: 'Заблоковані'
         approved: "Схвалено?"
         titles:
           active: 'Активні користувачі'
@@ -1506,25 +1495,21 @@ uk:
           staff: "Персонал"
           admins: 'Адміністратори'
           moderators: 'Модератори'
-          blocked: 'Заблоковані користувачі'
           suspended: 'Призупинені користувачі'
+        not_verified: "Не підтверджений"
         check_email:
           text: "Показати"
       user:
         suspend_failed: "Щось трапилося під час призупинення цього користувача: {{error}}"
         unsuspend_failed: "Щось трапилося під час скасування призупинення цього користувача: {{error}}"
         suspend_duration: "На який термін призупинити діяльність цього користувача?"
-        suspend_duration_units: "(днів)"
         suspend_reason_label: "Чому Ви призупиняєте цього користувача? Цей текст <b>буде видимим для всіх</b> на сторінці профілю цього користувача, і його буде показано користувачу при спробі увійти в систему. Будьте лаконічні."
         suspend_reason: "Причина"
         suspended_by: "Призупинено"
         delete_all_posts: "Видалити всі дописи"
-        suspend: "Призупинити"
-        unsuspend: "Скасувати призупинення"
-        suspended: "Призупинено?"
         moderator: "Модератор?"
         admin: "Адмін?"
-        blocked: "Заблоковано?"
+        suspended: "Призупинено?"
         show_admin_profile: "Адмін"
         refresh_browsers: "Примусово оновити оглядач"
         refresh_browsers_message: "Повідомлення надіслано всім клієнтам!"
@@ -1537,8 +1522,8 @@ uk:
         grant_admin: 'Зробити адміністратором'
         revoke_moderation: 'Відкликати модераторство'
         grant_moderation: 'Зробити модератором'
-        unblock: 'Розблокувати'
-        block: 'Заблокувати'
+        unsuspend: 'Скасувати призупинення'
+        suspend: 'Призупинити'
         reputation: Репутація
         permissions: Дозволи
         activity: Активність
@@ -1569,15 +1554,10 @@ uk:
         activate_failed: "Під час активації користувача сталася помилка."
         deactivate_account: "Деактивувати обліковий запис"
         deactivate_failed: "Під час деактивації користувача сталася помилка."
-        unblock_failed: 'Під час розблокування користувача сталася помилка.'
-        block_failed: 'Під час блокування користувача сталася помилка.'
-        block_confirm: 'Ви впевнені, що хочете заблокувати цього користувача? Вони не зможуть створювати будь-які нові теми або дописи.'
-        block_accept: 'Так, заблокувати цього користувача'
         reset_bounce_score:
           label: "Скинути"
         deactivate_explanation: "Деактивований користувач має повторно підтвердити свою електронну скриньку."
         suspended_explanation: "Призупинений користувач не може увійти."
-        block_explanation: "Заблокований користувач не може дописувати і розпочинати теми."
         trust_level_change_failed: "Під час зміни Рівня довіри користувача трапилася помилка."
         suspend_modal_title: "Призупинити користувача"
         trust_level_2_users: "Користувачі з Рівнем довіри 2"
@@ -1613,6 +1593,7 @@ uk:
           confirm: 'Підтвердження'
       site_text:
         edit: 'редагувати'
+        revert: "Повернути зміни"
         go_back: "Повернутись до пошуку"
         show_overriden: 'Показувати тільки перевизначені'
       site_settings:
@@ -1643,9 +1624,14 @@ uk:
           uncategorized: 'Інше'
           backups: "Backups"
           login: "Вхід"
+          plugins: "Плагіни"
           user_preferences: "Налаштування"
+          tags: "Теги"
           search: "Пошук"
+          groups: "Групи"
       badges:
+        title: Значки
+        new_badge: Новий значок
         new: Новий
         name: Ім'я
         badge: Значок
@@ -1711,7 +1697,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 c7491bead3..0b2bdf21a2 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,13 +355,9 @@ ur:
       bio: "گروپ کے بارے میں"
       selector_placeholder: "ممبران شامل کریں"
       owner: "مالِک"
-      visible: "گروپ تمام صارفین کو دکھائی دے"
       index:
         title: "گروپس"
         empty: "کوئی نظر آنے والے گروپ موجود نہیں ہیں۔"
-      title:
-        one: "گروپ"
-        other: "گروپس"
       activity: "سرگرمی"
       members: "ممبران"
       topics: "ٹاپک"
@@ -373,7 +365,6 @@ ur:
       mentions: "ذکر"
       messages: "پیغامات"
       alias_levels:
-        title: "کون اِس گروپ کو پیغام بھیج سکتا اور@زکر کرسکتا ہے؟"
         nobody: "کوئی بھی نہیں"
         only_admins: "صرف منتظمین"
         mods_and_admins: "صرف ثالث اور منتظمین"
@@ -442,10 +433,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 +445,7 @@ ur:
       organisation: ادارہ
       phone: فون
       other_accounts: "اسی IP ایڈریس والے دوسرے اکاؤنٹس:"
-      delete_other_accounts: "%{شمار} حذف کریں"
+      delete_other_accounts: "%{count} حذف کریں"
       username: "صارف کا نام"
       trust_level: "TL"
       read_time: "پڑھنے کیلئے اِستعمال ہونے والا وقت"
@@ -464,12 +455,11 @@ ur:
     user_fields:
       none: "(ایک آپشن منتخب کریں)"
     user:
-      said: "{{صارف کا نام}}:"
+      said: "{{username}}:"
       profile: "پروفائل"
       mute: "خاموش کردیں"
       edit: "ترجیحات میں ترمیم کردیں"
       download_archive:
-        button_text: "میری پوسٹس ڈاؤن لوڈ کریں"
         confirm: "کیا آپ واقعی اپنی پوسٹس ڈاؤن لوڈ کرنا چاہتے ہیں؟"
         success: "ڈاؤن لوڈ کا آغاز کر دیا گیا ہے، عمل مکمل ہونے پر آپ کو پیغام کے ذریعے مطلع کر دیا جائے گا۔"
         rate_limit_error: "پوسٹس فی دن ایک بار ہی ڈاؤن لوڈ کی جا سکتی ہیں،  براہ مہربانی کل دوبارہ کوشش کریں۔"
@@ -502,12 +492,11 @@ 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 +575,6 @@ ur:
         title: "صارف کا نام تبدیل کریں"
         confirm: "اگر آپ اپنا صارف نام تبدیل کرتے ہیں تو آپ کی پوسٹوں کی پچھلی تمام اقتباسات اور @نام زکر ٹوٹ جائیں گے۔ کیا آپ واقعی یہ کرنا چاہتے ہیں؟"
         taken: "معذرت، یِہ صارف نام پہلے سے لیا جاچکا ہے۔"
-        error: "آپ کا صارف نام تبدیل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
         invalid: "یہ صارف نام غلط ہے۔ اِس میں صرف ہندسوں اور حروف کو شامل کیا جا سکتا ہے"
       change_email:
         title: "اِی میل تبدیل کریں"
@@ -620,7 +608,7 @@ ur:
         frequency_immediately: "جس بارے میں ہم آپ کو اِی میل کر رہے ہیں، اگر آپ نے نہیں پڑھی ہوئی تو ہم فوری طور پر آپ کو اِی میل کریں گے۔"
         frequency:
           one: "ہم آپ کو اِی میل کریں گے صرف اُس صور میں کہ ہم نے آپ کو گزشتہ ایک منٹ میں نہ دیکھا ہو۔"
-          other: "ہم آپ کو اِی میل کریں گے صرف اُس صور میں کہ ہم نے آپ کو گزشتہ {{شمار}} منٹ میں نہ دیکھا ہو۔"
+          other: "ہم آپ کو اِی میل کریں گے صرف اُس صور میں کہ ہم نے آپ کو گزشتہ {{count}} منٹ میں نہ دیکھا ہو۔"
       name:
         title: "نام"
         instructions: "آپ کا پورا نام (اختیاری)"
@@ -630,9 +618,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 +697,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 +733,7 @@ ur:
         same_as_username: "آپ کا پاسورڈ  وہی ہے جو آپ کا صارف نام ہے۔"
         same_as_email: "آپ کا پاسورڈ وہی ہے جو آپ کا اِی میل ہے۔"
         ok: "آپ کا پاسورڈ صحیح لگ رہا ہے"
-        instructions: "کم از کم {شمار} حروف"
+        instructions: "کم از کم %{count} حروف"
       summary:
         title: "خلاصہ"
         stats: "اعدادوشمار"
@@ -756,12 +744,6 @@ ur:
         post_count:
           one: "بنائی گئی پوسٹ"
           other: "بنائی گئیں پوسٹ"
-        likes_given:
-          one: "<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> موصول ہوئے"
         days_visited:
           one: "دن جس میں دورہ کیا گیا"
           other: "دن جن میں دورہ کیا گیا"
@@ -815,7 +797,7 @@ ur:
       desc:
         network: " براہِ مہربانی اپنا کنکشن چیک کریں"
         network_fixed: "لگتا ہے یہ وآپس آ گیا"
-        server: "خرابی کوڈ: {{اسٹیٹس}}"
+        server: "خرابی کوڈ: {{status}}"
         forbidden: "آپ کو یہ دیکھنے کی اجازت نہیں ہے۔"
         not_found: "افوہ، ایپلیکیشن نے ایک ایسے URL کو لوڈ کرنے کی کوشش جو غیر موجود ہے۔"
         unknown: "کچھ غلط ہو گیا۔"
@@ -839,7 +821,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: 'کُل ٹاپک بنائے گئے'
@@ -853,7 +835,6 @@ ur:
     first_post: پہلی پوسٹ
     mute: خاموش کریں
     unmute: آواز چالو کریں
-    last_post: آخری پوسٹ
     last_reply_lowercase: آخری جواب
     replies_lowercase:
       one: جواب
@@ -879,8 +860,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 +878,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 +938,6 @@ ur:
       your_email: "آپ کے اکاؤنٹ کا اِیمیل ایڈریس <b>٪{اِیمیل}</b> ہے۔"
       accept_invite: "دعوت قبول کریں"
       success: "آپ کا اکاؤنٹ بنا دیا گیا ہے اور اب آپ لاگ اِن کر سکتے ہیں۔"
-      password_label: "پاسورڈ مقرر کریں (اختیاری)"
     password_reset:
       continue: "{SITE_NAME}٪ پر جاری رکھیں"
     emoji_set:
@@ -990,15 +970,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> بٹن اِستعمال کیا ہے؟'
@@ -1045,15 +1025,10 @@ ur:
       olist_title: "نمبروار فہرست"
       ulist_title: "بلٹ والی لسٹ"
       list_item: "فہرست آئٹم"
-      heading_label: "H"
-      heading_title: "سرخی"
-      heading_text: "سرخی"
-      hr_title: "افقی لکیر"
       help: "مارکڈائون ترمیم میں مدد"
-      toggler: "کمپوزر پینل چھپائیں یا دکھائیں"
       modal_ok: "ٹھیک"
       modal_cancel: "منسوخ"
-      cant_send_pm: "معذرت، آپ ٪{صارف نام} کو پیغام نہیں بھیج سکتے۔"
+      cant_send_pm: "معذرت، آپ ٪{username} کو پیغام نہیں بھیج سکتے۔"
       yourself_confirm:
         title: "کیا آپ وصول کنندگان کو شامل کرنا بھول گئے؟"
         body: "اِس وقت یہ پیغام صرف اپنے آپ کو بھیجا جا رہا ہے!"
@@ -1064,28 +1039,6 @@ 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>"
-      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>"
-      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>"
       alt:
         mentioned: "کی طرف سے ذکر کیا گیا"
         quoted: "کی طرف سے اقتباس کیا گیا"
@@ -1102,13 +1055,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: "ایک تصویر یا ایک فائل شامل کریں"
@@ -1132,43 +1085,32 @@ ur:
       select_all: "تمام منتخب کریں"
       clear_all: "تمام کو صاف کریں"
       too_short: "آپ کا سَرچ ٹَرم بہت مختصر ہے۔"
-      result_count:
-        one: "<span class='term'>\"{{term}}\"</span> کیلئیے 1 نتیجہ"
-        other: "<span class='term'>\"{{term}}\"</span> کیلئیے {{شمار}} نتائج"
       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:
         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: جو وِیکی ہو
         statuses:
@@ -1211,7 +1153,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 +1167,7 @@ ur:
         latest: "کوئی تازہ ٹاپک موجود نہیں ہیں۔ یہ اداس کر دینے والی بات ہے۔"
         hot: "کوئی مشہور ٹاپک موجود نہیں ہیں۔"
         bookmarks: "ابھی تک آپ کے بُک مارک کیے ہوے کوئی ٹاپک نہیں ہیں۔"
-        category: "کوئی {{زمرے}} کے ٹاپک موجود نہیں ہیں۔"
+        category: "کوئی {{category}} کے ٹاپک موجود نہیں ہیں۔"
         top: "کوئی ٹاپ ٹاپک موجود نہیں ہیں۔"
         search: "سرچ کے کوئی نتائج نہیں ہیں۔"
         educate:
@@ -1238,17 +1180,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 +1205,10 @@ ur:
       unread: 'بغیر پڑھے'
       new_topics:
         one: '1 نیا ٹاپک'
-        other: '{{شمار}} نئے ٹاپک'
+        other: '{{count}} نئے ٹاپک'
       unread_topics:
         one: '1 بغیر پڑھا گیا ٹاپک'
-        other: '{{شمار}} بغیر پڑھے گئے ٹاپک'
+        other: '{{count}} بغیر پڑھے گئے ٹاپک'
       title: 'ٹاپک'
       invalid_access:
         title: "ٹاپک نجی ہے"
@@ -1280,16 +1222,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 +1247,7 @@ ur:
       auto_close_title: 'خود کار طریقے سے بند کر نے کی سیٹِنگ'
       auto_close_immediate:
         one: "ٹاپک کی آخری پوسٹ ابھی سے 1 گھنٹا پرانی ہے، اِسلیئے ٹاپک فوری طور پر بند کر دیا جائے گا۔"
-        other: "ٹاپک کی آخری پوسٹ ابھی سے ٪{شمار} گھنٹے پرانی ہے، اِسلیئے ٹاپک فوری طور پر بند کر دیا جائے گا۔"
+        other: "ٹاپک کی آخری پوسٹ ابھی سے ٪{count} گھنٹے پرانی ہے، اِسلیئے ٹاپک فوری طور پر بند کر دیا جائے گا۔"
       timeline:
         back: "واپس"
         back_description: "آپنی آخری بغیر پڑھی پوسٹ پر واپس جائیں"
@@ -1316,9 +1258,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 +1342,7 @@ ur:
       feature_topic:
         title: "اس ٹاپک کو نمایاں کریں"
         pin: "اِس ٹاپک کو {{categoryLink}} زمرہ کے سب سے اُپر ظاہر کریں جب تک کہ"
-        confirm_pin: "آپ کے پاس پہلے سے ہی {{شمار}} پِن ہوے وے ٹاپک ہیں۔ بہت سارے پِن ہوے وے ٹاپک نئے اور گمنام صارفین کے لئے ایک بوجھ ثابت ہو سکتے ہیں۔ کیا آپ واقعی اِس زمرہ میں ایک اور ٹاپک پِن کرنا چاہتے ہیں؟"
+        confirm_pin: "آپ کے پاس پہلے سے ہی {{count}} پِن ہوے وے ٹاپک ہیں۔ بہت سارے پِن ہوے وے ٹاپک نئے اور گمنام صارفین کے لئے ایک بوجھ ثابت ہو سکتے ہیں۔ کیا آپ واقعی اِس زمرہ میں ایک اور ٹاپک پِن کرنا چاہتے ہیں؟"
         unpin: "اِس ٹاپک کو {{categoryLink}} زمرہ کے سب سے اُپر ظاہر کرنے سے ہٹائیں"
         unpin_until: "اِس ٹاپک کو {{categoryLink}} زمرہ کے سب سے اُپر ظاہر کرنے سے ہٹائیں یا <strong>%{until}</strong> تک اِنتظار کریں۔"
         pin_note: "صارفین خود سے انفرادی طور پر ٹاپک سے پن ہٹا سکتے ہیں۔"
@@ -1408,16 +1350,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 +1396,7 @@ ur:
       filters:
         n_posts:
           one: "1 پوسٹ"
-          other: "{{شمار}} پوسٹس"
+          other: "{{count}} پوسٹس"
         cancel: "فِلٹر ہٹائیں"
       split_topic:
         title: "نئے ٹاپک پر منتقل کریں"
@@ -1463,14 +1405,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 +1425,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,22 +1434,20 @@ ur:
         instructions: "براہ مہربانی ٹاپک کیلیئے نیا ٹائمسٹیمپ منتخب کریں۔ وقت کا فرق برابر رکھنے کیلیے ٹاپک میں پوسٹس کو اَپ ڈیٹ کر دیا جائے گا۔"
       multi_select:
         select: 'منتخب'
-        selected: 'منتخب کیے گئے ({{شمار}})'
-        select_replies: 'منتخب+جوابات'
+        selected: 'منتخب کیے گئے ({{count}})'
         delete: منتخب کیے ہوں کو حذف کریں
         cancel: انتخاب کرنا منسوخ کریں
         select_all: تمام منتخب کریں
         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 +1457,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: "معذرت، آپ کی پوسٹ ترمیم کرنے میں ایک خرابی کا سامنا کرنا پڑا۔  براہ مہربانی دوبارہ کوشش کریں۔"
@@ -1572,12 +1512,6 @@ ur:
         undelete: " اِس پوسٹ کو واپس لائیں"
         share: "اس پوسٹ کا لنک شیئرکریں"
         more: "مزید "
-        delete_replies:
-          confirm:
-            one: "کیا آپ اِس پوسٹ پر براہِ راست جواب حذف کرنا چاہتے ہیں؟"
-            other: "کیا آپ اِس پوسٹ پر {{شمار}} براہِ راست جوابات حذف کرنا چاہتے ہیں؟"
-          yes_value: "جی ہاں، جوابات کو بھی حذف کردیں"
-          no_value: "نہیں، صرف یہ پوسٹ"
         admin: "پوسٹ ایڈمن کے ایکشن"
         wiki: "وِیکی بنائیں"
         unwiki: "وِیکی ختم کریں"
@@ -1588,9 +1522,6 @@ ur:
         change_owner: "پوسٹس کے مالک کو تبدیل کریں"
       actions:
         flag: 'فلَیگ'
-        defer_flags:
-          one: "فلَیگ ملتوی کریں"
-          other: "فلَیگز ملتوی کریں"
         undo:
           off_topic: "فلَیگ کالعدم کریں"
           spam: "فلَیگ کالعدم کریں"
@@ -1619,61 +1550,53 @@ 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: "{{شمار}} لوگوں نے اِس پوسٹ کے لیے ووٹ کیا"
-      delete:
-        confirm:
-          one: "کیا آپ واقعی اِس پوسٹ کو حذف کرنا چاہتے ہیں؟"
-          other: "کیا آپ واقعی اِن تمام پوسٹس کو حذف کرنا چاہتے ہیں؟"
-      merge:
-        confirm:
-          one: "کیا آپ واقعی ان پوسٹس کو ضم کرنا چاہتے ہیں؟"
-          other: "کیا آپ واقعی ان {{شمار}} پوسٹس کو ضم کرنا چاہتے ہیں؟"
+            other: "{{count}} لوگوں نے اِس پوسٹ کے لیے ووٹ کیا"
       revisions:
         controls:
           first: "پہلی رَوِیژن"
@@ -1718,8 +1641,6 @@ ur:
       settings: 'سیٹِنگ'
       topic_template: "ٹاپک ٹَیمپلیٹ"
       tags: "ٹیگز"
-      tags_allowed_tags: "ٹیگز جو صرف اِس زمرہ میں استعمال کیے جا سکتے ہیں:"
-      tags_allowed_tag_groups: "ٹیگ گروپس جو صرف اِس زمرہ میں استعمال کیے جا سکتے ہیں:"
       tags_placeholder: "(اختیاری) اجازت والے ٹیگز کی فہرست"
       tag_groups_placeholder: "(اختیاری) اجازت والے ٹیگ گروپس کی فہرست"
       topic_featured_link_allowed: "اس زمرہ میں نمایاں لنکس کو اجازت دیں"
@@ -1829,13 +1750,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 +1768,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 +1797,7 @@ ur:
       invisible:
         help: "یہ ٹاپک غیر کسی فہرست میں نہیں ہے؛ یہ ٹاپکس کی فہرست میں ظاہر نہیں ہو گا، اور صرف ایک براہ راست لنک کے ذریعے اِس تک رسائی ہو سکے گی"
     posts: "پوسٹس"
-    posts_long: "اِس ٹاپک میں {{نمبر}} پوسٹس ہیں"
+    posts_long: "اِس ٹاپک میں {{number}} پوسٹس ہیں"
     posts_likes_MF: |
       یہاِس ٹاپک کی کیا ہے {شمار، جمع، ایک {1 جواب} دیگر {# جوابات}} {تناسب، منتخب،
       کم {لائیک پر پوسٹ کے اونچے تناسب کے ساتھ}
@@ -1911,12 +1832,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 +1856,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 +1881,7 @@ ur:
         title: "{{categoryName}}"
         title_with_count:
           one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{شمار}})"
+          other: "{{categoryName}} ({{count}})"
         help: "{{categoryName}} زمرہ میں تازہ تریں ٹاپک"
       top:
         title: "سب سے اوپر"
@@ -2018,7 +1939,6 @@ ur:
         hamburger_menu: '<b>=</b> ہیمبرگر مینو کھولیں'
         user_profile_menu: '<b>p</b> صارف مینو کھولیں'
         show_incoming_updated_topics: 'اَپ ڈیٹ ہوے ٹاپک دکھائیں'
-        search: '<b>/</b> سرچ'
         help: '<b>?</b> کیبورڈ مدد کھولیں'
         dismiss_new_posts: '<b>x</b>، <b>r</b> برخاست کریں نئے/پوسٹس'
         dismiss_topics: '<b>x</b>، <b>t</b> ٹاپک برخاست کریں'
@@ -2046,19 +1966,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:
@@ -2087,9 +2007,7 @@ ur:
       selector_no_tags: "کوئی ٹیگ نہیں"
       changed: "تبدیل کیے گئے ٹیگ:"
       tags: "ٹیگز"
-      choose_for_topic: "اِس ٹاپک کے لئے اختیاری ٹیگز منتخب کریں"
       delete_tag: "ٹیگ حذف کریں"
-      delete_confirm: "کیا آپ واقعی اِس ٹیگ کو حذف کرنا چاہتے ہیں؟"
       rename_tag: "ٹیگ کا نام تبدیل کریں"
       rename_instructions: "ٹیگ کے لیے نئے نام کا انتخاب کریں:"
       sort_by: "ترتیب بہ:"
@@ -2099,9 +2017,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: "نظر رکھی ہوئی ہے"
@@ -2184,7 +2102,6 @@ ur:
         no_problems: "کوئی مسائل نہیں پائے گئے۔"
         moderators: 'ماڈریٹرز:'
         admins: 'ایڈمن:'
-        blocked: 'بلاک کردہ:'
         suspended: 'معطل کردہ:'
         private_messages_short: "پغم"
         private_messages_title: "پیغامات"
@@ -2217,24 +2134,12 @@ ur:
         by: "تک"
       flags:
         title: "فلَیگز"
-        old: "پرانے"
-        active: "فعال"
         agree: "اتفاق کریں"
         agree_title: "اِس فلَیگ کے درست اور صحیح ہونے کی تصدیق کریں"
-        agree_flag_modal_title: "اتفاق کریں اور..."
-        agree_flag_hide_post: "اتفاق کریں (پوسٹ چھپائیں + PM بھیجیں)"
-        agree_flag_hide_post_title: "اِس پوسٹ کو چھپائیں اور صارف کو اِس میں ترمیم کرنے پر زور ڈالنے کیلئے پیغام بھیجیں"
-        agree_flag_restore_post: "اتفاق کریں (پوسٹ بحال کریں)"
-        agree_flag_restore_post_title: "اِس پوسٹ کو بحال کریں"
-        agree_flag: "فلَیگ کے ساتھ اتفاق کریں"
-        agree_flag_title: "فلَیگ کے ساتھ اتفاق کریں اور پوسٹ کو ویسا ہی رہنے دیں"
-        defer_flag: "ملتوی کریں"
         defer_flag_title: "اس فلَیگ کو ہٹا دیں؛ اِسے اِس وقت کسی کارروائی کی ضرورت نہیں۔"
         delete: "حذف کریں"
         delete_title: "یہ فلَیگ جس پوسٹ سے متعلق ہے اُسے حذف کریں۔"
-        delete_post_defer_flag: "پوسٹ حذف اور فلَیگ ملتوی کریں"
         delete_post_defer_flag_title: "پوسٹ حذف کریں؛ اگر پہلی پوسٹ، تو ٹاپک بھی ساتھ حذف کریں"
-        delete_post_agree_flag: "پوسٹ حذف کریں اور فلَیگ کے ساتھ اتفاق کریں"
         delete_post_agree_flag_title: "پوسٹ حذف کریں؛ اگر پہلی پوسٹ، تو ٹاپک بھی ساتھ حذف کریں"
         delete_flag_modal_title: "حذف کریں اور..."
         delete_spammer: "سپیم کرنے والے کو حذف کریں"
@@ -2249,34 +2154,16 @@ ur:
         dispositions:
           agreed: "اتفاق کیا"
           disagreed: "اختلاف کیا"
-          deferred: "ملتوی کیا"
         flagged_by: "کی طرف سے فلَیگ کیا گیا"
         resolved_by: "کی طرف سے حل کیا گیا"
         took_action: "کارروائی کی"
         system: "سِسٹَم"
         error: "کچھ غلط ہو گیا"
         reply_message: "جواب"
-        no_results: "کوئی فلَیگز موجود نہیں ہیں۔"
         topic_flagged: "اِس <strong>ٹاپک</strong> کو فلَیگ کر دیا گیا ہے۔"
         visit_topic: "کارروائی کرنے کیلئے ٹاپک کو وزٹ کریں"
         was_edited: "پہلے فلَیگ کے بعد پوسٹ میں ترمیم ہوئی تھی"
-        previous_flags_count: "اس پوسٹ کو پہلے ہی سے {{شمار}} دفعہ فلَیگ کیا جا چکا ہے۔"
-        summary:
-          action_type_3:
-            one: "موضوع سے ہٹ کر"
-            other: "موضوع سے ہٹ کر x{{شمار}}"
-          action_type_4:
-            one: "نامناسب"
-            other: "نامناسب x{{شمار}}"
-          action_type_6:
-            one: "اپنی مرضی کا"
-            other: "اپنی مرضی کا x{{شمار}}"
-          action_type_7:
-            one: "اپنی مرضی کا"
-            other: "اپنی مرضی کا x{{شمار}}"
-          action_type_8:
-            one: "سپَیم"
-            other: "سپَیم x{{شمار}}"
+        previous_flags_count: "اس پوسٹ کو پہلے ہی سے {{count}} دفعہ فلَیگ کیا جا چکا ہے۔"
       groups:
         primary: "پرائمری گروپ"
         no_primary: "(کوئی پرائمری گروپ نہیں)"
@@ -2290,7 +2177,7 @@ ur:
         delete: "حذف کریں"
         delete_confirm: "اِس گروپ کو حذف کریں؟"
         delete_failed: "گروپ کو حذف کرنے میں ناکام۔ اگر یہ ایک خودکار گروپ ہے تو اسے ختم نہیں کیا جا سکتا۔"
-        delete_owner_confirm: "'٪{صارف نام}' کے لیے مالک کے استحقاق کو ہٹائیں؟"
+        delete_owner_confirm: "'٪{username}' کے لیے مالک کے استحقاق کو ہٹائیں؟"
         add: "شامل کریں"
         add_members: "اراکین شامل کریں"
         custom: "اپنی مرضی کا"
@@ -2362,7 +2249,6 @@ ur:
           details: "جب ایک نیا جواب، ترمیم، حذف یا رِِیکور کیا جائے۔"
         user_event:
           name: "صارف واقعہ"
-          details: "جب ایک صارف بنایا، منظور یا اَپ ڈیٹ کیا جاتا ہے۔"
         delivery_status:
           title: "موصول ہونے کی آگاہی"
           inactive: "غیر فعال"
@@ -2373,10 +2259,10 @@ ur:
           redeliver: "دوبارہ ڈیلیور کریں"
           incoming:
             one: "ایک نیا واقعہ موجود ہے۔"
-            other: "{{شمار}} نئے واقعات موجود ہیں۔"
+            other: "{{count}} نئے واقعات موجود ہیں۔"
           completed_in:
             one: "1 سیکنڈ میں مکمل ہوا۔"
-            other: "{{شمار}} سیکنڈ میں مکمل ہوا۔"
+            other: "{{count}} سیکنڈ میں مکمل ہوا۔"
           request: "ریکویسٹ"
           response: "جواب"
           redeliver_confirm: "کیا آپ واقعی وہی پَیلوڈ دوبارہ ڈیلیور کرنا چاہتے ہیں؟"
@@ -2647,8 +2533,6 @@ ur:
             change_category_settings: "زمرہ جات کی سیٹِنگ تبدیل کریں"
             delete_category: "زمرہ حذف کریں"
             create_category: "زمرہ بنائیں"
-            block_user: "صارف بلاک کریں"
-            unblock_user: "صارف پر بلاک ختم کریں"
             grant_admin: "اَیڈمِن عطا کریں"
             revoke_admin: "اَیڈمِن منسوخ کریں"
             grant_moderation: "ماڈرَیشَن عطا کریں"
@@ -2715,15 +2599,14 @@ ur:
           pending: "زیرِاِلتوَاء"
           staff: 'سٹاف'
           suspended: 'معطل کردہ'
-          blocked: 'بلاک کردہ'
           suspect: 'مشتبہ'
         approved: "منظورشدہ؟"
         approved_selected:
           one: "صارف منظور کریں"
-          other: "صارفین منظور کریں ({{شمار}})"
+          other: "صارفین منظور کریں ({{count}})"
         reject_selected:
           one: "صارف مسترد کریں"
-          other: "صارفین مسترد کریں ({{شمار}})"
+          other: "صارفین مسترد کریں ({{count}})"
         titles:
           active: 'متحرک صارفین'
           new: 'نئے صارفین'
@@ -2736,15 +2619,14 @@ ur:
           staff: "سٹاف"
           admins: 'ایڈمِن صارفین'
           moderators: 'ماڈریٹرز'
-          blocked: 'بلاک کردہ صارفین'
           suspended: 'معطل کردہ صارفین'
           suspect: 'مشتبہ صارفین'
         reject_successful:
           one: "کامیابی کے ساتھ 1 صارف کو مسترد کیا۔"
-          other: "کامیابی کے ساتھ ٪{شمار} صارفین کو مسترد کیا۔"
+          other: "کامیابی کے ساتھ ٪{count} صارفین کو مسترد کیا۔"
         reject_failures:
           one: "1 صارف کو مسترد کرنے میں ناکامی۔"
-          other: "٪{شمار} صارفین کو مسترد کرنے میں ناکامی۔"
+          other: "٪{count} صارفین کو مسترد کرنے میں ناکامی۔"
         not_verified: "غیر تصدیق شدہ"
         check_email:
           title: "اِس صارف کا اِیمیل ایڈریس ظاہر کریں"
@@ -2753,18 +2635,14 @@ ur:
         suspend_failed: "اِس صارف کو معطل کرتے ہوے کچھ غلط ہو گیا {{error}}"
         unsuspend_failed: "اِس صارف کی معطلی ختم کرتے ہوے کچھ غلط ہو گیا {{error}}"
         suspend_duration: "صارف کب تک معطل رہے گا؟"
-        suspend_duration_units: "(دن)"
         suspend_reason_label: "آپ معطل کیوں کر رہے ہیں؟ یہ ٹَیکسٹ اِس صارف کے پروفائل پیج پر <b>ہر کسی کے لیے ظاہر ہو گا</b>، اور جب صارف لاگ اِن کرنے کی کوشش کریں گے تو اُنہیں دکھایا جائے گا۔ اِسے مختصر رکھیں۔"
         suspend_reason: "وجہ"
         suspended_by: "کی طرف سے معطل کیا گیا"
         delete_all_posts: "تمام پوسٹس حذف کریں"
         delete_all_posts_confirm_MF: "آپ {POSTS، جمع، ایک {1 پوسٹ} دیگر {# posts}} اور {TOPICS، جمع، ایک {1 ٹاپک} دیگر {# topics}} حذف کرنے والے ہیں۔ کیا آپ کو یقین ہے؟"
-        suspend: "معطل کریں"
-        unsuspend: "معطلی ختم کریں"
-        suspended: "معطل کردہ؟"
         moderator: "ماڈریٹر؟"
         admin: "ایڈمن؟"
-        blocked: "بلاک کردہ؟"
+        suspended: "معطل کردہ؟"
         staged: "سٹَیجڈ؟"
         show_admin_profile: "ایڈمن"
         refresh_browsers: "براؤزر رِیفریش فورس کریں"
@@ -2779,8 +2657,8 @@ ur:
         grant_admin: 'اَیڈمِن عطا کریں'
         revoke_moderation: 'ماڈرَیشَن منسوخ کریں'
         grant_moderation: 'ماڈرَیشَن عطا کریں'
-        unblock: 'بلاک ختم کریں'
-        block: 'بلاک کریں'
+        unsuspend: 'معطلی ختم کریں'
+        suspend: 'معطل کریں'
         reputation: ساکھ
         permissions: اجازتیں
         activity: سرگرمی
@@ -2807,14 +2685,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: "صرف حذف کریں"
@@ -2827,17 +2705,12 @@ ur:
         activate_failed: "صارف فعال کرنے میں ایک مسئلہ پیش آیا۔"
         deactivate_account: "اکاؤنٹ غیر فعال کریں"
         deactivate_failed: "صارف کو غیر فعال کرنے میں ایک مسئلہ پیش آیا۔"
-        unblock_failed: 'صارف کو بلاک سے ہٹانے میں ایک مسئلہ پیش آیا۔'
-        block_failed: 'صارف کو بلاک کرنے میں ایک مسئلہ پیش آیا۔'
-        block_confirm: 'کیا آپ واقعی اِس صارف کو بلاک کرنا چاہتے ہیں؟ وہ کوئی بھی نئے ٹاپک یا پوسٹ  نہیں بنا سکیں گے۔'
-        block_accept: 'جی ہاں، اِس صارف کو بلاک کریں'
         bounce_score: "بائونس سکور"
         reset_bounce_score:
           label: "رِی سَیٹ"
           title: "بائونس سکور واپس 0 پر رِی سَیٹ کریں"
         deactivate_explanation: "ایک غیر فعال صارف کو اپنا اِیمیل دوبارہ تصدیق کرنا ضروری ہے۔"
         suspended_explanation: "کوئی معطل صارف لاگ اِن نہیں کر سکتا۔"
-        block_explanation: "ایک بلاک ہوا صارف پوسٹ شائع یا ٹاپک شروع نہیں کر سکتا۔"
         staged_explanation: "ایک سٹَیجڈ صارف صرف مخصوص ٹاپکس پر اِیمیل کے ذریعے پوسٹ کر سکتا ہے۔"
         bounce_score_explanation:
           none: "اس اِیمیل سے حال میں کوئی باؤنسِز موصول نہیں ہوئے۔"
@@ -2855,7 +2728,7 @@ ur:
           title: "ٹرسٹ لَیول 3 کے تقاضے"
           table_title:
             one: "پچھلے دن میں"
-            other: "پچھلے ٪{شمار} دنوں میں"
+            other: "پچھلے ٪{count} دنوں میں"
           value_heading: "وَیلِیو"
           requirement_heading: "ضروریات"
           visits: "زائرین کی تعداد"
@@ -2991,7 +2864,7 @@ ur:
         grant_badge: بَیج دیں
         granted_badges: دیے گئے بَیجز
         grant: عطا کریں
-        no_user_badges: "٪{نام} کو کوئی بَیج عطا نہیں کیا گیا ہے۔"
+        no_user_badges: "٪{name} کو کوئی بَیج عطا نہیں کیا گیا ہے۔"
         no_badges: عطا کیے جانے کیلئے کوئی بَیج موجود نہیں ہیں۔
         none_selected: "شروع کرنے کے لئے ایک بَیج منتخب کریں"
         allow_title: عنوان کے طور پر بَیج وں کے استعمال کی اجازت دیں
@@ -3024,20 +2897,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: "کیا آپ واقعی اس ہَوسٹ کو حذف کرنا چاہتے ہیں؟"
@@ -3088,9 +2961,6 @@ ur:
       upload: "اَپ لوڈ"
       uploading: "اَپ لوڈ کیا جا رہا ہے..."
       quit: "شاید بعد میں"
-      staff_count:
-        one: "آپ کی کمیونٹی میں 1 سٹاف کا رکن ہے۔"
-        other: "آپ کی کمیونٹی میں ٪{شمار} سٹاف کے ارکان ہیں۔"
       invites:
         add_user: "شامل کریں"
         none_added: "آپ نے کسی  بھی سٹاف کو مدعو نہیں کیا۔ کیا آپ واقعی آگے جانا چاہتے ہیں؟"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 74092e9e5e..7f14104b46 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -83,7 +83,6 @@ vi:
           other: "còn %{count} năm"
       previous_month: 'Tháng trước'
       next_month: 'Tháng sau'
-      placeholder: Chọn một ngày
     share:
       topic: 'chia sẻ chủ đề này'
       post: 'đăng #%{postNumber}'
@@ -119,7 +118,7 @@ vi:
         enabled: 'được hiển thị lúc %{when}'
         disabled: 'bỏ hiển thị lúc %{when}'
       banner:
-        enabled: 'chọn đây làm banner %{when}. Nó sẽ xuất hiện tại đầu mỗi trang cho đến khi bị ẩn đi bởi người dùng,'
+        enabled: 'chọn đây làm banner %{when}. Nó sẽ xuất hiện ở đầu mỗi trang đến khi bị ẩn đi bởi người dùng,'
         disabled: 'xoá banner này %{when}. Nó sẽ không còn xuất hiện ở đầu mỗi trang.'
     topic_admin_menu: "Lựa chọn quản lí chủ đề."
     wizard_required: "Chào mừng bạn đến với Discourse! Hãy bắt đầu với <a href='%{url}' data-auto-route='true'>hướng dẫn cài đặt</a> ✨"
@@ -130,20 +129,21 @@ 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_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: '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"
@@ -273,19 +273,19 @@ vi:
       user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> đã đăng <a href='{{topicUrl}}'>chủ đề</a>"
       you_posted_topic: "<a href='{{userUrl}}'>Bạn</a> đã đăng <a href='{{topicUrl}}'>chủ đề</a>"
       user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> đã trả lời tới <a href='{{postUrl}}'>{{post_number}}</a>"
-      you_replied_to_post: "<a href='{{userUrl}}'>Bạn</a> đã trả lời tới <a href='{{postUrl}}'>{{post_number}}</a>"
+      you_replied_to_post: "<a href='{{userUrl}}'>Bạn</a> đã trả lời <a href='{{postUrl}}'>{{post_number}}</a>"
       user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> đã trả lời <a href='{{topicUrl}}'>chủ đề</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>Bạn</a> đã trả lời tới <a href='{{topicUrl}}'>chủ đề</a>"
+      you_replied_to_topic: "<a href='{{userUrl}}'>Bạn</a> đã trả lời <a href='{{topicUrl}}'>chủ đề</a>"
       user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> đã nhắc đến <a href='{{user2Url}}'>{{another_user}}</a>"
       user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> đã nhắc tới <a href='{{user2Url}}'>bạn</a>"
-      you_mentioned_user: "<a href='{{user1Url}}'>Bạn</a> đã đề cập <a href='{{user2Url}}'>{{another_user}}</a>"
+      you_mentioned_user: "<a href='{{user1Url}}'>Bạn</a> đã nhắc đến <a href='{{user2Url}}'>{{another_user}}</a>"
       posted_by_user: "Được đăng bởi <a href='{{userUrl}}'>{{user}}</a>"
       posted_by_you: "Được đăng bởi <a href='{{userUrl}}'>bạn</a>"
       sent_by_user: "Đã gửi bởi <a href='{{userUrl}}'>{{user}}</a>"
       sent_by_you: "Đã gửi bởi <a href='{{userUrl}}'>bạn</a>"
     directory:
       filter_name: "lọc theo tên đăng nhập"
-      title: "Thành viên"
+      title: "Người dùng"
       likes_given: "Đưa ra"
       likes_received: "Đã nhận"
       topics_entered: "Đã xem"
@@ -294,12 +294,12 @@ vi:
       topic_count: "Chủ đề"
       topic_count_long: "Chủ đề đã được tạo"
       post_count: "Trả lời"
-      post_count_long: "Trả lời đã được đăng"
+      post_count_long: "Trả lời đã đăng"
       no_results: "Không tìm thấy kết quả."
       days_visited: "Ghé thăm"
       days_visited_long: "Ngày đã ghé thăm"
-      posts_read: "Đọc"
-      posts_read_long: "Đọc bài viết"
+      posts_read: "Đã đọc"
+      posts_read_long: "Bài đăng đã đọc"
       total_rows:
         other: "%{count} người dùng"
     group_histories:
@@ -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"
@@ -341,30 +337,34 @@ vi:
       join: "Tham gia nhóm"
       leave: "Rời nhóm"
       request: "Xin gia nhập nhóm"
+      message: "Tin nh"
       automatic_group: Nhóm tự động
-      closed_group: Nhóm riêng
+      closed_group: Nhóm kín
       is_group_user: "Bạn là một thành viên của nhóm này"
       allow_membership_requests: "Cho phép người dùng gửi đơn xin gia nhập nhóm đến người quản lí nhóm."
+      membership_request:
+        submit: "Gửi yêu c"
       membership: "Thành viên"
       name: "Tên"
       user_count: "Số lượng thành viên"
       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."
       title:
-        other: "các nhóm"
+        other: "Nhóm"
       activity: "Hoạt động"
       members: "Các thành viên"
       topics: "Chủ đề"
       posts: "Các bài viết"
       mentions: "Được nhắc đến"
       messages: "Tin nhắn"
+      visibility_levels:
+        title: "Ai có thể xem nhóm"
+        public: "Mọi người"
       alias_levels:
-        title: "Ai có thể nhắn tin và @mention trong nhóm này?"
         nobody: "Không ai cả"
         only_admins: "Chỉ các quản trị viên"
         mods_and_admins: "Chỉ có người điều hành và ban quản trị"
@@ -375,7 +375,7 @@ vi:
         none: "Không có gì"
       notifications:
         watching:
-          title: "Đang xem"
+          title: "Đang theo dõi"
           description: "Bạn sẽ được thông báo khi có bài viết mới trong mỗi tin nhắn, và số lượng trả lời mới sẽ được hiển thị"
         watching_first_post:
           title: "Theo dõi chủ đề đầu tiên"
@@ -399,7 +399,7 @@ vi:
       flair_preview_image: "Ảnh xem trước"
       flair_note: "Ghi chú: Ảnh đại diện chỉ hiển thị cho nhóm chính của người dùng"
     user_action_groups:
-      '1': "Lần thích"
+      '1': "Lượt thích"
       '2': "Lần được thích"
       '3': "Chỉ mục"
       '4': "Các chủ đề"
@@ -458,13 +458,13 @@ 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"
+        button_text: "Tải tất c"
         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."
       new_private_message: "Tin nhắn mới"
       private_message: "Tin nhắn"
-      private_messages: "Các tin nhắn"
+      private_messages: "Tin nhắn"
       activity_stream: "Hoạt động"
       preferences: "Tùy chỉnh"
       expand_profile: "Mở"
@@ -488,6 +488,7 @@ vi:
       first_notification: "Thông báo đầu tiên của bạn! Chọn để bắt đầu"
       disable_jump_reply: "Đừng tới bài viết của tôi sau khi tôi trả lời"
       dynamic_favicon: "Hiện số chủ đề mới / cập nhật vào biểu tượng trình duyệt"
+      theme_default_on_all_devices: "Đặt giao diện này làm giao diện mặc định trên tất cả thiết bị của tôi"
       external_links_in_new_tab: "Mở tất cả liên kết bên ngoài trong thẻ mới"
       enable_quoting: "Bật chế độ làm nổi bật chữ trong đoạn trích dẫn trả lời"
       change: "thay đổi"
@@ -495,7 +496,6 @@ vi:
       admin: "{{user}} là người điều hành"
       moderator_tooltip: "Thành viên này là MOD"
       admin_tooltip: "Thành viên này là admin"
-      blocked_tooltip: "Tài khoản này bị khóa"
       suspended_notice: "Thành viên này bị đình chỉ cho đến ngày {{date}}. "
       suspended_reason: "Lý do: "
       github_profile: "Github"
@@ -517,7 +517,8 @@ vi:
       tracked_tags_instructions: "Chế độ theo dõi sẽ tự động bật với những chủ đề được gắn thẻ này. Số lượng bài viết mới sẽ xuất hiện bên cạnh chủ đề."
       muted_tags: "Im lặng"
       muted_tags_instructions: "Bạn sẽ không được thông báo về bất kì hoạt động nào ở những chủ đề có thẻ này, chúng cũng sẽ không xuất hiện như là những chủ đề mới nhất."
-      watched_categories: "Xem"
+      watched_categories: "Đã theo dõi"
+      watched_categories_instructions: "Bạn sẽ tự động theo dõi tất cả các chủ đề trong những chuyên mục này. Bạn sẽ nhận được tin báo về những bài viết và chủ đề mới, cùng với số lượng bài viết mới cũng sẽ xuất hiện kế bên chủ đề đó."
       tracked_categories: "Theo dõi"
       watched_first_post_categories: "Xem bài viết đầu tiên"
       watched_first_post_categories_instructions: "Bạn sẽ nhận được thông báo khi có ai đó đăng chủ đề mới trong thư mục này."
@@ -535,7 +536,7 @@ vi:
       muted_users: "Im lặng"
       muted_users_instructions: "Ngăn chặn tất cả các thông báo từ những thành viên."
       muted_topics_link: "Hiển thị chủ đề Im Lặng"
-      watched_topics_link: "HIển thị chủ đề đã xem"
+      watched_topics_link: "HIển thị các chủ đề đã theo dõi."
       automatically_unpin_topics: "Tự động bỏ ghim chủ đề khi tôi xuống cuối trang."
       apps: "Ứng dụng"
       revoke_access: "Lấy lại quyền"
@@ -564,7 +565,9 @@ vi:
         profile: "Hồ sơ"
         emails: "Email"
         notifications: "Thông báo"
+        categories: "Chuyên mục"
         tags: "Thẻ"
+        interface: "Giao diện"
         apps: "Ứng dụng"
       change_password:
         success: "(email đã gửi)"
@@ -581,7 +584,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"
@@ -714,6 +716,8 @@ vi:
         expired: "Thư mời này đã hết hạn."
         rescind: "Xoá"
         rescinded: "Lời mời bị xóa"
+        rescind_all: "Xóa tất cả lời m"
+        rescinded_all: "Tất cả lời mời đã được xóa!"
         reinvite: "Mời lại"
         reinvite_all: "Gửi lại tất cả lời mời"
         reinvited: "Gửi lại lời mời"
@@ -826,7 +830,6 @@ vi:
     first_post: Bài viết đầu tiên
     mute: Im lặng
     unmute: Bỏ im lặng
-    last_post: Bài viết cuối cùng
     last_reply_lowercase: trả lời cuối cùng
     replies_lowercase:
       other: trả lời
@@ -860,6 +863,7 @@ vi:
     trust_level: 'Độ tin tưởng'
     search_hint: 'username, email or IP address'
     create_account:
+      disclaimer: "Với việc đăng ký, tức là bạn đồng ý với <a href='{{privacy_link}}'>chính sách riêng tư</a> và <a href='{{tos_link}}'>điều khoản dịch vụ</a>."
       title: "Tạo tài khoản mới"
       failed: "Có gì đó không đúng, có thể email này đã được đăng ký, thử liên kết quên mật khẩu"
     forgot_password:
@@ -873,6 +877,7 @@ vi:
       complete_email_found: "Chúng tôi tìm thấy một tài khoản phù hợp với <b>% {email} </ b>, bạn sẽ nhận được một email với hướng dẫn về cách đặt lại mật khẩu của bạn trong thời gian ngắn."
       complete_username_not_found: "Không có tài khoản phù hợp với tên thành viên <b>% {username} </ b>"
       complete_email_not_found: "Không tìm thấy tài khoản nào tương ứng với <b>%{email}</b>"
+      button_help: "Giúp "
     login:
       title: "Đăng nhập"
       username: "Thành viên"
@@ -927,7 +932,9 @@ 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)"
+      name_label: "T"
+      password_label: "Đặt mật kh"
+      optional_description: "(tùy chọn)"
     password_reset:
       continue: "Tiếp tục truy cập %{site_name}"
     emoji_set:
@@ -942,6 +949,11 @@ vi:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      people: Mọi ng
+      food: 'Thức '
+      activity: 'Hoạt '
+      objects: Vật th
     composer:
       emoji: "Emoji :)"
       more_emoji: "thêm..."
@@ -974,6 +986,7 @@ vi:
       title: "Hoặc nhất Ctrl+Enter"
       users_placeholder: "Thêm thành viên "
       title_placeholder: "Tóm tắt lại thảo luận này trong một câu ngắn gọn"
+      title_or_link_placeholder: "Nhập tiêu đề, hoặc dán đường dẫn vào đây"
       edit_reason_placeholder: "Tại sao bạn sửa"
       show_edit_reason: "(thêm lý do sửa)"
       reply_placeholder: "Gõ ở đây. Sử dụng Markdown, BBCode, hoặc HTML để định dạng. Kéo hoặc dán ảnh."
@@ -1006,12 +1019,7 @@ vi:
       olist_title: "Danh sách kiểu số"
       ulist_title: "Danh sách kiểu ký hiệu"
       list_item: "Danh sách các mục"
-      heading_label: "H"
-      heading_title: "Tiêu đề"
-      heading_text: "Tiêu đề"
-      hr_title: "Căn ngang"
       help: "Trợ giúp soạn thảo bằng Markdown"
-      toggler: "ẩn hoặc hiển thị bảng điều khiển soạn thảo"
       modal_ok: "OK"
       modal_cancel: "Hủy"
       cant_send_pm: "Xin lỗi, bạn không thể gởi tin nhắn đến %{username}."
@@ -1024,24 +1032,6 @@ vi:
       empty: "Không có thông báo"
       more: "xem thông báo cũ hơn"
       total_flagged: "tổng số bài viết gắn cờ"
-      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}} và {{count}} người khác</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> chấp nhận lời mời của bạn</p>"
-      moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> chuyển {{description}}</p>"
-      granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Thu được '{{description}}'</p>"
-      group_message_summary:
-        other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} tin nhắn trong {{group_name}} của bạn</p>"
       alt:
         mentioned: "Được nhắc đến bởi"
         quoted: "Trích dẫn bởi"
@@ -1089,14 +1079,13 @@ vi:
       select_all: "Chọn tất cả"
       clear_all: "Xóa tất cả"
       too_short: "Từ khoá tìm kiếm của bạn quá ngắn."
-      result_count:
-        other: "{{count}} kết quả cho <span class='term'>\"{{term}}\"</span>"
       title: "tìm kiếm chủ đề, bài viết, tài khoản hoặc các danh mục"
       no_results: "Không tìm thấy kết quả."
       no_more_results: "Không tìm thấy kết quả"
       searching: "Đang tìm ..."
       post_format: "#{{post_number}} bởi {{username}}"
-      results_page: "Kết quả tìm kiếm"
+      search_google_button: "G"
+      search_google_title: "Tìm trong trang n"
       context:
         user: "Tìm bài viết của @{{username}}"
         topic: "Tìm trong chủ đề này"
@@ -1105,22 +1094,15 @@ vi:
         title: Tìm kiếm nâng cao
         posted_by:
           label: Gửi bởi
-        in_category:
-          label: Trong chuyên mục
         in_group:
           label: Trong nhóm
         with_badge:
           label: Với huy hiệu
-        with_tags:
-          label: Với thẻ
         filters:
           likes: Tôi đã thích
           posted: Tôi đã gửi trong
-          private: trong tin nhắn của tôi
-          bookmarks: Tôi đã đánh dấu
           pinned: được gim
           unpinned: không được gim
-          seen: Tôi đã đọc
           unseen: Tôi chưa đọc
           wiki: là wiki
         statuses:
@@ -1248,17 +1230,21 @@ vi:
         tomorrow: "Ngày mai"
         this_weekend: "Cuối tuần này"
         next_week: "Tuần tới"
+        next_month: "Tháng t"
         pick_date_and_time: "Chọn ngày và giờ"
       temp_close:
         title: "Tạm đóng"
       auto_close:
         error: "Hãy nhập giá trị hợp lệ."
+      reminder:
+        title: "Nhắc t"
       status_update_notice:
         auto_open: "Chủ đề này sẽ tự động mở trong %{timeLeft}."
         auto_close: "Chủ đề này sẽ tự đóng trong %{timeLeft}."
       auto_close_title: 'Tự động-Đóng các Cài đặt'
       timeline:
         back: "Quay lại"
+        replies_short: "%{current} / %{total}"
       progress:
         title: tiến trình của chủ đề
         go_top: "trên cùng"
@@ -1272,21 +1258,23 @@ vi:
         current: bài viết hiện tại
       notifications:
         reasons:
-          '3_6': 'Bạn sẽ nhận được các thông báo bởi vì bạn đang xem chuyên mục nàyotification'
-          '3_5': 'Bạn sẽ nhận được các thông báo bởi vì bạn đã bắt đầu xem chủ đề này một cách tự động'
-          '3_2': 'Bạn sẽ nhận được các thông báo bởi vì bạn đang xem chủ đề này'
-          '3_1': 'Bạn sẽ được nhận thông báo bởi bạn đã tạo chủ để này.'
-          '3': 'Bạn sẽ nhận được các thông báo bởi vì bạn đang xem chủ đề này'
-          '1_2': 'Bạn sẽ được thông báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn'
-          '1': 'Bạn sẽ được thông báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn'
-          '0_7': 'Bạn đang bỏ qua tất cả các thông báo trong chuyên mục này'
+          '3_6': 'Bạn sẽ nhận được các tin báo bởi vì bạn đang theo dõi chuyên mục này.'
+          '3_5': 'Bạn sẽ nhận được tin báo bởi vì bạn đã bắt đầu theo dõi chủ đề này một cách tự động.'
+          '3_2': 'Bạn sẽ nhận được các tin báo bởi vì bạn đang theo dõi chủ đề này.'
+          '3_1': 'Bạn sẽ được nhận các tin báo bởi bạn đã tạo chủ để này.'
+          '3': 'Bạn sẽ nhận được các tin báo bởi vì bạn đang theo dõi chủ đề này.'
+          '2_8': 'Bạn sẽ thấy được 1 số lượng bài viết mới bởi vì bạn đang theo dấu chuyên mục này.'
+          '2': 'Bạn sẽ xem được các bài trả lời bởi vì bạn <a href="/u/{{username}}/preferences">đọc chủ đề này</a>.'
+          '1_2': 'Bạn sẽ được tin báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn.'
+          '1': 'Bạn sẽ được tin báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn.'
+          '0_7': 'Bạn đang bỏ qua tất cả các tin báo trong chuyên mục này.'
           '0_2': 'Bạn đang bỏ qua tất cả các thông báo trong chủ đề này'
           '0': 'Bạn đang bỏ qua tất cả các thông báo trong chủ đề này'
         watching_pm:
-          title: "Đang xem"
+          title: "Đang theo dõi"
           description: "Bạn sẽ được thông báo về từng trả lời mới trong tin nhắn này, và một số trả lời mới sẽ được hiển thị"
         watching:
-          title: "Dang theo dõi"
+          title: "Đang theo dõi"
           description: "Bạn sẽ được thông báo về từng trả lời mới trong tin nhắn này, và một số trả lời mới sẽ được hiển thị"
         tracking_pm:
           title: "Đang theo dõi"
@@ -1424,7 +1412,6 @@ vi:
       multi_select:
         select: 'chọn'
         selected: 'đã chọn ({{count}})'
-        select_replies: 'chọn + trả lời'
         delete: xóa lựa chọn
         cancel: hủy lựa chọn
         select_all: chọn tất cả
@@ -1435,7 +1422,6 @@ vi:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "Trích dẫn"
-      edit: "Đang sửa {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Lý do: "
       post_number: "bài viết {{number}}"
       last_edited_on: "đã sửa bài viết lần cuối lúc"
@@ -1490,11 +1476,6 @@ vi:
         undelete: "hủy xóa bài viết này"
         share: "chia sẻ liên kết đến bài viết này"
         more: "Thêm"
-        delete_replies:
-          confirm:
-            other: "Bạn muốn xóa {{count}} trả lời cho bài viết này?"
-          yes_value: "Đồng ý, xóa những trả lời"
-          no_value: "Không, chỉ xóa chủ đề"
         admin: "quản lý bài viết"
         wiki: "Tạo Wiki"
         unwiki: "Xóa Wiki"
@@ -1505,8 +1486,6 @@ vi:
         change_owner: "Đổi chủ sở hữu"
       actions:
         flag: 'Gắn cờ'
-        defer_flags:
-          other: "Đánh dấu hoãn"
         undo:
           off_topic: "Hủy gắn cờ"
           spam: "Hủy gắn cờ"
@@ -1566,9 +1545,6 @@ vi:
             other: "{count}} người đã thích cái này"
           vote:
             other: "{{count}} người đã bình chọn cho bài viết này"
-      delete:
-        confirm:
-          other: "Bạn muốn xóa những bài viết này?"
       revisions:
         controls:
           first: "Sửa đổi đầu tiên"
@@ -1611,7 +1587,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'
@@ -1668,7 +1643,7 @@ vi:
       sort_options:
         default: "mặc định"
         likes: "Thích"
-        views: "Xem"
+        views: "Lượt xem"
         posts: "Bài viết"
         activity: "Hoạt động"
         posters: "Người gửi"
@@ -1814,7 +1789,7 @@ vi:
           other: "{{categoryName}} ({{count}})"
         help: "Những chủ đề mới nhất trong chuyên mục{{categoryName}} "
       top:
-        title: "Trên"
+        title: "Top"
         help: "Các chủ đề tích cực nhất trong năm, tháng, tuần, hoặc ngày trước"
         all:
           title: "Từ trước tới nay"
@@ -1877,9 +1852,7 @@ vi:
       selector_no_tags: "không có thẻ"
       changed: "thẻ đã đổi:"
       tags: "Thẻ"
-      choose_for_topic: "tuỳ chọn thẻ cho chủ đề này"
       delete_tag: "Xoá thẻ"
-      delete_confirm: "Bạn có chắc là muốn xoá thẻ đó ?"
       rename_tag: "Đổi tên thẻ"
       rename_instructions: "Chọn tên mới cho thẻ:"
       sort_by: "Xếp theo:"
@@ -1927,7 +1900,6 @@ vi:
         no_problems: "Không phát hiện vấn đề"
         moderators: 'Điều hành:'
         admins: 'Quản trị:'
-        blocked: 'Đã khóa:'
         suspended: 'Đã tạm khóa:'
         private_messages_short: "Tin nhắn"
         private_messages_title: "Tin nhắn"
@@ -1957,24 +1929,12 @@ vi:
         by: "bởi"
       flags:
         title: "Gắn cờ"
-        old: "Cũ"
-        active: "Kích hoạt"
         agree: "Đồng ý"
         agree_title: "Xác nhận đánh dấu này hợp lệ và chính xác"
-        agree_flag_modal_title: "Đồng ý và..."
-        agree_flag_hide_post: "Đồng ý (ẩn bài viết + gửi PM)"
-        agree_flag_hide_post_title: "Ẩn bài viết này và tự động gửi tin nhắn đến người dùng hối thúc họ sửa nó"
-        agree_flag_restore_post: "Đồng ý (khôi phục bài viết)"
-        agree_flag_restore_post_title: "Khôi phục bài viết này"
-        agree_flag: "Đống ý với cờ này"
-        agree_flag_title: "Đồng ý với cờ này và giữ bài viết không thay đổi"
-        defer_flag: "Hoãn"
         defer_flag_title: "Xóa cờ này; nó yêu cầu không có hành động nào vào thời điểm này."
         delete: "Xóa"
         delete_title: "Xóa bài viết đánh dấu này đề cập đến."
-        delete_post_defer_flag: "Xóa bài viết và Hoãn đánh dấu"
         delete_post_defer_flag_title: "Xóa bài viết; nếu là bài viết đầu tiên, xóa chủ đề này"
-        delete_post_agree_flag: "Xóa bài viết và Đồng ý với cờ"
         delete_post_agree_flag_title: "Xóa bài viết; nếu là bài viết đầu tiên, xóa chủ đề này"
         delete_flag_modal_title: "Xóa và..."
         delete_spammer: "Xóa người Spam"
@@ -1989,29 +1949,16 @@ vi:
         dispositions:
           agreed: "đồng ý"
           disagreed: "không đồng ý"
-          deferred: "hoãn"
         flagged_by: "Gắn cờ bởi"
         resolved_by: "Xử lý bởi"
         took_action: "Thực hiện"
         system: "Hệ thống"
         error: "Có lỗi xảy ra"
         reply_message: "Trả lời "
-        no_results: "Không được gắn cờ"
         topic_flagged: "<strong>Chủ đề này</strong> đã được đánh dấu."
         visit_topic: "Tới chủ đề để thực hiện"
         was_edited: "Bài viết đã được chỉnh sửa sau khi đánh dấu đầu tiên"
         previous_flags_count: "Bài viết này đã được đánh dấu {{count}} lần."
-        summary:
-          action_type_3:
-            other: "sai chủ đề x{{count}}"
-          action_type_4:
-            other: "Không phù hợp x{{count}}"
-          action_type_6:
-            other: "tùy chỉnh x{{count}}"
-          action_type_7:
-            other: "tùy chỉnh x{{count}}"
-          action_type_8:
-            other: "spam x{{count}}"
       groups:
         primary: "Nhóm Chính"
         no_primary: "(không có nhóm chính)"
@@ -2304,8 +2251,6 @@ vi:
             change_category_settings: "thay đổi cấu hình danh mục"
             delete_category: "xóa danh mục"
             create_category: "tạo danh mục"
-            block_user: "khóa tài khoản"
-            unblock_user: "mở khóa tài khoản"
             grant_admin: "cấp quản trị"
             revoke_admin: "hủy bỏ quản trị"
             grant_moderation: "cấp điều hành"
@@ -2361,7 +2306,6 @@ vi:
           pending: "Đang chờ xử lý"
           staff: 'Nhân viên'
           suspended: 'Đã tạm khóa'
-          blocked: 'Đã khóa'
           suspect: 'Nghi ngờ'
         approved: "Đã duyệt?"
         approved_selected:
@@ -2380,7 +2324,6 @@ vi:
           staff: "Nhân viên"
           admins: 'Tài khoản Quản trị'
           moderators: 'Điều hành viên'
-          blocked: 'Tài khoản Khóa'
           suspended: 'Tài khoản Tạm khóa'
           suspect: 'Tài khoản đáng ngờ'
         reject_successful:
@@ -2395,17 +2338,13 @@ vi:
         suspend_failed: "Có gì đó đã sai khi đình chỉ tài khoản này {{error}}"
         unsuspend_failed: "Có gì đó sai khi gỡ bỏ đình chỉ tài khoản này {{error}}"
         suspend_duration: "Tài khoản này sẽ bị đình chỉ bao lâu?"
-        suspend_duration_units: "(ngày)"
         suspend_reason_label: "Tại sao bạn bị đình chỉ? Dòng chữ <b>hiển thị cho tất cả mọi người</b> sẽ hiển thị trên trang hồ sơ tài khoản của người dùng này, và sẽ hiển thị cho thành viên khi họ đăng nhập, hãy viết ngắn."
         suspend_reason: "Lý do"
         suspended_by: "Tạm khóa bởi"
         delete_all_posts: "Xóa tất cả bài viết"
-        suspend: "Tạm khóa"
-        unsuspend: "Đã mở khóa"
-        suspended: "Đã tạm khóa?"
         moderator: "Mod?"
         admin: "Quản trị?"
-        blocked: "Đã khóa?"
+        suspended: "Đã tạm khóa?"
         staged: "Cấp bậc?"
         show_admin_profile: "Quản trị"
         refresh_browsers: "Bắt buộc làm mới trình duyệt"
@@ -2419,8 +2358,8 @@ vi:
         grant_admin: 'Cấp quản trị'
         revoke_moderation: 'Thu hồi điều hành'
         grant_moderation: 'Cấp điều hành'
-        unblock: 'Mở khóa'
-        block: 'Khóa'
+        unsuspend: 'Đã mở khóa'
+        suspend: 'Tạm khóa'
         reputation: Danh tiếng
         permissions: Quyền
         activity: Hoạt động
@@ -2464,13 +2403,8 @@ vi:
         activate_failed: "Có vấn đề khi kích hoạt thành viên này."
         deactivate_account: "Vô hiệu hóa Tài khoản"
         deactivate_failed: "Có vấn đề khi bỏ kích hoạt thành viên này."
-        unblock_failed: 'Có vẫn đề khi gỡ khóa thành viên này.'
-        block_failed: 'Có vấn đề khi khóa thành viên này.'
-        block_confirm: 'Bạn có chắc chắn muốn chặn người dùng này? Họ sẽ không thể tạo bất kỳ chủ đề hoặc bài viết mới nào.'
-        block_accept: 'Có, chặn người dùng này'
         deactivate_explanation: "Tài khoản chờ kích hoạt phải xác thực email của họ."
         suspended_explanation: "Tài khoản tạm khóa không thể đăng nhập."
-        block_explanation: "Tài khoản bị khóa không thể đăng bài hoặc tạo chủ đề."
         trust_level_change_failed: "Có lỗi xảy ra khi thay đổi mức độ tin tưởng của tài khoản."
         suspend_modal_title: "Tạm khóa Thành viên"
         trust_level_2_users: "Độ tin cậy tài khoản mức 2"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 809bb2dbb5..db4deb9195 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -45,12 +45,16 @@ zh_CN:
           other: "%{count}秒内"
         x_seconds:
           other: "%{count}秒前"
+        less_than_x_minutes:
+          other: "%{count}分钟内"
         x_minutes:
           other: "%{count}分钟前"
         about_x_hours:
           other: "%{count}小时前"
         x_days:
           other: "%{count}天前"
+        x_months:
+          other: "%{count} 个月"
         about_x_years:
           other: "%{count}年内"
         over_x_years:
@@ -83,7 +87,7 @@ zh_CN:
           other: "%{count}年后"
       previous_month: '上个月'
       next_month: '下个月'
-      placeholder: 选择日期
+      placeholder: 日期
     share:
       topic: '分享指向这个主题的链接'
       post: '#%{postNumber} 楼'
@@ -98,6 +102,7 @@ zh_CN:
       split_topic: "于%{when}分割了该主题"
       invited_user: "于%{when}邀请了%{who}"
       invited_group: "于%{when}邀请了%{who}"
+      user_left: "%{who}于%{when}离开了该私信"
       removed_user: "于%{when}移除了%{who}"
       removed_group: "于%{when}移除了%{who}"
       autoclosed:
@@ -120,7 +125,7 @@ zh_CN:
         disabled: '于%{when}隐藏'
       banner:
         enabled: '%{when}将其设置为横幅。在用户关闭横幅前，横幅将显示在每一页的顶部。'
-        disabled: "%{when}撤销了该横幅。\b横幅将不在显示每一页的顶部。"
+        disabled: '%{when}撤销了该横幅。横幅将不在显示每一页的顶部。'
     topic_admin_menu: "管理主题"
     wizard_required: "欢迎来到你新安装的 Discourse！让我们开始<a href='%{url}' data-auto-route='true'>设置向导</a>✨"
     emails_are_disabled: "出站邮件已经被管理员全局禁用。将不发送任何邮件提醒。"
@@ -130,20 +135,21 @@ 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_east_2: "美国东部（俄亥俄州）"
+        us_gov_west_1: "政府专用（US）"
+        us_west_1: "美国西部（N. California）"
+        us_west_2: "美国西部（Oregon）"
     edit: '编辑标题和分类'
     not_implemented: "非常抱歉，这个功能仍在开发中！"
     no_value: "否"
@@ -204,7 +210,7 @@ zh_CN:
       user_count: "用户"
       active_user_count: "活跃用户"
       contact: "联系我们"
-      contact_info: "重要事件或紧急事件，请通过 %{contact_info} 联系我们。"
+      contact_info: "如有重要问题或网站紧急事件，请以 %{contact_info} 联系我们。"
     bookmarked:
       title: "收藏"
       clear_bookmarks: "取消收藏"
@@ -234,6 +240,7 @@ zh_CN:
     uploading: "上传中..."
     uploading_filename: "上传“{{filename}}”中..."
     uploaded: "上传成功！"
+    pasting: "粘贴中..."
     enable: "启用"
     disable: "停用"
     undo: "重置"
@@ -322,14 +329,12 @@ zh_CN:
         to: "发至"
       edit:
         title: '编辑群组'
-        full_name: '名字'
+        full_name: '群组名'
         add_members: "增加组员"
         delete_member_confirm: "从“%{group}”群组中移除用户“%{username}'？"
-      request_membership_pm:
-        title: "成员申请"
-        body: "我想申请 @%{groupName} 的成员资格。"
       name_placeholder: "群组名，没有空格，和用户名一样的规则"
-      public: "允许用户自由加入/离开群组（需要群组是可见）"
+      public_admission: "允许用户自由加入小组（需要小组公开可见）"
+      public_exit: "允许用户自由离开小组"
       empty:
         posts: "群组成员没有发布帖子。"
         members: "群组没有成员。"
@@ -341,22 +346,27 @@ zh_CN:
       join: "加入群组"
       leave: "离开群组"
       request: "请求加入群组"
+      message: "私信"
       automatic_group: 自动群组
       closed_group: 封闭群组
       is_group_user: "你是该群组的一个成员"
-      allow_membership_requests: "允许用户向小组拥有者发送\b\b成员请求"
+      allow_membership_requests: "允许用户向小组拥有者发送成员请求"
+      membership_request_template: "用户发送会员请求时向其显示的自定义模板"
+      membership_request:
+        submit: "提交成员申请"
+        title: "申请加入%{group_name}"
+        reason: "向小组拥有者说明你为何属于这个小组"
       membership: "成员资格"
-      name: "名字"
+      name: "群组ID"
       user_count: "成员数目"
       bio: "关于群组"
       selector_placeholder: "添加成员"
       owner: "所有者"
-      visible: "群组对所有用户可见"
       index:
         title: "群组"
         empty: "没有可见的群组。"
       title:
-        other: "群组"
+        other: "小组"
       activity: "活动"
       members: "成员"
       topics: "主题"
@@ -364,8 +374,15 @@ zh_CN:
       mentions: "提及"
       messages: "私信"
       notification_level: "小组私信的默认通知等级"
+      visibility_levels:
+        title: "谁能看到这个小组？"
+        public: "所有人"
+        members: "小组创建人，成员和管理员"
+        staff: "小组创建者及工作人员"
+        owners: "小组创建者及管理员"
       alias_levels:
-        title: "谁能@该群组和发送私信？"
+        mentionable: "谁能@该小组"
+        messageable: "谁能私信此小组"
         nobody: "没有人"
         only_admins: "管理员"
         mods_and_admins: "版主与管理员"
@@ -451,6 +468,7 @@ zh_CN:
       topics_entered: "进入的主题"
       post_count: "# 帖子"
       confirm_delete_other_accounts: "确定要删除这些账户？"
+      powered_by: "由<a href='https://ipinfo.io'>ipinfo.io</a>驱动"
     user_fields:
       none: "（选择一项）"
     user:
@@ -459,7 +477,7 @@ zh_CN:
       mute: "防打扰"
       edit: "修改设置"
       download_archive:
-        button_text: "下载我的帖子"
+        button_text: "全部下载"
         confirm: "你确定要下载你的帖子吗？"
         success: "下载开始，完成后将有私信通知你。"
         rate_limit_error: "帖子只能每天下载一次，请明天再重试。"
@@ -470,7 +488,7 @@ zh_CN:
       preferences: "设置"
       expand_profile: "展开"
       bookmarks: "收藏"
-      bio: "个人信息"
+      bio: "我是谁"
       invited_by: "邀请人"
       trust_level: "信任等级"
       notifications: "通知"
@@ -484,12 +502,14 @@ zh_CN:
         disable: "停用通知"
         enable: "启用通知"
         each_browser_note: "注意：你必须在你使用的所用浏览器中更改这项设置。"
+      dismiss: '忽略'
       dismiss_notifications: "忽略所有"
       dismiss_notifications_tooltip: "标记所有未读通知为已读"
       first_notification: "你的头一个通知！选中它开始。"
       disable_jump_reply: "回复后不跳转至新帖子"
       dynamic_favicon: "在浏览器图标中显示主题更新数量"
       theme_default_on_all_devices: "将其设为我所有设备上的默认主题"
+      allow_private_messages: "允许其他用户发送私信给我"
       external_links_in_new_tab: "在新标签页打开外部链接"
       enable_quoting: "在选择文字时显示引用回复按钮"
       change: "修改"
@@ -497,8 +517,9 @@ zh_CN:
       admin: "{{user}}是管理员"
       moderator_tooltip: "用户是版主"
       admin_tooltip: "用户是管理员"
-      blocked_tooltip: "这个用户已被封禁"
+      silenced_tooltip: "该用户已被禁言。"
       suspended_notice: "该用户将被禁止登录，直至 {{date}}。"
+      suspended_permanently: "该用户被封禁了。"
       suspended_reason: "原因："
       github_profile: "Github"
       email_activity_summary: "活动摘要"
@@ -529,8 +550,9 @@ zh_CN:
       watched_first_post_tags_instructions: "在有了这些标签的每一个新主题，第一帖会通知你。"
       muted_categories: "静音"
       muted_categories_instructions: "在这些分类里面，你将不会收到新主题任何通知，它们也不会出现在“最新”主题列表。"
+      no_category_access: "无法保存，作为审核人您仅具有受限的 分类 访问权限"
       delete_account: "删除我的帐号"
-      delete_account_confirm: "你真的要永久删除自己的账号吗？删除之后无法恢复！"
+      delete_account_confirm: "你真的要永久删除自己的帐号吗？删除之后无法恢复！"
       deleted_yourself: "你的帐号已被删除。"
       delete_yourself_not_allowed: "你目前不能删除自己的帐号。联系管理员帮助你删除帐号。"
       unread_message_count: "私信"
@@ -547,6 +569,8 @@ zh_CN:
       undo_revoke_access: "解除撤销许可"
       api_approved: "已批准："
       theme: "主题"
+      home: "默认主页"
+      staged: "暂存"
       staff_counters:
         flags_given: "采纳标记"
         flagged_posts: "被标记"
@@ -565,8 +589,8 @@ zh_CN:
         failed_to_move: "移动选中私信失败（可能你的网络出问题了）"
         select_all: "全选"
       preferences_nav:
-        account: "账号"
-        profile: "个人简介"
+        account: "帐号"
+        profile: "个人信息"
         emails: "邮件"
         notifications: "通知"
         categories: "分类"
@@ -588,17 +612,18 @@ zh_CN:
         title: "更换用户名"
         confirm: "确定更换用户名？你的帖子和@提及你的引用将失效。"
         taken: "抱歉，此用户名已经有人使用了。"
-        error: "修改你的用户名时出错了。"
         invalid: "此用户名不合法，用户名只能包含字母和数字"
       change_email:
         title: "更换邮箱"
         taken: "抱歉，此邮箱不可用。"
         error: "修改你的邮箱时出错了，可能邮箱已经被使用了？"
         success: "我们已经发送了一封确认信到该邮箱，请按照邮箱内指示完成确认。"
+        success_staff: "我们已经发送了一封确认信到你现在的邮箱，请按照邮件内指示完成确认。"
       change_avatar:
         title: "更换头像"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>头像，基于："
         gravatar_title: "在 Gravatar 网站上更改你的头像"
+        gravatar_failed: "无法获取 Gravatar 。有关联到该电子邮件地址的 Gravatar ？"
         refresh_gravatar_title: "刷新你的 Gravatar 头像"
         letter_based: "默认头像"
         uploaded_avatar: "自定义图片"
@@ -608,10 +633,10 @@ zh_CN:
         image_is_not_a_square: "注意：图片不是正方形的，我们裁剪了部分图像。"
         cache_notice: "更改了头像成功，但是鉴于浏览器缓存可能需要一段时间后才会生效。"
       change_profile_background:
-        title: "个人资料背景"
+        title: "个人档背景"
         instructions: "显示在个人资料页面中，上传的图片将被居中且默认宽度为 850px。"
       change_card_background:
-        title: "用户卡片背景"
+        title: "用户卡背景"
         instructions: "显示在用户卡片中，上传的图片将被居中且默认宽度为 590px。"
       email:
         title: "邮箱"
@@ -654,7 +679,7 @@ zh_CN:
       location: "地点"
       card_badge:
         title: "用户卡片徽章"
-      website: "网站"
+      website: "网址"
       email_settings: "邮箱"
       like_notification_frequency:
         title: "用户被赞时通知提醒"
@@ -722,6 +747,9 @@ zh_CN:
         expired: "邀请已过期。"
         rescind: "移除"
         rescinded: "邀请已删除"
+        rescind_all: "移除所有邀请"
+        rescinded_all: "所有邀请已移除"
+        rescind_all_confirm: "你确定你想要移除所有邀请么？"
         reinvite: "重新发送邀请"
         reinvite_all: "重发所有邀请"
         reinvite_all_confirm: "确定要重发这些邀请吗？"
@@ -729,13 +757,13 @@ zh_CN:
         reinvited_all: "所有邀请已重新发送！"
         time_read: "阅读时间"
         days_visited: "访问天数"
-        account_age_days: "账号建立天数"
+        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>批量邀请。"
+          none: "你还没有邀请任何人。你可以单独邀请用户，也可以通过<a href='https://meta.discourse.org/t/send-bulk-invites/16468'>上传CSV文件</a>批量邀请。"
           text: "通过文件批量邀请"
           success: "文件上传成功，当操作完成时将通过私信通知你。"
           error: "抱歉，文件必须是CSV格式。"
@@ -751,16 +779,19 @@ zh_CN:
         title: "概要"
         stats: "统计"
         time_read: "阅读时间"
+        recent_time_read: "最近阅读时间"
         topic_count:
           other: "创建主题"
         post_count:
           other: "发表帖子"
         likes_given:
-          other: "<i class='fa fa-heart'></i> 送出赞"
+          other: "送出"
         likes_received:
-          other: "<i class='fa fa-heart'></i> 获得赞"
+          other: "收到"
         days_visited:
           other: "访问天数"
+        topics_entered:
+          other: "已阅主题"
         posts_read:
           other: "阅读帖子"
         bookmark_count:
@@ -775,11 +806,11 @@ zh_CN:
         no_badges: "暂无徽章。"
         more_badges: "更多徽章"
         top_links: "热门链接"
-        no_links: "暂无链接"
+        no_links: "暂无链接。"
         most_liked_by: "谁赞最多"
         most_liked_users: "赞谁最多"
         most_replied_to_users: "最多回复至"
-        no_likes: "暂无赞"
+        no_likes: "暂无赞。"
       associated_accounts: "登录"
       ip_address:
         title: "最后使用的 IP 地址"
@@ -846,7 +877,11 @@ zh_CN:
     first_post: 最早帖子
     mute: 静音
     unmute: 取消静音
-    last_post: 最后帖子
+    last_post: 最后发帖
+    time_read: 阅读
+    time_read_recently: '最近 %{time_read}'
+    time_read_tooltip: '合计阅读时间 %{time_read}'
+    time_read_recently_tooltip: '总阅读时间 %{time_read} (最近60天 %{recent_time_read})'
     last_reply_lowercase: 最后回复
     replies_lowercase:
       other: 回复
@@ -855,8 +890,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> 个回复。"
@@ -871,6 +906,7 @@ zh_CN:
     private_message_info:
       title: "私信"
       invite: "邀请其他人..."
+      leave_message: "你真的想要发送消息么？"
       remove_allowed_user: "确定将 {{name}} 从本条私信中移除？"
       remove_allowed_group: "确定将 {{name}} 从本条私信中移除？"
     email: '邮箱'
@@ -895,6 +931,9 @@ zh_CN:
       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: "OK"
+      button_help: "帮助"
     login:
       title: "登录"
       username: "用户"
@@ -911,7 +950,7 @@ zh_CN:
       awaiting_activation: "你的帐号尚未激活，点击忘记密码链接以重新发送激活邮件。"
       awaiting_approval: "你的帐号尚未被论坛版主审核。请等待一段时间，当你的帐号被审核时会收到一封电子邮件。"
       requires_invite: "抱歉，本论坛仅接受邀请注册。"
-      not_activated: "你还不能登录。我们已经发送了一封邮件至 <b>{{sentTo}}</b>，请打开它并完成账号激活。"
+      not_activated: "你还不能登录。我们已经发送了一封邮件至 <b>{{sentTo}}</b>，请打开它并完成帐号激活。"
       not_allowed_from_ip_address: "你使用的 IP 地址已被封禁。"
       admin_not_allowed_from_ip_address: "你不能从这个 IP 地址以管理员身份登录。"
       resend_activation_email: "点击此处重新发送激活邮件。"
@@ -922,7 +961,7 @@ zh_CN:
       sent_activation_email_again: "我们又向 <b>{{currentEmail}}</b> 发送了一封激活邮件，邮件送达可能需要几分钟；请检查一下你邮箱的垃圾邮件文件夹。"
       to_continue: "请登录"
       preferences: "需要登入后更改设置"
-      forgot: "我记不清账号详情了"
+      forgot: "我记不清帐号详情了"
       not_approved: "你的帐号还未通过审核。一旦审核通过，我们将邮件通知你。"
       google:
         title: "Google 登录"
@@ -954,8 +993,8 @@ zh_CN:
       accept_invite: "接受邀请"
       success: "已创建您的帐号，您现在可以登录了。"
       name_label: "昵称"
-      name_label_optional: "昵称（可选）"
-      password_label: "设置密码(可选)"
+      password_label: "设置密码"
+      optional_description: "（可选）"
     password_reset:
       continue: "转入到 %{site_name}"
     emoji_set:
@@ -964,6 +1003,8 @@ zh_CN:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "仅分类"
       categories_with_featured_topics: "有推荐主题的分类"
@@ -972,15 +1013,38 @@ zh_CN:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    select_kit:
+      default_header_text: 选择...
+      no_content: 无符合的结果
+      filter_placeholder: 搜索……
+      create: "创建{{content}}"
+    emoji_picker:
+      filter_placeholder: 查找表情符号
+      people: 人物
+      nature: 自然
+      food: 食物
+      activity: 活动
+      travel: 旅行
+      objects: 物品
+      celebration: 庆典
+      custom: 自定义表情符号
+      recent: 近期使用
+      default_tone: 无肤色
+      light_tone: 浅肤色
+      medium_light_tone: 中浅肤色
+      medium_tone: 中间肤色
+      medium_dark_tone: 中深肤色
+      dark_tone: 深肤色
     composer:
       emoji: "Emoji :)"
       more_emoji: "更多…"
       options: "选项"
       whisper: "密语"
       unlist: "隐藏"
+      blockquote_text: "引用"
       add_warning: "正式警告"
       toggle_whisper: "折叠或展开密语"
-      toggle_unlisted: "未列表切换"
+      toggle_unlisted: "显示/隐藏于主题列表"
       posting_not_on_topic: "你想回复哪一个主题？"
       saving_draft_tip: "保存中..."
       saved_draft_tip: "已保存"
@@ -990,7 +1054,7 @@ zh_CN:
       group_mentioned:
         other: "提及 {{group}} 时，你将通知 <a href='{{group_link}}'>{{count}} 人</a> － 确定吗？"
       cannot_see_mention:
-        category: "你提到了{{userrname}}，然而他们不能访问该分类，所以他们不会被通知。你需要把他们加入到能访问该分类的群组中。"
+        category: "你提到了 {{username}} ，然而他们不能访问该分类，所以他们不会被通知。你需要把他们加入到能访问该分类的群组中。"
         private: "你提到了{{userrname}}，然而他们不能访问该私信，所以他们不会被通知。你需要邀请他们至私信中。"
       duplicate_link: "好像<b>@{{username}}</b>在<a href='{{post_url}}'>{{ago}}</a>中前的回复中已经发了你的链接 <b>{{domain}}</b> － 你想再次发表链接吗？"
       error:
@@ -1008,6 +1072,7 @@ zh_CN:
       cancel: "取消"
       create_topic: "创建主题"
       create_pm: "私信"
+      create_whisper: "密语"
       title: "或 Ctrl + 回车"
       users_placeholder: "添加用户"
       title_placeholder: "一句话告诉讨论什么..."
@@ -1015,6 +1080,7 @@ zh_CN:
       edit_reason_placeholder: "编辑理由"
       show_edit_reason: "添加理由"
       topic_featured_link_placeholder: "在标题里输入链接"
+      remove_featured_link: "从主题中移除链接。"
       reply_placeholder: "在此键入。使用Markdown，BBCode，或HTML格式。可拖拽或粘贴图片。"
       view_new_post: "浏览新帖。"
       saving: "保存中"
@@ -1045,12 +1111,9 @@ zh_CN:
       olist_title: "数字列表"
       ulist_title: "符号列表"
       list_item: "列表条目"
-      heading_label: "H"
-      heading_title: "标题"
-      heading_text: "标题头"
-      hr_title: "分割线"
       help: "Markdown 编辑帮助"
-      toggler: "隐藏或显示编辑面板"
+      collapse: "最小号编辑面板"
+      abandon: "关闭编辑面板并放弃草稿"
       modal_ok: "确认"
       modal_cancel: "取消"
       cant_send_pm: "抱歉，你不能向 %{username} 发送私信。"
@@ -1059,32 +1122,37 @@ zh_CN:
         body: "目前该私信只发给了你自己！"
       admin_options_title: "本主题可选设置"
     notifications:
+      tooltip:
+        regular:
+          other: "{{count}} 个未读通知"
+        message:
+          other: "{{count}} 条未读私信"
       title: "使用@提到你，回复你的内容、私信以及其他的通知"
       none: "现在无法载入通知"
       empty: "未发现通知"
       more: "看历史通知"
       total_flagged: "被标记帖子的总数"
-      mentioned: "<i title='被提及' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
-      group_mentioned: "<i title='群组被提及' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
-      quoted: "<i title='引用' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      replied: "<i title='回复' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      posted: "<i title='回复' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
-      edited: "<i title='编辑' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
-      liked: "<i title='赞' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
-      liked_2: "<i title='赞' class='fa fa-heart'></i><p><span>{{username}}、{{username2}}</span> {{description}}</p>"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}}"
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
       liked_many:
-        other: "<i title='赞' class='fa fa-heart'></i><p><span>{{username}}、{{username2}}</span>和其他 {{count}} 人</span>{{description}}</p>"
-      private_message: "<i title='私信' class='fa fa-envelope-o'></i><p><span>{{username}}</span>{{description}}</p>"
-      invited_to_private_message: "<i title='私信' class='fa fa-envelope-o'></i><p><span>{{username}}</span>{{description}}</p>"
-      invited_to_topic: "<i title='邀请至主题' class='fa fa-heart'></i><p><span>{{username}}</span>{{description}}</p>"
-      invitee_accepted: "<i title='已接受你的邀请' class='fa fa-user'></i><p><span>{{username}}</span>已接受你的邀请</p>"
-      moved_post: "<i title='移动了帖子' class='fa fa-sign-out'></i><p><span>{{username}}</span>移动了{{description}}</p>"
-      linked: "<i title='关联帖子' class='fa fa-link'></i><p><span>{{username}}</span>{{description}}</p>"
-      granted_badge: "<i title='徽章授予' 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='近期主题' class='fa fa-dot-circle-o'></i><p><span>近期主题</span>{{description}}</p>"
+        other: "<span>{{username}}, {{username2}} 和其他 {{count}} 人</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> 已接受你的邀请"
+      moved_post: "<span>{{username}}</span> 移动了 {{description}}"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "获得 “{{description}}”"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>新主题</span> {{description}}"
       group_message_summary:
-        other: "<i title='群组收件箱中的私信' class='fa fa-group'></i><p> {{count}} 条私信在{{group_name}}组的收件箱中</p>"
+        other: "{{count}} 条私信在{{group_name}}组的收件箱中"
       alt:
         mentioned: "被提及"
         quoted: "被引用"
@@ -1100,6 +1168,7 @@ zh_CN:
         linked: "链接至你的帖子"
         granted_badge: "勋章授予"
         group_message_summary: "在群组收件箱中的私信"
+        topic_reminder: "一个提醒"
       popup:
         mentioned: '{{username}}在“{{topic}}”提到了你 - {{site_title}}'
         group_mentioned: '{{username}}在“{{topic}}”提到了你 - {{site_title}}'
@@ -1122,6 +1191,7 @@ zh_CN:
       uploading: "上传中"
       select_file: "选择文件"
       image_link: "链接图片到"
+      default_image_alt_text: 图片
     search:
       sort_by: "排序"
       relevance: "最相关"
@@ -1132,14 +1202,19 @@ zh_CN:
       select_all: "全选"
       clear_all: "清除所有"
       too_short: "你的搜索词太短。"
-      result_count:
-        other: "搜索<span class='term'>“{{term}}”</span>有 {{count}} 条相关结果"
       title: "搜索主题、帖子、用户或分类"
       no_results: "没有找到结果。"
       no_more_results: "没有找到更多结果。"
       searching: "搜索中..."
       post_format: "#{{post_number}} 来自于 {{username}}"
-      results_page: "搜索结果"
+      results_page: "关于“{{term}}”的搜索结果"
+      more_results: "还有更多结果。请增加您的搜索条件。"
+      cant_find: "找不到你要找的内容？"
+      start_new_topic: "不如创建一个新主题？"
+      or_search_google: "或者尝试使用Google进行搜索："
+      search_google: "尝试使用Google进行搜索："
+      search_google_button: "Google"
+      search_google_title: "站内搜索"
       context:
         user: "搜索 @{{username}} 的帖子"
         category: "搜索 #{{category}} 分类"
@@ -1150,27 +1225,29 @@ zh_CN:
         posted_by:
           label: 发帖人
         in_category:
-          label: 在该分类中
+          label: 分类
         in_group:
           label: 在该群组中
         with_badge:
           label: 有该徽章
         with_tags:
-          label: 有该标签
+          label: 标签
         filters:
-          label: 只返回主题/帖子符合...
+          label: 只返回主题/帖子……
           likes: 我给了赞的
           posted: 我参与发帖
           watching: 我正在监看
           tracking: 我正在追踪
           private: 在我的私信中
-          bookmarks: 我已经收藏了
+          bookmarks: 我收藏了
           first: 是第一帖
           pinned: 是置顶的
           unpinned: 不是置顶的
-          seen: 我已经读过的
+          seen: 我阅读了
           unseen: 我还没有读过的
           wiki: 公共编辑
+          images: 包含图片
+          all_tags: 上述所有标签
         statuses:
           label: 当主题
           open: 是开放的
@@ -1228,7 +1305,7 @@ zh_CN:
         hot: "没有热门主题。"
         bookmarks: "你没有收藏任何主题。"
         category: "{{category}}分类中没有主题。"
-        top: "没有最佳主题。"
+        top: "没有热门主题。"
         search: "没有搜索结果。"
         educate:
           new: '<p>这里显示了近期主题列表。</p><p>默认情况下，最近 2 天内创建的主题将显示在近期列表，还会显示一个<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">近期</span>标志。<p>你可以在<a href="%{userPrefsUrl}">用户设置</a>中更改要显示哪些内容。</p>'
@@ -1241,7 +1318,7 @@ zh_CN:
         new: "没有更多的近期主题。"
         unread: "没有更多未读主题了。"
         category: "没有更多{{category}}分类的主题了。"
-        top: "没有更多最佳主题了。"
+        top: "没有更多的热门主题."
         bookmarks: "没有更多收藏的主题了。"
         search: "没有更多搜索结果了。"
     topic:
@@ -1289,8 +1366,8 @@ zh_CN:
       options: "主题选项"
       show_links: "显示此主题中的链接"
       toggle_information: "切换主题详情"
-      read_more_in_category: "想阅读更多？浏览{{catLink}}的其他主题 或 {{latestLink}}。"
-      read_more: "想阅读更多？{{catLink}} 或 {{latestLink}}。"
+      read_more_in_category: "想阅读更多？浏览{{catLink}}的其他主题或{{latestLink}}。"
+      read_more: "想阅读更多？{{catLink}}或{{latestLink}}。"
       read_more_MF: "还有 { UNREAD, plural, =0 {} one { <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}} other {}}"
       browse_all_categories: 浏览所有分类
       view_latest_topics: 查阅最新主题
@@ -1299,19 +1376,27 @@ zh_CN:
       jump_reply_down: 转到更新的回复
       deleted: "此主题已被删除"
       topic_status_update:
-        title: "设置主题计时器"
+        title: "主题计时器"
         save: "设置计时器"
         num_of_hours: "小时数："
         remove: "撤销计时器"
         publish_to: "发布至："
         when: "时间："
+        public_timer_types: 主题计时器
+        private_timer_types: 用户主题计时器
       auto_update_input:
+        none: "选择时间范围"
         later_today: "今天的某个时候"
         tomorrow: "明天"
         later_this_week: "这周的某个时候"
         this_weekend: "周末"
         next_week: "下个星期"
+        two_weeks: "两周"
         next_month: "下个月"
+        three_months: "三个月"
+        six_months: "六个月"
+        one_year: "一年"
+        forever: "永远"
         pick_date_and_time: "选择日期和时间"
         set_based_on_last_post: "按照最新帖子关闭"
       publish_to_category:
@@ -1335,7 +1420,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: '自动关闭设置'
@@ -1489,6 +1574,7 @@ zh_CN:
         success_email: "我们发了一封邮件邀请<b>{{emailOrUsername}}</b>。邀请被接受后你会收到通知。检查用户页中的邀请标签页来追踪你的邀请。"
         success_username: "我们已经邀请了该用户参与该主题。"
         error: "抱歉，我们不能邀请这个人。可能他已经被邀请了？（邀请有频率限制）"
+        success_existing_email: "用户<b>{{emailOrUsername}}</b>已存在。我们已经邀请了该用户参与该主题。"
       login_reply: '登录以回复'
       filters:
         n_posts:
@@ -1529,7 +1615,14 @@ zh_CN:
       multi_select:
         select: '选择'
         selected: '已选择（{{count}}）'
-        select_replies: '选择以及回复其的帖子'
+        select_post:
+          label: '选中'
+          title: '将帖子加入选择'
+        selected_post:
+          label: '已选中'
+          title: '单击以将帖子从中移除'
+        select_replies:
+          label: '选择与回复'
         delete: 删除所选
         cancel: 取消选择
         select_all: 全选
@@ -1540,7 +1633,7 @@ zh_CN:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "引用"
-      edit: "编辑 {{replyAvatar}} {{username}}发表的{{link}}"
+      edit: "<i class='fa fa-pencil'></i> {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "理由："
       post_number: "帖子 {{number}}"
       wiki_last_edited_on: "维基最后修改于"
@@ -1595,17 +1688,13 @@ zh_CN:
         has_liked: "已赞"
         undo_like: "取消赞"
         edit: "编辑本帖"
+        edit_action: "编辑"
         edit_anonymous: "抱歉，需要登录后才能编辑该贴。"
         flag: "背地里标记该帖以示警示，或发送关于它的私下通知"
         delete: "删除本帖"
         undelete: "恢复本帖"
         share: "分享指向这个帖子的链接"
         more: "更多"
-        delete_replies:
-          confirm:
-            other: "同时删除 {{count}} 个回复这个帖子的相关帖子么？"
-          yes_value: "是，一并删除相关回复"
-          no_value: "否，仅删除该帖"
         admin: "帖子管理"
         wiki: "公共编辑"
         unwiki: "限制公共编辑"
@@ -1617,7 +1706,7 @@ zh_CN:
       actions:
         flag: '标记'
         defer_flags:
-          other: "推迟处理标记"
+          other: "忽略标记"
         undo:
           off_topic: "撤回标记"
           spam: "撤回标记"
@@ -1633,6 +1722,8 @@ zh_CN:
           notify_user: "发送私信"
           bookmark: "收藏"
           like: "赞了它"
+          like_capped:
+            other: "和其他 {{count}} 人赞了它"
           vote: "已投票"
         by_you:
           off_topic: "你标记其偏离主题"
@@ -1677,9 +1768,6 @@ zh_CN:
             other: "{{count}} 人赞了它"
           vote:
             other: "{{count}} 人已投票"
-      delete:
-        confirm:
-          other: "确定要删除这些帖子吗？"
       merge:
         confirm:
           other: "确定要合并这 {{count}} 个帖子吗？"
@@ -1728,8 +1816,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: "运行在该分类中发布特色链接"
@@ -1761,9 +1849,10 @@ zh_CN:
       special_warning: "警告：这个分类是已经自动建立好的分类，它的安全设置不能被更改。如果你不想要使用这个分类，直接删除它，而不是另作他用。"
       images: "图片"
       email_in: "自定义进站电子邮件地址："
-      email_in_allow_strangers: "接受无账号的匿名用户的邮件"
+      email_in_allow_strangers: "接受无帐号的匿名用户的邮件"
       email_in_disabled: "站点设置中已经禁用通过邮件发表新主题。欲启用通过邮件发表新主题，"
       email_in_disabled_click: '启用“邮件发表”设置。'
+      mailinglist_mirror: "分类镜像了一个邮件列表"
       suppress_from_homepage: "不在主页中显示这个分类。"
       show_subcategory_list: "在这个分类中把子分类列表显示在主题的上面"
       num_featured_topics: "分类页面上显示的主题数量："
@@ -1978,7 +2067,7 @@ zh_CN:
         this_month: "月"
         this_week: "周"
         today: "今天"
-        other_periods: "跳至顶部"
+        other_periods: "查看热门"
     browser_update: '抱歉，<a href="http://www.discourse.com/faq/#browser">你的浏览器版本太低，无法正常访问该站点。</a>。请<a href="http://browsehappy.com">升级你的浏览器</a>。'
     permission_types:
       full: "创建 / 回复 / 阅读"
@@ -2013,7 +2102,7 @@ zh_CN:
         hamburger_menu: '<b>=</b> 打开汉堡菜单'
         user_profile_menu: '<b>p</b> 打开用户菜单'
         show_incoming_updated_topics: '<b>.</b> 显示更新主题'
-        search: '<b>/</b> 搜索'
+        search: '<b>/</b>或<b>ctrl</b>+<b>alt</b>+<b>f</b> 搜索'
         help: '<b>?</b> 打开键盘帮助'
         dismiss_new_posts: '<b>x</b> 然后 <b>r</b> 解除新/帖子提示'
         dismiss_topics: '<b>x</b> 然后 <b>t</b> 解除主题提示'
@@ -2080,9 +2169,11 @@ zh_CN:
       selector_no_tags: "无标签"
       changed: "标签被修改："
       tags: "标签"
-      choose_for_topic: "为此主题选择可选标签"
+      choose_for_topic: "可选标签"
       delete_tag: "删除标签"
-      delete_confirm: "确定要删除这个标签吗？"
+      delete_confirm:
+        other: "你确定你想要删除这个标签以及撤销在{{count}}个主题中的关联么？"
+      delete_confirm_no_topics: "你确定你想要删除这个标签吗？"
       rename_tag: "重命名标签"
       rename_instructions: "标签的新名称："
       sort_by: "排序方式："
@@ -2133,7 +2224,7 @@ zh_CN:
           latest: "没有最新主题。"
           hot: "没有热门主题。"
           bookmarks: "你还没有收藏主题。"
-          top: "没有最佳主题。"
+          top: "没有热门主题。"
           search: "没有搜索结果。"
         bottom:
           latest: "没有更多的最新主题。"
@@ -2142,7 +2233,7 @@ zh_CN:
           read: "没有更多已阅主题可看了。"
           new: "没有更多的近期主题。"
           unread: "没有更多未读主题了。"
-          top: "没有更多最佳主题了。"
+          top: "没有更多的热门主题."
           bookmarks: "没有更多收藏的主题了。"
           search: "没有更多搜索结果了。"
     invite:
@@ -2177,7 +2268,7 @@ zh_CN:
         no_problems: "找不到问题."
         moderators: '版主：'
         admins: '管理员：'
-        blocked: '禁止参与讨论:'
+        silenced: '禁言：'
         suspended: '禁止登录'
         private_messages_short: "私信"
         private_messages_title: "私信"
@@ -2210,22 +2301,23 @@ zh_CN:
         by: "来自"
       flags:
         title: "标记"
-        old: "历史"
-        active: "待处理"
+        active_posts: "被标记帖子"
+        old_posts: "过去被标记帖子"
+        topics: "被标记主题"
+        moderation_history: "管理日志"
         agree: "确认标记"
         agree_title: "确认这个标记有效且正确"
-        agree_flag_modal_title: "确认标记并执行..."
-        agree_flag_hide_post: "确认标记（隐藏帖子并发送私信）"
-        agree_flag_hide_post_title: "隐藏帖子并自动发送私信要求用户修改"
-        agree_flag_restore_post: "确认 (还原帖子)"
-        agree_flag_restore_post_title: "还原这篇帖子"
-        agree_flag: "确认标记"
-        agree_flag_title: "确认标记，不对帖子进行操作"
-        defer_flag: "推迟处理"
+        agree_flag_hide_post: "确认并隐藏帖子"
+        agree_flag_hide_post_title: "隐藏帖子并自动发送私信给作者使其修改"
+        agree_flag_restore_post: "确认并恢复帖子"
+        agree_flag_restore_post_title: "恢复帖子为所有用户可见。"
+        agree_flag: "确认并保持帖子"
+        agree_flag_title: "确认标记并保持帖子不变。"
+        defer_flag: "忽略"
         defer_flag_title: "移除标记；这次不处理。"
         delete: "删除"
         delete_title: "删除标记指向的帖子。"
-        delete_post_defer_flag: "删除帖子并推迟处理标记"
+        delete_post_defer_flag: "删除帖子并忽略标记"
         delete_post_defer_flag_title: "删除此帖；如果这是这个主题内的第一篇帖子则删除主题"
         delete_post_agree_flag: "删除帖子并确认标记"
         delete_post_agree_flag_title: "删除此帖；如果这是这个主题内的第一篇帖子则删除主题"
@@ -2239,32 +2331,37 @@ zh_CN:
         clear_topic_flags: "完成"
         clear_topic_flags_title: "主题的问题已经已被调查且提案已被解决。单击<strong>完成</strong>以删除报告。"
         more: "（更多回复...）"
+        suspend_user: "禁用用户"
+        suspend_user_title: "因该贴禁用用户"
         dispositions:
           agreed: "已确认"
           disagreed: "被否决"
-          deferred: "已推迟"
+          deferred: "忽略"
         flagged_by: "标记者"
         resolved_by: "处理者"
         took_action: "立即执行"
         system: "系统"
         error: "出错了"
         reply_message: "回复"
-        no_results: "当前没有标记。"
+        no_results: "没有被标记的主题。"
         topic_flagged: "<strong>主题</strong>已经被标记。"
+        show_full: "显示全部帖子"
         visit_topic: "浏览主题才能操作"
         was_edited: "帖子在第一次标记后被编辑"
         previous_flags_count: "这篇帖子已经被标记了 {{count}} 次。"
-        summary:
-          action_type_3:
-            other: "偏离主题 x{{count}}"
-          action_type_4:
-            other: "不当内容 x{{count}}"
-          action_type_6:
-            other: "自定义 x{{count}}"
-          action_type_7:
-            other: "自定义 x{{count}}"
-          action_type_8:
-            other: "广告 x{{count}}"
+        show_details: "显示标记细节"
+        details: "详情"
+        flagged_topics:
+          topic: "主题"
+          type: "类型"
+          users: "用户"
+          last_flagged: "最后标记"
+        short_names:
+          off_topic: "离题"
+          inappropriate: "不恰当"
+          spam: "广告"
+          notify_user: "自定义"
+          notify_moderators: "自定义"
       groups:
         primary: "主要群组"
         no_primary: "(无主要群组)"
@@ -2352,7 +2449,6 @@ zh_CN:
           details: "当有新回复、编辑、帖子被删除或者恢复时。"
         user_event:
           name: "用户事件"
-          details: "当用户被创建、审核通过或更新时。"
         delivery_status:
           title: "分发状态"
           inactive: "不活跃"
@@ -2383,7 +2479,7 @@ zh_CN:
       plugins:
         title: "插件"
         installed: "安装的插件"
-        name: "名字"
+        name: "插件名"
         none_installed: "你没有安装任何插件。"
         version: "版本"
         enabled: "启用？"
@@ -2432,7 +2528,7 @@ zh_CN:
           download:
             label: "下载"
             title: "发送含下载链接的邮件"
-            alert: "包含下载备份链接的邮件已经发送给你了。\b"
+            alert: "包含下载备份链接的邮件已经发送给你了。"
           destroy:
             title: "删除备份"
             confirm: "你确定要删除该备份吗？"
@@ -2656,6 +2752,15 @@ zh_CN:
             type_placeholder: "摘要、注册…"
             reply_key_placeholder: "回复键"
             skipped_reason_placeholder: "原因"
+      moderation_history:
+        performed_by: "执行由"
+        no_results: "暂无管理历史。"
+        actions:
+          delete_user: "删除的用户"
+          suspend_user: "封禁的用户"
+          silence_user: "禁言的用户"
+          delete_post: "删除的帖子"
+          delete_topic: "删除的主题"
       logs:
         title: "日志"
         action: "操作"
@@ -2695,7 +2800,7 @@ zh_CN:
             change_trust_level: "更改信任等级"
             change_username: "修改用户名"
             change_site_setting: "更改站点设置"
-            change_theme: "\b更改主题"
+            change_theme: "更改主题"
             delete_theme: "删除主题"
             change_site_text: "更改站点文字"
             suspend_user: "封禁用户"
@@ -2711,8 +2816,8 @@ zh_CN:
             change_category_settings: "更改分类设置"
             delete_category: "删除分类"
             create_category: "创建分类"
-            block_user: "封禁用户"
-            unblock_user: "解封用户"
+            silence_user: "禁言用户"
+            unsilence_user: "解除禁言用户"
             grant_admin: "授予管理员权限"
             revoke_admin: "撤销管理员权限"
             grant_moderation: "授予版主权限"
@@ -2760,8 +2865,44 @@ zh_CN:
           roll_up:
             text: "折叠"
             title: "如果有至少 'min_ban_entries_for_roll_up' 个记录，创建一个子网封禁记录"
+        search_logs:
+          title: "搜索日志"
+          term: "术语"
+          searches: "搜索"
+          click_through: "点击通过"
+          unique: "独特"
+          unique_title: "执行搜索的特定用户"
+          types:
+            all_search_types: "所有搜索类型"
+            header: "头部"
+            full_page: "完整页面"
         logster:
           title: "错误日志"
+      watched_words:
+        title: "敏感词"
+        search: "搜索"
+        clear_filter: "清除"
+        show_words: "显示敏感词"
+        word_count:
+          other: "%{count}个敏感词"
+        actions:
+          block: '封禁'
+          censor: '审查'
+          require_approval: '需要审核'
+          flag: '旗标'
+        action_descriptions:
+          block: '防止发布包含这些敏感词的帖子。用户提交帖子时会收到错误提示。'
+          censor: '允许包含这些敏感词的帖子，但将其替换为隐藏敏感词的字符。'
+          require_approval: '包含这些敏感词的帖子需通过人工审核才能被看到。'
+          flag: '允许包含这些敏感词的帖子，但将其标记为不当，以便版主审核。'
+        form:
+          label: '新敏感词：'
+          placeholder: '完整字词或 * 作为通配符'
+          placeholder_regexp: "正则表达式"
+          add: '新增'
+          success: '成功'
+          upload: "上传"
+          upload_successful: "上传成功。敏感词已添加。"
       impersonate:
         title: "检视用户视角"
         help: "使用此工具来检视其他用户的帐号以方便调试。你应该在完成后立即退出。"
@@ -2781,7 +2922,7 @@ zh_CN:
           pending: "未审核"
           staff: '管理人员'
           suspended: '禁止登录'
-          blocked: '禁止参与讨论'
+          silenced: '已禁言'
           suspect: '怀疑'
         approved: "已批准？"
         approved_selected:
@@ -2800,7 +2941,7 @@ zh_CN:
           staff: "管理人员"
           admins: '管理员'
           moderators: '版主'
-          blocked: '被封用户'
+          silenced: '被禁言的用户'
           suspended: '被禁用户'
           suspect: '嫌疑用户'
         reject_successful:
@@ -2815,18 +2956,31 @@ zh_CN:
         suspend_failed: "禁止此用户时发生了错误 {{error}}"
         unsuspend_failed: "解禁此用户时发生了错误 {{error}}"
         suspend_duration: "该用户将被封禁多久？"
-        suspend_duration_units: "（天）"
         suspend_reason_label: "为什么封禁该用户？该理由将公开显示在用户个人页面上，当其尝试登录时，也看到这条理由。尽量简洁。"
+        suspend_reason_hidden_label: "你为什么被封禁了？该理由将在用户尝试登录时显示。尽量简洁。"
         suspend_reason: "封禁的理由"
+        suspend_reason_placeholder: "禁用理由"
+        suspend_message: "邮件消息"
+        suspend_message_placeholder: "（可选）你可以提供更多封禁的理由并邮件用户该理由。"
         suspended_by: "封禁操作者："
+        silence_reason: "理由"
+        silenced_by: "已禁用，由"
+        silence_modal_title: "被禁言用户"
+        silence_duration: "该用户将被禁言多久？"
+        silence_reason_label: "为何禁言该用户？"
+        silence_reason_placeholder: "禁言理由"
+        silence_message: "邮件消息"
+        silence_message_placeholder: "(留空以发送默认消息)"
+        suspended_until: "（直到%{until}）"
+        cant_suspend: "该用户不能被封禁。"
         delete_all_posts: "删除所有帖子"
         delete_all_posts_confirm_MF: "你将要删除 {POSTS, plural, one {1 个帖子} other {# 个帖子}}和 {TOPICS, plural, one {1 个主题} other {# 个主题}}。确定吗？"
-        suspend: "禁止"
-        unsuspend: "解禁"
-        suspended: "已禁止？"
+        silence: "禁言"
+        unsilence: "解除禁言"
+        silenced: "禁言？"
         moderator: "版主？"
         admin: "管理员？"
-        blocked: "已封?"
+        suspended: "已禁止？"
         staged: "暂存？"
         show_admin_profile: "管理员"
         refresh_browsers: "强制浏览器刷新"
@@ -2842,8 +2996,8 @@ zh_CN:
         grant_admin_confirm: "我们已经发送了一封邮件以验证新管理员。请打开邮件并按照指示完成确认。"
         revoke_moderation: '吊销论坛版主资格'
         grant_moderation: '赋予论坛版主资格'
-        unblock: '解封'
-        block: '封号'
+        unsuspend: '解禁'
+        suspend: '禁止'
         reputation: 声誉
         permissions: 权限
         activity: 活动
@@ -2887,10 +3041,10 @@ zh_CN:
         activate_failed: "在激活用户帐号时发生了错误。"
         deactivate_account: "停用帐号"
         deactivate_failed: "在停用用户帐号时发生了错误。"
-        unblock_failed: '在解除用户帐号封禁时发生了错误。'
-        block_failed: '在封禁用户帐号时发生了错误。'
-        block_confirm: '你确定要封禁用户吗？他们将没有办法创建任何主题或者帖子。'
-        block_accept: '是的，封禁用户'
+        unsilence_failed: '解除禁言时出错了。'
+        silence_failed: '禁言用户时出错了。'
+        silence_confirm: '你确定要禁言该用户吗？他们将不能创建主题或帖子。'
+        silence_accept: '是的，禁言该用户'
         bounce_score: "累计退信分值"
         reset_bounce_score:
           label: "重置"
@@ -2898,7 +3052,7 @@ zh_CN:
         visit_profile: "访问<a href='%{url}'>用户设置页面</a>编辑他们的个人页"
         deactivate_explanation: "已停用的用户必须重新验证他们的电子邮件。"
         suspended_explanation: "一个被封禁的用户不能登录。"
-        block_explanation: "被封禁的用户不能发表主题或者评论。"
+        silence_explanation: "被禁言的用户不能发帖或创建主题。"
         staged_explanation: "暂存用户只能通过邮件回复指定主题。"
         bounce_score_explanation:
           none: "近期该邮箱没有退信。"
@@ -2942,7 +3096,7 @@ zh_CN:
           title: "单点登录"
           external_id: "外部 ID"
           external_username: "用户名"
-          external_name: "名字"
+          external_name: "外部系统中的名字"
           external_email: "电子邮件"
           external_avatar_url: "头像URL"
       user_fields:
@@ -3015,6 +3169,7 @@ zh_CN:
           developer: '开发者'
           embedding: "嵌入"
           legal: "法律信息"
+          api: 'API'
           user_api: '用户 API'
           uncategorized: '未分类'
           backups: "备份"
@@ -3151,7 +3306,7 @@ zh_CN:
       uploading: "上传中..."
       quit: "以后再说"
       staff_count:
-        other: "你的社区中有 %{count} 位工作人员。"
+        other: "你的社区中包括你在内有 %{count} 位工作人员。"
       invites:
         add_user: "添加"
         none_added: "你还没有邀请任何工作人员。你确定要继续吗？"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index b49b176e7d..83409b1f3e 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -119,23 +119,23 @@ zh_TW:
         disabled: '於 %{when} 除名'
     topic_admin_menu: "版區管理員操作"
     emails_are_disabled: "管理員已經停用了所有外寄郵件功能。通知信件都不會寄出。"
-    bootstrap_mode_enabled: "為方便站點準備發佈，現正處於初始化模式中。所有新用戶將被授予信任等級1，並為他們設置接受每日郵件摘要。初始化模式會在用戶數超過 %{min_users} 個時關閉。"
+    bootstrap_mode_enabled: "為了讓你的新網站更容易上軌道，現正處於初始化模式中。所有新用戶將被授予信任等級1，並為他們設定接受每日郵件摘要。初始化模式將於用戶數超過 %{min_users} 位後關閉。"
     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: "這個團隊裡面沒有成員"
@@ -333,6 +329,7 @@ zh_TW:
       join: "加入團隊"
       leave: "離開團隊"
       request: "請求加入團隊"
+      message: "訊息"
       automatic_group: 自動群組
       closed_group: 關閉群組
       is_group_user: "你是團隊裡面的成員"
@@ -342,12 +339,9 @@ zh_TW:
       bio: "關於群組"
       selector_placeholder: "新增成員"
       owner: "擁有者"
-      visible: "群組可被所有用戶看到"
       index:
         title: "群組"
         empty: "沒有可看見的群組。"
-      title:
-        other: "群組"
       activity: "活動"
       members: "成員"
       topics: "主題"
@@ -355,7 +349,6 @@ zh_TW:
       mentions: "提及"
       messages: "訊息"
       alias_levels:
-        title: "誰可以在這個群組發送訊息和使用@提到"
         nobody: "沒有"
         only_admins: "只有管理員"
         mods_and_admins: "只有板主以及管理員"
@@ -449,7 +442,6 @@ zh_TW:
       mute: "靜音"
       edit: "編輯喜好設定"
       download_archive:
-        button_text: "下載我的文章"
         confirm: "你確定要下載你的文章嗎?"
         success: "開始下載，處理完畢後將以私人訊息通知您。"
         rate_limit_error: "帖子只能每天下載一次，請明天再重試。"
@@ -486,7 +478,6 @@ zh_TW:
       admin: "{{user}} 是管理員"
       moderator_tooltip: "此用戶為板主"
       admin_tooltip: "此用戶為管理員"
-      blocked_tooltip: "此用戶被屏蔽"
       suspended_notice: "此用戶已被停權至 {{date}}。"
       suspended_reason: "原因: "
       github_profile: "Github"
@@ -501,7 +492,7 @@ zh_TW:
         individual_no_echo: "每當有新文章時，寄給我郵件通知（除了我自己的文章）"
         many_per_day: "每當有新文章時，寄給我郵件通知（每天約有  {{dailyEmailEstimate}}  封）。"
         few_per_day: "每當有新文章時，寄給我郵件通知（每天約有 2  封）。"
-      tag_settings: "添加"
+      tag_settings: "標籤"
       watched_tags: "已觀看"
       watched_tags_instructions: "您將會自動監視所有這些添加的主題。您會收到新文章或新主題的通知，新文章數量將出現在每個主題後。"
       tracked_tags: "已追蹤"
@@ -551,6 +542,15 @@ zh_TW:
         move_to_archive: "封存"
         failed_to_move: "移動到所選郵件失敗(也許你的網絡沒有開啟)"
         select_all: "選擇全部"
+      preferences_nav:
+        account: "帳號"
+        profile: "基本資料"
+        emails: "電子郵件"
+        notifications: "通知"
+        categories: "分類"
+        tags: "標籤"
+        interface: "界面"
+        apps: "應用"
       change_password:
         success: "( 寄出的郵件 )"
         in_progress: "( 正在傳送郵件 )"
@@ -566,7 +566,6 @@ zh_TW:
         title: "修改用戶名稱"
         confirm: "確定更換用戶名？你的帖子和@提及你的引用將失效。"
         taken: "抱歉，此用戶名稱已經有人使用。"
-        error: "修改你的用戶名稱時發生錯誤。"
         invalid: "此用戶名稱無效，只能使用數字與英文字母。"
       change_email:
         title: "修改電子郵件地址"
@@ -732,10 +731,6 @@ zh_TW:
           other: "討論話題已建立"
         post_count:
           other: "帖子已建立"
-        likes_given:
-          other: "<i class='fa fa-heart'></i> 送出的"
-        likes_received:
-          other: "<i class='fa fa-heart'></i> 收到的"
         days_visited:
           other: "到訪天數"
         posts_read:
@@ -823,7 +818,6 @@ zh_TW:
     first_post: 第一篇文章
     mute: 靜音
     unmute: 取消靜音
-    last_post: 最後一篇文章
     last_reply_lowercase: 最新回覆
     replies_lowercase:
       other: 回覆
@@ -925,7 +919,6 @@ zh_TW:
       your_email: "您帳號的電郵地址是 <b>%{email}</b>"
       accept_invite: "接受邀請"
       success: "你的帳號已被建立，且您已經登入了。"
-      password_label: "設定密碼(選填)"
     password_reset:
       continue: "繼續連接至 %{site_name}"
     emoji_set:
@@ -1014,12 +1007,7 @@ zh_TW:
       olist_title: "編號清單"
       ulist_title: "符號清單"
       list_item: "清單項目"
-      heading_label: "H"
-      heading_title: "標頭"
-      heading_text: "標頭"
-      hr_title: "分隔線"
       help: "Markdown 編輯說明"
-      toggler: "隱藏或顯示編輯面板"
       modal_ok: "確定"
       modal_cancel: "取消"
       cant_send_pm: "抱歉，你不能向 %{username} 發送訊息。"
@@ -1033,26 +1021,6 @@ zh_TW:
       empty: "未找到任何通知。"
       more: "檢視較舊的通知"
       total_flagged: "所有被投訴的文章"
-      mentioned: "<i title='被提到' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
-      group_mentioned: "<i title='群組被提及' 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='回覆' 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='讚' class='fa fa-heart'></i><p><span>{{username}}、{{username2}}</span> {{description}}</p>"
-      liked_many:
-        other: "<i title='讚' class='fa fa-heart'></i><p><span>{{username}}、{{username2}}</span>和其他 {{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='邀請至主題' class='fa fa-heart'></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='關聯帖子' 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='近期主題' class='fa fa-dot-circle-o'></i><p><span>近期主題</span>{{description}}</p>"
-      group_message_summary:
-        other: "<i title='群組收件箱中的消息' class='fa fa-group'></i><p> {{count}} 條消息在{{group_name}}組的收件箱中</p>"
       alt:
         mentioned: "被提及"
         quoted: "引用者"
@@ -1099,8 +1067,6 @@ zh_TW:
       select_all: "選擇全部"
       clear_all: "清除全部"
       too_short: "你的搜索詞太短。"
-      result_count:
-        other: "搜索<span class='term'>“{{term}}”</span>有 {{count}} 條相關結果"
       title: "搜尋討論話題、文章、用戶或分類"
       no_results: "未找到任何結果。"
       no_more_results: "沒有找到更多的結果。"
@@ -1115,22 +1081,15 @@ zh_TW:
         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: 不是置頂的
@@ -1444,7 +1403,6 @@ zh_TW:
       multi_select:
         select: '選取'
         selected: '選取了 ({{count}})'
-        select_replies: '選取 + 回覆'
         delete: 刪除選取的文章
         cancel: 取消選取
         select_all: 選擇全部
@@ -1455,7 +1413,6 @@ zh_TW:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "引用"
-      edit: "編輯 {{replyAvatar}} {{username}} 發表的 {{link}}"
       edit_reason: "原因: "
       post_number: "文章 {{number}}"
       wiki_last_edited_on: "共筆最後編輯時間"
@@ -1516,11 +1473,6 @@ zh_TW:
         undelete: "復原此文章"
         share: "分享此文章的連結"
         more: "更多"
-        delete_replies:
-          confirm:
-            other: "你是否要同時刪除 {{count}} 篇針對這則文章的回覆？"
-          yes_value: "是，將回覆文章一併刪除"
-          no_value: "否，只刪除此文章"
         admin: "文章管理動作"
         wiki: "做為共筆"
         unwiki: "取消共筆"
@@ -1531,8 +1483,6 @@ zh_TW:
         change_owner: "更改作者"
       actions:
         flag: '投訴'
-        defer_flags:
-          other: "暫緩投訴"
         undo:
           off_topic: "撤回投訴"
           spam: "撤回投訴"
@@ -1592,12 +1542,6 @@ zh_TW:
             other: "{{count}} 人對此按讚"
           vote:
             other: "{{count}} 人已投票給此文章"
-      delete:
-        confirm:
-          other: "你確定要刪除這些文章?"
-      merge:
-        confirm:
-          other: "確定要合併這 {{count}} 個帖子嗎？"
       revisions:
         controls:
           first: "第一版"
@@ -1632,8 +1576,6 @@ zh_TW:
       settings: '設定'
       topic_template: "主題範本"
       tags: "標籤"
-      tags_allowed_tags: "僅在該分類內可以使用的標籤"
-      tags_allowed_tag_groups: "僅在該分類內可以使用的標籤組"
       tags_placeholder: "（可選）允許使用的標籤列表"
       tag_groups_placeholder: "（可選）允許使用的標籤組列表"
       topic_featured_link_allowed: "運行在該分類中發佈特色連結"
@@ -1905,7 +1847,6 @@ zh_TW:
         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> 解除主題提示'
@@ -1970,9 +1911,7 @@ zh_TW:
       selector_no_tags: "無標籤"
       changed: "標籤被修改："
       tags: "標籤"
-      choose_for_topic: "為此主題選擇可選標籤"
       delete_tag: "刪除標籤"
-      delete_confirm: "確定要刪除這個標籤嗎？"
       rename_tag: "重命名標籤"
       rename_instructions: "標籤的新名稱："
       sort_by: "排序方式："
@@ -2067,7 +2006,6 @@ zh_TW:
         no_problems: "未發現任何問題。"
         moderators: '板主：'
         admins: '管理員：'
-        blocked: '已封鎖：'
         suspended: '已停權:'
         private_messages_short: "訊息"
         private_messages_title: "訊息"
@@ -2100,24 +2038,12 @@ zh_TW:
         by: "由"
       flags:
         title: "投訴"
-        old: "舊的"
-        active: "待處理"
         agree: "同意"
         agree_title: "確認此投訴為有效且正確"
-        agree_flag_modal_title: "批准並且 ..."
-        agree_flag_hide_post: "批准 (隱藏文章 + 送出私人訊息)"
-        agree_flag_hide_post_title: "隱藏此文章，並自動向此用戶送出私人訊息，要求盡快修改它"
-        agree_flag_restore_post: "同意（還原文章）"
-        agree_flag_restore_post_title: "回復此文章"
-        agree_flag: "同意投訴"
-        agree_flag_title: "同意投訴且不更動文章"
-        defer_flag: "延遲"
         defer_flag_title: "移除標記；不需處理。"
         delete: "刪除"
         delete_title: "刪除此標記文章。"
-        delete_post_defer_flag: "刪除文章並且延緩檢舉"
         delete_post_defer_flag_title: "刪除文章，如果刪除的是討論話題的第一則文章，討論話題也將一併刪除"
-        delete_post_agree_flag: "刪除文章並且同意檢舉"
         delete_post_agree_flag_title: "刪除文章，如果刪除的是討論話題的第一則文章，討論話題也將一併刪除"
         delete_flag_modal_title: "刪除並且..."
         delete_spammer: "刪除垃圾文章發送者"
@@ -2132,29 +2058,16 @@ zh_TW:
         dispositions:
           agreed: "同意"
           disagreed: "不同意"
-          deferred: "之後再處理"
         flagged_by: "投訴者"
         resolved_by: "處理為"
         took_action: "採取行動"
         system: "系統"
         error: "發生了某些錯誤"
         reply_message: "回覆"
-        no_results: "沒有投訴。"
         topic_flagged: "此 <strong>討論話題</strong> 已被投訴。"
         visit_topic: "瀏覽討論話題以採取行動"
         was_edited: "文章已在第一次標記後被編輯"
         previous_flags_count: "這篇文章已經被標記  {{count}} 次。"
-        summary:
-          action_type_3:
-            other: "離題 x{{count}}"
-          action_type_4:
-            other: "不宜內容 x{{count}}"
-          action_type_6:
-            other: "自訂 x{{count}}"
-          action_type_7:
-            other: "自訂 x{{count}}"
-          action_type_8:
-            other: "垃圾內容 x{{count}}"
       groups:
         primary: "主要群組"
         no_primary: "( 沒有主要群組 )"
@@ -2238,7 +2151,6 @@ zh_TW:
           details: "當有新回覆、編輯、帖子被刪除或者恢復時。"
         user_event:
           name: "用戶事件"
-          details: "當用戶被創建、審核通過或更新時。"
         delivery_status:
           title: "分髮狀態"
           inactive: "不活躍"
@@ -2519,8 +2431,6 @@ zh_TW:
             change_category_settings: "變更分類設定"
             delete_category: "刪除分類"
             create_category: "建立分類"
-            block_user: "封鎖用戶"
-            unblock_user: "解除封鎖"
             grant_admin: "授予管理員權限"
             revoke_admin: "撤銷管理員權限"
             grant_moderation: "授予板主權限"
@@ -2587,7 +2497,6 @@ zh_TW:
           pending: "申請中"
           staff: '管理員'
           suspended: '已停權'
-          blocked: '已封鎖'
           suspect: '嫌疑'
         approved: "已批准？"
         approved_selected:
@@ -2606,7 +2515,6 @@ zh_TW:
           staff: "管理員"
           admins: '管理員'
           moderators: '板主'
-          blocked: '已封鎖的用戶'
           suspended: '已停權的用戶'
           suspect: '嫌疑使用者'
         reject_successful:
@@ -2621,18 +2529,14 @@ zh_TW:
         suspend_failed: "將此用戶停權時發生錯誤 {{error}}"
         unsuspend_failed: "恢復此用戶的權限時發生錯誤 {{error}}"
         suspend_duration: "你想將此用戶停權多久?"
-        suspend_duration_units: "(天)"
         suspend_reason_label: "你為什麼要將此用戶停權？你輸入的原因將在此用戶登入時顯示，及顯示在此用戶的基本資料頁面，且<b>任何人都可以看見</b>，請簡短說明原因。"
         suspend_reason: "原因"
         suspended_by: "將其停權者"
         delete_all_posts: "刪除所有文章"
         delete_all_posts_confirm_MF: "你將要刪除 {POSTS, plural, one {1 個帖子} other {# 個帖子}}和 {TOPICS, plural, one {1 個主題} other {# 個主題}}。確定嗎？"
-        suspend: "停權"
-        unsuspend: "恢復權限"
-        suspended: "已停權?"
         moderator: "板主？"
         admin: "管理員？"
-        blocked: "已封鎖？"
+        suspended: "已停權?"
         staged: "暫存？"
         show_admin_profile: "管理員"
         refresh_browsers: "強制瀏覽器重新整理"
@@ -2647,8 +2551,8 @@ zh_TW:
         grant_admin: '授予管理員權限'
         revoke_moderation: '撤銷板主權限'
         grant_moderation: '授予板主權限'
-        unblock: '解除封鎖'
-        block: '封鎖'
+        unsuspend: '恢復權限'
+        suspend: '停權'
         reputation: 聲望
         permissions: 權限
         activity: 活動
@@ -2692,17 +2596,12 @@ zh_TW:
         activate_failed: "啟用此帳號時發生錯誤。"
         deactivate_account: "取消帳號的啟用狀態"
         deactivate_failed: "取消此帳號的啟用狀態時發生錯誤。"
-        unblock_failed: '解除此用戶的封鎖狀態時發生錯誤。'
-        block_failed: '封鎖此用戶時發生錯誤。'
-        block_confirm: '你確定要封禁用戶嗎？他們將沒有辦法創建任何主題或者帖子。'
-        block_accept: '是的，封禁用戶'
         bounce_score: "累計退信分值"
         reset_bounce_score:
           label: "重置"
           title: "重置累計退信分值為 0"
         deactivate_explanation: "帳號的啟用狀態被取消的用戶必需重新啟用帳號。"
         suspended_explanation: "被停權的用戶無法登入。"
-        block_explanation: "被封鎖的用戶無法發表文章或建立討論話題。"
         staged_explanation: "暫存用戶只能通過郵件回覆指定主題。"
         bounce_score_explanation:
           none: "近期該郵箱沒有退信。"
@@ -2952,8 +2851,6 @@ zh_TW:
       upload: "上傳"
       uploading: "上傳中..."
       quit: "以後再說"
-      staff_count:
-        other: "你的社群中有 %{count} 位工作人員。"
       invites:
         add_user: "添加"
         none_added: "你還沒有邀請任何工作人員。你確定要繼續嗎？"
diff --git a/config/locales/names.yml b/config/locales/names.yml
index 60e9925014..6f15ab632d 100644
--- a/config/locales/names.yml
+++ b/config/locales/names.yml
@@ -119,6 +119,9 @@ eo:
 es:
   name: Spanish
   nativeName: Español
+es_MX:
+  name: Spanish
+  nativeName: Español (MX)
 et:
   name: Estonian
   nativeName: eesti
diff --git a/config/locales/plurals.rb b/config/locales/plurals.rb
index 9e6ea0b56e..f4d4acc038 100644
--- a/config/locales/plurals.rb
+++ b/config/locales/plurals.rb
@@ -2,115 +2,115 @@
 # source: https://github.com/svenfuchs/i18n/blob/master/test/test_data/locales/plurals.rb
 
 {
-  :af => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :am => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :ar => { :i18n => { :plural => { :keys => [:zero, :one, :two, :few, :many, :other], :rule => lambda { |n| n == 0 ? :zero : n == 1 ? :one : n == 2 ? :two : [3, 4, 5, 6, 7, 8, 9, 10].include?(n % 100) ? :few : [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99].include?(n % 100) ? :many : :other } } } },
-  :az => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :be => { :i18n => { :plural => { :keys => [:one, :few, :many, :other], :rule => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
-  :bg => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :bh => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :bn => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :bo => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :bs => { :i18n => { :plural => { :keys => [:one, :few, :many, :other], :rule => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
-  :ca => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :cs => { :i18n => { :plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n == 1 ? :one : [2, 3, 4].include?(n) ? :few : :other } } } },
-  :cy => { :i18n => { :plural => { :keys => [:one, :two, :many, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : n == 8 || n == 11 ? :many : :other } } } },
-  :da => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :de => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :dz => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :el => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :en => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :eo => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :es => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :et => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :eu => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :fa_IR => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :fi => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :fil => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :fo => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :fr => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n.between?(0, 2) && n != 2 ? :one : :other } } } },
-  :fur => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :fy => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :ga => { :i18n => { :plural => { :keys => [:one, :two, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
-  :gl => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :gu => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :guw => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :ha => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :he => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :hi => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :hr => { :i18n => { :plural => { :keys => [:one, :few, :many, :other], :rule => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
-  :hu => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :id => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :is => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :it => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :iw => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :ja => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :jv => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :ka => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :km => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :kn => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :ko => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :ku => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :lb => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :ln => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :lt => { :i18n => { :plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n % 10 == 1 && ![11, 12, 13, 14, 15, 16, 17, 18, 19].include?(n % 100) ? :one : [2, 3, 4, 5, 6, 7, 8, 9].include?(n % 10) && ![11, 12, 13, 14, 15, 16, 17, 18, 19].include?(n % 100) ? :few : :other } } } },
-  :lv => { :i18n => { :plural => { :keys => [:zero, :one, :other], :rule => lambda { |n| n == 0 ? :zero : n % 10 == 1 && n % 100 != 11 ? :one : :other } } } },
-  :mg => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :mk => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n % 10 == 1 ? :one : :other } } } },
-  :ml => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :mn => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :mo => { :i18n => { :plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n == 1 ? :one : n == 0 ? :few : :other } } } },
-  :mr => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :ms => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :mt => { :i18n => { :plural => { :keys => [:one, :few, :many, :other], :rule => lambda { |n| n == 1 ? :one : n == 0 || [2, 3, 4, 5, 6, 7, 8, 9, 10].include?(n % 100) ? :few : [11, 12, 13, 14, 15, 16, 17, 18, 19].include?(n % 100) ? :many : :other } } } },
-  :my => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :nah => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :nb_NO => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :ne => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :nl => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :nn => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :no => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :nso => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :om => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :or => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :pa => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :pap => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :pl_PL => { :i18n => { :plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n == 1 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : :other } } } },
-  :ps => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :pt => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :pt_BR => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :ro => { :i18n => { :plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n == 1 ? :one : n == 0 || ((n % 100) >= 1 && (n % 100) <= 19) ? :few : :other } } } },
-  :ru => { :i18n => { :plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : :other } } } },
-  :se => { :i18n => { :plural => { :keys => [:one, :two, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
-  :sh => { :i18n => { :plural => { :keys => [:one, :few, :many, :other], :rule => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
-  :sk => { :i18n => { :plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n == 1 ? :one : [2, 3, 4].include?(n) ? :few : :other } } } },
-  :sl => { :i18n => { :plural => { :keys => [:one, :two, :few, :other], :rule => lambda { |n| n % 100 == 1 ? :one : n % 100 == 2 ? :two : [3, 4].include?(n % 100) ? :few : :other } } } },
-  :sma => { :i18n => { :plural => { :keys => [:one, :two, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
-  :smi => { :i18n => { :plural => { :keys => [:one, :two, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
-  :smj => { :i18n => { :plural => { :keys => [:one, :two, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
-  :smn => { :i18n => { :plural => { :keys => [:one, :two, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
-  :sms => { :i18n => { :plural => { :keys => [:one, :two, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
-  :so => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :sq => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :sr => { :i18n => { :plural => { :keys => [:one, :few, :many, :other], :rule => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
-  :sv => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :sw => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :ta => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :te => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :th => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :ti => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :tk => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :tl => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :to => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :tr_TR => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
+  af: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  am: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  ar: { i18n: { plural: { keys: [:zero, :one, :two, :few, :many, :other], rule: lambda { |n| n == 0 ? :zero : n == 1 ? :one : n == 2 ? :two : [3, 4, 5, 6, 7, 8, 9, 10].include?(n % 100) ? :few : [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99].include?(n % 100) ? :many : :other } } } },
+  az: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  be: { i18n: { plural: { keys: [:one, :few, :many, :other], rule: lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
+  bg: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  bh: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  bn: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  bo: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  bs: { i18n: { plural: { keys: [:one, :few, :many, :other], rule: lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
+  ca: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  cs: { i18n: { plural: { keys: [:one, :few, :other], rule: lambda { |n| n == 1 ? :one : [2, 3, 4].include?(n) ? :few : :other } } } },
+  cy: { i18n: { plural: { keys: [:one, :two, :many, :other], rule: lambda { |n| n == 1 ? :one : n == 2 ? :two : n == 8 || n == 11 ? :many : :other } } } },
+  da: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  de: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  dz: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  el: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  en: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  eo: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  es: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  et: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  eu: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  fa_IR: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  fi: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  fil: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  fo: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  fr: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n.between?(0, 2) && n != 2 ? :one : :other } } } },
+  fur: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  fy: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  ga: { i18n: { plural: { keys: [:one, :two, :other], rule: lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
+  gl: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  gu: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  guw: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  ha: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  he: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  hi: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  hr: { i18n: { plural: { keys: [:one, :few, :many, :other], rule: lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
+  hu: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  id: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  is: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  it: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  iw: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  ja: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  jv: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  ka: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  km: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  kn: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  ko: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  ku: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  lb: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  ln: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  lt: { i18n: { plural: { keys: [:one, :few, :other], rule: lambda { |n| n % 10 == 1 && ![11, 12, 13, 14, 15, 16, 17, 18, 19].include?(n % 100) ? :one : [2, 3, 4, 5, 6, 7, 8, 9].include?(n % 10) && ![11, 12, 13, 14, 15, 16, 17, 18, 19].include?(n % 100) ? :few : :other } } } },
+  lv: { i18n: { plural: { keys: [:zero, :one, :other], rule: lambda { |n| n == 0 ? :zero : n % 10 == 1 && n % 100 != 11 ? :one : :other } } } },
+  mg: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  mk: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n % 10 == 1 ? :one : :other } } } },
+  ml: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  mn: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  mo: { i18n: { plural: { keys: [:one, :few, :other], rule: lambda { |n| n == 1 ? :one : n == 0 ? :few : :other } } } },
+  mr: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  ms: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  mt: { i18n: { plural: { keys: [:one, :few, :many, :other], rule: lambda { |n| n == 1 ? :one : n == 0 || [2, 3, 4, 5, 6, 7, 8, 9, 10].include?(n % 100) ? :few : [11, 12, 13, 14, 15, 16, 17, 18, 19].include?(n % 100) ? :many : :other } } } },
+  my: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  nah: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  nb_NO: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  ne: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  nl: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  nn: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  no: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  nso: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  om: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  or: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  pa: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  pap: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  pl_PL: { i18n: { plural: { keys: [:one, :few, :other], rule: lambda { |n| n == 1 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : :other } } } },
+  ps: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  pt: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  pt_BR: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  ro: { i18n: { plural: { keys: [:one, :few, :other], rule: lambda { |n| n == 1 ? :one : n == 0 || ((n % 100) >= 1 && (n % 100) <= 19) ? :few : :other } } } },
+  ru: { i18n: { plural: { keys: [:one, :few, :other], rule: lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : :other } } } },
+  se: { i18n: { plural: { keys: [:one, :two, :other], rule: lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
+  sh: { i18n: { plural: { keys: [:one, :few, :many, :other], rule: lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
+  sk: { i18n: { plural: { keys: [:one, :few, :other], rule: lambda { |n| n == 1 ? :one : [2, 3, 4].include?(n) ? :few : :other } } } },
+  sl: { i18n: { plural: { keys: [:one, :two, :few, :other], rule: lambda { |n| n % 100 == 1 ? :one : n % 100 == 2 ? :two : [3, 4].include?(n % 100) ? :few : :other } } } },
+  sma: { i18n: { plural: { keys: [:one, :two, :other], rule: lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
+  smi: { i18n: { plural: { keys: [:one, :two, :other], rule: lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
+  smj: { i18n: { plural: { keys: [:one, :two, :other], rule: lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
+  smn: { i18n: { plural: { keys: [:one, :two, :other], rule: lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
+  sms: { i18n: { plural: { keys: [:one, :two, :other], rule: lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
+  so: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  sq: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  sr: { i18n: { plural: { keys: [:one, :few, :other], rule: lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : :other } } } },
+  sv: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  sw: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  ta: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  te: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  th: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  ti: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  tk: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  tl: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  to: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  tr_TR: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
   # TODO put this back when translations are correct: :uk => { :i18n => { :plural => { :keys => [:one, :few, :many, :other], :rule => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
-  :uk => { :i18n => { :plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :other : :other } } } },
-  :ur => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :vi => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :wa => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :yo => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :zh => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :zh_CN => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :zh_TW => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :zu => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } }
+  uk: { i18n: { plural: { keys: [:one, :few, :other], rule: lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :other : :other } } } },
+  ur: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  vi: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  wa: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  yo: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  zh: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  zh_CN: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  zh_TW: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  zu: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } }
 }
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 82c01f104e..d13bba2c1e 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -24,33 +24,37 @@ ar:
     pm: "م"
     <<: *datetime_formats
   title: "دسكورس"
-  topics: "المواضيع"
-  posts: "المشاركات"
+  topics: "الموضوعات "
+  posts: "المنشورات"
   loading: "يحمّل"
+  powered_by_html: 'مدعومة من <a href="http://www.discourse.org">دسكورس </a>، يفضّل عرضه و جافاسكربت مفعّل'
   log_in: "لِج"
   purge_reason: "حُذف آليًّا باعتباره حسابًا إمّا مهجورًا أو غير مفعّل"
   disable_remote_images_download_reason: "عُطّل تنزيل الصور عن بعد بسبب نفاذ مساحة القرص الحرّة."
-  anonymous: "مجهول"
+  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: "يحدث عندما نستلم بريدًا خامًا فارغًا."
+        empty_email_error: "يحدث عندما يكون البريد المستَلم فارغ"
         no_message_id_error: "يحدث عندما لا يحتوي البريد ترويسة ’Message-Id‘."
         no_body_detected_error: "يحدث عندما يتعذّر استخراج المتن وعدم وجود مرفقات."
         inactive_user_error: "يحدث عندما يكون المرسل خاملًا."
-        blocked_user_error: "يحدث عندما يكون المرسل ممنوعًا."
         bad_destination_address: "يحدث عندما لا تتطابق عناوين البريد في حقول ”إلى/ن‌ك/ن‌ك‌م“ أحد عناوين البريد الوارد المضبوطة."
-        strangers_not_allowed_error: "يحدث عندما يحاول مستخدم إنشاء موضوع جديد في فئة هو ليس عضوًا فيها."
-        insufficient_trust_level_error: "يحدث عندما يحاول مستخدم إنشاء موضوع جديد في فئة ولا يملك مستوى الثّقة المطلوب لذلك."
+        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: "وحدث هذا عندما تم حجب عنوان البريد الالكتروني للمرسل"
+      unrecognized_error: "خطا غير محدد السبب"
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -113,15 +117,18 @@ ar:
         many: أخطاء كثيرة تمنع هذا %{model} من الحفظ
         other: '%{count} أخطاء منعت هذا %{model} من الحفظ'
     embed:
-      load_from_remote: "حدث عطل أثناء تحميل المشاركة."
+      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: "لا يمكنك تحديد فئة تستخدم في قائمة أخرى."
+      default_categories_already_selected: "لا يمكنك اختيار قسم يستخدم في قائمة أخرى."
       s3_upload_bucket_is_required: "لا يمكنك تفعيل الرفع إلى S3 حتّى توفّر 's3_upload_bucket'."
+  invite:
+    not_found: "نموذج الدعوة الخاص بك ليس صالحاً. رجاء اتصل بمدير الموقع."
   bulk_invite:
+    file_should_be_csv: "الملف المرفوع يجب أن يكون بنسق csv . "
     error: "حدث عطل أثناء رفع الملفّ. رجاء أعد المحاولة لاحقًا."
   topic_invite:
     user_exists: "آسف، ذلك المستخدم قد تمت دعوته من قبل. تستطيع فقط أن تدعوا عضواً لموضوعِ مرة واحدة."
@@ -146,6 +153,8 @@ ar:
   embed:
     start_discussion: "ابدأ النّقاش"
     continue: "تابع النّقاش"
+    error: "خطأ في التضمين"
+    referer: "المرجع:"
     more_replies:
       zero: "لا ردود أخرى"
       one: "رد واحد آخر"
@@ -166,60 +175,61 @@ ar:
       other: "%{count} رد"
   no_mentions_allowed: "نأسف، لا يمكنك الإشارة إلى الغير."
   too_many_mentions:
-    zero: "نأسف، لا يمكنك الإشارة إلى أحد في كلّ مشاركة."
-    one: "نأسف، يمكنك الإشارة إلى مستخدم واحد فقط في كلّ مشاركة."
+    zero: "عذرا، لا يمكنك الإشارة إلى أحد في كلّ مشاركة."
+    one: "عذرا، يمكنك الإشارة إلى عضو واحد فقط في كل منشور."
     two: "نأسف، يمكنك الإشارة إلى مستخدمين فقط في كلّ مشاركة."
     few: "نأسف، يمكنك الإشارة إلى %{count} مستخدمين فقط في كلّ مشاركة."
     many: "نأسف، يمكنك الإشارة إلى %{count} مستخدمًا فقط في كلّ مشاركة."
-    other: "نأسف، يمكنك الإشارة إلى %{count} مستخدم فقط في كلّ مشاركة."
+    other: "عذرا، يمكنك الإشارة إلى %{count} عضو فقط في كل منشور."
   no_mentions_allowed_newuser: "نأسف، لا يمكن للمستخدمين الجدد الإشارة إلى الغير."
   too_many_mentions_newuser:
     zero: "عذرا ، المستخدمون الجدد بامكانهم فقط تنبيه %{count} عضو في المشاركة ."
-    one: "عذرا ، المستخدمون الجدد بامكانهم فقط تنبيه عضو واحد فقط في المشاركة ."
+    one: "عذرا ، الاعضاء الجدد بامكانهم فقط الإشارة إلي عضو واحد فقط في المنشور."
     two: "عذرا ، المستخدمون الجدد بامكانهم فقط تنبيه %{count} عضوين فقط في المشاركة ."
     few: "عذرا ، المستخدمون الجدد بامكانهم فقط تنبيه %{count} أعضاء في المشاركة ."
     many: "عذرا ، المستخدمون الجدد بامكانهم فقط تنبيه %{count} عضو في المشاركة ."
-    other: "عذرا ، المستخدمون الجدد بامكانهم فقط تنبيه %{count} عضو في المشاركة ."
-  no_images_allowed: "نأسف، لا يمكن للمستخدمين الجدد وضع صور في المشاركات."
+    other: "عذرا ، الاعضاء الجدد بامكانهم فقط الإشارة إلي %{count} عضو في المنشور."
+  no_images_allowed: "عذرا، لا يمكن للأعضاء الجدد وضع صور في المنشور."
   too_many_images:
     zero: "يمكن للمستخدمين الجدد وضع أيّ عدد من الصور في أي منشور."
-    one: "آسفون، يمكن للمستخدمين الجدد وضع صورة واحدة فقط في كل منشور."
+    one: "عذرا، يمكن للأعضاء الجدد وضع صورة واحدة فقط في كل منشور."
     two: "آسفون، يمكن للمستخدمين الجدد وضع صورتين فقط في كل منشور."
     few: "آسفون، يمكن للمستخدمين الجدد وضع %{count} صور فقط في كل منشور."
     many: "آسفون، يمكن للمستخدمين الجدد وضع %{count} صورة فقط في كل منشور."
-    other: "آسفون، يمكن للمستخدمين الجدد وضع %{count} صورة فقط في كل منشور."
-  no_attachments_allowed: "نأسف، لا يمكن للمستخدمين الجدد إرفاق ملفّات إلى المشاركات."
+    other: "عذرا، يمكن للأعضاء الجدد وضع %{count} صورة فقط في كل منشور."
+  no_attachments_allowed: "عذرا، لا يمكن للأعضاء الجدد إرفاق ملفات في المنشورات."
   too_many_attachments:
-    zero: "يمكن للمستخدمين الجدد إرفاق أيّ عدد من الملفات إلى أي منشور."
-    one: "آسفون، يمكن للمستخدمين الجدد إرفاق ملف واحد فقط إلى كل منشور."
+    zero: "عذرا، يمكن للأعضاء الجدد إرفاق %{count} ملف فقط إلى كل منشور."
+    one: "عذرا، يمكن للأعضاء الجدد إرفاق ملف واحد فقط في كل منشور."
     two: "آسفون، يمكن للمستخدمين الجدد إرفاق ملفين فقط إلى كل منشور."
     few: "آسفون، يمكن للمستخدمين الجدد إرفاق %{count} ملفات فقط إلى كل منشور."
     many: "آسفون، يمكن للمستخدمين الجدد إرفاق %{count} ملفا فقط إلى كل منشور."
-    other: "آسفون، يمكن للمستخدمين الجدد إرفاق %{count} ملف فقط إلى كل منشور."
-  no_links_allowed: "نأسف، لا يمكن للمستخدمين الجدد وضع روابط في المشاركات."
+    other: "عذرا، يمكن للأعضاء الجدد إرفاق %{count} ملف فقط في كل منشور."
+  no_links_allowed: "عذرا، لا يمكن للأعضاء الجدد وضع روابط في المنشورات."
   too_many_links:
     zero: "يمكن للمستخدمين الجدد وضع أيّ عدد من الروابط في أي منشور."
-    one: "آسفون، يمكن للمستخدمين الجدد وضع رابطا واحدا فقط في كل منشور."
+    one: "عذرا، يمكن الأعضاء الجدد وضع رابطا واحدا فقط في كل منشور."
     two: "آسفون، يمكن للمستخدمين الجدد وضع رابطين فقط في كل منشور."
     few: "آسفون، يمكن للمستخدمين الجدد وضع %{count} روابط فقط في كل منشور."
     many: "آسفون، يمكن للمستخدمين الجدد وضع %{count} رابطا فقط في كل منشور."
-    other: "آسفون، يمكن للمستخدمين الجدد وضع %{count} رابط فقط في كل منشور."
-  spamming_host: "نأسف، لا يمكنك وضع رابط لهذا المضيف."
-  user_is_suspended: "ليس مسموحا للمستخدمين المعلّقة عضويتهم النشر."
+    other: "عذرا، يمكن للأعضاء الجدد وضع %{count} رابط فقط في كل منشور."
+  contains_blocked_words: "المنشور الخاص بك يحتوي علي كلمات غير مسموح بها."
+  spamming_host: "عذرا، لا يمكنك نشر رابط لهذا العنوان."
+  user_is_suspended: "غير مسموح للأعضاء المعلّقة عضويتهم النشر."
   topic_not_found: "حدث خطب ما. قد يكون الموضوع أُغلق أو حُذف وأنت تشاهده؟"
   not_accepting_pms: "نأسف، لا يقبل %{username} الرّسائل حاليًّا."
-  just_posted_that: "هذا مماثل لما شاركته مؤخرا"
+  just_posted_that: "هذا مشابة جدا لما نشرتة مؤخراً"
   invalid_characters: "يحتوي احرف غير صالحة "
   is_invalid: "تبدو غير واضحة، هل هذه عبارة كاملة؟"
   next_page: "الصفحة التالية ←"
   prev_page: "→ الصفحة السابقة "
   page_num: "صفحة %{num}"
   home_title: "الصفحة الرئيسية "
-  topics_in_category: "المواضيع في فئة '%{category}'"
+  topics_in_category: "المواضيع في قسم '%{category}'"
   rss_posts_in_topic: "مغذي RSS لـ'%{topic}'"
-  rss_topics_in_category: "مغذي RSS للمواضيع في فئة '%{category}'"
+  rss_topics_in_category: "تغذية RSS للموضوعات من قسم'%{category}'"
   author_wrote: "كتب %{author}:"
-  num_posts: "المشاركات:"
+  num_posts: "المنشورات:"
   num_participants: "المشاركون:"
   read_full_topic: "اقرأ كامل الموضوع"
   private_message_abbrev: "رسالة"
@@ -227,18 +237,16 @@ ar:
     latest: "آخر المواضيع"
     hot: "مواضيع نَشطة"
     top: "مواضيع مميزة"
-    posts: "اخر المشاركات "
+    posts: "اخر المنشورات"
     private_posts: "الرسائل الخاصة الآخيرة"
-    group_posts: "احدث المشاركات من %{group_name} "
+    group_posts: "احدث المنشورات من %{group_name} "
     group_mentions: "احدث التذكيرات من %{group_name} "
-    user_posts: "احدث المشاركات من %{group_name} "
-    user_topics: "  آخر المواضيع بواسطة   @%{username}"
-    tag: "مواضيع معلمة "
-  too_late_to_edit: "أُنشئت المشاركة هذه منذ فترة طويلة جدًّا، لذا تعديلها أو حذفها لم يعد ممكنًا."
+    user_posts: "احدث المنشورات من %{username} "
+    user_topics: "  آخر الموضوعات بواسطة @%{username}"
+    tag: "موضوعات موسومة"
+  too_late_to_edit: "هذا المنشور أُنشأ منذ فترة طويلة جدًّا، لم يعد ممكناً تعديلة او حذفة."
   revert_version_same: "ألاصدار الحالي يتطابق مع نفس ألاصدار الذي تحاول استرجاعه ."
   excerpt_image: "صورة"
-  queue:
-    delete_reason: "حذف عبر طابور مشاركة معتدل"
   groups:
     errors:
       can_not_modify_automatic: "لا يمكنك تعديل مجموعة تم انشائها تلقائيا"
@@ -249,7 +257,7 @@ ar:
       email_already_used_in_category: "'%{email}' مستخدم من قبل القسم '%{category_name}'."
     default_names:
       everyone: "الجميع"
-      admins: "المسؤولين"
+      admins: "المديرون"
       moderators: "مشرفين"
       staff: "العاملين"
       trust_level_0: "مستوى_الثقة_0"
@@ -260,21 +268,21 @@ ar:
   education:
     until_posts:
       zero: "لا مشاركات"
-      one: "مشاركة واحدة"
+      one: "منشور واحد"
       two: "مشاركتان"
       few: "%{count} مشاركات"
       many: "%{count} مشاركة"
-      other: "%{count} مشاركة"
+      other: "%{count} منشور"
     new-topic: |
       مرحبا بك في %{site_name} &mdash; **شكرا لك لأجل بدء محادثه جديدة!**
 
-      هل يبدو العنوان مثيرا للاهتمام إذا كنت تقرأ بصوت عال؟ هو ملخص جيد؟
+      هل يبدو عنوان الموضوع مثيرا للإهتمام إذا قراتة بصوت عال؟ العنوان ملخص هام جدا؟
 
-      - من هو الشخص الذي سيكون مهتما بهذا ؟ لماذا يهتم ؟ أي نوع من ردود تريد ؟
+      - من هو الشخص الذي سيكون مهتما بهذا؟ لماذا يهتم؟ أي نوع من ردود تريد؟
 
-      -  تتضمن أكثر الكلمات الشائعة استخداما في في موضوعك بحيث يمكن للآخرين أن * يجدوها* لمجموعة موضوعك مع المواضيع ذات الصلة، حدد فئة.
+      -  استخدم أكثر الكلمات الشائعة في موضوعك بحيث يمكن للآخرين أن * يجدوها*  لاضافة موضوعك مع المواضيع ذات الصلة، حدد قسم الموضوع.
 
-      لمعلومات أكثر ، [انظر المبادئ التوجيهية مجتمعنا] (/guidelines). وهذه اللوحة ستظهر لك لأول مرة فقط %{education_posts_text}.
+      لمعلومات أكثر ، [انظر مبادئ المجتمع](/guidelines). هذا الاعلان سيظهر لك لأول مرة %{education_posts_text}.
     new-reply: |
       مرحباً بك في %{site_name} &mdash; **شكراً لمشاركتك**!
 
@@ -284,13 +292,42 @@ ar:
 
       -نرحب بالنقد البناء، ولكن انتقد الأفكار ولا تنتقد الأشخاص!
 
-      للمزيد, [انظر إرشادات المجتمع](/guidelines). هذه اللوحة ستظهر فقط لأول %{education_posts_text} لك.
+      للمزيد, [انظر مبادئ المجتمع](/guidelines). هذا الاعلان سيظهر فقط لأول %{education_posts_text} لك.
+    avatar: |
+      ### هل صورة حسابك الشخصي مميزة
+
+      من الاسهل ملاحظة اطراف النقاش في اي موضوع من صور حساباتهم
+
+      لقد قمت بنشر عدد من الموضوعات و الردود, لكن صورة حسابك ليست مميزة مثلك.
+
+      حاول الدخول علي **[ملفك الشخصي](%{profile_path})** و ارفع صورة تعبر عنك
+    sequential_replies: |
+      ### الرد على عدة منشورات مرةً واحدة
+
+      بدلاً من عدة ردود متتابعة على موضوع ما, قم بكتابه رد واحد يتضمن اقتباسات من منشورات سابقة أو اشارة الي @اعضاء.
+
+      تستطيع التعديل على ردك السابق لإضافة اقتباس بتظليلك النص و اختيارك زر <b>quote reply</b> الظاهر.
+
+      يسهل على الكل قراءة المواضيع التي لها بعض الردود المتعمقة بدلاً من الكثير من الردود الفردية الصغيرة
+    dominating_topic: |
+      ### دع الآخرون ينضمون للمحادثة
+
+      من الواضح ان هذا الموضوع مهم بالنسبة لك &ndash; قمت بنشر أكثر من %{percent}% من الردود هنا.
+
+      هل أنت متأكد من أنك أعطيت وقت كافٍ للآخرين لمشاركة وجهة نظرهم أيضاً ؟
+    too_many_replies: |
+      ### لقد وصلت إلى حدود الرد في هذا الموضوع
+
+      عذرا، ولكن الأعضاء الجدد محدودين مؤقتا بعدد %{newuser_max_replies_per_topic} من الردود على نفس الموضوع.
+
+      بدلا من إضافة رد آخر، يرجى النظر في تعديل الردود السابقة، أو زيارة مواضيع أخرى.
   activerecord:
     attributes:
       category:
         name: "اسم القسم"
       topic:
         title: 'عنوان'
+        featured_link: 'رابط مشهور'
       post:
         raw: "متن النص"
       user_profile:
@@ -304,6 +341,8 @@ ar:
               too_many_users: "يمكنك إرسال التحذيرات إلى مستخدم واحد كل مرة."
               cant_send_pm: "نأسف، لا يمكنك إرسال رسالة خاصّة إلى هذا المستخدم."
               no_user_selected: "عليك تحديد مستخدم صالح."
+            featured_link:
+              invalid_category: "لا يمكن التعديل في هذا القسم"
         user:
           attributes:
             password:
@@ -317,6 +356,9 @@ ar:
           attributes:
             hex:
               invalid: "ليس لونا صالحا"
+        post_reply:
+          base:
+            different_topic: "المنشور و الرد لابد ان يكونا في نفس الموضوع"
         web_hook:
           attributes:
             payload_url:
@@ -325,11 +367,12 @@ ar:
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} لم يدخلوا أي شيء في مجال المعلومات عني لملفهم بعد</div>"
   vip_category_name: "استراحة"
-  vip_category_description: "فئة خاصة للمستخدمين ذوي مستوى الثقة 3 فأعلى."
+  vip_category_description: "قسم خاص للمستخدمين ذوي مستوى الثقة 3 فأعلى."
   meta_category_name: "موقع التغذية الإرتجاعية"
   meta_category_description: "النقاش حول هذا الموقع، وتنظيمه، وكيفية عمله وطرق تطويره."
   staff_category_name: "الطاقم"
-  staff_category_description: "فئة مخصصة للنقاش في مواضيع الإدارة. المواضيع مرئية فقط للأدارة وللمشرفين."
+  staff_category_description: "قسم مخصص للنقاش في موضوعات الإدارة. الموضوعات مرئية فقط للمديرين وللمشرفين."
+  assets_topic_body: "هذا الموضوع مرئي فقط لطاقم العمل. يستخدم لحفظ الصور و الملفات المستخدمه في واجهة الموقع. لا تقم بحذفة\n\n\n\nإليك كيف يستخدم.\n\n1. قم بالرد علي الموضوع\n2. قم برفع الشعار و الصور و الايقونات التي تريد استخدامها في الموقع. ( عبر استخدام زر الرفع في لوحة الادوات لمحرر نصوص الموقع او سحب الملفات الي المحرر او بالضغط علي زر الفأرة الايمن و اختيار \"paste\" )\n3. قم بالضغط علي زر \"رد\"\n4. بعد نشر الصور و الملفات قم بالضغط عليها بزر الماوس الايمن و اختر \"Copy link address\"\n5. قم بوضع مسار الملفات في لوحة التحكم في صفحة [المعلومات الاساسية](/admin/site_settings/category/required).\n\nإذا كنت تريد رفع ملفات بامتدادات ممنوعة يمكنك تعديل الامتدادات المسموح بها في [اعدادات الملفات](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "مرحبًا بك في دسكورس"
   lounge_welcome:
@@ -338,46 +381,43 @@ ar:
 
       تهانينا! :confetti_ball:
 
-      إذا تمكنت من رؤية هذا الموضوع, فأنت رقيت مؤخرا  لـ**منتظم** (مستوى الثقة 3).
+      إذا تمكنت من رؤية هذا الموضوع, فقد تم ترقيتك مؤخرا  لـمستوي**منتظم** (مستوى الثقة 3).
 
-      You can now &hellip;
+      انت الأن تستطيع &hellip
 
-      * تعديل العنوان لأي موضوع
-      * تغيير الفئة لأي موضوع
-      * جميع روابطك المتبوعة بـ ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) محذوفة)
-      * الوصول لفئة استراحة خاصة مرئية فقط لأعضاء مستوى الثقة 3 أو أعلى
-      * إخفاء الرسائل الغير هامة بتبليغ واحد
+      * تعديل العنوان لأي موضوع.
+      * تغيير القسم لأي موضوع.
+      * جميع الروابط التي تضعها تُأرشف من قبل محركات البحث ( خيار [automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) غير مفعل).
+      * الوصول لقسم خاص للأعضاء بمستوى الثقة 3 أو أعلى.
+      * إخفاء رسائل السبام ببلاغ واحد.
 
-      من هنا [القائمة الحالية لمتابع منتظم](/badges/3/regular). طبعا قل مرحبا.
+      من هنا [القائمة الحالية للأعضاء بمستوي متابع منتظم](/badges/3/regular).
 
       شكرا لكونك جزءً هاما من هذا المجتمع!
-
-      (لمعلومات أكثر حول مستويات الثقة, [see this topic][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"
+    replace_paragraph: "(قم بإستبدال هذة الفقرة بوصف مختصر للقسم الجديد. هذا الوصف سوف يظهر في منطقة إختيار القسم, لذا حاول ان يكون اقل من 200 حرف. ** حتي تقوم بتعديل هذا الوصف أو تقوم بإضافة موضوعات, هذا القسم لن يظهر في صفحة الأقسام**)"
+    post_template: "%{replace_paragraph}\n\nإستخدم الأسئلة الآتية لوضع وصف أطول ، أو لإنشاء تعليمات او قوانين للقسم الجديد:\n\n- لماذا يجب على الأعضاء والزوار استخدام هذا القسم؟ ولم اُنشئ؟\n\n- ما هو الاختلاف بين هذا القسم و الأقسام الأخرى التي لدينا؟\n\n- ما هي انواع الموضوعات التي تصنف تحت هذا القسم؟\n\n- هل نحتاج حقا إلى هذا القسم؟ وهل نستطيع دمجة مع قسم رئيسي أو فرعية أخر؟\n"
     errors:
-      uncategorized_parent: "غير مصنف لا يمكن أن يكون فئة الأم"
-      self_parent: "لا يمكن أن يكون أب الفئة الفرعية ذات الفئة"
-      depth: "لا يمكنك تضمين فئة فرعية تحت فئة فرعية اخرى"
+      uncategorized_parent: "قسم \"غير مصنف\" لا يمكن أن يكون له قسم رئيسي"
+      self_parent: "لا يمكن أن يكون القسم الرئيسي للقسم هو نفسة"
+      depth: "لا يمكنك وضع قسم فرعي تحت قسم فرعي اخر"
       invalid_email_in: "ليس '%{email}' عنوان بريد إلكترونيّ صالح."
       email_already_used_in_group: "'%{email}' مستخدم من قبل المجموعه '%{group_name}'. "
       email_already_used_in_category: "'%{email}' مستخدم من قبل القسم '%{category_name}'."
+      description_incomplete: "منشور وصف القسم يجب علي الاقل ان يحتوي علي فقرة واحدة."
     cannot_delete:
-      uncategorized: "لايمكن حذف الغير مصنف"
-      has_subcategories: "لا يمكن حذف هذه الفئة لأنّ لها فئات فرعيّة."
+      uncategorized: "لا يمكن حذف قسم  \"غير مصنف\""
+      has_subcategories: "لا يمكن حذف هذا القسم لأن له أقسام فرعيّة."
       topic_exists:
         zero: "لا يمكنك حذف هذه الفئة ﻷنها لا تملك موضوع.أقدم موضوع هو %{topic_link}."
         one: "لا يمكنك حذف هذه الفئة ﻷن لها موضوع واحد.أقدم موضوع هو %{topic_link}."
         two: "لا يمكنك حذف هذه الفئة ﻷن لها موضوعان.أقدم موضوع هو %{topic_link}."
         few: "لا يمكنك حذف هذه الفئة ﻷن لها مواضيع قليلة.أقدم موضوع هو %{topic_link}."
         many: "لا يمكنك حذف هذه الفئة ﻷن لها مواضيع كثيرة.أقدم موضوع هو %{topic_link}."
-        other: "لا يمكنك حذف هذه الفئة ﻷن لها %{count} مواضيع.أقدم موضوع هو %{topic_link}."
-      topic_exists_no_oldest: "لا يمكن حذف هذه الفئة لأنّ عدد مواضيعها هو %{count}."
-    uncategorized_description: "المواضيع التي لا تحتاج للتصنيف , او لا تتناسق مع اي تصنفيات اخرى موجوده"
+        other: "لا يمكنك حذف هذا القسم ﻷن به %{count} موضوع. أقدم موضوع هو %{topic_link}."
+      topic_exists_no_oldest: "لا يمكن حذف هذا القسم لأن عدد الموضوعات به هو %{count}."
+    uncategorized_description: "الموضوعات التي لا تحتاج الي ان تصنف تحت قسم معين, او لا تندرج تحت الأقسام الأخري."
   trust_levels:
     newuser:
       title: "مستخدم جديد "
@@ -402,7 +442,7 @@ ar:
       topics_per_day: "لقد وصلت للعدد الأقصى للمواضيع الجديدة اليوم. رجاء انتظر %{time_left} قبل المحاولة مجددا."
       pms_per_day: "لقد وصلت للعدد الأقصى للرسائل اليوم. رجاء انتظر %{time_left} قبل المحاولة مجددا."
       create_like: "لقد وصلت للعدد الأقصى للإعجابات اليوم. رجاء انتظر %{time_left} قبل المحاولة مجددا."
-      create_bookmark: "لقد وصلت للعدد الأقصى للتفضيلات اليوم. رجاء انتظر %{time_left} قبل المحاولة مجددا."
+      create_bookmark: "لقد وصلت للعدد الأقصى للعلامات المرجعية اليوم. رجاء انتظر %{time_left} قبل المحاولة مجددا."
       live_post_counts: "أنت تطلب تعداد حى للمنشورات بسرعه عاليه . الرجاء الانتظار  %{time_left} قبل المحاوله مجدداً"
       unsubscribe_via_email: "لقد وصلت للحد الأقصى من الغاء الاشتراكات عبر البريد الالكترونى اليوم. رجاء الانتظار %{time_left} قبل المحاولة مجددا."
       topic_invitations_per_day: "لقد وصلت للحد الأقصى للدعوة للمواضيع اليوم. رجاء الانتظار %{time_left} قبل المحاولة مجددا."
@@ -588,6 +628,8 @@ ar:
         other: "قبل حوالي %{count} سنة"
   password_reset:
     no_token: "نأسف، رابط تغيير كلمة السّرّ قديم جدًّا. انقر زرّ ”لِج“ واختر ”نسيت كلمة السّرّ“ لنرسل لك رابطًا آخر."
+    choose_new: "اختر كلمة المرور الجديدة"
+    choose: "اختر كلمة المرور"
     update: 'حدّث كلمة السّرّ'
     save: 'تعين كلمة المرور'
     title: 'إعادة تعين كلمة المرور'
@@ -611,53 +653,65 @@ ar:
     approval_required: "يجب على المشرف أن يقبل حسابك الجديد قبل أن تستطيع الدخول لهذا المنتدى. سوف تتلقى بريد إلكتروني عندما يتم قبول حسابك."
     missing_session: "لا نستظيع تحديد اذا كان حسابك قد أنشئ. رجاء التأكد من أن (الكوكيز) بالمتصفح  الذى تستخدمة منشطة."
     admin_confirm:
+      title: "تاكيد حساب المدير"
       description: "أمتأكّد من جعل <b>%{target_username}</b> مديرًا؟"
+      grant: "اجعلة مُديراً"
       complete: "المستخدم <b>%{target_username}</b> مدير الآن."
+      back_to: "العودة إلي %{title}"
   post_action_types:
     off_topic:
       title: 'خارج الموضوع'
-      description: 'لا صلة للمشاركة بالنقاش الحالي على النحو المحدد بواسطة العنوان والمشاركة الأولى، وربما ينبغي نقلها لمكان أخر.'
+      description: 'لا صلة للمنشور بالنقاش الحالي على النحو المحدد بواسطة العنوان و المنشور الاول، وربما ينبغي نقلها لمكان أخر.'
       long_form: 'أبلغ أن هذا خارج الموضوع.'
     spam:
       title: 'مزعج'
+      description: 'هذا المنشور هو اعلان او منشور تخريبي. لا صلة له بالموضوع الحالي.'
       long_form: 'علّم هذا على أنّه غير لائق'
       email_title: '"%{title}" عُلّم على أنّه موضوع غير لائق'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: 'غير مناسب'
-      description: 'هذه المشاركة تشمل محتوى أي شخص عاقل سيعتبره عدواني، أو مسيئ، أو انتهاك لـ<a href="/guidelines">مبادئ مجتمعنا التوجيهية</a>.'
+      description: 'محتوي هذا المنشور أي شخص عاقل سيعتبره عدواني، أو مسيئ، أو انتهاك لـ<a href="/guidelines">مبادئ مجتمعنا التوجيهية</a>.'
+      short_description: 'انتهاك <a href="/guidelines">للقواعد العامة للمجتمع</a>'
       long_form: 'ترفع علم هذا عن صورة غير ملائمة'
     notify_user:
       title: 'أرسل رسالة إلى @{{username}}'
-      description: 'أود الحديث مع هذا الشخص مباشرة وعلى انفراد عن هذه المشاركة.'
+      description: 'أود الحديث مع هذا الشخص مباشرة وعلى انفراد عن هذا المنشور.'
+      short_description: 'أود الحديث مع هذا الشخص مباشرة وعلى انفراد عن هذا المنشور.'
       long_form: 'العضو أرسل'
-      email_title: 'مشاركتك في "%{title}"'
+      email_title: 'منشورك في "%{title}"'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "شيء آخر "
       description: 'يحتاج هذا المنشور إجراء من الطاقم لسبب آخر لم يُذكر أعلاه.'
       long_form: ' بَلِّغ عن هذا لتنبيه الطاقم '
-      email_title: 'المشاركة في "%{title}" تتطلب تنبيه المشرف.'
+      email_title: 'النشر في "%{title}" تتطلب تنبيه الطاقم.'
       email_body: "%{link}\n\n%{message}"
     bookmark:
-      title: 'المفضلة'
-      description: 'فضل هذه المشاركة'
-      long_form: 'فضلت هذه المشاركة'
+      title: 'علامة مرجعية'
+      description: 'فضل هذا المنشور'
+      short_description: 'فضل هذا المنشور'
+      long_form: 'فضلت هذا المنشور'
     like:
       title: 'إعجاب'
-      description: 'أُعجَب بهذه المشاركة'
+      description: 'أُعجَب بهذا المنشور'
+      short_description: 'أُعجَب بهذا المنشور'
       long_form: 'أعجبت بهذه'
     vote:
       title: 'تصويت'
       description: 'صوت لهذا المنشور'
+      short_description: 'صوت لهذا المنشور'
       long_form: 'صوت لهذا المنشور'
   user_activity:
     no_bookmarks:
-      self: "لا مشاركات معلّمة. تعليم المشاركات يتيح لك الرّجوع إليها لاحقًا بسهولة."
+      self: "ليس لديك منشورات مفضلة. اضافة المنشورات إلي المفضِلة يتيح لك الرّجوع إليها لاحقًا بسهولة."
       others: "لا علامات."
     no_likes_given:
-      self: "لم تعجبك أيّة مشاركة."
-      others: "لا يوجد اعجاب لاي مشاركة."
+      self: "لم تعجبك أيّة منشور."
+      others: "لا يوجد منشورات اعجبت بها."
+    no_replies:
+      self: "لم تقم بالرد علي اي منشور."
+      others: "لا يوجد ردود ."
   topic_flag_types:
     spam:
       title: 'مزعج'
@@ -674,8 +728,7 @@ ar:
       email_title: 'الموضوع "%{title}" يتطلب موافقة المشرف'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>مشاركتك تم التبليغ عليها بواسطة المجتمع. نرجوا <a href="/my/messages">رؤية رسالتك</a>.</p>'
-    user_must_edit: '<p>هذه المشاركة كانت معلّمة بواسطة المجتمع وهي مخفية مؤقتاً.</p>'
+    user_must_edit: '<p>هذا المنشور كان مبلغ عنه بواسطة المجتمع وهو مخفي مؤقتاً.</p>'
   archetypes:
     regular:
       title: "موضوع عادي"
@@ -685,14 +738,14 @@ ar:
         make: "هذا الموضوع معلّم الآن. سوف يظهر في أعلى كل صفحة حتى يرفض من قبل المستخدم."
         remove: "هذا الموضوع لم يعد معلّم. لن يظهر في أعلى كل صفحة."
   unsubscribed:
-    title: "غير مشترك "
-    description: "لقد تم الغاء اشتراكك. لتغير اختيارات بريدك الالكترونى <a href='%{url}'>زور اختياراتك الشخصية</a>"
+    title: "غير مشترك!"
+    description: "<b>%{email}><b/> أصبح غير مشترك . لتغيّر بريدك الإلكتروني <a/>  زُر خصائص المستخدم الخاصة بك <'a href=%{url}"
     topic_description: "لإعادة الاشتراك لل %{link}، استخدم ادارة التنبيهات في أسفل او يمين الموضوع."
   unsubscribe:
     title: "إلغاء الإشتراك"
     stop_watching_topic: "ألغِ مراقبة هذا الموضوع، %{link}"
     mute_topic: "اكتم كلّ إشعارات هذا الموضوع، %{link}"
-    unwatch_category: "ألغِ مراقبة كلّ المواضيع في %{category}"
+    unwatch_category: "ألغِ مراقبة كلّ الموضوعات في %{category}"
     mailing_list_mode: "الغاء وضعية قائمة المراسلات"
     disable_digest_emails: "توقف عن ارسال الملخصات بالبريد الالكترونى"
     all: "لا ترسل إليّ أيّ بريد من %{sitename}"
@@ -731,9 +784,9 @@ ar:
       xaxis: "اليوم"
       yaxis: "عدد المواضيع الجديدة"
     posts:
-      title: "المشاركات"
+      title: "المنشورات"
       xaxis: "اليوم"
-      yaxis: "عدد المشاركات الجديدة"
+      yaxis: "عدد المنشورات الجديدة الجديدة"
     likes:
       title: "اﻹعجابات"
       xaxis: "اليوم"
@@ -871,54 +924,56 @@ ar:
   site_settings:
     censored_words: "الكلمات التي ستُستبدل آليًّا ب‍ &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "نمط التّعبير النّمطيّ الذي سيُستبدل آليًّا ب‍ &#9632;&#9632;&#9632;&#9632;"
-    delete_old_hidden_posts: "سيتم حذف الوظائف المخفية تلقائيًا إذا زادت مدة الإخفاء أكثر من 30 يومًا"
-    default_locale: "اللغة الافتراضيّة لسيرورة دسكورس هذه (رمز آيزو 639-1)"
+    delete_old_hidden_posts: "سيتم حذف المنشورات المخفية تلقائيًا إذا زادت مدة الإخفاء أكثر من 30 يومًا"
+    default_locale: "اللغة الافتراضيّة للموقع طبقا للمعيار (ISO 639-1)"
     allow_user_locale: "اسمح للمستخدمين باختيار لغة الواجهة التي تناسبهم"
-    set_locale_from_accept_language_header: "اختيار لغة الواجه للمستخدمين المجهولين طبقا للغة المختارة بمطصحف الشبكة. (اعداد تجريبى، لا يعمل مع ذاكرة المطصفح)"
-    min_post_length: "الحد الأدنى المسموح به لطول مشاركة في الأحرف"
-    min_first_post_length: "الحد الأدنى المسموح به لطول أول المشاركة (مقدمة العنوان) بالأحرف"
-    min_private_message_post_length: "الحد الأدنى المسموح به لطول مشاركة في الأحرف"
-    max_post_length: "الحد الأعلى المسموح به لطول مشاركة في الأحرف"
+    set_locale_from_accept_language_header: "اختيار لغة الواجة للمستخدمين المتخفون طبقا للغة المختارة بمتصفح الشبكة. ( إعداد تجريبى، لا يعمل مع ذاكرة المتصفح )"
+    min_post_length: "الحد الأدنى المسموح به لطول المنشور بالأحرف"
+    min_first_post_length: "الحد الأدنى المسموح به لطول أول منشور (المنشور الاول بالموضوع) بالأحرف"
+    min_private_message_post_length: "الحد الأدنى المسموح به لطول المنشور بالأحرف في الرسائل"
+    max_post_length: "الحد الأقصي المسموح به لطول المنشور بالأحرف"
+    topic_featured_link_enabled: "السماح بنشر روابط في الموضوعات"
     min_topic_title_length: "الحد الأدنى المسموح به موضوع طول اللقب في الأحرف"
     max_topic_title_length: "الحد الأعلى المسموح به لطول عنوان موضوع في الأحرف"
     min_private_message_title_length: "الحد الأدنى المسموح به لطول عنوان لرسالة في الأحرف"
     min_search_term_length: "الحد الأدنى الصالح لطول مصطلح  في الأحرف"
     search_tokenize_chinese_japanese_korean: "ارغام الباحث على تجميع احرف اللغات الصينية واليابانية والكورية حتى على المواقع الغير معدة لتلك اللغات."
-    allow_uncategorized_topics: "اسمح بتصميم النقاشات من غير فئات.  تحذير: اذا كان هناك نقاشات غير مصنفه،  يجب عليك تصنيفها قبل اغلاق هذا "
+    search_prefer_recent_posts: "اذا كان البحث في المنتدي بطئ, هذا الخيار سوف يحاول فهرسة اخر المنشورات اولاً"
+    search_recent_posts_size: "كل عدد المنشورات الحديثة التي تريد الابقاء عليها بالفهرس"
+    allow_uncategorized_topics: "اسمح بنشر الموضوعات بدون تحديد القسم.  تحذير: اذا كان هناك نقاشات غير مصنفه، يجب عليك تصنيفها قبل تعطيل هذة الخاصية."
     allow_duplicate_topic_titles: "اسمح بالمواضيع المماثلة والعناوين المكررة."
-    unique_posts_mins: "عدد الدّقائق التي يمكن للمستخدم بعدها نشر مشاركة فيها نفس المحتوى ثانيةً"
-    educate_until_posts: "عندما يبدا المستخدم كتابه منشورهم الاول.، اظهر انبثاق  لوحه تعليمات المستخدم الجديد في المؤلف"
+    unique_posts_mins: "عدد الدقائق التي يمكن للعضو بعدها عمل منشور به نفس المحتوى ثانيةً"
+    educate_until_posts: "عندما يبدا العضو كتابه منشورة الاول، اظهر لوحه تعليمات الاعضاء الجدد في المحرر"
     title: "اسم هذا الموقع، يُستخدم في وسم title."
     site_description: "صِف هذا الموقع بجملة واحدة، يُستخدم في وسم meta description."
-    contact_email: "عنوان البريد الإلكتروني للاتصال الرئيسي المسؤول لهذا الموقع. تستخدم للإشعارات الحرجة كالتبليغات الغير معالجة، وكذلك عن / حول نموذج الاتصال للأمور المستعجلة."
+    contact_email: "عنوان البريد الإلكتروني الرئيسي للاتصال بالمسؤل عن هذا الموقع. تستخدم للإشعارات الحرجة كالتبليغات الغير معالجة، وكذلك في نموذج الاتصال للأمور المستعجلة."
     contact_url: "اتصل بـ URL لهذا الموقع. استخدم في / حول نموذج الاتصال للأمور المستعجلة."
-    queue_jobs: "مطورين فقط ! تحذير ! افتراضياً، اذا تم تعطيل قوائم الانتظار في sidkiq سيتعطل الموقع."
     crawl_images: "جلب الصور من الروابط لادراج الأبعاد الصحيحة."
     download_remote_images_to_local: "تحويل الصور البعيدة إلى صور محلية بواسطة تحميلها؛ بإستثناء الصور التالفة"
     download_remote_images_threshold: "ادني مساحه للقرص ضروربه لتحميل الصور البعيده محليا ( في المئه) "
-    download_remote_images_max_days_old: "لا تقم بتحميل الصور من مواقع اخرى للمشاركات اﻷقدم من عدد س من اﻷيام."
+    download_remote_images_max_days_old: "لا تقم بتحميل الصور من مواقع اخرى للمنشورات اﻷقدم من هذا عدد من اﻷيام."
     disabled_image_download_domains: "الصور البعيدة لن يتم تنزيلها من هذا المجال. قائمة Pipe-delimited."
-    editing_grace_period: "خلال (n) ثواني بعد نشر المشاركة ، التعديل لن يقوم بانشاء نسخة جديدة في السجل الخاص بالتعديل ."
+    editing_grace_period: "خلال هذا العدد من الثواني بعد نشر المنشور، تعديل المنشور لن يقوم بانشاء نسخة جديدة في السجل الخاص بالتعديل ."
     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)."
+    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: "قائمه النطاقات حيت لا اتباع لا يجب ان تضاف للروابط. tld.com سوف يقوم تلقائيا  بالسماح  sub.tld.com كذلك  مثل  الاصغر , يجب عليك اضافه النطاق الاعلى مستوي الخاص بالموقع لمساعده  زحف الويب ليجاد جميع المحتويات.اذا كان باقي اجزاء موقعك في نطاقات اخرى , اضفهم ايضا"
+    exclude_rel_nofollow_domains: "قائمه النطاقات التي يُسمح لمحركات البحث بتتبع الروابط المشيره اليها و ارشفه محتواها. اذا اضيف نطاق سيمتد التاثير الي جميع النطاقات الفرعية الخاصه به, علي الاقل يجب عليك اضافه نطاق هذا الموقع لتسمح لمحركات البحث ايجاد كل المحتوي و ارشفته. اذا كان بعض من اجزاء موقعك علي نطاقات اخرى , اضفهم ايضا."
     post_excerpt_maxlength: "الحد الأقصى لطول وظيفة مقتطف / ملخص."
     show_pinned_excerpt_mobile: "اظهر مقتطفات من المواضيع المثبتة فى منظر المحمول."
     show_pinned_excerpt_desktop: "اظهر مقتطفات من المواضيع المثبتة فى منظر سطح المكتب."
-    post_onebox_maxlength: "الحد الأقصى لطول مشاركة oneboxed Discourse بالأحرف."
-    logo_url: "صورة الشعار في الجزء العلوي الأيسر من موقع الويب الخاص بك، يجب أن تكون على شكل مستطيل واسع. إذا ترك الحقل فارغا فسيتم استخدام اسم الموقع."
-    digest_logo_url: "صورة الشعار البديل المستخدم في الجزء العلوي لملخص البريد الالكترونى، يجب أن تكون على شكل مستطيل واسع. لا يجب أن تكون الصورة من نوع SVG.  إذا ترك الحقل فارغا فسيتم استخدام `logo_url`."
-    logo_small_url: "صورة الشعار صغيرة في الجزء العلوي الأيسر من موقع الويب الخاص بك، يجب أن تكون على شكل مربع، وينظر عند التمرير لأسفل. وإذا ترك فارغا أن أظهرت الصورة الرمزية المنزل."
+    post_onebox_maxlength: "الحد الأقصى بالاحرف لطول منشور هذا الموقع عندما يتم وضعة بلوحة مُعاينة."
+    onebox_domains_blacklist: "قائمة بعناوين المواقع التي يمنع وضع روابطها بلوحة مُعاينة."
+    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: "الأيقونات المستخدمة لأجهزة آبل باللمس. المقاس المستحسن هو 144×144 بكسل."
-    notification_email: "لمن:  يستخدم عنوان البريد الالكتروني عند  إرسال كل رسائل النظام الأساسي. المجال الخاص هنا يجب أن يكون SPF, DKIM وسجلات PTR عكسي تضبط بشكل صحيح لوصول البريد الالكتروني."
+    apple_touch_icon_url: "الأيقونة المستخدمة لأجهزة آبل باللمس. المقاس المستحسن هو 144×144 بكسل."
+    notification_email: "عنوان البريد الالكتروني المُرسِل للرسائل الصادرة من الموقع, العنوان المحدد يجب ان يكون له SPF و DKIM و  reverse PTR في سجلات الDNS"
     email_custom_headers: "قائمة قناة محددة لرؤوس بريد إلكتروني مخصص."
     email_subject: "لتخصيص تنسيق عناوين رسائل البريد الالكتروني القياسية. انظر  https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
     force_https: "ارغام الموقع على استخدام HTTPS فقط. تحذير: لا تفعل هذا الاختيار الا بعد التأكد أن HTTPS مفعلة وتعمل بالكامل فى جميع أنحاء الموقع! هل اختبرت جميع الخوادم  CDN، جميع تسجيلات الدخول من شبكات التواصل الاجتماعى، أية صور أو تبعيات خارجية للتأكد من أنها كلها متوافقه مع HTTPS؟"
@@ -940,55 +995,49 @@ ar:
     tl2_additional_likes_per_day_multiplier: "زيادة حد الإعجابات باليوم لـ  لـمستوى الثقة 2 (عضو) بالضرب بهذا الرقم"
     tl3_additional_likes_per_day_multiplier: "زيادة حد الإعجابات باليوم لـ  لـمستوى الثقة 3 (منتظم) بالضرب بهذا الرقم"
     tl4_additional_likes_per_day_multiplier: "زيادة حد الإعجابات باليوم لـمستوى الثقة 4 (قائد) بالضرب بهذا الرقم"
-    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: "اذا كانت مشاركات المستخدم الجديد حصلت علي هذا العدد من علامات  num_tl3_flags_to_block_new_user  من مستخدمين مختلفين من مستوى الثقة 3، اخفي جميع مشاركتهم و امنع جميع المشاركات المستقبليه.0 تعنى الالغاء."
-    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: "يجب أن الموظفين يوافق على جميع حسابات المستخدم الجديدة قبل أن يتم السماح لهم للوصول إلى الموقع. تحذير: تمكين هذا لموقع الحية إلغاء وصول المستخدمين الحاليين غير الموظفين!"
+    must_approve_users: "يجب علي طاقم العمل الموافقة على جميع الحسابات الجديدة قبل أن يتم السماح لها بالوصول إلى الموقع. تحذير: تفعيل هذة الخاصية علي موقع نشط سوف يمنع وصول كل الاعضاء ماعدا طاقم العمل."
     pending_users_reminder_delay: "نبه المشرفين إذا وجد اعضاء ينتظرون الموافقة لمدة اطول من الساعات ، قم بوضع الخيار -1 لايقاف التنبيهات ."
     maximum_session_age: "سيظل المستخدم مسجل دخول لهذا العدد من الساعات منذ زيارته اﻷخيرة."
-    ga_universal_tracking_code: "تحليلات Google العالمية (analytics.js) تتعقب رمز الشيفرة، مثال: UA-12345678-9; انظر http://google.com/analytics"
-    ga_universal_domain_name: "تحليلات Google العالمية (analytics.js) تتعقب اسم المجال، مثال: mysite.com; انظر http://google.com/analytics"
-    gtm_container_id: "هاوية حاوية ادارة العلامات الخاصة بجوجل. على سبيل المثال: GTM-ABCDEF"
+    ga_universal_tracking_code: "رمز التتبع الخاص بخدمة جوجل لتحليل نشاط زوار الموقع (analytics.js)، مثال: UA-12345678-9; انظر http://google.com/analytics"
+    ga_universal_domain_name: "المجال المسموح لخدمة جوجل لتحليل نشاط زوار الموقع (analytics.js) تحليله، مثال: mysite.com; انظر http://google.com/analytics"
+    ga_universal_auto_link_domains: "تفعيل خدمة جوجل لتحليل نشاط الزوار (analytics.js) عبر المواقع. (الروابط المشيرة الي هذة النطاقات سوف تحمل رقم تعريف الزائر)؛ انظر Google's Cross-Domain Tracking guide."
+    gtm_container_id: "الرمز التعريفي لحاوية مدير للوسوم الخاصة بجوجل. على سبيل المثال: GTM-ABCDEF"
     enable_escaped_fragments: "اللجوء الى استخدام Ajax-Crawling API حالة اكتشاف تواجد زاحف الشبكة. للمزيد: https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
-    allow_moderators_to_create_categories: "السماح للمشرفين إنشاء قسم جديد"
+    allow_moderators_to_create_categories: "السماح للمشرفين بإنشاء اقسام جديدة"
     cors_origins: "اسمح بالأصول للطلبات عبر المنشأ (CORS). كل أصل يجب أن يتضمن http:// أو https://. متغير env لـ DISCOURSE_ENABLE_CORS يجب أن يعين إلى true ليعمل CORS."
     use_admin_ip_whitelist: "المدير فقط يمكنه تسجيل الدخول إذا كانت عناوين IP لهم معرفة في قائمة IP المحجوبة. (المدير > السجلات > IP المحجوبة)"
-    top_menu: "حدد الأدوات التي تظهر في ملاحة الصفحة الرئيسية، وما ترتيبها. مثال الأخير|الجديد|غير مقروء|فئات|أعلى|مقروء|مشارك|مفضلات"
-    post_menu: "تحديد العناصر التي تظهر في القائمة آخر، وبأي ترتيب. مثال مثل | تحرير | العلم | حذف | سهم | المرجعية | الرد"
-    post_menu_hidden_items: "عناصر القائمة لإخفاء افتراضيا في القائمة آخر ما لم يتم النقر على القطع التوسع جرا."
-    share_links: "تحديد العناصر التي تظهر على الحوار سهم، وبأي ترتيب."
-    track_external_right_clicks: "تتبع الروابط الخارجية التي يتم النقر الحق (على سبيل المثال: فتح في علامة تبويب جديدة) تعطيل افتراضيا لأنه يعيد كتابة عناوين المواقع"
-    site_contact_username: "الموظفين صالحة اسم المستخدم لإرسال كافة الرسائل الآلي من. وإذا ترك فارغا يتم استخدام حساب النظام الافتراضي."
+    top_menu: "حدد العناصر التي تظهر في قائمة ملاحة الصفحة الرئيسية، و ترتيبها."
+    post_menu: "تحديد العناصر التي تظهر في القائمة المختصرة للمنشور، و ترتيبها. مثل ( اعجاب | تحرير | تبليغ | حذف | مشاركة | علّم | رد )"
+    post_menu_hidden_items: "العناصر المخفية بشكل افتراضي في القائمة المختصره للمنشور  مالم يتم الضغط علي زر الاظهار"
+    share_links: "تحدد اي العناصر تظهر في قائمة مشاركة المنشور و ترتيبها."
+    track_external_right_clicks: "تتبع الروابط الخارجية التي تم النقر عليها بزر الماوس الايمن (على سبيل المثال: فتحت في علامة تبويب جديدة) هذا اللإعداد معطل افتراضيا لأنه يعيد كتابة عناوين المواقع."
+    site_contact_username: "اسم العضو المُستخدَم لارسال جميع الرسائل الالية, اذا ترك الحقل فارغا سيتم استخدام اسم الحساب الافتراضي للنظام."
     send_welcome_message: "أرسل لكل الأعضاء الجدد رسالة ترحيب مع دليل البدء السريع."
     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: "عدد من أهم الموضوعات هو مبين في موجز أعلى الافتراضية المواضيع."
+    topics_per_period_in_top_summary: "عدد افضل الموضوعات الظاهرة في ملخص افضل الموضوعات."
+    topics_per_period_in_top_page: "عدد افضل الموضوعات التي تظهر عند الضغط علي زر \"المزيد من\" افضل الموضوعات."
     redirect_users_to_top_page: "إعادة توجيه تلقائيا للمستخدمين الجدد وغائبة لمدة طويلة إلى أعلى الصفحة."
-    top_page_default_timeframe: "الوقت المثبت علي الصفحة الأكثر مشاهدة."
+    top_page_default_timeframe: "المدي الزمني الافتراضي لصفحة الموضوعات الاكثر مشاهدة."
     show_email_on_profile: "أظهر بريد المستخدمين الإلكترونيّ في لاحاتهم (يكون معروضًا لهم وللطّاقم)"
     email_token_valid_hours: "أمارات نسيان كلمة السّرّ/تنشيط الحساب صالحة لمدّة (n) ساعة."
     enable_badges: "تفعيل نظام الأوسمة."
+    enable_whispers: "السماح للطاقم بعمل نقاشات سرية داخل الموضوعات."
     allow_index_in_robots_txt: "حدّد في robots.txt إمكانيّة فهرسة محرّكات البحث في الوبّ هذا الموقع."
     email_domains_blacklist: "قائمة pipe-delimited المجالات البريد الإلكتروني الذي لا يسمح للمستخدمين تسجيل حسابات مع. مثال: mailinator.com | trashmail.net"
     email_domains_whitelist: "قائمة pipe-delimited من مجالات البريد الإلكتروني التي يجب على المستخدمين تسجيل حسابات مع. تحذير: لن يسمح للمستخدمين مع مجالات البريد الإلكتروني الأخرى غير المذكورة هنا!"
-    forgot_password_strict: "لا تخبر المستخدمين بوجود الحساب عند استخدامهم حوار نسيان كلمة السّرّ."
     log_out_strict: "عند الخروج، اخرج من كلّ جلسات المستخدم في كلّ الأجهزة"
     version_checks: "Ping ديسكورس مركزا لتحديثات الإصدار وإظهار الرسائل النسخة الجديدة على لوحة القيادة / مسؤول"
     new_version_emails: "إرسال بريد إلكتروني إلى عنوان contact_email عندما نسخة جديدة من ديسكورس هو متاح."
-    port: "DEVELOPER فقط! تحذير! استخدام هذا المنفذ HTTP بدلا من الافتراضي من المنفذ 80. المغادرة ابحث عن الافتراضي من 80."
-    force_hostname: "DEVELOPER فقط! تحذير! تحديد اسم المضيف في URL. اتركه فارغا لالافتراضي."
     invite_expiry_days: "مدة صلاحية مفاتيح دعوة عضو، بالأيام."
     invite_passthrough_hours: "كم المدة التي يمكن للعضو أن يستخدم مفتاح دعوة محرر سابقا لتسجيل الدخول، في الساعات"
-    login_required: "أصلح التوثيق لقراءة الاتصال على هذا الموقع، لا تسمع بالوصول المجهول."
+    invite_only: "غير مسموح للعامة بانشاء حساب, كل الحسابات الجديدة يجب ان تكون دعوات مرسلة من قبل طاقم العمل."
+    login_required: "اطلب تسجيل دخول لقرائة محتوي هذا الموقع."
     min_username_length: "أدنى طول لاسم المستخدم (بالمحارف). تحذير: إن كان هناك أيّة مستخدمين أو مجموعات تملك أسماء أقصر من هذه، فسيعطب الموقع!"
     min_password_length: "أدنى طول لكلمة السّرّ."
     min_admin_password_length: "أدنى طول لكلمة سرّ الإداريّ."
@@ -1003,22 +1052,23 @@ ar:
     sso_overrides_name: "يتجاوز الاسم المحلي مع اسم موقع خارجي من حمولة SSO عند كل تسجيل دخول, ويمنع التغيرات المحلية. "
     sso_overrides_avatar: "تجاوز صوره المستخدم الرمزيه بواسطه موقع ور رميه خارجي من SSO المحمول. اذا فعلت, الغي allow_uploaded_avatarsعاليه  مطلوبه "
     sso_not_approved_url: "إعادة التوجيه لم توافق على حسابات SSO لهذا URL"
-    enable_local_logins: "فعل اسم مستخدم و كلمه مرور محليه تعتمد علي الحسابات(ملاحظه: يجب ان تفعل بالدعوات لتعمل) "
-    allow_new_registrations: "السماح تسجيل مستخدم جديد. إلغاء هذا لمنع أي شخص من إنشاء حساب جديد."
-    enable_signup_cta: "عرض إشعار لإرجاع المستخدمين المجهولين وحثهم على إنشاء حساب."
-    enable_yahoo_logins: "تفعيل مصادقة ياهو"
-    enable_google_oauth2_logins: "تمكين مصادقة جوجل Oauth2. هذا هو أسلوب المصادقة التي تؤيد جوجل حاليا. يتطلب مفتاح وسرا."
-    google_oauth2_client_id: "التسجيل بحسابك الشخصي في جوجل"
-    google_oauth2_client_secret: "العميل السري لتطبيق قوقل الخاص بك."
-    enable_twitter_logins: "تفعيل مصادقة تويتر , يطلب : twitter_consumer_key و twitter_consumer_secret"
-    twitter_consumer_key: "مفتاح المستهلك للمصادقة تويتر، مسجلة في http://dev.twitter.com"
-    twitter_consumer_secret: "مفتاح المستهلك للمصادقة تويتر، مسجلة في http://dev.twitter.com"
-    enable_instagram_logins: "تفعيل تسجيل الدخول عن طريق الانستغرام , يتطلب instagram_consumer_key و instagram_consumer_secret"
-    instagram_consumer_key: "مفتاح الاستخدام لتوثيق الانستغرام "
-    instagram_consumer_secret: "استخدم توثيق انستغرام السري "
-    enable_facebook_logins: "تمكين مصادقة الفيسبوك، يتطلب facebook_app_id وfacebook_app_secret"
-    facebook_app_id: "التطبيق معرف للمصادقة الفيسبوك، مسجلة في https://developers.facebook.com/apps"
-    facebook_app_secret: "التطبيق معرف للمصادقة الفيسبوك، مسجلة في https://developers.facebook.com/apps"
+    enable_local_logins: "فعل امكانية عمل حسابات محلية باسم المستخدم و كلمة المرور (ملحوظة: يجب ان تفعل لجعل خاصية الدعوات تعمل)"
+    allow_new_registrations: "السماح بتسجيل حسابات جديدة. عطل هذه الخاصية إذا كنت تريد منع الكل من عمل حساب جديد علي الموقع."
+    enable_signup_cta: "اعرض تنبية للزوار المجهولين المترددين يحثهم علي تسجيل حساب جديد."
+    enable_yahoo_logins: "تفعيل تسجيل الدخول بميل YAHOO"
+    enable_google_oauth2_logins: "تفيعل خاصية تسجيل الدخول بحساب الGmail بخاصية تسمي Oauth2."
+    google_oauth2_client_id: "رقم التعريف لتطبيق جوجل الخاص بك"
+    google_oauth2_client_secret: "الرقم السري لتطبيق جوجل الخاص بك."
+    enable_twitter_logins: "تفعيل تسجيل الدخول بحساب تويتر."
+    twitter_consumer_key: "مفتاح المستهلك لنظام تسجيل الدخول بحساب تويتر، يمكن الحصول علي واحد من http://dev.twitter.com"
+    twitter_consumer_secret: "رقم المستهلك السري لنظام تسجيل الدخول بحساب تويتر، يمكن الحصول علي واحد من http://dev.twitter.com"
+    enable_instagram_logins: "تفعيل تسجيل الدخول عن طريق حساب انستغرام."
+    instagram_consumer_key: "مفتاح المستهلك لنظام تسجيل الدخول بحساب انستجرام."
+    instagram_consumer_secret: "رقم المستهلك السري لنظام تسجيل الدخول بحساب انستجرام."
+    enable_facebook_logins: "تفعيل تسجيل الدخول عن طريق حساب الفيسبوك."
+    facebook_app_id: "رقم تعريف تطبيق الفيسبوك المستخدم لنظام تسجيل الدخول، يمكنك الحصور علية من هنا https://developers.facebook.com/apps"
+    facebook_app_secret: "الرقم السري لتطبيق الفيسبوك المستخدم لنظام تسجيل الدخول، يمكنك الحصور علية من هنا https://developers.facebook.com/apps"
+    facebook_request_extra_profile_details: "اطلب من الفيسبوك البيانات \"عني و الموقع الجغرافي و الموقع الالكتروني\". ( يتطلب ان يكون التطبيق المستخدم موافق عليه من قبل الفيسبوك )"
     enable_github_logins: "فعّل استيثاق غِت‌هَب، يتطلّب github_client_id وgithub_client_secret"
     github_client_id: "هوية العميل للمصادقة جيثب، مسجلة في https://github.com/settings/applications"
     github_client_secret: "هوية العميل للمصادقة جيثب، مسجلة في https://github.com/settings/applications"
@@ -1048,13 +1098,13 @@ ar:
     max_invites_per_day: "أقصى عدد للدعوات التي يمكن للعضو إرسالها باليوم."
     max_topic_invitations_per_day: "أقصى عدد لدعوات الموضوع التي يمكن للعضو إرسالها باليوم."
     alert_admins_if_errors_per_minute: "عدد الأخطاء في الدقيقة الواحدة لكى يرسل تنبيه للمدير. قيمة 0 تعطل هذه الميزة. ملاحظة: تتطلب إعادة تشغيل."
-    categories_topics: "عدد المواضيع لتظهر في صفحة ‎/categories."
-    suggested_topics: "عدد المواضيع المواضيع المقترحة يظهر في أسفل الموضوع."
-    limit_suggested_to_category: "أظهر فقط المواضيع من الفئات الحالية في المواضيع المقترحة."
+    categories_topics: "عدد الموضوعات التي تظهر في صفحة الأقسام."
+    suggested_topics: "عدد الموضوعات المقترحة التي تظهر في أسفل الموضوع."
+    limit_suggested_to_category: "أظهر فقط الموضوعات من القسم الحالي في الموضوعات المقترحة."
+    suggested_topics_max_days_old: "الموضوعات المقترحة لا يجب ان تكون اقدم من هذا العدد من الايام."
     clean_up_uploads: " يتيم أزالة تحديث غير مرجعية لمنع استضافة غير المشروعة. تحذير: قد تحتاج لعمل نسخة احتياطية من الدليل / تحميل قبل تمكين هذا الإعداد."
     clean_orphan_uploads_grace_period_hours: "فترة الراحة (بالساعات) قبل الرفع الوحيد تمت إزالته."
     purge_deleted_uploads_grace_period_days: "يتم مسح فترة سماح (بالأيام) قبل تحميل حذفه."
-    purge_unactivated_users_grace_period_days: "يتم حذف فترة سماح (بالأيام) قبل المستخدم الذي لم تنشيط حساباتهم."
     enable_s3_uploads: "وضع الإضافات على تخزين الأمازون S3. هام: يتطلب اعتماد S3 صالحة (على حد سواء الوصول معرف مفتاح ومفتاح الوصول السري)."
     s3_use_iam_profile: 'إستعمل وظيفة AWS EC2 IAM لإسترجاع المفاتيح. ملاحظة : التمكين سوف يتجاوز " مفتاح معرف الوصول ل s3 " و "مفتاح الوصول السري ل s3" الإعدادات.'
     s3_upload_bucket: "اسم حزمة Amazon S3 التي سيتم تحميل الملفات إليها. تحذير : يجب أن تكون أحرف صغيرة، لا تحوي مسافات، ولا _."
@@ -1065,8 +1115,9 @@ ar:
     avatar_sizes: "قائمة أحجام الرمزية إنشاؤه تلقائيا."
     external_system_avatars_enabled: "استخدم خدمات الهه النظام الخارجي "
     default_opengraph_image_url: "عنوان رابط صورة ال اوبن جراف الثابتة"
+    twitter_summary_large_image_url: "عنوان الURL للصورة الافتراضية لكارت الملخص علي تويتر ( يجب ان تكون علي الاقل بعرض 280 بكسل و ارتفاع 150 بكسل )"
     allow_all_attachments_for_group_messages: "اسمح بجميع ملحقات البريد  للرسائل الجماعيه "
-    enable_flash_video_onebox: "فعّل تضمين روابط swf وflv (أدوبي فلاش) في الصّناديق. تحذير: قد يتسبّب بمخاطر أمنيّة."
+    enable_flash_video_onebox: "فعّل تضمين روابط swf وflv (أدوبي فلاش) في لوحات المعاينة. تحذير: قد يتسبّب بمخاطر أمنيّة."
     default_invitee_trust_level: "مستوى الثقة الإفتراضي (0-4) للأعضاء المدعوين."
     default_trust_level: "مستوى الثقة الإفتراضي (0-4) للأعضاء المدعوين.تحذير! التغيرات ستضعك تحت خطر البريد الغير هام."
     tl1_requires_topics_entered: "عدد المواضيع التي على المستخدم الجديد دخولها قبل ترقيته إلى مستوى الثّقة الأوّل."
@@ -1104,8 +1155,9 @@ ar:
     title_fancy_entities: "تحويل أحرف ASCII مشتركة لكائنات HTML  في عناوين الموضوع، ala SmartyPants http://daringfireball.net/projects/smartypants/"
     min_title_similar_length: "الحد الأدنى لطول العنوان قبل أن يتم البحث عن مواضيع مشابهة."
     min_body_similar_length: "الحد الادنى لطول المشاركة قبل أن يتم البحث عن مواضيع مشابه."
-    category_colors: "قائمة قيمة الألوان الست عشرية مسموحة في الفئات."
-    category_style: "النمط المرئي لفئة الأوسمة."
+    desktop_category_page_style: "أسلوب العرض لصفحة الأقسام."
+    category_colors: "قائمة الألوان المسموحة لتمييز الأقسام بترميز الhexadecimal."
+    category_style: "أسلوب العرض لشارة القسم."
     max_image_size_kb: "الحجم الاقص لتحميل صوره بالكيلو بايت.هذا يجب ضبطه في nginx (client_max_body_size) /اباتشي او البروكسي"
     max_attachment_size_kb: "أقصى حجم لتحميل المرفقات الملفات بالكيلوبايت. وهذا يجب أن يتم تكوينه في nginx (client_max_body_size) / أباتشي أو الوكيل. "
     authorized_extensions: "قائمة بالملفات المسموح رفعها (أستخدم '*' للسماح لجميع الأنواع)"
@@ -1139,9 +1191,6 @@ ar:
     num_flags_to_close_topic: "ادني عدد من التبليغات النشطه المطلوبه ليتم توقيف الموضوع تلقائيا ليدخل"
     auto_respond_to_flag_actions: "تمكين الرد التلقائي عند التخلص من التبليغ."
     min_first_post_typing_time: "الحد الأدنى من الوقت بالمللي ثانية يجب على المستخدم كتابته خلال المشاركة الأولى، إذا لم تتم الاستجابة للحد الأدنى للمشاركة ستدخل تلقائيا في قائمة انتظار الموافقة على الاحتياجات. تعيين إلى 0 للتعطيل (غير مستحسن)"
-    auto_block_fast_typers_on_first_post: "اوتوماتيكيا احظر المستخدمين الذين لا يقابلون \nدقيقه_اول_منشور_كتابه_زمن"
-    auto_block_fast_typers_max_trust_level: "الحد الأعلى لمستوى الثقة لأنواع الحظر التلقائي السريع."
-    auto_block_first_post_regex: "التعابير القياسية ستتحسس عند مرور أول منشور، سيتم حظره وارساله لقائمة الانتظار للموافقة، مثال  raging|a[bc]a ستؤدي جميع المشاركات التي تحتوي على عنصرية أو جمعية المحامين الأمريكي أو هيئة مكافحة الفساد للحظر أول مرة. تنطبق فقط على أول منشور."
     reply_by_email_enabled: "تفعيل الرد على الموضوع بواسطة البريد الالكتروني"
     reply_by_email_address: "قالب للرد على عنوان البريد الإلكتروني الوارد بواسطة البريد الإلكتروني، مثال: %{reply_key}@reply.example.com أو الردود+%{reply_key}@example.com"
     disable_emails: "امنع دسكورس من إرسال أيّ نوع من البريد"
@@ -1162,21 +1211,23 @@ ar:
     pop3_polling_username: "اسم العضو لحساب POP3 للتصويت بالبريد الإلكتروني."
     pop3_polling_password: "كلمة المرور لحساب POP3 للتصويت بالبريد الإلكتروني."
     log_mail_processing_failures: " سجل كل فشل عمليات البريد الإلكتروني  الي http://yourtsitename.com/logs"
-    email_in: "اسمح للمستخدمين بنشر المواضيع الجديده عن طريق البريد الالكتروني (يتطلب تصويت  pop3 ). كون العناوين في الضبط صفحه لكل فئه "
+    email_in: "اسمح للأعضاء بنشر موضوعات جديدة باستخدام البريد الإلكتروني ( requires manual or pop3 polling ). قم بضبط عنوان البريد الإلكتروني في تبويب \"الإعدادات\" لكل قسم."
     email_in_min_trust: "أدنى مستوى ثقة يحتاجه العضو للسماح له بنشر موضوع جديد عبر البريد الألكتروني."
     email_prefix: "[الوسم] يُستخدم في عنون رسالة البريد الألكتروني. سيكون إفتراضياً 'العنوان' في حال عدم تعيينه."
     email_site_title: "عنوان الموقع يستعمل كمرسل للرسائل الإلكترونية من ااموقع. افترضيا 'العنوان'  اذا لم يتم ضبطه.  اذا كان، العنوان يحتوي علي رموز غير مسموح به في خانات البريد اامرسل، استعمل هذا الضبط. "
     minimum_topics_similar: "عدد المواضيع التي يجب أن تكون موجودة قبل عرض المواضيع المشابهة عند إنشاء موضوع جديد."
-    relative_date_duration: "عدد الايام بعد النشر حيث التواريخ سوف تظهر تقريبا (7ايام) بدلا من (20 فبراير) "
+    relative_date_duration: "عدد الايام من بداية نشر المنشور التي يتم بعدها كتابه تاريخ النشر بشكل نسبي ( منذ 7 ايام ) و ليس تاريخ مجرد ( 20 أيلول سبتمبر )"
     delete_user_max_post_age: "لا تسمح بحذف المستخدمين الذين منشورهم الاول اقدم من (x) ايام"
     delete_all_posts_max: "العدد الاقص للمشاركات التي يمكن مسحها مره واحده بزر مسح كل المشاركات.اذا المستخدم لديه اكثر من هذا العدد من المشاركات, المشاركات لا يمكن مسح جميعها مره واحدهو المستخدم لا يمكن حذفه"
-    username_change_period: "عدد الايام بعد التسجيل التي يستطيع فيها الحسابات بتغير اسم المستخدم الخاص بهم(0 لكي لا تسمح بتغير اسم المستخدم)"
     email_editable: "يُسمح للأعضاء بتغيير بريدهم الألكتروني بعد التسجيل."
     allow_uploaded_avatars: "اسمح للمستخدمين برفع صور لاحة مخصّصة."
     allow_animated_avatars: "يُسمح للمستخدمين باستخدام صور متحركة GIF كصورة شخصية.\nتحذير:يُمنع استخدام صور رمزية خليعة:سيتم تحديث الصورة فور تغييرها."
     allow_animated_thumbnails: "يولد الصور المصغرة المتحركة للرسوم المتحركة. "
     default_avatars: "سيتم استخدام عناوين URL للصور الرمزية بشكل افتراضيًا للأعضاء الجدد حتى يغيروا صورهم."
     automatically_download_gravatars: "تحميل Gravatars للأعضاء عند تغيرهم البريد الإلكتروني الخاص بهم أو عند إنشائهم لحساب آخر."
+    digest_topics: "أقصى عدد للمواضيع المشهورة لتعرض في موجز البريد الإلكتروني . "
+    digest_other_topics: "اقصي عدد من الموضوعات المعروضة برساله الملخص الإلكترونية في قسم \"الجديد في الموضوعات و الأقسام التي تتابعها\"."
+    digest_suppress_categories: "إستثني هذا القسم من رسالة الملخص الإلكترونية."
     disable_digest_emails: "تعطيل رسائل الملخص لجميع الأعضاء."
     detect_custom_avatars: "سواء او لا تفقد اذا كان المستخدم قام بتحميل صور شخصيه مخصصه"
     max_daily_gravatar_crawls: "العدد الاقصي من مرات Dicourse  سوف يتفقد Gravatar  لصور رمزيه مخصصه في اليوم"
@@ -1189,14 +1240,15 @@ ar:
     hide_user_profiles_from_public: "قم بإلغاء الصفحة الشخصية و حقيبة المستخدم و بطاقة المستخدم للمستخدمين المجهولين"
     allow_profile_backgrounds: "اسمح للمستخدمين برفع خلفيّات للّاحة."
     sequential_replies_threshold: "عدد المشاركات التي يجب على المستخدم انشاءها في عمود في الموضوع الواحد قبل ان يتم تنبيه بكثره الردود المتتاليه ."
-    enable_mobile_theme: "اجهزه الموبايل تستخدم ثيم مناسب للجوال,امكانيه التحويل للموقع الكامل .الغي هذا اذا اردت استخدام انماط سريعه الاستجابه"
+    enable_mobile_theme: "استخدام واجة مخصصة للهواتف مع امكانية التحول الي واجة الموقع الاساسية. قم بتعطيل هذا الاعداد اذا اردت استخدام واجهة تستطيع التكيف مع حجم الشاشة."
     dominating_topic_minimum_percent: "ما هي النسبه المئويه للمشاركات التي يجب علي المستخدم عملها في الموضوع قبل تلقيه لتنبيه عن خروجه لنطاق الموضوع"
     disable_avatar_education_message: "عطل الرسالة التعليمية لتغيير الصورة الرمزية."
-    suppress_uncategorized_badge: "لا تظهر الوسام  للمواضيع غير المصنفة في قائمة الموضوع."
+    suppress_uncategorized_badge: "لا تظهر الشارة للموضوعات غير المصنفة في قائمة الموضوعات."
     global_notice: "اعرض تنبيه, شعار عام طارئ ملاحظه لكل الزوار, غير الفراغ لاخفاء(HTML مسموح)"
     disable_edit_notifications: "لتعطيل تحرير الاشعارات بواسطة العضو النظام عندما يكون نشطاً 'download_remote_images_to_local'."
     automatically_unpin_topics: "تلقائياً قم بنزع الدبوس عندا يصل المستخدم إلي نهاية الصفحه"
     read_time_word_count: "عداد الكلمات  للدقيقه لحساب الوقت المقدر للقراءه "
+    topic_page_title_includes_category: "عنوان صفحة الموضوع يحتوي علي اسم القسم."
     full_name_required: "الإسم الكامل مطلوب وهو ضروري لإكمال الحساب "
     enable_names: "عرض الاسم الكامل للعضو , بطاقة العضو , ورسائل البريد الالكتروني , تعطيل عرض الاسم في اي مكان "
     display_name_on_posts: "عرض الاسم الكامل للعضو على التعليقات بالاضافة الى @username."
@@ -1205,15 +1257,9 @@ ar:
     default_code_lang: "تسليط الضوء علي تركيب جمله اللغه البرمجيه يطبق الي مكعبات اكواد GitHub (lang-auto, ruby, python etc.)"
     warn_reviving_old_topic_age: "عندما يبدا احدهم بالرد علي الموضوع و اخر كان اقدم من هذه الايام, سوف يظهر تحذير, عطل عن طريق الضبط الي 0"
     autohighlight_all_code: "تطبيق تسليط الضوء الاجباري علي الاكواد  لكل مكعبات الاكواد لمهياه مسبقا . عندما لا تحدد اللغه بشكل صريح"
-    feed_polling_enabled: "فقط التضمين : تضمين مغذي RSS/ATOM كمشاركات."
-    feed_polling_url: "فقط التضمين : URL  لمغذي RSS/ATOM مضمن."
-    embed_by_username: "اسم مستخدم Discourse للعضو الذي ينشأ المواضيع المضمنة."
-    embed_username_key_from_feed: "مفتاح لسحب اسم مستخدم discourse من المغذي."
     embed_truncate: "اقتطاع الوظائف المدمجة."
     embed_post_limit: "أقصى عدد للمشاركات المضمنة."
     embed_username_required: "إسم المستخدم مطلوب لإضافة مقالة"
-    embed_whitelist_selector: "منتقي CSS للعناصر التي تسمح في التضمينات."
-    embed_blacklist_selector: "منتقي CSS للعناصر التي حذفت من التضمينات."
     show_create_topics_notice: "إذا كان الموقع يحتوي على أقل من 5 مواضيع عامة , إظهار إشعار مطالبة المسؤولين إنشاء بعض المواضيع."
     delete_drafts_older_than_n_days: حذف المسودات مضى عليها أكثر من (ن) يوما.
     prevent_anons_from_downloading_files: "امنع  المستخدمين المجهولين من تحميل المرفقات. تحذير:سوف تمنع اي شخص ليس لديه صوره موقع  اصول نشره كمرفقات من العمل."
@@ -1238,9 +1284,12 @@ ar:
     default_other_disable_jump_reply: "لاتتجاوز الردود الى رد العضو مباشرة بعد اضافته رد جديد. "
     default_other_like_notification_frequency: "اجعل تنبيه الأعضاء بالإعجابات الجديدة افتراضي. "
     default_topics_automatic_unpin: "تلقائياً قم إزالة تثبيت المواضيع عندما يصل العضو إلى الأسفل \"إفتراضيا\"."
-    default_categories_watching: "قائمة الفئات التي تشاهد إفتراضيا."
-    default_categories_tracking: "قائمة الفئات التي تتابع إفتراضيا."
-    default_categories_muted: "قائمة الفئات التي توضع صامتة إفتراضيا."
+    default_categories_watching: "قائمة الأقسام المضبوطة إفتراضيا علي الوضع \"مُراقب\"."
+    default_categories_tracking: "قائمة الأقسام المضبوطة إفتراضيا علي الوضع \"مُتابع\"."
+    default_categories_muted: "قائمة الأقسام المضبوطة إفتراضيا علي الوضع \"مكتوم\"."
+    default_categories_watching_first_post: "قائمة الأقسام حيث أول منشور من كل موضوع جديد سوف يكون مضبوط افتراضياً علي الوضع  \"مُراقب\"."
+    tagging_enabled: "فعّل الأوسمة على المواضيع."
+    remove_muted_tags_from_latest: "لا تظهر الموضوعات الموسومة بأوسمة مكتومة في قائمة أخر الموضوعات."
     company_short_name: "اسم الشّركة (قصير)"
     company_full_name: "اسم الشّركة (الكامل)"
     company_domain: "نطاق الشّركة"
@@ -1346,10 +1395,10 @@ ar:
       other: "أُغلق هذا الموضوع آليًّا بعد %{count} دقيقة من آخر ردّ. لم يعد ممكنًا وضع ردود جديدة."
     autoclosed_disabled: "تم فتح هذا الموضوع الان ويسمح باضافة ردود جديدة "
     autoclosed_disabled_lastpost: "تم فتح هذا الموضوع الان ويسمح باضافة ردود جديدة "
-    pinned_enabled: "هذا الموضوع الآن مقيد. سوف تظهر في الجزء العلوي من فئة لها حتى أنها متغيرة من الموظفين لكل فرد، أو بواسطة المستخدمين انفسهم."
-    pinned_disabled: "هذا الموضوع يتم الآن إزالة. لن يظهر في الجزء العلوي من هذه الفئة."
-    pinned_globally_enabled: "هذا الموضوع معلّم الآن. سوف يظهر في أعلى كل صفحة حتى يرفض من قبل المستخدم."
-    pinned_globally_disabled: "هذا الموضوع الان غير مثبت . لن يكون موجودا في اعلى الفئه لمده طويله"
+    pinned_enabled: "هذا الموضوع مثبت الأن. سوف يظهر في اعلي القسم الخاص به حتي يتم إزالة التثبيت لكل الاعضاء بواسطة احد افراد طاقم العمل او كل عضو لنفسة ."
+    pinned_disabled: "هذا الموضوع غير مثبت الأن. لن يظهر اعلي القسم الخاص بة."
+    pinned_globally_enabled: "هذا الموضوع مثبت الآن بشكل عام. سوف يظهر في اعلي القسم الخاص بة و كل قوائم الموضوعات حتي يتم إزالة التثبيت لكل الأعضاء بواسطة احد افراد طاقم العمل او كل عضو لنفسة."
+    pinned_globally_disabled: "هذا الموضوع غير مثبت الأن. لن يظهر اعلي القسم الخاص بة."
     visible_enabled: "هذا الموضوع مدرج الأن. سيظهر في قائمة المواضيع."
     visible_disabled: "غير مدرج الآن هذا الموضوع. لن يتم عرضها في اي قوائم الموضوع. الطريقة الوحيدة للوصول إلى هذا الموضوع هو عن طريق الرابط المباشر."
   login:
@@ -1365,20 +1414,18 @@ ar:
     errors: "%{errors}"
     not_available: "غير متاح. جرّب %{suggestion} ؟"
     something_already_taken: "حدث خطأ ما, ربما اسم المستخدم و البريد الالكتروني مسجل مسبقا, جرب رابط نسيان كلمة المرور."
-    omniauth_error: "نأسف, هناك خطأ في تصريح حسابك. ربما لم تعطي تصريح؟"
+    omniauth_error: "نأسف، حدث خطأ في استيثاق حسابك. لربمّا لم تقبل الاستيثاق؟"
     omniauth_error_unknown: "حدث خطأ ما في معالجة دخولك، الرجاء إعادة المحاولة."
     new_registrations_disabled: "لا يُسمح بتسجيل حساب جديد بهذا الوقت "
     password_too_long: "كلمة السّرّ مقصورة على 200 محرف."
     email_too_long: "عنوان البريد الإلكترونيّ الذي قدّمته طويل جدًّا. لا يجب أن يزيد طول أسماء صناديق البريد على 254 محرفًا، ولا يجب أن يزيد طول أسماء النّطاقات على 253 محرفًا."
     reserved_username: "اسم المستخدم ذلك غير مسموح."
     missing_user_field: "لم تُكمل كافة الحقول المطلوبة "
-    close_window: "تم التحقق . اغلق هذه النافذة للإستمرار"
   user:
     no_accounts_associated: "لا حسابات مرتبطة"
     username:
       short: "يجب أن تكون على الأقل %{min} أحرف"
       long: "يجب ان تكون الاحرف اكثر من %{max} "
-      characters: "يجب ان تحتوي الارقام والاحرف الصغيرة فقط "
       unique: "يجب أن يكون فريدا"
       blank: "يجب أن يكون موجود"
       must_end_with_alphanumeric: "يجب أن ينتهي برقم أو حرف "
@@ -1395,21 +1442,13 @@ ar:
   flags_reminder:
     subject_template:
       zero: "لا يوجد تبليغات تنتظر التعامل معها"
-      one: "تبليغ 1 ينتظر التعامل معها"
-      two: "تبليغان ينتظران التعامل معها"
-      few: "%{count} تبليغات تنتظر التعامل معها"
-      many: "%{count} تبليغات تنتظر التعامل معها"
-      other: "%{count} تبليغات تنتظر التعامل معها"
+      one: "بلاغ واحد ينتظر التعامل معه"
+      two: "بلاغان ينتظران التعامل معهما"
+      few: "%{count} بلاغات تنتظر التعامل معها"
+      many: "%{count} بلاغات تنتظر التعامل معها"
+      other: "%{count} بلاغات تنتظر التعامل معها"
   unsubscribe_mailer:
     subject_template: "أكّد عدم رغبتك بعد الآن باستقبال تحديثات %{site_title} على البريد"
-  invite_mailer:
-    subject_template: "دعاك %{invitee_name} إلى ’%{topic_title}‘ على {site_domain_name}"
-  custom_invite_mailer:
-    subject_template: "دعاك %{invitee_name} إلى ’%{topic_title}‘ على {site_domain_name}"
-  invite_forum_mailer:
-    subject_template: "دعاك %{invitee_name} للانضمام إلى {site_domain_name}"
-  custom_invite_forum_mailer:
-    subject_template: "دعاك %{invitee_name} للانضمام إلى %{site_domain_name}"
   invite_password_instructions:
     subject_template: "اضبط كلمة سرّ لحسابك على %{site_name}"
   admin_confirmation_mailer:
@@ -1419,17 +1458,6 @@ ar:
       [أكّد حساب المدير](%{admin_confirm_url})
   new_version_mailer:
     subject_template: "[%{email_prefix}] إصدارة دسكورس جديدة، ثمّة تحديث متوفّر"
-    text_body_template: |
-      مرحى! هناك إصدارة جديدة متوفّرة من [دسكورس](http://www.discourse.org)!
-
-      الإصدارة الحاليّة: %{installed_version}
-      الإصدارة الجديدة: **%{new_version}**
-
-      - رقِّ الإصدارة مستخدمًا **[التّرقية عبر المتصفّح بنقرة واحدة](%{base_url}/admin/upgrade)**
-
-      - تعرّف على الجديد في [سجلّ غِت‌هَب](https://github.com/discourse/discourse/commits/master)
-
-      - زُر [meta.discourse.org](https://meta.discourse.org) لأخبار دسكورس، والنّقاشات عنه والدّعم له
   flag_reasons:
     off_topic: "تم تاشير مشاركتك **خارج الموضوع**:  المجتمع يشعر بانها لا تلائم الموضوع , حاليا كتعريف  بالعنوان و المشاركه الاولى"
     inappropriate: " مشاركتك **غير ملائم**: المجتمع يشعر بانها لا تلائم الموضوع . [our community guidelines](/guidelines)."
@@ -1442,16 +1470,20 @@ ar:
     deferred: "نشكرك لإعلامنا بذلك. نحن ننظر في الأمر."
     deferred_and_deleted: "نشكرك لإعلامنا بذلك. لقد أزلنا المشاركة."
   system_messages:
+    contents_hidden: "يُرجى زيارة المشاركة لرؤية محتوياتها"
     post_hidden:
       title: "المشاركة مخفية"
       subject_template: "المشاركة مخفية بتصويت الاعضاء"
     welcome_user:
+      title: "ترحيب المستخدم"
       subject_template: "مرحبا بك في %{site_name}!"
     welcome_invite:
+      title: "ترحيب دعوة"
       subject_template: "مرحبا بك في %{site_name}!"
     backup_succeeded:
       subject_template: "اكتملت عملية النسخ الإحتياطي بنجاح"
     backup_failed:
+      title: "النسخة إحتياطية فشلت"
       subject_template: "فشل النسخ الإحتياطي"
     restore_succeeded:
       subject_template: "أكتملت الإستعادة بنجاح"
@@ -1466,7 +1498,6 @@ ar:
       subject_template: "اكتمل تصدير البيانات"
     csv_export_failed:
       subject_template: "فشل تصدير البيانات"
-      text_body_template: "نأسف، فشل تصدير البيانات. رجاء افحص السّجلّات أو راسل أحد أعضاء الطّاقم."
     email_reject_empty:
       text_body_template: |
         آسفون، لكن رسالة البريد الالكتروني إلى %{destination} (titled %{former_title}) لم تنجح .
@@ -1479,8 +1510,16 @@ ar:
         نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title})  لا تعمل.
 
         لم نتمكن من العثور على أي محتوى في البريد الإلكتروني الخاص بك. **تأكد من الرد الخاص بك هو في الجزء العلوي من البريد الإلكتروني -- نحن لا يمكننا معالجة الردود في سطر .
-    spam_post_blocked:
-      subject_template: "العضو الجديد %{username} تم حجب مشاركاته بسبب تكرار الروابط "
+    email_reject_invalid_access:
+      text_body_template: |
+        عذرا, لكن رسالتك الإلكترونية إلي %{destination} ( بعنوان %{former_title}) مرفوضة.
+
+        حسابك الخاص ليس لدية الصلاحية لنشر موضوع جديد بهذا القسم. اذا كنت تعتقد ان هذا خطا [تواصل مع طاقم العمل](%{base_url}/about).
+    email_reject_strangers_not_allowed:
+      text_body_template: |
+        عذرا, لكن رسالتك الإلكترونية إلي %{destination} ( بعنوان %{former_title}) مرفوضة.
+
+        القسم الذي ارسلت له يسمح فقط لعناوين البريد الإلكتروني المعروفة و الاعضاء الحاصلين علي صلاحية مناسبة بعمل رد. إذا كنت تعتقد ان هذا خطا [تواصل مع طاقم العمل](%{base_url}/about).
     pending_users_reminder:
       subject_template:
         zero: "لا يوجد أعضاء تنتظر الموافقة."
@@ -1495,20 +1534,59 @@ ar:
     download_remote_images_disabled:
       subject_template: "الغاء تفعيل تحميل الصور عن بعد "
       text_body_template: "تم تعطيل الإعداد 'download_remote_images_to_local' لأنه تم الوصول إلى حد مساحة القرص في 'download_remote_images_threshold'."
+  unsubscribe_link: |
+    لإلغاء الإشتراك من هذه الرسائل الإلكترونية [أنقر هنا](%{unsubscribe_url}).
+  unsubscribe_link_and_mail: |
+    لإلغاء الإشتراك من هذه الرسائل الإلكترونية [أنقر هنا](%{unsubscribe_url}).
+  unsubscribe_mailing_list: |
+    استلمت هذا بسبب أنك قمت بتفعيل وضع القائمة البريدية.
+
+    لإلغاء الاشتراك من البريد الالكتروني ، [ انقر هنا](%{unsubscribe_url}).
   subject_re: "اعادة "
   user_notifications:
     previous_discussion: "الردود السابقة "
     in_reply_to: "في رد لـ "
     unsubscribe:
-      title: "غير مشترك "
+      title: "إلغاء الاشتراك"
       description: "لست مهتما في تلقي هذه الرسائل الالكترونيه؟ لا مشكله! اضغط تحت ليتم الغاء اشتركك فورا:"
+    reply_by_email: "[زيارة الموضوع](%{base_url}%{url}) أو بالرد على هذا البريد للإجابه."
+    visit_link_to_respond: "[زيارة الموضوع](%{base_url}%{url}) للرد."
     visit_link_to_respond_pm: "[زُر الرّسالة](%{base_url}%{url}) للرّدّ."
     posted_by: "مشاركة بواسطة %{username} على %{post_date}"
     user_posted_pm_staged:
       subject_template: "%{optional_re}%{topic_title}"
     digest:
       why: "ملخص المؤجز من %{site_link} منذ زيارتك الاخيره في  %{last_seen_at}"
+      since_last_visit: "منذ زيارتك الأخيرة"
+      new_topics: "المواضيع الجديدة"
+      liked_received: "الإعجابات المستلمة"
+      new_posts: "المشاركات الجديدة"
+      popular_topics: "أشهر المواضيع"
+      join_the_discussion: "إقرأ المزيد"
+      more_new: "الجديد لك أنت"
       click_here: "أنقر هنا"
+      preheader: "ملخص منذ زيارتك الأخيرة على %{last_seen_at}"
+    account_created:
+      title: "الحساب أُنشئ"
+      subject_template: "حسابك الجديد [%{email_prefix}]"
+    confirm_new_email:
+      subject_template: "أكّد عنوان بريد الإلكتروني الجديد %{email_prefix}"
+      text_body_template: |
+        أكد عنوان بريدك الإلكتروني لـ %{site_name} بالضغط على الرابط التالي :
+
+        %{email_token}/u/ وثق البريد الإلكتروني  /u/%{base_url}
+    confirm_old_email:
+      subject_template: "أكّد عنوان بريد الإلكتروني الحالي %{email_prefix}"
+      text_body_template: |
+        قبل أن نُغيّر عنوان بريد الإلكتروني ، نحتاجك إلى تأكيد تحكمك
+        بالبريد الالكتروني الحالي للحساب ، بعد إكمال هذه الخطوة ، سوف نؤكد لك
+        عنوان البريد الإلكتروني الجديد .
+
+        أكّد عنوان بريدك الإلكتروني الحالي لـ %{site_name} بالضغط على الرابط التالي :
+
+        /u/أكّد بريدك الإلكتروني/%{email_token}%{base_url}
+    notify_old_email:
+      subject_template: "عنوان بريد الإلكتروني تم تغييرة %{email_prefix}"
     signup_after_approval:
       subject_template: "قد وافقت على %{site_name}!"
   page_not_found:
@@ -1519,8 +1597,8 @@ ar:
     search_google: "غوغل"
   login_required:
     welcome_message: |
-      #[أهلاً بكم %{title}](#مرحبًا)
-      الحساب مطلوب. الرجاء انشاء حساب او تسجيل الدخول للأستمرار.
+      ## اهلا بك في %{title}
+      من فضلك قم بتسجيل الدخول او انشاء حساب جديد للمتابعة.
   terms_of_service:
     title: "شروط الخدمة"
     signup_form_message: 'لقد قرأت و أوافق على <a href="/tos" target="_blank">بنود الخدمة</a>.'
@@ -1538,6 +1616,9 @@ ar:
       size_not_found: "نأسف، لم نتمكّن من تحديد مقاس الصّورة. لربّما هي تالفة؟"
   avatar:
     missing: "نأسف، لم نعثر على أيّ صورة رمزيّة مرتبطة بعنوان البريد هذا. هلّا أعدت رفعها  ثانيةً؟"
+  flag_reason:
+    sockpuppet: "عضو جديد نشر موضوع جديد ثم قام عضو جديد اخر له نفس الIP (%{ip_address}) بالرد علية. انظر إعدادات<a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
+    spam_hosts: "عضو جديد حاول إنشاء عدة منشورات تحتوي علي روابط لنفس العنوان (%{domain}). انظر إعدادات <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   email_log:
     no_user: "تعذّر العثور على مستخدم معرّفه %{user_id}"
     anonymous_user: "المستخدم مجهول"
@@ -1565,7 +1646,7 @@ ar:
   static_topic_first_reply: |
     تعديل محتويات المنشور الاول في هذا الموضوع  %{page_name} page.
   guidelines_topic:
-    title: "الأسئلة الشّائعة/توجيهات"
+    title: "الأسئلة الشائعة/القواعد العامة"
   tos_topic:
     title: "شروط الخدمة"
   privacy_topic:
@@ -1657,86 +1738,274 @@ ar:
       هذه الوثيقة هي نسخة من CC-BY-SA تم تحديثها في 31 مايو عام 2013م .
   badges:
     editor:
-      name: محرّر
-      description: أوّل تحرير للمشاركات
+      name: مُصحح
+      description: لقد قمت بأول تصحيح لمنشور
       long_description: |
-        تُمنح هذه الشّارة أوّل مرّة تحرّر فيها إحدى مشاركاتك. مع أنّك لن تستطيع تحرير مشاركاتك للأبد، إلّا أنّ عمليّات التّحرير فكرة صائبة. يمكنك تحسين مشاركاتك، أو إصلاح الأخطاء البسيطة أو إضافة ما كنت نسيته عندما نشرت المشاركة. حرّر مشاركاتك لجعلها أفضل فأفضل!
+        تُمنح هذة الشارة عند اول مرة تقوم فيها بتصحيح منشور قمت بنشرة. في حين أنك لن تكون قادرا على تصحيح منشوراتك إلى الأبد. التصحيح هو دائما فكرة جيدة. بإمكانك تحسين منشورك بتصحيح الأخطاء اللغوية او إضافة اي جزء فاتك وقت كتابة المنشور او لتعيد صياغة المنشور بالكامل لتعرض المضمون بشكل أفضل.
     basic_user:
-      name: بسيط
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">تَمنح</a> كلّ وظائف المجتمع الأساسيّة
+      name: عضو اساسي
+      description: تُمنح كل صلاحيات المجتمع الأساسية
       long_description: |
-        تُمنح هذه الشّارة عندما تصل مستوى الثّقة الأوّل. تُعتبر شكرًا على قضاء بعض الوقت في قراءة المواضيع والاطّلاع على ما يهدف إليه مجتمعنا. رُفعت التّقييدات عليك الآن، حيث مُنحت كلّ إمكانيّات المجتمع الأساسيّة، مثل الرّسائل الخاصّة، ووضع العلامات، وتحرير الويكي وإمكانيّة نشر عدّة صور أو روابط.
+        تُمنح هذه الشارة عندما تصل إلي مستوى الثقة الأول. اي انك قمت بقضاء بعض الوقت في مجتمعنا و تعرفت علي اهدافه و مبادئة. لذا انت الأن تتمتح بكل صلاحيات المجتمع الأساسية.
+
+        ## صلاحيات الشارة
+        - ارسال رسائل خاصة لأعضاء المجتمع
+        - الإبلاغ عن المنشورات
+        - رفع اكثر من صورة إلي المنشورات
+        - رفع اي ملف إلي المنشورات
+        - وضح اكثر من رابطين بالمنشورات
+        - المشاركة في كتابه منشورات الwiki
+        - الإشارة إلي اكثر من عضوين بالمنشورات
     member:
-      name: عضو
+      name: عضو متوسط
+      description: تُمنح القدرة علي ارسال دعوات و عمل محادثات سرية جماعية و المزيد من العجابات.
+      long_description: |
+        تُمنح هذه الشارة عندما تصل إلي مستوى الثقة الثاني. اي انك قمت بقضاء الكثير من الوقت في مجتمعنا و شاركت بالعديد من النقاشات. لذا انت الأن تتمتح بعضوية كاملة بالمجتمع.
+
+        ## صلاحيات الشارة
+        - دعوة الأعضاء و اشخاص من خارج المجتمع للنقاشات
+        - انشاء محادثة سرية لمجموعة من الأشخاص
+        - زيادة المعدل اليومي للإعجابات المسموحة بمعدل 1.5
     regular:
-      name: منتظم
+      name: عضو مُتقدم
+      description: تُمنح القدرة علي إعادة تعيين تصنيف المنشورات و تعديل عناوينها و ارشفه الروابط التي تشاركها و عمل منشورات wiki و المزيد من الاعجابات.
+      long_description: |
+        تُمنح هذه الشارة عندما تصل إلي مستوى الثقة الثالث. شكرا علي كونك عضو فعال بمجتمعنا. عند هذا المستوي تمنح جزء من صلاحيات فريق العمل.
+
+        ##صلاحيات الشارة
+        - اعادة تعيين تصنيف قسم الموضوع و عنوانة
+        - حق الدخول علي قسم مخفي يختص بمناقشة موضوعات إدارة المجتمع
+        - تعطيل الامر  ( automatic nofollow ) علي الروابط التي تضعها بمنشوراتك
+        - اخفاء منشورات الأعضاء ذو المستوي الثقه صفر ( الاعضاء الجدد ) ببلاغ واحد
+        - إنشاء منشورات wiki
+        - زيادة عدد الاعجابات اليومي المسموح بة الي ضعف المعدل الطبيعي
+
+        علي عكس الشارات السابقة هذا الشارة ليست دائمة بل يمكنك ان تفقدها اذا لم تحافظ علي المعايير المطلوبة في اخر 100 يوم و هي
+
+        - زيارة الموقع علي الاقل 50% من عدد الايام
+        - الرد علي 10 موضوعات مختلفة
+        - مشاهدة 25% من الموضوعات المنشورة
+        - قراءة 25% من الردود المنشورة
+        - ان تعطي 30 اعجاب و تحصل علي 20 اعجاب علي الاقل من عدد من الأعضاء يقدر بخمس عدد الإعجابات و في ايام مختلفة تقدر بربع عدد الإعجابات و لا تُحسب الإعجابات بالرسائل الخاصة
+        - ان لا يصدر بحقق اكثر من 5 بلاغات في موضوعات مختلفة و من اعضاء مختلفين مأكدة من قبل طاقم العمل
+        - ان لا تكون قد تم ايقافك
+
+        محلوظة : هذة المعدلات يمكن ان تغير من قبل مديري الموقع.
     leader:
-      name: قائد
+      name: عضو مُحترف
+      description: تُمنح القدرة علي تعديل اي منشور و تثبيتة و إغلاقة و ارشفتة و تقسيمة و دمجة و المزيد من الإجابات.
+      long_description: |
+        تُمنح هذة الشارة عندما تصل إلي مستوي الثقة الرابع. لقد تم اختيارك من قبل طاقم العمل لتكون قائد في هذا المجتمع و لكي تكون مثال يحتذي بة باقي الأعضاء في الأفعال و الأقوال.
+
+        ##صلاحيات الشارة
+        - تعديل كل المنشورات
+        - تثبيت و اذلة تثبيت الموضوعات
+        - اغلاق الموضوعات
+        - ارشفة الموضوعات
+        - ازالة الموضوعات من القوائم
+        - تقسيم و دمج الموضوعات
+        - زيادة معدل الاعجابات اليومي الي ثلاث اضعاف
     welcome:
       name: مرحبًا
-      description: استقبلَ إعجابًا
+      description: تلقيت اعجابا
       long_description: |
-        تُمنح هذه الشّارة عندما تستقبل أولى الإعجابات لمشاركاتك. تهانينا. لقد نشرت شيئًا وجده أصدقاؤك أعضاء المجتمع أمرًا جديرًا بالاهتمام ومفيد!
+        تُمنح هذه الشارة عندما تتلقي أولى الإعجابات بمنشورك. تهانينا, لقد نشرت شيئًا وجده أصدقاؤك أعضاء المجتمع أمرا جديرا بالاهتمام ومفيد!
     autobiographer:
-      description: ملأ معلومات<a href="/my/preferences">اللاحة</a>
+      name: كاتب سيرة ذاتية
     anniversary:
       name: الذكرى السنوية
+      description: انت الأن عضو بالمجتمع من سنة كاملة و نشرت علي الاقل مرة واحدة.
+      long_description: |
+        تُمنح هذة الشارة عندما تكمل عاما كامل كعضو بهذا المجتمع مع النشر علي الاقل لمرة واحدة طوال هذا العام. شكرا علي البقاء معنا طوال هذة المدة. هذا المجتمع كبر بك.
     nice_post:
       name: رد رائع
+      description: تلقيت 10 أعجابات على الرد
+      long_description: |
+        تُمنح هذة الشارة عندما تتلقي اكثر من 10 اعجابات علي رد قمت به. ردك حقا ترك طابعا جيدا بالمجتمع و دفع المجتمع إلي الامام.
     good_post:
-      name: رد حسن
+      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: موضوع حسن
+      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: أول إبلاغ
+      name: أول بلاغ
+      description: لقد ابلغت عن منشور
+      long_description: |
+        تُمنح هذة الشارة عند اول مره تقوم بها بالابلاغ عن منشور. نظام البلاغات هو ما يساعدنا في جعل هذا المجتمع مكان مناسب للجميع. إذا لاحظت اي منشور يحتاج إلي انتباة المشرفين لاي سبب لا تتردد في الإبلاغ عنة. يمكنك ايضا الإبلاغ لترسل لرفاقك بالمجتمع <b>رسائل خاصة</b> إذا لاحظت مشكلة بمنشوراتهم.
+        القاعدة: إذا لاحظت اي مشكلة قم :flag_black: بالإبلاغ عنها.
+    promoter:
+      name: مُروج
+      description: لقد دعوت شخص للمجتمع
+      long_description: |
+        تُمنح هذة الشارة عندما تدعوا شخص ما للإنضمام إلي المجتمع عن طريق زر الدعوة في صفحتك الشخصية, او اسفل اي موضوع. إن دعوة الاصدقاء الذين من المحتمل ان يهتموا باحد الموضوعات التي يتم نقاشها بالمجتمع لهو إضافة عظيمة لمجتمعنا, لذا شكرا لك.
+    campaigner:
+      name: مُبادر
+      description: لقد دعوت ثلاث اشخاص للمجتمع
+      long_description: |
+        تُمنح هذة الشارة عندما تدعو ثلاث اشخاص إلي المجتمع و يقضوا بة بعض الوقت حتي يحصلوا علي مستوي الثقة الاول. المجتمع المتميز يحتاج إلي وافدين جدد بشكل مستمر لاثراء النقاشات.
+    champion:
+      name: بطل
+      description: لقد دعوت 5 اشخاص للمجتمع
+      long_description: |
+        تُمنح هذة الشارة عندما تدعو خمس اشخاص إلي المجتمع و يقضوا بة بعض الوقت حتي يحصلوا علي مستوي الثقة الثاني. شكرا لإثراء مجتمعنا باعضاء جدد.
     first_share:
       name: أول مشاركة
+      description: لقد شاركت منشور
+      long_description: |
+        تُمنح هذة الشارة عند اول مره تقوم بمشاركة منشور باستخدام زر المشاركة. من الرائع مشاركة نقاشات المجتمع مع العالم.
     first_link:
       name: أول رابط
+      description: اضفت إلي الموضوع رابط إلي موضوع اخر
+      long_description: |
+        تُمنح هذة الشارة عند اول مرة تقوم بها عمل رابط في موضوع إلي موضوع اخر له علاقة بنقطة النقاش. ربط الموضوعات يساعد رفاقك القراء في ايجاد الموضوعات المثيرة التي تدور حول نفس النقطة عن طريق ابراز العلاقه بين الموضوعات في كلا الاتجاهين.
     first_quote:
       name: أول إقتباس
+      description: لقد اقتبست منشورا
+      long_description: |
+        تُمنح هذة الشارة عند اول مرة تقوم فيها بالاقتباس من منشور في ردك. اقتباس الاجزاء المراد الرد عليها في المنشورات السابقة يساعد النقاش بان يظل مترابطا. اسهل طريقة للإقتباس هي تظليل النص المراد اقتباسه ثم الضغط علي زر "رد".
     read_guidelines:
-      name: إقرأ القواعد العامة
+      name: قراءة القواعد العامة
     reader:
       name: قارئ
-      description: قرأ كلّ الرّدود في موضوع فيه أكثر من 100 ردّ
+      description: قرأ كل الردود في موضوع فيه أكثر من 100 رد
+      long_description: |
+        تُمنح هذة الشارة عند اول مرة تقرا موضوع طويل به اكثر من 100 رد. قراءة المحادثة بدقة يساعدك علي متابعة النقاش, و فهم وجهات النظر المختلفة و تؤدي إلي نقاشات اكثر تشويقا. فكلما قرات اكثر, كلما فهمت الموضوع بشكل افضل.
     popular_link:
-      name: رابط شائع
+      name: رابط محبوب
+      description: قمت بنشر في منشور رابط خارجي تم فتحة 50 مرة
+      long_description: |
+        تُمنح هذة الشارة عندما يتم زيارة رابط خارجي قمت بنشرة في منشور اكثر من 50 مرة. شكرا لمشاركة هذا الرابط الهام الذي اضاف قيمة كبيرة للنقاش.
     hot_link:
-      name: رابط نَشط
+      name: رابط نشط
+      description: قمت بنشر في منشور رابط خارجي تم فتحة 300 مرة
+      long_description: |
+        تُمنح هذة الشارة عندما يتم زيارة رابط خارجي قمت بنشرة في منشور اكثر من 300 مرة. شكرا لمشاركة هذا الرابط الرائع الذي جعل النقاش مشوقا.
     famous_link:
       name: رابط مشهور
-    respected:
-      name: محترم
-    higher_love:
-      description: استخدمَ 50 إعجابًا يوميًّا 5 مرّات
-    crazy_in_love:
-      name: مجنون الحبّ
-      description: استخدمَ 50 إعجابًا يوميًّا 20 مرّة
+      description: قمت بنشر في منشور رابط خارجي تم فتحة 1000 مرة
       long_description: |
-        تُمنح هذه الشّارة عندما تستخدم كلّ ال‍ 50 إعجابًا اليوميّة لمدّة 20 يومًا. مذهل! أصبحت أيقونة تشجّع بانتظام أصدقائها أعضاء المجتمع!
+        تُمنح هذة الشارة عندما يتم زيارة رابط خارجي قمت بنشرة في منشور اكثر من 1000 مرة. شكرا لمشاركة هذا الرابط المذهل الذي اضاف الي النقاش العديد من التفاصيل. عملٌ عظيم.
+    appreciated:
+      name: محل تقدير
+      description: تلقيت اعجاب واحد علي 20 منشور
+      long_description: |
+        تُمنح هذة الشارة عندما تتلقي علي الأقل اعجاب واحد علي 20 منشور مختلف. المجتمع يشكرك علي مشاركتك في المناقشات.
+    respected:
+      name: مُحترم
+      description: تلقيت اعجابين على 100 منشور
+      long_description: |
+        تُمنح هذة الشارة عندما تتلقي علي الأقل اعجابين علي 100 منشور مختلف. المجتمع يحترم حقا منشوراتك البناءة في المناقشات.
+    admired:
+      name: محبوب
+      description: تلقيت 5 إعجابات على 300 منشور
+      long_description: |
+        تُمنح هذة الشارة عندما تتلقي علي الأقل 5 اعجابات علي 300 منشور مختلف. المجتمع يعشق منشوراتك البناءة في المناقشات.
+    out_of_love:
+      name: مُحب
+      description: نشرت 50 اعجابا في يوم
+      long_description: |
+        تُمنح هذة الشارة عندما تقوم بعمل 50 اعجاب في يوم واحد. تذكر ان الإعجاب بالمنشورات المفيدة يشجع رفاقك بالمجتمع علي الاستمرار في اثراء المجتمع بالنقاشات البناءة.
+    higher_love:
+      name: مُحب كبير
+      description: نشرت 50 اعجابا يوميا لمده خمس ايام
+      long_description: |
+        تُمنح هذة الشارة عندما تقوم بعمل 50 اعجاب يوميا لمدة خمس ايام. شكرا لاستثمارك بعض الوقت في تشجيع رفاقك بالمجتمع.
+    crazy_in_love:
+      name: مُحب مجنون
+      description: نشرت 50 اعجابا يوميا لمدة 20 يوم
+      long_description: |
+        تُمنح هذة الشارة عندما تقوم بعمل 50 اعجاب يوميا لمدة 20 يوما. مذهل! أصبحت أيقونة تشجع بانتظام أصدقائها أعضاء المجتمع!
     thank_you:
       name: شكرًا لك
+      description: تم الاعجاب ب(20) منشورا لك و اعجبت ب(10) منشورات
+      long_description: |
+        تُمنح هذة الشارة عندما يُعجب المجتمع بـ(20) منشورا لك و تقوم بالاعجاب بـ(10) منشورات. رائع! انت عضو بناء بالمجتمع.
     gives_back:
-      name: أعده
+      name: مُعيد
+      description: تم الاعجاب ب(100) منشورا لك و اعجبت ب(100) منشور
+      long_description: |
+        تُمنح هذة الشارة عندما يُعجب المجتمع بـ(100) منشورا لك و تقوم بالاعجاب بـ(100) منشور. شكرا لدفعك المجتمع للامام.
     empathetic:
-      description: لديه 500 إعجاب وأعطى 1000 إعجاب
+      name: متعاطف
+      description: تم الاعجاب ب(500) منشورا لك و اعجبت ب(1000) منشور
+      long_description: |
+        تُمنح هذة الشارة عندما يُعجب المجتمع بـ(500) منشورا لك و تقوم بالاعجاب بـ(1000) منشور. انت شخص سخي و مُقدر من الجميع:two_hearts:.
     first_emoji:
-      name: أوّل إيموجي
-      description: استخدمَ إيموجي في مشاركة
+      name: أول رمز تعبيري
+      description: استخدمت رمز تعبيري في منشور
+      long_description: |
+        تُمنح هذة الشارة عند اول مره تقوم باستخدام رمز تعبيري في منشوراتك :thumbsup:. الرموز التعبيرية تساعدك علي ملئ منشوراتك بالمشاعر الإنسانية من الفرح :smiley: للحزن :anguished: إلي الغضب :angry: و كل ما هو بينهم :sunglasses:. فقط قم بكتابه نقطتين فوق بعضهم ( : )  او اضغط علي زر الرموز التعبيرية في محرر النصوص لتختار من بين مئات الرموز التعبيرية :ok_hand:
     first_mention:
-      name: أوّل إشارة
-      description: أشار إلى مستخدم في إحدى المشاركات
+      name: أول إشارة
+      description: اشرت إلي عضو اخر في منشوراتك
+      long_description: تُمنح هذة الشارة عندما تشير إلي @اسم المستخدم لاحد اعضاء المجتمع في منشوراتك. كل اشارة تولد تنبية للشخص المشار إلية. لكي ينتبهوا إلي منشورك. فقط قم بكتابه الرمز @ ثم ( اسم المستخدم ) للعضو او للمجموعة إذا كانت هذه الخاصية مفعلة.
+    first_onebox:
+      name: اول لوحة مُعاينة.
+      description: قمت بنشر رابط تحول إلي لوحة مُعاينة.
+      long_description: تُمنح هذة الشارة عندما تنشر رابط بمنشور في سطر بشكل منفرد. و يقوم الموقع بفتح الرابط و وضع ملخص لمحتواه في لوحة مُعاينة.
     first_reply_by_email:
       name: أوّل ردّ عبر البريد
+      description: قمت بالرد عبر البريد الالكتروني
+      long_description: |
+        تُمنح هذة الشارة عند اول مرة تقوم فيها بالرد علي موضوع عبر البريد الإلكتروني.
+    new_user_of_the_month:
+      name: "عضو الشهر"
+      description: لك نشاط متميز بأول شهر لك في المجتمع
+      long_description: |
+        تُمنح هذة الشارة لشكر عضوين جديدين كل شهر كان لهما نشاط متميز في اول شهر لهما في المجتمع, يتم حساب هذا التميز بعدد المنشورات التي تم الاعجاب بها و من اُعجب بها.
+    enthusiast:
+      name: مُتحمس
+      description: زرت الموقع 10 ايام
+      long_description: تُمنح هذة الشارة لزيراتك الموقع 10 ايام متتالية. شكرا لبقائك معنا.
+    aficionado:
+      name: هاوي
+      description: زرت الموقع 100 يوم
+      long_description: تُمنح هذة الشارة لزيراتك الموقع 100 يوم متتالي. هذا اكثر من ثلاث اشهر!.
+    devotee:
+      name: متعصب
+      description: زرت الموقع 365 يوم
+      long_description: تُمنح هذة الشارة لزيراتك الموقع 365 يوم متتالي. هذا اكثر من سنة!.
+    badge_title_metadata: "%{display_name} شاره على %{site_title}"
   admin_login:
     success: "البريد أُرسل"
     error: "خطأ!"
@@ -1745,11 +2014,20 @@ ar:
   performance_report:
     initial_post_raw: 'هذا الموضوع يحتوي على معلومات الاداء اليومي للموقع '
     initial_topic_title: التبليغ عن اداء الموقع
+  tags:
+    title: "الأوسمة"
   finish_installation:
     congratulations: "تهانينا على تثبيت دسكورس!"
   wizard:
     step:
+      privacy:
+        title: "صلاحية"
+      corporate:
+        title: "منظمات"
+      icons:
+        title: "أيقونة"
       homepage:
+        description: "نحن نوصي بإظهار اخر الموضوعات بالصفحة الرئيسية للموقع, لكن ايضاً يمكنك عرض الأقسام إذا اردت."
         title: "الرّئيسيّة"
         fields:
           homepage_style:
@@ -1758,6 +2036,10 @@ ar:
                 label: "أحدث المواضيع"
               categories:
                 label: "الأقسام"
+      emoji:
+        title: "الرموز التعبيرية"
+      invites:
+        title: "ادعو للانظمام الى الطاقم"
       finished:
         title: "نسخة دسكورس جاهزة!"
   activemodel:
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index cad39d62b0..398c41d45f 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
@@ -253,7 +252,6 @@ bs_BA:
       email_title: 'Ova tema "%{title}" treba pažnju moderatora'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Your post was flagged by the community. Please <a href="/my/private-messages">see your private messages</a>.</p>'
     user_must_edit: '<p>This post was flagged by the community and is temporarily hidden.</p>'
   archetypes:
     regular:
@@ -372,8 +370,6 @@ bs_BA:
     educate_until_posts: "When the user starts typing their first (n) new posts, show the pop-up new user education panel in the composer."
     title: "Brief title of this site, used in the title tag."
     site_description: "Describe this site in one sentence, used in the meta description tag."
-    contact_email: "Email address of key contact for site. Important notices from discourse.org regarding critical updates may be sent to this address."
-    queue_jobs: "DEVELOPER ONLY! WARNING! By default, queue jobs in sidekiq. If disabled, your site will be broken."
     crawl_images: "Retrieve images from remote URLs to insert the correct width and height dimensions."
     download_remote_images_to_local: "Convert remote images to local images by downloading them; this prevents broken images."
     download_remote_images_threshold: "Minimum disk space necessary to download remote images locally (in percent)"
@@ -400,7 +396,6 @@ bs_BA:
     polling_interval: "How often should logged in user clients poll in milliseconds"
     anon_polling_interval: "How often should anonymous clients poll in milliseconds"
     cooldown_minutes_after_hiding_posts: "Number of minutes a user must wait before they can edit a post hidden via community flagging"
-    notify_mods_when_user_blocked: "If a user is automatically blocked, send a message to all moderators."
     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."
     post_undo_action_window_mins: "Number of minutes users are allowed to undo recent actions on a post (like, flag, etc)."
@@ -430,8 +425,6 @@ bs_BA:
     email_domains_whitelist: "A list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!"
     version_checks: "Ping the Discourse Hub for version updates and show new version messages on the /admin dashboard"
     new_version_emails: "Send an email to the contact_email address when a new version of Discourse is available."
-    port: "DEVELOPER ONLY! WARNING! Use this HTTP port rather than the default of port 80. Leave blank for default of 80."
-    force_hostname: "DEVELOPER ONLY! WARNING! Specify a hostname in the URL. Leave blank for default."
     invite_expiry_days: "How long user invitation keys are valid, in days"
     invite_passthrough_hours: "How long a user can use a previously redeemed invitation key to log in, in hours"
     login_required: "Require authentication to read content on this site, disallow anonymous access."
@@ -549,7 +542,6 @@ bs_BA:
     pop3_polling_host: "The host to poll for email via POP3."
     pop3_polling_username: "The username for the POP3 account to poll for email."
     pop3_polling_password: "The password for the POP3 account to poll for email."
-    email_in: "Allow users to post new topics via email (requires pop3 polling). Configure the addresses in the \"Settings\" tab of each category."
     email_in_min_trust: "The minimum trust level a user needs to have to be allowed to post new topics via email."
     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."
@@ -557,7 +549,6 @@ bs_BA:
     relative_date_duration: "Number of days after posting where post dates will be shown as relative (7d) instead of absolute (20 Feb)."
     delete_user_max_post_age: "Don't allow deleting users whose first post is older than (x) days."
     delete_all_posts_max: "The maximum number of posts that can be deleted at once with the Delete All Posts button. If a user has more than this many posts, the posts cannot all be deleted at once and the user can't be deleted."
-    username_change_period: "The number of days after registration that accounts can change their username (0 to disallow username change)."
     email_editable: "Allow users to change their e-mail address after registration."
     automatically_download_gravatars: "Download Gravatars for users upon account creation or email change."
     max_daily_gravatar_crawls: "Maximum number of times Discourse will check Gravatar for custom avatars in a day"
@@ -574,14 +565,8 @@ bs_BA:
     default_code_lang: "Default programming language syntax highlighting applied to GitHub code blocks (lang-auto, ruby, python etc.)"
     warn_reviving_old_topic_age: "When someone starts replying to a topic where the last reply is older than this many days, a warning will be displayed. Disable by setting to 0."
     autohighlight_all_code: "Force apply code highlighting to all preformatted code blocks even when they didn't explicitly specify the language."
-    feed_polling_enabled: "EMBEDDING ONLY: Whether to embed a RSS/ATOM feed as posts."
-    feed_polling_url: "EMBEDDING ONLY: URL of RSS/ATOM feed to embed."
-    embed_by_username: "Discourse username of the user who creates the embedded topics."
-    embed_username_key_from_feed: "Key to pull discourse username from feed."
     embed_truncate: "Truncate the embedded posts."
     embed_post_limit: "Maximum number of posts to embed."
-    embed_whitelist_selector: "CSS selector for elements that are allowed in embeds."
-    embed_blacklist_selector: "CSS selector for elements that are removed from embeds."
     show_create_topics_notice: "If the site has fewer than 5 public topics, show a notice asking admins to create some topics."
     prevent_anons_from_downloading_files: "Prevent anonymous users from downloading files. WARNING: this will prevent any site assets posted as attachments from working."
     enable_emoji: "Omogući smajlije"
@@ -640,22 +625,16 @@ bs_BA:
     new_registrations_disabled: "New account registrations are not allowed at this time."
     password_too_long: "Passwords are limited to 200 characters."
     missing_user_field: "You have not completed all the user fields"
-    close_window: "Authentication is complete. Close this window to continue."
   user:
     no_accounts_associated: "No accounts associated"
     username:
       short: "must be at least %{min} characters"
       long: "must be no more than %{max} characters"
-      characters: "must only include numbers, letters and underscores"
       unique: "must be unique"
       blank: "must be present"
     email:
       not_allowed: "is not allowed from that email provider. Please use another email address."
       blocked: "is not allowed."
-  invite_mailer:
-    subject_template: "%{invitee_name} vas poziva da pogledate '%{topic_title}' na sajtu %{site_domain_name}"
-  invite_forum_mailer:
-    subject_template: "%{invitee_name} vas poziva da se pridružite %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Set password for your %{site_name} account"
   flag_reasons:
@@ -691,9 +670,6 @@ bs_BA:
       subject_template: "Data Export completed successfully"
     csv_export_failed:
       subject_template: "Export failed"
-      text_body_template: "The export has failed. Please check the logs."
-    spam_post_blocked:
-      subject_template: "New user %{username} posts blocked due to repeated links"
     pending_users_reminder:
       text_body_template: |
         There are new user signups waiting to be approved (or rejected) before they can access this forum.
@@ -721,10 +697,6 @@ bs_BA:
     see_more: "Više"
     search_title: "Pretraži stranicu"
     search_google: "Google"
-  login_required:
-    welcome_message: |
-      #[Welcome to %{title}](#welcome)
-      Potreban je nalog. Kreirajte novi nalog ili se ulogujte.
   terms_of_service:
     title: "Terms of Service"
     signup_form_message: 'I have read and accept the <a href="/tos" target="_blank">Terms of Service</a>.'
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
new file mode 100644
index 0000000000..3339523174
--- /dev/null
+++ b/config/locales/server.ca.yml
@@ -0,0 +1,2368 @@
+# 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/
+
+ca:
+  dates:
+    short_date_no_year: "D MMM"
+    short_date: "D MMM, YYYY"
+    long_date: "MMMM D, YYYY h:mma"
+  datetime_formats: &datetime_formats
+    formats:
+      short: "%m-%d-%Y"
+      short_no_year: "%B %-d"
+      date_only: "%B %-d, %Y"
+      long: "%B %-d, %Y, %l:%M%P"
+  date:
+    month_names: [null, gener, febrer, març, abril, maig, juny, juliol, agost, setembre, octubre, novembre, desembre]
+    <<: *datetime_formats
+  time:
+    am: "am"
+    pm: "pm"
+    <<: *datetime_formats
+  title: "Discourse"
+  topics: "Temes"
+  posts: "escrits"
+  loading: "Carregant"
+  log_in: "Entrar"
+  purge_reason: "Compte desactivat, esborrat automàticament per abandó."
+  disable_remote_images_download_reason: "La descàrrega d'imatges ha estat desactivada perquè no hi havia prou espai d'emmatzematge al disc."
+  anonymous: "Anònim"
+  remove_posts_deleted_by_author: "Esborrat per la persona autora"
+  emails:
+    incoming:
+      default_subject: "Aquest tema necessita un títol"
+      show_trimmed_content: "Mostrar contingut tallat"
+      maximum_staged_user_per_email_reached: "S'ha arribat a la quantitat màxima de persones usuàries creades amb correu electrònic."
+      errors:
+        empty_email_error: "Succeeix quan el correu electrònic en brut que vam rebre era buit."
+        no_message_id_error: "Succeeix quan el correu electrònic no conté l'encapçalament 'Message-Id'."
+        auto_generated_email_error: "Succeeix quan l'encapçalament 'precedence' s'estableix com a: <i>list, junk</i>, <i>bulk</i> o <i>auto_reply</i>, o quan qualsevol altre encapçalament conté: <i>auto-submitted</i>, <i>auto-reply</i> o <i>auto-generated</i>."
+        no_body_detected_error: "Succeeis quan no vam poder extreure'n un contingut i no hi havia adjunts."
+        inactive_user_error: "Succeeix quan l'emissor no és actiu."
+        bad_destination_address: "Succeeix quan cap de les adreces de correu electrònic als camps A/CC/CCO no coincideixen amb una adreça entrant configurada."
+        strangers_not_allowed_error: "Succeeix quan una persona usuària ha provat de crear un nou tema a una categoria de la qual no n'és membre."
+        insufficient_trust_level_error: "Succeeix quan una persona usuària ha provat de crear un nou tema a una categoria per a la qual no gaudeix del nivell de confiança necessari."
+        reply_user_not_matching_error: "Succeeix quan una resposta ha arribat des d'un compte de correu electrònic diferent del qual en va ser destinatari."
+        topic_not_found_error: "Succeeix quan una resposta ha arribat però el tema relacionat ha estat esborrat."
+        topic_closed_error: "Succeeix quan una resposta ha arribat però el tema relacionat ja ha estat tancat. "
+        bounced_email_error: "S'ha informat que el correu electrònic ha estat retornat."
+        screened_email_error: "Succeeix quan l'adreça remitent de correu electrònic ja s'ha seleccionat."
+  errors: &errors
+    format: '%{attribute} %{message}'
+    messages:
+      too_long_validation: "es limita a %{max} caràcters; n'ha introduït %{length}."
+      invalid_boolean: "Booleà invàlid."
+      taken: "ja ha estat agafat"
+      accepted: s'ha d'acceptar
+      blank: no pot ser buit
+      present: ha de ser buit
+      confirmation: "no coincideix %{attribute}"
+      empty: no pot ser buit
+      equal_to: ha de ser igual a %{count}
+      even: ha de ser un nombre parell
+      exclusion: està reservat
+      greater_than: ha de ser més gran que %{count}
+      greater_than_or_equal_to: ha de ser més gran o igual a %{count}
+      has_already_been_used: "ja s'ha fet servir"
+      inclusion: no és inclòs a la llista
+      invalid: és invàlid
+      is_invalid: "no sembla clar, és una frase sencera?"
+      contains_censored_words: "hi conté els següents mots censurats: %{censored_words}"
+      matches_censored_pattern: "hi conté els següents mots que coincideixen amb les expressions regulars censurades del lloc: %{censored_words}"
+      less_than: ha de ser menys de %{count}
+      less_than_or_equal_to: ha de ser igual o menor a %{count}
+      not_a_number: no és una xifra
+      not_an_integer: 'ha de ser un nombre enter '
+      odd: ha de ser un nombre senar
+      record_invalid: 'N''ha fallat la validació: %{errors}'
+      restrict_dependent_destroy:
+        one: "No es pot esborrar el registre perquè existeix un %{record} que en depèn."
+        many: "No es pot esborrar el registre perquè existeix %{record} que en depèn."
+      too_long:
+        one: és massa llarg (el màxim són 1 caràcter)
+        other: és massa llarg (el màxim són %{count} caràcters)
+      too_short:
+        one: és massa curt (el mínimu és 1 caràcter)
+        other: és massa curt (el mínim són %{count} caràcters)
+      wrong_length:
+        one: té una mida errònia (hauria de contenir 1 caràcter)
+        other: té una mida errònia (hauria de contenir %{count} caràcters)
+      other_than: "ha de ser diferent de %{count}"
+    template:
+      body: 'Hi ha hagut problemes amb els següents camps:'
+      header:
+        one: '1 errada ha impedit desar aquest %{model} '
+        other: '%{count} errades han impedit desar aquest %{model} '
+    embed:
+      load_from_remote: "Hi ha hagut una errada en carregar aquest escrit."
+    site_settings:
+      min_username_length_exists: "No pots establir la mida mínima de nom usuari per sobre del nom usuari més curt."
+      min_username_length_range: "No pots establir el mínim per sobre del màxim."
+      max_username_length_exists: "No pots establir la mida màxima de nom usuari per sota del nom usuari més llarg."
+      max_username_length_range: "No pots establir el màxim per sota del mínim."
+      default_categories_already_selected: "No pots triar una categoria emprada a una altra llista."
+      s3_upload_bucket_is_required: "No pots activar càrregues a S3 si no has tingut 's3_upload_bucket'."
+  invite:
+    not_found: "La teva invitació no és vàlida. Si us plau, contacta amb l'administració del lloc."
+  bulk_invite:
+    file_should_be_csv: "L'arxiu desat hauria de tenir format csv."
+    error: "Hi ha hagut una errada en carregar aquest arxiu. Si us plau, prova-ho més tard."
+  topic_invite:
+    user_exists: "Disculpa, aquesta persona ja ha estat convidada. Només pots convidar d'un sol cop una persona a un tema."
+  backup:
+    operation_already_running: "Hi ha una operació en marxa en aquest moment. Ara no es pot començar la nova tasca."
+    backup_file_should_be_tar_gz: "La còpia de seguretat hauria de ser un arxiu .tar.gz."
+    not_enough_space_on_disk: "No hi ha prou espai al disc per desar-hi aquesta còpia de seguretat."
+    invalid_filename: "El nom de la còpia de seguretat conté caràcters invàlids. Els caràcters vàlids són a-z 0-9 . - _."
+  not_logged_in: "Et cal identificar-te per fer això."
+  not_found: "No s'hi ha trobat la URL o font sol·licitada."
+  invalid_access: "No tens permís per veure el recurs sol·licitat."
+  read_only_mode_enabled: "El lloc és només en mode de lectura. Les interaccions estan desactivades."
+  reading_time: "Temps de lectura."
+  likes: "M'agrades"
+  too_many_replies:
+    one: "Ho lamentem, però les noves persones usuàries ara estan de moment limitades a 1 resposta al mateix tema."
+    other: "Ho lamentem, però les noves persones usuàries ara estan de moment limitades a %{count} respostes al mateix tema."
+  embed:
+    start_discussion: "Comença una discussió"
+    continue: "Continua la discussió"
+    error: "Errada en incrustar"
+    referer: "Referent:"
+    mismatch: "El referent no coincideix amb cap dels següents amfitrions:"
+    no_hosts: "No s'hi han establert amfitrions per inscrustar."
+    configure: "Configurar la incrustació"
+    more_replies:
+      one: "1 resposta més"
+      other: "%{count} respostes més "
+    loading: "Carregant la discussió..."
+    permalink: "Enllaç permanent "
+    imported_from: "Aquesta discussió és derivada de l'entrada original de %{link}"
+    in_reply_to: "%{username}"
+    replies:
+      one: "1 resposta"
+      other: "%{count} respostes"
+  no_mentions_allowed: "Disculpa, no pots mencionar altres persones usuàries"
+  too_many_mentions:
+    one: "Disculpa, només pots mencionar una persona usuària a un escrit."
+    other: "Disculpa, només pots mencionar %{count} persones usuàries a un escrit."
+  no_mentions_allowed_newuser: "Disculpa, les noves persones usuàries no poden mencionar-ne d'altres."
+  too_many_mentions_newuser:
+    one: "Disculpa, les noves persones usuàries només poden mencionar una persona usuària a un escrit."
+    other: "Disculpa, les noves persones usuàries només poden mencionar %{count} persones usuàries a un escrit."
+  no_images_allowed: "Disculpa, les noves persones usuàries no poden adjuntar imatges a un escrit."
+  too_many_images:
+    one: "Disculpa, les noves persones usuàries només poden adjuntar una imatge a un escrit."
+    other: "Disculpa, les noves persones usuàries només poden adjuntar %{count} imatges a un escrit."
+  no_attachments_allowed: "Disculpa, les noves persones usuàries no poden adjuntar arxius a un escrit."
+  too_many_attachments:
+    one: "Disculpa, les noves persones usuàries només poden adjuntar un arxiu a un escrit."
+    other: "Disculpa, les noves persones usuàries només poden adjuntar %{count} arxius a un escrit."
+  no_links_allowed: "Disculpa, les noves persones usuàries no poden incloure enllaços a un escrit."
+  too_many_links:
+    one: "Disculpa, les noves persones usuàries només poden incloure un enllaç a un escrit."
+    other: "Disculpa, les noves persones usuàries només poden incloure %{count} enllaços a un escrit."
+  spamming_host: "Disculpa, no pots enviar un enllaç a aquest amfitrió."
+  user_is_suspended: "Les persones usuàries suspeses no tenen permís per publicar."
+  topic_not_found: "Alguna cosa ha fallat. Que potser aquest tema ha estat tancat o esborrat mentre el consultaves?"
+  not_accepting_pms: "Disculpa, per ara %{username} no accepta missatges."
+  just_posted_that: "és massa semblant al que has publicat recentment"
+  invalid_characters: "hi conté caràcters invàlids"
+  is_invalid: "no sembla clar, és una frase sencera?"
+  next_page: "pàgina següent →"
+  prev_page: "← pàgina anterior"
+  page_num: "Pàgina %{num}"
+  home_title: "Pàgina principal"
+  topics_in_category: "Temes a la '%{category}' "
+  rss_posts_in_topic: "Sindicació RSS del tema '%{topic}'"
+  rss_topics_in_category: "Sindicació RSS de temes de la categoria '%{category}' "
+  author_wrote: "%{author} ha escrit:"
+  num_posts: "Publicacions:"
+  num_participants: "Participants:"
+  read_full_topic: "Llegeix tot el tema"
+  private_message_abbrev: "Missatge"
+  rss_description:
+    latest: "Darrers temes"
+    hot: "Temes d'interès"
+    top: "Principals temes"
+    posts: "Darreres publicacions"
+    private_posts: "Darrers missatges privats"
+    group_posts: "Darreres publicacions de %{group_name}"
+    group_mentions: "Darreres mencions de %{group_name}"
+    user_posts: "Darreres publicacions segons @%{username}"
+    user_topics: "Darrers temes segons @%{username}"
+    tag: "Temes etiquetats"
+  too_late_to_edit: "La publicació es va crear fa molt de temps. Ja no es pot editar o esborrar."
+  revert_version_same: "La versió actual és la mateixa que la versió que estàs provant de revertir."
+  excerpt_image: "imatge"
+  queue:
+    delete_reason: "Esborrat per la cua de moderació de publicacions"
+  groups:
+    errors:
+      can_not_modify_automatic: "No pots modificar un grup automàtic"
+      member_already_exist: "'%{username}' ja és membre d'aquest grup."
+      invalid_domain: "'%{domain}' no és un domini vàlid."
+      invalid_incoming_email: "'%{email}' no és una adreça vàlida de correu electrònic."
+      email_already_used_in_group: "'%{email}' ja és fa servir pel grup '%{group_name}'."
+      email_already_used_in_category: "'%{email}' ja es fa servir per la categoria '%{category_name}'."
+    default_names:
+      everyone: "qualsevol"
+      admins: "administració"
+      moderators: "moderació"
+      staff: "equip"
+      trust_level_0: "trust_level_0"
+      trust_level_1: "trust_level_1"
+      trust_level_2: "trust_level_2"
+      trust_level_3: "trust_level_3"
+      trust_level_4: "trust_level_4"
+  education:
+    until_posts:
+      one: "1 publicació"
+      other: "%{count} publicacions"
+    new-topic: |
+      Et donem la benvinguda a %{site_name} &mdash; **gràcies per encetar una nova conversa!**
+
+      - El títol sona interessant si el llegeixes en veu alta? És un bon resum?
+
+      - Qui pot interessar-se'n? Per què és important? Quina mena de reaccions vols?
+
+      - Inclou mots emprats amb freqüència al teu tema perquè la resta ho puguin *trobar*. Per tal d'agrupar el teu tema amb d'altres relacionats, tria una categoria.
+
+      Per saber-ne més, [fes un cop d'ull a la guia de la comunitat](/guidelines). Aquest avís només apareixerà per al teu primer %{education_posts_text}.
+    new-reply: |
+      Et donem la benvinguda a %{site_name} &mdash; **gràcies per contribuir-hi!**
+
+      - La teva resposta millora d'alguna manera la conversa?
+
+      - Siguem amables amb la resta de membres de la comunitat.
+
+      - Les crítiques constructives són benvingudes, però per criticar *idees*, no pas persones.
+
+      Per saber-ne més, [fes un cop d'ull a la guia de la comunitat](/guidelines). Aquest avís només apareixerà per al teu primer %{education_posts_text}.
+    avatar: |
+      ### Què tal si poses una fotografia per al teu compte?
+
+      Has escrit uns quants temes i respostes, però encara no tens una fotorgrafia de perfil que t'identifiqui -- de moment, només és una lletra.
+
+      Has considerat **[visitar el teu perfil d'usuari](%{profile_path})** i pujar una fotografia que et representi?
+
+      És més fàcil seguir discussions i trobar gent interessant a la conversa quan tots tenim una fotografia de perfil diferent!
+    sequential_replies: |
+      ### Considera respondre unes quantes entrades d'una tirada
+
+      Enlloc d'escriure unes quantes respostes a un sol tema, siusplau considera escriure una sola resposta que citi diverses entrades prèvies, o mencions via @nom.
+
+      Pots editar la teva darrera resposta per a afegir una cita. Per a fer-ho, selecciona text i prem el botó de <b>cita resposta</b> que apareixerà.
+
+      És més fàcil seguir un tema quan té menys respostes més profundes que no pas moltes respostes indivituals.
+    dominating_topic: |
+      ### Deixa que altres s'afegeixin a a conversa
+
+      This topic is clearly important to you &ndash; you've posted more than %{percent}% of the replies here.
+
+      Are you sure you’re providing adequate time for other people to share their points of view, too?
+    too_many_replies: |
+      ### Has assolit el límit de respostes per a aquest tema
+
+      Disculpa, però les noves persones usuàries estan temporalment limitades a %{newuser_max_replies_per_topic} respostes al mateix tema.
+
+      En comptes d'afegir-hi una altra resposta, si us plau, considera l'edició de les teves respostes d'abans o fes una visita a altres temes.
+    reviving_old_topic: |
+      ### Reviu aquest tema?
+
+      Fa **%{days}** de la darrera resposta a aquest tema. La teva resposta llençarà el tema a la part superior de la llista i ho notificarà a tota persona que hi participi.
+
+      Segur que vols continuar amb aquesta conversa antiga?
+  activerecord:
+    attributes:
+      category:
+        name: "Nom de la categoria"
+      topic:
+        title: 'Títol'
+        featured_link: 'Enllaç destacat'
+      post:
+        raw: "Cos"
+      user_profile:
+        bio_raw: "Sobre mi"
+    errors:
+      models:
+        topic:
+          attributes:
+            base:
+              warning_requires_pm: "Només pots adjuntar avisos a missatges privats."
+              too_many_users: "Només pots enviar missatges a una persona usuària d'un sol cop."
+              cant_send_pm: "Disculpa, no pots enviar a un missatge privat a aquesta persona usuària."
+              no_user_selected: "Has de triar una persona usuària vàlida."
+            featured_link:
+              invalid: "no és vàlid. La URL hauria d'incloure http:// o https://."
+              invalid_category: "no pot editar-se dins aquesta categoria."
+        user:
+          attributes:
+            password:
+              common: "és una de les 10000 contrasenyes més freqüents. Si us plau fes servir una clau més segura."
+              same_as_username: "és igual que la teva identitat. Si us plau, fes servir una clau més segura."
+              same_as_email: "és igual que el teu correu electrònic. Si us plau, fes servir una clau més segura."
+              same_as_current: "és igual que la teva clau actual."
+              unique_characters: "té massa caràcters repetits. Si us plau, tria una contrasenya més segura."
+            ip_address:
+              signup_not_allowed: "No es permet el registre per a aquest compte."
+        color_scheme_color:
+          attributes:
+            hex:
+              invalid: "no és un color vàlid"
+        web_hook:
+          attributes:
+            payload_url:
+              invalid: "La URL no és vàlida. La URL hauria d'incloure http:// o https://. I no es permeten espais en blanc."
+      <<: *errors
+  user_profile:
+    no_info_other: "<div class='missing-profile'>%{name} encara no ha introduït res al camp Sobre mi del seu perfil</div>"
+  vip_category_name: "Saló"
+  vip_category_description: "Una categoria exclusiva per a membres amb un nivell 3 o superior de confiança."
+  meta_category_name: "Sindicació del lloc"
+  meta_category_description: "Discussió sobre aquest lloc, la seva organització, com funciona i com podem millorar-ho."
+  staff_category_name: "Equip"
+  staff_category_description: "Categoria privada per a converses de l'equip. Els temes només seran visibles per a debats entre moderadors i administradors."
+  assets_topic_title: "Recursos per al disseny del lloc"
+  discourse_welcome_topic:
+    title: "Benvinguda o benvingut a Discourse"
+    body: |2
+
+      El primer paràgraf d'aquest tema fixat será visible com a missatge de benvinguda per a totes les noves visites a la teva pàgina principal. És important!
+
+      **Edita això** per a una breu descripció de la teva comunitat:
+
+      - Per a qui és?
+      - Què hi poden trobar?
+      - Per què haurien de venir aquí?
+      - On poden llegir-ne més (enllaços, recursos, etcètera)?
+
+      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+
+      Potser desitges tancar aquest tema amb l'eina d'adminstració :wrench: (dalt a la dreta i abaix), perquè les respostes no s'amunteguin sobre un anunci.
+  lounge_welcome:
+    title: "Et donem la benvinguda al saló"
+    body: |2
+
+      Enhorabona! :confetti_ball:
+
+      Si pots veure aquest tema, se t'ha promogut recentment a **regular** (nivell 3 de confiança).
+
+      Ara pots &hellip;
+
+      * Editar el títol de qualsevol tema
+      * Canviar la categoria de qualsevol tema
+      * Tenir tots els teus enllaços seguits ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) és esborrat)
+      * Accedir a la categoria privada de Saló només visible per a persones usuàries a nivell 3 de confiança i superior
+      * Amagar correu brossa amb una única bandera
+
+      Vet aquí la llista [current list of fellow regulars](/badges/3/regular). Assegura't d'enviar-hi una salutació.
+
+      Gràcies per formar part d'una part important d'aquesta comunitat!
+
+      (Per a més informació sobre nivell de confiança [see this topic][trust]. Si us plau, fixa't que només membres que continuen reunint els requisits seguiran essent ordinaris).
+
+      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+  category:
+    topic_prefix: "Sobre la categoria %{category} "
+    replace_paragraph: "(Reemplaça aquest primer paràgraf amb una breu descripció de la teva nova categoria. Aquesta guia apareixerà a l'àrea de selecció de categoria, perquè s'hi pugui mantenir per sota de 200 caràcters. **Fins que no editis aquesta descripció o en creïs temes, aquesta categoria no apareixerà a la pàgina de categories.**)"
+    post_template: "%{replace_paragraph}\n\nFes servir els següents paràgrafs per a una descripció més llarga o per establir-hi guies o regles de categoria:\n\n- Per què la gent hauria de fer servir aquesta categoria? Per a què val?\n\n- Com es diferencia realment de les altres categories que ja tenim?\n\n- Què haurien de contenir generalment els temes d'aquesta categoria?\n\n- Ens cal aquesta categoria? Podem unir-la amb una altra categoria o subcategoria?\n"
+    errors:
+      uncategorized_parent: "Una descategoritzada no pot tenir una categoria relacionada"
+      self_parent: "Una subcategoria relacionada no pot ser ella mateixa"
+      depth: "No pots nidificar una subcategoria sota una altra"
+      invalid_email_in: "'%{email}' no és una adreça vàlida de correu electrònic."
+      email_already_used_in_group: "'%{email}' ja és fa servir pel grup '%{group_name}'."
+      email_already_used_in_category: "'%{email}' ja es fa servir per la categoria '%{category_name}'."
+    cannot_delete:
+      uncategorized: "No es pot esborrar una descategoritzada"
+      has_subcategories: "No es pot esborrar aquesta categoria perquè té subcategories"
+      topic_exists:
+        one: "No es pot esborrar aquesta categoria perquè hi conté 1 tema. El tema més antic és %{topic_link}."
+        other: "No es pot esborrar aquesta categoria perquè hi conté %{count} temes. El tema més antic és %{topic_link}."
+      topic_exists_no_oldest: "No es pot esborrar aquesta categoria perquè el recompte de temes és %{count}."
+    uncategorized_description: "Temes que no necessiten una categoria o no encaixen a cap altra categoria existent."
+  trust_levels:
+    newuser:
+      title: "nova persona usuària"
+    basic:
+      title: "persona usuària bàsica"
+    member:
+      title: "membre"
+    regular:
+      title: "ordinari"
+    leader:
+      title: "líder"
+    change_failed_explanation: "Has provat de degradar %{user_name} a '%{new_trust_level}'. En qualsevol cas, el seu nivell de confiança ja és '%{current_trust_level}'. %{user_name} restarà a '%{current_trust_level}' - Si vols degradar una persona usuària, bloca-li abans el nivell de confiança"
+  rate_limiter:
+    slow_down: "Has provat de fer el mateix moltes vegades, prova-ho més tard."
+    too_many_requests: "Tenim un límit diari sobre quants cops es pot realitzar aquesta acció. Si us plau, espera %{time_left} abans de tornar a provar-ho."
+    by_type:
+      first_day_replies_per_day: "Has arribat a la quantitat màxima de respostes que una nova persona usuària pot crear durant el seu primer dia. Si us plau, espera %{time_left} abans de tornar a provar-ho."
+      first_day_topics_per_day: "Has arribat a la quantitat màxima de temes que una nova persona usuària pot crear durant el seu primer dia. Si us plau, espera %{time_left} abans de tornar a provar-ho."
+      create_topic: "Estàs generant temes massa ràpid. Si us plau, espera %{time_left} abans de tornar a provar-ho."
+      create_post: "Estàs responent massa ràpid. Si us plau, espera %{time_left} abans de tornar a provar-ho."
+      delete_post: "Estàs esborrant publicacions massa ràpid. Si us plau, espera %{time_left} abans de tornar a provar-ho."
+      public_group_membership: "T'estàs unint a grups o abandonant-los massa ràpid. Si us plau, espera %{time_left} abans de tornar a provar-ho."
+      topics_per_day: "Avui has arribat a la quantitat màxima de temes. Si us plau, espera %{time_left} abans de tornar a provar-ho."
+      pms_per_day: "Avui has arribat a la quantitat màxima de missatges. Si us plau, espera %{time_left} abans de tornar a provar-ho."
+      create_like: "Has arribat a la quantitat màxima de m'agrades avui. Si us plau, espera %{time_left} abans de tornar a provar-ho."
+      create_bookmark: "Avui has arribat a la quantitat màxima de preferits. Si us plau, espera %{time_left} abans de tornar a provar-ho."
+      live_post_counts: "Estàs demanant recomptes de publicacions massa ràpid. Si us plau, espera %{time_left} abans de tornar a provar-ho."
+      unsubscribe_via_email: "Avui has arribat a la quantitat màxima de cancel·lacions de subscripcions per correu electrònic. Si us plau, espera %{time_left} abans de tornar a provar-ho."
+      topic_invitations_per_day: "Avui has arribat a la quantitat màxima d'invitacions de temes. Si us plau, espera %{time_left} abans de tornar a provar-ho."
+    hours:
+      one: "1 hora"
+      other: "%{count} hores"
+    minutes:
+      one: "1 minut"
+      other: "%{count} minuts"
+    seconds:
+      one: "1 segon"
+      other: "%{count} segons"
+  datetime:
+    distance_in_words:
+      half_a_minute: "< 1m"
+      less_than_x_seconds:
+        one: "< 1s"
+        other: "< %{count}s"
+      x_seconds:
+        one: "1s"
+        other: "%{count}s"
+      less_than_x_minutes:
+        one: "< 1m"
+        other: "< %{count}m"
+      x_minutes:
+        one: "1m"
+        other: "%{count}m"
+      about_x_hours:
+        one: "1h"
+        other: "%{count}h"
+      x_days:
+        one: "1d"
+        other: "%{count}d"
+      about_x_months:
+        one: "1mes"
+        other: "%{count}mes"
+      x_months:
+        one: "1mes"
+        other: "%{count}mes"
+      about_x_years:
+        one: "1a"
+        other: "%{count}a"
+      over_x_years:
+        one: "> 1a"
+        other: "> %{count}a"
+      almost_x_years:
+        one: "1a"
+        other: "%{count}a"
+    distance_in_words_verbose:
+      half_a_minute: "ara mateix"
+      less_than_x_seconds:
+        one: "ara mateix"
+        other: "ara mateix"
+      x_seconds:
+        one: "fa 1 segon"
+        other: "fa %{count} segons"
+      less_than_x_minutes:
+        one: "fa menys d'1 minut "
+        other: "fa menys de %{count} minuts "
+      x_minutes:
+        one: "fa 1 minut"
+        other: "fa %{count} minuts"
+      about_x_hours:
+        one: "fa 1 hora"
+        other: "fa %{count} houres"
+      x_days:
+        one: "fa 1 dia"
+        other: "fa %{count} dies"
+      about_x_months:
+        one: "fa més o menys 1 mes"
+        other: "fa més o menys %{count} mesos"
+      x_months:
+        one: "fa 1 mes"
+        other: "fa %{count} mesos"
+      about_x_years:
+        one: "fa més o menys 1 any"
+        other: "fa més o menys %{count} anys"
+      over_x_years:
+        one: "fa més d'1 any"
+        other: "fa més de %{count} anys"
+      almost_x_years:
+        one: "fa ben bé 1 any"
+        other: "fa ben bé %{count} any"
+  password_reset:
+    no_token: "Disculpa, aquest enllaç de canvi de contrasenya és massa antic. Tria el botó de Registre i fes servir 'He oblidat la meva contrasenya' per obtenir-ne un nou enllaç."
+    choose_new: "Tria una nova contrasenya"
+    choose: "Tria una constrasenya"
+    update: 'Actualitza la contrasenya'
+    save: 'Estableix la contrasenya'
+    title: 'Reinicia la contrasenya'
+    success: "Has canviat la teva contrasenya satisfactòriament i ara ja t'hi has connectat."
+    success_unapproved: "Has canviat la teva contrasenya satisfactòriament."
+  change_email:
+    confirmed: "El teu correu electrònic ha estat actualitzat."
+    please_continue: "Continua cap a %{site_name}"
+    error: "Hi ha hagut una errada en canviar el teu correu electrònic. Que potser l'adreça ja està en ús?"
+    error_staged: "Hi ha hagut una errada en canviar el teu correu electrònic. L'adreça ja està en ús per part d'una persona usuària."
+    already_done: "Disculpa, aquest enllaç de confirmació ja no és vàlid. Que potser ha canviat el teu correu electrònic?"
+    authorizing_old:
+      title: "Gràcies per confirmar la teva adreça actual de correu electrònic"
+      description: "T'enviem ara per correu la teva nova adreça per confirmar."
+  activation:
+    action: "Clica aquí per activar el teu compte"
+    already_done: "Disculpa, ja no és vàlid aquest enllaç per confirmar el compte. Que potser el teu compte ja és actiu?"
+    please_continue: "El teu nou compte està confirmat; et redireccionarem a la pàgina principal."
+    continue_button: "Continua a %{site_name} "
+    welcome_to: "Et donem la benvinguda a %{site_name}!"
+    approval_required: "Una persona moderadora ha d'aprovar manualment el teu nou compte abans no puguis accedir a aquest fòrum. Rebràs un correu quan el teu compte hagi estat aprovat!"
+    missing_session: "No podem detectar si el teu compte ha estat creat, si us plau assegura't que tens les galetes activades."
+  post_action_types:
+    off_topic:
+      title: 'Fora de context'
+      description: 'Aquesta entrada no és relevant per al tema actual tal i com està definit pel títol i la primera entrada, i probablement s''hauria de moure a un altre tema.'
+      long_form: 'marcat amb bandera de fora de context'
+    spam:
+      title: 'Brossa'
+      long_form: 'marcat amb bandera de brossa'
+      email_title: '"%{title}" ha estat abanderat com a brossa'
+      email_body: "%{link}\n\n%{message}"
+    inappropriate:
+      title: 'Inapropiat'
+      description: 'Aquesta publicació té contingut que una persona raonable consideraria ofensiu, abusiu o una violació de les <a href="/guidelines">nostres normes de la comunitat</a>.'
+      long_form: 'marcar amb bandera d''inapropiat'
+    notify_user:
+      title: 'Envia un missatge a @{{username}}'
+      description: 'Vull parlar directament i privadament amb aquesta persona sobre la seva publicació.'
+      long_form: 'persona contactada'
+      email_title: 'La teva publicació a "%{title}"'
+      email_body: "%{link}\n\n%{message}"
+    notify_moderators:
+      title: "Alguna altra cosa"
+      description: 'Aquesta publicació necessita la supervisió de l''equip per un altre motiu abans no esmentat.'
+      long_form: 'marcat per a la supervisió de l''equip'
+      email_title: 'Una publicació a "%{title}" necessita la supervisió de l''equip'
+      email_body: "%{link}\n\n%{message}"
+    bookmark:
+      title: 'Preferit'
+      description: 'Marca aquesta publicació'
+      long_form: 'publicació marcada com a preferit'
+    like:
+      title: 'Agrada'
+      description: 'M''agrada aquesta publicació'
+      long_form: 'ha agradat'
+    vote:
+      title: 'Vota'
+      description: 'Vota per aquesta publicació'
+      long_form: 'publicació votada'
+  user_activity:
+    no_bookmarks:
+      self: "No tens publicacions marcades com a preferits, fer-ho et permet accedir-hi després amb facilitat."
+      others: "Sense preferits."
+    no_likes_given:
+      self: "Encara no t'ha agradat cap publicació."
+      others: "Sense publicacions agradades"
+  topic_flag_types:
+    spam:
+      title: 'Brossa'
+      description: 'Aquest tema és un anunci. No és útil o rellevant per a aquest lloc, però sí de tipus promocional.'
+      long_form: 'marcat amb bandera de brossa'
+    inappropriate:
+      title: 'Inapropiat'
+      description: 'Aquest tema té contingut que una persona raonable consideraria ofensiu, abusiu o una violació de les <a href="/guidelines">nostres normes de la comunitat</a>.'
+      long_form: 'marcat amb bandera d''inapropiat'
+    notify_moderators:
+      title: "Alguna altra cosa"
+      description: 'Aquest tema necessita la supervisió general de l''equip basada en les <a href="/guidelines">normes</a>, <a href="%{tos_url}">TOS</a> o per un altre motiu abans no esmentat.'
+      long_form: 'marcat per a la supervisió moderadora'
+      email_title: 'El tema "%{title}" necessita la supervisió moderadora'
+      email_body: "%{link}\n\n%{message}"
+  flagging:
+    user_must_edit: '<p>Aquesta publicació va ser abanderada per la comunitat i temporalment està amagada.</p>'
+  archetypes:
+    regular:
+      title: "Tema ordinari"
+    banner:
+      title: "Bandera de tema"
+      message:
+        make: "Aquest tema ara està emmarcat. Apareixerà al començament de cada pàgina fins que la persona usuària ho descarti."
+        remove: "Aquest tema ja no està emmarcat. Ja no apareixerà més al començament de cada pàgina."
+  unsubscribed:
+    title: "Subscripció cancel·lada!"
+    topic_description: "Per tornar a subscriure't a %{link}, fes servir el control d'alertes abaix o a la dreta del tema."
+  unsubscribe:
+    title: "Cancel·la la subscripció!"
+    stop_watching_topic: "Deixa de mirar aquest tema, %{link}"
+    mute_topic: "Silencia totes les notificacions per a aquest tema, "
+    unwatch_category: "Deixa de mirar tots els temes a %{category}"
+    mailing_list_mode: "Apaga el mode de llista de correu"
+    disable_digest_emails: "Deixa d'enviar-me el resum de correus"
+    all: "No m'enviïs cap correu de %{sitename}"
+    different_user_description: "Actualment t'hi has connectat amb una identitat diferent a la qual vam enviar un correu. Si us plau, desconnecta't o entra-hi anònimament i torna a provar-ho."
+    not_found_description: "Disculpa, no hem pogut trobar aquesta cancel·lació de subscripció. És possible que hagi caducat l'enllaç al teu correu?"
+    log_out: "Sortir"
+  user_api_key:
+    title: "Autoritza l'accés a l'aplicació"
+    authorize: "Autoritza"
+    read: "llegeix"
+    read_write: "llegeix/escriu"
+    description: "\"%{application_name}\" està demanant el següent accés al teu compte:"
+    no_trust_level: "Disculpa, no tens el nivell de confiança necessari per accedir a l'API de la persona usuària"
+    generic_error: "Disculpa, no hem pogut emetre les claus API de la persona, aquesta característica pot haver estat desactivada per l'administració del lloc"
+    scopes:
+      message_bus: "Actualitzacions en directe"
+      notifications: "Llegeix i neteja alertes"
+      push: "Empeny alertes a serveis externs"
+      session_info: "Llegeix la informació de sessió de la persona"
+      read: "Llegeix tot"
+      write: "Escriu tot"
+  reports:
+    visits:
+      title: "Visites de la persona usuària"
+      xaxis: "Dia"
+      yaxis: "Quantitat de visites"
+    signups:
+      title: "Noves persones usuàries"
+      xaxis: "Dia"
+      yaxis: "Quantitat de noves persones usuàries"
+    profile_views:
+      title: "Vistes de perfils de persones usuàries"
+      xaxis: "Dia"
+      yaxis: "Quantitat de perfils vists de persones usuàries"
+    topics:
+      title: "Temes"
+      xaxis: "Dia"
+      yaxis: "Quantitat de nous temes"
+    posts:
+      title: "Publicacions"
+      xaxis: "Dia"
+      yaxis: "Quantitat de noves publicacions"
+    likes:
+      title: "M'agrada"
+      xaxis: "Dia"
+      yaxis: "Quantitat de nous m'agrades"
+    flags:
+      title: "Banderes"
+      xaxis: "Dia"
+      yaxis: "Quantitat de banderes"
+    bookmarks:
+      title: "Preferits"
+      xaxis: "Dia"
+      yaxis: "Quantitat de nous preferits"
+    starred:
+      title: "Estrellat"
+      xaxis: "Dia"
+      yaxis: "Quantitat de nous temes estrellats"
+    users_by_trust_level:
+      title: "Persones usuàries per nivell de confiança"
+      xaxis: "Nivell de confiança"
+      yaxis: "Quantitat de persones usuàries"
+    emails:
+      title: "Correus enviats"
+      xaxis: "Dia"
+      yaxis: "Quantitat de correus"
+    user_to_user_private_messages:
+      title: "Persona a persona"
+      xaxis: "Dia"
+      yaxis: "Quantitat de missatges"
+    system_private_messages:
+      title: "Sistema"
+      xaxis: "Dia"
+      yaxis: "Quantitat de missatges"
+    moderator_warning_private_messages:
+      title: "Avís de moderació"
+      xaxis: "Dia"
+      yaxis: "Quantitat de missatges"
+    notify_moderators_private_messages:
+      title: "Alerta l'equip moderador"
+      xaxis: "Dia"
+      yaxis: "Quantitat de missatges"
+    notify_user_private_messages:
+      title: "Avisa la persona usuària"
+      xaxis: "Dia"
+      yaxis: "Quantitat de missatges"
+    top_referrers:
+      title: "Principals referents"
+      xaxis: "Persona usuària"
+      num_clicks: "Clics"
+      num_topics: "Temes"
+    top_traffic_sources:
+      title: "Principals fonts de trànsit "
+      xaxis: "Domini"
+      num_clicks: "Clics"
+      num_topics: "Temes"
+      num_users: "Persones usuàries"
+    top_referred_topics:
+      title: "Principals temes referits"
+      xaxis: "Tema"
+      num_clicks: "Clics"
+    page_view_anon_reqs:
+      title: "Anònim"
+      xaxis: "Dia"
+      yaxis: "Vistes de pàgina anònimes"
+    page_view_logged_in_reqs:
+      title: "Amb connexió"
+      xaxis: "Dia"
+      yaxis: "Amb connexió a les vistes de pàgina"
+    page_view_crawler_reqs:
+      title: "Rastrejadors de web"
+      xaxis: "Dia"
+      yaxis: "Vistes de pàgina de rastrejadors de web"
+    page_view_total_reqs:
+      title: "Total"
+      xaxis: "Dia"
+      yaxis: "Total de vistes de pàgina"
+    page_view_logged_in_mobile_reqs:
+      title: "Amb connexió a les vistes de pàgina"
+      xaxis: "Dia"
+      yaxis: "Mòbil connectat a les vistes de pàgina"
+    page_view_anon_mobile_reqs:
+      title: "Vistes de pàgina anònimes"
+      xaxis: "Dia"
+      yaxis: "Vistes de pàgina anònimes amb mòbil"
+    http_background_reqs:
+      title: "Fons"
+      xaxis: "Dia"
+      yaxis: "Peticions emprades per a actualitzacions i seguiment en directe"
+    http_2xx_reqs:
+      title: "Estat 2xx (OK)"
+      xaxis: "Dia"
+      yaxis: "Peticions amb èxit (Estat 2xx)"
+    http_3xx_reqs:
+      title: "HTTP 3xx (Redirecció)"
+      xaxis: "Dia"
+      yaxis: "Peticions de redirecció (Estat 3xx)"
+    http_4xx_reqs:
+      title: "HTTP 4xx (Error de client)"
+      xaxis: "Dia"
+      yaxis: "Errors de client (Estat 4xx)"
+    http_5xx_reqs:
+      title: "HTTP 5xx (Error de servidor)"
+      xaxis: "Dia"
+      yaxis: "Errors de servidor (Estat 5xx)"
+    http_total_reqs:
+      title: "Total"
+      xaxis: "Dia"
+      yaxis: "Total de peticions"
+    time_to_first_response:
+      title: "Temps per a primera resposta"
+      xaxis: "Dia"
+      yaxis: "Temps mitjà (hores)"
+    topics_with_no_response:
+      title: "Temes sense resposta"
+      xaxis: "Dia"
+      yaxis: "Total"
+    mobile_visits:
+      title: "Visites de la persona usuària"
+      xaxis: "Dia"
+      yaxis: "Quantitat de visites"
+  dashboard:
+    rails_env_warning: "El teu servidor s'executa en mode %{env}."
+    host_names_warning: "El teu fitxer config/database.yml empra el nom d'amfitrió local per defecte. Actualitza-ho per tal de fer servir el nom del teu lloc."
+    gc_warning: 'El teu servidor fa servir una col·lecció de paràmetres de brossa per defecte de ruby que no et donarà el millor rendiment. Llegeix aquest tema l''ajust del rendiment: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Ajustant Ruby and Rails per a Discourse</a>.'
+    sidekiq_warning: 'No s''està executant <i>Sidekiq</i>. Hi ha moltes tasques asincrònicament en execució per <i>Sidekiq</i>, com ara enviament de correus. Si us plau, assegura''t que com a mínim hi ha un procés <i>Sidekiq</i> en marxa.  <a href="https://github.com/mperham/sidekiq" target="_blank">Aprèn més aquí sobre <i>Sidekiq</i></a>.'
+    queue_size_warning: 'La quantitat de tasques en cua és de %{queue_size}, que és elevada. Això podria indicar un problema amb un o més procesos o potser et cal afegir-hi més treballadors de <i>Sidekiq</i>.'
+    memory_warning: 'El teu servidor s''està executant amb menys d''1 GB de memòria total. Se''n recomana com a mínim un 1 GB de memòria.'
+    google_oauth2_config_warning: 'El servidor està configurat per permetre el registre i inici de sessió amb Google OAuth2 (enable_google_oauth2_logins), però l''id de client i els valors secrets de client no estan configurats. Vés a <a href="/admin/site_settings">la Configuració del Lloc</a> i actualitza les configuracions. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">Mira aquesta guia per saber-ne més</a>.'
+    facebook_config_warning: 'El servidor està configurat per permetre el registre i inici de sessió amb Facebook (enable_facebook_logins), però l''id de client i els valors secrets de client no estan configurats. Vés a <a href="/admin/site_settings">la Configuració del Lloc</a> i actualitza les configuracions. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Mira aquesta guia per saber-ne més</a>.'
+    twitter_config_warning: 'El servidor està configurat per permetre el registre i inici de sessió amb Twitter (enable_twitter_logins), però l''id de client i els valors secrets de client no estan configurats. Vés a <a href="/admin/site_settings">la Configuració del Lloc</a> i actualitza les configuracions. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Mira aquesta guia per saber-ne més</a>.'
+    github_config_warning: 'El servidor està configurat per permetre el registre i inici de sessió amb GitHub (enable_github_logins), però l''id de client i els valors secrets de client no estan configurats. Vés a <a href="/admin/site_settings">la Configuració del Lloc</a> i actualitza les configuracions. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Mira aquesta guia per aprendre''n més</a>.'
+    s3_config_warning: 'El servidor està configurat per carregar còpies de seguretat a s3, però almenys una de les següents configuracions no estan activades:  s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, o s3_upload_bucket. Vés a <a href="/admin/site_settings">la Configuració del Lloc</a> i actualitza les configuracions. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Mira "Com configurar les càrregues d''imatges a S3?" per saber-ne més</a>.'
+    s3_backup_config_warning: 'El servidor està configurat per carregar còpies de seguretat a s3, però almenys una de les següents configuracions no estan activades:  s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, o s3_backup_bucket. Vés a <a href="/admin/site_settings">la Configuració del Lloc</a> i actualitza les configuracions. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Mira "Com configurar les càrregues d''imatges a S3?" per saber-ne més</a>.'
+    image_magick_warning: 'El servidor està configurat per crear miniatures d''imatges grans, però no està instal·lat l''<i>ImageMagick</i>. Instal·la <i>ImageMagick</i> fent servir el teu gestor de paquets preferit o <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">descarrega''t la darrera versió</a>.'
+    failing_emails_warning: 'Hi ha %{num_failed_jobs} tasques de correu fallides. Revisa el teu app.yml i assegura''t que la configuració del servidor de correu és correcta. <a href="/sidekiq/retries" target="_blank">Mira les tasques fallides a <i>Sidekiq</i></a>.'
+    subfolder_ends_in_slash: "La teva configuració de subcarpeta no és correcta; DISCOURSE_RELATIVE_URL_ROOT acaba amb barra inclinada."
+    email_polling_errored_recently:
+      one: "L'enquesta per correu electrònic ha generat un error durant les darreres 24 hores. Fes un cop d'ull als <a href='/logs' target='_blank'>registres</a> per saber-ne més."
+      other: "L'enquesta per correu electrònic ha generat %{count} errors durant les darreres 24 hores. Fes un cop d'ull als <a href='/logs' target='_blank'>registres</a> per saber-ne més."
+    missing_mailgun_api_key: "El servidor està configurat per enviar correus amb <i>mailgun</i> però no has facilitat una clau API emprada per verificar els missatges de ganxo de web."
+    bad_favicon_url: "La càrrega de <i>favicon</i> està fallant. Revisa la configuració de favicon_url a la <a href='/admin/site_settings'>Configuració del lloc</a>."
+    poll_pop3_timeout: "S'ha esgotat del temps de connexió al servidor POP3. No s'ha pogut lliurar el correu entrant. Si us plau, revisa la teva <a href='/admin/site_settings/category/email'>configuració de POP3</a> i el proveïdor de serveis."
+    poll_pop3_auth_error: "La connexió al servidor POP3 està fallant amb un error d'autenticació. Si us plau, revisa la teva <a href='/admin/site_settings/category/email'>configuració de POP3</a>."
+  site_settings:
+    censored_words: "Paraules que es reemplaçaran automàticament amb  &#9632;&#9632;&#9632;&#9632;"
+    censored_pattern: "Patró d'expressió regular que serà reemplaçat automàticament amb  &#9632;&#9632;&#9632;&#9632;"
+    delete_old_hidden_posts: "Esborra automàticament qualsevol publicació que resten oculta durant més de 30 dies."
+    default_locale: "La llengua per defecte d'aquesta instància Discourse (ISO 639-1 Code)"
+    allow_user_locale: "Permet que les persones usuàries triïn la seva preferència de llengua d'interfície"
+    set_locale_from_accept_language_header: "configura la llengua d'interfície per a persones anònimes des dels encapçalaments dels seus navegadors. (EXPERIMENTAL, no funciona amb memòria cau anònima)"
+    min_post_length: "Mínim permès en caràcters per a l'extensió de publicacions "
+    min_first_post_length: "Mínim permès en caràcters per a l'extensió de primera publicació (cos del tema)"
+    min_private_message_post_length: "Mínim permès en caràcters per a l'extensió de publicacions a missatges"
+    max_post_length: "Màxim permès en caràcters per a l'extensió de publicacions "
+    topic_featured_link_enabled: "Activa la publicació d'enllaç amb temes."
+    show_topic_featured_link_in_digest: "Mostra el tema de l'enllaç destacat al correu electrònic de resum automàtic."
+    min_topic_title_length: "Mida mínima permesa del títol del tema en caràcters  "
+    max_topic_title_length: "Mida màxima permesa del títol del tema en caràcters  "
+    min_private_message_title_length: "Mida mínima permesa del títol d'un missatge en caràcters  "
+    min_search_term_length: "Mida mínima permesa d'un camp de cerca en caràcters  "
+    search_tokenize_chinese_japanese_korean: "Força la cerca per assegurar les dades en Xinès/Japonès/Coreà fins i tot en llocs que no siguin en aquestes llengües"
+    search_prefer_recent_posts: "Si la cerca al teu fòrum va lenta, aquesta opció prova primer amb un índex de publicacions recents"
+    search_recent_posts_size: "Quantes publicacions recents per mantenir a l'índex"
+    allow_uncategorized_topics: "Permet crear temes sense categoria. ATENCIÓ: si hi ha temes sense categoria, hauràs de categoritzar-los abans de desactivar aquesta opció."
+    allow_duplicate_topic_titles: "Permet temes amb títols idèntics, duplicats."
+    unique_posts_mins: "Quants minuts abans es pot tornar a publicar amb el mateix contingut"
+    educate_until_posts: "Quan es comencen a escriure les primeres (n) publicacions, mostra la guia d'ús amb menú emergent a l'editor."
+    title: "El nom d'aquest lloc, tal i com es fa servir a l'etiqueta del títol."
+    site_description: "Descriu aquest lloc amb una frase, tal i com es fa servir a la meta-etiqueta de descripció."
+    contact_url: "URL de contacte per a aquest lloc. Emprat al formulari de contacte per a qüestions urgents."
+    crawl_images: "Recupera imatges d'adreces URL remotes per inserir-hi les dimensions correctes d'amplada i alçada."
+    download_remote_images_to_local: "Converteix les imatges remotes en imatges locals en descarregar-les: això prevé les imatges trencades."
+    download_remote_images_threshold: "L'espai mínim necessari al disc per descarregar imatges remotes en local (percentatge)"
+    download_remote_images_max_days_old: "No descarreguis imatges remotes per a publicacions que tenen més d'N dies."
+    disabled_image_download_domains: "Les imatges remotes mai no es descarregaran des d'aquests dominis. Llista delimitada amb barra vertical."
+    editing_grace_period: "Per a (n) segons després de publicar, l'edició no crearà una nova versió a l'historial de publicacions."
+    post_edit_time_limit: "L'autoria pot editar o esborrar les pròpies publicacions durant els (n) minuts posteriors a publicar. Estableix 0 per a sempre."
+    edit_history_visible_to_public: "Permet que qualsevol miri les versions prèvies d'una publicació editada. Si està desactivat, només és visible per a integrants de l'equip."
+    delete_removed_posts_after: "Les publicacions eliminades per l'autoria s'esborraran automàticament després d'(n) hores. Si s'estableix a 0, s'esborraran immediatament."
+    max_image_width: "Amplada màxima de les miniatures d'imatges a una publicació"
+    max_image_height: "Alçada màxima de les miniatures d'imatges a una publicació"
+    fixed_category_positions: "Si està activat, sempre podràs manegar categories amb un ordre fix. Si no està activat, les categories es llisten segons l'ordre d'activitat."
+    fixed_category_positions_on_create: "Si està activat, l'ordenació de categor es mantindrà a diàleg de creació de temes (necessita fixed_category_positions)."
+    add_rel_nofollow_to_user_content: "Afegeix l'atribut \"nofollow\" a tots els continguts enviats, excepte els enllaços interns (incloent-hi dominis relacionats). Si ho canvies, hauràs de refer totes les publicacions amb: \"rake posts:rebake\""
+    post_excerpt_maxlength: "Mida màxima en caràcters d'un resum/extracte de publicació."
+    show_pinned_excerpt_mobile: "Mostra l'extracte de temes clavats a la vista per a mòbils."
+    show_pinned_excerpt_desktop: "Mostra l'extracte de temes clavats a la vista per a escriptori."
+    post_onebox_maxlength: "Mida màxima en caràcters d'una publicació encaixada de Discourse."
+    onebox_domains_blacklist: "Un llistat de dominis que mai no seran encaixats"
+    max_oneboxes_per_post: "Quantitat màxima d'encaixos a una publicació"
+    logo_url: "La imatge de logo a la part superior esquerra del teu lloc, hauria de tenir una forma rectangular allargada. Si es deixa en blanc, es mostrarà el títol del lloc."
+    digest_logo_url: "La imatge de logo alternativa emprada a la part superior del resum de correus del teu lloc. Hauria de tenir una forma rectangular allargada. No hauria de tenir format SVG. Si es deixa en blanc, s'emprarà `logo_url`."
+    logo_small_url: "La imatge de logo petita a la part superior esquerra del teu lloc, hauria de ser tenir una forma quadrada, mostrada en desplaçar-se cap abaix. Si es deixa en blanc, es mostrarà un glif."
+    favicon_url: "La icona de web del teu lloc, mira https://ca.wikipedia.org/wiki/Icona_de_web. Ha de ser de format png per treballar correctament a una xarxa de lliurament de continguts"
+    apple_touch_icon_url: "La icona emprada per a dispositius tàctils d'Apple. La mida recomanada és de 144x144 píxels."
+    notification_email: "L'adreça de correu electrònic emprada al \"de:\" en enviar tots els correus electrònics essencials del sistema. El domini especificat aquí ha de tenir registres SPF, DKIM i PTR inversos, establerts correctament per tal que arribi el correu electrònic."
+    email_custom_headers: "Una llista d'encapçalaments personalitzats de correu, delimitada amb barra vertical "
+    email_subject: "Format de tema personalitzable per a correus estàndards. Mira https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
+    force_https: "Força el teu lloc a fer servir només HTTPS. ATENCIÓ: NO activis això fins que no verifiquis que HTTPS està totalment configurat i treballant a tot arreu. Has comprovat la teva xarxa de lliurament de continguts, totes les connexions socials i els logos i dependències externs per assegurar-te també que tots són compatibles amb HTTPS?"
+    summary_score_threshold: "La puntuació mínima requerida per a una publicació per ser inclosa a 'Resumeix aquest tema'"
+    summary_posts_required: "Publicacions mínimes a un tema abans d'activar 'Resumeix aquest tema'"
+    summary_likes_required: "Mínim nombre de m'agrades a un tema abans d'activar 'Resumeix aquest tema'"
+    summary_percent_filter: "Quan una persona clica 'Resumeix aquest tema', mostra el '% o' principal de publicacions"
+    summary_max_results: "Màxim de publicacions resultat de 'Resumeix aquest tema'"
+    enable_private_messages: "Permet que les persones amb nivell de confiança 1 puguin crear missatges i respondre'ls (configurable amb el mínim de nivell de confiança per enviar missatges). Fixa't que l'equip sempre pot enviar qualsevol mena de missatges."
+    enable_long_polling: "El bus de missatges emprat per a la notificació pot fer servir el mostreig llarg"
+    long_polling_base_url: "La URL bàsica emprada per a mostreig llarg (quan una xarxa de lliurament de continguts serveix contingut dinàmic, assegura't de configurar-ho per llençar l'origen). Per exemple, http://origin.site.com"
+    long_polling_interval: "Quantitat de temps que el servidor hauria d'esperar abans de respondre clients quan no hi ha dades d'enviament (connectat només a persones usuàries)"
+    polling_interval: "Quan no hi ha mostreig llarg, amb quina freqüència en mil·lisegons haurien de connectar-se a clients de mostreig"
+    anon_polling_interval: "Amb quina freqüència en mil·lisegons podria votar els clients"
+    background_polling_interval: "Amb quina freqüència en mil·lisegons podrien votar els client (quan la finestra és al fons)"
+    flags_required_to_hide_post: "Quantitat de banderes que fan que una publicació s'amagui automàticament i s'enviï un missatge a la persona (0 per a mai)"
+    cooldown_minutes_after_hiding_posts: "Quantitat de minuts que una persona ha d'esperar abans d'editar una publicació oculta amb les banderes de la comunitat"
+    max_topics_in_first_day: "Quantitat màxima de temes que una persona pot crear en les 24 hores posteriors a la seva primera publicació"
+    max_replies_in_first_day: "Quantitat màxima de respostes que una persona pot crear en les 24 hores posteriors a la seva primera publicació"
+    tl2_additional_likes_per_day_multiplier: "Augmenta el límit de m'agrades per dia per a nivell de confiança 2 (membre), en multiplicar per aquesta xifra"
+    tl3_additional_likes_per_day_multiplier: "Augmenta la quantitat de M'agrada per dia per nivell de confiança 3 (ordinari), en multiplicar per aquesta xifra"
+    tl4_additional_likes_per_day_multiplier: "Augmenta el límit de M'agrada per dia a nivell de confiança 4 (líder), en multiplicar per aquesta xifra"
+    flag_sockpuppets: "Si una nova persona usuària respon un tema des de la mateixa adreça IP que la persona creadora del tema, marca les seves publicacions com a brossa potencial."
+    traditional_markdown_linebreaks: "Fes servir salts de línia tradicionals a Markdown, que necessita dos espais a la dreta per un salt de línia."
+    post_undo_action_window_mins: "Quantitat de minuts durant els quals es permet a les persones usuàries desfer accions recents sobre una publicació (M'agrada, bandera, etcètera)."
+    must_approve_users: "L'equip ha d'aprovar tots els nous comptes abans de permetre que accedeixin el lloc. ATENCIÓ: si actives això a un lloc en funcionament, es revocarà l'accés a les persones usuàries que no pertanyen a l'equip!"
+    pending_users_reminder_delay: "Comunica a l'equip moderador si hi ha noves persones esperant l'aprovació més enllà d'aquest grapat d'hores. Configura-ho a -1 per desactivar les alertes."
+    maximum_session_age: "La persona romandrà connectada durant n hores des de la darrera visita"
+    ga_universal_tracking_code: "Codi de rastreig de Google Universal Analytics (analytics.js), per exemple: UA-12345678-9; mira http://google.com/analytics"
+    ga_universal_domain_name: "Nom de domini de Google Universal Analytics (analytics.js), per exemple: mysite.com; mira http://google.com/analytics"
+    gtm_container_id: "Contenidor d'id de Google Tag Manager, per exemple: GTM-ABCDEF"
+    enable_escaped_fragments: "Torna a Google's Ajax-Crawling API si no es detecta cap restrejador de web. Mira https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
+    allow_moderators_to_create_categories: "Permet que l'equip moderador creï noves categories"
+    cors_origins: "Orígens permesos per a peticions d'origen creuat (CORS). Cada origen ha d'incloure http:// o https://. La variable DISCOURSE_ENABLE_CORS ha d'establir-se en \"true\" per tal d'habilitar CORS."
+    use_admin_ip_whitelist: "Les persones administradores només poden connectar-se si són a una adreça IP definida a la llista d'IP Cobertes (Administració > Connexions > IP Cobertes)."
+    top_menu: "Determina quins elements apareixen a la navegació de la pàgina principal i en quin ordre. Per exemple, latest|new|unread|categories|top|read|posted|bookmarks"
+    post_menu: "Determina quins elements apareixen al menú de publicacions i en qui ordre. Per exemple,\nlike|edit|flag|delete|share|bookmark|reply"
+    post_menu_hidden_items: "Els elements del menú que s'oculten per defecte al menú de publicacions, tret que es cliqui sobre una el·lipsi d'expansió."
+    share_links: "Determina quins elements apareixen a diàleg d'acció i en qui ordre."
+    track_external_right_clicks: "Rastreig d'enllaços externs que es cliquen amb el botó dret (en obrir a una nova pestanya, per exemple) desactivat per defecte, perquè reescriu les URL."
+    site_contact_username: "Un nom vàlid de membre de l'equip per emetre tots els missatges automàtics. Si es deixa buit, es farà servir el compte per defecte del sistema."
+    send_welcome_message: "Envia a totes les noves persones usuàries un missatge de benvinguda amb la guia ràpida d'inici."
+    suppress_reply_directly_below: "No mostris el recompte de respostes expansibles a una publicació quan només hi hagi una resposta directa sota la publicació."
+    suppress_reply_directly_above: "No mostris l'expansible \"en resposta a\" a una publicació quan només hi hagi una resposta directa sota aquesta publicació."
+    suppress_reply_when_quoting: "No mostris l'expansible \"en resposta a\" a una publicació quan la publicació cita una resposta."
+    max_reply_history: "Quantitat màxima de respostes per estendre en mostrar en resposta a"
+    topics_per_period_in_top_summary: "Quantitat de temes principals al resum per defecte de temes principals."
+    topics_per_period_in_top_page: "Quantitat de temes principals per desplegar a \"Mostra'n més\" de temes principals."
+    redirect_users_to_top_page: "Redirecciona automàticament les persones noves i força absents a l'inici de la pàgina."
+    top_page_default_timeframe: "Marc de temps per defecte per a la vista principal de pàgina."
+    show_email_on_profile: "Mostra el correu de la persona (només visibles per a la mateixa persona i l'equip)"
+    prioritize_username_in_ux: "Mostra el nom de la persona primer a la pàgina personal, tarjeta personal i publicacions (si està desactivat, el nom es mostra primer)"
+    email_token_valid_hours: "Els petits grups de dades de contrasenya oblidada / activa el compte són vàlids durant (n) hores."
+    enable_badges: "Activa el sistema de distintius"
+    enable_whispers: "Permet la comunicació privada de l'equip entre temes."
+    allow_index_in_robots_txt: "Especifica a robots.txt que aquest lloc està autoritzat a ser indexat pels motors de cerca."
+    email_domains_blacklist: "Una llista de dominis de correus delimitada amb barra vertical amb els quals les persones no poden registrar-hi comptes. Exemple: mailinator.com|trashmail.net"
+    email_domains_whitelist: "Una llista de dominis de correus delimitada amb barra vertical amb els quals les persones HAN de registrar-hi comptes. ATENCIÓ: Les persones amb altres dominis de correu diferents als llistats no estaran autoritzades!"
+    log_out_strict: "En desconnectar-se, desconnecta TOTES les sessions per a la persona a tots els dispositius"
+    version_checks: "Clava l'activitat de Discourse per a actualitzacions de versió i mostra els missatges de la nova versió al tauler /admin"
+    new_version_emails: "Envia un correu al contact_email address quan hi hagi una nova versió del Discourse disponible."
+    invite_expiry_days: "Quant és vàlida la clau d'invitació a una persona, en dies"
+    invite_passthrough_hours: "Quant pot la persona fer servir una clau d'invitació prèviament recuperada per connectar-s'hi, en hores"
+    login_required: "Exigeix l'autenticació per llegir el contingut del lloc, impedeix-ne l'accés anònim."
+    min_username_length: "La mida mínima de nom de persona usuària en caràcters. ATENCIÓ: si cap altra persona o grup té noms més breus que aquest, el teu lloc caurà!"
+    max_username_length: "Mida màxima de nom de persona usuària en caràcters. ATENCIÓ: si cap altra persona o grup té noms més llargs que aquest, el teu lloc caurà!"
+    min_password_length: "Mida mínima de contrasenya."
+    min_admin_password_length: "Mida mínima de contrasenya per a administració."
+    password_unique_characters: "Quantitat mínima de caràcters únics que ha de tenir una contrasenya."
+    block_common_passwords: "No permetis contrasenyes que es trobin entre les 10000 més comuns."
+    enable_sso: "Activa l'autenticació única des d'un lloc extern (ATENCIÓ: LES ADRECES DE CORREU *HAN* DE SER VALIDADES PER UN LLOC EXTERN!)"
+    verbose_sso_logging: "Carrega els diagnòstics relacionats amb l'autenticació única a /logs"
+    enable_sso_provider: "Implementa el protocol de proveïdor de l'autenticació única del Discourse a /session/sso_provider endpoint, necessita sso_secret per ser activada"
+    sso_url: "Adreça URL d'autenticació única a un punt final (ha dincloure http:// o https://)"
+    sso_secret: "Cadena secreta emprada per autenticar criptogràficament la informació d'autenticació única, assegura't que té 10 caràcters o més"
+    sso_overrides_bio: "Anul·la la biografia de la persona al perfil i evita que es pugui canviar"
+    sso_overrides_email: "Anul·la el correu local amb correu extern per a l'autenticació única a cada connexió i evita els canvis en local. (ATENCIÓ: poden succeir incidències a causa de la normalització dels correus locals)"
+    sso_overrides_username: "Anul·la el nom local de persona amb nom de lloc extern per a la càrrega útil d'autenticació única a cada connexió i evita els canvis en local. (ATENCIÓ: poden succeir incidències a causa de les diferències a la mida i a les condicions dels noms de persona usuària)"
+    sso_overrides_name: "Anul·la el nom sencer local amb nom sencer extern per a la càrrega útil d'autenticació única a cada connexió i evita els canvis en local."
+    sso_overrides_avatar: "Anul·la l'avatar de la persona amb avatar de lloc extern de la càrrega útil d'autenticació única, es recomana molt la inhabilitació de allow_uploaded_avatars"
+    sso_not_approved_url: "Redirecciona els comptes d'autenticació única a aquesta adreça URL"
+    sso_allows_all_return_paths: "No restringeixis el domini per a return_paths facilitat per l'autenticació única (per defecte el camí de retorn ha de ser el lloc actual)"
+    enable_local_logins: "Activa la connexió dels comptes basats en noms i contrasenyes locals. (Nota: això ha d'estar activat perquè les invitacions funcionin)"
+    allow_new_registrations: "Permet registres de noves persones. Inhabilita-ho per tal d'evitar que qualsevol pugui crear un nou compte."
+    enable_signup_cta: "Mostra un avís a les persones anònimes que tornin, convidant-les a registrar-s'hi amb un compte."
+    enable_yahoo_logins: "Activa l'autenticació amb Yahoo"
+    enable_google_oauth2_logins: "Activa l'autenticació amb Google Oauth2. Aquest és el mètode d'autenticació que Google accepta hores d'ara. Necessita clau i secret."
+    google_oauth2_client_id: "ID de client a la teva aplicació Google."
+    google_oauth2_client_secret: "Client secret a la teva aplicació Google."
+    enable_twitter_logins: "Activar l'autenticació de Twitter, necessita twitter_consumer_key i twitter_consumer_secret"
+    twitter_consumer_key: "Clau de consum per a l'autenticació amb Twitter, registrada a http://dev.twitter.com"
+    twitter_consumer_secret: "Secret de consum per a l'autenticació amb Twitter, registrat a http://dev.twitter.com"
+    enable_instagram_logins: "Activa l'autenticació amb Instagram, necessita instagram_consumer_key i instagram_consumer_secret"
+    instagram_consumer_key: "Clau de consum per a l'autenticació amb Instagram"
+    instagram_consumer_secret: "Secret de consum per a l'autenticació amb Instagram"
+    enable_facebook_logins: "Activa l'autenticació amb Facebook, necessita facebook_app_id i facebook_app_secret"
+    facebook_app_id: "Id d'app per a l'autenticació amb Facebook, registrada a https://developers.facebook.com/apps"
+    facebook_app_secret: "Secret d'app per a l'autenticació amb Facebook, registrat a https://developers.facebook.com/apps"
+    facebook_request_extra_profile_details: "Demana sobre mi, ubicació i lloc web de Facebook. (necessita que la teva aplicació sigui aprovada per Facebook)"
+    enable_github_logins: "Activar l'autenticació de GitHub, necessita  github_client_id i github_client_secret"
+    github_client_id: "Id client per a l'autenticació amb Github, registrada a https://github.com/settings/applications"
+    github_client_secret: "Secret de client per a l'autenticació amb GitHub, registrat a https://github.com/settings/applications"
+    readonly_mode_during_backup: "Activa el mode només de lectura mentre es fa la còpia de seguretat"
+    allow_restore: "Permet restablir, que pot reemplaçar TOTES les dades del lloc! Deixa-ho com a \"false\" si no pretens restablir una còpia de seguretat"
+    maximum_backups: "Quantitat màxima de còpies de seguretat per mantenir al disc. Les còpies més antigues seran esborrades automàticament"
+    automatic_backups_enabled: "Executa còpies de seguretat automàtiques tal com estan definides a la freqüències de la còpia de seguretat"
+    backup_frequency: "Amb quina freqüència podem crear una còpia de seguretat del lloc, en dies."
+    enable_s3_backups: "Carrega còpies de seguretat a S3 quan es completi. IMPORTANT: necessita credencials vàlides de S3 introduïdes a la configuració de fitxer."
+    s3_backup_bucket: "Sistema remot de càrrega de còpies de seguretat. ATENCIÓ: Assegura't que és una càrrega privada."
+    s3_disable_cleanup: "Inhabilita l'eliminació de còpies de seguretat de S3 quan s'eliminin localment."
+    backup_time_of_day: "Temps del dia UTC quan la còpia de seguretat hauria d'executar-se."
+    backup_with_uploads: "Inclou càrregues a les còpies de seguretat planificades. Inhabilitar això només farà còpia de seguretat de la base de dades."
+    active_user_rate_limit_secs: "Amb quina freqüència actualitzem el camp 'last_seen_at', en segons."
+    verbose_localization: "Mostra els consell de la ubicació desplegats a la interfície personal"
+    previous_visit_timeout_hours: "Quant dura una visita abans de considerar-la visita \"prèvia\", en hores"
+    top_topics_formula_log_views_multiplier: "valor del multiplicador (n) de vistes del registre segons fórmula de temes principals: `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: "valor del multiplicador (n) de la primera publicació agradada segons fórmula de temes principals: `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: "valor del multiplicador (n) de publicacions menys agradades segons fórmula de temes principals: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
+    rebake_old_posts_count: "Quantitat de publicacions antigues per refer cada 15 minuts."
+    rate_limit_create_topic: "Després de crear un tema, les persones han d'esperar (n) segons abans de crear-ne un altre."
+    rate_limit_create_post: "Després de fer una publicació, les persones han d'esperar (n) segons abans de publicar-ne més."
+    rate_limit_new_user_create_topic: "Després de crear un tema, les noves persones usuàries han d'esperar (n) segons abans de crear-ne un altre"
+    rate_limit_new_user_create_post: "Després de fer una publicació, les noves persones usuàries han d'esperar (n) segons abans de publicar-ne més."
+    max_likes_per_day: "Quantitat màxima de M'agrada per persona i dia."
+    max_flags_per_day: "Quantitat màxima de banderes per persona i dia."
+    max_bookmarks_per_day: "Quantitat màxima de preferits per persona i dia."
+    max_edits_per_day: "Quantitat màxima d'edicions per persona i dia."
+    max_topics_per_day: "Quantitat màxima de temes que una persona pot crear cada dia."
+    max_private_messages_per_day: "Quantitat màxima de missatges que una persona pot crear cada dia."
+    max_invites_per_day: "Quantitat màxima d'invitacions que una persona pot enviar cada dia."
+    max_topic_invitations_per_day: "Quantitat màxima d'invitacions a temes que una persona por enviar cada dia."
+    alert_admins_if_errors_per_minute: "Quantitat d'errors per minut per desencadenar una alerta admin. Un valor 0 inhabilita aquesta característica. NOTA: cal reiniciar."
+    alert_admins_if_errors_per_hour: "Quantitat d'errors per hora per desencadenar una alerta d'administració. Un valor 0 inhabilita aquesta característica. NOTA: cal reiniciar."
+    categories_topics: "Quantitat de temes per mostrar a la pàgina de /categories."
+    suggested_topics: "Quantitat de temes recomanats a mostrar al final d'un tema."
+    limit_suggested_to_category: "Mostra només temes de l'actual categoria als temes recomanats."
+    suggested_topics_max_days_old: "Els temes recomanats no haurien de tenir més de n dies."
+    clean_up_uploads: "Elimina càrregues òrfenes sense referència per tal d'evitar l'allotjament il·legal. ATENCIÓ: hauràs de fer còpia de seguretat del teu directori de /càrregues abans d'activar això."
+    clean_orphan_uploads_grace_period_hours: "Període de gràcia (en hores) abans d'eliminar una càrrega òrfena. "
+    purge_deleted_uploads_grace_period_days: "Període de gràcia (en dies) abans d'esborrar una càrrega eliminada."
+    enable_s3_uploads: "Emmagatzema les càrregues a un servei Amazon S3. IMPORTANT: calen credencials vàlides S3 (tant l'id de clau d'accés & com la clau secreta d'accés)."
+    s3_use_iam_profile: 'Fes servir el rol AWS EC2 IAM per recuperar claus. NOTA: activar això anul·larà les configuracions "s3 access key id" i "s3 secret access key" settings.'
+    s3_upload_bucket: "El nom del dipòsit Amazon S3 on es carregaran els fitxers. ATENCIÓ: ha de ser en minúscula, sense comes, ni guions."
+    s3_access_key_id: "La clau d'accés a Amazon S3 que es farà servir per carregar imatges."
+    s3_secret_access_key: "La clau secreta d'accés a Amazon S3 que es farà servir per carregar imatges."
+    s3_region: "El nom de regió d'Amazon S3 que es farà servir per carregar imatges."
+    s3_cdn_url: "L'adraça URL de CDN que es farà servir per a tots els actius s3 (per exemple: https://cdn.somewhere.com). ATENCIÓ: després de canviar aquesta configuració has de refer totes les publicacions antigues."
+    avatar_sizes: "Llista de mides d'avatar generades automàticament."
+    external_system_avatars_enabled: "Fes servir un servei extern de sistema d'avatars."
+    external_system_avatars_url: "Adreça URL del sitema extern de servei d'avatars. Les substitucions permeses són {username} {first_letter} {color} {size}"
+    default_opengraph_image_url: "Adreça URL del protocol opengraph d'imatge per defecte."
+    twitter_summary_large_image_url: "Adreça URL del resum de la targeta d'imatge per defecte de Twitter (hauria de fer almenys 280px d'amplada i com a míimim 150px d'alçada)."
+    allow_all_attachments_for_group_messages: "Permet tots els adjunts de correu per a missatges de grup."
+    enable_flash_video_onebox: "Habilita la incrustació d'enllaços swf i flv (Adobe Flash) emmarcats. ATENCIÓ: això pot comportar riscos de seguretat."
+    default_invitee_trust_level: "Nivell de confiança per defecte (0-4) per a persones convidades."
+    default_trust_level: "Nivell de confiança (0-4) per a totes les noves persones. ATENCIÓ! En canviar-ho t'exposes a un risc seriós de brossa."
+    tl1_requires_topics_entered: "Quants temes pot introduir una nova persona abans de promoure el nivell de confiança 1."
+    tl1_requires_read_posts: "Quantes publicacions ha de llegir una nova persona abans de promoure-la al nivell 1."
+    tl1_requires_time_spent_mins: "Quants minuts una nova persona ha de llegir publicacions abans de promoure-la a nivell 1."
+    tl2_requires_topics_entered: "Quants temes ha d'introduir una nova persona abans de promoure-la a nivell 2."
+    tl2_requires_read_posts: "Quantes publicacions ha de llegir una nova persona abans de promoure-la a nivell 2."
+    tl2_requires_time_spent_mins: "Quants minuts una nova persona ha de llegir publicacions abans de promoure-la a nivell 2."
+    tl2_requires_days_visited: "Quants dies una persona ha de visitar el lloc abans de promoure-la a nivell 2."
+    tl2_requires_likes_received: "Quants M'agrada ha de rebre una persona abans de promoure-la a nivell de confiança 2."
+    tl2_requires_likes_given: "Quants M'agrada ha d'emetre una persona abans de promoure-la a nivell 2."
+    tl2_requires_topic_reply_count: "Quants temes ha de respondre una persona abans de promoure-la a nivell 2."
+    tl3_time_period: "Condicions temporals de nivell de confiança 3 (en dies)"
+    tl3_requires_days_visited: "Quantitat mínima de dies que una persona necessita per haver visitat el lloc durant els darrers dies (període de temps nivell 3) per qualificar-la com a promoció a nivell de confiança 3. Estableix període de temps més gran que nivell 3 per inhabilitar les promocions a nivell 3. (0 o més alta)"
+    tl3_requires_topics_replied_to: "Quantitat mínima de temes que una persona necessita haver respost durant els darrers dies (període de temps nivell 3) per qualificar-la com a promoció a nivell de confiança 3. (0 o més alta)"
+    tl3_requires_topics_viewed: "El percentatge de temes creats durant els darrers dies (període de temps nivell 3) que una persona necessita haver vist per qualificar-la com a promoció a nivell 3 de confiança. (0 a 100)"
+    tl3_requires_topics_viewed_cap: "Quantitat màxima de temes vistos durant els darrers dies (període de temps nivell 3)."
+    tl3_requires_posts_read: "El percentatge de publicacions creades durant els darrers dies (període de temps nivell 3) que una persona necessita haver vist per qualificar-la com a promoció a nivell 3 de confiança. (0 a 100)"
+    tl3_requires_posts_read_cap: "Quantitat màxima de publicacions llegides durant els darrers dies (període de temps nivell 3)."
+    tl3_requires_topics_viewed_all_time: "Quantitat mínima total de temes que una persona ha d'haver vist per qualificar-la com a nivell de confiança 3."
+    tl3_requires_posts_read_all_time: "Quantitat mínima total de publicacions que una persona ha d'haver llegit per qualificar-la com a nivell de confiança 3."
+    tl3_requires_max_flagged: "La persona no ha de tenir més d'x publicacions abanderades per x participants diferents durant els darrers dies (període de temps nivell 3) per qualificar-la com a nivell 3 de confiança, quan x és el valor configurat (0 o més alt)."
+    tl3_promotion_min_duration: "La quantitat mínima de dies que dura una promoció a nivell 3 de confiança abans la persona no sigui rebaixada a nivell 2."
+    tl3_requires_likes_given: "La quantitat mínima de M'agrada que cal donar durant els darrers dies (període de temps nivell 3) per qualificar com a promoció a nivell 3 de confiança."
+    tl3_requires_likes_received: "Quantitat mínima de M'agrada que cal rebre durant els darrers dies (període de temps nivell 3) per qualificar com a promoció a nivell de confiança 3."
+    tl3_links_no_follow: "No esborris rel=nofollow dels enllaços publicats per persones de nivell 3 de confiança."
+    min_trust_to_create_topic: "Quantitat mínima de nivell de confiança necessària per crear un nou tema."
+    min_trust_to_edit_wiki_post: "Nivell de confiança mínim necessari per editar una publicació marcada com a wiki."
+    min_trust_to_edit_post: "Nivell de confiança mínim necessari per editar publicacions."
+    min_trust_to_allow_self_wiki: "Nivell de confiança mínim per fer-ne wiki de la pròpia publicació personal."
+    min_trust_to_send_messages: "Nivell de confiança mínim necessari per crear nous missatges privats."
+    newuser_max_links: "Quants enllaços pot afegir una persona a una publicació."
+    newuser_max_images: "Quantes imatges pot afegir una persona a una publicació."
+    newuser_max_attachments: "Quants adjunts pot afegir una persona a una publicació"
+    newuser_max_mentions_per_post: "Màxim nombre de mencions a @usuaris que un nou usuari pot usar en una entrada."
+    newuser_max_replies_per_topic: "Quantitat màxima de respostes que una nova persona pot fer a un únic tema fins que altres participants ho responguin."
+    max_mentions_per_post: "Màxim nombre de mencions a @usuaris que algú pot usar en una entrada."
+    max_users_notified_per_group_mention: "Quantitat màxima de persones que poden rebre alertes si un grup és mencionat (si el valor límit no troba alertes, serà augmentat)"
+    create_thumbnails: "Crea miniatures i finestres d'imatge de massa amplada per cabre a una publicació."
+    email_time_window_mins: "Espera (n) minuts abans d'enviar qualsevol alerta de correu, per tal de possibilitar l'edició i la finalització de les publicacions."
+    private_email_time_window_seconds: "Espera (n) segons abans d'enviar qualsevol correu privat d'alerta, per tal de possibilitar l'edició i la finalització dels missatges."
+    email_posts_context: "Quantes respostes prèvies per incloure com a context a correus d'alerta."
+    flush_timings_secs: "Amb quanta freqüència descarreguem al servidor les dades de temporització, en segons."
+    title_max_word_length: "La mida màxima permesa de la paraula, en caràcters al títol d'un tema."
+    title_min_entropy: "L'entropia mínima (caràcters únics, recompte no anglès per a més) necessari per al títol d'un tema."
+    body_min_entropy: "L'entropia mínima (caràcters únics, recompte no anglès per a més) necessari per al cos d'un tema."
+    allow_uppercase_posts: "Permet tot en majúscula al títol o al cos d'una publicació."
+    title_fancy_entities: "Converteix els caràcters ordinaris d'ASCII en entitats HTML sofisticades als títols de temes, a l'estil de SmartyPants http://daringfireball.net/projects/smartypants/"
+    min_title_similar_length: "Mida mínima d'un títol abans de ser consultat per a temes semblants."
+    min_body_similar_length: "Mida mínima del cos d'una publicació abans de ser consultada per a temes semblants."
+    desktop_category_page_style: "Estil visual per a la pàgina /categories."
+    category_colors: "Una llista de valors de color hexadecimal permesos per categories."
+    category_style: "Estil visual per a distincions de categoria."
+    max_image_size_kb: "Mida màxima de càrrega d'imatge en kB. Cal configurar-ho a nginx (client_max_body_size) / apache o també al servidor cau."
+    max_attachment_size_kb: "Mida màxima de càrrega de fitxers adjunts en kB. Cal configurar-ho a nginx (client_max_body_size) / apache o també al servidor cau."
+    authorized_extensions: "Una llista d'extensions de fitxer per a càrrega (fes servir '*' per habilitar tota mena de fitxers)"
+    max_similar_results: "Quants temes semblants es mostren sobre l'editor en elaborar un nou tema. La comparació es basa en el títol i el cos."
+    max_image_megapixels: "Quantitat màxima de megapíxels permesos a una imatge."
+    title_prettify: "Evita errades tipogràfiques freqüents al títol, incloent-hi tot en majúscula, primer caràcter en minúscula, múltiples ! i ?, . extres al final, etcètera."
+    topic_views_heat_low: "Després d'aquestes vistes, el camp de vistes està lleugerament destacat."
+    topic_views_heat_medium: "Després d'aquestes vistes, el camp de vistes està moderadament destacat."
+    topic_views_heat_high: "Després d'aquestes vistes, el camp de vistes està molt destacat."
+    cold_age_days_low: "Després d'aquests dies de conversa, el camp de data de darrera activitat està lleugerament atenuat."
+    cold_age_days_medium: "Després d'aquests dies de conversa, el camp de data de darrera activitat està moderadament atenuat."
+    cold_age_days_high: "Després d'aquests dies de conversa, el camp de data de darrera activitat està molt atenuat."
+    history_hours_low: "Una publicació editada dins d'aquestes hores té l'indicador d'edició lleugerament destacat."
+    history_hours_medium: "Una publicació editada dins d'aquestes hores té l'indicador d'edició moderadament destacat."
+    history_hours_high: "Una publicació editada dins d'aquestes hores té l'indicador d'edició molt destacat."
+    topic_post_like_heat_low: "Després que la relació M'agrada:publicació excedeixi aquest marge, el camp de recompte de publicacions està lleugerament destacat."
+    topic_post_like_heat_medium: "Després que la relació M'agrada:publicació excedeixi aquest marge, el camp de recompte de publicacions està moderadament destacat."
+    topic_post_like_heat_high: "Després que la relació M'agrada:publicació excedeixi aquest marge, el camp de recompte de publicacions està molt destacat."
+    faq_url: "Si tens Preguntes Freqüents allotjades a qualsevol lloc que vulguis fer servir, facilita l'adreça URL sencera aquí."
+    tos_url: "Si tens Condicions d'Ús allotjades a qualsevol lloc que vulguis fer servir, facilita l'adreça URL sencera aquí."
+    privacy_policy_url: "Si tens una Política de Privacitat allotjada a qualsevol lloc que vulguis fer servir, facilita l'adreça URL sencera aquí."
+    newuser_spam_host_threshold: "Quantes vegades una nova persona pot publicar un enllaç al mateix amfitrió dins de les seves publicacions `newuser_spam_host_threshold` abans considerar-se brossa."
+    white_listed_spam_host_domains: "Una llista de dominis exclosos de la prova d'amfitrió de brossa. Mai no s'impedirà a les noves persones publicar amb enllaços a aquests dominis."
+    staff_like_weight: "Quants factors de ponderació addicional per donar M'agrada a l'equip."
+    topic_view_duration_hours: "Compta una nova vista de tema una vegada per IP/Persona cada N hores"
+    user_profile_view_duration_hours: "Compta una nova vista de perfil de persona un cop per IP/Persona cada N hores"
+    levenshtein_distance_spammer_emails: "En fer coincidir correus brossa, diferència de quantitat de caràcters que encara permetrà una coincidència confusa."
+    max_new_accounts_per_registration_ip: "Si ja hi ha (n) comptes amb nivell 0 de confiança d'aquesta IP (i cap no és membre de l'equip o té nivell 2 o superior), deixa d'acceptar noves connexions des d'aquesta IP."
+    min_ban_entries_for_roll_up: "En clicar el botó d'enrotllar, es crearà una nova prohibició d'entrada a subxarxa si hi ha almenys (N) entrades."
+    max_age_unmatched_emails: "Esborra entrades no coincidents de correus monitoritzats després de (N) dies."
+    max_age_unmatched_ips: "Esborra entrades no coincidents d'entrades IP monitoritzades després de (N) dies."
+    num_flaggers_to_close_topic: "Quantitat mínima de banderes úniques necessàries per pausar automàticament un tema a una intervenció"
+    num_flags_to_close_topic: "Quantitat mínima de banderes actives necessàries per pausar automàticament un tema per a una intervenció"
+    auto_respond_to_flag_actions: "Activa resposta automàtica en rebutjar una bandera."
+    min_first_post_typing_time: "Quantitat mínima de temps en mil·lisegons que una persona pot escriure durant la primera publicació, si no s'assoleix el límit posterior la publicació passarà automàticament a la cua d'aprovació necessitats. Configura a 0 per desactivar (no recomanat)"
+    reply_by_email_enabled: "Activa la resposta a temes per correu."
+    reply_by_email_address: "Plantilla per respondre per correu una adreça de correu entrant, per exemple:  %{reply_key}@reply.example.com o replies+%{reply_key}@example.com"
+    alternative_reply_by_email_addresses: "Llista de plantilles alternatives per respondre per correu adreces de correu entrant. Per exemple: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
+    disable_emails: "Evita que Discourse enviï qualsevol mena de correus"
+    strip_images_from_short_emails: "Eliminar imatges de correus electrònics amb una mida inferior a 2800 bytes"
+    short_email_length: "Mostra la mida del correu en bits"
+    display_name_on_email_from: "Mostra noms sencers al correu des dels camps"
+    unsubscribe_via_email: "Permet a les persones cancel·lar la subscripció en enviar un correu amb 'unsubscribe' al tema o al cos del missatge"
+    unsubscribe_via_email_footer: "Adjunta una cancel·lació de subscripció per enllaç de correu al peu dels missatges enviats"
+    delete_email_logs_after_days: "Esborra els registres de correu després de (N) dies. 0 per mantenir-ho indefinidament"
+    max_emails_per_day_per_user: "Quantitat màxima de correus per enviar cada dia. 0 per inhabilitar el límit"
+    enable_staged_users: "Crea automàticament participants en escena en processar correus entrants."
+    maximum_staged_users_per_email: "Quantitat màxima de participants en escena en processar un correu entrant."
+    auto_generated_whitelist: "Llista d'adreces de correu que no es revisaran per a contingut auto-generat. Per exemple foo@bar.com|discourse@bar.com."
+    block_auto_generated_emails: "Bloca correus entrants identificats com a auto-generats."
+    ignore_by_title: "No facis cas dels correus entrants segons el seu títol."
+    mailgun_api_key: "Clau secreta API Mailgun emprada per verificar els missatges de ganxo de web."
+    soft_bounce_score: "Puntuació de rebot afegida a la persona quan hi ha un rebot temporal."
+    hard_bounce_score: "Puntuació de rebot afegida a la persona quan hi ha un rebot permanent."
+    bounce_score_threshold: "Puntuació màxima de rebot abans de permetre l'enviament d'un correu electrònic a una persona usuària."
+    bounce_score_threshold_deactivate: "Puntuació màxima de rebot abans de desactivar una persona usuària."
+    reset_bounce_score_after_days: "Restableix automàticament la puntuació de rebot després d'X dies."
+    attachment_content_type_blacklist: "Llista de paraules clau emprades a la llista negra d'adjunts basat en el tipus de contingut."
+    attachment_filename_blacklist: "Llista de paraules clau emprades a la llista negra d'adjunts basat en el nom de fitxer."
+    enable_forwarded_emails: "[BETA] Permet que les persones creïn un tema en reenviar un correu."
+    always_show_trimmed_content: "Mostra sempre la part retallada dels correus electrònics entrants. AVÍS: pot revelar adreces de correu electrònic."
+    manual_polling_enabled: "Empeny correus fent servir l'API per respondre correus."
+    pop3_polling_enabled: "Enquesta amb POP3 per a les respostes de correu electrònic."
+    pop3_polling_ssl: "Fes servir SSL en connectar amb el servidor POP3 (recomanat)."
+    pop3_polling_openssl_verify: "Verifica el certificat de servidor TLS (per defecte: activat)"
+    pop3_polling_period_mins: "El període en minuts entre revisar el compte POP3 per a correu. AVÍS: cal reiniciar."
+    pop3_polling_port: "El port per activar un compte d'enquestes POP3."
+    pop3_polling_host: "L'amfitrió per a enquestes amb POP3."
+    pop3_polling_username: "El nom de persona usuària per al compte POP3 per a enquestes amb correu."
+    pop3_polling_password: "La contrasenya per al compte POP3 per a enquestes amb correu."
+    log_mail_processing_failures: "Registra tots els errors de processar correu a http://yoursitename.com/logs"
+    email_in_min_trust: "El nivell de confiança mínim que una persona necessita per tal de tenir permís per publicar nous temes des del correu."
+    email_prefix: "[label] fet servir al tema dels correus. Per defecte serà 'títol' si no es configura."
+    email_site_title: "El títol del lloc fet servir com a remitent de correus des del lloc. Per defecte serà 'títol' si no es configura. Si el teu 'títol' conté caràcters no permesos, fes servir la configuració."
+    minimum_topics_similar: "Quants temes han d'existir abans no hi apareguin temes semblants quan es redacten nous temes."
+    relative_date_duration: "Quantitat de dies després de publicar on les dates de publicació seran visibles com a relatives (7d) en comptes d'absolutes (20 febrer)."
+    delete_user_max_post_age: "No permetis que s'esborrin persones usuàries amb una publicació de menys d'(x) dies."
+    delete_all_posts_max: "Quantitat màxima de publicacions que es poden esborrar d'un cop amb el botó \"Esborra totes les publicacions\". Si una persona en té una quantitat superior, les publicacions no podran esborrar-se d'un cop i la persona tampoc no podrà ser eliminada."
+    email_editable: "Permet que les persones canviïn la seva adreça de correu després del registre."
+    logout_redirect: "Ubicació on redirigir el navegador després de desconnectar (per exemple: http://somesite.com/logout)"
+    allow_uploaded_avatars: "Permet que les persones carreguin imatges de perfil personalitzades."
+    allow_animated_avatars: "Permet que les persones facin servir gifs animats a les fotos de perfil. ATENCIÓ: executa la tasca rastell avatars:refresh després de canviar aquesta configuració."
+    allow_animated_thumbnails: "Genera miniatures amb moviment de gifs animats."
+    default_avatars: "Adreces URL d'avatars que es faran servir per defecte per a les noves persones usuàries fins que es canviïn."
+    automatically_download_gravatars: "Descarrega Gravatars per a persones usuàries fins la creació d'un compte o el canvi de correu."
+    digest_topics: "Quantitat màxima de temes populars per mostrar al resum de correus."
+    digest_posts: "Quantitat màxima de publicacions populars per mostrar al resum de correus."
+    digest_other_topics: "Quantitat màxima de temes a mostrar a la secció \"Nou a temes i categories que segueixes\" del resum de correus."
+    digest_min_excerpt_length: "Extracte mínim de publicacions al resum de correus, en caràcters."
+    suppress_digest_email_after_days: "Elimina correus resumits per a persones no vistes al lloc durant més d'(n) dies."
+    digest_suppress_categories: "Elimina aquestes categories dels correus resumits."
+    disable_digest_emails: "Inhabilita correus resumits per a totes les persones."
+    email_accent_fg_color: "El color del text emprat al fons dels correus en HTML. Introdueix el nom d'un color ('blanc') o un valor hex ('#FFFFFF')."
+    email_link_color: "El color dels enllaços als correus en HTML. Introdueix el nom d'un color ('blau') o un valor hex ('#0000FF')."
+    detect_custom_avatars: "Comprovar o no si les persones han actualitzat les imatges personalitzades de perfil."
+    max_daily_gravatar_crawls: "Quantitat màxima de cops al dia que el Discourse revisarà Gravatar per personalitzar avatars."
+    public_user_custom_fields: "Una llista blanca de camps personalitzats que una persona por mostrar en públic."
+    staff_user_custom_fields: "Una llista blanca de camps personalitzats que una persona pot mostrar a l'equip."
+    enable_user_directory: "Facilita un directori perquè les persones hi naveguin."
+    enable_group_directory: "Facilita un directori perquè els grups hi naveguin."
+    allow_anonymous_posting: "Permet que les persones canviïn a mode anònim."
+    anonymous_posting_min_trust_level: "Nivell de confiança mínim necessari per activar la publicació anònima"
+    anonymous_account_duration_minutes: "Per tal de protegir l'anonimat crea un nou compte anònim per a cada persona cada N minuts. Per exemple: si està configurat a 600, tan bon punt faci 600 minuts des de la darrera publicació i la persona passi a l'anonimat, es crearà un nou compte anònim."
+    hide_user_profiles_from_public: "Inhabilita les targetes de persona usuària, perfils i directoris personals per a persones anònimes."
+    user_website_domains_whitelist: "El lloc web de la persona serà verificat enfront d'aquests dominis. Llista delimitada amb barra vertical."
+    allow_profile_backgrounds: "Permet que les persones carreguin fons de perfil."
+    sequential_replies_threshold: "Quantitat de publicacions que una persona ha de fer a la cel·la d'un tema abans no sigui advertida de fer massa respostes seqüencials."
+    get_a_room_threshold: "Quantitat de publicacions que una persona ha de fer a la mateixa persona al mateix tema abans no en sigui advertida."
+    enable_mobile_theme: "Els dispositius mòbils fan servir una plantilla compatible amb telefonia mòbil, amb la possibilitat de passar a la versió normal. Inhabilita-ho si vols fer servir una fulla d'estil personalitzada totalment compatible. "
+    dominating_topic_minimum_percent: "Quin percentatge de publicacions ha de fer una persona a un tema abans no sigui advertida sobre l'ús abusiu."
+    disable_avatar_education_message: "Inhabilita el missatge d'educació per canvi d'avatar."
+    suppress_uncategorized_badge: "No mostris el distintiu per a temes sense categoritzar al llistat de temes."
+    permalink_normalizations: "Aplica la següent expressió regular abans de coincidir enllaços permanents, per exemple:  /(topic.*)\\?.*/\\1 treurà les cadenes de consulta de les rutes de temes. El format és regex+string fes servir \\1 etc. per accedir a captures"
+    global_notice: "Mostra una bandera global d'avís URGENT, EMERGÈNCIA per a totes les visites, deixa-ho en blanc per ocultar-ho (HTML permès)."
+    disable_edit_notifications: "Inhabilita l'edició d'alertes de la persona usuària del sistema quan 'download_remote_images_to_local' estigui actiu."
+    automatically_unpin_topics: "Desclava temes automàticament quan la persona arribi al final."
+    read_time_word_count: "Recompte de paraules per minut per calcular el temps estimat de lectura."
+    topic_page_title_includes_category: "El títol del tema de la pàgina inclou el nom de la categoria."
+    native_app_install_banner: "Demana a les visites habituals si volen instal·lar l'app nativa del Discuourse."
+    max_prints_per_hour_per_user: "Quantitat màxima dimpressions de pàgina /print (deixa a 0 per inhabilitar)"
+    full_name_required: "Cal el camp de nom complet a un perfil personal."
+    enable_names: "Mostra el nom complet al perfil corresponent, targeta i correus personals. Inhabilita a tot arreu amagar nom complet."
+    display_name_on_posts: "Mostra el nom complet a les publicacions corresponents afegit a @username."
+    show_time_gap_days: "Si es fan dues publicacions amb molts dies de diferència, mostra la diferència de temps al tema."
+    short_progress_text_threshold: "Després que la quantitat de publicacions a un tema superi aquesta xifra, la barra de progrés només mostrarà la quantitat actual de publicacions. Si vols canviar l'amplada de la barra de progrés, has de modificar aquest valor."
+    default_code_lang: "Ressaltat de sintaxi del llenguatge de programació per defecte, aplicat a blocs de codi de GitHub (lang-auto, ruby, python, etcètera)."
+    warn_reviving_old_topic_age: "Es mostra un avís quan qualsevol comença una resposta a un tema on la darrera resposta té més dies que els assenyalats. Per inhabilitar-ho, deixa-ho a 0."
+    autohighlight_all_code: "Obliga l'ús de codi ressaltat per a tots els blocs de codi preformatat, fins i tot quan no n'hagin especificat el llenguatge."
+    highlighted_languages: "Regles incloses de ressaltat de sintaxi (atenció: incloure-hi massa llenguatges pot afectar el rendiment). Mira: https://highlightjs.org/static/demo/ per a una demostració."
+    embed_truncate: "Separa les publicacions incrustades."
+    allowed_href_schemes: "Esquemes permesos a enllaços a més de http i https."
+    embed_post_limit: "Quantitat màxima de publicacions per incrustar."
+    embed_username_required: "Cal el nom de persona usuària per crear un tema."
+    show_create_topics_notice: "Si el lloc té menys de 5 temes públics, mostra un avís demanant a l'administració que creï alguns temes."
+    delete_drafts_older_than_n_days: Elimina esborranys amb més d'(n) dies.
+    bootstrap_mode_min_users: "Quantitat mínima de persones necessàries per inhabilitar el mode d'arrencada (deia-ho a 0 per inhabilitar-ho)"
+    prevent_anons_from_downloading_files: "Evita que les persones anònimes puguin descarregar adjunts. ATENCIÓ: això evitarà que funcionin els adjunts del lloc que no siguin imatges"
+    slug_generation_method: "Tria un mètode de generació d'adreces amigables. 'encoded' generarà un percentatge de codificació. 'none' anul·larà totalment l'adreça amigable."
+    enable_emoji: "Activa emojo"
+    emoji_set: "Com t'agradaria el teu emoji?"
+    enforce_square_emoji: "Força una relació d'aspecte quadrat per a tots els emojis."
+    approve_post_count: "Cal aprovar la quantitat de publicacions d'una persona usuària nova o bàsica"
+    approve_unless_trust_level: "Cal aprovar les publicacions per a persones usuàries amb aquest nivell de confiança"
+    approve_new_topics_unless_trust_level: "Cal aprovar els nous temes per a persones amb aquest nivell de confiança"
+    notify_about_queued_posts_after: "Si hi ha publicacions que han estat esperant la revisió durant més d'aquesta quantitat d'hores, s'enviarà un correu a contact_email. Deixa-ho a 0 per inhabilitar aquests correus."
+    auto_close_messages_post_count: "Quantitat màxima de publicacions permeses a un missatge abans no es tanqui automàticament (a 0 per desactivar)"
+    auto_close_topics_post_count: "Quantitat màxima de publicacions permeses a un tema abans no es tanqui automàticament (a 0 per desactivar)"
+    code_formatting_style: "El botó de codi al compositor serà per defecte d'aquest estil de format de codi"
+    default_email_digest_frequency: "Amb quina freqüència les persones rebran els correus resumits per defecte."
+    default_include_tl0_in_digests: "Inclou publicacions de noves persones a correus resumits per defecte. Les persones ho poden canviar a les seves preferències."
+    default_email_private_messages: "Envia un correu s'enviïn missatges a la persona usuària per defecte."
+    default_email_direct: "Envia un correu quan se citi/respongui/mencioni la persona usuària o persones convidades per defecte."
+    default_email_mailing_list_mode: "Envia un correu per a cada nova publicació per defecte."
+    default_email_mailing_list_mode_frequency: "Per defecte, les persones que activen el mode llista de correu rebran correus amb aquesta freqüència."
+    disable_mailing_list_mode: "Inhabilita que es pugui activar el mode llista de correu."
+    default_email_always: "Envia un correu d'alerta fins i tot quan la persona està activa per defecte."
+    default_email_previous_replies: "Per defecte, inclou respostes prèvies als correus."
+    default_email_in_reply_to: "Per defecte, inclou extractes de publicacions respostes als correus."
+    default_other_new_topic_duration_minutes: "Condició global per defecte segons la qual es considera nou un tema."
+    default_other_auto_track_topics_after_msecs: "Temps global per defecte abans de seguir un tema automàticament."
+    default_other_notification_level_when_replying: "Nivell d'alerta global per defecte quan es respon a un tema."
+    default_other_external_links_in_new_tab: "Per defecte, obre enllaços externs a una nova pestanya."
+    default_other_enable_quoting: "Per defecte, habilita la resposta amb cita per a text destacat"
+    default_other_dynamic_favicon: "Per defecte, mostra el recompte de tema nou/actualitzat a una icona del navegador."
+    default_other_disable_jump_reply: "Per defecte, no saltis a la publicació d'una persona després que hagi respost."
+    default_other_like_notification_frequency: "Per defecte, avisa a les persones sobre els M'agrada."
+    default_topics_automatic_unpin: "Per defecte, desclava temes quan la persona arriba al final."
+    default_categories_watching: "Per defecte, el llistat de categories vistes."
+    default_categories_tracking: "Per defecte, llista de categories seguides."
+    default_categories_muted: "Per defecte, llista de categories silenciades."
+    default_categories_watching_first_post: "Per defecte, llista de categories on serà vista la primera publicació de cada nou tema."
+    allow_user_api_keys: "Permet la generació de claus API personals"
+    allow_user_api_key_scopes: "Llista d'àmbits permesos per a les claus API personals"
+    max_api_keys_per_user: "Quantitat màxima de claus API personals per participant"
+    min_trust_level_for_user_api_key: "Nivell de confiança necessari per generar claus API personals"
+    allowed_user_api_auth_redirects: "Adreça URL permesa de redirecció d'autenticació per a claus API personals"
+    allowed_user_api_push_urls: "Adreces URL permeses per dirigir el servidor a l'API personal "
+    tagging_enabled: "Activa etiquetes als temes?"
+    min_trust_to_create_tag: "Nivell mínim de confiança necessari per crear una etiqueta."
+    max_tags_per_topic: "Màxim d'etiquetes que es poden afegir a un tema."
+    max_tag_length: "Quantitat màxima de caràcters que es poden fer servir a una etiqueta."
+    max_tag_search_results: "Quantitat màxima de resultats per mostrar en cercar etiquetes."
+    show_filter_by_tag: "Mostra un desplegable per filtrar segons etiquetes un llistat de temes."
+    max_tags_in_filter_list: "Quantitat màxima d'etiquetes per mostrar al filtre desplegable. S'hi veuran les etiquetes més emprades."
+    tags_sort_alphabetically: "Mostra etiquetes per ordre alfabètic. Per defecte, es mostren ordenades per popularitat."
+    tag_style: "Estil visual per a principals distincions."
+    staff_tags: "Un llistat d'etiquetes que només l'equip pot aplicar"
+    min_trust_level_to_tag_topics: "Nivell de confiança mínim necessari per etiquetar temes"
+    suppress_overlapping_tags_in_list: "Si les etiquetes coincideixen exactament amb paraules als títols dels temes, no mostris l'etiqueta"
+    remove_muted_tags_from_latest: "No mostris temes etiquetats amb etiquetes silenciades al darrer llistat de temes."
+    company_short_name: "Nom de l'empresa (breu)"
+    company_full_name: "Nom de l'empresa (complet)"
+    company_domain: "Domini de l'empresa"
+    errors:
+      invalid_email: "Adreça de correu no vàlida."
+      invalid_username: "No hi ha cap participant amb aquest nom."
+      invalid_integer_min_max: "El valor ha de ser entre %{min} i %{max}."
+      invalid_integer_min: "El valor ha de ser %{min} o més gran."
+      invalid_integer_max: "El valor no pot ser més gran de %{max}."
+      invalid_integer: "El valor ha de ser un nombre enter."
+      regex_mismatch: "El valor no coincideix amb el format necessari."
+      must_include_latest: "El menú principal ha d'incloure la 'darrera' etiqueta."
+      invalid_string: "Valor no vàlid."
+      invalid_string_min_max: "Ha de ser d'entre %{min} i %{max} caràcters."
+      invalid_string_min: "Com a mínim ha de tenir %{min} caràcters."
+      invalid_string_max: "No ha de tenir més de %{max} caràcters."
+      invalid_reply_by_email_address: "El valor ha de tenir '%{reply_key}' i ser diferent del correu de notificació."
+      invalid_alternative_reply_by_email_addresses: "Tots els valors han d'incloure '%{reply_key}' i ser diferents del correu de notificació."
+      pop3_polling_host_is_empty: "Has de configurar 'pop3 polling host' abans d'activar enquestes POP3."
+      pop3_polling_username_is_empty: "Has de configurar 'pop3 polling username' abans d'activar enquestes POP3."
+      pop3_polling_password_is_empty: "Has de configurar 'pop3 polling password' abans d'activar enquestes POP3."
+      pop3_polling_authentication_failed: "L'autenticació POP3 ha fallat. Si us plau, verifica les teves credencials POP3."
+      reply_by_email_address_is_empty: "Has de configurar 'reply by email address' abans de respondre per correu."
+      email_polling_disabled: "Has de configurar enquestes POP3 o manuals abans de respondre per correu."
+      user_locale_not_enabled: "Has de configurar 'allow user locale' abans d'activar aquestes característiques."
+      invalid_regex: "Expressions regulars no són vàlides o no estan permeses."
+  search:
+    within_post: "#%{post_number} segons %{username}"
+    types:
+      category: 'Categories'
+      topic: 'Resultats'
+      user: 'Persones usuàries'
+  sso:
+    not_found: "No s'ha trobat el teu compte. Si us plau contacta amb l'administració del lloc."
+    account_not_approved: "El teu compte està pendent d'aprovació. Rebràs un correu d'alerta quan s'aprovi."
+    unknown_error: "Hi ha un problema amb el teu compte. Si us plau contacta amb l'administració del lloc."
+    timeout_expired: "La connexió del compte ha caducat, si us plau torna a provar-ho."
+  original_poster: "Ha publicat originalment"
+  most_posts: "Majoria de publicacions"
+  most_recent_poster: "Ha publicat més recentment"
+  frequent_poster: "Ha publicat amb freqüència"
+  redirected_to_top_reasons:
+    new_user: "Et donem la benvinguda a la nostra comunitat! Aquests són els temes populars més recents."
+    not_seen_in_a_month: "Et tornem a donar la benvinguda! No t'havíem vist durant un temps. Aquests són els temes populars des de la teva marxa."
+  merge_posts:
+    edit_reason:
+      one: "Una publicació ha estat fusionada per %{username}"
+      other: "%{count} publicacions han estat fusionades per %{username}"
+    errors:
+      different_topics: "Les publicacions que pertanyen a diferents temes no es poden fusionar."
+      different_users: "Les publicacions que pertanyen a diferents participants no es poden fusionar."
+  move_posts:
+    new_topic_moderator_post:
+      one: "Una publicació ha estat dividida a un nou tema: %{topic_link}"
+      other: "%{count} publicacions han estat dividides a un nou tema: %{topic_link}"
+    existing_topic_moderator_post:
+      one: "Una publicació ha estat fusionada a un tema existent: %{topic_link}"
+      other: "%{count} publicacions han estat fusionades a un tema existent: %{topic_link}"
+  change_owner:
+    post_revision_text: "Propietat transferida per %{old_user} a %{new_user}"
+    deleted_user: "una persona usuària esborrada"
+  topic_statuses:
+    archived_enabled: "Aquest tema ara està arxivat. Està congelat i no es pot canviar de cap manera."
+    archived_disabled: "Aquest tema ara està desarxivat. Ja no està congelat i es pot canviar."
+    closed_enabled: "Aquest tema ara està tancat. Ja no es permeten les noves respostes."
+    closed_disabled: "Aquest tema ara està obert. Es permeten les noves respostes."
+    autoclosed_message_max_posts:
+      one: "Aquest missatge es va tancar automàticament després d'arribar al límit màxim d'1 resposta."
+      other: "Aquest missatge es va tancar automàticament després d'arribar al límit màxim de %{count} respostes."
+    autoclosed_topic_max_posts:
+      one: "Aquest missatge es va tancar automàticament després d'arribar al límit màxim d'1 resposta."
+      other: "Aquest tema es va tancar automàticament després d'arribar al límit màxim de %{count} respostes."
+    autoclosed_enabled_days:
+      one: "Aquest missatge es va tancar automàticament després d'1 dia. Ja no es permeten les noves respostes."
+      other: "Aquest missatge es va tancar automàticament després de %{count} dies. Ja no es permeten les noves respostes."
+    autoclosed_enabled_hours:
+      one: "Aquest missatge es va tancar automàticament després d'1 hora. Ja no es permeten les noves respostes."
+      other: "Aquest missatge es va tancar automàticament després de %{count} hores. Ja no es permeten les noves respostes."
+    autoclosed_enabled_minutes:
+      one: "Aquest missatge es va tancar automàticament després d'1 minut. Ja no es permeten les noves respostes."
+      other: "Aquest missatge es va tancar automàticament després de %{count} minuts. Ja no es permeten les noves respostes."
+    autoclosed_enabled_lastpost_days:
+      one: "Aquest missatge es va tancar automàticament 1 dia després de la darrera resposta. Ja no es permeten les noves respostes."
+      other: "Aquest missatge es va tancar automàticament %{count} dies després de la darrera resposta. Ja no es permeten les noves respostes."
+    autoclosed_enabled_lastpost_hours:
+      one: "Aquest missatge es va tancar automàticament 1 hora després de la darrera resposta. Ja no es permeten les noves respostes."
+      other: "Aquest missatge es va tancar automàticament %{count} hores després de la darrera resposta. Ja no es permeten les noves respostes."
+    autoclosed_enabled_lastpost_minutes:
+      one: "Aquest missatge es va tancar automàticament 1 minut després de la darrera resposta. Ja no es permeten les noves respostes."
+      other: "Aquest missatge es va tancar automàticament %{count} minuts després de la darrera resposta. Ja no es permeten les noves respostes."
+    autoclosed_disabled: "Aquest tema ara està obert. Es permeten les noves respostes."
+    autoclosed_disabled_lastpost: "Aquest tema ara està obert. Es permeten les noves respostes."
+    pinned_enabled: "Aquest tema ara està clavat. Apareixerà al començament de la seva categoria fins que l'equip el desclavi per a tothom o ho facin les mateixes persones usuàries."
+    pinned_disabled: "Aquest tema ara està desclavat. Ja no apareixerà al començament de la seva categoria."
+    pinned_globally_enabled: "Aquest tema ara està destacat globalment. Apareixerà en primer lloc en la llista del seu categoria i en totes les llistes de temes fins que algú el desenganxi."
+    pinned_globally_disabled: "Aquest tema ara està desclavat. Ja no apareixerà al començament de la seva categoria."
+    visible_enabled: "Aquest tems ara està llistat. Es mostrarà als llistats de temes."
+    visible_disabled: "Aquest tema ja no està llistat. Ja no es mostrarà a cap llistat de temes. Només podrà ser accessible amb un enllaç directe."
+  login:
+    not_approved: "El teu compte encara no ha estat aprovat. Et notificarem per correu quan puguis connectar-t'hi."
+    incorrect_username_email_or_password: "Nom de persona usuària, correu electrònic o adreça IP incorrecte"
+    wait_approval: "Gràcies per registrar-t'hi. Et comunicarem quan s'aprovi el teu compte."
+    active: "El teu comte està activat i preparat per fer-lo servir."
+    not_activated: "Encara no pots iniciar sessió. T'hem enviat un correu d'activació. Si us plau, segueix les instruccions del correu per activar el teu compte."
+    not_allowed_from_ip_address: "No pots iniciar sessió com a %{username} des d'aquesta adreça IP."
+    admin_not_allowed_from_ip_address: "No pots iniciar sessió com a persona administradora des d'aquesta adreça IP."
+    suspended: "No pots iniciar sessió fins a %{date}."
+    suspended_with_reason: "Compte suspès fins a %{date}: %{reason}"
+    errors: "%{errors}"
+    not_available: "No disponible. Prova %{suggestion}?"
+    something_already_taken: "Alguna cosa ha anat malament, potser nom de persona usuària ja ha estat registrat. Prova-ho amb l'enllaç de contrasenya oblidada"
+    omniauth_error: "Disculpa, s'ha produït una errada en autoritzar el teu compte. Que potser no has aprovat l'autorització?"
+    omniauth_error_unknown: "Alguna cosa ha fallat en processar el teu inici de sessió. Si us plau, torna a provar-ho."
+    authenticator_error_no_valid_email: "No es permeten adreces de correu associades amb %{account}. Et pot caldre configurar el teu compte amb una adreça de correu diferent."
+    new_registrations_disabled: "Ara mateix no es permeten els registres de nous comptes."
+    password_too_long: "Les contrasenyes es limiten a 200 caràcters."
+    email_too_long: "El correu que has facilitat és massa llarg. Els noms d'adreces de correu no han de tenir més de 254 caràcters i els noms de dominis no n'han de tenir més de 253."
+    reserved_username: "No es permet el nom de persona usuària."
+    missing_user_field: "No has completat tots els camps."
+    already_logged_in: "Ui, sembla que estàs provant d'acceptar una invitació per a una altra persona usuària. Si no ets %{current_user}, si us plau surt i torna a provar-ho."
+  user:
+    no_accounts_associated: "No hi ha comptes associats"
+    deactivated: "Ha estat desactivat per massa correus retornats a to '%{email}'."
+    deactivated_by_staff: "Desactivat per l'equip"
+    activated_by_staff: "Activat per l'equip"
+    username:
+      short: "ha de tenir almenys %{min} caràcters"
+      long: "no ha de ser més llarg de %{max} caràcters"
+      unique: "ha de ser únic"
+      blank: "ha de ser actual"
+      must_begin_with_alphanumeric_or_underscore: "ha de començar amb una lletra, una xifra o un guió baix"
+      must_end_with_alphanumeric: "ha d'acabar amb una lletra o una xifra"
+      must_not_contain_two_special_chars_in_seq: "no ha d'incloure-hi una seqüència de 2 o més caràcters especials (.-_)"
+      must_not_end_with_confusing_suffix: "no ha d'acabar amb un sufix complex, com ara .json o .png,  etcètera."
+    email:
+      not_allowed: "no està permès per aquest proveïdor de correu. Si us plau, fes servir una altra adreça de correu."
+      blocked: "no es permet"
+      revoked: "No s'enviaran correus a '%{email}' fins a %{date}."
+    ip_address:
+      blocked: "No es permeten nous registres des de la teva adreça IP."
+      max_new_accounts_per_registration_ip: "No es permeten els nous registres des de la teva adreça IP (límit màxim assolit). Contacta amb l'equip."
+    website:
+      domain_not_allowed: "El lloc web no és vàlid. Els dominis permesos són: %{domains}"
+  flags_reminder:
+    subject_template:
+      one: "1 bandera esperant ser tractada"
+      other: "%{count} banderes esperant ser tractades"
+  unsubscribe_mailer:
+    title: "Cancel·la la subscripció del remitent"
+    subject_template: "Confirma que no vols rebre més actualitzacions per correu des de %{site_title}"
+  invite_mailer:
+    title: "convida remitent"
+  custom_invite_mailer:
+    title: "Personalitza convidar remitent"
+  invite_forum_mailer:
+    title: "Convida remitent de fòrum"
+  invite_password_instructions:
+    title: "Convida instruccions de contrasenya"
+    subject_template: "Estableix contrasenya per al teu compte de %{site_name}"
+  test_mailer:
+    title: "Prova remitent"
+    text_body_template: |
+      Aquest és un correu de
+
+      [**%{base_url}**][0]
+
+      La subministrabilitat del correu és complicada. Aquí hi ha algunes coses importants que hauries de revisar primer:
+
+      - "Assegura't" de d'establir correctament el de: de `notification email` a la teva configuració del lloc. **El domini especificat a l'adreça "de" dels correus que enviïs és el domini que tornarà a validar-se**.
+
+      - Sàpigues com veure el codi font dels missatges al teu client de correu, per tal que puguis examinar els encapçalaments per a pistes importants. A Gmail, es mostra a l'opció  "mostra l'original" al menú desplegable de la part superior dreta de cada missatge.
+
+      - **IMPORTANT:** La teva ISP té un registre de DNS inversa per associar els noms de dominis i les adreces IP que envies des del correu? [Prova el teu registre Revers PTR][2] aquí. Si la teva ISP no introdueix el registre adequat de DNS inversa, no és gaire provable que rebis cap correu.
+
+      - És correcte el [registre SPF][8] de domini? [Prova el teu registre SPF][1] aquí. Fixa't que TXT és el registre correcte oficial per a SPF.
+
+      - És correcte el teu domini [DKIM record][3]? Això millorarà força la lliurabilitat del correu. [Test your DKIM record][7] here.
+
+      - Si executes el teu propi servidor de correu, revisa per assegurar-te que les IP del teu servidor de correu no són [a cap de les meves llistes negres][4]. Verifica també que segur que envia un nom d'amfitrió totalment qualifiicat que resol la DNS al seu missatge HELO. En cas contrari, això farà que el teu correu sigui rebutjat per molts serveis de correu.
+
+      - Et recomanem **envia un correu de prova a [mail-tester.com][mt]** per tal de verificar que tot l'esmentat funcioni correctament.
+
+      (La manera "fàcil* és crear un compte lliure a [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] o [Mailjet][mj], que són generosos amb plans de correu gratuïts i funcionarà per a la majoria de comunitats petites. Encara et caldrà configurar els registres SPF i DKIM a la teva DNS!)
+
+      Esperem que hagis rebut correctament aquesta prova de subministrabilitat de correu!
+
+      Bona sort,
+
+      La teva gent a [Discourse](http://www.discourse.org)
+
+      [0]: %{base_url}
+      [1]: http://www.kitterman.com/spf/validate.html
+      [2]: http://mxtoolbox.com/ReverseLookup.aspx
+      [3]: http://www.dkim.org/
+      [4]: http://whatismyipaddress.com/blacklist-check
+      [7]: https://www.mail-tester.com/spf-dkim-check
+      [8]: http://www.openspf.org/SPF_Record_Syntax
+      [sg]: https://goo.gl/r1WMF6
+      [sp]: https://www.sparkpost.com/
+      [mg]: http://www.mailgun.com/
+      [mj]: https://www.mailjet.com/pricing
+      [mt]: http://www.mail-tester.com/
+  new_version_mailer:
+    title: "Nova versió remitent"
+  new_version_mailer_with_notes:
+    title: "Nova versió remitent amb notes"
+  flag_reasons:
+    off_topic: "La teva publicació ha estat abanderada com a **fora de context**: la comunitat troba que no encaixa amb el tema, tal i com el defineix el títol i la primera publicació."
+    inappropriate: "La teva publicació ha estat abanderada com a **inapropiada**: la comunitat troba que és ofensiva, abusiva o una violació de [les nostres normes de comunitat](/guidelines)."
+    spam: "La teva publicació ha estat abanderada com a **brossa**: la comunitat troba que és un anunci, que és de tipus publicitari en comptes de ser útil o important per al tema, com s'esperava."
+    notify_moderators: "La teva publicació ha estat abanderada per a **consideració moderadora**: la comunitat troba que la publicació necessita la intervenció de l'equip."
+  flags_dispositions:
+    agreed: "Gràcies per fer-nos-ho saber. Estem d'acord que hi ha alguna cosa i ens ho estem mirant."
+    agreed_and_deleted: "Gràcies per fer-nos-ho saber. Estem d'acord que hi ha alguna cosa i hem eliminat la publicació."
+    disagreed: "Gràcies per fer-nos-ho saber. Ens ho estem mirant."
+    deferred: "Gràcies per fer-nos-ho saber. Ens ho estem mirant."
+    deferred_and_deleted: "Gràcies per fer-nos-ho saber. Hem eliminat la publicació."
+  system_messages:
+    post_hidden:
+      title: "Publicació oculta"
+      subject_template: "Publicació ocultada per banderes de la comunitat"
+    welcome_user:
+      title: "Benvinguda a la persona usuària"
+      subject_template: "Et donem la benvinguda a %{site_name}!"
+    welcome_invite:
+      title: "Benvinguda a la persona convidada"
+      subject_template: "Et donem la benvinguda a %{site_name}!"
+    backup_succeeded:
+      title: "Còpia de seguretat reeixida"
+      subject_template: "Còpia de seguretat completada amb èxit"
+      text_body_template: |
+        La còpia de seguretat ha estat reeixida.
+
+        Visita [admin > secció de còpia de seguretat](%{base_url}/admin/backups) per desar la nova còpia de seguretat.
+
+        Aquí tens el registre:
+
+        ```text
+        %{logs}
+        ```
+    backup_failed:
+      title: "La còpia de seguretat ha fallat"
+      subject_template: "La còpia de seguretat ha fallat"
+      text_body_template: |
+        Ha fallat la còpia de seguretat.
+
+        Aquí tens el registre:
+
+        ```text
+        %{logs}
+        ```
+    restore_succeeded:
+      title: "Restauració reeixida"
+      subject_template: "Restauració completament reeixida"
+      text_body_template: |
+        Restauració reeixida.
+
+        Aquí tens el registre:
+
+        ```text
+        %{logs}
+        ```
+    restore_failed:
+      title: "Ha fallat la restauració"
+      subject_template: "Ha fallat la restauració"
+      text_body_template: |
+        Ha fallat la restauració.
+
+        Aquí tens el registre:
+
+        ```text
+        %{logs}
+        ```
+    bulk_invite_succeeded:
+      title: "Invitació massiva reeixida"
+      subject_template: "Invitació personal massiva processada amb èxit"
+      text_body_template: "El fitxer de la teva invitació personal massiva ha estat processat, %{sent} invitacions enviades."
+    bulk_invite_failed:
+      title: "Invitació massiva fallida"
+      subject_template: "Invitació personal massiva amb errors"
+    csv_export_succeeded:
+      title: "Exportació de CSV reeixida"
+      subject_template: "Exportació de dades completa"
+      text_body_template: |
+        La teva exportació de dades ha estat reeixida! :dvd:
+
+        <a class="attachment" href="%{download_link}">%{file_name}</a> (%{file_size})
+
+        L'enllaç anterior funcionarà durant 48 hores.
+
+        Les dades estan comprimides en format gzip. Si el fitxer no s'extreu sol en obrir-lo, fes servir les eines recomanades aquí: http://www.gzip.org/#faq4
+    csv_export_failed:
+      title: "Ha fallat l'exportació de CSV "
+      subject_template: "Ha fallat l'exportació de dades"
+    email_reject_insufficient_trust_level:
+      title: "Correu rebutjat per nivell de confiança insuficient"
+    email_reject_user_not_found:
+      title: "Correu rebutjat per no trobar la persona usuària"
+    email_reject_screened_email:
+      title: "Correu rebutjat per correus revisats"
+    email_reject_inactive_user:
+      title: "Correu rebutjat per persona inactiva"
+      text_body_template: |
+        Disculpa, però no ha funcionat el teu missatge de correu a %{destination} (titled %{former_title}).
+
+        El teu compte associat a aquest correu no està activat. Si us plau, activa el teu compte abans d'enviar-hi correus.
+    email_reject_reply_user_not_matching:
+      title: "Correu rebutjat per persona no coincident"
+    email_reject_no_account:
+      title: "Correu rebutjat per compte desconegut"
+    email_reject_empty:
+      title: "Correu rebutjat per buit"
+      text_body_template: |
+        Disculpa, però no ha funcionat el teu missatge de correu a %{destination} (titled %{former_title}).
+
+        No hem pogut trobar cap contingut al teu correu.
+
+        Si has rebut això i hi_has_inclòs_una_resposta, torna a provar-ho amb una altre format.
+    email_reject_parsing:
+      title: "Correu rebutjat per anàlisi de dades"
+      text_body_template: |
+        Disculpa, però no ha funcionat el teu missatge de correu a %{destination} (titled %{former_title}).
+
+        No hem pogut trobar la teva resposta al correu. **Assegura't que la teva resposta és al començament del correu** --no podem processar respostes entre línies.
+    email_reject_invalid_access:
+      title: "Correu rebutjat per accés no vàlid"
+    email_reject_strangers_not_allowed:
+      title: "Correu rebutjat per aliè"
+    email_reject_invalid_post:
+      title: "Correu rebutjat per publicació no vàlida"
+      text_body_template: |
+        Disculpa, però no ha funcionat el teu missatge de correu a %{destination} (titulat %{former_title}).
+
+        Alguns possibles motius són: missatge massa larg o massa curt. Si us plau, torna a provar-ho o publica des del lloc web si això persisteix.
+    email_reject_invalid_post_specified:
+      title: "Correu rebutjat per publicació no vàlida"
+      text_body_template: |
+        Disculpa, però no ha funcionat el teu missatge de correu a %{destination} (titulat %{former_title}).
+
+        Motiu:
+
+        %{post_error}
+
+        Si pots solucionar el problema, torna a provar-ho.
+    email_reject_invalid_post_action:
+      title: "Correu rebutjat per acció de publicació no vàlida"
+      text_body_template: |
+        Disculpa, però no ha funcionat el teu missatge de correu a %{destination} (titulat %{former_title}).
+
+        L'acció de publicació no ha estat reconeguda. Si us plau, torna a provar-ho o publica des del lloc web si això persisteix.
+    email_reject_reply_key:
+      title: "Correu rebutjat per clau de resposta"
+    email_reject_bad_destination_address:
+      title: "Correu rebutjat per adreça destinatària no vàlida"
+    email_reject_topic_not_found:
+      title: "Correu rebutjat per no tema no trobat"
+    email_reject_topic_closed:
+      title: "Correu rebutjat per no tema tancat"
+    email_reject_auto_generated:
+      title: "Correu rebutjat per autogenerat"
+    email_error_notification:
+      title: "Alerta d'error de correu"
+      text_body_template: |
+        Malauradament, hi ha hagut un error d'autenticació en sondejar els correus des del servidor POP.
+
+        Si us plau, assegura't que has configurat correctament les credencials POP a [the site settings](%{base_url}/admin/site_settings/category/email).
+
+        Si hi ha una interfície usuària per al compte de correu POP, potser et caldrà iniciar sessió al web i revisar-hi la teva configuració.
+    too_many_spam_flags:
+      title: "Massa banderes de brossa"
+      subject_template: "Nou compte en espera"
+    too_many_tl3_flags:
+      title: "Massa banderes de nivell de confiança 3"
+      subject_template: "Nou compte en espera"
+    pending_users_reminder:
+      title: "Recordatori de persones pendents"
+      subject_template:
+        one: "1 persona esperant aprovació"
+        other: "%{count} persones esperant aprovació"
+      text_body_template: |
+        Hi ha registres de noves persones esperant l'aprovació (o el refús) abans d'accedir a aquest fòrum.
+
+        [Si us plau, revisa-les a la secció d'administració](%{base_url}/admin/users/list/pending).
+    download_remote_images_disabled:
+      title: "Descarrega imatges remotes inhabilitades"
+      subject_template: "Descarregant imatges remotes inhabilitades"
+      text_body_template: "S'ha inhabilitat la configuració `download_remote_images_to_local` perquè s'ha arribat al límit de l'espai al disc de `download_remote_images_threshold`."
+    dashboard_problems:
+      title: "Problemes del tauler de control"
+      subject_template: "S'hi han trobat problemes"
+      text_body_template: |
+        S'ha informat d'alguns problemes al teu tauler de control d'administració.
+
+        [Si us plau, revisa'ls i soluciona'ls](%{base_url}/admin).
+  unsubscribe_link: |
+    Per cancel·lar la subscripció d'aquests correus, [clica aquí](%{unsubscribe_url}).
+  unsubscribe_link_and_mail: |
+    Per cancel·lar la subscripció d'aquests correus, [clica aquí](%{unsubscribe_url}).
+  unsubscribe_mailing_list: |
+    Estàs rebent això perquè has activat el mode de llista de correu.
+
+    Per cancel·lar la subscripció d'aquests correus, [clica aquí](%{unsubscribe_url}).
+  subject_re: "Re: "
+  subject_pm: "[MP]"
+  user_notifications:
+    previous_discussion: "Respostes anteriors"
+    in_reply_to: "En resposta a "
+    unsubscribe:
+      title: "Cancel·la la subscripció!"
+      description: "No t'interessa rebre aquests correus? Cap problema! Clica tot seguit per cancel·lar la subscripció al moment:"
+    reply_by_email: "[Visita tema](%{base_url}%{url}) o respon aquest correu per respondre."
+    reply_by_email_pm: "[Visita missatge](%{base_url}%{url}) o respon aquest correu per respondre."
+    only_reply_by_email: "Respon aquest correu per reaccionar."
+    visit_link_to_respond: "[Visita tema](%{base_url}%{url}) per reaccionar."
+    visit_link_to_respond_pm: "[Visita missatge](%{base_url}%{url}) per reaccionar."
+    posted_by: "Publicat per %{username} a %{post_date}"
+    user_invited_to_private_message_pm:
+      title: "Persona convidada a missatge privat"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_private_message_pm_staged:
+      title: "Persona convidada a missatge privat"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_topic:
+      title: "Persona convidada a tema"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_replied:
+      title: "Persona resposta"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_replied_pm:
+      title: "Resposta de la persona al MP"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_quoted:
+      title: "Persona citada"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_linked:
+      title: "Persona enllaçada"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_mentioned:
+      title: "Persona mecionada"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_group_mentioned:
+      title: "Grup de la persona mencionat"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted:
+      title: "La persona ha publicat"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_watching_first_post:
+      title: "La persona ha mirat la primera publicació"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted_pm:
+      title: "La persona ha publicat un MP"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted_pm_staged:
+      title: "Persona ha publicat un MP"
+      subject_template: "%{optional_re}%{topic_title}"
+      text_body_template: |2
+
+        %{message}
+    digest:
+      why: "Un breu resum de %{site_link} des de la teva darrera visita a %{last_seen_at}"
+      since_last_visit: "Des de la teva darrera visita"
+      new_topics: "Nous temes"
+      unread_messages: "Missatges sense llegir"
+      unread_notifications: "Alertes sense llegir"
+      liked_received: "M'agrades rebuts"
+      new_posts: "Noves publicacions"
+      new_users: "Noves persones usuàries"
+      popular_topics: "Temes populars"
+      follow_topic: "Segueix aquest tema"
+      join_the_discussion: "Llegeix-ne més"
+      popular_posts: "Publicacions populars"
+      more_new: "Nou per a tu"
+      click_here: "cilca aquí"
+      from: "%{site_name} resum"
+      preheader: "Un breu resum des de la teva darrera visita a %{last_seen_at}"
+    forgot_password:
+      title: "Contrasenya oblidada"
+    set_password:
+      title: "Estableix la contrasenya"
+    admin_login:
+      title: "Iniciar sessió d'administració"
+    account_created:
+      title: "Compte creat"
+    confirm_new_email:
+      title: "Confirma el nou correu"
+    confirm_old_email:
+      title: "Confirma l'antic correu"
+    notify_old_email:
+      title: "Notifica correu antic"
+      text_body_template: |
+        Aquest és un missatge automàtic per fer-te saber que ha canviat el teu correu per a
+        %{site_name}. Si això s'ha fet per equivocació, si us plau posa't en contacte
+        amb el lloc administrador.
+
+        La teva adreça de correu ha canviat a:
+
+        %{new_email}
+    signup_after_approval:
+      title: "Registre després d'aprovació"
+      subject_template: "T'hem aprovat a %{site_name}!"
+    signup:
+      title: "Registre"
+  page_not_found:
+    title: "Ups! Aquesta pàgina no existeix o és privada."
+    popular_topics: "Popular"
+    recent_topics: "Recent"
+    see_more: "Més"
+    search_title: "Busca aquest lloc"
+    search_google: "Google"
+  terms_of_service:
+    title: "Condicions d'ús"
+    signup_form_message: 'He llegit i accepto les <a href="/tos" target="_blank">Condicions del servei</a>.'
+  deleted: 'esborrat'
+  upload:
+    edit_reason: "còpia local d'imatges descarregada"
+    unauthorized: "Disculpa, el fitxer que estàs provant de carregar no està autoritzat (les extensions autoritzades són: %{authorized_extensions})."
+    pasted_image_filename: "Imatge enganxada"
+    store_failure: "Ha fallat la càrrega #%{upload_id} per a la persona #%{user_id}."
+    file_missing: "Disculpa, has de facilitar un fitxer per carregar"
+    attachments:
+      too_large: "Disculpa, el fitxer que proves de carregar és massa gran (la mida màxima és %{max_size_kb}KB)."
+    images:
+      too_large: "Disculpa, la imatge que proves de carregar és massa gran (la mida màxima és %{max_size_kb}KB). Si us plau, redimensiona-la i torna a provar-ho."
+      larger_than_x_megapixels: "Disculpa, la imatge que proves de carregar és massa gran (la mida màxima és %{max_image_megapixels}-megapixels). Si us plau, redimensiona-la i torna a provar-ho."
+      size_not_found: "Disculpa, però no podem determinar la mida de la teva imatge. Que potser la imatge està malmesa?"
+  avatar:
+    missing: "Disculpa, no podem trobar cap avatar associat amb aquesta adreça de correu. Que pots provar de tornar a carregar-ho?"
+  flag_reason:
+    sockpuppet: "Una nova persona ha creat un tema i una altra amb la mateixa adreça IP  (%{ip_address}) ha respost. Mira la configuració <a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
+    spam_hosts: "Aquesta nova persona ha creat moltes publicacions amb enllaços al mateix domini (%{domain}). Mira la configuració <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
+  email_log:
+    post_user_deleted: "La persona de la publicació ha estat eliminada"
+    no_user: "No es pot trobar la persona amb id %{user_id}"
+    anonymous_user: "La persona és anònima"
+    suspended_not_pm: "Aquesta persona està suspesa, sense missatge "
+    seen_recently: "S'ha vist la persona recentment"
+    post_not_found: "No es pot trobar una publicació amb id %{post_id}"
+    notification_already_read: "Ja s'ha llegit la notificació sobre aquest correu"
+    topic_nil: "post.topic és ul"
+    post_deleted: "la persona autora va esborrar la publicació "
+    user_suspended: "la persona va ser suspesa"
+    already_read: "la persona ja ha llegit aquesta publicació"
+    exceeded_emails_limit: "S'ha excedit exceeded max_emails_per_day_per_user"
+    exceeded_bounces_limit: "S'ha excedit bounce_score_threshold"
+    message_blank: "missatge és buit"
+    message_to_blank: "message.to és buit"
+    text_part_body_blank: "text_part.body és buit"
+    body_blank: "el cos és buit"
+    no_echo_mailing_list_mode: "S'han inhabilitat les alertes de llista de correu per a les publicacions pròpies"
+  color_schemes:
+    base_theme_name: "Base"
+  about: "Sobre"
+  guidelines: "Guies"
+  privacy: "Privacitat"
+  edit_this_page: "Edita aquesta pàgina"
+  csv_export:
+    boolean_yes: "Sí"
+    boolean_no: "No"
+  static_topic_first_reply: |
+    Edita la primera publicació a aquest tema per canviar els continguts de la pàgina %{page_name}.
+  guidelines_topic:
+    title: "Guies/Preguntes frqüents"
+  tos_topic:
+    title: "Condicions del Servei"
+    body: |
+      The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement").
+
+      Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by %{company_name}, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old.
+
+      <a name="1"></a>
+
+      ## [1. Your %{company_domain} Account](#1)
+
+      If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify %{company_name} of any unauthorized uses of your account or any other breaches of security. %{company_name} will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions.
+
+      <a name="2"></a>
+
+      ## [2. Responsibility of Contributors](#2)
+
+      If you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, "Content"), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that:
+
+      *   the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party;
+      *   if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content;
+      *   you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms;
+      *   the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content;
+      *   the Content is not spam, is not machine- or randomly-generated, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing);
+      *   the Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party;
+      *   your content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods;
+      *   your content is not named in a manner that misleads your readers into thinking that you are another person or company; and
+      *   you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by %{company_name} or otherwise.
+
+      <a name="3"></a>
+
+      ## [3. User Content License](#3)
+
+      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid.
+
+
+      <a name="4"></a>
+
+      ## [4. Payment and Renewal](#4)
+
+      ### General Terms
+
+      Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable.
+
+      ### Automatic Renewal
+
+      Unless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time.
+
+      <a name="5"></a>
+
+      ## [5. Services](#5)
+
+      ### Hosting, Support Services
+
+      Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.
+
+      <a name="6"></a>
+
+      ## [6. Responsibility of Website Visitors](#6)
+
+      %{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.
+
+      <a name="7"></a>
+
+      ## [7. Content Posted on Other Websites](#7)
+
+      We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages.
+
+      <a name="8"></a>
+
+      ## [8. Copyright Infringement and DMCA Policy](#8)
+
+      As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}.
+
+      <a name="9"></a>
+
+      ## [9. Intellectual Property](#9)
+
+      This Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks.
+
+      <a name="10"></a>
+
+      ## [10. Advertisements](#10)
+
+      %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.
+
+      <a name="11"></a>
+
+      ## [11. Attribution](#11)
+
+      %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased.
+
+      <a name="12"></a>
+
+      ## [12. Changes](#12)
+
+      %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement.
+
+      <a name="13"></a>
+
+      ## [13. Termination](#13)
+
+      %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.
+
+      <a name="14"></a>
+
+      ## [14. Disclaimer of Warranties](#14)
+
+      The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
+
+      <a name="15"></a>
+
+      ## [15. Limitation of Liability](#15)
+
+      In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.
+
+      <a name="16"></a>
+
+      ## [16. General Representation and Warranty](#16)
+
+      You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.
+
+      <a name="17"></a>
+
+      ## [17. Indemnification](#17)
+
+      You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement.
+
+      <a name="18"></a>
+
+      ## [18. Miscellaneous](#18)
+
+      This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.
+
+      This document is CC-BY-SA. It was last updated May 31, 2013.
+
+      Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/).
+  privacy_topic:
+    title: "Política de Privacitat"
+  badges:
+    editor:
+      name: Editor
+      description: Edita la primera publicació
+      long_description: |
+        Aquest distintiu es concedeix el primer cop que edites una de les teves publicacions. Com no sempre podràs editar-les, fer-ho ara és una bona idea. Pots millorar-les, corregir petits errors o afegir qualsevol cosa que vas oblidar en publicar originalment. Edita per millorar encara més les teves publicacions!
+    basic_user:
+      name: Bàsic
+      description: Totes les funcions essencials de la comunitat <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">concedides</a>
+      long_description: |
+        Aquest distintiu es concedeix quan arribes al nivell 1 de confiança. Gràcies pel teu temps dedicat a llegir un grapat de temes i saber de què va la nostra comunitat. S'han aixecat les teves restriccions de nova persona usuària; t'hem concedit totes les capacitats essencials de la comunitat, com els missatges personals, les banderes, edició de wiki i la possibilitat de publicar múltiples imatges i enllaços.
+    member:
+      name: Membre
+      description: Invitacions, missatges de grups i més m'agrades <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">concedits</a>
+      long_description: |
+        Aquest distintiu es concedeix quan arribes al nivell 2 de confiança. Gràcies per participar durant setmanes per afegir-te de debò a la nostra comunitat. Ara pots enviar invitacions des de la teva pàgina personal o temes individuals, crear missatges personals en grup i donar uns pocs més m'agrades cada dia.
+    regular:
+      name: Ordinari
+      description: Recategoritzar, reanomenar, enllaços seguits, wiki, més m'agrades <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">concedits</a>
+      long_description: |
+        Aquest distintiu es concedeix quan arribes al nivell 3 de confiança. Gràcies per formar part de la nostra comunitat durant mesos. Ara ets una de les persones més actives en lectura i contribucions, a més de fer gran la nostra comunitat. Ara pots recategoritzar i reanomenar temes, aprofitar les banderes més potents de brossa, l'accés a l'àrea privada de saló i també rebràs cada dia més m'agrades.
+    leader:
+      name: Líder
+      description: Edició global, clavar, tancar, arxivar, dividir i fusionar, més m'agrades <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">condedits</a>
+      long_description: |
+        Aquest distintiu es concedeix quan has arribat al nivell de confiança 4. Lideres aquesta comunitat tal i com ha triat l'equip i ets un exemple positiu amb les teves paraules i accions per a la resta de la comunitat. Tens la possibilitat d'editar totes les publicacions, prendre accions moderadores típiques com ara clavar, desllistar, arxivar, dividir i fusionar i cada dia tens muntanyes de m'agrades.
+    welcome:
+      name: Benvinguda
+      description: Ha rebut un m'agrada
+      long_description: |
+        Aquesta distinció es concedeix quan reps el teu primer m'agrada a una publicació. Enhorabona, has publicat alguna cosa que la resta de la teva comunitat considera interessant, bonic o útil.
+    autobiographer:
+      name: Autobiògraf
+    anniversary:
+      name: Aniversary
+      description: Membre amb activitat d'un any, ha publicat almenys un cop
+      long_description: |
+        Aquest distintiu es concedeix quan has tingut activitat durant un any amb almenys una publicació. Gràcies per contribuir a la comunitat. Sense tu no ho aconseguiríem.
+    nice_post:
+      name: Bonica resposta
+      description: Ha rebut 10 m'agrades a una resposta
+      long_description: |
+        Aquest distintiu es concedeix quan la teva resposta arriba a 10 m'agrades. La teva resposta ha impressionat la comunitat i ha ajudat a empènyer la conversa!
+    good_post:
+      name: Bona resposta
+      description: Ha rebut 25 m'agrades a una resposta
+      long_description: |
+        Aquest distintiu es concedeix quan la teva resposta arriba a 25 m'agrades. La teva resposta ha estat excepcional ha fet la conversa millor per a tothom!
+    great_post:
+      name: Gran resposta
+      description: Ha rebut 50 m'agrades a una resposta
+      long_description: |
+        Aquest distintiu es concedeix quan la teva resposta arriba a 50 m'agrades. La teva resposta és font d'inspiració i fascinant i la comunitat se l'estima!
+    nice_topic:
+      name: Bonic tema
+      description: Ha rebut 10 m'agrades a un tema
+      long_description: |
+        Aquest distintiu es concedeix quan el teu tema arriba a 10 m'agrades. Ep, has començat una conversa interessant i la comunitat en gaudeix!
+    good_topic:
+      name: Bon tema
+      description: Ha rebut 25 m'agrades a un tema
+      long_description: |+
+        Aquest distintiu es concedeix quan el teu tema arriba a 25 m'agrades. Has encetat una conversa vibrant que la comunitat s'estima i comparteix!
+
+    great_topic:
+      name: Gran tema
+      description: Ha rebut 50 m'agrades a un tema
+      long_description: |+
+        Aquest distintiu es concedeix quan el teu tema arriba a 50 m'agrades. Has provocat una conversa fascinant i la comunitat en gaudeix del dinamisme!
+
+    nice_share:
+      name: Bonica compartició
+      description: Publicació compartida amb 25 visites úniques
+      long_description: |
+        Aquesta insígnia es concedeix quan comparteixes un enllaç que visiten 25 visitants externs. Bona feina! Compartir enllaços a discussions amb amics és una gran manera de fer créixer la nostra comunitat.
+    good_share:
+      name: Bona compartició
+      description: Publicació compartida amb 300 visites úniques
+      long_description: |
+        Aquesta insígnia es concedeix quan comparteixes un enllaç a una entrada que ha estat visitat per 300 visitants externs. Has mostrat una discussió a molta gent nova i ens has ajudat a créixer.
+    great_share:
+      name: Gran compartició
+      description: Publicació compartida amb 1000 visites úniques
+      long_description: |
+        Aquesta insígnia es concedeix quan comparteixes un enllaç que és visitat per 1000 visitants externs. Uau! Has promocionat una discussió a una nova audiència, la qual cosa ha ajudat a fer créier la comunitat.
+    first_like:
+      name: Primer M'agrada
+      description: Publicació agradada
+      long_description: |
+        Aquesta insígnia es concedeix quan poses m'agrada per primera vegada usant el botó de :heart:. Posar m'agrada a les entrades és una gran manera de fer saber als membres de la comunitat que la seva entrada t'ha resultat interessant o divertida. Comparteix l'amor!
+    first_flag:
+      name: Primera bandera
+      description: Ha abanderat una publicació
+      long_description: |
+        Aquest distintiu es concedeix el primer cop que abanderes una publicació. La manera d'ajudar tothom i mantenir-ho tot net i polit és abanderant. Si observes publicacions que necessiten activitat moderadora per qualsevol motiu, no dubtis en abanderar-les. També pots abanderar per enviar <b>missatges personals</b> a altres persones usuàries si veus res sobre les seves publicacions. Si hi trobes cap problema, :flag_black: abandera'l!
+    promoter:
+      name: Promoció
+      description: Ha convidat una persona
+      long_description: |
+        Aquesta insígnia es concedeix quan invites algú a participar de la comunitat via el botó d'invitar en la teva pàgina d'usuari o al capdavall d'un tema. Invitar amics que puguin estar interessats en la conversa és una gran manera d'introduir nous membres a la comunitat, o sigui que gràcies!
+    campaigner:
+      name: Activista
+      description: Ha convidat 3 persones usuàries bàsiques
+      long_description: |
+        Aquesta insígnia es concedeix quan invites 3 persones que després passen prou temps al lloc web com per convertir-se en usuaris bàsics. Una comunitat vibrant necessita un influx constant de nouvinguts que regularment participen i afegeixen la seva veu a les converses.
+    champion:
+      name: De campionat
+      description: Ha convidat 5 membres
+      long_description: |
+        Aquest distintiu es concedeix quan has convidat 5 persones amb prou temps invertit al lloc com per esdevenir-ne usuàries completes. Increïble! Gràcies per estendre la diversitat de la nostra comunitat amb noves participacions!
+    first_share:
+      name: Primera compartició
+      description: Ha compartit una publicació
+      long_description: |
+        Aquesta insígnia es concedeix quan comparteixes per primera vegada una resposta o un tema usant el botó de compartir. Compartir enllaços és una gran manera de mostrar discussions interessants amb la resta del món i així fer créixer la nostra comunitat.
+    first_link:
+      name: Primer enllaç
+      description: Enllaça a un altre tema afegit
+      long_description: |+
+        Aquest distintiu es concedeix el primer cop que afegeixes un enllaç a un altre tema. Enllaçar temes ajuda la resta de persones a trobar-hi converses interessants, en mostrar les connexions entre temes en totes direccions. Enllaça a plaer!
+
+    first_quote:
+      name: Primera cita
+      description: Ha citat una publicació
+      long_description: |
+        Aquesta insígnia es concedeix quan cites per primera vegada una entrada en la teva resposta. Citar les parts rellevants en la teva resposta ajuda a matenir les discussions focalitzades en el tema en qüestió. La manera més fàcil de fer-ho és seleccionar una secció de l'entrada abans d'apretar el botó de respondre. Cita amb generositat!
+    read_guidelines:
+      name: Llegeix les guies
+    reader:
+      name: Persona lectora
+      description: Llegeix cada resposta a un tema amb més de 100 respostes
+      long_description: |
+        Aquesta entrada se't concedeix la primera vegada que llegeixes un tema amb més de 100 respostes. Llegir una conversa t'ajuda a seguir la discussió, entendre diferents punts de vista, i porta a converses més interessants. Com més llegeixes, millor es torna la conversa. Com ens agrada dir, llegir és bàsic :slight_smile:
+    popular_link:
+      name: Enllaç popular
+      description: Ha publicat un enllaç extern amb 50 clics
+      long_description: |
+        Aquest distintiu es concedeix quan l'enllaç compartit per tu ha arribat a 50 clics. Gràcies per publicar un enllaç útil que ha afegit un context interessant a la conversa.
+    hot_link:
+      name: Enllaç actiu
+      description: Ha publicat un enllaç extern amb 300 clics
+      long_description: |
+        Aquesta insígnia se't concedeix quan un enllaç que comparteixes rep 300 clics. Gràcies per posar un enllaç tan interessant que ha il·luminat la discussió!
+    famous_link:
+      name: Enllaç famós
+      description: Ha publicat un enllaç extern amb 1000 clics
+      long_description: |
+        Aquest distintiu es concedeix quan l'enllaç compartit per tu ha arribat a 1000 clics. Has publicat un enllaç que ha millorat molt la conversa en afegir-hi detalls, context i informació essencials. Gran feina!
+    appreciated:
+      name: Apreciat
+      description: Ha rebut 1 m'agrada a 20 publicacions
+      long_description: |
+        Aquest distintiu es concedeix quan reps 20 m'agrades a diferents publicacions. La comunitat està gaudint amb les teves aportacions a les converses!
+    respected:
+      name: Respectat
+      description: Ha rebut 2 m'agrades a 100 publicacions
+      long_description: |
+        Aquest distintiu es concedeix quan reps 2 m'agrades a 100 publicacions diferents. La comunitat està creixent per respectar les teves nombroses aportacions a les converses!
+    admired:
+      name: Admirat
+      description: Ha rebut 5 M'agrada a 300 publicacions
+      long_description: |
+        Aquest distintiu es concedeix quan reps 5 M'agrada a 300 publicacions diferents. Gran! La comunitat admira les teves aportacions freqüents i de gran qualitat a les converses!
+    out_of_love:
+      name: Desenamorat
+      description: Ha fet servir 50 m'agrades en un dia
+      long_description: |
+        Aquesta insígnia se't concedeix quan uses 50 m'agrades diaris. El fet de recordar-te de prendre't un temps per a mostrar el teu apreci per les entrades que t'han agradat encoratja els membres de la comunitat a crear discussions encara millors en el futur.
+    higher_love:
+      name: Un amor més gran
+      description: Ha fet servir 50 M'agrada en un dia 5 cops
+      long_description: |
+        Aquest distintiu es concedeix quan fas servir tots els teus 50 M'agrada diaris en 5 dies. Gràcies per prendre el teu temps i animar activament les millors converses cada dia.
+    crazy_in_love:
+      name: Enamorament boig
+      description: Ha fet servir 50 M'agrada en un dia 20 cops
+      long_description: |
+        Aquest distintiu es concedeix quan fas servir tots els teus 50 M'agrada diaris en 20 dies. Ets un exemple de regularitat en animar activament la teva gent de la teva comunitat.
+    thank_you:
+      name: Gràcies
+      description: Té 20 publicacions agradades i ha donat 10 M'agrada
+      long_description: |
+        Aquest distintiu es concedeix quan t'han agradat 20 publicacions i has donat 10 M'agrada o més. Quan les teves publicacions agraden, també trobes el temps perquè t'agradin les de la resta.
+    gives_back:
+      name: Torna
+      description: Té 100 publicacions agradades i ha donat 100 M'agrada
+      long_description: |
+        Aquest distintiu es concedeix quan t'han agradat 20 publicacions i has donat 100 M'agrada o més. Gràcies per recompensar-ho!
+    empathetic:
+      name: Empàtic
+      description: Té 500 publicacions agradades i ha donat 1000 M'agrada
+      long_description: |
+        Aquest distintiu es concedeix quan t'han agradat 500 publicacions i has donat 1000 M'agrada o més. Gran! Ets un model de generositat i apreci mutu :two_hearts:
+    first_emoji:
+      name: Primer emoji
+      description: Ha fet servir un emoji a una publicació
+      long_description: |
+        Aquest distintiu es concedeix el primer cop que afegeixes un Emoji a la teva publicació :thumbsup:. L'Emoji et permet donar emoció a les teves publicacions, des de la felicitat :smiley: a la tristor :anguished: o l'empipament :angry: i qualsevol cosa amb :sunglasses: . Senzillament escriu : (dos punts) o clica la barra d'eines d'Emoji a l'editor per triar-ne entre centenars de possibilitats :ok_hand:
+    first_mention:
+      name: Primera menció
+      long_description: Aquest distintiu es concedeix el primer cop que menciones  @username d'algú a la teva publicació. Cada menció genera una alerta a aquella persona, perquè sàpiga de la teva publicació. Senzillament comença a escriure @ (símbol arrova) per mencionar qualsevol persona o grup, si està permès – és una forma interessant de cridar la seva atenció.
+    first_onebox:
+      name: Primera caixa
+      description: Enllaç publicat que ha estat encaixat
+      long_description: Aquest distintiu es concedeix el primer cop que publiques un enllaç sobre una línia, que automàticament s'ha estès a una caixa amb un breu resum de l'enllaç, un títol i (si hi és) una imatge.
+    first_reply_by_email:
+      name: Primera resposta per correu
+      long_description: |
+        Aquesta distinció es concedeix el primer cop que respons una publicació per correu :e-mail:.
+  admin_login:
+    success: "Correu enviat"
+    error: "Error!"
+    email_input: "Administrar correu"
+    submit_button: "Enviar correu"
+  performance_report:
+    initial_post_raw: Aquest tema inclou informes diaris de funcionament per al teu lloc.
+    initial_topic_title: Informes de funcionament del lloc
+  tags:
+    title: "Etiquetes"
+    staff_tag_disallowed: "Només l'equip pot aplicar l'etiqueta \"%{tag}\"."
+    staff_tag_remove_disallowed: "Només l'equip pot eliminar l'etiqueta \"%{tag}\"."
+  rss_by_tag: "Temes etiquetats %{tag}"
+  finish_installation:
+    congratulations: "Felicitats, has instal·lat Discourse!"
+    register:
+      button: "Regsitre"
+      title: "Registrar un compte d'administració"
+      help: "registra un nou compte per començar"
+      no_emails: "Malauradament no s'han definit correus d'administració durant la instal·lació i per això <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>pot ser difícil</a> concloure la configuració."
+    confirm_email:
+      title: "Confirma el teu correu"
+      message: "<p>Hem enviat un correu d'activació a <b>%{email}</b>. Si us plau, segueix les instruccions del correu per activar el teu compte.</p><p>Si no t'arribam assegura't que has configurat al teu Discourse el teu correu correctament i revisa la teva carpeta de correu brossa.</p>"
+    resend_email:
+      title: "Torna a enviar el correu d'activació"
+      message: "<p>Hem tornat a enviar el correu d'activació a <b>%{email}</b>"
+  safe_mode:
+    title: "Entra en mode segur"
+    description: "El mode segur et permet provar el teu lloc sense carregar-hi complements o personalitzacions del lloc."
+    only_official: "Inhabilita tots els connectors no oficials"
+    no_plugins: "Inhabilita tots els complements"
+    enter: "Entra en mode segur"
+  wizard:
+    title: "Configuració de Discourse"
+    step:
+      locale:
+        title: "Et donem la benvinguda al teu Discourse!"
+        fields:
+          default_locale:
+            description: "Quina és la llengua per defecte de la teva comunitat?"
+      forum_title:
+        title: "Nom"
+        description: "El teu nom és un senyal visible de lluny, la <i>primera</i> cosa potencial a la qual es fixaran les persones de la teva comunitat. Què diu el teu nom i el teu títol sobre la teva comunitat?"
+        fields:
+          title:
+            label: "El nom de la teva comunitat"
+            placeholder: "Lloc de conversa de la Jane"
+          site_description:
+            label: "Descriu la teva comunitat amb una frase breu"
+            placeholder: "Un lloc on la Jane i les seves amistats poden conversar sobre temes interessants"
+      introduction:
+        title: "Introducció"
+        fields:
+          welcome:
+            label: "Tema de benvinguda"
+            description: "<p>Com descriuries la teva comunitat a una persona de fora en 1 minut?</p> <ul> <li>Per a què serveixen aquests debats?</li> <li>Què hi puc trobar?</li> <li>Per què ho hauria de visitar?</li> </ul> <p>El teu tema de benvinguda és la primera cosa que llegiran les persones nouvingudes. Pensa-hi com la teva 'targeta de presentació' o 'declaració d'intencions' d'<b>un paràgraf</b>.</p>"
+            one_paragraph: "Si us plau escurça el teu missatge de benvinguda a un paràgraf"
+      privacy:
+        title: "Accés"
+        description: "<p>La teva comunitat esta oberta a tothom o està restringida per participació, invitació o aprovació? s t'ho estimes més, pots configurar-ho tot en privat, per fer-ho públic més endavant</p> <p>Sempre pots enviar invitacions des de temes o també des de la teva pàgina de perfil.</p>"
+        fields:
+          privacy:
+            choices:
+              open:
+                label: "Públic"
+                description: "Qualsevol pot accedir a aquesta comunitat registrar-s'hi per a un compte"
+              restricted:
+                label: "Privat"
+                description: "Només poden accedir a aquesta comunitat les persones que jo hi hagi convidat o aprovat"
+      contact:
+        title: "Contacte"
+        fields:
+          contact_email:
+            label: "Correu"
+            placeholder: "name@example.com"
+            description: "L'adreça de correu per a la persona o grup responsable d'aquesta comunitat. Fet servir per a notificacions importants com ara banderes sense manipular, actualitzacions de seguretat ia <a href='/about' target='_blank'>pàgina sobre tu</a> per a un contacte urgent de la comunitat."
+          contact_url:
+            label: "Pàgina web"
+            placeholder: "http://www.example.com/contact-us"
+            description: "Pàgina web de contacte general per a tu o la teva organització. Es mostrarà a <a href='/about' target='_blank'>la teva pàgina sobre tu</a>."
+          site_contact:
+            label: "Missatges automàtics"
+      corporate:
+        title: "Organització"
+        description: "Els noms s'inclouran a la teva <a href='/privacy' target='blank'>Política de Privacitat</a> i a les <a href='/tos' target='blank'>Condicions del Servei</a>, que són temes que pots editar a la categoria d'equip. Si no tens cap empresa, pots deixar-ho buit."
+        fields:
+          company_short_name:
+            label: "Nom de l'empresa (breu)"
+            placeholder: "Initech"
+          company_full_name:
+            label: "Nom de l'empresa (complet)"
+            placeholder: "Initech, Inc."
+          company_domain:
+            label: "Nom de domini de l'empresa"
+            placeholder: "initech.com"
+      colors:
+        title: "Tema"
+        fields:
+          theme_id:
+            description: "T'estimes més un esquema de color clar o fosc per començar? Més endavant pots personalitzar l'aspecte del teu lloc web des de Amdinistració, Personalitza."
+            choices:
+              default:
+                label: "Clar senzill"
+              dark:
+                label: "Fosc senzill"
+      logos:
+        title: "Logos"
+        fields:
+          logo_url:
+            label: "Logo primari"
+            description: "La imatge de logo a la part superior esquerra del teu lloc. Fes servir una forma rectangular allargada."
+          logo_small_url:
+            label: "Logo compacte"
+            description: "Una versió compacta del teu logo, mostrada a la part superior esquerra del teu lloc en desplaçar-te cap avall. Fes servir una forma quadrada."
+      icons:
+        title: "Icones"
+        fields:
+          favicon_url:
+            label: "Icona petita"
+            description: "Imatge d'icona emprada per representar el teu lloc web a navegadors que tenen bon aspecte amb mides com ara de 32px per 32px."
+          apple_touch_icon_url:
+            label: "Icona gran"
+            description: "Imatge d'icona emprada per representar el teu lloc web a dispositius moderns que tenen bon aspecte amb mides més grans. La mida recomanada és d'almenys 144px per 144px."
+      homepage:
+        description: "Et suggerim que mostris els darrers temes a la teva pàgina principal, però si t'ho estimes més, també pots mostrar-hi categories (grups o temes) a la pàgina principal."
+        title: "Pàgina principal"
+        fields:
+          homepage_style:
+            choices:
+              latest:
+                label: "Darrers temes"
+              categories:
+                label: "Categories"
+      emoji:
+        title: "Emoji"
+        description: "Quin estil d'Emoji t'estimes més per a la teva comunitat? Més tard pots afegir-hi més Emoji personalitzats, des de Administració, Personalitza, Emoji."
+      invites:
+        title: "Convida equip"
+      finished:
+        title: "El teu Discourse està llest!"
+        description: |
+          <p>Si mai vols canviar aquesta configuració, visita <a href='/admin' target='_blank'>la teva secció d'administració</a>; troba-ho al costat de la icona de clau anglesa al menú del lloc.</p>
+          <p>Passa-t'ho bé i molta sort <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>amb la construcció de la teva nova comunitat!</a></p>
+  activemodel:
+    errors:
+      <<: *errors
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index bac3093b1e..09ff573a3a 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -7,9 +7,9 @@
 
 cs:
   dates:
-    short_date_no_year: "D. MMMM"
-    short_date: "D. MMMM, YYYY"
-    long_date: "D. MMMM YYYY H:mm"
+    short_date_no_year: "D MMM"
+    short_date: "D MMM, YYYY"
+    long_date: "D. MMMM, YYYY h:mm"
   datetime_formats: &datetime_formats
     formats:
       short: "%-d. %-m. %Y"
@@ -27,14 +27,18 @@ cs:
   topics: "Témata"
   posts: "příspěvky"
   loading: "Nahrávám"
+  powered_by_html: 'Systém běží na <a href="https://www.discourse.org">Discourse</a>, nejlépe funguje se zapnutým JavaScriptem'
   log_in: "Přihlásit se"
   purge_reason: "Tento účet byl automaticky smazán a deaktivován jako opuštěný"
   disable_remote_images_download_reason: "Stahování obrázků z cizích serverů bylo vypnuto protože na disku není dostatek místa."
   anonymous: "Anonymní"
   remove_posts_deleted_by_author: "Smazáno autorem"
+  themes:
+    bad_color_scheme: "Nelze aktualizovat skin (theme), neplatné barevné schéma"
+    other_error: "Něco se pokazilo při aktualizaci skinu (theme)"
   emails:
     incoming:
-      default_subject: "Toto téma vyžaduje název"
+      default_subject: "Toto téma potřebuje nadpis"
       show_trimmed_content: "Ukázat upravený obsah"
       maximum_staged_user_per_email_reached: "Dosáhli jste maximálního počtu uživatelů na jeden e-mail."
       errors:
@@ -164,6 +168,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 +192,8 @@ cs:
     attributes:
       category:
         name: "Název kategorie"
+      topic:
+        title: 'Nadpis'
       post:
         raw: "Tělo"
       user_profile:
@@ -206,12 +213,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,13 +233,13 @@ 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:
     title: "Vítejte v Redakci"
   category:
     topic_prefix: "Definice kategorie pro %{category}"
+    post_template: "%{replace_paragraph}\n\nPoužijte následující odstavce pro delší popis, nebo pro vytvoření pokynů ke kategorii nebo pravidel:\n\n- Proč by lidé měli používat tuto kategorii? K čemu slouží?\n\nJak přesně je tato kategorie odlišná od ostatních, které již máme?\n\n- Co by měly témata v této kategorii obvykle obsahovat?\n\nPotřebujeme tuto kategorii? Můžeme ji sloučit s jinou kategorií nebo subkategorií?\n"
     errors:
       uncategorized_parent: "„Bez kategorie“ nemůže mít nadřazenou kategorii"
       self_parent: "Nadřazená kategorie nemůže zároveň být podkategorie"
@@ -587,20 +599,16 @@ cs:
     min_search_term_length: "Minimální délka hledaného výrazu ve znacích"
     allow_duplicate_topic_titles: "Povolit témata se stejným, duplicitním názvem"
     unique_posts_mins: "Kolik minut musí uplynout, než může uživatel zaslat příspěvek se stejným obsahem"
-    queue_jobs: "Zařazovat úlohy do fronty v sidekiq, není-li nastaveno, jsou úlohy vyřizovány okamžitě"
     apple_touch_icon_url: "Ikona používaná pro doteková zařízení od firmy Apple. Doporučené rozměry jsou 144px krát 144px."
     email_custom_headers: "Seznam vlastních hlaviček emailů, oddělený svislítkem"
     enable_long_polling: "'Message bus' smí používat dlouhé výzvy"
     anon_polling_interval: "Jak často se mají zasílat výzvy anonymním uživatelům v milisekundách"
-    notify_mods_when_user_blocked: "If a user is automatically blocked, send a message to all moderators."
     ga_universal_tracking_code: "Kód Google Universal Analytics (analytics.js); například UA–12345678-9; více na http://google.com/analytics"
     ga_universal_domain_name: "Doménové jméno Google Universal Analytics (analytics.js); například mojeforum.cz; více na http://google.com/analytics"
     allow_moderators_to_create_categories: "Povolit moderátorům vytváření nových kategorií."
     post_menu: "Určuje, které položky se zobrazí v menu u příspěvku a v jakém pořadí. Příklad: like|edit|flag|delete|share|bookmark|reply"
     track_external_right_clicks: "Počítat kliknutí na externí odkazy pravým tlačítkem (např. otevření do nové záložky); defaultně zakázáno kvůli přepisu URL"
     enable_badges: "Povolit odznaky"
-    port: "Používat tento HTTP port místo standardního portu 80. Nechte prázdné pro výchozí port, užitečné hlavně pro vývoj"
-    force_hostname: "Na pevno nastaví hostitele v URL. Nechte prázdné pro výchozí server, užitečné hlavně pro vývoj"
     invite_expiry_days: "Platnost uživatelských pozvánek ve dnech"
     min_password_length: "Minimální povolená délka hesla."
     min_admin_password_length: "Minimální délka heslo pro administrátora."
@@ -633,7 +641,6 @@ cs:
     privacy_policy_url: "Pokud máte dokument 'Ochrana Soukromí' hostovaný samostatně, napište sem jeho plnou URL."
     reply_by_email_address: "Šablona emailé adresy pro odpověď emailem, např. %{reply_key}@reply.myforum.com"
     delete_all_posts_max: "Maximální počet příspěvků, které mohou být smazány najednou tlačítkem 'Odstranit všechny příspěvky'. Pokud má uživatel více příspěvků než je zde nastaveno, nemohou být jeho příspěvky smazány najednou a uživatele nelze odstranit."
-    username_change_period: "Počet dní od registrace za kolik si uživatel může změnit svoje uživatelské jméno (0 pokud chcete změnu uživatelského jména úplně zakázat)."
     email_editable: "Povolit uživatelům změnit si po registraci emailovou adresu."
     digest_topics: "Maximální počet populárních témat zařazených do email přehledu."
     digest_posts: "Maximální počet populárních příspěvků zařazených do email přehledu."
@@ -678,7 +685,6 @@ cs:
     omniauth_error_unknown: "Nastala chyba při zpracování vašeho přihlášení, prosím zkuste to znovu."
   user:
     username:
-      characters: "musí obsahovat pouze písmena a číslice"
       unique: "musí být unikátní"
       blank: "nesmí být prázdný"
     email:
@@ -725,7 +731,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}"
@@ -738,10 +743,6 @@ cs:
     recent_topics: "Nedávné"
     see_more: "Více"
     search_google: "Google"
-  login_required:
-    welcome_message: |
-      #[Vítejte na %{title}](#welcome)
-      Je vyžadován uživatelský účet. Prosím vytvořte si nový účet nebo se přihlaste.
   terms_of_service:
     title: "Podmínky používání"
     signup_form_message: 'I have read and accept the <a href="/tos" target="_blank">Terms of Service</a>.'
@@ -777,10 +778,11 @@ cs:
   privacy_topic:
     title: "Ochrana soukromí"
   badges:
+    editor:
+      long_description: |
+        Tento odznak je udělen, když poprvé upravíte jeden z Vašich příspěvků. I když nebudete moci upravovat Vaše příspěvky po určitém čase, úprava je vždy dobrý nápad - můžete své příspěvky vylepšit, opravit malé chyby nebo přidat cokoliv, co jste v původním příspěvku zapomněli. Upravujte, abyste Vaše příspěvky udělali ještě lepšími!
     welcome:
       name: Vítejte
-    autobiographer:
-      description: Vyplněné informace v <a href="/my/preferences">profilu</a>
     first_like:
       name: První "to se mi líbí"
     first_share:
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 37f4d55b2a..0d279ca0e4 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -47,7 +47,6 @@ da:
         auto_generated_email_error: "Dette sker når headeren 'precedence' er angivet til: list, junk, bulk eller auto_reply, eller når enhver anden header indeholder: auto-submitted, auto-replied eller auto-generated."
         no_body_detected_error: "Dette sker når vi ikke kunne trække noget indhold ud og der heller ikke var nogen vedhæftninger."
         inactive_user_error: "Dette sker når afsenderen ikke er aktiv."
-        blocked_user_error: "Dette sker når afsenderen er blevet blokeret."
         bad_destination_address: "Dette sker når ingen af email adresserne i To/Cc/Bcc felterne matcher en opsat indgående email adresse."
         strangers_not_allowed_error: "Dette sker når en bruger prøver at oprette et nyt emne i en kategori som de ikke er medlem af."
         insufficient_trust_level_error: "Dette sker når en bruger prøvede at oprette et nyt emne i en kategori som de ikke har den krævne \"trust level\" til."
@@ -357,7 +356,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
@@ -619,7 +617,6 @@ da:
       email_title: 'Emnet "%{title}" kræver moderator-opmærksomhed'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Dit indlæg er blevet markeret af fællesskabet. <a href="/my/messages">Se dine beskeder</a>.</p>'
     user_must_edit: '<p>Dette indlæg er blevet markert af fællesskabet, og er midlertidigt skjult.</p>'
   archetypes:
     regular:
@@ -631,7 +628,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"
@@ -847,9 +843,7 @@ da:
     educate_until_posts: "When the user starts typing their first (n) new posts, show the pop-up new user education panel in the composer."
     title: "Sitets navn, som anvendt i tittel."
     site_description: "Beskriv denne side i én sætning, som anvendt i meta beskrivelsen."
-    contact_email: "Email adresse på ansvarlig kontaktperson for denne side. Anvendes til kritiske notifikationer som ubehandlede flag, og hastende sager."
     contact_url: "Kontakt URL for denne side. Anvendt på kontakt admin, i tilfælde af hastesager."
-    queue_jobs: "KUN FOR UDVIKLERE! ADVARSEL! Brug sidekiq som jobkø. Hvis dette slås fra går dit site i stykker."
     crawl_images: "Hent billeder fra eksterne URLs for at indsætte de korrekte bredde og højde dimensioner."
     download_remote_images_to_local: "Konverter eksterne billeder til lokale billeder ved at downloade dem; dette forebygger at billeder ikke forsvinder."
     download_remote_images_threshold: "Minimum hukommelse påkrævet på drev for at downloade billeder lokalt (i procent)"
@@ -863,7 +857,6 @@ da:
     max_image_height: "Maksimum miniaturebillede højde for billeder i et indlæg"
     fixed_category_positions: "Hvis krydset af, vil du være i stand til at arrangere ordnet visning af kategorier. Hvis ikke afkrydset vil de være listet i en rækkefølge baseret på aktivitet."
     fixed_category_positions_on_create: "Hvis afkrydset vil kategori visning blive vedligeholdt baseret på emne (kræver manuelt valgt visning af kategorier)."
-    exclude_rel_nofollow_domains: "En liste af domæner hvor 'nofollow' skal tilføjes til links. tid.com vil desuden automatisk tillade sub.tid Som minimum bør du tilføje top level domænet til sitet, for at hjælpe webcrawlere finde alt indhold. Såfremt andre dele af jeres site er på andre domæner, så tilføj også disse."
     post_excerpt_maxlength: "Max længde på uddrag af indlæg / opsummering."
     show_pinned_excerpt_mobile: "Vis uddrag af fastgjorte emner på mobilen."
     show_pinned_excerpt_desktop: "Vis uddrag af fastgjorte emner i desktop visning"
@@ -874,7 +867,6 @@ da:
     digest_logo_url: "Det alternative logo billede der anvendes øverst på jeres sides email opsummering, burde være en bred rektangel. Skal ikke være et SVG billede. Hvis denne efterlades blank, vil 'logo_url' blive anvendt."
     logo_small_url: "Det lille logo øverst til venstre på siden burde være firkantet når der bladres ned. Såfremt denne efterlades blank. vil home 'glyph' blive vist."
     favicon_url: "Favoritikonet for jeres side, se http://en.wikipedia.org/wiki/Favicon, bør være en png, for at det fungere korrekt over CDN."
-    mobile_logo_url: "Jeres site logo, øverst til venstre på siden, skulle være firkantet. Såfremt det efterlades blankt, vil `logo_url` blive anvendt. F.eks: http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "Ikon til Apple touch-enheder. Den anbefalede størrelse er 144px gange 144px."
     notification_email: "Afsender email adresse, anvendt når der sendes esentielle system emails. Domænet her skal have korrekt opsatte SPF, DKIM og 'PTR records', for succesfuld afskibning af mails."
     email_custom_headers: "En liste af brugerdefinerede e-mail-headers adskilt af |-tegn."
@@ -898,20 +890,12 @@ da:
     tl2_additional_likes_per_day_multiplier: "Øg antallet af likes pr dag for tl2 (member) ved at gange med dette tal"
     tl3_additional_likes_per_day_multiplier: "Øg antallet af likes pr. dag for tl3 (regular) ved at gange med dette tal"
     tl4_additional_likes_per_day_multiplier: "Øg antallet af likes pr. dag for tl4 (leader) ved at gange med dette tal"
-    num_spam_flags_to_block_new_user: "Hvis indlæg fra en ny bruger får så mange spam flag fra forskellige brugere num_users_to_block_new_user gem da deres indlæg og forhindre at vedkommende kan udgive flere indlæg. 0 for at slå fra."
-    num_users_to_block_new_user: "Hvis en ny bruger får num_spam_flags_to_block_new_user spam flag fra dette antal forskellige brugere, gem da alle indlæg og forhindr yderligere posteringer 0 for at slå fra."
-    num_tl3_flags_to_block_new_user: "Hvis en ny brugers indlæg får dette antal flag fra num_tl3_users_to_block_new_user fra Trust Level 3 brugere, gem da alle deres indlæg og bloker yderligere posteringer. 0 for at slå fra."
-    num_tl3_users_to_block_new_user: "Hvis en brugers indlæg får num_tl3_flags_to_block_new_user flag fra mange forskellige \"trust level 3\" brugere, så gem alle deres indlæg og fjern muligheden for nye indlæg. Skriv 0 for at deaktivere."
-    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."
     maximum_session_age: "Bruger vil forblive logget in for n hours siden sidste besøg"
-    ga_tracking_code: "OBSOLETE: Google analytics (ga.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics"
-    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"
     gtm_container_id: "Google Tag Manager container id. eg: GTM-ABCDEF"
@@ -931,8 +915,6 @@ da:
     enable_whispers: "Tillad at hjælperteamet har private samtaler i emner."
     log_out_strict: "Når brugeren logger af, log da ud af alle sessioner, på alle enheder"
     new_version_emails: "Send en email til contact_email adressen når der er en ny version af Discourse tilgængelig."
-    port: "KUN FOR UDVIKLERE! ADVARSEL! Brug denne HTTP-port i stedet for standarden, som er port 80. Lad feltet stå tomt for at bruge standardværdien."
-    force_hostname: "KUN FOR UDVIKLERE! ADVARSEL! Angiv et host-navn i URLen. Lad feltet stå tomt for at bruge standardværdien."
     invite_expiry_days: "Hvor længe brugerinvitationsnøgler er gyldige, i dage."
     invite_passthrough_hours: "Hvor længe kan en bruger benytte en tidligere benyttet invitation til at logge ind, i timer."
     login_required: "Kræv godkendelse til at læse indhold på dette site, og tillad ikke anonym adgang."
@@ -986,8 +968,6 @@ da:
     num_flaggers_to_close_topic: "Minimum antal flagmarkeringer fra unikke brugere, der skal til for automatisk at pause et emne til ingriben"
     num_flags_to_close_topic: "Minimum antal aktive flagmarkeringer, der skal til for automatisk at pause et emne til indgriben"
     auto_respond_to_flag_actions: "Aktivér automatisk besvarelse, når en flagmarkering fjernes."
-    auto_block_fast_typers_on_first_post: "Blokér automatisk brugere som ikke opfylder min_first_post_typing_time"
-    auto_block_fast_typers_max_trust_level: "Maksimal trust level for at blokere \"fast typers\""
     reply_by_email_enabled: "Aktivér muligheden for at svare til emner via email."
     reply_by_email_address: "Skabelon for e-mail-adressen i formularen, for eksempel: %{reply_key}@reply.myforum.com."
     disable_emails: "Stop Discourse i at sende nogen form for emails"
@@ -998,7 +978,6 @@ da:
     ignore_by_title: "Ignorér indgående emails baseret på deres titel."
     mailgun_api_key: "Mailgun Secret API key used to verify webhook messages."
     delete_all_posts_max: "Det maksimale antal indlæg der kan slettes på én gang med “Slet alle indlæg”-knappen. Hvis en bruger har mere end dette antal indlæg, kan indlæggene ikke slettes på én gang og brugeren kan ikke slettes."
-    username_change_period: "Antal dage efter oprettelsen hvor brugere kan ændre deres brugernavn (0 for ikke at tillade skift af brugernavn)."
     email_editable: "Lad brugerne skifte deres e-mail-adresse efter oprettelsen."
     digest_topics: "Maximalt antal af populære emner vist i mails med sammendrag."
     digest_posts: "Maximalt antal af populære indlæg vist i mails med sammendrag."
@@ -1112,7 +1091,6 @@ da:
     email_too_long: "Den mailadresse, du har opgivet, er for lang. Navnet i mailadressen må ikke overstige 254 tegn, og domænenavnet må ikke overstige 253 tegn."
     reserved_username: "Dette brugernavn er ikke tilladt."
     missing_user_field: "Du har ikke udfyldt alle felterne"
-    close_window: "Godkendelsen er færdig. Luk dette vindue for at fortsætte."
     already_logged_in: "Hovsa, det ser ud til, at du forsøger at acceptere en invitation til en anden bruger. Hvis du ikke er %{current_user}, så log venligst ud og prøv igen."
   user:
     no_accounts_associated: "Ingen konti tilknyttet"
@@ -1122,7 +1100,6 @@ da:
     username:
       short: "skal være på mindst %{{min}} tegn."
       long: "skal være kortere end %{max} tegn"
-      characters: "må kun indeholde bogstaver og tal"
       unique: "skal være unik"
       blank: "skal udfyldes"
       must_begin_with_alphanumeric_or_underscore: "skal begynde med et bogstav, et nummer eller en underscore"
@@ -1151,46 +1128,6 @@ da:
 
       Hvis du ønsker at fortsætte med at modtage mailopdateringer, kan du bare ignorere denne mail.
 
-  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:
-    subject_template: "%{invitee_name} inviterede dig til at oprette dig på %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Opret password til din %{site_name}-konto"
     text_body_template: |
@@ -1220,15 +1157,6 @@ da:
     subject_template: "[%{email_prefix}] Ny version af Discourse, opdatering tilgængelig"
   new_version_mailer_with_notes:
     subject_template: "[%{email_prefix}] opdatering tilgængelig"
-  queued_posts_reminder:
-    title: "Påmindelse om indlæg, der skal godkendes"
-    subject_template:
-      one: "[%{email_prefix}] 1 post waiting to be reviewed"
-      other: "[%{email_prefix}] %{count} indlæg venter på at blive gennemgået"
-    text_body_template: |
-      Hej,
-
-      Indlæg fra nye brugere er tilbageholdt for at blive godkendt og afventer at blive gennemgået. [Godkend eller afvis dem her](%{base_url}/queued-posts).
   flag_reasons:
     off_topic: "Dit indlæg blev flagmarkeret som **off-topic**: Fællesskabet synes ikke, at det passer godt ind i emnet, som er blevet defineret af titlen og det første indlæg."
     inappropriate: "Dit indlæg blev markeret som **upassende**: Fællesskabet synes, at det er stødende, groft eller krænker [vores fællesskabs retningslinier](/guidelines)."
@@ -1248,21 +1176,6 @@ da:
     contents_hidden: "Gå venligst til indlægget for at se indholdet."
     post_hidden:
       subject_template: "Inlægget er skjult pga. flagmarkeringer"
-      text_body_template: |+
-        Hej,
-
-        Dette er en automatisk besked fra %{site_name} for at lade dig vide, at dit indlæg er blevet skjult.
-
-        %{base_url}%{url}
-
-        %{flag_reason}
-
-        Flere af de andre brugere har flaget indlægget, før det blev skjult, så overvej venligst, hvordan du kan opdatere dit indlæg baseret på deres feedback. **Du kan redigere dit indlæg efter %{edit_delay} minutter, hvoretefter det automatisk bliver vist igen.**
-
-        Hvis dit indlæg bliver skjult af de andre brugere endnu en gang, vil det forblive skjult, indtil moderatorerne tager sig af det - det kan medføre yderligere sanktioner, herunder en mulig suspendering af din konto.
-
-        Se venligst [Retningslinjerne](%{base_url}/guidelines) for yderligere vejledning.
-
     usage_tips:
       text_body_template: |
         Hvis du vil have et par hurtige tips til at komme i gang som ny bruger, så [tjek dette blogindlæg](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -1274,45 +1187,12 @@ da:
     welcome_invite:
       title: "Velkomst til inviterede brugere"
       subject_template: "Velkommen til %{site_name}!"
-    csv_export_failed:
-      text_body_template: "Desværre, din dataeksport mislykkedes. Kig venligst i loggen eller kontakt hjælperteamet."
-    email_reject_insufficient_trust_level:
-      text_body_template: |
-        Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
-
-        Din konto har ikke det nødvendige tillidsniveau til at kunne oprette nye emner til denne emailadresse. Hvis du mener, at det er en fejl, så kontakt hjælperteamet.
-    email_reject_user_not_found:
-      text_body_template: |
-        Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
-
-        Dit svar blev sendt fra en ukendt emailadresse. Prøv at sende fra en anden emailadresse eller kontakt hjælperteamet.
-    email_reject_screened_email:
-      text_body_template: |
-        Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
-
-        Dit svar blev sendt fra en blokeret emailadresse. Prøv at sende fra en anden emailadresse eller kontakt hjælperteamet.
     email_reject_inactive_user:
       text_body_template: |+
         Vi beklager, men din mailbesked til %{destination} (titled %{former_title}) fungerede ikke.
 
         Den konto, der er knyttet til denne mailadresse, er ikke aktiveret. Aktiver din konto, før du sendere flere mails ind.
 
-    email_reject_blocked_user:
-      text_body_template: |+
-        Vi beklager, men din mailbesked til %{destination} (titled %{former_title}) fungerede ikke.
-
-        Den konto, der er knyttet til denne mailadresse, er blokeret.
-
-    email_reject_reply_user_not_matching:
-      text_body_template: |
-        Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
-
-        Dit svar blev sendt fra en anden emailadresse end den forventede, så vi er ikke sikre på, at det er den samme person. Prøv at sende fra en anden emailadresse eller kontakt hjælperteamet.
-    email_reject_no_account:
-      text_body_template: |
-        Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
-
-        Vi kan ikke finde nogen konto, der matcher din emailadresse. Prøv at sende fra en anden emailadresse eller kontakt hjælperteamet.
     email_reject_empty:
       text_body_template: |+
         Vi beklager, men din mailbesked til %{destination} (titled %{former_title}) fungerede ikke.
@@ -1326,16 +1206,6 @@ da:
         Vi beklager, men din mailbesked til %{destination} (titled %{former_title}) fungerede ikke.
 
         Vi kunne ikke finde dit svar i mailen. **Sørg for at dit svar står øverst i mailen** -- vi kan ikke behandle svar, der er indsat i den oprindelige tekst.
-    email_reject_invalid_access:
-      text_body_template: |
-        Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
-
-        Din konto har ikke tilladelse til at oprette nye emner i kategorien. Hvis du mener, at det er en fejl, så kontakt hjælperteamet.
-    email_reject_strangers_not_allowed:
-      text_body_template: |
-        Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
-
-        Kategorien du sendte mailen til tillader kun svar fra brugere med gyldige kontoer og kendte emailadresser. Hvis du mener, at det er en fejl, så kontakt hjælperteamet.
     email_reject_invalid_post:
       text_body_template: |
         Vi beklager, men din mailbesked til %{destination} (titled %{former_title}) fungerede ikke.
@@ -1356,96 +1226,12 @@ da:
 
         Send-handlingen blev ikke genkendt. Prøv igen, eller send via websitet, hvis det fortsætter.
 
-    email_reject_reply_key:
-      text_body_template: |
-        Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
-
-        Svarknappen i emailen er ugyldig eller ukendt, så vi ved ikke, hvad denne email er et svar til. Kontakt hjælpeteamet.
-    email_reject_bad_destination_address:
-      text_body_template: |
-        Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
-
-        Ingen af modtageradresserne kan genkendes. Dobbelttjek at du sender til den korrekte emailadresse fra hjælperteamet.
-    email_reject_topic_not_found:
-      text_body_template: |
-        Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
-
-        Emnet du besvarer eksisterer ikke længere - Det er måske slettet? Hvis du mener, at det er en fejl, så kontakt hjælperteamet.
-    email_reject_topic_closed:
-      text_body_template: |
-        Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
-
-        Emnet du besvarer er i øjeblikket lukket og modtager ikke længere svar. Hvis du mener, at det er en fejl, så kontakt hjælperteamet.
-    email_reject_auto_generated:
-      text_body_template: |
-        Vi beklager, men din mailbesked til %{destination} (titled %{former_title}) fungerede ikke.
-
-        Din mail blev markeret som "autogenereret", hvilket betyder, at den er blevet oprettet automastisk af en computer i stedet for at blive tastet ind af en peron; vi kan ikke acceptere den slags mails. Hvis du mener, det er en fejl, kan du kontakte et medlem af staben.
     too_many_spam_flags:
       title: "For Mange Flagmarkeringer for Spam"
       subject_template: "Nyoprettet konto sat på hold"
-      text_body_template: |
-        Hej,
-
-        Dette er en automatisk besked fra %{site_name} for at lade dig vide, at dine indlæg midlertidigt er blevet skjult, fordi de er blevet flagmarkeret af andre brugere.
-
-        For en sikkerheds skyld er din nyoprettede konto blevet spærret, så du ikke kan oprette nye svar eller emner, indtil en administrator kan gennemgå din konto. Vi beklager ulejligheden.
-
-        Se venligst vores [Retningslinjer](%{base_url}/guidelines) for yderligere vejledning.
     too_many_tl3_flags:
       title: "For Mange TL3 Flagmarkeringer"
       subject_template: "Nyoprettet konto sat på hold"
-      text_body_template: |
-        Hej,
-
-        Dette er en automatisk besked fra %{site_name} for at lade dig vide, at din konto er blevet sat i venteposition på grund af et stort antal flagmarkeringer fra andre brugere.
-
-        For en sikkerheds skyld er din nyoprettede konto blevet spærret, så du ikke kan oprette nye svar eller emner, indtil en administrator kan gennemgå din konto. Vi beklager ulejligheden.
-
-        Se venligst vores [Retningslinjer](%{base_url}/guidelines) for yderligere vejledning.
-    blocked_by_staff:
-      title: "Blokeret af hjælperteamet"
-      subject_template: "Konto midlertidigt sat på hold"
-      text_body_template: |
-        Hej,
-
-        Dette er en automatisk besked fra %{site_name} for at lade dig vide, at din konto midlertidigt er blevet sat på hold af sikkerhedsmæssige årsager.
-
-        Du kan fortsat kigge dig omkring på sitet, men du kan ikke oprette indlæg eller emner, intil en [administrator](%{base_url}/about) har gennemgået dine seneste indlæg. Vi beklager ulejligheden.
-
-        Se venligst vores [Retningslinjer](%{base_url}/guidelines) for yderligere vejledning.
-    user_automatically_blocked:
-      title: "Bruger automatisk spærret"
-      subject_template: "Den nye bruger %{username} er blokeret pga. flagmakeringer"
-      text_body_template: |
-        Dette er en automatisk besked.
-
-        Den nye bruger [%{username}](%{user_url}) er automatisk blevet spærret, fordi adskillige brugere har flagmarkeret %{username}s indlæg.
-
-        [Gennemgå venligst flagmarkeringerne](%{base_url}/admin/flags). Hvis %{username} uretmæssigt er blevet forhindret i oprette indlæg, kan du klikke på ophæv spærring på [admin-siden for denne bruger](%{user_url}).
-
-        Grænseværdien kan ændres via indstillingen `block_new_user`.
-    spam_post_blocked:
-      title: "Spam-indlæg blokeret"
-      subject_template: "Ny bruger %{username} indlæg blokeret på grund af gentagne links"
-      text_body_template: |
-        Dette er en automatisk besked.
-
-        Den nye bruger [%{username}](%{user_url}) har forsøgt at oprette flere indlæg med links til %{domains}, men indlæggene blev blokeret for at forhindre spam. Brugeren kan stadig oprette nye indlæg, som ikke linker til %{domains}.
-
-        [Tjek denne bruger](%{user_url}).
-
-        Indstillingen kan ændres via `newuser_spam_host_threshold` og `white_listed_spam_host_domains`.
-    unblocked:
-      title: "Spærring ophævet"
-      subject_template: "Konto ikke længere sat på hold"
-      text_body_template: |+
-        Hej,
-
-        Dette er en automatisk besked fra %{site_name} for at lade dig vide, at din konto ikke længere er på hold, efter at den er blevet gennemgået af administrator.
-
-        Du kan nu oprette nye indlæg og emner igen. Tak for din tålmodighed.
-
     pending_users_reminder:
       title: "Påmindelse om afventende brugere"
       subject_template:
@@ -1461,12 +1247,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 +1412,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}"
@@ -1784,7 +1563,6 @@ da:
       description: Citerede et indlæg
     read_guidelines:
       name: Læst retningslinierne
-      description: Har læst <a href="/guidelines">retningslinierne for forummet</a>
     reader:
       name: Læser
       description: Har læst hvert eneste svar i et emne med mere end 100 svar
@@ -1934,7 +1712,6 @@ da:
         description: "Hvilken Emoji-stil foretrækker du for dit fællesskab? Du kan tilføje flere brugerdefinerede Emoji'er senere via Admin, Tilpas, Emoji."
       invites:
         title: "Inviter hjælpere"
-        description: "Du er næsten færdig! Lad os invitere nogle til hjælpereteamet, som kan href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>starte debatter</a> med interessante emner og svar for at få gang i dit fællesskab."
       finished:
         title: "Discourse er gjort klar til dig!"
   activemodel:
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 5ddfec2796..5c224a24ee 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -46,8 +46,9 @@ de:
         no_message_id_error: "Passiert wenn in der E-Mail die Kopfzeile 'Message-Id' fehlt."
         auto_generated_email_error: "Passiert wenn die Kopfzeile 'precedence' folgendes enthält: list, junk, bulk oder auto_reply, oder eine der anderen Kopfzeilen enthält: auto-submitted, auto-replied oder auto-generated."
         no_body_detected_error: "Passiert, wenn wir keinen Textkörper extrahieren konnten und keine Anhänge gefunden wurden."
+        no_sender_detected_error: "Kommt vor, wenn wir keine gültige E-Mail-Adresse im From-Header finden konnten."
         inactive_user_error: "Passiert wenn der Sender nicht aktiv ist."
-        blocked_user_error: "Passiert wenn der Sender geblockt wurde."
+        silenced_user_error: "Kommt vor, wenn der Absender stummgeschaltet wurde."
         bad_destination_address: "Passiert wenn keine der E-Mail Adressen in den Feldern To/Cc/Bcc zu einer konfigurierten Eingangs-E-Mail-Adresse passt."
         strangers_not_allowed_error: "Passiert wenn ein Benutzer versuchte ein neues Thema in einer Kategorie ohne Mitgliedschaft zu erstellen."
         insufficient_trust_level_error: "Passiert wenn ein Benutzer versuchte ein neues Thema in einer Kategorie zu erstellen, ohne die erforderliche Vertrauensstufe dafür zu haben."
@@ -56,8 +57,12 @@ de:
         topic_closed_error: "Passiert wenn eine Antwort eintraf aber das verbundene Thema geschlossen wurde."
         bounced_email_error: "E-Mail ist ein zurückgekommener Zustellungsbericht."
         screened_email_error: "Passiert, wenn die Absenderadresse schon einmal gefiltert wurde."
+        unsubscribe_not_allowed: "Kommt vor, wenn die Abbestellung per E-Mail für diesen Benutzer nicht erlaubt ist."
+        email_not_allowed: "Kommt vor, wenn die E-Mail-Adresse nicht auf der Positivliste oder auf der Negativliste ist."
+      unrecognized_error: "Unbekannter Fehler"
   errors: &errors
     format: '%{attribute} %{message}'
+    format_with_full_message: '<b>%{attribute}</b>: %{message}'
     messages:
       too_long_validation: "darf höchstens %{max} Zeichen lang sein; du hast %{length} eingegeben."
       invalid_boolean: "Ungültiger boolescher Wert."
@@ -111,6 +116,7 @@ de:
       max_username_length_range: "Das Maximum darf nicht kleiner als das Minimum sein."
       default_categories_already_selected: "Du kannst keine Kategorie auswählen, welche bereits in einer anderen Liste benutzt wird. "
       s3_upload_bucket_is_required: "Uploads auf Amazon S3 können nicht aktiviert werden, bevor der 's3_upload_bucket' eingetragen wurde."
+    conflicting_google_user_id: 'Die Google-Konto-ID für dieses Konto hat sich geändert; das Einschreiten des Teams ist aus Sicherheitsgründen erforderlich. Bitte kontaktiere das Team und verweise es auf <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   invite:
     not_found: "Dein Einladungsschlüssel ist ungültig. Bitte kontaktiere den Administrator der Seite."
     user_exists: "Es ist nicht nötig, <b>%{email}</b> einzuladen, er/sie <a href='/u/%{username}/summary'>hat schon ein Konto!</a>"
@@ -127,6 +133,7 @@ de:
   not_logged_in: "Dazu musst du angemeldet sein."
   not_found: "Die angeforderte URL oder Ressource konnte nicht gefunden werden."
   invalid_access: "Du hast nicht die Erlaubnis, die angeforderte Ressource zu betrachten."
+  invalid_api_credentials: "Du bist nicht berechtigt, die angeforderte Ressource anzuzeigen. Der API-Benutzername oder -Schlüssel ist ungültig."
   read_only_mode_enabled: "Die Seite befindet sich im Nur-Lesen Modus. Änderungen sind deaktiviert."
   reading_time: "Lesezeit"
   likes: "Likes"
@@ -171,10 +178,12 @@ de:
   too_many_links:
     one: "Entschuldige, neue Benutzer können Beiträgen höchstens einen Link hinzufügen."
     other: "Entschuldige, neue Benutzer können Beiträgen höchstens %{count} Links hinzufügen."
+  contains_blocked_words: "Dein Beitrag enthält Wörter, die nicht erlaubt sind."
   spamming_host: "Entschuldigung, du kannst keine Links zu diesem Webserver posten."
   user_is_suspended: "Gesperrte Benutzer dürfen keine Beiträge schreiben."
   topic_not_found: "Etwas ist schief gelaufen. Wurde das Thema eventuell geschlossen oder gelöscht, während du es angeschaut hast?"
   not_accepting_pms: "Entschuldige, %{username} akzeptiert gerade keine Nachrichten."
+  max_pm_recepients: "Sorry, du kannst eine Nachricht nur an maximal %{recipients_limit} Emfpänger senden."
   just_posted_that: "ist einer einer vor Kurzem von dir geschriebenen Nachricht zu ähnlich"
   invalid_characters: "enthält ungültige Zeichen"
   is_invalid: "scheint unklar, ist das ein ganzer Satz?"
@@ -207,11 +216,13 @@ de:
     user_posts: "Neueste Beiträge von @%{username}"
     user_topics: "Neueste Themen von @%{username}"
     tag: "Themen mit Schlagwörtern"
+    badge: "%{display_name} Abzeichen auf %{site_title}"
   too_late_to_edit: "Dieser Beitrag wurde vor zu langer Zeit erstellt. Er kann nicht mehr bearbeitet oder gelöscht werden."
   revert_version_same: "Die aktuelle Version entspricht der Version, zu der du zurückkehren möchtest."
   excerpt_image: "Bild"
   queue:
     delete_reason: "Aus der Moderations-Warteschlange für Beiträge gelöscht"
+    not_found: "Seite nicht gefunden oder bereits aktualisiert."
   groups:
     success:
       bulk_add: "%{users_added} Benutzer wurden der Gruppe hinzugefügt."
@@ -222,6 +233,7 @@ de:
       invalid_incoming_email: "'%{email}' ist keine gültige E-Mail-Adresse."
       email_already_used_in_group: "'%{email}' wird bereits von der Gruppe '%{group_name}' verwendet."
       email_already_used_in_category: "'%{email}' wird bereits von der Kategorie '%{category_name}' verwendet."
+      cant_allow_membership_requests: "Du kannst Mitgliedschaftsanfragen nicht für eine Gruppe ohne Eigentümer erlauben."
     default_names:
       everyone: "jeder"
       admins: "admins"
@@ -232,6 +244,8 @@ de:
       trust_level_2: "vertrauensstufe_2"
       trust_level_3: "vertrauensstufe_3"
       trust_level_4: "vertrauensstufe_4"
+    request_membership_pm:
+      title: "Mitgliedschaftsanfrage für @%{group_name}"
   education:
     until_posts:
       one: "1 Beitrag"
@@ -318,6 +332,7 @@ de:
               too_many_users: "Du kannst eine Warnung nur an einen Benutzer zugleich anhängen."
               cant_send_pm: "Entschuldigung, du kannst diesem Benutzer keine Direktnachricht schicken."
               no_user_selected: "Du musst einen gültigen Benutzer auswählen."
+              reply_by_email_disabled: "Antwort per E-Mail ist deaktiviert."
             featured_link:
               invalid: "ist ungültig. URL sollte http:// oder https:// enthalten."
               invalid_category: "kann in dieser Kategorie nicht bearbeitet werden."
@@ -350,6 +365,14 @@ de:
           attributes:
             execute_at:
               in_the_past: "muss in der Zukunft liegen."
+        translation_overrides:
+          attributes:
+            value:
+              invalid_interpolation_keys: 'Die folgenden Erweiterungsschlüssel sind ungültig: "%{keys}"'
+        watched_word:
+          attributes:
+            word:
+              too_many: "Zu viele Wörter für diese Aktion"
       <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>Das „Über mich“-Feld in deinem Profil ist aktuell leer, <a href='/u/%{username_lower}/preferences/about-me'>möchtest du es ausfüllen?</a></div>"
@@ -359,9 +382,9 @@ 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)."
+  assets_topic_body: "Dieses Thema, sichtbar nur für das Team, dient dem Ablegen von Bildern und Dateien, die für das Seiten-Design verwendet werden. Bitte nicht löschen!\n\n\nUnd so funktioniert es:\n\n\n1. Antworte zu diesem Thema.\n2. Lade alle Bilder hoch, die du hier als Logos, Favicon usw. verwenden möchtest. (Verwende das Upload-Symbol im Beitrag-Editor oder ziehe Bilder direkt per Drag & Drop in den Editor.)\n3. Schicke deine Antwort ab, um sie als Beitrag zu erstellen.\n4. Klicke mit der rechten Maustaste auf die Bilder in deinem neuen Beitrag, um den Pfad zu den hochgeladenen Bildern zu erhalten, oder klicke auf das Bearbeitungssymbol und bearbeite deinen Beitrag, um den Pfad zu den Bildern zu ermitteln. Kopiere die Bildpfade..\n5. Füge diese Pfade in den [Grundeinstellungen](/admin/site_settings/category/required) ein.\n\n\nWenn es nötig ist, den Upload weiterer Dateitypen zu erlauben, bearbeite die Einstellung `authorized_extensions` in den [Datei-Einstellungen](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Willkommen bei Discourse"
     body: |2
@@ -412,6 +435,7 @@ de:
       invalid_email_in: "'%{email}' ist keine gültige E-Mail-Adresse."
       email_already_used_in_group: "'%{email}' wird bereits von der Gruppe '%{group_name}' verwendet."
       email_already_used_in_category: "'%{email}' wird bereits von der Kategorie '%{category_name}' verwendet."
+      description_incomplete: "Die Kategorie-Beschreibung muss mindestens einen Absatz enthalten."
     cannot_delete:
       uncategorized: "Die \"unkategorisiert\" Kategorie kann nicht gelöscht werden."
       has_subcategories: "Diese Kategorie kann nicht gelöscht werden, weil sie Unterkategorien besitzt."
@@ -432,6 +456,9 @@ de:
     leader:
       title: "Anführer"
     change_failed_explanation: "Du wolltest %{user_name} auf '%{new_trust_level}' zurückstufen. Die Vertrauensstufe ist jedoch bereits '%{current_trust_level}'. %{user_name} verbleibt auf '%{current_trust_level}'. Wenn du den Benutzer zurückstufen möchtest, musst du zuerst seine Vertrauensstufe sperren."
+  post:
+    image_placeholder:
+      broken: "Dieses Bild ist beschädigt"
   rate_limiter:
     slow_down: "Du hast diese Aktion zu oft durchgeführt. Versuche es später wieder."
     too_many_requests: "Diese Aktion kann nur ein begrenztes Mal pro Tag durchgeführt werden. Bitte warte %{time_left} bis zum nächsten Versuch."
@@ -611,12 +638,18 @@ de:
       short_description: 'Für diesen Beitrag abstimmen'
       long_form: 'für diesen Beitrag gestimmt'
   user_activity:
+    no_default:
+      self: "Du hast noch keine Aktivität."
+      others: "Keine Aktivität."
     no_bookmarks:
       self: "Du hast keine Beiträge mit Lesezeichen, Lesezeichen ermöglichen es dir, diese später einfach zu finden."
       others: "Keine Lesezeichen."
     no_likes_given:
       self: "Du hast noch keine Beiträge mit einem „Like“ markiert."
       others: "Keine Beiträge mit „Like“."
+    no_replies:
+      self: "Du hast auf keine Beiträge geantwortet."
+      others: "Keine Antworten."
   topic_flag_types:
     spam:
       title: 'Spam'
@@ -633,7 +666,7 @@ de:
       email_title: 'Das Thema "%{title}" benötigt die Aufmerksamkeit eines Moderators'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Dein Beitrag wurde von der Community gemeldet. Bitte <a href="/my/messages">lies deine Nachrichten</a>.</p>'
+    you_must_edit: '<p>Dein Beitrag wurde von der Community gemeldet. Bitte <a href="%{path}">überprüfe deine Nachrichten</a>.</p>'
     user_must_edit: '<p>Dieser Beitrag wurde von der Community gemeldet und ist vorübergehend ausgeblendet.</p>'
   archetypes:
     regular:
@@ -645,7 +678,7 @@ 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>."
+    description: "<b>%{email}</b> wurde abbestellt. Um deine E-Mail-Einstellungen zu ändern, <a href='%{url}'>besuche deine Benutzer-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"
@@ -856,15 +889,16 @@ de:
     search_tokenize_chinese_japanese_korean: "Zwinge die Suche Chinesisch, Japanisch und Koreanisch zu erkennen, auch wenn die Site keine dieser Sprachen nutzt"
     search_prefer_recent_posts: "Wenn das Durchsuchen deines großen Forums langsam ist, dann versucht diese Option zuerst einen Index der letzten Beiträge."
     search_recent_posts_size: "Wie viele letzte Beiträge im Index halten"
+    log_search_queries: "Protokolliere Suchanfragen von Benutzern"
+    search_query_log_max_size: "Maximale Anzahl von Suchanfragen, die vorgehalten werden"
     allow_uncategorized_topics: "Erlaube Themen ohne Kategorie zu erstellen. ACHTUNG: Falls es unkategorisierte Themen gibt, musst du sie neu kategorisieren, bevor du diese Option abschaltest."
     allow_duplicate_topic_titles: "Erlaube Themen mit identischen und doppelten Titeln."
     unique_posts_mins: "Minuten, nach denen ein Benutzer denselben Inhalt noch einmal schreiben kann."
     educate_until_posts: "Zeige das Hilfe-Panel im Editor sobald ein Benutzer einen seiner ersten (n) Beiträge zu schreiben beginnt."
     title: "Der Name dieser Site, wird für das Title-Tag verwendet."
     site_description: "Beschreibe diese Site in einem Satz. Wird für das \"description\" Meta-Tag verwendet."
-    contact_email: "Die E-Mail-Adresse des Hauptverantwortlichen dieser Site. Wird verwendet bei kritischen Benachrichtigungen wie beispielsweise unbearbeitete Meldungen, als auch solche die via /about Kontaktformular eintreffen. "
+    contact_email: "E-Mail-Adresse einer verantwortlichen Person für diese Community. Wird verwendet für kritische Benachrichtigungen sowie auf dem /about Kontaktformular für dringende Anfragen."
     contact_url: "URL für Kontaktanfragen bezüglich dieser Site. Wird unter /about im Kontaktformular für dringende Angelegenheiten verwendet."
-    queue_jobs: "NUR FÜR ENTWICKLER! ACHTUNG! Benutze Sidekiq zur Ausführung von Jobs. Wenn dies abgeschaltet wird, dann wird die Site nicht mehr richtig funktionieren!"
     crawl_images: "Lade Bilder von fremden URLs herunter, um ihre Höhe und Breite zu bestimmen."
     download_remote_images_to_local: "Lade eine Kopie von extern gehosteten Bildern herunter und ersetze Links in Beiträgen entsprechend; dies verhindert defekte Bilder."
     download_remote_images_threshold: "Minimal benötigter freier Festplattenspeicher um externe Bilder lokal herunterzuladen (in Prozent)"
@@ -879,18 +913,21 @@ de:
     fixed_category_positions: "Falls aktiviert können Kategorien in einer fest vorgegebenen Reihenfolge angeordnet werden. Andernfalls werden Kategorien nach Aktivität sortiert aufgelistet."
     fixed_category_positions_on_create: "Wenn aktiviert wird die Kategoriezuordnung beim Erstellen eines Themas erhalten (benötigt fixed_category_positions)."
     add_rel_nofollow_to_user_content: "Füge mit Ausnahme interner Links (schließt übergeordnete Domains ein) allen benutzergenerierten Inhalten 'rel nofollow' hinzu. Die Änderung dieser Einstellung erfordert, dass du sämtliche Markdown-Beiträge aktualisierst: \"rake posts:rebake\""
-    exclude_rel_nofollow_domains: "Eine Liste von Domains auf welchen das Attribut nofollow nicht auf Links gesetzt werden sollte (tld.com erlaubt auch sub.tld.com). Du solltest mindestens die Top-Level Domain dieser Site hinzufügen, damit die Crawler der Suchmaschinen all deinen Content indexieren können. Wenn weitere Teile deiner Website unter anderen Domains zu finden sind, kannst du diese hier ebenfalls hinzufügen."
+    exclude_rel_nofollow_domains: "Eine Liste von Domains, bei denen nofollow bei Links nicht hinzugefügt werden soll. example.com wird automatisch auch Subdomains wie sub.example.com erlauben. Zumindest solltest du die Domain dieser Seite hinzufügen, um Web-Crawlern zu helfen, alle Inhalte zu finden. Wenn andere Teile der Seite auf anderen Domains liegen, füge auch diese hinzu."
     post_excerpt_maxlength: "Maximale Länge eines Beitrags-Auszuges bzw. -Zusammfassung."
     show_pinned_excerpt_mobile: "Zeige einen Auszug angehefteter Themen in der mobilen Ansicht."
     show_pinned_excerpt_desktop: "Zeige einen Auszug angehefteter Themen in der Desktop-Ansicht."
     post_onebox_maxlength: "Maximale Länge eines Onebox-Discourse-Beitrags in Zeichen."
     onebox_domains_blacklist: "Eine Liste von Domains, die nie in eine Onebox umgewandelt wird."
+    inline_onebox_domains_whitelist: "Eine Liste von Domains, die in verkleinerter Form in eine Onebox umgewandelt werden, wenn sie ohne Titel verlinkt werden"
+    enable_inline_onebox_on_all_domains: "Ignoriere die `inline_onebox_domain_whitelist`-Seiteneinstellung und erlaube Inline-Oneboxen für alle Domains"
     max_oneboxes_per_post: "Maximale Anzahl von Oneboxes in einem Beitrag."
     logo_url: "Das Logo oben links auf deiner Site sollte eine breite, rechteckige Form haben. Wenn du kein Logo auswählst, wird stattdessen `title` angezeigt."
     digest_logo_url: "Das alternative Logo oben in den E-Mail-Zusammenfassungen deiner Site. Sollte eine breite, rechteckige Form haben. Sollte kein SVG-Bild sein. Wenn leer, wird `logo_url` verwendet."
     logo_small_url: "Dein Logo in klein für die obere linke Seite deiner Site, in Form eines rechteckigen Quadrates. Es wird angezeigt, wenn der Benutzer scrollt. Wenn du dieses Feld frei lässt, wird stattdessen ein Haus-Symbol angezeigt."
     favicon_url: "Das Favicon deiner Site. Besuche http://de.wikipedia.org/wiki/Favicon um weitere Informationen zu erhalten. Damit das Favicon korrekt über einen CDN-Service funktioniert, muss es eine .png Datei sein."
-    mobile_logo_url: "Das fixierte Logo in der oberen linken Hälfte der mobilen Siteversion. Es sollte eine quadratische Form haben. Wenn du dieses Feld frei lässt, wird `logo_url` benutzt. Z.B. http://example.com/uploads/default/logo.png"
+    mobile_logo_url: "Benutzerdefiniertes Logo für die mobile Seitenversion. Falls leer, wird `logo_url` verwendet. Beispiel: http://example.com/uploads/default/logo.png"
+    large_icon_url: "Bild wird als Logo/Startbild auf Android verwendet. Empfohlene Größe beträgt 512px mal 512px."
     apple_touch_icon_url: "Icon für berührungsempfindliche Apple-Geräte. Empfohlene Grösse ist 144px auf 144px."
     notification_email: "Die E-Mail-Adresse die als \"From:\" Absender aller wichtiger System-E-Mails benutzt wird. Die benutzte Domain sollte über korrekte SPF, DKIM und PTR Einträge verfügen, damit E-Mails sicher zugestellt werden können."
     email_custom_headers: "Eine durch senkrechte Striche getrennte Liste von eigenen E-Mail Headerzeilen"
@@ -903,6 +940,7 @@ de:
     summary_percent_filter: "Zeige die besten (n)% der Beiträge eines Themas in der \"Thema zusammenfassen\"-Ansicht."
     summary_max_results: "Maximale Anzahl der sichtbaren Beiträge beim Zusammenfassen von Themen"
     enable_private_messages: "Erlaube Benutzer mit der Vertrauensstufe 1 (konfigurierbar über die minimale Vertrauensstufe zum Senden von Nachrichten), Nachrichten zu erstellen und auf Nachrichten zu antworten. Beachte, dass das Team immer Nachrichten und Antworten senden können."
+    enable_private_email_messages: "Erlaube Benutzern mit Vertrauensstufe 4 (konfigurierbar über die Mindestvertrauensstufe, um Nachrichten zu senden), private E-Mail-Nachrichten zu senden. Bitte beachte, dass Team-Mitglieder immer und in jedem Fall Nachrichten senden können."
     enable_long_polling: "Nachrichtenbus für Benachrichtigungen kann Long-Polling nutzen."
     long_polling_base_url: "Basis-URL für Long Polling (wenn zum Ausliefern von dynamischen Inhalten ein CDN verwendet wird, setze es auf Origin Pull), z. B. http://origin.site.com"
     long_polling_interval: "Wartezeit, bevor der Server auf Clients reagiert, wenn keine Daten gesendet werden müssen (nur für angemeldete Benutzer)"
@@ -916,28 +954,29 @@ de:
     tl2_additional_likes_per_day_multiplier: "Limit für \"Gefällt mir\" für Benutzer auf Vertrauensstufe 2 (Mitglied) mit diesem Faktor multiplizieren"
     tl3_additional_likes_per_day_multiplier: "Limit für \"Gefällt mir\" für Benutzer auf Vertrauensstufe 3 (Stammgast) mit diesem Faktor multiplizieren"
     tl4_additional_likes_per_day_multiplier: "Limit für \"Gefällt mir\" für Benutzer auf Vertrauensstufe 4 (Anführer) mit diesem Faktor multiplizieren"
-    num_spam_flags_to_block_new_user: "Verstecke alle Beiträge eines neuen Benutzers und erlaube keine neuen Beiträge mehr, wenn der neue Benutzer die hier angegebene Zahl an Meldungen bezüglich Spam von num_users_to_block_new_user verschiedenen anderen Benutzern erhalten hat. 0 deaktiviert diese Funktion."
-    num_users_to_block_new_user: "Wenn Beiträge eines neuen Benutzers so viele Spam-Meldungen von num_spam_flags_to_block_new_user verschiedenen Benutzern mit Vertrauensstufe 3 erhält, werden alle Beiträge des Benutzers ausgeblendet und weitere Beiträge verhindert. 0, um die Funktion zu deaktivieren."
-    num_tl3_flags_to_block_new_user: "Wenn Beiträge eines neuen Benutzers so viele Meldungen von num_tl3_users_to_block_new_user verschiedenen Benutzern mit Vertrauensstufe 3 erhält, werden alle Beiträge des Benutzers ausgeblendet und weitere Beiträge verhindert. 0, um die Funktion zu deaktivieren."
-    num_tl3_users_to_block_new_user: "Wenn Beiträge eines neuen Benutzers so viele Meldungen von num_tl3_users_to_block_new_user verschiedenen Benutzern mit Vertrauensstufe 3 erhält, werden alle Beiträge des Benutzers ausgeblendet und weitere Beiträge verhindert. 0, um die Funktion zu deaktivieren."
-    notify_mods_when_user_blocked: "Wenn ein Benutzer automatisch gesperrt wird, sende eine Nachricht an alle Moderatoren."
+    num_spam_flags_to_silence_new_user: "Wenn Beiträge eines neuen Benutzers von num_users_to_silence_new_user verschiedenen Benutzern gemeldet wird, verstecke alle Beiträge des Benutzers und erlaube keine weiteren Beiträge. Ein Wert von 0 deaktiviert diese Funktion."
+    num_users_to_silence_new_user: "Wenn Beiträge eines neuen Benutzers Spam-Meldungen von num_spam_flags_to_block_new_user verschiedenen Benutzern erhalten, werden alle Beiträge des Benutzers ausgeblendet und weitere Beiträge verhindert. Ein Wert von 0 deaktiviert die Funktion."
+    num_tl3_flags_to_silence_new_user: "Wenn Beiträge eines neuen Benutzers von num_tl3_users_to_silence_new_user verschiedenen Benutzern mit Vertrauensstufe 3 gemeldet werden, verstecke alle Beiträge des Benutzers und erlaube keine weiteren Beiträge. Ein Wert von 0 deaktiviert diese Funktion."
+    num_tl3_users_to_silence_new_user: "Wenn Beiträge eines neuen Benutzers von num_tl3_users_to_silence_new_user verschiedenen Benutzern mit Vertrauensstufe 3 gemeldet werden, verstecke alle Beiträge des Benutzers und erlaube keine weiteren Beiträge. Ein Wert von 0 deaktiviert diese Funktion."
+    notify_mods_when_user_silenced: "Wenn ein Benutzer automatisch stummgeschaltet 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)"
+    enable_markdown_typographer: "Verwende grundlegende typografische Regeln, um die Lesbarkeit von Absätzen zu erhöhen, ersetzt (c) (tm) usw. durch Symbole, reduziert die Anzahl von Lesezeichen und so weiter"
     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."
     maximum_session_age: "Benutzer bleiben (n) Stunden nach ihrem letzten Besuch angemeldet"
-    ga_tracking_code: "VERALTET: Google Analytics (analytics.js) tracking code code, z.B.: UA-12345678-9; siehe http://google.com/analytics"
-    ga_domain_name: "VERALTET: Google Analytics (analytics.js) Domain-Name, z.B.: mysite.com; siehe http://google.com/analytics"
     ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code code, beispielsweise: UA-12345678-9; Siehe http://google.com/analytics"
     ga_universal_domain_name: "Google Universal Analytics (analytics.js) domain name, eg: mysite.com; Siehe http://google.com/analytics"
+    ga_universal_auto_link_domains: "Aktiviere Google Universal Analytics (analytics.js) Cross-Domain-Tracking. Ausgehenden Links zu diesen Domains wird eine Client-ID hinzugefügt. Siehe Googles Anleitung zu Cross-Domain Tracking."
     gtm_container_id: "Google Tag Manager Container-ID, z.B.: GTM-ABCDEF"
     enable_escaped_fragments: "Als Fallback die Ajax-Crawling-API von Google verwenden, wenn keine Suchmaschine deaktiviert wurde. Siehe https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
     allow_moderators_to_create_categories: "Erlaube Moderatoren neue Kategorien zu erstellen"
     cors_origins: "Erlaubte Adressen für Cross-Origin-Requests (CORS). Jede Adresse muss http:// oder https:// enthalten. Die Umgebungsvariable DISCOURSE_ENABLE_CORS muss gesetzt sein, um CORS zu aktivieren."
     use_admin_ip_whitelist: "Administratoren können sich nur anmelden, wenn sie von einer IP-Adresse aus zugreifen, welcher unter den vertrauenswürden IP-Adressen gelistet ist (Admin > Logs > Screened Ips)."
     blacklist_ip_blocks: "Eine Liste von privaten IP-Blöcken, die nie von Discourse indiziert werden sollen"
+    whitelist_internal_hosts: "Eine Liste interner Hostnamen, die Discourse sicher abrufen kann für Oneboxing und andere Zwecke"
+    allowed_iframes: "Eine Liste von iframe-src-Domain-Präfixen, die Discourse in Beiträgen sicher erlauben kann."
     top_menu: "Legt fest, welche Elemente in der Navigationsleiste der Startseite auftauchen sollen, und in welcher Reihenfolge. Beispiel: latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "Legt fest, welche Funktionen in welcher Reihenfolge im Beitragsmenü auftauchen. Beispiel: like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Die Einträge im Menü eines Beitrags, die standardmäßig hinter einer erweiterbaren Ellipse versteckt werden sollen."
@@ -955,18 +994,17 @@ de:
     top_page_default_timeframe: "Standardzeitfenster für die oberste, angezeigte Seite."
     show_email_on_profile: "Im Profil die E-Mail-Adresse des Benutzers anzeigen (ist nur für den Benutzer selbst und das Team sichtbar)."
     prioritize_username_in_ux: "Zeige den Benutzernamen auf der Benutzerseite, der Benutzerkarte und in Beiträgen an erster Stelle (wenn deaktiviert, wird der Name an erster Stelle angezeigt)"
+    enable_rich_text_paste: "Aktiviere automatische Umwandlung von HTML in Markdown beim Einfügen von Text in den Editor. (Experimentell)"
     email_token_valid_hours: "Tokens zur Passwort-Wiederherstellung / Aktivierung eines Kontos sind für (n) Stunden gültig."
     enable_badges: "Abzeichen aktivieren"
     enable_whispers: "Erlaube dem Team private Kommunikation innerhalb von Themen."
     allow_index_in_robots_txt: "Suchmaschinen mittels der robots.txt Datei erlauben, die Site zu indizieren."
     email_domains_blacklist: "Eine durch senkrechte Striche getrennte Liste von E-Mail-Domains, die für die Registrierung neuer Konten nicht verwendet werden dürfen. Beispiel: mailinator.com|trashmail.net"
     email_domains_whitelist: "Eine durch senkrechte Striche getrennte Liste von E-Mail-Domains, die für die Registrierung neuer Konten verwendet werden können. ACHTUNG: Benutzer mit E-Mail-Adressen anderer Domains werden nicht zugelassen!"
-    forgot_password_strict: "Benutzer nicht informieren, ob ein Konto existiert, wenn sie den Passwort vergessen-Dialog verwenden."
+    hide_email_address_taken: "Teile Benutzer während der Registrierung und beim „Passwort vergessen“-Formular nicht mit, wenn ein Konto mit der angegebenen E-Mail-Adresse existiert."
     log_out_strict: "Beim Abmelden ALLE Sitzungen des Benutzers auf allen Geräten beenden"
     version_checks: "Kontaktiere den Discourse Hub zur Überprüfung auf neue Versionen und zeige Benachrichtigungen über neue Versionen auf der Administratorkonsole an."
     new_version_emails: "Sende eine E-Mail an die contact_email Adresse wenn eine neue Version von Discourse verfügbar ist."
-    port: "NUR FÜR ENTWICKLER! ACHTUNG! Benutze diesen HTTP-Port statt dem Standardport 80. Diese Feld leer lassen heißt 'keinen'. Dient hauptsächlich Entwicklungszwecken."
-    force_hostname: "NUR FÜR ENTWICKLER! ACHTUNG! Spezifiziere einen Hostnamen in der URL. Dieses Feld leer lassen heißt 'keinen'. Dient hauptsächlich Entwicklungszwecken."
     invite_expiry_days: "Tage, die Benutzereinladungen gültig bleiben."
     invite_passthrough_hours: "Wie viele Stunden ein Benutzer einen bereits eingelösten Einladungsschlüssel zum Anmelden verwenden kann"
     invite_only: "Die öffentliche Registrierungen ist deaktiviert, neue Benutzer müssen explizit vom Team eingeladen werden."
@@ -1011,6 +1049,7 @@ de:
     github_client_id: "Client-ID für GitHub-uthentifizierung, registriert auf https://github.com/settings/applications"
     github_client_secret: "Client Secret für GitHub-Authentifizierung, registriert auf https://github.com/settings/applications"
     readonly_mode_during_backup: "Nur-Lesen-Modus beim Erstellen einer Sicherung aktivieren"
+    enable_backups: "Erlaube Administratoren, Backups des Forums zu erstellen"
     allow_restore: "Wiederherstellung von Sicherungen zulassen, die ALLE vorhandenen Daten überschreiben! Auf 'false' lassen, sofern Sie nicht planen, eine Sicherung wiederherzustellen."
     maximum_backups: "Die maximale Anzahl an Sicherungen, die auf dem Server gespeichert werden. Ältere Sicherungen werden automatisch gelöscht."
     automatic_backups_enabled: "Automatische Backups aktivieren. Die Backups werden im eingestellten Zeitintervall erstellt."
@@ -1050,7 +1089,7 @@ de:
     clean_up_uploads: "Lösche verwaiste Uploads, um illegales Hosting zu vermeiden. ACHTUNG: du solltest ein Backup deines /uploads-Verzeichnis erstellen, bevor du diese Funktion aktivierst."
     clean_orphan_uploads_grace_period_hours: "Schonfrist (in Stunden), bevor ein verwaister Upload entfernt wird."
     purge_deleted_uploads_grace_period_days: "Schonfrist (in Tagen), bevor ein entfernter Upload endgültig gelöscht wird."
-    purge_unactivated_users_grace_period_days: "Schonfrist (in Tagen), bevor ein Benutzer, der sein Konto nicht aktiviert hat, gelöscht wird."
+    purge_unactivated_users_grace_period_days: "Frist (in Tagen), bevor ein Benutzer gelöscht wird, der sein Konto nicht aktiviert hat. Setze sie auf 0, um nicht aktivierte Benutzer nie zu bereinigen."
     enable_s3_uploads: "Speichere hochgeladene Dateien auf Amazon S3. WICHTIG: benötigt gültige S3 Anmeldedaten (sowohl access_key_id als auch secret_access_key)."
     s3_use_iam_profile: 'Benutze die AWS EC2 IAM Rolle zum Abrufen von Keys. ANMERKUNG: Das Aktivieren überschreibt die Einstellungen „s3 access key id“ und „s3 secret access key“.'
     s3_upload_bucket: "Der Name des Amazon S3 Buckets, in dem hochgeladene Dateien gespeichert werden sollen. ACHTUNG: nur Kleinbuchstaben, keine Punkte, keine Unterstriche."
@@ -1065,6 +1104,8 @@ de:
     twitter_summary_large_image_url: "URL des Bildes, das standardmäßig in Twitter-Cards angezeigt wird (sollte mindestens 280 Pixel breit und 150 Pixel hoch sein)."
     allow_all_attachments_for_group_messages: "Erlaube alle E-Mail-Anhänge für Gruppen-Nachrichten."
     png_to_jpg_quality: "Qualität der umgewandelten JPG-Datei (1 ist die niedrigste, 99 die beste Qualität, 100 deaktiviert die Funktion)."
+    allow_staff_to_upload_any_file_in_pm: "Erlaube Team-Mitgliedern, in Nachrichten alle Dateien hochzuladen."
+    strip_image_metadata: "Bild-Metadaten entfernen."
     enable_flash_video_onebox: "Aktiviere das Einbinden von swf und flv (Adobe Flash) Links in einer Onebox. ACHTUNG: Kann ein Sicherheitsrisiko sein."
     default_invitee_trust_level: "Standardwert für die Vertrauensstufe eines eingeladenen Benutzers (0-4)."
     default_trust_level: "Standardwert für die Vertrauensstufe (0-4) für alle neuen Benutzer. ACHTUNG! Diesen Wert anzuheben kann zu erhöhtem Spam-Aufkommen führen!"
@@ -1097,6 +1138,7 @@ de:
     min_trust_to_edit_post: "Die minimal benötigte Vertrauensstufe, um Beiträge bearbeiten zu können."
     min_trust_to_allow_self_wiki: "Die minimale Vertrauensstufe, die ein Benutzer haben muss, um einen eigenen Wiki Eintrag zu erstellen."
     min_trust_to_send_messages: "Benötigte Vertrauensstufe um neue private Nachrichten erstellen zu dürfen."
+    min_trust_to_send_email_messages: "Mindestvertrauensstufe, die nötig ist, um neue private Nachrichten per E-Mail (an vorbereitete Benutzer) zu schicken."
     newuser_max_links: "Maximale Anzahl der Links, die neue Benutzer Beiträgen hinzufügen dürfen."
     newuser_max_images: "Maximale Anzahl der Bilder, die neue Benutzer Beiträgen hinzufügen dürfen."
     newuser_max_attachments: "Maximale Anzahl der Dateien, die neue Benutzer Beiträgen hinzufügen dürfen."
@@ -1104,6 +1146,7 @@ de:
     newuser_max_replies_per_topic: "Maximale Anzahl an Antworten, die ein neuer Benutzer in einem einzigen Thema geben darf, bevor jemand auf diese antwortet."
     max_mentions_per_post: "Maximale Anzahl der @Namens-Erwähnungen, die jemand in einem Beitrag nutzen kann."
     max_users_notified_per_group_mention: "Maximale Anzahl von Benutzern die eine Benachrichtigung erhalten, wenn eine Gruppe erwähnt wird (wenn der Schwellenwert erreicht wird, wird keine Benachrichtigung erzeugt)"
+    enable_mentions: "Erlaube Benutzern, andere Benutzer zu erwähnen."
     create_thumbnails: "Erzeuge ein Vorschaubild und eine Lightbox für Bilder, die zu groß sind, um in einem Beitrag angezeigt zu werden."
     email_time_window_mins: "Warte (n) Minuten bevor eine E-Mail-Benachrichtigung geschickt wird, um Benutzern Gelegenheit zu geben, ihre Beiträge abschließend bearbeiten zu können."
     private_email_time_window_seconds: "Warte (n) Sekunden bevor eine E-Mail-Benachrichtigung geschickt wird, um Benutzern Gelegenheit zu geben, ihre Beiträge abschließend bearbeiten zu können."
@@ -1156,9 +1199,10 @@ de:
     num_hours_to_close_topic: "Anzahl Stunden, um ein Thema als Maßnahme zu pausieren."
     auto_respond_to_flag_actions: "Automatische Antwort auf abgearbeitete Meldungen aktivieren."
     min_first_post_typing_time: "Minimale Zeit die ein Benutzer mindestens aufwenden muss, um einen Beitrag zu schreiben. Wenn diese Zeit unterschritten wird, wird der Beitrag automatisch in die Warteschlange für freizuschaltende Beiträge verschoben. Setze diesen Wert auf 0 um dieses Verhalten zu deaktivieren (nicht empfohlen)."
-    auto_block_fast_typers_on_first_post: "Blockiere Benutzer automatisch, welche unterhalb der min_first_post_typing_time liegen."
-    auto_block_fast_typers_max_trust_level: "Maximale Vertrauensstufe um \"Schnelltipper\" automatisch zu blockieren."
-    auto_block_first_post_regex: "Regulärer Ausdruck der dafür sorgt dass passende erste Beiträge von Benutzern genehmigt werden müssen. Groß- und Kleinschreibung wird nicht beachtet.\nBeispiel: raging|a[bc]a blockiert alle ersten Beiträge, die raging, aba oder aca beinhalten. Wird nur auf den ersten Beitrag angewendet."
+    auto_silence_fast_typers_on_first_post: "Benutzer automatisch stummschalten, die nicht der min_first_post_typing_time entsprechen."
+    auto_silence_fast_typers_max_trust_level: "Maximale Vertrauensstufe, um „Schnelltipper“ stummzuschalten."
+    auto_silence_first_post_regex: "Regulärer Ausdruck (ohne Groß- und Kleinschreibung), der dafür sorgt dass entsprechende erste Beiträge von Benutzern stummgeschaltet und in die Genehmigungswarteschlange verschoben werden. Beispiel: raging|a[bc]a sorgt dafür, dass Beiträge, die raging, aba oder aca enthalten, zunächst stummgeschaltet werden. Dies betrifft jedoch nur den ersten Beitrag."
+    flags_default_topics: "Zeige gemeldete Themen standardmäßig im Administrationsbereich"
     reply_by_email_enabled: "Aktviere das Antworten auf Themen via E-Mail."
     reply_by_email_address: "Vorlage für die Antwort einer per E-Mail eingehender E-Mail-Adresse, zum Beispiel: %{reply_key}@reply.example.com oder replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Liste alternativer Vorlagen für eingehende E-Mail-Adressen für das Antworten per E-Mail. Beispiel: %{reply_key}@antwort.example.com|antworten+%{reply_key}@example.com"
@@ -1197,15 +1241,16 @@ de:
     pop3_polling_username: "Benutzername für die POP3-Abfrage."
     pop3_polling_password: "Passwort für die POP3-Abfrage."
     log_mail_processing_failures: "Protokolliere Fehler bei der E-Mail-Verarbeitung in http://yoursitename.com/logs"
-    email_in: "Erlaube Benutzern neue Themen per E-Mail (benötigt POP3-Abfrage) zu erstellen. Konfiguriere die Adressen im Reiter „Einstellungen“ für jede Kategorie."
+    email_in: "Erlaube Benutzern, neue Themen per E-Mail einzutragen (erfordert manuelles oder POP3-Polling). Konfiguriere die Adressen im „Einstellungen“-Reiter in jeder Kategorie."
     email_in_min_trust: "Minimale Vertrauensstufe um neue Themen per E-Mail erstellen zu können."
     email_prefix: "Das [Präfix], das für den Betreff von E-Mails genutzt wird. Standardwert ist 'title', wenn nicht gesetzt."
     email_site_title: "Titel der Site, der als Absender beim Versand von E-Mails verwendet wird. Wenn nicht angegeben wird 'title' verwendet. Verwende diese Einstellung, wenn 'title' spezielle Zeichen enthält, die im Absender-Feld einer E-Mail nicht verwendet werden dürfen."
+    find_related_post_with_key: "Verwende nur den 'Antwort-Schlüssel', um den Beitrag zu finden, auf den geantwortet wurde. WARNUNG: Wenn dies deaktiviert wird, können Benutzer auf Grundlage der E-Mail-Adresse nachgeahmt werden."
     minimum_topics_similar: "Wie viele Themen existieren müssen, bevor beim Erstellen eines neuen Themas eine Liste ähnlicher Themen angezeigt wird."
     relative_date_duration: "Anzahl von Tagen während derer das Datum eines Beitrags relativ (7T) und nicht absolut (20. Feb) angegeben wird."
     delete_user_max_post_age: "Verhindere das Löschen von Benutzerkonten, deren erster Beitrag mehr als (x) Tage alt ist."
     delete_all_posts_max: "Die maximale Anzahl von Beiträgen welche auf einmal gelöscht werden kann. Hat ein Benutzer mehr Beiträge, so können die Beiträge nicht auf einmal und der Benutzer nicht gelöscht werden."
-    username_change_period: "Die Anzahl der Tage, die neu registrierte Benutzer Zeit haben, um ihren Benutzernamen zu ändern (0 verbietet Änderungen)."
+    username_change_period: "Die maximale Anzahl von Tagen, nach der Konten ihren Benutzernamen ändern können (0 verbietet die Änderung des Benutzernamen)."
     email_editable: "Erlaube Benutzern ihre E-Mail-Adresse nach der Registrierung zu ändern."
     logout_redirect: "Benutzer nach dem Abmelden auf diese Adresse umleiten (z.B. http://somesite.com/logout)"
     allow_uploaded_avatars: "Benutzer können eigene Profilbilder hochladen."
@@ -1220,7 +1265,7 @@ de:
     suppress_digest_email_after_days: "Unterdrücke E-Mail-Zusammenfassungen für Benutzer, die länger als (n) Tage nicht auf der Seite gesehen wurden."
     digest_suppress_categories: "Unterdrücke diese Kategorien in E-Mail-Zusammenfassungen."
     disable_digest_emails: "Deaktiviere E-Mail-Zusammenfassungen für alle Benutzer."
-    email_accent_bg_color: "Die Hervorhebungsfarbe, die als Hintergrund mancher Elemente in HTML-E-Mails verwendet wird. Gib’ einen Namen ('red') oder einen Hex-Wert ('#FF000') der Farbe an."
+    email_accent_bg_color: "Die Hervorhebungsfarbe, die als Hintergrundfarbe bestimmter Elemente in HTML-Mails verwendet wird. Gib einen Farbnamen an (z.B. 'red' für rot) oder einen Hex-Wert ('#FF0000')."
     email_accent_fg_color: "Gib’ einen Namen ('white') oder einen Hex-Wert ('#FFFFFF') der Farbe an."
     email_link_color: "Die Farbe von Links in HTML-Mails. Gib’ einen Namen ('blue') oder einen Hex-Wert ('#0000FF') der Farbe an."
     detect_custom_avatars: "Aktiviere diese Option, um zu überprüfen, ob Benutzer eigene Profilbilder hochgeladen haben."
@@ -1233,6 +1278,8 @@ de:
     anonymous_posting_min_trust_level: "Vertrauensstufe, ab der das Schreiben anonymer Beiträge erlaubt ist"
     anonymous_account_duration_minutes: "Erzeuge alle (n) Minuten ein neues anonymes Konto je Benutzer, um die Anonymität der virtuellen anonymen Benutzer zu gewährleisten. Beispiel: Ein Wert von 600 sorgt dafür, dass ein neues anonymes Konto erzeugt wird, wenn ein Benutzer in den anonymen Modus wechselt UND mindestens 600 Minuten seit der letzten anonymen Nachricht dieses Benutzers vergangen sind."
     hide_user_profiles_from_public: "Deaktiviert Benutzerkarten, Benutzerprofile und das Benutzerverzeichnis für anonyme Benutzer."
+    show_inactive_accounts: "Erlaube angemeldeten Benutzern, die Profile inaktiver Benutzer anzuschauen."
+    hide_suspension_reasons: "Zeige Sperrgründe nicht öffentlich auf Benutzerprofilen an."
     user_website_domains_whitelist: "Benutzer-Webseiten werden mit diesen Domains abgeglichen. Mehrere Domains können mit einem Pipe-Symbol „|“ getrennt angegeben werden."
     allow_profile_backgrounds: "Erlaubt es Benutzern, Profilhintergründe hochzuladen."
     sequential_replies_threshold: "Anzahl an Beiträgen die ein Benutzer machen muss, um benachrichtigt zu werden, dass er zu viele aufeinanderfolgende Antworten schreibt."
@@ -1249,6 +1296,7 @@ de:
     topic_page_title_includes_category: "Name des Themas enthält den Namen der Kategorie."
     native_app_install_banner: "Wiederkehrende Benutzer dazu einladen, die native Discourse-App herunterzuladen."
     share_anonymized_statistics: "Anonymisierte Nutzungsdaten teilen."
+    auto_handle_queued_age: "Bearbeite Einträge automatisch, die so viele Tage auf Überprüfung warten. Meldungen werden ignorieren. Beiträge und Benutzer in der Warteschlange werden zurückgewiesen. Setze den Wert auf 0, um diese Funktion zu deaktivieren."
     max_prints_per_hour_per_user: "Maximale Anzahl von Aufrufen der Druckansicht pro Nutzer pro Stunde (0 zum deaktivieren)"
     full_name_required: "Der voller Name wird für das Benutzerprofil benötigt."
     enable_names: "Zeigt den vollen Namen eines Benutzers auf dem Profil, der Benutzerkarte und in E-Mails an. Wenn deaktiviert wird der volle Name überall ausgeblendet."
@@ -1259,18 +1307,10 @@ de:
     warn_reviving_old_topic_age: "Wenn jemand beginnt auf ein Thema zu antworten, dessen letzte Antwort älter als diese Anzahl an Tagen ist, wird eine Warnung angezeigt. Deaktiviere dies durch setzen auf 0."
     autohighlight_all_code: "Erzwinge Syntaxhervorhebung für alle Quellcode-Blöcke, auch dann wenn keine Sprache angeben wurde."
     highlighted_languages: "Aktivierter Regeln für das Syntax-Hervorhebung. (Warnung: Das Aktivieren zu vieler Sprachen kann die Leistung beeinträchtigen) siehe: https://highlightjs.org/static/demo/ für eine Demonstration"
-    feed_polling_enabled: "NUR WENN EINGEBETTET: Bestimmt, ob Inhalte eines RSS-/ATOM-Feeds als zusätzliche Beiträge dargestellt werden."
-    feed_polling_url: "NUR WENN EINGEBETTET: URL des einzubettenden RSS-/ATOM-Feeds."
-    feed_polling_frequency_mins: "NUR EINBETTUNG: Häufigkeit der Abfrage"
-    embed_by_username: "Discourse-Benutzername des Benutzers, der die eingebetteten Themen erstellt."
-    embed_username_key_from_feed: "Schlüssel, um Discourse-Benutzernamen aus Feed zu ermitteln."
-    embed_title_scrubber: "Regulärer Ausdruck (Regex) um eingebettete Titel zu bereinigen"
     embed_truncate: "Kürze die eingebetteten Beiträge"
     allowed_href_schemes: "URI-Schemas, die in Links zusätzlich zu http und https erlaubt sind."
     embed_post_limit: "Maximale Anzahl der Beiträge die eingebettet werden."
     embed_username_required: "Der Benutzername ist für die Themenerstellung notwendig"
-    embed_whitelist_selector: "CSS-Selektor für Elemente, die in Einbettungen erlaubt sind."
-    embed_blacklist_selector: "CSS-Selektor für Elemente, die in Einbettungen entfernt werden."
     notify_about_flags_after: "Wenn es Meldungen gibt, die nicht innerhalb der angegebenen Anzahl von Stunden behandelt wurden, sende eine Nachricht an das Team. Ein Wert von 0 deaktiviert die Funktion."
     show_create_topics_notice: "Administratoren eine Warnmeldung anzeigen, wenn im Forum weniger als 5 öffentlich sichtbare Themen existieren."
     delete_drafts_older_than_n_days: Lösche Entwürfe, die mehr als (n) Tage alt sind.
@@ -1287,6 +1327,8 @@ de:
     auto_close_messages_post_count: "Maximale Anzahl von Beiträgen, die in einer Nachricht erlaubt sind, bevor sie automatisch geschlossen wird (0 = ausgeschaltet)"
     auto_close_topics_post_count: "Maximale Anzahl von Beiträgen, die in einem Thema erlaubt sind, bevor es automatisch geschlossen wird (0 = ausgeschaltet)"
     code_formatting_style: "Code-Schaltfläche im Editor wird standardmäßig diesen Formatierungsstil anwenden"
+    max_allowed_message_recipients: "Maximale Anzahl von Empfängern in einer Nachricht."
+    watched_words_regular_expressions: "Beobachtete Wörter sind reguläre Ausdrücke."
     default_email_digest_frequency: "Wie häufig sollen Benutzer standardmäßig E-Mail-Zusammenfassungen erhalten?"
     default_include_tl0_in_digests: "Beiträge von neuen Benutzern in E-Mail-Zusammenfassungen standardmäßig anzeigen. Benutzer können dies in ihren Einstelllungen ändern."
     default_email_private_messages: "Sende einem Benutzer standardmäßig eine E-Mail, wenn dieser eine Nachricht von einem anderen Benutzer erhält."
@@ -1310,8 +1352,7 @@ de:
     default_categories_tracking: "Liste der standardmäßig gefolgten Kategorien."
     default_categories_muted: "Liste der standardmäßig stummgeschalteten Kategorien."
     default_categories_watching_first_post: "Liste von Kategorien, in denen der erste Beiträge in jedem neuen Thema automatisch beobachtet wird."
-    max_user_api_reqs_per_day: "Maximale Zahl der Benutzer API Anfragen pro Schlüssel pro Tag"
-    max_user_api_reqs_per_minute: "Maximale Zahl der Benutzer API Anfragen pro Schlüssel pro Minute"
+    retain_web_hook_events_period_days: "Anzahl an Tagen, die Web-Hook-Ereigniseinträge aufbewahrt werden"
     allow_user_api_keys: "Erlaube das Generieren von Benutzer-API-Schlüsseln"
     allow_user_api_key_scopes: "Liste erlaubter Scopes für Benutzer-API-Schlüssel"
     max_api_keys_per_user: "Maximale Zahl der Benutzer API Anfragen pro Benutzer"
@@ -1357,12 +1398,18 @@ de:
       email_polling_disabled: "Du musst entweder manuelles oder POP3 polling aktivieren, bevor per E-Mail antworten aktiviert wird"
       user_locale_not_enabled: "Du musst zuerst 'allow user locale' aktivieren bevor du dies aktivierst"
       invalid_regex: "Regulärer Ausdruck ist ungültig oder nicht erlaubt."
+      email_editable_enabled: "Du musst die Einstellung 'email editable' deaktivieren, bevor du diese Einstellung aktivierst."
+      enable_sso_disabled: "Du musst erst die Einstellung 'enable sso' aktivieren, bevor du diese Einstellung aktivierst."
+      staged_users_disabled: "Du musst erst 'vorbereitete Benutzer' aktivieren, bevor du diese Einstellung aktivierst."
+      reply_by_email_disabled: "Du musst erst 'Antwort per E-Mail' aktivieren, bevor du diese Einstellung aktivierst."
+      sso_url_is_empty: "Du musst erst eine 'sso url' angeben, bevor du diese Einstellung aktivierst."
   search:
     within_post: "#%{post_number} von %{username}"
     types:
       category: 'Kategorien'
       topic: 'Ergebnisse'
       user: 'Benutzer'
+    results_page: "Suchergebnisse für '%{term}'"
   sso:
     login_error: "Fehler bei der Anmeldung"
     not_found: "Dein Konto wurde nicht erkannt. Bitte kontaktiere den Administrator dieser Site."
@@ -1473,7 +1520,8 @@ de:
     email_too_long: "Die von dir eingegebene E-Mail-Adresse ist zu lang. Der Teil vor dem @ darf maximal 254 Zeichen lang sein und Domain-Namen maximal 253 Zeichen."
     reserved_username: "Der Benutzername ist nicht erlaubt."
     missing_user_field: "Du hast nicht alle Benutzerangaben ausgefüllt"
-    close_window: "Authentifizierung abgeschlossen. Schließe das Fenster um fortzufahren."
+    auth_complete: "Authentifizierung ist abgeschlossen."
+    click_to_continue: "Klicke hier um fortzufahren."
     already_logged_in: "Hoppla, es sieht so aus als ob du versuchst die Einladung für einen anderen Benutzer zu akzeptieren. Wenn du nicht %{current_user} bist, melde dich bitte ab und versuch es erneut."
   user:
     no_accounts_associated: "Es sind keine Konten zugeordnet"
@@ -1485,7 +1533,7 @@ de:
     username:
       short: "muss mindestens %{min} Zeichen lang sein"
       long: "darf nicht länger als %{max} Zeichen sein"
-      characters: "darf nur aus Zahlen und Buchstaben bestehen"
+      characters: "darf nur Zahlen, Buchstaben, Bindestriche und Unterstriche enthalten"
       unique: "muss eindeutig sein"
       blank: "muss angegeben werden"
       must_begin_with_alphanumeric_or_underscore: "muss mit einem Buchstaben, einer Zahl oder einem Unterstrich beginnen"
@@ -1501,6 +1549,11 @@ de:
       max_new_accounts_per_registration_ip: "Weitere Registrierungen sind von deiner IP-Adresse aus nicht gestattet (limit erreicht). Kontaktiere einen Administrator mit dem Problem damit er dir helfen kann."
     website:
       domain_not_allowed: "Webseite ist ungültig. Erlaubte Domains sind: %{domains}"
+    auto_rejected: "Automatisch abgelehnt aufgrund des Alters. Siehe Seiteneinstellung auto_handle_queued_age."
+    destroy_reasons:
+      unused_staged_user: "Unbenutztes, vorbereiteter Benutzerkonto"
+      fixed_primary_email: "Primäre E-Mail-Adresse für vorbereitetes Benutzerkonto korrigiert"
+      same_ip_address: "Gleiche IP-Adresse (%{ip_address}) wie andere Benutzer"
   flags_reminder:
     flags_were_submitted:
       one: "Meldungen wurden vor über 1 Stunde eingereicht. [Bitte übeprüfe sie](/admin/flags)."
@@ -1521,70 +1574,70 @@ de:
       Wenn du weiterhin E-Mail-Aktualisierungen erhalten möchtest, kannst du diese E-Mail ignorieren.
   invite_mailer:
     title: "Einladung zu einem Thema"
-    subject_template: "%{invitee_name} hat dich zum Thema '%{topic_title}' auf %{site_domain_name} eingeladen"
+    subject_template: "%{inviter_name} hat dich eingeladen zum Thema '%{topic_title}' auf %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} hat dich eingeladen zur Diskussion
+      %{inviter_name} hat dich eingeladen zur Diskussion
 
       > **%{topic_title}**
       >
       > %{topic_excerpt}
 
-      bei
+      auf
 
       > %{site_title} -- %{site_description}
 
-      Wenn du interessiert bist, klicke auf den folgenden Link:
+      Wenn dich das interessiert, 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}"
+    subject_template: "%{inviter_name} hat dich eingeladen zum Thema '%{topic_title}' auf %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} hat dich eingeladen zur Diskussion
+      %{inviter_name} hat dich eingeladen zur Diskussion
 
       > **%{topic_title}**
       >
       > %{topic_excerpt}
 
-      bei
+      auf
 
       > %{site_title} -- %{site_description}
 
-      Mit dieser Notiz:
+      Mit dieser Anmerkung:
 
       > %{user_custom_message}
 
-      Falls du Interesse hast, klicke auf den nachfolgenden Link:
+      Wenn dich das interessiert, klicke auf den folgenden Link:
 
       %{invite_link}
   invite_forum_mailer:
     title: "Einladung zur Teilnahme"
-    subject_template: "%{invitee_name} hat dich eingeladen %{site_domain_name} beizutreten"
+    subject_template: "%{inviter_name} hat dich eingeladen %{site_domain_name} beizutreten"
     text_body_template: |
-      %{invitee_name} hat dich eingeladen, der folgenden Seite beizutreten:
+      %{inviter_name} hat dich eingeladen, der folgenden Seite beizutreten:
 
       > **%{site_title}**
       >
       > %{site_description}
 
-      Falls du Interesse hast, klicke auf den folgenden Link:
+      Wenn dich das interessiert, klicke auf den folgenden Link:
 
       %{invite_link}
   custom_invite_forum_mailer:
     title: "Einladung zum Forum (mit Nachricht)"
-    subject_template: "%{invitee_name} hat dich eingeladen %{site_domain_name} beizutreten"
+    subject_template: "%{inviter_name} hat dich eingeladen %{site_domain_name} beizutreten"
     text_body_template: |
-      %{invitee_name} hat dich eingeladen der folgenden Seite beizutreten:
+      %{inviter_name} hat dich eingeladen, der folgenden Seite beizutreten:
 
       > **%{site_title}**
       >
       > %{site_description}
 
-      Mit dieser Notiz:
+      Mit dieser Anmerkung:
 
       > %{user_custom_message}
 
-      Falls du Interesse hast, klicke auf den nachfolgenden Link:
+      Wenn dich das interessiert, klicke auf den folgenden Link:
 
       %{invite_link}
   invite_password_instructions:
@@ -1668,11 +1721,11 @@ de:
       Deine Version: %{installed_version}
       Neue Version: **%{new_version}**
 
-      - Aktualisiere mit dem einfachen **[Ein-Klick-Browser-Upgrade](%{base_url}/admin/upgrade)**
+      - Aktualisiere mit unserem einfachen **[Ein-Klick-Browser-Upgrade](%{base_url}/admin/upgrade)**.
 
-      - Schaue dir im [GitHub-Changelog](https://github.com/discourse/discourse/commits/master) an, was neu ist
+      - Schaue dir in den [Releasenotes](https://meta.discourse.org/tags/release-notes) an, was neu ist, oder rufe das [technische GitHub-Changelog](https://github.com/discourse/discourse/commits/master) auf.
 
-      - Besuche [meta.discourse.org](https://meta.discourse.org) für Neuigkeiten, Diskussionen und Support für Discourse
+      - Besuche [meta.discourse.org](https://meta.discourse.org) für Neuigkeiten, Diskussionen und Support für Discourse.
   new_version_mailer_with_notes:
     title: "Neue Version mit Versionshinweisen"
     subject_template: "[%{email_prefix}] Update verfügbar"
@@ -1682,24 +1735,15 @@ de:
       Deine Version: %{installed_version}
       Neue Version: **%{new_version}**
 
-      - Aktualisiere mit dem einfachen **[Ein-Klick-Browser-Upgrade](%{base_url}/admin/upgrade)**
+      - Aktualisiere mit unserem einfachen **[Ein-Klick-Browser-Upgrade](%{base_url}/admin/upgrade)**.
 
-      - Schaue dir im [GitHub-Changelog](https://github.com/discourse/discourse/commits/master) an, was neu ist
+      - Schaue dir in den [Releasenotes](https://meta.discourse.org/tags/release-notes) an, was neu ist, oder rufe das [technische GitHub-Changelog](https://github.com/discourse/discourse/commits/master) auf.
 
-      - Besuche [meta.discourse.org](https://meta.discourse.org) für Neuigkeiten, Diskussionen und Support für Discourse
+      - Besuche [meta.discourse.org](https://meta.discourse.org) für Neuigkeiten, Diskussionen und Support für Discourse.
 
-      ### Versionshinweise
+      ### Releasenotes
 
       %{notes}
-  queued_posts_reminder:
-    title: "Erinnerung an Freischaltung wartender Beiträge"
-    subject_template:
-      one: "[%{email_prefix}] 1 Beitrag wartet auf Überprüfung"
-      other: "[%{email_prefix}] %{count} Beiträge warten auf Überprüfung"
-    text_body_template: |
-      Hallo,
-
-      Beiträge von neuen Benutzern wurden zur Moderation aufgehalten und warten gerade auf Überprüfung. [Akzeptiere sie hier oder lehne sie ab](%{base_url}/queued-posts).
   flag_reasons:
     off_topic: "Dein Beitrag wurde als **Thema verfehlt** gemeldet: Die Community glaubt, dass er nicht zum Thema passt, wie es durch den Titel und den ersten Beitrag definiert wurde."
     inappropriate: "Dein Beitrag wurde als **unangemessen** gemeldet: die Community glaubt, dass er anstößig oder beleidigend ist oder einen Verstoß gegen [die Community Richtlinien](/guidelines) darstellt."
@@ -1725,15 +1769,15 @@ de:
 
         dies ist eine automatisch erzeugte Nachricht von %{site_name}, um dich darüber zu informieren, dass dein Beitrag ausgeblendet wurde.
 
-        %{base_url}%{url}
+        <%{base_url}%{url}>
 
         %{flag_reason}
 
-        Mehrere Community-Mitglieder haben diesen Beitrag gemeldet, bevor er ausgeblendet wurde, daher prüfe bitte, wie du deinen Beitrag möglicherweise anpassen kannst, um ihr Feedback zu berücksichtigen. **Du kannst deinen Beitrag nach %{edit_delay} Minuten bearbeiten und er wird automatisch wieder sichtbar.**
+        Mehrere Community-Mitglieder haben diesen Beitrag gemeldet. Bedenke daher bitte, wie du diesen überarbeiten könntest, um ihre Rückmeldung zu berücksichtige. **Du kannst deinen Beitrag nach %{edit_delay} Minuten bearbeiten, und er wird automatisch wieder eingeblendet.**
 
-        Wenn der Beitrag jedoch von der Community erneut ausgeblendet wurde, wird er ausgeblendet bleiben, bis sich das Team darum kümmert – und möglicherweise gibt es weitere Maßnahmen, einschließlich einer möglichen Sperrung deines Kontos.
+        Wird der Beitrag allerdings ein zweites Mal von der Community ausgeblendet, bleibt er dies, bis er vom Team bearbeitet wurde.
 
-        Weitre Hinweise findest du in unseren [Community-Richtlinien](%{base_url}/guidelines).
+        Weitere Hinweise findest du in unseren [Community-Richtlinien](%{base_url}/guidelines).
     usage_tips:
       text_body_template: |
         Für einige schnelle Tipps, um als neuer Benutzer loszulegen, [schaue einmal diesen Blog-Beitrag an](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -1842,28 +1886,35 @@ de:
     csv_export_failed:
       title: "CSV-Export fehlgeschlagen"
       subject_template: "Datenexport fehlgeschlagen"
-      text_body_template: "Entschuldigung, beim Exportieren deiner Daten trat ein Fehler auf. Bitte kontaktiere ein Team-Mitglied oder überprüfe die Logdateien."
+      text_body_template: "Es tut uns leid, aber dein Datenexport ist fehlgeschlagen. Bitte  überprüfe die Logs oder [kontaktiere ein Team-Mitglied](%{base_url}/about)."
     email_reject_insufficient_trust_level:
       title: "E-Mail abgelehnt weil Vertrauensstufe unzureichend"
       subject_template: "[%{email_prefix}] E-Mail-Probme -- Vertrauensstufe nicht ausreichend"
       text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (Titel: %{former_title}) konnte nicht zugestellt werden.
+        Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (Betreff: %{former_title}) hat nicht funktioniert.
 
-        Du hast nicht die notwendige Vertrauensstufe, um neue Themen über diese E-Mail-Adresse zu erstellen. Wenn du glaubst, dass das ein Irrtum ist, dann kontaktiere ein Team-Mitglied.
+        Du hast nicht die erforderliche Vertrauensstufe, um neue Themen an diese E-Mail-Adresse zu schreiben. Wenn du denkst, dass dies ein Fehler ist, dann [kontaktiere ein Team-Mitglied]%{base_url}/about).
     email_reject_user_not_found:
       title: "E-Mail abgelehnt weil Benutzer nicht gefunden"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Benutzer nicht gefunden"
       text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
+        Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (Betreff: %{former_title}) hat nicht funktioniert.
 
-        Deine Antwort wurde von einer unbekannten E-Mail-Adresse gesendet. Probiere eine andere Absende-Adresse oder wende dich an ein Team-Mitglied.
+        Deine Antwort wurde von einer unbekannten E-Mail-Adresse gesendet. Probiere eine andere Absende-Adresse oder [kontaktiere ein Team-Mitglied](%{base_url}/about).
     email_reject_screened_email:
       title: "E-Mail abgelehnt weil E-Mail-Adresse gesperrt"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- E-Mail-Adresse blockiert"
       text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
+        Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (Betreff: %{former_title}) hat nicht funktioniert.
 
-        Deine Antwort wurde von einer blockierten E-Mail-Adresse gesendet. Probiere eine andere Absende-Adresse oder wende dich an ein Team-Mitglied.
+        Deine Antwort wurde von einer blockierten E-Mail-Adresse gesendet. Probiere eine andere Absende-Adresse oder [kontaktiere ein Team-Mitglied](%{base_url}/about).
+    email_reject_not_allowed_email:
+      title: "E-Mail abgelehnt weil E-Mail-Adresse nicht erlaubt"
+      subject_template: "[%{email_prefix}] E-Mail-Problem -- E-Mail blockiert"
+      text_body_template: |
+        Tut uns leid, aber deine E-Mail-Nachricht an %{destination} (mit dem Betreff %{former_title}) hat nicht funktioniert.
+
+        Deine Antwort wurde von einer blockierten E-Mail-Adresse gesendet. Versuche, von einer anderen E-Mail-Adresse zu schicken, oder [kontaktiere ein Team-Mitglied](%{base_url}/about).
     email_reject_inactive_user:
       title: "E-Mail abgelehnt weil Benutzer inaktiv"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Benutzer inaktiv"
@@ -1871,27 +1922,27 @@ de:
         Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) hat nicht funktioniert.
 
         Dein mit dieser E-Mail-Adresse verbundenes Benutzerkonto ist nicht aktiviert. Bitte aktiviere dein Konto bevor du E-Mails sendest.
-    email_reject_blocked_user:
-      title: "E-Mail abgelehnt weil Benutzer gesperrt"
-      subject_template: "[%{email_prefix}] E-Mail-Problem -- Benutzer blockiert"
+    email_reject_silenced_user:
+      title: "E-Mail abgelehnt weil Benutzer stummgeschaltet"
+      subject_template: "[%{email_prefix}] E-Mail-Problem -- Benutzer stummgeschaltet"
       text_body_template: |
-        Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) hat nicht funktioniert.
+        Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (mit dem Betreff %{former_title}) hat nicht funktioniert.
 
-        Dein mit dieser E-Mail-Adresse verbundenes Konto wurde blockiert.
+        Dein mit dieser E-Mail-Adresse verbundenes Konto wurde stummgeschaltet.
     email_reject_reply_user_not_matching:
       title: "E-Mail abgelehnt weil E-Mail-Adresse abweichend"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Antwortadresse unerwartet"
       text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
+        Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (Betreff: %{former_title}) hat nicht funktioniert.
 
-        Deine Antwort wurde von einer anderen E-Mail-Adresse versandt als wir erwartet haben, weshalb wir nicht sicher wissen ob das die gleiche Person ist. Probiere eine andere Absende-Adresse oder wende dich an ein Team-Mitglied.
+        Deine Antwort wurde von einer anderen E-Mail-Adresse als erwartet gesendet, sodass wir nicht sicher sind, ob dies die gleiche Person ist. Probiere eine andere Absende-Adresse oder [kontaktiere ein Team-Mitglied](%{base_url}/about).
     email_reject_no_account:
       title: "E-Mail abgelehnt weil unbekanntes Konto"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Konto unbekannt"
       text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
+        Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (Betreff: %{former_title}) hat nicht funktioniert.
 
-        Wir konnten kein Konto finden, das zu deiner E-Mail-Adresse passt. Probiere eine andere Absende-Adresse oder wende dich an ein Team-Mitglied.
+        Wir konnten kein passendes Benutzerkonto zu einer E-Mail-Adresse finden. Probiere eine andere Absende-Adresse oder [kontaktiere ein Team-Mitglied](%{base_url}/about).
     email_reject_empty:
       title: "E-Mail abgelehnt weil kein Inhalt"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Kein Inhalt"
@@ -1912,16 +1963,16 @@ de:
       title: "E-Mail abgelehnt weil nicht erlaubt"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Zugriff ungültig"
       text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
+        Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (Betreff: %{former_title}) hat nicht funktioniert.
 
-        Du hast nicht die notwendigen Zugriffsrechte, um neue Themen in dieser Kategorie zu erstellen. Wenn du glaubst, dass das ein Irrtum ist, dann kontaktiere ein Team-Mitglied.
+        Dein Benutzerkonto hat nicht die erforderlichen Rechte, um neue Themen in dieser Kategorie zu erstellen. Wenn du denkst, dass dies ein Fehler ist, dann [kontaktiere ein Team-Mitglied]%{base_url}/about).
     email_reject_strangers_not_allowed:
       title: "E-Mail abgelehnt weil Zugriff nicht erlaubt"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Zugriff ungültig"
       text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
+        Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (Betreff: %{former_title}) hat nicht funktioniert.
 
-        Die Kategorie, an die du die E-Mail geschickt hast, erlaubt nur Antworten von Benutzern mit gültigem Konto und von bekannten E-Mail-Adressen. Wenn du glaubst, dass das ein Irrtum ist, dann kontaktiere ein Team-Mitglied.
+        Die Kategorie, an die du diese E-Mail geschickt hast, erlaubt nur Antworten von Benutzern mit gültigen Benutzerkonten und bekannten E-Mail-Adressen. Wenn du denkst, dass dies ein Fehler ist, dann [kontaktiere ein Team-Mitglied]%{base_url}/about).
     email_reject_invalid_post:
       title: "E-Mail abgelehnt weil ungültiger Beitrag"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Beitrag fehlerhaft"
@@ -1951,37 +2002,44 @@ de:
       title: "E-Mail abgelehnt weil unbekannter Antwort-Schlüssel"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Antwortschlüssel unbekannt"
       text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
+        Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (Betreff: %{former_title}) hat nicht funktioniert.
 
-        Der angegebene Antwort-Schlüssel ist ungültig oder unbekannt. Wir wissen daher nicht auf welchen Beitrag diese E-Mail antwortet. Bitte kontaktiere ein Team-Mitglied.
+        Der Antwort-Schlüssel in der E-Mail ist ungültig oder unbekannt, sodass wir nicht ermitteln können, worauf diese E-Mail antwortet. [Kontaktiere ein Team-Mitglied](%{base_url}/about).
     email_reject_bad_destination_address:
       title: "E-Mail abgelehnt weil unbekannte Empfänger-Adresse"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Empfängeradresse unbekannt"
       text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
+        Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (mit dem Betreff %{former_title}) hat nicht funktioniert.
 
-        Keine der Ziel-E-Mail-Adressen wurde erkannt.  Bitte stelle sicher, dass du die E-Mail an die richtige Adresse schickst, die dir von unserem Team genannt wurde.
+        Keine der Empfängeradressen wurden erkannt oder der Message-ID-Header in der E-Mail ist verändert worden. Bitte stelle sicher, dass du an die richtige E-Mail-Adresse schickst, die vom Team bekanntgegeben wurde.
     email_reject_topic_not_found:
       title: "E-Mail abgelehnt weil Thema nicht gefunden"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Thema nicht gefunden"
       text_body_template: |
         Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
 
-        Das Thema, auf das du geantwortet hast, existiert nicht mehr -- vielleicht wurde es gelöscht? Wenn du glaubst, dass dies ein Irrtum ist, nimm Bitte Kontakt mit einem Team-Mitglied auf.
+        Das Thema, auf das du geantwortet hast, gibt es nicht mehr -- vielleicht wurde es gelöscht? Wenn du glaubst, dass dies ein Irrtum ist, nimm bitte Kontakt mit einem Team-Mitglied auf.
     email_reject_topic_closed:
       title: "E-Mail abgelehnt weil Thema geschlossen"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Thema geschlossen"
       text_body_template: |
         Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
 
-        Das Thema, auf das du geantwortet hast, ist derzeit geschlossen und akzeptiert keine Antworten mehr. Wenn du glaubst, dass dies ein Irrtum ist, nimm bitte Kontakt mit einem Team-Mitglied auf.
+        Das Thema, auf das du geantwortet hast, ist derzeit geschlossen und akzeptiert keine Antworten mehr. Wenn du glaubst, dass dies ein Irrtum ist, nimm Bitte Kontakt mit einem Team-Mitglied auf.
     email_reject_auto_generated:
       title: "E-Mail abgelehnt weil automatisch generierte Antwort"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Antwort automatisch generiert"
       text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
+        Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (Betreff: %{former_title}) hat nicht funktioniert.
 
-        Deine E-Mail wurde als „automatisch generiert“ markiert, was bedeutet, dass sie automatisch von einem Computer erstellt wurde statt von einem Menschen getippt; wir können diese Arten von E-Mails nicht akzeptieren. Wenn du glaubst, dass dies ein Irrtum ist, nimm bitte Kontakt mit einem Team-Mitglied auf.
+        Deine E-Mail war als "auto generated" markiert, was bedeutet, dass sie automatisch von einem Computer erstellt und nicht von einem Menschen verfasst wurde; wir können diese Art von E-Mails nicht akzeptieren. Wenn du denkst, dass dies ein Fehler ist, dann [kontaktiere ein Team-Mitglied]%{base_url}/about).
+    email_reject_unrecognized_error:
+      title: "E-Mail abgelehnt weil unbekannter Fehler"
+      subject_template: "[%{email_prefix}] E-Mail-Problem -- Unbekannter Fehler"
+      text_body_template: |
+        Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (Betreff: %{former_title}) hat nicht funktioniert.
+
+        Es gab einen unbekannten Fehler beim Bearbeiten deiner E-Mail und diese wurde nicht als Beitrag entgegengenommen. Du solltest es noch einmal probieren, oder [ein Team-Mitglied kontaktieren](%{base_url}/about).
     email_error_notification:
       title: "Benachrichtigung zu E-Mail-POP-Authentifizierungsfehler"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- POP-Authentifizierungsfehler"
@@ -1997,9 +2055,9 @@ de:
       text_body_template: |
         Hallo,
 
-        dies ist eine automatisch erzeugte Nachricht von %{site_name}, um dich darüber zu informieren, dass deine Beitrage vorübergehend ausgeblendet wurden, weil sie von der Community gemeldet wurden.
+        dies ist eine automatisch erzeugte Nachricht von %{site_name}, um dich darüber zu informieren, dass dein Beitrag vorübergehend versteckt wurde, weil er von der Community gemeldet wurde..
 
-        Als Vorsichtsmaßnahme wurde dein neues Konto für das Erstellen neuer Antworten und Themen gesperrt, bis ein Team-Mitglied dein Konto überprüfen kann. Wir bitten um Entschuldigung für die Unannehmlichkeiten.
+        Als Vorsichtsmaßnahme wurde dein neues Konto für das Erstellen neuer Antworten und Themen stummgeschaltet, bis ein Team-Mitglied dein Konto überprüfen kann. Wir bitten um Entschuldigung für die Unannehmlichkeiten.
 
         Weitere Hinweise findest du in unseren [Community-Richtlinien](%{base_url}/guidelines).
     too_many_tl3_flags:
@@ -2008,35 +2066,35 @@ de:
       text_body_template: |
         Hallo,
 
-        dies ist eine automatisch erzeugte Nachricht von %{site_name}, um dich darüber zu informieren, dass dein Konto aufgrund einer großen Anzahl von Community-Meldungen vorübergehend gesperrt wurde.
+        dies ist eine automatisch erzeugte Nachricht von %{site_name}, um dich darüber zu informieren, dass dein Konto vorübergehend gesperrt wurde aufgrund einer großen Anzahl an Community-Meldungen.
 
-        Als Vorsichtsmaßnahme wurde dein neues Konto für das Erstellen neuer Antworten und Themen gesperrt, bis ein Team-Mitglied dein Konto überprüfen kann. Wir bitten um Entschuldigung für die Unannehmlichkeiten.
+        Als Vorsichtsmaßnahme wurde dein neues Konto für das Erstellen neuer Antworten und Themen stummgeschaltet, bis ein Team-Mitglied dein Konto überprüfen kann. Wir bitten um Entschuldigung für die Unannehmlichkeiten.
 
         Weitere Hinweise findest du in unseren [Community-Richtlinien](%{base_url}/guidelines).
-    blocked_by_staff:
-      title: "Gesperrt vom Team"
+    silenced_by_staff:
+      title: "Stummgeschaltet vom Team"
       subject_template: "Konto vorübergehend gesperrt"
       text_body_template: |
         Hallo,
 
         dies ist eine automatisch erzeugte Nachricht von %{site_name}, um dich darüber zu informieren, dass dein Konto als Vorsichtsmaßnahme vorübergehend gesperrt wurde.
 
-        Bitte schaue dir weiter Inhalte an, aber du kannst zunächst keine Antworten oder Themen erstellen, bis ein [Team-Mitglied](%{base_url}/about) deine aktuellesten Beiträge überprüft hat. Wir bitten um Entschuldigung für die Unannehmlichkeiten.
+        Bitte schaue dir weiter Inhalte an, aber du kannst zunächst keine Antworten oder Themen erstellen, bis ein [Team-Mitglied](%{base_url}/about) deine aktuellsten Beiträge überprüft hat. Wir bitten um Entschuldigung für die Unannehmlichkeiten.
 
         Weitere Hinweise findest du in unseren [Community-Richtlinien](%{base_url}/guidelines).
-    user_automatically_blocked:
-      title: "Benutzer automatisch gesperrt"
-      subject_template: "Neuer Benutzer %{username} gesperrt wegen Community-Meldungen"
+    user_automatically_silenced:
+      title: "Benutzer automatisch stummgeschaltet"
+      subject_template: "Neuer Benutzer %{username} stummgeschaltet wegen Community-Meldungen"
       text_body_template: |
-        Dies ist eine automatisierte Nachricht.
+        Dies ist eine automatische Nachricht.
 
-        Der neue Benutzer  [%{username}](%{user_url}) wurde automatisch blockiert, weil mehrere Benutzer Beiträge von %{username} gemeldet haben.
+        Der neue Benutzer [%{username}](%{user_url}) wurde automatisch stummgeschaltet, weil mehrere Benutzer Beiträge von %{username} gemeldet haben.
 
-        Bitte [überprüfe die Meldungen](%{base_url}/admin/flags). Wenn %{username} fälschlich blockiert wurde, so klicke die „Entsperren“-Schaltfläche auf der [Administrationsseite dieses Benutzers](%{user_url}).
+        Bitte [überprüfe die Meldungen](%{base_url}/admin/flags). Wenn %{username} fälschlich stummgeschaltet wurde, so klicke die „Stummschaltung aufheben“-Schaltfläche auf der [Administrationsseite dieses Benutzers](%{user_url}).
 
-        Der Schwellenwert kann über die Einstellung `block_new_user` geändert werden.
+        Der Schwellenwert kann über die Einstellung `silence_new_user` geändert werden.
     spam_post_blocked:
-      title: "Spam-Beitrag gesperrt"
+      title: "Spam-Beitrag ausgeblendet"
       subject_template: "Beiträge des neuen Benutzers ${username} wegen mehrfacher Verlinkung blockiert"
       text_body_template: |
         Dies ist eine automatisierte Nachricht.
@@ -2046,8 +2104,8 @@ de:
         Bitte [überprüfe den Benutzer](%{user_url}).
 
         Dies kann über die Einstellungen `newuser_spam_host_threshold` und `white_listed_spam_host_domains` geändert werden.
-    unblocked:
-      title: "Entsperrt"
+    unsilenced:
+      title: "Stummschaltung aufgehoben"
       subject_template: "Konto nicht mehr gesperrt"
       text_body_template: |
         Hallo,
@@ -2081,9 +2139,18 @@ de:
       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).
+        Diese Auszeichnung wird nur zwei neuen Benutzern pro Monat verliehen, und wird dauerhaft sichtbar sein auf [deiner Abzeichen-Seite](%{url}).
 
         Du bist schnell ein wertvolles Mitglied unserer Community geworden. Danke, dass du dazugekommen bist, und mache weiter mit der großartigen Arbeit!
+    queued_posts_reminder:
+      title: "Erinnerung für anstehende Beiträge"
+      subject_template:
+        one: "1 Beitrag wartet auf Überprüfung"
+        other: "%{count} Beiträge warten auf Überprüfung"
+      text_body_template: |
+        Hallo,
+
+        Beiträge von neuen Benutzern wurden zur Moderation aufgehalten und warten derzeit auf Überprüfung. [Akzeptiere sie oder lehne sie hier ab](%{base_url}/queued-posts).
   unsubscribe_link: |
     Um diese E-Mails abzubestellen, [klicke hier](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -2109,6 +2176,16 @@ 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_group_to_private_message_body: |
+      %{username} hat @%{group_name} eingeladen zu einer Nachricht
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      bei
+
+      > %{site_title} -- %{site_description}
     invited_to_private_message_body: |
       %{username} hat dich zu einer Unterhaltung eingeladen
 
@@ -2116,7 +2193,7 @@ de:
       >
       > %{topic_excerpt}
 
-      auf
+      bei
 
       > %{site_title} -- %{site_description}
     invited_to_topic_body: |
@@ -2126,9 +2203,18 @@ de:
       >
       > %{topic_excerpt}
 
-      auf
+      bei
 
       > %{site_title} -- %{site_description}
+    user_invited_to_private_message_pm_group:
+      title: "Benutzer hat Gruppe zu Nachricht eingeladen"
+      subject_template: "[%{email_prefix}] %{username} hat @%{group_name} zu einer Unterhaltung '%{topic_title}' eingeladen"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
     user_invited_to_private_message_pm:
       title: "Benutzer zu Nachricht eingeladen"
       subject_template: "[%{email_prefix}] %{username} hat dich zu einer Unterhaltung '%{topic_title}' eingeladen"
@@ -2261,6 +2347,35 @@ de:
       text_body_template: |2
 
         %{message}
+    account_suspended:
+      title: "Konto gesperrt"
+      subject_template: "[%{email_prefix}] Dein Konto wurde gesperrt"
+      text_body_template: |
+        Du wurdest vom Forum gesperrt bis %{suspended_till}.
+
+        %{reason}
+
+        %{message}
+    account_silenced:
+      title: "Konto stummgeschaltet"
+      subject_template: "[%{email_prefix}] Dein Konto wurde stummgeschaltet"
+      text_body_template: |
+        Du wurdest im Forum stummgeschaltet bis %{suspended_till}.
+
+        %{reason}
+
+        %{message}
+    account_exists:
+      title: "Konto existiert bereits"
+      subject_template: "[%{email_prefix}] Konto existiert bereits"
+      text_body_template: |
+        Du hast gerade versuchst, ein Konto auf %{site_name} zu erstellen oder die E-Mail-Adresse eines Kontos zu %{email} zu ändern. Allerdings gibt es schon ein Konto für %{email}.
+
+        Wenn du dein Passwort vergessen hast, [setze es jetzt zurück](%{base_url}/password-reset).
+
+        Wenn du nicht versucht hast, ein Konto für %{email} zu erstellen oder deine E-Mail-Adresse zu ändern, mach’ dir keine Sorgen – du kannst diese Nachricht getrost ignorieren.
+
+        Wenn du Fragen hast, [kontaktiere unser freundliches Team](%{base_url}/about).
     digest:
       why: "Eine kurze Zusammenfassung von %{site_link} seit deinem letzten Besuch am %{last_seen_at}"
       since_last_visit: "Seit deinem letzten Besuch"
@@ -2276,7 +2391,8 @@ 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}."
+      unsubscribe: "Diese Zusammenfassung wird von %{site_link} versendet, wenn wir dich einige Zeit lang nicht gesehen haben. Ändere %{email_preferences_link} oder %{unsubscribe_link}zum Abbestellen."
+      your_email_settings: "deine E-Mail-Einstellungen"
       click_here: "klicke hier"
       from: "Zusammenfassung für %{site_name}"
       preheader: "Eine kurze Zusammenfassung seit deinem letzten Besuch am %{last_seen_at}"
@@ -2378,10 +2494,13 @@ de:
     see_more: "Mehr"
     search_title: "Diese Site durchsuchen"
     search_google: "Google"
+  offline:
+    title: "App kann nicht geladen werden"
+    offline_page_message: "Sieht so aus als wärst du offline! Bitte überprüfe deine Netzwerkverbindung und probiere es nochmal."
   login_required:
     welcome_message: |
       #[Wilkommen bei %{title}](#welcome)
-      Ein Benutzerkonto ist notwendig. Bitte registriere dich oder melde dich an.
+      Ein Konto ist erforderlich. Bitte erstelle ein Konto oder melde dich an.
   terms_of_service:
     title: "Nutzungsbedingungen"
     signup_form_message: 'Ich habe die <a href="/tos" target="_blank">Nutzungsbedingungen</a> gelesen und akzeptiert.'
@@ -2394,12 +2513,15 @@ de:
     store_failure: "Hochladen von #%{upload_id} für Benutzer #%{user_id} ist fehlgeschlagen."
     file_missing: "Bitte wähle eine Datei zum Hochladen aus. "
     empty: "Entschuldige, aber die angegebene Datei ist leer."
+    png_to_jpg_conversion_failure_message: "Ein Fehler ist aufgetreten bei der Umwandlung von PNG nach JPG."
     attachments:
       too_large: "Entschuldigung, die Datei die du hochladen möchtest, ist zu groß (maximale Dateigröße ist %{max_size_kb}KB)."
     images:
       too_large: "Entschuldigung, das Bild das du hochladen möchtest, ist zu groß (maximale Dateigröße ist %{max_size_kb}KB). Bitte verkleinere es und versuche es erneut."
       larger_than_x_megapixels: "Entschuldige, das Bild, das du versucht hast hochzuladen, ist zu groß (maximale Auflösung beträgt %{max_image_megapixels} Megapixel), bitte verkleinere es und versuche es erneut."
       size_not_found: "Entschuldige, aber wir konnten die Größe des Bildes nicht bestimmen. Vielleicht ist das Bild defekt?"
+    placeholders:
+      too_large: "(Bild größer als %{max_size_kb}KB)"
   avatar:
     missing: "Hoppla, wir können kein Profilbild für diese E-Mail-Adresse finden. Kannst du versuchen es erneut hochzuladen?"
   flag_reason:
@@ -2796,9 +2918,9 @@ de:
         Das Abzeichen wird verliehen, wenn du den ersten Like auf einen Beitrag erhältst. Glückwunsch, du hast einen Beitrag geschrieben, den deine Mitbenutzer interessant, cool oder nützlich finden!
     autobiographer:
       name: Autobiograf
-      description: Hat <a href="/my/preferences">Benutzerprofil</a> ausgefüllt
+      description: Hat <a href="%{base_uri}/my/preferences/profile">Benutzerprofil</a> ausgefüllt
       long_description: |
-        Das Abzeichen wird verliehen, wenn du dein <a href="/my/preferences">Benutzerprofil</a> ausfüllst und ein Profilbild hochlädst. Die Community mehr über dich wissen zu lassen und darüber, was dich interessiert, trägt zu einer besseren, verbundeneren Community bei. Mach mit!
+        Dieses Abzeichen erhältst du für das Ausfüllen von deinem <a href="%{base_uri}/my/preferences/profile">Benutzerprofil</a> und für das Hochladen eines Profilbildes erhalten. Die Community ein bisschen mehr wissen zu lassen über dich und darüber, was du gerne tust, macht die gesamte Community besser. Mach mit!
     anniversary:
       name: Jubiläum
       description: Ist ein aktives Mitglied für ein Jahr und hat mindestens einen Beitrag verfasst
@@ -2891,9 +3013,9 @@ de:
         Das Abzeichen wird verliehen, wenn du das erste Mal einen Beitrag in deiner Antwort zitierst. Das Zitieren relevanter Abschnitte früherer Beiträge in deiner Antwort hilft dabei, Diskussionen verbunden zu halten und beim Thema zu bleiben. Der einfachste Weg zu zitieren besteht darin, den Abschnitt eines Beitrags zu markieren und dann die Antwort-Schaltfläche zu drücken. Zitiere weiter großzügig!
     read_guidelines:
       name: Richtlinien gelesen
-      description: Hat die <a href="/guidelines">Community-Richtlinien</a> gelesen
+      description: Hat die <a href="%{base_uri}/guidelines">Community-Richtlinien</a> gelesen
       long_description: |
-        Das Abzeichen wird verliehen, wenn du die <a href="/guidelines">Community-Richtlinien liest</a>. Das Befolgen und Teilen dieser einfachen Richtlinien hilft dabei, eine sichere, lustige und nachhaltige Community für alle aufzubauen. Denke immer daran, dass dort ein anderer Mensch, sehr ähnlich zu dir, auf der anderen Seite des Bildschirms ist. Sei nett!
+        Dieses Abzeichen wird verliehen für das <a href="%{base_uri}/guidelines">Lesen der Communtiy-Richtlinien</a>. Ein Befolgen und Teilen dieser einfachen Richtlinien hilft uns dabei, eine sichere, lustige und nachhaltige Gemeinschaft für alle zu schaffen. Denke immer daran, dass dort ein anderer Mensch, genauso wie du, auf der anderen Seite des Bildschirms ist. Sei nett!
     reader:
       name: Leser
       description: Hat in einem Thema mit mehr als 100 Beiträgen jeden Beitrag gelesen
@@ -2982,6 +3104,18 @@ de:
       description: Herausragende Beiträge im ersten Monat
       long_description: |
         Dieses Abzeichen wird verliehen, um jedem Monat zwei neuen Benutzern für ihre insgesamt exzellenten Beiträge zu gratulieren, was dadurch ermittelt wird, wie häufig ihre Beiträge gefallen und von wem.
+    enthusiast:
+      name: Enthusiast
+      description: 10-Tages-Besuch
+      long_description: Dieses Abzeichen wird verliehen für Besuche an zehn aufeinander folgenden Tagen. Danke, dass du über eine Woche bei uns geblieben bist!
+    aficionado:
+      name: Begeisterter Anhänger
+      description: 100-Tages-Besuch
+      long_description: Dieses Abzeichen wird verliehen für Besuche an 100 aufeinander folgenden Tagen. Das sind mehr als drei Monate!
+    devotee:
+      name: Verehrer
+      description: 365-Tages-Besuch
+      long_description: Dieses Abzeichen wird verliehen für Besuche an 365 aufeinander folgenden Tagen. Wow, ein ganzes Jahr!
     badge_title_metadata: "%{display_name} Abzeichen auf %{site_title}"
   admin_login:
     success: "E-Mail gesendet"
@@ -3016,6 +3150,7 @@ de:
     only_official: "Inoffizielle Plugins deaktivieren"
     no_plugins: "Alle Plugins deaktivieren"
     enter: "Abgesicherten Modus betreten"
+    must_select: "Du musst mindestens eine Option auswählen, um den abgesicherten Modus zu betreten."
   wizard:
     title: "Discourse einrichten"
     step:
@@ -3066,7 +3201,7 @@ de:
             description: "Allgemeines Kontaktformular für euch oder eure Organisation. Wird angezeigt auf <a href='/about' target='_blank'>eurer „Über uns“-Seite</a>."
           site_contact:
             label: "Automatische Nachrichten"
-            description: "Alle automatischen privaten Nachrichten in Discourse werden von diesem Benutzer verschickt, wie etwa die Willkommensnachricht, die jedem neuen Benutzer geschickt wird."
+            description: "Alle automatischen Discourse-Nachrichten werden von diesem Benutzer geschickt, wie zum Beispiel Warnungen zu Meldungen und Benachrichtigungen über den Abschluss von Sicherungen."
       corporate:
         title: "Organisation"
         description: "Diese Namen werden in eure <a href='/privacy' target='blank'>Datenschutzerklärung</a> und <a href='/tos' target='blank'>Nutzungsbedingungen</a> eingefügt, die du jederzeit in der Team-Kategorie ändern kannst Wenn du keine Firma hast, kannst du diesen Schritt auch überspringen."
@@ -3123,12 +3258,14 @@ de:
         description: "Welches Emoji-Design bevorzugst du für deine Community? Du kannst später jederzeit mehr benutzerdefinierte Emoji einfügen unter Administration, Anpassen, Emoji."
       invites:
         title: "Team einladen"
-        description: "Du hast es fast geschafft! Lass uns ein paar Team-Mitglieder einladen, um <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>eure Diskussionen in Gang zu bringen</a> mit interessanten Themen und Antworten und deine Community zu beginnen."
+        description: "Du hast es fast geschafft! Lass’ uns ein paar Leute einladen, die dabei helfen <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>eure Diskussionen anzuregen</a> mit interessanten Themen und Beiträgen, um deine Community zu starten."
       finished:
         title: "Dein Discourse ist bereit!"
         description: |
           <p>Wenn du diese Einstellungen jemals ändern möchtest, besuche <a href='/admin' target='_blank'>deinen Administrationsbereich</a>; finde ihn neben dem Schraubenschüssel-Symbol im Seitenmenü..</p>
           <p>Viel Spaß, und viel Glück <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>beim Aufbauen deiner neuen Community!</a></p>
+  search_logs:
+    graph_title: "Anzahl Suchen"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index d0235a5094..a21b06301f 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -27,33 +27,42 @@ el:
   topics: "Νήματα"
   posts: "αναρτήσεις"
   loading: "Φόρτωση"
+  powered_by_html: 'Powered by Discourse, best viewed with JavaScript enabled'
   log_in: "Σύνδεση"
   purge_reason: "Διεγράφη αυτόματα ως εγκαταλελειμμένος, μη ενεργοποιημένος λογαριασμός."
-  disable_remote_images_download_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: "Έχει φτάσει τον μέγιστο αριθμό χρηστών που δημιουργούνται με κάθε ηλεκτρονική διεύθυνση ταχυδρομείου."
+      maximum_staged_user_per_email_reached: "Φτάστηκε ο μέγιστος αριθμός σταδιακών χρηστών που δημιουργούνται ανά email."
       errors:
-        empty_email_error: "Συμβαίνει όταν το αρχικό μήνυμα που λάβαμε ήταν κενό."
-        no_message_id_error: "Συμβαίνει όταν η αλληλογραφία δεν έχει επικεφαλίδα 'Message-Id' ."
-        auto_generated_email_error: "Συμβαίνει όταν η επικεφαλίδα 'προτεραιότητα' έχει οριστεί ώς: λίστα, άχρηστα,κύριο μέρος,, ή όταν οποιαδήποτε άλλη επικεφαλίδα  περιλαμβάνει: αυτόματη καταχώριση, αυτόματη απάντηση ή αυτόματη παραγώγιση."
+        empty_email_error: "Συμβαίνει όταν το ακατέργαστο μήνυμα που λάβαμε ήταν κενό."
+        no_message_id_error: "Συμβαίνει όταν το email δεν έχει επικεφαλίδα 'Message-Id' ."
+        auto_generated_email_error: "Συμβαίνει όταν η επικεφαλίδα που προηγείται έχει οριστεί ώς: list, junk, bulk ή auto_reply ή όταν οποιαδήποτε άλλη επικεφαλίδα περιέχει: auto-submitted, auto-replied ή auto-generated."
         no_body_detected_error: "Συμβαίνει όταν είναι αδύνατο να βρεθεί το κύριο μέρος του μηνύματος και όταν δεν υπάρχουν επισυναπτόμενα."
+        no_sender_detected_error: "Συμβαίνει όταν δεν μπορεί να βρεθεί μία έγκυρη διεύθυνση email στο From header."
         inactive_user_error: "Συμβαίνει όταν ο αποστολέας είναι ανενεργός"
-        blocked_user_error: "Συμβαίνει όταν ο αποστολέας έχει μπλοκαριστεί"
-        bad_destination_address: "Συμβαίνει όταν καμία από τις ηλεκτρονικές διευθύνσεις στα πεδία To/Cc/Bcc ταιριάζει με ένα σωστά ρυθμισμένο ηλεκτρονικό ταχυδρομείο."
+        silenced_user_error: "Συμβαίνει όταν ο αποστολέας έχει σιγηθεί."
+        bad_destination_address: "Συμβαίνει όταν καμία από τις διευθύνσεις email στα πεδία To/Cc/Bcc δεν αντιστοιχίζεται σε κάποια ρυθμισμένη διεύθυνση εισερχόμενων email."
         strangers_not_allowed_error: "Συμβαίνει όταν ο χρήστης προσπαθεί να δημιουργήσει ένα νέο θέμα σε κατηγορία που δεν είναι μέλος."
         insufficient_trust_level_error: "Συμβαίνει όταν ο χρήστης προσπαθεί να δημιουργήσει ένα νέο θέμα σε κατηγορία που δεν έχει το απαιτούμενο επίπεδο εμπιστοσύνης. "
-        reply_user_not_matching_error: "Συμβαίνει όταν μια απάντηση έχει έρθει από ένα διαφορετικό ηλεκτρονικό ταχυδρομίο από αυτόν που είχε σταλεί η ειδοποίηση."
+        reply_user_not_matching_error: "Συμβαίνει όταν μια απάντηση έρθει από ένα διαφορετικό email από αυτό στο οποίο είχε σταλεί η ειδοποίηση."
         topic_not_found_error: "Συμβαίνει όταν καταχωρηθεί μία απάντηση για θέμα που έχει διαγραφεί. "
         topic_closed_error: "Συμβαίνει όταν καταχωρηθεί μία απάντηση για θέμα που έχει κλείσει. "
-        bounced_email_error: "Το μήνυμα ηλεκτρονικού ταχυδρομείου είναι αναφορά αποτυχίας παράδοσης. "
-        screened_email_error: "Συμβαίνει όταν ο αποστολέας της ηλεκτρονικης διεύθηνσης έχει ήδη ελεγχθεί"
+        bounced_email_error: "Το email είναι αναφορά αποτυχίας παράδοσης. "
+        screened_email_error: "Συμβαίνει όταν η διεύθυνση email του αποστολέα ήταν ήδη ελεγχόμενη"
+        unsubscribe_not_allowed: "Συμβαίνει όταν η απεγγραφή μέσω email δεν επιτρέπεται για αυτόν τον χρήστη."
+        email_not_allowed: "Συμβαίνει όταν η διεύθυνση email δεν βρίσκεται στην λευκή ή βρίσκεται στην μαύρη λίστα."
+      unrecognized_error: "Άγνωστο Σφάλμα"
   errors: &errors
     format: '%{attribute} %{message}'
+    format_with_full_message: '<b>%{attribute}</b>: %{message}'
     messages:
       too_long_validation: "επιτρέπονται μέχρι %{max} χαρακτήρες, έχεις εισάγει %{length}."
       invalid_boolean: "Λανθασμένη τιμή boolean."
@@ -72,8 +81,8 @@ el:
       inclusion: δεν περιλαμβάνεται στην λίστα
       invalid: δεν είναι έγκυρο
       is_invalid: "φαίνεται ασαφές, είναι μια ολοκληρωμένη πρόταση;"
-      contains_censored_words: "Περιέχει τις ακόλουθες λογοκριθέντες λέξεις: %{censored_words}"
-      matches_censored_pattern: "Περιέχει τις ακόλουθες λέξεις που συμπήπτουν με τα λογοκριθέντα regexp: %{censored_words} της σελίδας"
+      contains_censored_words: "περιέχει τις ακόλουθες λογοκριμένες λέξεις: %{censored_words}"
+      matches_censored_pattern: "περιέχει τις ακόλουθες λέξεις που αντιστιχοίζονται με τα λογοκριθέντα regexp: %{censored_words}"
       less_than: πρέπει να είναι λιγότερο από %{count}
       less_than_or_equal_to: πρέπει να είναι λιγότερο ή ίσο με %{count}
       not_a_number: δεν είναι αριθμός
@@ -108,139 +117,149 @@ el:
       default_categories_already_selected: "Δεν μπορείς να επιλέξεις μια κατηγορία που χρησιμοποιείται σε άλλη λίστα."
       s3_upload_bucket_is_required: "Δεν μπορείτε να ενεργοποιήσετε μεταφορτώσεις στο S3 εάν δεν παρέχετε το 's3_upload_bucket'."
   invite:
-    not_found: "Η πρόσκληση δεν είναι έγγυρη. Παρακαλώ επικοινωνήστε με τον διαχειρηστή της ιστοσελίδας."
+    not_found: "Η πρόσκληση δεν είναι έγκυρη. Παρακαλώ επικοινωνήστε με τον διαχειριστή της ιστοσελίδας."
+    user_exists: "Δεν υπάρχει λόγος να προσκαλέσετε τον/την <b>%{email}</b>, έχει ήδη <a href='/u/%{username}/summary'>λογαριασμό χρήστη!</a>"
   bulk_invite:
     file_should_be_csv: "To ανεβασμένο αρχείο πρέπει να έχει μορφή csv."
     error: "Παρουσίαστηκε ένα σφάλμα κατά το ανέβασμα του αρχείου σας, Παρακαλώ δοκιμάστε αργότερα."
   topic_invite:
-    user_exists: "Συγγνώμη, αυτός ο χρήστης έχει ήδη προσκληθεί. Οι προσκλήσεις μπορούν να γίνονται μόνο μια φορά."
+    user_exists: "Συγγνώμη, αυτός ο χρήστης έχει ήδη προσκληθεί. Μπορείς να προσκαλέσεις έναν χρήστη σε ένα νήμα μόνο μια φορά."
   backup:
-    operation_already_running: "Μια λειτουργία εκτελείται αυτήν τη στιγμή. Δεν μπορείς να ξεκινήσεις μια νέα δουλειά τώρα."
+    operation_already_running: "Μια λειτουργία εκτελείται αυτήν τη στιγμή. Δεν μπορείς να ξεκινήσεις μια νέα διεργασία τώρα."
     backup_file_should_be_tar_gz: "Το αντίγραφο ασφαλείας πρέπει να είναι αρχείο .tar.gz"
     not_enough_space_on_disk: "Δεν υπάρχει αρκετός χώρος στο δίσκο για να ανεβάσεις αυτό το αντίγραφο ασφαλείας."
     invalid_filename: "Το αντίγραφο ασφαλείας περιέχει μη έγκυρους χαρακτήρες. Οι έγκυροι χαρακτήρες είναι a-z 0-9 .- _."
   not_logged_in: "Χρειάζεται να είσαι συνδεδεμένος για να το κάνεις αυτό."
   not_found: "Η ζητούμενη διεύθυνση URL δεν βρέθηκε."
   invalid_access: "Δεν έχεις δικαίωμα να δεις τους πόρους που ζήτησες."
+  invalid_api_credentials: "Δεν επιτρέπεται η προβολή της ζητούμενης πληροφορίας. Το API username ή το κλειδί δεν είναι έγκυρα."
   read_only_mode_enabled: "Η ιστοσελίδα είναι σε λειτουργία μόνο για ανάγνωση. Οι αλλαγές είναι απενεργοποιημένες."
   reading_time: "Χρόνος ανάγνωσης"
-  likes: "\"Μου αρέσει\""
+  likes: "Μου Αρέσει"
   too_many_replies:
     one: "Λυπούμαστε, αλλά οι νέοι χρήστες έχουν προσωρινό περιορισμό 1 απάντησης ανά νήμα."
     other: "Λυπούμαστε, αλλά οι νέοι χρήστες έχουν προσωρινό περιορισμό %{count} απαντήσεων ανά νήμα."
   embed:
-    start_discussion: "Ξεκίνησε τη συζήτηση"
-    continue: "Συνέχισε τη συζήτηση"
-    error: "Σφάλμα κατα την ενσωμάτωση"
-    referer: "Αναφέρων:"
-    mismatch: "Ο αναφέρων δεν ταιριάζει με οποιοδήποτε από τα παρακάτω πεδία:"
-    no_hosts: "Κανένα πεδίο δεν ορίστικε για ενσωμάτωση"
+    start_discussion: "Έναρξη Συζήτησης"
+    continue: "Συνέχεια Συζήτησης"
+    error: "Σφάλμα Ενσωμάτωσης"
+    referer: "Παραπέμπων:"
+    mismatch: "Ο παραπέμπων δεν ταιριάζει με κανένα από τους παρακάτω hosts:"
+    no_hosts: "Δεν υπάρχουν ορισμένοι hosts για ενσωμάτωση."
     configure: "Ρύθμιση Ενσωμάτωσης"
     more_replies:
       one: "μια ακόμη απάντηση"
       other: "%{count} ακόμη απαντήσεις"
-    loading: "Φόρτωση συζήτησης..."
+    loading: "Φόρτωση Συζήτησης..."
     permalink: "Μόνιμος σύνδεσμος"
-    imported_from: "Αυτό είναι το θέμα συζητησης της παρέας για την αυθεντική είσοδο στο %{link}"
+    imported_from: "Αυτό είναι ένα συνοδό θέμα συζητησης για την αρχική ανάρτηση στο %{link}"
     in_reply_to: "▶ %{username}"
     replies:
       one: "1 απάντηση"
       other: "%{count} απαντήσεις"
   no_mentions_allowed: "Λυπούμαστε, δεν μπορείς να αναφέρεις άλλους χρήστες."
   too_many_mentions:
-    one: "Λυπούμαστε, μπορείς να αναφέρεις μόνο έναν άλλο χρήστη σε κάθε δημοσίευση."
-    other: "Λυπούμαστε, μπορείς να αναφέρεις μόνο %{count} χρήστες σε κάθε δημοσίευση."
-  no_mentions_allowed_newuser: "Λυπούμαστε, οι καινούριοι χρήστες δεν μπορούν να αναφέρουν άλλους χρήστες."
+    one: "Λυπούμαστε, μπορείς να αναφέρεις μόνο έναν χρήστη σε κάθε ανάρτηση."
+    other: "Λυπούμαστε, μπορείς να αναφέρεις μόνο %{count} χρήστες σε κάθε ανάρτηση."
+  no_mentions_allowed_newuser: "Λυπούμαστε, οι νέοι χρήστες δεν μπορούν να αναφέρουν άλλους χρήστες."
   too_many_mentions_newuser:
-    one: "Λυπούμαστε, οι καινούριοι χρήστες μπορούν να αναφέρουν μόνο άλλον ένα χρήστη σε μια δημοσίευση."
-    other: "Λυπούμαστε, οι καινούριοι χρήστες μπορούν να αναφέρουν μόνο %{count} χρήστες σε μια δημοσίευση."
-  no_images_allowed: "Λυπούμαστε, οι καινούριοι χρήστες δεν μπορούν να βάλουν εικόνες στις δημοσιεύσεις."
+    one: "Λυπούμαστε, οι νέοι χρήστες μπορούν να αναφέρουν μόνο έναν χρήστη σε κάθε ανάρτηση."
+    other: "Λυπούμαστε, οι νέοι χρήστες μπορούν να αναφέρουν μόνο %{count} χρήστες σε κάθε ανάρτηση."
+  no_images_allowed: "Λυπούμαστε, οι νέοι χρήστες δεν μπορούν να βάλουν εικόνες στις αναρτήσεις."
   too_many_images:
-    one: "Λυπούμαστε, οι καινούριοι χρήστες μπορούν να βάλουν μόνο μία εικόνα σε μία δημοσίευση."
-    other: "Λυπούμαστε, οι καινούριοι χρήστες μπορούν να βάλουν μόνο %{count} εικόνες σε μία δημοσίευση."
-  no_attachments_allowed: "Λυπούμαστε, οι καινούριοι χρήστες δεν μπορούν να βάλουν συνημμένα αρχεία στις δημοσιεύσεις."
+    one: "Λυπούμαστε, οι νέοι χρήστες μπορούν να βάλουν μόνο μία εικόνα σε κάθε ανάρτηση."
+    other: "Λυπούμαστε, οι νέοι χρήστες μπορούν να βάλουν μόνο %{count} εικόνες σε κάθε ανάρτηση."
+  no_attachments_allowed: "Λυπούμαστε, οι νέοι χρήστες δεν μπορούν να βάλουν συνημμένα αρχεία στις αναρτήσεις."
   too_many_attachments:
-    one: "Λυπούμαστε, οι καινούριοι χρήστες μπορούν να βάλουν μόνο ένα συνημμένο αρχείο σε μία δημοσίευση."
-    other: "Λυπούμαστε, οι καινούριοι χρήστες μπορούν να βάλουν μόνο %{count} συνημμένα αρχεία σε μία δημοσίευση."
-  no_links_allowed: "Λυπούμαστε, οι καινούριοι χρήστες δεν μπορούν να βάλουν συνδέσμους στις δημοσιεύσεις."
+    one: "Λυπούμαστε, οι νέοι χρήστες μπορούν να βάλουν μόνο ένα συνημμένο αρχείο σε κάθε ανάρτηση."
+    other: "Λυπούμαστε, οι νέοι χρήστες μπορούν να βάλουν μόνο %{count} συνημμένα αρχεία σε κάθε ανάρτηση."
+  no_links_allowed: "Λυπούμαστε, οι νεοι χρήστες δεν μπορούν να βάλουν συνδέσμους στις αναρτήσεις."
   too_many_links:
-    one: "Λυπούμαστε, οι καινούριοι χρήστες μπορούν να βάλουν μόνο ένα σύνδεσμο σε μία δημοσίευση."
-    other: "Λυπούμαστε, οι καινούριοι χρήστες μπορούν να βάλουν %{count} συνδέσμους σε μία δημοσίευση."
+    one: "Λυπούμαστε, οι νέοι χρήστες μπορούν να βάλουν μόνο έναν σύνδεσμο σε κάθε ανάρτηση."
+    other: "Λυπούμαστε, οι νέοι χρήστες μπορούν να βάλουν μόνο %{count} συνδέσμους σε κάθε ανάρτηση."
+  contains_blocked_words: "Η ανάρτησή σας περιλαμβάνει λέξεις που δεν επιτρέπονται."
   spamming_host: "Συγγνώμη αλλά δεν μπορείτε να αναρτήσετε σύνδεσμο σε αυτόν τον διακομιστή."
-  user_is_suspended: "Δεν επιτρέπεται να δημοσιεύσουν οι χρήστες που βρίσκονται σε κατάσταση αναστολής."
+  user_is_suspended: "Δεν επιτρέπονται οι αναρτήσεις από αποβλημένους χρήστες."
   topic_not_found: "Κάτι πήγε στραβά. Ίσως το νήμα έκλεισε ή διαγράφηκε ενώ το κοιτούσες;"
-  not_accepting_pms: "Λυπούμαστε, %{username} δεν δέχεται μηνύματα αυτή τη στιγμή."
+  not_accepting_pms: "Λυπούμαστε, ο/η %{username} δεν δέχεται μηνύματα αυτή τη στιγμή."
+  max_pm_recepients: "Λυπούμαστε, μπορείτε να στείλετε μήνυμα το μέγιστο σε %{recipients_limit} παραλήπτες."
   just_posted_that: "είναι παρόμοιο με αυτό που δημοσιεύσατε πρόσφατα"
   invalid_characters: "περιέχει μη έγκυρους χαρακτήρες"
   is_invalid: "φαίνεται ασαφές, είναι μια ολοκληρωμένη πρόταση;"
-  next_page: "επόμενη σελίδα"
-  prev_page: "προηγούμενη σελίδα"
+  next_page: "επόμενη σελίδα →"
+  prev_page: "← προηγούμενη σελίδα"
   page_num: "Σελίδα %{num}"
-  home_title: "Αρχική σελίδα"
-  topics_in_category: "Θέματα στη '%{κατηγορία}' κατηγορία"
+  home_title: "Αρχική Σελίδα"
+  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_posts: "Αναρτήσεις:"
   num_participants: "Συμμετέχοντες:"
-  read_full_topic: "Διαβάστε όλο το θέμα"
+  read_full_topic: "Διαβάστε όλο το νήμα"
   private_message_abbrev: "Μνμ"
   rss_description:
-    latest: "Τελευταία θέματα"
-    hot: "Σημαντικά Θέματα"
-    top: "Κορυφαία Θέματα"
+    latest: "Τελευταία νήματα"
+    hot: "Δημοφιλή νήματα"
+    top: "Κορυφαία νήματα"
     top_all: "Κορυφαία νήματα όλων των εποχών"
-    top_yearly: "Ετήσια κορυφαία νήματα"
-    top_quarterly: "Τριμηνιαία κορυφαία νήματα"
-    top_monthly: "Μηνιαία κορυφαία νήματα"
-    top_weekly: "Εβδομαδιαία κορυφαία νήματα"
-    top_daily: "Ημερήσια κορυφαία νήματα"
+    top_yearly: "Κορυφαία νήματα ετήσιως"
+    top_quarterly: "Κορυφαία νήματα τριμηνιαία "
+    top_monthly: "Κορυφαία νήματα μηνιαία "
+    top_weekly: "Κορυφαία νήματα εβδομαδιαία "
+    top_daily: "Κορυφαία νήματα ημερησίως "
     posts: "Τελευταίες αναρτήσεις"
     private_posts: "Νέα προσωπικά μηνύματα"
-    group_posts: "Τελευταίες δημοσιεύσεις από %{group_name}"
+    group_posts: "Τελευταίες αναρτήσεις από %{group_name}"
     group_mentions: "Τελευταίες αναφορές από %{group_name}"
-    user_posts: "Τελευταίες δημοσιεύσεις από @%{username}"
+    user_posts: "Τελευταίες αναρτήσεις από @%{username}"
     user_topics: "Τελευταία νήματα από @%{username}"
     tag: "Νήματα με ετικέτα"
-  too_late_to_edit: "Αυτή η δημοσίευση δημιουργήθηκε πολύ καιρό πριν. Δεν μπορεί πλέον να γίνει επεξεργασία της ή να διαγραφεί."
+    badge: "%{display_name} παράσημο στην %{site_title}"
+  too_late_to_edit: "Αυτή η ανάρτηση δημιουργήθηκε πολύ καιρό πριν. Δεν μπορεί πλέον να γίνει επεξεργασία της ή να διαγραφεί."
   revert_version_same: "Η τρέχουσα έκδοση είναι η ίδια με την έκδοση που προσπαθείς να επαναφέρεις."
-  excerpt_image: "φωτογραφία"
+  excerpt_image: "εικόνα"
   queue:
-    delete_reason: "διαγράφοντε μέσο εναλλαγμένης σειράς "
+    delete_reason: "Διαγράφτηκαν μέσω της ουράς επανελέγχου "
   groups:
+    success:
+      bulk_add: "%{users_added} χρήστες προστέθηκαν στην ομάδα."
     errors:
       can_not_modify_automatic: "Δεν μπορείς να τροποποιήσεις μια αυτόματη ομάδα"
       member_already_exist: "'%{username}' είναι ήδη μέλος της ομάδας."
-      invalid_domain: "'%{domain}' δεν είναι έγκυρο όνομα τομέα."
-      invalid_incoming_email: "'%{email}' δεν είναι έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου."
+      invalid_domain: "'%{domain}' δεν είναι έγκυρο domain."
+      invalid_incoming_email: "'%{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: "διαχειριστές"
       moderators: "συντονιστές"
-      staff: "προσωπικό"
+      staff: "συνεργάτες"
       trust_level_0: "επίπεδο_εμπιστοσύνης_0"
       trust_level_1: "επίπεδο_εμπιστοσύνης_1"
       trust_level_2: "επίπεδο_εμπιστοσύνης_2"
       trust_level_3: "επίπεδο_εμπιστοσύνης_3"
       trust_level_4: "επίπεδο_εμπιστοσύνης_4"
+    request_membership_pm:
+      title: "Αίτημα Μέλους για @%{group_name}"
   education:
     until_posts:
       one: "1 ανάρτηση"
       other: "%{count} αναρτήσεις"
     new-topic: |
-      Καλώς ήρθατε στο %{site_name} &mdash. ** ευχαριστούμε που αρχίσατε μιά νέα συνομιλία!**
+      Καλώς ήρθατε στην %{site_name} &mdash. **ευχαριστούμε που αρχίσατε μιά νέα συνομιλία!**
 
-      - Είστε σίγουροι οτι ο τίτλος είναι αρκετά ενδιαφέρον? Παρέχει μια καλή περίληψη του θέματος?
+      - Είστε σίγουροι οτι ο τίτλος παρουσιάζει ενδιαφέρον; Είναι αντιπροσωπευτικός του περιεχομένου του νήματος;
 
-      - Ποιος θα ενδιαφερόταν για αυτό? Γιατί αυτό έχει σημασία? Τί είδους απαντήσεις θέλετε?
+      - Ποιος θα ενδιαφερόταν για αυτό; Γιατί αυτό έχει σημασία; Τί είδους απαντήσεις περιμένετε;
 
-      - Συμπεριλάβετε πολυχρησιμοποιημένες λέξεις στο θέμα σας έτσι ώστε να μπορούν να το *βρουν* οι άλλοι. Για να κατηγοριοποιήσετε το θέμα σας με σχετικά θέματα, επιλέξτε μια κατηγορία.
+      - Συμπεριλάβετε κοινές λέξεις στο νήμα σας έτσι ώστε να μπορούν να το *βρουν* οι άλλοι. Για να κατηγοριοποιήσετε το νήμα σας με άλλα παρόμοια νήματα, επιλέξτε μια κατηγορία.
 
       - Για περισσότερα, [δείτε τον οδηγό χρήσης της κοινότητάς μας](/guidelines). Αυτός ο πίνακας θα παρουσιαστεί μόνο για την πρώτη σας %{education_posts_text}
     new-reply: |
-      Καλώς ήρθατε στο %{site_name} &mdash; **ευχαριστούμε για την συνεισφορά σας**
+      Καλώς ήρθατε στην %{site_name} &mdash; **ευχαριστούμε για την συνεισφορά σας**
 
       - Βελτιώνει/προχωράει η απάντηση σας την συζήτηση με κάποιο τρόπο;
 
@@ -258,38 +277,46 @@ el:
 
       Είναι ευκολότερο να ακολουθείτε συζητήσεις και να βρείτε ενδιαφέροντες ανθρώπους σε συζητήσεις όταν όλοι έχουν μια μοναδική φωτογραφία προφίλ!
     sequential_replies: |
-      ### Μπορείτε να απαντήσετε σε πολλαπλές δημοσιεύσεις με μια
+      ### Μπορείτε να απαντήσετε σε πολλαπλές αναρτήσεις με την μια
 
-      Αντί για πολλαπλές απαντήσεις σε ένα νήμα, μπορείτε να κοινοποιήσετε μια απάντηση που περιέχει αποσπάσματα από προηγούμενες δημοσιεύσεις ή @ονομαστικές αναφορές.
+      Αντί για πολλαπλές απαντήσεις σε ένα νήμα, μπορείτε να κοινοποιήσετε μια απάντηση που περιέχει αποσπάσματα από προηγούμενες αναρτήσεις ή @ονομαστικές αναφορές.
 
-      Μπορείτε να επεξεργαστείτε την προηγούμενη απάντησή σας για να προσθέσετε μια φράση μαρκάροντας το κείμενο και επιλέγοντας το <b>quote reply</b> κουμπί που εμφανίζεται.
+      Μπορείτε να επεξεργαστείτε την προηγούμενη απάντησή σας για να προσθέσετε μια παράθεση, μαρκάροντας κείμενο και επιλέγοντας το κουμπί <b>παράθεσης</b> που εμφανίζεται.
 
-      Είναι ευκολότερο για όλους να διαβάζουν θέματα που έχουν λιγότερες αναλυτικές απαντήσεις σε αντίθεση με πολλές μικρές, ατομικές απαντήσεις.
+      Είναι ευκολότερο για όλους να διαβάζουν θέματα που έχουν λίγες και αναλυτικές απαντήσεις σε αντίθεση με πολλές μικρές, αυτόνομες απαντήσεις.
     dominating_topic: |
       ### Επιτρέψτε σε άλλους να συμμετέχουν στη συζήτηση
 
-      Αυτό το νήμα φαίνεται να είναι σημαντικό για εσάς &ndash. Έχετε δημοσιεύσει περισσότερο από %{percent}% των απαντήσεων εδώ.
+      Αυτό το νήμα φαίνεται να είναι σημαντικό για εσάς &ndash. Έχετε αναρτήσει πάνω από το %{percent}% των απαντήσεων εδώ.
 
       Είστε σίγουρος ότι παρέχετε επαρκή χρόνο σε άλλους ανθρώπους να μοιραστούν κι εκείνοι τις δικές τους απόψεις;
+    get_a_room: |
+      ### Γιατί δεν δοκιμάζετε να απαντήσετε και σε άλλους χρήστες;
+
+      Έχετε ήδη απαντήσει  %{count} φορές προς @%{reply_username} στο συγκεκριμένο θέμα.
+
+      Σκεφτήκατε να απαντήσετε και σε άλλους συμμετέχοντες σε αυτή την συζήτηση; Μια σωστή συζήτηση πρέπει να περιλαμβάνει πολλές διαφορετικές φωνές και απόψεις.
+
+      Αν θέλετε να συνεχίσετε την συζήτηση με τον ίδιο χρήστη, θα ήταν ίσως προτιμότερο να [στείλετε ένα προσωπικό μήνυμα] (/u/%{reply_username}).
     too_many_replies: |
       ### Έχετε φτάσει το όριο απαντήσεων γι' αυτό το νήμα
 
       Λυπούμαστε, αλλά οι νέοι χρήστες είναι προσωρινά περιορισμένοι σε %{newuser_max_replies_per_topic} απαντήσεις στο ίδιο νήμα.
 
-      Αντί να προσθέσετε κι άλλη απάντηση, παρακαλώ επεξεργατείτε τις προηγούμενες απαντήσεις ή επισκεφθείτε άλλα νήματα.
+      Αντί να προσθέσετε κι άλλη απάντηση, παρακαλώ επεξεργαστείτε τις προηγούμενες απαντήσεις σας ή επισκεφθείτε άλλα νήματα.
     reviving_old_topic: |
-      ### Αναβίωση αυτού του νήματος?
+      ### Αναβίωση αυτού του νήματος;
 
-      Η τελευταία απάντηση σε αυτό το νήμα ήταν **%{days}** μέρες πριν. Η απάντησή σας θα μεταφέρει το νήμα στην κορυφή της λίστας του και θα ειδοποιήjavascript:;σει οποιονδήποτε έχει προηγουμένως εμπλακεί στη συζήτηση.
+      Η τελευταία απάντηση σε αυτό το νήμα ήταν **%{days}** μέρες πριν. Η απάντησή σας θα μεταφέρει το νήμα στην κορυφή της λίστας και θα ειδοποιήσει οποιονδήποτε έχει προηγουμένως συμμετάσχει στη συζήτηση.
 
       Είστε σίγουροι ότι θέλετε να συνεχίσετε αυτή την παλιά συζήτηση;
   activerecord:
     attributes:
       category:
-        name: "Όνομα κατηγορίας"
+        name: "Όνομα Κατηγορίας"
       topic:
         title: 'Τίτλος'
-        featured_link: 'Προτεινόμενος σύνδεσμος'
+        featured_link: 'Προτεινόμενος Σύνδεσμος'
       post:
         raw: "Κύριο μέρος"
       user_profile:
@@ -303,6 +330,7 @@ el:
               too_many_users: "Μπορείτε να στέλνετε προειδοποιήσεις μόνο σε ένα χρήστη κάθε φορά."
               cant_send_pm: "Συγγνώμη, δεν μπορείτε να στείλετε προσωπικό μήνυμα σε αυτόν τον χρήστη."
               no_user_selected: "Πρέπει να επιλέξετε έναν έγκυρο χρήστη."
+              reply_by_email_disabled: "Η απάντηση μέσω email έχει απενεργοποιηθεί."
             featured_link:
               invalid: "δεν είναι έγκυρο. To URL πρέπει να συμπεριλαμβάνει http:// ή https://."
               invalid_category: "δεν μπορεί να δεχτεί επεξεργασία σε αυτή την κατηγορία."
@@ -310,31 +338,47 @@ el:
           attributes:
             password:
               common: "είναι ένας από τους 10000 πιο κοινούς κωδικούς πρόσβασης. Παρακαλώ χρησιμοποιήστε έναν πιο ασφαλή κωδικό πρόσβασης."
-              same_as_username: "είναι ο ίδιος με το όνομα χρήστη σας. Παρακαλώ χρησιμοποιήστε εναν πιο ασφαλή κωδικό πρόσβασης."
-              same_as_email: "είναι το ίδιο με το email σας. Παρακαλώ χρησιμοποιήστε ένα πιο ασφαλές κωδικό."
+              same_as_username: "είναι το ίδιο με το όνομα χρήστη σας. Παρακαλώ χρησιμοποιήστε εναν πιο ασφαλή κωδικό πρόσβασης."
+              same_as_email: "είναι το ίδιο με το email σας. Παρακαλώ χρησιμοποιήστε έναν πιο ασφαλή κωδικό πρόσβασης."
               same_as_current: "είναι ο ίδιος με τον τρέχοντα κωδικό."
-              unique_characters: "Περιέχει υπερβολικά πολλούς επαναλαμβανόμενους χαρακτήρες. Παρακαλώ χρησιμοποιήστε ένα πιο ασφαλή κωδικό πρόσβασης. "
+              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 δεν είναι έγκυρο. To URL πρέπει να συμπεριλαμβάνει http:// ή https://. Και δεν επιτρέπεται κανένα κενό."
+        custom_emoji:
+          attributes:
+            name:
+              taken: είναι ήδη σε χρήση από κάποιο άλλο emoji
+        topic_timer:
+          attributes:
+            execute_at:
+              in_the_past: "θα πρέπει να είναι στο μέλλον."
+        watched_word:
+          attributes:
+            word:
+              too_many: "Πάρα πολλές λέξεις για την ενέργεια"
       <<: *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: "Κατηγορία αποκλειστικά για μέλη με επίπεδο εμπιστοσύνης (trust level) 3 ή υψηλότερο."
-  meta_category_name: "Ανατροφοδότηση ιστοσελίδας"
-  meta_category_description: "Συζήτηση σχετικά με το forum, την οργάνωση του, τον τρόπο λειτουργίας του, και πώς μπορεί να βελτιωθεί."
-  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)."
+  meta_category_name: "Σχολιασμός Ιστοσελίδας"
+  meta_category_description: "Συζήτηση σχετικά με την ιστοσελίδα, την οργάνωσή της, τον τρόπο λειτουργίας της και πώς αυτή μπορεί να βελτιωθεί."
+  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` στο [file settings](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Καλώς ήρθατε στο Discourse"
     body: |2+
@@ -342,14 +386,11 @@ el:
 
       Η πρώτη παράγραφος αυτού του καρφιτσωμένου θέματος θα είναι ορατή ως μήνυμα καλωσορίσματος προς τους νέους επισκέπτες της σελίδας. Είναι σημαντικό!
 
-      **Να αλλαχτεί** σε μία σύντομη περιγραφή της κοινότητά σας:
+      **Αλλάξτε αυτό** με μία σύντομη περιγραφή της κοινότητάς σας:
 
       - Σε ποιον απευθύνεται η σελίδα;
-
       - Τι θα βρει εδώ πέρα;
-
       - Γιατί αξίζει να επισκευθεί τη σελίδα;
-
       - Που αλλού θα μπορούσαν να βρουν υλικό σχετικά με το θέμα; (url κτλπ)
 
 
@@ -357,84 +398,87 @@ el:
 
       <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      Θα ήταν καλό να κλείσετε αυτό το θέμα μέσω του διαχειριστή :wrench: (στην κάτω δεξιά και προς τα πάνω μεριά), έτσι ώστε οι απαντήσεις να μην μαζευτούν στην ανακοίνωση.
+      Θα ήταν καλό να κλείσετε αυτό το θέμα μέσω του διαχειριστή :wrench: (στην πάνω δεξιά και κάτω θέση), έτσι ώστε οι απαντήσεις να μην μαζευτούν στην ανακοίνωση.
 
   lounge_welcome:
     title: "Καλώς ήρθατε στο Σαλόνι"
-    body: |2
+    body: |2+
 
       Συγχαρητήρια! :confetti_ball:
 
-      Εάν μπορείς να δεις αυτό το θέμα, έχεις πρόσφατα μεταφερθεί στο **κανονικα** (επίπεδο εμπιστοσύνης χρήστη 3)
+      Εάν μπορείς να δεις αυτό το θέμα, έχεις πρόσφατα προαχθεί σε **τακτικό μέλος** (επίπεδο εμπιστοσύνης 3)
 
-      Μπορείς τώρα να &hellip,
+      Τώρα μπορείς να &hellip,
 
-      *Επεξεργαστείς τον τίτλο οποιουδήποτε θεματος
+      * Επεξεργαστείς τον τίτλο οποιουδήποτε θεματος
 
-      *Αλλάξεις την κατηγορία οποιουδήποτε θέματος
+      * Αλλάξεις την κατηγορία οποιουδήποτε θέματος
 
-      *Έχεις όλες σου τις σελίδες ακολουθημένες ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) έχει διαγραφτεί)
+      * Ακολουθούνται όλοι σου οι σύνδεσμοι ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) έχει αφαιρεθεί)
 
-      *Έχεις πρόσβαση σε ιδιοτική Lounge κατηγορία, που εμφανίζεται μόνο σε χρήστες του επιπέδου 3 και πιο πάνω.
+      * Έχεις πρόσβαση στην ιδιωτική κατηγορία, που εμφανίζεται μόνο σε χρήστες του επιπέδου 3 και πάνω.
 
-      *Κρύψεις ανεπιθύμητη αλληλογραφία με μία σημαία
+      * Κρύψεις ανεπιθύμητη αλληλογραφία με την σημαία
 
-      Εδώ είναι η [current list of fellow regulars](/badges/3/regular). Είσαι σίγουρος ότι θα πεις γεια.
+      Εδώ είναι η [λίστα με όλα τα κανονικά μέλη](/badges/3/regular). Μπες να πεις ένα γεια.
 
-      Ευχαριστούμε που είσαι ένα σημαντικό μέρος αυτής της κοινότητας!
+      Ευχαριστούμε που συνεχίζεις να είσαι ένα σημαντικό μέρος αυτής της κοινότητας!
 
-      (Για περισσότερες πληροφορίες όσον αφορά τα πεδία, [see this topic][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\n\n"
+    replace_paragraph: "(Αντικατέστησε αυτή την πρώτη παράγραφο με μια σύντομη περιγραφή της νέας σας κατηγορίας. Αυτή η οδηγία θα εμφανιστεί στην περιοχή επιλογής κατηγορίας, επομένως προσπάθησε να είναι κάτω απο 200 χαρακτήρες. **Μέχρι να επεξεργαστείς αυτή την περιγραφή ή να δημιουργήσεις θέματα, αυτή η κατηγορία δεν θα εμφανίζεται στην σελίδα κατηγοριών. **)"
+    post_template: "%{replace_paragraph}\n\nΧρησιμοποιήστε τις επόμενες παραγράφους για μια μεγαλύτερη περιγραφή ή για να ορίσεις οδηγίες και κανόνες για τις κατηγορίες:\n\n- Γιατί μπορεί να χρησιμοποιηθεί αυτή η κατηγορία; Ποιος είναι ο σκοπός της;\n\n- Αυτή η κατηγορία είναι διαφορετική από αυτές που έχουμε ήδη;\n\n- Τι πρέπει να περιέχουν τα θέματα αυτής της κατηγορίας γενικότερα;\n\n- Χρειαζόμαστε αυτή την κατηγορία; Μπορούμε να την ενώσουμε με άλλη κατηγορία ή υποκατηγορία;\n\n\n"
     errors:
       uncategorized_parent: "Μη κατηγοριοποιημένο δεν μπορεί να έχει κύρια κατηγορία"
       self_parent: "Η γονική κατηγορία μιας υποκατηγορίας δεν μπορεί να είναι ο εαυτός της"
       depth: "Δεν μπορείτε να βάλετε μια υποκατηγορία κάτω από άλλη"
-      invalid_email_in: "'%{email}' δεν είναι έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου."
+      invalid_email_in: "'%{email}' δεν είναι έγκυρη διεύθυνση email."
       email_already_used_in_group: "'%{email}' χρησιμοποιείται ήδη από την ομάδα '%{group_name}'"
       email_already_used_in_category: "%{email}' χρησιμοποιείται ήδη από την κατηγορία '%{caregory_name}'."
+      description_incomplete: "Η ανάρτηση περιγραφής κατηγορίας θα πρέπει να έχει τουλάχιστον μία παράγραφο."
     cannot_delete:
-      uncategorized: "Δεν μπορείτε να διαγράψετε την 'Mη κατηγοριοποιημένο'"
+      uncategorized: "Δεν μπορείτε να διαγράψετε την κατηγορία 'Αταξινόμητα'"
       has_subcategories: "Δεν είναι δυνατή η διαγραφή αυτής της κατηγορίας, επειδή έχει υπο-κατηγορίες."
       topic_exists:
         one: "Δεν είναι δυνατή η διαγραφή αυτής της κατηγορίας, επειδή έχει 1 θέμα. Το παλαιότερο θέμα είναι %{topic_link}."
         other: "Δεν είναι δυνατή η διαγραφή αυτής της κατηγορίας, επειδή έχει %{count} θέματα. Το παλαιότερο θέμα είναι %{topic_link}."
-      topic_exists_no_oldest: "Δεν είναι δυνατή η διαγραφή αυτής της κατηγορίας, διότι η καταμέτρηση του θέματος είναι %{count}."
-    uncategorized_description: "Νήματα που δεν χρειάζονται κατηγορία, ή που δεν ταιριάζουν σε καμία άλλη από τις κατηγορίες που ήδη υπάρχουν."
+      topic_exists_no_oldest: "Δεν είναι δυνατή η διαγραφή αυτής της κατηγορίας, διότι ο αριθμός νημάτων είναι %{count}."
+    uncategorized_description: "Νήματα που δεν χρειάζονται κατηγορία ή που δεν ταιριάζουν σε καμία άλλη από τις υπάρχουσες κατηγορίες."
   trust_levels:
     newuser:
       title: "νέος χρήστης"
     basic:
-      title: "βασικός χρήστης"
+      title: "αρχάριος"
     member:
       title: "μέλος"
     regular:
-      title: "κανονικός"
+      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}' - εάν επιθυμείς ακόμα να υποβιβάσεις το επίπεδο εμπιστοσύνης του χρήστη, κλείδωσε πρώτα το επίπεδο εμπιστοσύνης "
+  post:
+    image_placeholder:
+      broken: "Η εικόνα είναι χαλασμένη"
   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} πριν δοκιμάσεις ξανά."
-      live_post_counts: "Ζητάς ζωντανές δημοσιεύσεις πολύ γρήγορα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      unsubscribe_via_email: "Έχετε φτάσει το μέγιστο αριθμό των καταργήσεων εγγραφής μέσω του ηλεκτρονικού ταχυδρομείου σήμερα. Παρακαλώ περιμένετε % {time_left} πριν προσπαθήσετε ξανά."
-      topic_invitations_per_day: "Έχετε φθάσει το ανώτατο όριο προσκλήσεων τίτλου για σήμερα. Παρακαλώ περιμένετε %{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: "Έχεις φτάσει το ανώτατο όριο απεγγραφών μέσω email για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
+      topic_invitations_per_day: "Έχεις φτάσει το ανώτατο όριο προσκλήσεων σε νήματα για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
     hours:
       one: "1 ώρα"
       other: "%{count} ώρες"
@@ -467,10 +511,10 @@ el:
         other: "%{count}η"
       about_x_months:
         one: "1μήνας"
-        other: "%{count}μήνας"
+        other: "%{count}μήνες"
       x_months:
         one: "1μήνας"
-        other: "%{count}μήνας"
+        other: "%{count}μήνες"
       about_x_years:
         one: "1ε"
         other: "%{count}ε"
@@ -489,8 +533,8 @@ el:
         one: "πριν 1 δευτερόλεπτο"
         other: "πριν %{count} δευτερόλεπτα"
       less_than_x_minutes:
-        one: "πριν από λιγότερο 1 λεπτό"
-        other: "πριν από λιγότερο %{count} λεπτά"
+        one: "λιγότερο από 1 λεπτό πριν"
+        other: "λιγότερο από %{count} λεπτά πριν"
       x_minutes:
         one: "πριν 1 λεπτό"
         other: "πριν %{count} λεπτά"
@@ -516,133 +560,154 @@ 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: "Λυπούμαστε, αυτή η επιβεβαίωση του συνδέσμου δεν είναι πια έγκυρη. Πιθανόν η διεύθυνση του ηλεκτρονικού ταχυδρομείου να έχει αλλάξει ήδη."
+    confirmed: "Η διεύθυνσή email σας έχει ενημερωθεί."
+    please_continue: "Συνεχίστε στην %{site_name}"
+    error: "Υπήρξε ένα σφάλμα κατά την αλλαγή της διεύθυνσης email σου. Ίσως αυτή η διεύθυνση είναι ήδη σε χρήση;"
+    error_staged: "Υπήρξε ένα σφάλμα κατά την αλλαγή της διεύθυνσης email σου. Η δεύθυνση αυτή χρησιμοποιείται ήδη από αλλό χρήστη. "
+    already_done: "Λυπούμαστε, αυτός ο σύνδεσμος επιβεβαίωσης του λογαριασμού σας δεν είναι πλέον έγκυρος. Ίσως η διεύθυνση email σας να έχει αλλάξει ήδη."
     authorizing_old:
-      title: "Ευχαριστώ για την επιβεβαίωση της τρέχουσας διεύθυνσης ηλεκτρονικού ταχυδρομείου"
-      description: "Σας στέλνουμε τώρα με ηλεκτρονικό μύνημα με την επιβεβαίωση τηνς νεας σας διέυθυνσης "
+      title: "Ευχαριστούμε για την επιβεβαίωση της τρέχουσας διεύθυνσης email"
+      description: "Σας στέλνουμε τώρα email για την επιβεβαίωση της νέας σας διέυθυνσης."
   activation:
     action: "Πατήστε εδώ για να ενεργοποιήσετε το λογαριασμό σας."
     already_done: "Συγνώμη, αυτός ο σύνδεσμος επιβεβαίωσης του λογαριασμού σας δεν είναι πλέον έγκυρος. Ίσως ο λογαριασμός σας είναι ήδη ενεργός;"
     please_continue: "Ο νέος λογαριασμός σας έχει επιβεβαιωθεί. Θα μεταφερθείτε στην αρχική σελίδα."
-    continue_button: "Συνεχίστε στο %{site_name}"
-    welcome_to: "Καλώς ήλθατε στο %{site_name}!"
-    approval_required: "Ένας συντονιστής πρέπει να εγκρίνει το νέο σας λογαριασμό για να μπορέσετε να αποκτήσετε πρόσβαση σε αυτό το φόρουμ. Θα λάβετε ένα μήνυμα ηλεκτρονικού ταχυδρομείου όταν ο λογαριασμός σας έχει εγκριθεί!"
-    missing_session: "Δεν μπορούμε να ανιχνεύσουμε αν δημιουργήθηκε ο λογαριασμό σας, παρακαλούμε βεβαιωθείτε ότι έχετε ενεργοποιήσει τα cookies."
+    continue_button: "Συνεχίστε στην %{site_name}"
+    welcome_to: "Καλώς ήλθατε στην %{site_name}!"
+    approval_required: "Ένας συντονιστής θα πρέπει να εγκρίνει το νέο σας λογαριασμό πριν αποκτήσετε πρόσβαση στην ιστοσελίδα. Θα λάβετε ένα email όταν ο λογαριασμός σας εγκριθεί!"
+    missing_session: "Δεν μπορούμε να ανιχνεύσουμε αν δημιουργήθηκε ο λογαριασμός σας, παρακαλούμε βεβαιωθείτε ότι έχετε ενεργοποιήσει τα cookies."
     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: 'Αυτή η δημοσίευση δεν είναι σχετική με την τρέχουσα συζήτηση όπως ορίζεται από τον τίτλο και την πρώτη δημοσίευση, και θα πρέπει μάλλον να μετακινηθεί αλλού.'
-      long_form: 'Επισημάνετε το ως εκτός θέματος'
+      description: 'Αυτή η ανάρτηση δεν είναι σχετική με την τρέχουσα συζήτηση όπως ορίζεται από τον τίτλο και την πρώτη δημοσίευση και θα πρέπει μάλλον να μετακινηθεί αλλού.'
+      short_description: 'Μη σχετικό με την συζήτηση'
+      long_form: 'το επισήμαναν ως εκτός θέματος'
     spam:
       title: 'Ανεπιθύμητα'
-      long_form: 'Επισημάνετε το ως ανεπιθύμητο'
+      description: 'Αυτή η ανάρτηση είναι διαφήμιση ή δολιοφθορά. Δεν είναι σχετική με το παρόν νήμα.'
+      short_description: 'Αυτή είναι μια διαφήμιση ή δολιοφθορά'
+      long_form: 'το επισήμαναν ως ανεπιθύμητο'
       email_title: '"%{title}" επισημάνθηκε ως ανεπιθύμητο'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: 'Ανάρμοστο'
-      description: 'Το περιεχόμενο αυτή της δημοσίευσης θα θεωρούνταν από κάθε λογικό άνθρωπο, προσβλητικό, καταχρηστικό ή αντίθετο με τις  <a href="/guidelines"> της κοινότητας μας'
-      long_form: 'Επισημάνετε το ως ανάρμοστο'
+      description: 'Το περιεχόμενο αυτής της δημοσίευσης θα θεωρούνταν από κάθε λογικό άνθρωπο, προσβλητικό, καταχρηστικό ή αντίθετο με τις  <a href="/guidelines">οδηγίες χρήσης της κοινότητάς μας</a>'
+      short_description: 'Παράβαση των <a href="/guidelines">Οδηγιών της Κοινότητας</a>'
+      long_form: 'το επισήμαναν ως ανάρμοστο'
     notify_user:
       title: 'Αποστολή μηνύματος στον @{{username}} '
-      description: 'Θέλω να μιλήσω με αυτό το άτομο άμεσα και προσωπικά σχετικά με αυτή τη δημοσίευση.'
-      long_form: 'ειδοποιήσαι τον χρήστη'
+      description: 'Θέλω να μιλήσω με αυτό το άτομο άμεσα και ιδιωτικά σχετικά με αυτή την ανάρτηση.'
+      short_description: 'Θέλω να μιλήσω με αυτό το άτομο άμεσα και ιδιωτικά σχετικά με αυτή την ανάρτηση.'
+      long_form: 'ειδοποίησε το μέλος'
       email_title: 'Η δημοσίευση σας στο "%{title}"'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Κάτι άλλο"
-      description: 'Η συγκεκριμένη ανάρτηση απαιτεί έλεγχο από το προσωπικό. για έναν άλλον λόγο που δεν αναφέρεται παραπάνω.'
-      long_form: 'Αναφέρθηκε για έλεγχο από το προσωπικό.'
-      email_title: 'Μια ανάρτηση στο "%{title}" απαιτεί έλεγχο από το προσωπικό.'
+      description: 'Η συγκεκριμένη ανάρτηση απαιτεί έλεγχο από το προσωπικό για έναν άλλον λόγο που δεν αναφέρεται παραπάνω.'
+      short_description: 'Χρειάζεται έλεγχο από το προσωπικό για διαφορετικό λόγο'
+      long_form: 'το επισήμαναν για έλεγχο από τους συνεργάτες'
+      email_title: 'Μια ανάρτηση στο "%{title}" απαιτεί έλεγχο από τους συνεργάτες'
       email_body: "%{link}\n\n%{message}"
     bookmark:
       title: 'Σελιδοδείκτης'
-      description: 'Τοποθετήσατε σελιδοδείκτη σε αυτή την ανάρτηση'
-      long_form: 'τοποθετήσατε σελιδοδείκτη σε αυτή την ανάρτηση'
+      description: 'Προσθήκη σελιδοδείκτη στην ανάρτηση'
+      short_description: 'Προσθήκη σελιδοδείκτη στην ανάρτηση'
+      long_form: 'πρόσθεσε σελιδοδείκτη σε αυτή την ανάρτηση'
     like:
       title: 'Σας αρέσει'
-      description: 'Σας αρέσει αυτή η δημοσίευση'
-      long_form: 'Μου άρεσε'
+      description: 'Μου αρέσει η ανάρτηση'
+      short_description: 'Μου αρέσει η ανάρτηση'
+      long_form: 'άρεσαν'
     vote:
       title: 'Ψηφίστε'
-      description: 'Ψηφίστε για αυτή την δημοσίευση '
-      long_form: 'Ψηφίσατε για αυτή την δημοσίευση'
+      description: 'Ψηφίστε την ανάρτηση'
+      short_description: 'Ψηφίστε την ανάρτηση'
+      long_form: 'ψήφισαν την ανάρτηση'
   user_activity:
+    no_default:
+      self: "Δεν έχετε ακόμη καμία δραστηριότητα."
+      others: "Χωρίς δραστηριότητα."
     no_bookmarks:
-      self: "Δεν έχεις σελιδοδείκτη σε καμία ανάρτηση, οι σελιδοδείκτες στις αναρτήσεις σου επιτρέπουν εύκολη πρόσβαση σε αυτές αργότερα."
+      self: "Δεν έχεις κανέναν σελιδοδείκτη σε αναρτήσεις, οι σελιδοδείκτες στις αναρτήσεις σου επιτρέπουν εύκολη πρόσβαση σε αυτές αργότερα."
       others: "Κανένας σελιδοδείκτης."
     no_likes_given:
-      self: "Δεν έχεις πατήσει \"μου αρέσει\" σε καμία δημοσίευση."
-      others: "Κανένα \"μου αρέσει\" στις δημοσιεύσεις."
+      self: "Δεν σου αρέσει καμία ανάρτηση."
+      others: "Καμία αρεστή ανάρτηση."
+    no_replies:
+      self: "Δεν έχεις απαντήσει σε καμία ανάρτηση."
+      others: "Χωρίς απαντήσεις."
   topic_flag_types:
     spam:
       title: 'Ανεπιθύμητα'
-      description: 'Αυτό το θέμα είναι διαφήμιση. Δεν είναι χρήσιμο ή σχετικό με το forum, αλλά αποσκοπεί σε διαφημιστική προώθηση.'
-      long_form: 'Επισημάνετε το ως ανεπιθύμητο'
+      description: 'Αυτό το θέμα είναι διαφήμιση. Δεν είναι χρήσιμο ή σχετικό με την ιστοσελίδα, αλλά αποσκοπεί σε διαφημιστική προώθηση.'
+      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'
-      email_title: 'Το θέμα "%{title}" χρειάζεται έλεγχο από διαμεσολαβητή'
+      description: 'Το θέμα απαιτεί την γενική προσοχή του προσωπικού, βασισμένη στις <a href="/guidelines">κατευθυντήριες γραμμές</a>, τους<a href="%{tos_url}">όρους χρήσης</a> ή για άλλο λόγο που δεν αναφέρεται πιο πάνω.'
+      long_form: 'το επισήμαναν για έλεγχο από συντονιστή'
+      email_title: 'Το θέμα "%{title}" χρειάζεται έλεγχο από συντονιστή'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: 'Η ανάρτηση σου έχει επισημανθεί από την κοινότητα. Παρακαλώ <a href="/my/messages">δες τα μηνύματα σου.'
-    user_must_edit: '<p>Αυτή η δημοσίευση έχει αναφερθεί από την κοινότητα και είναι προσωρινά κρυφή</p>'
+    you_must_edit: '</p>Η ανάρτησή σου έχει επισημανθεί από την κοινότητα. Παρακαλώ <a href="%{path}">δες τα μηνύματά σου</a>.</p>'
+    user_must_edit: '<p>Αυτή η ανάρτηση έχει επισημανθεί από την κοινότητα και είναι προσωρινά κρυφή.</p>'
   archetypes:
     regular:
       title: "Κανονικό Νήμα"
     banner:
-      title: "Νήμα ανακοίνωσης"
+      title: "Νήμα Ανακοίνωσης"
       message:
-        make: "Aυτό το νήμα είναι τώρα νήμα ανακοίνωσης. Θα εμφανίζεται στην κορυφή της κάθε σελίδας μέχρι να απορριφθεί από το χρήστη."
-        remove: "Αυτό το θέμα δεν είναι πλέον διαφημιστικό πλαίσιο. Δε θα εμφανίζεται πια στην κορυφή της κάθε σελίδας."
+        make: "Aυτό το νήμα είναι πλέον νήμα ανακοίνωσης. Θα εμφανίζεται στην κορυφή κάθε σελίδας, μέχρι να απορριφθεί από το χρήστη."
+        remove: "Αυτό το νήμα δεν είναι πλέον νήμα ανακοίνωσης. Δε θα εμφανίζεται στην κορυφή κάθε σελίδας."
   unsubscribed:
     title: "Επιτυχής απεγγραφή!"
-    description: "Καταργήσατε την εγγραφή σας. Για να αλλάξετε της ρυθμίσεις του email σας <a href='%{url}'>επισκεφθείτε τις προτιμήσεις σας</a>."
-    topic_description: "Για να εγγραφείτε ξανά στο %{link}, χρησιμοποιήστε τον έλεγχο ειδοποιήσεων από κάτω ή δεξιά του νήματος."
+    description: "<b>%{email}</b> έχει απεγγραφεί. Για να αλλάξετε τις ρυθμίσεις του email σας <a href='%{url}'>επισκεφθείτε την σελίδα ρυθμίσεων</a>."
+    topic_description: "Για να εγγραφείτε ξανά στο %{link}, χρησιμοποιήστε τον έλεγχο ειδοποιήσεων στην κάτω ή στην δεξιά πλευρά του νήματος."
   unsubscribe:
     title: "Απεγγραφή"
-    stop_watching_topic: "Διακοπή παρακολούθησης αυτού του νήματος, %{link}."
+    stop_watching_topic: "Διακοπή επιτήρησης αυτού του νήματος, %{link}."
     mute_topic: "Σίγαση όλων των ειδοποιήσεων για αυτό το νήμα, %{link}"
-    unwatch_category: "Διακοπή παρακολούθησης όλων των νημάτων της κατηγορίας %{category}"
+    unwatch_category: "Διακοπή επιτήρησης όλων των νημάτων της κατηγορίας %{category}"
     mailing_list_mode: "Απενεργοποιήστε τη λειτουργία της ταχυδρομικής λίστας"
-    disable_digest_emails: "Διακοπή αποστολής περιληπτικών μηνυμάτων"
-    all: "Μη μου στέλνετε mail από το %{sitename}"
-    different_user_description: "Έχετε συνδεθεί ως διαφορετικός χρήστης από εκείνον που επικοινωνήσαμε μέσω ηλεκτρονικού ταχυδρομείου. Παρακαλούμε αποσυνδεθείτε, ή χρησιμοποιήστε την ανώνυμη λειτουργία, και δοκιμάστε ξανά."
-    not_found_description: "Λυπούμαστε, δεν μπορέσαμε να βρούμε την συγκεκριμένη κατάργηση εγγραφής. Είναι πιθανό ο σύνδεσμος στο email σας να έληξε? "
+    disable_digest_emails: "Διακοπή αποστολής συνοπτικών μηνυμάτων"
+    all: "Μη μου στέλνετε mail από την %{sitename}"
+    different_user_description: "Έχετε συνδεθεί ως διαφορετικός χρήστης από αυτόν που επικοινωνήσαμε μέσω email. Παρακαλούμε αποσυνδεθείτε ή χρησιμοποιήστε την ανώνυμη λειτουργία και δοκιμάστε ξανά."
+    not_found_description: "Λυπούμαστε, δεν μπορέσαμε να βρούμε την συγκεκριμένη απεγγραφή. Είναι πιθανό ο σύνδεσμος στο email σας να έληξε; "
     log_out: "Αποσύνδεση"
   user_api_key:
-    title: "Εξουσιοδοτημένη πρόσβαση στην εφαρμογή"
-    authorize: "Εξουσιοδοτώ"
-    read: "διαβάζω"
-    read_write: "διαβάζω/γράφω"
+    title: "Εξουσιοδότηση πρόσβασης στην εφαρμογή"
+    authorize: "Εξουσιοδότηση"
+    read: "ανάγνωση"
+    read_write: "ανάγνωση/εγγραφή"
     description: "\"%{application_name}\" ζητά την ακολόλουθη πρόσβαση στον λογαριασμό σου:"
-    no_trust_level: "Συγγνώμη, δεν έχεις το απαιτούμενο επίπεδο εμπιστοσύνης για να έχεις πρόσβαση στον χρήστη API"
-    generic_error: "Συγνώμη, δεν μπορούμε να εκδώσουμε σε χρήστη API κλειδία, αυτή η πράξη μπορεί να μην είναι διαθέδιμη από τη διαχείριση της σελίδας. "
+    no_trust_level: "Συγγνώμη, δεν έχεις το απαιτούμενο επίπεδο εμπιστοσύνης για να έχεις πρόσβαση στο API χρήστη"
+    generic_error: "Συγνώμη, δεν μπορούμε να εκδώσουμε σε χρήστη API keys, αυτή η πράξη μπορεί να μην είναι διαθέδιμη από τον διαχειριστή της ιστοσελίδας. "
     scopes:
       message_bus: "Ζωντανές ενημερώσεις"
       notifications: "Διάβασε και διάγραψε τις ειδοποιήσεις"
-      push: "ειδοποιήσεις για περετέρο υπηρεσίες"
-      session_info: "Διαβάστε τις πληροφορίες του χρήστη"
+      push: "Ώθησε ειδοποιήσεις σε υπηρεσίες τρίτων"
+      session_info: "Διαβάστε τις πληροφορίες της συνεδρίας του χρήστη"
       read: "Ανάγνωση όλων"
-      write: "Γράψτε όλα"
+      write: "Εγγραφή όλων"
   reports:
     visits:
       title: "Επισκέψεις Χρήστη"
@@ -661,13 +726,13 @@ el:
       xaxis: "Ημέρα"
       yaxis: "Αριθμός νέων θεμάτων"
     posts:
-      title: "Δημοσιεύσεις"
+      title: "Αναρτήσεις"
       xaxis: "Ημέρα"
-      yaxis: "Αριθμός νέων δημοσιεύσεων"
+      yaxis: "Αριθμός νέων αναρτήσεων"
     likes:
       title: "Αρέσει"
       xaxis: "Ημέρα"
-      yaxis: "Αριθμός νέων likes"
+      yaxis: "Αριθμός νέων 'Μου αρέσει'"
     flags:
       title: "Σημάνσεις"
       xaxis: "Ημέρα"
@@ -679,17 +744,17 @@ el:
     starred:
       title: "Επιλεγμένα"
       xaxis: "Ημέρα"
-      yaxis: "Αριθμός νέων πρωταγονιστικών θεμάτων."
+      yaxis: "Αριθμός νέων νημάτων με αστερίσκο"
     users_by_trust_level:
       title: "Χρήστες ανάλογα με το Επίπεδο Εμπιστοσύνης"
       xaxis: "Επίπεδο Εμπιστοσύνης"
       yaxis: "Αριθμός χρηστών"
     emails:
-      title: "Απεσταλμένα μηνύματα ηλεκτρονικού ταχυδρομείου"
+      title: "Απεσταλμένα Emails"
       xaxis: "Ημέρα"
-      yaxis: "Αριθμός μηνυμάτων ηλεκτρονικού ταχυδρομείου"
+      yaxis: "Αριθμός Emails"
     user_to_user_private_messages:
-      title: "Χειριστή-προς-χειριστή"
+      title: "Μέλος-προς-Μέλος"
       xaxis: "Ημέρα"
       yaxis: "Αριθμός μηνυμάτων"
     system_private_messages:
@@ -712,45 +777,45 @@ el:
       title: "Κορυφαίες παραπομπές"
       xaxis: "Χρήστης"
       num_clicks: "Clicks"
-      num_topics: "Θέματα"
+      num_topics: "Νήματα"
     top_traffic_sources:
-      title: "Κύριες πηγές κίνησης. "
-      xaxis: "Τομέας"
+      title: "Κύριες πηγές κίνησης"
+      xaxis: "Domain"
       num_clicks: "Clicks"
-      num_topics: "Θέματα"
+      num_topics: "Νήματα"
       num_users: "Χρήστες"
     top_referred_topics:
-      title: "Κορυφαία Αναφερόμενα Θέματα"
-      xaxis: "Θέμα"
+      title: "Κορυφαία Αναφερόμενα Νήματα"
+      xaxis: "Νήμα"
       num_clicks: "Clicks"
     page_view_anon_reqs:
-      title: "Ανώνημος "
+      title: "Ανώνυμοι"
       xaxis: "Ημέρα"
       yaxis: "Ανώνυμες Αναγνώσεις"
     page_view_logged_in_reqs:
-      title: "Συνδεδεμένος"
+      title: "Συνδεδεμένοι"
       xaxis: "Ημέρα"
       yaxis: "Συνδεδεμένοι στις αναγνώσεις"
     page_view_crawler_reqs:
-      title: "Κακόβουλοι ακόλουθοι ιστού"
+      title: "Web Crawlers"
       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: "Ημέρα"
@@ -760,19 +825,19 @@ el:
       xaxis: "Ημέρα"
       yaxis: "Ανακατεύθυνση αιτήσεων (Κατάσταση 3xx)"
     http_4xx_reqs:
-      title: "HTTP 4xx (Σφάλμα χρήστη)"
+      title: "HTTP 4xx (Client Error)"
       xaxis: "Ημέρα"
-      yaxis: "Λάθοι πελατών (Κατάσταση 4xx)"
+      yaxis: "Client Errors (Status 4xx)"
     http_5xx_reqs:
-      title: "HTTP 5xx (Σφάλμα Διακομιστή)"
+      title: "HTTP 5xx (Server Error)"
       xaxis: "Ημέρα"
-      yaxis: "Σφάλμα διακομιστή (Κατάσταση 5xx)"
+      yaxis: "Server Errors (Status 5xx)"
     http_total_reqs:
       title: "Σύνολο"
       xaxis: "Ημέρα"
       yaxis: "Σύνολο αιτήσεων"
     time_to_first_response:
-      title: "Ώρα για την πρώτη απάντηση"
+      title: "Χρόνος για την πρώτη απάντηση"
       xaxis: "Ημέρα"
       yaxis: "Μέσος όρος χρόνου (ώρες)"
     topics_with_no_response:
@@ -782,228 +847,235 @@ el:
     mobile_visits:
       title: "Επισκέψεις χρήστη"
       xaxis: "Ημέρα"
-      yaxis: "Νούμερο επισκέψεων"
+      yaxis: "Αριθμός επισκέψεων"
   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>.'
-    twitter_config_warning: 'Ο server είναι ρυθμισμένος να επιτρέπει την εγγραφή και την είσοδο με Twitter  (enable_twitter_logins), αλλά η ταυτότητα του πελάτη και οι μυστικές τιμές δεν έχουν οριστεί. Πηγαίνετε στο <a href="/admin/site_settings">Ρυθμίσεις σελίδας</a> και ανανεώστε τις ρυθμίσεις. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Δείτε τον οδηγό για περισσότερα</a>.'
-    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 τελειώνει με κάθετω.  "
+    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>.'
+    twitter_config_warning: 'Ο server είναι ρυθμισμένος να επιτρέπει την εγγραφή και την είσοδο με Twitter  (enable_twitter_logins), αλλά η ταυτότητα του πελάτη και οι μυστικές τιμές δεν έχουν οριστεί. Πηγαίνετε στις <a href="/admin/site_settings">Ρυθμίσεις Σελίδας</a> και ανανεώστε τις ρυθμίσεις. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Δείτε τον οδηγό για περισσότερα</a>.'
+    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 σας είναι σωστές.  <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>  "
+      one: "To Email polling έχει παράγει ένα σφάλμα τις τελευταίες 24 ώρες . Δείτε <a href='/logs' target='_blank'>τα αρχεία καταγραφής</a> για περισσότερες λεπτομέρειες.   "
+      other: "To Email polling έχει παράγει %{count} σφάλματα τις τελευταίες 24 ώρες . Δείτε <a href='/logs' target='_blank'>τα αρχεία καταγραφής</a> για περισσότερες λεπτομέρειες.  "
+    missing_mailgun_api_key: "Ο διακομιστής εχεί ρυθμιστεί για να στέλνει email μέσω του mailgun, αλλά δεν εχεις ρυθμίσει το κλειδί API που χρειάζεται για να επαληθευτούν τα webhook μυνήματα. "
+    bad_favicon_url: "Το favicon δεν μπορεί να φορτωθεί 'Ελεγξε το favicon_url στις <a href='/admin/site_settings'>Ρυθμίσεις Iστοσελίδας</a>"
+    poll_pop3_timeout: "Το χρονικό όριο σύνδεσης με τον διακομιστή POP3 έληξε. Τα εισερχόμενα email δεν μπορούν να ανακτηθούν. Παρακαλώ ελέγξτε τις <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)"
-    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: "Ελάχιστο επιτρεπόμενο μήκος τίτλου για ένα μήνυμα σε χαρακτήρες"
+    delete_old_hidden_posts: "Διάγραψε αυτόματα όποιες κρυμμένες αναρτήσεις μένουν κρυφές για πάνω από 30 ημέρες. "
+    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: "Δείξε το σύνδεσμο προτεινόμενου νήματος στο συνοπτικό email."
+    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) δευτερόλεπτα μετά από την δημοσίευση, η επεξεργασία δεν θα δημιουργίσει νεα έκδωση στο ιστορικό της δημοσίευσης. "
-    post_edit_time_limit: "Ο συγγραφέας μπορεί να επεξεργαστεί ή να διαγράψει τις δημοσιεύσεις του για (n) λεπτά αφότου δημοσευτούν. Όρισε το στο 0 για να είναι για πάντα."
-    edit_history_visible_to_public: "Επέτρεψε σε όλους να δουν προηγούμενες εκδοχές από μια επεξεργασμένη δημοσίευση. Όταν είναι απενεργοποιημένο, μόνο τα μέλη του προσωπικού μπορούν να τα δούν. "
-    delete_removed_posts_after: "Δημοσιεύσεις που διαγράφονται από τον συγγραφέα θα διαγράφονται αυτόματα μετά από (n) ώρες. Εάν το ορίσεις στο 0, τότε θα διαγράφονται αμέσως."
+    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: "Μετά από πόσα λεπτά ένας χρήστης μπορεί να κάνει δημοσιέυση με το ίδιο περιεχόμενο"
+    educate_until_posts: "Όταν ο χρήστης ξεκινά να πληκτρολογεί τις πρώτες (n) νέες αναρτήσεις, εμφάνισε το αναδυόμενο πάνελ εκπαίδευσης νέου χρήστη στο συνθέτη."
+    title: "Το όνομα αυτής της ιστοσελίδας, όπως χρησιμοποιείται στην ετικέτα τίτλου."
+    site_description: "Περιέγραψε αυτή την ιστοσελίδα με μία πρόταση, όπως χρησιμοποιείται στην ετικέτα περιγραφής."
+    contact_email: "Η διεύθυνση Email της επαφής που είναι υπεύθυνη για την ιστοσελίδα. Χρησιμοποιείται για σημαντικές ειδοποιήσεις καθώς και στην φόρμα επικοινωνίας /about για επείγοντα ζητήματα."
+    contact_url: "URL εποικινωνίας για την σελίδα. Χρησιμοποιείται στην /about σελίδα για επείγοντα ζητήματα. "
+    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: "Μια λίστα από domains στα οποία το nofollow δεν θα προστίθεται στους συνδέσμους. example.com θα επιτρέπει αυτόματα και τα sub.example.com. Κατ' ελάχιστον θα πρέπει να προστεθεί το domain της ιστοσελίδας σας για να βοηθήσει τα web crawlers να βρουν όλο το περιεχόμενο. Αν τμήματα της ιστοσελίδας σας βρίσκονται σε άλλα domains, τότε προσθέστε και αυτά."
+    post_excerpt_maxlength: "Ανώτατο όριο μήκους για την σύνοψη μιας ανάρτησης."
+    show_pinned_excerpt_mobile: "Εμφάνιση περίληψης σε καρφιτσωμένα νήματα στην περιήγηση από κινητά τηλέφωνα."
+    show_pinned_excerpt_desktop: "Εμφάνιση περίληψης σε καρφιτσωμένα νήματα στην περιήγηση από ηλεκτρονικούς υπολογιστές."
+    post_onebox_maxlength: "Μέγιστο μέγεθος μιας oneboxed ανάρτησης σε χαρακτήρες."
     onebox_domains_blacklist: "Μία λίστα τομέων που δεν θα είναι ποτέ oneboxed."
-    max_oneboxes_per_post: "Ανώτατος αριθμός επιλογών σε μια δημοσίευση. "
+    inline_onebox_domains_whitelist: "Μια λίστα από domains τα οποία θα γίνουν onebox σε σκίκρυνση αν αναφερθούν χωρίς τίτλο"
+    enable_inline_onebox_on_all_domains: "Αγνόησε την ρύθμιση inline_onebox_domain_whitelist και επέτρεψε inline onebox σε όλα τα domains."
+    max_oneboxes_per_post: "Ανώτατος αριθμός oneboxes σε μια ανάρτηση. "
     logo_url: "Η εικόνα του λογότυπου πάνω αριστερά της ιστοσελίδας, πρέπει να έχει ως σχήμα ένα πλατύ ορθογώνιο. Εάν το αφήσεις κενό, θα φανεί ο τίτλος της ιστοσελίδας."
-    digest_logo_url: "Το εναλλακτικό λογότυπο εικόνας που χρησιμοποιείται στην κορυφή της περίληψης ηλεκτρονικού ταχυδρομείου του ιστότοπου σας. Θα πρέπει να είναι ένα ευρύ ορθογώνιο σχήμα. Δεν πρέπει να είναι μια εικόνα SVG. Αν μείνει κενό τότε το `logo_url` θα χρησιμοποιηθεί."
-    logo_small_url: "Η μικρή εικόνα του λογοτύπου στο πάνω αριστερό μέρος του site σας, θα πρέπει να έχει τετράγωνο σχήμα, το οποίο παρατηρείται κατά την κύλιση προς τα κάτω. Αν μείνει κενό, θα εμφανίζεται ένα home glyph."
+    digest_logo_url: "Το εναλλακτικό λογότυπο εικόνας που χρησιμοποιείται στην κορυφή του συνοπτικού email του ιστότοπου σας. Θα πρέπει να είναι ένα ευρύ ορθογώνιο σχήμα. Δεν πρέπει να είναι μια εικόνα 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: "Το url του λογοτύπου που χρησιμοποιείται στην έκδοση της ιστοσελίδας για κινητά τηλέφωνα. Αν μείνει κενό, θα χρησιμοποιηθεί το `logo_url`. Π.χ.: http://example.com/uploads/default/logo.png"
+    large_icon_url: "Εικόνα που χρησιμοποιείται ως logo/splash εικόνα στο Android. Η προτεινόμενη διάσταση είναι 512px επί 512px."
     apple_touch_icon_url: "Εικονίδιο που χρησιμοποιείται για συσκευές αφής της Apple. Το συνιστώμενο μέγεθος είναι 144px από 144px."
-    notification_email: "Η από: διεύθυνση ηλεκτρονικού ταχυδρομείου που χρησιμοποιείται για την αποστολή όλων των απαραιτήτων μηνυμάτων του συστήματος. Ο τομέας που καθορίζεται εδώ πρέπει να έχει SPF, DKIM και αντίστροφα PTR αρχεία ρυθμισμένα σωστά για να φθάσει το ηλεκτρονικό ταχυδρομείο."
-    email_custom_headers: "Μια λίστα οριοθετημένης σωληνώσεως που περιέχει τις προσαρμοσμένες κεφαλίδες των μηνυμάτων ηλεκτρονικού ταχυδρομείου.   "
-    email_subject: "Προσαρμόσιμη μορφή του θέματος για τα πρότυπα μηνύματα ηλεκτρονικού ταχυδρομείου. Δες https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
-    force_https: "Αναγκάζει το site σας να χρησιμοποιεί μόνο HTTPS. ΠΡΟΣΟΧΗ: Μην το ενεργοποιήσετε, μέχρι να επαληθεύσετε ότι το HTTPS είναι πλήρως εγκατεστημένο και λειτουργεί απολύτως παντού! Ελέγξατε το CDN σας, όλες τις κοινωνικές συνδέσεις, και οποιαδήποτε εξωτερικά λογότυπα / εξαρτήσεις για να βεβαιωθείτε ότι είναι όλα συμβατά με HTTPS;"
+    notification_email: "Η από: διεύθυνση email που χρησιμοποιείται για την αποστολή όλων των απαραιτήτων μηνυμάτων του συστήματος. Ο τομέας που καθορίζεται εδώ πρέπει να έχει SPF, DKIM και reverse PTR αρχεία ρυθμισμένα σωστά για να φθάσει το μήνυμα."
+    email_custom_headers: "Μια pipe-delimited λίστα που περιέχει τις προσαρμοσμένες κεφαλίδες των μηνυμάτων email.   "
+    email_subject: "Προσαρμόσιμη μορφή του θέματος για τα πρότυπα μηνύματα email. Δες https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
+    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: "Μέγιστο ποσοστό αναρτήσεων Επιστράφηκε από 'Ανακεφαλαίωση αυτού του θέματος'"
-    enable_private_messages: "Επιτρέψτε στους χρήστες με επίπεδο εμπιστοσύνης 1 (παραμετροποιήσιμο με το ελάχιστο επίπεδο εμπιστοσύνης για την αποστολή μηνυμάτων)  να δημιουργήσουν μηνύματα και να απαντήσουν σε μηνύματα. Σημειώστε ότι το προσωπικό μπορεί πάντα να στέλνει μηνύματα οτιδήποτε και να συμβεί."
+    summary_score_threshold: "Η ελάχιστη βαθμολογία που απαιτείται από μια ανάρτηση για να συμπεριληφθεί στο «Συνοψίστε αυτό το θέμα»"
+    summary_posts_required: "Ελάχιστες αναρτήσεις σε ένα νήμα πριν το «Συνοψίστε αυτό το θέμα» ενεργοποιηθεί"
+    summary_likes_required: "Ελάχιστος αριθμός ''Μου αρέσει'' σε ένα θέμα πριν ενεργοποιηθεί το «Συνοψίστε αυτό το θέμα» "
+    summary_percent_filter: "Όταν ο χρήστης επιλέξει «Συνοψίστε αυτό το θέμα», δείξε το κορυφαίο % των αναρτήσεων"
+    summary_max_results: "Μέγιστος αριθμός αναρτήσεων στο «Συνοψίστε αυτό το θέμα»"
+    enable_private_messages: "Επίτρεψε στους χρήστες επιπέδου εμπιστοσύνης 1 (ρυθμιζόμενο μέσω min trust level to send messages)  να δημιουργήσουν μηνύματα και να απαντήσουν σε μηνύματα. Σημειώστε ότι οι συνεργάτες μπορούν πάντα να στέλνουν μηνύματα."
+    enable_private_email_messages: "Επίτρεψε στους χρήστες επιπέδου εμπιστοσύνης 4 (ρυθμιζόμενο μέσω min trust level to send messages) να στέλνουν προσωπικά μηνύματα email. Σημειώστε ότι οι συνεργάτες μπορούν πάντα να στέλνουν μηνύματα."
     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_silence_new_user: "Αν η ανάρτηση ενός νέου χρήστη λάβει αυτόν τον αριθμό σημάνσεων spam από num_users_to_silence_new_user διαφορετικούς χρήστες, κρύψε όλες τις υπάρχουσες αναρτησεις του χρήστη και απαγόρευσε κάθε μελλοντική ανάρτηση. 0 για ακύρωση."
+    num_users_to_silence_new_user: "Αν η ανάρτηση ενός νέου χρήστη λάβει  num_spam_flags_to_silence_new_user σημάνσεις spam από αυτόν τον αριθμό διαφορετικών χρηστών, κρύψε όλες τις υπάρχουσες αναρτησεις του χρήστη και απαγόρευσε κάθε μελλοντική ανάρτηση. 0 για ακύρωση."
+    num_tl3_flags_to_silence_new_user: "Αν η ανάρτηση ενός νέου χρήστη λάβει αυτόν τον αριθμό σημάνσεων από  num_tl3_users_to_silence_new_user διαφορετικούς χρήστες επιπέδου 3, κρύψε όλες τις υπάρχουσες αναρτησεις του χρήστη και απαγόρευσε κάθε μελλοντική ανάρτηση. 0 για ακύρωση."
+    num_tl3_users_to_silence_new_user: "Αν η ανάρτηση ενός νέου χρήστη λάβει num_tl3_flags_to_silence_new_user flags από αυτόν τον αριθμό διαφορετικών χρηστών επιπέδου 3, κρύψε όλες τις υπάρχουσες αναρτησεις του χρήστη και απαγόρευσε κάθε μελλοντική ανάρτηση. 0 για ακύρωση."
+    notify_mods_when_user_silenced: "Αν ένας χρήστης σιγηθεί αυτόματα, στείλε ένα μήνυμα σε όλους τους συντονιστές."
     flag_sockpuppets: "Εάν ένας νέος χρήστης απαντήσει σε ένα νήμα από την ίδια διεύθυνση ΙP όπως ο νέος χρήστης, ο οποίος ξεκίνησε το νήμα, και οι δυο δημοσιεύσεις τους θα επισημανθούν ως δυνητικά ανεπιθύμητες."
     traditional_markdown_linebreaks: "Χρήση παραδοσιακών αλλαγών γραμμών στη Markdown, η οποία απαιτεί δύο κενά διαστήματα για μια αλλαγή γραμμής."
-    allow_html_tables: "Αποδοχή εισδοχής πινάκων στη Markdown με τη χρήση ετικετών HTML. TABLE, THEAD, TD, TR, TH θα μπαίνουν στη λίστα επιτρεπόμενων (απαιτείται πληρής αντιγραφή σε όλες τις αναρτήσεις που περιέχουν πίνακες)"
+    enable_markdown_typographer: "Χρησιμοποίησε βασικούς τυπογραφικούς κανόνες για να βελτιώσεις την αναγνωσιμότητα του κειμένου στις παραγράφους, αντικαθιστά (c) (tm) κλπ με σύμβολα, μειώνει τον αριθμό των ερωτηματικών και άλλα"
     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_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"
+    ga_universal_auto_link_domains: "Ενεργοποίησε τα Google Universal Analytics (analytics.js) cross-domain tracking. Στα εξερχόμενα links προς αυτά τα domains θα προστεθεί αυτόματα το client id. Δες τον οδηγό Google's Cross-Domain Tracking."
     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: "Αποφάσισε ποια αντικείμενα θα εμφανίζονται στην πλοήγηση της αρχικής σελίδας, και με ποια σειρά. Παράδειγμα τελευταία/νέα/μη αναγνωσμένα/κατηγορίες/κορυφαία/αναγνωσμένα/δημοσιευμένα/σελιδοδείκτες"
+    blacklist_ip_blocks: "Μια λίστα από private IP blocks η οποία ποτέ δεν θα ανιχνεύεται από το Discourse"
+    whitelist_internal_hosts: "Μια λίστα από internal hosts την οποία το discourse μπορεί να ανιχνεύει με ασφάλεια για oneboxing και άλλους λόγους"
+    allowed_iframes: "Μία λίστα από iframe src domain prefixes τα οποία το discourse μπορεί με ασφάλεια να επιτρέπει στις αναρτήσεις."
+    top_menu: "Καθόρισε ποια αντικείμενα θα εμφανίζονται στην πλοήγηση της αρχικής σελίδας και με ποια σειρά. Παράδειγμα τελευταία/νέα/μη αναγνωσμένα/κατηγορίες/κορυφαία/αναγνωσμένα/δημοσιευμένα/σελιδοδείκτες"
     post_menu: "Αποφάσισε ποια αντικείμενα θα εμφανίζονται στο μενού των δημοσιεύσεων, και με ποια σειρά. Παράδειγμα μου αρέσει/επεξεργασία/επισήμανση/διαγραφή/κοινοποίηση/σελιδοδείκτης/απάντηση"
-    post_menu_hidden_items: "Τα στοιχεία καταλόγου να κρυφτούν από προεπιλογή στον αναρτημένο κατάλογο εκτός αν επιλεγεί μια ελλειπτική επέκταση. "
-    share_links: "Εντόπισε πια αντικείμενα εμφανίζονται στο κοινό διάλογο και σε πια σειρά"
-    track_external_right_clicks: "Παρακολουθείστε εξωτερικούς συνδέσμους οι οποίοι έχουν πατηθεί με αριστερό κλικ (πχ: άνοιγμα νέας καρτέλας) και είναι απενεργοποιημένες αυτόματα διότι επανεγγράφει URLs "
-    site_contact_username: "Ένα έγκυρο όνομα χρήστη για τα μέλη του προσωπικού από το οποίο θα στέλνονται όλα τα αυτοματοποιημένα μηνύματα. Αν αφεθεί κενό, θα χρησιμοποιείται ο προκαθορισμένος λογαριασμός συστήματος. "
+    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: "Εμφάνιση email στο προφίλ του μέλους (ορατό μόνο σε αυτούς και το προσωπικό)"
+    prioritize_username_in_ux: "Δίξε το όνομα χρήστη πρώτα στη σελίδα του χρήστη, την κάρτα χρήστη και στις δημοσιεύσεις (όταν είναι ανενεργό, φαίνεται πρώτα το όνομα)"
+    email_token_valid_hours: "Τα tokens ανάκτησης κωδικού / ενεργοποίησης λογαριασμού παραμένουν έγκυρα για (ν) ώρες."
+    enable_badges: "Ενεργοποίηση συστήματος παρασήμων"
+    enable_whispers: "Επιτρέπεται στο προσωπικό η ιδιωτική επικοινωνία μεταξύ νημάτων"
+    allow_index_in_robots_txt: "Καθόρισε στο robots.txt ότι για αυτή την ιστοσελίδα επιτρέπεται να δημιουργείται κατάλογος περιεχομένων από τις μηχανές αναζήτησης."
+    email_domains_blacklist: "Μία λίστα με διευθύνσεις email τις οποίες οι χρήστες δεν μπορούν να χρησιμοποιήσουν για να δημιουργήσουν λογαριασμό. Πχ: mailinator.com|trashmail.net"
+    email_domains_whitelist: "Μία λίστα με διευθύνσεις email τις οποίες οι χρήστες ΘΑ ΠΡΕΠΕΙ να χρησιμοποιήσουν για να δημιουργήσουν λογαριασμό. ΠΡΟΣΟΧΗ: οι χρήστες  με διευθύνσεις email οι οποίες δεν βρίσκονται σε αυτή τη λίστα δεν θα μπορούν να δημιουργήσουν λογαριασμό."
+    hide_email_address_taken: "Μην ενημερώνεις του χρήστες ότι υπάρχει λογαριασμός χρήστη με αυτήν την διεύθυνση email κατά την εγγραφή και στην φόρμα επαναφοράς κωδικού."
     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: "Αποστολή email στην contact_email διεύθυνση όταν μια νέα έκδοση του Discourse είναι διαθέσιμη."
     invite_expiry_days: "Για πόσο καιρό οι κύριες προσκλήσεις ισχύουν, σε μέρες "
     invite_passthrough_hours: "Για πόσο καιρό ο χρήστης μπορεί να χρησιμοποιήσει ένα ήδη εξαργυρωμένο κλειδί πρόσκλησης για να συνδεθεί, σε ώρες"
+    invite_only: "Οι ανοιχτές εγγραφές είναι απενεργοποιημένες, όλα τα νέα μέλη θα πρέπει να προσκληθούν από το προσωπικό."
     login_required: "Απαιτήστε την επικύρωση για να διαβάσετε το περιεχόμενο σε αυτήν την ιστοσελίδα,  απαγορεύσετε την ανώνυμη πρόσβαση."
-    min_username_length: "Ελάχιστο μέγεθος όνομα χρήστη σε χαρακτήρες. ΠΡΟΣΟΧΗ: εάν ο όποιος δήποτε από τους χρήστες που είδη υπάρχουν ή από της ομάδες έχουν ονόματα πιο μικρά από αυτό, η ιστοσελίδα σου θα διακοπεί!"
-    max_username_length: "Μέγιστο μέγεθος όνομα χρήστη με χαρακτήρες. ΠΡΟΣΟΧΗ:\nαν υπάρχοντες χρήστες ή ομάδες έχουν ονόματα περισσότερο από αυτό, η ιστοσελίδα σας θα παραβιαστεί!"
+    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: "Ενεργοποίηση καθολικής σύνδεσης μέσω ενός εξωτερικού συνδέσμου (ΠΡΟΕΙΔΟΠΟΙΗΣΗ: ΟΙ ΔΙΕΥΘΥΝΣΕΙΣ ΗΛΕΚΤΡΟΝΙΚΟΥ ΤΑΧΥΔΡΟΜΕΙΟΥ ΤΩΝ ΧΡΗΣΤΩΝ ΘΑ ΠΡΕΠΕΙ ΝΑ ΕΠΙΚΥΡΩΘΟΥΝ ΑΠΟ ΤΟΝ ΕΞΩΤΕΡΙΚΟ ΣΥΝΔΕΣΜΟ!)"
-    verbose_sso_logging: "SSO λεπτομερούς καταγραφής διαγνωστικών σχετίζονται με /logs"
+    enable_sso: "Ενεργοποίηση καθολικής σύνδεσης μέσω ενός εξωτερικού συνδέσμου (ΠΡΟΕΙΔΟΠΟΙΗΣΗ: ΟΙ ΔΙΕΥΘΥΝΣΕΙΣ EMAiL ΤΩΝ ΧΡΗΣΤΩΝ ΘΑ ΠΡΕΠΕΙ ΝΑ ΕΠΙΚΥΡΩΘΟΥΝ ΑΠΟ ΤΟΝ ΕΞΩΤΕΡΙΚΟ ΣΥΝΔΕΣΜΟ!)"
+    verbose_sso_logging: "Κατέγραψε αναλυτικά διαγνωστικά σχετικά με SSO στο /logs"
     enable_sso_provider: "Εφαρμογή πρωτοκόλλου παροχέα Discourse SSO στο τελικό σημείο του /session/sso_provider, απαιτεί να τεθει το sso_secret."
-    sso_url: "H διεύθυνση URL της ενιαίας σύνδεσης στο τέλος ( πρέπει να συμπεριλαμβάνει http:// or https://)"
+    sso_url: "URL του single sign on endpoint (πρέπει να περιέχει http:// or https://)"
     sso_secret: "Η μυστική συμβολοσειρά που χρησιμοποιείται για να πιστοποιήσει κρυπτογραφικά πληροφορίες SSO, σιγουρευτείτε οτι έχει 10 χαρακτήρες ή περισσότερους."
-    sso_overrides_bio: "Παρακάμπτει την βιογραφία του χρήστη στο προφίλ του χρήστη και τον αποτρέπει απ'το να την αλλάξει. "
-    sso_overrides_email: "Παράκαμψη τοπικής διεύθυνσης ηλεκτρονικού ταχυδρομείου με τη διεύθυνση ηλεκτρονικού ταχυδρομείου από τον εξωτερικό ιστότοπο με φορτίο SSO σε κάθε σύνδεση, και αποτροπή τοπικών αλλαγών. (ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μπορεί να προκληθούν ασυμφωνίες λόγω της ομαλοποίησης των τοπικών διευθύνσεων ηλεκτρονικού ταχυδρομείου)"
+    sso_overrides_bio: "Παρακάμπτει την βιογραφία του χρήστη στο προφίλ του χρήστη και τον αποτρέπει να την αλλάξει. "
+    sso_overrides_email: "Παράκαμψη τοπικής διεύθυνσης email με τη διεύθυνση email από τον εξωτερικό ιστότοπο με φορτίο SSO σε κάθε σύνδεση, και αποτροπή τοπικών αλλαγών. (ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μπορεί να προκληθούν ασυμφωνίες λόγω της ομαλοποίησης των τοπικών διευθύνσεων email)"
     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: "Μην αναχαιτίσεις το κυρίαρχο return_paths που παρέχεται από το SSO (από προεπιλογή η διαδρομή γυρισμόυ πρέπει να είναι στην τρεχούμενη ιστοσελίδα)"
-    enable_local_logins: "Ενεργοποίηση τοπικών λογαριασμών σύνδεσης με βάση το όνομα χρήστη και τον κωδικό πρόσβασης. (Σημείωση: αυτό πρέπει να είναι ενεργοποιημένο για καλέσματα στην εργασία)"
-    allow_new_registrations: "Επιτρέψτε τις νέες εγγραφές χρηστών.Καταργήστε την επιλογή αυτή για να αποτρέψετε σε οποιονδήποτε  να δημιουργήσει ένα νέο λογαριασμό"
+    sso_allows_all_return_paths: "Do not restrict the domain for return_paths provided by SSO (by default return path must be on current site)"
+    enable_local_logins: "Ενεργοποίηση τοπικών λογαριασμών χρήστη με βάση το όνομα χρήστη και τον κωδικό πρόσβασης. (Σημείωση: αυτό πρέπει να είναι ενεργοποιημένο για να λειτουργούν οι προσκλήσεις)"
+    allow_new_registrations: "Επιτρέψτε τις νέες εγγραφές χρηστών. Απενεργοποιήστε την επιλογή αυτή για να αποτρέψετε σε οποιονδήποτε  να δημιουργήσει ένα νέο λογαριασμό"
     enable_signup_cta: "Δείξε μια ανακοίνωση στους ανώνυμους χρήστες που επιστρέφουν, η οποία να τους παροτρύνει να δημιουργήσουν λογαριασμό."
     enable_yahoo_logins: "Ενεργοποιήστε την επαλήθευση μέσω Yahoo"
-    enable_google_oauth2_logins: "Ενεργοποίησε την επαλήθευση μέσω Google Oauth2. Είναι μια μέθοδος επαλήθευσης που η Google υποστηρίζει προς το παρόν. Απαιτεί κλειδί και μυστικό."
-    google_oauth2_client_id: "Ταυτότητα πελάτη της εφαρμογής σας Google."
-    google_oauth2_client_secret: "Μυστικό πελάτη του λογαριασμού σας Google. "
-    enable_twitter_logins: "Επίτρεψε επαλήθευση μέσω Twitter, απαιτεί twitter_κλειδί_καταναλωτή και twitter_μυστικό_καταναλωτή"
-    twitter_consumer_key: "Κλειδί καταναλωτή για επαλήθευση μέσω Twitter, εγγεγραμμένο στο http://dev.twitter.com"
-    twitter_consumer_secret: "Μυστικό καταναλωτή για επαλήθευση μέσω Twitter, εγγεγραμμένο στο http://dev.twitter.com"
-    enable_instagram_logins: "Επίτρεψε επαλήθευση μέσω Instagram, απαιτεί Instagram_κλειδί_καταναλωτή και Instagram_μυστικό_καταναλωτή"
-    instagram_consumer_key: "Κλειδί καταναλωτή για επαλήθευση μέσω Instagram"
-    instagram_consumer_secret: "Μυστικό καταναλωτή για επαλήθευση μέσω Instagram"
-    enable_facebook_logins: "Επίτρεψε επαλήθευση μέσω Facebook, απαιτεί Facebook_ταυτότητα_εφαρμογής και Facebook_μυστικό_εφαρμογής"
-    facebook_app_id: "Ταυτότητα εφαρμογής για επαλήθευση μέσω Facebook, εγγεγραμμένο στο https://developers.facebook.com/apps"
-    facebook_app_secret: "Μυστικό εφαρμογής για επαλήθευση μέσω Facebook, εγγεγραμμένο στο https://developers.facebook.com/apps"
-    facebook_request_extra_profile_details: "Ζήτησε σχετικά με μένα, τοποθεσία και ιστοσελίδα του facebook. (απαιτείται έγκριση της αίτησης επαλήθευσής σου από το facebook)"
-    enable_github_logins: "Επίτρεψε επαλήθευση μέσω Github, απαιτεί Github_ταυτότητα_εφαρμογής και Github_μυστικό_εφαρμογής"
-    github_client_id: "Ταυτότητα καταναλωτή για επαλήθευση μέσω Github, εγγεγραμμένο στο https://github.com/settings/applications"
-    github_client_secret: "Μυστικό καταναλωτή για επαλήθευση μέσω Github, εγγεγραμμένο στο https://github.com/settings/applications"
+    enable_google_oauth2_logins: "Ενεργοποίησε την επαλήθευση μέσω Google Oauth2. Είναι η μέθοδος επαλήθευσης που η Google υποστηρίζει προς το παρόν. Απαιτεί κλειδί και μυστικό."
+    google_oauth2_client_id: "Client ID της Google εφαρμογής σας."
+    google_oauth2_client_secret: "Μυστικό πελάτη της Google εφαρμογής σας. "
+    enable_twitter_logins: "Ενεργοποίησε την επαλήθευση μέσω Twitter. Απαιτεί twitter_consumer_key και twitter_consumer_secret"
+    twitter_consumer_key: "Consumer key για επαλήθευση μέσω Twitter, εγγεγραμμένο στο http://dev.twitter.com"
+    twitter_consumer_secret: "Consumer secret για επαλήθευση μέσω Twitter, εγγεγραμμένο στο http://dev.twitter.com"
+    enable_instagram_logins: "Ενεργοποίησε την επαλήθευση μέσω Instagram, απαιτεί instagram_consumer_key και instagram_consumer_secret"
+    instagram_consumer_key: "Consumer key για επαλήθευση μέσω Instagram"
+    instagram_consumer_secret: "Consumer secret για επαλήθευση μέσω Instagram"
+    enable_facebook_logins: "Ενεργοποίησε την επαλήθευση μέσω Facebook, απαιτεί facebook_app_id και facebook_app_secret"
+    facebook_app_id: "App id για επαλήθευση μέσω Facebook, εγγεγραμμένο στο https://developers.facebook.com/apps"
+    facebook_app_secret: "App secret για επαλήθευση μέσω Facebook, εγγεγραμμένο στο https://developers.facebook.com/apps"
+    facebook_request_extra_profile_details: "Ζήτησε σχετικά με μένα, τοποθεσία και ιστοσελίδα από το facebook. (απαιτείται έγκριση της εφαρμογής σου από το facebook)"
+    enable_github_logins: "Ενεργοποίησε την επαλήθευση μέσω Github, απαιτεί github_client_id και github_client_secret"
+    github_client_id: "Client id για επαλήθευση μέσω Github, εγγεγραμμένο στο https://github.com/settings/applications"
+    github_client_secret: "Client secret για επαλήθευση μέσω Github, εγγεγραμμένο στο https://github.com/settings/applications"
     readonly_mode_during_backup: "Ενεργοποίηση της λειτουργίας \"μόνο-ανάγνωση\" κατά τη διάρκεια δημιουργίας αντίγραφου ασφαλείας"
-    allow_restore: "Επίτρεψε επαναφορά, η οποία μπορεί να αντικαταστήσει ΟΛΑ τα δεδομένα του ιστότοπου! Αφήστε σφάλμα εκτός αν σχεδιάζεις να επαναφέρεις αντίγραφο ασφαλείας"
-    maximum_backups: "Το μέγιστο ποσό αντιγράφω ασφαλείας για να διατηρηθούν στο δίσκο. Παλαιότερα αντίγραφα ασφαλείας διαγράφονται αυτόματα"
-    automatic_backups_enabled: "Τρέξε αυτόματα αντίγραφα ασφαλείας όπως ορίζεται στη συχνότητα αντιγράφων ασφαλείας"
+    allow_restore: "Επίτρεψε επαναφορά, η οποία μπορεί να αντικαταστήσει ΟΛΑ τα δεδομένα του ιστότοπου! Αφήστε απενεργοποιημένο, εκτός αν σχεδιάζετε να επαναφέρετε αντίγραφο ασφαλείας"
+    maximum_backups: "Το μέγιστο ποσό αντιγράφων ασφαλείας το οποία θα διατηρηθούν στο δίσκο. Παλαιότερα αντίγραφα ασφαλείας διαγράφονται αυτόματα"
+    automatic_backups_enabled: "Πάρε αυτόματα αντίγραφα ασφαλείας όπως ορίζεται στη συχνότητα αντιγράφων ασφαλείας"
     backup_frequency: "Πόσο συχνά δημιουργούμε αντίγραφο ασφαλείας ιστοτόπου, σε ημέρες."
-    enable_s3_backups: "Ανέβασε αντίγραφα αφαλείας στο S3 όταν ολοκληρωθεί. ΣΗΜΑΝΤΙΚΟ: απαιτεί έγκυρα S3 πιστοποιητικά στις Ρυθμίσεις αρχείων."
-    s3_backup_bucket: "Απομακρυσμένος κουβάς για αντίγραφα ασφαλείας. ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Βεβαιωθείτε οτι είναι απόρρητος κουβάς."
-    s3_disable_cleanup: "Απενεργοποιήστε την αφαίρεση αντιγράφων ασφαλείας από την S3 όταν αφαιρεθεί σε τοπικό επίπεδο."
-    backup_time_of_day: "Ώρα της ημέρας σε ζώνη UTC που το αντίγραφο ασφαλείας πρέπει να πραγματοποιηθεί."
-    backup_with_uploads: "Συμπεριέλαβε μεταφορτώσεις σε προγραμματισμένα αντίγραφα ασφαλείας. Απενεργοποιώντας το θα δημιουργηθούν αντίγραφα ασφαλείας μόνο για τη βάση δεδομένων."
-    active_user_rate_limit_secs: "Πόσο συχνά ενημερώνουμε το 'τελευταία_εθεάθη_σε' πεδίο, σε δευτερόλεπτα"
-    verbose_localization: "Εμφάνιζε εκτεταμένες συμβουλές εντοπισμού στην διεπαφή χρήστη. "
+    enable_s3_backups: "Ανέβασε τα αντίγραφα αφαλείας στο S3 όταν ολοκληρωθούν. ΣΗΜΑΝΤΙΚΟ: απαιτεί έγκυρα διαπιστευτήρια S3 καταχωρημένα στις ρυθμίσεις αρχείων."
+    s3_backup_bucket: "Απομακρυσμένος αποθηκευτικός χώρος για τα αντίγραφα ασφαλείας. ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Βεβαιωθείτε οτι ο χώρος είναι προσωπικός."
+    s3_disable_cleanup: "Απενεργοποιήστε την αφαίρεση των αντιγράφων ασφαλείας από το S3 όταν αφαιρεθούν τοπικά"
+    backup_time_of_day: "Ώρα σε ζώνη UTC που το αντίγραφο ασφαλείας πρέπει να πραγματοποιηθεί."
+    backup_with_uploads: "Συμπεριέλαβε τις μεταφορτώσεις στα αντίγραφα ασφαλείας. Απενεργοποιώντας το θα δημιουργηθούν αντίγραφα ασφαλείας μόνο για τη βάση δεδομένων."
+    active_user_rate_limit_secs: "Πόσο συχνά ενημερώνουμε το 'last_seen_at' πεδίο, σε δευτερόλεπτα"
+    verbose_localization: "Εμφάνιζε εκτεταμένες συμβουλές τοπικής προσαρμογής στην διεπαφή χρήστη. "
     previous_visit_timeout_hours: "Πόσο διαρκεί μια επίσκεψη προτού τη θεωρήσουμε \"προηγούμενη\" επίσκεψη, σε ώρες"
-    top_topics_formula_log_views_multiplier: "Ο πολλαπλασιαστής (n) της αξίας προβολών καταγραφής μπαίνει στην αρχή του νήματος της φόρμουλας: `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: "Ο πολλαπλασιαστής (n) της αξίας των πρώτων αναρτήσεων μπαίνει στην αρχή του νήματος της φόρμουλας: `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: "Ο πολλαπλασιαστής (n) της αξίας των λιγότερων likes ανα ανάρτηση μπαίνει στην αρχή του νήματος της φόρμουλας: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
-    rebake_old_posts_count: "Ο αριθμός των παλιών αναρτήσεων θα αναθεωρηθεί σε 15 λεπτά."
+    top_topics_formula_log_views_multiplier: "value of log views multiplier (n) in top topics formula: `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: "value of first post likes multiplier (n) in top topics formula: `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: "value of least likes per post multiplier (n) in top topics formula: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
+    rebake_old_posts_count: "Ο αριθμός των παλιών αναρτήσεων ο οποίος θα αναθεωρείται κάθε 15 λεπτά."
     rate_limit_create_topic: "Μετά τη δημιουργία νήματος, οι χρήστες πρέπει να περιμένουν (n) δευτερόλεπτα πριν τη δημιουργία άλλου νήματος."
-    rate_limit_create_post: "Μετά τη δημοσίευση, οι χρήστες πρέπει να περιμένουν (n) δευτερόλεπτα πριν τη δημιουργία άλλης δημοσίευσης."
+    rate_limit_create_post: "Μετά την ανάρτηση, οι χρήστες πρέπει να περιμένουν (n) δευτερόλεπτα πριν τη δημιουργία άλλης ανάρτησης."
     rate_limit_new_user_create_topic: "Μετά τη δημιουργία νήματος, οι νέοι χρήστες πρέπει να περιμένουν (n) δευτερόλεπτα πριν τη δημιουργία άλλου νήματος."
-    rate_limit_new_user_create_post: "Μετά τη δημοσίευση, οι νέοι χρήστες πρέπει να περιμένουν (n) δευτερόλεπτα πριν τη δημιουργία άλλης δημοσίευσης."
+    rate_limit_new_user_create_post: "Μετά την ανάρτηση, οι νέοι χρήστες πρέπει να περιμένουν (n) δευτερόλεπτα πριν τη δημιουργία άλλης ανάρτησης."
     max_likes_per_day: "Μέγιστος αριθμός \"Μου αρέσει\" ανά χρήστη ανά ημέρα."
-    max_flags_per_day: "Μέγιστος αριθμός σημάνσεων που κάνει ο κάθε χρήστης ανά ημέρα."
-    max_bookmarks_per_day: "Μέγιστος αριθμός σελιδοδεικτών την ημέρα ανά χρήστη."
-    max_edits_per_day: "Μέγιστος αριθμός επεξεργασιών που μπορεί να κάνει κάθε χρήστης σε μια ημέρα."
+    max_flags_per_day: "Μέγιστος αριθμός σημάνσεων ανά χρήστη ανά ημέρα."
+    max_bookmarks_per_day: "Μέγιστος αριθμός σελιδοδεικτών ανά χρήστη ανά ημέρα."
+    max_edits_per_day: "Μέγιστος αριθμός επεξεργασιών ανά χρήστη ανά ημέρα."
     max_topics_per_day: "Μέγιστος αριθμός νημάτων που μπορεί να δημιουργήσει ο χρήστης σε μια ημέρα."
     max_private_messages_per_day: "Μέγιστος αριθμός μηνυμάτων που μπορεί να δημιουργήσει ο χρήστης σε μια ημέρα."
     max_invites_per_day: "Μέγιστος αριθμός προσκλήσεων που μπορεί να στείλει ο χρήστης σε μια ημέρα."
@@ -1012,87 +1084,92 @@ el:
     max_logins_per_ip_per_minute: "Μέγιστος αριθμός επιτρεπόμενων συνδέσεων ανα διεύθυνση IP το λεπτό"
     alert_admins_if_errors_per_minute: "Πλήθος σφαλμάτων ανά λεπτό για την ενεργοποίηση χρειάζεται ειδοποίηση διαχειριστή. Η τιμή 0 απενεργοποιεί αυτήν τη δυνατότητα. Σημείωση: απαιτεί επανεκκίνηση."
     alert_admins_if_errors_per_hour: "Ο αριθμός σφαλμάτων που χρειάζονται προκειμένου να προκληθεί μία ειδοποίηση διαχειριστή. Αν ο αριθμός σφαλμάτων είναι 0, τότε αυτή η λειτουργία απενεργοποιείται. Σημείωση: απαιτεί επανεκκίνηση. "
-    categories_topics: "Αριθμός θεμάτων που παρουσιάζονται στη σελίδα του /κατηγορίες."
+    categories_topics: "Αριθμός νημάτων που εμφανίζονται στη σελίδα /categories"
     suggested_topics: "Αριθμός προτεινόμενων νημάτων που εμφανίζονται στο κάτω μέρος ενός νήματος."
-    limit_suggested_to_category: "Εμφάνιζε θέματα μόνο από την τρέχουσα κατηγορία στα προτεινόμενα θέματα."
-    suggested_topics_max_days_old: "Προτεινόμενα θέματα δεν πρέπει να υπερβαίνουν το n παλαιών ημερών"
-    clean_up_uploads: "Απομάκρυνση μόνων και μη καταχωρημένων φορτώσεων για αποτροπή παράνομων . ΠΡΟΕΙΔΟΠΟΙΗΣΗ: ίσως να θέλετε να δημιουργήσετε αντίγραφα ασφαλείας του καταλόγου /uploads σας πριν την ενεργοποίηση αυτής της ρύθμισης."
-    clean_orphan_uploads_grace_period_hours: "Η περίοδος χάριτος είναι (ώρες) πριν μία ανώνυμη ανάρτηση θα αφαιρείται"
-    purge_deleted_uploads_grace_period_days: "Η περίοδος χάριτος είναι (μέρες) πριν μία διεγραμένη ανάρτηση σβηστεί μόνημα."
-    purge_unactivated_users_grace_period_days: "Η περίοδος χάριτος είναι (μέρες) πριν ένας χρήστης ο οποίος δεν έχει δρατηριοποιήσει τον λογαρισμό του θα διαγράφεται."
-    enable_s3_uploads: "Τοποθέτηση φορτόσεων στον αποθηκευτικό χώρο Amazon S3. ΣΗΜΑΝΤΙΚΟ: Απαιτούνται έγκυρα διαπιστευτήρια S3 (και access key id και secret access key)."
-    s3_use_iam_profile: 'Χρησιμοποιήστε AWS EC2 ΙΑΜ ρόλο για να ανακτήσετε τα κλειδιά. ΣΗΜΕΙΩΣΗ: η ενεργοποίηση θα υπερισχύσει τις ρυθμίσεις "κλειδί s3 πρόσβαση id" και "s3 βασικό μυστικό πρόσβασης".'
-    s3_upload_bucket: "Το όνομα κουβά Amazon S3 οπου θα μεταφορτοθούν τα αρχεία . ΠΡΟΣΟΧΗ: πρέπει να είναι πεζά, χωρίς περίοδοι και χωρίς υπογράμμισεις."
-    s3_access_key_id: "Η ταυτότητα του κλειδιού πρόσβασης του άμαζον Σ3 θα χρεισημοποιηθή για το ανέβασμα φωτογραφιών"
+    limit_suggested_to_category: "Εμφάνιζε νήματα μόνο από την τρέχουσα κατηγορία στα προτεινόμενα νήματα."
+    suggested_topics_max_days_old: "Τα προτεινόμενα νήματα δεν πρέπει να είναι πάνω από n ημερών"
+    clean_up_uploads: "Απομάκρυνση ορφανών και μη χρησιμοποιημένων μεταφορτώσεων για αποτροπή παράνομης φιλοξενίας αρχείων. ΠΡΟΕΙΔΟΠΟΙΗΣΗ: ίσως να θέλετε να δημιουργήσετε αντίγραφα ασφαλείας του καταλόγου /uploads σας πριν την ενεργοποίηση αυτής της ρύθμισης."
+    clean_orphan_uploads_grace_period_hours: "Η περίοδος χάριτος (σε ώρες) πριν μία ορφανή μεταφόρτωση αφαιρεθεί."
+    purge_deleted_uploads_grace_period_days: "Η περίοδος χάριτος (σε μέρες) πριν μία διεγραμένη μεταφόρτωση αφαιρεθεί μόνιμα."
+    purge_unactivated_users_grace_period_days: "Περίοδος χάριτος (σε ημέρες) πριν διαγραφεί ο λογαριασμός ενός χρήστη ο οποίος δεν ενεργοποιήθηκε. Ρυθμίστε στο 0 για να μην διαγράφονται ποτέ οι μη ενεργοποιημένοι χρήστες."
+    enable_s3_uploads: "Τοποθέτηση μεταφορτώσεων σε αποθηκευτικό χώρο Amazon S3. ΣΗΜΑΝΤΙΚΟ: Απαιτούνται έγκυρα διαπιστευτήρια S3 (access key id και secret access key)."
+    s3_use_iam_profile: 'Χρησιμοποιήστε AWS EC2 ΙΑΜ ρόλο για να ανακτήσετε τα κλειδιά. ΣΗΜΕΙΩΣΗ: η ενεργοποίηση θα αναιρέσει τις ρυθμίσεις "s3 access key id" και "s3 secret access key".'
+    s3_upload_bucket: "Το όνομα κουβά Amazon S3 οπου θα μεταφορτωθούν τα αρχεία . ΠΡΟΣΟΧΗ: πρέπει να είναι πεζά, χωρίς τελείες και χωρίς κάτω παύλες."
+    s3_access_key_id: "Η ταυτότητα του κλειδιού πρόσβασης του Amazon S3 η οποία θα χρεισημοποιηθεί για το ανέβασμα φωτογραφιών."
     s3_secret_access_key: "Το μυστικό κλειδί πρόσβασης στο Amazon S3 που θα χρησιμοποιηθεί για να ανεβάσετε εικόνες."
     s3_region: "Το όνομα περιοχής Amazon S3 που θα χρησιμοποιηθεί για να ανεβάσετε εικόνες."
     s3_cdn_url: "Η διεύθυνση CDN που θα χρησιμοποιήθει για όλα τα στοιχεία s3 (για παράδειγμα: https://cdn.somewhere.com). ΠΡΟΣΟΧΗ: μετά την αλλαγή αυτής της ρύθμισης θα πρέπει να γίνει rebake σε όλες τις υπάρχουσες αναρτήσεις."
-    avatar_sizes: "Κατάλογος που δημιουργείται αυτόματα άβαταρ,μεγέθη."
-    external_system_avatars_enabled: "Χρησιμοποιήσε εξωτερικό συστήμα avatars υπηρεσίας."
-    external_system_avatars_url: "URL του εξωτερικού συστήματος υπηρεσίας avatars. Επιτρεπτές αντικαταστάσεις είναι {username} {first_letter} {color} {size}"
+    avatar_sizes: "Κατάλογος από αυτόματα δημιουργημένα μεγέθη άβαταρ."
+    external_system_avatars_enabled: "Χρησιμοποιήσε εξωτερική υπηρεσία για avatars."
+    external_system_avatars_url: "URL της εξωτερικής υπηρεσίας avatars. Επιτρεπτές αντικαταστάσεις είναι {username} {first_letter} {color} {size}"
     default_opengraph_image_url: "Η διεύθυνση URL της προεπιλεγμένης εικόνας opengraph."
-    twitter_summary_large_image_url: "Η διεύθυνση URL της συνοπτικής κάρτας εικόνας της προεπιλογής Twitter (πρέπει να είναι τουλάχιστον 280px σε πλάτος, και σε τουλάχιστον 150px σε ύψος)."
-    allow_all_attachments_for_group_messages: "Επιτρέποντε όλα τα συνημμένα ηλεκτρονικά μηνύματα  σε ομαδικά μηνύματα"
-    enable_flash_video_onebox: "Ενεργοποίηση ενσωμάτωσης των SWF και flv (Adobe Flash) συνδέσμων σε oneboxes. ΠΡΟΣΟΧΗ: μπορεί να εισαγάγει κινδύνους για την ασφάλεια."
+    twitter_summary_large_image_url: "Η διεύθυνση URL της εικόνας της προκαθορισμένης συνοπτικής κάρτας του Twitter (θα πρέπει να είναι τουλάχιστον 280px σε πλάτος, και τουλάχιστον 150px σε ύψος)."
+    allow_all_attachments_for_group_messages: "Επιτρέπονται όλοι οι τύποι συνημμένων αρχείων σε ομαδικά μηνύματα."
+    png_to_jpg_quality: "Ποιότητα των αποθηκευμένων αρχείων JPG (1 χαμηλή ποιότητα, 99 μέγιστη ποιότητα, 100 για απενεργοποίηση)."
+    allow_staff_to_upload_any_file_in_pm: "Επίτρεψε στο προσωπικό να ανεβάζει οποιοδήποτε τύπο αρχείου στα πμ"
+    strip_image_metadata: "Strip image metadata."
+    enable_flash_video_onebox: "Ενεργοποίηση της ενσωμάτωσης συνδέσμων swf και flv (Adobe Flash) σε oneboxes. ΠΡΟΣΟΧΗ: μπορεί να εισαγάγει κινδύνους για την ασφάλεια."
     default_invitee_trust_level: "Προεπιλεγμένο επίπεδο εμπιστοσύνης (0-4) για τους χρήστες που έχουν προσκληθεί."
     default_trust_level: "Προεπιλεγμένο επίπεδο εμπιστοσύνης (0-4) για όλους τους νέους χρήστες. Προειδοποίηση! Αλλάζοντάς το θα εκτεθείς σε σοβαρό κίνδυνο για ανεπιθύμητα μηνύματα."
-    tl1_requires_topics_entered: "Πόσα νήματα πρέπει να εισάγει ένας νέος χρήστης προτού προωθηθεί στο επίπεδο εμπιστοσύνης 1."
-    tl1_requires_read_posts: "Πόσες δημοσιεύσεις πρέπει να διαβάσει ένας νέος χρήστης προτού προωθηθεί στο επίπεδο εμπιστοσύνης 1."
-    tl1_requires_time_spent_mins: "Για πόσα λεπτά πρέπει να διαβάσει δημοσιεύσεις ένας νέος χρήστης προτού προωθηθεί στο επίπεδο εμπιστοσύνης 1."
-    tl2_requires_topics_entered: "Πόσα νήματα πρέπει να εισάγει ένας χρήστης προτού προωθηθεί στο επίπεδο εμπιστοσύνης 2."
-    tl2_requires_read_posts: "Πόσες δημοσιεύσεις πρέπει να διαβάσει ένας χρήστης προτού προωθηθεί στο επίπεδο εμπιστοσύνης 2."
-    tl2_requires_time_spent_mins: "Για πόσα λεπτά πρέπει να διαβάζει ένας χρήστης δημοσιεύσεις προτού προωθηθεί στο επίπεδο εμπιστοσύνης 2."
-    tl2_requires_days_visited: "Πόσες μέρες πρέπει ο χρήστης να επισκεφτεί την ιστοσελίδα προτού προωθηθεί στο επίπεδο εμπιστοσύνης 2."
-    tl2_requires_likes_received: "Πόσα \"Μου αρέσει\" πρέπει να λάβει ένας χρήστης για να προωθηθεί στο επίπεδο εμπιστοσύνης 2."
-    tl2_requires_likes_given: "Πόσα \"Μου αρέσει\" πρέπει να δώσει ένας χρήστης για να προωθηθεί στο επίπεδο εμπιστοσύνης 2."
-    tl2_requires_topic_reply_count: "Σε πόσα νήματα πρέπει να απαντήσει ένας χρήστης προτού προωθηθεί στο επίπεδο εμπιστοσύνης 2."
-    tl3_time_period: "Χρόνος περιόδου για απαιτήςεις του επιπέδου εμπιστοςύνης 3(σε ημέρες)"
-    tl3_requires_days_visited: "Ελάχιστος αριθμός ημερών που ο χρήστης πρέπει να έχει επισκεφθεί την ιστοσελίδα τις τελευταίες ημέρες (tl3 time period) ώστε να δικαιούται να προωθηθεί στο επίπεδο εμπιστοσύνης 3 .Ορίστε υψηλότερη από tl3 χρονικό διάστημα για να απενεργοποιήσετε προσφορές από το tl3. (0 or higher) "
-    tl3_requires_topics_replied_to: "Ο ελάχιστος αριθμός θεμάτων στα οποία πρέπει να έχει απαντήσει ένας χρήστης τις τελευταίες (χρονική περίοδος εε3) μέρες, ώστε να δικαιούται να προωθηθεί στο επίπεδο εμπιστοσύνης 3. (0 ή παραπάνω) "
-    tl3_requires_topics_viewed: "Το ποσοστό των θεμάτων που έχουν δημιουργηθεί τις τελευταίες (χρονική περίοδος εε3) μέρες που πρέπει να έχει δει ένας χρήστης για να δικαιούται να προωθηθεί στο επίπεδο εμπιστοσύνης 3. (0 έως 100) "
-    tl3_requires_topics_viewed_cap: "Ο μέγιστος απαιτούμενος αριθμός θεμάτων που εμφανίστηκαν τις τελευταίες ημέρες (tl3 time period)."
-    tl3_requires_posts_read: "Το ποσοστό των αναρτήσεων που έχουν δημιουργηθεί τις τελευταίες (tl3 time period)  μέρες που πρέπει να έχει δει ένας χρήστης για να δικαιούται να προωθηθεί στο επίπεδο εμπιστοσύνης 3. (0 έως 100)"
-    tl3_requires_posts_read_cap: "Ο μέγιστος απαιτούμενος αριθμός αναρτήσεων που πρέπει να έχουν διαβαστεί τις τελευταίες (χρονική περίοδος εε3) μέρες. "
-    tl3_requires_topics_viewed_all_time: "Ο ελάχιστος συνολικός αριθμός νημάτων που ένας χρήστης πρέπει να έχει δει για να δικαιούται να προωθηθεί στο επίπεδο εμπιστοσύνης 3. "
-    tl3_requires_posts_read_all_time: "Ο ελάχιστος συνολικός αριθμός αναρτήσεων που πρέπει να έχει διαβάσει ένας χρήστης για να δικαιούται να προωθηθεί στο επίπεδο εμπιστοσύνης 3. "
-    tl3_requires_max_flagged: "Ο χρήστης δεν θα πρέπει να είχε περισσότερες από x αναρτήσεις επισημασμένες από x διαφορετικούς χρήστες τις τελευταίες (tl3 time period) ημέρες για να πληρe;i τις προϋποθέσεις για την προώθηση σε επίπεδο εμπιστοσύνης 3, όπου x είναι η αξία αυτής της ρύθμισης. (0 ή μεγαλύτερο)"
+    tl1_requires_topics_entered: "Πόσα νήματα πρέπει να επισκεφτεί ένας νέος χρήστης προτού προαχθεί στο επίπεδο εμπιστοσύνης 1."
+    tl1_requires_read_posts: "Πόσες αναρτήσεις πρέπει να διαβάσει ένας νέος χρήστης προτού προαχθεί στο επίπεδο εμπιστοσύνης 1."
+    tl1_requires_time_spent_mins: "Για πόσα λεπτά πρέπει να διαβάσει αναρτήσεις ένας νέος χρήστης προτού προαχθεί στο επίπεδο εμπιστοσύνης 1."
+    tl2_requires_topics_entered: "Πόσα νήματα πρέπει να επισκεφτεί ένας χρήστης προτού προαχθεί στο επίπεδο εμπιστοσύνης 2."
+    tl2_requires_read_posts: "Πόσες αναρτήσεις πρέπει να διαβάσει ένας χρήστης προτού προαχθεί στο επίπεδο εμπιστοσύνης 2."
+    tl2_requires_time_spent_mins: "Για πόσα λεπτά πρέπει να διαβάζει ένας χρήστης αναρτήσεις προτού προαχθεί στο επίπεδο εμπιστοσύνης 2."
+    tl2_requires_days_visited: "Πόσες μέρες πρέπει ο χρήστης να επισκεφτεί την ιστοσελίδα προτού προαχθεί στο επίπεδο εμπιστοσύνης 2."
+    tl2_requires_likes_received: "Πόσα \"Μου αρέσει\" πρέπει να λάβει ένας χρήστης προτού προαχθεί στο επίπεδο εμπιστοσύνης 2."
+    tl2_requires_likes_given: "Πόσα \"Μου αρέσει\" πρέπει να δώσει ένας χρήστης προτού προαχθεί στο επίπεδο εμπιστοσύνης 2."
+    tl2_requires_topic_reply_count: "Σε πόσα νήματα πρέπει να απαντήσει ένας χρήστης προτού προαχθεί στο επίπεδο εμπιστοσύνης 2."
+    tl3_time_period: "Χρονική περιόδος για τις απαιτήσεις του επιπέδου εμπιστοσύνης 3 (σε ημέρες)"
+    tl3_requires_days_visited: "Ελάχιστος αριθμός ημερών που ο χρήστης πρέπει να έχει επισκεφθεί την ιστοσελίδα τις τελευταίες (tl3 time period) ημέρες, ώστε να δικαιούται να προαχθεί στο επίπεδο εμπιστοσύνης 3. Ορίστε υψηλότερο από tl3 time period για να απενεργοποιήσετε προαγωγές στο tl3. (0 or higher) "
+    tl3_requires_topics_replied_to: "Ο ελάχιστος αριθμός θεμάτων στα οποία πρέπει να έχει απαντήσει ένας χρήστης τις τελευταίες (tl3 time period) ημέρες, ώστε να δικαιούται να προαχθεί στο επίπεδο εμπιστοσύνης 3. (0 ή παραπάνω) "
+    tl3_requires_topics_viewed: "Το ποσοστό των θεμάτων που έχουν δημιουργηθεί τις τελευταίες (tl3 time period) ημέρες που πρέπει να έχει δει ένας χρήστης για να δικαιούται να προαχθεί στο επίπεδο εμπιστοσύνης 3. (0 έως 100) "
+    tl3_requires_topics_viewed_cap: "Ο μέγιστος απαιτούμενος αριθμός νημάτων που προβλήθηκαν τις τελευταίες (tl3 time period) ημέρες."
+    tl3_requires_posts_read: "Το ποσοστό των αναρτήσεων που έχουν δημιουργηθεί τις τελευταίες (tl3 time period) ημέρες που πρέπει να έχει δει ένας χρήστης για να δικαιούται να προαχθεί στο επίπεδο εμπιστοσύνης 3. (0 έως 100)"
+    tl3_requires_posts_read_cap: "Ο μέγιστος απαιτούμενος αριθμός αναρτήσεων που πρέπει να έχουν διαβαστεί τις τελευταίες (tl3 time period) μέρες. "
+    tl3_requires_topics_viewed_all_time: "Ο ελάχιστος συνολικός αριθμός νημάτων που ένας χρήστης πρέπει να έχει δει για να δικαιούται να προαχθεί στο επίπεδο εμπιστοσύνης 3. "
+    tl3_requires_posts_read_all_time: "Ο ελάχιστος συνολικός αριθμός αναρτήσεων που πρέπει να έχει διαβάσει ένας χρήστης για να δικαιούται να προαχθεί στο επίπεδο εμπιστοσύνης 3. "
+    tl3_requires_max_flagged: "Ο χρήστης δεν θα πρέπει να είχε περισσότερες από x αναρτήσεις επισημασμένες από x διαφορετικούς χρήστες τις τελευταίες (tl3 time period) ημέρες για να πληροί τις προϋποθέσεις για να προαχθεί σε επίπεδο εμπιστοσύνης 3, όπου x είναι η αξία αυτής της ρύθμισης. (0 ή μεγαλύτερο)"
     tl3_promotion_min_duration: "Ο ελάχιστος αριθμός ημερών για τις οποίες διαρκεί μια προώθηση στο επίπεδο εμπιστοσύνης 3, προτού ένας χρήστης μπορεί να υποβιβαστεί στο επίπεδο εμπιστοσύνης 2. "
-    tl3_requires_likes_given: "Ο ελάχιστος αριθμός των 'μου αρέσει' που πρέπει να έχουν δωθεί τις τελευταίες (χρονική περίοδος εε3) ημέρες, ώστε να πληρούνται οι προυποθέσεις για προώθηση στο επίπεδο εμπιστοσύνης 3.  "
-    tl3_requires_likes_received: "Ο ελάχιστος αριθμός των 'μου αρέσει' που πρέπει να έχουν ληφθεί τις τελευταίες (χρονική περίοδος εε3) ημέρες, ώστε να πληρούνται οι προυποθέσεις για προώθηση στο επίπεδο εμπιστοσύνης 3.  "
-    tl3_links_no_follow: "Μην αφαιρείτε rel = nofollow από συνδέσεις που δημοσιεύτηκαν από επίπεδο   εμπιστοσύνης 3 χρήστες."
+    tl3_requires_likes_given: "Ο ελάχιστος αριθμός των 'μου αρέσει' που πρέπει να έχουν δωθεί τις τελευταίες (tl3 time period) ημέρες, ώστε να πληρούνται οι προυποθέσεις για να προαχθεί στο επίπεδο εμπιστοσύνης 3.  "
+    tl3_requires_likes_received: "Ο ελάχιστος αριθμός των 'μου αρέσει' που πρέπει να έχουν ληφθεί τις τελευταίες (tl3 time period) ημέρες, ώστε να πληρούνται οι προυποθέσεις για να προαχθεί στο επίπεδο εμπιστοσύνης 3.  "
+    tl3_links_no_follow: "Μην αφαιρείτε rel=nofollow από συνδέσμους που αναρτήθηκαν από χρήστες επιπέδου εμπιστοσύνης 3."
     min_trust_to_create_topic: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για να δημιουργήσεις ένα νέο νήμα."
-    min_trust_to_edit_wiki_post: "Ελάχιστο επίπεδο εμπιστοσύνης απαιτείται για να επεξεργαστεί μία δημοσίευση που έχει σημειωθεί ως wiki."
-    min_trust_to_edit_post: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για να επεξεργαστείς δημοσιεύσεις."
-    min_trust_to_allow_self_wiki: "Ελάχιστο επίπεδο εμπιστοσύνης απαιτείται για να μετατραπεί μία δημοσίευση του ίδιου του χρήστη σε wiki."
+    min_trust_to_edit_wiki_post: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για να επεξεργαστείς μία ανάρτηση που έχει σημειωθεί ως wiki."
+    min_trust_to_edit_post: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για να επεξεργαστείς αναρτήσεις."
+    min_trust_to_allow_self_wiki: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για να μετατραπεί μία ανάρτηση του ίδιου του χρήστη σε wiki."
     min_trust_to_send_messages: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για να δημιουργήσεις νέα προσωπικά μηνύματα."
-    newuser_max_links: "Πόσους συνδέσμους μπορεί να προσθέσει ένας χρήστης σε μια δημοσίευση."
-    newuser_max_images: "Πόσες εικόνες μπορεί να προσθέσει ένας χρήστης σε μια δημοσίευση."
-    newuser_max_attachments: "Πόσα συνημμένα μπορεί να προσθέσει ένας χρήστης σε μια δημοσίευση."
-    newuser_max_mentions_per_post: "Μέγιστος αριθμός @ονομαστικές ειδοποιήσεις που ένας νέος χρήστης μπορεί να χρησιμοποιήσει σε μια δημοσίευση."
+    min_trust_to_send_email_messages: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για την αποστολή νέου προσωπικού μηνύματος μέσω email (σε σταδιακούς χρήστες)."
+    newuser_max_links: "Πόσους συνδέσμους μπορεί να προσθέσει ένας χρήστης σε μια ανάρτηση."
+    newuser_max_images: "Πόσες εικόνες μπορεί να προσθέσει ένας χρήστης σε μια ανάρτηση."
+    newuser_max_attachments: "Πόσα συνημμένα μπορεί να προσθέσει ένας χρήστης σε μια ανάρτηση."
+    newuser_max_mentions_per_post: "Μέγιστος αριθμός @ονομαστικές ειδοποιήσεις που ένας νέος χρήστης μπορεί να χρησιμοποιήσει σε μια ανάρτηση."
     newuser_max_replies_per_topic: "Μέγιστος αριθμός απαντήσεων που ένας νέος χρήστης μπορεί να δώσει σε ένα συγκεκριμένο νήμα έως ότου κάποιος να του απαντήσει. "
-    max_mentions_per_post: "Μέγιστος αριθμός @ονομαστικές ειδοποιήσεις που οποιοσδήποτε μπορεί να χρησιμοποιήσει σε μια δημοσίευση."
+    max_mentions_per_post: "Μέγιστος αριθμός @ονομαστικές ειδοποιήσεις που οποιοσδήποτε μπορεί να χρησιμοποιήσει σε μια ανάρτηση."
     max_users_notified_per_group_mention: "Μέγιστος αριθμός χρηστών που ίσως λάβουν μια ειδοποίηση εάν μια ομάδα αναφέρεται (εάν φτάσουν το κατώφλι, δεν θα σταλούν ειδοποιήσεις)"
-    create_thumbnails: "Δημιούργησε εικόνες με αντίχειρες και φωτεινό κουτί που είναι πολύ μεγάλες για να χωρέσουν σε μια δημοσίευση."
-    email_time_window_mins: "Αναμονή (χ) λεπτών πριν την αποστολή οποιουδήποτε ειδοποιητικού ηλεκτρονικού μηνύματος, έτσι ώστε να δωθεί στους χρήστες η ευκαιρία να επεξεργασθούν και να οριστικοποιήσουν τις αναρτήσεις τους. "
-    private_email_time_window_seconds: "Αναμονή (χ) δευτερολέπτων πριν την αποστολή οποιουδήποτε προσωπικού ειδοποιητικού ηλεκτρονικού μηνύματος, έτσι ώστε να δωθεί στους χρήστες η ευκαιρία να επεξεργασθούν και να οριστικοποιήσουν τα μηνύματα τους. "
-    email_posts_context: "Πόσες προηγούμενες απαντήσεις να συμπεριλαμβάνονται ως συγκείμενο στα ειδοποιητικά μηνύματα. "
+    create_thumbnails: "Δημιούργησε μικρογραφίες και lightbox για εικόνες που είναι πολύ μεγάλες για να χωρέσουν σε μια ανάρτηση."
+    email_time_window_mins: "Αναμονή (χ) λεπτών πριν την αποστολή οποιουδήποτε ειδοποιητικού email, έτσι ώστε να δωθεί στους χρήστες η ευκαιρία να επεξεργασθούν και να οριστικοποιήσουν τις αναρτήσεις τους. "
+    private_email_time_window_seconds: "Αναμονή (χ) δευτερολέπτων πριν την αποστολή οποιουδήποτε προσωπικού ειδοποιητικού email, έτσι ώστε να δωθεί στους χρήστες η ευκαιρία να επεξεργασθούν και να οριστικοποιήσουν τα μηνύματα τους. "
+    email_posts_context: "Πόσες προηγούμενες απαντήσεις να συμπεριλαμβάνονται ως περιεχόμενο στα ειδοποιητικά μηνύματα. "
     flush_timings_secs: "Πόσο συχνά θα καθαρίσουμε τα δεδομένα χρονισμού στο σέρβερ, σε δευτερόλεπτα."
     title_max_word_length: "Το μέγιστο επιτρεπόμενο όριο λέξεων, σε χαρακτήρες, σε ένα τίτλο νήματος."
-    title_min_entropy: "Η ελάχιστη εντροπία (μοναδικοί χαρακτήρες, μη-Αγγλικά μετράνε για τους περισσότερους) που απαιτείται για ένα τίτλο του θέματος."
+    title_min_entropy: "Η ελάχιστη εντροπία (μοναδικοί χαρακτήρες, μη-Αγγλικά μετράνε για περισσότερα) που απαιτείται για ένα τίτλο νήματος."
     body_min_entropy: "Η ελάχιστη εντροπία (μοναδικοί χαρακτήρες, μη-Αγγλικά μετράνε για τα περισσότερα) που απαιτούνται για το κύριο τμήμα μίας ανάρτησης."
     allow_uppercase_posts: "Επίτρεψε όλα τα γράμματα στον τίτλο ενός νήματος ή σε μία ανάρτηση να είναι κεφαλαία. "
     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: "Μια λίστα με τιμές δεκαεξαδικού χρώματος δεκαεξαδικό, που επιτρέπεται για τις κατηγορίες."
+    category_colors: "Μια λίστα με τιμές δεκαεξαδικού χρώματος, που επιτρέπεται για τις κατηγορίες."
     category_style: "Οπτικό στυλ για τα εμβλημάτα κατηγορίας ."
     max_image_size_kb: "Το μέγιστο μέγεθος εικόνας για μεταφόρτωση σε kB. Αυτό πρέπει να ρυθμιστεί στο nginx (client_max_body_size) / apache ή και στο proxy."
     max_attachment_size_kb: "Το μέγιστο μέγεθος συννημένων αρχείων για μεταφόρτωση σε kB. Αυτό πρέπει να ρυθμιστεί στο nginx (client_max_body_size) / apache ή και στο proxy."
-    authorized_extensions: "Μια λίστα με επεκτάσεις αρχείου επιτρέπεται για ανέβασμα (use '*' to enable all file types)"
+    authorized_extensions: "Μια λίστα με επεκτάσεις αρχείου οι οποιες επιτρέπονται για ανέβασμα (use '*' to enable all file types)"
+    theme_authorized_extensions: "Μια λίστα από επεκτάσεις οι οποίες επιτρέπονται για τις μεταφορτώσεις θεμάτων ('*' για ενεργοποίηση όλων των τύπων αρχείων)"
     max_similar_results: "Πόσα παρόμοια νήματα να εμφανίζονται πάνω από τον εκδότη, όταν δημιουργείς ένα νέο νήμα. Η σύγκριση βασίζεται στον τίτλο και το σώμα."
     max_image_megapixels: "Ο μέγιστος αριθμός megapixel που επιτρέπεται σε μία εικόνα. "
-    title_prettify: "Απέφυγε συνηθησμένα τυπογραφικά λάθη στους τίτλους, όπως όλα τα γράμματα να είναι κεφαλαία, το πρώτο γράμμα της λέξης να είναι μικρό, πολλαπλά ! και ;, επιπλέον . στο τελος, κτλ. "
+    title_prettify: "Απέφυγε συνηθισμένα τυπογραφικά λάθη στους τίτλους, όπως όλα τα γράμματα να είναι κεφαλαία, το πρώτο γράμμα της λέξης να είναι μικρό, πολλαπλά ! και ;, επιπλέον . στο τελος, κτλ. "
     topic_views_heat_low: "Μετά από τόσες προβολές, το πεδίο των προβολών είναι ελάχιστα τονισμένο. "
     topic_views_heat_medium: "Μετά από τόσες προβολές, το πεδίο των προβολών είναι μέτρια τονισμένο. "
     topic_views_heat_high: "Μετά από τόσες προβολές, το πεδίο των προβολών είναι πολύ τονισμένο. "
@@ -1102,201 +1179,203 @@ el:
     history_hours_low: "Μία ανάρτηση η οποία έχει επεξεργαστεί ώς και πριν από τόσες ώρες, έχει την ένδειξη επεξεργασίας ελάχιστα τονισμένη. "
     history_hours_medium: "Μία ανάρτηση η οποία έχει επεξεργαστεί ώς και πριν από τόσες ώρες, έχει την ένδειξη επεξεργασίας μέτρια τονισμένη. "
     history_hours_high: "Μία ανάρτηση η οποία έχει επεξεργαστεί ώς και πριν από τόσες ώρες, έχει την ένδειξη επεξεργασίας πολύ τονισμένη. "
-    topic_post_like_heat_low: "Όταν η αναλογία likes:ανάρτηση υπερβεί αυτήν την αναλογία, το πεδίο μετρητής της ανάρτησης γίνετε ελαφρώς πιο τονισμένο. "
-    topic_post_like_heat_medium: "Μετά από τόσα ''Μου αρέσει'',το πεδίο μέτρησης αναρτήσεων είναι μέτρια τονισμένο."
-    topic_post_like_heat_high: "Όταν η αναλογία likes:ανάρτηση υπερβεί αυτήν την αναλογία, το πεδίο μετρητής της ανάρτησης γίνετε αρκετά πιο τονισμένο. "
-    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: "Πόσο επιπλέον συντελεστή στάθμισης να δωθεί στα likes των συνεργατών."
-    topic_view_duration_hours: "Μετρήστε μια νέα προβολή θέματος μία φορά ανά  IP/User κάθε N ώρες"
+    topic_post_like_heat_low: "Όταν η σχέση likes:ανάρτηση υπερβεί αυτήν την αναλογία, το πεδίο μέτρησης της ανάρτησης γίνεται ελαφρώς πιο τονισμένο. "
+    topic_post_like_heat_medium: "Όταν η σχέση likes:ανάρτηση υπερβεί αυτήν την αναλογία, το πεδίο μέτρησης της ανάρτησης γίνεται μέτρια τονισμένο."
+    topic_post_like_heat_high: "Όταν η σχέση likes:ανάρτηση υπερβεί αυτήν την αναλογία, το πεδίο μέτρησης της ανάρτησης γίνεται πολύ τονισμένο. "
+    faq_url: "Εάν έχετε ένα FAQ το οποίο φιλοξενείται αλλού και θέλετε να το χρησιμοποιήσετε, καταχωρήστε την πλήρη διεύθυνση URL εδώ."
+    tos_url: "Εάν έχετε ένα έγγραφο Όρων Χρήσης το οποίο φιλοξενείται αλλού και θέλετε να το χρησιμοποιήσετε, καταχωρήστε την πλήρη διεύθυνση URL εδώ."
+    privacy_policy_url: "Εάν έχετε ένα έγγραφο πολιτικής προστασίας προσωπικών δεδομένων  το οποίο φιλοξενείται αλλού και θέλετε να το χρησιμοποιήσετε, καταχωρήστε την πλήρη διεύθυνση URL εδώ."
+    newuser_spam_host_threshold: "Πόσες φορές ένας νέος χρήστης μπορεί να αναρτήσει ένα σύνδεσμο προς την ίδια ιστοσελίδα εντός του ορίου 'newuser_spam_host_threshold' αναρτήσεων, πριν αυτές θεωρηθούν spam."
+    white_listed_spam_host_domains: "Μια λίστα από domains που εξαιρούνται από τον έλεγχο spam. Οι νέοι χρήστες δεν θα περιορίζονται στη δημιουργία αναρτήσεων με συνδέσμους προς αυτά τα domains."
+    staff_like_weight: "Πόσο επιπλέον συντελεστή βαρύτητας να αποδίδεται στα likes των συνεργατών."
+    topic_view_duration_hours: "Μετρήστε μια νέα προβολή νήματος μία φορά ανά  IP/User κάθε N ώρες"
     user_profile_view_duration_hours: "Μετρήστε μια νέα προβολή προφίλ χρήστη μία φορά ανά IP/User κάθε N ώρες"
-    levenshtein_distance_spammer_emails: "Στην αντιστοίχιση διευθύνσεων ηλεκτρονικού ταχυδρομείου των σπαμερ, η διαφορά στον αριθμό των χαρακτήρων θα επιτρέπει μια ασαφή αντιστοίχιση."
-    max_new_accounts_per_registration_ip: "Αν ήδη υπάρχουν (ν) το πλήθος λογαριασμοί επιπέδου εμπιστοσύνης 0 από αυτή την IP διεύθυνση (και κανείς από αυτούς δεν είναι μέλος του προσωπικού ή στο επίπεδο εμπιστοσύνης 2 ή υψηλότερο), σταμάτα να αποδέχεσαι νέες εγγραφές από αυτή την IP διεύθυνση. "
+    levenshtein_distance_spammer_emails: "Στην αντιστοίχιση διευθύνσεων email των σπάμερ, η διαφορά στον αριθμό των χαρακτήρων η οποία θα επιτρέπει μια ασαφή αντιστοίχιση."
+    max_new_accounts_per_registration_ip: "Αν ήδη υπάρχουν (n) λογαριασμοί επιπέδου εμπιστοσύνης 0 από αυτή την IP διεύθυνση (και κανείς από αυτούς δεν είναι συνεργάτης ή τουλάχιστον στο ΕΕ2), σταμάτα να αποδέχεσαι νέες εγγραφές από αυτή την IP διεύθυνση. "
     min_ban_entries_for_roll_up: "Το πάτημα του πλήκτρου Κύλιση προς τα πάνω, θα δημιουργήσει μία απαγόρευση εισαγωγής νέου υποδικτύου αν υπάρχουν τουλάχιστον (Ν) εισαγωγές. "
-    max_age_unmatched_emails: "Διαγράψτε τις αταίριαστες καταχωρήσεις ηλεκτρονικού ταχυδρομείου που έχουν προβληθεί μετά από (N) μέρες."
-    max_age_unmatched_ips: "Διαγράψτε τις αταίριαστες καταχωρήσεις IP που έχουν προβληθεί μετά από (N) μέρες."
-    num_flaggers_to_close_topic: "Ελάχιστος αριθμός ξεχωριστών επισημάνσεων που απαιτείται για να σταματήσει αυτόματα ένα θέμα συζήτησης για παρέμβαση. "
-    num_flags_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: "Το regex χωρίς διάκριση πεζών-κεφαλαίων το οποίο αν περάσει θα προκαλέσει την πρώτη ανάρτηση από το χρήστη να μπλοκάρει και να σταλθεί στην ουρά για έγκριση. Παράδειγμα: raging|a[bc]a, θα προκαλέσει όλα τα μηνύματα που περιέχουν raging ή ΑΒΑ ή ACA να μπλοκάρουν. Ισχύει μόνο για την πρώτη θέση."
-    reply_by_email_enabled: "Ενεργοποίηση απάντησης στα νήματα μέσω ηλεκτρονικού μηνύματος."
-    reply_by_email_address: "Πρότυπο απάντησης μέσω ηλεκτρονικού ταχυδρομείου, με εισερχόμενες διευθύνσεις ηλεκτρονικού ταχυδρομείου, για παράδειγμα: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
-    alternative_reply_by_email_addresses: "Λίστα εναλλακτικών προτύπων για απάντηση μέσω ηλεκτρονικού ταχυδρομίου σε εισερχόμενες διευθύνσεις ηλεκτρονικού ταχυδρομίου, πχ: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    disable_emails: "Απαγόρευσε στο Discourse να στέλνει ηλεκτρονικά μηνύματα οποιουδήποτε είδους"
-    strip_images_from_short_emails: "Αφαίρεσε εικόνες από ηλεκτρονικά μηνύματα που έχουν μέγεθος λιγότερο από 2800 Bytes. "
-    short_email_length: "Μικρού μήκους ηλεκτρονικό ταχυδρομείο σε Bytes"
-    display_name_on_email_from: "Να εμφανίζει πλήρη ονόματα στο ηλεκτρονικό ταχυδρομείο από τα πεδία"
-    unsubscribe_via_email: "Επίτρεψε στους χρήστες να καταργούν τη συνδρομή τους από ηλεκτρονικά μηνύματα στέλνοντας ένα ηλεκτρονικό μήνυμα με την φράση 'κατάργηση συνδρομής' στο θέμα ή το κείμενο του μηνύματος. "
-    unsubscribe_via_email_footer: "Πρόσθεσε στο υποσέλιδο των απεσταλμένων μηνυμάτων έναν σύνδεσμο κατάργησης συνδρομής μέσω ηλεκτρονικού μηνύματος. "
-    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: "Mailgun μυστικό API κλειδί το οποίο χρησιμοποιήται για να επιβεβαιωθούν τα μηνύματα του webhook."
-    soft_bounce_score: "Το αποτέλεσμα εκβολλών προσθέτεται στο χρήστη όταν συμβαίνει μία προσωρινή εκβολλή. "
-    hard_bounce_score: "Το αποτέλεσμα εκβολλής προσθέτεται στο χρήστη όταν συμβαίνει μία μόνιμη εκβολλή. "
-    bounce_score_threshold: "Μέγιστος αριθμός εκβολλών μέχρι να σταματίσουμε να στέλνουμε email στο χρήστη."
-    bounce_score_threshold_deactivate: "Μέγιστος αριθμός εκβολλών μέχρι να απενεργοποιήσουμε το χρήστη."
-    reset_bounce_score_after_days: "Αυτόματη επαναφορά βαθμολογία αναπήδησης μετά από Χ ημέρες."
-    attachment_content_type_blacklist: "Λίστα των λέξεων-κλειδιών που χρησιμοποιούνται στη μαύρη λίστα συνημμένα με βάση τον τύπο περιεχομένου"
-    attachment_filename_blacklist: "Λίστα των λέξεων-κλειδιών που χρησιμοποιούνται στη μαύρη λίστα συνημμένα με βάση το όνομα του αρχείου."
-    enable_forwarded_emails: "[BETA] Να επιτρέπεται στους χρήστες να δημιουργήσουν ένα θέμα με την αποστολή ενός μηνύματος ηλεκτρονικού ταχυδρομείου στο."
-    always_show_trimmed_content: "Δείχνε πάντοτε την συντετμημένη μορφή των εισερχομένων ηλεκτρονικών μηνυμάτων. ΠΡΟΣΟΧΗ: μπορεί να αποκαλύψει διευθύνσεις ηλεκτρονικού ταχυδρομείου. "
-    manual_polling_enabled: "Αυτόματη αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου χρησιμοποιώντας το API για τις απαντήσεις ηλεκτονικών μηνυμάτων. "
-    pop3_polling_enabled: "Κάνε δειγματοληπτικό έλεγχο χρησιμοποιώντας το πρωτόκολλο POP3 για απαντήσεις ηλεκτρονικών μηνυμάτων. "
+    max_age_unmatched_emails: "Διαγράψτε τις αταίριαστες ελεγχόμενες εγγραφές email μετά από (N) μέρες."
+    max_age_unmatched_ips: "Διαγράψτε τις αταίριαστες ελεγχόμενες εγγραφές IP μετά από (N) μέρες."
+    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_silence_fast_typers_on_first_post: "Αυτόματη σίγηση των χρηστών που δεν πληρούν το κριτήριο min_first_post_typing_time"
+    auto_silence_fast_typers_max_trust_level: "Μέγιστο επίπεδο εμπιστοσύνης για την αυτόματη σίγηση σε περίπτωση γρήγορης πληκτρολόγησης"
+    auto_silence_first_post_regex: "Case insensitive regex το οποίο αν ισχύσει θα προκαλέσει την σιγή και την αποστολή για έλεγχο της πρώτης ανάρτησης ενός χρήστη. Παράδειγμα: raging|a[bc]a , θα προκαλέσει όλες τις αναρτήσεις που περιέχουν raging ή aba ή aca να σιγηθούν. Ισχύει μόνο για την πρώτη ανάρτηση."
+    flags_default_topics: "Προβολή επισημασμένων νημάτων από προεπιλογή στην σελίδα διαχείρισης"
+    reply_by_email_enabled: "Ενεργοποίηση απάντησης στα νήματα μέσω email."
+    reply_by_email_address: "Πρότυπο για την απάντηση μέσω email της διεύθυνσης email εισερχομένων μηνυμάτων, για παράδειγμα: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
+    alternative_reply_by_email_addresses: "Λίστα εναλλακτικών προτύπων για την απάντηση μέσω email της διεύθυνσης email εισερχομένων μηνυμάτων, πχ: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
+    incoming_email_prefer_html: "Χρησιμοποίησε HTML αντί για κείμενο στα εισερχόμενα email."
+    disable_emails: "Απαγόρευσε στο Discourse να στέλνει email οποιοασδήποτε μορφής"
+    strip_images_from_short_emails: "Αφαίρεσε εικόνες από email που έχουν μέγεθος λιγότερο από 2800 Bytes. "
+    short_email_length: "Μέγεθος μικρού email σε Bytes"
+    display_name_on_email_from: "Εμφάνισε πλήρη ονόματα στα πεδία απoστολέα των email"
+    unsubscribe_via_email: "Επίτρεψε στους χρήστες να απεγγραφούν από emails στέλνοντας ένα email με την φράση 'unsubscribe' στο θέμα ή το κείμενο του μηνύματος. "
+    unsubscribe_via_email_footer: "Πρόσθεσε στο υποσέλιδο των απεσταλμένων μηνυμάτων έναν σύνδεσμο απεγγραφής μέσω email. "
+    delete_email_logs_after_days: "Διαγραφή αρχείων καταγραφής email μετά απο  (N) μέρες. 0 για να κρατούνται επ' αόριστον"
+    max_emails_per_day_per_user: "Ο μέγιστος αριθμός email που θα στέλνονται στους χρήστες ανά μέρα. 0 για να απενεργοποιηθεί το όριο. "
+    enable_staged_users: "Αυτόματη δημιουργία σταδιακών χρηστών όταν επεξεργάζεται ένα εισερχόμενο μήνυμα email."
+    maximum_staged_users_per_email: "Μέγιστος αριθμός σταδιακών χρηστών που δημιουργούνται όταν επεξεργάζεται ένα εισερχόμενο μήνυμα email."
+    auto_generated_whitelist: "Κατάλογος διευθύνσεων email που δεν θα ελεγχθούν για αυτοπαραγόμενο περιεχόμενο. Παράδειγμα: foo@bar.com|discourse@bar.com"
+    block_auto_generated_emails: "Αποκλεισμός εισερχόμενων μηνυμάτων email που ταυτοποιούνται ως αυτόματα δημιουργημένα."
+    ignore_by_title: "Αγνόησε εισερχόμενα email σύμφωνα με τον τίτλο τους."
+    mailgun_api_key: "Mailgun Secret API key το οποίο χρησιμοποιείται για να επιβεβαιωθούν τα μηνύματα του webhook."
+    soft_bounce_score: "Το σκορ αναπήδησης το οποίο προστίθεται στο χρήστη όταν συμβαίνει μία προσωρινή αναπήδηση (bounce). "
+    hard_bounce_score: "Το σκορ αναπήδησης το οποίο προστίθεται στο χρήστη όταν συμβαίνει μία μόνιμη αναπήδηση (bounce). "
+    bounce_score_threshold: "Μέγιστος αριθμός αναπηδήσεων (bounce) πέραν του οποίου θα σταματήσουμε να στέλνουμε email στο χρήστη."
+    bounce_score_threshold_deactivate: "Μέγιστος αριθμός αναπηδήσεων (bounce) πέραν του οποίου θα απενεργοποιήσουμε το χρήστη."
+    reset_bounce_score_after_days: "Αυτόματη επαναφορά σκορ αναπήδησης μετά από Χ ημέρες."
+    attachment_content_type_blacklist: "Λίστα των λέξεων-κλειδιών που χρησιμοποιούνται στη μαύρη λίστα συνημμένων με βάση τον τύπο περιεχομένου"
+    attachment_filename_blacklist: "Λίστα των λέξεων-κλειδιών που χρησιμοποιούνται στη μαύρη λίστα συνημμένων με βάση το όνομα του αρχείου."
+    enable_forwarded_emails: "[BETA] Να επιτρέπεται στους χρήστες να δημιουργήσουν ένα νήμα προωθώντας ένα email."
+    always_show_trimmed_content: "Δείχνε πάντοτε την συντετμημένη μορφή των εισερχομένων email. ΠΡΟΣΟΧΗ: μπορεί να αποκαλύψει διευθύνσεις email. "
+    private_email: "Να μην περιλαμβάνεται περιεχόμενο από αναρτήσεις στα emails για επιπλέον ιδιωτικότητα."
+    manual_polling_enabled: "Προώθηση μηνυμάτων email χρησιμοποιώντας το API για τις απαντήσεις email. "
+    pop3_polling_enabled: "Κάνε έλεγχο χρησιμοποιώντας το πρωτόκολλο POP3 για απαντήσεις email. "
     pop3_polling_ssl: "Χρησιμοποιήσε το πρωτόκολλο SSL για την σύνδεση με τον POP3 διακομιστή. (Συνιστάται) "
     pop3_polling_openssl_verify: "Επαλήθευσε το TLS πιστοποιητικό διακομιστή (Προκαθορισμένο: ενεργοποιημένο)"
-    pop3_polling_period_mins: "Η περίοδος σε λεπτά ανάμεσα στους ελέγχους ενός POP3 λογαριασμού για ηλεκτρονικά μηνύματα. ΣΗΜΕΙΩΣΗ: απαιτεί επανεκκίνηση. "
+    pop3_polling_period_mins: "Η περίοδος σε λεπτά ανάμεσα στους ελέγχους ενός POP3 λογαριασμού για email. ΣΗΜΕΙΩΣΗ: απαιτεί επανεκκίνηση. "
     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). Διαμόρφωσε τις διευθύνσεις στην καρτέλα ''Ρυθμίσεις'' της κάθε κατηγορίας. "
-    email_in_min_trust: "Το ελάχιστο επίπεδο εμπιστοσύνης που χρειάζεται ένας χρήστης, ώστε να του επιτραπεί να αναρτήσει ένα νεό θέμα μέσω email. "
-    email_prefix: "Το [label]που χρησιμοποιείται στο θέμα των μηνυμάτων ηλεκτρονικού ταχυδρομείου. Αυτό θα προκαθοριστεί σαν «τίτλος», αν δεν οριστεί."
-    email_site_title: "Ο τίτλος αυτής της ιστοσελίδας χρησιμοποιήται καθώς ο χρήστης στέλνει email από την ιστοσελίδα. Η προκαθορισμένη ρύθμιση είναι 'τίτλος'. Εάν ο 'τίτλος' σας περιέχει χαρακτήρες οι οποίοι δεν επιτρέπονται στα email, χρησιμοποιήστε αυτή τη ρύθμιση. "
+    pop3_polling_host: "Ο διακομιστής ο οποίος ελέγχεται για το email μέσω του POP3."
+    pop3_polling_username: "Το όνομα χρήστη του POP3 λογαριασμού για το email."
+    pop3_polling_password: "Ο κωδικός πρόσβασης του POP3 λογαριασμού για το email."
+    log_mail_processing_failures: "Καταγραφή όλων των αποτυχιών επεξεργασίας email στη διεύθυνση http://yoursitename.com/logs"
+    email_in: "Επίτρεψε στους χρήστες να ανοίγουν νέα νήματα μέσω email (απαιτεί χειροκίνητο ή pop3 έλεγχο νέων μηνυμάτων). Ρυθμίστες την διεύθυνση στην καρτέλα \"Ρυθμίσεις\" της κάθε κατηγορίας."
+    email_in_min_trust: "Το ελάχιστο επίπεδο εμπιστοσύνης που χρειάζεται ένας χρήστης, ώστε να του επιτραπεί να αναρτήσει ένα νεό νήμα μέσω email. "
+    email_prefix: "Το [label] που χρησιμοποιείται στο θέμα των μηνυμάτων email. Αυτό θα προκαθοριστεί σαν «τίτλος», αν δεν οριστεί."
+    email_site_title: "Ο τίτλος της ιστοσελίδας που χρησιμοποιείται ως ο αποστολέας των email από την ιστοσελίδα. Η προκαθορισμένη ρύθμιση είναι 'τίτλος'. Εάν ο 'τίτλος' σας περιέχει χαρακτήρες οι οποίοι δεν επιτρέπονται στα email, χρησιμοποιήστε αυτή τη ρύθμιση. "
+    find_related_post_with_key: "Χρησιμοποίησε μόνο το 'reply key' για να βρεις την ανάρτηση replied-to. ΠΡΟΣΟΧΗ: αν απενεργοποιηθεί, επιτρέπει την πλαστοπροσωπία με βάση την διεύθυνση email."
     minimum_topics_similar: "Πόσα νήματα χρειάζεται να υπάρχουν προτού παρουσιαστούν παρόμοια νήματα όταν δημιουργείς νέα νήματα."
     relative_date_duration: "Αριθμός ημερών μετά την ανάρτηση όταν οι ημερομηνίες ανάρτησης θα εμφανίζονται ως σχετικές (7ημ) αντί για απόλυτες (20 Φεβ). "
     delete_user_max_post_age: "Να μην επιτρέπεται η διαγραφή χρηστών των οποίων η πρώτη ανάρτηση είναι τουλάχιστον (Χ) ημερών. "
     delete_all_posts_max: "Ο μέγιστος αριθμός αναρτήσεων που μπορούν να διαγραφούν με τη μία, χρησιμοποιώντας το κουμπί Διαγραφή Όλων Των Αναρτήσεων. Αν ο αριθμός των αναρτήσεων ενός χρήστη υπερβαίνει τον μέγιστο αριθμό, τότε δεν μπορόυν να διαγραφούν όλες οι αναρτήσεις με τη μία και ο χρήστης δεν μπορεί να διαγραφεί. "
-    username_change_period: "Ο αριθμός των ημερών που πρέπει να περάσουν από την εγγραφή ενός λογαριασμού για να μπορεί να γίνει αλλαγή του ονόματος του (0 για να μην επιτρέπεται η αλλαγή του ονόματος χρήστη). "
-    email_editable: "Να επιτρέπεται στους χρήστες η αλλαγή του ηλεκτρονικού ταχυδρομείου μετά την εγγραφή."
+    email_editable: "Να επιτρέπεται στους χρήστες η αλλαγή του email μετά την εγγραφή."
     logout_redirect: "Τοποθεσία του διαδικτύου όπου ανακατευθύνεται το πρόγραμμα περιήγησης μετά την αποσύνδεση (π.χ.: http://somesite.com/logout)"
     allow_uploaded_avatars: "Να επιτρέπεται στους χρήστες η μεταφόρτωση εξατομικευμένων εικόνων προφίλ. "
-    allow_animated_avatars: "Επιτρέπεται στους χρήστες να χρησιμοποιούν αρχεία τύπου gif για φωτογραφίες προφίλ. ΠΡΟΣΟΧΗ: εκτελέστε τα avatar:ανανεώστε αφού αλλάξετε αυτή τη ρύθμιση."
+    allow_animated_avatars: "Επιτρέπεται στους χρήστες να χρησιμοποιούν αρχεία τύπου animated gif για φωτογραφίες προφίλ. ΠΡΟΣΟΧΗ: εκτελέστε τα avatars:refresh αφού αλλάξετε αυτή τη ρύθμιση."
     allow_animated_thumbnails: "Δημιουργεί κινούμενες μικρογραφίες κινουμένων GIFs. "
-    default_avatars: "Προκαθορισμένα URL που οδηγούν στα avatar θα  χρησιμοποιούνται από τους νέους χρήστες μέχρι να τα αλλάξουν οι ίδιοι. "
-    automatically_download_gravatars: "Λήψη των Gravatars για τους χρήστες κατά τη δημιουργία λογαριασμού ή κατά την αλλαγή διεύθυνσης ηλεκτρονικού ταχυδρομίου. "
-    digest_topics: "Ο μέγιστος αριθμός δημοφιλών θεμάτων που θα εμφανίζονται στην σύνοψη του ηλεκτρονικού ταχυδρομείου. "
-    digest_posts: "Ο μέγιστος αριθμός δημοφιλών αναρτήσεων που θα εμφανίζονται στην σύνοψη του ηλεκτρονικού ταχυδρομείου. "
-    digest_other_topics: "Ο μέγιστος αριθμός θεμάτων που θα εμφανίζονται στην ενότητα 'Νέα στα θέματα και τις κατηγορίες που ακολουθείτε' της σύνοψης του ηλεκτρονικού ταχυδρομείου. "
-    digest_min_excerpt_length: "Ελάχιστο απόσπασμα ανάρτησης στην περίληψη του ηλεκτρονικού μηνύματος, σε χαρακτήρες. "
-    suppress_digest_email_after_days: "Καταστολή της σύνοψης του ηλεκτρονικού ταχυδρομείου για χρήστες που δεν έχουν φανεί στην ιστοσελίδα για πάνω απο (χ) μέρες. "
-    digest_suppress_categories: "Καταστείλει αυτές τις κατηγορίες από την περίληψη μηνυμάτων ηλεκτρονικού ταχυδρομείου."
-    disable_digest_emails: "Απενεργοποίηση των περιληπτικών ηλεκτρονικών μηνυμάτων για όλους τους χρήστες."
-    email_accent_bg_color: "Το χρώμα τονισμού που θα χρησιμοποιηθεί ως φόντο σε κάποια στοιχεία σε HTML ηλεκτρονικά μηνύματα. Εισήγαγε το όνομα του χρώματος ('κόκκινο') ή την δεκαεξαδική τιμή του ('#FF000')."
-    email_accent_fg_color: "Το χρώμα του κειμένου που θα αποδωθεί στο φόντο του ηλεκτρονικού μηνύματος σε HTML ηλεκτρονικά μηνύματα. Εισήγαγε το όνομα του χρώματος ('άσπρο') ή την δεκαεξαδική τιμή του ('#FFFFFF')."
-    email_link_color: "Το χρώμα των συνδέσμων σε HTML ηλεκτρονικά μηνύματα.  Εισήγαγε το όνομα του χρώματος ('μπλε') ή την δεκαεξαδική τιμή του ('#0000FF'). "
+    default_avatars: "URLs από avatars τα οποία θα χρησιμοποιούνται στους νέους χρήστες μέχρι αυτοί να τα αλλάξουν."
+    automatically_download_gravatars: "Λήψη των Gravatars για τους χρήστες κατά τη δημιουργία λογαριασμού ή κατά την αλλαγή διεύθυνσης email. "
+    digest_topics: "Ο μέγιστος αριθμός δημοφιλών θεμάτων που θα εμφανίζονται στην σύνοψη του email. "
+    digest_posts: "Ο μέγιστος αριθμός δημοφιλών αναρτήσεων που θα εμφανίζονται στην σύνοψη του email. "
+    digest_other_topics: "Ο μέγιστος αριθμός νημάτων που θα εμφανίζονται στην ενότητα 'Νέα στα νήματα και τις κατηγορίες που ακολουθείτε' του συνοπτικού email. "
+    digest_min_excerpt_length: "Ελάχιστο απόσπασμα ανάρτησης στο συνοπτικό email, σε χαρακτήρες. "
+    suppress_digest_email_after_days: "Καταστολή του συνοπτικού email για χρήστες που δεν έχουν επισκεφθεί την ιστοσελίδα για πάνω απο (χ) μέρες. "
+    digest_suppress_categories: "Καταστείλει αυτές τις κατηγορίες από το συνοπτικό email."
+    disable_digest_emails: "Απενεργοποίηση των συνοπτικών emails για όλους τους χρήστες."
+    email_accent_bg_color: "Η απόχρωση η οποία θα χρησιμοποιηθεί ως φόντο κάποιων στοιχείων στα HTML emails. Δώστε όνομα χρώματος ('red') ή τιμή hex ('#FF0000')."
+    email_accent_fg_color: "Το χρώμα του κειμένου που θα αποδωθεί στο φόντο του email σε HTML ηλεκτρονικά μηνύματα. Εισήγαγε το όνομα του χρώματος ('white') ή την δεκαεξαδική τιμή του ('#FFFFFF')."
+    email_link_color: "Το χρώμα των συνδέσμων σε HTML email.  Εισήγαγε το όνομα του χρώματος ('blue') ή την δεκαεξαδική τιμή του ('#0000FF'). "
     detect_custom_avatars: "Αν πρέπει ή όχι να ελεγχθεί ότι οι χρήστες έχουν μεταφορτώσει εξατομικευμένες φωτογραφίες προφίλ. "
     max_daily_gravatar_crawls: "Μέγιστος αριθμός φορών που το Discourse θα ελέγξει το Gravatar για προσαρμοσμένα avatars σε μία μέρα"
-    public_user_custom_fields: "Ο κατάλογος των ειδικών πεδίων για έναν χρήστη που μπορεί να εμφανιστεί δημόσια. "
-    staff_user_custom_fields: "Ο κατάλογος των ειδικών πεδίων που μπορεί να εμφανιστεί στο προσωπικό. "
-    enable_user_directory: "Παρέχουν κατάλογο με χρήστες για περιήγηση"
-    enable_group_directory: "Παρέχουν κατάλογο με ομάδες για περιήγηση"
-    allow_anonymous_posting: "Επέτρεψε στους χρήστες να μετατρέπουν σε ανώνυμη κατάσταση"
-    anonymous_posting_min_trust_level: "Το ελάχιστο επίπεδο εμπιστοσύνης που επιτρέπεται για ενεργοποίηση της  ανώνυμης δημοσίευση"
+    public_user_custom_fields: "Η λίστα των ειδικών πεδίων ενός χρήστη η οποία επιτρέπεται να εμφανιστεί δημόσια. "
+    staff_user_custom_fields: "Η λίστα των ειδικών πεδίων ενός χρήστη η οποία επιτρέπεται να εμφανιστεί στους συνεργάτες. "
+    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: "Ο  ιστότοπος του χρήστη θα επιβεβαιώνεται με αυτά τα πεδία. Pipe-delimited λίστα"
+    hide_user_profiles_from_public: "Απενεργοποιήσε τις κάρτες χρηστών, τα προφίλ χρηστών και τον κατάλογο χρηστών για ανώνυμους χρήστες. "
+    hide_suspension_reasons: "Να μην εμφανίζονται οι λόγοι αποβολής δημόσια στα προφίλ των χρηστών."
+    user_website_domains_whitelist: "Ο  ιστότοπος του χρήστη θα επιβεβαιώνεται με αυτά τα domains. Pipe-delimited λίστα"
     allow_profile_backgrounds: "Επίτρεψε στους χρήστες να μεταφορτώνουν εικόνες φόντου στο προφίλ."
     sequential_replies_threshold: "Ο αριθμός των αναρτήσεων που πρέπει να κάνει ένας χρήστης στη σειρά για το ίδιο θέμα πριν ειδοποιηθεί για παρα πολλές συνεχόμενες απαντήσεις."
     get_a_room_threshold: "Ο αριθμός των αναρτήσεων που πρέπει να κάνει ένας χρήστης στον ίδιο άνθρωπο και στο ίδιο θέμα προτού να προειδοποιηθεί. "
-    enable_mobile_theme: "Οι κινητές συσκευές χρησιμοποιούν θέματα φιλικά προς τα κινητά, με τη δυνατότητα αλλαγής στον ολοκληρωμένο ιστότοπο. Απενεργοποιήστε το εάν θέλετε να εξατομικεύσετε το στυλ που ανταποκρίνεται ολοκληρωτικά. "
-    dominating_topic_minimum_percent: "To ποσοστό αναρτήσεων που πρέπει να κάνει ένας χρήστης σε ένα νήμα πριν ειδοποιηθεί για υπερβολική χρήση του. "
+    enable_mobile_theme: "Οι κινητές συσκευές χρησιμοποιούν θέματα φιλικά προς τα κινητά, με δυνατότητα αλλαγής στον ολοκληρωμένο ιστότοπο. Απενεργοποιήστε το εάν θέλετε να χρησιμοποιήσετε ένα fully responsive stylesheet."
+    dominating_topic_minimum_percent: "To ποσοστό αναρτήσεων που πρέπει να κάνει ένας χρήστης σε ένα νήμα πριν ειδοποιηθεί για υπερβολική χρήση του νήματος."
     disable_avatar_education_message: "Απενεργοποίησε εκπαιδευτικό μήνυμα για αλλαγή του avatar."
-    suppress_uncategorized_badge: "Να μην εμφανίζεται το παράσημο για τα νήματα που δεν ανήκουν σε κατηγορίες στις καταχωρήσεις νημάτων."
+    suppress_uncategorized_badge: "Να μην εμφανίζεται το παράσημο για τα νήματα που δεν ανήκουν σε κατηγορίες στις λίστες νημάτων."
     permalink_normalizations: "Εφαρμόστε την ακόλουθη regex πριν ταιριάξετε τα permalinks, για παράδειγμα: /(topic.*)\\?.*/\\1 θα αφαιρέσει τις συμβολοσειρά για ερώτηση από τις διαδρομές για τα νήματα. Η μορφή είναι regex+συμβολοσειρά χρησημοποιήστε \\ 1 κ.λπ., για να αποκτήσετε πρόσβαση στις συλλήψεις"
-    global_notice: "Εμφάνισε μια ΕΠΕΙΓΟΥΣΑ, ΕΚΤΑΚΤΗ παγκόσμια ανακοίνωση σε όλους τους επισκέπτες, άλλαξε σε κενό για να την αποκρύψεθς (HTML επιτρεπτό)."
-    disable_edit_notifications: "Απενεργοποιεί τη επεξεργασία των ειδοποιήσεων από τον χρήστη του συστήματος όσο το 'download_remote_images_to_local' είναι ενεργό"
+    global_notice: "Εμφάνισε μια ΕΠΕΙΓΟΥΣΑ, ΕΚΤΑΚΤΗ γενική ανακοίνωση σε όλους τους επισκέπτες, άλλαξε σε κενό για να την αποκρύψεις (HTML επιτρεπτό)."
+    disable_edit_notifications: "Απενεργοποιεί τη επεξεργασία των ειδοποιήσεων από τον χρήστη του συστήματος όταν το 'download_remote_images_to_local' είναι ενεργό"
     automatically_unpin_topics: "Αυτόματο ξεκαρφίτσωμα των νημάτων, όταν ο χρήστης φτάνει στο κάτω μέρος."
     read_time_word_count: "Μέτρηση των λέξεων ανά λεπτό για να υπολογίσεις τον εκτιμώμενο χρόνο διαβάσματος."
     topic_page_title_includes_category: "Ο τίτλος του νήματος της σελίδας περιλαμβάνει και το όνομα της κατηγορίας."
     native_app_install_banner: "Ζήτα από τους συχνούς επισκέπτες να εγκαταστήσουν την υπάρχουσα εφαρμογή Discourse. "
-    max_prints_per_hour_per_user: "Μέγιστος αριθμός /προβολή σελίδας (0 για απενεργοποίηση)"
+    share_anonymized_statistics: "Μοιράσου ανωνυμοποιημένα στατιστικά χρήσης"
+    auto_handle_queued_age: "Αυτόματη διαχείριση εγγραφών σε αναμονή για έλεγχο μετά από τόσες ημέρες. Οι σημάνσεις θα αγνοηθούν. Αναρτήσεις σε ουρά και χρήστες θα αγνοηθούν. Θέσε 0 για απενεργοποίηση αυτής της λειτουργίας."
+    max_prints_per_hour_per_user: "Μέγιστος αριθμός προβολών σελίδας /print (0 για απενεργοποίηση)"
     full_name_required: "Το ονοματεπώνυμο είναι απαραίτητο πεδίο για το προφίλ του χρήστη."
-    enable_names: "Εμφάνιζε το πλήρες όνομα του χρήστη στο προφίλ τους, στην κάρτα χρήστη και στα ηλεκτρονικά μηνύματα. Απενεργοποίησε για να κρύβεται το πλήρες όνομα παντού. "
-    display_name_on_posts: "Να εμφανίζεται το πλήρες όνομα του χρήστη στις δημοσιεύσεις και επιπλέον το @όνομαχρήστη του."
+    enable_names: "Εμφάνιζε το πλήρες όνομα του χρήστη στο προφίλ τους, στην κάρτα χρήστη και στα email. Απενεργοποίησε για να κρύβεται το πλήρες όνομα παντού. "
+    display_name_on_posts: "Να εμφανίζεται το πλήρες όνομα του χρήστη στις δημοσιεύσεις μαζί με το @όνομαχρήστη του."
     show_time_gap_days: "Αν δύο αναρτήσεις δημιουργηθούν με τόσες πολλές ημέρες μεταξύ τους, εμφάνιζε το χρονικό κενό στο θέμα. "
-    short_progress_text_threshold: "Όταν ο αριθμός των αναρτήσεων σε ένα θέμα ξεπεράσει αυτό τον αριθμό, η γραμμή προόδου θα δείχνει μόνο τον τωρινό αριθμό αναρτήσεων. Αν αλλάξεις το πλάτος της γραμμής, μπορεί να χρειαστεί να αλλάξεις αυτή την τιμή."
+    short_progress_text_threshold: "Όταν ο αριθμός των αναρτήσεων σε ένα θέμα ξεπεράσει αυτό τον αριθμό, η γραμμή προόδου θα δείχνει μόνο τον τωρινό αριθμό αναρτήσεων. Αν αλλάξεις το πλάτος της γραμμής προόδου, μπορεί να χρειαστεί να αλλάξεις αυτή την τιμή."
     default_code_lang: "Το συντακτικό της προκαθορισμένης γλώσσας προγραμματισμού  στο οποίο έχει δωθεί έμφαση θα εφαρμοστεί στα code blocks του GitHub (lang-auto, ruby, python etc.)"
     warn_reviving_old_topic_age: "Όταν κάποιος αρχίζει να απαντά σε ένα θέμα όπου η τελευταία απάντηση είναι παλαιότερη από τόσες πολλές ημέρες, εμφανίζεται μία προειδοποίηση. Απενεργεποίησε θέτοντας το ίσο με 0. "
     autohighlight_all_code: "Αναγκαστική εφαρμογή έμφασης του κώδικα σε όλα τα διαμορφωμένα code blocks ακόμα και αν δεν έχουν προσδιορίσει τη γλώσσα."
-    highlighted_languages: "Συμπεριλαμβανόμενοι κανόνες επισήμανσης συντακτικού. (Προσοχή: το να συμπεριλάβεις υπερβολικά πολλές γλώσσες μπορεί να επηρεάσει την επίδοση) δες: https://highlightjs.org/static/demo/ for a demo"
-    feed_polling_enabled: "ΜΌΝΟ ΓΙΑ ΕΝΣΩΜΆΤΩΣΗ: Επιλογή για το αν πρεπει να ενσωματώθει ένα RSS/Atom feed ως ανάρτησεις."
-    feed_polling_url: "ΜΌΝΟ ΓΙΑ ΕΝΣΩΜΆΤΩΣΗ: Το URL του RSS/ATOM feed για ενσωμάτωση."
-    embed_by_username: "Το όνομα του χρήστη στο Discourse που δημιουργεί τα ενσωματομένα θέματα.  "
-    embed_username_key_from_feed: "Κλειδί για να πάρετε το όνομα χρήστη του discourse από το feed"
-    embed_title_scrubber: " Κανονική έκφραση για ενσωματωμένους τίτλους."
+    highlighted_languages: "Συμπεριέλαβε κανόνες επισήμανσης συντακτικού. (Προσοχή: το να συμπεριλάβεις υπερβολικά πολλές γλώσσες μπορεί να επηρεάσει την επίδοση) δες: https://highlightjs.org/static/demo/ for a demo"
     embed_truncate: "Περικόψτε τις ενσωματωμένες δημοσιεύσεις."
     allowed_href_schemes: "Τα σχεδιαγράμματα επιτρέπονται σε συνδέσμους επιπλέον απο το http και το https."
-    embed_post_limit: "Μέγιστος αριθμός δημοσιεύσεων για ενσωμάτωση."
+    embed_post_limit: "Μέγιστος αριθμός αναρτήσεων για ενσωμάτωση."
     embed_username_required: "Απαιτείται το όνομα χρήστη για τη δημιουργία νήματος."
-    embed_whitelist_selector: "CSS  εκλέκτορας για τα στοιχεία που επιτρέπονται στην ενσωμάτωση"
-    embed_blacklist_selector: "Επιλογέας CSS για τα στοιχεία που έχουν αφαιρεθεί από τα ενσωματωμένα."
+    notify_about_flags_after: "Αν υπάρχουν σημάνσεις που δεν έχουν διαχειριστεί μετά από αυτόν τον αριθμό ωρών, στείλε ένα μήνυμα στο προσωπικό. Θέσε 0 για απενεργοποίηση."
     show_create_topics_notice: "Εάν η ιστοσελίδα έχει λιγότερα από 5 δημόσια νήματα, κάνε μια παρατήρηση ζητώντας από τον διαχειριστή να δημιουργήσει μερικά νήματα."
-    delete_drafts_older_than_n_days: 'Διαγραφή προχείρων παλεότερα απο (ν) ημερων '
-    bootstrap_mode_min_users: "Μέγιστος αριθμός /προβολή σελίδας (0 για απενεργοποίηση)"
+    delete_drafts_older_than_n_days: 'Διαγραφή προχείρων παλαιότερα απο (ν) ημερων '
+    bootstrap_mode_min_users: "Μέγιστος αριθμός χρηστών που απαιτούνται για την απενεργοποίηση της κατάστασης bootstrap (0 για απενεργοποίηση)"
     prevent_anons_from_downloading_files: "Αποτρέψτε ανώνυμους χρήστες από το να κατεβάζουν συνημμένα. ΠΡΟΣΟΧΗ: αυτό θα αποτρέψει οποιαδήποτε στοιχεία του ιστοτόπου που δεν είναι εικόνες και δημοσιεύονται ως συνημμένα από το να λειτουργούν."
     slug_generation_method: "Επιλέξτε μια μέθοδο παραγωγής slug. «Κωδικοποιημένη» θα δημιουργήσει μια συμβολοσειρά για ποσοστιαία κωδικοποίηση. «Κανένα» θα απενεργοποιήσει τα slug."
     enable_emoji: "Ενεργοποίηση emoji"
     emoji_set: "Πως θα ήθελες το emoji σου;"
     enforce_square_emoji: "Αναγκαστική εφαρμογή τετράγωνων διαστάσεων σε όλα τα emoji."
-    approve_post_count: "Το ποσό των αναρτήσεων από έναν καινούριο ή βασικό χρήστη που πρέπει να εγκριθεί."
+    approve_post_count: "Ο όγκος των αναρτήσεων ενός καινούριου ή βασικού χρήστη που θα πρέπει να εγκριθεί."
     approve_unless_trust_level: "Οι αναρτήσεις για χρήστες κάτω από αυτό το επίπεδο εμπιστοσύνης πρέπει να εγκριθούν"
-    approve_new_topics_unless_trust_level: "Τα καινούρια θέματα για τους χρήστες κάτω από αυτό το επίπεδο εμπιστοσύνης πρέπει να εγκριθούν."
-    notify_about_queued_posts_after: "Εάν υπάρχουν αναρτήσεις που περιμέναν να αναθεωρηθούν για περισσότερο από τόσες ώρες, θα σταλεί ένα μήνυμα ηλεκτρονικού ταχυδρομίου στο contact_email. Όρισε το στο 0 για να απενεργοποιήσεις αυτά τα μηνύματα ηλεκτρονικού ταχυδρομίου."
+    approve_new_topics_unless_trust_level: "Τα καινούρια νήματα για χρήστες κάτω από αυτό το επίπεδο εμπιστοσύνης πρέπει να εγκριθούν."
+    notify_about_queued_posts_after: "Εάν υπάρχουν αναρτήσεις που περιμέναν να αναθεωρηθούν για περισσότερο από τόσες ώρες, θα σταλεί ένα email στο contact_email. Όρισε το στο 0 για να απενεργοποιήσεις αυτά τα emails."
     auto_close_messages_post_count: "Ανώταρο όριο αναρτήσεων που επιτρέπονται σε ένα μήνυμα πριν αυτό κλείσει αυτομάτως (0 για απενεργοποιήση)"
-    auto_close_topics_post_count: "Ανώτατο όριο αναρτήσεων που επιτρέπονται σε ένα θέμα πριν αυτό κλείσει αυτομάτως (0 για απενεργοποίηση)"
-    code_formatting_style: "Το Κουμπί κώδικα στον συνθέτη θα έχει ως αποτέλεσμα αυτό το στυλ μορφοποίησης κώδικα "
-    default_email_digest_frequency: "Πόσο συχνά οι χρήστες λαμβάνουν περιληπτικά ηλεκτρονικά μηνύματα από προεπιλογή."
-    default_include_tl0_in_digests: "Συμπεριλάμβανε αναρτήσεις από νέους χρήστες στα περιληπτικά ηλεκτρονικά μηνύματα ως προεπιλογή. Οι χρήστες μπορούν να το αλλάξουν αυτό στις προτιμήσεις τους. "
-    default_email_private_messages: "Στείλε ηλεκτρονικό μήνυμα όταν κάποιος στέλνει μήνυμα στο χρήστη από προεπιλογή."
-    default_email_direct: "Στείλε ένα ηλεκτρονικό μήνυμα όταν κάποιος παραθέτει/απαντάει σε/αναφέρει ή προσκαλεί το χρήστη από προεπιλογή."
-    default_email_mailing_list_mode: "Στείλε ένα ηλεκτρονικό μήνυμα για κάθε νέα δημοσίευση από προεπιλογή."
-    default_email_mailing_list_mode_frequency: "Οι χρήστες, οι οποίοι έχουν ενεργοποιήσει την λειτουργία ταχυδρομικής λίστας θα λαμβάνουν ηλεκτρονικά μηνύματα συχνά από προεπιλογή."
-    disable_mailing_list_mode: "Απαγόρευσε στους χρήστες να ενεργοποιούν την κατάσταση καταλόγων ηλεκτρονικών διευθύνσεων. "
-    default_email_always: "Στείλε μια ειδοποίηση με ηλεκτρονικό μήνυμα, ακόμα κι όταν ο χρήστης είναι ενεργός από προεπιλογή."
-    default_email_previous_replies: "Περιέχει προηγούμενες απαντήσεις σε ηλεκτρονικά μηνύματα με ουδέτερο"
-    default_email_in_reply_to: "Συμπερίλαβε απόσπασμα της αναρτησης που απαντήθηκε σε μηνύματα ηλεκτρονικού ταχυδρομείου από προεπιλογή."
-    default_other_new_topic_duration_minutes: "Ππροεπιλεγμένη παγκόσμια κατάσταση κατά την οποία ένα νήμα θεωρείται νέο."
-    default_other_auto_track_topics_after_msecs: "Προεπιλεγμένη παγκόσμια ώρα πριν ένα νήμα παρακολουθείται αυτόματα."
-    default_other_notification_level_when_replying: "Προεπιλεγμένo παγκόσμιo επίπεδο ειδοποιήσεων όταν ένας χρήστης απαντάει σε ένα νήμα."
+    auto_close_topics_post_count: "Ανώτατο όριο αναρτήσεων που επιτρέπονται σε ένα νήμα πριν αυτό κλείσει αυτομάτως (0 για απενεργοποίηση)"
+    code_formatting_style: "Το κουμπί κώδικα στον συνθέτη θα έχει ως αποτέλεσμα αυτό το στυλ μορφοποίησης κώδικα "
+    max_allowed_message_recipients: "Μέγιστος αριθμός παραληπτών που επιτρέπονται σε ένα μήνυμα"
+    watched_words_regular_expressions: "Οι λέξεις που επιτηρούνται είναι regular expressions."
+    default_email_digest_frequency: "Πόσο συχνά οι χρήστες λαμβάνουν συνοπτικά email από προεπιλογή."
+    default_include_tl0_in_digests: "Συμπεριέλαβε αναρτήσεις από νέους χρήστες στα συνοπτικά email από προεπιλογή. Οι χρήστες μπορούν να το αλλάξουν αυτό στις προτιμήσεις τους. "
+    default_email_private_messages: "Στείλε email όταν κάποιος στέλνει μήνυμα στο χρήστη από προεπιλογή."
+    default_email_direct: "Στείλε email όταν κάποιος παραθέτει/απαντάει σε/αναφέρει ή προσκαλεί το χρήστη από προεπιλογή."
+    default_email_mailing_list_mode: "Στείλε email για κάθε νέα ανάρτηση από προεπιλογή."
+    default_email_mailing_list_mode_frequency: "Οι χρήστες, οι οποίοι έχουν ενεργοποιήσει την λειτουργία ταχυδρομικής λίστας θα λαμβάνουν emails τόσο συχνά από προεπιλογή."
+    disable_mailing_list_mode: "Απαγόρευσε στους χρήστες να ενεργοποιούν την λειτουργία ταχυδρομικής λίστας. "
+    default_email_always: "Στείλε μια ειδοποίηση με email, ακόμα κι όταν ο χρήστης είναι ενεργός από προεπιλογή."
+    default_email_previous_replies: "Συμπεριέλαβε προηγούμενες απαντήσεις στα emails από προεπιλογή."
+    default_email_in_reply_to: "Συμπερίλαβε στα emails απόσπασμα της ανάρτησης η οποία απαντήθηκε από προεπιλογή."
+    default_other_new_topic_duration_minutes: "Προεπιλεγμένη γενική κατάσταση κατά την οποία ένα νήμα θεωρείται νέο."
+    default_other_auto_track_topics_after_msecs: "Προεπιλεγμένη γενική ώρα πριν ένα νήμα παρακολουθείται αυτόματα."
+    default_other_notification_level_when_replying: "Προεπιλεγμένo γενικό επίπεδο ειδοποιήσεων όταν ένας χρήστης απαντάει σε ένα νήμα."
     default_other_external_links_in_new_tab: "Άνοιγε τους εξωτερικούς συνδέσμους σε νέα καρτέλα από προεπιλογή."
-    default_other_enable_quoting: "Ενεργοποίηση απάντησης για επιλεγμένο κείμενο από προεπιλογή"
+    default_other_enable_quoting: "Ενεργοποίηση απάντησης με παράθεση για επιλεγμένο κείμενο από προεπιλογή"
     default_other_dynamic_favicon: "Δείχνε τον αριθμό νέων/ενημερωμένων θεμάτων στο εικονίδιο του προγράμματος περιήγησης από προεπιλογή. "
-    default_other_disable_jump_reply: "Να μην μεταφέρομαι στην ανάρτηση του χρήστη αφού απαντήσουν από προεπιλογή. "
+    default_other_disable_jump_reply: "Να μην γίνεται μετάβαση στην ανάρτηση του χρήστη μετά την απάντηση από προεπιλογή. "
     default_other_like_notification_frequency: "Ειδοποίησε τους χρήστες όταν έχουν 'μου αρέσει' απο προεπιλογή. "
     default_topics_automatic_unpin: "Αυτόματο ξεκαρφίτσωμα των νημάτων, όταν ο χρήστης φτάνει στο κάτω μέρος από προεπιλογή."
-    default_categories_watching: "Κατάλογος των κατηγοριών που που παρακολουθούνται από προεπιλογή."
-    default_categories_tracking: "Κατάλογος των κατηγοριών που παρακολουθούνται από προεπιλογή."
-    default_categories_muted: "Κατάλογος των κατηγοριών που βρίσκονται σε σίγαση από προεπιλογή."
-    default_categories_watching_first_post: "Κατάλογος των κατηγοριών στις οποίες η πρώτη δημοσίευση σε κάθε νέο θέμα θα παρακολουθείται από προεπιλογή."
-    max_user_api_reqs_per_day: "Μέγιστος αριθμός χρήστη API αιτήσεις ανά κλειδί ανά μέρα"
-    max_user_api_reqs_per_minute: "Μέγιστος αριθμός χρήστη API αιτήσεις ανά κλειδί ανά λεπτό"
-    allow_user_api_keys: "Επιτρέψτε την γενιά των χρηστών API κλειδιά"
-    allow_user_api_key_scopes: "Κατάλογος των πεδίων που επιτρέπεται για τον χρήστη για API κλειδιά"
-    max_api_keys_per_user: "Μέγιστος αριθμός κλειδιών API χρήστη ανά χρήστη. "
-    min_trust_level_for_user_api_key: "Επίπεδο εμπιστοσύνης που απαιτείται για την δημιουργία κλειδιών API χρήστη. "
-    allowed_user_api_auth_redirects: "Επιτρεπόμενος σύνδεσμος για ανακατεύθυνση ταυτότητας για τον χρήστη API κλειδιά"
-    allowed_user_api_push_urls: "Επιτρεπόμενοι συνδέσμοι για την ώθηση του διακομιστή στον χρήστη API"
+    default_categories_watching: "Λίστα κατηγοριών που επιτηρούνται από προεπιλογή."
+    default_categories_tracking: "Λίστα κατηγοριών που παρακολουθούνται από προεπιλογή."
+    default_categories_muted: "Λίστα κατηγοριών που βρίσκονται σε σίγαση από προεπιλογή."
+    default_categories_watching_first_post: "Λίστα κατηγοριών στις οποίες η πρώτη ανάρτηση σε κάθε νέο νήμα θα επιτηρείται από προεπιλογή."
+    retain_web_hook_events_period_days: "Number of days to retain web hook event records."
+    allow_user_api_keys: "Επιτρέψτε την δημιουργία των user API keys"
+    allow_user_api_key_scopes: "Λίστα των πεδίων που επιτρέπεται για τα user API keys"
+    max_api_keys_per_user: "Μέγιστος αριθμός user API keys ανά χρήστη. "
+    min_trust_level_for_user_api_key: "Επίπεδο εμπιστοσύνης που απαιτείται για την δημιουργία user API keys. "
+    allowed_user_api_auth_redirects: "Επιτρεπόμενος σύνδεσμος για ανακατεύθυνση ταυτότητας για τα user API keys"
+    allowed_user_api_push_urls: "Επιτρεπόμενοι συνδέσμοι για την ώθηση του διακομιστή στο user API"
     tagging_enabled: "Ενεργοποίηση ετικετών στα θέματα; "
-    min_trust_to_create_tag: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για να δημιουργήσεις μία ετικέτα. "
+    min_trust_to_create_tag: "Το ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για να δημιουργηθεί μία ετικέτα. "
     max_tags_per_topic: "Ο μέγιστος αριθμός ετικετών που μπορούν να εφαρμοσθούν σε ένα θέμα. "
     max_tag_length: "Ο μέγιστος αριθμός χαρακτήρων που μπορούν να χρησιμοποιηθούν σε μία ετικέτα. "
     max_tag_search_results: "Ο μέγιστος αριθμός αποτελεσμάτων που μπορούν να εμφανιστούν όταν γίνεται αναζήτηση ετικετών. "
-    show_filter_by_tag: "Προβολή ενός αναπτυσσόμενου μενού για να ξεχωριστεί μία θεματική λίστα με ετικέτα. "
-    max_tags_in_filter_list: "Μέγιστος αριθμός ετικετών που φαίνονται στο ανοιγμένο μενού φίλτρων. Οι πιο συχνά χρησιμοποιημένες ετικέτες θα φαίνονται. "
-    tags_sort_alphabetically: "Εμφάνιζε τις ετικέτες με αλφαβητική σειρά. Η προεπιλογή είναι να εμφανίζονται με σειρά δημοφιλίας. "
+    show_filter_by_tag: "Εμφάνιση ενός αναπτυσσόμενου μενού για το φιλτράρισμα νήματος ανά ετικέτα. "
+    max_tags_in_filter_list: "Μέγιστος αριθμός ετικετών που εμφανίζονται στο αναπτυσσόμενο μενού φίλτρων. Θα εμφανίζονται οι πιο συχνά χρησιμοποιημένες ετικέτες. "
+    tags_sort_alphabetically: "Εμφάνιζε τις ετικέτες με αλφαβητική σειρά. Η προεπιλογή είναι να εμφανίζονται με σειρά δημοτικότητας. "
     tag_style: "Οπτικό στυλ για εμβλήματα ετικετών. "
-    staff_tags: "Μια λίστα επισημάνσεων που μπορούν να εφαρμοστούν μόνο από μέλη του προσωπικού"
-    min_trust_level_to_tag_topics: "Ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για επισήμανση νημάτων"
+    staff_tags: "Μια λίστα ετικετών που μπορούν να εφαρμοστούν μόνο από μέλη του προσωπικού"
+    min_trust_level_to_tag_topics: "Ελάχιστο επίπεδο εμπιστοσύνης που απαιτείται για προσθήκη ετικετών στα νήματα"
     suppress_overlapping_tags_in_list: "Αν μία ετικέτα ταιριάζει ακριβώς με μία λέξη στον τίτλο ενός θέματος, τότε μην εμφανίσεις την ετικέτα. "
-    remove_muted_tags_from_latest: "Μην εμφανίζεις θέματα που έχουν επισημανθεί με ετικέτες σίγασης στην λίστα με τα νεώτερα θέματα. "
+    remove_muted_tags_from_latest: "Μην εμφανίζεις θέματα που έχουν επισημανθεί με ετικέτες σε σίγαση στην λίστα με τα νεώτερα θέματα. "
     company_short_name: "Όνομα Εταιρείας (σύντομο)"
     company_full_name: "Όνομα Εταιρείας (πλήρες)"
-    company_domain: "Εταιρική Διεύθυνση Διαδικτύου"
+    company_domain: "Εταιρικό Domain"
     errors:
-      invalid_email: "Μη έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου."
+      invalid_email: "Μη έγκυρη διεύθυνση email."
       invalid_username: "Δεν υπάρχει χρήστης με αυτό το όνομα χρήστη."
       invalid_integer_min_max: "Η τιμή πρέπει να είναι μεταξύ %{min} και %{max}."
       invalid_integer_min: "Η τιμή πρέπει να είναι %{min} ή υψηλότερη."
@@ -1305,37 +1384,45 @@ el:
       regex_mismatch: "Η τιμή δεν διαθέτει την απαιτούμενη μορφή. "
       must_include_latest: "Το κορυφαίο μενού πρέπει να περιέχει την καρτέλα 'νεώτερα'."
       invalid_string: "Μη έγκυρη τιμή."
-      invalid_string_min_max: "Πρέπει να είναι μεταξύ &{min} και %{max} χαρακτήρες."
+      invalid_string_min_max: "Πρέπει να είναι μεταξύ %{min} και %{max} χαρακτήρες."
       invalid_string_min: "Πρέπει να είναι τουλάχιστον %{min} χαρακτήρες."
       invalid_string_max: "Δεν πρέπει να είναι περισσότεροι από %{max} χαρακτήρες."
-      invalid_reply_by_email_address: "Η αξία πρέπει να περιέχει '%{reply_key}' και να είναι διαφορετική από την ειδοποίηση μέσω ηλεκτρονικού ταχυδρομείου."
-      invalid_alternative_reply_by_email_addresses: "Όλες οι αξίες πρέπει να περιέχει '%{reply_key}' και να είναι διαφορετικές από την ειδοποίηση μέσω ηλεκτρονικού ταχυδρομείου."
-      pop3_polling_host_is_empty: "Θα πρέπει να στήσετε εναν 'pop3 polling host' πρίν ενεργοποιήσετε το POP3 polling."
+      invalid_reply_by_email_address: "Η αξία πρέπει να περιέχει '%{reply_key}' και να είναι διαφορετική από την ειδοποίηση μέσω email."
+      invalid_alternative_reply_by_email_addresses: "Όλες οι αξίες πρέπει να περιέχουν '%{reply_key}' και να είναι διαφορετικές από την ειδοποίηση μέσω email."
+      pop3_polling_host_is_empty: "Πρέπει να ρυθμίσετε εναν 'pop3 polling host' πρίν ενεργοποιήσετε το POP3 polling."
       pop3_polling_username_is_empty: "Πρέπει να θέσετε ένα  'pop3 polling όνομα χρήστη' πριν ενεργοποιήσετε το POP3 polling."
       pop3_polling_password_is_empty: "Πρέπει να θέσετε ένα  'pop3 polling κωδικό πρόσβασης' πριν ενεργοποιήσετε το POP3 polling."
       pop3_polling_authentication_failed: "Ο έλεγχος ταυτότητας του πρωτοκόλλου POP3 απέτυχε. Παρακαλώ επαληθεύστε τα διαπιστευτήρια σας του πρωτοκόλλου POP3."
-      reply_by_email_address_is_empty: "Πρέπει να θέσετε μια 'ηλεκτρονική διεύθυνση απάντησης' πριν ενεργοποιήσετε την δυνατότητα απάντησης με ηλεκτρονικό μήνυμα ηλεκτρονικού ταχυδρομείου. "
-      email_polling_disabled: "Πρέπει να ενεργοποιήσετε ή το χειρωνακτικό ή το  POP3 polling πριν ενεργοποιήσετε την απάντηση μέσω email"
+      reply_by_email_address_is_empty: "Πρέπει να θέσετε μια 'ηλεκτρονική διεύθυνση απάντησης' πριν ενεργοποιήσετε την δυνατότητα απάντησης μέσω email."
+      email_polling_disabled: "Πρέπει να ενεργοποιήσετε το χειροκίνητο ή το  POP3 polling πριν ενεργοποιήσετε την απάντηση μέσω email"
       user_locale_not_enabled: "Πρέπει πρώτα να ενεργοποιήσετε τη ρύθμιση 'επίτρεψε την τοποθεσία χρήστη' πριν να ενεργοποιήσετε αυτή τη ρύθμιση. "
       invalid_regex: "Το Regex δεν είναι έγκυρο ή δεν επιτρέπεται"
+      email_editable_enabled: "Θα πρέπει να απενεγοποιηθεί το 'email editable' πριν ενεργοποιηθεί αυτή η ρύθμιση."
+      enable_sso_disabled: "Θα πρέπει να ενεργοποιήσετε το 'enable sso' πριν ενεργοποιηθεί αυτή η ρύθμιση."
+      staged_users_disabled: "Θα πρέπει να ενεργοποιήσετε τους σταδιακούς χρηστες πριν ενεργοποιήσετε αυτή τη ρύθμιση."
+      reply_by_email_disabled: "Θα πρέπει να ενεργοποιήσετε την απάντηση μέσω email πριν ενεργοποιήσετε αυτή τη ρύθμιση."
   search:
     within_post: "#%{post_number} από %{username}"
     types:
       category: 'Κατηγορίες'
       topic: 'Αποτελέσματα'
       user: 'Χρήστες'
+    results_page: "Αποτελέσματα αναζήτησης για '%{term}'"
   sso:
+    login_error: "Σφάλμα Σύνδεσης"
     not_found: "Ο λογαριασμός σου δεν ήταν δυνατόν να βρεθεί. Παρακαλώ επικοινώνησε με το διαχειριστή της ιστοσελίδας."
-    account_not_approved: "Ο λογαριασμός σας βρίσκεται σε αναμονή εγκρίσεως. Θα λάβετε ειδοποίηση με ηλεκτρονικό μήνυμα όταν έχει εγκριθεί. "
+    account_not_approved: "Ο λογαριασμός σας βρίσκεται σε αναμονή εγκρίσεως. Θα λάβετε ειδοποίηση με email όταν εγκριθεί. "
     unknown_error: "Προέκυψε κάποιο πρόβλημα με το λογαριασμό σου. Παρακαλώ επικοινώνησε με το διαχειριστή της ιστοσελίδας."
     timeout_expired: "Ο χρόνος σύνδεσης του λογαριασμού έληξε, παρακαλώ προσπάθησε να συνδεθείς ξανά."
-  original_poster: "Αυτός που έκανε την αρχική ανάρτηση"
-  most_posts: "Περισσότερες δημοσιεύσεις"
-  most_recent_poster: "Αυτός που έκανε την πιο πρόσφατη ανάρτηση"
-  frequent_poster: "Αυτός που κάνει αναρτήσεις συχνά"
+    no_email: "Δεν καταχωρήθηκε διεύθυνση email. Παρακαλούμε επικοινωνήστε με την διαχείριση."
+    email_error: "Ένας λογαριασμός δεν μπόρεσε να καταχωρηθεί με την διεύθυνση email <b>%{email}</b>. Παρακαλούμε επικοινωνήστε με την διαχείριση."
+  original_poster: "Αρχικός Αναρτητής"
+  most_posts: "Περισσότερες Αναρτήσεις"
+  most_recent_poster: "Πιο Πρόσφατος Αναρτητής"
+  frequent_poster: "Συχνός Αναρτητής"
   redirected_to_top_reasons:
-    new_user: "Καλώς ήλθες στην κοινότητά μας! Αυτά είναι τα πιο δημοφιλή πρόσφατα νήματα."
-    not_seen_in_a_month: "Καλώς ήλθες πίσω! Δε σε έχουμε δει για αρκετό καιρό. Αυτά είναι τα πιο δημοφιλή νήματα, από τότε που απομακρύνθηκες."
+    new_user: "Καλώς ήλθες στην κοινότητά μας! Αυτά είναι τα πιο δημοφιλή πρόσφατα νήματα συζητήσεων."
+    not_seen_in_a_month: "Καλώς ήλθες και πάλι! Δε σε έχουμε δει για αρκετό καιρό. Αυτά είναι τα πιο δημοφιλή νήματα συζητήσεων από την τελευταία σου επίσκεψη."
   merge_posts:
     edit_reason:
       one: "Μία δημοσίευση συγχωνεύθηκε από %{username}"
@@ -1346,13 +1433,13 @@ el:
   move_posts:
     new_topic_moderator_post:
       one: "Μια ανάρτηση διαχωρίστηκε σε ένα νέο νήμα: %{topic_link}"
-      other: "Αναρτήσεις %{count} διαχωρίσθηκαν σε ένα νέο νήμα: %{topic_link}"
+      other: "%{count} αναρτήσεις διαχωρίσθηκαν σε ένα νέο νήμα: %{topic_link}"
     existing_topic_moderator_post:
-      one: "Μία δημοσίευση συγχωνεύθηκε σε ένα υπάρχον νήμα: %{topic_link}"
-      other: "%{count} δημοσιεύσεις συγχωνεύθηκαν σε ένα υπάρχον νήμα: %{topic_link}"
+      one: "Μία ανάρτηση συγχωνεύθηκε σε ένα υπάρχον νήμα: %{topic_link}"
+      other: "%{count} αναρτήσεις συγχωνεύθηκαν σε ένα υπάρχον νήμα: %{topic_link}"
   change_owner:
     post_revision_text: "Η κυριότητα μεταφέρεται από %{old_user} σε %{new_user}."
-    deleted_user: "ένας χρήστης που έχει διαγραφεί "
+    deleted_user: "έναν διεγραμμένο χρήστη"
   topic_statuses:
     archived_enabled: "Αυτό το νήμα είναι τώρα αρχειοθετημένο. Έχει παγώσει και δεν μπορεί να τροποποιηθεί με κανένα τρόπο."
     archived_disabled: "Αυτό το νήμα δεν είναι τώρα αρχειοθετημένο. Δεν είναι πια παγωμένο και μπορεί να τροποποιηθεί."
@@ -1382,153 +1469,142 @@ el:
     autoclosed_enabled_lastpost_minutes:
       one: "Αυτό το νήμα έκλεισε αυτόματα 1 λεπτό μετά την τελευταία απάντηση. Δεν επιτρέπονται πια καινούριες απαντήσεις."
       other: "Αυτό το νήμα έκλεισε αυτόματα %{count} λεπτά μετά την τελευταία απάντηση. Δεν επιτρέπονται πια νέες απαντήσεις."
+    autoclosed_disabled_days:
+      one: "Το νήμα αυτό ανοίχτηκε αυτόματα μετά από 1 ημέρα."
+      other: "Το νήμα αυτό ανοίχτηκε αυτόματα μετά από %{count} ημέρες."
+    autoclosed_disabled_hours:
+      one: "Το νήμα αυτό ανοίχτηκε αυτόματα μετά από 1 ώρα."
+      other: "Το νήμα αυτό ανοίχτηκε αυτόματα μετά από %{count} ώρες."
+    autoclosed_disabled_minutes:
+      one: "Το νήμα αυτό ανοίχτηκε αυτόματα μετά από 1 λεπτό."
+      other: "Το νήμα αυτό ανοίχτηκε αυτόματα μετά από %{count} λεπτά."
+    autoclosed_disabled_lastpost_days:
+      one: "Το νήμα αυτό ανοίχτηκε αυτόματα 1 ημέρα μετά την τελευταία απάντηση."
+      other: "Το νήμα αυτό ανοίχτηκε αυτόματα %{count} ημέρες μετά την τελευταία απάντηση."
+    autoclosed_disabled_lastpost_hours:
+      one: "Το νήμα αυτό ανοίχτηκε αυτόματα 1 ώρα μετά την τελευταία απάντηση."
+      other: "Το νήμα αυτό ανοίχτηκε αυτόματα %{count} ώρες μετά την τελευταία απάντηση."
+    autoclosed_disabled_lastpost_minutes:
+      one: "Το νήμα αυτό ανοίχτηκε αυτόματα 1 λεπτό μετά την τελευταία απάντηση."
+      other: "Το νήμα αυτό ανοίχτηκε αυτόματα %{count} λεπτά μετά την τελευταία απάντηση."
     autoclosed_disabled: "Αυτό το νήμα είναι τώρα ανοικτό. Επιτρέπονται νέες απαντήσεις."
-    autoclosed_disabled_lastpost: "Το νήμα είναι τώρα ανοιχτό. Επιτρέπονται νέες απαντήσεις."
-    pinned_enabled: "Αυτό το νήμα είναι τώρα καρφιτσωμένο. Θα εμφανίζεται στην κορυφή της κατηγορίας του, έως ότου ξεκαρφιτσωθεί από το προσωπικό για κάποιον, ή από ατομικούς χρήστες για τον εαυτό τους."
+    autoclosed_disabled_lastpost: "Αυτό το νήμα είναι τώρα ανοικτό. Επιτρέπονται νέες απαντήσεις."
+    pinned_enabled: "Αυτό το νήμα είναι τώρα καρφιτσωμένο. Θα εμφανίζεται στην κορυφή της κατηγορίας του έως ότου ξεκαρφιτσωθεί από τους συνεργάτες για όλους ή από τους χρήστες για τον εαυτό τους."
     pinned_disabled: "Αυτό το νήμα δεν είναι τώρα καρφιτσωμένο. Δε θα εμφανίζεται πια στην κορυφή της κατηγορίας."
-    pinned_globally_enabled: "Αυτό το νήμα είναι τώρα καρφιτσωμένο παγκοσμίως. Θα εμφανίζεται στην κορυφή της κατηγορίας και σε όλες τις καταχωρήσεις νημάτων μέχρι να ξεκαρφιτσωθεί για όλους από το προσωπικό, ή από ατομικούς χρήστες για τον εαυτό τους."
+    pinned_globally_enabled: "Αυτό το νήμα είναι τώρα καρφιτσωμένο γενικά. Θα εμφανίζεται στην κορυφή της κατηγορίας και σε όλες τις λίστες νημάτων μέχρι να ξεκαρφιτσωθεί από τους συνεργάτες για όλους ή από τους χρήστες για τον εαυτό τους."
     pinned_globally_disabled: "Αυτό το νήμα δεν είναι τώρα καρφιτσωμένο. Δε θα εμφανίζεται πια στην κορυφή της κατηγορίας."
-    visible_enabled: "Αυτό το νήμα είναι τώρα καταχωρημένο. Θα εμφανίζεται στις καταχωρήσεις νημάτων."
-    visible_disabled: "Αυτό το νήμα δεν είναι πια καταχωρημένο. Δε θα εμφανίζεται πλέον σε καμιά καταχώρηση νημάτων. Ο μόνος τρόπος να αποκτήσεις πρόσβαση σε αυτό το νήμα είναι μέσω άμεσου συνδέσμου."
+    visible_enabled: "Αυτό το νήμα είναι τώρα καταχωρημένο. Θα εμφανίζεται στις λίστες νημάτων."
+    visible_disabled: "Αυτό το νήμα δεν είναι πια καταχωρημένο. Δε θα εμφανίζεται πλέον σε καμιά λίστα νημάτων. Ο μόνος τρόπος να αποκτήσεις πρόσβαση σε αυτό το νήμα είναι μέσω άμεσου συνδέσμου."
+    auto_deleted_by_timer: "Διεγράφη αυτόματα με χρονοπρογραμματισμό."
   login:
-    not_approved: "Ο λογαριασμός σου δεν έχει εγκριθεί ακόμα. Θα λάβεις ειδοποίηση με ηλεκτρονικό μήνυμα, όταν θα είσαι έτοιμος να συνδεθείς."
-    incorrect_username_email_or_password: "Λάθος όνομα χρήστη, διεύθυνση ηλεκτρονικού ταχυδρομείου ή κωδικός προσβασης"
+    not_approved: "Ο λογαριασμός σου δεν έχει εγκριθεί ακόμα. Θα λάβεις ειδοποίηση με email όταν θα είσαι έτοιμος να συνδεθείς."
+    incorrect_username_email_or_password: "Λάθος όνομα χρήστη, διεύθυνση email ή κωδικός προσβασης"
     wait_approval: "Ευχαριστούμε για την εγγραφή σας. Θα σας ενημερώσουμε όταν ο λογαριασμός σας εγκριθεί."
     active: "Ο λογαριασμός σας έχει ενεργοποιηθεί και είναι έτοιμος προς χρήση"
-    not_activated: "Δεν μπορείς να συνδεθείς ακόμα. Σου έχουμε στείλει ένα ηλεκτρονικό μήνυμα ενεργοποίησης. Παρακαλώ, ακολούθησε τις οδηγίες που υπάρχουν στο μήνυμα για να ενεργοποιήσεις τον λογαριασμό σου."
+    activate_email: "<p>Έχετε σχεδόν ολοκληρώσει! Σας έχουμε στείλει ένα mail ενεργοποίησης λογαριασμού στην διεύθυνση <b>%{email}</b>. Παρακαλούμε ακολουθήστε τις οδηγίες σε αυτό το mail για να ενεργοποιήσετε τον λογαριασμό σας.</p><p>Σε περίπτωση που δεν λάβετε το μήνυμα, παρακαλούμε ελέγξτε τον φάκελο spam.</p>"
+    not_activated: "Δεν μπορείς να συνδεθείς ακόμα. Σου έχουμε στείλει ένα email ενεργοποίησης. Παρακαλώ ακολούθησε τις οδηγίες που θα βρεις στο μήνυμα αυτό για να ενεργοποιήσεις τον λογαριασμό σου."
     not_allowed_from_ip_address: "Δεν μπορείς να συνδεθείς ως %{username} από αυτή τη διεύθυνση IP."
     admin_not_allowed_from_ip_address: "Δεν μπορείς να συνδεθείς ως διαχειριστής από αυτή τη διεύθυνση IP."
-    suspended: "Δεν μπορείς να συνδεθείς μέχρι %{date}."
+    suspended: "Δεν μπορείς να συνδεθείς μέχρι τις %{date}."
     suspended_with_reason: "Ο λογαριασμός θα είναι αποκλεισμένος μέχρι τις %{date}: %{reason}"
     errors: "%{errors}"
     not_available: "Δεν είναι διαθέσιμο. Προσπάθησε %{suggestion};"
-    something_already_taken: "Κάτι πήγε στραβά, ίσως το όνομα χρήστη ή η διεύθυνση ηλεκτρονικού ταχυδρομείου υπάρχει ήδη. Δοκίμασε τον σύνδεσμο \"ξέχασα τον κωδικό μου\"."
+    something_already_taken: "Κάτι πήγε στραβά, ίσως το όνομα χρήστη ή η διεύθυνση email υπάρχει ήδη. Δοκίμασε τον σύνδεσμο \"ξέχασα τον κωδικό μου\"."
     omniauth_error: "Συγνώμη, παρουσιάστηκε σφάλμα κατά την εξουσιοδότηση του λογαριασμού σας. Μήπως δεν εγκρίνατε την διαδικασία εξουσιοδότησης; "
     omniauth_error_unknown: "Κάτι πήγε στραβά κατά τη διαδικασία σύνδεσης, παρακαλώ προσπάθησε ξανά."
-    authenticator_error_no_valid_email: "Δεν επιτρέπονται διευθύνσεις ηλεκτρονικού ταχυδρομείου σχετικές με %{account}. ίσως να χρειαστεί να διαμορφώσετε τον λογαριασμό σας με μια διαφορετική διεύθυνση ηλεκτρονικού ταχυδρομείου. "
+    authenticator_error_no_valid_email: "Δεν επιτρέπονται διευθύνσεις email σχετικές με %{account}. ίσως να χρειαστεί να διαμορφώσετε τον λογαριασμό σας με μια διαφορετική διεύθυνση email. "
     new_registrations_disabled: "Νέες εγγραφές λογαριασμών δεν επιτρέπονται αυτή τη στιγμή."
     password_too_long: "Οι κωδικοί πρόσβασης περιορίζονται σε 200 χαρακτήρες."
-    email_too_long: "Η ηλεκτρονική διεύθυνση που δώσατε είναι πολύ μεγάλη. Οι ηλεκτρονικές διευθύνσεις δεν πρέπει να είναι περισσότερο από 254 χαρακτήρες, και η διεύθυνση Διαδικτύου δεν πρέπει να είναι περισσότερο απο 253 χαρακτήρες."
-    reserved_username: "Αυτό το χρηστώνυμο δεν είναι επιτρεπτό."
+    email_too_long: "Η διεύθυνση email που δώσατε είναι πολύ μεγάλη. Οι ηλεκτρονικές διευθύνσεις δεν πρέπει να είναι περισσότερο από 254 χαρακτήρες, και η διεύθυνση Διαδικτύου δεν πρέπει να είναι περισσότερο απο 253 χαρακτήρες."
+    reserved_username: "Αυτό το όνομα χρήστη δεν είναι επιτρεπτό."
     missing_user_field: "Δεν έχετε συμπληρώσει όλα τα πεδία χρήστη"
-    close_window: "Η αυθεντικοποιήση έχει ολοκληρωθεί. Κλείστε αυτό το παράθυρο για να συνεχίσετε."
+    auth_complete: "Η ταυτοποιήση έχει ολοκληρωθεί."
+    click_to_continue: "Κλικ εδώ για να συνεχίσετε."
     already_logged_in: "Ουπς, φαίνεται ότι προσπαθείς να αποδεχθείς μια πρόσκληση για άλλον χρήστη. Εάν δεν εισαι %{current_user}, παρακαλώ αποσυνδέσου και δοκίμασε ξανά."
   user:
     no_accounts_associated: "Δεν υπάρχουν σχετικοί λογαριασμοί"
-    deactivated: "Απενεργοποιήθηκε εξαιτίας των πολλών μηνυμάτων ηλεκτρονικού ταχυδρομείου που επέστρεψαν πίσω στο %{email}'."
-    deactivated_by_staff: "Απενεργοποιημένο από το προσωπικό"
-    activated_by_staff: "Ενεργοποιημένο από το προσωπικό"
+    deactivated: "Απενεργοποιήθηκε εξαιτίας των πολλών μηνυμάτων email που επέστρεψαν πίσω στο %{email}'."
+    deactivated_by_staff: "Απενεργοποιήθηκε από τους συνεργάτες"
+    activated_by_staff: "Ενεργοποιήθηκε από τους συνεργάτες"
+    new_user_typed_too_fast: "Ο νέος χρήστης πληκτρολογούσε πολύ γρήγορα"
+    content_matches_auto_block_regex: "Content matches auto block regex"
     username:
       short: "πρέπει να είναι τουλάχιστον %{min} χαρακτήρες"
       long: "δεν πρέπει να είναι περισσότερο από %{max} χαρακτήρες"
-      characters: "πρέπει να συμπεριλαμβάνει μόνο αριθμούς, γράμματα και κάτω παύλες"
+      characters: "πρέπει να περιέχει μόνο αριθμούς, γράμματα, παύλες και κάτω παύλες"
       unique: "πρέπει να είναι μοναδικό"
-      blank: "πρέπει να είναι παρών"
+      blank: "πρέπει να υπάρχει"
       must_begin_with_alphanumeric_or_underscore: "πρέπει να αρχίζει με ένα γράμμα, έναν αριθμό ή μια κάτω παύλα"
       must_end_with_alphanumeric: "πρεπει να τελειώνει με ένα γράμμα ή έναν αριθμό"
-      must_not_contain_two_special_chars_in_seq: "δεν πρέπει να περιέχει 2 ή περισσότερους ξεχωριστούς χαρακτήρες συνεχόμενους (.-_)"
-      must_not_end_with_confusing_suffix: "δεν πρέπει να τελειώνει με μια μπερδεμένη κατάλυξη όπως .json ή .png κτλ."
+      must_not_contain_two_special_chars_in_seq: "δεν πρέπει να περιέχει 2 ή περισσότερους συνεχόμενους ειδικούς χαρακτήρες (.-_)"
+      must_not_end_with_confusing_suffix: "δεν πρέπει να τελειώνει με μια μπερδεμένη κατάληξη όπως .json ή .png κτλ."
     email:
-      not_allowed: "δεν επιτρέπεται από τον πάροχο του ηλεκτρονικού μηνύματος. Παρακαλώ χρησιμοποίησε μια άλλη διεύθυνση ηλεκτρονικού ταχυδρομείου."
+      not_allowed: "δεν επιτρέπεται από αυτόν τον πάροχο email. Παρακαλώ χρησιμοποίησε μια άλλη διεύθυνση email."
       blocked: "δεν είναι επιτρεπτό."
-      revoked: "Δεν θα στέλνονται emails στο '%{email}' μέχρι τις %{ημερομηνια}."
+      revoked: "Δεν θα στέλνονται emails στο '%{email}' μέχρι τις %{date}."
     ip_address:
       blocked: "Δεν επιτρέπονται νεές εγγραφές από την IP  διεύθυνσή σου."
       max_new_accounts_per_registration_ip: "Δεν επιτρέπονται νεές εγγραφές από την IP  διεύθυνσή σου (το ανώτατο όριο έχει επιτευχθεί). Επικοινώνησε με ένα μέλος του προσωπικού."
     website:
-      domain_not_allowed: "Η ιστοσελίδα δεν είναι έγκυρη. Τα επιτρεπόμενα πεδία είναι: &{πεδία}"
+      domain_not_allowed: "Η ιστοσελίδα δεν είναι έγκυρη. Τα επιτρεπόμενα domains είναι: %{domains}"
+    auto_rejected: "Απορρίφθηκε αυτόματα λόγω παλαιότητας. Δες την ρύθμιση auto_handle_queued_age της ιστοσελίδας."
   flags_reminder:
+    flags_were_submitted:
+      one: "Οι σημάνσεις έχουν καταχωρηθεί πάνω από 1 ώρα πριν. [Παρακαλούμε ελέγξτε τις](/admin/flags)."
+      other: "Οι σημάνσεις έχουν καταχωρηθεί πάνω από %{count} ώρες πριν. [Παρακαλούμε ελέγξτε τις](/admin/flags)."
     subject_template:
       one: "1 επισήμανση περιμένει να διαχειριστεί"
       other: "%{count} επισημάνσεις περιμένουν να διαχειριστούν"
   unsubscribe_mailer:
-    title: "Διαγραφή αποστολέα"
-    subject_template: "Επιβεβαιώστε ότι δε θέλετε να λαμβάνετε πλέον εξελίξεις μέσω email από %{ιστοσελίδα_τίτλος}"
+    title: "Απεγγραφή"
+    subject_template: "Επιβεβαιώστε ότι δε θέλετε να λαμβάνετε πλέον ενημερώσεις μέσω email από %{site_title}"
     text_body_template: |
-      Κάποιος (ίσως εσύ;) ζήτησε να μην αποστέλλονται ενημερώσεις με μήνυμα ηλεκτρονικού ταχυδρομείου από το %{site_domain_name} σε αυτή τη διεύθυνση.
+      Κάποιος (ίσως εσύ;) ζήτησε να μην αποστέλλονται ενημερώσεις με email από το %{site_domain_name} σε αυτή τη διεύθυνση.
       Εάν επιθυμείς να το επιβεβαιώσεις, παρακαλούμε πάτησε αυτό το σύνδεσμο:
 
       %{confirm_unsubscribe_link}
 
 
-      Εάν θέλεις να συνεχίσεις να λαμβάνεις ενημερώσεις με μηνύματα ηλεκτρονικού ταχυδρομείου, μπορείς να αγνοήσεις αυτό το μήνυμα ηλεκτρονικού ταχυδρομείου.
+      Εάν θέλεις να συνεχίσεις να λαμβάνεις ενημερώσεις με email, μπορείς να αγνοήσεις αυτό το email.
   invite_mailer:
-    title: "Προσκάλεσε τον αποστολέα"
-    subject_template: "%{invitee_name} σε προσκάλεσε σε '%{topic_title}' πάνω σε %{site_domain_name}"
-    text_body_template: |
-      %{όνομα_προσκεκλημένου} σας προσκάλεσε σε μία συζήτηση
-
-      > **%{τίτλος_νήματος}**
-      >
-      > %{περιγραφή_νήματος}
-
-      στο
-
-      > %{τίτλος_ιστοτόπου} -- %{περιγραφή_ιστοτόπου}
-
-      Εάν σε ενδιαφέρει, κάνε κλικ στο σύνδεσμο παρακάτω:
-
-      %{σύνδεσμος_πρόσκλησης}
+    title: "Αποστολή Προσκλήσεων"
   custom_invite_mailer:
-    title: "Προσαρμοσμένη Πρόσκληση Ταχυδρομείου"
-    subject_template: "%{invitee_name} σε προσκάλεσε στο %{topic_title}' του %{site_domain_name}"
-    text_body_template: |
-      %{όνομα_προσκεκλημένου} σας προσκάλεσε σε μία συζήτηση
-
-      > **%{τίτλος_νήματος}**
-      >
-      > %{περιγραφή_νήματος}
-
-      στο
-
-      > %{τίτλος_ιστοτόπου} -- %{περιγραφή_ιστοτόπου}
-
-      Με αυτή τη σημείωση
-
-      > %{εξατομίκευση_μηνύματος_χρήστη}
-
-      Εάν σε ενδιαφέρει, κάνε κλικ στο σύνδεσμο παρακάτω:
-
-      %{σύνδεσμος_πρόσκλησης}
-
-      Αυτή η πρόσκληση προέρχεται από έμπιστο χρήστη, επομένως ένας λογαριασμός θα δημιουργηθεί αυτόματα για εσένα χρησιμοποιώντας αυτή τη διεύθυνση ηλεκτρονικού ταχυδρομείου.
+    title: "Προσαρμοσμένη Αποστολή Προσκλήσεων"
   invite_forum_mailer:
-    title: "Προσκαλέστε τον Μέιλερ του Φόρουμ"
-    subject_template: "%{invitee_name} σε προσκάλεσε να συμμετέχεις στο %{site_domain_name}"
-    text_body_template: |+
-      %{όνομα_προσκεκλημένου} σας προσκάλεσε να γίνετε μέλος
-
-      > **%{τίτλος_ιστοτόπου}**
-      >
-      > %{περιγραφή_ιστοτόπου}
-
-      Εάν σε ενδιαφέρει, κάνε κλικ στο σύνδεσμο παρακάτω:
-
-      %{σύνδεσμος_πρόσκλησης}
-
+    title: "Αποστολή Προσκλήσεων Forum"
   custom_invite_forum_mailer:
-    subject_template: "%{invitee_name} σε προσκάλεσε να συμμετέχεις στο %{site_domailn_name}"
-    text_body_template: |
-      %{όνομα_προσκεκλημένου} σας προσκάλεσε να γίνετε μέλος
-
-      > **%{τίτλος_ιστοτόπου}**
-      >
-      > %{περιγραφή_ιστοτόπου}
-
-      Με αυτή τη σημείωση
-
-      > %{εξατομίκευση_μηνύματος_χρήστη}
-
-      Εάν σε ενδιαφέρει, κάνε κλικ στο σύνδεσμο παρακάτω:
-
-      %{σύνδεσμος_πρόσκλησης}
-
-      Αυτή η πρόσκληση προέρχεται από έμπιστο χρήστη, επομένως ένας λογαριασμός θα δημιουργηθεί αυτόματα για εσένα χρησιμοποιώντας αυτή τη διεύθυνση ηλεκτρονικού ταχυδρομείου.
+    title: "Προσαρμογή Πρόσκλησης Forum "
   invite_password_instructions:
-    title: "Προσκάλεσε οδηγίες κωδικού"
-    subject_template: "Όρισε κωδικό πρόσβασης για τον λογαρισμό σου %{όνομα_ιστοσελίδας}"
+    title: "Οδηγίες Κωδικού Πρόσκλησης"
+    subject_template: "Όρισε κωδικό πρόσβασης για τον λογαρισμό σου %{site_name}"
+    text_body_template: |
+      Ευχαριστούμε που αποδεχτήκατε την πρόσκληση στην %{site_name} -- καλώς ήρθατε!
+
+      Κάντε κλικ στον παρακάτω σύνδεσμο για να επιλέξετε τον κωδικό πρόσβασής σας:
+      %{base_url}/u/password-reset/%{email_token}
+
+      (Σε περίπτωση που ο παραπάνω σύνδεσμος έχει λήξει, επιλέξτε "ξέχασα τον κωδικό μου" όταν συνδέεστε με την διεύθυνση email σας.)
+  download_backup_mailer:
+    title: "Αποστολή Αντιγράφων Ασφαλείας"
+    subject_template: "[%{email_prefix}] Λήψη Αντιγράφου Ασφαλείας Ιστοσελίδας"
+    text_body_template: |
+      Αυτό είναι το [site backup download](%{backup_file_path}) που ζητήσατε.
+
+      Στείλαμε τον σύνδεσμο λήψης στην έγκυρη διεύθυνση email σας για λόγους ασφαλείας.
+
+      (Αν δεν ζητήσατε *εσείς* αυτό το αρχείο, τότε θα πρέπει να ανησυχήσετε -- κάποιος έχει πρόσβαση διαχειριστή στην ιστοσελίδα σας.)
+    no_token: |
+      Λυπούμαστε, ο σύνδεσμος λήψης του αντιγράφου ασφαλείας έχει ήδη χρησιμοποιηθεί ή έχει λήξει.
+  admin_confirmation_mailer:
+    title: "Επικύρωση Διαχειριστή"
+    subject_template: "[%{email_prefix}] Επιβεβαίωση νέου Λογαριασμού Διαχειριστή"
+    text_body_template: |
+      Παρακαλούμε επιβεβαιώστε ότι θέλετε να προσθέστε τον **%{target_username}** ως διαχειριστή στην ιστοσελίδα σας.
+
+      [Επιβεβαίωση Λογαριασμού Διαχειριστή](%{admin_confirm_url})
   test_mailer:
-    title: "Δοκιμάστε τον αποστολέα"
+    title: "Δοκιμαστική Αποστολή"
+    subject_template: "[%{email_prefix}] Email Deliverability Test"
     text_body_template: |
       Αυτό είναι το πρώτο δοκιμαστικό μήνυμα ηλεκτρονικού ταχυδρομείου από
 
@@ -1571,87 +1647,73 @@ el:
       [mj]: https://www.mailjet.com/pricing
       [mt]: http://www.mail-tester.com/
   new_version_mailer:
-    title: "Καινούργια έκδοση Αποστολέα"
-    text_body_template: |
-      Ζήτω, μια νέα έκδοση του [Discourse](http://www.discourse.org) είναι διαθέσιμη!
-
-      Η έκδοσή σου: %{εγκατεστημένη_έκδοση}
-      Η νέα έκδοση: **%{νέα_έκδοση}**
-
-      - Λάβε την ενημέρωση εύκολα χρησιμοποιώντας **[ενημέρωση περιηγητή με ένα κλικ](%{base_url}/admin/upgrade)**
-
-      - Δες τι νέο υπάρχει [GitHub changelog](https://github.com/discourse/discourse/commits/master)
-
-      - Επισκέψου [meta.discourse.org](https://meta.discourse.org) για νέα, συζήτηση, και υποστήριξη για το Discourse
+    title: "Αποστολή Καινούργιας Έκδοσης"
+    subject_template: "[%{email_prefix}] Νέα έκδοση Discourse, διαθέσιμη ενημέρωση"
   new_version_mailer_with_notes:
-    title: "Καινούργια έκδοση Αποστολέα με Σημειώσεις"
-    text_body_template: |
-      Γιούπιιι, μια νέα έκδοση του [Discourse](http://www.discourse.org) είανι διαθέσιμη!
-
-      Η έκδοσή σου: %{εγκατεστημένη_έκδοση}
-      Η νέα έκδοση: **%{νέα_έκδοση}**
-
-      - Λάβε την ενημέρωση εύκολα χρησιμοποιώντας **[ενημέρωση περιηγητή με ένα κλικ](%{base_url}/admin/upgrade)**
-
-      - Δες τι νέο υπάρχει [GitHub changelog](https://github.com/discourse/discourse/commits/master)
-
-      - Επισκέψου [meta.discourse.org](https://meta.discourse.org) για νέα, συζήτηση, και υποστήριξη για το Discourse
-
-      ### Απελευθέρωση σημειώσεων
-
-      %{notes}
-  queued_posts_reminder:
-    title: "Υπενθύμιση μηνυμάτων σε αναμονή."
-    text_body_template: |
-      Γεια σου,
-
-      αναρτήσεις από νέους χρήστες έχουν ανασταλλεί για συντονισμό και είναι σε αναμονή για εξέταση. [Approve or reject them here](%{base_url}/queued-posts).
+    title: "Αποστολή Καινούργιας Έκδοσης με Σημειώσεις"
+    subject_template: "[%{email_prefix}] διαθέσιμη ενημέρωση"
   flag_reasons:
     off_topic: "Η ανάρτησή σου επισημάθηκε ως **εκτός θέματος**: η κοινότητα πιστεύει ότι δεν ταιριάζει με το νήμα, όπως ορίζεται από τον τίτλο και την πρώτη ανάρτηση αυτή τη στιγμή. "
-    inappropriate: "Η δημοσίευσή σου επισημάνθηκε ως \"ακατάλληλη\": η κοινότητα θεωρεί ότι είναι προσβλητική, υβριστική ή παραβίαση των [οδηγιών της κοινότητας](/οδηγίες)."
+    inappropriate: "Η δημοσίευσή σου επισημάνθηκε ως \"ακατάλληλη\": η κοινότητα θεωρεί ότι είναι προσβλητική, υβριστική ή παραβιάζει τον [οδηγό χρήσης της κοινότητας](/οδηγίες)."
     spam: "Η δημοσίευσή σου επισημάνθηκε ως \"ανεπιθύμητη\": η κοινότητα θεωρεί ότι πρόκειται για διαφήμιση ή κάτι που αφορά προώθηση και δεν είναι χρήσιμη ή σχετική με το νήμα όπως αναμενόταν."
-    notify_moderators: "Η ανάρτησή σου επισημάνθηκε ως **προς την προσοχή του συντονιστή**: η κοινότητα πιστεύει ότι κάτι σχετικά με την ανάρτηση απαιτεί χειροκίνητη παρέμβαση από ένα συνεργάτη."
+    notify_moderators: "Η ανάρτησή σου επισημάνθηκε **προς έλεγχο από συντονιστή**. Η κοινότητα πιστεύει ότι κάτι σχετικά με την ανάρτησή σου, απαιτεί την παρέμβαση ενός συνεργάτη."
   flags_dispositions:
     agreed: "Ευχαριστούμε που μας ενημερώσατε. Συμφωνούμε ότι υπάρχει κάποιο θέμα και το εξετάζουμε."
     agreed_and_deleted: "Ευχαριστούμε που μας ενημερώσατε. Συμφωνούμε ότι υπάρχει κάποιο θέμα και έχουμε απομακρύνει τη δημοσίευση."
     disagreed: "Ευχαριστούμε που μας ειδοποιήσατε. Το εξετάζουμε."
     deferred: "Ευχαριστούμε που μας ειδοποιήσατε. Το εξετάζουμε."
-    deferred_and_deleted: "Ευχαριστούμε που μας ειδοποίησες. Έχουμε αφαιρέσει τη δημοσίευση."
+    deferred_and_deleted: "Ευχαριστούμε που μας ειδοποιήσατε. Έχουμε αφαιρέσει τη δημοσίευση."
+  temporarily_closed_due_to_flags:
+    one: "Αυτό το νήμα έχει κλείσει προσωρινά για 1 ώρα λόγω μεγάλου αριθμού σημάνσεων από την κοινότητα."
+    other: "Αυτό το νήμα έχει κλείσει προσωρινά για %{count} ώρες λόγω μεγάλου αριθμού σημάνσεων από την κοινότητα."
   system_messages:
+    private_topic_title: "Νήμα #%{id}"
+    contents_hidden: "Παρακαλώ επισκεφθείτε αυτή την ανάρτηση για να δείτε τα περιεχόμενά της."
     post_hidden:
-      title: "Η δημοσίευση κρύφτηκε"
-      subject_template: "Η δημοσίευση κρύφτηκε από τις επισημάνσεις της κοινότητας"
+      title: "Η ανάρτηση κρύφτηκε"
+      subject_template: "Η ανάρτηση κρύφτηκε λόγω των επισημάνσεων της κοινότητας"
+    usage_tips:
       text_body_template: |
-        Γεια σου,
-
-        Αυτό είναι αυτοματοποιημένο μήνυμα από %{site_name} tγια να σε ενημερώσει ότι η ανάρτησή σου έχει αποκρυφθεί.
-
-        %{βάση_url}%{url}
-
-        %{λόγος_επισήμανσης}
-
-        Πολλά μέλη της κοινότητας επισήμαναν αυτή την ανάρτηση πριν αποκρυφθεί, οπότε σε παρακαλούμε σκέψου πως μπορείς να επαναλάβεις την ανάρτηση λαμβάνοντας υπόψιν τα σχόλια τους. **Μπορείς να επεξεργαστείς την ανάρτησή σου μετά από %{edit_delay} λεπτά, και αυτόματα θα επανεμφανιστεί.**
-
-        Όμως, εάν η ανάρτηση αποκρυφθεί από την κοινότητα για δεύτερη φορά, θα παραμείνει κρυμμένη έως ότου διαχειριστεί απο συνεργάτη, και ίσως υπάρξουν περαιτέρω ενέργειες συμπεριλαμβανομένης την πιθανής διακοπής του λογαριασμού σου.
-
-        Για επιπλεον καθοδήγηση, παρακαλούμε ανάτρεξε στις [οδηγίες κοινότητας](%{base_url}/guidelines).
+        Με την συμμετοχή σου στην κοινότητα θα γνωριστούμε καλύτερα και οι περιορισμοί που έχεις ως νεός χρήστης θα αρθούν. Με τον καιρό θα σου δοθούν περισσότερα δικαιώματα και νέες δυνατότητες με τις οποίες θα μπορείς κι εσύ να μας βοηθήσεις να κάνουμε μαζί την κοινότητά μας καλύτερη.
     welcome_user:
-      title: "Καλώς ήλθες χρήστη"
-      subject_template: "Καλώς ήλθατε στο %{site_name}!"
+      title: "Καλωσόρισμα Χρήστη"
+      subject_template: "Καλώς ήλθατε στην %{site_name}!"
+      text_body_template: |
+        Ευχαριστούμε για την εγγραφή σας στην %{site_name}, καλώς ορίσατε!
+
+        %{new_user_tips}
+
+        Πιστεύουμε και επικροτούμε την [πολιτισμένη επικοινωνία](%{base_url}/guidelines) στο διαδίκτυο.
+
+        Να περάσετε καλά!
     welcome_invite:
-      title: "Πρόσκληση καλωσορίσματος"
-      subject_template: "Καλώς ήλθατε στο %{site_name}!"
+      title: "Πρόσκληση Καλωσορίσματος"
+      subject_template: "Καλώς ήλθατε στην %{site_name}!"
+      text_body_template: |
+        Ευχαριστούμε για την αποδοχή της πρόσκλησης στην %{site_name} -- καλώς ορίσατε!
+
+        - Δημιουργήσαμε αυτόν τον νέο λογαριασμό χρήστη **%{username}** για εσάς. Αλλάξτε το όνομα και τον κωδικό σας από την [σελίδα προφίλ][prefs].
+
+        - Όταν συνδέεστε, παρακαλούμε **χρησιμοποιήστε την διεύθυνση email της αρχικής πρόσκλησης** — για να μπορέσουμε να σας ταυτοποιήσουμε!
+
+        %{new_user_tips}
+
+        Πιστεύουμε και επικροτούμε την [πολιτισμένη επικοινωνία](%{base_url}/guidelines) στο διαδίκτυο.
+
+        Να περάσετε καλά!
+
+        [prefs]: %{user_preferences_url}
     backup_succeeded:
       title: "Το αντίγραφο ασφαλείας πέτυχε"
       subject_template: "Το αντίγραφο ασφαλείας ολοκληρώθηκε επιτυχώς"
       text_body_template: |
         Η δημιουργία αντιγράφων ασφαλείας ήταν επιτυχής.
 
-        Επισκέψου το [διαχειριστής > ενότητα αντιγράφων ασφαλείας](%{base_url}/admin/backups) για να κατεβάσεις το νέο σου αντίγραφο ασφαλείας.
+        Επισκέψου ττην σελίδα [διαχείριση > αντίγραφα ασφαλείας](%{base_url}/admin/backups) για να κατεβάσεις το νέο σου αντίγραφο ασφαλείας.
 
         Το αρχείο καταγραφής είναι εδώ:
 
-        ```κείμενο
+        ```text
         %{logs}
         ```
     backup_failed:
@@ -1662,7 +1724,7 @@ el:
 
         Το αρχείο καταγραφής είναι εδώ:
 
-        ```κείμενο
+        ```text
         %{logs}
         ```
     restore_succeeded:
@@ -1673,16 +1735,16 @@ el:
 
         Το αρχείο καταγραφής είναι εδώ:
 
-        ```κείμενο
+        ```text
         %{logs}
         ```
     restore_failed:
-      title: "Η επαναφορά ήταν αποτυχής"
+      title: "Η επαναφορά απέτυχε"
       subject_template: "Η επαναφορά απέτυχε"
       text_body_template: |
         Η επαναφορά απέτυχε.
 
-        Εδώ είναι η καταγραφη:
+        Το αρχείο καταγραφής είναι εδώ:
 
         ```text
         %{logs}
@@ -1690,10 +1752,18 @@ el:
     bulk_invite_succeeded:
       title: "Η μαζική πρόσκληση ήταν επιτυχής"
       subject_template: "Μαζική πρόσκληση χρηστών επεξεργάστηκε επιτυχώς"
-      text_body_template: "Το αρχείο της μαζικής πρόσκλησης χρηστών υποβλήθηκε σε επεξεργασία, %{sent} προσκλήσεις στάλθηκαν."
+      text_body_template: "Η επεξεργασία του αρχείου μαζικής πρόσκλησης χρηστών ολοκληρώθηκε, %{sent} προσκλήσεις στάλθηκαν."
     bulk_invite_failed:
       title: "Μαζική πρόσκληση απέτυχε"
-      subject_template: "Μαζική πρόσκληση χρηστών υποβλήθηκε σε επεξεργασία με λάθη."
+      subject_template: "Η επεξεργασία του αρχείου μαζικής πρόσκλησης χρηστών ολοκληρώθηκε με λάθη."
+      text_body_template: |
+        Το αρχείο μαζικής πρόσκλησης χρηστών έχει επεξεργαστεί, %{sent} προσκλήσεις στάλθηκαν με %{failed} σφάλμα(τα).
+
+        Το αρχείο καταγραφής είναι εδώ:
+
+        ```text
+        %{logs}
+        ```
     csv_export_succeeded:
       title: "Η CSV Εξαγωγή Πέτυχε"
       subject_template: "Εξαγωγή δεδομένων ολοκληρώθηκε"
@@ -1708,86 +1778,105 @@ el:
     csv_export_failed:
       title: "Εξαγωγή CSV απέτυχε"
       subject_template: "Η εξαγωγή δεδομένων απέτυχε"
-      text_body_template: "Λυπούμαστε αλλά η εξαγωγή δεδομένων απέτυχε. Παρακαλούμε έλεγξε τις καταγραφές ή επικοινώνησε με ένα συνεργάτη. "
+      text_body_template: "Λυπούμαστε, αλλά η εξαγωγή δεδομένων απέτυχε. Παρακαλούμε δείτε τα αρχεία καταγραφής ή [επικοινωνήστε με την διαχείριση](%{base_url}/about)."
     email_reject_insufficient_trust_level:
-      title: "Απόρριψη ηλεκτρονικού μηνύματος Ανεπαρκές επίπεδο εμπιστοσύνης"
+      title: "Απόρριψη email Ανεπαρκές επίπεδο εμπιστοσύνης"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Ανεπαρκές Επίπεδο Εμπιστοσύνης"
       text_body_template: |
-        Λυπούμαστε, αλλά το μήνυμα του ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) απέτυχε.
+        Λυπούμαστε, αλλά το email προς %{destination} (με τίτλο %{former_title}) απέτυχε.
 
-        Ο λογαριασμός σου δεν έχει το απαιτούμενο επίπεδο εμπιστοσύνης ώστε να δημοσιεύσεις καινούρια νήματα σε αυτή τη διεύθυνση ηλεκτρονικού ταχυδρομείου. Εάν πιστεύεις ότι πρόκειται για λάθος, επικοινώνησε με ένα μέλος του προσωπικού.
+        Ο λογαριασμός σας δεν έχει το απαιτούμενο επίπεδο εμπιστοοσύνης ώστε να στείλει νέα νήματα σε αυτή τη διεύθυνση email. Αν πιστεύετε ότι αυτό είναι λάθος, [επικοινωνήστε με την διαχείριση](%{base_url}/about).
     email_reject_user_not_found:
-      title: "Απόρριψη ηλεκτρονικού μηνύματος Δε βρέθηκε ο χρήστης"
+      title: "Απόρριψη email Δε βρέθηκε ο χρήστης"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Δεν Βρέθηκε Χρήστης"
       text_body_template: |
-        Λυπούμαστε, αλλά το ηλεκτρονικό σου μήνυμα προς %{destination} (με τίτλο %{former_title}) απέτυχε.
+        Λυπούμαστε, αλλά το email σας προς %{destination} (με τίτλο %{former_title}) απέτυχε.
 
-        Η απάντησή σου στάλθηκε από άγνωστη διεύθυνση ηλεκτρονικού ταχυδρομείου. Προσπάθησε να στείλεις από άλλη διεύθυνση ηλεκτρονικού ταχυδρομείου, ή επικοινώνησε με ένα μέλος του προσωπικού.
+        Η απάντησή σας στάλθηκε από μία άγνωστη διεύθυνση email. Δοκιμάστε να στείλετε από κάποια άλλη διεύθυνση email ή [επικοινωνήστε με την διαχείριση](%{base_url}/about).
     email_reject_screened_email:
-      title: "Απόρριψη ηλεκτρονικού μηνύματος σε ελεγμένες διευθύνσεις ηλεκτρονικού ταχυδρομίου"
+      title: "Απόρριψη email Ελεγχόμενη Διεύθυνση email"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Αποκλεισμένο Email"
       text_body_template: |
-        Λυπούμαστε, αλλά το ηλεκτρονικό σου μήνυμα προς %{destination} (με τίτλο %{former_title}) απέτυχε.
+        Λυπούμαστε, αλλά το email σας προς %{destination} (με τίτλο %{former_title}) απέτυχε.
 
-        Η απάντησή σου στάλθηκε από διεύθυνση ηλεκτρονικού ταχυδρομείου που έχει μπλοκαριστεί. Προσπάθησε να στείλεις από διαφορετική διεύθυνση ηλεκτρονικού ταχυδρομείου, ή επικοινώνησε με ένα μέλος του προσωπικού.
+        Η απάντησή σας στάλθηκε από μία αποκλεισμένη διεύθυνση email. Δοκιμάστε να στείλετε από κάποια άλλη διεύθυνση email ή [επικοινωνήστε με την διαχείριση](%{base_url}/about).
+    email_reject_not_allowed_email:
+      title: "Email Απερρίφθη Μη Επιτρεπτό Email"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Αποκλεισμένο Email"
+      text_body_template: |
+        Λυπούμαστε, αλλά το email προς %{destination} (με τίτλο %{former_title}) δεν λειτούργησε.
+
+        Η απάντησή σας στάλθηκε από μία αποκλεισμένη διεύθυνση email. Δοκιμάστε να στείλετε ξανά από κάποια άλλη διεύθυνση email ή [επικοινωνήστε με συνεργάτη](%{base_url}/about).
     email_reject_inactive_user:
-      title: "Απόρριψη ηλεκτρονικού μηνύματος Μη ενεργός χρήστης"
+      title: "Απόρριψη email Μη ενεργός χρήστης"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Ανενεργός Χρήστης"
       text_body_template: |
-        Λυπούμαστε, αλλά το ηλεκτρονικό σου μήνυμα προς %{destination} (με τίτλο %{former_title}) απέτυχε.
+        Λυπούμαστε, αλλά το email σου προς %{destination} (με τίτλο %{former_title}) απέτυχε.
 
-        Ο λογαριασμός σου που σχετίζεται με αυτή τη διεύθυνση ηλεκτρονικού ταχυδρομείου δεν είναι ενεργοποιημένος. Παρακαλώ ενεργοποίησε τον λογαριασμό σου προτού στείλεις ηλεκτρονικά μηνύματα.
-    email_reject_blocked_user:
-      title: "Απόρριψη ηλεκτρονικού μηνύματος Ο χρήστης μπλοκαρίστηκε"
-      text_body_template: |+
-        Λυπούμαστε, αλλά το ηλεκτρονικό σου μήνυμα προς %{destination} (με τίτλο %{former_title}) απέτυχε.
-
-        Ο λογαριασμός σου που σχετίζεται με αυτή τη διεύθυνση ηλεκτρονικού ταχυδρομείου έχει μπλοκαριστεί.
+        Ο λογαριασμός σου που σχετίζεται με αυτή τη διεύθυνση email δεν είναι ενεργοποιημένος. Παρακαλώ ενεργοποίησε τον λογαριασμό σου προτού στείλεις email.
+    email_reject_silenced_user:
+      title: "Απόρριψη Email Χρήστης σε Σιγή"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email  -- Χρήστης σε Σιγή"
+      text_body_template: |
+        Λυπούμαστε, αλλά το email προς %{destination} (με τίτλο %{former_title}) δεν λειτούργησε.
 
+        Ο λογαριασμός χρήστη που είναι συνδεμένος με αυτό το email είναι σε σιγή.
     email_reject_reply_user_not_matching:
-      title: "Απόρριψη ηλεκτρονικού μηνύματος Ο χρήστης δεν ταιριάζει"
+      title: "Απόρριψη email Ο χρήστης δεν ταιριάζει"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Απροσδόκητη Διεύθυνση Απάντησης"
       text_body_template: |
-        Λυπούμαστε, αλλά το ηλεκτρονικό σου μήνυμα προς %{destination} (με τίτλο %{former_title}) απέτυχε.
+        Λυπούμαστε, αλλά το email σας προς %{destination} (με τίτλο%{former_title}) απέτυχε.
 
-        Η απάντησή σου στάλθηκε από διαφορετική διεύθυνση ηλεκτρονικού ταχυδρομείου από αυτή που περιμέναμε, κι έτσι δεν είμαστε βέβαιοι εάν πρόκειται για το ίδιο άτομο. Προσπάθησε να στείλεις από διαφορετική διεύθυνση ηλεκτρονικού ταχυδρομείου, ή επικοινώνησε με ένα μέλος του προσωπικού.
+        Η απάντησή σας στάλθηκε από διαφορετική διεύθυνση email από αυτήν που περιμέναμε και δεν μπορούμε να γνωρίζουμε αν πρόκειται για το ίδιο άτομο. Δοκιμάστε να στείλετε από κάποια άλλη διεύθυνση email ή [επικοινωνήστε με την διαχείριση](%{base_url}/about).
     email_reject_no_account:
-      title: "Απόρριψη ηλεκτρονικού μηνύματος Κανένας λογαριασμός"
+      title: "Απόρριψη email Κανένας λογαριασμός"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email  -- Άγνωστος Λογαριασμός"
       text_body_template: |
-        Λυπούμαστε, αλλά το ηλεκτρονικό σας μήνυμα προς %{destination} (με τίτλο %{former_title}) απέτυχε.
+        Λυπούμαστε, αλλά το email σας προς %{destination} (με τίτλο%{former_title}) απέτυχε.
 
-        Δεν μπορούμε να βρούμε κανένα λογαριασμό που να ταιριάζει με την διεύθυνση του ηλεκτρονικού σου ταχυδρομείου. Προσπάθησε να στείλεις από διαφορετική διεύθυνση ηλεκτρονικού ταχυδρομείου, ή επικοινώνησε με ένα μέλος του προσωπικού.
+        Δεν μπόρεσε να βρεθεί λογαριασμός χρήστη ο οποίος να αντιστοιχίζεται με αυτήν την διεύθυνση email. Δοκιμάστε να στείλετε από κάποια άλλη διεύθυνση email ή [επικοινωνήστε με την διαχείριση](%{base_url}/about).
     email_reject_empty:
-      title: "Απόρριψη ηλεκτρονικού μηνύματος άδεια"
+      title: "Απόρριψη Κενού email"
+      subject_template: "[%{email_prefix}] Πρόβληα Email -- Χωρίς Περιεχόμενο"
       text_body_template: |
-        Λυπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη.
+        Λυπούμαστε, αλλά το email σου προς %{destination} (titled %{former_title}) δεν εστάλη.
 
-        Δε μπορέσαμε να βρούμε κανένα κείμενο απάντησης στο μήνυμα ηλεκτρονικού ταχυδρομείου σου.
+        Δε μπορέσαμε να βρούμε κανένα κείμενο απάντησης στο email σου.
 
         Αν λαμβάνεις αυτό και αν _όντως_ συμπεριέλαβες απάντηση, προσπάθησε ξανά με απλούστερη μορφοποίηση.
     email_reject_parsing:
-      title: "Τεχνολογία απορριψης ηλεκτρονικού μηνύματος"
+      title: "Απόρριψη Μη Επεξεργάσιμου email"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Άγνωστο Περιεχόμενο"
       text_body_template: |
-        Λυπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη.
+        Λυπούμαστε, αλλά το email σου προς %{destination} (titled %{former_title}) δεν εστάλη.
 
-        Δε μπορέσαμε να βρούμε την απάντησή σου στο μήνυμα ηλεκτρονικού ταχυδρομείου. **Σιγουρέψου ότι η απάντησή σου είναι στην κορυφή του μηνύματος ηλεκτρονικού ταχυδρομείου** - δε μπορούμε να επεξεργαστούμε απαντήσες μέσα στις γραμμές.
+        Δε μπορέσαμε να βρούμε την απάντησή σου στο email. **Σιγουρέψου ότι η απάντησή σου είναι στην κορυφή του email** - δε μπορούμε να επεξεργαστούμε απαντήσεις μέσα στις γραμμές.
     email_reject_invalid_access:
-      title: "Απόρριψη ηλεκτρονικού μηνύματος μη έγκυρη πρόσβαση"
+      title: "Απόρριψη email Μη έγκυρη πρόσβαση"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Σφάλμα Πρόσβασης"
       text_body_template: |
-        Λυπούμαστε, αλλά το ηλεκτρονικό μήνυμα προς %{destination} (με τίτλο %{former_title}) απέτυχε.
+        Λυπούμαστε, αλλά το email σας προς %{destination} (με τίτλο%{former_title}) απέτυχε.
 
-        Ο λογαριασμός σου δεν έχει το προνόμιο να δημοσιεύει καινούρια νήματα σε αυτή την κατηγορία. Εάν πιστεύεις ότι πρόκειται για σφάλμα, επικοινώνησε με ένα μέλος του προσωπικού.
+        Ο λογαριασμός σας δεν έχει το δικαίωμα να προσθέσει νέο νήμα σε αυτή την κατηγορία. Αν πιστεύετε ότι αυτό είναι λάθος, [επικοινωνήστε με την διαχείριση](%{base_url}/about).
     email_reject_strangers_not_allowed:
-      title: "Άγνωστοι απόρριψης ηλεκτρονικού μηνύματος δεν επιτρέπονται"
+      title: "Απόρριψη email Άγνωστοι δεν επιτρέπονται"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Σφάλμα Πρόσβασης"
       text_body_template: |
-        Λυπούμαστε, αλλά αυτό το ηλεκτρονικό μήνυμα προς %{destination} (με τίτλο %{former_title}) απέτυχε.
+        Λυπούμαστε, αλλά το email σας προς %{destination} (με τίτλο %{former_title}) απέτυχε.
 
-        Η κατηγορία που έστειλες το ηλεκτρονικό μήνυμα επιτρέπει απαντήσεις μόνο από χρήστες με έγκυρους λογαριασμούς και γνωστές διευθύνσεις ηλεκτρονικού ταχυδρομείου. Εάν πιστεύεις ότι πρόκειται για σφάλμα, επικοινώνησε με ένα μέλος του προσωπικού.
+        Η κατηγορια στην οποία στέλνετε αυτό το email, επιτρέπει απαντήσεις μόνο από χρήστες με έγκυρους λογαριασμούς και γνωστές διευθύνσεις email. Αν πιστεύετε ότι αυτό είναι λάθος, [επικοινωνήστε με την διαχείριση](%{base_url}/about).
     email_reject_invalid_post:
-      title: "Απόρριψη ηλεκτρονικού μηνύματος μη έγκυρη ανάρτηση"
+      title: "Απόρριψη email Μη έγκυρη ανάρτηση"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Σφάλμα Ανάρτησης"
       text_body_template: |
-        Λυπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη.
+        Λυπούμαστε, αλλά το email σου προς %{destination} (titled %{former_title}) δεν εστάλη.
 
         Μερικές πιθανές αιτίες είναι: περίπλοκη μορφοποίηση, πολύ μεγάλο μέγεθος μηνύματος, πολύ μικρό μέγεθος μηνύματος. Παραλούμε προσπαθήστε ξανά, ή αναρτήστε μέσω του ιστοτόπου αν το πρόβλημα συνεχίζεται.
     email_reject_invalid_post_specified:
-      title: "Προσδιορισμός μη έγκυρης ανάρτησης για απόρριψη ηλεκτρονικού μηνύματος"
+      title: "Απόρριψη email Μη Έγκυρη Ανάρτηση"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Σφάλμα Ανάρτησης"
       text_body_template: |
-        υπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη.
+        Λυπούμαστε, αλλά το email σου προς %{destination} (titled %{former_title}) δεν εστάλη.
 
         Αιτία:
 
@@ -1795,49 +1884,63 @@ el:
 
         Αν μπορείς να διορθώσεις το πρόβλημα, παρακαλούμε προσπάθησε ξανά.
     email_reject_invalid_post_action:
-      title: "Πράξη μη έγκυρης ανάρτησης για απόρριψη ηλεκτρονικού μηνύματος"
+      title: "Απόρριψη email Μη Έγκυρη Πράξη Ανάρτησης"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Άκυρη Ενέργεια Ανάρτησης"
       text_body_template: |
-        Λυπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη.
+        Λυπούμαστε, αλλά το email σου προς %{destination} (titled %{former_title}) δεν εστάλη.
 
         Η ενέργεια ανάρτησης δεν αναγνωρίστηκε. Παρακαλούμε προσπαθήστε ξανά, ή αναρτήστε μέσω του ιστοτόπου αν το πρόβλημα συνεχιζεται.
     email_reject_reply_key:
-      title: "Κλειδί απάντησης για απόρριψη ηλεκτρονικού μηνύματος"
+      title: "Απόρριψη email Μη Έγκυρο Κλειδί Απάντησης"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Άγνωστο Κλειδί Απάντησης"
       text_body_template: |
-        Λυπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη.
+        Λυπούμαστε, αλλά το email σας προς %{destination} (με τίτλο %{former_title}) απέτυχε.
 
-        Το κλειδί απάντησης στο μήνυμα ηλεκτρονικού ταχυδρομείου δεν είναι έγκυρο ή είναι άγνωστο, οπότε δεν μπορούμε να καταλάβουμε σε τι αναφέρεται ως απάντηση αυτό το μήνυμα ηλεκτρονικού ταχυδρομείου. Επικοινώνησε με κάποιο συνεργάτη.
+        Το κλειδί απάντησης στο email είναι λανθασμένο ή άγνωστο και έτσι δεν μπορούμε να καταλάβουμε σε τι απαντάτε. Αν πιστεύετε ότι αυτό είναι λάθος, [επικοινωνήστε με την διαχείριση](%{base_url}/about).
     email_reject_bad_destination_address:
-      title: "Απόρριψη ηλεκτρονικού μηνύματος άκυρη διεύθυνση προορισμού"
+      title: "Απόρριψη email Μη Έγκυρη Διεύθυνση Προορισμού"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Άγνωστη Διεύθυνση Προς:"
       text_body_template: |
-        Λυπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη.
+        Λυπούμαστε, αλλά το email προς %{destination} (με τίτλο%{former_title}) απέτυχε.
 
-        Καμία από τις διευθύνσεις ηλεκτρονικού ταχυδρομείου των παραληπτών δεν αναγνωρίστηκε. Παρακαλούμε σιγουρέψου ότι στέλνεις στην σωστή διεύθυνση ηλεκτρονικού ταχυδρομείου, η οποία παρέχεται από κάποιο συνεργάτη.
+        Δεν αναγνωρίστηκε καμία από τις διευθύνσεις παραληπτών ή το Message-ID header στο email έχει τροποποιηθεί. Παρακαλούμε βεβαιωθείται ότι στέλνετε στην σωστή διεύθυνση email που σας έχει δοθεί από τους συνεργάτες.
     email_reject_topic_not_found:
-      title: "Απόρριψη ηλεκτρονικού μηνύματος Δε βρέθηκε το νήμα"
+      title: "Απόρριψη email Δε βρέθηκε το νήμα"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Δεν Βρέθηκε Νήμα"
       text_body_template: |
-        Λυπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη.
+        Λυπούμαστε, αλλά το email σας προς %{destination} (με τίτλο %{former_title}) απέτυχε.
 
-        Το νήμα στο οποίο απαντάς είναι δεν υπάρχει πλέον, ίσως να έχει διαγραφεί. Εάν πιστεύεις ότι πρόκειται για λάθος, επικοινώνησε με ένα συνεργάτη.
+        Το νήμα στο οποίο απαντάτε δεν υπάρχει πια -- μήπως έχει αφαιρεθεί; Αν πιστεύετε ότι αυτό είναι λάθος, [επικοινωνήστε με την διαχείριση](%{base_url}/about).
     email_reject_topic_closed:
-      title: "Απόρριψη ηλεκτρονικού μηνύματος θέμα τελειωμένο"
+      title: "Απόρριψη email Κλειστό Νήμα"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Κλειστό Νήμα"
       text_body_template: |
-        Λυπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη.
+        Λυπούμαστε, αλλά το email σας προς %{destination} (με τίτλο %{former_title}) απέτυχε.
 
-        Το νήμα στο οποίο απαντάς είναι προσωρινά κλειστό και δε μπορεί πλέον δεχτεί απαντήσεις. Εάν πιστεύεις ότι πρόκειται για λάθος, επικοινώνησε με ένα συνεργάτη.
+        Το νήμα στο οποίο απαντάτε είναι για την ώρα κλειστό και δεν δέχεται νέες απαντήσεις. Αν πιστεύετε ότι αυτό είναι λάθος, [επικοινωνήστε με την διαχείριση](%{base_url}/about).
     email_reject_auto_generated:
-      title: "Απόρριψη ηλεκτρονικού μηνύματος δημιουργήθηκε αυτόματα"
+      title: "Απόρριψη email Δημιουργήθηκε Αυτόματα"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Αυτόματη Απάντηση"
       text_body_template: |
-        Λυπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη.
+        Λυπούμαστε, αλλά το email σας προς %{destination} (με τίτλο %{former_title}) απέτυχε.
 
-        Το μήνυμα ηλεκτρονικού ταχυδρομείου σου σημάνθηκε ως "αυτοδημιούργητο", το οποίο σημαίνει ότι δημιουργήθηκε αυτόματα από έναν υπολογιστή αντί να πληκτρολογηθεί από άνθρωπο. Δε μπορούμε να δεχτούμε τέτοιου είδους μηνύματα ηλεκτρονικού ταχυδρομείου. Εάν πιστεύεις ότι πρόκειται για λάθος, επικοινώνησε με ένα συνεργάτη.
+        Το email σας αναγνωρίστηκε ως "αυτοματοποιημένο", το οποίο σημαίνει ότι δημιουργήθηκε αυτόματα από έναν υπολογιστή αντί να πληκτρολογηθεί από άνθρωπο - τέτοια μηνύματα δεν γίνονται αποδεκτά. Αν πιστεύετε ότι αυτό είναι λάθος, [επικοινωνήστε με την διαχείριση](%{base_url}/about).
+    email_reject_unrecognized_error:
+      title: "Απόρριψη Email - Άγνωστο Σφάλμα"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Άγνωστο Σφάλμα"
+      text_body_template: |
+        Λυπούμαστε, αλλά το email σας προς %{destination} (με τίτλο %{former_title}) απέτυχε.
+
+        Υπήρξε ένα άγνωστο σφάλμα κατά την επεξεργασία του email σας. Θα πρέπει να δοκιμάσετε ξανά ή να [επικοινωνήστε με την διαχείριση](%{base_url}/about).
     email_error_notification:
-      title: "Ειδοποίηση σφάλματος ηλεκτρονικού ταχυδρομείου"
+      title: "Ειδοποίηση Σφάλματος email"
+      subject_template: "[%{email_prefix}] Πρόβλημα Email -- Σφάλμα επαλήθευσης POP"
       text_body_template: |
         Δυστυχώς υπήρξε ένα πρόβλημα πιστοποίησης κατά τη διάρκεια συγκέντρωσης μηνυμάτων από τον διακομιστή POP.
 
         Παρακαλούμε σιγουρευτείτε ότι έχετε τις σωστές ρυθμίσεις πιστοποιητικών POP στις [ρυθμίσεις ιστοτόπου](%{base_url}/admin/site_settings/category/email).
 
-        Εάν υπάρχει διαδικτυακό περιβάλλον χρήστη για το λογαριασμό ηλεκτρονικού ταχυδρομείου POP, ίσως χρειάζεται να συνδεθείτε στο διαδίκτυο και να ελέγξετε τις ρυθμίσεις σας εκεί.
+        Εάν υπάρχει διαδικτυακό περιβάλλον χρήστη για το λογαριασμό email POP, ίσως χρειάζεται να συνδεθείτε στο διαδίκτυο και να ελέγξετε τις ρυθμίσεις σας εκεί.
     too_many_spam_flags:
       title: "Πάρα πολλές επισημάνσεις ανεπιθύμητης αλληλογραφίας."
       subject_template: "Καινούριος λογαριασμός σε αναμονή"
@@ -1846,63 +1949,51 @@ el:
 
         Αυτό είναι αυτοματοποιημένο μήνυμα από %{site_name} για να σε ενημερώσει ότι οι αναρτήσεις σου έχουν αποκρυφθεί επειδή επισημάνθηκαν από την κοινότητα.
 
-        Ως μέτρο προστασίας, ο νέος σου λογαριασμός έχει μπλοκαριστεί και δε μπορείς να δημιουργήσεις νέες απαντήσεις ή νήμαατα έως ότου ένα μέλος του προσωπικού μπορέσει να εξετάσει το λογαριασμό σου. Ζητούμε συγνώμη για την ταλαιπωρία.
+        Ως μέτρο προστασίας, ο νέος σου λογαριασμός είναι σε σιγή και δε μπορείς να δημιουργήσεις νέες απαντήσεις ή νήματα έως ότου ένας συνεργάτης μπορέσει να εξετάσει το λογαριασμό σου. Ζητούμε συγνώμη για την ταλαιπωρία.
 
-        Για επιπλέον καθοδήγηση, παρακαλούμε ανάτρεξε στο [community guidelines](%{base_url}/guidelines).
+        Για επιπλέον καθοδήγηση, παρακαλούμε ανάτρεξε στον [οδηγό χρήσης](%{base_url}/guidelines).
     too_many_tl3_flags:
       title: "Πάρα πολλές επισημάνσεις ΕΕ3 "
       subject_template: "Καινούριος λογαριασμός σε αναμονή"
       text_body_template: |
         Γεια σου,
 
-        Αυτό είναι αυτοματοποιημένο μήνυμα από %{site_name} για να σε ενημερώσει ότι ο λογαριασμός σου έχει ανασταλλεί εξαιτίας του μεγάλου αριθμού επισημάνσεων της κοινότητας.
+        Αυτό είναι αυτοματοποιημένο μήνυμα από %{site_name} για να σε ενημερώσει ότι ο λογαριασμός σου έχει ανασταλλεί εξαιτίας του μεγάλου αριθμού επισημάνσεων από την κοινότητα.
 
-        Ως μέτρο προστασίας, ο νέος σου λογαριασμός έχει μπλοκαριστεί και δε μπορείς να δημιουργήσεις νέες απαντήσεις ή νήμαατα έως ότου ένα μέλος του προσωπικού μπορέσει να εξετάσει το λογαριασμό σου. Ζητούμε συγνώμη για την ταλαιπωρία.
+        Ως μέτρο προστασίας, ο νέος σου λογαριασμός είναι σε σιγή και δε μπορείς να δημιουργήσεις νέες απαντήσεις ή νήματα έως ότου ένας συνεργάτης μπορέσει να εξετάσει το λογαριασμό σου. Ζητούμε συγνώμη για την ταλαιπωρία.
 
-        Για επιπλέον καθοδήγηση, παρακαλούμε ανάτρεξε στο [community guidelines](%{base_url}/guidelines).
-    blocked_by_staff:
-      title: "Μπλοκάρισμα από το προσωπικό"
-      subject_template: "Λογαριασμός προσωρινά σε αναμονή"
+        Για επιπλέον καθοδήγηση, παρακαλούμε ανάτρεξε στον [οδηγό χρήσης](%{base_url}/guidelines).
+    silenced_by_staff:
+      title: "Σιγήθηκε από Συνεργάτες"
+      subject_template: "Λογαριασμός σε αναστολή"
       text_body_template: |
         Γεια σου,
 
-        Αυτό είναι αυτοματοποιημένο μήνυμα από %{site_name} για να σε ενημερώσει ότι ο λογαριασμός σου έχει προσωρινά ανασταλλεί ως μέτρο προστασίας.
+        Αυτό είναι ένα αυτοματοποιημένο μήνυμα από την %{site_name} για να σε ενημερώσει ότι ο λογαριασμός σου είναι προσωρινά σε αναστολή για λόγους ασφαλείας.
 
-        Παρακαλούμε συνέχισε την περιήγηση, αλλά δεν θα είσαι σε θέση να απαντήσεις ή να δημιουργήσεις νήματα έως ότου ένας [συνεργάτης](%{base_url}/about) αναθεωρήσει τις πιο πρόσφατες αναρτήσεις σου. Ζητούμε συγνώμη για την ταλαιπωρία.
+        Μπορείς να συνεχίσεις την περιήγηση, αλλά δεν θα μπορείς να δημιουργήσεις νέα νήματα ή απαντήσεις ωσότου ένας [συνεργάτης](%{base_url}/about) ελέγξει τις τελευταίες σου αναρτήσεις. Λυπούμαστε για την ταλαιπωρία.
 
-        Για επιπλέον καθοδήγηση, ανάτρεξε στο [οδηγίες κοινότητας](%{base_url}/guidelines).
-    user_automatically_blocked:
-      title: "Ο χρήστης μπλοκαρίστηκε αυτόματα"
-      subject_template: "Νέος χρήστης %{username} αποκλείστηκε από της σημαίες της κοινότητας"
+        Για επιπλέον ενημέρωση, ανατρέξτε στον [οδηγό της κοινότητας](%{base_url}/guidelines).
+    user_automatically_silenced:
+      title: "Χρήστης Αυτόματα σε Σιγή"
+      subject_template: "Νέος χρήστης %{username} σιγήθηκε από σημάνσεις της κοινότητας"
       text_body_template: |
         Αυτό είναι αυτοματοποιημένο μήνυμα.
 
-        Ο νέος χρήστης [%{username}](%{user_url}) μπλοκαρίστηκε αυτόματα επειδή πολλαπλοί χρήστες επισήμαναν την ανάρτηση(σεις) του %{username}.
+        Ο νέος χρήστης [%{username}](%{user_url}) τέθηκε αυτόματα σε σίγαση διότι ένας αριθμός χρηστών σήμανε τις αναρτήσεις του %{username}.
 
-        Παρακαλούμε [αναθεώρησε τις επισημάνσεις](%{base_url}/admin/flags). Εάν ο χρήστης %{username} λανθασμένα μπλοκαρίστηκε από το να αναρτεί, πάτησε το κουμπί απεμπλοκής σε [σελίδα διαχείρισης γι' αυτό το χρήστη](%{user_url}).
+        Παρακαλούμε [ελέγξτε τις σημάνσεις](%{base_url}/admin/flags). Αν ο/η %{username} τέθηκε λανθασμένα σε σιγή, κάντε κλικ στο κουμπί αναίρεσης σίγασης στην [σελίδα διαχείρισης χρήστη](%{user_url}).
 
-        Αυτό το κατώφλι μπορεί να αλλαχθεί μέσω των ρυθμίσεων `block_new_user`.
-    spam_post_blocked:
-      title: "Μπλοκαρίστηκε ανεπιθύμητη δημοσίευση"
-      subject_template: "Του καινούριου χρήστη %{username} οι δημοσιεύσεις μπλοκαρίστηκαν εξαιτίας των επαναλαμβανόμενων συνδέσμων"
+        Αυτό το όριο μπορεί να ρυθμιστεί μέσω του πεδίου `silence_new_user` στις ρυθμίσεις ιστοσελίδας.
+    unsilenced:
+      title: "Εκτός Σιγής"
+      subject_template: "Λογαριασμός όχι πια σε αναστολή"
       text_body_template: |
-        Αυτό είναι αυτοματοποιημένο μήνυμα.
-
-        Ο νέος χρήστης [%{username}](%{user_url}) προσπάθησε να δημιουργήσει πολλαπλές αναρτήσεις με συνδέσμους σε %{domains}, όμως αυτές οι αναρτήσεις μπλοκαρίστηκαν για να αποφευχθεί ανεπιθύμητη αλληλογραφία. Ο χρήστης ακόμα μπορεί να δημιουργεί νέες αναρτήσεις που δεν περιέχουν συνδέσμους σε %{domains}.
-
-        Παρακαλούμε [αναθεώρησε το χρήστη](%{user_url}).
-
-        Μπορείς να το τροποποιήσεις μέσω των ρυθμίσεων ιστοτόπου newuser_spam_host_threshold` και `white_listed_spam_host_domains`.
-    unblocked:
-      title: "Αναιρέθηκε ο αποκλεισμός"
-      subject_template: "Λογαριασμός όχι πια σε αναμονή"
-      text_body_template: |+
         Γεια σου,
 
-        αυτό είναι αυτοματοποιημένο μήνυμα από %{site_name} για να σε ενημερώσει ότι ο λογαριασμός σου δεν είναι πλέον σε αναστολή έπειτα από αναθεώρηση απο τους συνεργάτες.
-
-        Μπορείς τώρα να δημιουργήσεις νέες απαντήσεις και νήματα ξανά. Ευχαριστούμε για την υπομονή σου.
+        Αυτό είναι ένα αυτοματοποιημένο μήνυμα από την %{site_name} για να σε ενημερώσει ότι ο λογαριασμός σου μετά από διαξαγωγή ελέγχου δεν είναι πλέον σε αναστολή.
 
+        Μπορείς και πάλι να αναρτήσεις απαντήσεις και να ξεκινήσεις νέα νήματα. Ευχαριστούμε για την υπομονή σου.
     pending_users_reminder:
       title: "Υπενθύμηση για χρήστες που εκκρεμούν"
       subject_template:
@@ -1913,40 +2004,71 @@ el:
 
         [Παρακαλούμε αναθεωρήστε τις στην ενότητα διαχείρισης](%{base_url}/admin/users/list/pending).
     download_remote_images_disabled:
-      title: "Η λήψη μακρινών εικόνων είναι απενεργοποιημένο"
-      subject_template: "Το κατέβασμα μακρινών φωτογραφιών είναι απενεργοποιημένο"
+      title: "Η λήψη απομακρυσμένων εικόνων απενεργοποιήθηκε"
+      subject_template: "Η λήψη απομακρυσμένων εικόνων απενεργοποιήθηκε"
       text_body_template: "Η ρύθμιση `download_remote_images_to_local` απενεργοποιήθηκε επειδή  το όριο χώρου στο δίσκο του `download_remote_images_threshold` έχει ξεπεραστεί"
     dashboard_problems:
-      title: "Προβλήματα πίνακα"
+      title: "Προβλήματα Πίνακα"
       subject_template: "Προέκυψαν προβλήματα"
       text_body_template: |
-        Μερικά προβλήματα αναφέρονται στον πίνακα του διαχειριστή σας.
+        Μερικά προβλήματα αναφέρονται στον πίνακα διαχείρισης.
 
-        [Παρακαλώ επανεξετάστετα διορθώστετα](%{base_url}/admin).
+        [Παρακαλώ επανεξετάστε τα](%{base_url}/admin).
+    new_user_of_the_month:
+      title: "Έχεις επιλεχθεί ως Χρήστης του Μήνα!"
+      subject_template: "Έχεις επιλεχθεί ως Χρήστης του Μήνα!"
+      text_body_template: |
+        Συγχαρητήρια, κέρδισες το βραβείο **Χρήστης του Μήνα για %{month_year}**. :trophy:
+
+        Αυτό το βραβείο επονέμεται σε δυο νέους χρήστες κάθε μήνα και θα είναι για πάντα ορατό στην [σελίδα χρήστη](%{url}).
+
+        Γίνατε γρήγορα ένα πολύτιμο μέλος της κοινότητάς μας.  Σας ευχαριστούμε για την συμμετοχή σας και ελπίζουμε να συνεχίσετε έτσι και στο μέλλον!
+    queued_posts_reminder:
+      title: "Υπενθύμιση Ουράς Αναρτήσεων"
+      subject_template:
+        one: "1 ανάρτηση σε αναμονή για έλεγχο"
+        other: "%{count} αναρτήσεις σε αναμονή για έλεγχο"
+      text_body_template: |
+        Γεια σου,
+
+        Υπάρχουν αναρτήσεις νέων χρηστων σε αναμονή για έλεγχο πριν δημοσιευθούν. [Κλικ εδώ για έγκριση ή απόρριψη](%{base_url}/queued-posts).
   unsubscribe_link: |+
-    Για να απεγγραφείς από αυτά τα ηλεκτρονικά μηνύματα, [click here](%{unsubscribe_url}).
+    Για να απεγγραφείς από αυτά τα email, [κάνε κλικ εδώ](%{unsubscribe_url}).
 
   unsubscribe_link_and_mail: |+
-    Για να απεγγραφείς από αυτά τα ηλεκτρονικά μηνύματα, [click here](%{unsubscribe_url}).
+    Για να απεγγραφείς από αυτά τα email, [κάνε κλικ εδώ](%{unsubscribe_url}).
 
   unsubscribe_mailing_list: |
-    Το λαμβάνεται αυτό γιατί έχεται ενεργοποιήσει την λειτουργία λίστας.
+    Λαμβάνετε αυτό επειδή έχετε ενεργοποιήσει την λειτουργία λίστας αλληλογραφίας (mailing list).
 
-    Για διαγραφή απο αυτά, [κάντε κλικ εδώ](%{unsubscribe_url}).
+    Για να απεγγραφείς από αυτά τα email, [κάνε κλικ εδώ](%{unsubscribe_url}).
   subject_re: "Απ:"
   subject_pm: "[ΠΜ]"
   user_notifications:
-    previous_discussion: "Προηγούμενες απαντήσεις"
-    in_reply_to: "Απάντηση σε"
+    previous_discussion: "Προηγούμενες Απαντήσεις"
+    reached_limit:
+      one: "Ενημέρωση: Στέλνουμε το μέγιστο 1 email καθημερινά. Ελέγξτε την ιστοσελίδα για να δείτε αυτά που πιθανώς έχουν κρατηθεί. "
+      other: "Ενημέρωση: Στέλνουμε το μέγιστο %{count} emails καθημερινά. Ελέγξτε την ιστοσελίδα για να δείτε αυτά που πιθανώς έχουν κρατηθεί. ΥΓ ευχαριστούμε που είστε τόσο δημοφιλής!"
+    in_reply_to: "Απάντηση Σε"
     unsubscribe:
       title: "Απεγγραφή"
-      description: "Δεν ενδιαφέρεσαι να λαμβάνεις αυτά τα ηλεκτρονικά μηνύματα; Κάνε κλικ εδώ να απεγγραφείς στη στιγμή:"
-    reply_by_email: "[Visit Topic](%{base_url}%{url}) ή απάντησε σε αυτό το μήνυμα ηλεκτρονικού ταχυδρομείου για να αποκριθείς."
-    reply_by_email_pm: "[Visit Message](%{base_url}%{url}) ή απάντησε σε αυτό το μήνυμα ηλεκτρονικού ταχυδρομείου για να αποκριθείς."
-    only_reply_by_email: "Απαντήστε σε αυτό το email για απόκριση."
-    visit_link_to_respond: "[Visit Topic](%{base_url}%{url}) για να αποκριθείς."
-    visit_link_to_respond_pm: "[Visit Message](%{base_url}%{url}) για να αποκριθείς."
-    posted_by: "Δημοσιεύθηκε από %{username} στις %{post_date}"
+      description: "Δεν ενδιαφέρεσαι να λαμβάνεις αυτά τα email; Κανένα πρόβλημα! Κάνε κλικ στο παρακάτω για να απεγγραφείς στη στιγμή:"
+    reply_by_email: "[Επισκέψου το νήμα](%{base_url}%{url}) ή απάντησε σε αυτό το email για να αποκριθείς."
+    reply_by_email_pm: "[Επισκέψου την ανάρτηση](%{base_url}%{url}) ή απάντησε σε αυτό το email για να αποκριθείς."
+    only_reply_by_email: "Απαντήστε σε αυτό το email για να αποκριθείς."
+    visit_link_to_respond: "[Επισκέψου το νήμα](%{base_url}%{url}) για να αποκριθείς."
+    visit_link_to_respond_pm: "[Επισκέψου την ανάρτηση](%{base_url}%{url}) για να αποκριθείς."
+    posted_by: "Αναρτήθηκε από %{username} στις %{post_date}"
+    invited_group_to_private_message_body: |
+      Ο/Η %{username} προσκάλεσε @%{group_name} σε ένα μήνυμα
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      στην
+
+      > %{site_title} -- %{site_description}
     invited_to_private_message_body: |
       %{username} σας προσκάλεσε σε ένα μήνυμα
 
@@ -1954,7 +2076,7 @@ el:
       >
       > %{topic_excerpt}
 
-      στο
+      στην
 
       > %{site_title} -- %{site_description}
     invited_to_topic_body: |
@@ -1964,11 +2086,21 @@ el:
       >
       > %{topic_excerpt}
 
-      στο
+      στην
 
       > %{site_title} -- %{site_description}
+    user_invited_to_private_message_pm_group:
+      title: "Ο χρήστης προσκάλεσε ομάδα σε ΠΜ"
+      subject_template: "[%{email_prefix}] %{username} προσκλήθηκε @%{group_name} σε ένα μήνυμα '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
     user_invited_to_private_message_pm:
-      title: "Ο χρήστης προσκλήθηκε σε προσωπικό μήνυμα"
+      title: "Προσκλήθηκε ο χρήστης σε ΠΜ"
+      subject_template: "[%{email_prefix}] %{username} σας προσκάλεσε σε ένα μήνυμα '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -1976,24 +2108,26 @@ el:
 
         %{respond_instructions}
     user_invited_to_private_message_pm_staged:
-      title: "Ο χρήστης προσκλήθηκε στο στάδιο προσωπικού μηνύματος"
-      text_body_template: |+
+      title: "Προσκλήθηκε ο χρήστης σε σταδιακό ΠΜ"
+      subject_template: "[%{email_prefix}] %{username} σας προσκάλεσε σε ένα μήνυμα '%{topic_title}'"
+      text_body_template: |
         %{header_instructions}
 
         %{message}
 
         %{respond_instructions}
-
     user_invited_to_topic:
-      title: "Ο χρήστης προσκλήθηκε στο νήμα"
+      title: "Προσκλήθηκε ο χρήστης στο νήμα"
+      subject_template: "[%{email_prefix}] %{username} σας προσκάλεσε στο '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
-        &{message}
+        %{message}
 
         %{respond_instructions}
     user_replied:
       title: "Ο χρήστης απάντησε"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -2003,7 +2137,8 @@ el:
 
         %{respond_instructions}
     user_replied_pm:
-      title: "Ο χρήστης απάντησε σε προσωπικό μηνύμα"
+      title: "Ο χρήστης απάντησε στο ΠΜ"
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -2013,7 +2148,8 @@ el:
 
         %{respond_instructions}
     user_quoted:
-      title: "Φράση χρήστη"
+      title: "Παρατέθηκε ο χρήστης"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -2023,7 +2159,8 @@ el:
 
         %{respond_instructions}
     user_linked:
-      title: "Ο χρήστης συνδέθηκε"
+      title: "Διασυνδέθηκε ο χρήστης"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -2033,7 +2170,8 @@ el:
 
         %{respond_instructions}
     user_mentioned:
-      title: "Ο χρήστης αναφέρθηκε"
+      title: "Αναφέρθηκε ο χρήστης"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -2043,9 +2181,10 @@ el:
 
         %{respond_instructions}
     user_group_mentioned:
-      title: "Αναφέρθηκε χρήστης ομάδας"
+      title: "Αναφέρθηκε Ομάδα Χρηστών"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
-        &{header_instructions}
+        %{header_instructions}
 
         %{message}
 
@@ -2053,7 +2192,8 @@ el:
 
         %{respond_instructions}
     user_posted:
-      title: "Ο χρήστης δημοσίευσε"
+      title: "Ανάρτηση Χρήστη"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -2063,8 +2203,9 @@ el:
 
         %{respond_instructions}
     user_watching_first_post:
-      title: "Ο χρήστης παρακολουθεί την πρώτη δημοσίευση"
-      text_body_template: |+
+      title: "Χρήστης που επιτηρεί την πρώτη ανάρτηση"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
         %{header_instructions}
 
         %{message}
@@ -2072,10 +2213,10 @@ el:
         %{context}
 
         %{respond_instructions}
-
     user_posted_pm:
-      title: "Ο χρήστης δημοσίευσε προσωπικό μήνυμα"
-      text_body_template: |+
+      title: "Χρήστης που ανάρτησε ΠΜ"
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
+      text_body_template: |
         %{header_instructions}
 
         %{message}
@@ -2083,113 +2224,222 @@ el:
         %{context}
 
         %{respond_instructions}
-
     user_posted_pm_staged:
-      title: "Ο χρήστης δημοσίευσε στο στάδιο προσωπικού μηνύματος"
+      title: "Χρήστης που ανάρτησε σταδιακό ΠΜ"
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
         %{message}
+    account_suspended:
+      title: "Χρήστης σε Αποβολη"
+      subject_template: "[%{email_prefix}] Ο λογαριασμός σου είναι σε κατάσταση αποβολής"
+      text_body_template: |
+        Αποβλήθηκες από την ιστοσελίδα έως %{suspended_till}.
+
+        %{reason}
+
+        %{message}
+    account_silenced:
+      title: "Λογαριασμός σε Σίγαση"
+      subject_template: "[%{email_prefix}] Ο λογαριασμός σας είναι σε σίγαση"
+      text_body_template: |
+        Είστε σε κατάσταση σίγασης μέχρι %{silenced_till}.
+
+        %{reason}
+
+        %{message}
+    account_exists:
+      title: "Ο λογαριασμός υπάρχει ήδη"
+      subject_template: "[%{email_prefix}] Ο λογαριασμός υπάρχει ήδη"
+      text_body_template: |
+        Μόλις προσπαθήσατε να δημιουργήσετε έναν λογαριασμό στην %{site_name} η προσπαθήσατε να αλλάξετε το email ενός λογαριασμού σε %{email}. Ωστόσο ένας λογαριασός υπάρχει ήδη για το %{email}.
+
+        Αν ξεχάσατε τον κωδικό σας μπορείτε να κάνετε [επαναφορά κωδικού](%{base_url}/password-reset).
+
+        Αν δεν προσπαθήσατε να δημιουργήσετε έναν λογαριασμό για το %{email} ή να αλλάξετε την διεύθυνση email, μην ανησυχείτε – μπορείτε με ασφάλεια να αγνοήσετε αυτό το μήνυμα.
+
+        Αν έχετε απορίες, [επικοινωνήστε με τους συνεργάτες μας](%{base_url}/about).
     digest:
-      why: "Μια σύντομη περίληψη του %{site_link} από την τελευταία σου επίσκεψη στο %{last_seen_at}"
+      why: "Μια σύντομη σύνοψη του %{site_link} από την τελευταία σου επίσκεψη στις %{last_seen_at}"
       since_last_visit: "Από την τελευταία σου επίσκεψη"
-      new_topics: "Νέα νήματα"
-      unread_messages: "Μη αναγνωσμένα μηνύματα"
-      unread_notifications: "Μη αναγνωσμένες ειδοποιήσεις"
-      liked_received: "\"Μου αρέσει\" που έλαβες"
-      new_posts: "Νέες δημοσιεύσεις"
-      new_users: "Νέοι χρήστες"
-      popular_topics: "Δημοφιλή νήματα"
+      new_topics: "Νέα Νήματα"
+      unread_messages: "Αδιάβαστα Μηνύματα"
+      unread_notifications: "Αδιάβαστες Ειδοποιήσεις"
+      liked_received: "Ληφθέντα \"Μου αρέσει\""
+      new_posts: "Νέες Αναρτήσεις"
+      new_users: "Νέοι Χρήστες"
+      popular_topics: "Δημοφιλή Νήματα"
       follow_topic: "Ακολούθησε αυτό το νήμα"
-      join_the_discussion: "Διάβασε περισσότερα"
-      popular_posts: "Δημοφιλείς Δημοσιεύσεις"
-      more_new: "Νέο για εσένα"
-      unsubscribe: "Αυτή η περίληψη αποστέλλεται από %{site_link} όταν δεν σε έχουμε δεί για ένα χρονικό διάστημα. Για να σταματήσεις την εγγραφή %{unsubscribe_link}."
+      join_the_discussion: "Διάβασε Περισσότερα"
+      popular_posts: "Δημοφιλείς Αναρτήσεις"
+      more_new: "Νέα για σένα"
+      subject_template: "[%{email_prefix}] Σύνοψη"
+      unsubscribe: "Λάβατε αυτή την σύνοψη από την %{site_link} επειδή δεν σας είδαμε εδώ και μερικές μέρες. Αν δεν θέλετε να λαμβάνετε αυτή την σύνοψη, αλλάξτε τις %{email_preferences_link} ή %{unsubscribe_link} για διαγραφή από την λίστα."
+      your_email_settings: "ρυθμίσεις email"
       click_here: "κάνε κλικ εδώ"
-      from: "%{site_name} περίληψη"
-      preheader: "Μία σύντομη περίληψη από την τελευταία σου επίσκεψη στο %{last_seen_at}"
+      from: "%{site_name} σύνοψη"
+      preheader: "Μία σύντομη σύνοψη από την τελευταία σου επίσκεψη στις %{last_seen_at}"
     forgot_password:
       title: "Ξέχασα τον κωδικό πρόσβασης"
+      subject_template: "[%{email_prefix}] Επαναφορά κωδικού"
+      text_body_template: |
+        Κάποιος ζήτησε την δημιουργία νέου κωδικού για εσάς στην [%{site_name}](%{base_url}).
+
+        Αν δεν το έχετε ζητήσει εσείς, μπορείτε με ασφάλεια να αγνοήσετε αυτό το email.
+
+        Κάντε κλικ στον παρακάτω σύνδεσμο για να επιλέξετε έναν νέο κωδικό:
+        %{base_url}/u/password-reset/%{email_token}
     set_password:
       title: "Όρισε κωδικό πρόσβασης"
+      subject_template: "[%{email_prefix}] Όρισε Κωδικό Πρόσβασης"
+      text_body_template: |
+        Κάποιος ζήτησε να προστεθεί ένας κωδικός στον λογαριασμό σας στην [%{site_name}](%{base_url}). Εναλλακτικά μπορείτε να συνδεθείτε χρησιμοποιώντας μια υπηρεσία ταυτοποίησης χρήστη (Google, Facebook, κλπ) η οποία θα πρέπει να αντιστοιχίζεται με αυτήν την επικυρωμένη διεύθυνση email.
+
+        Αν δεν το έχετε ζητήσει εσείς, μπορείτε με ασφάλεια να αγνοήσετε αυτό το email.
+
+        Κάντε κλικ στον παρακάτω σύνδεσμο για να επιλέξετε έναν νέο κωδικό:
+        %{base_url}/u/password-reset/%{email_token}
     admin_login:
       title: "Σύνδεση Διαχειριστή"
-    account_created:
-      title: "Ο λογαριασμός δημιουργήθηκε"
-    confirm_new_email:
-      title: "Επιβεβαίωση Νέας Ηλεκτρονικής Διεύθυνσης"
-    confirm_old_email:
-      title: "Επιβεβαίωση Παλιάς Ηλεκτρονικής Διεύθυνσης"
-    notify_old_email:
-      title: "Ειδοποίηση παλιάς ηλεκτρονικής διεύθυνσης"
+      subject_template: "[%{email_prefix}] Σύνδεση"
       text_body_template: |
-        Αυτό είναι αυτοματοποιημένο μήνυμα για να σε ενημερώσει ότι η διεύθυνση ηλεκτρονικού ταχυδρομείου σου για το
-        %{site_name} έχει αλλάξει. Εάν αυτό έγινε καταλάθος, παρακαλούμε επικοινώνησε
+        Κάποιος ζήτησε να συνδεθεί στον λογαριασμό σας στην [%{site_name}](%{base_url}).
 
-        με ένα διαχειριστή ιστοτόπου
+        Αν δεν το έχετε ζητήσει εσείς, μπορείτε με ασφάλεια να αγνοήσετε αυτό το email.
 
-        Η διεύθυνση ηλεκτρονικού ταχυδρομείου σου έχει αλλάξει σε:
+        Κάντε κλικ στον παρακάτω σύνδεσμο για να συνδεθείτε:
+        %{base_url}/u/admin-login/%{email_token}
+    account_created:
+      title: "Ο Λογαριασμός Δημιουργήθηκε"
+      subject_template: "[%{email_prefix}] Ο νέος σας Λογαριασμός"
+      text_body_template: |
+        Ένας νέος λογαριασμός χρήστη δημιουργηθηκε για εσάς στην %{site_name}
+
+        Κάντε κλικ στον παρακάτω σύνδεσμο για να επιλέξετε κωδικό πρόσβασης για τον νέο σας λογαριασμό:
+        %{base_url}/u/password-reset/%{email_token}
+    confirm_new_email:
+      title: "Επιβεβαίωση νέας διεύθυνσης email"
+      subject_template: "[%{email_prefix}] Επικυρώστε την νέα σας διεύθυνση email"
+      text_body_template: |
+        Επικυρώστε την νέα σας διεύθυνση email στην %{site_name} κάνοντας κλικ στον παρακάτω σύνδεσμο:
+
+        %{base_url}/u/authorize-email/%{email_token}
+    confirm_old_email:
+      title: "Επιβεβαίωση παλιάς διεύθυνσης email"
+      subject_template: "[%{email_prefix}] Επικυρώστε την νέα σας διεύθυνση email"
+      text_body_template: |
+        Προτού αλλάξουμε την διεύθυνση email σας, θα πρέπει να επιβεβαιώσουμε ότι σας ανήκει
+        η τρέχουσα διεύθυνση email. Αφού ολοκληρώσετε αυτό το βήμα, θα σας ζητήσουμε να
+        επιβεβαιώσετε την νέα σας διεύθυνση email.
+
+        Επιβεβαιώστε την τρέχουσα διεύθυνση email στην%{site_name} κάνοντας κλικ στον παρακάτω σύνδεσμο:
+
+        %{base_url}/u/authorize-email/%{email_token}
+    notify_old_email:
+      title: "Ειδοποίηση παλιάς διεύθυνσης email"
+      subject_template: "[%{email_prefix}] Η διεύθυνση email σας έχει αλλαχθεί"
+      text_body_template: |
+        Αυτό είναι ένα αυτοματοποιημένο μήνυμα για να σε ενημερώσει ότι η διεύθυνση email σου
+        για την %{site_name} έχει αλλάξει. Εάν αυτό έγινε κατα λάθος, παρακαλούμε επικοινώνησε
+        με ένα διαχειριστή
+
+        Η διεύθυνση email σου έχει αλλάξει σε:
 
         %{new_email}
     signup_after_approval:
-      title: "Εγγραφή μετά την έγκριση "
-      subject_template: "Έχετε εγκριθεί στο %{site_name}!"
+      title: "Εγγραφή μετά από έγκριση "
+      subject_template: "Έχετε εγκριθεί στην %{site_name}!"
+      text_body_template: |
+        Καλώς ήρθατε στην %{site_name}!
+
+        Ένα μέλος του προσωπικού ενέκρινε τον λογαριασμό σας στην %{site_name}.
+
+        Κάντε κλικ στον παρακάτω σύνδεσμο για να επικυρώσετε και να ενεργοποιήσετε τον νέο λογαριασμό σας:
+        %{base_url}/u/activate-account/%{email_token}
+
+        Αν για κάποιο λόγο δεν μπορείτε να κάνετε κλικ στον παραπάνω σύνδεσμο, παρακαλούμε αντιγράψτε ολόκληρη την διεύθυνση και επικολλήστε την στην γραμμή διευθύνσεων του περιηγητή σας.
+
+        %{new_user_tips}
+
+        Επικροτούμε πάντα την [πολιτισμένη κοινωνική συμπεριφορά](%{base_url}/guidelines).
+
+        Καλά να περάσετε!
     signup:
       title: "Εγγραφή"
+      subject_template: "[%{email_prefix}] Επικυρώστε τον νέο σας λογαριασμό"
+      text_body_template: |
+        Καλώς ήρθατε στην %{site_name}!
+
+        Κάντε κλικ στον παρακάτω σύνδεσμο για να επικυρώσετε και να ενεργοποιήσετε τον νέο λογαριασμό σας:
+        %{base_url}/u/activate-account/%{email_token}
+
+        Αν για κάποιο λόγο δεν μπορείτε να κάνετε κλικ στον παραπάνω σύνδεσμο, παρακαλούμε αντιγράψτε ολόκληρη την διεύθυνση και επικολλήστε την στην γραμμή διευθύνσεων του περιηγητή σας.
   page_not_found:
     title: "Ουπς! Αυτή η σελίδα δεν υπάρχει ή είναι ιδιωτική."
     popular_topics: "Δημοφιλή"
     recent_topics: "Πρόσφατα"
     see_more: "Περισσότερα"
-    search_title: "Κάνε αναζήτηση αυτής της ιστοσελίδας"
+    search_title: "Αναζήτηση στην ιστοσελίδα"
     search_google: "Google"
+  offline:
+    title: "Cannot load app"
+    offline_page_message: "Πιθανώς βρίσκεσαι εκτός σύνδεσης! Έλεγξε την σύνδεσή σου και δοκίμασε ξανά."
   login_required:
-    welcome_message: |+
-      #[Welcome to %{title}](#welcome)
-      Απαιτείται λογαριασμός. Παρακαλούμε Δημιουργήστε έναν λογαριασμό ή συνδεθείτε για να συνεχίσετε.
-
+    welcome_message: |
+      ## [Καλώς ήρθατε στην %{title}](#welcome)
+      Είναι απαραίτητο να έχετε λογαριασμό χρήστη.
+      Παρακαλούμε δημιουργήστε έναν λογαριασμό ή συνδεθείτε για να συνεχίσετε..
   terms_of_service:
-    title: "Όροι χρήσης της Υπηρεσίας"
-    signup_form_message: 'Έχω διαβάσει και αποδέχομαι τους <a href="/tos" target="_blank"> Όροι Υπηρεσίας</a>.'
-  deleted: 'διαγράφηκε'
+    title: "Όροι Χρήσης"
+    signup_form_message: 'Έχω διαβάσει και αποδέχομαι τους <a href="/tos" target="_blank">Όρους Χρήσης</a>.'
+  deleted: 'διεγράφη'
+  image: "εικόνα"
   upload:
-    edit_reason: "Λήψη τοπικά αντίγραφα των εικόνων"
-    unauthorized: "Λυπούμαστε, τα αρχεία που προσπαθείτε να ανεβάσετε δεν είναι εγκεκριμένα (authorized extensions: %{authorized_extensions})."
+    edit_reason: "λήψη τοπικών αντιγράφων των εικόνων"
+    unauthorized: "Λυπούμαστε, το αρχείο που προσπαθείτε να ανεβάσετε δεν είναι εγκεκριμένο (authorized extensions: %{authorized_extensions})."
     pasted_image_filename: "Επικολλημένη εικόνα"
-    store_failure: "Απέτυχε το ανέβσμα αποθηκευμένων #%{upload_id} για το χρήστη #%{user_id}."
-    file_missing: "Λυπούμαστε, πρέπει να παρέχετε ένα φάκελο για τη μεταφόρτωση."
+    store_failure: "Απέτυχε η αποθήκευση του αρχείου #%{upload_id} για το χρήστη #%{user_id}."
+    file_missing: "Λυπούμαστε, πρέπει να επιλέξετε ένα αρχείο για μεταφόρτωση."
+    empty: "Λυπούμαστε, αλλά το αρχείο που ανεβάσατε ήταν κενό."
     attachments:
-      too_large: "Λυπούμαστε, το αρχείο που προσπαθείτε να ανεβάσετε είναι πάρα πολύ μεγάλο (μέγιστο μέγεθος είναι % {max_size_kb} KB)."
+      too_large: "Λυπούμαστε, το αρχείο που προσπαθείτε να ανεβάσετε είναι πάρα πολύ μεγάλο (το μέγιστο μέγεθος είναι %{max_size_kb}KB)."
     images:
-      too_large: "Λυπούμαστε, το φορτίο της εικόνας που προσπαθείτε να ανεβάσετε είναι πάρα πολύ μεγάλο (μέγιστο μέγεθος είναι % {max_size_kb} KB),\nΠαρακαλούμε να αλλάξετε το μέγεθός της και προσπαθήστε ξανά"
-      larger_than_x_megapixels: "Λυπούμαστε, η εικόνα που προσπαθείς να μεταφορτώσεις είναι πολύ μεγάλη (το μέγιστο μέγεθος είναι %{max_image_megapixels}-megapixels), παρακαλώ άλλαξε το μέγεθος και προσπάθησε ξανά."
-      size_not_found: "Λυπούμαστε, αλλά δεν μπορούμε να καθορίσουμε το μέγεθοσ της εικόνας.Ίσως η εικόνα σας είναι μη έγκυρη;"
+      too_large: "Λυπούμαστε, το μέγεθος του αρχείου της εικόνας που προσπαθείτε να ανεβάσετε είναι πάρα πολύ μεγάλο (το μέγιστο μέγεθος είναι %{max_size_kb}KB), παρακαλούμε μειώστε το μέγεθος αρχείου της εικόνας και προσπαθήστε ξανά."
+      larger_than_x_megapixels: "Λυπούμαστε, η διάσταση της εικόνας που προσπαθείτε να ανεβάσετε είναι πάρα πολύ μεγάλη (η μέγιστη διάσταση είναι %{max_image_megapixels}-megapixels), παρακαλούμε μειώστε τις διαστάσεις της εικόνας και προσπαθήστε ξανά."
+      size_not_found: "Λυπούμαστε, αλλά δεν μπορούμε να καθορίσουμε το μέγεθος της εικόνας. Μήπως η εικόνα σας είναι χαλασμένη;"
+    placeholders:
+      too_large: "(εικόνα μεγαλύτερη από %{max_size_kb}KB)"
   avatar:
-    missing: "Δυστυχώς, δεν μπορούμε να βρούμε οποιaδήποτε προσωποποίηση που να συνδέεται με τη συγκεκριμένη διεύθυνση ηλεκτρονικού ταχυδρομείου. Μπορείτε να δοκιμάσετε την ανεβάσετε ξανά;"
+    missing: "Λυπούμαστε, αλλά δεν μπορέσαμε να βρούμε κάποιο άβαταρ που να αντιστοιχίζεται με τη συγκεκριμένη διεύθυνση email. Μπορείτε να δοκιμάσετε να το ανεβάσετε ξανά;"
   flag_reason:
-    sockpuppet: "Ένας νέος χρήστης δημιούργησε ένα νήμα,  και ένας άλλος νέος χρήσης με την ίδια διεύθυνση IP (%{ip_address}) απάντησε. Δες τις ρυθμίσεις ιστοτόπου <a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "Αυτός ο νέος χρήστης προσπάθησε να δημιουργήσει πολλαπλές αναρτήσεις με συνδέσμους στο ίδιο τομέα (%{domain}). Δες τις ρυθμίσεις ιστοτόπου <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
+    sockpuppet: "Ένας νέος χρήστης δημιούργησε ένα νήμα και ένας άλλος νέος χρήσης με την ίδια διεύθυνση IP (%{ip_address}) απάντησε. Δες τις ρυθμίσεις ιστοτόπου <a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
+    spam_hosts: "Αυτός ο νέος χρήστης προσπάθησε να δημιουργήσει πολλαπλές αναρτήσεις με συνδέσμους προς το ίδιο domain (%{domain}). Δες τις ρυθμίσεις ιστοτόπου <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   email_log:
-    post_user_deleted: "Ο χρήστης της δημοσίευσης έχει διαγραφεί"
-    no_user: "Δεν μπορεί να βρεθει  χρήστης με τη συγκεκριμένη διεύθυνση ηλεκτρονικού ταχυδρομείου %{user_id}"
+    post_user_deleted: "Ο χρήστης της ανάρτησης έχει διαγραφεί."
+    no_user: "Δεν μπορεί να βρεθει  χρήστης με id %{user_id}"
     anonymous_user: "Ο χρήστης είναι ανώνυμος"
-    suspended_not_pm: "Ο Χρήστης έχει ανασταλεί, δεν είναι μήνυμα"
+    suspended_not_pm: "Ο χρήστης έχει ανασταλεί, δεν είναι μήνυμα"
     seen_recently: "Ο χρήστης εμφανίστηκε πρόσφατα"
-    post_not_found: "Δεν μπορεί να βρει δημοσίευμα με αναγνωριστικό % {post_id}"
-    notification_already_read: "Η ειδοποίηση αυτού του ηλεκτρονικού μηνύματος έχει ήδη διαβαστεί"
-    topic_nil: "post.topic  είναι κενό"
-    post_deleted: "η ανάρτηση διαγράφηκε από τον συγγραφέα"
-    user_suspended: "Ο χρήστης είχε ανασταλεί"
-    already_read: "ο χρήστης έχει ήδη διαβάσει τη δημοσίευση"
+    post_not_found: "Δεν μπορεί να βρεθεί ανάρτηση με id %{post_id}"
+    notification_already_read: "Η ειδοποίηση αυτού του email έχει ήδη διαβαστεί"
+    topic_nil: "post.topic είναι κενό"
+    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: "ext_part.body είναι κενό"
-    body_blank: "το σώμα είναι κενό"
-    no_echo_mailing_list_mode: "Ειδοποιήσεις λίστας ηλεκτρονικού ταχυδρομείου απενεργοποιημένες για τις αναρτήσεις του ίδιου του χρήστη."
+    message_to_blank: "message.to είναι κενό"
+    text_part_body_blank: "text_part.body είναι κενό"
+    body_blank: "body είναι κενό"
+    no_echo_mailing_list_mode: "Οι ειδοποιήσεις λίστας email είναι απενεργοποιημένες για τις αναρτήσεις του ίδιου του χρήστη."
   color_schemes:
     base_theme_name: "Βάση"
+    default: "Ανοιχτόχρωμος Συνδυασμός"
+    dark: "Σκουρόχρωμος Συνδυασμός"
+    default_theme_name: "Προεπιλογή"
+    dark_theme_name: "Σκούρο"
+    light_theme_name: "Ανοιχτό"
   about: "Σχετικά"
   guidelines: "Οδηγίες"
   privacy: "Ιδιωτικότητα"
@@ -2197,13 +2447,112 @@ el:
   csv_export:
     boolean_yes: "Ναι "
     boolean_no: "Όχι"
-  static_topic_first_reply: |+
-    Επεξεργασία της πρώτης δημοσίευσης σε αυτό το νήμα για να αλλάξεις τα περιεχόμενα της %{page_name} σελίδας.
-
+  static_topic_first_reply: |
+    Επεξεργαστείτε την πρώτη ανάρτηση σε αυτό το νήμα για να αλλάξετε τα περιεχόμενα της σελίδας %{page_name}.
   guidelines_topic:
     title: "Συχνές Ερωτήσεις/Οδηγίες"
+    body: |
+      <a name="civilized"></a>
+
+      ## [Αυτός είναι ένας πολιτισμένος χώρος για δημόσιες συζητήσεις](#civilized)
+
+      Παρακαλούμε σεβαστείτε τον χώρο στον οποίο βρίσκεστε και συμπεριφερθείτε πολιτισμένα, σαν να βρίσκεστε σε κάποιο δημόσιο πάρκο ή άλλο δημόσιο χώρο στον οποίο μπορείτε να επικοινωνήσετε πολιτισμένα με τους συνανθρώπους σας.
+
+      Ο οδηγός αυτός έχει σκοπό να σας ενθαρρύνει σε πολιτισμένες συζητήσεις ώστε να παραμένει το επίπεδο της κοινότητας υψηλό.
+
+      <a name="improve"></a>
+
+      ## [Βελτιώστε την Συζήτηση](#improve)
+
+      Βοηθήστε μας να κάνουμε τον χώρο αυτό ένα υπέροχο μέρος για να περνάμε καλά και να ανταλλάσουμε απόψεις. συμβάλλωντας με οποιοδήποτε τρόπο, έστω και μικρό, στην βελτίωση των συζητήσεων. Συνεισφέρετε όσο μπορείτε πιο θετικά σε αυτές και μην μειώνετε τις απόψεις των άλλων.
+
+      Τα θέματα που συζητούνται σε αυτήν την κοινότητα, έχουν αξία σε εμας καθώς και στα μέλη της κοινότητας που συμμετέχουν και θα θέλαμε να συμπεριφερθείτε ανάλογα όταν συμμετέχετε και εσείς σε αυτά. Να σέβεστε λοιπόν τα θέματα στα οποία συμμετέχετε καθώς και τους ανθρώπους που συμμετέχουν σε αυτά, ακόμα και αν διαφωνείτε.
+
+      Σεβαστείτε την διαφορετικότητα των συνανθρώπων σας και αν δεν συμφωνείτε με τα θέματα τα οποία συζητούνται, προτιμήστε να ξεκινήστε ένα δικό σας.
+
+      One way to improve the discussion is by discovering ones that are already happening. Spend time browsing the topics here before replying or starting your own, and you’ll have a better chance of meeting others who share your interests.
+
+      <a name="agreeable"></a>
+
+      ## [Συμφωνήστε, ακόμα και όταν διαφωνείτε](#agreeable)
+
+      Πιθανώς να νοιώθετε την αναγκη να διαφωνήσετε και αυτό είναι λογικό. Θυμηθείτε όμως, να διαφωνείτε με τις ιδέες και όχι με τους ανθρώπους που τις εκφράζουν. Αποφύγετε:
+
+      *   Προσωπικούς χαρακτηρισμούς
+      *   Προσωπικές επιθέσεις
+      *   Την απάντηση στον "τόνο" του μηνύματος αντί του περιεχομένου
+      *   Την απάντηση σε απόψεις, λόγω του μέλους που τις εκφράζει
+
+      Αντ' αυτού, επικοινωνήστε θετικά με απόψεις που βοηθούν την βελτίωση μια συζήτησης.
+
+      <a name="participate"></a>
+
+      ## [Your Participation Counts](#participate)
+
+      The conversations we have here set the tone for every new arrival. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be &mdash; and avoiding those that do not.
+
+      Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too.
+
+      Let’s leave our community better than we found it.
+
+      <a name="flag-problems"></a>
+
+      ## [If You See a Problem, Flag It](#flag-problems)
+
+      Moderators have special authority; they are responsible for this forum. But so are you. With your help, moderators can be community facilitators, not just janitors or police.
+
+      When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. _Just flag it_. If enough flags accrue, action will be taken, either automatically or by moderator intervention.
+
+      In order to maintain our community, moderators reserve the right to remove any content and any user account for any reason at any time. Moderators do not preview new posts; the moderators and site operators take no responsibility for any content posted by the community.
+
+      <a name="be-civil"></a>
+
+      ## [Always Be Civil](#be-civil)
+
+      Nothing sabotages a healthy conversation like rudeness:
+
+      *   Be civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech.
+      *   Keep it clean. Don’t post anything obscene or sexually explicit.
+      *   Respect each other. Don’t harass or grief anyone, impersonate people, or expose their private information.
+      *   Respect our forum. Don’t post spam or otherwise vandalize the forum.
+
+      These are not concrete terms with precise definitions &mdash; avoid even the _appearance_ of any of these things. If you’re unsure, ask yourself how you would feel if your post was featured on the front page of the New York Times.
+
+      This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends.
+
+      <a name="keep-tidy"></a>
+
+      ## [Keep It Tidy](#keep-tidy)
+
+      Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So:
+
+      *   Don’t start a topic in the wrong category.
+      *   Don’t cross-post the same thing in multiple topics.
+      *   Don’t post no-content replies.
+      *   Don’t divert a topic by changing it midstream.
+      *   Don’t sign your posts &mdash; every post has your profile information attached to it.
+
+      Rather than posting “+1” or “Agreed”, use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a Linked Topic.
+
+      <a name="stealing"></a>
+
+      ## [Post Only Your Own Stuff](#stealing)
+
+      You may not post anything digital that belongs to someone else without permission. You may not post descriptions of, links to, or methods for stealing someone’s intellectual property (software, video, audio, images), or for breaking any other law.
+
+      <a name="power"></a>
+
+      ## [Powered by You](#power)
+
+      This site is operated by your [friendly local staff](/about) and *you*, the community. If you have any further questions about how things should work here, open a new topic in the [site feedback category](/c/site-feedback) and let's discuss! If there's a critical or urgent issue that can't be handled by a meta topic or flag, contact us via the [staff page](/about).
+
+      <a name="tos"></a>
+
+      ## [Terms of Service](#tos)
+
+      Yes, legalese is boring, but we must protect ourselves &ndash; and by extension, you and your data &ndash; against unfriendly folks. We have a [Terms of Service](/tos) describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our [TOS](/tos).
   tos_topic:
-    title: "Όροι χρήσης της Υπηρεσίας"
+    title: "Όροι Χρήσης"
     body: |+
       Οι ακόλουθοι όροι και προϋποθέσεις διέπουν την χρήση του %{company_domain} ιστότοπου και όλου του περιεχομένου, υπηρεσιών και προϊόντων που διατίθενται στον ή από τον ιστότοπο, συμπεριλαμβανομένων αλλά μη περιοριζομένων, και των %{company_domain} Λογισμικό Φόρουμ, %{company_domain} Φόρουμ Υποστήριξης και %{company_domain} Υπηρεσία Φιλοξενίας (‘’Φιλοξενια’’), (λαμβανόμενα μαζί, ο ιστότοπος). Ο ιστότοπος ανήκει και λειτουργεί από την %{company_full_name} ("%{company_name}"). Ο ιστότοπος προσφέρεται υπό την προυπόθεση της εκ μέρους σας αποδοχής, χωρίς τροποποίηση όλων των όρων και συνθηκών που περιλαμβάνονται στο παρόν κείμενο και όλους τους άλλους κανόνες λειτουργείας, πολιτικές (περιλαμβανομένων, χωρίς περιορισμό, %{company_domain}’s [Πολιτική προστασίας προσωπικών δεδομένων](/προστασία προσωπικών δεδομένων) και [Κατευθυντήριες Οδηγίες Κοινότητας](Συχνές Ερωτήσεις)) και διαδικασίες που μπορεί να δημοσιευθούν από καιρού εις καιρών σε αυτό τον ιστότοπο από την %{company_name} (Συνοπτικά, το ‘’Συμφωνητικό’’).
 
@@ -2361,7 +2710,7 @@ el:
 
 
   privacy_topic:
-    title: "Πολιτική Προστασίας Προσωπικών Δεδομένων"
+    title: "Πολιτική Ιδιωτικότητας"
     body: |
       <a όνομα=“συλλέγουν"></a>
 
@@ -2445,109 +2794,107 @@ el:
   badges:
     editor:
       name: Συντάκτης
-      description: Πρώτη επεξεργασία δημοσίευσης
+      description: Πρώτη επεξεργασία ανάρτησης
       long_description: |
         Αυτό το παράσημο δίνεται την πρώτη φορά που επεξεργάζεσαι μία από τις αναρτήσεις σου. Δεν θα έχεις τη δυνατότητα να επεξεργάζεσαι τις αναρτήσεις σου για πάντα, όμως η επεξεργασία είναι πάντα καλή ιδέα. Μπορείς να βελτιώσεις τις αναρτήσεις σου, να διορθώσεις μικρά λάθη ή να προσθέσεις οτιδήποτε σου διέφυγε όταν έκανες την ανάρτηση. Επεξεργάσου τις αναρτήσεις σου για να τις κάνεις ακόμη καλύτερες!
     basic_user:
-      name: Βασικός
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Χορηγήθηκαν</a> όλες οι σημαντικές λειτουργίες της κοινότητας
+      name: Αρχάριος
+      description: Παραχωρήθηκαν όλες οι βασικές λειτουργίες της κοινότητας
       long_description: |
-        Αυτό το παράσημο δίνεται όταν φτάσεις το 1ο επίπεδο εμπιστοσύνης. Ευχαριστούμε που μένεις μαζί μας για λίγο και διαβάζεις νήματα για να μάθεις σχετικά με την κοινότητά μας. Οι περιορισμοί νέου χρήστη έχουν αφαιρεθεί. Όλες οι βασικές δυνατότητες της κοινότητας σου έχουν δοθεί, όπως προσωπικά μηνύματα, επισημάνεις, επεξεργασία του wiki και τη δυνατότητα ανάρτησης πολλαπλών εικόνων και συνδέσμων.
+        Αυτό το παράσημο δίνεται όταν φτάσεις το 1ο επίπεδο εμπιστοσύνης. Ευχαριστούμε που μένεις μαζί μας για λίγο και διαβάζεις νήματα για να μάθεις σχετικά με την κοινότητά μας. Οι περιορισμοί νέου χρήστη έχουν αφαιρεθεί. Όλες οι βασικές δυνατότητες της κοινότητας σου έχουν δοθεί, όπως προσωπικά μηνύματα, επισημάνσεις, επεξεργασία του wiki και δυνατότητα ανάρτησης πολλαπλών εικόνων και συνδέσμων.
     member:
       name: Μέλος
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Παραχωρήθηκε</a> προσκλήσεις, μηνύματα ομάδας, περισσότερα μου αρέσει
+      description: Παραχωρήθηκε δυνατότητα για αποστολή προσκλήσεων, μηνύματα ομάδας, περισσότερα μου αρέσει
       long_description: |
         Αυτό το παράσημο δίνεται όταν φτάσεις το 2ο επίπεδο εμπιστοσύνης. Ευχαριστούμε που συμμετέχεις και είσαι μέλος της κοινότητας μας εδώ και κάποιες εβδομάδες. Μπορείς πλέον να στέλνεις προσκλήσεις από την σελίδα χρήστη σου ή από ατομικά νήματα, να δημιουργείς ομαδικά προσωπικά μηνύματα και να έχεις λίγα περισσότερα "μου αρέσει" ημερησίως.
     regular:
-      name: Κανονικός
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Δόθηκε</a> επανακατηγοριοποίησε, μετονόμασε, ακολούθησε συνδέσμους, wiki, περισσότερα "μου αρέσει"
+      name: Τακτικός
+      description: Παραχωρήθηκε δυνατότητα για επανακατηγοριοποίηση, μετονομασία, ακολούθηση συνδέσμων, wiki, περισσότερα "μου αρέσει"
       long_description: |
-        Αυτό το παράσημο δίνεται όταν φτάσεις το 3ο επίπεδο εμπιστοσύνης. Ευχαριστούμε που είσαι κανονικό μέλος της κοινότητάς μας εδώ και μήνες. Είσαι πλέον ένας από τους πιο ενεργούς αναγνώστες και έμπιστα συμβάλλεις να γίνει η κοινότητά μας υπέροχη. Μπορείς πλέον να ανακατηγοριοποιήσεις και να μετονομάσεις νήματα, να εκμεταλλευτείς πιο ισχυρές επισημάνσεις , να έχεις πρόσβαση σε ιδιωτική περιοχή χαλάρωσης και επιπλέον θα παίρνεις πολύ περισσότερα "μου αρέσει" ημερησίως.
+        Αυτό το παράσημο δίνεται όταν φτάσεις το 3ο επίπεδο εμπιστοσύνης. Ευχαριστούμε που είσαι τακτικό μέλος της κοινότητάς μας εδώ και μήνες. Είσαι πλέον ένας από τους πιο ενεργούς αναγνώστες και έμπιστα συμβάλλεις να γίνει η κοινότητά μας υπέροχη. Μπορείς πλέον να ανακατηγοριοποιήσεις και να μετονομάσεις νήματα, να εκμεταλλευτείς πιο ισχυρές επισημάνσεις, να έχεις πρόσβαση σε ιδιωτική περιοχή χαλάρωσης και επιπλέον θα παίρνεις πολύ περισσότερα "μου αρέσει" ημερησίως.
     leader:
       name: Αρχηγός
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Παραχωρήθηκε</a> επεξεργασία, καρφίτσωμα, κλείσιμο, αρχείο, διάσπαση και συγχώνευση, περισσότερα μου αρέσει
+      description: Παραχωρήθηκε δυνατότητα για καθολική επεξεργασία, καρφίτσωμα, κλείσιμο, αρχειοθέτηση, διαχωρισμό και συγχώνευση, περισσότερα μου αρέσει
       long_description: |
-        Αυτό το παράσημο δίνεται όταν φτάσεις το 4ο επίπεδο εμπιστοσύνης. Οι συνεργάτες έχουν επιλέξει να είσαι αρχηγός αυτής της κοινότητας και δίνεις το καλό παράδειγμα για την υπόλοιπη κοινότητα με τις πράξεις και τις λέξεις σου εδώ. Έχεις τη δυνατότητα να επεξεργαστείς όλες τις αναρτήσεις, να συντονίσεις νήματα μέσω καρφιτσώματος, κλεισίματος, αρχειοθέτησης, αφαίρεση κατηγοριοποίησης, διαίρεση και συγχώνευση καθώς επίσης και τόνους "μου αρέσει" την ημέρα.
+        Αυτό το παράσημο δίνεται όταν φτάσεις το 4ο επίπεδο εμπιστοσύνης. Οι συνεργάτες έχουν επιλέξει να είσαι αρχηγός αυτής της κοινότητας και δίνεις το καλό παράδειγμα για την υπόλοιπη κοινότητα με τις πράξεις και τα λεγόμενά σου. Έχεις τη δυνατότητα να επεξεργαστείς όλες τις αναρτήσεις, να συντονίσεις νήματα μέσω καρφιτσώματος, κλεισίματος, αρχειοθέτησης, αφαίρεσης κατηγοριοποίησης, διαίρεσης και συγχώνευση καθώς επίσης και τόνους "μου αρέσει" κάθε μέρα.
     welcome:
-      name: Καλώς ήλθατε
+      name: Καλωσόρισμα
       description: Έλαβε ένα "Μου αρέσει"
       long_description: |+
-        Το παράσημο χορηγείται όταν λαμβάνεις το πρώτο σου "Μου αρέσει" σε μια δημοσίευση. Συγχαρητήρια, δημοσίευσες κάτι μου τα υπόλοιπα μέλη της κοινότητας βρήκαν ενδιαφέρον, ωραίο, ή χρήσιμο!
+        Το παράσημο χορηγείται όταν λαμβάνεις το πρώτο σου "Μου αρέσει" σε μια ανάρτηση. Συγχαρητήρια, δημοσίευσες κάτι που τα υπόλοιπα μέλη της κοινότητας βρήκαν ενδιαφέρον, ωραίο ή χρήσιμο!
 
     autobiographer:
       name: Αυτοβιογράφος
-      description: Συμπλήρωσε <a href="/my/preferences"> προφίλ</a> πληροφορίες
+      description: Συμπλήρωσε τις πληροφορίες του <a href="%{base_uri}/my/preferences/profile">προφίλ</a>
       long_description: |
-        Αυτό το παράσημο δίνεται όταν συμπληρώσεις <a href="/my/preferences">your user profile</a> και επιλέξεις μια φωτογραφία προφίλ. Επιτρέποντας στην κοινότητα να μάθει λίγα περισσότερα για σένα και τα ενδιαφέροντά σου, δημιουργεί μια καλύτερη, πιο διασυνδεμένη κοινότητα. Γίνε κι εσύ μέλος της!
+        Αυτό το παράσημο χορηγείται όταν συμπληρώσεις <a href="%{base_uri}/my/preferences/profile">το προφίλ σου</a> και επιλέξεις μια φωτογραφία προφίλ. Επιτρέποντας στην κοινότητα να μάθει λίγα περισσότερα για σένα και τα ενδιαφέροντά σου, βοηθάει στην δημιουργία μιας καλύτερης, πιο διασυνδεμένης κοινότητας.
     anniversary:
       name: Επέτειος
-      description: Ενεργό μέλος για ένα χρόνο, δημοσίευσε τουλάχιστον μια φορά
+      description: Ενεργό μέλος για ένα χρόνο με τουλάχιστον μια ανάρτηση
       long_description: |+
-        Το παράσημο χορηγείται όταν είσαι μέλος για ένα χρόνο με τουλάχιστον μια δημοσίευση σε αυτόν τον χρόνο. Ευχαριστούμε που έμεινες τριγύρω και για την συνεισφορά σου στην κοινότητα. Δε θα μπορούσαμε να κάνουμε χωρίς εσένα!
+        Το παράσημο χορηγείται όταν είσαι μέλος για ένα χρόνο με τουλάχιστον μια ανάρτηση σε αυτόν τον χρόνο. Ευχαριστούμε που έμεινες τριγύρω και για την συνεισφορά σου στην κοινότητα. Δε θα μπορούσαμε να κάνουμε χωρίς εσένα!
 
     nice_post:
-      name: Ωραία απάντηση
+      name: Καλή Απάντηση
       description: Έλαβε 10 "Μου αρέσει" σε μια απάντηση
       long_description: |+
-        Το παράσημο χορηγείται όταν η απάντηση σου παίρνει 10 "Μου αρέσει". Η απάντησή σου εντυπωσίασε την κοινότητα και βοήθησε τη συζήτηση να πάει μπροστά!
+        Το παράσημο χορηγείται όταν η απάντηση σου παίρνει 10 "Μου αρέσει". Η απάντησή σου άρεσε στην κοινότητα και βοήθησε τη συζήτηση να πάει μπροστά!
 
     good_post:
-      name: Καλή απάντηση
+      name: Πολύ Καλή Απάντηση
       description: 'Έλαβε 25 "Μου αρέσει" σε μια απάντηση '
-      long_description: |+
+      long_description: |
         Το παράσημο χορηγείται όταν η απάντησή σου παίρνει 25 ¨Μου αρέσει". Η απάντησή σου ήταν εξαιρετική και έκανε τη συζήτηση πολύ καλύτερη για όλους!
-
     great_post:
-      name: Υπέροχη απάντηση
+      name: Υπέροχη Απάντηση
       description: Έλαβε 50 "Μου αρέσει" σε μια απάντηση
-      long_description: |+
-        Το παράσημο χορηγείται όταν η απάντησή σου παίρνει 50 "Μου αρέσει". Ουάου! Η απάντησή σου προκάλεσε έμπνευση, ήταν μαγευτική ή διορατική και η κοινότητά σου τη λάτρεψε.
-
+      long_description: |
+        Το παράσημο χορηγείται όταν η απάντησή σου παίρνει 50 "Μου αρέσει". Ουάου! Η απάντησή σου προκάλεσε έμπνευση, ήταν μαγευτική ή διορατική και η κοινότητά μας τη λάτρεψε.
     nice_topic:
-      name: Ωραίο νήμα
+      name: Καλο Νήμα
       description: Έλαβε 10 "Μου αρέσει" σε ένα νήμα
       long_description: |+
-        Το παράσημο χορηγείται όταν το νήμα σου παίρνει 10 "Μου αρέσει". Λοιπόν, ξεκίνησες μια ενδιαφέρουσα συζήτηση που απόλαυσε η κοινότητα!
+        Το παράσημο χορηγείται όταν το νήμα σου παίρνει 10 "Μου αρέσει". Όπως φαίνεται, ξεκίνησες μια ενδιαφέρουσα συζήτηση που άρεσε στην κοινότητα!
 
     good_topic:
-      name: Καλό νήμα
+      name: Πολύ Καλό Νήμα
       description: Έλαβε 25 "Μου αρέσει" σε ένα νήμα
       long_description: |
-        Αυτό το παράσημο δίνεται όταν το νήμα σου φτάνει τα 25 "μου αρέσει". Ξεκίνησες μια ζωντανή συζήτηση γύρω από την οποία η κοινότητα συγκεντρώθηκε και την οποία αγάπησε!
+        Αυτό το παράσημο δίνεται όταν το νήμα σου φτάνει τα 25 "μου αρέσει". Ξεκίνησες μια έντονη συζήτηση γύρω από την οποία η κοινότητα συγκεντρώθηκε και την αγάπησε!
     great_topic:
-      name: Υπέροχο νήμα
+      name: Υπέροχο Νήμα
       description: Έλαβε 50 "Μου αρέσει" σε ένα νήμα
       long_description: |+
-        Το παράσημο χορηγείται όταν το νήμα σου παίρνει 50 "Μου αρέσει". Ξεκίνησες μια μαγευτική συζήτηση και η κοινότητα απόλαυσε τη δυναμική κουβέντα που δημιουργήθηκε!
+        Το παράσημο χορηγείται όταν το νήμα σου παίρνει 50 "Μου αρέσει". Ξεκίνησες μια συναρπαστική συζήτηση και η κοινότητα απόλαυσε τη δυναμική κουβέντα που δημιουργήθηκε!
 
     nice_share:
-      name: Ωραία κοινοποίηση
-      description: Κοινοποίησε μια δημοσίευση με 25 μοναδικούς επισκέπτες
+      name: Καλή Κοινοποίηση
+      description: Κοινοποίησε μια ανάρτηση με 25 μοναδικούς επισκέπτες
       long_description: |
-        Αυτό το παράσημο δίνεται όταν μοιράζεσαι ένα σύνδεσμο που πατήθηκε από 25 εξωτερικούς επισκέπτες. Ευχαριστούμε που διαδίδεις τις συητήσεις μας και αυτή την κοινότητα.
+        Αυτό το παράσημο χορηγείται για την κοινοποίηση ενός συνδέσμου στον οποίον έκαναν κλικ 25 εξωτερικοί επισκέπτες. Ευχαριστούμε που διαδίδεις τις συητήσεις μας και αυτή την κοινότητα.
     good_share:
-      name: Καλή κοινοποίηση
+      name: Πολύ Καλή Κοινοποίηση
       description: Κοινοποίησε μια δημοσίευση με 300 μοναδικούς επισκέπτες
       long_description: |+
-        Το παράσημο χορηγήθηκε για την κοινοποίηση ενός συνδέσμου, στο οποίο πάτησαν κλικ 300 εξωτερικοί επισκέπτες. Έχεις επιδείξει μια υπέροχη συζήτηση σε ένα πλήθος καινούριου κόσμου και βοήθησες την κοινότητα να μεγαλώσει.
+        Αυτό το παράσημο χορηγείται για την κοινοποίηση ενός συνδέσμου στον οποίον έκαναν κλικ 300 εξωτερικοί επισκέπτες. Μπράβο σου! Έχεις οδηγήσει ένα πλήθος νέου κόσμου να γνωρίσει τις συζητήσεις μας βοηθώντας έτσι την κοινότητά μας να μεγαλώσει.
 
     great_share:
-      name: Υπέροχη κοινοποίηση
+      name: Υπέροχη Κοινοποίηση
       description: Κοινοποίησε μια δημοσίευση με 1000 μοναδικούς επισκέπτες
       long_description: |+
-        Το παράσημο χορηγείται για την κοινοποίηση ενός συνδέσμου, στο οποίο πάτησαν κλικ 1000 εξωτερικοί επισκέπτες. Ουάου! Έχεις προωθήσει μια ενδιαφέρουσα συζήτηση σε ένα τεράστιο, νέο κοινό, και μας βοήθησες να μεγαλώσουμε την κοινότητά μας σε μεγάλο βαθμό!
+        Αυτό το παράσημο χορηγείται για την κοινοποίηση ενός συνδέσμου στον οποίον έκαναν κλικ 1000 εξωτερικοί επισκέπτες.. Ουάου! Έχεις προωθήσει μια ενδιαφέρουσα συζήτηση σε ένα τεράστιο νέο κοινό, βοηθώντας έτσι την κοινότητά μας να μεγαλώσει σε μεγάλο βαθμό!
 
     first_like:
       name: Πρώτο "Μου αρέσει"
       description: «Μου άρεσε» μια ανάρτηση
       long_description: |+
-        Το παράσημο χορηγείται την πρώτη φορά που πατάς "Μου αρέσει" σε μια κοινοποίηση χρησιμοποιώντας το κουμπί :heart:. Το να πατάς "Μου αρέσει" σε δημοσιεύσεις είναι ένας υπέροχος τρόπος να αφήνεις τα υπόλοιπα μέλη της κοινότητας να γνωρίζουν ότι αυτό που δημοσίευσαν ήταν ενδιαφέρον, χρήσιμο, ωραίο ή διασκεδαστικό. Κοινοποίησε την αγάπη!
+        Το παράσημο χορηγείται την πρώτη φορά που πατάς "Μου αρέσει" σε μια ανάρτηση χρησιμοποιώντας το κουμπί :heart:. Πατώντας "Μου αρέσει" στις αναρτήσεις είναι ο καλύτερος τρόπος να δίνεις στα υπόλοιπα μέλη της κοινότητας να καταλάβουν ότι αυτό που δημοσίευσαν ήταν ενδιαφέρον, χρήσιμο, έξυπνο ή διασκεδαστικό. Μοιράσου την αγάπη!
 
     first_flag:
-      name: Πρώτη επισήμανση
-      description: Επεσήμανε μια δημοσίευση
+      name: Πρώτη Επισήμανση
+      description: Επισήμανε μια ανάρτηση
       long_description: |
-        Αυτό το παράσημο δίνεται την πρώτη φορά που επισημαίνεις μια ανάρτηση. Με την επισήμανση βοηθάμε όλοι να κρατάμε αυτό το σημείο καθαρό και φωτεινό για όλους. Εάν παρατηρήσεις οποιαδήποτε ανάρτηση που απαιτεί την προσοχή του συντονιστή για οποιοδήποτε λόγο, σε παρακαλούμε μην διστάσεις να την επισημάνεις. Μπορείς επίσης να επισημάνεις για να στείλεις <b>προσωπικά μηνύματα</b> σε άλλους χρήστες εάν βρεις κάποιο πρόβλημα με την ανάρτησή τους. Εάν βρεις κάποιο πρόβλημα, :flag_black: επισήμανέ το!
+        Αυτό το παράσημο χορηγείται την πρώτη φορά που επισημαίνεις μια ανάρτηση. Με τις επισημάνσεις βοηθάμε όλοι να παραμένει η κοινότητα καθαρή για όλους. Εάν παρατηρήσεις οποιαδήποτε ανάρτηση που απαιτεί έλεγχο από συντονιστή για οποιοδήποτε λόγο, σε παρακαλούμε μην διστάσεις να την επισημάνεις. Μπορείς επίσης να επισημάνεις για να στείλεις <b>προσωπικά μηνύματα</b> σε άλλους χρήστες εάν βρεις κάποιο πρόβλημα με την ανάρτησή τους. Εάν βρεις οποιοδήποτε πρόβλημα, :flag_black: επισήμανέ το!
     promoter:
       name: Προωθητής
       description: Προσκάλεσε ένα χρήστη
@@ -2558,36 +2905,36 @@ el:
       name: Εκστρατεύων
       description: Προσκάλεσε 3 βασικούς χρήστες
       long_description: |+
-        Το παράσημο χορηγείται όταν έχεις προσκαλέσει 3 άτομα, οι οποίοι μεταγενέστερα πέρασαν αρκετό χρόνο στην ιστοσελίδα για να γίνουν βασικοί χρήστες. Μια ζωηρή κοινότητα χρειάζεται τακτική έμπνευση από τους νεοελθόντες, οι οποίοι συμμετέχουν τακτικά και προσθέτουν καινούριες φωνές στη συζήτηση.
+        Το παράσημο χορηγείται όταν έχεις προσκαλέσει 3 άτομα,  τα οποία στην συνέχεια πέρασαν αρκετό χρόνο στην ιστοσελίδα και έγιναν βασικοί χρήστες. Μια ζωηρή κοινότητα χρειάζεται την τακτική εισροή νεων χρηστών σε αυτήν και με την συμμετοχή τους να προσθέτουν καινούριες φωνές στη συζήτηση.
 
     champion:
       name: 'Πρωταθλητής '
       description: Προσκάλεσε 5 μέλη
       long_description: |+
-        Το παράσημο χορηγείται όταν έχεις προσκαλέσει 5 άτομα, οι οποίοι μεταγενέστερα πέρασαν πολύ χρόνο στην ιστοσελίδα για να γίνουν μέλη πλήρως. Ουάου! Ευχαριστούμε που επέκτεινες την ποικιλία της κοινότητάς μας με καινούρια μέλη!
+        Το παράσημο χορηγείται όταν έχεις προσκαλέσει 5 άτομα, τα οποία στην συνέχεια πέρασαν αρκετό χρόνο στην ιστοσελίδα και έγιναν κανονικοί χρήστες. Ουάου! Ευχαριστούμε που επέκτεινες την ποικιλία της κοινότητάς μας με καινούρια μέλη!
 
     first_share:
       name: Πρώτη Κοινοποίηση
       description: Κοινοποίησε μια δημοσίευση
       long_description: |+
-        Το παράσημο χορηγείται την πρώτη φορά που κοινοποιείς ένα σύνδεσμο σε μια απάντηση ή σε ένα νήμα χρησιμοποιώντας το κουμπί της κοινοποίησης. Το να κοινοποιείς συνδέσμους είναι ένας καλός τρόπος να επιδείξεις ενδιαφέρουσες συζητήσεις με τον υπόλοιπο κόσμο και να μεγαλώσεις την κοινότητά σου.
+        Το παράσημο χορηγείται την πρώτη φορά που κοινοποιείς ένα σύνδεσμο σε μια απάντηση ή σε ένα νήμα χρησιμοποιώντας το κουμπί της κοινοποίησης. Το να κοινοποιείς συνδέσμους είναι ένας καλός τρόπος να επιδείξεις ενδιαφέρουσες συζητήσεις με τον υπόλοιπο κόσμο και να μεγαλώσεις την κοινότητά μας.
 
     first_link:
       name: Πρώτος σύνδεσμος
       description: Προστέθηκε ένας σύνδεσμος σε ένα άλλο νήμα
       long_description: |+
-        Το παράσημο χορηγείται την πρώτη φορά που προσθέτεις ένα σύνδεσμο σε ένα άλλο νήμα. Το να συνδέεις νήματα βοηθά τους συν-αναγνώστες σου να βρουν ενδριαφέρουσες σχετικές συζητήσεις, δείχνοντας τα κοινά στοιχεία μεταξύ των νημάτων και στις δυο κατευθύνσεις. Κάνε συνδέσμους ελεύθερα!
+        Το παράσημο χορηγείται την πρώτη φορά που προσθέτεις ένα σύνδεσμο σε ένα άλλο νήμα. Το να συνδέεις νήματα βοηθά τους άλλους χρήστες να βρουν ενδριαφέρουσες σχετικές συζητήσεις, δείχνοντας τα κοινά στοιχεία μεταξύ των νημάτων και στις δυο κατευθύνσεις. Κάνε συνδέσμους ελεύθερα!
 
     first_quote:
-      name: Πρώτο απόσπασμα
-      description: Ανάφερε μια δημοσίευση
+      name: Πρώτη Παράθεση
+      description: Παράθεσε μια ανάρτηση
       long_description: |
-        Αυτό το παράσημο δίνεται την πρώτη φορά που παραθέτεις μια ανάρτηση σε μια απάντησή σου. Παραθέτοντας σχετικές ενοτητες από νωρίτερες αναρτήσεις στη απάντησή σου βοηθάει να κρατάμε τις συζητήσεις συνδεδεμένες και εντός θέματος. Ο πιο εύκολος τρόπος να παραθέσεις είναι να μαρκάρεις μια ενότητα από μια ανάρτηση και έπειτα να πατήσεις οποιδήποτε πλήκτρο απάντησης. Παραθέστε γεναιόδωρα!
+        Αυτό το παράσημο δίνεται την πρώτη φορά που παραθέτεις μια ανάρτηση σε μια απάντησή σου. Παραθέτοντας σχετικά τμήματα από προηγούμενες αναρτήσεις στην απάντησή σου, βοηθάει να παραμένουν οι συζητήσεις συνδεδεμένες και εντός θέματος. Ο πιο εύκολος τρόπος να παραθέσεις, είναι να μαρκάρεις ένα τμήμα από μια ανάρτηση και έπειτα να πατήσεις κάποιο πλήκτρο απάντησης. Παραθέστε ελεύθερα!
     read_guidelines:
-      name: Διάβασε τις κατευθυντήριες γραμμές
-      description: Διαβάστε το<a href="/guidelines"> κατευθυντήριες γραμμές της κοινότητας</a>
+      name: Διάβασε τις Οδηγίες
+      description: Διάβασε τις <a href="%{base_uri}/guidelines">οδηγίες χρήσης της κοινότητας</a>
       long_description: |+
-        Το παράσημο χορηγείται για <a href="/guidelines"> διαβάζοντας τις οδηγίες της κοινότητας</a>. Ακολουθώντας και κοινοποιώντας αυτές τις απλές οδηγίες σε βοηθά να χτίσεις μια ασφαλή, διασκεδαστική και βιώσιμη κοινότητα για όλους. Να θυμάσαι πάντα ότι υπάρχει κάποιος άλλος άνθρωπος, πολύ όμοιος με εσένα, στην άλλη πλευρά της οθόνης. Να είσαι καλός!
+        Το παράσημο χορηγείται για την <a href="%{base_uri}/guidelines">ανάγνωση των οδηγιών χρήσης της κοινότητας</a>. Ακολουθώντας και κοινοποιώντας αυτές τις απλές οδηγίες σε βοηθά να χτίσεις μια ασφαλή, διασκεδαστική και βιώσιμη κοινότητα για όλους. Να θυμάσαι πάντα ότι υπάρχει κάποιος άλλος άνθρωπος, πολύ όμοιος με εσένα, στην άλλη πλευρά της οθόνης. Να είσαι καλός!
 
     reader:
       name: Αναγνώστης
@@ -2596,123 +2943,138 @@ el:
         Το παράσημο χορηγείται την πρώτη φορά που διαβάζεις ένα μακρύ νήμα με πάνω από 100 απαντήσεις. Το να διαβάζεις μια συζήτηση στενά σε βοηθά να ακολουθήσεις τη συζήτηση, να καταλάβεις διαφορετικές απόψεις και οδηγεί σε πιο ενδιαφέρουσες συζητήσεις. Όσο περισσότερο διαβάζεις, τόσο το καλύτερο για τη συζήτηση. Όπως μας αρέσει να λέμε, το Διάβασμα είναι θεμελιώδες! :slight_smile:
 
     popular_link:
-      name: Δημοφιλής σύνδεσμος
-      description: Δημοσιεύτηκε μια εξωτερική σύνδεση με 50 κλικ
+      name: Δημοφιλής Σύνδεσμος
+      description: Δημοσίευσε έναν εξωτερικό σύνδεσμο με 50 κλικ
       long_description: |+
-        Το παράσημο χορηγείται όταν ένας σύνδεσμος που κοινοποιείς έχει 50 χτυπήματα. Ευχαριστούμε που δημοσίευσες έναν χρήσιμο σύνδεσμο που πρόσθεσε ενδιαφέροντα συμφραζόμενα στη συζήτηση!
+        Το παράσημο χορηγείται όταν ένας σύνδεσμος που κοινοποίησες λάβει 50 κλικς. Ευχαριστούμε που δημοσίευσες έναν χρήσιμο σύνδεσμο που πρόσθεσε ενδιαφέρον περιεχόμενο στη συζήτηση!
 
     hot_link:
-      name: "\t\nΖεστή σύνδεση"
-      description: Δημοσιεύτηκε μια εξωτερική σύνδεση με 300 κλικ
+      name: Καυτός Σύνδεσμος
+      description: Δημοσίευσε έναν εξωτερικό σύνδεσμο με 300 κλικ
       long_description: |+
-        Το παράσημο χορηγείται όταν ένας σύνδεσμος που κοινοποίησες έχει 300 χτυπήματα. Ευχαριστούμε που δημοσίευσες έναν τόσο μαγευτικό σύνδεσμο που πήγε τη συζήτηση πολύ μπροστά και της έριξε φως!
+        Το παράσημο χορηγείται όταν ένας σύνδεσμος που κοινοποίησες λάβει 300 κλικς. Ευχαριστούμε που δημοσίευσες έναν τόσο μαγευτικό σύνδεσμο που πήγε τη συζήτηση πολύ μπροστά και της έριξε φως!
 
     famous_link:
-      name: Δημοφιλής σύνδεσμος
-      description: Δημοσιεύτηκε μια εξωτερική σύνδεση με 1000 κλικ
-      long_description: |+
-        Το παράσημο χορηγείται όταν ο σύνδεσμος που κοινοποιείς έχει 1000 χτυπήματα. Ουάου!Δημοσίευσες ένα σύνδεσμο που βελτίωσε σημαντικά τη συζήτηση προσθέτοντας ουσιώδεις λεπτομέρειες, συμφραζόμενα και πληροφορίες. Υπέροχη δουλειά!
-
+      name: Διάσημος Σύνδεσμος
+      description: Δημοσίευσε έναν εξωτερικό σύνδεσμο με 1000 κλικ
+      long_description: |
+        Το παράσημο χορηγείται όταν ένας σύνδεσμος που κοινοποίησες λάβει 1000 κλικς. Ουάου! Δημοσίευσες ένα σύνδεσμο που βελτίωσε σημαντικά τη συζήτηση προσθέτοντας ουσιώδεις λεπτομέρειες, συμφραζόμενα και πληροφορίες. Υπέροχη δουλειά!
     appreciated:
-      name: Εκτιμωμένος
+      name: Αναγνωρίζεται
       description: Έλαβε 1 "Μου αρέσει" σε 20 δημοσιεύσεις
-      long_description: |+
-        Το παράσημο χορηγείται όταν λαμβάνεις τουλάχιστον ένα "Μου αρέσει" σε 20 διαφορετικές δημοσιεύσεις. Η κοινότητα απολαμβάνει την συνεισφορά σου στις συζητήσεις εδώ!
-
+      long_description: |
+        Το παράσημο χορηγείται όταν λαμβάνεις τουλάχιστον ένα "Μου αρέσει" σε 20 διαφορετικές δημοσιεύσεις. Η κοινότητα αναγνωρίζει την συνεισφορά σου στις συζητήσεις εδώ!
     respected:
-      name: Σεβαστή
+      name: Εκτιμάται
       description: Έλαβε 2 "Μου αρέσει" σε 100 δημοσιεύσεις
-      long_description: |+
-        Το παράσημο χορηγείται όταν λαμβάνεις τουλάχιστον 2 "Μου αρέσει" σε 100 διαφορετικές δημοσιεύσεις. Η κοινότητα σέβεται τη μεγάλη σου συνεισφορά στις συζητήσεις εδώ.
-
+      long_description: |
+        Το παράσημο χορηγείται όταν λαμβάνεις τουλάχιστον 2 "Μου αρέσει" σε 100 διαφορετικές δημοσιεύσεις. Η κοινότητα εκτιμά τη μεγάλη σου συνεισφορά στις συζητήσεις εδώ.
     admired:
-      name: Θαύμαζα
+      name: Θαυμάζεται
       description: Έλαβε 5 "Μου αρέσει" σε 300 δημοσιεύσεις
       long_description: |
         Αυτό το παράσημο χορηγείται όταν λαμβάνεις τουλάχιστον 5 "Μου αρέσει" σε 300 διαφορετικές δημοσιεύσεις. Ουάου! Η κοινότητα θαυμάζει την συχνή και υψηλής ποιότητας συνεισφορά σου στις συζητήσεις εδώ.
     out_of_love:
-      name: 'Από αγάπη '
+      name: 'Αγάπη '
       description: Χρησιμοποίησε 50 "Μου αρέσει" σε μια ημέρα
       long_description: |+
-        Το παράσημο χορηγείται όταν χρησιμοποιείς όλα τα 50 "Μου αρέσει" που έχεις καθημερινά. Να θυμάσαι ότι το να έχεις το χρόνο να πατάς "Μου αρέσει" στις δημοσιεύσεις που απολαμβάνεις και εκτιμάς, ενθαρρύνει τα μέλη της κοινότητας σου να δημιουργούν ακόμα καλύτερες συζητήσεις στο μέλλον.
+        Το παράσημο χορηγείται όταν χρησιμοποιείς όλα τα 50 "Μου αρέσει" που έχεις ημερησίως. Να θυμάσαι ότι το να έχεις το χρόνο να πατάς "Μου αρέσει" στις αναρτήσεις που απολαμβάνεις και εκτιμάς, ενθαρρύνει τα μέλη της κοινότητας σου να δημιουργούν ακόμα καλύτερες συζητήσεις στο μέλλον.
 
     higher_love:
-      name: Υψηλότερο Επίπεδο Αγάπης
+      name: Πολύ Αγάπη
       description: Χρησιμοποίησε 50 "Μου αρέσει" σε μια ημέρα 5 φορές
-      long_description: |+
+      long_description: |
         Το παράσημο χορηγείται όταν χρησιμοποιείς όλα τα 50 ¨Μου αρέσει" που έχεις ημερησίως για 5 ημέρες. Ευχαριστούμε για το χρόνο σου να ενθαρρύνεις ενεργά τις καλύτερες συζητήσεις κάθε μέρα!
-
     crazy_in_love:
-      name: Τρελά ερωτευμένος
+      name: Τρελή Αγάπη
       description: Χρησιμοποίησε 50 "Μου αρέσει" σε μια ημέρα 20 φορές
-      long_description: |+
+      long_description: |
         Το παράσημο χορηγείται όταν χρησιμοποιείς όλα τα 50 "Μου αρέσει" που έχεις ημερησίως για 20 ημέρες. Ουάου! Είσαι υπόδειγμα τακτικής ενθάρρυνσης των μελών της κοινότητάς σου!
-
     thank_you:
-      name: Σε ευχαριστώ
+      name: Ευχαριστεί
       description: Έχει σε 20 δημοσιεύσεις "Μου αρέσει" και πάτησε 10 "Μου αρέσει"
-      long_description: |+
+      long_description: |
         Το παράσημο χορηγείται όταν έχεις 20 "Μου αρέσει" σε δημοσιεύσεις και δίνεις 10 ή περισσότερα "Μου αρέσει" σε αντάλλαγμα. Όταν κάποιος πατάει "Μου αρέσει" στη δημοσίευσή σου, βρίσκεις το χρόνο να πατήσεις "Μου αρέσει" σε ότι δημοσιεύουν οι άλλοι, επίσης.
-
     gives_back:
       name: Ανταποδίδει
       description: Έχει σε 100 δημοσιεύσεις "Μου αρέσει" και πάτησε 100 "Μου αρέσει"
       long_description: |
-        Αυτό το παράσημο δίνεται όταν έχεις 100 αναρτήσεις με ένδειξη  "μου αρέσει" και ταυτόχρονα έχεις κι εσύ πατήσει "μου αρέσει" σε 100 ή περισσότερες αναρτήσεις. Ευχαριστούμε που το συνεχίζεις!
+        Το παράσημο χορηγείται όταν έχεις 20 "Μου αρέσει" σε δημοσιεύσεις και ταυτόχρονα έχεις κι εσύ πατήσει "μου αρέσει" σε 100 ή περισσότερες αναρτήσεις. Ευχαριστούμε που το συνεχίζεις!
     empathetic:
-      name: 'Κατανοητικός '
+      name: Λατρεία
       description: 'Έχει σε 500 δημοσιεύσεις "Μου αρέσει" και πάτησε 1000 "Μου αρέσει" '
-      long_description: |+
+      long_description: |
         Το παράσημο χορηγείται όταν έχεις 500 "Μου αρέσει" σε δημοσιεύσεις και δίνεις 1000 ή περισσότερα "Μου αρέσει" σε αντάλλαγμα. Ουάου! Είσαι υπόδειγμα γενναιοδωρίας και αμοιβαίας εκτίμησης :two_hearts:.
-
     first_emoji:
       name: Πρώτο Emoji
       description: Χρησιμοποίησε ένα Emoji σε μια ανάρτηση
       long_description: |
-        Αυτό το παράσημο δίνεται την πρώτη φορά που προσθέτεις κάποιο Emoji σε ανάρτησή σου :thumbsup:. Τα Emoji σου επιτρέπουν να προσθέσεις συναίσθημα στις αναρτήσεις σου, από χαρά :smiley: έως λύπη :anguished: έως θυμό :angry: και όλα τα ενδιάμεσα :sunglasses: . Απλώς πληκτρολόγησε ένα : (colon) ή πίεσε το πλήκτρο εργαλειοθήκης Emoji στο συνθέτη για να διαλέξεις  από εκατοντάδες επιλογές  :ok_hand:
+        Αυτό το παράσημο δίνεται την πρώτη φορά που προσθέτεις κάποιο Emoji σε ανάρτησή σου :thumbsup:. Τα Emoji σου επιτρέπουν να προσθέσεις συναίσθημα στις αναρτήσεις σου, από χαρά :smiley: έως λύπη :anguished: έως θυμό :angry: και όλα τα ενδιάμεσα :sunglasses: . Απλώς πληκτρολόγησε ένα : (άνω κάτω τελεία) ή πίεσε το πλήκτρο εργαλειοθήκης Emoji στο συνθέτη για να διαλέξεις  από εκατοντάδες επιλογές  :ok_hand:
     first_mention:
-      name: Πρώτη αναφορά
-      long_description: 'Αυτό το παράσημο δίνεται την πρώτη φορά που αναφέρεις το @χρηστώνυμο κάποιου στην ανάρτηση. Κάθε αναφορά δημιουργεί μια ειδοποίηση σε αυτό το άτομο, ώστε να μάθουν για την ανάρτησή σου. Απλώς ξεκίνα να πληκτρολογείς το @ (στα σύμβολα) για να αναφέρεις οποιδήποτε χρήστη ή, εάν επιτρέπεται, μια ομάδα. Είναι ένας βολικός τρόπος να τραβήξεις την προσοχή τους σε κάτι. '
+      name: Πρώτη Αναφορά
+      description: Ανέφερε έναν χρήστη σε μία ανάρτηση
+      long_description: 'Αυτό το παράσημο δίνεται την πρώτη φορά που αναφέρεις το @όνομα κάποιου στην ανάρτησή σου. Κάθε αναφορά δημιουργεί μια ειδοποίηση σε αυτό το άτομο, ώστε να μάθουν για την ανάρτησή σου. Απλώς ξεκίνα να πληκτρολογείς το @ (at σύμβολο) για να αναφέρεις οποιοδήποτε χρήστη ή εάν επιτρέπεται, μια ομάδα. Είναι ένας βολικός τρόπος να τραβήξεις την προσοχή τους σε κάτι. '
     first_onebox:
       name: Πρώτο Onebox
       description: Αναρτήθηκε σύνδεσμος ο οποίος είναι oneboxed
       long_description: 'Αυτό το παράσημο δίνεται την πρώτη φορά που αναρτείς ένα σύνδεσμο μόνο του σε μια γραμμή, το οποίο αυτόματα αναπτύσσεται σε onebox με μια σύντονη περίληψη του συνδέσμου, ένα τίτλο και (όπου αυτό είναι διαθέσιμο) μια εικόνα. '
     first_reply_by_email:
-      name: Πρώτη απάντηση μέσω ηλεκτρονικού ταχυδρομείου
+      name: Πρώτη Απάντηση μέσω Email
+      description: Απάντησε σε μία ανάρτηση μέσω email
       long_description: |
-        Το παράσημο χορηγείται την πρώτη φορά που απαντάς σε μια δημοσίευση μέσω ηλεκτρονικού ταχυδρομείου :ηλεκτρονική διεύθυνση:.
+        Το παράσημο χορηγείται την πρώτη φορά που απαντάς σε μια δημοσίευση μέσω e-mail :e-mail:.
+    new_user_of_the_month:
+      name: "Νέος Χρήστης του Μήνα"
+      description: Εξαιρετική συνεισφορά κατά τον πρώτο μήνα
+      long_description: |
+        Αυτό το βραβείο απονέμεται σε δύο νέους χρήστες κάθε μήνα για την εξαιρετική συνεισφορά τους στην κοινότητα, όπως αυτή μετρήθηκε από το πόσο σύχνα άρεσαν οι αναρτήσεις τους και σε ποιους.
+    enthusiast:
+      name: Θιασώτης
+      description: 10 ημέρες επισκέψεων
+      long_description: Αυτό το παράσημο σας απονέμεται για 10 ημέρες επισκέψεων. Ευχαριστούμε που μείνατε μαζί μας για πάνω από μία εβδομάδα!
+    aficionado:
+      name: Οπαδός
+      description: 100 ημέρες επισκέψεων
+      long_description: Αυτό το παράσημο σας απονέμεται για 100 ημέρες επισκέψεων. Περισσότερο από τρεις μήνες!
+    devotee:
+      name: Λάτρης
+      description: 365 ημέρες επισκέψεων
+      long_description: Αυτό το παράσημο σας απονέμεται για 365  ημέρες επισκέψεων. Γουάου, ένας ολόκληρος χρόνος!
+    badge_title_metadata: "%{display_name} παράσημο στην %{site_title}"
   admin_login:
-    success: "Το Email απεστάλη"
+    success: "Το Email Στάλθηκε"
     error: "Σφάλμα!"
-    email_input: "Email διαχειριστή"
+    email_input: "Email Διαχειριστή"
     submit_button: "Αποστολή Email"
   performance_report:
     initial_post_raw: Αυτό το θέμα περιλαμβάνει καθημερινές αναφορές απόδοσης για τη σελίδα σας.
     initial_topic_title: Εκθέσεις απόδοσης ιστοσελίδας
   tags:
     title: "Ετικέτες"
-    staff_tag_disallowed: "Η επικόλληση \"%{tag}\"μπορεί να εφαρμοστεί μόνο από το προσωπικό "
-    staff_tag_remove_disallowed: "Η επικόλληση \"%{tag}\"μπορεί να αφαιρεθεί μόνο από το προσωπικό "
+    staff_tag_disallowed: "Η ετικέτα \"%{tag}\" μπορεί να εφαρμοστεί μόνο από τους συνεργάτες."
+    staff_tag_remove_disallowed: "Η ετικέτα \"%{tag}\"μπορεί να αφαιρεθεί μόνο από τους συνεργάτες."
   rss_by_tag: "Νήματα με ετικέτες %{tag}"
   finish_installation:
     congratulations: "Συγχαρητήρια, έχετε εγκαταστήσει το Discourse!"
     register:
       button: "Εγγραφή"
-      title: "Εγγραφείτε σε λογαριασμό διαχειριστή"
+      title: "Εγγραφή Λογαριασμού Διαχειριστή"
       help: "κάνε εγγραφή με ένα καινούριο λογαριασμό για να ξεκινήσεις"
-      no_emails: "Δυστυχώς, δεν ορίστηκε καμιά διεύθυνση ηλεκτρονικού ταχυδρομείου του διαχειριστή κατά τη διάρκεια της εγκατάστασης, έτσι η ολοκλήρωση της διαμόρφωσης <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'> ίσως να είναι δύσκολη</a>."
+      no_emails: "Δυστυχώς, δεν ορίστηκε καμιά διεύθυνση email διαχειριστή κατά τη διάρκεια της εγκατάστασης, έτσι η ολοκλήρωση της διαμόρφωσης <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>"
+      title: "Επιβεβαίωσε το email σου"
+      message: "<p>Στείλαμε email ενεργοποίησης στο <b>%{email}</b>. Παρακαλώ, ακολούθησε τις οδηγίες σε αυτό το email για να ενεργοποιήσεις τον λογαριασμό σου. </p><p>Εάν δεν έρθει, βεβαιώσου ότι έχεις ρυθμίσει τα ηλεκτρονικά μηνύματα σωστά για το Discourse και έλεγξε τον φάκελο με τα ανεπιθύμητα.</p>"
     resend_email:
-      title: "Επαναποστολή του μηνύματος ενεργοποίησης"
-      message: "<p> Έχουμε στείλει ηλεκτρονικό μήνυμα ενεργοποίησης σε <b>%{email}</b>"
+      title: "Επαναποστολή email ενεργοποίησης"
+      message: "<p> Στείλαμε email ενεργοποίησης στο <b>%{email}</b>"
   safe_mode:
-    title: "Εισαγωγή λειτουργίας ασφαλείας"
-    description: "Η ασφαλής λειτουργία σου επιτρέπει να εξετάσεις τον ιστότοπό σου χωρίς να φορτώσεις πρόσθετα ή  εξηατομικεύσεις ιστοτόπου."
+    title: "Έναρξη ασφαλούς λειτουργίας"
+    description: "Η ασφαλής λειτουργία σου επιτρέπει να δοκιμάσεις τον ιστότοπό σου χωρίς να φορτώσεις πρόσθετα ή  εξατομικεύσεις ιστοτόπου."
+    no_customizations: "Απενεργοποίηση τρέχοντος θέματος"
     only_official: "Απενεργοποίησε ανεπίσημα πρόσθετα"
     no_plugins: "Απενεργοποίησε όλα τα πρόσθετα"
-    enter: "Εισαγωγή λειτουργίας ασφαλείας"
+    enter: "Έναρξη Ασφαλούς Λειτουργίας"
+    must_select: "Θα πρέπει να διαλέξτε τουλάχιστον μία επιλογή για να εισέλθετε σε ασφαλή λειτοθργία."
   wizard:
     title: "Εγκατάσταση Discourse"
     step:
@@ -2736,36 +3098,37 @@ el:
         fields:
           welcome:
             label: "Νήμα καλωσορίσματος"
-            description: "<p>HΠως θα περιέγραφες  την κοινότητά σου σε έναν άγνωστο σε ένα ασανσέρ σε περίπου 1 λεπτό;</p> <ul> <li>Για ποιον είναι αυτές οι συζητήσεις;</li> <li>Τι μπορώ να βρω εδώ;</li> <li>Γιατί να το επισκεφθώ;</li> </ul> <p>Το νήμα καλωσορίσματός σου είναι το πρώτο πράγμα που οι νέοι αφιχθέντες θα διαβάσουν. Σκέψου το σαν <b>μια παράγραφος</b> 'τα λόγια στο ασανσέρ' ή 'η αποστολή μου'. </p>"
+            description: "<p>Πως θα περιέγραφες  την κοινότητά σου σε έναν άγνωστο σε ένα ασανσέρ μέσα σε ένα λεπτό;</p> <ul> <li>Για ποιον είναι αυτές οι συζητήσεις;</li> <li>Τι μπορώ να βρω εδώ;</li> <li>Γιατί να το επισκεφθώ;</li> </ul> <p>Το νήμα καλωσορίσματός είναι το πρώτο πράγμα που οι νέοι αφιχθέντες θα διαβάσουν. Σκέψου το σαν <b>μια παράγραφο</b> με 'λόγια του ασανσέρ' ή με την 'δήλωση αποστολής'. </p>"
             one_paragraph: "Παρακαλώ, περιόρισε το μήνυμα καλωσορίσματος σε μία παράγραφο."
       privacy:
         title: "Πρόσβαση"
-        description: "<p> Η κοινότητά σου είναι ανοιχτή σε όλους, ή προϋποθέτει εγγραφή μέλους, πρόσκληση, ή έγκριση; Εάν προτιμάς, μπορείς να ρυθμίσεις κάποια πράγματα να είναι ιδιωτικά, κι έπειτα να τα κάνεις δημόσια.</p><p>Μπορείς πάντα να στέλνεις προσκλήσεις από τα νήματα, ή από τη σελίδα του προφίλ του χρήστη, επίσης.</p> "
+        description: "<p> Είναι η κοινότητά σου είναι ανοιχτή σε όλους ή προϋποθέτει εγγραφή μέλους, πρόσκληση ή έγκριση; Εάν προτιμάς, μπορείς να ρυθμίσεις κάποια πράγματα να είναι ιδιωτικά και έπειτα να τα κάνεις δημόσια.</p><p>Μπορείς πάντα να στέλνεις προσκλήσεις από τα νήματα καθώς επίσης και από τη σελίδα προφίλ του χρήστη.</p> "
         fields:
           privacy:
             choices:
               open:
                 label: "Δημόσια"
-                description: "Όλοι μπορούν να έχουν πρόσβαση σε αυτή την κοινότητα και να εγγραφούν σε ένα λογαριασμό"
+                description: "Όλοι μπορούν να έχουν πρόσβαση σε αυτή την κοινότητα και να εγγραφούν για νέο λογαριασμό"
               restricted:
-                label: "Ιδιωτικός"
-                description: "Μόνο τα άτομα που έχω προσκαλέσει ή εγκρίνει μπορούν να έχουν πρόσβαση σε αυτή την κοινότητα."
+                label: "Ιδιωτική"
+                description: "Μόνο τα άτομα που έχω προσκαλέσει ή εγκρίνει μπορούν να έχουν πρόσβαση σε αυτή την κοινότητα"
       contact:
         title: "Επικοινωνία"
         fields:
           contact_email:
-            label: "Αλληλογραφία"
+            label: "Mail"
             placeholder: "name@example.com"
-            description: "Διευθύνσεις μηνυμάτων ηλεκτρονικού ταχυδρομείου για το άτομο ή την ομάδα που είναι υπεύθυνοι για αυτή την κοινότητα. Χρησιμοποιείται για σημαντικές ειδοποιήσεις όπως σημαίες χωρίς διαχείριση, ανανεώσεις ασφάλειας και σε <a href='/about' target='_blank'>η σχετικά με σένα σελίδα σου</a> για έκτακτη επικοινωνία με την κοινότητα."
+            description: "Διεύθυνση email του ατόμου ή της ομάδας που είναι υπεύθυνα για αυτή την κοινότητα. Χρησιμοποιείται για σημαντικές ειδοποιήσεις όπως σημάνσεις χωρίς διαχείριση, ανανεώσεις ασφάλειας και στην σελίδα <a href='/about' target='_blank'>σχετικά</a> για έκτακτη επικοινωνία με την κοινότητα."
           contact_url:
             label: "Ιστοσελίδα"
             placeholder: "http://www.example.com/contact-us"
-            description: "Ιστοσελίδα γενικής επικοινωνίας για εσάς και τον οργανισμό σας. Θα εμφανίζεται στο <a href='/about' target='_blank'>Σχετικά με τη σελίδα</a>."
+            description: "Ιστοσελίδα γενικής επικοινωνίας με εσάς και τον οργανισμό σας. Θα εμφανίζεται στην επιλογή <a href='/about' target='_blank'>σχετικά με τη σελίδα</a>."
           site_contact:
             label: "Αυτόματα Μηνύματα"
+            description: "Όλα τα αυτοματοποιημένα συστημικά μηνύματα, όπως οι προειδοποιήσεις σημάνσεων και η ειδοποίηση ολοκλήρωσης των αντιγράφων ασφαλείας, θα στέλνονται από αυτόν τον χρήστη."
       corporate:
         title: "Οργάνωση"
-        description: "Αυτά τα ονόματα θα υπάρχουν στην <a href='/privacy' target='blank'> Πολιτική Προστασίας Πολιτικών Δεδομένων</a> και <a href='/tos' target='blank'> στους Όρους χρήσης, που είναι νήματα τα οποία μπορείς να επεξεργαστείς στην κατηγορία του Προσωπικού. Εάν δεν έχεις εταιρεία, παράλειψε ελεύθερα αυτό το βήμα για τώρα."
+        description: "Αυτά τα ονόματα θα υπάρχουν στην <a href='/privacy' target='blank'> Πολιτική Ιδιωτικότητας</a> και στους <a href='/tos' target='blank'>Όρους Χρήσης</a>, που είναι νήματα τα οποία μπορείς να επεξεργαστείς στην κατηγορία Συνεργατών. Εάν δεν έχεις εταιρεία, μπορείς να παραλείψεις αυτό το βήμα για τώρα."
         fields:
           company_short_name:
             label: "Όνομα Εταιρείας (σύντομο)"
@@ -2774,36 +3137,36 @@ el:
             label: "Όνομα Εταιρείας (πλήρες)"
             placeholder: "Initech, Inc."
           company_domain:
-            label: "Όνομα Διαχειριστή Εταιρείας"
+            label: "Όνομα Domain Εταιρείας"
             placeholder: "initech.com"
       colors:
         title: "Θέμα"
         fields:
           theme_id:
-            description: "Προτιμάτε χρωματισμό ανοιχτού ή σκούρου χρώματος για να ξεκινήσετε; Μπορείτε να εξατομικεύσετε την εμφάνιση και την αίσθηση του ιστοτόπου σας μέσω Διαχείρισης, Εξατομίκευσης"
+            description: "Προτιμάτε χρωματισμό ανοιχτού ή σκούρου χρώματος για να ξεκινήσετε; Μπορείτε να εξατομικεύσετε την εμφάνιση και την αίσθηση του ιστοτόπου σας μέσω της επιλογής Διαχείριση, Εξατομίκευση."
             choices:
               default:
-                label: "Απλό Φως"
+                label: "Απλό Φωτεινό"
               dark:
-                label: "Απλό σκούρο"
+                label: "Απλό Σκούρο"
       logos:
-        title: "Λογότυποι"
+        title: "Λογότυπα"
         fields:
           logo_url:
-            label: "Κύριο Λογότυπο"
-            description: "Η εικόνα του λογότυπου πάνω αριστερά της ιστοσελίδας, χρησιμοποίησε σχήμα ένα πλατύ ορθογώνιο."
+            label: "Κυρίως Λογότυπο"
+            description: "Το λογότυπο στην πάνω αριστερή πλευρά της ιστοσελίδας. Χρησιμοποίησε ένα πλατύ ορθογώνιο σχήμα."
           logo_small_url:
             label: "Μικρό λογότυπο"
-            description: "Μία συμπαγές εκδοχή το λογότυπό σας, εμφανίζεται στην κορυφή αριστερά της σελίδας σας, κατά την κύλιση προς τα κάτω. Χρησιμοποιήστε ένα τετράγωνο σχήμα."
+            description: "Μία συμπαγής εκδοχή του λογοτύπου σας η οποία εμφανίζεται στην κορυφή αριστερά της σελίδας σας, κατά την κύλιση αυτής προς τα κάτω. Χρησιμοποιήστε ένα τετράγωνο σχήμα."
       icons:
         title: "Εικονίδια"
         fields:
           favicon_url:
             label: "Μικρό εικονίδιο"
-            description: "Εικονίδιο εικόνας που χρησιμοποιείται για να αντιπροσωπεύσει την σελίδα σας στις μηχανές αναζήτησης Ιστού που φαίνεται καλό σε μικρά μεγέθη όπως 32px σε 32px."
+            description: "Εικονίδιο το οποίο χρησιμοποιείται για να απεικονίσει την ιστοσελίδα σας στους web browsers και που φαίνεται καλό σε μικρά μεγέθη όπως 32px επί 32px."
           apple_touch_icon_url:
             label: "Μεγάλο εικονίδιο"
-            description: "Εικονίδιο εικόνας που χρησιμοποιείται για να αντιπροσωπεύσει τη σελίδα σας στις σύγχρονες συσκευές φαίνεται καλό σε μεγαλύτερα μεγέθη. Συνιστάται το μέγεθος είναι τουλάχιστον 144px σε 144px."
+            description: "Εικονίδιο το οποίο χρησιμοποιείται για να απεικονίσει την ιστοσελίδα σας στις σύγχρονες συσκευές και που φαίνεται καλό σε μεγαλύτερα μεγέθη. Συνιστώμενο μέγεθος τουλάχιστον 144px επί 144px."
       homepage:
         description: "Σου προτείνουμε να εμφανίζονται τα τελευταία νήματα στην αρχική σου σελίδα, αλλά μπορείς επίσης να επιλέξεις να εμφανίζονται κατηγορίες (ομάδες ή νήματα) στην αρχική σου σελίδα, εάν το προτιμάς."
         title: "Αρχική Σελίδα"
@@ -2811,20 +3174,20 @@ el:
           homepage_style:
             choices:
               latest:
-                label: "Τελευταία θέματα"
+                label: "Τελευταία Θέματα"
               categories:
                 label: "Κατηγορίες"
       emoji:
         title: "Emoji"
-        description: "Ποιο στυλ Emoji προτιμάς στην κοινότητά σου? Μπορείς να προσθέσεις πιο εξατομικευμένα Emoji αργότερα μέσω Διαχείριση, Εξατομίκευση, Emoji."
+        description: "Ποιο στυλ Emoji προτιμάς στην κοινότητά σου; Μπορείς να προσθέσεις πιο εξατομικευμένα Emoji αργότερα μέσω της επιλογής Διαχείριση, Εξατομίκευση, Emoji."
       invites:
-        title: "Πρόσκληση προσωπικού"
-        description: "Είσαι σχεδόν έτοιμος! Ας προσκαλέσουμε κάποια μέλη του προσωπικού να βοηθήσουν <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>εμπλούτισε τις συζητήσεις σας</a> με ενδιαφέροντα νήματα και απαντήσεις για να ξεκινήσεις την κοινότητά σου. "
+        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>
+          <p>Αν ποτέ θελήσεις να αλλάξεις αυτές τις ρυθμίσεις, επισκέψου την <a href='/admin' target='_blank'>σελίδα διαχείρισης</a>; θα τη βρεις δίπλα στο εικονίδιο του εργαλείου στο μενού ιστοτόπου.</p>
+          <p>Καλή διασκέδαση και καλή επιτυχία στην κατασκευή της νέας σου κοινότητας!</a></p>
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 94070e7a36..0db6ff6c9a 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -68,8 +68,9 @@ en:
         no_message_id_error: "Happens when the mail has no 'Message-Id' header."
         auto_generated_email_error: "Happens when the 'precedence' header is set to: list, junk, bulk or auto_reply, or when any other header contains: auto-submitted, auto-replied or auto-generated."
         no_body_detected_error: "Happens when we couldn't extract a body and there were no attachments."
+        no_sender_detected_error: "Happens when we couldn't find a valid email address in the From header."
         inactive_user_error: "Happens when the sender is not active."
-        blocked_user_error: "Happens when the sender has been blocked."
+        silenced_user_error: "Happens when the sender has been silenced."
         bad_destination_address: "Happens when none of the email addresses in To/Cc/Bcc fields matched a configured incoming email address."
         strangers_not_allowed_error: "Happens when a user tried to create a new topic in a category they're not a member of."
         insufficient_trust_level_error: "Happens when a user tried to create a new topic in a category they don't have the required trust level for."
@@ -78,9 +79,13 @@ en:
         topic_closed_error: "Happens when a reply came in but the related topic has been closed."
         bounced_email_error: "Email is a bounced email report."
         screened_email_error: "Happens when the sender's email address was already screened."
+        unsubscribe_not_allowed: "Happens when unsubscribing via email is not allowed for this user."
+        email_not_allowed: "Happens when the email address is not on the whitelist or is on the blacklist."
+      unrecognized_error: "Unrecognized Error"
 
   errors: &errors
     format: ! '%{attribute} %{message}'
+    format_with_full_message: '<b>%{attribute}</b>: %{message}'
     messages:
       too_long_validation: "is limited to %{max} characters; you entered %{length}."
       invalid_boolean: "Invalid boolean."
@@ -134,6 +139,7 @@ en:
       max_username_length_range: "You cannot set the maximum below the minimum."
       default_categories_already_selected: "You cannot select a category used in another list."
       s3_upload_bucket_is_required: "You cannot enable uploads to S3 unless you've provided the 's3_upload_bucket'."
+    conflicting_google_user_id: 'The Google Account ID for this account has changed; staff intervention is required for security reasons. Please contact staff and point them to <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
 
   activemodel:
     errors:
@@ -159,6 +165,7 @@ en:
   not_logged_in: "You need to be logged in to do that."
   not_found: "The requested URL or resource could not be found."
   invalid_access: "You are not permitted to view the requested resource."
+  invalid_api_credentials: "You are not permitted to view the requested resource. The API username or key is invalid."
   read_only_mode_enabled: "The site is in read only mode. Interactions are disabled."
 
   reading_time: "Reading time"
@@ -208,11 +215,13 @@ en:
   too_many_links:
     one: "Sorry, new users can only put one link in a post."
     other: "Sorry, new users can only put %{count} links in a post."
+  contains_blocked_words: "Your post contains words that aren't allowed."
 
   spamming_host: "Sorry you cannot post a link to that host."
   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"
@@ -229,6 +238,7 @@ en:
   num_participants: "Participants:"
   read_full_topic: "Read full topic"
   private_message_abbrev: "Msg"
+
   rss_description:
     latest: "Latest topics"
     hot: "Hot topics"
@@ -246,6 +256,8 @@ en:
     user_posts: "Latest posts by @%{username}"
     user_topics: "Latest topics by @%{username}"
     tag: "Tagged topics"
+    badge: "%{display_name} badge on %{site_title}"
+
   too_late_to_edit: "That post was created too long ago. It can no longer be edited or deleted."
   revert_version_same: "The current version is same as the version you are trying to revert to."
 
@@ -253,6 +265,7 @@ en:
 
   queue:
     delete_reason: "Deleted via post moderation queue"
+    not_found: "Post not found or already updated."
 
   groups:
     success:
@@ -264,6 +277,7 @@ en:
       invalid_incoming_email: "'%{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}'."
+      cant_allow_membership_requests: "You cannot allow membership requests for a group without any owners."
     default_names:
       everyone: "everyone"
       admins: "admins"
@@ -276,7 +290,6 @@ en:
       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:
@@ -376,6 +389,7 @@ en:
               too_many_users: "You can only send warnings to one user at a time."
               cant_send_pm: "Sorry, you cannot send a private message to that user."
               no_user_selected: "You must select a valid user."
+              reply_by_email_disabled: "Reply by email has been disabled."
             featured_link:
               invalid: "is invalid. URL should include http:// or https://."
               invalid_category: "can't be edited in this category."
@@ -408,6 +422,14 @@ en:
           attributes:
             execute_at:
               in_the_past: "must be in the future."
+        translation_overrides:
+          attributes:
+            value:
+              invalid_interpolation_keys: 'The following interpolation key(s) are invalid: "%{keys}"'
+        watched_word:
+          attributes:
+            word:
+              too_many: "Too many words for that action"
 
   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>"
@@ -423,7 +445,7 @@ en:
   staff_category_description: "Private category for staff discussions. Topics are only visible to admins and moderators."
 
   assets_topic_title: "Assets for the site design"
-  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)."
+  assets_topic_body: "This topic, visible only to staff, is 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)."
 
   discourse_welcome_topic:
     title: "Welcome to Discourse"
@@ -479,6 +501,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."
@@ -500,6 +523,9 @@ en:
       title: "leader"
     change_failed_explanation: "You attempted to demote %{user_name} to '%{new_trust_level}'. However their trust level is already '%{current_trust_level}'. %{user_name} will remain at '%{current_trust_level}' - if you wish to demote user lock trust level first"
 
+  post:
+    image_placeholder:
+      broken: "This image is broken"
 
   rate_limiter:
     slow_down: "You have performed this action too many times, try again later."
@@ -687,12 +713,18 @@ en:
       long_form: 'voted for this post'
 
   user_activity:
+    no_default:
+      self: "You have no activity yet."
+      others: "No activity."
     no_bookmarks:
       self: "You have no bookmarked posts, bookmarking posts allows you to easily access them later on."
       others: "No bookmarks."
     no_likes_given:
       self: "You have not liked any posts."
       others: "No liked posts."
+    no_replies:
+      self: "You have not replied to any posts."
+      others: "No replies."
 
   topic_flag_types:
     spam:
@@ -711,7 +743,7 @@ en:
       email_body: "%{link}\n\n%{message}"
 
   flagging:
-    you_must_edit: '<p>Your post was flagged by the community. Please <a href="/my/messages">see your messages</a>.</p>'
+    you_must_edit: '<p>Your post was flagged by the community. Please <a href="%{path}">see your messages</a>.</p>'
     user_must_edit: '<p>This post was flagged by the community and is temporarily hidden.</p>'
 
   archetypes:
@@ -725,7 +757,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:
@@ -941,15 +973,16 @@ 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"
     educate_until_posts: "When the user starts typing their first (n) new posts, show the pop-up new user education panel in the composer."
     title: "The name of this site, as used in the title tag."
     site_description: "Describe this site in one sentence, as used in the meta description tag."
-    contact_email: "Email address of key contact responsible for this site. Used for critical notifications such as unhandled flags, as well as on the /about contact form for urgent matters."
+    contact_email: "Email address of key contact responsible for this site. Used for critical notifications, as well as on the /about contact form for urgent matters."
     contact_url: "Contact URL for this site. Used on the /about contact form for urgent matters."
-    queue_jobs: "DEVELOPER ONLY! WARNING! By default, queue jobs in sidekiq. If disabled, your site will be broken."
     crawl_images: "Retrieve images from remote URLs to insert the correct width and height dimensions."
     download_remote_images_to_local: "Convert remote images to local images by downloading them; this prevents broken images."
     download_remote_images_threshold: "Minimum disk space necessary to download remote images locally (in percent)"
@@ -964,20 +997,23 @@ en:
     fixed_category_positions: "If checked, you will be able to arrange categories into a fixed order. If unchecked, categories are listed in order of activity."
     fixed_category_positions_on_create: "If checked, category ordering will be maintained on topic creation dialog (requires fixed_category_positions)."
     add_rel_nofollow_to_user_content: "Add rel nofollow to all submitted user content, except for internal links (including parent domains). If you change this, you must rebake all posts with: \"rake posts:rebake\""
-    exclude_rel_nofollow_domains: "A list of domains where nofollow should not be added to links. tld.com will automatically allow sub.tld.com as well. As a minimum, you should add the top-level domain of this site to help web crawlers find all content. If other parts of your website are at other domains, add those too."
+    exclude_rel_nofollow_domains: "A list of domains where nofollow should not be added to links. example.com will automatically allow sub.example.com as well. As a minimum, you should add the domain of this site to help web crawlers find all content. If other parts of your website are at other domains, add those too."
 
     post_excerpt_maxlength: "Maximum length of a post excerpt / summary."
     show_pinned_excerpt_mobile: "Show excerpt on pinned topics in mobile view."
     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"
+    enable_inline_onebox_on_all_domains: "Ignore inline_onebox_domain_whitelist site setting and allow inline onebox on all domains."
     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."
     digest_logo_url: "The alternate logo image used at the top of your site's email summary. Should be a wide rectangle shape. Should not be an SVG image. If left blank `logo_url` will be used."
     logo_small_url: "The small logo image at the top left of your site, should be a square shape, seen when scrolling down. If left blank a home glyph will be shown."
     favicon_url: "A favicon for your site, see http://en.wikipedia.org/wiki/Favicon, to work correctly over a CDN it must be a png"
-    mobile_logo_url: "The fixed position logo image used at the top left of your mobile site. Should be a square shape. If left blank, `logo_url` will be used. eg: http://example.com/uploads/default/logo.png"
+    mobile_logo_url: "Custom logo url used on mobile version of your site. If left blank, `logo_url` will be used. eg: http://example.com/uploads/default/logo.png"
+    large_icon_url: "Image used as logo/splash image on Android. Recommended size is 512px by 512px."
     apple_touch_icon_url: "Icon used for Apple touch devices. Recommended size is 144px by 144px."
 
     notification_email: "The from: email address used when sending all essential system emails. The domain specified here must have SPF, DKIM and reverse PTR records set correctly for email to arrive."
@@ -992,6 +1028,7 @@ en:
     summary_max_results: "Maximum posts returned by 'Summary This Topic'"
 
     enable_private_messages: "Allow trust level 1 (configurable via min trust level to send messages) users to create messages and reply to messages. Note that staff can always send messages no matter what."
+    enable_private_email_messages: "Allow trust level 4 (configurable via min trust level to send messages) users to send private email messages. Note that staff can always send messages no matter what."
 
     enable_long_polling: "Message bus used for notification can use long polling"
     long_polling_base_url: "Base URL used for long polling (when a CDN is serving dynamic content, be sure to set this to origin pull) eg: http://origin.site.com"
@@ -1010,29 +1047,30 @@ en:
     tl3_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl3 (regular) by multiplying with this number"
     tl4_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl4 (leader) by multiplying with this number"
 
-    num_spam_flags_to_block_new_user: "If a new user's posts get this many spam flags from num_users_to_block_new_user different users, hide all their posts and prevent future posting. 0 to disable."
-    num_users_to_block_new_user: "If a new user's posts get num_spam_flags_to_block_new_user spam flags from this many different users, hide all their posts and prevent future posting. 0 to disable."
-    num_tl3_flags_to_block_new_user: "If a new user's posts get this many flags from num_tl3_users_to_block_new_user different trust level 3 users, hide all their posts and prevent future posting. 0 to disable."
-    num_tl3_users_to_block_new_user: "If a new user's posts get num_tl3_flags_to_block_new_user flags from this many different trust level 3 users, hide all their posts and prevent future posting. 0 to disable."
-    notify_mods_when_user_blocked: "If a user is automatically blocked, send a message to all moderators."
+    num_spam_flags_to_silence_new_user: "If a new user's posts get this many spam flags from num_users_to_silence_new_user different users, hide all their posts and prevent future posting. 0 to disable."
+    num_users_to_silence_new_user: "If a new user's posts get num_spam_flags_to_silence_new_user spam flags from this many different users, hide all their posts and prevent future posting. 0 to disable."
+    num_tl3_flags_to_silence_new_user: "If a new user's posts get this many flags from num_tl3_users_to_silence_new_user different trust level 3 users, hide all their posts and prevent future posting. 0 to disable."
+    num_tl3_users_to_silence_new_user: "If a new user's posts get num_tl3_flags_to_silence_new_user flags from this many different trust level 3 users, hide all their posts and prevent future posting. 0 to disable."
+    notify_mods_when_user_silenced: "If a user is automatically silenced, send a message to all moderators."
     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."
     maximum_session_age: "User will remain logged in for n hours since last visit"
-    ga_tracking_code: "OBSOLETE: Google analytics (ga.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics"
-    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"
+    allowed_iframes: "A list of iframe src domain prefixes that discourse can safely allow in posts"
     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."
@@ -1050,6 +1088,7 @@ en:
     top_page_default_timeframe: "Default timeframe for the top view page."
     show_email_on_profile: "Show a user's email on their profile (only visible to themselves and staff)"
     prioritize_username_in_ux: "Show username first on user page, user card and posts (when disabled name is shown first)"
+    enable_rich_text_paste: "Enable automatic HTML to Markdown conversion when pasting text into the composer. (Experimental)"
 
     email_token_valid_hours: "Forgot password / activate account tokens are valid for (n) hours."
 
@@ -1059,14 +1098,11 @@ en:
     allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines."
     email_domains_blacklist: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Example: mailinator.com|trashmail.net"
     email_domains_whitelist: "A pipe-delimited list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!"
-    forgot_password_strict: "Don't inform users of an account's existence when they use the forgot password dialog."
+    hide_email_address_taken: "Don't inform users that an account exists with a given email address during signup and from the forgot password form."
     log_out_strict: "When logging out, log out ALL sessions for the user on all devices"
     version_checks: "Ping the Discourse Hub for version updates and show new version messages on the /admin dashboard"
     new_version_emails: "Send an email to the contact_email address when a new version of Discourse is available."
 
-    port: "DEVELOPER ONLY! WARNING! Use this HTTP port rather than the default of port 80. Leave blank for default of 80."
-    force_hostname: "DEVELOPER ONLY! WARNING! Specify a hostname in the URL. Leave blank for default."
-
     invite_expiry_days: "How long user invitation keys are valid, in days"
     invite_passthrough_hours: "How long a user can use a previously redeemed invitation key to log in, in hours"
 
@@ -1124,6 +1160,7 @@ en:
     github_client_secret: "Client secret for Github authentication, registered at https://github.com/settings/applications"
 
     readonly_mode_during_backup: "Enable read only mode while taking a backup"
+    enable_backups: "Allow administrators to create backups of the forum"
     allow_restore: "Allow restore, which can replace ALL site data! Leave false unless you plan to restore a backup"
     maximum_backups: "The maximum amount of backups to keep on disk. Older backups are automatically deleted"
     automatic_backups_enabled: "Run automatic backups as defined in backup frequency"
@@ -1172,7 +1209,7 @@ en:
     clean_up_uploads: "Remove orphan unreferenced uploads to prevent illegal hosting. WARNING: you may want to back up of your /uploads directory before enabling this setting."
     clean_orphan_uploads_grace_period_hours: "Grace period (in hours) before an orphan upload is removed."
     purge_deleted_uploads_grace_period_days: "Grace period (in days) before a deleted upload is erased."
-    purge_unactivated_users_grace_period_days: "Grace period (in days) before a user who has not activated their account is deleted."
+    purge_unactivated_users_grace_period_days: "Grace period (in days) before a user who has not activated their account is deleted. Set to 0 to never purge unactivated users."
     enable_s3_uploads: "Place uploads on Amazon S3 storage. IMPORTANT: requires valid S3 credentials (both access key id & secret access key)."
     s3_use_iam_profile: 'Use AWS EC2 IAM role to retrieve keys. NOTE: enabling will override "s3 access key id" and "s3 secret access key" settings.'
     s3_upload_bucket: "The Amazon S3 bucket name that files will be uploaded into. WARNING: must be lowercase, no periods, no underscores."
@@ -1193,6 +1230,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."
@@ -1235,6 +1276,8 @@ en:
 
     min_trust_to_send_messages: "The minimum trust level required to create new private messages."
 
+    min_trust_to_send_email_messages: "The minimum trust level required to send new private messages via email (to staged users)."
+
     newuser_max_links: "How many links a new user can add to a post."
     newuser_max_images: "How many images a new user can add to a post."
     newuser_max_attachments: "How many attachments a new user can add to a post."
@@ -1242,6 +1285,7 @@ en:
     newuser_max_replies_per_topic: "Maximum number of replies a new user can make in a single topic until someone replies to them."
     max_mentions_per_post: "Maximum number of @name notifications anyone can use in a post."
     max_users_notified_per_group_mention: "Maximum number of users that may receive a notification if a group is mentioned (if threshold is met no notifications will be raised)"
+    enable_mentions: "Allow users to mention other users."
 
     create_thumbnails: "Create thumbnails and lightbox images that are too large to fit in a post."
 
@@ -1314,9 +1358,10 @@ en:
 
     auto_respond_to_flag_actions: "Enable automatic reply when disposing a flag."
     min_first_post_typing_time: "Minimum amount of time in milliseconds a user must type during first post, if threshold is not met post will automatically enter the needs approval queue. Set to 0 to disable (not recommended)"
-    auto_block_fast_typers_on_first_post: "Automatically block users that do not meet min_first_post_typing_time"
-    auto_block_fast_typers_max_trust_level: "Maximum trust level to auto block fast typers"
-    auto_block_first_post_regex: "Case insensitive regex that if passed will cause first post by user to be blocked and sent to approval queue. Example: raging|a[bc]a , will cause all posts containing raging or aba or aca to be blocked on first. Only applies to first post."
+    auto_silence_fast_typers_on_first_post: "Automatically silence users that do not meet min_first_post_typing_time"
+    auto_silence_fast_typers_max_trust_level: "Maximum trust level to auto silence fast typers"
+    auto_silence_first_post_regex: "Case insensitive regex that if passed will cause first post by user to be silenced and sent to approval queue. Example: raging|a[bc]a , will cause all posts containing raging or aba or aca to be silenced on first. Only applies to first post."
+    flags_default_topics: "Show flagged topics by default in the admin section"
 
     reply_by_email_enabled: "Enable replying to topics via email."
     reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
@@ -1364,17 +1409,19 @@ en:
     pop3_polling_username: "The username for the POP3 account to poll for email."
     pop3_polling_password: "The password for the POP3 account to poll for email."
     log_mail_processing_failures: "Log all email processing failures to http://yoursitename.com/logs"
-    email_in: "Allow users to post new topics via email (requires pop3 polling). Configure the addresses in the \"Settings\" tab of each category."
+    email_in: "Allow users to post new topics via email (requires manual or pop3 polling). Configure the addresses in the \"Settings\" tab of each category."
     email_in_min_trust: "The minimum trust level a user needs to have to be allowed to post new topics via email."
     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. WARNING: disabling this allows user impersonation based on email address."
+
     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)."
     delete_user_max_post_age: "Don't allow deleting users whose first post is older than (x) days."
     delete_all_posts_max: "The maximum number of posts that can be deleted at once with the Delete All Posts button. If a user has more than this many posts, the posts cannot all be deleted at once and the user can't be deleted."
-    username_change_period: "The number of days after registration that accounts can change their username (0 to disallow username change)."
+    username_change_period: "The maximum number of days after registration that accounts can change their username (0 to disallow username change)."
     email_editable: "Allow users to change their e-mail address after registration."
     logout_redirect: "Location to redirect browser to after logout (eg: http://somesite.com/logout)"
 
@@ -1390,7 +1437,7 @@ en:
     suppress_digest_email_after_days: "Suppress summary emails for users not seen on the site for more than (n) days."
     digest_suppress_categories: "Suppress these categories from summary emails."
     disable_digest_emails: "Disable summary emails for all users."
-    email_accent_bg_color: "The accent color to be used as the background of some elements in HTML emails. Enter a color name ('red') or hex value ('#FF000')."
+    email_accent_bg_color: "The accent color to be used as the background of some elements in HTML emails. Enter a color name ('red') or hex value ('#FF0000')."
     email_accent_fg_color: "The color of text rendered on the email bg color in HTML emails. Enter a color name ('white') or hex value ('#FFFFFF')."
     email_link_color: "The color of links in HTML emails. Enter a color name ('blue') or hex value ('#0000FF')."
 
@@ -1406,6 +1453,9 @@ en:
 
     hide_user_profiles_from_public: "Disable user cards, user profiles and user directory for anonymous users."
 
+    show_inactive_accounts: "Allow logged in users to browse profiles of inactive accounts."
+
+    hide_suspension_reasons: "Don't display suspension reasons publically on user profiles."
     user_website_domains_whitelist: "User website will be verified against these domains. Pipe-delimited list."
 
     allow_profile_backgrounds: "Allow users to upload profile backgrounds."
@@ -1438,6 +1488,8 @@ en:
 
     share_anonymized_statistics: "Share anonymized usage statistics."
 
+    auto_handle_queued_age: "Automatically handle records that are waiting to be reviewed after this many days. Flags will be ignored. Queued posts and users will be rejected. Set to 0 to disable this feature."
+
     max_prints_per_hour_per_user: "Maximum number of /print page impressions (set to 0 to disable)"
 
     full_name_required: "Full name is a required field of a user's profile."
@@ -1450,18 +1502,10 @@ en:
     autohighlight_all_code: "Force apply code highlighting to all preformatted code blocks even when they didn't explicitly specify the language."
     highlighted_languages: "Included syntax highlighting rules. (Warning: including too many languages may impact performance) see: https://highlightjs.org/static/demo/ for a demo"
 
-    feed_polling_enabled: "EMBEDDING ONLY: Whether to embed a RSS/ATOM feed as posts."
-    feed_polling_url: "EMBEDDING ONLY: URL of RSS/ATOM feed to embed."
-    feed_polling_frequency_mins: "EMBEDDING ONLY: Frequency of polling"
-    embed_by_username: "Discourse username of the user who creates the embedded topics."
-    embed_username_key_from_feed: "Key to pull discourse username from feed."
-    embed_title_scrubber: "Regular expression for scrubbing embeddable titles."
     embed_truncate: "Truncate the embedded posts."
     allowed_href_schemes: "Schemes allowed in links in addition to http and https."
     embed_post_limit: "Maximum number of posts to embed."
     embed_username_required: "The username for topic creation is required."
-    embed_whitelist_selector: "CSS selector for elements that are allowed in embeds."
-    embed_blacklist_selector: "CSS selector for elements that are removed from embeds."
     notify_about_flags_after: "If there are flags that haven't been handled after this many hours, send a private message to staff. Set to 0 to disable."
     show_create_topics_notice: "If the site has fewer than 5 public topics, show a notice asking admins to create some topics."
 
@@ -1486,6 +1530,9 @@ 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."
+    watched_words_regular_expressions: "Watched words are regular expressions."
+
     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."
@@ -1515,8 +1562,8 @@ en:
     default_categories_muted: "List of categories that are muted by default."
     default_categories_watching_first_post: "List of categories in which first post in each new topic will be watched by default."
 
-    max_user_api_reqs_per_day: "Maximum number of user API requests per key per day"
-    max_user_api_reqs_per_minute: "Maximum number of user API requests per key per minute"
+    retain_web_hook_events_period_days: "Number of days to retain web hook event records."
+
     allow_user_api_keys: "Allow generation of user API keys"
     allow_user_api_key_scopes: "List of scopes allowed for user API keys"
     max_api_keys_per_user: "Maximum number of user API keys per user"
@@ -1565,6 +1612,11 @@ 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."
+      staged_users_disabled: "You must first enable 'staged users' before enabling this setting."
+      reply_by_email_disabled: "You must first enable 'reply by email' before enabling this setting."
+      sso_url_is_empty: "You must set a 'sso url' before enabling this setting."
 
   search:
     within_post: "#%{post_number} by %{username}"
@@ -1572,6 +1624,7 @@ en:
       category: 'Categories'
       topic: 'Results'
       user: 'Users'
+    results_page: "Search results for '%{term}'"
 
   sso:
     login_error: "Login Error"
@@ -1692,7 +1745,8 @@ en:
     email_too_long: "The email you provided is too long. Mailbox names must be no more than 254 characters, and domain names must be no more than 253 characters."
     reserved_username: "That username is not allowed."
     missing_user_field: "You have not completed all the user fields"
-    close_window: "Authentication is complete. Close this window to continue."
+    auth_complete: "Authentication is complete."
+    click_to_continue: "Click here to continue."
     already_logged_in: "Oops, looks like you are attempting to accept an invitation for another user. If you are not %{current_user}, please log out and try again."
 
   user:
@@ -1705,7 +1759,7 @@ en:
     username:
       short: "must be at least %{min} characters"
       long: "must be no more than %{max} characters"
-      characters: "must only include numbers, letters and underscores"
+      characters: "must only include numbers, letters, dashes, and underscores"
       unique: "must be unique"
       blank: "must be present"
       must_begin_with_alphanumeric_or_underscore: "must begin with a letter, a number or an underscore"
@@ -1721,6 +1775,11 @@ en:
       max_new_accounts_per_registration_ip: "New registrations are not allowed from your IP address (maximum limit reached). Contact a staff member."
     website:
       domain_not_allowed: "Website is invalid. Allowed domains are: %{domains}"
+    auto_rejected: "Rejected automatically due to age. See auto_handle_queued_age site setting."
+    destroy_reasons:
+      unused_staged_user: "Unused staged user"
+      fixed_primary_email: "Fixed primary email for staged user"
+      same_ip_address: "Same IP address (%{ip_address}) as other users"
 
   flags_reminder:
     flags_were_submitted:
@@ -1744,9 +1803,9 @@ en:
 
   invite_mailer:
     title: "Invite Mailer"
-    subject_template: "%{invitee_name} invited you to '%{topic_title}' on %{site_domain_name}"
+    subject_template: "%{inviter_name} invited you to '%{topic_title}' on %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} invited you to a discussion
+      %{inviter_name} invited you to a discussion
 
       > **%{topic_title}**
       >
@@ -1762,9 +1821,9 @@ en:
 
   custom_invite_mailer:
     title: "Custom Invite Mailer"
-    subject_template: "%{invitee_name} invited you to '%{topic_title}' on %{site_domain_name}"
+    subject_template: "%{inviter_name} invited you to '%{topic_title}' on %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} invited you to a discussion
+      %{inviter_name} invited you to a discussion
 
       > **%{topic_title}**
       >
@@ -1784,9 +1843,9 @@ en:
 
   invite_forum_mailer:
     title: "Invite Forum Mailer"
-    subject_template: "%{invitee_name} invited you to join %{site_domain_name}"
+    subject_template: "%{inviter_name} invited you to join %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} invited you to join
+      %{inviter_name} invited you to join
 
       > **%{site_title}**
       >
@@ -1798,9 +1857,9 @@ en:
 
   custom_invite_forum_mailer:
     title: "Custom Invite Forum Mailer"
-    subject_template: "%{invitee_name} invited you to join %{site_domain_name}"
+    subject_template: "%{inviter_name} invited you to join %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} invited you to join
+      %{inviter_name} invited you to join
 
       > **%{site_title}**
       >
@@ -1901,7 +1960,7 @@ en:
 
       - Upgrade using our easy **[one-click browser upgrade](%{base_url}/admin/upgrade)**
 
-      - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master)
+      - See what's new in the [release notes](https://meta.discourse.org/tags/release-notes) or view the [raw GitHub changelog](https://github.com/discourse/discourse/commits/master)
 
       - Visit [meta.discourse.org](https://meta.discourse.org) for news, discussion, and support for Discourse
 
@@ -1916,7 +1975,7 @@ en:
 
       - Upgrade using our easy **[one-click browser upgrade](%{base_url}/admin/upgrade)**
 
-      - See what's new in the [GitHub changelog](https://github.com/discourse/discourse/commits/master)
+      - See what's new in the [release notes](https://meta.discourse.org/tags/release-notes) or view the [raw GitHub changelog](https://github.com/discourse/discourse/commits/master)
 
       - Visit [meta.discourse.org](https://meta.discourse.org) for news, discussion, and support for Discourse
 
@@ -1924,16 +1983,6 @@ en:
 
       %{notes}
 
-  queued_posts_reminder:
-    title: "Queued Posts Reminder"
-    subject_template:
-      one: "[%{email_prefix}] 1 post waiting to be reviewed"
-      other: "[%{email_prefix}] %{count} posts waiting to be reviewed"
-    text_body_template: |
-      Hello,
-
-      Posts from new users were held for moderation and are currently waiting to be reviewed. [Approve or reject them here](%{base_url}/queued-posts).
-
   flag_reasons:
     off_topic: "Your post was flagged as **off-topic**: the community feels it is not a good fit for the topic, as currently defined by the title and the first post."
     inappropriate: "Your post was flagged as **inappropriate**: the community feels it is offensive, abusive, or a violation of [our community guidelines](/guidelines)."
@@ -1963,13 +2012,13 @@ en:
 
         This is an automated message from %{site_name} to let you know that your post was hidden.
 
-        %{base_url}%{url}
+        <%{base_url}%{url}>
 
         %{flag_reason}
 
         Multiple community members flagged this post before it was hidden, so please consider how you might revise your post to reflect their feedback. **You can edit your post after %{edit_delay} minutes, and it will be automatically unhidden.**
 
-        However, if the post is hidden by the community a second time, it will remain hidden until handled by staff – and there may be further action, including the possible suspension of your account.
+        However, if the post is hidden by the community a second time, it will remain hidden until handled by staff.
 
         For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
 
@@ -2091,7 +2140,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"
@@ -2099,7 +2148,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"
@@ -2107,7 +2156,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"
@@ -2115,7 +2164,15 @@ 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_not_allowed_email:
+      title: "Email Reject Not Allowed Email"
+      subject_template: "[%{email_prefix}] Email issue -- Blocked Email"
+      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](%{base_url}/about).
 
     email_reject_inactive_user:
       title: "Email Reject Inactive User"
@@ -2125,13 +2182,13 @@ en:
 
         Your account associated with this email address is not activated. Please activate your account before sending emails in.
 
-    email_reject_blocked_user:
-      title: "Email Reject Blocked User"
-      subject_template: "[%{email_prefix}] Email issue -- Blocked User"
+    email_reject_silenced_user:
+      title: "Email Reject Silenced User"
+      subject_template: "[%{email_prefix}] Email issue -- Silenced User"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        Your account associated with this email address has been blocked.
+        Your account associated with this email address has been silenced.
 
     email_reject_reply_user_not_matching:
       title: "Email Reject User Not Matching"
@@ -2139,7 +2196,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"
@@ -2147,7 +2204,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"
@@ -2173,7 +2230,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"
@@ -2181,7 +2238,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"
@@ -2218,7 +2275,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"
@@ -2226,7 +2283,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        None of the destination email addresses are recognized. Please make sure that you are sending to the correct email address provided by staff.
+        None of the destination email addresses are recognized, or the Message-ID header in the email has been modified. Please make sure that you are sending to the correct email address provided by staff.
 
     email_reject_topic_not_found:
       title: "Email Reject Topic Not Found"
@@ -2234,7 +2291,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"
@@ -2242,7 +2299,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"
@@ -2250,7 +2307,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"
@@ -2269,7 +2334,7 @@ en:
 
         This is an automated message from %{site_name} to let you know that your posts have been temporarily hidden because they were flagged by the community.
 
-        As a precautionary measure, your new account has been blocked from creating new replies or topics until a staff member can review your account. We apologize for the inconvenience.
+        As a precautionary measure, your new account has been silenced from creating new replies or topics until a staff member can review your account. We apologize for the inconvenience.
 
         For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
     too_many_tl3_flags:
@@ -2280,11 +2345,11 @@ en:
 
         This is an automated message from %{site_name} to let you know you that your account has been placed on hold due to a large number of community flags.
 
-        As a precautionary measure, your new account has been blocked from creating new replies or topics until a staff member can review your account.  We apologize for the inconvenience.
+        As a precautionary measure, your new account has been silenced from creating new replies or topics until a staff member can review your account.  We apologize for the inconvenience.
 
         For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
-    blocked_by_staff:
-      title: "Blocked by Staff"
+    silenced_by_staff:
+      title: "Silenced by Staff"
       subject_template: "Account temporarily on hold"
       text_body_template: |
         Hello,
@@ -2295,17 +2360,17 @@ en:
 
         For additional guidance, refer to our [community guidelines](%{base_url}/guidelines).
 
-    user_automatically_blocked:
-      title: "User Automatically Blocked"
-      subject_template: "New user %{username} blocked by community flags"
+    user_automatically_silenced:
+      title: "User Automatically Silenced"
+      subject_template: "New user %{username} silenced by community flags"
       text_body_template: |
         This is an automated message.
 
-        The new user [%{username}](%{user_url}) was automatically blocked because multiple users flagged %{username}'s post(s).
+        The new user [%{username}](%{user_url}) was automatically silenced because multiple users flagged %{username}'s post(s).
 
-        Please [review the flags](%{base_url}/admin/flags). If %{username} was incorrectly blocked from posting, click the unblock button on [the admin page for this user](%{user_url}).
+        Please [review the flags](%{base_url}/admin/flags). If %{username} was incorrectly silenced from posting, click the unsilence button on [the admin page for this user](%{user_url}).
 
-        This threshold can be changed via the `block_new_user` site settings.
+        This threshold can be changed via the `silence_new_user` site settings.
 
     spam_post_blocked:
       title: "Spam Post Blocked"
@@ -2319,8 +2384,8 @@ en:
 
         This can be modified via the `newuser_spam_host_threshold` and `white_listed_spam_host_domains` site settings.
 
-    unblocked:
-      title: "Unblocked"
+    unsilenced:
+      title: "Unsilenced"
       subject_template: "Account no longer on hold"
       text_body_template: |
         Hello,
@@ -2358,10 +2423,22 @@ 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 [the badges page](%{url}).
 
         You've quickly become a valuable member of our community. Thanks for joining, and keep up the great work!
 
+    queued_posts_reminder:
+      title: "Queued Posts Reminder"
+      subject_template:
+        one: "1 post waiting to be reviewed"
+        other: "%{count} posts waiting to be reviewed"
+      text_body_template: |
+        Hello,
+
+        Posts from new users were held for moderation and are currently waiting to be reviewed. [Approve or reject them here](%{base_url}/queued-posts).
+
+
+
   unsubscribe_link: |
     To unsubscribe from these emails, [click here](%{unsubscribe_url}).
 
@@ -2395,6 +2472,17 @@ 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
 
@@ -2417,6 +2505,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}'"
@@ -2562,6 +2660,41 @@ en:
 
         %{message}
 
+    account_suspended:
+      title: "Account Suspended"
+      subject_template: "[%{email_prefix}] Your account has been suspended"
+      text_body_template: |
+        You have been suspended from the forum until %{suspended_till}.
+
+        %{reason}
+
+        %{message}
+
+    account_silenced:
+      title: "Account Silenced"
+      subject_template: "[%{email_prefix}] Your account has been silenced"
+      text_body_template: |
+        You have been silenced from the forum until %{silenced_till}.
+
+        %{reason}
+
+        %{message}
+
+
+    account_exists:
+      title: "Account already exists"
+      subject_template: "[%{email_prefix}] Account already exists"
+      text_body_template: |
+        You just tried to create an account at %{site_name}, or tried to change the email of an account to %{email}. However, an account already exists for %{email}.
+
+        If you forgot your password, [reset it now](%{base_url}/password-reset).
+
+        If you didn’t try to create an account for %{email} or change your email address, don’t worry – you can safely ignore this message.
+
+        If you have any questions, [contact our friendly staff](%{base_url}/about).
+
+
+
     digest:
       why: "A brief summary of %{site_link} since your last visit on %{last_seen_at}"
       since_last_visit: "Since your last visit"
@@ -2577,7 +2710,8 @@ 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 %{email_preferences_link}, or %{unsubscribe_link} to unsubscribe."
+      your_email_settings: "your email settings"
       click_here: "click here"
       from: "%{site_name} summary"
       preheader: "A brief summary since your last visit on %{last_seen_at}"
@@ -2716,9 +2850,13 @@ en:
     search_title: "Search this site"
     search_google: "Google"
 
+  offline:
+    title: "Cannot load app"
+    offline_page_message: "It looks like you are offline! Please check your network connection and try again."
+
   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:
@@ -2736,12 +2874,15 @@ en:
     store_failure: "Failed to store upload #%{upload_id} for user #%{user_id}."
     file_missing: "Sorry, you must provide a file to upload."
     empty: "Sorry, but the file you provided is empty."
+    png_to_jpg_conversion_failure_message: "An error happened when converting from PNG to JPG."
     attachments:
       too_large: "Sorry, the file you are trying to upload is too big (maximum size is %{max_size_kb}KB)."
     images:
       too_large: "Sorry, the image you are trying to upload is too big (maximum size is %{max_size_kb}KB), please resize it and try again."
       larger_than_x_megapixels: "Sorry, the image you are trying to upload is too large (maximum dimension is %{max_image_megapixels}-megapixels), please resize it and try again."
       size_not_found: "Sorry, but we couldn't determine the size of the image. Maybe your image is corrupted?"
+    placeholders:
+      too_large: "(image larger than %{max_size_kb}KB)"
 
   avatar:
     missing: "Sorry, we can't find any avatar associated with that email address. Can you try uploading it again?"
@@ -2949,6 +3090,14 @@ en:
 
       Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.
 
+      ### HTTPS
+
+      We offer HTTPS as a paid add-on. By signing up and using a custom domain on %{company_domain}, you authorize us to act on the domain name registrant’s behalf (by requesting the necessary certificates, for example) for the sole purpose of providing HTTPS on your site.
+
+      ### Enterprise
+
+      Enterprise Hosting services are provided by %{company_name} under the terms and conditions for each such service, which are determined by a customer-specific contract. By signing up for an Enterprise Hosting account you agree to abide by such terms and conditions.
+
       <a name="6"></a>
 
       ## [6. Responsibility of Website Visitors](#6)
@@ -2975,59 +3124,53 @@ en:
 
       <a name="10"></a>
 
-      ## [10. Advertisements](#10)
+      ## [10. Attribution](#10)
 
-      %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.
+      %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer.
 
       <a name="11"></a>
 
-      ## [11. Attribution](#11)
-
-      %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased.
-
-      <a name="12"></a>
-
-      ## [12. Changes](#12)
+      ## [11. Changes](#11)
 
       %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement.
 
-      <a name="13"></a>
+      <a name="12"></a>
 
-      ## [13. Termination](#13)
+      ## [12. Termination](#12)
 
       %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.
 
-      <a name="14"></a>
+      <a name="13"></a>
 
-      ## [14. Disclaimer of Warranties](#14)
+      ## [13. Disclaimer of Warranties](#13)
 
       The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
 
-      <a name="15"></a>
+      <a name="14"></a>
 
-      ## [15. Limitation of Liability](#15)
+      ## [14. Limitation of Liability](#14)
 
       In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.
 
-      <a name="16"></a>
+      <a name="15"></a>
 
-      ## [16. General Representation and Warranty](#16)
+      ## [15. General Representation and Warranty](#15)
 
       You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.
 
-      <a name="17"></a>
+      <a name="16"></a>
 
-      ## [17. Indemnification](#17)
+      ## [16. Indemnification](#16)
 
       You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement.
 
-      <a name="18"></a>
+      <a name="17"></a>
 
-      ## [18. Miscellaneous](#18)
+      ## [17. Miscellaneous](#17)
 
       This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.
 
-      This document is CC-BY-SA. It was last updated May 31, 2013.
+      This document is CC-BY-SA. It was last updated January 1, 2017.
 
       Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/).
 
@@ -3149,9 +3292,9 @@ en:
         This badge is granted when you receive your first like on a post. Congratulations, you've posted something that your fellow community members found interesting, cool, or useful!
     autobiographer:
       name: Autobiographer
-      description: Filled out <a href="/my/preferences">profile</a> information
+      description: Filled out <a href="%{base_uri}/my/preferences/profile">profile</a> information
       long_description: |
-        This badge is granted for filling out <a href="/my/preferences">your user profile</a> and selecting a profile picture. Letting the community know a bit more about who you are and what you're interested in makes for a better, more connected community. Join us!
+        This badge is granted for filling out <a href="%{base_uri}/my/preferences/profile">your user profile</a> and selecting a profile picture. Letting the community know a bit more about who you are and what you're interested in makes for a better, more connected community. Join us!
     anniversary:
       name: Anniversary
       description: Active member for a year, posted at least once
@@ -3244,9 +3387,9 @@ en:
         This badge is granted the first time you quote a post in your reply. Quoting relevant sections of earlier posts in your reply helps keep discussions connected together and on topic. The easiest way to quote is to highlight a section of a post, and then press any reply button. Quote generously!
     read_guidelines:
       name: Read Guidelines
-      description: Read the <a href="/guidelines">community guidelines</a>
+      description: Read the <a href="%{base_uri}/guidelines">community guidelines</a>
       long_description: |
-        This badge is granted for <a href="/guidelines">reading the community guidelines</a>. Following and sharing these simple guidelines helps build a safe, fun, and sustainable community for everyone. Always remember there's another human being, one very much like yourself, on the other side of that screen. Be nice!
+        This badge is granted for <a href="%{base_uri}/guidelines">reading the community guidelines</a>. Following and sharing these simple guidelines helps build a safe, fun, and sustainable community for everyone. Always remember there's another human being, one very much like yourself, on the other side of that screen. Be nice!
     reader:
       name: Reader
       description: Read every reply in a topic with more than 100 replies
@@ -3335,6 +3478,18 @@ en:
       description: Outstanding contributions in their first month
       long_description: |
         This badge is granted to congratulate two new users each month for their excellent overall contributions, as measured by how often their posts were liked, and by whom.
+    enthusiast:
+      name: Enthusiast
+      description:  Visited 10 days
+      long_description: This badge is granted for visiting 10 consecutive days. Thanks for sticking with us for over a week!
+    aficionado:
+      name: Aficionado
+      description: Visited 100 days
+      long_description: This badge is granted for visiting 100 consecutive days. That's more than three months!
+    devotee:
+      name: Devotee
+      description: Visited 365 days
+      long_description: This badge is granted for visiting 365 consecutive days. Wow, an entire year!
     badge_title_metadata: "%{display_name} badge on %{site_title}"
 
   admin_login:
@@ -3374,6 +3529,7 @@ en:
     only_official: "Disable unofficial plugins"
     no_plugins: "Disable all plugins"
     enter: "Enter Safe Mode"
+    must_select: "You must select at least one option to enter safe mode."
   wizard:
     title: "Discourse Setup"
     step:
@@ -3438,7 +3594,7 @@ en:
             description: "General contact web page for you or your organization. Will be displayed on <a href='/about' target='_blank'>your about page</a>."
           site_contact:
             label: "Automated Messages"
-            description: "All automated Discourse personal messages will be sent from this user, such as the welcome message sent to each new user."
+            description: "All automated Discourse personal messages will be sent from this user, such as flag warnings and backup completion notices."
 
       corporate:
         title: "Organization"
@@ -3504,10 +3660,13 @@ en:
 
       invites:
         title: "Invite Staff"
-        description: "You’re almost done! Let’s invite some staff members to help <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>seed your discussions</a> with interesting topics and replies to get your community started."
+        description: "You’re almost done! Let’s invite some people to help <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>seed your discussions</a> with interesting topics and replies to get your community started."
 
       finished:
         title: "Your Discourse is Ready!"
         description: |
           <p>If you ever feel like changing these settings, visit <a href='/admin' target='_blank'>your admin section</a>; find it next to the wrench icon in the site menu.</p>
           <p>Have fun, and good luck <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>building your new community!</a></p>
+
+  search_logs:
+    graph_title: "Search Count"
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 0a03209ff5..7befac1f30 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -27,15 +27,15 @@ es:
   topics: "Temas"
   posts: "posts"
   loading: "Cargando"
-  powered_by_html: 'Desarrollado por <a href="https://www.discourse.org">Discourse</a>, se visualiza mejor habilitando JavaScript'
+  powered_by_html: 'Funciona gracias a <a href="https://www.discourse.org">Discourse</a>, se ve mejor con JavaScript activado'
   log_in: "Iniciar sesión"
   purge_reason: "Cuenta eliminada automáticamente al detectarse como abandonada, desactivada"
   disable_remote_images_download_reason: "La descarga de imágenes remotas se desactivó porque no había suficiente espacio disponible en disco."
   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"
@@ -46,8 +46,9 @@ es:
         no_message_id_error: "Sucede cuando el email no tiene Id del mensaje en el encabezado."
         auto_generated_email_error: "Sucede cuando la 'prioridad' en el encabezado está establecida en: lista, basura, en masa o auto_respuesta, o cuando algún otro encabezado contiene: auto-enviado, auto-respondido o auto-generado."
         no_body_detected_error: "Sucede cuando no podemos extraer el cuerpo del mensaje y no hay archivos adjuntos."
+        no_sender_detected_error: "Sucede cuando no podemos encontrar una dirección de email válida desde el encabezado From."
         inactive_user_error: "Sucede cuando el emisor no está activo."
-        blocked_user_error: "Sucede cuando el emisor ha sido bloqueado."
+        silenced_user_error: "Ocurre cuando el remitente ha sido silenciado."
         bad_destination_address: "Sucede cuando ninguna de las direcciones de email en los campos Para/Cc/Bcc coincide con un email configurado como dirección de correo entrante."
         strangers_not_allowed_error: "Sucede cuando un usuario intentó crear un nuevo tema en una categoría de la que no forma parte."
         insufficient_trust_level_error: "Sucede cuando un usuario intentó crear un nuevo tema en una categoría para la que no tiene el nivel de confianza requerido."
@@ -56,8 +57,12 @@ es:
         topic_closed_error: "Sucede cuando entró una respuesta pero el tema relacionado ha sido cerrado. "
         bounced_email_error: "El email es un reporte de correo rebotado."
         screened_email_error: "Sucede cuando la dirección de email del remitente ya ha sido filtrada."
+        unsubscribe_not_allowed: "Sucede cuando la desuscripción por email no está permitida para este usuario."
+        email_not_allowed: "Sucede cuando la dirección de email no está en la lista de admisiones, o está en la lista negra."
+      unrecognized_error: "Error no identificado"
   errors: &errors
     format: '%{attribute} %{message}'
+    format_with_full_message: '<b>%{attribute}</b>: %{message}'
     messages:
       too_long_validation: "está limitado a %{max} caracteres; has introducido %{length}."
       invalid_boolean: "Booleano no válido."
@@ -74,14 +79,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:
@@ -111,22 +116,24 @@ es:
       max_username_length_range: "No puedes poner el máximo por debajo del mínimo."
       default_categories_already_selected: "No se puede seleccionar una categoría ya utilizada en otra lista."
       s3_upload_bucket_is_required: "No se pueden activar las subidas a S3 a menos que se haya proporcionado un valor a 's3_upload_bucket'."
+    conflicting_google_user_id: 'La ID de la cuenta de Google para esta cuenta ha cambiado; por motivos de seguridad, hace falta que un miembro del staff intervenga. Por favor, ponte en contacto con el staff y mándales a <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   invite:
     not_found: "El código de la invitación es inválido. Por favor, ponte en contacto con un administrador."
-    user_exists: "No hace falta invitar a <b>%{email}</b>, ¡ya <a href='/u/%{username}/summary'>tiene una cuenta</a>!"
+    user_exists: "No hay necesidad de 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."
+  invalid_api_credentials: "No tienes permisos para visualizar el recurso solicitado. El nombre de usuario API o la clave es inválida. "
   read_only_mode_enabled: "El sitio está en modo sólo lectura. Las interacciones están deshabilitadas."
   reading_time: "Tiempo de lectura"
   likes: "Me gusta"
@@ -151,15 +158,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."
@@ -171,10 +178,12 @@ es:
   too_many_links:
     one: "Lo sentimos, los nuevos usuarios solo pueden poner un link en un post."
     other: "Lo sentimos, los nuevos usuarios solo pueden poner %{count} enlaces en un post."
+  contains_blocked_words: "Tu post contiene palabras que no son permitidas."
   spamming_host: "Lo sentimos, no puedes publicar un enlace a esa web."
   user_is_suspended: "A los usuarios suspendidos no se les permite publicar."
   topic_not_found: "Algo ha salido mal. ¿Tal vez este tema ha sido cerrado o eliminado mientras estabas lo estabas mirando?"
   not_accepting_pms: "Lo sentimos, %{username} no acepta mensajes en este momento."
+  max_pm_recepients: "Lo sentimos, puedes enviar un mensaje a un máximo de %{recipients_limit} destinatarios."
   just_posted_that: "es demasiado parecido a lo que has publicado recientemente"
   invalid_characters: "contiene caracteres no válidos"
   is_invalid: "parece poco claro, es una oración completa?"
@@ -207,14 +216,16 @@ es:
     user_posts: "Posts recientes por @%{username}"
     user_topics: "Temas recientes por @%{username}"
     tag: "Temas etiquetados"
+    badge: "%{display_name} distintivo en %{site_title}"
   too_late_to_edit: "Ese post fue publicado hace demasiado tiempo. No puede ser editado ni eliminado."
   revert_version_same: "La versión actual es la misma que la versión a la que intentas volver."
   excerpt_image: "imagen"
   queue:
     delete_reason: "Eliminado vía moderación"
+    not_found: "Post no encontrado o ya se actualizó."
   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 +233,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 +244,8 @@ 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}"
   education:
     until_posts:
       one: "1 post"
@@ -279,13 +293,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
 
@@ -306,7 +320,7 @@ es:
         title: 'Título'
         featured_link: 'Enlace destacado'
       post:
-        raw: "Body"
+        raw: "Mensaje"
       user_profile:
         bio_raw: "Sobre mí"
     errors:
@@ -318,6 +332,7 @@ es:
               too_many_users: "Solamente puedes enviar advertencias a un usuario a la vez."
               cant_send_pm: "Lo sentimos, no puedes enviar un mensaje privado a este usuario."
               no_user_selected: "Debes seleccionar un usuario válido."
+              reply_by_email_disabled: "Respuestas por email han sido desactivadas."
             featured_link:
               invalid: "es inválido. La dirección debería incluir http:// o https://."
               invalid_category: "no puede ser editado en esta categoría."
@@ -345,14 +360,22 @@ 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:
+              invalid_interpolation_keys: 'La siguiente llave(s) de interpolación es inválida: "%{keys}"'
+        watched_word:
+          attributes:
+            word:
+              too_many: "Demasiadas palabras para esa acción"
       <<: *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 +384,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
@@ -412,6 +435,7 @@ es:
       invalid_email_in: "'%{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}'."
+      description_incomplete: "El post que contiene la descripción de la categoría debe contener al menos un párrafo."
     cannot_delete:
       uncategorized: "Sin categoría no se puede eliminar"
       has_subcategories: "No se puede eliminar esta categoría porque tiene sub-categorías."
@@ -432,6 +456,9 @@ es:
     leader:
       title: "líder"
     change_failed_explanation: "Trataste de degradar a %{user_name} a '%{new_trust_level}'. Sin embargo su nivel de confianza ya es '%{current_trust_level}'. %{user_name} va a permanecer en '%{current_trust_level}' - si deseas degradar al usuario primero bloquea su nivel de confianza."
+  post:
+    image_placeholder:
+      broken: "Esta imagen está rota"
   rate_limiter:
     slow_down: "Has realizado esta acción muchas veces, inténtalo de nuevo más tarde."
     too_many_requests: "Estas haciendo eso demasiado a menudo. Por favor espera %{time_left} antes de intentarlo de nuevo."
@@ -558,28 +585,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,32 +618,38 @@ 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_default:
+      self: "No tienes actividad aún."
+      others: "Sin actividad."
     no_bookmarks:
       self: "No tienes temas en marcadores, añadir temas a marcadores te permite acceder a ellos más tarde fácilmente."
       others: "Sin marcadores."
     no_likes_given:
       self: "No le has dado a \"Me gusta\" en ningún tema."
       others: "No te gusta ningún tema."
+    no_replies:
+      self: "No tienes respuestas a ningún post."
+      others: "Sin respuestas."
   topic_flag_types:
     spam:
       title: 'Spam'
@@ -633,7 +666,7 @@ es:
       email_title: 'El tema "%{title}" requiere la atención de un moderador'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Tu post fue reportado por la comunidad. Por favor, <a href="/my/messages">mira tus mensajes</a>.</p>'
+    you_must_edit: '<p>Tu post fue reportado por la comunidad. Por favor, <a href="%{path}">mira tus mensajes</a>.</p>'
     user_must_edit: '<p>Este post fue reportado por la comunidad y está oculto temporalmente.</p>'
   archetypes:
     regular:
@@ -645,7 +678,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"
@@ -856,15 +889,16 @@ es:
     search_tokenize_chinese_japanese_korean: "Forzar la búsqueda a tokenizar Chino/Japonés/Coreano incluso en sitios que no basados en esos idiomas"
     search_prefer_recent_posts: "Si la búsqueda en tu foro gigante es lenta, esta opción prueba primero un índice de posts más recientes"
     search_recent_posts_size: "Cuántos posts recientes mantener en el índice"
+    log_search_queries: "Log de búsquedas de los usuarios"
+    search_query_log_max_size: "Cantidad máxima de consultas a conservar"
     allow_uncategorized_topics: "Permitir la creación de temas sin categoría. AVISO: Si ya hay algún tema sin categoría, debes recategorizarlo antes de activar esta opción."
     allow_duplicate_topic_titles: "Permitir temas con títulos idénticos, duplicados."
     unique_posts_mins: "¿Cuántos minutos deben pasar antes de que un usuario pueda publicar el mismo contenido de nuevo?"
     educate_until_posts: "Cuando el usuario comienza a escribir su primer o primeros (n) posts, mostrar un pop-up con el panel de consejos para nuevos usuarios en el editor."
     title: "El nombre de este sitio, utilizado en la etiqueta title."
     site_description: "Describe este sitio en una frase, utilizada en la etiqueta meta description."
-    contact_email: "Dirección de correo electrónico del responsable de este sitio. Utilizado para notificaciones críticas como reportes sin resolver, así como en la página /about de contacto para asuntos urgentes."
+    contact_email: "Dirección de correo electrónico del responsable de este sitio. Utilizado para notificaciones críticas, así como en la página /about de contacto para asuntos urgentes."
     contact_url: "URL de contacto para este sitio. Utilizada en la sección /about para asuntos urgentes."
-    queue_jobs: "¡SOLO DESARROLLADORES! ¡ADVERTENCIA! Poner varios trabajos en la cola de Sidekiq. Si se desactiva, el sitio dejará de funcionar."
     crawl_images: "Recuperar imágenes desde URLs remotas para insertarlas con las dimensiones correctas de ancho y de largo."
     download_remote_images_to_local: "Convertir imágenes remotas a imágenes locales descargándolas; esto previene imágenes rotas."
     download_remote_images_threshold: "Mínimo espacio en disco necesario para descargar imágenes remotas de forma local (porcentaje)"
@@ -879,30 +913,34 @@ es:
     fixed_category_positions: "Si está marcado, podrás ordenar las categorías en un orden fijado. Si no, las categorías se mostrarán según su actividad reciente."
     fixed_category_positions_on_create: "Al marcar esta opción, el orden de las categorías se mantendrá en el diálogo de creación de temas (requiere fixed_category_positions)."
     add_rel_nofollow_to_user_content: "Añadir la etiqueta rel nofollow a todo el contenido introducido por los usuarios, excepto por los enlaces entrantes (incluyendo dominios padre). Si cambias esto, deberás hacer un rebake de todos los posts con: \"rake posts:rebake\""
-    exclude_rel_nofollow_domains: "Una lista de dominios a cuyos enlaces no se les añadirá la etiqueta nofollow. dominio.com permitirá automáticamente sub.dominio.com también. Como mínimo, deberías añadir el dominio de este sitio para ayudar a los rastreadores web a encontrar todo el contenido. Si otras partes de este sitio web están en otros dominios, añádelos también."
+    exclude_rel_nofollow_domains: "Una lista de dominios a cuyos enlaces no se les añadirá la etiqueta nofollow. ejemplo.com permitirá automáticamente sub.ejemplo.com también. Como mínimo, deberías añadir el dominio de este sitio para ayudar a los rastreadores web a encontrar todo el contenido. Si otras partes de este sitio web están en otros dominios, añádelos también."
     post_excerpt_maxlength: "Extensión máxima del resumen / extracto de un post."
     show_pinned_excerpt_mobile: "Mostrar extracto de temas destacados en la vista móvil."
     show_pinned_excerpt_desktop: "Mostrar extracto de temas destacados en la vista de escritorio."
     post_onebox_maxlength: "Extensión máxima en caracteres de un post de Discourse en formato Onebox."
     onebox_domains_blacklist: "Una lista de dominios que nunca se mostrarán en un obenox."
+    inline_onebox_domains_whitelist: "Lista de dominios que serán oneboxed en miniatura si son enlazados sin un título"
+    enable_inline_onebox_on_all_domains: "Ignorar configuración inline_onebox_domain_whitelist site y permitir inline onebox en todos los dominios."
     max_oneboxes_per_post: "Número máximo de oneboxes en un tema."
     logo_url: "El logo situado en la esquina superior izquierda de tu sitio, debería encajar en las dimensiones de un rectángulo. Si se deja en blanco, se mostrará un texto con el título del sitio."
     digest_logo_url: "La imagen de logo alterno utilizado en la parte superior del resumen del sitio enviado por email. Debería encajar en las dimensiones de un rectángulo. No debería ser una imagen SVG. Si se deja en blanco, se utilizará `logo_url`."
     logo_small_url: "El logo pequeño situado en la esquina superior izquierda del sitio, debería encajar en las dimensiones de un cuadrado y se muestra cuando se hace scroll hacia abajo. Si se deja en blanco, se mostrará un glifo de una casita."
     favicon_url: "Un favicon para tu sitio, mira más info en http://es.wikipedia.org/wiki/Favicon - para que funcione correctamente sobre un CDN debe ser un png"
-    mobile_logo_url: "El logo con posición fija utilizado en la esquina superior izquierda de la versión móvil de tu sitio. Debería encajar en las dimensiones de un cuadrado. Si se deja en blanco, se mostrará el campo introducido en `logo_url`. Ejemplo: http://example.com/uploads/default/logo.png"
+    mobile_logo_url: "Url del logo personalizado usado en la versión móvil de tu sitio. Si lo dejas en blanco, `logo_url` será usado. Por ejemplo: http://example.com/uploads/default/logo.png"
+    large_icon_url: "Imagen usada como logo/splash en Android. Tamaño recomendado: 512px por 512px."
     apple_touch_icon_url: "Icono para los dispositivos táctiles de Apple. Se recomienda un tamaño de 144px por 144px."
     notification_email: "La dirección de correo electrónico \"remitente\", utilizada al enviar todos los emails esenciales de sistema. El dominio especificado debe tener correctamente configurados los registros SPF, DKIM y PTR inversos para que los emails se reciban correctamente."
     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'"
     summary_percent_filter: "Cuando un usuario hace clic en 'Resumen de este tema', se muestra el n % mejores posts"
     summary_max_results: "Máximo de posts devueltos en \"Resumen de este  tema\""
     enable_private_messages: "Permitir a los usuarios con nivel 1 de confianza (configurable vía mínimo nivel para enviar mensajes) crear y responder a mensajes directos. Ten en cuenta que el staff siempre puede enviar mensajes directos."
+    enable_private_email_messages: "Permita que el nivel de confianza 4 (configurable a través del nivel mínimo de confianza para enviar mensajes) envíe mensajes de correo electrónico privados. Tenga en cuenta que el personal siempre puede enviar mensajes, pase lo que pase."
     enable_long_polling: "Los mensajes usados para notificaciones pueden usar el long polling"
     long_polling_base_url: "URL base usada para el 'long polling' (cuando un CDN esta sirviendo contenido dinámico, asegúrate de ajustar esto al 'pull' de origen) ejemplo: http://origin.site.com"
     long_polling_interval: "Cantidad de tiempo que el servidor debe de esperar antes de responder a los clientes que no hay datos enviados (solamente usuarios con sesión iniciada)."
@@ -916,27 +954,29 @@ es:
     tl2_additional_likes_per_day_multiplier: "Incrementar el límite de likes por día para el nivel de confianza 2 (miembro) multiplicando por este número"
     tl3_additional_likes_per_day_multiplier: "Incrementar el límite de likes por día para el nivel de confianza 3 (habitual) multiplicando por este número"
     tl4_additional_likes_per_day_multiplier: "Incrementar el límite de likes por día para el nivel de confianza 4 (líder) multiplicando por este número"
-    num_spam_flags_to_block_new_user: "Si los posts de un nuevo usuario obtienen este número de reportes por spam de num_users_to_block_new_user diferentes usuarios, se ocultarán todos sus posts y no podrá publicar más en un futuro. Pon 0 para deshabilitar esto."
-    num_users_to_block_new_user: "Si los posts de un nuevo usuario son reportados como spam por num_spam_flags_to_block_new_user usuarios diferentes, ocultar todos sus posts y evitar que publique en el futuro. Poner 0 para desactivar."
-    num_tl3_flags_to_block_new_user: "Si los posts de un nuevo usuario obtienen este número de reportes por spam de num_users_to_block_new_user diferentes usuarios, se ocultarán todos sus posts y no podrá publicar más en un futuro. Pon 0 para deshabilitar esto."
-    num_tl3_users_to_block_new_user: "Si los posts de un nuevo usuario reciben num_tl3_flags_to_block_new_user reportes de este número de usuarios de nivel 3 de confianza, ocultar todos sus posts y prevenir futuras publicaciones. 0 para desactivar esta opción."
-    notify_mods_when_user_blocked: "Si un usuario es bloqueado automáticamente, enviar un mensaje a todos los moderadores."
+    num_spam_flags_to_silence_new_user: "Si los posts de un nuevo usuario obtienen este número de reportes por spam de num_users_to_silence_new_user diferentes usuarios, se ocultarán todos sus posts y no podrá publicar más en un futuro. 0 para deshabilitar."
+    num_users_to_silence_new_user: "Si los posts de un nuevo usuario son reportados como spam por num_spam_flags_to_silence_new_user usuarios diferentes, ocultar todos sus posts y evitar que publique en el futuro. 0 para deshabilitar."
+    num_tl3_flags_to_silence_new_user: "Si los posts de un nuevo usuario obtienen este número de reportes de num_tl3_users_to_silence_new_user diferentes usuarios con nivel de confianza 3, se ocultarán todos sus posts y no podrá publicar más en un futuro. 0 para deshabilitar."
+    num_tl3_users_to_silence_new_user: "Si los posts de un nuevo usuario reciben num_tl3_flags_to_silence_new_user reportes de este número de usuarios de nivel 3 de confianza, ocultar todos sus posts y prevenir futuras publicaciones. 0 para desactivar esta opción."
+    notify_mods_when_user_silenced: "Si un usuario es silenciado 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."
     maximum_session_age: "El usuario permanecerá n horas con su sesión iniciada desde su última visita"
-    ga_tracking_code: "El código \"Google analytics (ga.js)\", por ejemplo: UA-12345678-9 es OBSOLETO; leer  http://google.com/analytics"
-    ga_domain_name: "El nombre del dominio para \"Google analytics (ga.js)\" es OBSOLETO, ejemplo: mysite.com; ver http://google.com/analytics"
     ga_universal_tracking_code: "Código de seguimiento de Google Universal Analytics (analytics.js), ejemplo: UA-12345678-9; visita http://google.com/analytics"
     ga_universal_domain_name: "Nombre del dominio establecido en Google Universal Analytics (analytics.js), ejemplo: misitio.com; visita http://google.com/analytics"
+    ga_universal_auto_link_domains: "Habilitar el seguimiento multidominio de Google Universal Analytics (analytics.js). Enlaces salientes de estos dominios serán del client id agregados. Por favor ver las guías de Seguimiento Multidominio en la página de soporte de Google."
     gtm_container_id: "Google Tag Manager container id. ejempo: GTM-ABCDEF"
     enable_escaped_fragments: "Ir a la API Ajax-Crawling de Google si no se detecta ningún webcrawler. Mira https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
     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"
+    allowed_iframes: "Una lista de dominios para iframe src donde discourse pueda permitir de forma segura en mensajes"
     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."
@@ -954,21 +994,20 @@ es:
     top_page_default_timeframe: "Período de tiempo por defecto para la página de temas top"
     show_email_on_profile: "Mostrar el e-mail los usuarios en su perfil (solamente visibles para ellos mismos y el staff)"
     prioritize_username_in_ux: "Mostrar username primero en la página de usuario, tarjeta de usuario y mensajes (cuando el nombre ha sido desactivado se muestra primero)"
+    enable_rich_text_paste: "Activar la conversión automática de HTML a Markdown al pegar texto en el editor. (Experimental)"
     email_token_valid_hours: "Los tokens para restablecer contraseña olvidada / activar cuenta son válidos durante (n) horas."
     enable_badges: "Activar el sistema de distintivos"
     enable_whispers: "Permitir a los miembros del staff comunicarse privadamente entre ellos en temas públicos."
     allow_index_in_robots_txt: "Especificar en robots.txt que este sitio puede ser indexado por los motores de búsqueda web."
     email_domains_blacklist: "Una lista de dominios de correo electrónico con los que los usuarios no se podrán registrar. Ejemplo: mailinator.com|trashmail.net"
     email_domains_whitelist: "Una lista de dominios de email con los que los usuarios DEBERÁN registrar sus cuentas. AVISO: ¡los usuarios con un email con diferente dominio a los listados no estarán permitidos!"
-    forgot_password_strict: "No informar a los usuarios de la existencia de una cuenta cuando utilicen el diálogo de pérdida de contraseña."
+    hide_email_address_taken: "No informar a los usuarios de la existencia de una cuenta con el email durante el registro y desde el formulario de contraseña olvidada."
     log_out_strict: "Al cerrar sesión, cierra TODAS las sesiones del usuario en todos los dispositivos"
     version_checks: "Ping el 'Discourse Hub' para actualizaciones de versión y mostrar mensajes del número de versión en el dashboard /admin"
     new_version_emails: "Enviar un email a la dirección contact_email cuando esté disponible una nueva versión de Discourse."
-    port: "¡SOLO DESARROLLADORES! ¡ADVERTENCIA! Usa este puerto HTTP en vez del puerto 80 por defecto. Dejar en blanco deja por defecto el puerto 80."
-    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á."
@@ -1010,6 +1049,7 @@ es:
     github_client_id: "Client id para la autenticación por Github, registrado en https://github.com/settings/applications"
     github_client_secret: "Client secret para la autenticación por Github, registrado en https://github.com/settings/applications"
     readonly_mode_during_backup: "Habilitar el modo de 'solo-lectura' mientras se hace el backup"
+    enable_backups: "Permitir a los administradores crear copias de seguridad del foro"
     allow_restore: "Permitir restauración, la cual puede sobreescribir TODOS los datos del sitio! Dejela en falso a menos que tenga planeado recuperar sus datos desde una copia de respaldo. "
     maximum_backups: "La cantidad máxima de copias de seguridad a tener en el disco. Las copias de seguridad más antiguas se eliminan automáticamente"
     automatic_backups_enabled: "Ejecutar backups automáticos definidos por la opción de frecuencia de backups"
@@ -1049,7 +1089,7 @@ es:
     clean_up_uploads: "Eliminar subidas huérfanas sin referencia para prevenir hosting ilegal. AVISO: antes de habilitar esta opción quizá quieres hacer un backup de tu directorio de /uploads"
     clean_orphan_uploads_grace_period_hours: "Período de gracia (en horas) antes de que una subida huérfana sea eliminada."
     purge_deleted_uploads_grace_period_days: "Período de gracia (en días) antes de que una subida eliminada sea borrada totalmente."
-    purge_unactivated_users_grace_period_days: "Período de gracia (en días) que se concede a un usuario que no haya activado su cuenta antes de eliminarla."
+    purge_unactivated_users_grace_period_days: "Periodo de gracia (en días) antes de que un usuario que no ha activado su cuenta sea borrado. Configurar a 0 para que nunca se purgue a usuarios no activados."
     enable_s3_uploads: "Coloca los archivos subidos en el almacén Amazon S3. IMPORTANTE: requiere de credenciales de S3 validas. (ambas clave de acceso y clave de acceso secreta)."
     s3_use_iam_profile: 'Usar el rol de AWS EC2 IAM para descargar las llaves. NOTA: habilitando esta opción ignorará la "llave de acceso s3" y "la llave de acceso secreta s3".'
     s3_upload_bucket: "El nombre del bucket Amazon S3 donde se subirán los archivos. AVISO: debe ser en minúsculas, sin puntos ni guiones bajos."
@@ -1063,7 +1103,9 @@ 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."
+    strip_image_metadata: "Eliminar metadatos de imágenes."
     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."
@@ -1096,6 +1138,7 @@ es:
     min_trust_to_edit_post: "El mínimo nivel de confianza requerido para editar posts."
     min_trust_to_allow_self_wiki: "El mínimo nivel de confianza requerido para que un usuario convierta sus propios posts a wiki."
     min_trust_to_send_messages: "Mínimo nivel de confianza requerido para crear nuevos mensajes directos."
+    min_trust_to_send_email_messages: "El nivel de confianza mínimo necesario para enviar nuevos mensajes privados por correo electrónico (a los usuarios en escena)."
     newuser_max_links: "Cuántos enlaces puede un nuevo usuario añadir a un post."
     newuser_max_images: "Cuántas imágenes puede un nuevo usuario añadir a un post."
     newuser_max_attachments: "Cuántos adjuntos puede un nuevo usuario añadir a un post."
@@ -1103,6 +1146,7 @@ es:
     newuser_max_replies_per_topic: "Máximo número de respuestas que un nuevo usuario puede realizar en el mismo tema antes de que alguien responda a su vez a alguna de ellas."
     max_mentions_per_post: "Máximo número de menciones a @usuarios que alguien puede usar en un post."
     max_users_notified_per_group_mention: "Número de usuarios máximos que serán notificados si un grupo es mencionado (si se llega al límite no se mandarán las notificaciones)"
+    enable_mentions: "Permitir a los usuarios mencionar a otros usuarios."
     create_thumbnails: "Crear miniaturas de imágenes y lightbox cuando estas son demasiado grandes para encajar en un post."
     email_time_window_mins: "Esperar (n) minutos antes de enviar cualquier email de notificación, para dar a los usuarios margen con el que editar y finalizar sus posts."
     private_email_time_window_seconds: "Espera (n) segundos antes de enviar cualquier email de notificación, para dar a los usuarios margen con el que editar y finalizar sus mensajes."
@@ -1121,7 +1165,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,16 +1196,17 @@ 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"
-    auto_block_fast_typers_max_trust_level: "Máximo nivel de confianza por debajo del cual se podrán bloquearán usuarios que escriban demasiado rápido en su primer post"
-    auto_block_first_post_regex: "Expresión regular que no distingue mayúsculas y minúsculas que si es detectada hará que el primer post de un usuario sea bloqueado y enviado a la cola de aprobacion. Ejemplo: raging|a[bc]a hará que todos los posts que contengan gaging, aba o aca sean bloqueados. Sólo tiene efecto en el primer mensaje de un usuario."
+    auto_silence_fast_typers_on_first_post: "Silenciar automáticamente a usuarios que no cumplan el umbral establecido en min_first_post_typing_time"
+    auto_silence_fast_typers_max_trust_level: "Máximo nivel de confianza por debajo del cual se podrán silenciar usuarios que escriban demasiado rápido en su primer post"
+    auto_silence_first_post_regex: "Expresión regular que no distingue mayúsculas y minúsculas que si es detectada hará que el primer post de un usuario sea silenciado y enviado a la cola de aprobación. Ejemplo: raging|a[bc]a hará que todos los posts que contengan gaging, aba o aca sean silenciados. Sólo tiene efecto en el primer mensaje de un usuario."
+    flags_default_topics: "Mostrar temas reportados por defecto en la sección de administración"
     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 +1230,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,11 +1245,12 @@ 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: "Solo usar la 'reply key' para encontrar el mensaje que respondió. ADVERTENCIA: deshabilitar esto permitirá al usuario impersonar basado en las direcciones de email."
     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."
     delete_all_posts_max: "El máximo número de posts que pueden ser eliminados a la vez con el botón \"Eliminar todos los posts\". Si un usuario tiene un mayor número de posts que este valor, éstos no podrán ser eliminados de una vez y el usuario no podrá ser eliminado."
-    username_change_period: "El número de días después de registrarse entre los cuales una cuenta puede cambiar su nombre de usuario (0 para deshabilitar esta opción)"
+    username_change_period: "Número máximo de días después del registro en los que las cuentas pueden cambiar su nombre de usuario (0 para desactivar los cambios de usuario)."
     email_editable: "Permitir a los usuarios cambiar su dirección de email después de registrarse."
     logout_redirect: "Destino hacia donde redirigir el navegador después de cerrar sesión (ej: http://sitio.com/salida)"
     allow_uploaded_avatars: "Permitir a los usuarios subir imágenes de perfil personalizadas."
@@ -1219,7 +1265,7 @@ es:
     suppress_digest_email_after_days: "Suprimir los emails de resumen para aquellos usuarios que no han visto el sitio desde más de (n) días."
     digest_suppress_categories: "Suprimir estas categorías de los emails de resumen."
     disable_digest_emails: "Desactivar emails de resumen para todos los usuarios."
-    email_accent_bg_color: "El color de realce utilizado como fondo en algunos elementos del HTML en los emails. Introduce un nombre de color ('red') o un valor hexadecimal ('#FF000')."
+    email_accent_bg_color: "El color de realce utilizado como fondo en algunos elementos del HTML en los emails. Introduce un nombre de color ('red') o un valor hexadecimal ('#FF0000')."
     email_accent_fg_color: "El color de texto renderizado que irá con el color de fondo en el HTML de los emails. Introduce un nombre de color ('white') o un valor hexadecimal ('#FFFFFF')."
     email_link_color: "El color de los enlaces en el HTML de los emails. Introduce un nombre de color ('blue') o un valor hexadecimal ('#0000FF')."
     detect_custom_avatars: "Verificar o no que los usuarios han subido una imagen de perfil."
@@ -1232,6 +1278,8 @@ es:
     anonymous_posting_min_trust_level: "Nivel de confianza mínimo requerido para activar el modo anónimo"
     anonymous_account_duration_minutes: "Para proteger el anonimato, crear una nueva cuenta anónima cada N minutos para cada usuario. Ejemplo: si se establece en 600, tan pronto como pasen 600 minutos desde el último post Y el usuario cambie a anónimo, se creará una nueva cuenta anónima."
     hide_user_profiles_from_public: "Desactiva las tarjetas de usuario, los perfiles y el directorio de usuarios para usuarios anónimos."
+    show_inactive_accounts: "Permitir a los usuarios con sesión iniciada ver perfiles de cuentas inactivas."
+    hide_suspension_reasons: "No mostrar la razón de suspensión públicamente en el perfil de usuario."
     user_website_domains_whitelist: "El sitio web del usuario será automáticamente verificado con estos dominios. Lista delimitada por barras |"
     allow_profile_backgrounds: "Permitir a los usuarios subir sus propios fondos de perfil personalizados."
     sequential_replies_threshold: "Número de mensajes que un usuario tiene que publicar seguidos antes de que se le recuerde sobre demasiadas respuestas consecutivas."
@@ -1248,6 +1296,7 @@ es:
     topic_page_title_includes_category: "El título de la página del tema incluye el nombre de la categoría."
     native_app_install_banner: "Preguntar a visitantes recurrentes si quieren instalar la app nativa de Discourse"
     share_anonymized_statistics: "Compartir estadísticas del uso anónimas."
+    auto_handle_queued_age: "Maneja automáticamente los registros que están esperando para ser revisados después de estos días. Los reportes serán ignorados. Los mensajes en cola y los usuarios serán rechazados. Establezca en 0 para desactivar esta función."
     max_prints_per_hour_per_user: "Número máximo de impresiones de página /print (pon un 0 para desactivar esta opción)"
     full_name_required: "El nombre completo es un campo obligatorio del perfil de usuario."
     enable_names: "Mostrar el nombre completo del usuario en su perfil, tarjeta de usuario y emails. Desactiva esta opción para ocultar el nombre completo en todas partes."
@@ -1258,18 +1307,11 @@ es:
     warn_reviving_old_topic_age: "Cuando alguien publica en un tema cuya última respuesta fue hace este número de días o más, se le mostrará un aviso para desalentar el hecho de revivir una antigua discusión. Deshabilita esta opción introduciendo el valor 0."
     autohighlight_all_code: "Forzar el resaltado de código a los bloques de código preformateado cuando no se especifique el lenguaje del código."
     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."
-    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."
     embed_truncate: "Truncar los posts embebidos."
     allowed_href_schemes: "Esquemas permitidos en enlaces además de http y https."
     embed_post_limit: "Número máximo de posts a embeber."
     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)"
@@ -1285,6 +1327,8 @@ es:
     auto_close_messages_post_count: "Máximo número de publicaciones permitidas en un mensaje antes de que sea cerrado automáticamente (0 para desactivar)"
     auto_close_topics_post_count: "Máximo número de publicaciones permitidas en un tema antes de que sea cerrado automáticamente (0 para desactivar)"
     code_formatting_style: "El botón de código en el editor se establecerá por defecto a este estilo de formato de código"
+    max_allowed_message_recipients: "Destinatarios máximos permitidos en un mensaje."
+    watched_words_regular_expressions: "Palabras observadas son expresiones regulares."
     default_email_digest_frequency: "Cuán a menudo recibirán los usuarios emails de resumen por defecto."
     default_include_tl0_in_digests: "Incluir temas de usuarios nuevos en los emails de resumen por defecto. Los usuarios pueden cambiar esto en sus preferencias."
     default_email_private_messages: "Enviar un email cuando alguien envíe un mensaje al usuario por defecto."
@@ -1308,8 +1352,7 @@ es:
     default_categories_tracking: "Lista de categorías que están seguidas por defecto"
     default_categories_muted: "Lista de categorías que están silenciadas por defecto."
     default_categories_watching_first_post: "Lista de categorías en las que el mensaje de cada nuevo tema será vigilado por defecto."
-    max_user_api_reqs_per_day: "Número máximo de peticiones de API de usuario por clave y por día"
-    max_user_api_reqs_per_minute: "Número máximo de peticiones de API de usuario por clave y por minuto"
+    retain_web_hook_events_period_days: "Número de días para retener registros de eventos de web hook."
     allow_user_api_keys: "Permitir que se generen claves de API de usuario"
     allow_user_api_key_scopes: "Lista de ámbitos permitidos para las claves API de usuario"
     max_api_keys_per_user: "Número máximo de claves de usuario por usuario"
@@ -1355,20 +1398,26 @@ es:
       email_polling_disabled: "Debes activar el polling POP3 o bien el manual antes de activar la respuesta por email."
       user_locale_not_enabled: "Debes activar primero 'allow user locale' antes de activar esta opción."
       invalid_regex: "El código Regex es inválido o no está permitido."
+      email_editable_enabled: "Debes desactivar primero 'email editable' antes de activar esta opción."
+      enable_sso_disabled: "Debes activar primero 'enable sso' antes de activar esta opción."
+      staged_users_disabled: "Primero debes habilitar 'staged users' antes, para habilitar esta configuración."
+      reply_by_email_disabled: "Primero debes habilitar 'reply by email' antes de habilitar esta configuración."
+      sso_url_is_empty: "Debes establecer un valor en 'sso url' antes de activar este ajuste."
   search:
     within_post: "#%{post_number} por %{username}"
     types:
       category: 'Categorías'
       topic: 'Resultados'
       user: 'Usuarios'
+    results_page: "Resultados de búsqueda para '%{term}'"
   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 +1481,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 +1497,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."
@@ -1471,7 +1520,8 @@ es:
     email_too_long: "El email que has proporcionado es demasiado largo. Las direcciones de correo no deben tener más de 254 caracteres y los nombres de dominio no más de 253."
     reserved_username: "Ese nombre de usuario no está permitido."
     missing_user_field: "No has completado todos los campos de usuario"
-    close_window: "Autenticación completa. Cierra esta ventana para continuar."
+    auth_complete: "Autenticación completa."
+    click_to_continue: "Clic aquí para continuar."
     already_logged_in: "Ups, parece que estás intentando aceptar una invitación dirigida a otro usuariol. Si no eres %{current_user}, por favor cierra sesión e inténtalo de nuevo."
   user:
     no_accounts_associated: "No hay cuentas relacionadas."
@@ -1483,7 +1533,7 @@ es:
     username:
       short: "debe contener al menos %{min} caracteres"
       long: "debe contener no más de %{max} caracteres"
-      characters: "solo debe incluir números y letras"
+      characters: "solo debe incluir números, letras, guiones y guiones bajos"
       unique: "debe ser único"
       blank: "debe estar presente"
       must_begin_with_alphanumeric_or_underscore: "debe comenzar con una letra, un número o un guión bajo"
@@ -1499,10 +1549,15 @@ es:
       max_new_accounts_per_registration_ip: "No se permiten nuevos registros desde tu dirección IP (alcanzado el límite máximo). Contacta un miembro del staff."
     website:
       domain_not_allowed: "El sitio web no es válido. Los dominios permitidos son: %{domains}"
+    auto_rejected: "Rechazo automáticamente debido a la antigüedad. Ver configuración auto_handle_queued_age"
+    destroy_reasons:
+      unused_staged_user: "Usuario temporal sin uso"
+      fixed_primary_email: "Se arregló el correo electrónico principal para el usuario temporal"
+      same_ip_address: "Misma dirección de IP (%{ip_address}) como otros usuarios"
   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,37 +1565,35 @@ 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}"
+    subject_template: "%{inviter_name} te invitó a '%{topic_title}' en %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} te invitó a un debate
+      %{inviter_name} te invitó a una discusión
 
       > **%{topic_title}**
       >
       > %{topic_excerpt}
 
-      en
+      at
 
       > %{site_title} -- %{site_description}
 
-      Si estás interesado, haz clic en el siguiente enlace:
+      Si estás interesado, clic en el enlace de abajo:
 
       %{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}"
+    subject_template: "%{inviter_name} te invitó a '%{topic_title}' en %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} te ha invitado a un debate
+      %{inviter_name} te invitó a una discusión
 
       > **%{topic_title}**
       >
@@ -1550,61 +1603,56 @@ es:
 
       > %{site_title} -- %{site_description}
 
-      Mensaje de %{invitee_name}:
+      Con esta nota
 
-      %{user_custom_message}
+      > %{user_custom_message}
 
-      Si estás interesado en participar, haz clic en el enlace debajo:
+      Si estás interesado, clic en este enlace:
 
       %{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}"
+    subject_template: "%{inviter_name} te invitó a unirte a %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} te ha invitado a unirte a
+      %{inviter_name} te invitó a unirte
 
       > **%{site_title}**
       >
       > %{site_description}
 
-      Si estás interesado, haz clic en el botón debajo:
+      Si estás interesado, clic en el siguiente enlace:
 
       %{invite_link}
-
-      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:
-    subject_template: "%{invitee_name} te ha invitado a %{site_domain_name}"
+    title: "Invitación suscripción del foro"
+    subject_template: "%{inviter_name} te invitó a unirte a %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} te ha invitado a
+      %{inviter_name} te invitó a unirte a
 
       > **%{site_title}**
       >
       > %{site_description}
 
-      Mensaje de %{invitee_name}:
+      Con esta nota
 
-      %{user_custom_message}
+      > %{user_custom_message}
 
-      Si estás interesado en unirte, haz clic en el enlace debajo:
+      Si estás interesado, clic en el siguiente enlace:
 
       %{invite_link}
-
-      Esta invitación viene de un usuario en el que confiamos, por lo que se te creará una cuenta automáticamente.
   invite_password_instructions:
     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 +1662,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
 
@@ -1675,7 +1723,7 @@ es:
 
       - Actualiza usando nuestro sencillo **[sistema de un clic para actualizar](%{base_url}/admin/upgrade)**
 
-      - Echa un vistazo a los cambios en el  [changelog de GitHub](https://github.com/discourse/discourse/commits/master)
+      - Echa un vistazo a los cambios en  [las notas de versión](https://meta.discourse.org/tags/release-notes) o en el  [changelog de GitHub](https://github.com/discourse/discourse/commits/master)
 
       - Visita [meta.discourse.org](https://meta.discourse.org) para noticias, debates y ayuda para Discourse.
   new_version_mailer_with_notes:
@@ -1689,7 +1737,7 @@ es:
 
       - Actualiza usando nuestro sencillo **[sistema de un clic para actualizar](%{base_url}/admin/upgrade)**
 
-      - Echa un vistazo a los cambios en el  [changelog de GitHub](https://github.com/discourse/discourse/commits/master)
+      - Echa un vistazo a los cambios en  [las notas de versión](https://meta.discourse.org/tags/release-notes) o en el  [changelog de GitHub](https://github.com/discourse/discourse/commits/master)
 
       - Visita [meta.discourse.org](https://meta.discourse.org) para noticias, debates y ayuda para Discourse.
 
@@ -1697,15 +1745,6 @@ es:
 
       %{notes}
 
-  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"
-    text_body_template: |
-      Hola,
-
-      Algunos mensajes de usuarios nuevos  han sido retenidos para moderar y están esperando ser revisados. [Apruébalos o recházalos aquí](%{base_url}/queued-posts).
   flag_reasons:
     off_topic: "Tu post fue reportado como **off-topic**: la comunidad piensa que no se ajusta debidamente al tema, definido por el título o el primer post."
     inappropriate: "Tu post fue reportado como **inapropiado**: la comunidad piensa que es ofensivo, abusivo o que vulnera alguna de [nuestros consejos de uso](/guidelines)."
@@ -1718,11 +1757,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"
@@ -1731,34 +1770,50 @@ es:
 
         Esto es un mensaje automático de %{site_name} para hacerte saber que tu mensaje ha sido ocultado.
 
-        %{base_url}%{url}
+        <%{base_url}%{url}>
 
         %{flag_reason}
 
-        Varios miembros de la comunidad han reportado el mensaje antes de que fuera ocultado, por lo que te recomendamos que revises tu mensaje para reflejar su opinión. **Puedes editar tu mensaje en %{edit_delay} minutos, y será automáticamente mostrado de nuevo.**
+        Varios miembros de la comunidad han reportado este mensaje antes de que fuera ocultado, por lo que por favor considera cómo podrías editar tu mensaje para reflejar sus comentarios. **Podrás editar tu mensaje en %{edit_delay} minutos, y será automáticamente desocultado**.
 
-        Sin embargo, si el mensaje es ocultado por la comunidad una segunda vez, seguirá ocultado hasta que el staff lo revise – y se podrían tomar medidas incluida la posible suspensión de tu cuenta.
+        Sin embargo, si el mensaje es ocultado por la comunidad una segunda vez, se mantendrá oculto hasta que sea revisado por un miembro del staff.
 
-        Para más información sobre lo que consideramos adecuado, lee las [directrices de la comunidad](%{base_url}/guidelines).
+        Para obtener más información sobre el comportamiento esperado, revisa por favor 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 +1868,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"
@@ -1827,59 +1890,66 @@ es:
     csv_export_failed:
       title: "Error en la exportación de datos en CSV"
       subject_template: "La exportación de datos falló"
-      text_body_template: "Lo sentimos, pero la exportación de datos falló. Por favor, verifica los registros o contacta a un miembro del staff."
+      text_body_template: "Lo sentimos, pero la exportación de datos falló. Por favor, verifica los registros o [contacta a un miembro del staff](%{base_url}/about)."
     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.
+        Lo sentimos, pero tu mensaje de correo a %{destination} (titulado %{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.
+        Tu cuenta no tiene el suficiente nivel de confianza para publicar nuevos temas con esta dirección de correo. Si crees que esto es un error, [contacta a un miembro del staff](%{base_url}/about).
     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.
+        Lo sentimos, pero tu mensaje de correo a %{destination} (titulado %{former_title}) no ha funcionado.
 
-        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.
+        Tu respuesta ha sido enviada desde un correo electrónico desconocido. Intenta usar otro correo, o [contacta a un miembro del staff](%{base_url}/about).
     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.
+        Lo sentimos, pero tu mensaje de correo a %{destination} (titulado %{former_title}) no ha funcionado.
 
-        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.
+        Tu respuesta ha sido enviada desde un correo bloqueado. Intenta usar otro correo, o [contacta a un miembro del staff](%{base_url}/about).
+    email_reject_not_allowed_email:
+      title: "Email rechazado, email no permitido"
+      subject_template: "[%{email_prefix}] Problema con el email -- Correo bloqueado"
+      text_body_template: |
+        Lo sentimos, pero tu mensaje a %{destination} (titulado %{former_title}) no ha funcionado.
+
+        Tu respuesta ha sido enviada desde una dirección de correo electrónico bloqueada. Trata de enviar la respuesta desde otra dirección de email, o [contactar a un miembro del staff](%{base_url}/about).
     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"
+    email_reject_silenced_user:
+      title: "Email rechazado, usuario silenciado"
+      subject_template: "[%{email_prefix}] Problema con el email -- Usuario Silenciado"
       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.
+        La cuenta asociada a esta dirección de email ha sido silenciada.
     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.
+        Lo sentimos, pero tu mensaje de correo a %{destination} (titulado %{former_title}) no ha funcionado.
 
-        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.
+        Tu respuesta ha sido enviada desde un correo diferente al que esperábamos, así que no estamos seguros de que seas la misma persona.  Intenta usar otro correo, o [contacta a un miembro del staff](%{base_url}/about).
     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.
+        Lo sentimos, pero tu mensaje de correo a %{destination} (titulado %{former_title}) no ha funcionado.
 
-        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.
+        No podemos encontrar ninguna cuenta que coincida con tu dirección de email. Intenta usar otro correo, o [contacta a un miembro del staff](%{base_url}/about).
     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,37 +1958,35 @@ 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ó.
+        Lo sentimos, pero tu mensaje de correo a %{destination} (titulado %{former_title}) no ha funcionado.
 
-        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.
+        Tu cuenta no tiene los permisos para crear nuevos temas en esta categoría. Si crees que esto es un error, [contacta a un miembro del staff](%{base_url}/about).
     email_reject_strangers_not_allowed:
       title: "Rechazar emails desconocidos No permitido"
-      subject_template: "[%{email_prefix}] Problema de correo -- Acceso inválido"
-      text_body_template: |+
-        Lo sentimos, pero tu mensaje de email para %{destination} (titulado %{former_title}) no fue aceptado.
-
-
-        La categoría donde intentas enviar tu email solo acepta respuestas desde usuarios válidos con correos conocidos. Si tu crees que ves esto por error, contacta con algún administrador o moderador.
+      subject_template: "[%{email_prefix}] Problema con el correo -- Acceso no válido"
+      text_body_template: |
+        Lo sentimos, pero tu mensaje de correo a %{destination} (titulado %{former_title}) no ha funcionado.
 
+        La categoría que a la que has enviado la respuesta, solo acepta respuestas de cuentas y correos verificados. Si crees que esto es un error, [contacta a un miembro del staff](%{base_url}/about).
     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 +1997,56 @@ 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.
+        Lo sentimos, pero tu mensaje de correo a %{destination} (titulado %{former_title}) no ha funcionado.
 
-        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.
+        La llave de respuesta es inválida o desconocida, así que no podemos determinar a qué estás respondiendo. [Contacta a un miembro del staff](%{base_url}/about).
     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.
+        Ninguna de las direcciones de emails ha sido reconocida, o el Message-ID de la cabecera en el email ha sido modificado. Por favor asegúrate de que estás enviando los correos a las direcciones correctas provistas por el staff.
     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ó.
+        Lo sentimos, pero tu mensaje de correo a %{destination} (titulado %{former_title}) no ha funcionado.
 
-        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.
+        El tema al que respondes ya no existe -- quizás ha sido borrado? Si crees que esto es un error, [contacta a un miembro del staff](%{base_url}/about).
     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ó.
+        Lo sentimos, pero tu mensaje de correo a %{destination} (titulado %{former_title}) no ha funcionado.
 
-        El tema actualmente está cerrado y no acepta más respuestas. Si crees que esto es un error, contacta a un administrador.
+        El tema que estás respondiendo está cerrado y no permite más respuestas. Si crees que esto es un error, [contacta a un miembro del staff](%{base_url}/about).
     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ó.
+        Lo sentimos, pero tu mensaje de correo a %{destination} (titulado %{former_title}) no ha funcionado.
 
-        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.
+        Tu email ha sido marcado como "auto generado", lo que significa que ha sido creado automáticamente por una computadora en lugar de haber sido escrito por un ser humano; no podemos aceptar este tipo de correos. Si crees que esto es un error, [contacta un miembro del staff](%{base_url}/about).
+    email_reject_unrecognized_error:
+      title: "Email rechazado, error no identificado"
+      subject_template: "[%{email_prefix}] Problema con el correo -- Error no reconocido"
+      text_body_template: |
+        Lo sentimos, pero tu mensaje a %{destination} (titulado %{former_title}) no funcionó.
+
+        Hay un error no reconocido mientras se procesó tu email y no ha podido ser publicado. Intenta nuevamente, o  [contacta un miembro del staff](%{base_url}/about).
     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.
 
@@ -1985,9 +2060,9 @@ es:
       text_body_template: |
         Hola,
 
-        Esto es un mensaje automático de %{site_name} para hacerte saber que tus mensajes han sido ocultados temporalmente porque han sido reportados por la comunidad.
+        Esto es un mensaje automático de %{site_name} para hacerte saber que tus mensajes han sido ocultados temporalmente porque han sido reportados muchas veces por la comunidad.
 
-        Como medida cautelar, tu cuenta nueva ha sido bloqueada y no puede crear nuevas respuestas o temas hasta que un miembro del staff la revise. Sentimos las molestias ocasionadas.
+        Como medida cautelar, tu cuenta nueva ha sido silenciada de crear nuevas respuestas o debates hasta que un miembro del staff la revise tu cuenta. Sentimos las molestias ocasionadas.
 
         Para más información sobre lo que consideramos adecuado, lee las [directrices de la comunidad](%{base_url}/guidelines).
     too_many_tl3_flags:
@@ -1996,47 +2071,46 @@ es:
       text_body_template: |
         Hola,
 
-        Esto es un mensaje automático de %{site_name} para hacerte saber que tus mensajes han sido ocultados temporalmente porque han sido reportados muchas veces por la comunidad.
+        Esto es un mensaje automático de %{site_name} para hacerte saber que tu cuenta ha sido retenida porque ha sido reportada muchas veces por la comunidad.
 
-        Como medida cautelar, tu cuenta nueva ha sido bloqueada y no puede crear nuevas respuestas o temas hasta que un miembro del staff la revise. Sentimos las molestias ocasionadas.
+        Como medida cautelar, tu cuenta nueva ha sido silenciada de crear nuevas respuestas o debates hasta que un miembro del staff la revise tu cuenta. Sentimos las molestias ocasionadas.
 
-        Para más información sobre lo que consideramos adecuado, lee las [directrices de la comunidad](%{base_url}/guidelines).
-    blocked_by_staff:
-      title: "Bloqueado por Staff"
+        Para más información, por favor lee las [directrices de la comunidad](%{base_url}/guidelines).
+    silenced_by_staff:
+      title: "Silenciado por Staff"
       subject_template: "Cuenta temporalmente retenida"
       text_body_template: |
         Hola,
 
         Esto es un mensaje automático de %{site_name} para hacerte saber que tu cuenta ha sido temporalmente retenida como medida cautelar.
 
-        Por favor, sigue leyendo, pero no podrás responder o crear temas hasta que un [miembro del staff](%{base_url}/about) revise tus últimos temas. Sentimos las molestias ocasionadas.
-
+        Por favor sigue navegando, pero no podrás responder o crear temas hasta que un [miembro del staff](%{base_url}/about) revise tus últimos mensajes. Sentimos las molestias ocasionadas.
 
         Para más información sobre lo que consideramos adecuado, lee las [directrices de la comunidad](%{base_url}/guidelines).
-    user_automatically_blocked:
-      title: "Usuario Bloqueado Automaticamente"
-      subject_template: "Nuevo usuario %{username} bloqueado por las \"banderas\" de la comunidad."
+    user_automatically_silenced:
+      title: "Usuario Silenciado Automáticamente"
+      subject_template: "Nuevo usuario %{username} silenciado por reportes de la comunidad"
       text_body_template: |
         Este es un mensaje automático.
 
-        El usuario nuevo [%{username}](%{user_url}) ha sido automáticamente bloqueado porque varios usuarios han reportado los mensajes de %{username}.
+        El usuario nuevo [%{username}](%{user_url}) ha sido automáticamente silenciado porque varios usuarios han reportado  mensaje(s) de %{username}.
 
-        Por favor, [mira los reportes](%{base_url}/admin/flags). Si %{username} hubiera sido bloqueado incorrectamente, click haz clic en el botón de desbloquear en la [página de administración del usuario](%{user_url}).
+        Por favor, [mira los reportes](%{base_url}/admin/flags). Si %{username} hubiera sido silenciado  incorrectamente, haz clic en el botón de quitar silencio en la [página de administración del usuario](%{user_url}).
 
-        Esto puede ser cambiado con el ajuste `block_new_user`.
+        Esto puede ser cambiado con el ajuste `silence_new_user` en configuración del sitio.
     spam_post_blocked:
-      title: "Post con Spam Bloqueado"
-      subject_template: "El nuevo usuario %{username} tiene posts bloqueados debido a repetición de enlaces."
+      title: "Post spam bloqueado"
+      subject_template: "Bloqueado nuevo usuario %{username} debido a enlaces repetidos"
       text_body_template: |
         Este es un mensaje automático.
 
-        El usuario nuevo [%{username}](%{user_url}) ha intentado crear múltiples temas con enlaces a %{domains}, pero han sido bloqueados para evitar spam. El usuario todavía puede crear temas, siempre y cuando no contengan enlaces a  %{domains}.
+        El nuevo usuario [%{username}](%{user_url}) ha intentado crear múltiples posts con enlaces a %{domains}, pero han sido bloqueados para evitar spam. El usuario podrá seguir creando nuevos posts si no enlazan a %{domains}.
 
-        Por favor, [echa un vistazo al usuario](%{user_url}).
+        Por favor, [revisa el usuario](%{user_url}).
 
-        Esto puede ser modificado con los ajustes`newuser_spam_host_threshold` y`white_listed_spam_host_domains`.
-    unblocked:
-      title: "Desbloqueado"
+        Esto puede ser modificado a través de los ajustes `newuser_spam_host_threshold` y `newuser_spam_host_threshold`.
+    unsilenced:
+      title: "Dejar de silenciar"
       subject_template: "Cuenta no retenida"
       text_body_template: |
         Hola,
@@ -2065,14 +2139,23 @@ 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 Nuevo Usuario del Mes para %{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 solo lo ganan dos de los nuevos miembros por mes, y será visible permanentemente en [la página de distintivos](%{url}).
 
-        Has conseguido ser un miembro valioso de nuestra comunidad. Gracias por unirte, ¡y sigue así!
+        Te has convertido rápidamente en un miembro de valor para nuestra comunidad. ¡Gracias por unirte, y sigue con este excelente trabajo!
+    queued_posts_reminder:
+      title: "Recordatorio de post en revisión"
+      subject_template:
+        one: "1 post esperando a ser revisado"
+        other: "%{count} posts esperando a ser revisados"
+      text_body_template: |
+        Hola,
+
+        Posts de nuevos usuarios se mantienen moderados y están actualmente esperando a ser revisados. [Aprueba o rechaza desde aquí](%{base_url}/queued-posts).
   unsubscribe_link: |
     Para darte de baja de estos emails, [haz clic aquí](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -2086,8 +2169,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,8 +2181,18 @@ 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_group_to_private_message_body: |
+      %{username} te invitó en @%{group_name} al mensaje
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      en
+
+      > %{site_title} -- %{site_description}
     invited_to_private_message_body: |
-      %{username} te invitó a un mensaje directo
+      %{username} te invitó a un mensaje
 
       > **%{topic_title}**
       >
@@ -2109,7 +2202,7 @@ es:
 
       > %{site_title} -- %{site_description}
     invited_to_topic_body: |
-      %{username} te invitó a un tema de debate
+      %{username} te invitó a un debate
 
       > **%{topic_title}**
       >
@@ -2118,9 +2211,18 @@ es:
       en
 
       > %{site_title} -- %{site_description}
+    user_invited_to_private_message_pm_group:
+      title: "Usuario invitado a MP de Grupo"
+      subject_template: "[%{email_prefix}] %{username} te ha invitado en @%{group_name} al mensaje '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
     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 +2240,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}
 
@@ -2250,6 +2352,35 @@ es:
       text_body_template: |2
 
         %{message}
+    account_suspended:
+      title: "Cuenta Suspendida"
+      subject_template: "[%{email_prefix}] Tu cuenta ha sido suspendida"
+      text_body_template: |
+        Has sido suspendido del foro hasta  %{suspended_till}.
+
+        %{reason}
+
+        %{message}
+    account_silenced:
+      title: "Cuenta Silenciada"
+      subject_template: "[%{email_prefix}] Tu cuenta ha sido silenciada"
+      text_body_template: |
+        Has sido silenciado del foro hasta %{silenced_till}.
+
+        %{reason}
+
+        %{message}
+    account_exists:
+      title: "Cuenta ya existe"
+      subject_template: "[%{email_prefix}] La cuenta ya existe"
+      text_body_template: |
+        Has intentado crear una cuenta en %{site_name}, o intentaste cambiar el email de una cuenta para %{email}.  Sin embargo, una cuenta ya existe para %{email}.
+
+        Si te has olvidado la contraseña, [resetea la misma ahora](%{base_url}/password-reset).
+
+        Si no quisiste crear una cuenta para  %{email} o cambiar la dirección de correo electrónico, no te preocupes – puedes ignorar este mensaje.
+
+        Si tienes alguna pregunta, [contactar a nuestro amigable staff](%{base_url}/about).
     digest:
       why: "Un breve resumen de %{site_link} desde tu última visita el %{last_seen_at}"
       since_last_visit: "Desde tu última visita"
@@ -2257,7 +2388,7 @@ es:
       unread_messages: "Mensajes no leídos"
       unread_notifications: "Notificaciones no leídas"
       liked_received: "Me gusta recibidos"
-      new_posts: "Nuevos temas"
+      new_posts: "Nuevos posts"
       new_users: "Nuevos usuarios"
       popular_topics: "Temas populares"
       follow_topic: "Seguir este tema"
@@ -2265,71 +2396,68 @@ 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 %{email_preferences_link},  o %{unsubscribe_link} para cancelar tu suscripción."
+      your_email_settings: "tus configuraciones de email"
       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 +2467,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"
@@ -2356,9 +2499,12 @@ es:
     see_more: "Más"
     search_title: "Busca en este sitio"
     search_google: "Google"
+  offline:
+    title: "No carga app"
+    offline_page_message: "¡Parece que estás offline! Por favor revisa tu conexión a internet e intenta de nuevo."
   login_required:
     welcome_message: |
-      #[Bienvenido a %{title}](#welcome)
+      ## [Bienvenido a %{title}](#welcome)
       Una cuenta es requerida. Por favor cree una cuenta o inicie sesión para continuar.
   terms_of_service:
     title: "Condiciones Generales de Uso"
@@ -2371,13 +2517,16 @@ 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."
+    png_to_jpg_conversion_failure_message: "Ha ocurrido un error al convertir de PNG a JPG."
     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:
       too_large: "Lo sentimos, la imagen que estás intentando subir es demasiado grande (el tamaño máximo es %{max_size_kb}%KB). Por favor, modifica sus dimensiones y prueba otra vez."
       larger_than_x_megapixels: "Perdón, la imagen que intentas subir es demasiado grande (tamaño máximo  %{max_image_megapixels}-megapixels), por favor hazla mas pequeña e inténtalo de nuevo."
       size_not_found: "Lo sentimos, pero no hemos podido determinar el tamaño de la imagen. ¿Quizás el archivo está corrupto?"
+    placeholders:
+      too_large: "(imagen más grande que %{max_size_kb}KB)"
   avatar:
     missing: "Lo sentimos, no hemos encontrado un avatar asociado a esa dirección de email. ¿Puedes intentar subirlo de nuevo?"
   flag_reason:
@@ -2404,6 +2553,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 +2569,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: |
@@ -2675,9 +2925,9 @@ es:
         Este distintivo se concede cuando recibes tu primer Me gusta en un post. ¡Enhorabuena, has publicado algo que la comunidad considera guay, útil o interesante!
     autobiographer:
       name: Autobiógrafo
-      description: Detalló información en su <a href="/my/preferences">perfil</a> de usuario
+      description: Detalló información en su <a href="%{base_uri}/my/preferences/profile">perfil</a> de usuario
       long_description: |
-        Este distintivo se otorga por completar <a href="/my/preferences">tu perfil de usuario</u> y seleccionando una foto de perfil. Permitiendo a la comunidad saber más sobre ti y tus intereses hace que la comunidad sea mejor y esté más conectada.
+        Este distintivo se otorga por completar <a href="%{base_uri}/my/preferences/profile">tu perfil de usuario</a> y seleccionando una foto de perfil. Permitiendo a la comunidad saber más sobre ti y tus intereses hace que la comunidad sea mejor y esté más conectada. ¡Anímate!
     anniversary:
       name: Aniversario
       description: Miembro activo desde hace un año y que ha publicado al menos una vez
@@ -2770,9 +3020,9 @@ es:
         Este distintivo se otorga la primera vez que citas un post en tu respuesta. Citar secciones relevantes de posts anteriores ayuda a mantener los debates conectados y centrados en el tema. La forma más fácil de citar es seleccionando un trozo de cualquier post y utilizando el botón Citar que aparece al lado. ¡Cita generosamente!
     read_guidelines:
       name: Directrices leídas
-      description: Leyó las <a href="/guidelines">directrices de la comunidad</a>
+      description: Leyó las <a href="%{base_uri}/guidelines">directrices de la comunidad</a>
       long_description: |
-        Este distintivo se otorga por <a href="/guidelines">leer las directrices de la comunidad</a>. Siguiendo y compartiendo estas simples directrices ayudas a construir una comunidad segura, divertida y sostenible para todos. Recuerda siempre que hay otra persona como tú al otro lado, ¡sé agradable!
+        Este distintivo se otorga por <a href="%{base_uri}/guidelines">leer las directrices de la comunidad</a>. Siguiendo y compartiendo estas simples directrices ayudas a construir una comunidad segura, divertida y sostenible para todos. Recuerda siempre que hay otra persona como tú al otro lado de la pantalla, ¡sé agradable!
     reader:
       name: Lector
       description: Leyó todas las respuestas en un tema con más de 100 respuestas
@@ -2857,10 +3107,22 @@ 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.
+    enthusiast:
+      name: Entusiasta
+      description: 10 días de visitas
+      long_description: Este distintivo se gana por visitas durante 10 días consecutivos. ¡Gracias por quedarte con nosotros por más de una semana!
+    aficionado:
+      name: Aficionado
+      description: 100 días de visitas
+      long_description: Este distintivo se gana por visitas durante 100 días consecutivos. ¡Eso es más de tres meses!
+    devotee:
+      name: Devoto
+      description: 365 días de visitas
+      long_description: Este distintivo se gana por visitas durante 365 días consecutivos. ¡Wow, un año entero!
     badge_title_metadata: "%{display_name} distintivo en %{site_title}"
   admin_login:
     success: "Email enviado"
@@ -2891,9 +3153,11 @@ 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"
+    must_select: "Debes escoger al menos una opción para ingresar al modo seguro."
   wizard:
     title: "Instalación de Discourse"
     step:
@@ -2904,7 +3168,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 +3181,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"
@@ -2944,7 +3208,7 @@ es:
             description: "Tu página de contacto o la de tu organización. Será mostrada en la <a href='/about' target='_blank'>página de acerca de</a>."
           site_contact:
             label: "Mensajes automáticos"
-            description: "Todos los mensajes privados automáticos de Discourse serán enviados desde este usuario, como por ejemplo, el mensaje de bienvenida que se envía a los usuarios nuevos."
+            description: "Todos los mensajes privados automáticos de Discourse serán enviados desde este usuario, como por ejemplo, reportes de advertencia y notificaciones de backups completos."
       corporate:
         title: "Organización"
         description: "Estos nombres se usarán en tu <a href='/privacy' target='blank'>Política de privacidad</a> y <a href='/tos' target='blank'>Términos y condiciones</a>, que podrás editar en todo momento en la categoría Staff. Si no tienes una empresa, puedes saltarte este paso por ahora."
@@ -3001,12 +3265,14 @@ es:
         description: "¿Qué estilo de Emoji prefieres para tu comunidad? Siempre puedes añadir más Emojis personalizados a trvés de Admin, Personalizar, Emoji."
       invites:
         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."
+        description: "¡Ya casi estás listo! Vamos a invitar otras personas para que ayuden a <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>iniciar discusiones</a> con temas interesantes y respuestas para que comience tu comunidad."
       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>
+  search_logs:
+    graph_title: "Número de búsquedas"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml
index cc8baf659d..a7fa24e09c 100644
--- a/config/locales/server.et.yml
+++ b/config/locales/server.et.yml
@@ -43,7 +43,6 @@ et:
         auto_generated_email_error: "Juhtub, kui 'precedence' päis on seatud väärtusele: list, junk, bulk või auto_reply või kui mingi muu päis sisaldab väärtusi: auto-submitted, auto-replied või auto-generated."
         no_body_detected_error: "Juhtub, kui meil ei õnnestunud keha eraldada ja manused puudusid."
         inactive_user_error: "Juhtub, kui saatja ei ole aktiveeritud."
-        blocked_user_error: "Juhtub, kui saatja on blokeeritud."
         bad_destination_address: "Juhtub, kui ükski To/Cc/Bcc meiliaadresidest ei lange kokku seadistatud sissetulavate meiliaadressidega."
         strangers_not_allowed_error: "Juhtub, kui kasutaja proovib teha teemat liiki, millesse ta ise ei kuulu."
         insufficient_trust_level_error: "Juhtub, kui kasutaja proovib teha teemat liiki, millele tal puudub vajalik usaldustase."
@@ -289,7 +288,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
@@ -691,14 +689,8 @@ et:
     enable_staged_users: "Sissetulevate meilide töötlemisel loo kasutajad ettevalmistamiseks automaatselt."
     maximum_staged_users_per_email: "Ettevalmistamisel olevate kasutajate maksimaalne arv sai sissetuleva meili töötlemisel täis."
     dominating_topic_minimum_percent: "Mitu protsenti teema postitustest peab kasutaja tegema, et talle saadetaks meeldetuletus teema liigse domineerimise kohta."
-    feed_polling_enabled: "VAID SÄNGITAMISEL: Kas sängitada RSS/ATOM voog postitusena."
-    feed_polling_url: "VAID SÄNGITAMISEL: URL või RSS/ATOM voog, mida sängitada."
-    embed_by_username: "Sängitatud teemasid lisava kasutaja Discourse kasutajanimi."
-    embed_title_scrubber: "Regex sängitatavate päiste puhastamiseks."
     embed_truncate: "Lühenda sängitatud postitused."
     embed_post_limit: "Maksimaalne postituste arv, mida sängitada."
-    embed_whitelist_selector: "CSS valik elementidele, mida lubada sängitamistes."
-    embed_blacklist_selector: "CSS valik elementidele, mida eemaldada sängitamistes."
     tagging_enabled: "Luba silte teemadel?"
     min_trust_to_create_tag: "Sildi lisamiseks nõutav minimaalne usaldustase."
     max_tags_per_topic: "Teemale liidetavate siltide maksimaalne arv."
@@ -737,6 +729,8 @@ et:
     csv_export_failed:
       subject_template: "Andmete eksportimine ebaõnnestus"
   user_notifications:
+    previous_discussion: "Varasemad vastused"
+    in_reply_to: "Vastuseks"
     unsubscribe:
       title: "Tühista tellimus"
     user_posted_pm_staged:
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 16bc80baf6..2635f3c403 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -47,7 +47,6 @@ fa_IR:
         auto_generated_email_error: "زمانی که 'اولویت' سربرگ به: فهرست، شکسته، انبوه یا پاسخ خودکار اتفاق می‌افتد. یا وقتی سربرگ دیگری شامل: ثبت خودکار، پاسخ خودکار یا ایجاد خودکار باشد."
         no_body_detected_error: "وقتی که نمی‌توانیم متن را استخراج کنیم و ضمیمه‌ای وجود ندارد اتفاق می‌افتد."
         inactive_user_error: "هنگامی که ارسال کننده فعال نباشد."
-        blocked_user_error: "هنگامی که ارسال کننده مسدود شده باشد، رخ می‌دهد."
         bad_destination_address: "وقتی ایمیل‌‌های To/Cc/Bcc با یکی از ایمیل‌های پیکربندی شده ورودی هماهنگ نیستند، اتفاق می‌افتد"
         strangers_not_allowed_error: "هنگامی که که کاربر سعی در ایجاد موضوع در دسته‌بندی می کند که در آن عضو نیست، رخ می‌دهد."
         insufficient_trust_level_error: "وقتی اتفاق می‌افتد که کاربر قصد ایجاد موضوع در دسته‌بندی را دارد که سطح اعتمادش با آن دسته‌بندی هماهنگ نیست."
@@ -56,6 +55,7 @@ fa_IR:
         topic_closed_error: "این اتفاق زمانی رخ می‌دهد که موضوع مربوطه از سمت مدیران بسته شده باشد."
         bounced_email_error: "ایمیل یک گزارش برگشتی است."
         screened_email_error: "وقتی که ارسال کننده ایمیل پیش از این در حال نمایش باشد، اتفاق می‌افتد."
+      unrecognized_error: "خطای نامشخص"
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -159,10 +159,12 @@ fa_IR:
   no_links_allowed: "متأسفیم، کاربران تازه نمی‌توانند در نوشته‌ها پیوند بگذارند."
   too_many_links:
     other: "متأسفیم، کاربران تازه تنها می‌توانند در هر نوشته %{count} پیوند بگذارند."
+  contains_blocked_words: "نوشته‌ی شما حاوی الفاظی است که ممنوع هستند."
   spamming_host: "متأسفانه شما نمی‌توانید پیوندی با آن میزبان را بفرستید."
   user_is_suspended: "کاربر تعلیق شده نمی‌تواند نوشته‌ای ارسال کند."
   topic_not_found: "یک مشکلی وجود دارد.  شاید این موضوع همزمان که شما در حال خواندن آن بودید بسته شده یا پاک شده."
   not_accepting_pms: "با عرض پوزش، کاربر %{username} در حال حاضر پیام نمی‌پذیرد."
+  max_pm_recepients: "متاسفیم. فقط می‌توانید که پیغام را نهایتا به %{recipients_limit} گیرنده بفرستید."
   just_posted_that: "بسیار شبیه به چیزی است که به تازگی ارسال کردید"
   invalid_characters: "شامل نویسه‌های نامعتبر است"
   is_invalid: "نامفهوم است.آیا جمله کامل است؟"
@@ -195,6 +197,7 @@ fa_IR:
     user_posts: "آخرین نوشته ها توسط @%{username}"
     user_topics: "آخرین موضوعات توسط @%{username}"
     tag: "موضوعات برچسب خورده"
+    badge: "نشان %{display_name} در %{site_title}"
   too_late_to_edit: "نوشته‌ی مورد نظر مربوط به زمان بسیار گذشته می باشد. امکان ویرایش و حذف آن وجود ندارد."
   revert_version_same: "نسخه فعلی همان نسخه‌ای است که می‌خواهید به آن برگردید."
   excerpt_image: "تصویر"
@@ -220,6 +223,8 @@ fa_IR:
       trust_level_2: "سطح اعتماد 2"
       trust_level_3: "سطح اعتماد 3"
       trust_level_4: "سطح اعتماد 4"
+    request_membership_pm:
+      title: "درخواست عضویت در @%{group_name}"
   education:
     until_posts:
       other: "%{count} نوشته"
@@ -305,6 +310,7 @@ fa_IR:
               too_many_users: "شما در هر بار می توانید به یک کاربر اخطار ارسال نمایید."
               cant_send_pm: "متأسفانه ، شما نمی‌توانید به این کاربر پیام‌خصوصی بفرستید."
               no_user_selected: "باید یک کاربر معتبر انتخاب کنید"
+              reply_by_email_disabled: "پاسخ با ایمیل از کار انداخته شده است."
             featured_link:
               invalid: "نامعتبر است. لینک باید شامل http:// یا https:// باشد."
               invalid_category: "در این دسته بندی قابل ویرایش نیست."
@@ -337,6 +343,10 @@ fa_IR:
           attributes:
             execute_at:
               in_the_past: "باید در آینده باشد."
+        watched_word:
+          attributes:
+            word:
+              too_many: "برای چنین کاری کلمات زیادی است"
       <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>فیلد درباره من نمایه شما خالی است, <a href='/u/%{username_lower}/preferences/about-me'>قصد نوشتن دارید؟</a></div>"
@@ -348,7 +358,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
@@ -418,6 +427,9 @@ fa_IR:
     leader:
       title: "راهبر"
     change_failed_explanation: "شما تلاش برای تنزل رتبه دادید %{user_name} به   '%{new_trust_level}'. در هر صورت سطح اعتمادشان در حال حاضر '%{current_trust_level}' است. %{user_name} در '%{current_trust_level}' می‌ماند  - اگر می‌خواهید سطح کاربری را پایین بیاورید، ابتدا سطح اعتماد را قبل کنید."
+  post:
+    image_placeholder:
+      broken: "عکس خراب شده است."
   rate_limiter:
     slow_down: "شما این عمل را بیش از حد انجام داده اید, بعدا دوباره امتحان کنید."
     too_many_requests: "ما روزانه  محدودیت زمانی داریم برای اینکه این اقدام چند بار انجام شود. لطفا %{time_left} قبل از اینکه دوباره تلاش کنید صبر کنید . "
@@ -547,7 +559,7 @@ fa_IR:
       description: 'من می‌خواهم با این شخص به صورت مستقیم و محرمانه درباره نوشته‌اش صحبت کنم.'
       short_description: 'می‌خواهم با این شخص به صورت خصوصی درباره‌ی نوشته‌اش صحبت کنم.'
       long_form: 'به کاربر پیام داده شد'
-      email_title: 'نوشته ی شما در "{title}%"'
+      email_title: 'نوشته ی شما در " %{title} "'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "یک چیز دیگر"
@@ -578,6 +590,9 @@ fa_IR:
     no_likes_given:
       self: "نوشته پسندیده شده‌ای ندارید."
       others: "نوشته‌ی پسندیده شده‌ای وجود ندارد."
+    no_replies:
+      self: "شما به هیچ نوشته‌ای پاسخ نداده‌اید."
+      others: "بدون پاسخ"
   topic_flag_types:
     spam:
       title: 'هرز‌نامه'
@@ -594,7 +609,6 @@ fa_IR:
       email_title: 'موضوع "%{title}" نیاز به توجه مدیر دارد. '
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>نوشته شما توسط انجمن پرچم گذاری شده. لطفا <a href="/my/private-messages"> پیام هایتان را ببینید</a>.</p> '
     user_must_edit: '<p> این نوشته توسط انجمن پرچم گذاری شده و بطور موقت مخفی شده است.</p>'
   archetypes:
     regular:
@@ -606,7 +620,7 @@ fa_IR:
         remove: "این موضوع دیگر در بنر نیست. دیگر در بالای تمام صفحات به نمایش در نمی‌آید. "
   unsubscribed:
     title: "اشتراک لغو شد!"
-    description: "لغو اشتراک انجام شد. برای تغییر تنظیمات ایمیل <a href='%{url}'>تنظیمات را ببینید</a>."
+    description: "<b>%{email}</b> از فهرست خارج شد. برای تغییر تنظیمات ایمیل، به <a href='%{url}'>صفحه‌ی تنظیمات کاربری</a> وارد شوید."
     topic_description: "اشتراک مجدد در %{link}، استفاده از مدیریت اعلانات در قسمت پایین یا راست موضوع."
   unsubscribe:
     title: "لغو اشتراک"
@@ -816,15 +830,15 @@ fa_IR:
     search_tokenize_chinese_japanese_korean: "اجبار جستجو برای tokenize کردن چینی/ژاپنی/کره‌ای حتی در سایت هایی که از این زبان‌ها استفاده نمی‌کنند"
     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: "چند دقیقه قبل از اینکه کاربر بتواند دوباره نوشته‌ای با محتویات یکسان را بگذارد."
     educate_until_posts: "وقتی کاربر شروع کرد به نوشتن اولین (n)  نوشته‌ی جدید، آموزش‌ها را برای کاربران جدید بصورت بالابر در قسمت نویسنده نشان بده."
     title: "نام این وب سایت، استفاده شده در تگ title"
     site_description: "سایت را در یک جمله توصیف کنید،‌ همانطور که در تگ meta توضیح داده شده بود"
-    contact_email: "آدرس ایمیل تماس کلیدی که برای این سایت مسولیت دارند. برای ارسال اعلان‌های حساس مثل پرچم گزاری های پیگیری نشده استفاده می شود، و همچنین برای تماس در موارد ضروری. "
     contact_url: "با URL برای این سایت تماس بگیر. برای تماس در صفحه‌ی درباره‌ما برای موارد ضروری استفاده می‌شود."
-    queue_jobs: "فقط برنامه نویسان!‌ اخطار! بصورت پیش فرض٬ کارها در  sidekiq در نوبت هستند. اگر غیر فعال باشد، وب سایت شما به مشکل بر‌می‌خورد."
     crawl_images: "بازیابی تصاویر از URL‌های خارجی برای وارد کردن طول و عرض صحیح. "
     download_remote_images_to_local: "تبدیل عکس‌های خارجی به عکس های محلی با دانلود کردن آنها، این مانع از شکستن عکس‌ها می شود."
     download_remote_images_threshold: "حداقل فضای دیسک مورد نیاز برای دانلود عکس‌های خارجی به هاست (به درصد)"
@@ -839,7 +853,6 @@ fa_IR:
     fixed_category_positions: "اگر فعال باشد٬ شما این امکان را دارید تا دسته‌ندی‌ها را به ترتیب در یک نظم ثابت قرار دهید. اگر فعال نباشد، دسته‌بندی‌ها بر اساس فعالیتشان قرار می گیرند. "
     fixed_category_positions_on_create: "اگر انتخاب شود بدین معنی است که ترتیب دسته‌بندی‌ها در پنجره ایجاد یک عنوان جدید مدیریت خواهد شد (نیازمند  fixed_category_positions است)."
     add_rel_nofollow_to_user_content: "nofollow REL را به تمام محتویات ارسال شده توسط کاربر اضافه کن، بجر برای پیوندهای داخلی (به همراه دامنه‌های والد). اگر این قسمت را عوض کنید،‌ باید تمام نوشته‌ها را با دستور زیر 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: "نمایش خلاصه موضوعات سنجاق شده در کامپیوتر."
@@ -850,7 +863,6 @@ fa_IR:
     digest_logo_url: "موقعیت لوگوی تصویر ثابت در بالای خلاصه ایمیل استفاده  شده است. باید به شکل یک مستطیل عریض باشد. نباید تصویر SVG باشد. اگر این قسمت را وارد نکنید مقدار  `logo_url` استفاده می‌شود."
     logo_small_url: "لوگو کوچک در قسمت بالا چپ سایت نمایش داده می‌شود. باید شکل مربعی داشته باشد، وقتی که کاربر اسکرول می‌کند نمایش داده می‌شود. اگر خالی باشد آیکن home glyph نمایش داده می‌شود."
     favicon_url: "فاویکون سایت، برای استفاده صحیح از CDN لینک زیر را ببینید، فرمت باید png باشد\nhttp://en.wikipedia.org/wiki/Favicon"
-    mobile_logo_url: "موقعیت لوگو ثابت در قسمت بالا چپ نسخه موبایل استفاده می‌شود. باید به شکل مربع باشد، اگر خالی باشد از مقدار `logo_url` استفاده می‌شود. مثال: http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "آیکن استفاده شده برای دستگاه های لمسی اپل. اندازه پیشنهادی 144px by 144px."
     notification_email: "از: ایمیل آدرس زمان ارسال تمام ایمیل های ضروری سیستم استفاده شد. .دامنه مشخص شده در اینجا باید SPF, DKIM  داشته باشد و سوابق PTR معکوس به درستی برای ورود ایمیل تنظیم شده باشد. "
     email_custom_headers: "فهرست pipe-delimited از سربرگ‌های ایمیل سفارشی "
@@ -876,20 +888,12 @@ fa_IR:
     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_flags_to_block_new_user از کاربران متفاوت پرچم های هرزنامه گرفت٬ نوشته های آن‌ها را مخفی کن و از نوشتن آنها در آینده جلوگیری کن. 0 برای غیر فعال."
-    num_users_to_block_new_user: "اگر نوشته های کاربران جدید num_flags_to_block_new_user از کاربران متفاوت پرچم های هرزنامه گرفت٬ نوشته های آنها را مخفی کن و از نوشتن آنها در آینده جلوگیری کن. 0 برای از کار انداختن. "
-    num_tl3_flags_to_block_new_user: "اگر کاربر جدید این تعداد پرچم هرزنامه از کاربران مختلف سطح اعتماد 3 num_tl3_users_to_block_new_user دریافت کرد تمام نوشته‌هایش را مخفی کن و اجازه ارسال نوشته جدید نده. 0 برای غیر فعال."
-    num_tl3_users_to_block_new_user: "اگر کاربر جدید این تعداد پرچم هرزنامه از کاربران مختلف سطح اعتماد 3 num_tl3_users_to_block_new_user دریافت کرد تمام نوشته‌هایش را مخفی کن و اجازه ارسال نوشته جدید نده. 0 برای غیر فعال."
-    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 برای غیرفعال‌سازی."
     maximum_session_age: "کاربر برای n ساعت از آخرین بازدید در حالت وارد شده می‌ماند."
-    ga_tracking_code: "منسوخ: کد پیگیری آمارگیر گوگل (ga.js) برای مثال: UA-12345678-9; این لینک را ببینید http://google.com/analytics"
-    ga_domain_name: "منسوخ: نام دامنه آمار‌گیر گوگل (ga.js) برای مثال: mysite.com; این لینک را ببینید http://google.com/analytics"
     ga_universal_tracking_code: "کد آمارگیر گوگل  (analytics.js) UA-12345678-9؛ اینجا را ببینید http://google.com/analytics"
     ga_universal_domain_name: "کد آمارگیر گوگل (analytics.js) اسم دامنه٬‌ مثلا: mysite.com؛ اینجا را ببینید  http://google.com/analytics"
     gtm_container_id: "مدیریت برچسب گوگل شامل شناسه است برای مثال: GTM-ABCDEF"
@@ -920,12 +924,9 @@ fa_IR:
     allow_index_in_robots_txt: "در robots.txt که به این سایت اجازه دهید که در موتور‌های جستجو ایندکس شود."
     email_domains_blacklist: "لیست pipe-delimit دامنه های ایمیل که کاربران اجازه ندارند با آن حساب کاربری ثبت‌نام کنند. برای مثال:  mailinator.com|trashmail.net"
     email_domains_whitelist: "لیست pipe-delimit دامنه های ایمیل که کاربران اجازه باید با آن حساب کاربری ثبت نام کنند. اخطار: کاربرانی با دامنه‌های ایمیلی به غیر از آن‌هایی که در لیست هستند اجازه ندارند. "
-    forgot_password_strict: "آگاه نکردن کاربران از وجود حساب کاربری در صفحه فراموشی روز عبور"
     log_out_strict: "وقتی از سیستم خارج می شود، کاربر را از تمام session‌ها بر روی تمام دستگاه‌ها خارج کن "
     version_checks: "Discourse Hub را پینگ کن برای  نسخه بروزرسانی و پیام نسخه جدید را صفحه آمار ادمین نشان بده."
     new_version_emails: "ارسال ایمیل به contact_email address وقتی نسخه جدید  Discourse موجود است. "
-    port: "فقط توسعه‌دهندگان! اخطار! از این پورت HTTP استفاده به‌جای پورت پیش فرض 80 استفاده شود. برای پیش فرض 80 خالی بگذارید."
-    force_hostname: "فقط توسعه‌دهندگان!‌ اخطار! نام هاست را در URL مشخص کنید. برای پیش فرض خالی بگذارید. "
     invite_expiry_days: "کلید دعوتنامه فراخوان برای چه مدت اعتبار دارد، واحد روز"
     invite_passthrough_hours: "کاربر برای چه مدت می تواند از کلید فراخوان استفاده شده برای ورود به سیستم استفاده کند، واحد ساعت"
     invite_only: "ثبت‌نام عمومی غیر‌فعال است، تمام کاربران جدید باید توسط کارمندان دعوت شوند."
@@ -1009,7 +1010,6 @@ fa_IR:
     clean_up_uploads: "بارگذاری های بدون ریشه و بدون رفرنس را برای جلوگیری از  میزبانی غیر قانونی پاک کن. اخطار: شاید شما می‌خواهید قبل از بکارگیری این تظیم از بارگذایتان نسخه پشتیبان بگیرید. "
     clean_orphan_uploads_grace_period_hours: "دوره معافیت (واحد ساعت) قبل از اینکه بارگذاری‌های بدون ریشه پاک شوند. "
     purge_deleted_uploads_grace_period_days: "دوره معافیت (واحد روز) قبل از اینکه بارگذاری‌های پاک شده حذف شوند. "
-    purge_unactivated_users_grace_period_days: "دوره معافیت (واحد روز) قبل از اینکه کاربری که حساب کاربریش را فعال نکرده پاک شوند. "
     enable_s3_uploads: "مکان بارگزاری ها در فضای Amazon S3. مهم: به اطلاعات ورود S3 صحیح معتبر نیاز است (a3 access key id و s3 secret key)"
     s3_use_iam_profile: 'از نقش AWS EC2 IAM  برای بازیابی کلید‌ها استفاده کن. نکته: بکارگیری این مورد موجب باطل کردن  تنظیمات "s3 access key id"  و "s3 secret access key" می شود. '
     s3_upload_bucket: "نام میزبان Amazon S3 که فایل‌ها در آنجا بارگذاری می شود. اخطار: باید حروف کوچک باشد٬ بدون دوره٬‌ بدون زیرخط"
@@ -1024,6 +1024,8 @@ 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: "به مدیران اجازه بده که هر فایلی در پیغام خصوصی آپلود کنند."
+    strip_image_metadata: "فراداده های عکس را حذف کن."
     enable_flash_video_onebox: "بکارگیری جاسازی لینک های  swf و flv (ادوبی فلاش Adobe Flash) در oneboxes. اخطار: شاید باعث ایجاد خطرات امنیتی شود."
     default_invitee_trust_level: "سطح اعتماد پیشفرض (0-4) برای دعوت کاربران"
     default_trust_level: "سطح اعتماد پیشفرض(0-4) برای تمام کاربران جدید. اخطار! تغییر این ممکن است شما را در معرض خطر جدی هرزنامه قرار دهد."
@@ -1115,9 +1117,6 @@ fa_IR:
     num_hours_to_close_topic: "زمان توقف مورد نیاز برای مداخله در یک موضوع"
     auto_respond_to_flag_actions: "فعال کردن پاسخ خودکار برای زمانی که پرچم‌گذاری دفع می شود."
     min_first_post_typing_time: "حداقل زمان تایپ برای اولین نوشته کاربر به واحد میلی ثانیه، اگر این زمان رعایت نشود نوشته نیازمند تایید خواهد بود. 0 برای غیر فعال (توصیه نمی‌شود)"
-    auto_block_fast_typers_on_first_post: "کاربرانی که حداقل زمان نوشتن متن را رعایت نمی‌کنند به صورت خودکار مسدود کن"
-    auto_block_fast_typers_max_trust_level: "حداکثر سطح اعتماد برای مسدود کردن اسپمر‌ها"
-    auto_block_first_post_regex: "regex غیر حساس به اندازه حروف که اگر در نوشته اول کاربر باشد باعث جلوگیری از ارسال خواهد شد و نیاز به تایید توسط مدیران دارد. برای مثال raging|a[bc]a باعث می‌شود نوشته های شامل raging یا aba یا aca در ابتدا بسته شوند. فقط به نوشته اول اثر دارد."
     reply_by_email_enabled: "Enable replying to topics via email."
     reply_by_email_address: "نمونه برای پاسخ به ایمیل، آدرس‌های ایمیل آمده برای مثال: %{reply_key}@reply.example.com یا replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "لیست قالب‌های مشابه برای پاسخ به ایمیل‌های دریافتی. مثال:\n%{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
@@ -1156,7 +1155,6 @@ fa_IR:
     pop3_polling_username: "نام کاربری برای حساب کاربری POP3 برای نظرسنجی در ایمیل."
     pop3_polling_password: "رمز عبور برای حساب کاربری POP3 برای نظرسنجی در ایمیل."
     log_mail_processing_failures: "گزارش تمام ایمیل ها را در http://yoursitename.com/logs قرار بده"
-    email_in: "به کاربران اجازه بده نوشته های جدید را از طریق ایمیل ارسال کنند. (بهpop3 polling نیاز است). آدرس‌ها را در تنظیمات هر دسته‌بندی پیکربندی کنید. "
     email_in_min_trust: "حداقل میزان سطح اعتماد برای کاربران تا بتوانند نوشته را از طریق ایمیل ارسال کنند. "
     email_prefix: "این [برچسب]  در موضوع ایمیل استفاده شده. اگر تنظيم نشود عنوان به 'عنوان' تبدیل می‌شود."
     email_site_title: "عنوان این سایت به فرستنده ایمیل‌ها در سایت استفاده شده. اگر مقداری عنوان شامل نویسه‌های غیر مجاز باشد، به 'عنوان' تبدیل خواهد شد."
@@ -1164,7 +1162,6 @@ fa_IR:
     relative_date_duration: "تعداد روزها بعد از پست کردن جایی که تاریخ نوشته به عنوان نسبی (7 روز) به‌جای (23 بهمن) نشان داده می شود."
     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: "اجازه بارگذاری تصاویر سفارشی پروفایل به کاربران"
@@ -1179,7 +1176,6 @@ fa_IR:
     suppress_digest_email_after_days: "غیر‌فعال کردن خلاصه ایمیل برای کاربرانی که بیش از (n) روز وارد سایت نشدند."
     digest_suppress_categories: "غیر‌فعال کردن این دسته‌بندی‌ها در ایمیل های خلاصه."
     disable_digest_emails: "غیر‌فعال کردن خلاصه ایمیل برای تمامی کاربران"
-    email_accent_bg_color: "رنگ پس زمینه عناصر HTML استفاده شده در ایمیل‌ها. یک نام رنگ مثل ('red') یا کد هگز ('#FF0000') وارد کنید."
     email_accent_fg_color: "رنگ متن پس‌زمینه ایمیل HTML. یک نام رنگ مثل ('white') یا کد هگز وارد کنید ('#FFFFFF')."
     email_link_color: "رنگ پیوند‌ها در ایمیل‌های HTML. یک نام رنگ مثل ('blue') یا کد هگز ('#0000FF') وارد کنید"
     detect_custom_avatars: "بررسی کن که کاربران تصویر پروفایل سفارشی بارگذاری کرده‌اند یا خیر."
@@ -1218,18 +1214,10 @@ fa_IR:
     warn_reviving_old_topic_age: "وقتی کسی شروع می کند با پاسخ دادن به موضوعی که آخرین پاسخ برمی گردد به  خیلی قبل یک هشدار نمایش داده می شود. نمایش با تنظیمات تا 0. "
     autohighlight_all_code: "اعمال زور برای  برجسته کردن کد به تمام بلاک های کد تنظیم نشده حتی وقتی به صراحت زبان را مشخص نمی کنند. "
     highlighted_languages: "شامل برجسته کردن دستورات (syntax highlighting) است. (اخطار: اضافه کردن زبان‌های زیاد باعث کاهش کارایی می‌شود) دمو: https://highlightjs.org/static/demo/ "
-    feed_polling_enabled: "فقط جاسازی: چه زمانی RSS/ATOM feed به عنوان نوشته جاسازی شود"
-    feed_polling_url: "فقط جاسازی: لینک RSS/ATOM برای جاسازی شدن."
-    feed_polling_frequency_mins: "فقط کد‌های جاسازی شده: تعداد دفعات رای گیری"
-    embed_by_username: "نام کاربری discourse که نوشته‌های جاسازی شده را می‌سازد."
-    embed_username_key_from_feed: "کلیدی برای کشیدن نام‌کاربری discourse از فید."
-    embed_title_scrubber: "regular expression برای پاکسازی عنوان‌های درج شده"
     embed_truncate: "کوتاه کردن نوشته‌های جاسازی شده "
     allowed_href_schemes: "طرح‌ها در لینک‌های http و https مجازند"
     embed_post_limit: "حداکثر تعداد نوشته‌هایی که می‌توانید جا‌سازی کنید. "
     embed_username_required: "نام‌کاربری برای ایجاد تاپیک مورد نیاز است."
-    embed_whitelist_selector: "CSS selector برای المان‌هایی که اجازه دارند جاسازی شوند."
-    embed_blacklist_selector: "CSS selector برای المان‌هایی که از جاسازی حذف شدند."
     notify_about_flags_after: "اگر پرچم‌ها بعد از چند ساعت حل نشدند، یک پیام خصوصی به کارمندان ارسال کن. 0 برای غیرفعال"
     show_create_topics_notice: "اگر سایت کمتر از 5 موضوع عمومی دارد٬ مدیران اطلاع بده تا موضوعات بیشتری بسازند."
     delete_drafts_older_than_n_days: پیش‌نویس‌های قدیمی‌تر از (n) روز را حذف کن
@@ -1269,8 +1257,6 @@ fa_IR:
     default_categories_tracking: "لیست دسته‌بندی‌هایی که به صورت پیشفرض پیگیری می‌شوند."
     default_categories_muted: "لیست دسته‌بندی‌هایی که به صورت پیشفرض غیر‌فعال می‌شوند."
     default_categories_watching_first_post: "لیست دسته‌بندی‌هایی که نوشته‌هایشان در هر موضوع به صورت پیشفرض تحت نظر هستند."
-    max_user_api_reqs_per_day: "حداکثر تعداد درخواست روزانه API کاربر هر کلید در هر روز"
-    max_user_api_reqs_per_minute: "حداکثر تعداد درخواست روزانه API کاربر هر کلید در هر دقیقه"
     allow_user_api_keys: "اجازه‌ی ساخت کلید‌های API"
     allow_user_api_key_scopes: "لیست حوزه‌های مجاز برای کلید‌های API کاربری"
     max_api_keys_per_user: "حداکثر تعداد کلید API برای هر کاربر"
@@ -1415,7 +1401,6 @@ fa_IR:
     email_too_long: "ایمیل شما بسیار طولانی است. ایمیل باکس ها نباید بیش از 254 نویسه و نام دامنه نباید بیش از 253 نویسه باشد."
     reserved_username: "این نام کاربری مجاز نیست."
     missing_user_field: "شما تمام فیلد‌های کاربری را تکمیل نکرده اید"
-    close_window: "احراز هویت تمام شد. برای ادامه پنجره را ببندید."
     already_logged_in: "به نظر می‌رسد می‌خواهید دعوت کاربری دیگری را تایید کنید. اگر کاربر %{current_user} نیستید لطفا خارج شده و دوباره وارد سایت شوید."
   user:
     no_accounts_associated: "بدون حساب‌کاربری مرتبط"
@@ -1427,7 +1412,6 @@ fa_IR:
     username:
       short: "نباید کمتر از  %{min} نویسه باشد"
       long: "نباید بیشتر از  %{max}  نویسه باشد"
-      characters: "باید شامل٬‌اعداد٬ حروف و زیر خط باشد"
       unique: "باید خاص باشد"
       blank: "باید حاضر باشد"
       must_begin_with_alphanumeric_or_underscore: "باید با یک حرف، عدد یا زیر‌خط شروع شود"
@@ -1462,72 +1446,12 @@ 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} دعوت شدید"
-    text_body_template: |
-      %{invitee_name} شما را دعوت کرده که به سایت زیر بپیوندید
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      اگر علاقه‌مند هستید روی لینک زیر کلیک کنید:
-
-      %{invite_link}
   custom_invite_forum_mailer:
     title: "دعوت نامه‌رسان سفارشی انجمن"
-    subject_template: "%{invitee_name} از شما دعوت کرده که به %{site_domain_name} بپیوندید"
-    text_body_template: |
-      %{invitee_name} از شما دعوت کرده به سایت زیر بپیوندید
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      With this note
-
-      > %{user_custom_message}
-
-      اگر علاقه‌مند هستید کلیک کنید:
-
-      %{invite_link}
   invite_password_instructions:
     title: "دستور‌العمل رمز دعوت"
     subject_template: "تنظیم رمز عبور برای حساب‌کاربری {site_name}%"
@@ -1563,44 +1487,9 @@ fa_IR:
   new_version_mailer:
     title: "نسخه جدید نامه‌رسان"
     subject_template: "[%{email_prefix}] نسخه جدید Discourse موجود است"
-    text_body_template: |+
-      نسخه جدید  [Discourse](http://www.discourse.org) موجود است!
-
-      نسخه شما: %{installed_version}
-      نسخه جدید: **%{new_version}**
-
-      - با **[نصب کننده آسان](%{base_url}/admin/upgrade)** بروز رسانی کنید
-
-      - مشاهده تغییرات [در Github](https://github.com/discourse/discourse/commits/master)
-
-      نمایش [meta.discourse.org](https://meta.discourse.org) برای اخبار، بحث‌ها و پشتیبانی Discourse
-
   new_version_mailer_with_notes:
     title: "نسخه جدید نامه‌رسان با یادداشت"
     subject_template: "[%{email_prefix}] نسخه جدید موجود است"
-    text_body_template: |
-      نسخه جدید  [Discourse](http://www.discourse.org) موجود است!
-
-      نسخه شما: %{installed_version}
-      نسخه جدید: **%{new_version}**
-
-      - با **[نصب کننده آسان](%{base_url}/admin/upgrade)** بروز رسانی کنید
-
-      - مشاهده تغییرات [در Github](https://github.com/discourse/discourse/commits/master)
-
-      نمایش [meta.discourse.org](https://meta.discourse.org) برای اخبار، بحث‌ها و پشتیبانی Discourse
-
-      ### نکات انتشار
-
-      %{notes}
-  queued_posts_reminder:
-    title: "یادآور نوشته‌های زمانبندی شده"
-    subject_template:
-      other: "[%{email_prefix}] %{count} در انتظار بررسی هستند"
-    text_body_template: |
-      سلام،
-
-      نوشته‌های کاربران جدید که منتظر تایید و بررسی هستند. [تایید یا رد کنید](%{base_url}/queued-posts).
   flag_reasons:
     off_topic: "نوشته شما به عنوان **بی ربط به موضوع** پرچم‌گذاری شده. انجمن احساس خوبی برای جا دادن آن در موضوع ندارد٬ آن طور که در عنوان و نوشته اول تعریف شده. "
     inappropriate: "نوشاه شما به عنوان ** نامناسب** پرچم‌گذاری شده. انجمن احساس کرده این تهاجمی، توهین آمیز، و یا نقض  [دستورالعمل  انجمن ما است](/guidelines)"
@@ -1620,20 +1509,6 @@ fa_IR:
     post_hidden:
       title: "نوشته مخفی"
       subject_template: "نوشته مخفی شده توسط پرچم‌های اعضا"
-      text_body_template: |
-        سلام،
-
-        این یک پیام خودکار از %{site_name} است که به شما اطلاع دهد نوشته‌تان مخفی شده.
-
-        %{base_url}%{url}
-
-        %{flag_reason}
-
-        چند نفر از اعضای انجمن نوشته شما را قبل از اینکه مخفی شود، پرچم زدند، بنابراین تصمیم با شماست که چگونه نوشته‌تان را تغییر دهید تا نظر آن‌ها را جلب کنید.  **می‌توتانید نوشته خود را بعد از  %{edit_delay} دقیقه ویرایش کرده، و آن را به صورت خودکار از حالت مخفی خارج کنید.**
-
-        اگرچه، اگر نوشته دوباره توسط اعضا پرچم گذاری شود، تا زمانی که همکاران آن را بررسی کنند مخفی باقی خواهد ماند -- و شاید منجر به مسائل دیگری مثل تعلیق حساب کاربری شما شود.
-
-        برای راهنمای بیشتر لطفا [راهنمای انجمن](%{base_url}/guidelines) را ببینید.
     usage_tips:
       text_body_template: |
         چند نکته کوچک برای شروع به عنوان کاربر جدید، [این نوشته‌ی بلاگ را ببینید](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)
@@ -1742,28 +1617,15 @@ fa_IR:
     csv_export_failed:
       title: "خروجی CSV نامفق"
       subject_template: "خروج اطلاعات ناموفق بود"
-      text_body_template: "ما متاسفیم٬ ولی خارج کردن اطلاعات ناموفق شد. لطفا سیستم را چک کنید یا با یکی از مدیران تماس بگیرید. "
     email_reject_insufficient_trust_level:
       title: "به دلیل ناکافی بودن سطح اعتماد ایمیل رد شد"
       subject_template: "[%{email_prefix}] مشکل ایمیل -- ناکافی بودن سطح اعتماد"
-      text_body_template: |
-        با عرض پوزش، ایمیل شما به %{destination} (titled %{former_title}) ارسال نشد.
-
-        حساب کاربری شما سطح اعتماد مورد نیاز برای ارسال موضوعات جدید به این ایمیل را ندارد. اگر فکر می‌کنید خطایی رخ داده با کارمندان تماس بگیرید.
     email_reject_user_not_found:
       title: "ایمیل به دلیل پیدا نشدن کاربر رد شد"
       subject_template: "[%{email_prefix}] مشکل ایمیل -- کاربر پیدا نشد"
-      text_body_template: |
-        با عرض پوزش، ولی پیام ایمیلی شما به {destination} (titled %{former_title}) ارسال نشد.
-
-        پاسخ شما از یک ایمیل ناشناس ارسال شده. سعی کنید با یک ایمیل دیگر ارسال کنید، یا با کارمندان تماس بگیرید.
     email_reject_screened_email:
       title: "ایمیل نمایش داده شده رد می‌شود"
       subject_template: "[%{email_prefix}] مشکل ایمیل -- ایمیل مسدود شد"
-      text_body_template: |
-        با عرض پوزش، ولی پیام ایمیلی شما به {destination} (titled %{former_title}) ارسال نشد.
-
-        پاسخ شما از یک ایمیل مسدود ارسال شده. سعی کنید با یک ایمیل دیگر ارسال کنید، یا با کارمندان تماس بگیرید.
     email_reject_inactive_user:
       title: "ایمیل رد شده کاربر غیر‌فعال"
       subject_template: "[%{email_prefix}] مشکل ایمیل -- کاربر غیر‌فعال"
@@ -1771,25 +1633,12 @@ fa_IR:
         با عرض پوزش، ولی پیام ایمیلی شما به {destination} (titled %{former_title}) ارسال نشد.
 
         حساب کاربری شما که مربوط به این ایمیل است، فعال نشده. لطفا قبل از ارسال ایمیل حساب کاربری خود را فعال کنید.
-    email_reject_blocked_user:
-      title: "ایمیل رد شده کاربر مسدود"
-      subject_template: "[%{email_prefix}] مشکل ایمیل -- کاربر مسدود"
-      text_body_template: |
-        با عرض پوزش، ولی پیام ایمیلی شما به {destination} (titled %{former_title}) ارسال نشد.
-
-        حساب کاربری مربوط به این ایمیل شما مسدود شده است.
     email_reject_reply_user_not_matching:
       title: "ایمیل رد شده کاربر تطابق ندارد"
       subject_template: "[%{email_prefix}] مشکل ایمیل -- آدرس پاسخ غیر منتظره"
-      text_body_template: |
-        با عرض پوزش، ولی پیام ایمیلی شما به {destination} (titled %{former_title}) ارسال نشد.
-
-        پاسخ ارسالی شما از یک ایمیل متفاوت از آنچه توقع داشتیم است، بنابراین مطمئن نیستیم که شما همان شخص باشید. سعی کنید از یک ایمیل دیگر ارسال کنید، یا با همکاران تماس بگیرید.
     email_reject_no_account:
       title: "ایمیل رد شده حساب کاربر ی وجود ندارد"
       subject_template: "[%{email_prefix}] مشکل ایمیل -- حساب کاربری ناشناس"
-      text_body_template: |
-        با عرض پوزش، ولی پیام ایمیلی شما به {destination} (titled %{former_title}) ارسال نشد.
     email_reject_empty:
       title: "ایمیل رد شده خالی"
       subject_template: "[%{email_prefix}] مشکل ایمیل -- محتوا وجود ندارد"
@@ -1809,17 +1658,9 @@ fa_IR:
     email_reject_invalid_access:
       title: "ایمیل رد شده دسترسی نامعتبر"
       subject_template: "[%{email_prefix}] مشکل ایمیل -- دسترسی نامعتبر"
-      text_body_template: |
-        با عرض پوزش، ولی پیام ایمیلی شما به {destination} (titled %{former_title}) ارسال نشد.
-
-        حساب کاربری شما دسترسی ایجاد موضوع در این دسته‌بندی را ندارد. اگر فکر می‌کنید خطایی رخ داده، با همکاران تماس بگیرید.
     email_reject_strangers_not_allowed:
       title: "ایمیل رد شده غریبه‌ها اجازه ندارند"
       subject_template: "[%{email_prefix}] مشکل ایمیل -- دسترسی نامعتبر"
-      text_body_template: |
-        با عرض پوزش، ولی پیام ایمیلی شما به {destination} (titled %{former_title}) ارسال نشد.
-
-        دسته‌بندی که به آن ایمیل فرستادید فقط به کاربرانی که حساب کاربری معتبر و ایمیل شناخته شده دارند اجازه ارسال می‌دهد، اگر فکر می‌کنید که خطایی رخ داده با همکاران تماس بگیرید.
     email_reject_invalid_post:
       title: "ایمیل رد شده نوشته نامعتبر"
       subject_template: "[%{email_prefix}] مشکل ایمیل -- نوشته نامعتبر"
@@ -1849,39 +1690,20 @@ fa_IR:
     email_reject_reply_key:
       title: "کلید پاسخ ایمیل رد شده"
       subject_template: "[%{email_prefix}] مشکل ایمیل -- کلید ناشناس پاسخ"
-      text_body_template: |+
-        ما متاسفیم٬ ولی پیام  ایمیل شما به  %{destination} (titled %{former_title}) ارسال نشد.
-
-        کلید پاسخ وارد شده در ایمیل خراب یا ناشناس است٬ پس ما نمی دانیم این ایمیل در پاسخ چه چیزی است. با یکی از همکاران تماس بگیرید.
-
     email_reject_bad_destination_address:
       title: "ایمیل رد شده آدرس مقصد نادرست"
       subject_template: "[%{email_prefix}] مشکل ایمیل -- ناشناخته به:‌ آدرس"
-      text_body_template: |
-        متاسفیم، ولی پیام ایمیلی شما به {destination} (titled %{former_title}) ارسال نشد.
-
-        هیچ یک از ایمیل‌های مقصد شناسایی نشدند. لطفا مطمئن شوید که ایمیل‌های صحیح همکاران را استفاده می‌کنید.
     email_reject_topic_not_found:
       title: "ایمیل رد شده موضوع پیدا نشد"
       subject_template: "[%{site_name}] مشکل ایمیل  -- موضوع پیدا نشد"
-      text_body_template: |
-        متاسفیم، ولی پیام ایمیلی شما به %{destination} (titled %{former_title}) ارسال نشد.
-
-        موضوعی که قصد پاسخ به آن را دارید دیگر وجود ندارد -- شاید حذف شده؟ اگر فکر می‌کنید خطایی رخ داده، با همکاران تماس بگیرید.
     email_reject_topic_closed:
       title: "ایمیل رد شده موضوع بسته شد"
       subject_template: "[%{email_prefix}] مشکل ایمیل -- موضوع بسته شد"
-      text_body_template: |
-        متاسفیم، ولی پیام ایمیلی شما به %{destination} (titled %{former_title}) ارسال نشد.
-
-        موضوعی که قصد ارسال پاسخ به آن را دارید بسته شده یا دیگر پاسخ قبول نمی‌کند. اگر فکر می‌کنید خطایی رخ داده، با همکاران تماس بگیرید.
     email_reject_auto_generated:
       title: "ایمیل رد شده به صورت خودکار ایجاد شده"
       subject_template: "[%{email_prefix}] مشکل ایمیل -- پاسخ ایجاد شده خودکار"
-      text_body_template: |
-        متاسفیم، ولی پیام ایمیلی شما به %{destination} (titled %{former_title}) ارسال نشد.
-
-        ایمیل شما به عنوان "خودکار ایجاد شده" علامت گذاری شده، که به این معنی است که به جای تایپ توسط انسان، توسط کامپیوتر ایجاد شده; ما نمی‌توانید این نوع ایمیل ها را قبول کنیم. اگر فکر می‌کنید خطایی رخ داده، با یکی از همکاران تماس بگیرید.
+    email_reject_unrecognized_error:
+      title: "رایانامه رد شده خطای ناشناخته"
     email_error_notification:
       title: "اعلان خطای ایمیل"
       subject_template: "[%{site_name}] مشکل ایمیل  -- ایراد احراز هویت POP "
@@ -1894,64 +1716,9 @@ fa_IR:
     too_many_spam_flags:
       title: "پرچم هرز‌نامه بسیار زیاد است"
       subject_template: "حساب‌کاربری جدید در انتظار"
-      text_body_template: |
-        سلام،
-        این یک پیام خودکار از %{site_name} است که به شما درباره نوشته‌هایی که به دلیل دریافت پرچم از انجمن مخفی شده‌اند اطلاع می‌دهد.
-
-        به عنوان یک اقدام حیاتی، حساب کاربری شما از ایجاد نوشته‌ها و موضوعات جدید تا زمانی که یکی از همکاران حساب کاربریتان را بررسی نماید، مسدود خواهد بود. برای ناراحتی پیش آمده عذر خواهی می‌کنیم.
-
-        برای راهنمایی بیشتر لطفا [راهنمای انجمن](%{base_url}/guidelines) را ببینید.
     too_many_tl3_flags:
       title: "تعداد پرچم‌های TL3 بالاست"
       subject_template: "حساب‌کاربری جدید در انتظار"
-      text_body_template: |
-        سلام،
-
-        این یک پیام خودکار از %{site_name} جهت اطلاع از در انتظار نگه داشتن حساب‌کاربری شما به دلیل دریافت پرچم‌های زیاد است.
-
-        به عنوان یک اقدام حیاتی، حساب‌کاربری شما تا زمانی که همکاران آن را بازبینی نکنند اجازه ایجاد پاسخ یا موضوع جدید را نخواهد داشت. از اینکه به زحمت افتادید پوزش میخواهیم.
-
-        برای راهنمایی بیشتر، [راهنمای انجمن](%{base_url}/guidelines) را ببینید.
-    blocked_by_staff:
-      title: "مسدود شده توسط همکاران"
-      subject_template: "حساب کاربری به صورت موقت در انتظار است"
-      text_body_template: |
-        سلام،
-
-        این یک پیام خودکار از %{site_name} جهت اطلاع از در انتظار نگه داشتن حساب‌کاربری شما به عنوان یک اقدام حیاتی است.
-
-        لطفا به مرور انجمن ادامه دهید، ولی تا زمانی که  [همکاران](%{base_url}/about) نوشته‌های اخیر شما را بررسی نکنند، نمی‌توانید پاسخ یا موضوع جدید ایجاد کنید. از اینکه به زحمت افتادید پوزش میخواهیم.
-
-        برای راهنمایی بیشتر، [راهنمای انجمن](%{base_url}/guidelines) را ببینید.
-    user_automatically_blocked:
-      title: "کاربر به صورت خودکار مسدود شده"
-      subject_template: "کاربر جدید %{username} توسط پرچم‌های اعضا مسدود شده"
-      text_body_template: |
-        این یک پیام خودکار است.
-
-        کاربر جدید  [%{username}](%{user_url}) به دلیل پرچم گذاری چندکاربره نوشته‌(ها)ی %{username} به صورت خودکار مسدود شد.
-
-        لطفا  [پرچم‌ها را بازبینی کنید](%{base_url}/admin/flags). اگر %{username} به درستی مسدود نشده، روی گزینه خروج از مسدودیت در  [صفحه مدیریت این کاربر](%{user_url}) کلیک کنید.
-
-        آستانه می‌توانید از طریق تنظیمات  `block_new_user` تغییر کند.
-    spam_post_blocked:
-      title: "نوشته هرزنامه مسدود شد"
-      subject_template: "کاربر جدید%{username} به‌دلیل پیوند‌های تکراری نوشته مسدود شده است"
-      text_body_template: |
-        این یک پیام خودکار است.
-
-        کاربر جدید [%{username}](%{user_url}) تلاش کرده چند نوشته با لینک به %{domains} ایجاد کند، ولی لینک‌ها برای جلوگیری از هرزنامه شدن مسدود شدند. کاربر همچنان می‌تواند نوشته‌های جدیدی ایجاد کند که در آن لینک %{domains} وجود ندارد.
-
-        لطفا [کاربر را بازبینی کنید](%{user_url}).
-    unblocked:
-      title: "رفع مسدودیت شد"
-      subject_template: "حساب کاربری در انتظار نیست"
-      text_body_template: |
-        سلام،
-
-        این یک پیام خودکار از %{site_name} است که شما را متوجه آن کند که حساب کاربریتان از حالت انتظار و تایید همکاران خارج شده.
-
-        شما می‌توانید دوباره پاسخ‌ها و موضوعات جدید ایجاد کنید. با تشکر از صبر شما.
     pending_users_reminder:
       title: "یاداور کاربران در انتظار"
       subject_template:
@@ -1975,12 +1742,10 @@ fa_IR:
     new_user_of_the_month:
       title: "شما کاربر جدید ماه هستید!"
       subject_template: "شما کاربر جدید ماه هستید!"
-      text_body_template: |
-        تبریک عرض میکنم، شما **جایزه کاربر جدید ماه %{month_year}** را بدست آوردید! :trophy:
-
-        این جایزه فقط به دو کاربر در ماه تعلق می‌گیرد و به صورت ثابت در [حساب کاربری شما](/my/badges) باقی می‌ماند.
-
-        شما خیلی زود به یک عضو ارزشمند برای انجمن ما تبدیل شدید. از پیوستن شما متشکریم، به کار خود ادامه دهید!
+    queued_posts_reminder:
+      title: "یادآور نوشته‌های زمانبندی شده"
+      subject_template:
+        other: "%{count} نوشته منتظر بررسی است"
   unsubscribe_link: |
     برای لغو اشتراک از این ایمیل‌ها،  [کلیک کنید](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -2005,26 +1770,8 @@ 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_group:
+      title: "کاربر دعوت شده به پیام خصوصی"
     user_invited_to_private_message_pm:
       title: "کاربر دعوت شده به پیام خصوصی"
       subject_template: "[%{email_prefix}] %{username} شما را به پیام '%{topic_title}' دعوت کرده"
@@ -2157,6 +1904,18 @@ fa_IR:
       text_body_template: |2
 
         %{message}
+    account_suspended:
+      title: "حساب کاربری معلق شد"
+      subject_template: "[%{email_prefix}] حساب کاربری شما معلق شده است"
+      text_body_template: |
+        شما از انجمن گفتگو معلق شده اید تا %{suspended_till}.
+
+        %{reason}
+
+        %{message}
+    account_exists:
+      title: "حساب کاربری وحود دارد"
+      subject_template: "[%{email_prefix}] حساب کاربری وحود دارد"
     digest:
       why: "یک گزارش کوتاه از %{site_link}  از آخرین باری که بازدید کردید در %{last_seen_at}"
       since_last_visit: "از آخرین بازدید شما"
@@ -2172,7 +1931,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} بوده."
@@ -2281,9 +2039,8 @@ fa_IR:
     search_google: "گوگل"
   login_required:
     welcome_message: |
-      #[خوش آمدید به  %{title}](#welcome)
-
-      حساب کاربری نیاز داره به.  لطفا حساب کاربری درست کنید یا وارد سیستم بشید برای ادامه.
+      ## [خوش آمدید به %{title}](#welcome)
+      داشتن حساب کاربری الزامی است. لطفا یک حساب کاربری بسازید یا وارد شوید.
   terms_of_service:
     title: "شرایط استفاده از خدمات"
     signup_form_message: 'من  <a href="/tos" target="_blank">شرایط استفاده از خدمات</a> را خواندم و قبول می‌کنم.'
@@ -2382,9 +2139,6 @@ fa_IR:
         این نشان را وقتی که اولین پسند را دریافت کنید به شما اعطا می‌شود. تبریک، نوشته‌ای ارسال کردید که اعضای انجمن به آن علاقه نشان دادند، باحال، یا مفید بود!
     autobiographer:
       name: نویسنده شرح‌حال
-      description: <a href="/my/preferences">مشخصات</a>  خود را تکمیل کنید
-      long_description: |
-        این نشان را وقتی دریافت می‌کنید <a href="/my/preferences">پروفایل کاربریe</a> خود را کامل کنید و یک تصویر کاربری انتخاب کنید. به انجمن اجازه دهید بیشتر درباره شما بدانند و متوجه علایق شما شوند، تا بتوانیم انجمن به هم پیوسته‌ای داشته باشیم. به ما ملحق شوید!
     anniversary:
       name: سالگرد
       description: برای یک سال کاربر فعال بوده، حداقل یک نوشته دارد.
@@ -2476,13 +2230,10 @@ fa_IR:
       long_description: |
         این نشان زمانی اعطا می‌شود که برای بار اول یک نوشته را  در پاسخ خود نقل‌قول کنید. نقل‌قول بخش‌های مربوطه کمک می‌کند که بحث‌های موضوع به هم متصل شوند. بهترین راه برای نقل قول انتخاب متن در نوشته و کلیک روی دکمه پاسخ است. سخاوتمندانه نقل‌قول کنید!
     read_guidelines:
-      name: دستور‌العمل را خوانده
-      description: <a href="/guidelines">دستورالعمل های انجمن</a> را بخوانید
-      long_description: |
-        این نشان زمانی اعطا می‌شود  <a href="/guidelines">راهنمای انجمن را بخوانید</a>. دنبال کردن و به اشتراک گذاری این راهنمای ساده به ایجاد یک انجمن امن، لذت‌بخش و پایدار برای همه کمک می‌کند. همیشه به یاد داشته باشید که همیشه فردی وجود دارد که خیلی شبیه شماست، و برعکس این مسئله هم وجود دارد. خوب باشید!
+      name: خواندن دستورالعمل‌ها
     reader:
-      name: خواننده
-      description: تمام نوشته‌های یک موضوع که بیش از 100 پاسخ دارد را بخوانید.
+      name: اهل مطالعه
+      description: همه‌ی پاسخ‌های یک موضوع با ۱۰۰ پاسخ را مطالعه کرده.
       long_description: |
         این نشان زمانی اعطا می‌شود که یک موضوع طولانی با بیش از 100 پاسخ را بخوانید. خواندن یک گفتگو به دقت به شما کمک می‌کند که گفتگو را دنبال کنید، متوجه دیدگاه‌های متفاوت شوید، و منجر به گفتگو‌های جالب‌تر می‌شود. هرچقدر بیشتر بخوانید، گفتگو بهتر می‌شود. همانطور که گفتیم خواندن یک مسئله بنیادی است! :slight_smile:
     popular_link:
@@ -2652,7 +2403,6 @@ fa_IR:
             description: "صفحه تماس عمومی شما در <a href='/about' target='_blank'>صفحه درباره ما</a> نمایش داده می‌شود."
           site_contact:
             label: "پیام‌های خودکار"
-            description: "همه‌ی پیام‌های خصوصی خودکار توسط این کاربر ارسال می‌شوند. پیام‌هایی مثل خوش آمد گویی به هر کاربر جدید."
       corporate:
         title: "سازمان"
         description: "این نام ها در <a href='/privacy' target='blank'>سیاست حفظ حریم خصوصی</a> و <a href='/tos' target='blank'>شرایط استفاده از سرویس</a> وارد می‌شوند، که موضوعات قابل ویرایشی در دسته‌بندی کارکنان هستند. اگر شرکت ندارید این قسمت را رد کنید."
@@ -2709,7 +2459,6 @@ fa_IR:
         description: "نوع شکلک مورد نظرتان را انتخاب کنید. می‌توانید از بخش مدیریت شکلک های سفارشی اضافه کنید."
       invites:
         title: "دعوت همکاران"
-        description: "تقریبا آمادست! برای ادامه چند عضو کارمند دعوت کنید. <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>چند موضوع جالب ایجاد کنید</a> که انجمن شروع به کار کند."
       finished:
         title: "Discourse شما آماده‌ست!"
         description: |
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 702cec949d..07f351faea 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -40,24 +40,29 @@ fi:
     incoming:
       default_subject: "Tämä ketju tarvitsee otsikon"
       show_trimmed_content: "Näytä piilotettu sisältö"
-      maximum_staged_user_per_email_reached: "Saavutti maksimimäärän automaattisesti luotuja tunnuksia per sähköpostiosoite"
+      maximum_staged_user_per_email_reached: "Saavutti maksimimäärän automaattisesti luotuja esikäyttäjiä per sähköpostiosoite."
       errors:
         empty_email_error: "Näin käy, kun saapuneessa sähköpostissa ei lue mitään."
         no_message_id_error: "Näin käy, kun viestin otsikkotiedoista puuttuu ID-tunniste (engl. message-ID)."
         auto_generated_email_error: "Näin käy, kun viestin kiireellisyysluokitus (engl. precedence header) on joku seuraavista: list, junk, bulk tai auto_reply, tai kun joku muu otsikkotiedoista sisältää jonkun seuraavista: auto-submitted, auto-replied tai auto-generated."
         no_body_detected_error: "Näin käy, kun leipätekstin poiminta epäonnistuu eikä liitteitä ole."
+        no_sender_detected_error: "Näin käy, kun emme tunnista käypää sähköpostiosoitetta viestin From-otsikkotiedosta."
         inactive_user_error: "Näin käy, kun lähettäjä ei ole aktiivinen."
-        blocked_user_error: "Näin käy, kun lähettäjä on estetty."
+        silenced_user_error: "Näin käy, kun lähettäjä on hiljennetty."
         bad_destination_address: "Näin käy, kun viestin vastaanottaja/kopio/piilokopio -kenttien osoitteet eivät täsmää asetettuihin saapuvan sähköpostin osoitteiden kanssa."
-        strangers_not_allowed_error: "Näin käy, kun käyttäjä yrittää luoda ketjun alueelle, jonka jäsen ei ole."
-        insufficient_trust_level_error: "Näin käy, kun käyttäjä yrittää luoda ketjun alueelle, jonka vähimmäisluottamustasovaatimusta ei täytä."
+        strangers_not_allowed_error: "Näin käy, kun käyttäjä yrittää aloittaa ketjun alueella, jonka jäsen ei ole."
+        insufficient_trust_level_error: "Näin käy, kun käyttäjä yrittää aloittaa ketjun alueella, jonka vähimmäisluottamustasovaatimusta ei täytä."
         reply_user_not_matching_error: "Näin käy, kun vastaus saapuu eri sähköpostiosoitteesta kuin mihin ilmoitus lähetettiin."
         topic_not_found_error: "Näin käy, kun vastauksen saapuessa ketju, johon viesti oli tarkoitettu, on poistettu."
         topic_closed_error: "Näin käy, kun vastauksen saapuessa ketju, johon viesti oli tarkoitettu, on suljettu."
         bounced_email_error: "Sähköposti on palautetun sähköpostin raportti"
         screened_email_error: "Näin käy, kun lähettäjän sähköpostiosoite on jo seulottu."
+        unsubscribe_not_allowed: "Näin käy, kun tämä käyttäjä ei voi perua tilausta sähköpostitse."
+        email_not_allowed: "Näin käy, kun sähköpostiosoite ei ole sallittujen listalla tai on kiellettyjen listalla."
+      unrecognized_error: "Tuntematon virhe"
   errors: &errors
     format: '%{attribute} %{message}'
+    format_with_full_message: '<b>%{attribute}</b>: %{message}'
     messages:
       too_long_validation: "on rajoitettu %{max} merkkiin; sinä syötit %{length} merkkiä."
       invalid_boolean: "Totuusarvomuuttuja ei kelpaa"
@@ -127,6 +132,7 @@ fi:
   not_logged_in: "Sinun täytyy kirjautua sisään ensin."
   not_found: "Pyydettyä osoitetta tai resurssia ei löytynyt."
   invalid_access: "Sinulla ei ole oikeutta nähdä pyydettyä resurssia."
+  invalid_api_credentials: "Et voi katsella pyytämääsi resurssia. Rajapinnan käyttäjänimi tai avain ei kelpaa."
   read_only_mode_enabled: "Sivusto on vain luku-tilassa. Vuorovaikutteiset toiminnot ovat poissa käytöstä."
   reading_time: "Lukuaika"
   likes: "Tykkäykset"
@@ -171,10 +177,12 @@ fi:
   too_many_links:
     one: "Pahoittelut, uudet käyttäjät voivat laittaa vain yhden linkin viestiin."
     other: "Pahoittelut, uusi käyttäjä voi laittaa vain %{count} linkkiä viestiin."
+  contains_blocked_words: "Viestissäsi on kielletty sanoja."
   spamming_host: "Pahoittelut, linkit tuolle sivulle eivät ole sallittuja."
   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?"
@@ -207,11 +215,13 @@ fi:
     user_posts: "Viimeisimmät viestit käyttäjältä @%{username}"
     user_topics: "Viimeisimmät ketjut käyttäjältä @%{username}"
     tag: "Tunnisteelliset ketjut"
+    badge: "%{display_name} -ansiomerkki sivustolla %{site_title}"
   too_late_to_edit: "Tämä viesti luotiin liian kauan sitten. Sitä ei voi enää muokata tai poistaa."
   revert_version_same: "Nykyinen revisio on sama, kuin jonka yrität palauttaa."
   excerpt_image: "kuva"
   queue:
     delete_reason: "Poistettu moderointijonon kautta"
+    not_found: "Viestiä ei löytynyt tai se päivittyi jo."
   groups:
     success:
       bulk_add: "%{users_added} käyttäjää lisättiin ryhmään."
@@ -222,6 +232,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 +243,8 @@ 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}"
   education:
     until_posts:
       one: "ensimmäisen viestisi"
@@ -259,7 +272,7 @@ fi:
     avatar: |
       ### Mitäpä jos lisäisit kuvan käyttäjätiliisi?
 
-      Olet luonut ketjuja ja kirjoittanut viestejä, mutta profiilikuvasi ei ole yhtä uniikki kuin sinä olet – se on pelkkä kirjain.
+      Olet aloittanut ketjuja ja kirjoittanut viestejä, mutta profiilikuvasi ei ole yhtä uniikki kuin sinä olet – se on pelkkä kirjain.
 
       Oletko ajatellut **[käväistä käyttäjäprofiilissasi](%{profile_path})** ja lisätä kuvan edustamaan sinua?
 
@@ -319,6 +332,7 @@ fi:
               too_many_users: "Voit lähettää varoituksia vain yhdelle käyttäjälle kerrallaan."
               cant_send_pm: "Pahoittelut, et voi lähettää tälle käyttäjälle yksityisviestiä."
               no_user_selected: "Sinun täytyy valita kelpaava käyttäjä."
+              reply_by_email_disabled: "Sähköpostilla vastaaminen ei ole käytössä."
             featured_link:
               invalid: "ei ole käypä. URL:in tulisi sisältää http:// tai https://."
               invalid_category: "ei voi muokata tällä alueella."
@@ -351,6 +365,14 @@ fi:
           attributes:
             execute_at:
               in_the_past: "täytyy olla tulevaisuudessa."
+        translation_overrides:
+          attributes:
+            value:
+              invalid_interpolation_keys: 'Nämä interpolaatioavaimet eivät kelpaa: "%{keys}"'
+        watched_word:
+          attributes:
+            word:
+              too_many: "Toiminnolle on määritelty liian monta sanaa"
       <<: *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 +384,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
@@ -404,7 +426,7 @@ fi:
       [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Alueesta %{category}"
-    replace_paragraph: "(Korvaa tämä kappale lyhyellä kuvauksella uudesta alueesta. Tämä kuvaus näytetään alueen valinnan yhteydessä, joten yritä pitää se alle 200 merkin pituisena. **Aluetta ei näytetä Keskustelualueet-sivulla ennen kuin olet muokannut tätä tekstiä tai luonut viestiketjuja.**)"
+    replace_paragraph: "(Korvaa tämä kappale lyhyellä kuvauksella uudesta alueesta. Tämä kuvaus näytetään alueen valinnan yhteydessä, joten yritä pitää se alle 200 merkin pituisena. **Aluetta ei näytetä Keskustelualueet-sivulla ennen kuin olet muokannut tätä tekstiä tai aloittanut viestiketjuja.**)"
     post_template: "%{replace_paragraph}\n\nKäytä seuraavat kappaleet pidempään kuvaukseen tai selvittääksesi alueen säännöt ja ohjeet:\n\n- Miksi käyttäjät valitsisivat tämän alueen? Mitä varten se on?\n\n- Kuinka se tarkkaan ottaen eroaa muista olemassa olevista alueista?\n\n- Minkälaista sisältöä alueen ketjuissa tulisi yleensä olla?\n\n- Tarvitaanko tätä aluetta? Voisiko sen yhdistää toiseen alueeseen tai siirtää toisen alueen alle?\n"
     errors:
       uncategorized_parent: "Alueettomilla ei voi olla emoaluetta"
@@ -413,6 +435,7 @@ fi:
       invalid_email_in: "'%{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}'."
+      description_incomplete: "Alueen kuvauksessa on oltava ainakin yksi kappale."
     cannot_delete:
       uncategorized: "Alueettomat-aluetta ei voi poistaa"
       has_subcategories: "Aluetta ei voi poistaa, koska sillä on tytäralueita."
@@ -433,17 +456,20 @@ fi:
     leader:
       title: "johtaja"
     change_failed_explanation: "Yritit alentaa käyttäjän %{user_name} luottamustasolle '%{new_trust_level}'. Käyttäjän luottamustaso on jo valmiiksi '%{current_trust_level}'. %{user_name} jatkaa edelleen luottamustasolla '%{current_trust_level}' - jos haluat alentaa luottamustasoa, lukitse se ensin"
+  post:
+    image_placeholder:
+      broken: "Tämä kuva ei toimi"
   rate_limiter:
     slow_down: "Olet tehnyt tämän toiminnon liian monta kertaa, yritä uudelleen myöhemmin."
     too_many_requests: "Tämä toiminto voidaan suorittaa vain määrätyn monta kertaa päivässä. Odota %{time_left} ja yritä sitten uudelleen."
     by_type:
       first_day_replies_per_day: "Uusi käyttäjä ei voi ensimmäisenä päivänään kirjoittaa enempää viestejä. Odota %{time_left} ja yritä sitten uudelleen."
-      first_day_topics_per_day: "Uusi käyttäjä ei voi ensimmäisenä päivänään luoda enempää ketjuja. Odota %{time_left} ja yritä sitten uudelleen."
-      create_topic: "Yrität luoda ketjuja liian nopeasti. Odota %{time_left} ja yritä sitten uudelleen."
+      first_day_topics_per_day: "Uusi käyttäjä ei voi ensimmäisenä päivänään aloittaa enempää ketjuja. Odota %{time_left} ja yritä sitten uudelleen."
+      create_topic: "Yrität aloittaa ketjuja liian nopeasti. Odota %{time_left} ja yritä sitten uudelleen."
       create_post: "Yrität vastata liian nopeasti. Odota %{time_left} ja yritä sitten uudelleen."
       delete_post: "Poistat viestejä liian nopeasti. Odota %{time_left} ja yritä sitten uudelleen."
       public_group_membership: "Liityt/eroat ryhmistä liian nopeasti. Odota %{time_left} ja yritä sitten uudelleen."
-      topics_per_day: "Olet luonut enimmäismäärän uusia ketjuja tälle päivälle. Odota %{time_left} ja yritä sitten uudelleen."
+      topics_per_day: "Olet aloittanut enimmäismäärän uusia ketjuja tälle päivälle. Odota %{time_left} ja yritä sitten uudelleen."
       pms_per_day: "Olet lähettänyt enimmäismäärän viestejä tälle päivälle. Odota %{time_left} ja yritä sitten uudelleen."
       create_like: "Olet tykännyt enimmäismäärän tälle päivälle. Odota %{time_left} ja yritä sitten uudelleen."
       create_bookmark: "Olet lisännyt enimmäismäärän kirjanmerkkejä tälle päivälle. Odota %{time_left} ja yritä sitten uudelleen."
@@ -544,7 +570,7 @@ fi:
     confirmed: "Sähköpostiosoite päivitetty."
     please_continue: "Jatka sivustolle %{site_name}"
     error: "Sähköpostiosoitteen vaihdossa tapahtui virhe. Ehkäpä tämä sähköpostiosoite on jo käytössä?"
-    error_staged: "Sähköpostiosoitetta muutettaessa tapahtui virhe. Osoite on automaattisesti luodun käyttäjän käytössä."
+    error_staged: "Sähköpostiosoitetta muutettaessa tapahtui virhe. Osoite on automaattisesti luodun esikäyttäjän käytössä."
     already_done: "Pahoittelut, tämä varmennuslinnkki ei ole enää voimassa. Ehkäpä sähköpostiosoitteesi on jo vaihdettu?"
     authorizing_old:
       title: "Kiitos sähköpostiosoitteesi varmentamisesta"
@@ -567,31 +593,31 @@ fi:
   post_action_types:
     off_topic:
       title: 'Se eksyy aiheesta'
-      description: 'Tämä viesti ei ole relevantti tässä ketjussa, jonka määrittelee ketjun otsikko ja aloitusviesti, ja pitäisi todennäköisesti siirtää toiselle alueelle.'
+      description: 'Viesti ei ole liity meneillään olevaan keskusteluun, jonka aiheen määrittelee ketjun otsikko ja aloitusviesti. Viesti pitäisi luultavasti siirtää toiseen paikkaan.'
       short_description: 'Ei liity aiheeseen'
       long_form: 'liputti tämän eksyvän aiheesta'
     spam:
       title: 'Roskaposti'
-      description: 'Viesti on mainos tai häiriköintiä. Se on hyödytön ja epäolennainen tähän ketjuun.'
+      description: 'Viesti on mainos tai ilkivaltaa. Se on hyödytön ja epäolennainen tähän ketjuun.'
       short_description: 'On mainos tai häiriköintiä'
       long_form: 'liputti tämän roskapostiksi'
       email_title: '"%{title}" liputettiin roskapostiksi'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: 'Sopimaton'
-      description: 'Tämän viestin sisältö on loukkaava, herjaava tai ristiriidassa <a href="/guidelines">palstan sääntöjen</a> kanssa.'
+      description: 'Viestin sisältö on loukkaava, herjaava tai ristiriidassa <a href="/guidelines">palstan sääntöjen</a> kanssa.'
       short_description: '<a href="/guidelines">Palstan sääntöjen</a> vastainen'
       long_form: 'liputti tämän sopimattomaksi'
     notify_user:
       title: 'Lähetä käyttäjälle @{{username}} viesti.'
-      description: 'Haluan keskustella tästä viestistä kirjoittajan kanssa kahden kesken.'
+      description: 'Haluan keskustella viestistä kirjoittajan kanssa kahden kesken.'
       short_description: 'Haluan keskustella viestistä kirjoittajan kanssa suoraan kahden kesken.'
       long_form: 'lähetä käyttäjälle viesti'
       email_title: 'Viestisi ketjussa "%{title}"'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Jotain muuta"
-      description: 'Valvojan tulee huomioida tämä viesti muusta kuin yllä listatusta syystä.'
+      description: 'Valvojan tulee huomioida viesti muusta kuin yllä listatusta syystä.'
       short_description: 'Henkilökunnan tulisi huomioida muusta syystä'
       long_form: 'liputti tämän valvojien nähtäväksi'
       email_title: 'Valvojien tulisi huomioida viesti ketjussa "%{title}" '
@@ -603,21 +629,27 @@ fi:
       long_form: 'viesti lisätty kirjanmerkkeihin'
     like:
       title: 'Tykkää'
-      description: 'Tykkää tästä viestistä'
+      description: 'Tykkää viestistä'
       short_description: 'Tykkää viestistä'
       long_form: 'tykkäsi tästä'
     vote:
       title: 'Äänestä'
-      description: 'Äänestä tätä viestiä'
+      description: 'Äänestä viestiä'
       short_description: 'Äänestä viestiä'
       long_form: 'viestiä äänestetty'
   user_activity:
+    no_default:
+      self: "Et ole vielä tehnyt mitään mainittavaa."
+      others: "Ei ole tehnyt mitään mainittavaa."
     no_bookmarks:
       self: "Kirjanmerkeissäsi ei ole viestejä. Kirjanmerkit auttavat löytämään viestejä helposti myöhemmin."
       others: "Ei kirjanmerkkejä."
     no_likes_given:
       self: "Et ole tykännyt yhdestäkään viestistä."
       others: "Ei tykättyjä viestejä."
+    no_replies:
+      self: "Et ole vastannut yhteenkään viestiin."
+      others: "Ei vastauksia."
   topic_flag_types:
     spam:
       title: 'Roskaposti'
@@ -634,7 +666,7 @@ fi:
       email_title: 'Ketju"%{title}" kaipaa valvojan huomiota'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Muu yhteisö liputti viestisi. Käy lukemassa <a href="/my/messages">saapuneet viestisi</a>.</p>'
+    you_must_edit: '<p>Muu yhteisö liputti viestisi. Käy lukemassa <a href="%{path}">saapuneet viestisi</a>.</p>'
     user_must_edit: '<p>Tämä viesti on liputettu ja on siksi piilotettu väliaikaisesti.</p>'
   archetypes:
     regular:
@@ -646,7 +678,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,15 +889,16 @@ 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"
-    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."
+    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 aloittaminen valitsematta aluetta. VAROITUS: Alueettomat ketjut täytyy siirtää jollekin alueelle ennen kuin poistat asetuksen käytöstä."
+    allow_duplicate_topic_titles: "Salli ketjun aloittaminen identtisellä otsikolla."
     unique_posts_mins: "Kuinka monen minuutin kuluttua käyttäjä voi lähettää uudestaan samansisältöisen viestin"
     educate_until_posts: "Näytä uuden käyttäjän ohje, kun käyttäjä alkaa kirjoittamaan ensimmäistä (n) viestiään viestikenttään."
     title: "Palstan nimi, käytetään title tagissa."
     site_description: "Kuvaile sivustoa yhdellä lauseella, jota käytetään meta description tagissa."
-    contact_email: "Sähköpostiosoite, josta sivuston henkilökunnan saa tavoitettua. Tänne lähetetään sivuston kriittiset ilmoitukset, kuten käsittelemättömät liput ja näytetään /about sivun yhteystietona."
+    contact_email: "Sivustosta vastaavan henkilön sähköpostiosoite. Siihen lähetetään kriittiset ilmoitukset ja se näkyy /about-sivulla kiireellisiä yhteydenottoja varten."
     contact_url: "Verkko-osoiteyhteystieto sivustolle. Näytetään /about sivun yhteystietona kiireellisiin asioihin liittyen."
-    queue_jobs: "VAIN KEHITTÄJILLE! VAROITUS! Oletusarvona tehtävät asetetaan sidekiq jonoon. Jos poistetaan käytöstä, sivusto ei enää toimi."
     crawl_images: "Lataa linkatut kuvat kuvan dimensioiden määrittamiseksi."
     download_remote_images_to_local: "Muunna linkatut kuvat liitetiedostoiksi lataamalla ne; tämä estää kuvien rikkoontumisen vanhentuneiden linkkien vuoksi."
     download_remote_images_threshold: "Vähin vapaa tila, jotta linkatut kuvat ladataan (prosenteissa)"
@@ -877,21 +910,24 @@ 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_on_create: "Jos tämä on valittuna, alueiden järjestys pysyy samana uuden ketjun luomisen dialogissa (edellyttää fixed_category_positions)"
+    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 aloittamisen 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."
+    exclude_rel_nofollow_domains: "Lista verkkotunnuksista, joihin osoittaviin linkkeihin nofollow:ta ei lisätä. example.com sallii automaattisesti myös sub.example.comin. Sinun tulisi vähintäänkin lisätä tämän sivuston verkkotunnus, jotta hakurobotit löytävät kaiken sisällön. Jos sivustosi muita osia on toisen verkkotunnuksen alaisuudessa, lisää nekin."
     post_excerpt_maxlength: "Viestin katkelman merkkien maksimimäärä."
     show_pinned_excerpt_mobile: "Näytä katkelma kiinnitetyistä ketjuista mobiilinäkymässä."
     show_pinned_excerpt_desktop: "Näytä katkelma kiinnitetyistä ketjuista työpöytänäkymässä."
     post_onebox_maxlength: "Discourse-viestin Onebox-esikatselun merkkien maksimimäärä."
     onebox_domains_blacklist: "Verkko-osoitteet, joista ei luoda Onebox-esikatselua"
+    inline_onebox_domains_whitelist: "Verkko-osoitteet, joista luodaan Onebox-esikatselu, jos niihin linkitetään määrittämättä otsikkoa."
+    enable_inline_onebox_on_all_domains: "Poista  inline_onebox_domain_whitelist -sivustoasetus käytöstä ja salli rivi-oneboxit kaikista verkko-osoitteista."
     max_oneboxes_per_post: "Oneboxien enimmäismäärä yhdessä viestissä"
     logo_url: "Logo sivustosi vasemmassa yläkulmassa. Sen pitäisi olla leveä suorakulmio muodoltaan. Jos jätetään tyhjäksi, näytetään sivuston otsikkoteksti."
     digest_logo_url: "Vaihtoehtoinen logo, jota käytetään sähköpostikoosteessa. Muodoltaan sen tulisi olla leveä suorakulmio, eikä se saa olla SVG-muodossa. Jos ei aseteta, käytetään `logo_url`-kuvaa."
     logo_small_url: "Pieni logo sivuston vasemmassa reunassa, joka näytettään rullattaessa alaspäin. Sen pitäisi olla neliö muodoltaan. Jos jätetään tyhjäksi, näytetään sen tilalla koti-merkki."
     favicon_url: "Palstan favicon, katso http://fi.wikipedia.org/wiki/Favicon, täytyy olla png toimiakseen CDN:n kanssa"
-    mobile_logo_url: "Logo mobiilisivun vasemmassa ylälaidassa. Sen pitäisi olla neliön muotoinen. Jos jätetään tyhjäksi, 'logo_url' käytetään sen tilalla. Esim: http://example.com/uploads/default/logo.png"
+    mobile_logo_url: "Sivustosi mobiiliversion logo. Jos ei määritetä, 'logo_url' käytetään sen tilalla. Esim: http://example.com/uploads/default/logo.png"
+    large_icon_url: "Kuva, jota käytetään logo/splash -kuvana Androidissa. Suositeltava koko on 512x512 pikseliä."
     apple_touch_icon_url: "Applen laitteiden käyttämä ikoni, Suositeltu koko on 144px kertaa 144px."
     notification_email: "Sähköpostiosoite, josta kaikki tärkeät järjestelmän lähettämät sähköpostiviestit lähetetään. Verkkotunnuksen SPF, DKIM ja reverse PTR tietueiden täytyy olla kunnossa, jotta sähköpostit menevät perille."
     email_custom_headers: "Pystyviivalla eroteltu lista mukautetuista sähköpostin tunnisteista"
@@ -903,6 +939,7 @@ fi:
     summary_percent_filter: "Kun käyttäjä klikkaa 'Näytä ketjun tiivistelmä', näytä paras % viesteistä"
     summary_max_results: "Maksimimäärä viestejä, jotka näytetään ketjun tiivistelmässä"
     enable_private_messages: "Salli luottamustason 1 (muokattavissa asetuksista) käyttäjien lähettää yksityisviestejä ja vastata viesteihin. Huomaa, että henkilökunta voi aina lähettää viestejä."
+    enable_private_email_messages: "Salli luottamustason 4 (säädettävissä toisella asetuksella) käyttäjien lähettää yksityisviestitoiminnolla sähköpostia. Huomioi, että henkilökunta voi lähettää riippumatta asetuksista."
     enable_long_polling: "Ilmoitusten käyttämä viestiväylä voi käyttää long pollingia"
     long_polling_base_url: "Base URL, jota käytetään long pollingissa (kun CDN on käytössä, varmista että tähän on asetettu origin pull) esim: http://origin.site.com"
     long_polling_interval: "Kuinka kauan palvelimen pitäisi odottaa ennen vastaamista asiakkaalle, kun ei ole mitään dataa jota lähettää (vain kirjautuneille käyttäjille)"
@@ -911,25 +948,23 @@ fi:
     background_polling_interval: "Kuinka usein asiakkaat pollaavat, millisekunneissa (kun ikkuna ei ole aktiivisena)"
     flags_required_to_hide_post: "Kuinka monta lippua aiheuttaa viestin automaattisen piilottamisen ja automaattiviestin lähettämisen kirjoittajalle (aseta 0, jos haluat pois käytöstä)"
     cooldown_minutes_after_hiding_posts: "Kuinka monta minuuttia käyttäjän tulee odottaa ennen kuin voi muokata viestiään, jonka yhteisö on liputtanut piiloon."
-    max_topics_in_first_day: "Kuinka monta ketjua käyttäjä voi luoda ensimmäistä viestiään seuraavien 24 tunnin aikana"
+    max_topics_in_first_day: "Kuinka monta ketjua käyttäjä voi aloittaa ensimmäistä viestiään seuraavien 24 tunnin aikana"
     max_replies_in_first_day: "Kuinka monta vastausta käyttäjä voi kirjoittaa ensimmäistä viestiään seuraavien 24 tunnin aikana"
     tl2_additional_likes_per_day_multiplier: "Nosta tykkäysten päivittäistä rajaa tasolla lt2 (konkari) kertomalla tällä luvulla"
     tl3_additional_likes_per_day_multiplier: "Nosta tykkäysten päivittäistä rajaa tasolla lt3 (mestari) kertomalla tällä luvulla"
     tl4_additional_likes_per_day_multiplier: "Nosta tykkäysten päivittäistä rajaa tasolla lt4 (johtaja) kertomalla tällä luvulla"
-    num_spam_flags_to_block_new_user: "Jos uuden käyttäjän viestit saavat näin monta roskapostiliputusta num_users_to_block_new_user eri käyttäjältä, piilota kaikki viestit ja jäädytä kirjoitusoikeudet. Aseta 0 poistaaksesi käytöstä."
-    num_users_to_block_new_user: "Jos uuden käyttäjän viestit saavat num_spam_flags_to_block_new_user roskapostiliputusta näin monelta eri käyttäjältä, piilota kaikki viestit ja jäädytä kirjoitusoikeudet. Aseta 0 poistaaksesi käytöstä."
-    num_tl3_flags_to_block_new_user: "Jos uuden käyttäjän viesti saa näin monta lippua num_tl3_users_to_block_new_user eri lt3 käyttäjältä, piilota kaikki hänen viestinsä ja estä uusien viestien kirjoittaminen. 0 poistaa käytöstä."
-    num_tl3_users_to_block_new_user: "Jos uuden käyttäjän viesti saa num_tl3_flags_to_block_new_user lippua näin monelta lt3 käyttäjältä, piilota kaikki hänen viestinsä ja estä uusien viestien kirjoittaminen. 0 poistaa käytöstä."
-    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."
+    num_spam_flags_to_silence_new_user: "Jos uuden käyttäjän viestit saavat näin monta roskapostiliputusta num_users_to_silence_new_user eri käyttäjältä, piilota kaikki hänen viestinsä ja estä uusien viestien lähettäminen. 0 poistaa toiminnon käytöstä."
+    num_users_to_silence_new_user: "Jos uuden käyttäjän viestit saavat num_spam_flags_to_silence_new_user roskapostiliputusta näin monelta eri käyttäjältä, piilota kaikki hänen viestinsä ja estä uusien viestien lähettäminen. 0 poistaa toiminnon käytöstä."
+    num_tl3_flags_to_silence_new_user: "Jos uuden käyttäjän viestit saavat näin monta liputusta num_tl3_users_to_silence_new_user eri luottamustason 3 käyttäjältä, piilota kaikki hänen viestinsä ja estä uusien viestien lähettäminen. 0 poistaa toiminnon käytöstä."
+    num_tl3_users_to_silence_new_user: "Jos uuden käyttäjän viestit saavat num_tl3_flags_to_silence_new_user liputusta näin monelta eri luottamustason 3 käyttäjältä, piilota kaikki hänen viestinsä ja estä uusien viestien lähettäminen. 0 poistaa toiminnon käytöstä."
+    notify_mods_when_user_silenced: "Jos käyttäjä hiljennetään automaattisesti, lähetä viesti kaikile valvojille."
+    flag_sockpuppets: "Jos uuden käyttäjän aloittamaan 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ä."
     maximum_session_age: "Käyttäjä pysyy sisäänkirjautuneena n tuntia vierailunsa jälkeen"
-    ga_tracking_code: "VANHENTUNUT: Google Analytics (ga.js) -seurantatunnus, esim. UA-12345678-9; ks. http://google.com/analytics"
-    ga_domain_name: "VANHENTUNUT: Google Analytics (ga.js) -verkkotunnus, esim. mysite.com; ks. http://google.com/analytics"
     ga_universal_tracking_code: "Google Universal analytics (analytics.js) seurantakoodi, esim.: UA-12345678-9; katso http://google.com/analytics"
     ga_universal_domain_name: "Google Universal analytics (analytics.js) verkkotunnus, esim.: osoite.fi; katso http://google.com/analytics"
     gtm_container_id: "Google Tag Manager -säiliön ID. Esim: GTM-ABCDEF"
@@ -938,6 +973,7 @@ fi:
     cors_origins: "Salli lähteet CORS-pyynnöille (cross-origin request). Jokaisen lähteen pitää sisältää http:// tai https://. DISCOURSE_ENABLE_CORS asetus pitää olla valittuna ottaaksesi CORSin käyttöön."
     use_admin_ip_whitelist: "Ylläpitäjät voivat kirjautua vain IP-osoitteista, jotka on määritetty Seulottavien IP:iden listassa (Ylläpito > Lokit > Seulottavat IP:t)"
     blacklist_ip_blocks: "Lista yksityisistä IP-blokeista, joita Discoursen ei tule käydä läpi"
+    allowed_iframes: "Iframe src -verkkotunnukset, jotka Discourse voi turvallisesti sallia viesteissä"
     top_menu: "Mitkä painikkeet näytetään kotisivun navigointipalkissa, ja missä järjestyksessä. Esimerkiksi latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "Mitkä painikkeet näytetään viestin valikossa, ja missä järjestyksessä. Esimerkiksi like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Piilotettavat painikkeet viestin valikosta, kunnes '...' klikataan."
@@ -955,18 +991,17 @@ fi:
     top_page_default_timeframe: "Huiput-sivun oletusaikajakso."
     show_email_on_profile: "Näytä käyttäjän sähköpostiosoite profiilissa (näkyy vain käyttäjälle itselleen ja henkilökunnalle)"
     prioritize_username_in_ux: "Näytä käyttäjänimi ensimmäisenä käyttäjäsivulla, -kortissa ja viesteissä (jos poistetaan käytöstä, nimi näytetään ensin)"
+    enable_rich_text_paste: "Ota käyttöön automaattinen muunnos HTML:stä Markdowniin, kun tekstiä liitetään kirjoitusalueelle (kokeellinen)"
     email_token_valid_hours: "Unohtuneen salasanan / tilin vahvistamisen tokenit ovat voimassa (n) tuntia."
     enable_badges: "Ota käyttöön ansiomerkkijärjestelmä"
     enable_whispers: "Salli henkilökunnan yksityiskeskustelu ketjujen sisällä."
     allow_index_in_robots_txt: "Määrittele robots.txt-tiedostossa, että hakukoneet saavat luetteloida sivuston."
     email_domains_blacklist: "Pystyviivalla eroteltu lista sähköposti-verkkotunnuksista, joista käyttäjät eivät voi luoda tiliä. Esimerkiksi mailinator.com|trashmail.net"
     email_domains_whitelist: "Pystyviivalla eroteltu lista sähköposti-verkkotunnuksista, joista käyttäjien pitää luoda tilinsä. VAROITUS: Käyttäjiä, joiden sähköpostiosoite on muusta verkkotunnuksesta ei sallita!"
-    forgot_password_strict: "Älä paljasta tilin olemassaoloa unohtuneen salasanan kyselyssä."
+    hide_email_address_taken: "Älä kerro käyttäjälle, että käyttäjätili annetulla sähköpostiosoitteella on jo olemassa, kun hän liittyy palstalle tai kun hän pyytää salasanan palauttamista."
     log_out_strict: "Kun kirjaudutaan ulos, kirjaa käyttäjä ulos kaikilta laitteilta"
     version_checks: "Pingaa Discourse Hubia päivityksistä ja näytä viesti /admin hallintapaneelissa kun uusi versio on saatavilla"
     new_version_emails: "Lähetä sähköposti contact_email osoitteeseen kun uusi versio Discoursesta on saatavilla."
-    port: "VAIN KEHITTÄJILLE! VAROITUS! Käytä tätä HTTP porttia portin 80 sijaan. Jätä tyhjäksi jos haluat käyttää oletusporttia 80."
-    force_hostname: "VAIN KEHITTÄJILLE! VAROITUS! Määrittele isäntänimi URL:ssa. Jätä tyhjäksi käyttääksesi oletusarvoa."
     invite_expiry_days: "Kuinka monta päivää käyttäjäkutsujen avaimet ovat voimassa"
     invite_passthrough_hours: "Kuinka pitkään käyttäjä voi käyttää vastatun kutsun avainta kirjautuakseen sisään, tunneissa"
     invite_only: "Julkinen rekisteröityminen ei ole käytössä, uuden tilin luominen vaatii kutsun henkilökunnalta."
@@ -1010,6 +1045,7 @@ fi:
     github_client_id: "Client id Github autentikaatioon, rekisteröinti osoitteessa https://github.com/settings/applications"
     github_client_secret: "Client secret Github autentikaatioon, rekisteröinti osoitteessa https://github.com/settings/applications"
     readonly_mode_during_backup: "Ota käyttöön vain luku -tila, kun otetaan varmuuskopiota"
+    enable_backups: "Salli ylläpitäjien tehdä varmuuskopioita palstasta"
     allow_restore: "Salli palautus, joka korvaa KAIKEN sivuston datan! Jätä valitsematta, jos et aio palauttaa sivuston varmuuskopiota"
     maximum_backups: "Tallennettuna pidettävien varmuuskopioiden maksimimäärä. Vanhemmat varmuuskopiot poistetaan automaattisesti"
     automatic_backups_enabled: "Tee automaattinen varmuuskopiointi, kuten tiheysasetus on määritelty"
@@ -1026,7 +1062,7 @@ fi:
     top_topics_formula_first_post_likes_multiplier: "avausviestin tykkäysmäärän kerroin (n) Huiput-listauksen kaavassa: `log(katselut) * 2 + avausviestin tykkäykset * (n) + PIENEMPI(tykkäysten määrä / viestien määrä, 3) + 10 + log(viestien määrä)`"
     top_topics_formula_least_likes_per_post_multiplier: "tykkäykset/viestit -suhteen enimmäisarvo (n) Huiput-listauksen kaavassa: `log(katselut) * 2 + avausviestin tykkäykset * 0.5 + PIENEMPI(tykkäysten määrä / viestien määrä, (n)) + 10 + log(viestien määrä)`"
     rebake_old_posts_count: "Kuinka monta vanhaa viestiä rakennetaan uudelleen 15 minuutissa."
-    rate_limit_create_topic: "Ketjun luomisen jälkeen käyttäjän täytyy odottaa (n) sekuntia voidakseen luoda uuden ketjun."
+    rate_limit_create_topic: "Ketjun aloittamisen jälkeen käyttäjän täytyy odottaa (n) sekuntia voidakseen aloittaa toisen ketjun."
     rate_limit_create_post: "Viestin luomisen jälkeen käyttäjän täytyy odottaa (n) sekuntia voidakseen luoda uuden viestin."
     rate_limit_new_user_create_topic: "Ketjun luomisen jälkeen uuden käyttäjän täytyy odottaa (n) sekuntia voidakseen luoda uuden ketjun."
     rate_limit_new_user_create_post: "Viestin luomisen jälkeen uuden käyttäjän täytyy odottaa (n) sekuntia voidakseen luoda uuden viestin."
@@ -1034,7 +1070,7 @@ fi:
     max_flags_per_day: "Liputusten päivittäinen maksimimäärä per käyttäjä."
     max_bookmarks_per_day: "Kirjanmerkkien päivittäinen maksimimäärä per käyttäjä."
     max_edits_per_day: "Muokkausten päivittäinen maksimimäärä per käyttäjä."
-    max_topics_per_day: "Luotujen ketjujen päivittäinen enimmäismäärä per käyttäjä."
+    max_topics_per_day: "Kuinka monta ketjua käyttäjä voi aloittaa päivässä."
     max_private_messages_per_day: "Viestien päivittäinen maksimimäärä per käyttäjä."
     max_invites_per_day: "Maksimimäärä kutsuja, jonka käyttäjä voi lähettää päivässä."
     max_topic_invitations_per_day: "Maksimimäärä ketjukutsuja, jonka yksittäinen käyttäjä voi lähettää päivässä"
@@ -1049,7 +1085,7 @@ fi:
     clean_up_uploads: "Poista orpoutuneet liitetiedostot, joita ei käytetä viesteissä, laittoman hostauksen estämiseksi. VAROITUS: kannattaa varmuuskopioida /uploads kansio ennen tämän asetuksen ottamista käyttöön."
     clean_orphan_uploads_grace_period_hours: "Varoaika (tunteina) kunnes orpoutuneet liitetiedostot poistetaan"
     purge_deleted_uploads_grace_period_days: "Varoaika (päivinä) kunnes poistettu liitetiedosto tuhotaan."
-    purge_unactivated_users_grace_period_days: "Varoaika (päivinä) kunnes aktivoimaton käyttäjätili tuhotaan."
+    purge_unactivated_users_grace_period_days: "Varoaika (päivissä) ennen kuin aktivoimaton käyttäjätili poistetaan.  Aseta 0 niin aktivoimattomia käyttäjiä ei poisteta ollenkaan."
     enable_s3_uploads: "Lataa liitetiedostot Amazon S3:een. Tärkeää: edellyttää toimivat S3 kirjautumistiedot (access key id ja secret access key)."
     s3_use_iam_profile: 'Käytä AWS EC2 IAM roolia avainten hakuun. HUOM: käyttöönotto korvaa "s3 access key id" ja "s3 secret access key" asetukset.'
     s3_upload_bucket: "Amazon S3 bucket, jonne lataukset sijoitetaan. VAROITUS: täytyy olla pienillä kirjaimilla, ei pisteitä, ei alaviivoja."
@@ -1064,13 +1100,15 @@ 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."
+    strip_image_metadata: "Poista metadata kuvista."
     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."
-    tl1_requires_topics_entered: "Kuinka monta ketjua uuden käyttäjän täytyy avata ennen ylentämistä luottamustasolle 1."
+    tl1_requires_topics_entered: "Kuinka monessa ketjussa uuden käyttäjän täytyy käydä ennen ylentämistä luottamustasolle 1."
     tl1_requires_read_posts: "Kuinka monta viestiä uuden käyttäjän täytyy lukea ennen ylentämistä luottamustasolle 1."
     tl1_requires_time_spent_mins: "Kuinka monta minuuttia uuden käyttäjän täytyy lukea keskusteluita ennen ylentämistä luottamustasolle 1."
-    tl2_requires_topics_entered: "Kuinka monta ketjua käyttäjän täytyy avata ennen ylentämistä luottamustasolle 2."
+    tl2_requires_topics_entered: "Kuinka monessa ketjussa uuden käyttäjän täytyy käydä ennen ylentämistä luottamustasolle 2."
     tl2_requires_read_posts: "Kuinka monta viestiä käyttäjän täytyy lukea ennen ylentämistä luottamustasolle 2."
     tl2_requires_time_spent_mins: "Kuinka monta minuuttia käyttäjän täytyy lukea keskusteluita ennen ylentämistä luottamustasolle 2."
     tl2_requires_days_visited: "Kuinka monena päivänä käyttäjän täytyy vierailla sivustolla ennen ylentämistä luottamustasolle 2."
@@ -1080,22 +1118,23 @@ fi:
     tl3_time_period: "Luottamustason 3 vaatimuksiin liittyvän ajanjakson pituus (päivissä)"
     tl3_requires_days_visited: "Monenako päivänä vähintään käyttäjän täytyy olla vieraillut sivustolla viimeisen (tl3 time period) päivän aikana voidakseen saavuttaa luottamustason 3. Ota ylennykset käytöstä asettamalla arvo korkeammaksi kuin lt3 aikaraja. (0 tai korkeampi)"
     tl3_requires_topics_replied_to: "Moneenko ketjuun vähintään käyttäjän täytyy olla vastannut viimeisen (tl3 time period) päivän aikana voidakseen saavuttaa luottamustason 3. (0 tai korkeampi)"
-    tl3_requires_topics_viewed: "Montako prosenttia viimeisen (tl3 time period) päivän aikana luoduista ketjuista käyttäjän täytyy olla katsellut voidakseen saavuttaa luottamustason 3. (asteikko 0-100)"
+    tl3_requires_topics_viewed: "Prosentteina, kuinka suuressa osassa viimeisimpien (tl3 time period) päivän aikana aloitetuista ketjuista käyttäjän täytyy olla käynyt voidakseen saavuttaa luottamustason 3. (asteikko 0-100)"
     tl3_requires_topics_viewed_cap: "Maksimimäärä katseltuja ketjuja, joka vaaditaan edellisen (tl3 time period) aikana."
     tl3_requires_posts_read: "Montako prosenttia viimeisen (tl3 time period) päivän aikana luoduista viesteistä käyttäjän täytyy olla katsellut voidakseen saavuttaa luottamustason 3. (asteikko 0-100)"
     tl3_requires_posts_read_cap: "Maksimimäärä luettuja viestejä, joka vaaditaan edellisen (tl3 time period) aikana."
-    tl3_requires_topics_viewed_all_time: "Montako ketjua käyttäjän täytyy olla katsonut voidakseen saavuttaa luottamustason 3."
+    tl3_requires_topics_viewed_all_time: "Monessako ketjussa käyttäjän täytyy olla käynyt voidakseen saavuttaa luottamustason 3."
     tl3_requires_posts_read_all_time: "Montako viestiä käyttäjän täytyy olla katsonut voidakseen saavuttaa luottamustason 3."
     tl3_requires_max_flagged: "Käyttäjällä ei saa olla enempää kuin x viestiä liputettuna x eri käyttäjältä viimeisen (tl3 time period) päivän aikana voidakseen saavuttaa luottamustason 3. (0 tai korkeampi)"
     tl3_promotion_min_duration: "Kuinka montaa päivää luottamustasolle 3 ylennyksen jälkeen käyttäjä voidaa jälleen alentaa luottamustasolle 2."
     tl3_requires_likes_given: "Montako tykkäystä käyttäjän täytyy olla vähintään antanut viimeisen (tl3 time period) päivän aikana voidakseen saavuttaa luottamustason 3."
     tl3_requires_likes_received: "Montako tykkäystä käyttäjän täytyy olla vähintään saanut viimeisen (tl3 time period) päivän aikana voidakseen saavuttaa luottamustason 3."
     tl3_links_no_follow: "Älä poista rel=nofollow -attribuuttia linkeistä luottamustason 3 käyttäjiltä."
-    min_trust_to_create_topic: "Ketjun luomiseksi vaadittava luottamustaso."
+    min_trust_to_create_topic: "Ketjun aloittamiseen vaadittava luottamustaso."
     min_trust_to_edit_wiki_post: "Wikiviestin muokkaamiseen vaadittava luottamustaso."
     min_trust_to_edit_post: "Viestin muokkaamiseen vaadittava luottamustaso."
     min_trust_to_allow_self_wiki: "Minimiluottamustaso, jolla käyttäjä voi tehdä omasta viestistään wiki-viestin."
     min_trust_to_send_messages: "Yksityisviestien luomiseen vaadittava luottamustaso"
+    min_trust_to_send_email_messages: "Vähimmäisluottamustaso, jotta voi lähettää uusia yksityisviestejä sähköpostilla (esikäyttäjille)"
     newuser_max_links: "Kuinka monta linkkiä uusi käyttäjä voi lisätä viestiin."
     newuser_max_images: "Kuinka monta kuvaa uusi käyttäjä voi lisätä viestiin."
     newuser_max_attachments: "Kuinka monta liitettä uusi käyttäjä voi lisätä viestiin."
@@ -1103,6 +1142,7 @@ fi:
     newuser_max_replies_per_topic: "Uuden käyttäjän viestien maksimimäärä samassa ketjussa, kunnes joku vastaa heille."
     max_mentions_per_post: "Kuinka monta @nimi mainintaa kukaan voi lisätä viestiin."
     max_users_notified_per_group_mention: "Kuinka moni voi saada ilmoituksen, kun ryhmä mainitaan (jos raja ylittyy, kukaan ei saa ilmoitusta)"
+    enable_mentions: "Salli käyttäjän mainita toinen käyttäjä."
     create_thumbnails: "Luo esikatselu- ja lightbox-kuvia, jotka ovat liian suuria mahtuakseen viestiin."
     email_time_window_mins: "Odota (n) minuuttia ennen ilmoitussähköpostien lähettämistä, jotta käyttäjällä on aikaa muokata ja viimeistellä viestinsä."
     private_email_time_window_seconds: "Odota (n) sekuntia ennen sähköposti-ilmoitusten lähettämistä käyttäjille, jotta kirjoittajalla on mahdollisuus tehdä muokkaukset ja viimeistellä viestinsä."
@@ -1122,7 +1162,7 @@ fi:
     max_attachment_size_kb: "Liitetyn tiedoston suurin sallittu koko kilotavuissa. Tämä pitää asettaa myös nginxin (client_max_body_size) / apachen tai proxyn asetuksista."
     authorized_extensions: "Liitetiedostojen sallitut tiedostopäätteet (käytä '*' salliaksesi kaikki tiedostotyypit)"
     theme_authorized_extensions: "Teemalatausten liitetiedostojen sallitut tiedostopäätteet (käytä '*' salliaksesi kaikki tiedostotyypit)"
-    max_similar_results: "Kuinka monta samankaltaista ketjua näytetään viestikentän päällä uutta ketjua luotaessa. Vertailu perustuu sekä otsikkoon että leipätekstiin."
+    max_similar_results: "Kuinka monta samankaltaista ketjua näytetään viestikentän päällä uutta ketjua aloitettaessa. Vertailu perustuu sekä otsikkoon että leipätekstiin."
     max_image_megapixels: "Kuvan enimmäiskoko megapikseleinä."
     title_prettify: "Estä yleiset kirjoitusvirheet otsikossa, kuten pelkät isot kirjaimet, pieni ensimmäinen kirjain, useat !- ja ?-merkit ym."
     topic_views_heat_low: "Näin monen katselun jälkeen katselut-saraketta korostetaan hieman."
@@ -1155,9 +1195,10 @@ fi:
     num_hours_to_close_topic: "Kuinka moneksi tunniksi ketju menee tauolle puuttumistoimia odottamaan."
     auto_respond_to_flag_actions: "Ota käyttöön automaattinen vastaus lippua poistettaessa."
     min_first_post_typing_time: "Minimimäärä aikaa millisekunneissa, joka käyttäjän täytyy kirjoittaa ensimmäistä viestiään. Jos rajaa ei saavuteta, viesti lisätään automaattisesti hyväksyttävien jonoon. Aseta 0 ottaaksesi pois käytöstä (ei suositella)."
-    auto_block_fast_typers_on_first_post: "Estä automaattisesti käyttäjät, jotka eivät saavuta min_first_post_typing_time"
-    auto_block_fast_typers_max_trust_level: "Suurin luottamustaso, jolla automaattisesti estetään nopeat kirjoittajat"
-    auto_block_first_post_regex: "Merkkikokoriippumaton regex joka aiheuttaa käyttäjän ensimmäisen viestin estämisen ja lisäämisen hyväksymisjonoon. Esimerkiksi raivoaminen|a[bc]a aiheuttaa kaikkien viestien, joissa on sanat raivoava, aba tai aca estämisen. Vaikuttaa vain ensimmäiseen viestiin."
+    auto_silence_fast_typers_on_first_post: "Hiljennä automaattisesti käyttäjät, joiden ensimmäisen viestin kirjoittamiseen ei kulu min_first_post_typing_time"
+    auto_silence_fast_typers_max_trust_level: "Enimmäisluottamustaso, jolla nopea kirjoittaja voidaan hiljentää automaattisesti"
+    auto_silence_first_post_regex: "Isoista ja pienistä kirjaimista riippumaton säännöllinen lauseke, joka osuessaan aiheuttaa käyttäjän ensimmäisen viestin hiljennyksen ja viesti viedään arvioitavaksi. Esimerkki: hemmetti|a[bc]a aiheuttaa hiljennyksen, jos viesti sisältää sanan 'hemmetti', 'aba' tai 'aca'. Koskee vain käyttäjän ensimmäistä viestiä."
+    flags_default_topics: "Näytä liputetut ketjut oletuksena ylläpito-osiossa"
     reply_by_email_enabled: "Ota käyttöön vastaukset sähköpostin avulla."
     reply_by_email_address: "Saapuvien sähköpostivastausten sähköpostiosoitekaava, esimerkiksi: %{reply_key}@reply.example.com tai replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Lista vaihtoehtoisista saapuvien sähköpostivastausten sähköpostiosoitekaavoista, esimerkiksi: %{reply_key}@reply.example.com tai replies+%{reply_key}@example.com"
@@ -1170,8 +1211,8 @@ fi:
     unsubscribe_via_email_footer: "Liitä sähköpostiviestien alaosaan mailto: linkki, jonka avulla saaja voi lakkauttaa sähköposti-ilmoitukset"
     delete_email_logs_after_days: "Poista sähköpostilokit (N) päivän jälkeen. Aseta 0 säilyttääksesi ikuisesti."
     max_emails_per_day_per_user: "Käyttäjälle päivässä lähetettävien sähköpostien enimmäismäärä. Aseta 0, jos et halua rajoittaa."
-    enable_staged_users: "Luo automaattisesti käyttäjiä, kun saapuvia sähköposteja käsitellään."
-    maximum_staged_users_per_email: "Maksimimäärä automaattisesti luotavia tilejä, kun käsitellään saapuvaa sähköpostia."
+    enable_staged_users: "Luo automaattisesti esikäyttäjiä, kun saapuvia sähköposteja käsitellään."
+    maximum_staged_users_per_email: "Enimmäismäärä automaattisesti luotuja esikäyttäjiä, kun käsitellään saapuvaa sähköpostia."
     auto_generated_whitelist: "Lista sähköpostiosoitteista, joiden viestejä ei tarkasteta automaattisesti luodun sisällön osalta. Esimerkki: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Estä saapuvat sähköpostit, jotka tunnistetaan automaattisesti luoduiksi."
     ignore_by_title: "Jätä sähköpostit huomiotta niiden otsikon perusteella."
@@ -1183,7 +1224,7 @@ fi:
     reset_bounce_score_after_days: "Nollaa palautuspisteet X päivä kuluttua."
     attachment_content_type_blacklist: "Lista avainsanoja, jota käytetään liitteiden estämisessä niiden sisältötyypin perusteella."
     attachment_filename_blacklist: "Lista avainsanoja, jota käytetään liitteiden estämisessä niiden tiedostonimen perusteella."
-    enable_forwarded_emails: "[BETA] Salli käyttäjän luoda ketju välittämällä saapunut sähköpostiviesti."
+    enable_forwarded_emails: "[BETA] Salli käyttäjän aloittaa ketju välittämällä saapunut sähköpostiviesti."
     always_show_trimmed_content: "Näytä kaikkialla saapuvien sähköpostien karsitut osat. VAROITUS: voi paljastaa sähköpostiosoitteita."
     private_email: "Älä laita sähköposteihin viestien tai ketjujen sisältöä yksityisyyssyistä."
     manual_polling_enabled: "Työnnä sähköpostit käyttäen sähköpostivastausten APIa."
@@ -1196,15 +1237,16 @@ fi:
     pop3_polling_username: "POP3 käyttäjänimi"
     pop3_polling_password: "POP3 käyttäjätilin salasana."
     log_mail_processing_failures: "Kirjaa kaikki sähköpostin prosessoinnin virheet tänne http://sivustonnimi.com/logs"
-    email_in: "Salli käyttäjien luoda uusia ketjuja sähköpostitse (vaatii pop3 pollauksen). Konfiguroi osoitteet  erikseen jokaisen alueen \"Asetukset\" välilehdeltä. "
-    email_in_min_trust: "Alin luottamustaso, jonka käyttäjä tarvitsee voidakseen luoda uusia ketjuja sähköpostitse."
+    email_in: "Salli käyttäjien aloittaa uusia ketjuja sähköpostitse (vaatii manuaalisen tai pop3-pollauksen). Määritä osoitteet jokaiselle alueelle erikseen niiden Asetukset-välilehdiltä. "
+    email_in_min_trust: "Vähimmäisluottamustaso, jonka käyttäjä tarvitsee uuden ketjun aloittamiseen 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."
-    minimum_topics_similar: "Kuinka monta ketjua täytyy olla olemassa, ennen kuin samankaltaisia ketjuja näytetään uutta ketjua luotaessa."
+    find_related_post_with_key: "Käytä vain vastausavainta tunnistettaessa, mihin viestiin viesti on vastaus. VAROITUS: pois päältä kytkeminen mahdollistaa sähköpostiosoitteeseen pohjautuvan toisena esiintymisen."
+    minimum_topics_similar: "Kuinka monta ketjua täytyy olla olemassa, jotta samankaltaisia ketjuja näytetään uutta ketjua aloitettaessa."
     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ää."
     delete_all_posts_max: "Kerralla poistettavien viestien maksimimäärä Poista kaikki viestit-painikkeella. Jos käyttäjällä on enemmän viestejä, niitä ei voi poistaa kerralla eikä käyttäjää voi poistaa."
-    username_change_period: "Montako päivää aikaa käyttäjällä on vaihtaa käyttäjänimeä tilin luomisen jälkeen (0 poistaa nimen vaihdon käytöstä)."
+    username_change_period: "Kuinka monen päivän ajan voi vaihtaa käyttäjänimeään sen jälkeen, kun rekisteröityy (0 estää käyttäjänimen muuttamisen)."
     email_editable: "Salli käyttäjien vaihtaa sähköpostiosoitteensa tilin luomisen jälkeen."
     logout_redirect: "Sivu, jonne selain ohjataan uloskirjautumisen jälkeen, esim: (http://somesite.com/logout)"
     allow_uploaded_avatars: "Salli käyttäjien ladata oma profiilikuva."
@@ -1219,7 +1261,7 @@ fi:
     suppress_digest_email_after_days: "Älä lähetä sähköpostikoostetta käyttäjille, jotka eivät ole vierailleet sivustolla yli (n) päivään."
     digest_suppress_categories: "Älä liitä näiden alueiden viestejä sähköpostikoosteisiin."
     disable_digest_emails: "Poista sähköpostikoosteet kaikilta käyttäjiltä."
-    email_accent_bg_color: "Kakkosväri, jota käytetään joidenkin elementtien taustavärinä sähköpostiviesteissä. Anna värin nimi englanniksi ('red') tai sen Hex-arvo ('#FF000')."
+    email_accent_bg_color: "Kakkosväri, jota käytetään joidenkin elementtien taustavärinä HTML-sähköpostiviesteissä. Anna värin nimi englanniksi ('red') tai sen Hex-arvo ('#FFF000')."
     email_accent_fg_color: "Sähköpostiviestin taustavärin päällä olevan tekstin väri HTML-sähköpostiviesteissä. Anna värin nimi englanniksi ('white') tai sen Hex-arvo ('#FFFFFF')."
     email_link_color: "Linkkien väri HTML-sähköpostiviesteissä. Anna värin nimi  ('blue') tai sen Hex-arvo ('#0000FF')."
     detect_custom_avatars: "Tarkistetaanko, ovatko käyttäjät ladanneet oman profiilikuvan."
@@ -1232,6 +1274,8 @@ fi:
     anonymous_posting_min_trust_level: "Anonyymin tilan käyttämiseen vaadittava luottamustila"
     anonymous_account_duration_minutes: "Suojellaksesi anonymiteettiä, luo uusi anonyymi tili N minuutin välein jokaiselle käyttäjälle. Esimerkki: jos arvoksi asetetaan 600, kun 600 minuuttia tulee kuluneeksi edellisestä viestistä JA käyttäjä vaihtaa anonyymiin tilaan, luodaan uusi anonyymi tili."
     hide_user_profiles_from_public: "Älä näytä käyttäjäkortteja, käyttäjäprofiileita tai käyttäjähakemistoa kirjautumattomille käyttäjille."
+    show_inactive_accounts: "Salli kirjautuneiden käyttähien selailla aktivoimattomia käyttäjätilejä."
+    hide_suspension_reasons: "Älä näytä hyllytysten syitä julkisesti käyttäjäprofiileissa."
     user_website_domains_whitelist: "Käyttäjän kotisivu voi olla näiden verkkotunnusten alainen. Pystyviivoin erotettu lista."
     allow_profile_backgrounds: "Salli käyttäjien ladata profiilin taustakuva."
     sequential_replies_threshold: "Kuinka monen peräkkäisen viestin jälkeen yhdessä ketjussa käyttäjää muistutetaan peräkkäisistä vastauksista."
@@ -1248,6 +1292,7 @@ fi:
     topic_page_title_includes_category: "Ketjusivu sisältää alueen nimen."
     native_app_install_banner: "Tarjoaa toistuvasti vieraileville Discoursen käyttöjärjestelmäkohtaista sovellusta."
     share_anonymized_statistics: "Julkaise yksilöimättömät käyttötilastot."
+    auto_handle_queued_age: "Käsittele automaattisesti asiat, jotka ovat odottaneet käsittelyä näin monta päivää. Lut sivuutetaan. Jonossa olevat viestit ja käyttäjät hylätään. Jos asetat 0:ksi, ominaisuus ei ole käytössä."
     max_prints_per_hour_per_user: "Tulostuspyyntöjen (/print) enimmäismäärä (aseta 0 poistaaksesi käytöstä)"
     full_name_required: "Koko nimi on käyttäjäprofiilin vaadittu kohta"
     enable_names: "Näytä käyttäjän koko nimi profiilissa, käyttäjäkortissa ja sähköposteissa. Poista käytöstä piilottaaksesi koko nimen kaikkialla."
@@ -1258,20 +1303,12 @@ fi:
     warn_reviving_old_topic_age: "Kun käyttäjä alkaa kirjoittamaan vastausta ketjuun, jonka uusin viesti on tätä vanhempi päivissä, näytetään varoitus. Poista käytöstä asettamalla arvoksi 0."
     autohighlight_all_code: "Pakota koodin korostus kaikkiin esimuotoiltuihin tekstiblokkeihin, vaikka käyttäjä ei määrittelisi kieltä."
     highlighted_languages: "Käytettävät syntaksinkorostussäännöt. (Varoitus: liian monen ohjelmointikielen käyttö voi vaikuttaa suorituskykyyn) ks. demo https://highlightjs.org/static/demo/"
-    feed_polling_enabled: "VAIN UPOTUS: Upotetaanko RSS/ATOM syöte viesteinä."
-    feed_polling_url: "VAIN UPOTUS: RSS/ATOM syötteen URL."
-    feed_polling_frequency_mins: "VAIN UPOTUS: Kyselyn taajuus"
-    embed_by_username: "Sen käyttäjän Discourse käyttäjänimi, joka luo upotetut ketjut."
-    embed_username_key_from_feed: "Avain, jolla erotetaan Discourse-käyttäjänimi syötteestä."
-    embed_title_scrubber: "Säännöllinen lauseke, jolla riisutaan upotettuja otsikoita."
     embed_truncate: "Typistä upotetut viestit."
     allowed_href_schemes: "Linkeissä sallitut skeemat http:n ja https:n lisäksi."
     embed_post_limit: "Upotettavien viestien maksimimäärä."
     embed_username_required: "Käyttäjänimi vaaditaan ketjun luomiseksi."
-    embed_whitelist_selector: "CSS valitsin elementeille, jotka sallitaan upotetuissa viesteissä."
-    embed_blacklist_selector: "CSS valitstin elementeille, jotka poistetaan upotetuista viesteistä."
     notify_about_flags_after: "Jos liputusta ei ole käsitelty näin monessa tunnissa, lähetä yksityisviesti henkilökunnalle. Aseta 0 ottaaksesi pois käytöstä."
-    show_create_topics_notice: "Jos palstalla on vähemmän kuin 5 julkista ketjua, huomauta ylläpitäjiä ketjujen luonnista."
+    show_create_topics_notice: "Jos palstalla on vähemmän kuin 5 julkista ketjua, kehota ylläpitäjiä aloittamaan ketjuja."
     delete_drafts_older_than_n_days: Poista yli (n) päivää vanhat luonnokset.
     bootstrap_mode_min_users: "Vähimmäismäärä käyttäjiä, joka vaaditaan aloitustilan poistamiseen (aseta 0 poistaaksesi käytöstä)"
     prevent_anons_from_downloading_files: "Estä kirjautumattomia käyttäjiä lataamasta liitetiedostoja. VAROITUS: tämä estää viestin liitettyjen muiden tiedostojen, kuin kuvien käyttämisen sivustolla."
@@ -1281,11 +1318,13 @@ fi:
     enforce_square_emoji: "Pakota neliö kuvasuhteeksi kaikille emojille."
     approve_post_count: "Viestien lukumäärä, joka tarkastetaan uusilta käyttäjiltä ja haastajilta."
     approve_unless_trust_level: "Tätä luottamustasoa alhaisempien käyttäjien viestit tarkastetaan"
-    approve_new_topics_unless_trust_level: "Tätä luottamustasoa alhaisempien käyttäjien luomat ketjut tarkastetaan"
+    approve_new_topics_unless_trust_level: "Tätä luottamustasoa alhaisempien käyttäjien aloittamat ketjut tarkastetaan"
     notify_about_queued_posts_after: "Jos viesti on odottanut hyväksyntää kauemmin kuin näin monta tuntia, sähköpostiviesti lähetetään contact_email osoitteeseen. Aseta 0 ottaaksesi pois käytöstä."
     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."
+    watched_words_regular_expressions: "Tarkkaillut sanat ovat säännöllisiä lausekkeita."
     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."
@@ -1309,8 +1348,7 @@ fi:
     default_categories_tracking: "Lista oletuksena seurattavista alueista."
     default_categories_muted: "Lista oletuksena vaimennetuista alueista."
     default_categories_watching_first_post: "Lista alueista, joiden ketjujen ensimmäisiä viestejä tarkkaillaan oletuksena."
-    max_user_api_reqs_per_day: "Rajapintapyyntöjen päivittäinen enimmäismäärä rajapinnan avainta kohden"
-    max_user_api_reqs_per_minute: "Rajapintapyyntöjen enimmäismäärä minuuttia kohden rajapinnan avainta kohden"
+    retain_web_hook_events_period_days: "Kuinka monta päivää tietoa webhook-tapahtumista säilötään."
     allow_user_api_keys: "Salli rajapinnan käyttäjäavainten muodostaminen"
     allow_user_api_key_scopes: "Lista rajapinnan käyttäjäavaimiin liittyvistä oikeuksista"
     max_api_keys_per_user: "Enimmäismäärä rajapinnan käyttäjäavaimia käyttäjää kohden"
@@ -1354,12 +1392,17 @@ 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."
+      staged_users_disabled: "\"Esikäyttäjät\" on otettava käyttöön ennen tämän asetuksen käyttöönottoa."
+      reply_by_email_disabled: "Asetus \"reply by email\" täytyy ottaa käyttöön ennen tämän asetuksen käyttöönottoa."
   search:
     within_post: "#%{post_number} käyttäjältä %{username}"
     types:
       category: 'Alueet'
       topic: 'Tulokset'
       user: 'Käyttäjät'
+    results_page: "Tulokset hakusanalle '%{term}'"
   sso:
     login_error: "Virhe kirjauduttaessa"
     not_found: "Tiliäsi ei löydetty. Ota yhteyttä sivuston ylläpitäjään."
@@ -1390,7 +1433,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."
@@ -1470,7 +1513,8 @@ fi:
     email_too_long: "Antamasi sähköpostiosoite on liian pitkä. Mailbox nimi ei saa olla yli 254 merkkiä pitkä, eikä domain nimi yli 253 merkkiä pitkä."
     reserved_username: "Käyttäjänimi ei ole sallittu."
     missing_user_field: "Et ole täyttänyt kaikkia kenttiä"
-    close_window: "Kirjautuminen onnistui. Sulje tämä ikkuna jatkaaksesi."
+    auth_complete: "Todentaminen suoritettu."
+    click_to_continue: "Jatka klikkaamalla tästä."
     already_logged_in: "Hups, näyttää siltä, että yrität hyväksyä kutsun käyttäjänä, jolle sitä ei lähetetty. Jos et ole %{current_user}, kirjaudu ulos ja yritä uudestaan."
   user:
     no_accounts_associated: "Ei liittyviä käyttäjätilejä"
@@ -1482,7 +1526,7 @@ fi:
     username:
       short: "täytyy olla vähintään %{min} merkkiä"
       long: "ei saa olla yli %{max} merkkiä"
-      characters: "täytyy koostua vain numeroista, kirjaimista ja alaviivoista"
+      characters: "vain numerot, kirjaimet (A-Z, a-z), tavuviivat ja alaviivat sallittu"
       unique: "täytyy olla uniikki"
       blank: "pakollinen kenttä"
       must_begin_with_alphanumeric_or_underscore: "täytyy alkaa kirjaimella, numerolla tai alaviivalla"
@@ -1498,6 +1542,10 @@ fi:
       max_new_accounts_per_registration_ip: "Rekisteröitymisiä ei oteta vastaan IP-osoitteestasi (maksimimäärä saavutettu). Ota yhteyttä henkilökuntaan."
     website:
       domain_not_allowed: "Verkkosivu ei kelpaa. Sallitus verkkotunnukset ovat: %{domains}"
+    auto_rejected: "Hylättiin automaattisesti iän perusteella. Katso auto_handle_queued_age -sivustoasetus."
+    destroy_reasons:
+      unused_staged_user: "Käyttämätön esikäyttäjä"
+      same_ip_address: "Sama IP-osoite (%{ip_address}) kuin muilla käyttäjillä"
   flags_reminder:
     flags_were_submitted:
       one: "Viestejä liputettiin yli tunti sitten. [Tarkastele niitä](/admin/flags)."
@@ -1517,37 +1565,36 @@ fi:
       Jos haluat jatkossakin saada sähköposti-ilmoituksia, voit jättää tämän viestin huomiotta.
   invite_mailer:
     title: "Kutsu keskusteluun"
-    subject_template: "%{invitee_name} kutsui sinut ketjuun '%{topic_title}' sivustolla %{site_domain_name}"
-    text_body_template: |+
-      %{invitee_name} kutsui sinut keskusteluun
+    subject_template: "%{inviter_name} kutsui sinut ketjuun '%{topic_title}' sivustolla %{site_domain_name}"
+    text_body_template: |
+      %{inviter_name} kutsui sinut keskusteluun
 
       > **%{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}"
+    subject_template: "%{inviter_name} kutsui sinut ketjuun '%{topic_title}' sivustolla %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} kutsui sinut keskusteluun
+      %{inviter_name} kutsui sinut keskusteluun
 
       > **%{topic_title}**
       >
       > %{topic_excerpt}
 
-      keskustelupalstalla
+      sivustolla
 
       > %{site_title} -- %{site_description}
 
-      tällaisin saatesanoin:
+      Tällaisin saatesanoin
 
       > %{user_custom_message}
 
@@ -1556,9 +1603,9 @@ fi:
       %{invite_link}
   invite_forum_mailer:
     title: "Kutsu palstalle"
-    subject_template: "%{invitee_name} kutsui sinut sivustolle %{site_domain_name}"
+    subject_template: "%{inviter_name} kutsui sinut sivustolle %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} kutsui sinut liittymään sivustolle
+      %{inviter_name} kutsui sinut liittymään sivustolle
 
       > **%{site_title}**
       >
@@ -1569,9 +1616,9 @@ fi:
       %{invite_link}
   custom_invite_forum_mailer:
     title: "Kutsu palstalle saatesanoilla"
-    subject_template: "%{invitee_name} kutsui sinut sivustolle %{site_domain_name}"
+    subject_template: "%{inviter_name} kutsui sinut sivustolle %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} kutsui sinut liittymään sivustolle
+      %{inviter_name} kutsui sinut liittymään sivustolle
 
       > **%{site_title}**
       >
@@ -1667,7 +1714,7 @@ fi:
 
       - Päivitä käyttäen helppoa **[yhden klikkauksen päivitystä selaimessa](%{base_url}/admin/upgrade)**
 
-      - Tarkastele muutoksia [GitHubin muutoslokissa](https://github.com/discourse/discourse/commits/master)
+      - Katso mikä on uutta [julkaisutiedoista](https://meta.discourse.org/tags/release-notes) tai tutki [raakaa GitHubin muutoslokia](https://github.com/discourse/discourse/commits/master)
 
       - Käy osoitteessa [meta.discourse.org](https://meta.discourse.org) lukemassa uutisia ja keskustelua, tai hae apua Discourseen liittyen
   new_version_mailer_with_notes:
@@ -1681,22 +1728,13 @@ fi:
 
       - Päivitä käyttäen helppoa **[yhden klikkauksen päivitystä selaimessa](%{base_url}/admin/upgrade)**
 
-      - Tarkastele muutoksia [GitHubin muutoslokissa](https://github.com/discourse/discourse/commits/master)
+      - Katso mikä on uutta [julkaisutiedoista](https://meta.discourse.org/tags/release-notes) tai tutki [raakaa GitHubin muutoslokia](https://github.com/discourse/discourse/commits/master)
 
       - Käy osoitteessa [meta.discourse.org](https://meta.discourse.org) lukemassa uutisia ja keskustelua, tai hae apua Discourseen liittyen
 
       ### Julkaisutiedot
 
       %{notes}
-  queued_posts_reminder:
-    title: "Viestejä jonossa"
-    subject_template:
-      one: "[%{email_prefix}] 1 viesti odottaa hyväksyntää"
-      other: "[%{email_prefix}] %{count} viestiä odottaa hyväksyntää"
-    text_body_template: |
-      Hei,
-
-      Uusilta käyttäjiltä on hyväksyntää odottavia viestejä. [Niitä voi hyväksyä tai hylätä täällä](%{base_url}/queued-posts).
   flag_reasons:
     off_topic: "Viestisi liputettiin **eksyvän aiheesta**: koetaan, ettei se ei kuulu ketjun aiheeseen, jonka määrittelevät sen aloitusviesti ja otsikko."
     inappropriate: "Viestisi liputettiin **sopimattomaksi**: se koetaan loukkaavaksi, herjaavaksi tai [palstan sääntöjen](/guidelines) vastaiseksi."
@@ -1717,20 +1755,6 @@ fi:
     post_hidden:
       title: "Viesti piilotettu"
       subject_template: "Yhteisön piiloon liputtama viesti"
-      text_body_template: |
-        Hei,
-
-        Tämä automaattinen viesti lähetettiin sivustolta %{site_name} kertoaksemme sinulle, että viestisi on piilotettu.
-
-        %{base_url}%{url}
-
-        %{flag_reason}
-
-        Usea sivuston käyttäjä on liputtanut viestin ennen sen piilottamista, joten harkitse miten voisit muokata sitä heidän antamansa palautteen pohjalta. **Voit muokata viestiäsi, kun %{edit_delay} minuuttia on kulunut, jonka jälkeen se tulee taas näkyviin.**
-
-        Kuitenkin, jos viesti piilotetaan toisen kerran, se pysyy piilotettuna, kunnes henkilökunta selvittää tilanteen – josta voi olla muita seuraumuksia, kuten tilisi hyllyttäminen.
-
-        Saadaksesi lisätietoja, lue [yhteisön säännöt](%{base_url}/guidelines).
     usage_tips:
       text_body_template: |
         [Tässä blogikirjoituksessa](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/) on joitakin käteviä vinkkejä uudelle käyttäjälle.
@@ -1839,28 +1863,36 @@ fi:
     csv_export_failed:
       title: "CSV:n vienti epäonnistui"
       subject_template: "Datan vienti epäonnistui"
-      text_body_template: "Pahoittelemme, mutta datan vientisi epäonnistui. Tarkasta lokit tai ota yhteyttä henkilökuntaan."
+      text_body_template: "Pahoittelemme, mutta datan vienti epäonnistui. Tarkasta lokit tai [ota yhteyttä henkilökuntaan](%{base_url}/about)."
     email_reject_insufficient_trust_level:
       title: "Sähköposti hylätty - riittämätön luottamustaso"
       subject_template: "[%{email_prefix}] Sähköpostiongelma -- Riittämätön luottamustaso"
       text_body_template: |
-        Pahoittelut, sähköpostiviestiäsi tänne: %{destination} (otsikolla %{former_title}) ei voitu toimittaa.
+        Pahoittelut, sähköpostin lähettäminen kohteeseen %{destination} (otsikolla %{former_title}) ei onnistunut.
 
-        Tilisi luottamustaso ei ole riittävä, jotta saisit lähettää uusia ketjuja tähän sähköpostiosoitteeseen. Jos uskot, että tämä johtuu virheestä, ota yhteyttä henkilökuntaan.
+        Et voi lähettää uusia ketjunaloituksia tähän sähköpostiosoitteeseen, koska luottamustasosi ei riitä. Jos uskot, että tämä johtuu virheestä, [ota yhteyttä henkilökuntaan](%{base_url}/about).
     email_reject_user_not_found:
       title: "Sähköposti hylätty - käyttäjää ei löytynyt"
       subject_template: "[%{email_prefix}] Sähköpostiongelma -- Käyttäjää ei löytynyt"
       text_body_template: |
-        Pahoittelemme, mutta sähköpostin lähettäminen tänne %{destination} (otsikolla %{former_title}) ei onnistunut.
+        Pahoittelemme, mutta sähköpostin lähettäminen kohteeseen %{destination} (otsikolla %{former_title}) ei onnistunut.
 
-        Vastauksesi lähetettiin tuntemattomasta sähköpostiosoitteesta. Yritä lähettää viesti toisesta osoitteesta, tai ota yhteyttä henkilökuntaan.
+        Vastauksesi lähetettiin tuntemattomasta sähköpostiosoitteesta. Yritä lähettää viesti toisesta osoitteesta tai [ota yhteyttä henkilökuntaan](%{base_url}/about).
     email_reject_screened_email:
       title: "Sähköposti hylätty - estetty sähköpostiosoite"
       subject_template: "[%{email_prefix}] Sähköpostiongelma-- Estetty sähköpostiosoite"
       text_body_template: |+
         Pahoittelemme, mutta sähköpostin lähettäminen tänne %{destination} (otsikolla %{former_title}) ei onnistunut.
 
-        Viestisi lähetettiin estetystä sähköpostiosoitteesta. Yritä lähettää viesti toisesta sähköpostiosoitteesta tai ota yhteyttä henkilökuntaan.
+        Vastauksesi lähetettiin estetystä sähköpostiosoitteesta. Yritä lähettää viesti toisesta sähköpostiosoitteesta tai  [ota yhteyttä henkilökuntaan](%{base_url}/about).
+
+    email_reject_not_allowed_email:
+      title: "Sähköposti hylätty - osoite ei sallittu"
+      subject_template: "[%{email_prefix}] Sähköpostiongelma -- Estetty osoite"
+      text_body_template: |
+        Pahoittelemme, mutta sähköpostin lähettäminen tänne %{destination} (otsikolla %{former_title}) ei onnistunut.
+
+        Vastauksesi on peräisin estetystä sähköpostiosoitteesta. Kokeile lähettää toisesta sähköpostiosoitteesta tai [ota yhteyttä henkilökuntaan](%{base_url}/about).
     email_reject_inactive_user:
       title: "Sähköposti hylätty - aktivoimaton käyttäjä"
       subject_template: "[%{email_prefix}] Sähköpostiongelma -- Aktivoimaton käyttäjä"
@@ -1868,27 +1900,27 @@ fi:
         Pahoittelemme, mutta sähköpostin lähettäminen tänne %{destination} (otsikolla %{former_title}) ei onnistunut.
 
         Käyttäjätiliä tällä sähköpostiosoitteella ei ole aktivoitu. Aktivoi käyttäjätili ennen sähköpostien lähettämistä.
-    email_reject_blocked_user:
-      title: "Sähköposti hylätty - estetty käyttäjä"
-      subject_template: "[%{email_prefix}] Sähköpostiongelma-- Estetty käyttäjä"
+    email_reject_silenced_user:
+      title: "Sähköposti hylätty - hiljennetty käyttäjä"
+      subject_template: "%{email_prefix} Sähköpostiongelma - Hiljennetty käyttäjä"
       text_body_template: |
-        Pahoittelemme, mutta sähköpostiviesetisi tänne  %{destination} (otsikolla %{former_title}) ei onnistunut.
+        Pahoittelut, sähköpostin lähettäminen kohteeseen %{destination} (titled %{former_title}) ei onnistunut.
 
-        Käyttäjätili tällä sähköpostiosoitteella on estetty.
+        Tähän sähköpostiosoitteeseen liittyvä tilisi on hiljennetty.
     email_reject_reply_user_not_matching:
       title: "Sähköposti hylätty - käyttäjä ei täsmää"
       subject_template: "[%{email_prefix}] Sähköpostiongelma -- Vastaus odottamattomasta osoitteesta"
       text_body_template: |
-        Pahoittelut, sähköpostiviestisi lähetys kohteeseen %{destination} (titled %{former_title}) ei onnistunut.
+        Pahoittelut, sähköpostin lähettäminen kohteeseen %{destination} (titled %{former_title}) ei onnistunut.
 
-        Viestisi ei saapunut siitä sähköpostiosoitteesta josta odotimme, joten emme voineet olla varmoja lähettäjästä. Kokeile lähettää viestisi toisesta sähköpostiosoitteesta tai ota yhteyttä henkilökuntaan.
+        Vastauksesi ei saapunut siitä sähköpostiosoitteesta kuin odotimme, joten emme voineet olla varmoja lähettäjästä. Kokeile lähettää viestisi toisesta sähköpostiosoitteesta tai [ota yhteyttä henkilökuntaan](%{base_url}/about).
     email_reject_no_account:
       title: "Sähköposti hylätty - ei käyttäjätiliä"
       subject_template: "[%{email_prefix}] Sähköpostiongelma -- Tuntematon tili"
       text_body_template: |
         Pahoittelut, sähköpostiviestisi lähetys kohteeseen %{destination} (titled %{former_title}) ei onnistunut.
 
-        Sähköpostiosoitteesi ei vastaa yhtäkään käyttäjistä. Kokeile lähettää viestisi toisesta sähköpostiosoitteesta tai ota yhteyttä henkilökuntaan.
+        Sähköpostiosoitteesi ei kuulu kenellekään käyttäjistä. Kokeile lähettää viestisi toisesta sähköpostiosoitteesta tai [ota yhteyttä henkilökuntaan](%{base_url}/about)..
     email_reject_empty:
       title: "Sähköposti hylätty - tyhjä"
       subject_template: "[%{email_prefix}] Sähköpostiongelma -- Ei sisältöä"
@@ -1911,14 +1943,14 @@ fi:
       text_body_template: |
         Pahoittelut, sähköpostiviestiäsi tänne: %{destination} (otsikolla %{former_title}) ei voitu toimittaa.
 
-        Tilisi luottamustaso ei ole riittävä, jotta saisit luoda uusia ketjuja tälle alueelle. Jos uskot, että tämä johtuu virheestä, ota yhteyttä henkilökuntaan.
+        Käyttäjätililläsi ei ole oikeutta aloittaa ketjua sillä alueella. Jos uskot, että tämä johtuu virheestä, [ota yhteyttä henkilökuntaan](%{base_url}/about).
     email_reject_strangers_not_allowed:
       title: "Sähköposti hylätty - vierailla ei pääsyä"
       subject_template: "[%{email_prefix}] Sähköpostiongelma -- Ei pääsyoikeutta"
       text_body_template: |
         Pahoittelut, sähköpostiviestisi lähetys kohteeseen %{destination} (otsikolla %{former_title}) ei onnistunut.
 
-        Alueelle jolle lähetit viestin voivat kirjoittaa ne, joilla on käypä käyttäjätunnus ja sähköpostiosoite. Jos uskot tämän olevan virhe, ota yhteyttä henkilökuntaan.
+        Alueelle jolle lähetit viestin voivat kirjoittaa ne, joilla on käypä käyttäjätunnus ja sähköpostiosoite. Jos uskot, että tämä johtuu virheestä, [ota yhteyttä henkilökuntaan](%{base_url}/about).
     email_reject_invalid_post:
       title: "Sähköposti hylätty - viesti ei kelpaa"
       subject_template: "[%{email_prefix}] Sähköpostiongelma -- Lähetysvirhe"
@@ -1950,35 +1982,42 @@ fi:
       text_body_template: |
         Pahoittelut, sähköpostiviestisi lähetys kohteeseen %{destination} (titled %{former_title}) ei onnistunut.
 
-        Sähköpostiviestin vastaustunniste, engl. 'reply key', ei ole kelvollinen, minkä vuoksi ei tiedetä, mihin asiaan viestisi oli tarkoitus vastata. Ota yhteyttä henkilökuntaan.
+        Sähköpostiviestin vastaustunniste, engl. 'reply key', ei ole kelvollinen, minkä vuoksi ei tiedetä, mihin asiaan viestisi oli tarkoitus vastata. [Ota yhteyttä henkilökuntaan](%{base_url}/about).
     email_reject_bad_destination_address:
       title: "Sähköposti hylätty - tuntematon vastaanottajaosoite"
       subject_template: "[%{email_prefix}] Sähköpostiongelma -- Tuntematon Vastaanottaja: -osoite"
       text_body_template: |
-        Pahoittelut, sähköpostiviestisi lähetys kohteeseen %{destination} (titled %{former_title}) ei onnistunut.
+        Pahoittelut, sähköpostin lähettäminen kohteeseen %{destination} (titled %{former_title}) ei onnistunut.
 
-        Viestisi kohdesähköpostiosoitteet olivat tuntemattomia. Ole hyvä ja varmistu, että lähetit viestin oikeaan osoitteeseen.
+        Viestisi kohdesähköpostiosoitteet olivat tuntemattomia tai sähköpostiviestin ID-otsikkotietoa (engl. Message-ID) on muutettu. Varmistu, että lähetät oikeaan henkilökunnan antamaan sähköpostiosoitteeseen.
     email_reject_topic_not_found:
       title: "Sähköposti hylätty - ketjua ei löytynyt"
       subject_template: "[%{email_prefix}] Sähköpostiongelma -- Ketjua ei löytynyt"
       text_body_template: |
         Pahoittelut, sähköpostiviestisi lähetys kohteeseen %{destination} (otsikolla %{former_title}) ei onnistunut.
 
-        Ketjua johon yritit kirjoittaa ei ole enää olemassa -- ehkä se poistettiin? Jos uskot tämän olevan virhe, ota yhteyttä henkilökuntaan.
+        Ketjua johon yritit kirjoittaa ei ole enää olemassa -- ehkä se poistettiin? Jos uskot, että tämä johtuu virheestä, [ota yhteyttä henkilökuntaan](%{base_url}/about).
     email_reject_topic_closed:
       title: "Sähköposti hylätty - ketju suljettu"
       subject_template: "[%{email_prefix}] Sähköpostiongelma -- Suljettu ketju"
       text_body_template: |
         Pahoittelut, sähköpostiviestiäsi tänne: %{destination} (otsikolla %{former_title}) ei voitu toimittaa.
 
-        Ketju, johon yritit vastata on tällä hetkellä suljettu, eikä siihen voi vastata. Jos uskot, että on tapahtunut virhe, ota yhteyttä palstan henkilökuntaan.
+        Ketju, johon yritit vastata on tällä hetkellä suljettu, eikä siihen voi enää vastata. Jos uskot, että tämä johtuu virheestä, [ota yhteyttä henkilökuntaan](%{base_url}/about).
     email_reject_auto_generated:
       title: "Sähköposti hylätty - automaattivastaus"
       subject_template: "[%{email_prefix}] Sähköpostiongelma -- Automaattivastaus"
       text_body_template: |
         Pahoittelut, sähköpostiviestisi lähetys kohteeseen %{destination} (otsikolla %{former_title}) ei onnistunut.
 
-        Järjestelmä havaitsi viestisi olevan tietokoneen automaattisesti luoma, eikä ihmisen kirjoittama, eikä sitä voitu siksi hyväksyä. Jos uskot tämän olevan virhe, ota yhteyttä henkilökuntaan.
+        Järjestelmä havaitsi viestisi olevan tietokoneen automaattisesti luoma eikä ihmisen kirjoittama, eikä viestiä voitu siksi hyväksyä. Jos uskot, että tämä johtuu virheestä, [ota yhteyttä henkilökuntaan](%{base_url}/about).
+    email_reject_unrecognized_error:
+      title: "Sähköposti hylätty - Tunnistamaton virhe"
+      subject_template: "[%{email_prefix}] Sähköpostiongelma -- Tunnistamaton virhe"
+      text_body_template: |
+        Pahoittelut, sähköpostiviestisi lähetys kohteeseen %{destination} (otsikolla %{former_title}) ei onnistunut.
+
+        Viestiäsi käsiteltäessä tapahtui tunnistamaton virhe eikä sitä siksi julkaistu. Kokeile uudelleen tai [ota yhteyttä henkilökuntaan](%{base_url}/about).
     email_error_notification:
       title: "Ilmoitus sähköpostivirheestä"
       subject_template: "[%{email_prefix}] Sähköpostiongelma -- virhe POP-autentikoinnissa"
@@ -1994,64 +2033,64 @@ fi:
       text_body_template: |
         Hei,
 
-        Tämä automaattinen viesti on lähetetty sivustolta %{site_name} kertoaksemme, että viestejäsi on väliakaisesti piilotettu yhteisön liputusten perusteella.
+        Lähetämme tämän automaattisen viestin sivustolta %{site_name} kertoaksemme, että viestejäsi on väliakaisesti piilotettu yhteisön liputusten perusteella.
 
-        Varotoimena uudelta tililtäsi ei voi vastata tai luoda uusia ketjuja ennen kuin henkilökunnan jäsen tarkastaa sen. Pahoittelemme tästä aiheutuvaa vaivaa.
+        Varotoimena uusi käyttäjätilisi on hiljennetty etkä voi vastata etkä aloittaa uusia ketjuja ennen kuin henkilökunnan jäsen arvioi tilanteen. Pahoittelemme tästä aiheutuvaa vaivaa.
 
-        Saadaksesi lisätietoa, tutustu [yhteisön ohjeisiin](%{base_url}/guidelines).
+        Saat lisätietoa [yhteisön ohjeista](%{base_url}/guidelines).
     too_many_tl3_flags:
       title: "Liian monta lt3-lippua"
       subject_template: "Uusi tili on estetty"
       text_body_template: |
         Hei,
 
-        Tämä automaattinen viesti on lähetetty sivustolta %{site_name} kertoaksemme, että tilisi on jäädytetty yhteisön useiden liputusten perusteella.
+        Lähetämme tämän automaattisen viestin sivustolta %{site_name} kertoaksemme, että käyttäjätilisi on jäädytetty yhteisön liputusten perusteella.
 
-        Varotoimena uudelta tililtäsi ei voi vastata tai luoda uusia ketjuja ennen kuin henkilökunnan jäsen tarkastaa sen. Pahoittelemme tästä aiheutuvaa vaivaa.
+        Varotoimena uusi käyttäjätilisi on hiljennetty etkä voi vastata etkä aloittaa uusia ketjuja ennen kuin henkilökunnan jäsen arvioi tilanteen. Pahoittelemme tästä aiheutuvaa vaivaa.
 
-        Saadaksesi lisätietoa, tutustu [yhteisön ohjeisiin](%{base_url}/guidelines).
-    blocked_by_staff:
-      title: "Henkilökunta esti"
-      subject_template: "Tili on väliaikaisesti estetty"
+        Saat lisätietoa [yhteisön ohjeista](%{base_url}/guidelines).
+    silenced_by_staff:
+      title: "Henkilökunta hiljensi"
+      subject_template: "Tili väliaikaisesti jäädytetty"
       text_body_template: |
         Hei,
 
-        Tämä automaattinen viesti on lähetetty sivustolta %{site_name} kertoaksemme, että tilisi on jäädytetty väliaikaisesti varotoimenpiteenä.
+        Lähetämme tämän automaattisen viestin sivustolta %{site_name} kertoaksemme, että käyttäjätilisi on jäädytetty yhteisön liputusten perusteella.
 
-        Voit jatkaa selailua, muttet voi vastata tai luoda uusia ketjuja ennen kuin [henkilökunnan jäsen](%{base_url}/about) tarkastaa viimeisimmät viestisi. Pahoittelemme tästä aiheutuvaa vaivaa.
+        Voit jatkaa selailua, muttet voi vastata etkä aloittaa uusia ketjuja ennen kuin henkilökunnan jäsen arvioi tilanteen. Pahoittelemme tästä aiheutuvaa vaivaa.
 
-        Saadaksesi lisätietoa, tutustu [yhteisön ohjeisiin](%{base_url}/guidelines).
-    user_automatically_blocked:
-      title: "Käyttäjä estetty automaattisesti"
-      subject_template: "Uusi käyttäjä %{username} on estetty yhteisön liputusten perusteella"
+        Saat lisätietoa [yhteisön ohjeista](%{base_url}/guidelines).
+    user_automatically_silenced:
+      title: "Käyttäjä hiljennettiin automaattisesti"
+      subject_template: "Yhteisön liputukset hiljensivät uuden käyttäjän %{username}"
       text_body_template: |
         Tämä on automaattinen viesti.
 
-        Uusi käyttäjätili [%{username}](%{user_url}) estettiin, koska monet liputtivat käyttäjän %{username} viestin tai viestejä.
+        Uusi käyttäjä [%{username}](%{user_url}) hiljennettiin automaattisesti, koska useampi käyttäjä liputti  hänen viestinsä tai viestejänsä.
 
-        [Tarkastele liputettuja viestejä](%{base_url}/admin/flags). Jos käyttäjä %{username} estettiin aiheettomasti, klikkaa poista esto -painiketta [tähän käyttäjään liittyvällä ylläpitäjän sivulla](%{user_url}).
+        [Arvioi liputukset](%{base_url}/admin/flags). Jos %{username} hiljennettiin eli viestien kirjoittaminen estettiin ilman syytä. kumoa hiljennys klikkaamalla painiketta [käyttäjän ylläpitosivulla](%{user_url}).
 
-        Kynnysarvoa voi muuttaa säätämällä asetuksen `block_new_user` arvoa sivuston asetuksissa.
+        Rajaa voi muuttaa sivustoasetuksella `silence_new_user.
     spam_post_blocked:
-      title: "Roskapostiviesti estetty"
-      subject_template: "Uuden käyttäjän %{username} viestit on estetty toistuvien linkkien vuoksi"
+      title: "Roskapostiviesti estettiin"
+      subject_template: "Uuden käyttäjän %{username} viestit estettiin toistuvien linkkien vuoksi"
       text_body_template: |
-        Tämä on automaattisesti luotu viesti.
+        Tämä on automaattinen viesti.
 
-        Uusi käyttäjä [%{username}](%{user_url}) yritti luoda useita viestejä, jotka sisälsivät linkkejä osoitteeseen %{domains}, mutta jotka estettiin roskapostin välttämiseksi. Käyttäjä voi edelleen luoda viesteijä, joissa ei ole linkkejä näihin osoitteisiin %{domains}.
+        Uusi käyttäjä [%{username}](%{user_url}) yritti lähettää useita viestejä, joissa oli linkkejä kohteeseen %{domains}, mutta viestit estettiin roskapostin ehkäisemiseksi.
 
-        [Tarkasta käyttäjätili](%{user_url}).
+        [Arvioi käyttäjä]%{user_url}.
 
-        Tätä toimintoa voi muokata vaihtamalla asetuksia `newuser_spam_host_threshold`  `white_listed_spam_host_domains` sivuston asetuksissa.
-    unblocked:
-      title: "Ei enää estetty"
-      subject_template: "Tili avattu"
+        Tätä voi muuttaa sivustoasetuksilla `newuser_spam_host_threshold` ja `white_listed_spam_host_domains`.
+    unsilenced:
+      title: "Hiljennys kumottu"
+      subject_template: "Käyttäjätili ei ole enää jäädytetty"
       text_body_template: |
         Hei,
 
-        Tämä automaattinen viesti on lähetetty sivustolta %{site_name} kertoaksemme, että tilisi on avattu henkilökunnan tarkastettua tilanteen.
+        Tämä on automaattinen viesti sivustolta %{site_name} kertoaksemme, ettei käyttäjätilisi ole enää jäädytetty henkilökunnan arvioinnin jälkeen.
 
-        Voit jälleen luoda uusia viestejä ja ketjuja. Kiitos kärsivällisyydestänne.
+        Voit nyt jälleen kirjoittaa vastauksia ja aloittaa ketjuja. Kiitos kärsivällisyydestäsi.
     pending_users_reminder:
       title: "Käyttäjiä jonossa"
       subject_template:
@@ -2076,11 +2115,20 @@ fi:
       title: "Olet kuukauden tulokas!"
       subject_template: "Olet kuukauden tulokas!"
       text_body_template: |
-        Onneksi olkoon, olet ansainnut Kuukauden tulokas -palkinnon %{month_year}** :trophy:
+        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](%{url}).
 
         Sinusta on äkkiä tullut tärkeä osa yhteisöä. Kiitos kun liityit, ja jatka samaa rataa!
+    queued_posts_reminder:
+      title: "Muistutukset jonossa olevista viesteistä"
+      subject_template:
+        one: "Yksi viesti odottaa tarkastusta"
+        other: "%{count} viestiä odottaa tarkastusta"
+      text_body_template: |
+        Hei
+
+        Uusien käyttäjien viestejä odottaa valvojan hyväksyntää. [Hyväksy tai hylkää ne täällä](%{base_url}/queued-posts).
   unsubscribe_link: |
     Jos et enää halua näitä viestejä, [klikkaa tästä](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -2106,6 +2154,16 @@ fi:
     visit_link_to_respond: "[Vieraile ketjussa](%{base_url}%{url}) vastataksesi."
     visit_link_to_respond_pm: "[Vieraile ketjussa](%{base_url}%{url}) vastataksesi."
     posted_by: "Käyttäjältä %{username} %{post_date}"
+    invited_group_to_private_message_body: |
+      %{username} kutsui ryhmän @%{group_name} yksityiskeskusteluun
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      sivustolla
+
+      > %{site_title} -- %{site_description}
     invited_to_private_message_body: |
       %{username} kutsui sinut yksityiskeskusteluun
 
@@ -2117,7 +2175,7 @@ fi:
 
       > %{site_title} -- %{site_description}
     invited_to_topic_body: |
-      %{username} kutsui sinut keskusteluun
+      %{username} kustui sinut keskusteluun
 
       > **%{topic_title}**
       >
@@ -2126,6 +2184,15 @@ fi:
       sivustolla
 
       > %{site_title} -- %{site_description}
+    user_invited_to_private_message_pm_group:
+      title: "Ryhmä kutsuttiin yksityiskeskusteluun"
+      subject_template: "[%{email_prefix}] %{username} kutsui ryhmän %{group_name} yksityiskeskusteluun '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
     user_invited_to_private_message_pm:
       title: "Käyttäjä kutsuttiin yksityiskeskusteluun"
       subject_template: "[%{email_prefix}] %{username} kutsui sinut yksityiskeskusteluun '%{topic_title}'"
@@ -2258,6 +2325,35 @@ fi:
       text_body_template: |2
 
         %{message}
+    account_suspended:
+      title: "Tili hyllytetty"
+      subject_template: "[%{email_prefix}] Tilisi on hyllytetty"
+      text_body_template: |
+        Sinut hyllytettiin palstalta %{suspended_till} asti.
+
+        %{reason}
+
+        %{message}
+    account_silenced:
+      title: "Käyttäjätili hiljennetty"
+      subject_template: "[%{email_prefix}] Tilisi on hiljennetty"
+      text_body_template: |
+        Sinut on hiljennetty palstalta %{silenced_till} asti.
+
+        %{reason}
+
+        %{message}
+    account_exists:
+      title: "Tili on jo olemassa"
+      subject_template: "[%{email_prefix}] TIli on jo olemassa"
+      text_body_template: |
+        Yritit luoda tilin sivustolle %{site_name} tai yritit muuttaa tilin sähköpostiosoitteeksi %{email}. Sähköpostiosoitteella %{email} on kuitenkin jo tili olemassa.
+
+        Jos unohdit salasanasi, [voit uusia sen nyt](%{base_url}/password-reset).
+
+        Jos et yrittänyt luoda tunnusta sähköpostiosoitteella %{email} tai vaihtaa sähköpostiosoitettasi, älä huoli - voit huoletta jättää tämän viestin huomiotta.
+
+        Jos sinulla on kysyttävää, [ota yhteyttä avuliaaseen henkilökuntaamme](%{base_url}/about).
     digest:
       why: "Lyhyt kooste siitä mitä on tapahtunut sivustolla %{site_link} viimeisimmän vierailusi jälkeen %{last_seen_at}."
       since_last_visit: "Viime vierailusi jälkeen"
@@ -2273,8 +2369,9 @@ 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}."
-      click_here: "klikkaa tästä"
+      unsubscribe: "Tämä kooste lähetettiin sivustolta %{site_link}, koska sinua ei ole näkynyt vähään aikaan. Voit perua tilauksen muuttamalla %{email_preferences_link} tai %{unsubscribe_link} peruaksesi tilauksen."
+      your_email_settings: "sähköpostiasetuksiasi"
+      click_here: "klikkaa tätä"
       from: "%{site_name} kooste"
       preheader: "Lyhyt yhteenveto tapahtumista viime vierailusi (%{last_seen_at}) jälkeen"
     forgot_password:
@@ -2374,10 +2471,13 @@ fi:
     see_more: "Lisää"
     search_title: "Etsi tältä sivustolta"
     search_google: "Google"
+  offline:
+    title: "Sovellusta ei voida ladata"
+    offline_page_message: "Yhteydessäsi vaikuttaa olevan vikaa! Tarkista verkkoyhteytesi ja yritä uudelleen."
   login_required:
     welcome_message: |
-      #[Tervetuloa sivustolle %{title}](#welcome)
-      Käyttäjätunnus tarvitaan. Ole hyvä ja luo tunnus tai kirjaudu sisään jatkaaksesi.
+      ## [Tervetuloa sivustolle %{title}](#welcome)
+      Käyttäjätili tarvitaan. Luo tili tai kirjaudu sisään.
   terms_of_service:
     title: "Käyttöehdot"
     signup_form_message: 'Olen lukenut ja ymmärtänyt <a href="/tos" target="_blank">Käyttöehdot</a>.'
@@ -2396,10 +2496,12 @@ fi:
       too_large: "Pahoittelut, kuva jonka yritit ladata on liian suuri (suurin sallittu kuvakoko on %{max_size_kb}KB), pienennä kuvaa ja yritä uudestaan."
       larger_than_x_megapixels: "Pahoittelut, kuva jota yrität lähettää on liian suuri (maksimikoko on %{max_image_megapixels} megapikseliä). Muuta kuvan kokoa ja yritä uudelleen."
       size_not_found: "Pahoittelut, mutta emme pystyneet selvittämään kuvan kokoa. Ehkä kuvatiedosto on vahingoittunut?"
+    placeholders:
+      too_large: "(kuva on suurempi kuin %{max_size_kb}KB)"
   avatar:
     missing: "Pahoittelut, emme löydä profiilikuvaa, joka olisi yhdistetty tähän sähköpostiosoitteeseen. Voitko yrittää ladata sen uudestaan?"
   flag_reason:
-    sockpuppet: "Uusi käyttäjä loi ketjun, johon toinen uusi käyttäjä samasta IP-osoitteesta (%{ip_address}) vastasi. Katso asetus <a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
+    sockpuppet: "Uusi käyttäjä aloitti ketjun, johon toinen uusi käyttäjä samasta IP-osoitteesta (%{ip_address}) vastasi. Katso asetus <a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
     spam_hosts: "Tämä uusi käyttäjä yritti luoda useita viestejä, jotka sisälsivät linkkejä samaan verkkotunnukseen (%{domain}). Katso asetus <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   email_log:
     post_user_deleted: "Viestin käyttäjä on poistettu"
@@ -2637,7 +2739,7 @@ fi:
       name: Konkari
       description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Myönnetty</a> kutsut, ryhmäviestit ja lisää tykkäyksiä
       long_description: |
-        Tämä ansiomerkki myönnetään, kun nouset luottamustasolle 2. Kiitos siitä, että olet ollut keskuudessamme viikkojen ajan ja tullut osaksi yhteisöä. Voit nyt lähettää kutsuja käyttäjäsivultasi ja ketjuista, luoda ryhmäviestejä ja käytössäsi on muutama tykkäys enemmän päivää kohden.
+        Tämä ansiomerkki myönnetään, kun nouset luottamustasolle 2. Kiitos siitä, että olet ollut keskuudessamme viikkojen ajan ja tullut osaksi yhteisöä. Voit nyt lähettää kutsuja käyttäjäsivultasi ja ketjuista, aloittaa ryhmäviestejä ja käytössäsi on muutama tykkäys enemmän päivää kohden.
     regular:
       name: Mestari
       description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Myönnetty</a> ketjujen siirto toiselle alueelle ja uudelleen nimeäminen, hakukoneiden seuraamat linkit, wiki-viestit ja lisää tykkäyksiä
@@ -2655,14 +2757,14 @@ fi:
         Tämä ansiomerkki myönnetään, kun viestistäsi tykätään ensi kertaa. Onnittelut, olet tuottanut jotakin, mitä toinen käyttäjä on pitänyt mielenkiintoisena, hauskana tai hyödyllisenä!
     autobiographer:
       name: Omaelämäkerta
-      description: Täytti <a href="/my/preferences">käyttäjätiedot</a>
+      description: Täytti <a href="%{base_uri}/my/preferences/profile">käyttäjätiedot</a>
       long_description: |
-        Tämä ansiomerkki myönnetään , kun täytät <a href="/my/preferences">käyttäjätiedot</a> ja valitset profiilikuvan. Kertomalla hieman itsestäsi ja kiinnostuksen kohteistasi edistät yhteisöllisyyttä. Liity meihin!
+        Tämä ansiomerkki myönnetään, kun täytät <a href="%{base_uri}/my/preferences/profile">käyttäjätiedot</a> ja valitset profiilikuvan. Kertomalla hieman itsestäsi ja kiinnostuksen kohteistasi edistät yhteisöllisyyttä. Liity meihin!
     anniversary:
       name: Vuosipäivä
       description: Aktiivinen jäsen vuoden ajan, kirjoittanut ainakin yhden viestin
       long_description: |
-        Tämä ansiomerkki myönnetään, kun olet ollut jäsen vuoden ajan ja kirjoittanut sinä aikana ainakin yhden viestin. Kiitos, kun olet yhä keskuudessamme ja antanut panoksesi yhteisön hyväksi. Emme pärjäisi ilman sinua.
+        Tämä ansiomerkki myönnetään aina, kun olet jäsenenä vuoden ajan ja kirjoitat sinä aikana ainakin yhden viestin. Kiitos, kun olet yhä keskuudessamme ja antanut panoksesi yhteisön hyväksi. Emme pärjäisi ilman sinua.
     nice_post:
       name: Hyvä vastaus
       description: Vastaus sai 10 tykkäystä
@@ -2682,17 +2784,17 @@ fi:
       name: Hyvä ketju
       description: Ketjunavaus sai 10 tykkäystä
       long_description: |
-        Tämä ansiomerkki myönnetään, kun luomasi ketju saa 10 tykkäystä. Aloitit kiintoisan keskustelun, josta yhteisö nautti!
+        Tämä ansiomerkki myönnetään, kun ketjunaloituksesi saa 10 tykkäystä. Aloitit kiintoisan keskustelun, josta yhteisö nautti!
     good_topic:
       name: Erinomainen ketju
       description: Ketjunavaus sai 25 tykkäystä
       long_description: |
-        Tämä ansiomerkki myönnetään, kun luomasi ketju saa 25 tykkäystä. Aloitit vilkkaan keskustelun, jota yhteisö rakasti!
+        Tämä ansiomerkki myönnetään, kun ketjunaloituksesi saa 25 tykkäystä. Aloitit vilkkaan keskustelun, jota yhteisö rakasti!
     great_topic:
       name: Loistava ketju
       description: Ketjunavaus sai 50 tykkäystä
       long_description: |+
-        Tämä ansiomerkki myönnetään, kun luomasi ketju saa 50 tykkäystä. Aloitit kiehtovan keskustelun, jossa vaihdetuista ajatuksista yhteisö nautti!
+        Tämä ansiomerkki myönnetään, kun ketjunaloituksesi saa 50 tykkäystä. Aloitit kiehtovan keskustelun, jossa vaihdetuista ajatuksista yhteisö nautti!
 
     nice_share:
       name: Hyvä jako
@@ -2752,9 +2854,9 @@ fi:
         Tämä ansiomerkki myönnetään, kun ensi kerran lainaat viestiä vastauksessasi. Edellisten viestien olennaisten osien lainaaminen auttaa pitämään keskustelun yhtenäisenä ja aiheen mukaisena. Helpoin tapa on maalata viestin osa ja sitten painaa vastaa-painiketta. Lainaa runsaasti!
     read_guidelines:
       name: Luki ohjeet
-      description: Luki <a href="/guidelines">palstan säännöt</a>
+      description: Luki <a href="%{base_uri}/guidelines">yhteisön säännöt</a>
       long_description: |
-        Tämä ansiomerkki myönnetään, kun <a href="/guidelines">luet yhteisön ohjeet </a>. Noudattamalla ja jakamalla näitä yksinkertaisia ohjeita edistät yhteisön turvallisuutta, viihtyisyyttä ja jatkuvuutta. Muista aina, että toisessa päässä on toinen ihminen, hyvin itsesi kaltainen. Ole kohtelias!
+        Tämä ansiomerkki myönnetään, kun <a href="%{base_uri}/guidelines">luet yhteisön säännöt</a>. Noudattamalla ja jakamalla näitä yksinkertaisia ohjeita edistät yhteisön turvallisuutta, viihtyisyyttä ja jatkuvuutta. Muista aina, että toisessa päässä on toinen ihminen, hyvin itsesi kaltainen. Ole kohtelias!
     reader:
       name: Lukutoukka
       description: Luki jokaisen viestin ketjusta, jossa on enemmän kuin 100 vastausta
@@ -2843,6 +2945,18 @@ fi:
       description: Erinomaista osallistumista ensimmäisen kuukauden aikana
       long_description: |
         Tämä ansiomerkki myönnetään kahdelle uudelle käyttäjälle joka kuukausi kiitoksena erinomaisesta osallistumisestaan. Mittari on tykkäykset: kuinka usein viesteistä tykätään ja kuka tykkää.
+    enthusiast:
+      name: Intoilija
+      description: Vieraili 10 päivänä
+      long_description: Tämä ansiomerkki myönnetään, kun olet vieraillut 10 peräkkäisenä päivänä. Kiitos kun olet ollut kanssamme yli viikon ajan!
+    aficionado:
+      name: Hullaantunut
+      description: Vieraili 100 päivänä
+      long_description: Tämä ansiomerkki myönnetään, kun olet vieraillut 100 peräkkäisenä päivänä. Sehän on yli kolme kuukautta!
+    devotee:
+      name: Omistautunut
+      description: Vieraili 365 päivänä
+      long_description: Tämä ansiomerkki myönnetään, kun olet vieraillut 365 peräkkäisenä päivänä. Vau, kokonainen vuosi!
     badge_title_metadata: "%{display_name} -ansiomerkki sivustolla %{site_title}"
   admin_login:
     success: "Sähköposti lähetetty"
@@ -2877,6 +2991,7 @@ fi:
     only_official: "Poista käytöstä epäviralliset lisäosat"
     no_plugins: "Poista käytöstä kaikki lisäosat"
     enter: "Siirry vikasietotilaan"
+    must_select: "Ainakin yksi on valittava, jotta voi siirtyä vikasietotilaan."
   wizard:
     title: "Discoursen asennus"
     step:
@@ -2887,7 +3002,7 @@ fi:
             description: "Mikä on yhteisösi oletuskieli?"
       forum_title:
         title: "Nimi"
-        description: "Nimi on merkittävä asia, sillä se on <i>ensimmäinen</i>asia, jonka potentiaalinen vierailija saa tietää yhteisöstäsi. Mitä valitsemasi nimi kertoo yhteisöstä?"
+        description: "Nimi on merkittävä asia, sillä se on <i>ensimmäinen</i> asia, jonka potentiaalinen vierailija saa tietää yhteisöstäsi. Mitä valitsemasi nimi kertoo yhteisöstä?"
         fields:
           title:
             label: "Yhteisösi nimi"
@@ -2900,7 +3015,7 @@ fi:
         fields:
           welcome:
             label: "Tervetuloa-ketju"
-            description: "<p>How Kuinka kuvailisit yhteisöä hississä ventovieraalle, jos sinulla olisi minuutti aikaa?</p> <ul> <li>Keille nämä keskustelut on suunnattu?</li> <li>Mistä täällä puhutaan?</li> <li>Miksi täällä kannattaa käydä?</li> </ul> <p>Tervetuloa-ketju on ensimmäinen asia, jonka palstalle saapunut näkee. Ajattele sitä <b>yhden kappaleen mittaisena</b> \"hissipuheena\" tai \"perimmäisenä tavoitteena\".</p>"
+            description: "<p>Kuinka kuvailisit yhteisöä hississä ventovieraalle, jos sinulla olisi minuutti aikaa?</p> <ul> <li>Keille nämä keskustelut on suunnattu?</li> <li>Mistä täällä puhutaan?</li> <li>Miksi täällä kannattaa käydä?</li> </ul> <p>Tervetuloa-ketju on ensimmäinen asia, jonka palstalle saapunut näkee. Ajattele sitä <b>yhden kappaleen mittaisena</b> \"hissipuheena\" tai \"perimmäisenä tavoitteena\".</p>"
             one_paragraph: "Pidä tervetuloviesti yhden kappaleen mittaisena."
       privacy:
         title: "Käyttöoikeudet"
@@ -2927,7 +3042,7 @@ fi:
             description: "Sinun tai organisaatiosi yleinen yhteydenottosivu. Näytetään <a href='/about' target='_blank'>Tietoja-sivulla</a>."
           site_contact:
             label: "Automaattiset viestit"
-            description: "Tämän käyttäjän nimissä Discourse lähettää käyttäjille kaikki automaattiset yksityisviestit, kuten uudelle käyttäjälle lähetettävän tervetulotoivotuksen. "
+            description: "Tämän käyttäjän nimissä Discourse lähettää käyttäjille kaikki automaattiset yksityisviestit, kuten liputusvaroitukset ja ilmoitukset valmistuneista varmuuskopioista."
       corporate:
         title: "Organisaatio"
         description: "Nämä nimet näkyvät <a href='/privacy' target='blank'>rekisteriselosteen</a> ja <a href='/tos' target='blank'>käyttöehtojen</a> yhteydessä, joita voit milloin vain muokata henkilökunta-alueella. Jos taustalla ei ole yritystä, voit hypätä tämän vaiheen yli toistaiseksi."
@@ -2984,7 +3099,7 @@ fi:
         description: "Minkä emojityylin haluat yhteisöösi? Voit milloin vain lisätä mukautettuja emojeita navigoimalla Ylläpito --> Mukauta --> Emoji."
       invites:
         title: "Kutsu henkiökuntaa"
-        description: "Melkein valmista! Kutsutaan muutama henkilökuntalainen auttamaan <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>pohjustamaan keskusteluita</a> kiintoisilla ketjunavauksilla ja vastauksilla, jotta yhteisö pääsee alkuun."
+        description: "Melkein valmista! Kutsutaan ihmisiä <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>pohjustamaan keskusteluita</a> kiintoisilla ketjunavauksilla ja vastauksilla, jotta yhteisö pääsee alkuun."
       finished:
         title: "Discoursesi on valmis!"
         description: |
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 5ddd06b494..d98e8f0f07 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -46,8 +46,9 @@ fr:
         no_message_id_error: "Se produit quand le courriel n'a pas d'entête \"Message-Id\"."
         auto_generated_email_error: "Se produit quand l'entête « precedence » est : list, junk, bulk ou auto-reply, ou lorsque n'importe quel autre entête contient : auto-submitted, auto-replied ou auto-generated."
         no_body_detected_error: "Se produit quand il est impossible d'extraire le corps du message et qu'il n'y a pas de pièces-jointes."
+        no_sender_detected_error: "Se produit lorsque nous n'avons pas trouvé une adresse courriel valide dans l'entête From."
         inactive_user_error: "Se produit quand l'expéditeur n'est pas actif."
-        blocked_user_error: "Se produit quand l'expéditeur a été bloqué."
+        silenced_user_error: "Se produit lorsque l'expéditeur a été mis sous silence."
         bad_destination_address: "Se produit quand aucune des adresses de courriel des champs To/Cc/Bcc ne correspondent à une adresse de courriel entrante configurée."
         strangers_not_allowed_error: "Se produit quand un utilisateur a essayé de créer un nouveau sujet dans une catégorie dans laquelle il n'est pas membre."
         insufficient_trust_level_error: "Se produit quand un utilisateur a essayé de créer un nouveau sujet dans une catégorie pour laquelle il n'a pas le niveau de confiance nécessaire."
@@ -56,8 +57,12 @@ fr:
         topic_closed_error: "Se produit quand quelqu'un répond mais le sujet lié a été fermé."
         bounced_email_error: "Le courriel est un rapport de courriel rejeté."
         screened_email_error: "Arrive quand l'adresse courriel de l'expéditeur est déjà sous surveillance."
+        unsubscribe_not_allowed: "Se produit lorsque le désabonnement via courriel n'est pas autorisé pour cet utilisateur."
+        email_not_allowed: "Se produit quand l'adresse courriel n'est pas dans la liste autorisée ou est dans la liste des indésirables."
+      unrecognized_error: "Erreur non reconnue"
   errors: &errors
     format: '%{attribute} %{message}'
+    format_with_full_message: '<b>%{attribute}</b> : %{message}'
     messages:
       too_long_validation: "est limité à %{max} caractères maximum ; il y en a %{length}."
       invalid_boolean: "Vrai/Faux invalide."
@@ -127,6 +132,7 @@ fr:
   not_logged_in: "Vous devez être connecté pour faire cela."
   not_found: "L'URL ou ressource demandée n'a pas été retrouvé."
   invalid_access: "Vous n'avez pas la permission de voir cette ressource."
+  invalid_api_credentials: "Vous n'êtes pas autorisés à voir cette ressource. Le nom d’utilisateur ou la clé API n'est pas valide."
   read_only_mode_enabled: "Le site est en mode lecture seule. Les interactions sont désactivées."
   reading_time: "Temps de lecture"
   likes: "J'aime"
@@ -171,10 +177,12 @@ fr:
   too_many_links:
     one: "Désolé, les nouveaux utilisateurs ne peuvent insérer qu'un seul lien par message."
     other: "Désolé, les nouveaux utilisateurs ne peuvent insérer que %{count} liens par message."
+  contains_blocked_words: "Votre message contient des mots non autorisés."
   spamming_host: "Désolé, vous ne pouvez pas insérer de lien vers ce domaine."
   user_is_suspended: "Les utilisateurs suspendus ne sont pas autorisés à poster de messages."
   topic_not_found: "Une erreur est survenue. Peut-être que ce sujet a été fermé ou supprimé pendant que vous le regardiez ?"
   not_accepting_pms: "Désolé, %{username} n'accepte pas de messages pour le moment."
+  max_pm_recepients: "Désolé, vous pouvez envoyer un message à un maximum de %{recipients_limit} destinataires."
   just_posted_that: "est trop similaire à ce que vous avez récemment posté"
   invalid_characters: "contient des caractères invalides"
   is_invalid: "ne semble pas clair, est-ce une phrase complète ?"
@@ -207,11 +215,13 @@ fr:
     user_posts: "Derniers messages par @%{username}"
     user_topics: "Derniers sujets par @%{username}"
     tag: "Sujets tagués"
+    badge: "%{display_name} badge sur %{site_title}"
   too_late_to_edit: "Ce message a été créé il y a trop longtemps. Il ne peut plus être modifié ou supprimé."
   revert_version_same: "La version actuelle est la même que la version vers laquelle vous essayez de revenir."
   excerpt_image: "image"
   queue:
     delete_reason: "Supprimé depuis la liste des messages en attente de validation"
+    not_found: "Message non trouvé ou déjà mis à jour."
   groups:
     success:
       bulk_add: "%{users_added} utilisateurs ont bien été ajoutés au groupe."
@@ -222,6 +232,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 +243,8 @@ 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}"
   education:
     until_posts:
       one: "1 message"
@@ -318,6 +331,7 @@ fr:
               too_many_users: "Vous ne pouvez envoyer des avertissements qu'à un utilisateur à la fois."
               cant_send_pm: "Désolé, vous ne pouvez pas envoyer de message privé à cet utilisateur."
               no_user_selected: "Vous devez choisir un utilisateur valide."
+              reply_by_email_disabled: "Réponse par courriel désactivée."
             featured_link:
               invalid: "est invalide. L'URL doit inclure http:// ou https://."
               invalid_category: "ne peut pas être modifié dans cette catégorie."
@@ -350,6 +364,14 @@ fr:
           attributes:
             execute_at:
               in_the_past: "Doit être dans le futur"
+        translation_overrides:
+          attributes:
+            value:
+              invalid_interpolation_keys: 'Les clés d''interpolation suivantes sont invalides : « %{keys} »'
+        watched_word:
+          attributes:
+            word:
+              too_many: "Trop de mots pour cette action"
       <<: *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 +383,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
@@ -412,6 +434,7 @@ fr:
       invalid_email_in: "« %{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} »."
+      description_incomplete: "Le message de description de la catégorie doit avoir au moins un paragraphe."
     cannot_delete:
       uncategorized: "Vous ne pouvez pas supprimer Sans Catégorie"
       has_subcategories: "Vous ne pouvez pas supprimer cette catégorie car elle a des sous-catégories."
@@ -432,6 +455,9 @@ fr:
     leader:
       title: "meneur"
     change_failed_explanation: "Vous avez essayé de rétrograder %{user_name} au niveau '%{new_trust_level}'. Cependant son niveau de confiance est déjà '%{current_trust_level}'. %{user_name} restera au niveau  '%{current_trust_level}' -  Si vous souhaitez rétrograder un utilisateur vous devez verrouiller le niveau de confiance au préalable"
+  post:
+    image_placeholder:
+      broken: "Cette image ne fonctionne pas"
   rate_limiter:
     slow_down: "Vous avez réalisé cette action un trop grand nombre de fois, essayez à nouveau plus tard."
     too_many_requests: "Nous avons une limite journalière du nombre d'actions qui peuvent être effectuées. Veuillez patienter %{time_left} avant de recommencer."
@@ -571,12 +597,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}} '
@@ -587,14 +616,15 @@ fr:
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Autre chose"
-      description: 'Ce message demande l''attention des responsables pour une autre raison..'
-      short_description: 'Requière l''attention du staff pour une autre raison'
+      description: 'Ce message demande l''attention des responsables pour une autre raison.'
+      short_description: 'Nécessite l''attention du staff pour une autre raison'
       long_form: 'signalé aux responsables'
       email_title: 'Un message dans « %{title} » nécessite l''attention des responsables'
       email_body: "%{link}\n\n%{message}"
     bookmark:
       title: 'Mettre un signet'
       description: 'Mettre un signet'
+      short_description: 'Mettre un signet'
       long_form: 'signet ajouté'
     like:
       title: 'J''aime'
@@ -607,12 +637,18 @@ fr:
       short_description: 'Voter pour ce message'
       long_form: 'a voté pour ce message'
   user_activity:
+    no_default:
+      self: "Vous n'avez aucune activité pour le moment."
+      others: "Aucune activité."
     no_bookmarks:
       self: "Vous n'avez mis de signets à aucun message ; mettre des signets vous permet de facilement les retrouver par la suite."
       others: "Aucun signet."
     no_likes_given:
       self: "Vous n'avez aimé aucun message"
       others: "Aucun message aimé"
+    no_replies:
+      self: "Vous n'avez répondu à aucun message."
+      others: "Aucune réponse."
   topic_flag_types:
     spam:
       title: 'Spam'
@@ -629,7 +665,7 @@ fr:
       email_title: 'Le sujet « %{title} » nécessite l''attention d''un modérateur'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Votre message a été signalé par la communauté. Veuillez <a href="/my/messages">regarder vos messages directs</a>.</p>'
+    you_must_edit: '<p>Votre message a été signalé par la communauté. Veuillez <a href="%{path}">consulter vos messages privés</a>.</p>'
     user_must_edit: '<p>Ce message a été signalé par la communauté et temporairement masqué.</p>'
   archetypes:
     regular:
@@ -641,7 +677,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"
@@ -852,15 +888,16 @@ fr:
     search_tokenize_chinese_japanese_korean: "Forcer la tokenisation dans la recherche chinois/japonais/koréen, même sur des sites non-CJK."
     search_prefer_recent_posts: "Si la recherche dans votre forum est lente, cette option tente l'indéxation des messages les plus récents en premier"
     search_recent_posts_size: "Combien de messages récents à garder dans l'index"
+    log_search_queries: "Archiver les requêtes de recherche des utilisateurs"
+    search_query_log_max_size: "Nombre maximum de requêtes de recherche à conserver"
     allow_uncategorized_topics: "Autorise la création de sujets sans catégorie. ATTENTION : S'il existe des sujets non-catégorisés, vous devez les catégoriser avant de désactiver cette fonction."
     allow_duplicate_topic_titles: "Autoriser la création de sujet avec le même titre."
     unique_posts_mins: "Combien de temps avant qu'un utilisateur puisse poster le même contenu à nouveau"
     educate_until_posts: "Lors de la rédaction des (n) premiers nouveaux sujets de l'utilisateur, afficher le panneau d'aide à la saisie."
     title: "Le nom du site, utilisé dans la balise title."
     site_description: "Décrivez ce site en une seule phrase, utilisée dans le tag meta description."
-    contact_email: "Adresse de courriel du contact clé pour ce site. Utilisée pour des notifications critiques telles que des signalements en attente ou des faits urgents en provenance du formulaire de contact de la page À propos."
+    contact_email: "Adresse de courriel de la personne responsable de ce site. Utilisée pour des notifications critiques et des faits urgents en provenance du formulaire de contact de la page À propos."
     contact_url: "Adresse de contact pour ce site. Utilisée sur la formulaire de contact sur la page À propos pour les notifications critiques."
-    queue_jobs: "SEULEMENT POUR LES DÉVELOPPEURS ! ATTENTION ! Par défaut, empiler les travaux dans sidekiq. Si désactivé, votre site sera cassé."
     crawl_images: "Récupérer les images provenant de sources tierces pour y insérer les dimensions correctes (hauteur et largeur)."
     download_remote_images_to_local: "Transformer les images distantes en images locales en les téléchargeant ; cela permet d'éviter les liens morts."
     download_remote_images_threshold: "Quantité minimum d'espace disque requise pour télécharger localement des images distantes (en pourcentage)"
@@ -881,12 +918,13 @@ fr:
     show_pinned_excerpt_desktop: "Afficher les extraits des sujets épinglés en vue bureau."
     post_onebox_maxlength: "Longueur maximale d'un message emboîté en nombre de caractères."
     onebox_domains_blacklist: "Une liste de domaines que ne seront jamais transformés en Onebox."
+    inline_onebox_domains_whitelist: "Une liste de domaines qui seront transformé en Onebox s'ils ont été liés sans titre"
     max_oneboxes_per_post: "Nombre maximum de Onebox dans un message."
     logo_url: "L'image de votre logo situé en haut à gauche de votre site doit être de forme rectangulaire large. Si vous laissez ce champ vide, le nom de votre site apparaitra."
     digest_logo_url: "L'image alternative de votre logo utilisée en haut du résumé par courriel de votre site. Elle devrait idéalement être en forme de large rectangle et ne pas être une image SVG. Si vide, `logo_url` sera utilisé."
     logo_small_url: "Le petit logo situé en haut à gauche de votre site doit être de forme carré. Si vous laissez ce champ vide, un logo de maison apparaîtra."
     favicon_url: "Un favicon pour votre site, voir http://fr.wikipedia.org/wiki/Favicon, pour fonctionner correctement à travers un CDN il doit être PNG."
-    mobile_logo_url: "L'image fixe utilisée tout en haut à gauche de votre site mobile. Devrait-être de forme carrée. Si laissé vide, `logo_url` sera utilisé. ex: http://example.com/uploads/default/logo.png"
+    large_icon_url: "Image utilisée comme logo sur Android. Taille recommandée : 512 px par 512 px."
     apple_touch_icon_url: "Icône utilisée pour les appareils d'Apple. Taille recommandée 144 px par 144 px."
     notification_email: "L'adresse de courriel dans le champs De qui sera utilisée pour envoyer les courriels systèmes essentiels. Le nom de domaine spécifié  doit avoir les informations SPF, DKIM et PTR inversé renseignés correctement pour que le courriel arrive à destination."
     email_custom_headers: "Une liste délimité par des (|) pipes d'entêtes de courriel"
@@ -911,20 +949,13 @@ fr:
     tl2_additional_likes_per_day_multiplier: "Augmenter la limite de J'aime par jour pour les utilisateurs de niveau 2 (membres) en la multipliant par ce nombre"
     tl3_additional_likes_per_day_multiplier: "Augmenter la limite de J'aime par jour pour les utilisateurs de niveau 3 (réguliers) en la multipliant par ce nombre"
     tl4_additional_likes_per_day_multiplier: "Augmenter la limite de J'aime par jour pour les utilisateurs de niveau 4 (meneurs) en la multipliant par ce nombre"
-    num_spam_flags_to_block_new_user: "Si les messages d'un nouvel utilisateur obtiennent ce nombre de signalements pour spam de la part de num_users_to_block_new_user utilisateurs différents, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
-    num_users_to_block_new_user: "Si les messages d'un nouvel utilisateur obtiennent num_spam_flags_to_block_new_user signalements d'autant d'utilisateurs différents, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
-    num_tl3_flags_to_block_new_user: "Si les messages d'un nouvel utilisateur obtiennent\nce nombre de signalements de la part de num_tl3_users_to_block_new_user utilisateurs de niveau de confiance 3 différents, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
-    num_tl3_users_to_block_new_user: "Si les messages d'un nouvel utilisateur obtiennent num_tl3_flags_to_block_new_user signalements d'autant d'utilisateurs de niveau de confiance 3 différents, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
-    notify_mods_when_user_blocked: "Si un utilisateur est bloqué automatiquement, envoyer un message à tous les modérateurs."
+    notify_mods_when_user_silenced: "Si un utilisateur est automatiquement mis sous silence, 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."
     maximum_session_age: "L'utilisateur restera connecté pour n heures après la dernière visite"
-    ga_tracking_code: "Obsolète : code de suivi Google Analytics (ga.js), par exemple : UA-12345678-9 ; voir http://google.com/analytics"
-    ga_domain_name: "Obsolète : nom de domaine Google Analytics (ga.js), par exemple : monsite.com ; voir http://google.com/analytics"
     ga_universal_tracking_code: "Code de suivi Google Universal Analytics (analytics.js), par exemple : UA-12345678-9 ; voir http://google.com/analytics"
     ga_universal_domain_name: "Nom de domaine Google Universal Analytics (analytics.js), par exemple : monsite.com ; voir http://google.com/analytics"
     gtm_container_id: "ID du conteneur Google Tag Manager, par exemple : GTM-ABCDEF"
@@ -932,6 +963,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."
@@ -955,16 +988,14 @@ fr:
     allow_index_in_robots_txt: "Préciser dans robots.txt que le site est autorisé à être indexé par les robots des moteurs de recherche."
     email_domains_blacklist: "Liste des domaines de courriel qui ne sont pas autorisés lors de la création de compte, délimitée par des pipes. Exemple : mailinator.com|trashmail.net"
     email_domains_whitelist: "Liste des domaines de courriel avec lesquelles les utilisateurs DOIVENT s'enregistrer, délimités par un pipe. ATTENTION : les utilisateurs ayant une adresse de courriel sur un autre domaine ne pourront pas s'enregistrer."
-    forgot_password_strict: "Ne pas mentionner l'existence d'un compte utilisateur quand un utilisateur utilise le formulaire d'oubli de mot de passe."
     log_out_strict: "Lors de la déconnexion, déconnecter TOUTES les sessions pour l'utilisateur sur tous les appareils"
     version_checks: "Ping les serveurs de Discourse afin d'obtenir les mises à jours et affiche les nouveaux messages d'information dans le tableau de bord /admin"
     new_version_emails: "Envoyer un courriel à contact_email quand une nouvelle version de Discourse est disponible."
-    port: "SEULEMENT POUR LES DÉVELOPPEURS ! ATTENTION ! Utiliser ce port HTTP plutôt que celui par défaut 80. Laissez vide par défaut 80."
-    force_hostname: "SEULEMENT POUR LES DÉVELOPPEURS ! ATTENTION ! Voulez-vous spécifier un nom d'hôte dans l'URL ? Sinon, laisser vide par défaut."
     invite_expiry_days: "Combien de temps (en jours) les clés d'invitation sont-elles valides"
     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."
@@ -1041,7 +1072,6 @@ fr:
     clean_up_uploads: "Retirer les fichiers téléchargés orphelins pour prévenir les hébergements illégaux. ATTENTION: vous devriez faire une sauvegarde de votre répertoire /uploads avant d'activer ce paramètre."
     clean_orphan_uploads_grace_period_hours: "La période de grâce (en heures) avant qu'un fichier envoyé orphelin soit retiré."
     purge_deleted_uploads_grace_period_days: "La période de grâce (en jours) avant qu'un fichier envoyé et supprimé soit effacé."
-    purge_unactivated_users_grace_period_days: "Période de grâce (en jours) avant qu'un utilisateur qui n'a pas activé son compte soit supprimé."
     enable_s3_uploads: "Placez les fichiers envoyés sur un stockage Amazon S3. IMPORTANT: nécessite un accès valide à S3  (l'identifiant et la clé secrète)."
     s3_use_iam_profile: 'Utiliser un role AWS EC2 IAM pour la récupération des clés. NOTE: si activé, surcharge les paramètres "s3 access key id" et "s3 secret access key".'
     s3_upload_bucket: "Le nom du bucket Amazon S3 qui contiendra les fichiers téléchargés. ATTENTION : doit être en minuscule, sans points et sans caractères de soulignement."
@@ -1055,6 +1085,9 @@ 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)."
+    allow_staff_to_upload_any_file_in_pm: "Autoriser les responsables à envoyer n'importe quel fichier dans les messages privés."
+    strip_image_metadata: "Enlever les métadonnées de l'image."
     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."
@@ -1087,6 +1120,7 @@ fr:
     min_trust_to_edit_post: "Le niveau de confiance minimum requis pour modifier des messages."
     min_trust_to_allow_self_wiki: "Le niveau de confiance minimum requis pour transformer ses propres messages en type wiki."
     min_trust_to_send_messages: "Le niveau de confiance minimum pour être autorisé à créer des nouveaux messages privés."
+    min_trust_to_send_email_messages: "Le niveau de confiance minimum requis pour envoyer de nouveaux messages privés par courriel (aux utilisateurs générés)."
     newuser_max_links: "Combien de liens un nouvel utilisateur peut-il ajouter à un message."
     newuser_max_images: "Combien d'images un nouvel utilisateur peut-il ajouter à un message."
     newuser_max_attachments: "Combien de fichiers un nouvel utilisateur peut-il ajouter à un message."
@@ -1112,6 +1146,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.)"
@@ -1145,9 +1180,8 @@ fr:
     num_hours_to_close_topic: "Nombre d'heures de fermeture d'un sujet pour intervention."
     auto_respond_to_flag_actions: "Activer la réponse automatique lors du traitement d'un signalement."
     min_first_post_typing_time: "Minimum de temps en millisecondes qu'un utilisateur doit passer à la saisie de son premier commentaire, si le seuil n'est pas atteint, il rejoindra automatiquement la file des commentaires en cours d'approbation. Mettre à 0 pour désactiver (non recommandé)"
-    auto_block_fast_typers_on_first_post: "Bloque automatiquement les utilisateurs qui n'ont pas respecté min_first_post_typing_time"
-    auto_block_fast_typers_max_trust_level: "Niveau de confiance maximum pour bloquer automatiquement les 'dactylo rapides'"
-    auto_block_first_post_regex: "Regex non sensible à la casse qui, si elle est déclenchée, bloquera le premier message de l'utilisateur et l'enverra dans la file d'attente d'approbation.\nExemple: rageux|a[bc]a bloquera les premiers messages contenant rageux ou aba ou aca."
+    auto_silence_fast_typers_max_trust_level: "Niveau de confiance maximum pour automatiquement mettre sous silence les utilisateurs rédigeant des messages trop rapidement."
+    flags_default_topics: "Afficher les sujets signalés par défaut dans la section administrateur"
     reply_by_email_enabled: "Activer les réponses aux sujets via courriel."
     reply_by_email_address: "Modèle pour la réponse par courriel entrant; exemple : %{reply_key}@reply.example.com ou replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Liste des templates alternatifs pour les adresses des courriels entrants de la réponse par courriel. Exemple : %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
@@ -1175,6 +1209,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é)"
@@ -1185,7 +1220,6 @@ fr:
     pop3_polling_username: "Le nom d'utilisateur du compte POP3 pour le pooling des courriels."
     pop3_polling_password: "Le mot de passe du compte POP3 pour le pooling des courriels."
     log_mail_processing_failures: "Enregistrer tous les problèmes de mails sur\nhttp://yoursitename.com/logs"
-    email_in: "Autoriser les utilisateurs à poster de nouveaux sujets par courriel (requêtes via pop3 requise). Configurer les adresses dans l'onglet \"Paramètres\" de chaque catégorie."
     email_in_min_trust: "Le niveau de confiance minimum qu'un utilisateur doit avoir pour être autorisé à poster de nouveaux sujets par courriel."
     email_prefix: "Le [label] qui sera utilisé dans le sujet des courriels. Par défaut il prend la valeur de 'title'."
     email_site_title: "Le titre du site utilisé comme expéditeur pour les courriels du site. Par défaut il prend la valeur de 'title'. Si votre 'title\" utilise des caractères interdits dans les courriels, utiliser ce paramètre."
@@ -1193,7 +1227,6 @@ fr:
     relative_date_duration: "Nombre de jours après la création d'un message à partir desquels les dates seront affichées en absolu (20 Fév) plutôt qu'en relatif (7j)"
     delete_user_max_post_age: "Interdire la suppression des utilisateurs dont le premier message est date de plus de (n) jours."
     delete_all_posts_max: "Le nombre maximum de messages qui peuvent être supprimés en une seule fois avec le bouton Supprimer tous les messages. Si un utilisateur a plus que ce nombre de messages, ses messages ne pourront pas être supprimés en une seule fois et l'utilisateur ne pourra pas être supprimé."
-    username_change_period: "Le nombre de jours après l'enregistrement pour pouvoir modifier le pseudo (0 pour empêcher la modification de pseudo)."
     email_editable: "Autoriser les utilisateurs à modifier leur adresse de courriel après l'inscription."
     logout_redirect: "URL vers laquelle rediriger le navigateur après déconnexion (par exemple : http://unsite.com/deconnexion)"
     allow_uploaded_avatars: "Autoriser les utilisateurs à télécharger une photo de profil personnalisé."
@@ -1208,7 +1241,6 @@ fr:
     suppress_digest_email_after_days: "Ne pas envoyer de résumés par courriel aux utilisateurs qui n'ont pas visité le site depuis plus de (n) jours."
     digest_suppress_categories: "Ne pas inclure ces catégories dans les résumés par courriel."
     disable_digest_emails: "Désactiver les résumés par courriel pour tous les utilisateurs."
-    email_accent_bg_color: "La couleur d'accentuation utilisée comme arrière-plan de certains éléments des courriels HTML. Entrez un nom de couleur (« red ») ou une valeur hexadécimale (« #FF0000 »)."
     email_accent_fg_color: "La couleur des textes rendus sur la couleur d'arrière-plan des courriels HTML. Entrez un nom de couleur (« white ») ou une valeur hexadécimale (« #FFFFFF »)."
     email_link_color: "La couleur des liens dans les courriels HTML. Entrez un nom de couleur (« blue ») ou une valeur hexadécimale (« #0000FF »)."
     detect_custom_avatars: "Vérifier ou non si les utilisateurs ont envoyé une photo de profil personnalisée."
@@ -1221,6 +1253,7 @@ fr:
     anonymous_posting_min_trust_level: "Le niveau de confiance minimum pour passer en mode anonyme."
     anonymous_account_duration_minutes: "Pour protéger l'anonymat, créer un nouveau compte anonyme tous les N minutes pour chaque utilisateur. Exemple: si 600 est choisi, dès 600 minutes après le dernier message ET que l'utilisateur passe en mode anonyme, un nouveau compte anonyme lui sera crée."
     hide_user_profiles_from_public: "Cacher les cartes, les profils et le répertoire d'utilisateurs aux visiteurs."
+    hide_suspension_reasons: "Ne pas afficher les raisons d'une suspension sur les profils utilisateurs."
     user_website_domains_whitelist: "Les sites Web des utilisateurs vont être vérifiés contre ces domaines. Liste délimitée par des pipes (|)."
     allow_profile_backgrounds: "Autoriser les utilisateurs à envoyer des arrières-plans de profil."
     sequential_replies_threshold: "Nombre de messages successifs qu'un utilisateur peut poster dans un sujet avant d'être averti d'avoir posté un nombre excessif de réponses qui se suivent."
@@ -1247,17 +1280,11 @@ 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é."
-    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."
     embed_truncate: "Tronquer les messages embarqués."
     allowed_href_schemes: "Préfixes autorisés dans les liens en plus de http et https."
     embed_post_limit: "Nombre maximum de messages à embarquer."
     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)"
@@ -1273,6 +1300,8 @@ fr:
     auto_close_messages_post_count: "Nombre maximum de messages dans un message privé avant qu'il ne soit automatiquement fermé (0 pour désactiver)"
     auto_close_topics_post_count: "Nombre maximum de messages dans un sujet avant qu'il ne soit automatiquement fermé (0 pour désactiver)"
     code_formatting_style: "Le bouton Code dans l'éditeur utilisera ce style de formatage par défaut"
+    max_allowed_message_recipients: "Nombre maximum de destinataires autorisés dans un message."
+    watched_words_regular_expressions: "Les mots surveillés sont des expressions régulières."
     default_email_digest_frequency: "Par défaut, à quelle fréquence les utilisateurs reçoivent les résumés par courriel."
     default_include_tl0_in_digests: "Par défaut, inclure les messages des nouveaux utilisateurs dans les résumés par courriel. Les utilisateurs peuvent changer cela dans leurs préférences."
     default_email_private_messages: "Envoyer un courriel quand quelqu'un envoie un message à un utilisateur."
@@ -1296,8 +1325,7 @@ fr:
     default_categories_tracking: "Liste de catégories suivies par défaut."
     default_categories_muted: "Liste de catégories silencées par défaut."
     default_categories_watching_first_post: "Liste des catégories dont le premier message de chaque nouveau sujet sera surveillé par défaut."
-    max_user_api_reqs_per_day: "Nombre maximum de requêtes de l'API utilisateur par clé et par jour"
-    max_user_api_reqs_per_minute: "Nombre maximum de requêtes de l'API utilisateur par clé et par minute"
+    retain_web_hook_events_period_days: "Nombre de jours de conservation des événement des Web hooks."
     allow_user_api_keys: "Autoriser la génération des clés de l'API utilisateur"
     allow_user_api_key_scopes: "Liste des champs d'action autorisés pour les clés de l'API utilisateur"
     max_api_keys_per_user: "Nombre maximum de clés de l'API utilisateur par utilisateur"
@@ -1349,6 +1377,7 @@ fr:
       category: 'Catégories'
       topic: 'Résultats'
       user: 'Utilisateurs'
+    results_page: "Résultats de recherche pour « %{term} »"
   sso:
     login_error: "Erreur de connexion"
     not_found: "Votre compte n'a pas été trouvé. Merci de contacter l'administrateur du site."
@@ -1436,6 +1465,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"
@@ -1458,7 +1488,8 @@ fr:
     email_too_long: "L'email renseigné est trop long. Les noms de boîte ne doivent pas dépasser 254 caractères, et les noms de domaines ne doivent pas dépasser 253 caractères."
     reserved_username: "Ce pseudo n'est pas autorisé."
     missing_user_field: "Vous n'avez pas renseigné l'ensemble des champs utilisateur"
-    close_window: "Identification terminée. Fermez cette fenêtre pour continuer."
+    auth_complete: "Authentification terminée."
+    click_to_continue: "Cliquer ici pour continuer."
     already_logged_in: "Oups, on dirait que vous essayez d'accepter une invitation d'un autre utilisateur. Si vous n'êtes pas %{current_user}, veuillez vous déconnecter et réessayer."
   user:
     no_accounts_associated: "Aucun compte associé"
@@ -1470,7 +1501,7 @@ fr:
     username:
       short: "doit être d'au moins %{min} caractères"
       long: "ne doit pas être supérieur à %{max} caractères"
-      characters: "doit inclure uniquement des chiffres, lettres et caractères de soulignement"
+      characters: "doit uniquement contenir des chiffres, lettres, tirets et tirets bas."
       unique: "doit être unique"
       blank: "doit être présent"
       must_begin_with_alphanumeric_or_underscore: "doit commencer par une lettre, un chiffre ou un tiret bas"
@@ -1487,10 +1518,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,70 +1536,15 @@ fr:
 
       Si vous souhaitez continuer à recevoir ces emails, vous pouvez ignorer ce message.
   invite_mailer:
-    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}
+    title: "Invitiation"
   custom_invite_mailer:
-    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}
+    title: "Invitation personnalisée"
   invite_forum_mailer:
-    subject_template: "%{invitee_name} vous a invité(e) à rejoindre %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} vous invite à rejoindre :
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      Si cela vous intéresse, cliquez sur le lien ci-dessous :
-
-      %{invite_link}
+    title: "Invitation sur le forum"
   custom_invite_forum_mailer:
-    subject_template: "%{invitee_name} vous a invité(e) à rejoindre %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} vous invite à rejoindre :
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      Avec ce message :
-
-      > %{user_custom_message}
-
-      Si cela vous intéresse, cliquez sur le lien ci-dessous :
-
-      %{invite_link}
+    title: "Invitation personnalisée sur le forum"
   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,11 +1554,12 @@ 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é.
+      Voici le [téléchargement de la sauvegarde du site](%{backup_file_path}) que vous avez demandé.
 
-      Nous avons envoyé ce lien par email pour des raisons de sécurité.
+      Nous avons envoyé ce lien à votre adresse de courriel validée pour des raisons de sécurité.
 
       (Si vous *n'avez pas* effectué cette demande, vous devriez vous poser des questions -- quelqu'un a accès à l'administration de votre site.)
     no_token: |
@@ -1636,6 +1617,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 !
@@ -1643,13 +1625,14 @@ fr:
       Votre version : %{installed_version}
       Nouvelle version : **%{new_version}**
 
-      - Mettez à jour depuis votre navigateur sur [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).
+      - Mettez à jour depuis le navigateur avec notre **[mise à jour en 1 clic](%{base_url}/admin/upgrade)**
 
-      - Consultez les nouveautés sur l'historique [GitHub](https://github.com/discourse/discourse/commits/master).
+      - Consultez les nouveautés dans les [notes de version](https://meta.discourse.org/tags/release-notes) ou l'[historique GitHub](https://github.com/discourse/discourse/commits/master).
 
-      - Visitez [meta.discourse.org](https://meta.discourse.org) pour des nouvelles, des discussions, et de l'aide concernant Discourse.
+      - 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 !
@@ -1657,23 +1640,15 @@ fr:
       Votre version : %{installed_version}
       Nouvelle version : **%{new_version}**
 
-      - Mettez à jour depuis votre navigateur sur [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).
+      - Mettez à jour depuis le navigateur avec notre **[mise à jour en 1 clic](/admin/upgrade)**
 
-      - Consultez les nouveautés sur l'historique [GitHub](https://github.com/discourse/discourse/commits/master).
+      - Consultez les nouveautés dans les [notes de version](https://meta.discourse.org/tags/release-notes) ou l'[historique GitHub](https://github.com/discourse/discourse/commits/master).
 
-      - Visitez [meta.discourse.org](https://meta.discourse.org) pour des nouvelles, des discussions, et de l'aide concernant Discourse.
+      - Visitez [meta.discourse.org](https://meta.discourse.org) pour des nouvelles, des discussions et de l'aide concernant Discourse
 
       ### Notes de version
 
       %{notes}
-  queued_posts_reminder:
-    subject_template:
-      one: "[%{email_prefix}] 1 message en attente de modération"
-      other: "[%{email_prefix}] %{count} messages en attente de modération"
-    text_body_template: |
-      Bonjour,
-
-      Des messages de nouveaux utilisateurs sont en attente de modération. [Approuvez ou rejetez-les ici](%{base_url}/queued-posts).
   flag_reasons:
     off_topic: "Votre message a été signalé comme étant **hors sujet** : la communauté considère qu'il ne correspond au sujet en discussion qui est défini par son titre et son premier message."
     inappropriate: "Votre message a été signalé comme étant **inapproprié** : la communauté considère que son contenu est offensif, abusif ou enfreint notre [charte](/guidelines)."
@@ -1694,21 +1669,6 @@ fr:
     post_hidden:
       title: "Message caché"
       subject_template: "Message caché suite à des signalements de la communauté"
-      text_body_template: |+
-        Bonjour,
-
-        Ceci est un message automatique de %{site_name} pour vous informer que votre message a été caché.
-
-        %{base_url}%{url}
-
-        %{flag_reason}
-
-        Plusieurs membres de la communauté ont signalé ce message avant qu'il soit masqué, merci de modifier votre message en fonction des raisons invoquées. **Vous pouvez modifier votre message après %{edit_delay} minutes, il sera alors automatiquement démasqué.**
-
-        Cependant, si votre message est masqué par la communauté une seconde fois, il le restera jusqu'à ce qu'un membre de l'équipe s'en occupe – et il est possible que des actions supplémentaires soient entreprises, y compris la suspension de votre compte.
-
-        Afin d'être guidé, merci de vous référer à notre [charte](%{base_url}/guidelines).
-
     usage_tips:
       text_body_template: |+
         Pour connaître quelques astuces pour vous aider à démarrer en tant que nouveau membre, [check out this blog post](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -1718,8 +1678,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 +1750,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,50 +1776,27 @@ 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."
+      text_body_template: "Nous sommes désolés, votre export de données a échoué. Veuillez consulter les journaux ou [contacter un responsable](%{base_url}/about)."
     email_reject_insufficient_trust_level:
       subject_template: "[%{email_prefix}] Problème de courriel -- Niveau de confiance insuffisant "
-      text_body_template: |
-        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
-
-        Votre compte n'a pas le niveau de confiance requis pour créer un nouveau sujet via cette adresse de courriel. Si vous pensez qu'il s'agit d'une erreur, contacter un responsable.
     email_reject_user_not_found:
       subject_template: "[%{site_name}] Problème de courriel -- L'utilisateur est introuvable"
-      text_body_template: |
-        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
-
-        Votre réponse a été envoyée depuis une adresse inconnue. Essayez de l'envoyer depuis une autre adresse, ou contactez un responsable.
     email_reject_screened_email:
       subject_template: "[%{email_prefix}] Problème de courriel -- Courriel bloqué"
-      text_body_template: |
-        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
-
-        Votre réponse a été envoyée depuis une adresse bloquée. Essayez de l'envoyer depuis une autre adresse ou contactez un responsable.
+    email_reject_not_allowed_email:
+      subject_template: "[%{email_prefix}] Problème de courriel -- Courriel bloqué"
     email_reject_inactive_user:
       subject_template: "[%{email_prefix}] Problème de courriel -- Utilisateur inactif"
       text_body_template: |
         Malheureusement votre courriel à %{destination} (titled %{former_title}) a échoué.
 
         Le compte associé avec cette adresse existe n'est pas activé. Veuillez activer votre compte avant d'envoyer des courriels.
-    email_reject_blocked_user:
-      subject_template: "[%{email_prefix}] Problème de courriel -- Utilisateur bloqué"
-      text_body_template: |
-        Malheureusement votre courriel à %{destination} (titled %{former_title}) a échoué.
-
-        Le compte associé avec cette adresse a été bloqué.
     email_reject_reply_user_not_matching:
       subject_template: "[%{email_prefix}] Problème de courriel -- Adresse de réponse inattendue"
-      text_body_template: |
-        Malheureusement votre courriel à %{destination} (titled %{former_title}) a échoué.
-
-        Votre réponses nous est parvenue d'une autre adresse courriel que celle attendue, nous ne savons donc pas s'il s'agit de la même personne. Essayez de l'envoyer depuis une autre adresse, ou contactez un responsable.
     email_reject_no_account:
       subject_template: "[%{email_prefix}] Problème de courriel - Compte inconnu"
-      text_body_template: |
-        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
-
-        Aucun compte utilisateur avec cette adresse n'a été trouvé. Essayez de l'envoyer depuis une autre adresse ou contactez un responsable.
     email_reject_empty:
       subject_template: "[%{email_prefix}] Problème de courriel - Aucun contenu"
       text_body_template: |
@@ -1851,16 +1813,8 @@ fr:
         Nous n'avons pas pu trouver votre réponse dans le courriel. **Assurez-vous que votre réponse se trouve au début du courriel** -- nous ne pouvons pas traiter les réponses en ligne.
     email_reject_invalid_access:
       subject_template: "[%{email_prefix}] Problème de courriel -- Accès invalide"
-      text_body_template: |
-        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
-
-        Votre compte n'a pas le niveau de confiance requis pour créer un nouveau sujet dans cette catégorie. Si vous pensez qu'il s'agit d'une erreur, contactez un responsable.
     email_reject_strangers_not_allowed:
       subject_template: "[%{email_prefix}] Problème de courriel -- Accès invalide"
-      text_body_template: |
-        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
-
-        La catégorie vers laquelle vous avez envoyé ce courriel autorise uniquement les réponses d'utilisateurs avec un compte valide et une adresse de courriel connue. Si vous pensez qu'il s'agit d'une erreur, contactez un responsable.
     email_reject_invalid_post:
       subject_template: "[%{email_prefix}] Problème de courriel -- Erreur d'envoi d'un message"
       text_body_template: |
@@ -1885,34 +1839,14 @@ fr:
         Le Post Action n'était pas reconnu. Veuillez réessayer ou rédigez votre message directement sur le site si le problème persiste.
     email_reject_reply_key:
       subject_template: "[%{email_prefix}] Problème de courriel -- Clé de réponse inconnue"
-      text_body_template: |
-        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
-
-        La clé de réponse est invalide ou inconnue et nous ne pouvons pas savoir à quel message s’adresse cette réponse. Contactez un responsable.
     email_reject_bad_destination_address:
       subject_template: "[%{email_prefix}] Problème de courriel - Adresse de destinataire inconnue"
-      text_body_template: |
-        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
-
-        Aucune des adresses de destination n'est reconnue. Veuillez vérifier que vous envoyez bien à l'adresse de courriel fournie par les responsables.
     email_reject_topic_not_found:
       subject_template: "[%{email_prefix}] Problème de courriel -- Sujet introuvable"
-      text_body_template: |
-        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
-
-        Le sujet à lequel vous répondez n'existe plus. Si vous pensez qu'il s'agit d'une erreur, contactez un responsable.
     email_reject_topic_closed:
       subject_template: "[%{email_prefix}] Problème de courriel -- Sujet fermé"
-      text_body_template: |
-        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
-
-        Le sujet à lequel vous répondez est actuellement fermé et n'accepte plus de réponses. Si vous pensez qu'il s'agit d'une erreur, contactez un responsable.
     email_reject_auto_generated:
       subject_template: "[%{email_prefix}] Problème de courriel - Réponse automatique"
-      text_body_template: |
-        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
-
-        Votre courriel a été marqué comme "automatiquement généré", ce qui signifie qu'il a été créé par un ordinateur au lieu d'être rédigé par un humain ; nous ne pouvons pas accepter ces types de courriel. Si vous pensez qu'il s'agit d'une erreur, contacter un responsable.
     email_error_notification:
       subject_template: "[%{email_prefix}] Problème de courriel -- Erreur d'authentification POP3"
       text_body_template: |
@@ -1929,7 +1863,7 @@ fr:
 
         Ceci est un message automatique de %{site_name} pour vous informer que vos messages ont été temporairement masqués suite à des signalements de la communauté.
 
-        Par mesure de précaution, votre nouveau compte a été bloqué et vous ne pourrez plus créer de nouvelles réponses et sujets tant qu'un responsable n'a pas vérifié votre compte. Veuillez nous excuser pour la gêne occasionnée.
+        Par mesure de précaution, votre nouveau compte a été mis sous silence et vous ne pourrez plus créer de nouvelles réponses et sujets tant qu'un responsable n'a pas vérifié votre compte. Veuillez nous excuser pour la gêne occasionnée.
 
         Pour plus d'informations, merci de vous référer à la [charte de la communauté](%{base_url}/guidelines).
     too_many_tl3_flags:
@@ -1939,12 +1873,12 @@ fr:
 
         Ceci est un message automatique de %{site_name} pour vous informer que votre compte a été bloqué suite à un grand nombre de signalements de la communauté.
 
-        Par mesure de précaution, votre nouveau compte a été bloqué et vous ne pourrez par créer de nouvelles réponses ou sujets tant qu'un responsable n'a pas vérifié votre compte.
+        Par mesure de précaution, votre nouveau compte a été mis sous silence et vous ne pourrez par créer de nouvelles réponses ou sujets tant qu'un responsable n'a pas vérifié votre compte.
 
         Pour plus d'informations, merci de vous en référer à la [charte de la communauté](%{base_url}/guidelines).
-    blocked_by_staff:
-      title: "Bloqué par un responsable"
-      subject_template: "Compte bloqué temporairement"
+    silenced_by_staff:
+      title: "Mis sous silence par un responsable"
+      subject_template: "Compte temporairement bloqué"
       text_body_template: |
         Bonjour,
 
@@ -1953,30 +1887,19 @@ fr:
         Vous pouvez continuer à naviguer mais vous ne pourrez plus répondre ou créer de sujets tant qu'un [responsable](%{base_url}/about) n'a pas vérifié vos messages les plus récents. Veuillez nous excuser pour la gêne occasionnée.
 
         Pour plus d'informations, merci de vous référer à la [charte de la communauté](%{base_url}/guidelines).
-    user_automatically_blocked:
-      title: "Utilisateur bloqué automatiquement"
-      subject_template: "Nouvel utilisateur %{username} bloqué suite à des signalements de la communauté"
+    user_automatically_silenced:
+      title: "Utilisateur automatiquement mis sous silence"
+      subject_template: "Nouvel utilisateur %{username} mis sous silence suite à des signalements de la communauté"
       text_body_template: |
         Ceci est un message automatique
 
-        Le nouvel utilisateur [%{username}](%{user_url}) a été bloqué automatiquement par plusieurs utilisateurs ayant signalés ses (%{username}) messages.
+        Le nouvel utilisateur [%{username}](%{user_url}) a été automatiquement  mis sous silence suite à plusieurs signalements par des utilisateurs.
 
-        Merci de [vérifier les signalements](%{base_url}/admin/flags). Si %{username} a été bloqué injustement, cliquez sur le bouton débloquer sur la [page d'administration de cet utilisateur](%{user_url}).
+        Merci de [vérifier les signalements](%{base_url}/admin/flags). Si %{username} a été injustement mis sous silence, cliquez sur le bouton d'annulation de la mise sous silence sur la [page d'administration de cet utilisateur](%{user_url}).
 
-        Cette limite peut être changée par le paramètre du site `block_new_user`.
-    spam_post_blocked:
-      title: "Message spam bloqué"
-      subject_template: "Les messages du nouvel utilisateur %{username} sont bloqués pour des liens répétés"
-      text_body_template: |
-        Ceci est un message automatique.
-
-        Le nouvel utilisateur [%{username}](%{user_url}) tente de créer de multiples messages avec des liens vers %{domains}, mais que ces messages ont été bloqués pour éviter le spam. Cet utilisateur est toujours capable de créer des messages qui ne contiennent pas de liens vers %{domains}.
-
-        Merci de [review the user](%{user_url}).
-
-        Ceci peut être modifier via les options `newuser_spam_host_threshold` et white_listed_spam_host_domains`.
-    unblocked:
-      title: "Débloqué"
+        Ce seuil peut être changé par le paramètre `silence_new_user`.
+    unsilenced:
+      title: "Mise sous silence annulée"
       subject_template: "Compte débloqué"
       text_body_template: |
         Bonjour,
@@ -2008,11 +1931,19 @@ fr:
       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:
+        Félicitations, vous avez reçu 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).
+        Ce prix est seulement décerné à deux nouveaux membres par mois et sera listé [dans vos badges](/my/badges).
 
-        Vous êtes devenu rapidement un membre précieux pour notre communauté. Merci de nous avoir rejoint et continuez à participer !
+        Vous êtes rapidement devenu un membre précieux de notre communauté. Merci de nous avoir rejoint et continuez à participer ainsi !
+    queued_posts_reminder:
+      subject_template:
+        one: "1 message en attente de modération"
+        other: "%{count} messages en attention de modération"
+      text_body_template: |
+        Bonjour,
+
+        Des messages de nouveaux utilisateurs sont en attente de modération. [Approuvez ou rejetez-les ici](%{base_url}/queued-posts).
   unsubscribe_link: |
     Pour se désabonner de ces courriels, [cliquer ici](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -2025,6 +1956,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,6 +1969,16 @@ 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_group_to_private_message_body: |
+      %{username} a invité @%{group_name} à un message
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      sur
+
+      > %{site_title} -- %{site_description}
     invited_to_private_message_body: |
       %{username} vous a invité(e) à un message
 
@@ -2055,6 +1999,14 @@ fr:
       sur
 
       > %{site_title} -- %{site_description}
+    user_invited_to_private_message_pm_group:
+      subject_template: "[%{email_prefix}] %{username} a invité @%{group_name} dans la conversation « %{topic_title} »"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
     user_invited_to_private_message_pm:
       title: "Utilisateur invité au MP"
       subject_template: "[%{email_prefix}] %{username} vous a invité dans la conversation « %{topic_title} »"
@@ -2183,6 +2135,35 @@ fr:
       text_body_template: |2
 
         %{message}
+    account_suspended:
+      title: "Compte suspendu"
+      subject_template: "[%{email_prefix}] Votre compte a été suspendu"
+      text_body_template: |
+        Vous avez été suspendu du forum jusqu'au %{suspended_till}.
+
+        %{reason}
+
+        %{message}
+    account_silenced:
+      title: "Compte mis sous silence"
+      subject_template: "[%{email_prefix}] Votre compte a été mis sous silence"
+      text_body_template: |
+        Vous avez été mis sous silence sur le forum jusqu'au %{suspended_till}.
+
+        %{reason}
+
+        %{message}
+    account_exists:
+      title: "Le compte existe déjà"
+      subject_template: "[%{email_prefix}] Le compte existe déjà"
+      text_body_template: |
+        Vous venez d'essayer de créer un compte sur %{site_name}, ou essayer de changer l'adresse courriel d'un compte vers %{email}. Cependant, un compte existe déjà pour %{email}.
+
+        Si vous avez oublié votre mot de passe,  [réinitialisez le maintenant](%{base_url}/password-reset).
+
+        Si vous n'avez pas essayé de créer un compte pour %{email} ou changer votre adresse courriel, ne vous inquiétez pas – vous pouvez ignorer ce message.
+
+        Si vous avez des questions, [contactez notre équipe](%{base_url}/about).
     digest:
       why: "Voici un bref résumé de ce qu'il s'est passé sur %{site_link} depuis votre dernière visite le %{last_seen_at}"
       since_last_visit: "Depuis votre dernière visite"
@@ -2198,7 +2179,8 @@ 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}."
+      unsubscribe: "Ce résumé est envoyé depuis %{site_link} quand nous ne vous avons plus vu depuis un moment. Changez %{email_preferences_link}, ou %{unsubscribe_link} pour se désabonner."
+      your_email_settings: "vos préférences de courriel"
       click_here: "cliquez ici"
       from: "résumé de %{site_name}"
       preheader: "Un bref résumé depuis votre dernière visite le %{last_seen_at}"
@@ -2257,6 +2239,7 @@ fr:
 
         %{base_url}/u/authorize-email/%{email_token}
     notify_old_email:
+      title: "Notifier l'ancienne adresse courriel"
       subject_template: "[%{email_prefix}] Votre adresse email a été modifié"
       text_body_template: |
         Ceci est un message automatique pour vous informer que votre adresse courriel pour
@@ -2269,6 +2252,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"
@@ -2286,10 +2285,13 @@ fr:
     see_more: "Plus"
     search_title: "Rechercher dans ce site"
     search_google: "Google"
+  offline:
+    title: "Impossible de charger l'application"
+    offline_page_message: "Il semble que vous n'êtes pas connectés à Internet. Veuillez vérifier votre connexion réseau puis réessayez."
   login_required:
     welcome_message: |
-      #[Bienvenue sur %{title}](#bienvenue)
-      Un compte est requis. Veuillez créer un compte ou vous connecter pour continuer.
+      ## [Bienvenue sur %{title}](#welcome)
+      Un compte est nécessaire. Veuillez en créer un ou connectez-vous pour continuer.
   terms_of_service:
     title: "Conditions générales d'utilisation"
     signup_form_message: 'J''ai lu et j''accepte les <a href="/tos" target="_blank">conditions générales d''utilisation</ a>.'
@@ -2301,12 +2303,15 @@ 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:
       too_large: "Désolé, l'image que vous essayez d'envoyer est trop grande (taille maximale de %{max_size_kb} Ko), merci de le redimensionner et de réessayer."
       larger_than_x_megapixels: "Désolé, l'image que vous essayez d'envoyer est trop grande (la dimension maximale est de %{max_image_megapixels} mégapixels) ; veuillez la redimensionner et réessayer."
       size_not_found: "Désolé, mais nous n'avons pas pu déterminer la taille de votre image. Peut-être est-elle corrompue ?"
+    placeholders:
+      too_large: "(image plus large que %{max_size_kb} Ko)"
   avatar:
     missing: "Désolé, nous ne parvenons pas à trouver un avatar associé à cette adresse mail. Pouvez-vous essayer de la télécharger à nouveau ?"
   flag_reason:
@@ -2494,9 +2499,9 @@ fr:
         Ce badge est accordé lorsque vous recevez votre premier J'aime sur un de vos messages. Félicitations, vous avez écrit quelque chose que les membres de votre communauté ont trouvé intéressant, cool, ou utile !
     autobiographer:
       name: Autobiographe
-      description: A rempli les informations de son <a href="/my/preferences">profil</a>
+      description: A complété les informations de son <a href="%{base_uri}/my/preferences/profile">profile</a>
       long_description: |
-        Ce badge est accordé au remplissage de <a href="/my/preferences">votre profil utilisateur</a> et au choix d'une photo de profil. En dire plus à la communauté sur vous et vos intérêts permet de la rendre plus agréable et plus connectée. Rejoignez-nous!
+        Ce badge est accordé pour avoir complété <a href="%{base_uri}/my/preferences/profile">votre profil utilisateur</a> et au choix d'une photo de profil. En dire plus à la communauté sur vous et vos intérêts permet de la rendre plus agréable et plus connectée. Rejoignez-nous !
     anniversary:
       name: Jubilaire
       description: Membre actif depuis un an, avec au moins un message
@@ -2589,9 +2594,9 @@ fr:
         Ce badge est accordé la première fois que vous citez un message dans votre réponse. Citer les sections pertinentes des messages précédents dans votre réponse permet de garder les discussions reliées entre elles et sur le sujet. La meilleure façon de citer est de mettre en évidence une section d'un message, puis appuyer sur un bouton de réponse. Citer généreusement !
     read_guidelines:
       name: Règlement lu
-      description: A lu le <a href="/guidelines">règlement de la communauté</a>
+      description: A lu le <a href="%{base_uri}/guidelines">règlement de la communauté</a>
       long_description: |
-        Ce badge est accordé après <a href="/guidelines">lecture de la charte de la communauté</a>. Respecter et partager ces règles simples permet de construire une communauté sûre, agréable et durable. Souvenez-vous toujours qu'il y a un autre être humain, tout comme vous, de l'autre côté de cet écran. Soyez courtois !
+        Ce badge est accordé après <a href="%{base_uri}/guidelines">lecture de la charte de la communauté</a>. Respecter et partager ces règles simples permet de construire une communauté sûre, agréable et durable. Souvenez-vous toujours qu'il y a un autre être humain, tout comme vous, de l'autre côté de cet écran. Soyez courtois !
     reader:
       name: Lecteur
       description: A lu tous les messages d'un sujet contenant plus de 100 messages
@@ -2680,6 +2685,18 @@ fr:
       description: Contributions remarquables durant leur premier mois
       long_description: |
         Ce badge est accordé pour féliciter deux nouveaux utilisateurs chaque mois pour leur excellente contribution mesurée par la fréquence à laquelle leurs messages reçoivent des J'aime et par qui.
+    enthusiast:
+      name: Passionné
+      description: A visité 10 jours
+      long_description: Ce badge est décerné pour avoir visiter 10 jours consécutifs. Merci d'être resté avec nous pendant plus d'une semaine !
+    aficionado:
+      name: Aficionado
+      description: A visité 100 jours
+      long_description: Ce badge est décerné pour avoir visiter 100 jours consécutifs. C'est plus de trois mois !
+    devotee:
+      name: Adepte
+      description: A visité 365 jours
+      long_description: Ce badge est décerné pour avoir visiter 365 jours consécutifs. Waouh, une année entière !
     badge_title_metadata: "%{display_name} badge sur %{site_title}"
   admin_login:
     success: "Courriel envoyé"
@@ -2764,7 +2781,7 @@ fr:
             description: "Page web pour vous contacter ou votre organisation. Sera affichée dans la page <a href='/about' target='_blank'>À propos</a>."
           site_contact:
             label: "Messages automatiques"
-            description: "Tous les messages privés automatiques de Discourse seront envoyés par cet utilisateur comme le message de bienvenue envoyé à chaque nouvel utilisateur."
+            description: "Tous les messages privés de Discourse seront envoyés de cet utilisateur, tels que les signalements et les notifications de sauvegarde."
       corporate:
         title: "Organisation"
         description: "Ces noms seront renseignés dans les pages <a href='/privacy' target='blank'>Politique de confidentialité</a> et <a href='/tos' target='blank'>Conditions générales d'utilisation</a> que vous pouvez modifier à tout moment depuis la catégorie Staff. Si vous n'avez pas de société, vous pouvez ignorer cette étape pour le moment."
@@ -2821,7 +2838,7 @@ fr:
         description: "Quel style d'Emoji préférez-vous pour votre communauté ? Vous pouvez ajouter des Emoji supplémentaires dans Administration, Personnaliser, Emoji."
       invites:
         title: "Inviter des responsables"
-        description: "Vous avez presque fini ! Invitons quelques responsables pour aider à <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>entamer les discussions</a> avec des sujets et réponses intéressantes pour lancer la communauté."
+        description: "Vous avez presque terminé ! Invitons quelques personnes pour <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>commencer des discussions</a> avec des sujets et réponses intéressantes pour faire démarrer votre communauté."
       finished:
         title: "Votre Discourse est prêt !"
         description: |
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
index 63a4454a41..6a2712fe3c 100644
--- a/config/locales/server.gl.yml
+++ b/config/locales/server.gl.yml
@@ -401,7 +401,6 @@ gl:
     suppress_uncategorized_badge: "Non mostrar a insignia para temas sen categoría nas listas de temas."
     automatically_unpin_topics: "Despegar os temas automaticamente cando o usuario chega ao fondo."
     full_name_required: "O nome completo no perfil do usuario é obrigatorio."
-    embed_username_key_from_feed: "Clave para recuperar o nome do usuario desde a fonte."
     enable_emoji: "Activar emojis"
   search:
     types:
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index f4536805ba..655be9279e 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -28,10 +28,10 @@ he:
   posts: "פוסטים"
   loading: "טוען"
   powered_by_html: 'מופעל על ידי <a href="https://www.discourse.org">דיסקורס</a>, לצפיה מיטבית יש להפעיל JavaScript'
-  log_in: "התחברות"
+  log_in: "כניסה"
   purge_reason: "נמחק אוטומטית כחשבון נטוש ולא פעיל"
   disable_remote_images_download_reason: "הורדת תמונות מרחוק נחסמה בשל היעדר מספיק שטח אחסון פנוי."
-  anonymous: "אנונימי"
+  anonymous: "אלמוני"
   remove_posts_deleted_by_author: "נמחק על ידי הכותב"
   themes:
     bad_color_scheme: "לא ניתן לעדכן את התמה, סכמת צבעים שגויה"
@@ -46,8 +46,8 @@ he:
         no_message_id_error: "קורה כאשר למייל אין 'Message-Id' בכותרת."
         auto_generated_email_error: "קורה כאשר כותרת ה״קדימות״ מכוונת ל: רשימה, זבל, תפזורת או מענה-אוטומטי, או כאשר כותרת אחרת כוללת: נשלח-אוטומטית, מענה-אוטומטי או נוצר-אוטומטית."
         no_body_detected_error: "קורה כאשר לא הצלחנו לחלץ גוף ולא היו קבצים מצורפים."
+        no_sender_detected_error: "קורה כשאנחנו לא מצליחים כתובת מייל תקינה בכותרת ״From״."
         inactive_user_error: "קורה כאשר השולח אינו פעיל."
-        blocked_user_error: "קורה כאשר השולח נחסם."
         bad_destination_address: "קורה כאשר אף אחת מהכתובות ב To/CC/Bcc לא מתאימה לאף כתובת מייל נכנסת."
         strangers_not_allowed_error: "מתרחש כאשר משתמשים מנסים ליצור נושא חדש בקטגוריה בה הם אינם חברים."
         insufficient_trust_level_error: "מתרחש כאשר משתמשים מנסים ליצור נושא חדש בקטגוריה בה אין להם את רמת האמון/הרשאה הנדרשת."
@@ -56,6 +56,7 @@ he:
         topic_closed_error: "קורה כאשר הגיעה תגובה אבל הנושא הקשור נסגר."
         bounced_email_error: "המייל הוא דוח מיילים מוחזרים"
         screened_email_error: "מתרחש כאשר כתובת הדוא\"ל של השולחים כבר סוננה."
+      unrecognized_error: "תקלה לא מוכרת"
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -121,11 +122,11 @@ he:
     user_exists: "מצטערים, המשתמשים כבר הוזמנו. ניתן להזמין משתמשים לנושא רק פעם אחת."
   backup:
     operation_already_running: "פעולה רצה כרגע. לא יכול להתחיל עבודה חדשה עכשיו."
-    backup_file_should_be_tar_gz: "קובץ הגיבוי צריך להיות .tar.gz."
-    not_enough_space_on_disk: "אין מספיק מקום על הדיסק כדי להעלות את הגיבוי הזה."
+    backup_file_should_be_tar_gz: "קובץ הגיבוי צריך להיות ‎.tar.gz."
+    not_enough_space_on_disk: "אין מספיק מקום על הכונן כדי להעלות את הגיבוי הזה."
     invalid_filename: "שם קובץ הגיבוי מכיל תווים שגויים. תווים תקינים הם a-z 0-9 . - _."
   not_logged_in: "אתם צריכים להיות מחוברים כדי לעשות את זה."
-  not_found: "המשאב או כתובת ה-URL המבוקשת לא נמצאו."
+  not_found: "המשאב או הכתובת המבוקשת לא נמצאו."
   invalid_access: "אינכם מורשים לצפות במשאב שביקשתם."
   read_only_mode_enabled: "האתר הזה במצב קריאה בלבד. פעולות אין אפשריות."
   reading_time: "זמן קריאה"
@@ -171,10 +172,12 @@ he:
   too_many_links:
     one: "מצטערים, משתמשים חדשים יכולים להוסיף רק קישור אחד בפוסט."
     other: "מצטערים, משתמשים חדשים יכולים להוסיף רק %{count} קישורים בפוסט."
+  contains_blocked_words: "הפוסט שלך מכיל מילים אסורות."
   spamming_host: "סליחה אך אינכם יכולים להוסיף קישור לאתר זה."
   user_is_suspended: "משתמשים מושעים אינם מורשים לפרסם."
   topic_not_found: "משהו השתבש אולי נושא זה נסגר או נמחק בזמן שקראתם אותו?"
   not_accepting_pms: "מצטעים,  %{username} לא מקבל הודעות כרגע."
+  max_pm_recepients: "מצטערים, אתם יכולים לשלוח הודעה לכל היותר ל-%{recipients_limit} נמענים."
   just_posted_that: "דומה מידי למה שפרסמתם לאחרונה"
   invalid_characters: "מכיל תווים לא תקניים"
   is_invalid: "נראה לא ברור, האם זה משפט שלם?"
@@ -207,6 +210,7 @@ he:
     user_posts: "פוסטים אחרונים של @%{username}"
     user_topics: "נושאים אחרונים של @%{username}"
     tag: "נושאים מתוייגים"
+    badge: "עיטור של %{display_name} ב-%{site_title}"
   too_late_to_edit: "פוסט זה נוצר לפני זמן רב מידי. לא ניתן יותר לערוך או למחוק אותו."
   revert_version_same: "הגרסה הנוכחית זהה לגרסה אליה אתם מנסים לחזור."
   excerpt_image: "תמונה"
@@ -222,6 +226,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 +237,8 @@ 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}"
   education:
     until_posts:
       one: "פוסט אחד"
@@ -315,6 +322,7 @@ he:
               too_many_users: "אתם יכולים לשלוח אזהרות רק למשתמש/ת אחד בכל פעם."
               cant_send_pm: "מצטערים, אינכם יכולים לשלוח הודעה פרטית למשתמש זה."
               no_user_selected: "עליכם לבחור משתמש/ת תקניים."
+              reply_by_email_disabled: "תגובה באמצעות מייל נוטרלה"
             featured_link:
               invalid: "אינו תקין. URL אמור לכלול http:// או https://."
               invalid_category: "לא ניתן לעריכה בקטגוריה זו."
@@ -347,6 +355,10 @@ he:
           attributes:
             execute_at:
               in_the_past: "חייב להיות בעתיד"
+        watched_word:
+          attributes:
+            word:
+              too_many: "יש יותר מדי מילים בפעולה הזו"
       <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>השדה ״אודותי״ בפרופיל שלכם הוא ריק כרגע, <a href='/u/%{username_lower}/preferences/about-me'>תרצו למלא אותו?</a></div>"
@@ -358,7 +370,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
@@ -408,6 +419,7 @@ he:
       invalid_email_in: "'%{email}' אינה כתובת מייל תקפה."
       email_already_used_in_group: "'%{email}' כבר בשימוש על ידי הקבוצה '%{group_name}'."
       email_already_used_in_category: "'%{email}' כבר בשימוש על ידי הקטגוריה '%{category_name}'."
+      description_incomplete: "לתיאור קטגוריה זו צריכה להיות לפחות פסקה אחת."
     cannot_delete:
       uncategorized: "לא ניתן למחוק תוכן ללא קטגוריה"
       has_subcategories: "לא ניתן למחוק קטגוריה זו משום שיש בה תת-קטגוריות."
@@ -428,6 +440,9 @@ he:
     leader:
       title: "מוביל"
     change_failed_explanation: "ניסיתם להוריד ברמה את %{user_name} ל- '%{new_trust_level}'. אולם רמת האמון שלהם היא כבר '%{current_trust_level}'. %{user_name} ישאר/תישאר ב-'%{current_trust_level}' - אם ברצונכם להוריד את המשתמש/ת נעלו קודם את רמת האמון"
+  post:
+    image_placeholder:
+      broken: "תמונה זו שבורה"
   rate_limiter:
     slow_down: "ביצעתם פעולה זו מספר רב מדי של פעמים. נסו שוב מאוחר יותר."
     too_many_requests: "יש לנו מגבלה יומית על מספר הפעמים שניתן לבצע פעולה זו. אנא המתינו %{time_left} לפני ניסיון חוזר."
@@ -607,12 +622,17 @@ he:
       short_description: 'הצביעו עבור פוסט זה'
       long_form: 'הצבעתם לפוסט זה'
   user_activity:
+    no_default:
+      others: "אין פעילות."
     no_bookmarks:
       self: "אין לכם פוסטים שסומנו בסימניה, סימון פוסטים מאפשר לכם לגשת אליהם בקלות בהמשך."
       others: "אין סימניות."
     no_likes_given:
       self: "לא עשיתם לייק לאף פוסט."
       others: "אין פוסטים שנעשה להם לייק."
+    no_replies:
+      self: "לא הגבתם לאף פוסט."
+      others: "אין תגובות."
   topic_flag_types:
     spam:
       title: 'ספאם'
@@ -629,7 +649,6 @@ he:
       email_title: 'הנושא "%{title}" דורש תשומת לב של מנחה'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>פוסט שלכם סומן על ידי הקהילה. בבקשה <a href="/my/messages">בדקו את ההודעות</a>.</p>'
     user_must_edit: '<p>פוסט זה סומן על ידי הקהילה וכרגע מוסתר באופן זמני.</p>'
   archetypes:
     regular:
@@ -641,7 +660,6 @@ he:
         remove: "נושא זה כבר אינו באנר. הוא לא יופיע יותר בראש כל עמוד."
   unsubscribed:
     title: "בוטל המנוי!"
-    description: "הוסרתם מהרשימות. כדי לשנות את אפשרויות המייל שלכם <a href='%{url}'>בקרו בהגדרות המשתמש שלכם</a>."
     topic_description: "כדי להרשם מחדש ל %{link}, השתמשו בהגדרות ההתראות בתחתית או משמאל לנושא."
   unsubscribe:
     title: "בטלו את המנוי"
@@ -852,15 +870,15 @@ 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: "כמה דקות לפני שמשתמש יכול לפרסם את אותו תוכן שוב"
     educate_until_posts: "כאשר המשתמש/ת מתחילים להקיש את (n) הפוסטים הראשונים שלהם, הציגו פאנל הנחיה למשתמש באזור חיבור הפוסטים."
     title: "שם האתר הזה, כפי שהוא משמש בתגית הכותרת."
     site_description: "תארו את האתר הזה במשפט אחד, כפי שהוא מופיע במטא-תגית התיאור."
-    contact_email: "כתובת דוא\"ל של אנשי קשר האחראים לאתר זה. משמשת להתראות חשובות, כמו דגלים שלא טופלו, כמו גם ליצירת קשר בשעת חירום מעמוד האודות."
     contact_url: "כתובת URL ליצירת קשר לעמוד זה. משמשת בטופס ה- /about לעניינים דחופים."
-    queue_jobs: "מפתחים בלבד! אזהרה! כברירת מחדל, שימו עבודות בתור sidekiq. אם מנוטרל, האתר שלכם ישבר."
     crawl_images: "אחזור תמונות מכתובת URL רחוקה כדי להכניס את מימדי האורך והרוחב הנכונים."
     download_remote_images_to_local: "המרת תמונות מרחוק לתמונות מקומיות באמצעות הורדות; למניעת שגיאות של תמונות חסרות"
     download_remote_images_threshold: "שטח האכסון המינימלי (באחוזים) הנדרש להורדת תמונות באופן מקומי"
@@ -875,7 +893,6 @@ he:
     fixed_category_positions: "אם אפשרות זו מסומנת, תוכלו  לארגן את הקטגוריות כך שיופיעו בסדר קבוע. אם האופציות אינן מסומנות, הקטגוריות יסודרו על פי סדר הפעילות שהתבצעה בהן."
     fixed_category_positions_on_create: "אם האפשרות תסומן, סדר הקטגוריות יוגדר בתפריט יצירת נושא (דורש fixed_category_positions)."
     add_rel_nofollow_to_user_content: "הוספת התווית rel nofollow לכל תוכן שפורסם על ידי המשתמש/ת, פרט לקישורים פנימיים (כולל מתחם הורה parent domains). אם תשנו אפשרות זו, עליכם לאפות מחדש את כל הפרסומים עם: \"rake posts:rebake\""
-    exclude_rel_nofollow_domains: "רשימת דומיינים שלקישורים אליהם לא יתווסף nofollow. לדומיין tld.com אוטומטית יצטרף sub.tld.com גם כן. בתור מינימום, כדאי לכם להוסיף את הדומיין העליון של אתר זה, כדי להקל על זחלני רשת למצוא תוכן. אם חלקים אחרים של האתר שלכם נמצאים בדומיינים אחרים, הוסיפו אותם גם כן."
     post_excerpt_maxlength: "אורך מקסימלי של קטע פוסט / סיכום."
     show_pinned_excerpt_mobile: "הצגת קטע בנושאים נעוצים במבט ניידים."
     show_pinned_excerpt_desktop: "הצגת קטע בנושאים נעוצים בתצוגת מחשב-שולחני."
@@ -886,7 +903,6 @@ he:
     digest_logo_url: "תמונת הלוגו האלטרנטיבי שמשמשת בראש המיילים של הסיכום מאתרכם. אמורה להיות צורה מלבנית מוארכת. צריכה לא להיות תמונת SVG. אם נשאר ריק ייעשה שימוש ב `logo_url`."
     logo_small_url: "תמונת לוגו קטנה בפינה הימנית עליונה של האתר, אמורה להיות ריבועית, נראית כאשר גוללים למטה. אם נשארת ריקה תוצג צלמית בית."
     favicon_url: "צלמית favicon לאתר שלכם, ראו http://en.wikipedia.org/wiki/Favicon, כדי שתעבוד כמו שצריך עם CDN חייבת להיות png"
-    mobile_logo_url: "תמונת הלוגו הקבועה לצד ימין למעלה של האתר הנייד שלכם. אמורה להיות ריבועית. אם משאירים ריקה, ייעשה שימוש ב `logo_url`. למשל: http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "אייקון שמשמש למכשירי טאץ׳ של אפל. גודל מומלץ 144 על 144 פיקסלים."
     notification_email: "מאת: נעשה שימוש בכתובת מייל זו כאשר שולחים את כל הודעות המערכת הנדרשות. כדי שהודעות הדוא\"ל יגיעו, המתחם (domain) המצויין כאן חייב לכלול SPF, DKIM ורשומות reverse PTR מוגדרים כהלכה."
     email_custom_headers: "רשימה מופרדת pipes (הסימון |) של כותרות מייל מותאמות אישית"
@@ -912,20 +928,12 @@ he:
     tl2_additional_likes_per_day_multiplier: "להגדיל את כמות הלייקים האפשרית ביום עבור tl2 (משתמש) באמצעות הכפלה במספר זה. "
     tl3_additional_likes_per_day_multiplier: "להגדיל את כמות הלייקים האפשרית ביום עבור רמת-אמון 3 (רגיל) באמצעות הכפלה במספר זה."
     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: "אם פוסטים של משתמשים חדשים מקבלים num_tl3_flags_to_block_new_user דגלים מכמות זו של משתמשים ברמת אמון 3, הסתירו את הפוסטים שלהם ומנעו פרסומים עתידיים. 0 לניטרול."
-    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 כדי לנטרל התראות."
     maximum_session_age: "משתמשים ישארו מחוברים ל n שעות מאז ביקורם האחרון"
-    ga_tracking_code: "מיושן: קוד גוגל אנליטיקס (ga.js) למעקב, כגון: UA-12345678-9ֿ; ראו http://google.com/analytics"
-    ga_domain_name: "מיושן: שם מתחם (דומיין) לגוגל אנליטיקס (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: "מזהה קונטיינר של מנהל תגיות גוגל. למשל: GTM-ABCDEF"
@@ -933,6 +941,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: "פריטי התפריט להסתרה כברירת מחדל בתפריט הפוסט, אלא אם כן נלחץ לחצן ההרחבה."
@@ -956,12 +965,9 @@ he:
     allow_index_in_robots_txt: "פרטו ב-robots.txt שלאתר זה מותר להיות מאונדקס על ידי מנועי חיפוש."
     email_domains_blacklist: "רשימה מופרדת בצינור (pipe) של דומיינים של אימייל אשר מהם משתמשים לא מורשים לרשום חשבונות. למשל: mailinator.com|trashmail.net"
     email_domains_whitelist: "רשימה מופרדת בצינור (pipe) אשר ר-ק ממנה משתמשים יכולים לרשום חשבונות. א-ז-ה-ר-ה: משתמשים עם אימיילים מדומיינים אחרים לא יורשו!"
-    forgot_password_strict: "אל תיידעו משתמשים בנוגע לקיום חשבון כשהם משתמשים באפשרות של ״שכחתי סיסמה״."
     log_out_strict: "בהתנתקות, נתקו את כל ההפעלות של המשתמש/ת בכל המכשירים"
     version_checks: "שלחו פינג להאב של Discourse לעדכוני גרסה וכדי להציג מסרים אודות גרסאות בלוח התצוגה ב /admin"
     new_version_emails: "שלחו דוא\"ל לכתובת של contact_email כשגרסה חדשה של Discourse זמינה."
-    port: "מ-פ-ת-ח-י-ם ב-ל-ב-ד! א-ז-ה-ר-ה! התמשו בפורט זה ל HTTP במקום בפורט 80. השאירו ריק בשביל ברירת המחדל פורט 80."
-    force_hostname: "מ-פ-ת-ח-י-ם ב-ל-ב-ד! א-ז-ה-ר-ה! הגדירו שם שרת ב URL. השאירו ריק בשביל ברירת המחדל."
     invite_expiry_days: "מה התוקף מפתחות הזמנת משתמשים, בימים"
     invite_passthrough_hours: "כמה זמן, בשעות, יכולים משתמשים לעשות שימוש בהזמנה שנשלחה כדי להתחבר "
     invite_only: "הרשמה פומבית מנוטרלת, כל המשתמשים החדשים חייבים להיות מוזמנים על ידי הצוות."
@@ -1045,7 +1051,6 @@ he:
     clean_up_uploads: "הסירו העלאות יתומות וללא הפניה כדי למנוע אירוח בלתי חוקי של חומר. אזהרה: אתם עלולי לרצות לגבות את תיקיית ה-/uploads שלכם לפנו שתאפשרו הגדרה זו."
     clean_orphan_uploads_grace_period_hours: "תקופת חסד (בשעות) לפני שהעלאות יתומות מוסרות."
     purge_deleted_uploads_grace_period_days: "תקופת חסד (בימים) לפני שהעלאה שהוסרה תמחק."
-    purge_unactivated_users_grace_period_days: "תקופת חסד (בימים) לפני שמשתמשים שלא הפעילו את חשבונם ימחקו."
     enable_s3_uploads: "אחסן העלאות (uploads) על תשתית של Amazon S3. חשוב: מצריך מפתח גישה + מפתח גישה סודי שיהיו חוקיים."
     s3_use_iam_profile: 'השתמש ב-AWS EC2 IAM role על מנת לאחזר מפתחות. שימו לב: איפשור של זה ידרוס את ההגדרות "S3 access key id" וכן את "s3 secret access key".'
     s3_upload_bucket: "שם של Amazon S3 bucket אליו יועלו קבצים. אזהרה: שם זה חייב להיות באותיות קטנות, ללא נקודות וללא קווים תחתונים."
@@ -1060,6 +1065,8 @@ 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: "אפשרו לחברי צוות להעלות כל קובץ בהודעה פרטית."
+    strip_image_metadata: "הסרת מטה-דאטה מהתמונה"
     enable_flash_video_onebox: "אפשרו הטמעת קישורי swf ו-flv (פלאש של אדובי) ב Oneboxes. אזהרה: עלול להביא לבעיות אבטחה באתר."
     default_invitee_trust_level: "ברירת מחדל של רמת אמון (0-4) של משתמשים מוזמנים."
     default_trust_level: "רמת אמון (0-4) לכל המשתמשים החדשים. אזהרה! שינוי של משתנה זה שם אתכם בסיכון רציני לספאם."
@@ -1151,9 +1158,6 @@ he:
     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: "ביטוי רגולרי case insensitive שאם הוא מתקיים יגרום לפוסט הראשון מהמשתמש להחסם ולהשלח לתור האישורים. למשל raging|a[bc]a , יגרום לכל הפוסטים שמכילים raging או aba או aca קודם כל להחסם. רלוונטי רק לפוסט הראשון."
     reply_by_email_enabled: "אפשרו  תגובה לנושאים באמצעות הדוא\"ל."
     reply_by_email_address: "תבנית עבור כתובות מייל של מענה באמצעות אימייל, למשל: {reply_key}@reply.example.com או  replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "רשימה של כמה תבניות לתגובות במייל באמצעות כתובות מייל נכנסות. למשל: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
@@ -1192,7 +1196,6 @@ he:
     pop3_polling_username: "שם המשתמש/ת לחשבון ה-POP3 לתשאול דוא\"ל."
     pop3_polling_password: "הסיסמה לחשבון ה-POP3 למשיכת הדוא\"ל."
     log_mail_processing_failures: "רישום של כל בעיות העיבוד ל http://yoursitename.com/logs"
-    email_in: "אפשרו למשתמשים לפרסם נושאים חדשים באמצעות דוא\"ל (דורש תשאול באמצעות pop3). הגדירו את הכתובת בלשונית \"הגדרות\" עבור כל קטגוריה."
     email_in_min_trust: "רמת האמון המינימלית הנדרשת למשתמשים כדי שיוכלו להעלות נושאים חדשים באמצעות הדוא\"ל."
     email_prefix: "ה[תווית] שתשמש כנושא של מיילים. אם לא יוגדר, ברירת המחדל תכוון ל'כותרת' אם לא יוגדר אחרת."
     email_site_title: "הכותרת של האתר שתשמש כשם השולח של דוא\"ל מהאתר. במידה ולא יוגדר ערך, תכוון ברירת המחדל ל\"כותרת\". אם ה\"כותרת\" שלכם מכילה תוים שאינם מותרים לשימוש במחרוזות \"שם השולח\" בדוא\"ל, השתמשו בהגדרה זו."
@@ -1200,7 +1203,6 @@ he:
     relative_date_duration: "מספר הימים לאחר פרסום בהם תאריך הפוסט מופיע כתאריך יחסי (7 ימים) לעומת תאריך רגיל (20 בפברואר)."
     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: "אפשרו למשתמשים להעלות תמונות פרופיל משלהם."
@@ -1215,7 +1217,6 @@ he:
     suppress_digest_email_after_days: "השתקת מיילים של סיכום למשתמשים שלא נראו באתר למעלה מ (n) ימים."
     digest_suppress_categories: "וותרו על קטגוריות אלו במיילים מסכמים."
     disable_digest_emails: "בטל סיכומי מיילים לכל המשתמשים."
-    email_accent_bg_color: "צבע האקסנט שיעשה בו שימוש כרקע לחלק מהאלמנטים של מיילים מסוג HTML. הכניסו שם צבע ('red') או ערך הקסדצימלי ('#FF000')."
     email_accent_fg_color: "צבע הטקסט שמופיע על צבע הרקע של מיילים מסוג HTML. הכניסו שם צבע ('white') או ערך הקסדצימלי ('#FFFFFF')."
     email_link_color: "צבע הקישורים במיילים מסוג HTML. הכניסו שם צבע ('blue') או ערך הקסדצימלי ('#0000FF')."
     detect_custom_avatars: "האם לבדוק או לא לבדוק שמשתמשים העלו תמונות פרופיל אישיות."
@@ -1254,18 +1255,10 @@ he:
     warn_reviving_old_topic_age: "כאשר מישהם מתחילים להגיב לנושא שבו התגובה האחרונה היא בת יותר מכמה ימים, אזהרה תוצג. נטרלו באמצעות הזנה של 0."
     autohighlight_all_code: "לחייב שימוש בקוד הדגשה לכל קוד מעוצב מראש (preformatted code blocks) אפילו אם הם אינם מציינים את השפה."
     highlighted_languages: "כולל הדגשת כללי תחביר (syntax). (אזהרה: הכללת שפות רבות מידי עשויה להשפיע על הביצועים) ראו: https://highlightjs.org/static/demo/ להדגמה."
-    feed_polling_enabled: "הטמעה בלבד: האם להטמיע תזרימים של RSS/ATOM כפוסטים."
-    feed_polling_url: "הטמעה בלבד: URL של תזרים RSS/ATOM להטמעה."
-    feed_polling_frequency_mins: "שילוב בלבד: תדירות משיכה"
-    embed_by_username: "שם המשתמש של המשתמש/ת שיוצר את הנושאים המוטמעים."
-    embed_username_key_from_feed: "מפתח למשיכת שם המשתמש ב-discourse מהתזרים."
-    embed_title_scrubber: "ביטויים רגולריים כדי לנקות כותרות מוטמעות."
     embed_truncate: "חיתוך הפוסטים המוטמעים."
     allowed_href_schemes: "פרוטוקולים מותרים בלינקים בנוסף ל http ו https."
     embed_post_limit: "מספר מקסימלי של פוסטים להטמעה."
     embed_username_required: "נדרש שם משתמש ליצירת הנושא."
-    embed_whitelist_selector: "בוררי CSS לאלמנטים שיותר להטמיע."
-    embed_blacklist_selector: "בוררי CSS לאלמנטים שיוסרו מן ההטמעות."
     notify_about_flags_after: "אם יש דגלים שלא טופלו לאחר מספר זה של שעות, שילחו הודעה פרטית לצוות. קיבעו ל 0 כדי לנטרל."
     show_create_topics_notice: "אם לאתר פחות מ-5 נושאים פומביים, הציגו מודעה המבקשת מן המנהלים ליצור עוד נושאים."
     delete_drafts_older_than_n_days: מחקו טיוטות בנות יותר מ (n) ימים.
@@ -1282,6 +1275,7 @@ he:
     auto_close_messages_post_count: "מספר פוסטים מקסימלי בהודעה לפני שהיא נסגרת אוטומטית (0 לניטרול)"
     auto_close_topics_post_count: "מספר מקסימלי של פוסטים בנושא לפני שהוא נסגר אוטומטית (0 לניטרול)"
     code_formatting_style: "כפתור קוד בדפדפן יציע אוטומטית סגנון קידוד זה"
+    max_allowed_message_recipients: "מספר מקסימלי של נמענים מותר בהודעה."
     default_email_digest_frequency: "באיזו תדירות משתמשים יקבלו סיכומי מיילים כברירת מחדל."
     default_include_tl0_in_digests: "כללו פוסטים ממשתמשים חדשים בדוא\"ל מסכם כברירת מחדל. משתמשים יוכלו לשנות זאת בהעדפות האישיות."
     default_email_private_messages: "שלח מייל כשמישהו שולח הודעה למשתמש, בתור ברירת מחדל."
@@ -1305,8 +1299,6 @@ he:
     default_categories_tracking: "רשימת קטגוריות שנעקבת כברירת מחדל."
     default_categories_muted: "רשימת קטגוריות שמושתקות כברירת מחדל."
     default_categories_watching_first_post: "רשימת קטגוריות שבה הפוסט הראשון בכל נושא ייצפה אוטומטית."
-    max_user_api_reqs_per_day: "המספר המקסימלי של בקשות API של משתמש ליום"
-    max_user_api_reqs_per_minute: "המספר המקסימלי של בקשות API של משתמש לדקה"
     allow_user_api_keys: "איפשור יצירת מפתחות API למשתמשים"
     allow_user_api_key_scopes: "רשימת אזורים מותרים למפתחות API של משתמשים"
     max_api_keys_per_user: "מספר מקסימלי של מפתחות API של משתמש לכל משתמש"
@@ -1352,6 +1344,7 @@ he:
       email_polling_disabled: "עליכם לאפשר ידני או תשאול POP3 לפני שתאפשרו מענה באמצעות מייל."
       user_locale_not_enabled: "לפני שתוכלו להפעיל אפשרות זאת, יש לאפשר \"הגדרות מקומיות מותאמות משתמש/ת\""
       invalid_regex: "ביטוי רגולרי לא תקין או לא מותר."
+      enable_sso_disabled: "אתם חייבים קודם כל לאפשר ״אפשור sso״ לפני שאתם מאפשרים הגדרה זו."
   search:
     within_post: "#%{post_number} פוסטים של %{username}"
     types:
@@ -1468,7 +1461,6 @@ he:
     email_too_long: "המייל שהזנת ארוך מדי. שמות מייל צריכים להכיל לכל היותר 254 תוים, ושמות דומיין צריכים להכיל לכל היותר 253 תוים."
     reserved_username: "שם משתמש זה אינו מורשה."
     missing_user_field: "לא מילאת את כל שדות המשתמש/ת"
-    close_window: "האימות הושלם. סגרו חלון זה כדי להמשיך."
     already_logged_in: "אופס, נראה שאתם מנסים לקבל הזמנה שנועדה למשתמש אחר. אם אתם לא %{current_user}, אנא התנתקו ונסו שוב."
   user:
     no_accounts_associated: "אין חשבונות מקושרים."
@@ -1480,7 +1472,6 @@ he:
     username:
       short: "חייבים להיות לפחות %{min} תווים"
       long: "נדרשים לא יותר מ-%{max} תווים"
-      characters: "חייב לכלול מספרים, אותיות ומקפים תחתונים בלבד."
       unique: "חייב להיות ייחודי"
       blank: "חייב להיות מלא"
       must_begin_with_alphanumeric_or_underscore: "חייב להתחיל באות, מספר, או קו תחתון"
@@ -1516,72 +1507,12 @@ 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}"
-    text_body_template: |
-      %{invitee_name} הזמין/ה אתכם להצטרף
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      אם אתם מעוניינים, לחצו על הקישור למטה:
-
-      %{invite_link}
   custom_invite_forum_mailer:
     title: "דואר הזמנה לפורום מותאם אישית"
-    subject_template: "%{invitee_name} הזמין/ה אתכם להצטרף ל %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} הזמין/ה אתכם להצטרף
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      עם ההערה הזו
-
-      > %{site_description}
-
-      אם אתם מעוניינים, לחצו על הקישור למטה:
-
-      %{invite_link}
   invite_password_instructions:
     title: "הנחיות סיסמה למוזמנים"
     subject_template: "צרו סיסמה עבור חשבון ה-%{site_name} שלכם."
@@ -1657,44 +1588,9 @@ he:
   new_version_mailer:
     title: "שולח-מיילים של גרסה חדשה"
     subject_template: "[%{email_prefix}] גרסת Discourse חדשה, עדכון זמין."
-    text_body_template: |
-      יש! יצאה גרסה חדשה של [Discourse](http://www.discourse.org)
-
-      הגרסה שלכם: %{installed_version}
-      הגרסה החדשה: **%{new_version}**
-
-      - שדרגו באמצעות כפתור **[שדרוג בלחיצה-אחת בדפדפן](%{base_url}/admin/upgrade)** הפשוט שלנו
-
-      - בידקו מה חדש ב[יומן השינויים בגיטהאב](https://github.com/discourse/discourse/commits/master)
-
-      - בקרו את [meta.discourse.org](https://meta.discourse.org) לחדשות, דיונים, ותמיכה ב Discourse
   new_version_mailer_with_notes:
     title: "שולח-מיילים של גרסה חדשה עם הערות"
     subject_template: "[%{email_prefix}] עדכון זמין"
-    text_body_template: |
-      יש! יצאה גרסה חדשה של [Discourse](http://www.discourse.org)
-
-      הגרסה שלכם: %{installed_version}
-      הגרסה החדשה: **%{new_version}**
-
-      - שדרגו באמצעות כפתור **[שדרוג בלחיצה-אחת בדפדפן](%{base_url}/admin/upgrade)** הפשוט שלנו
-
-      - בידקו מה חדש ב[יומן השינויים בגיטהאב](https://github.com/discourse/discourse/commits/master)
-
-      - בקרו ב-[meta.discourse.org](https://meta.discourse.org) לחדשות, דיונים, ותמיכה ב Discourse
-
-      ### הערות בנוגע לגרסה
-
-      %{notes}
-  queued_posts_reminder:
-    title: "תזכורת פוסטים בתור"
-    subject_template:
-      one: "[%{site_name}] פוסט 1 ממתין לסקירה"
-      other: "[%{email_prefix}] %{count} פוסטים ממתינים לסקירה"
-    text_body_template: |
-      שלום,
-
-      פוסטים של משתמשים חדשים הושהו לצורך בדיקה והם כרגע ממתינים לסקירה. [אשרו או דחו אותם כאן](%{base_url}/queued-posts).
   flag_reasons:
     off_topic: "הפוסט שלכם סומן כ **מחוץ לנושא**: הקהילה מרגישה שהוא לא מתאים לנושא, כפי שמוגדר על ידי הכותרת והפוסט הראשון. "
     inappropriate: "התגובה שלך סומנה כ**לא מתאימה**: הקהילה מרגישה שהיא פוגענית או הפרה של [הנחיות הקהילה](/guidelines)"
@@ -1715,20 +1611,6 @@ he:
     post_hidden:
       title: "פוסט חבוי"
       subject_template: "פוסט הוסתר על ידי דגלים של הקהילה"
-      text_body_template: |
-        שלום,
-
-        זוהי הודעה אוטומטית מ %{site_name} כדי ליידע אתכם שפוסט שלכם הוחבא.
-
-        %{base_url}%{url}
-
-        %{flag_reason}
-
-        מספר חברי קהילה דיגלו פוסט זה לפני שהוא הוחבא, אז אנא שיקלו לערוך אותו כדי לענות על המשוב שלהם. **אתם יכולים לערוך את הפוסט שלכם לאחר %{edit_delay} דקות, והוא יוצג מחדש אוטומטית.**
-
-        אך עם זאת, אם הפוסט יוחבא שוב על ידי הקהילה, הוא יישאר מוחבא עד לטיפול של חבר צוות - וייתכן ותנקט פעולה נוספת, כולל השהייה אפשרית של החשבון.
-
-        להנחיות נוספות, אנא פנו ל[הנחיות הקהילה](%{base_url}/guidelines).
     usage_tips:
       text_body_template: |
         לכמה טיפים זריזים בנוגע להתחלה כמשתמשים חדשים, [קיראו פוסט זה](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
@@ -1823,28 +1705,15 @@ he:
     csv_export_failed:
       title: "יצוא CSV נכשל"
       subject_template: "ייצוא הנתונים נכשל"
-      text_body_template: "צר לנו, אך ייצוא הנתונים שלכם נכשל. אנא בדקו את רישומי המערכת או צרו קשר עם איש/אשת צוות."
     email_reject_insufficient_trust_level:
       title: "מייל נדחה, רמת אמון לא מספיקה"
       subject_template: "[%{email_prefix}] בעיית מייל -- רמת אמון לא מספיקה"
-      text_body_template: |
-        אנחנו מצטערים, אך הודעת המייל שלכם ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
-
-        לחשבון שלכם אין את רמת האמון הנדרשת כדי לפרסם נושאים חדשים לכתובת מייל זו. אם אתם חושבים שזו טעות, אנא פנו לחבר צוות.
     email_reject_user_not_found:
       title: "מייל נדחה, משתמש לא נמצא"
       subject_template: "[%{email_prefix}] בעיית מייל -- משתמש לא נמצא"
-      text_body_template: |
-        אנחנו מצטערים, אבל הודעת המייל שלכם ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
-
-        התגובה שלכם נשלחה מכתובת מייל לא ידועה. נסו לשלוח מכתובת מייל אחרת, או ליצור קשר עם חבר צוות.
     email_reject_screened_email:
       title: "מייל נדחה, מייל מסונן"
       subject_template: "[%{email_prefix}] בעיית מייל -- מייל חסום"
-      text_body_template: |
-        אנחנו מצטערים, אך הודעת המייל ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
-
-        התשובה שלכם נשלחה מכתובת מייל חסומה. נסו לשלוח מכתובת מייל אחרת, או צרו קשר עם חבר צוות.
     email_reject_inactive_user:
       title: "מייל נדחה, משתמש לא פעיל"
       subject_template: "[%{email_prefix}] בעיית מייל -- משתמש לא-פעיל"
@@ -1852,27 +1721,12 @@ he:
         אנחנו מצטערים, אך הודעת המייל שלכם ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
 
         החשבון שלכם שמקושר לכתובת המייל הזו לא הופעל. אנא הפעילו את החשבון שלכם לפני שאתם שולחים מיילים למערכת.
-    email_reject_blocked_user:
-      title: "מייל נדחה, משתמש חסום"
-      subject_template: "[%{email_prefix}] בעיית מייל -- משתמש חסום"
-      text_body_template: |
-        אנחנו מצטערים, אך הודעת המייל שלכם ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
-
-        חשבונכם שקשור לכתובת מייל זו נחסם.
     email_reject_reply_user_not_matching:
       title: "דחיית מייל משתמש/ת לא מתאימים"
       subject_template: "[%{email_prefix}] בעיית מייל -- נמען לא תואם"
-      text_body_template: |
-        אנחנו מצטערים, אך הודעת המייל שלכם ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
-
-        התשובה שלכם נשלחה מכתובת מייל שונה מזו שציפינו לה, אז אנחנו לא בטוחים אם זה אותו אדם. נסו לשלוח מכתובת מייל אחרת, או ליצור קשר עם חבר צוות.
     email_reject_no_account:
       title: "מייל נדחה, אין חשבון"
       subject_template: "[%{email_prefix}]  בעיית מייל -- חשבון לא מזוהה"
-      text_body_template: |
-        אנחנו מצטערים, אך הודעת המייל שלכם ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
-
-        אנחנו לא מוצאים חשבונות שמתאימים לכתובת המייל שלכם. נסו לשלוח מכתובת מייל אחרת, או צרו קשר עם חבר צוות.
     email_reject_empty:
       title: "מייל נדחה, ריק"
       subject_template: "[%{email_prefix}]  בעיית מייל -- ללא תוכן"
@@ -1892,17 +1746,9 @@ he:
     email_reject_invalid_access:
       title: "דחיית מייל גישה לא-מורשית"
       subject_template: "[%{email_prefix}]  בעיית מייל -- גישה לא תקינה"
-      text_body_template: |
-        אנחנו מצטערים, אבל הודעת המייל שלכם ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
-
-        לחשבון שלכם אין מספיק הרשאות כדי לפרסם נושאים חדשים בקטגוריה זו. אם אתם מאמינים שזו טעות, צרו קשר עם חבר צוות.
     email_reject_strangers_not_allowed:
       title: "דחיית מייל זרים לא מורשים"
       subject_template: "[%{email_prefix}] בעיית מייל -- גישה לא נכונה"
-      text_body_template: |
-        אנחנו מצטערים, אבל הודעת המייל שלכם ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
-
-        הקטגוריה ששלחתם אליה את המייל הזה מאפשרת רק תגובות ממשתמשים עם חשבונות תקינים וכתובות מייל ידועות. אם אתם מאמינים שזו טעות, אנא פנו לחבר צוות.
     email_reject_invalid_post:
       title: "דחיית מייל פוסט לא-תקין"
       subject_template: "[%{email_prefix}] בעיית מייל -- תקלה בפרסום"
@@ -1931,38 +1777,20 @@ he:
     email_reject_reply_key:
       title: "דחיית מייל מפתח תגובה"
       subject_template: "[%{email_prefix}]  בעיית מייל -- תו תגובה לא מוכר"
-      text_body_template: |
-        אנחנו מצטערים, אך הודעת המייל שלכם ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
-
-        מפתח התגובה במייל לא תקין או לא ידוע, אז לא יכולנו להבין למה המייל הזה מגיב. אנא פנו לחבר צוות.
     email_reject_bad_destination_address:
       title: "דחיית מייל כתובת יעד לא-נכונה"
       subject_template: "[%{email_prefix}] בעיית מייל -- כתובת To: לא ידועה"
-      text_body_template: |
-        אנחנו מצטערים, אבל הודעת המייל שלכם ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
-
-        אף אחד מייעדי המייל לא זוהה. אנא וודאו שאתם שולחים לכתובת המייל הנכונה שניתנה על-ידי הצוות.
     email_reject_topic_not_found:
       title: "דחיית מייל נושא לא נמצא"
       subject_template: "[%{email_prefix}]  בעיית מייל -- לא נמצא נושא"
-      text_body_template: |
-        אנחנו מצטערים, אך הודעת המייל ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
-
-        הנושא שאתם מנסים להגיב אליו כבר לא קיים -- אולי הוא נמחק? אם אתם מאמינים שזו טעות, אנא פנו לחבר צוות.
     email_reject_topic_closed:
       title: "דחיית מייל נושא סגור"
       subject_template: "[%{email_prefix}]  בעיית מייל -- נושא נסגר"
-      text_body_template: |
-        אנחנו מצטערים, אך הודעת המייל ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
-
-        הנושא שאתם מגיבים אליו סגור כרגע ולא מקבל יותר תגובות. אם אתם מאמינים שזו טעות, אנא פנו לחבר צוות.
     email_reject_auto_generated:
       title: "דחיית מייל נוצר אוטומטית"
       subject_template: "[%{email_prefix}]  בעיית מייל -- תגובה נוצרה אוטומטית"
-      text_body_template: |
-        אנחנו מצטערים, אבל משהו לא עבד עם הודעת הדוא"ל שלך, שנשלחה אל %{destination} (titled %{former_title}).
-
-        המייל ששלחת סומן כ"נכתב אוטומטית", מה שאומר שהוא נכתב על ידי מחשב ולא הוקלד על ידי אדם; איננו יכולים לקבל מיילים שכאלה. אם אתם מאמינים שזוהי תקלה, אנא צרו קשר עם איש/אשת צוות.
+    email_reject_unrecognized_error:
+      subject_template: "[%{email_prefix}] בעיה עם הדוא״ל -- שגיאה לא מוכרת"
     email_error_notification:
       title: "התראת בעיית מייל"
       subject_template: "[%{email_prefix}]  בעיית מייל -- בעיית אימות POP"
@@ -1975,67 +1803,9 @@ he:
     too_many_spam_flags:
       title: "יותר מידי דיגלי ספאם"
       subject_template: "חשבון חדש בהשהיה"
-      text_body_template: |
-        שלום,
-
-        זוהי הודעה אוטומטית מ %{site_name} כדי ליידע אתכם שהפוסטים שלכם מוחבאים זמנית כיוון שהם דוגלו על ידי הקהילה.
-
-        כאמצעי זהירות, חשבונכם החדש נחסם מליצור תגובות או נושאים חדשים עד שחבר צוות יסקור את חשבונכם. אנחנו מצטערים על חוסר הנוחות.
-
-        להנחיות נוספות, אנא פנו ל[הנחיות הקהילה](%{base_url}/guidelines).
     too_many_tl3_flags:
       title: "יותר מידי דגלי רמת-אמון 3"
       subject_template: "חשבון חדש בהשהיה"
-      text_body_template: |
-        שלום,
-
-        זוהי הודעה אוטומטית מ %{site_name} כדי ליידע אתכם שחשבונכם הושהה בגלל דגלים רבים מהקהילה.
-
-        כאמצעי זהירות, חשבונכם החדש נחסם מליצור תגובות או נושאים חדשים עד שחבר צוות יוכל לסקור את חשבונכם. אנחנו מתנצלים על חוסר הנוחות.
-
-        לפרטים נוספים, אנא פנו ל[הנחיות הקהילה](%{base_url}/guidelines).
-    blocked_by_staff:
-      title: "נחסם על ידי הצוות"
-      subject_template: "חשבון זמנית בהשהיה"
-      text_body_template: |
-        שלום,
-
-        זוהי הודעה אוטומטית מ %{site_name} כדי ליידע אתכם שהחשבון שלכם הושהה באופן זמני כאמצעי זהירות.
-
-        אנא המשיכו לבקר, אך לא תוכלו לענות או ליצור נושאים עד ש[חבר צוות](%{base_url}/about) יסקור את הפוסטים האחרונים שלכם. אנחנו מתנצלים על אי הנוחות.
-
-        להנחיות נוספות, אנא פנו ל[הנחיות הקהילה](%{base_url}/guidelines).
-    user_automatically_blocked:
-      title: "משתמש נחסם אוטומטית"
-      subject_template: "המשתמש החדש %{username} נחסם על ידי דגלים של הקהילה"
-      text_body_template: |
-        זוהי הודעה אוטומטית.
-
-        המשתמש החדש [%{username}](%{user_url}) נחסם אוטומטית כיוון שמספר משתמשים דיגלו פוסטים שלו.
-
-        אנא [סיקרו את הדגלים](%{base_url}/admin/flags). אם %{username} נחסם בטעות מלפרסם, לחצו על כפתור שחרור הנעילה ב [דף הניהול למשתמש זה](%{user_url}).
-
-        סף זה ניתן לשינוי באמצעות הגדרת האתר `block_new_user`.
-    spam_post_blocked:
-      title: "פוסט ספאם נחסם"
-      subject_template: "פוסים של המשתמש/ת החדש/ה %{username} נחסמו בשל קישורים חוזרים."
-      text_body_template: |
-        זוהי הודעה אוטומטית.
-
-        המשתמש החדש [%{username}](%{user_url}) ניסה ליצור מספר פוסטים עם קישורים ל %{domains}, אבל הפוסטים האלו נחסמו כדי למנוע ספאם. המשתמש עדיין יכול ליצור פוסטים חדשים שלא מקשרים ל %{domains}.
-
-        אנא [סיקרו את המשתמש](%{user_url}).
-
-        ניתן לכוון זאת בהגדרות האתר `newuser_spam_host_threshold` ו`white_listed_spam_host_domains`.
-    unblocked:
-      title: "לא-חסום"
-      subject_template: "החשבון כבר לא מושהה"
-      text_body_template: |
-        שלום,
-
-        זוהי הודעה אוטומטית מ %{site_name} כדי ליידע אתכם שהחשבון שלכם כבר לא מושהה לאחר סקירה של הצוות.
-
-        אתם יכולים עכשיו ליצור נושאים חדשים, ושוב להגיב לנושאים קיימים. תודה על הסבלנות.
     pending_users_reminder:
       title: "תזכורת משתמשים ממתינים"
       subject_template:
@@ -2059,12 +1829,8 @@ he:
     new_user_of_the_month:
       title: "אתם המשתמשים החדשים של החודש!"
       subject_template: "אתם המשתמשים החדשים של החודש!"
-      text_body_template: |
-        ברכות, זכיתם ב-**פרס המשתמש החדש של החודש עבור %{month_year}**. :trophy:
-
-        פרס זה ניתן רק לשני משתמשים חדשים בכל חודש, והוא תמיד ייראה ב[דף המשתמש/ת שלכם](/my/badges).
-
-        הפכתם במהרה לחברים מוערכים בקהילה שלנו. תודה שהצטרפתם, והמשיכו בעבודה הנהדרת!
+    queued_posts_reminder:
+      title: "תזכורת פוסטים בתור"
   unsubscribe_link: |
     כדי להפסיק את המיילים האלו, [לחצו כאן](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -2090,26 +1856,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 +2003,6 @@ he:
       popular_posts: "פוסטים פופולאריים"
       more_new: "חדש בשבילכם"
       subject_template: "[%{email_prefix}] סיכום"
-      unsubscribe: "סיכום זה נשלח מ %{site_link} כאשר אנחנו לא רואים אתכם לאורך זמן. כדי לבטל את המנוי %{unsubscribe_link}."
       click_here: "לחצו כאן"
       from: "סיכום %{site_name}"
       preheader: "סיכום קצר מאז ביקורכם האחרון ב-%{last_seen_at}"
@@ -2347,8 +2092,8 @@ he:
     search_google: "גוגל"
   login_required:
     welcome_message: |
-      #[ברוכים הבאים אל %{title}](#welcome)
-      נדרש חשבון. אנא צרו חשבון או התחברו כדי להמשיך.
+      ## [ברוך בואך אל %{title}](#welcome)
+      נדרש חשבון. נא ליצור חשבון או להיכנס כדי להמשיך.
   terms_of_service:
     title: "תנאי השימוש"
     signup_form_message: 'קראתי את ואני מסכים/מה עם <a href="/tos" target="_blank">תנאי השירות</a>.'
@@ -2669,9 +2414,6 @@ he:
         עיטור זוה מוענק כאשר אתם מקבלים את הלייק הראשון שלכם על פוסט. מזל טוב, פרסמתם משהו שחבריכם לקהילה חשבו שהוא מעניין, מגניב, או שימושי!
     autobiographer:
       name: אוטוביוגרפים
-      description: מילאו מידע <a href="/my/preferences">פרופיל</a>
-      long_description: |
-        עיטור זה מוענק על מילוי מידע ה<a href="/my/preferences">פרופיל</a> ובחירת תמונת פרופיל. שיתוף מידע עם הקהילה לגבי מי אתם ומהם תחומי העיניין שלכם - תורם לקהילה מחוברת יותר. הצטרפו אלינו!
     anniversary:
       name: יום השנה
       description: חברים פעילים למשך שנה, פרסמו לפחות פעם אחת
@@ -2765,9 +2507,6 @@ he:
         עיטור זה מוענק בפעם הראשונה שאתם מצטטים פוסט בתגובה שלכם. ציטוט חלקים רלוונטיים של פוסטים קודמים בתגובה שלכם עוזרת לדיונים להשאר מחוברים לנושא. הדרך הקלה ביותר לצטט היא להדגיש קטע בפוסט, וללחוץ על כפתור מענה כלשהו. צטטו בנדיבות!
     read_guidelines:
       name: קראו את ההנחיות
-      description: קראו את <a href="/guidelines">הנחיות הקהילה</a>
-      long_description: |
-        עיטור זה מוענק בעבור <a href="/guidelines">קריאת הנחיות הקהילה</a>. פעולה לפי הכללים ושיתוף שלהם יעזרו לבנות קהילה בטוחה, כיפית, ומקיימת לכולם. זכרו תמיד שיש אנשים אחרים, ממש כמוכם, בצד השני של המסך. תהיו נחמדים!
     reader:
       name: קוראים
       description: קראו כל תגובה בנושא עם למעלה מ 100 תגובות
@@ -2856,6 +2595,13 @@ he:
       description: תרומות יוצאות מהכלל בחודש הראשון שלהם
       long_description: |
         עיטור זה מוענק כדי לברך שני משתמשים חדשים בכל חודש בעבור תרומות מצטיינות שלהם, שנמדדות לפי תדירות הלייקים לפוסטים שלכם, וממי הם ניתנו.
+    enthusiast:
+      name: נלהב
+      description: ביקרו 10 ימים
+    aficionado:
+      description: ביקרו 100 ימים
+    devotee:
+      description: ביקרו 365 ימים
     badge_title_metadata: "עיטור ב-%{site_title} של %{display_name}"
   admin_login:
     success: "דוא\"ל נשלח"
@@ -2940,7 +2686,6 @@ he:
             description: "דף יצירת קשר כללי איתכם או עם הארגון שלכם. יוצג ב<a href='/about' target='_blank'>דף האודות שלכם</a>."
           site_contact:
             label: "הודעות אוטומטיות"
-            description: "כל הודעות דיסקורס האישיות האוטומטיות יישלחו ממשתמש זה, כמו הודעת הברוכים הבאים שנשלחת לכל משתמש חדש."
       corporate:
         title: "ארגון"
         description: "שמות אלו יוכנסו ל<a href='/privacy' target='blank'>מדיניות הפרטיות</a> שלכם ול<a href='/tos' target='blank'>תנאי השימוש</a>, שתוכלו לערוך בכל זמן בקטגוריית הצוות. אם אין לכם חברה, הרגישו חופשי לדלג על שלב זה לעת עתה."
@@ -2997,7 +2742,6 @@ he:
         description: "איזה סגנון אמוג׳יז תעדיפו לקהילה שלכם? אתם יכולים להוסיף עוד אמוג׳יז מותאמים אישית תחת ניהול, התאמה אישית, אמוג׳י."
       invites:
         title: "הזמינו צוות"
-        description: "כמעט סיימתם! בואו נזמין כמ חברי צוות כדי לסייע <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>לזרוע את הדיונים</a> עם נושאים מעניינים ותגובות שיניעו קדימה את הקהילה שלכם."
       finished:
         title: "ה Discourse שלכם מוכן!"
         description: |
diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml
index 1ca7b879aa..040029a506 100644
--- a/config/locales/server.id.yml
+++ b/config/locales/server.id.yml
@@ -428,7 +428,6 @@ id:
     allow_user_locale: "Perbolehkan pengguna untuk memilih bahasa sendiri"
     allow_duplicate_topic_titles: "Perbolehkan topik dengan judul yang sama."
     contact_url: "URL kontak untuk situs ini. Digunakan dalam formulir kontak pada /about untuk hal penting."
-    notify_mods_when_user_blocked: "Jika pengguna diblokir secara otomatis, kirimkan pesan kepada semua moderator."
     maximum_backups: "Jumlah maksimum backup yang disimpan dalam disk. Backup lama akan dihapus secara otomatis."
     email_editable: "Perbolehkan pengguna untuk mengganti alamat email setelah registrasi."
     errors:
@@ -446,8 +445,6 @@ id:
       blocked: "Registrasi baru dari alamat IP Anda tidak diijinkan."
       max_new_accounts_per_registration_ip: "Registrasi baru dari alamat IP Anda tidak diijinkan (telah mencapai batas maksimum). Silahkan hubungi staff."
   system_messages:
-    spam_post_blocked:
-      subject_template: "Pengguna baru %{username} disuspensi atas penulisan tautan yang berulang-ulang kali"
     pending_users_reminder:
       subject_template:
         other: "%{count} pengguna sedang menunggu persetujuan"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 6e31bb9083..84fd7684b6 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -46,8 +46,9 @@ it:
         no_message_id_error: "Succede quando l'email non ha l'intestazione 'Message-Id'."
         auto_generated_email_error: "Succede quando l'intestazione 'precedence' è impostata su: list, junk, bulk oppure auto_reply, oppure quando qualunque altra intestazione contiene: auto-submitted, auto-replied o auto-generated."
         no_body_detected_error: "Succede quando non si riesce ad estrapolare il corpo del messaggio e non ci sono allegati. "
+        no_sender_detected_error: "Succede quando non abbiamo trovato un indirizzo email valido nell'intestazione From."
         inactive_user_error: "Succede quando il mittente non è attivo."
-        blocked_user_error: "Succede quando il mittente è stato bloccato."
+        silenced_user_error: "Succede quando il mittente è stato silenziato."
         bad_destination_address: "Succede quando nessuno degli indirizzi email presente nei campi A/Cc/Bcc corrisponde ad alcun indirizzo email entrante tra quelli configurati."
         strangers_not_allowed_error: "Succede quando un utente tenta di creare uno nuovo argomento in una categoria della quale non è membro."
         insufficient_trust_level_error: "Succede quando un utente tenta di creare un nuovo argomento in una categoria per la quale non ha il livello di esperienza richiesto."
@@ -56,8 +57,12 @@ it:
         topic_closed_error: "Succede quando arriva una risposta ma l'argomento relativo è stato chiuso."
         bounced_email_error: "L'email rappresenta un rapporto di email tornata indietro."
         screened_email_error: "Succede quando l'indirizzo email del mittente era stato già vagliato."
+        unsubscribe_not_allowed: "Accade quando annullare l'iscrizione tramite email non è consentito per questo utente."
+        email_not_allowed: "Accade quando l'indirizzo email non è in whitelist o è nella blacklist."
+      unrecognized_error: "Errore Non Riconosciuto"
   errors: &errors
     format: '%{attribute} %{message}'
+    format_with_full_message: '<b>%{attribute}</b>: %{message}'
     messages:
       too_long_validation: "è limitato a %{max} caratteri; tu ne hai inseriti %{length}."
       invalid_boolean: "Booleano non valido."
@@ -127,6 +132,7 @@ it:
   not_logged_in: "Devi essere connesso per farlo."
   not_found: "L'URL o la risorsa richiesta non sono stati trovati."
   invalid_access: "Non hai il permesso di vedere la risorsa richiesta."
+  invalid_api_credentials: "Non è consentito visualizzare la risorsa richiesta. Il nome utente o la chiave API non sono validi."
   read_only_mode_enabled: "Il sito è in modalità di sola lettura. Le interazioni sono disabilitate."
   reading_time: "Tempo di lettura"
   likes: "Mi piace"
@@ -171,10 +177,12 @@ it:
   too_many_links:
     one: "Spiacenti, i nuovi utenti possono inserire al massimo un collegamento in un messaggio."
     other: "Spiacenti, i nuovi utenti possono inserire al massimo %{count} collegamenti in un messaggio."
+  contains_blocked_words: "Il tuo messaggio contiene parole che non sono consentite."
   spamming_host: "Spiacenti, non puoi inserire un collegamento verso quel dominio."
   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?"
@@ -207,6 +215,7 @@ it:
     user_posts: "Ultimi messaggi di @%{username}"
     user_topics: "Ultimi argomenti di @%{username}"
     tag: "Argomenti etichettati"
+    badge: "%{display_name} distintivo su %{site_title}"
   too_late_to_edit: "Questo messaggio è stato creato troppo tempo fa. Non può più essere modificato né cancellato."
   revert_version_same: "La versione attuale è la stessa versione che stai cercando di ripristinare."
   excerpt_image: "immagine"
@@ -222,6 +231,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 +242,8 @@ 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}"
   education:
     until_posts:
       one: "1 messaggio"
@@ -321,6 +333,7 @@ it:
               too_many_users: "Puoi inviare avvertimenti ad un solo utente per volta."
               cant_send_pm: "Spiacenti, non puoi inviare un messaggio privato a quell'utente."
               no_user_selected: "Seleziona un utente valido."
+              reply_by_email_disabled: "La risposta via email è stata disabilitata."
             featured_link:
               invalid: "è invalido. Un URL dovrebbe includere http:// o https://."
               invalid_category: "non può essere modificato in questa categoria."
@@ -353,6 +366,10 @@ it:
           attributes:
             execute_at:
               in_the_past: "deve essere in data futura."
+        watched_word:
+          attributes:
+            word:
+              too_many: "Troppe parole per quest'azione"
       <<: *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 +381,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
@@ -401,6 +432,7 @@ it:
       invalid_email_in: "'%{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}'."
+      description_incomplete: "Il messaggio di descrizione della categoria deve avere almeno un paragrafo."
     cannot_delete:
       uncategorized: "Non puoi eliminare la categoria \"Non classificato\""
       has_subcategories: "Non puoi cancellare questa categoria perché ha sotto-categorie."
@@ -421,6 +453,9 @@ it:
     leader:
       title: "veterano"
     change_failed_explanation: "Hai cercato di degradare %{user_name} a '%{new_trust_level}'. Comunque il suo livello di esperienza è già '%{current_trust_level}'. %{user_name} resterà a '%{current_trust_level}' - se vuoi degradarlo, prima blocca il suo livello di esperienza"
+  post:
+    image_placeholder:
+      broken: "Questa immagine è assente"
   rate_limiter:
     slow_down: "Hai eseguito questa operazione troppe volte, riprova più tardi."
     too_many_requests: "C'è un limite giornaliero su quante volte si può fare questa azione. Per favore attendi %{time_left} prima di riprovare."
@@ -600,12 +635,18 @@ it:
       short_description: 'Vota per questo messaggio'
       long_form: 'hai votato questo messaggio'
   user_activity:
+    no_default:
+      self: "Non hai ancora nessuna attività."
+      others: "Nessuna attività."
     no_bookmarks:
       self: "Non hai aggiunto nessun segnalibro ai messaggi, farlo ti consentirà di ritrovarli facilmente più avanti. "
       others: "Nessun segnalibro."
     no_likes_given:
       self: "Non hai messo \"Mi piace\" ad alcun messaggio."
       others: "Nessun messaggio con \"Mi piace\"."
+    no_replies:
+      self: "Non hai risposto a nessun messaggio."
+      others: "Nessuna risposta."
   topic_flag_types:
     spam:
       title: 'Spam'
@@ -622,7 +663,7 @@ it:
       email_title: 'L''argomento "%{title}" richiede l''attenzione di un moderatore'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Il tuo messaggio è stato segnalato dalla comunità. <a href="/my/messages">vedi i tuoi messaggi</a>.</p>'
+    you_must_edit: '<p>Il tuo messaggio è stato segnalato dalla comunità. Per favore  <a href="%{path}">controlla i tuoi messaggi</a>.</p>'
     user_must_edit: '<p>Questo messaggio è stato segnalato dalla comunità ed è stato temporaneamente nascosto.</p>'
   archetypes:
     regular:
@@ -634,7 +675,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 +854,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,15 +886,16 @@ 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"
+    log_search_queries: "Log delle query di ricerca eseguite dagli utenti"
+    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"
     educate_until_posts: "Per i primi (n) messaggi di un utente, mostra la finestra pop-up con il pannello di istruzioni per nuovi utenti."
     title: "Il nome di questo sito, da usare nell'attributo title."
     site_description: "Descrivi questo sito in una frase, da usare nell'attributo meta description."
-    contact_email: "Gli indirizzi email delle persone chiave responsabili di questo sito. Usati per notifiche importanti, come segnalazioni da gestire, come pure nel modulo di contatto /about per questioni urgenti."
+    contact_email: "Indirizzo email del contatto chiave responsabile per questo sito. Utilizzato per notifiche critiche, nonché sul modulo di contatto /about per questioni urgenti."
     contact_url: "URL di contatto per questo sito. Usato sul modulo di contatto /about per questioni urgenti."
-    queue_jobs: "SOLO PER SVILUPPATORI! ATTENZIONE! Per default, accoda i job in sidekiq. Se disabilitato, il tuo sito non funzionerà."
     crawl_images: "Recupera le immagini dagli URL remoti per inserire le dimensioni corrette di ampiezza e altezza nel tag."
     download_remote_images_to_local: "Scarica localmente le immagini remote; ciò permettei di evitare immagini assenti."
     download_remote_images_threshold: "Minimo spazio disco necessario per scaricare le immagini remote in locale (in percentuale)"
@@ -863,28 +910,34 @@ it:
     fixed_category_positions: "Se attivata, potrai ordinare le categorie. Se non attivata, le categorie vengono elencate in ordine di attività."
     fixed_category_positions_on_create: "Se attivata, verrà mantenuto l'ordinamento delle categorie nella finestra di creazione argomenti (richiede fixed_category_positions)."
     add_rel_nofollow_to_user_content: "Aggiungi l'attributo rel nofollow a tutti i contenuti degli utenti, tranne per i link interni (compresi i domini di livello superiore). Se modifichi questa opzione devi aggiornare tutti i messaggi con il comando \"rake posts:rebake\""
-    exclude_rel_nofollow_domains: "Una lista di domini a cui non aggiungere \"nofollow\" ai collegamenti. Inoltre tld.com autorizzerà automaticamente sub.tld.com. Dovresti perlomeno aggiungere il dominio di primo livello di questo sito, per aiutare i motori di ricerca a trovare tutto il contenuto. Se parti del tuo sito si trovano su altri domini, aggiungi anche quelli."
+    exclude_rel_nofollow_domains: "Un elenco di domini dove l'attributo nofollow non dovrebbe essere aggiunto ai collegamenti. \"esempio.com\" consentirà automaticamente anche \"sub.esempio.com\". Come minimo si dovrebbe aggiungere il dominio di questo sito per aiutare i web crawler a trovare tutti i contenuti. Se altre parti del tuo sito web sono in altri domini, aggiungi anche quelle."
     post_excerpt_maxlength: "Lunghezza massima dell'estratto / riassunto di un messaggio."
     show_pinned_excerpt_mobile: "Mostra estratti sugli argomenti appuntati nella vista mobile."
     show_pinned_excerpt_desktop: "Mostra estratti sugli argomenti appuntati nella vista desktop."
     post_onebox_maxlength: "Lunghezza massima in caratteri di un messaggio Discourse in Onebox."
     onebox_domains_blacklist: "Una lista di domini che non verranno mai oneboxed."
+    inline_onebox_domains_whitelist: "Una lista di domini che saranno oneboxed in forma di miniatura se collegati senza un titolo"
+    enable_inline_onebox_on_all_domains: "Ignira l'impostazione del sito inline_onebox_domain_whitelist e consenti onebox in linea in tutti i domini."
     max_oneboxes_per_post: "Numero massimo di oneboxe in un messaggio."
     logo_url: "L'immagine nel logo in alto a sinistra del sito, dovrebbe essere larga e di forma rettangolare. Se non impostata, verrà usato il testo del titolo del sito."
     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: "Url del logo personalizzato usato nella versione mobile del tuo sito. Se non impostato verrà usato `logo_url`. Es: http://esempio.com/uploads/default/logo.png "
+    large_icon_url: "Immagine usata come logo/splash su Android. La dimensione consigliata è di 512px per 512px."
     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 |)"
     email_subject: "Formato personalizzabile dell'oggetto per le email standard. Vedi https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
     force_https: "Forza il tuo sito ad usare solo HTTPS. ATTENZIONE: NON abilitare questa opzione finché non hai verificato che HTTPS è pienamente configurato e sta funzionando ovunque! Hai verificato il tuo CDN, tutti i social login, ed ogni logo esterno / dipendenze per essere sicuro che sono anch'essi tutti compatibili con HTTPS?"
+    same_site_cookies: "Utilizza gli stessi cookie del sito, si eliminano tutti i vettori Cross Site Request Forgery nei browser supportati (Lax o Strict). Avviso: Strict lavorerà solo su siti che forzano l'accesso e utilizzano SSO."
     summary_score_threshold: "Il punteggio minimo richiesto affinché un messaggio sia incluso in 'Riassumi Questo Argomento'"
     summary_posts_required: "Minimo numero di messaggi in un argomento affinché venga abilitato 'Riassumi Questo Argomento' "
     summary_likes_required: "Minimo numero di \"Mi piace\" in un argomento affinché venga abilitato 'Riassumi Questo Argomento'"
     summary_percent_filter: "Quando un utente clicca su 'Riassumi Questo Argomento', mostra i primi % messaggi"
     summary_max_results: "Massimo numero di messaggi mostrati in 'Riassumi Argomento'"
     enable_private_messages: "Autorizza gli utenti con livello di esperienza 1  (configurabile attraverso \"min livello di esperienza per l'invio di messaggi\") a creare e rispondere ai messaggi. Nota che lo staff può inviare messaggi in ogni caso."
+    enable_private_email_messages: "Consenti agli utenti a livello di esperienza 4 (configurabile attraverso \"min trust level to send messages\") di inviare messaggi privati via email . Nota che lo staff può inviare messaggi in ogni caso."
     enable_long_polling: "Il message bus per le notifiche può usare il long polling"
     long_polling_base_url: "URL di base usato per il long polling (quando una CDN serve contenuto dinamico, bisogna impostarlo come origin pull) es. http://origin.site.com"
     long_polling_interval: "Tempo di attesa prima che il server risponda ai client che non ci sono dati da trasmettere (solo per utenti autenticati)"
@@ -898,24 +951,29 @@ it:
     tl2_additional_likes_per_day_multiplier: "Aumenta il limite di \"Mi piace\" al giorno ammessi per gli utenti con livello di esperienza 2 (Assiduo), moltiplicando per questo numero"
     tl3_additional_likes_per_day_multiplier: "Aumenta il limite di \"Mi piace\" al giorno ammessi per gli utenti con livello di esperienza 3 (Esperto) moltiplicando per questo numero"
     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."
-    notify_mods_when_user_blocked: "Se un utente è bloccato automaticamente, manda un messaggio ai moderatori."
+    num_spam_flags_to_silence_new_user: "Se i messaggi di un nuovo utente ricevono segnalazioni di spam da num_users_to_silence_new_user diversi utenti, nascondi tutti i messaggi dell'utente e impediscigli ulteriori invii. 0 per disabilitare questa funzionalità. "
+    num_users_to_silence_new_user: "Se i messaggi di un nuovo utente ricevono num_spam_flags_to_silence_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_silence_new_user: "Se i messaggi di un nuovo utente ricevono questo numero di segnalazioni da num_tl3_users_to_silence_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_silence_new_user: "Se i messaggi di un nuovo utente ricevono num_tl3_flags_to_silence_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_silenced: "Se un utente è silenziato 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)"
+    enable_markdown_typographer: "Utilizza regole tipografiche di base per migliorare la leggibilità dei paragrafi di testo, sostituire (c) (tm) ecc, con simboli, ridurre il numero di punti interrogativi e così via"
     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_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"
+    ga_universal_auto_link_domains: "Attiva Il monitoraggio interdominio di Google Universal Analytics (analytics.js). Ai collegamenti in uscita a questi domini verrà aggiunto l'id del client. Vedi la guida di Google Cross-domain Tracking."
     gtm_container_id: "Container id di Google Tag Manager. Es: GTM-ABCDEF"
     enable_escaped_fragments: "Usa le Ajax-Crawling API di Google se non viene rilevato un webcrawler. Vedi https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
     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"
+    allowed_iframes: "Un elenco di prefissi di dominio src iframe che discourse può consentire in modo sicuro nei messaggi"
     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."
@@ -939,17 +997,20 @@ it:
     allow_index_in_robots_txt: "Specifica nel file robots.txt che questo sito permette l'indicizzazione da parte dei motori di ricerca."
     email_domains_blacklist: "Una lista di domini email separati dal carattere pipe \"|\" con cui gli utenti non possono registrare un account. Ad esempio: mailinator.com/trashmail.net"
     email_domains_whitelist: "Una lista di domini email delimitati da carattere pipe (|) che gli utenti DEVONO usare per poter registrare i propri account. ATTENZIONE: gli utenti con domini email differenti da questi non saranno accettati!"
-    forgot_password_strict: "Non informare gli utenti dell'esistenza o meno dell'account quando richiamano la funzione per la password dimenticata."
+    hide_email_address_taken: "Durante l'iscrizione e nel modulo per la password dimenticata, non informare gli utenti che già esiste un account con un dato indirizzo email."
     log_out_strict: "Quando ci si disconnette, esci da TUTTE le sessioni dell'utente su tutti i dispositivi"
     version_checks: "Verifica su Discourse Hub l'esistenza di aggiornamenti e mostra i messaggi per le nuove versioni nel cruscotto /admin"
     new_version_emails: "Invia un'email all'indirizzo contact_email quando è disponibile una nuova versione di Discourse."
-    port: "SOLO PER SVILUPPATORI! ATTENZIONE! Usa questa porta HTTP al posto della porta di default 80. Lascia vuoto per usare il default 80."
-    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"
@@ -996,6 +1057,9 @@ it:
     active_user_rate_limit_secs: "Ogni quanti secondi viene aggiornato il campo 'last_seen_at'"
     verbose_localization: "Mostra suggerimenti per la traduzione nell'interfaccia utente"
     previous_visit_timeout_hours: "Durata di una visita prima che venga considerata la visita 'precedente', in ore"
+    top_topics_formula_log_views_multiplier: "valore del moltiplicatore (n) delle visualizzazioni nella formula dei migliori argomenti: `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: "valore del moltiplicatore (n) dei mi piace sul primo messaggio nella formula dei migliori argomenti: `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: "valore del moltiplicatore (n) dei mi piace per messaggio nella formula dei migliori argomenti: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
     rebake_old_posts_count: "Numero di vecchi messaggi da rigenerare ogni 15 minuti."
     rate_limit_create_topic: "Dopo aver creato un argomento, gli utenti devono aspettare (n) secondi prima di poterne creare un altro."
     rate_limit_create_post: "Dopo aver inviato un messaggio, gli utenti devono aspettare (n) secondi prima di creare un altro messaggio. "
@@ -1009,6 +1073,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."
@@ -1018,17 +1084,23 @@ it:
     clean_up_uploads: "Elimina i caricamenti orfani per evitare l'hosting di materiale illegale. ATTENZIONE: prima di attivare questa impostazione è meglio effettuare un backup della cartella /uploads."
     clean_orphan_uploads_grace_period_hours: "Dopo quante ore un caricamento orfano (senza riferimenti) viene rimosso."
     purge_deleted_uploads_grace_period_days: "Dopo quanti giorni un caricamento cancellato viene rimosso."
-    purge_unactivated_users_grace_period_days: "Periodo di grazia (in giorni) prima che un utente che non abbia attivato il proprio account venga cancellato."
+    purge_unactivated_users_grace_period_days: "Il periodo di grazia (in giorni) prima che un utente che non ha attivato il suo account venga eliminato. Impostare su 0 per non eliminare mai gli utenti non attivati."
     enable_s3_uploads: "Mette i caricamenti sullo spazio disco Amazon S3. IMPORTANTE: richiede che siano inserite valide credenziali S3 (sia l'access key id sia l'access key secret)."
     s3_use_iam_profile: 'Usa il ruolo AWS EC2 IAM per recuperare le chiavi. NOTA: abilitarla sovrascriverà le impostazioni "s3 access key id" e "s3 secret access key". '
     s3_upload_bucket: "Il nome del bucket Amazon S3 sul quale verranno caricati i file. ATTENZIONE: deve essere tutto minuscolo, senza punti, senza trattini bassi."
     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."
+    strip_image_metadata: "Rimuovi i metadati dalle immagini."
     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,15 +1114,26 @@ 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."
     min_trust_to_edit_post: "Il livello di esperienza minimo richiesto per modificare i messaggi."
     min_trust_to_allow_self_wiki: "Il livello di esperienza minimo richiesto per consentire agli utenti di pubblicare una propria wiki."
     min_trust_to_send_messages: "Il livello di esperienza minimo richiesto per creare nuovi messaggi privati."
+    min_trust_to_send_email_messages: " Il livello di esperienza minimo richiesto per inviare nuovi messaggi privati via email (a utenti temporanei)."
     newuser_max_links: "Quanti collegamenti può aggiungere a un messaggio un nuovo utente ."
     newuser_max_images: "Quante immagini può aggiungere ad un messaggio un nuovo utente."
     newuser_max_attachments: "Quanti allegati può aggiungere ad un messaggio un nuovo utente."
@@ -1076,6 +1159,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,61 +1178,195 @@ 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."
+    min_ban_entries_for_roll_up: "Quando si clicca il pulsante Riassumi Argomento , verrà creata una nuova voce di blocco se sono presenti almeno (N) voci."
+    max_age_unmatched_emails: "Elimina le voci di email scansionate senza corrispondenza dopo (N) giorni."
+    max_age_unmatched_ips: "Elimina le voci di IP scansionati senza corrispondenza dopo (N) giorni."
     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."
+    auto_respond_to_flag_actions: "Attiva risposta automatica quando viene fatta una segnalazione."
+    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_silence_fast_typers_on_first_post: "Silenzia automaticamente gli utenti che non soddisfano min_first_post_typing_time"
+    auto_silence_fast_typers_max_trust_level: "Livello di esperienza massimo per silenziare automaticamente i digitatori veloci"
+    auto_silence_first_post_regex: "Regex senza distinzione tra maiuscole e minuscole che, se passato, causerà il silenziamento del primo messaggio dell'utente e che sarà inviato nella coda dei messaggi da approvare. Esempio: rabbia|a[bc]a, fa in modo che tutti i messaggi contenenti le parole rabbia o aba o aca siano silenziati in un primo momento. Si applica solo al primo messaggio."
+    flags_default_topics: "Di default, mostra gli argomenti segnalati nella sezione di amministrazione"
     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"
+    alternative_reply_by_email_addresses: "Elenco dei template alternativi per la risposta via email in arrivo da indirizzi email. Esempio: %{reply_key}@reply.example.com|replies+%{reply_key}@example.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"
+    display_name_on_email_from: "Mostra nomi completi per email dai campi"
+    unsubscribe_via_email: "Consenti agli utenti di annullare la sottoscrizione alle email inviando una email con 'unsubscribe' nell'oggetto o nel corpo"
+    unsubscribe_via_email_footer: "Allegare la cancellazione via email mailto: link al piè di pagina delle email inviate"
+    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. "
+    soft_bounce_score: "Punteggio di rimbalzo aggiunto all'utente quando si verifica un rimbalzo temporaneo."
+    hard_bounce_score: "Punteggio di rimbalzo aggiunto all'utente quando si verifica un rimbalzo permanente."
+    bounce_score_threshold: "Punto di rimbalzo massimo prima di interrompere l'invio di email ad un utente."
+    bounce_score_threshold_deactivate: "Punto di rimbalzo massimo prima di disattivare un utente."
+    reset_bounce_score_after_days: "Ripristina automaticamente il punteggio di rimbalzo dopo X giorni."
+    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."
+    manual_polling_enabled: "Push delle email utilizzando le API per le risposte email."
     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."
     pop3_polling_password: "La password dell'account POP3 per la ricezione di email."
     log_mail_processing_failures: "Traccia tutti i fallimenti di lavorazione delle email all'indirizzo http://tuosito.com/logs "
-    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: "Permetti agli utenti di pubblicare nuovi argomenti via email (richiede il polling manuale o pop3). 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'."
-    relative_date_duration: "Dopo quanti giorni dalla pubblicazione le date verranno mostrate in termini relativi (7g) anziché assoluti (20 feb)."
+    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 'reply key' per trovare il messaggio inviato. ATTENZIONE: la disattivazione di questa funzione consente di impersonare l'utente in base all'indirizzo email."
+    minimum_topics_similar: "Quanti argomenti devono esistere prima di presentare argomenti simili quando si creano nuovi argomenti."
+    relative_date_duration: "Dopo quanti giorni dalla pubblicazione le date verranno mostrate in termini assoluti (20 feb) anziché relativi (7g)."
     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."
-    username_change_period: "Numero di giorni dall'iscrizione dopo i quali è possibile modificare il nome utente (imposta a 0 per non permettere il cambio del nome utente)."
     email_editable: "Permetti agli utenti di cambiare l'indirizzo email dopo la registrazione."
+    logout_redirect: "Posizione per reindirizzare il browser dopo il logout (es: http://tuosito.com/logout)"
     allow_uploaded_avatars: "Permetti agli utenti di caricare immagini di profilo personalizzate."
     allow_animated_avatars: "Permetti agli utenti di utilizzare gif animate come immagini di profilo. ATTENZIONE: lanciare il comando rake \"avatars:refresh\" dopo aver cambiato questa impostazione."
     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_other_topics: "Il numero massimo di argomenti da mostrare nella sezione \"Nuovi argomenti e categorie che segui\" delle email di riepilogo."
+    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 ('#FF0000')."
+    email_accent_fg_color: "Colore del testo reso sul colore di background delle email bg nelle email HTML. Inserire il nome di un colore ('white') o un valore esadecimale ('#FFFFFF'). "
+    email_link_color: "Colore dei collegamenti nelle email HTML. Inserire il nome di un colore ('blue') o un valore esadecimale ('#0000FF')."
+    detect_custom_avatars: "Controllare o meno che gli utenti abbiano caricato immagini personalizzate sul profilo."
+    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"
+    anonymous_account_duration_minutes: "Per proteggere l'anonimato creare un nuovo account anonimo ogni N minuti per ogni utente. Esempio: se impostato a 600, non appena passano 600 minuti dall'ultimo messaggio E l'utente passa in modalità anonima, viene creato un nuovo account anonimo."
+    hide_user_profiles_from_public: "Disabilita schede utenti, profili utenti e directory utenti per gli utenti anonimi."
+    hide_suspension_reasons: "Non visualizzare pubblicamente le ragioni della sospensione sui profili utente."
+    user_website_domains_whitelist: "Verrà verificato il sito web dell'utente per questi domini. Lista delimitata dal carattere pipe."
     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."
+    permalink_normalizations: "Applicare il seguente regex prima di accedere ai permalink, ad esempio: /(topic.*)\\?.*/\\1 eliminerà le stringhe query dalla route degli argomenti. Il formato è regex+string use \\1 ecc. per accedere alle catture"
     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."
+    topic_page_title_includes_category: "Il titolo dell'argomento sulla pagina include il nome della categoria."
+    native_app_install_banner: "Domanda ai visitatori ricorrenti di installare l'app nativa di Discourse."
+    share_anonymized_statistics: "Condividi statistiche anonime di utilizzo."
+    auto_handle_queued_age: "Gestisci automaticamente i record che sono in attesa di essere rivisti dopo tale numero di giorni. Le segnalazioni saranno ignorate. I messaggi in attesa e gli utenti saranno rifiutati. Impostare su 0 per disattivare questa funzionalità."
+    max_prints_per_hour_per_user: "Numero massimo di impressioni /pagine di stampa (imposta a 0 per disattivare)"
     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."
+    show_time_gap_days: "Se due messaggi vengono creati dopo tale numero di giorni, mostrare l'intervallo di tempo nell'argomento."
     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.)"
-    embed_by_username: "Nome utente Discourse dell'utente che crea gli argomenti incorporati."
+    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_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."
+    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."
+    slug_generation_method: "Scegli un metodo di generazione delle abbreviazioni. 'encoded' genererà la stringa di codifica percentuale. 'none' disattiverà completamente le abbreviazioni."
     enable_emoji: "Attiva gli emoji"
+    emoji_set: "Come ti piacerebbero le tue 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)"
+    code_formatting_style: "Il pulsante del testo preformattato nel composer verrà predefinito a questo stile di formattazione del codice"
+    max_allowed_message_recipients: "Numero massimo di destinatari consentiti in un messaggio privato."
+    watched_words_regular_expressions: "Le parole osservate sono espressioni regolari."
+    default_email_digest_frequency: "Con quale frequenza gli utenti ricevono email riepilogative di default."
+    default_include_tl0_in_digests: "Per impostazione predefinita, includi i messaggi dei nuovi utenti nelle email riepilogative. Gli utenti possono modificare questa impostazione nelle loro preferenze"
+    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_dynamic_favicon: "Per impostazione predefinita mostra il conteggio degli argomenti nuovi/aggiornati sull'icona del browser."
     default_other_disable_jump_reply: "Per default non saltare al messaggio dell'utente dopo la sua risposta."
+    default_other_like_notification_frequency: "Per impostazione predefinita invia una notifica agli utenti sui mi piace"
+    default_topics_automatic_unpin: " Per impostazione predefinita spunta automaticamente gli argomenti quando l'utente arriva in fondo. "
     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."
+    default_categories_watching_first_post: "Elenco di categorie in cui il primo messaggio di ogni nuovo argomento verrà osservato per impostazione predefinita."
+    retain_web_hook_events_period_days: "Numero di giorni per mantenere i record degli eventi di web hook."
+    allow_user_api_keys: "Consenti la generazione di chiavi API utente"
+    allow_user_api_key_scopes: "Elenco di ambiti consentiti per le chiavi API utente"
+    max_api_keys_per_user: "Numero massimo di chiavi API utente per utente"
+    min_trust_level_for_user_api_key: "Livello di esperienza richiesto per la generazione di chiavi API utente"
+    allowed_user_api_auth_redirects: "URL consentito per il reindirizzamento di autenticazione per le chiavi API utente"
+    allowed_user_api_push_urls: "URL consentiti per il push del server alla API 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."
+    max_tag_length: "La quantità massima di caratteri utilizzabili in un'etichetta."
     max_tag_search_results: "Il numero massimo di risultati da mostrare nella ricerca di etichette."
+    show_filter_by_tag: "Mostra un menu a discesa per filtrare un elenco di argomenti per etichetta."
+    max_tags_in_filter_list: "Numero massimo di etichette da mostrare nell'elenco a discesa del filtro. Saranno mostrate le etichette più usate."
     tags_sort_alphabetically: "Mostra le etichette in ordine alfabetico. Per default vengono mostrate in ordine di popolarità."
     tag_style: "Stile grafico dei distintivi relativi alle etichette."
     staff_tags: "Un elenco di etichette che possono essere usate soltanto dai membri dello staff"
     min_trust_level_to_tag_topics: "Livello di esperienza minimo richiesto per etichettare argomenti"
+    suppress_overlapping_tags_in_list: "Se le etichette corrispondono alle esatte parole nei titoli degli argomenti, non mostrare l'etichetta"
+    remove_muted_tags_from_latest: "Non mostrare argomenti contrassegnati con etichette silenziate nella lista degli argomenti recenti."
+    company_short_name: "Nome Azienda (corto)"
+    company_full_name: "Nome Azienda (completo)"
+    company_domain: "Dominio Azienda"
     errors:
       invalid_email: "Indirizzo email non valido."
       invalid_username: "Non c'è alcun utente con quel nome."
@@ -1157,18 +1375,40 @@ it:
       invalid_integer_max: "Il valore non può essere maggiore di %{max}."
       invalid_integer: "Il valore deve essere un intero."
       regex_mismatch: "Il valore non rispetta il formato richiesto."
+      must_include_latest: "Il menu principale deve includere la scheda \"ultimi\"."
       invalid_string: "Valore non valido."
       invalid_string_min_max: "Il numero di caratteri deve essere tra %{min} e %{max}."
       invalid_string_min: "Il numero di caratteri deve essere di almeno %{min}."
       invalid_string_max: "Il numero di caratteri non deve eccedere %{max}."
+      invalid_reply_by_email_address: "Il valore deve contenere '%{reply_key}' ed essere differente dalla email di notifica."
+      invalid_alternative_reply_by_email_addresses: "Tutti i valori devono contenere '%{reply_key}' ed essere differenti dalla email di notifica."
+      pop3_polling_host_is_empty: "È necessario impostare 'pop3 polling host' prima di attivare il polling POP3."
+      pop3_polling_username_is_empty: "È necessario impostare 'pop3 polling username' prima di attivare il polling POP3."
+      pop3_polling_password_is_empty: "È necessario impostare 'pop3 polling password' prima di attivare il polling POP3."
+      pop3_polling_authentication_failed: "Autenticazione POP3 fallita. Verifica le tue credenziali POP3:"
+      reply_by_email_address_is_empty: "Devi impostare 'reply by email address' prima di attivare la risposta via email."
+      email_polling_disabled: "È necessario attivare il polling manuale o POP3 prima di attivare la risposta via email."
+      user_locale_not_enabled: "Prima di attivare questa impostazione, devi abilitare 'allow user locale'."
+      invalid_regex: "Regex non è valido o non è consentito."
+      email_editable_enabled: "Prima di attivare questa impostazione, devi disabilitare 'email editable'."
+      enable_sso_disabled: "Prima di attivare questa impostazione, devi abilitare 'enable sso'."
+      staged_users_disabled: "Devi abilitare 'staged users' prima di attivare questa impostazione ."
+      reply_by_email_disabled: "Devi abilitare 'reply by email' prima di attivare questa impostazione ."
   search:
     within_post: "n°%{post_number} di %{username}"
     types:
       category: 'Categorie'
       topic: 'Risultati'
       user: 'Utenti'
+    results_page: "Risultati della ricerca per '%{term}'"
   sso:
+    login_error: "Errore Login"
+    not_found: "Impossibile trovare il tuo account. Si prega di contattare l'amministratore del sito."
+    account_not_approved: "Il tuo account è in attesa di approvazione. Riceverai una notifica email una volta approvato. "
+    unknown_error: "C'è un problema con il tuo account. Si prega di contattare l'amministratore del sito."
     timeout_expired: "Il tempo di connessione dell'account è scaduto, prova a connetterti di nuovo."
+    no_email: "Nessun indirizzo email è stato fornito. Si prega di contattare l'amministratore del sito."
+    email_error: "Non è possibile registrare un account con l'indirizzo email <b>%{email}</b>. Si prega di contattare l'amministratore del sito."
   original_poster: "Autore Iniziale"
   most_posts: "Maggioranza Messaggi"
   most_recent_poster: "Autore Più Recente"
@@ -1176,6 +1416,13 @@ it:
   redirected_to_top_reasons:
     new_user: "Benvenuto nella nostra comunità! Questi sono gli argomenti recenti più popolari."
     not_seen_in_a_month: "Bentornato! Non ti si vede da un po'. Questi sono gli argomenti più popolari da quando sei stato via."
+  merge_posts:
+    edit_reason:
+      one: "A post was merged in by %{username}"
+      other: "%{count} messaggi sono stati fusi da %{username}"
+    errors:
+      different_topics: "I messaggi appartenenti a diversi argomenti non possono essere fusi."
+      different_users: "I messaggi appartenenti a diversi utenti non possono essere fusi."
   move_posts:
     new_topic_moderator_post:
       one: "Un messaggio è stato spostato in un nuovo argomento: %{topic_link}"
@@ -1215,6 +1462,24 @@ it:
     autoclosed_enabled_lastpost_minutes:
       one: "Questo argomento è stato automaticamente chiuso un minuto dopo l'ultima risposta. Non sono permesse altre risposte."
       other: "Questo argomento è stato automaticamente chiuso %{count} minuti dopo l'ultima risposta. Non sono permesse altre risposte."
+    autoclosed_disabled_days:
+      one: "This topic was automatically opened after 1 day."
+      other: "Questo argomento è stato aperto automaticamente dopo %{count} giorni."
+    autoclosed_disabled_hours:
+      one: "This topic was automatically opened after 1 hour."
+      other: "Questo argomento è stato aperto automaticamente dopo %{count} ore."
+    autoclosed_disabled_minutes:
+      one: "This topic was automatically opened after 1 minute."
+      other: "Questo argomento è stato aperto automaticamente dopo %{count} minuti."
+    autoclosed_disabled_lastpost_days:
+      one: "This topic was automatically opened 1 day after the last reply."
+      other: "Questo argomento è stato aperto automaticamente %{count} giorni dopo l'ultima risposta."
+    autoclosed_disabled_lastpost_hours:
+      one: "This topic was automatically opened 1 hour after the last reply."
+      other: "Questo argomento è stato aperto automaticamente %{count} ore dopo l'ultima risposta."
+    autoclosed_disabled_lastpost_minutes:
+      one: "Questo argomento è stato aperto automaticamente 1 minuto dopo l'ultima risposta."
+      other: "This topic was automatically opened %{count} minutes after the last reply."
     autoclosed_disabled: "Questo argomento è ora aperto. Sono permesse altre risposte."
     autoclosed_disabled_lastpost: "Questo argomento è ora aperto. Sono permesse altre risposte."
     pinned_enabled: "Questo argomento è stato puntato. Sarà mostrato in cima alla sua categoria finché non sarà spuntato da un membro dello staff - e allora varrà per tutti - oppure dai singoli utenti - e varrà solo per loro stessi."
@@ -1223,46 +1488,166 @@ it:
     pinned_globally_disabled: "Questo argomento è ora spuntato. Non apparirà più in cima alla sua categoria."
     visible_enabled: "Questo argomento è stato reso visibile. Sarà mostrato nelle liste degli argomenti."
     visible_disabled: "Questo argomento è ora invisibile. Non verrà più mostrato in nessuna lista degli argomenti. Sarà possibile accedervi solo tramite collegamento diretto."
+    auto_deleted_by_timer: "Eliminato automaticamente dal timer."
   login:
     not_approved: "Il tuo account non è ancora stato approvato. Verrai avvertito via mail quando potrai collegarti."
     incorrect_username_email_or_password: "Nome utente, email o password errati"
     wait_approval: "Grazie per esserti iscritto. Ti avvertiremo quando il tuo account sarà approvato."
     active: "Il tuo account è attivo e pronto all'uso."
+    activate_email: "<p>Ci siamo quasi! Abbiamo mandato una email di attivazione a <b>%{email}</b>. Per favore segui le istruzioni contenute nell'email per attivare il tuo account.</p><p>Se l'email non ti arriva, controlla la tua cartella spam.</p>"
     not_activated: "Non puoi ancora collegarti. Ti abbiamo mandato un'email di attivazione. Per favore segui le istruzioni contenute nell'email per attivare il tuo account."
     not_allowed_from_ip_address: "Non puoi collegarti come %{username} da quell'indirizzo IP."
     admin_not_allowed_from_ip_address: "Non puoi collegarti come admin da quell'indirizzo IP."
     suspended: "Non puoi collegarti fino a %{date}."
+    suspended_with_reason: "Account sospeso fino a %{date}: %{reason}"
     errors: "%{errors}"
     not_available: "Non disponibile. Prova %{suggestion}?"
     something_already_taken: "Qualcosa è andato storto, forse il nome utente o l'email sono già registrati. Prova a recuperare la password."
     omniauth_error: "Si è verificato un errore nell'autorizzazione del tuo account. Hai approvato l'autorizzazione?"
     omniauth_error_unknown: "Qualcosa è andato storto durante il collegamento, per favore riprova."
+    authenticator_error_no_valid_email: "Non sono ammessi gli indirizzi email associati a %{account}. Potrebbe essere necessario configurare il tuo account con un diverso indirizzo email."
     new_registrations_disabled: "Non sono permesse nuove registrazioni al momento."
     password_too_long: "Le password sono limitate a 200 caratteri."
+    email_too_long: "L'email fornita è troppo lunga. Le mailbox non devono superare i 254 caratteri, e i nomi di dominio non devono superare i 253 caratteri."
     reserved_username: "Questo utente non ha il permesso."
     missing_user_field: "Non hai inserito tutti i campi utente"
-    close_window: "L'autenticazione è completa. Chiudi questa finestra per continuare."
+    auth_complete: "L'autenticazione è completa"
+    click_to_continue: "Clicca qui per continuare."
+    already_logged_in: "Oops, sembra che tu stai tentando di accettare un invito per un altro utente. Se non sei %{current_user}, disconnettiti e prova di nuovo."
   user:
     no_accounts_associated: "Nessun account associato"
+    deactivated: "È stata disattivata a causa di troppe email rimbalzate a '%{email}'."
+    deactivated_by_staff: "Disattivato dallo staff"
+    activated_by_staff: "Attivato dallo staff"
+    new_user_typed_too_fast: "Il nuovo utente ha digitato troppo velocemente"
+    content_matches_auto_block_regex: "Il contenuto corrisponde al regex del blocco automatico"
     username:
       short: "deve essere almeno di %{min} caratteri"
       long: "non deve essere più lungo di %{max} caratteri"
-      characters: "deve includere solo numeri, lettere e trattini bassi"
+      characters: "deve includere solo numeri, lettere, trattini e trattini bassi"
       unique: "deve essere univoco"
       blank: "deve essere presente"
+      must_begin_with_alphanumeric_or_underscore: "deve iniziare con una lettera, un numero o un underscore"
+      must_end_with_alphanumeric: "deve terminare con una lettera o un numero"
+      must_not_contain_two_special_chars_in_seq: "non deve contenere una sequenza di 2 o più caratteri speciali (.-_)"
+      must_not_end_with_confusing_suffix: "non deve finire con un suffisso confuso come .json o .png ecc."
     email:
       not_allowed: "non è permesso da quel fornitore di email. Per favore usa un altro indirizzo email."
       blocked: "non è permesso."
+      revoked: "Non ti verranno inviate email a '%{email}' fino a %{date}."
+    ip_address:
+      blocked: "Le nuove iscrizioni non sono consentite dal tuo indirizzo IP."
+      max_new_accounts_per_registration_ip: "Le nuove iscrizioni non sono consentite dal tuo indirizzo IP (limite massimo raggiunto). Contatta un membro dello staff."
+    website:
+      domain_not_allowed: "Il sito web non è valido. I domini consentiti sono: %{domains}"
+    auto_rejected: "Rifiutato automaticamente a causa dell'età. Vedi l'impostazione del sito auto_handle_queued_age."
+    destroy_reasons:
+      unused_staged_user: "Utente temporaneo non utilizzato"
+      fixed_primary_email: "Risolto il problema dell'email principale per l'utente temporaneo"
   flags_reminder:
+    flags_were_submitted:
+      one: "Flags were submitted over 1 hour ago. [Please review them](/admin/flags)."
+      other: "Delle segnalazioni sono state inviate oltre %{count} ore fa. [Per favore, revisionale](/admin/flags)."
     subject_template:
       one: "1 segnalazione in attesa di essere revisionata"
       other: "%{count} segnalazioni in attesa di essere revisionate"
+  unsubscribe_mailer:
+    title: "Annullare Iscrizione Mailer"
+    subject_template: "Conferma che non desideri più ricevere aggiornamenti via email da %{site_title}"
+    text_body_template: |
+      Qualcuno (probabilmente tu?) ha chiesto di non inviare più aggiornamenti via email da%{site_domain_name} a questo indirizzo.
+      Se desideri confermare, clicca su questo collegamento:
+
+      %{confirm_unsubscribe_link}
+
+
+      Se desideri continuare a ricevere aggiornamenti via email, puoi ignorare questa email.
   invite_mailer:
-    subject_template: "%{invitee_name} ti ha invitato a '%{topic_title}' su %{site_domain_name}"
+    title: "Mailer Invito"
+  custom_invite_mailer:
+    title: "Mailer Invito Personalizzato"
   invite_forum_mailer:
-    subject_template: "%{invitee_name} ti invita a partecipare su %{site_domain_name}"
+    title: "Mailer Invito Forum"
+  custom_invite_forum_mailer:
+    title: "Mailer Invito Forum Personalizzato"
   invite_password_instructions:
+    title: "Invito Istruzioni Password"
     subject_template: "Imposta la password per il tuo account su %{site_name}"
+    text_body_template: |
+      Grazie per aver accettato l'invito su  %{site_name} -- benvenuto!
+
+      Clicca questo collegamento per scegliere adesso una password:
+      %{base_url}/u/password-reset/%{email_token}
+
+      (Se il collegamento qui sopra è scaduto, scegli "Ho dimenticato la password" quando accedi con il tuo indirizzo email.)
+  download_backup_mailer:
+    title: "Mailer Scaricamento Backup"
+    subject_template: "[%{email_prefix}] Download Backup Sito"
+    text_body_template: |
+      Ecco il [download del backup del sito](%{backup_file_path}) che hai richiesto.
+
+      Per motivi di sicurezza abbiamo inviato questo collegamento per il download al tuo indirizzo email convalidato.
+
+      (Se *non hai* richiesto questo download, dovresti seriamente preoccuparti -- : qualcuno ha un accesso amministratore al tuo sito.)
+    no_token: |
+      Spiacenti, questo collegamento per il download del backup è già stato utilizzato o è scaduto.
+  admin_confirmation_mailer:
+    title: "Conferma Amministratore"
+    subject_template: "[%{email_prefix}] Conferma nuovo Account Amministratore"
+    text_body_template: |
+      Conferma che desideri aggiungere **%{target_username}** come amministratore del tuo forum.
+
+      [Conferma Account Amministratore](%{admin_confirm_url})
+  test_mailer:
+    title: "Test Mailer"
+    subject_template: "[%{email_prefix}] Test di Consegna Email"
+    text_body_template: |
+      Questa è una email di prova inviata da
+
+      [**%{base_url}**][0]
+
+      Il recapito di email è complesso. Ecco alcune cose importanti che dovresti controllare prima::
+
+      - Sii *certo* di aver impostato `notification email`  from: indirizzo correttamente nelle impostazioni del tuo sito. **Il dominio specificato nell'indirizzo "from" delle email inviate è il dominio in cui verranno convalidate le tue email**.
+
+      - Impara a visualizzare il contenuto originale delle email nel tuo client email, in questo modo potrai controllare la presenza di eventuali errori. In Gmail puoi usare il tasto "Mostra Originale" presente nel menù a tendina di ogni email.
+
+      - **IMPORTANTE:** Il tuo ISP ha un record DNS inverso per associare il nome del dominio e l'indirizzo ip dal quale invii le email? [Controlla il tuo record inverso PTR][2] qui. Se il tuo ISP non inserisce il record DNS inverso appropriato è molto improbabile che le tue email verranno recapitate.
+
+      - Il [record SPF][8] del tuo dominio è corretto? [Controlla il tuo record SPF][1] qui. Tieni presente che TXT è il tipo di record ufficiale corretto per SPF.
+
+      - Il [record DKIM][3] del tuo dominio è corretto? Questo migliorerà significativamente il recapito delle email. [Controlla il tuo record DKIM][7] qui.
+
+      - Se usi un tuo mail server, verifica che gli IP del tuo mail server [non siano in nessuna blacklist][4]. Verifica inoltre che il tuo mail server stia inviando un hostname pienamente qualificato che abbia una risoluzione nel DNS nel suo messaggio HELO. Se questo non avviene, è molto provabile che le tue email verranno scartate da molte caselle email.
+
+      - Ti raccomandiamo di **inviare una email di prova a [mail-tester.com][mt]** per verificare che tutte le operazioni sopra indicate funzionino correttamente.
+
+      (Il modo più *semplice* è quello di creare un account free su [SendGrid][sg], [SparkPost][sp], [Mailgun][mg] o [Mailjet][mj], che hanno un generoso piano gratuito che andrà bene per i forum più piccoli. Attenzione che dovrai comunque impostare i tuoi record SPF e DKIM nel DNS!)
+
+      Speriamo tu abbia ricevuto questo test di recapito email!
+
+      Buona fortuna,
+
+      I tuoi amici di [Discourse](http://www.discourse.org)
+
+      [0]: %{base_url}
+      [1]: http://www.kitterman.com/spf/validate.html
+      [2]: http://mxtoolbox.com/ReverseLookup.aspx
+      [3]: http://www.dkim.org/
+      [4]: http://whatismyipaddress.com/blacklist-check
+      [7]: https://www.mail-tester.com/spf-dkim-check
+      [8]: http://www.openspf.org/SPF_Record_Syntax
+      [sg]: https://goo.gl/r1WMF6
+      [sp]: https://www.sparkpost.com/
+      [mg]: http://www.mailgun.com/
+      [mj]: https://www.mailjet.com/pricing
+      [mt]: http://www.mail-tester.com/
+  new_version_mailer:
+    title: "Mailer Nuova Versione"
+    subject_template: "[%{email_prefix}] Nuova versione di Discourse, aggiornamento disponibile"
+  new_version_mailer_with_notes:
+    title: "Mailer Nuova Versione con Note"
+    subject_template: "[%{email_prefix}] aggiornamento disponibile"
   flag_reasons:
     off_topic: "Il tuo messaggio è stato segnalato come **fuori tema**: la comunità pensa non riguardi l'argomento, come attualmente definito dal titolo e dal contenuto del primo messaggio."
     inappropriate: "Il tuo messaggio è stato segnalato come **inappropriato**: la comunità lo ritiene offensivo, ingiurioso o una violazione delle [linee guida della comunità](/guidelines)."
@@ -1278,31 +1663,70 @@ it:
     one: "Questo argomento resterà temporaneamente chiuso per 1 ora per via di un elevato numero di segnalazioni da parte della comunità. "
     other: "Questo argomento resterà temporaneamente chiuso per %{count}ore per via di un elevato numero di segnalazioni da parte della comunità. "
   system_messages:
+    private_topic_title: "Argomento #%{id}"
+    contents_hidden: "Visita il messaggio per vederne i contenuti."
     post_hidden:
+      title: "Messaggio Nascosto"
       subject_template: "Messaggio nascosto a causa di segnalazioni dalla comunità"
+    usage_tips:
       text_body_template: |
-        Salve,
+        Per alcuni suggerimenti veloci per iniziare come nuovo utente, [consulta questo post sul blog](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
 
-        questo è un messaggio automatico da parte di %{site_name} per informarti che il tuo messaggio è stato nascosto.
-
-        %{base_url}%{url}
-
-        %{flag_reason}
-
-        Vari membri della comunità hanno segnalato il messaggio prima che venisse nascosto, quindi per favore pensa come modificarlo alla luce di queste osservazioni. **Puoi modificare il messaggio dopo %{edit_delay} minuti, e verrà automaticamente ripubblicato.**
-
-        Tuttavia, se il messaggio dovesse venire nascosto dalla comunità una seconda volta, rimarrà nascosto fino a che un membro dello staff se ne occuperà – e saranno possibili ulteriori sanzioni, compresa la sospensione del tuo account.
-
-        Per ulteriori informazioni, puoi far riferimento alle nostre [linee guida della comunità](%{base_url}/guidelines).
+        Man mano che parteciperai, ti conosceremo meglio e le limitazioni temporanee per i nuovi utenti verranno rimosse. Con il tempo potrai raggiungere [livelli di esperienza](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) che includono abilità speciali per aiutarci a gestire insieme la nostra comunità.
     welcome_user:
+      title: "Benvenuto Utente"
       subject_template: "Benvenuto su %{site_name}!"
+      text_body_template: |
+        Grazie per esserti unito a %{site_name}, e benvenuto!
+
+        %{new_user_tips}
+
+        Crediamo da sempre in una [comunità dal comportamento civile](%{base_url}/guidelines).
+
+        Buona permanenza!
     welcome_invite:
+      title: "Invito Benvenuto"
       subject_template: "Benvenuto su %{site_name}!"
+      text_body_template: |
+        Grazie per aver accettato l'invito a %{site_name} -- benvenuto!
+
+        - Abbiamo creato questo nuovo account  **%{username}** per te. Cambia il tuo nome o la password visitando il [tuo profilo utente][prefs].
+
+        - Quando effettui il login **usa lo stesso indirizzo email del tuo invito originale** — altrimenti non saremo in grado di capire che sei tu!
+
+        %{new_user_tips}
+
+        Crediamo da sempre in una [comunità dal comportamento civile](%{base_url}/guidelines).
+
+        Buona permanenza!
+
+        [prefs]: %{user_preferences_url}
     backup_succeeded:
+      title: "Backup Riuscito"
       subject_template: "Backup completato correttamente"
+      text_body_template: |
+        Il backup è avvenuto con successo.
+
+        Visita la  [sezione admin > backup](%{base_url}/admin/backups) per scaricare il nuovo backup.
+
+        Ecco il log:
+
+        ```text
+        %{logs}
+        ```
     backup_failed:
+      title: "Backup Fallito"
       subject_template: "Backup fallito"
+      text_body_template: |
+        Il backup è fallito.
+
+        Ecco il log:
+
+        ```text
+        %{logs}
+        ```
     restore_succeeded:
+      title: "Ripristino Riuscito"
       subject_template: "Il ripristino è avvenuto con successo."
       text_body_template: |
         Il ripristino è avvenuto con successo.
@@ -1313,6 +1737,7 @@ it:
         %{logs}
         ```
     restore_failed:
+      title: "Ripristino Fallito"
       subject_template: "Ripristino fallito"
       text_body_template: |
         Il ripristino è fallito.
@@ -1323,51 +1748,252 @@ it:
         %{logs}
         ```
     bulk_invite_succeeded:
+      title: "Invito di Massa Riuscito"
       subject_template: "Invito di massa processato con successo"
       text_body_template: "Il tuo file con l'invito di massa è stato processato, %{sent} inviti spediti."
     bulk_invite_failed:
+      title: "Invito di Massa Fallito"
       subject_template: "Invito di massa processato con errori"
+      text_body_template: |
+        Il tuo invito di massa è stato processato, %{sent}inviti spediti con %{failed}errore(i).
+
+        Ecco il log:
+
+        ```text
+        %{logs}
+        ```
     csv_export_succeeded:
+      title: "Esportazione CSV Riuscita"
       subject_template: "Esportazione dati completa"
+      text_body_template: |
+        L'esportazione dei tuoi dati è avvenuta con successo! :dvd:
+
+        <a class="attachment" href="%{download_link}">%{file_name}</a> (%{file_size})
+
+        Il collegamento per il download qui sopra sarà valido per 48 ore.
+
+        I dati vengono compressi come archivio gzip. Se l'archivio non si auto-estrae quando lo si apre, utilizzare gli strumenti consigliati qui: http://www.gzip.org/#faq4
     csv_export_failed:
+      title: "Esportazione CSV Fallita"
       subject_template: "Esportazione dati fallita"
+      text_body_template: "Siamo spiacenti, ma l'esportazione dei dati è fallita. Per favore controlla i log o [contatta un membro dello staff](%{base_url}/about)."
+    email_reject_insufficient_trust_level:
+      title: "Email Rifiutata Livello Esperienza Insufficiente"
+      subject_template: "[%{email_prefix}] Problema email -- Livello Esperienza Insufficiente"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
+
+        Il tuo account non dispone del livello di esperienza richiesto per inserire nuovi argomenti da questo indirizzo email. Se pensi che sia un errore, [contatta un membro dello staff](%{base_url}/about).
+    email_reject_user_not_found:
+      title: "Email Rifiutata Utente Non Trovato"
+      subject_template: "[%{email_prefix}] Problema email -- Utente Non Trovato"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
+
+        La tua risposta è stata inviata da un indirizzo email sconosciuto. Prova a rispondere da un altro indirizzo email, o [contatta un membro dello staff](%{base_url}/about).
     email_reject_screened_email:
+      title: "Email Rifiutata Email Scansionata"
+      subject_template: "[%{email_prefix}] Problema email -- Email Bloccata"
       text_body_template: |
-        Spiacenti, il tuo messaggio email a %{destination} (intitolato %{former_title}) non ha funzionato.
+        Spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
 
-        La tua risposta è stata inviata da un indirizzo email bloccato. Prova a spedire da un altro indirizzo email, oppure contatta un membro dello staff.
+        La tua risposta è stata inviata da un indirizzo email bloccato. Prova a rispondere da un altro indirizzo email, o [contatta un membro dello staff](%{base_url}/about).
+    email_reject_not_allowed_email:
+      title: "Email Rifiuta Email Non Consentita"
+      subject_template: "[%{email_prefix}] Problema email -- Email Bloccata"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
+
+        La tua risposta è stata inviata da un indirizzo email bloccato. Prova a rispondere da un altro indirizzo email, o [contatta un membro dello staff](%{base_url}/about).
+    email_reject_inactive_user:
+      title: "Email Rifiutata Utente Inattivo"
+      subject_template: "[%{email_prefix}] Problema email -- Utente Inattivo"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
+
+        Il tuo account associato a questo indirizzo email non è stato attivato. Attiva il tuo account prima di inviare email.
+    email_reject_silenced_user:
+      title: "Email Rifiutata Utente Silenziato"
+      subject_template: "[%{email_prefix}] Problema email -- Utente Silenziato"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
+
+        Il tuo account associato a questo indirizzo email è stato silenziato.
+    email_reject_reply_user_not_matching:
+      title: "Email Rifiutata Utente Non Corrispondente"
+      subject_template: "[%{email_prefix}] Problema email -- Indirizzo Risposta Imprevisto"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
+
+        La tua risposta è stata inviata da un indirizzo email diverso da quello previsto quindi non sappiamo se proviene dalla stessa persona. Prova a rispondere da un altro indirizzo email, o [contatta un membro dello staff](%{base_url}/about).
     email_reject_no_account:
+      title: "Email Rifiutata Nessun Account"
+      subject_template: "[%{email_prefix}] Problema email -- Account Sconosciuto"
       text_body_template: |
-        Ci dispiace, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
+        Spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
 
-        Non esiste un account con quell'indirizzo email. Prova ad inviarla a un altro indirizzo o contatta un membro dello staff.
+        Non troviamo nessun account che corrisponda al tuo indirizzo email. Prova a inviare da un altro indirizzo email, o [contatta un membro dello staff](%{base_url}/about).
+    email_reject_empty:
+      title: "Email Rifiutata Vuota"
+      subject_template: "[%{email_prefix}] Problema email -- Nessun Contenuto"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
+
+        Non abbiamo trovato nessun contenuto nella tua email.
+
+        Se stai ricevendo questo messaggio e _hai_ inserito una risposta, riprova con una formattazione più semplice.
+    email_reject_parsing:
+      title: "Email Rifiutata Lettura"
+      subject_template: "[%{email_prefix}] Problema email -- Contenuto Non Riconosciuto"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
+
+        Non abbiamo potuto trovare la tua risposta nella email. **Assicurati che la tua risposta sia in cima all'email** -- non possiamo elaborare risposte in linea.
+    email_reject_invalid_access:
+      title: "Email Rifiutata Accesso Non Valido"
+      subject_template: "[%{email_prefix}] Problema email -- Accesso Non Valido"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
+
+        Il tuo account non dispone dei privilegi per pubblicare nuovi argomenti in questa categoria. Se pensi che sia un errore, [contatta un membro dello staff](%{base_url}/about).
+    email_reject_strangers_not_allowed:
+      title: "Email Rifiutata Estranei Non Consentiti"
+      subject_template: "[%{email_prefix}] Problema email -- Accesso Non Valido"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
+
+        La categoria in cui hai inviato questa email consente solo le risposte degli utenti con account validi e indirizzi email conosciuti. Se pensi che sia un errore, [contatta un membro dello staff](%{base_url}/about).
+    email_reject_invalid_post:
+      title: "Email Rifiutata Messaggio Invalido"
+      subject_template: "[%{email_prefix}] Problema email -- Errore di pubblicazione"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
+
+        Alcune cause possibili sono: formattazione complessa, messaggio troppo grande, messaggio troppo piccolo. Riprova, o pubblicalo tramite il sito web se questo errore continua.
+    email_reject_invalid_post_specified:
+      title: "Email Rifiutata Messaggio Specificato Non Valido"
+      subject_template: "[%{email_prefix}] Problema email -- Errore di pubblicazione"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per %{destination} (intitolata %{former_title}) non ha funzionato.
+
+        Motivo:
+
+        %{post_error}
+
+        Se è possibile correggere il problema, prova nuovamente.
+    email_reject_invalid_post_action:
+      title: "Email Rifiutata Azione Post Non Valida"
+      subject_template: "[%{email_prefix}] Problema email -- Azione Post Non Valida"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
+
+        L'azione Post non è stata riconosciuta. Riprova, o pubblicalo tramite il sito web se questo errore continua.
+    email_reject_reply_key:
+      title: "Email Rifiutata Chiave di Risposta"
+      subject_template: "[%{email_prefix}] Problema email -- Chiave di Risposta Sconosciuta"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
+
+        La chiave di risposta nella email non è valida o è sconosciuta, quindi non possiamo capire a cosa risponda questa email. [Contatta un membro dello staff](%{base_url}/about).
     email_reject_bad_destination_address:
-      text_body_template: |+
-        Spiacenti, ma il tuo messaggio email a %{destination} (intitolato %{former_title}) non è stato inviato.
+      title: "Email Rifiutata Indirizzo di Destinazione Errato"
+      subject_template: "[%{email_prefix}] Problema email -- Sconosciuto A: Indirizzo"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per %{destination}(intitolato %{former_title}) non ha funzionato.
 
-        Non è stato riconosciuto alcuno degli indirizzi email di destinazione. Assicurati di inviare a indirizzi email validi.
+        Nessuno degli indirizzi email di destinazione viene riconosciuto o l'intestazione Message-ID della email è stata modificata. Assicurati di inviare all'indirizzo email corretto fornito dallo staff.
+    email_reject_topic_not_found:
+      title: "Email Rifiutata Argomento Non Trovato"
+      subject_template: "[%{email_prefix}] Problema email -- Argomento Non Trovato"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
 
+        L'argomento a cui stai rispondendo non esiste più -- forse è stato cancellato? Se pensi che sia un errore, [contatta un membro dello staff](%{base_url}/about).
+    email_reject_topic_closed:
+      title: "Email Rifiutata Argomento Chiuso"
+      subject_template: "[%{email_prefix}] Problema email -- Argomento Chiuso"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per  %{destination} (intitolato %{former_title}) non ha funzionato.
+
+        L'argomento a cui stai rispondendo è attualmente chiuso e non vengono accettate altre risposte. Se pensi che sia un errore, [contatta un membro dello staff](%{base_url}/about).
+    email_reject_auto_generated:
+      title: "Email Rifiutata Generata Automaticamente"
+      subject_template: "[%{email_prefix}] Problema email -- Risposta Generata Automaticamente"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per  %{destination} (intitolato %{former_title}) non ha funzionato.
+
+        La tua email è stata contrassegnata come "generata automaticamente", il che significa che è stata creata automaticamente da un computer anziché essere digitata da un essere umano; non possiamo accettare tali tipi di email. Se pensi che sia un errore, [contatta un membro dello staff](%{base_url}/about).
+    email_reject_unrecognized_error:
+      title: "Email Rifiutata Errore Non Riconosciuto"
+      subject_template: "[%{email_prefix}] Problema email -- Errore Non Riconosciuto"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
+
+        Si è verificato un errore non riconosciuto durante l'elaborazione della tua email e non è stata inviata. Dovresti riprovare oppure [contattare un membro dello staff](%{base_url}/about).
+    email_error_notification:
+      title: "Notifica Errore Email"
+      subject_template: "[%{email_prefix}] Problema email -- errore di autenticazione POP"
+      text_body_template: |
+        Purtroppo si è verificato un errore di autenticazione durante il polling delle mail dal server POP.
+
+        Assicurati di aver configurato correttamente le credenziali POP nelle [impostazioni del sito](%{base_url}/admin/site_settings/category/email).
+
+        Se esiste un interfaccia web per l'account di posta POP, potrebbe essere necessario accedere al web e controllare le impostazioni.
     too_many_spam_flags:
+      title: "Troppe Segnalazioni Spam"
       subject_template: "Nuovo account sospeso"
       text_body_template: |
-        Salve,
+        Ciao,
 
-        questo è un messaggio automatico da %{site_name} per informarti che i tuoi messaggi sono stati temporaneamente nascosti perché segnalati dalla comunità.
+        questo è un messaggio automatico da %{site_name} per informarti che il tuo account è stato bloccato a causa di un gran numero di segnalazioni da parte della comunità.
 
-        Come misura precauzionale, il tuo nuovo account non può creare altre risposte o argomenti finché il tuo account non verrà revisionato da un membro dello staff. Ci scusiamo per il disagio.
+        Come misura precauzionale, il tuo nuovo account è stato silenziato e non può creare altre risposte o argomenti finché non verrà revisionato da un membro dello staff.  Ci scusiamo per l'inconveniente
 
-        Per ulteriori informazioni, ti rimandiamo alle [linee guida della comunità](%{base_url}/guidelines).
+        Per maggiori dettagli, fai riferimento alle [linee guida della comunità](%{base_url}/guidelines).
     too_many_tl3_flags:
+      title: "Troppe Segnalazioni Da TL3"
       subject_template: "Nuovo account sospeso"
-    blocked_by_staff:
+      text_body_template: |
+        Ciao,
+
+        questo è un messaggio automatico da %{site_name} per informarti che il tuo account è stato bloccato a causa di un gran numero di segnalazioni da parte della comunità.
+
+        Come misura precauzionale, il tuo nuovo account è stato silenziato e non può creare altre risposte o argomenti finché non verrà revisionato da un membro dello staff.  Ci scusiamo per l'inconveniente
+
+        Per maggiori dettagli, fai riferimento alle [linee guida della comunità](%{base_url}/guidelines).
+    silenced_by_staff:
+      title: "Silenziato dallo Staff"
       subject_template: "Account temporaneamente sospeso"
-    user_automatically_blocked:
-      subject_template: "Nuovo utente %{username} bloccato dalle segnalazioni della comunità"
-    spam_post_blocked:
-      subject_template: "Il messaggi del nuovo utente %{username} sono stati bloccati a causa dell'invio di ripetuti collegamenti."
-    unblocked:
+      text_body_template: |
+        Ciao,
+
+        questo è un messaggio automatico da %{site_name} per informarti che il tuo account è stato temporaneamente bloccato come misura precauzionale.
+
+        Per favore continua pure a navigare, anche se non potrai rispondere o creare argomenti fino a che un  [membro dello staff](%{base_url}/about) avrà revisionato i tuoi messaggi più recenti. Ci scusiamo per l'inconveniente.
+
+        Per maggiori dettagli, fai riferimento alle [linee guida della comunità](%{base_url}/guidelines).
+    user_automatically_silenced:
+      title: "Utente Silenziato Automaticamente"
+      subject_template: "Nuovo utente %{username} silenziato dalle segnalazioni della comunità"
+      text_body_template: |
+        Questo è un messaggio automatico.
+
+        Il nuovo utente [%{username}](%{user_url}) è stato automaticamente silenziato perché più utenti hanno contrassegnato i messaggi di %{username}.
+
+        Per favore [controlla le segnalazioni](%{base_url}/admin/flags). Se %{username} è stato silenziato per errore, clicca sul tasto di sblocco nella [pagina di amministrazione di questo utente](%{user_url}).
+
+        Questa impostazione può essere modificata tramite l'impostazione del sito `silence_new_user`.
+    unsilenced:
+      title: "Non silenziato"
       subject_template: "Account non più sospeso"
+      text_body_template: |
+        Ciao,
+
+        questo è un messaggio automatico da %{site_name} per informarti che il tuo account non è più silenziato a seguito di revisione da parte dello staff.
+
+        Ora puoi nuovamente creare argomenti e risposte. Grazie della pazienza.
     pending_users_reminder:
+      title: "Promemoria Utenti in Sospeso"
       subject_template:
         one: "1 utente in attesa di approvazione"
         other: "%{count} utenti in attesa di approvazione"
@@ -1376,14 +2002,49 @@ it:
 
         [Per favore valutale nella sezione di amministrazione](%{base_url}/admin/users/list/pending).
     download_remote_images_disabled:
+      title: "Scaricamento Immagini Remote Disabilitato"
       subject_template: "Lo scaricamento delle immagini remote è disabilitato"
       text_body_template: "L'impostazione `download_remote_images_to_local` è stata disabilitata perché è stato raggiunto il limite di spazio su disco definito in `download_remote_images_threshold`."
     dashboard_problems:
+      title: "Problemi Cruscotto"
       subject_template: "Si sono riscontrati problemi"
+      text_body_template: |
+        Alcuni problemi sono stati riportati sul tuo cruscotto di amministratore.
+
+        [Per favore esaminali e risolvili](%{base_url}/admin).
+    new_user_of_the_month:
+      title: "Sei il Nuovo Utente del Mese!"
+      subject_template: "Sei il Nuovo Utente del Mese!"
+      text_body_template: |
+        Congratulazioni, ti sei meritato il premio come **Nuovo Utente del Mese per %{month_year}**. :trophy:
+
+        Questo premio viene assegnato solo a due nuovi utenti al mese e sarà visibile permanentemente sulla [pagina dei distintivi](%{url}).
+
+        Sei diventato velocemente un membro prezioso della nostra comunità. Grazie per l'adesione e continua a fare un buon lavoro!
+    queued_posts_reminder:
+      title: "Promemoria Messaggi in Coda"
+      subject_template:
+        one: "messaggi in attesa di essere revisionati "
+        other: "%{count} messaggi in attesa di essere revisionati"
+      text_body_template: |
+        Ciao,
+
+        dei messaggi di nuovi utenti sono stati trattenuti per la moderazione e attualmente sono in attesa di essere rivisti. [Approvali o rifiutali qui](%{base_url}/queued-posts).
+  unsubscribe_link: |
+    Per annullare l'iscrizione a queste email, [clicca qui](%{unsubscribe_url}).
+  unsubscribe_link_and_mail: |
+    Per annullare l'iscrizione a queste email, [clicca qui](%{unsubscribe_url}).
+  unsubscribe_mailing_list: |
+    Stai ricevendo questa email perchè hai abilitato la modalità mailing list.
+
+    Per annullare l'iscrizione a queste email, [clicca qui](%{unsubscribe_url}).
   subject_re: "R:"
   subject_pm: "[MP]"
   user_notifications:
     previous_discussion: "Risposte Precedenti"
+    reached_limit:
+      one: "Heads up: We send a maximum of 1 daily email. Check the site to see the ones that might be held back."
+      other: "Avvertimento: Inviamo un massimo di  %{count} email giornaliere. Controlla il sito per vedere quelle che potrebbero essere state trattenute. PS grazie per essere popolare!"
     in_reply_to: "In Risposta A"
     unsubscribe:
       title: "Annulla iscrizione"
@@ -1394,7 +2055,86 @@ it:
     visit_link_to_respond: "[Visita Argomento](%{base_url}%{url}) per replicare."
     visit_link_to_respond_pm: "[Visita Messaggio](%{base_url}%{url}) per replicare."
     posted_by: "Pubblicato da %{username} il %{post_date}"
+    invited_group_to_private_message_body: |
+      %{username} ha invitato @%{group_name} a partecipare al messaggio
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      su
+
+      > %{site_title} -- %{site_description}
+    invited_to_private_message_body: |
+      %{username} ti ha invitato a partecipare al messaggio
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      su
+
+      > %{site_title} -- %{site_description}
+    invited_to_topic_body: |
+      %{username} ti ha invitato alla discussione
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      su
+
+      > %{site_title} -- %{site_description}
+    user_invited_to_private_message_pm_group:
+      title: "Gruppo Invitato da Utente ad un MP"
+      subject_template: "[%{email_prefix}] %{username} ha invitato @%{group_name} a partecipare al messaggio '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_private_message_pm:
+      title: "Utente Invitato ad un MP"
+      subject_template: "[%{email_prefix}] %{username} ti ha invitato a partecipare al messaggio '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_private_message_pm_staged:
+      title: "Utente Invitato a MP Temporaneo"
+      subject_template: "[%{email_prefix}] %{username} ti ha invitato a partecipare al messaggio '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_topic:
+      title: "Utente Invitato ad un Argomento"
+      subject_template: "[%{email_prefix}] %{username} ti ha invitato a '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_replied:
+      title: "Risposta Utente"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_replied_pm:
+      title: "Risposta Utente a MP"
+      subject_template: "[%{email_prefix}][MP]%{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1404,6 +2144,8 @@ it:
 
         %{respond_instructions}
     user_quoted:
+      title: "Utente Citato"
+      subject_template: "[%{email_prefix}]%{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1413,6 +2155,8 @@ it:
 
         %{respond_instructions}
     user_linked:
+      title: "Utente Collegato"
+      subject_template: "[%{email_prefix}]%{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1422,6 +2166,8 @@ it:
 
         %{respond_instructions}
     user_mentioned:
+      title: "Utente Menzionato"
+      subject_template: "[%{email_prefix}]%{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1431,6 +2177,8 @@ it:
 
         %{respond_instructions}
     user_group_mentioned:
+      title: "Gruppo Utente Menzionato"
+      subject_template: "[%{email_prefix}]%{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1440,6 +2188,8 @@ it:
 
         %{respond_instructions}
     user_posted:
+      title: "Utente Pubblicato"
+      subject_template: "[%{email_prefix}]%{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1449,6 +2199,8 @@ it:
 
         %{respond_instructions}
     user_watching_first_post:
+      title: "Utente Osservando Primo Messaggio"
+      subject_template: "[%{email_prefix}]%{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1458,6 +2210,8 @@ it:
 
         %{respond_instructions}
     user_posted_pm:
+      title: "Pubblicazione MP da Utente"
+      subject_template: "[%{email_prefix}] [MP] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1467,17 +2221,154 @@ it:
 
         %{respond_instructions}
     user_posted_pm_staged:
+      title: "Pubblicazione MP da Utente Temporaneo"
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
         %{message}
+    account_suspended:
+      title: "Account Sospeso"
+      subject_template: "[%{email_prefix}] Il tuo account è stato sospeso"
+      text_body_template: |
+        Sei stato sospeso dal forum fino a %{suspended_till}.
+
+        %{reason}
+
+        %{message}
+    account_silenced:
+      title: "Account Silenziato"
+      subject_template: "[%{email_prefix}] Il tuo account è stato silenziato"
+      text_body_template: |
+        Sei silenziato dal forum fino %{silenced_till}.
+
+        %{reason}
+
+        %{message}
+    account_exists:
+      title: "L'account esiste già"
+      subject_template: "[%{email_prefix}] L'account esiste già"
+      text_body_template: |
+        Hai appena cercato di creare un account su %{site_name}, o hai tentato di cambiare l'email di un account su %{email}. Tuttavia, un account esiste già per %{email}.
+
+        Se hai dimenticato la tua password, [reimpostala adesso](%{base_url}/password-reset).
+
+        Se non hai cercato di creare un account per %{email} o di cambiare il tuo indirizzo email, non ti preoccupare – puoi tranquillamente ignorare questo messaggio.
+
+        Se hai delle domande, [contatta il nostro amichevole staff](%{base_url}/about).
     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}."
+      since_last_visit: "Dalla tua ultima visita"
+      new_topics: "Nuovi Argomenti"
+      unread_messages: "Messaggi Non Letti"
+      unread_notifications: "Notifiche Non Lette"
+      liked_received: "Like ricevuti"
+      new_posts: "Nuovi Messaggi"
+      new_users: "Nuovi utenti"
+      popular_topics: "Argomenti Di Successo"
+      follow_topic: "Segui questo topic"
+      join_the_discussion: "Leggi Altro"
+      popular_posts: "Messaggi di Successo"
+      more_new: "Nuovo per te"
+      subject_template: "[%{email_prefix}] Riepilogo"
+      unsubscribe: "Questo riepilogo viene inviato da %{site_link} se non ti si vede da un po'. Modifica %{email_preferences_link}, o %{unsubscribe_link} per annullare l'iscrizione."
+      your_email_settings: "le tue impostazioni email"
       click_here: "clicca qui"
       from: "%{site_name} riepilogo"
+      preheader: "Un breve riepilogo dall'ultima tua visita il %{last_seen_at}"
+    forgot_password:
+      title: "Password Dimenticata"
+      subject_template: "[%{email_prefix}] Reimposta password"
+      text_body_template: |
+        Qualcuno ha richiesto l'azzeramento della tua password su [%{site_name}](%{base_url}).
+
+        Se non sei stato tu, puoi tranquillamente ignorare questa email.
+
+        Clicca il seguente collegamento per scegliere una nuova password:
+        %{base_url}/u/password-reset/%{email_token}
+    set_password:
+      title: "Imposta Password"
+      subject_template: "[%{email_prefix}] Imposta Password"
+      text_body_template: |
+        Qualcuno ha richiesto di aggiungere una password al tuo account su [%{site_name}](%{base_url}). In alternativa, puoi collegarti usando uno dei servizi online supportati (Google, Facebook, ecc) associato con questo indirizzo email validato.
+
+        Se non hai fatto tu questa richiesta, ignora tranquillamente questa email.
+
+        Clicca sul seguente collegamento per scegliere una password:
+        %{base_url}/u/password-reset/%{email_token}
+    admin_login:
+      title: "Login Amministratore"
+      subject_template: "[%{email_prefix}] Login"
+      text_body_template: |
+        Qualcuno ha richiesto di connettersi con il tuo account su [%{site_name}](%{base_url}).
+
+        Se non sei stato tu a fare questa richiesta, puoi tranquillamente ignorare questa email.
+
+        Clicca sul seguente collegamento per connetterti:
+        %{base_url}/u/admin-login/%{email_token}
+    account_created:
+      title: "Account Creato"
+      subject_template: "[%{email_prefix}] Il Tuo Nuovo Account"
+      text_body_template: |
+        E' stato creato un nuovo account per te su %{site_name}
+
+        Clicca sul seguente collegamento per scegliere una password per il tuo nuovo account:
+        %{base_url}/u/password-reset/%{email_token}
+    confirm_new_email:
+      title: "Conferma Nuova Email"
+      subject_template: "[%{email_prefix}] Conferma il tuo nuovo indizzo email"
+      text_body_template: |
+        Conferma il tuo nuovo indirizzo email su %{site_name} cliccando il seguente collegamento:
+
+        %{base_url}/u/authorize-email/%{email_token}
+    confirm_old_email:
+      title: "Conferma Vecchia Email"
+      subject_template: "[%{email_prefix}] Conferma il tuo attuale indirizzo email"
+      text_body_template: |
+        Prima di poter cambiare il tuo indirizzo email abbiamo bisogno che tu confermi di controllare
+        l'indirizzo email attuale. Dopo aver completato questo passaggio, dovrai confermare
+        il nuovo indirizzo email.
+
+        Conferma il tuo attuale indirizzo email su %{site_name} cliccando il seguente collegamento:
+
+        %{base_url}/u/authorize-email/%{email_token}
+    notify_old_email:
+      title: "Notifica Vecchia Email"
+      subject_template: "[%{email_prefix}] Il tuo indirizzo email è stato cambiato"
+      text_body_template: |
+        Questo è un messaggio automatico per farti sapere che il tuo indirizzo email per
+        %{site_name} è stato cambiato. Se è stato fatto per errore, per favore contatta un amministratore del sito.
+
+        Il tuo indirizzo email è stato cambiato in:
+
+        %{new_email}
     signup_after_approval:
+      title: "Iscrizione Dopo Approvazione"
       subject_template: "Sei stato ammesso su %{site_name}!"
+      text_body_template: |
+        Benvenuto su %{site_name}!
+
+        Un membro dello staff ha approvato il tuo account su  %{site_name}.
+
+        Clicca sul seguente collegamento per confermare e attivare il tuo nuovo account:
+        %{base_url}/u/activate-account/%{email_token}
+
+        Se il collegamento qui sopra non è cliccabile, prova a copiarlo e incollarlo nella barra degli indirizzi del tuo browser.
+
+        %{new_user_tips}
+
+        Noi crediamo da sempre in un [comportamento comunitario civile](%{base_url}/guidelines).
+
+        Buona permanenza!
+    signup:
+      title: "Iscrizione"
+      subject_template: "[%{email_prefix}] Conferma il tuo nuovo account"
+      text_body_template: |
+        Benvenuto su %{site_name}!
+
+        Clicca sul collegamento seguente per confermare ed attivare il tuo nuovo account:
+        %{base_url}/u/activate-account/%{email_token}
+
+        Se il collegamento non è cliccabile, copialo ed incollalo nella barra degli indirizzi del tuo browser.
   page_not_found:
     title: "La pagina richiesta non esiste oppure è privata."
     popular_topics: "Di successo"
@@ -1485,26 +2376,40 @@ it:
     see_more: "Altro"
     search_title: "Cerca nel sito"
     search_google: "Google"
+  offline:
+    title: "Impossibile caricare l'app"
+    offline_page_message: "Sembra che tu sia offline! Controlla la tua connessione di rete e riprova."
   login_required:
     welcome_message: |
-      #[Benvenuto su %{title}](#welcome)
+      ## [Benvenuto su %{title}](#welcome)
       E' richiesto un account. Per continuare, crea un nuovo account oppure connettiti.
   terms_of_service:
     title: "Termini di Servizio"
     signup_form_message: 'Ho letto e accetto i <a href="/tos" target="_blank">Termini del Servizio</a>.'
   deleted: 'cancellati'
+  image: "immagine"
   upload:
     edit_reason: "copie locali delle immagini scaricate"
     unauthorized: "Spiacenti, il file che stai cercando di caricare non è autorizzato (estensioni autorizzate: %{authorized_extensions})."
     pasted_image_filename: "Immagine incollata"
     store_failure: "Caricamento n°%{upload_id} fallito per l'utente n°%{user_id}."
     file_missing: "Spiacenti, devi fornire un file da caricare."
+    empty: "Spiacenti, ma il file che hai fornito è vuoto."
     attachments:
       too_large: "Spiacenti, ma il file che stai cercando di caricare è troppo grande (la dimensione massima è %{max_size_kb}KB)."
     images:
       too_large: "Spiacenti, ma l'immagine che stai cercando di caricare è troppo grande (la dimensione massima è %{max_size_kb}KB), per favore ridimensionala e riprova."
+      larger_than_x_megapixels: "Spiacenti, ma l'immagine che stai cercando di caricare è troppo grande (la dimensione massima è %{max_image_megapixels}-megapixel), per favore ridimensionala e riprova."
       size_not_found: "Spiacenti, ma non riusciamo a determinare la dimensione dell'immagine. E' forse danneggiata?"
+    placeholders:
+      too_large: "(immagine più grande di %{max_size_kb}KB)"
+  avatar:
+    missing: "Spiacenti, non troviamo nessun avatar associato a questo indirizzo email. Puoi provare a caricarlo nuovamente?"
+  flag_reason:
+    sockpuppet: "Un nuovo utente ha creato un argomento, e un altro nuovo utente ha risposto dallo stesso indirizzo IP (%{ip_address}). Vedi l'impostazione del sito <a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
+    spam_hosts: "Questo nuovo utente ha provato a creare più messaggi con collegamenti allo stesso dominio (%{domain}). Vedi l'impostazione del sito <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   email_log:
+    post_user_deleted: "L'utente del messaggio è stato eliminato."
     no_user: "Non trovo l'utente con l'id %{user_id}"
     anonymous_user: "L'utente è anonimo"
     suspended_not_pm: "L'utente è sospeso, non è un messaggio"
@@ -1515,12 +2420,20 @@ it:
     post_deleted: "il messaggio è stato cancellato dal suo autore"
     user_suspended: "l'utente è stato sospeso"
     already_read: "l'utente ha già letto questo messaggio"
+    exceeded_emails_limit: "Ha superato max_emails_per_day_per_user"
+    exceeded_bounces_limit: "Ha superato bounce_score_threshold"
     message_blank: "il messaggio è vuoto"
     message_to_blank: "message.to è vuoto"
     text_part_body_blank: "text_part.body è vuoto"
     body_blank: "il corpo è vuoto"
+    no_echo_mailing_list_mode: "Notifiche della mailing list disattivate per i propri messaggi"
   color_schemes:
     base_theme_name: "Base"
+    default: "Combinazione Chiara"
+    dark: "Combinazione Scura"
+    default_theme_name: "Predefinito"
+    dark_theme_name: "Scuro"
+    light_theme_name: "Chiaro"
   about: "Informazioni su"
   guidelines: "Linee Guida"
   privacy: "Privacy"
@@ -1532,10 +2445,325 @@ it:
     Modifica il primo messaggio in questo argomento per cambiare il contenuto della pagina %{page_name}.
   guidelines_topic:
     title: "FAQ/Linee Guida"
+    body: |
+      <a name="civilized"></a>
+
+      ## [Questo è un luogo civile per discussioni pubbliche](#civilized)
+
+      Su questo forum per favore comportati con lo stesso rispetto con cui ti comporteresti in un parco comunale. Come il parco, infatti, anche questa è una risorsa pubblica &mdash; un luogo dove condividere competenze, conoscenze ed interessi attraverso continue conversazioni.
+
+      Quelle che seguono non sono regole ferree, ma solo dei consigli per aiutarti a giudicare il comportamento degli altri membri di questa comunità. Usiamo queste linee guida per far sì che questo luogo rimanga sempre un posto piacevole e limpido dove discutere civilmente.
+
+      <a name="improve"></a>
+
+      ## [Migliorare le discussioni](#improve)
+
+      Puoi aiutarci a fare di questo forum un piacevole luogo di discussione, facendo in modo di migliorare una discussione, anche se in piccola misura. Se non sei convinto che il tuo messaggio aggiunga qualcosa alla conversazione, pensa meglio a ciò che intendi dire o magari riprova più tardi.
+
+      Gli argomenti di cui trattiamo qui, per noi sono importanti, e vorremmo che lo fossero anche per te. Porta rispetto sia per l'argomento di discussione sia per le persone che stanno partecipando, anche se sei in disaccordo con qualcosa.
+
+      Uno dei modi per migliorare le discussioni è scoprire quelle che sono già in corso. Fatti un giro, spendi un po' di tempo a leggere le discussioni già inserite, prima di rispondere o di iniziare una nuova discussione, in questo modo avrai più possibilità di parlare con persone con i tuoi stessi interessi.
+
+      <a name="agreeable"></a>
+
+      ## [Sii gentile, anche quando sei in disaccordo](#agreeable)
+
+      Ti capiterà a volte di aver voglia di rispondere ad un messaggio esprimendo il tuo dissenso. Va benissimo, però ricorda sempre di _criticare le idee, non le persone_. Perciò per favore evita:
+
+      *   Di offendere
+      *   Portare attacchi _ad personam_
+      *   Rispondere al tono di un messaggio invece che al suo reale contenuto
+      *   Avviare un contraddittorio per partito preso
+
+      Piuttosto fornisci contro-argomentazioni valide che migliorino la discussione.
+
+      <a name="participate"></a>
+
+      ## [La tua partecipazione è importante](#participate)
+
+      Le discussioni qui presenti impostano il tono da usare per tutti i nuovi arrivati. Aiutaci a dirigere ed influenzare il futuro di questa comunità scegliendo di partecipare a quelle discussioni che rendono questo forum un posto interessante dove stare &mdash; e, di contro, evitando quelle altre discussioni che invece non lo fanno.
+
+      Questa piattaforma fornisce degli strumenti che permettono alla comunità di identificare i contributi migliori (e i peggiori): i preferiti, i segnalibri, i "mi piace", le segnalazioni, le risposte, le modifiche, ecc. Usa tutti questi strumenti per migliorare la tua esperienza e quella degli altri.
+
+      Facciamo in modo di rendere questa comunità migliore di come l'abbiamo trovata.
+
+      <a name="flag-problems"></a>
+
+      ## [Se noti un problema, segnalalo](#flag-problems)
+
+      I moderatori hanno speciali autorità; sono loro i responsabili di questo forum. Ma anche tu lo sei. Con il tuo aiuto, i moderatori possono rappresentare solo dei bravi animatori, non dei custodi o dei poliziotti.
+
+      Se ti accorgi di comportamenti impropri, non rispondere. La tua risposta incoraggerebbe l'autore a continuare, inoltre consuma inutilmente le tue energie e fa perdere tempo a tutti. Semplicemente _segnalalo_. Se arrivano abbastanza segnalazioni, verranno presi provvedimenti, sia automatici che con l'intervento di un moderatore.
+
+      Al fine di mantenere la nostra comunità, i moderatori si riservano il diritto di cancellare qualsiasi contenuto o qualsiasi utente in qualunque momento. I moderatori non leggono i nuovi messaggi prima che vengano pubblicati, perciò loro non sono responsabili per contenuti inseriti dai membri di questa comunità.
+
+      <a name="be-civil"></a>
+
+      ##[Sii sempre civile](#be-civil)
+
+      Non c'è niente di meglio della maleducazione per sabotare una conversazione salutare:
+
+      *   Sii civile. Non inviare niente che una persona ragionevole possa considerare offensivo, ingiurioso o che inciti all'odio.
+      *   Non sporcare. Non inviare niente di osceno o di sessualmente esplicito.
+      *   Rispetta tutti. Non offendere né attaccare nessuno, non spacciarti per qualcun altro, non pubblicare informazioni private altrui.
+      *   Rispetta il nostro forum. Non pubblicare spam o contenuti vandalici.
+
+      Anche se le precedenti non sono regole formali con definizioni esatte &mdash; evita di pubblicare materiale anche se hai il semplice _sospetto_ che rientri in una di queste categorie. Se non sei sicuro se pubblicare o no, chiediti che cosa succederebbe se il tuo messaggio fosse pubblicato sulla prima pagina de Il corriere della sera.
+
+      Essendo questo un forum pubblico, i motori di ricerca indicizzano tutte le nostre discussioni. Mantieni il linguaggio, i tuoi collegamenti e le tue immagini consoni anche per essere visualizzati dai nostri amici e dalle nostre famiglie.
+
+      <a name="keep-tidy"></a>
+
+      ## [Tieni in ordine](#keep-tidy)
+
+      Fai il piccolo lo sforzo di mettere tutte le cose al loro posto, in modo tale che possiamo tutti spendere più tempo a discutere e meno tempo a ripulire. Quindi:
+
+      *   Non iniziare un argomento nella categoria sbagliata.
+      *   Non inviare lo stesso messaggio in discussioni diverse.
+      *   Non inviare risposte prive di contenuto.
+      *   Non andare fuori tema cambiando discorso.
+      *   Non firmare i tuoi messaggi &mdash; ogni messaggio ha già allegate le informazioni del tuo profilo.
+
+      Piuttosto che inviare un messaggio "+1" oppure "Sono d'accordo", usa il bottone "Mi piace". Piuttosto che andare fuori tema, usa il bottone "Rispondi con nuovo argomento".
+
+      <a name="stealing"></a>
+
+      ## [Farina del tuo sacco](#stealing)
+
+      Per favore non inviare materiale che appartiene a qualcun altro senza il suo permesso. Non inviare descrizioni, collegamenti o metodi per rubare la proprietà intellettuale altrui (software, video, musica, immagini) o che violi qualche altra legge.
+
+      <a name="power"></a>
+
+      ## [Fatto da Te](#power)
+
+      Questo sito è gestito dal tuo [simpatico staff](/about) e da *te*, la comunità. Se hai altre domande su come le cose dovrebbero funzionare qui apri un nuovo argomento nella [categoria Feedback Sito](/c/site-feedback) e parliamone! Se c'è un problema urgente e importante che non si può affrontare in un argomento o con una segnalazione,contattaci tramite la [pagina staff](/about)
+
+      <a name="tos"></a>
+
+      ## [Termini di Servizio](#tos)
+
+      Sì, l'avvocatese è noioso, ma ci dobbiamo proteggere &ndash; e, per estensione, proteggere anche te ed i tuoi dati &ndash; contro persone non amichevoli. Abbiamo dei [Termini di Servizio](/tos) che descrivono il tuo (e il nostro) comportamento ed i diritti che riguardano i contenuti, la privacy e le leggi. Per poter usare questo servizio, devi accettare i nostri [TDS](/tos)
   tos_topic:
     title: "Termini del Servizio"
+    body: |
+      I seguenti termini e condizioni regolano l’uso del sito web %{company_domain} e di tutti i contenuti, i servizi e i prodotti disponibili direttamente sul sito web e mediante di esso, compresi, ma non limitatamente a, il Software Forum di %{company_domain}, il Forum di Supporto di %{company_domain} e il Servizio Hosting ("Hosting") di %{company_domain} (collettivamente chiamati nel seguito il Sito). Il Sito è di proprietà ed è gestito da %{company_full_name} ("%{company_name}"). L’uso del Sito è soggetto all’accettazione incondizionata di tutti i termini e le condizioni previsti nel presente documento e di tutte le altre regole operative, le politiche (incluse, senza limitazione, la [Politica sulla Privacy](/privacy) di %{company_domain}e le [Linee guida della comunità](/faq)) e le procedure che possono essere pubblicate di volta in volta su questo Sito da %{company_name} (nel seguito, il “Contratto”).
+
+      Leggi il presente Contratto prima di accedere o utilizzare il Sito. L’accesso o l’utilizzo di qualsiasi parte del Sito implica l’accettazione dei termini e delle condizioni del presente contratto. In caso di mancata accettazione di tutti i termini e le condizioni del presente contratto, l’accesso al Sito o l’uso di qualsiasi servizio potrebbe non essere consentito. Se questi termini e condizioni sono considerati un’offerta di %{company_name}, l’accettazione è espressamente limitata ai presenti termini. Il Sito è disponibile solo per gli utenti con almeno 13 anni di età.
+
+      <a name="1"></a>
+
+      ## [1. Il tuo Account su %{company_domain}](#1)
+
+      Se crei un account sul Sito, è tua responsabilità mantenere la sicurezza dell’account e sei interamente responsabile di tutte le attività eseguite con l’account. L’utente è tenuto a notificare immediatamente a %{company_name} usi non autorizzati dell’account o altre violazioni della sicurezza. %{company_name} non sarà responsabile per qualsiasi atto od omissione da parte tua, inclusi eventuali danni di qualsiasi tipo derivanti da tali atti o omissioni.
+
+      <a name="2"></a>
+
+      ## [2. Responsabilità dei Collaboratori](#2)
+
+      Se pubblichi materiale o inserisci collegamenti sul Sito o rendi disponibile in altro modo (o consenti a terzi di rendere disponibile) materiale mediante il Sito (qualsiasi materiale di questo tipo, nel seguito chiamato il “Contenuto”), sei interamente responsabile del Contenuto e di qualsiasi danno risultante da tale Contenuto. Ciò è valido indipendentemente dalla circostanza in cui il Contenuto in questione sia costituito da testo, grafica, file audio o software informatico. Rendendo disponibile il Contenuto, l’utente dichiara e garantisce che:
+
+      *   il download, la copia e l’uso del Contenuto non viola i diritti di proprietà, inclusi ma non limitatamente a, il copyright, i brevetti, i diritti di marchi di fabbrica o di segreti commerciali di terze parti;
+      *   se il tuo datore di lavoro è titolare dei diritti sulla proprietà intellettuale creata da te, allora delle due l’una, o (i) hai ottenuto il permesso dal datore di lavoro di pubblicare o rendere disponibile il Contenuto, incluso ma non limitatamente a, qualsiasi software oppure (ii) che hai ottenuto dal datore di lavoro una rinuncia relativamente a tutti i diritti sul Contenuto o in riferimento ad esso;
+      *   sei pienamente in regola con le licenze di terze parti in relazione al Contenuto e che sono state adottate tutte le azioni necessarie per trasferire con esito positivo qualsiasi condizione richiesta agli utenti finali;
+      *   il Contenuto non contiene né installa alcun virus, worm, malware, cavalli di Troia o altri contenuti dannosi o distruttivi;
+      *   il Contenuto non costituisce spam, non è generato da macchina o in modo casuale e non contiene contenuto commerciale indesiderato o immorale finalizzato a indirizzare il traffico verso siti di terze parti o a migliorare il posizionamento nei motori di ricerca di siti di terze parti o per altri atti illeciti (ad esempio, il phishing) o per indurre in errore i destinatari in relazione all’origine del materiale (ad esempio, lo spoofing);
+      *   il Contenuto non ha carattere pornografico, non contiene minacce e non incita alla violenza e non viola i diritti di privacy o pubblicitari di terze parti;
+      *   il Contenuto non viene pubblicizzato tramite messaggi elettronici indesiderati, come collegamenti spam verso a newsgroup, elenchi email, altri blog e siti web e analoghi metodi promozionali non richiesti;
+      *   il Contenuto non è presentato in modo da indurre gli utenti a errori di identità con altri utenti o aziende; e
+      *   nel caso di Contenuto contenente codice informatico, hai classificato e/o descritto in modo accurato il tipo, la natura, gli usi e gli effetti dei materiali, se richiesto da %{company_name} o in altro modo.
+
+      <a name="3"></a>
+
+      ## [3. Licenza sui contenuti utente](#3)
+
+      I contributi degli utenti sono resi disponibili ai sensi di una [Licenza Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Senza alcuna limitazione di tali dichiarazioni o garanzie, %{company_name} ha il diritto (sebbene non l’obbligo), a discrezione di %{company_name} (i), di rifiutare o rimuovere qualsiasi contenuto che, nella ragionevole opinione di %{company_name}, viola qualsiasi politica di %{company_name} o è in altro modo dannoso o sgradevole, o (ii) di cessare o negare l’accesso e l’utilizzo del Sito a qualsiasi singolo utente o entità per qualsiasi motivo, a sola discrezione di %{company_name}. %{company_name} non ha alcun obbligo di rimborsare eventuali somme pagate in precedenza.
+
+
+      <a name="4"></a>
+
+      ## [4. Pagamento e rinnovo](#4)
+
+      ### Termini Generali
+
+      Potrebbero essere disponibili sul Sito servizi opzionali o aggiornamenti a pagamento. Quando si utilizza un servizio opzionale o aggiornamento a pagamento, acconsenti a pagare a %{company_name} le commissioni per l’abbonamento mensile o annuale indicate per tale servizio. Le somme verranno addebitate con pagamento anticipato il giorno dell’abbonamento al servizio o aggiornamento e riguarderanno l’uso di tale servizio o aggiornamento per un periodo di abbonamento mensile o annuale, come indicato. Le commissioni non sono rimborsabili.
+
+      ### Rinnovo Automatico
+
+      A meno che non invii una notifica a %{company_name} prima della scadenza del periodo di abbonamento applicabile da annullare, l’abbonamento si rinnoverà automaticamente e tu ci autorizzi a riscuotere le commissioni dell’abbonamento annuale o mensile applicabili in quel momento per tale abbonamento (così come eventuali tasse) utilizzando qualsiasi carta di credito o altro meccanismo di pagamento registrato. Gli abbonamenti possono essere annullati in qualsiasi momento.
+
+      <a name="5"></a>
+
+      ## [5. Servizi](#5)
+
+      ### Servizi di Hosting e di supporto
+
+      Possono essere forniti da %{company_name} servizi opzionali di Hosting e di supporto, ai sensi dei termini e delle condizioni specifici per ogni servizio. Con la sottoscrizione a un account di servizi di hosting o supporto, accetti di rispettare i termini e le condizioni previsti.
+
+      <a name="6"></a>
+
+      ## [6. Responsabilità dei visitatori del Sito](#6)
+
+      %{company_name} non ha rivisto e non può rivedere tutto il materiale, compreso il software informatico, pubblicato sul Sito e pertanto non può essere considerata responsabile per il contenuto, l’uso o gli effetti di tale materiale. Gestendo il Sito, %{company_name} non dichiara né implica che approva il materiale pubblicato o che ritiene che tale materiale sia accurato, utile o non nocivo. L’utente deve adottare le precauzioni necessarie per proteggere se stesso e i sistemi informatici da virus, worm, cavalli di Troia e altri contenuti dannosi o distruttivi. Il Sito potrebbe includere contenuto offensivo, indecente, o altrimenti discutibile, così come contenuto contenente imprecisioni tecniche, errori tipografici e altri errori. Il Sito potrebbe inoltre contenere materiale che viola i diritti pubblicitari o di privacy, o violare la proprietà intellettuale e altri diritti proprietari di terzi, o il cui download, la copia o l’utilizzo siano soggetti a ulteriori termini e condizioni, dichiarati o non dichiarati. %{company_name} declina ogni responsabilità per qualsiasi danno derivante dall’uso da parte di visitatori del Sito, o da qualsiasi download eseguito da tali visitatori del contenuto pubblicato.
+
+      <a name="7"></a>
+
+      ## [7. Contenuto pubblicato su altri siti Web](#7)
+
+      Non abbiamo rivisto e non possiamo rivedere tutto il materiale, compreso il software informatico, reso disponibile mediante i siti e le pagine Web che contengono link a %{company_domain} e dal sito %{company_domain}. %{company_name} non esercita alcun controllo su tali siti e pagine Web non %{company_domain} e non è responsabile del loro contenuto o utilizzo. Con il collegamento a un sito o a una pagina Web non %{company_domain}, %{company_name} non dichiara né ammette implicitamente che approva tale sito o pagina Web. L’utente deve adottare le precauzioni necessarie per proteggere se stesso e i sistemi informatici da virus, worm, cavalli di Troia e altri contenuti dannosi o distruttivi. %{company_name} declina ogni responsabilità per eventuali danni risultanti dall’uso di siti e pagine Web non %{company_domain}.
+
+      <a name="8"></a>
+
+      ## [8. Violazione del copyright e della politica DMCA](#8)
+
+      %{company_name} chiede agli altri di rispettare i propri diritti di proprietà intellettuale e a sua volta rispetta i diritti di proprietà intellettuale di terzi. Se l’utente ritiene che il materiale presente o a cui accede mediante link dal sito %{company_domain} violi il proprio copyright, è invitato a inviare una notifica a %{company_name} in conformità alla politica [Digital Millennium Copyright Act] (http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) (“DMCA”) di %{company_name}. %{company_name} risponderà a tutte le notifiche includendo, in base alle misure necessarie o appropriate, la rimozione del materiale che genera la violazione o la disabilitazione di tutti i link al materiale in presunta violazione. %{company_name} non consentirà più l’accesso e l’utilizzo del Sito al visitatore se, in circostanze appropriate, il visitatore si comporta come trasgressore recidivo del copyright o di altri diritti di proprietà intellettuale di %{company_name} o di terzi. In caso di rescissione, %{company_name} non avrà alcun obbligo di rimborsare eventuali somme pagate in precedenza a  %{company_name}.
+
+      <a name="9"></a>
+
+      ## [9. Proprietà intellettuale](#9)
+
+      Il presente Contratto non trasferisce da %{company_name} all’utente qualsiasi proprietà intellettuale di %{company_name} o di terzi e tutti i diritti, la titolarità e l’interesse nel e su tale proprietà rimarranno (fra le parti) esclusivamente di %{company_name}. %{company_name}, %{company_domain}, il logo %{company_domain} e tutti gli altri marchi commerciali, marchi di servizio, grafica e logo utilizzati in connessione a %{company_domain} o il Sito sono marchi commerciali o marchi commerciali registrati di %{company_name} o dei licenziatari di %{company_name}. Altri marchi, marchi di servizio, grafica e logo utilizzati in connessione con il Sito possono essere marchi di terzi. L’utilizzo del Sito non implica per l’utente alcun diritto o licenza di riprodurre o utilizzare in altro modo qualsiasi marchio commerciale di %{company_name} o di terzi.
+
+      <a name="10"></a>
+
+      ## [10. Annunci pubblicitari](#10)
+
+      %{company_name} si riserva il diritto di visualizzare annunci pubblicitari sul tuo contenuto, a meno che tu non abbia acquistato un Upgrade o un account di servizi senza pubblicità.
+
+      <a name="11"></a>
+
+      ## [11. Attribuzione](#11)
+
+      %{company_name} si riserva il diritto di visualizzare link di attribuzione come “Powered by %{company_domain}”, autore del tema e attribuzione dei caratteri nel piè di pagina o la barra degli strumenti del tuo contenuto. I crediti a piè di pagina e la barra degli strumenti %{company_domain} non possono essere alterati o rimossi indipendentemente dagli upgrade acquistati.
+
+      <a name="12"></a>
+
+      ## [12. Modifiche](#12)
+
+      %{company_name} si riserva il diritto, a sua unica discrezione, di modificare o rimpiazzare qualunque parte di questo Contratto. E’ tua responsabilità controllare questo Contratto periodicamente per prendere atto dei cambiamenti. L’uso continuato e l'accesso al sito web implica l’accettazione di tali cambiamenti. %{company_name} può, in futuro, offrire nuovi servizi e/o funzionalità attraverso il Sito (incluso il rilascio di nuovi strumenti e risorse). Tali nuovi servizi e/o funzionalità saranno soggetti ai termini e condizioni di questo Contratto.
+
+      <a name="13"></a>
+
+      ## [13. Rescissione del contratto](#13)
+
+      %{company_name} può interrompere l’accesso a tutto o a parte del Sito in qualsiasi momento, con o senza causa, con o senza preavviso, con efficacia immediata. Se desideri rescindere dal presente Contratto o dall’account %{company_domain} (se disponibile), puoi semplicemente interrompere l’utilizzo del Sito. Tutte le disposizioni del presente Contratto che, per loro natura, devono permanere dopo la rescissione permarranno, incluse, senza limitazione, le disposizioni di proprietà, le esclusioni di garanzia, le indennità e le limitazioni di responsabilità.
+
+      <a name="14"></a>
+
+      ## [14. Esclusione di garanzie](#14)
+
+      Il Sito è fornito “così com’è”. Con la presente, %{company_name}, i suoi fornitori e licenziatari declinano tutte le garanzie di qualsiasi tipo, espresse o implicite, incluse, senza limitazione, le garanzie di commerciabilità, idoneità per un particolare scopo e non violazione. Né %{company_name} né i suoi fornitori e licenziatari concedono alcuna garanzia che il Sito sia privo di errori o che l’accesso ad essi sarà continuo o ininterrotto. Se stai leggendo queste informazioni, ecco un [chiarimento] (http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). Tu comprendi che scaricare o ottenere in altro modo i contenuti o i servizi mediante il Sito, a tua discrezione e a tuo rischio.
+
+      <a name="15"></a>
+
+      ## [15. Limitazione di responsabilità](#15)
+
+      In nessun caso %{company_name}, o suoi fornitori o licenziatari, saranno responsabili per qualsiasi aspetto oggetto del presente contratto ai sensi di qualsiasi accordo, negligenza, responsabilità oggettiva o altra dottrina legale o equitativa: (i) per qualsiasi danno speciale, incidentale o consequenziale; (ii) per il costo di approvvigionamento dei prodotti o dei servizi sostitutivi; (iii) per l’interruzione dell’utilizzo oppure la perdita o il danneggiamento di dati; o (iv) per gli importi che superano le commissioni versate a %{company_name} ai sensi del presente contratto nel corso del periodo di dodici (12) mesi precedenti alla causa dell’azione. %{company_name} non sarà responsabile per qualsiasi errore o ritardo dovuto a cause al di fuori del proprio ragionevole controllo. Quanto precede non si applica nella misura vietata dalla legge applicabile.
+
+      <a name="16"></a>
+
+      ## [16. Garanzia e dichiarazione generale](#16)
+
+      Tu dichiari e garantisci che (i) l’utilizzo del Sito avverrà in stretta conformità alla [Politica sulla Privacy] (/privacy) di %{company_name}, alle [Linee Guida](/guidelines), al presente Contratto e a tutti i regolamenti e le leggi (inclusi senza limitazioni le leggi o i regolamenti locali in vigore nel paese, nello stato, nella città o in altra area governativa di appartenenza, per quanto riguarda la condotta online e il contenuto accettabile, e comprese tutte le leggi applicabili in materia di trasmissione di dati tecnici esportati dal paese di residenza del Sito o del tuo) e (ii) l’uso del Sito non viola o non si appropria indebitamente dei diritti di proprietà intellettuale di terze parti.
+
+      <a name="17"></a>
+
+      ## [17. Indennizzo](#17)
+
+      Tu accetti di indennizzare e manlevare %{company_name}, i suoi contraenti e i suoi licenziatari, e i rispettivi direttori, funzionari, dipendenti e agenti da e contro tutte le richieste di risarcimento e le spese, inclusi gli onorari, derivanti dall’uso del Sito, inclusa ma non limitatamente alla violazione dell’utente del presente Contratto.
+
+      <a name="18"></a>
+
+      ## [18. Varie](#18)
+
+      Il presente Contratto costituisce l’intero contratto tra te e %{company_name} riguardo l’argomento oggetto del contratto, e può essere modificato solo da un emendamento scritto e firmato da un dirigente autorizzato di %{company_name}, o mediante l’invio da parte di %{company_name} di una versione riveduta. Salvo diversa disposizione nel presente Contratto nei limiti consentiti dalla legge applicabile, se disponibile, qualsiasi accesso a o utilizzo del sito sarà disciplinato dalle leggi dello stato italiano, con esclusione delle disposizioni in materia di conflitto di leggi, il foro competente per qualsiasi controversia derivante dal presente contratto o collegata allo stesso è il tribunale di Roma. Fatta eccezione per le richieste di risarcimento ingiuntivo o per via equitativa o richieste di risarcimento relative ai diritti di proprietà intellettuale (che possono essere avanzate in qualsiasi tribunale competente senza prestare garanzie), qualsiasi controversia derivante dal presente contratto sarà risolta in conformità alle leggi italiane (Italia). La parte vincente in qualsiasi azione o procedimento per l’applicazione del presente Contratto avrà diritto di ottenere il rimborso delle spese e degli onorari legali. Nel caso in cui una parte del presente Contratto venga ritenuta non valida o non applicabile, tale parte verrà interpretata in modo da riflettere le intenzioni originali delle parti e le altre disposizioni rimarranno attive ed efficaci. Il mancato esercizio da parte di qualsiasi parte di qualsiasi termine o condizione del presente Contratto o qualsiasi violazione dello stesso, in qualsiasi unica istanza, non implicherà la rinuncia a tale termine o condizione oppure a successive violazioni. Tu puoi assegnare diritti ai sensi del presente Contratto a qualsiasi parte che acconsenta e accetti di essere vincolata dai suoi termini e condizioni; %{company_name} può assegnare i suoi diritti ai sensi del presente Contratto senza condizioni. Il presente Contratto sarà vincolante e avrà effetto a beneficio delle parti, dei subentranti e degli assegnatari autorizzati.
+
+      Questo documento è CC-BY-SA. Ultimo aggiornamento 31 maggio 2013.
+
+      Adattamento dal contratto originale [Termini di Servizio WordPress](http://en.wordpress.com/tos/).
   privacy_topic:
     title: "Politica della Privacy"
+    body: |
+      <a name="collect"></a>
+
+      ## [Quali informazioni raccogliamo?](#collect)
+
+      Raccogliamo informazioni su di te quando ti registri sul nostro sito e raccogliamo i dati quando partecipi alle attività del sito con la lettura, la scrittura, e la valutazione del contenuto condiviso qui.
+
+      Quando ti registri al nostro sito, ti potrebbe essere richiesto di inserire il tuo nome  e l'indirizzo email. Puoi tuttavia visitare il nostro sito senza effettuare la registrazione. Il tuo indirizzo email sarà verificato da una email contenente un link unico. Se tale link è cliccato, sapremo che hai controllato l'indirizzo email.
+
+      Quando ti registri e pubblichi un messaggio, registriamo l'indirizzo IP da cui il messaggio ha origine. Possiamo anche conservare i log del server che includono gli indirizzi IP di ogni richiesta al nostro server.
+
+      <a name="use"></a>
+
+      ## [Per cosa usiamo i tuoi dati?](#use)
+
+      Ogni informazione che raccogliamo da te può essere utilizzata in uno dei seguenti modi:
+
+      *   Per personalizzare la tua esperienza &mdash; le tue informazioni ci aiutano a rispondere meglio alle tue esigenze individuali.
+      *   Per migliorare il nostro sito &mdash; ci sforziamo continuamente di migliorare il nostro sito sulla base delle informazioni e dei feedback che riceviamo da te.
+      *   Per migliorare il servizio clienti &mdash; le tue informazioni ci aiutano per rispondere più efficacemente alle richieste di assistenza e alle esigenze di supporto.
+      *   Per inviare email periodiche &mdash; l'indirizzo email che ci fornisci può essere usato per inviarti informazioni, notifiche sulle modifche di argomenti che stai seguendo o in risposta alla citazione del tuo nome utente, per rispondere alle domande, e/o altre richieste.
+
+      <a name="protect"></a>
+
+      ## [Come proteggiamo i tuoi dati?](#protect)
+
+      Attuiamo una serie di misure di sicurezza per garantire la sicurezza dei tuoi dati personali quando accedi al forum, invii o accedi alle tue informazioni personali.
+
+      <a name="data-retention"></a>
+
+      ## [Qual è a vostra politica di conservazione dei dati?](#data-retention)
+
+      Faremo uno sforzo per:
+
+      *   Conservare i log del server contenenti l'indirizzo IP di tutte le richieste al server non più di 90 giorni.
+      *   Conservare gli indirizzi IP associati a utenti registrati e i loro post non più di 5 anni.
+
+      <a name="cookies"></a>
+
+      ## [Usiamo i cookie?](#cookies)
+
+      Sì. I cookie sono piccoli file che un sito o il suo fornitore di servizi trasferiscono sul disco rigido del tuo computer tramite il browser Web (se acconsenti). Questi cookie consentono al sito di riconoscere il tuo browser e, se hai un account registrato, associa il tuo account registrato.
+
+      Utilizziamo i cookie per comprendere e salvare le tue preferenze per visite future e compilare dati aggregati sul traffico del sito e l'interazione del sito in modo da offrire migliori esperienze e strumenti in futuro. Possiamo contrattare con fornitori di servizi di terze parti per aiutarci a comprendere meglio i visitatori del sito. Questi fornitori di servizi non sono autorizzati a utilizzare le informazioni raccolte per nostro conto, tranne che per aiutarci a condurre e migliorare la nostra attività.
+
+      <a name="disclose"></a>
+
+      ## [Divulghiamo informazioni a terze parti?](#disclose)
+
+      Non vendiamo, commerciamo o trasferiamo a terzi i tuoi dati personali. Questo non include i terzi di fiducia che ci aiutano nella gestione del nostro sito e a mantenere la nostra attività, finché tali parti si impegnano a mantenere tali informazioni riservate. Potremmo anche rilasciare i tuoi dati quando crediamo che il rilascio sia opportuno per rispettare la legge, far rispettare le nostre politiche del sito, o proteggere il nostro o altri diritti, la proprietà o la sicurezza.  Tuttavia, le informazioni dei visitatori non identificabili personalmente possono essere fornite ad altre parti per marketing, pubblicità o altri usi.
+
+      <a name="third-party"></a>
+
+      ## [Link di terze parti](#third-party)
+
+      Occasionalmente, a nostra discrezione, possiamo includere o offrire prodotti o servizi di terzi sul nostro sito. Questi siti di terze parti hanno politiche sulla privacy separate e indipendenti. Non abbiamo quindi alcuna responsabilità per il contenuto e le attività di questi siti collegati. Tuttavia, cerchiamo di proteggere l'integrità del nostro sito, ed eventuali feedback su altri siti sono i benvenuti.
+
+      <a name="coppa"></a>
+
+      ## [Legge sulla protezione dei dati personali dei bambini](#coppa)
+
+      Il nostro sito, i prodotti e i servizi sono tutti rivolti a persone di almeno 13 anni. Se questo server è negli Stati Uniti e sei al di sotto dei 13 anni per i requisiti del COPPA ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), non utilizzare questo sito.
+
+      <a name="online"></a>
+
+      ## [Politica sulla Privacy Online](#online)
+
+      Questa politica sulla privacy online si applica solo alle informazioni raccolte attraverso il nostro sito e non alle informazioni raccolte offline.
+
+      <a name="consent"></a>
+
+      ## [Il tuo consenso](#consent)
+
+      Usando il nostro sito, acconsenti alla nostra politica sulla privacy.
+
+      <a name="changes"></a>
+
+      ## [Cambiamenti sulla nostra Politica della Privacy](#changes)
+
+      Se decideremo di modificare la nostra politica sulla privacy, pubblicheremo i cambiamenti su questa pagina..
+
+      Questo documento è CC-BY-SA. Le ultime modifiche sono state effettuate il 31 Maggio 2013.
   badges:
     editor:
       name: Redattore
@@ -1560,63 +2788,282 @@ it:
     leader:
       name: Veterano
       description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Assegnato</a> modifica globale, puntare, chiudere, archiviare, suddividere e riunire, maggiori "Mi piace"
+      long_description: |
+        Questo distintivo è assegnato quando si raggiunge il livello di esperienza 4. Sei un veterano in questa comunità selezionato dallo staff, e qui sei un esempio positivo per il resto della comunità con le tue azioni e parole. Hai la possibilità di modificare tutti i messaggi, agire come un moderatore con azioni comuni quali puntare, chiudere, rendere invisibile, archiviare, dividere e unire, e hai tonnellate di mi piace al giorno.
     welcome:
       name: Benvenuto
       description: Ha ricevuto un "Mi piace"
+      long_description: |
+        Questo distintivo è assegnato quando ricevi il tuo primo mi piace su un messaggio. Congratulazioni, hai pubblicato qualcosa che i membri della tua comunità hanno trovato interessante, eccezionale o utile!
     autobiographer:
       name: Autobiografo
+      description: Ha compilato le informazioni del <a href="%{base_uri}/my/preferences/profile">profilo</a>
+      long_description: |
+        Questo distintivo è assegnato per aver compilato <a href="%{base_uri}/my/preferences/profile">il tuo profilo utente</a> e selezionato un'immagine per il profilo. Lasciare che gli altri sappiano di più su chi sei e a cosa sei interessato rende la comunità migliore e più connessa. Unisciti a noi!
     anniversary:
       name: Compleanno
       description: Membro attivo per un anno, ha scritto almeno una volta
       long_description: |
         Questo distintivo è assegnato a chi è membro da un anno con almeno un messaggio scritto durante quell'anno. Grazie per esserci e contribuire alla nostra comunità. Non potremmo farcela senza di te.
+    nice_post:
+      name: Risposta Piacevole
+      description: Ha ricevuto 10 mi piace su una risposta
+      long_description: |
+        Questo distintivo è assegnato quando una risposta riceve 10 mi piace. La tua risposta ha fatto davvero impressione sulla comunità e ha aiutato a portare la conversazione avanti!
+    good_post:
+      name: Buona Risposta
+      description: Ha ricevuto 25 mi piace su una risposta
+      long_description: |
+        Questo distintivo è assegnato quando una risposta riceve 25 mi piace. La tua risposta è stata eccezionale e ha reso la conversazione migliore per tutti!
+    great_post:
+      name: Grande Risposta
+      description: Ha ricevuto 50 mi piace su una risposta
+      long_description: |
+        Questo distintivo è assegnato quando una risposta riceve 50 mi piace. Wow! La tua risposta è stata ispiratrice, affascinante, divertente, o penetrante e la comunità l'ha amata.
+    nice_topic:
+      name: Argomento Piacevole
+      description: Ha ricevuto 10 mi piace su un argomento
+      long_description: |
+        Questo distintivo è assegnato quando un argomento riceve 10 mi piace. Hey, hai iniziato una conversazione interessante che la comunità ha apprezzato!
+    good_topic:
+      name: Buon Argomento
+      description: Ha ricevuto 25 mi piace su un argomento
+      long_description: |
+        Questo distintivo è assegnato quando il tuo argomento riceve 25 mi piace. Hai lanciato una conversazione vibrante che ha radunato la comunità!
     great_topic:
+      name: Grande Argomento
       description: Ha ricevuto 50 "Mi piace" in un argomento
+      long_description: |
+        Questo distintivo è assegnato quando un argomento riceve 50 mi piace. Hai avviato una conversazione affascinante e la comunità ha apprezzato la discussione dinamica che è seguita!
+    nice_share:
+      name: Piacevole Condivisione
+      description: Ha condiviso un messaggio con 25 visitatori unici
+      long_description: |
+        Questo distintivo è assegnato per aver condiviso un collegamento che è stato cliccato da 25 visitatori esterni. Grazie per diffondere la parola circa le nostre discussioni e questa comunità.
+    good_share:
+      name: Buona Condivisione
+      description: Ha condiviso un messaggio con 300 visitatori unici
+      long_description: |
+        Questo distintivo è assegnato per aver condiviso un collegamento che è stato cliccato da 300 visitatori esterni. Buon lavoro! Hai mostrato una grande discussione ad un gruppo di persone nuove e hai aiutato questa comunità a crescere.
+    great_share:
+      name: Grande Condivisione
+      description: Ha condiviso un messaggio con 1000 visitatori unici
+      long_description: |
+        Questo distintivo è assegnato per aver condiviso un collegamento che è stato cliccato da 1000 visitatori esterni. Wow! Hai promosso un'interessante discussione ad un pubblico enorme e ci hai aiutato a far crescere la nostra comunità in grande stile!
     first_like:
       name: Primo "Mi piace"
       description: Ha messo "Mi piace" a un messaggio
+      long_description: |
+        Questo distintivo è assegnato la prima volta che metti mi piace ad un messaggio usando il pulsante :heart:. Mettere mi piace a dei messaggi è un ottimo modo per far sapere a tutti i membri della tua comunità che ciò che hanno pubblicato è stato interessante, utile, forte o divertente. Condividi l'amore!
     first_flag:
       name: Prima Segnalazione
       description: Segnalato un messaggio
+      long_description: |
+        Questo distintivo è assegnato la prima volta che segnali un messaggio. La segnalazione serve per contribuire a mantenere questo luogo pulito e piacevole per tutti. Se noti dei messaggi che richiedono l'attenzione di un moderatore per qualsiasi motivo, non esitate a contrassegnarli. Puoi anche contrassegnare per inviare <b>messaggi personali</b> ad altri utenti se vedi un problema con i loro messaggi. Se vedi un problema, :flag_black: segnalalo!
+    promoter:
+      name: Promotore
+      description: Ha invitato un utente
+      long_description: |
+        Questo distintivo è assegnato quando si invita qualcuno ad unirsi alla comunità tramite il pulsante invita sulla tua pagina utente, o in fondo ad un argomento. Invitare amici che potrebbero essere interessati a discussioni specifiche è un ottimo modo per introdurre nuove persone alla nostra comunità, quindi grazie!
+    campaigner:
+      name: Attivista
+      description: Ha invitato 3 utenti
+      long_description: |
+        Questo distintivo è assegnato quando hai invitato 3 persone che hanno successivamente trascorso abbastanza tempo sul sito per diventare utenti base. Una comunità vivace ha bisogno di un'infusione regolare di nuovi arrivati che partecipano regolarmente e aggiungono nuove voci alle conversazioni.
+    champion:
+      name: Campione
+      description: Ha invitato 5 membri
+      long_description: |
+        Questo distintivo è assegnato quando hai invitato 5 persone che hanno successivamente trascorso abbastanza tempo sul sito per diventare membri a tutti gli effetti. Wow! Grazie per aver ampliato la diversità della nostra comunità con nuovi membri!
     first_share:
       name: Prima Condivisione
       description: Ha condiviso un messaggio
+      long_description: |
+        Questo distintivo è assegnato la prima volta che condividi un collegamento ad una risposta o ad un argomento usando il pulsante condividi. Condividere collegamenti è un ottimo modo per mostrare interessanti discussioni al resto del mondo e far crescere la tua comunità.
     first_link:
       name: Primo Collegamento
+      description: Ha aggiunto un collegamento ad un altro argomento
+      long_description: |
+        Questo distintivo è assegnato la prima volta che aggiungi un collegamento ad un altro argomento. Collegare argomenti aiuta i tuoi colleghi lettori a trovare interessanti conversazioni correlate, mostrando le connessioni tra gli argomenti in entrambe le direzioni. Collega liberamente!
     first_quote:
+      name: Prima Citazione
       description: Ha citato un messaggio
+      long_description: |
+        Questo distintivo è assegnato la prima volta che citi un messaggio nella tua risposta. Citare le sezioni rilevanti di messaggi precedenti nella tua risposta aiuta a mantenere le discussioni connesse insieme e in argomento. Il modo più semplice per citare è evidenziare una sezione di un messaggio e quindi premere il pulsante rispondi. Cita generosamente!
+    read_guidelines:
+      name: Linee Guida
+      description: Ha letto le <a href="%{base_uri}/guidelines">linee guida della comunità</a>
+      long_description: |
+        Questo distintivo è assegnato per <a href="%{base_uri}/guidelines">aver letto le linee guida della comunità</a>. Seguendo e condividendo queste semplici linee guida aiuti a costruire una comunità sicura, divertente e sostenibile per tutti. Ricorda sempre che c'è un altro essere umano, molto simile a te, dall'altro lato dello schermo. Sii carino!
+    reader:
+      name: Lettore
+      description: Ha letto ogni risposta in un argomento con più di 100 risposte
+      long_description: |
+        Questo distintivo è assegnato la prima volta che leggi un argomento lungo con più di 100 risposte. Leggere una conversazione attentamente ti aiuta a seguire la discussione, a comprendere punti di vista diversi, e conduce a conversazioni ancora più interessanti. Quanto più si legge, tanto è migliore la conversazione. Come ci piace dire, la Lettura è Fondamentale! :slight_smile:
+    popular_link:
+      name: Collegamento Di Successo
+      description: Ha pubblicato un collegamento esterno con 50 click
+      long_description: |
+        Questo distintivo è assegnato quando un collegamento che hai condiviso riceve 50 click. Grazie per aver pubblicato un collegamento utile che ha aggiunto un contesto interessante alla conversazione!
+    hot_link:
+      name: Collegamento Caldo
+      description: Ha pubblicato un collegamento esterno con 300 click
+      long_description: |
+        Questo distintivo è assegnato quando un collegamento che hai condiviso riceve 300 click. Grazie per aver pubblicato un collegamento affascinante che ha portato avanti la conversazione e ha illuminato la discussione!
+    famous_link:
+      name: Collegamento Famoso
+      description: Ha pubblicato un collegamento esterno con 1000 click
+      long_description: |
+        Questo distintivo è assegnato quando un collegamento condiviso riceve 1000 click. Wow! Hai inserito un link che ha migliorato significativamente la conversazione aggiungendo dettagli, contesto e informazioni essenziali. Ottimo lavoro!
     appreciated:
+      name: Apprezzato
       description: Ha ricevuto 1 "Mi piace" su 20 messaggi
+      long_description: |
+        Questo distintivo è assegnato quando ricevi almeno un mi piace su 20 messaggi differenti. La comunità si sta godendo i tuoi contributi alle conversazioni!
     respected:
+      name: Rispettato
       description: Ha ricevuto 2 "Mi piace" su 100 messaggi
+      long_description: |
+        Questo distintivo è assegnato quando ricevi almeno 2 mi piace su 100 messaggi differenti. La comunità sta imparando a rispettare i tuoi numerosi contributi alle conversazioni.
     admired:
+      name: Ammirato
       description: Ha ricevuto 5 "Mi piace" su 300 messaggi
+      long_description: |
+        Questo distintivo è assegnato quando ricevi almeno 5 mi piace su 300 messaggi differenti. Wow! La comunità ammira i tuoi contributi frequenti e di alta qualità nelle conversazioni.
+    out_of_love:
+      name: Amato
+      description: Ha messo 50 mi piace in un giorno
+      long_description: |
+        Questo distintivo è assegnato quando usi tutti i 50 mi piace che hai a disposizione giornalmente. Ricordando di prenderti un momento per mettere mi piace ai messaggi che ti piacciono e apprezzi, incoraggi i membri della tua comunità a creare discussioni ancora più grandi in futuro.
+    higher_love:
+      name: Molto Amato
+      description: Ha messo 50 mi piace al giorno per 5 volte
+      long_description: |
+        Questo distintivo è assegnato quando usi tutti i 50 mi piace giornalieri per 5 giorni. Grazie per aver dedicato del tempo ad incoraggiare le migliori conversazioni ogni giorno!
+    crazy_in_love:
+      name: Adorato
+      description: Ha messo 50 mi piace al giorno per 20 volte
+      long_description: |
+        Questo distintivo è assegnato quando usi tutti i 50 mi piace giornalieri per 20 giorni. Wow! Sei un modello di regolarità nel cercare di incoraggiare i membri della  tua comunità!
+    thank_you:
+      name: Ringraziato
+      description: Ha ricevuto 20 mi piace sui messaggi e dato 10 mi piace
+      long_description: |
+        Questo distintivo è assegnato quando ricevi 20 mi piace sui messaggi e dai 10 o più mi piace in cambio. Quando qualcuno mette mi piace ai tuoi messaggi, troverai il tempo per mettere mi piace a ciò che altri scrivono.
+    gives_back:
+      name: Ricambiato
+      description: Ha ricevuto 100 mi piace sui messaggi e dato 100 mi piace
+      long_description: |
+        Questo distintivo è assegnato quando hai ricevuto 100 mi piace sui messaggi e hai dato 100 o più mi piace in cambio. Grazie per aver ricambiato!
+    empathetic:
+      name: Empatico
+      description: Ha ricevuto 500 mi piace sui messaggi e dato 1000 mi piace
+      long_description: |
+        Questo distintivo è assegnato quando hai ricevuto 500 mi piace sui messaggi e hai dato 1000 o più mi piace in cambio. Sei un modello di generosità e di apprezzamento reciproco : due_hearts :.
     first_emoji:
+      name: Prima Emoji
+      description: Ha usato una Emoji in un messaggio
       long_description: |
         Questo distintivo viene assegnato la prima volta che inserisci un Emoji in un messaggio :thumbsup:. Gli Emoji ti permettono di trasmettere emozioni nei messaggi, dalla felicità :smiley: alla tristezza :anguished: alla rabbia :angry: e tutto ciò che sta nel mezzo :sunglasses:. Digita semplicemente : (carattere due punti) oppure premi il bottone Emoji nella barra degli strumenti dell'editor, per selezionare tra centinaia di possibilità :ok_hand:
+    first_mention:
+      name: Prima Menzione
+      description: Ha menzionato un utente in un messaggio
+      long_description: Questo distintivo è assegnato la prima volta che menzioni lo @username di qualcuno nel tuo messaggio. Ogni menzione genera una notifica a quella persona, così verrà a conoscenza del tuo messaggio. Inizia a digitare @ (il simbolo) per menzionare qualsiasi utente o, se è consentito, un gruppo - è un modo conveniente per portare qualcosa alla loro attenzione.
+    first_onebox:
+      name: Prima Onebox
+      description: ha inserito un collegamento che ha generato una onebox
+      long_description: Questo distintivo è assegnato la prima volta che inserisci un collegamento su una riga da solo, il quale viene automaticamente espanso in un'anteprima con un breve riassunto del collegamento, un titolo e (quando disponibile) un'immagine.
+    first_reply_by_email:
+      name: Prima Risposta Da Email
+      description: Ha risposto ad un messaggio tramite email
+      long_description: |
+        Questo distintivo è assegnato la prima volta che rispondi ad un messaggio tramite email :e-mail:.
+    new_user_of_the_month:
+      name: "Nuovo Utente del Mese"
+      description: Contributi eccezionali nel loro primo mese
+      long_description: |
+        Questo distintivo è assegnato per congratularsi con due nuovi utenti ogni mese per i loro ottimi contributi globali, misurati sulla frequenza dei like ricevuti per i loro messaggi e da chi li ha dati.
+    enthusiast:
+      name: Appassionato
+      description: 10 giorni di frequenza
+      long_description: Questo distintivo è assegnato per aver frequentato il sito per 10 giorni consecutivi. Grazie per essere stato con noi per più di una settimana!
+    aficionado:
+      name: Amatoriale
+      description: 100 giorni di frequenza
+      long_description: Questo distintivo è assegnato per aver frequentato il sito per 100 giorni consecutivi. Sono più di tre mesi!
+    devotee:
+      name: Devoto
+      description: 365 giorni di frequenza
+      long_description: Questo distintivo è assegnato per aver frequentato il sito per 365 giorni consecutivi. Wow, un anno intero!
+    badge_title_metadata: "%{display_name}distintivo su %{site_title}"
   admin_login:
     success: "email Inviata"
     error: "Errore!"
     email_input: "Email Amministratore"
     submit_button: "Invia Email"
+  performance_report:
+    initial_post_raw: Questo argomento include rapporti di rendimento giornalieri per il tuo sito.
+    initial_topic_title: Rapporti sul rendimento del sito web
   tags:
     title: "Etichette"
+    staff_tag_disallowed: "L'etichetta \"%{tag}\" può essere applicata solo dallo staff."
     staff_tag_remove_disallowed: "L'etichetta \"%{tag}\" può essere cancellata soltanto dallo staff."
   rss_by_tag: "Argomenti etichettati %{tag}"
+  finish_installation:
+    congratulations: "Congratulazioni, hai installato Discourse!"
+    register:
+      button: "Registrare"
+      title: "Registrare Account Amministratore"
+      help: "registrare un nuovo account per cominciare"
+      no_emails: "Purtroppo non è stata definita alcuna email di amministratore durante l'installazione, per cui la configurazione <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>potrebbe risultare difficoltosa</a>."
+    confirm_email:
+      title: "Conferma la tua Email"
+      message: "<p>Abbiamo inviato una email di attivazione a <b>%{email}</b>. Segui le istruzioni nella email per attivare il tuo account.</p><p>Se non arriva assicurati di aver impostato correttamente l'email per Discourse e di aver controllato la cartella di spam.</p>"
+    resend_email:
+      title: "Rispedire Email di Attivazione"
+      message: "<p>Abbiamo rispedito una email di attivazione a <b>%{email}</b>"
+  safe_mode:
+    title: "Modalità sicura"
+    description: "La modalità sicura ti consente di testare il tuo sito senza caricare plugin o personalizzazioni del sito."
+    no_customizations: "Disabilita il tema corrente"
+    only_official: "Disabilita i plugin non ufficiali"
+    no_plugins: "Disabilita tutti i plugin"
+    enter: "Avvia Modalità Sicura"
+    must_select: "È necessario selezionare almeno un'opzione per accedere alla modalità sicura."
   wizard:
+    title: "Configurazione Discourse"
     step:
+      locale:
+        title: "Benvenuto sul tuo Discourse!"
+        fields:
+          default_locale:
+            description: "Qual è il linguaggio predefinito della tua comunità?"
+      forum_title:
+        title: "Nome"
+        description: "Il tuo nome è un segno visibile in lontananza, la <i>prima</i> cosa che i visitatori potenziali noteranno sulla tua comunità. Cosa dice il tuo nome e il tuo titolo sulla tua comunità?"
+        fields:
+          title:
+            label: "Il nome della tua comunità"
+            placeholder: "Il Ritrovo di Jane"
+          site_description:
+            label: "Descrivi  la tua comunità in una breve frase"
+            placeholder: "Un posto per Jane e per i suoi amici dove discutere di cose forti"
       introduction:
         title: "Introduzione"
         fields:
           welcome:
             label: "Argomento di Benvenuto"
+            description: "<p>Come descriveresti la tua comunità ad un estraneo su un ascensore in circa 1 minuto?</p><ul><li>Per chi sono queste discussioni?</li><li>Cosa posso trovare qui?</li><li>Perché dovrei visitare il sito?</li></ul><p>Il tuo argomento di benvenuto è la prima cosa che i nuovi arrivati leggeranno. Pensalo come al <b>tuo paragrafo</b> 'discorso da ascensore' o 'dichiarazione di intenti'.</p>"
+            one_paragraph: "Restringi il tuo messaggio di benvenuto a un paragrafo."
       privacy:
         title: "Accesso"
+        description: "<p>La tua comunità è aperta a tutti o è limitata ai membri, agli inviti o all'approvazione? Se preferisci puoi impostare il sito come privato e poi passare a pubblico in seguito.</p><p>Puoi sempre inviare inviti da argomenti o dalla tua pagina di profilo utente.</p>"
         fields:
           privacy:
             choices:
               open:
                 label: "Pubblico"
+                description: "Chiunque può accedere a questa comunità e registrare un account"
               restricted:
                 label: "Privato"
                 description: "Solo le persone che ho invitato o approvato possono accedere a questa comunità"
@@ -1626,23 +3073,32 @@ it:
           contact_email:
             label: "Email"
             placeholder: "nome@esempio.com"
+            description: "Indirizzo email della persona o del gruppo responsabile di questa comunità. Utilizzato per notifiche critiche quali segnalazioni non gestite, aggiornamenti sulla protezione e sulla tua pagina <a href='/about' target='_blank'>informazioni</a> per un contatto urgente."
           contact_url:
             label: "Sito Web"
+            placeholder: "http://www.example.com/contact-us"
+            description: "Pagina web di contatto generale per te o per la tua organizzazione. Sarà visualizzato sulla tua pagina <a href='/about' target='_blank'>informazioni</a>."
           site_contact:
             label: "Messaggi Automatici"
+            description: "Tutti i messaggi personali automatici di Discourse saranno inviati da questo utente, quali avvisi di segnalazione e avvisi di completamento di backup."
       corporate:
         title: "Società"
+        description: "Questi nomi verranno inseriti nelle <a href='/privacy' target='blank'>Norme sulla Privacy</a> e nei <a href='/tos' target='blank'>Termini di servizio</a>, che sono argomenti che è possibile modificare nella categoria Staff. Se non hai un'azienda, non esitare a saltare questo passaggio per ora."
         fields:
           company_short_name:
             label: "Nome Azienda (breve)"
+            placeholder: "Initech"
           company_full_name:
             label: "Nome Azienda (completo)"
+            placeholder: "Initech, Inc."
           company_domain:
             label: "Nome Dominio Azienda"
+            placeholder: "initech.com"
       colors:
         title: "Tema"
         fields:
           theme_id:
+            description: "Preferisci iniziare una combinazione di colori chiara o scura? È possibile personalizzare ulteriormente l'aspetto del tuo sito tramite Amministrazione, Personalizza."
             choices:
               default:
                 label: "Semplice Chiaro"
@@ -1653,24 +3109,40 @@ it:
         fields:
           logo_url:
             label: "Logo Primario"
+            description: "L'immagine del logo in alto a sinistra del tuo sito. Usare una forma rettangolare estesa."
           logo_small_url:
             label: "Logo Piccolo"
+            description: "Una versione compatta del tuo logo, mostrata in alto a sinistra del tuo sito, quando lo scorri verso il basso. Utilizzare una forma quadrata."
       icons:
         title: "Icone"
         fields:
           favicon_url:
             label: "Icona Piccola"
+            description: "Immagine dell'icona utilizzata per rappresentare il tuo sito nei browser web che sembra buona a piccole dimensioni, ad esempio 32px per 32px."
           apple_touch_icon_url:
             label: "Icona Grande"
+            description: "Immagine dell'icona utilizzata per rappresentare il tuo sito su dispositivi moderni che sembra buona a dimensioni più grandi. La dimensione consigliata è almeno 144px per 144px."
       homepage:
+        description: "Ti consigliamo di mostrare gli ultimi argomenti nella tua homepage, ma puoi anche visualizzare le categorie (gruppi di argomenti) sulla homepage, se preferisci."
         title: "Homepage"
         fields:
           homepage_style:
             choices:
+              latest:
+                label: "Ultimi Argomenti"
               categories:
                 label: "Categorie"
       emoji:
         title: "Emoji"
+        description: "Quale stile di emoji preferisci per la tua comunità? Puoi aggiungere più Emoji personalizzate in seguito tramite Amministrazione, Personalizza, Emoji."
+      invites:
+        title: "Invita lo Staff"
+        description: "Hai quasi finito! Invita alcune persone a <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>contribuire alle discussioni</a> con argomenti e risposte interessanti per far partire la tua comunità. "
+      finished:
+        title: "Il tuo Discourse è Pronto!"
+        description: |
+          <p>Se te la senti di cambiare queste impostazioni, visita <a href='/admin' target='_blank'>la tua sezione amministrazione</a>; la trovi accanto all'icona della chiave inglese nel menu hamburger del sito.</p>
+          <p>Divertiti e buona fortuna <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>nel costruire la tua nuova comunità!</a></p>
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 622638af6e..3df482f16d 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}'
@@ -75,6 +82,9 @@ ja:
       load_from_remote: "投稿の読み込みに失敗しました。"
     site_settings:
       min_username_length_range: "最小値を最大値より上にすることはできません。"
+  bulk_invite:
+    file_should_be_csv: "アップロードファイルはcsv形式である必要があります。"
+    error: "アップロードファイルにエラーが発生しました。時間が経ってから再度お試しください。"
   backup:
     operation_already_running: "操作を実行しています。他の操作はできません。"
     backup_file_should_be_tar_gz: "バックアップファイルは .tar.gz形式である必要があります。"
@@ -183,6 +193,7 @@ ja:
               common: "は10000最も一般的なパスワードのいずれかである。より安全なパスワードを使用してください。"
               same_as_username: "はあなたのユーザー名と同じです。より安全なパスワードを使用してください"
               same_as_email: "はあなたのメールアドレスと同じです。より安全なパスワードを使用してください"
+              same_as_current: "はあなたの現在のパスワードと同じです。"
             ip_address:
               signup_not_allowed: "このアカウントからのサインアップできません。"
         color_scheme_color:
@@ -195,10 +206,11 @@ ja:
   vip_category_name: "ラウンジ"
   vip_category_description: "トラストレベル3以上のメンバーのみが参加できるカテゴリ"
   meta_category_name: "サイトフィードバック"
-  meta_category_description: "Discussion about this site, its organization, how it works, and how we can improve it."
+  meta_category_description: "本サイトをより使い勝手がいいものにするために議論しましょう。"
   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)の`サポートするファイルの拡張` を編集してください"
+  discourse_welcome_topic:
+    title: "Discourseへようこそ"
   lounge_welcome:
     title: "ラウンジへようこそ"
     body: |2
@@ -320,15 +332,18 @@ ja:
     off_topic:
       title: '関係ない話題'
       description: 'この投稿はタイトルと投稿で定義される現在の内容に関連しておらず、どこかに移動させる必要があります'
+      short_description: 'ディスカッションに関連がない'
       long_form: '「関係ない話題」として通報'
     spam:
       title: 'スパム'
+      short_description: '営利目的か破壊行為の可能性'
       long_form: 'スパムとして通報する'
       email_title: '"%{title}"はスパムとして通報されています'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: '不適切'
       description: 'この投稿は、誹謗中傷、恫喝、名誉毀損、わいせつ、犯罪行為など他人を不快にさせる内容を含んでいる。'
+      short_description: 'コミュニティガイドラインへの違反'
       long_form: '不適切として通報する'
     notify_user:
       title: '@{{username}}へメッセージを送る'
@@ -337,6 +352,7 @@ ja:
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "その他"
+      short_description: 'その他の理由で管理人による確認が必要'
       long_form: 'スタッフへ知らせるために通報する'
       email_body: "%{link}\n\n%{message}"
     bookmark:
@@ -367,7 +383,6 @@ ja:
       email_title: 'トピック"%{title}" は不適切な可能性があるため、管理人による確認を必要とする。'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>投稿が他のユーザーから通報されました。<a href="/my/messages">投稿したメッセージ</a>を確認してください。</p>'
     user_must_edit: '<p>この投稿は他のユーザーから通報されたため、非表示にされています。</p>'
   archetypes:
     regular:
@@ -378,15 +393,16 @@ ja:
         make: "このトピックはバナートピックに設定されています。ユーザーが解除しない限り、ページ毎の一番上に表示されます"
         remove: "このトピックはバナーではなくなりました。トップページには表示されなくなります"
   unsubscribe:
+    title: "配信停止"
     unwatch_category: "%{category}内の全トピックのウォッチを解除"
   user_api_key:
     title: "アプリケーションアクセスの認証"
     description: "\"%{application_name}\" があなたのアカウントへのアクセスを要求しています: "
   reports:
     visits:
-      title: "訪問ユーザー"
+      title: "アクセスユーザー"
       xaxis: "日"
-      yaxis: "訪問者数"
+      yaxis: "アクセス数"
     signups:
       title: "新規ユーザー"
       xaxis: "日"
@@ -518,9 +534,9 @@ ja:
       xaxis: "日"
       yaxis: "合計"
     mobile_visits:
-      title: "訪問ユーザー"
+      title: "アクセスユーザー"
       xaxis: "日"
-      yaxis: "訪問者数"
+      yaxis: "アクセス数"
   dashboard:
     rails_env_warning: "サーバは %{env} モードで起動中です。"
     host_names_warning: "現在 config/database.yml ファイルは、デフォルトの localhost をホスト名として使用しています。あなたのサイトのホスト名に更新してください。"
@@ -552,9 +568,7 @@ ja:
     educate_until_posts: "最初(または複数)の投稿でタイピングを開始したら、ポップアップでガイダンスを表示させるか"
     title: "サイトの名前です。titleタグで使用されます"
     site_description: "このサイトについて簡単に説明してください。 descriptionタグで使用されます。"
-    contact_email: "このサイトへのお問い合わせを行うメールアドレス。お問い合わせフォームからの緊急事項、対応されていない通報など、緊急の通知に使用します"
     contact_url: "このサイトの問い合わせURL。緊急連絡用問い合わせフォームに使用されます"
-    queue_jobs: "開発者ONLY! 警告! デフォルトでキューは sidekiq により処理されます。これを無効にするとサイトが動作不能になります。"
     crawl_images: "正しい幅と高さを取得するためにURLから画像を取得する"
     download_remote_images_to_local: "リモート画像をダウンロードしてローカル画像に変換する。破損した画像を防ぎます"
     download_remote_images_threshold: "リモート画像をダウンロードするために必要なディスクスペースの最低残容量 (パーセント)"
@@ -567,12 +581,10 @@ ja:
     fixed_category_positions: "チェックすると、カテゴリの表示順をコントロールできます。チェックしない場合、アクティビティ順に表示されます"
     fixed_category_positions_on_create: "チェックすると、トピック作成ダイアログ上でカテゴリの順序が維持されます(fixed category positions が必要)。"
     add_rel_nofollow_to_user_content: " 内部リンク(親ドメインを含む)を除き、投稿されたすべてのユーザコンテンツに rel nofollow を追加する。この設定を反映するには \"rake posts:rebake\" を実行して baked markdown をすべて更新する必要があります"
-    exclude_rel_nofollow_domains: "nofollowを付与すべきではないドメインのリスト。tld.comは、sub.tld.com も許可します。最低でもクローラーが全てのコンテンツを見つけるために、このサイトのトップレベルドメインを追加する必要があります。このサイトの他の部分が別ドメインに存在している場合、それも追加します"
     post_excerpt_maxlength: "投稿の引用/サマリの最大文字数"
     post_onebox_maxlength: "Discourse OneBox投稿の最大文字数"
     logo_url: "サイトの左上に表示されるロゴ画像です。横幅の大きい長方形にする必要があります。空欄の場合、サイトタイトルが表示されます"
     logo_small_url: "サイトの左上に表示される小さいロゴ画像です。正方形である必要があります。下にスクロールすると表示されます。空欄の場合、ホームアイコンが表示されます"
-    mobile_logo_url: "モバイルサイトの左上に固定で表示されるロゴ画像です。正方形である必要があります。空欄の場合 `logo_url` が利用されます 例: http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "Apple のタッチデバイス用のアイコン。推奨サイズは 144px x 144px"
     notification_email: "The from: email address used when sending all essential system emails. The domain specified here must have SPF, DKIM and reverse PTR records set correctly for email to arrive."
     email_custom_headers: "カスタムメールヘッダのリスト (パイプ(バーティカルバー) 区切り)"
@@ -592,7 +604,6 @@ ja:
     tl2_additional_likes_per_day_multiplier: "この数字を掛けると TL2 (メンバー) の1日あたりの「いいね！」の上限を増やします"
     tl3_additional_likes_per_day_multiplier: "この数字を掛けると TL3 (レギュラー) の1日あたりの「いいね！」の上限を増やします"
     tl4_additional_likes_per_day_multiplier: "この数字を掛けると TL4 (リーダー) の1日あたりの「いいね！」の上限を増やします"
-    notify_mods_when_user_blocked: "ユーザが自動的にブロックされた際に、すべてのモデレータにメッセージを送信する。"
     flag_sockpuppets: "トピックを作成したユーザーと同じIPアドレスで、新規ユーザーがトピックに回答した場合、両者を潜在的なスパムとしてフラグを立てるか"
     traditional_markdown_linebreaks: "Markdown の従来形式のラインブレーク (行の終わりにダブルスペース) を使う"
     post_undo_action_window_mins: "投稿に対するアクション (「いいね!」、通報等) 取り消しを許可する時間 (秒)"
@@ -624,8 +635,6 @@ ja:
     log_out_strict: "ログアウトした際に、そのユーザーの全デバイスのセッションをログアウトさせる"
     version_checks: "Discourse Hubからのアップデートを確認し、管理ページにバージョンやアップデートメッセージを表示する"
     new_version_emails: "Discourseの新しいバージョンが利用可能になった際に contact_email アドレスにメールで通知する"
-    port: "開発者用! 警告! デフォルトの80番ポートではなく、ここで指定した HTTP ポートを利用する。空欄でデフォルトの80番ポートを利用。"
-    force_hostname: "開発者用! 警告! URL 内のホスト名を指定。空欄でデフォルト値を利用。"
     invite_expiry_days: "招待キーの有効期間 (日)"
     invite_passthrough_hours: "ユーザーが、以前の招待キーを使う事ができる時間"
     login_required: "サイトのコンテンツを閲覧するには認証を必須にして、匿名アクセスを拒否する"
@@ -679,7 +688,6 @@ ja:
     clean_up_uploads: "不正アップロードを防ぐためにどこからも参照されていないアップロードファイルを削除する。警告: この設定を有効にする前に /uploads ディレクトリのバックアップを取ることをおすすめします"
     clean_orphan_uploads_grace_period_hours: "どこからもリンクされていないアップロードファイルを削除するまでの猶予期間 (単位：時間)。"
     purge_deleted_uploads_grace_period_days: "削除されたアップロードファイルが完全削除されるまでの猶予期間 (単位：日)。"
-    purge_unactivated_users_grace_period_days: "アクティベートしていないユーザが削除されるまでの猶予期間 (日)"
     enable_s3_uploads: "Amazon S3にアップロードします。重要: 有効なS3 credentials(access key id & secret access key)が必要です"
     s3_use_iam_profile: 'キーの取得にAWS EC2 IAM roleを使用する 注意: 有効にすると、s3 access key id" と "s3 secret access key"の設定を上書きします'
     s3_upload_bucket: "ファイルをアップロードする Amazon S3のバケット名。　警告: 小文字である必要があり、ピリオドとアンダースコアを含むことはできません"
@@ -759,9 +767,6 @@ ja:
     num_flags_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: "自動的にブロックされるfast typerに対する最大のトラストレベル"
-    auto_block_first_post_regex: "この正規表現に一致すると、ユーザーの最初の投稿をブロックし、承認キューに送られる。最初の投稿にのみ適用されます"
     reply_by_email_enabled: "メールでのトピックへの返信を有効化する"
     reply_by_email_address: "メールアドレスによる回答のテンプレート。例: %{reply_key}@reply.myforum.com"
     disable_emails: "Discourseからの全ての種類のメール送信を止める"
@@ -775,7 +780,6 @@ ja:
     pop3_polling_username: "ポーリングを行うPOS3アカウントのユーザ名"
     pop3_polling_password: "ポーリングを行うPOS3アカウントのパスワード"
     log_mail_processing_failures: "Eメールの失敗ログをhttp://yoursitename.com/logs に保存する"
-    email_in: "ユーザにメールでのトピック作成を許可する(POP3ポーリングが必須) 。設定タブでカテゴリ毎に設定してください"
     email_in_min_trust: "メールでのトピック作成を許可する最低トラストレベル"
     email_prefix: "メールのタイトルに使用される[ラベル]。空白の場合、タイトルがデフォルトで使用されます"
     email_site_title: "サイトからのメールの送信者として使用されるタイトル。 空白の場合、タイトルがデフォルトで使用されます。タイトルにメールの送信者として使用できない文字列が含まれている場合、この設定を使用します"
@@ -783,7 +787,6 @@ ja:
     relative_date_duration: "ポスト投稿後、ポスト投稿日が相対表示 (例: 7d)から絶対表示(例: Feb 20)に変わるまでの日数"
     delete_user_max_post_age: "最初のポストが(x)日よりも古いユーザは削除しない"
     delete_all_posts_max: "すべてのポストを削除ボタンで一度に削除可能な最大ポスト数。ユーザがここで指定した以上のポストを投稿していた場合は、一度に全ポストを削除することができません。またユーザも削除されません。"
-    username_change_period: "ユーザ名の変更が可能になるまでの登録日からの日数 (0を指定でユーザ名の変更自体を無効化)。"
     email_editable: "登録後、ユーザによるメールアドレスの変更を許可する。"
     allow_uploaded_avatars: "プロフィール画像のアップロードを許可"
     allow_animated_avatars: "プロフィール画像としてアニメgifをアップロードするのを許可。警告: この設定を変更した場合 avatars:refresh rakeタスクを実行すること"
@@ -812,14 +815,8 @@ ja:
     default_code_lang: "Github コードブロックにデフォルトで適用されるプログラム言語シンタックスハイライト (lang-auto, ruby, python 等)"
     warn_reviving_old_topic_age: "最後の返信がこの設定よりも古いトピックに返信すると、警告を表示します。0を設定すると無効になります"
     autohighlight_all_code: "明示的に言語を指定しなくても、全てのコードブロックにコードハイライトを強制的に適用する"
-    feed_polling_enabled: "EMBEDDING ONLY:  ポストとしてRSS/Atomフィードを埋め込むかどうか"
-    feed_polling_url: "EMBEDDING ONLY: RSS/ATOMフィードのURLを埋め込む事が出来ます"
-    embed_by_username: "embedされたトピックの作成者として表示されるDiscourseユーザー名"
-    embed_username_key_from_feed: "フィードからDiscourseユーザ名をプルするキー"
     embed_truncate: "embedされた投稿をtruncateする"
     embed_post_limit: "表示可能な投稿の最大数を埋め込む"
-    embed_whitelist_selector: "embedを許可するエレメントのCSS Selector"
-    embed_blacklist_selector: "embedから削除するエレメントのCSS Selector"
     show_create_topics_notice: "サイトにpublicなトピックが5よりも少ない場合、トピックを作成するための通知が管理者に表示される"
     delete_drafts_older_than_n_days: (n) 日間経過したドラフトを削除
     prevent_anons_from_downloading_files: "匿名ユーザーが添付ファイルをダウンロードするのを防止。警告: 画像ではなく、添付ファイルとして投稿された全てのファイルが対象です"
@@ -910,13 +907,11 @@ ja:
     email_too_long: "メールアドレスが長過ぎます。アドレス部は254文字以内に、ドメイン部は253文字以内にする必要があります"
     reserved_username: "そのユーザー名は許可されていません"
     missing_user_field: "全てのユーザーフィールドの入力が終わっていません"
-    close_window: "ログインは完了しました。このウィンドウを閉じて続けてください"
   user:
     no_accounts_associated: "関連づけられたアカウントはありませんでした"
     username:
       short: "少なくとも%{min}文字は必要です"
       long: "%{max}文字以下である必要があります"
-      characters: "英数字/アンダースコア/ハイフン/ドットのみ使用できます"
       unique: "はユニークである必要があります"
       blank: "は空であってはなりません"
     email:
@@ -928,10 +923,6 @@ ja:
   flags_reminder:
     subject_template:
       other: "%{count}件の通報が対応待ちです"
-  invite_mailer:
-    subject_template: "%{invitee_name} があなたを %{site_domain_name}の'%{topic_title}'に招待しました"
-  invite_forum_mailer:
-    subject_template: "%{invitee_name} あなたを %{site_domain_name}に招待しました。"
   invite_password_instructions:
     subject_template: "%{site_name} アカウントのパスワードを設定"
   flag_reasons:
@@ -946,6 +937,7 @@ ja:
     deferred: "伝えてくれてありがとうございます。調査しています"
     deferred_and_deleted: "伝えてくれてありがとうございます。投稿を削除しました"
   system_messages:
+    contents_hidden: "内容を確認するためにその投稿にアクセスして下さい。"
     welcome_user:
       subject_template: "%{site_name} へようこそ!"
     welcome_invite:
@@ -967,13 +959,10 @@ ja:
       subject_template: "データのダウンロード準備が完了しました"
     csv_export_failed:
       subject_template: "データのエクスポートに失敗しました"
-      text_body_template: "申し訳ありません。データのエクスポートに失敗しました。ログを確認するかスタッフメンバーにお問い合わせください。"
     email_reject_parsing:
       text_body_template: |
         申し訳ありません,あなたの %{destination} へのメール(titled %{former_title}) は動きませんでした
         メールから回答を見つける事ができませんでした。返信はメールのトップにあることを確認してください。インライン回答を見つける事はできません。
-    spam_post_blocked:
-      subject_template: "同一リンクの連続投稿による新規ユーザ %{username} のブロック"
     pending_users_reminder:
       subject_template:
         other: "%{count} 人のユーザか承認を待っています。"
@@ -984,6 +973,13 @@ ja:
     download_remote_images_disabled:
       subject_template: "リモート画像のダウンロードを無効化"
       text_body_template: "'download_remote_images_threshold'の制限に達したため、`download_remote_images_to_local`の設定は無効になりました"
+  unsubscribe_link: |
+    配信停止をご希望の場合は、[こちらをクリック](%{unsubscribe_url})してください。
+  unsubscribe_link_and_mail: |
+    配信停止をご希望の場合は、[こちらをクリック](%{unsubscribe_url})してください。
+  unsubscribe_mailing_list: |
+    本メッセージは、メーリングリストモードの設定が有効になっているため配信されました。
+    配信停止をご希望の場合は、[こちらをクリック](%{unsubscribe_url})してください。
   subject_re: "Re:"
   subject_pm: "[プライベートメッセージ]"
   user_notifications:
@@ -991,11 +987,13 @@ ja:
     unsubscribe:
       title: "解除"
       description: "メールに興味がありませんか? 下のリンクをクリックすると、即座にメール解除ができます:"
+    reply_by_email: "回答するにはこのメールに返信するか、 (%{base_url}%{url}) に[ブラウザでアクセスしてください]。"
+    visit_link_to_respond: "回答するには(%{base_url}%{url})に[ブラウザでアクセスしてください]。"
+    visit_link_to_respond_pm: "回答するには(%{base_url}%{url})に[ブラウザでアクセスしてください]。"
     posted_by: "%{post_date} に %{username} が投稿"
     digest:
       why: "あなたが最後にアクセスした %{last_seen_at} 以降の %{site_link} のまとめです"
-      unsubscribe: "このお知らせは%{site_link}から送信されました。購読を解除したい場合は%{unsubscribe_link}してください。"
-      click_here: "ここをクリック"
+      click_here: "こちらをクリック"
     signup_after_approval:
       subject_template: "%{site_name} への参加承認完了!"
   page_not_found:
@@ -1005,10 +1003,6 @@ ja:
     see_more: "もっと見る"
     search_title: "サイトを検索"
     search_google: "Google"
-  login_required:
-    welcome_message: |
-      #[%{title}へようこそ](#welcome)
-      アカウントが必要です。アカウントを作成するかログインしてください
   terms_of_service:
     title: "利用規約"
     signup_form_message: '<a href="/tos" target="_blank">Terms of Service</a>を読んで同意しました'
@@ -1140,24 +1134,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>をすべて書く
+    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: 通報した投稿
-    read_guidelines:
-      description: <a href="/guidelines">ガイドライン</a>を読む
     popular_link:
       name: 人気のリンク
     hot_link:
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index f6b923eb70..6220d2e962 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)가 비활성상태일 때 발생합니다."
+        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: "발신자의 이메일 주소가 이미 차단되었을 때 발생합니다."
+      unrecognized_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}명의 사용자만 언급할 수 있습니다."
@@ -111,36 +159,61 @@ ko:
   no_links_allowed: "죄송합니다. 신규회원은 글에 링크를 넣을 수 없습니다."
   too_many_links:
     other: "죄송합니다. 신규회원은 글 하나에 링크를 %{count}개까지 넣을 수 있습니다."
+  contains_blocked_words: "포스트에 금지 단어가 포함되어 있습니다."
   spamming_host: "죄송합니다. 회원님은 링크를 첨부할 수 없습니다."
   user_is_suspended: "가입이 보류된 회원은 글을 쓸 수 없습니다."
-  topic_not_found: "뭔가 잘못됐네요. 아마 글 보려는 도중에 글타래가 닫혔거나 지워진 건 아닐까요?"
+  topic_not_found: "뭔가 잘못됐네요. 아마 읽려는 도중에  토픽이 닫혔거나 지워진 건 아닐까요?"
+  not_accepting_pms: "죄송합니다. %{username} 님이 당분간 메시지를 받지 않습니다."
+  max_pm_recepients: "죄송합니다. 최대 %{recipients_limit} 명의 수신자에게만 메시지를 보낼 수 있습니다."
   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: "태그된 토픽"
+    badge: "%{site_title}의 %{display_name} 배지"
   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 +224,8 @@ ko:
       trust_level_2: "회원등급 2"
       trust_level_3: "회원등급 3"
       trust_level_4: "회원등급 4"
+    request_membership_pm:
+      title: "@%{group_name}그룹에 가입 신청"
   education:
     until_posts:
       other: "글 %{count}개"
@@ -161,7 +236,7 @@ ko:
 
       - 누가 무엇때문에 관심을 보일까요? 어떤 대답을 듣고 싶나요?
 
-      - 사람들이 *검색*할 수 있도록 글타래에 흔히 사용하는 단어를 집어넣으세요. 관련 글타래와 같이 엮으려면 해당 카테고리를 선택하시고요.
+      - 사람들이 *검색*할 수 있도록 토픽에 흔히 사용하는 단어를 집어넣으세요. 관련 토픽과 같이 엮으려면 해당 카테고리를 선택하시고요.
 
       이 글은 당신의 첫 %{education_posts_text} 에서만 나옵니다. 자세한 내용은 [커뮤니티 가이드라인](/guidelines)을 참조하세요.
     new-reply: |
@@ -174,12 +249,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 +311,46 @@ ko:
               too_many_users: "한 번에 한 명의 사용자에게 경고를 보낼 수 있습니다."
               cant_send_pm: "죄송합니다. 그 사용자에게 개인 메세지를 보낼 수 없습니다."
               no_user_selected: "유효한 사용자를 선택해주십시오"
+              reply_by_email_disabled: "이메일로 답글쓰기가 비활성화되었습니다."
+            featured_link:
+              invalid: "는 올바르지 않습니다. URL은 http:// 또는 https://를 포함해야 합니다."
+              invalid_category: "이 카테고리에서는 편집할 수 없습니다."
         user:
           attributes:
             password:
               common: "가장 자주 사용되는 10000개의 비밀번호 중 하나입니다. 보다 안전한 비밀번호를 사용하세요."
-              same_as_username: "는 아이디랑 같음. 제발 좀 더 안전한 비밀번호를 사용해주세요."
-              same_as_email: "는 이메일 주소랑 같음. 좀 더 안전한 비밀번호를 사용해주세요."
+              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: "미래값으로 설정되어야 합니다."
+        watched_word:
+          attributes:
+            word:
+              too_many: "해당 행동을 위한 단어가 너무 많습니다."
       <<: *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 +358,48 @@ 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}' 카테고리에서 이미 사용중입니다."
+      description_incomplete: "카테고리 설명 포스트는 적어도 하나의 문장을 가져야 합니다."
     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 +420,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 +486,9 @@ ko:
       almost_x_years:
         other: "약 %{count}년 전"
   password_reset:
+    no_token: "죄송하지만, 해당 비밀번호 변경 링크는 너무 오래됐습니다. 로그인 버튼을 눌러서 '비밀번호를 잊어버렸어요'를 사용하여 새로운 링크를 받으세요."
+    choose_new: "새로운 비밀번호를 입력하세요"
+    choose: "패스워드를 입력하세요"
     update: '비밀번호 변경'
     save: '비밀번호 설정'
     title: '비밀번호 초기화'
@@ -317,8 +498,11 @@ ko:
     confirmed: "이메일 주소가 변경되었습니다."
     please_continue: "%{site_name}으로 가기"
     error: "이메일 주소를 변경하는데 문제가 있습니다. 주소가 이미 사용되고 있나요?"
+    error_staged: "이메일 주소 변경중에 에러가 발생했습니다. 이 주소는 격리된 사용자가 이미 사용중입니다."
+    already_done: "죄송합니다. 이 확인 링크는 더 이상 유효하지 않습니다. 이메일이 이미 변경되지는 않았나요?"
     authorizing_old:
       title: "이메일 주소를 확인해 주셔서 감사합니다."
+      description: "확인을 위하여 새로운 이메일 주소로 메일을 전송합니다."
   activation:
     action: "여기를 눌러 계정을 활성화하세요."
     already_done: "죄송합니다. 이 계정 확인 링크는 더 이상 유효하지 않습니다."
@@ -326,41 +510,71 @@ 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: "좋아요를 받은 게시글이 없습니다"
+    no_replies:
+      self: "어떠한 게시물에도 답글을 단 적이 없습니다."
+      others: "답글이 없습니다."
   topic_flag_types:
     spam:
       title: '스팸'
@@ -379,7 +593,6 @@ ko:
       email_title: '글타래 "%{title}" 은 운영자의 확인이 필요합니다'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>회원님의 글이 신고되었습니다. <a href="/my/messages">메세지를 확인</a> 해주세요.</p>'
     user_must_edit: '<p>글이 신고되었기 때문에 일시적으로 보이지 않습니다.</p>'
   archetypes:
     regular:
@@ -389,6 +602,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 +715,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,38 +777,58 @@ 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: "대문에 실을 최신 포스트 수"
+    log_search_queries: "사용자에 의해 발생된 로그 탐색 쿼리"
+    search_query_log_max_size: "최대 쿼리 기록 저장 수"
     allow_uncategorized_topics: "카테고리 없이 게시 허용. 주의: 카테고리 없는 글은 이 항목을 비활성화에 하기전에 카테고리 설정을 해야 합니다."
     allow_duplicate_topic_titles: "같은 제목의 동일한 주제 허용"
     unique_posts_mins: "같은 컨텐츠를 다시 글 할 수 있는 기간(분)"
     educate_until_posts: "새로운 사용자가 글를 작성할 시 글 작성 방법에 대한 교육패널을 보여주는데, 해당 패널이 보여지는 초기 글 개수"
     title: "타이틀 태그에 쓰일 이 사이트의 이름"
     site_description: "이 사이트를 한 문장으로 설명해 주세요. 설명 메타태그에 사용됩니다."
-    contact_email: "문의 답변 관련 중요 책임자 이메일주소. 접수안된 신고, 긴급사항으로 /about 양식에서 보낸 메일 등 중요한 알림에 사용 됩니다. "
     contact_url: "이 사이트의 문의 URL.  /about 문의양식에 사용됩니다."
-    queue_jobs: "개발자 전용! 경고!  By default, queue jobs in sidekiq. If disabled, your site will be broken."
     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으로 설정 시, 즉시 삭제됩니다."
@@ -566,40 +837,57 @@ ko:
     fixed_category_positions: "활성화하면 고정된 순서의 카테고리들을 바꿀 수 있다. 활성화 하지 않으면 카테고리는 활동적인 순서에 따라 정렬된다."
     fixed_category_positions_on_create: "선택 시, 카테고리 정렬이 유지됩니다. (fixed_category_positions가 체크돼 있어야 합니다.)"
     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 파일을 설정해야 합니다."
     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 (리더)의 일별 좋아요 제한을 올릴 배수"
-    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_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,32 +902,44 @@ 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: "가입하려면 반드시 사용해야하는 이메일 도메인 목록, 파이프 기호로 구분. 경고: 이 목록외의 도메인으로는 가입이 안됩니다!"
     log_out_strict: "로그아웃 할때, 모든 장치에서 다같이 로그아웃"
     version_checks: "Dicousre Hub에 ping을 날려 버전 업데이트와 새 버전 알림을 /admin 대시보드에 보이게 합니다."
     new_version_emails: "사용가능한 새로운 업데이트가 있으면 등록된 contact_email 주소로 메일을 발송하여 알려줍니다."
-    port: "Use this HTTP port rather than the default of port 80. Leave blank for none, mainly useful for development"
-    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 +947,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,12 +986,17 @@ 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: "참조되지 않은 업로드 파일을 완전 삭제하지 전 기간(일)"
-    purge_unactivated_users_grace_period_days: "유예기간(하루) 동안 활성화하지 않으면 계정이 삭제됩니다."
     enable_s3_uploads: "Amazon S3 storage에 업로드해주세요. 중요: 올바른 S3 계정이 필요합니다.(access key id와 secret access key 둘다)"
     s3_use_iam_profile: 'AWS EC2 IAM role로 key를 받음. 정보: 활성화하면 "s3 access key id"와 "s3 secret access key" 설정도 같이 변경됩니다.'
     s3_upload_bucket: "파일이 업로드 될 위치의 Amazon S3 bucket name.  경고: 소문자 알파벳만 허용되며 점 . 이나 밑줄문자 _ 가 없어야 함."
@@ -686,6 +1005,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 +1025,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 +1063,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 +1088,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,20 +1100,47 @@ 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으로 설정하면 해제됩니다.(해제는 권장하지 않습니다)"
     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 사용자 비밀번호"
-    email_in: "이메일을 통해 새로운 글타래를 포스팅할 수 있도록 허가한다.(POP3 polling 필요) 각 카테고리의 \"Setting\" 탭에서 주소를 설정합니다."
+    log_mail_processing_failures: "이메일 처리 실패 로그를 http://yoursitename.com/logs 에 남기기"
     email_in_min_trust: "이메일을 통해 새 글타래를 포스팅 할 수 있는 최소 사용자 회원등급"
     email_prefix: "이메일 제목에 쓰일 [라벨]. 설정하지 않으면 기본적으로 'title(필수 설정의)' 이 된다."
     email_site_title: "사이트에서 전송되는 이메일의 보내는 이를 사이트 이름으로 설정. 설정하지 않으면 'title(필수 설정의)'이 된다. 만약 'title'에 보내는 이에 허용되지 않는 글자가 포함되어 있으면 이 설정이 사용된다."
@@ -774,24 +1148,46 @@ ko:
     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_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 뿐만 아니라 사용자의 전체 이름도 보여준다."
@@ -800,14 +1196,9 @@ ko:
     default_code_lang: "기본 programming language syntax highlighting은 GitHub code blocks이 적용된다. (lang-auto, ruby, python etc.)"
     warn_reviving_old_topic_age: "이 값보다 오래된 글타래에 답글을 달면, 오래된 토론이라는 것을 상기시키기 위해 주의 알림이 보여진다. 비활성화 값음 0 이다. "
     autohighlight_all_code: "형식이 지정되기 전의(되지 않은) 모든 코드 블럭들에 대해, 사용자가 언어를 지정하지 않아도 강제로 code highlighting이 적용된다."
-    feed_polling_enabled: "EMBEDDING 전용: RSS/ATOM도 글로 embed할 것인지"
-    feed_polling_url: "EMBEDDING 전용:  RSS/ATOM의 URL도 embed로 받도록 하기"
-    embed_by_username: "embed 글타래를 작성한 Discourse 사용자 아이디 "
-    embed_username_key_from_feed: "feed에서 Discourse 아이디 가져올 때 쓰는 Key"
     embed_truncate: "임베드된 글 비우기"
     embed_post_limit: "글 개수가 최대치입니다."
-    embed_whitelist_selector: "embed에서 보여져야 할 DOM element 선택하는 CSS 셀렉터"
-    embed_blacklist_selector: "embed에서 지워져야 할 DOM element 선택하는 CSS 셀렉터"
+    embed_username_required: "토픽 생성을 위한 사용자명이 필요합니다."
     show_create_topics_notice: "이 사이트에 5개 이하의 공개 글타래가 있으면, 관리자에게 글타래 좀 만들라고 알려줍니다."
     delete_drafts_older_than_n_days: (n) 일지난 임시 보관글 삭제하기
     prevent_anons_from_downloading_files: "익명 사용자가 다운로드를 받지 못하게 합니다. 경고: 이미지 파일 외 모든 첨부파일이 다운로드 받지 못하게 됩니다."
@@ -816,6 +1207,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 +1230,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 +1248,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 +1274,7 @@ ko:
     pinned_globally_disabled: "이 글타래는 이제 고정이 풀렸습니다. 더이상 카테고리 상단에 보이지 않을 것입니다."
     visible_enabled: "이 글타래는 리스트에 추가되었습니다. 글타래 리스트에 나타나게 될 것입니다."
     visible_disabled: "이 글타래는 이제 리스트에서 해제되었습니다. 더이상 글타래 리스트에 나타나지 않습니다. 링크를 통해서만 접근할 수 있습니다."
+    auto_deleted_by_timer: "타이머에 의해 자동삭제됨"
   login:
     not_approved: "당신의 계정은 아직 활성화되지 않았습니다. 이메일을 확인하시고 로그인 해주세요."
     incorrect_username_email_or_password: "계정 아이디, 이메일 또는 패스워드가 다릅니다."
@@ -888,28 +1293,35 @@ ko:
     new_registrations_disabled: "지금은 새로 가입할 수 없습니다."
     password_too_long: "비밀번호는 200글자 이내만 허용됩니다."
     missing_user_field: "사용자 정보 입력을 덜 끝마쳤습니다."
-    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}개의 신고가 접수 대기 중"
-  invite_mailer:
-    subject_template: "%{invitee_name} 회원님이 %{site_domain_name} 에 '%{topic_title}'에 초대하였습니다."
-  invite_forum_mailer:
-    subject_template: "%{site_domain_name}의 %{invitee_name}님께서 당신을 초대하였습니다."
+  unsubscribe_mailer:
+    title: "메일링 구독해지"
   invite_password_instructions:
     subject_template: "%{site_name} 계정을 위해 비밀번호 설정"
   flag_reasons:
@@ -945,14 +1357,16 @@ ko:
       subject_template: "데이터 추출이 완료되었습니다."
     csv_export_failed:
       subject_template: "데이터 추출 실패"
-      text_body_template: "죄송합니다. 데이터 추출에 실패하였습니다. 로그를 확인하시거나 관리자에게 문의해주세요."
     email_reject_parsing:
       text_body_template: |
         죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다.
 
         이메일에 내용이 안 보입니다. 답글이 이메일 상단에 있는지 확인 해주세요 -- 한줄 답변은 처리 못합니다.
-    spam_post_blocked:
-      subject_template: "%{username} 신규가입자가 연속 링크로 블락됨"
+    email_error_notification:
+      title: "이메일 에러 알림"
+    too_many_tl3_flags:
+      title: "TL3 Flag가 너무 많음"
+      subject_template: "대기중인 신규 계정"
     pending_users_reminder:
       subject_template:
         other: "%{count}명의 새로운 사용자가 가입 승인 대기중 입니다."
@@ -961,8 +1375,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,36 +1392,87 @@ 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: "더"
     search_title: "이 사이트 검색"
     search_google: "Google"
-  login_required:
-    welcome_message: |
-      #[%{title}에 오신 것을 환영합니다.](#welcome)
-      계정이 필요합니다. 회원가입 또는 로그인 해주세요
   terms_of_service:
     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 +1483,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 +1512,220 @@ 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: 자서전 작가
+    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: 가이드라인을 읽었어요
+    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 +1734,142 @@ 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: "자동화된 메시지"
+      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: "운영진 초청하기"
+      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.lv.yml b/config/locales/server.lv.yml
new file mode 100644
index 0000000000..88fa154c74
--- /dev/null
+++ b/config/locales/server.lv.yml
@@ -0,0 +1,121 @@
+# 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/
+
+lv:
+  dates:
+    short_date_no_year: "D MMM"
+    short_date: "D MMM, YYYY"
+    long_date: "MMMM D, YYYY hh:mm"
+  title: "Discourse"
+  topics: "Tēmas"
+  posts: "raksti"
+  loading: "Ielāde"
+  log_in: "Ienākt"
+  anonymous: "Anonīmi"
+  emails:
+    incoming:
+      default_subject: "Šim ierakstam ir nepieciešams nosaukums"
+  embed:
+    start_discussion: "Sākt Diskusiju"
+    continue: "Turpināt Diskusiju"
+    more_replies:
+      zero: "vel %{count} atbildes"
+      one: "vel 1 atbilde"
+      other: "vel %{count} atbildes"
+    loading: "Diskusijas Ielādēšana..."
+    in_reply_to: "▶ %{username}"
+    replies:
+      zero: "%{count} atbildes"
+      one: "1 atbilde"
+      other: "%{count} atbildes"
+  next_page: "nākošo lapu →"
+  prev_page: "← iepriekšējo lapu"
+  page_num: "Lapa %{num}"
+  num_posts: "Raksti:"
+  num_participants: "Dalībnieki:"
+  read_full_topic: "Lasīt pilnu tēmu"
+  rss_description:
+    latest: "Jaunākās tēmas"
+    hot: "Aktuālas tēmas"
+  groups:
+    default_names:
+      everyone: "ikviens"
+      admins: "administratori"
+      moderators: "moderatori"
+      staff: "personāls"
+      trust_level_0: "trust_level_0"
+      trust_level_1: "trust_level_1"
+      trust_level_2: "trust_level_2"
+      trust_level_3: "trust_level_3"
+      trust_level_4: "trust_level_4"
+  education:
+    until_posts:
+      zero: "%{count} raksti"
+      one: "1 raksts"
+      other: "%{count} raksti"
+  activerecord:
+    attributes:
+      user_profile:
+        bio_raw: "Par Mani"
+  staff_category_name: "Personāls"
+  trust_levels:
+    newuser:
+      title: "jauns lietotājs"
+  post_action_types:
+    bookmark:
+      title: 'Grāmatzīmes'
+  reports:
+    visits:
+      xaxis: "Diena"
+    topics:
+      title: "Tēmas"
+      xaxis: "Diena"
+    likes:
+      title: "Patīk"
+    flags:
+      xaxis: "Diena"
+    bookmarks:
+      title: "Grāmatzīmes"
+      xaxis: "Diena"
+    starred:
+      xaxis: "Diena"
+    emails:
+      title: "E-pasti Izsūtīti "
+    user_to_user_private_messages:
+      xaxis: "Diena"
+    system_private_messages:
+      title: "Sistēma"
+      xaxis: "Diena"
+    moderator_warning_private_messages:
+      xaxis: "Diena"
+    notify_moderators_private_messages:
+      xaxis: "Diena"
+    notify_user_private_messages:
+      xaxis: "Diena"
+    top_referrers:
+      xaxis: "Lietotājs"
+      num_topics: "Tēmas"
+    top_traffic_sources:
+      xaxis: "Domēns"
+    top_referred_topics:
+      xaxis: "Tēmas"
+  site_settings:
+    errors:
+      invalid_email: "Nepareiza e-pasta adrese."
+  page_not_found:
+    popular_topics: "Populāri"
+    recent_topics: "Neseni"
+    see_more: "Vairāk"
+    search_title: "Meklēt šajā vietnē"
+    search_google: "Google"
+  terms_of_service:
+    title: "Pakalpojuma noteikumi"
+  guidelines: "Vadlīnijas"
+  guidelines_topic:
+    title: "BUJ/Vadlīnijas"
+  tos_topic:
+    title: "Pakalpojuma noteikumi"
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index d2ec3b79ca..20c1bd5d7d 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -27,6 +27,7 @@ nb_NO:
   topics: "Emner"
   posts: "innlegg"
   loading: "Laster"
+  powered_by_html: 'Drives av <a href="https://www.discourse.org">Discourse</a>, og ser best ut med JavaScript aktivert'
   log_in: "Logg inn"
   purge_reason: "Automatisk slettet som som forlatt, uaktivert konto"
   disable_remote_images_download_reason: "Nedlasting av bilder ble deaktivert grunnet mangel på tilgjengelig diskplass."
@@ -37,19 +38,21 @@ nb_NO:
   emails:
     incoming:
       default_subject: "Emnet trenger en tittel"
-      show_trimmed_content: "Vis beskjært innhold"
+      show_trimmed_content: "Vis beskåret innhold"
       errors:
-        no_message_id_error: "Skjer når en e-post ikke har noen «Message-Id»-header."
-        auto_generated_email_error: "Skjer når «Precedence»-headeren er satt til list, junk, bulk eller auto_reply eller når en annen header innholder auto-submitted, auto-replied eller auto-generated."
+        empty_email_error: "Skjer når den rå e-posten vi mottok var blank."
+        no_message_id_error: "Skjer når en e-post ikke har noen «Message-ID»-hode."
+        auto_generated_email_error: "Skjer når «Presedens»-hodet er satt til list, junk, bulk eller auto_reply eller når en annen header inneholder auto-submitted, auto-replied eller auto-generated."
         no_body_detected_error: "Skjer når vi ikke kunne trekke ut meldingskroppen eller det ikke var noen vedlegg."
+        no_sender_detected_error: "Skjer når vi ikke kunne finne en gyldig adresse i Fra-hodet."
         inactive_user_error: "Skjer når senderen ikke er aktiv."
-        blocked_user_error: "Skjer når avsenderen har blitt blokkert."
         bad_destination_address: "Skjer når ingen av adressene i To-, Cc- eller Bcc-feltene passer med en konfigurert innkommende e-postadresse."
         strangers_not_allowed_error: "Skjer når en bruker forsøket å opprette et nytt emne i en kategori som han eller hun ikke er medlem av."
         insufficient_trust_level_error: "Skjer når en bruker forsøket å opprette et nytt emne i en kategori som han eller hun ikke har tillitsnivå for."
         reply_user_not_matching_error: "Skjer når et innkommende svar kommer fra en annen e-postadresse enn varselet var sendt til."
         topic_not_found_error: "Skjer når et svar blir mottatt, men det tilhørene emnet er slettet."
         topic_closed_error: "Skjer når et svar blir mottatt, men det tilhørene emnet er stengt."
+      unrecognized_error: "Ukjent feil"
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -70,6 +73,7 @@ nb_NO:
       inclusion: er ikke inkludert i listen
       invalid: er ugyldig
       is_invalid: "virker uklart, er det en komplett setning?"
+      contains_censored_words: "inneholder følgende sensurerte ord: %{censored_words}"
       less_than: må være mindre enn %{count}
       less_than_or_equal_to: må være lik eller mindre enn %{count}
       not_a_number: er ikke et nummer
@@ -115,9 +119,10 @@ nb_NO:
   not_logged_in: "Du må være logget inn for å gjøre dette."
   not_found: "Den etterspurte URL eller ressurs ble ikke funnet"
   invalid_access: "Du har ingen tilgang til denne resurssen."
+  invalid_api_credentials: "Du har ikke tillatelse til å se denne forespurte ressuresen. API-brukernavnet eller -nøkkelen er ikke gyldig."
   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."
@@ -192,6 +197,7 @@ nb_NO:
     delete_reason: "Slettet via køen for innleggmoderering"
   groups:
     errors:
+      can_not_modify_automatic: "Du kan ikke modifisere en automatisk gruppe"
       member_already_exist: "'%{username}' er allerede medlem av denne gruppen."
       invalid_domain: "'%{domain}' er ikke et gyldig domene."
       invalid_incoming_email: "'%{email}' er ikke en gyldig e-postadresse."
@@ -253,6 +259,7 @@ nb_NO:
               no_user_selected: "Du må velge en gyldig bruker. "
             featured_link:
               invalid: "er ugyldig. Nettadressen bør inneholde http:// eller https://"
+              invalid_category: "kan ikke redigeres i denne kategorien."
         user:
           attributes:
             password:
@@ -267,10 +274,21 @@ nb_NO:
           attributes:
             hex:
               invalid: "er ikke en gyldig farge"
+        post_reply:
+          base:
+            different_topic: "Innlegg ogg svar må tilhøre samme emne."
         web_hook:
           attributes:
             payload_url:
               invalid: "URL-adresse er ikke gyldig. Adressen skal starte med http:// eller https:// og ingen blanke tegn er tillatt."
+        custom_emoji:
+          attributes:
+            name:
+              taken: er allerede i bruk av en annen emoji
+        topic_timer:
+          attributes:
+            execute_at:
+              in_the_past: "må være i fremtiden."
       <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} har ikke skrevet noe i Om meg-feltet på sin profil ennå</div>"
@@ -280,7 +298,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:
@@ -503,7 +520,6 @@ nb_NO:
       email_title: 'Emne "%{title}" krever moderator oppmerksomhet'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Innlegget ditt har blitt rapportert av nettsamfunnet. <a href="/my/messages">Sjekk meldingene dine</a>.</p>'
     user_must_edit: '<p>Dette innlegget ble rapportert av gemenskapen og er midlertidig skjult.</p>'
   archetypes:
     regular:
@@ -551,9 +567,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"
@@ -688,9 +704,7 @@ nb_NO:
     educate_until_posts: "Når bruker begynner å skrive på de første (n) innleggene, vis pop-up med opplæringspanelet for nye brukere i editoren."
     title: "Navnet på denne siden, slik du vil ha det i title-taggen."
     site_description: "Beskriv siden med en setning, vil brukes i beskrivelses-merkelappen."
-    contact_email: "E-post til ansvarlig kontakt for denne siden. Brukes til kritiske påminninger som uhåndterte flagg og som kontakt-adresse på /om-siden."
     contact_url: "Kontakt-URL for siden. Brukes på /om siden."
-    queue_jobs: "KUN FOR UTVIKLERE! ADVARSEL! Jobber køes som forvalg i Sidekiq. Hvis det slås av vil siden ikke fungere. "
     crawl_images: "Hent bilder fra ekstern URL for å sette inn korrekt høyde og bredde."
     download_remote_images_to_local: "Konverter eksterne bilder ved å laste de ned lokalt, dette forhindrer ødelagte bilder."
     download_remote_images_threshold: "Minimum ledig diskplass for å kunne laste ned eksterne bilder (i prosent)"
@@ -717,7 +731,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."
@@ -760,6 +774,7 @@ nb_NO:
       invalid_email: "Ugyldig e-mail adresse"
       invalid_username: "Ingen bruker med det brukernavnet."
       invalid_integer_min_max: "Verdien må være mellom %{min} og %{max}."
+      invalid_integer: "Verdien må være et heltall."
       invalid_string: "Ugyldig verdi"
       invalid_string_min: "Må være minst %{min} tegn."
       invalid_string_max: "Må ikke være mer enn %{max} tegn."
@@ -848,8 +863,6 @@ nb_NO:
       subject_template: "Ny konto på vent"
     too_many_tl3_flags:
       subject_template: "Ny konto på vent"
-    unblocked:
-      subject_template: "Kontoen er ikke lenger på vent"
   unsubscribe_mailing_list: |
     Du mottar dette fordi du har slått på e-postlistemodus.
 
@@ -862,7 +875,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 +883,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}"
@@ -881,10 +893,6 @@ nb_NO:
     see_more: "Mer"
     search_title: "Søk i denne siden"
     search_google: "Google"
-  login_required:
-    welcome_message: |
-      #[Velkommen til %{title}](#welcome)
-      En bruker er påkrevd. Lag en bruker eller logg inn for å fortsette.
   terms_of_service:
     title: "Bruksvilkår"
     signup_form_message: 'Jeg har lest og akseptert <a href="/tos" target="_blank">Bruksvilkårene</a>.'
@@ -903,6 +911,12 @@ nb_NO:
     user_suspended: "Brukeren var suspendert"
     already_read: "bruker har allerede lest dette innlegget"
     message_blank: "meldingen er tom"
+  color_schemes:
+    default: "Lys drakt"
+    dark: "Mørk drakt"
+    default_theme_name: "Forvalg"
+    dark_theme_name: "Mørk"
+    light_theme_name: "Lys"
   about: "Om"
   guidelines: "Retningslinjer"
   privacy: "Personvern"
@@ -910,6 +924,8 @@ nb_NO:
   csv_export:
     boolean_yes: "Ja"
     boolean_no: "Nei"
+  guidelines_topic:
+    title: "O-S-S/retningslinjer"
   tos_topic:
     title: "Bruksvilkår"
   privacy_topic:
@@ -1001,6 +1017,8 @@ nb_NO:
       name: Tekstbehandler
     member:
       name: Medlem
+    welcome:
+      name: Velkommen
     anniversary:
       name: Jubileum
     good_topic:
@@ -1017,7 +1035,7 @@ nb_NO:
     appreciated:
       name: Verdsatt
     out_of_love:
-      name: Ikke mer kjærlighet å gi
+      name: Ikke flere likes å gi
     thank_you:
       name: Takk skal du ha
     gives_back:
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 008db077b5..1ccee3384b 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -47,7 +47,6 @@ nl:
         auto_generated_email_error: "Gebeurt wanneer de 'precedence'-header is ingesteld op list, junk, bulk of auto_reply, of wanneer een andere header het volgende bevat: auto-submitted, auto-replied of auto-generated."
         no_body_detected_error: "Gebeurt wanneer er geen hoofdtekst uit de mail kon worden gehaald en er geen bijlagen waren."
         inactive_user_error: "Gebeurt wanneer de afzender niet actief is."
-        blocked_user_error: "Gebeurt wanneer de afzender is geblokkeerd."
         bad_destination_address: "Gebeurt wanneer geen van de e-mailadressen in de Aan, CC-, of BCC-velden gelijk zijn aan de geconfigureerde inkomende e-mailadressen."
         strangers_not_allowed_error: "Gebeurt wanneer een gebruiker een nieuwe topic probeerde aan te maken in een categorie waar hij/zij geen lid van is."
         insufficient_trust_level_error: "Gebeurt wanneer een gebruiker een nieuwe topic probeerde aan te maken in een categorie waarvoor hij/zij niet het vereiste vertrouwensniveau heeft."
@@ -56,6 +55,7 @@ nl:
         topic_closed_error: "Gebeurt wanneer een antwoord is ontvangen, maar het verwante topic is gesloten."
         bounced_email_error: "E-mail is een gebouncet e-mailrapport."
         screened_email_error: "Gebeurt wanneer het e-mailadres van de afzender al was gecontroleerd."
+      unrecognized_error: "Onbekende Fout"
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -171,6 +171,7 @@ nl:
   too_many_links:
     one: "Sorry, nieuwe gebruikers kunnen maar één koppeling in een bericht plaatsen."
     other: "Sorry, nieuwe gebruikers kunnen maar %{count} koppelingen in een bericht plaatsen."
+  contains_blocked_words: "Je bericht bevat woorden die niet zijn toegestaan."
   spamming_host: "Sorry, u kunt geen koppeling naar die host plaatsen."
   user_is_suspended: "Geschorste gebruikers mogen geen berichten plaatsen."
   topic_not_found: "Er is iets fout gegaan. Misschien is het topic gesloten of verwijderd terwijl u het bekeek?"
@@ -207,6 +208,7 @@ nl:
     user_posts: "Nieuwste berichten van @%{username}"
     user_topics: "Nieuwste topics van @%{username}"
     tag: "Gemarkeerde onderwerpen"
+    badge: "%{display_name} badge op %{site_title}"
   too_late_to_edit: "Dat bericht is te lang geleden geschreven. Het kan niet meer worden gewijzigd of verwijderd."
   revert_version_same: "De huidige versie is dezelfde als de versie die u probeert terug te zetten."
   excerpt_image: "afbeelding"
@@ -232,6 +234,8 @@ nl:
       trust_level_2: "vertrouwensniveau_2"
       trust_level_3: "vertrouwensniveau_3"
       trust_level_4: "vertrouwensniveau_4"
+    request_membership_pm:
+      title: "Lidmaatschapsverzoek voor @%{group_name}"
   education:
     until_posts:
       one: "1 bericht"
@@ -318,6 +322,7 @@ nl:
               too_many_users: "U kunt alleen waarschuwingen naar één gebruiker tegelijk sturen."
               cant_send_pm: "Sorry, u kunt geen privébericht naar die gebruiker sturen."
               no_user_selected: "U moet een geldige gebruiker selecteren."
+              reply_by_email_disabled: "Antwoorden met een email is uitgeschakeld."
             featured_link:
               invalid: "is ongeldig. URL moet http:// of https:// bevatten."
               invalid_category: "kan niet worden bewerkt in deze categorie."
@@ -346,6 +351,14 @@ nl:
           attributes:
             name:
               taken: wordt al door een andere emoji gebruikt
+        topic_timer:
+          attributes:
+            execute_at:
+              in_the_past: "moet in de toekomst zijn."
+        watched_word:
+          attributes:
+            word:
+              too_many: "Te veel woorden voor die aktie"
       <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>het veld Over mij van uw profiel is momenteel leeg; <a href='/u/%{username_lower}/preferences/about-me'>zou u dit willen invullen?</a></div>"
@@ -357,7 +370,7 @@ 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)."
+  assets_topic_body: "Dit topic, alleen zichtbaar voor personeel, is 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. Reageer op dit topic.\n2. Upload hier alle afbeeldingen die je voor logos, favicons, etc. wilt gebruiken. (Gebruik het werkbalkpictogram voor uploaden in je berichteditor, of sleep of plak de afbeeldingen.)\n3. Verzend je reactie om het te plaatsen.\n4. Klik met de rechtermuisknop op de afbeeldingen in je 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 de afbeeldingspaden in [basisinstellingen](/admin/site_settings/category/required).\n\n\nAls u verschillende soorten uploads van bestandstypen wilt inschakelen, bewerk dan 'authorized_extensions' in de [bestandsinstellingen](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Welkom bij Discourse"
     body: |2
@@ -408,6 +421,7 @@ nl:
       invalid_email_in: "'%{email}' is geen geldig e-mailadres."
       email_already_used_in_group: "'%{email}' wordt al gebruikt door de groep '%{group_name}'."
       email_already_used_in_category: "'%{email}' wordt al gebruikt door de categorie '%{category_name}'."
+      description_incomplete: "De categorie beschrijving moet minimaal een paragraaf hebben."
     cannot_delete:
       uncategorized: "Ongecategoriseerd kan niet worden verwijderd"
       has_subcategories: "Deze categorie kan niet worden verwijderd, omdat deze subcategorieën bevat"
@@ -563,39 +577,48 @@ nl:
     off_topic:
       title: 'Off-topic'
       description: 'Dit bericht is niet relevant voor de huidige discussie zoals beschreven door de titel en het eerste bericht, en dient wellicht naar een ander topic te worden verplaatst.'
+      short_description: 'Niet relevant voor de discussie'
       long_form: 'heeft dit als off-topic gemarkeerd'
     spam:
       title: 'Spam'
+      description: 'Dit bericht is een advertentie of vandalisme. Het is niet relevant voor het huidige onderwerp.'
+      short_description: 'Dit is spam'
       long_form: 'heeft dit als spam gemarkeerd'
       email_title: '''%{title}'' is als spam gemarkeerd'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: 'Ongepast'
       description: 'Dit bericht bevat inhoud die een redelijk persoon als beledigend, kwetsend of een overtreding van <a href="/guidelines">onze gemeenschapsrichtlijnen</a> zou beschouwen.'
+      short_description: 'Een overtreding van <a href="/guidelines">onze community richtlijnen</a>'
       long_form: 'heeft dit als ongepast gemarkeerd'
     notify_user:
       title: '@{{username}} een bericht sturen'
       description: 'I wil rechtstreeks en privé met deze persoon over zijn of haar bericht praten.'
+      short_description: 'I wil rechtstreeks en privé met deze persoon over zijn of haar bericht praten.'
       long_form: 'bericht verstuurd naar gebruiker'
       email_title: 'Uw bericht in ''%{title}'''
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Iets anders"
       description: 'Dit bericht vereist aandacht van een staflid om een andere reden dan hierboven vermeld.'
+      short_description: 'Dit bericht vereist aandacht van een staflid om een andere reden'
       long_form: 'heeft dit gemarkeerd voor aandacht van een staflid'
       email_title: 'Een bericht in ''%{title}'' vereist aandacht van een staflid'
       email_body: "%{link}\n\n%{message}"
     bookmark:
       title: 'Bladwijzer maken'
       description: 'Bladwijzer voor dit bericht maken'
+      short_description: 'Bladwijzer voor dit bericht maken'
       long_form: 'heeft een bladwijzer voor dit bericht gemaakt'
     like:
       title: 'Leuk'
       description: 'Dit bericht leuk vinden'
+      short_description: 'Like dit bericht'
       long_form: 'vindt dit bericht leuk'
     vote:
       title: 'Stemmen'
       description: 'Stemmen op dit bericht'
+      short_description: 'Stemmen op dit bericht'
       long_form: 'heeft op dit bericht gestemd'
   user_activity:
     no_bookmarks:
@@ -604,6 +627,9 @@ nl:
     no_likes_given:
       self: "U hebt geen berichten geliket."
       others: "Geen gelikete berichten."
+    no_replies:
+      self: "U hebt op geen enkel bericht geantwoord."
+      others: "Geen antwoorden."
   topic_flag_types:
     spam:
       title: 'Spam'
@@ -620,7 +646,6 @@ nl:
       email_title: 'Het topic ''%{title}'' vereist aandacht van een moderator'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Uw bericht is gemarkeerd door de gemeenschap. <a href="/my/messages">Bekijk uw berichten</a>.</p>'
     user_must_edit: '<p>Uw bericht is gemarkeerd door de gemeenschap en is tijdelijk verborgen.</p>'
   archetypes:
     regular:
@@ -632,7 +657,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"
@@ -842,15 +866,16 @@ nl:
     min_search_term_length: "Minimumlengte van een zoekterm in tekens"
     search_prefer_recent_posts: "Als doorzoeken van uw grote forum traag werkt, probeert deze optie eerst een index van recentere berichten"
     search_recent_posts_size: "Het aantal in de index te behouden recente berichten "
+    log_search_queries: "Zoekopdrachten van gebruikers opslaan"
+    search_query_log_max_size: "Maximum aantal te bewaren zoekopdrachten"
     allow_uncategorized_topics: "Topics zonder categorie toestaan. WAARSCHUWING: Alle topics moet weer aan een categorie zijn toegekend voor dit wordt uitgezet."
     allow_duplicate_topic_titles: "Topics met dezelfde identieke titels toestaan"
     unique_posts_mins: "Hoeveel minuten iemand moet wachten voordat deze een bericht met dezelfde inhoud mag plaatsen"
     educate_until_posts: "Laat de popup voor nieuwe gebruikers zien als een gebruiker start met het typen van hun eerste (n) nieuwe berichten in de berichtopsteller."
     title: "De naam van deze site, wordt gebruikt in de titeltag"
     site_description: "Omschrijf de site in één zin. Deze wordt getoond in de meta-omschrijvingstag."
-    contact_email: "E-mailadressen van een contactpersonen van deze site. Belangrijke updates, zoals onbehandelde meldingen, maar ook berichten van het /about contactformulier worden naar dit adres gestuurd."
+    contact_email: "e-mailadres van de hoofdpersoon verandwoordelijk voor deze website. Wordt gebruikt voor kritische meldingen, als ook voor het /about contact formulier voor dringende vragen."
     contact_url: "Contact URL voor deze site. Wordt gebruikt op het /about contactformulier voor dringende zaken."
-    queue_jobs: "DEVELOPERS ONLY! WARNING! Zet verschillende taken in een queue binnen sidekiq, bij 'false' worden taken ineens uitgevoerd"
     crawl_images: "Haal afbeeldingen van externe URLs om de correcte breedte- en hoogtedimensies in te voegen"
     download_remote_images_to_local: "Download externe afbeeldingen en sla ze lokaal op. Dit voorkomt dat afbeeldingen niet meer beschikbaar zouden kunnen worden."
     download_remote_images_threshold: "Minimum schijfruimte vereist om externe afbeeldingen lokaal te downloaden (percentage)"
@@ -865,14 +890,14 @@ nl:
     fixed_category_positions: "Wanneer aangevinkt, kunt u categorieën in een vaste volgorde schikken. Wanneer niet aangevinkt, worden categorieën op activiteit vermeld."
     fixed_category_positions_on_create: "Wanneer aangevinkt, wordt de categorievolgorde bij het maken van een topic aangehouden (vereist fixed_category_positions)."
     add_rel_nofollow_to_user_content: "Voeg 'rel nofollow' toe aan alle ingediende gebruikerscontent, behalve voor interne links (inclusief bovenliggende domeinen). Als je dit verandert, moet je ook alle berichten opnieuw renderen met: \"rake posts:rebake\""
-    exclude_rel_nofollow_domains: "Een lijst van domeinen waar ´nofollow´ niet aan de links moet worden toegevoegd. (voorbeelddomein.com staat automatisch sub.voorbeelddomein toe). Voeg minimaal het 'top-level' domein van deze site toe om web crawlers alle content te laten vinden. Als delen van deze site zich op andere domeinen bevinden, voeg deze eveneens toe."
     post_excerpt_maxlength: "Maximale lengte van een uittreksel / samenvatting van een bericht."
+    show_pinned_excerpt_mobile: "Laat een fragment bij vastgemaakte topics zien op mobiel."
+    show_pinned_excerpt_desktop: "Laat een fragment bij vastgemaakte topics zien op desktop."
     post_onebox_maxlength: "Maximale lengte van een 'oneboxed Discourse' bericht in tekens."
     max_oneboxes_per_post: "Maximale aantal Oneboxes in een bericht."
     logo_url: "De logoafbeelding links bovenaan op uw website moet de vorm van een brede rechthoek hebben. Wanneer leeg gelaten, wordt de titeltekst van de website getoond."
     logo_small_url: "De kleine logoafbeelding linksboven op uw website dient een vierkante vorm te hebben en wordt getoond als omlaag wordt gescrold. Bij leeg laten wordt een startpaginasymbool getoond."
     favicon_url: "Een favicon voor je site, zie http://nl.wikipedia.org/wiki/Favicon. Voor een correcte werking via CDN moet het een png zijn."
-    mobile_logo_url: "De logoafbeelding met vaste positie voor linksboven op uw mobiele website. De afbeelding dient een vierkante vorm te hebben. Bij leeg laten wordt 'logo_url' gebruikt. Vb.: http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "Pictogram voor Apple touch-apparaten. Aanbevolen grootte is 144px bij 144px."
     notification_email: "Het afzender email adres dat wordt gebruikt voor het verzenden van alle essentiële systeem emails. Voor het domein dat hier gespecificeerd is moeten de SPF, DKIM en reverse PTR records goed ingesteld zijn om de mails te doen aankomen."
     email_custom_headers: "Een lijst van custom email headers, gescheiden door een pipe (|)"
@@ -894,10 +919,8 @@ nl:
     tl2_additional_likes_per_day_multiplier: "Verhoog de limiet van likes per dag voor tl2 (lid) door te vermenigvuldigen met dit getal"
     tl3_additional_likes_per_day_multiplier: "Verhoog de limiet van likes per dag voor tl3 (vaste bezoeker) door te vermenigvuldigen met dit getal"
     tl4_additional_likes_per_day_multiplier: "Verhoog de limiet van likes per dag voor tl4 (leider) door te vermenigvuldigen met dit getal"
-    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."
@@ -930,18 +953,19 @@ nl:
     log_out_strict: "Bij het afmelden ALLE sessies voor de gebruiker op alle apparaten afmelden"
     version_checks: "Ping de Discourse-Hub voor updates en laat meldingen van nieuwe versies zien op het dashboard van de beheerder."
     new_version_emails: "Stuur een email naar het contact_email adres wanneer een nieuwe versie van Discourse beschikbaar is."
-    port: "DEVELOPER ONLY! WARNING! Mocht je een specifieke poort willen toewijzen aan de URL. Handig in ontwikkelaars-modus. Laat leeg voor geen toewijzing."
-    force_hostname: "DEVELOPER ONLY! WARNING! Mocht je een specifieke hostname willen toewijzen. Handig in ontwikkelaars-modus. Laat leeg voor geen toewijzing."
     invite_expiry_days: "Hoe lang uitnodigingscodes geldig blijven (in dagen)."
     invite_passthrough_hours: "Hoe lang een gebruiker een eerder verkregen uitnodigingssleutel kan gebruiken om in te loggen, in uren gespecificeerd"
     invite_only: "Openbare registratie is uitgeschakeld; alle nieuwe gebruikers moeten expliciet worden uitgenodigd door stafleden."
     login_required: "Authenticatie vereist om inhoud te lezen op deze site, verbied anonieme toegang."
     min_password_length: "Minimum lengte wachtwoord."
     min_admin_password_length: "Minimale wachtwoordlengte voor de beheerder."
+    password_unique_characters: "Minimum aantal unieke karakters dat een wachtwoord nodig heeft."
     block_common_passwords: "Accepteer geen wachtwoorden die voorkomen in de 10.000 meest voorkomende wachtwoorden."
     enable_sso: "Schakel single sign on in via een externe site (WAARSCHUWING: E-MAILADRESSEN VAN GEBRUIKERS '* MOETEN * DOOR DE EXTERNE SITE WORDEN GEVALIDEERD)"
+    verbose_sso_logging: "Uitgebreide SSO gegevens opslaan in /logs"
     enable_sso_provider: "Pas  Discourse SSO provider protocol toe op het /session/sso_provider eindpunt, vereist dat sso_secret is ingesteld"
     sso_secret: "Geheime tekenreeks voor het cryptografisch valideren van SSO informatie, zorg er voor dat het 10 tekens of langer is"
+    sso_overrides_bio: "Overschrijft de biografie in het gebruikersprofiel en voorkomt dat de gebruiker het kan wijzigen"
     sso_overrides_email: "Overschrijft bij elke aanmelding lokaal opgegeven mailadres door mailadres uit SSO payload van externe site, en voorkomt lokaal wijzigen. (WAARSCHUWING: er kunnen discrepanties ontstaan door normalisatie van lokale mailadressen)"
     sso_overrides_username: "Overschrijft bij elke aanmelding lokaal opgegeven gebruikersnaam door gebruikersnaam uit SSO payload van externe site, en voorkomt lokaal wijzigen. (WAARSCHUWING: er kunnen discrepanties ontstaan door verschillen in gebruikersnaam lengte/vereisten)"
     sso_overrides_name: "Overschrijft bij elke aanmelding lokaal opgegeven volledige naam door volledige naam uit SSO payload van externe site, en voorkomt lokaal wijzigen"
@@ -971,6 +995,7 @@ nl:
     backup_frequency: "Hoe vaak we een back-up van de site maken, in dagen."
     enable_s3_backups: "Upload voltooide back-ups naar S3. LET OP: Zorg ervoor dat je je S3 inloggegevens hebt ingevuld in de Bestanden instellingen."
     s3_backup_bucket: "De S3 bucket voor de backups. WAARSCHUWING: zorg er voor dat dit een privébucket is."
+    s3_disable_cleanup: "Backups van S3 niet verwijderen als het lokaal wordt verwijdert."
     backup_time_of_day: "Tijdstip UTC wanneer de back-up moet plaatsvinden."
     backup_with_uploads: "Uploads ook meenemen in de geplande back-ups. Deze optie uitschakelen zal alleen een back-up maken van de database."
     active_user_rate_limit_secs: "Hoe vaak we het 'last_seen_at'-veld updaten, in seconden."
@@ -992,12 +1017,14 @@ nl:
     max_logins_per_ip_per_minute: "Maximale aantal toegestane aanmeldingen per IP-adres per minuut"
     alert_admins_if_errors_per_minute: "Aantal foutmeldingen per minuut waarbij de beheerder een melding krijgt. Een waarde van 0 schakelt deze mogelijkheid uit. LET OP: herstart vereist."
     alert_admins_if_errors_per_hour: "Aantal foutmeldingen per uur waarbij de beheerder een melding krijgt. Een waarde van 0 schakelt deze mogelijkheid uit. LET OP: herstart vereist."
+    categories_topics: "Aantal getoonde topics op de categoriepagina."
     suggested_topics: "Aantal aanbevolen topics onderaan een topic."
     limit_suggested_to_category: "Alleen topics van de huidige categorie weergeven in aanbevolen topics."
+    suggested_topics_max_days_old: "Aanbevolen topics moeten niet meer dan n dagen oud zijn."
     clean_up_uploads: "Verwijder weesbestanden zonder referentie om illegale hosting te voorkomen. LET OP: maak een back-up van je /uploads directory voordat je deze instelling aanzet."
     clean_orphan_uploads_grace_period_hours: "Na hoeveel uur een weesbestand voor verwijderding gemarkeerd wordt."
     purge_deleted_uploads_grace_period_days: "Na hoeveel uur een weesbestand definitief verwijderd wordt."
-    purge_unactivated_users_grace_period_days: "Respijtperiode (in dagen) voordat een gebruiker die het account niet heeft geactiveerd wordt verwijderd."
+    purge_unactivated_users_grace_period_days: "Periode (in dagen) voordat een gebruiker die zijn account niet heeft geactiveerd wordt verwijderd. Zet op 0 om gebruikers nooit te verwijderen."
     enable_s3_uploads: "Uploads plaatsen op Amazon S3 storage. LET OP: vereist geldige S3 inloggegevens (zowel acces key id als secret access key)"
     s3_use_iam_profile: 'Gebruik AWS EC2 IAM rol om keys binnen te halen. LET OP: na inschakelen dit gebruikt i.p.v. de instellingen voor "s3 access key id" en "s3 secret access key".'
     s3_upload_bucket: "De naam van de Amazon S3 bucket waar bestanden naar worden geüpload. LET OP: moet bestaan uit kleine letters, zonder puntjes en geen underscores."
@@ -1007,7 +1034,10 @@ nl:
     s3_cdn_url: "De CDN URL voor alle S3 assets (bijvoorbeeld: https://cdn.ergens.com). LETOP: na het wijzigen van deze instelling moeten je alle oude berichten rebaken."
     avatar_sizes: "Lijst van automatisch gegenereerde avatar groottes."
     external_system_avatars_enabled: "Gebruik een avatars service van een extern systeem."
+    external_system_avatars_url: "URL van de externe avatar service. Toegestaande vervangingen zijn {username} {first_letter} {color} {size}"
     default_opengraph_image_url: "URL van de standaard opengraph afbeelding."
+    png_to_jpg_quality: "Kwaliteit van het geconverteerde JPG bestand (1 is laagste kwaliteit, 99 is beste kwaliteit, 100 om uit te schakelen)."
+    strip_image_metadata: "Verwijder metadata uit afbeelding."
     enable_flash_video_onebox: "Embedden van swf en flv (Adobe Flash) links toestaan in oneboxen. LET OP: dit kan onveilig zijn"
     default_invitee_trust_level: "Het standaard trustlevel (0-4) voor uitgenodigde leden."
     default_trust_level: "Het standaard trustlevel (0-4) voor alle nieuwe gebruikers. LET OP! Wijzigen van deze instelling geeft een serieus risico op spam."
@@ -1028,6 +1058,7 @@ nl:
     tl3_links_no_follow: "rel=nofollow niet verwijderen van links geplaatst door leden met trustlevel 3."
     min_trust_to_create_topic: "Het minimale trust level dat nodig is om een topic te mogen maken."
     min_trust_to_edit_wiki_post: "Het minimale trust level dat nodig is om een bericht te wijzigen dat als wiki gemarkeerd is."
+    min_trust_to_edit_post: "Het minimale vertrouwensniveau dat nodig is om het bericht te bewerken."
     min_trust_to_send_messages: "Het minimum vertrouwensniveau dat nodig is om nieuwe private berichten aan te maken."
     newuser_max_links: "Hoeveel links een nieuw lid in een bericht kan plaatsen."
     newuser_max_images: "Hoeveel afbeeldingen een nieuw lid in een bericht kan plaatsen."
@@ -1046,6 +1077,7 @@ nl:
     title_fancy_entities: "Algemene ASCII-tekens naar decoratieve HTML-entiteiten converteren in topictitels, zoals SmartyPants (http://daringfireball.net/projects/smartypants/)"
     min_title_similar_length: "De minimale lengte die een titel van een topic moet hebben voordat er wordt gezocht naar vergelijkbare topics."
     min_body_similar_length: "De minimale lengte die de inhoud van een bericht moet hebben voordat er wordt gezocht naar vergelijkbare topics."
+    desktop_category_page_style: "Visuele stijl voor de categoriepagina."
     category_colors: "Een lijst me hexadecimale kleurwaardes die gebruikt kunnen worden voor categorieën."
     category_style: "Visuele stijl voor categorie badges."
     max_image_size_kb: "De maximale grootte van te uploaden afbeeldingen in kB. Dit moet ook worden geconfigureerd in nginx (client_max_body_size) / apache of proxy."
@@ -1082,9 +1114,6 @@ nl:
     num_flags_to_close_topic: "Minimun aantal actieve markeerders benodigd om geautomatiseerd een topic te pauzeren."
     auto_respond_to_flag_actions: "Automatisch antwoord Inschakelen op moment van weggooien van een markering."
     min_first_post_typing_time: "Minimum tijd in milliseconden dat een gebruiker moet typen tijdens een eerste post, als de drempelwaarde niet wordt bereikt zal de post automatisch in de wachtrij voor goedkeuring gezet worden. Zet op 0 om uit te schakelen (niet aanbevolen)"
-    auto_block_fast_typers_on_first_post: "Blokkeer gebruikers automatisch als ze niet voldoen aan min_first_post_typing_time"
-    auto_block_fast_typers_max_trust_level: "Maximale vertrouwensniveau om snelle typers automatisch te blokkeren "
-    auto_block_first_post_regex: "Hoofdlettergevoelige regex die bij overeenkomst het eerste bericht van een gebruiker blokkeert en in de wachtrij voor goedkeuring zet. Voorbeeld: raging|a[bc]a zorgt ervoor dat alle eerste berichten die raging, aba of aca bevatten worden geblokkeerd. Alleen van toepassing op het eerste bericht."
     reply_by_email_enabled: "Mogelijk inschakelen om te antwoorden per e-mail."
     reply_by_email_address: "Template voor antwoorden per e-mail, bijvoorbeeld: %{reply_key}@reageer.mijnforum.nl"
     incoming_email_prefer_html: "De HTML gebruiken in plaats van de tekst voor inkomende e-mail"
@@ -1104,7 +1133,6 @@ nl:
     pop3_polling_username: "De gebruikersnaam van het te pollen POP3 account voor e-mail."
     pop3_polling_password: "Het wachtwoord van het te pollen POP3 account voor e-mail."
     log_mail_processing_failures: "Log alle e-mail verwerkingsfouten naar http://yoursitename.com/logs"
-    email_in: "Sta toe dat gebruikers een nieuw topic via e-mail (vereist het pollen van pop3). Configureer het adres in de \"Instellingen\" tabblad van elke categorie."
     email_in_min_trust: "Het minium trustlevel dat een gebruiker moet hebben om nieuwe topics te kunnen mailen."
     email_prefix: "Het [label] dat in het onderwerp van e-mails wordt gebruikt. Als niets is ingevuld, wordt 'title' gebruikt."
     email_site_title: "De titel van de website die als de afzender van e-mails van de website wordt gebruikt. Standaard wordt 'titel' gebruikt als niets is ingesteld. Gebruik deze instelling als uw 'titel' tekens bevat die niet in tekenreeksen van e-mailafzenders zijn toegestaan."
@@ -1112,7 +1140,6 @@ nl:
     relative_date_duration: "Na hoeveel dagen moet een post datum niet meer worden getoond als relatieve datum (7d) maar als absolute datum (20 feb)."
     delete_user_max_post_age: "Gebruikers wiens eerste bericht ouder dan (x) dagen is kunnen niet meer verwijderd worden."
     delete_all_posts_max: "Het maximale aantal berichten dat tegelijk met de knop 'Alle berichten verwijderen' kan worden verwijderd. Als een gebruiker meer berichten heeft, kunnen de berichten niet allemaal tegelijk worden verwijderd, en kan de gebruiker niet worden verwijderd."
-    username_change_period: "The number of days after registration that accounts can change their username (0 om wijziging niet toe te staan)."
     email_editable: "Gebruikers mogen hun e-mailadres na registratie nog wijzigen."
     allow_uploaded_avatars: "Sta gebruikers toe eigen profielfoto's te uploaden."
     allow_animated_avatars: "Sta gebruikers toe gif animaties als profielfoto te gebruiken. WAARSCHUWING: draai de avatars:refresh rake task na het aanpassen van deze instelling. "
@@ -1122,6 +1149,7 @@ nl:
     digest_topics: "Het maximale aantal populaire topics dat in de e-mailsamenvatting wordt weergegeven."
     digest_posts: "Het maximale aantal populaire berichten dat in de e-mailsamenvatting wordt weergegeven."
     digest_other_topics: "Het maximale aantal topics dat in de sectie 'Nieuw in topics en categorieën die u volgt' van de e-mailsamenvatting wordt getoond."
+    disable_digest_emails: "E-mails met samenvatting uitschakelen voor alle gebruikers."
     email_link_color: "De kleur van koppelingen in HTML-e-mails. Voer een kleurnaam ('blue') of hex-waarde ('#0000FF') in."
     detect_custom_avatars: "Wel of niet te verifiëren of gebruikers eigen profielfoto's hebben geüpload.  "
     max_daily_gravatar_crawls: "Maximale aantal keren dat Discourse op een dag bij Gravatar op aangepaste gravatars controleert"
@@ -1141,6 +1169,7 @@ nl:
     global_notice: "Laat een LET OP, BELANGRIJK-banner zien aan alle gebruikers. Laat leeg om niet te tonen (HTML is toegestaan)."
     disable_edit_notifications: "Schakelt bewerkingsmeldingen van de systeemgebruiker uit als 'download_remote_images_to_local' actief is."
     automatically_unpin_topics: "Automatisch ont-pinnen van topics als de gebruiker onderaan de pagina komt."
+    read_time_word_count: "Woorden per minuut voor bepalen van geschatte leestijd."
     topic_page_title_includes_category: "Paginatitel van topic bevat de categorienaam."
     share_anonymized_statistics: "Geanonimiseerde gebruiksstatistieken delen."
     full_name_required: "Volledige naam is een verplicht veld van het gebruikersprofiel."
@@ -1151,15 +1180,9 @@ nl:
     default_code_lang: "Standaard programmeertaal die gebruikt wordt voor syntax highlighting van GitHub codeblokken (lang-auto, ruby, python etc.)"
     warn_reviving_old_topic_age: "Wanneer iemand begint met antwoorden op een topic waar het laatste antwoord ouder is dan dit aantal dagen, zal er een waarschuwing worden weergegeven. Kan worden uitsgechakeld door op 0 te zetten."
     autohighlight_all_code: "Forceer het toepassen van code highlighting bij alle opgemaakte code blokken, zelfs als de codetaal niet expliciet is opgeven."
-    feed_polling_enabled: "ALLEEN INSLUITEN: Het al of niet insluiten van een RSS / ATOM-feed als berichten."
-    feed_polling_url: "ALLEEN INSLUITEN: URL van de RSS/ATOM feed om in te sluiten."
-    embed_by_username: "Discourse gebruikersnaam van de gebruiker die de ingesloten topics aanmaakt."
-    embed_username_key_from_feed: "Sleutel waarmee de discourse gebruikersnaam uit de feed kan worden gehaald."
     embed_truncate: "Kort de geembedde berichten in"
     embed_post_limit: "Maximale aantal te embedden berichten."
     embed_username_required: "De gebruikersnaam om topics aan te maken is vereist."
-    embed_whitelist_selector: "CSS-selector voor de elementen die zijn toegestaan in invoegberichten."
-    embed_blacklist_selector: "CSS-selector voor de elementen die zijn verwijderd uit invoegberichten."
     notify_about_flags_after: "Als er na dit aantal uren markeringen zijn die nog niet zijn afgehandeld, een privébericht naar stafleden sturen. Gebruik 0 om dit uit te schakelen."
     show_create_topics_notice: "Als de site minder dan 5 publieke topics heeft, toon dan een melding waarin admins gevraagd wordt om een aantal topics te creëren."
     delete_drafts_older_than_n_days: Verwijder concepten ouder dan (n) dagen.
@@ -1186,8 +1209,6 @@ nl:
     default_categories_watching: "Lijst van categorieën die standaard worden bekeken."
     default_categories_tracking: "Lijst van categorieën die standaard worden bijgehouden."
     default_categories_muted: "Lijst van categorieën die standaard worden gedempt."
-    max_user_api_reqs_per_day: "Maximale aantal API-aanvragen van gebruiker per sleutel per dag"
-    max_user_api_reqs_per_minute: "Maximale aantal API-aanvragen van gebruiker per sleutel per minuut"
     allow_user_api_keys: "Genereren van API-sleutels van gebruiker toestaan"
     allow_user_api_key_scopes: "Lijst van toegestane scopes voor API-sleutels van gebruiker"
     max_api_keys_per_user: "Maximale aantal API-aanvragen van gebruiker per gebruiker"
@@ -1316,13 +1337,11 @@ nl:
     email_too_long: "De e-mail die je hebt opgegeven is te lang. Mailbox namen mogen niet langer zijn dan 254 tekens, en domeinnamen niet langer dan 253 tekens."
     reserved_username: "Die gebruikersnaam is niet toegestaan."
     missing_user_field: "U hebt niet alle gebruikersvelden ingevuld"
-    close_window: "Authenticatie is voltooid. Sluit dit venster om verder te gaan."
   user:
     no_accounts_associated: "Geen accounts gekoppeld"
     username:
       short: "moet ten minste %{min} tekens zijn"
       long: "moet niet meer dan %{max} tekens zijn"
-      characters: "mag alleen nummers, letters en underscores bevatten"
       unique: "moet uniek zijn"
       blank: "mag niet leeg zijn"
       must_begin_with_alphanumeric_or_underscore: "moet beginnen met een letter, een nummer of een laag streepje"
@@ -1339,17 +1358,8 @@ nl:
     subject_template:
       one: "Eén vlag af te handelen"
       other: "%{count} vlaggen af te handelen"
-  invite_mailer:
-    subject_template: "%{invitee_name} nodigt je uit voor '%{topic_title}' op %{site_domain_name}"
-  invite_forum_mailer:
-    subject_template: "%{invitee_name} heeft je uitgenodigd voor %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Geeft wachtwoord voor je %{site_name} account"
-  queued_posts_reminder:
-    text_body_template: |
-      Hallo,
-
-      Er zijn berichten van nieuwe gebruikers voor moderatie achtergehouden die momenteel op goedkeuring wachten. [Keur ze goed of weiger ze hier](%{base_url}/queued-posts).
   flag_reasons:
     off_topic: "Je bericht is gemarkeerd als **off-topic**: de gemeenschap meent het niet goed past bij het onderwerp, zoals momenteel bepaald door de titel en de eerste post."
     inappropriate: "Je bericht is gemarkeerd als **ongepast**: de gemeenschap vindt het bericht beledigend, grof, of een schending van [onze gemeenschapsrichtlijnen](/guidelines)."
@@ -1391,27 +1401,11 @@ nl:
     csv_export_failed:
       title: "CSV Export Mislukt"
       subject_template: "Export mislukt"
-      text_body_template: "Het spijt ons, maar de export is mislukt. Bekijk de logbestanden of neem contact op met de staf."
     email_reject_inactive_user:
       text_body_template: |
         Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
 
         Het account dat bij dit e-mailadres hoort, is niet geactiveerd. Je moet je account activeren voordat je e-mails instuurt.
-    email_reject_blocked_user:
-      text_body_template: |
-        Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
-        Het account dat bij dit e-mailadres hoort, is geblokkeerd.
-    email_reject_reply_user_not_matching:
-      text_body_template: |
-        Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
-        Je reactie werd verstuurd van een ander e-mailadres dan we verwacht hadden, dus we weten niet zeker of dit dezelfde persoon is. Probeer de e-mail vanaf een ander adres te sturen, of neem contact op met de staf.
-    email_reject_no_account:
-      text_body_template: |
-        Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
-        We konden geen accounts vinden die overeenkomen met je e-mailadres. Probeer de e-mail van een ander adres te sturen, of neem contact op met de staf.
     email_reject_empty:
       text_body_template: |+
         Het spijt ons, maar het plaatsen van uw e-mailbericht naar %{destination} (getiteld %{former_title}) is niet gelukt.
@@ -1445,33 +1439,6 @@ nl:
         Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
 
         De plaatsingsactie werd niet herkend. Probeer het opnieuw of plaats je bericht via de website als het nog steeds niet lukt.
-    email_reject_reply_key:
-      text_body_template: |
-        Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
-        De antwoordsleutel in de e-mail is ongeldig of onbekend, dus we weten niet waar deze e-mail een reactie op is. Neem contact op met de staf.
-    email_reject_bad_destination_address:
-      text_body_template: |
-        Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
-        Geen van de bestemmingsadressen werd herkend. Zorg ervoor dat je je e-mail naar het juiste door de staf verstrekte e-mailadres stuurt.
-    blocked_by_staff:
-      subject_template: "Account tijdelijk geblokkeerd"
-    user_automatically_blocked:
-      title: "Gebruiker Automatisch Geblokkeerd"
-      subject_template: "Nieuwe gebruiker %{username} geblokkeerd wegens meldingen van andere gebruikers"
-    spam_post_blocked:
-      title: "Spam bericht geblokkeerd"
-      subject_template: "Berichten van nieuwe gebruiker %{username} geblokkeerd vanwege herhaalde links"
-    unblocked:
-      title: "Gedeblokkeerd"
-      subject_template: "Account niet langer geblokkeerd"
-      text_body_template: |
-        Hallo,
-
-        Dit is een automatisch bericht van %{site_name} om u te laten weten dat uw account na beoordeling door een staflid niet meer is geblokkeerd.
-
-        U kunt nu weer nieuwe antwoorden en topics aanmaken. Bedankt voor uw geduld.
     pending_users_reminder:
       subject_template:
         one: "1 gebruiker wacht op goedkeuring"
@@ -1508,8 +1475,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"
@@ -1526,10 +1493,6 @@ nl:
     see_more: "Meer"
     search_title: "Zoeken op deze website"
     search_google: "Google"
-  login_required:
-    welcome_message: |
-      #[Welkom op %{title}](#welcome)
-      Voor dit forum is een account nodig. Maak een account aan of log in om verder te gaan.
   terms_of_service:
     title: "Servicevoorwaarden"
     signup_form_message: 'Ik heb de <a href="/tos" target="_blank">Servicevoorwaarden</a> gelezen en ga hiermee akkoord.'
@@ -1587,6 +1550,8 @@ nl:
   privacy_topic:
     title: "Privacy Voorwaarden"
   badges:
+    autobiographer:
+      name: Autobiograaf
     read_guidelines:
       name: Richtlijnen gelezen
   admin_login:
@@ -1644,7 +1609,6 @@ nl:
         title: "Emoji"
       invites:
         title: "Staf uitnodigen"
-        description: "U bent bijna klaar! Nodig wat stafleden uit om te helpen met <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>het starten van discussies</a> met interessante topics en berichten om uw gemeenschap op te zetten."
       finished:
         title: "Uw Discourse is gereed!"
         description: |
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 6021fea024..97bebf4ebd 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -27,11 +27,15 @@ pl_PL:
   topics: "Tematy"
   posts: "posty"
   loading: "Ładowanie"
+  powered_by_html: 'Oparte na <a href="https://www.discourse.org">Discourse</a>, najlepiej oglądać z włączonym JavaScriptem'
   log_in: "Logowanie"
   purge_reason: "Automatycznie usunięte jako porzucone, dezaktywowane konto."
   disable_remote_images_download_reason: "Pobieranie zewnętrznych grafik zostało wyłączone z uwagi na niską ilość wolnego miejsca na dysku."
   anonymous: "Anonim"
   remove_posts_deleted_by_author: "Usunięte przez autora"
+  themes:
+    bad_color_scheme: "Nie można zaktualizować szablonu, nieprawidłowe kolory"
+    other_error: "Coś poszło nie tak podczas aktualizacji szablonu"
   emails:
     incoming:
       default_subject: "Ten temat wymaga tytułu"
@@ -43,7 +47,6 @@ pl_PL:
         auto_generated_email_error: "Zdarza się, gdy \"pierwszeństwo\" nagłówka jest ustawione na: listę, śmieci, luzem lub auto odpowiedź lub gdy inny nagłówek zawiera: auto-składane, auto-odpowiadanie lub auto-generowane."
         no_body_detected_error: "Zdarza się kiedy nie może rozpakować całości wiadomości, a zawarte są w niej załączniki."
         inactive_user_error: "Zdarza się kiedy nadawca jest nie aktywny."
-        blocked_user_error: "Zdarza się kiedy nadawca jest zablokowany."
         bad_destination_address: "Zdarza się gdy żaden adres email nie pasuje do pól To/Cc/Bcc skonfigurowanych jako przychodzący adres email."
         strangers_not_allowed_error: "Zdarza się, gdy użytkownik próbuje stworzyć temat w kategorii, której nie jest członkiem."
         insufficient_trust_level_error: "Zdarza się, gdy użytkownik próbuje stworzyć temat w kategorii, której nie ma odpowiedniego poziomu zaufania.."
@@ -52,6 +55,7 @@ pl_PL:
         topic_closed_error: "Zdarza się kiedy pojawia się odpowiedź, ale powiązany temat został zamknięty."
         bounced_email_error: "Email jest cofniętym raportem emaila."
         screened_email_error: "Zdarza się kiedy adres email nadawcy został zasłonięty. "
+      unrecognized_error: "Niezidentyfikowany błąd"
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -131,6 +135,7 @@ pl_PL:
   not_logged_in: "Aby to zrobić musisz się zalogować."
   not_found: "Żądany URL lub źródło nie mógł zostać znaleziony."
   invalid_access: "Nie jesteś uprawniony, by zobaczyć żądane źródło."
+  invalid_api_credentials: "Nie masz dostępu do żądanego zasobu. Nazwa użytkownika lub klucz API jest nieprawidłowy."
   read_only_mode_enabled: "Strona jest w trybie tylko do odczytu. Możliwość interakcji jest wyłączona."
   reading_time: "Czas odczytu"
   likes: "Lajki"
@@ -186,10 +191,12 @@ pl_PL:
     one: "Przepraszamy, nowi użytkownicy mogą dodać tylko jeden link we wpisie."
     few: "Przepraszamy, nowi użytkownicy mogą dodać tylko %{count} linki we wpisie."
     other: "Przepraszamy, nowi użytkownicy mogą dodać tylko %{count} linków we wpisie."
+  contains_blocked_words: "Twój wpis zawiera niedozwolone słowa"
   spamming_host: "Przepraszamy, nie możesz umieścić linka do tej strony."
   user_is_suspended: "Zawieszeni użytkownicy nie mogą wysyłać wiadomości."
   topic_not_found: "Coś poszło nie tak. Być może temat został zamknięty lub usunięty w międzyczasie?"
   not_accepting_pms: "Przepraszamy, ale użytkownik %{username}  nie akceptuje w tej chwili wiadomości "
+  max_pm_recepients: "Przepraszam, możesz wysłać wiadomość tylko do %{recipients_limit} odbiorców."
   just_posted_that: "jest zbyt podobne do tego co umieściłeś niedawno"
   invalid_characters: "zawiera niepoprawne znaki"
   is_invalid: "wygląda niejasno, czy to cała wypowiedz ?"
@@ -209,6 +216,12 @@ pl_PL:
     latest: "Ostatnie wątki"
     hot: "Popularne wątki"
     top: "Najlepsze tematy"
+    top_all: "Popularne tematy ogółem"
+    top_yearly: "Popularnie tematy w tym roku"
+    top_quarterly: "Popularne tematy w kwartale"
+    top_monthly: "Najpopularniejsze tematy w tym miesiącu"
+    top_weekly: "Najpopularniejsze tematy w tym tygodniu"
+    top_daily: "Najpopularniejsze tematy dzisiaj"
     posts: "Aktualne wpisy"
     private_posts: "Najnowsze prywatne wiadomości"
     group_posts: "Ostatni post z %{group_name}"
@@ -216,11 +229,13 @@ pl_PL:
     user_posts: "Ostatnie posty @%{username}"
     user_topics: "Ostatnie tematy @%{username}"
     tag: "Oznaczone tematy"
+    badge: "%{display_name}odznaka na%{site_title}"
   too_late_to_edit: "Ten wpis został utworzony zbyt dawno. Nie może być edytowany ani usunięty."
   revert_version_same: "Obecna wersja jest taka sama jak w wersja, którą próbujesz przywrócić."
   excerpt_image: "zdjęcie"
   queue:
     delete_reason: "Skasowany z poziomu kolejki moderacji."
+    not_found: "Post nie został znaleziony lub jest już zaktualizowany."
   groups:
     success:
       bulk_add: "%{users_added} użytkowników zostało dodanych do grupy"
@@ -231,6 +246,7 @@ pl_PL:
       invalid_incoming_email: "'%{domain}' nie jest poprawną domeną."
       email_already_used_in_group: "'%{email}' jest już używany przez grupę '%{group_name}'."
       email_already_used_in_category: "'%{email}' jest już używany przez kategorię '%{category_name}'."
+      cant_allow_membership_requests: "Nie możesz zatwierdzić członkostwa w grupie bez żadnego właściela"
     default_names:
       everyone: "wszyscy"
       admins: "administratorzy"
@@ -241,6 +257,8 @@ pl_PL:
       trust_level_2: "poziom_zaufania_2"
       trust_level_3: "poziom_zaufania_3"
       trust_level_4: "poziom_zaufania_4"
+    request_membership_pm:
+      title: "Prośba o członkostwo w grupie @%{group_name}"
   education:
     until_posts:
       one: "1 wpis"
@@ -290,6 +308,14 @@ pl_PL:
       Ten temat jest dla Ciebie istotny  &ndash; napisałeś tu ponad %{percent}% wszystkich odpowiedzi.
 
       Czy na pewno dajesz innym wystarczająco czasu na przedstawienie swoich punktów widzenia?
+    get_a_room: |
+      ### Odpowiedz wielu osobom
+
+      W tym temacie odpowiedziałeś już %{count} razy do @%{reply_username}
+
+      Czy myślałeś o odpowiedzi do *innych* osób w dyskusji? Dobra dyskusja pozwala wypowiedzieć się wielu osobom z różnymi opiniami.
+
+      Jeżeli chcesz kontynuować dowolnie długą dyskusję z konkretnym użytkownikiem możesz [wysłać prywatną wiadomość](/u/%{reply_username}).
     too_many_replies: |
       ### Osiągnąłeś limit odpowiedzi w tym temacie
 
@@ -322,6 +348,7 @@ pl_PL:
               too_many_users: "Jedno ostrzeżenie możesz wysłać tylko do pojedynczego użytkownika."
               cant_send_pm: "Przepraszamy, niestety nie możesz wysłać prywatnej wiadomości temu użytkownikowi."
               no_user_selected: "Musisz wybrać poprawnego użytkownika,"
+              reply_by_email_disabled: "Odpowiedź przez e-mail została wyłączona."
             featured_link:
               invalid: "Link jest nieprawidłowy, powinien zawierać http:// lub https://."
               invalid_category: "nie może być edytowany w tej kategorii."
@@ -339,12 +366,28 @@ pl_PL:
           attributes:
             hex:
               invalid: "nie jest poprawnym kolorem"
+        post_reply:
+          base:
+            different_topic: "Wpis i odpowiedź muszą należeć do tego samego tematu."
         web_hook:
           attributes:
             payload_url:
               invalid: "Link jest nieprawidłowy, powinien zawierać http:// lub https://. Puste pole jest niedozwolone."
+        custom_emoji:
+          attributes:
+            name:
+              taken: jest używane przez inną emotikonkę
+        topic_timer:
+          attributes:
+            execute_at:
+              in_the_past: "musi być w przyszłości"
+        watched_word:
+          attributes:
+            word:
+              too_many: "Za długi opis akcji"
       <<: *errors
   user_profile:
+    no_info_me: "<div class='missing-profile'>pole \"O mnie\" w profilu jest obecnie puste, <a href='/u/%{username_lower}/preferences/about-me'>Czy chcesz je wypełnić?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} jeszcze nie podał swojego opisu w profilu</div>"
   vip_category_name: "Salon"
   vip_category_description: "Kategoria wyłącznie dla członków o poziomie zaufania 3 lub wyższym."
@@ -352,7 +395,8 @@ 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)."
+  assets_topic_title: "Zasoby wyglądu strony"
+  assets_topic_body: "Ten wpis (widoczny tylko dla administratorów) służy zapisywaniu obrazków i plików służących do zmianu wyglądu strony. Nie kasuj go!\n\n\nOto jak to zrobić:\n\n\n1. Odpowieź w tym wpisie.\n2. Załaduj wszystkie pliki, których chcesz użyć jako logotypy, favikony itp. (Użyj przycisku uploadowania na pasku narzędzi w edytorze wpisu albo przeciągnij obrazki do treści).\n3. Naciśnij odpowiedź, żeby ją opublikować.\n4. Naciśnij prawym przyciskiem myszki na obrazku, żeby zapisać link do obrazka albo naciśnij przycisk edycji, żeby zobaczyć link w treści wpisu.\n5. Wklej te linki w [ustawieniach strony](/admin/site_settings/category/required).\n\n\nJeżeli chcesz uploadować inne typy plików, zedytuj `dozwolone rozszerzenia` [ustawieniach plików](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Witaj w Discourse"
     body: |2
@@ -403,6 +447,7 @@ pl_PL:
       invalid_email_in: "'%{email}' nie jest poprawnym adresem e-mail."
       email_already_used_in_group: "'%{email}' jest już używany przez grupę '%{group_name}'."
       email_already_used_in_category: "'%{email}' jest już używany przez kategorię '%{category_name}'."
+      description_incomplete: "Post opisujący kategorię musi mieć przynajmniej jeden paragraf."
     cannot_delete:
       uncategorized: "Nie można usunąć kategorii Inne"
       has_subcategories: "Nie można usunąć tej kategorii ponieważ posiada podkategorie. "
@@ -424,6 +469,10 @@ pl_PL:
       title: "zwyczajny"
     leader:
       title: "lider"
+    change_failed_explanation: "Twoja próba obniżenia poziomu %{user_name} do '%{new_trust_level}' była nieudana. Ten użytkownik posiada już poziom '%{current_trust_level}'. %{user_name} pozostanie na poziomie '%{current_trust_level}' - jeśli chcesz to zmienić, najpierw zablokuj poziom zaufania temu użytkownikowi."
+  post:
+    image_placeholder:
+      broken: "Ten obraz jest uszkodzony"
   rate_limiter:
     slow_down: "Powtórzyłeś to działanie zbyt wiele razy, spróbuj ponownie później."
     too_many_requests: "Liczba wykonań tej czynności w ciągu dnia jest ograniczona. Odczekaj %{time_left} przed ponowną próbą."
@@ -438,6 +487,7 @@ pl_PL:
       pms_per_day: "Osiągnąłeś maksymalną liczbę wiadomości na dziś. Musisz poczekać %{time_left}, zanim znów spróbujesz."
       create_like: "Osiągnąłeś maksymalną liczbę lajków na dziś. Musisz poczekać %{time_left}, zanim znów spróbujesz."
       create_bookmark: "Wyczerpałeś na dziś możliwość dodawania zakładek. Musisz poczekać %{time_left}, zanim znów spróbujesz."
+      edit_post: "Wyczerpałeś na dziś możliwość edytowania. Musisz poczekać %{time_left}, zanim znów spróbujesz."
       live_post_counts: "Zbyt szybko prosisz o bieżące zliczanie postów . Musisz poczekać %{time_left}, zanim znów spróbujesz."
       unsubscribe_via_email: "Osiągnąłeś maksymalną liczbę wypisań przez maila na dziś. Musisz poczekać %{time_left}, zanim znów spróbujesz."
       topic_invitations_per_day: "Osiągnąłeś maksymalną liczbę zaproszeń do tematów na dziś. Odczekaj %{time_left} przed kolejną próbą."
@@ -601,53 +651,69 @@ 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:
     off_topic:
       title: 'Nie na temat'
       description: 'Ten post jest niezwiązany z obecną dyskusją zdefiniowaną przez tytuł i pierwszy post, i powinien zostać przeniesiony gdzieś indziej.'
+      short_description: 'Nie istotne z punktu widzenia dyskusji.'
       long_form: 'oflagowano jako nie-na-temat'
     spam:
       title: 'Spam'
+      description: 'Ten post jest reklamą lub aktem wandalizmu. Nie jest potrzebny, ani istotny w bieżącym temacie.'
+      short_description: 'To jest reklama lub akty wandalizmu.'
       long_form: 'oflagowano jako spam'
       email_title: '%{title}" został oznaczony jako spam'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: 'Niewłaściwe'
       description: 'Ten wpis zawiera treści które umiarkowana osoba może uznać za wulgarne, obraźliwe lub naruszające <a href="/guidelines">wytyczne społeczności</a>.'
+      short_description: 'Naruszenie  <a href="/guidelines">naszych wytycznych dla społeczności </a>'
       long_form: 'oflagowano jako niewłaściwe'
     notify_user:
       title: 'Wyślij @{{username}} wiadomość'
       description: 'Chciałbym porozmawiać o tym poście z tą osobą prywatnie'
+      short_description: 'Chciałbym porozmawiać o tym poście bezpośrednio z tą osobą.'
       long_form: 'użytkownik został powiadomiony'
       email_title: 'Twój wpis w "%{title}"'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Coś innego"
       description: 'Ten post wymaga uwagi moderatora z powodu nie uwzględnionego na liście powyżej.'
+      short_description: 'Wymaga uwagi personelu z innego powodu.'
       long_form: 'oznaczony dla uwagi moderatora'
       email_title: 'Post"%{title}" wymaga uwagi moderatora'
       email_body: "%{link}\n\n%{message}"
     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_default:
+      self: "Nie masz jeszcze żadnej aktywności."
+      others: "Brak aktywności"
     no_bookmarks:
       self: "Nie masz postów dodanych do zakładek, posty w zakładkach pozwalają ci na łatwiejszy dostęp do nich w późniejszym czasie."
       others: "Brak zakładek."
     no_likes_given:
       self: "Nie masz lajkowanych postów."
       others: "Brak lajkowanych postów."
+    no_replies:
+      self: "Nie odpowiedziałeś na żadne posty."
+      others: "Brak odpowiedzi."
   topic_flag_types:
     spam:
       title: 'Spam'
@@ -664,7 +730,6 @@ pl_PL:
       email_title: 'Temat "%{title}" wymaga uwagi moderatora'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Twój wpis został oflagowany przez społeczność. Sprawdź <a href="/my/private-messages">swoje prywatne wiadomości</a>.</p>'
     user_must_edit: '<p>Ten wpis został oflagowany przez społeczność i został tymczasowo ukryty.</p>'
   archetypes:
     regular:
@@ -676,7 +741,7 @@ 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>."
+    description: "<b>%{email}</b> nie posiada subskrypcji. Aby zmienić ustawienia emaila <a href='%{url}'>przejdź do ustawień użytkownika </a>."
     topic_description: "Aby ponownie zasubskrybować %{link}, użyj kontrolki powiadomienia na dole lub po prawej stronie tematu."
   unsubscribe:
     title: "Wypisz"
@@ -851,9 +916,12 @@ pl_PL:
     sidekiq_warning: 'Sidekiq nie działa. Wiele zadań, takich jak wysyłanie emaili, jest wykonywane asynchronicznie przez sidekiqa. Zagwarantuj, że przynajmniej jeden proces sidekiqa działa. <a href="https://github.com/mperham/sidekiq" target="_blank">Dowiedz się więcej o Sidekiqu</a>.'
     queue_size_warning: 'Liczba oczekujących zadań wynosi %{queue_size}, to dużo. Może to wskazywać na problem z procesem (procesami) Sidekiq, lub możesz potrzebować więcej pracowników Sidekiq.'
     memory_warning: 'Twój serwer działa z mniej niż 1 GB pamięci całkowitej. Przynajmniej 1 GB pamięci jest zalecany.'
+    google_oauth2_config_warning: 'Serwer został skonfigurowany, aby umożliwić rejestracje i logowanie za pomocą Google OAuth2 (enable_google_oauth2_logins), ale id klienta oraz tajne wartości klienta nie są ustawione. Przejdź do <a href="/admin/site_settings">strony ustawień</a> i zaktualizuj ustawienia, <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank"> Zobacz przewodnik, aby dowiedzieć się więcej</a>.'
     facebook_config_warning: 'Serwer jest skonfigurowany by pozwalać na rejestrację i logowanie za pomocą Facebooka (enable_facebook_logins), ale identyfikator i sekret aplikacji nie są ustawione. Przejdź do <a href="/admin/site_settings">ustawień serwisu</a> i zmień ustawienia. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Zobacz ten poradnik by dowiedzieć się więcej</a>.'
     twitter_config_warning: 'Serwer jest skonfigurowany by pozwalać na rejestrację i logowanie za pomocą Twittera (enable_twitter_logins), ale klucz i sekret nie są ustawione. Przejdź do <a href="/admin/site_settings">ustawień serwisu</a> i zmień ustawienia. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Zobacz ten poradnik by dowiedzieć się więcej</a>.'
     github_config_warning: 'Serwer jest skonfigurowany by pozwalać na rejestrację i logowanie za pomocą GitHuba (enable_github_logins), ale id klienta i sekret nie są ustawione. Przejdź do <a href="/admin/site_settings">ustawień serwisu</a> i zmień ustawienia. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Zobacz ten poradnik by dowiedzieć się więcej</a>.'
+    s3_config_warning: 'Serwer został skonfigurowany aby przesyłać pliki do s2, ale przynajmniej jeden z następujących parametrów nie został ustawiony: s3_access_key_id_, s3_secret_access_key, s3_use_iam_profile, lub s3_upload bucket. Przejdź do <a href="/admin/site_settings">Strony ustawień</a> i zaktualizuj ustawienia, <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank"> Zobacz "Jak ustawić przesyłanie obrazu do S3" aby dowiedzieć się więcej</a>,'
+    s3_backup_config_warning: 'Serwer jest skonfigurowany tak, aby wysyłać kopie zapasowe do s3, ale jedno z ustawień nie jest ustawione prawidłowo: s3_access_key_id, s3_secret_access_key or s3_backup_bucket. Idź do <a href="/admin/site_settings"> ustawień strony </a> i zaktualizuj ustawienia. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank"> Zobacz Jak ustawić wysyłanie zdjęć do S3 </a>.'
     image_magick_warning: 'Serwer jest skonfigurowany by tworzyć miniaturki dużych obrazów, ale ImageMagick nie jest zainstalowany. Zainstaluj ImageMagick za pomocą ulubionego menedżera pakietów lub <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">pobierz najnowszą wersję</a>.'
     failing_emails_warning: '%{num_failed_jobs} prac emailowych nie powiodło się. Sprawdź plik app.yml i upewnij się, że ustawienia serwera poczty są poprawne. <a href="/sidekiq/retries" target="_blank">Zobacz nieudane prace w Sidekiqu</a>.'
     subfolder_ends_in_slash: "Twoje ustawienie podfolderu jest niepoprawne; DISCOURSE_RELATIVE_URL_ROOT kończy się slashem."
@@ -886,6 +954,8 @@ pl_PL:
     search_tokenize_chinese_japanese_korean: "Wymuś wyszukiwanie żeby tokenizowało Chiński/Japoński/Koreański nawet na stronach nie-CJK"
     search_prefer_recent_posts: "Jeśli wyszukiwanie na twoim duży forum jest wolne, ta opcja pozwala zaindeskować ostanie posty wpierw."
     search_recent_posts_size: "Jak dużo ostanich postów trzymać w indexie"
+    log_search_queries: "Dzienniki wyszukiwanych przez użytkowników treści"
+    search_query_log_max_size: "Maksymalna liczba zapytań do zachowania"
     allow_uncategorized_topics: "Zezwól na tworzenie tematów bez kategorii. UWAGA: jeśli jest jakiś nieskategoryzowany temat, musisz go przypisać do kategorii, zanim wyłączysz tę opcję."
     allow_duplicate_topic_titles: "Pozwól na tworzenie tematów o identycznych tytułach."
     unique_posts_mins: "Ile minut musi upłynąć zanim użytkownik będzie mógł ponownie zrobić wpis z tą samą treścią"
@@ -894,7 +964,6 @@ pl_PL:
     site_description: "Opis strony w jednym zdaniu, wykorzystywany w meta tagu description."
     contact_email: "Adres email kogoś, z kim należy się kontaktować w kwestii serwisu. Istotne informacje z discourse.org dotyczące krytycznych aktualizacji mogą być wysyłane pod ten adres."
     contact_url: "URL kontaktowy dla tego serwisu. Używany na podstronie /about."
-    queue_jobs: "DEVELOPER ONLY! WARNING! By default, queue jobs in sidekiq. If disabled, your site will be broken."
     crawl_images: "Pobieraj grafiki ze zdalnych URLi aby ustawić poprawną wysokość i szerokość w tagu img."
     download_remote_images_to_local: "Pobieraj zdalne grafiki i twórz ich lokalne kopie aby zapobiegać uszkodzonym/brakującym obrazkom na stronach."
     download_remote_images_threshold: "Minimalna ilość wolnego miejsca na dysku wymagana przez funkcję pobierania zdalnych grafik (w procentach)"
@@ -909,23 +978,24 @@ pl_PL:
     fixed_category_positions: "Zaznacz, aby ręcznie ustawiać kolejność kategorii. Odznacz, aby kategorie były sortowane na podstawie aktywności. "
     fixed_category_positions_on_create: "Jeżeli jest sprawdzone to porządkowanie kategorii będzie zależało od stworzonego tematu (requires fixed_category_positions). "
     add_rel_nofollow_to_user_content: "Dodaj rel nofollow do wszystkich treści użytkownika, poza wewnętrznymi linkami (wliczając domeny nadrzędne). Jeśli to zmienisz, musisz rebake wszystkie posty poprzez: \"rake post:rebake\""
-    exclude_rel_nofollow_domains: "Spis domen, dla których nofollow nie powinien być dodawany do linków. tld.com automatycznie zezwoli sub.tld.com. Minimalnie powinieneś dodać nadrzędną domenę tej strony żeby pomóc robotom internetowym znajdować treści. Jeśli inne części Twojej witryny znajdują się w innych domenach - dodaj również je."
     post_excerpt_maxlength: "Maksymalna długość podsumowania / streszczenia wpisu."
     show_pinned_excerpt_mobile: "Pokaż fragment przypiętych tematów w widoku mobilnym"
     show_pinned_excerpt_desktop: "Pokaż fragment przypiętych tematów w widoku \"wersja komputerowa\""
     post_onebox_maxlength: "Maksymalna długość (ilość znaków) treści wpisu osadzonego via Onebox"
     onebox_domains_blacklist: "Lista domen które nigdy nie będą posegregowane. "
+    inline_onebox_domains_whitelist: "Lista domen, które będą zamknięte w miniaturze jeśli zostały zalinkowane bez tytułu."
+    enable_inline_onebox_on_all_domains: "Zignoruj inline_onebox_domain_whitelist strony ustawień i zezwól na wstawki onebox we wszystkich domenach."
     max_oneboxes_per_post: "Masymalna ilość oneboxów w poście."
     logo_url: "Zdjęcie logo w lewym górnym rogu twojej strony powinno mieć kształt szerokiego prostokąta. Jeśli zostawisz miejsce puste, wyświetlany będzie tytuł strony."
     digest_logo_url: "Alternatywne logo używane w biuletynie email. Powinno mieć kształt szerokiego prostokąta. Nie powinno być obrazkiem SVG. Jeśli puste, zostanie użyta wartość z pola `logo_url`."
     logo_small_url: "Małe logo w lewym górnym rogu strony widoczne przy przewijaniu. Powinno mieć kwadratowy kształt. Jeśli zostawisz to pole puste zamiast logo pojawi się symbol strony domowej."
     favicon_url: "Favicon serwisu. Więcej informacji: http://pl.wikipedia.org/wiki/Favicon Żeby działało poprawnie poprzez CDN musi być obrazem png"
-    mobile_logo_url: "Statyczne logo widoczne w lewym górnym rogu mobilnej wersji serwisu. Powinno mieć kwadratowy kształt. Jeśli puste, zostanie użyta grafika z pola `logo_url` np.: http://example.com/uploads/default/logo.png "
     apple_touch_icon_url: "Ikona używana przez urządzenia Apple. Rekomendowany wymiar to 144px na 144px."
     notification_email: "Adres z którego wysyłane będą wszystkie istotne emaile systemowe.\nKonieczna jest poprawna konfiguracja rekordów SPF, DKIM oraz zwrotnego PTR użytej domeny."
     email_custom_headers: "A pipe-delimited list of custom email headers"
     email_subject: "Możliwość dostosowania formatu tematów maili. Szczegóły: https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
     force_https: "Wymuś używanie wyłącznie HTTPS na stronie. UWAGA: NIE włączaj tego dopóki nie zweryfikujesz, że HTTPS jest w pełni skonfigurowany i działa absolutnie wszędzie! Czy sprawdziłeś swoje CDN, loginy z portali społecznościowych i wszystkie zewnętrzne loga / zależności żeby być pewnym, że są kompatybilne z HTTPS?"
+    same_site_cookies: "Używaj tych samych plików cookies, eliminują one wszystkie wektory Cross Site Request Forgery na wspieranych przeglądarkach (Lax lub Strict). Ostrzeżenie: Przeglądarka Strict działa jedynie na stronach, które wymagają logowania oraz używają SSO."
     summary_score_threshold: "Minimalny wynik wpisu wymagany do umieszczenia go w 'Podsumowaniu tematu'"
     summary_posts_required: "Minimalna liczba wpisów w temacie zanim 'Podsumowanie tematu' jest dostępne"
     summary_likes_required: "Minimalna liczba polubień w temacie zanim 'Podsumowanie tematu' jest dostępne"
@@ -945,27 +1015,23 @@ pl_PL:
     tl2_additional_likes_per_day_multiplier: "Zwiększ limit lajków na dzień dla tl2 (członek), mnożąc przez tę liczbę"
     tl3_additional_likes_per_day_multiplier: "Zwiększ limit lajków na dzień dla tl3 (użytkownik stały), mnożąc przez tę liczbę"
     tl4_additional_likes_per_day_multiplier: "Zwiększ limit lajków na dzień dla tl4 (lider), mnożąc przez tę liczbę"
-    num_spam_flags_to_block_new_user: "Jeżeli post nowego użytkownika otrzyma tyle spam flag od num_users_to_block_new_user różnych użytkowników, ukryj ich wszystkie posty i zablokuj możliwość tworzenia kolejnych. 0 żeby wyłączyć."
-    num_users_to_block_new_user: "Jeżeli post nowego użytkownika otrzyma num_spam_flags_to_block_new_user flag spamu od tylu różnych użytkowników, ukryj jego wszystkie posty i zablokuj możliwość pisania nowych. 0 żeby wyłączyć."
-    num_tl3_flags_to_block_new_user: "Jeżeli post nowego użytkownika otrzyma num_tl3_users_to_block_new_user flag od tylu różnych użytkowników poziomu zaufania 3, ukryj jego wszystkie posty i zablokuj możliwość pisania nowych. 0 żeby wyłączyć."
-    num_tl3_users_to_block_new_user: "Jeżeli post nowego użytkownika otrzyma num_tl3_users_to_block_new_user flag spamu od tylu różnych użytkowników poziomu zaufania 3, ukryj jego wszystkie posty i zablokuj możliwość pisania nowych. 0 żeby wyłączyć."
-    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)."
+    enable_markdown_typographer: "Używaj podstawowych zasad typografii, aby poprawić czytelność poszczególnych paragrafów tekstu, zastąpienie (c)(tm) itd, z symbolami, zmniejsza liczbę znaków zapytania itd"
     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. "
     maximum_session_age: "Użytkownik zostanie zalogowany przez n godzin od czasu ostatniej wizyty."
-    ga_tracking_code: "Identyfikator Google Universal Analytics (ga.js) tracking code code, eg: UA-12345678-9; zobacz http://google.com/analytics"
-    ga_domain_name: "Identyfikator Google Analytics (ga.js) nazwa domeny,  eg: UA-12345678-9; zobacz http://google.com/analytics"
     ga_universal_tracking_code: "Identyfikator Google Universal Analytics (analytics.js), np: UA-12345678-9; zobacz http://google.com/analytics"
     ga_universal_domain_name: "Domena dla Google Universal Analytics (analytics.js), np: mysite.com; zobacz http://google.com/analytics"
+    ga_universal_auto_link_domains: "Włącz Google Universal Analytics (analytics.js) śledzenie wielu domen. Linki wychodzące do tych domen będą miały dodane id klienta. Zobacz poradnik Google's Cross-Domain Tracking."
     gtm_container_id: "Kontener menadżera tagów Google np: GTM-ABCDEF"
     enable_escaped_fragments: "Odwołuj się do API Google Ajax-Crawling jeżeli nie wykryto żadnego robota internetowego. Sprawdź https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
     allow_moderators_to_create_categories: "Zezwól moderatorom na tworzenie nowych kategorii"
     cors_origins: "Dozwolone źródła dla zapytać cross-origin (CORS). Każde źródło musi zawierać http:// lub https://. Zmienna środowiskowa DISCOURSE_ENABLE_CORS musi być ustawiona na true żeby włączyć CORS."
     use_admin_ip_whitelist: "Administratorzy mogą się logować tylko z adresów IP zdefiniowanych w liście Screened IPs (Admin > Logi > Screened Ips)."
+    blacklist_ip_blocks: "Lista zablokowanych prywatnych adresów IP, które nigdy nie powinny być przeszukiwane przez Discourse."
+    whitelist_internal_hosts: "Lista wewnętrznych hostów, które są bezpieczne dla discourse, jeśli chodzi o oneboxing i inne cele"
     top_menu: "Określ które elementy nawigacyjne serwisu powinny być widoczne i w jakiej kolejności. Przykład aktualne|nowe|nieodczytane|kategorie|top|przeczytane|wysłane|zakładki"
     post_menu: "Określ które elementy menu wpisu powinny być widoczne i w jakiej kolejności. Przykład like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Elementy w menu, które w menu posta będą ukryte, chyba że kliknięty zostanie przycisk rozwijania."
@@ -980,6 +1046,7 @@ pl_PL:
     topics_per_period_in_top_summary: "Liczba tematów wyświetlanych w domyślnym podsumowaniu najbardziej popularnych wątków"
     topics_per_period_in_top_page: "Liczba tematów wyświetlanych w widoku 'Pokaż więcej'  na ekranie popularnych wątków."
     redirect_users_to_top_page: "Automatycznie kieruj nowych i długo nieobecnych użytkowników na stronę główną."
+    top_page_default_timeframe: "Domyślne ramy czasowe dla strony widoku z góry."
     show_email_on_profile: "Pokazuj email użytkownika w jego profilu (widoczny jedynie dla użytkownika i personelu)."
     prioritize_username_in_ux: "Pokaż nazwę użytkownika jako pierwszą na stronie użytkownika, karcie użytkownika i w postach (kiedy wyłączone imię jest pokazane jako pierwsze)"
     email_token_valid_hours: "Tokeny resetujące hasło / aktywujące konto są ważne przez (n) godzin."
@@ -988,18 +1055,16 @@ pl_PL:
     allow_index_in_robots_txt: "Określ w robots.txt, że ta strona może być indeksowana przez silniki wyszukiwania."
     email_domains_blacklist: "Lista rozdzielonych pionową kreską domen e-mail, z których użytkownicy nie mogą się rejestrować. Przykład: mailinator.com|trashmail.net"
     email_domains_whitelist: "Lista rozdzielonych pionową kreską domen e-mail, z których użytkownicy MUSZĄ się rejestrować. UWAGA: Użytkownicy z domenami e-mail innymi niż wypisane nie będą dopuszczeni!"
-    forgot_password_strict: "Nie informuj użytkowników o istnieniu konta kiedy używają dialogu zapomnianego hasła."
     log_out_strict: "Po wylogowaniu wyloguj WSZYSTKIE sesje użytkownika na wszystkich urządzeniach."
     version_checks: "Odpytuj Discourse Hub o aktualizacje i wyświetlaj wiadomości o nowej wersji w panelu /admin"
     new_version_emails: "Wyślij email na adres contact_email, kiedy nowa wersja Discourse będzie dostępna."
-    port: "OSTRZEŻENIE! Tylko dla Developera! Użyj ten port HTTP zamiast domyślnego portu 80. Pozostaw puste pole, domyślnie port 80"
-    force_hostname: "OSTRZEŻENIE! Tylko dla Developera! Określ nazwę hosta w adresie URL. Pozostaw domyślnie puste."
     invite_expiry_days: "Jak długo klucz zaproszenie użytkownika jest ważny, w dniach."
     invite_passthrough_hours: "Jak długo użytkownik może użyć poprzednio wykorzystanego klucza zaproszenia by się zalogować, w godzinach"
     invite_only: "Rejestracja jest wyłączona. Nowi użytkownicy muszą zostać zaproszeni przez administrację."
     login_required: "Wymagaj autoryzacji do wyświetlenia zawartości strony, zablokuj możliwość anonimowego dostępu."
     min_username_length: "Minimalna długość nazwy użytkownika w znakach. OSTRZEŻENIE: jeśli jacykolwiek istniejący użytkownicy lub grupy mają nazwy krótsze niż ta, twój serwis się uszkodzi!"
     max_username_length: "Maksymalna długość nazwy użytkownika w znakach. OSTRZEŻENIE: jeśli jacykolwiek istniejący użytkownicy lub grupy mają nazwy dłuższe niż ta, twój serwis się uszkodzi!"
+    reserved_usernames: "Nazwy użytkowników, które są niedostępne przy rejestracji. Symbol dzikiej karty * może zostać użyty, aby dopasować do argumentu zero lub więcej razy."
     min_password_length: "Minimalna długość hasła."
     min_admin_password_length: "Minimalna długość hasła dla Admina."
     password_unique_characters: "Minimalna ilość różnych znaków, które muszą być w haśle."
@@ -1008,9 +1073,15 @@ pl_PL:
     verbose_sso_logging: "Log więcej diagnostyk związanych z SSO do /logs"
     enable_sso_provider: "Zaimplementuj protokół dostawcy Discourse SSO w endpoint /session/sso_provider, wymaga ustawienia sso_secret"
     sso_url: "URL endpoint pojedynczego logowania (musi zawierać http:// lub https://)"
+    sso_secret: "Tajny ciąg znaków używany, aby kryptograficznie uwierzytelnić informacje SSO, powinien mieć 10 lub więcej znaków."
     sso_overrides_bio: "Nadpisuje biografię użytkownika w jego profilu i uniemożliwia mu zmianę biografii."
+    sso_overrides_email: "Nadpisuje lokalny email poprzez zewnętrzną witrynę email z SSO przy każdym logowaniu, aby zapobiec lokalnym zmianom. (Ostrzeżenie: rozbieżności mogą pojawić się w związku z normalizacją lokalnym emaili)."
+    sso_overrides_username: "Nadpisuje lokalne nazwy użytkowników z pomocą nazw użytkowników z zewnętrznej strony przez SSO przy każdym logowaniu i zapobiega lokalnym zmianom. (Ostrzeżenie: rozbieżności mogą pojawić się w związku z różnicami w długością/wymaganiami nazwy użytkownika)"
+    sso_overrides_name: "Nadpisuje lokalną pełną nazwę za pomocą pełnych nazw z zewnętrznej strony przez SSO przy każdym logowaniu i zapobiega lokalnym zmianom."
+    sso_overrides_avatar: "Nadpisuje avatar użytkownika z pomocą avatarów z zewnętrznych stron poprzez SSO. Jeśli włączone, wyłączanie allow_uploaded_avatars wysoce polecane"
     sso_not_approved_url: "Przekieruj niezatwierdzone konta SSO na ten URL"
     sso_allows_all_return_paths: "Nie ograniczaj domen dla return_paths dostarczanych przez SSO (domyślnie zwracana ścieżka musi być na aktualnej stronie)"
+    enable_local_logins: "Włącz konta oparte o lokalne nazwy użytkownika i hasła logowania. (Pamiętaj: to musi być włączone dla zaproszeń, aby działało)"
     allow_new_registrations: "Zezwól na rejestrację nowych użytkowników. Odznacz opcję żeby uniemożliwić rejestrację nowych kont."
     enable_signup_cta: "Pokazuj wiadomość dla powracających użytkowników anonimowych, zachęcającą ich do założenia konta."
     enable_yahoo_logins: "Włącz autoryzację Yahoo"
@@ -1026,6 +1097,7 @@ pl_PL:
     enable_facebook_logins: "Enable Facebook authentication, requires facebook_app_id and facebook_app_secret"
     facebook_app_id: "App id for Facebook authentication, registered at https://developers.facebook.com/apps"
     facebook_app_secret: "App secret for Facebook authentication, registered at https://developers.facebook.com/apps"
+    facebook_request_extra_profile_details: "Poproś o mnie, lokalizację i stronę z facebooka. (wymaga, aby twoja aplikacja autoryzacyjna była zaakceptowana przez Facebooka)"
     enable_github_logins: "Włacz autoryzację Github, wymagane github_client_id oraz github_client_secret"
     github_client_id: "Client id dla autoryzacji Github, zarejestrowany w https://github.com/settings/applications"
     github_client_secret: "Client secret dla autoryzacji Github, zarejestrowany w https://github.com/settings/applications"
@@ -1038,9 +1110,14 @@ pl_PL:
     s3_backup_bucket: "Zdalne wiadro do przechowywania kopii zapasowych. UWAGA: Upewnij się, że jest to wiadro prywatne."
     s3_disable_cleanup: "Dezaktywuj usuwanie kopii zapasowych z S3 kiedy usunięte lokalnie."
     backup_time_of_day: "Godzina (UTC) wykonania kopii zapasowej."
+    backup_with_uploads: "Uwzględniaj przesyły w zaplanowanych backupach. Wyłączenie tej opcji spowoduje backup jedynie bazy danych."
     active_user_rate_limit_secs: "How frequently we update the 'last_seen_at' field, in seconds"
     verbose_localization: "Wyświetlaj dodatkowe identyfikatory tłumaczeń w treści etykiet"
     previous_visit_timeout_hours: "How long a visit lasts before we consider it the 'previous' visit, in hours"
+    top_topics_formula_log_views_multiplier: "wartość mnożnika odsłon dziennik (n) w tematach formuła : `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: "wartość mnożnika polubień pierwszego posta (n) w tematach formuła:  `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: "wartość mnożnika najmniejszej liczby polubień na post w (n) tematach formuła:  `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
+    rebake_old_posts_count: "Liczba starych postów, które są ponownie wypalane co 15 minut."
     rate_limit_create_topic: "Po otworzeniu tematu użytkownicy muszą odczekać (n) sekund, zanim otworzą inny temat."
     rate_limit_create_post: "Po napisaniu posta użytkownicy muszą odczekać (n) sekund, zanim napiszą inny post."
     rate_limit_new_user_create_topic: "Po otworzeniu tematu nowi użytkownicy muszą odczekać (n) sekund, zanim otworzą inny temat."
@@ -1064,10 +1141,23 @@ pl_PL:
     clean_up_uploads: "Usuń osierocone pliki aby zapobiec wykorzystywaniu forum jako hosting. UWAGA: przed włączeniem tej opcji zaleca się wykonanie kopii katalogu /uploads."
     clean_orphan_uploads_grace_period_hours: "Okres karencji (w dniach) przed wysłaniem sierot zostanie skasowany."
     purge_deleted_uploads_grace_period_days: "Okres karencji (w dniach) przed usunięciem upload zostanie skasowany."
-    purge_unactivated_users_grace_period_days: "Okres karencji w dniach, po upływie którego nieaktywowane konto użytkownika zostanie usunięte."
+    enable_s3_uploads: "Umieść przesyły w pamięci Amazon S3. Ważne: wymaga ważnych danych uwierzytelniających (zarówno klucza id i tajnego klucza dostępu)"
+    s3_use_iam_profile: 'Użyj AWS EC2 IAM aby odzyskać klucze. Pamiętaj: włączenie spowoduje nadpisanie ustawień "id klucza dostępu s3" i "tajnego klucza dostępu s3" '
+    s3_upload_bucket: "Nazwa koszyka Amazon S3, do którego zostaną przesłane pliki. Ostrzeżenie: bez wielkich liter, kropek czy podkreślenia."
+    s3_access_key_id: "Klucz dostępu Amazon S3, który zostanie użyty do przesyłania zdjęć."
+    s3_secret_access_key: "Tajny klucz dostępu Amazon S3, który zostanie użyty do przesyłania zdjęć."
+    s3_region: "Nazwa obszaru Amazon S3, który zostanie użyty do przesyłania zdjęć."
+    s3_cdn_url: "URL CDN używany dla wszystkich aktywów s3 (na przykład : https://cdn.somewhere.com). Ostrzeżenie: po zmianie tego ustawienia musisz ponownie przywrócić stare posty."
     avatar_sizes: "Lista automatycznie wygenerowanych rozmiarów awatarów."
     external_system_avatars_enabled: "Użyj zewnętrzny system awatarów."
     external_system_avatars_url: "Adres URL zewnętrznego dostawcy awatarów. Dozwolone podstawienia: {username} {first_letter} {color} {size}"
+    default_opengraph_image_url: "Adres URL domyślnego obrazu otwarciawykresu."
+    twitter_summary_large_image_url: "Adres URL domyślnego obrazu karty podsumowanie Twitter (powinien mieć przynajmniej 280px szerokości oraz 150px wysokości)."
+    allow_all_attachments_for_group_messages: "Zezwól na wszystkie załączniki email dla wiadomości grupowych."
+    png_to_jpg_quality: "Jakość skonwertowanego pliku JPG (1 to najniższa jakość, 99 to najlepsza jakość, 100 aby dezaktywować)."
+    allow_staff_to_upload_any_file_in_pm: "Pozwól personelowi przesyłać pliki w wiadomościach."
+    strip_image_metadata: "Pasek metadanych obrazu."
+    enable_flash_video_onebox: "Włącz osadzanie linków swf i flv (Adobe Flash) za pomocą funkcji onebox. Ostrzeżenie: może powodować pewne ryzyko związane z bezpieczeństwem."
     default_invitee_trust_level: "Domyślny poziom zaufania (0-4) dla zaproszonych użytkowników."
     default_trust_level: "Domyślny poziom zaufania (0-4) dla wszystkich nowych użytkowników. Zmienianie tego  narażą na ryzyko sporej ilości Spamu."
     tl1_requires_topics_entered: "Jak wiele tematów musi odwiedzić nowy użytkownik, przed promocją na 1-szy poziom zaufania."
@@ -1081,7 +1171,18 @@ pl_PL:
     tl2_requires_likes_given: "Ile lajków musi dać użytkownik, zanim otrzyma promocję na 2 poziom zaufania."
     tl2_requires_topic_reply_count: "Na ile tematów musi odpowiedzieć użytkownik, zanim otrzyma promocję na 2 poziom zaufania."
     tl3_time_period: "Wymagania 3. poziomu zaufania w czasie (w dniach)"
+    tl3_requires_days_visited: "Minimalna liczba dni, w których użytkownik powinien odwiedzić stronę w ostatnich (tl3 okres) dniach, aby zakwalifikować się do promocji na poziom zaufania 3. Ustaw większy czas niż tl3, aby wyłączyć awans na tl3. (0 lub większy)"
+    tl3_requires_topics_replied_to: "Minimalna liczba tematów, w których użytkownik musi odpowiedzieć w ostatnich (tl3 okres) dniach, aby zakwalifikować się do awansu na poziom zaufania 3. (0 lub większy)"
+    tl3_requires_topics_viewed: "Procent tematów utworzony w ostatnich (tl3 okres) dniach, które użytkownik musi zobaczyć, aby zakwalifikować się do awansu na poziom zaufania 3. ( od 0 do 100)"
+    tl3_requires_topics_viewed_cap: "Maksymalna liczba potrzebnych wyświetlonych tematów w ostatnich (tl3 okres) dniach."
+    tl3_requires_posts_read: "Procent postów utworzonych w ostatnich (tl3 okres) dniach, które użytkownik musi zobaczyć, aby zakwalifikować się do promocji na poziom zaufania 3. (0 do 100)"
+    tl3_requires_posts_read_cap: "Maksymalna liczba potrzebnych przeczytanych postów w ostatnich (tl3 okres) dniach."
+    tl3_requires_topics_viewed_all_time: "Minimalna całkowita liczba tematów, które użytkownik musi zobaczyć, aby zakwalifikować się na poziom zaufania 3."
     tl3_requires_posts_read_all_time: "Minimalna łączna ilość postów, które użytkownik musi przeczytać, aby kwalifikować się do trzeciego poziomu zaufania."
+    tl3_requires_max_flagged: "Użytkownik nie może mieć więcej niż x postów oflagowanych przez x różnych użytkowników w ostatnich (tl3 okres) dniach, aby zakwalifikować się do awansu na poziom zaufania 3, gdzie x jest wartością tych ustawień. (0 lub więcej)"
+    tl3_promotion_min_duration: "Minimalna liczba dni potrzebnych do promocji na poziom zaufania 3 przed tym, jak użytkownik może zostać cofnięty na 2 poziom zaufania."
+    tl3_requires_likes_given: "Minimalna liczba polubień, które muszą zostać rozdane w ostatnich (tl3 okres) dniach, aby zakwalifikować się do awansu na poziom zaufania 3."
+    tl3_requires_likes_received: "Minimalna liczba polubień, które użytkownik musi otrzymać w ostatnich (tl3 okres) dniach, aby zakwalifikować się do awansu na poziom zaufania 3."
     tl3_links_no_follow: "Nie usuwaj rel=nofollow z linków od użytkowników z trzecim poziomem zaufania."
     min_trust_to_create_topic: "The minimum trust level required to create a new topic."
     min_trust_to_edit_wiki_post: "Minimalny poziom zaufania wymagany do edycji posta oznaczonego jako wiki."
@@ -1094,8 +1195,12 @@ pl_PL:
     newuser_max_mentions_per_post: "Maksymalna liczba powiadomień poprzez @nazwę w jednym wpisie (dla nowych użytkowników)."
     newuser_max_replies_per_topic: "Maksymalna liczba odpowiedzi, jakie nowy użytkownik może dodać w pojedynczym temacie zanim ktoś odpowie."
     max_mentions_per_post: "Maksymalna liczba powiadomień poprzez @nazwę w jednym wpisie (dla wszystkich)."
+    max_users_notified_per_group_mention: "Maksymalna liczba użytkowników, którzy mogą otrzymać powiadomienie jeśli ktoś wspomniał o grupie (jeśli próg został osiągnięty, nie będzie żadnych powiadomień)"
+    create_thumbnails: "Stwórz miniatury i obrazy lightbox, które są za duże, aby pasować do postu."
     email_time_window_mins: "Odczekaj (n) minut przed wysłaniem maila z powiadomieniem, aby dać użytkownikom szansę na edytowanie i ukończenie postów."
     private_email_time_window_seconds: "Poczekaj (n) sekund przed wysłaniem jakichkolwiek prywatnych powiadomień emailem, by dać szansę użytkownikom na edycję i sfinalizowanie ich wiadomości."
+    email_posts_context: "Jak wiele poprzednich wiadomości zawrzeć jako kontekst i emailu powiadamiającym."
+    flush_timings_secs: "W sekundach, jak często wysyłamy dane czasowe na serwer."
     title_max_word_length: "Maksymalna dozwolona długość słowa, w znakach, jako tytuł tematu."
     title_min_entropy: "Minimalna entropia tytułu wątku (liczba różnych znaków, zaleca się więcej dla języków innych niż angielski)."
     body_min_entropy: "Minimalna entropia treści posta (liczba różnych znaków, zaleca się więcej dla języków innych niż angielski)."
@@ -1109,6 +1214,7 @@ pl_PL:
     max_image_size_kb: "Maksymalny rozmiar wgrywanego pliku graficznego w kB. Należy to także skonfigurować dla serwera nginx (client_max_body_size) / Apache lub dla proxy."
     max_attachment_size_kb: "Maksymalny rozmiar załącznika w kB. Należy to także skonfigurować dla serwera nginx (client_max_body_size) / Apache lub dla proxy."
     authorized_extensions: "Lista dozwolonych rozszerzeń plików (gwiazdka \"*\" oznacza wszystkie typy plików)"
+    theme_authorized_extensions: "Lista dozwolonych rozszerzeń plików dla przesyłania szablonów (gwiazdka \"*\" oznacza wszystkie typy plików)"
     max_similar_results: "Liczba podobnych wątków, jaka zostanie wyświetlona nad oknem edytora podczas tworzenia nowego wątku. Wątki są porównywane na podstawie tytułów i treści."
     max_image_megapixels: "Maksymalna rozdzielczość pliku graficznego w megapikselach."
     title_prettify: "Prevent common title typos and errors, including all caps, lowercase first character, multiple ! and ?, extra . at end, etc."
@@ -1127,22 +1233,66 @@ pl_PL:
     faq_url: "If you have a FAQ hosted elsewhere that you want to use, provide the full URL here."
     tos_url: "If you have a Terms of Service document hosted elsewhere that you want to use, provide the full URL here."
     privacy_policy_url: "If you have a Privacy Policy document hosted elsewhere that you want to use, provide the full URL here."
+    newuser_spam_host_threshold: "Jak wiele razy użytkownik może zamieścić link\" original-title=\"<span class=\"glossary-highlight\" title=\"link (click to copy)\" data-copy-glossary=\"link\"> link (click to copy)\">link do tego samego hosta wewnątrz postów `newuser_spam_host_threshold` przed rozważeniem spamu."
+    white_listed_spam_host_domains: "Lista domen wykluczonych z testowania pod kątem spamu. Nowi użytkownicy nigdy nie będą ograniczani w dodawaniu postów z linkami z tych domen."
     staff_like_weight: "O ile większą wagę mają mieć polubienia przyznawane przez członków zespołu?"
+    topic_view_duration_hours: "Licz wyświetlanie nowego tematu na IP/Użytkownika co N godzin"
+    user_profile_view_duration_hours: "Licz nowe wyświetlenia profilu użytkownika na IP/Użytkownika co N godzin"
+    levenshtein_distance_spammer_emails: "Przy dopasowywaniu emaili spamowych, różnica liczby znaków, która w dalszym ciągu pozwoli na przybliżone dopasowanie."
+    max_new_accounts_per_registration_ip: "Jeśli istnieję już (n) kont o poziomie zaufania 0 z tego adresu IP (i żaden nie jest z obsługi lub na TL2 lub wyżej), zatrzymaj akceptowanie nowych użytkowników z tego IP."
+    min_ban_entries_for_roll_up: "Podczas naciskania na przycisk Przewiń do góry, utwórz nowy wpis blokady podsieci jeśli jest co najmniej (N) wpisów."
+    max_age_unmatched_emails: "Usuń niedopasowany ekranowany wpis email po (N) dniach."
+    max_age_unmatched_ips: "Usuń niedopasowany ekranowany wpis IP po (N) dniach."
+    num_flaggers_to_close_topic: "Minimalna liczba unikalnych oflagowań, które są potrzebne aby automatycznie zatrzymać temat do czasu interwencji."
+    num_flags_to_close_topic: "Maksymalna liczba aktywnych oflagować, które są potrzebne, aby automatycznie zatrzymać temat do czasu interwencji."
+    num_hours_to_close_topic: "Liczba godzin zatrzymanie tematu dla interwencji."
+    auto_respond_to_flag_actions: "Włącz automatyczną odpowiedź, w czasie pozbywania się flagi."
+    min_first_post_typing_time: "Minimalny czas w milisekundach, w którym użytkownik musi napisać post, jeśli próg nie zostanie osiągnięty post zostanie automatycznie dostosowany w zależności od kolejki zatwierdzania potrzeb. Ustaw 0, aby wyłączyć (nie polecane)"
     reply_by_email_enabled: "Włącz możliwość odpowiadania na wpisy poprzez email."
     reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
+    alternative_reply_by_email_addresses: "Lista alternatywnych szablonów do odpowiedzi przez adres email. Przykład: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
+    incoming_email_prefer_html: "Używaj HTML zamiast tekstu dla emaili przychodzących."
     disable_emails: "Powstrzymaj Discourse przed wysyłaniem jakichkolwiek emaili."
+    strip_images_from_short_emails: "Pasek zdjęć z emaila o rozmiarze mniejszym niż 2800 bajtów"
     short_email_length: "Długość krótkiego emaila w bajtach"
+    display_name_on_email_from: "Wyświetl pełne nazwy na emailach z pól"
+    unsubscribe_via_email: "Pozwalaj użytkownikom na anulacja subskrypcji poprzez email, wysłanie wiadomośi o temacie lub treści \"Anuluj subskrypcje\""
+    unsubscribe_via_email_footer: "Dołącz anulacje subskrypcji poprzez email mailto:link do stopki wysłanego emaila"
     delete_email_logs_after_days: "Usuń logi email po (N) dniach. 0 by trzymać w nieskończoność"
     max_emails_per_day_per_user: "Maksymalna liczba maili, jakie użytkownik może wysłać w ciągu dnia. 0 wyłącza ograniczenie."
+    enable_staged_users: "Automatycznie twórz wystawianych użytkowników podczas przetwarzania przychodzących emaili."
+    maximum_staged_users_per_email: "Maksymalna liczba wystawionych  stworzonych użytkowników podczas przetwarzania przychodzących emaili."
     auto_generated_whitelist: "Lista adresów e-mail oddzielonych pipe'em (|), które nie będą testowane na zawartość treści generowanej automatycznie. Przykład: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Odrzucaj maile przychodzące zidentyfikowane jako wysłane automatycznie."
     ignore_by_title: "Ignoruj przychodzące wiadomości e-mail w oparciu o ich tytuł."
+    mailgun_api_key: "Klucz Mailgun Secret API używany do weryfikacji wiadomości webhook."
+    soft_bounce_score: "Wynik odrzucania dodany do użytkownika, gdy ma miejsce tymczasowe odrzucanie."
+    hard_bounce_score: "Wynik odrzucania dodany do użytkownika, gdy ma miejsce stałe odrzucanie."
+    bounce_score_threshold: "Maksymalny wynik odrzucania przed końcem wysyłania emaili do użytkownika."
+    bounce_score_threshold_deactivate: "Maksymalny wynik odrzucania przed dezaktywacją użytkownika."
+    reset_bounce_score_after_days: "Automatyczne resetuj licznik odrzucania po X dniach."
     attachment_content_type_blacklist: "Lista słów kluczowych do blokowania załączników w oparciu o typ zawartości."
     attachment_filename_blacklist: "Lista słów kluczowych do blokowania załączników w oparciu o nazwę pliku."
     enable_forwarded_emails: "[BETA] Zezwól użytkownikom zakładać wątki poprzez forwardowanie maili przychodzących."
+    always_show_trimmed_content: "Zawsze pokazuj przyciętą część przychodzących maili. Ostrzeżenie: może wyjawiać adresy email."
+    private_email: "Nie uwzględniaj zawartość z postów czy tematów w mailach dla zwiększenia prywatności."
+    manual_polling_enabled: "Wykorzystuj funkcję push emails za pomocą API dla odpowiedzi na email."
+    pop3_polling_enabled: "Ankieta poprzez POP3 dla odpowiedzi przez email."
     pop3_polling_ssl: "Używaj SSL podczas łączenia z serwerem POP3. (Rekomendowane)"
     pop3_polling_openssl_verify: "Sprawdź certyfikat TLS serwera (domyślnie: włączone)"
+    pop3_polling_period_mins: "Okres w minutach pomiędzy sprawdzeniem konta POP3 dla emaila. Pamiętaj: wymaga ponownego uruchomienia."
+    pop3_polling_port: "Port do przeglądania cyklicznego konta POP3."
+    pop3_polling_host: "Host do przeglądania cyklicznego emaila poprzez POP3."
+    pop3_polling_username: "Nazwa użytkownika dla konta POP3 do przeglądania cyklicznego emaila."
+    pop3_polling_password: "Hasło dla konta POP3 do przeglądania cyklicznego maila."
+    log_mail_processing_failures: "Zapisuj wszystkie błędy w przetwarzaniu emaili na http://yoursitename.com/logs"
+    email_in_min_trust: "Minimalny poziom zaufania, który musi posiadać użytkownik, aby móc dodawać nowe posty w tematach poprzez email."
+    email_prefix: "Etykieta używana w temacie emaili. Domyślnie będzie ustawiana jako \"tytuł\", w przypadku braku ustawienia."
+    email_site_title: "Tytuł strony używany jako nadawca emaili ze strony. Domyślnie ustawiony jako \"tytuł\", w przypadku braku ustawienia. Jeśli twój \"tytuł\" zawiera znaki, które nie są dozwolone przez ciągi znaków nadawcy emaila, użyj tego ustawienia."
+    find_related_post_with_key: "Używaj \"klucza odpowiedzi\" tylko po to, aby znaleźć post, na który odpowiadasz. Ostrzeżenie: Wyłączenie tej funkcji, pozwoli na personifikację użytkownika na podstawie adresu email."
+    minimum_topics_similar: "Jak wiele tematów musi istnieć przed proponowaniem podobnych tematów podczas tworzenia nowych tematów."
     relative_date_duration: "Liczba dni od wysłania wpisu gdy wyświetlana jest data relatywna (7d) zamiast absolutnej (20 Lut)."
+    delete_user_max_post_age: "Nie pozwalaj na usuwanie użytkowników których pierwszy post jest starszy niż (x) dni."
     delete_all_posts_max: "The maximum number of posts that can be deleted at once with the Delete All Posts button. If a user has more than this many posts, the posts cannot all be deleted at once and the user can't be deleted."
     email_editable: "Allow users to change their e-mail address after registration."
     logout_redirect: "Adres, na jaki użytkownik zostanie przekierowany po wylogowaniu (np. http://jakasstrona.pl/logout)"
@@ -1150,35 +1300,115 @@ pl_PL:
     allow_animated_avatars: "Zezwól na używanie animowanych plików GIF jako zdjęć profilowych. UWAGA: po zmianie tego ustawienia uruchom zadanie avatars:refresh rake."
     allow_animated_thumbnails: "Generowanie miniatur animowanych gifów."
     default_avatars: "Adresy URL awatarów wykorzystywanych jako domyślne w przypadku nowych użytkowników do momentu, gdy je zmienią."
+    automatically_download_gravatars: "Pobierz Gravatary dla użytkowników podczas tworzenia konta lub zmiany hasła."
     digest_topics: "Maksymalna liczba popularnych wątków wyświetlanych w podsumowaniu mailowym."
     digest_posts: "Maksymalna liczba popularnych postów wyświetlanych w podsumowaniu mailowym."
     digest_other_topics: "Maksymalna liczba wątków wyświetlanych w sekcji \"Śledzone wątki i kategorie\" podsumowania mailowego."
+    digest_min_excerpt_length: "Minimalny wycinek wpisu (liczba znaków) w podsumowaniu e-mail."
+    suppress_digest_email_after_days: "Znieś emaile podsumowujące dla użytkowników niewidocznych na stronie przez więcej niż (n) dni."
+    digest_suppress_categories: "Znieś te kategorie z emaili podsumowujących."
     disable_digest_emails: "Wyłącz podsumowania mailowe dla wszystkich użytkowników."
-    email_accent_bg_color: "Kolor wyróżniający używany jako tło niektórych elementów maili wysyłanych w trybie HTML. Wprowadź angielską nazwę koloru HTML (\"red\") lub wartość szesnastkową (\"#ff0000\")."
     email_accent_fg_color: "Kolor tekstu wyświetlanego na kolorowym tle w mailach wysyłanych w trybie HTML. Wprowadź angielską nazwę koloru HTML (\"white\") lub wartość szesnastkową (\"#ffffff\")."
     email_link_color: "Kolor linków w mailach wysyłanych w trybie HTML. Wprowadź angielską nazwę koloru HTML (\"blue\") lub wartość szesnastkową (\"#0000ff\")."
     detect_custom_avatars: "Czy sprawdzać, czy użytkownik wgrał własne zdjęcie profilowe?"
+    max_daily_gravatar_crawls: "Maksymalna liczba razy Discourse sprawdzi Gravatar w poszukiwaniu nowych niestandardowych avatorów w czasie jednego dnia"
+    public_user_custom_fields: "Biała lista pól niestandardowych dla użytkownika, które mogą być wyświetlane publicznie."
+    staff_user_custom_fields: "Biała lista niestandardowych pól dla użytkownika, które mogą być wyświetlane dla personelu."
+    enable_user_directory: "Dostarcz katalog użytkowników do wyszukiwania"
+    enable_group_directory: "Dostarcz katalog grup do wyszukiwania"
     allow_anonymous_posting: "Zezwól użytkownikom na przechodzenie w tryb anonimowości."
     anonymous_posting_min_trust_level: "Minimalny poziom zaufania potrzebny by aktywować anonimowe postowanie"
+    anonymous_account_duration_minutes: "Aby chronić anonimowość twórz nowe anonimowe konto co N minut dla każdego użytkownika. Przykład: jeśli ustawione na 600, dopóki nie minie 600 minut od ostatniego postu i użytkownik przełącza się na anon, zostanie utworzone nowe anonimowe konto."
+    hide_user_profiles_from_public: "Wyłącz karty, profile i katalogi użytkownika dla użytkownika anonimowego."
     user_website_domains_whitelist: "Lista domen (rozdzielone pipe'em \"|\"), względem których weryfikowana będzie strona internetowa użytkownika w profilu."
     allow_profile_backgrounds: "Zezwól użytkownikom na przesyłanie obrazu tła dla profilu."
     sequential_replies_threshold: "Liczba postów dodanych przez użytkownika jeden pod drugim w jednym wątku, po której zostanie on upomniany."
     get_a_room_threshold: "Liczba postów dodanych przez użytkownika w odpowiedzi na posty tej samej osoby w jednym wątku, po której zostanie on ostrzeżony."
     enable_mobile_theme: "Urządzenia mobilne używają dedykowanego mobilnego szablonu. Wyłącz to, jeśli chcesz użyć własnego, pojedynczego i responsywnego szablonu stylów. "
     dominating_topic_minimum_percent: "Odsetek (%) postów dodanych przez użytkownika w jednym wątku, po którym otrzyma on upomnienie, że nadmiernie go dominuje."
+    disable_avatar_education_message: "Wyłącz wiadomość edukacyjną dla zmiany avataru."
     suppress_uncategorized_badge: "Nie pokazuj etykiety z nazwą kategorii Inne na listach tematów."
+    permalink_normalizations: "Zastosuj następujący regex przed dopasowaniem permalinków, na przykład /(topic.*)\\?.*/\\1  spowoduje ściągnięcie ciągu zapytań z dróg tematu. Format to regex+strin używaj \\1 itd aby przechwycić dostęp"
+    global_notice: "Wyświetl PILNY, NAGŁY WYPADEK globalny baner, aby poinformować wszystkich gości, zmień na pusty, aby go ukryć (HTML dozwolony)."
+    disable_edit_notifications: "Wyłącz edytowanie powiadomień przez system użytkownika gdy 'download_remote_images_to_local' jest aktywne."
+    automatically_unpin_topics: "Automatycznie odpinaj wątki,  gdy użytkownik dotknie dna."
+    read_time_word_count: "Licznik słów na minutę dla kalkulacji szacowanego czasu czytania."
+    topic_page_title_includes_category: "Tytuł strony wątku zawiera nazwę kategorii."
+    native_app_install_banner: "Pytaj powtarzających się gości instalację aplikacji."
+    share_anonymized_statistics: "Udostępnij anonimowe statystyki użytkowania."
+    max_prints_per_hour_per_user: "Maksymalna liczba /drukowanych stron (ustaw na 0, aby wyłączyć)"
     full_name_required: "Pełne imię i nazwisko to wymagane pole w profilu użytkownika."
+    enable_names: "Pokaż pełną nazwę użytkownika na profilu, karcie użytkownika i w emailach. Wyłącz opcję ukrywania pełnej nazwy wszędzie."
     display_name_on_posts: "Pokazuj imię i nazwisko użytkownika przy jego postach, a także jego @nazwę użytkownika."
+    show_time_gap_days: "Jeśli dwa posty zostały dodane w dużej przerwie, wyświetl okres w temacie."
+    short_progress_text_threshold: "Po tym jak liczba postów w tym temacie przekroczy ten numer, ten pasek postępu pokaże tylko bieżącą liczbę postów. Jeśli zmienisz szerokość paska postępu, możliwe, że będziesz musiał zmienić tą wartość."
+    default_code_lang: "Domyślny język programowania syntax podświetlający zastosowany do bloków kodu GitHub (lang-auto, ruby, python etc.)"
+    warn_reviving_old_topic_age: "Kiedy ktoś rozpoczyna udziela odpowiedzi na dany temat, w którym ostatnia odpowiedź jest starsza niż tak wiele dni, wyświetlone zostanie ostrzeżenie. Wyłącz tą ustawienia ustawiając 0."
+    autohighlight_all_code: "Narzuć dodawanie podświetlenia kodu do wszystkich bloków kodu, w przypadku gdy nie jest dokładnie określony język."
+    highlighted_languages: "Uwzględniona reguły podświetlania syntax. (Ostrzeżenie: uwzględnianie zbyt wielu języków może mieć wpływ na działanie) zobacz demo: https://highlightjs.org/static/demo/"
+    embed_truncate: "Okrój osadzone posty."
+    allowed_href_schemes: "Projekty dozwolone w linkach jako dodatek do http i https."
+    embed_post_limit: "Maksymalna liczba postów do osadzenia."
+    embed_username_required: "W celu stworzenia tematu potrzebna jest nazwa użytkownika."
+    notify_about_flags_after: "Jeśli istnieją oflagowania, które nie zostały przejrzane po tylu godzinach, wyślij wiadomość prywatną do obsługi. Ustaw 0, aby wyłączyć."
+    show_create_topics_notice: "Jeśli na stronie jest mniej niż 5 publicznych tematów, pokaż powiadomienie proszące adminów, aby stworzyli nowe wątki."
+    delete_drafts_older_than_n_days: Usuń projekty starsze niż (n) dni.
+    bootstrap_mode_min_users: "Minimalna liczba użytkowników potrzebnych do wyłączenia trybu rozruchowego (ustaw 0, aby wyłączyć)"
+    prevent_anons_from_downloading_files: "Zapobiegaj pobieraniu załączników przez anonimowych użytkowników. Ostrzeżenie: wszystkie dodane załączniku nie będące obrazkami nie będą działały."
+    slug_generation_method: "Wybierz metodę tworzenia ślimaka. 'Zakodowane\" stworzy procentowy ciąg kodujący, \"żadne\" wyłączy tą metodę."
     enable_emoji: "Włącz obsługę emoji"
     emoji_set: "Jaki jest twój preferowany styl emoji?"
+    enforce_square_emoji: "Narzuć kwadratowy stosunek dla wszystkich emoji."
+    approve_post_count: "Liczba postów od nowego lub podstawowego użytkownika, które muszą zostać zatwierdzone"
     approve_unless_trust_level: "Posty użytkowników poniżej tego poziomu zaufania muszą być zatwierdzane"
+    approve_new_topics_unless_trust_level: "Nowe wątki dodawane przez użytkowników z poziomem zaufania poniżej muszą zostać zaakceptowane"
+    notify_about_queued_posts_after: "Jeśli są posty, które czekają na przejrzenie przez więcej niż tak wiele godzin, zostanie wysłany email do contact_email. Ustaw 0, aby wyłączyć te emaile."
+    auto_close_messages_post_count: "Maksymalna liczba postów dozwolonych w wiadomości przed automatycznym zamknięciem (0 aby wyłączyć)"
+    auto_close_topics_post_count: "Maksymalna liczba postów dozwolona w temacie przed automatycznym zamknięciem (0 aby wyłączyć)"
+    code_formatting_style: "Przycisk kodu w kompozytorze narzuci domyśl styl formatowania dla tego kodu"
+    max_allowed_message_recipients: "Maksymalna dozwolona liczba odbiorców dla wiadomości."
+    default_email_digest_frequency: "Domyślnie, jak często użytkownicy otrzymują emaile podsumowujące."
+    default_include_tl0_in_digests: "Domyślnie uwzględniaj posty od nowych użytkowników w podsumowaniach mailowych. Użytkownicy mogą dokonywać zmian w swoich ustawieniach."
+    default_email_private_messages: "Domyślnie wysyłaj email, gdy użytkownik otrzyma wiadomość."
+    default_email_direct: "Domyślnie wysyłaj email, gdy ktoś zacytuje/odpowie/wspomni lub zaprosi użytkownika."
+    default_email_mailing_list_mode: "Domyślnie wyślij email dla każdego nowego posta."
+    default_email_mailing_list_mode_frequency: "Domyślnie użytkownicy, którzy włączą tryb listy mailingowej będą otrzymywać emaile tak często."
+    disable_mailing_list_mode: "Nie pozwól użytkownikom na aktywacja trybu listy mailingowej."
+    default_email_always: "Domyślnie wysyłaj powiadomienie email nawet gdy użytkownik jest aktywny."
+    default_email_previous_replies: "Domyślnie uwzględniaj poprzednie odpowiedzi w emailach."
+    default_email_in_reply_to: "Domyślnie uwzględniaj fragment odpowiedzi do postu w emailu."
+    default_other_new_topic_duration_minutes: "Domyślny globalny warunek dla którego wątek uznawany jest za nowy."
+    default_other_auto_track_topics_after_msecs: "Domyślny globalny czas przed, którym wątek jest śledzony automatycznie."
+    default_other_notification_level_when_replying: "Globalny domyślny poziom powiadomienia, gdy użytkownik odpowie w temacie."
     default_other_external_links_in_new_tab: "Otwórz linki zewnętrzne w nowej karcie domyślnie."
+    default_other_enable_quoting: "Domyślnie zezwól na podświetlone cytowane odpowiedzi."
+    default_other_dynamic_favicon: "Domyślnie pokazuj liczbę nowych/zaktualizowanych tematów w ikonie przeglądarki."
+    default_other_disable_jump_reply: "Domyślnie nie przechodź do postów użytkowników po odpisaniu."
+    default_other_like_notification_frequency: "Domyślnie informuj użytkowników o polubieniach."
+    default_topics_automatic_unpin: "Domyślnie automatycznie odpinaj tematy, gdy użytkownik znajdzie na dole."
     default_categories_watching: "Lista kategorii obserwowanych domyślnie."
     default_categories_tracking: "Lista kategorii śledzonych domyślnie."
+    default_categories_muted: "Lista domyślnie wyciszonych kategorii."
+    default_categories_watching_first_post: "Lista kategorii, w której domyślnie każdy pierwszy post w wątku będzie obserwowany."
+    allow_user_api_keys: "Pozwól na generację kluczy API użytkownika."
+    allow_user_api_key_scopes: "Lista zakresów dozwolona dla kluczy API użytkownika."
+    max_api_keys_per_user: "Maksymalna liczba kluczy API użytkownika na użytkownika."
+    min_trust_level_for_user_api_key: "Poziom zaufania wymagany dla generacji kluczy API użytkownika."
+    allowed_user_api_auth_redirects: "Dozwolony URL dla przeadresowania autoryzacji dla klucz API użytkownika"
+    allowed_user_api_push_urls: "Dozwolone URLs dla serwera push do API użytkownika"
+    tagging_enabled: "Włączyć tagi w tematach?"
+    min_trust_to_create_tag: "Minimalny poziom zaufania potrzebny do stworzenia tagu."
+    max_tags_per_topic: "Maksymalna liczba tagów, które mogą zostać połączone z tematem."
+    max_tag_length: "Maksymalna liczba znaków, które mogą być użyte w tagu."
+    max_tag_search_results: "Podczas wyszukiwania tagów, maksymalna liczba rezultatów do wyświetlenia."
+    show_filter_by_tag: "Pokaż rozwinięcie aby filtrować listę tematów przez tag."
+    max_tags_in_filter_list: "Maksymalna liczba tagów do pokazania w rozwijanym filtrze. Pokazane będą najczęściej używane tagi."
     tags_sort_alphabetically: "Pokaż tagi w alfabetycznym porządku. Domyślne pokazywane są według popularności."
     tag_style: "Styl etykiet tagów"
     staff_tags: "Lista tagów może być zaakceptowana tylko przez moderatorów."
     min_trust_level_to_tag_topics: "Minimalny poziom zaufania wymagany do tagowania tematów"
+    suppress_overlapping_tags_in_list: "Jeśli tagi dopasowane są dokładnie do słów w tytule tematu, nie pokazuj tagu"
+    remove_muted_tags_from_latest: "Nie pokazuj tematów z tagiem z wyciszonymi tagami w ostatniej liście tematów."
     company_short_name: "Nazwa firmy (skrócona)"
     company_full_name: "Nazwa firmy (pełna)"
     company_domain: "Domena Organizacji"
@@ -1196,7 +1426,17 @@ pl_PL:
       invalid_string_min: "Musi być co najmniej %{min} znaków."
       invalid_string_max: "Musi być nie więcej niż %{max} znaków."
       invalid_reply_by_email_address: "Wartość musi zawierać '%{reply_key}' i musi być inna niż mail z powiadomieniem."
+      invalid_alternative_reply_by_email_addresses: "Wszystkie wartości muszą zawierać '%{reply_key}' i być inne niż w emailu powiadamiającym."
+      pop3_polling_host_is_empty: "Musisz ustawić 'pop3 polling host' przed włączeniem przeglądania cyklicznego POP3."
+      pop3_polling_username_is_empty: "Musisz ustawić 'pop3 polling username' przed włączeniem przeglądania cyklicznego POP3."
+      pop3_polling_password_is_empty: "Musisz ustawić 'pop3 polling password' przed włączeniem przeglądania cyklicznego POP3."
+      pop3_polling_authentication_failed: "Błąd autoryzacji POP3. Proszę zweryfikować swoje dane uwierzytelniające POP3."
+      reply_by_email_address_is_empty: "Musisz ustawić \"odpowiedz poprzez adres email' przed włączeniem odpowiedzi przez email."
+      email_polling_disabled: "Musisz włączyć manualne lub cykliczne przeglądanie POP3 przed włączeniem odpowiedzi przez email."
+      user_locale_not_enabled: "Musisz najpierw włączyć ''pozwól na ustawienia lokalne\" przed włączeniem tych ustawień."
       invalid_regex: "Wyrażenie regularne jest niepoprawne lub niedozwolone."
+      email_editable_enabled: "Musisz wyłączyć 'możliwość edycji emaili' przed włączeniem tych ustawień."
+      enable_sso_disabled: "Musisz najpierw włączyć \"włącz ss\" przed aktywacją tych ustawień."
   search:
     within_post: "#%{post_number} przez %{username}"
     types:
@@ -1204,10 +1444,13 @@ pl_PL:
       topic: 'Wyniki'
       user: 'Użytkownicy'
   sso:
+    login_error: "Błąd logowania"
     not_found: "Nie znaleziono takiego konta. Skontaktuj się z administratorem."
     account_not_approved: "Twoje konto oczekuje na zatwierdzenie. Gdy konto zostanie zatwierdzone, otrzymasz powiadomienie mailowe."
     unknown_error: "Z twoim kontem jest problem. Skontaktuj się z administratorem."
     timeout_expired: "Upłynął maksymalny czas logowania. Spróbuj ponownie."
+    no_email: "Żaden adres email nie został podany. Proszę skontaktować się z administratorem strony."
+    email_error: "Konto nie mogło zostać zarejestrowane przy użyciu tego adresu email <b>%{email}</b>. Proszę skontaktować się z administratorem strony."
   original_poster: "Autor pierwszego wpisu"
   most_posts: "Większość postów"
   most_recent_poster: "Autor najnowszego wpisu"
@@ -1291,11 +1534,13 @@ pl_PL:
     pinned_globally_disabled: "Temat został odpięty. Już nie będzie wyświetlany na górze swojej kategorii."
     visible_enabled: "Temat jest ponownie widoczny i będzie pojawiać się na listach tematów."
     visible_disabled: "Ten temat został ustawiony jako niewidoczny. Nie pojawi się na żadnej liście tematów. Aby go wyświetlić wymagana będzie znajomość linku bezpośredniego."
+    auto_deleted_by_timer: "Automatycznie usunięte przez regulator czasowy."
   login:
     not_approved: "Twoje konto nie zostało jeszcze aktywowane. Zostaniesz powiadomiony emailem gdy będziesz mógł się zalogować."
     incorrect_username_email_or_password: "Niepoprawna nazwa użytkownika, email lub hasło"
     wait_approval: "Dziękujemy za rejestrację. Powiadomimy Cię gdy Twoje konto zostanie aktywowane."
     active: "Twoje konto zostało aktywowane i jest gotowe do użycia."
+    activate_email: "<p>Już prawie koniec! Wysłaliśmy email aktywacyjny na <b>%{email}</b>.  Postępuj zgodnie z instrukcjami w mailu, aby aktywować konto. </p><p>Jeśli email nie przyszedł, sprawdź folder spam.</p>"
     not_activated: "Nie możesz się jeszcze zalogować. Wysłaliśmy do Ciebie email aktywacyjny. Wykonaj instrukcje w nim zawarte by aktywować Twoje konto."
     not_allowed_from_ip_address: "Nie możesz się zalogować jako %{username} z tego adresu IP."
     admin_not_allowed_from_ip_address: "Nie możesz zalogować się jako administrator z tego adresu IP."
@@ -1312,14 +1557,18 @@ pl_PL:
     email_too_long: "Podałeś zbyt długi adres email. Nazwa skrzynki pocztowej nie może być dłuższa niż 254 znaki, a nazwa domeny nie może zawierać więcej niż 253 znaki."
     reserved_username: "Niedozwolona nazwa użytkownika."
     missing_user_field: "Nie wypełniłeś wszystkich pól użytkownika"
-    close_window: "Uwierzytelnianie zakończone. Aby kontynuować, zamknij to okno."
+    click_to_continue: "Kliknij tutaj aby kontynuować."
     already_logged_in: "Próbujesz zaakceptować zaproszenie przeznaczone dla innego użytkownika. Jeśli %{current_user} to nie ty, wyloguj się i zaloguj ponownie."
   user:
     no_accounts_associated: "Brak powiązanych kont"
+    deactivated: "Został dezaktywowany w związku ze zbyt dużą liczbą odrzuconych emaili na '%{email}'."
+    deactivated_by_staff: "Wyłączone przez personel"
+    activated_by_staff: "Aktywowane przez personel"
+    new_user_typed_too_fast: "Nowy użytkownik wpisany zbyt szybko"
+    content_matches_auto_block_regex: "Zawartość pasuje do automatycznej blokady regex"
     username:
       short: "musi zawierać co najmniej %{min} znaków"
       long: "nie może zawierać więcej niż %{max} znaków"
-      characters: "może zawierać tylko litery, cyfry i podkreślenia"
       unique: "musi być unikalna"
       blank: "musi zostać podana"
       must_begin_with_alphanumeric_or_underscore: "musi zaczynać się literą, cyfrą lub znakiem podkreślenia"
@@ -1342,74 +1591,61 @@ pl_PL:
       many: "%{count} flagi oczekują na reakcję"
       other: "%{count} flagi oczekują na reakcję"
   unsubscribe_mailer:
+    title: "Unsubscribe Mailer"
     subject_template: "Potwierdź, że nie chcesz już otrzymywać powiadomień mailowych ze strony %{site_title}"
+    text_body_template: |
+      Ktoś (może ty?) zażądał, by strona %{site_domain_name} nie wysyłała już powiadomień mailowych na ten adres.
+      Jeśli to potwierdzasz, kliknij w ten link:
+
+      %{confirm_unsubscribe_link}
+
+
+      Jeśli nadal chcesz otrzymywać powiadomienia mailowe, po prostu zignoruj ten mail.
   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}
+    title: "Zaproś mailera"
   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}
+    title: "Niestandardowe zaproszenie mailera"
   invite_forum_mailer:
-    subject_template: "%{invitee_name} zaprosił cię do dołączenia do %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} zaprosił cię, byś dołączył do serwisu
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      Jeśli jesteś zainteresowany, kliknij w link:
-
-      %{invite_link}
+    title: "Zaproś forum mailera"
   custom_invite_forum_mailer:
-    subject_template: "%{invitee_name} zaprosił cię, byś dołączył do serwisu %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} zaprosił cię, byś dołączył do serwisu
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      Informacja od zapraszającego:
-
-      > %{user_custom_message}
-
-      Jeśli jesteś zainteresowany, kliknij w link:
-
-      %{invite_link}
+    title: "Niestandardowe zaproszenie forum mailera"
   invite_password_instructions:
+    title: "Zaproś hasło instrukcje"
     subject_template: "Ustaw hasło dla swojego konta na %{site_name}"
+    text_body_template: |+
+      Dziękujemy za zaakceptowanie zaproszenia do %{site_name} -- witamy!
+
+
+
+      Kliknij ten link, by wybrać hasło:
+
+      %{base_url}/u/password-reset/%{email_token}
+
+
+
+      (Jeśli powyższy link wygasł, wybierz "Zapomniałem hasła", logując się za pomocą adresu email.)
+
+  download_backup_mailer:
+    title: "Ściągnij backup mailer"
+    subject_template: "[%{email_prefix}] Ściągnij backup strony"
+    text_body_template: |
+      Tutaj jest [strona ściągania backupu](%{backup_file_path}), o którą prosiłeś.
+
+      Ze względów bezpieczeństwa wysłaliśmy link do ściągnięcia na twój potwierdzony adres email .
+
+      (Jeśli nie prosiłeś o ten link, powinieneś być poważnie zaniepokojony - ktoś ma dostęp admina do twojej strony).
+    no_token: |
+      Przepraszamy, ten link do pobrania backupu został wcześniej użyty lub wygasł.
+  admin_confirmation_mailer:
+    title: "Potwierdzenie admina"
+    subject_template: "[%{email_prefix}] Potwierdź nowe konto admina"
+    text_body_template: |
+      Proszę potwierdzić dodanie **%{target_username}**  jako administratora do twojego forum.
+
+      [Potwierdź Konto Administratora](%{admin_confirm_url})
   test_mailer:
+    title: "Test Powiadomień"
+    subject_template: "[%{site_name}] Test dostarczania poczty"
     text_body_template: |
       To testowy mail z serwisu:
 
@@ -1452,38 +1688,11 @@ pl_PL:
       [mj]: https://www.mailjet.com/pricing
       [mt]: http://www.mail-tester.com/
   new_version_mailer:
-    text_body_template: |
-      Pojawiła się nowa wersja [Discourse](http://www.discourse.org)!
-
-      Używasz wersji %{installed_version}
-      Nowa wersja to **%{new_version}**
-
-      - Dokonaj aktualizacji *[jednym kliknięciem przez przeglądarkę](%{base_url}/admin/upgrade)**
-
-      - Zobacz, co nowego, w [naszym changelogu na GitHubie](https://github.com/discourse/discourse/commits/master)
-
-      - Sprawdź najnowsze informacje, weź udział w dyskusji lub skorzystaj z wsparcia technicznego Discourse na stronie [meta.discourse.org](https://meta.discourse.org)
+    title: "Nowa wersja powiadomień"
+    subject_template: "[%{site_name}] Aktualizacja do nowej wersji Discourse jest dostępna."
   new_version_mailer_with_notes:
-    text_body_template: |
-      Pojawiła się nowa wersja [Discourse](http://www.discourse.org)!
-
-      Używasz wersji %{installed_version}
-      Nowa wersja to **%{new_version}**
-
-      - Dokonaj aktualizacji *[jednym kliknięciem przez przeglądarkę](%{base_url}/admin/upgrade)**
-
-      - Zobacz, co nowego, w [naszym changelogu na GitHubie](https://github.com/discourse/discourse/commits/master)
-
-      - Sprawdź najnowsze informacje, weź udział w dyskusji lub skorzystaj z wsparcia technicznego Discourse na stronie [meta.discourse.org](https://meta.discourse.org)
-
-      ### Release notes
-
-      %{notes}
-  queued_posts_reminder:
-    text_body_template: |
-      Witaj,
-
-      Posty od nowych użytkowników zostały przekazane do moderacji i oczekują na przejrzenie. [Zatwierdź lub odrzuć je tutaj](%{base_url}/queued-posts).
+    title: "Nowa wersja powiadomień z uwagami"
+    subject_template: "[%{site_name}] dostępna aktualizacja"
   flag_reasons:
     off_topic: "Twój post został oznaczony jako **nie na temat**: społeczność uważa, że nie pasuje do wątku, w którym został dodany, biorąc pod uwagę jego tytuł i treść pierwszego posta."
     inappropriate: "Twój wpis został oznaczony jako  **nieodpowiedni**: społeczność uznała, że zbyt agresywny lub niezgodny z [jej wytycznymi](/guidelines)."
@@ -1496,22 +1705,16 @@ pl_PL:
     deferred: "Dziękujemy za zwrócenie uwagi. Zajmiemy się tym wkrótce."
     deferred_and_deleted: "Dziękujemy za zwrócenie uwagi. Wpis został usunięty."
   system_messages:
+    private_topic_title: "Temat#%{id}"
+    contents_hidden: "Proszę przejść do posta, aby wyświetlić jego zawartość."
     post_hidden:
       title: "Ukryty post"
+      subject_template: "Wpis został ukryty z powodu oflagowania przez społeczność"
+    usage_tips:
       text_body_template: |
-        Witaj,
+        Dla kilku szybkich wskazówek dotyczących rozpoczęcia użytkowania strony dla nowych użytkowników [sprawdź ten blog] (https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
 
-        To automatyczna wiadomość z serwisu %{site_name}, którą wysłaliśmy, by poinformować cię, że twój post został ukryty.
-
-        %{base_url}%{url}
-
-        %{flag_reason}
-
-        Wielu członków społeczności oflagowało go zanim został ukryty. Pomyśl, jak mógłbyś go poprawić to, co im się nie podobało. **Po upływie %{edit_delay} będziesz mógł zmienić jego treść, wtedy zostanie on automatycznie odkryty.**
-
-        Pamiętaj jednak, że jeśli post zostanie ukryty po raz kolejny, pozostanie on ukryty do momentu, gdy sprawdzą go nasi moderatorzy. Podejmą oni dalsze kroki, włączając w to nawet możliwość zawieszenia twojego konta.
-
-        Więcej dowiesz się czytając [zasady naszej społeczności](%{base_url}/guidelines).
+        Jeśli będziesz się udzielał, poznamy ciebie i zniesiemy tymczasowe ograniczenia dla nowych użytkowników. Z biegiem czasu uzyskasz [poziomy zaufania] (https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), które zawierają specjalne zdolności, aby pomóc nam zarządzać naszą społecznością.
     welcome_user:
       title: "Witaj Użytkowniku"
       subject_template: "Witaj na %{site_name}!"
@@ -1526,6 +1729,24 @@ pl_PL:
     welcome_invite:
       title: "Zaproszenie powitalne"
       subject_template: "Witaj na %{site_name}!"
+      text_body_template: |
+        Dziękujemy za przyjęcie zaproszenia do %{site_name} – witamy!
+
+        Twoja automatycznie wygenerowana nazwa użytkownika: **%{username}**. Możesz ją zmienić w każdej chwili w [swoich ustawieniach][prefs].
+
+        Aby zalogować się:
+
+        A) Zaloguj się przyciskiem logowania przez zewnętrzny serwis. Pamiętaj, aby podpięty pod wybrany serwis adres e-mail **był taki sam** jak ten na który dostałeś swoje zaproszenie. W przeciwnym wypadku nie będziemy mogli stwierdzić, że ty to Ty!
+
+        B) Stwórz unikalne hasło w [swoich ustawieniach][prefs] i zaloguj się przy jego pomocy.
+
+        %{new_user_tips}
+
+        Wierzymy w [cywilizowane zachowanie](%{base_url}/guidelines) jako podstawę naszej społeczności.
+
+        Miłego uczestnictwa!
+
+        [prefs]: %{user_preferences_url}
     backup_succeeded:
       title: "Kopia zapasowa została utworzona "
       subject_template: "Kopia zapasowa jest gotowa"
@@ -1579,6 +1800,16 @@ pl_PL:
     bulk_invite_failed:
       title: "Zaproszenia hurtowe Nieudane"
       subject_template: "Plik z zaproszeniami został przetworzony z błędami."
+      text_body_template: |+
+        Plik z zaproszeniami został przetworzony -- wysłanych: %{sent}, błędów: %{failed}.
+
+        Dziennik operacji:
+
+        ```
+        %{logs}
+        ```
+
+
     csv_export_succeeded:
       title: "Eksport CSV udany "
       subject_template: "Zakończono eksport danych"
@@ -1594,51 +1825,191 @@ pl_PL:
       title: "Eksport CSV nieudany "
       subject_template: "Nieudany eksport danych"
       text_body_template: "Przepraszamy, ale eksport danych zakończył się niepowodzeniem. Sprawdź logi lub skontaktuj się z operatorami serwisu."
+    email_reject_insufficient_trust_level:
+      title: "Odrzucenie emaila niedostateczny poziom zaufania"
+      subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną - niewystarczający poziom zaufania"
+      text_body_template: |
+        Przepraszamy, ale twoja wiadomość email do %{destination} (zatytułowana %{former_title}) nie została wysłana.
+        Twoja konto nie posiada wystarczających uprawnień do zamieszczania postów w nowych tematach poprzez ten adres. Jeśli wydaję ci się, że jest to błąd, [skontaktuj się z obsługą](%{base_url}/o nas).
     email_reject_user_not_found:
       title: "Email odrzucony Użytkownik nie odnaleziony"
+      subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną - Użytkownik nie znaleziony"
+      text_body_template: |
+        Przepraszamy, ale twoja wiadomość email do %{destination} (zatytułowana %{former_title}) nie została wysłana.
+
+        Twoja odpowiedź została wysłana z nieznanego adresu email. Spróbuj wysłać wiadomość z innego adresu email lub [skontaktuj się z obsługą](%{base_url}/about).
+    email_reject_screened_email:
+      title: "Odrzucenie emaila ekranowany email"
+      subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną - zablokowany email"
+      text_body_template: |+
+        Przepraszamy, ale twoja wiadomość email do %{destination}(zatytułowana %{former_title}) nie została wysłana.
+
+        Twoja odpowiedź została wysłana z zablokowanego adresu email. Spróbuj ją wysłać z innego adresu email, lub [skontaktuj się z obsługą] %{base_url}/o nas).
+
     email_reject_inactive_user:
       title: "Email odrzucony Użytkownik nieaktywny"
-    email_reject_blocked_user:
-      title: "Email odrzucony Użytkownik zablokowany"
+      subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną - nieaktywny użytkownik"
+      text_body_template: |
+        Przepraszamy, ale twoja wiadomość email do %{destination}(zatytułowana %{former_title}) nie została wysłana.
+
+        Twoja konto powiązane z tym adresem email nie jest aktywne. Proszę aktywować konto przed wysyłaniem emaili.
     email_reject_reply_user_not_matching:
       title: "Email odrzucony Użytkownik nie pasuje"
+      subject_template: "[%{email_prefix}] Problem z pocztą - Nieoczekiwany adres odpowiedzi"
+      text_body_template: |
+        Przepraszamy, ale twoja wiadomość email do %{destination}(zatytułowana %{former_title}) nie została wysłana.
+
+        Twoja odpowiedź została wysłana z innego adresu email niż się spodziewaliśmy. Nie jesteśmy pewni czy jest to ta sama osoba, spróbuj wysłać wiadomość z innego adresu email lub [skontaktuj się z obsługą] %{base_url}/about).
     email_reject_no_account:
       title: "Email odrzucony Brak konta"
+      subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną - Nieznane Konto"
+      text_body_template: |
+        Przepraszamy, ale twoja wiadomość email do %{destination}(zatytułowana %{former_title}) nie została wysłana.
+
+        Nie możemy znaleźć kont, które pasują do tego adresu email. Spróbuj wysłać wiadomość z innego adresu email, lub [skontaktuj się z obsługą] %{base_url}/about).
     email_reject_empty:
       title: "Email odrzucony Pusty"
+      subject_template: "[%{email_prefix}]email\" original-title=\"<span class=\"glossary-highlight\" title=\"email (click to copy)\" data-copy-glossary=\"email\">email (click to copy)\"> Problem z pocztą elektroniczną - brak zawartości"
+      text_body_template: |
+        Przepraszamy, ale twoja wiadomość email do %{destination}(zatytułowana %{former_title}) nie została wysłana.
+
+        Nie znaleźliśmy żadnej zawartości w twoim emailu.
+
+        Jeśli otrzymałeś tą wiadomość, a dodałeś zawartość do odpowiedzi, spróbuj ponownie z prostszym formatowaniem.
+    email_reject_parsing:
+      title: "Odrzucenie emaila Rozbiór gramatyczny zdania"
+      subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną - Nierozpoznana zawartość"
+      text_body_template: |
+        Przepraszamy, ale twoja wiadomość email do %{destination}(zatytułowana %{former_title}) nie została wysłana.
+
+        Nie mogliśmy znaleźć twojej odpowiedzi w emailu. ** Upewnij się, że twoja odpowiedzieć jest na wierzchu emaila** - nie możemy przetworzyć wewnętrznych odpowiedzi
     email_reject_invalid_access:
       title: "Email odrzucony Nieprawidłowy dostęp"
+      subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną - nieprawidłowy dostęp"
+      text_body_template: |
+        Przepraszamy, ale twoja wiadomość email do %{destination}(zatytułowana %{former_title}) nie została wysłana.
+
+        Twoje konto nie ma przywilejów , aby dodać nowe wątki w tej kategorii. Jeśli wydaje ci się, że jest to błąd, [skontaktuj się z obsługą](%{base_url}/about).
+    email_reject_strangers_not_allowed:
+      title: "Odrzucenie emaila Nieznajomi niedozwoleni"
+      subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną - nieprawidłowy dostęp"
+      text_body_template: |
+        Przepraszamy, ale twoja wiadomość email do %{destination}(zatytułowana %{former_title}) nie została wysłana.
+
+        Kategoria, do której został wysłany ten email pozwala jedynie na odpowiedzi od użytkowników z ważnymi kontami i znanymi adresami email. Jeśli wydaje ci się, że jest to błąd [skontaktuj się z obsługą](%{base_url}/about).
+    email_reject_invalid_post:
+      title: "Odrzucenia emaila niewłaściwy post"
+      subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną - błąd dodawania"
+      text_body_template: |
+        Przepraszamy, ale twoja wiadomość email do %{destination}(zatytułowana %{former_title}) nie została wysłana.
+
+        Niektóre możliwe przyczyny: złożone formowanie, zbyt długa wiadomość, zbyt krótka wiadomość. Prosimy spróbuj ponownie lub dodaj post przez przeglądarkę, jeśli problem będzie się powtarzał.
+    email_reject_invalid_post_specified:
+      title: "Odrzucenie emaila nieprawidłowy wpis"
+      subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną - błąd dodawania"
+      text_body_template: |
+        Przepraszamy, ale twoja wiadomość email do %{destination}(zatytułowana %{former_title}) nie została wysłana.
+
+        Przyczyna:
+
+        %{post_error}
+
+        Jeśli możesz poprawić ten błąd, spróbuj ponownie.
+    email_reject_invalid_post_action:
+      title: "Email odrzucony nieprawidłowy post akcja"
+      subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną - nieprawidłowa akcja postu"
+      text_body_template: |
+        Przepraszamy, ale twoja wiadomość email do %{destination}(zatytułowana %{former_title}) nie została wysłana.
+
+        Akcja dotycząca postu nie została rozpoznana. Prosimy spróbować ponownie lub dodać wiadomość poprzez stronę internetową, jeśli problem będzie się powtarzał.
+    email_reject_reply_key:
+      title: "Odrzucony email klawisz odpowiedzi"
+      subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną - Nieznany klucz odpowiedzi"
+      text_body_template: |
+        Przepraszamy, ale twoja wiadomość email do %{destination}(zatytułowana %{former_title}) nie została wysłana.
+
+        Klucz odpowiedzi w tym emailu jest nieprawidłowy lub nieznany, nie możemy dowiedzieć się odpowiedzią na co jest ten email. [skontaktuj się z obsługą] (%{base_url}/o nas).
+    email_reject_bad_destination_address:
+      title: "Odrzucony email zły adres docelowy"
+      subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną -- Nieznany: adres"
+    email_reject_topic_not_found:
+      title: "Odrzucenie emaila nie znaleziono tematu"
+      subject_template: "[%{site_name}] Problem z mailem -- Temat Nieznaleziony "
+      text_body_template: |
+        Przepraszamy, twoja wiadomość email do%{destination}( zatytułowana %{former_title}) nie została wysłana.
+
+        Dany temat przestał istnieć - możliwe, że został usunięty? Jeśli wydaje ci się, że jest to błąd, [skontaktuj się obsługą] (%{base_url})/o nas).
     email_reject_topic_closed:
       title: "Email odrzucony Temat zamknięty"
+      subject_template: "[%{site_name}] Problem z mailem -- Temat Zamknięty"
+      text_body_template: |
+        Przepraszamy, twoja wiadomość email do%{destination}( zatytułowana %{former_title}) nie została wysłana.
+
+        Temat, w którym dokonujesz odpowiedzi jest obecnie zamknięty i nie można dodawać nowych komentarzy. Jeśli wydaję ci się, że jest to błąd, [skontaktuj się z obsługą](%{base_url}/o nas).
+    email_reject_auto_generated:
+      title: "Odrzucenie email wygenerowane automatycznie"
+      subject_template: "[%{site_name}] Problem z mailem -- Odpowiedź Wygenerowana Automatycznie "
+      text_body_template: |
+        Przepraszamy, twoja wiadomość email do%{destination}( zatytułowana %{former_title}) nie została wysłana.
+
+        Twój email został oznaczony jako "wygenerowany automatycznie", co oznacza, że został automatycznie stworzony przez komputer,  zamiast wpisany przez człowieka; nie akceptujemy tego typu emaili. Jeśli wydaję ci się, że jest to błąd, [skontaktuj się z obsługą](%{base_url})/o nas).
+    email_reject_unrecognized_error:
+      title: "Odrzucony email nierozpoznany błąd"
+      subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną - Nierozpoznany błąd."
+      text_body_template: |
+        Przepraszamy, ale twoja wiadomość email do %{destination}(zatytułowana %{former_title}) nie została wysłana.
+
+        Wykryto nierozpoznany błąd podczas przetwarzania twojego emaila i nie został opublikowany. Powinieneś spróbować ponownie lub [skontaktować się z obsługą](%{base_url}/o nas).
+    email_error_notification:
+      title: "Błąd emaila powiadomienie"
+      subject_template: "[%{email_prefix}] Problem z pocztą elektroniczną - błąd autoryzacji POP"
+      text_body_template: |
+        Niestety, wystąpił błąd autoryzacji podczas odbierania maili z serwera POP.
+
+        Proszę upewnij się, że prawidłowo skonfigurowałeś referencje POP na [strona ustawień](%{base_url}/admin/strona_ustawień/kategoria/email).
+
+        Jeśli istnieję UI dla konta email POP, możesz potrzebować zalogować się na stronie i sprawdzić tam ustawienia.
     too_many_spam_flags:
+      title: "Zbyt wiele spamowych flag."
       subject_template: "Nowe konto zawieszone"
     too_many_tl3_flags:
+      title: "Zbyt wiele flag TL3"
       subject_template: "Nowe konto zawieszone"
-    blocked_by_staff:
-      title: "Zablokowany prze moderatora"
-      subject_template: "Konto tymczasowo zawieszone"
-    user_automatically_blocked:
-      title: "Użytkownik Zablokowany Automatycznie"
-    spam_post_blocked:
-      title: "Spam Zablokowany"
-    unblocked:
-      title: "Odblokowany"
     pending_users_reminder:
+      title: "Oczekujący użytkownicy przypomnienie"
       subject_template:
         one: "1 użytkownik czeka na zatwierdzenie"
         few: "%{count} użytkowników czeka na zatwierdzenie"
         many: "%{count} użytkowników czeka na zatwierdzenie"
         other: "%{count} użytkowników czeka na zatwierdzenie"
+      text_body_template: |+
+        Są nowi zarejestrowani użytkownicy, oczekujący na zaakceptowanie (lub odrzucenie) przed rozpoczęciem użytkowania forum.
+
+        [Proszę przejrzeć to w sekcji admina](%{base_url}/admin/users/list/pending).
+
     download_remote_images_disabled:
       title: "Pobieranie Zdalne Obrazów Wyłączone"
       subject_template: "Pobieranie zdalne obrazów wyłączone"
+      text_body_template: "Ustawienie `download_remote_images_to_local` zostało dezaktywowane ponieważ został osiągnięty limit miejsca na dysku `download_remote_images_threshold`."
     dashboard_problems:
+      title: "Problemy tablicy"
       subject_template: "Znaleziono problemy "
+      text_body_template: |
+        Pojawiły się problemy w twojej tablicy admina.
+
+        [Proszę przejrzeć i naprawić powstałe problemy](%{base_url}/admin).
+    new_user_of_the_month:
+      title: "Jesteś nowym użytkownikiem miesiąca!"
+      subject_template: "Jesteś nowym użytkownikiem miesiąca!"
   unsubscribe_link: |
     Aby zrezygnować z otrzymywania tych wiadomości e-mail, [Kliknij tutaj](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |+
     Aby zrezygnować z otrzymywania tych wiadomości e-mail, [Kliknij tutaj](%{unsubscribe_url}).
 
+  unsubscribe_mailing_list: |
+    Otrzymujesz tą wiadomość, ponieważ włączyłeś tryb listy mailingowej.
+
+    Aby zrezygnować z tych maili, [naciśnij tutaj](%{unsubscribe_url}).
   subject_re: "Re: "
   subject_pm: "[PW] "
   user_notifications:
@@ -1672,8 +2043,18 @@ pl_PL:
       w
 
       > %{site_title} -- %{site_description}
+    user_invited_to_private_message_pm_group:
+      title: "Użytkownik zaproszony grupy do PM"
+      subject_template: "[%{email_prefix}]%{username} zaprosił @%{group_name} do wiadomości '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
     user_invited_to_private_message_pm:
       title: "Użytkownik zaprosił do PW"
+      subject_template: "[%{email_prefix}]%{username} zaprosił cię do wiadomości '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -1681,6 +2062,8 @@ pl_PL:
 
         %{respond_instructions}
     user_invited_to_private_message_pm_staged:
+      title: "Użytkownik zaproszony do stopniowego PM"
+      subject_template: "[%{site_name}] %{username} zaprasza cie do wiadomości '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -1689,6 +2072,7 @@ pl_PL:
         %{respond_instructions}
     user_invited_to_topic:
       title: "Użytkownik zaprosił do Tematu"
+      subject_template: "[%{site_name}] %{username} zaprasił cie do '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -1697,6 +2081,7 @@ pl_PL:
         %{respond_instructions}
     user_replied:
       title: "Użytkownik odpowiedział"
+      subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1707,6 +2092,7 @@ pl_PL:
         %{respond_instructions}
     user_replied_pm:
       title: "Użytkownik odpowiedział przez PW"
+      subject_template: "[%{site_name}] [PW] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1717,6 +2103,7 @@ pl_PL:
         %{respond_instructions}
     user_quoted:
       title: "Użytkownik Zacytował"
+      subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1727,6 +2114,7 @@ pl_PL:
         %{respond_instructions}
     user_linked:
       title: "Użytkownik podał link"
+      subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1737,6 +2125,7 @@ pl_PL:
         %{respond_instructions}
     user_mentioned:
       title: "Użytkownik Wspomniany"
+      subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1747,6 +2136,7 @@ pl_PL:
         %{respond_instructions}
     user_group_mentioned:
       title: "Grupa Użytkowników Wspomniana"
+      subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1757,6 +2147,7 @@ pl_PL:
         %{respond_instructions}
     user_posted:
       title: "Użytkownik Opublikował"
+      subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1767,6 +2158,7 @@ pl_PL:
         %{respond_instructions}
     user_watching_first_post:
       title: "Użytkownik Pregląda pierwszy post"
+      subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1777,6 +2169,7 @@ pl_PL:
         %{respond_instructions}
     user_posted_pm:
       title: "Użytkownik Napisał PM"
+      subject_template: "[%{site_name}] [PW] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1786,11 +2179,13 @@ pl_PL:
 
         %{respond_instructions}
     user_posted_pm_staged:
+      title: "Użytkownik dodał stopniowe PM"
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
         %{message}
     digest:
+      why: "Krótkie podsumowanie aktywności na %{site_link} od twojej ostatniej wizyty w dniu %{last_seen_at}."
       since_last_visit: "Od twojej ostatniej wizyty"
       new_topics: "Nowe tematy"
       unread_messages: "Nieprzeczytane Wiadomości"
@@ -1809,25 +2204,95 @@ pl_PL:
       preheader: "Podsumowanie aktywności od Twojej ostatniej wizyty w dniu %{last_seen_at}"
     forgot_password:
       title: "Zapomniane hasło"
+      subject_template: "[%{site_name}] Reset hasła"
+      text_body_template: |
+        Ktoś poprosił o zresetowanie Twojego hasła na [%{site_name}](%{base_url}).
+
+        Jeśli to nie Ty, możesz bezpiecznie zignorować tę wiadomość.
+
+        Kliknij na poniższy link by wybrać nowe hasło:
+        %{base_url}/users/password-reset/%{email_token}
     set_password:
       title: "Ustaw hasło"
+      subject_template: "[%{site_name}] Ustaw hasło"
+      text_body_template: |
+        Ktoś poprosił o dodanie hasła do twojego konta [%{site_name}](%{base_url}). Możesz się zalogować przy pomocy konta w i innym serwisie (Google, Facebook, itd.) które zostało powiązane z twoim potwierdzonym adresem email.
+
+        Jeśli to nie była twoja prośba, możesz zignorować tą wiadomość.
+
+        Kliknij odnośnik poniżej by ustawić hasło:
+        %{base_url}/u/password-reset/%{email_token}
     admin_login:
       title: "Logowanie administratora. "
+      subject_template: "[%{site_name}] Login"
+      text_body_template: |
+        Ktoś próbował się zalogować na twoje konto [%{site_name}](%{base_url}).
+
+        Jeśli to nie byłeś ty, możesz po prostu zignorować tą wiadomość.
+
+        Naciśnij następujący link, aby się zalogować:
+        %{base_url}/u/admin-login/%{email_token}
     account_created:
       title: "Utworzono Konto"
       subject_template: "[%{site_name}] Twoje Nowe Konto"
+      text_body_template: |
+        Utworzyliśmy Twoje konto na %{site_name}
+
+        Kliknij na link poniżej, aby ustawić swoje hasło:
+        %{base_url}/u/password-reset/%{email_token}
     confirm_new_email:
       title: "Potwierdź Nowy Email"
       subject_template: "[%{email_prefix}] Potwierdź swój nowy adres email"
+      text_body_template: |
+        Potwierdź swój nowy adres email dla %{site_name} poprzez kliknięcia na następujący link:
+
+        %{base_url}/u/authorize-email/%{email_token}
     confirm_old_email:
       title: "Potwierdź stary email"
+      subject_template: "[%{site_name}] Potwierdź aktualny adres email"
+      text_body_template: |
+        Przed zmianą twojego adresu email, potrzebujemy, abyś potwierdził, że masz dostęp do tego adresu. Po zakończeniu tego kroku, poinformujemy cię o nowym adresie email.
+
+        Potwierdź obecny adres email dla %{site_name}poprzez naciśnięcie na następujący link:
+
+        %{base_url}/u/authorize-email/%{email_token}
     notify_old_email:
       title: "Powiadom Stary Email"
+      subject_template: "[%{site_name}] Twój adres email został zmieniony"
+      text_body_template: |
+        To jest wiadomość automatyczna, aby cię poinformować, że twój adres email na stronie %{site_name}został zmieniony. Jeśli działania te zostały dokonane przez przypadek, proszę skontaktować się z administratorem strony.
+
+        Twój adres email został zmieniony na:
+
+        %{new_email}
     signup_after_approval:
       title: "Zarejestruj się po zatwierdzeniu"
       subject_template: "Zostałeś zaakceptowany na forum %{site_name}!"
+      text_body_template: |
+        Witamy na %{site_name}!
+
+        Nasz personel zatwierdził twoje konto na %{site_name}.
+
+        Kliknij na podany link, aby potwierdzić i aktywować swoje nowe konto:
+        %{base_url}/u/activate-account/%{email_token}
+
+        Jeśli podany link nie działa, spróbuj skopiować go i przykleić w pasku adresów swojej wyszukiwarki.
+
+        %{new_user_tips}
+
+        Wierzymy, że [cywilizowana dyskusja](%{base_url}/guidelines) jest zawsze możliwa.
+
+        Baw się dobrze!
     signup:
       title: "Podpis"
+      subject_template: "[%{site_name}] Potwierdź swoje nowe konto"
+      text_body_template: |
+        Witaj na %{site_name}!
+
+        Kliknij na poniższy link by potwierdzić i aktywować Twoje nowe konto:
+        %{base_url}/u/activate-account/%{email_token}
+
+        Jeśli powyższy link nie działa, spróbuj skopiować i wkleić go do pasku adresu Twojej przeglądarki.
   page_not_found:
     title: "Ups! Ta strona nie istnieje lub jest prywatna."
     popular_topics: "Popularne"
@@ -1838,25 +2303,32 @@ pl_PL:
   login_required:
     welcome_message: |+
       #[Witamy na %{title}](#welcome)
-      Zarejestruj nowe konto lub przejdź do logowania.
+      Wymagane konto. Zarejestruj nowe konto lub przejdź do logowania.
 
 
   terms_of_service:
-    title: "Warunki użytkowania"
+    title: "Warunki użytkowania serwisu"
     signup_form_message: 'Przeczytałem i zgadzam się z <a href="/tos" target="_blank">Regulaminem Serwisu</a>.'
   deleted: 'usunięte'
+  image: "obraz"
   upload:
     edit_reason: "lokalne kopie pobranych obrazów"
     unauthorized: "Sorry, the file you are trying to upload is not authorized (authorized extensions: %{authorized_extensions})."
     pasted_image_filename: "Wklejone zdjęcie"
     store_failure: "Błąd zapisu załączników #%{upload_id} dla użytkownika #%{user_id}."
     file_missing: "Przepraszamy, należy podać plik do przesłania."
+    empty: "Przepraszamy, plik który wysłałeś jest pusty."
     attachments:
       too_large: "Przepraszamy, plik który chcesz wczytać jest zbyt duży (maximum to is %{max_size_kb}KB)."
     images:
+      too_large: "Przepraszamy, obraz, który próbujesz przesłać jest zbyt duży (maksymalny rozmiar to %{max_size_kb}KB), proszę zmienić rozmiar i spróbować ponownie."
+      larger_than_x_megapixels: "Przepraszamy, obraz który próbujesz dodać jest zbyt duży (maksymalny wymiar to %{max_image_megapixels}-megapikseli), proszę zmienić rozmiar i spróbować ponownie."
       size_not_found: "Przepraszamy, ale nie udało się ustalić rozmiaru obrazu. Może twój obraz jest uszkodzony?"
   avatar:
     missing: "Przepraszamy, nie możemy odnaleźć żadnego avatara przypisanego do tego konta email. Spróbuj załadować go ponownie"
+  flag_reason:
+    sockpuppet: "Nowy użytkownik stworzył temat, a inny nowy użytkownik z tym samym adresem IP (%{ip_address}) odpowiedział. <a href='/admin/site_settings/category/spam'>'flag_sockpuppets'</a> ustawienia strony."
+    spam_hosts: "Ten nowy użytkownik próbował stworzyć wiele postów z linkami do tej samej domeny (%{domain}). Zobacz <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold</a> ustawienia strony."
   email_log:
     post_user_deleted: "Użytkownik tego wpisu został usunięty."
     no_user: "Nie można znaleźć użytkownika z ID %{user_id}"
@@ -1875,8 +2347,14 @@ pl_PL:
     message_to_blank: "wiadomość.do jest pusta"
     text_part_body_blank: "text_part.body jest pusta"
     body_blank: "Wiadomość jest pusta"
+    no_echo_mailing_list_mode: "Powiadomienia listy mailingowej wyłączone dla postów własnych użytkowników."
   color_schemes:
     base_theme_name: "Podstawa"
+    default: "Jasny motyw"
+    dark: "Ciemny motyw"
+    default_theme_name: "Domyślny"
+    dark_theme_name: "Ciemny"
+    light_theme_name: "Jasny"
   about: "O stronie"
   guidelines: "Przewodnik"
   privacy: "Prywatność"
@@ -1888,26 +2366,218 @@ pl_PL:
     Edytuj pierwszy post w tym temacie by zmienić zawartość strony %{page_name}.
   guidelines_topic:
     title: "FAQ/Przewodnik"
+    body: |
+      <a name="civilized"></a>
+
+      ## [Jest to cywilizowane miejsce dyskusji publicznej](#civilized)
+
+      Prosimy o traktowanie tego forum dyskusyjnego z należytym szacunkiem, tak jakim na przykład traktuje się publiczny park. Jesteśmy również wspólnym zasobem społeczeństwa &mdash; miejscem gdzie można podzielić się swoimi umiejętnościami, wiedzą i interesami poprzez różne konwersacje.
+
+      .
+      Nie są to trudne czy szybkie zasady, jedynie pewne wytyczne, aby pomóc ocenie naszej społeczności i utrzymać to miejsce lekkim i przyjaznym dla cywilizowanej publicznej rozmowy.
+      <a name="improve"></a>
+
+      ## [Udoskonalaj dyskusję](#improve)
+
+      Pomóż nam sprawić, aby to miejsce było zawsze otwarte na różne dyskusje poprzez ciągle udoskonalanie ich różne sposoby. Jeśli nie jesteś pewien, że twój post wnosi cokolwiek do konwersacji, przemyśl go jeszcze raz i spróbuj ponownie później.
+
+      Tematy tutaj podnoszone mają dla nas duże znaczenie, zależy nam, żebyś zachowywał się tak, jakby one miały również dla ciebie większa wagę. Bądź pełen szacunku dla tematów, jak również dla ludzi uczestniczących w dyskusji, nawet jeśli nie zgadzasz się z tym, co piszą inne osoby.
+
+      Jednym ze sposobów, aby ulepszyć dyskusje jest poznanie innych które mają już miejsce. Spędź trochę czasu na wyszukiwaniu innych tematów przed zamieszczeniem odpowiedzi lub rozpoczęciem nowego tematu, a będziesz miał większe szanse na poznanie ludzi, którzy zainteresowani są tą samą dziedziną.
+
+      <a name="agreeable"></a>
+
+      ## [Bądź miły, nawet jeśli się nie zgadzasz](#agreeable)
+
+      Możesz chcieć odpowiedzieć na post, wyrażając przeciwne zdanie. W porządku. Ale pamiętaj, aby krytykować pomysły, a nie ludzi. Prosimy unikaj:
+
+      *   Nazywania po imieniu
+      *   ataki ad hominem
+      *  Odpowiadaniu na styl postu, a nie na jego treść
+      *   automatycznej sprzeczności
+
+      Zamiast tego, zawsze staraj się udzielać rozsądnej, popartej argumentami odpowiedzi, w celu ulepszenia konwersacji,
+
+      <a name="participate"></a>
+
+      ## [Twoje uczestnictwo ma znaczenie](#participate)
+
+      Rozmowy, które tutaj się odbywają nadają ton dla każdej nowej osoby. Pomóż nam mieć wpływ na przyszłość tej społeczności poprzez zaangażowanie w dyskusje, które powodują, że to forum jest interesującym miejscem &mdash; i unikaj tych, którzy nie chcą się angażować.
+      .
+      Discourse dostarcza narzędzi, które umożliwiają społeczności wspólnie identyfikować najlepszy (i najgorszy) wkład: zakładki, polubienia, flagi, odpowiedzi, edycje itd. Używaj tych narzędzi, aby poprawić ogólne wrażenia z korzystania z tego forum.
+
+      Pozostaw naszą społeczność w lepszym stanie, niż my ją zastaliśmy.
+
+      <a name="flag-problems"></a>
+
+      ## Jeśli zauważysz problem, oflaguj go](#flag-problems)
+
+      Moderatorzy posiadają specjalne uprawnienia; są odpowiedzialni za to forum. Ty też jesteś. Z twoją pomocą, moderatorzy mogą być facylitatorami. a nie tylko dozorcami czy policją.
+
+      Kiedy jesteś świadkiem złego zachowania, nie odpowiadaj. To zachęci do kolejnych takich aktów, spożytkuję twoją energie, a poza tym będzie to strata czasu dla wszystkich. _Po prostu to _oflaguj_.  Jeśli pojawi się wystarczająca liczba flag, zostaną podjęte działania - automatycznie lub przez moderatora.
+
+      W celu utrzymania naszej społeczności, moderatorzy mają prawo do usuwania jakiejkolwiek zawartości lub konta użytkownika bez podania powodu w każdym momencie. Moderatorzy nie sprawdzają nieopublikowanych postów; zarówno moderatorzy jak i operatorzy strony nie biorą żadnej odpowiedzialności za publikowane przez społeczności treści.
+
+      <a name="be-civil"></a>
+
+      ## [Zawsze bądź miły](#be-civil)
+
+      Nic nie niszczy zdrowej konwersacji jak nieuprzejmość:
+
+      *  Badź miły. Nie zamieszczaj niczego, co rozsądna osoba mogłaby uznać za ofensywne, obraźliwe lub jako mowę nienawiści.
+      * Nie dodaj niczego obscenicznego lub o charakterze seksualnym.
+      *   Szanujmy się wzajemnie. Nie nękaj czy zasmucaj innych,  nie podszywaj się pod innych i nie wyjawiaj ich prywatnych informacji,
+      *  Szanuj nasze forum. Nie spamuj, nie wandalizuj tego forum.
+
+      Nie są to konkretne zasady z dokładnymi definicjami .&mdash; unikaj pojawiania się którejkolwiek z wymienionych rzeczy. Jeśli nie jesteś pewien, po prostu zapytaj siebie jakbyś się czuł, jakby twój post znalazł się na pierwszej stronie New York Times.
+      .
+      To forum jest publiczne i silniki wyszukiwania indeksują te dyskusje. Pamiętaj, aby język, linki i obrazki były bezpieczne dla rodziny i przyjaciół.
+
+      <a name="keep-tidy"></a>
+
+      ## [Utrzymuj porządek](#keep-tidy)
+
+      Dokładaj starań, aby wszystkie rzeczy znajdowały się we właściwym miejscu, abyśmy mogli spędzaj więcej czasu na dyskusji niż na sprzątaniu. Więc:
+
+      *  Nie zaczynaj wątku w złej kategorii.
+      *   Nie powtarzaj tej samej wiadomości w różnych tematach.
+      *  Nie zamieszczaj odpowiedzi bez treści.
+      *   Nie zakłócaj wątku poprzez zmianę tematu w środku konwersacji.
+      *   Nie podpisuj swoich postów &mdash; każda wiadomość zawiera informacje o twoim profilu.
+      .
+      Zamiast dodać post "+1" lub "Zgoda". posłuż się przyciskiem polubienia. Zamiast próby radykalnej zmiany tematu w konwersacji, posłuż się odpowiedzią jako powiązany temat.
+
+
+      <a name="stealing"></a>
+
+      ## [Zamieszczaj tylko swoją własną treść](#stealing)
+
+      Nie możesz dodać czegokolwiek, co należy do innej osoby bez jej zgody. Nie możesz dodać opisów, linków lub metod, które mają na celu kradzież własności intelektualnej innych (oprogramowanie, wideo, dźwięk, obrazy) lub łamanie innych praw.
+
+      <a name="power"></a>
+
+      ## [Zasilana dzięki Tobie](#power)
+
+      Ta strona jest utrzymywana przez [przyjazną obsługę](/o nas) i *Ciebie*, społeczność. Jeśli posiadasz jeszcze jakieś pytania dotyczące poruszania się po forum, tworzenia nowych wątków [Opinie](/c/site-feedback) po prostu się odezwij! Jeśli wystąpi sytuacja krytyczna lub po prostu nagły problem, który nie możesz zostać rozwiązany przez oflagowanie skontaktuj się z obsługą poprzez [strona obsługi](/about).
+
+      <a name="tos"></a>
+
+      ## [Warunki](#tos)
+
+      Tak, język prawniczy jest nudny, ale musimy chronić siebie &ndash; a więc też Ciebie i twoje informacje &ndash;; przed nieprzyjaznymi ludźmi. Mamy [Warunki obsługi[(/tos) opisujące twoje (i nasze) zachowanie i prawa związane z treścią, prywatnością i prawami. Aby korzystać z tej usługi, musisz zgodzić się na ich przestrzeganie [TOS](/tos).
   tos_topic:
     title: "Warunki użytkowania"
   privacy_topic:
     title: "Polityka prywatności"
+    body: |
+      <a name="collect"></a>
+
+      ## [Jakie dane o Tobie zbieramy?](#collect)
+
+      Zbieramy takie informacje jak: kiedy zarejestrowałeś się na naszej stronie; kiedy uczestniczyłeś w życiu forum poprzez czytanie, pisanie oraz udoskolananie zawartości tu udostępnianej.
+
+      Podczas rejestracji na naszej stronie możesz być zapytany o twoje imię i nazwisko oraz adres email.  Możesz też przeglądać naszą stronę bez konieczności rejestracji. Twój adres email będzie weryfikowany poprzez przesłanie na niego unikalnego linku. Jeżeli nacisnąłeś na ten link, wiemy że ten adres email należy do Ciebie.
+
+      Podczas rejestracji oraz pisania treści zbieramy dane o twoim adresie IP. Możemy też zachowywać logi serwera, które pobierają dane o twoim adresie IP zawsze kiedy logujesz się na nasz serwer.
+
+      <a name="use"></a>
+
+      ## [Do czego używamy tych informacji?](#use)
+
+      Wszystkie informacje jakie od Ciebie zbieramy mogą być wykorzystane w jeden z następujących sposobów:
+
+      * Aby przystosować naszą stronę dla Ciebie &mdash; twoje informacje pomagają nam lepiej odpowiadać na twoje indywidualne potrzeby.
+      * Aby ulepszyć naszą stronę &mdash; cały czas ulepszamy naszą stronę na podstawie informacji otrzymanych od Ciebie.
+      * Aby ulepszyć obsługę klienta &mdash; informacje pomagają nam na efektywniejsze obsługiwanie twoich próśb.
+      * Aby wysyłać Tobie okresowe wiadomości email &mdash; Adres email, który podałeś może być użyty aby wysyłać Tobie informację o stronie, powiadomienia, odpowiedzi, wiadomości i wątki skierowane do Ciebie.
+
+      <a name="protect"></a>
+
+      ## [Jak chronimy twoje dane?](#protect)
+
+      Wdrażamy różne środki bezpieczeństwa, aby podnosić poziom bezpieczeństwa twoich danych osobowych, kiedy podajesz, potwierdzasz albo udzielasz dostępu do informacji osobistych.
+
+      <a name="data-retention"></a>
+
+      ## [Jaką mamy politykę przechowywania danych?](#data-retention)
+
+      Dokładamy wszelkich starań, aby:
+
+      * Nie przechowywać danych o twoim adresie IP dłużej niż 90 dni.
+      * Nie przechowywać danych o adresie IP przypisanym do twojego konta dłużej niż 5 lat.
+
+
+      <a name="cookies"></a>
+
+      ## [Czy używamy plików cookies?](#cookies)
+
+      Tak. Cookies to małe pliki, wysyłane przez serwis internetowy, który odwiedzamy i zapisywane na urządzeniu końcowym (komputerze, laptopie, smartfonie), z którego korzystamy podczas przeglądania stron internetowych. Pozwalają naszej stronie na rozpoznanie czy jesteś naszym użytkownikiem.
+
+      Używamy ich, aby zrozumieć i zapisać twoje preferencje. Dzięki nim możemy zapewnić Tobie lepszą jakość dostarczanych usług. Możemy też udostępniać je firmom trzecim, aby mogły rozpoznawać twoje zachowania.
+
+      <a name="disclose"></a>
+
+      ## [Czy udostępniamy jakiekolwiek informacje osobom trzecim?](#disclose)
+
+      Nie sprzedajemy, nie przekazujemy i nie handlujemy twoimi informacjami osobistymi z innymi partnerami. Wyjątek stanowią zaufane firmy, które pomagają nam w utrzymaniu strony, prowadzeniu firmy czy obsłudze klienta, tak długo dopóki firmy te zgadzają się utrzymywać te informacje jako tajne.
+
+      <a name="third-party"></a>
+
+      ## [Linki osób trzecich](#third-party)
+
+      Na naszej stronie możemy promować linki osób trzecich. Strony te mają swoją oddzielną politykę prywatności. Nie bierzemy żadnej odpowiedzialności za te strony lub zawartość na nich udostępnianą. Niemniej jednak, staramy się chronić integralność naszej strony, a wszelkie opinie są mile widziane.
+
+      <a name="coppa"></a>
+
+      ## [Zgodność z przepisami dotyczącymi ochrony prywatności w internecie dla dzieci](#coppa)
+
+      Nasza strona, produkty i funkcję są skierowane do osób powyżej 12 roku życia. Jeśli serwer jest zlokalizowany w Stanach Zjednoczonych i masz mniej niż 13 lat, zgodnie z wymaganiami COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)), nie używaj tej stron.
+
+      <a name="online"></a>
+
+      ## [Online Privacy Policy Only](#online)
+
+      Ta polityka prywatności odnosi się tylko do danych zbieranych przez przez naszą strone, nie odnosi się ona do informacji zbieranych w trybie offline.
+
+      <a name="consent"></a>
+
+      ## [Twoja Zgoda](#consent)
+
+      Korzystając z tej strony zgadzasz się na jej politykę prywatności.
+
+      <a name="changes"></a>
+
+      ## [Zmiany w polityce prywatności](#changes)
+
+      Jeżeli zostaną zmienione zasady polityki prywatności, zostaną one opublikowane na tej stronie.
+
+      Ten dokument jest CC-BY-SA.Ostatnia aktualizacja May 31, 2013.
   badges:
     editor:
       name: Edytor
       description: Pierwsza edycja
+      long_description: |
+        Ta odznaka jest przyznawana, gdy po raz pierwszy dokonasz edycji jednego z twoich postów. Nie będziesz miał możliwości dokonywania zmian w postach na zawsze, edytowanie to jest zawsze dobry pomysł - możesz dokonać ulepszenia swoich postów, naprawić małe błędy, lub dodać tekst, który przez przypadek pominąłeś w oryginalnym poście. Edytuj by twoje posty stawały się coraz lepsze!
     basic_user:
       name: Podstawowy
       description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Przyznano</a> wszystkie podstawowe funkcje
+      long_description: |
+        To odznaka jest przyznawana, gdy osiągniesz poziom zaufania 1. Dziękujemy, że z nami jesteś i czytasz różne wątki, aby dowiedzieć się jak działa  nasza społeczność. Ograniczenia dla nowego użytkownika zostały usunięte; przyznano ci wszystkie niezbędne funkcję społecznościowe, jak na przykład wysyłanie wiadomości prywatnych, edytowanie wiki, flagowanie i możliwość dodawania wielu obrazków i linków w postach.
     member:
       name: Zwykły
       description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Przyznano</a> zaproszenia, wysyłanie wiadomości do grup, więcej lajków
+      long_description: |
+        Ta odznaka jest przyznawana, gdy osiągniesz poziom zaufania 2. Dziękujemy za to, że udzielasz się przez czas kilku tygodni, aby w pełni dołączyć do społeczności. Możesz teraz wysyłać zaproszenia ze strony użytkownika lub z wątków, tworzyć konwersacje grupowe i mieć kilka polubień więcej na dzień.
     regular:
       name: Regularny
       description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Przyznano</a> możliwość zmiany kategorii, nazwy, linków oraz salon, więcej lajków
+      long_description: |
+        Ta odznaka jest przyznawana, gdy osiągniesz poziom zaufania 3. Dziękujemy, że regularnie udzielasz się w naszej społeczności od miesięcy. Jesteś teraz jednym z najbardziej aktywnych czytelników i masz realny wkład w tworzenie tej społeczności. Możesz teraz dokonywać zmian kategorii i zmieniać nazwy tematów, wykorzystaj bardziej skuteczne oflagowania, dostęp do obszaru prywatnego pokoju i możliwość dawania dużo większej liczby polubień na dzień.
     leader:
       name: Weteran
       description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Przyznano</a> możliwość globalnej edycji, przypinania, zamykania, archiwizacji, podziału i scalania, więcej lajków
+      long_description: |
+        Ta odznaka jest przyznawana, gdy osiągniesz poziom zaufania 4. Obsługa ocenia, że jesteś liderem w tej społeczności i dajesz dobry przykład reszcie społeczności poprzez swoje akcje i wypowiedzi. Masz możliwość edycji wszystkich postów, dokonywania akcji zarezerwowanych dla moderatorów takich jak przypinanie, zamykanie, usuwanie z katalogu, archiwizowanie, rozdzielanie i łącznie, jak również otrzymujesz całe tony polubień do rozdania dziennie.
     welcome:
       name: Powitanie
       description: Otrzymano polubienie
@@ -1915,55 +2585,81 @@ pl_PL:
         Ta odznaka jest przyznawana, kiedy dostajesz pierwszego lajka przy poście. Gratulacje, napisałeś coś, co inni użytkownicy uznali za interesujące, fajne lub użyteczne!
     autobiographer:
       name: Autobiograf
-      description: Wypełnienie <a href="/my/preferences">profilu</a> użytkownika
-      long_description: |+
-        Ta odznaka jest przyznawana za wypełnienie <a href="/my/preferences">w twoim profilu i za wybranie zdjęcia profilowego. Pozwól lepiej się poznać i pokaż swoje zainteresowania, aby społeczność była jeszcze lepsza i silniej związana. Dołącz do nas.
-
     anniversary:
       name: Rocznica
       description: Aktywność przez rok, co najmniej jeden wpis
+      long_description: |
+        Ta odznaka jest przyznawana w momencie, gdy jesteś członkiem przynajmniej rok i napisałeś przynajmniej jeden post przez rok. Dziękujemy, że z nami jesteś i udzielasz się w naszej społeczności. Nie moglibyśmy funkcjonować bez ciebie.
     nice_post:
       name: Miła odpowiedź
       description: Otrzymano 10 polubień w odpowiedzi
+      long_description: |
+        Ta odznaka jest przyznawana, gdy uzyskasz 10 polubień twojej odpowiedzi. Twoja odpowiedź zrobiła wrażenie na społeczności i pomogła się jej rozwinąć!
     good_post:
       name: Dobra odpowiedź
       description: Otrzymano 25 polubień w odpowiedzi
+      long_description: |
+        Ta odznaka jest przyznawana, gdy uzyskasz 25 polubień twojej odpowiedzi. Twoja odpowiedź była znakomita i sprawiła, że cała konwersacja stała się dla wszystkich lepsza!
     great_post:
       name: Świetna odpowiedź
       description: Otrzymano 50 polubień w odpowiedzi
+      long_description: |
+        Ta odznaka jest przyznawana, gdy uzyskasz 50 polubień twojej odpowiedzi. Twoja odpowiedź była inspirująca, fascynująca, zabawna lub wnikliwa i przede wszystkim podobała się społeczności.
     nice_topic:
       name: Miły Temat
       description: Otrzymano 10 polubień w temacie.
+      long_description: |
+        Ta odznaka jest przyznawana, gdy uzyskasz 10 polubień twojej odpowiedzi. Hej, rozpocząłeś interesującą konwersacje, która podoba się społeczności!
     good_topic:
       name: Dobry Temat
       description: Otrzymano 25 polubień w temacie.
+      long_description: |
+        Ta odznaka jest przyznawana, gdy uzyskasz 25 polubień. Stworzyłeś ekscytującą konwersację, która spodobała się społeczności!
     great_topic:
       name: Świetny Temat
       description: Otrzymano 50 polubień w temacie.
+      long_description: |
+        Ta odznaka jest przyznawana, gdy twój wątek otrzymał 50 polubień. Rozpocząłeś fascynującą konwersację, a społeczeństwu spodobała się dynamiczna dyskusja, która z tego wynikła.
     nice_share:
       name: Miłe udostępnienie
       description: 'Udostępniono post z 25 unikalnymi odwiedzającymi. '
+      long_description: |
+        Ta odznaka przyznawana jest za udostępnienie linku, który został naciśnięty przez co najmniej 25 osób. Dziękujemy za rozpowszechnianie naszych konwersacji i tej społeczności.
     good_share:
       name: Dobre udostępnienie
       description: 'Udostępniono post z 300 unikalnymi odwiedzającymi. '
+      long_description: |
+        Ta odznaka jest przyznawana za udostępnienie linku, który został naciśnięty przez co najmniej 300 osób. Dobra robota! Pokazałeś jak wygląda prawdziwa dyskusja grupie nowych osób i wspomogłeś rozrost tej społeczności.
     great_share:
       name: Świetne udostępnienie
       description: 'Udostępniono post z 1000 unikalnych odwiedzających. '
+      long_description: |
+        Ta odznaka jest przyznawana za udostępnienie linku, który został naciśnięty przez co najmniej 1000 osób. Wow! Dokonałeś promocji naprawdę interesującej dyskusji w dużym gronie odbiorców i wspomogłeś w istotny sposób rozrost naszej społeczności!
     first_like:
       name: Pierwsze polubienie
       description: Polubiono wpis
+      long_description: |
+        Ta odznaka jest przyznawana, gdy po raz pierwszy polubisz post poprzez przycisk :heart:. Dokonywanie polubień jest świetnym sposobem aby poinformować członków społeczności, że ich post jest naprawdę interesujący, przydatny, fajny, zabawny. Dziel się miłością!
     first_flag:
       name: Pierwsza flaga
       description: Zgłoszenie wpisu
+      long_description: |
+        Ta odznaka jest przyznawana, gdy po raz pierwszy oflagujesz post. Flagowanie to metoda, która pozwala na utrzymanie forum na jak najwyższym poziomie merytorycznym. Jeśli zobaczysz jakieś posty, które wymagają uwagi moderatora z jakiegokolwiek powodu, nie wahaj się aby oflagować tą wiadomość. Możesz również oflagować, aby wysłać <b>prywatną wiadomość</b> do innych użytkowników, jeśli zauważysz problem z ich postem. Jeśli zauważysz problem :flag_black:, oflaguj go!
     promoter:
       name: Promotor
       description: Zaproszenie użytkownika
+      long_description: |
+        Ta odznaka jest przyznawana, gdy zaprosisz kogoś do społeczności poprzez przycisk zaproś na stronie użytkownika, lub na dole wątku. Zapraszanie przyjaciół, którzy mogą być zainteresowani dyskusjami to świetny sposób aby wprowadzić nowe osoby do naszej społeczności, dzięki!
     campaigner:
       name: Działacz
       description: 'Zaproszenie 3 użytkowników '
+      long_description: |
+        Ta odznaka jest przyznawana, gdy zaprosisz przynajmniej 3 osoby, które później spędzą wystarczająco dużo czasu na stronie, aby zostać regularnymi użytkownikami. Żyjąca społeczność potrzebuje regularnego wpływu nowych użytkowników, którzy regularnie udzielają się na forum i przedstawiają swój nowy punkt widzenia w konwersacjach.
     champion:
       name: Mistrz
       description: Zaproszono 5 użytkowników
+      long_description: |
+        Ta odznaka jest przyznawana, gdy zaprosisz przynajmniej 5 osób, które następnie spędzą wystarczająco dużo czasu, aby zostać pełnoprawnymi użytkownikami. Wow! Dziękujemy za rozszerzanie różnorodności naszej społeczności.
     first_share:
       name: Pierwsze udostępnienie
       description: Udostępniono wpis
@@ -1982,55 +2678,84 @@ pl_PL:
 
     read_guidelines:
       name: Przeczytany przewodnik
-      description: Przeczytanie <a href="/guidelines">wytycznych społeczności</a>
-      long_description: |
-        Ta odznaka jest przyznawana za <a href="/guidelines">przeczytanie przewodników społeczności</a>. Obserwowanie tych prostych przewodników i dzielenie się nimi pomaga zbudować bezpieczną, wesołą i trwałą społeczność.
     reader:
       name: Czytelnik
       description: Przeczytanie każdego odpowiedzi w temacie z ponad 100 wpisami
+      long_description: |
+        Ta odznaka jest przyznawana, gdy po raz pierwszy przeczytasz dłuższy wątek z więcej niż 100 odpowiedziami. Dokładne czytanie konwersacji pozwala na śledzenie dyskusji, zrozumienie różnych punktów widzenia i prowadzi do bardziej interesującej konwersacji. Im więcej czytasz, tym lepsza staję się konwersacja. Lubimy powtarzać, że czytanie to właśnie fundament! :slight_smile:
     popular_link:
       name: Popularny link
       description: Opublikowanie zewnętrznego linku, który otrzymał co najmniej 50 kliknięć
+      long_description: |
+        Ta odznaka jest przyznawana, gdy link, który udostępniłeś zostanie otwarty przynajmniej 50 razy. Dziękujemy za dodawanie przydatnych linków, które mają wyraźny wkład w zawartość konwersacji!
     hot_link:
       name: Gorący link
       description: Opublikowanie zewnętrznego linku, który otrzymał co najmniej 300 kliknięć
+      long_description: |
+        Ta odznaka jest przyznawana, gdy link, który udostępniłeś zostanie otwarty przynajmniej 300 razy. Dziękujemy za udostępnienie ciekawe linku, który pozwolił rozwinąć konwersację i dodać nowy punkt widzenia dyskusji!
     famous_link:
       name: Popularny link
       description: Opublikowanie zewnętrznego linku, który otrzymał co najmniej 1000 kliknięć
+      long_description: |
+        Ta odznaka jest przyznawana, gdy link, który udostępniłeś zostanie otwarty przynajmniej 1000 razy. Wow! Udostępniłeś link, który wyraźnie przyczynił się do ulepszenia konwersacji poprzez dodanie niezbędnych szczegółów, zawartości i informacji. Dobra robota!
     appreciated:
       name: Doceniony
       description: Otrzymano 1 polubienie w 20 postach
+      long_description: |
+        Ta odznaka jest przyznawana, gdy otrzymasz przynajmniej 20 polubień na różnych postach. Społeczność lubi twój wkład do konwersacji!
     respected:
       name: Szanowany
       description: Otrzymano 2 polubienia w 100 postach
+      long_description: |
+        Ta odznaka jest przyznawana, gdy otrzymasz przynajmniej 2 polubienia na 100 różnych postach. Społeczność zaczyna szanować twój wkład do konwersacji.
     admired:
       name: Podziwiany
       description: Otrzymano 5 polubień w 300 postach
+      long_description: |
+        Ta odznaka jest przyznawana, gdy otrzymasz przynajmniej 5 polubień na 300 różnych postach. Wow! Społeczność docenia twój częsty i wysokiej jakości wkład w konwersacje.
     out_of_love:
       name: Z miłości
       description: Użyto 50 polubień w dzień
+      long_description: |
+        Ta odznaka jest przyznawana, gdy wykorzystasz wszystkie 50 polubień danego dnia. Warto zatrzymać się na chwilę i polubić posty, które przypadły ci do gusty i docenić zaangażowanie innych członków społeczności. Tak aby tworzyć coraz lepsze dyskusje w przyszłości.
     higher_love:
       name: Wyższa miłość
       description: Użyto 50 polubień w dzień 5 razy
+      long_description: |
+        Ta odznaka jest przyznawana, gdy wykorzystasz wszystkie 5 polubień w 5 dni. Dziękujemy, że przyczyniasz się do rozwoju jak najlepszych konwersacji każdego dnia!
     crazy_in_love:
       name: Szaleńczo zakochany
       description: Użyto 50 polubień w dzień 20 razy
+      long_description: |
+        Ta odznaka jest przyznawana, gdy wykorzystasz wszystkie 50 polubień w 20 dni. Wow! Jesteś naprawdę regularnym użytkownikiem i starasz się cały czas zachęcać osoby z twojej społeczności!
     thank_you:
       name: Dziękuje
       description: Ma 20 polubionych postów i dał 10 polubień
+      long_description: |
+        Ta odznaka jest przyznawana, gdy masz co najmniej 20 polubionych postów i dałeś w zamian 10 lub więcej polubień. Gdy ktoś polubi twój post, znajdź czas, by polubić również posty innych użytkowników.
     gives_back:
       name: Oddać
       description: Ma 100 polubionych postów i dał 100 polubień
+      long_description: |
+        Ta odznaka jest przyznawana, gdy masz co najmniej 100 polubionych postów i dałeś w zamian 100 lub więcej polubień. Dziękujemy za twoją aktywność!
     empathetic:
       name: Empatyczny
       description: Ma 500 polubionych postów i dał 1000 polubień
+      long_description: |
+        Ta odznaka jest przyznawana, gdy masz co najmniej 500 polubionych postów i dałeś w zamian 1000 lub więcej polubień. Wow! Jesteś przykładem hojności i wzajemnego uznania  :two_hearts:.
     first_emoji:
       name: Pierwszy Emoji
       description: Użyto Emoji w Poście
+      long_description: |
+        Ta odznaka jest przyznawana, gdy po raz pierwszy dodasz emoji do twojego posta  :thumbsup:. Emoji pozwala ci przenosić emocje do twojego posta, od szczęścia  :smiley: do smutku  :anguished:, gniewu :angry: i wszystkie pomiędzy  :sunglasses:. Po prostu rozpocznij od: (dwukropka) lub naciśnij na przycisk paska Emoji w edytorze, aby wybrać z spośród setek emoji :ok_hand:.
     first_mention:
       name: Pierwsze Wspomnienie
+      description: Wspomniano o użytkowniku w poście
+      long_description: Ta odznaka jest przyznawana, gdy po raz pierwszy wspomnisz o którymś użytkowniku *nazwa użytkownika w swoim poście. Każde wspomnienie powoduje wysłanie powiadomienia do tej osoby, tak aby wiedział o twoim poście. Po prostu rozpocznij pisanie od @(symbolu) aby wspomnieć o użytkowniku lub jeśli można o grupie - jest to wygodny sposób, aby zwrócić czyjąś uwagę.
     first_onebox:
       name: Pierwszy Onebox
+      description: Dodany link został poddany funkcji oneboxe
+      long_description: Ta odznaka jest przyznawana, gdy po raz pierwszy umieścisz link w swoim poście, który został automatycznie rozszerzony przez funkcję onebox z krótkim podsumowaniem linku; tytuł i (jeśli dozwolone) zdjęcie.
     first_reply_by_email:
       name: Pierwsza Odpowiedz przez Email
       description: Odpowiedział na post poprzez email
@@ -2038,6 +2763,10 @@ pl_PL:
         Ta odznaka jest przyznawana za kiedy pierwszy raz odpowiesz na post poprzez maila:.
     new_user_of_the_month:
       name: "Nowy Użytkownik Miesiąca"
+      description: Wybitny wkład w pierwszym miesiącu
+      long_description: |
+        Ta odznaka jest przyznawana, aby pogratulować dwóm użytkownikom każdego miesiąca za ich wkład w rozwój; mierzone na podstawie tego jak często ich posty dostawały polubienia i przez kogo.
+    badge_title_metadata: "%{display_name} odznaka na %{site_title}"
   admin_login:
     success: "Email wysłany"
     error: "Błąd!"
@@ -2057,13 +2786,17 @@ pl_PL:
       button: "Zarejestruj"
       title: "Zarejestrowano konto administratora"
       help: "zarejestruj nowe konto aby rozpocząć"
+      no_emails: "Niestety, żaden email administratora nie został określony podczas instalacji, więc finalizacja konfiguracji <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>może być trudna</a>."
     confirm_email:
       title: "Potwierdzenie przez email"
+      message: "<p>Wysłaliśmy email aktywacyjny na <b>%{email}</b>. Proszę postępować zgodnie z instrukcjami w emailu, tak aby dokonać aktywacji konta,</p><p> Jeśli email nie doszedł, upewnij się, że adres został ustawiony poprawnie i sprawdź folder spam w twojej skrzynce.</p>"
     resend_email:
       title: "Ponowne przesyłanie emaila aktywacyjnego"
       message: "<p>Powtórnie przesłaliśmy maila aktywacyjnego do <b>%{email}</b>"
   safe_mode:
     title: "Wejście w tryb bezpieczny"
+    description: "Tryb awaryjny pozwala na sprawdzenie twojej strony bez ładowania pluginów i modyfikacji."
+    no_customizations: "Wyłącz bieżący motyw."
     only_official: "Wyłącz nieoficjalne wtyczki"
     no_plugins: "Wyłącz wszystkie wtyczki"
     enter: "Włącz Tryb Bezpieczny"
@@ -2077,9 +2810,11 @@ pl_PL:
             description: "Jaki jest podstawowy język dla twojej społeczności?"
       forum_title:
         title: "Imię"
+        description: "Twoja nazwa jest znakiem widocznym z daleka, <i>Pierwszą</i> rzeczą, którą goście zobaczą w twojej społeczności. Co nazwa i tytuł mówią o twojej społeczności?"
         fields:
           title:
             label: "Twoja pełna nazwa"
+            placeholder: "Hangout Jane"
           site_description:
             label: "Opisz swoja społeczność w jednym krótkim zdaniu."
             placeholder: "Miejsce dla Jane i jej przyjaciół na dyskusje o fajnych sprawach."
@@ -2088,9 +2823,11 @@ pl_PL:
         fields:
           welcome:
             label: "Temat powitalny"
+            description: "<p>Jak opisałbyś twoją społeczność nieznajomemu w windzie mając tylko 1 minutę?</p><ul><li> Dla kogo są te dyskusje?</li><li>Gdzie mogę je znaleźć?</li><li>Dlaczego powinienem odwiedzić tą społeczność?</li></ul>Wątek wprowadzający to pierwsza rzecz, która nowi użytkownicy przeczytają. Pomyśl o tym, jak o <b>jednym paragrafie</b> 'sprzedanie pomysłu' lub 'misja przedsiębiorstwa'.</p>"
             one_paragraph: "Ogranicz wiadomość powitalną do jednego akapitu."
       privacy:
         title: "Dostęp"
+        description: "<p>Czy twoja społeczność jest otwarta dla wszystkich, czy może jest  ograniczona przed członkostwo, zaproszenie czy akceptację? Jeśli wolisz, możesz ustawić wszystko nieoficjalnie, następnie zmienić na publiczne później.</p><p> Możesz również wysyłać zaproszenia z wątków, lub również ze strony twojego profilu.</p>"
         fields:
           privacy:
             choices:
@@ -2106,13 +2843,17 @@ pl_PL:
           contact_email:
             label: "E-mail"
             placeholder: "name@example.com"
+            description: "Adres email osoby lub grupy odpowiedzialnej za tą społeczność. Używany dla krytycznych powiadomień jak na przykład nieobsłużone oflagowania, aktualizację bezpieczeństwa i na <a href='/about' target='_blank'>stronie o Tobie</a> dla szybkiego kontaktu."
           contact_url:
             label: "Strona kontaktowa"
             placeholder: "http://www.example.com/contact-us"
+            description: "Ogólna strona kontaktowa do ciebie i twojej organizacja. Będzie wyświetlane na <a href='/about' target='_blank'>twojej stronie </a>."
           site_contact:
             label: "Automatyczne wiadomości"
+            description: "Wszystkie automatyczne wiadomości prywatne Discourse będą wysyłane z tego użytkownika, jak na przykład ostrzeżenia o flagach i powiadomienia ukończenia backupu."
       corporate:
         title: "Organizacja"
+        description: "Te nazwy zostaną wpisane w twojej <a href='/privacy' target='blank'>Polityce Prywatności</a> i <a href='/tos' target='blank'>Warunków korzystania z usług</a>, są to tematy, które możesz edytować w kategorii obsługa. Jeśli nie posiadasz firmy, możesz pominąć ten krok."
         fields:
           company_short_name:
             label: "Nazwa organizacji (krótka)"
@@ -2127,6 +2868,7 @@ pl_PL:
         title: "Motyw"
         fields:
           theme_id:
+            description: "Który kolor motywu preferujesz na początek? W późniejszym etapie możesz dostosować wygląd twojej strony poprzez Admin, Dostosuj."
             choices:
               default:
                 label: "Prosty Jasny"
@@ -2140,14 +2882,18 @@ pl_PL:
             description: "Zdjęcie logo w lewym górnym rogu twojej strony. Użyj szerokiego prostokątu. "
           logo_small_url:
             label: "Kompaktowe logo"
+            description: "Wersja kompaktowa twojego logo, wyświetlana w lewym górnym rogu strony przy przewijaniu w dół. Używaj kwadratowego kształtu."
       icons:
         title: "Ikony"
         fields:
           favicon_url:
             label: "Mała ikona"
+            description: "Ikona obrazu używana, aby reprezentować twoją stronę w przeglądarkach internetowych. Wygląda dobrze w małych rozmiarach jak na przykład 32px na 32px."
           apple_touch_icon_url:
             label: "Duża ikona"
+            description: "Ikona obrazu używana, aby reprezentować twoją stronę na nowoczesnych urządzeniach. Wygląda dobrze w większych rozmiarach jak na przykład 144px na 144px."
       homepage:
+        description: "Polecamy wyświetlanie ostatnich tematów na twojej stronie domowej, ale jeśli wolisz możesz również wyświetlić kategorie (grupy tematów) na stronie domowej."
         title: "Strona Główna"
         fields:
           homepage_style:
@@ -2158,10 +2904,15 @@ pl_PL:
                 label: "Kategorie"
       emoji:
         title: "Emotikony"
+        description: "Który styl emoji preferujesz dla twojej społeczności? Możesz dodać więcej niestandardowym emoji poprzez Admin, Dostosuj, Emoji."
       invites:
         title: "Zaproś administrację"
+        description: "Już prawie koniec! Teraz zaprośmy trochę ludzi, aby rozwinąć twoją społeczność i pomóc <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>zasiać nowe dyskusje</a> poprzez interesujące tematy i odpowiedzi."
       finished:
         title: "Twój Discourse jest Gotowy!"
+        description: |
+          <p>Jeśli kiedykolwiek będziesz chciał dokonać zmian w tych ustawieniach, przejdź <a href='/admin' target='_blank'>do sekcji admina</a>; znajdziesz ją obok ikony klucza w menu witryny.</p>
+          <p>Baw się dobrze i powodzenia <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>w budowaniu nowej społeczności!</a></p>
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index b4b1494069..f8d3d28d88 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 porque não existe 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."
-        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."
+        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."
+        bad_destination_address: "Acontece quando nenhum dos endereços de e-mail nos campos Para/Cc/Bcc coincidem com um endereço de e-mail de 'A Receber' configurado."
+        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."
+      unrecognized_error: "Erro Desconhecido"
   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,9 @@ pt:
   embed:
     start_discussion: "Iniciar Discussão"
     continue: "Continuar Discussão"
+    error: "Erro de Integração"
+    no_hosts: "Não foram configurados anfitriões para incorporar."
+    configure: "Configurar Integração"
     more_replies:
       one: "mais 1 resposta"
       other: "mais %{count} respostas"
@@ -155,9 +166,12 @@ pt:
   too_many_links:
     one: "Pedimos desculpa, novos utilizadores podem colocar apenas 1 hiperligação numa mensagem."
     other: "Pedimos desculpa, novos utilizadores podem colocar apenas %{count} hiperligações numa mensagem."
+  contains_blocked_words: "A sua publicação contém palavras que não são permitidas."
   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."
+  max_pm_recepients: "Desculpe, pode enviar uma mensagem para um máximo de %{recipients_limit}destinatários."
   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 +191,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 +210,8 @@ pt:
   queue:
     delete_reason: "Eliminado através da fila de moderação de mensagens"
   groups:
+    success:
+      bulk_add: "Foram adicionados %{users_added} utilizadores 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 +219,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 +230,8 @@ 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}"
   education:
     until_posts:
       one: "1 mensagem"
@@ -261,16 +286,32 @@ 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."
+        watched_word:
+          attributes:
+            word:
+              too_many: "Demasiadas palavras para essa ação"
       <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} ainda não colocou nada no campo Sobre Mim</div>"
@@ -280,7 +321,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+
@@ -433,6 +476,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'
@@ -455,43 +500,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 deseja 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 para %{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 linhas diretrizes comunitárias</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: 'Vote para esta publicação'
       long_form: 'votou nesta mensagem'
   user_activity:
     no_bookmarks:
@@ -516,7 +576,6 @@ pt:
       email_title: 'O tópico "%{title}" requer a atenção do moderador'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>A sua mensagem foi sinalizada pela comunidade.Por favor <a href="/my/messages"> consulte as suas mensagens</a>.</p>'
     user_must_edit: '<p>Esta mensagem foi sinalizada pela comunidade e está temporariamente oculta.</p>'
   archetypes:
     regular:
@@ -528,7 +587,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"
@@ -707,7 +765,7 @@ pt:
     facebook_config_warning: 'O servidor está configurado para permitir inscrever-se e entrar com o Facebook (enable_facebook_logins), mas o id e os valores privados da aplicação não estão configurados. Vá  <a href="/admin/site_settings">às Configurações do Sítio</a> e atualize as definições. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Veja este guia para saber mais</a>.'
     twitter_config_warning: 'O servidor está configurado para permitir inscrever-se e entrar com o Twitter (enable_twitter_logins), mas a chave e os valores privados não estão configurados. Vá <a href="/admin/site_settings">às Configurações do Sítio</a> e atualize as definições. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Veja este guia para saber mais</a>.'
     github_config_warning: 'O servidor está configurado para permitir inscrever-se e entrar com o GitHub (enable_github_logins), mas o id e valores privados do cliente não estão configurados. Vá <a href="/admin/site_settings">às Configurações do Sítio</a> e atualize as definições. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Veja este guia para saber mais</a>.'
-    image_magick_warning: 'O servidor está configurado para criar miniaturas de imagens grandes, mas o ImageMagick não está instalado. Instale o ImageMagick usando o seu gestor de pacotes preferido ou aceda a <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">para descarregar a última versão</a>.'
+    image_magick_warning: 'O servidor está configurado para criar miniaturas de imagens grandes, mas o ImageMagick não está instalado. Instale o ImageMagick utilizando o seu gestor de pacotes favorito ou <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">transfira a última versão</a>.'
     failing_emails_warning: 'Há %{num_failed_jobs} tarefas de email que falharam. Verifique o seu app.yml e assegure-se que as configurações do servidor de email estão corretas. <a href="/sidekiq/retries" target="_blank"> Veja as tarefas que falharam no Sidekiq</a>.'
     subfolder_ends_in_slash: "A configuração da sua sub-página está incorreta; o DISCOURSE_RELATIVE_URL_ROOT termina com um traço."
     email_polling_errored_recently:
@@ -743,14 +801,12 @@ pt:
     educate_until_posts: "Quando um utilizador começar a escrever as primeiras (n) novas mensagens, mostrar o painel pop-up de educação do novo utilizador no editor."
     title: "O nome deste sítio, tal como usado na etiqueta do título."
     site_description: "Descrever este sítio em uma frase, tal como usado na etiqueta de descrição meta."
-    contact_email: "Endereço de email do principal contacto para este sítio. Usado para notificações críticas tais como sinalizações não tratadas, assim como no formulário de contacto /sobre para assuntos urgentes."
     contact_url: "URL de Contacto para este sítio. Utilizado no formulário de contacto /sobre para assuntos urgentes."
-    queue_jobs: "PROGRAMADORES APENAS! AVISO! Por defeito, fila de trabalhos no sidekiq. Se não estiver ativa, o seu sítio irá ficar corrompido."
     crawl_images: "Recuperar imagens de URLs remotos para inserir o comprimento e largura corretos."
-    download_remote_images_to_local: "Converter imagens remotas em imagens locais ao descarregá-las; isto previne imagens corrompidas."
-    download_remote_images_threshold: "Espaço mínimo necessário em disco para descarregar imagens remotas localmente (em percentagem)"
-    download_remote_images_max_days_old: "Não descarregar imagens remotas para publicações que têm mais de n dias de idade."
-    disabled_image_download_domains: "Imagens remotas não serão descarregadas destes domínios. "
+    download_remote_images_to_local: "Converta as imagens remotas em imagens locais transferindo-as; isto previne imagens corrompidas."
+    download_remote_images_threshold: "Espaço mínimo necessário em disco para transferir imagens remotas localmente (em percentagem)"
+    download_remote_images_max_days_old: "Não transferir imagens remotas para publicações que têm mais de n dias."
+    disabled_image_download_domains: "As imagens remotas nunca serão transferidas destes domínios. "
     editing_grace_period: "Por (n) segundos após publicar, a edição não irá criar uma nova versão no histórico da mensagem."
     post_edit_time_limit: "O autor pode editar ou eliminar a sua mensagem por um período de (n) minutos após a publicação da mesma. Definir a 0 para ser para sempre."
     edit_history_visible_to_public: "Permitir que todos vejam versões anteriores de uma mensagem editada. Quando desativado, apenas membros do pessoal podem ver."
@@ -760,7 +816,6 @@ pt:
     fixed_category_positions: "Se estiver marcado, irá conseguir organizar as categorias por uma ordem fixa. Se não estiver marcado, as categorias são listadas por ordem de actividade."
     fixed_category_positions_on_create: "Se marcado, a ordenação de categorias irá ser mantida no diálogo de criação do tópico (requer fixed_category_positions)"
     add_rel_nofollow_to_user_content: "Adicionar a etiqueta rel nofollow em todos os conteúdos submetidos pelo utilizador, excepto para hiperligações internas (incluindo domínios pai). Se mudar isto, terá que atualizar todas as suas mensagens com: \"rake posts:rebake\""
-    exclude_rel_nofollow_domains: "Uma lista de domínios em que nofollow não deve ser adicionado a linkls.tld.com irá permitir automaticamente sub.tld.com. Como mínimo, deve adicionar o domínio de alto nível deste sítio para ajudar os rastreadores da internet a encontrarem todo o conteúdo. Se outras partes do seu sítio estão em outros domínicios, adicione-os também."
     post_excerpt_maxlength: "Tamanho máximo do excerto/sumário de uma mensagem."
     show_pinned_excerpt_mobile: "Mostrar excerto em publicações afixadas na vista móvel."
     show_pinned_excerpt_desktop: "Mostar excerto em publicações afixadas na vista de desktop."
@@ -771,7 +826,6 @@ pt:
     digest_logo_url: "A imagem de logo alternativa usada no topo dos emails de sumário do seu site. Deverá ser um rectângulo largo. Não deve ser uma imagem SVG. Se deixado vazio 'logo_url' será usado."
     logo_small_url: "A pequena imagem do logótipo no canto superior esquerdo do seu sítio, deve ter uma forma quadrada, visível quando arrastado para baixo. Quando deixado em branco, um glifo de início será exibido."
     favicon_url: "Um favicon para o seu sítio, veja http://en.wikipedia.org/wiki/Favicon, para trabalhar corretamente sobre um CDN deve ser um png"
-    mobile_logo_url: "A imagem do logótipo com posição fixa utilizada no canto superior esquerdo do seu sítio móvel deve ter uma forma quadrada. Quando deixado em branco, `logo_url` será utilizado. ex: http://exemplo.com/uploads/default/logo.png"
     apple_touch_icon_url: "Ícone usado para dispositivos Apple. Tamanho recomendado é 144px por 144px."
     notification_email: "Para: endereço de email usado ao enviar emails essenciais do sistema. O domínio especificado aqui deverá ter SPF, DKIM e registos PTR inversos configurados corretamente para a chegada do email."
     email_custom_headers: "A lista delimitada por barras verticais de cabeçalhos de e-mail personalizados"
@@ -796,20 +850,12 @@ pt:
     tl2_additional_likes_per_day_multiplier: "Aumentar limite de gostos por dia para nc2 (membro) ao multiplicar por este número"
     tl3_additional_likes_per_day_multiplier: "Aumentar limite de gostos por dia para nc3 (habitual) ao multiplicar por este número"
     tl4_additional_likes_per_day_multiplier: "Aumentar limite de gostos por dia para nc4 (líder) ao multiplicar por este número"
-    num_spam_flags_to_block_new_user: "Se as publicações de um novo utilizador receberem estas tantas denúncias de num_users_to_block_new_user  diferentes utilizadores, esconder todos as suas publicações e prevenir publicação futura. 0 para desactivar."
-    num_users_to_block_new_user: "Se as publicações de um novo utilizador receberem num_spam_flags_to_block_new_user denúncias de spam de estes tantos diferentes utilizadores, esconder todos as suas publicações e prevenir publicação futura. 0 para desactivar."
-    num_tl3_flags_to_block_new_user: "Se as publicações de um novo utilizador receberem estas tantas denúncias de num_tl3_users_to_block_new_user diferentes utilizadores de nível de confiança 3, esconder todos as suas publicações e prevenir publicação futura. 0 para desactivar."
-    num_tl3_users_to_block_new_user: "Se as publicações de um novo utilizador receberem num_tl3_flags_to_block_new_user denúncias de estes tantos diferentes utilizadores de nível de confiança 3, esconder todos as suas publicações e prevenir publicação futura. 0 para desactivar."
-    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."
     maximum_session_age: "Utilizador permanecerá ligado durante n horas desde a última visita"
-    ga_tracking_code: "OBSOLETO: Google analytics (ga.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics"
-    ga_domain_name: "OBSOLETO: Google analytics (ga.js) domain name, eg: mysite.com; see http://google.com/analytics"
     ga_universal_tracking_code: "Código de acompanhamento do Google Universal Analytics (analytics.js), ex: UA-12345678-9; ver http://google.com/analytics"
     ga_universal_domain_name: "Nome de domínio do Google Universal Analytics (analytics.js), ex: omeusitio.com; ver http://google.com/analytics"
     gtm_container_id: "id de contentor do Google Tag Manager. eg: GTM-ABCDEF"
@@ -840,12 +886,9 @@ pt:
     allow_index_in_robots_txt: "Especificar em robots.txt que este sítio permite ser indexado pelos motores de pesquisa."
     email_domains_blacklist: "Lista de domínios de email que os utilizadores não podem usar para registo de contas. Exemplo: mailinator.com|trashmail.net"
     email_domains_whitelist: "Lista de domínios de email que os utilizadores DEVEM usar para registar contas. AVISO: Utilizadores com domínios de email diferentes dos listados não serão permitidos!"
-    forgot_password_strict: "Não informar utilizadores da existência de uma conta quando estes usam o diálogo de palavra-passe esquecida. "
     log_out_strict: "Ao terminar sessão, saia de TODAS as sessões do utilizador em todos dispositivos"
     version_checks: "Fazer o ping do Discourse Hub para atualização de versões e mostrar mensagens sobre novas versões no painel de administração"
     new_version_emails: "Enviar um email para o endereço 'contact_email' quando uma nova versão do Discourse estiver disponível."
-    port: "PROGRAMADOR APENAS! AVISO! Utilize esta porta HTTP em vez da porta 80. Deixar em branco para usar a porta padrão 80."
-    force_hostname: "PROGRAMADOR APENAS! AVISO! Especifique um nome de servidor no URL. Deixe em branco para utilizar o valor por defeito."
     invite_expiry_days: "Durante quantos dias as chaves de convite são válidas."
     invite_passthrough_hours: "Quanto tempo pode um utilizador utilizar uma chave de convite previamente recuperada, em horas"
     login_required: "Requerer autenticação para ler conteúdo neste sítio, não permitir acesso anónimo."
@@ -921,7 +964,6 @@ pt:
     clean_up_uploads: "Remover carregamentos orfãos não referenciados para prevenir alojamento ilegal. AVISO: poderá querer criar uma cópia de segurança da diretoria /uploads antes de ativar esta configuração."
     clean_orphan_uploads_grace_period_hours: "Período de carência (em horas) antes de um carregamento orfão ser removido."
     purge_deleted_uploads_grace_period_days: "Período de carência (em dias) antes de um carregamento eliminado ser apagado."
-    purge_unactivated_users_grace_period_days: "Período de carência (em dias) antes de um utilizador que não ativou a sua conta ser eliminado."
     enable_s3_uploads: "Coloca os carregamentos no armazenamento Amazon S3. IMPORTANTE: requer credenciais S3 válidas (tanto id de chave de acesso como a chave de acesso secreta)."
     s3_use_iam_profile: 'Utiliza AWS EC2 IAM para recuperar chaves. NOTA: a ativação irá substituir as configurações de "id da chave de acesso s3" e a "chave de acesso secreta s3".'
     s3_upload_bucket: "Nome do balde da Amazon S3 que contém os ficheiros carregados. AVISO: tem que ser minúsculo, sem pontos e sem sublinhados."
@@ -1021,14 +1063,13 @@ pt:
     max_age_unmatched_ips: "Eliminar entradas IP não encontradas após (N) dias."
     num_flaggers_to_close_topic: "Número mínimo de sinalizações únicas que são necessárias para automaticamente pausar um tópico para intervenção."
     num_flags_to_close_topic: "Número mínimo de sinalizações ativas que são necessárias para automaticamente pausar um tópico para intervenção."
+    num_hours_to_close_topic: "Número de horas para pausar um tópico para intervenção."
     auto_respond_to_flag_actions: "Ativar respostas automáticas ao eliminar uma bandeira."
     min_first_post_typing_time: "Quantidade mínima de tempo em milissegundos que um utilizador deve digitar durante a sua primeira mensagem, se o limite não for atingido a mensagem será automaticamente inserida na fila de aprovação. Configurar a 0 para desativar (não recomendado)"
-    auto_block_fast_typers_on_first_post: "Bloquear automaticamente utilizadores que não cumprem min_first_post_typing_time"
-    auto_block_fast_typers_max_trust_level: "Nível de confiança máximo para bloquear automaticamente escritores rápidos"
-    auto_block_first_post_regex: "Expressão regular sensível a maiúsculas e minúsculas que se passar irá fazer com que a primeira mensagem do utilizador seja bloqueada e enviada para a fila de aprovação. Exemplo: raging|a[bc]a, irá fazer com que todas as mensagens que contenham raging ou aba ou aca sejam bloqueadas primeiro. Aplicável apenas à primeira mensagem."
     reply_by_email_enabled: "Ativar respostas aos tópicos por email."
     reply_by_email_address: "Modelo para endereços emails recebidos com função resposta por email, por exemplo: %{reply_key}@resposta.exemplo.com ou resposta+%{reply_key}@exemplo.com"
     alternative_reply_by_email_addresses: "Lista de modelos alternativos para respostas via email. Exemplo: %{reply_key}@resposta.exemplo.com ou resposta+%{reply_key}@exemplo.com"
+    incoming_email_prefer_html: "Utilize HTML em vez de texto para o correio a receber."
     disable_emails: "Impedir que Discourse envie qualquer tipo de emails"
     strip_images_from_short_emails: "Remover imagens de emails cujo tamanho seja inferior a 2800 Bytes"
     short_email_length: "Comprimento de email curto, em Bytes"
@@ -1052,6 +1093,7 @@ pt:
     attachment_filename_blacklist: "Lista de termos-chave  usados para bloquear anexos com base no nome do ficheiro."
     enable_forwarded_emails: "[BETA] Permitir aos utilizadores a criação de um tópico via o encaminhamento de um email."
     always_show_trimmed_content: "Mostrar sempre a parte aparada dos emails recebidos. AVISO: poderá revelar endereços de email."
+    private_email: "Não inclua conteúdo de dos artigos ou tópicos nas mensagens para privacidade extra."
     manual_polling_enabled: "Enviar emails utilizando a API de resposta por email."
     pop3_polling_enabled: "Solicitação através de POP3 para respostas de emails"
     pop3_polling_ssl: "Utilize SSL ao ligar a um servidor POP3. (Recomendado)"
@@ -1062,7 +1104,6 @@ pt:
     pop3_polling_username: "Nome de utilizador para a conta POP3 para resgatar emails."
     pop3_polling_password: "Palavra-passe para a conta POP3 solicitar emails ao servidor."
     log_mail_processing_failures: "Registar todas as falhas de processamento de email em http://nomedoseusítio.com/logs"
-    email_in: "Permitir que utilizadores publiquem novos tópicos através de email (requer pop3). Configurar os endereços no separador \"Configurações\" de cada categoria."
     email_in_min_trust: "Nível de Confiança mínimo que um utilizador necessita de ter para poder publicar novos tópicos por email."
     email_prefix: "A [etiqueta] usada no assunto dos emails. Se não estiver configurada, será 'Título' por defeito."
     email_site_title: "Título do sítio usado como remetente de emails. Se não for configurado, será 'título' por defeito. Se o seu 'título' contém caracteres que não são permitidos na string do remetente de email, utilize esta configuração."
@@ -1070,14 +1111,13 @@ pt:
     relative_date_duration: "Número de dias após uma publicação durante o qual as datas das mensagens serão mostradas como relativas(7d) em vez de absolutas(20 Fev)."
     delete_user_max_post_age: "Não permitir eliminação de utilizadores cuja primeira mensagem é mais antiga que (x) dias."
     delete_all_posts_max: "Número máximo de mensagens que podem ser eliminadas de uma única vez com o botão Eliminar Todas as Mensagens. Se um utilizador tem mais mensagens do que este número, estas não podem ser eliminadas de uma única vez e o utilizador não pode ser eliminado."
-    username_change_period: "Número de dias após o registo em que as contas podem modificar o seu nome de utilizador (0 para não permitir a modificação do nome de utilizador)"
     email_editable: "Permitir que os utilizadores alterem o seu endereço de email após o registo."
     logout_redirect: "Localização de redireccionamento do navegador após encerramento da sessão. EX: (http://somesite.com/logout)"
     allow_uploaded_avatars: "Permitir que os utilizadores carreguem fotografias de perfil personalizadas."
     allow_animated_avatars: "Permitir que os utilizadores utilizem fotografias de perfil com gifs animados. AVISO: executar avatars:atualizar após mudança desta configuração."
     allow_animated_thumbnails: "Gera miniaturas de imagens ou gifs animados."
     default_avatars: "URLs para avatars que serão usados por defeito para novos utilizadores até que estes o mudem."
-    automatically_download_gravatars: "Descarregar Gravatars para os utilizadores após criação de conta ou mudança de email."
+    automatically_download_gravatars: "Transferir Gravatars para os utilizadores após a criação da conta ou alteração de e-mail."
     digest_topics: "Número máximo de publicações populares a mostrar no email de resumo."
     digest_posts: "Número máximo de publicações populares a mostrar no resumo do email."
     digest_other_topics: "O número máximo de tópicos a mostrar na secção de  \"Novos em tópicos e categorias que segue\" do email de resumo."
@@ -1101,10 +1141,11 @@ pt:
     suppress_uncategorized_badge: "Não mostrar distintivos para tópicos sem categoria nas listagens de tópicos."
     permalink_normalizations: "Aplicar a seguinte expressão regular antes de igualar ligações permanentes, por exemplo: /(topic.*)\\?.*/\\1 irá remover rotas de tópico. O formato é regex+string utilize \\1 etc. para aceder a capturas"
     global_notice: "Exibir um banner global URGENTE, EMERGÊNCIA a todos os visitantes, mudar para branco para esconder (HTML permitido)."
-    disable_edit_notifications: "Desativa notificações de edição do sistema quando 'download_remote_images_to_local' está ativo."
+    disable_edit_notifications: "Desativa as notificações de edição pelo utilizador do sistema quando 'download_remote_images_to_local' está ativo."
     automatically_unpin_topics: "Desafixar tópicos automaticamente quando um utilizador chega ao final."
     read_time_word_count: "Contagem de palavras por minuto para calcular tempo estimado de leitura."
     topic_page_title_includes_category: "Título da página do tópico inclui o nome da categoria."
+    share_anonymized_statistics: "Partilhe estatísticas de utilização anonimizadas."
     max_prints_per_hour_per_user: "Número máximo de impressões de páginas /print, por hora, por utlizador. (coloque 0 para desactivar)"
     full_name_required: "O nome completo é um campo obrigatório no perfil de utilizador."
     enable_names: "Mostrar o nome completo do utilizador no seu perfil, cartão de utilizador, e emails. Desativar para esconder o nome completo em todos os locais."
@@ -1115,17 +1156,10 @@ pt:
     warn_reviving_old_topic_age: "Quando alguém começa a responder a um tópico em que a última resposta é mais antiga que estes dias, um aviso será exibido. Desativar ao configurar para 0."
     autohighlight_all_code: "Forçar o destaque do código a todos os blocos de código pré-formatados mesmo quando não se especifica a linguagem."
     highlighted_languages: "Incluídas regras de destaque da sintaxe (Aviso: incluir demasiadas linguagens pode impactar o desempenho) ver: https://highlightjs.org/static/demo/ para uma demonstração"
-    feed_polling_enabled: "INCORPORAR APENAS: incorporar feeds RSS/ATOM como mensagens."
-    feed_polling_url: "INCORPORAR APENAS: URL dos feeds de RSS/ATOM para embutir."
-    embed_by_username: "Nome de utilizador Discourse do utilizador que cria tópicos embebidos."
-    embed_username_key_from_feed: "Chave para recuperar o nome de utilizador discourse do feed."
-    embed_title_scrubber: "Expressão regular usada para filtrar títulos embutíveis."
     embed_truncate: "Truncar mensagens incorporadas."
     allowed_href_schemes: "Esquemas permitidos nos links além de http e https."
     embed_post_limit: "Número máximo de mensagens a serem incorporadas."
     embed_username_required: "O nome de utilizador para a criação de tópico é necessário."
-    embed_whitelist_selector: "Seletor CSS para elementos permitidos em incorporações."
-    embed_blacklist_selector: "Seletor CSS para elementos que foram removidos de incorporações."
     show_create_topics_notice: "Se o sítio tem menos de 5 tópicos públicos, mostrar um aviso pedindo aos administradores a criação de mais tópicos."
     delete_drafts_older_than_n_days: Eliminar rascunhos mais antigos que (n) days.
     bootstrap_mode_min_users: "Número mínimo de utilizadores necessários para desactivar o modo de inicialização (coloque 0 para desactivar)"
@@ -1164,8 +1198,6 @@ pt:
     default_categories_tracking: "Lista de categorias que por defeito são acompanhadas."
     default_categories_muted: "Lista de categorias que por defeito são mudas."
     default_categories_watching_first_post: "Lista de categorias em que a primeira publicação em cada novo tópico será vigiada por defeito."
-    max_user_api_reqs_per_day: "Número máximo de pedidos à API de utilizador por dia, por chave"
-    max_user_api_reqs_per_minute: "Número máximo de pedidos à API de utilizador por dia, por minuto"
     allow_user_api_keys: "Permitir geração de chaves de API de utilizador"
     allow_user_api_key_scopes: "Lista de esferas permitidas para chaves da API de utlizador"
     max_api_keys_per_user: "Número máximo de chaves de API de utilizador por utlizador"
@@ -1218,6 +1250,7 @@ pt:
       topic: 'Resultados'
       user: 'Utilizadores'
   sso:
+    login_error: "Erro de Início de Sessão"
     not_found: "A sua conta não foi encontrada. Por favor contacte o administrador do site."
     account_not_approved: "A sua conta ainda não foi aprovada. Receberá uma notificação por email quando a sua conta for aprovada."
     unknown_error: "Existe um problema com a sua conta. Por favor contacte o administrador do site."
@@ -1304,7 +1337,6 @@ pt:
     email_too_long: "O email fornecido é demasiado longo. Nomes de caixas de email não devem ter mais que 254 caracteres, e nomes de domínio não devem ter mais que 253 caracteres."
     reserved_username: "Esse nome de utilizador não é permitido."
     missing_user_field: "Não completou todos os campos de utilizador."
-    close_window: "A autenticação está completa. Feche esta janela para continuar."
     already_logged_in: "Oops, parece que tentou aceitar um convite para outro utilizador. Se não é o %{current_user}, por favor saia e tente novamente."
   user:
     no_accounts_associated: "Sem contas associadas"
@@ -1312,7 +1344,6 @@ pt:
     username:
       short: "deve ter pelo menos %{min} caracteres"
       long: "não deve ter mais que %{max} caracteres"
-      characters: "pode incluir apenas números, letras e sublinhados"
       unique: "tem que ser único"
       blank: "tem que estar preenchido"
       must_begin_with_alphanumeric_or_underscore: "tem de começar por uma letra, um número ou o carácter sublinhado"
@@ -1332,16 +1363,14 @@ pt:
       other: "%{count} sinalizações à espera de serem tratadas"
   unsubscribe_mailer:
     subject_template: "Confirme que não quer receber emails com actualizações de %{site_title}"
-  invite_mailer:
-    subject_template: "%{invitee_name} convidou-o a juntar-se a '%{topic_title}' em %{site_domain_name}"
-  custom_invite_mailer:
-    subject_template: "%{invitee_name} convidou-o para '%{topic_title}' em %{site_domain_name}"
-  invite_forum_mailer:
-    subject_template: "%{invitee_name} convidou-o a juntar-se a %{site_domain_name}"
-  custom_invite_forum_mailer:
-    subject_template: "%{invitee_name} convidou-o para %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Configurar a palavra-passe para a sua conta %{site_name}"
+  download_backup_mailer:
+    subject_template: "[%{email_prefix}] Transferir Cópia de Segurança do Site"
+    no_token: |
+      Desculpe, esta hiperligação de transferência da cópia de segurança já foi utilizada ou expirou.
+  admin_confirmation_mailer:
+    subject_template: "[%{email_prefix}] Confirmar nova Conta de Administrador"
   test_mailer:
     text_body_template: |
       Este é um email de teste de
@@ -1385,38 +1414,9 @@ pt:
       [mj]: https://www.mailjet.com/pricing
       [mt]: http://www.mail-tester.com/
   new_version_mailer:
-    text_body_template: |
-      Hurrah, uma nova versão do [Discourse](http://www.discourse.org) está disponível!
-
-      A sua versão: %{installed_version}
-      A nova versão: **%{new_version}**
-
-      -Atualize facilmente usando a nossa **[actualização de um-clique via navegador](%{base_url}/admin/upgrade)**
-
-      - Veja o que há de novo em [GitHub changelog](https://github.com/discourse/discourse/commits/master).
-
-      - Visite [meta.discourse.org](https://meta.discourse.org) para notícias, debates, e suporte para o Discourse.
+    subject_template: "[%{email_prefix}] Nova versão do Discourse, disponível atualização"
   new_version_mailer_with_notes:
-    text_body_template: |
-      Hurrah, uma nova versão do [Discourse](http://www.discourse.org) está disponível!
-
-      A sua versão: %{installed_version}
-      A nova versão: **%{new_version}**
-
-      -Atualize facilmente usando a nossa **[actualização de um-clique via navegador](%{base_url}/admin/upgrade)**
-
-      - Veja o que há de novo em [GitHub changelog](https://github.com/discourse/discourse/commits/master).
-
-      - Visite [meta.discourse.org](https://meta.discourse.org) para notícias, debates, e suporte para o Discourse.
-
-      ### Notas de lançamento
-
-      %{notes}
-  queued_posts_reminder:
-    text_body_template: |
-      Olá,
-
-      Existem publicações de novos utilizadores que estão à espera de revisão. [Podem ser aprovadas ou rejeitadas aqui](%{base_url}/queued-posts).
+    subject_template: "[%{email_prefix}] disponível atualização"
   flag_reasons:
     off_topic: "A sua mensagem foi marcada como **fora do contexto**: a comunidade sente que não se enquadra neste tópico, conforme o seu título e a sua primeira mensagem."
     inappropriate: "A sua mensagem foi sinalizada como **inapropriada**: a comunidade sente que é ofensiva, abusiva ou que é uma violação das [orientações da nossa comunidade](/guidelines)."
@@ -1429,32 +1429,38 @@ pt:
     deferred: "Obrigado por nos informar. Estamos a analisá-lo."
     deferred_and_deleted: "Obrigado por nos informar. Removemos a mensagem."
   system_messages:
+    private_topic_title: "Tópico #%{id}"
+    contents_hidden: "Por favor, visite o artigo para ver o seu conteúdo."
     post_hidden:
+      title: "Artigo Ocultado"
       subject_template: "Publicação oculta devido a denúncias da comunidade"
-      text_body_template: |
-        Olá,
-
-        Esta é uma mensagem automática de %{site_name} para informá-lo que a sua mensagem foi ocultada.
-
-        %{base_url}%{url}
-
-        %{flag_reason}
-
-        Múltiplos membros da comunidade denunciaram esta publicação antes de ser escondida, por isso considere como poderá rever a sua publicação para refletir o seu feedback. **Pode editar a sua publicação após %{edit_delay} minutos, e esta será automaticamente exibida.**
-
-        Contudo, se a publicação for ocultada pela comunidade uma segunda vez, irá manter-se ocultada até ser tratada pelo pessoal – e poderão ocorrer outras medidas, incluindo uma possível suspensão da sua conta.
-
-        Para orientação adicional, por favor consulte as [orientações da comunidade](%{base_url}/guidelines).
     welcome_user:
+      title: "Bem-vindo Utilizador"
       subject_template: "Bem-vindo a %{site_name}!"
     welcome_invite:
+      title: "Boas-vindas de Convite"
       subject_template: "Bem-vindo a %{site_name}!"
+      text_body_template: |
+        Obrigado por ter aceite o convite para %{site_name} -- bem-vindo!
+
+        - Nós criamos esta nova conta para si: **%{username}**. Altere o seu nome ou palavra-passe visitando [o seu perfil de utilizador][prefs].
+
+        - Quando iniciar a sessão, por favor, **utilize o mesmo endereço de e-mail do seu convite original** - caso contrário, nós não poderemos confirmar se é você!
+
+        %{new_user_tips}
+
+        Nós acreditamos num [comportamento civilizado da comunidade]%{base_url}/linhas diretrizes) de todas as vezes.
+
+        Desfrute da sua estadia!
+
+        [prefs]: %{user_preferences_url}
     backup_succeeded:
+      title: "Cópia de segurança bem-sucedida"
       subject_template: "Cópia de segurança completa corretamente"
       text_body_template: |
         A cópia de segurança foi bem-sucedida.
 
-        Visite [admin > secção de cópias de segurança](%{base_url}/admin/backups) para descarregar a sua nova cópia de segurança.
+        Visite [admin > secção de cópias de segurança](%{base_url}/admin/backups) para transferir a sua nova cópia de segurança.
 
         Aqui está o registo:
 
@@ -1462,6 +1468,7 @@ pt:
         %{logs}
         ```
     backup_failed:
+      title: "Cópia de segurança falhou"
       subject_template: "A cópia de segurança falhou"
       text_body_template: |
         A cópia de segurança falhou.
@@ -1472,6 +1479,7 @@ pt:
         %{logs}
         ```
     restore_succeeded:
+      title: "Restauro bem-sucedido"
       subject_template: "Restauração completa corretamente"
       text_body_template: |
         A restauração foi bem sucedida.
@@ -1482,6 +1490,7 @@ pt:
         %{logs}
         ```
     restore_failed:
+      title: "Restauro falhou"
       subject_template: "A restauração falhou"
       text_body_template: |
         A restauração falhou.
@@ -1497,47 +1506,16 @@ pt:
     bulk_invite_failed:
       subject_template: "Convite de utilizadores em massa processado com erros"
     csv_export_succeeded:
+      title: "Exportação de CSV bem-sucedida"
       subject_template: "Exportação de dados completa"
     csv_export_failed:
+      title: "Exportação de CSV falhou"
       subject_template: "A exportação dos dados falhou"
-      text_body_template: "Pedimos desculpa mas a sua exportação de dados falhou. Por favor verifique os registos do log ou contacte um membro do pessoal."
-    email_reject_insufficient_trust_level:
-      text_body_template: |
-        Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) falhou.
-
-        A sua conta não possui o nível de confiança necessário para criar novos tópicos para este endereço de email. Se acredita que isto é um erro, contacte um membro da equipa de apoio.
-    email_reject_user_not_found:
-      text_body_template: |
-        Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou.
-
-        A sua resposta foi enviada de um endereço de email desconhecido. Tente enviá-la de outro endereço de email, ou contacte um membro da equipa de apoio.
-    email_reject_screened_email:
-      text_body_template: |
-        Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou.
-
-        A sua resposta foi enviada de um endereço de email bloqueado. Tente enviá-la de outro endereço de email, ou contacte um membro da equipa de apoio.
     email_reject_inactive_user:
       text_body_template: |
         Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou.
 
         A sua conta associada com este email não está activa. Por favor active a sua conta antes de enviar emails.
-    email_reject_blocked_user:
-      text_body_template: |+
-        Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou.
-
-        A sua conta associada com este endereço de email foi bloqueada.
-    email_reject_reply_user_not_matching:
-      text_body_template: |+
-        Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou.
-
-        A sua resposta foi enviada de um email diferente daquele que esperávamos, por esta razão não temos a certeza que seja a mesma pessoa. Tente enviar de outro endereço de email ou contacte um membro da equipa de apoio.
-
-    email_reject_no_account:
-      text_body_template: |+
-        Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou.
-
-        Não conseguimos encontrar nenhuma conta com o seu endereço de email. Tente enviar de outro endereço de email, ou contacte um membro da equipa de apoio.
-
     email_reject_empty:
       text_body_template: |
         Pedimos desculpa, mas a sua mensagem de email para %{destination} (com título%{former_title}) não funcionou.
@@ -1550,17 +1528,6 @@ pt:
         Pedimos desculpa, mas a sua mensagem de email para %{destination} (título %{former_title}) não funcionou.
 
         Não conseguimos encontrar a sua resposta no email. **Certifique-se que a sua resposta se encontra no topo do email** - não conseguimos processar respostas em linha.
-    email_reject_invalid_access:
-      text_body_template: |
-        Pedimos desculpa, mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou.
-
-        A sua conta não tem privilégios para publicar novos tópicos nessa categoria. Se acredita que isto é um erro, contacte um membro da equipa de apoio.
-    email_reject_strangers_not_allowed:
-      text_body_template: |+
-        Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou.
-
-        A categoria que enviou neste email apenas permite respostas de utilizadores com contas validadas e endereços de email conhecidos. Se acredita que isto é um erro, contacte um membro da equipa de apoio.
-
     email_reject_invalid_post:
       text_body_template: |
         Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou.
@@ -1580,32 +1547,8 @@ pt:
         Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou.
 
         A Acção de Publicação não foi reconhecida. Por favor tente novamente, ou publique através do sítio se isto continuar.
-    email_reject_reply_key:
-      text_body_template: |
-        Pedimos desculpa, mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou.
-
-        A chave de resposta no email é inválida ou desconhecida e por isso não conseguimos determinar a que é o que email estava a responder. Contacte um membro da equipa de apoio.
-    email_reject_bad_destination_address:
-      text_body_template: |
-        Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou.
-
-        Nenhum dos endereços de destino é reconhecido. Por favor, certifique-se que está a enviar o endereço de email correcto fornecido pela equipa de apoio.
-    email_reject_topic_not_found:
-      text_body_template: |
-        Pedimos desculpa, mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou.
-
-        O tópico ao qual está a responder já não existe -- talvez tenha sido apagado. Se acredita que isto é um erro, contacte um membro da equipa de apoio.
-    email_reject_topic_closed:
-      text_body_template: |
-        Pedimos desculpa, mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou.
-
-        O tópico ao qual está a responder encontra-se fechado e já não aceita respostas. Se acredita que isto é um erro, contacte um membro da equipa de apoio.
-    email_reject_auto_generated:
-      text_body_template: |
-        Pedimos desculpa, mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou.
-
-        O seu email foi marcado como "gerado automaticamente", o que quer dizer que foi automaticamente criado por um computador em vez de ser escrito por uma pessoa; não podemos aceitar esse tipo de emails. Se acredita que isto é um erro, contacte um membro da equipa de apoio.
     email_error_notification:
+      title: "Notificação de Erro de Mensagem"
       text_body_template: |
         Infelizmente, ocorreu um erro de autenticação ao recuperar emails do servidor POP.
 
@@ -1614,62 +1557,8 @@ pt:
         Se existe uma interface web para a sua conta de POP de email, pode precisar de iniciar sessão na web e verificar a suas configurações aí.
     too_many_spam_flags:
       subject_template: "Nova conta suspensa"
-      text_body_template: |
-        Olá,
-
-        Esta é uma mensagem automática de %{site_name} para informá-lo de que as suas publicações foram temporariamente ocultadas porque foram denunciadas pela comunidade.
-
-        Como medida precaucionária, a sua conta nova foi bloqueada de criar novas respostas ou tópicos até um membro da equipa de apoio poder rever a sua conta. Pedimos desculpa pela inconveniência.
-
-        Para orientação adicional, por favor consulte as [orientações da comunidade](%{base_url}/guidelines).
     too_many_tl3_flags:
       subject_template: "Nova conta suspensa"
-      text_body_template: |
-        Olá,
-
-        Esta é uma mensagem automática de %{site_name} para informá-lo de que a sua conta está temporariamente suspensa devido a um número elevado de denúncias pela comunidade.
-
-        Como medida precaucionária, a sua conta nova foi bloqueada de criar novas respostas ou tópicos até um membro da equipa de apoio poder rever a sua conta. Pedimos desculpa pela inconveniência.
-
-        Para orientação adicional, por favor consulte as [orientações da comunidade](%{base_url}/guidelines).
-    blocked_by_staff:
-      subject_template: "Conta temporariamente suspensa"
-      text_body_template: |
-        Olá,
-
-        Esta é uma mensagem automática de %{site_name} para informá-lo de que a sua conta está temporariamente suspensa como medida precaucionária.
-
-        Por favor continue a navegar, mas não será capaz de criar novas respostas ou tópicos até um [membro da equipa de apoio](%{base_url}/about)  poder rever a sua conta. Pedimos desculpa pela inconveniência.
-
-        Para orientação adicional, por favor consulte as [orientações da comunidade](%{base_url}/guidelines).
-    user_automatically_blocked:
-      subject_template: "Novo utilizador %{username}  bloqueado devido a denúncias da comunidade."
-      text_body_template: |
-        Esta é uma mensagem automática.
-
-        O novo utilizador [%{username}](%{user_url}) foi automaticamente bloqueado porque múltiplos utilizadores marcaram mensagem(ns) de %{username}.
-
-        Por favor [reveja as sinalizações](%{base_url}/admin/flags). Se %{username} foi incorretamente bloqueado de publicar, carregue no botão de desbloqueio em [a página de administração para este utilizador](%{user_url})
-
-        Este limite pode ser alterado através de `block_new_user` nas configurações do sítio.
-    spam_post_blocked:
-      subject_template: "Novas mensagens do novo utilizador %{username} foram bloqueadas devido a hiperligações repetidas"
-      text_body_template: |
-        Esta é uma mensagem automática.
-
-        O novo utilizador [%{username}](%{user_url}) tentou criar múltiplas mensagens com hiperligações para %{domains}, mas estas foram bloqueadas para evitar spam. O utilizador ainda pode criar novas mensagens sem hiperligação a %{domains}.
-
-        Por favor [reveja o utilizador](%{user_url}).
-
-        Isto pode ser modificado através de `newuser_spam_host_threshold` e `white_listed_spam_host_domains` nas configurações do sítio.
-    unblocked:
-      subject_template: "Conta deixou de estar suspensa"
-      text_body_template: |
-        Olá,
-
-        Esta é uma mensagem automática de %{site_name} para informar que a sua conta deixou de estar suspensa após avaliação da staff.
-
-        Pode agora voltar a responder e criar novos tópicos.
     pending_users_reminder:
       subject_template:
         one: "1 utilizador espera a aprovação"
@@ -1679,7 +1568,8 @@ pt:
 
         [Por favor reveja-os na secção de administração](%{base_url}/admin/users/list/pending).
     download_remote_images_disabled:
-      subject_template: "Descarregamento de imagens remotas desativado"
+      title: "Transferência de Imagens Remotas Desativada"
+      subject_template: "Transferência de imagens remotas desativada"
       text_body_template: "A configuração `download_remote_images_to_local` foi desativada porque o limite de espaço em disco em `download_remote_images_threshold` foi alcançado."
     dashboard_problems:
       subject_template: "Problemas foram encontrados"
@@ -1709,29 +1599,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}
@@ -1851,7 +1718,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}"
@@ -1873,16 +1739,12 @@ pt:
     see_more: "Mais"
     search_title: "Pesquisar neste sítio"
     search_google: "Google"
-  login_required:
-    welcome_message: |
-      #[Bem-vindo a %{title}](#bem-vindo)
-      É necessário ter uma conta. Por favor crie uma conta ou inicie a sessão para continuar.
   terms_of_service:
     title: "Termos de Serviço"
     signup_form_message: 'Li e aceito os <a href="/tos" target="_blank">Termos de Serviço</a>.'
   deleted: 'eliminado'
   upload:
-    edit_reason: "cópias locais de imagens descarregadas"
+    edit_reason: "cópias locais de imagens transferidas"
     unauthorized: "Pedimos desculpa, o ficheiro que está a tentar carregar não está autorizado (extensões autorizadas: %{authorized_extensions})."
     pasted_image_filename: "Imagem colada"
     store_failure: "Falha ao armazenar o carregamento #%{upload_id} para o utilizador #%{user_id}."
@@ -2182,9 +2044,6 @@ pt:
         Este distintivo é concedido quando recebe o seu primeiro gosto numa publicação. Parabéns, publicou algo que os colegas membros da comunidade acham interessante, giro, ou útil!
     autobiographer:
       name: Autobiógrafo
-      description: Preencheu informação de <a href="/my/preferences">perfil</a>
-      long_description: |
-        Este distintivo é concedido por preencher <a href="/my/preferences">o seu perfil de utilizador</a> e por selecionar uma imagem de perfil. Deixar a comunidade saber mais sobre quem você é e no que está interessado torna a comunidade melhor e mais ligada. Junte-se a nós!
     anniversary:
       name: Aniversário
       description: Membro ativo há um ano, publicou pelo menos uma vez
@@ -2278,9 +2137,6 @@ pt:
         Este distintivo é concedido pela primeira vez que cita uma publicação numa resposta sua. Citar secções relevantes de publicações anteriores na sua resposta ajuda a manter as discussões coesas e focadas. Cite generosamente!
     read_guidelines:
       name: Ler Orientações
-      description: Ler as <a href="/guidelines">orientações da comunidade</a>
-      long_description: |
-        Este distintivo é concedido por <a href="/guidelines">ler as orientações da comunidade</a>. Seguir e partilhar estas simples orientações ajuda a construir uma comunidade segura, divertida e sustentável para todos. Lembre-se sempre que está outro ser humano, em muito como si, do outro lado do ecrã. Seja agradável!
     reader:
       name: Leitor
       description: Ler todas as respostas num tópico com mais de 100 respostas
@@ -2494,7 +2350,6 @@ pt:
         title: "Emoji"
       invites:
         title: "Convidar Equipa de Apoio"
-        description: "Está quase completo! Vamos convidar algumas pessoas para a equipa de apoio para ajudar a <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>disseminar as suas conversas</a>  com tópicos e respostas interessantes para que a sua comunidade ganhe tração."
       finished:
         title: "O seu Discourse está Pronto!"
         description: |
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index bdbe93b3cc..f855ee931f 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -32,9 +32,11 @@ pt_BR:
   disable_remote_images_download_reason: "Download de imagens remotas foi desativado porque não havia espaço suficiente em disco disponível."
   anonymous: "Anônimo"
   remove_posts_deleted_by_author: "Deletado pelo autor"
+  themes:
+    other_error: "Algo de errado aconteceu ao atualizar o tema"
   emails:
     incoming:
-      default_subject: "Este tópico necessita de um título"
+      default_subject: "Este tópico precisa de um título"
       show_trimmed_content: "Exibir conteúdo abreviado"
       maximum_staged_user_per_email_reached: "Atingido número máximo de usuários de teste criados por email."
       errors:
@@ -43,15 +45,15 @@ pt_BR:
         auto_generated_email_error: "Ocorre quando o cabeçalho 'precedência' estiver definido como: lista, lixo eletrônico, lote ou resposta_automática, ou quando outro cabeçalho contiver: enviado_automaticamente, respondido_automaticamente ou gerado_automaticamente."
         no_body_detected_error: "Ocorre quando não conseguimos extrair um corpo e não há anexos."
         inactive_user_error: "Ocorre quando o remetente não está ativo."
-        blocked_user_error: "Ocorre quando o remetente foi bloqueado."
         bad_destination_address: "Ocorre quando nenhum dos endereços de email nos campos Para/Cc/Cco era correspondente ao endereço de email recebido."
         strangers_not_allowed_error: "Ocorre quando um usuário tentou criar um novo tópico em uma categoria da qual não é membro."
         insufficient_trust_level_error: "Ocorre quando um usuário tenta criar um novo tópico em uma categoria onde não possui nível de confiança necessário."
         reply_user_not_matching_error: "Ocorre quando uma resposta chega em um endereço de email diferente ao da notificação enviada."
         topic_not_found_error: "Ocorre quando uma resposta foi enviada mas o tópico relacionado foi excluído."
         topic_closed_error: "Ocorre quando uma resposta foi enviada mas o tópico relacionado foi fechado."
-        bounced_email_error: "O email é um relatório de email devolvido."
-        screened_email_error: "Acontece quando o endereço de email do remetente já foi examinado."
+        bounced_email_error: "O e-mail é um relatório de e-mail devolvido."
+        screened_email_error: "Acontece quando o endereço de e-mail do remetente já foi examinado."
+      unrecognized_error: "Erro Desconhecido"
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -313,6 +315,14 @@ pt_BR:
           attributes:
             payload_url:
               invalid: "URL inválida. A URL deve conter http:// ou https://. Espaço em branco não é permitido."
+        topic_timer:
+          attributes:
+            execute_at:
+              in_the_past: "deve estar no futuro."
+        watched_word:
+          attributes:
+            word:
+              too_many: "Muitas palavras para esta ação"
       <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} ainda não colocou nada no campo Sobre Mim</div>"
@@ -322,7 +332,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
@@ -393,6 +402,9 @@ pt_BR:
     leader:
       title: "líder"
     change_failed_explanation: "Você tentou rebaixar %{user_name} para '%{new_trust_level}'. No entanto o nível de confiança dele já é '%{current_trust_level}'. %{user_name} permanecerá em '%{current_trust_level}' - se você deseja rebaixar um usuário, tranque o nível de confiança primeiro"
+  post:
+    image_placeholder:
+      broken: "Esta imagem está danificada"
   rate_limiter:
     slow_down: "Você fez essa ação demais, tente novamente mais tarde."
     too_many_requests: "Nós possuímos um limite diário do número de vezes que uma ação pode ser tomada. Por favor aguarde %{time_left} antes de tentar novamente."
@@ -515,13 +527,17 @@ pt_BR:
     welcome_to: "Bem-vindo a %{site_name}!"
     approval_required: "Um moderador tem que aprovar a sua conta para que você possa acessar este fórum. Você receberá um email quando sua conta for aprovada!"
     missing_session: "Não conseguimos detectar se sua conta foi criada. Por favor, certifique-se de que você está com os cookies do navegador habilitados."
+    admin_confirm:
+      title: "Confirmar Conta de Administrador"
   post_action_types:
     off_topic:
       title: 'Off-Topic'
       description: 'Essa mensagem não é relevante para a discussão definida pelo título e primeira mensagem, e deveria ser movida para outro local.'
+      short_description: 'Isso não é relevante à discussão'
       long_form: 'sinalizou isto como off-topic'
     spam:
       title: 'Spam'
+      short_description: 'Isto é uma propaganda ou vandalismo'
       long_form: 'sinalizado como spam'
       email_title: '"%{title}" foi sinalizado como spam'
       email_body: "%{link}\n\n%{message}"
@@ -544,18 +560,25 @@ pt_BR:
     bookmark:
       title: 'Adicionar Marcador'
       description: 'Adicionar um marcador a esta postagem'
+      short_description: 'Favoritar esta publicação'
       long_form: 'adicionou um marcador esta postagem'
     like:
       title: 'Curtir'
       description: 'Curtir esta postagem'
+      short_description: 'Curtir esta publicação'
       long_form: 'curtiu isto'
     vote:
       title: 'Vote'
       description: 'Votar nesta postagem'
       long_form: 'voto computado para esta postagem'
   user_activity:
+    no_default:
+      self: "Você não tem nenhuma atividade ainda."
+      others: "Nenhuma atividade."
     no_bookmarks:
       others: "Nenhum favorito."
+    no_likes_given:
+      self: "Você não curtiu nenhuma publicação."
   topic_flag_types:
     spam:
       title: 'Spam'
@@ -572,7 +595,6 @@ pt_BR:
       email_title: 'O tópico "%{title}" requer atenção do moderador'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Sua mensagem foi marcada pela comunidade. Por favor <a href="/my/messages">veja suas mensagens</a>.</p>'
     user_must_edit: '<p>Conteúdo sinalizado escondido.</p>'
   archetypes:
     regular:
@@ -584,7 +606,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"
@@ -797,9 +818,7 @@ pt_BR:
     educate_until_posts: "Quando o usuário começa a digitar suas primeiras (n) novos posts, mostrar o novo painel pop-up de educação do usuário no compositor."
     title: "O nome deste site, como usado na tag de título."
     site_description: "Descreva este site com uma frase, como usado na tag de meta description."
-    contact_email: "Endereço de email do responsável de contato chave para este site. Usado para notificações críticas tais como sinalizações não controladas, assim como também pela forma de contato em /about para assuntos urgentes."
     contact_url: "URL de contato para este site. Usada no formulário de contato /about para assuntos urgentes."
-    queue_jobs: "APENAS DESENVOLVEDORES! ATENÇÃO! Por padrão, enfileira tarefas no sidekiq. Se desativado, seu site ficará defeituoso."
     crawl_images: "Recupere imagens de URLs remotas para inserir as dimensões de largura e altura corretos."
     download_remote_images_to_local: "Converta imagens remotas para imagens locais, transferindo-as; isto evita imagens quebradas."
     download_remote_images_threshold: "Espaço mínimo necessário para download das imagens ( em % )"
@@ -814,7 +833,6 @@ pt_BR:
     fixed_category_positions: "Se selecionado, você será capaz de organizar as categorias em uma ordem fixa. Se nada for feito, as categorias serão listadas em ordem de atividade."
     fixed_category_positions_on_create: "Se ativado, a ordenação das categorias vai ser mantida no formulário de criação de tópico. (requer fixed_category_positions)"
     add_rel_nofollow_to_user_content: "Adicionar \"nofollow\" para todo conteúdo incluído por um usuário, exceto links internos (incluindo sub domínios). Para que as mudanças façam efeito é necessário rodar \"rake posts:rebake\"."
-    exclude_rel_nofollow_domains: "Uma lista de domínios aonde nofollow não deve ser adicionado nos links. tld.com automaticamente permite sub.tld.com. No mínimo, você deve adiocionar o domínio principal deste site para ajudar os motores de busca encontrarem todo conteúdo. Se outras partes de seu site estão em outros domínios, adicione estes também."
     post_excerpt_maxlength: "Limite de caracteres para o resumo de um post."
     show_pinned_excerpt_mobile: "Mostrar excerto de tópicos fixos na exibição para celular."
     show_pinned_excerpt_desktop: "Mostrar excerto de tópicos fixos na exibição para desktop."
@@ -825,7 +843,6 @@ pt_BR:
     digest_logo_url: "A imagem de logo alternativa usada no topo do email de resumo do seu site. Ela deve ter um formato retangular alongado e não deve ser uma imagem SVG. Se deixado em branco, `logo_url` será usado."
     logo_small_url: "A pequena imagem de logo no topo à esquerda do seu site, vista quando rolando a página abaixo. Se deixado em branco, um símbolo de casa será mostrado."
     favicon_url: "Um favicon para seu site, veja http://en.wikipedia.org/wiki/Favicon. Para funcionar corretamente por um CDN, ele deve ser um png"
-    mobile_logo_url: "A imagem de logo de posição fixa usada no topo esquerdo do seu site móvel, que deve ter um formato quadrado. Se deixado em branco, `logo_url` será usado. Por ex: http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "Ícone usado para dispositivos Apple. Tamanho recomendado é 144px por 144px."
     notification_email: "O endereço de email utilizado quando enviado emails do sistema. O domínio especificado deve ter registros SPF, DKIM e PTR, devidamente configurados para que os email funcionem corretamente."
     email_custom_headers: "A lista delimitada por barras verticais de cabeçalhos de e-mail personalizados"
@@ -850,17 +867,11 @@ pt_BR:
     tl2_additional_likes_per_day_multiplier: "Aumentar limite de likes por dia para tl2 (membros) multiplicando por esse número"
     tl3_additional_likes_per_day_multiplier: "Aumentar limite de likes por dia para tl3 (regular) multiplicando por esse número"
     tl4_additional_likes_per_day_multiplier: "Aumentar limite de likes por dia para tl4 (lideres) multiplicando por esse número"
-    num_spam_flags_to_block_new_user: "Se as publicações de um novo usuário receberem essa quantidade de sinalizações de spam de num_users_to_block_new_user usuários diferentes, esconder todos os seus posts e impedir publicação futura. 0 para desabilitar. "
-    num_users_to_block_new_user: "Se as publicações de um usuário novo receberem num_spam_flags_to_block_new_user sinalizações de spam dessa quantidade de usuários diferentes, esconder todos as suas publicações e impedir publicações futuras. 0 para desabilitar."
-    num_tl3_flags_to_block_new_user: "Se as publicações de um usuário novo tiverem essa quantidade de sinalizações de num_tl3_users_to_block_new_user usuários de nível de confiança 3 diferentes, esconder todas as publicações do usuário e prevenir postagem futura. 0 para desabilitar."
-    notify_mods_when_user_blocked: "Se um usuário for bloqueado de forma automática, enviar uma mensagem para todos os moderadores."
     flag_sockpuppets: "Se um novo usuário responder um tópico usando o mesmo endereço de IP do novo usário que começou o tópico, sinalize as duas publicações como um potencial spam."
     traditional_markdown_linebreaks: "Use quebras de linhas tradicionais em Markdown, as quais requerem dois espaços à direita para uma quebra de linha."
     post_undo_action_window_mins: "Número de minutos permitidos aos usuários para desfazerem uma ação recente em uma publicação (curtir, sinalizar, etc)"
     must_approve_users: "Os moderadores devem aprovar todas novas contas antes que elas sejam permitidas acessarem o site. CUIDADO: habilitar esta opção para um site já em funcionamento irá revogar o acesso para todos usuários já cadastrados que não são moderadores."
     maximum_session_age: "Usuário continuará logado por n horas desde a última visita"
-    ga_tracking_code: "OBSOLETO: Código de monitoramento do Google analytics (ga.js), por ex: UA-12345678-9; veja http://google.com/analytics"
-    ga_domain_name: "OBSOLETO: Nome de domínio do Google Analytics (ga.js), por ex: meusite.com; veja http://google.com/analytics"
     ga_universal_tracking_code: "Código de monitoramento Google Universal Analytics (analytics.js), ex: UA-12345678-9; veja http://google.com/analytics"
     ga_universal_domain_name: "Nome de domínio do Google Universal Analytics (analytics.js), ex: meusite.com; veja http://google.com/analytics"
     gtm_container_id: "ID do container do Gerenciador de Tags do Google. eg: GTM-ABCDEF"
@@ -890,12 +901,9 @@ pt_BR:
     allow_index_in_robots_txt: "Especificar no robots.txt que este site é permitido de ser indexado por sistemas de busca na web."
     email_domains_blacklist: "Lista delimitada por barras (|) de domínios de email que não são permitidos registros de contas. Exemplo: mailinator.com|trashmail.net"
     email_domains_whitelist: "Lista separada por barra (|) de domínios de email que usuários DEVEM usar para registrar contas. CUIDADO: Usuário com domínio de email diferentes da lista não serão permitidos!"
-    forgot_password_strict: "Não informar os usuários da existência de uma conta quando eles usam o diálogo de esquecimento de senha."
     log_out_strict: "Quando deslogando, deslogar TODAS as sessões do usuário em todos os dispositivos"
     version_checks: "Pingar Discourse Hub para atualizações de versão e exibir mensagens de versão no Painel em /admin"
     new_version_emails: "Enviar um email para o endereço contact_email quando uma nova versão do Discourse estiver disponível."
-    port: "Se você quiser especificar a porta na URL. Útil no modo de desenvolvimento. Deixe em branco para nada."
-    force_hostname: "Se você quiser especificar um hostname na URL. Útil no modo de desenvolvimento. Deixe em branco para nada."
     invite_expiry_days: "Quantos dias as chaves de convite são válidas."
     invite_passthrough_hours: "Quando tempo um usuário pode usar uma chave de convite previamente usada para logar, em horas"
     login_required: "Exigir autenticação para ler conteúdo neste site, desabilitar acesso anônimo."
@@ -971,7 +979,6 @@ pt_BR:
     clean_up_uploads: "Remover envios sem referência para evitar hospedagem ilegal. AVISO: você pode querer fazer um backup do seu diretório de /uploads antes de habilitar essa configuração."
     clean_orphan_uploads_grace_period_hours: "Carência (em horas) antes de um upload órfão ser removido."
     purge_deleted_uploads_grace_period_days: "Carência (em dias) antes que um upload excluído seja apagado."
-    purge_unactivated_users_grace_period_days: "Período extra (em dias) antes que um usuário que não ativou sua conta seja deletado."
     enable_s3_uploads: "Colocar uploads no armazenamento da Amazon S3. IMPORTANTE: exige credenciais válidas da S3 (ambos id da chave de acesso & segredo da chave de acesso)."
     s3_use_iam_profile: 'Usar papel AWS EC2 IAM para recuperar chaves. OBS: habilitar irá substituir configurações "s3 access key id" e "s3 secret access key".'
     s3_upload_bucket: "Nome do bucket da Amazon S3 no qual os arquivos serão enviados. AVISO: precisa ser em minúsculas, sem pontos, sem underscores."
@@ -1067,7 +1074,6 @@ pt_BR:
     pop3_polling_host: "O host no qual conectar via POP3 para pegar emails."
     pop3_polling_username: "O nome de usuário para a conta POP3 na qual pegar emails."
     pop3_polling_password: "A senha para a conta POP3 na qual pegar emails."
-    email_in: "Permitir usuários de postar novos tópicos via email (requer pegar emails via POP3). Configure os endereços na aba \"Configurações\" de cada categoria."
     email_in_min_trust: "O nível de confiança mínimo que um usuário necessita ter para ser permitido a postar novos tópicos via email."
     email_prefix: "A [etiqueta] usada no assunto dos emails. Ele será por padrão 'título' se não configurada."
     email_site_title: "O título do site usado como o enviador dos emails do site. Por padrão será 'título' se não for configurado. Se o seu 'título' contiver caracteres que não são permitidos em strings de enviador de emails, utilize esta configuração."
@@ -1075,7 +1081,6 @@ pt_BR:
     relative_date_duration: "Número de dias após postar quando datas de postagem serão mostradas como relativas (7d) ao invés de absolutas (20 Fev)."
     delete_user_max_post_age: "Não permitir deletar usuários cujo primeiro post for mais antigo do que (x) dias."
     delete_all_posts_max: "Número máximo de postagens que podem ser apagadas de uma vez com o botão Remover Todos Postagens. Se um usuário tiver mais postagens do que este número, as postagens não poderão ser todas removidas de uma vez e o usuário não poderá ser removido."
-    username_change_period: "O número de dias após o registro para que as contas possam mudar o seu nome de usuário (0 para não permitir a mudança de nome de usuário)."
     email_editable: "Permitir que os usuários alterem o seu endereço de e-mail após o registro."
     allow_uploaded_avatars: "Permitir aos usuários carregar fotos em seu perfil personalizado."
     allow_animated_avatars: "Permitir que os usuários usem GIF animados na foto do perfil. ATENÇÃO: executar os avatares: atualizar tarefa rake após alterar essa configuração."
@@ -1106,15 +1111,9 @@ pt_BR:
     default_code_lang: "Realce de sintaxe padrão da linguagem de programação aplicada a blocos de código GitHub (lang-auto, Ruby, Python, etc)"
     warn_reviving_old_topic_age: "Quando alguém começa a responder a um tópico mais velho do que este número de dias, um aviso será exibido para desencorajar o usuário de reviver uma velha discussão. Desabilite definindo para 0."
     autohighlight_all_code: "Aplicar código destacando todos os blocos de código pré-formatados, mesmo quando não for específica o idioma"
-    feed_polling_enabled: "Se um feed RSS / ATOM são importados como mensagens"
-    feed_polling_url: "URL do feed RSS / ATOM para importar"
-    embed_by_username: "Nome de usuário Discourse para o usuário que cria os tópicos"
-    embed_username_key_from_feed: "Chave para puxar nome do usuário discourse a partir do feed."
     embed_truncate: "Cortar os posts embutidos."
     embed_post_limit: "Número máximo de respostas para embutir"
     embed_username_required: "Nome de usuário para criação do tópico é obrigatório."
-    embed_whitelist_selector: "Seletor CSS para os elementos que são permitidos em embeds."
-    embed_blacklist_selector: "Selector CSS para elementos que são removidos dos embeds."
     show_create_topics_notice: "Se o site tem menos de 5 tópicos públicos, mostrar um aviso pedindo para os administradores criarem alguns tópicos."
     delete_drafts_older_than_n_days: Apagar rascunhos mais antigos do que (N) dias.
     prevent_anons_from_downloading_files: "Impedir que usuários anônimos façam download de arquivos anexados. AVISO: isso irá impedir quaisquer componentes do site que não sejam imagens, tendo sido postados como anexos, de funcionar."
@@ -1232,13 +1231,11 @@ pt_BR:
     email_too_long: "O email fornecido é muito longo. Os endereços de email não devem ter mais de 254 caracteres e nomes de domínio devem ter no máximo 253 caracteres."
     reserved_username: "Este nome de usuário não é permitido."
     missing_user_field: "Você não completou todos campos de usuário"
-    close_window: "A autenticação está completa. Feche esta janela para continuar."
   user:
     no_accounts_associated: "Nenhuma conta associada"
     username:
       short: "deve ter no mínimo %{min} caracteres"
       long: "precisa ter não mais que ${max} caracteres"
-      characters: "deve incluir apenas números, letras e sublinhados"
       unique: "tem que ser único"
       blank: "tem que ser preenchido"
       must_begin_with_alphanumeric_or_underscore: "deve começar com uma letra, número ou um underline"
@@ -1255,10 +1252,6 @@ pt_BR:
     subject_template:
       one: "1 sinalização aguardando a ser controlada"
       other: "%{count} sinalizações aguardando a ser controladas"
-  invite_mailer:
-    subject_template: "%{invitee_name} convidou você para '%{topic_title}' em %{site_domain_name}"
-  invite_forum_mailer:
-    subject_template: "%{invitee_name} convidou você para participar de %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Defina uma senha para a sua %{site_name}  conta"
   flag_reasons:
@@ -1294,7 +1287,6 @@ pt_BR:
       subject_template: "Exportação de dados completada"
     csv_export_failed:
       subject_template: "A exportação de dados falhou"
-      text_body_template: "Nos desculpamos, mas sua exportação de dados falhou. Por favor verifique os logs ou entre em contato com um membro da staff."
     email_reject_parsing:
       text_body_template: |
         Nos desculpamos, mas sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou.
@@ -1304,12 +1296,6 @@ pt_BR:
       subject_template: "Nova conta suspensa"
     too_many_tl3_flags:
       subject_template: "Nova conta suspensa"
-    blocked_by_staff:
-      subject_template: "Conta temporariamente suspensa"
-    spam_post_blocked:
-      subject_template: "Novo usuário %{username} teve postagem bloqueada por repetidos links"
-    unblocked:
-      subject_template: "Conta não está mais suspensa"
     pending_users_reminder:
       subject_template:
         one: "1 usuário aguardando aprovação"
@@ -1341,16 +1327,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 +1446,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}"
@@ -1494,10 +1469,6 @@ pt_BR:
     see_more: "Mais"
     search_title: "Procurar neste site"
     search_google: "Google"
-  login_required:
-    welcome_message: |
-      #[Welcome to %{title}](#welcome)
-      Este fórum de discussão requer uma conta para visualizar %{title}.  Para continuar a ler, por favor, crie uma nova conta ou entre na sua conta.
   terms_of_service:
     title: "Termos de Serviço"
     signup_form_message: 'Eu li e aceito os <a href="/tos" target="_blank">Termos de Serviço</ a>.'
@@ -1579,7 +1550,6 @@ pt_BR:
         Este emblema é concedido quando você recebe sua primeira curtida numa mensagem. Parabéns, você postou algo que sua comunidade achou interessante, legal ou divertido!
     autobiographer:
       name: Autobiógrafo
-      description: Preencheu as informações do <a href="/my/preferences">perfil</a>
     anniversary:
       name: Aniversário
       description: Membro ativo por um ano, postou ao menos uma vez
@@ -1636,7 +1606,6 @@ pt_BR:
       description: Citou uma mensagem
     read_guidelines:
       name: Leu as regras
-      description: Leu as <a href="/guidelines">regras da comunidade</a>
     reader:
       name: Leitor
       description: Leu todas as respostas em um tópico com mais de 100 respostas
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 2e6fab893e..95f2e9f36c 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -43,7 +43,6 @@ ro:
         auto_generated_email_error: "Apare când header-ul de 'precedență' este setat pe: list, junk, bulk sau auto_reply, sau atunci când orice alt header conține: auto-submitted, auto-replied sau auto-generated."
         no_body_detected_error: "Apare când nu am putut extrage corpul mesajului și nu existau fișiere atașate."
         inactive_user_error: "Apare când expeditorul nu este activ."
-        blocked_user_error: "Apare când expeditorul a fost blocat."
         bad_destination_address: "Apare  când niciuna dintre adresele de email din câmpurile To/Cc/Bcc nu se potrivește cu o adresa de email expeditor configurată."
         strangers_not_allowed_error: "Apare când un utilizator a încercat să creeze un nou subiect într-o categorie în care nu este membru. "
         insufficient_trust_level_error: "Apare atunci când un utilizator a încercat să creeze un subiect nou într-o categorie pentru care nu are nivelul de încredere necesar."
@@ -320,7 +319,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
@@ -592,7 +590,6 @@ ro:
       email_title: 'Subiectul "%{title}" necesită atenția moderatorilor'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Postarea ta a fost marcată cu marcaj de avertizare de către comunitate. Te rugăm <a href="/my/messages">să verifici mesajele</a>.</p>'
     user_must_edit: '<p>Această postare a fost marcată de către comunitate cu marcaj de avertizare și a fost ascunsă temporar.</p>'
   archetypes:
     regular:
@@ -604,7 +601,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"
@@ -820,9 +816,7 @@ ro:
     educate_until_posts: "Când utilizatorul începe să scrie primele (n) postări, arată panelul de instruire în spațiul pentru scris postarea."
     title: "Titlul scurt al site-ului, folosit în tag-ul title."
     site_description: "Descrie acest site într-o singură frază, așa cum se folosește în tagul meta-descriere."
-    contact_email: "Adresa de email a persoanei de contact principale pentru acest site. Folosită pentru notificări critice precum marcaje de avertizare negestionate și pentru chestiuni urgente trimise prin formularul de contact din /despre"
     contact_url: "URL-ul de contact pentru acest site. Folosit pentru chestiuni urgente trimise prin formularul de contact din /despre"
-    queue_jobs: "PENTRU DEVELOPER! ATENȚIE! Implicit, pune operațiile în coadă în sidekiq. Dacă e dezactivat, site-ul nu va mai funcționa."
     crawl_images: "Recuperează imaginile din URL-uri la distanță pentru a insera dimensiunile corecte de înălțime și lățime."
     download_remote_images_to_local: "Transformă imaginile la distanță în imagini locale descărcându-le; asta previne imaginile stricate."
     download_remote_images_threshold: "Spațiul minim necesar pentru descărcarea imaginilor la distanță pe local (în procente)"
@@ -837,7 +831,6 @@ ro:
     fixed_category_positions: "Dacă e bifat, veți putea aranja categoriile într-o ordine fixă. Dacă e nebifat, categoriile sunt listate în ordinea activității."
     fixed_category_positions_on_create: "Dacă este bifat, ordonarea categoriilor va fi menținută în dialogul de creare a subiectelor (presupune fixed_category_positions)."
     add_rel_nofollow_to_user_content: "Adaugă atributul rel nofollow la toate conținuturile transmise de către utilizator, cu excepția link-urilor interne (includiv domeniile părinte). Dacă schimbi această setare, postările trebuie refăcute cu: \"rake posts:rebake\""
-    exclude_rel_nofollow_domains: "O listă a domeniilor unde nofollow nu trebuie adăugat la link-uri. tld.com va permite automat și sub.tld.com. Ca cerință minimă, va trebui să adaugi domeniul top-level  al acestui site pentru a permite roboților web să îi găsească tot conținutul. Dacă există părți ale site-ul tău care se află pe alte domenii, adăugă-le și pe acestea."
     post_excerpt_maxlength: "Lungimea maximă a unui fragment/rezumat dintr-o postare."
     show_pinned_excerpt_mobile: "Arată fragmente din subiectele fixate în vizualizarea de mobil."
     show_pinned_excerpt_desktop: "Arată fragmente din subiectele fixate în vizualizarea de desktop."
@@ -848,7 +841,6 @@ ro:
     digest_logo_url: "Imaginea logo alternativă folosită în partea de sus a emailurilor-rezumat de pe site-ul tău. Trebuie să aibă o forma de dreptunghi lat. Nu trebuie să  fie o imagine SVG. Dacă e lăsată goală, va fi folosit în locul ei - `logo_url` ."
     logo_small_url: "Imaginea logo mică din partea de sus-stânga a site-ului tău va trebui să aibă o formă dreptunghiulară, vizibilă când se derulează pagina. Dacă e lăsată goală, va fi afișat un pictograf."
     favicon_url: "Un favicon pentru site-ul tău trebuie să fie în format png pentru a funcționa corect peste un CDN  vedeți http://en.wikipedia.org/wiki/Favicon"
-    mobile_logo_url: "Imaginea logo cu poziție fixă folosită în partea stângă-sus a site-ului tău mobil. Trebuie să aibă o formă pătrată. Dacă este lăsată goală, va fi folosit `logo_url` . De ex.: http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "Iconiță folosită pentru dispozitivele touch Apple. Mărimea recomandată este 144px pe 144px."
     notification_email: "Adresă expeditor: adresa de email folosită când se trimit toate emailurile esențiale ale sistemului. Domeniul specificat aici trebuie să aibă setate corect SPF, DKIM și reverse PTR pentru ca emailul să poată fi livrat."
     email_custom_headers: "O listă delimitată cu simbolul | (pipe) a header-elor personalizate de email"
@@ -873,20 +865,12 @@ ro:
     tl2_additional_likes_per_day_multiplier: "Crește numărul maxim de aprecieri pe zi pentru (membrii cu) nivelul de încredere 2, multiplicând cu această valoare"
     tl3_additional_likes_per_day_multiplier: "Crește numărul maxim de aprecieri pe zi pentru (membrii cu) nivelul de încredere 3, multiplicând cu această valoare"
     tl4_additional_likes_per_day_multiplier: "Crește numărul maxim de aprecieri pe zi pentru (membrii cu) nivelul de încredere 4, multiplicând cu această valoare"
-    num_spam_flags_to_block_new_user: "Dacă postările unui nou utilizator primesc atâtea marcaje de avertizare ca spam de la num_users_to_block_new_user utilizatori diferiți, ascunde-i toate postările și împiedică-l să mai posteze. 0 pentru dezactivare."
-    num_users_to_block_new_user: "Dacă mesajele unui nou utilizator obțin num_spam_flags_to_block_new_user marcaje de avertizare de la tot atâția utilizatori diferiți, ascunde toate mesajele sale și blochează-i posibilitatea de a posta. 0 pentru dezactivare."
-    num_tl3_flags_to_block_new_user: "Dacă postările unui nou utilizator primesc atâtea marcaje de avertizare de la num_tl3_users_to_block_new_user de utilizatori diferiți cu nivel de încredere 3, ascunde toate postările sale și blochează-i posibilitatea de a posta pe viitor. 0 pentru dezactivare."
-    num_tl3_users_to_block_new_user: "Dacă postările unui utilizator nou primesc num_tl3_flags_to_block_new_user marcaje de avertizare de la tot atâția utilizatori diferiți cu nivelul de încredere 3, ascunde-i toate postările și blochează-i posibilitatea de a posta pe viitor. 0 pentru dezactivare."
-    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."
     maximum_session_age: "Utilizatorul va rămâne autentificat pentru n ore de la ultima vizită"
-    ga_tracking_code: "ÎNVECHIT: Google analytics (ga.js) cod de urmărire, eg: UA-12345678-9; see http://google.com/analytics"
-    ga_domain_name: "ÎNVECHIT: numele domeniului Google Analytics (ga.js), de exemplu: siteulmeu.com ; vezi http://google.com/analytics"
     ga_universal_tracking_code: "Codul de urmărire Google Universal Analytics (analytics.js), ex: UA-12345678-9; vezi http://google.com/analytics"
     ga_universal_domain_name: "Numele de domeniu Google Universal Analytics (analytics.js), ex: mysite.com; vezi http://google.com/analytics"
     gtm_container_id: "ID-ul containerului Google Tag Manager. De ex: GTM-ABCDEF"
@@ -917,12 +901,9 @@ ro:
     allow_index_in_robots_txt: "Specifică în robots.txt că acest site poate fi indexat de motoarele de căutare web."
     email_domains_blacklist: "O listă de domenii de email separate cu simbolul | (pipe) ale căror utilizatori nu au permisiunea să înregistreze conturi. Exemplu: mailinator.com|trashmail.net"
     email_domains_whitelist: "O listă de domenii de email (separate cu simbolul | (pipe)) cu care utilizatorii TREBUIE să se înregistreze. ATENȚIE: utilizatorii cu alte domenii de email decât cele listate nu vor avea permisiunea să se înregistreze."
-    forgot_password_strict: "Nu informa utilizatorii despre existența unui cont atunci când folosesc dialogul pentru parolă uitată."
     log_out_strict: "La ieșire, închide TOATE sesiunile pentru utilizator, pe toate dispozitivele."
     version_checks: "Verifică Hub-ul Discourse pentru actualizări și arată notificările de versiuni noi pe spațiul de lucru /admin ."
     new_version_emails: "Trimite un email la adresa contact_email când o nouă versiune de Discourse este disponibilă."
-    port: "PENTRU DEVELOPER! ATENȚIE! Folosește acest port HTTP în locul portului 80 care este implicit. Lasă liber pentru a folosi portul 80, ca implicit."
-    force_hostname: "PENTRU DEVELOPER! ATENȚIE! Specifică un nume de gazdă în URL. Lasă liber pentru cel implicit."
     invite_expiry_days: "Cât timp sunt valabile cheile de invitație ale utilizatorilor, în zile"
     invite_passthrough_hours: "Cât timp un utilizator poate folosi o cheie de invitație acceptată anterior pentru autentificare, în ore"
     login_required: "Cere autentificare pentru a citi conținutul acestui site, blochează accesul anonim."
@@ -999,7 +980,6 @@ ro:
     clean_up_uploads: "șterge încărcările ne-referențiate orfane pentru a preveni găzduirea ilegală. ATENȚIE: înainte de a activa această setare faceți un backup la directorul /uploads ."
     clean_orphan_uploads_grace_period_hours: "Perioada de grație (în ore) înainte ca o reîncărcare orfană să fie ștearsă."
     purge_deleted_uploads_grace_period_days: "Perioada de grație (în zile) înainte ca o încărcare ștearsă să fie eliminată."
-    purge_unactivated_users_grace_period_days: "Perioada de grație (în zile) înainte ca un utilizator care nu și-a activat contul să fie șters."
     enable_s3_uploads: "Pune încărcările pe spațiul Amazon S3. IMPORTANT: necesită un acces valid (atât identificatorul cheii de acces cât și cheia secretă)."
     s3_use_iam_profile: 'Folosește rolul AWS EC2 IAM pentru retragerea cheilor. NOTĂ: activarea va suprascrie setările pentru "s3 access key id" și "s3 secret access key".'
     s3_upload_bucket: "Numele containerului Amazon S3 unde vor fi încărcate fișierele. ATENȚIE: trebuie să fie scris cu litere mici, fără puncte și fără underscore."
@@ -1101,9 +1081,6 @@ ro:
     num_flags_to_close_topic: "Numărul minim de marcaje de avertizare active care este necesar pentru a suspenda un subiect în vederea intervenției"
     auto_respond_to_flag_actions: "Activează răspunsul automat la gestionarea unui marcaj de avertizare."
     min_first_post_typing_time: "Durata de timp minimă în milisecunde cât este nevoie ca un utilizator să tasteze la prima postare, dacă acest prag nu este atins postarea va intra automat în coada mesajelor care necesită aprobare. Valoarea 0 dezactivează (nerecomandat)"
-    auto_block_fast_typers_on_first_post: "Blochează automat utilizatorii care nu întrunesc min_first_post_typing_time"
-    auto_block_fast_typers_max_trust_level: "Nivelul maxim de încredere pentru a-i bloca automat pe cei care scriu rapid la tastatură"
-    auto_block_first_post_regex: "Un regex care nu ține cont de majuscule și minuscule va determina prima postare a utilizatorului să fie blocată și trimisă în coada de aprobare. Exemplu: raging|a[bc]a va determina toate postările care conțin raging sau aba sau aca să fie blocate din prima. Se aplică doar la prima postare."
     reply_by_email_enabled: "Activează răspunsurile către subiecte prin email."
     reply_by_email_address: "șablon pentru răspuns prin email de intrare, de exemplu: %{reply_key}@reply.example.com sau răspunsuri+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Listă de șabloane alternative pentru adresele de email primite cu răspunsuri prin email. Exemplu: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
@@ -1140,7 +1117,6 @@ ro:
     pop3_polling_username: "Numele de utilizator al contului POP3 pentru retragerea emailurilor."
     pop3_polling_password: "Parola contului de POP3 pentru retragerea emailurilor."
     log_mail_processing_failures: "Înregistrează toate erorile de procesare la http://yoursitename.com/logs"
-    email_in: "Permite utilizatorilor să posteze noi subiecte prin email (necesită retragere de emailuri prin POP3). Configurează adresa în tab-ul \"Setări\" al fiecărei categorii."
     email_in_min_trust: "Nivelul minim de încredere de care are nevoie un utilizator pentru a i se permite să posteze noi subiecte prin email."
     email_prefix: "[Eticheta] e folosită în subiectul email-ului. Implicit va fi \"titlul\", dacă nu este setată altfel."
     email_site_title: "Titlul site-ului folosit ca expeditor de email-uri trimise de site. Implicit va fi 'titlu', dacă nu este setat altfel. Dacă 'titlul' conține caractere care nu sunt permise în email, folosiți această setare."
@@ -1148,7 +1124,6 @@ ro:
     relative_date_duration: "Numărul de zile după crearea unei postări cât data postării va sta afișată în format relativ (7z) în loc de format absolut (20 Feb)."
     delete_user_max_post_age: "Nu permite ștergerea utilizatorilor a căror prima postare e mai veche de (x) de zile."
     delete_all_posts_max: "Numărul maxim de postări ce pot fi șterse deodată folosind butonul șterge toate postările. Dacă un utilizator are mai multe postări decât această valoare, postările sale nu pot fi șterse dintr-o dată și utilizatorul nu poate fi șters."
-    username_change_period: "Numărul de zile după înregistrare în care conturile își pot schimba numele de utilizator (0 la nu permite schimbarea numelui de utilizator)."
     email_editable: "Permite utilizatorilor să își schimbe adresa de email după înregistrare."
     logout_redirect: "URL-ul spre care să fie redirecționat browserul după ieșire (ex: http://somesite.com/logout)"
     allow_uploaded_avatars: "Permite utilizatorilor să încarce o poză de profil personalizate."
@@ -1162,7 +1137,6 @@ ro:
     digest_min_excerpt_length: "Lungimea minimă (în caractere) a extraselor de postări, ce vor fi incluse în emailul-rezumat."
     digest_suppress_categories: "Nu include aceste categorii în emailurile-rezumat."
     disable_digest_emails: "Dezactivează emailurile-rezumat pentru toți utilizatorii."
-    email_accent_bg_color: "Culoarea accent care să fie folosită ca fundal pentru unele elemente din emailurile HTML. Introdu numele culorii („roșu”) sau valoarea hex ('#FF000')."
     email_accent_fg_color: "Culoarea textului redat pe culoarea de fundal a emailurilor HTML. Introdu un nume de culoare („alb”) sau o valoare hex ('#FFFFFF')."
     email_link_color: "Culoarea link-urilor din emailurile HTML. Introdu un nume de culoare („albastru”) sau o valoare hex ('#0000FF')."
     detect_custom_avatars: "Dacă sau nu să verifice dacă utilizatorii și-au încărcat poze de profil personalizate."
@@ -1196,17 +1170,10 @@ ro:
     warn_reviving_old_topic_age: "Când cineva răspunde la un subiect unde ultimul răspuns e mai vechi decât atâtea zile, va fi afișată o avertizare. Dezactivează prin alegerea cifrei 0."
     autohighlight_all_code: "Forțează aplicarea de punere în evidență cod pe toate blocurile de cod preformatate, chiar și atunci când nu le este explicit specificată limba."
     highlighted_languages: "Regulile e evidențiere sintactică. (Atenție: includerea de prea multe limbaje va avea un impact asupra performanței) vezi: https://highlightjs.org/static/demo/ pentru un demo"
-    feed_polling_enabled: "EXCLUSIV ÎNCORPORARE:  Dacă să încorporeze un flux RSS/ATOM ca postări."
-    feed_polling_url: "EXCLUSIV ÎNCORPORARE: URL fluxului RSS/ATOM care să fie încorporat."
-    embed_by_username: "Numele utilizator Discourse al utilizatorului care creează subiecte embedded."
-    embed_username_key_from_feed: "Cheie pentru extragerea numelui utilizator din flux."
-    embed_title_scrubber: "Expresie regulată pentru curățarea titlurile integrabile."
     embed_truncate: "Retează postările încorporate."
     allowed_href_schemes: "Alte tipuri de linkuri permise, în afară de http și https."
     embed_post_limit: "Numărul maxim de postări care să fie încorporate."
     embed_username_required: "Numele utilizator pentru acest subiect este obligatoriu."
-    embed_whitelist_selector: "Selector CSS pentru elementele ce sunt permise în încorporări."
-    embed_blacklist_selector: "Selector CSS pentru elementele ce sunt șterse din încorporări"
     show_create_topics_notice: "Dacă site-ul are mai puțin de 5 subiecte publice, afișează o notificare prin care se cere adminilor să creeze subiecte."
     delete_drafts_older_than_n_days: șterge drafturile mai vechi de (n) zile.
     bootstrap_mode_min_users: "Numărul minim de utilizatori necesar pentru dezactivarea modului bootstrap (0 pentru dezactivare)"
@@ -1245,8 +1212,6 @@ ro:
     default_categories_tracking: "Implicit, listează categoriile care sunt urmărite."
     default_categories_muted: "Implicit, listează categoriile care sunt setate pe silențios."
     default_categories_watching_first_post: "Lista categoriilor în care prima postare din fiecare topic va fi urmărită activ în mod implicit."
-    max_user_api_reqs_per_day: "Numărul maxim de interogări API utilizator pe cheie, pe zi. "
-    max_user_api_reqs_per_minute: "Numărul maxim de interogări API utilizator pe cheie, pe minut. "
     allow_user_api_keys: "Permite generarea de chei API pentru utilizator"
     allow_user_api_key_scopes: "Lista domeniilor pentru care se permit chei API pentru utilizatori"
     max_api_keys_per_user: "Numărul maxim de chei API utilizator pe utilizator"
@@ -1396,7 +1361,6 @@ ro:
     email_too_long: "Adresa de email pe care ai introdus-o este prea lungă. Numele de căsuțe poștale nu trebuie să depășească 254 de caractere, și numele de domenii nu trebuie să depășească 253 de caractere."
     reserved_username: "Acest nume utilizator nu este permis."
     missing_user_field: "Nu ai completat toate câmpurile utilizatorului"
-    close_window: "Autentificarea este completă. Închide această fereastră pentru a continua."
     already_logged_in: "Oops, se pare că încerci să accepți o invitație de la un alt utilizator. Dacă nu ești %{current_user}, te rugăm ieși și intră din nou."
   user:
     no_accounts_associated: "Nu sunt conturi asociate"
@@ -1404,7 +1368,6 @@ ro:
     username:
       short: "trebuie să fie cel puțin %{min} de caractere"
       long: "trebuie să nu aibă mai mult de %{max} caractere"
-      characters: "trebuie să includă doar numere, litere și underscor-uri"
       unique: "trebuie să fie unic"
       blank: "trebuie să fie prezent"
       must_begin_with_alphanumeric_or_underscore: "trebuie să înceapă ci o literă, un număr sau un underscore"
@@ -1425,14 +1388,6 @@ ro:
       other: "%{count} de marcaje de avertizare așteptând să fie gestionate"
   unsubscribe_mailer:
     subject_template: "Confirmă că nu mai vrei să primești actualizări pe email de la %{site_title}"
-  invite_mailer:
-    subject_template: "%{invitee_name} te-a invitat la subiectul '%{topic_title}' pe %{site_domain_name}"
-  custom_invite_mailer:
-    subject_template: "%{invitee_name} te-a invitat la subiectul '%{topic_title}' pe  %{site_domain_name}"
-  invite_forum_mailer:
-    subject_template: "%{invitee_name} te-a invitat să te alături pe %{site_domain_name}"
-  custom_invite_forum_mailer:
-    subject_template: "%{invitee_name} te-a invitat să te alături pe %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Setează parolă pentru contul tău %{site_name}"
   test_mailer:
@@ -1477,39 +1432,6 @@ ro:
       [mg]: http://www.mailgun.com/
       [mj]: https://www.mailjet.com/pricing
       [mt]: http://www.mail-tester.com/
-  new_version_mailer:
-    text_body_template: |
-      Uraaa, o nouă versiune de [Discourse](http://www.discourse.org) este acum disponibilă!
-
-      Versiunea curentă: %{installed_version}
-      Noua versiune: **%{new_version}**
-
-      - Actualizează folosind metoda noastră de **[actualizare cu un singur click în browser](%{base_url}/admin/upgrade)**
-
-      - Află ce e nou în [raportul de schimbări GitHub](https://github.com/discourse/discourse/commits/master)
-
-      - Vizitează [meta.discourse.org](https://meta.discourse.org) pentru știri, discuții și suport pentru Discourse
-  new_version_mailer_with_notes:
-    text_body_template: |
-      Uraaa, o nouă versiune de [Discourse](http://www.discourse.org) este acum disponibilă!
-
-      Versiunea curentă: %{installed_version}
-      Noua versiune: **%{new_version}**
-
-      - Actualizează folosind metoda noastră de **[actualizare cu un singur click în browser](%{base_url}/admin/upgrade)**
-
-      - Află ce e nou în [raportul de schimbări GitHub](https://github.com/discourse/discourse/commits/master)
-
-      - Vizitează [meta.discourse.org](https://meta.discourse.org) pentru știri, discuții și supot pentru Discourse
-
-      ### Note de versiune
-
-      %{notes}
-  queued_posts_reminder:
-    text_body_template: |
-      Salutare,
-
-      Există postări de utilizatori noi care așteaptă să fie moderate. [Aprobă-le sau respinge-le aici](%{base_url}/queued-posts).
   flag_reasons:
     off_topic: "Postarea ta a fost marcată cu marcaj de avertizare **în afara subiectului**: comunitatea simte că nu se potrivește subiectului, așa cum e el momentan definit de titlu și de prima postare."
     inappropriate: "Postarea ta a fost marcată cu marcaj de avertizare **inadecvat**: comunitatea simte că este ofensatoare, abuzivă sau în contradicție cu [ghidul comunității noastre](/guidelines)."
@@ -1524,20 +1446,6 @@ ro:
   system_messages:
     post_hidden:
       subject_template: "Postare ascunsă din cauza marcajelor de avertizare ale comunității"
-      text_body_template: |
-        Salut,
-
-        Acesta este un mesaj automat de pe %{site_name} pentru a te informa că mesajul tău a fost ascuns.
-
-        %{base_url}%{url}
-
-        %{flag_reason}
-
-        Mai mulți membri ai comunității au marcat acestă postare cu marcaje de avertizare înainte ca ea să fie ascunsă, așa că te rugăm să îți revizuiești postarea pentru a ține cont de feedback-ul primit. **Îți poți edita postarea după %{edit_delay} minute, și ea va fi automat re-afișată**
-
-        Totuși, dacă postarea este ascunsă de comunitate pentru a doua oară, va rămâne așa până ce va fi gestionată de un membru al echipei -- și asta ar putea atrage și alte consecințe, inclusiv posibilitatea suspendării contului tău..
-
-        Pentru informații suplimentare, te rugăm să citești [ghidul comunității](%{base_url}/guidelines).
     welcome_user:
       subject_template: "Bine ai venit pe %{site_name}!"
     welcome_invite:
@@ -1593,42 +1501,11 @@ ro:
       subject_template: "Exportul datelor s-a terminat"
     csv_export_failed:
       subject_template: "Exportul datelor a eșuat"
-      text_body_template: "Ne pare rău, dar exportul datelor tale a eșuat. Te rugăm să verifici rapoartele sau să contactezi un membru al echipei."
-    email_reject_insufficient_trust_level:
-      text_body_template: |
-        Ne pare rău, dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers.
-
-        Contul tău nu are nivelul de încredere necesar pentru a crea noi subiecte, de la această adresă de email. Dacă ți se pare că aste e o eroare, contactează un membru al echipei.
-    email_reject_user_not_found:
-      text_body_template: |
-        Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers.
-
-        Răspunsul tău a fost trimis de pe o adresă de email necunoscută. Încearcă să îl trimiți de pe o altă adresă de email, sau contactează un membru al echipei.
-    email_reject_screened_email:
-      text_body_template: |
-        Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers.
-
-        Răspunsul tău a fost trimis de pe o adresă de email blocată. Încearcă să îl trimiți de pe o altă adresă, sau contactează un membru al echipei.
     email_reject_inactive_user:
       text_body_template: |
         Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers.
 
         Contul tău asociat acestei adrese de email nu este activat. Te rugăm să îți activezi contul înainte de a trimite emailuri.
-    email_reject_blocked_user:
-      text_body_template: |
-        Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers.
-
-        Contul asociat acestei adrese de email este blocat.
-    email_reject_reply_user_not_matching:
-      text_body_template: |
-        Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers.
-
-        Răspunsul tău a fost trimis de pe o adresă de email diferită de cea așteptată, așa că nu suntem siguri că este aceeași persoană. Încearcă să trimiți de pe altă adresă de email, sau contactează un membru al echipei.
-    email_reject_no_account:
-      text_body_template: |
-        Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers.
-
-        Nu putem găsi nici un cont care să corespundă adresei tale de email. Încearcă să trimiți de pe o adresă diferită de email, sau contactează un membru al echipei.
     email_reject_empty:
       text_body_template: |
         Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers.
@@ -1641,17 +1518,6 @@ ro:
         Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers.
 
         Nu am putu găsi răspunsul tău în email. **Asigură-te că răspunsul tău este în partea de sus a emailului** -- nu putem procesa răspunsuri intercalate.
-    email_reject_invalid_access:
-      text_body_template: |+
-        Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers.
-
-        Contul tău nu are drepturile necesare pentru a posta noi subiecte în acea categorie. Dacă ți se pare că asta e o eroare, contactează un membru al echipei.
-
-    email_reject_strangers_not_allowed:
-      text_body_template: |
-        Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers.
-
-        Categoria căreia i-ai trimis acest email nu permite răspunsuri decât de la utilizatori cu conturi valide și adrese de email cunoscute. Dacă ți se pare că e o eroare, contactează un membru al echipei.
     email_reject_invalid_post:
       text_body_template: |
         Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers.
@@ -1671,31 +1537,6 @@ ro:
         Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers.
 
         Acțiunea de postare nu a fost recunoscută. Te rugăm să încerci din nou, sau să postezi pe website dacă eroarea persistă.
-    email_reject_reply_key:
-      text_body_template: |
-        Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers.
-
-        Cheia de răspuns la acest email este invalidă sau necunoscută, așa că nu ne putem da seama la ce email vine acest răspuns. Contactați un membru al echipei.
-    email_reject_bad_destination_address:
-      text_body_template: |
-        Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers.
-
-        Nici una din adresele de email de destinație nu este recunoscută. Te rugăm să verifici că trimiți la adresa corecta de email furnizată de către echipă.
-    email_reject_topic_not_found:
-      text_body_template: |
-        Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers.
-
-        Subiectul la care vrei să răspunzi nu mai există -- poate că a fost șters? Dacă ți se pare că e o eroare, contactează un membru al echipei.
-    email_reject_topic_closed:
-      text_body_template: |
-        Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers.
-
-        Subiectul la care vrei să răspunzi este în prezent închis și nu mai acceptă răspunsuri. Dacă ți se pare că e o eroare, contactează un membru al echipei.
-    email_reject_auto_generated:
-      text_body_template: |
-        Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers.
-
-        Emailul tău a fost marcat ca „autogenerat”, ceea ce înseamnă că a fost creat automat de un computer în loc să fie scris de un om; nu putem accepta aceste tipuri de emailuri. Dacă ți se pare că este o eroare, contactează un membru al echipei.
     email_error_notification:
       text_body_template: |
         Din păcate,s-a produs o eroare de autentificare la retragerea emailurilor de pe serverul POP
@@ -1705,63 +1546,8 @@ ro:
         Dacă există interfață utilizator web pentru contul tău POP, ar trebui să te autentifici pe ea și să îți verifici acolo setările.
     too_many_spam_flags:
       subject_template: "Cont nou suspendat"
-      text_body_template: |
-        Salut,
-
-        Acesta este un mesaj automat de pe %{site_name} pentru a te informa că postările tale au fost temporar ascunse pentru că au fost marcate cu marcaje de avertizare de către comunitate..
-
-        Ca măsura de precauție, noului tău cont i s-a blocat posibilitatea de a crea noi răspunsuri sau subiecte până ce un un membru al echipei nu îl va verifica. Ne cerem scuze pentru inconveniență.
-
-        Pentru informații suplimentare, te rugăm să citești [ghidul comunității](%{base_url}/guidelines).
     too_many_tl3_flags:
       subject_template: "Cont nou suspendat"
-      text_body_template: |
-        Salut,
-
-        Acesta este un mesaj automat de pe %{site_name} pentru a te informa că ți-a fost suspendat contul din cauza unui număr mare de marcaje de avertizare primite de la comunitate.
-
-        Ca măsura de precauție, noului tău cont i s-a blocat posibilitatea de a crea noi răspunsuri sau subiecte până ce un un membru al echipei nu îl va verifica. Ne cerem scuze pentru inconveniență.
-
-        Pentru informații suplimentare, te rugăm să citești [ghidul comunității](%{base_url}/guidelines).
-    blocked_by_staff:
-      subject_template: "Cont suspendat temporar"
-      text_body_template: |+
-        Salut,
-
-        Acesta este un mesaj automat de pe %{site_name} pentru a te informa că ți-a fost suspendat temporar contul, ca măsură de precauție.
-
-        Poți să continui să răsfoiești, dar nu vei mai putea să răspunzi sau să creezi subiecte până când un [membru al echipei](%{base_url}/about) nu îți verifică postările recente. Ne cerem scuze pentru inconveniență.
-
-        Pentru informații suplimentare, te rugăm să citești [ghidul comunității](%{base_url}/guidelines).
-
-    user_automatically_blocked:
-      subject_template: "Noul utilizator %{username} a fost blocat de marcajele de avertizare ale comunității."
-      text_body_template: |
-        Acesta este un mesaj automat.
-
-        Noul utilizator [%{username}](%{user_url}) a fost blocat în mod automat din cauza că mai mulți utilizatori au marcat postarea(ările) lui %{username} cu cu marcaje de avertizare.
-
-        Te rugăm [verifică marcajele de avertizare](%{base_url}/admin/flags). Dacă %{username} a fost blocat în mod incorect de la postare, dă click pe butonul deblocare din [pagina de administrare pentru acest utilizator](%{user_url}).
-
-        Pragul poate fi schimbat prin `block_new_user` din setările site-ului.
-    spam_post_blocked:
-      subject_template: "Utilizatorul nou %{username} are postările blocate datorită adreselor repetate"
-      text_body_template: |
-        Acesta este un mesaj automat.
-
-        Noul utilizator [%{username}](%{user_url}) a încercat să creeze postări multiple cu link-uri la %{domains}, dar aceste postări au fost blocate pentru a evita spam-ul. Utilizatorul poate încă să creeze noi subiecte dar care să nu link-uiască la  %{domains}.
-
-        Te rugăam [verifică acest utilizator](%{user_url}).
-
-        Această setare poate fi schimbată prin `newuser_spam_host_threshold` și `white_listed_spam_host_domains` din setările site-ului.
-    unblocked:
-      subject_template: "Contul nu mai este în așteptare"
-      text_body_template: |
-        Salut,
-
-        Acesta este un mesaj automat de pe %{site_name} pentru a te informa că - în urma verificărilor echipei - contul tău nu mai este suspendat.
-
-        Acum poți să creezi din nou subiecte și postări. Îți mulțumim pentru răbdare.
     pending_users_reminder:
       subject_template:
         one: "un utilizator în așteptarea aprobării"
@@ -1802,26 +1588,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 +1708,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}"
@@ -1962,10 +1727,6 @@ ro:
     see_more: "Mai multe"
     search_title: "Caută în site"
     search_google: "Google"
-  login_required:
-    welcome_message: |
-      #[Bine ai venit pe %{title}](#welcome)
-      Ai nevoie de un cont. Te rugăm să îți creezi un cont sau autentifică-te pentru a continua.
   terms_of_service:
     title: "Condițiile generale de utilizare"
     signup_form_message: 'Am citit și accept <a href="/tos" target="_blank">Condițiile generale de utilizare</a>.'
@@ -2271,9 +2032,6 @@ ro:
         Acest ecuson se acordă atunci când primești prima apreciere la o postare. Felicitări, ai postat ceva ce colegii tăi membri ai comunității au găsit a fi interesant, mișto și folositor!
     autobiographer:
       name: Autobiograf
-      description: Ai completat informațiile de la <a href="/my/preferences">profil</a>
-      long_description: |
-        Acest ecuson se acordă pentru completarea <a href="/my/preferences">profilului utilizator</a> și selectare unei poze de profil. Faptul că oferi celorlați câteva informații despre cine ești și ce anume te interesează contribuie crearea unei comunităil mai bune și mai coezive. Alătură-te nouă!
     anniversary:
       name: Aniversare
       description: Ești membru activ de un an, ai postat cel puțin odată
@@ -2366,9 +2124,6 @@ ro:
         Acest ecuson se acordă când, pentru prima dată, citezi o postare precedentă în cadrul propriului tău răspuns și ajută la conexarea discuțiilor în cadrul unui subiect. Cel mai simplu mod să citezi este să selectezi o secțiune a unei postări și apoi să apeși orice buton de răspuns. Citează generos!
     read_guidelines:
       name: Ghid Citit
-      description: Ai citit <a href="/guidelines">ghidul comunității</a>
-      long_description: |
-        Acest ecuson se acordă pentru că <a href="/guidelines">ai citit ghidul comunității</a>. Urmând și distribuind aceste reguli simple putem construi o comunitate sustenabilă, amuzantă și sigură pentru toți. Întotdeauna adu-ți aminte că o altă ființă umană, una ce seamănă foarte mult cu tine, se află de partea cealaltă a ecranului. Fii drăguț!
     reader:
       name: Cititor
       description: Ai citit toate răspunsurile dintr-un subiect cu mai mult de 100 de răspunsuri
@@ -2582,7 +2337,6 @@ ro:
         title: "Emoji"
       invites:
         title: "Invită membrii echipei"
-        description: "Aproape ai terminat! Hai să invităm niște membri ai echipei să dea o mână de ajutor <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>și să presare discuțiile</a> cu subiecte și răspunsuri interesante, pentru a lansa comunitatea."
       finished:
         title: "Discourse-ul tău e gata!"
         description: |
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index eb98b93bff..4f956b8212 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -28,30 +28,32 @@ ru:
   posts: "сообщения"
   loading: "Загрузка..."
   log_in: "Войти"
-  purge_reason: "Деактивированная учетная запись будет автоматически удалена как заброшенная"
-  disable_remote_images_download_reason: "Загрузка картинок была отключена из-за недостаточности места на диске."
+  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: "Показывать урезанное содержимое"
+      default_subject: "Тема входящего письма по умолчанию."
+      show_trimmed_content: "Показывать сокращённый текст"
       maximum_staged_user_per_email_reached: "Достигнуто максимальное количество постановочных пользователей, созданных по электронной почте."
       errors:
         empty_email_error: "Происходит, когда мы получаем пустое письмо."
         no_message_id_error: "Происходит, когда письмо не имеет заголовка 'Message-Id'."
-        auto_generated_email_error: "Случается, когда заголовок 'Приоритет' установлен в: список, мусор, навалочных или автоматический ответ, или когда какой-либо другой заголовок содержит: автоматический представленный, автоматический ответ или автоматически генерируется."
-        no_body_detected_error: "Случается, когда мы не могли извлечь тело и не было никаких вложений."
+        auto_generated_email_error: "Происходит когда заголовок \"приоритет\" установлен в: 'bulk', 'list', 'auto_reply', 'junk' или когда другой заголовок содержит флаги 'auto-submitted', 'auto-replied' или 'auto-generated'."
+        no_body_detected_error: "Случается, когда мы не смогли извлечь текст письма и не было никаких вложений."
         inactive_user_error: "Происходит, когда отправитель неактивен."
-        blocked_user_error: "Происходит, когда отправитель заблокирован."
-        bad_destination_address: "Случается, когда ни один из адресов электронной почты в To / Cc / Bcc поля не совпадающего с настройки входящей адрес электронной почты."
-        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: "Случается, когда адрес электронной почты отправителя был уже экранированы."
+        bad_destination_address: "Происходит, когда ни один из адресатов, указанных в полях To/Cc/Bcc не совпадает со входящим адресом электронной почты."
+        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:
@@ -72,8 +74,8 @@ ru:
       inclusion: не включен в список
       invalid: неверный
       is_invalid: "Не совсем ясно, это предложение закончено?"
-      contains_censored_words: "содержит следующие нецензурные слова  %{censored_words}"
-      matches_censored_pattern: "содержит нецензурные слова, которые соответствуют шаблону  %{censored_words}"
+      contains_censored_words: "содержит следующие запрещенные слова  %{censored_words}"
+      matches_censored_pattern: "содержит запрещенные на сайте выражения, которые соответствуют шаблону  %{censored_words}"
       less_than: должен быть меньше %{count}
       less_than_or_equal_to: должен быть меньше или равен %{count}
       not_a_number: не число
@@ -113,6 +115,7 @@ ru:
       s3_upload_bucket_is_required: "Нельзя включить загрузки на S3, пока не задана настройка 's3_upload_bucket'."
   invite:
     not_found: "Неверный код приглашения. Пожалуйста, свяжитесь с администратором сайта."
+    user_exists: "Нет необходимости приглашать <b>%{email}</b>, у него уже есть <a href='/u/%{username}/summary'>аккаунт</a>!"
   bulk_invite:
     file_should_be_csv: "Загружаемый файл должен быть в csv-формате."
     error: "Произошла ошибка при загрузке файла. Пожалуйста, повторите попытку позже."
@@ -123,23 +126,23 @@ ru:
     backup_file_should_be_tar_gz: "Файл резервной копии должен быть архивом в формате .TAR.GZ."
     not_enough_space_on_disk: "Не хватает места на диске сервера для загрузки этой резервной копии."
     invalid_filename: "Резервная копия файла содержит недопустимые символы. Допустимые символы A-Z 0-9. - _."
-  not_logged_in: "Для этого действия, пожалуйста авторизуйтесь."
+  not_logged_in: "Для этого действия необходимо зарегистрироваться."
   not_found: "Запрашиваемая страница или ресурс не найден."
   invalid_access: "У вас нет прав для просмотра запрашиваемого ресурса."
-  read_only_mode_enabled: "Сайт в режиме только для чтения. Взаимодействия отключены."
+  read_only_mode_enabled: "Сайт в режиме только для чтения. Какие-либо иные действия запрещены. "
   reading_time: "Время на прочтение"
   likes: "Лайков"
   too_many_replies:
     one: "Извините, новые пользователи могут оставлять только один ответ к теме."
     few: "Извините, новые пользователи могут оставлять только %{count} ответов к одной теме."
     many: "Извините, новые пользователи могут оставлять только %{count} ответов к одной теме."
-    other: "Извините, новые пользователи могут оставлять только %{count} ответов к одной теме."
+    other: "Извините, новые пользователи могут оставлять только %{count} ответ(ов) к одной теме."
   embed:
     start_discussion: "Начать обсуждение"
     continue: "Продолжить обсуждение"
-    error: "Встраивание Ошибки"
-    referer: "Отсылающий:"
-    mismatch: "Ссылающийся не совпал с каким-либо из следующих хостов:"
+    error: "Внутренняя ошибка"
+    referer: "Источник:"
+    mismatch: "Источник не совпал с каким-либо из следующих хостов:"
     no_hosts: "Никаких хостов не настроено для встраивания."
     configure: "Настроить Встраивание"
     more_replies:
@@ -189,8 +192,9 @@ ru:
   spamming_host: "Извините, вы не можете разместить ссылку в этом сообщении."
   user_is_suspended: "Заблокированным пользователям запрещено писать."
   topic_not_found: "Что-то пошло не так. Возможно, эта тема была закрыта или заархивирована, пока вы ее читали?"
-  not_accepting_pms: "К сожалению, %{username} не принимает сообщения в данный момент."
-  just_posted_that: "слишком схоже с уже опубликованным Вами сообщением"
+  not_accepting_pms: "К сожалению, %{username} в данный момент не принимает сообщения."
+  max_pm_recepients: "Извините, вы можете послать сообщение максимум %{recipients_limit}получателю."
+  just_posted_that: "слишком схоже с уже опубликованным вами сообщением"
   invalid_characters: "содержит недопустимые символы"
   is_invalid: "Не совсем ясно, это предложение закончено?"
   next_page: "следующая страница →"
@@ -228,6 +232,8 @@ ru:
   queue:
     delete_reason: "Удалено по запросу модератора."
   groups:
+    success:
+      bulk_add: "%{users_added}пользователей было добавлено в группу."
     errors:
       can_not_modify_automatic: "Вы не можете изменить автоматическую группу."
       member_already_exist: "'%{username}' уже является членом этой группы."
@@ -235,6 +241,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: "администраторы"
@@ -245,6 +252,8 @@ ru:
       trust_level_2: "уровень доверия 2"
       trust_level_3: "уровень доверия 3"
       trust_level_4: "уровень доверия 4"
+    request_membership_pm:
+      title: "Запрос на участие в группе %{group_name}"
   education:
     until_posts:
       one: "1 сообщение"
@@ -258,17 +267,15 @@ ru:
 
       - Интересен ли придуманный заголовок? Достаточно ли точно он описывает то, что вы хотите обсудить в вашей теме?
 
-      - О чём ваша тема? Кому она будет интересна? Почему она важна для обсуждения? Какой, по-вашему мнению, будет реакция общества на тему?
+      - О чём ваша тема? Кому она будет интересна? Почему она важна для обсуждения? Какой, по-вашему мнению, будет реакция сообщества на тему?
 
-      - Постарайтесь включить в текст сообщения подходящие поисковые слова, по которым другие смогут *найти* тему. Выберите раздел, к которому ваша тема подходит по смыслу.
+      - Постарайтесь включить в текст сообщения подходящие теги, по которым другие смогут *найти* тему. Выберите раздел, к которому ваша тема подходит по смыслу.
 
       Больше информации вы найдете в нашем [руководстве пользователя](/guidelines). Данное окно будет показываться, пока вы создаете свои первые %{education_posts_text}.
     new-reply: |
       Добро пожаловать на сайт %{site_name} &mdash; **Спасибо за участие в обсуждении!**
 
-      Составляя свой ответ в теме, учитывайте следующее:
-
-      - Улучшит ли ваш ответ обсуждение в целом, хотя бы немного?
+      - Как вы думаете, улучшит ли ваш ответ обсуждение в целом, хотя бы немного?
 
       - Будьте дружелюбны к участникам разговора.
 
@@ -277,11 +284,11 @@ ru:
       Больше информации вы найдете в нашем [руководстве пользователя](/guidelines). Данное окно будет показываться пока вы создаете свои первые %{education_posts_text}.
     avatar: |
       ### Как насчет изображения для вашей учетной записи?
-      Вы опубликовали несколько тем и ответы, но ваше изображение профиля не уникален как вы - это просто письмо.
+      Вы опубликовали несколько тем и ответы, но ваше изображение профиля не уникально - это просто первая буква вашего имени.
 
-      Рассматривали ли вы **[посетить свой профиль пользователя] (%{профиль_дорожка})**  и загрузить изображение, которое представляет вас?
+      Может быть вам стоит **[посетить свой профиль пользователя] (%{profile_path})**  и загрузить аватарку?
 
-      Это легче следить за ходом обсуждений и найти интересных людей в разговорах, когда каждый человек имеет уникальный профиль картину!
+      Когда каждый пользователь имеет уникальную аватарку, следить за обсуждениями становится значительно легче!
     sequential_replies: |
       ### Лучше совмещать несколько ответов в один
 
@@ -319,12 +326,16 @@ ru:
               same_as_username: "совпадает с вашим псевдонимом. Пожалуйста, придумайте более надежный пароль."
               same_as_email: "совпадает с вашим e-mail. Пожалуйста, придумайте более надежный пароль."
               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:
@@ -338,7 +349,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 +583,7 @@ ru:
     off_topic:
       title: 'Офтопик (не по теме)'
       description: 'Это сообщение не имеет отношения к теме, учитывая ее название и текст. Возможно, его стоит перенести.'
+      short_description: 'Не относится к обсуждению'
       long_form: 'отметили это как офтопик (не по теме)'
     spam:
       title: 'Спам'
@@ -602,6 +613,7 @@ ru:
     like:
       title: 'Нравится'
       description: 'Мне нравится это сообщение'
+      short_description: 'Мне нравится'
       long_form: 'понравилось это'
     vote:
       title: 'Проголосовать'
@@ -629,7 +641,6 @@ ru:
       email_title: 'Тема "%{title}" требует внимания модератора'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>На ваше сообщение поступила жалоба. Вы можете посмотреть ваше сообщение <a href="/my/messages">тут</a>.</p>'
     user_must_edit: '<p>На это сообщение поступили жалобы от участников сообщества, поэтому оно временно скрыто.</p>'
   archetypes:
     regular:
@@ -641,7 +652,6 @@ ru:
         remove: "Эта тема теперь не является объявлением и больше не будет отображаться вверху всех страниц."
   unsubscribed:
     title: "Подписка отменена!"
-    description: "Вы отписались от рассылки. Для изменения настроек почты <a href='%{url}'>посетите страницу с пользовательскими настройками</a>."
   unsubscribe:
     title: "Отписаться"
     stop_watching_topic: "Прекратить наблюдение за этой темой, %{link}"
@@ -836,9 +846,7 @@ ru:
     educate_until_posts: "Количество первых сообщений новых пользователей, для которых необходимо показывать всплывающую подсказку с советами для новичков."
     title: "Название этого сайта. Будет использоваться в HTML-тэге title."
     site_description: "Опишите сайт одним предложением для использования описания в мета-теге description."
-    contact_email: "Адрес электронной почты ключевого контактного лица, ответственного за этот сайт. Используется для критических уведомлений, таких как необработанные жалобы или срочные обращения через контактную форму /about."
     contact_url: "Контактный URL для этого сайта. Используется для срочных обращений через контактную форму /about."
-    queue_jobs: "ТОЛЬКО ДЛЯ РАЗРАБОТЧИКОВ! ВНИМАНИЕ! По умолчанию задачи обрабатываются асинхронно в очереди sidekiq. Если настройка выключена, ваш сайт может не работать."
     crawl_images: "Скачивать картинки с других сайтов для автоматического определения их размеров."
     download_remote_images_to_local: "Скачивать картинки, вставленные в сообщения ссылками на другие сайты, и хранить их локально, чтобы предотвратить их изменения или утерю."
     download_remote_images_threshold: "Минимальное доступное место на диске (в процентах), при котором разрешено автоматическое скачивание картинок для локального хранения."
@@ -873,7 +881,6 @@ ru:
     tl2_additional_likes_per_day_multiplier: "Увеличить лимит лайков в день для tl2 (member) до"
     tl3_additional_likes_per_day_multiplier: "Увеличить лимит лайков в день для tl3 (member) до"
     tl4_additional_likes_per_day_multiplier: "Увеличить лимит лайков в день для tl4 (leader) до"
-    notify_mods_when_user_blocked: "Отправить сообщение всем модераторам, если пользователь заблокирован автоматически."
     flag_sockpuppets: "Если новый пользователь отвечает на тему с того же IP адреса как и новый пользователь, кто начал тему, отметить оба их сообщения как возможный спам."
     traditional_markdown_linebreaks: "Использовать стандартный способ переноса строки в Markdown: строка должна заканчиваться двумя пробелами, чтобы перенос строки после нее сработал."
     post_undo_action_window_mins: "Количество минут, в течение которых пользователь может отменить действия, связанные с сообщениями: 'Мне нравится', 'Жалоба' и др."
@@ -906,8 +913,6 @@ ru:
     log_out_strict: "Когда пользователь выходит из системы, закрывать все сессии на всех устройствах пользователя."
     version_checks: "Проверять обновления и показывать сообщения о новых версиях на панели администратора"
     new_version_emails: "Отправлять сообщение на адрес contact_email когда будут доступны новые версии."
-    port: "Внимание, только для разработчиков! Использовать порт HTTP отличный от значения по умолчанию. Оставьте это поле пустым для использования стандартного 80-го порта."
-    force_hostname: "Внимание, только для разработчиков! Укажите имя хоста для формирования URL или оставьте пустым для значения по умолчанию."
     invite_expiry_days: "Срок валидности ключей, высланных приглашенному пользователю, в днях"
     invite_passthrough_hours: "Как долго пользователь может воспользоваться ключем приглашения для входа на сайт, указывается в часах"
     login_required: "Требовать авторизации для доступа к сайту, анонимный доступ запретить."
@@ -963,7 +968,6 @@ ru:
     clean_up_uploads: "Удалить неиспользуемые загрузки для предотвращения хранения нелегального контента. ВНИМАНИЕ: рекомендуется сделать резервную копию директории /uploads перед включением данной настройки."
     clean_orphan_uploads_grace_period_hours: "Период (в часах) после которого неопубликованные вложения удаляются."
     purge_deleted_uploads_grace_period_days: "Период (в днях) после которого удаленные вложения очищаются."
-    purge_unactivated_users_grace_period_days: "Период (в днях) после которого пользователи которые не активировали свой аккаунт будут удалены."
     enable_s3_uploads: "размещать загружаемые файлы на Amazon S3. ВАЖНО: требуется правильные настройки S3 (access key id и secret access key)."
     s3_use_iam_profile: 'Использовать AWS EC2 IAM роль для ключей. ПРИМЕЧАНИЕ: включение данной функции перезапишет настройки "s3 access key id" и "s3 secret access key".'
     s3_upload_bucket: "Имя Amazon S3 bucket куда будут загружаться файлы. ВНИМАНИЕ: должно быть в нижнем регистре, без пробелов, без подчеркиваний.\nhttp://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictions.html"
@@ -975,7 +979,7 @@ ru:
     allow_all_attachments_for_group_messages: "Разрешить все почтовые вложения для групповых сообщений."
     enable_flash_video_onebox: "Разрешить умную вставку ссылок sqf и flv (Adobe Flash). ВНИМАНИЕ: повышает риски безопасности сайта."
     default_invitee_trust_level: "Уровень доверия приглашенных пользователей по-умолчанию (от 0 до 4)."
-    default_trust_level: "Уровень доверия по умолчанию для всех новых пользователей (0-4). ВНИМАНИЕ! Повышая уровень доверия для новых пользователей, Вы можете столкнуться с большим колличеством спама."
+    default_trust_level: "Уровень доверия по умолчанию для всех новых пользователей (0-4). ВНИМАНИЕ! Повышая уровень доверия для новых пользователей, вы можете столкнуться с большим количеством спама."
     tl1_requires_topics_entered: "В скольких темах новый пользователь должен побывать для продвижения до уровня доверия 1."
     tl1_requires_read_posts: "Сколько сообщений новый пользователь должен прочитать для продвижения до уровня доверия 1."
     tl1_requires_time_spent_mins: "Сколько минут новый пользователь должен читать сообщения на форуме для продвижения до уровня доверия 1."
@@ -1060,7 +1064,6 @@ ru:
     pop3_polling_host: "Хост учетной записи POP3 для загрузки e-mail."
     pop3_polling_username: "Имя пользователя, или логин, учетной записи POP3 для загрузки e-mail."
     pop3_polling_password: "Пароль учетной записи POP3 для загрузки e-mail."
-    email_in: "Разрешить пользователям создавать посты по email (требуются настройки pop3). Сконфигурируйте адрес для создания топиков во вкладке настройки для каждой категории."
     email_in_min_trust: "Минимальный уровень доверия требуемый для возможности создавать новые темы через электронные письма."
     email_prefix: "[метка], используемая в заголовках писем. Если не указано, по-умолчанию будет использовано значение из настройки 'title'."
     email_site_title: "Заголовок сайта который будет использоваться в автоматических письмах. По умолчанию 'title'. Если 'title' содержит символы которые запрещены в поле от кого, будет использовано данное значение."
@@ -1068,14 +1071,12 @@ ru:
     relative_date_duration: "Количество дней после отправки сообщения, в течении которых его дата будет отображаться в относительном виде (7д), а позже - в абсолютном (20 Фев)."
     delete_user_max_post_age: "Запретить удаление пользователей, чье первое сообщение старее (x) дней."
     delete_all_posts_max: "Максимальное количество сообщений, которое может быть удалено за один раз через кнопку \"Удалить все сообщения\". Если у пользователя сообщений больше этого числа, сообщения удаляются не полностью и пользователь не удаляется."
-    username_change_period: "Количество дней после регистрации, когда пользователь сможет изменить свой псевдоним (0 - запретить изменение псевдонима)."
     email_editable: "Позволять пользователям изменять свой адрес электронной почты после регистрации."
     allow_uploaded_avatars: "Разрешить пользователям загружать свои собственные картинки профиля."
     allow_animated_avatars: "Разрешить пользователям использовать анимированные GIF картинки в своём профиле. ВНИМАНИЕ: после изменения данной настройки запустите avatars:refresh rake-задачу."
     allow_animated_thumbnails: "Генерировать анимированные миниатюры gif-картинок."
     default_avatars: "URL для аватара, который будет использован по умолчанию для новых пользователей, пока они не изменят его."
     automatically_download_gravatars: "Скачивать аватарку Gravatar пользователя во время создания учетной записи или изменения e-mail."
-    email_accent_bg_color: "Акцентирующий цвет для использования в качестве фона некоторых элементов в HTML писем. Введите название цвета ('red') или hex значение ('#FF000').  "
     email_link_color: "Цвет ссылок в HTML письмах. Введите название цвета ('blue') или hex значение ('#0000FF')."
     detect_custom_avatars: "Проверять ли, что пользователи загрузили свои собственные картинки профиля (аватарки)."
     max_daily_gravatar_crawls: "Максимальное количество загрузок аватаорок с Gravatar за один день"
@@ -1100,14 +1101,8 @@ ru:
     default_code_lang: "Подсветка синтаксиса по умолчанию для блоков кода (lang-auto, ruby, python etc.)"
     warn_reviving_old_topic_age: "Показывать предупреждение, когда кто-то пытается ответить в очень старую тему. Указывается в днях. Чтобы отключить 0."
     autohighlight_all_code: "Принудительно использовать подсветку кода для всех отформатированных блоков кода, даже когда они явно не указан язык."
-    feed_polling_enabled: "ТОЛЬКО ДЛЯ ВЛОЖЕННЫХ: Встраивать ли вложенные сообщения в RSS/ATOM ленту"
-    feed_polling_url: "URL адрес импорта RSS/ATOM ленты"
-    embed_by_username: "Имя пользователя который созал вложенную тему"
-    embed_username_key_from_feed: "Ключ для извлечения пользователя из ленты"
     embed_truncate: "Обрезать встроенные сообщения."
     embed_post_limit: "Максимальное количество вложенных сообщений."
-    embed_whitelist_selector: "CSS selector которые разрешины для использования."
-    embed_blacklist_selector: "CSS selector которые запрещены для использования."
     show_create_topics_notice: "Если общее количество тем меньше 5, показывать персоналу соощбение с просьбой создать новые темы."
     delete_drafts_older_than_n_days: Удалять черновики, которые старше (n) дней.
     prevent_anons_from_downloading_files: "Запретить анонимным пользователям скачивать вложенные файлы. ВНИМАНИЕ: при этом будут недоступны любые вложения кроме картинок."
@@ -1258,6 +1253,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 в качестве администратора запрещен."
@@ -1274,7 +1270,6 @@ ru:
     email_too_long: "E-mail, который Вы указали, слишком длинный. Имя почтового ящика должно быть не длиннее 254 символов, а доменное имя не более 253 символов."
     reserved_username: "Такой псевдоним не разрешен."
     missing_user_field: "Вы не заполнили все поля пользователя"
-    close_window: "Аутентификация выполнена. Закройте это окно для продолжения."
     already_logged_in: "Ой, кажется, Вы пытаетесь принять приглашение для другого пользователя. Если Вы не %{current_user}, пожалуйста, выйдите из учётной записи и попробуйте снова."
   user:
     no_accounts_associated: "Нет ассоциированных учетных записей"
@@ -1283,7 +1278,6 @@ ru:
     username:
       short: "минимум %{min} знаков"
       long: "должно быть более %{max} знаков"
-      characters: "должно состоять только из цифр и латинских букв"
       unique: "должно быть уникально"
       blank: "необходимо заполнить"
       must_begin_with_alphanumeric_or_underscore: "должно начинаться с буквы, цифры или нижнего подчёркивания"
@@ -1307,12 +1301,6 @@ ru:
       other: "%{count} жалоб ожидают рассмотрения"
   unsubscribe_mailer:
     subject_template: "Подтвердите, что вы больше не желаете получать обновления по электронной почте от %{site_title}"
-  invite_mailer:
-    subject_template: "%{invitee_name} приглашает вас присоединиться к '%{topic_title}' на сайте %{site_domain_name}"
-  custom_invite_mailer:
-    subject_template: "%{invitee_name} приглашает Вас присоединиться к '%{topic_title}' на сайте %{site_domain_name}"
-  invite_forum_mailer:
-    subject_template: "%{invitee_name} приглашает вас присоединиться к %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Задайте пароль для вашей учетной записи на сайте %{site_name}"
   flag_reasons:
@@ -1357,22 +1345,11 @@ ru:
     csv_export_failed:
       title: "Неудачный Экспорт CSV"
       subject_template: "Экспорт не удался"
-      text_body_template: "Мы сожалеем, но возникли неполадки с экспортом ваших данных. Свяжитесь с администратором сайта."
     email_reject_parsing:
       text_body_template: |
         К сожалению, ваше письмо к %{destination} с заголовком %{former_title} не может быть обработано.
 
         Система не смогла обнаружить тект сообщения в теле письма. Советуем убедится в том, что вы написали желаемый текст **в самом верху письма**.
-    blocked_by_staff:
-      title: "Заблокировано Персоналом"
-      subject_template: "Учётная запись временно заблокирована"
-    user_automatically_blocked:
-      title: "Автоматическая Блокировка Пользователя"
-    spam_post_blocked:
-      subject_template: "Сообщения нового пользователя %{username} заблокированы из-за повторяющихся ссылок"
-    unblocked:
-      title: "Разблокировано"
-      subject_template: "Учётная запись больше не заблокирована"
     pending_users_reminder:
       subject_template:
         one: "1 пользователь ожидает рассмотрение"
@@ -1421,7 +1398,6 @@ ru:
       popular_posts: "Популярные сообщения"
       more_new: "Новинки для вас"
       subject_template: "[%{email_prefix}] — сводка"
-      unsubscribe: "Сводка новостей отправляется, если вы давно не заходили на сайт %{site_link}. Чтобы отписаться от этой рассылки, %{unsubscribe_link}."
       click_here: "нажмите здесь"
       from: "Сводка — %{site_name}"
       preheader: "Сводка новостей с вашего последнего визита %{last_seen_at}"
@@ -1442,10 +1418,6 @@ ru:
     see_more: "Еще"
     search_title: "Искать на этом сайте"
     search_google: "Google"
-  login_required:
-    welcome_message: |
-      #[Добро пожаловать на сайт %{title}](#welcome)
-      Для доступа требуется учетная запись пользователя. Чтобы продолжить, пожалуйста, зарегистрируйтесь или войдите.
   terms_of_service:
     title: "Условия предоставления услуг"
     signup_form_message: 'Я прочитал(а) и согласен(а) с <a href="/tos" target="_blank">пользовательским соглашением</a>.'
@@ -1519,7 +1491,6 @@ ru:
       description: Получил симпатию
     autobiographer:
       name: Автобиограф
-      description: Заполнил информацию в <a href="/my/preferences">профиле</a>
     anniversary:
       name: Годовщина
     nice_post:
@@ -1753,7 +1724,6 @@ ru:
         description: "Выберите стиль смайлов для сообщества. В дальнейшем, вы сможете добавить другие стили смайлов в Админке, в секции Оформление / Смайлы."
       invites:
         title: "Пригласить как персонал"
-        description: "Вы почти закончили! Давайте пригласим несколько человек в качестве персонала что бы помочь <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>засеять Ваши обсуждения</a> интересными темами и ответами для начала Вашего сообщества."
       finished:
         title: "Ваш Discourse готов!"
         description: |
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index 4066baa657..086694727d 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -40,7 +40,6 @@ sk:
         empty_email_error: "Nastane, keď prijmeme úplne prázdny mail."
         no_message_id_error: "Nastane, keď v maili chýba hlavička 'Message-Id'."
         inactive_user_error: "Nastane, keď odosielateľ nie je aktívny."
-        blocked_user_error: "Nastane, keď odosielateľ bol zablokovaný."
         insufficient_trust_level_error: "Nastane, keď sa používateľ pokúsi vytvoriť novú tému v kategórii, na ktorú nemajú dostatočný stupeň dôvery."
         topic_closed_error: "Nastane, keď príde odpoveď na uzavretú tému."
   errors: &errors
@@ -276,7 +275,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
@@ -522,7 +520,6 @@ sk:
       email_title: 'Téma "%{title}" vyžaduje pozornosť moderátora'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Váš príspevok bol označený komunitou. Prosim <a href="/my/messages">pozrite si Vaše správy</a>.</p>'
     user_must_edit: '<p>Tento príspevok bol označený komunitou a je dočasne skrytý</p>'
   archetypes:
     regular:
@@ -717,9 +714,7 @@ sk:
     educate_until_posts: "Ked používateľ začne písať svojich prvých (n) príspevkov, zobraz sprievodcu vzdelávania pre nového užívateľa. "
     title: "Meno stránok, tak ako je použité v značke title."
     site_description: "Popíšte stránky v jednej vete, tak ako sa popisujú v tagu meta."
-    contact_email: "Emailová adresa kľúčovej kontaktnej osoby zodpovednej za túto stránku. Používa sa pri kritických situáciach, ako napríklad neošetrené návestia a tiež pri kontaktnom formulári pre dôležité prípady."
     contact_url: "Kontaktná URL adresa pre túto stránku. Použitá tiež pri kontaktnom formulári pre dôležité prípady."
-    queue_jobs: "IBA VÝVOJÁRI VAROVANIE! Štandardne, požiadavky fronty v sidekiq. Ak je vypnuté, vaše stránky budú rozbité."
     crawl_images: "Načítať obrázky z URL pre vloženie správnej výšky a šírky."
     download_remote_images_to_local: "Stiahnuť obrázky zo vzdialených zdrojov na lokálne. Zabráni poškodeniu obrázkov. "
     download_remote_images_threshold: "Minimálne miesto na lokálnom disku potrebné na stiahnutie obrázkov zo vzdialených zdrojov (v percentách)"
@@ -733,13 +728,11 @@ sk:
     fixed_category_positions: "Ak je to označené, budete môcť zoraďovať kategórie v pevnom poradí. Ak je neoznačené, kategórie budu zoradené podlľa aktivity."
     fixed_category_positions_on_create: "Ak je označené, triedenie kategórií bude spravované v dialógu na vytváranie témy (vyžaduje fixed_category_positions)."
     add_rel_nofollow_to_user_content: "Pridať rel nofollow ku všetkému zaslanému používateľskému kontextu s výnimkou interných odkazov (zahrňuje rodičovskú doménu). Ak to zmeníte, musíte vykonať prípaz rebake na všetky príspevky pomocou: \"rake posts:rebake\""
-    exclude_rel_nofollow_domains: "Zoznam domén, na ktorých odkazy nebude pridávaný nofollow . tld.com automaticky umožní sub.tld.com. Aby ste umožnili internetovým vyhľadávačom nájsť kompletný obsah mali by ste pridať minimálne doménu najvyššej úrovne týchto stránok. Ak je nejaká časť stránok na iných doménach, pridajte ich tiež."
     post_excerpt_maxlength: "Maximálna dĺžka príspevku okrem zhrnutia."
     post_onebox_maxlength: "Maximálna dĺžka vloženého Discourse príspevku v znakoch."
     logo_url: "Obrázok loga na ľavej hornej časti stránky, mal by byť tvaru širokého obdĺžnika. Ak nebude uvedený, zobrazí sa nadpis stránok."
     logo_small_url: "Malý obrázok loga na ľavej hornej strane stránok, mal by mať tvar štvorca a bude zobrazený pri skrolovaní nadol. Ak nebude uvedený, zobrazí sa piktogram domu."
     favicon_url: "Favicon pre Vaše stránky, pozrite http://en.wikipedia.org/wiki/Favicon. Aby fungoval správne s CDN, musí byť vo formáte png"
-    mobile_logo_url: "Obrázok loga zobrazený na fixnej pozícií v ľavom hornom rohu mobilnej verzie. Mal byť mať tvar štvorca. Ak nie je uvedené, použije sa `logo_url`. Napríklad: http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "Ikona použitá na zariadeniach Apple touch. Doporučovaná veľkosť je 144px na 144px."
     notification_email: "Odosieľateľ: email adresa použitá na zasielanie všetkých systémových emailov. Uvedená doména musí mať správne nastavené záznamy SPF, DKIM a opačný PTR aby email dorazil."
     email_custom_headers: "Zoznam voliteľných emailových hlavičiek oddelených |"
@@ -759,14 +752,11 @@ sk:
     tl2_additional_likes_per_day_multiplier: "Zvýšiť počet páči sa mi na deň pre úroveň dôvery 2 (člen) vynásobením týmto číslom"
     tl3_additional_likes_per_day_multiplier: "Zvýšiť počet páči sa mi na deň pre úroveň dôvery 3 (bežný) vynásobením týmto číslom"
     tl4_additional_likes_per_day_multiplier: "Zvýšiť počet páči sa mi na deň pre úroveň dôvery 4 (vedúci) vynásobením týmto číslom"
-    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."
-    ga_tracking_code: "ZASTARALÉ: Google analytics (ga.js) sledovací kód, napr.: UA-12345678-9; pozri http://google.com/analytics"
     ga_universal_tracking_code: "Google Universal Analytics (analytics.js) sledovací kód, napr: UA-12345678-9; pozri http://google.com/analytics"
     ga_universal_domain_name: "Google Universal Analytics (analytics.js) názov domény, napr: mysite.com; pozri http://google.com/analytics"
     allow_moderators_to_create_categories: "Povoliť moderátorom vytváranie nových kategórií"
@@ -796,8 +786,6 @@ sk:
     log_out_strict: "Pri odhlasovaní odhlásiť VŠETKY sessiony používateľa, na všetkých zariadeniach."
     version_checks: "Zisťovať aktualizácie na Discourse Hub a zobrazovať správy o novej verzii na stránke admina"
     new_version_emails: "Poslať email na kontaktnú emailovú adresu ak je zistená nová verzia Discourse."
-    port: "POZOR! LEN PRE VÝVOJÁROV! Použiť tento HTTP port namiesto predvoleného portu 80. Nechajte prázdne pre port 80."
-    force_hostname: "POZOR! LEN PRE VÝVOJÁROV! V URL zadajte hostname. Ak chcete použiť predvolené, nechajte políčko prázdne."
     invite_expiry_days: "Ako dlho je platná pozvánka pre používateľa, v dňoch"
     invite_passthrough_hours: "Ako dlho môže používateľ používať získaný pozývací kľúč na prihlasovanie, v hodinách"
     login_required: "Požadovať prihlásenie pre čítanie obshau tejto stránky, zakáž anonymný prístup. "
@@ -860,7 +848,6 @@ sk:
     clean_up_uploads: "Na zamedzenie nezákonného uloženia odstrániť opustené nahrané súbory na ktoré nevedie žiadny odkaz. VAROVANIE: pred zapnutím tohoto nastavenie možno chcete zálohovať Váš adresár s nahranými súbormi."
     clean_orphan_uploads_grace_period_hours: "Doba (v hodinách) pred odstránením opustených nahraných súborov."
     purge_deleted_uploads_grace_period_days: "Doba (v dňoch) pred úplným vymazaním odstráneného nahraného súboru."
-    purge_unactivated_users_grace_period_days: "Doba (v dňoch) pred tým, než je používateľ, ktorý si neaktivoval svoj účet vymazaný."
     enable_s3_uploads: "Ukladať nahrávané súbory na úložište S3. DÔLEŽITÉ: vyžaduje platné prístupové údaje S3 (id prístupového kľúča (access key id) a tajný prístupový kľúč (secret access key))."
     s3_use_iam_profile: 'Použiť rolu AWS EC2 IAM na načítanie kľúčov. POZNÁMKA: zapnutie prepíše nastavený "s3 prístupový kľúč id (s3 access key id)" a "s3 tajný prístupový kľúč (s3 secret access key)".'
     s3_upload_bucket: "Amazon S3 bucket name, do ktorého budú nahraté súbory. POZOR: musí byť malými písmenami, žiadne bodky a žiadne podtržítka."
@@ -945,9 +932,6 @@ sk:
     num_flags_to_close_topic: "Minimálny počet aktívnych príznakov potrebný na automatické pozastavenie témy pre intervenciu."
     auto_respond_to_flag_actions: "Zapnúť automatickú odpoveď pri odstránení označenia."
     min_first_post_typing_time: "Minimalny čas písania prvého príspevku v milisekundách, ak je čas kratší ako je limit, príspevok bude automaticky zaradený do fronty na schválenie. Nastav 0 pre vypnutie (Neoporúča sa)"
-    auto_block_fast_typers_on_first_post: "Automaticky blokovať užívateľov, ktorí nesplnili podmienku minimálneho času pre prvý príspevok min_first_post_typing_time"
-    auto_block_fast_typers_max_trust_level: "Maximálny level dôvery pre automatické blokovanie rýchlo-písačov"
-    auto_block_first_post_regex: "Regulárny výraz bez rozlíšenia veľkých a malých písmen, ktorého splnenie zablokuje prvý príspevok užívateľa a pošle ho do fronty na schválenie. Napriklad: raging|a[bc]a , zablokuje príspevky obsahujúce raging alebo aba alebo aca. Aplikuje sa len na prvý príspevok. "
     reply_by_email_enabled: "Povoliť odpoveď na tému prostredníctvom emailu."
     reply_by_email_address: "Šablóna pre príchodziu emailovú adresu emailových odpovedí. Napríklad : %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
     disable_emails: "Zabrániť Discoursu v odosielaní akýchkoľvek e-mailov"
@@ -964,7 +948,6 @@ sk:
     pop3_polling_username: "Používateľské meno na kontrolu emailového POP3 účtu."
     pop3_polling_password: "Heslo na kontrolu emailového POP3 účtu."
     log_mail_processing_failures: "Zaznamenávať všetky chyby pri spracovaní emailov do http://yoursitename.com/logs"
-    email_in: "Umožniť používateľom posielať nové príspevky pomocou emailu (vyžaduje POP3 kontrolu). Adresy nastavte v záložke \"Nastavenia\" pre každú kategóriu."
     email_in_min_trust: "MInimálna úroveň dôveru použivateľa, ktorý môže posielať nové príspevky pomocou emailu."
     email_prefix: "[Menovka], ktorá má byť použitá ako predmet emailov. Ak nie je nastavená bude nahradená 'nadpisom'."
     email_site_title: "Názov stránok, použitý ako odosieľateľ emailov zo stránok. Ak nie ne nastavený bude použitý 'nadpis'. Použite toto nastavenie, ak Váš nadpis obsahuje nepovolené znaky pre emailový reťazec odosieľateľ."
@@ -972,7 +955,6 @@ sk:
     relative_date_duration: "Počet dní, po uplynutí ktorých sa doba príspevkov začne zobrazovať relatívne (7d) miesto ablolútnej (20 Feb)."
     delete_user_max_post_age: "Neumožniť vymazanie použivateľov, ktorých prvý príspevok je starší ako (x) dní."
     delete_all_posts_max: "Maximálny počet príspevkov, ktoré môžu byť vymazané naraz pomocou tlačítka Vymaž všetky príspevky. Ak má používateľ viac ako uvedený počet, príspevky nemôžu byť vymazané naraz a používateľ nemôže byť vymazaný."
-    username_change_period: "Počet dní od registrácie po ktorých môžu účty zmeniť používateľské meno (Na vypnutie zmeny používateľského mena nastavte 0)."
     email_editable: "Povoliť užívateľom zmenu ich emailovej adresy po registrácii."
     allow_uploaded_avatars: "Povoliť používateľom nahranie profilovej fotky."
     allow_animated_avatars: "Umožniť používateľom, použiť ako profilový obrázok animovaný gif. VAROVANE: na zmenu tohoto nastavenia spustite rake task avatars:refresh."
@@ -1006,15 +988,9 @@ sk:
     default_code_lang: "Vysvietenie syntaxe pre štandardné programovacie jazyky, aplikované na GitHub bloky kódu (lang-auto, ruby, python etc.)"
     warn_reviving_old_topic_age: "Zobrazenie varovania, ak niekto začne odpovedať na tému, kde je posledná odpoveď staršia ako uvedený počet dní. Na vypnutie varozania zadajte 0."
     autohighlight_all_code: "Zapnúť vysvietenie syntaxe kódu na všetky formátované bloky kódu, i keď nie je explicitne zadaný jazyk."
-    feed_polling_enabled: "IBA VKLADANIE: Či sa má vkladať RSS/ATOM kanál ako príspevok."
-    feed_polling_url: "IBA VKLADANIE: URL RSS/ATOM kanála na vloženie"
-    embed_by_username: "Discourse používateľské meno pre používateľa, ktorý vkladá vložené príspevky."
-    embed_username_key_from_feed: "Kľúč na načítanie discourse používateľského mena z RSS/ATOM kanála."
     embed_truncate: "Orezať vkladané príspevky."
     embed_post_limit: "Maximálny počet príspevkov na vloženie."
     embed_username_required: "Na vytvorenie téme je vyžadované používateľské meno."
-    embed_whitelist_selector: "CSS prepínač na elementy, ktoré sú povolené pri vkladaní."
-    embed_blacklist_selector: "CSS prepínač na elementy, ktoré sú vymazané pri vkladaní."
     show_create_topics_notice: "Zobraz výzvu žiadajúcu administrátorov o vytvorenie nejakých tém, ak majú stránky menej ako 5 verejných tém."
     delete_drafts_older_than_n_days: Vymazať návrhy staršie ako (n) dní.
     prevent_anons_from_downloading_files: "Zabrániť anonymným používateľom sťahovať prílohy. VAROVANIE: toto nastavenie zneprístupní akékoľvek neobrázkové súbory na stánkach uložené ako prílohy."
@@ -1150,13 +1126,11 @@ sk:
     email_too_long: "Emailová adresa je príliš dlhá. Meno priečinka musí byť kratšie ako 254 znakov a meno domény musí byť kratšie ako 253 znakov."
     reserved_username: "Toto užívateľské meno nie je povolené."
     missing_user_field: "Nevyplnili ste všetky užívateľké polia."
-    close_window: "Autentifikácia je dokončená. Pre pokračovanie zavrite toto okno. "
   user:
     no_accounts_associated: "Žiadne pripojené účty "
     username:
       short: "musí mať minimálne %{min} znakov"
       long: "nesmie byť dlhší než %{max} znakov"
-      characters: "musí obsahovať len čísla, písmená a podržníky"
       unique: "musí byť jedinečné"
       blank: "musí existovať"
       must_not_contain_two_special_chars_in_seq: "nesmie obsahovať reťazec 2 alebo viac špeciálnych znakov po sebe (.-_)"
@@ -1174,10 +1148,6 @@ sk:
       other: "%{count} značiek čaká na zpracovanie"
   unsubscribe_mailer:
     subject_template: "Potvrďte, že už ďalej nechcete dostávať aktualizácie z  %{site_title}"
-  invite_mailer:
-    subject_template: "%{invitee_name} Vás pozval '%{topic_title}' na %{site_domain_name}"
-  invite_forum_mailer:
-    subject_template: "%{invitee_name} Vás pozval na %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Nastavte heslo pre účet na  %{site_name}"
   flag_reasons:
@@ -1213,42 +1183,11 @@ sk:
       subject_template: "Export dát kompletný"
     csv_export_failed:
       subject_template: "Export dát zlyhal"
-      text_body_template: "Ľutujeme, ale export Vašich dát zlyhal. Prosím, skontrolujte logy alebo kontaktujte člena obsluhy."
-    email_reject_insufficient_trust_level:
-      text_body_template: |
-        Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
-
-        Váš účet nemá požadovaný stupeň dôvery na vytváranie nových tém pomocou emailu. Ak si myslíte, že ide o chybu, kontaktujte obsluhu.
-    email_reject_user_not_found:
-      text_body_template: |
-        Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
-
-        Vaša odpoveď bola poslaná z neznámej emailovej adresy. Skúste ju poslať z inej emailovej adresy alebo kontaktujte obsluhu.
-    email_reject_screened_email:
-      text_body_template: |
-        Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
-
-        Vaša odpoveď bola poslaná z blokovanej emailovej adresy. Skúste ju poslať z inej emailovej adresy alebo kontaktujte obsluhu.
     email_reject_inactive_user:
       text_body_template: |
         Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
 
         Váš účet asociovaný s touto emailovou adresou nie je aktivovaný. Prosím aktivujte svoj účet pred posielaním emailov.
-    email_reject_blocked_user:
-      text_body_template: |
-        Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
-
-        Váš účet asociovaný s touto emailovou adresou bol zablokovaný.
-    email_reject_reply_user_not_matching:
-      text_body_template: |
-        Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
-
-        Vaša odpoveď bola poslaná z inej emailovej adresy ako sme očakávali, takže si nie sme istí či sa jedná o tú istú osobu. Skúste ju poslať z inej emailovej adresy alebo kontaktujte obsluhu.
-    email_reject_no_account:
-      text_body_template: |
-        Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
-
-        Nemôžeme nájsť žiaden účet zodpovedajúci Vašej emailovej adrese. Skúste ju poslať z inej emailovej adresy alebo kontaktujte obsluhu.
     email_reject_empty:
       text_body_template: |
         Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
@@ -1261,16 +1200,6 @@ sk:
         Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
 
         Vo Vašom emaile se nepodarilo nájsť pridávaný obsah. **Uistite sa, že ste odpoveď uviedli na začiatku emailu** -- nedokážeme spracovať vložené odpovede.
-    email_reject_invalid_access:
-      text_body_template: |
-        Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
-
-        Váš účet nemá právo na vytváranie nových tém v danej kategórii. Ak si myslíte, že ide o chybu, kontaktujte obsluhu.
-    email_reject_strangers_not_allowed:
-      text_body_template: |
-        Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
-
-        Kategória, do ktorej ste poslali tento email, povoľuje odpovede iba od používateľov s platným účtom a známou emailovou adresou. Ak si mysíte, že ide o chybu, kontaktujte zamestnanca stránok.
     email_reject_invalid_post:
       text_body_template: |
         Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
@@ -1290,33 +1219,6 @@ sk:
         Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
 
         Akcia uverejnenia nebola rozpoznaná. Prosíme skúste znovu alebo, ak sa chovanie opakuje, uverejnite pomocou webstránky.
-    email_reject_reply_key:
-      text_body_template: |
-        Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
-
-        Kľúč odpovede v emaili je neplatný alebo neznámy, takže nedokážeme zistiť na čo tento email odpovedá. Kontaktujte obsluhu.
-    email_reject_bad_destination_address:
-      text_body_template: |
-        Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
-
-        Žiadna z adries príjemcov nebola rozpoznaná. Prosíme, uistite sa, že email posielate na správnu adresu poskytnutú obsluhou.
-    email_reject_topic_not_found:
-      text_body_template: |
-        Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
-
-        Téma, na ktorú odpovedáte už neexistuje - možno bola zmazaná? Ak si myslíte, že ide o chybu, kontaktujte obsluhu.
-    email_reject_topic_closed:
-      text_body_template: |
-        Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
-
-        Téma, na ktorú odpovedáte je momentálne zavretá a neakceptuje ďalšie odpovede. Ak si myslíte, že ide o chybu, kontaktujte obsluhu.
-    email_reject_auto_generated:
-      text_body_template: |
-        Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
-
-        Váš email bol označený ako "automaticky vygenerovaný", čo znamená, že bol vytvorený automaticky počítačom namiesto napísaný človekom; tento typ emailov nemôžeme akceptovať. Ak si myslíte, že ide o chybu, kontaktujte obsluhu.
-    spam_post_blocked:
-      subject_template: "Nový uživateľ %{username} je zablokovaný kôli opakovaným odkazom"
     pending_users_reminder:
       subject_template:
         one: "1 užívateľ čaká na schválenie"
@@ -1412,7 +1314,6 @@ sk:
     step:
       invites:
         title: "Pozvite členov"
-        description: "Už ste takmer hotový(á)! Poďme pozvať nejakých členov, aby pomohli <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>vytvoriť diskusie</a> na zaujímavé témy a svojimi odpoveďami naštartovali komunitu."
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 4cd7677c2a..2a51d683ac 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -63,6 +63,8 @@ sq:
       load_from_remote: "Postimi nuk mundi të ngarkohet. Riprovoheni!"
     site_settings:
       default_categories_already_selected: "Nuk mund të zgjidhni një kategori të përdorur në një tjetër listë."
+  invite:
+    user_exists: "Nuk keni nevojë të ftoni <b>%{email}</b>, ata <a href='/u/%{username}/summary'>kanë krijuar një llogari në faqe!</a>"
   not_logged_in: "Ju duhet të identifikoheni për këtë veprim."
   invalid_access: "Ju nuk jeni të drejta për të parë burimin e kërkuar."
   reading_time: "Koha e leximit"
@@ -163,7 +165,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
@@ -313,10 +314,13 @@ sq:
     confirmed: "Adresa e postës u azhornua."
     please_continue: "Vazhdo tek %{site_name}"
     error: "Hasëm një gabim gjatë ndryshimit të adresës email. Mos vallë është në përdorim nga një llogari tjetër në faqe?"
+    already_done: "Na vjen keq, ky link nuk vlen më. Mbase adresa juaj email u ndryshua para pak kohësh?"
     authorizing_old:
       title: "Ju falënderojmë për konfirmimin e adresës tuaj email"
+      description: "Tani po ju dërgojmë një mesazh tek adresa e re e emailit për t'a konfirmuar."
   activation:
     action: "Klikoni këtu për të aktivizuar llogarinë tuaj"
+    already_done: "Na vjen keq, ky link nuk vlen më. Mbase llogaria është që tani e aktivizuar?"
     please_continue: "Llogaria juaj e re u konfirumua; ju po ridrejtoheni për tek faqja kryesore."
     continue_button: "Vazhdo tek %{site_name}"
     welcome_to: "Mirë se vini tek %{site_name}!"
@@ -371,7 +375,6 @@ sq:
       email_title: 'Tema "%{title}" kërkon redaktimin e një moderatori'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Postimi juaj u sinjalizua nga komuniteti. <a href="/my/messages">Shikoni mesazhet</a>.</p>'
     user_must_edit: '<p>Kjo temë u sinjalizua nga komuniteti dhe është fshehur përkohësisht.</p>'
   archetypes:
     regular:
@@ -383,12 +386,12 @@ 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"
     stop_watching_topic: "Ndaloni së ndjekuri këtë temë, %{link}"
     unwatch_category: "Ndaloni së ndjekuri të gjitha temat në %{category}"
+    disable_digest_emails: "Mos më dërgo më mesazhe email me përmbledhjet"
     all: "Mos më dërgoni më email nga %{sitename}"
   user_api_key:
     title: "Lejo këtë aplikimi të ketë akses në faqe"
@@ -557,9 +560,7 @@ sq:
     educate_until_posts: "When the user starts typing their first (n) new posts, show the pop-up new user education panel in the composer."
     title: "The name of this site, as used in the title tag."
     site_description: "Describe this site in one sentence, as used in the meta description tag."
-    contact_email: "Email address of key contact responsible for this site. Used for critical notifications such as unhandled flags, as well as on the /about contact form for urgent matters."
     contact_url: "Contact URL for this site. Used on the /about contact form for urgent matters."
-    queue_jobs: "DEVELOPER ONLY! WARNING! By default, queue jobs in sidekiq. If disabled, your site will be broken."
     crawl_images: "Retrieve images from remote URLs to insert the correct width and height dimensions."
     download_remote_images_to_local: "Convert remote images to local images by downloading them; this prevents broken images."
     download_remote_images_threshold: "Minimum disk space necessary to download remote images locally (in percent)"
@@ -572,12 +573,10 @@ sq:
     fixed_category_positions: "If checked, you will be able to arrange categories into a fixed order. If unchecked, categories are listed in order of activity."
     fixed_category_positions_on_create: "If checked, category ordering will be maintained on topic creation dialog (requires fixed_category_positions)."
     add_rel_nofollow_to_user_content: "Add rel nofollow to all submitted user content, except for internal links (including parent domains). If you change this, you must rebake all posts with: \"rake posts:rebake\""
-    exclude_rel_nofollow_domains: "A list of domains where nofollow should not be added to links. tld.com will automatically allow sub.tld.com as well. As a minimum, you should add the top-level domain of this site to help web crawlers find all content. If other parts of your website are at other domains, add those too."
-    post_excerpt_maxlength: "Maximum length of a post excerpt / summary."
+    post_excerpt_maxlength: "Gjatësia maksimale e një përmbledhjeje të një postimi. "
     post_onebox_maxlength: "Maximum length of a oneboxed Discourse post in characters."
     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."
     logo_small_url: "The small logo image at the top left of your site, should be a square shape, seen when scrolling down. If left blank a home glyph will be shown."
-    mobile_logo_url: "The fixed position logo image used at the top left of your mobile site. Should be a square shape. If left blank, `logo_url` will be used. eg: http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "Icon used for Apple touch devices. Recommended size is 144px by 144px."
     notification_email: "The from: email address used when sending all essential system emails. The domain specified here must have SPF, DKIM and reverse PTR records set correctly for email to arrive."
     email_custom_headers: "A pipe-delimited list of custom email headers"
@@ -598,7 +597,6 @@ sq:
     tl2_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl2 (member) by multiplying with this number"
     tl3_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl3 (regular) by multiplying with this number"
     tl4_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl4 (leader) by multiplying with this number"
-    notify_mods_when_user_blocked: "If a user is automatically blocked, send a message to all moderators."
     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."
     post_undo_action_window_mins: "Number of minutes users are allowed to undo recent actions on a post (like, flag, etc)."
@@ -630,8 +628,6 @@ sq:
     log_out_strict: "When logging out, log out ALL sessions for the user on all devices"
     version_checks: "Ping the Discourse Hub for version updates and show new version messages on the /admin dashboard"
     new_version_emails: "Send an email to the contact_email address when a new version of Discourse is available."
-    port: "DEVELOPER ONLY! WARNING! Use this HTTP port rather than the default of port 80. Leave blank for default of 80."
-    force_hostname: "DEVELOPER ONLY! WARNING! Specify a hostname in the URL. Leave blank for default."
     invite_expiry_days: "How long user invitation keys are valid, in days"
     invite_passthrough_hours: "How long a user can use a previously redeemed invitation key to log in, in hours"
     login_required: "Require authentication to read content on this site, disallow anonymous access."
@@ -685,7 +681,6 @@ sq:
     clean_up_uploads: "Remove orphan unreferenced uploads to prevent illegal hosting. WARNING: you may want to back up of your /uploads directory before enabling this setting."
     clean_orphan_uploads_grace_period_hours: "Grace period (in hours) before an orphan upload is removed."
     purge_deleted_uploads_grace_period_days: "Grace period (in days) before a deleted upload is erased."
-    purge_unactivated_users_grace_period_days: "Grace period (in days) before a user who has not activated their account is deleted."
     enable_s3_uploads: "Place uploads on Amazon S3 storage. IMPORTANT: requires valid S3 credentials (both access key id & secret access key)."
     s3_use_iam_profile: 'Use AWS EC2 IAM role to retrieve keys. NOTE: enabling will override "s3 access key id" and "s3 secret access key" settings.'
     s3_upload_bucket: "The Amazon S3 bucket name that files will be uploaded into. WARNING: must be lowercase, no periods, no underscores."
@@ -762,9 +757,6 @@ sq:
     num_flags_to_close_topic: "Minimum number of active flags that is required to automatically pause a topic for intervention"
     auto_respond_to_flag_actions: "Enable automatic reply when disposing a flag."
     min_first_post_typing_time: "Minimum amount of time in milliseconds a user must type during first post, if threshold is not met post will automatically enter the needs approval queue. Set to 0 to disable (not recommended)"
-    auto_block_fast_typers_on_first_post: "Automatically block users that do not meet min_first_post_typing_time"
-    auto_block_fast_typers_max_trust_level: "Maximum trust level to auto block fast typers"
-    auto_block_first_post_regex: "Case insensitive regex that if passed will cause first post by user to be blocked and sent to approval queue. Example: raging|a[bc]a , will cause all posts containing raging or aba or aca to be blocked on first. Only applies to first post."
     reply_by_email_enabled: "Enable replying to topics via email."
     reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
     disable_emails: "Prevent Discourse from sending any kind of emails"
@@ -778,14 +770,12 @@ sq:
     pop3_polling_username: "The username for the POP3 account to poll for email."
     pop3_polling_password: "The password for the POP3 account to poll for email."
     log_mail_processing_failures: "Log all email processing failures to http://yoursitename.com/logs"
-    email_in: "Allow users to post new topics via email (requires pop3 polling). Configure the addresses in the \"Settings\" tab of each category."
     email_in_min_trust: "The minimum trust level a user needs to have to be allowed to post new topics via email."
     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."
     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)."
     delete_user_max_post_age: "Don't allow deleting users whose first post is older than (x) days."
-    username_change_period: "The number of days after registration that accounts can change their username (0 to disallow username change)."
     email_editable: "Allow users to change their e-mail address after registration."
     allow_uploaded_avatars: "Allow users to upload custom profile pictures."
     allow_animated_avatars: "Allow users to use animated gif profile pictures. WARNING: run the avatars:refresh rake task after changing this setting."
@@ -816,14 +806,8 @@ sq:
     default_code_lang: "Default programming language syntax highlighting applied to GitHub code blocks (lang-auto, ruby, python etc.)"
     warn_reviving_old_topic_age: "When someone starts replying to a topic where the last reply is older than this many days, a warning will be displayed. Disable by setting to 0."
     autohighlight_all_code: "Force apply code highlighting to all preformatted code blocks even when they didn't explicitly specify the language."
-    feed_polling_enabled: "EMBEDDING ONLY: Whether to embed a RSS/ATOM feed as posts."
-    feed_polling_url: "EMBEDDING ONLY: URL of RSS/ATOM feed to embed."
-    embed_by_username: "Discourse username of the user who creates the embedded topics."
-    embed_username_key_from_feed: "Key to pull discourse username from feed."
     embed_truncate: "Truncate the embedded posts."
     embed_post_limit: "Maximum number of posts to embed."
-    embed_whitelist_selector: "CSS selector for elements that are allowed in embeds."
-    embed_blacklist_selector: "CSS selector for elements that are removed from embeds."
     show_create_topics_notice: "If the site has fewer than 5 public topics, show a notice asking admins to create some topics."
     delete_drafts_older_than_n_days: Delete drafts older than (n) days.
     prevent_anons_from_downloading_files: "Prevent anonymous users from downloading attachments. WARNING: this will prevent any non-image site assets posted as attachments from working."
@@ -920,13 +904,11 @@ sq:
     suspended: "You can't log in until %{date}."
     reserved_username: "Ky emër nuk lejohet."
     missing_user_field: "You have not completed all the user fields"
-    close_window: "Authentication is complete. Close this window to continue."
   user:
     no_accounts_associated: "No accounts associated"
     username:
       short: "must be at least %{min} characters"
       long: "must be no more than %{max} characters"
-      characters: "must only include numbers, letters and underscores"
       unique: "must be unique"
       blank: "must be present"
     email:
@@ -939,14 +921,13 @@ sq:
     subject_template:
       one: "1 sinjalizim në pritje për t'u trajtuar"
       other: "%{count} sinjalizime në pritje për t'u trajtuar"
-  invite_mailer:
-    subject_template: "%{invitee_name} ju ftoi tek tema '%{topic_title}' tek %{site_domain_name}"
-  invite_forum_mailer:
-    subject_template: "%{invitee_name} ju ka ftuar të bëheni pjesë e %{site_domain_name}"
-  custom_invite_forum_mailer:
-    subject_template: "%{invitee_name} ju ka ftuar të bëheni pjesë e %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Vendos fjalëkalimin për llogarinë tek %{site_name}"
+  admin_confirmation_mailer:
+    text_body_template: |
+      Ju lutemi të konfirmoni që dëshironi të shtoni **%{target_username}** si një administrator në këtë faqe.
+
+      [Konfirmo llogarinë e administratorit](%{admin_confirm_url})
   flag_reasons:
     off_topic: "Your post was flagged as **off-topic**: the community feels it is not a good fit for the topic, as currently defined by the title and the first post."
     inappropriate: "Your post was flagged as **inappropriate**: the community feels it is offensive, abusive, or a violation of [our community guidelines](/guidelines)."
@@ -961,20 +942,6 @@ sq:
   system_messages:
     post_hidden:
       subject_template: "Postimi u fsheh ngaqë u sinjalizua nga komuniteti"
-      text_body_template: |
-        Përshëndetje,
-
-        Ky është një mesazh automatik nga %{site_name} për t'ju njoftuar se postimi juaj u fsheh.
-
-        %{base_url}%{url}
-
-        %{flag_reason}
-
-        Disa anëtarë të faqes sinjalizuan këtë postim. **Mund t'a modifikoni postimin pas %{edit_delay} minutash, dhe do të shfaqet automatikisht.**
-
-        Sidoqoftë, nëse postimi fshihet nga komuniteti për një herë të dytë, postimi do të mbetet u fshehur derisa të ndërhyjë stafi. Stafi mund të vendosë edhe të pezullojë ose bllokojë llogarinë tuaj.
-
-        Për udhëzime të mëtejshme, shikoni [rregullat e komunitetit](%{base_url}/guidelines).
     welcome_user:
       subject_template: "Mirë se vini tek %{site_name}!"
     welcome_invite:
@@ -996,14 +963,11 @@ sq:
       subject_template: "Data export complete"
     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."
     email_reject_parsing:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
         We couldn't find your reply in the email. **Make sure your reply is at the top of the email** -- we can't process inline replies.
-    spam_post_blocked:
-      subject_template: "New user %{username} posts blocked due to repeated links"
     pending_users_reminder:
       subject_template:
         one: "1 user waiting for approval"
@@ -1042,26 +1006,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,9 +1115,18 @@ 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}."
+      subject_template: "[%{email_prefix}] Përmbledhja"
       click_here: "klikoni këtu"
-      from: "%{site_name} - Një përmbledhje e shkurtër"
+      from: "%{site_name} - përmbledhja"
+      preheader: "Një përmbledhe e shkurtër e faqes që nga vizita juaj e fundit më %{last_seen_at}"
+    confirm_new_email:
+      subject_template: "[%{email_prefix}] Konfirmoni adresën tuaj të re të emailit"
+      text_body_template: |
+        Konfirmoni adresën tuaj të re të emailit për "%{site_name}" duke klikuar linkun më poshtë:
+
+        %{base_url}/u/authorize-email/%{email_token}
+    confirm_old_email:
+      subject_template: "[%{email_prefix}] Konfirmoni adresën e tanishme të emailit "
     notify_old_email:
       text_body_template: |
         Ky është një mesazh automatik që ju njofton se adresa juaj email për
@@ -1184,16 +1137,21 @@ sq:
         %{new_email}
     signup_after_approval:
       subject_template: "Jeni aprovuar tek %{site_name}!"
+    signup:
+      subject_template: "[%{email_prefix}] Konfirmoni llogarinë tuaj të re"
+      text_body_template: |
+        Mirseerdhët tek %{site_name}!
+
+        Klikoni linkun më poshtë për të konfirmuar dhe aktivizuar llogarinë tuaj të re:
+        %{base_url}/u/activate-account/%{email_token}
+
+        Nëse nuk arrini të klikoni në linkun më siper, provoni ta kopjoni dhe ta ngjisni në shfletuesin tuaj.
   page_not_found:
     popular_topics: "Popullore"
     recent_topics: "Më të fundit"
     see_more: "Më shumë"
     search_title: "Kërko në këtë faqe"
     search_google: "Google"
-  login_required:
-    welcome_message: |
-      #[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"
     signup_form_message: 'I have read and accept the <a href="/tos" target="_blank">Terms of Service</a>.'
@@ -1409,9 +1367,6 @@ sq:
         Kjo stemë jepet kur merrni pëlqimin e parë për një postim. Urime, keni postuar diçka të cilën anëtarët e komunitetit e gjetën interesante, fantastike apo të dobishme!
     autobiographer:
       name: Autobiograf
-      description: Plotësoi <a href="/my/preferences">profilin</a> e anëtarit
-      long_description: |
-        Kjo stemë jepet kur mbushni <a href="/my/preferences">profilin tuaj</a> dhe zgjidhni një imazhi profili. Kur lejoni komunitetin t'ju njohë ca më shumë se kush jeni dhe çfarë ju intereson, ndihmon në përmirësimin dhe lidhjen e mëtejshme të komunitetit. Bashkohuni me ne!
     anniversary:
       name: Përvjetor
       description: Anëtar aktiv për një vit, postoi të paktën një herë
@@ -1504,9 +1459,6 @@ sq:
         Kjo stemë jepet kur për herë të parë citoni një postim në përgjigjen tuaj. Të cituarit në përgjigjen tuaj e pjesëve të rëndësishme prej postimeve të mëparshme, ndihmon në mbajtjen e bisedave të lidhura me njëra-tjetrën dhe brenda tematikës. Mënyra më e lehtë për të cituar është duke theksuar pjesë të një postimi, dhe duke shtypur më pas butonin përgjigju. Citoni me bollëk!
     read_guidelines:
       name: Lexoi Udhëzimet
-      description: Ka lexuar <a href="/guidelines">udhëzimet e komunitetit</a>
-      long_description: |
-        Kjo stemë jepet pasi <a href="/guidelines">lexon udhëzimet e komunitetit</a>. Duke ndjekur dhe ndarë këto udhëzime të thjeshta ndihmon në ndërtimin e një komuniteti të sigurtë, dëfryes dhe të qëndrueshëm. Gjithmonë kini parasysh që është një tjetër qënie njerëzore, dikush shumë i ngjashëm me ju, në anën tjetër të ekranit. Silluni mirë!
     reader:
       name: Lexues
       description: Lexoi çdo përgjigje në një temë me mbi 100 përgjigje
@@ -1597,6 +1549,9 @@ sq:
   performance_report:
     initial_post_raw: This topic includes daily performance reports for your site.
     initial_topic_title: Raportet e performancës se faqes
+  finish_installation:
+    confirm_email:
+      title: "Konfirmoni emailin tuaj"
   wizard:
     step:
       emoji:
diff --git a/config/locales/server.sr.yml b/config/locales/server.sr.yml
new file mode 100644
index 0000000000..57e7f7a111
--- /dev/null
+++ b/config/locales/server.sr.yml
@@ -0,0 +1,212 @@
+# 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/
+
+sr:
+  dates:
+    short_date_no_year: "D MMM"
+    short_date: "D MMM, YYYY"
+    long_date: "MMMM D, YYYY h:mma"
+  datetime_formats: &datetime_formats
+    formats:
+      short: "%m-%d-%Y"
+      short_no_year: "%B %-d"
+      date_only: "%B %-d, %Y"
+  date:
+    month_names: [null, januar, februar, mart, april, maj, jun, jul, avgust, septembar, oktobar, novembar, decembar]
+    <<: *datetime_formats
+  title: "Discourse"
+  topics: "Teme"
+  posts: "poruke"
+  loading: "Učitavanje"
+  log_in: "Prijava"
+  disable_remote_images_download_reason: "Daljinske slike za download je onemogućeno zato što nije bilo dovoljno slobodnog prostora na disku."
+  anonymous: "Anonimno"
+  remove_posts_deleted_by_author: "Izbrisano od strane autora"
+  emails:
+    incoming:
+      default_subject: "Ovoj temi je potreban naslov"
+  errors: &errors
+    messages:
+      too_long_validation: "je limitirano na %{max} karaktera; koje ste vi uneli %{length}."
+      invalid_boolean: "Nepravilan boolean."
+      even: mora biti parno
+      exclusion: je rezervisano
+      greater_than: mora biti veće od %{count}
+      contains_censored_words: "sadrži sledeće cenzurisane reči: 1%{censored_words}"
+      matches_censored_pattern: "sadrži sledeće reči koje se poklapaju sa registrom cenzurisanih reči: 1%{censored_wrods}"
+      less_than: mora biti manje od 1%{count}
+      not_a_number: nije broj
+      not_an_integer: mora biti ceo broj
+      record_invalid: 'Verifikacija neuspešna: 1%{errors}'
+    embed:
+      load_from_remote: "Došlo je do greške prilikom učitavanja poruke."
+    site_settings:
+      default_categories_already_selected: "Ne možete izabrati kategoriju koja se koristi u drugoj listi."
+  bulk_invite:
+    file_should_be_csv: "Izabrani fajl bi trebalo biti u csv formatu."
+  topic_invite:
+    user_exists: "Žao nam je, korisnik je već pozvan. Korisnik može biti pozvan na temu samo jednom."
+  backup:
+    operation_already_running: "Jedna operacija je trenutno pokrenuta. Ne mogu da pokrenem drugu trenutno."
+    backup_file_should_be_tar_gz: "Rezervna datoteka bi trebala biti u .tar.gz arhivi."
+    not_enough_space_on_disk: "Nema dovoljno prostora na disku da bi ubacili ovau rezervu."
+  not_logged_in: "Niste prijavljeni da bi uradili to."
+  not_found: "Zatraženi URL ili resurs nije pronađen."
+  read_only_mode_enabled: "Sajt je u čitaj samo modu. Interakcije su isključene."
+  reading_time: "Vreme za čitanje"
+  likes: "Lajkovi"
+  embed:
+    start_discussion: "Započnite diskusiju"
+    continue: "Nastavite diskusiju"
+  no_links_allowed: "Žao nam je, novi korisnici ne mogu postavljati linkove u svoje postove."
+  contains_blocked_words: "Vaš post, sadrži reči koje nisu dozvoljene."
+  user_is_suspended: "Suspendovanim korisnicima nije dozvoljeno da objavljuju postove."
+  topic_not_found: "Nešto se dogodilo. Možda je tema zatvorena ili izbrisana dok ste je gledali?"
+  not_accepting_pms: "Žao nam je, %{username} trenutno ne prihvata privatne poruke."
+  invalid_characters: "sadrži nevažeće karaktere."
+  is_invalid: "deluje nejasno, da li je rečenica kompletna?"
+  next_page: "sledeća strana →"
+  prev_page: "← prethodna strana"
+  page_num: "Strana %{num}"
+  home_title: "Home"
+  topics_in_category: "Teme u '%{category}' kategoriji"
+  num_posts: "Postovi:"
+  num_participants: "Učesnici: "
+  read_full_topic: "Pročitajte celu temu"
+  rss_description:
+    latest: "Poslednje teme"
+    hot: "Vruće teme"
+    top: "Top teme"
+    user_posts: "Poslednji postovi autora @%{username}"
+    user_topics: "Poslednje teme autora @%{username}"
+    tag: "Označene teme"
+  revert_version_same: "Trenutna verzija je ista onoj na koju pokušavate da se vratite."
+  excerpt_image: "slika"
+  groups:
+    success:
+      bulk_add: "%{users_added} korisnika je dodato grupi."
+    errors:
+      member_already_exist: "'%{username}' je postojeći član grupe."
+    default_names:
+      everyone: "svi"
+      admins: "admini"
+      moderators: "moderatori"
+      staff: "osoblje"
+  activerecord:
+    attributes:
+      category:
+        name: "Ime kategorije"
+      topic:
+        title: 'Naslov'
+      user_profile:
+        bio_raw: "O meni"
+    errors:
+      models:
+        topic:
+          attributes:
+            base:
+              cant_send_pm: "Žao nam je, ne možete slati privatne poruke tom korisniku."
+        user:
+          attributes:
+            password:
+              common: "je jedna od 10000 najčešće korišćenih lozinki. Molimo Vas izaberite sigurniju lozinku."
+              same_as_username: "je ista kao vaše korisničko ime. Molimo Vas izaberite sigurniju šifru."
+      <<: *errors
+  change_email:
+    authorizing_old:
+      title: "Hvala što ste potvrdili svoju važeću email adresu"
+  site_settings:
+    min_topic_title_length: "Minimalna dozvoljena dužina naslova teme u znakovima"
+    max_topic_title_length: "Maksimalna dozvoljena dužina naslova teme u znakovima"
+    min_private_message_title_length: "Minimalna dozvoljena dužina naslova poruke u znakovima"
+    min_search_term_length: "Minimalna dozvoljena dužina termina za pretragu u znakovima"
+    apple_touch_icon_url: "Ikonica koja se koristi za Apple touch uređaje. Preporučena veličina 144px sa 144px."
+    max_replies_in_first_day: "Maksimalan broj odgovora koje korisnik može da kreira u prvih 24 sata nakon kreiranja svoje prve poruke."
+    flag_sockpuppets: "Ako novi korisnik odgovara na temu sa iste IP adrese kao i novi korisnik koji je pokrenuo temu, označi obe njihove poruke kao potencijalni spam."
+    pending_users_reminder_delay: "Obavesti moderatore ako novi korisnik čeka na odobrenje duže nego ovoliko časova. Podesiti na -1 da bi se onemogućile notifikacije."
+    maximum_session_age: "Korisnik će ostati ulogovan n časova od prethodnog logovanja"
+    max_image_megapixels: "Maksimalan dozvoljeni broj megapiksela za slike."
+    topic_views_heat_low: "Nakon ovoliko pregleda, polje pregleda je blago označeno."
+    topic_views_heat_medium: "Nakon ovoliko pregleda, polje pregleda je umereno označeno."
+    topic_views_heat_high: "Nakon ovoliko pregleda, polje pregleda je jako označeno."
+    num_hours_to_close_topic: "Broj sati za pauziranje teme radi intervencije."
+    reply_by_email_enabled: "Omogući odgovore na teme putem email poruka."
+    incoming_email_prefer_html: "Koristi HTML umesto tekstualnog formata za dolazne email poruke."
+    disable_emails: "Spreči Discourse da šalje bilo kakve email poruke"
+    delete_email_logs_after_days: "Obriši email logove posle (N) dana. Uneti 0 za neograničeno čuvanje."
+    block_auto_generated_emails: "Blokiraj dolazne email poruke prepoznate kao automatski generisane."
+    ignore_by_title: "Ignoriši dolazne email poruke na osnovu njihovog naslova"
+    enable_forwarded_emails: "[BETA] Dozvoli korisnicima da kreiraju temu prosleđivanjem email poruke."
+    private_email: "Ne uključuj sadržaj  poruka ili tema u email porukama radi dodatne privatnosti."
+    pop3_polling_ssl: "Koristi SSL pri povezivanju na POP3 server. (Preporučeno)"
+    pop3_polling_period_mins: "Period u minutima za proveru novih email poruka na POP3 nalogu. NAPOMENA: zahteva ponovno pokretanje. "
+    pop3_polling_port: "Port za proveru POP3 naloga."
+    pop3_polling_username: "Korisničko ime POP3 naloga za proveru postojanja novih email poruka"
+    pop3_polling_password: "Lozinka PO3 naloga za proveru postojanja novih email poruka"
+    log_mail_processing_failures: "Beleži sve greške u obradi email poruka na http://yoursitename.com/logs"
+    minimum_topics_similar: "Koliko teme mora da postoji da bi se prikazivale slične teme prilikom kreiranja novih"
+    delete_user_max_post_age: "Ne dozvoli brisanje korisnika čije prve poruke su starije od (x) dana."
+    delete_all_posts_max: "Maksimalan broj poruke koje mogu biti obrisane odjednom korišćenjem dugmeta Obriši sve poruke. Ako korisnik ima više poruka, poruke ne mogu biti obrisane odjednom i korisnik ne može biti obrisan."
+    email_editable: "Dozvoli korisnicima da promene svoju email adresu nakon registracije"
+    allow_uploaded_avatars: "Dozvoli korisnicima da postave svoju sliku za profil"
+    default_avatars: "URL avatara koji će biti korišćeni kao podrazumevani za nove korisnike dok ih ne promene. "
+    digest_other_topics: "Maksimalan broj tema za prikazivanje u sekciji \"Novo u temama i kategorijama koje pratite\" rezimea email poruke."
+    digest_min_excerpt_length: "Minimalna dužina isečka poruke u email rezimeu, u karakterima."
+    email_link_color: "Boja linkova u HTML email porukama. Unesite ime boje ('blue') ili heksadecimalnu vrednost ('#0000FF'). "
+    allow_anonymous_posting: "Dozvoli korisnicima da se prebace u anonimni mod"
+    hide_user_profiles_from_public: "Onemogući korisničke kartice, profile i direktorijume za anonimne korisnike."
+    sequential_replies_threshold: "Broj poruka koje korisnik može zaredom da pošalje pre upozoravanja o  prevelikom broju uzastopnih odgovora."
+    disable_avatar_education_message: "Onemogući edukativne poruke za izmenu avatara."
+    read_time_word_count: "Broj reči po minutu za računanje procenjenog vremena čitanja"
+    share_anonymized_statistics: "Deli anonimizirane statistike korišćenja"
+    full_name_required: "Puno ime je obavezno polje profila korisnika."
+    display_name_on_posts: "Prikaži puno ime korisnika na njihovim porukama kao dodatak na @korisnicko_ime"
+    show_time_gap_days: "Ako su dve poruke poslate sa ovoliko dana razmaka, prikaži vremensku razliku u temi."
+    default_code_lang: "Podrazumevani programski jezik za obeležavanje sintakse GitHub blokova koda (lang-auto, ruby, python itd.)"
+    warn_reviving_old_topic_age: "Kada neko krene da odgovara na temu u kojoj je poslednji odgovor stariji od ovoliko dana, biće prikazano upozorenje. Onemogućite postavljanjem vrednosti 0. "
+    autohighlight_all_code: "Forsiraj primenu označavanja koda za sve preformatirane blokove koda i kada nije eksplicitno naveden jezik."
+    highlighted_languages: "Uključena pravila za označavanje sintakse (Upozorenje: uključivanje previše jezika može da utiče na performanse). Pogledajte https://highlightjs.org/static/demo/ za demo."
+    embed_username_required: "Korisničko ime je obavezno za kreiranje teme."
+    show_create_topics_notice: "Ako sajt ima manje od 5 javnih tema, prikaži poruku koja sugeriše administratorima da kreiraju neke teme."
+    delete_drafts_older_than_n_days: Izbriši radne verzije poruka starije od (n) dana
+    enable_emoji: "Omogući emotikone"
+    enforce_square_emoji: "Forsiraj kvadratni oblik za sve emotikone."
+    auto_close_messages_post_count: "Maksimalan broj dozvoljenih poruka pre nego se tema automatski zatvori  (0 da se isključi)"
+    default_email_mailing_list_mode: "Podrazumevano šalji email za svaku novu poruku"
+    default_email_previous_replies: "Podrazumevano uključi prethodne odgovore u email poruku"
+    default_other_external_links_in_new_tab: "Podrazumevano otvori spoljne veze u novoj kartici "
+  wizard:
+    step:
+      locale:
+        title: "Dobrodošli na vaš Discourse"
+        fields:
+          default_locale:
+            description: "Koji je podrazumevani jezik vaše zajednice?"
+      forum_title:
+        title: "Ime foruma"
+        description: "Naziv foruma je <i>prva</i> stvar koju će posetioci primetiti. Šta vaše ime govori o vašoj zajednici?"
+        fields:
+          title:
+            label: "Ime vaše zajednice"
+            placeholder: "Milenino mesto za bleju"
+          site_description:
+            label: "Opišite vašu zajednicu u jednoj kratkoj rečenici"
+            placeholder: "Mesto gde Milena i njene prijateljice ćaskaju o kul stvarima"
+      introduction:
+        title: "Uvod"
+        fields:
+          welcome:
+            label: "Tema dobrodošlice"
+            description: "<p>Kako biste najbolje opisali vašu zajednicu totalnom strancu u liftu u 1 minuti?</p> <ul> <li>Za koga su ove diskusije?</li> <li>Šta ovde mogu da pronađem?</li> <li>Zašto bih ovo posećivao?</li> </ul> <p>Vaša tema dobrodošlice je prvo što će novi posetioci pročitati. Posmatrajte je to kao <b>vašu misiju</b> u jednom paragrafu. </p>"
+            one_paragraph: "Molimo da vaša poruka dobrodošlice ne bude duža od jednog paragrafa."
+      finished:
+        title: "Vaš Discource je spreman!"
+  time:
+    <<: *datetime_formats
+  activemodel:
+    errors:
+      <<: *errors
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 5556b1e69e..e2f12b7b6c 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -43,7 +43,6 @@ sv:
         auto_generated_email_error: "Händer när 'precedence'-rubriken är satt till: list, skräp, mass eller auto-reply, eller när någon annan rubrik innehåller: auto-submitted, auto-replied eller auto-generated."
         no_body_detected_error: "Händer när vi inte kunde extrahera någon huvuddel och det inte fanns några bilagor."
         inactive_user_error: "Händer när sändaren inte är aktiv."
-        blocked_user_error: "Händer när sändare har blivit blockerad."
         bad_destination_address: "Händer när inga av e-postadresserna i Till/Cc/Bcc-fälten matchar en konfigurerad inkommande e-postadress."
         strangers_not_allowed_error: "Händer när en användare försöker skapa ett nytt ämne i en kategori som användare inte är en medlem av."
         insufficient_trust_level_error: "Händer när en användare försöker skapa ett nytt ämne i en kategori som användare saknar förtroendenivå för."
@@ -295,7 +294,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:
@@ -536,7 +534,6 @@ sv:
       email_title: 'Ämnet "%{title}" kräver moderators uppmärksamhet'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Ditt inlägg blev flaggat av andra medlemmar i forumet. Vänligen <a href="/my/messages">se över dina meddelanden</a>.</p>'
     user_must_edit: '<p>Detta inlägg blev flaggat av andra medlemmar i forumet och är dolt för tillfället.</p>'
   archetypes:
     regular:
@@ -548,7 +545,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"
@@ -761,9 +757,7 @@ sv:
     educate_until_posts: "Visa hjälppanelen för komponering tills dess att användaren har gjort (n) nya inlägg. "
     title: "Namnet på denna webbplats som används i titel-taggen."
     site_description: "Beskriv denna webbplats i en mening, som sedan används i meta-description-taggen."
-    contact_email: "E-postadresser som är kritiska för kontakt av den här webbplatsen. Används för kritiska notiser såsom ohanterade flaggor och även som kontaktadress för brådskande ärenden på /om-sidans kontaktformulär."
     contact_url: "Kontakt URL för den här webbplatsen. Används på /om kontaktformuläret för brådskande ärenden."
-    queue_jobs: "UTVECKLARE ENDAST! VARNING! Köa uppgifter i sidekiq som standard. Om inaktiverat så kommer din webbplats att gå sönder."
     crawl_images: "Hämta bilder från tredjepartskällor för att infoga korrekta bredd- och höjddimensioner. "
     download_remote_images_to_local: "Konvertera externa bilder till lokala bilder genom att ladda hem dem; det motverkar felaktiga bildlänkar."
     download_remote_images_threshold: "Minimalt diskutrymme nödvändigt för att hämta hem externa bilder lokalt (i procent)"
@@ -778,7 +772,6 @@ sv:
     fixed_category_positions: "Om aktiverad, kommer du kunna ordna kategorier i en bestämd ordning. Om inaktiverad, sorteras kategorierna baserat på aktivitet."
     fixed_category_positions_on_create: "Kategoriordningen kommer att upprätthållas vid dialogen för skapandet av ämnen om den här bockas i (kräver fixed_category_positions)."
     add_rel_nofollow_to_user_content: "Lägg till rel nofollow på allt användargenererat innehåll, förutom interna länkar (inklusive förälderdomän). Om du ändrar det här så måste du uppdatera alla inlägg med \"rake posts:rebake\""
-    exclude_rel_nofollow_domains: "En lista av alla domän där nofollow inte bör läggas till länkarna. tld.com kommer automatiskt tillåta sub.tld.com också. Du bör lägga till top-level domän från den här webbplatsen för att hjälpa sökrobotar hitta allt innehåll. Om andra delar av din webbplats finns på andra domän så bör du lägga till dem också. "
     post_excerpt_maxlength: "Maxlängd på ett inläggs utdrag / sammanfattning."
     show_pinned_excerpt_mobile: "Visa inte utdrag för klistrade ämnen i mobilen."
     show_pinned_excerpt_desktop: "Visa inte utdrag för klistrade ämnen på datorn."
@@ -788,7 +781,6 @@ sv:
     digest_logo_url: "Den alternativa logotypen används överst i din webbplats e-postsammanfattning. Den bör ha en bred rektangulär form. Den borde inte vara en SVG-bild. Om den lämnas blank kommer `logo_url` att användas."
     logo_small_url: "Den lilla logotypen som visas i övre vänstra hörnet av hemsidan när man bläddrar ned i ämnen. Om den lämnas blank kommer hemloggan visas."
     favicon_url: "En favoritikon för din webbplats, se http://en.wikipedia.org/wiki/Favicon. För att fungera korrekt med en CDN måste det vara en png"
-    mobile_logo_url: "Den fixerade logotypen som används i det övre vänstra hörnet av din mobilsida. Bör vara en kvadratisk form. Om den lämnas blank så kommer `logo_url` att användas, eg: http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "Ikon som används för Apples touch-enheter. Rekommenderad storlek är 144*144 pixlar."
     notification_email: "Avsändaradressen som används vid utskick av system e-post. Domänen som specifieras här måste ha en SPF, DKIM och reverse PTR record korrekt inställt för att e-post ska levereras."
     email_custom_headers: "En pipe-avgränsad lista av anpassade e-postrubriker"
@@ -813,14 +805,8 @@ sv:
     tl2_additional_likes_per_day_multiplier: "Höj gränsen för antal gillningar per dag för användare med förtroendenivå 2 (medlem) genom att multiplicera med det här numret "
     tl3_additional_likes_per_day_multiplier: "Höj gränsen för antal gillningar per dag för användare med förtroendenivå 3 (regelbundna) genom att multiplicera med det här numret"
     tl4_additional_likes_per_day_multiplier: "Höj gränsen för antal gillningar per dag för användare med förtroendenivå 4 (ledare) genom att multiplicera med det här numret"
-    num_spam_flags_to_block_new_user: "Dölj alla inlägg från en ny användare och förhindra framtida inlägg om ett av användarens inlägg får så här många flaggningar för spam från num_users_to_block_new_user olika användare. Ange 0 för att inaktivera."
-    num_users_to_block_new_user: "Dölj alla inlägg och förhindra framtida inlägg från en ny användare om ett av användarens inlägg får num_spam_flags_to_block_new_user flaggningar för spam från så här många olika användare. Ange 0 för att inaktivera."
-    num_tl3_flags_to_block_new_user: "Dölj alla inlägg från en ny användare och förhindra framtida inlägg om ett av användarens inlägg får så här många flaggningar från num_tl3_users_to_block_new_user olika användare med förtroendenivå 3. Ange 0 för att inaktivera."
-    num_tl3_users_to_block_new_user: "Dölj alla inlägg och förhindra framtida inlägg från en ny användare om ett av användarens inlägg får num_tl3_flags_to_block_new_user flaggningar från så här många olika användare med förtroendenivå 3. Ange 0 för att inaktivera."
-    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. "
@@ -854,12 +840,9 @@ sv:
     allow_index_in_robots_txt: "Specificera i robots.txt att den här webbplatsen tillåter att bli indexerad av sökmotorer. "
     email_domains_blacklist: "En pipe-avgränsad lista av alla e-postdomän som användare inte tillåts registrera konton med. Exempel: mailinator.com, trashmail.net"
     email_domains_whitelist: "En pipe-avgränsad lista av alla e-postdomän som användare MÅSTE registrera konton med. VARNING: Användare med e-postdomän som inte finns på listan kommer inte att tillåtas!"
-    forgot_password_strict: "Informera inte användare om ett kontos existens när de försöker använda dialogen vid bortglömt lösenord. "
     log_out_strict: "Vid utloggning, logga ut ALLA sessioner för den användaren på alla apparater"
     version_checks: "Pinga Discourse Hubben för versionsuppdatering och visa nya versionsmeddelanden på /admin översiktspanelen"
     new_version_emails: "Skicka ett mejl till contact_email när en ny version av Discourse finns tillgängligt."
-    port: "ENDAST UTVECKLARE! VARNING! Använd denna HTTP-port istället för standardporten 80. Lämna tom för standardport 80. "
-    force_hostname: "ENDAST UTVECKLARE! VARNING! Specifiera ett värdnamn i URL:en. Lämna tom för standard."
     invite_expiry_days: "Hur länge användarinbjudningsnycklar är giltiga, i dagar"
     invite_passthrough_hours: "Hur länge en användare kan använda en tidigare utlöst inbjudningsnyckel för att logga in, i timmar"
     login_required: "Kräv autentisering för att läsa innehåll på den här webbplatsen, avvisa anonym tillgång."
@@ -934,7 +917,6 @@ sv:
     clean_up_uploads: "Ta bort föräldralösa orefererade uppladdningar för att förhindra illegal hosting. VARNING: det kan vara värt att säkerhetskopiera din /uploads-mapp innan du aktiverar den här inställningen."
     clean_orphan_uploads_grace_period_hours: "Nådefrist (i timmar) innan en föräldralös uppladdning raderas."
     purge_deleted_uploads_grace_period_days: "Nådefrist (i dagar) innan en borttagen uppladdning raderas."
-    purge_unactivated_users_grace_period_days: "Nådefrista (i dagar) innan en användare som inte har aktiverat sitt raderas."
     enable_s3_uploads: "Lägg uppladdningar i Amazon S3 lagring. VIKTIGT: kräver giltiga S3-kreditiv (både åtkomstnyckelns ID och den hemliga åtkomstnyckeln)."
     s3_use_iam_profile: 'Använd AWS EC2 IAM roll för att återfå nycklar. OBS: aktivering kommer att åsidosätta inställningarna "s3 access key id" och "s3 secret access key". '
     s3_upload_bucket: "Namnet på Amazon S3 behållaren som filerna kommer att laddas upp i. VARNING: måste vara gemener, inga punkter och inga understreck."
@@ -1035,9 +1017,6 @@ sv:
     num_flags_to_close_topic: "Minsta antal aktiva flaggor som krävs för att automatiskt pausa ett ämne för ingripande"
     auto_respond_to_flag_actions: "Aktivera automatiskt svar vid hantering av en flagga."
     min_first_post_typing_time: "Minsta tid i millisekunder en användare måste skriva vid komponerandet av sitt första inlägg. Om gränsen inte är uppnådd så kommer inlägget automatiskt att hamna i kön av saker som behöver granskas. Ange 0 för att inaktivera (rekommenderas ej)"
-    auto_block_fast_typers_on_first_post: "Blockera automatiskt användare som inte når upp till min_first_post_typing_time"
-    auto_block_fast_typers_max_trust_level: "Högsta förtroendenivå för att automatiskt blockera snabba författare"
-    auto_block_first_post_regex: "Skriftlägeskänsligt regex som om godkänt kommer att orsaka att första inlägget av en användare blockeras och skickas till kön för saker som behöver granskas. Exempel: raging|a[bc]a kommer att orsaka att alla inlägg som börjar med raging eller aba eller aca blockeras vid första försöket. Gäller endast användarens första inlägg. "
     reply_by_email_enabled: "Aktivera möjlighet att svara på ämnen via e-post."
     reply_by_email_address: "Mall för inkommande e-postadress för svar via e-post, till exempel: %{reply_key}@svar.exempel.se eller svar+%{reply_key}@exempel.se"
     disable_emails: "Förhindra Discourse från att skicka någon form av e-post"
@@ -1071,7 +1050,6 @@ sv:
     pop3_polling_username: "Användarnamn för POP3-kontot som ska sökas efter e-post."
     pop3_polling_password: "Lösenord för POP3-kontot som ska sökas efter e-post."
     log_mail_processing_failures: "Logga alla behandlingsfel för e-post till http://dinhemsida.se/logs"
-    email_in: "Tillåt användare att skapa nya ämnen via e-post (kräver POP3 sökning). Konfigurera adresserna i tabben med inställningar för varje kategori."
     email_in_min_trust: "Minsta förtroendenivå en användare behöver för att tillåtas skapa nya ämnen via e-post."
     email_prefix: "[label] används i ämnesraden för e-post. Om ej ifylld sätts standardrubriken 'title'."
     email_site_title: "Webbplatsens titel som används som avsändare för e-post från webbplatsen. Om ej ifylld sätts standardtiteln 'title'. Använd det alternativet om din titel innehåller tecken som inte tillåts i e-post avsändarsträngar."
@@ -1079,7 +1057,6 @@ sv:
     relative_date_duration: "Antal dagar efter att ett inlägg skrivits som datummarkeringen som visas för inlägget är relativ (7d) istället för absolut (20 Feb). "
     delete_user_max_post_age: "Tillåt inte raderande av användare vars äldsta inlägg är äldre än (x) dagar."
     delete_all_posts_max: "Högsta antal inlägg som kan raderas på samma gång med Radera Alla Inlägg-knappen. Om en användare har fler än så många inlägg så kan inläggen inte raderas på samma gång och användaren kan inte raderas."
-    username_change_period: "Antal dagar efter registrering som användarnamn kan ändras för konton (ange 0 för att avvisa användarnamnsändringar)."
     email_editable: "Tillåt användare att ändra deras e-postadress efter registrering."
     allow_uploaded_avatars: "Tillåt att användare laddar upp egna profilbilder."
     allow_animated_avatars: "Tillåt att användare använder animerade gif-profilbilder. VARNING: kör avatars:refresh rake-kommando efter att ha ändrat den här inställningen."
@@ -1128,16 +1105,10 @@ sv:
     warn_reviving_old_topic_age: "En varning visas när någon börjar skriva ett svar på ett ämne och senaste inlägget är äldre än så här många dagar. Ange 0 för att inaktivera."
     autohighlight_all_code: "Tvinga applicerad syntaxmarkering på alla förformatterade kodblock även när de inte explicit har specifierat språket."
     highlighted_languages: "Ingår syntax höjda regler. (Varning: att inkludera för många språk kan ha påverkan på prestandan) se: https://highlightjs.org/static/demo/ för en demo"
-    feed_polling_enabled: "ENDAST INBÄDDNING: Huruvida RSS/ATOM-flöde ska bäddas in som inlägg."
-    feed_polling_url: "ENDAST INBÄDDNING: URL för RSS/ATOM-flöde att bädda in."
-    embed_by_username: "Discourse användarnamn för användaren som skapar inbäddade ämnen."
-    embed_username_key_from_feed: "Nyckel för att hämta discourse användarnamn från flöde. "
     embed_truncate: "Trunkera de inbäddade inläggen."
     allowed_href_schemes: "System tillåtna i länkar i motsatsen till http och https."
     embed_post_limit: "Högsta antal inlägg att bädda in."
     embed_username_required: "Användarnamn krävs för skapade av ämne."
-    embed_whitelist_selector: "CSS-väljare för element som tillåts bäddas in. "
-    embed_blacklist_selector: "CSS-väljare för element som tas bort från inbäddningar."
     show_create_topics_notice: "Visa en notis som ber administratörerna att skapa några ämnen om webbplatsen har färre än 5 publika ämnen."
     delete_drafts_older_than_n_days: Ta bort utkast som är äldre än (n) dagar.
     bootstrap_mode_min_users: "Minsta antal användare som krävs för att inaktivera bootstrap-läget (ange 0 för att inaktivera)"
@@ -1175,9 +1146,7 @@ sv:
     default_categories_watching: "Lista av kategorier som är bevakade som standard."
     default_categories_tracking: "Lista av kategorier som är följda som standard."
     default_categories_muted: "Lista av kategorier som är tystade som standard."
-    default_categories_watching_first_post: "Förteckning över kategorier i vilket första inlägget i varje nytt ämnet kommer att ses som standard."
-    max_user_api_reqs_per_day: "Maximalt antal användare som API´t kräver per nyckel/dag"
-    max_user_api_reqs_per_minute: "Maximalt antal användare API kräver på nyckel/minut"
+    default_categories_watching_first_post: "Förteckning över kategorier i vilket första inlägget i varje nytt ämne kommer att bevakas som standard."
     allow_user_api_key_scopes: "Lista över samtliga tillåtna användar-API nycklar "
     max_api_keys_per_user: "Maximalt antal användar API nycklar per användare"
     min_trust_level_for_user_api_key: "Förtroende nivå som krävs för att generera användar API nycklar"
@@ -1308,7 +1277,6 @@ sv:
     email_too_long: "E-postadressen du tillhandahöll är för lång. E-postadresser kan på sin höjd vara 254 tecken och domännamn inte mer än 253 tecken."
     reserved_username: "Användarnamnet är inte tillåtet."
     missing_user_field: "Du har inte fyllt i alla användarfält"
-    close_window: "Autentiseringen är färdig. Stäng det här fönstret för att fortsätta."
     already_logged_in: "Hoppsan, det ser ut som att du försöker acceptera en inbjudan för en annan användare. Logga ut och försök igen om du inte är %{current_user}. "
   user:
     no_accounts_associated: "Inga kopplade konton"
@@ -1317,7 +1285,6 @@ sv:
     username:
       short: "måste var minst %{min} tecken"
       long: "får högst vara %{max} tecken"
-      characters: "får endast innehålla nummer, bokstäver och understreck"
       unique: "måste vara unikt"
       blank: "måste finnas"
       must_begin_with_alphanumeric_or_underscore: "måste börja med en bostav, en siffra eller ett understreck"
@@ -1339,15 +1306,10 @@ sv:
     subject_template: "Bekräfta att du inte längre vill motta e-postuppdateringar från %{site_title}"
   invite_mailer:
     title: "Invitera mail skrivaren"
-    subject_template: "%{invitee_name} har bjudit in dig till '%{topic_title}' på %{site_domain_name}"
   custom_invite_mailer:
     title: "Kund inviterar mail skrivare"
-    subject_template: "%{invitee_name} har bjudit in dig till '%{topic_title}' på %{site_domain_name}"
   invite_forum_mailer:
     title: "Invitera forumets skrivare"
-    subject_template: "%{invitee_name} har bjudit in dig till %{site_domain_name}"
-  custom_invite_forum_mailer:
-    subject_template: "%{invitee_name} har bjudit in dig till %{site_domain_name}"
   invite_password_instructions:
     title: "Invitera lösenords instruktioner"
     subject_template: "Ange lösenord för ditt konto på %{site_name}"
@@ -1357,12 +1319,6 @@ sv:
     title: "Ny version mail skrivare"
   new_version_mailer_with_notes:
     title: "Ny version mail skrivare med anteckningar"
-  queued_posts_reminder:
-    title: "Påminnelse om köande inlägg"
-    text_body_template: |
-      Hej!
-
-      Meddelanden från nya användare väntar för närvarande på att granskas. [Godkänn eller avvisa dem här](%{base_url}/queued-posts).
   flag_reasons:
     off_topic: "Ditt inlägg blev flaggat som **orelevant**. Medlemmarna i forumet kände att det inte är passande för ämnet, som definieras av rubriken och det första inlägget."
     inappropriate: "Ditt inlägg blev flaggat som **olämpligt**. Medlemmarna i forumet kände att det är störande, kränkande eller att det strider mot [våra riktlinjer](/guidelines)."
@@ -1378,20 +1334,6 @@ sv:
     post_hidden:
       title: "Gömda inlägg"
       subject_template: "Inlägg dolt på grund av att det flaggats av forumets medlemmar"
-      text_body_template: |
-        Hej!
-
-        Det här är ett automatiserat meddelande från %{site_name} för att informera dig om att ditt meddelande har dolts.
-
-        %{base_url}%{url}
-
-        %{flag_reason}
-
-        Ett flertal forummedlemmar flaggade det här meddelandet innan det doldes. Var vänlig och begrunda hur du kan se över ditt meddelande för att reflektera deras respons. **Du kan redigera ditt meddelande efter %{edit_delay} minuter, då kommer det automatiskt att visas igen.**
-
-        Om meddelandet flaggas av medlemmarna och döljs en andra gång så kommer det att fortsätta döljas tills det har hanterats av personal – och det är möjligt att det leder till andra åtgärder, bland annat avstängning av ditt konto.
-
-        För ytterligare information, se våra [riktlinjer](%{base_url}/guidelines).
     welcome_user:
       title: "Välkommen Användare"
       subject_template: "Välkommen till %{site_name}!"
@@ -1423,49 +1365,22 @@ sv:
     csv_export_failed:
       title: "CSV exporten misslyckades"
       subject_template: "Dataexport misslyckades"
-      text_body_template: "Tyvärr har din dataexport misslyckats. Var god kontrollera loggarna eller kontakta personal."
     email_reject_insufficient_trust_level:
       title: "email avslår otillräcklig förtroendenivå"
-      text_body_template: |
-        Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas.
-
-        Ditt konto har inte tillräckligt hög förtroendenivå för att skriva nya inlägg från den e-postadressen. Kontakta personal om du tror att det här är ett misstag.
     email_reject_user_not_found:
       title: "Emailet avslås användare kunde inte finnas"
-      text_body_template: |
-        Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas.
-
-        Ditt svarsmeddelande skickades från en okänd e-postadress. Försök skicka meddelandet från en annan e-postadress, eller kontakta personal.
     email_reject_screened_email:
       title: "Email avslås screenade email"
-      text_body_template: |
-        Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas.
-
-        Ditt svarsmeddelande skickades från en blockerad e-postadress. Försök skicka svaret från en annan e-postadress eller kontakta personal.
     email_reject_inactive_user:
       title: "Emailet avslås Inaktiverad användare"
       text_body_template: |
         Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas.
 
         Kontot associerat till den här e-postadressen är inte aktiverat. Var god se till att ditt konto är aktiverat innan du skickar e-post.
-    email_reject_blocked_user:
-      title: "Email avslås blockerad användare"
-      text_body_template: |
-        Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas.
-
-        Kontot associerat till den här e-postadressen har blockerats.
     email_reject_reply_user_not_matching:
       title: "Emailet avslås användare hittas ej"
-      text_body_template: |
-        Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas.
-
-        Ditt svarsmeddelande skickades från en annan e-postadress än den vi väntat oss, så vi är inte säkra på att det är från samma person. Försök skicka svaret från en annan e-postadress eller kontakta personal.
     email_reject_no_account:
       title: "Emailet avslås det finns inget konto"
-      text_body_template: |
-        Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas.
-
-        Vi kan inte hitta något konto som matchar din e-postadress. Försök skicka meddelandet från en annan e-postadress eller kontakta personal.
     email_reject_empty:
       title: "Emailet avslås - tomt"
       text_body_template: |
@@ -1481,16 +1396,8 @@ sv:
         Vi kunde inte hitta något svar i ditt e-postmeddelande. **Se till att ditt svar är högst upp i e-postmeddelandet** -- vi kan inte hantera inbäddad text.
     email_reject_invalid_access:
       title: "Emailet avslås ogiltig åtkomst"
-      text_body_template: |
-        Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas.
-
-        Ditt konto har inte rättighet att skriva nya inlägg i den kategorin. Kontakta personal om du tror att det här är ett misstag.
     email_reject_strangers_not_allowed:
       title: "Emailet avslås okända är ej tillåtna"
-      text_body_template: |
-        Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas.
-
-        Kategorin som du skickat e-postmeddelandet till godkänner endast inlägg från användare med giltiga konton och kända e-postadresser. Kontakta personal om du tror att det här är ett misstag.
     email_reject_invalid_post:
       title: "Emailet avslås ogiltigt inlägg"
       text_body_template: |
@@ -1515,34 +1422,14 @@ sv:
         Poståtgärden kändes inte igen. Var vänlig försök igen, eller gör ett inlägg via hemsidan om problemet fortsätter.
     email_reject_reply_key:
       title: "Emailet avvisar svars nyckeln"
-      text_body_template: |
-        Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas.
-
-        Svarsnyckeln i e-postmeddelandet är ogiltigt eller okänt, så vi vet inte vad det är e-postmeddelandet är ett svar till. Kontakta personal.
     email_reject_bad_destination_address:
       title: "Emailet avslås dålig mottagaradress"
-      text_body_template: |
-        Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas.
-
-        Inga av mottagaradresserna kunde identifieras. Var god se till att du skickar till en korrekt e-postadress tillhandahållen av personalen.
     email_reject_topic_not_found:
       title: "Emailet avslås ämnet fanns ej"
-      text_body_template: |
-        Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas.
-
-        Ämnet du försöker svara i finns inte längre, kanske har den raderats? Kontakta personal om du tror att det här är ett misstag.
     email_reject_topic_closed:
       title: "Emailet avslås ämnet är stängt"
-      text_body_template: |
-        Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas.
-
-        Ämnet som du svarar i är för närvarande avstängt och tar inte emot svarsmeddelanden. Kontakta personal om du tror att det här är ett misstag.
     email_reject_auto_generated:
       title: "Emailet avslås detta är autogenererat"
-      text_body_template: |
-        Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas.
-
-        Ditt e-postmeddelande har flaggats som "autogenererat", vilket betyder att e-postmeddelandet är skapat av en dator och inte skrivet av en människa. Vi kan tyvärr inte acceptera den typen av e-post. Kontakta personal om du tror att det här är ett misstag.
     email_error_notification:
       title: "Email felmeddelanden"
       text_body_template: |
@@ -1554,66 +1441,8 @@ sv:
     too_many_spam_flags:
       title: "För många skräppost flaggningar"
       subject_template: "Nytt konto pausat"
-      text_body_template: |
-        Hej!
-
-        Det här är ett automatiserat meddelande från %{site_name} för att informera dig om att dina inlägg temporärt har dolts på grund av att de flaggades av medlemmar.
-
-        Som en förebyggande åtgärd har ditt nya konto blockerats från att skapa nya inlägg eller ämnen tills det har granskats av personal. Vi ber om ursäkt för besväret.
-
-        För ytterligare information, se våra [riktlinjer](%{base_url}/guidelines).
     too_many_tl3_flags:
       subject_template: "Nytt konto pausat"
-      text_body_template: |
-        Hej!
-
-        Det här är ett automatiserat meddelande från %{site_name} för att informera dig om att dina inlägg temporärt har dolts på grund av att de flaggades av ett stort antal medlemmar.
-
-        Som en förebyggande åtgärd har ditt nya konto blockerats från att skapa nya inlägg eller ämnen tills det har granskats av personal. Vi ber om ursäkt för besväret.
-
-        För ytterligare information, se våra [riktlinjer](%{base_url}/guidelines).
-    blocked_by_staff:
-      title: "Blockerat av personal"
-      subject_template: "Konto tillfälligt pausat"
-      text_body_template: |
-        Hej!
-
-        Det här är ett automatiserat meddelande från %{site_name} för att informera dig om att ditt konto tillfälligt har pausats som en försiktighetsåtgärd.
-
-        Det går bra att fortsätta besöka sidan men du kommer inte att kunna skriva inlägg eller skapa nya ämnen förrän [personalen](%{base_url}/about) granskar dina senaste inlägg. Vi ber om ursäkt för besväret.
-
-        För mer information, se våra [riktlinjer](%{base_url}/guidelines).
-    user_automatically_blocked:
-      title: "Användare blir automatiskt blockerad"
-      subject_template: "Ny användare  %{username} blockerad på grund av flaggningar från forumet"
-      text_body_template: |
-        Det här är ett automatiserat meddelande.
-
-        Den nya användaren [%{username}](%{user_url}) blockerades automatiskt på grund av att ett flertal medlemmar flaggat användaren %{username}s inlägg.
-
-        Var vänlig och [granska inläggen](%{base_url}/admin/flags). Om %{username} har blockerats på felaktig grund, var god och klicka på avblockeringsknappen [på administrationssidan för den här användaren](%{user_url}).
-
-        Du kan också modifiera inställningen `block_new_user` via Webbplatsinställningar.
-    spam_post_blocked:
-      title: "Skräppost är blockerat"
-      subject_template: "Ny användare %{username} har fått meddelanden blockerade pga. upprepade länkar "
-      text_body_template: |
-        Det här är ett automatiserat meddelande.
-
-        Den nya användaren [%{username}](%{user_url}) försökte skriva flera inlägg med länkar till %{domains}, men inläggen blockerades för att undvika spam. Användaren kan fortfarande skriva nya inlägg som inte länkar till %{domains}.
-
-        Var vänlig och [granska användaren](%{user_url}).
-
-        Du kan också modifiera webbplatsinställningarna `newuser_spam_host_threshold`och `white_listed_spam_host_domains`.
-    unblocked:
-      title: "Avblockerat"
-      subject_template: "Konto ej längre pausat"
-      text_body_template: |
-        Hej!
-
-        Det här är ett automatiserat meddelande från %{site_name} för att informera dig om att ditt konto inte längre är pausat efter att personal har granskat ärendet.
-
-        Du kan nu skriva inlägg och skapa nya ämnen igen. Tack för ditt tålamod.
     pending_users_reminder:
       title: "Påminnelse om väntande användare"
       subject_template:
@@ -1652,26 +1481,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 +1612,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:
@@ -1838,10 +1646,6 @@ sv:
     see_more: "Mer"
     search_title: "Sök på hemsidan"
     search_google: "Google"
-  login_required:
-    welcome_message: |
-      #[Välkommen till %{title}](#welcome)
-      Ett konto krävs för att logga in. Var god och skapa ett konto eller logga in för att fortsätta.
   terms_of_service:
     title: "Användarvillkor"
     signup_form_message: 'Jag har läst och accepterat <a href="/tos" target="_blank">Användarvillkoren</a>.'
@@ -1931,9 +1735,6 @@ sv:
         Den här utmärkelsen beviljas när du får din första gillning på ett inlägg. Grattis, du har skrivit något som en av medlemmarna på forumet tyckte var intressant, coolt eller användbart!
     autobiographer:
       name: Självbiograf
-      description: 'Fyllde ut sin <a href="/my/preferences">profilinformation</a> '
-      long_description: |
-        Den här utmärkelsen beviljas för att ha fyllt i din <a href="/my/preferences">profilinformation</a> och valt en profilbild. Genom att låta oss få lära känna dig bättre och vad du är intresserad av så blir forumet bättre och mer förenat.
     anniversary:
       name: Årsdag
       description: Aktiv medlem ett år, har skrivit minst en gång
@@ -2026,9 +1827,6 @@ sv:
         Den här utmärkelsen beviljas första gången du citerar ett inlägg i ditt svar. Att citera relevanta delar av tidigare inlägg i ditt svar hjälper att hålla diskussionen sammankopplad och relevant för ämnet. Det lättaste sättet att citera är att markera en del av ett inlägg och sedan klicka på svara-knappen. Citera generöst!
     read_guidelines:
       name: Läst riktlinjer
-      description: Läste <a href="/guidelines">forumets riktlinjer</a>
-      long_description: |
-        Den här utmärkelsen beviljas för <a href="/guidelines">att ha läst forumets riktlinjer</a>. Att följa och dela de här enkla riktlinjerna hjälper oss att bygga en rolig, säker och hållbar sida för alla. Kom alltid ihåg att det finns en annan människa, inte helt olik dig själv, på andra sidan skärmen. Var hövlig!
     reader:
       name: Läsare
       description: Läst varje inlägg i ett ämne med över 100 svar
diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml
index 8df36e10fb..d6f0962ec6 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: "ఈ సైటు గురించి చర్చ. ఎలా మొదలైంది. ఎలా పని చేస్తుంది. ఇంకా ఎలా మెరుగు పరచవచ్చు."
@@ -520,13 +520,11 @@ te:
     new_registrations_disabled: "కొత్త ఖాతా నమోదులను ప్రస్తుతం అనుమతించడం లేదు."
     password_too_long: "సంకేతపదాలు 200 అక్షరాలకు పరిమితం"
     missing_user_field: "మీరు అన్ని సభ్య క్షేత్రాలూ నింపలేదు"
-    close_window: "ద్రువీకరణ ముగిసింది. ఈ విండోను మూసి కొనసాగండి"
   user:
     no_accounts_associated: "ఎటువంటి ఖాతాలు భాగమవలేదు"
     username:
       short: "కనీసం %[min] అక్షరాలు ఉండాలి"
       long: "గరిష్టం %{max} అక్షరాలు ఉండాలి"
-      characters: "కేవలం సంఖ్యలు, అక్షరాలు మరియు అండర్ స్కోరు మాత్రమే ఉండాలి. "
       unique: "ఏకైకంగా ఉండాలి"
       blank: "తప్పనిసరిగా ఉండాలి"
     email:
diff --git a/config/locales/server.th.yml b/config/locales/server.th.yml
new file mode 100644
index 0000000000..dd3fd19d26
--- /dev/null
+++ b/config/locales/server.th.yml
@@ -0,0 +1,110 @@
+# 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/
+
+th:
+  dates:
+    short_date_no_year: "D MMM"
+    short_date: "D MMM, YYYY"
+    long_date: "MMMM D, YYYY h:mma"
+  datetime_formats: &datetime_formats
+    formats:
+      short: "%m-%d-%Y"
+      short_no_year: "%B %-d"
+      date_only: "%B %-d, %Y"
+      long: "%B %-d, %Y, %l:%M%P"
+  date:
+    month_names: [null, มกราคม, กุมภาพันธ์, มีนาคม, เมษายน, พฤษภาคม, มิถุนายน, กรกฎาคม, สิงหาคม, กันยายน, ตุลาคม, พฤศจิกายน, ธันวาคม]
+    <<: *datetime_formats
+  time:
+    am: "am"
+    pm: "pm"
+    <<: *datetime_formats
+  title: "ดิสคอส"
+  topics: "หัวข้อ"
+  posts: "โพสต์"
+  loading: "กำลังโหลด"
+  powered_by_html: 'บอร์ดนี้ใช้<a href="https://www.discourse.org">Discourse</a> จะแสดงได้สมบูรณ์เมื่อเปิดการใช้งาน JavaScript'
+  log_in: "เข้าสู่ระบบ"
+  disable_remote_images_download_reason: "ไม่สามารถดาวน์โหลดรูปได้เนื่องจากพื้นที่ไม่เพียงพอ"
+  anonymous: "ไม่ระบุชื่อ"
+  remove_posts_deleted_by_author: "ถูกลบโดยผู้โพส"
+  emails:
+    incoming:
+      errors:
+        inactive_user_error: "เกิดขึ้นเมื่อผู้ส่งยังไม่มีการใช้งาน"
+  errors: &errors
+    messages:
+      invalid: ไม่ถูกต้อง
+  embed:
+    start_discussion: "เริ่มการสนทนา"
+    continue: "ดำเนินการสนทนาต่อ"
+    loading: "กำลังโหลดการสนทนา"
+  user_is_suspended: "ผู้ใช้ที่ถูกระงับการใช้งานไม่สามารถโพสได้"
+  just_posted_that: "คล้ายกับสิ่งคุณเพิ่งโพสมากเกินไป"
+  invalid_characters: "มีตัวอักษรที่ไม่สามารถใช้งานได้"
+  next_page: "หน้าถัดไป →"
+  prev_page: "← หน้าก่อนหน้า"
+  page_num: "หน้า %{num}"
+  num_posts: "โพส"
+  groups:
+    default_names:
+      everyone: "ทุกคน"
+      admins: "ผู้ดูแลระบบ"
+      moderators: "ผู้ดูแล"
+      staff: "ทีมงาน"
+  education:
+    until_posts:
+      other: "%{count} โพส"
+  category:
+    topic_prefix: "เกี่ยวกับหมวด %{category}"
+  archetypes:
+    banner:
+      title: "ป้ายหัวข้อ"
+  reports:
+    topics:
+      title: "หัวข้อ"
+    posts:
+      title: "โพส"
+    bookmarks:
+      title: "บุ๊คมาร์ค"
+    users_by_trust_level:
+      xaxis: "ระดับความไว้ใจ"
+    top_referrers:
+      num_topics: "หัวข้อ"
+    top_traffic_sources:
+      num_topics: "หัวข้อ"
+      num_users: "ผู้ใช้"
+  search:
+    types:
+      user: 'ผู้ใช้'
+  login:
+    admin_not_allowed_from_ip_address: "คุณไม่สามารถเข้าสู่ระบบด้วยผู้ดูแลระบบด้วยไอพีนี้"
+  subject_re: "ตอบ: "
+  subject_pm: "[PM] "
+  user_notifications:
+    user_posted_pm:
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted_pm_staged:
+      text_body_template: |2
+
+        %{message}
+  page_not_found:
+    see_more: "อื่น"
+    search_google: "กูเกิ้ล"
+  activemodel:
+    errors:
+      <<: *errors
+  activerecord:
+    errors:
+      <<: *errors
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 91c538e63c..5a70c66156 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -32,6 +32,9 @@ tr_TR:
   disable_remote_images_download_reason: "Yeterli disk alanı kalmaması sebebiyle uzaktan görüntü indirme devre dışı bırakıldı."
   anonymous: "Anonim"
   remove_posts_deleted_by_author: "Yazar tarafından silindi"
+  themes:
+    bad_color_scheme: "Temayı güncelleyemiyorum, geçersiz renk şeması"
+    other_error: "Temanın güncellenmesi sırasında bir sorun oluştu"
   emails:
     incoming:
       default_subject: "Konuya bir başlık konulmalı"
@@ -40,7 +43,6 @@ tr_TR:
         empty_email_error: "Bize ulaşan ham posta boş olduğunda olur."
         no_message_id_error: "E-postanın 'Message-Id' başlığı olmadığında olur."
         inactive_user_error: "Gönderici etkin olmadığında olur."
-        blocked_user_error: "Gönderici engellendiğinde olur."
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -107,6 +109,7 @@ tr_TR:
   embed:
     start_discussion: "Tartışma Başlat"
     continue: "Tartışmaya Devam Et"
+    referer: "Yönlendiren:"
     more_replies:
       other: "%{count} cevap daha"
     loading: "Tartışma Yükleniyor..."
@@ -151,6 +154,12 @@ tr_TR:
     latest: "En son konular"
     hot: "Sıcak konular"
     top: "En iyi konular"
+    top_all: "Tüm zamanlarda en iyi konular"
+    top_yearly: "Yıllık en iyi konular"
+    top_quarterly: "Üç aylık en iyi konular"
+    top_monthly: "Aylık en iyi konular"
+    top_weekly: "Haftalık en iyi konular"
+    top_daily: "Günlük en iyi konular"
     posts: "Son gönderiler"
     private_posts: "Son özel iletiler"
     group_posts: "%{group_name} tarafından son gönderiler"
@@ -245,7 +254,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
@@ -426,6 +434,7 @@ tr_TR:
     like:
       title: 'Beğen'
       description: 'Bu gönderiyi beğen'
+      short_description: 'Bu gönderiyi beğen'
       long_form: 'bu beğenildi'
     vote:
       title: 'Oyla'
@@ -447,7 +456,6 @@ tr_TR:
       email_title: '"%{title}" konu başlığının moderatör tarafından kontrol edilmesi gerekiyor'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Gönderiniz topluluk tarafından bildirildi. Lütfen <a href="/my/private-messages">özel iletilerinize göz atın</a>.</p>'
     user_must_edit: '<p>Bu gönderi topluluk tarafından bildirildi ve geçici olarak gizlendi.</p>'
   archetypes:
     regular:
@@ -652,9 +660,7 @@ tr_TR:
     educate_until_posts: "Kullanıcılar, ilk (n) gönderilerini yazmaya başladıklarında, pop-up yeni kullanıcı eğitim paneli metin düzenleyecisinin üstünde çıksın."
     title: "Sayfa başlığı etiketinde kullanılacak, bu sitenin ismi."
     site_description: "Meta açıklama etiketinde kullanılacak, bu sitenin bir cümlelik açıklaması."
-    contact_email: "Bu site için sorumlu kişinin e-posta adresi. Sadece acil durumlar için /about iletişim formu içerisinde ve beklenmeyen bildirmeler gibi ciddi bildiriler için kullanılacak."
     contact_url: "Bu site için iletişim URL'si. Acil durumlar için /about iletişim formunda kullanılır."
-    queue_jobs: "SADECE GELİŞTİRİCİLER İÇİN! UYARI! Aksi gerekmediği takdirde işleri sidekiq ile sıraya koydurtun. Bu özellik devre dışı bırakılırsa, siteniz düzgün çalışmayacaktır."
     crawl_images: "Doğru genişlik ve yükseklik boyutlarını girmek için uzak URL'lerdeki resimlerin birer kopyasını alınsın."
     download_remote_images_to_local: "Uzaktaki resimler yerel resimlere çevirmek için indirilsin; bu ayar resim bağlantılarının kırılmasını önleyecektir"
     download_remote_images_threshold: "Uzaktaki resimlerin yerele indirilmesi için gereken en az disk alanı (yüzdesel)"
@@ -669,7 +675,6 @@ tr_TR:
     fixed_category_positions: "Seçerseniz, kategoriler için sabit bir sıralama belirleyebileceksiniz. Seçmezseniz, kategoriler etkinlik sırasına göre listelenir. "
     fixed_category_positions_on_create: "Seçerseniz, konu oluşturma ekranında da kategori sıralaması korunur (fixed_category_positions gerektirir)."
     add_rel_nofollow_to_user_content: "İç bağlantılar (ana alan adları dahil) hariç, gönderilen tüm kullanıcı içeriklerine rel nofollow ekle. Bu ayarı değiştirirseniz, tüm gönderileri \"rake post:rebake\" ile yeniden işlemeniz gerekir."
-    exclude_rel_nofollow_domains: "nofollow eklenmeyecek sınırlandırılmış alan adları listesi. ust.com'a izin verirseniz otomatik olarak alt.ust.com'a da izin verilir."
     post_excerpt_maxlength: "Gönderi alıntısının / özetinin en fazla uzunluğu."
     show_pinned_excerpt_mobile: "Mobil görünümünde başa tutturulmuş konuların özetini göster."
     show_pinned_excerpt_desktop: "Masaüstü görünümünde başa tutturulmuş konuların özetini göster."
@@ -678,7 +683,6 @@ tr_TR:
     logo_url: "Sitenin üst solundaki görsel, geniş dikdörtgen şeklinde olmalıdır. Boş bırakılırsa site başlığı gösterilecektir."
     logo_small_url: "Sitenin üst solundaki küçük görsel, kare şeklinde olmalıdır, aşağıya doğru kaydırılırken görünür. Boş bırakılırsa bir ev oyması gösterilecektir."
     favicon_url: "Site simgesi, bilgi için http://en.wikipedia.org/wiki/Favicon adresine bakınız, bir CDN ile doğru şekilde çalışmak için png olmalıdır."
-    mobile_logo_url: "Mobil sitenin üst solunda kullanılan sabit konumlu görsel. Kare şeklinde olmalıdır. Boş bırakılırsa, `logo_url` kullanılacaktır. Örneğin: http://ornek.com/uploads/default/gorsel.png"
     apple_touch_icon_url: "Apple dokunmatik cihazları için kullanılan ikon. Önerilen boyut; 144 x 144 pixel."
     notification_email: "Tüm önemli sistem e-postaları için kullanılacak olan gönderen e-posta adresi. E-postaların başarıyla ulaşması için buraya girilen alan adının SPF, DKIM ve reverse PTR kayıtlarının doğru yapılması lazım."
     email_custom_headers: "Sınırlandırılmış özel e-posta başlıkları listesi"
@@ -703,16 +707,12 @@ tr_TR:
     tl2_additional_likes_per_day_multiplier: "Güvenlik seviyesi 2 (Üye) olanlar için günlük beğeni limitini bu rakamla çarparak artır"
     tl3_additional_likes_per_day_multiplier: "Güven seviyesi 3 (Müdavim) olanlar için günlük beğeni limitini bu rakamla çarparak artır"
     tl4_additional_likes_per_day_multiplier: "Güvenlik seviyesi 4 (Lider) olanlar için günlük beğeni limitini bu rakamla çarparak artır"
-    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."
     maximum_session_age: "Kullanıcı son ziyaretinden bu yana n saat boyunca giriş yapmış olarak kalacak"
-    ga_tracking_code: "ESKİ: Google analiz (ga.js) takip kodu, ör:UA-12345678-9; bakınız http://google.com/analytics"
-    ga_domain_name: "ESKİ: Google analiz (ga.js) alan adı, ör: benimsitem.com; bakınız http://google.com/analytics"
     ga_universal_tracking_code: "Google Universal Analytics (analytics.js) takip kodu, ör: UA-12345678-9; bakınız http://google.com/analytics"
     ga_universal_domain_name: "Google Universal Analytics (analytics.js) alan adı, ör: mysite.com; bakınız http://google.com/analytics"
     enable_escaped_fragments: "Eğer bir ağ gezgini tespit edilmezse Google'ın Ajax-Crawling API'sine dönün. Dahası için şuraya bakın : https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
@@ -741,12 +741,9 @@ tr_TR:
     allow_index_in_robots_txt: "robots.txt dosyasında bu sitenin arama motorları tarafından dizinlenmesine izin verildiğini belirt."
     email_domains_blacklist: "Kullanıcıların kayıt olurken kullanamayacağı e-posta alan adlarının, dikey çizgilerle ayrıştırılmış listesi. Örneğin: mailinator.com|trashmail.net"
     email_domains_whitelist: "Kullanıcıların kayıt olurken kullanmak ZORUNDA olduğu e-posta alan adlarının, dikey çizgilerle ayrıştırılmış listesi. UYARI: Bu listede yer almayan e-posta alan adları kabul edilmeyecektir!"
-    forgot_password_strict: "Parola sıfırlama kullanıldığında kullanıcıyı hesabın varlığı ile ilgili olarak bilgilendirme."
     log_out_strict: "Çıkış yapılırken, kullanıcının tüm cihazlardaki TÜM seanslarını sonlandır"
     version_checks: "Discourse Hub'a sürüm güncellemeleri için haber yolla ve yeni versiyon iletilerine /admin gösterge panelinde yer ver"
     new_version_emails: "Discourse'un yeni sürümü çıktığında contact_email adresine e-posta gönder."
-    port: "SADECE YAZILIMCILAR İÇİN! UYARI! Öntanımlı 80 portu yerine bu HTTP portunu kullanın. Öntanımlı 80'i kullanmak için boş bırakın. "
-    force_hostname: "SADECE YAZILIMCILAR İÇİN! DİKKAT! URL'de bir bilgisayar adı belirleyin. Öntanımlı için boş bırakın."
     invite_expiry_days: "Kullanıcı davet anahtarlarının geçerlilik süresi, gün olarak"
     invite_passthrough_hours: "Daha önce kabul edilmiş davetiye anahtarının kullanım süresi, saat olarak"
     login_required: "Bu sitede içerik görüntülenebilmesi için kimlik doğrulamayı zorunlu kıl, isimsiz girişe izin verme."
@@ -811,7 +808,6 @@ tr_TR:
     clean_up_uploads: "Yasadışı barındırmayı engellemek için artık referanssız yüklemeleri kaldır. UYARI: Bu ayarı etkinleştirmeden önce /uploads dizinini yedeklemeyi isteyebilirsiniz"
     clean_orphan_uploads_grace_period_hours: "Artık yüklemeler kaldırılmadan önce tanınan süre (saat olarak)."
     purge_deleted_uploads_grace_period_days: "Silinen yüklemelerin kaldırılması için tanınan süre (gün olarak)."
-    purge_unactivated_users_grace_period_days: "Hesabını etkinleştirmemiş bir kullanıcının sistemden silinmesi için tanınan süre (gün olarak)."
     enable_s3_uploads: "Yüklemeleri Amazon S3 belleklerinde sakla. ÖNEMLİ: Doğru S3 bilgileri (erişim anahtarı id & gizli erişim anahtarı) gerektirir"
     s3_use_iam_profile: 'Anahtarları almak için AWS EC2 IAM rolünü kullan. NOT: Etkinleştirilmesi "s3 access key id" and "s3 secret access key" ayarlarının üzerine yazacaktır.'
     s3_upload_bucket: "Dosyaların yükleneceği Amazon S3 biriktirme yeri adı. DİKKAT: büyük harfler, nokta ve altçizgi karakterleri kullanılmamalı."
@@ -906,9 +902,6 @@ tr_TR:
     num_flags_to_close_topic: "Bir konunun moderatör müdahalesi için otomatik olarak durdurulmadan önce alması gereken en az etkin bildirim sayısı "
     auto_respond_to_flag_actions: "Bir bildirim kaldırırken otomatik olarak cevaplamayı etkinleştir"
     min_first_post_typing_time: "Milisaniye olarak bir kullanıcının ilk gönderisini yazarken geçmesi gereken en küçük süre, bu süre geçmezse gönderi otomatik olarak onaylanma kuyruğuna girer. Devre dışı bırakmak için 0'a ayarlayın (tavsiye edilmez)."
-    auto_block_fast_typers_on_first_post: "min_first_post_typing_time'ı karşılamayan kullanıcıları otomatik olarak engelle."
-    auto_block_fast_typers_max_trust_level: "Hızlı yazıcıları otomatik engellemek için en büyük güven seviyesi."
-    auto_block_first_post_regex: "Eğer eşleşirse kullanıcının ilk gönderisinin engellenmesi ve onaylanma kuyruğuna gitmesine neden olan harf büyüklüğü duyarsız düzenli ifade. Örnek: reklam|a[bc]a düzenli ifadesi reklam, aba ya da aca içeren ilk gönderilerin engellenmesi ve onaylanma kuyruğuna gitmesine neden olacaktır. Sadece ilk gönderiler için geçerlidir."
     reply_by_email_enabled: "Konulara e-posta üzerinden cevap yazmayı etkinleştir."
     reply_by_email_address: "Email ile cevapla özelliği için gelen e-posta adresi şablonu, örnek: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
     disable_emails: "Discourse'un herhangi bir e-posta göndermesine izin verme"
@@ -926,7 +919,6 @@ tr_TR:
     pop3_polling_username: "E-postaların sorgulanacağı POP3 hesabının kullanıcı adı."
     pop3_polling_password: "E-postaların sorgulanacağı POP3 hesabının parolası."
     log_mail_processing_failures: "Bütün e-posta işleme hatalarını http://yoursitename.com/logs adresine logla."
-    email_in: "Kullanıcıların e-posta aracılığıyla yeni konu oluşturabilmesine izin ver (pop3 sorgulaması gerektirir). Adresleri her kategorinin \"Ayarlar\" sekmesinden düzenleyin."
     email_in_min_trust: "Bir kullanıcının e-posta aracılığı ile yeni konu oluşturabilmesi için sahip olması gereken en az güven seviyesi."
     email_prefix: "E-postaların konu bölümünü belirten [etiket]. Boş bırakılırsa 'title' yazacak."
     email_site_title: "Bu siteden giden e-postalarda gönderici olarak kullanılacak sitenin başlığı. Herhangi bir şey girilmezse öntanımlı olarak 'title' yazacak. Eğer 'başlık\" içeriğinizde, e-posta göndericisinin stringlerinde izin verilmeyen karakterler varsa, bu ayarı kullanın.  "
@@ -934,7 +926,6 @@ tr_TR:
     relative_date_duration: "Gönderinin üstünden bu kadar gün geçtikten sonra, gönderi tarihi mutlak şekilde değil (20 Şubat) göreceli şekilde (7g) gösterilecek."
     delete_user_max_post_age: "İlk gönderisi (x) günden eski olan kullanıcıların silinmesine izin verme."
     delete_all_posts_max: "Tüm Gönderileri Sil düğmesine basıldığında tek seferde silinebilecek en fazla gönderi sayısı. Eğer bir kullanıcının gönderi sayısı bu sayıdan fazlaysa, gönderilerin hepsi tek seferde silinemez ve bu kullanıcı silinemez."
-    username_change_period: "Kayıt sonrası, kullanıcı adınının değiştirilebileceği gün sayısı. (Kullanıcı adının değiştirilebilmesini devre dışı bırakmak için 0 girin)"
     email_editable: "Kullanıcıların kayıt olduktan sonra e-posta adreslerini değiştirmesine izin ver."
     logout_redirect: "Çıkış yaptıktan sonra tarayıcının yönlendirileceği adres (ör: http://bitanesite.com/cikis)"
     allow_uploaded_avatars: "Kullanıcıların özel profil resimleri yüklemelerine izin ver."
@@ -972,15 +963,9 @@ tr_TR:
     warn_reviving_old_topic_age: "Herhangi bir kullanıcı, son cevabın burada belirtilen gün sayısından daha önce yazıldığı bir konuya cevap yazmaya başladığında, bir uyarı iletisi çıkacak. Bu özelliği devre dışı bırakmak için 0 girin. "
     autohighlight_all_code: "Tüm önceden biçimlendirilen kod parçalarına, açıkça dil seçimi yapılmamış olsa da, zorla kod vurgulaması uygula."
     highlighted_languages: "Dahil edilen kod renklendirme kuralları. (Uyarı: çok fazla dil eklemek performansı etkileyebilir) demo için bakınız: https://highlightjs.org/static/demo/"
-    feed_polling_enabled: "SADECE YERLEŞTİRME İÇİN: RSS/ATOM beslemesinin gönderi olarak yerleştirilip yerleştirilemeyeceği."
-    feed_polling_url: "SADECE YERLEŞTİRME İÇİN: Yerleştirilecek RSS/ATOM beslemesinin URL'i."
-    embed_by_username: "Yerleştirilmiş konuları oluşturan kullanıcıya ait Discourse kullanıcı adı. "
-    embed_username_key_from_feed: "Beslemeden Discourse kullanıcı adını çekmek için kullanılacak anahtar"
     embed_truncate: "Yerleştirilmiş gönderileri kırp."
     embed_post_limit: "Yerleştirilecek en fazla gönderi sayısı."
     embed_username_required: "Konu oluşturmak için kullanıcı adı gereklidir."
-    embed_whitelist_selector: "Yerleştirmelerde kullanılmasına izin verilen öğeler için CSS seçicisi."
-    embed_blacklist_selector: "Yerleştirmelerden çıkartılmış öğeler için CSS seçicisi."
     show_create_topics_notice: "Eğer sitede herkese açık konu sayısı 5'den az ise, yöneticiden yeni konular oluşturmasını isteyen bir uyarı iletisi göster. "
     delete_drafts_older_than_n_days: (n) günden eski taslakları sil.
     bootstrap_mode_min_users: "bootstrap modunun edilgen olması için gereken en az kullanıcı sayısı (edilgen bırakmak için 0 yapın)"
@@ -1007,8 +992,6 @@ tr_TR:
     default_categories_watching: "Öntanımlı olarak gözlenen kategorilerin listesi."
     default_categories_tracking: "Öntanımlı olarak, takip edilen kategorilerin listesi."
     default_categories_muted: "Öntanımlı olarak, sesi kısılan kategorilerin listesi."
-    max_user_api_reqs_per_day: "Gün başına yapılabilecek en fazla kullanıcı API isteği"
-    max_user_api_reqs_per_minute: "Dakika başına yapılabilecek en fazla kullanıcı API isteği"
     max_api_keys_per_user: "Kullanıcı başına kullanılabilecek kullanıcı API anahtarı sayısı"
     min_trust_level_for_user_api_key: "Kullanıcı API'si oluşturmak için gereken güven seviyesi"
     tagging_enabled: "Konularda etiketleri etkinleştirin?"
@@ -1120,13 +1103,11 @@ tr_TR:
     email_too_long: "Vermiş olduğun e-posta çok uzun. E-posta kutusu isimleri 254, alan adı isimleri ise 253 karakterden daha uzun olamaz."
     reserved_username: "Bu kullanıcı adını kullanamazsın."
     missing_user_field: "Kullanıcı alanlarının tamamını doldurmadınız"
-    close_window: "Doğrulama tamamlandı. Devam etmek için bu pencereyi kapatın."
   user:
     no_accounts_associated: "İlgili hesap yok"
     username:
       short: "en az %{min} karakter olmalı"
       long: "%{max} karakterden fazla olmamalı"
-      characters: "sadece rakam, harf ve altçizgi bulundurabilir "
       unique: "özgün olmalı"
       blank: "bulunmalı"
       must_begin_with_alphanumeric_or_underscore: "bir harf, rakam ya da alt çizgi ile başlamalı"
@@ -1144,44 +1125,8 @@ tr_TR:
       other: "İlgilenilmesi gereken %{count} bildirim var"
   unsubscribe_mailer:
     subject_template: "%{site_title} üzerinden daha fazla e-posta güncellemesi almak istemediğinizi onaylayın"
-  invite_mailer:
-    subject_template: "%{invitee_name}  sizi %{site_domain_name} sitesindeki '%{topic_title}' adlı konuya davet etti. "
-  custom_invite_mailer:
-    subject_template: "%{invitee_name} sizi %{site_domain_name} sitesindeki '%{topic_title}' adlı konuya davet etti "
-  invite_forum_mailer:
-    subject_template: "%{invitee_name} sizi %{site_domain_name} sitesine katılmanız için davet etti"
-  custom_invite_forum_mailer:
-    subject_template: "%{invitee_name} sizi %{site_domain_name} sitesine katılmaya davet etti"
   invite_password_instructions:
     subject_template: "%{site_name} hesabınız için parola oluşturun"
-  new_version_mailer:
-    text_body_template: |
-      Yuhaaa, [Discourse](http://www.discourse.org) için yeni bir sürüm hazır!
-
-      Sizin sürümünüz:  %{installed_version}
-      Yeni çıkan sürüm: **%{new_version}**
-
-      - **[Tek tıklamayla](%{base_url}/admin/upgrade)** basitçe yükseltin
-
-      - Nelerin yeni olduğunu [GitHub kayıtlarında](https://github.com/discourse/discourse/commits/master) görün
-
-      - Yeniliklerden haberdar olmak, tartışmak ve destek almak için [meta.discourse.org](https://meta.discourse.org) adresini ziyaret edin
-  new_version_mailer_with_notes:
-    text_body_template: |
-      Yuhaaa, [Discourse](http://www.discourse.org) için yeni bir sürüm hazır!
-
-      Sizin sürümünüz:  %{installed_version}
-      Yeni çıkan sürüm: **%{new_version}**
-
-      - **[Tek tıklamayla](%{base_url}/admin/upgrade)** basitçe yükseltin
-
-      - Nelerin yeni olduğunu [GitHub kayıtlarında](https://github.com/discourse/discourse/commits/master) görün
-
-      - Yeniliklerden haberdar olmak, tartışmak ve destek almak için [meta.discourse.org](https://meta.discourse.org) adresini ziyaret edin
-
-      ### Sürüm notları
-
-      %{notes}
   flag_reasons:
     off_topic: "Gönderiniz **konu-dışı** olarak bildirildi: topluluk, gönderinizin konu başlığı ve ilk gönderi ile tanımlanan konu içeriğine uygun olmadığını düşünüyor. "
     inappropriate: "Gönderiniz **uygunsuz** olarak bildirildi: topluluk gönderinizin saldırgan, kaba ya da [topluluk yönergelerine](/guidelines) aykırı olduğunu düşünüyor."
@@ -1251,7 +1196,6 @@ tr_TR:
       subject_template: "Dışarı veri aktarımı tamamlandı"
     csv_export_failed:
       subject_template: "Dışarı veri aktarımı başarısız oldu"
-      text_body_template: "Üzgünüz, dışarı veri aktarımı başarısız oldu. Lütfen kayıtları inceleyin veya bir görevli ile iletişime geçin."
     email_reject_empty:
       text_body_template: |
         Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu.
@@ -1264,30 +1208,8 @@ tr_TR:
         Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başırısız oldu. E-postada herhangi bir cevap bulamadık. **Cevabınızın e-posta'nın en üstünde yer aldığından emin olun** -- aralardaki cevapları işleyemiyoruz.
     too_many_spam_flags:
       subject_template: "Yeni hesap askıda"
-      text_body_template: |
-        Merhaba,
-
-        Bu, %{site_name} adresinden size gönderilen, topluluk tarafından bildirildiği için kontrol edilmek üzere gizlenen gönderinizi bildiren otomatik bir iletidir.
-
-        Bir önlem olarak, bir yetkili incelemesine kadar yeni hesabınızdan yeni cevaplar veya konular oluşturmanız engellendi. Bu rahatsızlık için üzgünüz.
-
-        Ek bilgi için, [topluluk yönergelerine](%{base_url}/guidelines) başvurun.
     too_many_tl3_flags:
       subject_template: "Yeni hesap askıda"
-    blocked_by_staff:
-      subject_template: "Hesap geçiçi olarak askıda"
-    user_automatically_blocked:
-      subject_template: "Yeni kullanıcı %{username} topluluk bildirimleri tarafından engellendi"
-    spam_post_blocked:
-      subject_template: "Üst üste aynı bağlantıların paylaşılmasından ötürü %{username} adlı yeni kullanıcının gönderileri engelledi"
-    unblocked:
-      subject_template: "Hesap artık askıda değil"
-      text_body_template: |
-        Merhaba,
-
-        Bu otomatik ileti %{site_name} forumunda, görevli incelemesinin ardından hesabınızın artık askıda olmadığını bilmeniz amacıyla gönderilmiştir.
-
-        Şimdi tekrar gönderi ve konular oluşturabilirsiniz. Sabrınız için teşekkürler.
     pending_users_reminder:
       subject_template:
         other: "%{count} kullanıcı onay bekliyor"
@@ -1326,26 +1248,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 +1365,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"
@@ -1485,10 +1386,6 @@ tr_TR:
     see_more: "Daha fazla"
     search_title: "Bu sitede ara"
     search_google: "Google"
-  login_required:
-    welcome_message: |
-      #[%{title} topluluğuna hoş geldiniz](#welcome)
-      Hesap oluşturmanız gerekiyor. Devam etmek için lütfen bir hesap oluşturun ya da giriş yapın.
   terms_of_service:
     title: "Üyelik Sözleşmesi"
     signup_form_message: '<a href="/tos" target="_blank">Üyelik Sözleşmesini</a> okudum ve kabul ediyorum.'
@@ -1574,9 +1471,6 @@ tr_TR:
         Bu rozet gönderine ilk beğenini aldığın için verildi. Tebrikler forumda diğer üyelerin ilgisini çeken, yararlı bir paylaşımda bulundun!
     autobiographer:
       name: Güncel Profil
-      description: <a href="/my/preferences">profil</a> bilgilerini tamamlama
-      long_description: |
-        Bu rozet <a href="/my/preferences">profil sayfasını </a> tamamladığınız ve bir profil resmi seçtiğiniz için verilmiştir. Artık topluluk sizin hakkınızda daha fazla bilgi sahibi olup, sizin ilgi alanlarınızı daha yakından takip edebilir.
     anniversary:
       name: Yıldönümü
       description: Bir sene içerisinde, en az bir kere gönderi yazmış etkin üye
@@ -1669,9 +1563,6 @@ tr_TR:
         Bu rozet cevabınızda başkasından alıntı yaptığınız için verilmiştir. Başka konulardan ve gönderilerden alıntı yapmak mesajlar arasındaki bağlantıyı kuvvetlendirir. En kolay alıntı yapma yolu alıntı yapacağınız bölümü seçip cevap düğmesine basmaktır.
     read_guidelines:
       name: Yönergeleri Okuma
-      description: <a href="/guidelines">Topluluk yönergelerini</a> okuma
-      long_description: |
-        Bu rozeti <a href="/guidelines">topluluk yönergelerini</a> okuduğunuz için kazandınız. Site kurallarını bilmek ve bu kurallara uygun davranmak daha huzurlu bir ortam içerisinde paylaşım yapmanızı sağlar.
     reader:
       name: Okuyucu
       description: 100 cevaptan fazla cevabı olan bir konunun her cevabını okuma
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index 959207db0b..29794e9440 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -19,7 +19,6 @@ uk:
     incoming:
       errors:
         inactive_user_error: "Таке трапляється, якщо відправник не активний"
-        blocked_user_error: "Таке трапляється, якщо відправника було заблоковано"
   errors: &errors
     messages:
       accepted: має бути прийнятий
@@ -306,19 +305,15 @@ uk:
     min_search_term_length: "Мінімальна дозволена довжина пошукової фрази у символах"
     allow_duplicate_topic_titles: "Дозволити теми з однаковими, дублюючими назвами."
     unique_posts_mins: "How many minutes before a user can make a post with the same content again"
-    queue_jobs: "ТІЛЬКИ ДЛЯ РОЗРОБНИКІВ! УВАГА! За замовчуванням, додавати завдання до черги в sidekiq. Якщо вимкнути, Ваш сайт зламається."
     crawl_images: "Отримувати зображення з віддалених адрес, щоб встановити правильні розміри ширини і висоти."
     apple_touch_icon_url: "Піктограма, що використовується для сенсорних пристроїв Apple. Рекмоендований розмір 144px на 144px."
     email_custom_headers: "Список заголовків електронної пошти, розділених вертикальною рискою"
     enable_long_polling: "Message bus used for notification can use long polling"
     anon_polling_interval: "How often should anonymous clients poll in milliseconds"
-    notify_mods_when_user_blocked: "Якщо користувача автоматично заблоковано, надіслати повідомлення всім модераторам."
     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"
     post_menu: "Визначає, які елементи з'являються в меню допису, та в якому порядку. Наприклад, like|edit|flag|delete|share|bookmark|reply"
     track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
-    port: "ТІЛЬКИ ДЛЯ РОЗРОБНИКІВ! УВАГА! Використовувати цей HTTP-порт замість звичайного порту 80. Лишіть порожнім, щоб використовувати значення за замовчуванням 80."
-    force_hostname: "ТІЛЬКИ ДЛЯ РОЗРОБНИКІВ! УВАГА! Вкажіть ім'я хосту в URL. Лишіть порожнім, щоб використовувати значення за замовчуванням."
     invite_expiry_days: "Скільки днів ключі запрошення користувачів лишаються чинними"
     min_password_length: "Мінімальна довжина пароля."
     enable_yahoo_logins: "Увімкнути вхід через Yahoo"
@@ -347,7 +342,6 @@ uk:
     reply_by_email_address: "Шаблон адреси електронної скриньки у формі для відповідей через електронну пошту, наприклад: %{reply_key}@reply.myforum.com"
     email_in_min_trust: "Мінімальний рівень довіри, який потрібен користувачу для дозволу створювати нові теми через email. "
     delete_all_posts_max: "Максимальне число дописів, які можна видалити за один раз кнопкою \"Видалити всі дописи\". Якщо користувач має більше дописів, ніж це число, їх не можна буде видалити за один раз, і користувача також."
-    username_change_period: "Кількість днів після реєстрації, протягом яких новим обліковим записам можна змінювати своє ім'я користувача (0 щоб заборонити зміну імені користувача)."
     email_editable: "Дозволити користувачам змінювати свою електронну скриньку після реєстрації."
     allow_profile_backgrounds: "Дозволити користувачам завантажувати фони профілю."
     enable_mobile_theme: "Мобільні пристрої використовуватимуть тему, дружню для них, з можливістю перемикатися на повний сайт. Відключіть це, якщо хочете використовувати власну, повністю чутливу, таблицю стилів."
@@ -394,7 +388,6 @@ uk:
   user:
     username:
       short: "має бути найменше %{min} символів"
-      characters: "must only include numbers, letters and underscores"
       unique: "має бути унікальним"
       blank: "має бути наявним"
     email:
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 27e0890a47..7320fbe29b 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -33,11 +33,10 @@ vi:
     incoming:
       show_trimmed_content: "Hiện nội dung đã cắt"
       errors:
-        empty_email_error: "Xảy ra khi thư nguồn hệ thống nhận được là trống."
+        empty_email_error: "Xảy ra khi thư nguồn hệ thống nhận được trống."
         no_message_id_error: "Xảy ra khi thư không có tiêu đề."
         auto_generated_email_error: "Xảy ra khi tiêu đề 'ưu tiên' được đặt là: danh sách, rác, theo lô hoặc tự động trả lời, hoặc khi có tiêu đề khác bao gồm: tự động gửi, tự động trả lời hoặc tự động tạo."
         inactive_user_error: "Xảy ra khi người gửi không hoạt động."
-        blocked_user_error: "Xảy ra khi người gửi đã bị chặn."
         bad_destination_address: "Xảy ra khi không có địa chỉ email trong các trường Tới/Cc/Bcc khớp với địa chỉ email đến đã được cấu hình."
         strangers_not_allowed_error: "Xảy ra khi người dùng cố tạo chủ đề mới trong một danh mục mà họ không phải là thành viên."
         insufficient_trust_level_error: "Xảy ra khi người dùng cố tạo chủ đề mới trong một danh mục mà họ chưa đủ cấp độ tin cậy."
@@ -51,13 +50,13 @@ vi:
       invalid_boolean: "Giá trị logic không hợp lệ"
       taken: "đã được lấy trước"
       accepted: phải được chấp nhận
-      blank: không thể để rỗng
-      present: phải để rỗng
+      blank: không được để trống
+      present: phải để trống
       confirmation: "%{attribute} không khớp"
       empty: không thể để trống
       equal_to: phải bằng %{count}
       even: phải là chắn
-      exclusion: được bảo lưu
+      exclusion: được dành riêng
       greater_than: phải lớn hơn %{count}
       greater_than_or_equal_to: phải lớn hơn hoặc bằng %{count}
       has_already_been_used: "đã được sử dụng"
@@ -246,7 +245,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
@@ -448,7 +446,6 @@ vi:
       email_title: 'Chủ đề "%{title}" cần được ban điều hành quan tâm'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>Bài viết của bạn đã được gắn cờ bở cộng đồng. Vui lòng<a href="/my/messages">xem tin nhắn của bạn</a>.</p>'
     user_must_edit: '<p>Bài viết này đã bị đánh dấu bởi cộng đồng và đang được ẩn tạm thời.</p>'
   archetypes:
     regular:
@@ -636,9 +633,7 @@ vi:
     educate_until_posts: "Khi người dùng bắt đầu đăng (n) bài viết đầu tiên, hiện pop-up để hướng dẫn họ khi soạn thảo."
     title: "Tên của trang này, sử dụng trong thẻ tiêu đề"
     site_description: "Mô tả trang này trong một câu, nó sẽ được sử dụng trong thẻ meta description"
-    contact_email: "Địa chỉ email liên hệ của người chịu trách nhiệm trang này. Sử dụng cho những thông báo quan trọng giống như cờ không được quản lý, cũng giống form liện hệ /about  cho những vấn đề cấp bách."
     contact_url: "URL liên hệ trong trang này. Sử dụng trong form liên hệ /about cho những vấn đề cấp bách."
-    queue_jobs: "DEVELOPER ONLY! WARNING! By default, queue jobs in sidekiq. If disabled, your site will be broken."
     crawl_images: "Lấy hình ảnh tử URL bên ngoài để thêm vào đúng chiều dài và chiều cao."
     download_remote_images_to_local: "Tải ảnh về lưu trữ để tránh ảnh bị hư."
     download_remote_images_threshold: "Dung lượng tối thiểu cần để tải ảnh từ xa về lưu trữ (tính bằng phần trăm)"
@@ -652,13 +647,11 @@ vi:
     fixed_category_positions: "Nếu được bật, bạn sẽ có thể sắp xếp chuyên mục theo một thứ tự cố định. Nếu không bật, chuyên mục sẽ được sắp xếp theo thứ tử hoạt động."
     fixed_category_positions_on_create: "Nếu chọn, sắp xếp danh mục sẽ được thực hiện trong cửa sổ tạo chủ đề (yêu cầu fixed_category_positions)."
     add_rel_nofollow_to_user_content: "Thêm rel='nofollow' cho tất cả các nội dung mà người dùng gửi, ngoại trừ các liên kết nội bộ (của tên miền chính). Nếu thay đổi, bạn phải thực hiện lại cho tất cả các bài viết với: \"rake posts:rebake\""
-    exclude_rel_nofollow_domains: "Một danh sách tên miền mà rel='nofollow' không được thêm vào các liên kết, các tên miền con sẽ được tự động áp dụng như với tên miền chính. Tối thiểu, bạn nên thêm tên miền cấp cao nhất của website này để giúp search engine tìm kiếm tất cả các nội dung. Nếu các phần khác của website thuộc tên miền khác, cũng nên thêm vào."
     post_excerpt_maxlength: "Chiều dài tối đa của đoạn trích / tóm tắt chủ đề."
     post_onebox_maxlength: "Số ký tự tối đa của một bài onebox Discourse."
     logo_url: "Logo ở vị trí trên cùng của website nên là hình chữ nhật, nếu để trống thì tên website sẽ hiển thị."
     logo_small_url: "Logo nhỏ ở vị trí trên cùng của website hiển thị khi cuộn xuống nên là hình vuông, nếu để trống thì icon trang chủ sẽ hiển thị."
     favicon_url: "Favicon cho trang của bạn, xem tại http://en.wikipedia.org/wiki/Favicon, để chạy được với CDN ảnh phải là png"
-    mobile_logo_url: "Cố định vị trí hình logo sử dụng tại phía trên bên trái trang mobile của bạn. Nên là hình vuông. Nếu để trống, sẽ sử dụng `logo_url`. Ví dụ: http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "Biểu tượng sử dụng trong các thiết bị cảm ứng của Apple. Kích thước gợi ý 144px x 144px"
     notification_email: "Địa chỉ email 'Từ:' được dùng để gửi các email thiết yếu của hệ thống. Các tên miền quy định ở đây phải có SPF, DKIM và bản ghi PTR phải được thiết lập chính xác cho email đến."
     email_custom_headers: "Danh sách xác định email header tùy chỉnh"
@@ -679,10 +672,8 @@ vi:
     tl2_additional_likes_per_day_multiplier: "Tăng giới hạn thích mỗi ngày cho mức độ tin tưởng 2 (thành viên) bằng cách nhân với số này"
     tl3_additional_likes_per_day_multiplier: "Tăng giới hạn thích mỗi ngày cho mức độ tin tưởng 3 (bình thường) bằng cách nhân với số này"
     tl4_additional_likes_per_day_multiplier: "Tăng giới hạn thích mỗi ngày cho mức độ tin tưởng 4 (dẫn đầu) bằng cách nhân với số này"
-    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."
@@ -715,8 +706,6 @@ vi:
     log_out_strict: "Khi đăng xuất, đăng xuất TẤT CẢ session cho tất cả thiế bị"
     version_checks: "Ping Discourse Hub để cập nhật phiên bản và hiện thông báo phiên bản mới trong bảng điều khiển quản trị"
     new_version_emails: "Gửi email đến địa chỉ contact_email khi có phiên bản Discourse mới."
-    port: "DEVELOPER ONLY! WARNING! Sử dụng HTTP port thay vì mặc định port 80. Để trống mặc định port 80."
-    force_hostname: "DEVELOPER ONLY! LƯU Ý! Chỉ rõ hostname trong URL. Để trống là mặc định."
     invite_expiry_days: "Key mời người dùng có giới hạn bao lâu? tính theo ngày"
     invite_passthrough_hours: "Bao lâu người dùng có thể sử dụng mã lời mời trước đó để đăng nhập, theo giờ"
     login_required: "Yêu cầu chứng thực để đọc nội dung trên trang web, không cho phép người dùng nặc danh truy cập."
@@ -786,7 +775,6 @@ vi:
     clean_up_uploads: "Loại bỏ không triệt các dòng mồ côi khi upload để ngăn chặn hosting bất hợp pháp. LƯU Ý: bạn cần phải backup thư mục /uploads trước khi bật thiết lập này."
     clean_orphan_uploads_grace_period_hours: "Thời gian gia hạn (theo giờ) trước khi dòng mồ côi upload được loại bỏ."
     purge_deleted_uploads_grace_period_days: "Thời gian gia hạn (theo ngày) trước khi upload cần xóa được xóa."
-    purge_unactivated_users_grace_period_days: "Thời gian gia hạn (theo ngày) trước khi người dùng chưa kích hoạt tài khoản sẽ được xóa."
     enable_s3_uploads: "Đặt thư mục upload trên Amazon S3. QUAN TRỌNG: yêu cầu chứng thực S3 (cả ID khóa truy cập & khóa bảo mật)."
     s3_use_iam_profile: 'Sử dụng AWS EC2 IAM để lấy khóa. LƯU Ý: bật thiết lập này sẽ ghi đè thiết lập "s3 access key id" và "s3 secret access key".'
     s3_upload_bucket: "Tên Amazon S3 để lưu trữ các file sẽ được upload. CHÚ Ý: phải là chữ thường, không cách và không gạch dưới."
@@ -880,9 +868,6 @@ vi:
     num_flags_to_close_topic: "Số lượng tối thiểu đánh dấu hoạt động để tự động tạm dừng một chủ đề để can thiệp."
     auto_respond_to_flag_actions: "Kích hoạt tính năng trả lời tự động khi xử lý một đánh dấu."
     min_first_post_typing_time: "Số lượng thời gian tối thiểu theo phần ngàn giây mà thành viên phải nhập trong bài viết đầu tiên, nếu ngưỡng không được đáp ứng sẽ tự động nhập vào hàng chờ duyệt. Đặt là 0 để tắt (không khuyến nghị)"
-    auto_block_fast_typers_on_first_post: "Tự động chặn người dùng không đáp ứng min_first_post_typing_time"
-    auto_block_fast_typers_max_trust_level: "Cấp độ tin cậy tối đa để tự động chặn những người đánh máy quá nhanh"
-    auto_block_first_post_regex: "Regex trường hợp không nhạy cảm để nếu vượt qua sẽ khóa bài viết đầu tiên của thành viên và gửi tới chờ duyệt. Ví dụ: raging|a[bc]a , sẽ khóa tất cả các bài viết đầu tiên có chứa raging, aba hoặc aca. Chỉ áp dụng cho các bài viết đầu tiên."
     reply_by_email_enabled: "Cho phép trả lời chủ đề qua email."
     reply_by_email_address: "Mẫu để trả lời cho các địa chỉ email đến, ví dụ: %{reply_key}@reply.example.com hoặc replies+%{reply_key}@example.com"
     disable_emails: "Ngăn chặn Discourse gửi thêm bất kỳ email nào"
@@ -902,7 +887,6 @@ vi:
     pop3_polling_username: "Tên truy cập của tài khoản POP3 để poll email."
     pop3_polling_password: "Mật khẩu của tài khoản POP3 để poll email."
     log_mail_processing_failures: "Ghi lại tất cả các lỗi xử lý email vào http://yoursitename.com/logs"
-    email_in: "Cho phép người dùng tạo chủ đề mới thông qua email (yêu cầu pop3 polling). Cấu hình các địa chỉ trong tab \"Thiết lập\" cho mỗi chuyên mục."
     email_in_min_trust: "Bậc tin tưởng tối thiểu cho phép một thành viên gửi chủ đề mới qua email."
     email_prefix: "Nhãn [label] sử dụng trong tiêu đề email, mặc định được đặt là 'title'."
     email_site_title: "Tên website được sử dụng là tên người gửi email, mặc định là 'title' nếu không thiết lập. Nếu 'title' có chứa ký tự không được phép trong chuỗi người gửi email, sử dụng thiết lập này."
@@ -910,7 +894,6 @@ vi:
     relative_date_duration: "Số ngày sau khi đăng bài nơi ngày của bài viết sẽ được hiển thị tương đối (7d) thay vì tuyệt đối (20 Feb)."
     delete_user_max_post_age: "Không cho phép xóa thành viên khi bài viết đầu tiên của họ cũ hơn (x) ngày."
     delete_all_posts_max: "Số lượng tối đa bài viết có thể được xóa cùng một lúc khi sử dụng nút Xóa Tất Cả Bài Viết. Nếu thành viên có nhiều hơn số lượng bài viết này, các bài viết có thể không bị xóa cùng một lúc và cũng không thể xóa được thành viên đó."
-    username_change_period: "Số ngày thành viên có thể thay đổi tên đăng nhập sau khi đăng kí (0 để vô hiệu hóa chức năng thay đổi tên thành viên)"
     email_editable: "Cho phép thành viên thay đổi địa chỉ email sau khi đăng kí"
     allow_uploaded_avatars: "Cho phép người dùng tải lên hình hồ sơ."
     allow_animated_avatars: "Cho phép người dùng sử dụng ảnh gif động trong trang hồ sơ. CẢNH BÁO: cần chạy tác vụ avatars:refresh sau khi thay đổi thiết lập này."
@@ -945,15 +928,9 @@ vi:
     default_code_lang: "Highlight cú pháp ngôn ngữ lập trình mặc định áp dụng cho đoạn mã GitHub (lang-auto, ruby, python...)"
     warn_reviving_old_topic_age: "Khi ai đó trả lời chủ đề mà lần trả lời cuối cùng cũ hơn số ngày được thiết lập ở đây, hiển thị một cảnh báo. Vô hiệu hóa bằng cách đặt là 0."
     autohighlight_all_code: "Highlight code bắt buộc đối với các đoạn mã thực thi ngay cả khi họ không chỉ định ngôn ngữ rõ ràng."
-    feed_polling_enabled: "CHỈ NHÚNG: Cho dù chỉ nhúng RSS/ATOM bài viết."
-    feed_polling_url: "CHỈ NHÚNG: URL của RSS/ATOM để nhúng."
-    embed_by_username: "Tên tài khoản Discourse của thành viên tạo các chủ đề nhúng."
-    embed_username_key_from_feed: "Khóa để kéo tên tài khoản Discourse từ feed."
     embed_truncate: "Cắt ngắn các bài viết được nhúng."
     embed_post_limit: "Số lượng tối đa bài viết được nhúng."
     embed_username_required: "Tên tài khoản để tạo chủ đề là bắt buộc."
-    embed_whitelist_selector: "Bộ chọn các thành phần CSS được hỗ trợ khi nhúng."
-    embed_blacklist_selector: "Bộ chọn các thành phần CSS được loại bỏ khi nhúng."
     show_create_topics_notice: "Nếu trang có ít hơn 5 chủ đề công khai, hiển thị một thông báo yêu cầu quản trị tạo thêm các chủ đề mới"
     delete_drafts_older_than_n_days: Xóa các bản nháp cũ hơn (n) ngày.
     prevent_anons_from_downloading_files: "Cấm khách truy cập tải các tập tin đính kèm. CẢNH BÁO: việc này sẽ chặn những hình ảnh không thuộc giao diện trang hoạt động"
@@ -1074,14 +1051,12 @@ vi:
     email_too_long: "Email bạn cung cấp quá dài. Địa chỉ email phải không quá 254 ký tự, và tên miền phải không quá 253 ký tự."
     reserved_username: "Tên đăng nhập không được cho phép."
     missing_user_field: "Bạn không hoàn tất tất cả các trường người dùng"
-    close_window: "Chứng thực hoàn tất. Đóng của sổ này để tiếp tụ."
     already_logged_in: "Rất tiếc, có vẻ như bạn đang cố gắng để chấp nhận lời mời của một người dùng khác. Nếu bạn không phải là %{current_user}, xin vui lòng đăng xuất và thử lại."
   user:
     no_accounts_associated: "Không có tài khoản liên quan"
     username:
       short: "phải dài ít nhất %{min} ký tự"
       long: "không được dài hơn %{max} ký tự"
-      characters: "chỉ bao gồm số, ký tự và dấu gạch dưới"
       unique: "phải độc nhất"
       blank: "phải hiện hành"
       must_begin_with_alphanumeric_or_underscore: "phải bắt đầu bằng chữ, số hoặc dấu gạch dưới"
@@ -1099,10 +1074,6 @@ vi:
       other: "%{count} đánh dấu đang đợi xử lý"
   unsubscribe_mailer:
     subject_template: "Xác nhận bạn không còn muốn nhận email cập nhật từ %{site_title}"
-  invite_mailer:
-    subject_template: "%{invitee_name} mời bạn tham gia chủ đề '%{topic_title}' trên %{site_domain_name}"
-  invite_forum_mailer:
-    subject_template: "%{invitee_name} đã mời bạn gia nhập %{site_domain_name}"
   invite_password_instructions:
     subject_template: "Đặt mật khẩu cho tài khoản của bạn ở %{site_name}"
   flag_reasons:
@@ -1138,37 +1109,11 @@ vi:
       subject_template: "Xuất dữ liệu hoàn tất"
     csv_export_failed:
       subject_template: "Xuất dữ liệu thất bại"
-      text_body_template: "Chúng tôi xin lỗi, những dữ liệu bạn xuất bị lỗi. Vui lòng xem log hoặc liên hệ nhân viên."
-    email_reject_insufficient_trust_level:
-      text_body_template: |
-        Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
-        Tài khoản của bạn không đủ cấp độ tin cậy bắt buộc để gửi chủ đề mới tới địa chỉ email này. Nếu bạn tin đây là lỗi, xin hãy liên hệ với BQT.
-    email_reject_user_not_found:
-      text_body_template: |
-        Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
-        Trả lời của bạn đã được gửi từ một địa chỉ email chưa rõ. Xin hãy thử gửi với địa chỉ email khác, hoặc liên hệ với BQT.
     email_reject_inactive_user:
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
 
         Tài khoản của bạn liên kết với địa chỉ email này chưa được kích hoạt. Xin hãy kích hoạt tài khoản của bạn trước khi gửi email.
-    email_reject_blocked_user:
-      text_body_template: |
-        Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
-        Tài khoản của bạn liên kết với địa chỉ email này đã bị chặn.
-    email_reject_reply_user_not_matching:
-      text_body_template: |
-        Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
-        Trả lời của bạn đã được gửi từ một địa chỉ email khác với những gì chúng tôi mong đợi, chúng tôi nghĩ đây có thể là cùng một người. Xin hãy thử gửi với địa chỉ email khác, hoặc liên hệ với BQT.
-    email_reject_no_account:
-      text_body_template: |
-        Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
-        Chúng tôi không tìm thấy tài khoản nào khớp với địa chỉ email của bạn. Xin hãy thử gửi với địa chỉ email khác, hoặc liên hệ với BQT.
     email_reject_empty:
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
@@ -1181,16 +1126,6 @@ vi:
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
 
         Chúng tôi không tìm thấy nội dung trả lời trong email của bạn. **Hãy đảm bảo rằng trả lời của bạn ở phía trên cùng của email** -- chúng tôi không thể xử lý các trả lời nội tuyến.
-    email_reject_invalid_access:
-      text_body_template: |
-        Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
-        Tài khoản của bạn không có quyền tạo chủ đề mới trong chuyên mục đó. Nếu bạn tin đây là lỗi, xin hãy liên hệ với BQT.
-    email_reject_strangers_not_allowed:
-      text_body_template: |
-        Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
-        Chuyên mục bạn gửi email này tới chỉ chấp nhận trả lời từ các thành viên có tài khoản hợp lệ với các địa chỉ email rõ ràng. Nếu bạn tin đây là lỗi, xin hãy liên hệ với BQT.
     email_reject_invalid_post:
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
@@ -1210,31 +1145,6 @@ vi:
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
 
         Hành động gửi bài không được công nhận, bạn hãy thử lại hoặc gửi thông qua website.
-    email_reject_reply_key:
-      text_body_template: |
-        Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
-        Khóa trả lời trong email là không hợp lệ hoặc không rõ, vì thế chúng tôi không thể hình dung ra email này gửi trả lời tới đâu. Xin hãy liên hệ với BQT.
-    email_reject_bad_destination_address:
-      text_body_template: |
-        Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
-        Không có địa chỉ email người nhận được xác định, hãy chắc chắn rằng địa chỉ email bạn gửi tới là chính xác.
-    email_reject_topic_not_found:
-      text_body_template: |
-        Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
-        Chủ đề bạn gửi trả lời không còn tồn tại -- có thể do đã được xóa? Nếu bạn tin đây là lỗi, xin hãy liên hệ với BQT.
-    email_reject_topic_closed:
-      text_body_template: |
-        Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
-        Chủ đề bạn gửi trả lời hiện đang đóng và không nhận gửi trả lời. Nếu bạn tin đây là lỗi, xin hãy liên hệ với BQT.
-    email_reject_auto_generated:
-      text_body_template: |
-        Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
-        Email của bạn được đánh dấu là "tạo tự động", chúng tôi không chấp nhận các kiểu email này. Nếu bạn tin đây là lỗi, xin hãy liên hệ với BQT.
     email_error_notification:
       text_body_template: |
         Thật không may, có một lỗi xác thực trong khi polling mail từ POP server.
@@ -1242,25 +1152,6 @@ vi:
         Hãy chắc chắn rằng bạn đã cấu hình đúng các thông tin POP trong [thiết lập website](%{base_url}/admin/site_settings/category/email).
 
         Nếu có một giao diện web cho các tài khoản email POP, bạn có thể cần phải đăng nhập vào website và kiểm tra các thiết lập này.
-    user_automatically_blocked:
-      text_body_template: |
-        Đây là tin nhắn tự động.
-
-        Tài khoản mới [%{username}](%{user_url}) đã được tự động chặn do nhiều thành viên đã gắn cờ các bài viết của %{username}.
-
-        Hãy [xem lại các cờ](%{base_url}/admin/flags). Nếu %{username} không đáng bị chặn gửi bài, click nút gỡ bỏ trên [trang quản trị thành viên](%{user_url}).
-
-        Ngưỡng này có thể thay đổi trong thiết lập `block_new_user` của website.
-    spam_post_blocked:
-      subject_template: "Các bài viết của tài khoản mới %{username} đã bị chặn do lặp đi lặp lại các liên kết"
-      text_body_template: |
-        Đây là tin nhắn tự động.
-
-        Tài khoản mới [%{username}](%{user_url}) đã nhiều lần tạo bài viết chứa các liên kết tới %{domains}, nhưng những bài viết này đã bị chặn để tránh spam. Thành viên vẫn có thể tạo bài viết mới mà không liên kết tới %{domains}.
-
-        Hãy [xem xét thành viên](%{user_url}).
-
-        Có thể thay đổi điều này trong thiết lập `newuser_spam_host_threshold` và `white_listed_spam_host_domains` của website.
     pending_users_reminder:
       subject_template:
         other: "%{count} thành viên đang chờ duyệt"
@@ -1287,26 +1178,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:
@@ -1328,10 +1199,6 @@ vi:
     see_more: "Thêm"
     search_title: "Tìm trang này"
     search_google: "Goole"
-  login_required:
-    welcome_message: |
-      #[Chào mừng đến %{title}](#welcome)
-      Trang này yêu cầu phải có tài khoản. Vui lòng tạo một tài khoản hoặc đăng nhập để tiếp tục.
   terms_of_service:
     title: "Điều khoản Dịch vụ"
     signup_form_message: 'Tôi đã đọc và đồng ý với <a href="/tos" target="_blank">Điều khoản dịch vụ</a>.'
@@ -1414,9 +1281,6 @@ vi:
         Huy hiệu này được cấp khi bạn nhận được like đầu tiên. Xin chúc mừng, bạn đã đăng nội dung mà các thành viên của cộng đồng cảm thấy thú vị, hấp dẫn, hoặc có ích!
     autobiographer:
       name: Tự truyện
-      description: Điền thông tin vào <a href="/my/preferences">hồ sơ</a>
-      long_description: |
-        Huy hiệu này được cấp khi bạn điền thông tin vào <a href="/my/preferences">hồ sơ thành viên</a> và chọn một ảnh cá nhân. Cho cộng đồng biết thêm một chút về bạn và những gì bạn quan tâm, qua đó làm cho cộng đồng tốt hơn, kết nối hơn. Tham gia cùng chúng tôi!
     anniversary:
       name: Ngày kỷ niệm
       description: Thành viên hoạt động trong một năm, gửi bài ít nhất một lần
@@ -1505,9 +1369,6 @@ vi:
       description: Trích dẫn một bài viết
     read_guidelines:
       name: Xem hướng dẫn
-      description: Xem <a href="/guidelines">nguyên tắc cộng đồng</a>
-      long_description: |
-        Huy hiệu này được cấp khi bạn xem <a href="/guidelines">nguyên tắc cộng đồng</a>. Xem và làm theo những nguyên tắc này sẽ giúp bạn cùng chúng tôi xây dựng một cộng đồng an toàn, bền vững, và đem lại nhiều niềm vui cho tất cả mọi người!
     reader:
       name: Người xem
       description: Đọc từng trả lời trong một chủ đề có hơn 100 trả lời
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index faaaf867cb..aaf5ae63d1 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -7,7 +7,7 @@
 
 zh_CN:
   dates:
-    short_date_no_year: "MMMDokeys:"
+    short_date_no_year: "MMMDokeys: "
     short_date: "ll"
     long_date: "lll"
   datetime_formats: &datetime_formats
@@ -46,8 +46,9 @@ zh_CN:
         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: "无法解析正文并且没有附件。"
+        no_sender_detected_error: "当无法在来源信息中找到有效邮件地址时发生。"
         inactive_user_error: "发送者未激活。"
-        blocked_user_error: "发送者被封禁。"
+        silenced_user_error: "当发件人被禁言时发生。"
         bad_destination_address: "发至/抄送/密送栏中的所有邮件都不匹配进站邮件地址。"
         strangers_not_allowed_error: "用户尝试在非成员分类中创建主题。"
         insufficient_trust_level_error: "用户尝试在用户等级不满足分类要求时发帖。"
@@ -56,8 +57,12 @@ zh_CN:
         topic_closed_error: "回复到已经锁定的主题。"
         bounced_email_error: "邮件是投递失败的错误报告。"
         screened_email_error: "发件人邮箱已经被封禁。"
+        unsubscribe_not_allowed: "当用户不能通过邮件退订时发生。"
+        email_not_allowed: "当用户邮件不在白名单或在黑名单时发生。"
+      unrecognized_error: "无法识别的错误"
   errors: &errors
     format: '%{attribute}%{message}'
+    format_with_full_message: '<b>%{attribute}</b>：%{message}'
     messages:
       too_long_validation: "最多只能有 %{max} 个字；你已经输入了 %{length} 个字。"
       invalid_boolean: "无效布尔值。"
@@ -109,7 +114,7 @@ zh_CN:
       s3_upload_bucket_is_required: "你没有填写“s3_upload_bucket”，不能开启上传至 S3。"
   invite:
     not_found: "你的邀请码不正确。请联系网站管理员。"
-    user_exists: "不需要邀请<b>%{email}</b>，他们<a href='/u/%{username}/summary'>已经有账号了！</a>"
+    user_exists: "不需要邀请<b>%{email}</b>，他们<a href='/u/%{username}/summary'>已经有帐号了！</a>"
   bulk_invite:
     file_should_be_csv: "上传的文件应为 csv 格式。"
     error: "上传文件的时候出错了。请重试。"
@@ -123,6 +128,7 @@ zh_CN:
   not_logged_in: "你需要登录后才能这么做。"
   not_found: "找不到请求的地址或资源。"
   invalid_access: "你没有权限查看请求的资源。"
+  invalid_api_credentials: "你没有权限查看请求的资源。API 用户名或者秘钥无效。"
   read_only_mode_enabled: "这个站点正处于只读模式。交互功能已禁用。"
   reading_time: "阅读时间"
   likes: "赞"
@@ -159,10 +165,12 @@ zh_CN:
   no_links_allowed: "抱歉，访客无法贴链接。"
   too_many_links:
     other: "抱歉，访客一次仅能贴 %{count} 条链接。"
+  contains_blocked_words: "你的帖子包含违禁词。"
   spamming_host: "抱歉，你不能添加一个链接到那个地址的链接。"
   user_is_suspended: "被封禁的用户不允许发贴。"
   topic_not_found: "出现问题。或许这个主题在你看的时候已经被关闭或删除了。"
   not_accepting_pms: "对不起，%{username} 目前不接收讯息。"
+  max_pm_recepients: "抱歉，你至多可以向%{recipients_limit}个收件人发送私信。"
   just_posted_that: "太类似于你最近发表的内容"
   invalid_characters: "包含无效字符"
   is_invalid: "似乎不清楚，这是一个完整的句子？ "
@@ -171,8 +179,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: "参与者："
@@ -195,11 +203,13 @@ zh_CN:
     user_posts: "最新贴子由@%{username}发表"
     user_topics: "最新主题由@%{username}发表"
     tag: "主题标签"
+    badge: "%{site_title}的%{display_name}徽章"
   too_late_to_edit: "这个主题在很早之前创建。不能被编辑或者被删除。"
   revert_version_same: "目前的版本和你想要回退至的版本一样。"
   excerpt_image: "图片"
   queue:
     delete_reason: "通过帖子审核队列删除"
+    not_found: "未找到帖子或已经更新。"
   groups:
     success:
       bulk_add: "%{users_added}用户已经被添加至小组。"
@@ -210,6 +220,7 @@ zh_CN:
       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: "管理面板"
@@ -220,17 +231,19 @@ zh_CN:
       trust_level_2: "信任等级2"
       trust_level_3: "信任等级3"
       trust_level_4: "信任等级4"
+    request_membership_pm:
+      title: "%{group_name}的成员请求"
   education:
     until_posts:
       other: "%{count} 个帖子"
     new-topic: |
       欢迎来到%{site_name} &mdash; **衷心感谢你参与讨论！**
 
-      - 标题是否清晰明了地描述了主题？看起来有意思么？
+      - 标题念出来后听着有趣么？是否清晰明了？
 
-      - 谁会感兴趣？它为什么重要？你期望从社区中获得什么样的回应？
+      - 谁会对它感兴趣？它为什么有价值？你期望从社区中获得什么样的回应？
 
-      - 选择恰当的词句以便别人能找到你的主题。若想要给主题分组，选择一个分类。
+      - 选择常用的词句以便别人能找到你的主题。如果想要把主题和类似主题放在一起，选择一个分类。
 
       更多的帮助信息，[请查看我们的社区准则](/guidelines)。此信息面板只在你发布前 %{education_posts_text}时显示。
     new-reply: |
@@ -242,7 +255,7 @@ zh_CN:
 
       - 欢迎有建设性的批评，但是请批判观点，而不是人身攻击。
 
-      欲查看更多，[请查看我们的社区准则](/guidelines)。此信息面板只会在你发表前 %{education_posts_text} 时显示。
+      欲查看更多，[请查看我们的社区准则](/guidelines)。此信息面板只会在你发表前 %{education_posts_text}时显示。
     avatar: |
       ### 想更改你的头像吗?
 
@@ -305,6 +318,7 @@ zh_CN:
               too_many_users: "一次只能发送警告给一个用户。"
               cant_send_pm: "抱歉，不能向该用户发送私信。"
               no_user_selected: "必须选择一个有效的用户。"
+              reply_by_email_disabled: "用邮件回复已被禁止"
             featured_link:
               invalid: "不合法。URL 应包括 http:// 或 https://。"
               invalid_category: "无法编辑该分类。"
@@ -337,6 +351,14 @@ zh_CN:
           attributes:
             execute_at:
               in_the_past: "必须是未来。"
+        translation_overrides:
+          attributes:
+            value:
+              invalid_interpolation_keys: '以下内插键值无效：“%{keys}”'
+        watched_word:
+          attributes:
+            word:
+              too_many: "对该操作敏感词过多"
       <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>你的个人主页中的关于我部分目前还是空白，<a href='/u/%{username_lower}/preferences/about-me'>你想要补些什么吗？</a></div>"
@@ -347,8 +369,8 @@ zh_CN:
   meta_category_description: "讨论该站点的站务、组织、如何运作和如何改善它。"
   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`。"
+  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
@@ -399,6 +421,7 @@ zh_CN:
       invalid_email_in: "'%{email}'不是一个有效邮箱地址。"
       email_already_used_in_group: "'%{email}' 已经被群组'%{group_name}'使用了。"
       email_already_used_in_category: "'%{email}' 已经被分类'%{category_name}'使用了。"
+      description_incomplete: "分类描述帖至少要有一段。"
     cannot_delete:
       uncategorized: "不能删除未分类。"
       has_subcategories: "不能删除该分类，因为它有子分类"
@@ -418,6 +441,9 @@ zh_CN:
     leader:
       title: "资深"
     change_failed_explanation: "你尝试将%{user_name}降至%{new_trust_level}。然而他们的信任等级已经是%{current_trust_level}。%{user_name}将仍处于%{current_trust_level}——如果你想要降级用户，先锁定信任等级。"
+  post:
+    image_placeholder:
+      broken: "此图片已损坏"
   rate_limiter:
     slow_down: "你执行这个操作太多次了，请稍后再试。"
     too_many_requests: "你的请求过于频繁，请等待%{time_left}之后再试。"
@@ -572,12 +598,18 @@ zh_CN:
       short_description: '为该贴投票'
       long_form: '已给本帖投票'
   user_activity:
+    no_default:
+      self: "你还没有活动。"
+      others: "无活动。"
     no_bookmarks:
       self: "你没有收藏帖子，收藏帖子能让你之后轻松找到他们。"
       others: "没有收藏。"
     no_likes_given:
       self: "你还没有赞任何帖子。"
       others: "没有被赞的帖子。"
+    no_replies:
+      self: "你还未回复任何主题"
+      others: "无回复"
   topic_flag_types:
     spam:
       title: '垃圾'
@@ -594,7 +626,7 @@ zh_CN:
       email_title: '“{title}”主题需要你的关注'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>你的帖子被社区成员标记了。请<a href="/my/messages">查看你的私信</a>。</p>'
+    you_must_edit: '<p>你的帖子被社区标记了。请<a href="%{path}">查看你的消息</a>。</p>'
     user_must_edit: '<p>你的帖子已经被社区标记并被临时隐藏。</p>'
   archetypes:
     regular:
@@ -606,7 +638,7 @@ zh_CN:
         remove: "本主题已经不再是横幅主题。它将不在每个页面的顶部显示。"
   unsubscribed:
     title: "退订！"
-    description: "你已经退订。要更改你的邮件设置，<a href='%{url}'>访问你的用户设置页面</a>。"
+    description: "<b>%{email}</b>已经退订。要更改你的邮件设置，<a href='%{url}'>访问你的用户设置页面</a>。"
     topic_description: "点击链接 %{link} 重新订阅，或是使用主题底部或右侧的通知控制。"
   unsubscribe:
     title: "退订"
@@ -782,7 +814,7 @@ zh_CN:
     queue_size_warning: '队列中有较多任务，为 %{queue_size} 个。这可能是因为 Sidekiq 进程的问题导致，或者需要更多的 Sidekiq 进程。'
     memory_warning: '你的服务器环境内存少于 1GB，我们建议至少要有 1GB 内存。'
     google_oauth2_config_warning: '服务器允许使用 Google Oauth2 登录（enable_google_oauth2_logins），但是 client id 和 client secret 没有被设定。 到<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: '服务器允许使用 Facebook 账号登录（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>。'
+    facebook_config_warning: '服务器允许使用 Facebook 帐号登录（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: '服务器允许使用 Twitter 账号登录（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>。'
@@ -816,15 +848,16 @@ zh_CN:
     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: "多少分钟之后才允许一个用户再次发表包含相同内容的帖子"
     educate_until_posts: "当用户开始键入他们的前几个（n）新帖子时，在编辑器上显示教育面板弹窗。"
     title: "站点名字，用于 title 标签。"
     site_description: "用一句话描述这个论坛，用于 meta description 标签。"
-    contact_email: "本站负责人的电子邮件地址。用于紧急事项的通知，如未处理的标记，以及作为 /about 页面中的紧急联系人。"
+    contact_email: "本站负责人的电子邮件地址。用于紧急事项的通知，以及作为 /about 页面中的紧急联系人。"
     contact_url: "联系 URL。作为 /about 页面中的紧急联系方式。"
-    queue_jobs: "仅限开发者设定！警告！默认使用 sidekiq 完成队列工作。如果禁用，你的站点将无法使用。"
     crawl_images: "允许从第三方 URL 获取图片来插入宽、高数值"
     download_remote_images_to_local: "下载一份主题中链接的外部图片到本地；以防图片损坏。"
     download_remote_images_threshold: "本地最小可用下载外部图片到本地的空间（百分比）"
@@ -839,18 +872,21 @@ zh_CN:
     fixed_category_positions: "如果选择，你将可以设置一个固定的分类顺序。如果不选择，分类将按照活动的顺序显示。"
     fixed_category_positions_on_create: "如果选择了，目录排序将会在话题创建对话框中被包含(要求固定目录位置选项)"
     add_rel_nofollow_to_user_content: "添加 rel nofollow 属性到所有的用户内容，除了内部链接（包括父域名）。如果你更改了这个，你必须重新调制所有帖子，以该命令：“rake posts:rebake”"
-    exclude_rel_nofollow_domains: "不添加 nofollow 链接的域名列表。填写 tld.com 将自动包括 sub.tld.com。最少你应该填写顶级域名来让爬虫获得所有内容。如果你的网站包含其他域名，增加他们。"
+    exclude_rel_nofollow_domains: "Nofollow 的域名列表不应被加入到链接中。 填写 example.com 也将自动允许 sub.example.com。至少你应该填写本站域名来帮助爬虫获得所有内容。如果你网站的其余部分在另外的域名，也请添加那些域名。"
     post_excerpt_maxlength: "帖子摘要的最大字符长度"
     show_pinned_excerpt_mobile: "移动版显示置顶主题剪辑。"
     show_pinned_excerpt_desktop: "移动版显示置顶主题剪辑。"
     post_onebox_maxlength: "Onebox 处理后的 Discourse 帖子的最大字符长度"
     onebox_domains_blacklist: "不会被 Onebox 的域名列表。"
+    inline_onebox_domains_whitelist: "若链接不带标题会以微型形式被 Onebox 的域名列表。"
+    enable_inline_onebox_on_all_domains: "忽略  inline_onebox_domain_whitelist 站点设定并在所有域允许一致 Onebox 。"
     max_oneboxes_per_post: "帖子中最多的 Onebox 数量。"
     logo_url: "在你站点左上角出现的小号标志图片，应为一个长方形。如果留空，将显示站点标题文字。"
     digest_logo_url: "邮件摘要中使用的标志图像。应为长方形。不能使用 SVG 图片。如果留空，将使用 `logo_url`。"
     logo_small_url: "在你站点左上角的小号标志图片，应为正方形，当滚动时才可见。如果留空，将显示主页图标。"
     favicon_url: "你的站点图标（favicon），参考 http://zh.wikipedia.org/wiki/Favicon，如果要正确地通过 CDN 分发，它必须是 png 图片"
-    mobile_logo_url: "移动站点左上角的固定标志图片。应为正方形。如果留空，`logo_url` 将被使用。如：http://example.com/uploads/default/logo.png"
+    mobile_logo_url: "站点移动版本的自定义标志 url。如果留空，则使用`logo_url`。例如: http://example.com/uploads/default/logo.png"
+    large_icon_url: "Android 上用于标志和启动屏图标。推荐 512px x 512px 大小。"
     apple_touch_icon_url: "Apple 触摸设备使用的图标。推荐 144x144 大小。"
     notification_email: "这个表格：被用于发送所有重要系统邮件的邮箱地址。指定的域名必须正确设置 SPF、DKIM 和反向 PTR 记录以发送邮件。"
     email_custom_headers: "一个逗号分离的自定义邮件头部"
@@ -863,6 +899,7 @@ zh_CN:
     summary_percent_filter: "当用户点击摘要，显示前 % 几的帖子"
     summary_max_results: "“概括主题”返回的最大帖子数量"
     enable_private_messages: "允许信任等级1（可以另外选择发送私信的信任等级）的用户创建私信和回复私信。注意：管理人员不受限制。"
+    enable_private_email_messages: "允许信任等级 4 (可通过发送私信的最低信任等级进行设置) 的用户创建私信和回复私信。注意：管理人员不受限制。"
     enable_long_polling: "启用 Message bus 使通知功能可以使用长轮询（long polling）"
     long_polling_base_url: "长轮询的基本 URL（当用 CDN 分发动态能让时，请设置此至原始拉取地址）例如：http://origin.site.com"
     long_polling_interval: "当没有数据向客户端发送时服务器端应等待的时间（仅对已登录用户有效）"
@@ -876,28 +913,29 @@ zh_CN:
     tl2_additional_likes_per_day_multiplier: "增加信任等级2（成员）的赞限制，可提供一个乘数与原始值相乘"
     tl3_additional_likes_per_day_multiplier: "增加信任等级3（常规）的每日赞限制，将此设置项与原始值相乘"
     tl4_additional_likes_per_day_multiplier: "增加信任等级4（资深）的赞限制，可提供一个乘数与原始值相乘"
-    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: "如果一个用户被自动封禁了，发送一个私信给所有管理员。"
+    num_spam_flags_to_silence_new_user: "如果新用户被 num_users_to_silence_new_user 个用户标记垃圾信息，隐藏他们的所以帖子并禁止发音。设置为 0 禁用。"
+    num_users_to_silence_new_user: "如果新用户被不同用户标记了 num_spam_flags_to_silence_new_user 次垃圾信息，隐藏他们的所以帖子并禁止发音。设置为 0 禁用。"
+    num_tl3_flags_to_silence_new_user: "如果新用户被 num_tl3_users_to_silence_new_user 个信任等级3的用户标记垃圾信息，隐藏他们的所以帖子并禁止发音。设置为 0 禁用。"
+    num_tl3_users_to_silence_new_user: "如果新用户被不同信任等级3的用户标记 num_tl3_flags_to_silence_new_use 为标记垃圾信息，隐藏他们的所以帖子并禁止发音。设置为 0 禁用。"
+    notify_mods_when_user_silenced: "如果用户被自动禁言了，发私信给所有版主。"
     flag_sockpuppets: "如果一个新用户开始了一个主题，并且同时另一个新用户以同一个 IP 在该主题回复，他们所有的帖子都将被自动标记为垃圾。"
     traditional_markdown_linebreaks: "在 Markdown 中使用传统换行符，即用两个尾随空格来换行"
-    allow_html_tables: "允许在输入 Markdown 文本时使用表格 HTML 标签。标签 TABLE、THEAD、TD、TR、TH 将被允许使用，即白名单这些标签（需要重置所有包含表格的老帖子的 HTML）"
+    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 通用分析追踪代码（analytics.js）追踪代码，例如：UA-12345678-9；参考 http://google.com/analytics"
     ga_universal_domain_name: "Google 通用分析域名（analytics.js）追踪代码，例如：mysite.com；参考 http://google.com/analytics"
+    ga_universal_auto_link_domains: "启用Google通用数据分析（analytics.js）跨域跟踪。发送到这些域的链接将添加客户端标识。请参阅Google的跨域跟踪指南。"
     gtm_container_id: "Google Tag Manager 容器 id。例如：GTM-ABCDEF"
     enable_escaped_fragments: "如未侦测到爬虫回退到使用 Google Ajax-Crawling API。参见 https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
     allow_moderators_to_create_categories: "允许版主创建新的分类"
     cors_origins: "允许跨源请求（CORS）。每个源必须包括 http:// 或 https://。DISCOURSE_ENABLE_CORS 环境变量必须设置为 true 才能启用 CORS 政策。"
     use_admin_ip_whitelist: "当目前的IP刚好处于IP段禁止名单(Admin > Logs > Screened Ips)中的时候，只有管理员才可登入。"
     blacklist_ip_blocks: "Discourse 不会访问抓取的保密 IP 封禁列表"
+    whitelist_internal_hosts: "discourse 可以安全抓取以用于 Onebox 和其他目的的内部主机列表"
+    allowed_iframes: "可以令 Discourse 在主题中安全地发布的 iframe src 域名前缀列表"
     top_menu: "确定在主页导航条包含哪些条目，以及排列顺序。例如：latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "确定在帖子菜单条包含哪些条目，以及排列顺序。例如：like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "帖子菜单中默认隐藏的按钮，点击省略号后显示。"
@@ -921,12 +959,10 @@ zh_CN:
     allow_index_in_robots_txt: "在 robots.txt 中详细指出这个站点允许被网页搜索引擎检索。"
     email_domains_blacklist: "用管道符“|”分隔的邮箱域名黑名单列表，其中的域名将不能用来注册账户，例如：mailinator.com|trashmail.net"
     email_domains_whitelist: "用管道符“|”分隔的电子邮箱域名的列表，用户必须使用这些邮箱域名注册。警告：用户使用不包含在这个列表里的邮箱域名，将无法成功注册。"
-    forgot_password_strict: "用户找回密码时不提示帐户是否存在。"
+    hide_email_address_taken: "通过邮件地址注册账户或忘记密码时不反馈用户账户是否存在的信息。"
     log_out_strict: "退出时，退出用户所有设备的会话"
     version_checks: "访问 Discourse Hub 来检查版本更新，并在管理面板 /admin 显示新版本信息"
     new_version_emails: "当新版本发布时，发送一封邮件至 contact_email 设置的地址。"
-    port: "仅限开发者设定！警告！使用此 HTTP 端口而不是 80 端口。留空为使用默认 80 端口"
-    force_hostname: "仅限开发者设定！警告！指定 URL 里的主机名。留空为默认"
     invite_expiry_days: "多少天以内用户的邀请码是有效的"
     invite_passthrough_hours: "用户多久才能使用一个已经使用过的邀请代码，以小时计"
     invite_only: "公开注册已被禁用，所有新用户必须由管理人员邀请进来。"
@@ -1010,7 +1046,7 @@ zh_CN:
     clean_up_uploads: "移除孤立的已上传资料。警告：你可能想要在启用这个设定前备份一下 /uploads 目录。"
     clean_orphan_uploads_grace_period_hours: "删除孤立上传资料的宽限期（单位：小时）"
     purge_deleted_uploads_grace_period_days: "彻底删除孤立上传资料的宽限期（单位：天）"
-    purge_unactivated_users_grace_period_days: "删除未激活用户账户的宽限期（单位：天）。"
+    purge_unactivated_users_grace_period_days: "删除未激活用户账户的宽限期（单位：天）。设置为 0 将永不清除未激活用户。"
     enable_s3_uploads: "上传至 Amazon S3 存储的地址。重要：需要有效的 S3 验证资料（包括 access key id & secret access key）。"
     s3_use_iam_profile: '使用 AWS EC2 IAM 角色来获得 key。注意：启用这个会覆盖“S3 access key id”和“S3 secret access key” 设置。'
     s3_upload_bucket: "上传文件保存于 Amazon S3 的 bucket 名字。警告：必须为小写，无句点，无下划线。"
@@ -1025,6 +1061,8 @@ zh_CN:
     twitter_summary_large_image_url: "默认 Twitter summary 卡片的 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: "允许管理人员在私信中上传任何文件。"
+    strip_image_metadata: "剥离图像元数据。"
     enable_flash_video_onebox: "在 Onebox 启用嵌入 swf 和 flv 链接（Adobe Flash）。警告：可能增加安全风险。"
     default_invitee_trust_level: "受邀用户的缺省信任等级（0-4）。"
     default_trust_level: "所有新用户的缺省信任等级（0-4）。警告！改变此项将提高广告泛滥的风险。"
@@ -1057,6 +1095,7 @@ zh_CN:
     min_trust_to_edit_post: "能编辑帖子的最小信任等级。"
     min_trust_to_allow_self_wiki: "用户将自己的帖子设置为维基模式的最低信任等级。"
     min_trust_to_send_messages: "发送私信所需的最低信任等级。"
+    min_trust_to_send_email_messages: "通过 email 发送新私信（给暂存用户）所需的最低信任等级。"
     newuser_max_links: "一个访问者可以添加到一个帖子里的链接数量。"
     newuser_max_images: "一个访问者可以加入到一个帖子里的图片数量。"
     newuser_max_attachments: "一个新用户可以添加到一个帖子里的附件数量。"
@@ -1064,6 +1103,7 @@ zh_CN:
     newuser_max_replies_per_topic: "直至有人回复他们前，新用户在一个帖子里的最大回复数量。"
     max_mentions_per_post: "你可以在一个帖子里使用 @name 提及的最大数量。"
     max_users_notified_per_group_mention: "当群组被提及时，接受提醒的最大用户数 ( 超过阈值后将不发送提醒 )"
+    enable_mentions: "允许用户提及其他用户。"
     create_thumbnails: "为太大而无法恰当地显示在帖子里的图片创建 lightbox 缩略图。"
     email_time_window_mins: "等待多少（n）分钟才给用户发送通知电子邮件，好让他们有机会自己来编辑和完善他们的帖子。"
     private_email_time_window_seconds: "等待多少（n）秒再给用户发送通知电子邮件，这可以让用户有时间来编辑和完善他们的私信。"
@@ -1116,9 +1156,10 @@ zh_CN:
     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: "大小写不相关的正则表达式，如果匹配成功，会导致该用户不能发表第一帖，而是进入审核队列。例如：求下载|谢谢楼[主猪]，会阻止包含求下载、谢谢楼主或谢谢楼猪的帖子。该选项只适用于首贴。"
+    auto_silence_fast_typers_on_first_post: "自动禁言未达到 min_first_post_typing_time 的用户"
+    auto_silence_fast_typers_max_trust_level: "自动禁言输入快速的用户的适用信任等级"
+    auto_silence_first_post_regex: "检查用户首贴的大小写不相关的正则表达式。如匹配，用户将被禁言并送至审核队列。例子：raging|a[bc]a 将匹配 raging、aba 或者 aca，因此禁言该用户。只对首贴有效。"
+    flags_default_topics: "在管理栏目中默认显示被标记的主题"
     reply_by_email_enabled: "启用通过邮件回复。"
     reply_by_email_address: "通过邮件回复的回复地址模板，例如：%{reply_key}@reply.example.com 或 replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "通过邮件回复的回复地址模板，例如：%{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
@@ -1157,15 +1198,15 @@ zh_CN:
     pop3_polling_username: "轮询 POP3 账户所用的用户名。"
     pop3_polling_password: "轮询 POP3 账户所用的密码。"
     log_mail_processing_failures: "记录所有邮件失败处理日志至 http://yoursitename.com/logs"
-    email_in: "允许用户通过邮件发表新主题（需要 pop3 轮询）。在每一个分类的“设置”标签页配置地址。"
+    email_in: "允许用户通过邮件发表新主题（需要手动或 pop3 轮询）。在每一个分类的“设置”标签页配置地址。"
     email_in_min_trust: "能通过邮件发表新主题的最低用户信任等级。"
     email_prefix: "邮件主题中使用的 [标签]。留空将缺省使用 'title'。"
     email_site_title: "邮件发送人站点标题。如果没有设置，默认为“title”。如果标题包含了任何不允许的字符，使用这个设置。"
+    find_related_post_with_key: "只能使用 'reply key' 来查找已回复的帖子。警告：禁用此功能将允许用户基于电子邮件地址进行模拟。"
     minimum_topics_similar: "在编写新主题时，需要有多少相似主题存在？"
     relative_date_duration: "发表多少天内将显示相对时间（7天）而非绝对时间（2月20日）。"
     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: "允许用户上传自定义个人头像。"
@@ -1180,7 +1221,7 @@ zh_CN:
     suppress_digest_email_after_days: "停止给(n)天未登陆网站的用户发送摘要邮件。"
     digest_suppress_categories: "不在摘要邮件中显示这些分类的内容。"
     disable_digest_emails: "禁用所有用户摘要邮件功能。"
-    email_accent_bg_color: "HTML 邮件中某些元素的背景使用的强调颜色。输入色彩名（“red”）或十六进制值（“#FF0000”）。"
+    email_accent_bg_color: "HTML 邮件中用于背景的强调颜色。输入色彩名字（“red”）或十六进制值（“#0000FF”）。"
     email_accent_fg_color: "HTML 邮件中背景使用的字体颜色。输入色彩名（“white”）或十六进制值（“#FFFFFF”）。"
     email_link_color: "HTML 邮件中的链接颜色。输入色彩名字（“blue”）或十六进制值（“#0000FF”）。"
     detect_custom_avatars: "检测用户是否上传了自定义个人头像。"
@@ -1193,6 +1234,8 @@ zh_CN:
     anonymous_posting_min_trust_level: "启用匿名发帖所需的最小信任等级"
     anonymous_account_duration_minutes: "为了匿名性，为每个用户每 N 分钟创建一个匿名账户。例如：如果设置为 600，只要发帖后 600 分钟到了，并且用户切换至了匿名模式，就会创建一个新的匿名账户。"
     hide_user_profiles_from_public: "不对来访用户显示用户信息卡、用户资料和用户目录。"
+    show_inactive_accounts: "允许已登录用户查看不活跃账户。"
+    hide_suspension_reasons: "不在用户页面公开显示封禁原因。"
     user_website_domains_whitelist: "用户网站要属于这些域名中。用 | 分割。"
     allow_profile_backgrounds: "允许用户上传个人资料背景图片。"
     sequential_replies_threshold: "在被提醒回复了太多连续的回复前，用户在主题中可以连续回复的帖子的数量。"
@@ -1209,6 +1252,7 @@ zh_CN:
     topic_page_title_includes_category: "主题页面标题包含分类名。"
     native_app_install_banner: "邀請常客安裝 Discourse 本机应用程序"
     share_anonymized_statistics: "分享匿名使用数据。"
+    auto_handle_queued_age: "此设定天数后自动处理待审核的记录。标记将被忽略。队列中的帖子及用户将被拒绝。设为 0 将禁用此功能。"
     max_prints_per_hour_per_user: "/print 页面的每小时最大展示量（设置为 0 禁用）"
     full_name_required: "全名是用户个人信息的必填项。"
     enable_names: "在用户的个人信息、用户卡片和邮件中显示全名。禁用将在所有地方隐藏全名。"
@@ -1219,18 +1263,10 @@ zh_CN:
     warn_reviving_old_topic_age: "当有人开始回复最后一贴超过一定天数前的主题时，将有一个警告显示，不鼓励他们复活一个老的讨论。将其设置为 0 以禁用。"
     autohighlight_all_code: "即使未显式设定语言，仍为所有预编排代码块应用语法高亮。"
     highlighted_languages: "包含语法高亮规则。（警告：包含太多的语言可能影响性能）见：https://highlightjs.org/static/demo/ 查看演示"
-    feed_polling_enabled: "仅用于嵌入：是否将 RSS/ATOM 订阅为帖子。"
-    feed_polling_url: "仅用于嵌入：RSS/ATOM 订阅的 URL。"
-    feed_polling_frequency_mins: "只用于嵌入：轮询的频率"
-    embed_by_username: "创建嵌入主题的 Discourse 的用户名。"
-    embed_username_key_from_feed: "从流中获取 discourse 用户名的 Key。"
-    embed_title_scrubber: "抓取嵌入主题的正则表达式。"
     embed_truncate: "截断嵌入的帖子。"
     allowed_href_schemes: "除了 http 和 https 外允许的链接协议。"
     embed_post_limit: "嵌入帖子的最大数量。"
     embed_username_required: "创建主题需要用户名。"
-    embed_whitelist_selector: "在嵌入页面加入元素 CSS 选择器。"
-    embed_blacklist_selector: "在嵌入页面移除元素 CSS 选择器。"
     notify_about_flags_after: "如果有标记在设定的小时数后仍未被处理，那么发送邮件给管理人员。设为 0 禁用。"
     show_create_topics_notice: "如果站点只有少于 5 篇的公开帖子时，显示一条请管理员创建帖子的提示。"
     delete_drafts_older_than_n_days: 删除超过 n 天得草稿。
@@ -1247,6 +1283,8 @@ zh_CN:
     auto_close_messages_post_count: "私信中贴子数上限，达到后自动关闭私信（0 为禁用）"
     auto_close_topics_post_count: "主题中贴子数上限，达到后自动关闭主题 ( 0 为禁用 )"
     code_formatting_style: "编辑器中的代码格式化按钮设置的默认格式"
+    max_allowed_message_recipients: "私信允许的最大收件人数。"
+    watched_words_regular_expressions: "监视词是正则表达式。"
     default_email_digest_frequency: "用户收到摘要邮件的默认频率。"
     default_include_tl0_in_digests: "在摘要邮件中默认包含新用户帖子。用户可以自行在参数设置中更改这个设置。"
     default_email_private_messages: "默认在有人发私信给用户时发送一封邮件通知。"
@@ -1270,8 +1308,7 @@ zh_CN:
     default_categories_tracking: "分类列表默认追踪。"
     default_categories_muted: "分类列表默认不显示。"
     default_categories_watching_first_post: "默认监看这些分类中每个新主题的第一贴"
-    max_user_api_reqs_per_day: "用户API每日每密钥最高请求数"
-    max_user_api_reqs_per_minute: "用户API每密钥每分钟最高请求数"
+    retain_web_hook_events_period_days: "保存 web hook 事件记录的天数。"
     allow_user_api_keys: "允许生成用户API密钥"
     allow_user_api_key_scopes: "用户API授权范围列表"
     max_api_keys_per_user: "每用户最多持有的用户 API 数"
@@ -1317,12 +1354,17 @@ zh_CN:
       email_polling_disabled: "在启用邮件回复功能前，你必须启用手动或者 POP3 轮询。"
       user_locale_not_enabled: "你必须先设置 'allow user locale' 再启用该设置。"
       invalid_regex: "正则表达式非法或者不允许。"
+      email_editable_enabled: "你必须先禁用 'email editable' 再启用该设置。"
+      enable_sso_disabled: "你必须先启用 'enable sso' 再启用该设置。"
+      staged_users_disabled: "你必须先启用“暂存用户”再启用该设置。"
+      reply_by_email_disabled: "你必须先启用 '用 email 回复' 再启用该设置。"
   search:
     within_post: "#{{post_number}} 由 {{username}}"
     types:
       category: '分类'
       topic: '结果'
       user: '用户'
+    results_page: "关于“%{term}”的搜索结果"
   sso:
     login_error: "登录错误"
     not_found: "无法找到你的账户。请联系站点管理人员。"
@@ -1336,7 +1378,7 @@ zh_CN:
   most_recent_poster: "当前大部分帖子作者"
   frequent_poster: "频繁发帖者"
   redirected_to_top_reasons:
-    new_user: "欢迎来到我们的社区！这是我们最近的热门主题。"
+    new_user: "欢迎来到我们的社区！这些都是最近热门主题。"
     not_seen_in_a_month: "欢迎回来！我们已经好久没见到你了。这些是你不在时的最热门主题。"
   merge_posts:
     edit_reason:
@@ -1404,7 +1446,7 @@ zh_CN:
     not_allowed_from_ip_address: "你不能以 %{username} 身份从该 IP 地址登陆。"
     admin_not_allowed_from_ip_address: "你不能从该 IP 地址以管理员身份登录。"
     suspended: "你要等到 %{date} 之后才能登录。"
-    suspended_with_reason: "账号暂停至%{date}: %{reason}"
+    suspended_with_reason: "帐号暂停至%{date}: %{reason}"
     errors: "%{errors}"
     not_available: "不可用，试试%{suggestion}？"
     something_already_taken: "出了一些问题，可能此用户名或电子邮箱已经被注册。试试 忘记密码链接吧。"
@@ -1416,7 +1458,8 @@ zh_CN:
     email_too_long: "你输入的邮件太长了。邮箱名不得超过 254 字符，域名必须不超过 253 字符。"
     reserved_username: "该用户名不可被使用。"
     missing_user_field: "你还没有填写完所有用户字段"
-    close_window: "验证已经完成。关闭窗口以继续。"
+    auth_complete: "验证已经完成。"
+    click_to_continue: "点击这里继续。"
     already_logged_in: "喔，看起来你正尝试查看给另一个用户的邀请链接。如果你不是%{current_user}，请退出再重试。"
   user:
     no_accounts_associated: "无关联账户"
@@ -1428,7 +1471,7 @@ zh_CN:
     username:
       short: "必须超过 %{min} 个字"
       long: "必须不超过 %{max} 个字"
-      characters: "必须只包含字母、数字和下划线"
+      characters: "必须只包括数字、字母、连字号或下划线"
       unique: "已被使用"
       blank: "必须存在"
       must_begin_with_alphanumeric_or_underscore: "必须以字母、数字或下划线开头"
@@ -1444,6 +1487,11 @@ zh_CN:
       max_new_accounts_per_registration_ip: "不允许从你的 IP 地址注册新用户（达到上限）。联系一个管理人员。"
     website:
       domain_not_allowed: "网站无效。允许的域名有：%{domains}"
+    auto_rejected: "因时限被自动拒绝。查看站点自动处理队列时限设置。"
+    destroy_reasons:
+      unused_staged_user: "未使用的暂存用户"
+      fixed_primary_email: "为暂存用户固定主要邮箱"
+      same_ip_address: "同一IP地址(%{ip_address})如其他用户"
   flags_reminder:
     flags_were_submitted:
       other: "标志已经提交%{count}小时前。[请审核他们](/admin/flags)。"
@@ -1463,66 +1511,70 @@ zh_CN:
       如果你想要继续收到邮件更新，你可以忽略这封邮件。
   invite_mailer:
     title: "要求发件人"
-    subject_template: "%{invitee_name} 邀请你参与 %{site_domain_name} 主题 '%{topic_title}' "
+    subject_template: "%{inviter_name} 邀请您参与 '%{topic_title}' 于 %{site_domain_name}"
     text_body_template: |
-      %{invitee_name}邀请你参与讨论：
+      %{inviter_name} 邀请您参与讨论
 
       > **%{topic_title}**
       >
       > %{topic_excerpt}
 
-      社区：
+      于
 
       > %{site_title} -- %{site_description}
 
-      如果你有兴趣，点击下方的链接：
+      如果您感兴趣，点击以下链接:
 
       %{invite_link}
   custom_invite_mailer:
     title: "自定义邀请发件人"
-    subject_template: "%{invitee_name}邀请你'%{topic_title}'在%{site_domain_name}"
+    subject_template: "%{inviter_name} 邀请您加入 '%{topic_title}' 于 %{site_domain_name}"
     text_body_template: |
-      %{invitee_name}邀请你参与讨论：
+      %{inviter_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}"
+    subject_template: "%{inviter_name} 邀请您加入 %{site_domain_name}"
     text_body_template: |
-      %{invitee_name}邀请你加入
+      %{inviter_name} 邀请您加入
 
       > **%{site_title}**
       >
       > %{site_description}
 
-      如果你有兴趣，点击下方的链接：
+      如果您感兴趣，点击以下链接:
 
       %{invite_link}
   custom_invite_forum_mailer:
     title: "自定义论坛邀请发件人"
-    subject_template: "%{invitee_name}邀请你加入%{site_domain_name}"
+    subject_template: "%{inviter_name} 邀请您加入 %{site_domain_name}"
     text_body_template: |
-      %{invitee_name}邀请你加入
+      %{inviter_name} 邀请您加入
 
       > **%{site_title}**
       >
       > %{site_description}
 
-      并附留言：
+      留言为
 
       > %{user_custom_message}
 
-      如果你有兴趣，点击下方的链接：
+      如果您感兴趣，点击以下链接:
 
       %{invite_link}
   invite_password_instructions:
@@ -1539,11 +1591,11 @@ zh_CN:
     title: "下载备份邮件发件人"
     subject_template: "[%{email_prefix}] 站点备份下载"
     text_body_template: |
-      这是你需要的[站点备份下载](%{backup_file_path})。
+      这是你的[站点备份文件](%{backup_file_path})。
 
-      我们处于安全原因把下载链接发到你确认过的邮箱。
+      出于安全原因，我们把下载链接发送至你验证过的邮箱。
 
-      （如果你**没有**请求下载，你需要认真考虑了——有管理员请求下载）
+      （如果你**没有**请求下载，你需要思考一下了——某管理员请求了备份文件）
     no_token: |
       抱歉，这个备份下载链接已经被使用或已经过期。
   admin_confirmation_mailer:
@@ -1608,7 +1660,7 @@ zh_CN:
 
       - 浏览器访问**[一键更新工具](%{base_url}/admin/upgrade)**升级。
 
-      - 查看[GitHub 改动日志（英文）](https://github.com/discourse/discourse/commits/master)中更新的内容。
+      - 查看 [发行注记（英文）](https://meta.discourse.org/tags/release-notes) 或查看 [GitHub 改动日志](https://github.com/discourse/discourse/commits/master)中更新的内容。
 
       - 访问 [meta.discourse.org（英文）](https://meta.discourse.org) 获取 Discourse 的最新资讯、讨论和支持。也可访问 [meta.discoursecn.org 非官方的中文支持论坛](https://meta.discoursecn.org) 获得支持。
   new_version_mailer_with_notes:
@@ -1620,23 +1672,15 @@ zh_CN:
       你的版本：%{installed_version}
       新的版本：**%{new_version}**
 
-      - 查看[GitHub 改动日志（英文）](https://github.com/discourse/discourse/commits/master)中更新的内容。
-
       - 浏览器访问**[一键更新工具](%{base_url}/admin/upgrade)**升级。
 
-      - 访问 [meta.discourse.org（英文）](http://meta.discourse.org) 获取 Discourse 的最新资讯、讨论和支持。也可访问 [meta.discoursecn.org 非官方的中文支持论坛](http://meta.discoursecn.org) 获得支持。
+      - 查看 [发行注记（英文）](https://meta.discourse.org/tags/release-notes) 或查看 [GitHub 改动日志](https://github.com/discourse/discourse/commits/master)中更新的内容。
+
+      - 访问 [meta.discourse.org（英文）](https://meta.discourse.org) 获取 Discourse 的最新资讯、讨论和支持。也可访问 [meta.discoursecn.org 非官方的中文支持论坛](https://meta.discoursecn.org) 获得支持。
 
       ### 发行注记
 
       %{notes}
-  queued_posts_reminder:
-    title: "有帖子在队列中提醒"
-    subject_template:
-      other: "[%{email_prefix}] %{count} 个帖子需要审核"
-    text_body_template: |
-      你好，
-
-      新用户的帖子等待被编辑或审核。[审核通过或者拒绝](%{base_url}/queued-posts)。
   flag_reasons:
     off_topic: "你的帖子被标记为 **偏离主题**：鉴于当前的主题标题和第一个帖子，社区成员们感觉它不适合处于这个主题中。"
     inappropriate: "你的帖子被标记为 **不恰当**：社区成员感觉它有冒犯或者侮辱的意味，亦或是它违反了[社区准则](/guidelines)。"
@@ -1656,22 +1700,11 @@ zh_CN:
     post_hidden:
       title: "帖子隐藏"
       subject_template: "帖子因社区标记隐藏"
-      text_body_template: |
-        你好，
-
-        这是%{site_name}自动发出的邮件，通知你的帖子已被隐藏。
-
-        %{base_url}%{url}
-
-        %{flag_reason}
-
-        你的帖子是因为被多个社区成员标记才被隐藏的，所以请考虑根据他们的反馈修改你的帖子。**你可以在 %{edit_delay} 分钟后开始编辑你的帖子，然后它将重新被显示。**
-
-        然而，如果帖子再次被社区成员标记并隐藏，它将被隐藏至版主处理后——并且可能导致进一步的措施，如封禁帐号。
-
-        想了解更多，请查看我们的[社区指引](%{base_url}/guidelines)。
     usage_tips:
-      text_body_template: "要查看给新用户的简要技巧，[（英文）看看这篇博客文章](http://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)。\n\n只要你不断参与，我们将更了解你，并且新用户的临时限制将被移除。\b一段时间后你将获得[信任等级](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924)，这将提供一些特殊功能来帮助我们更好地管理社群。\n"
+      text_body_template: |
+        要查看给新用户的简要技巧，[（英文）看看这篇博客文章](http://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/)。
+
+        只要你不断参与，我们将更了解你，并且新用户的临时限制将被移除。一段时间后你将获得[信任等级](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924)，这将提供一些特殊功能来帮助我们更好地管理社群。
     welcome_user:
       title: "欢迎用户"
       subject_template: "欢迎来到 %{site_name}！"
@@ -1689,7 +1722,7 @@ zh_CN:
       text_body_template: |
         感谢你接受邀请加入%{site_name} —— 欢迎！
 
-        - 我们为你创建了账号**%{username}**。访问[你的用户设置][prefs]修改名字或密码。
+        - 我们为你创建了帐号**%{username}**。访问[你的用户设置][prefs]修改名字或密码。
 
         - 你登录的时候，请**使用收到邀请的邮箱地址**登录——否则我们就无法分辨是不是你本人！
 
@@ -1775,56 +1808,63 @@ zh_CN:
     csv_export_failed:
       title: "导致CSV失败"
       subject_template: "数据导出失败"
-      text_body_template: "我们很抱歉，但是你的数据导出请求失败了。请检查日志或联系一位管理人员。"
+      text_body_template: "我们很抱歉，但是你的数据导出请求失败了。请检查日志或[联系管理人员](%{base_url}/about)。"
     email_reject_insufficient_trust_level:
       title: "拒收邮件 信任等级不足"
       subject_template: "[%{email_prefix}] 邮件问题 -- 信任等级不足"
       text_body_template: |
         我们很抱歉，但是你发送至%{destination}（名为 %{former_title}）的邮件出问题了。
 
-        你的账户没有足够的信任等级以该邮件地址发布新主题。如果你有异议，联系管理人员。
+        你的账户没有足够的信任等级以该邮件地址发布新主题。如果你有异议，[联系管理人员](%{base_url}/about)。
     email_reject_user_not_found:
       title: "Email被拒绝：用户未找到"
       subject_template: "[%{email_prefix}] 邮件问题 -- 未找到用户"
       text_body_template: |
         我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。
 
-        你发送回复的邮件地址是未知的邮件地址。试试从另外一个邮件地址发送，或者联系管理人员。
+        你发送回复的邮件地址是未知的邮件地址。试试从另外一个邮件地址发送，或者[联系管理人员](%{base_url}/about)。
     email_reject_screened_email:
       title: "Email被拒绝：被屏蔽的Email地址"
       subject_template: "[%{email_prefix}] 邮件问题 -- 被封禁的邮件地址"
       text_body_template: |
         我们非常抱歉，但是你发送至%{destination}（名为%{former_title}）的邮件出问题了。
 
-        你发送回复的邮件地址是已被封禁的邮件地址。试试从另外一个邮件地址发送，或者联系管理人员。
+        你发送回复的邮件地址是已被封禁的邮件地址。试试从另外一个邮件地址发送，或者[联系管理人员](%{base_url}/about)。
+    email_reject_not_allowed_email:
+      title: "邮件被拒绝：不被允许的邮件地址"
+      subject_template: "[%{email_prefix}] 邮件问题 -- 被封禁的邮件地址"
+      text_body_template: |
+        我们非常抱歉，但是你发送至%{destination}（名为%{former_title}）的邮件出问题了。
+
+        你发送回复的邮件地址是已被封禁的邮件地址。试试从另外一个邮件地址发送，或者[联系管理人员](%{base_url}/about)。
     email_reject_inactive_user:
       title: "Email被拒绝：未激活的用户"
       subject_template: "[%{email_prefix}] 邮件问题 -- 未激活用户"
       text_body_template: |
         我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。
 
-        与你账户关联的邮件地址没有激活，请先激活你的账号再发送邮件。
-    email_reject_blocked_user:
-      title: "Email被拒绝：被禁用的用户"
-      subject_template: "[%{email_prefix}] 邮件问题 -- 被封禁的用户"
+        与你账户关联的邮件地址没有激活，请先激活你的帐号再发送邮件。
+    email_reject_silenced_user:
+      title: "Email被拒绝：被禁言的用户"
+      subject_template: "[%{email_prefix}] 邮件问题 -- 被禁言的用户"
       text_body_template: |
         我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。
 
-        与你账户关联的邮件地址已经被封禁。
+        与你账户关联的邮件地址已经被禁言。
     email_reject_reply_user_not_matching:
       title: "Email被拒绝：用户未找到"
       subject_template: "[%{email_prefix}] 邮件问题 -- 未预期的回复地址"
       text_body_template: |
         我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。
 
-        你发送回复的邮件地址与我们等待的地址不同，所以我们不确定你是不是同一个人。试试从另外一个邮件地址发送，或者联系管理人员。
+        你发送回复的邮件地址与我们预期的地址不同，所以我们不确定你是不是同一个人。试试从另外一个邮件地址发送，或者[联系管理人员](%{base_url}/about)。
     email_reject_no_account:
       title: "Email被拒绝：帐户不存在"
       subject_template: "[%{email_prefix}] 邮件问题 -- 位置账户"
       text_body_template: |
         我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。
 
-        我们找不到匹配你邮件地址的账号。试试从另外一个邮件地址发送，或者联系管理人员。
+        我们找不到匹配你邮件地址的账号。试试从另外一个邮件地址发送，或者[联系管理人员](%{base_url}/about)。
     email_reject_empty:
       title: "Email被拒绝：空"
       subject_template: "[%{email_prefix}] 邮件问题 -- 无内容"
@@ -1847,14 +1887,15 @@ zh_CN:
       text_body_template: |
         我们很抱歉，但是你发送至%{destination}（名为 %{former_title}）的邮件出问题了。
 
-        你的账户没有达到足够的信任等级在该分类发布新主题。如果你有异议，联系管理人员。
+        你的账户没有达到足够的信任等级在该分类发布新主题。如果你有异议，[联系管理人员](%{base_url}/about)。
     email_reject_strangers_not_allowed:
       title: "Email被拒绝：不允许陌生人"
       subject_template: "[%{email_prefix}] 邮件问题 -- 无效访问"
       text_body_template: |+
         我们非常抱歉，但是你发送至%{destination}（名为%{former_title}）的邮件出问题了。
 
-        邮件发至的分类只接受来自合法帐户且邮件地址已确认的用户的有邮件。如果你有异议，联系管理人员。
+        邮件发至的分类只接受来自合法帐户且邮件地址已确认的用户的有邮件。如果你有异议，[联系管理人员](%{base_url}/about)。
+
     email_reject_invalid_post:
       title: "邮件拒绝无效主题"
       subject_template: "[%{email_prefix}] 邮件问题 -- 发表错误"
@@ -1886,35 +1927,42 @@ zh_CN:
       text_body_template: |
         我们非常抱歉，但是你发送至%{destination}（名为%{former_title}）的邮件出问题了。
 
-        邮件中的回复信令是无效或者未知的，所以我们不知道这封邮件回复给谁了。请联系管理人员。
+        邮件中的回复信令是无效或者未知的，所以我们不知道这封邮件回复给谁了。请[联系管理人员](%{base_url}/about)。
     email_reject_bad_destination_address:
       title: "Email被拒绝：收件人地址不正确"
       subject_template: "[%{email_prefix}] 邮件问题 -- 未知的发至：地址"
       text_body_template: |
-        我们非常抱歉，但是你发送至%{destination}（名为%{former_title}） 邮件出问题了。
+        我们很抱歉，但是你发送至 %{destination}（名为 %{former_title}）的邮件消息无法发送。
 
-        目标邮件地址无法识别。请确保你在向管理人员提供的邮件地址发信。
+        无法识别目标邮件地址，或是邮件的 Message-ID 头已被修改。请确认在你正在将邮件发送至工作人员提供的正确的地址中。
     email_reject_topic_not_found:
       title: "Email被拒绝：主题不存"
       subject_template: "[%{email_prefix}] 邮件问题 -- 主题未找到"
       text_body_template: |
         我们很抱歉，但是你发送至%{destination}（名为 %{former_title}）的邮件出问题了。
 
-        你回复的主题不存在——可能已经被删除了？如果你有异议，联系管理人员。
+        你回复的主题不存在——可能已经被删除了？如果你有异议，[联系管理人员](%{base_url}/about)。
     email_reject_topic_closed:
       title: "Email被拒绝：主题已关闭"
       subject_template: "[%{email_prefix}] 邮件问题 -- 主题已关闭"
       text_body_template: |
         我们很抱歉，但是你发送至 %{destination} ( 名为 %{former_title} )的邮件出问题了。
 
-        你回复的主题已经被关闭，不允许回复。如果你有异议，联系管理人员。
+        你回复的主题已经被关闭，不允许回复。如果你有异议，[联系管理人员](%{base_url}/about)。
     email_reject_auto_generated:
       title: "邮件拒绝自动生成"
       subject_template: "[%{email_prefix}] 邮件问题 -- 自动生成的回复"
       text_body_template: |
         我们很抱歉，但是你发送至%{destination}（名为 %{former_title}）的邮件出问题了。
 
-        系统觉得你的邮件是“自动生成”的，即电脑生成了该邮件而不是由你输入的；我们不能接受这样的邮件。如果你有异议，联系管理人员。
+        系统觉得你的邮件是“自动生成”的，即电脑生成了该邮件而不是由你输入的；我们不能接受这样的邮件。如果你有异议，[联系管理人员](%{base_url}/about)。
+    email_reject_unrecognized_error:
+      title: "Email被拒绝：无法识别的错误"
+      subject_template: "[%{email_prefix}] 邮件问题 -- 无法识别的错误"
+      text_body_template: |
+        我们非常抱歉，但是你发送至%{destination}（名为%{former_title}）的邮件出问题了。
+
+        在处理您的电子邮件时出现无法识别的错误，它并未发布。你可以再试一次，或者[联系管理人员](%{base_url}/about)。
     email_error_notification:
       title: "邮件错误提醒"
       subject_template: "[%{email_prefix}] 电子邮件错误 -- POP 验证错误"
@@ -1930,7 +1978,9 @@ zh_CN:
       text_body_template: |
         你好，
 
-        这是%{site_name}自动发出的邮件。你的帖子因社区标记而被临时隐藏。
+        这是%{site_name}自动发出的邮件。你的帖子因社区标记而被临时隐藏
+
+        。
 
         出于谨慎的考虑，在管理人员审核通过前，你的新账户不能再发表新的回复或者主题。我们对此带来的不便表示歉意。
 
@@ -1941,14 +1991,14 @@ zh_CN:
       text_body_template: |
         你好，
 
-        这是%{site_name}自动发出的邮件。你的帐户因大量社区标记而被暂停使用。
+        这是%{site_name}自动发出的邮件。你的帖子因社区标记而被临时禁用。
 
         出于谨慎的考虑，在管理人员审核通过前，你的新账户不能再发表新的回复或者主题。我们对此带来的不便表示歉意。
 
         要查看更多指引，请参考我们的[社区指引](%{base_url}/guidelines)。
-    blocked_by_staff:
-      title: "已被管理人员封禁"
-      subject_template: "账户被暂时封禁"
+    silenced_by_staff:
+      title: "被管理人员禁言"
+      subject_template: "账户临时被禁用"
       text_body_template: |
         你好，
 
@@ -1957,31 +2007,31 @@ zh_CN:
         请继续浏览，但在管理人员审核通过前，你的账户不能再发表新的回复或者主题。我们对此带来的不便表示歉意。
 
         要查看更多指引，请参考我们的[社区指引](%{base_url}/guidelines)。
-    user_automatically_blocked:
-      title: "用户被自动封禁"
-      subject_template: "新用户%{username}因社区标记而被封禁"
+    user_automatically_silenced:
+      title: "用户自动被禁用"
+      subject_template: "新用户%{username}因社区标记被封禁"
       text_body_template: |
         这是自动发出的邮件。
 
-        因多位用户标记%{username}的帖子，新用户[%{username}](%{base_url}%{user_url})已被自动封禁。
+        因多位用户标记%{username}的帖子，新用户[%{username}](%{user_url})已被自动禁言。
 
-        请[查看这些标记](%{base_url}/admin/flags)。如果%{username}被意外禁用了编辑功能，点击[该用户管理页面](%{base_url}%{user_url})内的解封按钮。
+        请[查看这些标记](%{base_url}/admin/flags)。如果%{username}被意外禁言，点击[该用户管理页面](%{user_url})内的解除禁言按钮。
 
-        该阈值可以通过站点设置中的 `block_new_user` 更改。
+        该阈值可以通过站点设置中的 `silence_new_user` 更改。
     spam_post_blocked:
       title: "垃圾帖子被封锁"
       subject_template: "新用户 %{username} 因重复发布链接而被禁止发表相关帖子"
       text_body_template: |
-        这是自动发出的邮件。
+        这是自动发出的消息。
 
         新用户[%{username}](%{base_url}%{user_url})试图创建多个链接至 %{domains} 的帖子，但这些帖子因为反垃圾策略而被阻挡了。用户仍能够发表不包含到 %{domains} 的帖子。
 
-        请[审核该用户](%{base_url}%{user_url})。
+        请[审核该用户](%{user_url})。
 
         该阈值可以通过站点设置中的 `newuser_spam_host_threshold` 和 `white_listed_spam_host_domains` 更改。
-    unblocked:
-      title: "解锁"
-      subject_template: "账户已解除封禁"
+    unsilenced:
+      title: "解除禁言"
+      subject_template: "账户不再被挂起"
       text_body_template: |
         你好，
 
@@ -2011,11 +2061,19 @@ zh_CN:
       title: "你是这个月的最佳新用户！"
       subject_template: "你是这个月的最佳新用户！"
       text_body_template: |
-        恭喜，你获得了**%{month_year}月最佳新用户**。 :trophy:
+        恭喜，你是**%{month_year}月最佳新用户**。 :trophy:
 
-        该奖项每月只授予给两位新用户，并且你永远都可以在[你的用户页](/my/badges)找到。
+        该奖项每月只授予给两位新用户，并且你永远都可以在[你的用户页](%{base_url}/my/badges)找到。
 
-        你迅速成为了我们社区中的一员。感谢你参与，未来继续努力！
+        你迅速成为了我们社区中的宝贵一员。感谢你的参与，未来继续努力！
+    queued_posts_reminder:
+      title: "待处理帖子提醒"
+      subject_template:
+        other: "%{count} 个帖子等待审核"
+      text_body_template: |
+        你好，
+
+        新用户的帖子因规则被暂存正等待审核。[在此审核通过或者拒绝](%{base_url}/queued-posts)。
   unsubscribe_link: |
     要退订这些邮件，[点击这里](%{unsubscribe_url})。
   unsubscribe_link_and_mail: |
@@ -2040,6 +2098,16 @@ zh_CN:
     visit_link_to_respond: "[访问主题](%{base_url}%{url})以回复."
     visit_link_to_respond_pm: "[访问私信](%{base_url}%{url})以回复."
     posted_by: "%{username}发表于%{post_date}"
+    invited_group_to_private_message_body: |
+      %{username} 邀请 @%{group_name} 至私信交流：
+
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+
+      论坛：
+
+      > %{site_title} -- %{site_description}
     invited_to_private_message_body: |
       %{username} 邀请你至私信交流：
 
@@ -2060,6 +2128,15 @@ zh_CN:
       论坛：
 
       > %{site_title} -- %{site_description}
+    user_invited_to_private_message_pm_group:
+      title: "用户邀请小组至私信"
+      subject_template: "[%{email_prefix}] %{username}邀请 @%{group_name} 加入消息交流：“%{topic_title}”"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
     user_invited_to_private_message_pm:
       title: "邀请用户至私信"
       subject_template: "[%{email_prefix}] %{username}邀请你至私信“%{topic_title}”"
@@ -2192,6 +2269,35 @@ zh_CN:
       text_body_template: |2
 
         %{message}
+    account_suspended:
+      title: "账户被禁用"
+      subject_template: "[%{email_prefix}] 你的账户已经被禁用"
+      text_body_template: |
+        你的账户已经被禁用至%{suspended_till}。
+
+        %{reason}
+
+        %{message}
+    account_silenced:
+      title: "账号被禁言"
+      subject_template: "[%{email_prefix}] 你的账号已被禁言"
+      text_body_template: |
+        你的账号已经被禁言至%{silenced_till}。
+
+        %{reason}
+
+        %{message}
+    account_exists:
+      title: "账户已经存在"
+      subject_template: "[%{email_prefix}] 账户已经存在"
+      text_body_template: |
+        你刚试着在%{site_name}创建账户或者试着将账户的邮箱改为%{email}。然而，%{email}已经绑定于另一账户了。
+
+        如果你忘记了密码，[立即重置](%{base_url}/password-reset)。
+
+        如果你没有试着用%{email}创建账户或者更改邮件，不要担心——你可以安全地忽略这封邮件。
+
+        如果你有任何问题，[联系我们友善的工作人员](%{base_url}/about)。
     digest:
       why: "在你上次于%{last_seen_at}访问后，%{site_link}的新内容摘要。"
       since_last_visit: "自从你上次访问"
@@ -2207,7 +2313,8 @@ zh_CN:
       popular_posts: "流行帖子"
       more_new: "你关注的新帖"
       subject_template: "[%{email_prefix}] 摘要"
-      unsubscribe: "这是封来自%{site_link}的摘要邮件，因为你长时间没有访问而发送。%{unsubscribe_link}取消订阅。"
+      unsubscribe: "这是来自%{site_link}的摘要邮件，因为你长时间没有访问站点而发送。修改你的邮件设置%{email_preferences_link}，或%{unsubscribe_link}取消订阅。"
+      your_email_settings: "你的邮件设置"
       click_here: "点击此处"
       from: "%{site_name}的摘要"
       preheader: "在你上次于%{last_seen_at}访问后的新内容摘要"
@@ -2215,12 +2322,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}] 设置密码"
@@ -2235,11 +2342,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: "帐号已创建"
@@ -2309,9 +2416,12 @@ zh_CN:
     see_more: "更多"
     search_title: "搜索该网页"
     search_google: "Google"
+  offline:
+    title: "无法载入应用"
+    offline_page_message: "看起来你掉线了！请检查网络连接并重试。"
   login_required:
     welcome_message: |
-      #[欢迎来到 %{title}](#welcome)
+      ##[欢迎来到 %{title}](#welcome)
       你需要一个账号。请创建一个账号或者登录以继续。
   terms_of_service:
     title: "服务条款"
@@ -2331,6 +2441,8 @@ zh_CN:
       too_large: "抱歉，你试图上传的图片太大了（最大限制为%{max_size_kb}%KB），请裁剪它并重试。"
       larger_than_x_megapixels: "对不起，你上传的图片太大(最大支持%{max_image_megapixels}像素)，请缩小图片然后再试一次。"
       size_not_found: "抱歉，我们无法获取图片大小，请检查你的图片是否已损坏。"
+    placeholders:
+      too_large: "(图片大小超过%{max_size_kb}KB)"
   avatar:
     missing: "抱歉，我们没法找到与你邮件地址关联的头像。你能再上传一次试试吗？"
   flag_reason:
@@ -2724,9 +2836,9 @@ zh_CN:
         该徽章授予给帖子收到了第一个赞的成员。恭喜，有社区成员发现你发表的内容有意思、酷炫或者有用！
     autobiographer:
       name: 自传作者
-      description: 已填写用户<a href="/my/preferences">资料</a>信息
+      description: 填写<a href="%{base_uri}/my/preferences/profile">用户资料</a>信息
       long_description: |
-        该徽章授予给填写了<a href="/my/preferences">用户页面</a>并选择了用户头像的你。让社区成员们多了解你一点以及你感兴趣的内容，能帮助我们打造一个更好、更团结的社区。让我们一起努力！
+        该徽章授予给填写了<a href="%{base_uri}/my/preferences/profile">用户资料页</a>并设置了用户头像的你。让社群成员们多了解你一点以及你感兴趣的内容，能帮助我们打造一个更好、更团结的社群。让我们一起努力！
     anniversary:
       name: 年度纪念日
       description: 一年活跃用户，至少发了一个帖子
@@ -2821,9 +2933,9 @@ zh_CN:
         该徽章授予给第一次在回复中引用帖子的你。在你的回复中引用之前帖子中的相关的段落将把主题关联在一起并切题。只要选中别的帖子中的任何文字，然后点击回复按钮将可以引用啦。多引用一些吧！
     read_guidelines:
       name: 阅读指引
-      description: 阅读<a href="/guidelines">社区指引</a>
+      description: 阅读<a href="%{base_uri}/guidelines">社群指引</a>
       long_description: |
-        该徽章授予给<a href="/guidelines">阅读了社区指引</a>的你。遵守和分享简单的指引能让我们打造一个稳定、有趣和可持续的社区。永远记住别人，一个和你有很多共同点的人，就在屏幕的那一侧。友好一些！
+        该徽章授予给<a href="%{base_uri}/guidelines">阅读了社群指引</a>的你。遵守和分享简单的指引能让我们打造一个稳定、有趣和可持续的社群。永远记住别人，一个和你有很多共同点的人，就在屏幕的那一侧。友好一些！
     reader:
       name: 读者
       description: 阅读了有至少 100 个回复的主题中的所有回复
@@ -2865,7 +2977,7 @@ zh_CN:
       long_description: |
         该徽章授予给一天内赞了 50 次的你。别忘记休息一下。赞你喜欢的帖子能鼓励成员不断改进讨论的内容。
     higher_love:
-      name: "激情\b"
+      name: 激情
       description: 5 天都赞过 50 次
       long_description: |
         该徽章授予给 5 天赞过 50 次的你。感谢你每天都花点时间鼓励讨论的进行！
@@ -2912,6 +3024,18 @@ zh_CN:
       description: 第一个月做出杰出贡献
       long_description: |
         该徽章授予给每个月中做出杰出贡献的两位新用户。这是根据你收到的赞和谁赞了你决定的。
+    enthusiast:
+      name: 十全十美
+      description: 连续 10 天访问
+      long_description: 连续 10 天访问论坛会被授予该勋章。感谢与我们共度超过一周的时光！
+    aficionado:
+      name: 百尺竿头
+      description: 连续 100 天访问
+      long_description: 连续 100 天访问论坛会被授予该勋章。这可是超过三个月的时间！
+    devotee:
+      name: 全年不落
+      description: 连续 365 天访问
+      long_description: 连续365 天访问论坛会被授予该勋章。哇哦，一整年了！
     badge_title_metadata: "%{site_title}的%{display_name}徽章"
   admin_login:
     success: "邮件已发送"
@@ -2946,6 +3070,7 @@ zh_CN:
     only_official: "禁用非官方插件"
     no_plugins: "禁用所以插件"
     enter: "进入安全模式"
+    must_select: "你必须选择至少一个选项以进入安全模式。"
   wizard:
     title: "Discourse 安装"
     step:
@@ -2996,7 +3121,7 @@ zh_CN:
             description: "你或者你的组织平时用于联络的网页。将被显示在<a href='/about' target='_blank'>关于页面</a>中。"
           site_contact:
             label: "自动私信"
-            description: "所有 Discourse 自动发送的私信将以该用户的名义发送，比如发给每个用户的欢迎消息。"
+            description: "所有 Discourse 自动发送的私信将以该用户的名义发送，比如标志警告和备份完成通知。"
       corporate:
         title: "组织"
         description: "这些名字将显示于<a href='/privacy' target='blank'>隐私策略</a>和<a href='/tos' target='blank'>服务条款</a>中，你可以随时在工作人员分类中编辑他们。如果你没有公司，现在你可以跳过这个步骤。"
@@ -3053,7 +3178,7 @@ zh_CN:
         description: "你想使用哪种样式的表情符号？你可以以后在\"管理员/定制/表情符号（Emoji）\"界面增加更多定制的表情符号。"
       invites:
         title: "邀请管理人员"
-        description: "你快做完啦！让我们邀请一些工作人员来帮助你<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>创建一些讨论主题</a>以方便你发布社区。"
+        description: "你快做完啦！让我们邀请一些工作人员来帮助你创建一些有趣的主题和回复来<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>启动你的讨论</a>以开始社区之旅。"
       finished:
         title: "你的 Discourse 已经准备就绪！"
         description: |
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index a795d5ead4..1f838e50f3 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -36,7 +36,7 @@ zh_TW:
   emails:
     incoming:
       default_subject: "無標題的討論話題"
-      show_trimmed_content: "顯示刪減後的內容"
+      show_trimmed_content: "顯示截短後的內容"
       maximum_staged_user_per_email_reached: "以達成分期使用者能創造的最大數量信件"
       errors:
         empty_email_error: "當我們收到的原生郵件空白時發生。"
@@ -44,7 +44,6 @@ zh_TW:
         auto_generated_email_error: "郵件頭部的“precedence”為：list、junk、bulk 或 auto_reply，或者頭部包含了：auto-submitted、auto-replied 或 auto-generated。"
         no_body_detected_error: "無法解析正文並且沒有附件。"
         inactive_user_error: "當寄件者處於非啟動狀態時發生。"
-        blocked_user_error: "當寄件者已被封鎖時發生。"
         bad_destination_address: "發至/抄送/密送欄中的所有郵件都不匹配進站郵件地址。"
         strangers_not_allowed_error: "當用戶試圖在尚未晉身為成員之一的分類中新建討論話題時發生。"
         insufficient_trust_level_error: "用戶嘗試在用戶等級不滿足分類要求時發帖。"
@@ -106,6 +105,7 @@ zh_TW:
       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: "上傳檔案有錯誤，請再試一次。"
@@ -142,19 +142,20 @@ zh_TW:
       other: "%{count} 個回覆"
   no_mentions_allowed: "抱歉，您無法提及其他用戶。"
   too_many_mentions:
-    other: "抱歉，您的貼文中只能提及 %{count} 位用戶。"
+    other: "抱歉，您的文章中只能提及 %{count} 位用戶。"
   no_mentions_allowed_newuser: "抱歉，新用戶不能提及其他用戶。"
   too_many_mentions_newuser:
-    other: "抱歉，新用戶只能在貼文中提及 %{count} 位用戶。"
+    other: "抱歉，新使用者在文章中只能提及 %{count} 位用戶。"
   no_images_allowed: "抱歉，新用戶不能在貼文中放置圖片。"
   too_many_images:
-    other: "抱歉，新者用者只能在貼文中放置 %{count} 張圖片。"
+    other: "抱歉，新使用者只能在文章中放置 %{count} 張圖片。"
   no_attachments_allowed: "抱歉，新用戶不能在貼文中放置附件。"
   too_many_attachments:
-    other: "抱歉，新用戶只能在貼文中放置 %{count} 個附件。"
+    other: "抱歉，新使用者只能在文章中放置 %{count} 個附件。"
   no_links_allowed: "抱歉，新用戶不能在貼文中放置連結。"
   too_many_links:
-    other: "抱歉，新用戶只能在貼文中放置 %{count} 個連結。"
+    other: "抱歉，新使用者只能在文章中放置 %{count} 個連結。"
+  contains_blocked_words: "你的文章包含禁用的字詞"
   spamming_host: "抱歉，你不能張貼該網站之連結。"
   user_is_suspended: "被停權的用戶無法張貼文章。"
   topic_not_found: "出現問題。也許這個話題被關閉或刪除。"
@@ -178,13 +179,14 @@ zh_TW:
     latest: "最新討論話題"
     hot: "熱門討論話題"
     top: "熱門討論話題"
+    top_weekly: "每週最佳話題"
     posts: " 最近文章"
     private_posts: "最新的私人訊息"
     group_posts: "%{group_name} 的最新貼文"
     group_mentions: "%{group_name} 的最近提及"
     user_posts: "@%{username} 的最新貼文"
     user_topics: "@%{username} 的的最新討論話題"
-    tag: "主題標籤"
+    tag: "已標籤話題"
   too_late_to_edit: "這文章建立很久了，它已經無法被編輯或刪除"
   revert_version_same: "您試圖回復的版本和當前版本相同。"
   excerpt_image: "圖片"
@@ -254,12 +256,20 @@ zh_TW:
       這篇主題真的對你很重要 &ndash; 你在這個討論中已回覆多於 %{percent}% 的回應。
 
       你有沒有提供其他人充足的時間，以便表達意見呢？
+    get_a_room: |
+      ### 考慮回應更多參與者
+
+      你已經在這個特定主題中，回應了 @%{reply_username} %{count} 次。
+
+      你有考慮回應討論中的 *其他人* 嗎？一個好的討論，需要納入更多人的觀點與意見。
+
+      如果你還是想要與他繼續討論，請考慮透過[個人訊息](/u/%{reply_username})來進行。
     too_many_replies: |
-      ### 你發表的回應數量已經達到主題的回覆上限
+      ### 你的回應數量已經達到本主題的回覆上限
 
-      非常抱歉，新用戶有臨時限制，只能回覆同一主題 %{newuser_max_replies_per_topic} 次。
+      非常抱歉，新使用者有只能回覆同一話題 %{newuser_max_replies_per_topic} 次的臨時限制。
 
-      除了繼續回覆外，可以考慮修改你先前的回應，或參與其他主題。
+      除了繼續回覆外，請考慮修改你先前的回應，或參與其他話題。
     reviving_old_topic: |
       ### 討論串考古？
 
@@ -283,7 +293,7 @@ zh_TW:
           attributes:
             base:
               warning_requires_pm: "你只能附加警告於私人訊息。"
-              too_many_users: "你只能同時傳送警告給一位用戶。"
+              too_many_users: "你只能同時傳送警告給一位使用者。"
               cant_send_pm: "抱歉，你不能向該用戶發送私人訊息。"
               no_user_selected: "你必須選擇有效用戶。"
             featured_link:
@@ -307,8 +317,13 @@ zh_TW:
           attributes:
             payload_url:
               invalid: "URL 不合法。URL 應包括 http:// 或 https://。並且其中沒有空格。"
+        custom_emoji:
+          attributes:
+            name:
+              taken: 已被其他表情符號使用
       <<: *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 的用戶討論的分類"
@@ -317,7 +332,7 @@ 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`。"
+  assets_topic_body: "這個主題僅限管理人員可見，用來儲存討論區使用的圖片和檔案。請不要刪除它！\n\n如何使用：\n\n\n1. 回覆這個主題。\n2. 上傳你想要用作網站圖示、favicon 與其他所有圖片。（使用文章編輯器內的上傳按鈕，或者拖曳或貼上圖片。）\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
@@ -401,6 +416,7 @@ zh_TW:
       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}之後再試。"
@@ -485,13 +501,17 @@ zh_TW:
     welcome_to: "歡迎來到%{site_name}！"
     approval_required: "你的論壇帳號需要由板主手動審核後才可使用。當你的帳號獲得批准，你將收到電子郵件通知。"
     missing_session: "無法確認你是否註冊了帳戶，請確定你已經啟用了 cookie。"
+    activated: "抱歉，這個帳號已被啟用。"
   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}"
@@ -546,22 +566,21 @@ zh_TW:
       email_title: '此討論話題 "%{title}" 需要板主注意'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: '<p>你的帖子被社群成員標記了。請<a href="/my/messages">查看你的消息</a>。</p>'
     user_must_edit: '<p>你的帖子已經被社群標記並被臨時隱藏。</p>'
   archetypes:
     regular:
       title: "一般討論話題"
     banner:
-      title: "討論話題橫幅"
+      title: "橫幅主題"
       message:
-        make: "本主題現在是橫幅主題。它將出現在每頁的頂部，除非用戶將其隱藏。"
+        make: "本主題現在是橫幅主題。它將出現在每頁的頂部，除非用戶將其標記已讀。"
         remove: "本主題已經不再是橫幅主題。它將不在每個頁面的頂部顯示。"
   unsubscribed:
-    title: "退訂！"
-    description: "你已經退訂。要更改你的郵件設置，<a href='%{url}'>訪問你的用戶設置頁面</a>。"
+    title: "取消訂閱"
+    description: "你已經退訂 <b>%{email}</b>。想要變更你的郵件設定，請訪問你的<a href='%{url}'>使用者偏好設定</a>頁面。"
     topic_description: "點擊連結 %{link} 重新訂閲，或是使用主題底部或右側的通知控制。"
   unsubscribe:
-    title: "退訂"
+    title: "取消訂閱"
     stop_watching_topic: "停止關注這個討論話題，%{link}"
     mute_topic: "關閉此主題的所有通知，%{link}"
     unwatch_category: "停止監看%{category}分類中的所有主題"
@@ -744,7 +763,7 @@ zh_TW:
     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 密鑰。"
+    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>。"
@@ -774,9 +793,7 @@ zh_TW:
     educate_until_posts: "當用戶開始鍵入他們的前幾個 (n) 新帖子時，在編輯器上顯示教育面板視窗。"
     title: "網站名字，用於 title 標籤。"
     site_description: "用一句話描述這個網站，用於 meta description 標籤。"
-    contact_email: "本站管理員的電郵地址。用於緊急事項的通知，如未處理的標記，以及作為 /about 頁面中的緊急聯絡人。"
     contact_url: "這個網站聯絡 URL。用作 /about 頁面中的緊急聯絡。"
-    queue_jobs: "如果失敗佇列在排隊，使用 Sidekiq 消息引擎對不同的工作排隊"
     crawl_images: "允許從第三方 URL 取得圖片，來加入寬和高的數值"
     download_remote_images_to_local: "下載外部鏈接的圖片到本機；以防圖片損壞。"
     download_remote_images_threshold: "可用來下載外部圖片到本機最少的空間（百分比）"
@@ -791,18 +808,18 @@ zh_TW:
     fixed_category_positions: "若勾選，你將能調整並固定分類的順序。若不勾選，分類將會依照活躍程度來排序。"
     fixed_category_positions_on_create: "如果選擇了，目錄排序將會在話題創建對話框中被包含(要求固定目錄位置選項)"
     add_rel_nofollow_to_user_content: "添加 rel nofollow 屬性到所有的用戶內容，除了內部鏈接（包括父域名）。如果你更改了這個，你必須重新調制所有帖子，而該命令為：“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: "Onebox 處理後的 Discourse 帖子的最大字符長度"
-    onebox_domains_blacklist: "不會被 Onebox 的域名列表。"
-    max_oneboxes_per_post: "帖子中最多的 Onebox 數量。"
+    show_pinned_excerpt_mobile: "在行動版置頂主題顯示摘要。"
+    show_pinned_excerpt_desktop: "在桌面版置頂主題顯示摘要。"
+    post_onebox_maxlength: "展開連結預覽後的 Discourse 文章最大字數限制。"
+    onebox_domains_blacklist: "不會展開成連結預覽的網域列表。"
+    inline_onebox_domains_whitelist: "如果連結未包含 title，會被展開成連結預覽的網域白名單。"
+    enable_inline_onebox_on_all_domains: "忽略 inline_onebox_domain_whitelist 網站設定，允許所有網域的連結預覽。"
+    max_oneboxes_per_post: "文章中允許的連結預覽數量上限。"
     logo_url: "在你站點左上角出現的小號標誌圖片，應為一個長方形。如果留空，將顯示站點標題文字。"
     digest_logo_url: "郵件摘要中使用的標誌圖像。應為長方形。不能使用 SVG 圖片。如果留空，將使用 `logo_url`。"
     logo_small_url: "在你站點左上角的小號標誌圖片，應為正方形，當滾動時才可見。如果留空，將顯示主頁表徵圖。"
     favicon_url: "你的站點表徵圖（favicon），參考 http://zh.wikipedia.org/wiki/Favicon，如果要正確地通過 CDN 分發，它必須是 png 圖片"
-    mobile_logo_url: "移動站點左上角的固定標誌圖片。應為正方形。如果留空，`logo_url` 將被使用。如：http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "Apple 觸碰設備使用的圖示，建議 144 X 144px 大小"
     notification_email: "這個表格：被用於發送所有重要系統郵件的郵箱地址。指定的域名必須正確設置 SPF、DKIM 和反向 PTR 記錄以發送郵件。"
     email_custom_headers: "自定義的電子郵件標題的管道分隔列表"
@@ -827,20 +844,12 @@ zh_TW:
     tl2_additional_likes_per_day_multiplier: "增加信任等級2（成員）的贊限制，可提供一個乘數與原始值相乘"
     tl3_additional_likes_per_day_multiplier: "增加信任等級3（常規）的每日贊限制，將此設置項與原始值相乘"
     tl4_additional_likes_per_day_multiplier: "增加信任等級4（資深）的贊限制，可提供一個乘數與原始值相乘"
-    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: "如果一個新用戶開始了一個主題，並且同時另一個新用戶以同一個 IP 在該主題回復，他們所有的帖子都將被自動標記為垃圾。"
     traditional_markdown_linebreaks: "在 Markdown 中使用傳統的換行符號，即用兩個行末空格來換行"
-    allow_html_tables: "允許在輸入 Markdown 文本時使用表格 HTML 標籤。標籤 TABLE、THEAD、TD、TR、TH 將被允許使用，即白名單這些標籤（需要重置所有包含表格的老帖子的 HTML）"
-    post_undo_action_window_mins: "允許用戶在帖子上進行撤銷操作（讚、標記等）所需等待的時間分隔（分鐘）"
+    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 通用 Analytics (分析) 追蹤代碼（analytics.js）追蹤代碼，例如：UA-12345678-9；參考 http://google.com/analytics"
     ga_universal_domain_name: "Google 通用 Analytics (分析) 域名（analytics.js）追踪代码，例如：mysite.com；参考 http://google.com/analytics"
     gtm_container_id: "Google Tag Manager 容器 id。例如：GTM-ABCDEF"
@@ -871,12 +880,9 @@ zh_TW:
     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: "訪問 Discourse Hub 來檢查版本更新，並在管理面板 /admin 顯示新版本訊息"
     new_version_emails: "當新版本發佈時，將會發送一封新的 EMail 至 contact_email 設定的位址"
-    port: "使用此 HTTP 埠而不是80埠。留空為不使用，主要用於開發調試"
-    force_hostname: "指定 URL 裡的主機名稱。留空為不使用，主要用於開發調試"
     invite_expiry_days: "多少天以內用戶的邀請碼是有效的"
     invite_passthrough_hours: "邀請號碼如已被使用，用戶仍可使用多少小時"
     login_required: "需要登入才能進入網站，不允許匿名操作"
@@ -885,10 +891,10 @@ zh_TW:
     min_password_length: "最小密碼長度"
     min_admin_password_length: "管理員最短密碼長度"
     block_common_passwords: "不允許使用 10,000 個最常用的密碼"
-    enable_sso: "啟用通過外部站點單點登錄（警告：用戶的郵件地址必須被外部站點驗證！）"
+    enable_sso: "啟用外部站點登入 (注意：必須確認外部站點已驗證使用者的電子郵件地址！)"
     verbose_sso_logging: "將 SSO 日誌詳情記錄至 /logs"
     enable_sso_provider: "在 /session/sso_provider endpoint 必須設定 sso_secret 以實現 Discourse SSO 提供方協定"
-    sso_url: "單點登錄 URL 入口點（必須包含 http:// 或 https://）"
+    sso_url: "SSO URL endpoint (必須包含 http:// 或 https://)"
     sso_secret: "秘密字符串，用於驗證秘密的 SSO 訊息，請確保由 10 個字或以上組成"
     sso_overrides_bio: "在用戶頁面中覆蓋用戶的個人信息並禁止用戶修改"
     sso_overrides_email: "每一次登錄時，用 SSO 信息中的外部站點的郵件地址覆蓋本地郵件地址，並且阻止本地的郵件地址修改。（警告：因格本地郵件的正規化，郵件地址可能會有所差異）"
@@ -946,8 +952,8 @@ zh_TW:
     max_private_messages_per_day: "用戶每天能建立訊息的數量上限"
     max_invites_per_day: "每個用戶每天最多能邀請用戶的數量。"
     max_topic_invitations_per_day: "每個用戶每天能創建的邀請至主題數量的最大值。"
-    alert_admins_if_errors_per_minute: "激活管理員警告的每分鐘錯誤的數量。0 會禁用這個特性。注意：需要重啟。"
-    alert_admins_if_errors_per_hour: "激活管理員警告的每小時錯誤的數量。0 會禁用這個特性。注意：需要重啟。"
+    alert_admins_if_errors_per_minute: "觸發管理員警示的每分鐘錯誤數量。設為 0 會停用這個功能。注意：需要重啟。"
+    alert_admins_if_errors_per_hour: "觸發管理員警示的每小時錯誤數量。設為 0 會停用這個功能。注意：需要重新啟動。"
     categories_topics: "/categories 頁面中顯示的主題數。"
     suggested_topics: "討論話題下的推薦話題數量"
     limit_suggested_to_category: "目前的話題下只顯示同分類的推薦話題"
@@ -955,10 +961,9 @@ zh_TW:
     clean_up_uploads: "移除孤立的已上傳檔案。警告：你可能想要在啟用這個設定前備份 /uploads 文件夾。"
     clean_orphan_uploads_grace_period_hours: "刪除孤立的上傳檔案的寬限期（單位：小時）"
     purge_deleted_uploads_grace_period_days: "徹底刪除孤立的上傳檔案的寬限期（單位：天）"
-    purge_unactivated_users_grace_period_days: "刪除未啓用的帳戶的寬限期（單位：天）。"
     enable_s3_uploads: "上傳至 Amazon S3 存儲的地址。重要：需要有效的 S3 驗證資料（包括 access key id & secret access key）。"
     s3_use_iam_profile: '使用 AWS EC2 IAM 角色來獲得鑰匙。注意：啟用這個會覆蓋“S3 access key id”和“S3 secret access key” 設定。'
-    s3_upload_bucket: "上傳檔案保存於 Amazon S3 的 bucket 名字。警告：必須為小寫，無句點，無下劃線。"
+    s3_upload_bucket: "Amazon S3 保存上傳檔案的 bucket 名稱。警告：必須為小寫，不包含句點 (.) 與底線 (_)。"
     s3_access_key_id: "上傳至 Amazon S3 的 access key id，將用於上傳圖片"
     s3_secret_access_key: "上傳至 Amazon S3 的 secret access key，將用於上傳圖片"
     s3_region: "上傳至 Amazon S3 的 region name，將用於上傳圖片"
@@ -969,7 +974,7 @@ zh_TW:
     default_opengraph_image_url: "opengraph圖像的預設URL。"
     twitter_summary_large_image_url: "預設 Twitter summary 卡片的 URL（需要至少寬 280px 和高 150px）。"
     allow_all_attachments_for_group_messages: "允許群組消息中包含任何郵件附件。"
-    enable_flash_video_onebox: "在 Onebox 啟用嵌入 swf 和 flv (Adobe Flash) 的鏈接。警告：可能增加安全風險。"
+    enable_flash_video_onebox: "在連結預覽中啟用 swf 和 flv (Adobe Flash) 嵌入。警告：可能增加安全風險。"
     default_invitee_trust_level: "預設的受邀用戶等級 (0-4)"
     default_trust_level: "所有新用戶的預設信任等級（0-4）。警告！改變此項將提高廣告氾濫的風險。"
     tl1_requires_topics_entered: "新用戶升級到信任等級1所需要進入的主題數量。"
@@ -1001,6 +1006,7 @@ zh_TW:
     min_trust_to_edit_post: "能編輯帖子的最小信任等級。"
     min_trust_to_allow_self_wiki: "用戶將自己的帖子設置為維基模式的最低信任等級。"
     min_trust_to_send_messages: "發送消息所需的最低信任等級。"
+    min_trust_to_send_email_messages: "透過郵件發送私訊給暫存使用者所需的最低信任等級"
     newuser_max_links: "新用戶可添加多少連結於一篇文章中"
     newuser_max_images: "新用戶可添加多少張圖片於一篇文章中"
     newuser_max_attachments: "新用戶可添加多少附件於一篇文章中"
@@ -1058,9 +1064,6 @@ zh_TW:
     num_flags_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: "大小寫不相關的正則表達式，如果匹配成功，會導致該用戶不能發表第一帖，而是進入審核隊列。例如：求下載|謝謝樓[主豬]，會阻止包含求下載、謝謝樓主或謝謝樓豬的帖子。該選項只適用於首貼。"
     reply_by_email_enabled: "啟用通過電郵回覆。"
     reply_by_email_address: "通過郵件回覆的回覆地址模板，例如：%{reply_key}@reply.example.com 或 replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "通過郵件回覆的回覆地址模板，例如：%{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
@@ -1077,7 +1080,7 @@ zh_TW:
     auto_generated_whitelist: "不會被檢查是否是自動生成內容的郵件地址列表。例如：foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "阻止被檢測為自動生成的進站郵件。"
     ignore_by_title: "使用正則表達式根據標題忽略進站郵件。"
-    mailgun_api_key: "用以驗證 webhook 消息的 Mailgun 密鑰 API。"
+    mailgun_api_key: "用來驗證 webhook 訊息 Mailgun API 密鑰。"
     soft_bounce_score: "當碰到臨時拒信時，增加用戶的累計退信分值。"
     hard_bounce_score: "當碰到永久拒信時，增加用戶的累計退信分值。"
     bounce_score_threshold: "停止發送郵件給用戶的累計退信分值。"
@@ -1086,7 +1089,7 @@ zh_TW:
     attachment_content_type_blacklist: "基于 content type 禁止附件的黑名單列表。"
     attachment_filename_blacklist: "基于檔案名禁止附件的黑名單列表。"
     enable_forwarded_emails: "[測試] 允許用戶通過抄送郵件發表主題。"
-    always_show_trimmed_content: "總是顯示進站郵件中被截斷的部分。警告：可能顯示某些郵件地址。"
+    always_show_trimmed_content: "永遠顯示進入站內郵件中被截短的部分。警告：可能顯露出郵件地址。"
     manual_polling_enabled: "用 API 推送郵件回覆。"
     pop3_polling_enabled: "輪詢 POP3 收取郵件回覆。"
     pop3_polling_ssl: "連接至 POP3 伺服器時使用 SSL。（推薦）"
@@ -1097,7 +1100,6 @@ zh_TW:
     pop3_polling_username: "輪詢 POP3 賬戶所用的用戶名。"
     pop3_polling_password: "輪詢 POP3 賬戶所用的密碼。"
     log_mail_processing_failures: "記錄所有郵件失敗處理日誌至 http://yoursitename.com/logs"
-    email_in: "允許用戶通過郵件發表新主題（需要 pop3 輪詢）。在每一個分類的“設置”標籤頁配置地址。"
     email_in_min_trust: "能使用 EMail 發表新話題的最低的用戶信任等級"
     email_prefix: "EMail主題中使用的 [ 標籤 ]，留空將預設使用 'title'"
     email_site_title: "郵件發送人站點標題。如果沒有設置，預設為“title”。如果標題包含了任何不允許的字元，使用這個設置。"
@@ -1105,7 +1107,6 @@ zh_TW:
     relative_date_duration: "發表多少天內將顯示相對時間（7天）而非絶對時間（2月20日）。"
     delete_user_max_post_age: "不允許刪除首發表文章超過 (x) 天的用戶"
     delete_all_posts_max: "通過刪除所有帖子按鈕可以刪除的最大帖子數量。如果用戶有比這更多的帖子，這些帖子不能一次性刪除並且這個用戶不能被刪除。"
-    username_change_period: "用戶在註冊多少天內可以更改他們的用戶名（0 表示禁用用戶名更改）"
     email_editable: "允許用戶在註冊後改變他們的 EMail"
     logout_redirect: "登出後重定向至的地址。（如：http://somesite.com/logout）"
     allow_uploaded_avatars: "允許用戶上傳自定義個人頭像。"
@@ -1120,7 +1121,6 @@ zh_TW:
     suppress_digest_email_after_days: "對於 (n) 日以上未上站的用戶，停止發送摘要郵件。"
     digest_suppress_categories: "不在摘要郵件中顯示這些分類的內容。"
     disable_digest_emails: "停用發送摘要郵件給所有用戶的功能。"
-    email_accent_bg_color: "HTML 郵件中某些元素的背景使用的強調顏色。輸入色彩名（“red”）或十六進制值（“#FF0000”）。"
     email_accent_fg_color: "HTML 郵件中背景使用的字型顏色。輸入色彩名（“white”）或十六進制值（“#FFFFFF”）。"
     email_link_color: "HTML 郵件中的連結顏色。輸入色彩名字（“blue”）或十六進制值（“#0000FF”）。"
     detect_custom_avatars: "檢測用戶是否上傳了自定義個人頭像。"
@@ -1141,7 +1141,7 @@ zh_TW:
     disable_avatar_education_message: "禁用更改頭像操作的教育消息。"
     suppress_uncategorized_badge: "不在\"無分類\"的話題列表內顯示徽章。"
     permalink_normalizations: "在匹配永久連結之前應用如下正則表達式，例如：/(topic.*)\\?.*/\\1 將去掉所有主題路徑的參數字元串。格式為使用正則表達式+使用 \\1 等字元串來訪問捕獲內容"
-    global_notice: "為所有訪客顯示“緊急的”全局橫幅，留空隱藏它（可以使用 HTML）"
+    global_notice: "為所有訪客顯示「緊急的」全局橫幅主題，留空將其隱藏（可以使用 HTML）"
     disable_edit_notifications: "當 'download_remote_images_to_local' 啟用時禁用系統編輯提醒。"
     automatically_unpin_topics: "當用戶到達底部時自動解除主題置頂。"
     read_time_word_count: "一分鐘閲讀的詞的數量，用於估計閲讀時間。"
@@ -1157,25 +1157,18 @@ zh_TW:
     warn_reviving_old_topic_age: "當有人開始回覆最後一貼超過一定天數前的主題時，將有一個警告顯示，不鼓勵他們復活一個老的討論。將其設置為 0 以禁用。"
     autohighlight_all_code: "即使未顯示特定語言，仍為所有預編排程式套用程式碼顏色提示"
     highlighted_languages: "包含語法高亮規則。（警告：包含太多的語言可能影響性能）見：https://highlightjs.org/static/demo/ 查看演示"
-    feed_polling_enabled: "僅用於嵌入：是否將 RSS/ATOM 訂閲為帖子。"
-    feed_polling_url: "僅用於嵌入：RSS/ATOM 訂閲的 URL。"
-    embed_by_username: "創建嵌入主題的 Discourse 的用戶名。"
-    embed_username_key_from_feed: "從流中獲取 discourse 用戶名的 Key。"
-    embed_title_scrubber: "抓取嵌入主題的正則表達式。"
     embed_truncate: "截斷 embed 過的文章"
     allowed_href_schemes: "除了 http 和 https 外允許的連結協議。"
     embed_post_limit: "文章內 embed 的最大數量"
     embed_username_required: "創建主題需要用戶名。"
-    embed_whitelist_selector: "在 embeds 頁面允許 CSS 元素選擇器"
-    embed_blacklist_selector: "在 embeds 頁面移除 CSS 元件選擇器"
     show_create_topics_notice: "如果網站的公開討論話題少於 5 個，顯示通知要求管理員建立一些討論話題。"
     delete_drafts_older_than_n_days: 刪除超過 n 天得草稿。
     bootstrap_mode_min_users: "禁用摘要模式的用戶數下限（0 為禁用）。"
     prevent_anons_from_downloading_files: "禁止匿名用戶下載附件。警告：這將禁止他們訪問任何發表在帖子中的非圖片資源。"
     slug_generation_method: "選擇一個連結生成方式。“encoded”將生成以百分號編碼的連結。“none”將禁用自定義連結，只生成預設連結。"
     enable_emoji: "啟用表情符號"
-    emoji_set: "你會如何喜歡你的表情符號？"
-    enforce_square_emoji: "強制為所有 emojis 設置的正方形比例。"
+    emoji_set: "你喜歡怎麼樣的表情符號？"
+    enforce_square_emoji: "強制所有表情符號成為正方形比例。"
     approve_post_count: "新用戶或基礎用戶需要被審核的帖子數量"
     approve_unless_trust_level: "該信任等級之下的用戶的帖子必須被審核"
     approve_new_topics_unless_trust_level: "低於該信任等級的用戶的新帖子需要被審核"
@@ -1206,21 +1199,19 @@ zh_TW:
     default_categories_tracking: "分類列表預設追蹤。"
     default_categories_muted: "分類列表預設不顯示。"
     default_categories_watching_first_post: "預設監看這些分類中每個新主題的第一貼"
-    max_user_api_reqs_per_day: "用戶API每日每密鑰最高請求數"
-    max_user_api_reqs_per_minute: "用戶API每密鑰每分鐘最高請求數"
     allow_user_api_keys: "允許生成用戶API密鑰"
     allow_user_api_key_scopes: "用戶API授權範圍列表"
     max_api_keys_per_user: "每用戶最多持有的用戶 API 數"
     min_trust_level_for_user_api_key: "生成用戶 API 密鑰所需的信任等級"
     allowed_user_api_auth_redirects: "允許用戶 API 密鑰重定向授權至"
     allowed_user_api_push_urls: "允許使用伺服器推送至用戶 API 的 URL"
-    tagging_enabled: "啟用標籤功能，允許為主題設置標籤？"
-    min_trust_to_create_tag: "創建標籤所需的最小信任等級。"
+    tagging_enabled: "啟用話題標籤功能？"
+    min_trust_to_create_tag: "建立標籤所需的最低信任等級。"
     max_tags_per_topic: "主題最多允許有多少個標籤。"
     max_tag_length: "標籤允許的最大字元數。"
     max_tag_search_results: "當搜索標籤時，顯示的結果數上限。"
-    show_filter_by_tag: "顯示下拉菜單以按照標籤過濾主題列表。"
-    max_tags_in_filter_list: "過濾菜單中顯示的標籤數上限。優先顯示最常用的標籤。"
+    show_filter_by_tag: "顯示下拉選單以按照標籤過濾主題列表。"
+    max_tags_in_filter_list: "過濾下拉選單中顯示的標籤數上限。優先顯示最常用的標籤。"
     tags_sort_alphabetically: "按照字母順序顯示標籤。預設按流行度顯示。"
     tag_style: "標籤的視覺樣式。"
     staff_tags: "只可由管理人員使用的標籤列表"
@@ -1319,11 +1310,12 @@ zh_TW:
     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 登入成為管理員。"
     suspended: "你在 %{date} 之前無法登入。"
-    suspended_with_reason: "賬號暫停至%{date}: %{reason}"
+    suspended_with_reason: "帳號因 %{reason} 被停權至 %{date}"
     errors: "%{errors}"
     not_available: "不可用，試試 %{suggestion}？"
     something_already_taken: "出了一些問題，可能此用戶名或電子郵箱已經被註冊。試試 忘記密碼 連結吧。"
@@ -1335,7 +1327,6 @@ zh_TW:
     email_too_long: "你輸入的郵件太長了。郵箱名不得超過 254 字元，域名必須不超過 253 字元。"
     reserved_username: "該用戶名不可被使用。"
     missing_user_field: "你還沒有填寫完所有用戶字段"
-    close_window: "驗證已經完成。關閉視窗以繼續。"
     already_logged_in: "喔，看起來你正嘗試查看給另一個用戶的邀請連結。如果你不是%{current_user}，請退出再重試。"
   user:
     no_accounts_associated: "無關聯的帳戶"
@@ -1345,10 +1336,9 @@ zh_TW:
     username:
       short: "必須至少 %{min} 個字"
       long: "不能超過 %{max} 個字"
-      characters: "必須只包含字母和數位"
       unique: "必須是唯一的"
       blank: "必須存在"
-      must_begin_with_alphanumeric_or_underscore: "必須以字母、數字或下劃線開頭"
+      must_begin_with_alphanumeric_or_underscore: "必須以英數字或底線開頭"
       must_end_with_alphanumeric: "必須以字母或數字結尾"
       must_not_contain_two_special_chars_in_seq: "必須不包括連續的 2 個或更多的特殊字元（.-_）"
       must_not_end_with_confusing_suffix: "不能以難以分辨的尾碼結尾，比如 .json 或者 .png 等"
@@ -1375,77 +1365,30 @@ 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}
+    title: "邀請郵件"
   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}
+    title: "客製邀請郵件"
   invite_forum_mailer:
     title: "邀請論壇 Mailer"
-    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_domain_name}"
-    text_body_template: |
-      %{invitee_name} 留下以下留言
-
-      > %{user_custom_message}
-
-      邀請你加入
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      如果你感興趣，請點擊下面的連結：
-
-      %{invite_link}
+    title: "客製討論區邀請郵件"
   invite_password_instructions:
     title: "邀請密碼的說明"
     subject_template: "為 %{site_name} 的帳戶設置密碼"
+    text_body_template: |
+      感謝你接受來自 %{site_name} 的邀請，歡迎！
+
+      點擊下面的連結，立即設定你的密碼：
+      %{base_url}/u/password-reset/%{email_token}
+
+      (如果連結已經過期，到登入頁面以你的 email 登入 ，再選擇「我忘了我的密碼」即可)
+  download_backup_mailer:
+    subject_template: "[%{email_prefix}] 下載網站備份"
+  admin_confirmation_mailer:
+    subject_template: "[%{email_prefix}] 確認新的管理員帳號"
   test_mailer:
     title: "測試 Mailer"
+    subject_template: "[%{email_prefix}] 電子郵件發送測試"
     text_body_template: |
       這是一封測試電子郵件，發自：
 
@@ -1489,40 +1432,10 @@ zh_TW:
       [mt]: http://www.mail-tester.com/
   new_version_mailer:
     title: "新版本 Mailer"
-    text_body_template: |
-      哇哦，有新版本的 [Discourse](http://www.discourse.org) 可以升級！
-
-      你的版本：%{installed_version}
-      新的版本：**%{new_version}**
-
-      - 瀏覽器訪問**[一鍵更新工具](%{base_url}/admin/upgrade)**升級。
-
-      - 查看[GitHub 改動日誌（英文）](https://github.com/discourse/discourse/commits/master)中更新的內容。
-
-      - 訪問 [meta.discourse.org（英文）](https://meta.discourse.org) 獲取 Discourse 的最新資訊、討論和支持。也可訪問 [meta.discoursecn.org 非官方的中文支持論壇](https://meta.discoursecn.org) 獲得支持。
+    subject_template: "[%{email_prefix}] 有可用的 Discourse 更新"
   new_version_mailer_with_notes:
     title: "包含提醒的新版本 Mailer"
-    text_body_template: |
-      哇哦，有新版本的 [Discourse](http://www.discourse.org) 可以升級！
-
-      你的版本：%{installed_version}
-      新的版本：**%{new_version}**
-
-      - 查看[GitHub 改動日誌（英文）](https://github.com/discourse/discourse/commits/master)中更新的內容。
-
-      - 瀏覽器訪問**[一鍵更新工具](%{base_url}/admin/upgrade)**升級。
-
-      - 訪問 [meta.discourse.org（英文）](http://meta.discourse.org) 獲取 Discourse 的最新資訊、討論和支持。也可訪問 [meta.discoursecn.org 非官方的中文支持論壇](http://meta.discoursecn.org) 獲得支持。
-
-      ### 發行註記
-
-      %{notes}
-  queued_posts_reminder:
-    title: "排定中的文章提醒"
-    text_body_template: |
-      你好，
-
-      新用戶的帖子等待被編輯或審核。[審核通過或者拒絶](%{base_url}/queued-posts)。
+    subject_template: "[%{email_prefix}] 有得更新了"
   flag_reasons:
     off_topic: "你的帖子被標記為 **偏離主題**：鑒於當前的主題標題和第一個帖子，社群成員們感覺它不適合處于這個主題中。"
     inappropriate: "你的帖子被標記為 **不恰當**：社群成員感覺它有冒犯或者侮辱的意味，亦或是它違反了[社群準則](/guidelines)。"
@@ -1534,30 +1447,38 @@ zh_TW:
     disagreed: "感謝你讓我們知道。我們正在調查。"
     deferred: "感謝你讓我們知道。我們正在調查。"
     deferred_and_deleted: "感謝通知我們。我們已經刪除了帖子。"
+  temporarily_closed_due_to_flags:
+    other: "這個話題因為大量的社群投訴暫時關閉 %{count} 小時。"
   system_messages:
     post_hidden:
       title: "文章已隱藏"
       subject_template: "帖子因社群標記隱藏"
-      text_body_template: |
-        你好，
-
-        這是%{site_name}自動發出的郵件，通知你的帖子已被隱藏。
-
-        %{base_url}%{url}
-
-        %{flag_reason}
-
-        你的帖子是因為被多個社群成員標記才被隱藏的，所以請考慮根據他們的反饋修改你的帖子。**你可以在 %{edit_delay} 分鐘後開始編輯你的帖子，然後它將重新被顯示。**
-
-        然而，如果帖子再次被社群成員標記並隱藏，它將被隱藏至版主處理後——並且可能導致進一步的措施，如封禁帳號。
-
-        想瞭解更多，請查看我們的[社群指引](%{base_url}/guidelines)。
     welcome_user:
       title: "歡迎使用者"
       subject_template: "歡迎來到 %{site_name}！"
+      text_body_template: |
+        感謝你加入%{site_name}，歡迎！
+
+        %{new_user_tips}
+
+        我們始終相信[文明的社群行為](%{base_url}/guidelines) 。
+
+        好好享受你在論壇的時光！
     welcome_invite:
       title: "歡迎邀請"
       subject_template: "歡迎來到 %{site_name}！"
+      text_body_template: |
+        感謝你接受邀請加入 %{site_name} — 歡迎！
+
+        - 我們已為你建立 **%{username}** 帳號。請到 [偏好設定][prefs] 頁面修改帳號名稱或密碼。
+
+        - 請使用與你的邀請信件 **相同的 email 信箱登入**，不然我們就不知道你來了！
+
+        %{new_user_tips}
+
+        我們始終相信[文明的社群行為](%{base_url}/guidelines) 。好好享受你在論壇的時光！
+
+        [prefs]: %{user_preferences_url}
     backup_succeeded:
       title: "備份成功"
       subject_template: "備份成功完成"
@@ -1607,10 +1528,18 @@ zh_TW:
     bulk_invite_succeeded:
       title: "批量邀請成功"
       subject_template: "批次用戶邀請已完成處理"
-      text_body_template: "你的批量邀請用戶已經完成，發送了 %{sent} 個邀請。"
+      text_body_template: "你的批次使用者邀請已經完成，寄出 %{sent} 封邀請郵件。"
     bulk_invite_failed:
       title: "批量邀請失敗"
       subject_template: "批次使用者邀請處理已經完成，發生了些錯誤"
+      text_body_template: |
+        你的批次使用者邀請已結束，發出 %{sent} 個邀請、共有 %{failed} 個錯誤。
+
+        查看紀錄：
+
+        ```text
+        %{logs}
+        ```
     csv_export_succeeded:
       title: "CSV 檔匯出成功"
       subject_template: "資料匯出完成"
@@ -1625,49 +1554,22 @@ zh_TW:
     csv_export_failed:
       title: "CSV 檔匯出失敗"
       subject_template: "資料匯出失敗"
-      text_body_template: "很抱歉，你的資料匯出失敗了。請檢查日誌，或聯繫管理人員。"
     email_reject_insufficient_trust_level:
       title: "電子郵件拒絕 信任等級不足"
-      text_body_template: |
-        我們很抱歉，但是你發送至%{destination}（名為 %{former_title}）的郵件出問題了。
-
-        你的賬戶沒有足夠的信任等級以該郵件地址發佈新主題。如果你有異議，聯繫管理人員。
     email_reject_user_not_found:
       title: "電子郵件拒絕 找不到用戶"
-      text_body_template: |
-        我們非常抱歉，但是你發送至 %{destination}（名為%{former_title}） 的郵件出問題了。
-
-        你發送回覆的郵件地址是未知的郵件地址。試試從另外一個郵件地址發送，或者聯繫管理人員。
     email_reject_screened_email:
       title: "電子郵件拒絕 屏蔽的電子郵件地址"
-      text_body_template: |
-        我們非常抱歉，但是你發送至%{destination}（名為%{former_title}）的郵件出問題了。
-
-        你發送回覆的郵件地址是已被封禁的郵件地址。試試從另外一個郵件地址發送，或者聯繫管理人員。
     email_reject_inactive_user:
       title: "電子郵件拒絕 用戶尚未啟動"
       text_body_template: |
         我們非常抱歉，但是你發送至 %{destination}（名為%{former_title}） 的郵件出問題了。
 
         與你賬戶關聯的郵件地址沒有激活，請先激活你的賬號再發送郵件。
-    email_reject_blocked_user:
-      title: "電子郵件拒絕 已封鎖的用戶"
-      text_body_template: |
-        我們非常抱歉，但是你發送至 %{destination}（名為%{former_title}） 的郵件出問題了。
-
-        與你賬戶關聯的郵件地址已經被封禁。
     email_reject_reply_user_not_matching:
       title: "點子郵件拒絕 未找到符合的用戶"
-      text_body_template: |
-        我們非常抱歉，但是你發送至 %{destination}（名為%{former_title}） 的郵件出問題了。
-
-        你發送回覆的郵件地址與我們等待的地址不同，所以我們不確定你是不是同一個人。試試從另外一個郵件地址發送，或者聯繫管理人員。
     email_reject_no_account:
       title: "電子郵件拒絕 沒有帳號"
-      text_body_template: |
-        我們非常抱歉，但是你發送至 %{destination}（名為%{former_title}） 的郵件出問題了。
-
-        我們找不到匹配你郵件地址的賬號。試試從另外一個郵件地址發送，或者聯繫管理人員。
     email_reject_empty:
       title: "電子郵件拒絕 空白"
       text_body_template: |
@@ -1684,17 +1586,8 @@ zh_TW:
         我們不能找到你郵件中的回覆。**請確認將你的回覆置於郵件頂端**——我們不能處理行內回覆。
     email_reject_invalid_access:
       title: "電子郵件拒絕 無效存取"
-      text_body_template: |
-        我們很抱歉，但是你發送至%{destination}（名為 %{former_title}）的郵件出問題了。
-
-        你的賬戶沒有達到足夠的信任等級在該分類發佈新主題。如果你有異議，聯繫管理人員。
     email_reject_strangers_not_allowed:
       title: "電子郵件拒絕 陌生人禁止"
-      text_body_template: |+
-        我們非常抱歉，但是你發送至%{destination}（名為%{former_title}）的郵件出問題了。
-
-        郵件發至的分類只接受來自合法帳戶且郵件地址已確認的用戶的有郵件。如果你有異議，聯繫管理人員。
-
     email_reject_invalid_post:
       title: "電子郵件拒絕 無效貼文"
       text_body_template: |
@@ -1719,34 +1612,16 @@ zh_TW:
         發送的命令無法被識別。請再試一次，如果還有問題，使用網站發表。
     email_reject_reply_key:
       title: "電子郵件拒絕 復原金鑰"
-      text_body_template: |
-        我們非常抱歉，但是你發送至%{destination}（名為%{former_title}）的郵件出問題了。
-
-        郵件中的回覆信令是無效或者未知的，所以我們不知道這封郵件回覆給誰了。請聯繫管理人員。
     email_reject_bad_destination_address:
       title: "電子郵件拒絕 不良目的地位址"
-      text_body_template: |
-        我們非常抱歉，但是你發送至%{destination}（名為%{former_title}） 郵件出問題了。
-
-        目標郵件地址無法識別。請確保你在向管理人員提供的郵件地址發信。
     email_reject_topic_not_found:
       title: "電子郵件拒絕 未找到討論話題"
-      text_body_template: |
-        我們很抱歉，但是你發送至%{destination}（名為 %{former_title}）的郵件出問題了。
-
-        你回覆的主題不存在——可能已經被刪除了？如果你有異議，聯繫管理人員。
     email_reject_topic_closed:
       title: "電子郵件拒絕 討論話題已關閉"
-      text_body_template: |
-        我們很抱歉，但是你發送至 %{destination} ( 名為 %{former_title} )的郵件出問題了。
-
-        你回覆的主題已經被關閉，不允許回覆。如果你有異議，聯繫管理人員。
     email_reject_auto_generated:
       title: "電子郵件拒絕 自動生成"
-      text_body_template: |
-        我們很抱歉，但是你發送至%{destination}（名為 %{former_title}）的郵件出問題了。
-
-        系統覺得你的郵件是“自動生成”的，即電腦生成了該郵件而不是由你輸入的；我們不能接受這樣的郵件。如果你有異議，聯繫管理人員。
+    email_reject_unrecognized_error:
+      title: "電子郵件拒絕 未知錯誤"
     email_error_notification:
       title: "電子郵件錯誤通知"
       text_body_template: |
@@ -1757,68 +1632,10 @@ zh_TW:
         如果 POP 郵件賬號有圖形界面，你可以登錄後查看郵箱設置。
     too_many_spam_flags:
       title: "過多垃圾文章投訴"
-      subject_template: "新賬戶被暫時封禁"
-      text_body_template: |
-        你好，
-
-        這是%{site_name}自動發出的郵件。你的帖子因社群標記而被臨時隱藏。
-
-        出於謹慎的考慮，在管理人員審核通過前，你的新賬戶不能再發表新的回覆或者主題。我們對此帶來的不便表示歉意。
-
-        要查看更多指引，請參考我們的[社群指引](%{base_url}/guidelines)。
+      subject_template: "新帳號被暫時停用"
     too_many_tl3_flags:
       title: "過多 TL3 投訴"
-      subject_template: "新賬戶被暫時封禁"
-      text_body_template: |
-        你好，
-
-        這是%{site_name}自動發出的郵件。你的帳戶因大量社群標記而被暫停使用。
-
-        出於謹慎的考慮，在管理人員審核通過前，你的新賬戶不能再發表新的回覆或者主題。我們對此帶來的不便表示歉意。
-
-        要查看更多指引，請參考我們的[社群指引](%{base_url}/guidelines)。
-    blocked_by_staff:
-      title: "被管理員封鎖"
-      subject_template: "賬戶被暫時封禁"
-      text_body_template: |
-        你好，
-
-        這是%{site_name}自動發出的郵件。出於謹慎的考慮，你的帳戶臨時暫停使用。
-
-        請繼續瀏覽，但在管理人員審核通過前，你的賬戶不能再發表新的回覆或者主題。我們對此帶來的不便表示歉意。
-
-        要查看更多指引，請參考我們的[社群指引](%{base_url}/guidelines)。
-    user_automatically_blocked:
-      title: "用戶自動封鎖"
-      subject_template: "新用戶%{username}因社群標記而被封禁"
-      text_body_template: |
-        這是自動發出的郵件。
-
-        因多位用戶標記%{username}的帖子，新用戶[%{username}](%{base_url}%{user_url})已被自動封禁。
-
-        請[查看這些標記](%{base_url}/admin/flags)。如果%{username}被意外禁用了編輯功能，點擊[該用戶管理頁面](%{base_url}%{user_url})內的解封按鈕。
-
-        該閾值可以通過站點設置中的 `block_new_user` 更改。
-    spam_post_blocked:
-      title: "因垃圾貼文而被封鎖"
-      subject_template: "新用戶 %{username} 由於重複貼連結，文章已被封鎖"
-      text_body_template: |
-        這是自動發出的郵件。
-
-        新用戶[%{username}](%{base_url}%{user_url})試圖創建多個連結至 %{domains} 的帖子，但這些帖子因為反垃圾策略而被阻擋了。用戶仍能夠發表不包含到 %{domains} 的帖子。
-
-        請[審核該用戶](%{base_url}%{user_url})。
-
-        該閾值可以通過站點設置中的 `newuser_spam_host_threshold` 和 `white_listed_spam_host_domains` 更改。
-    unblocked:
-      title: "解除封鎖"
-      subject_template: "賬戶已解除封禁"
-      text_body_template: |
-        你好，
-
-        這是%{site_name}自動發出的郵件。管理人員審核你的帳戶後，你的帳戶不再受到限制。
-
-        你現在可以創建新回覆和主題了。感謝你的耐心等待。
+      subject_template: "新帳號被暫時停用"
     pending_users_reminder:
       title: "待審用戶提醒"
       subject_template:
@@ -1838,6 +1655,9 @@ zh_TW:
         系統在管理員面板中報告了發現的問題。
 
         [請檢查並修復他們](%{base_url}/admin)。
+    new_user_of_the_month:
+      title: "你是本月最佳新人！"
+      subject_template: "你是本月最佳新人！"
   unsubscribe_link: |
     要退訂這些郵件，[請點擊這裡](%{unsubscribe_url})。
   unsubscribe_link_and_mail: |
@@ -1850,38 +1670,34 @@ zh_TW:
   subject_pm: "[私訊]"
   user_notifications:
     previous_discussion: "之前的回覆"
+    reached_limit:
+      other: "注意：你達到了每日郵件限額（%{count}），到網站看看哪些訊息可能被延遲了。BTW，感謝你經營的這麼熱絡！"
     in_reply_to: "回覆給"
     unsubscribe:
       title: "取消訂閱"
-      description: "不再對這些郵件感興趣？沒問題！點擊下面按鈕來立即取消訂閱："
+      description: "不再對這些郵件感興趣？沒問題！點擊以立即取消訂閱："
     reply_by_email: "[訪問主題](%{base_url}%{url})或者發郵件回覆。"
     reply_by_email_pm: "[訪問消息](%{base_url}%{url})或者發郵件回覆。"
     only_reply_by_email: "發郵件回覆。"
     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} 邀請你參與討論：
+      %{username}邀請你參與
+
+      > %{site_title}－%{site_description}
+
+      的討論話題
 
       > **%{topic_title}**
       >
       > %{topic_excerpt}
-
-      論壇：
-
-      > %{site_title} -- %{site_description}
+    user_invited_to_private_message_pm_group:
+      title: "用戶邀請群組至私人訊息"
+      subject_template: "[%{email_prefix}] %{username} 邀請 @%{group_name} 參與討論「%{topic_title}」"
     user_invited_to_private_message_pm:
       title: "用戶被邀請至私人訊息"
+      subject_template: "[%{email_prefix}] %{username} 邀請你參與討論「%{topic_title}」"
       text_body_template: |
         %{header_instructions}
 
@@ -1890,6 +1706,7 @@ zh_TW:
         %{respond_instructions}
     user_invited_to_private_message_pm_staged:
       title: "用戶被邀請至私人訊息狀態"
+      subject_template: "[%{email_prefix}] %{username} 邀請你參與私訊討論「%{topic_title}」"
       text_body_template: |
         %{header_instructions}
 
@@ -1898,6 +1715,7 @@ zh_TW:
         %{respond_instructions}
     user_invited_to_topic:
       title: "用戶被邀請至討論話題"
+      subject_template: "[%{email_prefix}] %{username} 邀請你參與「%{topic_title}」"
       text_body_template: |
         %{header_instructions}
 
@@ -1906,6 +1724,7 @@ zh_TW:
         %{respond_instructions}
     user_replied:
       title: "用戶回覆"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1916,6 +1735,7 @@ zh_TW:
         %{respond_instructions}
     user_replied_pm:
       title: "用戶回復私人訊息"
+      subject_template: "[%{email_prefix}] [私訊] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1926,6 +1746,7 @@ zh_TW:
         %{respond_instructions}
     user_quoted:
       title: "用戶引述"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1936,6 +1757,7 @@ zh_TW:
         %{respond_instructions}
     user_linked:
       title: "用戶連結"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1946,6 +1768,7 @@ zh_TW:
         %{respond_instructions}
     user_mentioned:
       title: "用戶提及"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1956,6 +1779,7 @@ zh_TW:
         %{respond_instructions}
     user_group_mentioned:
       title: "用戶群組提及"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1966,6 +1790,7 @@ zh_TW:
         %{respond_instructions}
     user_posted:
       title: "用戶貼文"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1976,6 +1801,7 @@ zh_TW:
         %{respond_instructions}
     user_watching_first_post:
       title: "用戶觀看第一個主題"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1986,6 +1812,7 @@ zh_TW:
         %{respond_instructions}
     user_posted_pm:
       title: "用戶發表私人訊息"
+      subject_template: "[%{email_prefix}] [私訊] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -2014,35 +1841,103 @@ zh_TW:
       join_the_discussion: "閲讀更多"
       popular_posts: "熱門貼文"
       more_new: "新內容與你分享"
-      unsubscribe: "這是封來自%{site_link}的摘要郵件，因為你長時間沒有訪問而發送。%{unsubscribe_link}取消訂閲。"
+      subject_template: "[%{email_prefix}] 摘要"
       click_here: "點擊此處"
       from: "%{site_name}的摘要"
       preheader: "在你上次於%{last_seen_at}訪問後的新內容摘要"
     forgot_password:
       title: "忘記密碼"
+      subject_template: "[%{email_prefix}] 重設密碼"
+      text_body_template: |
+        有人請求重設你在 [%{site_name}](%{base_url}) 的密碼。
+
+        如果那不是你，你可以直接忽略本郵件。
+
+        點擊下面的連結以建立新密碼：
+        %{base_url}/u/password-reset/%{email_token}
     set_password:
       title: "設定密碼"
+      subject_template: "[%{email_prefix}] 設定密碼"
+      text_body_template: |
+        有人要求為你在 [%{site_name}](%{base_url}) 的帳號新增密碼。你也可以直接透過任何與此郵件信箱關聯的線上服務登入（例如 Google、Facebook 等）。
+
+        如果你沒有做此請求，你可以直接忽略本郵件。
+
+        點擊下面的連結以建立新密碼：
+        %{base_url}/u/password-reset/%{email_token}
     admin_login:
       title: "管理員登入"
+      subject_template: "[%{email_prefix}] 登入"
+      text_body_template: |+
+        有人要求登入你在 [%{site_name}](%{base_url}) 的帳號。
+
+        如果你沒有做此請求，你可以直接忽略本郵件。
+
+        點擊下面的連結以登入：
+        %{base_url}/u/admin-login/%{email_token}
+
     account_created:
       title: "建立用戶"
-    confirm_new_email:
-      title: "確認新郵件"
-    confirm_old_email:
-      title: "確認舊郵件"
-    notify_old_email:
-      title: "通知舊的郵件"
+      subject_template: "[%{email_prefix}] 你的新帳號"
       text_body_template: |
-        這是%{site_name}自動發出的郵件，以告知你的郵箱地址已經被修改了。如果這是一個錯誤，請聯繫站點管理人員。
+        你在 %{site_name} 的新帳號已準備好。
 
-        你的郵箱地址被修改為：
+        請點擊以下連結來為新帳號設定密碼：
+        %{base_url}/u/password-reset/%{email_token}
+    confirm_new_email:
+      title: "確認新郵件地址"
+      subject_template: "[%{email_prefix}] 確認你的新郵件地址"
+      text_body_template: |
+        點擊以下連結，確認你 %{site_name} 的新郵件地址：
+
+        %{base_url}/u/authorize-email/%{email_token}
+    confirm_old_email:
+      title: "確認原郵件地址"
+      subject_template: "[%{email_prefix}] 確認你的現行郵件地址"
+      text_body_template: |
+        在我們修改你的郵件地址前，我們需要你確認你擁有當前的郵件帳號。
+        完成此步驟後，我們將請你確認新的郵件地址。
+
+        點擊下面的連結，以確認你當前在 %{site_name} 的郵件地址：
+
+        %{base_url}/u/authorize-email/%{email_token}
+    notify_old_email:
+      title: "通知原郵件地址"
+      subject_template: "[%{email_prefix}] 已變更你的郵件地址"
+      text_body_template: |
+        這是 %{site_name} 自動發出的郵件，在此通知你已變更郵件地址。如果這是一個錯誤，請聯繫網站管理人員。
+
+        你的郵件地址已變更為：
 
         %{new_email}
     signup_after_approval:
       title: "在同意之後註冊"
       subject_template: "你已受到 %{site_name} 的認可！"
+      text_body_template: |
+        歡迎加入 %{site_name}！
+
+        管理員已通過你的帳號申請。
+
+        請點擊以下連結，以確認啟用你的新帳號：
+        %{base_url}/u/activate-account/%{email_token}
+
+        如果上面的連結無法點擊，請複製該連結，並貼到瀏覽器中開啟。
+
+        %{new_user_tips}
+
+        我們永遠相信[文明的社群行為](%{base_url}/guidelines)。
+
+        好好享受您在此的時光吧！
     signup:
       title: "註冊"
+      subject_template: "[%{email_prefix}] 確認你的新帳號"
+      text_body_template: |
+        歡迎來到 %{site_name}！
+
+        請點擊以下連結，以確認和啟用你的新帳戶：
+        %{base_url}/users/activate-account/%{email_token}
+
+        如果上面的連結無法點擊，請複製該連結，並貼到瀏覽器的網址列中開啟。
   page_not_found:
     title: "抱歉！這個頁面不存在或者是私密的。"
     popular_topics: "熱門"
@@ -2052,8 +1947,8 @@ zh_TW:
     search_google: "Google"
   login_required:
     welcome_message: |
-      #[歡迎來到 %{title}](#welcome)
-      你需要一個賬號。請創建一個賬號或者登錄以繼續。
+      ## [歡迎來到 %{title}](#welcome)
+      你需要一個帳號。請創設一個帳號，或者登入以繼續。
   terms_of_service:
     title: "服務條款"
     signup_form_message: '我已閱讀並接受 <a href="/tos" target="_blank">服務條款</a>'
@@ -2079,7 +1974,7 @@ zh_TW:
     post_user_deleted: "帖子的用戶已被刪除。"
     no_user: "無法找到 ID 為 %{user_id} 的使用者"
     anonymous_user: "匿名用戶"
-    suspended_not_pm: "用戶已被停權，不是訊息"
+    suspended_not_pm: "使用者已被停權，不是訊息"
     seen_recently: "用戶最近活躍"
     post_not_found: "無法找到 ID 為 %{post_id} 的文章"
     notification_already_read: "這封通知 EMail 已被讀取"
@@ -2107,6 +2002,104 @@ zh_TW:
     編輯本主題的第一帖以改變 %{page_name} 頁面的內容。
   guidelines_topic:
     title: "FAQ / 使用守則"
+    body: |
+      <a name="civilized"></a>
+
+      ## [這是一個文明討論的公共場所](#civilized)
+
+      在論壇上請表現得像在公共公園一樣得體。我們一群人共享着這個社群資源 &mdash; 一個透過不斷對話，以分享技能、知識和興趣的地方。
+
+      這些都不是草率決定的死規矩，而是一些幫助社群的人們來判斷的指引。以保持乾淨和充滿靈感的文明公開論壇。
+
+      <a name="improve"></a>
+
+      ## [改善討論](#improve)
+
+      幫助我們讓這個地方變成交流的好地方。由小處開始一點一滴的協助改善討論方向。如果不確定你的文章能益於討論，請再想一想你要表達的意思，然後稍後再試一次。
+
+      這裡討論的主題對我們很重要，我們希望你也認真看待它。尊重主題以及參與討論的人們，特別是當你不同意某些意見的時候。
+
+      改善討論的其中一個方法，是先了解已經發生過的事。請在發表新文章或回應前，先花一些時間瀏覽這些主題，你會更容易遇見和你有共同愛好的人。
+
+      <a name="agreeable"></a>
+
+      ## [即使你不同意他人意見，也請保持和善](#agreeable)
+
+      你可能想表達對某些觀點的反對。這沒問題。但是，記住_評論觀點，而非對象_。請避免：
+
+      *   指名道姓。
+      *   人身攻擊。
+      *   回覆無關於內文，僅評判態度的內容。
+      *   針鋒相對的反駁。
+
+      相反的，提供具事實基礎的陳述以增進對話。
+
+      <a name="participate"></a>
+
+      ## [你的參與很重要](#participate)
+
+      我們在此的討論都會是新訪客的榜樣，請幫助我們一起影響社群的未來：選擇有意思的主題參與討論—並略過那些負面的。
+
+      Discourse 提供了一些工具，讓社群共同鑒別最棒（或最差）的貢獻：書籤、贊、投訴標記、回覆和編輯等等。使用這些工具不僅能改善你自己的體驗，也能增進他人的體驗。
+
+      讓我們創造一個比你加入前更美好的社群。
+
+      <a name="flag-problems"></a>
+
+      ## [如果你發現問題，標記投訴它](#flag-problems)
+
+      版主有特別的權力，他們對論壇負責；但是你也有責任。有了你的幫助，版主才能成為社群協助者，而非守衛或者警察。
+
+      當你見到不合適的行為時，請不要回覆。這種作法變相鼓勵了不合適的行為，浪費了你的精力，並且浪費每一個人的時間。_只要標記它_。如果收到了足夠的標記，將會自動的、或由版主介入做出相應的處理。
+
+      為了維護我們的社群，版主保留在任何時間、任何理由下刪除任何內容和任何使用者帳號的權力。新文章未經版主預先審核，版主和網站維護人員對社群發表的任何內容均不負責任。
+
+      <a name="be-civil"></a>
+
+      ## [永遠保持文明](#be-civil)
+
+      無禮的態度破壞良好的溝通至甚：
+
+      *   維持文明。不要發表任何理智的人會感覺被冒犯、污辱或仇恨的言論。
+      *   保持乾淨。不要發表任何淫穢或性暗示的東西。
+      *   尊重他人。不要騷擾或者讓別人難過，戲仿他人，或暴露其他人的個人資訊。
+      *   尊重我們的論壇。不要發表廣告或者其他垃圾訊息。
+
+      以上不是精確的法律條文 &mdash; 但也請別打擦邊球挑戰底線。如果你不確定是否適合，請問問自己當你的文章出現在紐約時報頭版頭條時，你會有什麼感受。
+
+      這是一個公開論壇，且搜索引擎會索引這些討論。請注意你的發言內容、連結和圖片，不要張貼任何家人和朋友的資訊。
+
+      <a name="keep-tidy"></a>
+
+      ## [維護整潔](#keep-tidy)
+
+      努力讓東西出現在正確的位置，我們就能投注更多的時間在討論上，不須費時打掃。因此：
+
+      *   不要在錯誤的分類裡發表文章。
+      *   不要在多重主題上回覆相同的內容。
+      *   不要發佈沒有內容的回覆。
+      *   不要歪樓，在中途改變主題。
+      *   不需在你的內容中署名 &mdash; 每一篇文章都已附有你的個人資訊。
+
+      比起發表「+1」或者「卡」，請使用贊按鈕。比起將討論帶向一個截然不同的方向，請使用「分享 > 新討論話題」以關聯主題的形式回覆。
+
+      <a name="stealing"></a>
+
+      ## [只發表你自己的東西](#stealing)
+
+      你不能在沒有他人授權的情況下，發佈任何屬於他人的數位資產。你或許不能發表竊自他人智慧財產（軟體、影片、聲音和圖片）或其他任何違反法律的事物的介紹、連結或竊取方法。
+
+      <a name="power"></a>
+
+      ## [由你參與](#power)
+
+      這個網站由[一群友善的管理人員](/about)和 *你* 一同運營。如果你對站上的事情有任何建議，請至[網站回饋](/c/site-feedback)分類新建一個主題，與我們一同討論！如果遇到了重大或緊急的事情，且不適合用站務主題或標記解決，請到[管理人員頁面](/about)聯繫我們。
+
+      <a name="tos"></a>
+
+      ## [服務條款](#tos)
+
+      是的，法律條文很無聊，但是我們必須保護自己 &ndash; 以及你與你的資料 &ndash; 面對那些不友善的傢伙。我們的[服務條款](/tos)描述你（以及我們）在內容、隱私和法律上的行為和權利。想要使用我們的服務，你必須同意並遵守[服務條款](/tos)。
   tos_topic:
     title: "服務條款"
     body: |
@@ -2361,9 +2354,6 @@ zh_TW:
         該徽章授予給帖子收到了第一個讚的成員。恭喜，有社群成員發現你發表的內容有意思、酷炫或者有用！
     autobiographer:
       name: 自傳作者
-      description: 已填寫用戶<a href="/my/preferences">資料</a>信息
-      long_description: |
-        該徽章授予給填寫了<a href="/my/preferences">用戶頁面</a>並選擇了用戶頭像的你。讓社群成員們多瞭解你一點以及你感興趣的內容，能幫助我們打造一個更好、更團結的社群。讓我們一起努力！
     anniversary:
       name: 年度紀念日
       description: 一年活躍用戶，至少發了一個帖子
@@ -2458,9 +2448,6 @@ zh_TW:
         該徽章授予給第一次在回覆中引用帖子的你。在你的回覆中引用之前帖子中的相關的段落將把主題關聯在一起並切題。只要選中別的帖子中的任何文字，然後點擊回覆按鈕將可以引用啦。多引用一些吧！
     read_guidelines:
       name: 閲讀指引
-      description: 閲讀<a href="/guidelines">社群指引</a>
-      long_description: |
-        該徽章授予給<a href="/guidelines">閲讀了社群指引</a>的你。遵守和分享簡單的指引能讓我們打造一個穩定、有趣和可持續的社群。永遠記住別人，一個和你有很多共同點的人，就在屏幕的那一側。友好一些！
     reader:
       name: 讀者
       description: 閲讀了有至少 100 個回覆的主題中的所有回覆
@@ -2502,7 +2489,7 @@ zh_TW:
       long_description: |
         該徽章授予給一天內讚了 50 次的你。別忘記休息一下。讚你喜歡的帖子能鼓勵成員不斷改進討論的內容。
     higher_love:
-      name: "激情\b"
+      name: 激情
       description: 5 天都讚過 50 次
       long_description: |
         該徽章授予給 5 天讚過 50 次的你。感謝你每天都花點時間鼓勵討論的進行！
@@ -2528,20 +2515,25 @@ zh_TW:
         該徽章授予給收到了 500 個贊，且讚過別人至少 1000 次的你。哇！你是一個富有同情心且會換位思考的模範。 :two_hearts:
     first_emoji:
       name: 首個表情
-      description: 在帖子中使用表情符號
+      description: 在文章中使用表情符號
       long_description: |
-        該徽章授予給第一次在帖子中使用 Emoji 的你 :thumbsup:。Emoji 讓你在帖子中表達快樂 :smiley:、悲傷 :anguished:、憤怒 :angry: 以及任何東西 :sunglasses:。輸入 :（冒號）或在編輯器中的 Emoji 工具欄中選擇吧 :ok_hand:
+        該徽章授予給第一次在文章中使用表情符號的你 :thumbsup:。表情符號讓你在文章中表達快樂 :smiley:、悲傷 :anguished:、憤怒 :angry: 以及任何東西 :sunglasses:。輸入 : (冒號) 或在編輯器中的表情符號工具列中按鈕選擇吧 :ok_hand:
     first_mention:
       name: 首次提及
       long_description: 該徽章授予給第一次在帖子中@別人的你。每個提及都將通知對方，讓他們知道你發了貼。輸入 @ 提及任何用戶，如果可以的話，也可以提及群組——這是個獲得他們注意的好辦法。
     first_onebox:
-      name: 首個Onebox
-      description: 發佈過 oneboxed 連結
-      long_description: 該徽章授予給第一次在空行中發錶鏈接的你，連結將被展開成 onebox。其中有連結摘要、標題和（如果有）圖片。
+      name: 首個連結預覽
+      description: 張貼過具連結預覽的連結
+      long_description: 該徽章授予給第一次發表單行連結的你。連結將被展開成連結預覽，包還摘要、標題和圖片（如果有的話）。
     first_reply_by_email:
       name: 首次郵件回覆
       long_description: |
         該徽章授予給第一次通過郵件回覆的你 :e-mail:。
+    new_user_of_the_month:
+      name: "每月最佳新人"
+      description: 在第一個月表現傑出
+      long_description: |
+        這個徽章每個月授與兩位新使用者，以表揚他們的傑出貢獻。衡量的標準在發表的文章獲得喜歡的頻率、與喜愛者的身份。
   admin_login:
     success: "已發送郵件"
     error: "錯誤"
@@ -2564,15 +2556,15 @@ zh_TW:
       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>"
+      message: "<p>我們已寄送了一封啟用信件到 <b>%{email}</b>，請按照信中的步驟來啟用你的帳號。</p><p>如果你沒有收到郵件，請檢查你的 Discourse 郵件設定正確，並檢查你的垃圾郵件收件夾。</p>"
     resend_email:
       title: "重發啟用信件"
       message: "<p>我們已重發啟用信件至 <b>%{email}</b>"
   safe_mode:
     title: "進入安全模式"
-    description: "安全模式讓你的站點不載入插件或站點自定義設置。"
-    only_official: "禁用非官方插件"
-    no_plugins: "禁用所以插件"
+    description: "安全模式讓你的網站不載入套件或站點自定義設定。"
+    only_official: "停用非官方套件"
+    no_plugins: "停用所有套件"
     enter: "進入安全模式"
   wizard:
     title: "Discourse 安裝"
@@ -2680,7 +2672,6 @@ zh_TW:
         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: |
diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf
index d08cb11be7..c4f0c79ddf 100644
--- a/config/nginx.sample.conf
+++ b/config/nginx.sample.conf
@@ -12,6 +12,9 @@ upstream discourse {
 
 proxy_cache_path /var/nginx/cache keys_zone=one:10m max_size=200m;
 
+# see: https://meta.discourse.org/t/x/74060
+proxy_buffer_size 8k;
+
 # If you are going to use Puma, use these:
 #
 # upstream discourse {
@@ -25,7 +28,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 {
 
@@ -36,7 +39,7 @@ server {
   gzip_vary on;
   gzip_min_length 1000;
   gzip_comp_level 5;
-  gzip_types application/json text/css application/x-javascript application/javascript;
+  gzip_types application/json text/css application/x-javascript application/javascript image/svg+xml;
 
   # Uncomment and configure this section for HTTPS support
   # NOTE: Put your ssl cert in your main nginx config directory (/etc/nginx)
@@ -121,7 +124,7 @@ server {
     }
 
     # cache emojis
-    location ~ /_?emoji.*\.(png|gif|jpg|jpeg)$/ {
+    location ~ /images/emoji/ {
       expires 1y;
       add_header Cache-Control public,immutable;
     }
@@ -151,7 +154,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 +242,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/puma.rb b/config/puma.rb
index d472c7278f..85f38250ec 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,4 +1,4 @@
-if ENV['RAILS_ENV']=='production'
+if ENV['RAILS_ENV'] == 'production'
 
   # First, you need to change these below to your situation.
   APP_ROOT = '/home/discourse/discourse'
@@ -6,11 +6,11 @@ if ENV['RAILS_ENV']=='production'
 
   # Second, you can choose how many threads that you are going to run at same time.
   workers "#{num_workers}"
-  threads 8,32
+  threads 8, 32
 
   # Unless you know what you are changing, do not change them.
-  bind  "unix://#{APP_ROOT}/tmp/sockets/puma.sock"
-  stdout_redirect "#{APP_ROOT}/log/puma.log","#{APP_ROOT}/log/puma.err.log"
+  bind "unix://#{APP_ROOT}/tmp/sockets/puma.sock"
+  stdout_redirect "#{APP_ROOT}/log/puma.log", "#{APP_ROOT}/log/puma.err.log"
   pidfile "#{APP_ROOT}/tmp/pids/puma.pid"
   state_path "#{APP_ROOT}/tmp/pids/puma.state"
   daemonize true
diff --git a/config/routes.rb b/config/routes.rb
index 36c265da18..f3cb50b6fb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -5,10 +5,8 @@ require_dependency "staff_constraint"
 require_dependency "homepage_constraint"
 require_dependency "permalink_constraint"
 
-# This used to be User#username_format, but that causes a preload of the User object
-# and makes Guard not work properly.
+# The following constants have been replaced with `RouteFormat` and are deprecated.
 USERNAME_ROUTE_FORMAT = /[\w.\-]+?/ unless defined? USERNAME_ROUTE_FORMAT
-
 BACKUP_ROUTE_FORMAT = /.+\.(sql\.gz|tar\.gz|tgz)/i unless defined? BACKUP_ROUTE_FORMAT
 
 Discourse::Application.routes.draw do
@@ -93,7 +91,9 @@ Discourse::Application.routes.draw do
     get "groups/:type" => "groups#show", constraints: AdminConstraint.new
     get "groups/:type/:id" => "groups#show", constraints: AdminConstraint.new
 
-    resources :users, id: USERNAME_ROUTE_FORMAT, except: [:show] do
+    get "moderation_history" => "moderation_history#index"
+
+    resources :users, id: RouteFormat.username, except: [:show] do
       collection do
         get "list" => "users#index"
         get "list/:query" => "users#index"
@@ -117,8 +117,8 @@ Discourse::Application.routes.draw do
       post "log_out", constraints: AdminConstraint.new
       put "activate"
       put "deactivate"
-      put "block"
-      put "unblock"
+      put "silence"
+      put "unsilence"
       put "trust_level"
       put "trust_level_lock"
       put "primary_group"
@@ -130,12 +130,11 @@ Discourse::Application.routes.draw do
       put "anonymize"
       post "reset_bounce_score"
     end
-    get "users/:id.json" => 'users#show', defaults: {format: 'json'}
-    get 'users/:id/:username' => 'users#show', constraints: {username: USERNAME_ROUTE_FORMAT}
+    get "users/:id.json" => 'users#show', defaults: { format: 'json' }
+    get 'users/:id/:username' => 'users#show', constraints: { username: RouteFormat.username }
     get 'users/:id/:username/badges' => 'users#show'
     get 'users/:id/:username/tl3_requirements' => 'users#show'
 
-
     post "users/sync_sso" => "users#sync_sso", constraints: AdminConstraint.new
     post "users/invite_admin" => "users#invite_admin", constraints: AdminConstraint.new
 
@@ -169,6 +168,14 @@ Discourse::Application.routes.draw do
         end
       end
       resources :screened_urls,         only: [:index]
+      resources :watched_words, only: [:index, :create, :update, :destroy] do
+        collection do
+          get "action/:id" => "watched_words#index"
+        end
+      end
+      post "watched_words/upload" => "watched_words#upload"
+      resources :search_logs,           only: [:index]
+      get 'search_logs/term/:term' => 'search_logs#term'
     end
 
     get "/logs" => "staff_action_logs#index"
@@ -182,12 +189,15 @@ Discourse::Application.routes.draw do
     put "customize/embedding" => "embedding#update", constraints: AdminConstraint.new
 
     get "flags" => "flags#index"
-    get "flags/:filter" => "flags#index"
+    get "flags/:filter" => "flags#index", as: 'flags_filtered'
+    get "flags/topics/:topic_id" => "flags#index"
     post "flags/agree/:id" => "flags#agree"
     post "flags/disagree/:id" => "flags#disagree"
     post "flags/defer/:id" => "flags#defer"
 
+    resources :flagged_topics, constraints: StaffConstraint.new
     resources :themes, constraints: AdminConstraint.new
+
     post "themes/import" => "themes#import"
     post "themes/upload_asset" => "themes#upload_asset"
     get "themes/:id/preview" => "themes#preview"
@@ -242,10 +252,10 @@ Discourse::Application.routes.draw do
 
     resources :backups, only: [:index, :create], constraints: AdminConstraint.new do
       member do
-        get "" => "backups#show", constraints: { id: BACKUP_ROUTE_FORMAT }
-        put "" => "backups#email", constraints: { id: BACKUP_ROUTE_FORMAT }
-        delete "" => "backups#destroy", constraints: { id: BACKUP_ROUTE_FORMAT }
-        post "restore" => "backups#restore", constraints: { id: BACKUP_ROUTE_FORMAT }
+        get "" => "backups#show", constraints: { id: RouteFormat.backup }
+        put "" => "backups#email", constraints: { id: RouteFormat.backup }
+        delete "" => "backups#destroy", constraints: { id: RouteFormat.backup }
+        post "restore" => "backups#restore", constraints: { id: RouteFormat.backup }
       end
       collection do
         get "logs" => "backups#logs"
@@ -266,10 +276,9 @@ Discourse::Application.routes.draw do
       end
     end
 
-    get "memory_stats"=> "diagnostics#memory_stats", constraints: AdminConstraint.new
-    get "dump_heap"=> "diagnostics#dump_heap", constraints: AdminConstraint.new
-    get "dump_statement_cache"=> "diagnostics#dump_statement_cache", constraints: AdminConstraint.new
-
+    get "memory_stats" => "diagnostics#memory_stats", constraints: AdminConstraint.new
+    get "dump_heap" => "diagnostics#dump_heap", constraints: AdminConstraint.new
+    get "dump_statement_cache" => "diagnostics#dump_statement_cache", constraints: AdminConstraint.new
   end # admin namespace
 
   get "email_preferences" => "email#preferences_redirect", :as => "email_preferences_redirect"
@@ -280,7 +289,7 @@ Discourse::Application.routes.draw do
 
   get "extra-locales/:bundle" => "extra_locales#show"
 
-  resources :session, id: USERNAME_ROUTE_FORMAT, only: [:create, :destroy, :become] do
+  resources :session, id: RouteFormat.username, only: [:create, :destroy, :become] do
     get 'become'
     collection do
       post "forgot_password"
@@ -293,6 +302,7 @@ Discourse::Application.routes.draw do
   get "session/current" => "session#current"
   get "session/csrf" => "session#csrf"
   get "composer_messages" => "composer_messages#index"
+  post "composer/parse_html" => "composer#parse_html"
 
   resources :static
   post "login" => "static#enter", constraints: { format: /(json|html)/ }
@@ -309,7 +319,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"
@@ -325,7 +337,7 @@ Discourse::Application.routes.draw do
     post "#{root_path}/read-faq" => "users#read_faq"
     get "#{root_path}/search/users" => "users#search_users"
 
-    get({ "#{root_path}/account-created/" => "users#account_created" }.merge(index == 1 ? { as: :users_account_created } : {as: :old_account_created}))
+    get({ "#{root_path}/account-created/" => "users#account_created" }.merge(index == 1 ? { as: :users_account_created } : { as: :old_account_created }))
 
     get "#{root_path}/account-created/resent" => "users#account_created"
     get "#{root_path}/account-created/edit-email" => "users#account_created"
@@ -340,64 +352,64 @@ Discourse::Application.routes.draw do
       constraints: { token: /[0-9a-f]+/ }
     }.merge(index == 1 ? { as: 'confirm_admin' } : {}))
     post "#{root_path}/confirm-admin/:token" => "users#confirm_admin", constraints: { token: /[0-9a-f]+/ }
-    get "#{root_path}/:username/private-messages" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/private-messages/:filter" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/messages" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/messages/:filter" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/messages/group/:group_name" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT, group_name: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/messages/group/:group_name/archive" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT, group_name: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username.json" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}, defaults: {format: :json}
-    get({ "#{root_path}/:username" => "users#show", constraints: { username: USERNAME_ROUTE_FORMAT, format: /(json|html)/ } }.merge(index == 1 ? { as: 'user' } : {}))
-    put "#{root_path}/:username" => "users#update", constraints: {username: USERNAME_ROUTE_FORMAT}, defaults: { format: :json }
-    get "#{root_path}/:username/emails" => "users#check_emails", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get({ "#{root_path}/:username/preferences" => "users#preferences", constraints: { username: USERNAME_ROUTE_FORMAT } }.merge(index == 1 ? { as: :email_preferences } : {}))
-    get "#{root_path}/:username/preferences/email" => "users_email#index", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/account" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/profile" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/emails" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/notifications" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/categories" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/tags" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/interface" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/apps" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    put "#{root_path}/:username/preferences/email" => "users_email#update", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/about-me" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/badge_title" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    put "#{root_path}/:username/preferences/badge_title" => "users#badge_title", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/username" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    put "#{root_path}/:username/preferences/username" => "users#username", constraints: {username: USERNAME_ROUTE_FORMAT}
-    delete "#{root_path}/:username/preferences/user_image" => "users#destroy_user_image", constraints: {username: USERNAME_ROUTE_FORMAT}
-    put "#{root_path}/:username/preferences/avatar/pick" => "users#pick_avatar", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/card-badge" => "users#card_badge", constraints: {username: USERNAME_ROUTE_FORMAT}
-    put "#{root_path}/:username/preferences/card-badge" => "users#update_card_badge", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/staff-info" => "users#staff_info", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/summary" => "users#summary", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/invited" => "users#invited", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/invited_count" => "users#invited_count", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/invited/:filter" => "users#invited", constraints: {username: USERNAME_ROUTE_FORMAT}
+    get "#{root_path}/:username/private-messages" => "user_actions#private_messages", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/private-messages/:filter" => "user_actions#private_messages", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/messages" => "user_actions#private_messages", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/messages/:filter" => "user_actions#private_messages", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/messages/group/:group_name" => "user_actions#private_messages", constraints: { username: RouteFormat.username, group_name: RouteFormat.username }
+    get "#{root_path}/:username/messages/group/:group_name/archive" => "user_actions#private_messages", constraints: { username: RouteFormat.username, group_name: RouteFormat.username }
+    get "#{root_path}/:username.json" => "users#show", constraints: { username: RouteFormat.username }, defaults: { format: :json }
+    get({ "#{root_path}/:username" => "users#show", constraints: { username: RouteFormat.username, format: /(json|html)/ } }.merge(index == 1 ? { as: 'user' } : {}))
+    put "#{root_path}/:username" => "users#update", constraints: { username: RouteFormat.username }, defaults: { format: :json }
+    get "#{root_path}/:username/emails" => "users#check_emails", constraints: { username: RouteFormat.username }
+    get({ "#{root_path}/:username/preferences" => "users#preferences", constraints: { username: RouteFormat.username } }.merge(index == 1 ? { as: :email_preferences } : {}))
+    get "#{root_path}/:username/preferences/email" => "users_email#index", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/preferences/account" => "users#preferences", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/preferences/profile" => "users#preferences", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/preferences/emails" => "users#preferences", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/preferences/notifications" => "users#preferences", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/preferences/categories" => "users#preferences", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/preferences/tags" => "users#preferences", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/preferences/interface" => "users#preferences", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/preferences/apps" => "users#preferences", constraints: { username: RouteFormat.username }
+    put "#{root_path}/:username/preferences/email" => "users_email#update", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/preferences/about-me" => "users#preferences", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/preferences/badge_title" => "users#preferences", constraints: { username: RouteFormat.username }
+    put "#{root_path}/:username/preferences/badge_title" => "users#badge_title", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/preferences/username" => "users#preferences", constraints: { username: RouteFormat.username }
+    put "#{root_path}/:username/preferences/username" => "users#username", constraints: { username: RouteFormat.username }
+    delete "#{root_path}/:username/preferences/user_image" => "users#destroy_user_image", constraints: { username: RouteFormat.username }
+    put "#{root_path}/:username/preferences/avatar/pick" => "users#pick_avatar", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/preferences/card-badge" => "users#card_badge", constraints: { username: RouteFormat.username }
+    put "#{root_path}/:username/preferences/card-badge" => "users#update_card_badge", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/staff-info" => "users#staff_info", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/summary" => "users#summary", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/invited" => "users#invited", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/invited_count" => "users#invited_count", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/invited/:filter" => "users#invited", constraints: { username: RouteFormat.username }
     post "#{root_path}/action/send_activation_email" => "users#send_activation_email"
-    get "#{root_path}/:username/summary" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/activity/topics.rss" => "list#user_topics_feed", format: :rss, constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/activity.rss" => "posts#user_posts_feed", format: :rss, constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/activity" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/activity/:filter" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/badges" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/notifications" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/notifications/:filter" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/activity/pending" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
-    delete "#{root_path}/:username" => "users#destroy", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/by-external/:external_id" => "users#show", constraints: {external_id: /[^\/]+/}
-    get "#{root_path}/:username/flagged-posts" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/deleted-posts" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/topic-tracking-state" => "users#topic_tracking_state", constraints: {username: USERNAME_ROUTE_FORMAT}
+    get "#{root_path}/:username/summary" => "users#show", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/activity/topics.rss" => "list#user_topics_feed", format: :rss, constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/activity.rss" => "posts#user_posts_feed", format: :rss, constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/activity" => "users#show", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/activity/:filter" => "users#show", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/badges" => "users#badges", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/notifications" => "users#show", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/notifications/:filter" => "users#show", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/activity/pending" => "users#show", constraints: { username: RouteFormat.username }
+    delete "#{root_path}/:username" => "users#destroy", constraints: { username: RouteFormat.username }
+    get "#{root_path}/by-external/:external_id" => "users#show", constraints: { external_id: /[^\/]+/ }
+    get "#{root_path}/:username/flagged-posts" => "users#show", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/deleted-posts" => "users#show", constraints: { username: RouteFormat.username }
+    get "#{root_path}/:username/topic-tracking-state" => "users#topic_tracking_state", constraints: { username: RouteFormat.username }
   end
 
-  get "user-badges/:username.json" => "user_badges#username", constraints: {username: USERNAME_ROUTE_FORMAT}, defaults: {format: :json}
-  get "user-badges/:username" => "user_badges#username", constraints: {username: USERNAME_ROUTE_FORMAT}
+  get "user-badges/:username.json" => "user_badges#username", constraints: { username: RouteFormat.username }, defaults: { format: :json }
+  get "user-badges/:username" => "user_badges#username", constraints: { username: RouteFormat.username }
 
-  post "user_avatar/:username/refresh_gravatar" => "user_avatars#refresh_gravatar", constraints: {username: USERNAME_ROUTE_FORMAT}
-  get "letter_avatar/:username/:size/:version.png" => "user_avatars#show_letter", format: false, constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: USERNAME_ROUTE_FORMAT}
-  get "user_avatar/:hostname/:username/:size/:version.png" => "user_avatars#show", format: false, constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: USERNAME_ROUTE_FORMAT }
+  post "user_avatar/:username/refresh_gravatar" => "user_avatars#refresh_gravatar", constraints: { username: RouteFormat.username }
+  get "letter_avatar/:username/:size/:version.png" => "user_avatars#show_letter", format: false, constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: RouteFormat.username }
+  get "user_avatar/:hostname/:username/:size/:version.png" => "user_avatars#show", format: false, constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: RouteFormat.username }
 
   # in most production settings this is bypassed
   get "letter_avatar_proxy/:version/letter/:letter/:color/:size.png" => "user_avatars#show_proxy_letter"
@@ -408,6 +420,7 @@ Discourse::Application.routes.draw do
   get "stylesheets/:name.css" => "stylesheets#show", constraints: { name: /[-a-z0-9_]+/ }
 
   post "uploads" => "uploads#create"
+  post "uploads/lookup-urls" => "uploads#lookup_urls"
 
   # used to download original images
   get "uploads/:site/:sha(.:extension)" => "uploads#show", constraints: { site: /\w+/, sha: /\h{40}/, extension: /[a-z0-9\.]+/i }
@@ -420,10 +433,11 @@ Discourse::Application.routes.draw do
   get "private-posts" => "posts#latest", id: "private_posts"
   get "posts/by_number/:topic_id/:post_number" => "posts#by_number"
   get "posts/:id/reply-history" => "posts#reply_history"
-  get "posts/:username/deleted" => "posts#deleted_posts", constraints: {username: USERNAME_ROUTE_FORMAT}
-  get "posts/:username/flagged" => "posts#flagged_posts", constraints: {username: USERNAME_ROUTE_FORMAT}
+  get "posts/:id/reply-ids"     => "posts#reply_ids"
+  get "posts/:username/deleted" => "posts#deleted_posts", constraints: { username: RouteFormat.username }
+  get "posts/:username/flagged" => "posts#flagged_posts", constraints: { username: RouteFormat.username }
 
-  resources :groups, id: USERNAME_ROUTE_FORMAT do
+  resources :groups, id: RouteFormat.username do
     get "posts.rss" => "groups#posts_feed", format: :rss
     get "mentions.rss" => "groups#mentions_feed", format: :rss
 
@@ -436,8 +450,13 @@ Discourse::Application.routes.draw do
     get 'messages'
     get 'counts'
     get 'mentionable'
+    get 'messageable'
     get 'logs' => 'groups#histories'
 
+    collection do
+      get "search" => "groups#search"
+    end
+
     member do
       put "members" => "groups#add_members"
       delete "members" => "groups#remove_member"
@@ -499,10 +518,9 @@ Discourse::Application.routes.draw do
   get "/badges/:id(/:slug)" => "badges#show"
   resources :user_badges, only: [:index, :create, :destroy]
 
-
   get '/c', to: redirect('/categories')
 
-  resources :categories, :except => :show
+  resources :categories, except: :show
   post "category/:category_id/move" => "categories#move"
   post "categories/reorder" => "categories#reorder"
   post "category/:category_id/notifications" => "categories#set_notifications"
@@ -548,6 +566,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"
@@ -564,19 +583,19 @@ Discourse::Application.routes.draw do
   resources :similar_topics
 
   get "topics/feature_stats"
-  get "topics/created-by/:username" => "list#topics_by", as: "topics_by", constraints: {username: USERNAME_ROUTE_FORMAT}
-  get "topics/private-messages/:username" => "list#private_messages", as: "topics_private_messages", constraints: {username: USERNAME_ROUTE_FORMAT}
-  get "topics/private-messages-sent/:username" => "list#private_messages_sent", as: "topics_private_messages_sent", constraints: {username: USERNAME_ROUTE_FORMAT}
-  get "topics/private-messages-archive/:username" => "list#private_messages_archive", as: "topics_private_messages_archive", constraints: {username: USERNAME_ROUTE_FORMAT}
-  get "topics/private-messages-unread/:username" => "list#private_messages_unread", as: "topics_private_messages_unread", constraints: {username: USERNAME_ROUTE_FORMAT}
+  get "topics/created-by/:username" => "list#topics_by", as: "topics_by", constraints: { username: RouteFormat.username }
+  get "topics/private-messages/:username" => "list#private_messages", as: "topics_private_messages", constraints: { username: RouteFormat.username }
+  get "topics/private-messages-sent/:username" => "list#private_messages_sent", as: "topics_private_messages_sent", constraints: { username: RouteFormat.username }
+  get "topics/private-messages-archive/:username" => "list#private_messages_archive", as: "topics_private_messages_archive", constraints: { username: RouteFormat.username }
+  get "topics/private-messages-unread/:username" => "list#private_messages_unread", as: "topics_private_messages_unread", constraints: { username: RouteFormat.username }
   get "topics/private-messages-group/:username/:group_name.json" => "list#private_messages_group", as: "topics_private_messages_group", constraints: {
-    username: USERNAME_ROUTE_FORMAT,
-    group_name: USERNAME_ROUTE_FORMAT
+    username: RouteFormat.username,
+    group_name: RouteFormat.username
   }
 
   get "topics/private-messages-group/:username/:group_name/archive.json" => "list#private_messages_group_archive", as: "topics_private_messages_group_archive", constraints: {
-    username: USERNAME_ROUTE_FORMAT,
-    group_name: USERNAME_ROUTE_FORMAT
+    username: RouteFormat.username,
+    group_name: RouteFormat.username
   }
 
   get 'embed/comments' => 'embed#comments'
@@ -588,49 +607,49 @@ Discourse::Application.routes.draw do
 
   # Topic routes
   get "t/id_for/:slug" => "topics#id_for_slug"
-  get "t/:slug/:topic_id/print" => "topics#show", format: :html, print: true, constraints: {topic_id: /\d+/}
-  get "t/:slug/:topic_id/wordpress" => "topics#wordpress", constraints: {topic_id: /\d+/}
-  get "t/:topic_id/wordpress" => "topics#wordpress", constraints: {topic_id: /\d+/}
-  get "t/:slug/:topic_id/moderator-liked" => "topics#moderator_liked", constraints: {topic_id: /\d+/}
-  get "t/:slug/:topic_id/summary" => "topics#show", defaults: {summary: true}, constraints: {topic_id: /\d+/}
-  get "t/:slug/:topic_id/unsubscribe" => "topics#unsubscribe", constraints: {topic_id: /\d+/}
-  get "t/:topic_id/unsubscribe" => "topics#unsubscribe", constraints: {topic_id: /\d+/}
-  get "t/:topic_id/summary" => "topics#show", constraints: {topic_id: /\d+/}
-  put "t/:slug/:topic_id" => "topics#update", constraints: {topic_id: /\d+/}
-  put "t/:slug/:topic_id/star" => "topics#star", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/star" => "topics#star", constraints: {topic_id: /\d+/}
-  put "t/:slug/:topic_id/status" => "topics#status", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/status" => "topics#status", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/clear-pin" => "topics#clear_pin", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/re-pin" => "topics#re_pin", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/mute" => "topics#mute", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/unmute" => "topics#unmute", constraints: {topic_id: /\d+/}
-  post "t/:topic_id/timer" => "topics#timer", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/make-banner" => "topics#make_banner", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/remove-banner" => "topics#remove_banner", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/remove-allowed-user" => "topics#remove_allowed_user", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/remove-allowed-group" => "topics#remove_allowed_group", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/recover" => "topics#recover", constraints: {topic_id: /\d+/}
-  get "t/:topic_id/:post_number" => "topics#show", constraints: {topic_id: /\d+/, post_number: /\d+/}
-  get "t/:topic_id/last" => "topics#show", post_number: 99999999, constraints: {topic_id: /\d+/}
-  get "t/:slug/:topic_id.rss" => "topics#feed", format: :rss, constraints: {topic_id: /\d+/}
-  get "t/:slug/:topic_id" => "topics#show", constraints: {topic_id: /\d+/}
-  get "t/:slug/:topic_id/:post_number" => "topics#show", constraints: {topic_id: /\d+/, post_number: /\d+/}
-  get "t/:slug/:topic_id/last" => "topics#show", post_number: 99999999, constraints: {topic_id: /\d+/}
-  get "t/:topic_id/posts" => "topics#posts", constraints: {topic_id: /\d+/}, format: :json
-  get "t/:topic_id/excerpts" => "topics#excerpts", constraints: {topic_id: /\d+/}, format: :json
-  post "t/:topic_id/timings" => "topics#timings", constraints: {topic_id: /\d+/}
-  post "t/:topic_id/invite" => "topics#invite", constraints: {topic_id: /\d+/}
-  post "t/:topic_id/invite-group" => "topics#invite_group", constraints: {topic_id: /\d+/}
-  post "t/:topic_id/move-posts" => "topics#move_posts", constraints: {topic_id: /\d+/}
-  post "t/:topic_id/merge-topic" => "topics#merge_topic", constraints: {topic_id: /\d+/}
-  post "t/:topic_id/change-owner" => "topics#change_post_owners", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/change-timestamp" => "topics#change_timestamps", constraints: {topic_id: /\d+/}
-  delete "t/:topic_id/timings" => "topics#destroy_timings", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/bookmark" => "topics#bookmark", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/remove_bookmarks" => "topics#remove_bookmarks", constraints: {topic_id: /\d+/}
+  get "t/:slug/:topic_id/print" => "topics#show", format: :html, print: true, constraints: { topic_id: /\d+/ }
+  get "t/:slug/:topic_id/wordpress" => "topics#wordpress", constraints: { topic_id: /\d+/ }
+  get "t/:topic_id/wordpress" => "topics#wordpress", constraints: { topic_id: /\d+/ }
+  get "t/:slug/:topic_id/moderator-liked" => "topics#moderator_liked", constraints: { topic_id: /\d+/ }
+  get "t/:slug/:topic_id/summary" => "topics#show", defaults: { summary: true }, constraints: { topic_id: /\d+/ }
+  get "t/:slug/:topic_id/unsubscribe" => "topics#unsubscribe", constraints: { topic_id: /\d+/ }
+  get "t/:topic_id/unsubscribe" => "topics#unsubscribe", constraints: { topic_id: /\d+/ }
+  get "t/:topic_id/summary" => "topics#show", constraints: { topic_id: /\d+/ }
+  put "t/:slug/:topic_id" => "topics#update", constraints: { topic_id: /\d+/ }
+  put "t/:slug/:topic_id/star" => "topics#star", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/star" => "topics#star", constraints: { topic_id: /\d+/ }
+  put "t/:slug/:topic_id/status" => "topics#status", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/status" => "topics#status", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/clear-pin" => "topics#clear_pin", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/re-pin" => "topics#re_pin", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/mute" => "topics#mute", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/unmute" => "topics#unmute", constraints: { topic_id: /\d+/ }
+  post "t/:topic_id/timer" => "topics#timer", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/make-banner" => "topics#make_banner", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/remove-banner" => "topics#remove_banner", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/remove-allowed-user" => "topics#remove_allowed_user", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/remove-allowed-group" => "topics#remove_allowed_group", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/recover" => "topics#recover", constraints: { topic_id: /\d+/ }
+  get "t/:topic_id/:post_number" => "topics#show", constraints: { topic_id: /\d+/, post_number: /\d+/ }
+  get "t/:topic_id/last" => "topics#show", post_number: 99999999, constraints: { topic_id: /\d+/ }
+  get "t/:slug/:topic_id.rss" => "topics#feed", format: :rss, constraints: { topic_id: /\d+/ }
+  get "t/:slug/:topic_id" => "topics#show", constraints: { topic_id: /\d+/ }
+  get "t/:slug/:topic_id/:post_number" => "topics#show", constraints: { topic_id: /\d+/, post_number: /\d+/ }
+  get "t/:slug/:topic_id/last" => "topics#show", post_number: 99999999, constraints: { topic_id: /\d+/ }
+  get "t/:topic_id/posts" => "topics#posts", constraints: { topic_id: /\d+/ }, format: :json
+  get "t/:topic_id/excerpts" => "topics#excerpts", constraints: { topic_id: /\d+/ }, format: :json
+  post "t/:topic_id/timings" => "topics#timings", constraints: { topic_id: /\d+/ }
+  post "t/:topic_id/invite" => "topics#invite", constraints: { topic_id: /\d+/ }
+  post "t/:topic_id/invite-group" => "topics#invite_group", constraints: { topic_id: /\d+/ }
+  post "t/:topic_id/move-posts" => "topics#move_posts", constraints: { topic_id: /\d+/ }
+  post "t/:topic_id/merge-topic" => "topics#merge_topic", constraints: { topic_id: /\d+/ }
+  post "t/:topic_id/change-owner" => "topics#change_post_owners", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/change-timestamp" => "topics#change_timestamps", constraints: { topic_id: /\d+/ }
+  delete "t/:topic_id/timings" => "topics#destroy_timings", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/bookmark" => "topics#bookmark", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/remove_bookmarks" => "topics#remove_bookmarks", constraints: { topic_id: /\d+/ }
 
-  post "t/:topic_id/notifications" => "topics#set_notifications" , constraints: {topic_id: /\d+/}
+  post "t/:topic_id/notifications" => "topics#set_notifications" , constraints: { topic_id: /\d+/ }
 
   get "p/:post_id(/:user_id)" => "posts#short_link"
   get "/posts/:id/cooked" => "posts#cooked"
@@ -644,6 +663,7 @@ 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"
@@ -660,6 +680,7 @@ Discourse::Application.routes.draw do
   end
 
   get "onebox" => "onebox#show"
+  get "inline-onebox" => "inline_onebox#show"
 
   get "exception" => "list#latest"
 
@@ -669,12 +690,15 @@ Discourse::Application.routes.draw do
   post "draft" => "draft#update"
   delete "draft" => "draft#destroy"
 
+  get "service-worker" => "static#service_worker_asset", format: :js
+
   get "cdn_asset/:site/*path" => "static#cdn_asset", format: false
   get "brotli_asset/*path" => "static#brotli_asset", format: false
 
   get "favicon/proxied" => "static#favicon", format: false
 
   get "robots.txt" => "robots_txt#index"
+  get "offline.html" => "offline#index"
   get "manifest.json" => "metadata#manifest", as: :manifest
   get "opensearch" => "metadata#opensearch", format: :xml
 
@@ -709,12 +733,12 @@ Discourse::Application.routes.draw do
   end
 
   Discourse.filters.each do |filter|
-    root to: "list##{filter}", constraints: HomePageConstraint.new("#{filter}"), :as => "list_#{filter}"
+    root to: "list##{filter}", constraints: HomePageConstraint.new("#{filter}"), as: "list_#{filter}"
   end
   # special case for categories
-  root to: "categories#index", constraints: HomePageConstraint.new("categories"), :as => "categories_index"
+  root to: "categories#index", constraints: HomePageConstraint.new("categories"), as: "categories_index"
   # special case for top
-  root to: "list#top", constraints: HomePageConstraint.new("top"), :as => "top_lists"
+  root to: "list#top", constraints: HomePageConstraint.new("top"), as: "top_lists"
 
   root to: 'finish_installation#index', constraints: HomePageConstraint.new("finish_installation"), as: 'installation_redirect'
 
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 7b095d7d42..3f94e6a21b 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -1,5 +1,6 @@
 ---
 development:
+  :concurrency: 5
   :queues:
     - [critical,4]
     - [default, 2]
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 76afea633e..c94fff8489 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -12,6 +12,9 @@
 # shadowed_by_global - "Shadow" a site setting with a GlobalSetting. If the GlobalSetting
 #                      exists it will be used instead of the setting and the setting will be hidden.
 #                      Useful for things like API keys on multisite.
+# locale_default     - A hash which overrides according to `SiteSetting.default_locale`.
+#                      The key should be as the same as possible value of default_locale.
+#
 #
 # type: email    - Must be a valid email address.
 # type: username - Must match the username of an existing user.
@@ -51,6 +54,8 @@ required:
   mobile_logo_url:
     client: true
     default: ''
+  large_icon_url:
+    default: ''
   favicon_url:
     client: true
     default: '/images/default-favicon.ico'
@@ -68,11 +73,6 @@ required:
     default: ''
 
 basic:
-  default_locale:
-    default: 'en'
-    enum: 'LocaleSiteSetting'
-    refresh: true
-    shadowed_by_global: true
   allow_user_locale:
     client: true
     default: false
@@ -103,12 +103,9 @@ basic:
   ga_universal_domain_name:
     client: true
     default: 'auto'
-  ga_tracking_code:
-    client: true
-    default: ''
-  ga_domain_name:
-    client: true
+  ga_universal_auto_link_domains:
     default: ''
+    type: list
   gtm_container_id:
     client: true
     default: ''
@@ -181,11 +178,12 @@ basic:
       - bar
       - box
       - bullet
-    preview: '<span class="badge-wrapper {{value}}"><span class="badge-category-parent-bg" style="background-color: #aaa;"></span><span class="badge-category-bg" style="background-color: #777;"></span><span style="color: #fff;" data-drop-close="true" class="badge-category clear-badge">Category</span></span>'
+      - none
   enable_mobile_theme:
     client: true
     default: true
   default_theme_key:
+    default: ''
     hidden: true
   relative_date_duration:
     client: true
@@ -293,6 +291,7 @@ login:
   enable_sso:
     client: true
     default: false
+    validator: "EnableSsoValidator"
   sso_allows_all_return_paths: false
   enable_sso_provider: false
   verbose_sso_logging: false
@@ -304,7 +303,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:
@@ -317,7 +318,7 @@ login:
   email_domains_whitelist:
     default: ''
     type: list
-  forgot_password_strict: false
+  hide_email_address_taken: false
   log_out_strict: true
   pending_users_reminder_delay:
     min: -1
@@ -415,9 +416,14 @@ users:
   hide_user_profiles_from_public:
     default: false
     client: true
+  show_inactive_accounts:
+    default: false
   user_website_domains_whitelist:
     default: ''
     type: list
+  hide_suspension_reasons:
+    default: false
+    client: true
 
 groups:
   enable_group_directory:
@@ -428,21 +434,24 @@ posting:
   min_post_length:
     client: true
     min: 1
-    default:
-      test: 5
-      default: 20
+    default: 20
+    locale_default:
+      zh_CN: 8
+      zh_TW: 8
   min_first_post_length:
     client: true
     min: 1
-    default:
-      test: 5
-      default: 20
+    default: 20
+    locale_default:
+      zh_CN: 8
+      zh_TW: 8
   min_private_message_post_length:
     client: true
     min: 1
-    default:
-      test: 5
-      default: 10
+    default: 10
+    locale_default:
+      zh_CN: 3
+      zh_TW: 3
   max_post_length:
     client: true
     default: 32000
@@ -450,17 +459,34 @@ posting:
   topic_featured_link_enabled:
     client: true
     default: true
-  body_min_entropy: 7
+  body_min_entropy:
+    default: 7
+    locale_default:
+      zh_CN: 3
+      zh_TW: 3
   min_topic_title_length:
     client: true
     default: 15
+    min: 1
+    locale_default:
+      zh_CN: 6
+      zh_TW: 6
   max_topic_title_length:
     client: true
     default: 255
+    min: 5
     max: 255
-  title_min_entropy: 10
+  title_min_entropy:
+    default: 10
+    locale_default:
+      zh_CN: 3
+      zh_TW: 3
   allow_uppercase_posts: false
-  title_prettify: true
+  title_prettify:
+    default: true
+    locale_default:
+      zh_CN: false
+      zh_TW: false
   title_fancy_entities: true
   min_private_message_title_length:
     client: true
@@ -474,12 +500,16 @@ posting:
   min_title_similar_length:
     client: true
     default: 10
-  min_body_similar_length:
-    client: true
-    default: 15
+    locale_default:
+      zh_CN: 4
+      zh_TW: 4
   enable_private_messages:
     default: true
     client: true
+  enable_private_email_messages:
+    default: false
+    client: true
+    validator: "EnablePrivateEmailMessagesValidator"
   editing_grace_period: 300
   post_edit_time_limit:
     default: 86400
@@ -493,7 +523,10 @@ posting:
   traditional_markdown_linebreaks:
     client: true
     default: false
-  allow_html_tables:
+  enable_markdown_typographer:
+    client: true
+    default: true
+  enable_rich_text_paste:
     client: true
     default: false
   suppress_reply_directly_below:
@@ -508,6 +541,9 @@ posting:
     default: 1
     client: true
   post_undo_action_window_mins: 10
+  enable_mentions:
+    default: true
+    client: true
   max_mentions_per_post: 10
   max_users_notified_per_group_mention: 100
   newuser_max_replies_per_topic: 3
@@ -520,7 +556,11 @@ posting:
   newuser_max_attachments:
     client: true
     default: 0
-  post_excerpt_maxlength: 300
+  post_excerpt_maxlength:
+    default: 300
+    locale_default:
+      zh_CN: 120
+      zh_TW: 120
   show_pinned_excerpt_mobile:
     client: true
     default: true
@@ -550,11 +590,6 @@ posting:
     type: list
     client: true
   delete_old_hidden_posts: true
-  censored_words:
-    client: true
-    default: ''
-    refresh: true
-    type: list
   censored_pattern:
     client: true
     default: ''
@@ -564,7 +599,7 @@ posting:
     default: true
     client: true
   emoji_set:
-    default: 'emoji_one'
+    default: 'twitter'
     client: true
     enum: 'EmojiSetSiteSetting'
   enforce_square_emoji:
@@ -594,6 +629,16 @@ posting:
     client: true
     default: ''
     type: list
+  max_allowed_message_recipients:
+    default: 30
+    min: 1
+  watched_words_regular_expressions:
+    default: false
+  enable_advanced_editor_preview_sync:
+    hidden: true
+    default: false
+    client: true
+    shadowed_by_global: true
 
 email:
   email_time_window_mins:
@@ -601,7 +646,11 @@ email:
     client: true
   private_email_time_window_seconds: 20
   email_posts_context: 5
-  digest_min_excerpt_length: 100
+  digest_min_excerpt_length:
+    default: 100
+    locale_default:
+      zh_CN: 50
+      zh_TW: 50
   digest_topics:
     default: 5
     min: 1
@@ -629,6 +678,8 @@ email:
   alternative_reply_by_email_addresses:
     default: ''
     validator: "AlternativeReplyByEmailAddressesValidator"
+  find_related_post_with_key:
+    default: true
   manual_polling_enabled:
     default: false
   pop3_polling_enabled:
@@ -695,7 +746,7 @@ email:
     default: "pkcs7|x-vcard"
   attachment_filename_blacklist:
     type: list
-    default: "smime.p7s|signature.asc"
+    default: "smime.p7s|signature.asc|winmail.dat"
   enable_forwarded_emails: false
   always_show_trimmed_content: false
   private_email: false
@@ -722,9 +773,7 @@ files:
     refresh: true
     type: list
   crawl_images:
-    default:
-      test: false
-      default: true
+    default: true
   max_image_width:
     client: true
     default: 690
@@ -732,9 +781,7 @@ files:
     client: true
     default: 500
   download_remote_images_to_local:
-    default:
-      test: false
-      default: true
+    default: true
   download_remote_images_threshold: 10
   download_remote_images_max_days_old:
     default: 30
@@ -798,6 +845,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,6 +872,9 @@ trust:
   min_trust_to_send_messages:
     default: 1
     enum: 'TrustLevelSetting'
+  min_trust_to_send_email_messages:
+    default: 4
+    enum: 'TrustLevelSetting'
   tl1_requires_topics_entered: 5
   tl1_requires_read_posts:
     default: 30
@@ -884,6 +938,10 @@ security:
   enable_escaped_fragments: true
   allow_index_in_robots_txt: true
   allow_moderators_to_create_categories: false
+  crawler_user_agents:
+    hidden: true
+    default: 'Googlebot|Mediapartners|AdsBot|curl|HTTrack|Twitterbot|facebookexternalhit|bingbot|Baiduspider|ia_archiver|archive.org_bot|Wayback Save Page|360Spider|Swiftbot|YandexBot'
+    type: list
   cors_origins:
     default: ''
     type: list
@@ -894,26 +952,42 @@ security:
     default: ''
     type: list
     shadowed_by_global: true
+  whitelist_internal_hosts:
+    default: ''
+    type: list
+  allowed_iframes:
+    default: 'https://www.google.com/maps/embed?|https://www.openstreetmap.org/export/embed.html?'
+    type: list
+    client: true
 
 onebox:
   enable_flash_video_onebox: false
-  post_onebox_maxlength: 500
+  post_onebox_maxlength:
+    default: 500
+    locale_default:
+      zh_CN: 200
+      zh_TW: 200
   onebox_domains_blacklist:
     default: ''
     type: list
   max_oneboxes_per_post:
     default: 50
     client: true
+  inline_onebox_domains_whitelist:
+    default: ''
+    type: list
+  enable_inline_onebox_on_all_domains:
+    default: false
 
 spam:
   add_rel_nofollow_to_user_content: true
   flags_required_to_hide_post: 3
   cooldown_minutes_after_hiding_posts: 10
-  num_spam_flags_to_block_new_user: 3
-  num_users_to_block_new_user: 3
-  num_tl3_flags_to_block_new_user: 4
-  num_tl3_users_to_block_new_user: 2
-  notify_mods_when_user_blocked: false
+  num_spam_flags_to_silence_new_user: 3
+  num_users_to_silence_new_user: 3
+  num_tl3_flags_to_silence_new_user: 4
+  num_tl3_users_to_silence_new_user: 2
+  notify_mods_when_user_silenced: false
   flag_sockpuppets: false
   newuser_spam_host_threshold: 3
   white_listed_spam_host_domains:
@@ -933,15 +1007,15 @@ spam:
     min: 1
   auto_respond_to_flag_actions: true
   min_first_post_typing_time: 3000
-  auto_block_fast_typers_on_first_post: true
-  auto_block_fast_typers_max_trust_level: 0
-  auto_block_first_post_regex: ""
+  auto_silence_fast_typers_on_first_post: true
+  auto_silence_fast_typers_max_trust_level: 0
+  auto_silence_first_post_regex: ""
+  flags_default_topics:
+    default: false
+    client: true
 
 rate_limits:
-  unique_posts_mins:
-    default:
-      test: 0
-      default: 5
+  unique_posts_mins: 5
   rate_limit_create_topic: 15
   rate_limit_create_post: 5
   rate_limit_new_user_create_topic: 120
@@ -979,28 +1053,20 @@ rate_limits:
 
 developer:
   force_hostname:
-    hidden:
-      development: false
-      default: true
+    hidden: true
     default: ''
   port:
-    hidden:
-      development: false
-      default: true
-    default:
-      development: 3000
-      default: ''
+    hidden: true
+    default: ''
   queue_jobs:
-    hidden:
-      development: false
-      default: true
-    default:
-      test: false
-      default: true
+    hidden: true
+    default: true
   enable_long_polling:
     client: true
     default: true
-  long_polling_interval: 25000
+  long_polling_interval:
+    default: 25000
+    max: 25000
   long_polling_base_url:
     client: true
     default: '/'
@@ -1030,7 +1096,7 @@ developer:
   top_topics_formula_least_likes_per_post_multiplier:
     default: 3
   rebake_old_posts_count:
-    default: 250
+    default: 100
     min: 1
   migrate_to_new_scheme:
     hidden: true
@@ -1045,6 +1111,16 @@ developer:
   bypass_wizard_check:
     default: false
     hidden: true
+  logging_provider:
+    hidden: true
+    default: 'default'
+    type: 'list'
+    choices:
+      - 'default'
+      - 'lograge'
+  bootstrap_error_pages:
+    hidden: true
+    default: false
 
 embedding:
   feed_polling_enabled:
@@ -1093,10 +1169,15 @@ legal:
     default: ''
 
 backups:
-  readonly_mode_during_backup:
+  enable_backups:
     default: true
+    shadowed_by_global: true
+    client: true
+  readonly_mode_during_backup:
+    default: false
   allow_restore:
     default: false
+    shadowed_by_global: true
   maximum_backups:
     client: true
     default: 5
@@ -1127,15 +1208,25 @@ search:
   min_search_term_length:
     client: true
     default: 3
+    locale_default:
+      zh_CN: 2
+      zh_TW: 2
 
   search_tokenize_chinese_japanese_korean: false
   search_prefer_recent_posts: false
-  search_recent_posts_size: 100000
+  search_recent_posts_size:
+    default: 100000
+    max: 100000
+  log_search_queries: true
+  search_query_log_max_size:
+    default: 1000000
+    max: 1000000
 
 uncategorized:
   version_checks:
     client: true
     default: true
+    shadowed_by_global: true
   new_version_emails: true
   send_welcome_message: true
 
@@ -1146,6 +1237,9 @@ uncategorized:
   slug_generation_method:
     default: 'ascii'
     enum: 'SlugSetting'
+    locale_default:
+      zh_CN: 'none'
+      zh_TW: 'none'
 
   permalink_normalizations:
     default: ''
@@ -1286,13 +1380,22 @@ uncategorized:
   read_time_word_count:
     default: 500
     client: true
+    locale_default:
+      zh_CN: 350
+      zh_TW: 350
 
-  topic_page_title_includes_category: true
+  topic_page_title_includes_category:
+    default: true
+    client: true
 
   native_app_install_banner: false
 
   share_anonymized_statistics: true
 
+  auto_handle_queued_age:
+    default: 60
+    min: 0
+
 user_preferences:
   default_email_digest_frequency:
     enum: 'DigestEmailSiteSetting'
@@ -1303,7 +1406,7 @@ user_preferences:
   default_email_mailing_list_mode: false
   default_email_mailing_list_mode_frequency:
     enum: 'MailingListModeSiteSetting'
-    default: 0
+    default: 1
   disable_mailing_list_mode:
     default: false
     client: true
@@ -1348,11 +1451,11 @@ user_preferences:
     type: category_list
     default: ''
 
+api:
+  retain_web_hook_events_period_days:
+    default: 30
+
 user_api:
-  max_user_api_reqs_per_day:
-    default: 2880
-  max_user_api_reqs_per_minute:
-    default: 20
   allow_user_api_keys:
     default: true
   allow_user_api_key_scopes:
@@ -1361,9 +1464,10 @@ user_api:
   max_api_keys_per_user:
     default: 10
   push_api_secret_key:
+    default: ''
     hidden: true
   min_trust_level_for_user_api_key:
-    default: 1
+    default: 0
     enum: 'TrustLevelSetting'
   allowed_user_api_push_urls:
     default: ''
diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
index 2e142c1b0d..e5f5c4d112 100644
--- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb
@@ -1,5 +1,10 @@
 # See http://unicorn.bogomips.org/Unicorn/Configurator.html
 
+if ENV["LOGSTASH_UNICORN_URI"]
+  require_relative '../lib/discourse_logstash_logger'
+  logger DiscourseLogstashLogger.logger(uri: ENV['LOGSTASH_UNICORN_URI'], type: :unicorn)
+end
+
 # enable out of band gc out of the box, it is low risk and improves perf a lot
 ENV['UNICORN_ENABLE_OOBGC'] ||= "1"
 
@@ -17,7 +22,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,
@@ -66,7 +71,7 @@ before_fork do |server, worker|
     I18n.t(:posts)
 
     # load up all models and schema
-    (ActiveRecord::Base.connection.tables - %w[schema_migrations]).each do |table|
+    (ActiveRecord::Base.connection.tables - %w[schema_migrations versions]).each do |table|
       table.classify.constantize.first rescue nil
     end
 
@@ -85,6 +90,11 @@ before_fork do |server, worker|
       end
     end
 
+    # preload discourse version
+    Discourse.git_version
+    Discourse.git_branch
+    Discourse.full_version
+
     # get rid of rubbish so we don't share it
     GC.start
 
@@ -108,10 +118,14 @@ before_fork do |server, worker|
       puts "Starting up #{sidekiqs} supervised sidekiqs"
 
       require 'demon/sidekiq'
-
       if @stats_socket_dir
         Demon::Sidekiq.after_fork do
           start_stats_socket(server)
+          DiscourseEvent.trigger(:sidekiq_fork_started)
+        end
+      else
+        Demon::Sidekiq.after_fork do
+          DiscourseEvent.trigger(:sidekiq_fork_started)
         end
       end
       Demon::Sidekiq.start(sidekiqs)
@@ -126,9 +140,9 @@ before_fork do |server, worker|
 
         def max_rss
           rss = `ps -eo rss,args | grep sidekiq | grep -v grep | awk '{print $1}'`
-                .split("\n")
-                .map(&:to_i)
-                .max
+            .split("\n")
+            .map(&:to_i)
+            .max
 
           rss ||= 0
 
@@ -146,9 +160,9 @@ before_fork do |server, worker|
         def force_kill_rogue_sidekiq
           info = `ps -eo pid,rss,args | grep sidekiq | grep -v grep | awk '{print $1,$2}'`
           info.split("\n").each do |row|
-            pid,mem = row.split(" ").map(&:to_i)
-            if pid > 0 && (mem*1024) > max_allowed_size
-              Rails.logger.warn "Detected rogue Sidekiq pid #{pid} mem #{mem*1024}, killing"
+            pid, mem = row.split(" ").map(&:to_i)
+            if pid > 0 && (mem * 1024) > max_allowed_size
+              Rails.logger.warn "Detected rogue Sidekiq pid #{pid} mem #{mem * 1024}, killing"
               Process.kill("KILL", pid) rescue nil
             end
           end
@@ -199,7 +213,6 @@ before_fork do |server, worker|
   ActiveRecord::Base.connection.disconnect!
   $redis.client.disconnect
 
-
   # Throttle the master from forking too quickly by sleeping.  Due
   # to the implementation of standard Unix signal handlers, this
   # helps (but does not completely) prevent identical, repeated signals
@@ -214,6 +227,8 @@ end
 after_fork do |server, worker|
   start_stats_socket(server)
 
+  DiscourseEvent.trigger(:web_fork_started)
+
   # warm up v8 after fork, that way we do not fork a v8 context
   # it may cause issues if bg threads in a v8 isolate randomly stop
   # working due to fork
diff --git a/db/api_test_seeds.rb b/db/api_test_seeds.rb
index 53aed52071..ece7fc1935 100644
--- a/db/api_test_seeds.rb
+++ b/db/api_test_seeds.rb
@@ -1,2 +1,3 @@
-User.create(name: "Test User", email: "test_user@example.com", password: "password", username: "test_user", approved: true, active: true, auth_token: "39a925803ddc658a68a7e276e558ed62", admin: true)
-ApiKey.create(key: 'test_d7fd0429940', user_id: 1, created_by_id: 1)
+user = User.where(username: "test_user").first_or_create(name: "Test User", email: "test_user@example.com", password: SecureRandom.hex, username: "test_user", approved: true, active: true, admin: true)
+UserAuthToken.generate!(user_id: user.id)
+ApiKey.create(key: 'test_d7fd0429940', user_id: user.id, created_by_id: user.id)
diff --git a/db/fixtures/001_categories.rb b/db/fixtures/001_categories.rb
index 1a0282b84e..4dc13268ac 100644
--- a/db/fixtures/001_categories.rb
+++ b/db/fixtures/001_categories.rb
@@ -30,7 +30,7 @@ ColumnDropper.drop(
   table: 'categories',
   after_migration: 'AddUploadsToCategories',
   columns: ['logo_url', 'background_url'],
-  on_drop: ->(){
+  on_drop: ->() {
     STDERR.puts 'Removing superflous categories columns!'
   }
 )
diff --git a/db/fixtures/002_groups.rb b/db/fixtures/002_groups.rb
index 94757078a7..900f4b3ca8 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: 'SplitAliasLevels',
+  columns:  %w[visible public alias_level],
+  on_drop: ->() {
+    STDERR.puts 'Removing superflous visible group column!'
+  }
+)
diff --git a/db/fixtures/006_badges.rb b/db/fixtures/006_badges.rb
index a8f55dd6f8..18022ab451 100644
--- a/db/fixtures/006_badges.rb
+++ b/db/fixtures/006_badges.rb
@@ -142,9 +142,9 @@ Badge.seed do |b|
 end
 
 [
-  [Badge::Promoter,"Promoter",BadgeType::Bronze,1,0],
-  [Badge::Campaigner,"Campaigner",BadgeType::Silver,3,1],
-  [Badge::Champion,"Champion",BadgeType::Gold,5,2],
+  [Badge::Promoter, "Promoter", BadgeType::Bronze, 1, 0],
+  [Badge::Campaigner, "Campaigner", BadgeType::Silver, 3, 1],
+  [Badge::Champion, "Champion", BadgeType::Gold, 5, 2],
 ].each do |id, name, type, count, trust_level|
   Badge.seed do |b|
     b.id = id
@@ -154,7 +154,7 @@ end
     b.multiple_grant = false
     b.target_posts = false
     b.show_posts = false
-    b.query = BadgeQueries.invite_badge(count,trust_level)
+    b.query = BadgeQueries.invite_badge(count, trust_level)
     b.default_badge_grouping_id = BadgeGrouping::Community
     # daily is good enough
     b.trigger = Badge::Trigger::None
@@ -307,7 +307,6 @@ end
   end
 end
 
-
 [
   [Badge::ThankYou,   "Thank You",  BadgeType::Bronze, 20, 10],
   [Badge::GivesBack,  "Gives Back", BadgeType::Silver, 100, 100],
@@ -416,6 +415,25 @@ Badge.seed do |b|
   b.system = true
 end
 
+[
+  [Badge::Enthusiast, "Enthusiast", BadgeType::Bronze, 10],
+  [Badge::Aficionado, "Aficionado", BadgeType::Silver, 100],
+  [Badge::Devotee,    "Devotee",    BadgeType::Gold,   365],
+].each do |id, name, level, days|
+  Badge.seed do |b|
+    b.id = id
+    b.name = name
+    b.default_icon = "fa-eye"
+    b.badge_type_id = level
+    b.query = BadgeQueries.consecutive_visits(days)
+    b.badge_grouping_id = BadgeGrouping::Community
+    b.default_badge_grouping_id = BadgeGrouping::Community
+    b.trigger = Badge::Trigger::None
+    b.auto_revoke = false
+    b.system = true
+  end
+end
+
 Badge.where("NOT system AND id < 100").each do |badge|
   new_id = [Badge.maximum(:id) + 1, 100].max
   old_id = badge.id
diff --git a/db/fixtures/009_users.rb b/db/fixtures/009_users.rb
index d725d78a41..6a97df4bb2 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
@@ -27,41 +33,81 @@ UserOption.where(user_id: -1).update_all(
 
 Group.user_trust_level_change!(-1, TrustLevel[4])
 
+ColumnDropper.drop(
+  table: 'users',
+  after_migration: 'DropEmailFromUsers',
+  columns: %w[
+    email
+    email_always
+    mailing_list_mode
+    email_digests
+    email_direct
+    email_private_messages
+    external_links_in_new_tab
+    enable_quoting
+    dynamic_favicon
+    disable_jump_reply
+    edit_history_public
+    automatically_unpin_topics
+    digest_after_days
+    auto_track_topics_after_msecs
+    new_topic_duration_minutes
+    last_redirected_to_top_at
+    auth_token
+    auth_token_updated_at
+  ],
+  on_drop: ->() {
+    STDERR.puts 'Removing superflous users columns!'
+  }
+)
 
 ColumnDropper.drop(
   table: 'users',
-  after_migration: 'AddUserAuthTokens',
-  columns:  %w[
-      email_always
-      mailing_list_mode
-      email_digests
-      email_direct
-      email_private_messages
-      external_links_in_new_tab
-      enable_quoting
-      dynamic_favicon
-      disable_jump_reply
-      edit_history_public
-      automatically_unpin_topics
-      digest_after_days
-      auto_track_topics_after_msecs
-      new_topic_duration_minutes
-      last_redirected_to_top_at
-      auth_token
-      auth_token_updated_at ],
-  on_drop: ->(){
-    STDERR.puts 'Removing superflous users columns!'
+  after_migration: 'RenameBlockedSilence',
+  columns: %w[
+    blocked
+  ],
+  on_drop: ->() {
+    STDERR.puts 'Removing user blocked column!'
+  }
+)
+
+ColumnDropper.drop(
+  table: 'users',
+  after_migration: 'AddSilencedTillToUsers',
+  columns: %w[
+    silenced
+  ],
+  on_drop: ->() {
+    STDERR.puts 'Removing user silenced column!'
+  }
+)
+
+ColumnDropper.drop(
+  table: 'users',
+  after_migration: 'AddTrustLevelLocksToUsers',
+  columns: %w[
+    trust_level_locked
+  ],
+  on_drop: ->() {
+    STDERR.puts 'Removing user trust_level_locked!'
   }
 )
 
 # 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 +123,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 83d8eb5cf2..5fa93ddb1e 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/501_meta_category.rb b/db/fixtures/501_meta_category.rb
index 9996b2abc8..38ed96aaea 100644
--- a/db/fixtures/501_meta_category.rb
+++ b/db/fixtures/501_meta_category.rb
@@ -17,7 +17,7 @@ unless Rails.env.test?
         raise "Failed meta topic"
       end
 
-      meta.set_permissions(:everyone => :full)
+      meta.set_permissions(everyone: :full)
       meta.topic_id = post.topic.id
       unless meta.save
         puts meta.errors.full_messages
diff --git a/db/fixtures/502_staff_category.rb b/db/fixtures/502_staff_category.rb
index f1b62c1bf2..54faa6385b 100644
--- a/db/fixtures/502_staff_category.rb
+++ b/db/fixtures/502_staff_category.rb
@@ -1,6 +1,6 @@
 unless Rails.env.test?
   staff = Category.find_by(id: SiteSetting.staff_category_id)
-  if staff and !staff.group_ids.include?(Group[:staff].id)
+  if staff && !staff.group_ids.include?(Group[:staff].id)
 
     # Add permissions and a description to the Staff category.
 
diff --git a/db/fixtures/600_themes.rb b/db/fixtures/600_themes.rb
index 0ec6e274d2..5b141c57ad 100644
--- a/db/fixtures/600_themes.rb
+++ b/db/fixtures/600_themes.rb
@@ -7,13 +7,13 @@ if !Theme.exists?
   dark_scheme ||= ColorScheme.create_from_base(name: name, via_wizard: true, base_scheme_id: "dark")
 
   name = I18n.t('color_schemes.dark_theme_name')
-  _dark_theme =  Theme.create(name: name, user_id: -1,
-                                         color_scheme_id: dark_scheme.id,
-                                         user_selectable: true)
+  _dark_theme = Theme.create(name: name, user_id: -1,
+                             color_scheme_id: dark_scheme.id,
+                             user_selectable: true)
 
   name = I18n.t('color_schemes.default_theme_name')
-  default_theme =  Theme.create(name: name, user_id: -1,
-                                         user_selectable: true)
+  default_theme = Theme.create(name: name, user_id: -1,
+                               user_selectable: true)
 
   default_theme.set_default!
 end
@@ -22,7 +22,7 @@ ColumnDropper.drop(
   table: 'theme_fields',
   after_migration: 'AddUploadIdToThemeFields',
   columns: ['target'],
-  on_drop: ->(){
+  on_drop: ->() {
     STDERR.puts 'Removing superflous theme_fields target column!'
   }
 )
diff --git a/db/fixtures/999_delayed.rb b/db/fixtures/999_delayed.rb
index 1141e13e64..4d69a58267 100644
--- a/db/fixtures/999_delayed.rb
+++ b/db/fixtures/999_delayed.rb
@@ -6,7 +6,7 @@ TableMigrationHelper.delayed_drop(
   old_name: 'topic_status_updates',
   new_name: 'topic_timers',
   after_migration: 'RenameTopicStatusUpdatesToTopicTimers',
-  on_drop: ->(){
+  on_drop: ->() {
     STDERR.puts "Dropping topic_status_updates. It was moved to topic_timers."
   }
 )
diff --git a/db/fixtures/999_topics.rb b/db/fixtures/999_topics.rb
index abdc372e8a..25958a8c69 100644
--- a/db/fixtures/999_topics.rb
+++ b/db/fixtures/999_topics.rb
@@ -6,9 +6,9 @@ staff = Category.find_by(id: SiteSetting.staff_category_id)
 seed_welcome_topics = (Topic.where('id NOT IN (SELECT topic_id from categories where topic_id is not null)').count == 0 && !Rails.env.test?)
 
 unless Rails.env.test?
-  def create_static_page_topic(site_setting_key, title_key, body_key, body_override, category, description, params={})
+  def create_static_page_topic(site_setting_key, title_key, body_key, body_override, category, description, params = {})
     unless SiteSetting.send(site_setting_key) > 0
-      creator = PostCreator.new( Discourse.system_user,
+      creator = PostCreator.new(Discourse.system_user,
                                  title: I18n.t(title_key, default: I18n.t(title_key, locale: :en)),
                                  raw: body_override.present? ? body_override : I18n.t(body_key, params.merge(default: I18n.t(body_key, params.merge(locale: :en)))),
                                  skip_validations: true,
@@ -19,18 +19,16 @@ unless Rails.env.test?
 
       SiteSetting.send("#{site_setting_key}=", post.topic_id)
 
-      _reply = PostCreator.create( Discourse.system_user,
+      _reply = PostCreator.create(Discourse.system_user,
                                   raw: I18n.t('static_topic_first_reply', page_name: I18n.t(title_key, default: I18n.t(title_key, locale: :en))),
                                   skip_validations: true,
-                                  topic_id: post.topic_id )
+                                  topic_id: post.topic_id)
     end
   end
 
-  create_static_page_topic('tos_topic_id', 'tos_topic.title', "tos_topic.body", nil, staff, "terms of service", {
-    company_domain: "company_domain",
-    company_full_name: "company_full_name",
-    company_name: "company_short_name"
-  })
+  create_static_page_topic('tos_topic_id', 'tos_topic.title', "tos_topic.body", nil, staff, "terms of service",     company_domain: "company_domain",
+                                                                                                                    company_full_name: "company_full_name",
+                                                                                                                    company_name: "company_short_name")
 
   create_static_page_topic('guidelines_topic_id', 'guidelines_topic.title', "guidelines_topic.body", nil, staff, "guidelines")
 
@@ -57,15 +55,13 @@ if seed_welcome_topics
   end
 
   welcome = File.read(filename)
-  PostCreator.create( Discourse.system_user,
+  PostCreator.create(Discourse.system_user,
                       raw: welcome,
                       title: DiscoursePluginRegistry.seed_data["admin_quick_start_title"] || "READ ME FIRST: Admin Quick Start Guide",
                       skip_validations: true,
                       category: staff ? staff.name : nil)
 end
 
-
-
 # run this later, cause we need to make sure new application controller resilience is in place first
 
 ColumnDropper.drop(
@@ -74,7 +70,7 @@ ColumnDropper.drop(
   columns: %w{
     first_topic_unread_at
   },
-  on_drop: ->(){
+  on_drop: ->() {
     STDERR.puts "Removing superflous user stats columns!"
     ActiveRecord::Base.exec_sql "DROP FUNCTION IF EXISTS first_unread_topic_for(int)"
   }
@@ -91,7 +87,23 @@ ColumnDropper.drop(
     notify_user_count
     last_unread_at
   },
-  on_drop: ->(){
+  on_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/20000225050318_add_schema_migration_details.rb b/db/migrate/20000225050318_add_schema_migration_details.rb
index dbf4959b17..927b7d1e04 100644
--- a/db/migrate/20000225050318_add_schema_migration_details.rb
+++ b/db/migrate/20000225050318_add_schema_migration_details.rb
@@ -1,4 +1,4 @@
-class AddSchemaMigrationDetails < ActiveRecord::Migration
+class AddSchemaMigrationDetails < ActiveRecord::Migration[4.2]
   def up
     # schema_migrations table is way too thin, does not give info about
     # duration of migration or the date it happened, this migration together with the
diff --git a/db/migrate/20120311163914_create_forum_threads.rb b/db/migrate/20120311163914_create_forum_threads.rb
index 2867915819..a0f4f2c597 100644
--- a/db/migrate/20120311163914_create_forum_threads.rb
+++ b/db/migrate/20120311163914_create_forum_threads.rb
@@ -1,11 +1,11 @@
-class CreateForumThreads < ActiveRecord::Migration
+class CreateForumThreads < ActiveRecord::Migration[4.2]
   def change
     create_table :forum_threads do |t|
       t.integer :forum_id, null: false
       t.string :title, null: false
       t.integer :last_post_id
       t.datetime :last_posted_at
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/db/migrate/20120311164326_create_posts.rb b/db/migrate/20120311164326_create_posts.rb
index 41108b2bd3..f67d93f29d 100644
--- a/db/migrate/20120311164326_create_posts.rb
+++ b/db/migrate/20120311164326_create_posts.rb
@@ -1,4 +1,4 @@
-class CreatePosts < ActiveRecord::Migration
+class CreatePosts < ActiveRecord::Migration[4.2]
   def change
     create_table :posts do |t|
       t.integer :user_id, null: false
@@ -6,7 +6,7 @@ class CreatePosts < ActiveRecord::Migration
       t.integer :post_number, null: false
       t.text :content, null: false
       t.text :formatted_content, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :posts, [:forum_thread_id, :created_at]
diff --git a/db/migrate/20120311170118_create_users.rb b/db/migrate/20120311170118_create_users.rb
index d8dcdf1b9f..9a1ae7a448 100644
--- a/db/migrate/20120311170118_create_users.rb
+++ b/db/migrate/20120311170118_create_users.rb
@@ -1,9 +1,9 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :users do |t|
       t.string :username, limit: 20, null: false
       t.string :avatar_url, null: false
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/db/migrate/20120311201341_create_forums.rb b/db/migrate/20120311201341_create_forums.rb
index 748c6f6eef..ef88af4c10 100644
--- a/db/migrate/20120311201341_create_forums.rb
+++ b/db/migrate/20120311201341_create_forums.rb
@@ -1,9 +1,9 @@
-class CreateForums < ActiveRecord::Migration
+class CreateForums < ActiveRecord::Migration[4.2]
   def change
     create_table :forums do |t|
       t.integer :site_id, null: false
       t.string :title, limit: 100, null: false
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/db/migrate/20120311210245_create_sites.rb b/db/migrate/20120311210245_create_sites.rb
index d281148641..70e8f2c4e6 100644
--- a/db/migrate/20120311210245_create_sites.rb
+++ b/db/migrate/20120311210245_create_sites.rb
@@ -1,8 +1,8 @@
-class CreateSites < ActiveRecord::Migration
+class CreateSites < ActiveRecord::Migration[4.2]
   def change
     create_table :sites  do |t|
       t.string :title, limit: 100, null: false
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/db/migrate/20120416201606_add_reply_to_to_posts.rb b/db/migrate/20120416201606_add_reply_to_to_posts.rb
index 0bdabad405..0656d31537 100644
--- a/db/migrate/20120416201606_add_reply_to_to_posts.rb
+++ b/db/migrate/20120416201606_add_reply_to_to_posts.rb
@@ -1,4 +1,4 @@
-class AddReplyToToPosts < ActiveRecord::Migration
+class AddReplyToToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :reply_to_post_number, :integer, null: true
     add_index :posts, :reply_to_post_number
diff --git a/db/migrate/20120420183447_add_views_to_forum_threads.rb b/db/migrate/20120420183447_add_views_to_forum_threads.rb
index 2309cad593..5075787608 100644
--- a/db/migrate/20120420183447_add_views_to_forum_threads.rb
+++ b/db/migrate/20120420183447_add_views_to_forum_threads.rb
@@ -1,4 +1,4 @@
-class AddViewsToForumThreads < ActiveRecord::Migration
+class AddViewsToForumThreads < ActiveRecord::Migration[4.2]
   def change
     add_column :forum_threads, :views, :integer, default: 0, null: false
   end
diff --git a/db/migrate/20120423140906_add_posts_count_to_forum_threads.rb b/db/migrate/20120423140906_add_posts_count_to_forum_threads.rb
index 6f319e7501..832f66a307 100644
--- a/db/migrate/20120423140906_add_posts_count_to_forum_threads.rb
+++ b/db/migrate/20120423140906_add_posts_count_to_forum_threads.rb
@@ -1,4 +1,4 @@
-class AddPostsCountToForumThreads < ActiveRecord::Migration
+class AddPostsCountToForumThreads < ActiveRecord::Migration[4.2]
   def change
     add_column :forum_threads, :posts_count, :integer, default: 0, null: false
 
diff --git a/db/migrate/20120423142820_fix_post_indices.rb b/db/migrate/20120423142820_fix_post_indices.rb
index 571db8f8ec..0e99e03e16 100644
--- a/db/migrate/20120423142820_fix_post_indices.rb
+++ b/db/migrate/20120423142820_fix_post_indices.rb
@@ -1,4 +1,4 @@
-class FixPostIndices < ActiveRecord::Migration
+class FixPostIndices < ActiveRecord::Migration[4.2]
   def up
     remove_index :posts, [:forum_thread_id, :created_at]
     add_index :posts, [:forum_thread_id, :post_number]
diff --git a/db/migrate/20120423151548_remove_last_post_id.rb b/db/migrate/20120423151548_remove_last_post_id.rb
index f9ec56229c..fd3f1b292b 100644
--- a/db/migrate/20120423151548_remove_last_post_id.rb
+++ b/db/migrate/20120423151548_remove_last_post_id.rb
@@ -1,4 +1,4 @@
-class RemoveLastPostId < ActiveRecord::Migration
+class RemoveLastPostId < ActiveRecord::Migration[4.2]
   def up
     remove_column :forum_threads, :last_post_id
   end
diff --git a/db/migrate/20120425145456_add_display_username_to_users.rb b/db/migrate/20120425145456_add_display_username_to_users.rb
index 9ef10657bd..43df8bdf6a 100644
--- a/db/migrate/20120425145456_add_display_username_to_users.rb
+++ b/db/migrate/20120425145456_add_display_username_to_users.rb
@@ -1,4 +1,4 @@
-class AddDisplayUsernameToUsers < ActiveRecord::Migration
+class AddDisplayUsernameToUsers < ActiveRecord::Migration[4.2]
   def up
     add_column :users, :display_username, :string
     execute "UPDATE users SET display_username = username"
diff --git a/db/migrate/20120427150624_add_user_id_index_to_posts.rb b/db/migrate/20120427150624_add_user_id_index_to_posts.rb
index 78f8ac68f6..8da0ee50fe 100644
--- a/db/migrate/20120427150624_add_user_id_index_to_posts.rb
+++ b/db/migrate/20120427150624_add_user_id_index_to_posts.rb
@@ -1,4 +1,4 @@
-class AddUserIdIndexToPosts < ActiveRecord::Migration
+class AddUserIdIndexToPosts < ActiveRecord::Migration[4.2]
   def change
     add_index :posts, :user_id
   end
diff --git a/db/migrate/20120427151452_cooked_migration.rb b/db/migrate/20120427151452_cooked_migration.rb
index d027fe8ff2..9b8ca2d8e8 100644
--- a/db/migrate/20120427151452_cooked_migration.rb
+++ b/db/migrate/20120427151452_cooked_migration.rb
@@ -1,4 +1,4 @@
-class CookedMigration < ActiveRecord::Migration
+class CookedMigration < ActiveRecord::Migration[4.2]
   def change
     rename_column :posts, :content, :raw
     rename_column :posts, :formatted_content, :cooked
diff --git a/db/migrate/20120427154330_create_vestal_versions.rb b/db/migrate/20120427154330_create_vestal_versions.rb
index f912113291..730c275c1f 100644
--- a/db/migrate/20120427154330_create_vestal_versions.rb
+++ b/db/migrate/20120427154330_create_vestal_versions.rb
@@ -1,4 +1,4 @@
-class CreateVestalVersions < ActiveRecord::Migration
+class CreateVestalVersions < ActiveRecord::Migration[4.2]
   def self.up
     create_table :versions do |t|
       t.belongs_to :versioned, polymorphic: true
@@ -9,7 +9,7 @@ class CreateVestalVersions < ActiveRecord::Migration
       t.integer :reverted_from
       t.string  :tag
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     change_table :versions do |t|
diff --git a/db/migrate/20120427172031_add_version_to_posts.rb b/db/migrate/20120427172031_add_version_to_posts.rb
index 408dc293c4..6ff53461a4 100644
--- a/db/migrate/20120427172031_add_version_to_posts.rb
+++ b/db/migrate/20120427172031_add_version_to_posts.rb
@@ -1,4 +1,4 @@
-class AddVersionToPosts < ActiveRecord::Migration
+class AddVersionToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :cached_version, :integer, null: false, default: 1
   end
diff --git a/db/migrate/20120502183240_add_created_by_to_forum_threads.rb b/db/migrate/20120502183240_add_created_by_to_forum_threads.rb
index b9dd947e91..0eca6e0908 100644
--- a/db/migrate/20120502183240_add_created_by_to_forum_threads.rb
+++ b/db/migrate/20120502183240_add_created_by_to_forum_threads.rb
@@ -1,4 +1,4 @@
-class AddCreatedByToForumThreads < ActiveRecord::Migration
+class AddCreatedByToForumThreads < ActiveRecord::Migration[4.2]
   def up
     add_column :forum_threads, :user_id, :integer
 
diff --git a/db/migrate/20120502192121_add_last_post_user_id_to_forum_threads.rb b/db/migrate/20120502192121_add_last_post_user_id_to_forum_threads.rb
index 9f7daa2742..aafa179b82 100644
--- a/db/migrate/20120502192121_add_last_post_user_id_to_forum_threads.rb
+++ b/db/migrate/20120502192121_add_last_post_user_id_to_forum_threads.rb
@@ -1,9 +1,8 @@
-class AddLastPostUserIdToForumThreads < ActiveRecord::Migration
+class AddLastPostUserIdToForumThreads < ActiveRecord::Migration[4.2]
 
   def up
     add_column :forum_threads, :last_post_user_id, :integer
 
-
     execute "update forum_threads t
     set last_post_user_id = (select user_id from posts where forum_thread_id = t.Id order by post_number desc limit 1)"
 
diff --git a/db/migrate/20120503205521_add_site_id_to_users.rb b/db/migrate/20120503205521_add_site_id_to_users.rb
index 9b1121eee7..2057bc809a 100644
--- a/db/migrate/20120503205521_add_site_id_to_users.rb
+++ b/db/migrate/20120503205521_add_site_id_to_users.rb
@@ -1,4 +1,4 @@
-class AddSiteIdToUsers < ActiveRecord::Migration
+class AddSiteIdToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :site_id, :integer
     add_column :users, :bio, :text
diff --git a/db/migrate/20120507144132_create_expressions.rb b/db/migrate/20120507144132_create_expressions.rb
index 2cf61712fe..5daf04026f 100644
--- a/db/migrate/20120507144132_create_expressions.rb
+++ b/db/migrate/20120507144132_create_expressions.rb
@@ -1,11 +1,11 @@
-class CreateExpressions < ActiveRecord::Migration
+class CreateExpressions < ActiveRecord::Migration[4.2]
   def change
     create_table :expressions, id: false, force: true do |t|
       t.integer :parent_id, null: false
       t.string :parent_type, null: false, limit: 50
       t.integer :expression_type_id, null: false
       t.integer :user_id, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :expressions, [:parent_id, :parent_type, :expression_type_id, :user_id], unique: true, name: "expressions_pk"
diff --git a/db/migrate/20120507144222_create_expression_types.rb b/db/migrate/20120507144222_create_expression_types.rb
index 37cd4d0a36..a536a0da51 100644
--- a/db/migrate/20120507144222_create_expression_types.rb
+++ b/db/migrate/20120507144222_create_expression_types.rb
@@ -1,10 +1,10 @@
-class CreateExpressionTypes < ActiveRecord::Migration
+class CreateExpressionTypes < ActiveRecord::Migration[4.2]
   def change
     create_table :expression_types do |t|
       t.integer :site_id, null: false
       t.string :name, null: false, limit: 50
       t.string :long_form, null: false, limit: 100
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :expression_types, [:site_id, :name], unique: true
diff --git a/db/migrate/20120514144549_add_reply_count_to_posts.rb b/db/migrate/20120514144549_add_reply_count_to_posts.rb
index 31c7cf9e1a..4be691b234 100644
--- a/db/migrate/20120514144549_add_reply_count_to_posts.rb
+++ b/db/migrate/20120514144549_add_reply_count_to_posts.rb
@@ -1,4 +1,4 @@
-class AddReplyCountToPosts < ActiveRecord::Migration
+class AddReplyCountToPosts < ActiveRecord::Migration[4.2]
   def up
     add_column :posts, :reply_count, :integer, null: false, default: 0
 
diff --git a/db/migrate/20120514173920_add_flag_to_expression_types.rb b/db/migrate/20120514173920_add_flag_to_expression_types.rb
index 4251f61d24..b5f15bf458 100644
--- a/db/migrate/20120514173920_add_flag_to_expression_types.rb
+++ b/db/migrate/20120514173920_add_flag_to_expression_types.rb
@@ -1,4 +1,4 @@
-class AddFlagToExpressionTypes < ActiveRecord::Migration
+class AddFlagToExpressionTypes < ActiveRecord::Migration[4.2]
   def change
     add_column :expression_types, :flag, :boolean, default: false
   end
diff --git a/db/migrate/20120514204934_add_description_to_expression_types.rb b/db/migrate/20120514204934_add_description_to_expression_types.rb
index fcb697ab9b..8e4cc98271 100644
--- a/db/migrate/20120514204934_add_description_to_expression_types.rb
+++ b/db/migrate/20120514204934_add_description_to_expression_types.rb
@@ -1,4 +1,4 @@
-class AddDescriptionToExpressionTypes < ActiveRecord::Migration
+class AddDescriptionToExpressionTypes < ActiveRecord::Migration[4.2]
   def change
     add_column :expression_types, :description, :text, null: true
   end
diff --git a/db/migrate/20120517200130_add_quoteless_to_post.rb b/db/migrate/20120517200130_add_quoteless_to_post.rb
index 5b3ba541fd..116f67eaba 100644
--- a/db/migrate/20120517200130_add_quoteless_to_post.rb
+++ b/db/migrate/20120517200130_add_quoteless_to_post.rb
@@ -1,4 +1,4 @@
-class AddQuotelessToPost < ActiveRecord::Migration
+class AddQuotelessToPost < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :quoteless, :boolean, default: false
   end
diff --git a/db/migrate/20120518200115_create_read_posts.rb b/db/migrate/20120518200115_create_read_posts.rb
index dde7280896..d1cc7b99ff 100644
--- a/db/migrate/20120518200115_create_read_posts.rb
+++ b/db/migrate/20120518200115_create_read_posts.rb
@@ -1,4 +1,4 @@
-class CreateReadPosts < ActiveRecord::Migration
+class CreateReadPosts < ActiveRecord::Migration[4.2]
   def up
     create_table :read_posts, id: false do |t|
       t.integer :forum_thread_id, null: false
diff --git a/db/migrate/20120519182212_create_last_read_posts.rb b/db/migrate/20120519182212_create_last_read_posts.rb
index c2d1e7b382..7c90498a5b 100644
--- a/db/migrate/20120519182212_create_last_read_posts.rb
+++ b/db/migrate/20120519182212_create_last_read_posts.rb
@@ -1,10 +1,10 @@
-class CreateLastReadPosts < ActiveRecord::Migration
+class CreateLastReadPosts < ActiveRecord::Migration[4.2]
   def change
     create_table :last_read_posts do |t|
       t.integer :user_id, null: false
       t.integer :forum_thread_id, null: false
       t.integer :post_number, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :last_read_posts, [:user_id, :forum_thread_id], unique: true
diff --git a/db/migrate/20120523180723_create_views.rb b/db/migrate/20120523180723_create_views.rb
index 68638ef506..aa201b3dd3 100644
--- a/db/migrate/20120523180723_create_views.rb
+++ b/db/migrate/20120523180723_create_views.rb
@@ -1,4 +1,4 @@
-class CreateViews < ActiveRecord::Migration
+class CreateViews < ActiveRecord::Migration[4.2]
   def change
     create_table :views, id: false do |t|
       t.integer  :parent_id, null: false
diff --git a/db/migrate/20120523184307_add_replies_to_forum_threads.rb b/db/migrate/20120523184307_add_replies_to_forum_threads.rb
index a8648b7e3e..fd5870417c 100644
--- a/db/migrate/20120523184307_add_replies_to_forum_threads.rb
+++ b/db/migrate/20120523184307_add_replies_to_forum_threads.rb
@@ -1,4 +1,4 @@
-class AddRepliesToForumThreads < ActiveRecord::Migration
+class AddRepliesToForumThreads < ActiveRecord::Migration[4.2]
   def change
     add_column :forum_threads, :reply_count, :integer, default: 0, null: false
 
diff --git a/db/migrate/20120523201329_add_featured_to_forum_threads.rb b/db/migrate/20120523201329_add_featured_to_forum_threads.rb
index d9568d795a..ef47cb07e4 100644
--- a/db/migrate/20120523201329_add_featured_to_forum_threads.rb
+++ b/db/migrate/20120523201329_add_featured_to_forum_threads.rb
@@ -1,4 +1,4 @@
-class AddFeaturedToForumThreads < ActiveRecord::Migration
+class AddFeaturedToForumThreads < ActiveRecord::Migration[4.2]
   def up
     add_column :forum_threads, :featured_user1_id, :integer, null: true
     add_column :forum_threads, :featured_user2_id, :integer, null: true
diff --git a/db/migrate/20120525194845_add_avg_time_to_forum_threads.rb b/db/migrate/20120525194845_add_avg_time_to_forum_threads.rb
index aa364962f3..08f3bc7f37 100644
--- a/db/migrate/20120525194845_add_avg_time_to_forum_threads.rb
+++ b/db/migrate/20120525194845_add_avg_time_to_forum_threads.rb
@@ -1,4 +1,4 @@
-class AddAvgTimeToForumThreads < ActiveRecord::Migration
+class AddAvgTimeToForumThreads < ActiveRecord::Migration[4.2]
   def up
     add_column :forum_threads, :avg_time, :integer
 
diff --git a/db/migrate/20120529175956_create_uploads.rb b/db/migrate/20120529175956_create_uploads.rb
index b0eb798447..9d6c355dd0 100644
--- a/db/migrate/20120529175956_create_uploads.rb
+++ b/db/migrate/20120529175956_create_uploads.rb
@@ -1,4 +1,4 @@
-class CreateUploads < ActiveRecord::Migration
+class CreateUploads < ActiveRecord::Migration[4.2]
   def change
     create_table :uploads do |t|
       t.integer :user_id, null: false
@@ -8,7 +8,7 @@ class CreateUploads < ActiveRecord::Migration
       t.integer :width, null: true
       t.integer :height, null: true
       t.string  :url, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :uploads, :forum_thread_id
diff --git a/db/migrate/20120529202707_create_stars.rb b/db/migrate/20120529202707_create_stars.rb
index 91c609ac31..75e7588837 100644
--- a/db/migrate/20120529202707_create_stars.rb
+++ b/db/migrate/20120529202707_create_stars.rb
@@ -1,10 +1,10 @@
-class CreateStars < ActiveRecord::Migration
+class CreateStars < ActiveRecord::Migration[4.2]
   def change
     create_table :stars, id: false do |t|
       t.integer  :parent_id, null: false
       t.string   :parent_type, limit: 50, null: false
       t.integer  :user_id, null: true
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :stars, [:parent_id, :parent_type, :user_id]
diff --git a/db/migrate/20120530150726_create_forum_thread_user.rb b/db/migrate/20120530150726_create_forum_thread_user.rb
index 98ecd85a84..272e96d564 100644
--- a/db/migrate/20120530150726_create_forum_thread_user.rb
+++ b/db/migrate/20120530150726_create_forum_thread_user.rb
@@ -1,4 +1,4 @@
-class CreateForumThreadUser < ActiveRecord::Migration
+class CreateForumThreadUser < ActiveRecord::Migration[4.2]
   def up
     create_table :forum_thread_users, id: false do |t|
       t.integer  :user_id, null: false
@@ -6,7 +6,7 @@ class CreateForumThreadUser < ActiveRecord::Migration
       t.boolean  :starred, null: false, default: false
       t.boolean  :posted, null: false, default: false
       t.integer  :last_read_post_number, null: false, default: 1
-      t.timestamps
+      t.timestamps null: false
     end
 
     execute "DELETE FROM read_posts"
@@ -24,7 +24,7 @@ class CreateForumThreadUser < ActiveRecord::Migration
       t.integer  :parent_id, null: false
       t.string   :parent_type, limit: 50, null: false
       t.integer  :user_id, null: true
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :stars, [:parent_id, :parent_type, :user_id]
@@ -33,7 +33,7 @@ class CreateForumThreadUser < ActiveRecord::Migration
       t.integer :user_id, null: false
       t.integer :forum_thread_id, null: false
       t.integer :post_number, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :last_read_posts, [:user_id, :forum_thread_id], unique: true
diff --git a/db/migrate/20120530160745_migrate_posted.rb b/db/migrate/20120530160745_migrate_posted.rb
index e72528b465..599c8810e4 100644
--- a/db/migrate/20120530160745_migrate_posted.rb
+++ b/db/migrate/20120530160745_migrate_posted.rb
@@ -1,4 +1,4 @@
-class MigratePosted < ActiveRecord::Migration
+class MigratePosted < ActiveRecord::Migration[4.2]
   def up
   end
 
diff --git a/db/migrate/20120530200724_add_index_to_forum_threads.rb b/db/migrate/20120530200724_add_index_to_forum_threads.rb
index cfe14bff14..35045d1951 100644
--- a/db/migrate/20120530200724_add_index_to_forum_threads.rb
+++ b/db/migrate/20120530200724_add_index_to_forum_threads.rb
@@ -1,4 +1,4 @@
-class AddIndexToForumThreads < ActiveRecord::Migration
+class AddIndexToForumThreads < ActiveRecord::Migration[4.2]
   def change
     add_index :forum_threads, :last_posted_at
   end
diff --git a/db/migrate/20120530212912_create_forum_thread_links.rb b/db/migrate/20120530212912_create_forum_thread_links.rb
index 91cb347a82..f43cbf9f2d 100644
--- a/db/migrate/20120530212912_create_forum_thread_links.rb
+++ b/db/migrate/20120530212912_create_forum_thread_links.rb
@@ -1,4 +1,4 @@
-class CreateForumThreadLinks < ActiveRecord::Migration
+class CreateForumThreadLinks < ActiveRecord::Migration[4.2]
   def change
     create_table :forum_thread_links do |t|
       t.integer :forum_thread_id, null: false
@@ -8,7 +8,7 @@ class CreateForumThreadLinks < ActiveRecord::Migration
       t.string  :domain, limit: 100, null: false
       t.boolean :internal, null: false, default: false
       t.integer :link_forum_thread_id, null: true
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :forum_thread_links, :forum_thread_id
diff --git a/db/migrate/20120614190726_add_tags_to_forum_threads.rb b/db/migrate/20120614190726_add_tags_to_forum_threads.rb
index c65eaf3c32..042f32b92a 100644
--- a/db/migrate/20120614190726_add_tags_to_forum_threads.rb
+++ b/db/migrate/20120614190726_add_tags_to_forum_threads.rb
@@ -1,4 +1,4 @@
-class AddTagsToForumThreads < ActiveRecord::Migration
+class AddTagsToForumThreads < ActiveRecord::Migration[4.2]
   def change
     add_column :forum_threads, :tag, :string, null: true, limit: 25
   end
diff --git a/db/migrate/20120614202024_add_quote_count_to_posts.rb b/db/migrate/20120614202024_add_quote_count_to_posts.rb
index 46994edb69..373e800789 100644
--- a/db/migrate/20120614202024_add_quote_count_to_posts.rb
+++ b/db/migrate/20120614202024_add_quote_count_to_posts.rb
@@ -1,4 +1,4 @@
-class AddQuoteCountToPosts < ActiveRecord::Migration
+class AddQuoteCountToPosts < ActiveRecord::Migration[4.2]
   def up
     add_column :posts, :quote_count, :integer, default: 0, null: false
     execute "UPDATE posts SET quote_count = 1 WHERE quoteless = 'f'"
diff --git a/db/migrate/20120615180517_create_bookmarks.rb b/db/migrate/20120615180517_create_bookmarks.rb
index 5e129e8950..b8b1f66e4b 100644
--- a/db/migrate/20120615180517_create_bookmarks.rb
+++ b/db/migrate/20120615180517_create_bookmarks.rb
@@ -1,9 +1,9 @@
-class CreateBookmarks < ActiveRecord::Migration
+class CreateBookmarks < ActiveRecord::Migration[4.2]
   def change
     create_table :bookmarks do |t|
       t.integer :user_id
       t.integer :post_id
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :bookmarks, [:user_id, :post_id], unique: true
diff --git a/db/migrate/20120618152946_add_reply_below_to_posts.rb b/db/migrate/20120618152946_add_reply_below_to_posts.rb
index 99c23a87d9..33fcc00683 100644
--- a/db/migrate/20120618152946_add_reply_below_to_posts.rb
+++ b/db/migrate/20120618152946_add_reply_below_to_posts.rb
@@ -1,4 +1,4 @@
-class AddReplyBelowToPosts < ActiveRecord::Migration
+class AddReplyBelowToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :reply_below_post_number, :integer, null: true
   end
diff --git a/db/migrate/20120618212349_create_post_timings.rb b/db/migrate/20120618212349_create_post_timings.rb
index b795ca902c..4cfbf9d4ae 100644
--- a/db/migrate/20120618212349_create_post_timings.rb
+++ b/db/migrate/20120618212349_create_post_timings.rb
@@ -1,4 +1,4 @@
-class CreatePostTimings < ActiveRecord::Migration
+class CreatePostTimings < ActiveRecord::Migration[4.2]
   def change
     create_table :post_timings do |t|
       t.integer :thread_id, null: false
diff --git a/db/migrate/20120618214856_create_message_bus.rb b/db/migrate/20120618214856_create_message_bus.rb
index f2d81c6d20..a81441d5ad 100644
--- a/db/migrate/20120618214856_create_message_bus.rb
+++ b/db/migrate/20120618214856_create_message_bus.rb
@@ -1,4 +1,4 @@
-class CreateMessageBus < ActiveRecord::Migration
+class CreateMessageBus < ActiveRecord::Migration[4.2]
   def change
     create_table :message_bus do |t|
       t.string :name
diff --git a/db/migrate/20120619150807_fix_post_timings.rb b/db/migrate/20120619150807_fix_post_timings.rb
index 1d06d8f6d8..4e6fd051eb 100644
--- a/db/migrate/20120619150807_fix_post_timings.rb
+++ b/db/migrate/20120619150807_fix_post_timings.rb
@@ -1,4 +1,4 @@
-class FixPostTimings < ActiveRecord::Migration
+class FixPostTimings < ActiveRecord::Migration[4.2]
   def up
     remove_index :post_timings, [:thread_id, :post_number]
     remove_index :post_timings, [:thread_id, :post_number, :user_id]
diff --git a/db/migrate/20120619153349_drop_read_posts.rb b/db/migrate/20120619153349_drop_read_posts.rb
index f23dc488e9..89b7472751 100644
--- a/db/migrate/20120619153349_drop_read_posts.rb
+++ b/db/migrate/20120619153349_drop_read_posts.rb
@@ -1,4 +1,4 @@
-class DropReadPosts < ActiveRecord::Migration
+class DropReadPosts < ActiveRecord::Migration[4.2]
   def up
     drop_table :read_posts
   end
diff --git a/db/migrate/20120619172714_add_post_number_to_bookmarks.rb b/db/migrate/20120619172714_add_post_number_to_bookmarks.rb
index 6cbf8151ba..7a21dda8ad 100644
--- a/db/migrate/20120619172714_add_post_number_to_bookmarks.rb
+++ b/db/migrate/20120619172714_add_post_number_to_bookmarks.rb
@@ -1,4 +1,4 @@
-class AddPostNumberToBookmarks < ActiveRecord::Migration
+class AddPostNumberToBookmarks < ActiveRecord::Migration[4.2]
   def change
     drop_table :bookmarks
 
@@ -6,7 +6,7 @@ class AddPostNumberToBookmarks < ActiveRecord::Migration
       t.integer :user_id, null: false
       t.integer :forum_thread_id, null: false
       t.integer :post_number, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :bookmarks, [:user_id, :forum_thread_id, :post_number], unique: true
diff --git a/db/migrate/20120621155351_add_seen_post_count_to_forum_thread_users.rb b/db/migrate/20120621155351_add_seen_post_count_to_forum_thread_users.rb
index eff20e632e..20199118cb 100644
--- a/db/migrate/20120621155351_add_seen_post_count_to_forum_thread_users.rb
+++ b/db/migrate/20120621155351_add_seen_post_count_to_forum_thread_users.rb
@@ -1,4 +1,4 @@
-class AddSeenPostCountToForumThreadUsers < ActiveRecord::Migration
+class AddSeenPostCountToForumThreadUsers < ActiveRecord::Migration[4.2]
   def change
     remove_column :post_timings, :id
     remove_column :forum_thread_users, :created_at
diff --git a/db/migrate/20120621190310_add_deleted_at_to_forum_threads.rb b/db/migrate/20120621190310_add_deleted_at_to_forum_threads.rb
index 2aeb019f5a..0d4b9c063b 100644
--- a/db/migrate/20120621190310_add_deleted_at_to_forum_threads.rb
+++ b/db/migrate/20120621190310_add_deleted_at_to_forum_threads.rb
@@ -1,4 +1,4 @@
-class AddDeletedAtToForumThreads < ActiveRecord::Migration
+class AddDeletedAtToForumThreads < ActiveRecord::Migration[4.2]
   def change
     add_column :forum_threads, :deleted_at, :datetime
   end
diff --git a/db/migrate/20120622200242_create_notifications.rb b/db/migrate/20120622200242_create_notifications.rb
index f97550bbf4..116b111974 100644
--- a/db/migrate/20120622200242_create_notifications.rb
+++ b/db/migrate/20120622200242_create_notifications.rb
@@ -1,11 +1,11 @@
-class CreateNotifications < ActiveRecord::Migration
+class CreateNotifications < ActiveRecord::Migration[4.2]
   def change
     create_table :notifications do |t|
       t.integer :notification_type, null: false
       t.references :user, null: false
       t.string :data, null: false
       t.boolean :read, default: false, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :notifications, [:user_id, :created_at]
diff --git a/db/migrate/20120625145714_add_seen_notification_id_to_users.rb b/db/migrate/20120625145714_add_seen_notification_id_to_users.rb
index 920f136d3e..c14c7f40c9 100644
--- a/db/migrate/20120625145714_add_seen_notification_id_to_users.rb
+++ b/db/migrate/20120625145714_add_seen_notification_id_to_users.rb
@@ -1,4 +1,4 @@
-class AddSeenNotificationIdToUsers < ActiveRecord::Migration
+class AddSeenNotificationIdToUsers < ActiveRecord::Migration[4.2]
   def change
 
     execute "TRUNCATE TABLE notifications"
diff --git a/db/migrate/20120625162318_add_deleted_at_to_posts.rb b/db/migrate/20120625162318_add_deleted_at_to_posts.rb
index ff9b313f5f..55efd8b5bb 100644
--- a/db/migrate/20120625162318_add_deleted_at_to_posts.rb
+++ b/db/migrate/20120625162318_add_deleted_at_to_posts.rb
@@ -1,4 +1,4 @@
-class AddDeletedAtToPosts < ActiveRecord::Migration
+class AddDeletedAtToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :deleted_at, :datetime
   end
diff --git a/db/migrate/20120625174544_add_highest_post_number_to_forum_threads.rb b/db/migrate/20120625174544_add_highest_post_number_to_forum_threads.rb
index 33ffb5478e..3a9cf51ed5 100644
--- a/db/migrate/20120625174544_add_highest_post_number_to_forum_threads.rb
+++ b/db/migrate/20120625174544_add_highest_post_number_to_forum_threads.rb
@@ -1,4 +1,4 @@
-class AddHighestPostNumberToForumThreads < ActiveRecord::Migration
+class AddHighestPostNumberToForumThreads < ActiveRecord::Migration[4.2]
   def change
     add_column :forum_threads, :highest_post_number, :integer, default: 0, null: false
 
diff --git a/db/migrate/20120625195326_add_image_url_to_forum_threads.rb b/db/migrate/20120625195326_add_image_url_to_forum_threads.rb
index 4b37240bcd..5f9cdfa4ca 100644
--- a/db/migrate/20120625195326_add_image_url_to_forum_threads.rb
+++ b/db/migrate/20120625195326_add_image_url_to_forum_threads.rb
@@ -1,4 +1,4 @@
-class AddImageUrlToForumThreads < ActiveRecord::Migration
+class AddImageUrlToForumThreads < ActiveRecord::Migration[4.2]
   def change
     add_column :forum_threads, :image_url, :string
   end
diff --git a/db/migrate/20120629143908_rename_expression_type_id.rb b/db/migrate/20120629143908_rename_expression_type_id.rb
index eb19b14a20..ccb7f6f4e7 100644
--- a/db/migrate/20120629143908_rename_expression_type_id.rb
+++ b/db/migrate/20120629143908_rename_expression_type_id.rb
@@ -1,4 +1,4 @@
-class RenameExpressionTypeId < ActiveRecord::Migration
+class RenameExpressionTypeId < ActiveRecord::Migration[4.2]
 
   def up
     add_column :expression_types, :expression_index, :integer
diff --git a/db/migrate/20120629150253_denormalize_expressions.rb b/db/migrate/20120629150253_denormalize_expressions.rb
index 1b8a659db4..9c0ae63840 100644
--- a/db/migrate/20120629150253_denormalize_expressions.rb
+++ b/db/migrate/20120629150253_denormalize_expressions.rb
@@ -1,4 +1,4 @@
-class DenormalizeExpressions < ActiveRecord::Migration
+class DenormalizeExpressions < ActiveRecord::Migration[4.2]
   def change
 
     # Denormalizing this makes our queries so, so, so much nicer
@@ -15,7 +15,6 @@ class DenormalizeExpressions < ActiveRecord::Migration
     add_column :forum_threads, :expression4_count, :integer, null: false, default: 0
     add_column :forum_threads, :expression5_count, :integer, null: false, default: 0
 
-
     (1..5).each do |i|
       execute "update posts set expression#{i}_count = (select count(*) from expressions where parent_id = posts.id and expression_type_id = #{i})"
       execute "update forum_threads set expression#{i}_count = (select sum(expression#{i}_count) from posts where forum_thread_id = forum_threads.id)"
diff --git a/db/migrate/20120629151243_make_expressions_less_generic.rb b/db/migrate/20120629151243_make_expressions_less_generic.rb
index ffe9e6ee79..a442abe574 100644
--- a/db/migrate/20120629151243_make_expressions_less_generic.rb
+++ b/db/migrate/20120629151243_make_expressions_less_generic.rb
@@ -1,4 +1,4 @@
-class MakeExpressionsLessGeneric < ActiveRecord::Migration
+class MakeExpressionsLessGeneric < ActiveRecord::Migration[4.2]
   def up
     rename_column :expressions, :parent_id, :post_id
     rename_column :expressions, :expression_type_id, :expression_index
diff --git a/db/migrate/20120629182637_create_incoming_links.rb b/db/migrate/20120629182637_create_incoming_links.rb
index d5215c1ece..ffa324c0a9 100644
--- a/db/migrate/20120629182637_create_incoming_links.rb
+++ b/db/migrate/20120629182637_create_incoming_links.rb
@@ -1,4 +1,4 @@
-class CreateIncomingLinks < ActiveRecord::Migration
+class CreateIncomingLinks < ActiveRecord::Migration[4.2]
   def change
     create_table :incoming_links do |t|
       t.integer :site_id, null: false
@@ -7,7 +7,7 @@ class CreateIncomingLinks < ActiveRecord::Migration
       t.string :domain, limit: 100, null: false
       t.integer :forum_thread_id, null: true
       t.integer :post_number, null: true
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :incoming_links, [:site_id, :forum_thread_id, :post_number], name: 'incoming_index'
diff --git a/db/migrate/20120702211427_create_replies.rb b/db/migrate/20120702211427_create_replies.rb
index cf8e80e3d0..fccfd383cd 100644
--- a/db/migrate/20120702211427_create_replies.rb
+++ b/db/migrate/20120702211427_create_replies.rb
@@ -1,9 +1,9 @@
-class CreateReplies < ActiveRecord::Migration
+class CreateReplies < ActiveRecord::Migration[4.2]
   def change
     create_table :post_replies, id: false do |t|
       t.references :post
       t.integer :reply_id
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :post_replies, [:post_id, :reply_id], unique: true
diff --git a/db/migrate/20120703184734_add_reflection_to_forum_thread_links.rb b/db/migrate/20120703184734_add_reflection_to_forum_thread_links.rb
index af6b99cb88..aa41ca9905 100644
--- a/db/migrate/20120703184734_add_reflection_to_forum_thread_links.rb
+++ b/db/migrate/20120703184734_add_reflection_to_forum_thread_links.rb
@@ -1,4 +1,4 @@
-class AddReflectionToForumThreadLinks < ActiveRecord::Migration
+class AddReflectionToForumThreadLinks < ActiveRecord::Migration[4.2]
   def change
     add_column :forum_thread_links, :reflection, :boolean, default: false
     change_column :forum_thread_links, :post_id, :integer, null: true
diff --git a/db/migrate/20120703201312_add_incoming_link_count_to_posts.rb b/db/migrate/20120703201312_add_incoming_link_count_to_posts.rb
index 16c4e37eaa..ca1641a5d4 100644
--- a/db/migrate/20120703201312_add_incoming_link_count_to_posts.rb
+++ b/db/migrate/20120703201312_add_incoming_link_count_to_posts.rb
@@ -1,4 +1,4 @@
-class AddIncomingLinkCountToPosts < ActiveRecord::Migration
+class AddIncomingLinkCountToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :incoming_link_count, :integer, default: 0, null: false
   end
diff --git a/db/migrate/20120703203623_add_incoming_link_count_to_forum_threads.rb b/db/migrate/20120703203623_add_incoming_link_count_to_forum_threads.rb
index 15eb799751..18684044ed 100644
--- a/db/migrate/20120703203623_add_incoming_link_count_to_forum_threads.rb
+++ b/db/migrate/20120703203623_add_incoming_link_count_to_forum_threads.rb
@@ -1,4 +1,4 @@
-class AddIncomingLinkCountToForumThreads < ActiveRecord::Migration
+class AddIncomingLinkCountToForumThreads < ActiveRecord::Migration[4.2]
   def change
     add_column :forum_threads, :incoming_link_count, :integer, default: 0, null: false
   end
diff --git a/db/migrate/20120703210004_add_bookmark_count_to_posts.rb b/db/migrate/20120703210004_add_bookmark_count_to_posts.rb
index c9e5cf9b3c..ddb1a98a02 100644
--- a/db/migrate/20120703210004_add_bookmark_count_to_posts.rb
+++ b/db/migrate/20120703210004_add_bookmark_count_to_posts.rb
@@ -1,4 +1,4 @@
-class AddBookmarkCountToPosts < ActiveRecord::Migration
+class AddBookmarkCountToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :bookmark_count, :integer, default: 0, null: false
     add_column :forum_threads, :bookmark_count, :integer, default: 0, null: false
diff --git a/db/migrate/20120704160659_add_avg_time_to_posts.rb b/db/migrate/20120704160659_add_avg_time_to_posts.rb
index 33fbd39f14..2aa76da9c5 100644
--- a/db/migrate/20120704160659_add_avg_time_to_posts.rb
+++ b/db/migrate/20120704160659_add_avg_time_to_posts.rb
@@ -1,4 +1,4 @@
-class AddAvgTimeToPosts < ActiveRecord::Migration
+class AddAvgTimeToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :avg_time, :integer, null: true
     add_column :posts, :score, :float, null: true
diff --git a/db/migrate/20120704201743_add_view_count_to_posts.rb b/db/migrate/20120704201743_add_view_count_to_posts.rb
index 9ea94e0be4..286b9b9745 100644
--- a/db/migrate/20120704201743_add_view_count_to_posts.rb
+++ b/db/migrate/20120704201743_add_view_count_to_posts.rb
@@ -1,4 +1,4 @@
-class AddViewCountToPosts < ActiveRecord::Migration
+class AddViewCountToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :views, :integer, default: 0, null: false
 
diff --git a/db/migrate/20120705181724_add_user_to_versions.rb b/db/migrate/20120705181724_add_user_to_versions.rb
index cdafd3472f..0e68b887d6 100644
--- a/db/migrate/20120705181724_add_user_to_versions.rb
+++ b/db/migrate/20120705181724_add_user_to_versions.rb
@@ -1,4 +1,4 @@
-class AddUserToVersions < ActiveRecord::Migration
+class AddUserToVersions < ActiveRecord::Migration[4.2]
   def change
     execute "UPDATE versions SET user_type = 'User', user_id = posts.user_id
              FROM posts
diff --git a/db/migrate/20120708210305_add_last_posted_at_to_users.rb b/db/migrate/20120708210305_add_last_posted_at_to_users.rb
index b41d355698..e0df759ebd 100644
--- a/db/migrate/20120708210305_add_last_posted_at_to_users.rb
+++ b/db/migrate/20120708210305_add_last_posted_at_to_users.rb
@@ -1,4 +1,4 @@
-class AddLastPostedAtToUsers < ActiveRecord::Migration
+class AddLastPostedAtToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :last_posted_at, :datetime, null: true
     add_index :users, :last_posted_at
diff --git a/db/migrate/20120712150500_create_categories.rb b/db/migrate/20120712150500_create_categories.rb
index 3cd4ccdd79..90adb73d10 100644
--- a/db/migrate/20120712150500_create_categories.rb
+++ b/db/migrate/20120712150500_create_categories.rb
@@ -1,4 +1,4 @@
-class CreateCategories < ActiveRecord::Migration
+class CreateCategories < ActiveRecord::Migration[4.2]
   def up
     create_table :categories do |t|
       t.string :name, limit: 50, null: false
@@ -9,7 +9,7 @@ class CreateCategories < ActiveRecord::Migration
       t.integer :top1_user_id, null: true
       t.integer :top2_user_id, null: true
       t.integer :forum_thread_count, null: false, default: 0
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :categories, :name, unique: true
diff --git a/db/migrate/20120712151934_add_category_id_to_forum_threads.rb b/db/migrate/20120712151934_add_category_id_to_forum_threads.rb
index c918ebbdfa..d90799dc4f 100644
--- a/db/migrate/20120712151934_add_category_id_to_forum_threads.rb
+++ b/db/migrate/20120712151934_add_category_id_to_forum_threads.rb
@@ -1,4 +1,4 @@
-class AddCategoryIdToForumThreads < ActiveRecord::Migration
+class AddCategoryIdToForumThreads < ActiveRecord::Migration[4.2]
   def up
     add_column :forum_threads, :category_id, :integer
 
diff --git a/db/migrate/20120713201324_create_category_featured_threads.rb b/db/migrate/20120713201324_create_category_featured_threads.rb
index 170ff49b81..897992ce64 100644
--- a/db/migrate/20120713201324_create_category_featured_threads.rb
+++ b/db/migrate/20120713201324_create_category_featured_threads.rb
@@ -1,9 +1,9 @@
-class CreateCategoryFeaturedThreads < ActiveRecord::Migration
+class CreateCategoryFeaturedThreads < ActiveRecord::Migration[4.2]
   def change
     create_table :category_featured_threads, id: false do |t|
       t.references :category, null: false
       t.references :forum_thread, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :category_featured_threads, [:category_id, :forum_thread_id], unique: true, name: 'cat_featured_threads'
diff --git a/db/migrate/20120716020835_create_site_settings.rb b/db/migrate/20120716020835_create_site_settings.rb
index f519c89b5e..f554de545a 100644
--- a/db/migrate/20120716020835_create_site_settings.rb
+++ b/db/migrate/20120716020835_create_site_settings.rb
@@ -1,4 +1,4 @@
-class CreateSiteSettings < ActiveRecord::Migration
+class CreateSiteSettings < ActiveRecord::Migration[4.2]
   def change
     create_table :site_settings do |t|
       t.string :name, null: false
@@ -6,7 +6,7 @@ class CreateSiteSettings < ActiveRecord::Migration
       t.integer :data_type, null: false
       t.text :value
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/db/migrate/20120716173544_add_stats_to_categories.rb b/db/migrate/20120716173544_add_stats_to_categories.rb
index e9cea0050a..d904089921 100644
--- a/db/migrate/20120716173544_add_stats_to_categories.rb
+++ b/db/migrate/20120716173544_add_stats_to_categories.rb
@@ -1,4 +1,4 @@
-class AddStatsToCategories < ActiveRecord::Migration
+class AddStatsToCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :posts_year, :integer
     add_column :categories, :posts_month, :integer
diff --git a/db/migrate/20120718044955_create_user_open_ids.rb b/db/migrate/20120718044955_create_user_open_ids.rb
index 62cb7ff36c..626c27897c 100644
--- a/db/migrate/20120718044955_create_user_open_ids.rb
+++ b/db/migrate/20120718044955_create_user_open_ids.rb
@@ -1,10 +1,10 @@
-class CreateUserOpenIds < ActiveRecord::Migration
+class CreateUserOpenIds < ActiveRecord::Migration[4.2]
   def change
     create_table :user_open_ids do |t|
       t.integer :user_id
       t.string :email
       t.string :url
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :user_open_ids, [:url]
diff --git a/db/migrate/20120719004636_add_email_hashed_password_name_salt_to_users.rb b/db/migrate/20120719004636_add_email_hashed_password_name_salt_to_users.rb
index bd1e05bea2..a4169738e7 100644
--- a/db/migrate/20120719004636_add_email_hashed_password_name_salt_to_users.rb
+++ b/db/migrate/20120719004636_add_email_hashed_password_name_salt_to_users.rb
@@ -1,10 +1,10 @@
-class AddEmailHashedPasswordNameSaltToUsers < ActiveRecord::Migration
+class AddEmailHashedPasswordNameSaltToUsers < ActiveRecord::Migration[4.2]
   def up
     add_column :users, :email, :string, limit: 256
 
     execute "update users set email= md5(random()::text) || 'domain.com'"
 
-    change_column :users, :email, :string, limit:256, null: false
+    change_column :users, :email, :string, limit: 256, null: false
     add_index :users, [:email], unique: true
 
     rename_column :users, :display_username, :name
@@ -12,7 +12,7 @@ class AddEmailHashedPasswordNameSaltToUsers < ActiveRecord::Migration
     add_column :users, :password_hash, :string, limit: 64
     add_column :users, :salt, :string, limit: 32
     add_column :users, :active, :boolean
-    add_column :users, :activation_key,:string, limit: 32
+    add_column :users, :activation_key, :string, limit: 32
 
     add_column :user_open_ids, :active, :boolean, null: false
 
diff --git a/db/migrate/20120720013733_add_username_lower_to_users.rb b/db/migrate/20120720013733_add_username_lower_to_users.rb
index 764fae375d..0a6a89e741 100644
--- a/db/migrate/20120720013733_add_username_lower_to_users.rb
+++ b/db/migrate/20120720013733_add_username_lower_to_users.rb
@@ -1,9 +1,9 @@
-class AddUsernameLowerToUsers < ActiveRecord::Migration
+class AddUsernameLowerToUsers < ActiveRecord::Migration[4.2]
   def up
     add_column :users, :username_lower, :string, limit: 20
     execute "update users set username_lower = lower(username)"
     add_index :users, [:username_lower], unique: true
-    change_column :users, :username_lower, :string, limit: 20, null:false
+    change_column :users, :username_lower, :string, limit: 20, null: false
   end
   def down
     remove_column :users, :username_lower
diff --git a/db/migrate/20120720044246_add_auth_token_to_users.rb b/db/migrate/20120720044246_add_auth_token_to_users.rb
index 3d6ec19efa..d489e99b07 100644
--- a/db/migrate/20120720044246_add_auth_token_to_users.rb
+++ b/db/migrate/20120720044246_add_auth_token_to_users.rb
@@ -1,4 +1,4 @@
-class AddAuthTokenToUsers < ActiveRecord::Migration
+class AddAuthTokenToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :auth_token, :string, limit: 32
     add_index :users, [:auth_token]
diff --git a/db/migrate/20120720162422_add_forum_id_to_categories.rb b/db/migrate/20120720162422_add_forum_id_to_categories.rb
index 39b734c73f..8b253d1549 100644
--- a/db/migrate/20120720162422_add_forum_id_to_categories.rb
+++ b/db/migrate/20120720162422_add_forum_id_to_categories.rb
@@ -1,4 +1,4 @@
-class AddForumIdToCategories < ActiveRecord::Migration
+class AddForumIdToCategories < ActiveRecord::Migration[4.2]
   def up
     add_column :categories, :forum_id, :integer
     execute "UPDATE categories SET forum_id = (SELECT MIN(id) FROM forums)"
diff --git a/db/migrate/20120723051512_add_not_nulls_to_user_open_ids.rb b/db/migrate/20120723051512_add_not_nulls_to_user_open_ids.rb
index 44572b23d5..44666072a7 100644
--- a/db/migrate/20120723051512_add_not_nulls_to_user_open_ids.rb
+++ b/db/migrate/20120723051512_add_not_nulls_to_user_open_ids.rb
@@ -1,4 +1,4 @@
-class AddNotNullsToUserOpenIds < ActiveRecord::Migration
+class AddNotNullsToUserOpenIds < ActiveRecord::Migration[4.2]
   def change
     change_column :user_open_ids, :user_id, :integer, null: false
     change_column :user_open_ids, :email, :string, null: false
diff --git a/db/migrate/20120724234502_add_last_seen_at_to_users.rb b/db/migrate/20120724234502_add_last_seen_at_to_users.rb
index 7281d99bfb..c957404fa8 100644
--- a/db/migrate/20120724234502_add_last_seen_at_to_users.rb
+++ b/db/migrate/20120724234502_add_last_seen_at_to_users.rb
@@ -1,4 +1,4 @@
-class AddLastSeenAtToUsers < ActiveRecord::Migration
+class AddLastSeenAtToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :last_seen_at, :datetime
   end
diff --git a/db/migrate/20120724234711_add_website_to_users.rb b/db/migrate/20120724234711_add_website_to_users.rb
index 8687ceca6a..96b5ba64d2 100644
--- a/db/migrate/20120724234711_add_website_to_users.rb
+++ b/db/migrate/20120724234711_add_website_to_users.rb
@@ -1,4 +1,4 @@
-class AddWebsiteToUsers < ActiveRecord::Migration
+class AddWebsiteToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :website, :string
   end
diff --git a/db/migrate/20120725183347_add_excerpt_to_categories.rb b/db/migrate/20120725183347_add_excerpt_to_categories.rb
index ecbdca1790..3171ec2a81 100644
--- a/db/migrate/20120725183347_add_excerpt_to_categories.rb
+++ b/db/migrate/20120725183347_add_excerpt_to_categories.rb
@@ -1,4 +1,4 @@
-class AddExcerptToCategories < ActiveRecord::Migration
+class AddExcerptToCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :excerpt, :string, limit: 250
   end
diff --git a/db/migrate/20120726201830_add_invisible_to_forum_thread.rb b/db/migrate/20120726201830_add_invisible_to_forum_thread.rb
index 1c79c9a467..404350ed86 100644
--- a/db/migrate/20120726201830_add_invisible_to_forum_thread.rb
+++ b/db/migrate/20120726201830_add_invisible_to_forum_thread.rb
@@ -1,4 +1,4 @@
-class AddInvisibleToForumThread < ActiveRecord::Migration
+class AddInvisibleToForumThread < ActiveRecord::Migration[4.2]
   def up
     add_column :forum_threads, :invisible, :boolean, default: false, null: false
     change_column :categories, :excerpt, :text, null: true
diff --git a/db/migrate/20120726235129_add_user_id_to_categories.rb b/db/migrate/20120726235129_add_user_id_to_categories.rb
index 26f2ff32b0..376781c4fd 100644
--- a/db/migrate/20120726235129_add_user_id_to_categories.rb
+++ b/db/migrate/20120726235129_add_user_id_to_categories.rb
@@ -1,4 +1,4 @@
-class AddUserIdToCategories < ActiveRecord::Migration
+class AddUserIdToCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :user_id, :integer
     execute "UPDATE categories SET user_id = 1186"
diff --git a/db/migrate/20120727005556_remove_excerpt_from_categories.rb b/db/migrate/20120727005556_remove_excerpt_from_categories.rb
index aef33cbf93..8699dab5d5 100644
--- a/db/migrate/20120727005556_remove_excerpt_from_categories.rb
+++ b/db/migrate/20120727005556_remove_excerpt_from_categories.rb
@@ -1,4 +1,4 @@
-class RemoveExcerptFromCategories < ActiveRecord::Migration
+class RemoveExcerptFromCategories < ActiveRecord::Migration[4.2]
   def up
     remove_column :categories, :excerpt
   end
diff --git a/db/migrate/20120727150428_rename_invisible.rb b/db/migrate/20120727150428_rename_invisible.rb
index 04dc3aab1c..4829a1f5f2 100644
--- a/db/migrate/20120727150428_rename_invisible.rb
+++ b/db/migrate/20120727150428_rename_invisible.rb
@@ -1,4 +1,4 @@
-class RenameInvisible < ActiveRecord::Migration
+class RenameInvisible < ActiveRecord::Migration[4.2]
   def change
 
     add_column :forum_threads, :visible, :boolean, default: true, null: false
diff --git a/db/migrate/20120727213543_add_thread_counts_to_categories.rb b/db/migrate/20120727213543_add_thread_counts_to_categories.rb
index 36add724c1..cd922b175f 100644
--- a/db/migrate/20120727213543_add_thread_counts_to_categories.rb
+++ b/db/migrate/20120727213543_add_thread_counts_to_categories.rb
@@ -1,4 +1,4 @@
-class AddThreadCountsToCategories < ActiveRecord::Migration
+class AddThreadCountsToCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :threads_year, :integer
     add_column :categories, :threads_month, :integer
diff --git a/db/migrate/20120802151210_add_icon_to_expression_types.rb b/db/migrate/20120802151210_add_icon_to_expression_types.rb
index 289ae28b8a..ab833036fb 100644
--- a/db/migrate/20120802151210_add_icon_to_expression_types.rb
+++ b/db/migrate/20120802151210_add_icon_to_expression_types.rb
@@ -1,4 +1,4 @@
-class AddIconToExpressionTypes < ActiveRecord::Migration
+class AddIconToExpressionTypes < ActiveRecord::Migration[4.2]
   def change
     add_column :expression_types, :icon, :string, limit: 20
 
diff --git a/db/migrate/20120803191426_add_admin_flag_to_users.rb b/db/migrate/20120803191426_add_admin_flag_to_users.rb
index 9d7abddfec..f60b405ee3 100644
--- a/db/migrate/20120803191426_add_admin_flag_to_users.rb
+++ b/db/migrate/20120803191426_add_admin_flag_to_users.rb
@@ -1,4 +1,4 @@
-class AddAdminFlagToUsers < ActiveRecord::Migration
+class AddAdminFlagToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :admin, :boolean, default: false, null: false
     add_column :users, :moderator, :boolean, default: false, null: false
diff --git a/db/migrate/20120806030641_add_new_password_new_salt_email_token_to_users.rb b/db/migrate/20120806030641_add_new_password_new_salt_email_token_to_users.rb
index dfac912b71..7277b4eb45 100644
--- a/db/migrate/20120806030641_add_new_password_new_salt_email_token_to_users.rb
+++ b/db/migrate/20120806030641_add_new_password_new_salt_email_token_to_users.rb
@@ -1,4 +1,4 @@
-class AddNewPasswordNewSaltEmailTokenToUsers < ActiveRecord::Migration
+class AddNewPasswordNewSaltEmailTokenToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :new_salt, :string, limit: 32
     add_column :users, :new_password_hash, :string, limit: 64
diff --git a/db/migrate/20120806062617_remove_new_password_stuff_from_user.rb b/db/migrate/20120806062617_remove_new_password_stuff_from_user.rb
index 9d8df3e7e4..c1a3069a25 100644
--- a/db/migrate/20120806062617_remove_new_password_stuff_from_user.rb
+++ b/db/migrate/20120806062617_remove_new_password_stuff_from_user.rb
@@ -1,4 +1,4 @@
-class RemoveNewPasswordStuffFromUser < ActiveRecord::Migration
+class RemoveNewPasswordStuffFromUser < ActiveRecord::Migration[4.2]
   def change
     remove_column :users, :new_password_hash
     remove_column :users, :new_salt
diff --git a/db/migrate/20120807223020_create_actions.rb b/db/migrate/20120807223020_create_actions.rb
index 623bda5929..c84336dc22 100644
--- a/db/migrate/20120807223020_create_actions.rb
+++ b/db/migrate/20120807223020_create_actions.rb
@@ -1,4 +1,4 @@
-class CreateActions < ActiveRecord::Migration
+class CreateActions < ActiveRecord::Migration[4.2]
   def change
     create_table :actions do |t|
 
@@ -8,7 +8,6 @@ class CreateActions < ActiveRecord::Migration
       # There is a notificiation table as well that covers much of this,
       # but this table is wider and is intended for non-notifying actions as well
 
-
       t.integer :action_type, null: false
       t.integer :user_id, null: false
       t.integer :target_forum_thread_id
@@ -16,7 +15,7 @@ class CreateActions < ActiveRecord::Migration
       t.integer :target_user_id
       t.integer :acting_user_id
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :actions, [:user_id, :action_type]
diff --git a/db/migrate/20120809020415_remove_site_id.rb b/db/migrate/20120809020415_remove_site_id.rb
index 86727e86fd..24a8019824 100644
--- a/db/migrate/20120809020415_remove_site_id.rb
+++ b/db/migrate/20120809020415_remove_site_id.rb
@@ -1,4 +1,4 @@
-class RemoveSiteId < ActiveRecord::Migration
+class RemoveSiteId < ActiveRecord::Migration[4.2]
   def up
     drop_table 'sites'
     remove_index 'incoming_links', name: "incoming_index"
@@ -9,7 +9,7 @@ class RemoveSiteId < ActiveRecord::Migration
 
     remove_index 'expression_types', name: 'index_expression_types_on_site_id_and_expression_index'
     remove_index 'expression_types', name: 'index_expression_types_on_site_id_and_name'
-    remove_column 'expression_types','site_id'
+    remove_column 'expression_types', 'site_id'
     add_index "expression_types", ["expression_index"], unique: true
     add_index "expression_types", ["name"], unique: true
 
diff --git a/db/migrate/20120809030647_remove_forum_id.rb b/db/migrate/20120809030647_remove_forum_id.rb
index 412f9e3cc7..f489fc52e5 100644
--- a/db/migrate/20120809030647_remove_forum_id.rb
+++ b/db/migrate/20120809030647_remove_forum_id.rb
@@ -1,4 +1,4 @@
-class RemoveForumId < ActiveRecord::Migration
+class RemoveForumId < ActiveRecord::Migration[4.2]
   def up
     remove_column 'forum_threads', 'forum_id'
     remove_column 'categories', 'forum_id'
diff --git a/db/migrate/20120809053414_correct_indexing_on_posts.rb b/db/migrate/20120809053414_correct_indexing_on_posts.rb
index b3777e093a..ce29c25a5a 100644
--- a/db/migrate/20120809053414_correct_indexing_on_posts.rb
+++ b/db/migrate/20120809053414_correct_indexing_on_posts.rb
@@ -1,20 +1,20 @@
-class CorrectIndexingOnPosts < ActiveRecord::Migration
+class CorrectIndexingOnPosts < ActiveRecord::Migration[4.2]
   def up
-      execute "update posts pp
+    execute "update posts pp
 set post_number = c.real_number
 from
 (
 	select p1.id, count(*) real_number from posts p1
 	join posts p2 on p1.forum_thread_id = p2.forum_thread_id
 	where p2.id <= p1.id and p1.forum_thread_id = p2.forum_thread_id
-        group by p1.id
+      group by p1.id
 ) as c
 where pp.id = c.id and pp.post_number <> c.real_number"
 
-    remove_index "posts", ["forum_thread_id","post_number"]
+    remove_index "posts", ["forum_thread_id", "post_number"]
 
     # this needs to be unique if it is not we can not use post_number to identify a post
-    add_index "posts", ["forum_thread_id","post_number"], unique: true
+    add_index "posts", ["forum_thread_id", "post_number"], unique: true
 
   end
 
diff --git a/db/migrate/20120809154750_remove_index_for_now.rb b/db/migrate/20120809154750_remove_index_for_now.rb
index 148cbe70a0..dabc172850 100644
--- a/db/migrate/20120809154750_remove_index_for_now.rb
+++ b/db/migrate/20120809154750_remove_index_for_now.rb
@@ -1,11 +1,11 @@
-class RemoveIndexForNow < ActiveRecord::Migration
+class RemoveIndexForNow < ActiveRecord::Migration[4.2]
   def up
-    remove_index "posts", ["forum_thread_id","post_number"]
-    add_index "posts", ["forum_thread_id","post_number"], unique: false
+    remove_index "posts", ["forum_thread_id", "post_number"]
+    add_index "posts", ["forum_thread_id", "post_number"], unique: false
   end
 
   def down
-    remove_index "posts", ["forum_thread_id","post_number"]
-    add_index "posts", ["forum_thread_id","post_number"], unique: true
+    remove_index "posts", ["forum_thread_id", "post_number"]
+    add_index "posts", ["forum_thread_id", "post_number"], unique: true
   end
 end
diff --git a/db/migrate/20120809174649_create_post_actions.rb b/db/migrate/20120809174649_create_post_actions.rb
index ddcf4d4632..f9d2d8af87 100644
--- a/db/migrate/20120809174649_create_post_actions.rb
+++ b/db/migrate/20120809174649_create_post_actions.rb
@@ -1,11 +1,11 @@
-class CreatePostActions < ActiveRecord::Migration
+class CreatePostActions < ActiveRecord::Migration[4.2]
   def up
     create_table :post_actions do |t|
       t.integer :post_id, null: false
       t.integer :user_id, null: false
-      t.integer :post_action_type_id, null:false
+      t.integer :post_action_type_id, null: false
       t.datetime :deleted_at
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :post_actions, ["post_id"]
diff --git a/db/migrate/20120809175110_create_post_action_types.rb b/db/migrate/20120809175110_create_post_action_types.rb
index c738031ca9..1759817ea3 100644
--- a/db/migrate/20120809175110_create_post_action_types.rb
+++ b/db/migrate/20120809175110_create_post_action_types.rb
@@ -1,4 +1,4 @@
-class CreatePostActionTypes < ActiveRecord::Migration
+class CreatePostActionTypes < ActiveRecord::Migration[4.2]
   def change
     create_table(:post_action_types, id: false) do |t|
       t.integer :id, options: "PRIMARY KEY", null: false
@@ -8,7 +8,7 @@ class CreatePostActionTypes < ActiveRecord::Migration
       t.text :description
       t.string :icon, limit: 20
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/db/migrate/20120809201855_migrate_bookmarks_to_post_actions.rb b/db/migrate/20120809201855_migrate_bookmarks_to_post_actions.rb
index 89db330213..5b6705e866 100644
--- a/db/migrate/20120809201855_migrate_bookmarks_to_post_actions.rb
+++ b/db/migrate/20120809201855_migrate_bookmarks_to_post_actions.rb
@@ -1,4 +1,4 @@
-class MigrateBookmarksToPostActions < ActiveRecord::Migration
+class MigrateBookmarksToPostActions < ActiveRecord::Migration[4.2]
   def up
     drop_table "bookmarks"
   end
diff --git a/db/migrate/20120810064839_rename_actions_to_user_actions.rb b/db/migrate/20120810064839_rename_actions_to_user_actions.rb
index f7a245fdbe..6be0a2b8b3 100644
--- a/db/migrate/20120810064839_rename_actions_to_user_actions.rb
+++ b/db/migrate/20120810064839_rename_actions_to_user_actions.rb
@@ -1,4 +1,4 @@
-class RenameActionsToUserActions < ActiveRecord::Migration
+class RenameActionsToUserActions < ActiveRecord::Migration[4.2]
   def change
     rename_table 'actions', 'user_actions'
   end
diff --git a/db/migrate/20120812235417_retire_expressions.rb b/db/migrate/20120812235417_retire_expressions.rb
index 696d9a39f8..3f565558c1 100644
--- a/db/migrate/20120812235417_retire_expressions.rb
+++ b/db/migrate/20120812235417_retire_expressions.rb
@@ -1,4 +1,4 @@
-class RetireExpressions < ActiveRecord::Migration
+class RetireExpressions < ActiveRecord::Migration[4.2]
   def up
     execute 'insert into post_actions (post_action_type_id, user_id, post_id, created_at, updated_at)
 select
diff --git a/db/migrate/20120813004347_rename_expression_columns_in_forum_thread.rb b/db/migrate/20120813004347_rename_expression_columns_in_forum_thread.rb
index 77efca9ea8..4483800e4f 100644
--- a/db/migrate/20120813004347_rename_expression_columns_in_forum_thread.rb
+++ b/db/migrate/20120813004347_rename_expression_columns_in_forum_thread.rb
@@ -1,4 +1,4 @@
-class RenameExpressionColumnsInForumThread < ActiveRecord::Migration
+class RenameExpressionColumnsInForumThread < ActiveRecord::Migration[4.2]
   def change
     rename_column 'forum_threads', 'expression1_count', 'off_topic_count'
     rename_column 'forum_threads', 'expression2_count', 'offensive_count'
diff --git a/db/migrate/20120813042912_rename_expression_columns_in_posts.rb b/db/migrate/20120813042912_rename_expression_columns_in_posts.rb
index c57a250704..8b22ec5a27 100644
--- a/db/migrate/20120813042912_rename_expression_columns_in_posts.rb
+++ b/db/migrate/20120813042912_rename_expression_columns_in_posts.rb
@@ -1,4 +1,4 @@
-class RenameExpressionColumnsInPosts < ActiveRecord::Migration
+class RenameExpressionColumnsInPosts < ActiveRecord::Migration[4.2]
   def change
     rename_column 'posts', 'expression1_count', 'off_topic_count'
     rename_column 'posts', 'expression2_count', 'offensive_count'
diff --git a/db/migrate/20120813201426_create_forum_thread_link_clicks.rb b/db/migrate/20120813201426_create_forum_thread_link_clicks.rb
index f87202cfb5..65e67011b7 100644
--- a/db/migrate/20120813201426_create_forum_thread_link_clicks.rb
+++ b/db/migrate/20120813201426_create_forum_thread_link_clicks.rb
@@ -1,10 +1,10 @@
-class CreateForumThreadLinkClicks < ActiveRecord::Migration
+class CreateForumThreadLinkClicks < ActiveRecord::Migration[4.2]
   def change
     create_table :forum_thread_link_clicks do |t|
       t.references :forum_thread_link, null: false
       t.references :user, null: true
       t.integer :ip, null: false, limit: 8
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_column :forum_thread_links, :clicks, :integer, default: 0, null: false
diff --git a/db/migrate/20120815004411_add_unique_index_to_forum_thread_links.rb b/db/migrate/20120815004411_add_unique_index_to_forum_thread_links.rb
index e94bcc9337..7ddf6d405b 100644
--- a/db/migrate/20120815004411_add_unique_index_to_forum_thread_links.rb
+++ b/db/migrate/20120815004411_add_unique_index_to_forum_thread_links.rb
@@ -1,4 +1,4 @@
-class AddUniqueIndexToForumThreadLinks < ActiveRecord::Migration
+class AddUniqueIndexToForumThreadLinks < ActiveRecord::Migration[4.2]
   def change
 
     execute "DELETE FROM forum_thread_links USING forum_thread_links ftl2
diff --git a/db/migrate/20120815180106_add_post_type_to_posts.rb b/db/migrate/20120815180106_add_post_type_to_posts.rb
index 768da19725..4f3b00c168 100644
--- a/db/migrate/20120815180106_add_post_type_to_posts.rb
+++ b/db/migrate/20120815180106_add_post_type_to_posts.rb
@@ -1,4 +1,4 @@
-class AddPostTypeToPosts < ActiveRecord::Migration
+class AddPostTypeToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :post_type, :integer, default: 1, null: false
   end
diff --git a/db/migrate/20120815204733_add_moderator_posts_count_to_forum_threads.rb b/db/migrate/20120815204733_add_moderator_posts_count_to_forum_threads.rb
index 0f3ff34966..49717c4fd9 100644
--- a/db/migrate/20120815204733_add_moderator_posts_count_to_forum_threads.rb
+++ b/db/migrate/20120815204733_add_moderator_posts_count_to_forum_threads.rb
@@ -1,4 +1,4 @@
-class AddModeratorPostsCountToForumThreads < ActiveRecord::Migration
+class AddModeratorPostsCountToForumThreads < ActiveRecord::Migration[4.2]
   def change
     add_column :forum_threads, :moderator_posts_count, :integer, default: 0, null: false
 
diff --git a/db/migrate/20120816050526_add_unique_constraint_to_user_actions.rb b/db/migrate/20120816050526_add_unique_constraint_to_user_actions.rb
index 5a8ea4af87..43bbe102d1 100644
--- a/db/migrate/20120816050526_add_unique_constraint_to_user_actions.rb
+++ b/db/migrate/20120816050526_add_unique_constraint_to_user_actions.rb
@@ -1,5 +1,5 @@
-class AddUniqueConstraintToUserActions < ActiveRecord::Migration
+class AddUniqueConstraintToUserActions < ActiveRecord::Migration[4.2]
   def change
-    add_index :user_actions, ['action_type','user_id', 'target_forum_thread_id', 'target_post_id', 'acting_user_id'], name: "idx_unique_rows", unique: true
+    add_index :user_actions, ['action_type', 'user_id', 'target_forum_thread_id', 'target_post_id', 'acting_user_id'], name: "idx_unique_rows", unique: true
   end
 end
diff --git a/db/migrate/20120816205537_add_forum_thread_states.rb b/db/migrate/20120816205537_add_forum_thread_states.rb
index 95a6e8b6a8..5a80831a14 100644
--- a/db/migrate/20120816205537_add_forum_thread_states.rb
+++ b/db/migrate/20120816205537_add_forum_thread_states.rb
@@ -1,4 +1,4 @@
-class AddForumThreadStates < ActiveRecord::Migration
+class AddForumThreadStates < ActiveRecord::Migration[4.2]
   def change
     add_column :forum_threads, :closed, :boolean, default: false, null: false
     add_column :forum_threads, :sticky, :boolean, default: false, null: false
diff --git a/db/migrate/20120816205538_add_starred_at_to_forum_thread_user.rb b/db/migrate/20120816205538_add_starred_at_to_forum_thread_user.rb
index 6cbe575a34..2fc02d4287 100644
--- a/db/migrate/20120816205538_add_starred_at_to_forum_thread_user.rb
+++ b/db/migrate/20120816205538_add_starred_at_to_forum_thread_user.rb
@@ -1,4 +1,4 @@
-class AddStarredAtToForumThreadUser < ActiveRecord::Migration
+class AddStarredAtToForumThreadUser < ActiveRecord::Migration[4.2]
   def up
     add_column :forum_thread_users, :starred_at, :datetime
     User.exec_sql 'update forum_thread_users f set starred_at = COALESCE(created_at, ?)
diff --git a/db/migrate/20120820191804_add_search_indices.rb b/db/migrate/20120820191804_add_search_indices.rb
index e073be6c16..11f8c30748 100644
--- a/db/migrate/20120820191804_add_search_indices.rb
+++ b/db/migrate/20120820191804_add_search_indices.rb
@@ -1,4 +1,4 @@
-class AddSearchIndices < ActiveRecord::Migration
+class AddSearchIndices < ActiveRecord::Migration[4.2]
   def up
     execute "CREATE INDEX idx_search_user ON users USING GIN(to_tsvector('english', username))"
     execute "CREATE INDEX idx_search_thread ON forum_threads USING GIN(to_tsvector('english', title))"
diff --git a/db/migrate/20120821191616_add_bumped_at_to_forum_threads.rb b/db/migrate/20120821191616_add_bumped_at_to_forum_threads.rb
index 584c62c9fb..96217a0ad8 100644
--- a/db/migrate/20120821191616_add_bumped_at_to_forum_threads.rb
+++ b/db/migrate/20120821191616_add_bumped_at_to_forum_threads.rb
@@ -1,10 +1,10 @@
-class AddBumpedAtToForumThreads < ActiveRecord::Migration
+class AddBumpedAtToForumThreads < ActiveRecord::Migration[4.2]
   def change
     add_column :forum_threads, :bumped_at, :datetime
     execute "UPDATE forum_threads SET bumped_at = last_posted_at"
     change_column :forum_threads, :bumped_at, :datetime, null: false
 
     remove_index :forum_threads, :last_posted_at
-    add_index :forum_threads, :bumped_at, order: {bumped_at: :desc}
+    add_index :forum_threads, :bumped_at, order: { bumped_at: :desc }
   end
 end
diff --git a/db/migrate/20120823205956_add_slug_to_categories.rb b/db/migrate/20120823205956_add_slug_to_categories.rb
index 5064184825..76cdab26a7 100644
--- a/db/migrate/20120823205956_add_slug_to_categories.rb
+++ b/db/migrate/20120823205956_add_slug_to_categories.rb
@@ -1,4 +1,4 @@
-class AddSlugToCategories < ActiveRecord::Migration
+class AddSlugToCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :slug, :string
     execute "UPDATE categories SET slug = REPLACE(LOWER(name), ' ', '-')"
diff --git a/db/migrate/20120824171908_create_category_featured_users.rb b/db/migrate/20120824171908_create_category_featured_users.rb
index 27c3fadd5b..c97fcf195f 100644
--- a/db/migrate/20120824171908_create_category_featured_users.rb
+++ b/db/migrate/20120824171908_create_category_featured_users.rb
@@ -1,9 +1,9 @@
-class CreateCategoryFeaturedUsers < ActiveRecord::Migration
+class CreateCategoryFeaturedUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :category_featured_users do |t|
       t.references :category
       t.references :user
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :category_featured_users, [:category_id, :user_id], unique: true
diff --git a/db/migrate/20120828204209_create_onebox_renders.rb b/db/migrate/20120828204209_create_onebox_renders.rb
index 85b60d7654..297be79b76 100644
--- a/db/migrate/20120828204209_create_onebox_renders.rb
+++ b/db/migrate/20120828204209_create_onebox_renders.rb
@@ -1,10 +1,10 @@
-class CreateOneboxRenders < ActiveRecord::Migration
+class CreateOneboxRenders < ActiveRecord::Migration[4.2]
   def change
     create_table :onebox_renders do |t|
       t.string :url, null: false
       t.text :cooked, null: false
       t.datetime :expires_at, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :onebox_renders, :url, unique: true
diff --git a/db/migrate/20120828204624_create_post_onebox_renders.rb b/db/migrate/20120828204624_create_post_onebox_renders.rb
index 19c70e1429..fae17c5052 100644
--- a/db/migrate/20120828204624_create_post_onebox_renders.rb
+++ b/db/migrate/20120828204624_create_post_onebox_renders.rb
@@ -1,9 +1,9 @@
-class CreatePostOneboxRenders < ActiveRecord::Migration
+class CreatePostOneboxRenders < ActiveRecord::Migration[4.2]
   def change
     create_table :post_onebox_renders, id: false do |t|
       t.references :post, null: false
       t.references :onebox_render, null: false
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :post_onebox_renders, [:post_id, :onebox_render_id], unique: true
   end
diff --git a/db/migrate/20120830182736_add_preview_to_onebox_renders.rb b/db/migrate/20120830182736_add_preview_to_onebox_renders.rb
index 79edede11a..e41805580e 100644
--- a/db/migrate/20120830182736_add_preview_to_onebox_renders.rb
+++ b/db/migrate/20120830182736_add_preview_to_onebox_renders.rb
@@ -1,4 +1,4 @@
-class AddPreviewToOneboxRenders < ActiveRecord::Migration
+class AddPreviewToOneboxRenders < ActiveRecord::Migration[4.2]
   def change
     add_column :onebox_renders, :preview, :text, null: true
 
diff --git a/db/migrate/20120910171504_remove_description_from_site_settings.rb b/db/migrate/20120910171504_remove_description_from_site_settings.rb
index a0718456c2..f353e117c1 100644
--- a/db/migrate/20120910171504_remove_description_from_site_settings.rb
+++ b/db/migrate/20120910171504_remove_description_from_site_settings.rb
@@ -1,4 +1,4 @@
-class RemoveDescriptionFromSiteSettings < ActiveRecord::Migration
+class RemoveDescriptionFromSiteSettings < ActiveRecord::Migration[4.2]
   def up
     remove_column :site_settings, :description
   end
diff --git a/db/migrate/20120918152319_rename_views_to_reads.rb b/db/migrate/20120918152319_rename_views_to_reads.rb
index 4a35838010..8f65f1c646 100644
--- a/db/migrate/20120918152319_rename_views_to_reads.rb
+++ b/db/migrate/20120918152319_rename_views_to_reads.rb
@@ -1,4 +1,4 @@
-class RenameViewsToReads < ActiveRecord::Migration
+class RenameViewsToReads < ActiveRecord::Migration[4.2]
   def up
     rename_column :posts, :views, :reads
   end
diff --git a/db/migrate/20120918205931_add_sub_tag_to_forum_threads.rb b/db/migrate/20120918205931_add_sub_tag_to_forum_threads.rb
index 4765da2e96..bcd4f98b6c 100644
--- a/db/migrate/20120918205931_add_sub_tag_to_forum_threads.rb
+++ b/db/migrate/20120918205931_add_sub_tag_to_forum_threads.rb
@@ -1,4 +1,4 @@
-class AddSubTagToForumThreads < ActiveRecord::Migration
+class AddSubTagToForumThreads < ActiveRecord::Migration[4.2]
   def change
     add_column :forum_threads, :sub_tag, :string
     add_index :forum_threads, [:category_id, :sub_tag, :bumped_at]
diff --git a/db/migrate/20120919152846_add_has_best_of_to_forum_threads.rb b/db/migrate/20120919152846_add_has_best_of_to_forum_threads.rb
index d6fd5599fd..ae0b8bbb29 100644
--- a/db/migrate/20120919152846_add_has_best_of_to_forum_threads.rb
+++ b/db/migrate/20120919152846_add_has_best_of_to_forum_threads.rb
@@ -1,4 +1,4 @@
-class AddHasBestOfToForumThreads < ActiveRecord::Migration
+class AddHasBestOfToForumThreads < ActiveRecord::Migration[4.2]
 
   def change
     add_column :forum_threads, :has_best_of, :boolean, default: false, null: false
diff --git a/db/migrate/20120921055428_add_twitter_user_info.rb b/db/migrate/20120921055428_add_twitter_user_info.rb
index 7aa0f81f0c..48b8c34ad6 100644
--- a/db/migrate/20120921055428_add_twitter_user_info.rb
+++ b/db/migrate/20120921055428_add_twitter_user_info.rb
@@ -1,10 +1,10 @@
-class AddTwitterUserInfo < ActiveRecord::Migration
+class AddTwitterUserInfo < ActiveRecord::Migration[4.2]
   def change
     create_table :twitter_user_infos do  |t|
       t.integer :user_id, null: false
       t.string :screen_name, null: false
       t.integer :twitter_user_id, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :twitter_user_infos, [:twitter_user_id], unique: true
diff --git a/db/migrate/20120921155050_create_archetypes.rb b/db/migrate/20120921155050_create_archetypes.rb
index 59e716913c..6e9ae48981 100644
--- a/db/migrate/20120921155050_create_archetypes.rb
+++ b/db/migrate/20120921155050_create_archetypes.rb
@@ -1,8 +1,8 @@
-class CreateArchetypes < ActiveRecord::Migration
+class CreateArchetypes < ActiveRecord::Migration[4.2]
   def up
     create_table :archetypes do |t|
       t.string :name_key, null: false
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :archetypes, :name_key, unique: true
 
diff --git a/db/migrate/20120921162512_add_meta_data_to_forum_threads.rb b/db/migrate/20120921162512_add_meta_data_to_forum_threads.rb
index 7543fe9876..e4377a7744 100644
--- a/db/migrate/20120921162512_add_meta_data_to_forum_threads.rb
+++ b/db/migrate/20120921162512_add_meta_data_to_forum_threads.rb
@@ -1,4 +1,4 @@
-class AddMetaDataToForumThreads < ActiveRecord::Migration
+class AddMetaDataToForumThreads < ActiveRecord::Migration[4.2]
   def change
     execute "CREATE EXTENSION IF NOT EXISTS hstore"
     add_column :forum_threads, :meta_data, :hstore
diff --git a/db/migrate/20120921163606_create_archetype_options.rb b/db/migrate/20120921163606_create_archetype_options.rb
index acac37d897..f772013d90 100644
--- a/db/migrate/20120921163606_create_archetype_options.rb
+++ b/db/migrate/20120921163606_create_archetype_options.rb
@@ -1,10 +1,10 @@
-class CreateArchetypeOptions < ActiveRecord::Migration
+class CreateArchetypeOptions < ActiveRecord::Migration[4.2]
   def change
     create_table :archetype_options do |t|
       t.references :archetype, null: false
       t.string :key, null: false
       t.integer :option_type, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :archetype_options, :archetype_id
diff --git a/db/migrate/20120924182000_add_hstore_extension.rb b/db/migrate/20120924182000_add_hstore_extension.rb
index f3f8d8acba..f8145e7e7f 100644
--- a/db/migrate/20120924182000_add_hstore_extension.rb
+++ b/db/migrate/20120924182000_add_hstore_extension.rb
@@ -1,4 +1,4 @@
-class AddHstoreExtension < ActiveRecord::Migration
+class AddHstoreExtension < ActiveRecord::Migration[4.2]
   def self.up
     execute "CREATE EXTENSION IF NOT EXISTS hstore"
   end
diff --git a/db/migrate/20120924182031_add_vote_count_to_posts.rb b/db/migrate/20120924182031_add_vote_count_to_posts.rb
index c65852ae77..1b0e739570 100644
--- a/db/migrate/20120924182031_add_vote_count_to_posts.rb
+++ b/db/migrate/20120924182031_add_vote_count_to_posts.rb
@@ -1,4 +1,4 @@
-class AddVoteCountToPosts < ActiveRecord::Migration
+class AddVoteCountToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :forum_threads, :vote_count, :integer, default: 0, null: false
     add_column :posts, :vote_count, :integer, default: 0, null: false
diff --git a/db/migrate/20120925171620_remove_english_from_post_action_types.rb b/db/migrate/20120925171620_remove_english_from_post_action_types.rb
index 25eb104afb..b3d2840a22 100644
--- a/db/migrate/20120925171620_remove_english_from_post_action_types.rb
+++ b/db/migrate/20120925171620_remove_english_from_post_action_types.rb
@@ -1,4 +1,4 @@
-class RemoveEnglishFromPostActionTypes < ActiveRecord::Migration
+class RemoveEnglishFromPostActionTypes < ActiveRecord::Migration[4.2]
   def up
     rename_column :post_action_types, :name, :name_key
     execute "UPDATE post_action_types SET name_key = regexp_replace(lower(name_key), '[^a-z]', '_')"
diff --git a/db/migrate/20120925190802_add_sequence_to_post_action_types.rb b/db/migrate/20120925190802_add_sequence_to_post_action_types.rb
index d6d14b9589..b82c69f252 100644
--- a/db/migrate/20120925190802_add_sequence_to_post_action_types.rb
+++ b/db/migrate/20120925190802_add_sequence_to_post_action_types.rb
@@ -1,4 +1,4 @@
-class AddSequenceToPostActionTypes < ActiveRecord::Migration
+class AddSequenceToPostActionTypes < ActiveRecord::Migration[4.2]
   def change
     remove_column :post_action_types, :id
     add_column :post_action_types, :id, :primary_key
diff --git a/db/migrate/20120928170023_add_sort_order_to_posts.rb b/db/migrate/20120928170023_add_sort_order_to_posts.rb
index de98ed3b75..6a0bf192ad 100644
--- a/db/migrate/20120928170023_add_sort_order_to_posts.rb
+++ b/db/migrate/20120928170023_add_sort_order_to_posts.rb
@@ -1,4 +1,4 @@
-class AddSortOrderToPosts < ActiveRecord::Migration
+class AddSortOrderToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :sort_order, :integer
     remove_index :posts, :user_id
diff --git a/db/migrate/20121009161116_add_email_stuff_to_users.rb b/db/migrate/20121009161116_add_email_stuff_to_users.rb
index af0210eef1..839a10bee6 100644
--- a/db/migrate/20121009161116_add_email_stuff_to_users.rb
+++ b/db/migrate/20121009161116_add_email_stuff_to_users.rb
@@ -1,4 +1,4 @@
-class AddEmailStuffToUsers < ActiveRecord::Migration
+class AddEmailStuffToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :last_emailed_at, :datetime, null: true
     add_column :users, :email_digests, :boolean, null: false, default: true
diff --git a/db/migrate/20121011155904_create_email_logs.rb b/db/migrate/20121011155904_create_email_logs.rb
index 2d92e00db6..f6a5af197c 100644
--- a/db/migrate/20121011155904_create_email_logs.rb
+++ b/db/migrate/20121011155904_create_email_logs.rb
@@ -1,13 +1,13 @@
-class CreateEmailLogs < ActiveRecord::Migration
+class CreateEmailLogs < ActiveRecord::Migration[4.2]
   def change
     create_table :email_logs do |t|
       t.string :to_address, null: false
       t.string :email_type, null: false
       t.integer :user_id, null: true
-      t.timestamps
+      t.timestamps null: false
     end
 
-    add_index :email_logs, :created_at, order: {created_at: :desc}
-    add_index :email_logs, [:user_id, :created_at], order: {created_at: :desc}
+    add_index :email_logs, :created_at, order: { created_at: :desc }
+    add_index :email_logs, [:user_id, :created_at], order: { created_at: :desc }
   end
 end
diff --git a/db/migrate/20121017162924_convert_archetypes.rb b/db/migrate/20121017162924_convert_archetypes.rb
index ba4559da9d..b6513f9fbc 100644
--- a/db/migrate/20121017162924_convert_archetypes.rb
+++ b/db/migrate/20121017162924_convert_archetypes.rb
@@ -1,4 +1,4 @@
-class ConvertArchetypes < ActiveRecord::Migration
+class ConvertArchetypes < ActiveRecord::Migration[4.2]
   def up
     add_column :forum_threads, :archetype, :string, default: 'regular', null: false
     execute "UPDATE forum_threads SET archetype = a.name_key FROM archetypes AS a WHERE a.id = forum_threads.archetype_id"
diff --git a/db/migrate/20121018103721_rename_forum_thread_tables.rb b/db/migrate/20121018103721_rename_forum_thread_tables.rb
index d513d1b0e2..e8a3e4160d 100644
--- a/db/migrate/20121018103721_rename_forum_thread_tables.rb
+++ b/db/migrate/20121018103721_rename_forum_thread_tables.rb
@@ -1,4 +1,4 @@
-class RenameForumThreadTables < ActiveRecord::Migration
+class RenameForumThreadTables < ActiveRecord::Migration[4.2]
   def change
     rename_table 'forum_threads', 'topics'
     rename_table 'forum_thread_link_clicks', 'topic_link_clicks'
@@ -14,7 +14,6 @@ class RenameForumThreadTables < ActiveRecord::Migration
     rename_column 'categories', 'threads_month', 'topics_month'
     rename_column 'categories', 'threads_week', 'topics_week'
 
-
     rename_column 'category_featured_topics', 'forum_thread_id', 'topic_id'
 
     rename_column 'topic_link_clicks', 'forum_thread_link_id', 'topic_link_id'
@@ -22,7 +21,6 @@ class RenameForumThreadTables < ActiveRecord::Migration
     rename_column 'topic_links', 'forum_thread_id', 'topic_id'
     rename_column 'topic_links', 'link_forum_thread_id', 'link_topic_id'
 
-
     rename_column 'topic_users', 'forum_thread_id', 'topic_id'
 
     rename_column 'incoming_links', 'forum_thread_id', 'topic_id'
diff --git a/db/migrate/20121018133039_create_topic_allowed_users.rb b/db/migrate/20121018133039_create_topic_allowed_users.rb
index 04a832f60f..8975ae622f 100644
--- a/db/migrate/20121018133039_create_topic_allowed_users.rb
+++ b/db/migrate/20121018133039_create_topic_allowed_users.rb
@@ -1,9 +1,9 @@
-class CreateTopicAllowedUsers < ActiveRecord::Migration
+class CreateTopicAllowedUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :topic_allowed_users do |t|
       t.integer :user_id, null: false
       t.integer :topic_id, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :topic_allowed_users, [:topic_id, :user_id], unique: true
diff --git a/db/migrate/20121018182709_fix_notification_data.rb b/db/migrate/20121018182709_fix_notification_data.rb
index 5d261a464f..cbfeb28fd2 100644
--- a/db/migrate/20121018182709_fix_notification_data.rb
+++ b/db/migrate/20121018182709_fix_notification_data.rb
@@ -1,4 +1,4 @@
-class FixNotificationData < ActiveRecord::Migration
+class FixNotificationData < ActiveRecord::Migration[4.2]
   def up
     execute "UPDATE notifications SET data = replace(data, 'thread_title', 'topic_title')"
   end
diff --git a/db/migrate/20121106015500_drop_avatar_url_from_users.rb b/db/migrate/20121106015500_drop_avatar_url_from_users.rb
index a9cc69114d..9d6662322b 100644
--- a/db/migrate/20121106015500_drop_avatar_url_from_users.rb
+++ b/db/migrate/20121106015500_drop_avatar_url_from_users.rb
@@ -4,7 +4,7 @@
 #   for local urls we need to upload an image and have a pointer to the upload, then use the upload id in the user table
 #   for gravatar we already have the email and can hash it
 
-class DropAvatarUrlFromUsers < ActiveRecord::Migration
+class DropAvatarUrlFromUsers < ActiveRecord::Migration[4.2]
   def up
     remove_column :users, :avatar_url
   end
diff --git a/db/migrate/20121108193516_add_post_action_id_to_notifications.rb b/db/migrate/20121108193516_add_post_action_id_to_notifications.rb
index beeae1131c..01e1f7e7b1 100644
--- a/db/migrate/20121108193516_add_post_action_id_to_notifications.rb
+++ b/db/migrate/20121108193516_add_post_action_id_to_notifications.rb
@@ -1,4 +1,4 @@
-class AddPostActionIdToNotifications < ActiveRecord::Migration
+class AddPostActionIdToNotifications < ActiveRecord::Migration[4.2]
   def change
     add_column :notifications, :post_action_id, :integer, null: true
     add_index :notifications, :post_action_id
diff --git a/db/migrate/20121109164630_create_trust_levels.rb b/db/migrate/20121109164630_create_trust_levels.rb
index 16a1e70c16..8b5fe68192 100644
--- a/db/migrate/20121109164630_create_trust_levels.rb
+++ b/db/migrate/20121109164630_create_trust_levels.rb
@@ -1,8 +1,8 @@
-class CreateTrustLevels < ActiveRecord::Migration
+class CreateTrustLevels < ActiveRecord::Migration[4.2]
   def change
     create_table :trust_levels do |t|
       t.string :name_key, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_column :users, :trust_level_id, :integer, default: 1, null: false
diff --git a/db/migrate/20121113200844_bio_markdown_support.rb b/db/migrate/20121113200844_bio_markdown_support.rb
index 54ad72f71c..1737b65449 100644
--- a/db/migrate/20121113200844_bio_markdown_support.rb
+++ b/db/migrate/20121113200844_bio_markdown_support.rb
@@ -1,4 +1,4 @@
-class BioMarkdownSupport < ActiveRecord::Migration
+class BioMarkdownSupport < ActiveRecord::Migration[4.2]
   def up
     rename_column :users, :bio, :bio_raw
     add_column :users, :bio_cooked, :text, null: true
diff --git a/db/migrate/20121113200845_create_facebook_user_infos.rb b/db/migrate/20121113200845_create_facebook_user_infos.rb
index aa9c29099d..9640031c92 100644
--- a/db/migrate/20121113200845_create_facebook_user_infos.rb
+++ b/db/migrate/20121113200845_create_facebook_user_infos.rb
@@ -1,4 +1,4 @@
-class CreateFacebookUserInfos < ActiveRecord::Migration
+class CreateFacebookUserInfos < ActiveRecord::Migration[4.2]
   def change
     create_table :facebook_user_infos do |t|
       t.integer :user_id, null: false
@@ -11,7 +11,7 @@ class CreateFacebookUserInfos < ActiveRecord::Migration
       t.string :name
       t.string :link
 
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :facebook_user_infos, :user_id, unique: true
     add_index :facebook_user_infos, :facebook_user_id, unique: true
diff --git a/db/migrate/20121115172544_rename_sticky_to_pinned.rb b/db/migrate/20121115172544_rename_sticky_to_pinned.rb
index 6feb2a720c..915bd3cb4e 100644
--- a/db/migrate/20121115172544_rename_sticky_to_pinned.rb
+++ b/db/migrate/20121115172544_rename_sticky_to_pinned.rb
@@ -1,4 +1,4 @@
-class RenameStickyToPinned < ActiveRecord::Migration
+class RenameStickyToPinned < ActiveRecord::Migration[4.2]
   def up
     rename_column :topics, :sticky, :pinned
   end
diff --git a/db/migrate/20121116212424_add_more_email_settings_to_user.rb b/db/migrate/20121116212424_add_more_email_settings_to_user.rb
index 6a7ac29519..6d6e7282d1 100644
--- a/db/migrate/20121116212424_add_more_email_settings_to_user.rb
+++ b/db/migrate/20121116212424_add_more_email_settings_to_user.rb
@@ -1,4 +1,4 @@
-class AddMoreEmailSettingsToUser < ActiveRecord::Migration
+class AddMoreEmailSettingsToUser < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :email_private_messages, :boolean, default: true
     add_column :users, :email_mentions, :boolean, default: true
diff --git a/db/migrate/20121119190529_add_email_settings_to_users.rb b/db/migrate/20121119190529_add_email_settings_to_users.rb
index b6e7e8a656..8eea445eb0 100644
--- a/db/migrate/20121119190529_add_email_settings_to_users.rb
+++ b/db/migrate/20121119190529_add_email_settings_to_users.rb
@@ -1,4 +1,4 @@
-class AddEmailSettingsToUsers < ActiveRecord::Migration
+class AddEmailSettingsToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :email_replied, :boolean, default: true
     add_column :users, :email_quoted, :boolean, default: true
diff --git a/db/migrate/20121119200843_add_email_direct_to_users.rb b/db/migrate/20121119200843_add_email_direct_to_users.rb
index 0091e6e348..c3e9cc9701 100644
--- a/db/migrate/20121119200843_add_email_direct_to_users.rb
+++ b/db/migrate/20121119200843_add_email_direct_to_users.rb
@@ -1,4 +1,4 @@
-class AddEmailDirectToUsers < ActiveRecord::Migration
+class AddEmailDirectToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :email_direct, :boolean, default: true, null: false
     remove_column :users, :email_mentions
diff --git a/db/migrate/20121121202035_create_invites.rb b/db/migrate/20121121202035_create_invites.rb
index 727f456164..3da6834354 100644
--- a/db/migrate/20121121202035_create_invites.rb
+++ b/db/migrate/20121121202035_create_invites.rb
@@ -1,4 +1,4 @@
-class CreateInvites < ActiveRecord::Migration
+class CreateInvites < ActiveRecord::Migration[4.2]
   def change
     create_table :invites do |t|
       t.string :invite_key, null: false, limit: 32
@@ -6,7 +6,7 @@ class CreateInvites < ActiveRecord::Migration
       t.integer :invited_by_id, null: false
       t.integer :user_id, null: true
       t.timestamp :redeemed_at, null: true
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :invites, :invite_key, unique: true
diff --git a/db/migrate/20121121205215_create_topic_invites.rb b/db/migrate/20121121205215_create_topic_invites.rb
index 75a58b2ee9..30071dc126 100644
--- a/db/migrate/20121121205215_create_topic_invites.rb
+++ b/db/migrate/20121121205215_create_topic_invites.rb
@@ -1,9 +1,9 @@
-class CreateTopicInvites < ActiveRecord::Migration
+class CreateTopicInvites < ActiveRecord::Migration[4.2]
   def change
     create_table :topic_invites do |t|
       t.references :topic, null: false
       t.references :invite, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :topic_invites, [:topic_id, :invite_id], unique: true
diff --git a/db/migrate/20121122033316_add_muted_at_to_topic_user.rb b/db/migrate/20121122033316_add_muted_at_to_topic_user.rb
index 9ecd7d07ab..3b8119fffb 100644
--- a/db/migrate/20121122033316_add_muted_at_to_topic_user.rb
+++ b/db/migrate/20121122033316_add_muted_at_to_topic_user.rb
@@ -1,4 +1,4 @@
-class AddMutedAtToTopicUser < ActiveRecord::Migration
+class AddMutedAtToTopicUser < ActiveRecord::Migration[4.2]
   def change
     add_column :topic_users, :muted_at, :datetime
     change_column :topic_users, :last_read_post_number, :integer, null: true
diff --git a/db/migrate/20121123054127_make_post_number_distinct.rb b/db/migrate/20121123054127_make_post_number_distinct.rb
index fc8959cc83..695ac7392c 100644
--- a/db/migrate/20121123054127_make_post_number_distinct.rb
+++ b/db/migrate/20121123054127_make_post_number_distinct.rb
@@ -1,4 +1,4 @@
-class MakePostNumberDistinct < ActiveRecord::Migration
+class MakePostNumberDistinct < ActiveRecord::Migration[4.2]
   def up
 
     Topic.exec_sql('update posts p
diff --git a/db/migrate/20121123063630_create_user_visits.rb b/db/migrate/20121123063630_create_user_visits.rb
index e68d6dd50f..6a130d1682 100644
--- a/db/migrate/20121123063630_create_user_visits.rb
+++ b/db/migrate/20121123063630_create_user_visits.rb
@@ -1,4 +1,4 @@
-class CreateUserVisits < ActiveRecord::Migration
+class CreateUserVisits < ActiveRecord::Migration[4.2]
   def change
     create_table :user_visits do |t|
       t.integer :user_id, null: false
diff --git a/db/migrate/20121129160035_create_email_tokens.rb b/db/migrate/20121129160035_create_email_tokens.rb
index 6dcfd64c32..e4011c7a32 100644
--- a/db/migrate/20121129160035_create_email_tokens.rb
+++ b/db/migrate/20121129160035_create_email_tokens.rb
@@ -1,4 +1,4 @@
-class CreateEmailTokens < ActiveRecord::Migration
+class CreateEmailTokens < ActiveRecord::Migration[4.2]
   def change
     create_table :email_tokens do |t|
       t.references :user, null: false
@@ -6,7 +6,7 @@ class CreateEmailTokens < ActiveRecord::Migration
       t.string :token, null: false
       t.boolean :confirmed, null: false, default: false
       t.boolean :expired, null: false, default: false
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :email_tokens, :token, unique: true
   end
diff --git a/db/migrate/20121129184948_remove_email_token_from_users.rb b/db/migrate/20121129184948_remove_email_token_from_users.rb
index f605820daa..4cace300c9 100644
--- a/db/migrate/20121129184948_remove_email_token_from_users.rb
+++ b/db/migrate/20121129184948_remove_email_token_from_users.rb
@@ -1,4 +1,4 @@
-class RemoveEmailTokenFromUsers < ActiveRecord::Migration
+class RemoveEmailTokenFromUsers < ActiveRecord::Migration[4.2]
   def up
     execute "INSERT INTO email_tokens (user_id, email, token, created_at, updated_at)
               SELECT id, email, email_token, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP
diff --git a/db/migrate/20121130010400_create_drafts.rb b/db/migrate/20121130010400_create_drafts.rb
index 085e01ae54..1be48658a7 100644
--- a/db/migrate/20121130010400_create_drafts.rb
+++ b/db/migrate/20121130010400_create_drafts.rb
@@ -1,10 +1,10 @@
-class CreateDrafts < ActiveRecord::Migration
+class CreateDrafts < ActiveRecord::Migration[4.2]
   def change
     create_table :drafts do |t|
       t.integer :user_id, null: false
       t.string :draft_key, null: false
       t.text :data, null: false
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :drafts, [:user_id, :draft_key]
   end
diff --git a/db/migrate/20121130191818_add_link_post_id_to_topic_links.rb b/db/migrate/20121130191818_add_link_post_id_to_topic_links.rb
index f8347dc2b7..d6b1ccf27c 100644
--- a/db/migrate/20121130191818_add_link_post_id_to_topic_links.rb
+++ b/db/migrate/20121130191818_add_link_post_id_to_topic_links.rb
@@ -1,4 +1,4 @@
-class AddLinkPostIdToTopicLinks < ActiveRecord::Migration
+class AddLinkPostIdToTopicLinks < ActiveRecord::Migration[4.2]
   def change
     add_column :topic_links, :link_post_id, :integer
   end
diff --git a/db/migrate/20121202225421_add_visited_at_to_topic_user.rb b/db/migrate/20121202225421_add_visited_at_to_topic_user.rb
index 4525698b2c..ea27d4a310 100644
--- a/db/migrate/20121202225421_add_visited_at_to_topic_user.rb
+++ b/db/migrate/20121202225421_add_visited_at_to_topic_user.rb
@@ -1,4 +1,4 @@
-class AddVisitedAtToTopicUser < ActiveRecord::Migration
+class AddVisitedAtToTopicUser < ActiveRecord::Migration[4.2]
   def change
     add_column :topic_users, :last_visited_at, :datetime
     add_column :topic_users, :first_visited_at, :datetime
diff --git a/db/migrate/20121203181719_rename_seen_notificaiton_id.rb b/db/migrate/20121203181719_rename_seen_notificaiton_id.rb
index 017f199121..9f6996aa7b 100644
--- a/db/migrate/20121203181719_rename_seen_notificaiton_id.rb
+++ b/db/migrate/20121203181719_rename_seen_notificaiton_id.rb
@@ -1,4 +1,4 @@
-class RenameSeenNotificaitonId < ActiveRecord::Migration
+class RenameSeenNotificaitonId < ActiveRecord::Migration[4.2]
   def up
     rename_column :users, :seen_notificaiton_id, :seen_notification_id
   end
diff --git a/db/migrate/20121204183855_fix_link_post_id.rb b/db/migrate/20121204183855_fix_link_post_id.rb
index 4b03b96327..4749188098 100644
--- a/db/migrate/20121204183855_fix_link_post_id.rb
+++ b/db/migrate/20121204183855_fix_link_post_id.rb
@@ -1,4 +1,4 @@
-class FixLinkPostId < ActiveRecord::Migration
+class FixLinkPostId < ActiveRecord::Migration[4.2]
   def up
     to_remove = []
 
@@ -18,7 +18,7 @@ class FixLinkPostId < ActiveRecord::Migration
 
     end
 
-    TopicLink.delete_all ["id in (?)", to_remove]
+    TopicLink.where("id in (?)", to_remove).delete_all
   end
 
   def down
diff --git a/db/migrate/20121204193747_add_another_featured_user_to_topics.rb b/db/migrate/20121204193747_add_another_featured_user_to_topics.rb
index 7e639e75d4..bda56c09c1 100644
--- a/db/migrate/20121204193747_add_another_featured_user_to_topics.rb
+++ b/db/migrate/20121204193747_add_another_featured_user_to_topics.rb
@@ -1,4 +1,4 @@
-class AddAnotherFeaturedUserToTopics < ActiveRecord::Migration
+class AddAnotherFeaturedUserToTopics < ActiveRecord::Migration[4.2]
   def change
     add_column :topics, :featured_user4_id, :integer, null: true
   end
diff --git a/db/migrate/20121205162143_add_approved_to_users.rb b/db/migrate/20121205162143_add_approved_to_users.rb
index fdb474e30e..8202b725fa 100644
--- a/db/migrate/20121205162143_add_approved_to_users.rb
+++ b/db/migrate/20121205162143_add_approved_to_users.rb
@@ -1,4 +1,4 @@
-class AddApprovedToUsers < ActiveRecord::Migration
+class AddApprovedToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :approved, :boolean, null: false, default: false
     add_column :users, :approved_by_id, :integer, null: true
diff --git a/db/migrate/20121207000741_add_notifications_to_topic_users.rb b/db/migrate/20121207000741_add_notifications_to_topic_users.rb
index 37eb8129c6..ae31470d98 100644
--- a/db/migrate/20121207000741_add_notifications_to_topic_users.rb
+++ b/db/migrate/20121207000741_add_notifications_to_topic_users.rb
@@ -1,4 +1,4 @@
-class AddNotificationsToTopicUsers < ActiveRecord::Migration
+class AddNotificationsToTopicUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :topic_users, :notifications, :integer, default: 2
     add_column :topic_users, :notifications_changed_at, :datetime
diff --git a/db/migrate/20121211233131_create_site_customizations.rb b/db/migrate/20121211233131_create_site_customizations.rb
index 0e19a3f369..206f041c60 100644
--- a/db/migrate/20121211233131_create_site_customizations.rb
+++ b/db/migrate/20121211233131_create_site_customizations.rb
@@ -1,4 +1,4 @@
-class CreateSiteCustomizations < ActiveRecord::Migration
+class CreateSiteCustomizations < ActiveRecord::Migration[4.2]
   def change
     create_table :site_customizations do |t|
       t.string :name, null: false
@@ -8,7 +8,7 @@ class CreateSiteCustomizations < ActiveRecord::Migration
       t.integer :user_id, null: false
       t.boolean :enabled, null: false
       t.string :key, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :site_customizations, [:key]
diff --git a/db/migrate/20121216230719_add_override_default_style_to_site_customization.rb b/db/migrate/20121216230719_add_override_default_style_to_site_customization.rb
index 786df0f1cc..f4b21257a9 100644
--- a/db/migrate/20121216230719_add_override_default_style_to_site_customization.rb
+++ b/db/migrate/20121216230719_add_override_default_style_to_site_customization.rb
@@ -1,4 +1,4 @@
-class AddOverrideDefaultStyleToSiteCustomization < ActiveRecord::Migration
+class AddOverrideDefaultStyleToSiteCustomization < ActiveRecord::Migration[4.2]
   def change
     add_column :site_customizations, :override_default_style, :boolean, default: false, null: false
     add_column :site_customizations, :stylesheet_baked, :text, default: '', null: false
diff --git a/db/migrate/20121218205642_add_topics_entered_to_users.rb b/db/migrate/20121218205642_add_topics_entered_to_users.rb
index 38cf2a158d..464ffabf62 100644
--- a/db/migrate/20121218205642_add_topics_entered_to_users.rb
+++ b/db/migrate/20121218205642_add_topics_entered_to_users.rb
@@ -1,4 +1,4 @@
-class AddTopicsEnteredToUsers < ActiveRecord::Migration
+class AddTopicsEnteredToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :topics_entered, :integer, default: 0, null: false
     add_column :users, :posts_read_count, :integer, default: 0, null: false
diff --git a/db/migrate/20121224072204_add_last_editor_id_to_posts.rb b/db/migrate/20121224072204_add_last_editor_id_to_posts.rb
index 0c74f2992b..9651bae678 100644
--- a/db/migrate/20121224072204_add_last_editor_id_to_posts.rb
+++ b/db/migrate/20121224072204_add_last_editor_id_to_posts.rb
@@ -1,4 +1,4 @@
-class AddLastEditorIdToPosts < ActiveRecord::Migration
+class AddLastEditorIdToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :last_editor_id, :integer
   end
diff --git a/db/migrate/20121224095139_create_draft_sequence.rb b/db/migrate/20121224095139_create_draft_sequence.rb
index a93d444a0b..239a7a3851 100644
--- a/db/migrate/20121224095139_create_draft_sequence.rb
+++ b/db/migrate/20121224095139_create_draft_sequence.rb
@@ -1,4 +1,4 @@
-class CreateDraftSequence < ActiveRecord::Migration
+class CreateDraftSequence < ActiveRecord::Migration[4.2]
   def change
     create_table :draft_sequences do |t|
       t.integer :user_id, null: false
diff --git a/db/migrate/20121224100650_add_sequence_to_drafts.rb b/db/migrate/20121224100650_add_sequence_to_drafts.rb
index 7edde6492d..555174f261 100644
--- a/db/migrate/20121224100650_add_sequence_to_drafts.rb
+++ b/db/migrate/20121224100650_add_sequence_to_drafts.rb
@@ -1,4 +1,4 @@
-class AddSequenceToDrafts < ActiveRecord::Migration
+class AddSequenceToDrafts < ActiveRecord::Migration[4.2]
   def change
     add_column :drafts, :sequence, :integer, null: false, default: 0
   end
diff --git a/db/migrate/20121228192219_add_deleted_at_to_invites.rb b/db/migrate/20121228192219_add_deleted_at_to_invites.rb
index f95e811ad1..46ba45daf9 100644
--- a/db/migrate/20121228192219_add_deleted_at_to_invites.rb
+++ b/db/migrate/20121228192219_add_deleted_at_to_invites.rb
@@ -1,4 +1,4 @@
-class AddDeletedAtToInvites < ActiveRecord::Migration
+class AddDeletedAtToInvites < ActiveRecord::Migration[4.2]
   def change
     add_column :invites, :deleted_at, :datetime
   end
diff --git a/db/migrate/20130107165207_add_digest_after_days_to_users.rb b/db/migrate/20130107165207_add_digest_after_days_to_users.rb
index 7964f2c71a..fa4e01b6a6 100644
--- a/db/migrate/20130107165207_add_digest_after_days_to_users.rb
+++ b/db/migrate/20130107165207_add_digest_after_days_to_users.rb
@@ -1,4 +1,4 @@
-class AddDigestAfterDaysToUsers < ActiveRecord::Migration
+class AddDigestAfterDaysToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :digest_after_days, :integer, default: 7, null: false
   end
diff --git a/db/migrate/20130108195847_add_previous_visit_at_to_users.rb b/db/migrate/20130108195847_add_previous_visit_at_to_users.rb
index d56d116bab..b8cd19ba34 100644
--- a/db/migrate/20130108195847_add_previous_visit_at_to_users.rb
+++ b/db/migrate/20130108195847_add_previous_visit_at_to_users.rb
@@ -1,4 +1,4 @@
-class AddPreviousVisitAtToUsers < ActiveRecord::Migration
+class AddPreviousVisitAtToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :previous_visit_at, :timestamp
   end
diff --git a/db/migrate/20130115012140_merge_mute_options_on_topic_users.rb b/db/migrate/20130115012140_merge_mute_options_on_topic_users.rb
index a3b80104ae..0fc471fcfe 100644
--- a/db/migrate/20130115012140_merge_mute_options_on_topic_users.rb
+++ b/db/migrate/20130115012140_merge_mute_options_on_topic_users.rb
@@ -1,4 +1,4 @@
-class MergeMuteOptionsOnTopicUsers < ActiveRecord::Migration
+class MergeMuteOptionsOnTopicUsers < ActiveRecord::Migration[4.2]
   def change
     execute "update topic_users set notifications = 0 where notifications = 3"
     execute "update topic_users set notifications = 1 where notifications = 2"
diff --git a/db/migrate/20130115021937_correct_default_on_notification_level.rb b/db/migrate/20130115021937_correct_default_on_notification_level.rb
index 93947c6462..dda56432a9 100644
--- a/db/migrate/20130115021937_correct_default_on_notification_level.rb
+++ b/db/migrate/20130115021937_correct_default_on_notification_level.rb
@@ -1,4 +1,4 @@
-class CorrectDefaultOnNotificationLevel < ActiveRecord::Migration
+class CorrectDefaultOnNotificationLevel < ActiveRecord::Migration[4.2]
   def change
     change_column :topic_users, :notification_level, :integer, default: 1, null: false
   end
diff --git a/db/migrate/20130115043603_oops_unwatch_a_boat_of_watched_stuff.rb b/db/migrate/20130115043603_oops_unwatch_a_boat_of_watched_stuff.rb
index e2078fee0f..ebf1f48b13 100644
--- a/db/migrate/20130115043603_oops_unwatch_a_boat_of_watched_stuff.rb
+++ b/db/migrate/20130115043603_oops_unwatch_a_boat_of_watched_stuff.rb
@@ -1,4 +1,4 @@
-class OopsUnwatchABoatOfWatchedStuff < ActiveRecord::Migration
+class OopsUnwatchABoatOfWatchedStuff < ActiveRecord::Migration[4.2]
   def change
     execute 'update topic_users set notification_level = 1 where notifications_reason_id is null and notification_level = 2'
   end
diff --git a/db/migrate/20130116151829_remove_sub_tag_from_topics.rb b/db/migrate/20130116151829_remove_sub_tag_from_topics.rb
index 2ff253b223..1c6e189b14 100644
--- a/db/migrate/20130116151829_remove_sub_tag_from_topics.rb
+++ b/db/migrate/20130116151829_remove_sub_tag_from_topics.rb
@@ -1,4 +1,4 @@
-class RemoveSubTagFromTopics < ActiveRecord::Migration
+class RemoveSubTagFromTopics < ActiveRecord::Migration[4.2]
   def up
     remove_column :topics, :sub_tag
   end
diff --git a/db/migrate/20130120222728_fix_search.rb b/db/migrate/20130120222728_fix_search.rb
index ee44ea1ae8..4d5dfcd4f1 100644
--- a/db/migrate/20130120222728_fix_search.rb
+++ b/db/migrate/20130120222728_fix_search.rb
@@ -1,4 +1,4 @@
-class FixSearch < ActiveRecord::Migration
+class FixSearch < ActiveRecord::Migration[4.2]
   def up
     execute 'drop index idx_search_thread'
     execute 'drop index idx_search_user'
diff --git a/db/migrate/20130121231352_add_tracking_to_topic_users.rb b/db/migrate/20130121231352_add_tracking_to_topic_users.rb
index b52c0d9821..b0882cde82 100644
--- a/db/migrate/20130121231352_add_tracking_to_topic_users.rb
+++ b/db/migrate/20130121231352_add_tracking_to_topic_users.rb
@@ -1,4 +1,4 @@
-class AddTrackingToTopicUsers < ActiveRecord::Migration
+class AddTrackingToTopicUsers < ActiveRecord::Migration[4.2]
   def up
     execute 'update topic_users set notification_level = 3 where notification_level = 2'
   end
diff --git a/db/migrate/20130122051134_add_auto_track_topics_to_user.rb b/db/migrate/20130122051134_add_auto_track_topics_to_user.rb
index a995ba0731..9339f7e25f 100644
--- a/db/migrate/20130122051134_add_auto_track_topics_to_user.rb
+++ b/db/migrate/20130122051134_add_auto_track_topics_to_user.rb
@@ -1,4 +1,4 @@
-class AddAutoTrackTopicsToUser < ActiveRecord::Migration
+class AddAutoTrackTopicsToUser < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :auto_track_topics, :boolean, null: false, default: false
   end
diff --git a/db/migrate/20130122232825_add_auto_track_after_seconds_and_banning_and_dob_to_user.rb b/db/migrate/20130122232825_add_auto_track_after_seconds_and_banning_and_dob_to_user.rb
index 1432d8ba70..f654cb6fec 100644
--- a/db/migrate/20130122232825_add_auto_track_after_seconds_and_banning_and_dob_to_user.rb
+++ b/db/migrate/20130122232825_add_auto_track_after_seconds_and_banning_and_dob_to_user.rb
@@ -1,4 +1,4 @@
-class AddAutoTrackAfterSecondsAndBanningAndDobToUser < ActiveRecord::Migration
+class AddAutoTrackAfterSecondsAndBanningAndDobToUser < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :banned_at, :datetime
     add_column :users, :banned_till, :datetime
@@ -6,7 +6,7 @@ class AddAutoTrackAfterSecondsAndBanningAndDobToUser < ActiveRecord::Migration
     add_column :users, :auto_track_topics_after_msecs, :integer
     add_column :users, :views, :integer, null: false, default: 0
 
-    remove_column  :users, :auto_track_topics
+    remove_column :users, :auto_track_topics
 
     add_column :topic_users, :total_msecs_viewed, :integer, null: false, default: 0
 
diff --git a/db/migrate/20130123070909_auto_track_all_topics_replied_to.rb b/db/migrate/20130123070909_auto_track_all_topics_replied_to.rb
index 0989ff343d..334566680c 100644
--- a/db/migrate/20130123070909_auto_track_all_topics_replied_to.rb
+++ b/db/migrate/20130123070909_auto_track_all_topics_replied_to.rb
@@ -1,4 +1,4 @@
-class AutoTrackAllTopicsRepliedTo < ActiveRecord::Migration
+class AutoTrackAllTopicsRepliedTo < ActiveRecord::Migration[4.2]
   def up
     execute 'update topic_users set notification_level = 2, notifications_reason_id = 4
       from posts p
diff --git a/db/migrate/20130125002652_add_hidden_to_posts.rb b/db/migrate/20130125002652_add_hidden_to_posts.rb
index ad787fbacc..b98ee5aefd 100644
--- a/db/migrate/20130125002652_add_hidden_to_posts.rb
+++ b/db/migrate/20130125002652_add_hidden_to_posts.rb
@@ -1,4 +1,4 @@
-class AddHiddenToPosts < ActiveRecord::Migration
+class AddHiddenToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :hidden, :boolean, null: false, default: false
     add_column :posts, :hidden_reason_id, :integer
diff --git a/db/migrate/20130125030305_add_fields_to_post_action.rb b/db/migrate/20130125030305_add_fields_to_post_action.rb
index 6e14079440..09fef75bdb 100644
--- a/db/migrate/20130125030305_add_fields_to_post_action.rb
+++ b/db/migrate/20130125030305_add_fields_to_post_action.rb
@@ -1,4 +1,4 @@
-class AddFieldsToPostAction < ActiveRecord::Migration
+class AddFieldsToPostAction < ActiveRecord::Migration[4.2]
   def change
     add_column :post_actions, :deleted_by, :integer
     add_column :post_actions, :message, :text
diff --git a/db/migrate/20130125031122_correct_index_on_post_action.rb b/db/migrate/20130125031122_correct_index_on_post_action.rb
index 6d3d71716c..d16d54c145 100644
--- a/db/migrate/20130125031122_correct_index_on_post_action.rb
+++ b/db/migrate/20130125031122_correct_index_on_post_action.rb
@@ -1,4 +1,4 @@
-class CorrectIndexOnPostAction < ActiveRecord::Migration
+class CorrectIndexOnPostAction < ActiveRecord::Migration[4.2]
   def change
     remove_index "post_actions", name: "idx_unique_actions"
     add_index "post_actions", ["user_id", "post_action_type_id", "post_id", "deleted_at"], name: "idx_unique_actions", unique: true
diff --git a/db/migrate/20130127213646_remove_trust_levels.rb b/db/migrate/20130127213646_remove_trust_levels.rb
index 53f9c738fe..9ba29eafd5 100644
--- a/db/migrate/20130127213646_remove_trust_levels.rb
+++ b/db/migrate/20130127213646_remove_trust_levels.rb
@@ -1,4 +1,4 @@
-class RemoveTrustLevels < ActiveRecord::Migration
+class RemoveTrustLevels < ActiveRecord::Migration[4.2]
   def up
     drop_table :trust_levels
     change_column_default :users, :trust_level_id, TrustLevel[0]
diff --git a/db/migrate/20130128182013_trust_level_default_null.rb b/db/migrate/20130128182013_trust_level_default_null.rb
index 3031ade916..d6409650eb 100644
--- a/db/migrate/20130128182013_trust_level_default_null.rb
+++ b/db/migrate/20130128182013_trust_level_default_null.rb
@@ -1,4 +1,4 @@
-class TrustLevelDefaultNull < ActiveRecord::Migration
+class TrustLevelDefaultNull < ActiveRecord::Migration[4.2]
   def up
     change_column_default :users, :trust_level, nil
   end
diff --git a/db/migrate/20130129010625_remove_pm_reflections.rb b/db/migrate/20130129010625_remove_pm_reflections.rb
index bf82c73b37..eb3f73e661 100644
--- a/db/migrate/20130129010625_remove_pm_reflections.rb
+++ b/db/migrate/20130129010625_remove_pm_reflections.rb
@@ -1,4 +1,4 @@
-class RemovePmReflections < ActiveRecord::Migration
+class RemovePmReflections < ActiveRecord::Migration[4.2]
   def up
     execute 'delete from topic_links where link_topic_id in (select id from topics where archetype = \'private_message\') '
   end
diff --git a/db/migrate/20130129163244_add_time_read_to_users.rb b/db/migrate/20130129163244_add_time_read_to_users.rb
index bd5c3cf8a0..3b714744d7 100644
--- a/db/migrate/20130129163244_add_time_read_to_users.rb
+++ b/db/migrate/20130129163244_add_time_read_to_users.rb
@@ -1,4 +1,4 @@
-class AddTimeReadToUsers < ActiveRecord::Migration
+class AddTimeReadToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :time_read, :integer, default: 0, null: false
 
diff --git a/db/migrate/20130129174845_add_days_visited_to_users.rb b/db/migrate/20130129174845_add_days_visited_to_users.rb
index eff920af0d..b5b5dc76c8 100644
--- a/db/migrate/20130129174845_add_days_visited_to_users.rb
+++ b/db/migrate/20130129174845_add_days_visited_to_users.rb
@@ -1,4 +1,4 @@
-class AddDaysVisitedToUsers < ActiveRecord::Migration
+class AddDaysVisitedToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :days_visited, :integer, null: false, default: 0
 
diff --git a/db/migrate/20130130154611_remove_index_from_views.rb b/db/migrate/20130130154611_remove_index_from_views.rb
index a6662c8161..449dbef48c 100644
--- a/db/migrate/20130130154611_remove_index_from_views.rb
+++ b/db/migrate/20130130154611_remove_index_from_views.rb
@@ -1,4 +1,4 @@
-class RemoveIndexFromViews < ActiveRecord::Migration
+class RemoveIndexFromViews < ActiveRecord::Migration[4.2]
   def up
     remove_index "views", name: "unique_views"
     change_column :views, :viewed_at, :date
diff --git a/db/migrate/20130131055710_add_custom_flag_count_to_topics.rb b/db/migrate/20130131055710_add_custom_flag_count_to_topics.rb
index 8574ad2212..d99df1d52d 100644
--- a/db/migrate/20130131055710_add_custom_flag_count_to_topics.rb
+++ b/db/migrate/20130131055710_add_custom_flag_count_to_topics.rb
@@ -1,4 +1,4 @@
-class AddCustomFlagCountToTopics < ActiveRecord::Migration
+class AddCustomFlagCountToTopics < ActiveRecord::Migration[4.2]
   def change
     add_column :topics, :custom_flag_count, :integer, null: false, default: 0
     add_column :posts, :custom_flag_count, :integer, null: false, default: 0
diff --git a/db/migrate/20130201000828_add_column_summaries_to_posts_and_topics.rb b/db/migrate/20130201000828_add_column_summaries_to_posts_and_topics.rb
index 5c86c11a43..0a08581605 100644
--- a/db/migrate/20130201000828_add_column_summaries_to_posts_and_topics.rb
+++ b/db/migrate/20130201000828_add_column_summaries_to_posts_and_topics.rb
@@ -1,4 +1,4 @@
-class AddColumnSummariesToPostsAndTopics < ActiveRecord::Migration
+class AddColumnSummariesToPostsAndTopics < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :spam_count, :integer, default: 0, null: false
     add_column :topics, :spam_count, :integer, default: 0, null: false
diff --git a/db/migrate/20130201023409_add_position_to_post_action_type.rb b/db/migrate/20130201023409_add_position_to_post_action_type.rb
index 80bf29fb1d..bc9c974f83 100644
--- a/db/migrate/20130201023409_add_position_to_post_action_type.rb
+++ b/db/migrate/20130201023409_add_position_to_post_action_type.rb
@@ -1,4 +1,4 @@
-class AddPositionToPostActionType < ActiveRecord::Migration
+class AddPositionToPostActionType < ActiveRecord::Migration[4.2]
   def change
     add_column :post_action_types, :position, :integer, default: 0, null: false
   end
diff --git a/db/migrate/20130203204338_add_last_version_at_to_posts.rb b/db/migrate/20130203204338_add_last_version_at_to_posts.rb
index 5ce0f7257b..44eef360dd 100644
--- a/db/migrate/20130203204338_add_last_version_at_to_posts.rb
+++ b/db/migrate/20130203204338_add_last_version_at_to_posts.rb
@@ -1,4 +1,4 @@
-class AddLastVersionAtToPosts < ActiveRecord::Migration
+class AddLastVersionAtToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :last_version_at, :timestamp
     execute "UPDATE posts SET last_version_at = COALESCE((SELECT max(created_at)
diff --git a/db/migrate/20130204000159_add_ip_address_to_users.rb b/db/migrate/20130204000159_add_ip_address_to_users.rb
index 7537b3d784..6c5910ec91 100644
--- a/db/migrate/20130204000159_add_ip_address_to_users.rb
+++ b/db/migrate/20130204000159_add_ip_address_to_users.rb
@@ -1,4 +1,4 @@
-class AddIpAddressToUsers < ActiveRecord::Migration
+class AddIpAddressToUsers < ActiveRecord::Migration[4.2]
   def up
     execute 'alter table users add column ip_address inet'
   end
diff --git a/db/migrate/20130205021905_alter_facebook_user_id.rb b/db/migrate/20130205021905_alter_facebook_user_id.rb
index 8517a9799e..56011785dc 100644
--- a/db/migrate/20130205021905_alter_facebook_user_id.rb
+++ b/db/migrate/20130205021905_alter_facebook_user_id.rb
@@ -1,4 +1,4 @@
-class AlterFacebookUserId < ActiveRecord::Migration
+class AlterFacebookUserId < ActiveRecord::Migration[4.2]
   def up
     change_column :facebook_user_infos, :facebook_user_id, :integer, limit: 8, null: false
   end
diff --git a/db/migrate/20130207200019_add_user_deleted_to_posts.rb b/db/migrate/20130207200019_add_user_deleted_to_posts.rb
index 04e45a1a0b..ed6274c82c 100644
--- a/db/migrate/20130207200019_add_user_deleted_to_posts.rb
+++ b/db/migrate/20130207200019_add_user_deleted_to_posts.rb
@@ -1,4 +1,4 @@
-class AddUserDeletedToPosts < ActiveRecord::Migration
+class AddUserDeletedToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :user_deleted, :boolean, null: false, default: false
   end
diff --git a/db/migrate/20130208220635_remove_reply_below_post_number_from_posts.rb b/db/migrate/20130208220635_remove_reply_below_post_number_from_posts.rb
index 85336bce30..3e58b83fff 100644
--- a/db/migrate/20130208220635_remove_reply_below_post_number_from_posts.rb
+++ b/db/migrate/20130208220635_remove_reply_below_post_number_from_posts.rb
@@ -1,4 +1,4 @@
-class RemoveReplyBelowPostNumberFromPosts < ActiveRecord::Migration
+class RemoveReplyBelowPostNumberFromPosts < ActiveRecord::Migration[4.2]
   def change
     remove_column :posts, :reply_below_post_number
   end
diff --git a/db/migrate/20130213021450_remove_topic_response_actions.rb b/db/migrate/20130213021450_remove_topic_response_actions.rb
index f993a9049e..076f3f557d 100644
--- a/db/migrate/20130213021450_remove_topic_response_actions.rb
+++ b/db/migrate/20130213021450_remove_topic_response_actions.rb
@@ -1,4 +1,4 @@
-class RemoveTopicResponseActions < ActiveRecord::Migration
+class RemoveTopicResponseActions < ActiveRecord::Migration[4.2]
   def up
     # 2 notes:
     #   migrations should never use the object model to run sql, otherwise they are a time bomb
diff --git a/db/migrate/20130213203300_add_new_topic_duration_minutes_to_users.rb b/db/migrate/20130213203300_add_new_topic_duration_minutes_to_users.rb
index 51685cd59a..8d5516f1e2 100644
--- a/db/migrate/20130213203300_add_new_topic_duration_minutes_to_users.rb
+++ b/db/migrate/20130213203300_add_new_topic_duration_minutes_to_users.rb
@@ -1,4 +1,4 @@
-class AddNewTopicDurationMinutesToUsers < ActiveRecord::Migration
+class AddNewTopicDurationMinutesToUsers < ActiveRecord::Migration[4.2]
   def change
     # note, no constants allowed here, -1 means since last visit
     # -2 means always
diff --git a/db/migrate/20130221215017_add_description_to_categories.rb b/db/migrate/20130221215017_add_description_to_categories.rb
index 15645c1943..aa22568014 100644
--- a/db/migrate/20130221215017_add_description_to_categories.rb
+++ b/db/migrate/20130221215017_add_description_to_categories.rb
@@ -1,4 +1,4 @@
-class AddDescriptionToCategories < ActiveRecord::Migration
+class AddDescriptionToCategories < ActiveRecord::Migration[4.2]
   def up
     add_column :categories, :description, :text, null: true
 
diff --git a/db/migrate/20130226015336_add_github_user_info.rb b/db/migrate/20130226015336_add_github_user_info.rb
index 431fb29d98..775a763e96 100644
--- a/db/migrate/20130226015336_add_github_user_info.rb
+++ b/db/migrate/20130226015336_add_github_user_info.rb
@@ -1,10 +1,10 @@
-class AddGithubUserInfo < ActiveRecord::Migration
+class AddGithubUserInfo < ActiveRecord::Migration[4.2]
   def change
     create_table :github_user_infos do  |t|
       t.integer :user_id, null: false
       t.string :screen_name, null: false
       t.integer :github_user_id, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :github_user_infos, [:github_user_id], unique: true
diff --git a/db/migrate/20130306180148_add_cleared_pinned_to_topic_users.rb b/db/migrate/20130306180148_add_cleared_pinned_to_topic_users.rb
index 9cc4af5d91..1182b90191 100644
--- a/db/migrate/20130306180148_add_cleared_pinned_to_topic_users.rb
+++ b/db/migrate/20130306180148_add_cleared_pinned_to_topic_users.rb
@@ -1,4 +1,4 @@
-class AddClearedPinnedToTopicUsers < ActiveRecord::Migration
+class AddClearedPinnedToTopicUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :topic_users, :cleared_pinned_at, :datetime, null: true
 
diff --git a/db/migrate/20130311181327_remove_extra_spam_record.rb b/db/migrate/20130311181327_remove_extra_spam_record.rb
index 7b32647644..ceee3c5d05 100644
--- a/db/migrate/20130311181327_remove_extra_spam_record.rb
+++ b/db/migrate/20130311181327_remove_extra_spam_record.rb
@@ -1,4 +1,4 @@
-class RemoveExtraSpamRecord < ActiveRecord::Migration
+class RemoveExtraSpamRecord < ActiveRecord::Migration[4.2]
   def up
     execute "UPDATE post_actions SET post_action_type_id = 7 where post_action_type_id = 8"
     execute "DELETE FROM post_action_types WHERE id = 8"
diff --git a/db/migrate/20130313004922_add_external_links_in_new_tab_an_disable_quoting_to_user.rb b/db/migrate/20130313004922_add_external_links_in_new_tab_an_disable_quoting_to_user.rb
index fe83a95a29..8c96e4cbba 100644
--- a/db/migrate/20130313004922_add_external_links_in_new_tab_an_disable_quoting_to_user.rb
+++ b/db/migrate/20130313004922_add_external_links_in_new_tab_an_disable_quoting_to_user.rb
@@ -1,4 +1,4 @@
-class AddExternalLinksInNewTabAnDisableQuotingToUser < ActiveRecord::Migration
+class AddExternalLinksInNewTabAnDisableQuotingToUser < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :external_links_in_new_tab, :boolean, default: false, null: false
     add_column :users, :enable_quoting, :boolean, default: true, null: false
diff --git a/db/migrate/20130314093434_add_foreground_color_to_categories.rb b/db/migrate/20130314093434_add_foreground_color_to_categories.rb
index f60663b85c..9a149136ff 100644
--- a/db/migrate/20130314093434_add_foreground_color_to_categories.rb
+++ b/db/migrate/20130314093434_add_foreground_color_to_categories.rb
@@ -1,4 +1,4 @@
-class AddForegroundColorToCategories < ActiveRecord::Migration
+class AddForegroundColorToCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :text_color, :string, limit: 6, null: false, default: 'FFFFFF'
   end
diff --git a/db/migrate/20130315180637_enable_trigram_support.rb b/db/migrate/20130315180637_enable_trigram_support.rb
index 602133d850..1b82f45aae 100644
--- a/db/migrate/20130315180637_enable_trigram_support.rb
+++ b/db/migrate/20130315180637_enable_trigram_support.rb
@@ -1,4 +1,4 @@
-class EnableTrigramSupport < ActiveRecord::Migration
+class EnableTrigramSupport < ActiveRecord::Migration[4.2]
   def up
     execute "CREATE EXTENSION IF NOT EXISTS pg_trgm"
   end
diff --git a/db/migrate/20130319122248_add_reply_to_user_id_to_post.rb b/db/migrate/20130319122248_add_reply_to_user_id_to_post.rb
index 3f537dfdc9..7da8abad4f 100644
--- a/db/migrate/20130319122248_add_reply_to_user_id_to_post.rb
+++ b/db/migrate/20130319122248_add_reply_to_user_id_to_post.rb
@@ -1,10 +1,10 @@
-class AddReplyToUserIdToPost < ActiveRecord::Migration
+class AddReplyToUserIdToPost < ActiveRecord::Migration[4.2]
   def up
     # caching this column makes the topic page WAY faster
     add_column :posts, :reply_to_user_id, :integer
     execute 'UPDATE posts p SET reply_to_user_id = (
-                SELECT u.id from users u 
-                JOIN posts p2 ON  p2.user_id = u.id AND 
+                SELECT u.id from users u
+                JOIN posts p2 ON  p2.user_id = u.id AND
                                   p2.post_number = p.reply_to_post_number AND
                                   p2.topic_id = p.topic_id
             )'
diff --git a/db/migrate/20130320012100_add_user_indexes_to_posts_and_topics.rb b/db/migrate/20130320012100_add_user_indexes_to_posts_and_topics.rb
index 3fffe74303..cdd421f34b 100644
--- a/db/migrate/20130320012100_add_user_indexes_to_posts_and_topics.rb
+++ b/db/migrate/20130320012100_add_user_indexes_to_posts_and_topics.rb
@@ -1,9 +1,9 @@
-class AddUserIndexesToPostsAndTopics < ActiveRecord::Migration
+class AddUserIndexesToPostsAndTopics < ActiveRecord::Migration[4.2]
   def up
-    execute "CREATE INDEX idx_posts_user_id_deleted_at 
+    execute "CREATE INDEX idx_posts_user_id_deleted_at
               ON posts(user_id) WHERE deleted_at IS NULL"
-    
-    execute "CREATE INDEX idx_topics_user_id_deleted_at 
+
+    execute "CREATE INDEX idx_topics_user_id_deleted_at
               ON topics(user_id) WHERE deleted_at IS NULL"
   end
 
diff --git a/db/migrate/20130320024345_add_moderator_to_user.rb b/db/migrate/20130320024345_add_moderator_to_user.rb
index 62d466af73..e8943b7dca 100644
--- a/db/migrate/20130320024345_add_moderator_to_user.rb
+++ b/db/migrate/20130320024345_add_moderator_to_user.rb
@@ -1,4 +1,4 @@
-class AddModeratorToUser < ActiveRecord::Migration
+class AddModeratorToUser < ActiveRecord::Migration[4.2]
   def up
     add_column :users, :moderator, :boolean, default: false
     execute "UPDATE users SET trust_level = 1, moderator = 't' where trust_level = 5"
diff --git a/db/migrate/20130321154905_remove_oneboxes_from_db.rb b/db/migrate/20130321154905_remove_oneboxes_from_db.rb
index 8cf4c1cfef..75c25d064a 100644
--- a/db/migrate/20130321154905_remove_oneboxes_from_db.rb
+++ b/db/migrate/20130321154905_remove_oneboxes_from_db.rb
@@ -1,4 +1,4 @@
-class RemoveOneboxesFromDb < ActiveRecord::Migration
+class RemoveOneboxesFromDb < ActiveRecord::Migration[4.2]
   def up
     drop_table :post_onebox_renders
     drop_table :onebox_renders
diff --git a/db/migrate/20130322183614_add_percent_rank_to_posts.rb b/db/migrate/20130322183614_add_percent_rank_to_posts.rb
index 25554a94e0..e3d54a7031 100644
--- a/db/migrate/20130322183614_add_percent_rank_to_posts.rb
+++ b/db/migrate/20130322183614_add_percent_rank_to_posts.rb
@@ -1,4 +1,4 @@
-class AddPercentRankToPosts < ActiveRecord::Migration
+class AddPercentRankToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :percent_rank, :float, default: 1.0
 
diff --git a/db/migrate/20130326210101_add_hotness_to_category.rb b/db/migrate/20130326210101_add_hotness_to_category.rb
index 19412d7cb5..3dca552afc 100644
--- a/db/migrate/20130326210101_add_hotness_to_category.rb
+++ b/db/migrate/20130326210101_add_hotness_to_category.rb
@@ -1,4 +1,4 @@
-class AddHotnessToCategory < ActiveRecord::Migration
+class AddHotnessToCategory < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :hotness, :float, default: 5.0, null: false
   end
diff --git a/db/migrate/20130327185852_update_site_settings_for_hot.rb b/db/migrate/20130327185852_update_site_settings_for_hot.rb
index 1040a2ccc7..46b3c06a57 100644
--- a/db/migrate/20130327185852_update_site_settings_for_hot.rb
+++ b/db/migrate/20130327185852_update_site_settings_for_hot.rb
@@ -1,4 +1,4 @@
-class UpdateSiteSettingsForHot < ActiveRecord::Migration
+class UpdateSiteSettingsForHot < ActiveRecord::Migration[4.2]
   def up
     execute "UPDATE site_settings SET value = REPLACE(value, 'popular|', 'latest|hot|') where name = 'top_menu'"
   end
diff --git a/db/migrate/20130328162943_create_hot_topics.rb b/db/migrate/20130328162943_create_hot_topics.rb
index 21b5f8a2d9..018c13fc72 100644
--- a/db/migrate/20130328162943_create_hot_topics.rb
+++ b/db/migrate/20130328162943_create_hot_topics.rb
@@ -1,4 +1,4 @@
-class CreateHotTopics < ActiveRecord::Migration
+class CreateHotTopics < ActiveRecord::Migration[4.2]
   def change
     create_table :hot_topics, force: true do |t|
       t.integer :topic_id, null: false
diff --git a/db/migrate/20130328182433_add_score_to_topics.rb b/db/migrate/20130328182433_add_score_to_topics.rb
index 2c0a2612ed..44fb14904d 100644
--- a/db/migrate/20130328182433_add_score_to_topics.rb
+++ b/db/migrate/20130328182433_add_score_to_topics.rb
@@ -1,4 +1,4 @@
-class AddScoreToTopics < ActiveRecord::Migration
+class AddScoreToTopics < ActiveRecord::Migration[4.2]
   def change
     add_column :topics, :score, :float
     add_column :topics, :percent_rank, :float, null: false, default: 1.0
diff --git a/db/migrate/20130402210723_add_values_to_hot_topics.rb b/db/migrate/20130402210723_add_values_to_hot_topics.rb
index dab4598a6c..989b91d77d 100644
--- a/db/migrate/20130402210723_add_values_to_hot_topics.rb
+++ b/db/migrate/20130402210723_add_values_to_hot_topics.rb
@@ -1,4 +1,4 @@
-class AddValuesToHotTopics < ActiveRecord::Migration
+class AddValuesToHotTopics < ActiveRecord::Migration[4.2]
   def change
     add_column :hot_topics, :random_bias, :float
     add_column :hot_topics, :random_multiplier, :float
diff --git a/db/migrate/20130404143437_create_site_contents.rb b/db/migrate/20130404143437_create_site_contents.rb
index c4554c9116..f35acd9021 100644
--- a/db/migrate/20130404143437_create_site_contents.rb
+++ b/db/migrate/20130404143437_create_site_contents.rb
@@ -1,9 +1,9 @@
-class CreateSiteContents < ActiveRecord::Migration
+class CreateSiteContents < ActiveRecord::Migration[4.2]
   def change
     create_table :site_contents, force: true, id: false do |t|
       t.string :content_type, null: false
       t.text :content, null: false
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :site_contents, :content_type, unique: true
   end
diff --git a/db/migrate/20130404232558_add_user_extras.rb b/db/migrate/20130404232558_add_user_extras.rb
index 73d1add55d..2f2b5ec6c3 100644
--- a/db/migrate/20130404232558_add_user_extras.rb
+++ b/db/migrate/20130404232558_add_user_extras.rb
@@ -1,4 +1,4 @@
-class AddUserExtras < ActiveRecord::Migration
+class AddUserExtras < ActiveRecord::Migration[4.2]
   def up
 
     # NOTE: our user table is getting bloated, we probably want to split it for performance
@@ -7,7 +7,6 @@ class AddUserExtras < ActiveRecord::Migration
     add_column :users, :likes_received, :integer, null: false, default: 0
     add_column :users, :topic_reply_count, :integer, null: false, default: 0
 
-
     # NOTE: to keep migrations working through refactorings we avoid externalizing this stuff.
     #   even though a helper method may make sense
     execute <<SQL
diff --git a/db/migrate/20130411205132_create_admin_logs.rb b/db/migrate/20130411205132_create_admin_logs.rb
index 197bea30cd..0dc74ac8fd 100644
--- a/db/migrate/20130411205132_create_admin_logs.rb
+++ b/db/migrate/20130411205132_create_admin_logs.rb
@@ -1,11 +1,11 @@
-class CreateAdminLogs < ActiveRecord::Migration
+class CreateAdminLogs < ActiveRecord::Migration[4.2]
   def up
     create_table :admin_logs, force: true do |t|
       t.integer :action,          null: false
       t.integer :admin_id,        null: false
       t.integer :target_user_id
       t.text    :details
-      t.timestamps
+      t.timestamps null: false
     end
   end
 
diff --git a/db/migrate/20130412015502_correct_counts_on_posts.rb b/db/migrate/20130412015502_correct_counts_on_posts.rb
index 4711c14f36..abc798964a 100644
--- a/db/migrate/20130412015502_correct_counts_on_posts.rb
+++ b/db/migrate/20130412015502_correct_counts_on_posts.rb
@@ -1,4 +1,4 @@
-class CorrectCountsOnPosts < ActiveRecord::Migration
+class CorrectCountsOnPosts < ActiveRecord::Migration[4.2]
   def change
     rename_column :posts, :custom_flag_count, :notify_moderators_count
     add_column :posts, :notify_user_count, :integer, default: 0, null: false
diff --git a/db/migrate/20130412020156_correct_counts_on_topics.rb b/db/migrate/20130412020156_correct_counts_on_topics.rb
index bae4bf86f7..67ac99527e 100644
--- a/db/migrate/20130412020156_correct_counts_on_topics.rb
+++ b/db/migrate/20130412020156_correct_counts_on_topics.rb
@@ -1,4 +1,4 @@
-class CorrectCountsOnTopics < ActiveRecord::Migration
+class CorrectCountsOnTopics < ActiveRecord::Migration[4.2]
   def change
     rename_column :topics, :custom_flag_count, :notify_moderators_count
     add_column :topics, :notify_user_count, :integer, default: 0, null: false
diff --git a/db/migrate/20130416004607_create_groups.rb b/db/migrate/20130416004607_create_groups.rb
index f684f3fc3c..5fb442d00a 100644
--- a/db/migrate/20130416004607_create_groups.rb
+++ b/db/migrate/20130416004607_create_groups.rb
@@ -1,8 +1,8 @@
-class CreateGroups < ActiveRecord::Migration
+class CreateGroups < ActiveRecord::Migration[4.2]
   def change
     create_table :groups, force: true do |t|
       t.string :name, null: false
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/db/migrate/20130416004933_group_users.rb b/db/migrate/20130416004933_group_users.rb
index 024d6caaa4..238ddd1951 100644
--- a/db/migrate/20130416004933_group_users.rb
+++ b/db/migrate/20130416004933_group_users.rb
@@ -1,9 +1,9 @@
-class GroupUsers < ActiveRecord::Migration
+class GroupUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :group_users, force: true do |t|
       t.integer :group_id, null: false
       t.integer :user_id, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :group_users, [:group_id, :user_id], unique: true
diff --git a/db/migrate/20130416170855_add_subtype_to_topics.rb b/db/migrate/20130416170855_add_subtype_to_topics.rb
index 93aa0c3228..a148cf76b3 100644
--- a/db/migrate/20130416170855_add_subtype_to_topics.rb
+++ b/db/migrate/20130416170855_add_subtype_to_topics.rb
@@ -1,4 +1,4 @@
-class AddSubtypeToTopics < ActiveRecord::Migration
+class AddSubtypeToTopics < ActiveRecord::Migration[4.2]
   def up
     add_column :topics, :subtype, :string
     execute "update topics set subtype = 'user_to_user' where archetype = 'private_message'"
diff --git a/db/migrate/20130419195746_increase_data_length_on_notifications.rb b/db/migrate/20130419195746_increase_data_length_on_notifications.rb
index 796b83c7e4..ac3234fe0c 100644
--- a/db/migrate/20130419195746_increase_data_length_on_notifications.rb
+++ b/db/migrate/20130419195746_increase_data_length_on_notifications.rb
@@ -1,4 +1,4 @@
-class IncreaseDataLengthOnNotifications < ActiveRecord::Migration
+class IncreaseDataLengthOnNotifications < ActiveRecord::Migration[4.2]
   def up
     execute "ALTER TABLE notifications ALTER COLUMN data TYPE VARCHAR(1000)"
   end
diff --git a/db/migrate/20130422050626_add_related_post_id_to_post_actions.rb b/db/migrate/20130422050626_add_related_post_id_to_post_actions.rb
index 7f3bbcf16c..23a89836d5 100644
--- a/db/migrate/20130422050626_add_related_post_id_to_post_actions.rb
+++ b/db/migrate/20130422050626_add_related_post_id_to_post_actions.rb
@@ -1,4 +1,4 @@
-class AddRelatedPostIdToPostActions < ActiveRecord::Migration
+class AddRelatedPostIdToPostActions < ActiveRecord::Migration[4.2]
   def change
     add_column :post_actions, :related_post_id, :integer
   end
diff --git a/db/migrate/20130424015746_add_slug_to_topics.rb b/db/migrate/20130424015746_add_slug_to_topics.rb
index 729cbfd07e..cd3458e590 100644
--- a/db/migrate/20130424015746_add_slug_to_topics.rb
+++ b/db/migrate/20130424015746_add_slug_to_topics.rb
@@ -1,4 +1,4 @@
-class AddSlugToTopics < ActiveRecord::Migration
+class AddSlugToTopics < ActiveRecord::Migration[4.2]
   def change
     add_column :topics, :slug, :string
   end
diff --git a/db/migrate/20130424055025_add_user_id_to_incoming_links.rb b/db/migrate/20130424055025_add_user_id_to_incoming_links.rb
index 623e5af915..36a428c87d 100644
--- a/db/migrate/20130424055025_add_user_id_to_incoming_links.rb
+++ b/db/migrate/20130424055025_add_user_id_to_incoming_links.rb
@@ -1,4 +1,4 @@
-class AddUserIdToIncomingLinks < ActiveRecord::Migration
+class AddUserIdToIncomingLinks < ActiveRecord::Migration[4.2]
   def change
     add_column :incoming_links, :user_id, :integer
   end
diff --git a/db/migrate/20130426044914_allow_nulls_in_incoming_links.rb b/db/migrate/20130426044914_allow_nulls_in_incoming_links.rb
index 5463394c84..92827f5cd1 100644
--- a/db/migrate/20130426044914_allow_nulls_in_incoming_links.rb
+++ b/db/migrate/20130426044914_allow_nulls_in_incoming_links.rb
@@ -1,6 +1,6 @@
-class AllowNullsInIncomingLinks < ActiveRecord::Migration
+class AllowNullsInIncomingLinks < ActiveRecord::Migration[4.2]
   def change
-    change_column :incoming_links, :referer, :string, limit:1000, null: true
-    change_column :incoming_links, :domain, :string, limit:100, null: true
+    change_column :incoming_links, :referer, :string, limit: 1000, null: true
+    change_column :incoming_links, :domain, :string, limit: 100, null: true
   end
 end
diff --git a/db/migrate/20130426052257_add_incoming_ip_current_user_id_to_incoming_links.rb b/db/migrate/20130426052257_add_incoming_ip_current_user_id_to_incoming_links.rb
index bfc8eb830a..b89f599dbf 100644
--- a/db/migrate/20130426052257_add_incoming_ip_current_user_id_to_incoming_links.rb
+++ b/db/migrate/20130426052257_add_incoming_ip_current_user_id_to_incoming_links.rb
@@ -1,4 +1,4 @@
-class AddIncomingIpCurrentUserIdToIncomingLinks < ActiveRecord::Migration
+class AddIncomingIpCurrentUserIdToIncomingLinks < ActiveRecord::Migration[4.2]
   def change
     add_column :incoming_links, :ip_address, :inet
     add_column :incoming_links, :current_user_id, :int
diff --git a/db/migrate/20130428194335_add_unstarred_at_to_topic_users.rb b/db/migrate/20130428194335_add_unstarred_at_to_topic_users.rb
index 1f74eca660..279ff2fd6a 100644
--- a/db/migrate/20130428194335_add_unstarred_at_to_topic_users.rb
+++ b/db/migrate/20130428194335_add_unstarred_at_to_topic_users.rb
@@ -1,4 +1,4 @@
-class AddUnstarredAtToTopicUsers < ActiveRecord::Migration
+class AddUnstarredAtToTopicUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :topic_users, :unstarred_at, :datetime
   end
diff --git a/db/migrate/20130429000101_add_security_to_categories.rb b/db/migrate/20130429000101_add_security_to_categories.rb
index 04f0314112..dc6bbef668 100644
--- a/db/migrate/20130429000101_add_security_to_categories.rb
+++ b/db/migrate/20130429000101_add_security_to_categories.rb
@@ -1,11 +1,11 @@
-class AddSecurityToCategories < ActiveRecord::Migration
+class AddSecurityToCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :secure, :boolean, default: false, null: false
 
     create_table :category_groups, force: true do |t|
       t.integer :category_id, null: false
       t.integer :group_id, null: false
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/db/migrate/20130430052751_add_topic_allowed_groups.rb b/db/migrate/20130430052751_add_topic_allowed_groups.rb
index 57bb23fbb2..a83f864571 100644
--- a/db/migrate/20130430052751_add_topic_allowed_groups.rb
+++ b/db/migrate/20130430052751_add_topic_allowed_groups.rb
@@ -1,4 +1,4 @@
-class AddTopicAllowedGroups < ActiveRecord::Migration
+class AddTopicAllowedGroups < ActiveRecord::Migration[4.2]
   def change
     create_table :topic_allowed_groups, force: true do |t|
       # oops
diff --git a/db/migrate/20130501105651_fix_topic_allowed_groups.rb b/db/migrate/20130501105651_fix_topic_allowed_groups.rb
index cf12cedff9..02e3ec3afc 100644
--- a/db/migrate/20130501105651_fix_topic_allowed_groups.rb
+++ b/db/migrate/20130501105651_fix_topic_allowed_groups.rb
@@ -1,4 +1,4 @@
-class FixTopicAllowedGroups < ActiveRecord::Migration
+class FixTopicAllowedGroups < ActiveRecord::Migration[4.2]
   def change
     # big oops
     remove_column :topic_allowed_groups, :integer
diff --git a/db/migrate/20130506020935_add_automatic_to_groups.rb b/db/migrate/20130506020935_add_automatic_to_groups.rb
index e62081c7b1..e04bac57aa 100644
--- a/db/migrate/20130506020935_add_automatic_to_groups.rb
+++ b/db/migrate/20130506020935_add_automatic_to_groups.rb
@@ -1,4 +1,4 @@
-class AddAutomaticToGroups < ActiveRecord::Migration
+class AddAutomaticToGroups < ActiveRecord::Migration[4.2]
   def up
     add_column :groups, :automatic, :boolean, default: false, null: false
 
diff --git a/db/migrate/20130506185042_add_auto_close_at_to_topics.rb b/db/migrate/20130506185042_add_auto_close_at_to_topics.rb
index c4f9987f58..297608e8e7 100644
--- a/db/migrate/20130506185042_add_auto_close_at_to_topics.rb
+++ b/db/migrate/20130506185042_add_auto_close_at_to_topics.rb
@@ -1,4 +1,4 @@
-class AddAutoCloseAtToTopics < ActiveRecord::Migration
+class AddAutoCloseAtToTopics < ActiveRecord::Migration[4.2]
   def change
     add_column :topics, :auto_close_at,      :datetime
     add_column :topics, :auto_close_user_id, :integer
diff --git a/db/migrate/20130508040235_add_user_count_to_groups.rb b/db/migrate/20130508040235_add_user_count_to_groups.rb
index cae58bc21e..7ab95b79bc 100644
--- a/db/migrate/20130508040235_add_user_count_to_groups.rb
+++ b/db/migrate/20130508040235_add_user_count_to_groups.rb
@@ -1,4 +1,4 @@
-class AddUserCountToGroups < ActiveRecord::Migration
+class AddUserCountToGroups < ActiveRecord::Migration[4.2]
   def change
     add_column :groups, :user_count, :integer, null: false, default: 0
   end
diff --git a/db/migrate/20130509040248_update_sequence_for_groups.rb b/db/migrate/20130509040248_update_sequence_for_groups.rb
index 0c0c70b682..7bf85eea4c 100644
--- a/db/migrate/20130509040248_update_sequence_for_groups.rb
+++ b/db/migrate/20130509040248_update_sequence_for_groups.rb
@@ -1,4 +1,4 @@
-class UpdateSequenceForGroups < ActiveRecord::Migration
+class UpdateSequenceForGroups < ActiveRecord::Migration[4.2]
   def up
     # even if you alter a sequence you still need to set the seq
     execute <<SQL
diff --git a/db/migrate/20130509041351_add_unique_name_to_groups.rb b/db/migrate/20130509041351_add_unique_name_to_groups.rb
index f2259a2004..587739e59b 100644
--- a/db/migrate/20130509041351_add_unique_name_to_groups.rb
+++ b/db/migrate/20130509041351_add_unique_name_to_groups.rb
@@ -1,4 +1,4 @@
-class AddUniqueNameToGroups < ActiveRecord::Migration
+class AddUniqueNameToGroups < ActiveRecord::Migration[4.2]
   def change
     add_index :groups, [:name], unique: true
   end
diff --git a/db/migrate/20130515193551_add_auto_close_days_to_categories.rb b/db/migrate/20130515193551_add_auto_close_days_to_categories.rb
index d2e16e0c1f..1f3478ec4d 100644
--- a/db/migrate/20130515193551_add_auto_close_days_to_categories.rb
+++ b/db/migrate/20130515193551_add_auto_close_days_to_categories.rb
@@ -1,4 +1,4 @@
-class AddAutoCloseDaysToCategories < ActiveRecord::Migration
+class AddAutoCloseDaysToCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :auto_close_days, :float
   end
diff --git a/db/migrate/20130521210140_create_cas_user_infos.rb b/db/migrate/20130521210140_create_cas_user_infos.rb
index befadc56aa..fdedd07ae5 100644
--- a/db/migrate/20130521210140_create_cas_user_infos.rb
+++ b/db/migrate/20130521210140_create_cas_user_infos.rb
@@ -1,4 +1,4 @@
-class CreateCasUserInfos < ActiveRecord::Migration
+class CreateCasUserInfos < ActiveRecord::Migration[4.2]
   def change
     create_table :cas_user_infos do |t|
       t.integer :user_id, null: false
@@ -11,7 +11,7 @@ class CreateCasUserInfos < ActiveRecord::Migration
       t.string :name
       t.string :link
 
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :cas_user_infos, :user_id, unique: true
     add_index :cas_user_infos, :cas_user_id, unique: true
diff --git a/db/migrate/20130522193615_rename_search_tables.rb b/db/migrate/20130522193615_rename_search_tables.rb
index a9af436a24..26a3991c8c 100644
--- a/db/migrate/20130522193615_rename_search_tables.rb
+++ b/db/migrate/20130522193615_rename_search_tables.rb
@@ -1,4 +1,4 @@
-class RenameSearchTables < ActiveRecord::Migration
+class RenameSearchTables < ActiveRecord::Migration[4.2]
   def up
     rename_table :users_search, :user_search_data
     rename_column :user_search_data, :id, :user_id
diff --git a/db/migrate/20130527152648_add_like_score_to_posts.rb b/db/migrate/20130527152648_add_like_score_to_posts.rb
index 98c61ea9fb..c3a4f26c53 100644
--- a/db/migrate/20130527152648_add_like_score_to_posts.rb
+++ b/db/migrate/20130527152648_add_like_score_to_posts.rb
@@ -1,4 +1,4 @@
-class AddLikeScoreToPosts < ActiveRecord::Migration
+class AddLikeScoreToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :like_score, :integer, default: 0, null: false
 
@@ -15,5 +15,3 @@ class AddLikeScoreToPosts < ActiveRecord::Migration
               WHERE x.post_id = p.id"
   end
 end
-
-
diff --git a/db/migrate/20130528174147_add_rank_to_category_featured_topics.rb b/db/migrate/20130528174147_add_rank_to_category_featured_topics.rb
index ea9c1c4e91..bfb29035ce 100644
--- a/db/migrate/20130528174147_add_rank_to_category_featured_topics.rb
+++ b/db/migrate/20130528174147_add_rank_to_category_featured_topics.rb
@@ -1,4 +1,4 @@
-class AddRankToCategoryFeaturedTopics < ActiveRecord::Migration
+class AddRankToCategoryFeaturedTopics < ActiveRecord::Migration[4.2]
   def change
     add_column :category_featured_topics, :rank, :integer, default: 0, null: false
     add_index :category_featured_topics, [:category_id, :rank]
diff --git a/db/migrate/20130531210816_add_staff_took_action_to_post_actions.rb b/db/migrate/20130531210816_add_staff_took_action_to_post_actions.rb
index 3b6c2c3684..bb522ddf71 100644
--- a/db/migrate/20130531210816_add_staff_took_action_to_post_actions.rb
+++ b/db/migrate/20130531210816_add_staff_took_action_to_post_actions.rb
@@ -1,4 +1,4 @@
-class AddStaffTookActionToPostActions < ActiveRecord::Migration
+class AddStaffTookActionToPostActions < ActiveRecord::Migration[4.2]
   def change
     add_column :post_actions, :staff_took_action, :boolean, default: false, null: false
   end
diff --git a/db/migrate/20130603192412_add_blocked_to_users.rb b/db/migrate/20130603192412_add_blocked_to_users.rb
index cf52fc74c1..e80eb8c425 100644
--- a/db/migrate/20130603192412_add_blocked_to_users.rb
+++ b/db/migrate/20130603192412_add_blocked_to_users.rb
@@ -1,4 +1,4 @@
-class AddBlockedToUsers < ActiveRecord::Migration
+class AddBlockedToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :blocked, :boolean, default: false
   end
diff --git a/db/migrate/20130606190601_add_auto_close_started_at_to_topics.rb b/db/migrate/20130606190601_add_auto_close_started_at_to_topics.rb
index 76692e344e..95016198e4 100644
--- a/db/migrate/20130606190601_add_auto_close_started_at_to_topics.rb
+++ b/db/migrate/20130606190601_add_auto_close_started_at_to_topics.rb
@@ -1,4 +1,4 @@
-class AddAutoCloseStartedAtToTopics < ActiveRecord::Migration
+class AddAutoCloseStartedAtToTopics < ActiveRecord::Migration[4.2]
   def change
     add_column :topics, :auto_close_started_at, :datetime
   end
diff --git a/db/migrate/20130610201033_add_reply_key_to_email_logs.rb b/db/migrate/20130610201033_add_reply_key_to_email_logs.rb
index 9295101073..266a66c06d 100644
--- a/db/migrate/20130610201033_add_reply_key_to_email_logs.rb
+++ b/db/migrate/20130610201033_add_reply_key_to_email_logs.rb
@@ -1,4 +1,4 @@
-class AddReplyKeyToEmailLogs < ActiveRecord::Migration
+class AddReplyKeyToEmailLogs < ActiveRecord::Migration[4.2]
   def change
     add_column :email_logs, :reply_key, :string, limit: 32
     add_index :email_logs, :reply_key
diff --git a/db/migrate/20130612200846_create_post_upload_join_table.rb b/db/migrate/20130612200846_create_post_upload_join_table.rb
index 94698c89f0..809b104074 100644
--- a/db/migrate/20130612200846_create_post_upload_join_table.rb
+++ b/db/migrate/20130612200846_create_post_upload_join_table.rb
@@ -1,12 +1,12 @@
-class CreatePostUploadJoinTable < ActiveRecord::Migration
+class CreatePostUploadJoinTable < ActiveRecord::Migration[4.2]
   def change
-  	create_table :posts_uploads, force: true, id: false do |t|
-  		t.integer :post_id
-  		t.integer :upload_id
-  	end
+    create_table :posts_uploads, force: true, id: false do |t|
+      t.integer :post_id
+      t.integer :upload_id
+    end
 
-  	add_index :posts_uploads, :post_id
-  	add_index :posts_uploads, :upload_id
-  	add_index :posts_uploads, [:post_id, :upload_id], unique: true
+    add_index :posts_uploads, :post_id
+    add_index :posts_uploads, :upload_id
+    add_index :posts_uploads, [:post_id, :upload_id], unique: true
   end
 end
diff --git a/db/migrate/20130613211700_drop_posts_uploads.rb b/db/migrate/20130613211700_drop_posts_uploads.rb
index d383d22710..f04de8e8b2 100644
--- a/db/migrate/20130613211700_drop_posts_uploads.rb
+++ b/db/migrate/20130613211700_drop_posts_uploads.rb
@@ -1,4 +1,4 @@
-class DropPostsUploads < ActiveRecord::Migration
+class DropPostsUploads < ActiveRecord::Migration[4.2]
   def up
     drop_table :posts_uploads
   end
@@ -7,7 +7,7 @@ class DropPostsUploads < ActiveRecord::Migration
     create_table :posts_uploads, id: false do |t|
       t.integer :post_id
       t.integer :upload_id
-  end
+    end
 
     add_index :posts_uploads, :post_id
     add_index :posts_uploads, :upload_id
diff --git a/db/migrate/20130613212230_create_post_uploads.rb b/db/migrate/20130613212230_create_post_uploads.rb
index baf08b71bc..1e2b6f5b8c 100644
--- a/db/migrate/20130613212230_create_post_uploads.rb
+++ b/db/migrate/20130613212230_create_post_uploads.rb
@@ -1,4 +1,4 @@
-class CreatePostUploads < ActiveRecord::Migration
+class CreatePostUploads < ActiveRecord::Migration[4.2]
   def up
     create_table :post_uploads do |t|
       t.integer :post_id, null: false
diff --git a/db/migrate/20130615064344_add_dynamic_favicon_preference_to_user.rb b/db/migrate/20130615064344_add_dynamic_favicon_preference_to_user.rb
index b8395a4bcd..42564fdd60 100644
--- a/db/migrate/20130615064344_add_dynamic_favicon_preference_to_user.rb
+++ b/db/migrate/20130615064344_add_dynamic_favicon_preference_to_user.rb
@@ -1,4 +1,4 @@
-class AddDynamicFaviconPreferenceToUser < ActiveRecord::Migration
+class AddDynamicFaviconPreferenceToUser < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :dynamic_favicon, :boolean, default: false, null: false
   end
diff --git a/db/migrate/20130615073305_remove_topic_id_from_uploads.rb b/db/migrate/20130615073305_remove_topic_id_from_uploads.rb
index 3be8c407fe..01fe10714c 100644
--- a/db/migrate/20130615073305_remove_topic_id_from_uploads.rb
+++ b/db/migrate/20130615073305_remove_topic_id_from_uploads.rb
@@ -1,4 +1,4 @@
-class RemoveTopicIdFromUploads < ActiveRecord::Migration
+class RemoveTopicIdFromUploads < ActiveRecord::Migration[4.2]
   def up
     remove_column :uploads, :topic_id
   end
diff --git a/db/migrate/20130615075557_add_sha_to_uploads.rb b/db/migrate/20130615075557_add_sha_to_uploads.rb
index 8af093d88c..f1a27225ac 100644
--- a/db/migrate/20130615075557_add_sha_to_uploads.rb
+++ b/db/migrate/20130615075557_add_sha_to_uploads.rb
@@ -1,4 +1,4 @@
-class AddShaToUploads < ActiveRecord::Migration
+class AddShaToUploads < ActiveRecord::Migration[4.2]
   def change
     add_column :uploads, :sha, :string, null: true
     add_index :uploads, :sha, unique: true
diff --git a/db/migrate/20130616082327_create_optimized_images.rb b/db/migrate/20130616082327_create_optimized_images.rb
index a927548a00..d8397c3aac 100644
--- a/db/migrate/20130616082327_create_optimized_images.rb
+++ b/db/migrate/20130616082327_create_optimized_images.rb
@@ -1,4 +1,4 @@
-class CreateOptimizedImages < ActiveRecord::Migration
+class CreateOptimizedImages < ActiveRecord::Migration[4.2]
   def up
     create_table :optimized_images do |t|
       t.string :sha, null: false
diff --git a/db/migrate/20130617014127_rename_sha_and_ext_columns.rb b/db/migrate/20130617014127_rename_sha_and_ext_columns.rb
index d0077df775..359462c96c 100644
--- a/db/migrate/20130617014127_rename_sha_and_ext_columns.rb
+++ b/db/migrate/20130617014127_rename_sha_and_ext_columns.rb
@@ -1,4 +1,4 @@
-class RenameShaAndExtColumns < ActiveRecord::Migration
+class RenameShaAndExtColumns < ActiveRecord::Migration[4.2]
   def up
     rename_column :optimized_images, :sha, :sha1
     change_column :optimized_images, :sha1, :string, limit: 40
diff --git a/db/migrate/20130617180009_rename_sha_column.rb b/db/migrate/20130617180009_rename_sha_column.rb
index c621a485de..4f50ec4cb6 100644
--- a/db/migrate/20130617180009_rename_sha_column.rb
+++ b/db/migrate/20130617180009_rename_sha_column.rb
@@ -1,4 +1,4 @@
-class RenameShaColumn < ActiveRecord::Migration
+class RenameShaColumn < ActiveRecord::Migration[4.2]
   def up
     remove_index :uploads, :sha
     rename_column :uploads, :sha, :sha1
diff --git a/db/migrate/20130617181804_add_post_id_to_email_logs.rb b/db/migrate/20130617181804_add_post_id_to_email_logs.rb
index 793b85dec8..f2c6f787e1 100644
--- a/db/migrate/20130617181804_add_post_id_to_email_logs.rb
+++ b/db/migrate/20130617181804_add_post_id_to_email_logs.rb
@@ -1,4 +1,4 @@
-class AddPostIdToEmailLogs < ActiveRecord::Migration
+class AddPostIdToEmailLogs < ActiveRecord::Migration[4.2]
   def change
     add_column :email_logs, :post_id, :integer, null: true
     add_column :email_logs, :topic_id, :integer, null: true
diff --git a/db/migrate/20130619063902_add_defer_to_post_actions.rb b/db/migrate/20130619063902_add_defer_to_post_actions.rb
index ac290b92d8..7c55d2c5c2 100644
--- a/db/migrate/20130619063902_add_defer_to_post_actions.rb
+++ b/db/migrate/20130619063902_add_defer_to_post_actions.rb
@@ -1,4 +1,4 @@
-class AddDeferToPostActions < ActiveRecord::Migration
+class AddDeferToPostActions < ActiveRecord::Migration[4.2]
   def change
     # an action can be deferred by a moderator, used for flags
     add_column :post_actions, :defer, :boolean
diff --git a/db/migrate/20130621042855_change_supress_to_suppress.rb b/db/migrate/20130621042855_change_supress_to_suppress.rb
index 1e8f497b09..6f6af2ac27 100644
--- a/db/migrate/20130621042855_change_supress_to_suppress.rb
+++ b/db/migrate/20130621042855_change_supress_to_suppress.rb
@@ -1,9 +1,9 @@
-class ChangeSupressToSuppress < ActiveRecord::Migration
+class ChangeSupressToSuppress < ActiveRecord::Migration[4.2]
   def up
-    SiteSetting.where(name: "suppress_reply_directly_below").update_all({name: "supress_reply_directly_below"})
+    SiteSetting.where(name: "suppress_reply_directly_below").update_all(name: "supress_reply_directly_below")
   end
 
   def down
-    SiteSetting.where(name: "supress_reply_directly_below").update_all({name: "suppress_reply_directly_below"})
+    SiteSetting.where(name: "supress_reply_directly_below").update_all(name: "suppress_reply_directly_below")
   end
 end
diff --git a/db/migrate/20130622110348_add_url_index_to_uploads.rb b/db/migrate/20130622110348_add_url_index_to_uploads.rb
index 6775c7c11c..ec4e01767d 100644
--- a/db/migrate/20130622110348_add_url_index_to_uploads.rb
+++ b/db/migrate/20130622110348_add_url_index_to_uploads.rb
@@ -1,4 +1,4 @@
-class AddUrlIndexToUploads < ActiveRecord::Migration
+class AddUrlIndexToUploads < ActiveRecord::Migration[4.2]
   def change
     add_index :uploads, :url
   end
diff --git a/db/migrate/20130624203206_change_ip_to_inet_in_topic_link_clicks.rb b/db/migrate/20130624203206_change_ip_to_inet_in_topic_link_clicks.rb
index a0c3924bfd..384cbe8631 100644
--- a/db/migrate/20130624203206_change_ip_to_inet_in_topic_link_clicks.rb
+++ b/db/migrate/20130624203206_change_ip_to_inet_in_topic_link_clicks.rb
@@ -1,6 +1,6 @@
 require 'ipaddr'
 
-class ChangeIpToInetInTopicLinkClicks < ActiveRecord::Migration
+class ChangeIpToInetInTopicLinkClicks < ActiveRecord::Migration[4.2]
   def up
     add_column :topic_link_clicks, :ip_address, :inet
 
@@ -11,7 +11,7 @@ class ChangeIpToInetInTopicLinkClicks < ActiveRecord::Migration
       (ip >>  0 & 255)
     );"
 
-    change_column :topic_link_clicks, :ip_address, :inet, { :null => false }
+    change_column :topic_link_clicks, :ip_address, :inet, null: false
     remove_column :topic_link_clicks, :ip
   end
 
diff --git a/db/migrate/20130625022454_change_ip_to_inet_in_views.rb b/db/migrate/20130625022454_change_ip_to_inet_in_views.rb
index 30a0e8390b..178a2aeced 100644
--- a/db/migrate/20130625022454_change_ip_to_inet_in_views.rb
+++ b/db/migrate/20130625022454_change_ip_to_inet_in_views.rb
@@ -1,6 +1,6 @@
 require 'ipaddr'
 
-class ChangeIpToInetInViews < ActiveRecord::Migration
+class ChangeIpToInetInViews < ActiveRecord::Migration[4.2]
   def up
     table = :views
     add_column table, :ip_address, :inet
@@ -12,7 +12,7 @@ class ChangeIpToInetInViews < ActiveRecord::Migration
       (ip >>  0 & 255)
     );"
 
-    change_column table, :ip_address, :inet, { :null => false }
+    change_column table, :ip_address, :inet, null: false
     remove_column table, :ip
   end
 
diff --git a/db/migrate/20130625170842_remove_access_password.rb b/db/migrate/20130625170842_remove_access_password.rb
index 31c5a83d4a..10e6d49e30 100644
--- a/db/migrate/20130625170842_remove_access_password.rb
+++ b/db/migrate/20130625170842_remove_access_password.rb
@@ -1,7 +1,7 @@
-class RemoveAccessPassword < ActiveRecord::Migration
+class RemoveAccessPassword < ActiveRecord::Migration[4.2]
   def up
     result = execute("SELECT count(*) FROM site_settings where name='access_password' and char_length(value) > 0")
-    if result[0] and result[0]["count"].to_i > 0
+    if result[0] && result[0]["count"].to_i > (0)
       execute "DELETE FROM site_settings where name='access_password'"
       SiteSetting.login_required = true
       SiteSetting.must_approve_users = true
diff --git a/db/migrate/20130625201113_add_title_to_users.rb b/db/migrate/20130625201113_add_title_to_users.rb
index 8b921702a6..cb63d4fa5b 100644
--- a/db/migrate/20130625201113_add_title_to_users.rb
+++ b/db/migrate/20130625201113_add_title_to_users.rb
@@ -1,4 +1,4 @@
-class AddTitleToUsers < ActiveRecord::Migration
+class AddTitleToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :title, :string
   end
diff --git a/db/migrate/20130709184941_add_deleted_by_id_to_posts.rb b/db/migrate/20130709184941_add_deleted_by_id_to_posts.rb
index 7f725b1985..d322f05dd7 100644
--- a/db/migrate/20130709184941_add_deleted_by_id_to_posts.rb
+++ b/db/migrate/20130709184941_add_deleted_by_id_to_posts.rb
@@ -1,4 +1,4 @@
-class AddDeletedByIdToPosts < ActiveRecord::Migration
+class AddDeletedByIdToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :deleted_by_id, :integer, null: true
     add_column :topics, :deleted_by_id, :integer, null: true
diff --git a/db/migrate/20130710201248_add_nuked_user_to_posts.rb b/db/migrate/20130710201248_add_nuked_user_to_posts.rb
index 6c72dd2684..14e9aad0ef 100644
--- a/db/migrate/20130710201248_add_nuked_user_to_posts.rb
+++ b/db/migrate/20130710201248_add_nuked_user_to_posts.rb
@@ -1,4 +1,4 @@
-class AddNukedUserToPosts < ActiveRecord::Migration
+class AddNukedUserToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :nuked_user, :boolean, default: false
   end
diff --git a/db/migrate/20130712041133_add_permission_type_to_category_groups.rb b/db/migrate/20130712041133_add_permission_type_to_category_groups.rb
index ae227562e3..4ddab5fe07 100644
--- a/db/migrate/20130712041133_add_permission_type_to_category_groups.rb
+++ b/db/migrate/20130712041133_add_permission_type_to_category_groups.rb
@@ -1,4 +1,4 @@
-class AddPermissionTypeToCategoryGroups < ActiveRecord::Migration
+class AddPermissionTypeToCategoryGroups < ActiveRecord::Migration[4.2]
   def change
     # 1 is full permissions
     add_column :category_groups, :permission_type, :integer, default: 1
diff --git a/db/migrate/20130712163509_add_missing_id_columns.rb b/db/migrate/20130712163509_add_missing_id_columns.rb
index 97987e0bc5..a81cadc696 100644
--- a/db/migrate/20130712163509_add_missing_id_columns.rb
+++ b/db/migrate/20130712163509_add_missing_id_columns.rb
@@ -1,4 +1,4 @@
-class AddMissingIdColumns < ActiveRecord::Migration
+class AddMissingIdColumns < ActiveRecord::Migration[4.2]
   def up
     add_column :category_featured_topics, :id, :primary_key
     add_column :topic_users, :id, :primary_key
diff --git a/db/migrate/20130723212758_rename_admin_log.rb b/db/migrate/20130723212758_rename_admin_log.rb
index 5e33a25325..e7f2e5471b 100644
--- a/db/migrate/20130723212758_rename_admin_log.rb
+++ b/db/migrate/20130723212758_rename_admin_log.rb
@@ -1,4 +1,4 @@
-class RenameAdminLog < ActiveRecord::Migration
+class RenameAdminLog < ActiveRecord::Migration[4.2]
   def up
     rename_table :admin_logs, :staff_action_logs
     rename_column :staff_action_logs, :admin_id, :staff_user_id
diff --git a/db/migrate/20130724201552_create_blocked_emails.rb b/db/migrate/20130724201552_create_blocked_emails.rb
index 2c669e3ee1..e3e7b35600 100644
--- a/db/migrate/20130724201552_create_blocked_emails.rb
+++ b/db/migrate/20130724201552_create_blocked_emails.rb
@@ -1,11 +1,11 @@
-class CreateBlockedEmails < ActiveRecord::Migration
+class CreateBlockedEmails < ActiveRecord::Migration[4.2]
   def change
     create_table :blocked_emails do |t|
       t.string :email, null: false
       t.integer :action_type, null: false
       t.integer :match_count, null: false, default: 0
       t.datetime :last_match_at
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :blocked_emails, :email, unique: true
   end
diff --git a/db/migrate/20130725213613_add_more_to_staff_action_log.rb b/db/migrate/20130725213613_add_more_to_staff_action_log.rb
index c2385f6afc..dbefeedcf7 100644
--- a/db/migrate/20130725213613_add_more_to_staff_action_log.rb
+++ b/db/migrate/20130725213613_add_more_to_staff_action_log.rb
@@ -1,4 +1,4 @@
-class AddMoreToStaffActionLog < ActiveRecord::Migration
+class AddMoreToStaffActionLog < ActiveRecord::Migration[4.2]
   def change
     add_column :staff_action_logs, :context, :string
     add_column :staff_action_logs, :ip_address, :string
diff --git a/db/migrate/20130728172550_add_url_to_optimized_images.rb b/db/migrate/20130728172550_add_url_to_optimized_images.rb
index f22892014e..cf881a2002 100644
--- a/db/migrate/20130728172550_add_url_to_optimized_images.rb
+++ b/db/migrate/20130728172550_add_url_to_optimized_images.rb
@@ -1,4 +1,4 @@
-class AddUrlToOptimizedImages < ActiveRecord::Migration
+class AddUrlToOptimizedImages < ActiveRecord::Migration[4.2]
   def up
     # add a nullable url column
     add_column :optimized_images, :url, :string
diff --git a/db/migrate/20130731163035_add_report_index_to_incoming_links.rb b/db/migrate/20130731163035_add_report_index_to_incoming_links.rb
index 7d02541696..c470979e0f 100644
--- a/db/migrate/20130731163035_add_report_index_to_incoming_links.rb
+++ b/db/migrate/20130731163035_add_report_index_to_incoming_links.rb
@@ -1,4 +1,4 @@
-class AddReportIndexToIncomingLinks < ActiveRecord::Migration
+class AddReportIndexToIncomingLinks < ActiveRecord::Migration[4.2]
   def change
     add_index :incoming_links, [:created_at, :user_id]
     add_index :incoming_links, [:created_at, :domain]
diff --git a/db/migrate/20130807202516_add_last_match_index_to_blocked_emails.rb b/db/migrate/20130807202516_add_last_match_index_to_blocked_emails.rb
index 4a49304ee4..ad3828c7a2 100644
--- a/db/migrate/20130807202516_add_last_match_index_to_blocked_emails.rb
+++ b/db/migrate/20130807202516_add_last_match_index_to_blocked_emails.rb
@@ -1,4 +1,4 @@
-class AddLastMatchIndexToBlockedEmails < ActiveRecord::Migration
+class AddLastMatchIndexToBlockedEmails < ActiveRecord::Migration[4.2]
   def change
     add_index :blocked_emails, :last_match_at
   end
diff --git a/db/migrate/20130809160751_fix_seen_notification_ids.rb b/db/migrate/20130809160751_fix_seen_notification_ids.rb
index 9a83d82605..fce5ae1165 100644
--- a/db/migrate/20130809160751_fix_seen_notification_ids.rb
+++ b/db/migrate/20130809160751_fix_seen_notification_ids.rb
@@ -1,4 +1,4 @@
-class FixSeenNotificationIds < ActiveRecord::Migration
+class FixSeenNotificationIds < ActiveRecord::Migration[4.2]
   def up
 
     # There was an error where `seen_notification_id` was being updated incorrectly.
diff --git a/db/migrate/20130809204732_add_filter_indexes_to_staff_action_logs.rb b/db/migrate/20130809204732_add_filter_indexes_to_staff_action_logs.rb
index 24aa1ad1f8..db5a1b47d8 100644
--- a/db/migrate/20130809204732_add_filter_indexes_to_staff_action_logs.rb
+++ b/db/migrate/20130809204732_add_filter_indexes_to_staff_action_logs.rb
@@ -1,4 +1,4 @@
-class AddFilterIndexesToStaffActionLogs < ActiveRecord::Migration
+class AddFilterIndexesToStaffActionLogs < ActiveRecord::Migration[4.2]
   def change
     add_index :staff_action_logs, [:action, :id]
     add_index :staff_action_logs, [:staff_user_id, :id]
diff --git a/db/migrate/20130809211409_add_avatar_to_users.rb b/db/migrate/20130809211409_add_avatar_to_users.rb
index 4d570aeee7..c891fbdecc 100644
--- a/db/migrate/20130809211409_add_avatar_to_users.rb
+++ b/db/migrate/20130809211409_add_avatar_to_users.rb
@@ -1,4 +1,4 @@
-class AddAvatarToUsers < ActiveRecord::Migration
+class AddAvatarToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :use_uploaded_avatar, :boolean, default: false
     add_column :users, :uploaded_avatar_template, :string
diff --git a/db/migrate/20130813204212_create_screened_urls.rb b/db/migrate/20130813204212_create_screened_urls.rb
index 5e613c748e..e9887141aa 100644
--- a/db/migrate/20130813204212_create_screened_urls.rb
+++ b/db/migrate/20130813204212_create_screened_urls.rb
@@ -1,4 +1,4 @@
-class CreateScreenedUrls < ActiveRecord::Migration
+class CreateScreenedUrls < ActiveRecord::Migration[4.2]
   def change
     create_table :screened_urls do |t|
       t.string :url, null: false
@@ -6,7 +6,7 @@ class CreateScreenedUrls < ActiveRecord::Migration
       t.integer :action_type, null: false
       t.integer :match_count, null: false, default: 0
       t.datetime :last_match_at
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :screened_urls, :url, unique: true
     add_index :screened_urls, :last_match_at
diff --git a/db/migrate/20130813224817_rename_blocked_emails_to_screened_emails.rb b/db/migrate/20130813224817_rename_blocked_emails_to_screened_emails.rb
index 5f593e445a..6518c622b6 100644
--- a/db/migrate/20130813224817_rename_blocked_emails_to_screened_emails.rb
+++ b/db/migrate/20130813224817_rename_blocked_emails_to_screened_emails.rb
@@ -1,4 +1,4 @@
-class RenameBlockedEmailsToScreenedEmails < ActiveRecord::Migration
+class RenameBlockedEmailsToScreenedEmails < ActiveRecord::Migration[4.2]
   def change
     rename_table :blocked_emails, :screened_emails
   end
diff --git a/db/migrate/20130816024250_create_oauth2_user_infos.rb b/db/migrate/20130816024250_create_oauth2_user_infos.rb
index d5a392fb61..d29ec19b19 100644
--- a/db/migrate/20130816024250_create_oauth2_user_infos.rb
+++ b/db/migrate/20130816024250_create_oauth2_user_infos.rb
@@ -1,4 +1,4 @@
-class CreateOauth2UserInfos < ActiveRecord::Migration
+class CreateOauth2UserInfos < ActiveRecord::Migration[4.2]
   def change
     create_table :oauth2_user_infos do |t|
       t.integer :user_id, null: false
@@ -6,7 +6,7 @@ class CreateOauth2UserInfos < ActiveRecord::Migration
       t.string :provider, null: false
       t.string :email
       t.string :name
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :oauth2_user_infos, [:uid, :provider], unique: true
diff --git a/db/migrate/20130819192358_add_value_columns_to_staff_action_logs.rb b/db/migrate/20130819192358_add_value_columns_to_staff_action_logs.rb
index 5ea550ece9..4251b122f8 100644
--- a/db/migrate/20130819192358_add_value_columns_to_staff_action_logs.rb
+++ b/db/migrate/20130819192358_add_value_columns_to_staff_action_logs.rb
@@ -1,4 +1,4 @@
-class AddValueColumnsToStaffActionLogs < ActiveRecord::Migration
+class AddValueColumnsToStaffActionLogs < ActiveRecord::Migration[4.2]
   def change
     add_column :staff_action_logs, :subject, :text
     add_column :staff_action_logs, :previous_value, :text
diff --git a/db/migrate/20130820174431_add_subject_index_to_staff_action_logs.rb b/db/migrate/20130820174431_add_subject_index_to_staff_action_logs.rb
index 24471d4c03..47459b3bfc 100644
--- a/db/migrate/20130820174431_add_subject_index_to_staff_action_logs.rb
+++ b/db/migrate/20130820174431_add_subject_index_to_staff_action_logs.rb
@@ -1,4 +1,4 @@
-class AddSubjectIndexToStaffActionLogs < ActiveRecord::Migration
+class AddSubjectIndexToStaffActionLogs < ActiveRecord::Migration[4.2]
   def change
     add_index :staff_action_logs, [:subject, :id]
   end
diff --git a/db/migrate/20130822213513_add_ip_address_to_screening_tables.rb b/db/migrate/20130822213513_add_ip_address_to_screening_tables.rb
index 73eb383248..b5a5490e73 100644
--- a/db/migrate/20130822213513_add_ip_address_to_screening_tables.rb
+++ b/db/migrate/20130822213513_add_ip_address_to_screening_tables.rb
@@ -1,4 +1,4 @@
-class AddIpAddressToScreeningTables < ActiveRecord::Migration
+class AddIpAddressToScreeningTables < ActiveRecord::Migration[4.2]
   def change
     add_column :screened_emails, :ip_address, :inet
     add_column :screened_urls,   :ip_address, :inet
diff --git a/db/migrate/20130823201420_drop_defaults_on_email_digest_columns_of_users.rb b/db/migrate/20130823201420_drop_defaults_on_email_digest_columns_of_users.rb
index 45b3f32676..0f11387575 100644
--- a/db/migrate/20130823201420_drop_defaults_on_email_digest_columns_of_users.rb
+++ b/db/migrate/20130823201420_drop_defaults_on_email_digest_columns_of_users.rb
@@ -1,4 +1,4 @@
-class DropDefaultsOnEmailDigestColumnsOfUsers < ActiveRecord::Migration
+class DropDefaultsOnEmailDigestColumnsOfUsers < ActiveRecord::Migration[4.2]
   def up
     change_column_default :users, :email_digests,     nil
     change_column         :users, :digest_after_days, :integer, default: nil, null: true
diff --git a/db/migrate/20130826011521_create_plugin_store_rows.rb b/db/migrate/20130826011521_create_plugin_store_rows.rb
index acf0e2c38d..c26e09e0b0 100644
--- a/db/migrate/20130826011521_create_plugin_store_rows.rb
+++ b/db/migrate/20130826011521_create_plugin_store_rows.rb
@@ -1,4 +1,4 @@
-class CreatePluginStoreRows < ActiveRecord::Migration
+class CreatePluginStoreRows < ActiveRecord::Migration[4.2]
   def change
     create_table :plugin_store_rows do |table|
       table.string :plugin_name, null: false
diff --git a/db/migrate/20130828192526_fix_optimized_images_urls.rb b/db/migrate/20130828192526_fix_optimized_images_urls.rb
index c605b7b74e..31eb7d61cb 100644
--- a/db/migrate/20130828192526_fix_optimized_images_urls.rb
+++ b/db/migrate/20130828192526_fix_optimized_images_urls.rb
@@ -1,4 +1,4 @@
-class FixOptimizedImagesUrls < ActiveRecord::Migration
+class FixOptimizedImagesUrls < ActiveRecord::Migration[4.2]
   def up
     # `AddUrlToOptimizedImages` was wrongly computing the URLs. This fixes it!
     execute "UPDATE optimized_images
diff --git a/db/migrate/20130903154323_allow_null_user_id_on_posts.rb b/db/migrate/20130903154323_allow_null_user_id_on_posts.rb
index 8a9141268d..8afa0a9d1e 100644
--- a/db/migrate/20130903154323_allow_null_user_id_on_posts.rb
+++ b/db/migrate/20130903154323_allow_null_user_id_on_posts.rb
@@ -1,4 +1,4 @@
-class AllowNullUserIdOnPosts < ActiveRecord::Migration
+class AllowNullUserIdOnPosts < ActiveRecord::Migration[4.2]
   def up
     change_column :posts, :user_id, :integer, null: true
     execute "UPDATE posts SET user_id = NULL WHERE nuked_user = true"
diff --git a/db/migrate/20130904181208_allow_null_user_id_on_topics.rb b/db/migrate/20130904181208_allow_null_user_id_on_topics.rb
index 48e9b157d5..1cf399f4b3 100644
--- a/db/migrate/20130904181208_allow_null_user_id_on_topics.rb
+++ b/db/migrate/20130904181208_allow_null_user_id_on_topics.rb
@@ -1,4 +1,4 @@
-class AllowNullUserIdOnTopics < ActiveRecord::Migration
+class AllowNullUserIdOnTopics < ActiveRecord::Migration[4.2]
   def up
     change_column :topics, :user_id, :integer, null: true
   end
diff --git a/db/migrate/20130906081326_rename_system_username.rb b/db/migrate/20130906081326_rename_system_username.rb
index 38550ddc48..13e3dcc912 100644
--- a/db/migrate/20130906081326_rename_system_username.rb
+++ b/db/migrate/20130906081326_rename_system_username.rb
@@ -1,4 +1,4 @@
-class RenameSystemUsername < ActiveRecord::Migration
+class RenameSystemUsername < ActiveRecord::Migration[4.2]
   def up
     execute "update site_settings set name = 'site_contact_username' where name = 'system_username'"
   end
diff --git a/db/migrate/20130906171631_add_index_to_uploads.rb b/db/migrate/20130906171631_add_index_to_uploads.rb
index 38e91b75b7..f52a61e8b4 100644
--- a/db/migrate/20130906171631_add_index_to_uploads.rb
+++ b/db/migrate/20130906171631_add_index_to_uploads.rb
@@ -1,4 +1,4 @@
-class AddIndexToUploads < ActiveRecord::Migration
+class AddIndexToUploads < ActiveRecord::Migration[4.2]
   def change
     add_index :uploads, [:id, :url]
   end
diff --git a/db/migrate/20130910040235_index_topics_for_front_page.rb b/db/migrate/20130910040235_index_topics_for_front_page.rb
index 33dd7de678..7b495958de 100644
--- a/db/migrate/20130910040235_index_topics_for_front_page.rb
+++ b/db/migrate/20130910040235_index_topics_for_front_page.rb
@@ -1,4 +1,4 @@
-class IndexTopicsForFrontPage < ActiveRecord::Migration
+class IndexTopicsForFrontPage < ActiveRecord::Migration[4.2]
   def change
     add_index :topics, [:deleted_at, :visible, :archetype, :id]
     # covering index for join
diff --git a/db/migrate/20130910220317_rename_staff_action_logs_to_user_history.rb b/db/migrate/20130910220317_rename_staff_action_logs_to_user_history.rb
index e5163dd1ea..b11fb90b29 100644
--- a/db/migrate/20130910220317_rename_staff_action_logs_to_user_history.rb
+++ b/db/migrate/20130910220317_rename_staff_action_logs_to_user_history.rb
@@ -1,4 +1,4 @@
-class RenameStaffActionLogsToUserHistory < ActiveRecord::Migration
+class RenameStaffActionLogsToUserHistory < ActiveRecord::Migration[4.2]
   def up
     remove_index :staff_action_logs, [:staff_user_id, :id]
     rename_table :staff_action_logs, :user_histories
diff --git a/db/migrate/20130911182437_create_user_stats.rb b/db/migrate/20130911182437_create_user_stats.rb
index 66f5370743..b7936b3710 100644
--- a/db/migrate/20130911182437_create_user_stats.rb
+++ b/db/migrate/20130911182437_create_user_stats.rb
@@ -1,6 +1,6 @@
-class CreateUserStats < ActiveRecord::Migration
+class CreateUserStats < ActiveRecord::Migration[4.2]
   def up
-    create_table :user_stats, :id => false do |t|
+    create_table :user_stats, id: false do |t|
       t.references :user, null: false
       t.boolean :has_custom_avatar, default: false, null: false
     end
diff --git a/db/migrate/20130912185218_acting_user_null.rb b/db/migrate/20130912185218_acting_user_null.rb
index fe99e3783c..e6a8b92aa7 100644
--- a/db/migrate/20130912185218_acting_user_null.rb
+++ b/db/migrate/20130912185218_acting_user_null.rb
@@ -1,10 +1,10 @@
-class ActingUserNull < ActiveRecord::Migration
+class ActingUserNull < ActiveRecord::Migration[4.2]
   def up
-    change_column :user_histories, :acting_user_id, :integer, :null => true
+    change_column :user_histories, :acting_user_id, :integer, null: true
   end
 
   def down
     execute "DELETE FROM user_histories WHERE acting_user_id IS NULL"
-    change_column :user_histories, :acting_user_id, :integer, :null => false
+    change_column :user_histories, :acting_user_id, :integer, null: false
   end
 end
diff --git a/db/migrate/20130913210454_add_mobile_to_site_customizations.rb b/db/migrate/20130913210454_add_mobile_to_site_customizations.rb
index 681788ce6e..f66162dc29 100644
--- a/db/migrate/20130913210454_add_mobile_to_site_customizations.rb
+++ b/db/migrate/20130913210454_add_mobile_to_site_customizations.rb
@@ -1,4 +1,4 @@
-class AddMobileToSiteCustomizations < ActiveRecord::Migration
+class AddMobileToSiteCustomizations < ActiveRecord::Migration[4.2]
   def change
     add_column :site_customizations, :mobile_stylesheet, :text
     add_column :site_customizations, :mobile_header, :text
diff --git a/db/migrate/20130917174738_add_topic_id_to_user_histories.rb b/db/migrate/20130917174738_add_topic_id_to_user_histories.rb
index 2b0c17946d..0347a3edc0 100644
--- a/db/migrate/20130917174738_add_topic_id_to_user_histories.rb
+++ b/db/migrate/20130917174738_add_topic_id_to_user_histories.rb
@@ -1,4 +1,4 @@
-class AddTopicIdToUserHistories < ActiveRecord::Migration
+class AddTopicIdToUserHistories < ActiveRecord::Migration[4.2]
   def change
     add_column :user_histories, :topic_id, :integer
   end
diff --git a/db/migrate/20131001060630_add_email_always_to_users.rb b/db/migrate/20131001060630_add_email_always_to_users.rb
index c5773574ed..f8ef7f31a3 100644
--- a/db/migrate/20131001060630_add_email_always_to_users.rb
+++ b/db/migrate/20131001060630_add_email_always_to_users.rb
@@ -1,4 +1,4 @@
-class AddEmailAlwaysToUsers < ActiveRecord::Migration
+class AddEmailAlwaysToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :email_always, :bool, default: false, null: false
   end
diff --git a/db/migrate/20131002070347_add_user_id_parent_type_index_on_views.rb b/db/migrate/20131002070347_add_user_id_parent_type_index_on_views.rb
index b1a20098d6..f20ecc4545 100644
--- a/db/migrate/20131002070347_add_user_id_parent_type_index_on_views.rb
+++ b/db/migrate/20131002070347_add_user_id_parent_type_index_on_views.rb
@@ -1,5 +1,5 @@
-class AddUserIdParentTypeIndexOnViews < ActiveRecord::Migration
+class AddUserIdParentTypeIndexOnViews < ActiveRecord::Migration[4.2]
   def change
-    add_index :views, [:user_id,:parent_type,:parent_id]
+    add_index :views, [:user_id, :parent_type, :parent_id]
   end
 end
diff --git a/db/migrate/20131003061137_move_columns_to_user_stats.rb b/db/migrate/20131003061137_move_columns_to_user_stats.rb
index b5346a9452..4212b56bca 100644
--- a/db/migrate/20131003061137_move_columns_to_user_stats.rb
+++ b/db/migrate/20131003061137_move_columns_to_user_stats.rb
@@ -1,4 +1,4 @@
-class MoveColumnsToUserStats < ActiveRecord::Migration
+class MoveColumnsToUserStats < ActiveRecord::Migration[4.2]
   def up
     add_column :user_stats, :topics_entered, :integer, default: 0, null: false
     add_column :user_stats, :time_read, :integer, default: 0, null: false
diff --git a/db/migrate/20131014203951_backfill_post_upload_reverse_index.rb b/db/migrate/20131014203951_backfill_post_upload_reverse_index.rb
index d4d121bf81..d288ef1ec2 100644
--- a/db/migrate/20131014203951_backfill_post_upload_reverse_index.rb
+++ b/db/migrate/20131014203951_backfill_post_upload_reverse_index.rb
@@ -1,4 +1,4 @@
-class BackfillPostUploadReverseIndex < ActiveRecord::Migration
+class BackfillPostUploadReverseIndex < ActiveRecord::Migration[4.2]
 
   def up
     # clean the reverse index
diff --git a/db/migrate/20131015131652_create_post_details.rb b/db/migrate/20131015131652_create_post_details.rb
index 5a124432cf..20b780b9f7 100644
--- a/db/migrate/20131015131652_create_post_details.rb
+++ b/db/migrate/20131015131652_create_post_details.rb
@@ -1,4 +1,4 @@
-class CreatePostDetails < ActiveRecord::Migration
+class CreatePostDetails < ActiveRecord::Migration[4.2]
   def change
     create_table :post_details do |t|
       t.belongs_to :post
@@ -6,7 +6,7 @@ class CreatePostDetails < ActiveRecord::Migration
       t.string     :value, size: 512
       t.text       :extra
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :post_details, [:post_id, :key], unique: true
diff --git a/db/migrate/20131017014509_add_post_count_to_categories.rb b/db/migrate/20131017014509_add_post_count_to_categories.rb
index 809eb65e89..c1db909d76 100644
--- a/db/migrate/20131017014509_add_post_count_to_categories.rb
+++ b/db/migrate/20131017014509_add_post_count_to_categories.rb
@@ -1,4 +1,4 @@
-class AddPostCountToCategories < ActiveRecord::Migration
+class AddPostCountToCategories < ActiveRecord::Migration[4.2]
   def up
     add_column :categories, :post_count, :integer, null: false, default: 0
     execute <<SQL
diff --git a/db/migrate/20131017030605_add_latest_to_categories.rb b/db/migrate/20131017030605_add_latest_to_categories.rb
index 305aa6c4e1..9dfb9a2e48 100644
--- a/db/migrate/20131017030605_add_latest_to_categories.rb
+++ b/db/migrate/20131017030605_add_latest_to_categories.rb
@@ -1,4 +1,4 @@
-class AddLatestToCategories < ActiveRecord::Migration
+class AddLatestToCategories < ActiveRecord::Migration[4.2]
   def up
     add_column :categories, :latest_post_id, :integer
     add_column :categories, :latest_topic_id, :integer
diff --git a/db/migrate/20131017205954_create_screened_ip_addresses.rb b/db/migrate/20131017205954_create_screened_ip_addresses.rb
index 63968f05ff..aeb2f9bdb1 100644
--- a/db/migrate/20131017205954_create_screened_ip_addresses.rb
+++ b/db/migrate/20131017205954_create_screened_ip_addresses.rb
@@ -1,11 +1,11 @@
-class CreateScreenedIpAddresses < ActiveRecord::Migration
+class CreateScreenedIpAddresses < ActiveRecord::Migration[4.2]
   def change
     create_table :screened_ip_addresses do |t|
       t.column :ip_address, :inet, null: false
       t.integer :action_type, null: false
       t.integer :match_count, null: false, default: 0
       t.datetime :last_match_at
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :screened_ip_addresses, :ip_address, unique: true
     add_index :screened_ip_addresses, :last_match_at
diff --git a/db/migrate/20131018050738_add_position_to_categories.rb b/db/migrate/20131018050738_add_position_to_categories.rb
index 65e90a1d1c..7f45652ed1 100644
--- a/db/migrate/20131018050738_add_position_to_categories.rb
+++ b/db/migrate/20131018050738_add_position_to_categories.rb
@@ -1,4 +1,4 @@
-class AddPositionToCategories < ActiveRecord::Migration
+class AddPositionToCategories < ActiveRecord::Migration[4.2]
   def up
     add_column :categories, :position, :integer
     execute "UPDATE categories SET position = id"
diff --git a/db/migrate/20131022045114_add_uncategorized_category.rb b/db/migrate/20131022045114_add_uncategorized_category.rb
index 953960fd66..4055fefb05 100644
--- a/db/migrate/20131022045114_add_uncategorized_category.rb
+++ b/db/migrate/20131022045114_add_uncategorized_category.rb
@@ -1,4 +1,4 @@
-class AddUncategorizedCategory < ActiveRecord::Migration
+class AddUncategorizedCategory < ActiveRecord::Migration[4.2]
   def up
 
     result = execute "SELECT 1 FROM categories WHERE lower(name) = 'uncategorized'"
@@ -17,7 +17,6 @@ class AddUncategorizedCategory < ActiveRecord::Migration
     execute "INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
              VALUES ('uncategorized_category_id', 3, #{category_id}, now(), now())"
 
-
     execute "DELETE from site_settings where name in ('uncategorized_name', 'uncategorized_text_color', 'uncategorized_color')"
 
     execute "UPDATE topics SET category_id = #{category_id} WHERE archetype = 'regular' AND category_id IS NULL"
diff --git a/db/migrate/20131022151218_create_api_keys.rb b/db/migrate/20131022151218_create_api_keys.rb
index a9f938b838..4976d9fe58 100644
--- a/db/migrate/20131022151218_create_api_keys.rb
+++ b/db/migrate/20131022151218_create_api_keys.rb
@@ -1,11 +1,11 @@
-class CreateApiKeys < ActiveRecord::Migration
+class CreateApiKeys < ActiveRecord::Migration[4.2]
 
   def up
     create_table :api_keys do |t|
       t.string :key, limit: 64, null: false
       t.integer :user_id, null: true
       t.integer :created_by_id
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :api_keys, :key
diff --git a/db/migrate/20131023163509_add_parent_category_id_to_categories.rb b/db/migrate/20131023163509_add_parent_category_id_to_categories.rb
index f4b86f5041..c23d09f39d 100644
--- a/db/migrate/20131023163509_add_parent_category_id_to_categories.rb
+++ b/db/migrate/20131023163509_add_parent_category_id_to_categories.rb
@@ -1,6 +1,5 @@
-class AddParentCategoryIdToCategories < ActiveRecord::Migration
+class AddParentCategoryIdToCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :parent_category_id, :integer
   end
 end
-
diff --git a/db/migrate/20131105101051_add_origin_to_uploads.rb b/db/migrate/20131105101051_add_origin_to_uploads.rb
index dcbe31b12f..d6c63755b4 100644
--- a/db/migrate/20131105101051_add_origin_to_uploads.rb
+++ b/db/migrate/20131105101051_add_origin_to_uploads.rb
@@ -1,4 +1,4 @@
-class AddOriginToUploads < ActiveRecord::Migration
+class AddOriginToUploads < ActiveRecord::Migration[4.2]
   def change
     add_column :uploads, :origin, :string, limit: 1000
   end
diff --git a/db/migrate/20131107154900_rename_banned_to_suspended.rb b/db/migrate/20131107154900_rename_banned_to_suspended.rb
index bf797b1fd5..838863194b 100644
--- a/db/migrate/20131107154900_rename_banned_to_suspended.rb
+++ b/db/migrate/20131107154900_rename_banned_to_suspended.rb
@@ -1,4 +1,4 @@
-class RenameBannedToSuspended < ActiveRecord::Migration
+class RenameBannedToSuspended < ActiveRecord::Migration[4.2]
   def change
     rename_column :users, :banned_at,   :suspended_at
     rename_column :users, :banned_till, :suspended_till
diff --git a/db/migrate/20131114185225_add_participant_count_to_topics.rb b/db/migrate/20131114185225_add_participant_count_to_topics.rb
index 20983e64d9..42dda2a4b0 100644
--- a/db/migrate/20131114185225_add_participant_count_to_topics.rb
+++ b/db/migrate/20131114185225_add_participant_count_to_topics.rb
@@ -1,4 +1,4 @@
-class AddParticipantCountToTopics < ActiveRecord::Migration
+class AddParticipantCountToTopics < ActiveRecord::Migration[4.2]
   def up
     add_column :topics, :participant_count, :integer, default: 1
 
diff --git a/db/migrate/20131115165105_add_edit_reason_to_posts.rb b/db/migrate/20131115165105_add_edit_reason_to_posts.rb
index 1650f9d99a..e84ee09880 100644
--- a/db/migrate/20131115165105_add_edit_reason_to_posts.rb
+++ b/db/migrate/20131115165105_add_edit_reason_to_posts.rb
@@ -1,4 +1,4 @@
-class AddEditReasonToPosts < ActiveRecord::Migration
+class AddEditReasonToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :edit_reason, :string
   end
diff --git a/db/migrate/20131118173159_rename_best_of_to_summary.rb b/db/migrate/20131118173159_rename_best_of_to_summary.rb
index 82a37a700e..777506f513 100644
--- a/db/migrate/20131118173159_rename_best_of_to_summary.rb
+++ b/db/migrate/20131118173159_rename_best_of_to_summary.rb
@@ -1,4 +1,4 @@
-class RenameBestOfToSummary < ActiveRecord::Migration
+class RenameBestOfToSummary < ActiveRecord::Migration[4.2]
   def change
     rename_column :topics, :has_best_of, :has_summary
   end
diff --git a/db/migrate/20131120055018_move_emoji_to_new_location.rb b/db/migrate/20131120055018_move_emoji_to_new_location.rb
index b553369072..1863a7bad1 100644
--- a/db/migrate/20131120055018_move_emoji_to_new_location.rb
+++ b/db/migrate/20131120055018_move_emoji_to_new_location.rb
@@ -1,4 +1,4 @@
-class MoveEmojiToNewLocation < ActiveRecord::Migration
+class MoveEmojiToNewLocation < ActiveRecord::Migration[4.2]
   def up
     execute("update posts set cooked = regexp_replace(cooked, '\(<img[^\>]*)assets\/emoji\/', '\\1plugins\/emoji\/images\/' , 'g') where cooked like '%emoji%'")
   end
diff --git a/db/migrate/20131122064921_increase_twitter_user_id_length.rb b/db/migrate/20131122064921_increase_twitter_user_id_length.rb
index 65cb13ce3e..ab1ee73c0a 100644
--- a/db/migrate/20131122064921_increase_twitter_user_id_length.rb
+++ b/db/migrate/20131122064921_increase_twitter_user_id_length.rb
@@ -1,4 +1,4 @@
-class IncreaseTwitterUserIdLength < ActiveRecord::Migration
+class IncreaseTwitterUserIdLength < ActiveRecord::Migration[4.2]
   def change
     change_column :twitter_user_infos, :twitter_user_id, :bigint
   end
diff --git a/db/migrate/20131206200009_rename_auto_close_days_to_hours.rb b/db/migrate/20131206200009_rename_auto_close_days_to_hours.rb
index 6a1f550e84..f37240a371 100644
--- a/db/migrate/20131206200009_rename_auto_close_days_to_hours.rb
+++ b/db/migrate/20131206200009_rename_auto_close_days_to_hours.rb
@@ -1,4 +1,4 @@
-class RenameAutoCloseDaysToHours < ActiveRecord::Migration
+class RenameAutoCloseDaysToHours < ActiveRecord::Migration[4.2]
   def up
     rename_column :categories, :auto_close_days, :auto_close_hours
     execute "update categories set auto_close_hours = auto_close_hours * 24"
diff --git a/db/migrate/20131209091702_create_post_revisions.rb b/db/migrate/20131209091702_create_post_revisions.rb
index 7d12d8cb88..0cc684cf85 100644
--- a/db/migrate/20131209091702_create_post_revisions.rb
+++ b/db/migrate/20131209091702_create_post_revisions.rb
@@ -1,11 +1,11 @@
-class CreatePostRevisions < ActiveRecord::Migration
+class CreatePostRevisions < ActiveRecord::Migration[4.2]
   def up
     create_table :post_revisions do |t|
       t.belongs_to :user
       t.belongs_to :post
       t.text :modifications
       t.integer :number
-      t.timestamps
+      t.timestamps null: false
     end
 
     execute "INSERT INTO post_revisions (user_id, post_id, modifications, number, created_at, updated_at)
diff --git a/db/migrate/20131209091742_create_topic_revisions.rb b/db/migrate/20131209091742_create_topic_revisions.rb
index a6bddd046d..ecbb4e2c37 100644
--- a/db/migrate/20131209091742_create_topic_revisions.rb
+++ b/db/migrate/20131209091742_create_topic_revisions.rb
@@ -1,11 +1,11 @@
-class CreateTopicRevisions < ActiveRecord::Migration
+class CreateTopicRevisions < ActiveRecord::Migration[4.2]
   def up
     create_table :topic_revisions do |t|
       t.belongs_to :user
       t.belongs_to :topic
       t.text :modifications
       t.integer :number
-      t.timestamps
+      t.timestamps null: false
     end
 
     execute "INSERT INTO topic_revisions (user_id, topic_id, modifications, number, created_at, updated_at)
diff --git a/db/migrate/20131210163702_add_word_count_to_posts.rb b/db/migrate/20131210163702_add_word_count_to_posts.rb
index f0436ef830..6f008f8604 100644
--- a/db/migrate/20131210163702_add_word_count_to_posts.rb
+++ b/db/migrate/20131210163702_add_word_count_to_posts.rb
@@ -1,4 +1,4 @@
-class AddWordCountToPosts < ActiveRecord::Migration
+class AddWordCountToPosts < ActiveRecord::Migration[4.2]
   def up
     add_column :posts, :word_count, :integer
     add_column :topics, :word_count, :integer
diff --git a/db/migrate/20131210181901_migrate_word_counts.rb b/db/migrate/20131210181901_migrate_word_counts.rb
index 64e05aae99..1731e2cefd 100644
--- a/db/migrate/20131210181901_migrate_word_counts.rb
+++ b/db/migrate/20131210181901_migrate_word_counts.rb
@@ -1,8 +1,8 @@
-class MigrateWordCounts < ActiveRecord::Migration
+class MigrateWordCounts < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
 
   def up
-    post_ids = execute("SELECT id FROM posts WHERE word_count IS NULL LIMIT 500").map {|r| r['id'].to_i }
+    post_ids = execute("SELECT id FROM posts WHERE word_count IS NULL LIMIT 500").map { |r| r['id'].to_i }
     while post_ids.length > 0
       3.times do
         begin
@@ -12,10 +12,10 @@ class MigrateWordCounts < ActiveRecord::Migration
           # Deadlock. Try again, up to 3 times.
         end
       end
-      post_ids = execute("SELECT id FROM posts WHERE word_count IS NULL LIMIT 500").map {|r| r['id'].to_i }
+      post_ids = execute("SELECT id FROM posts WHERE word_count IS NULL LIMIT 500").map { |r| r['id'].to_i }
     end
 
-    topic_ids = execute("SELECT id FROM topics WHERE word_count IS NULL LIMIT 500").map {|r| r['id'].to_i }
+    topic_ids = execute("SELECT id FROM topics WHERE word_count IS NULL LIMIT 500").map { |r| r['id'].to_i }
     while topic_ids.length > 0
       3.times do
         begin
@@ -25,7 +25,7 @@ class MigrateWordCounts < ActiveRecord::Migration
           # Deadlock. Try again, up to 3 times.
         end
       end
-      topic_ids = execute("SELECT id FROM topics WHERE word_count IS NULL LIMIT 500").map {|r| r['id'].to_i }
+      topic_ids = execute("SELECT id FROM topics WHERE word_count IS NULL LIMIT 500").map { |r| r['id'].to_i }
     end
 
   end
diff --git a/db/migrate/20131210234530_rename_version_column.rb b/db/migrate/20131210234530_rename_version_column.rb
index 04f811e7dc..f6271fc83f 100644
--- a/db/migrate/20131210234530_rename_version_column.rb
+++ b/db/migrate/20131210234530_rename_version_column.rb
@@ -1,4 +1,4 @@
-class RenameVersionColumn < ActiveRecord::Migration
+class RenameVersionColumn < ActiveRecord::Migration[4.2]
 
   def change
     add_column :posts, :version, :integer, default: 1, null: false
diff --git a/db/migrate/20131212225511_add_post_count_stats_columns_to_categories.rb b/db/migrate/20131212225511_add_post_count_stats_columns_to_categories.rb
index 4c42074a2d..73466e65e0 100644
--- a/db/migrate/20131212225511_add_post_count_stats_columns_to_categories.rb
+++ b/db/migrate/20131212225511_add_post_count_stats_columns_to_categories.rb
@@ -1,4 +1,4 @@
-class AddPostCountStatsColumnsToCategories < ActiveRecord::Migration
+class AddPostCountStatsColumnsToCategories < ActiveRecord::Migration[4.2]
   def change
     change_table :categories do |t|
       t.integer :posts_year
diff --git a/db/migrate/20131216164557_make_position_nullable_in_categories.rb b/db/migrate/20131216164557_make_position_nullable_in_categories.rb
index 9b7dc619ac..d47d852f0b 100644
--- a/db/migrate/20131216164557_make_position_nullable_in_categories.rb
+++ b/db/migrate/20131216164557_make_position_nullable_in_categories.rb
@@ -1,4 +1,4 @@
-class MakePositionNullableInCategories < ActiveRecord::Migration
+class MakePositionNullableInCategories < ActiveRecord::Migration[4.2]
   def up
     change_column :categories, :position, :integer, null: true
   end
diff --git a/db/migrate/20131217174004_create_topic_embeds.rb b/db/migrate/20131217174004_create_topic_embeds.rb
index d887ff890b..53be7fff28 100644
--- a/db/migrate/20131217174004_create_topic_embeds.rb
+++ b/db/migrate/20131217174004_create_topic_embeds.rb
@@ -1,11 +1,11 @@
-class CreateTopicEmbeds < ActiveRecord::Migration
+class CreateTopicEmbeds < ActiveRecord::Migration[4.2]
   def change
     create_table :topic_embeds, force: true do |t|
       t.integer :topic_id, null: false
       t.integer :post_id, null: false
       t.string :embed_url, null: false
       t.string :content_sha1, null: false, limit: 40
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :topic_embeds, :embed_url, unique: true
diff --git a/db/migrate/20131219203905_add_cook_method_to_posts.rb b/db/migrate/20131219203905_add_cook_method_to_posts.rb
index 5549082059..987349d345 100644
--- a/db/migrate/20131219203905_add_cook_method_to_posts.rb
+++ b/db/migrate/20131219203905_add_cook_method_to_posts.rb
@@ -1,4 +1,4 @@
-class AddCookMethodToPosts < ActiveRecord::Migration
+class AddCookMethodToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :cook_method, :integer, default: 1, null: false
   end
diff --git a/db/migrate/20131223171005_create_top_topics.rb b/db/migrate/20131223171005_create_top_topics.rb
index 974928c96d..af3be25483 100644
--- a/db/migrate/20131223171005_create_top_topics.rb
+++ b/db/migrate/20131223171005_create_top_topics.rb
@@ -1,4 +1,4 @@
-class CreateTopTopics < ActiveRecord::Migration
+class CreateTopTopics < ActiveRecord::Migration[4.2]
   PERIODS = [:yearly, :monthly, :weekly, :daily]
   SORT_ORDERS = [:posts, :views, :likes]
 
diff --git a/db/migrate/20131227164338_add_scores_to_top_topics.rb b/db/migrate/20131227164338_add_scores_to_top_topics.rb
index e9bf28fb3c..4245057c82 100644
--- a/db/migrate/20131227164338_add_scores_to_top_topics.rb
+++ b/db/migrate/20131227164338_add_scores_to_top_topics.rb
@@ -1,4 +1,4 @@
-class AddScoresToTopTopics < ActiveRecord::Migration
+class AddScoresToTopTopics < ActiveRecord::Migration[4.2]
   def change
     [:daily, :weekly, :monthly, :yearly].each do |period|
       add_column :top_topics, "#{period}_score".to_sym, :float
diff --git a/db/migrate/20131229221725_add_watch_new_topics_to_users.rb b/db/migrate/20131229221725_add_watch_new_topics_to_users.rb
index 4d18f69453..9c3105ad8b 100644
--- a/db/migrate/20131229221725_add_watch_new_topics_to_users.rb
+++ b/db/migrate/20131229221725_add_watch_new_topics_to_users.rb
@@ -1,4 +1,4 @@
-class AddWatchNewTopicsToUsers < ActiveRecord::Migration
+class AddWatchNewTopicsToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :watch_new_topics, :boolean, default: false, null: false
   end
diff --git a/db/migrate/20131230010239_add_last_emailed_post_number_to_topic_user.rb b/db/migrate/20131230010239_add_last_emailed_post_number_to_topic_user.rb
index 8d2e2d2a96..b49bf2b4c2 100644
--- a/db/migrate/20131230010239_add_last_emailed_post_number_to_topic_user.rb
+++ b/db/migrate/20131230010239_add_last_emailed_post_number_to_topic_user.rb
@@ -1,4 +1,4 @@
-class AddLastEmailedPostNumberToTopicUser < ActiveRecord::Migration
+class AddLastEmailedPostNumberToTopicUser < ActiveRecord::Migration[4.2]
   def change
     add_column :topic_users, :last_emailed_post_number, :integer
   end
diff --git a/db/migrate/20140101235747_add_category_users.rb b/db/migrate/20140101235747_add_category_users.rb
index 57841fe7fd..11fc4bfffe 100644
--- a/db/migrate/20140101235747_add_category_users.rb
+++ b/db/migrate/20140101235747_add_category_users.rb
@@ -1,4 +1,4 @@
-class AddCategoryUsers < ActiveRecord::Migration
+class AddCategoryUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :category_users do |t|
       t.column :category_id, :integer, null: false
diff --git a/db/migrate/20140102104229_add_alias_level_to_groups.rb b/db/migrate/20140102104229_add_alias_level_to_groups.rb
index 9cee03f581..64106fdf69 100644
--- a/db/migrate/20140102104229_add_alias_level_to_groups.rb
+++ b/db/migrate/20140102104229_add_alias_level_to_groups.rb
@@ -1,4 +1,4 @@
-class AddAliasLevelToGroups < ActiveRecord::Migration
+class AddAliasLevelToGroups < ActiveRecord::Migration[4.2]
   def change
     add_column :groups, :alias_level, :integer, default: 0
   end
diff --git a/db/migrate/20140102194802_remove_default_from_external_links_in_new_tab.rb b/db/migrate/20140102194802_remove_default_from_external_links_in_new_tab.rb
index b18afe4c75..af05478d6f 100644
--- a/db/migrate/20140102194802_remove_default_from_external_links_in_new_tab.rb
+++ b/db/migrate/20140102194802_remove_default_from_external_links_in_new_tab.rb
@@ -1,4 +1,4 @@
-class RemoveDefaultFromExternalLinksInNewTab < ActiveRecord::Migration
+class RemoveDefaultFromExternalLinksInNewTab < ActiveRecord::Migration[4.2]
   def up
     change_column_default :users, :external_links_in_new_tab, nil
   end
diff --git a/db/migrate/20140107220141_remove_enable_wide_category_list.rb b/db/migrate/20140107220141_remove_enable_wide_category_list.rb
index 80850969f5..0d5f52112f 100644
--- a/db/migrate/20140107220141_remove_enable_wide_category_list.rb
+++ b/db/migrate/20140107220141_remove_enable_wide_category_list.rb
@@ -1,4 +1,4 @@
-class RemoveEnableWideCategoryList < ActiveRecord::Migration
+class RemoveEnableWideCategoryList < ActiveRecord::Migration[4.2]
   def up
     execute "DELETE FROM site_settings WHERE name = 'enable_wide_category_list'"
   end
diff --git a/db/migrate/20140109205940_rename_favorites_to_starred.rb b/db/migrate/20140109205940_rename_favorites_to_starred.rb
index ec59b71e7a..bdfc6b505f 100644
--- a/db/migrate/20140109205940_rename_favorites_to_starred.rb
+++ b/db/migrate/20140109205940_rename_favorites_to_starred.rb
@@ -1,4 +1,4 @@
-class RenameFavoritesToStarred < ActiveRecord::Migration
+class RenameFavoritesToStarred < ActiveRecord::Migration[4.2]
   def up
     execute "UPDATE site_settings SET name = 'max_stars_per_day' where name = 'max_favorites_per_day'"
     execute "UPDATE site_settings SET value = REPLACE(value, '|favorited', '|starred') where name = 'top_menu'"
diff --git a/db/migrate/20140116170655_drop_hot_topics.rb b/db/migrate/20140116170655_drop_hot_topics.rb
index 8042ee06fe..77caed3469 100644
--- a/db/migrate/20140116170655_drop_hot_topics.rb
+++ b/db/migrate/20140116170655_drop_hot_topics.rb
@@ -1,4 +1,4 @@
-class DropHotTopics < ActiveRecord::Migration
+class DropHotTopics < ActiveRecord::Migration[4.2]
   def change
     drop_table :hot_topics
   end
diff --git a/db/migrate/20140120155706_add_lounge_category.rb b/db/migrate/20140120155706_add_lounge_category.rb
index b43b8b97e1..0dac6e7b29 100644
--- a/db/migrate/20140120155706_add_lounge_category.rb
+++ b/db/migrate/20140120155706_add_lounge_category.rb
@@ -1,4 +1,4 @@
-class AddLoungeCategory < ActiveRecord::Migration
+class AddLoungeCategory < ActiveRecord::Migration[4.2]
   def up
     return if Rails.env.test?
 
diff --git a/db/migrate/20140121204628_add_invalidated_at_to_invites.rb b/db/migrate/20140121204628_add_invalidated_at_to_invites.rb
index 7ce133dea5..2c7508d6e1 100644
--- a/db/migrate/20140121204628_add_invalidated_at_to_invites.rb
+++ b/db/migrate/20140121204628_add_invalidated_at_to_invites.rb
@@ -1,4 +1,4 @@
-class AddInvalidatedAtToInvites < ActiveRecord::Migration
+class AddInvalidatedAtToInvites < ActiveRecord::Migration[4.2]
   def change
     add_column :invites, :invalidated_at, :datetime
   end
diff --git a/db/migrate/20140122043508_add_meta_category.rb b/db/migrate/20140122043508_add_meta_category.rb
index 1e17de6f46..2b42b81643 100644
--- a/db/migrate/20140122043508_add_meta_category.rb
+++ b/db/migrate/20140122043508_add_meta_category.rb
@@ -1,4 +1,4 @@
-class AddMetaCategory < ActiveRecord::Migration
+class AddMetaCategory < ActiveRecord::Migration[4.2]
   def up
     return if Rails.env.test?
 
diff --git a/db/migrate/20140124202427_add_posts_read_to_user_visits.rb b/db/migrate/20140124202427_add_posts_read_to_user_visits.rb
index 5315f07ba7..aa8492d397 100644
--- a/db/migrate/20140124202427_add_posts_read_to_user_visits.rb
+++ b/db/migrate/20140124202427_add_posts_read_to_user_visits.rb
@@ -1,4 +1,4 @@
-class AddPostsReadToUserVisits < ActiveRecord::Migration
+class AddPostsReadToUserVisits < ActiveRecord::Migration[4.2]
   def up
     add_column :user_visits, :posts_read, :integer, default: 0
 
diff --git a/db/migrate/20140129164541_remove_category_hotness.rb b/db/migrate/20140129164541_remove_category_hotness.rb
index 9eaaed1492..af127eaacb 100644
--- a/db/migrate/20140129164541_remove_category_hotness.rb
+++ b/db/migrate/20140129164541_remove_category_hotness.rb
@@ -1,4 +1,4 @@
-class RemoveCategoryHotness < ActiveRecord::Migration
+class RemoveCategoryHotness < ActiveRecord::Migration[4.2]
   def change
     remove_column :categories, :hotness
   end
diff --git a/db/migrate/20140206044818_add_locale_to_user.rb b/db/migrate/20140206044818_add_locale_to_user.rb
index c0f2431b3e..8771039c50 100644
--- a/db/migrate/20140206044818_add_locale_to_user.rb
+++ b/db/migrate/20140206044818_add_locale_to_user.rb
@@ -1,4 +1,4 @@
-class AddLocaleToUser < ActiveRecord::Migration
+class AddLocaleToUser < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :locale, :string, limit: 10
   end
diff --git a/db/migrate/20140206195001_add_defaults_to_category_posts_and_topics_fields.rb b/db/migrate/20140206195001_add_defaults_to_category_posts_and_topics_fields.rb
index 28426a572b..e5c7ddbdd3 100644
--- a/db/migrate/20140206195001_add_defaults_to_category_posts_and_topics_fields.rb
+++ b/db/migrate/20140206195001_add_defaults_to_category_posts_and_topics_fields.rb
@@ -1,4 +1,4 @@
-class AddDefaultsToCategoryPostsAndTopicsFields < ActiveRecord::Migration
+class AddDefaultsToCategoryPostsAndTopicsFields < ActiveRecord::Migration[4.2]
   def change
     change_column_default :categories, :posts_week,   0
     change_column_default :categories, :posts_month,  0
diff --git a/db/migrate/20140206215029_add_mailing_list_mode_to_users.rb b/db/migrate/20140206215029_add_mailing_list_mode_to_users.rb
index c4de0991fd..d9a0c0d940 100644
--- a/db/migrate/20140206215029_add_mailing_list_mode_to_users.rb
+++ b/db/migrate/20140206215029_add_mailing_list_mode_to_users.rb
@@ -1,4 +1,4 @@
-class AddMailingListModeToUsers < ActiveRecord::Migration
+class AddMailingListModeToUsers < ActiveRecord::Migration[4.2]
   def change
     rename_column :users, :watch_new_topics, :mailing_list_mode
   end
diff --git a/db/migrate/20140210194146_add_primary_group_id_to_users.rb b/db/migrate/20140210194146_add_primary_group_id_to_users.rb
index 84d328ff2c..71562daba9 100644
--- a/db/migrate/20140210194146_add_primary_group_id_to_users.rb
+++ b/db/migrate/20140210194146_add_primary_group_id_to_users.rb
@@ -1,4 +1,4 @@
-class AddPrimaryGroupIdToUsers < ActiveRecord::Migration
+class AddPrimaryGroupIdToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :primary_group_id, :integer, null: true
   end
diff --git a/db/migrate/20140211230222_move_cas_settings.rb b/db/migrate/20140211230222_move_cas_settings.rb
index 0de988fbfa..d2775e2f30 100644
--- a/db/migrate/20140211230222_move_cas_settings.rb
+++ b/db/migrate/20140211230222_move_cas_settings.rb
@@ -1,26 +1,26 @@
-class MoveCasSettings < ActiveRecord::Migration
+class MoveCasSettings < ActiveRecord::Migration[4.2]
   def change
     #As part of removing the build in CAS authentication we should
     #convert the data over to be used by the plugin.
     cas_hostname = SiteSetting.find_by(name: "cas_hostname")
     cas_sso_hostname = SiteSetting.find_by(name: "cas_sso_hostname")
-    if cas_hostname  && ! cas_sso_hostname
+    if cas_hostname && ! cas_sso_hostname
       #convert the setting over for use by the plugin
       cas_hostname.update_attribute(:name, 'cas_sso_hostname')
-    elsif cas_hostname  && cas_sso_hostname
+    elsif cas_hostname && cas_sso_hostname
       #copy the setting over for use by the plugin and delete the original setting
-      cas_sso_hostname.update_attribute(:value,cas_hostname.value)
+      cas_sso_hostname.update_attribute(:value, cas_hostname.value)
       cas_hostname.destroy
     end
 
     cas_domainname = SiteSetting.find_by(name: "cas_domainname")
     cas_sso_email_domain = SiteSetting.find_by(name: "cas_sso_email_domain")
-    if cas_domainname  && ! cas_sso_email_domain
+    if cas_domainname && ! cas_sso_email_domain
       #convert the setting over for use by the plugin
       cas_domainname.update_attribute(:name, 'cas_sso_email_domain')
-    elsif cas_domainname  && cas_sso_email_domain
+    elsif cas_domainname && cas_sso_email_domain
       #copy the setting over for use by the plugin and delete the original setting
-      cas_sso_email_domain.update_attribute(:value,cas_domainname.value)
+      cas_sso_email_domain.update_attribute(:value, cas_domainname.value)
       cas_domainname.destroy
     end
 
@@ -29,7 +29,7 @@ class MoveCasSettings < ActiveRecord::Migration
       cas_logins.destroy
     end
 
-    #remove the unused table
+   #remove the unused table
    drop_table :cas_user_infos
 
   end
diff --git a/db/migrate/20140211234523_add_targets_topic_to_post_actions.rb b/db/migrate/20140211234523_add_targets_topic_to_post_actions.rb
index 38355175b4..5da97fe984 100644
--- a/db/migrate/20140211234523_add_targets_topic_to_post_actions.rb
+++ b/db/migrate/20140211234523_add_targets_topic_to_post_actions.rb
@@ -1,4 +1,4 @@
-class AddTargetsTopicToPostActions < ActiveRecord::Migration
+class AddTargetsTopicToPostActions < ActiveRecord::Migration[4.2]
   def change
     add_column :post_actions, :targets_topic, :boolean, default: false
   end
diff --git a/db/migrate/20140214151255_add_skipped_to_email_logs.rb b/db/migrate/20140214151255_add_skipped_to_email_logs.rb
index e661545365..f24b2fc09f 100644
--- a/db/migrate/20140214151255_add_skipped_to_email_logs.rb
+++ b/db/migrate/20140214151255_add_skipped_to_email_logs.rb
@@ -1,4 +1,4 @@
-class AddSkippedToEmailLogs < ActiveRecord::Migration
+class AddSkippedToEmailLogs < ActiveRecord::Migration[4.2]
   def change
     add_column :email_logs, :skipped, :boolean, default: :false
     add_column :email_logs, :skipped_reason, :string
diff --git a/db/migrate/20140220160510_rename_site_settings.rb b/db/migrate/20140220160510_rename_site_settings.rb
index 1a3395c865..78da03786e 100644
--- a/db/migrate/20140220160510_rename_site_settings.rb
+++ b/db/migrate/20140220160510_rename_site_settings.rb
@@ -1,4 +1,4 @@
-class RenameSiteSettings < ActiveRecord::Migration
+class RenameSiteSettings < ActiveRecord::Migration[4.2]
 
   def up
     execute "UPDATE site_settings SET name = 'allow_restore' WHERE name = 'allow_import'"
diff --git a/db/migrate/20140220163213_rename_delete_user_max_age.rb b/db/migrate/20140220163213_rename_delete_user_max_age.rb
index 79a9616af5..5906f36f79 100644
--- a/db/migrate/20140220163213_rename_delete_user_max_age.rb
+++ b/db/migrate/20140220163213_rename_delete_user_max_age.rb
@@ -1,4 +1,4 @@
-class RenameDeleteUserMaxAge < ActiveRecord::Migration
+class RenameDeleteUserMaxAge < ActiveRecord::Migration[4.2]
   def change
     execute "UPDATE site_settings SET name = 'delete_user_max_post_age' WHERE name = 'delete_user_max_age'"
   end
diff --git a/db/migrate/20140224232712_add_profile_background_to_user.rb b/db/migrate/20140224232712_add_profile_background_to_user.rb
index 83c0e23149..ad6f4366f8 100644
--- a/db/migrate/20140224232712_add_profile_background_to_user.rb
+++ b/db/migrate/20140224232712_add_profile_background_to_user.rb
@@ -1,4 +1,4 @@
-class AddProfileBackgroundToUser < ActiveRecord::Migration
+class AddProfileBackgroundToUser < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :profile_background, :string, limit: 255
   end
diff --git a/db/migrate/20140224232913_add_single_sign_on_records.rb b/db/migrate/20140224232913_add_single_sign_on_records.rb
index 8daa750a7f..994a5cfcee 100644
--- a/db/migrate/20140224232913_add_single_sign_on_records.rb
+++ b/db/migrate/20140224232913_add_single_sign_on_records.rb
@@ -1,10 +1,10 @@
-class AddSingleSignOnRecords < ActiveRecord::Migration
+class AddSingleSignOnRecords < ActiveRecord::Migration[4.2]
   def change
     create_table :single_sign_on_records do |t|
       t.integer :user_id, null: false
       t.string :external_id, null: false, length: 255
       t.text :last_payload, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :single_sign_on_records, :external_id, unique: true
diff --git a/db/migrate/20140227104930_add_custom_email_in_to_categories.rb b/db/migrate/20140227104930_add_custom_email_in_to_categories.rb
index 7d3cac2c5f..007c54e165 100644
--- a/db/migrate/20140227104930_add_custom_email_in_to_categories.rb
+++ b/db/migrate/20140227104930_add_custom_email_in_to_categories.rb
@@ -1,12 +1,12 @@
-class AddCustomEmailInToCategories < ActiveRecord::Migration
+class AddCustomEmailInToCategories < ActiveRecord::Migration[4.2]
   def up
-  	add_column :categories, :email_in, :string, null: true
-  	add_column :categories, :email_in_allow_strangers, :boolean, default: false
-  	add_index :categories, :email_in, unique: true
+    add_column :categories, :email_in, :string, null: true
+    add_column :categories, :email_in_allow_strangers, :boolean, default: false
+    add_index :categories, :email_in, unique: true
   end
   def down
-  	remove_column :categories, :email_in
-  	remove_column :categories, :email_in_allow_strangers
-  	remove_index :categories, :email_in
+    remove_column :categories, :email_in
+    remove_column :categories, :email_in_allow_strangers
+    remove_index :categories, :email_in
   end
 end
diff --git a/db/migrate/20140227201005_add_staff_category.rb b/db/migrate/20140227201005_add_staff_category.rb
index c8b7075b30..67a8480601 100644
--- a/db/migrate/20140227201005_add_staff_category.rb
+++ b/db/migrate/20140227201005_add_staff_category.rb
@@ -1,4 +1,4 @@
-class AddStaffCategory < ActiveRecord::Migration
+class AddStaffCategory < ActiveRecord::Migration[4.2]
   def up
     return if Rails.env.test?
 
diff --git a/db/migrate/20140228005443_add_external_username_to_single_sign_on_record.rb b/db/migrate/20140228005443_add_external_username_to_single_sign_on_record.rb
index 61a1a1bb72..b450c55260 100644
--- a/db/migrate/20140228005443_add_external_username_to_single_sign_on_record.rb
+++ b/db/migrate/20140228005443_add_external_username_to_single_sign_on_record.rb
@@ -1,4 +1,4 @@
-class AddExternalUsernameToSingleSignOnRecord < ActiveRecord::Migration
+class AddExternalUsernameToSingleSignOnRecord < ActiveRecord::Migration[4.2]
   def change
     add_column :single_sign_on_records, :external_username, :string
   end
diff --git a/db/migrate/20140228173431_add_external_email_and_external_name_to_single_sign_on_record.rb b/db/migrate/20140228173431_add_external_email_and_external_name_to_single_sign_on_record.rb
index a56a611d89..720a1b5e4e 100644
--- a/db/migrate/20140228173431_add_external_email_and_external_name_to_single_sign_on_record.rb
+++ b/db/migrate/20140228173431_add_external_email_and_external_name_to_single_sign_on_record.rb
@@ -1,4 +1,4 @@
-class AddExternalEmailAndExternalNameToSingleSignOnRecord < ActiveRecord::Migration
+class AddExternalEmailAndExternalNameToSingleSignOnRecord < ActiveRecord::Migration[4.2]
   def change
     add_column :single_sign_on_records, :external_email, :string
     add_column :single_sign_on_records, :external_name, :string
diff --git a/db/migrate/20140228205743_add_admin_only_to_user_histories.rb b/db/migrate/20140228205743_add_admin_only_to_user_histories.rb
index 7e55ab6a07..1a9e3a7d0b 100644
--- a/db/migrate/20140228205743_add_admin_only_to_user_histories.rb
+++ b/db/migrate/20140228205743_add_admin_only_to_user_histories.rb
@@ -1,4 +1,4 @@
-class AddAdminOnlyToUserHistories < ActiveRecord::Migration
+class AddAdminOnlyToUserHistories < ActiveRecord::Migration[4.2]
   def up
     add_column :user_histories, :admin_only, :boolean, default: false
     execute "UPDATE user_histories SET admin_only = true WHERE action = #{UserHistory.actions[:change_site_setting]}"
diff --git a/db/migrate/20140303185354_add_new_since_to_user_stats.rb b/db/migrate/20140303185354_add_new_since_to_user_stats.rb
index f0e1a071cd..c510ea6173 100644
--- a/db/migrate/20140303185354_add_new_since_to_user_stats.rb
+++ b/db/migrate/20140303185354_add_new_since_to_user_stats.rb
@@ -1,4 +1,4 @@
-class AddNewSinceToUserStats < ActiveRecord::Migration
+class AddNewSinceToUserStats < ActiveRecord::Migration[4.2]
   def change
     add_column :user_stats, :new_since, :datetime
     execute "UPDATE user_stats AS us
diff --git a/db/migrate/20140304200606_create_badge_types.rb b/db/migrate/20140304200606_create_badge_types.rb
index e580c3a1e9..4c3d460dce 100644
--- a/db/migrate/20140304200606_create_badge_types.rb
+++ b/db/migrate/20140304200606_create_badge_types.rb
@@ -1,10 +1,10 @@
-class CreateBadgeTypes < ActiveRecord::Migration
+class CreateBadgeTypes < ActiveRecord::Migration[4.2]
   def change
     create_table :badge_types do |t|
       t.string :name, null: false
       t.string :color_hexcode, null: false
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :badge_types, [:name], unique: true
diff --git a/db/migrate/20140304201403_create_badges.rb b/db/migrate/20140304201403_create_badges.rb
index 1fbc9b52af..040468e042 100644
--- a/db/migrate/20140304201403_create_badges.rb
+++ b/db/migrate/20140304201403_create_badges.rb
@@ -1,4 +1,4 @@
-class CreateBadges < ActiveRecord::Migration
+class CreateBadges < ActiveRecord::Migration[4.2]
   def change
     create_table :badges do |t|
       t.string :name, null: false
@@ -6,7 +6,7 @@ class CreateBadges < ActiveRecord::Migration
       t.integer :badge_type_id, index: true, null: false
       t.integer :grant_count, null: false, default: 0
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :badges, [:name], unique: true
diff --git a/db/migrate/20140305100909_create_user_badges.rb b/db/migrate/20140305100909_create_user_badges.rb
index 52afead5ad..bb26815e72 100644
--- a/db/migrate/20140305100909_create_user_badges.rb
+++ b/db/migrate/20140305100909_create_user_badges.rb
@@ -1,4 +1,4 @@
-class CreateUserBadges < ActiveRecord::Migration
+class CreateUserBadges < ActiveRecord::Migration[4.2]
   def change
     create_table :user_badges do |t|
       t.integer :badge_id, null: false
diff --git a/db/migrate/20140306223522_move_topic_revisions_to_post_revisions.rb b/db/migrate/20140306223522_move_topic_revisions_to_post_revisions.rb
index 2f5cd70b08..3f810cb452 100644
--- a/db/migrate/20140306223522_move_topic_revisions_to_post_revisions.rb
+++ b/db/migrate/20140306223522_move_topic_revisions_to_post_revisions.rb
@@ -1,4 +1,4 @@
-class MoveTopicRevisionsToPostRevisions < ActiveRecord::Migration
+class MoveTopicRevisionsToPostRevisions < ActiveRecord::Migration[4.2]
   def up
     execute <<SQL
 
diff --git a/db/migrate/20140318150412_add_excerpt_to_topics.rb b/db/migrate/20140318150412_add_excerpt_to_topics.rb
index 35283cb47b..1bb239a8ad 100644
--- a/db/migrate/20140318150412_add_excerpt_to_topics.rb
+++ b/db/migrate/20140318150412_add_excerpt_to_topics.rb
@@ -1,8 +1,8 @@
-class AddExcerptToTopics < ActiveRecord::Migration
+class AddExcerptToTopics < ActiveRecord::Migration[4.2]
   def up
     add_column :topics, :excerpt, :string, limit: 1000
 
-    topic_ids = execute("SELECT id FROM topics WHERE pinned_at IS NOT NULL").map {|r| r['id'].to_i }
+    topic_ids = execute("SELECT id FROM topics WHERE pinned_at IS NOT NULL").map { |r| r['id'].to_i }
     topic_ids.each do |topic_id|
       cooked = execute("SELECT cooked FROM posts WHERE topic_id = #{topic_id} ORDER BY post_number ASC LIMIT 1")[0]['cooked']
       if cooked
diff --git a/db/migrate/20140318203559_add_created_at_index_to_posts.rb b/db/migrate/20140318203559_add_created_at_index_to_posts.rb
index 5c6d9e6619..9419f95789 100644
--- a/db/migrate/20140318203559_add_created_at_index_to_posts.rb
+++ b/db/migrate/20140318203559_add_created_at_index_to_posts.rb
@@ -1,4 +1,4 @@
-class AddCreatedAtIndexToPosts < ActiveRecord::Migration
+class AddCreatedAtIndexToPosts < ActiveRecord::Migration[4.2]
   def up
     execute "CREATE INDEX idx_posts_created_at_topic_id ON posts(created_at, topic_id) WHERE deleted_at IS NULL"
     add_column :categories, :topics_day, :integer, default: 0
diff --git a/db/migrate/20140320042653_facebook_user_infos_username_can_be_nil.rb b/db/migrate/20140320042653_facebook_user_infos_username_can_be_nil.rb
index 358467203b..860473d5ee 100644
--- a/db/migrate/20140320042653_facebook_user_infos_username_can_be_nil.rb
+++ b/db/migrate/20140320042653_facebook_user_infos_username_can_be_nil.rb
@@ -1,4 +1,4 @@
-class FacebookUserInfosUsernameCanBeNil < ActiveRecord::Migration
+class FacebookUserInfosUsernameCanBeNil < ActiveRecord::Migration[4.2]
   def change
     change_column "facebook_user_infos", :username, :string, null: true
   end
diff --git a/db/migrate/20140402201432_make_content_sha1_nullable.rb b/db/migrate/20140402201432_make_content_sha1_nullable.rb
index 29b7572edc..2af4e12b4e 100644
--- a/db/migrate/20140402201432_make_content_sha1_nullable.rb
+++ b/db/migrate/20140402201432_make_content_sha1_nullable.rb
@@ -1,5 +1,5 @@
-class MakeContentSha1Nullable < ActiveRecord::Migration
+class MakeContentSha1Nullable < ActiveRecord::Migration[4.2]
   def change
-    change_column :topic_embeds, :content_sha1, :string, :limit => 40, :null => true
+    change_column :topic_embeds, :content_sha1, :string, limit: 40, null: true
   end
 end
diff --git a/db/migrate/20140404143501_add_title_to_topic_links.rb b/db/migrate/20140404143501_add_title_to_topic_links.rb
index 90d142782d..f239bcb1b7 100644
--- a/db/migrate/20140404143501_add_title_to_topic_links.rb
+++ b/db/migrate/20140404143501_add_title_to_topic_links.rb
@@ -1,4 +1,4 @@
-class AddTitleToTopicLinks < ActiveRecord::Migration
+class AddTitleToTopicLinks < ActiveRecord::Migration[4.2]
   def change
     add_column :topic_links, :title, :string
     add_column :topic_links, :crawled_at, :datetime
diff --git a/db/migrate/20140407055830_add_pinned_globally_to_topics.rb b/db/migrate/20140407055830_add_pinned_globally_to_topics.rb
index a450cf1bda..9cb68d34db 100644
--- a/db/migrate/20140407055830_add_pinned_globally_to_topics.rb
+++ b/db/migrate/20140407055830_add_pinned_globally_to_topics.rb
@@ -1,4 +1,4 @@
-class AddPinnedGloballyToTopics < ActiveRecord::Migration
+class AddPinnedGloballyToTopics < ActiveRecord::Migration[4.2]
   def up
     add_column :topics, :pinned_globally, :boolean, null: false, default: false
     execute "UPDATE topics set pinned_globally = 't' where category_id = (
diff --git a/db/migrate/20140407202158_site_setting_comma_to_pipe.rb b/db/migrate/20140407202158_site_setting_comma_to_pipe.rb
index 86fe7d4b63..ae7138820e 100644
--- a/db/migrate/20140407202158_site_setting_comma_to_pipe.rb
+++ b/db/migrate/20140407202158_site_setting_comma_to_pipe.rb
@@ -1,4 +1,4 @@
-class SiteSettingCommaToPipe < ActiveRecord::Migration
+class SiteSettingCommaToPipe < ActiveRecord::Migration[4.2]
   def up
     execute <<SQL
       UPDATE site_settings
diff --git a/db/migrate/20140408061512_add_wiki_to_posts.rb b/db/migrate/20140408061512_add_wiki_to_posts.rb
index 26f38facc6..114954d40d 100644
--- a/db/migrate/20140408061512_add_wiki_to_posts.rb
+++ b/db/migrate/20140408061512_add_wiki_to_posts.rb
@@ -1,4 +1,4 @@
-class AddWikiToPosts < ActiveRecord::Migration
+class AddWikiToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :wiki, :boolean, default: false, null: false
   end
diff --git a/db/migrate/20140408152401_add_default_value_to_top_topic_scores.rb b/db/migrate/20140408152401_add_default_value_to_top_topic_scores.rb
index 7eb230ddd5..5f8a093876 100644
--- a/db/migrate/20140408152401_add_default_value_to_top_topic_scores.rb
+++ b/db/migrate/20140408152401_add_default_value_to_top_topic_scores.rb
@@ -1,4 +1,4 @@
-class AddDefaultValueToTopTopicScores < ActiveRecord::Migration
+class AddDefaultValueToTopTopicScores < ActiveRecord::Migration[4.2]
   def change
     [:daily, :weekly, :monthly, :yearly].each do |period|
       change_column_default :top_topics, "#{period}_score".to_sym, 0
diff --git a/db/migrate/20140415054717_allow_longer_usernames.rb b/db/migrate/20140415054717_allow_longer_usernames.rb
index e93d217643..08ad151827 100644
--- a/db/migrate/20140415054717_allow_longer_usernames.rb
+++ b/db/migrate/20140415054717_allow_longer_usernames.rb
@@ -1,4 +1,4 @@
-class AllowLongerUsernames < ActiveRecord::Migration
+class AllowLongerUsernames < ActiveRecord::Migration[4.2]
   def up
     change_column :users, :username, :string, limit: 60
     change_column :users, :username_lower, :string, limit: 60
diff --git a/db/migrate/20140416202746_create_color_schemes.rb b/db/migrate/20140416202746_create_color_schemes.rb
index e6491c0b96..8d17412484 100644
--- a/db/migrate/20140416202746_create_color_schemes.rb
+++ b/db/migrate/20140416202746_create_color_schemes.rb
@@ -1,4 +1,4 @@
-class CreateColorSchemes < ActiveRecord::Migration
+class CreateColorSchemes < ActiveRecord::Migration[4.2]
   def change
     create_table :color_schemes do |t|
       t.string  :name,         null: false
@@ -7,7 +7,7 @@ class CreateColorSchemes < ActiveRecord::Migration
       t.integer :versioned_id
       t.integer :version,      null: false, default: 1
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/db/migrate/20140416202801_create_color_scheme_colors.rb b/db/migrate/20140416202801_create_color_scheme_colors.rb
index bed6d5fac7..39bfc3da3c 100644
--- a/db/migrate/20140416202801_create_color_scheme_colors.rb
+++ b/db/migrate/20140416202801_create_color_scheme_colors.rb
@@ -1,4 +1,4 @@
-class CreateColorSchemeColors < ActiveRecord::Migration
+class CreateColorSchemeColors < ActiveRecord::Migration[4.2]
   def change
     create_table :color_scheme_colors do |t|
       t.string  :name,            null: false
@@ -6,7 +6,7 @@ class CreateColorSchemeColors < ActiveRecord::Migration
       t.integer :opacity,         null: false, default: 100
       t.integer :color_scheme_id, null: false
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :color_scheme_colors, [:color_scheme_id]
diff --git a/db/migrate/20140416235757_remove_color_hexcode_from_badge_types.rb b/db/migrate/20140416235757_remove_color_hexcode_from_badge_types.rb
index 9a19c17a8f..c666e122c8 100644
--- a/db/migrate/20140416235757_remove_color_hexcode_from_badge_types.rb
+++ b/db/migrate/20140416235757_remove_color_hexcode_from_badge_types.rb
@@ -1,4 +1,4 @@
-class RemoveColorHexcodeFromBadgeTypes < ActiveRecord::Migration
+class RemoveColorHexcodeFromBadgeTypes < ActiveRecord::Migration[4.2]
   def change
     remove_column :badge_types, :color_hexcode, :string
   end
diff --git a/db/migrate/20140421235646_add_user_custom_fields.rb b/db/migrate/20140421235646_add_user_custom_fields.rb
index 59c3658946..2df466bebb 100644
--- a/db/migrate/20140421235646_add_user_custom_fields.rb
+++ b/db/migrate/20140421235646_add_user_custom_fields.rb
@@ -1,10 +1,10 @@
-class AddUserCustomFields < ActiveRecord::Migration
+class AddUserCustomFields < ActiveRecord::Migration[4.2]
   def change
     create_table :user_custom_fields do |t|
       t.integer :user_id, null: false
       t.string :name, limit: 256, null: false
       t.text :value
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :user_custom_fields, [:user_id, :name]
diff --git a/db/migrate/20140422195623_add_visibile_to_groups.rb b/db/migrate/20140422195623_add_visibile_to_groups.rb
index 58f65f6cb9..5d1a6c06d6 100644
--- a/db/migrate/20140422195623_add_visibile_to_groups.rb
+++ b/db/migrate/20140422195623_add_visibile_to_groups.rb
@@ -1,4 +1,4 @@
-class AddVisibileToGroups < ActiveRecord::Migration
+class AddVisibileToGroups < ActiveRecord::Migration[4.2]
   def change
     add_column :groups, :visible, :boolean, default: true, null: false
   end
diff --git a/db/migrate/20140425125742_add_custom_fields.rb b/db/migrate/20140425125742_add_custom_fields.rb
index 3b6c542fde..00d133077c 100644
--- a/db/migrate/20140425125742_add_custom_fields.rb
+++ b/db/migrate/20140425125742_add_custom_fields.rb
@@ -1,24 +1,24 @@
-class AddCustomFields < ActiveRecord::Migration
+class AddCustomFields < ActiveRecord::Migration[4.2]
   def change
     create_table :category_custom_fields do |t|
       t.integer :category_id, null: false
       t.string :name, limit: 256, null: false
       t.text :value
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :group_custom_fields do |t|
       t.integer :group_id, null: false
       t.string :name, limit: 256, null: false
       t.text :value
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :post_custom_fields do |t|
       t.integer :post_id, null: false
       t.string :name, limit: 256, null: false
       t.text :value
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :category_custom_fields, [:category_id, :name]
diff --git a/db/migrate/20140425135354_add_topic_custom_fields.rb b/db/migrate/20140425135354_add_topic_custom_fields.rb
index 4a059f8a62..666ad12f8c 100644
--- a/db/migrate/20140425135354_add_topic_custom_fields.rb
+++ b/db/migrate/20140425135354_add_topic_custom_fields.rb
@@ -1,10 +1,10 @@
-class AddTopicCustomFields < ActiveRecord::Migration
+class AddTopicCustomFields < ActiveRecord::Migration[4.2]
   def change
     create_table :topic_custom_fields do |t|
       t.integer :topic_id, null: false
       t.string :name, limit: 256, null: false
       t.text :value
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :topic_custom_fields, [:topic_id, :name]
diff --git a/db/migrate/20140425172618_add_titleable_to_badges.rb b/db/migrate/20140425172618_add_titleable_to_badges.rb
index 346f3314f4..ad55758100 100644
--- a/db/migrate/20140425172618_add_titleable_to_badges.rb
+++ b/db/migrate/20140425172618_add_titleable_to_badges.rb
@@ -1,4 +1,4 @@
-class AddTitleableToBadges < ActiveRecord::Migration
+class AddTitleableToBadges < ActiveRecord::Migration[4.2]
   def change
     add_column :badges, :allow_title, :boolean, null: false, default: false
   end
diff --git a/db/migrate/20140429175951_add_registration_ip_address_to_users.rb b/db/migrate/20140429175951_add_registration_ip_address_to_users.rb
index 9d1466cd49..9fd8d4bf07 100644
--- a/db/migrate/20140429175951_add_registration_ip_address_to_users.rb
+++ b/db/migrate/20140429175951_add_registration_ip_address_to_users.rb
@@ -1,4 +1,4 @@
-class AddRegistrationIpAddressToUsers < ActiveRecord::Migration
+class AddRegistrationIpAddressToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :registration_ip_address, :inet
   end
diff --git a/db/migrate/20140504174212_increment_reserved_trust_level_badge_ids.rb b/db/migrate/20140504174212_increment_reserved_trust_level_badge_ids.rb
index ff3e00f193..9501f48025 100644
--- a/db/migrate/20140504174212_increment_reserved_trust_level_badge_ids.rb
+++ b/db/migrate/20140504174212_increment_reserved_trust_level_badge_ids.rb
@@ -1,4 +1,4 @@
-class IncrementReservedTrustLevelBadgeIds < ActiveRecord::Migration
+class IncrementReservedTrustLevelBadgeIds < ActiveRecord::Migration[4.2]
   def up
     execute "ALTER SEQUENCE badges_id_seq START WITH 100"
 
diff --git a/db/migrate/20140505145918_add_last_redirected_to_top_at_to_users.rb b/db/migrate/20140505145918_add_last_redirected_to_top_at_to_users.rb
index 8c09b88daf..33dda2c2b8 100644
--- a/db/migrate/20140505145918_add_last_redirected_to_top_at_to_users.rb
+++ b/db/migrate/20140505145918_add_last_redirected_to_top_at_to_users.rb
@@ -1,4 +1,4 @@
-class AddLastRedirectedToTopAtToUsers < ActiveRecord::Migration
+class AddLastRedirectedToTopAtToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :last_redirected_to_top_at, :datetime
   end
diff --git a/db/migrate/20140506200235_remove_seed_color_scheme.rb b/db/migrate/20140506200235_remove_seed_color_scheme.rb
index b27e9dbc20..48cfea4559 100644
--- a/db/migrate/20140506200235_remove_seed_color_scheme.rb
+++ b/db/migrate/20140506200235_remove_seed_color_scheme.rb
@@ -1,4 +1,4 @@
-class RemoveSeedColorScheme < ActiveRecord::Migration
+class RemoveSeedColorScheme < ActiveRecord::Migration[4.2]
   def up
     execute "DELETE FROM color_schemes WHERE id = 1"
     execute "DELETE FROM color_scheme_colors WHERE color_scheme_id = 1"
diff --git a/db/migrate/20140507173327_remove_opacity_from_color_scheme_colors.rb b/db/migrate/20140507173327_remove_opacity_from_color_scheme_colors.rb
index 2b4e31e199..fe8837f291 100644
--- a/db/migrate/20140507173327_remove_opacity_from_color_scheme_colors.rb
+++ b/db/migrate/20140507173327_remove_opacity_from_color_scheme_colors.rb
@@ -1,4 +1,4 @@
-class RemoveOpacityFromColorSchemeColors < ActiveRecord::Migration
+class RemoveOpacityFromColorSchemeColors < ActiveRecord::Migration[4.2]
   def up
     remove_column :color_scheme_colors, :opacity
   end
diff --git a/db/migrate/20140508053815_add_invited_groups.rb b/db/migrate/20140508053815_add_invited_groups.rb
index 09a51ee1ac..7999267db6 100644
--- a/db/migrate/20140508053815_add_invited_groups.rb
+++ b/db/migrate/20140508053815_add_invited_groups.rb
@@ -1,9 +1,9 @@
-class AddInvitedGroups < ActiveRecord::Migration
+class AddInvitedGroups < ActiveRecord::Migration[4.2]
   def change
     create_table :invited_groups do |t|
       t.integer :group_id
       t.integer :invite_id
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/db/migrate/20140515220111_init_fixed_category_positions_value.rb b/db/migrate/20140515220111_init_fixed_category_positions_value.rb
index 96610b505f..f9f454848f 100644
--- a/db/migrate/20140515220111_init_fixed_category_positions_value.rb
+++ b/db/migrate/20140515220111_init_fixed_category_positions_value.rb
@@ -1,4 +1,4 @@
-class InitFixedCategoryPositionsValue < ActiveRecord::Migration
+class InitFixedCategoryPositionsValue < ActiveRecord::Migration[4.2]
   def up
     # Look at existing categories to determine if positions have been specified
     result = Category.exec_sql("SELECT count(*) FROM categories WHERE position IS NOT NULL")
diff --git a/db/migrate/20140520062826_add_multiple_award_to_badges.rb b/db/migrate/20140520062826_add_multiple_award_to_badges.rb
index 4e7fb1bdfa..c9a17886fb 100644
--- a/db/migrate/20140520062826_add_multiple_award_to_badges.rb
+++ b/db/migrate/20140520062826_add_multiple_award_to_badges.rb
@@ -1,4 +1,4 @@
-class AddMultipleAwardToBadges < ActiveRecord::Migration
+class AddMultipleAwardToBadges < ActiveRecord::Migration[4.2]
   def change
     add_column :badges, :multiple_grant, :boolean, default: false, null: false
 
diff --git a/db/migrate/20140520063859_remove_has_custom_avatar_from_user_stats.rb b/db/migrate/20140520063859_remove_has_custom_avatar_from_user_stats.rb
index 66bcb15f96..1973846726 100644
--- a/db/migrate/20140520063859_remove_has_custom_avatar_from_user_stats.rb
+++ b/db/migrate/20140520063859_remove_has_custom_avatar_from_user_stats.rb
@@ -1,4 +1,4 @@
-class RemoveHasCustomAvatarFromUserStats < ActiveRecord::Migration
+class RemoveHasCustomAvatarFromUserStats < ActiveRecord::Migration[4.2]
   def change
     remove_column :user_stats, :has_custom_avatar
   end
diff --git a/db/migrate/20140521192142_create_google_user_infos.rb b/db/migrate/20140521192142_create_google_user_infos.rb
index 28da7b547c..acda8f03de 100644
--- a/db/migrate/20140521192142_create_google_user_infos.rb
+++ b/db/migrate/20140521192142_create_google_user_infos.rb
@@ -1,4 +1,4 @@
-class CreateGoogleUserInfos < ActiveRecord::Migration
+class CreateGoogleUserInfos < ActiveRecord::Migration[4.2]
   def change
     create_table :google_user_infos do |t|
       t.integer :user_id, null: false
@@ -12,7 +12,7 @@ class CreateGoogleUserInfos < ActiveRecord::Migration
       t.string :profile_link
       t.string :picture
 
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :google_user_infos, :user_id, unique: true
     add_index :google_user_infos, :google_user_id, unique: true
diff --git a/db/migrate/20140521220115_google_openid_default_has_changed.rb b/db/migrate/20140521220115_google_openid_default_has_changed.rb
index a9964bafd4..d76718c691 100644
--- a/db/migrate/20140521220115_google_openid_default_has_changed.rb
+++ b/db/migrate/20140521220115_google_openid_default_has_changed.rb
@@ -1,4 +1,4 @@
-class GoogleOpenidDefaultHasChanged < ActiveRecord::Migration
+class GoogleOpenidDefaultHasChanged < ActiveRecord::Migration[4.2]
   def up
     users_count_query = User.exec_sql("SELECT count(*) FROM users")
     if users_count_query[0]['count'].to_i > 1
diff --git a/db/migrate/20140522003151_add_user_avatars.rb b/db/migrate/20140522003151_add_user_avatars.rb
index cb9a51348a..5b4cccbf4c 100644
--- a/db/migrate/20140522003151_add_user_avatars.rb
+++ b/db/migrate/20140522003151_add_user_avatars.rb
@@ -1,4 +1,4 @@
-class AddUserAvatars < ActiveRecord::Migration
+class AddUserAvatars < ActiveRecord::Migration[4.2]
   def up
     create_table :user_avatars do |t|
       t.integer :user_id, null: false
@@ -6,7 +6,7 @@ class AddUserAvatars < ActiveRecord::Migration
       t.integer :custom_upload_id
       t.integer :gravatar_upload_id
       t.datetime :last_gravatar_download_attempt
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :user_avatars, [:user_id]
diff --git a/db/migrate/20140525233953_remove_uploaded_avatar_template_from_users.rb b/db/migrate/20140525233953_remove_uploaded_avatar_template_from_users.rb
index 138dcb992f..8e06b8507a 100644
--- a/db/migrate/20140525233953_remove_uploaded_avatar_template_from_users.rb
+++ b/db/migrate/20140525233953_remove_uploaded_avatar_template_from_users.rb
@@ -1,4 +1,4 @@
-class RemoveUploadedAvatarTemplateFromUsers < ActiveRecord::Migration
+class RemoveUploadedAvatarTemplateFromUsers < ActiveRecord::Migration[4.2]
   def change
     remove_column :users, :uploaded_avatar_template
   end
diff --git a/db/migrate/20140526185749_change_category_uniquness_contstraint.rb b/db/migrate/20140526185749_change_category_uniquness_contstraint.rb
index 65788268c8..1c60540237 100644
--- a/db/migrate/20140526185749_change_category_uniquness_contstraint.rb
+++ b/db/migrate/20140526185749_change_category_uniquness_contstraint.rb
@@ -1,4 +1,4 @@
-class ChangeCategoryUniqunessContstraint < ActiveRecord::Migration
+class ChangeCategoryUniqunessContstraint < ActiveRecord::Migration[4.2]
   def change
     remove_index :categories, name: 'index_categories_on_name'
     add_index :categories, [:parent_category_id, :name], unique: true
diff --git a/db/migrate/20140526201939_add_disable_jump_reply_to_users.rb b/db/migrate/20140526201939_add_disable_jump_reply_to_users.rb
index 84c6c8c0dd..e056734035 100644
--- a/db/migrate/20140526201939_add_disable_jump_reply_to_users.rb
+++ b/db/migrate/20140526201939_add_disable_jump_reply_to_users.rb
@@ -1,4 +1,4 @@
-class AddDisableJumpReplyToUsers < ActiveRecord::Migration
+class AddDisableJumpReplyToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :disable_jump_reply, :boolean, default: false, null: false
   end
diff --git a/db/migrate/20140527163207_create_user_profiles.rb b/db/migrate/20140527163207_create_user_profiles.rb
index 34d8fa87cd..ce1bd61460 100644
--- a/db/migrate/20140527163207_create_user_profiles.rb
+++ b/db/migrate/20140527163207_create_user_profiles.rb
@@ -1,4 +1,4 @@
-class CreateUserProfiles < ActiveRecord::Migration
+class CreateUserProfiles < ActiveRecord::Migration[4.2]
   def up
     create_table :user_profiles, id: false do |t|
       t.references :user
diff --git a/db/migrate/20140527233225_add_system_savatar_version_to_user_avatars.rb b/db/migrate/20140527233225_add_system_savatar_version_to_user_avatars.rb
index 9fe87c9a80..2992db210a 100644
--- a/db/migrate/20140527233225_add_system_savatar_version_to_user_avatars.rb
+++ b/db/migrate/20140527233225_add_system_savatar_version_to_user_avatars.rb
@@ -1,4 +1,4 @@
-class AddSystemSavatarVersionToUserAvatars < ActiveRecord::Migration
+class AddSystemSavatarVersionToUserAvatars < ActiveRecord::Migration[4.2]
   def change
     add_column :user_avatars, :system_avatar_version, :integer, default: 0
   end
diff --git a/db/migrate/20140528015354_add_baked_at_to_posts.rb b/db/migrate/20140528015354_add_baked_at_to_posts.rb
index bd97a56f10..6d6e954186 100644
--- a/db/migrate/20140528015354_add_baked_at_to_posts.rb
+++ b/db/migrate/20140528015354_add_baked_at_to_posts.rb
@@ -1,4 +1,4 @@
-class AddBakedAtToPosts < ActiveRecord::Migration
+class AddBakedAtToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :baked_at, :datetime
   end
diff --git a/db/migrate/20140529045508_remove_use_uploaded_avatar_from_user.rb b/db/migrate/20140529045508_remove_use_uploaded_avatar_from_user.rb
index 21bb9956e3..018b84d701 100644
--- a/db/migrate/20140529045508_remove_use_uploaded_avatar_from_user.rb
+++ b/db/migrate/20140529045508_remove_use_uploaded_avatar_from_user.rb
@@ -1,4 +1,4 @@
-class RemoveUseUploadedAvatarFromUser < ActiveRecord::Migration
+class RemoveUseUploadedAvatarFromUser < ActiveRecord::Migration[4.2]
   def change
     remove_column :users, :use_uploaded_avatar
   end
diff --git a/db/migrate/20140530002535_remove_system_avatars_from_user_avatars.rb b/db/migrate/20140530002535_remove_system_avatars_from_user_avatars.rb
index ae4a8f364a..8711d90dcf 100644
--- a/db/migrate/20140530002535_remove_system_avatars_from_user_avatars.rb
+++ b/db/migrate/20140530002535_remove_system_avatars_from_user_avatars.rb
@@ -1,6 +1,6 @@
 # This takes all the system avatars out of the upload system, saving us a huge
 # amount of space on backups
-class RemoveSystemAvatarsFromUserAvatars < ActiveRecord::Migration
+class RemoveSystemAvatarsFromUserAvatars < ActiveRecord::Migration[4.2]
   def up
     execute "UPDATE users SET uploaded_avatar_id = NULL WHERE uploaded_avatar_id IN (
       SELECT system_upload_id FROM user_avatars
@@ -9,7 +9,7 @@ class RemoveSystemAvatarsFromUserAvatars < ActiveRecord::Migration
     # normally we dont reach into the object model, but we have to here.
     # otherwise we will wait a real long time for uploads to go away
     skip = -1
-    while skip=destroy_system_avatar_batch(skip) do
+    while skip = destroy_system_avatar_batch(skip) do
       puts "Destroyed up to id: #{skip}"
     end
 
@@ -21,9 +21,9 @@ class RemoveSystemAvatarsFromUserAvatars < ActiveRecord::Migration
     initial = skip
 
     Upload.where('id IN (SELECT system_upload_id FROM user_avatars) AND id > ?', skip)
-        .order(:id)
-        .limit(500)
-        .each do |upload|
+      .order(:id)
+      .limit(500)
+      .each do |upload|
       skip = upload.id
       begin
         upload.destroy
diff --git a/db/migrate/20140530043913_add_baked_version_to_post.rb b/db/migrate/20140530043913_add_baked_version_to_post.rb
index dd1cbd75d9..55824b283a 100644
--- a/db/migrate/20140530043913_add_baked_version_to_post.rb
+++ b/db/migrate/20140530043913_add_baked_version_to_post.rb
@@ -1,4 +1,4 @@
-class AddBakedVersionToPost < ActiveRecord::Migration
+class AddBakedVersionToPost < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :baked_version, :integer
   end
diff --git a/db/migrate/20140604145431_disable_external_auths_by_default.rb b/db/migrate/20140604145431_disable_external_auths_by_default.rb
index 8a5e780a3c..8f47ba505e 100644
--- a/db/migrate/20140604145431_disable_external_auths_by_default.rb
+++ b/db/migrate/20140604145431_disable_external_auths_by_default.rb
@@ -1,4 +1,4 @@
-class DisableExternalAuthsByDefault < ActiveRecord::Migration
+class DisableExternalAuthsByDefault < ActiveRecord::Migration[4.2]
 
   def enable_setting_if_default(name)
     result = User.exec_sql("SELECT count(*) count FROM site_settings WHERE name = '#{name}'")
diff --git a/db/migrate/20140607035234_add_website_to_user_profiles.rb b/db/migrate/20140607035234_add_website_to_user_profiles.rb
index 4194dcf139..4fcecb7401 100644
--- a/db/migrate/20140607035234_add_website_to_user_profiles.rb
+++ b/db/migrate/20140607035234_add_website_to_user_profiles.rb
@@ -1,4 +1,4 @@
-class AddWebsiteToUserProfiles < ActiveRecord::Migration
+class AddWebsiteToUserProfiles < ActiveRecord::Migration[4.2]
   def up
     add_column :user_profiles, :website, :string
 
diff --git a/db/migrate/20140610012414_add_post_id_to_user_badges.rb b/db/migrate/20140610012414_add_post_id_to_user_badges.rb
index 26ecd890c7..ec15a9ae33 100644
--- a/db/migrate/20140610012414_add_post_id_to_user_badges.rb
+++ b/db/migrate/20140610012414_add_post_id_to_user_badges.rb
@@ -1,4 +1,4 @@
-class AddPostIdToUserBadges < ActiveRecord::Migration
+class AddPostIdToUserBadges < ActiveRecord::Migration[4.2]
   def change
     add_column :user_badges, :post_id, :integer
   end
diff --git a/db/migrate/20140610012833_add_icon_to_badges.rb b/db/migrate/20140610012833_add_icon_to_badges.rb
index 7610385079..81f08ad169 100644
--- a/db/migrate/20140610012833_add_icon_to_badges.rb
+++ b/db/migrate/20140610012833_add_icon_to_badges.rb
@@ -1,4 +1,4 @@
-class AddIconToBadges < ActiveRecord::Migration
+class AddIconToBadges < ActiveRecord::Migration[4.2]
   def change
     add_column :badges, :icon, :string, default: "fa-certificate"
   end
diff --git a/db/migrate/20140610034314_move_bio_to_user_profiles.rb b/db/migrate/20140610034314_move_bio_to_user_profiles.rb
index d1042c552a..4d832da743 100644
--- a/db/migrate/20140610034314_move_bio_to_user_profiles.rb
+++ b/db/migrate/20140610034314_move_bio_to_user_profiles.rb
@@ -1,4 +1,4 @@
-class MoveBioToUserProfiles < ActiveRecord::Migration
+class MoveBioToUserProfiles < ActiveRecord::Migration[4.2]
   def up
     add_column :user_profiles, :bio_raw, :text
     add_column :user_profiles, :bio_cooked, :text
diff --git a/db/migrate/20140612010718_move_profile_background_to_user_profiles.rb b/db/migrate/20140612010718_move_profile_background_to_user_profiles.rb
index d654ab19a2..b5c9a12cb2 100644
--- a/db/migrate/20140612010718_move_profile_background_to_user_profiles.rb
+++ b/db/migrate/20140612010718_move_profile_background_to_user_profiles.rb
@@ -1,4 +1,4 @@
-class MoveProfileBackgroundToUserProfiles < ActiveRecord::Migration
+class MoveProfileBackgroundToUserProfiles < ActiveRecord::Migration[4.2]
   def up
     add_column :user_profiles, :profile_background, :string, limit: 255
 
diff --git a/db/migrate/20140617053829_add_notification_id_to_user_badge.rb b/db/migrate/20140617053829_add_notification_id_to_user_badge.rb
index e066ac3cf0..1cdd62c80f 100644
--- a/db/migrate/20140617053829_add_notification_id_to_user_badge.rb
+++ b/db/migrate/20140617053829_add_notification_id_to_user_badge.rb
@@ -1,4 +1,4 @@
-class AddNotificationIdToUserBadge < ActiveRecord::Migration
+class AddNotificationIdToUserBadge < ActiveRecord::Migration[4.2]
   def change
     add_column :user_badges, :notification_id, :integer
   end
diff --git a/db/migrate/20140617080955_rename_registered_users.rb b/db/migrate/20140617080955_rename_registered_users.rb
index ec7e35b9e8..b036c8e565 100644
--- a/db/migrate/20140617080955_rename_registered_users.rb
+++ b/db/migrate/20140617080955_rename_registered_users.rb
@@ -1,4 +1,4 @@
-class RenameRegisteredUsers < ActiveRecord::Migration
+class RenameRegisteredUsers < ActiveRecord::Migration[4.2]
   def change
     execute "update groups set name = 'trust_level_0' where name = 'registered_users' and id = 10"
   end
diff --git a/db/migrate/20140617193351_add_post_id_index_on_topic_links.rb b/db/migrate/20140617193351_add_post_id_index_on_topic_links.rb
index aae44fbc1d..dcdc5bd9e1 100644
--- a/db/migrate/20140617193351_add_post_id_index_on_topic_links.rb
+++ b/db/migrate/20140617193351_add_post_id_index_on_topic_links.rb
@@ -1,4 +1,4 @@
-class AddPostIdIndexOnTopicLinks < ActiveRecord::Migration
+class AddPostIdIndexOnTopicLinks < ActiveRecord::Migration[4.2]
   def up
     add_index :topic_links, :post_id
   end
diff --git a/db/migrate/20140618001820_dont_auto_muto_topics.rb b/db/migrate/20140618001820_dont_auto_muto_topics.rb
index f91070a391..23edeb3222 100644
--- a/db/migrate/20140618001820_dont_auto_muto_topics.rb
+++ b/db/migrate/20140618001820_dont_auto_muto_topics.rb
@@ -1,4 +1,4 @@
-class DontAutoMutoTopics < ActiveRecord::Migration
+class DontAutoMutoTopics < ActiveRecord::Migration[4.2]
   def change
     # muting all new topics was a mistake, revert it
     execute 'DELETE FROM topic_users WHERE notification_level = 0 and notifications_reason_id =7 AND first_visited_at IS NULL'
diff --git a/db/migrate/20140618163511_add_dismissed_banner_key_to_user_profile.rb b/db/migrate/20140618163511_add_dismissed_banner_key_to_user_profile.rb
index f84c1f9a92..1e0e390ec2 100644
--- a/db/migrate/20140618163511_add_dismissed_banner_key_to_user_profile.rb
+++ b/db/migrate/20140618163511_add_dismissed_banner_key_to_user_profile.rb
@@ -1,4 +1,4 @@
-class AddDismissedBannerKeyToUserProfile < ActiveRecord::Migration
+class AddDismissedBannerKeyToUserProfile < ActiveRecord::Migration[4.2]
   def change
     add_column :user_profiles, :dismissed_banner_key, :integer, nullable: true
   end
diff --git a/db/migrate/20140620184031_add_hidden_at_to_posts.rb b/db/migrate/20140620184031_add_hidden_at_to_posts.rb
index e22041be19..60138d9d0c 100644
--- a/db/migrate/20140620184031_add_hidden_at_to_posts.rb
+++ b/db/migrate/20140620184031_add_hidden_at_to_posts.rb
@@ -1,4 +1,4 @@
-class AddHiddenAtToPosts < ActiveRecord::Migration
+class AddHiddenAtToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :hidden_at, :timestamp
   end
diff --git a/db/migrate/20140623195618_fix_categories_constraint.rb b/db/migrate/20140623195618_fix_categories_constraint.rb
index 5c6daa0cc5..5e1423032f 100644
--- a/db/migrate/20140623195618_fix_categories_constraint.rb
+++ b/db/migrate/20140623195618_fix_categories_constraint.rb
@@ -1,4 +1,4 @@
-class FixCategoriesConstraint < ActiveRecord::Migration
+class FixCategoriesConstraint < ActiveRecord::Migration[4.2]
   def change
     remove_index :categories, name: 'index_categories_on_parent_category_id_and_name'
 
diff --git a/db/migrate/20140624044600_add_raw_data_to_search.rb b/db/migrate/20140624044600_add_raw_data_to_search.rb
index 51fe1c4e8e..6e69bfcf3e 100644
--- a/db/migrate/20140624044600_add_raw_data_to_search.rb
+++ b/db/migrate/20140624044600_add_raw_data_to_search.rb
@@ -1,4 +1,4 @@
-class AddRawDataToSearch < ActiveRecord::Migration
+class AddRawDataToSearch < ActiveRecord::Migration[4.2]
   def change
     add_column :post_search_data, :raw_data, :text
     add_column :user_search_data, :raw_data, :text
diff --git a/db/migrate/20140627193814_add_images_to_categories.rb b/db/migrate/20140627193814_add_images_to_categories.rb
index 58e4cce731..5317a70f11 100644
--- a/db/migrate/20140627193814_add_images_to_categories.rb
+++ b/db/migrate/20140627193814_add_images_to_categories.rb
@@ -1,4 +1,4 @@
-class AddImagesToCategories < ActiveRecord::Migration
+class AddImagesToCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :logo_url, :string
     add_column :categories, :background_url, :string
diff --git a/db/migrate/20140703022838_add_fields_to_badges.rb b/db/migrate/20140703022838_add_fields_to_badges.rb
index 69cfd32ec2..1597bc6241 100644
--- a/db/migrate/20140703022838_add_fields_to_badges.rb
+++ b/db/migrate/20140703022838_add_fields_to_badges.rb
@@ -1,4 +1,4 @@
-class AddFieldsToBadges < ActiveRecord::Migration
+class AddFieldsToBadges < ActiveRecord::Migration[4.2]
   def change
     add_column :badges, :listable, :boolean, default: true
     add_column :badges, :target_posts, :boolean, default: false
diff --git a/db/migrate/20140705081453_index_user_badges.rb b/db/migrate/20140705081453_index_user_badges.rb
index 332fc17188..6133b2b46f 100644
--- a/db/migrate/20140705081453_index_user_badges.rb
+++ b/db/migrate/20140705081453_index_user_badges.rb
@@ -1,4 +1,4 @@
-class IndexUserBadges < ActiveRecord::Migration
+class IndexUserBadges < ActiveRecord::Migration[4.2]
   def change
     execute 'DELETE FROM user_badges USING user_badges ub2
              WHERE  user_badges.badge_id = ub2.badge_id AND
diff --git a/db/migrate/20140707071913_add_self_edits_to_posts.rb b/db/migrate/20140707071913_add_self_edits_to_posts.rb
index cd0727b409..aa93dd502e 100644
--- a/db/migrate/20140707071913_add_self_edits_to_posts.rb
+++ b/db/migrate/20140707071913_add_self_edits_to_posts.rb
@@ -1,4 +1,4 @@
-class AddSelfEditsToPosts < ActiveRecord::Migration
+class AddSelfEditsToPosts < ActiveRecord::Migration[4.2]
   def up
     add_column :posts, :self_edits, :integer, null: false, default: 0
     execute "
diff --git a/db/migrate/20140710005023_add_badge_posts_and_topics_view.rb b/db/migrate/20140710005023_add_badge_posts_and_topics_view.rb
index 5f1cae360e..3b9c43df94 100644
--- a/db/migrate/20140710005023_add_badge_posts_and_topics_view.rb
+++ b/db/migrate/20140710005023_add_badge_posts_and_topics_view.rb
@@ -1,4 +1,4 @@
-class AddBadgePostsAndTopicsView < ActiveRecord::Migration
+class AddBadgePostsAndTopicsView < ActiveRecord::Migration[4.2]
   def up
     add_column :categories, :allow_badges, :boolean, default: true, null: false
 
diff --git a/db/migrate/20140710224658_add_is_quote_to_topic_links.rb b/db/migrate/20140710224658_add_is_quote_to_topic_links.rb
index 0abe4d3c8e..f816f8a6ff 100644
--- a/db/migrate/20140710224658_add_is_quote_to_topic_links.rb
+++ b/db/migrate/20140710224658_add_is_quote_to_topic_links.rb
@@ -1,4 +1,4 @@
-class AddIsQuoteToTopicLinks < ActiveRecord::Migration
+class AddIsQuoteToTopicLinks < ActiveRecord::Migration[4.2]
   def up
     add_column :topic_links, :quote, :boolean, default: false, null: false
 
diff --git a/db/migrate/20140711063215_add_read_faq_to_user_stats.rb b/db/migrate/20140711063215_add_read_faq_to_user_stats.rb
index 90b6ce6efd..2441605d4f 100644
--- a/db/migrate/20140711063215_add_read_faq_to_user_stats.rb
+++ b/db/migrate/20140711063215_add_read_faq_to_user_stats.rb
@@ -1,4 +1,4 @@
-class AddReadFaqToUserStats < ActiveRecord::Migration
+class AddReadFaqToUserStats < ActiveRecord::Migration[4.2]
   def change
     add_column :user_stats, :read_faq, :datetime
   end
diff --git a/db/migrate/20140711143146_remove_not_null_from_email.rb b/db/migrate/20140711143146_remove_not_null_from_email.rb
index 9cde9b01bc..a6e63168ba 100644
--- a/db/migrate/20140711143146_remove_not_null_from_email.rb
+++ b/db/migrate/20140711143146_remove_not_null_from_email.rb
@@ -1,4 +1,4 @@
-class RemoveNotNullFromEmail < ActiveRecord::Migration
+class RemoveNotNullFromEmail < ActiveRecord::Migration[4.2]
   def up
     execute "ALTER TABLE invites ALTER COLUMN email DROP NOT NULL"
   end
diff --git a/db/migrate/20140711193923_remove_email_in_address_setting.rb b/db/migrate/20140711193923_remove_email_in_address_setting.rb
index f81efdb7a6..a82dbe4dd0 100644
--- a/db/migrate/20140711193923_remove_email_in_address_setting.rb
+++ b/db/migrate/20140711193923_remove_email_in_address_setting.rb
@@ -1,4 +1,4 @@
-class RemoveEmailInAddressSetting < ActiveRecord::Migration
+class RemoveEmailInAddressSetting < ActiveRecord::Migration[4.2]
   def up
     uncat_id = ActiveRecord::Base.exec_sql("SELECT value FROM site_settings WHERE name = 'uncategorized_category_id'").first
     cat_id_r = ActiveRecord::Base.exec_sql("SELECT value FROM site_settings WHERE name = 'email_in_category'").first
diff --git a/db/migrate/20140711233329_badges_only_on_public_categories.rb b/db/migrate/20140711233329_badges_only_on_public_categories.rb
index e1c5659a31..320201849d 100644
--- a/db/migrate/20140711233329_badges_only_on_public_categories.rb
+++ b/db/migrate/20140711233329_badges_only_on_public_categories.rb
@@ -1,4 +1,4 @@
-class BadgesOnlyOnPublicCategories < ActiveRecord::Migration
+class BadgesOnlyOnPublicCategories < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW badge_posts"
 
diff --git a/db/migrate/20140714060646_add_enabled_to_badges.rb b/db/migrate/20140714060646_add_enabled_to_badges.rb
index c381511a0b..e62aac8651 100644
--- a/db/migrate/20140714060646_add_enabled_to_badges.rb
+++ b/db/migrate/20140714060646_add_enabled_to_badges.rb
@@ -1,4 +1,4 @@
-class AddEnabledToBadges < ActiveRecord::Migration
+class AddEnabledToBadges < ActiveRecord::Migration[4.2]
   def change
     add_column :badges, :enabled, :boolean, default: true, null: false
   end
diff --git a/db/migrate/20140715013018_correct_post_number_index.rb b/db/migrate/20140715013018_correct_post_number_index.rb
index 5aeb03f7a7..f554e01dea 100644
--- a/db/migrate/20140715013018_correct_post_number_index.rb
+++ b/db/migrate/20140715013018_correct_post_number_index.rb
@@ -1,4 +1,4 @@
-class CorrectPostNumberIndex < ActiveRecord::Migration
+class CorrectPostNumberIndex < ActiveRecord::Migration[4.2]
   def change
 
     begin
diff --git a/db/migrate/20140715051412_add_auto_revoke_to_badges.rb b/db/migrate/20140715051412_add_auto_revoke_to_badges.rb
index a86127f4e0..b7e4a74175 100644
--- a/db/migrate/20140715051412_add_auto_revoke_to_badges.rb
+++ b/db/migrate/20140715051412_add_auto_revoke_to_badges.rb
@@ -1,4 +1,4 @@
-class AddAutoRevokeToBadges < ActiveRecord::Migration
+class AddAutoRevokeToBadges < ActiveRecord::Migration[4.2]
   def change
     add_column :badges, :auto_revoke, :boolean, default: true, null: false
   end
diff --git a/db/migrate/20140715055242_add_quoted_posts.rb b/db/migrate/20140715055242_add_quoted_posts.rb
index 587d894799..7c29156fac 100644
--- a/db/migrate/20140715055242_add_quoted_posts.rb
+++ b/db/migrate/20140715055242_add_quoted_posts.rb
@@ -1,15 +1,14 @@
-class AddQuotedPosts < ActiveRecord::Migration
+class AddQuotedPosts < ActiveRecord::Migration[4.2]
   def change
     create_table :quoted_posts do |t|
       t.integer :post_id, null: false
       t.integer :quoted_post_id, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :quoted_posts, [:post_id, :quoted_post_id], unique: true
     add_index :quoted_posts, [:quoted_post_id, :post_id], unique: true
 
-
     # NOTE this can be done in pg but too much of a headache
     id = 0
     while id = backfill_batch(id, 1000); end
@@ -37,9 +36,8 @@ SQL
         topic_id = a['data-topic'].to_i
         post_number = a['data-post'].to_i
 
-        next if uniq[[topic_id,post_number]]
-        uniq[[topic_id,post_number]] = true
-
+        next if uniq[[topic_id, post_number]]
+        uniq[[topic_id, post_number]] = true
 
         execute "INSERT INTO quoted_posts(post_id, quoted_post_id, created_at, updated_at)
                  SELECT #{post_id}, id, created_at, updated_at
diff --git a/db/migrate/20140715160720_update_users_case_insensitive_emails.rb b/db/migrate/20140715160720_update_users_case_insensitive_emails.rb
index 13c1aebefa..ea0c876c78 100644
--- a/db/migrate/20140715160720_update_users_case_insensitive_emails.rb
+++ b/db/migrate/20140715160720_update_users_case_insensitive_emails.rb
@@ -1,4 +1,4 @@
-class UpdateUsersCaseInsensitiveEmails < ActiveRecord::Migration
+class UpdateUsersCaseInsensitiveEmails < ActiveRecord::Migration[4.2]
   def up
     execute "DROP INDEX index_users_on_email"
 
diff --git a/db/migrate/20140715190552_remove_uncategorized_parents.rb b/db/migrate/20140715190552_remove_uncategorized_parents.rb
index ebfc334277..f29ae00a7a 100644
--- a/db/migrate/20140715190552_remove_uncategorized_parents.rb
+++ b/db/migrate/20140715190552_remove_uncategorized_parents.rb
@@ -1,4 +1,4 @@
-class RemoveUncategorizedParents < ActiveRecord::Migration
+class RemoveUncategorizedParents < ActiveRecord::Migration[4.2]
   def up
     uncat = execute("SELECT value FROM site_settings WHERE name = 'uncategorized_category_id'")
     if uncat && uncat[0] && uncat[0]['value']
diff --git a/db/migrate/20140716063802_add_badge_groupings.rb b/db/migrate/20140716063802_add_badge_groupings.rb
index bdcb02e880..806d615e42 100644
--- a/db/migrate/20140716063802_add_badge_groupings.rb
+++ b/db/migrate/20140716063802_add_badge_groupings.rb
@@ -1,10 +1,10 @@
-class AddBadgeGroupings < ActiveRecord::Migration
+class AddBadgeGroupings < ActiveRecord::Migration[4.2]
   def change
     create_table :badge_groupings do |t|
       t.string :name, null: false
       t.string :description, null: false
       t.integer :position, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_column :badges, :badge_grouping_id, :integer
diff --git a/db/migrate/20140717024528_description_optional_in_badge_grouping.rb b/db/migrate/20140717024528_description_optional_in_badge_grouping.rb
index d5be6dc5d7..323a559712 100644
--- a/db/migrate/20140717024528_description_optional_in_badge_grouping.rb
+++ b/db/migrate/20140717024528_description_optional_in_badge_grouping.rb
@@ -1,4 +1,4 @@
-class DescriptionOptionalInBadgeGrouping < ActiveRecord::Migration
+class DescriptionOptionalInBadgeGrouping < ActiveRecord::Migration[4.2]
   def change
     change_column :badge_groupings, :description, :text, null: true
   end
diff --git a/db/migrate/20140718041445_set_default_badge_grouping.rb b/db/migrate/20140718041445_set_default_badge_grouping.rb
index 8b1b3591c9..9615a9996f 100644
--- a/db/migrate/20140718041445_set_default_badge_grouping.rb
+++ b/db/migrate/20140718041445_set_default_badge_grouping.rb
@@ -1,4 +1,4 @@
-class SetDefaultBadgeGrouping < ActiveRecord::Migration
+class SetDefaultBadgeGrouping < ActiveRecord::Migration[4.2]
   def change
     execute 'UPDATE badges SET badge_grouping_id = 5 WHERE badge_grouping_id IS NULL'
     change_column :badges, :badge_grouping_id, :integer, null: false, default: 5
diff --git a/db/migrate/20140721063820_add_trigger_to_badges.rb b/db/migrate/20140721063820_add_trigger_to_badges.rb
index 743b2a8357..eec45e3f58 100644
--- a/db/migrate/20140721063820_add_trigger_to_badges.rb
+++ b/db/migrate/20140721063820_add_trigger_to_badges.rb
@@ -1,4 +1,4 @@
-class AddTriggerToBadges < ActiveRecord::Migration
+class AddTriggerToBadges < ActiveRecord::Migration[4.2]
   def change
     add_column :badges, :trigger, :integer
   end
diff --git a/db/migrate/20140721161249_add_agreed_at_and_agreed_by_id_to_post_action.rb b/db/migrate/20140721161249_add_agreed_at_and_agreed_by_id_to_post_action.rb
index c676a0faf5..549751b6cc 100644
--- a/db/migrate/20140721161249_add_agreed_at_and_agreed_by_id_to_post_action.rb
+++ b/db/migrate/20140721161249_add_agreed_at_and_agreed_by_id_to_post_action.rb
@@ -1,4 +1,4 @@
-class AddAgreedAtAndAgreedByIdToPostAction < ActiveRecord::Migration
+class AddAgreedAtAndAgreedByIdToPostAction < ActiveRecord::Migration[4.2]
   def change
     add_column :post_actions, :agreed_at, :datetime
     add_column :post_actions, :agreed_by_id, :integer
diff --git a/db/migrate/20140721162307_rename_defer_columns_on_post_action.rb b/db/migrate/20140721162307_rename_defer_columns_on_post_action.rb
index 7a02bc139a..99ecbfa792 100644
--- a/db/migrate/20140721162307_rename_defer_columns_on_post_action.rb
+++ b/db/migrate/20140721162307_rename_defer_columns_on_post_action.rb
@@ -1,4 +1,4 @@
-class RenameDeferColumnsOnPostAction < ActiveRecord::Migration
+class RenameDeferColumnsOnPostAction < ActiveRecord::Migration[4.2]
   def up
     rename_column :post_actions, :defer_by, :defered_by_id
 
diff --git a/db/migrate/20140723011456_add_show_posts_to_badges.rb b/db/migrate/20140723011456_add_show_posts_to_badges.rb
index d830861af7..3b4190d41e 100644
--- a/db/migrate/20140723011456_add_show_posts_to_badges.rb
+++ b/db/migrate/20140723011456_add_show_posts_to_badges.rb
@@ -1,4 +1,4 @@
-class AddShowPostsToBadges < ActiveRecord::Migration
+class AddShowPostsToBadges < ActiveRecord::Migration[4.2]
   def change
     # show posts to users on badge show page
     add_column :badges, :show_posts, :boolean, null: false, default: false
diff --git a/db/migrate/20140725050636_remove_invalid_incoming_links.rb b/db/migrate/20140725050636_remove_invalid_incoming_links.rb
index ae6833ef32..56eecad2a6 100644
--- a/db/migrate/20140725050636_remove_invalid_incoming_links.rb
+++ b/db/migrate/20140725050636_remove_invalid_incoming_links.rb
@@ -1,4 +1,4 @@
-class RemoveInvalidIncomingLinks < ActiveRecord::Migration
+class RemoveInvalidIncomingLinks < ActiveRecord::Migration[4.2]
   def change
     execute "DELETE FROM incoming_links WHERE url ILIKE '%avatar%.png'"
   end
diff --git a/db/migrate/20140725172830_remove_message_from_post_action.rb b/db/migrate/20140725172830_remove_message_from_post_action.rb
index 778d99a7f8..8521705a70 100644
--- a/db/migrate/20140725172830_remove_message_from_post_action.rb
+++ b/db/migrate/20140725172830_remove_message_from_post_action.rb
@@ -1,4 +1,4 @@
-class RemoveMessageFromPostAction < ActiveRecord::Migration
+class RemoveMessageFromPostAction < ActiveRecord::Migration[4.2]
   def up
     remove_column :post_actions, :message
   end
diff --git a/db/migrate/20140727030954_add_edit_history_public_to_users.rb b/db/migrate/20140727030954_add_edit_history_public_to_users.rb
index 61d571aeb7..e738497d37 100644
--- a/db/migrate/20140727030954_add_edit_history_public_to_users.rb
+++ b/db/migrate/20140727030954_add_edit_history_public_to_users.rb
@@ -1,4 +1,4 @@
-class AddEditHistoryPublicToUsers < ActiveRecord::Migration
+class AddEditHistoryPublicToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :edit_history_public, :boolean, default: false, null: false
   end
diff --git a/db/migrate/20140728120708_fix_index_on_post_action.rb b/db/migrate/20140728120708_fix_index_on_post_action.rb
index 23be8acecd..5752e45e2c 100644
--- a/db/migrate/20140728120708_fix_index_on_post_action.rb
+++ b/db/migrate/20140728120708_fix_index_on_post_action.rb
@@ -1,4 +1,4 @@
-class FixIndexOnPostAction < ActiveRecord::Migration
+class FixIndexOnPostAction < ActiveRecord::Migration[4.2]
   def change
     remove_index "post_actions", name: "idx_unique_actions"
     add_index "post_actions", ["user_id", "post_action_type_id", "post_id", "deleted_at", "targets_topic"], name: "idx_unique_actions", unique: true
diff --git a/db/migrate/20140728144308_add_first_post_created_at_to_user_stat.rb b/db/migrate/20140728144308_add_first_post_created_at_to_user_stat.rb
index 34dfca71cb..c163c9a63b 100644
--- a/db/migrate/20140728144308_add_first_post_created_at_to_user_stat.rb
+++ b/db/migrate/20140728144308_add_first_post_created_at_to_user_stat.rb
@@ -1,4 +1,4 @@
-class AddFirstPostCreatedAtToUserStat < ActiveRecord::Migration
+class AddFirstPostCreatedAtToUserStat < ActiveRecord::Migration[4.2]
   def up
     add_column :user_stats, :first_post_created_at, :datetime
 
diff --git a/db/migrate/20140728152804_add_post_and_topic_counts_to_user_stat.rb b/db/migrate/20140728152804_add_post_and_topic_counts_to_user_stat.rb
index 3152191d16..055ad3cb0b 100644
--- a/db/migrate/20140728152804_add_post_and_topic_counts_to_user_stat.rb
+++ b/db/migrate/20140728152804_add_post_and_topic_counts_to_user_stat.rb
@@ -1,4 +1,4 @@
-class AddPostAndTopicCountsToUserStat < ActiveRecord::Migration
+class AddPostAndTopicCountsToUserStat < ActiveRecord::Migration[4.2]
   def up
     add_column :user_stats, :post_count, :integer, default: 0, null: false
     add_column :user_stats, :topic_count, :integer, default: 0, null: false
diff --git a/db/migrate/20140729092525_remove_unique_constraint_from_invites_index.rb b/db/migrate/20140729092525_remove_unique_constraint_from_invites_index.rb
index 6ec759f65c..f250648c05 100644
--- a/db/migrate/20140729092525_remove_unique_constraint_from_invites_index.rb
+++ b/db/migrate/20140729092525_remove_unique_constraint_from_invites_index.rb
@@ -1,4 +1,4 @@
-class RemoveUniqueConstraintFromInvitesIndex < ActiveRecord::Migration
+class RemoveUniqueConstraintFromInvitesIndex < ActiveRecord::Migration[4.2]
   def up
     remove_index :invites, [:email, :invited_by_id]
     add_index :invites, [:email, :invited_by_id], unique: false
diff --git a/db/migrate/20140730203029_add_disagreed_at_and_disagreed_by_id_to_post_action.rb b/db/migrate/20140730203029_add_disagreed_at_and_disagreed_by_id_to_post_action.rb
index 4b9aefa892..5a458424dd 100644
--- a/db/migrate/20140730203029_add_disagreed_at_and_disagreed_by_id_to_post_action.rb
+++ b/db/migrate/20140730203029_add_disagreed_at_and_disagreed_by_id_to_post_action.rb
@@ -1,4 +1,4 @@
-class AddDisagreedAtAndDisagreedByIdToPostAction < ActiveRecord::Migration
+class AddDisagreedAtAndDisagreedByIdToPostAction < ActiveRecord::Migration[4.2]
   def up
     add_column :post_actions, :disagreed_at, :datetime
     add_column :post_actions, :disagreed_by_id, :integer
diff --git a/db/migrate/20140731011328_add_reply_quoted_to_posts.rb b/db/migrate/20140731011328_add_reply_quoted_to_posts.rb
index 8dc7a8d446..d21ad72a55 100644
--- a/db/migrate/20140731011328_add_reply_quoted_to_posts.rb
+++ b/db/migrate/20140731011328_add_reply_quoted_to_posts.rb
@@ -1,4 +1,4 @@
-class AddReplyQuotedToPosts < ActiveRecord::Migration
+class AddReplyQuotedToPosts < ActiveRecord::Migration[4.2]
   def up
     add_column :posts, :reply_quoted, :boolean, null: false, default: false
     execute "UPDATE posts p
diff --git a/db/migrate/20140801052028_fix_incoming_links.rb b/db/migrate/20140801052028_fix_incoming_links.rb
index c00ac021a2..d2b8f85c07 100644
--- a/db/migrate/20140801052028_fix_incoming_links.rb
+++ b/db/migrate/20140801052028_fix_incoming_links.rb
@@ -1,4 +1,4 @@
-class FixIncomingLinks < ActiveRecord::Migration
+class FixIncomingLinks < ActiveRecord::Migration[4.2]
   def up
     execute "DROP INDEX incoming_index"
     add_column :incoming_links, :post_id, :integer
diff --git a/db/migrate/20140801170444_create_post_timings_user_index.rb b/db/migrate/20140801170444_create_post_timings_user_index.rb
index c33b84f862..dde6da3b51 100644
--- a/db/migrate/20140801170444_create_post_timings_user_index.rb
+++ b/db/migrate/20140801170444_create_post_timings_user_index.rb
@@ -1,4 +1,4 @@
-class CreatePostTimingsUserIndex < ActiveRecord::Migration
+class CreatePostTimingsUserIndex < ActiveRecord::Migration[4.2]
   def change
     add_index :post_timings, :user_id
   end
diff --git a/db/migrate/20140804010803_incoming_link_normalization.rb b/db/migrate/20140804010803_incoming_link_normalization.rb
index 2c3743541a..4d8c04c09d 100644
--- a/db/migrate/20140804010803_incoming_link_normalization.rb
+++ b/db/migrate/20140804010803_incoming_link_normalization.rb
@@ -1,4 +1,4 @@
-class IncomingLinkNormalization < ActiveRecord::Migration
+class IncomingLinkNormalization < ActiveRecord::Migration[4.2]
   def up
     remove_column :incoming_links, :post_number
     remove_column :incoming_links, :domain
@@ -36,7 +36,6 @@ class IncomingLinkNormalization < ActiveRecord::Migration
             ) X
           WHERE a[2] IS NOT NULL"
 
-
     execute "UPDATE incoming_links l
     SET incoming_referer_id = r.id
     FROM incoming_referers r
@@ -59,7 +58,6 @@ class IncomingLinkNormalization < ActiveRecord::Migration
     FROM incoming_domains d
     WHERE d.name = l.domain AND d.https = l.https AND d.port = l.port"
 
-
     remove_column :incoming_referers, :domain
     remove_column :incoming_referers, :port
     remove_column :incoming_referers, :https
diff --git a/db/migrate/20140804030041_remove_url_from_incoming_referer.rb b/db/migrate/20140804030041_remove_url_from_incoming_referer.rb
index 3306194132..75abede78e 100644
--- a/db/migrate/20140804030041_remove_url_from_incoming_referer.rb
+++ b/db/migrate/20140804030041_remove_url_from_incoming_referer.rb
@@ -1,4 +1,4 @@
-class RemoveUrlFromIncomingReferer < ActiveRecord::Migration
+class RemoveUrlFromIncomingReferer < ActiveRecord::Migration[4.2]
   def up
     remove_column :incoming_referers, :url
   end
diff --git a/db/migrate/20140804060439_drop_topic_id_from_incoming_links.rb b/db/migrate/20140804060439_drop_topic_id_from_incoming_links.rb
index 305e93ea18..15fdc10ddb 100644
--- a/db/migrate/20140804060439_drop_topic_id_from_incoming_links.rb
+++ b/db/migrate/20140804060439_drop_topic_id_from_incoming_links.rb
@@ -1,4 +1,4 @@
-class DropTopicIdFromIncomingLinks < ActiveRecord::Migration
+class DropTopicIdFromIncomingLinks < ActiveRecord::Migration[4.2]
   def change
     remove_column :incoming_links, :topic_id
   end
diff --git a/db/migrate/20140804072504_views_to_topic_views.rb b/db/migrate/20140804072504_views_to_topic_views.rb
index 16e78bc941..d88620afba 100644
--- a/db/migrate/20140804072504_views_to_topic_views.rb
+++ b/db/migrate/20140804072504_views_to_topic_views.rb
@@ -1,4 +1,4 @@
-class ViewsToTopicViews < ActiveRecord::Migration
+class ViewsToTopicViews < ActiveRecord::Migration[4.2]
   def change
     remove_column :views, :parent_type
     rename_column :views, :parent_id, :topic_id
diff --git a/db/migrate/20140804075613_normalize_topic_view_data_and_index.rb b/db/migrate/20140804075613_normalize_topic_view_data_and_index.rb
index 4f6e6f1b2e..eedb52fb38 100644
--- a/db/migrate/20140804075613_normalize_topic_view_data_and_index.rb
+++ b/db/migrate/20140804075613_normalize_topic_view_data_and_index.rb
@@ -1,4 +1,4 @@
-class NormalizeTopicViewDataAndIndex < ActiveRecord::Migration
+class NormalizeTopicViewDataAndIndex < ActiveRecord::Migration[4.2]
   def change
     remove_index :topic_views, [:topic_id]
     remove_index :topic_views, [:user_id, :topic_id]
@@ -29,7 +29,6 @@ class NormalizeTopicViewDataAndIndex < ActiveRecord::Migration
     SELECT NULL, topic_id, ip_address, viewed_at FROM tmp_views_ip
     '
 
-
     execute 'CREATE UNIQUE INDEX user_id_topic_id_topic_views ON topic_views(user_id, topic_id) WHERE user_id IS NOT NULL'
     execute 'CREATE UNIQUE INDEX ip_address_topic_id_topic_views ON topic_views(ip_address, topic_id) WHERE user_id IS NULL'
 
diff --git a/db/migrate/20140805061612_add_bio_cooked_version_to_user_profile.rb b/db/migrate/20140805061612_add_bio_cooked_version_to_user_profile.rb
index 200e3f4198..56d72bc1f0 100644
--- a/db/migrate/20140805061612_add_bio_cooked_version_to_user_profile.rb
+++ b/db/migrate/20140805061612_add_bio_cooked_version_to_user_profile.rb
@@ -1,4 +1,4 @@
-class AddBioCookedVersionToUserProfile < ActiveRecord::Migration
+class AddBioCookedVersionToUserProfile < ActiveRecord::Migration[4.2]
   def change
     add_column :user_profiles, :bio_cooked_version, :integer
     add_index :user_profiles, [:bio_cooked_version]
diff --git a/db/migrate/20140806003116_fixup_badge_ids.rb b/db/migrate/20140806003116_fixup_badge_ids.rb
index 61dc0a4caa..f64e7c4221 100644
--- a/db/migrate/20140806003116_fixup_badge_ids.rb
+++ b/db/migrate/20140806003116_fixup_badge_ids.rb
@@ -1,4 +1,4 @@
-class FixupBadgeIds < ActiveRecord::Migration
+class FixupBadgeIds < ActiveRecord::Migration[4.2]
   def change
     # badge ids were below 100, for user badges, this really messed stuff up
     # to resolve this add a "system" flag which we can use to figure out what
diff --git a/db/migrate/20140807033123_add_index_on_last_seen_to_users.rb b/db/migrate/20140807033123_add_index_on_last_seen_to_users.rb
index dc7eecc885..2b7e523199 100644
--- a/db/migrate/20140807033123_add_index_on_last_seen_to_users.rb
+++ b/db/migrate/20140807033123_add_index_on_last_seen_to_users.rb
@@ -1,4 +1,4 @@
-class AddIndexOnLastSeenToUsers < ActiveRecord::Migration
+class AddIndexOnLastSeenToUsers < ActiveRecord::Migration[4.2]
   def change
     add_index :users, [:last_seen_at]
   end
diff --git a/db/migrate/20140808051823_create_topic_search_index.rb b/db/migrate/20140808051823_create_topic_search_index.rb
index 1a154e6a08..6edfc1e5fe 100644
--- a/db/migrate/20140808051823_create_topic_search_index.rb
+++ b/db/migrate/20140808051823_create_topic_search_index.rb
@@ -1,4 +1,4 @@
-class CreateTopicSearchIndex < ActiveRecord::Migration
+class CreateTopicSearchIndex < ActiveRecord::Migration[4.2]
   def up
     # used for similarity search
     create_table :topic_search_data, id: false do |t|
diff --git a/db/migrate/20140809224243_add_user_badge_unique_index.rb b/db/migrate/20140809224243_add_user_badge_unique_index.rb
index aefb27af47..83f8be6daf 100644
--- a/db/migrate/20140809224243_add_user_badge_unique_index.rb
+++ b/db/migrate/20140809224243_add_user_badge_unique_index.rb
@@ -1,4 +1,4 @@
-class AddUserBadgeUniqueIndex < ActiveRecord::Migration
+class AddUserBadgeUniqueIndex < ActiveRecord::Migration[4.2]
   def up
     # used to keep badges distinct
     add_column :user_badges, :seq, :integer, default: 0, null: false
diff --git a/db/migrate/20140811094300_rename_defered_columns_on_post_action.rb b/db/migrate/20140811094300_rename_defered_columns_on_post_action.rb
index ad4f7c50a2..635562c432 100644
--- a/db/migrate/20140811094300_rename_defered_columns_on_post_action.rb
+++ b/db/migrate/20140811094300_rename_defered_columns_on_post_action.rb
@@ -1,4 +1,4 @@
-class RenameDeferedColumnsOnPostAction < ActiveRecord::Migration
+class RenameDeferedColumnsOnPostAction < ActiveRecord::Migration[4.2]
   def change
     rename_column :post_actions, :defered_by_id, :deferred_by_id
     rename_column :post_actions, :defered_at, :deferred_at
diff --git a/db/migrate/20140813175357_add_default_to_active.rb b/db/migrate/20140813175357_add_default_to_active.rb
index 5d5000fe32..dcf60f63d2 100644
--- a/db/migrate/20140813175357_add_default_to_active.rb
+++ b/db/migrate/20140813175357_add_default_to_active.rb
@@ -1,4 +1,4 @@
-class AddDefaultToActive < ActiveRecord::Migration
+class AddDefaultToActive < ActiveRecord::Migration[4.2]
   def change
     change_column :users, :active, :boolean, default: false, null: false
   end
diff --git a/db/migrate/20140815183851_fix_index_on_post_actions.rb b/db/migrate/20140815183851_fix_index_on_post_actions.rb
index ed403da399..e899a702b6 100644
--- a/db/migrate/20140815183851_fix_index_on_post_actions.rb
+++ b/db/migrate/20140815183851_fix_index_on_post_actions.rb
@@ -1,4 +1,4 @@
-class FixIndexOnPostActions < ActiveRecord::Migration
+class FixIndexOnPostActions < ActiveRecord::Migration[4.2]
   def change
     execute 'UPDATE post_actions SET targets_topic = false WHERE targets_topic IS NULL'
     change_column :post_actions, :targets_topic, :boolean, default: false, null: false
diff --git a/db/migrate/20140815191556_fix_post_actions_index_again.rb b/db/migrate/20140815191556_fix_post_actions_index_again.rb
index 1979cbb8a9..93310192a4 100644
--- a/db/migrate/20140815191556_fix_post_actions_index_again.rb
+++ b/db/migrate/20140815191556_fix_post_actions_index_again.rb
@@ -1,4 +1,4 @@
-class FixPostActionsIndexAgain < ActiveRecord::Migration
+class FixPostActionsIndexAgain < ActiveRecord::Migration[4.2]
   def change
     remove_index "post_actions", name: "idx_unique_actions"
     add_index "post_actions",
diff --git a/db/migrate/20140815215618_add_name_lower_to_categories.rb b/db/migrate/20140815215618_add_name_lower_to_categories.rb
index 97c1685337..6672608ebb 100644
--- a/db/migrate/20140815215618_add_name_lower_to_categories.rb
+++ b/db/migrate/20140815215618_add_name_lower_to_categories.rb
@@ -1,9 +1,9 @@
-class AddNameLowerToCategories < ActiveRecord::Migration
+class AddNameLowerToCategories < ActiveRecord::Migration[4.2]
 
   def up
     add_column :categories, :name_lower, :string, limit: 50
     execute "update categories set name_lower = lower(name)"
-    change_column :categories, :name_lower, :string, limit: 50, null:false
+    change_column :categories, :name_lower, :string, limit: 50, null: false
   end
 
   def down
diff --git a/db/migrate/20140817011612_add_external_avatar_url_to_single_sign_on_record.rb b/db/migrate/20140817011612_add_external_avatar_url_to_single_sign_on_record.rb
index 6069d8771e..cc664ae52a 100644
--- a/db/migrate/20140817011612_add_external_avatar_url_to_single_sign_on_record.rb
+++ b/db/migrate/20140817011612_add_external_avatar_url_to_single_sign_on_record.rb
@@ -1,4 +1,4 @@
-class AddExternalAvatarUrlToSingleSignOnRecord < ActiveRecord::Migration
+class AddExternalAvatarUrlToSingleSignOnRecord < ActiveRecord::Migration[4.2]
   def change
     add_column :single_sign_on_records, :external_avatar_url, :string
   end
diff --git a/db/migrate/20140818023700_index_email_tokens.rb b/db/migrate/20140818023700_index_email_tokens.rb
index 8f855f679e..fe7a041e12 100644
--- a/db/migrate/20140818023700_index_email_tokens.rb
+++ b/db/migrate/20140818023700_index_email_tokens.rb
@@ -1,4 +1,4 @@
-class IndexEmailTokens < ActiveRecord::Migration
+class IndexEmailTokens < ActiveRecord::Migration[4.2]
   def change
     add_index :email_tokens, [:user_id]
   end
diff --git a/db/migrate/20140826234625_rename_settings_pop3s_to_pop3.rb b/db/migrate/20140826234625_rename_settings_pop3s_to_pop3.rb
index 0672e5168f..1d8b1c6b00 100644
--- a/db/migrate/20140826234625_rename_settings_pop3s_to_pop3.rb
+++ b/db/migrate/20140826234625_rename_settings_pop3s_to_pop3.rb
@@ -1,4 +1,4 @@
-class RenameSettingsPop3sToPop3 < ActiveRecord::Migration
+class RenameSettingsPop3sToPop3 < ActiveRecord::Migration[4.2]
   def up
     execute "UPDATE site_settings SET name = replace(name, 'pop3s', 'pop3') WHERE name ILIKE 'pop3%'"
   end
diff --git a/db/migrate/20140827044811_remove_nullable_dates.rb b/db/migrate/20140827044811_remove_nullable_dates.rb
index 3f8f2211be..2baf9745a6 100644
--- a/db/migrate/20140827044811_remove_nullable_dates.rb
+++ b/db/migrate/20140827044811_remove_nullable_dates.rb
@@ -1,4 +1,4 @@
-class RemoveNullableDates < ActiveRecord::Migration
+class RemoveNullableDates < ActiveRecord::Migration[4.2]
   def up
 
     # must drop so we can muck with the column
diff --git a/db/migrate/20140828172407_create_permalinks.rb b/db/migrate/20140828172407_create_permalinks.rb
index 5e4d9ce9b6..564907b487 100644
--- a/db/migrate/20140828172407_create_permalinks.rb
+++ b/db/migrate/20140828172407_create_permalinks.rb
@@ -1,4 +1,4 @@
-class CreatePermalinks < ActiveRecord::Migration
+class CreatePermalinks < ActiveRecord::Migration[4.2]
   def change
     create_table :permalinks do |t|
       t.string :url, null: false
@@ -6,7 +6,7 @@ class CreatePermalinks < ActiveRecord::Migration
       t.integer :post_id
       t.integer :category_id
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :permalinks, :url
diff --git a/db/migrate/20140828200231_make_url_col_bigger_in_permalinks.rb b/db/migrate/20140828200231_make_url_col_bigger_in_permalinks.rb
index f2767d1a2a..653510c8c4 100644
--- a/db/migrate/20140828200231_make_url_col_bigger_in_permalinks.rb
+++ b/db/migrate/20140828200231_make_url_col_bigger_in_permalinks.rb
@@ -1,4 +1,4 @@
-class MakeUrlColBiggerInPermalinks < ActiveRecord::Migration
+class MakeUrlColBiggerInPermalinks < ActiveRecord::Migration[4.2]
   def up
     remove_index :permalinks, :url
     change_column :permalinks, :url, :string, limit: 1000, null: false
diff --git a/db/migrate/20140831191346_remove_category_groups_orphaned_by_removing_category_or_group.rb b/db/migrate/20140831191346_remove_category_groups_orphaned_by_removing_category_or_group.rb
index 2e19870c2b..fd30ea531a 100644
--- a/db/migrate/20140831191346_remove_category_groups_orphaned_by_removing_category_or_group.rb
+++ b/db/migrate/20140831191346_remove_category_groups_orphaned_by_removing_category_or_group.rb
@@ -1,4 +1,4 @@
-class RemoveCategoryGroupsOrphanedByRemovingCategoryOrGroup < ActiveRecord::Migration
+class RemoveCategoryGroupsOrphanedByRemovingCategoryOrGroup < ActiveRecord::Migration[4.2]
   def up
     execute "DELETE FROM category_groups
              WHERE group_id NOT IN (
diff --git a/db/migrate/20140904055702_correct_post_action_index.rb b/db/migrate/20140904055702_correct_post_action_index.rb
index a582d19f8e..f98e125885 100644
--- a/db/migrate/20140904055702_correct_post_action_index.rb
+++ b/db/migrate/20140904055702_correct_post_action_index.rb
@@ -1,4 +1,4 @@
-class CorrectPostActionIndex < ActiveRecord::Migration
+class CorrectPostActionIndex < ActiveRecord::Migration[4.2]
 
   def up
 
diff --git a/db/migrate/20140904160015_add_via_email_to_posts.rb b/db/migrate/20140904160015_add_via_email_to_posts.rb
index 2b3425b068..bf3cb33e09 100644
--- a/db/migrate/20140904160015_add_via_email_to_posts.rb
+++ b/db/migrate/20140904160015_add_via_email_to_posts.rb
@@ -1,4 +1,4 @@
-class AddViaEmailToPosts < ActiveRecord::Migration
+class AddViaEmailToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :via_email, :boolean, default: false, null: false
   end
diff --git a/db/migrate/20140904215629_rename_trust_level_settings.rb b/db/migrate/20140904215629_rename_trust_level_settings.rb
index 317fb6ae00..f19af1a5b5 100644
--- a/db/migrate/20140904215629_rename_trust_level_settings.rb
+++ b/db/migrate/20140904215629_rename_trust_level_settings.rb
@@ -1,4 +1,4 @@
-class RenameTrustLevelSettings < ActiveRecord::Migration
+class RenameTrustLevelSettings < ActiveRecord::Migration[4.2]
   def up
     execute "UPDATE site_settings
              SET name = regexp_replace(name, '^basic_', 'tl1_')"
diff --git a/db/migrate/20140905055251_rename_trust_level_badges.rb b/db/migrate/20140905055251_rename_trust_level_badges.rb
index 40b34e0dd0..db6e341f2e 100644
--- a/db/migrate/20140905055251_rename_trust_level_badges.rb
+++ b/db/migrate/20140905055251_rename_trust_level_badges.rb
@@ -1,4 +1,4 @@
-class RenameTrustLevelBadges < ActiveRecord::Migration
+class RenameTrustLevelBadges < ActiveRecord::Migration[4.2]
 
   def rename(id, old, new)
     execute "UPDATE badges SET name = '#{new}' WHERE name = '#{old}' AND id = #{id}"
diff --git a/db/migrate/20140905171733_create_warnings.rb b/db/migrate/20140905171733_create_warnings.rb
index 90d38725b6..7c0ae9931c 100644
--- a/db/migrate/20140905171733_create_warnings.rb
+++ b/db/migrate/20140905171733_create_warnings.rb
@@ -1,10 +1,10 @@
-class CreateWarnings < ActiveRecord::Migration
+class CreateWarnings < ActiveRecord::Migration[4.2]
   def change
     create_table :warnings do |t|
       t.references :topic, null: false
       t.references :user, null: false
       t.integer :created_by_id, null: false
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :warnings, :user_id
     add_index :warnings, :topic_id, unique: true
diff --git a/db/migrate/20140908165716_migrate_warning_topic_subtypes.rb b/db/migrate/20140908165716_migrate_warning_topic_subtypes.rb
index 30b477a809..cddb771ffd 100644
--- a/db/migrate/20140908165716_migrate_warning_topic_subtypes.rb
+++ b/db/migrate/20140908165716_migrate_warning_topic_subtypes.rb
@@ -1,4 +1,4 @@
-class MigrateWarningTopicSubtypes < ActiveRecord::Migration
+class MigrateWarningTopicSubtypes < ActiveRecord::Migration[4.2]
   def change
     execute "UPDATE topics AS t
               SET subtype = 'moderator_warning'
diff --git a/db/migrate/20140908191429_trim_profile_length.rb b/db/migrate/20140908191429_trim_profile_length.rb
index 4651bcae2e..739e1ea7bd 100644
--- a/db/migrate/20140908191429_trim_profile_length.rb
+++ b/db/migrate/20140908191429_trim_profile_length.rb
@@ -1,4 +1,4 @@
-class TrimProfileLength < ActiveRecord::Migration
+class TrimProfileLength < ActiveRecord::Migration[4.2]
   def change
     # In case any profiles exceed 3000 chars
     execute "UPDATE user_profiles SET bio_raw=LEFT(bio_raw, 3000)"
diff --git a/db/migrate/20140910130155_create_topic_user_index.rb b/db/migrate/20140910130155_create_topic_user_index.rb
index 0f02e64534..8f3eaecddd 100644
--- a/db/migrate/20140910130155_create_topic_user_index.rb
+++ b/db/migrate/20140910130155_create_topic_user_index.rb
@@ -1,4 +1,4 @@
-class CreateTopicUserIndex < ActiveRecord::Migration
+class CreateTopicUserIndex < ActiveRecord::Migration[4.2]
   def change
     # seems to be the most effective for joining into topics
     add_index :topic_users, [:user_id, :topic_id], unique: true
diff --git a/db/migrate/20140911065449_private_messages_have_no_category_id.rb b/db/migrate/20140911065449_private_messages_have_no_category_id.rb
index c02ea84e5a..32b058a4d0 100644
--- a/db/migrate/20140911065449_private_messages_have_no_category_id.rb
+++ b/db/migrate/20140911065449_private_messages_have_no_category_id.rb
@@ -1,4 +1,4 @@
-class PrivateMessagesHaveNoCategoryId < ActiveRecord::Migration
+class PrivateMessagesHaveNoCategoryId < ActiveRecord::Migration[4.2]
   def up
     execute "UPDATE topics SET category_id = NULL WHERE category_id IS NOT NULL AND archetype = \'private_message\'"
     execute "ALTER TABLE topics ADD CONSTRAINT pm_has_no_category CHECK (category_id IS NULL OR archetype <> 'private_message')"
diff --git a/db/migrate/20140913192733_add_trust_level_locked_column.rb b/db/migrate/20140913192733_add_trust_level_locked_column.rb
index 8ac5b0b989..71b34b0086 100644
--- a/db/migrate/20140913192733_add_trust_level_locked_column.rb
+++ b/db/migrate/20140913192733_add_trust_level_locked_column.rb
@@ -1,6 +1,6 @@
-class AddTrustLevelLockedColumn < ActiveRecord::Migration
+class AddTrustLevelLockedColumn < ActiveRecord::Migration[4.2]
   def change
-    add_column :users, :trust_level_locked, :boolean, { default: false, null: false}
+    add_column :users, :trust_level_locked, :boolean, default: false, null: false
 
     reversible do |dir|
       dir.up do
diff --git a/db/migrate/20140923042349_add_retain_hours_to_uploads.rb b/db/migrate/20140923042349_add_retain_hours_to_uploads.rb
index 38aea048f8..513f686d57 100644
--- a/db/migrate/20140923042349_add_retain_hours_to_uploads.rb
+++ b/db/migrate/20140923042349_add_retain_hours_to_uploads.rb
@@ -1,4 +1,4 @@
-class AddRetainHoursToUploads < ActiveRecord::Migration
+class AddRetainHoursToUploads < ActiveRecord::Migration[4.2]
   def change
     add_column :uploads, :retain_hours, :integer
   end
diff --git a/db/migrate/20140924192418_rename_content_type.rb b/db/migrate/20140924192418_rename_content_type.rb
index 3162096203..0f428aa02a 100644
--- a/db/migrate/20140924192418_rename_content_type.rb
+++ b/db/migrate/20140924192418_rename_content_type.rb
@@ -1,4 +1,4 @@
-class RenameContentType < ActiveRecord::Migration
+class RenameContentType < ActiveRecord::Migration[4.2]
   def change
     rename_column :site_contents, :content_type, :text_type
     rename_column :site_contents, :content, :value
diff --git a/db/migrate/20140925173220_create_user_fields.rb b/db/migrate/20140925173220_create_user_fields.rb
index 68c72452b6..03ae8dec13 100644
--- a/db/migrate/20140925173220_create_user_fields.rb
+++ b/db/migrate/20140925173220_create_user_fields.rb
@@ -1,9 +1,9 @@
-class CreateUserFields < ActiveRecord::Migration
+class CreateUserFields < ActiveRecord::Migration[4.2]
   def change
     create_table :user_fields do |t|
       t.string :name, null: false
       t.string :field_type, null: false
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/db/migrate/20140929181930_add_editable_to_user_fields.rb b/db/migrate/20140929181930_add_editable_to_user_fields.rb
index bfb4ee4746..f3399901d9 100644
--- a/db/migrate/20140929181930_add_editable_to_user_fields.rb
+++ b/db/migrate/20140929181930_add_editable_to_user_fields.rb
@@ -1,4 +1,4 @@
-class AddEditableToUserFields < ActiveRecord::Migration
+class AddEditableToUserFields < ActiveRecord::Migration[4.2]
   def change
     add_column :user_fields, :editable, :boolean, default: false, null: false
   end
diff --git a/db/migrate/20140929204155_migrate_tos_setting.rb b/db/migrate/20140929204155_migrate_tos_setting.rb
index 4e313c0373..6f2e91a534 100644
--- a/db/migrate/20140929204155_migrate_tos_setting.rb
+++ b/db/migrate/20140929204155_migrate_tos_setting.rb
@@ -1,4 +1,4 @@
-class MigrateTosSetting < ActiveRecord::Migration
+class MigrateTosSetting < ActiveRecord::Migration[4.2]
   def up
     res = execute("SELECT * FROM site_settings WHERE name = 'tos_accept_required' AND value = 't'")
     if res.present? && res.cmd_tuples > 0
@@ -13,7 +13,6 @@ class MigrateTosSetting < ActiveRecord::Migration
         label = res[0]['value']
       end
 
-
       label = PG::Connection.escape_string(label)
       execute("INSERT INTO user_fields (name, field_type, editable) VALUES ('#{label}', 'confirm', false)")
     end
diff --git a/db/migrate/20141001101041_add_post_id_to_user_histories.rb b/db/migrate/20141001101041_add_post_id_to_user_histories.rb
index 049ad95a75..cd70b1308b 100644
--- a/db/migrate/20141001101041_add_post_id_to_user_histories.rb
+++ b/db/migrate/20141001101041_add_post_id_to_user_histories.rb
@@ -1,4 +1,4 @@
-class AddPostIdToUserHistories < ActiveRecord::Migration
+class AddPostIdToUserHistories < ActiveRecord::Migration[4.2]
   def change
     add_column :user_histories, :post_id, :integer
   end
diff --git a/db/migrate/20141002181613_add_description_to_user_fields.rb b/db/migrate/20141002181613_add_description_to_user_fields.rb
index 5bebb80bde..1495975c47 100644
--- a/db/migrate/20141002181613_add_description_to_user_fields.rb
+++ b/db/migrate/20141002181613_add_description_to_user_fields.rb
@@ -1,4 +1,4 @@
-class AddDescriptionToUserFields < ActiveRecord::Migration
+class AddDescriptionToUserFields < ActiveRecord::Migration[4.2]
   def change
     add_column :user_fields, :description, :string, null: true
     execute "UPDATE user_fields SET description=name"
diff --git a/db/migrate/20141007224814_add_badge_granted_title_to_user_profile.rb b/db/migrate/20141007224814_add_badge_granted_title_to_user_profile.rb
index 008590121a..73576c7b3b 100644
--- a/db/migrate/20141007224814_add_badge_granted_title_to_user_profile.rb
+++ b/db/migrate/20141007224814_add_badge_granted_title_to_user_profile.rb
@@ -1,4 +1,4 @@
-class AddBadgeGrantedTitleToUserProfile < ActiveRecord::Migration
+class AddBadgeGrantedTitleToUserProfile < ActiveRecord::Migration[4.2]
   def up
     add_column :user_profiles, :badge_granted_title, :boolean, default: false
 
diff --git a/db/migrate/20141008152953_add_exernal_url_to_permalinks.rb b/db/migrate/20141008152953_add_exernal_url_to_permalinks.rb
index f0ec678373..a4fbedc514 100644
--- a/db/migrate/20141008152953_add_exernal_url_to_permalinks.rb
+++ b/db/migrate/20141008152953_add_exernal_url_to_permalinks.rb
@@ -1,4 +1,4 @@
-class AddExernalUrlToPermalinks < ActiveRecord::Migration
+class AddExernalUrlToPermalinks < ActiveRecord::Migration[4.2]
   def change
     add_column :permalinks, :external_url, :string, limit: 1000
   end
diff --git a/db/migrate/20141008181228_add_required_signup_to_user_fields.rb b/db/migrate/20141008181228_add_required_signup_to_user_fields.rb
index d95286054e..a160f51b70 100644
--- a/db/migrate/20141008181228_add_required_signup_to_user_fields.rb
+++ b/db/migrate/20141008181228_add_required_signup_to_user_fields.rb
@@ -1,4 +1,4 @@
-class AddRequiredSignupToUserFields < ActiveRecord::Migration
+class AddRequiredSignupToUserFields < ActiveRecord::Migration[4.2]
   def change
     add_column :user_fields, :required, :boolean, default: true, null: false
   end
diff --git a/db/migrate/20141008192525_add_auto_close_based_on_last_post_and_auto_close_hours_to_topics.rb b/db/migrate/20141008192525_add_auto_close_based_on_last_post_and_auto_close_hours_to_topics.rb
index 71e8712316..ecf5837f38 100644
--- a/db/migrate/20141008192525_add_auto_close_based_on_last_post_and_auto_close_hours_to_topics.rb
+++ b/db/migrate/20141008192525_add_auto_close_based_on_last_post_and_auto_close_hours_to_topics.rb
@@ -1,4 +1,4 @@
-class AddAutoCloseBasedOnLastPostAndAutoCloseHoursToTopics < ActiveRecord::Migration
+class AddAutoCloseBasedOnLastPostAndAutoCloseHoursToTopics < ActiveRecord::Migration[4.2]
   def change
     add_column :topics, :auto_close_based_on_last_post, :boolean, default: false
     add_column :topics, :auto_close_hours, :float
diff --git a/db/migrate/20141008192526_add_auto_close_based_on_last_post_to_categories.rb b/db/migrate/20141008192526_add_auto_close_based_on_last_post_to_categories.rb
index 3af300abc0..bc80b61747 100644
--- a/db/migrate/20141008192526_add_auto_close_based_on_last_post_to_categories.rb
+++ b/db/migrate/20141008192526_add_auto_close_based_on_last_post_to_categories.rb
@@ -1,4 +1,4 @@
-class AddAutoCloseBasedOnLastPostToCategories < ActiveRecord::Migration
+class AddAutoCloseBasedOnLastPostToCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :auto_close_based_on_last_post, :boolean, default: false
   end
diff --git a/db/migrate/20141014032859_add_hidden_to_post_revision.rb b/db/migrate/20141014032859_add_hidden_to_post_revision.rb
index 93423e2190..de1c2f4ba9 100644
--- a/db/migrate/20141014032859_add_hidden_to_post_revision.rb
+++ b/db/migrate/20141014032859_add_hidden_to_post_revision.rb
@@ -1,4 +1,4 @@
-class AddHiddenToPostRevision < ActiveRecord::Migration
+class AddHiddenToPostRevision < ActiveRecord::Migration[4.2]
   def change
     add_column :post_revisions, :hidden, :boolean, null: false, default: false
   end
diff --git a/db/migrate/20141014191645_fix_tos_name.rb b/db/migrate/20141014191645_fix_tos_name.rb
index 56059dd95f..42daa0a150 100644
--- a/db/migrate/20141014191645_fix_tos_name.rb
+++ b/db/migrate/20141014191645_fix_tos_name.rb
@@ -1,4 +1,4 @@
-class FixTosName < ActiveRecord::Migration
+class FixTosName < ActiveRecord::Migration[4.2]
   def up
     I18n.overrides_disabled do
       execute ActiveRecord::Base.sql_fragment('UPDATE user_fields SET name = ? WHERE name = ?', I18n.t('terms_of_service.title'), I18n.t("terms_of_service.signup_form_message"))
diff --git a/db/migrate/20141015060145_add_raw_email_to_posts.rb b/db/migrate/20141015060145_add_raw_email_to_posts.rb
index 2c3b89b6d6..44f703e666 100644
--- a/db/migrate/20141015060145_add_raw_email_to_posts.rb
+++ b/db/migrate/20141015060145_add_raw_email_to_posts.rb
@@ -1,4 +1,4 @@
-class AddRawEmailToPosts < ActiveRecord::Migration
+class AddRawEmailToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :raw_email, :text
   end
diff --git a/db/migrate/20141016183307_add_expansion_background_to_user_profiles.rb b/db/migrate/20141016183307_add_expansion_background_to_user_profiles.rb
index af0c536bf4..97b85cccd9 100644
--- a/db/migrate/20141016183307_add_expansion_background_to_user_profiles.rb
+++ b/db/migrate/20141016183307_add_expansion_background_to_user_profiles.rb
@@ -1,4 +1,4 @@
-class AddExpansionBackgroundToUserProfiles < ActiveRecord::Migration
+class AddExpansionBackgroundToUserProfiles < ActiveRecord::Migration[4.2]
   def change
     add_column :user_profiles, :expansion_background, :string, limit: 255
   end
diff --git a/db/migrate/20141020153415_add_public_version_to_posts.rb b/db/migrate/20141020153415_add_public_version_to_posts.rb
index 52cb65f41a..aa7f2368b3 100644
--- a/db/migrate/20141020153415_add_public_version_to_posts.rb
+++ b/db/migrate/20141020153415_add_public_version_to_posts.rb
@@ -1,4 +1,4 @@
-class AddPublicVersionToPosts < ActiveRecord::Migration
+class AddPublicVersionToPosts < ActiveRecord::Migration[4.2]
   def up
     add_column :posts, :public_version, :integer, null: false, default: 1
 
diff --git a/db/migrate/20141020154935_rename_expansion_to_card.rb b/db/migrate/20141020154935_rename_expansion_to_card.rb
index 9dbde2f821..bb8b0e6a25 100644
--- a/db/migrate/20141020154935_rename_expansion_to_card.rb
+++ b/db/migrate/20141020154935_rename_expansion_to_card.rb
@@ -1,4 +1,4 @@
-class RenameExpansionToCard < ActiveRecord::Migration
+class RenameExpansionToCard < ActiveRecord::Migration[4.2]
   def change
     rename_column :user_profiles, :expansion_background, :card_background
   end
diff --git a/db/migrate/20141020164816_add_image_to_badges.rb b/db/migrate/20141020164816_add_image_to_badges.rb
index 2d8e8c5a2b..4d6101ecc2 100644
--- a/db/migrate/20141020164816_add_image_to_badges.rb
+++ b/db/migrate/20141020164816_add_image_to_badges.rb
@@ -1,4 +1,4 @@
-class AddImageToBadges < ActiveRecord::Migration
+class AddImageToBadges < ActiveRecord::Migration[4.2]
   def change
     add_column :badges, :image, :string, limit: 255
   end
diff --git a/db/migrate/20141020174120_add_card_image_to_user_profiles.rb b/db/migrate/20141020174120_add_card_image_to_user_profiles.rb
index a875ce0a56..c94074bc81 100644
--- a/db/migrate/20141020174120_add_card_image_to_user_profiles.rb
+++ b/db/migrate/20141020174120_add_card_image_to_user_profiles.rb
@@ -1,4 +1,4 @@
-class AddCardImageToUserProfiles < ActiveRecord::Migration
+class AddCardImageToUserProfiles < ActiveRecord::Migration[4.2]
   def change
     add_column :user_profiles, :card_image_badge_id, :integer
   end
diff --git a/db/migrate/20141030222425_rename_seen_post_count.rb b/db/migrate/20141030222425_rename_seen_post_count.rb
index dac8d14467..8401d8d67a 100644
--- a/db/migrate/20141030222425_rename_seen_post_count.rb
+++ b/db/migrate/20141030222425_rename_seen_post_count.rb
@@ -1,4 +1,4 @@
-class RenameSeenPostCount < ActiveRecord::Migration
+class RenameSeenPostCount < ActiveRecord::Migration[4.2]
   def change
     rename_column :topic_users, :seen_post_count, :highest_seen_post_number
   end
diff --git a/db/migrate/20141110150304_add_footer_to_site_customization.rb b/db/migrate/20141110150304_add_footer_to_site_customization.rb
index c681923099..c1266a1c70 100644
--- a/db/migrate/20141110150304_add_footer_to_site_customization.rb
+++ b/db/migrate/20141110150304_add_footer_to_site_customization.rb
@@ -1,4 +1,4 @@
-class AddFooterToSiteCustomization < ActiveRecord::Migration
+class AddFooterToSiteCustomization < ActiveRecord::Migration[4.2]
   def change
     add_column :site_customizations, :footer, :text
     add_column :site_customizations, :mobile_footer, :text
diff --git a/db/migrate/20141118011735_correct_username_search.rb b/db/migrate/20141118011735_correct_username_search.rb
index fad33f0f11..996b87e79b 100644
--- a/db/migrate/20141118011735_correct_username_search.rb
+++ b/db/migrate/20141118011735_correct_username_search.rb
@@ -1,4 +1,4 @@
-class CorrectUsernameSearch < ActiveRecord::Migration
+class CorrectUsernameSearch < ActiveRecord::Migration[4.2]
   def up
     execute "update user_search_data
               set search_data = TO_TSVECTOR('simple', username_lower || ' ' || lower(name))
diff --git a/db/migrate/20141120035016_add_allowed_ips_to_api_keys.rb b/db/migrate/20141120035016_add_allowed_ips_to_api_keys.rb
index 846c889195..275e040367 100644
--- a/db/migrate/20141120035016_add_allowed_ips_to_api_keys.rb
+++ b/db/migrate/20141120035016_add_allowed_ips_to_api_keys.rb
@@ -1,4 +1,4 @@
-class AddAllowedIpsToApiKeys < ActiveRecord::Migration
+class AddAllowedIpsToApiKeys < ActiveRecord::Migration[4.2]
   def change
     change_table :api_keys do |t|
       t.inet :allowed_ips, array: true
diff --git a/db/migrate/20141120043401_add_hidden_to_api_keys.rb b/db/migrate/20141120043401_add_hidden_to_api_keys.rb
index 565baa0504..c64acf921f 100644
--- a/db/migrate/20141120043401_add_hidden_to_api_keys.rb
+++ b/db/migrate/20141120043401_add_hidden_to_api_keys.rb
@@ -1,4 +1,4 @@
-class AddHiddenToApiKeys < ActiveRecord::Migration
+class AddHiddenToApiKeys < ActiveRecord::Migration[4.2]
   def change
     change_table :api_keys do |t|
       t.boolean :hidden, null: false, default: false
diff --git a/db/migrate/20141211114517_fix_emoji_path.rb b/db/migrate/20141211114517_fix_emoji_path.rb
index 03c5cd9bdd..8b202671f9 100644
--- a/db/migrate/20141211114517_fix_emoji_path.rb
+++ b/db/migrate/20141211114517_fix_emoji_path.rb
@@ -1,4 +1,4 @@
-class FixEmojiPath < ActiveRecord::Migration
+class FixEmojiPath < ActiveRecord::Migration[4.2]
   BASE_URL = '/plugins/emoji/images/'
 
   def up
diff --git a/db/migrate/20141216112341_resolve_duplicate_group_names.rb b/db/migrate/20141216112341_resolve_duplicate_group_names.rb
index 63a49e4b60..c13b1f7b80 100644
--- a/db/migrate/20141216112341_resolve_duplicate_group_names.rb
+++ b/db/migrate/20141216112341_resolve_duplicate_group_names.rb
@@ -1,4 +1,4 @@
-class ResolveDuplicateGroupNames < ActiveRecord::Migration
+class ResolveDuplicateGroupNames < ActiveRecord::Migration[4.2]
 
   def up
     results = Group.exec_sql 'SELECT id FROM groups
@@ -11,7 +11,7 @@ class ResolveDuplicateGroupNames < ActiveRecord::Migration
     groups  = Group.where id: results.map { |r| r['id'] }
     groups.group_by { |g| g.name.downcase }.each do |key, value|
       value.each_with_index do |dup, index|
-        dup.update! name: "#{dup.name[0..18]}_#{index+1}" if index > 0
+        dup.update! name: "#{dup.name[0..18]}_#{index + 1}" if index > 0
       end
     end
   end
diff --git a/db/migrate/20141222051622_remove_override_default_styles_from_site_customizations.rb b/db/migrate/20141222051622_remove_override_default_styles_from_site_customizations.rb
index c70f570f86..14c7c09910 100644
--- a/db/migrate/20141222051622_remove_override_default_styles_from_site_customizations.rb
+++ b/db/migrate/20141222051622_remove_override_default_styles_from_site_customizations.rb
@@ -1,4 +1,4 @@
-class RemoveOverrideDefaultStylesFromSiteCustomizations < ActiveRecord::Migration
+class RemoveOverrideDefaultStylesFromSiteCustomizations < ActiveRecord::Migration[4.2]
   def change
     remove_column :site_customizations, :override_default_style
   end
diff --git a/db/migrate/20141222224220_fix_emoji_path_take2.rb b/db/migrate/20141222224220_fix_emoji_path_take2.rb
index e0b167d065..b7842f1b53 100644
--- a/db/migrate/20141222224220_fix_emoji_path_take2.rb
+++ b/db/migrate/20141222224220_fix_emoji_path_take2.rb
@@ -1,4 +1,4 @@
-class FixEmojiPathTake2 < ActiveRecord::Migration
+class FixEmojiPathTake2 < ActiveRecord::Migration[4.2]
   OLD_URL = '/plugins/emoji/images/'
   NEW_URL = '/images/emoji/'
 
diff --git a/db/migrate/20141222230707_amend_site_customization.rb b/db/migrate/20141222230707_amend_site_customization.rb
index 70b3067f6f..36006f4111 100644
--- a/db/migrate/20141222230707_amend_site_customization.rb
+++ b/db/migrate/20141222230707_amend_site_customization.rb
@@ -1,4 +1,4 @@
-class AmendSiteCustomization < ActiveRecord::Migration
+class AmendSiteCustomization < ActiveRecord::Migration[4.2]
   def change
     remove_column :site_customizations, :position
   end
diff --git a/db/migrate/20141223145058_create_csv_export_logs.rb b/db/migrate/20141223145058_create_csv_export_logs.rb
index 83291db28b..afb698f49e 100644
--- a/db/migrate/20141223145058_create_csv_export_logs.rb
+++ b/db/migrate/20141223145058_create_csv_export_logs.rb
@@ -1,9 +1,9 @@
-class CreateCsvExportLogs < ActiveRecord::Migration
+class CreateCsvExportLogs < ActiveRecord::Migration[4.2]
   def change
     create_table :csv_export_logs do |t|
       t.string :export_type, null: false
       t.integer :user_id, null: false
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/db/migrate/20141228151019_rename_csv_export_logs_to_user_exports.rb b/db/migrate/20141228151019_rename_csv_export_logs_to_user_exports.rb
index 12d15bb5e1..e7364392f1 100644
--- a/db/migrate/20141228151019_rename_csv_export_logs_to_user_exports.rb
+++ b/db/migrate/20141228151019_rename_csv_export_logs_to_user_exports.rb
@@ -1,4 +1,4 @@
-class RenameCsvExportLogsToUserExports < ActiveRecord::Migration
+class RenameCsvExportLogsToUserExports < ActiveRecord::Migration[4.2]
   def change
     rename_table :csv_export_logs, :user_exports
   end
diff --git a/db/migrate/20150102113309_clean_up_user_history.rb b/db/migrate/20150102113309_clean_up_user_history.rb
index 8ddbe9be05..7e341e6710 100644
--- a/db/migrate/20150102113309_clean_up_user_history.rb
+++ b/db/migrate/20150102113309_clean_up_user_history.rb
@@ -1,4 +1,4 @@
-class CleanUpUserHistory < ActiveRecord::Migration
+class CleanUpUserHistory < ActiveRecord::Migration[4.2]
   def up
     # 'checked_for_custom_avatar' is not used anymore
     # was removed in https://github.com/discourse/discourse/commit/6c1c8be79433f87bef9d768da7b8fa4ec9bb18d7
diff --git a/db/migrate/20150106215342_remove_stars.rb b/db/migrate/20150106215342_remove_stars.rb
index 7e5f6e44d9..3cdf9ddbd9 100644
--- a/db/migrate/20150106215342_remove_stars.rb
+++ b/db/migrate/20150106215342_remove_stars.rb
@@ -1,4 +1,4 @@
-class RemoveStars < ActiveRecord::Migration
+class RemoveStars < ActiveRecord::Migration[4.2]
   def up
     r = execute <<SQL
     INSERT INTO post_actions(user_id, post_id, post_action_type_id, created_at, updated_at)
diff --git a/db/migrate/20150108002354_add_liked_and_bookmarked_to_topic_user.rb b/db/migrate/20150108002354_add_liked_and_bookmarked_to_topic_user.rb
index 2dcdd47314..7dbbd4becb 100644
--- a/db/migrate/20150108002354_add_liked_and_bookmarked_to_topic_user.rb
+++ b/db/migrate/20150108002354_add_liked_and_bookmarked_to_topic_user.rb
@@ -1,10 +1,10 @@
-class AddLikedAndBookmarkedToTopicUser < ActiveRecord::Migration
+class AddLikedAndBookmarkedToTopicUser < ActiveRecord::Migration[4.2]
   def up
     add_column :topic_users, :liked, :boolean, default: false
     add_column :topic_users, :bookmarked, :boolean, default: false
 
     # likes and bookmarks PostActionType.types[:like] and :bookmark which should not be used in a migration
-    {liked: 2, bookmarked: 1}.each do |name, type|
+    { liked: 2, bookmarked: 1 }.each do |name, type|
       execute "UPDATE topic_users
                SET #{name} = true
                WHERE EXISTS (SELECT 1 FROM post_actions pa
diff --git a/db/migrate/20150108202057_create_bookmark_actions.rb b/db/migrate/20150108202057_create_bookmark_actions.rb
index 5b27ab4459..fe454316e3 100644
--- a/db/migrate/20150108202057_create_bookmark_actions.rb
+++ b/db/migrate/20150108202057_create_bookmark_actions.rb
@@ -1,4 +1,4 @@
-class CreateBookmarkActions < ActiveRecord::Migration
+class CreateBookmarkActions < ActiveRecord::Migration[4.2]
   def up
     execute "INSERT INTO user_actions (action_type,
                                        user_id,
diff --git a/db/migrate/20150108211557_index_topic_custom_field_values.rb b/db/migrate/20150108211557_index_topic_custom_field_values.rb
index da06ff034e..ece3ab1527 100644
--- a/db/migrate/20150108211557_index_topic_custom_field_values.rb
+++ b/db/migrate/20150108211557_index_topic_custom_field_values.rb
@@ -1,4 +1,4 @@
-class IndexTopicCustomFieldValues < ActiveRecord::Migration
+class IndexTopicCustomFieldValues < ActiveRecord::Migration[4.2]
   def change
     add_index :topic_custom_fields, :value
   end
diff --git a/db/migrate/20150108221703_group_managers.rb b/db/migrate/20150108221703_group_managers.rb
index 9c6e356ff2..9fcee22b13 100644
--- a/db/migrate/20150108221703_group_managers.rb
+++ b/db/migrate/20150108221703_group_managers.rb
@@ -1,9 +1,9 @@
-class GroupManagers < ActiveRecord::Migration
+class GroupManagers < ActiveRecord::Migration[4.2]
   def change
     create_table :group_managers do |t|
       t.integer :group_id, null: false
       t.integer :user_id, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :group_managers, [:group_id, :user_id], unique: true
diff --git a/db/migrate/20150112172258_add_new_site_customization_types.rb b/db/migrate/20150112172258_add_new_site_customization_types.rb
index dcfe2db6de..0114d42683 100644
--- a/db/migrate/20150112172258_add_new_site_customization_types.rb
+++ b/db/migrate/20150112172258_add_new_site_customization_types.rb
@@ -1,4 +1,4 @@
-class AddNewSiteCustomizationTypes < ActiveRecord::Migration
+class AddNewSiteCustomizationTypes < ActiveRecord::Migration[4.2]
   def change
     add_column :site_customizations, :head_tag, :text
     add_column :site_customizations, :body_tag, :text
diff --git a/db/migrate/20150112172259_migrate_site_text_to_site_customization.rb b/db/migrate/20150112172259_migrate_site_text_to_site_customization.rb
index 4e3b18fe73..9b2f5b05cc 100644
--- a/db/migrate/20150112172259_migrate_site_text_to_site_customization.rb
+++ b/db/migrate/20150112172259_migrate_site_text_to_site_customization.rb
@@ -1,4 +1,4 @@
-class MigrateSiteTextToSiteCustomization < ActiveRecord::Migration
+class MigrateSiteTextToSiteCustomization < ActiveRecord::Migration[4.2]
 
   def up
     execute <<-SQL
diff --git a/db/migrate/20150114093325_add_top_to_site_customization.rb b/db/migrate/20150114093325_add_top_to_site_customization.rb
index 0aee14ccae..a51e6e3c02 100644
--- a/db/migrate/20150114093325_add_top_to_site_customization.rb
+++ b/db/migrate/20150114093325_add_top_to_site_customization.rb
@@ -1,4 +1,4 @@
-class AddTopToSiteCustomization < ActiveRecord::Migration
+class AddTopToSiteCustomization < ActiveRecord::Migration[4.2]
   def up
     add_column :site_customizations, :top, :text
     add_column :site_customizations, :mobile_top, :text
diff --git a/db/migrate/20150115172310_rename_user_export_column.rb b/db/migrate/20150115172310_rename_user_export_column.rb
index 604e2b0b1e..138a8a5a3c 100644
--- a/db/migrate/20150115172310_rename_user_export_column.rb
+++ b/db/migrate/20150115172310_rename_user_export_column.rb
@@ -1,4 +1,4 @@
-class RenameUserExportColumn < ActiveRecord::Migration
+class RenameUserExportColumn < ActiveRecord::Migration[4.2]
   def change
     rename_column :user_exports, :export_type, :file_name
   end
diff --git a/db/migrate/20150119192813_add_posts_index_including_deleted.rb b/db/migrate/20150119192813_add_posts_index_including_deleted.rb
index 20d6e588df..6a2ad78ce9 100644
--- a/db/migrate/20150119192813_add_posts_index_including_deleted.rb
+++ b/db/migrate/20150119192813_add_posts_index_including_deleted.rb
@@ -1,4 +1,4 @@
-class AddPostsIndexIncludingDeleted < ActiveRecord::Migration
+class AddPostsIndexIncludingDeleted < ActiveRecord::Migration[4.2]
   def change
     add_index :posts, [:user_id, :created_at]
   end
diff --git a/db/migrate/20150123145128_add_automatic_membership_to_group.rb b/db/migrate/20150123145128_add_automatic_membership_to_group.rb
index 2ea654656e..22aa311b06 100644
--- a/db/migrate/20150123145128_add_automatic_membership_to_group.rb
+++ b/db/migrate/20150123145128_add_automatic_membership_to_group.rb
@@ -1,4 +1,4 @@
-class AddAutomaticMembershipToGroup < ActiveRecord::Migration
+class AddAutomaticMembershipToGroup < ActiveRecord::Migration[4.2]
   def change
     add_column :groups, :automatic_membership_email_domains, :text
     add_column :groups, :automatic_membership_retroactive, :boolean, default: false
diff --git a/db/migrate/20150129204520_add_show_on_profile_to_user_fields.rb b/db/migrate/20150129204520_add_show_on_profile_to_user_fields.rb
index e4a641f98d..3b7b0da59f 100644
--- a/db/migrate/20150129204520_add_show_on_profile_to_user_fields.rb
+++ b/db/migrate/20150129204520_add_show_on_profile_to_user_fields.rb
@@ -1,4 +1,4 @@
-class AddShowOnProfileToUserFields < ActiveRecord::Migration
+class AddShowOnProfileToUserFields < ActiveRecord::Migration[4.2]
   def change
     add_column :user_fields, :show_on_profile, :boolean, default: false, null: false
   end
diff --git a/db/migrate/20150203041207_add_application_requests.rb b/db/migrate/20150203041207_add_application_requests.rb
index 32678edf85..844bfebf7c 100644
--- a/db/migrate/20150203041207_add_application_requests.rb
+++ b/db/migrate/20150203041207_add_application_requests.rb
@@ -1,4 +1,4 @@
-class AddApplicationRequests < ActiveRecord::Migration
+class AddApplicationRequests < ActiveRecord::Migration[4.2]
   def change
     create_table :application_requests do |t|
       t.date :date, null: false
diff --git a/db/migrate/20150205032808_reset_application_requests.rb b/db/migrate/20150205032808_reset_application_requests.rb
index a9c8f039f3..e41f160293 100644
--- a/db/migrate/20150205032808_reset_application_requests.rb
+++ b/db/migrate/20150205032808_reset_application_requests.rb
@@ -1,4 +1,4 @@
-class ResetApplicationRequests < ActiveRecord::Migration
+class ResetApplicationRequests < ActiveRecord::Migration[4.2]
 
   def up
     # enum changed we need to clear the data
diff --git a/db/migrate/20150205172051_add_custom_type_to_user_histories.rb b/db/migrate/20150205172051_add_custom_type_to_user_histories.rb
index 1706a4fa9a..ed6ff0a9e4 100644
--- a/db/migrate/20150205172051_add_custom_type_to_user_histories.rb
+++ b/db/migrate/20150205172051_add_custom_type_to_user_histories.rb
@@ -1,4 +1,4 @@
-class AddCustomTypeToUserHistories < ActiveRecord::Migration
+class AddCustomTypeToUserHistories < ActiveRecord::Migration[4.2]
   def change
     add_column :user_histories, :custom_type, :string
   end
diff --git a/db/migrate/20150206004143_flush_application_requests.rb b/db/migrate/20150206004143_flush_application_requests.rb
index 5d5a6e454c..c00ea9370c 100644
--- a/db/migrate/20150206004143_flush_application_requests.rb
+++ b/db/migrate/20150206004143_flush_application_requests.rb
@@ -1,4 +1,4 @@
-class FlushApplicationRequests < ActiveRecord::Migration
+class FlushApplicationRequests < ActiveRecord::Migration[4.2]
   def up
     # flush as enum changed
     execute "TRUNCATE TABLE application_requests"
diff --git a/db/migrate/20150213174159_create_digest_unsubscribe_keys.rb b/db/migrate/20150213174159_create_digest_unsubscribe_keys.rb
index 102146b6aa..52ec4d300a 100644
--- a/db/migrate/20150213174159_create_digest_unsubscribe_keys.rb
+++ b/db/migrate/20150213174159_create_digest_unsubscribe_keys.rb
@@ -1,9 +1,9 @@
-class CreateDigestUnsubscribeKeys < ActiveRecord::Migration
+class CreateDigestUnsubscribeKeys < ActiveRecord::Migration[4.2]
   def up
     create_table :digest_unsubscribe_keys, id: false do |t|
       t.string :key, limit: 64, null: false
       t.integer :user_id, null: false
-      t.timestamps
+      t.timestamps null: false
     end
     execute "ALTER TABLE digest_unsubscribe_keys ADD PRIMARY KEY (key)"
     add_index :digest_unsubscribe_keys, :created_at
diff --git a/db/migrate/20150224004420_add_pinned_indexes.rb b/db/migrate/20150224004420_add_pinned_indexes.rb
index b750a4d0d6..99dc4bef7f 100644
--- a/db/migrate/20150224004420_add_pinned_indexes.rb
+++ b/db/migrate/20150224004420_add_pinned_indexes.rb
@@ -1,4 +1,4 @@
-class AddPinnedIndexes < ActiveRecord::Migration
+class AddPinnedIndexes < ActiveRecord::Migration[4.2]
   def change
     add_index :topics, :pinned_globally, where: 'pinned_globally'
     add_index :topics, :pinned_at, where: 'pinned_at IS NOT NULL'
diff --git a/db/migrate/20150227043622_add_long_description_to_badges.rb b/db/migrate/20150227043622_add_long_description_to_badges.rb
index c89a1007c4..df683ff09d 100644
--- a/db/migrate/20150227043622_add_long_description_to_badges.rb
+++ b/db/migrate/20150227043622_add_long_description_to_badges.rb
@@ -1,4 +1,4 @@
-class AddLongDescriptionToBadges < ActiveRecord::Migration
+class AddLongDescriptionToBadges < ActiveRecord::Migration[4.2]
   def change
     add_column :badges, :long_description, :text
   end
diff --git a/db/migrate/20150301224250_create_suggested_for_index.rb b/db/migrate/20150301224250_create_suggested_for_index.rb
index dece353905..42e4dd7faa 100644
--- a/db/migrate/20150301224250_create_suggested_for_index.rb
+++ b/db/migrate/20150301224250_create_suggested_for_index.rb
@@ -1,4 +1,4 @@
-class CreateSuggestedForIndex < ActiveRecord::Migration
+class CreateSuggestedForIndex < ActiveRecord::Migration[4.2]
   def change
     add_index :topics, [:created_at, :visible],
                 where: "deleted_at IS NULL AND archetype <> 'private_message'"
diff --git a/db/migrate/20150306050437_add_all_time_and_op_likes_to_top_topics.rb b/db/migrate/20150306050437_add_all_time_and_op_likes_to_top_topics.rb
index 36bc6de65a..cfd31ba158 100644
--- a/db/migrate/20150306050437_add_all_time_and_op_likes_to_top_topics.rb
+++ b/db/migrate/20150306050437_add_all_time_and_op_likes_to_top_topics.rb
@@ -1,4 +1,4 @@
-class AddAllTimeAndOpLikesToTopTopics < ActiveRecord::Migration
+class AddAllTimeAndOpLikesToTopTopics < ActiveRecord::Migration[4.2]
   def change
     add_column :top_topics, :all_score, :float, default: 0
     [:daily, :weekly, :monthly, :yearly].each do |period|
diff --git a/db/migrate/20150318143915_create_directory_items.rb b/db/migrate/20150318143915_create_directory_items.rb
index 088bfba0d0..9ca67c7506 100644
--- a/db/migrate/20150318143915_create_directory_items.rb
+++ b/db/migrate/20150318143915_create_directory_items.rb
@@ -1,4 +1,4 @@
-class CreateDirectoryItems < ActiveRecord::Migration
+class CreateDirectoryItems < ActiveRecord::Migration[4.2]
   def change
     create_table :directory_items, force: true do |t|
       t.integer :period_type, null: false
@@ -8,7 +8,7 @@ class CreateDirectoryItems < ActiveRecord::Migration
       t.integer :topics_entered, null: false
       t.integer :topic_count, null: false
       t.integer :post_count, null: false
-      t.timestamps
+      t.timestamps null: true
     end
 
     add_index :directory_items, :period_type
diff --git a/db/migrate/20150323034933_add_allow_private_messages_to_user_profile.rb b/db/migrate/20150323034933_add_allow_private_messages_to_user_profile.rb
index f80bc1b11c..cbf27cf038 100644
--- a/db/migrate/20150323034933_add_allow_private_messages_to_user_profile.rb
+++ b/db/migrate/20150323034933_add_allow_private_messages_to_user_profile.rb
@@ -1,4 +1,4 @@
-class AddAllowPrivateMessagesToUserProfile < ActiveRecord::Migration
+class AddAllowPrivateMessagesToUserProfile < ActiveRecord::Migration[4.2]
   def change
     add_column :user_profiles, :allow_private_messages, :boolean, default: true, null: false
   end
diff --git a/db/migrate/20150323062322_remove_allow_private_messages_from_user_profile.rb b/db/migrate/20150323062322_remove_allow_private_messages_from_user_profile.rb
index ea120aa584..0a3781a78d 100644
--- a/db/migrate/20150323062322_remove_allow_private_messages_from_user_profile.rb
+++ b/db/migrate/20150323062322_remove_allow_private_messages_from_user_profile.rb
@@ -1,4 +1,4 @@
-class RemoveAllowPrivateMessagesFromUserProfile < ActiveRecord::Migration
+class RemoveAllowPrivateMessagesFromUserProfile < ActiveRecord::Migration[4.2]
   def change
     remove_column :user_profiles, :allow_private_messages
   end
diff --git a/db/migrate/20150323234856_add_muted_users.rb b/db/migrate/20150323234856_add_muted_users.rb
index 8192d38284..9b4edb5d37 100644
--- a/db/migrate/20150323234856_add_muted_users.rb
+++ b/db/migrate/20150323234856_add_muted_users.rb
@@ -1,9 +1,9 @@
-class AddMutedUsers < ActiveRecord::Migration
+class AddMutedUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :muted_users, force: true do |t|
       t.integer :user_id, null: false
       t.integer :muted_user_id, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :muted_users, [:user_id, :muted_user_id], unique: true
diff --git a/db/migrate/20150324184222_add_more_to_directory_items.rb b/db/migrate/20150324184222_add_more_to_directory_items.rb
index efc7e9477f..28eac2dced 100644
--- a/db/migrate/20150324184222_add_more_to_directory_items.rb
+++ b/db/migrate/20150324184222_add_more_to_directory_items.rb
@@ -1,4 +1,4 @@
-class AddMoreToDirectoryItems < ActiveRecord::Migration
+class AddMoreToDirectoryItems < ActiveRecord::Migration[4.2]
   def change
     add_column :directory_items, :days_visited, :integer, null: false, default: 0
     add_column :directory_items, :posts_read, :integer, null: false, default: 0
diff --git a/db/migrate/20150325183400_fix_group_user_count.rb b/db/migrate/20150325183400_fix_group_user_count.rb
index 96988a6287..4cffb5eea5 100644
--- a/db/migrate/20150325183400_fix_group_user_count.rb
+++ b/db/migrate/20150325183400_fix_group_user_count.rb
@@ -1,4 +1,4 @@
-class FixGroupUserCount < ActiveRecord::Migration
+class FixGroupUserCount < ActiveRecord::Migration[4.2]
   def change
     execute "UPDATE groups g SET user_count = (SELECT COUNT(user_id) FROM group_users gu WHERE gu.group_id = g.id)"
   end
diff --git a/db/migrate/20150325190959_create_queued_posts.rb b/db/migrate/20150325190959_create_queued_posts.rb
index 9946a642b7..b2bf9e1eef 100644
--- a/db/migrate/20150325190959_create_queued_posts.rb
+++ b/db/migrate/20150325190959_create_queued_posts.rb
@@ -1,4 +1,4 @@
-class CreateQueuedPosts < ActiveRecord::Migration
+class CreateQueuedPosts < ActiveRecord::Migration[4.2]
   def change
     create_table :queued_posts, force: true do |t|
       t.string     :queue, null: false
@@ -11,7 +11,7 @@ class CreateQueuedPosts < ActiveRecord::Migration
       t.timestamp  :approved_at
       t.integer    :rejected_by_id
       t.timestamp  :rejected_at
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :queued_posts, [:queue, :state, :created_at], name: 'by_queue_status'
diff --git a/db/migrate/20150410002033_add_primary_group_to_groups.rb b/db/migrate/20150410002033_add_primary_group_to_groups.rb
index 23e4e87138..ddd303e182 100644
--- a/db/migrate/20150410002033_add_primary_group_to_groups.rb
+++ b/db/migrate/20150410002033_add_primary_group_to_groups.rb
@@ -1,4 +1,4 @@
-class AddPrimaryGroupToGroups < ActiveRecord::Migration
+class AddPrimaryGroupToGroups < ActiveRecord::Migration[4.2]
   def change
     add_column :groups, :primary_group, :boolean, default: false, null: false
   end
diff --git a/db/migrate/20150410002551_add_title_to_groups.rb b/db/migrate/20150410002551_add_title_to_groups.rb
index eb90e98efa..ccc234e665 100644
--- a/db/migrate/20150410002551_add_title_to_groups.rb
+++ b/db/migrate/20150410002551_add_title_to_groups.rb
@@ -1,4 +1,4 @@
-class AddTitleToGroups < ActiveRecord::Migration
+class AddTitleToGroups < ActiveRecord::Migration[4.2]
   def change
     add_column :groups, :title, :string
   end
diff --git a/db/migrate/20150421085850_increase_url_length_on_topic_embed.rb b/db/migrate/20150421085850_increase_url_length_on_topic_embed.rb
index 3f0ea315be..6166070be1 100644
--- a/db/migrate/20150421085850_increase_url_length_on_topic_embed.rb
+++ b/db/migrate/20150421085850_increase_url_length_on_topic_embed.rb
@@ -1,4 +1,4 @@
-class IncreaseUrlLengthOnTopicEmbed < ActiveRecord::Migration
+class IncreaseUrlLengthOnTopicEmbed < ActiveRecord::Migration[4.2]
   def up
     remove_index :topic_embeds, :embed_url
     change_column :topic_embeds, :embed_url, :string, limit: 1000, null: false
diff --git a/db/migrate/20150421190714_add_queued_post_id_to_user_actions.rb b/db/migrate/20150421190714_add_queued_post_id_to_user_actions.rb
index d6987afc25..f658d1f0ea 100644
--- a/db/migrate/20150421190714_add_queued_post_id_to_user_actions.rb
+++ b/db/migrate/20150421190714_add_queued_post_id_to_user_actions.rb
@@ -1,4 +1,4 @@
-class AddQueuedPostIdToUserActions < ActiveRecord::Migration
+class AddQueuedPostIdToUserActions < ActiveRecord::Migration[4.2]
   def change
     add_column :user_actions, :queued_post_id, :integer, null: true
   end
diff --git a/db/migrate/20150422160235_add_link_post_id_index_on_topic_links.rb b/db/migrate/20150422160235_add_link_post_id_index_on_topic_links.rb
index 0ccb656279..24442c3625 100644
--- a/db/migrate/20150422160235_add_link_post_id_index_on_topic_links.rb
+++ b/db/migrate/20150422160235_add_link_post_id_index_on_topic_links.rb
@@ -1,4 +1,4 @@
-class AddLinkPostIdIndexOnTopicLinks < ActiveRecord::Migration
+class AddLinkPostIdIndexOnTopicLinks < ActiveRecord::Migration[4.2]
   def change
     add_index :topic_links, [:link_post_id, :reflection]
   end
diff --git a/db/migrate/20150505044154_add_stylesheet_cache.rb b/db/migrate/20150505044154_add_stylesheet_cache.rb
index a23757ef97..98634c543f 100644
--- a/db/migrate/20150505044154_add_stylesheet_cache.rb
+++ b/db/migrate/20150505044154_add_stylesheet_cache.rb
@@ -1,10 +1,10 @@
-class AddStylesheetCache < ActiveRecord::Migration
+class AddStylesheetCache < ActiveRecord::Migration[4.2]
   def change
     create_table :stylesheet_cache do |t|
       t.string :target, null: false
       t.string :digest, null: false
       t.text :content, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :stylesheet_cache, [:target, :digest], unique: true
diff --git a/db/migrate/20150513094042_add_index_on_post_actions.rb b/db/migrate/20150513094042_add_index_on_post_actions.rb
index e79c0ce9be..54502aa7fc 100644
--- a/db/migrate/20150513094042_add_index_on_post_actions.rb
+++ b/db/migrate/20150513094042_add_index_on_post_actions.rb
@@ -1,4 +1,4 @@
-class AddIndexOnPostActions < ActiveRecord::Migration
+class AddIndexOnPostActions < ActiveRecord::Migration[4.2]
   def change
     add_index :post_actions, [:user_id, :post_action_type_id], where: 'deleted_at IS NULL'
   end
diff --git a/db/migrate/20150514023016_add_unread_notifications_index.rb b/db/migrate/20150514023016_add_unread_notifications_index.rb
index e4a7694c18..fabd25fca6 100644
--- a/db/migrate/20150514023016_add_unread_notifications_index.rb
+++ b/db/migrate/20150514023016_add_unread_notifications_index.rb
@@ -1,4 +1,4 @@
-class AddUnreadNotificationsIndex < ActiveRecord::Migration
+class AddUnreadNotificationsIndex < ActiveRecord::Migration[4.2]
   def change
     add_index :notifications, [:user_id, :notification_type], where: 'not read', name: 'idx_notifications_speedup_unread_count'
   end
diff --git a/db/migrate/20150514043155_add_user_actions_all_index.rb b/db/migrate/20150514043155_add_user_actions_all_index.rb
index 5d2a9d54c0..74feeccb32 100644
--- a/db/migrate/20150514043155_add_user_actions_all_index.rb
+++ b/db/migrate/20150514043155_add_user_actions_all_index.rb
@@ -1,4 +1,4 @@
-class AddUserActionsAllIndex < ActiveRecord::Migration
+class AddUserActionsAllIndex < ActiveRecord::Migration[4.2]
   def change
     add_index :user_actions, [:user_id, :created_at, :action_type], name: 'idx_user_actions_speed_up_user_all'
   end
diff --git a/db/migrate/20150525151759_set_default_s3_region.rb b/db/migrate/20150525151759_set_default_s3_region.rb
index de3d0b7b2c..58ecb95fcf 100644
--- a/db/migrate/20150525151759_set_default_s3_region.rb
+++ b/db/migrate/20150525151759_set_default_s3_region.rb
@@ -1,4 +1,4 @@
-class SetDefaultS3Region < ActiveRecord::Migration
+class SetDefaultS3Region < ActiveRecord::Migration[4.2]
   def up
     execute <<-SQL
       UPDATE site_settings
diff --git a/db/migrate/20150609163211_migrate_embeddable_host.rb b/db/migrate/20150609163211_migrate_embeddable_host.rb
index d3d351a32b..de40f7290c 100644
--- a/db/migrate/20150609163211_migrate_embeddable_host.rb
+++ b/db/migrate/20150609163211_migrate_embeddable_host.rb
@@ -1,4 +1,4 @@
-class MigrateEmbeddableHost < ActiveRecord::Migration
+class MigrateEmbeddableHost < ActiveRecord::Migration[4.2]
   def change
     execute "UPDATE site_settings SET name = 'embeddable_hosts', data_type = 9 WHERE name = 'embeddable_host'"
   end
diff --git a/db/migrate/20150617080349_add_index_on_post_notifications.rb b/db/migrate/20150617080349_add_index_on_post_notifications.rb
index a8cbccfdc8..a2f65f6a36 100644
--- a/db/migrate/20150617080349_add_index_on_post_notifications.rb
+++ b/db/migrate/20150617080349_add_index_on_post_notifications.rb
@@ -1,4 +1,4 @@
-class AddIndexOnPostNotifications < ActiveRecord::Migration
+class AddIndexOnPostNotifications < ActiveRecord::Migration[4.2]
   def change
     add_index :notifications, [:user_id, :topic_id, :post_number]
   end
diff --git a/db/migrate/20150617233018_add_index_target_post_id_on_user_actions.rb b/db/migrate/20150617233018_add_index_target_post_id_on_user_actions.rb
index 973bda76f0..ec4b5ea016 100644
--- a/db/migrate/20150617233018_add_index_target_post_id_on_user_actions.rb
+++ b/db/migrate/20150617233018_add_index_target_post_id_on_user_actions.rb
@@ -1,4 +1,4 @@
-class AddIndexTargetPostIdOnUserActions < ActiveRecord::Migration
+class AddIndexTargetPostIdOnUserActions < ActiveRecord::Migration[4.2]
   def change
     add_index :user_actions, [:target_post_id]
   end
diff --git a/db/migrate/20150617234511_add_staff_index_to_users.rb b/db/migrate/20150617234511_add_staff_index_to_users.rb
index f060b9b169..5b4ddf8568 100644
--- a/db/migrate/20150617234511_add_staff_index_to_users.rb
+++ b/db/migrate/20150617234511_add_staff_index_to_users.rb
@@ -1,4 +1,4 @@
-class AddStaffIndexToUsers < ActiveRecord::Migration
+class AddStaffIndexToUsers < ActiveRecord::Migration[4.2]
   def change
     add_index :users, [:id], name: 'idx_users_admin', where: 'admin'
     add_index :users, [:id], name: 'idx_users_moderator', where: 'moderator'
diff --git a/db/migrate/20150702201926_add_topic_template_to_categories.rb b/db/migrate/20150702201926_add_topic_template_to_categories.rb
index 719851cdbc..b1e66e5340 100644
--- a/db/migrate/20150702201926_add_topic_template_to_categories.rb
+++ b/db/migrate/20150702201926_add_topic_template_to_categories.rb
@@ -1,4 +1,4 @@
-class AddTopicTemplateToCategories < ActiveRecord::Migration
+class AddTopicTemplateToCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :topic_template, :text, null: true
   end
diff --git a/db/migrate/20150706215111_add_mobile_to_user_visits.rb b/db/migrate/20150706215111_add_mobile_to_user_visits.rb
index f794e1a8ff..1e371b9413 100644
--- a/db/migrate/20150706215111_add_mobile_to_user_visits.rb
+++ b/db/migrate/20150706215111_add_mobile_to_user_visits.rb
@@ -1,4 +1,4 @@
-class AddMobileToUserVisits < ActiveRecord::Migration
+class AddMobileToUserVisits < ActiveRecord::Migration[4.2]
   def change
     add_column :user_visits, :mobile, :boolean, default: false
   end
diff --git a/db/migrate/20150707163251_add_reports_index_to_user_visits.rb b/db/migrate/20150707163251_add_reports_index_to_user_visits.rb
index 299bcb250e..c0d56dfe19 100644
--- a/db/migrate/20150707163251_add_reports_index_to_user_visits.rb
+++ b/db/migrate/20150707163251_add_reports_index_to_user_visits.rb
@@ -1,4 +1,4 @@
-class AddReportsIndexToUserVisits < ActiveRecord::Migration
+class AddReportsIndexToUserVisits < ActiveRecord::Migration[4.2]
   def up
     add_index :user_visits, [:visited_at, :mobile]
   end
diff --git a/db/migrate/20150709021818_add_like_count_to_post_menu.rb b/db/migrate/20150709021818_add_like_count_to_post_menu.rb
index a12a166f41..901a7c35a0 100644
--- a/db/migrate/20150709021818_add_like_count_to_post_menu.rb
+++ b/db/migrate/20150709021818_add_like_count_to_post_menu.rb
@@ -1,4 +1,4 @@
-class AddLikeCountToPostMenu < ActiveRecord::Migration
+class AddLikeCountToPostMenu < ActiveRecord::Migration[4.2]
   def up
     execute <<SQL
 UPDATE site_settings
diff --git a/db/migrate/20150713203955_enlarge_users_email_field.rb b/db/migrate/20150713203955_enlarge_users_email_field.rb
index 15856c0f04..c640fc26bd 100644
--- a/db/migrate/20150713203955_enlarge_users_email_field.rb
+++ b/db/migrate/20150713203955_enlarge_users_email_field.rb
@@ -1,8 +1,8 @@
-class EnlargeUsersEmailField < ActiveRecord::Migration
+class EnlargeUsersEmailField < ActiveRecord::Migration[4.2]
   def up
-    change_column :users, :email, :string, :limit => 513
+    change_column :users, :email, :string, limit: 513
   end
   def down
-    change_column :users, :email, :string, :limit => 128
+    change_column :users, :email, :string, limit: 128
   end
 end
diff --git a/db/migrate/20150724165259_add_index_to_post_custom_fields.rb b/db/migrate/20150724165259_add_index_to_post_custom_fields.rb
index 230b3d499f..4d043be4b7 100644
--- a/db/migrate/20150724165259_add_index_to_post_custom_fields.rb
+++ b/db/migrate/20150724165259_add_index_to_post_custom_fields.rb
@@ -1,4 +1,4 @@
-class AddIndexToPostCustomFields < ActiveRecord::Migration
+class AddIndexToPostCustomFields < ActiveRecord::Migration[4.2]
   def up
     execute <<SQL
       CREATE INDEX index_post_custom_fields_on_name_and_value ON post_custom_fields USING btree (name, left(value, 200))
diff --git a/db/migrate/20150724182342_add_action_code_to_post.rb b/db/migrate/20150724182342_add_action_code_to_post.rb
index df27d1ec82..3e763816bc 100644
--- a/db/migrate/20150724182342_add_action_code_to_post.rb
+++ b/db/migrate/20150724182342_add_action_code_to_post.rb
@@ -1,4 +1,4 @@
-class AddActionCodeToPost < ActiveRecord::Migration
+class AddActionCodeToPost < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :action_code, :string, null: true
   end
diff --git a/db/migrate/20150727193414_create_user_field_options.rb b/db/migrate/20150727193414_create_user_field_options.rb
index 64e6e8ed37..e4f24a53c4 100644
--- a/db/migrate/20150727193414_create_user_field_options.rb
+++ b/db/migrate/20150727193414_create_user_field_options.rb
@@ -1,9 +1,9 @@
-class CreateUserFieldOptions < ActiveRecord::Migration
+class CreateUserFieldOptions < ActiveRecord::Migration[4.2]
   def change
     create_table :user_field_options, force: true do |t|
       t.references :user_field, null: false
       t.string :value, null: false
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/db/migrate/20150727210019_add_pinned_until_to_topics.rb b/db/migrate/20150727210019_add_pinned_until_to_topics.rb
index 992448416b..a72f3bdb15 100644
--- a/db/migrate/20150727210019_add_pinned_until_to_topics.rb
+++ b/db/migrate/20150727210019_add_pinned_until_to_topics.rb
@@ -1,4 +1,4 @@
-class AddPinnedUntilToTopics < ActiveRecord::Migration
+class AddPinnedUntilToTopics < ActiveRecord::Migration[4.2]
   def change
     add_column :topics, :pinned_until, :datetime, null: true
   end
diff --git a/db/migrate/20150727210748_add_quarterly_to_top_topics.rb b/db/migrate/20150727210748_add_quarterly_to_top_topics.rb
index 0539820f66..351994a2b1 100644
--- a/db/migrate/20150727210748_add_quarterly_to_top_topics.rb
+++ b/db/migrate/20150727210748_add_quarterly_to_top_topics.rb
@@ -1,4 +1,4 @@
-class AddQuarterlyToTopTopics < ActiveRecord::Migration
+class AddQuarterlyToTopTopics < ActiveRecord::Migration[4.2]
   def change
     add_column :top_topics, :quarterly_posts_count,    :integer, default: 0, null: false
     add_column :top_topics, :quarterly_views_count,    :integer, default: 0, null: false
diff --git a/db/migrate/20150728004647_correct_custom_fields_migration.rb b/db/migrate/20150728004647_correct_custom_fields_migration.rb
index 1e72dd53e4..fb1e487cbd 100644
--- a/db/migrate/20150728004647_correct_custom_fields_migration.rb
+++ b/db/migrate/20150728004647_correct_custom_fields_migration.rb
@@ -1,4 +1,4 @@
-class CorrectCustomFieldsMigration < ActiveRecord::Migration
+class CorrectCustomFieldsMigration < ActiveRecord::Migration[4.2]
   def up
     execute <<SQL
       DROP INDEX index_post_custom_fields_on_name_and_value
diff --git a/db/migrate/20150728210202_migrate_old_moderator_posts.rb b/db/migrate/20150728210202_migrate_old_moderator_posts.rb
index a741854b0a..ee8a4f0fd3 100644
--- a/db/migrate/20150728210202_migrate_old_moderator_posts.rb
+++ b/db/migrate/20150728210202_migrate_old_moderator_posts.rb
@@ -1,4 +1,4 @@
-class MigrateOldModeratorPosts < ActiveRecord::Migration
+class MigrateOldModeratorPosts < ActiveRecord::Migration[4.2]
 
   def migrate_key(action_code)
     I18n.overrides_disabled do
diff --git a/db/migrate/20150729150523_migrate_auto_close_posts.rb b/db/migrate/20150729150523_migrate_auto_close_posts.rb
index d00ec9623a..6b90842d9a 100644
--- a/db/migrate/20150729150523_migrate_auto_close_posts.rb
+++ b/db/migrate/20150729150523_migrate_auto_close_posts.rb
@@ -1,4 +1,4 @@
-class MigrateAutoClosePosts < ActiveRecord::Migration
+class MigrateAutoClosePosts < ActiveRecord::Migration[4.2]
   def up
     I18n.overrides_disabled do
       strings = []
@@ -9,7 +9,7 @@ class MigrateAutoClosePosts < ActiveRecord::Migration
 
       sql = "UPDATE posts SET action_code = 'autoclosed.enabled', post_type = 3 "
       sql << "WHERE post_type = 2 AND ("
-      sql << strings.map {|s| "raw ~* #{ActiveRecord::Base.connection.quote(s)}" }.join(' OR ')
+      sql << strings.map { |s| "raw ~* #{ActiveRecord::Base.connection.quote(s)}" }.join(' OR ')
       sql << ")"
 
       execute sql
diff --git a/db/migrate/20150730154830_add_position_to_user_fields.rb b/db/migrate/20150730154830_add_position_to_user_fields.rb
index 0f0fd04999..58859dac98 100644
--- a/db/migrate/20150730154830_add_position_to_user_fields.rb
+++ b/db/migrate/20150730154830_add_position_to_user_fields.rb
@@ -1,4 +1,4 @@
-class AddPositionToUserFields < ActiveRecord::Migration
+class AddPositionToUserFields < ActiveRecord::Migration[4.2]
   def change
     add_column :user_fields, :position, :integer, default: 0
     execute "UPDATE user_fields SET position = (SELECT COUNT(*) from user_fields as uf2 where uf2.id < user_fields.id)"
diff --git a/db/migrate/20150731225331_migrate_old_moved_posts.rb b/db/migrate/20150731225331_migrate_old_moved_posts.rb
index 73add43ded..ae1160f1bb 100644
--- a/db/migrate/20150731225331_migrate_old_moved_posts.rb
+++ b/db/migrate/20150731225331_migrate_old_moved_posts.rb
@@ -1,4 +1,4 @@
-class MigrateOldMovedPosts < ActiveRecord::Migration
+class MigrateOldMovedPosts < ActiveRecord::Migration[4.2]
   def up
     execute "UPDATE posts SET post_type = 3, action_code = 'split_topic' WHERE post_type = 2 AND raw ~* '^I moved [a\\d]+ posts? to a new topic:'"
     execute "UPDATE posts SET post_type = 3, action_code = 'split_topic' WHERE post_type = 2 AND raw ~* '^I moved [a\\d]+ posts? to an existing topic:'"
diff --git a/db/migrate/20150802233112_add_post_stats.rb b/db/migrate/20150802233112_add_post_stats.rb
index 0ff42664da..55157d0348 100644
--- a/db/migrate/20150802233112_add_post_stats.rb
+++ b/db/migrate/20150802233112_add_post_stats.rb
@@ -1,4 +1,4 @@
-class AddPostStats < ActiveRecord::Migration
+class AddPostStats < ActiveRecord::Migration[4.2]
   def change
 
     add_column :drafts, :revisions, :int, null: false, default: 1
@@ -8,7 +8,7 @@ class AddPostStats < ActiveRecord::Migration
       t.integer :drafts_saved
       t.integer :typing_duration_msecs
       t.integer :composer_open_duration_msecs
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :post_stats, [:post_id]
diff --git a/db/migrate/20150806210727_add_embedded_css_to_site_customizations.rb b/db/migrate/20150806210727_add_embedded_css_to_site_customizations.rb
index 99a5f17a58..812e995e19 100644
--- a/db/migrate/20150806210727_add_embedded_css_to_site_customizations.rb
+++ b/db/migrate/20150806210727_add_embedded_css_to_site_customizations.rb
@@ -1,4 +1,4 @@
-class AddEmbeddedCssToSiteCustomizations < ActiveRecord::Migration
+class AddEmbeddedCssToSiteCustomizations < ActiveRecord::Migration[4.2]
   def change
     add_column :site_customizations, :embedded_css, :text
     add_column :site_customizations, :embedded_css_baked, :text
diff --git a/db/migrate/20150818190757_create_embeddable_hosts.rb b/db/migrate/20150818190757_create_embeddable_hosts.rb
index 1d4e1b0d46..c5ae2ac36a 100644
--- a/db/migrate/20150818190757_create_embeddable_hosts.rb
+++ b/db/migrate/20150818190757_create_embeddable_hosts.rb
@@ -1,9 +1,9 @@
-class CreateEmbeddableHosts < ActiveRecord::Migration
+class CreateEmbeddableHosts < ActiveRecord::Migration[4.2]
   def change
     create_table :embeddable_hosts, force: true do |t|
       t.string :host, null: false
       t.integer :category_id, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     category_id = 0;
diff --git a/db/migrate/20150822141540_fix_migrated_hosts.rb b/db/migrate/20150822141540_fix_migrated_hosts.rb
index d777eddb32..9c36f028b3 100644
--- a/db/migrate/20150822141540_fix_migrated_hosts.rb
+++ b/db/migrate/20150822141540_fix_migrated_hosts.rb
@@ -1,4 +1,4 @@
-class FixMigratedHosts < ActiveRecord::Migration
+class FixMigratedHosts < ActiveRecord::Migration[4.2]
   def up
     execute "UPDATE embeddable_hosts SET host = regexp_replace(host, '^https?:\/\/', '', 'i')"
   end
diff --git a/db/migrate/20150828155137_add_suppress_from_homepage_to_category.rb b/db/migrate/20150828155137_add_suppress_from_homepage_to_category.rb
index e706f40f97..900556b5e3 100644
--- a/db/migrate/20150828155137_add_suppress_from_homepage_to_category.rb
+++ b/db/migrate/20150828155137_add_suppress_from_homepage_to_category.rb
@@ -1,4 +1,4 @@
-class AddSuppressFromHomepageToCategory < ActiveRecord::Migration
+class AddSuppressFromHomepageToCategory < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :suppress_from_homepage, :boolean, default: false
   end
diff --git a/db/migrate/20150901192313_add_grant_trust_level_to_groups.rb b/db/migrate/20150901192313_add_grant_trust_level_to_groups.rb
index a654369a2e..a94e3c642e 100644
--- a/db/migrate/20150901192313_add_grant_trust_level_to_groups.rb
+++ b/db/migrate/20150901192313_add_grant_trust_level_to_groups.rb
@@ -1,4 +1,4 @@
-class AddGrantTrustLevelToGroups < ActiveRecord::Migration
+class AddGrantTrustLevelToGroups < ActiveRecord::Migration[4.2]
   def change
     add_column :groups, :grant_trust_level, :integer
   end
diff --git a/db/migrate/20150914021445_create_user_profile_views.rb b/db/migrate/20150914021445_create_user_profile_views.rb
index 04c085a53b..6b67e44952 100644
--- a/db/migrate/20150914021445_create_user_profile_views.rb
+++ b/db/migrate/20150914021445_create_user_profile_views.rb
@@ -1,4 +1,4 @@
-class CreateUserProfileViews < ActiveRecord::Migration
+class CreateUserProfileViews < ActiveRecord::Migration[4.2]
   def change
     create_table :user_profile_views do |t|
       t.integer :user_profile_id, null: false
diff --git a/db/migrate/20150914034541_add_views_to_user_profile.rb b/db/migrate/20150914034541_add_views_to_user_profile.rb
index 3a13f6c136..4decf72b92 100644
--- a/db/migrate/20150914034541_add_views_to_user_profile.rb
+++ b/db/migrate/20150914034541_add_views_to_user_profile.rb
@@ -1,4 +1,4 @@
-class AddViewsToUserProfile < ActiveRecord::Migration
+class AddViewsToUserProfile < ActiveRecord::Migration[4.2]
   def change
     add_column :user_profiles, :views, :integer, default: 0, null: false
   end
diff --git a/db/migrate/20150917071017_add_category_id_to_user_histories.rb b/db/migrate/20150917071017_add_category_id_to_user_histories.rb
index 117edef54a..864e833c13 100644
--- a/db/migrate/20150917071017_add_category_id_to_user_histories.rb
+++ b/db/migrate/20150917071017_add_category_id_to_user_histories.rb
@@ -1,4 +1,4 @@
-class AddCategoryIdToUserHistories < ActiveRecord::Migration
+class AddCategoryIdToUserHistories < ActiveRecord::Migration[4.2]
   def change
     add_column :user_histories, :category_id, :integer
     add_index :user_histories, :category_id
diff --git a/db/migrate/20150918004206_add_user_id_group_id_index_to_group_users.rb b/db/migrate/20150918004206_add_user_id_group_id_index_to_group_users.rb
index bf20583149..d2fb4f207f 100644
--- a/db/migrate/20150918004206_add_user_id_group_id_index_to_group_users.rb
+++ b/db/migrate/20150918004206_add_user_id_group_id_index_to_group_users.rb
@@ -1,4 +1,4 @@
-class AddUserIdGroupIdIndexToGroupUsers < ActiveRecord::Migration
+class AddUserIdGroupIdIndexToGroupUsers < ActiveRecord::Migration[4.2]
   def change
     add_index :group_users, [:user_id, :group_id], unique: true
   end
diff --git a/db/migrate/20150924022040_add_fancy_title_to_topic.rb b/db/migrate/20150924022040_add_fancy_title_to_topic.rb
index 49863f89f5..346b0a3ec6 100644
--- a/db/migrate/20150924022040_add_fancy_title_to_topic.rb
+++ b/db/migrate/20150924022040_add_fancy_title_to_topic.rb
@@ -1,4 +1,4 @@
-class AddFancyTitleToTopic < ActiveRecord::Migration
+class AddFancyTitleToTopic < ActiveRecord::Migration[4.2]
   def change
     add_column :topics, :fancy_title, :string, limit: 400, null: true
   end
diff --git a/db/migrate/20150925000915_exclude_whispers_from_badges.rb b/db/migrate/20150925000915_exclude_whispers_from_badges.rb
index a7326e8ee3..8833c03254 100644
--- a/db/migrate/20150925000915_exclude_whispers_from_badges.rb
+++ b/db/migrate/20150925000915_exclude_whispers_from_badges.rb
@@ -1,4 +1,4 @@
-class ExcludeWhispersFromBadges < ActiveRecord::Migration
+class ExcludeWhispersFromBadges < ActiveRecord::Migration[4.2]
   def up
     execute "DROP VIEW badge_posts"
 
diff --git a/db/migrate/20151103233815_add_lower_title_index_on_topics.rb b/db/migrate/20151103233815_add_lower_title_index_on_topics.rb
index bdd93fd533..810104c62f 100644
--- a/db/migrate/20151103233815_add_lower_title_index_on_topics.rb
+++ b/db/migrate/20151103233815_add_lower_title_index_on_topics.rb
@@ -1,4 +1,4 @@
-class AddLowerTitleIndexOnTopics < ActiveRecord::Migration
+class AddLowerTitleIndexOnTopics < ActiveRecord::Migration[4.2]
   def up
     execute "CREATE INDEX index_topics_on_lower_title ON topics (LOWER(title))"
   end
diff --git a/db/migrate/20151105181635_add_staged_to_user.rb b/db/migrate/20151105181635_add_staged_to_user.rb
index 16d7984a7a..8d0e8a02f2 100644
--- a/db/migrate/20151105181635_add_staged_to_user.rb
+++ b/db/migrate/20151105181635_add_staged_to_user.rb
@@ -1,4 +1,4 @@
-class AddStagedToUser < ActiveRecord::Migration
+class AddStagedToUser < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :staged, :boolean, null: false, default: false
   end
diff --git a/db/migrate/20151107041044_fix_incorrect_topic_creator_after_move.rb b/db/migrate/20151107041044_fix_incorrect_topic_creator_after_move.rb
index e7ffdf0491..e196a1cd72 100644
--- a/db/migrate/20151107041044_fix_incorrect_topic_creator_after_move.rb
+++ b/db/migrate/20151107041044_fix_incorrect_topic_creator_after_move.rb
@@ -1,4 +1,4 @@
-class FixIncorrectTopicCreatorAfterMove < ActiveRecord::Migration
+class FixIncorrectTopicCreatorAfterMove < ActiveRecord::Migration[4.2]
   def up
     execute "UPDATE topics SET user_id = p.user_id
              FROM posts p
diff --git a/db/migrate/20151107042241_add_owner_to_group_users.rb b/db/migrate/20151107042241_add_owner_to_group_users.rb
index c834ac1375..4f672ee4a8 100644
--- a/db/migrate/20151107042241_add_owner_to_group_users.rb
+++ b/db/migrate/20151107042241_add_owner_to_group_users.rb
@@ -1,4 +1,4 @@
-class AddOwnerToGroupUsers < ActiveRecord::Migration
+class AddOwnerToGroupUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :group_users, :owner, :boolean, null: false, default: false
   end
diff --git a/db/migrate/20151109124147_drop_group_managers.rb b/db/migrate/20151109124147_drop_group_managers.rb
index 41e07141c1..1ac79a30d0 100644
--- a/db/migrate/20151109124147_drop_group_managers.rb
+++ b/db/migrate/20151109124147_drop_group_managers.rb
@@ -1,4 +1,4 @@
-class DropGroupManagers < ActiveRecord::Migration
+class DropGroupManagers < ActiveRecord::Migration[4.2]
   def up
     # old data under old structure
     execute "UPDATE group_users SET owner = true
diff --git a/db/migrate/20151113205046_create_translation_overrides.rb b/db/migrate/20151113205046_create_translation_overrides.rb
index 48f7bcb3f7..d0b57bc872 100644
--- a/db/migrate/20151113205046_create_translation_overrides.rb
+++ b/db/migrate/20151113205046_create_translation_overrides.rb
@@ -1,4 +1,4 @@
-class CreateTranslationOverrides < ActiveRecord::Migration
+class CreateTranslationOverrides < ActiveRecord::Migration[4.2]
   def change
     create_table :translation_overrides, force: true do |t|
       t.string :locale, length: 30, null: false
diff --git a/db/migrate/20151117165756_add_automatically_unpin_topics_to_users.rb b/db/migrate/20151117165756_add_automatically_unpin_topics_to_users.rb
index e665b42702..2fba4c2ae3 100644
--- a/db/migrate/20151117165756_add_automatically_unpin_topics_to_users.rb
+++ b/db/migrate/20151117165756_add_automatically_unpin_topics_to_users.rb
@@ -1,4 +1,4 @@
-class AddAutomaticallyUnpinTopicsToUsers < ActiveRecord::Migration
+class AddAutomaticallyUnpinTopicsToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :automatically_unpin_topics, :boolean, nullabe: false, default: true
   end
diff --git a/db/migrate/20151124172631_add_is_support_to_categories.rb b/db/migrate/20151124172631_add_is_support_to_categories.rb
index 6747153c26..50978dbc17 100644
--- a/db/migrate/20151124172631_add_is_support_to_categories.rb
+++ b/db/migrate/20151124172631_add_is_support_to_categories.rb
@@ -1,4 +1,4 @@
-class AddIsSupportToCategories < ActiveRecord::Migration
+class AddIsSupportToCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :is_support, :boolean, default: false, null: false
   end
diff --git a/db/migrate/20151124192339_rename_ninja_edit.rb b/db/migrate/20151124192339_rename_ninja_edit.rb
index 1b36d4308c..2fd9c33390 100644
--- a/db/migrate/20151124192339_rename_ninja_edit.rb
+++ b/db/migrate/20151124192339_rename_ninja_edit.rb
@@ -1,4 +1,4 @@
-class RenameNinjaEdit < ActiveRecord::Migration
+class RenameNinjaEdit < ActiveRecord::Migration[4.2]
   def change
     execute "UPDATE site_settings SET name = 'editing_grace_period' WHERE name = 'ninja_edit_window'"
   end
diff --git a/db/migrate/20151125194322_remove_site_text.rb b/db/migrate/20151125194322_remove_site_text.rb
index 9f1b4b6a17..0b2443fc15 100644
--- a/db/migrate/20151125194322_remove_site_text.rb
+++ b/db/migrate/20151125194322_remove_site_text.rb
@@ -1,4 +1,4 @@
-class RemoveSiteText < ActiveRecord::Migration
+class RemoveSiteText < ActiveRecord::Migration[4.2]
   def change
     execute "INSERT INTO translation_overrides (locale, translation_key, value, created_at, updated_at)
                     SELECT '#{I18n.locale}',
diff --git a/db/migrate/20151126173356_rename_is_support_to_contains_messages.rb b/db/migrate/20151126173356_rename_is_support_to_contains_messages.rb
index 8d9cf8e496..c2fbabdd3c 100644
--- a/db/migrate/20151126173356_rename_is_support_to_contains_messages.rb
+++ b/db/migrate/20151126173356_rename_is_support_to_contains_messages.rb
@@ -1,4 +1,4 @@
-class RenameIsSupportToContainsMessages < ActiveRecord::Migration
+class RenameIsSupportToContainsMessages < ActiveRecord::Migration[4.2]
   def change
     rename_column :categories, :is_support, :contains_messages
   end
diff --git a/db/migrate/20151126233623_add_baked_head_and_body_to_site_customizations.rb b/db/migrate/20151126233623_add_baked_head_and_body_to_site_customizations.rb
index c7f8ed4170..598be62f97 100644
--- a/db/migrate/20151126233623_add_baked_head_and_body_to_site_customizations.rb
+++ b/db/migrate/20151126233623_add_baked_head_and_body_to_site_customizations.rb
@@ -1,4 +1,4 @@
-class AddBakedHeadAndBodyToSiteCustomizations < ActiveRecord::Migration
+class AddBakedHeadAndBodyToSiteCustomizations < ActiveRecord::Migration[4.2]
   def change
     add_column :site_customizations, :head_tag_baked, :text
     add_column :site_customizations, :body_tag_baked, :text
diff --git a/db/migrate/20151127011837_add_header_and_footer_baked_to_site_customizations.rb b/db/migrate/20151127011837_add_header_and_footer_baked_to_site_customizations.rb
index 7e35898d03..cbc8e11c7c 100644
--- a/db/migrate/20151127011837_add_header_and_footer_baked_to_site_customizations.rb
+++ b/db/migrate/20151127011837_add_header_and_footer_baked_to_site_customizations.rb
@@ -1,4 +1,4 @@
-class AddHeaderAndFooterBakedToSiteCustomizations < ActiveRecord::Migration
+class AddHeaderAndFooterBakedToSiteCustomizations < ActiveRecord::Migration[4.2]
   def change
     add_column :site_customizations, :header_baked, :text
     add_column :site_customizations, :mobile_header_baked, :text
diff --git a/db/migrate/20151201035631_add_group_mentions.rb b/db/migrate/20151201035631_add_group_mentions.rb
index 4e3900387a..f8eefb8d1d 100644
--- a/db/migrate/20151201035631_add_group_mentions.rb
+++ b/db/migrate/20151201035631_add_group_mentions.rb
@@ -1,9 +1,9 @@
-class AddGroupMentions < ActiveRecord::Migration
+class AddGroupMentions < ActiveRecord::Migration[4.2]
   def change
     create_table :group_mentions do |t|
       t.integer :post_id
       t.integer :group_id
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :group_mentions, [:post_id, :group_id], unique: true
diff --git a/db/migrate/20151201161726_add_incoming_email_to_groups.rb b/db/migrate/20151201161726_add_incoming_email_to_groups.rb
index afea28ba22..708d8cfe2b 100644
--- a/db/migrate/20151201161726_add_incoming_email_to_groups.rb
+++ b/db/migrate/20151201161726_add_incoming_email_to_groups.rb
@@ -1,4 +1,4 @@
-class AddIncomingEmailToGroups < ActiveRecord::Migration
+class AddIncomingEmailToGroups < ActiveRecord::Migration[4.2]
   def change
     add_column :groups, :incoming_email, :string, null: true
     add_index :groups, :incoming_email, unique: true
diff --git a/db/migrate/20151214165852_add_notification_level_to_group_users.rb b/db/migrate/20151214165852_add_notification_level_to_group_users.rb
index a1f2a5d811..9546d39c8e 100644
--- a/db/migrate/20151214165852_add_notification_level_to_group_users.rb
+++ b/db/migrate/20151214165852_add_notification_level_to_group_users.rb
@@ -1,4 +1,4 @@
-class AddNotificationLevelToGroupUsers < ActiveRecord::Migration
+class AddNotificationLevelToGroupUsers < ActiveRecord::Migration[4.2]
   def change
     # defaults to TopicUser.notification_levels[:watching]
     add_column :group_users, :notification_level, :integer, default: 3, null: false
diff --git a/db/migrate/20151218232200_add_unique_index_to_category_users.rb b/db/migrate/20151218232200_add_unique_index_to_category_users.rb
index 74cfe3f4f1..dbc87bd09a 100644
--- a/db/migrate/20151218232200_add_unique_index_to_category_users.rb
+++ b/db/migrate/20151218232200_add_unique_index_to_category_users.rb
@@ -1,4 +1,4 @@
-class AddUniqueIndexToCategoryUsers < ActiveRecord::Migration
+class AddUniqueIndexToCategoryUsers < ActiveRecord::Migration[4.2]
   def up
     execute <<SQL
 DELETE FROM category_users cu USING category_users cu1
diff --git a/db/migrate/20151219045559_add_has_messages_to_groups.rb b/db/migrate/20151219045559_add_has_messages_to_groups.rb
index e4f4fcbefa..517f9741da 100644
--- a/db/migrate/20151219045559_add_has_messages_to_groups.rb
+++ b/db/migrate/20151219045559_add_has_messages_to_groups.rb
@@ -1,4 +1,4 @@
-class AddHasMessagesToGroups < ActiveRecord::Migration
+class AddHasMessagesToGroups < ActiveRecord::Migration[4.2]
   def up
     add_column :groups, :has_messages, :boolean, default: false, null: false
 
diff --git a/db/migrate/20151220232725_add_user_archived_messages_group_archived_messages.rb b/db/migrate/20151220232725_add_user_archived_messages_group_archived_messages.rb
index 9ec9971871..8dc48dccef 100644
--- a/db/migrate/20151220232725_add_user_archived_messages_group_archived_messages.rb
+++ b/db/migrate/20151220232725_add_user_archived_messages_group_archived_messages.rb
@@ -1,9 +1,9 @@
-class AddUserArchivedMessagesGroupArchivedMessages < ActiveRecord::Migration
+class AddUserArchivedMessagesGroupArchivedMessages < ActiveRecord::Migration[4.2]
   def change
     create_table :user_archived_messages do |t|
       t.integer :user_id, null: false
       t.integer :topic_id, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :user_archived_messages, [:user_id, :topic_id], unique: true
@@ -11,7 +11,7 @@ class AddUserArchivedMessagesGroupArchivedMessages < ActiveRecord::Migration
     create_table :group_archived_messages do |t|
       t.integer :group_id, null: false
       t.integer :topic_id, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :group_archived_messages, [:group_id, :topic_id], unique: true
diff --git a/db/migrate/20160108051129_fix_incorrect_user_history.rb b/db/migrate/20160108051129_fix_incorrect_user_history.rb
index 2a9cbdf0fb..d4d466ca22 100644
--- a/db/migrate/20160108051129_fix_incorrect_user_history.rb
+++ b/db/migrate/20160108051129_fix_incorrect_user_history.rb
@@ -1,4 +1,4 @@
-class FixIncorrectUserHistory < ActiveRecord::Migration
+class FixIncorrectUserHistory < ActiveRecord::Migration[4.2]
   def up
     # see https://meta.discourse.org/t/old-user-suspension-reasons-have-gone-missing/3730
     # we had a window of 21 days where all user history records with action > 5 were off by one
@@ -7,7 +7,6 @@ class FixIncorrectUserHistory < ActiveRecord::Migration
     #
     # This migration hunts for date stuff started going wrong and date it started being good and corrects the data
 
-
     # this is a :auto_trust_level_change mislabled as :check_email
     # impersonate that was actually delete topic
     condition = <<CLAUSE
diff --git a/db/migrate/20160110053003_archive_system_messages_with_no_replies.rb b/db/migrate/20160110053003_archive_system_messages_with_no_replies.rb
index da9b1d71c3..e639a2b276 100644
--- a/db/migrate/20160110053003_archive_system_messages_with_no_replies.rb
+++ b/db/migrate/20160110053003_archive_system_messages_with_no_replies.rb
@@ -1,4 +1,4 @@
-class ArchiveSystemMessagesWithNoReplies < ActiveRecord::Migration
+class ArchiveSystemMessagesWithNoReplies < ActiveRecord::Migration[4.2]
   def up
     # backdate archival of system messages send on behalf of site_contact_user
     execute <<SQL
diff --git a/db/migrate/20160112025852_remove_users_from_topic_allowed_users.rb b/db/migrate/20160112025852_remove_users_from_topic_allowed_users.rb
index 0610a40a66..7643033466 100644
--- a/db/migrate/20160112025852_remove_users_from_topic_allowed_users.rb
+++ b/db/migrate/20160112025852_remove_users_from_topic_allowed_users.rb
@@ -1,4 +1,4 @@
-class RemoveUsersFromTopicAllowedUsers < ActiveRecord::Migration
+class RemoveUsersFromTopicAllowedUsers < ActiveRecord::Migration[4.2]
 
   # historically we added admins automatically to a message if they
   # responded, despite them being in the group the message is targetted at
diff --git a/db/migrate/20160112101818_remove_contains_message_on_category.rb b/db/migrate/20160112101818_remove_contains_message_on_category.rb
index df4187b95a..b8d9d8f31d 100644
--- a/db/migrate/20160112101818_remove_contains_message_on_category.rb
+++ b/db/migrate/20160112101818_remove_contains_message_on_category.rb
@@ -1,4 +1,4 @@
-class RemoveContainsMessageOnCategory < ActiveRecord::Migration
+class RemoveContainsMessageOnCategory < ActiveRecord::Migration[4.2]
   def change
     remove_column :categories, :contains_messages
   end
diff --git a/db/migrate/20160112104733_add_contains_messages_back_to_categories.rb b/db/migrate/20160112104733_add_contains_messages_back_to_categories.rb
index c14803adb5..35f2b5d77b 100644
--- a/db/migrate/20160112104733_add_contains_messages_back_to_categories.rb
+++ b/db/migrate/20160112104733_add_contains_messages_back_to_categories.rb
@@ -1,4 +1,4 @@
-class AddContainsMessagesBackToCategories < ActiveRecord::Migration
+class AddContainsMessagesBackToCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :contains_messages, :boolean
   end
diff --git a/db/migrate/20160113160742_create_incoming_emails.rb b/db/migrate/20160113160742_create_incoming_emails.rb
index 34502bace5..9dbf057f67 100644
--- a/db/migrate/20160113160742_create_incoming_emails.rb
+++ b/db/migrate/20160113160742_create_incoming_emails.rb
@@ -1,4 +1,4 @@
-class CreateIncomingEmails < ActiveRecord::Migration
+class CreateIncomingEmails < ActiveRecord::Migration[4.2]
   def change
     create_table :incoming_emails do |t|
       t.integer :user_id
diff --git a/db/migrate/20160118174335_rebake_html_customizations.rb b/db/migrate/20160118174335_rebake_html_customizations.rb
index 112e47c303..85e35c1f1d 100644
--- a/db/migrate/20160118174335_rebake_html_customizations.rb
+++ b/db/migrate/20160118174335_rebake_html_customizations.rb
@@ -1,4 +1,4 @@
-class RebakeHtmlCustomizations < ActiveRecord::Migration
+class RebakeHtmlCustomizations < ActiveRecord::Migration[4.2]
   def change
     execute "UPDATE site_customizations SET body_tag_baked = NULL,
                                             head_tag_baked = NULL,
diff --git a/db/migrate/20160118233631_backfill_incoming_emails.rb b/db/migrate/20160118233631_backfill_incoming_emails.rb
index f2d1f0d725..687285a458 100644
--- a/db/migrate/20160118233631_backfill_incoming_emails.rb
+++ b/db/migrate/20160118233631_backfill_incoming_emails.rb
@@ -1,4 +1,4 @@
-class BackfillIncomingEmails < ActiveRecord::Migration
+class BackfillIncomingEmails < ActiveRecord::Migration[4.2]
   def up
     execute <<-SQL
       INSERT INTO incoming_emails (post_id, created_at, updated_at, user_id, topic_id, message_id, from_address, to_addresses, subject)
diff --git a/db/migrate/20160127105314_change_default_notification_level_on_groups.rb b/db/migrate/20160127105314_change_default_notification_level_on_groups.rb
index 474b200b15..c87029eefa 100644
--- a/db/migrate/20160127105314_change_default_notification_level_on_groups.rb
+++ b/db/migrate/20160127105314_change_default_notification_level_on_groups.rb
@@ -1,4 +1,4 @@
-class ChangeDefaultNotificationLevelOnGroups < ActiveRecord::Migration
+class ChangeDefaultNotificationLevelOnGroups < ActiveRecord::Migration[4.2]
   def change
     execute "UPDATE group_users SET notification_level = 2"
     change_column :group_users, :notification_level, :integer, null: false, default: 2
diff --git a/db/migrate/20160127222802_migrate_uncategorized_description_setting.rb b/db/migrate/20160127222802_migrate_uncategorized_description_setting.rb
index b5439564ba..8cbfd81ce6 100644
--- a/db/migrate/20160127222802_migrate_uncategorized_description_setting.rb
+++ b/db/migrate/20160127222802_migrate_uncategorized_description_setting.rb
@@ -1,4 +1,4 @@
-class MigrateUncategorizedDescriptionSetting < ActiveRecord::Migration
+class MigrateUncategorizedDescriptionSetting < ActiveRecord::Migration[4.2]
   def change
     execute "INSERT INTO translation_overrides (locale, translation_key, value, created_at, updated_at)
              SELECT '#{I18n.locale}', 'category.uncategorized_description', value, created_at, updated_at
diff --git a/db/migrate/20160201181320_fix_email_logs.rb b/db/migrate/20160201181320_fix_email_logs.rb
index 402761a8fb..531c6937b3 100644
--- a/db/migrate/20160201181320_fix_email_logs.rb
+++ b/db/migrate/20160201181320_fix_email_logs.rb
@@ -1,4 +1,4 @@
-class FixEmailLogs < ActiveRecord::Migration
+class FixEmailLogs < ActiveRecord::Migration[4.2]
   def up
     execute <<-SQL
       UPDATE email_logs
diff --git a/db/migrate/20160206210202_remove_invalid_websites.rb b/db/migrate/20160206210202_remove_invalid_websites.rb
index d0ae516ef8..2907b01e04 100644
--- a/db/migrate/20160206210202_remove_invalid_websites.rb
+++ b/db/migrate/20160206210202_remove_invalid_websites.rb
@@ -1,4 +1,4 @@
-class RemoveInvalidWebsites < ActiveRecord::Migration
+class RemoveInvalidWebsites < ActiveRecord::Migration[4.2]
   def change
     execute "UPDATE user_profiles SET website = NULL WHERE website = 'http://'"
   end
diff --git a/db/migrate/20160215075528_add_unread_pm_index_to_notifications.rb b/db/migrate/20160215075528_add_unread_pm_index_to_notifications.rb
index 382489e2fd..66703e720b 100644
--- a/db/migrate/20160215075528_add_unread_pm_index_to_notifications.rb
+++ b/db/migrate/20160215075528_add_unread_pm_index_to_notifications.rb
@@ -1,4 +1,4 @@
-class AddUnreadPmIndexToNotifications < ActiveRecord::Migration
+class AddUnreadPmIndexToNotifications < ActiveRecord::Migration[4.2]
   def change
     # create index idxtmp on notifications(user_id, id) where notification_type = 6 AND NOT read
     add_index :notifications, [:user_id, :id], unique: true, where: 'notification_type = 6 AND NOT read'
diff --git a/db/migrate/20160224033122_create_instagram_user_infos.rb b/db/migrate/20160224033122_create_instagram_user_infos.rb
index ef3633f892..f688787842 100644
--- a/db/migrate/20160224033122_create_instagram_user_infos.rb
+++ b/db/migrate/20160224033122_create_instagram_user_infos.rb
@@ -1,4 +1,4 @@
-class CreateInstagramUserInfos < ActiveRecord::Migration
+class CreateInstagramUserInfos < ActiveRecord::Migration[4.2]
   def change
     create_table :instagram_user_infos do |t|
       t.integer :user_id
diff --git a/db/migrate/20160225050317_add_user_options.rb b/db/migrate/20160225050317_add_user_options.rb
index 965865197d..ed3d0ae6b6 100644
--- a/db/migrate/20160225050317_add_user_options.rb
+++ b/db/migrate/20160225050317_add_user_options.rb
@@ -1,4 +1,4 @@
-class AddUserOptions < ActiveRecord::Migration
+class AddUserOptions < ActiveRecord::Migration[4.2]
   def up
 
     create_table :user_options, id: false do |t|
diff --git a/db/migrate/20160225050318_allow_defaults_on_users_table.rb b/db/migrate/20160225050318_allow_defaults_on_users_table.rb
index 999e275fdd..963e02c4c9 100644
--- a/db/migrate/20160225050318_allow_defaults_on_users_table.rb
+++ b/db/migrate/20160225050318_allow_defaults_on_users_table.rb
@@ -1,4 +1,4 @@
-class AllowDefaultsOnUsersTable < ActiveRecord::Migration
+class AllowDefaultsOnUsersTable < ActiveRecord::Migration[4.2]
   def up
     # we need to temporarily change table a bit to ensure we can insert new records
     change_column :users, :email_digests, :boolean, null: false, default: true
diff --git a/db/migrate/20160225050319_move_tracking_options_to_user_options.rb b/db/migrate/20160225050319_move_tracking_options_to_user_options.rb
index 87dabf3995..51acfecdd3 100644
--- a/db/migrate/20160225050319_move_tracking_options_to_user_options.rb
+++ b/db/migrate/20160225050319_move_tracking_options_to_user_options.rb
@@ -1,4 +1,4 @@
-class MoveTrackingOptionsToUserOptions < ActiveRecord::Migration
+class MoveTrackingOptionsToUserOptions < ActiveRecord::Migration[4.2]
   def change
     add_column :user_options, :auto_track_topics_after_msecs, :integer
     add_column :user_options, :new_topic_duration_minutes, :integer
diff --git a/db/migrate/20160225050320_add_email_previous_replies_to_user_options.rb b/db/migrate/20160225050320_add_email_previous_replies_to_user_options.rb
index 5f9aec18a0..f01c1f1949 100644
--- a/db/migrate/20160225050320_add_email_previous_replies_to_user_options.rb
+++ b/db/migrate/20160225050320_add_email_previous_replies_to_user_options.rb
@@ -1,4 +1,4 @@
-class AddEmailPreviousRepliesToUserOptions < ActiveRecord::Migration
+class AddEmailPreviousRepliesToUserOptions < ActiveRecord::Migration[4.2]
   def change
     add_column :user_options, :email_previous_replies, :integer, null: false, default: 1
   end
diff --git a/db/migrate/20160225095306_add_email_in_reply_to_to_user_options.rb b/db/migrate/20160225095306_add_email_in_reply_to_to_user_options.rb
index 3f85333580..c24eb87490 100644
--- a/db/migrate/20160225095306_add_email_in_reply_to_to_user_options.rb
+++ b/db/migrate/20160225095306_add_email_in_reply_to_to_user_options.rb
@@ -1,4 +1,4 @@
-class AddEmailInReplyToToUserOptions < ActiveRecord::Migration
+class AddEmailInReplyToToUserOptions < ActiveRecord::Migration[4.2]
   def up
     add_column :user_options, :email_in_reply_to, :boolean, null: false, default: true
     change_column :user_options, :email_previous_replies, :integer, default: 2, null: false
diff --git a/db/migrate/20160302063432_rebuild_directory_item_with_index.rb b/db/migrate/20160302063432_rebuild_directory_item_with_index.rb
index 9cf131f470..3d57ac126a 100644
--- a/db/migrate/20160302063432_rebuild_directory_item_with_index.rb
+++ b/db/migrate/20160302063432_rebuild_directory_item_with_index.rb
@@ -1,4 +1,4 @@
-class RebuildDirectoryItemWithIndex < ActiveRecord::Migration
+class RebuildDirectoryItemWithIndex < ActiveRecord::Migration[4.2]
   def up
     remove_index :directory_items, [:period_type]
     execute "TRUNCATE TABLE directory_items RESTART IDENTITY"
diff --git a/db/migrate/20160302104253_add_like_notification_frequency_to_user_options.rb b/db/migrate/20160302104253_add_like_notification_frequency_to_user_options.rb
index d5c00d7305..f9c7e2f9ea 100644
--- a/db/migrate/20160302104253_add_like_notification_frequency_to_user_options.rb
+++ b/db/migrate/20160302104253_add_like_notification_frequency_to_user_options.rb
@@ -1,4 +1,4 @@
-class AddLikeNotificationFrequencyToUserOptions < ActiveRecord::Migration
+class AddLikeNotificationFrequencyToUserOptions < ActiveRecord::Migration[4.2]
   def change
     add_column :user_options, :like_notification_frequency, :integer, null: false, default: 1
   end
diff --git a/db/migrate/20160302170230_rename_digest_after_days_to_digest_after_minutes.rb b/db/migrate/20160302170230_rename_digest_after_days_to_digest_after_minutes.rb
index 9c9cfdd0cc..f518c49077 100644
--- a/db/migrate/20160302170230_rename_digest_after_days_to_digest_after_minutes.rb
+++ b/db/migrate/20160302170230_rename_digest_after_days_to_digest_after_minutes.rb
@@ -1,4 +1,4 @@
-class RenameDigestAfterDaysToDigestAfterMinutes < ActiveRecord::Migration
+class RenameDigestAfterDaysToDigestAfterMinutes < ActiveRecord::Migration[4.2]
   def up
     rename_column :user_options, :digest_after_days, :digest_after_minutes
     execute "UPDATE user_options SET digest_after_minutes = digest_after_minutes * 1440 WHERE digest_after_minutes IS NOT NULL"
diff --git a/db/migrate/20160303183607_clear_common_passwords_cache.rb b/db/migrate/20160303183607_clear_common_passwords_cache.rb
index c4ba8042a4..dc449ba957 100644
--- a/db/migrate/20160303183607_clear_common_passwords_cache.rb
+++ b/db/migrate/20160303183607_clear_common_passwords_cache.rb
@@ -1,6 +1,6 @@
 require "common_passwords/common_passwords"
 
-class ClearCommonPasswordsCache < ActiveRecord::Migration
+class ClearCommonPasswordsCache < ActiveRecord::Migration[4.2]
   def change
     $redis.without_namespace.del CommonPasswords::LIST_KEY
   end
diff --git a/db/migrate/20160303234317_add_rejection_message_to_incoming_email.rb b/db/migrate/20160303234317_add_rejection_message_to_incoming_email.rb
index da873df403..ac8f9995ee 100644
--- a/db/migrate/20160303234317_add_rejection_message_to_incoming_email.rb
+++ b/db/migrate/20160303234317_add_rejection_message_to_incoming_email.rb
@@ -1,4 +1,4 @@
-class AddRejectionMessageToIncomingEmail < ActiveRecord::Migration
+class AddRejectionMessageToIncomingEmail < ActiveRecord::Migration[4.2]
   def change
     add_column :incoming_emails, :rejection_message, :text
   end
diff --git a/db/migrate/20160307190919_create_email_change_requests.rb b/db/migrate/20160307190919_create_email_change_requests.rb
index 010c3e356d..68e5820308 100644
--- a/db/migrate/20160307190919_create_email_change_requests.rb
+++ b/db/migrate/20160307190919_create_email_change_requests.rb
@@ -1,4 +1,4 @@
-class CreateEmailChangeRequests < ActiveRecord::Migration
+class CreateEmailChangeRequests < ActiveRecord::Migration[4.2]
   def change
     create_table :email_change_requests do |t|
       t.integer :user_id, null: false
diff --git a/db/migrate/20160308193142_rename_confirm_translation_key.rb b/db/migrate/20160308193142_rename_confirm_translation_key.rb
index b121bf9a94..99c970c676 100644
--- a/db/migrate/20160308193142_rename_confirm_translation_key.rb
+++ b/db/migrate/20160308193142_rename_confirm_translation_key.rb
@@ -1,4 +1,4 @@
-class RenameConfirmTranslationKey < ActiveRecord::Migration
+class RenameConfirmTranslationKey < ActiveRecord::Migration[4.2]
   def change
     execute "UPDATE translation_overrides SET translation_key = 'user_notifications.confirm_new_email.subject_template'
                WHERE translation_key = 'user_notifications.authorize_email.subject_template'"
diff --git a/db/migrate/20160309073132_add_mailing_list_mode_frequency.rb b/db/migrate/20160309073132_add_mailing_list_mode_frequency.rb
index dcdce07c40..0d63b36241 100644
--- a/db/migrate/20160309073132_add_mailing_list_mode_frequency.rb
+++ b/db/migrate/20160309073132_add_mailing_list_mode_frequency.rb
@@ -1,4 +1,4 @@
-class AddMailingListModeFrequency < ActiveRecord::Migration
+class AddMailingListModeFrequency < ActiveRecord::Migration[4.2]
   def change
     add_column :user_options, :mailing_list_mode_frequency, :integer, default: 0, null: false
   end
diff --git a/db/migrate/20160317174357_create_given_daily_likes.rb b/db/migrate/20160317174357_create_given_daily_likes.rb
index 42cf767b95..1e37bcdc1d 100644
--- a/db/migrate/20160317174357_create_given_daily_likes.rb
+++ b/db/migrate/20160317174357_create_given_daily_likes.rb
@@ -1,4 +1,4 @@
-class CreateGivenDailyLikes < ActiveRecord::Migration
+class CreateGivenDailyLikes < ActiveRecord::Migration[4.2]
   def up
     create_table :given_daily_likes, id: false, force: true do |t|
       t.integer :user_id, null: false
diff --git a/db/migrate/20160317201955_add_include_tl0_in_digests_to_user_options.rb b/db/migrate/20160317201955_add_include_tl0_in_digests_to_user_options.rb
index 512f5d6df5..83549e2b84 100644
--- a/db/migrate/20160317201955_add_include_tl0_in_digests_to_user_options.rb
+++ b/db/migrate/20160317201955_add_include_tl0_in_digests_to_user_options.rb
@@ -1,4 +1,4 @@
-class AddIncludeTl0InDigestsToUserOptions < ActiveRecord::Migration
+class AddIncludeTl0InDigestsToUserOptions < ActiveRecord::Migration[4.2]
   def change
     add_column :user_options, :include_tl0_in_digests, :boolean, default: false
   end
diff --git a/db/migrate/20160326001747_add_user_first_visit.rb b/db/migrate/20160326001747_add_user_first_visit.rb
index 50e000ab00..9022f31d35 100644
--- a/db/migrate/20160326001747_add_user_first_visit.rb
+++ b/db/migrate/20160326001747_add_user_first_visit.rb
@@ -1,4 +1,4 @@
-class AddUserFirstVisit < ActiveRecord::Migration
+class AddUserFirstVisit < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :first_seen_at, :datetime
   end
diff --git a/db/migrate/20160329101122_remove_wiki_color.rb b/db/migrate/20160329101122_remove_wiki_color.rb
index 4b6007ceae..9f2ed76751 100644
--- a/db/migrate/20160329101122_remove_wiki_color.rb
+++ b/db/migrate/20160329101122_remove_wiki_color.rb
@@ -1,4 +1,4 @@
-class RemoveWikiColor < ActiveRecord::Migration
+class RemoveWikiColor < ActiveRecord::Migration[4.2]
   def up
     execute "DELETE FROM color_scheme_colors WHERE name = 'wiki'"
   end
diff --git a/db/migrate/20160405172827_create_user_firsts.rb b/db/migrate/20160405172827_create_user_firsts.rb
index 87dc3ed734..76712d54ca 100644
--- a/db/migrate/20160405172827_create_user_firsts.rb
+++ b/db/migrate/20160405172827_create_user_firsts.rb
@@ -1,4 +1,4 @@
-class CreateUserFirsts < ActiveRecord::Migration
+class CreateUserFirsts < ActiveRecord::Migration[4.2]
   def change
     create_table :user_firsts, force: true do |t|
       t.integer :user_id, null: false
diff --git a/db/migrate/20160407160756_remove_user_firsts.rb b/db/migrate/20160407160756_remove_user_firsts.rb
index 6f4004a59a..43d86d81cd 100644
--- a/db/migrate/20160407160756_remove_user_firsts.rb
+++ b/db/migrate/20160407160756_remove_user_firsts.rb
@@ -1,4 +1,4 @@
-class RemoveUserFirsts < ActiveRecord::Migration
+class RemoveUserFirsts < ActiveRecord::Migration[4.2]
   def up
     drop_table(:user_firsts) if table_exists?(:user_firsts)
   rescue
diff --git a/db/migrate/20160407180149_create_onceoff_logs.rb b/db/migrate/20160407180149_create_onceoff_logs.rb
index 0d91643ec5..645a245ff7 100644
--- a/db/migrate/20160407180149_create_onceoff_logs.rb
+++ b/db/migrate/20160407180149_create_onceoff_logs.rb
@@ -1,4 +1,4 @@
-class CreateOnceoffLogs < ActiveRecord::Migration
+class CreateOnceoffLogs < ActiveRecord::Migration[4.2]
   def change
     create_table :onceoff_logs do |t|
       t.string :job_name
diff --git a/db/migrate/20160408131959_add_show_on_user_card_to_user_fields.rb b/db/migrate/20160408131959_add_show_on_user_card_to_user_fields.rb
index 9713abb4dd..bc8bc09ca7 100644
--- a/db/migrate/20160408131959_add_show_on_user_card_to_user_fields.rb
+++ b/db/migrate/20160408131959_add_show_on_user_card_to_user_fields.rb
@@ -1,4 +1,4 @@
-class AddShowOnUserCardToUserFields < ActiveRecord::Migration
+class AddShowOnUserCardToUserFields < ActiveRecord::Migration[4.2]
   def change
     add_column :user_fields, :show_on_user_card, :boolean, default: false, null: false
   end
diff --git a/db/migrate/20160408175727_add_compiled_js_to_translation_overrides.rb b/db/migrate/20160408175727_add_compiled_js_to_translation_overrides.rb
index bdf28a2bf8..c37f64828b 100644
--- a/db/migrate/20160408175727_add_compiled_js_to_translation_overrides.rb
+++ b/db/migrate/20160408175727_add_compiled_js_to_translation_overrides.rb
@@ -1,4 +1,4 @@
-class AddCompiledJsToTranslationOverrides < ActiveRecord::Migration
+class AddCompiledJsToTranslationOverrides < ActiveRecord::Migration[4.2]
   def change
     add_column :translation_overrides, :compiled_js, :text, null: true
   end
diff --git a/db/migrate/20160418065403_add_bounce_key_to_email_log.rb b/db/migrate/20160418065403_add_bounce_key_to_email_log.rb
index 683a26ff8a..141742bea5 100644
--- a/db/migrate/20160418065403_add_bounce_key_to_email_log.rb
+++ b/db/migrate/20160418065403_add_bounce_key_to_email_log.rb
@@ -1,4 +1,4 @@
-class AddBounceKeyToEmailLog < ActiveRecord::Migration
+class AddBounceKeyToEmailLog < ActiveRecord::Migration[4.2]
   def change
     add_column :email_logs, :bounce_key, :string
   end
diff --git a/db/migrate/20160420172330_add_is_auto_generated_to_incoming_emails.rb b/db/migrate/20160420172330_add_is_auto_generated_to_incoming_emails.rb
index f8b64bfe56..4295e17d5a 100644
--- a/db/migrate/20160420172330_add_is_auto_generated_to_incoming_emails.rb
+++ b/db/migrate/20160420172330_add_is_auto_generated_to_incoming_emails.rb
@@ -1,4 +1,4 @@
-class AddIsAutoGeneratedToIncomingEmails < ActiveRecord::Migration
+class AddIsAutoGeneratedToIncomingEmails < ActiveRecord::Migration[4.2]
   def change
     add_column :incoming_emails, :is_auto_generated, :boolean, default: false
   end
diff --git a/db/migrate/20160425141954_fix_incoming_emails_indices.rb b/db/migrate/20160425141954_fix_incoming_emails_indices.rb
index 4fa6366343..d6b34238f7 100644
--- a/db/migrate/20160425141954_fix_incoming_emails_indices.rb
+++ b/db/migrate/20160425141954_fix_incoming_emails_indices.rb
@@ -1,4 +1,4 @@
-class FixIncomingEmailsIndices < ActiveRecord::Migration
+class FixIncomingEmailsIndices < ActiveRecord::Migration[4.2]
   def change
     add_index :incoming_emails, :post_id
   end
diff --git a/db/migrate/20160427202222_add_support_for_bounced_emails.rb b/db/migrate/20160427202222_add_support_for_bounced_emails.rb
index 6dfb9332e6..50f324ad80 100644
--- a/db/migrate/20160427202222_add_support_for_bounced_emails.rb
+++ b/db/migrate/20160427202222_add_support_for_bounced_emails.rb
@@ -1,4 +1,4 @@
-class AddSupportForBouncedEmails < ActiveRecord::Migration
+class AddSupportForBouncedEmails < ActiveRecord::Migration[4.2]
   def change
     add_column :email_logs, :bounced, :boolean, null: false, default: false
     add_column :incoming_emails, :is_bounce, :boolean, null: false, default: false
diff --git a/db/migrate/20160503205953_create_tags.rb b/db/migrate/20160503205953_create_tags.rb
index 6af853f734..535f6958ea 100644
--- a/db/migrate/20160503205953_create_tags.rb
+++ b/db/migrate/20160503205953_create_tags.rb
@@ -1,22 +1,22 @@
-class CreateTags < ActiveRecord::Migration
+class CreateTags < ActiveRecord::Migration[4.2]
   def change
     create_table :tags do |t|
       t.string      :name,        null: false
       t.integer     :topic_count, null: false, default: 0
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :topic_tags do |t|
       t.references :topic, null: false
       t.references :tag,   null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :tag_users do |t|
       t.references :tag,  null: false
       t.references :user, null: false
       t.integer    :notification_level, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :tags, :name, unique: true
diff --git a/db/migrate/20160514100852_remove_invalid_topic_user.rb b/db/migrate/20160514100852_remove_invalid_topic_user.rb
index 9f9f09f585..686d31863c 100644
--- a/db/migrate/20160514100852_remove_invalid_topic_user.rb
+++ b/db/migrate/20160514100852_remove_invalid_topic_user.rb
@@ -1,4 +1,4 @@
-class RemoveInvalidTopicUser < ActiveRecord::Migration
+class RemoveInvalidTopicUser < ActiveRecord::Migration[4.2]
   def up
     execute <<-SQL
       DELETE FROM topic_users
diff --git a/db/migrate/20160520022627_shorten_topic_custom_fields_index.rb b/db/migrate/20160520022627_shorten_topic_custom_fields_index.rb
index 8226c7556f..3175e3d15f 100644
--- a/db/migrate/20160520022627_shorten_topic_custom_fields_index.rb
+++ b/db/migrate/20160520022627_shorten_topic_custom_fields_index.rb
@@ -1,4 +1,4 @@
-class ShortenTopicCustomFieldsIndex < ActiveRecord::Migration
+class ShortenTopicCustomFieldsIndex < ActiveRecord::Migration[4.2]
   def up
     remove_index :topic_custom_fields, :value
     add_index :topic_custom_fields, [:value, :name],
diff --git a/db/migrate/20160527015355_correct_mailing_list_mode_frequency.rb b/db/migrate/20160527015355_correct_mailing_list_mode_frequency.rb
index bcbdcd0364..4e1efd7b24 100644
--- a/db/migrate/20160527015355_correct_mailing_list_mode_frequency.rb
+++ b/db/migrate/20160527015355_correct_mailing_list_mode_frequency.rb
@@ -1,4 +1,4 @@
-class CorrectMailingListModeFrequency < ActiveRecord::Migration
+class CorrectMailingListModeFrequency < ActiveRecord::Migration[4.2]
   def up
     # historically mailing list mode was for every message
     # keep working the same way for all old users
diff --git a/db/migrate/20160527191614_create_category_tags.rb b/db/migrate/20160527191614_create_category_tags.rb
index 9ec7566e6f..90de572c82 100644
--- a/db/migrate/20160527191614_create_category_tags.rb
+++ b/db/migrate/20160527191614_create_category_tags.rb
@@ -1,9 +1,9 @@
-class CreateCategoryTags < ActiveRecord::Migration
+class CreateCategoryTags < ActiveRecord::Migration[4.2]
   def change
     create_table :category_tags do |t|
       t.references :category, null: false
       t.references :tag,      null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :category_tags, [:category_id, :tag_id], name: "idx_category_tags_ix1", unique: true
diff --git a/db/migrate/20160530003739_create_scheduler_stats.rb b/db/migrate/20160530003739_create_scheduler_stats.rb
index 04cfdca817..1e9694b630 100644
--- a/db/migrate/20160530003739_create_scheduler_stats.rb
+++ b/db/migrate/20160530003739_create_scheduler_stats.rb
@@ -1,4 +1,4 @@
-class CreateSchedulerStats < ActiveRecord::Migration
+class CreateSchedulerStats < ActiveRecord::Migration[4.2]
   def change
     create_table :scheduler_stats do |t|
       t.string :name, null: false
diff --git a/db/migrate/20160530203810_add_message_id_to_email_logs.rb b/db/migrate/20160530203810_add_message_id_to_email_logs.rb
index bb74401dba..ec65cd4979 100644
--- a/db/migrate/20160530203810_add_message_id_to_email_logs.rb
+++ b/db/migrate/20160530203810_add_message_id_to_email_logs.rb
@@ -1,4 +1,4 @@
-class AddMessageIdToEmailLogs < ActiveRecord::Migration
+class AddMessageIdToEmailLogs < ActiveRecord::Migration[4.2]
   def change
     add_column :email_logs, :message_id, :string
     add_index :email_logs, :message_id
diff --git a/db/migrate/20160602164008_create_tag_groups.rb b/db/migrate/20160602164008_create_tag_groups.rb
index e851ff39b9..624564ea9b 100644
--- a/db/migrate/20160602164008_create_tag_groups.rb
+++ b/db/migrate/20160602164008_create_tag_groups.rb
@@ -1,15 +1,15 @@
-class CreateTagGroups < ActiveRecord::Migration
+class CreateTagGroups < ActiveRecord::Migration[4.2]
   def change
     create_table :tag_groups do |t|
       t.string :name,       null: false
       t.integer :tag_count, null: false, default: 0
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :tag_group_memberships do |t|
       t.references :tag,       null: false
       t.references :tag_group, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :tag_group_memberships, [:tag_group_id, :tag_id], unique: true
diff --git a/db/migrate/20160606204319_create_category_tag_groups.rb b/db/migrate/20160606204319_create_category_tag_groups.rb
index 628f131ddc..dc7b6eee15 100644
--- a/db/migrate/20160606204319_create_category_tag_groups.rb
+++ b/db/migrate/20160606204319_create_category_tag_groups.rb
@@ -1,9 +1,9 @@
-class CreateCategoryTagGroups < ActiveRecord::Migration
+class CreateCategoryTagGroups < ActiveRecord::Migration[4.2]
   def change
     create_table :category_tag_groups do |t|
       t.references :category,  null: false
       t.references :tag_group, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :category_tag_groups, [:category_id, :tag_group_id], name: "idx_category_tag_groups_ix1", unique: true
diff --git a/db/migrate/20160607213656_add_tag_group_options.rb b/db/migrate/20160607213656_add_tag_group_options.rb
index 54f0c60507..ce1f8c6790 100644
--- a/db/migrate/20160607213656_add_tag_group_options.rb
+++ b/db/migrate/20160607213656_add_tag_group_options.rb
@@ -1,4 +1,4 @@
-class AddTagGroupOptions < ActiveRecord::Migration
+class AddTagGroupOptions < ActiveRecord::Migration[4.2]
   def change
     add_column :tag_groups, :parent_tag_id, :integer
     add_column :tag_groups, :one_per_topic, :boolean, default: false
diff --git a/db/migrate/20160609203508_remove_tag_count_from_tag_groups.rb b/db/migrate/20160609203508_remove_tag_count_from_tag_groups.rb
index e6e73949be..6ab5f08832 100644
--- a/db/migrate/20160609203508_remove_tag_count_from_tag_groups.rb
+++ b/db/migrate/20160609203508_remove_tag_count_from_tag_groups.rb
@@ -1,4 +1,4 @@
-class RemoveTagCountFromTagGroups < ActiveRecord::Migration
+class RemoveTagCountFromTagGroups < ActiveRecord::Migration[4.2]
   def change
     remove_column :tag_groups, :tag_count
   end
diff --git a/db/migrate/20160615024524_rename_digest_unsbscribe_keys.rb b/db/migrate/20160615024524_rename_digest_unsbscribe_keys.rb
index e296c9b692..4ceed10fac 100644
--- a/db/migrate/20160615024524_rename_digest_unsbscribe_keys.rb
+++ b/db/migrate/20160615024524_rename_digest_unsbscribe_keys.rb
@@ -1,4 +1,4 @@
-class RenameDigestUnsbscribeKeys < ActiveRecord::Migration
+class RenameDigestUnsbscribeKeys < ActiveRecord::Migration[4.2]
   def up
     rename_table :digest_unsubscribe_keys, :unsubscribe_keys
 
diff --git a/db/migrate/20160615165447_rename_num_flags_to_block_new_user.rb b/db/migrate/20160615165447_rename_num_flags_to_block_new_user.rb
index ddcfd985d0..b171ebca38 100644
--- a/db/migrate/20160615165447_rename_num_flags_to_block_new_user.rb
+++ b/db/migrate/20160615165447_rename_num_flags_to_block_new_user.rb
@@ -1,4 +1,4 @@
-class RenameNumFlagsToBlockNewUser < ActiveRecord::Migration
+class RenameNumFlagsToBlockNewUser < ActiveRecord::Migration[4.2]
   def up
     execute "update site_settings set name = 'num_spam_flags_to_block_new_user' where name = 'num_flags_to_block_new_user'"
   end
diff --git a/db/migrate/20160627104436_use_https_name_change_in_site_settings.rb b/db/migrate/20160627104436_use_https_name_change_in_site_settings.rb
index b093e7345f..127cb0c2d2 100644
--- a/db/migrate/20160627104436_use_https_name_change_in_site_settings.rb
+++ b/db/migrate/20160627104436_use_https_name_change_in_site_settings.rb
@@ -1,4 +1,4 @@
-class UseHttpsNameChangeInSiteSettings < ActiveRecord::Migration
+class UseHttpsNameChangeInSiteSettings < ActiveRecord::Migration[4.2]
   def up
     execute "UPDATE site_settings SET name = 'force_https' WHERE name = 'use_https'"
   end
diff --git a/db/migrate/20160707195549_add_compiler_version_to_site_customizations.rb b/db/migrate/20160707195549_add_compiler_version_to_site_customizations.rb
index 6abab5f72f..3488ffa353 100644
--- a/db/migrate/20160707195549_add_compiler_version_to_site_customizations.rb
+++ b/db/migrate/20160707195549_add_compiler_version_to_site_customizations.rb
@@ -1,4 +1,4 @@
-class AddCompilerVersionToSiteCustomizations < ActiveRecord::Migration
+class AddCompilerVersionToSiteCustomizations < ActiveRecord::Migration[4.2]
   def change
     add_column :site_customizations, :compiler_version, :integer, default: 0, null: false
   end
diff --git a/db/migrate/20160716112354_remove_edit_history_public.rb b/db/migrate/20160716112354_remove_edit_history_public.rb
index 47f70b7aa8..6f5ed05de1 100644
--- a/db/migrate/20160716112354_remove_edit_history_public.rb
+++ b/db/migrate/20160716112354_remove_edit_history_public.rb
@@ -1,4 +1,4 @@
-class RemoveEditHistoryPublic < ActiveRecord::Migration
+class RemoveEditHistoryPublic < ActiveRecord::Migration[4.2]
   def up
     remove_column :user_options, :edit_history_public
   end
diff --git a/db/migrate/20160719002225_add_deleted_post_index_to_posts.rb b/db/migrate/20160719002225_add_deleted_post_index_to_posts.rb
index ec469b99ca..b306429e82 100644
--- a/db/migrate/20160719002225_add_deleted_post_index_to_posts.rb
+++ b/db/migrate/20160719002225_add_deleted_post_index_to_posts.rb
@@ -1,4 +1,4 @@
-class AddDeletedPostIndexToPosts < ActiveRecord::Migration
+class AddDeletedPostIndexToPosts < ActiveRecord::Migration[4.2]
   def change
     add_index :posts, [:topic_id, :post_number], where: 'deleted_at IS NOT NULL', name: 'idx_posts_deleted_posts'
   end
diff --git a/db/migrate/20160722071221_add_auth_token_created_at_to_users.rb b/db/migrate/20160722071221_add_auth_token_created_at_to_users.rb
index a6cea2bbcb..830fc20f79 100644
--- a/db/migrate/20160722071221_add_auth_token_created_at_to_users.rb
+++ b/db/migrate/20160722071221_add_auth_token_created_at_to_users.rb
@@ -1,4 +1,4 @@
-class AddAuthTokenCreatedAtToUsers < ActiveRecord::Migration
+class AddAuthTokenCreatedAtToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :auth_token_created_at, :datetime, null: true
   end
diff --git a/db/migrate/20160725015749_rename_auth_token_created_at.rb b/db/migrate/20160725015749_rename_auth_token_created_at.rb
index a34ea6d7a2..259a9641e8 100644
--- a/db/migrate/20160725015749_rename_auth_token_created_at.rb
+++ b/db/migrate/20160725015749_rename_auth_token_created_at.rb
@@ -1,4 +1,4 @@
-class RenameAuthTokenCreatedAt < ActiveRecord::Migration
+class RenameAuthTokenCreatedAt < ActiveRecord::Migration[4.2]
   def change
     rename_column :users, :auth_token_created_at, :auth_token_updated_at
   end
diff --git a/db/migrate/20160727233044_create_developers_table.rb b/db/migrate/20160727233044_create_developers_table.rb
index 3a87ee59e3..d63f350c9c 100644
--- a/db/migrate/20160727233044_create_developers_table.rb
+++ b/db/migrate/20160727233044_create_developers_table.rb
@@ -1,4 +1,4 @@
-class CreateDevelopersTable < ActiveRecord::Migration
+class CreateDevelopersTable < ActiveRecord::Migration[4.2]
   def change
     create_table :developers do |t|
       t.integer :user_id, null: false
diff --git a/db/migrate/20160815002002_add_user_api_keys.rb b/db/migrate/20160815002002_add_user_api_keys.rb
index 0789781d87..1341c72300 100644
--- a/db/migrate/20160815002002_add_user_api_keys.rb
+++ b/db/migrate/20160815002002_add_user_api_keys.rb
@@ -1,4 +1,4 @@
-class AddUserApiKeys < ActiveRecord::Migration
+class AddUserApiKeys < ActiveRecord::Migration[4.2]
   def change
     create_table :user_api_keys do |t|
       t.integer :user_id, null: false
@@ -9,7 +9,7 @@ class AddUserApiKeys < ActiveRecord::Migration
       t.boolean :write, null: false
       t.boolean :push, null: false
       t.string :push_url
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :user_api_keys, [:key], unique: true
diff --git a/db/migrate/20160815210156_add_flair_url_to_groups.rb b/db/migrate/20160815210156_add_flair_url_to_groups.rb
index 19cd4c1d2d..c85cfe4db3 100644
--- a/db/migrate/20160815210156_add_flair_url_to_groups.rb
+++ b/db/migrate/20160815210156_add_flair_url_to_groups.rb
@@ -1,4 +1,4 @@
-class AddFlairUrlToGroups < ActiveRecord::Migration
+class AddFlairUrlToGroups < ActiveRecord::Migration[4.2]
   def change
     add_column :groups, :flair_url,      :string
     add_column :groups, :flair_bg_color, :string
diff --git a/db/migrate/20160816052836_user_api_client_id_is_unique.rb b/db/migrate/20160816052836_user_api_client_id_is_unique.rb
index 59b3dc4b35..44401a308c 100644
--- a/db/migrate/20160816052836_user_api_client_id_is_unique.rb
+++ b/db/migrate/20160816052836_user_api_client_id_is_unique.rb
@@ -1,4 +1,4 @@
-class UserApiClientIdIsUnique < ActiveRecord::Migration
+class UserApiClientIdIsUnique < ActiveRecord::Migration[4.2]
   def change
     remove_index :user_api_keys, [:client_id]
     add_index :user_api_keys, [:client_id], unique: true
diff --git a/db/migrate/20160816063534_add_revoked_at_to_user_api_keys.rb b/db/migrate/20160816063534_add_revoked_at_to_user_api_keys.rb
index 30c252a6e8..893020f25e 100644
--- a/db/migrate/20160816063534_add_revoked_at_to_user_api_keys.rb
+++ b/db/migrate/20160816063534_add_revoked_at_to_user_api_keys.rb
@@ -1,4 +1,4 @@
-class AddRevokedAtToUserApiKeys < ActiveRecord::Migration
+class AddRevokedAtToUserApiKeys < ActiveRecord::Migration[4.2]
   def change
     add_column :user_api_keys, :revoked_at, :datetime
   end
diff --git a/db/migrate/20160823171911_add_path_whitelist_to_embeddable_hosts.rb b/db/migrate/20160823171911_add_path_whitelist_to_embeddable_hosts.rb
index 9b49fd161c..1048c9d80e 100644
--- a/db/migrate/20160823171911_add_path_whitelist_to_embeddable_hosts.rb
+++ b/db/migrate/20160823171911_add_path_whitelist_to_embeddable_hosts.rb
@@ -1,4 +1,4 @@
-class AddPathWhitelistToEmbeddableHosts < ActiveRecord::Migration
+class AddPathWhitelistToEmbeddableHosts < ActiveRecord::Migration[4.2]
   def change
     add_column :embeddable_hosts, :path_whitelist, :string
   end
diff --git a/db/migrate/20160826195018_add_flair_color_to_groups.rb b/db/migrate/20160826195018_add_flair_color_to_groups.rb
index cf96c741e7..231bc7ee77 100644
--- a/db/migrate/20160826195018_add_flair_color_to_groups.rb
+++ b/db/migrate/20160826195018_add_flair_color_to_groups.rb
@@ -1,4 +1,4 @@
-class AddFlairColorToGroups < ActiveRecord::Migration
+class AddFlairColorToGroups < ActiveRecord::Migration[4.2]
   def change
     add_column :groups, :flair_color, :string
   end
diff --git a/db/migrate/20160905082217_create_web_hook_event_types.rb b/db/migrate/20160905082217_create_web_hook_event_types.rb
index 44466d4510..1f5a36c7d0 100644
--- a/db/migrate/20160905082217_create_web_hook_event_types.rb
+++ b/db/migrate/20160905082217_create_web_hook_event_types.rb
@@ -1,4 +1,4 @@
-class CreateWebHookEventTypes < ActiveRecord::Migration
+class CreateWebHookEventTypes < ActiveRecord::Migration[4.2]
   def change
     create_table :web_hook_event_types do |t|
       t.string :name, null: false
diff --git a/db/migrate/20160905082248_create_web_hooks.rb b/db/migrate/20160905082248_create_web_hooks.rb
index f0f592507a..9afbbcaf16 100644
--- a/db/migrate/20160905082248_create_web_hooks.rb
+++ b/db/migrate/20160905082248_create_web_hooks.rb
@@ -1,4 +1,4 @@
-class CreateWebHooks < ActiveRecord::Migration
+class CreateWebHooks < ActiveRecord::Migration[4.2]
   def change
     create_table :web_hooks do |t|
       t.string  :payload_url, null: false
@@ -10,7 +10,7 @@ class CreateWebHooks < ActiveRecord::Migration
       t.boolean :verify_certificate, default: true, null: false
       t.boolean :active, default: false, null: false
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/db/migrate/20160905084502_create_web_hook_events.rb b/db/migrate/20160905084502_create_web_hook_events.rb
index 9f15520153..ba5e7b9a5a 100644
--- a/db/migrate/20160905084502_create_web_hook_events.rb
+++ b/db/migrate/20160905084502_create_web_hook_events.rb
@@ -1,4 +1,4 @@
-class CreateWebHookEvents < ActiveRecord::Migration
+class CreateWebHookEvents < ActiveRecord::Migration[4.2]
   def change
     create_table :web_hook_events do |t|
       t.belongs_to :web_hook, null: false, index: true
@@ -9,7 +9,7 @@ class CreateWebHookEvents < ActiveRecord::Migration
       t.text       :response_body
       t.integer    :duration, default: 0
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/db/migrate/20160905085445_create_join_table_web_hooks_web_hook_event_types.rb b/db/migrate/20160905085445_create_join_table_web_hooks_web_hook_event_types.rb
index 28c54d3abc..72a55bc8be 100644
--- a/db/migrate/20160905085445_create_join_table_web_hooks_web_hook_event_types.rb
+++ b/db/migrate/20160905085445_create_join_table_web_hooks_web_hook_event_types.rb
@@ -1,4 +1,4 @@
-class CreateJoinTableWebHooksWebHookEventTypes < ActiveRecord::Migration
+class CreateJoinTableWebHooksWebHookEventTypes < ActiveRecord::Migration[4.2]
   def change
     create_join_table :web_hooks, :web_hook_event_types
 
diff --git a/db/migrate/20160905091958_create_join_table_web_hooks_groups.rb b/db/migrate/20160905091958_create_join_table_web_hooks_groups.rb
index a237607710..7bbd6378f9 100644
--- a/db/migrate/20160905091958_create_join_table_web_hooks_groups.rb
+++ b/db/migrate/20160905091958_create_join_table_web_hooks_groups.rb
@@ -1,4 +1,4 @@
-class CreateJoinTableWebHooksGroups < ActiveRecord::Migration
+class CreateJoinTableWebHooksGroups < ActiveRecord::Migration[4.2]
   def change
     create_join_table :web_hooks, :groups
     add_index :groups_web_hooks, [:web_hook_id, :group_id], unique: true
diff --git a/db/migrate/20160905092148_create_join_table_web_hooks_categories.rb b/db/migrate/20160905092148_create_join_table_web_hooks_categories.rb
index 8759ff64a7..06f651042e 100644
--- a/db/migrate/20160905092148_create_join_table_web_hooks_categories.rb
+++ b/db/migrate/20160905092148_create_join_table_web_hooks_categories.rb
@@ -1,4 +1,4 @@
-class CreateJoinTableWebHooksCategories < ActiveRecord::Migration
+class CreateJoinTableWebHooksCategories < ActiveRecord::Migration[4.2]
   def change
     create_join_table :web_hooks, :categories
     add_index :categories_web_hooks, [:web_hook_id, :category_id], unique: true
diff --git a/db/migrate/20160906200439_add_via_wizard_to_color_schemes.rb b/db/migrate/20160906200439_add_via_wizard_to_color_schemes.rb
index 1fc1881f50..7d7ad0182b 100644
--- a/db/migrate/20160906200439_add_via_wizard_to_color_schemes.rb
+++ b/db/migrate/20160906200439_add_via_wizard_to_color_schemes.rb
@@ -1,4 +1,4 @@
-class AddViaWizardToColorSchemes < ActiveRecord::Migration
+class AddViaWizardToColorSchemes < ActiveRecord::Migration[4.2]
   def change
     add_column :color_schemes, :via_wizard, :boolean, default: false, null: false
     add_column :color_schemes, :theme_id, :string, null: true
diff --git a/db/migrate/20160919003141_add_avatar_url_to_facebook_info.rb b/db/migrate/20160919003141_add_avatar_url_to_facebook_info.rb
index 65b2a80dc2..f5e8366dc3 100644
--- a/db/migrate/20160919003141_add_avatar_url_to_facebook_info.rb
+++ b/db/migrate/20160919003141_add_avatar_url_to_facebook_info.rb
@@ -1,4 +1,4 @@
-class AddAvatarUrlToFacebookInfo < ActiveRecord::Migration
+class AddAvatarUrlToFacebookInfo < ActiveRecord::Migration[4.2]
   def change
     add_column :facebook_user_infos, :avatar_url, :string
   end
diff --git a/db/migrate/20160919054014_add_fields_to_facebook_user_info.rb b/db/migrate/20160919054014_add_fields_to_facebook_user_info.rb
index 8e50f8fb41..e700e81370 100644
--- a/db/migrate/20160919054014_add_fields_to_facebook_user_info.rb
+++ b/db/migrate/20160919054014_add_fields_to_facebook_user_info.rb
@@ -1,4 +1,4 @@
-class AddFieldsToFacebookUserInfo < ActiveRecord::Migration
+class AddFieldsToFacebookUserInfo < ActiveRecord::Migration[4.2]
   def change
     add_column :facebook_user_infos, :about_me, :text
     add_column :facebook_user_infos, :location, :string
diff --git a/db/migrate/20160920165833_add_moderator_to_invites.rb b/db/migrate/20160920165833_add_moderator_to_invites.rb
index 1476ac0e4f..8a6da3d81f 100644
--- a/db/migrate/20160920165833_add_moderator_to_invites.rb
+++ b/db/migrate/20160920165833_add_moderator_to_invites.rb
@@ -1,4 +1,4 @@
-class AddModeratorToInvites < ActiveRecord::Migration
+class AddModeratorToInvites < ActiveRecord::Migration[4.2]
   def change
     add_column :invites, :moderator, :boolean, default: false, null: false
   end
diff --git a/db/migrate/20160930123330_add_notification_level_when_replying.rb b/db/migrate/20160930123330_add_notification_level_when_replying.rb
index 0d3a9f6a5a..c6a588af6b 100644
--- a/db/migrate/20160930123330_add_notification_level_when_replying.rb
+++ b/db/migrate/20160930123330_add_notification_level_when_replying.rb
@@ -1,4 +1,4 @@
-class AddNotificationLevelWhenReplying < ActiveRecord::Migration
+class AddNotificationLevelWhenReplying < ActiveRecord::Migration[4.2]
   def change
     add_column :user_options, :notification_level_when_replying, :integer
   end
diff --git a/db/migrate/20161010230853_single_sign_on_increase_external_avatar_url.rb b/db/migrate/20161010230853_single_sign_on_increase_external_avatar_url.rb
index dc14e29497..801e27dee8 100644
--- a/db/migrate/20161010230853_single_sign_on_increase_external_avatar_url.rb
+++ b/db/migrate/20161010230853_single_sign_on_increase_external_avatar_url.rb
@@ -1,4 +1,4 @@
-class SingleSignOnIncreaseExternalAvatarUrl < ActiveRecord::Migration
+class SingleSignOnIncreaseExternalAvatarUrl < ActiveRecord::Migration[4.2]
   def change
     change_column :single_sign_on_records, :external_avatar_url, :string, limit: 1000
   end
diff --git a/db/migrate/20161013012136_add_scopes_to_user_api_keys.rb b/db/migrate/20161013012136_add_scopes_to_user_api_keys.rb
index d3182bdea4..e4db889af2 100644
--- a/db/migrate/20161013012136_add_scopes_to_user_api_keys.rb
+++ b/db/migrate/20161013012136_add_scopes_to_user_api_keys.rb
@@ -1,4 +1,4 @@
-class AddScopesToUserApiKeys < ActiveRecord::Migration
+class AddScopesToUserApiKeys < ActiveRecord::Migration[4.2]
   def change
     add_column :user_api_keys, :scopes, :text, array: true, null: false, default: []
 
diff --git a/db/migrate/20161014171034_add_directory_items_indexes.rb b/db/migrate/20161014171034_add_directory_items_indexes.rb
index f6b795cd1c..41c57bff68 100644
--- a/db/migrate/20161014171034_add_directory_items_indexes.rb
+++ b/db/migrate/20161014171034_add_directory_items_indexes.rb
@@ -1,4 +1,4 @@
-class AddDirectoryItemsIndexes < ActiveRecord::Migration
+class AddDirectoryItemsIndexes < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
 
   def change
diff --git a/db/migrate/20161025083648_fix_category_logo_and_background_urls.rb b/db/migrate/20161025083648_fix_category_logo_and_background_urls.rb
index 1f0f5b1a98..a3fe7b251b 100644
--- a/db/migrate/20161025083648_fix_category_logo_and_background_urls.rb
+++ b/db/migrate/20161025083648_fix_category_logo_and_background_urls.rb
@@ -1,4 +1,4 @@
-class FixCategoryLogoAndBackgroundUrls < ActiveRecord::Migration
+class FixCategoryLogoAndBackgroundUrls < ActiveRecord::Migration[4.2]
   def up
     return true if Discourse.asset_host.blank?
 
diff --git a/db/migrate/20161029181306_add_image_url_to_posts.rb b/db/migrate/20161029181306_add_image_url_to_posts.rb
index ed9e1ab859..833adef28e 100644
--- a/db/migrate/20161029181306_add_image_url_to_posts.rb
+++ b/db/migrate/20161029181306_add_image_url_to_posts.rb
@@ -1,4 +1,4 @@
-class AddImageUrlToPosts < ActiveRecord::Migration
+class AddImageUrlToPosts < ActiveRecord::Migration[4.2]
   def change
     add_column :posts, :image_url, :string
   end
diff --git a/db/migrate/20161031183811_add_sort_fields_to_categories.rb b/db/migrate/20161031183811_add_sort_fields_to_categories.rb
index 991b5484be..60c2263b30 100644
--- a/db/migrate/20161031183811_add_sort_fields_to_categories.rb
+++ b/db/migrate/20161031183811_add_sort_fields_to_categories.rb
@@ -1,4 +1,4 @@
-class AddSortFieldsToCategories < ActiveRecord::Migration
+class AddSortFieldsToCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :sort_order, :string
     add_column :categories, :sort_ascending, :boolean
diff --git a/db/migrate/20161102024700_add_post_uploads_indexes.rb b/db/migrate/20161102024700_add_post_uploads_indexes.rb
index c8f8ced714..2e58509933 100644
--- a/db/migrate/20161102024700_add_post_uploads_indexes.rb
+++ b/db/migrate/20161102024700_add_post_uploads_indexes.rb
@@ -1,4 +1,4 @@
-class AddPostUploadsIndexes < ActiveRecord::Migration
+class AddPostUploadsIndexes < ActiveRecord::Migration[4.2]
   def change
     add_index :post_uploads, :post_id
     add_index :post_uploads, :upload_id
diff --git a/db/migrate/20161102024818_add_uploaded_avatar_id_index_to_users.rb b/db/migrate/20161102024818_add_uploaded_avatar_id_index_to_users.rb
index 2e5c6e66e1..e33006b3a3 100644
--- a/db/migrate/20161102024818_add_uploaded_avatar_id_index_to_users.rb
+++ b/db/migrate/20161102024818_add_uploaded_avatar_id_index_to_users.rb
@@ -1,4 +1,4 @@
-class AddUploadedAvatarIdIndexToUsers < ActiveRecord::Migration
+class AddUploadedAvatarIdIndexToUsers < ActiveRecord::Migration[4.2]
   def change
     add_index :users, :uploaded_avatar_id
   end
diff --git a/db/migrate/20161102024838_add_user_avatars_indexes.rb b/db/migrate/20161102024838_add_user_avatars_indexes.rb
index ea1b26f7f7..d878ddb0fe 100644
--- a/db/migrate/20161102024838_add_user_avatars_indexes.rb
+++ b/db/migrate/20161102024838_add_user_avatars_indexes.rb
@@ -1,4 +1,4 @@
-class AddUserAvatarsIndexes < ActiveRecord::Migration
+class AddUserAvatarsIndexes < ActiveRecord::Migration[4.2]
   def change
     add_index :user_avatars, :custom_upload_id
     add_index :user_avatars, :gravatar_upload_id
diff --git a/db/migrate/20161102024900_add_user_profiles_indexes.rb b/db/migrate/20161102024900_add_user_profiles_indexes.rb
index 7a5ce85f26..7bd6fb03b3 100644
--- a/db/migrate/20161102024900_add_user_profiles_indexes.rb
+++ b/db/migrate/20161102024900_add_user_profiles_indexes.rb
@@ -1,4 +1,4 @@
-class AddUserProfilesIndexes < ActiveRecord::Migration
+class AddUserProfilesIndexes < ActiveRecord::Migration[4.2]
   def change
     add_index :user_profiles, :profile_background
     add_index :user_profiles, :card_background
diff --git a/db/migrate/20161102024920_add_categories_indexes.rb b/db/migrate/20161102024920_add_categories_indexes.rb
index d5ad88f10d..a2337a2667 100644
--- a/db/migrate/20161102024920_add_categories_indexes.rb
+++ b/db/migrate/20161102024920_add_categories_indexes.rb
@@ -1,4 +1,4 @@
-class AddCategoriesIndexes < ActiveRecord::Migration
+class AddCategoriesIndexes < ActiveRecord::Migration[4.2]
   def change
     add_index :categories, :logo_url
     add_index :categories, :background_url
diff --git a/db/migrate/20161124020918_add_scores_indexes_to_top_topics.rb b/db/migrate/20161124020918_add_scores_indexes_to_top_topics.rb
index 0e79373d23..3def17f22a 100644
--- a/db/migrate/20161124020918_add_scores_indexes_to_top_topics.rb
+++ b/db/migrate/20161124020918_add_scores_indexes_to_top_topics.rb
@@ -1,4 +1,4 @@
-class AddScoresIndexesToTopTopics < ActiveRecord::Migration
+class AddScoresIndexesToTopTopics < ActiveRecord::Migration[4.2]
   def change
     add_index :top_topics, :daily_score
     add_index :top_topics, :weekly_score
diff --git a/db/migrate/20161202011139_add_whisper_support_to_topics.rb b/db/migrate/20161202011139_add_whisper_support_to_topics.rb
index 0e065889e8..05e5a17cf4 100644
--- a/db/migrate/20161202011139_add_whisper_support_to_topics.rb
+++ b/db/migrate/20161202011139_add_whisper_support_to_topics.rb
@@ -1,4 +1,4 @@
-class AddWhisperSupportToTopics < ActiveRecord::Migration
+class AddWhisperSupportToTopics < ActiveRecord::Migration[4.2]
   def up
     remove_column :topics, :bookmark_count
     remove_column :topics, :off_topic_count
diff --git a/db/migrate/20161202034856_add_uploads_to_categories.rb b/db/migrate/20161202034856_add_uploads_to_categories.rb
index de35b1a0d0..b799e0c23a 100644
--- a/db/migrate/20161202034856_add_uploads_to_categories.rb
+++ b/db/migrate/20161202034856_add_uploads_to_categories.rb
@@ -1,4 +1,4 @@
-class AddUploadsToCategories < ActiveRecord::Migration
+class AddUploadsToCategories < ActiveRecord::Migration[4.2]
   def up
     add_column :categories, :uploaded_logo_id, :integer, index: true
     add_column :categories, :uploaded_background_id, :integer, index: true
diff --git a/db/migrate/20161205001727_add_topic_columns_back.rb b/db/migrate/20161205001727_add_topic_columns_back.rb
index d464c54a9e..a99c36ac1e 100644
--- a/db/migrate/20161205001727_add_topic_columns_back.rb
+++ b/db/migrate/20161205001727_add_topic_columns_back.rb
@@ -1,10 +1,10 @@
-class AddTopicColumnsBack < ActiveRecord::Migration
+class AddTopicColumnsBack < ActiveRecord::Migration[4.2]
 
   # This really sucks big time, we have no use for these columns yet can not remove them
   # if we remove them then sites will be down during migration
 
   def up
-     add_column :topics, :bookmark_count, :int
+    add_column :topics, :bookmark_count, :int
      add_column :topics, :off_topic_count, :int
      add_column :topics, :illegal_count, :int
      add_column :topics, :inappropriate_count, :int
@@ -12,7 +12,7 @@ class AddTopicColumnsBack < ActiveRecord::Migration
   end
 
   def down
-     remove_column :topics, :bookmark_count
+    remove_column :topics, :bookmark_count
      remove_column :topics, :off_topic_count
      remove_column :topics, :illegal_count
      remove_column :topics, :inappropriate_count
diff --git a/db/migrate/20161205065743_add_bio_to_groups.rb b/db/migrate/20161205065743_add_bio_to_groups.rb
index 846b3a1c97..03915f3889 100644
--- a/db/migrate/20161205065743_add_bio_to_groups.rb
+++ b/db/migrate/20161205065743_add_bio_to_groups.rb
@@ -1,4 +1,4 @@
-class AddBioToGroups < ActiveRecord::Migration
+class AddBioToGroups < ActiveRecord::Migration[4.2]
   def change
     add_column :groups, :bio_raw, :text
     add_column :groups, :bio_cooked, :text
diff --git a/db/migrate/20161207030057_add_public_to_groups.rb b/db/migrate/20161207030057_add_public_to_groups.rb
index edcceb2505..c7e8d09586 100644
--- a/db/migrate/20161207030057_add_public_to_groups.rb
+++ b/db/migrate/20161207030057_add_public_to_groups.rb
@@ -1,4 +1,4 @@
-class AddPublicToGroups < ActiveRecord::Migration
+class AddPublicToGroups < ActiveRecord::Migration[4.2]
   def change
     add_column :groups, :public, :boolean, default: :false, null: false
   end
diff --git a/db/migrate/20161208064834_create_group_histories.rb b/db/migrate/20161208064834_create_group_histories.rb
index 1b18971c4e..3407808913 100644
--- a/db/migrate/20161208064834_create_group_histories.rb
+++ b/db/migrate/20161208064834_create_group_histories.rb
@@ -1,4 +1,4 @@
-class CreateGroupHistories < ActiveRecord::Migration
+class CreateGroupHistories < ActiveRecord::Migration[4.2]
   def change
     create_table :group_histories do |t|
       t.integer :group_id, null: false
diff --git a/db/migrate/20161212123649_add_allow_membership_requests_to_groups.rb b/db/migrate/20161212123649_add_allow_membership_requests_to_groups.rb
index b219ed4ef8..1d8dce26ea 100644
--- a/db/migrate/20161212123649_add_allow_membership_requests_to_groups.rb
+++ b/db/migrate/20161212123649_add_allow_membership_requests_to_groups.rb
@@ -1,4 +1,4 @@
-class AddAllowMembershipRequestsToGroups < ActiveRecord::Migration
+class AddAllowMembershipRequestsToGroups < ActiveRecord::Migration[4.2]
   def change
     add_column :groups, :allow_membership_requests, :boolean, default: false, null: false
   end
diff --git a/db/migrate/20161213073938_add_full_name_to_groups.rb b/db/migrate/20161213073938_add_full_name_to_groups.rb
index 655b89551b..ed8933ce60 100644
--- a/db/migrate/20161213073938_add_full_name_to_groups.rb
+++ b/db/migrate/20161213073938_add_full_name_to_groups.rb
@@ -1,4 +1,4 @@
-class AddFullNameToGroups < ActiveRecord::Migration
+class AddFullNameToGroups < ActiveRecord::Migration[4.2]
   def change
     add_column :groups, :full_name, :string
   end
diff --git a/db/migrate/20161215201907_migrate_featured_link_fields.rb b/db/migrate/20161215201907_migrate_featured_link_fields.rb
index 44820a912e..02ed1492e4 100644
--- a/db/migrate/20161215201907_migrate_featured_link_fields.rb
+++ b/db/migrate/20161215201907_migrate_featured_link_fields.rb
@@ -1,4 +1,4 @@
-class MigrateFeaturedLinkFields < ActiveRecord::Migration
+class MigrateFeaturedLinkFields < ActiveRecord::Migration[4.2]
   def change
     add_column :topics, :featured_link, :string
     add_column :categories, :topic_featured_link_allowed, :boolean, default: true
diff --git a/db/migrate/20161216101352_add_all_topics_wiki_to_categories.rb b/db/migrate/20161216101352_add_all_topics_wiki_to_categories.rb
index 7d5fc43000..3293f4cf63 100644
--- a/db/migrate/20161216101352_add_all_topics_wiki_to_categories.rb
+++ b/db/migrate/20161216101352_add_all_topics_wiki_to_categories.rb
@@ -1,5 +1,5 @@
-class AddAllTopicsWikiToCategories < ActiveRecord::Migration
+class AddAllTopicsWikiToCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :all_topics_wiki, :boolean, default: false, null: false
   end
-end
\ No newline at end of file
+end
diff --git a/db/migrate/20170124181409_add_user_auth_tokens.rb b/db/migrate/20170124181409_add_user_auth_tokens.rb
index d7c785bb83..ec3b8cffda 100644
--- a/db/migrate/20170124181409_add_user_auth_tokens.rb
+++ b/db/migrate/20170124181409_add_user_auth_tokens.rb
@@ -1,4 +1,4 @@
-class AddUserAuthTokens < ActiveRecord::Migration
+class AddUserAuthTokens < ActiveRecord::Migration[4.2]
   def down
     execute <<SQL
       UPDATE users
@@ -22,17 +22,17 @@ SQL
       t.boolean :legacy, default: false, null: false
       t.inet    :client_ip
       t.datetime :rotated_at, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :user_auth_tokens, [:auth_token]
     add_index :user_auth_tokens, [:prev_auth_token]
 
-    execute <<SQL
-    INSERT INTO user_auth_tokens(user_id, auth_token, prev_auth_token, legacy, created_at, rotated_at)
-    SELECT id, auth_token, auth_token, true, auth_token_updated_at, auth_token_updated_at
+    execute <<~SQL
+    INSERT INTO user_auth_tokens(user_id, auth_token, prev_auth_token, legacy, updated_at, created_at, rotated_at)
+    SELECT id, auth_token, auth_token, true, auth_token_updated_at, auth_token_updated_at, auth_token_updated_at
     FROM users
     WHERE auth_token_updated_at IS NOT NULL AND auth_token IS NOT NULL
-SQL
+    SQL
   end
 end
diff --git a/db/migrate/20170201085745_create_custom_emojis.rb b/db/migrate/20170201085745_create_custom_emojis.rb
index 15590fba61..d5198fa4fc 100644
--- a/db/migrate/20170201085745_create_custom_emojis.rb
+++ b/db/migrate/20170201085745_create_custom_emojis.rb
@@ -1,4 +1,4 @@
-class CreateCustomEmojis < ActiveRecord::Migration
+class CreateCustomEmojis < ActiveRecord::Migration[4.2]
   def change
     create_table :custom_emojis do |t|
       t.string :name, null: false
diff --git a/db/migrate/20170213180857_add_user_auth_token_log.rb b/db/migrate/20170213180857_add_user_auth_token_log.rb
index 32eaadadf1..e8e4a4b94c 100644
--- a/db/migrate/20170213180857_add_user_auth_token_log.rb
+++ b/db/migrate/20170213180857_add_user_auth_token_log.rb
@@ -1,4 +1,4 @@
-class AddUserAuthTokenLog < ActiveRecord::Migration
+class AddUserAuthTokenLog < ActiveRecord::Migration[4.2]
   def change
     create_table :user_auth_token_logs do |t|
       t.string :action, null: false
diff --git a/db/migrate/20170215151505_add_seen_at_to_user_auth_token.rb b/db/migrate/20170215151505_add_seen_at_to_user_auth_token.rb
index c3ae6c2ef1..5044127321 100644
--- a/db/migrate/20170215151505_add_seen_at_to_user_auth_token.rb
+++ b/db/migrate/20170215151505_add_seen_at_to_user_auth_token.rb
@@ -1,4 +1,4 @@
-class AddSeenAtToUserAuthToken < ActiveRecord::Migration
+class AddSeenAtToUserAuthToken < ActiveRecord::Migration[4.2]
   def up
     add_column :user_auth_tokens, :seen_at, :datetime
     ActiveRecord::Base.exec_sql "UPDATE user_auth_tokens SET seen_at = :now WHERE auth_token_seen", now: Time.zone.now
diff --git a/db/migrate/20170221204204_add_show_subcategory_list_to_categories.rb b/db/migrate/20170221204204_add_show_subcategory_list_to_categories.rb
index 454a5d6098..3438e3ef30 100644
--- a/db/migrate/20170221204204_add_show_subcategory_list_to_categories.rb
+++ b/db/migrate/20170221204204_add_show_subcategory_list_to_categories.rb
@@ -1,9 +1,9 @@
-class AddShowSubcategoryListToCategories < ActiveRecord::Migration
+class AddShowSubcategoryListToCategories < ActiveRecord::Migration[4.2]
   def up
     add_column :categories, :show_subcategory_list, :boolean, default: false
 
     result = execute("select count(1) from site_settings where name = 'show_subcategory_list' and value = 't'")
-    if result[0] and result[0]["count"].to_i > 0
+    if result[0] && result[0]["count"].to_i > (0)
       execute "UPDATE categories SET show_subcategory_list = true WHERE parent_category_id IS NULL"
     end
   end
diff --git a/db/migrate/20170222173036_make_user_auth_token_index_unique.rb b/db/migrate/20170222173036_make_user_auth_token_index_unique.rb
index 33afe08082..48a61a8826 100644
--- a/db/migrate/20170222173036_make_user_auth_token_index_unique.rb
+++ b/db/migrate/20170222173036_make_user_auth_token_index_unique.rb
@@ -1,4 +1,4 @@
-class MakeUserAuthTokenIndexUnique < ActiveRecord::Migration
+class MakeUserAuthTokenIndexUnique < ActiveRecord::Migration[4.2]
   def up
     remove_index :user_auth_tokens, [:auth_token]
     remove_index :user_auth_tokens, [:prev_auth_token]
diff --git a/db/migrate/20170227211458_add_featured_topics_to_categories.rb b/db/migrate/20170227211458_add_featured_topics_to_categories.rb
index 6d08584007..a34123b168 100644
--- a/db/migrate/20170227211458_add_featured_topics_to_categories.rb
+++ b/db/migrate/20170227211458_add_featured_topics_to_categories.rb
@@ -1,4 +1,4 @@
-class AddFeaturedTopicsToCategories < ActiveRecord::Migration
+class AddFeaturedTopicsToCategories < ActiveRecord::Migration[4.2]
   def up
     add_column :categories, :num_featured_topics, :integer, default: 3
 
diff --git a/db/migrate/20170301215150_add_default_view_to_categories.rb b/db/migrate/20170301215150_add_default_view_to_categories.rb
index a70d1a7bab..1b83682846 100644
--- a/db/migrate/20170301215150_add_default_view_to_categories.rb
+++ b/db/migrate/20170301215150_add_default_view_to_categories.rb
@@ -1,4 +1,4 @@
-class AddDefaultViewToCategories < ActiveRecord::Migration
+class AddDefaultViewToCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :default_view, :string, null: true, limit: 50
   end
diff --git a/db/migrate/20170303070706_add_index_to_topic_view_items.rb b/db/migrate/20170303070706_add_index_to_topic_view_items.rb
index d3410816c2..39ecb19af4 100644
--- a/db/migrate/20170303070706_add_index_to_topic_view_items.rb
+++ b/db/migrate/20170303070706_add_index_to_topic_view_items.rb
@@ -1,4 +1,4 @@
-class AddIndexToTopicViewItems < ActiveRecord::Migration
+class AddIndexToTopicViewItems < ActiveRecord::Migration[4.2]
   def change
     add_index :topic_views, [:user_id, :viewed_at]
   end
diff --git a/db/migrate/20170307181800_add_path_to_user_auth_token_log.rb b/db/migrate/20170307181800_add_path_to_user_auth_token_log.rb
index c55e04c225..265c173a10 100644
--- a/db/migrate/20170307181800_add_path_to_user_auth_token_log.rb
+++ b/db/migrate/20170307181800_add_path_to_user_auth_token_log.rb
@@ -1,4 +1,4 @@
-class AddPathToUserAuthTokenLog < ActiveRecord::Migration
+class AddPathToUserAuthTokenLog < ActiveRecord::Migration[4.2]
   def change
     add_column :user_auth_token_logs, :path, :string
   end
diff --git a/db/migrate/20170308201552_add_subcategory_list_style_to_categories.rb b/db/migrate/20170308201552_add_subcategory_list_style_to_categories.rb
index 0c2f5159e4..d682662fad 100644
--- a/db/migrate/20170308201552_add_subcategory_list_style_to_categories.rb
+++ b/db/migrate/20170308201552_add_subcategory_list_style_to_categories.rb
@@ -1,4 +1,4 @@
-class AddSubcategoryListStyleToCategories < ActiveRecord::Migration
+class AddSubcategoryListStyleToCategories < ActiveRecord::Migration[4.2]
   def up
     add_column :categories, :subcategory_list_style, :string, limit: 50, default: 'rows_with_featured_topics'
 
diff --git a/db/migrate/20170313192741_add_themes.rb b/db/migrate/20170313192741_add_themes.rb
index ab2e3abc3b..be8fa82e04 100644
--- a/db/migrate/20170313192741_add_themes.rb
+++ b/db/migrate/20170313192741_add_themes.rb
@@ -1,4 +1,4 @@
-class AddThemes < ActiveRecord::Migration
+class AddThemes < ActiveRecord::Migration[4.2]
   def up
     rename_table :site_customizations, :themes
 
@@ -9,7 +9,7 @@ class AddThemes < ActiveRecord::Migration
     create_table :child_themes do |t|
       t.integer :parent_theme_id
       t.integer :child_theme_id
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :child_themes, [:parent_theme_id, :child_theme_id], unique: true
@@ -20,16 +20,15 @@ class AddThemes < ActiveRecord::Migration
     remove_column :color_schemes, :versioned_id
 
     enabled_theme_count = execute("SELECT count(*) FROM themes WHERE enabled")
-        .to_a[0]["count"].to_i
-
+      .to_a[0]["count"].to_i
 
     enabled_scheme_id = execute("SELECT id FROM color_schemes WHERE enabled")
-        .to_a[0]&.fetch("id")
+      .to_a[0]&.fetch("id")
 
     theme_key, theme_id =
       execute("SELECT key, id FROM themes WHERE enabled").to_a[0]&.values
 
-    if (enabled_theme_count == 0  && enabled_scheme_id) || enabled_theme_count > 1
+    if (enabled_theme_count == 0 && enabled_scheme_id) || enabled_theme_count > 1
 
       puts "Creating a new default theme!"
 
@@ -67,8 +66,6 @@ SQL
       execute(sql)
     end
 
-
-
     remove_column :themes, :enabled
     remove_column :color_schemes, :enabled
   end
diff --git a/db/migrate/20170322065911_create_topic_status_updates.rb b/db/migrate/20170322065911_create_topic_status_updates.rb
index 36f81a6fa8..a4451b95d5 100644
--- a/db/migrate/20170322065911_create_topic_status_updates.rb
+++ b/db/migrate/20170322065911_create_topic_status_updates.rb
@@ -1,4 +1,4 @@
-class CreateTopicStatusUpdates < ActiveRecord::Migration
+class CreateTopicStatusUpdates < ActiveRecord::Migration[4.2]
   def change
     create_table :topic_status_updates do |t|
       t.datetime :execute_at, null: false
@@ -8,7 +8,7 @@ class CreateTopicStatusUpdates < ActiveRecord::Migration
       t.boolean :based_on_last_post, null: false, default: false
       t.datetime :deleted_at
       t.integer :deleted_by_id
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :topic_status_updates, :user_id
diff --git a/db/migrate/20170322155537_add_theme_to_stylesheet_cache.rb b/db/migrate/20170322155537_add_theme_to_stylesheet_cache.rb
index 53e32696c6..9ab8b058cc 100644
--- a/db/migrate/20170322155537_add_theme_to_stylesheet_cache.rb
+++ b/db/migrate/20170322155537_add_theme_to_stylesheet_cache.rb
@@ -1,4 +1,4 @@
-class AddThemeToStylesheetCache < ActiveRecord::Migration
+class AddThemeToStylesheetCache < ActiveRecord::Migration[4.2]
   def change
     add_column :stylesheet_cache, :theme_id, :integer, default: -1, null: false
     add_column :stylesheet_cache, :source_map, :text
diff --git a/db/migrate/20170322191305_add_default_top_period_to_categories.rb b/db/migrate/20170322191305_add_default_top_period_to_categories.rb
index e6322cbdf8..f835b2a061 100644
--- a/db/migrate/20170322191305_add_default_top_period_to_categories.rb
+++ b/db/migrate/20170322191305_add_default_top_period_to_categories.rb
@@ -1,4 +1,4 @@
-class AddDefaultTopPeriodToCategories < ActiveRecord::Migration
+class AddDefaultTopPeriodToCategories < ActiveRecord::Migration[4.2]
   def change
     add_column :categories, :default_top_period, :string, limit: 20, default: 'all'
   end
diff --git a/db/migrate/20170324032913_move_auto_close_columns_to_topic_status_update.rb b/db/migrate/20170324032913_move_auto_close_columns_to_topic_status_update.rb
index a5d59760d0..b08c0fd679 100644
--- a/db/migrate/20170324032913_move_auto_close_columns_to_topic_status_update.rb
+++ b/db/migrate/20170324032913_move_auto_close_columns_to_topic_status_update.rb
@@ -1,4 +1,4 @@
-class MoveAutoCloseColumnsToTopicStatusUpdate < ActiveRecord::Migration
+class MoveAutoCloseColumnsToTopicStatusUpdate < ActiveRecord::Migration[4.2]
   def up
     # The 1 in the fourth column is TopicStatusUpdate.types[:close], an enum with value 1.
     execute <<~SQL
diff --git a/db/migrate/20170324144456_amend_css_columns_in_theme.rb b/db/migrate/20170324144456_amend_css_columns_in_theme.rb
index 588c92e05b..04173cc802 100644
--- a/db/migrate/20170324144456_amend_css_columns_in_theme.rb
+++ b/db/migrate/20170324144456_amend_css_columns_in_theme.rb
@@ -1,4 +1,4 @@
-class AmendCssColumnsInTheme < ActiveRecord::Migration
+class AmendCssColumnsInTheme < ActiveRecord::Migration[4.2]
   def change
     rename_column :themes, :stylesheet, :desktop_scss
     rename_column :themes, :mobile_stylesheet, :mobile_scss
diff --git a/db/migrate/20170328163918_break_up_themes_table.rb b/db/migrate/20170328163918_break_up_themes_table.rb
index 911584dbcd..f2a79e35d7 100644
--- a/db/migrate/20170328163918_break_up_themes_table.rb
+++ b/db/migrate/20170328163918_break_up_themes_table.rb
@@ -1,4 +1,4 @@
-class BreakUpThemesTable < ActiveRecord::Migration
+class BreakUpThemesTable < ActiveRecord::Migration[4.2]
   def change
     create_table :theme_fields do |t|
       t.integer :theme_id, null: false
@@ -6,7 +6,7 @@ class BreakUpThemesTable < ActiveRecord::Migration
       t.string :name, null: false
       t.text :value, null: false
       t.text :value_baked
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :theme_fields, [:theme_id, :target, :name], unique: true
diff --git a/db/migrate/20170328203122_add_compiler_version_to_theme_fields.rb b/db/migrate/20170328203122_add_compiler_version_to_theme_fields.rb
index 7f66ff7eae..50407c6767 100644
--- a/db/migrate/20170328203122_add_compiler_version_to_theme_fields.rb
+++ b/db/migrate/20170328203122_add_compiler_version_to_theme_fields.rb
@@ -1,4 +1,4 @@
-class AddCompilerVersionToThemeFields < ActiveRecord::Migration
+class AddCompilerVersionToThemeFields < ActiveRecord::Migration[4.2]
   def change
     add_column :theme_fields, :compiler_version, :integer, null: false, default: 0
   end
diff --git a/db/migrate/20170330041605_add_index_to_topic_status_updates.rb b/db/migrate/20170330041605_add_index_to_topic_status_updates.rb
index 12a981b5fe..1d00062fd6 100644
--- a/db/migrate/20170330041605_add_index_to_topic_status_updates.rb
+++ b/db/migrate/20170330041605_add_index_to_topic_status_updates.rb
@@ -1,4 +1,4 @@
-class AddIndexToTopicStatusUpdates < ActiveRecord::Migration
+class AddIndexToTopicStatusUpdates < ActiveRecord::Migration[4.2]
   def up
     execute <<~SQL
     CREATE UNIQUE INDEX idx_topic_id_status_type_deleted_at
diff --git a/db/migrate/20170403062717_add_category_id_to_topic_status_updates.rb b/db/migrate/20170403062717_add_category_id_to_topic_status_updates.rb
index 33147680bb..6dfc88781a 100644
--- a/db/migrate/20170403062717_add_category_id_to_topic_status_updates.rb
+++ b/db/migrate/20170403062717_add_category_id_to_topic_status_updates.rb
@@ -1,4 +1,4 @@
-class AddCategoryIdToTopicStatusUpdates < ActiveRecord::Migration
+class AddCategoryIdToTopicStatusUpdates < ActiveRecord::Migration[4.2]
   def change
     add_column :topic_status_updates, :category_id, :integer
   end
diff --git a/db/migrate/20170407154510_rename_theme_id.rb b/db/migrate/20170407154510_rename_theme_id.rb
index 48d3524f64..b6876b0a56 100644
--- a/db/migrate/20170407154510_rename_theme_id.rb
+++ b/db/migrate/20170407154510_rename_theme_id.rb
@@ -1,4 +1,4 @@
-class RenameThemeId < ActiveRecord::Migration
+class RenameThemeId < ActiveRecord::Migration[4.2]
   def change
     rename_column :color_schemes, :theme_id, :base_scheme_id
   end
diff --git a/db/migrate/20170410170923_add_theme_remote_fields.rb b/db/migrate/20170410170923_add_theme_remote_fields.rb
index 95cb5d7e5c..971c30da47 100644
--- a/db/migrate/20170410170923_add_theme_remote_fields.rb
+++ b/db/migrate/20170410170923_add_theme_remote_fields.rb
@@ -1,4 +1,4 @@
-class AddThemeRemoteFields < ActiveRecord::Migration
+class AddThemeRemoteFields < ActiveRecord::Migration[4.2]
   def change
     create_table :remote_themes do |t|
       t.string :remote_url, null: false
@@ -8,7 +8,7 @@ class AddThemeRemoteFields < ActiveRecord::Migration
       t.string :license_url
       t.integer :commits_behind
       t.datetime :remote_updated_at
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_column :themes, :remote_theme_id, :integer
diff --git a/db/migrate/20170413043152_rename_warnings.rb b/db/migrate/20170413043152_rename_warnings.rb
index d4397726be..d97e063625 100644
--- a/db/migrate/20170413043152_rename_warnings.rb
+++ b/db/migrate/20170413043152_rename_warnings.rb
@@ -1,4 +1,4 @@
-class RenameWarnings < ActiveRecord::Migration
+class RenameWarnings < ActiveRecord::Migration[4.2]
   def up
     rename_table :warnings, :user_warnings
   end
diff --git a/db/migrate/20170417164715_add_theme_id_to_color_scheme.rb b/db/migrate/20170417164715_add_theme_id_to_color_scheme.rb
index 884621c776..35f3c45f48 100644
--- a/db/migrate/20170417164715_add_theme_id_to_color_scheme.rb
+++ b/db/migrate/20170417164715_add_theme_id_to_color_scheme.rb
@@ -1,4 +1,4 @@
-class AddThemeIdToColorScheme < ActiveRecord::Migration
+class AddThemeIdToColorScheme < ActiveRecord::Migration[4.2]
   def change
     add_column :color_schemes, :theme_id, :int
   end
diff --git a/db/migrate/20170419193714_add_error_to_theme_fields.rb b/db/migrate/20170419193714_add_error_to_theme_fields.rb
index 34bcaa4754..7f83abd14e 100644
--- a/db/migrate/20170419193714_add_error_to_theme_fields.rb
+++ b/db/migrate/20170419193714_add_error_to_theme_fields.rb
@@ -1,4 +1,4 @@
-class AddErrorToThemeFields < ActiveRecord::Migration
+class AddErrorToThemeFields < ActiveRecord::Migration[4.2]
   def change
     add_column :theme_fields, :error, :string
   end
diff --git a/db/migrate/20170420163628_add_default_notification_level_to_group.rb b/db/migrate/20170420163628_add_default_notification_level_to_group.rb
index dee6ae771e..0fee0d3099 100644
--- a/db/migrate/20170420163628_add_default_notification_level_to_group.rb
+++ b/db/migrate/20170420163628_add_default_notification_level_to_group.rb
@@ -1,4 +1,4 @@
-class AddDefaultNotificationLevelToGroup < ActiveRecord::Migration
+class AddDefaultNotificationLevelToGroup < ActiveRecord::Migration[4.2]
   def up
     add_column :groups, :default_notification_level, :integer, default: 3, null: false
     # don't auto watch 'moderators' it is just way too loud
diff --git a/db/migrate/20170425083011_add_deleted_at_to_topic_embeds.rb b/db/migrate/20170425083011_add_deleted_at_to_topic_embeds.rb
index 5aaf8ed836..a6fe69341b 100644
--- a/db/migrate/20170425083011_add_deleted_at_to_topic_embeds.rb
+++ b/db/migrate/20170425083011_add_deleted_at_to_topic_embeds.rb
@@ -1,4 +1,4 @@
-class AddDeletedAtToTopicEmbeds < ActiveRecord::Migration
+class AddDeletedAtToTopicEmbeds < ActiveRecord::Migration[4.2]
   def change
     add_column :topic_embeds, :deleted_at, :datetime
     add_column :topic_embeds, :deleted_by_id, :integer, null: true
diff --git a/db/migrate/20170425172415_add_error_to_scheduler_stats.rb b/db/migrate/20170425172415_add_error_to_scheduler_stats.rb
index 9d26ec29d7..a7b7aaee6c 100644
--- a/db/migrate/20170425172415_add_error_to_scheduler_stats.rb
+++ b/db/migrate/20170425172415_add_error_to_scheduler_stats.rb
@@ -1,4 +1,4 @@
-class AddErrorToSchedulerStats < ActiveRecord::Migration
+class AddErrorToSchedulerStats < ActiveRecord::Migration[4.2]
   def change
     add_column :scheduler_stats, :error, :text
   end
diff --git a/db/migrate/20170501191912_add_upload_id_to_theme_fields.rb b/db/migrate/20170501191912_add_upload_id_to_theme_fields.rb
index d72fee8005..b146d6aa7c 100644
--- a/db/migrate/20170501191912_add_upload_id_to_theme_fields.rb
+++ b/db/migrate/20170501191912_add_upload_id_to_theme_fields.rb
@@ -1,4 +1,4 @@
-class AddUploadIdToThemeFields < ActiveRecord::Migration
+class AddUploadIdToThemeFields < ActiveRecord::Migration[4.2]
   def up
     remove_index :theme_fields, [:theme_id, :target, :name]
     rename_column :theme_fields, :target, :target_id
diff --git a/db/migrate/20170505035229_migrate_mailing_list_daily_updates_users_to_daily_summary.rb b/db/migrate/20170505035229_migrate_mailing_list_daily_updates_users_to_daily_summary.rb
index 735d527805..3408db7477 100644
--- a/db/migrate/20170505035229_migrate_mailing_list_daily_updates_users_to_daily_summary.rb
+++ b/db/migrate/20170505035229_migrate_mailing_list_daily_updates_users_to_daily_summary.rb
@@ -1,4 +1,4 @@
-class MigrateMailingListDailyUpdatesUsersToDailySummary < ActiveRecord::Migration
+class MigrateMailingListDailyUpdatesUsersToDailySummary < ActiveRecord::Migration[4.2]
   def change
     change_column_default :user_options, :mailing_list_mode_frequency, 1
 
diff --git a/db/migrate/20170508183819_add_css_class_name_to_embeddable_hosts.rb b/db/migrate/20170508183819_add_css_class_name_to_embeddable_hosts.rb
index 4a078139d5..c2dea75ae3 100644
--- a/db/migrate/20170508183819_add_css_class_name_to_embeddable_hosts.rb
+++ b/db/migrate/20170508183819_add_css_class_name_to_embeddable_hosts.rb
@@ -1,4 +1,4 @@
-class AddCssClassNameToEmbeddableHosts < ActiveRecord::Migration
+class AddCssClassNameToEmbeddableHosts < ActiveRecord::Migration[4.2]
   def change
     add_column :embeddable_hosts, :class_name, :string
   end
diff --git a/db/migrate/20170511071355_remove_convert_pasted_image_site_setting.rb b/db/migrate/20170511071355_remove_convert_pasted_image_site_setting.rb
index b865a86d26..f6f45052d8 100644
--- a/db/migrate/20170511071355_remove_convert_pasted_image_site_setting.rb
+++ b/db/migrate/20170511071355_remove_convert_pasted_image_site_setting.rb
@@ -1,4 +1,4 @@
-class RemoveConvertPastedImageSiteSetting < ActiveRecord::Migration
+class RemoveConvertPastedImageSiteSetting < ActiveRecord::Migration[4.2]
   def up
     execute "DELETE FROM site_settings WHERE name = 'convert_pasted_images_to_hq_jpg'"
   end
diff --git a/db/migrate/20170511080007_rename_convert_pasted_images_quality_site_setting.rb b/db/migrate/20170511080007_rename_convert_pasted_images_quality_site_setting.rb
index 521d5f5143..0747d55161 100644
--- a/db/migrate/20170511080007_rename_convert_pasted_images_quality_site_setting.rb
+++ b/db/migrate/20170511080007_rename_convert_pasted_images_quality_site_setting.rb
@@ -1,4 +1,4 @@
-class RenameConvertPastedImagesQualitySiteSetting < ActiveRecord::Migration
+class RenameConvertPastedImagesQualitySiteSetting < ActiveRecord::Migration[4.2]
   def up
     execute "UPDATE site_settings SET name = 'png_to_jpg_quality' WHERE name = 'convert_pasted_images_quality'"
   end
diff --git a/db/migrate/20170511184842_rename_topic_status_updates_to_topic_timers.rb b/db/migrate/20170511184842_rename_topic_status_updates_to_topic_timers.rb
index c185bfaa0c..bb5ebd6580 100644
--- a/db/migrate/20170511184842_rename_topic_status_updates_to_topic_timers.rb
+++ b/db/migrate/20170511184842_rename_topic_status_updates_to_topic_timers.rb
@@ -1,4 +1,4 @@
-class RenameTopicStatusUpdatesToTopicTimers < ActiveRecord::Migration
+class RenameTopicStatusUpdatesToTopicTimers < ActiveRecord::Migration[4.2]
   def change
     rename_table :topic_status_updates, :topic_timers
   end
diff --git a/db/migrate/20170512153318_add_theme_key_to_user_options.rb b/db/migrate/20170512153318_add_theme_key_to_user_options.rb
index 8f8fc0e99d..45b731b77c 100644
--- a/db/migrate/20170512153318_add_theme_key_to_user_options.rb
+++ b/db/migrate/20170512153318_add_theme_key_to_user_options.rb
@@ -1,4 +1,4 @@
-class AddThemeKeyToUserOptions < ActiveRecord::Migration
+class AddThemeKeyToUserOptions < ActiveRecord::Migration[4.2]
   def change
     add_column :user_options, :theme_key, :string
   end
diff --git a/db/migrate/20170512185227_create_topic_status_updates_again.rb b/db/migrate/20170512185227_create_topic_status_updates_again.rb
index aaa8ba70df..9883594e90 100644
--- a/db/migrate/20170512185227_create_topic_status_updates_again.rb
+++ b/db/migrate/20170512185227_create_topic_status_updates_again.rb
@@ -1,6 +1,6 @@
 require 'table_migration_helper'
 
-class CreateTopicStatusUpdatesAgain < ActiveRecord::Migration
+class CreateTopicStatusUpdatesAgain < ActiveRecord::Migration[4.2]
   def up
     create_table :topic_status_updates do |t|
       t.datetime :execute_at, null: false
@@ -10,7 +10,7 @@ class CreateTopicStatusUpdatesAgain < ActiveRecord::Migration
       t.boolean :based_on_last_post, null: false, default: false
       t.datetime :deleted_at
       t.integer :deleted_by_id
-      t.timestamps
+      t.timestamps null: false
       t.integer :category_id
     end
 
diff --git a/db/migrate/20170515152725_add_theme_key_seq_to_user_options.rb b/db/migrate/20170515152725_add_theme_key_seq_to_user_options.rb
index 7bba1cf9c5..2349e40e33 100644
--- a/db/migrate/20170515152725_add_theme_key_seq_to_user_options.rb
+++ b/db/migrate/20170515152725_add_theme_key_seq_to_user_options.rb
@@ -1,4 +1,4 @@
-class AddThemeKeySeqToUserOptions < ActiveRecord::Migration
+class AddThemeKeySeqToUserOptions < ActiveRecord::Migration[4.2]
   def change
     add_column :user_options, :theme_key_seq, :integer, null: false, default: 0
   end
diff --git a/db/migrate/20170515203721_add_public_type_to_topic_timers.rb b/db/migrate/20170515203721_add_public_type_to_topic_timers.rb
index 168f2ac85d..4616e29108 100644
--- a/db/migrate/20170515203721_add_public_type_to_topic_timers.rb
+++ b/db/migrate/20170515203721_add_public_type_to_topic_timers.rb
@@ -1,4 +1,4 @@
-class AddPublicTypeToTopicTimers < ActiveRecord::Migration
+class AddPublicTypeToTopicTimers < ActiveRecord::Migration[4.2]
   def up
     add_column :topic_timers, :public_type, :boolean, default: true
 
diff --git a/db/migrate/20170524182846_add_unread_tracking_columns.rb b/db/migrate/20170524182846_add_unread_tracking_columns.rb
index 28cb3d7d25..45b94c4319 100644
--- a/db/migrate/20170524182846_add_unread_tracking_columns.rb
+++ b/db/migrate/20170524182846_add_unread_tracking_columns.rb
@@ -1,9 +1,9 @@
-class AddUnreadTrackingColumns < ActiveRecord::Migration
+class AddUnreadTrackingColumns < ActiveRecord::Migration[4.2]
   def up
     # no op, no need to create all data, next migration will delete it
   end
 
   def down
-    raise "Can not be reverted"
+    raise ActiveRecord::IrreversibleMigration
   end
 end
diff --git a/db/migrate/20170526125321_drop_unread_tracking_columns.rb b/db/migrate/20170526125321_drop_unread_tracking_columns.rb
index 3d11870218..8e609f8c32 100644
--- a/db/migrate/20170526125321_drop_unread_tracking_columns.rb
+++ b/db/migrate/20170526125321_drop_unread_tracking_columns.rb
@@ -1,8 +1,8 @@
-class DropUnreadTrackingColumns < ActiveRecord::Migration
+class DropUnreadTrackingColumns < ActiveRecord::Migration[4.2]
   def up
   end
 
   def down
-    raise "Can not be reverted"
+    raise ActiveRecord::IrreversibleMigration
   end
 end
diff --git a/db/migrate/20170602132735_fix_group_allow_membership_requests.rb b/db/migrate/20170602132735_fix_group_allow_membership_requests.rb
new file mode 100644
index 0000000000..7573e2a81c
--- /dev/null
+++ b/db/migrate/20170602132735_fix_group_allow_membership_requests.rb
@@ -0,0 +1,13 @@
+class FixGroupAllowMembershipRequests < ActiveRecord::Migration[4.2]
+  def up
+    execute <<~SQL
+    UPDATE groups g
+    SET allow_membership_requests = 'f'
+    WHERE NOT EXISTS (SELECT 1 FROM group_users gu WHERE gu.owner = 't' AND gu.group_id = g.id LIMIT 1)
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
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 0000000000..b945b4e210
--- /dev/null
+++ b/db/migrate/20170605014820_remove_auto_close_columns_from_topics.rb
@@ -0,0 +1,9 @@
+class RemoveAutoCloseColumnsFromTopics < ActiveRecord::Migration[4.2]
+  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/20170609115401_add_extension_to_topic_links.rb b/db/migrate/20170609115401_add_extension_to_topic_links.rb
new file mode 100644
index 0000000000..48976bae24
--- /dev/null
+++ b/db/migrate/20170609115401_add_extension_to_topic_links.rb
@@ -0,0 +1,6 @@
+class AddExtensionToTopicLinks < ActiveRecord::Migration[4.2]
+  def change
+    add_column :topic_links, :extension, :string, limit: 10
+    add_index :topic_links, :extension
+  end
+end
diff --git a/db/migrate/20170628152322_create_watched_words.rb b/db/migrate/20170628152322_create_watched_words.rb
new file mode 100644
index 0000000000..c4c44f524a
--- /dev/null
+++ b/db/migrate/20170628152322_create_watched_words.rb
@@ -0,0 +1,11 @@
+class CreateWatchedWords < ActiveRecord::Migration[4.2]
+  def change
+    create_table :watched_words do |t|
+      t.string  :word,   null: false
+      t.integer :action, null: false
+      t.timestamps null: false
+    end
+
+    add_index :watched_words, [:action, :word], unique: true
+  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 0000000000..72c697c309
--- /dev/null
+++ b/db/migrate/20170630083540_add_custom_message_to_invite.rb
@@ -0,0 +1,5 @@
+class AddCustomMessageToInvite < ActiveRecord::Migration[4.2]
+  def change
+    add_column :invites, :custom_message, :text
+  end
+end
diff --git a/db/migrate/20170703115216_add_extension_to_uploads.rb b/db/migrate/20170703115216_add_extension_to_uploads.rb
new file mode 100644
index 0000000000..ba8b696f49
--- /dev/null
+++ b/db/migrate/20170703115216_add_extension_to_uploads.rb
@@ -0,0 +1,11 @@
+class AddExtensionToUploads < ActiveRecord::Migration[4.2]
+  def up
+    add_column :uploads, :extension, :string, limit: 10
+    execute "CREATE INDEX index_uploads_on_extension ON uploads(lower(extension))"
+  end
+
+  def down
+    remove_column :uploads, :extension
+    execute "DROP INDEX index_uploads_on_extension"
+  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 0000000000..0987bea384
--- /dev/null
+++ b/db/migrate/20170703144855_add_visibility_level_to_groups.rb
@@ -0,0 +1,12 @@
+class AddVisibilityLevelToGroups < ActiveRecord::Migration[4.2]
+  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 0000000000..5d2a761b52
--- /dev/null
+++ b/db/migrate/20170704142141_add_visible_back_to_groups.rb
@@ -0,0 +1,7 @@
+class AddVisibleBackToGroups < ActiveRecord::Migration[4.2]
+  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 0000000000..59a8fbff20
--- /dev/null
+++ b/db/migrate/20170713164357_create_search_logs.rb
@@ -0,0 +1,12 @@
+class CreateSearchLogs < ActiveRecord::Migration[4.2]
+  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 0000000000..978c75bfdf
--- /dev/null
+++ b/db/migrate/20170717084947_create_user_emails.rb
@@ -0,0 +1,42 @@
+require_dependency 'column_dropper'
+
+class CreateUserEmails < ActiveRecord::Migration[4.2]
+  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 null: false
+    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/db/migrate/20170725075535_correct_default_email_mailing_list_mode_frequency.rb b/db/migrate/20170725075535_correct_default_email_mailing_list_mode_frequency.rb
new file mode 100644
index 0000000000..5eccdd0607
--- /dev/null
+++ b/db/migrate/20170725075535_correct_default_email_mailing_list_mode_frequency.rb
@@ -0,0 +1,8 @@
+class CorrectDefaultEmailMailingListModeFrequency < ActiveRecord::Migration[4.2]
+  def up
+    execute "UPDATE site_settings SET value = '1' WHERE value = '0' AND name = 'default_email_mailing_list_mode_frequency';"
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20170728012754_split_public_in_groups.rb b/db/migrate/20170728012754_split_public_in_groups.rb
new file mode 100644
index 0000000000..febb2f9779
--- /dev/null
+++ b/db/migrate/20170728012754_split_public_in_groups.rb
@@ -0,0 +1,17 @@
+class SplitPublicInGroups < ActiveRecord::Migration[4.2]
+  def up
+    add_column :groups, :public_exit, :boolean, default: false, null: false
+    add_column :groups, :public_admission, :boolean, default: false, null: false
+
+    ActiveRecord::Base.exec_sql <<~SQL
+    UPDATE groups
+    SET public_exit = true, public_admission = true
+    WHERE public = true
+    SQL
+  end
+
+  def down
+    remove_column :groups, :public_exit
+    remove_column :groups, :public_admission
+  end
+end
diff --git a/db/migrate/20170728054115_remove_public_from_groups.rb b/db/migrate/20170728054115_remove_public_from_groups.rb
new file mode 100644
index 0000000000..ec16a39d52
--- /dev/null
+++ b/db/migrate/20170728054115_remove_public_from_groups.rb
@@ -0,0 +1,9 @@
+class RemovePublicFromGroups < ActiveRecord::Migration[4.2]
+  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/20170731075604_add_membership_request_template_to_groups.rb b/db/migrate/20170731075604_add_membership_request_template_to_groups.rb
new file mode 100644
index 0000000000..dc69065457
--- /dev/null
+++ b/db/migrate/20170731075604_add_membership_request_template_to_groups.rb
@@ -0,0 +1,5 @@
+class AddMembershipRequestTemplateToGroups < ActiveRecord::Migration[4.2]
+  def change
+    add_column :groups, :membership_request_template, :text
+  end
+end
diff --git a/db/migrate/20170803123704_add_version_to_search_data.rb b/db/migrate/20170803123704_add_version_to_search_data.rb
new file mode 100644
index 0000000000..bb91c8fa9b
--- /dev/null
+++ b/db/migrate/20170803123704_add_version_to_search_data.rb
@@ -0,0 +1,8 @@
+class AddVersionToSearchData < ActiveRecord::Migration[4.2]
+  def change
+    add_column :post_search_data, :version, :integer, default: 0
+    add_column :topic_search_data, :version, :integer, default: 0
+    add_column :category_search_data, :version, :integer, default: 0
+    add_column :user_search_data, :version, :integer, default: 0
+  end
+end
diff --git a/db/migrate/20170818191909_split_alias_levels.rb b/db/migrate/20170818191909_split_alias_levels.rb
new file mode 100644
index 0000000000..cbf650218d
--- /dev/null
+++ b/db/migrate/20170818191909_split_alias_levels.rb
@@ -0,0 +1,12 @@
+class SplitAliasLevels < ActiveRecord::Migration[4.2]
+  def up
+    add_column :groups, :messageable_level, :integer, default: 0
+    add_column :groups, :mentionable_level, :integer, default: 0
+
+    execute 'UPDATE groups SET messageable_level = alias_level, mentionable_level = alias_level'
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20170823173427_create_tag_search_data.rb b/db/migrate/20170823173427_create_tag_search_data.rb
new file mode 100644
index 0000000000..8403eb0511
--- /dev/null
+++ b/db/migrate/20170823173427_create_tag_search_data.rb
@@ -0,0 +1,16 @@
+class CreateTagSearchData < ActiveRecord::Migration[4.2]
+  def up
+    create_table :tag_search_data, primary_key: :tag_id do |t|
+      t.tsvector "search_data"
+      t.text     "raw_data"
+      t.text     "locale"
+      t.integer  "version",     default: 0
+    end
+    execute 'create index idx_search_tag on tag_search_data using gin(search_data)'
+  end
+
+  def down
+    execute 'drop index idx_search_tag'
+    drop_table :tag_search_data
+  end
+end
diff --git a/db/migrate/20170824172615_add_slug_index_on_topic.rb b/db/migrate/20170824172615_add_slug_index_on_topic.rb
new file mode 100644
index 0000000000..b67ca4a5e7
--- /dev/null
+++ b/db/migrate/20170824172615_add_slug_index_on_topic.rb
@@ -0,0 +1,9 @@
+class AddSlugIndexOnTopic < ActiveRecord::Migration[4.2]
+  def up
+    execute 'CREATE INDEX idxTopicSlug ON topics(slug) WHERE deleted_at IS NULL AND slug IS NOT NULL'
+  end
+
+  def down
+    execute 'DROP INDEX idxTopicSlug'
+  end
+end
diff --git a/db/migrate/20170831180419_remove_whisper_topic_links.rb b/db/migrate/20170831180419_remove_whisper_topic_links.rb
index c9798c59f0..2a66c97f2f 100644
--- a/db/migrate/20170831180419_remove_whisper_topic_links.rb
+++ b/db/migrate/20170831180419_remove_whisper_topic_links.rb
@@ -1,4 +1,4 @@
-class RemoveWhisperTopicLinks < ActiveRecord::Migration
+class RemoveWhisperTopicLinks < ActiveRecord::Migration[4.2]
   def change
     execute <<-SQL
       DELETE FROM topic_links
diff --git a/db/migrate/20171003180951_rename_forgot_password_strict_setting.rb b/db/migrate/20171003180951_rename_forgot_password_strict_setting.rb
new file mode 100644
index 0000000000..0a9945bb96
--- /dev/null
+++ b/db/migrate/20171003180951_rename_forgot_password_strict_setting.rb
@@ -0,0 +1,9 @@
+class RenameForgotPasswordStrictSetting < ActiveRecord::Migration[5.1]
+  def up
+    execute "UPDATE site_settings SET name = 'hide_email_address_taken' WHERE name = 'forgot_password_strict'"
+  end
+
+  def down
+    execute "UPDATE site_settings SET name = 'forgot_password_strict' WHERE name = 'hide_email_address_taken'"
+  end
+end
diff --git a/db/migrate/20171006030028_add_allow_private_messages_to_user_options.rb b/db/migrate/20171006030028_add_allow_private_messages_to_user_options.rb
new file mode 100644
index 0000000000..c74f68fff8
--- /dev/null
+++ b/db/migrate/20171006030028_add_allow_private_messages_to_user_options.rb
@@ -0,0 +1,5 @@
+class AddAllowPrivateMessagesToUserOptions < ActiveRecord::Migration[5.1]
+  def change
+    add_column :user_options, :allow_private_messages, :boolean, default: true, null: false
+  end
+end
diff --git a/db/migrate/20171026014317_add_user_option_home.rb b/db/migrate/20171026014317_add_user_option_home.rb
new file mode 100644
index 0000000000..8724ec40e7
--- /dev/null
+++ b/db/migrate/20171026014317_add_user_option_home.rb
@@ -0,0 +1,5 @@
+class AddUserOptionHome < ActiveRecord::Migration[5.1]
+  def change
+    add_column :user_options, :homepage_id, :integer, null: true, default: nil
+  end
+end
diff --git a/db/migrate/20171107020512_drop_email_from_users.rb b/db/migrate/20171107020512_drop_email_from_users.rb
new file mode 100644
index 0000000000..f5697d3718
--- /dev/null
+++ b/db/migrate/20171107020512_drop_email_from_users.rb
@@ -0,0 +1,9 @@
+class DropEmailFromUsers < ActiveRecord::Migration[5.1]
+  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/20171110174413_rename_blocked_silence.rb b/db/migrate/20171110174413_rename_blocked_silence.rb
new file mode 100644
index 0000000000..d8c1613ff1
--- /dev/null
+++ b/db/migrate/20171110174413_rename_blocked_silence.rb
@@ -0,0 +1,32 @@
+class RenameBlockedSilence < ActiveRecord::Migration[5.1]
+
+  def setting(old, new)
+    execute "UPDATE site_settings SET name='#{new}' where name='#{old}'"
+  end
+
+  def up
+    add_column :users, :silenced, :boolean, default: false, null: false
+    execute "UPDATE users set silenced = blocked"
+
+    setting :notify_mods_when_user_blocked, :notify_mods_when_user_silenced
+    setting :auto_block_fast_typers_on_first_post, :auto_silence_fast_typers_on_first_post
+    setting :auto_block_fast_typers_max_trust_level, :auto_silence_fast_typers_max_trust_level
+    setting :auto_block_first_post_regex, :auto_silence_first_post_regex
+    setting :num_spam_flags_to_block_new_user, :num_spam_flags_to_silence_new_user
+    setting :num_users_to_block_new_user, :num_users_to_silence_new_user
+    setting :num_tl3_flags_to_block_new_user, :num_tl3_flags_to_silence_new_user
+    setting :num_tl3_users_to_block_new_user, :num_tl3_users_to_silence_new_user
+  end
+
+  def down
+    remove_column :users, :silenced
+    setting :notify_mods_when_user_silenced, :notify_mods_when_user_blocked
+    setting :auto_silence_fast_typers_on_first_post, :auto_block_fast_typers_on_first_post
+    setting :auto_silence_fast_typers_max_trust_level, :auto_block_fast_typers_max_trust_level
+    setting :auto_silence_first_post_regex, :auto_block_first_post_regex
+    setting :num_spam_flags_to_silence_new_user, :num_spam_flags_to_block_new_user
+    setting :num_users_to_silence_new_user, :num_users_to_block_new_user
+    setting :num_tl3_flags_to_silence_new_user, :num_tl3_flags_to_block_new_user
+    setting :num_tl3_users_to_silence_new_user, :num_tl3_users_to_block_new_user
+  end
+end
diff --git a/db/migrate/20171113175414_add_silenced_till_to_users.rb b/db/migrate/20171113175414_add_silenced_till_to_users.rb
new file mode 100644
index 0000000000..33552a3898
--- /dev/null
+++ b/db/migrate/20171113175414_add_silenced_till_to_users.rb
@@ -0,0 +1,14 @@
+class AddSilencedTillToUsers < ActiveRecord::Migration[5.1]
+  def up
+    add_column :users, :silenced_till, :timestamp, null: true
+    execute <<~SQL
+      UPDATE users
+        SET silenced_till = CURRENT_TIMESTAMP + INTERVAL '1000 YEAR'
+        WHERE silenced
+    SQL
+  end
+
+  def down
+    add_column :users, :silenced_till
+  end
+end
diff --git a/db/migrate/20171113214725_add_time_read_to_user_visits.rb b/db/migrate/20171113214725_add_time_read_to_user_visits.rb
new file mode 100644
index 0000000000..4079fcdef4
--- /dev/null
+++ b/db/migrate/20171113214725_add_time_read_to_user_visits.rb
@@ -0,0 +1,11 @@
+class AddTimeReadToUserVisits < ActiveRecord::Migration[5.1]
+  def up
+    add_column :user_visits, :time_read, :integer, null: false, default: 0 # in seconds
+    add_index :user_visits, [:user_id, :visited_at, :time_read]
+  end
+
+  def down
+    remove_index :user_visits, [:user_id, :visited_at, :time_read]
+    remove_column :user_visits, :time_read
+  end
+end
diff --git a/db/migrate/20171115170858_add_mailinglist_mirror_to_categories.rb b/db/migrate/20171115170858_add_mailinglist_mirror_to_categories.rb
new file mode 100644
index 0000000000..71555579d8
--- /dev/null
+++ b/db/migrate/20171115170858_add_mailinglist_mirror_to_categories.rb
@@ -0,0 +1,9 @@
+class AddMailinglistMirrorToCategories < ActiveRecord::Migration[5.1]
+  def up
+    add_column :categories, :mailinglist_mirror, :boolean, default: false, null: false
+  end
+
+  def down
+    remove_column :categories, :mailinglist_mirror
+  end
+end
diff --git a/db/migrate/20171123200157_add_trust_level_locks_to_users.rb b/db/migrate/20171123200157_add_trust_level_locks_to_users.rb
new file mode 100644
index 0000000000..36e9c8752f
--- /dev/null
+++ b/db/migrate/20171123200157_add_trust_level_locks_to_users.rb
@@ -0,0 +1,27 @@
+class AddTrustLevelLocksToUsers < ActiveRecord::Migration[5.1]
+  def up
+    add_column :users, :group_locked_trust_level, :integer, null: true
+    add_column :users, :manual_locked_trust_level, :integer, null: true
+
+    execute <<~SQL
+      UPDATE users SET manual_locked_trust_level = trust_level WHERE trust_level_locked
+    SQL
+
+    execute <<~SQL
+      UPDATE users SET group_locked_trust_level = x.tl
+      FROM users AS u
+      INNER JOIN (
+        SELECT gu.user_id, MAX(g.grant_trust_level) AS tl
+        FROM group_users AS gu
+        INNER JOIN groups AS g ON gu.group_id = g.id
+          WHERE g.grant_trust_level IS NOT NULL
+        GROUP BY gu.user_id
+      ) AS x ON x.user_id = u.id
+      WHERE users.id = u.id
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20171128172835_rename_clicked_topic_id_to_search_result_id.rb b/db/migrate/20171128172835_rename_clicked_topic_id_to_search_result_id.rb
new file mode 100644
index 0000000000..998dc7b95e
--- /dev/null
+++ b/db/migrate/20171128172835_rename_clicked_topic_id_to_search_result_id.rb
@@ -0,0 +1,13 @@
+class RenameClickedTopicIdToSearchResultId < ActiveRecord::Migration[5.1]
+  def up
+    rename_column :search_logs, :clicked_topic_id, :search_result_id
+    add_column :search_logs, :search_result_type, :integer, null: true
+
+    execute "UPDATE search_logs SET search_result_type = 1 WHERE search_result_id is NOT NULL"
+  end
+
+  def down
+    rename_column :search_logs, :search_result_id, :clicked_topic_id
+    remove_column :search_logs, :search_result_type
+  end
+end
diff --git a/db/migrate/20171213105921_replace_invite_mailer_translation_override.rb b/db/migrate/20171213105921_replace_invite_mailer_translation_override.rb
new file mode 100644
index 0000000000..0c12186e7b
--- /dev/null
+++ b/db/migrate/20171213105921_replace_invite_mailer_translation_override.rb
@@ -0,0 +1,12 @@
+class ReplaceInviteMailerTranslationOverride < ActiveRecord::Migration[5.1]
+  def change
+    execute <<~SQL
+      UPDATE translation_overrides
+      SET value = replace(value, '%{invitee_name}', '%{inviter_name}')
+      WHERE translation_key IN ('invite_mailer.subject_template', 'invite_mailer.text_body_template',
+                                'invite_forum_mailer.subject_template', 'invite_forum_mailer.text_body_template',
+                                'custom_invite_mailer.subject_template', 'custom_invite_mailer.text_body_template',
+                                'custom_invite_forum_mailer.subject_template', 'custom_invite_forum_mailer.text_body_template');
+    SQL
+  end
+end
diff --git a/db/migrate/20171214040346_add_email_to_twitter_user_info.rb b/db/migrate/20171214040346_add_email_to_twitter_user_info.rb
new file mode 100644
index 0000000000..fb33972afe
--- /dev/null
+++ b/db/migrate/20171214040346_add_email_to_twitter_user_info.rb
@@ -0,0 +1,5 @@
+class AddEmailToTwitterUserInfo < ActiveRecord::Migration[5.1]
+  def change
+    add_column :twitter_user_infos, :email, :string, limit: 1000, null: true
+  end
+end
diff --git a/db/migrate/20171228122834_replace_blocked_silence_translation.rb b/db/migrate/20171228122834_replace_blocked_silence_translation.rb
new file mode 100644
index 0000000000..dfd9a02c0f
--- /dev/null
+++ b/db/migrate/20171228122834_replace_blocked_silence_translation.rb
@@ -0,0 +1,17 @@
+class ReplaceBlockedSilenceTranslation < ActiveRecord::Migration[5.1]
+  def change
+    execute <<~SQL
+      UPDATE translation_overrides
+      SET translation_key = 'system_messages.silenced_by_staff.subject_template'
+      WHERE translation_key = 'system_messages.blocked_by_staff.subject_template'
+      AND NOT EXISTS (SELECT 1 FROM translation_overrides WHERE translation_key = 'system_messages.silenced_by_staff.subject_template');
+    SQL
+
+    execute <<~SQL
+      UPDATE translation_overrides
+      SET translation_key = 'system_messages.silenced_by_staff.text_body_template'
+      WHERE translation_key = 'system_messages.blocked_by_staff.text_body_template'
+      AND NOT EXISTS (SELECT 1 FROM translation_overrides WHERE translation_key = 'system_messages.silenced_by_staff.text_body_template');
+    SQL
+  end
+end
diff --git a/discourse.sublime-project b/discourse.sublime-project
index 6ec5f18c58..82cb7955f7 100644
--- a/discourse.sublime-project
+++ b/discourse.sublime-project
@@ -16,7 +16,7 @@
     { "path": "script" },
     { "path": "spec" },
     { "path": "vendor" },
-    { "path": "test" },
+    { "path": "test" }
   ],
   "settings":
   {
diff --git a/docs/DEVELOPER-ADVANCED.md b/docs/DEVELOPER-ADVANCED.md
index fce07d005c..5bd9792d06 100644
--- a/docs/DEVELOPER-ADVANCED.md
+++ b/docs/DEVELOPER-ADVANCED.md
@@ -19,29 +19,26 @@ To get your Ubuntu 16.04 LTS install up and running to develop Discourse and Dis
     curl -sSL https://get.rvm.io | bash -s stable
     echo 'gem: --no-document' >> ~/.gemrc
 
-    # Logout and back in to activate RVM installation
+    # exit the terminal and open it again to activate RVM
 
-    rvm install 2.3.1
-    rvm --default use 2.3.1 # If this error out check https://rvm.io/integration/gnome-terminal
+    rvm install 2.3.4
+    rvm --default use 2.3.4 # If this error out check https://rvm.io/integration/gnome-terminal
     gem install bundler mailcatcher
 
-
     # Postgresql
-    sudo su postgres
-    createuser --createdb --superuser -Upostgres $(cat /tmp/username)
+    sudo -u postgres -i
+    createuser --superuser -Upostgres $(cat /tmp/username)
     psql -c "ALTER USER $(cat /tmp/username) WITH PASSWORD 'password';"
-    psql -c "create database discourse_development owner $(cat /tmp/username) encoding 'UTF8' TEMPLATE template0;"
-    psql -c "create database discourse_test        owner $(cat /tmp/username) encoding 'UTF8' TEMPLATE template0;"
-    psql -d discourse_development -c "CREATE EXTENSION hstore;"
-    psql -d discourse_development -c "CREATE EXTENSION pg_trgm;"
     exit
 
     # Node
-    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.1/install.sh | bash
-    # exit the terminal and open it again
-    nvm install 6.2.0
-    nvm alias default 6.2.0
-    npm install -g svgo phantomjs-prebuilt
+    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.2/install.sh | bash
+
+    # exit the terminal and open it again to activate NVM
+
+    nvm install node
+    nvm alias default node
+    npm install -g svgo
 
 
 If everything goes alright, let's clone Discourse and start hacking:
@@ -49,22 +46,35 @@ If everything goes alright, let's clone Discourse and start hacking:
     git clone https://github.com/discourse/discourse.git ~/discourse
     cd ~/discourse
     bundle install
-    bundle exec rake db:create db:migrate db:test:prepare
-    bundle exec rake autospec # CTRL + C to stop; Optional
-    bundle exec rails s -b 0.0.0.0 # Open browser on http://localhost:3000 and you should see Discourse
 
-Create a test account, and enable it with:
+    # run this if there was a pre-existing database
+    bundle exec rake db:drop
+    RAILS_ENV=test bundle exec rake db:drop
 
-    bundle exec rails c
-    u = User.find_by_id 1
-    u.activate
-    u.grant_admin!
-    exit
+    # time to create the database and run migrations
+    bundle exec rake db:create db:migrate
+    RAILS_ENV=test bundle exec rake db:create db:migrate
+
+    # run the specs (optional)
+    bundle exec rake autospec # CTRL + C to stop
+
+    # launch discourse
+    bundle exec rails s -b 0.0.0.0 # open browser on http://localhost:3000 and you should see Discourse
+
+Create an admin account with:
+
+    bundle exec rake admin:create
+
+If you ever need to recreate your database:
+
+    bundle exec rake db:drop db:create db:migrate
+    bundle exec rake admin:create
+    RAILS_ENV=test bundle exec rake db:drop db:create db:migrate
 
 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
+    mailcatcher # open http://localhost:1080 to see the emails, stop with pkill -f mailcatcher
+    bundle exec sidekiq # open http://localhost:3000/sidekiq to see queues
     bundle exec rails server
 
 And happy hacking!
diff --git a/docs/DEVELOPMENT-OSX-NATIVE.md b/docs/DEVELOPMENT-OSX-NATIVE.md
index c3ff8b9677..470930a7e4 100644
--- a/docs/DEVELOPMENT-OSX-NATIVE.md
+++ b/docs/DEVELOPMENT-OSX-NATIVE.md
@@ -99,6 +99,7 @@ Atlassian has a free Git client for OS X called [SourceTree](http://www.sourcetr
 ## Postgres 9.3
 
 OS X ships with Postgres 9.1.5, but you're better off going with the latest from Homebrew or [Postgres.app](http://postgresapp.com).
+Note that we currently do not support Postgres 10 [due to an issue with seed-fu](https://meta.discourse.org/t/discourse-appears-to-be-broken-with-postgres-10/71723).
 
 ### Using Postgres.app
 
@@ -114,7 +115,7 @@ unix_socket_directories = '/var/pgsql_socket'   # comma-separated list of direct
 #and
 unix_socket_permissions = 0777  # begin with 0 to use octal notation
 ```
-Then create the '/var/pgsql/' folder and set up the appropriate permission in your bash (this requires admin access)
+Then create the '/var/pgsql_socket/' folder and set up the appropriate permission in your bash (this requires admin access)
 ```
 sudo mkdir /var/pgsql_socket
 sudo chmod 770 /var/pgsql_socket
@@ -182,17 +183,19 @@ You should not need to alter `/usr/local/var/postgres/pg_hba.conf`
 
 That's about it.
 
-## PhantomJS
+## Google Chrome 59+
 
-Homebrew loves you.
+Chrome is used for running QUnit tests in headless mode.
 
-    brew install phantomjs
+Download from https://www.google.com/chrome/index.html
 
 ## ImageMagick
 
-ImageMagick is used for generating avatars (including for test fixtures).
+ImageMagick is used for generating avatars (including for test fixtures). Brew installs ImageMagick 7 by default, and this version
+doesn't work with Discourse.
 
-    brew install imagemagick
+    brew install imagemagick@6
+    brew link --force imagemagick@6
 
 ImageMagick is going to want to use the Helvetica font to generate the
 letter-avatars:
@@ -229,25 +232,16 @@ config.action_mailer.smtp_settings = { address: "localhost", port: 1025 }
 Set up [MailCatcher](https://github.com/sj26/mailcatcher) so the app can intercept
 outbound email and you can verify what is being sent.
 
-## Additional Setup Tasks
+## Additional Image Tooling
 
 In addition to ImageMagick we also need to install some other image related
 software:
 
 ```sh
-brew install gifsicle jpegoptim optipng
+brew install gifsicle jpegoptim optipng jhead
 npm install -g svgo
 ```
 
-Install jhead
-
-```sh
-curl "http://www.sentex.net/~mwandel/jhead/jhead-2.97.tar.gz" | tar xzf -
-cd jhead-2.97
-make
-make install
-```
-
 ## Setting up your Discourse
 
 ###  Check out the repository
@@ -266,10 +260,13 @@ bundle install
 
 ### Prepare your database
 ```sh
-rake db:create
-rake db:migrate
-rake db:test:prepare
-rake db:seed_fu
+# run this if there was a pre-existing database
+bundle exec rake db:drop
+RAILS_ENV=test bundle exec rake db:drop
+
+# time to create the database and run migrations
+bundle exec rake db:create db:migrate
+RAILS_ENV=test bundle exec rake db:create db:migrate
 ```
 
 ## Now, test it out!
diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md
index eff05664f1..aaca49a3ad 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
@@ -68,7 +68,7 @@ Answer the following questions when prompted:
     SMTP port [587]:
     SMTP password? []: 
 
-This will generate an `app.yml` configuration file on your behalf, and then kicks off bootstrap. Bootstrapping takes between **2-8 minutes** to set up your Discourse. If you need to change or fix these settings after bootstrapping, edit your `/containers/app.yml` file and `./launcher rebuild app`, otherwise your changes will not take effect.
+This will generate an `app.yml` configuration file on your behalf, and then kicks off bootstrap. Bootstrapping takes between **2-8 minutes** to set up your Discourse. If you need to change these settings after bootstrapping, you can run `./discourse-setup` again (it will read your old values from the file) or edit `/containers/app.yml` with `nano` and then `./launcher rebuild app`, otherwise your changes will not take effect.
 
 ### Start Discourse
 
diff --git a/docs/INSTALL-email.md b/docs/INSTALL-email.md
index 7c9979d2e6..d62a669d8c 100644
--- a/docs/INSTALL-email.md
+++ b/docs/INSTALL-email.md
@@ -8,12 +8,12 @@ The following are template configurations for email service providers who offer
 
 Enter these values when prompted by `./discourse-setup` per the [install guide](https://github.com/discourse/discourse/blob/master/docs/INSTALL-cloud.md#edit-discourse-configuration):
 
-#### [SparkPost][sp] &mdash; 100k emails/month
+#### [Mailgun][gun] &mdash; 10k emails/month (with credit card)
+
+    SMTP server address? smtp.mailgun.org
+    SMTP user name?      [SMTP credentials for your domain under domains tab]
+    SMTP password?       [SMTP credentials for your domain under domains tab]
 
-    SMTP server address? smtp.sparkpostmail.com
-    SMTP user name?      SMTP_Injection
-    SMTP password?       [Any API key with Send via SMTP permission]
-    
 #### [Elastic Email][ee] &mdash; 150k emails/month
 
     SMTP server address? smtp.elasticemail.com
@@ -29,17 +29,10 @@ Enter these values when prompted by `./discourse-setup` per the [install guide](
 
 We recommend creating an [API Key][sg2] instead of using your SendGrid username and password.
 
-#### [Mailgun][gun] &mdash; 10k emails/month (with credit card)
-
-    SMTP server address? smtp.mailgun.org
-    SMTP user name?      [SMTP credentials for your domain under domains tab]
-    SMTP password?       [SMTP credentials for your domain under domains tab]
-
 #### [Mailjet][jet] &mdash; 6k emails/month
 
 Go to [My Account page](https://www.mailjet.com/account) and click on the ["SMTP and SEND API Settings"](https://www.mailjet.com/account/setup) link.
 
-   [sp]: https://www.sparkpost.com/
    [ee]: https://elasticemail.com
   [jet]: https://www.mailjet.com/pricing
   [gun]: http://www.mailgun.com/
diff --git a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
index 84500b50f7..0bdcda39f1 100644
--- a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
+++ b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
@@ -1,13 +1,26 @@
 require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/postgresql_adapter'
 require 'discourse'
+require 'sidekiq/pausable'
 
 class PostgreSQLFallbackHandler
   include Singleton
 
+  attr_reader :masters_down
+  attr_accessor :initialized
+
+  DATABASE_DOWN_CHANNEL = '/global/database_down'.freeze
+
   def initialize
-    @masters_down = {}
+    @masters_down = DistributedCache.new('masters_down', namespace: false)
     @mutex = Mutex.new
+    @initialized = false
+
+    MessageBus.subscribe(DATABASE_DOWN_CHANNEL) do |payload|
+      RailsMultisite::ConnectionManagement.with_connection(payload.data['db']) do
+        clear_connections
+      end
+    end
   end
 
   def verify_master
@@ -18,41 +31,51 @@ class PostgreSQLFallbackHandler
         begin
           thread = Thread.new { initiate_fallback_to_master }
           thread.join
-          break if synchronize { @masters_down.empty? }
+          break if synchronize { @masters_down.hash.empty? }
           sleep 10
         ensure
           thread.kill
         end
       end
     end
+
+    @thread.abort_on_exception = true
   end
 
   def master_down?
     synchronize { @masters_down[namespace] }
   end
 
-  def master_down=(args)
-    synchronize { @masters_down[namespace] = args }
+  def master_down
+    synchronize do
+      @masters_down[namespace] = true
+      Sidekiq.pause! if !Sidekiq.paused?
+      MessageBus.publish(DATABASE_DOWN_CHANNEL, db: namespace)
+    end
   end
 
   def master_up(namespace)
-    synchronize { @masters_down.delete(namespace) }
+    synchronize { @masters_down.delete(namespace, publish: false) }
   end
 
   def initiate_fallback_to_master
-    @masters_down.keys.each do |key|
+    @masters_down.hash.keys.each do |key|
       RailsMultisite::ConnectionManagement.with_connection(key) do
         begin
           logger.warn "#{log_prefix}: Checking master server..."
-          connection = ActiveRecord::Base.postgresql_connection(config)
+          begin
+            connection = ActiveRecord::Base.postgresql_connection(config)
+            is_connection_active = connection.active?
+          ensure
+            connection.disconnect! if connection
+          end
 
-          if connection.active?
-            connection.disconnect!
-            ActiveRecord::Base.clear_all_connections!
+          if is_connection_active
             logger.warn "#{log_prefix}: Master server is active. Reconnecting..."
-
+            clear_connections
             self.master_up(key)
-            Discourse.disable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
+            disable_readonly_mode
+            Sidekiq.unpause!
           end
         rescue => e
           logger.warn "#{log_prefix}: Connection to master PostgreSQL server failed with '#{e.message}'"
@@ -63,11 +86,21 @@ class PostgreSQLFallbackHandler
 
   # Use for testing
   def setup!
-    @masters_down = {}
+    @masters_down.clear
+    disable_readonly_mode
+  end
+
+  def clear_connections
+    ActiveRecord::Base.clear_active_connections!
+    ActiveRecord::Base.clear_all_connections!
   end
 
   private
 
+  def disable_readonly_mode
+    Discourse.disable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
+  end
+
   def config
     ActiveRecord::Base.connection_config
   end
@@ -96,32 +129,45 @@ module ActiveRecord
       config = config.symbolize_keys
 
       if fallback_handler.master_down?
-        fallback_handler.verify_master
-
-        connection = postgresql_connection(config.dup.merge({
-          host: config[:replica_host], port: config[:replica_port]
-        }))
-
-        verify_replica(connection)
         Discourse.enable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
+        fallback_handler.verify_master
+        connection = replica_postgresql_connection(config)
       else
         begin
           connection = postgresql_connection(config)
+          fallback_handler.initialized ||= true
         rescue PG::ConnectionBad => e
-          fallback_handler.master_down = true
+          fallback_handler.master_down
           fallback_handler.verify_master
-          raise e
+
+          if !fallback_handler.initialized
+            return postgresql_fallback_connection(config)
+          else
+            fallback_handler.clear_connections
+            raise e
+          end
         end
       end
 
       connection
     end
 
+    def replica_postgresql_connection(config)
+      config = config.dup.merge(
+        host: config[:replica_host],
+        port: config[:replica_port]
+      )
+
+      connection = postgresql_connection(config)
+      verify_replica(connection)
+      connection
+    end
+
     private
 
     def verify_replica(connection)
-      value = connection.raw_connection.exec("SELECT pg_is_in_recovery()").values[0][0]
-      raise "Replica database server is not in recovery mode." if value == 'f'
+      value = connection.exec_query("SELECT pg_is_in_recovery()").rows[0][0]
+      raise "Replica database server is not in recovery mode." if !value
     end
   end
 end
diff --git a/lib/admin_constraint.rb b/lib/admin_constraint.rb
index 0ee711c2bc..db5c0e73b6 100644
--- a/lib/admin_constraint.rb
+++ b/lib/admin_constraint.rb
@@ -2,7 +2,7 @@ require_dependency 'current_user'
 
 class AdminConstraint
 
-  def initialize(options={})
+  def initialize(options = {})
     @require_master = options[:require_master]
   end
 
diff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rb
index ffd1dd404d..b9d74e8a52 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(:primary_email))
     @trust_levels = trust_levels
   end
 
@@ -24,10 +24,10 @@ class AdminUserIndexQuery
     'read_time' => 'user_stats.time_read'
   }
 
-  def find_users(limit=100)
+  def find_users(limit = 100)
     page = params[:page].to_i - 1
     if page < 0
-        page = 0
+      page = 0
     end
     find_users_query.limit(limit).offset(page * limit)
   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
@@ -81,32 +81,50 @@ class AdminUserIndexQuery
     where_conds << "user_stats.posts_read_count <= 1 AND user_stats.topics_entered <= 1"
 
     @query.activated
-          .references(:user_stats)
-          .includes(:user_profile)
-          .where("COALESCE(user_profiles.bio_raw, '') != ''")
-          .where('users.created_at <= ?', 1.day.ago)
-          .where(where_conds.map {|c| "(#{c})"}.join(" OR "))
+      .human_users
+      .references(:user_stats)
+      .includes(:user_profile)
+      .where("COALESCE(user_profiles.bio_raw, '') != ''")
+      .where('users.created_at <= ?', 1.day.ago)
+      .where(where_conds.map { |c| "(#{c})" }.join(" OR "))
   end
 
   def filter_by_query_classification
     case params[:query]
-      when 'staff'      then @query.where("admin or moderator")
-      when 'admins'     then @query.where(admin: true)
-      when 'moderators' then @query.where(moderator: true)
-      when 'blocked'    then @query.blocked
-      when 'suspended'  then @query.suspended
-      when 'pending'    then @query.not_suspended.where(approved: false)
-      when 'suspect'    then suspect_users
+    when 'staff'      then @query.where("admin or moderator")
+    when 'admins'     then @query.where(admin: true)
+    when 'moderators' then @query.where(moderator: true)
+    when 'silenced'   then @query.silenced
+    when 'suspended'  then @query.suspended
+    when 'pending'    then @query.not_suspended.where(approved: false, active: true)
+    when 'suspect'    then suspect_users
     end
   end
 
+  def filter_by_user_with_bypass(filter)
+    if filter =~ /.+@.+/
+      # probably an email so try the bypass
+      user_id = UserEmail.where(email: filter.downcase).pluck(:user_id).first
+      if user_id
+        return @query.where('users.id = ?', user_id)
+      end
+    end
+
+    @query.where('username_lower ILIKE :filter OR user_emails.email ILIKE :filter', filter: "%#{params[:filter]}%")
+  end
+
   def filter_by_search
-    if params[:filter].present?
-      params[:filter].strip!
-      if ip = IPAddr.new(params[:filter]) rescue nil
+    if params[:email].present?
+      return @query.where('user_emails.email = ?', params[:email].downcase)
+    end
+
+    filter = params[:filter]
+    if filter.present?
+      filter.strip!
+      if ip = IPAddr.new(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]}%")
+        filter_by_user_with_bypass(filter)
       end
     end
   end
@@ -119,7 +137,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/archetype.rb b/lib/archetype.rb
index 7213c8b26f..8c8f3591ae 100644
--- a/lib/archetype.rb
+++ b/lib/archetype.rb
@@ -32,7 +32,7 @@ class Archetype
     @archetypes.values
   end
 
-  def self.register(name, options={})
+  def self.register(name, options = {})
     @archetypes ||= {}
     @archetypes[name] = Archetype.new(name, options)
   end
diff --git a/lib/auth/current_user_provider.rb b/lib/auth/current_user_provider.rb
index cdd4d495fc..1affbc8d87 100644
--- a/lib/auth/current_user_provider.rb
+++ b/lib/auth/current_user_provider.rb
@@ -12,12 +12,12 @@ class Auth::CurrentUserProvider
   end
 
   # log on a user and set cookies and session etc.
-  def log_on_user(user,session,cookies)
+  def log_on_user(user, session, cookies)
     raise NotImplementedError
   end
 
   # optional interface to be called to refresh cookies etc if needed
-  def refresh_session(user,session,cookies)
+  def refresh_session(user, session, cookies)
   end
 
   # api has special rights return true if api was detected
@@ -35,7 +35,6 @@ class Auth::CurrentUserProvider
     raise NotImplementedError
   end
 
-
   def log_off_user(session, cookies)
     raise NotImplementedError
   end
diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index 4be651472b..105ae53839 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "auth/current_user_provider"
 require_dependency "rate_limiter"
 
@@ -37,14 +39,14 @@ class Auth::DefaultCurrentUserProvider
     request = @request
 
     user_api_key = @env[USER_API_KEY]
-    api_key = request[API_KEY]
+    api_key = @env.blank? ? nil : request[API_KEY]
 
     auth_token = request.cookies[TOKEN_COOKIE] unless user_api_key || api_key
 
     current_user = nil
 
     if auth_token && auth_token.length == 32
-      limiter = RateLimiter.new(nil, "cookie_auth_#{request.ip}", COOKIE_ATTEMPTS_PER_MIN ,60)
+      limiter = RateLimiter.new(nil, "cookie_auth_#{request.ip}", COOKIE_ATTEMPTS_PER_MIN , 60)
 
       if limiter.can_perform?
         @user_token = UserAuthToken.lookup(auth_token,
@@ -76,16 +78,19 @@ class Auth::DefaultCurrentUserProvider
     # possible we have an api call, impersonate
     if api_key
       current_user = lookup_api_user(api_key, request)
-      raise Discourse::InvalidAccess unless current_user
+      raise Discourse::InvalidAccess.new(I18n.t('invalid_api_credentials'), nil, custom_message: "invalid_api_credentials") unless current_user
       raise Discourse::InvalidAccess if current_user.suspended? || !current_user.active
       @env[API_KEY_ENV] = true
+
+      limiter_min = RateLimiter.new(nil, "admin_api_min_#{api_key}", GlobalSetting.max_admin_api_reqs_per_key_per_minute, 60)
+      limiter_min.performed!
     end
 
     # user api key handling
     if user_api_key
 
-      limiter_min = RateLimiter.new(nil, "user_api_min_#{user_api_key}", SiteSetting.max_user_api_reqs_per_minute, 60)
-      limiter_day = RateLimiter.new(nil, "user_api_day_#{user_api_key}", SiteSetting.max_user_api_reqs_per_day, 86400)
+      limiter_min = RateLimiter.new(nil, "user_api_min_#{user_api_key}", GlobalSetting.max_user_api_reqs_per_minute, 60)
+      limiter_day = RateLimiter.new(nil, "user_api_day_#{user_api_key}", GlobalSetting.max_user_api_reqs_per_day, 86400)
 
       unless limiter_day.can_perform?
         limiter_day.performed!
@@ -127,8 +132,8 @@ class Auth::DefaultCurrentUserProvider
 
       if !@user_token.legacy && needs_rotation
         if @user_token.rotate!(user_agent: @env['HTTP_USER_AGENT'],
-                              client_ip: @request.ip,
-                              path: @env['REQUEST_PATH'])
+                               client_ip: @request.ip,
+                               path: @env['REQUEST_PATH'])
           cookies[TOKEN_COOKIE] = cookie_hash(@user_token.unhashed_auth_token)
         end
       elsif @user_token.legacy
@@ -197,10 +202,10 @@ class Auth::DefaultCurrentUserProvider
     elsif user && @user_token
       @user_token.destroy
     end
+
     cookies.delete(TOKEN_COOKIE)
   end
 
-
   # api has special rights return true if api was detected
   def is_api?
     current_user
diff --git a/lib/auth/facebook_authenticator.rb b/lib/auth/facebook_authenticator.rb
index f7f90cb26b..f969c8dabf 100644
--- a/lib/auth/facebook_authenticator.rb
+++ b/lib/auth/facebook_authenticator.rb
@@ -52,8 +52,8 @@ class Auth::FacebookAuthenticator < Auth::Authenticator
 
   def register_middleware(omniauth)
     omniauth.provider :facebook,
-           :setup => lambda { |env|
-              strategy = env["omniauth.strategy"]
+           setup: lambda { |env|
+             strategy = env["omniauth.strategy"]
               strategy.options[:client_id] = SiteSetting.facebook_app_id
               strategy.options[:client_secret] = SiteSetting.facebook_app_secret
               strategy.options[:info_fields] = 'gender,email,name,about,first_name,link,last_name,website,location'
@@ -61,7 +61,7 @@ class Auth::FacebookAuthenticator < Auth::Authenticator
                 strategy.options[:scope] = 'email,user_about_me,user_location,user_website'
               end
            },
-           :scope => "email"
+           scope: "email"
   end
 
   protected
diff --git a/lib/auth/github_authenticator.rb b/lib/auth/github_authenticator.rb
index e79414973a..bde25ed5d1 100644
--- a/lib/auth/github_authenticator.rb
+++ b/lib/auth/github_authenticator.rb
@@ -47,10 +47,8 @@ class Auth::GithubAuthenticator < Auth::Authenticator
       # Potentially use *any* of the emails from GitHub to find a match or
       # register a new user, with preference given to the primary email.
       all_emails = Array.new(auth_token[:extra][:all_emails])
-      all_emails.unshift({
-          :email => data[:email],
-          :verified => !!data[:email_verified]
-      })
+      all_emails.unshift(email: data[:email],
+                         verified: !!data[:email_verified])
 
       # Only consider verified emails to match an existing user.  We don't want
       # someone to be able to create a GitHub account with an unverified email
@@ -93,6 +91,8 @@ class Auth::GithubAuthenticator < Auth::Authenticator
       end
     end
 
+    retrieve_avatar(user, data)
+
     result.user = user
     result
   end
@@ -104,16 +104,25 @@ class Auth::GithubAuthenticator < Auth::Authenticator
       screen_name: data[:github_screen_name],
       github_user_id: data[:github_user_id]
     )
-  end
 
+    retrieve_avatar(user, data)
+  end
 
   def register_middleware(omniauth)
     omniauth.provider :github,
-           :setup => lambda { |env|
-              strategy = env["omniauth.strategy"]
+           setup: lambda { |env|
+             strategy = env["omniauth.strategy"]
               strategy.options[:client_id] = SiteSetting.github_client_id
               strategy.options[:client_secret] = SiteSetting.github_client_secret
            },
-           :scope => "user:email"
+           scope: "user:email"
+  end
+
+  private
+
+  def retrieve_avatar(user, data)
+    return unless data[:image].present? && user && user.user_avatar&.custom_upload_id.blank?
+
+    Jobs.enqueue(:download_avatar_from_url, url: data[:image], user_id: user.id, override_gravatar: false)
   end
 end
diff --git a/lib/auth/google_oauth2_authenticator.rb b/lib/auth/google_oauth2_authenticator.rb
index 2dfc69da5c..dcee38d217 100644
--- a/lib/auth/google_oauth2_authenticator.rb
+++ b/lib/auth/google_oauth2_authenticator.rb
@@ -21,7 +21,20 @@ class Auth::GoogleOAuth2Authenticator < Auth::Authenticator
     if !result.user && !result.email.blank? && result.email_valid
       result.user = User.find_by_email(result.email)
       if result.user
-        ::GoogleUserInfo.create({user_id: result.user.id}.merge(google_hash))
+        # we've matched an existing user to this login attempt...
+        if result.user.google_user_info && result.user.google_user_info.google_user_id != google_hash[:google_user_id]
+          # but the user has changed the google account used to log in...
+          if result.user.google_user_info.email != google_hash[:email]
+            # the user changed their email, go ahead and scrub the old record
+            result.user.google_user_info.destroy!
+          else
+            # same email address but different account? likely a takeover scenario
+            result.failed = true
+            result.failed_reason = I18n.t('errors.conflicting_google_user_id')
+            return result
+          end
+        end
+        ::GoogleUserInfo.create({ user_id: result.user.id }.merge(google_hash))
       end
     end
 
@@ -30,15 +43,19 @@ class Auth::GoogleOAuth2Authenticator < Auth::Authenticator
 
   def after_create_account(user, auth)
     data = auth[:extra_data]
-    GoogleUserInfo.create({user_id: user.id}.merge(data))
+    GoogleUserInfo.create({ user_id: user.id }.merge(data))
+    if auth[:email_valid].to_s == 'true' && data[:email]&.downcase == user.email
+      EmailToken.confirm(user.email_tokens.first.token)
+      user.set_automatic_groups
+    end
   end
 
   def register_middleware(omniauth)
     # jwt encoding is causing auth to fail in quite a few conditions
     # skipping
     omniauth.provider :google_oauth2,
-           :setup => lambda { |env|
-              strategy = env["omniauth.strategy"]
+           setup: lambda { |env|
+             strategy = env["omniauth.strategy"]
               strategy.options[:client_id] = SiteSetting.google_oauth2_client_id
               strategy.options[:client_secret] = SiteSetting.google_oauth2_client_secret
            },
diff --git a/lib/auth/instagram_authenticator.rb b/lib/auth/instagram_authenticator.rb
index ba2dd7f1bb..507981ef2a 100644
--- a/lib/auth/instagram_authenticator.rb
+++ b/lib/auth/instagram_authenticator.rb
@@ -39,8 +39,8 @@ class Auth::InstagramAuthenticator < Auth::Authenticator
 
   def register_middleware(omniauth)
     omniauth.provider :instagram,
-           :setup => lambda { |env|
-              strategy = env["omniauth.strategy"]
+           setup: lambda { |env|
+             strategy = env["omniauth.strategy"]
               strategy.options[:client_id] = SiteSetting.instagram_consumer_key
               strategy.options[:client_secret] = SiteSetting.instagram_consumer_secret
            }
diff --git a/lib/auth/oauth2_authenticator.rb b/lib/auth/oauth2_authenticator.rb
index 5484a19f5f..cadd1022a7 100644
--- a/lib/auth/oauth2_authenticator.rb
+++ b/lib/auth/oauth2_authenticator.rb
@@ -5,7 +5,7 @@ class Auth::OAuth2Authenticator < Auth::Authenticator
   end
 
   # only option at the moment is :trusted
-  def initialize(name, opts={})
+  def initialize(name, opts = {})
     @name = name
     @opts = opts
   end
diff --git a/lib/auth/open_id_authenticator.rb b/lib/auth/open_id_authenticator.rb
index 04f2764a9c..1bb17447c7 100644
--- a/lib/auth/open_id_authenticator.rb
+++ b/lib/auth/open_id_authenticator.rb
@@ -49,15 +49,14 @@ class Auth::OpenIdAuthenticator < Auth::Authenticator
     )
   end
 
-
   def register_middleware(omniauth)
     omniauth.provider :open_id,
-           :setup => lambda { |env|
-              strategy = env["omniauth.strategy"]
+           setup: lambda { |env|
+             strategy = env["omniauth.strategy"]
               strategy.options[:store] = OpenID::Store::Redis.new($redis)
            },
-           :name => name,
-           :identifier => identifier,
-           :require => "omniauth-openid"
+           name: name,
+           identifier: identifier,
+           require: "omniauth-openid"
   end
 end
diff --git a/lib/auth/result.rb b/lib/auth/result.rb
index eabc699999..35204bb7e3 100644
--- a/lib/auth/result.rb
+++ b/lib/auth/result.rb
@@ -6,8 +6,11 @@ class Auth::Result
                 :admin_not_allowed_from_ip_address, :omit_username,
                 :skip_email_validation
 
-  attr_accessor :failed,
-                :failed_reason
+  attr_accessor(
+    :failed,
+    :failed_reason,
+    :failed_code
+  )
 
   def initialize
     @failed = false
@@ -35,8 +38,8 @@ class Auth::Result
       if user.suspended?
         {
           suspended: true,
-          suspended_message: I18n.t( user.suspend_reason ? "login.suspended_with_reason" : "login.suspended",
-                                     {date: I18n.l(user.suspended_till, format: :date_only), reason: user.suspend_reason} )
+          suspended_message: I18n.t(user.suspend_reason ? "login.suspended_with_reason" : "login.suspended",
+                                     date: I18n.l(user.suspended_till, format: :date_only), reason: user.suspend_reason)
         }
       else
         {
diff --git a/lib/auth/twitter_authenticator.rb b/lib/auth/twitter_authenticator.rb
index c5f91c0477..36a16b1cf9 100644
--- a/lib/auth/twitter_authenticator.rb
+++ b/lib/auth/twitter_authenticator.rb
@@ -16,6 +16,7 @@ class Auth::TwitterAuthenticator < Auth::Authenticator
     twitter_user_id = auth_token["uid"]
 
     result.extra_data = {
+      twitter_email: result.email,
       twitter_user_id: twitter_user_id,
       twitter_screen_name: result.username,
       twitter_image: data["image"],
@@ -26,11 +27,12 @@ class Auth::TwitterAuthenticator < Auth::Authenticator
     user_info = TwitterUserInfo.find_by(twitter_user_id: twitter_user_id)
 
     result.user = user_info.try(:user)
-    if !result.user && result.email_valid && result.user = User.find_by_email(result.email)
+    if (!result.user) && result.email_valid && (result.user = User.find_by_email(result.email))
       TwitterUserInfo.create(
         user_id: result.user.id,
         screen_name: result.username,
-        twitter_user_id: twitter_user_id
+        twitter_user_id: twitter_user_id,
+        email: result.email
       )
     end
 
@@ -46,7 +48,8 @@ class Auth::TwitterAuthenticator < Auth::Authenticator
     TwitterUserInfo.create(
       user_id: user.id,
       screen_name: extra_data[:twitter_screen_name],
-      twitter_user_id: extra_data[:twitter_user_id]
+      twitter_user_id: extra_data[:twitter_user_id],
+      email: extra_data[:email]
     )
 
     retrieve_avatar(user, extra_data)
@@ -57,8 +60,8 @@ class Auth::TwitterAuthenticator < Auth::Authenticator
 
   def register_middleware(omniauth)
     omniauth.provider :twitter,
-           :setup => lambda { |env|
-              strategy = env["omniauth.strategy"]
+           setup: lambda { |env|
+             strategy = env["omniauth.strategy"]
               strategy.options[:consumer_key] = SiteSetting.twitter_consumer_key
               strategy.options[:consumer_secret] = SiteSetting.twitter_consumer_secret
            }
diff --git a/lib/autospec/formatter.rb b/lib/autospec/formatter.rb
index 98d872de8e..a5fe09acbe 100644
--- a/lib/autospec/formatter.rb
+++ b/lib/autospec/formatter.rb
@@ -16,7 +16,7 @@ class Autospec::Formatter < RSpec::Core::Formatters::BaseTextFormatter
   def start(example_count)
     super
     File.delete(RSPEC_RESULT) if File.exists?(RSPEC_RESULT)
-    @fail_file = File.open(RSPEC_RESULT,"w")
+    @fail_file = File.open(RSPEC_RESULT, "w")
   end
 
   def example_passed(_notification)
diff --git a/lib/autospec/manager.rb b/lib/autospec/manager.rb
index 538d276144..6e611a550a 100644
--- a/lib/autospec/manager.rb
+++ b/lib/autospec/manager.rb
@@ -9,7 +9,7 @@ module Autospec; end
 
 class Autospec::Manager
 
-  def self.run(opts={})
+  def self.run(opts = {})
     self.new(opts).run
   end
 
@@ -52,13 +52,8 @@ class Autospec::Manager
   private
 
   def ruby_runner
-    if ENV["SPORK"]
-      require "autospec/spork_runner"
-      Autospec::SporkRunner.new
-    else
-      require "autospec/simple_runner"
-      Autospec::SimpleRunner.new
-    end
+    require "autospec/simple_runner"
+    Autospec::SimpleRunner.new
   end
 
   def javascript_runner
@@ -66,10 +61,10 @@ class Autospec::Manager
     Autospec::QunitRunner.new
   end
 
-  def ensure_all_specs_will_run(current_runner=nil)
+  def ensure_all_specs_will_run(current_runner = nil)
     puts "@@@@@@@@@@@@ ensure_all_specs_will_run" if @debug
 
-    @queue.reject!{|_,s,_| s == "spec"}
+    @queue.reject! { |_, s, _| s == "spec" }
 
     if current_runner
       @queue.concat [['spec', 'spec', current_runner]]
@@ -151,14 +146,14 @@ class Autospec::Manager
 
     # try focus tag
     if failed_specs.length > 0
-      filename,_ = failed_specs[0].split(":")
+      filename, _ = failed_specs[0].split(":")
       if filename && File.exist?(filename) && !File.directory?(filename)
         spec = File.read(filename)
-        start,_ =  spec.split(/\S*#focus\S*$/)
+        start, _ = spec.split(/\S*#focus\S*$/)
         if start.length < spec.length
           line = start.scan(/\n/).length + 1
           puts "Found #focus tag on line #{line}!"
-          failed_specs = ["#{filename}:#{line+1}"]
+          failed_specs = ["#{filename}:#{line + 1}"]
         end
       end
     end
@@ -188,7 +183,7 @@ class Autospec::Manager
       FileUtils.rm_f(socket_path)
       server = SocketServer.new(socket_path)
       server.start do |line|
-        file,line = line.split(' ')
+        file, line = line.split(' ')
         file = file.sub(Rails.root.to_s << "/", "")
         # process_change can aquire a mutex and block
         # the acceptor
@@ -196,7 +191,7 @@ class Autospec::Manager
           if file =~ /(es6|js)$/
             process_change([[file]])
           else
-            process_change([[file,line]])
+            process_change([[file, line]])
           end
         end
         "OK"
@@ -213,7 +208,7 @@ class Autospec::Manager
           listener = Listen.to("#{path}/#{watch}", options) do |modified, added, _|
             paths = [modified, added].flatten
             paths.compact!
-            paths.map!{|long| long[(path.length+1)..-1]}
+            paths.map! { |long| long[(path.length + 1)..-1] }
             process_change(paths)
           end
           listener.start
@@ -246,7 +241,7 @@ class Autospec::Manager
           end
         end
         # watchers
-        runner.watchers.each do |k,v|
+        runner.watchers.each do |k, v|
           if m = k.match(file)
             puts "@@@@@@@@@@@@ #{file} matched a watcher for #{runner}" if @debug
             hit = true
@@ -295,8 +290,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 fc7a7eca67..051fcb0409 100644
--- a/lib/autospec/qunit_runner.rb
+++ b/lib/autospec/qunit_runner.rb
@@ -24,10 +24,10 @@ module Autospec
 
     require "socket"
 
-    class PhantomJsNotInstalled < StandardError; end
+    class ChromeNotInstalled < StandardError; end
 
     def initialize
-      ensure_phantomjs_is_installed
+      ensure_chrome_is_installed
     end
 
     def start
@@ -66,7 +66,7 @@ module Autospec
         end
       end
 
-      cmd = "phantomjs #{Rails.root}/lib/autospec/run-qunit.js \"#{qunit_url}\""
+      cmd = "node #{Rails.root}/lib/autospec/run-qunit.js \"#{qunit_url}\""
 
       @pid = Process.spawn(cmd)
       _, status = Process.wait2(@pid)
@@ -96,7 +96,6 @@ module Autospec
     end
 
     def stop
-      # kill phantomjs first
       abort
       stop_rails_server
       @running = false
@@ -104,8 +103,12 @@ module Autospec
 
     private
 
-    def ensure_phantomjs_is_installed
-      raise PhantomJsNotInstalled.new unless system("command -v phantomjs >/dev/null;")
+    def ensure_chrome_is_installed
+      raise ChromeNotInstalled.new unless system("command -v google-chrome >/dev/null;")
+
+      if Gem::Version.new(`$(command -v google-chrome) --version`.match(/[\d\.]+/)[0]) < Gem::Version.new("59")
+        raise "Chrome 59 or higher is required"
+      end
     end
 
     def port_available?(port)
@@ -144,7 +147,7 @@ module Autospec
     end
 
     def try_to_find_module_name(file)
-      file,_ = file.split(/:\d+$/)
+      file, _ = file.split(/:\d+$/)
       return unless File.exists?(file)
       File.open(file, "r").each_line do |line|
         if m = /module\(['"]([^'"]+)/i.match(line)
@@ -159,7 +162,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 cdef09e0b1..03b49f63d8 100644
--- a/lib/autospec/rspec_runner.rb
+++ b/lib/autospec/rspec_runner.rb
@@ -19,14 +19,20 @@ 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})
+    watch(%r{^(plugins/.*)/lib/(.*)\.rb}) { |m| "#{m[1]}/spec/lib/#{m[2]}_spec.rb" }
+
     RELOADERS = Set.new
     def self.reload(pattern); RELOADERS << pattern; end
     def reloaders; RELOADERS; end
 
-    # We need to reload the whole app when changing any of these files
-    reload("spec/rails_helper.rb")
-    reload(%r{config/.+\.rb})
-    reload(%r{app/helpers/.+\.rb})
+    # we are using a simple runner at the moment, whole idea of using a reloader is no longer needed
+    watch("spec/rails_helper.rb")
+    watch(%r{config/.+\.rb})
+    #reload(%r{app/helpers/.+\.rb})
 
     def failed_specs
       specs = []
diff --git a/lib/autospec/run-qunit.js b/lib/autospec/run-qunit.js
index fcf10df5c6..2c2bd86073 100644
--- a/lib/autospec/run-qunit.js
+++ b/lib/autospec/run-qunit.js
@@ -1,182 +1,182 @@
-/*jshint devel:true, phantom:true */
-/*globals QUnit ANSI */
+// Chrome QUnit Test Runner
+// Author: David Taylor
+// Requires chrome-launcher and chrome-remote-interface from npm
+// An up-to-date version of chrome is also required
 
-// THIS FILE IS CALLED BY "qunit_runner.rb" IN AUTOSPEC
+/* globals Promise */
 
-var system = require("system"),
-    args = phantom.args;
+var args = process.argv.slice(2);
 
-if (args === undefined) {
-  args = system.args;
-  args.shift();
+if (args.length < 1 || args.length > 2) {
+  console.log("Usage: node run-qunit.js <URL> <timeout>");
+  process.exit(1);
 }
 
-if (args.length !== 1) {
-  console.log("Usage: " + phantom.scriptName + " <URL>");
-  phantom.exit(1);
-}
+const chromeLauncher = require('chrome-launcher');
+const CDP = require('chrome-remote-interface');
+const fs = require('fs');
+const QUNIT_RESULT = "./tmp/qunit_result";
 
-var fs = require('fs'),
-    page = require('webpage').create(),
-    QUNIT_RESULT = "./tmp/qunit_result";
+(async () => {
+  await fs.stat(QUNIT_RESULT, (err, stats) => {
+    if (stats && stats.isFile()) fs.unlink(QUNIT_RESULT);
+  });
+})();
 
-if (fs.exists(QUNIT_RESULT) && fs.isFile(QUNIT_RESULT)) { fs.remove(QUNIT_RESULT); }
+(function() {
 
-page.onConsoleMessage = function (message) {
-  // filter out Ember's debug messages
-  if (message.slice(0, 8) === "WARNING:") { return; }
-  if (message.slice(0, 6) === "DEBUG:") { return; }
-
-  console.log(message);
-};
-
-page.onCallback = function (message) {
-  // write to the result file
-  if (message.slice(0, 5) === "FAIL:") {
-    fs.write(QUNIT_RESULT, message.slice(6) + "\n", "a"); 
+  function launchChrome() {
+    return chromeLauncher.launch({
+      chromeFlags: [
+        '--disable-gpu',
+       '--headless',
+       '--no-sandbox'
+      ]
+    });
   }
-  // forward the message to the standard output
-  if (message.slice(0, 6) === "PRINT:") { system.stdout.write(message.slice(7)); }
-};
 
-page.start = new Date();
+  launchChrome().then(chrome => {
+    CDP({
+      port: chrome.port
+    }).then(protocol => {
+      const {Page, Runtime} = protocol;
+      Promise.all([Page.enable(), Runtime.enable()]).then(()=>{
 
-// -----------------------------------WARNING --------------------------------------
-// calling "console.log" BELOW this line will go through the "page.onConsoleMessage"
-// -----------------------------------WARNING --------------------------------------
-page.open(args[0], function (status) {
-  if (status !== "success") {
-    console.log("\nNO NETWORK :(\n");
-    phantom.exit(1);
-  } else {
-    console.log("QUnit loaded in " + (new Date() - page.start) + " ms");
+        Runtime.consoleAPICalled((response) => {
+          const message = response['args'][0].value;
 
-    page.evaluate(colorizer);
-    page.evaluate(logQUnit);
-
-    // wait up to 600 seconds for QUnit to finish
-    var timeout = 600 * 1000,
-        start = Date.now();
-
-    var interval = setInterval(function() {
-      if (Date.now() - start > timeout) {
-        console.error("\nTIME OUT :(\n");
-        phantom.exit(1);
-      } else {
-        var qunitResult = page.evaluate(function() { return window.qunitResult; });
-        if (qunitResult) {
-          clearInterval(interval);
-          if (qunitResult.failed > 0) {
-            phantom.exit(1);
+          // If it's a simple test result, write without newline
+          if (message === "." || message === "F") {
+            process.stdout.write(message);
+          } else if (message.startsWith("AUTOSPEC:")) {
+            fs.appendFileSync(QUNIT_RESULT, `${message.slice(10)}\n`);
           } else {
-            phantom.exit(0);
+            console.log(message);
           }
-        }
-      }
-    }, 250);
-  }
-});
+        });
 
-// https://github.com/jquery/qunit/pull/470
-function colorizer() {
-  window.ANSI = {
-    colorMap: {
-      "red": "\u001b[31m",
-      "green": "\u001b[32m",
-      "blue": "\u001b[34m",
-      "end": "\u001b[0m"
-    },
-    highlightMap: {
-      "red": "\u001b[41m\u001b[37m", // change 37 to 30 for black text
-      "green": "\u001b[42m\u001b[30m",
-      "blue": "\u001b[44m\u001b[37m",
-      "end": "\u001b[0m"
-    },
+        Page.navigate({
+          url: args[0]
+        });
 
-    highlight: function (text, color) {
-      var colorCode = this.highlightMap[color],
-          colorEnd = this.highlightMap.end;
+        Page.loadEventFired(() => {
 
-      return colorCode + text + colorEnd;
-    },
+          Runtime.evaluate({
+            expression: `(${qunit_script})()`
+          }).then(() => {
+            const timeout = parseInt(args[1] || 300000, 10);
+            var start = Date.now();
 
-    colorize: function (text, color) {
-      var colorCode = this.colorMap[color],
-          colorEnd = this.colorMap.end;
+            var interval = setInterval(() => {
+              if (Date.now() > start + timeout) {
+                console.error("Tests timed out");
 
-      return colorCode + text + colorEnd;
-    }
+                protocol.close();
+                chrome.kill();
+                process.exit(124);
+              } else {
+
+                Runtime.evaluate({
+                  expression: `(${check_script})()`
+                }).then(numFails => {
+                  if (numFails.result.type !== 'undefined') {
+                    clearInterval(interval);
+                    protocol.close();
+                    chrome.kill();
+
+                    if (numFails.result.value > 0) {
+                      process.exit(1);
+                    } else {
+                      process.exit();
+                    }
+                  }
+                }).catch(error);
+              }
+            }, 250);
+          }).catch(error(1));
+        });
+      }).catch(error(3));
+    }).catch(error(4));
+  }).catch(error(5));
+})();
+
+function error(code){
+  return function(){
+    console.log("A promise failed to resolve code:"+code);
+    process.exit(1);
   };
 }
 
-
+// The following functions are converted to strings
+// And then sent to chrome to be evalaluated
 function logQUnit() {
-  // keep track of error messages
-  var errors = {};
+  var moduleErrors = [];
+  var testErrors = [];
+  var assertionErrors = [];
 
-  QUnit.begin(function () {
-    console.log("BEGIN");
-  });
+  console.log("\nRunning: " + JSON.stringify(QUnit.urlParams) + "\n");
 
-  QUnit.log(function (context) {
-    if (!context.result) {
-      var module = context.module,
-          test = context.name;
+  QUnit.config.testTimeout = 10000;
 
-      var assertion = {
-        message: context.message,
-        expected: context.expected,
-        actual: context.actual
-      };
-
-      if (!errors[module]) { errors[module] = {}; }
-      if (!errors[module][test]) { errors[module][test] = []; }
-      errors[module][test].push(assertion);
-
-      window.callPhantom("FAIL: " + context.module + ":::" + context.testId + ":::" + context.name);
+  QUnit.moduleDone(function(context) {
+    if (context.failed) {
+      var msg = "Module Failed: " + context.name + "\n" + testErrors.join("\n");
+      moduleErrors.push(msg);
+      testErrors = [];
     }
   });
 
-  QUnit.testDone(function (context) {
-    if (context.failed > 0) {
-      window.callPhantom("PRINT: " + ANSI.colorize("F", "red"));
+  QUnit.testDone(function(context) {
+    if (context.failed) {
+      var msg = "  Test Failed: " + context.name + assertionErrors.join("    ");
+      console.log(`AUTOSPEC: ${context.module}:::${context.testId}:::${context.name}`);
+      testErrors.push(msg);
+      assertionErrors = [];
+      console.log("F");
     } else {
-      window.callPhantom("PRINT: " +  ANSI.colorize(".", "green"));
+      console.log(".");
     }
   });
 
-  QUnit.done(function (context) {
+  QUnit.log(function(context) {
+    if (context.result) { return; }
+
+    var msg = "\n    Assertion Failed:";
+    if (context.message) {
+      msg += " " + context.message;
+    }
+
+    if (context.expected) {
+      msg += "\n      Expected: " + context.expected + ", Actual: " + context.actual;
+    }
+
+    assertionErrors.push(msg);
+  });
+
+  QUnit.done(function(context) {
     console.log("\n");
 
-    // display failures
-    if (Object.keys(errors).length > 0) {
-      console.log("Failures:\n");
-      for (var m in errors) {
-        var module = errors[m];
-        console.log("Module Failed: " + ANSI.highlight(m, "red"));
-        for (var t in module) {
-          var test = module[t];
-          console.log("  Test Failed: " + t);
-          for (var a = 0; a < test.length; a++) {
-            var assertion = test[a];
-            console.log("    Assertion Failed: " + (assertion.message || ""));
-            if (assertion.expected) {
-              console.log("      Expected: " + assertion.expected);
-              console.log("        Actual: " + assertion.actual);
-            }
-          }
-        }
+    if (moduleErrors.length > 0) {
+      for (var idx=0; idx<moduleErrors.length; idx++) {
+        console.error(moduleErrors[idx]+"\n");
       }
     }
 
-    // display summary
-    console.log("\n");
-    console.log("Finished in " + (context.runtime / 1000) + " seconds");
-    var color = context.failed > 0 ? "red" : "green";
-    console.log(ANSI.colorize(context.total + " examples, " + context.failed + " failures", color));
-
-    // we're done
-    window.qunitResult = context;
+    var stats = [
+      "Time: " + context.runtime + "ms",
+      "Total: " + context.total,
+      "Passed: " + context.passed,
+      "Failed: " + context.failed
+    ];
+    console.log(stats.join(", "));
+    window.qunitDone = context;
   });
-
 }
+const qunit_script = logQUnit.toString();
+
+function check() {
+  if(window.qunitDone){
+    return window.qunitDone.failed;
+  }
+}
+const check_script = check.toString();
diff --git a/lib/autospec/simple_runner.rb b/lib/autospec/simple_runner.rb
index be8da854c7..2c1fe8e656 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/autospec/spork_runner.rb b/lib/autospec/spork_runner.rb
deleted file mode 100644
index fbd05d93ef..0000000000
--- a/lib/autospec/spork_runner.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-require "drb/drb"
-require "autospec/rspec_runner"
-
-module Autospec
-
-  class SporkRunner < RspecRunner
-
-    def start
-      if already_running?(pid_file)
-        puts "autospec appears to be running, it is possible the pid file is old"
-        puts "if you are sure it is not running, delete #{pid_file}"
-        return
-      end
-      write_pid_file(pid_file, Process.pid)
-      start_spork
-      @spork_running = true
-    end
-
-    def running?
-      # launch a thread that will wait for spork to die
-      @monitor_thread ||=
-        Thread.new do
-          Process.wait(@spork_pid)
-          @spork_running = false
-        end
-
-      @spork_running
-    end
-
-    def run(specs)
-      args = ["-r", "#{File.dirname(__FILE__)}/formatter.rb",
-              "-f", "Autospec::Formatter", specs.split].flatten
-      spork_service.run(args,$stderr,$stdout)
-    end
-
-    def reload
-      stop_spork
-      sleep 1
-      start_spork
-    end
-
-    def abort
-      spork_service.abort
-    end
-
-    def stop
-      stop_spork
-    end
-
-    private
-
-    def spork_pid_file
-      Rails.root + "tmp/pids/spork.pid"
-    end
-
-    def pid_file
-      Rails.root + "tmp/pids/autospec.pid"
-    end
-
-    def already_running?(pid_file)
-      if File.exists? pid_file
-        pid = File.read(pid_file).to_i
-        Process.getpgid(pid) rescue nil
-      end
-    end
-
-    def write_pid_file(file, pid)
-      FileUtils.mkdir_p(Rails.root + "tmp/pids")
-      File.open(file,'w') do |f|
-        f.write(pid)
-      end
-    end
-
-    def spork_running?
-      spork_service.port rescue nil
-    end
-
-    def spork_service
-      unless @drb_listener_running
-        begin
-          DRb.start_service("druby://127.0.0.1:0")
-        rescue SocketError, Errno::EADDRNOTAVAIL
-          DRb.start_service("druby://:0")
-        end
-        @drb_listener_running = true
-      end
-
-      @spork_service ||= DRbObject.new_with_uri("druby://127.0.0.1:8989")
-    end
-
-    def start_spork
-      if already_running?(spork_pid_file)
-        puts "Killing old orphan spork instance"
-        stop_spork
-        sleep 1
-      end
-
-      @spork_pid = Process.spawn({'RAILS_ENV' => 'test'}, "bundle exec spork")
-      write_pid_file(spork_pid_file, @spork_pid)
-
-      running = false
-      while !running
-        running = spork_running?
-        sleep 0.01
-      end
-    end
-
-    def stop_spork
-      pid = File.read(spork_pid_file).to_i
-      Process.kill("SIGTERM", pid) rescue nil
-    end
-
-  end
-
-end
diff --git a/lib/avatar_lookup.rb b/lib/avatar_lookup.rb
index 4af184052a..f056e73696 100644
--- a/lib/avatar_lookup.rb
+++ b/lib/avatar_lookup.rb
@@ -1,6 +1,6 @@
 class AvatarLookup
 
-  def initialize(user_ids=[])
+  def initialize(user_ids = [])
     @user_ids = user_ids.tap(&:compact!).tap(&:uniq!).tap(&:flatten!)
   end
 
@@ -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
@@ -20,11 +20,11 @@ class AvatarLookup
   end
 
   def user_lookup_hash
-    # adding tap here is a personal taste thing
     hash = {}
-    User.where(:id => @user_ids)
-        .select(AvatarLookup.lookup_columns)
-        .each{ |user| hash[user.id] = user }
+    User.joins(:user_emails)
+      .where(id: @user_ids)
+      .select(AvatarLookup.lookup_columns)
+      .each { |user| hash[user.id] = user }
     hash
   end
 end
diff --git a/lib/backup_restore/backup_restore.rb b/lib/backup_restore/backup_restore.rb
index 12a9ecd21d..99789e139c 100644
--- a/lib/backup_restore/backup_restore.rb
+++ b/lib/backup_restore/backup_restore.rb
@@ -11,11 +11,15 @@ module BackupRestore
   METADATA_FILE = "meta.json"
   LOGS_CHANNEL = "/admin/backups/logs"
 
-  def self.backup!(user_id, opts={})
-    start! BackupRestore::Backuper.new(user_id, opts)
+  def self.backup!(user_id, opts = {})
+    if opts[:fork] == false
+      BackupRestore::Backuper.new(user_id, opts).run
+    else
+      start! BackupRestore::Backuper.new(user_id, opts)
+    end
   end
 
-  def self.restore!(user_id, opts={})
+  def self.restore!(user_id, opts = {})
     start! BackupRestore::Restorer.new(user_id, opts)
   end
 
diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb
index 8a4573a41c..9465457092 100644
--- a/lib/backup_restore/backuper.rb
+++ b/lib/backup_restore/backuper.rb
@@ -3,7 +3,7 @@ module BackupRestore
   class Backuper
     attr_reader :success
 
-    def initialize(user_id, opts={})
+    def initialize(user_id, opts = {})
       @user_id = user_id
       @client_id = opts[:client_id]
       @publish_to_message_bus = opts[:publish_to_message_bus] || false
@@ -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 de6e133df1..c0c2b41377 100644
--- a/lib/backup_restore/restorer.rb
+++ b/lib/backup_restore/restorer.rb
@@ -8,7 +8,7 @@ module BackupRestore
   class Restorer
     attr_reader :success
 
-    def initialize(user_id, opts={})
+    def initialize(user_id, opts = {})
       @user_id = user_id
       @client_id = opts[:client_id]
       @filename = opts[:filename]
@@ -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/badge_queries.rb b/lib/badge_queries.rb
index 20a08d7daf..c2ce008150 100644
--- a/lib/badge_queries.rb
+++ b/lib/badge_queries.rb
@@ -70,7 +70,7 @@ SQL
     SELECT pa.user_id, min(pa.id) id
     FROM post_actions pa
     JOIN badge_posts p on p.id = pa.post_id
-    WHERE post_action_type_id IN (#{PostActionType.flag_types.values.join(",")}) AND
+    WHERE post_action_type_id IN (#{PostActionType.flag_types_without_custom.values.join(",")}) AND
       (:backfill OR pa.post_id IN (:post_ids) )
     GROUP BY pa.user_id
   ) x
@@ -133,44 +133,44 @@ SQL
   GROUP BY acting_user_id
 SQL
 
-  def self.invite_badge(count,trust_level)
-"
-  SELECT u.id user_id, current_timestamp granted_at
-  FROM users u
-  WHERE u.id IN (
-    SELECT invited_by_id
-    FROM invites i
-    JOIN users u2 ON u2.id = i.user_id
-    WHERE i.deleted_at IS NULL AND u2.active AND u2.trust_level >= #{trust_level.to_i} AND not u2.blocked
-    GROUP BY invited_by_id
-    HAVING COUNT(*) >= #{count.to_i}
-  ) AND u.active AND NOT u.blocked AND u.id > 0 AND
-    (:backfill OR u.id IN (:user_ids) )
-"
+  def self.invite_badge(count, trust_level)
+    "
+      SELECT u.id user_id, current_timestamp granted_at
+      FROM users u
+      WHERE u.id IN (
+        SELECT invited_by_id
+        FROM invites i
+        JOIN users u2 ON u2.id = i.user_id
+        WHERE i.deleted_at IS NULL AND u2.active AND u2.trust_level >= #{trust_level.to_i} AND u2.silenced_till IS NULL
+        GROUP BY invited_by_id
+        HAVING COUNT(*) >= #{count.to_i}
+      ) AND u.active AND u.silenced_till IS NULL AND u.id > 0 AND
+        (:backfill OR u.id IN (:user_ids) )
+    "
   end
 
   def self.like_badge(count, is_topic)
     # we can do better with dates, but its hard work
-"
-  SELECT p.user_id, p.id post_id, p.updated_at granted_at
-  FROM badge_posts p
-  WHERE #{is_topic ? "p.post_number = 1" : "p.post_number > 1" } AND p.like_count >= #{count.to_i} AND
-    (:backfill OR p.id IN (:post_ids) )
-"
+    "
+      SELECT p.user_id, p.id post_id, p.updated_at granted_at
+      FROM badge_posts p
+      WHERE #{is_topic ? "p.post_number = 1" : "p.post_number > 1" } AND p.like_count >= #{count.to_i} AND
+        (:backfill OR p.id IN (:post_ids) )
+    "
   end
 
   def self.trust_level(level)
     # we can do better with dates, but its hard work figuring this out historically
-"
-  SELECT u.id user_id, current_timestamp granted_at FROM users u
-  WHERE trust_level >= #{level.to_i} AND (
-    :backfill OR u.id IN (:user_ids)
-  )
-"
+    "
+      SELECT u.id user_id, current_timestamp granted_at FROM users u
+      WHERE trust_level >= #{level.to_i} AND (
+        :backfill OR u.id IN (:user_ids)
+      )
+    "
   end
 
   def self.sharing_badge(count)
-<<SQL
+    <<SQL
   SELECT views.user_id, i2.post_id, current_timestamp granted_at
   FROM
   (
@@ -232,4 +232,26 @@ SQL
     SQL
   end
 
+  def self.consecutive_visits(days)
+    <<~SQL
+      WITH consecutive_visits AS (
+        SELECT user_id
+             , visited_at
+             , visited_at - (DENSE_RANK() OVER (PARTITION BY user_id ORDER BY visited_at))::int s
+          FROM user_visits
+      ), visits AS (
+        SELECT user_id
+             , MIN(visited_at) "start"
+             , DENSE_RANK() OVER (PARTITION BY user_id ORDER BY s) "rank"
+          FROM consecutive_visits
+      GROUP BY user_id, s
+        HAVING COUNT(*) >= #{days}
+      )
+      SELECT user_id
+           , "start" + interval '#{days} days' "granted_at"
+        FROM visits
+       WHERE "rank" = 1
+    SQL
+  end
+
 end
diff --git a/lib/base62.rb b/lib/base62.rb
new file mode 100644
index 0000000000..84f9fbf23c
--- /dev/null
+++ b/lib/base62.rb
@@ -0,0 +1,35 @@
+# Modified version of: https://github.com/steventen/base62-rb
+
+module Base62
+  KEYS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".freeze
+  KEYS_HASH = KEYS.each_char.with_index.inject({}) { |h, (k, v)| h[k] = v; h }
+  BASE = KEYS.length
+
+  # Encodes base10 (decimal) number to base62 string.
+  def self.encode(num)
+    return "0" if num == 0
+    return nil if num < 0
+
+    str = ""
+    while num > 0
+      # prepend base62 charaters
+      str = KEYS[num % BASE] + str
+      num = num / BASE
+    end
+    str
+  end
+
+  # Decodes base62 string to a base10 (decimal) number.
+  def self.decode(str)
+    num = 0
+    i = 0
+    len = str.length - 1
+    # while loop is faster than each_char or other 'idiomatic' way
+    while i < str.length
+      pow = BASE**(len - i)
+      num += KEYS_HASH[str[i]] * pow
+      i += 1
+    end
+    num
+  end
+end
diff --git a/lib/cache.rb b/lib/cache.rb
index 00ca6365a5..e04129b877 100644
--- a/lib/cache.rb
+++ b/lib/cache.rb
@@ -27,7 +27,7 @@ class Cache < ActiveSupport::Cache::Store
     end
   end
 
-  def namespaced_key(key, opts=nil)
+  def normalize_key(key, opts = nil)
     "#{@namespace}:" << key
   end
 
diff --git a/lib/category_badge.rb b/lib/category_badge.rb
index e6a7abebf0..900f293849 100644
--- a/lib/category_badge.rb
+++ b/lib/category_badge.rb
@@ -10,11 +10,14 @@ module CategoryBadge
   end
 
   def self.inline_badge_wrapper_style
-    style = case (SiteSetting.category_style || :box).to_sym
-            when :bar then 'line-height: 1.25; margin-right: 5px;'
-            when :box then 'line-height: 1.5; margin-top: 5px; margin-right: 5px;'
-            when :bullet then 'line-height: 1; margin-right: 10px;'
-            end
+    style =
+      case (SiteSetting.category_style || :box).to_sym
+      when :bar then 'line-height: 1.25; margin-right: 5px;'
+      when :box then 'line-height: 1.5; margin-top: 5px; margin-right: 5px;'
+      when :bullet then 'line-height: 1; margin-right: 10px;'
+      when :none then ''
+      end
+
     " style='font-size: 0.857em; white-space: nowrap; display: inline-block; position: relative; #{style}'"
   end
 
@@ -34,51 +37,67 @@ module CategoryBadge
     # parent span
     unless category.parent_category_id.nil? || opts[:hide_parent]
       parent_category = Category.find_by(id: category.parent_category_id)
-      result << if opts[:inline_style]
-        case (SiteSetting.category_style || :box).to_sym
-        when :bar then inline_category_stripe(parent_category.color, 'display: inline-block; padding: 1px;', true)
-        when :box then inline_category_stripe(parent_category.color, 'display: block; position: absolute; width: 100%; height: 100%;')
-        when :bullet then inline_category_stripe(parent_category.color, 'display: inline-block; width: 5px; height: 10px; line-height: 1;')
+      result <<
+        if opts[:inline_style]
+          case (SiteSetting.category_style || :box).to_sym
+          when :bar
+            inline_category_stripe(parent_category.color, 'display: inline-block; padding: 1px;', true)
+          when :box
+            inline_category_stripe(parent_category.color, 'display: block; position: absolute; width: 100%; height: 100%;')
+          when :bullet
+            inline_category_stripe(parent_category.color, 'display: inline-block; width: 5px; height: 10px; line-height: 1;')
+          when :none
+            ''
+          end
+        else
+          category_stripe(parent_category.color, 'badge-category-parent-bg')
         end
-      else
-        category_stripe(parent_category.color, 'badge-category-parent-bg')
-      end
     end
 
     show_parent = category.parent_category_id && !opts[:hide_parent]
 
     # sub parent or main category span
-    result << if opts[:inline_style]
-      case (SiteSetting.category_style || :box).to_sym
-      when :bar then inline_category_stripe(category.color, 'display: inline-block; padding: 1px;', true)
-      when :box
-        unless show_parent
-          inline_category_stripe(category.color, 'display: block; position: absolute; width: 100%; height: 100%;')
-        else
-          inline_category_stripe(category.color, 'left: 5px; display: block; position: absolute; width: calc(100% - 5px); height: 100%;')
+    result <<
+      if opts[:inline_style]
+        case (SiteSetting.category_style || :box).to_sym
+        when :bar
+          inline_category_stripe(category.color, 'display: inline-block; padding: 1px;', true)
+        when :box
+          unless show_parent
+            inline_category_stripe(category.color, 'display: block; position: absolute; width: 100%; height: 100%;')
+          else
+            inline_category_stripe(category.color, 'left: 5px; display: block; position: absolute; width: calc(100% - 5px); height: 100%;')
+          end
+        when :bullet
+          inline_category_stripe(category.color, "display: inline-block; width: #{category.parent_category_id.nil? ? 10 : 5}px; height: 10px;")
+        when :none
+          ''
         end
-      when :bullet then inline_category_stripe(category.color, "display: inline-block; width: #{category.parent_category_id.nil? ? 10 : 5}px; height: 10px;")
+      else
+        category_stripe(category.color, 'badge-category-bg')
       end
-    else
-      category_stripe(category.color, 'badge-category-bg')
-    end
 
     # category name
     class_names = 'badge-category clear-badge'
-    text_color = "##{category.text_color}"
     description = category.description_text ? "title='#{category.description_text.html_safe}'" : ''
     category_url = opts[:absolute_url] ? "#{Discourse.base_url_no_prefix}#{category.url}" : category.url
 
-    extra_span_classes = if opts[:inline_style]
+    extra_span_classes =
+      if opts[:inline_style]
         case (SiteSetting.category_style || :box).to_sym
-        when :bar then 'padding: 3px; color: #222222 !important; vertical-align: text-top; margin-top: -3px; display: inline-block;'
-        when :box then "#{show_parent ? 'margin-left: 5px; ' : ''} position: relative; padding: 0 5px; margin-top: 2px;"
-        when :bullet then 'color: #222222 !important; vertical-align: text-top; line-height: 1; margin-left: 4px; padding-left: 2px; display: inline;'
+        when :bar
+          'color: #222222; padding: 3px; vertical-align: text-top; margin-top: -3px; display: inline-block;'
+        when :box
+          "color: #{category.text_color}; #{show_parent ? 'margin-left: 5px; ' : ''} position: relative; padding: 0 5px; margin-top: 2px;"
+        when :bullet
+          'color: #222222; vertical-align: text-top; line-height: 1; margin-left: 4px; padding-left: 2px; display: inline;'
+        when :none
+          ''
         end + 'max-width: 150px; overflow: hidden; text-overflow: ellipsis;'
       else
         ''
       end
-    result << "<span style='color: #{text_color};#{extra_span_classes}' data-drop-close='true' class='#{class_names}'
+    result << "<span style='#{extra_span_classes}' data-drop-close='true' class='#{class_names}'
                  #{description}>"
 
     result << category.name.html_safe << '</span>'
diff --git a/lib/column_dropper.rb b/lib/column_dropper.rb
index 766ddddddf..a291d212bc 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|
+        ActiveRecord::Base.exec_sql <<~SQL
+        DROP TRIGGER IF EXISTS #{readonly_trigger_name(table, column)} ON #{table};
+        DROP FUNCTION IF EXISTS #{readonly_function_name(table, column)} CASCADE;
+        SQL
+
+        # 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
+
+      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/comment_migration.rb b/lib/comment_migration.rb
index 60065d7507..79c1576dd7 100644
--- a/lib/comment_migration.rb
+++ b/lib/comment_migration.rb
@@ -1,6 +1,6 @@
 
 
-class CommentMigration < ActiveRecord::Migration
+class CommentMigration < ActiveRecord::Migration[4.2]
   def comments_up
     raise "Not implemented"
   end
diff --git a/lib/composer_messages_finder.rb b/lib/composer_messages_finder.rb
index fa3c952abd..94d5a23efa 100644
--- a/lib/composer_messages_finder.rb
+++ b/lib/composer_messages_finder.rb
@@ -7,7 +7,7 @@ class ComposerMessagesFinder
   end
 
   def self.check_methods
-    @check_methods ||= instance_methods.find_all {|m| m =~ /^check\_/}
+    @check_methods ||= instance_methods.find_all { |m| m =~ /^check\_/ }
   end
 
   def find
@@ -70,7 +70,7 @@ class ComposerMessagesFinder
     return if SiteSetting.disable_avatar_education_message || SiteSetting.sso_overrides_avatar || !SiteSetting.allow_uploaded_avatars
 
     # If we got this far, log that we've nagged them about the avatar
-    UserHistory.create!(action: UserHistory.actions[:notified_about_avatar], target_user_id: @user.id )
+    UserHistory.create!(action: UserHistory.actions[:notified_about_avatar], target_user_id: @user.id)
 
     # Return the message
     {
@@ -86,19 +86,19 @@ class ComposerMessagesFinder
 
     # Count the topics made by this user in the last day
     recent_posts_user_ids = Post.where(topic_id: @details[:topic_id])
-                                .where("created_at > ?", 1.day.ago)
-                                .order('created_at desc')
-                                .limit(SiteSetting.sequential_replies_threshold)
-                                .pluck(:user_id)
+      .where("created_at > ?", 1.day.ago)
+      .order('created_at desc')
+      .limit(SiteSetting.sequential_replies_threshold)
+      .pluck(:user_id)
 
     # Did we get back as many posts as we asked for, and are they all by the current user?
     return if recent_posts_user_ids.size != SiteSetting.sequential_replies_threshold ||
-              recent_posts_user_ids.detect {|u| u != @user.id }
+              recent_posts_user_ids.detect { |u| u != @user.id }
 
     # If we got this far, log that we've nagged them about the sequential replies
     UserHistory.create!(action: UserHistory.actions[:notified_about_sequential_replies],
                         target_user_id: @user.id,
-                        topic_id: @details[:topic_id] )
+                        topic_id: @details[:topic_id])
 
     {
       id: 'sequential_replies',
@@ -149,7 +149,7 @@ class ComposerMessagesFinder
       order('created_at desc').
       limit(SiteSetting.get_a_room_threshold).
       pluck(:reply_to_user_id).
-      find_all {|uid| uid != @user.id && uid == reply_to_user_id}
+      find_all { |uid| uid != @user.id && uid == reply_to_user_id }
 
     return unless last_x_replies.size == SiteSetting.get_a_room_threshold
     return unless @topic.posts.count('distinct user_id') >= min_users_posted
diff --git a/lib/content_buffer.rb b/lib/content_buffer.rb
index 99d176d4cb..8db6146f0b 100644
--- a/lib/content_buffer.rb
+++ b/lib/content_buffer.rb
@@ -35,7 +35,7 @@ class ContentBuffer
       end
 
       # fix last line
-      @lines[start_row] << @lines[finish_row][finish_col-1..-1]
+      @lines[start_row] << @lines[finish_row][finish_col - 1..-1]
     end
 
     if transform[:operation] == :insert
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 48f1d38b49..5cc187a490 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -7,9 +7,9 @@ require_dependency 'pretty_text'
 class CookedPostProcessor
   include ActionView::Helpers::NumberHelper
 
-  attr_reader :cooking_options
+  attr_reader :cooking_options, :doc
 
-  def initialize(post, opts={})
+  def initialize(post, opts = {})
     @dirty = false
     @opts = opts
     @post = post
@@ -20,6 +20,7 @@ class CookedPostProcessor
     @cooking_options[:topic_id] = post.topic_id
     @cooking_options = @cooking_options.symbolize_keys
     @cooking_options[:omit_nofollow] = true if post.omit_nofollow?
+    @cooking_options[:cook_method] = post.cook_method
 
     analyzer = post.post_analyzer
     @doc = Nokogiri::HTML::fragment(analyzer.cook(post.raw, @cooking_options))
@@ -29,12 +30,17 @@ class CookedPostProcessor
 
   def post_process(bypass_bump = false)
     DistributedMutex.synchronize("post_process_#{@post.id}") do
-      keep_reverse_index_up_to_date
-      post_process_images
+      DiscourseEvent.trigger(:before_post_process_cooked, @doc, @post)
       post_process_oneboxes
+      post_process_images
+      keep_reverse_index_up_to_date
       optimize_urls
+      update_post_image
+      enforce_nofollow
       pull_hotlinked_images(bypass_bump)
       grant_badges
+      DiscourseEvent.trigger(:post_process_cooked, @doc, @post)
+      nil
     end
   end
 
@@ -51,7 +57,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,53 +65,115 @@ class CookedPostProcessor
       end
     end
 
-    values = upload_ids.map{ |u| "(#{@post.id},#{u})" }.join(",")
+    upload_ids |= downloaded_images.values.select { |id| Upload.exists?(id) }
+
+    values = upload_ids.map { |u| "(#{@post.id},#{u})" }.join(",")
     PostUpload.transaction do
-      PostUpload.delete_all(post_id: @post.id)
-      if upload_ids.length > 0
+      PostUpload.where(post_id: @post.id).delete_all
+      if upload_ids.size > 0
         PostUpload.exec_sql("INSERT INTO post_uploads (post_id, upload_id) VALUES #{values}")
       end
     end
   end
 
   def post_process_images
-    images = extract_images
-    return if images.blank?
+    extract_images.each do |img|
+      src = img["src"].sub(/^https?:/i, "")
+      if large_images.include?(src)
+        add_large_image_placeholder!(img)
+      elsif broken_images.include?(src)
+        add_broken_image_placeholder!(img)
+      else
+        limit_size!(img)
+        convert_to_link!(img)
+      end
+    end
+  end
 
-    images.each do |img|
-      limit_size!(img)
-      convert_to_link!(img)
+  def add_large_image_placeholder!(img)
+    url = img["src"]
+
+    is_hyperlinked = is_a_hyperlink?(img)
+
+    placeholder = create_node("div", "large-image-placeholder")
+    img.add_next_sibling(placeholder)
+    placeholder.add_child(img)
+
+    a = create_link_node(nil, url, true)
+    img.add_next_sibling(a)
+
+    span = create_span_node("url", url)
+    a.add_child(span)
+    span.add_previous_sibling(create_icon_node("image"))
+    span.add_next_sibling(create_span_node("help", I18n.t("upload.placeholders.too_large", max_size_kb: SiteSetting.max_image_size_kb)))
+
+    # Only if the image is already linked
+    if is_hyperlinked
+      parent = placeholder.parent
+      parent.add_next_sibling(placeholder)
+
+      if parent.name == 'a' && parent["href"].present?
+        if url == parent["href"]
+          parent.remove
+        else
+          parent["class"] = "link"
+          a.add_previous_sibling(parent)
+
+          lspan = create_span_node("url", parent["href"])
+          parent.add_child(lspan)
+          lspan.add_previous_sibling(create_icon_node("link"))
+        end
+      end
     end
 
-    update_post_image
+    img.remove
+  end
+
+  def add_broken_image_placeholder!(img)
+    img.name = "span"
+    img.set_attribute("class", "broken-image fa fa-chain-broken")
+    img.set_attribute("title", I18n.t("post.image_placeholder.broken"))
+    img.remove_attribute("src")
+    img.remove_attribute("width")
+    img.remove_attribute("height")
+  end
+
+  def large_images
+    @large_images ||= JSON.parse(@post.custom_fields[Post::LARGE_IMAGES].presence || "[]") rescue []
+  end
+
+  def broken_images
+    @broken_images ||= JSON.parse(@post.custom_fields[Post::BROKEN_IMAGES].presence || "[]") rescue []
+  end
+
+  def downloaded_images
+    @downloaded_images ||= JSON.parse(@post.custom_fields[Post::DOWNLOADED_IMAGES].presence || "{}") rescue {}
   end
 
   def extract_images
-    # all image with a src attribute
+    # all images with a src attribute
     @doc.css("img[src]") -
-    # minus, data images
+    # minus data images
     @doc.css("img[src^='data']") -
-    # minus, emojis
+    # minus emojis
     @doc.css("img.emoji") -
-    # minus, image inside oneboxes
+    # minus oneboxed images
     oneboxed_images -
-    # minus, images inside quotes
+    # minus images inside quotes
     @doc.css(".quote img")
   end
 
   def extract_images_for_post
-    # all image with a src attribute
+    # all images with a src attribute
     @doc.css("img[src]") -
-    # minus, emojis
+    # minus emojis
     @doc.css("img.emoji") -
-    # minus, image inside oneboxes
-    oneboxed_images -
-    # minus, images inside quotes
+    # minus images inside quotes
     @doc.css(".quote img")
   end
 
   def oneboxed_images
-    @doc.css(".onebox-result img, .onebox img")
+    @doc.css(".onebox-body img, .onebox img")
   end
 
   def limit_size!(img)
@@ -133,11 +201,11 @@ class CookedPostProcessor
       original_width, original_height = original_image_size.map(&:to_f)
 
       if w > 0
-        ratio = w/original_width
-        [w.floor, (original_height*ratio).floor]
+        ratio = w / original_width
+        [w.floor, (original_height * ratio).floor]
       else
-        ratio = h/original_height
-        [(original_width*ratio).floor, h.floor]
+        ratio = h / original_height
+        [(original_width * ratio).floor, h.floor]
       end
     end
   end
@@ -163,13 +231,12 @@ class CookedPostProcessor
 
     # FastImage fails when there's no scheme
     absolute_url = SiteSetting.scheme + ":" + absolute_url if absolute_url.start_with?("//")
-
     return unless is_valid_image_url?(absolute_url)
 
     # we can *always* crawl our own images
     return unless SiteSetting.crawl_images? || Discourse.store.has_been_uploaded?(url)
 
-    @size_cache[url] ||= FastImage.size(absolute_url)
+    @size_cache[url] = FastImage.size(absolute_url)
   rescue Zlib::BufError # FastImage.size raises BufError for some gifs
   end
 
@@ -185,28 +252,26 @@ class CookedPostProcessor
 
   def convert_to_link!(img)
     src = img["src"]
-    return unless src.present?
+    return if src.blank? || is_a_hyperlink?(img)
 
     width, height = img["width"].to_i, img["height"].to_i
-    original_width, original_height = get_size(src)
+    # TODO: store original dimentions in db
+    original_width, original_height = (get_size(src) || [0, 0]).map(&:to_i)
 
     # can't reach the image...
-    if original_width.nil? ||
-       original_height.nil? ||
-       original_width == 0 ||
-       original_height == 0
+    if original_width == 0 || original_height == 0
       Rails.logger.info "Can't reach '#{src}' to get its dimension."
       return
     end
 
-    return if original_width.to_i <= width && original_height.to_i <= height
-    return if original_width.to_i <= SiteSetting.max_image_width && original_height.to_i <= SiteSetting.max_image_height
+    return if original_width <= width && original_height <= height
+    return if original_width <= SiteSetting.max_image_width && original_height <= SiteSetting.max_image_height
 
-    return if is_a_hyperlink?(img)
+    crop = original_width.to_f / original_height.to_f < MIN_RATIO_TO_CROP
+    # prevent iPhone X screenshots from being cropped
+    crop &= original_width != 1125 && original_height != 2436
 
-    crop = false
-    if original_width.to_f / original_height.to_f < MIN_RATIO_TO_CROP
-      crop = true
+    if crop
       width, height = ImageSizer.crop(original_width, original_height)
       img["width"] = width
       img["height"] = height
@@ -223,29 +288,25 @@ class CookedPostProcessor
     parent = img.parent
     while parent
       return true if parent.name == "a"
-      break unless parent.respond_to? :parent
-      parent = parent.parent
+      parent = parent.parent if parent.respond_to?(:parent)
     end
     false
   end
 
-  def add_lightbox!(img, original_width, original_height, upload=nil)
+  def add_lightbox!(img, original_width, original_height, upload = nil)
     # first, create a div to hold our lightbox
-    lightbox = Nokogiri::XML::Node.new("div", @doc)
-    lightbox["class"] = "lightbox-wrapper"
+    lightbox = create_node("div", "lightbox-wrapper")
     img.add_next_sibling(lightbox)
     lightbox.add_child(img)
 
     # then, the link to our larger image
-    a = Nokogiri::XML::Node.new("a", @doc)
+    a = create_link_node("lightbox", img["src"])
     img.add_next_sibling(a)
 
     if upload && Discourse.store.internal?
       a["data-download-href"] = Discourse.store.download_url(upload)
     end
 
-    a["href"] = img["src"]
-    a["class"] = "lightbox"
     a.add_child(img)
 
     # replace the image by its thumbnail
@@ -253,8 +314,7 @@ class CookedPostProcessor
     img["src"] = upload.thumbnail(w, h).url if upload && upload.has_thumbnail?(w, h)
 
     # then, some overlay informations
-    meta = Nokogiri::XML::Node.new("div", @doc)
-    meta["class"] = "meta"
+    meta = create_node("div", "meta")
     img.add_next_sibling(meta)
 
     filename = get_filename(upload, img["src"])
@@ -274,15 +334,36 @@ class CookedPostProcessor
     return I18n.t("upload.pasted_image_filename")
   end
 
-  def create_span_node(klass, content=nil)
-    span = Nokogiri::XML::Node.new("span", @doc)
+  def create_node(tag_name, klass)
+    node = Nokogiri::XML::Node.new(tag_name, @doc)
+    node["class"] = klass if klass.present?
+    node
+  end
+
+  def create_span_node(klass, content = nil)
+    span = create_node("span", klass)
     span.content = content if content
-    span["class"] = klass
     span
   end
 
+  def create_icon_node(klass)
+    create_node("i", "fa fa-fw fa-#{klass}")
+  end
+
+  def create_link_node(klass, url, external = false)
+    a = create_node("a", klass)
+    a["href"] = url
+    if external
+      a["target"] = "_blank"
+      a["rel"] = "nofollow noopener"
+    end
+    a
+  end
+
   def update_post_image
     img = extract_images_for_post.first
+    return if img.blank?
+
     if img["src"].present?
       @post.update_column(:image_url, img["src"][0...255]) # post
       @post.topic.update_column(:image_url, img["src"][0...255]) if @post.is_first_post? # topic
@@ -301,12 +382,56 @@ class CookedPostProcessor
       Oneboxer.onebox(url, args)
     end
 
-    # make sure we grab dimensions for oneboxed images
-    oneboxed_images.each { |img| limit_size!(img) }
+    oneboxed_images.each do |img|
+      next if img["src"].blank?
 
-    # respect nofollow admin settings
-    if !@cooking_options[:omit_nofollow] && SiteSetting.add_rel_nofollow_to_user_content
-      PrettyText.add_rel_nofollow_to_user_content(@doc)
+      src = img["src"].sub(/^https?:/i, "")
+
+      if large_images.include?(src) || broken_images.include?(src)
+        img.remove
+        next
+      end
+
+      upload_id = downloaded_images[src]
+      upload = Upload.find(upload_id) if upload_id
+      img["src"] = upload.url if upload.present?
+
+      # make sure we grab dimensions for oneboxed images
+      # and wrap in a div
+      limit_size!(img)
+
+      next if img["class"]&.include?('onebox-avatar')
+
+      parent_class = img.parent && img.parent["class"]
+      if parent_class&.include?("onebox-body") && (width = img["width"].to_i) > 0 && (height = img["height"].to_i) > 0
+
+        # special instruction for width == height, assume we are dealing with an avatar
+        if (img["width"].to_i == img["height"].to_i)
+          found = false
+          parent = img
+          while parent = parent.parent
+            if parent["class"] && parent["class"].include?("whitelistedgeneric")
+              found = true
+              break
+            end
+          end
+
+          if found
+            img["class"] = img["class"].to_s + " onebox-avatar"
+            next
+          end
+        end
+
+        if width < 64 && height < 64
+          img["class"] = img["class"].to_s + " onebox-full-image"
+        else
+          img.delete('width')
+          img.delete('height')
+          new_parent = img.add_next_sibling("<div class='aspect-image' style='--aspect-ratio:#{width}/#{height};'/>")
+          new_parent.first.add_child(img)
+        end
+
+      end
     end
   end
 
@@ -319,7 +444,7 @@ class CookedPostProcessor
       end
     end
 
-    use_s3_cdn = SiteSetting.enable_s3_uploads && SiteSetting.s3_cdn_url.present?
+    use_s3_cdn = SiteSetting.Upload.enable_s3_uploads && SiteSetting.Upload.s3_cdn_url.present?
 
     %w{href data-download-href}.each do |selector|
       @doc.css("a[#{selector}]").each do |a|
@@ -336,6 +461,12 @@ class CookedPostProcessor
     end
   end
 
+  def enforce_nofollow
+    if !@cooking_options[:omit_nofollow] && SiteSetting.add_rel_nofollow_to_user_content
+      PrettyText.add_rel_nofollow_to_user_content(@doc)
+    end
+  end
+
   def pull_hotlinked_images(bypass_bump = false)
     # is the job enabled?
     return unless SiteSetting.download_remote_images_to_local?
@@ -344,7 +475,7 @@ class CookedPostProcessor
     # don't download remote images for posts that are more than n days old
     return unless @post.created_at > (Date.today - SiteSetting.download_remote_images_max_days_old)
     # we only want to run the job whenever it's changed by a user
-    return if @post.last_editor_id == Discourse.system_user.id
+    return if @post.last_editor_id && @post.last_editor_id <= 0
     # make sure no other job is scheduled
     Jobs.cancel_scheduled_job(:pull_hotlinked_images, post_id: @post.id)
     # schedule the job
@@ -359,7 +490,7 @@ class CookedPostProcessor
     # log the site setting change
     reason = I18n.t("disable_remote_images_download_reason")
     staff_action_logger = StaffActionLogger.new(Discourse.system_user)
-    staff_action_logger.log_site_setting_change("download_remote_images_to_local", true, false, { details: reason })
+    staff_action_logger.log_site_setting_change("download_remote_images_to_local", true, false, details: reason)
 
     # also send a private message to the site contact user
     notify_about_low_disk_space
diff --git a/lib/crawler_detection.rb b/lib/crawler_detection.rb
index a8892fdc76..5d222ecf7b 100644
--- a/lib/crawler_detection.rb
+++ b/lib/crawler_detection.rb
@@ -1,9 +1,17 @@
 module CrawlerDetection
+
   # added 'ia_archiver' based on https://meta.discourse.org/t/unable-to-archive-discourse-pages-with-the-internet-archive/21232
   # added 'Wayback Save Page' based on https://meta.discourse.org/t/unable-to-archive-discourse-with-the-internet-archive-save-page-now-button/22875
   # added 'Swiftbot' based on https://meta.discourse.org/t/how-to-add-html-markup-or-meta-tags-for-external-search-engine/28220
+  def self.to_matcher(string)
+    escaped = string.split('|').map { |agent| Regexp.escape(agent) }.join('|')
+    Regexp.new(escaped)
+  end
 
   def self.crawler?(user_agent)
-    !/Googlebot|Mediapartners|AdsBot|curl|HTTrack|Twitterbot|facebookexternalhit|bingbot|Baiduspider|ia_archiver|Wayback Save Page|360Spider|Swiftbot|YandexBot/.match(user_agent).nil?
+    # this is done to avoid regenerating regexes
+    @matchers ||= {}
+    matcher = (@matchers[SiteSetting.crawler_user_agents] ||= to_matcher(SiteSetting.crawler_user_agents))
+    matcher.match?(user_agent)
   end
 end
diff --git a/lib/current_user.rb b/lib/current_user.rb
index 79a04e4a71..a5035b9764 100644
--- a/lib/current_user.rb
+++ b/lib/current_user.rb
@@ -8,18 +8,18 @@ module CurrentUser
     Discourse.current_user_provider.new(env).current_user
   end
 
-
   # can be used to pretend current user does no exist, for CSRF attacks
   def clear_current_user
     @current_user_provider = Discourse.current_user_provider.new({})
   end
 
   def log_on_user(user)
-    current_user_provider.log_on_user(user,session,cookies)
+    current_user_provider.log_on_user(user, session, cookies)
+    user.logged_in
   end
 
   def log_off_user
-    current_user_provider.log_off_user(session,cookies)
+    current_user_provider.log_off_user(session, cookies)
   end
 
   def is_api?
@@ -35,7 +35,7 @@ module CurrentUser
   end
 
   def refresh_session(user)
-    current_user_provider.refresh_session(user,session,cookies)
+    current_user_provider.refresh_session(user, session, cookies)
   end
 
   private
diff --git a/lib/demon/base.rb b/lib/demon/base.rb
index 6fb162faad..188a27e9fe 100644
--- a/lib/demon/base.rb
+++ b/lib/demon/base.rb
@@ -7,7 +7,7 @@ class Demon::Base
     @demons
   end
 
-  def self.start(count=1)
+  def self.start(count = 1)
     @demons ||= {}
     count.times do |i|
       (@demons["#{prefix}_#{i}"] ||= new(i)).start
@@ -50,7 +50,7 @@ class Demon::Base
     "#{Rails.root}/tmp/pids/#{self.class.prefix}_#{@index}.pid"
   end
 
-  def alive?(pid=nil)
+  def alive?(pid = nil)
     pid ||= @pid
     if pid
       Demon::Base.alive?(pid)
@@ -63,14 +63,14 @@ class Demon::Base
     @started = false
     if @pid
       # TODO configurable stop signal
-      Process.kill("HUP",@pid)
+      Process.kill("HUP", @pid)
 
       wait_for_stop = lambda {
         timeout = @stop_timeout
 
         while alive? && timeout > 0
-          timeout -= (@stop_timeout/10.0)
-          sleep(@stop_timeout/10.0)
+          timeout -= (@stop_timeout / 10.0)
+          sleep(@stop_timeout / 10.0)
           Process.waitpid(@pid, Process::WNOHANG) rescue -1
         end
 
@@ -86,7 +86,6 @@ class Demon::Base
 
       wait_for_stop.call
 
-
       @pid = nil
       @started = false
     end
@@ -116,7 +115,7 @@ class Demon::Base
     if existing = already_running?
       # should not happen ... so kill violently
       STDERR.puts "Attempting to kill pid #{existing}"
-      Process.kill("TERM",existing)
+      Process.kill("TERM", existing)
     end
 
     @started = true
@@ -156,7 +155,7 @@ class Demon::Base
 
   def write_pid_file
     FileUtils.mkdir_p(Rails.root + "tmp/pids")
-    File.open(pid_file,'w') do |f|
+    File.open(pid_file, 'w') do |f|
       f.write(@pid)
     end
   end
@@ -182,7 +181,6 @@ class Demon::Base
     end
   end
 
-
   def suppress_stdout
     true
   end
diff --git a/lib/demon/rails_autospec.rb b/lib/demon/rails_autospec.rb
index 92d15a8fb2..702876c87e 100644
--- a/lib/demon/rails_autospec.rb
+++ b/lib/demon/rails_autospec.rb
@@ -12,9 +12,9 @@ class Demon::RailsAutospec < Demon::Base
     require "rack"
     ENV["RAILS_ENV"] = "test"
     Rack::Server.start(
-      :config => "config.ru",
-      :AccessLog => [],
-      :Port => ENV["TEST_SERVER_PORT"] || 60099,
+      config: "config.ru",
+      AccessLog: [],
+      Port: ENV["TEST_SERVER_PORT"] || 60099,
     )
   rescue => e
     STDERR.puts e.message
diff --git a/lib/demon/sidekiq.rb b/lib/demon/sidekiq.rb
index 350b2da28b..0ca7ba9994 100644
--- a/lib/demon/sidekiq.rb
+++ b/lib/demon/sidekiq.rb
@@ -7,7 +7,7 @@ class Demon::Sidekiq < Demon::Base
   end
 
   def self.after_fork(&blk)
-    blk ? (@blk=blk) : @blk
+    blk ? (@blk = blk) : @blk
   end
 
   private
@@ -23,7 +23,7 @@ class Demon::Sidekiq < Demon::Base
   def after_fork
     Demon::Sidekiq.after_fork&.call
 
-    STDERR.puts "Loading Sidekiq in process id #{Process.pid}"
+    puts "Loading Sidekiq in process id #{Process.pid}"
     require 'sidekiq/cli'
     # CLI will close the logger, if we have one set we can be in big
     # trouble, if STDOUT is closed in our process all sort of weird
@@ -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/directory_helper.rb b/lib/directory_helper.rb
index ec8eaccc5a..7f8e6b86e3 100644
--- a/lib/directory_helper.rb
+++ b/lib/directory_helper.rb
@@ -2,7 +2,7 @@ module DirectoryHelper
 
   def tmp_directory(prefix)
     directory_cache[prefix] ||= begin
-      f = File.join( Rails.root, 'tmp', Time.now.strftime("#{prefix}%Y%m%d%H%M%S") )
+      f = File.join(Rails.root, 'tmp', Time.now.strftime("#{prefix}%Y%m%d%H%M%S"))
       FileUtils.mkdir_p(f) unless Dir[f].present?
       f
     end
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 086ed28b72..66ce5c3d76 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -1,8 +1,10 @@
 require 'cache'
 require 'open3'
+require_dependency 'route_format'
 require_dependency 'plugin/instance'
 require_dependency 'auth/default_current_user_provider'
 require_dependency 'version'
+require 'digest/sha1'
 
 # Prevents errors with reloading dev with conditional includes
 if Rails.env.development?
@@ -62,9 +64,12 @@ module Discourse
 
   # When they don't have permission to do something
   class InvalidAccess < StandardError
-    attr_reader :obj
-    def initialize(msg=nil, obj=nil)
+    attr_reader :obj, :custom_message
+    def initialize(msg = nil, obj = nil, opts = nil)
       super(msg)
+
+      opts ||= {}
+      @custom_message = opts[:custom_message] if opts[:custom_message]
       @obj = obj
     end
   end
@@ -84,6 +89,8 @@ module Discourse
   # Cross site request forgery
   class CSRF < StandardError; end
 
+  class Deprecation < StandardError; end
+
   def self.filters
     @filters ||= [:latest, :unread, :new, :read, :posted, :bookmarks]
   end
@@ -115,10 +122,24 @@ module Discourse
     set
   end
 
-
   def self.activate_plugins!
     all_plugins = Plugin::Instance.find_all("#{Rails.root}/plugins")
 
+    if Rails.env.development?
+      plugin_hash = Digest::SHA1.hexdigest(all_plugins.map { |p| p.path }.sort.join('|'))
+      hash_file = "#{Rails.root}/tmp/plugin-hash"
+      old_hash = File.read(hash_file) rescue nil
+
+      if old_hash && old_hash != plugin_hash
+        puts "WARNING: It looks like your discourse plugins have recently changed."
+        puts "It is highly recommended to remove your `tmp` directory, otherwise"
+        puts "plugins might not work."
+        puts
+      else
+        File.write(hash_file, plugin_hash)
+      end
+    end
+
     @plugins = []
     all_plugins.each do |p|
       v = p.metadata.required_version || Discourse::VERSION::STRING
@@ -144,11 +165,11 @@ module Discourse
   end
 
   def self.official_plugins
-    plugins.find_all{|p| p.metadata.official?}
+    plugins.find_all { |p| p.metadata.official? }
   end
 
   def self.unofficial_plugins
-    plugins.find_all{|p| !p.metadata.official?}
+    plugins.find_all { |p| !p.metadata.official? }
   end
 
   def self.assets_digest
@@ -214,6 +235,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
@@ -256,7 +296,7 @@ module Discourse
   end
 
   def self.readonly_mode?
-    recently_readonly? || READONLY_KEYS.any? { |key| !!$redis.get(key) }
+    recently_readonly? || $redis.mget(*READONLY_KEYS).compact.present?
   end
 
   def self.last_read_only
@@ -276,36 +316,67 @@ module Discourse
     last_read_only[$redis.namespace] = nil
   end
 
-  def self.request_refresh!
+  def self.request_refresh!(user_ids: nil)
     # Causes refresh on next click for all clients
     #
     # This is better than `MessageBus.publish "/file-change", ["refresh"]` because
     # it spreads the refreshes out over a time period
-    MessageBus.publish '/global/asset-version', 'clobber'
+    if user_ids
+      MessageBus.publish("/refresh_client", 'clobber', user_ids: user_ids)
+    else
+      MessageBus.publish('/global/asset-version', 'clobber')
+    end
+  end
+
+  def self.ensure_version_file_loaded
+    unless @version_file_loaded
+      version_file = "#{Rails.root}/config/version.rb"
+      require version_file if File.exists?(version_file)
+      @version_file_loaded = true
+    end
   end
 
   def self.git_version
-    return $git_version if $git_version
-
-    # load the version stamped by the "build:stamp" task
-    f = Rails.root.to_s + "/config/version"
-    require f if File.exists?("#{f}.rb")
-
-    begin
-      $git_version ||= `git rev-parse HEAD`.strip
-    rescue
-      $git_version = Discourse::VERSION::STRING
-    end
+    ensure_version_file_loaded
+    $git_version ||=
+      begin
+        git_cmd = 'git rev-parse HEAD'
+        self.try_git(git_cmd, Discourse::VERSION::STRING)
+      end
   end
 
   def self.git_branch
-    return $git_branch if $git_branch
+    ensure_version_file_loaded
+    $git_branch ||=
+      begin
+        git_cmd = 'git rev-parse --abbrev-ref HEAD'
+        self.try_git(git_cmd, 'unknown')
+      end
+  end
+
+  def self.full_version
+    ensure_version_file_loaded
+    $full_version ||=
+      begin
+        git_cmd = 'git describe --dirty --match "v[0-9]*"'
+        self.try_git(git_cmd, 'unknown')
+      end
+  end
+
+  def self.try_git(git_cmd, default_value)
+    version_value = false
 
     begin
-      $git_branch ||= `git rev-parse --abbrev-ref HEAD`.strip
+      version_value = `#{git_cmd}`.strip
     rescue
-      $git_branch = "unknown"
+      version_value = default_value
     end
+
+    if version_value.empty?
+      version_value = default_value
+    end
+
+    version_value
   end
 
   # Either returns the site_contact_username user or the first admin.
@@ -321,7 +392,7 @@ module Discourse
   end
 
   def self.store
-    if SiteSetting.enable_s3_uploads?
+    if SiteSetting.Upload.enable_s3_uploads
       @s3_store_loaded ||= require 'file_store/s3_store'
       FileStore::S3Store.new
     else
@@ -359,7 +430,7 @@ module Discourse
     Rails.cache.reconnect
     Logster.store.redis.reconnect
     # shuts down all connections in the pool
-    Sidekiq.redis_pool.shutdown{|c| nil}
+    Sidekiq.redis_pool.shutdown { |c| nil }
     # re-establish
     Sidekiq.redis = sidekiq_redis_config
     start_connection_reaper
@@ -372,6 +443,25 @@ module Discourse
     nil
   end
 
+  # report a warning maintaining backtrack for logster
+  def self.warn_exception(e, message: "", env: nil)
+    if Rails.logger.respond_to? :add_with_opts
+      # logster
+      Rails.logger.add_with_opts(
+        ::Logger::Severity::WARN,
+        "#{message} : #{e}",
+        "discourse-exception",
+        backtrace: e.backtrace.join("\n"),
+        env: env
+      )
+    else
+      # no logster ... fallback
+      Rails.logger.warn("#{message} #{e}")
+    end
+  rescue
+    STDERR.puts "Failed to report exception #{e} #{message}"
+  end
+
   def self.start_connection_reaper
     return if GlobalSetting.connection_reaper_age < 1 ||
               GlobalSetting.connection_reaper_interval < 1
@@ -383,7 +473,7 @@ module Discourse
           sleep GlobalSetting.connection_reaper_interval
           reap_connections(GlobalSetting.connection_reaper_age, GlobalSetting.connection_reaper_max_age)
         rescue => e
-          Discourse.handle_exception(e, {message: "Error reaping connections"})
+          Discourse.warn_exception(e, message: "Error reaping connections")
         end
       end
     end
@@ -391,7 +481,7 @@ module Discourse
 
   def self.reap_connections(idle, max_age)
     pools = []
-    ObjectSpace.each_object(ActiveRecord::ConnectionAdapters::ConnectionPool){|pool| pools << pool}
+    ObjectSpace.each_object(ActiveRecord::ConnectionAdapters::ConnectionPool) { |pool| pools << pool }
 
     pools.each do |pool|
       pool.drain(idle.seconds, max_age.seconds)
@@ -414,7 +504,7 @@ module Discourse
 
   def self.reset_active_record_cache_if_needed(e)
     last_cache_reset = Discourse.last_ar_cache_reset
-    if e && e.message =~ /UndefinedColumn/ && (last_cache_reset.nil?  || last_cache_reset < 30.seconds.ago)
+    if e && e.message =~ /UndefinedColumn/ && (last_cache_reset.nil? || last_cache_reset < 30.seconds.ago)
       Rails.logger.warn "Clear Active Record cache cause schema appears to have changed!"
       Discourse.last_ar_cache_reset = Time.zone.now
       Discourse.reset_active_record_cache
@@ -423,11 +513,14 @@ module Discourse
 
   def self.reset_active_record_cache
     ActiveRecord::Base.connection.query_cache.clear
-    (ActiveRecord::Base.connection.tables - %w[schema_migrations]).each do |table|
+    (ActiveRecord::Base.connection.tables - %w[schema_migrations versions]).each do |table|
       table.classify.constantize.reset_column_information rescue nil
     end
     nil
   end
 
+  def self.running_in_rack?
+    ENV["DISCOURSE_RUNNING_IN_RACK"] == "1"
+  end
 
 end
diff --git a/lib/discourse_cookie_store.rb b/lib/discourse_cookie_store.rb
index f962ba3a0c..2dbd56792f 100644
--- a/lib/discourse_cookie_store.rb
+++ b/lib/discourse_cookie_store.rb
@@ -1,6 +1,6 @@
 class ActionDispatch::Session::DiscourseCookieStore < ActionDispatch::Session::CookieStore
-  def initialize(app, options={})
-    super(app,options)
+  def initialize(app, options = {})
+    super(app, options)
   end
 
   private
diff --git a/lib/discourse_event.rb b/lib/discourse_event.rb
index cc6a1f65d2..6a45571bf2 100644
--- a/lib/discourse_event.rb
+++ b/lib/discourse_event.rb
@@ -1,6 +1,6 @@
 # This is meant to be used by plugins to trigger and listen to events
 # So we can execute code when things happen.
-module DiscourseEvent
+class DiscourseEvent
 
   # Defaults to a hash where default values are empty sets.
   def self.events
diff --git a/lib/discourse_hub.rb b/lib/discourse_hub.rb
index dc97b1748d..cf6df955ee 100644
--- a/lib/discourse_hub.rb
+++ b/lib/discourse_hub.rb
@@ -1,12 +1,12 @@
-require_dependency 'rest_client'
 require_dependency 'version'
+require_dependency 'site_setting'
 
 module DiscourseHub
 
   STATS_FETCHED_AT_KEY = "stats_fetched_at"
 
   def self.version_check_payload
-    default_payload = { installed_version: Discourse::VERSION::STRING }.merge!(Discourse.git_branch == "unknown" ? {} : {branch: Discourse.git_branch})
+    default_payload = { installed_version: Discourse::VERSION::STRING }.merge!(Discourse.git_branch == "unknown" ? {} : { branch: Discourse.git_branch })
     default_payload.merge!(get_payload)
   end
 
@@ -18,34 +18,42 @@ module DiscourseHub
     $redis.set STATS_FETCHED_AT_KEY, time_with_zone.to_i
   end
 
-  private
-
   def self.get_payload
     SiteSetting.share_anonymized_statistics && stats_fetched_at < 7.days.ago ? About.fetch_cached_stats.symbolize_keys : {}
   end
 
-  def self.get(rel_url, params={})
+  def self.get(rel_url, params = {})
     singular_action :get, rel_url, params
   end
 
-  def self.post(rel_url, params={})
+  def self.post(rel_url, params = {})
     collection_action :post, rel_url, params
   end
 
-  def self.put(rel_url, params={})
+  def self.put(rel_url, params = {})
     collection_action :put, rel_url, params
   end
 
-  def self.delete(rel_url, params={})
+  def self.delete(rel_url, params = {})
     singular_action :delete, rel_url, params
   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 } )
+  def self.singular_action(action, rel_url, params = {})
+    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 )
+  def self.collection_action(action, rel_url, params = {})
+    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 +65,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_logstash_logger.rb b/lib/discourse_logstash_logger.rb
new file mode 100644
index 0000000000..369e7e3c05
--- /dev/null
+++ b/lib/discourse_logstash_logger.rb
@@ -0,0 +1,16 @@
+require 'logstash-logger'
+
+class DiscourseLogstashLogger
+  def self.logger(uri:, type:)
+    LogStashLogger.new(
+      uri: uri,
+      sync: true,
+      customize_event: ->(event) {
+        event['hostname'] = `hostname`.chomp
+        event['severity_name'] = event['severity']
+        event['severity'] = Object.const_get("Logger::Severity::#{event['severity']}")
+        event['type'] = type
+      },
+    )
+  end
+end
diff --git a/lib/discourse_plugin.rb b/lib/discourse_plugin.rb
index b39b676c02..a2f86705ae 100644
--- a/lib/discourse_plugin.rb
+++ b/lib/discourse_plugin.rb
@@ -27,10 +27,10 @@ class DiscoursePlugin
   # Find the modules defined in the plugin with "Mixin" in their name.
   def self.mixins
     constants.map { |const_name| const_get(const_name) }
-             .select { |const| const.class == Module && const.name["Mixin"] }
+      .select { |const| const.class == Module && const.name["Mixin"] }
   end
 
-  def register_js(file, opts={})
+  def register_js(file, opts = {})
     @registry.register_js(file, opts)
   end
 
@@ -38,7 +38,7 @@ class DiscoursePlugin
     @registry.register_css(file)
   end
 
-  def register_archetype(name, options={})
+  def register_archetype(name, options = {})
     @registry.register_archetype(name, options)
   end
 
@@ -48,4 +48,3 @@ class DiscoursePlugin
   end
 
 end
-
diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index 568c48932d..afe8009f8c 100644
--- a/lib/discourse_plugin_registry.rb
+++ b/lib/discourse_plugin_registry.rb
@@ -5,6 +5,7 @@ class DiscoursePluginRegistry
 
   class << self
     attr_writer :javascripts
+    attr_writer :service_workers
     attr_writer :admin_javascripts
     attr_writer :stylesheets
     attr_writer :mobile_stylesheets
@@ -24,6 +25,10 @@ class DiscoursePluginRegistry
       @javascripts ||= Set.new
     end
 
+    def service_workers
+      @service_workers ||= Set.new
+    end
+
     def asset_globs
       @asset_globs ||= Set.new
     end
@@ -64,30 +69,38 @@ class DiscoursePluginRegistry
       @html_builders ||= {}
     end
 
+    def seed_path_builders
+      @seed_path_builders ||= Set.new
+    end
+
     def vendored_pretty_text
       @vendored_pretty_text ||= Set.new
     end
 
   end
 
-  def register_js(filename, options={})
+  def register_js(filename, options = {})
     # If we have a server side option, add that too.
     self.class.javascripts << filename
   end
 
+  def self.register_service_worker(filename, options = {})
+    self.service_workers << filename
+  end
+
   def register_css(filename)
     self.class.stylesheets << filename
   end
 
-  def register_archetype(name, options={})
+  def register_archetype(name, options = {})
     Archetype.register(name, options)
   end
 
-  def self.register_glob(root, extension, options=nil)
+  def self.register_glob(root, extension, options = nil)
     self.asset_globs << [root, extension, options || {}]
   end
 
-  def self.each_globbed_asset(each_options=nil)
+  def self.each_globbed_asset(each_options = nil)
     each_options ||= {}
 
     self.asset_globs.each do |g|
@@ -108,7 +121,7 @@ class DiscoursePluginRegistry
   JS_REGEX = /\.js$|\.js\.erb$|\.js\.es6$/
   HANDLEBARS_REGEX = /\.hbs$|\.js\.handlebars$/
 
-  def self.register_asset(asset, opts=nil)
+  def self.register_asset(asset, opts = nil)
     if asset =~ JS_REGEX
       if opts == :admin
         self.admin_javascripts << asset
@@ -136,18 +149,36 @@ class DiscoursePluginRegistry
     self.seed_data[key] = value
   end
 
-  def self.register_html_builder(name, &block)
-    html_builders[name] = block
+  def self.register_seed_path_builder(&block)
+    seed_path_builders << block
   end
 
-  def self.build_html(name, ctx=nil)
-    html_builders[name]&.call(ctx)
+  def self.register_html_builder(name, &block)
+    html_builders[name] ||= []
+    html_builders[name] << block
+  end
+
+  def self.build_html(name, ctx = nil)
+    builders = html_builders[name] || []
+    builders.map { |b| b.call(ctx) }.join("\n").html_safe
+  end
+
+  def self.seed_paths
+    result = SeedFu.fixture_paths.dup
+    unless Rails.env.test? && ENV['LOAD_PLUGINS'] != "1"
+      seed_path_builders.each { |b| result += b.call }
+    end
+    result.uniq
   end
 
   def javascripts
     self.class.javascripts
   end
 
+  def service_workers
+    self.class.service_workers
+  end
+
   def stylesheets
     self.class.stylesheets
   end
@@ -170,6 +201,7 @@ class DiscoursePluginRegistry
 
   def self.clear
     self.javascripts = nil
+    self.service_workers = nil
     self.stylesheets = nil
     self.mobile_stylesheets = nil
     self.desktop_stylesheets = nil
@@ -179,6 +211,7 @@ class DiscoursePluginRegistry
 
   def self.reset!
     javascripts.clear
+    service_workers.clear
     admin_javascripts.clear
     stylesheets.clear
     mobile_stylesheets.clear
@@ -188,6 +221,7 @@ class DiscoursePluginRegistry
     asset_globs.clear
     html_builders.clear
     vendored_pretty_text.clear
+    seed_path_builders.clear
   end
 
   def self.setup(plugin_class)
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index aaa5f74ef7..49f0a3ec1d 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -2,6 +2,7 @@
 #  A wrapper around redis that namespaces keys with the current site id
 #
 require_dependency 'cache'
+
 class DiscourseRedis
   class FallbackHandler
     include Singleton
@@ -14,15 +15,24 @@ class DiscourseRedis
       @running = false
       @mutex = Mutex.new
       @slave_config = DiscourseRedis.slave_config
-      @timer_task = init_timer_task
+      @message_bus_keepalive_interval = MessageBus.keepalive_interval
     end
 
     def verify_master
-      synchronize do
-        return if @timer_task.running?
-      end
+      synchronize { return if @thread && @thread.alive? }
 
-      @timer_task.execute
+      @thread = Thread.new do
+        loop do
+          begin
+            thread = Thread.new { initiate_fallback_to_master }
+            thread.join
+            break if synchronize { @master }
+            sleep 10
+          ensure
+            thread.kill
+          end
+        end
+      end
     end
 
     def initiate_fallback_to_master
@@ -30,10 +40,10 @@ class DiscourseRedis
 
       begin
         slave_client = ::Redis::Client.new(@slave_config)
-        logger.info "#{log_prefix}: Checking connection to master server..."
+        logger.warn "#{log_prefix}: Checking connection to master server..."
 
         if slave_client.call([:info]).split("\r\n").include?(MASTER_LINK_STATUS)
-          logger.info "#{log_prefix}: Master server is active, killing all connections to slave..."
+          logger.warn "#{log_prefix}: Master server is active, killing all connections to slave..."
 
           self.master = true
 
@@ -41,6 +51,7 @@ class DiscourseRedis
             slave_client.call([:client, [:kill, 'type', connection_type]])
           end
 
+          MessageBus.keepalive_interval = @message_bus_keepalive_interval
           Discourse.clear_readonly!
           Discourse.request_refresh!
           success = true
@@ -57,21 +68,16 @@ class DiscourseRedis
     end
 
     def master=(args)
-      synchronize { @master = args }
-    end
+      synchronize do
+        @master = args
 
-    def running?
-      @timer_task.running?
+        # Disables MessageBus keepalive when Redis is in readonly mode
+        MessageBus.keepalive_interval = 0 if !@master
+      end
     end
 
     private
 
-    def init_timer_task
-      Concurrent::TimerTask.new(execution_interval: 10) do |task|
-        task.shutdown if initiate_fallback_to_master
-      end
-    end
-
     def synchronize
       @mutex.synchronize { yield }
     end
@@ -92,22 +98,22 @@ class DiscourseRedis
       @fallback_handler = DiscourseRedis::FallbackHandler.instance
     end
 
-    def resolve
+    def resolve(client = nil)
       if !@fallback_handler.master
-        @fallback_handler.verify_master unless @fallback_handler.running?
+        @fallback_handler.verify_master
         return @slave_options
       end
 
       begin
         options = @options.dup
         options.delete(:connector)
-        client = Redis::Client.new(options)
+        client ||= Redis::Client.new(options)
         loading = client.call([:info]).split("\r\n").include?("loading:1")
         loading ? @slave_options : @options
       rescue Redis::ConnectionError, Redis::CannotConnectError, RuntimeError => ex
         raise ex if ex.class == RuntimeError && ex.message != "Name or service not known"
         @fallback_handler.master = false
-        @fallback_handler.verify_master unless @fallback_handler.running?
+        @fallback_handler.verify_master
         raise ex
       ensure
         client.disconnect
@@ -125,12 +131,13 @@ class DiscourseRedis
   end
 
   def self.slave_config(options = config)
-    options.dup.merge!({ host: options[:slave_host], port: options[:slave_port] })
+    options.dup.merge!(host: options[:slave_host], port: options[:slave_port])
   end
 
-  def initialize(config=nil)
+  def initialize(config = nil, namespace: true)
     @config = config || DiscourseRedis.config
     @redis = DiscourseRedis.raw_connection(@config)
+    @namespace = namespace
   end
 
   def self.fallback_handler
@@ -146,12 +153,13 @@ 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
 
       fallback_handler.verify_master if !fallback_handler.master
       Discourse.received_readonly!
+      nil
     else
       raise ex
     end
@@ -174,31 +182,37 @@ class DiscourseRedis
    :msetnx, :persist, :pexpire, :pexpireat, :psetex, :pttl, :rename, :renamenx, :rpop, :rpoplpush, :rpush, :rpushx, :sadd, :scard,
    :sdiff, :set, :setbit, :setex, :setnx, :setrange, :sinter, :sismember, :smembers, :sort, :spop, :srandmember, :srem, :strlen,
    :sunion, :ttl, :type, :watch, :zadd, :zcard, :zcount, :zincrby, :zrange, :zrangebyscore, :zrank, :zrem, :zremrangebyrank,
-   :zremrangebyscore, :zrevrange, :zrevrangebyscore, :zrevrank, :zrangebyscore].each do |m|
+   :zremrangebyscore, :zrevrange, :zrevrangebyscore, :zrevrank, :zrangebyscore ].each do |m|
     define_method m do |*args|
-      args[0] = "#{namespace}:#{args[0]}"
+      args[0] = "#{namespace}:#{args[0]}" if @namespace
       DiscourseRedis.ignore_readonly { @redis.send(m, *args) }
     end
   end
 
   def mget(*args)
-    args.map!{|a| "#{namespace}:#{a}"}
+    args.map! { |a| "#{namespace}:#{a}" }  if @namespace
     DiscourseRedis.ignore_readonly { @redis.mget(*args) }
   end
 
   def del(k)
     DiscourseRedis.ignore_readonly do
-      k = "#{namespace}:#{k}"
+      k = "#{namespace}:#{k}"  if @namespace
       @redis.del k
     end
   end
 
-  def keys(pattern=nil)
+  def keys(pattern = nil)
     DiscourseRedis.ignore_readonly do
-      len = namespace.length + 1
-      @redis.keys("#{namespace}:#{pattern || '*'}").map{
-        |k| k[len..-1]
-      }
+      pattern = pattern || '*'
+      pattern = "#{namespace}:#{pattern}" if @namespace
+      keys = @redis.keys(pattern)
+
+      if @namespace
+        len = namespace.length + 1
+        keys.map! { |k| k[len..-1] }
+      end
+
+      keys
     end
   end
 
@@ -210,7 +224,7 @@ class DiscourseRedis
 
   def flushdb
     DiscourseRedis.ignore_readonly do
-      keys.each{|k| del(k)}
+      keys.each { |k| del(k) }
     end
   end
 
@@ -218,6 +232,14 @@ class DiscourseRedis
     @redis.client.reconnect
   end
 
+  def namespace_key(key)
+    if @namespace
+      "#{namespace}:#{key}"
+    else
+      key
+    end
+  end
+
   def namespace
     RailsMultisite::ConnectionManagement.current_db
   end
diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb
index 4d15f60612..0fcf8bda9b 100644
--- a/lib/discourse_tagging.rb
+++ b/lib/discourse_tagging.rb
@@ -3,7 +3,6 @@ module DiscourseTagging
   TAGS_FIELD_NAME = "tags"
   TAGS_FILTER_REGEXP = /[\/\?#\[\]@!\$&'\(\)\*\+,;=\.%\\`^\s|\{\}"<>]+/ # /?#[]@!$&'()*+,;=.%\`^|{}"<>
 
-
   def self.tag_topic_by_names(topic, guardian, tag_names_arg, append: false)
     if SiteSetting.tagging_enabled
       tag_names = DiscourseTagging.tags_for_saving(tag_names_arg, guardian) || []
@@ -33,11 +32,9 @@ module DiscourseTagging
 
         # guardian is explicitly nil cause we don't want to strip all
         # staff tags that already passed validation
-        tags = filter_allowed_tags(Tag.where(name: tag_names), nil, {
-          for_input: true,
-          category: category,
-          selected_tags: tag_names
-        }).to_a
+        tags = filter_allowed_tags(Tag.where(name: tag_names), nil,           for_input: true,
+                                                                              category: category,
+                                                                              selected_tags: tag_names).to_a
 
         if tags.size < tag_names.size && (category.nil? || category.tags.count == 0)
           tag_names.each do |name|
@@ -51,7 +48,7 @@ module DiscourseTagging
       else
         topic.tags = []
       end
-      topic.tags_changed=true
+      topic.tags_changed = true
     end
     true
   end
@@ -61,12 +58,11 @@ module DiscourseTagging
   #   category: a Category to which the object being tagged belongs
   #   for_input: result is for an input field, so only show permitted tags
   #   selected_tags: an array of tag names that are in the current selection
-  def self.filter_allowed_tags(query, guardian, opts={})
+  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
 
@@ -125,9 +121,9 @@ module DiscourseTagging
       else
         # One tag per group restriction
         exclude_group_ids = TagGroup.where(one_per_topic: true)
-                                    .joins(:tag_group_memberships)
-                                    .where('tag_group_memberships.tag_id in (?)', selected_tag_ids)
-                                    .pluck(:id)
+          .joins(:tag_group_memberships)
+          .where('tag_group_memberships.tag_id in (?)', selected_tag_ids)
+          .pluck(:id)
 
         if exclude_group_ids.empty?
           sql = "tags.id NOT IN (#{select_sql} WHERE tg.parent_tag_id NOT IN (?))"
@@ -136,9 +132,9 @@ module DiscourseTagging
           # It's possible that the selected tags violate some one-tag-per-group restrictions,
           # so filter them out by picking one from each group.
           limit_tag_ids = TagGroupMembership.select('distinct on (tag_group_id) tag_id')
-                                            .where(tag_id: selected_tag_ids)
-                                            .where(tag_group_id: exclude_group_ids)
-                                            .map(&:tag_id)
+            .where(tag_id: selected_tag_ids)
+            .where(tag_group_id: exclude_group_ids)
+            .map(&:tag_id)
           sql = "(tags.id NOT IN (#{select_sql} WHERE (tg.parent_tag_id NOT IN (?) OR tg.id in (?))) OR tags.id IN (?))"
           query = query.where(sql, selected_tag_ids, exclude_group_ids, limit_tag_ids)
         end
@@ -150,8 +146,8 @@ module DiscourseTagging
 
   def self.clean_tag(tag)
     tag.downcase.strip
-       .gsub(/\s+/, '-').squeeze('-')
-       .gsub(TAGS_FILTER_REGEXP, '')[0...SiteSetting.max_tag_length]
+      .gsub(/\s+/, '-').squeeze('-')
+      .gsub(TAGS_FILTER_REGEXP, '')[0...SiteSetting.max_tag_length]
   end
 
   def self.staff_only_tags(tags)
@@ -165,7 +161,7 @@ module DiscourseTagging
     tag_diff.present? ? tag_diff : nil
   end
 
-  def self.tags_for_saving(tags_arg, guardian, opts={})
+  def self.tags_for_saving(tags_arg, guardian, opts = {})
 
     return [] unless guardian.can_tag_topics? && tags_arg.present?
 
@@ -180,7 +176,7 @@ module DiscourseTagging
     return opts[:unlimited] ? tag_names : tag_names[0...SiteSetting.max_tags_per_topic]
   end
 
-  def self.add_or_create_tags_by_name(taggable, tag_names_arg, opts={})
+  def self.add_or_create_tags_by_name(taggable, tag_names_arg, opts = {})
     tag_names = DiscourseTagging.tags_for_saving(tag_names_arg, Guardian.new(Discourse.system_user), opts) || []
     if taggable.tags.pluck(:name).sort != tag_names.sort
       taggable.tags = Tag.where(name: tag_names).all
diff --git a/lib/discourse_updates.rb b/lib/discourse_updates.rb
index 3e2f14c682..782a03ab0b 100644
--- a/lib/discourse_updates.rb
+++ b/lib/discourse_updates.rb
@@ -3,47 +3,52 @@ module DiscourseUpdates
   class << self
 
     def check_version
-      version_info = if updated_at.nil?
-        DiscourseVersionCheck.new(
-          installed_version: Discourse::VERSION::STRING,
-          installed_sha: (Discourse.git_version == 'unknown' ? nil : Discourse.git_version),
-          installed_describe: `git describe --dirty --match "v[0-9]*"`,
-          git_branch: Discourse.git_branch,
-          updated_at: nil
-        )
-      else
-        DiscourseVersionCheck.new(
+      attrs = {
+        installed_version: Discourse::VERSION::STRING,
+        installed_sha: (Discourse.git_version == 'unknown' ? nil : Discourse.git_version),
+        installed_describe: Discourse.full_version,
+        git_branch: Discourse.git_branch,
+        updated_at: updated_at,
+      }
+
+      unless updated_at.nil?
+        attrs.merge!(
           latest_version: latest_version,
           critical_updates: critical_updates_available?,
-          installed_version: Discourse::VERSION::STRING,
-          installed_sha: (Discourse.git_version == 'unknown' ? nil : Discourse.git_version),
-          installed_describe: `git describe --dirty --match "v[0-9]*"`,
-          missing_versions_count: missing_versions_count,
-          git_branch: Discourse.git_branch,
-          updated_at: updated_at
+          missing_versions_count: missing_versions_count
         )
       end
 
+      version_info = DiscourseVersionCheck.new(attrs)
+
       # replace -commit_count with +commit_count
       if version_info.installed_describe =~ /-(\d+)-/
         version_info.installed_describe = version_info.installed_describe.gsub(/-(\d+)-.*/, " +#{$1}")
       end
 
       if SiteSetting.version_checks?
+        is_stale_data =
+          (version_info.missing_versions_count == 0 && version_info.latest_version != version_info.installed_version) ||
+          (version_info.missing_versions_count != 0 && version_info.latest_version == version_info.installed_version)
 
         # Handle cases when version check data is old so we report something that makes sense
+        if version_info.updated_at.nil? || # never performed a version check
+           last_installed_version != Discourse::VERSION::STRING || # upgraded since the last version check
+           is_stale_data
 
-        if (version_info.updated_at.nil? or  # never performed a version check
-            last_installed_version != Discourse::VERSION::STRING or  # upgraded since the last version check
-            (version_info.missing_versions_count == 0 and version_info.latest_version != version_info.installed_version) or  # old data
-            (version_info.missing_versions_count != 0 and version_info.latest_version == version_info.installed_version))    # old data
           Jobs.enqueue(:version_check, all_sites: true)
           version_info.version_check_pending = true
+
           unless version_info.updated_at.nil?
             version_info.missing_versions_count = 0
             version_info.critical_updates = false
           end
         end
+
+        version_info.stale_data =
+          version_info.version_check_pending ||
+          (updated_at && updated_at < 48.hours.ago) ||
+          is_stale_data
       end
 
       version_info
@@ -92,7 +97,7 @@ module DiscourseUpdates
       if versions.present?
         # store the list in redis
         version_keys = []
-        versions[0,5].each do |v|
+        versions[0, 5].each do |v|
           key = "#{missing_versions_key_prefix}:#{v['version']}"
           $redis.mapped_hmset key, v
           version_keys << key
@@ -108,7 +113,6 @@ module DiscourseUpdates
       keys.present? ? keys.map { |k| $redis.hgetall(k) } : []
     end
 
-
     private
 
       def last_installed_version_key
diff --git a/lib/distributed_cache.rb b/lib/distributed_cache.rb
index 3175332036..2c454526db 100644
--- a/lib/distributed_cache.rb
+++ b/lib/distributed_cache.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Like a hash, just does its best to stay in sync across the farm
 # On boot all instances are blank, but they populate as various processes
 # fill it up
@@ -6,96 +8,108 @@ require 'weakref'
 require 'base64'
 
 class DistributedCache
-  @subscribers = []
-  @subscribed = false
-  @lock = Mutex.new
+
+  class Manager
+    CHANNEL_NAME ||= '/distributed_hash'.freeze
+
+    def initialize(message_bus = nil)
+      @subscribers = []
+      @subscribed = false
+      @lock = Mutex.new
+      @message_bus = message_bus || MessageBus
+    end
+
+    def subscribers
+      @subscribers
+    end
+
+    def process_message(message)
+      i = @subscribers.length - 1
+
+      payload = message.data
+
+      while i >= 0
+        begin
+          current = @subscribers[i]
+
+          next if payload["origin"] == current.identity && !Rails.env.test?
+          next if current.key != payload["hash_key"]
+          next if payload["discourse_version"] != Discourse.git_version
+
+          hash = current.hash(message.site_id)
+
+          case payload["op"]
+          when "set" then hash[payload["key"]] = payload["marshalled"] ? Marshal.load(Base64.decode64(payload["value"])) : payload["value"]
+          when "delete" then hash.delete(payload["key"])
+          when "clear"  then hash.clear
+          end
+
+        rescue WeakRef::RefError
+          @subscribers.delete_at(i)
+        ensure
+          i -= 1
+        end
+      end
+    end
+
+    def ensure_subscribe!
+      return if @subscribed
+      @lock.synchronize do
+        return if @subscribed
+        @message_bus.subscribe(CHANNEL_NAME) do |message|
+          @lock.synchronize do
+            process_message(message)
+          end
+        end
+        @subscribed = true
+      end
+    end
+
+    def publish(hash, message)
+      message[:origin] = hash.identity
+      message[:hash_key] = hash.key
+      message[:discourse_version] = Discourse.git_version
+      @message_bus.publish(CHANNEL_NAME, message, user_ids: [-1])
+    end
+
+    def set(hash, key, value)
+      # special support for set
+      marshal = (Set === value || Hash === value)
+      value = Base64.encode64(Marshal.dump(value)) if marshal
+      publish(hash, op: :set, key: key, value: value, marshalled: marshal)
+    end
+
+    def delete(hash, key)
+      publish(hash, op: :delete, key: key)
+    end
+
+    def clear(hash)
+      publish(hash, op: :clear)
+    end
+
+    def register(hash)
+      @lock.synchronize do
+        @subscribers << WeakRef.new(hash)
+      end
+    end
+  end
+
+  @default_manager = Manager.new
+
+  def self.default_manager
+    @default_manager
+  end
 
   attr_reader :key
 
-  def self.subscribers
-    @subscribers
-  end
-
-  def self.process_message(message)
-    i = @subscribers.length-1
-
-    payload = message.data
-
-    while i >= 0
-      begin
-        current = @subscribers[i]
-
-        next if payload["origin"] == current.identity
-        next if current.key != payload["hash_key"]
-        next if payload["discourse_version"] != Discourse.git_version
-
-        hash = current.hash(message.site_id)
-
-        case payload["op"]
-          when "set" then hash[payload["key"]] = payload["marshalled"] ?  Marshal.load(Base64.decode64(payload["value"])) : payload["value"]
-          when "delete" then hash.delete(payload["key"])
-          when "clear"  then hash.clear
-        end
-
-      rescue WeakRef::RefError
-        @subscribers.delete_at(i)
-      ensure
-        i -= 1
-      end
-    end
-  end
-
-  def self.channel_name
-    "/distributed_hash".freeze
-  end
-
-  def self.ensure_subscribe!
-    return if @subscribed
-    @lock.synchronize do
-      return if @subscribed
-      MessageBus.subscribe(channel_name) do |message|
-        @lock.synchronize do
-          process_message(message)
-        end
-      end
-      @subscribed = true
-    end
-  end
-
-  def self.publish(hash, message)
-    message[:origin] = hash.identity
-    message[:hash_key] = hash.key
-    message[:discourse_version] = Discourse.git_version
-    MessageBus.publish(channel_name, message, { user_ids: [-1] })
-  end
-
-  def self.set(hash, key, value)
-    # special support for set
-    marshal = (Set === value || Hash === value)
-    value = Base64.encode64(Marshal.dump(value)) if marshal
-    publish(hash, { op: :set, key: key, value: value, marshalled: marshal })
-  end
-
-  def self.delete(hash, key)
-    publish(hash, { op: :delete, key: key })
-  end
-
-  def self.clear(hash)
-    publish(hash, { op: :clear })
-  end
-
-  def self.register(hash)
-    @lock.synchronize do
-      @subscribers << WeakRef.new(hash)
-    end
-  end
-
-  def initialize(key)
-    DistributedCache.ensure_subscribe!
-    DistributedCache.register(self)
-
+  def initialize(key, manager: nil, namespace: true)
     @key = key
     @data = {}
+    @manager = manager || DistributedCache.default_manager
+    @namespace = namespace
+
+    @manager.ensure_subscribe!
+    @manager.register(self)
   end
 
   def identity
@@ -103,9 +117,9 @@ class DistributedCache
     (@seed_id ||= SecureRandom.hex) + "#{Process.pid}"
   end
 
-  def []=(k,v)
+  def []=(k, v)
     k = k.to_s if Symbol === k
-    DistributedCache.set(self, k, v)
+    @manager.set(self, k, v)
     hash[k] = v
   end
 
@@ -114,19 +128,25 @@ class DistributedCache
     hash[k]
   end
 
-  def delete(k)
+  def delete(k, publish: true)
     k = k.to_s if Symbol === k
-    DistributedCache.delete(self, k)
+    @manager.delete(self, k) if publish
     hash.delete(k)
   end
 
   def clear
-    DistributedCache.clear(self)
+    @manager.clear(self)
     hash.clear
   end
 
   def hash(db = nil)
-    db ||= RailsMultisite::ConnectionManagement.current_db
+    db =
+      if @namespace
+        db || RailsMultisite::ConnectionManagement.current_db
+      else
+        RailsMultisite::ConnectionManagement::DEFAULT
+      end
+
     @data[db] ||= ThreadSafe::Hash.new
   end
 
diff --git a/lib/distributed_memoizer.rb b/lib/distributed_memoizer.rb
index c5e7031d37..e80b687923 100644
--- a/lib/distributed_memoizer.rb
+++ b/lib/distributed_memoizer.rb
@@ -19,7 +19,7 @@ class DistributedMemoizer
       begin
         while Time.new < start + MAX_WAIT && !got_lock
           LOCK.synchronize do
-            got_lock = get_lock(redis,redis_lock_key)
+            got_lock = get_lock(redis, redis_lock_key)
           end
           sleep 0.001
         end
@@ -38,7 +38,6 @@ class DistributedMemoizer
     result
   end
 
-
   def self.redis_lock_key(key)
     "memoize_lock_" << key
   end
diff --git a/lib/distributed_mutex.rb b/lib/distributed_mutex.rb
index 6a0e0af8cd..b014a554a3 100644
--- a/lib/distributed_mutex.rb
+++ b/lib/distributed_mutex.rb
@@ -1,11 +1,11 @@
 # Cross-process locking using Redis.
 class DistributedMutex
 
-  def self.synchronize(key, redis=nil, &blk)
+  def self.synchronize(key, redis = nil, &blk)
     self.new(key, redis).synchronize(&blk)
   end
 
-  def initialize(key, redis=nil)
+  def initialize(key, redis = nil)
     @key = key
     @redis = redis || $redis
     @mutex = Mutex.new
diff --git a/lib/email/message_builder.rb b/lib/email/message_builder.rb
index ac3463a5d9..9bc9cfd5dd 100644
--- a/lib/email/message_builder.rb
+++ b/lib/email/message_builder.rb
@@ -17,7 +17,7 @@ module Email
   class MessageBuilder
     attr_reader :template_args
 
-    def initialize(to, opts=nil)
+    def initialize(to, opts = nil)
       @to = to
       @opts = opts || {}
 
@@ -30,7 +30,7 @@ module Email
       }.merge!(@opts)
 
       if @template_args[:url].present?
-        @template_args[:header_instructions] = I18n.t('user_notifications.header_instructions', @template_args)
+        @template_args[:header_instructions] ||= I18n.t('user_notifications.header_instructions', @template_args)
 
         if @opts[:include_respond_instructions] == false
           @template_args[:respond_instructions] = ''
@@ -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]}] " : '')
@@ -167,7 +166,6 @@ module Email
       result
     end
 
-
     protected
 
     def reply_key
@@ -196,11 +194,13 @@ module Email
 
       @reply_by_email_address = SiteSetting.reply_by_email_address.dup
       @reply_by_email_address.gsub!("%{reply_key}", reply_key)
-      @reply_by_email_address = if private_reply?
-                                  alias_email(@reply_by_email_address)
-                                else
-                                  site_alias_email(@reply_by_email_address)
-                                end
+
+      @reply_by_email_address =
+        if private_reply?
+          alias_email(@reply_by_email_address)
+        else
+          site_alias_email(@reply_by_email_address)
+        end
     end
 
     def alias_email(source)
diff --git a/lib/email/processor.rb b/lib/email/processor.rb
index 71c9b846f7..f212fef667 100644
--- a/lib/email/processor.rb
+++ b/lib/email/processor.rb
@@ -2,29 +2,29 @@ module Email
 
   class Processor
 
-    def initialize(mail, retry_on_rate_limit=true)
+    def initialize(mail, retry_on_rate_limit = true)
       @mail = mail
       @retry_on_rate_limit = retry_on_rate_limit
     end
 
-    def self.process!(mail, retry_on_rate_limit=true)
+    def self.process!(mail, retry_on_rate_limit = true)
       Email::Processor.new(mail, retry_on_rate_limit).process!
     end
 
     def process!
       begin
-        receiver = Email::Receiver.new(@mail)
-        receiver.process!
+        @receiver = Email::Receiver.new(@mail)
+        @receiver.process!
       rescue RateLimiter::LimitExceeded
         @retry_on_rate_limit ? Jobs.enqueue(:process_email, mail: @mail) : raise
       rescue Email::Receiver::BouncedEmailError => e
         # never reply to bounced emails
         log_email_process_failure(@mail, e)
-        set_incoming_email_rejection_message(receiver.incoming_email, I18n.t("emails.incoming.errors.bounced_email_error"))
+        set_incoming_email_rejection_message(@receiver.incoming_email, I18n.t("emails.incoming.errors.bounced_email_error"))
       rescue => e
         log_email_process_failure(@mail, e)
-        incoming_email = receiver.try(:incoming_email)
-        rejection_message = handle_failure(@mail, e, incoming_email)
+        incoming_email = @receiver.try(:incoming_email)
+        rejection_message = handle_failure(@mail, e)
         if rejection_message.present?
           set_incoming_email_rejection_message(incoming_email, rejection_message.body.to_s)
         end
@@ -33,25 +33,29 @@ module Email
 
     private
 
-    def handle_failure(mail_string, e, incoming_email)
+    def handle_failure(mail_string, e)
       message_template = case e
-        when Email::Receiver::EmptyEmailError             then :email_reject_empty
-        when Email::Receiver::NoBodyDetectedError         then :email_reject_empty
-        when Email::Receiver::UserNotFoundError           then :email_reject_user_not_found
-        when Email::Receiver::ScreenedEmailError          then :email_reject_screened_email
-        when Email::Receiver::AutoGeneratedEmailError     then :email_reject_auto_generated
-        when Email::Receiver::InactiveUserError           then :email_reject_inactive_user
-        when Email::Receiver::BlockedUserError            then :email_reject_blocked_user
-        when Email::Receiver::BadDestinationAddress       then :email_reject_bad_destination_address
-        when Email::Receiver::StrangersNotAllowedError    then :email_reject_strangers_not_allowed
-        when Email::Receiver::InsufficientTrustLevelError then :email_reject_insufficient_trust_level
-        when Email::Receiver::ReplyUserNotMatchingError   then :email_reject_reply_user_not_matching
-        when Email::Receiver::TopicNotFoundError          then :email_reject_topic_not_found
-        when Email::Receiver::TopicClosedError            then :email_reject_topic_closed
-        when Email::Receiver::InvalidPost                 then :email_reject_invalid_post
-        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
+                         when Email::Receiver::NoSenderDetectedError       then return nil
+                         when Email::Receiver::EmptyEmailError             then :email_reject_empty
+                         when Email::Receiver::NoBodyDetectedError         then :email_reject_empty
+                         when Email::Receiver::UserNotFoundError           then :email_reject_user_not_found
+                         when Email::Receiver::ScreenedEmailError          then :email_reject_screened_email
+                         when Email::Receiver::EmailNotAllowed             then :email_reject_not_allowed_email
+                         when Email::Receiver::AutoGeneratedEmailError     then :email_reject_auto_generated
+                         when Email::Receiver::InactiveUserError           then :email_reject_inactive_user
+                         when Email::Receiver::SilencedUserError           then :email_reject_silenced_user
+                         when Email::Receiver::BadDestinationAddress       then :email_reject_bad_destination_address
+                         when Email::Receiver::StrangersNotAllowedError    then :email_reject_strangers_not_allowed
+                         when Email::Receiver::InsufficientTrustLevelError then :email_reject_insufficient_trust_level
+                         when Email::Receiver::ReplyUserNotMatchingError   then :email_reject_reply_user_not_matching
+                         when Email::Receiver::TopicNotFoundError          then :email_reject_topic_not_found
+                         when Email::Receiver::TopicClosedError            then :email_reject_topic_closed
+                         when Email::Receiver::InvalidPost                 then :email_reject_invalid_post
+                         when Email::Receiver::UnsubscribeNotAllowed       then :email_reject_invalid_post
+                         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 +67,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 +88,15 @@ 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 false if @receiver.sent_to_mailinglist_mirror?
+      return true if type == :email_reject_unrecognized_error
+
       key = "rejection_email:#{email}:#{type}:#{Date.today}"
 
       if $redis.setnx(key, "1")
@@ -99,7 +108,7 @@ module Email
     end
 
     def set_incoming_email_rejection_message(incoming_email, message)
-      incoming_email.update_attributes!(rejection_message: message)
+      incoming_email.update_attributes!(rejection_message: message) if incoming_email
     end
 
     def log_email_process_failure(mail_string, exception)
diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb
index 75fb3e9bfc..1cf9754b25 100644
--- a/lib/email/receiver.rb
+++ b/lib/email/receiver.rb
@@ -2,6 +2,7 @@ require "digest"
 require_dependency "new_post_manager"
 require_dependency "post_action_creator"
 require_dependency "html_to_markdown"
+require_dependency "plain_text_to_markdown"
 require_dependency "upload_creator"
 
 module Email
@@ -9,6 +10,9 @@ module Email
   class Receiver
     include ActionView::Helpers::NumberHelper
 
+    # If you add a new error, you need to
+    #   * add it to Email::Processor#handle_failure()
+    #   * add text to server.en.yml (parent key: "emails.incoming.errors")
     class ProcessingError              < StandardError; end
     class EmptyEmailError              < ProcessingError; end
     class ScreenedEmailError           < ProcessingError; end
@@ -16,8 +20,9 @@ module Email
     class AutoGeneratedEmailError      < ProcessingError; end
     class BouncedEmailError            < ProcessingError; end
     class NoBodyDetectedError          < ProcessingError; end
+    class NoSenderDetectedError        < ProcessingError; end
     class InactiveUserError            < ProcessingError; end
-    class BlockedUserError             < ProcessingError; end
+    class SilencedUserError            < ProcessingError; end
     class BadDestinationAddress        < ProcessingError; end
     class StrangersNotAllowedError     < ProcessingError; end
     class InsufficientTrustLevelError  < ProcessingError; end
@@ -26,18 +31,26 @@ module Email
     class TopicClosedError             < ProcessingError; end
     class InvalidPost                  < ProcessingError; end
     class InvalidPostAction            < ProcessingError; end
+    class UnsubscribeNotAllowed        < ProcessingError; end
+    class EmailNotAllowed              < ProcessingError; end
 
     attr_reader :incoming_email
     attr_reader :raw_email
     attr_reader :mail
     attr_reader :message_id
 
-    def initialize(mail_string)
+    def self.formats
+      @formats ||= Enum.new(plaintext: 1,
+                            markdown: 2)
+    end
+
+    def initialize(mail_string, opts = {})
       raise EmptyEmailError if mail_string.blank?
-      @staged_users_created = 0
+      @staged_users = []
       @raw_email = try_to_encode(mail_string, "UTF-8") || try_to_encode(mail_string, "ISO-8859-1") || mail_string
       @mail = Mail.new(@raw_email)
       @message_id = @mail.message_id.presence || Digest::MD5.hexdigest(mail_string)
+      @opts = opts
     end
 
     def process!
@@ -49,7 +62,10 @@ module Email
           @incoming_email = create_incoming_email
           process_internal
         rescue => e
-          @incoming_email.update_columns(error: e.to_s) if @incoming_email
+          error = e.to_s
+          error = e.class.name if error.blank?
+          @incoming_email.update_columns(error: error) if @incoming_email
+          delete_staged_users
           raise
         end
       end
@@ -57,7 +73,7 @@ module Email
 
     def is_blacklisted?
       return false if SiteSetting.ignore_by_title.blank?
-      Regexp.new(SiteSetting.ignore_by_title) =~ @mail.subject
+      Regexp.new(SiteSetting.ignore_by_title, Regexp::IGNORECASE) =~ @mail.subject
     end
 
     def create_incoming_email
@@ -73,16 +89,16 @@ module Email
 
     def process_internal
       raise BouncedEmailError  if is_bounce?
+      raise NoSenderDetectedError if @from_email.blank?
       raise ScreenedEmailError if ScreenedEmail.should_block?(@from_email)
 
-      user = find_or_create_user(@from_email, @from_display_name)
+      user = find_user(@from_email)
 
-      raise UserNotFoundError if user.nil?
-
-      @incoming_email.update_columns(user_id: user.id)
-
-      raise InactiveUserError if !user.active && !user.staged
-      raise BlockedUserError  if user.blocked
+      if user.present?
+        log_and_validate_user(user)
+      else
+        raise UserNotFoundError unless SiteSetting.enable_staged_users
+      end
 
       body, elided = select_body
       body ||= ""
@@ -91,13 +107,26 @@ module Email
 
       if is_auto_generated?
         @incoming_email.update_columns(is_auto_generated: true)
-        raise AutoGeneratedEmailError if SiteSetting.block_auto_generated_emails?
+
+        if SiteSetting.block_auto_generated_emails? && !sent_to_mailinglist_mirror?
+          raise AutoGeneratedEmailError
+        end
       end
 
       if action = subscription_action_for(body, subject)
-        message = SubscriptionMailer.send(action, user)
-        Email::Sender.new(message, :subscription).send
-      elsif post = find_related_post
+        raise UnsubscribeNotAllowed if user.nil?
+        send_subscription_mail(action, user)
+        return
+      end
+
+      # Lets create a staged user if there isn't one yet. We will try to
+      # delete staged users in process!() if something bad happens.
+      if user.nil?
+        user = find_or_create_user(@from_email, @from_display_name)
+        log_and_validate_user(user)
+      end
+
+      if post = find_related_post
         create_reply(user: user,
                      raw: body,
                      elided: elided,
@@ -121,6 +150,13 @@ module Email
       end
     end
 
+    def log_and_validate_user(user)
+      @incoming_email.update_columns(user_id: user.id)
+
+      raise InactiveUserError if !user.active && !user.staged
+      raise SilencedUserError if user.silenced?
+    end
+
     def is_bounce?
       return false unless @mail.bounced? || verp
 
@@ -133,7 +169,7 @@ module Email
 
       email ||= @from_email
 
-      if @mail.error_status.present? && @mail.error_status.start_with?("4.")
+      if @mail.error_status.present? && Array.wrap(@mail.error_status).any? { |s| s.start_with?("4.") }
         Email::Receiver.update_bounce_score(email, SiteSetting.soft_bounce_score)
       else
         Email::Receiver.update_bounce_score(email, SiteSetting.hard_bounce_score)
@@ -153,7 +189,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
@@ -166,7 +202,7 @@ module Email
           elsif bounce_score >= SiteSetting.bounce_score_threshold
             # NOTE: we check bounce_score before sending emails, nothing to do
             # here other than log it happened.
-            reason = I18n.t("user.email.revoked", { email: user.email, date: user.user_stat.reset_bounce_score_after })
+            reason = I18n.t("user.email.revoked", email: user.email, date: user.user_stat.reset_bounce_score_after)
             StaffActionLogger.new(Discourse.system_user).log_revoke_email(user, reason)
           end
         end
@@ -188,19 +224,32 @@ module Email
     def select_body
       text = nil
       html = nil
+      text_content_type = nil
 
       if @mail.multipart?
         text = fix_charset(@mail.text_part)
         html = fix_charset(@mail.html_part)
+        text_content_type = @mail.text_part&.content_type
       elsif @mail.content_type.to_s["text/html"]
         html = fix_charset(@mail)
       else
         text = fix_charset(@mail)
+        text_content_type = @mail.content_type
       end
 
-      text, elided_text = if text.present?
+      if text.present?
         text = trim_discourse_markers(text)
-        EmailReplyTrimmer.trim(text, true)
+        text, elided_text = EmailReplyTrimmer.trim(text, true)
+
+        if @opts[:convert_plaintext] || sent_to_mailinglist_mirror?
+          text_content_type ||= ""
+          converter_opts = {
+            format_flowed: !!(text_content_type =~ /format\s*=\s*["']?flowed["']?/i),
+            delete_flowed_space: !!(text_content_type =~ /DelSp\s*=\s*["']?yes["']?/i)
+          }
+          text = PlainTextToMarkdown.new(text, converter_opts).to_markdown
+          elided_text = PlainTextToMarkdown.new(elided_text, converter_opts).to_markdown
+        end
       end
 
       markdown, elided_markdown = if html.present?
@@ -210,9 +259,9 @@ module Email
       end
 
       if text.blank? || (SiteSetting.incoming_email_prefer_html && markdown.present?)
-        return [markdown, elided_markdown]
+        return [markdown, elided_markdown, Receiver::formats[:markdown]]
       else
-        return [text, elided_text]
+        return [text, elided_text, Receiver::formats[:plaintext]]
       end
     end
 
@@ -271,14 +320,29 @@ module Email
         end
       end
 
-      if mail.from[/<[^>]+>/]
-        from_address = mail.from[/<([^>]+)>/, 1]
-        from_display_name = mail.from[/^([^<]+)/, 1]
+      return extract_from_address_and_name(mail.from) if mail.from.is_a? String
+
+      if mail.from.is_a? Mail::AddressContainer
+        mail.from.each do |from|
+          from_address, from_display_name = extract_from_address_and_name(from)
+          return [from_address, from_display_name] if from_address
+        end
       end
 
-      if (from_address.blank? || !from_address["@"]) && mail.from[/\[mailto:[^\]]+\]/]
-        from_address = mail.from[/\[mailto:([^\]]+)\]/, 1]
-        from_display_name = mail.from[/^([^\[]+)/, 1]
+      nil
+    rescue StandardError
+      nil
+    end
+
+    def extract_from_address_and_name(value)
+      if value[/<[^>]+>/]
+        from_address = value[/<([^>]+)>/, 1]
+        from_display_name = value[/^([^<]+)/, 1]
+      end
+
+      if (from_address.blank? || !from_address["@"]) && value[/\[mailto:[^\]]+\]/]
+        from_address = value[/\[mailto:([^\]]+)\]/, 1]
+        from_display_name = value[/^([^\[]+)/, 1]
       end
 
       [from_address&.downcase, from_display_name&.strip]
@@ -288,14 +352,20 @@ module Email
       @suject ||= @mail.subject.presence || I18n.t("emails.incoming.default_subject", email: @from_email)
     end
 
+    def find_user(email)
+      User.find_by_email(email)
+    end
+
     def find_or_create_user(email, display_name)
       user = nil
 
       User.transaction do
-        begin
-          user = User.find_by_email(email)
+        user = User.find_by_email(email)
 
-          if user.nil? && SiteSetting.enable_staged_users
+        if user.nil? && SiteSetting.enable_staged_users
+          raise EmailNotAllowed unless EmailValidator.allowed?(email)
+
+          begin
             username = UserNameSuggester.sanitize_username(display_name) if display_name.present?
             user = User.create!(
               email: email,
@@ -303,10 +373,10 @@ module Email
               name: display_name.presence || User.suggest_name(email),
               staged: true
             )
-            @staged_users_created += 1
+            @staged_users << user
+          rescue
+            user = nil
           end
-        rescue
-          user = nil
         end
       end
 
@@ -322,9 +392,20 @@ module Email
     end
 
     def destinations
-      all_destinations
+      @destinations ||= all_destinations
         .map { |d| Email::Receiver.check_address(d) }
-        .drop_while(&:blank?)
+        .reject(&:blank?)
+    end
+
+    def sent_to_mailinglist_mirror?
+      destinations.each do |destination|
+        next unless destination[:type] == :category
+
+        category = destination[:obj]
+        return true if category.mailinglist_mirror?
+      end
+
+      false
     end
 
     def self.check_address(address)
@@ -346,6 +427,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 +455,7 @@ module Email
 
         create_topic(user: user,
                      raw: body,
+                     elided: elided,
                      title: subject,
                      category: category.id,
                      skip_validations: user.staged?)
@@ -380,7 +463,7 @@ module Email
       when :reply
         email_log = destination[:obj]
 
-        if email_log.user_id != user.id
+        if email_log.user_id != user.id && !forwareded_reply_key?(email_log, user)
           raise ReplyUserNotMatchingError, "email_log.user_id => #{email_log.user_id.inspect}, user.id => #{user.id.inspect}"
         end
 
@@ -393,6 +476,40 @@ module Email
       end
     end
 
+    def forwareded_reply_key?(email_log, user)
+      incoming_emails = IncomingEmail
+        .joins(:post)
+        .where('posts.topic_id = ?', email_log.topic_id)
+        .addressed_to(email_log.reply_key)
+        .addressed_to(user.email)
+
+      incoming_emails.each do |email|
+        next unless contains_email_address?(email.to_addresses, user.email) ||
+          contains_email_address?(email.cc_addresses, user.email)
+
+        return true if contains_reply_by_email_address(email.to_addresses, email_log.reply_key) ||
+          contains_reply_by_email_address(email.cc_addresses, email_log.reply_key)
+      end
+
+      false
+    end
+
+    def contains_email_address?(addresses, email)
+      return false if addresses.blank?
+      addresses.split(";").include?(email)
+    end
+
+    def contains_reply_by_email_address(addresses, reply_key)
+      return false if addresses.blank?
+
+      addresses.split(";").each do |address|
+        match = Email::Receiver.reply_by_email_address_regex.match(address)
+        return true if match && match.captures&.include?(reply_key)
+      end
+
+      false
+    end
+
     def has_been_forwarded?
       subject[/^[[:blank:]]*(fwd?|tr)[[:blank:]]?:/i] && embedded_email_raw.present?
     end
@@ -464,7 +581,7 @@ module Email
       true
     end
 
-    def self.reply_by_email_address_regex(extract_reply_key=true)
+    def self.reply_by_email_address_regex(extract_reply_key = true)
       reply_addresses = [SiteSetting.reply_by_email_address]
       reply_addresses << (SiteSetting.alternative_reply_by_email_addresses.presence || "").split("|")
 
@@ -485,6 +602,8 @@ module Email
     end
 
     def find_related_post
+      return if SiteSetting.find_related_post_with_key && !sent_to_mailinglist_mirror?
+
       message_ids = [@mail.in_reply_to, Email::Receiver.extract_references(@mail.references)]
       message_ids.flatten!
       message_ids.select!(&:present?)
@@ -534,11 +653,11 @@ module Email
       PostActionType.types[:like] if likes.include?(body.strip.downcase)
     end
 
-    def create_topic(options={})
+    def create_topic(options = {})
       create_post_with_attachments(options)
     end
 
-    def create_reply(options={})
+    def create_reply(options = {})
       raise TopicNotFoundError if options[:topic].nil? || options[:topic].trashed?
 
       if post_action_type = post_action_for(options[:raw])
@@ -568,28 +687,34 @@ module Email
       end
     end
 
-    def create_post_with_attachments(options={})
+    def create_post_with_attachments(options = {})
       # deal with attachments
+      options[:raw] = add_attachments(options[:raw], options[:user].id, options)
+
+      create_post(options)
+    end
+
+    def add_attachments(raw, user_id, options = {})
       attachments.each do |attachment|
         tmp = Tempfile.new(["discourse-email-attachment", File.extname(attachment.filename)])
         begin
           # 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] }
-          upload = UploadCreator.new(tmp, attachment.filename, opts).create_for(options[:user].id)
-          if upload && upload.errors.empty?
+          opts = { for_group_message: options[:is_group_message] }
+          upload = UploadCreator.new(tmp, attachment.filename, opts).create_for(user_id)
+          if upload&.valid?
             # try to inline images
-            if attachment.content_type.start_with?("image/")
-              if options[:raw][attachment.url]
-                options[:raw].sub!(attachment.url, upload.url)
-              elsif options[:raw][/\[image:.*?\d+[^\]]*\]/i]
-                options[:raw].sub!(/\[image:.*?\d+[^\]]*\]/i, attachment_markdown(upload))
+            if attachment.content_type&.start_with?("image/")
+              if raw[attachment.url]
+                raw.sub!(attachment.url, upload.url)
+              elsif raw[/\[image:.*?\d+[^\]]*\]/i]
+                raw.sub!(/\[image:.*?\d+[^\]]*\]/i, attachment_markdown(upload))
               else
-                options[:raw] << "\n\n#{attachment_markdown(upload)}\n\n"
+                raw << "\n\n#{attachment_markdown(upload)}\n\n"
               end
             else
-              options[:raw] << "\n\n#{attachment_markdown(upload)}\n\n"
+              raw << "\n\n#{attachment_markdown(upload)}\n\n"
             end
           end
         ensure
@@ -597,7 +722,7 @@ module Email
         end
       end
 
-      create_post(options)
+      raw
     end
 
     def attachment_markdown(upload)
@@ -608,7 +733,7 @@ module Email
       end
     end
 
-    def create_post(options={})
+    def create_post(options = {})
       options[:via_email] = true
       options[:raw_email] = @raw_email
 
@@ -618,7 +743,7 @@ module Email
         raise InvalidPost, "No post creation date found. Is the e-mail missing a Date: header?"
       end
 
-      options[:created_at]   = DateTime.now if options[:created_at] > DateTime.now
+      options[:created_at] = DateTime.now if options[:created_at] > DateTime.now
 
       is_private_message = options[:archetype] == Archetype.private_message ||
                            options[:topic].try(:private_message?)
@@ -636,7 +761,7 @@ module Email
       if result.post
         @incoming_email.update_columns(topic_id: result.post.topic_id, post_id: result.post.id)
         if result.post.topic && result.post.topic.private_message?
-          add_other_addresses(result.post.topic, user)
+          add_other_addresses(result.post, user)
         end
       end
 
@@ -645,13 +770,13 @@ module Email
 
     def self.elided_html(elided)
       html =  "\n\n" << "<details class='elided'>" << "\n"
-      html << "<summary title='#{I18n.t('emails.incoming.show_trimmed_content')}'>&#183;&#183;&#183;</summary>" << "\n"
-      html << elided << "\n"
+      html << "<summary title='#{I18n.t('emails.incoming.show_trimmed_content')}'>&#183;&#183;&#183;</summary>" << "\n\n"
+      html << elided << "\n\n"
       html << "</details>" << "\n"
       html
     end
 
-    def add_other_addresses(topic, sender)
+    def add_other_addresses(post, sender)
       %i(to cc bcc).each do |d|
         if @mail[d] && @mail[d].address_list && @mail[d].address_list.addresses
           @mail[d].address_list.addresses.each do |address_field|
@@ -662,18 +787,19 @@ module Email
               next unless email["@"]
               if should_invite?(email)
                 user = find_or_create_user(email, display_name)
-                if user && can_invite?(topic, user)
-                  topic.topic_allowed_users.create!(user_id: user.id)
-                  topic.add_small_action(sender, "invited_user", user.username)
+                if user && can_invite?(post.topic, user)
+                  post.topic.topic_allowed_users.create!(user_id: user.id)
+                  TopicUser.auto_notification_for_staging(user.id, post.topic_id, TopicUser.notification_reasons[:auto_watch])
+                  post.topic.add_small_action(sender, "invited_user", user.username)
                 end
                 # cap number of staged users created per email
-                if @staged_users_created > SiteSetting.maximum_staged_users_per_email
-                  topic.add_moderator_post(sender, I18n.t("emails.incoming.maximum_staged_user_per_email_reached"))
+                if @staged_users.count > SiteSetting.maximum_staged_users_per_email
+                  post.topic.add_moderator_post(sender, I18n.t("emails.incoming.maximum_staged_user_per_email_reached"))
                   return
                 end
               end
-            rescue ActiveRecord::RecordInvalid
-              # don't care if user already allowed
+            rescue ActiveRecord::RecordInvalid, EmailNotAllowed
+              # don't care if user already allowed or the user's email address is not allowed
             end
           end
         end
@@ -691,6 +817,22 @@ module Email
       !topic.topic_allowed_groups.where("group_id IN (SELECT group_id FROM group_users WHERE user_id = ?)", user.id).exists?
     end
 
+    def send_subscription_mail(action, user)
+      message = SubscriptionMailer.send(action, user)
+      Email::Sender.new(message, :subscription).send
+    end
+
+    def delete_staged_users
+      @staged_users.each do |user|
+        if @incoming_email.user.id == user.id
+          @incoming_email.update_columns(user_id: nil)
+        end
+
+        if user.posts.count == 0
+          UserDestroyer.new(Discourse.system_user).destroy(user, quiet: true)
+        end
+      end
+    end
   end
 
 end
diff --git a/lib/email/renderer.rb b/lib/email/renderer.rb
index 9b209781ff..be802b7a99 100644
--- a/lib/email/renderer.rb
+++ b/lib/email/renderer.rb
@@ -3,7 +3,7 @@ require_dependency 'email/styles'
 module Email
   class Renderer
 
-    def initialize(message, opts=nil)
+    def initialize(message, opts = nil)
       @message = message
       @opts = opts || {}
     end
diff --git a/lib/email/sender.rb b/lib/email/sender.rb
index 61c5fc1685..08e141a923 100644
--- a/lib/email/sender.rb
+++ b/lib/email/sender.rb
@@ -15,7 +15,7 @@ SMTP_CLIENT_ERRORS = [Net::SMTPFatalError, Net::SMTPSyntaxError]
 module Email
   class Sender
 
-    def initialize(message, email_type, user=nil)
+    def initialize(message, email_type, user = nil)
       @message =  message
       @email_type = email_type
       @user = user
@@ -55,8 +55,8 @@ module Email
       # These are the links we add when a user uploads a file or image.
       # Ideally we would parse general markdown into plain text, but that is almost an intractable problem.
       url_prefix = Discourse.base_url
-      @message.parts[0].body = @message.parts[0].body.to_s.gsub(/<a class="attachment" href="(\/uploads\/default\/[^"]+)">([^<]*)<\/a>/, '[\2]('+url_prefix+'\1)')
-      @message.parts[0].body = @message.parts[0].body.to_s.gsub(/<img src="(\/uploads\/default\/[^"]+)"([^>]*)>/, '![]('+url_prefix+'\1)')
+      @message.parts[0].body = @message.parts[0].body.to_s.gsub(/<a class="attachment" href="(\/uploads\/default\/[^"]+)">([^<]*)<\/a>/, '[\2](' + url_prefix + '\1)')
+      @message.parts[0].body = @message.parts[0].body.to_s.gsub(/<img src="(\/uploads\/default\/[^"]+)"([^>]*)>/, '![](' + url_prefix + '\1)')
 
       @message.text_part.content_type = 'text/plain; charset=UTF-8'
 
@@ -88,8 +88,8 @@ module Email
           "<topic/#{topic_id}/#{post_id}@#{host}>"
 
         referenced_posts = Post.includes(:incoming_email)
-                               .where(id: PostReply.where(reply_id: post_id).select(:post_id))
-                               .order(id: :desc)
+          .where(id: PostReply.where(reply_id: post_id).select(:post_id))
+          .order(id: :desc)
 
         referenced_post_message_ids = referenced_posts.map do |post|
           if post.incoming_email&.message_id.present?
@@ -165,9 +165,9 @@ module Email
       when /\.mailjet\.com/
         @message.header['X-MJ-CustomID'] = @message.message_id
       when "smtp.mandrillapp.com"
-        merge_json_x_header('X-MC-Metadata', { message_id: @message.message_id })
+        merge_json_x_header('X-MC-Metadata', message_id: @message.message_id)
       when "smtp.sparkpostmail.com"
-        merge_json_x_header('X-MSYS-API', { metadata: { message_id: @message.message_id } })
+        merge_json_x_header('X-MSYS-API', metadata: { message_id: @message.message_id })
       end
 
       # Suppress images from short emails
diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index eb3074f5b8..8fc9677b7a 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -10,7 +10,7 @@ module Email
 
     delegate :css, to: :fragment
 
-    def initialize(html, opts=nil)
+    def initialize(html, opts = nil)
       @html = html
       @opts = opts || {}
       @fragment = Nokogiri::HTML.fragment(@html)
@@ -41,7 +41,7 @@ module Email
           img['width'] = img['height'] = 20
         else
           # use dimensions of original iPhone screen for 'too big, let device rescale'
-          if img['width'].to_i > 320 or img['height'].to_i > 480
+          if img['width'].to_i > (320) || img['height'].to_i > (480)
             img['width'] = img['height'] = 'auto'
           end
         end
@@ -113,6 +113,7 @@ module Email
 
       # Oneboxes
       style('aside.onebox', "border: 5px solid #e9e9e9; padding: 12px 25px 12px 12px;")
+      style('aside.onebox header img.site-icon', "width: 16px; height: 16px; margin-right: 3px;")
       style('aside.onebox header a[href]', "color: #222222; text-decoration: none;")
       style('aside.onebox .onebox-body', "clear: both")
       style('aside.onebox .onebox-body img', "max-height: 80%; max-width: 20%; height: auto; float: left; margin-right: 10px;")
@@ -191,8 +192,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
 
@@ -244,7 +247,7 @@ module Email
         linknum = 0
         element.css('a').each do |inner|
           # we want the first footer link to be specially highlighted as IMPORTANT
-          if footernum == 0 and linknum == 0
+          if footernum == (0) && linknum == (0)
             inner['style'] = "background-color: #006699; color:#ffffff; border-top: 4px solid #006699; border-right: 6px solid #006699; border-bottom: 4px solid #006699; border-left: 6px solid #006699; display: inline-block;"
           else
             inner['style'] = "color:#666;"
@@ -269,7 +272,7 @@ module Email
     def style(selector, style, attribs = {})
       @fragment.css(selector).each do |element|
         add_styles(element, style) if style
-        attribs.each do |k,v|
+        attribs.each do |k, v|
           element[k] = v
         end
       end
diff --git a/lib/email_cook.rb b/lib/email_cook.rb
index f440be6389..7a5056167d 100644
--- a/lib/email_cook.rb
+++ b/lib/email_cook.rb
@@ -1,13 +1,19 @@
-# A very simple formatter for imported emails
+require_dependency 'pretty_text'
 
+# A very simple formatter for imported emails
 class EmailCook
 
   def self.url_regexp
-    /((?:https?:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.])(?:[^\s()<>]+|\([^\s()<>]+\))+(?:\([^\s()<>]+\)|[^`!()\[\]{};:'".,<>?«»“”‘’\s]))/
+    @url_regexp ||= /((?:https?:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.])(?:[^\s()<>]+|\([^\s()<>]+\))+(?:\([^\s()<>]+\)|[^`!()\[\]{};:'".,<>?«»“”‘’\s]))/
+  end
+
+  def self.raw_regexp
+    @raw_regexp ||= /^\[plaintext\]$\n(.*)\n^\[\/plaintext\]$(?:\s^\[attachments\]$\n(.*)\n^\[\/attachments\]$)?(?:\s^\[elided\]$\n(.*)\n^\[\/elided\]$)?/m
   end
 
   def initialize(raw)
     @raw = raw
+    @body, @attachment_html, @elided = @raw.scan(EmailCook.raw_regexp).first
   end
 
   def add_quote(result, buffer)
@@ -17,54 +23,64 @@ class EmailCook
     end
   end
 
-  def link_string!(str)
-    str.scan(EmailCook.url_regexp).each do |m|
+  def link_string!(line, unescaped_line)
+    unescaped_line = unescaped_line.strip
+    unescaped_line.scan(EmailCook.url_regexp).each do |m|
       url = m[0]
 
-      val = "<a href='#{url}'>#{url}</a>"
-
-      # Onebox consideration
-      if str.strip == url
-        oneboxed = Oneboxer.onebox(url)
-        val = oneboxed if oneboxed.present?
+      if unescaped_line == url
+        # this could be oneboxed
+        val = %|<a href="#{url}" class="onebox" target="_blank">#{url}</a>|
+      else
+        val = %|<a href="#{url}">#{url}</a>|
       end
 
-      str.gsub!(url, val)
+      line.gsub!(url, val)
     end
   end
 
-  def cook
+  def htmlify(text)
     result = ""
 
     in_text = false
     in_quote = false
 
     quote_buffer = ""
-    @raw.each_line do |l|
+    text.each_line do |line|
+      # replace indentation with non-breaking spaces
+      line.sub!(/^\s{2,}/) { |s| "\u00A0" * s.length }
 
-      if l =~ /^\s*>/
+      if line =~ /^\s*>/
         in_quote = true
-        link_string!(l)
-        quote_buffer << l.sub(/^[\s>]*/, '') << "<br>"
+        line.sub!(/^[\s>]*/, '')
+
+        unescaped_line = line
+        line = CGI.escapeHTML(line)
+        link_string!(line, unescaped_line)
+
+        quote_buffer << line << "<br>"
       elsif in_quote
         add_quote(result, quote_buffer)
         quote_buffer = ""
         in_quote = false
       else
 
-        sz = l.size
+        sz = line.size
 
-        link_string!(l)
-
-        result << l
+        unescaped_line = line
+        line = CGI.escapeHTML(line)
+        link_string!(line, unescaped_line)
 
         if sz < 60
-          result << "<br>"
-          if in_text
+          if in_text && line == "\n"
             result << "<br>"
           end
+          result << line
+          result << "<br>"
+
           in_text = false
         else
+          result << line
           in_text = true
         end
       end
@@ -78,4 +94,14 @@ class EmailCook
     result
   end
 
+  def cook(opts = {})
+    # fallback to PrettyText if we failed to detect a body
+    return PrettyText.cook(@raw, opts) if @body.nil?
+
+    result =  htmlify(@body)
+    result << "\n<br>" << @attachment_html if @attachment_html.present?
+    result << "\n<br><br>" << Email::Receiver.elided_html(htmlify(@elided)) if @elided.present?
+    result
+  end
+
 end
diff --git a/lib/email_updater.rb b/lib/email_updater.rb
index ab4c8246a2..e8515b8645 100644
--- a/lib/email_updater.rb
+++ b/lib/email_updater.rb
@@ -7,12 +7,12 @@ class EmailUpdater
 
   attr_reader :user
 
-  def initialize(guardian=nil, user=nil)
+  def initialize(guardian = nil, user = nil)
     @guardian = guardian
     @user = user
   end
 
-  def self.human_attribute_name(name, options={})
+  def self.human_attribute_name(name, options = {})
     User.human_attribute_name(name, options)
   end
 
@@ -27,12 +27,16 @@ class EmailUpdater
     EmailValidator.new(attributes: :email).validate_each(self, :email, email)
 
     if existing_user = User.find_by_email(email)
-      error_message = 'change_email.error'
-      error_message << '_staged' if existing_user.staged?
-      errors.add(:base, I18n.t(error_message))
+      if SiteSetting.hide_email_address_taken
+        Jobs.enqueue(:critical_user_email, type: :account_exists, user_id: existing_user.id)
+      else
+        error_message = 'change_email.error'
+        error_message << '_staged' if existing_user.staged?
+        errors.add(:base, I18n.t(error_message))
+      end
     end
 
-    if errors.blank?
+    if errors.blank? && existing_user.nil?
       args = {
         old_email: @user.email,
         new_email: email,
@@ -68,8 +72,8 @@ class EmailUpdater
         @user = token.user
 
         change_req = user.email_change_requests
-                          .where('old_email_token_id = :token_id OR new_email_token_id = :token_id', { token_id: token.id})
-                          .first
+          .where('old_email_token_id = :token_id OR new_email_token_id = :token_id', token_id: token.id)
+          .first
 
         # Simple state machine
         case change_req.try(:change_state)
@@ -81,7 +85,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!(email: token.email)
           confirm_result = :complete
         end
       else
diff --git a/lib/emoji/db.json b/lib/emoji/db.json
index 0ae88e7309..b5835bf3af 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-200d-2642-fe0f",
+      "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,5241 @@
     },
     {
       "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",
+    "child",
+    "adult",
+    "older_adult",
+    "woman_with_headscarf",
+    "bearded_person",
+    "breast_feeding",
+    "mage",
+    "fairy",
+    "vampire",
+    "merperson",
+    "elf",
+    "person_in_steamy_room",
+    "person_climbing",
+    "person_in_lotus_position",
+    "love_you_gesture",
+    "palms_up_together"
+  ],
   "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 +6188,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 +6202,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 +6250,8 @@
     "fr": [
       "flag_fr"
     ],
-    "gb": [
+    "uk": [
+      "gb",
       "flag_gb"
     ],
     "it": [
@@ -4318,101 +6269,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 +6353,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 +6374,6 @@
       "hankey",
       "poo"
     ],
-    "projector": [
-      "film_projector"
-    ],
-    "race_car": [
-      "racing_car"
-    ],
     "radioactive": [
       "radioactive_sign"
     ],
@@ -4464,80 +6383,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 0000000000..5b313dfc11
--- /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": true
+      },
+      {
+        "name": "boy",
+        "diversity": true
+      },
+      {
+        "name": "girl",
+        "diversity": true
+      },
+      {
+        "name": "adult",
+        "diversity": true
+      },
+      {
+        "name": "man",
+        "diversity": true
+      },
+      {
+        "name": "woman",
+        "diversity": true
+      },
+      {
+        "name": "older_adult",
+        "diversity": true
+      },
+      {
+        "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": true
+      },
+      {
+        "name": "bearded_person",
+        "diversity": true
+      },
+      {
+        "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": true
+      },
+      {
+        "name": "angel",
+        "diversity": true
+      },
+      {
+        "name": "santa",
+        "diversity": true
+      },
+      {
+        "name": "mrs_claus",
+        "diversity": true
+      },
+      {
+        "name": "mage",
+        "diversity": true
+      },
+      {
+        "name": "fairy",
+        "diversity": true
+      },
+      {
+        "name": "vampire",
+        "diversity": true
+      },
+      {
+        "name": "merperson",
+        "diversity": true
+      },
+      {
+        "name": "elf",
+        "diversity": true
+      },
+      {
+        "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": true
+      },
+      {
+        "name": "writing_hand",
+        "diversity": true
+      },
+      {
+        "name": "clap",
+        "diversity": true
+      },
+      {
+        "name": "open_hands",
+        "diversity": true
+      },
+      {
+        "name": "raised_hands",
+        "diversity": true
+      },
+      {
+        "name": "palms_up_together",
+        "diversity": true
+      },
+      {
+        "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": true
+      },
+      {
+        "name": "person_climbing",
+        "diversity": true
+      },
+      {
+        "name": "person_in_lotus_position",
+        "diversity": true
+      },
+      {
+        "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 dfb91bc439..0000000000
--- 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 f093a0a30e..704a95f1f9 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
@@ -15,7 +14,7 @@ module Tilt
       source = input[:data]
       context = input[:environment].context_class.new(input)
 
-      result = new(filename){source}.render(context)
+      result = new(filename) { source }.render(context)
       context.metadata.merge(data: result)
     end
 
@@ -27,22 +26,29 @@ 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(File.read(Ember::Source.bundled_path_for('ember-template-compiler.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.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
       console = {
         prefix: "",
         log: function(msg){ rails.logger.info(console.prefix + msg); },
         error: function(msg){ rails.logger.error(console.prefix + msg); }
       }
+
 JS
+      source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
+      js_source = ::JSON.generate(source, quirks_mode: true)
+      js = ctx.eval("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'] }).code")
+      ctx.eval(js)
+
       ctx
     end
 
     def self.reset_context
+      @ctx&.dispose
       @ctx = nil
     end
 
@@ -106,12 +112,12 @@ 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),
+          filename: logical_path
+        )
+        @output = klass.v8.eval(transpiled)
       end
     end
 
@@ -121,7 +127,14 @@ JS
       klass = self.class
       klass.protect do
         klass.v8.eval("console.prefix = 'BABEL: #{scope.logical_path}: ';")
-        @output = klass.v8.eval(generate_source(scope))
+
+        source = babel_source(
+          data,
+          module_name: module_name(scope.root_path, scope.logical_path),
+          filename: scope.logical_path
+        )
+
+        @output = klass.v8.eval(source)
       end
 
       # For backwards compatibility with plugins, for now export the Global format too.
@@ -160,18 +173,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]
+        filename = opts[:filename] || 'unknown'
+        "Babel.transform(#{js_source}, { moduleId: '#{opts[:module_name]}', filename: '#{filename}', ast: false, presets: ['es2015'], plugins: [['transform-es2015-modules-amd', {noInterop: true}], 'transform-decorators-legacy', exports.WidgetHbsCompiler] }).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', exports.WidgetHbsCompiler] }).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
 
@@ -180,7 +196,7 @@ JS
       if root_path =~ /(.*\/#{root_base}\/plugins\/[^\/]+)\//
         plugin_path = "#{Regexp.last_match[1]}/plugin.rb"
 
-        plugin = Discourse.plugins.find {|p| p.path == plugin_path }
+        plugin = Discourse.plugins.find { |p| p.path == plugin_path }
         path = "discourse/plugins/#{plugin.name}/#{logical_path.sub(/javascripts\//, '')}" if plugin
       end
 
diff --git a/lib/excerpt_parser.rb b/lib/excerpt_parser.rb
index b6547b59bb..0e3f824679 100644
--- a/lib/excerpt_parser.rb
+++ b/lib/excerpt_parser.rb
@@ -4,12 +4,13 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
 
   SPAN_REGEX = /<\s*span[^>]*class\s*=\s*['|"]excerpt['|"][^>]*>/
 
-  def initialize(length, options=nil)
+  def initialize(length, options = nil)
     @length = length
     @excerpt = ""
     @current_length = 0
     options || {}
     @strip_links = options[:strip_links] == true
+    @strip_images = options[:strip_images] == true
     @text_entities = options[:text_entities] == true
     @markdown_images = options[:markdown_images] == true
     @keep_newlines = options[:keep_newlines] == true
@@ -17,6 +18,8 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
     @keep_onebox_source = options[:keep_onebox_source] == true
     @remap_emoji = options[:remap_emoji] == true
     @start_excerpt = false
+    @summary_contents = ""
+    @detail_contents = ""
   end
 
   def self.get_excerpt(html, length, options)
@@ -45,26 +48,27 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
   end
 
   def include_tag(name, attributes)
-    characters("<#{name} #{attributes.map{|k,v| "#{k}=\"#{escape_attribute(v)}\""}.join(' ')}>", false, false, false)
+    characters("<#{name} #{attributes.map { |k, v| "#{k}=\"#{escape_attribute(v)}\"" }.join(' ')}>", false, false, false)
   end
 
-  def start_element(name, attributes=[])
+  def start_element(name, attributes = [])
     case name
-      when "img"
-        attributes = Hash[*attributes.flatten]
+    when "img"
+      attributes = Hash[*attributes.flatten]
 
-        if attributes["class"] == 'emoji'
-          if @remap_emoji
-            title = (attributes["alt"] || "").gsub(":", "")
-            title = Emoji.lookup_unicode(title) || attributes["alt"]
-            return characters(title)
-          elsif @keep_emoji_images
-            return include_tag(name, attributes)
-          else
-            return characters(attributes["alt"])
-          end
+      if attributes["class"]&.include?('emoji')
+        if @remap_emoji
+          title = (attributes["alt"] || "").gsub(":", "")
+          title = Emoji.lookup_unicode(title) || attributes["alt"]
+          return characters(title)
+        elsif @keep_emoji_images
+          return include_tag(name, attributes)
+        else
+          return characters(attributes["alt"])
         end
+      end
 
+      unless @strip_images
         # If include_images is set, include the image in markdown
         characters("!") if @markdown_images
 
@@ -77,34 +81,41 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
         end
 
         characters("(#{attributes['src']})") if @markdown_images
+      end
 
-      when "a"
-        unless @strip_links
-          include_tag(name, attributes)
-          @in_a = true
-        end
+    when "a"
+      unless @strip_links
+        include_tag(name, attributes)
+        @in_a = true
+      end
 
-      when "aside"
-        attributes = Hash[*attributes.flatten]
+    when "aside"
+      attributes = Hash[*attributes.flatten]
 
         unless @keep_onebox_source && attributes['class'].include?('onebox')
           @in_quote = true
         end
-      when 'article'
-        if @keep_onebox_source && attributes.include?(['class', 'onebox-body'])
-          @in_quote = true
-        end
-      when "div", "span"
-        if attributes.include?(["class", "excerpt"])
-          @excerpt = ""
-          @current_length = 0
-          @start_excerpt = true
-        end
+    when 'article'
+      if @keep_onebox_source && attributes.include?(['class', 'onebox-body'])
+        @in_quote = true
+      end
+    when "div", "span"
+      if attributes.include?(["class", "excerpt"])
+        @excerpt = ""
+        @current_length = 0
+        @start_excerpt = true
+      end
         # Preserve spoilers
         if attributes.include?(["class", "spoiler"])
           include_tag("span", attributes)
           @in_spoiler = true
         end
+    when "details"
+      @detail_contents = ""
+      @in_details = true
+    when "summary"
+      @summary_contents = ""
+      @in_summary = true
     end
   end
 
@@ -112,7 +123,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
     case name
     when "a"
       unless @strip_links
-        characters("</a>",false, false, false)
+        characters("</a>", false, false, false)
         @in_a = false
       end
     when "p", "br"
@@ -123,6 +134,17 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
       end
     when "aside"
       @in_quote = false
+    when "details"
+      @in_details = false
+      full = "<details><summary>#{clean(@summary_contents)}</summary>#{clean(@detail_contents)}</details>"
+      if @current_length + full.length > @length
+        @excerpt << "<details class='disabled'><summary>#{@summary_contents[0..@length]}</summary></details>"
+      else
+        @excerpt << full
+      end
+
+    when "summary"
+      @in_summary = false
     when "div", "span"
       throw :done if @start_excerpt
       characters("</span>", false, false, false) if @in_spoiler
@@ -130,9 +152,25 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
     end
   end
 
+  def clean(str)
+    ERB::Util.html_escape(str.strip)
+  end
+
   def characters(string, truncate = true, count_it = true, encode = true)
     return if @in_quote
-    encode = encode ? lambda{|s| ERB::Util.html_escape(s)} : lambda {|s| s}
+
+    # we call length on this so might as well ensure we have a string
+    string = string.to_s
+    if @in_details
+      if @in_summary
+        @summary_contents << string
+      else
+        @detail_contents << string
+      end
+      return
+    end
+
+    encode = encode ? lambda { |s| ERB::Util.html_escape(s) } : lambda { |s| s }
     if count_it && @current_length + string.length > @length
       length = [0, @length - @current_length - 1].max
       @excerpt << encode.call(string[0..length]) if truncate
diff --git a/lib/feed_element_installer.rb b/lib/feed_element_installer.rb
new file mode 100644
index 0000000000..c9354e4287
--- /dev/null
+++ b/lib/feed_element_installer.rb
@@ -0,0 +1,52 @@
+require 'rexml/document'
+require 'rss'
+
+class FeedElementInstaller
+  private_class_method :new
+
+  def self.install(element_name, feed)
+    # RSS Specification at http://cyber.harvard.edu/rss/rss.html#extendingRss
+    # > A RSS feed may contain [non-standard elements], only if those elements are *defined in a namespace*
+
+    new(element_name, feed).install if element_name.include?(':')
+  end
+
+  attr_reader :feed, :original_name, :element_namespace, :element_name, :element_accessor
+
+  def initialize(element_name, feed)
+    @feed = feed
+    @original_name = element_name
+    @element_namespace, @element_name = *element_name.split(':')
+    @element_accessor = "#{@element_namespace}_#{@element_name}"
+  end
+
+  def element_uri
+    @element_uri ||= REXML::Document.new(feed).root&.attributes&.namespaces&.fetch(@element_namespace, '') || ''
+  end
+
+  def install
+    install_in_rss unless installed_in_rss?
+    install_in_atom unless installed_in_atom?
+  end
+
+  private
+
+  def install_in_rss
+    RSS::Rss::Channel::Item.install_text_element(element_name, element_uri, '?', element_accessor, nil, original_name)
+    RSS::BaseListener.install_get_text_element(element_uri, element_name, element_accessor)
+  end
+
+  def install_in_atom
+    RSS::Atom::Entry.install_text_element(element_name, element_uri, '?', element_accessor, nil, original_name)
+    RSS::Atom::Feed::Entry.install_text_element(element_name, element_uri, '?', element_accessor, nil, original_name)
+    RSS::BaseListener.install_get_text_element(element_uri, element_name, element_accessor)
+  end
+
+  def installed_in_rss?
+    RSS::Rss::Channel::Item.method_defined?(element_accessor)
+  end
+
+  def installed_in_atom?
+    RSS::Atom::Entry.method_defined?(element_accessor) || RSS::Atom::Feed::Entry.method_defined?(element_accessor)
+  end
+end
diff --git a/lib/feed_item_accessor.rb b/lib/feed_item_accessor.rb
new file mode 100644
index 0000000000..36acabcbf5
--- /dev/null
+++ b/lib/feed_item_accessor.rb
@@ -0,0 +1,25 @@
+class FeedItemAccessor
+  attr_accessor :rss_item
+
+  def initialize(rss_item)
+    @rss_item = rss_item
+  end
+
+  def element_content(element_name)
+    try_attribute_or_self(element(element_name), :content)
+  end
+
+  def link
+    try_attribute_or_self(element(:link), :href)
+  end
+
+  private
+
+  def element(element_name)
+    rss_item.respond_to?(element_name) ? rss_item.send(element_name) : nil
+  end
+
+  def try_attribute_or_self(element, attribute_name)
+    element.respond_to?(attribute_name) ? element.send(attribute_name) : element
+  end
+end
diff --git a/lib/file_helper.rb b/lib/file_helper.rb
index d87db228bb..c8039bb9c5 100644
--- a/lib/file_helper.rb
+++ b/lib/file_helper.rb
@@ -1,52 +1,109 @@
-require "open-uri"
 require "final_destination"
+require "mini_mime"
+require "open-uri"
 
 class FileHelper
 
+  def self.log(log_level, message)
+    Rails.logger.public_send(
+      log_level,
+      "#{RailsMultisite::ConnectionManagement.current_db}: #{message}"
+    )
+  end
+
   def self.is_image?(filename)
     filename =~ images_regexp
   end
 
+  class FakeIO
+    attr_accessor :status
+  end
+
   def self.download(url,
                     max_file_size:,
                     tmp_file_name:,
                     follow_redirect: false,
                     read_timeout: 5,
-                    skip_rate_limit: false)
+                    skip_rate_limit: false,
+                    verbose: nil)
+
+    # verbose logging is default while debugging onebox
+    verbose = verbose.nil? ? true : verbose
 
     url = "https:" + url if url.start_with?("//")
     raise Discourse::InvalidParameters.new(:url) unless url =~ /^https?:\/\//
 
-    uri = FinalDestination.new(
+    dest = FinalDestination.new(
       url,
       max_redirects: follow_redirect ? 5 : 1,
-      skip_rate_limit: skip_rate_limit
-    ).resolve
-    return unless uri.present?
+      skip_rate_limit: skip_rate_limit,
+      verbose: verbose
+    )
+    uri = dest.resolve
+
+    if !uri && dest.status_code.to_i >= 400
+      # attempt error API compatability
+      io = FakeIO.new
+      io.status = [dest.status_code.to_s, ""]
+
+      # TODO perhaps translate and add Discourse::DownloadError
+      raise OpenURI::HTTPError.new("#{dest.status_code} Error", io)
+    end
+
+    unless uri
+      log(:error, "FinalDestination did not work for: #{url}") if verbose
+      return
+    end
+
+    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/base_store.rb b/lib/file_store/base_store.rb
index b79282fe68..f30882d4d6 100644
--- a/lib/file_store/base_store.rb
+++ b/lib/file_store/base_store.rb
@@ -95,7 +95,16 @@ module FileStore
     end
 
     def get_path_for_upload(upload)
-      get_path_for("original".freeze, upload.id, upload.sha1, upload.extension)
+      extension =
+        if upload.extension
+          ".#{upload.extension}"
+        else
+          # Maintain backward compatibility before Jobs::MigrateUploadExtensions
+          # runs
+          File.extname(upload.original_filename)
+        end
+
+      get_path_for("original".freeze, upload.id, upload.sha1, extension)
     end
 
     def get_path_for_optimized_image(optimized_image)
diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index b19963bb65..838e8ffbc6 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"
@@ -8,7 +9,7 @@ module FileStore
   class S3Store < BaseStore
     TOMBSTONE_PREFIX ||= "tombstone/"
 
-    def initialize(s3_helper=nil)
+    def initialize(s3_helper = nil)
       @s3_helper = s3_helper || S3Helper.new(s3_bucket, TOMBSTONE_PREFIX)
     end
 
@@ -26,14 +27,14 @@ module FileStore
     #   - filename
     #   - content_type
     #   - cache_locally
-    def store_file(file, path, opts={})
+    def store_file(file, path, opts = {})
       filename = opts[:filename].presence || File.basename(path)
       # cache file locally when needed
       cache_file(file, File.basename(path)) if opts[:cache_locally]
       # 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)
@@ -55,22 +56,17 @@ module FileStore
       base_hostname = URI.parse(absolute_base_url).hostname
       return true if url[base_hostname]
 
-      return false if SiteSetting.s3_cdn_url.blank?
-      cdn_hostname = URI.parse(SiteSetting.s3_cdn_url || "").hostname
+      return false if SiteSetting.Upload.s3_cdn_url.blank?
+      cdn_hostname = URI.parse(SiteSetting.Upload.s3_cdn_url || "").hostname
       cdn_hostname.presence && url[cdn_hostname]
     end
 
-    def absolute_base_url
-      bucket = @s3_helper.s3_bucket_name
+    def s3_bucket_name
+      @s3_helper.s3_bucket_name
+    end
 
-      # cf. http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
-      @absolute_base_url ||= if SiteSetting.s3_region == "us-east-1"
-        "//#{bucket}.s3.amazonaws.com"
-      elsif SiteSetting.s3_region == 'cn-north-1'
-        "//#{bucket}.s3.cn-north-1.amazonaws.com.cn"
-      else
-        "//#{bucket}.s3-#{SiteSetting.s3_region}.amazonaws.com"
-      end
+    def absolute_base_url
+      @absolute_base_url ||= SiteSetting.Upload.absolute_base_url
     end
 
     def external?
@@ -87,9 +83,9 @@ module FileStore
     end
 
     def cdn_url(url)
-      return url if SiteSetting.s3_cdn_url.blank?
+      return url if SiteSetting.Upload.s3_cdn_url.blank?
       schema = url[/^(https?:)?\/\//, 1]
-      url.sub("#{schema}#{absolute_base_url}", SiteSetting.s3_cdn_url)
+      url.sub("#{schema}#{absolute_base_url}", SiteSetting.Upload.s3_cdn_url)
     end
 
     def cache_avatar(avatar, user_id)
@@ -103,8 +99,8 @@ module FileStore
     end
 
     def s3_bucket
-      raise Discourse::SiteSettingMissing.new("s3_upload_bucket") if SiteSetting.s3_upload_bucket.blank?
-      SiteSetting.s3_upload_bucket.downcase
+      raise Discourse::SiteSettingMissing.new("s3_upload_bucket") if SiteSetting.Upload.s3_upload_bucket.blank?
+      SiteSetting.Upload.s3_upload_bucket.downcase
     end
   end
 end
diff --git a/lib/filter_best_posts.rb b/lib/filter_best_posts.rb
index 88f97d4d1a..b517149708 100644
--- a/lib/filter_best_posts.rb
+++ b/lib/filter_best_posts.rb
@@ -2,26 +2,27 @@ class FilterBestPosts
 
   attr_accessor :filtered_posts, :posts
 
-  def initialize(topic, filtered_posts, limit, options={})
+  def initialize(topic, filtered_posts, limit, options = {})
     @filtered_posts = filtered_posts
     @topic = topic
     @limit = limit
     options.each do |key, value|
-        self.instance_variable_set("@#{key}".to_sym, value)
+      self.instance_variable_set("@#{key}".to_sym, value)
     end
     filter
   end
 
   def filter
-    @posts =  if @min_replies && @topic.posts_count < @min_replies + 1
-                []
-              else
-                filter_posts_liked_by_moderators
-                setup_posts
-                filter_posts_based_on_trust_level
-                filter_posts_based_on_score
-                sort_posts
-              end
+    @posts =
+      if @min_replies && @topic.posts_count < @min_replies + 1
+        Post.none
+      else
+        filter_posts_liked_by_moderators
+        setup_posts
+        filter_posts_based_on_trust_level
+        filter_posts_based_on_score
+        sort_posts
+      end
   end
 
   private
@@ -39,24 +40,26 @@ class FilterBestPosts
   end
 
   def filter_posts_based_on_trust_level
-    return unless @min_trust_level.try('>',0)
-      @posts = if @bypass_trust_level_score.try('>',0)
-                  @posts.where('COALESCE(users.trust_level,0) >= ? OR posts.score >= ?',
-                              @min_trust_level,
-                              @bypass_trust_level_score)
-                else
-                  @posts.where('COALESCE(users.trust_level,0) >= ?', @min_trust_level)
-                end
+    return unless @min_trust_level.try('>', 0)
+
+    @posts =
+      if @bypass_trust_level_score.try('>', 0)
+        @posts.where('COALESCE(users.trust_level,0) >= ? OR posts.score >= ?',
+          @min_trust_level,
+          @bypass_trust_level_score
+        )
+      else
+        @posts.where('COALESCE(users.trust_level,0) >= ?', @min_trust_level)
+      end
   end
 
   def filter_posts_based_on_score
-    return unless @min_score.try('>',0)
+    return unless @min_score.try('>', 0)
     @posts = @posts.where('posts.score >= ?', @min_score)
   end
 
   def sort_posts
-    @posts.to_a.sort!{|a,b| a.post_number <=> b.post_number}
+    @posts = Post.from(@posts, :posts).order(post_number: :asc)
   end
 
 end
-
diff --git a/lib/final_destination.rb b/lib/final_destination.rb
index ce8d76eafd..d28fc0d3c7 100644
--- a/lib/final_destination.rb
+++ b/lib/final_destination.rb
@@ -1,28 +1,56 @@
-require "socket"
-require "ipaddr"
+require 'socket'
+require 'ipaddr'
 require 'excon'
 require 'rate_limiter'
+require 'url_helper'
 
 # Determine the final endpoint for a Web URI, following redirects
 class FinalDestination
 
-  attr_reader :status
-  attr_reader :cookie
+  def self.clear_https_cache!(domain)
+    key = redis_https_key(domain)
+    $redis.without_namespace.del(key)
+  end
+
+  def self.cache_https_domain(domain)
+    key = redis_https_key(domain)
+    $redis.without_namespace.setex(key, "1", 1.day.to_i).present?
+  end
+
+  def self.is_https_domain?(domain)
+    key = redis_https_key(domain)
+    $redis.without_namespace.get(key).present?
+  end
+
+  def self.redis_https_key(domain)
+    "HTTPS_DOMAIN_#{domain}"
+  end
+
+  attr_reader :status, :cookie, :status_code
+
+  def initialize(url, opts = nil)
+    @url = url
+    @uri =
+      begin
+        URI(escape_url) if @url
+      rescue URI::InvalidURIError
+      end
 
-  def initialize(url, opts=nil)
-    @uri = URI(url) rescue nil
     @opts = opts || {}
+    @force_get_hosts = @opts[:force_get_hosts] || []
     @opts[:max_redirects] ||= 5
     @opts[:lookup_ip] ||= lambda do |host|
       begin
-        IPSocket::getaddress(host)
-      rescue SocketError
-        nil
+        FinalDestination.lookup_ip(host)
       end
     end
+    @ignored = [Discourse.base_url_no_prefix] + (@opts[:ignore_redirects] || [])
     @limit = @opts[:max_redirects]
     @status = :ready
+    @http_verb = @force_get_hosts.any? { |host| hostname_matches?(host) } ? :get : :head
     @cookie = nil
+    @limited_ips = []
+    @verbose = @opts[:verbose] || false
   end
 
   def self.connection_timeout
@@ -36,7 +64,7 @@ class FinalDestination
   def request_headers
     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",
+      "Accept" => "*/*",
       "Host" => @uri.hostname
     }
 
@@ -49,70 +77,109 @@ class FinalDestination
     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
+      http.request_get(@uri.request_uri, headers)
     end
   end
 
   def resolve
+    if @uri && @uri.port == 80 && FinalDestination.is_https_domain?(@uri.hostname)
+      @uri.scheme = "https"
+      @uri = URI(@uri.to_s)
+    end
+
     if @limit < 0
       @status = :too_many_redirects
+      log(:warn, "FinalDestination could not resolve URL (too many redirects): #{@uri}") if @verbose
       return nil
     end
 
-    # Always allow current base url
-    if hostname_matches?(Discourse.base_url_no_prefix)
-      @status = :resolved
-      return @uri
+    @ignored.each do |host|
+      if hostname_matches?(host)
+        @status = :resolved
+        return @uri
+      end
+    end
+
+    unless validate_uri
+      log(:warn, "FinalDestination could not resolve URL (invalid URI): #{@uri}") if @verbose
+      return nil
     end
 
-    return nil unless validate_uri
     headers = request_headers
-    response = Excon.head(
+    response = Excon.public_send(@http_verb,
       @uri.to_s,
       read_timeout: FinalDestination.connection_timeout,
       headers: headers
     )
 
     location = nil
+    headers = nil
+
+    response_status = response.status.to_i
+
     case response.status
     when 200
       @status = :resolved
       return @uri
-    when 405, 501
-      get_response = small_get(headers)
+    when 405, 406, 409, 501
+      get_response = small_get(request_headers)
 
-      if get_response.code.to_i == 200
+      response_status = get_response.code.to_i
+      if response_status == 200
         @status = :resolved
         return @uri
       end
 
+      headers = {}
       if cookie_val = get_response.get_fields('set-cookie')
-        @cookie = cookie_val.join
+        headers['set-cookie'] = cookie_val.join
       end
 
+      # TODO this is confusing why grap location for anything not
+      # between 300-400 ?
       if location_val = get_response.get_fields('location')
-        location = location_val.join
+        headers['location'] = location_val.join
       end
-    else
+    end
+
+    unless headers
+      headers = {}
       response.headers.each do |k, v|
-        case k.downcase
-        when 'set-cookie' then @cookie = v
-        when 'location' then location = v
-        end
+        headers[k.to_s.downcase] = v
       end
     end
 
+    if (300..399).include?(response_status)
+      location = headers["location"]
+    end
+
+    if set_cookie = headers["set-cookie"]
+      @cookie = set_cookie
+    end
+
     if location
+      old_port = @uri.port
+
       location = "#{@uri.scheme}://#{@uri.host}#{location}" if location[0] == "/"
       @uri = URI(location) rescue nil
       @limit -= 1
+
+      # https redirect, so just cache that whole new domain is https
+      if old_port == 80 && @uri.port == 443 && (URI::HTTPS === @uri)
+        FinalDestination.cache_https_domain(@uri.hostname)
+      end
+
       return resolve
     end
 
+    # this is weird an exception seems better
+    @status = :failure
+    @status_code = response.status
+
+    log(:warn, "FinalDestination could not resolve URL (status #{response.status}): #{@uri}") if @verbose
+    nil
+  rescue Excon::Errors::Timeout
+    log(:warn, "FinalDestination could not resolve URL (timeout): #{@uri}") if @verbose
     nil
   end
 
@@ -138,6 +205,17 @@ class FinalDestination
 
     return false unless @uri && @uri.host
 
+    # Whitelisted hosts
+    return true if hostname_matches?(SiteSetting.Upload.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
+
     # Whitelisted hosts
     return true if hostname_matches?(SiteSetting.s3_cdn_url) ||
       hostname_matches?(GlobalSetting.try(:cdn_url)) ||
@@ -148,14 +226,15 @@ class FinalDestination
 
     address = IPAddr.new(address_s)
 
-    if private_ranges.any? {|r| r === address }
+    if private_ranges.any? { |r| r === address }
       @status = :invalid_address
       return false
     end
 
     # Rate limit how often this IP can be crawled
-    unless @opts[:skip_rate_limit]
-      RateLimiter.new(nil, "crawl-destination-ip:#{address_s}", 100, 1.hour).performed!
+    if !@opts[:skip_rate_limit] && !@limited_ips.include?(address)
+      @limited_ips << address
+      RateLimiter.new(nil, "crawl-destination-ip:#{address_s}", 1000, 1.hour).performed!
     end
 
     true
@@ -163,9 +242,26 @@ class FinalDestination
     false
   end
 
+  def escape_url
+    UrlHelper.escape_uri(
+      CGI.unescapeHTML(@url),
+      Regexp.new("[^#{URI::PATTERN::UNRESERVED}#{URI::PATTERN::RESERVED}#]")
+    )
+  end
+
   def private_ranges
     FinalDestination.standard_private_ranges +
-      SiteSetting.blacklist_ip_blocks.split('|').map {|r| IPAddr.new(r) rescue nil }.compact
+      SiteSetting.blacklist_ip_blocks.split('|').map { |r| IPAddr.new(r) rescue nil }.compact
+  end
+
+  def log(log_level, message)
+    # blacklist 404 on gravatar.com
+    return if @status_code == 404 && @uri.hostname["gravatar.com"]
+
+    Rails.logger.public_send(
+      log_level,
+      "#{RailsMultisite::ConnectionManagement.current_db}: #{message}"
+    )
   end
 
   def self.standard_private_ranges
@@ -179,7 +275,13 @@ class FinalDestination
   end
 
   def self.lookup_ip(host)
+    # TODO clean this up in the test suite, cause it is a mess
+    # if Rails.env == "test"
+    #   STDERR.puts "WARNING FinalDestination.lookup_ip was called with host: #{host}, this is network call that should be mocked"
+    # end
     IPSocket::getaddress(host)
+  rescue SocketError
+    nil
   end
 
 end
diff --git a/lib/flag_query.rb b/lib/flag_query.rb
index 11b21c8966..f8051853c6 100644
--- a/lib/flag_query.rb
+++ b/lib/flag_query.rb
@@ -1,24 +1,32 @@
+require 'ostruct'
+
 module FlagQuery
 
-  def self.flagged_posts_report(current_user, filter, offset=0, per_page=25)
-    actions = flagged_post_actions(filter)
+  def self.flagged_posts_report(current_user, opts = nil)
+    opts ||= {}
+    offset = opts[:offset] || 0
+    per_page = opts[:per_page] || 25
+
+    actions = flagged_post_actions(opts)
 
     guardian = Guardian.new(current_user)
 
     if !guardian.is_admin?
-      actions = actions.where('category_id IN (:allowed_category_ids) OR archetype = :private_message',
+      actions = actions.where(
+        'category_id IN (:allowed_category_ids) OR archetype = :private_message',
         allowed_category_ids: guardian.allowed_category_ids,
-        private_message: Archetype.private_message)
+        private_message: Archetype.private_message
+      )
     end
 
-    post_ids = actions.limit(per_page)
-                      .offset(offset)
-                      .group(:post_id)
-                      .order('MIN(post_actions.created_at) DESC')
-                      .pluck(:post_id)
-                      .uniq
+    total_rows = actions.count
 
-    return nil if post_ids.blank?
+    post_ids = actions.limit(per_page)
+      .offset(offset)
+      .group(:post_id)
+      .order('MIN(post_actions.created_at) DESC')
+      .pluck(:post_id)
+      .uniq
 
     posts = SqlBuilder.new("
       SELECT p.id,
@@ -47,12 +55,20 @@ module FlagQuery
     end
 
     post_actions = actions.order('post_actions.created_at DESC')
-                          .includes(related_post: { topic: { ordered_posts: :user }})
-                          .where(post_id: post_ids)
+      .includes(related_post: { topic: { ordered_posts: :user } })
+      .where(post_id: post_ids)
+
+    all_post_actions = []
 
     post_actions.each do |pa|
       post = post_lookup[pa.post_id]
-      post.post_actions ||= []
+
+      if opts[:rest_api]
+        post.post_action_ids ||= []
+      else
+        post.post_actions ||= []
+      end
+
       # TODO: add serializer so we can skip this
       action = {
         id: pa.id,
@@ -91,7 +107,12 @@ module FlagQuery
         action.merge!(permalink: related_topic.relative_url, conversation: conversation)
       end
 
-      post.post_actions << action
+      if opts[:rest_api]
+        post.post_action_ids << action[:id]
+        all_post_actions << action
+      else
+        post.post_actions << action
+      end
 
       user_ids << pa.user_id
       user_ids << pa.disposed_by_id if pa.disposed_by_id
@@ -105,33 +126,81 @@ module FlagQuery
     [
       posts,
       Topic.with_deleted.where(id: topic_ids.to_a).to_a,
-      User.includes(:user_stat).where(id: user_ids.to_a).to_a
+      User.includes(:user_stat).where(id: user_ids.to_a).to_a,
+      all_post_actions,
+      total_rows
     ]
   end
 
-  def self.flagged_post_actions(filter)
-    post_actions = PostAction.flags
-                             .joins("INNER JOIN posts ON posts.id = post_actions.post_id")
-                             .joins("INNER JOIN topics ON topics.id = posts.topic_id")
-                             .joins("LEFT JOIN users ON users.id = posts.user_id")
-                             .where("posts.user_id > 0")
+  def self.flagged_post_actions(opts = nil)
+    opts ||= {}
 
-    if filter == "old"
+    post_actions = PostAction.flags
+      .joins("INNER JOIN posts ON posts.id = post_actions.post_id")
+      .joins("INNER JOIN topics ON topics.id = posts.topic_id")
+      .joins("LEFT JOIN users ON users.id = posts.user_id")
+      .where("posts.user_id > 0")
+
+    if opts[:topic_id]
+      post_actions = post_actions.where("topics.id = ?", opts[:topic_id])
+    end
+
+    if opts[:filter] == "old"
       post_actions.where("post_actions.disagreed_at IS NOT NULL OR
                           post_actions.deferred_at IS NOT NULL OR
                           post_actions.agreed_at IS NOT NULL")
     else
       post_actions.active
-                  .where("posts.deleted_at" => nil)
-                  .where("topics.deleted_at" => nil)
+        .where("posts.deleted_at" => nil)
+        .where("topics.deleted_at" => nil)
     end
 
   end
 
+  def self.flagged_topics
+
+    results = PostAction
+      .flags
+      .active
+      .includes(post: [:user, :topic])
+      .references(:post)
+      .where("posts.user_id > 0")
+      .order('post_actions.created_at DESC')
+
+    ft_by_id = {}
+    users_by_id = {}
+    topics_by_id = {}
+
+    results.each do |pa|
+      if pa.post.present? && pa.post.topic.present?
+        ft = ft_by_id[pa.post.topic.id] ||= OpenStruct.new(
+          topic: pa.post.topic,
+          flag_counts: {},
+          user_ids: [],
+          last_flag_at: pa.created_at
+        )
+
+        topics_by_id[pa.post.topic.id] = pa.post.topic
+
+        ft.flag_counts[pa.post_action_type_id] ||= 0
+        ft.flag_counts[pa.post_action_type_id] += 1
+
+        ft.user_ids << pa.post.user_id
+        ft.user_ids.uniq!
+
+        users_by_id[pa.post.user_id] ||= pa.post.user
+      end
+    end
+
+    Topic.preload_custom_fields(topics_by_id.values, TopicList.preloaded_custom_fields)
+
+    { flagged_topics: ft_by_id.values, users: users_by_id.values }
+  end
+
   private
 
     def self.excerpt(cooked)
-      excerpt = Post.excerpt(cooked, 200)
+      excerpt = Post.excerpt(cooked, 200, keep_emoji_images: true)
       # remove the first link if it's the first node
       fragment = Nokogiri::HTML.fragment(excerpt)
       if fragment.children.first == fragment.css("a:first").first && fragment.children.first
diff --git a/lib/flag_settings.rb b/lib/flag_settings.rb
new file mode 100644
index 0000000000..3fb700d7cc
--- /dev/null
+++ b/lib/flag_settings.rb
@@ -0,0 +1,42 @@
+class FlagSettings
+
+  attr_reader(
+    :without_custom_types,
+    :notify_types,
+    :topic_flag_types,
+    :auto_action_types,
+    :custom_types
+  )
+
+  def initialize
+    @all_flag_types = Enum.new
+    @topic_flag_types = Enum.new
+    @notify_types = Enum.new
+    @auto_action_types = Enum.new
+    @custom_types = Enum.new
+    @without_custom_types = Enum.new
+  end
+
+  def add(id, name, details = nil)
+    details ||= {}
+
+    @all_flag_types[name] = id
+    @topic_flag_types[name] = id if !!details[:topic_type]
+    @notify_types[name] = id if !!details[:notify_type]
+    @auto_action_types[name] = id if !!details[:auto_action_type]
+    if !!details[:custom_type]
+      @custom_types[name] = id
+    else
+      @without_custom_types[name] = id
+    end
+  end
+
+  def is_flag?(key)
+    @all_flag_types.valid?(key)
+  end
+
+  def flag_types
+    @all_flag_types
+  end
+
+end
diff --git a/lib/freedom_patches/active_record_base.rb b/lib/freedom_patches/active_record_base.rb
index 4f62d40647..bd4eb2c1e8 100644
--- a/lib/freedom_patches/active_record_base.rb
+++ b/lib/freedom_patches/active_record_base.rb
@@ -19,13 +19,12 @@ class ActiveRecord::Base
     ActiveRecord::Base.exec_sql(*args)
   end
 
-
   # Executes the given block +retries+ times (or forever, if explicitly given nil),
   # catching and retrying SQL Deadlock errors.
   #
   # Thanks to: http://stackoverflow.com/a/7427186/165668
   #
-  def self.retry_lock_error(retries=5, &block)
+  def self.retry_lock_error(retries = 5, &block)
     begin
       yield
     rescue ActiveRecord::StatementInvalid => e
diff --git a/lib/freedom_patches/ams_include_without_root.rb b/lib/freedom_patches/ams_include_without_root.rb
index 424489b3f5..67c4cf185b 100644
--- a/lib/freedom_patches/ams_include_without_root.rb
+++ b/lib/freedom_patches/ams_include_without_root.rb
@@ -8,7 +8,7 @@ module ActiveModel
     # This method is copied over verbatim from the AMS version, except for silently
     # ignoring associations that cannot be embedded without a root instead of
     # raising an exception.
-    def include!(name, options={})
+    def include!(name, options = {})
       unique_values =
         if hash = options[:hash]
           if @options[:hash] == hash
diff --git a/lib/freedom_patches/better_handlebars_errors.rb b/lib/freedom_patches/better_handlebars_errors.rb
index 3cab31cc94..940afe71a2 100644
--- a/lib/freedom_patches/better_handlebars_errors.rb
+++ b/lib/freedom_patches/better_handlebars_errors.rb
@@ -13,4 +13,3 @@ module Ember
     end
   end
 end
-
diff --git a/lib/freedom_patches/fast_pluck.rb b/lib/freedom_patches/fast_pluck.rb
index ac1203c66d..6034cf7a52 100644
--- a/lib/freedom_patches/fast_pluck.rb
+++ b/lib/freedom_patches/fast_pluck.rb
@@ -64,7 +64,7 @@ class ActiveRecord::Relation
         columns_hash.key?(cn) ? arel_table[cn] : cn
       }
 
-      conn.select_raw(relation, nil, relation.arel.bind_values + bind_values) do |result,_|
+      conn.select_raw(relation, nil, relation.bound_attributes) do |result, _|
         result.type_map = SqlBuilder.pg_type_map
         result.nfields == 1 ? result.column_values(0) : result.values
       end
diff --git a/lib/freedom_patches/inflector_backport.rb b/lib/freedom_patches/inflector_backport.rb
index 299ee1107c..1e192b0033 100644
--- a/lib/freedom_patches/inflector_backport.rb
+++ b/lib/freedom_patches/inflector_backport.rb
@@ -23,7 +23,7 @@ module ActiveSupport
         define_method(method_name) do |*args|
           # this avoids recursive locks
           found = true
-          data = cache.fetch(args){found = false}
+          data = cache.fetch(args) { found = false }
           unless found
             cache[args] = data = send(uncached, *args)
           end
@@ -56,8 +56,3 @@ module ActiveSupport
     end
   end
 end
-
-
-
-
-
diff --git a/lib/freedom_patches/match.rb b/lib/freedom_patches/match.rb
new file mode 100644
index 0000000000..56084edaf6
--- /dev/null
+++ b/lib/freedom_patches/match.rb
@@ -0,0 +1,8 @@
+class String
+  # new to Ruby 2.4, fastest way of matching a string to a regex
+  unless method_defined? :match?
+    def match?(regex)
+      !!(self =~ regex)
+    end
+  end
+end
diff --git a/lib/freedom_patches/pool_drainer.rb b/lib/freedom_patches/pool_drainer.rb
index 6ded19de97..0e0350d635 100644
--- a/lib/freedom_patches/pool_drainer.rb
+++ b/lib/freedom_patches/pool_drainer.rb
@@ -11,7 +11,7 @@ if Rails.version >= "4.2.0"
       end
 
       def lease
-        synchronize do
+        @lock.synchronize do
           unless in_use?
             @last_use = Time.now
             super
@@ -27,7 +27,7 @@ end
 class ActiveRecord::ConnectionAdapters::ConnectionPool
   # drain all idle connections
   # if idle_time is specified only connections idle for N seconds will be drained
-  def drain(idle_time=nil, max_age=nil)
+  def drain(idle_time = nil, max_age = nil)
     synchronize do
       @available.clear
       @connections.delete_if do |conn|
diff --git a/lib/freedom_patches/postgresql_adapter.rb b/lib/freedom_patches/postgresql_adapter.rb
new file mode 100644
index 0000000000..30cea9f81e
--- /dev/null
+++ b/lib/freedom_patches/postgresql_adapter.rb
@@ -0,0 +1,8 @@
+# Awaiting decision on https://github.com/rails/rails/issues/31190
+if ENV['DISABLE_MIGRATION_ADVISORY_LOCK']
+  class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+    def supports_advisory_locks?
+      false
+    end
+  end
+end
diff --git a/lib/freedom_patches/rack_patches.rb b/lib/freedom_patches/rack_patches.rb
index e02aca52cf..890435d9b9 100644
--- a/lib/freedom_patches/rack_patches.rb
+++ b/lib/freedom_patches/rack_patches.rb
@@ -4,7 +4,7 @@ class Rack::ETag
   private
 
    def digest_body(body)
-    parts = []
+     parts = []
     has_body = false
 
     body.each do |part|
@@ -28,15 +28,15 @@ end
 class Rack::ConditionalGet
   private
    def to_rfc2822(since)
-    # shortest possible valid date is the obsolete: 1 Nov 97 09:55 A
-    # anything shorter is invalid, this avoids exceptions for common cases
-    # most common being the empty string
-    if since && since.length >= 16
-      # NOTE: there is no trivial way to write this in a non execption way
-      #   _rfc2822 returns a hash but is not that usable
-      Time.rfc2822(since) rescue nil
-    else
-      nil
-    end
+     # shortest possible valid date is the obsolete: 1 Nov 97 09:55 A
+     # anything shorter is invalid, this avoids exceptions for common cases
+     # most common being the empty string
+     if since && since.length >= 16
+       # NOTE: there is no trivial way to write this in a non execption way
+       #   _rfc2822 returns a hash but is not that usable
+       Time.rfc2822(since) rescue nil
+     else
+       nil
+     end
   end
 end
diff --git a/lib/freedom_patches/rails4.rb b/lib/freedom_patches/rails4.rb
index 82b4ed9fb9..5052dd8654 100644
--- a/lib/freedom_patches/rails4.rb
+++ b/lib/freedom_patches/rails4.rb
@@ -1,4 +1,4 @@
-# Sam: This has now forked of rails. Trouble is we would never like to use "about 1 month" ever, we only want months for 2 or more months. 
+# Sam: This has now forked of rails. Trouble is we would never like to use "about 1 month" ever, we only want months for 2 or more months.
 #
 # Backporting a fix to rails itself may get too complex
 module FreedomPatches
@@ -6,7 +6,7 @@ module FreedomPatches
 
     def self.distance_of_time_in_words(from_time, to_time = 0, include_seconds = false, options = {})
       options = {
-        :scope => :'datetime.distance_in_words',
+        scope: :'datetime.distance_in_words',
       }.merge!(options)
 
       from_time = from_time.to_time if from_time.respond_to?(:to_time)
@@ -15,36 +15,36 @@ module FreedomPatches
       distance_in_minutes = (distance / 60.0).round
       distance_in_seconds = distance.round
 
-      I18n.with_options :locale => options[:locale], :scope => options[:scope] do |locale|
+      I18n.with_options locale: options[:locale], scope: options[:scope] do |locale|
         case distance_in_minutes
-          when 0..1
-            return distance_in_minutes == 0 ?
-                   locale.t(:less_than_x_minutes, :count => 1) :
-                   locale.t(:x_minutes, :count => distance_in_minutes) unless include_seconds
+        when 0..1
+          return distance_in_minutes == 0 ?
+                 locale.t(:less_than_x_minutes, count: 1) :
+                 locale.t(:x_minutes, count: distance_in_minutes) unless include_seconds
 
             case distance_in_seconds
-              when 0..4   then locale.t :less_than_x_seconds, :count => 5
-              when 5..9   then locale.t :less_than_x_seconds, :count => 10
-              when 10..19 then locale.t :less_than_x_seconds, :count => 20
-              when 20..39 then locale.t :half_a_minute
-              when 40..59 then locale.t :less_than_x_minutes, :count => 1
-              else             locale.t :x_minutes,           :count => 1
+            when 0..4   then locale.t :less_than_x_seconds, count: 5
+            when 5..9   then locale.t :less_than_x_seconds, count: 10
+            when 10..19 then locale.t :less_than_x_seconds, count: 20
+            when 20..39 then locale.t :half_a_minute
+            when 40..59 then locale.t :less_than_x_minutes, count: 1
+              else             locale.t :x_minutes,           count: 1
             end
 
-          when 2..44           then locale.t :x_minutes,      :count => distance_in_minutes
-          when 45..89          then locale.t :about_x_hours,  :count => 1
-          when 90..1439        then locale.t :about_x_hours,  :count => (distance_in_minutes.to_f / 60.0).round
-          when 1440..2519      then locale.t :x_days,         :count => 1
-          
+        when 2..44           then locale.t :x_minutes,      count: distance_in_minutes
+        when 45..89          then locale.t :about_x_hours,  count: 1
+        when 90..1439        then locale.t :about_x_hours,  count: (distance_in_minutes.to_f / 60.0).round
+        when 1440..2519      then locale.t :x_days,         count: 1
+
           # this is were we diverge from Rails
-          when 2520..129599     then locale.t :x_days,         :count => (distance_in_minutes.to_f / 1440.0).round
-          when 129600..525599   then locale.t :x_months,       :count => (distance_in_minutes.to_f / 43200.0).round
+        when 2520..129599     then locale.t :x_days,         count: (distance_in_minutes.to_f / 1440.0).round
+        when 129600..525599   then locale.t :x_months,       count: (distance_in_minutes.to_f / 43200.0).round
           else
-            fyear = from_time.year
+          fyear = from_time.year
             fyear += 1 if from_time.month >= 3
             tyear = to_time.year
             tyear -= 1 if to_time.month < 3
-            leap_years = (fyear > tyear) ? 0 : (fyear..tyear).count{|x| Date.leap?(x)}
+            leap_years = (fyear > tyear) ? 0 : (fyear..tyear).count { |x| Date.leap?(x) }
             minute_offset_for_leap_year = leap_years * 1440
             # Discount the leap year days when calculating year distance.
             # e.g. if there are 20 leap year days between 2 dates having the same day
@@ -55,11 +55,11 @@ module FreedomPatches
             remainder                   = (minutes_with_offset % 525600)
             distance_in_years           = (minutes_with_offset / 525600)
             if remainder < 131400
-              locale.t(:about_x_years,  :count => distance_in_years)
+              locale.t(:about_x_years,  count: distance_in_years)
             elsif remainder < 394200
-              locale.t(:over_x_years,   :count => distance_in_years)
+              locale.t(:over_x_years,   count: distance_in_years)
             else
-              locale.t(:almost_x_years, :count => distance_in_years + 1)
+              locale.t(:almost_x_years, count: distance_in_years + 1)
             end
         end
       end
diff --git a/lib/freedom_patches/raw_handlebars.rb b/lib/freedom_patches/raw_handlebars.rb
index 888e99e413..3d3a8a84f2 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
@@ -54,12 +54,12 @@ end
 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)});"
+  def precompile_handlebars(string, input = nil)
+    "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});"
+  def compile_handlebars(string, input = nil)
+    "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/regexp.rb b/lib/freedom_patches/regexp.rb
new file mode 100644
index 0000000000..5ff804c490
--- /dev/null
+++ b/lib/freedom_patches/regexp.rb
@@ -0,0 +1,9 @@
+unless ::Regexp.instance_methods.include?(:match?)
+  class ::Regexp
+    # this is the fast way of checking a regex (zero string allocs) added in Ruby 2.4
+    # backfill it for now
+    def match?(string)
+      !!(string =~ self)
+    end
+  end
+end
diff --git a/lib/freedom_patches/safe_buffer.rb b/lib/freedom_patches/safe_buffer.rb
index b39a96ebaa..8c8a294bfd 100644
--- a/lib/freedom_patches/safe_buffer.rb
+++ b/lib/freedom_patches/safe_buffer.rb
@@ -4,7 +4,7 @@
 # The alternative is a broken website when this happens
 
 class ActiveSupport::SafeBuffer
-  def concat(value, raise_encoding_err=false)
+  def concat(value, raise_encoding_err = false)
     if !html_safe? || value.html_safe?
       super(value)
     else
@@ -22,8 +22,8 @@ class ActiveSupport::SafeBuffer
 
         self.force_encoding("UTF-8")
         unless valid_encoding?
-          encode!("utf-16","utf-8",:invalid => :replace)
-          encode!("utf-8","utf-16")
+          encode!("utf-16", "utf-8", invalid: :replace)
+          encode!("utf-8", "utf-16")
         end
         Rails.logger.warn("Encountered a non UTF-8 string in SafeBuffer - #{self} - #{encoding_diags}")
       end
@@ -36,7 +36,7 @@ class ActiveSupport::SafeBuffer
         Rails.logger.warn("Attempted to concat a non UTF-8 string in SafeBuffer - #{value} - #{encoding_diags}")
       end
 
-      concat(value,_raise=true)
+      concat(value, _raise = true)
     end
   end
 
diff --git a/lib/freedom_patches/schema_migration_details.rb b/lib/freedom_patches/schema_migration_details.rb
index bbae956c11..2c2722fdc7 100644
--- a/lib/freedom_patches/schema_migration_details.rb
+++ b/lib/freedom_patches/schema_migration_details.rb
@@ -4,7 +4,7 @@ module FreedomPatches
       rval = nil
 
       time = Benchmark.measure do
-        rval=super
+        rval = super
       end
 
       sql = <<SQL
diff --git a/lib/freedom_patches/scrub.rb b/lib/freedom_patches/scrub.rb
deleted file mode 100644
index 26917b5aec..0000000000
--- a/lib/freedom_patches/scrub.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class String
-  # A poor man's scrub, Ruby 2.1 has a much better implementation, but this will do
-  unless method_defined? :scrub
-    def scrub(replace_char=nil)
-      str = dup.force_encoding("utf-8")
-
-      unless str.valid_encoding?
-        # work around bust string with a double conversion
-        str.encode!("utf-16","utf-8",:invalid => :replace)
-        str.encode!("utf-8","utf-16")
-      end
-
-      str
-    end
-  end
-end
diff --git a/lib/freedom_patches/sprockets_patches.rb b/lib/freedom_patches/sprockets_patches.rb
index ca83e2aabb..7cbf529aff 100644
--- a/lib/freedom_patches/sprockets_patches.rb
+++ b/lib/freedom_patches/sprockets_patches.rb
@@ -21,9 +21,9 @@ if Rails.env == "development"
       end
 
       if source[0] != ?/
-       # CODE REMOVED
-       # source = compute_asset_path(source, options)
-       source = "/assets/#{source}"
+        # CODE REMOVED
+        # source = compute_asset_path(source, options)
+        source = "/assets/#{source}"
       end
 
       relative_url_root = defined?(config.relative_url_root) && config.relative_url_root
diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb
index 0ec215c2ea..92f0b80b31 100644
--- a/lib/freedom_patches/translate_accelerator.rb
+++ b/lib/freedom_patches/translate_accelerator.rb
@@ -49,10 +49,10 @@ module I18n
     end
 
     def ensure_all_loaded!
-      backend.fallbacks(locale).each {|l| ensure_loaded!(l) }
+      backend.fallbacks(locale).each { |l| ensure_loaded!(l) }
     end
 
-    def search(query, opts=nil)
+    def search(query, opts = nil)
       locale = opts[:locale] || config.locale
 
       load_locale(locale) unless @loaded_locales.include?(locale)
@@ -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
@@ -158,7 +167,7 @@ module I18n
 
     alias_method :t, :translate
 
-    def exists?(key, locale=nil)
+    def exists?(key, locale = nil)
       locale ||= config.locale
       load_locale(locale) unless @loaded_locales.include?(locale)
       exists_no_cache?(key, locale)
diff --git a/lib/gaps.rb b/lib/gaps.rb
index c1f3f89602..0bf52b14fc 100644
--- a/lib/gaps.rb
+++ b/lib/gaps.rb
@@ -23,7 +23,7 @@ class Gaps
   end
 
   def find_gaps
-    return if @subset.nil? or @original.nil?
+    return if @subset.nil? || @original.nil?
 
     i = j = 0
     gaps = {}
@@ -48,7 +48,7 @@ class Gaps
       break if (i == @subset.size) || (j == @original.size)
     end
 
-    @after[@subset[i-1]] = @original[j..-1] if j < @original.size
+    @after[@subset[i - 1]] = @original[j..-1] if j < @original.size
   end
 
 end
diff --git a/lib/global_path.rb b/lib/global_path.rb
index ce6018e1d4..fc9557210a 100644
--- a/lib/global_path.rb
+++ b/lib/global_path.rb
@@ -8,8 +8,8 @@ module GlobalPath
   end
 
   def upload_cdn_path(p)
-    if SiteSetting.s3_cdn_url.present?
-      p = p.sub(Discourse.store.absolute_base_url, SiteSetting.s3_cdn_url)
+    if SiteSetting.Upload.s3_cdn_url.present?
+      p = p.sub(Discourse.store.absolute_base_url, SiteSetting.Upload.s3_cdn_url)
     end
     p =~ /^http/ ? p : cdn_path(p)
   end
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 4e9b7763ea..9792f468f3 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -25,7 +25,7 @@ class Guardian
     def moderator?; false; end
     def approved?; false; end
     def staged?; false; end
-    def blocked?; false; end
+    def silenced?; false; end
     def secure_category_ids; []; end
     def topic_create_allowed_category_ids; []; end
     def has_trust_level?(level); false; end
@@ -34,7 +34,7 @@ class Guardian
 
   attr_accessor :can_see_emails
 
-  def initialize(user=nil)
+  def initialize(user = nil)
     @user = user.presence || AnonymousUser.new
   end
 
@@ -63,8 +63,8 @@ class Guardian
     @user.moderator?
   end
 
-  def is_blocked?
-    @user.blocked?
+  def is_silenced?
+    @user.silenced?
   end
 
   def is_developer?
@@ -91,7 +91,7 @@ class Guardian
     end
   end
 
-  def can_create?(klass, parent=nil)
+  def can_create?(klass, parent = nil)
     return false unless authenticated? && klass
 
     # If no parent is provided, we look for a can_create_klass?
@@ -122,27 +122,39 @@ class Guardian
   end
 
   def can_moderate?(obj)
-    obj && authenticated? && !is_blocked? && (is_staff? || (obj.is_a?(Topic) && @user.has_trust_level?(TrustLevel[4])))
+    obj && authenticated? && !is_silenced? && (is_staff? || (obj.is_a?(Topic) && @user.has_trust_level?(TrustLevel[4])))
   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
 
-
-
   # Can we impersonate this user?
   def can_impersonate?(target)
     target &&
@@ -164,7 +176,7 @@ class Guardian
 
   # Can we approve it?
   def can_approve?(target)
-    is_staff? && target && not(target.approved?)
+    is_staff? && target && target.active? && not(target.approved?)
   end
 
   def can_activate?(target)
@@ -219,7 +231,7 @@ class Guardian
     is_me?(user)
   end
 
-  def can_invite_to_forum?(groups=nil)
+  def can_invite_to_forum?(groups = nil)
     authenticated? &&
     (SiteSetting.max_invites_per_day.to_i > 0 || is_staff?) &&
     !SiteSetting.enable_sso &&
@@ -228,16 +240,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?
@@ -265,6 +277,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
@@ -275,17 +291,35 @@ class Guardian
   end
 
   def can_send_private_message?(target)
-    (target.is_a?(Group) || target.is_a?(User)) &&
+    is_user = target.is_a?(User)
+    is_group = target.is_a?(Group)
+
+    (is_group || is_user) &&
     # User is authenticated
     authenticated? &&
     # Have to be a basic level at least
     @user.has_trust_level?(SiteSetting.min_trust_to_send_messages) &&
+    # User disabled private message
+    (is_staff? || is_group || target.user_option.allow_private_messages) &&
     # PMs are enabled
     (is_staff? || SiteSetting.enable_private_messages) &&
     # Can't send PMs to suspended users
-    (is_staff? || target.is_a?(Group) || !target.suspended?) &&
-    # Blocked users can only send PM to staff
-    (!is_blocked? || target.staff?)
+    (is_staff? || is_group || !target.suspended?) &&
+    # Check group messageable level
+    (is_staff? || is_user || Group.messageable(@user).where(id: target.id).exists?) &&
+    # Silenced users can only send PM to staff
+    (!is_silenced? || target.staff?)
+  end
+
+  def cand_send_private_messages_to_email?
+    # Staged users must be enabled to create a temporary user.
+    SiteSetting.enable_staged_users &&
+    # User is authenticated
+    authenticated? &&
+    # User is trusted enough
+    @user.has_trust_level?(SiteSetting.min_trust_to_send_email_messages) &&
+    # PMs to email addresses are enabled
+    (is_staff? || SiteSetting.enable_private_email_messages)
   end
 
   def can_see_emails?
@@ -309,7 +343,6 @@ class Guardian
     end
   end
 
-
   private
 
   def is_my_own?(obj)
diff --git a/lib/guardian/category_guardian.rb b/lib/guardian/category_guardian.rb
index 7e67066e89..567fbdbdd9 100644
--- a/lib/guardian/category_guardian.rb
+++ b/lib/guardian/category_guardian.rb
@@ -2,7 +2,7 @@
 module CategoryGuardian
 
   # Creating Method
-  def can_create_category?(parent=nil)
+  def can_create_category?(parent = nil)
     is_admin? ||
     (
       SiteSetting.allow_moderators_to_create_categories &&
@@ -34,10 +34,10 @@ module CategoryGuardian
     if category.topic_count != 0
       oldest_topic = category.topics.where.not(id: category.topic_id).order('created_at ASC').limit(1).first
       if oldest_topic
-        return I18n.t('category.cannot_delete.topic_exists', {count: category.topic_count, topic_link: "<a href=\"#{oldest_topic.url}\">#{oldest_topic.title}</a>"})
+        return I18n.t('category.cannot_delete.topic_exists', count: category.topic_count, topic_link: "<a href=\"#{oldest_topic.url}\">#{oldest_topic.title}</a>")
       else
         # This is a weird case, probably indicating a bug.
-        return I18n.t('category.cannot_delete.topic_exists_no_oldest', {count: category.topic_count})
+        return I18n.t('category.cannot_delete.topic_exists_no_oldest', count: category.topic_count)
       end
     end
 
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index 9b8f8ab0c1..d4ce94fdff 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -3,21 +3,21 @@ module PostGuardian
 
   # Can the user act on the post in a particular way.
   #  taken_actions = the list of actions the user has already taken
-  def post_can_act?(post, action_key, opts={})
-
-    return false unless can_see_post?(post)
+  def post_can_act?(post, action_key, opts: {}, can_see_post: nil)
+    return false unless (can_see_post.nil? && can_see_post?(post)) || can_see_post
 
     # no warnings except for staff
     return false if (action_key == :notify_user && !is_staff? && opts[:is_warning].present? && opts[:is_warning] == 'true')
 
     taken = opts[:taken_actions].try(:keys).to_a
-    is_flag = PostActionType.is_flag?(action_key)
+    is_flag = PostActionType.flag_types_without_custom[action_key]
     already_taken_this_action = taken.any? && taken.include?(PostActionType.types[action_key])
-    already_did_flagging      = taken.any? && (taken & PostActionType.flag_types.values).any?
+    already_did_flagging      = taken.any? && (taken & PostActionType.flag_types_without_custom.values).any?
 
     result = if authenticated? && post && !@user.anonymous?
 
-      return false if action_key == :notify_moderators && !SiteSetting.enable_private_messages
+      return false if [:notify_user, :notify_moderators].include?(action_key) &&
+        !SiteSetting.enable_private_messages?
 
       # we allow flagging for trust level 1 and higher
       # always allowed for private messages
@@ -35,11 +35,9 @@ module PostGuardian
       # don't like your own stuff
       not(action_key == :like && is_my_own?(post)) &&
 
-      # new users can't notify_user because they are not allowed to send private messages
-      not(action_key == :notify_user && !@user.has_trust_level?(SiteSetting.min_trust_to_send_messages)) &&
-
-      # can't send private messages if they're disabled globally
-      not(action_key == :notify_user && !SiteSetting.enable_private_messages) &&
+      # new users can't notify_user or notify_moderators because they are not allowed to send private messages
+      not((action_key == :notify_user || action_key == :notify_moderators) &&
+        !@user.has_trust_level?(SiteSetting.min_trust_to_send_messages)) &&
 
       # no voting more than once on single vote topics
       not(action_key == :vote && opts[:voted_in_topic] && post.topic.has_meta_data_boolean?(:single_vote))
@@ -82,10 +80,10 @@ module PostGuardian
 
   # Creating Method
   def can_create_post?(parent)
-    (!SpamRule::AutoBlock.block?(@user) || (!!parent.try(:private_message?) && parent.allowed_users.include?(@user))) && (
+    (!SpamRule::AutoSilence.silence?(@user) || (!!parent.try(:private_message?) && parent.allowed_users.include?(@user))) && (
       !parent ||
       !parent.category ||
-      Category.post_create_allowed(self).where(:id => parent.category.id).count == 1
+      Category.post_create_allowed(self).where(id: parent.category.id).count == 1
     )
   end
 
@@ -186,8 +184,8 @@ module PostGuardian
     can_see_post?(post)
   end
 
-  def can_vote?(post, opts={})
-    post_can_act?(post,:vote, opts)
+  def can_vote?(post, opts = {})
+    post_can_act?(post, :vote, opts: opts)
   end
 
   def can_change_post_owner?
diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index add956351b..1bf07ef82c 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -1,8 +1,13 @@
 #mixin for all guardian methods dealing with topic permisions
 module TopicGuardian
 
-  def can_remove_allowed_users?(topic)
-    is_staff?
+  def can_remove_allowed_users?(topic, target_user = nil)
+    is_staff? ||
+    (
+      topic.allowed_users.count > 1 &&
+      topic.user != target_user &&
+      !!(target_user && user == target_user)
+    )
   end
 
   # Creating Methods
@@ -63,7 +68,9 @@ module TopicGuardian
   end
 
   def can_convert_topic?(topic)
+    return false if topic.blank?
     return false if topic && topic.trashed?
+    return false if Category.where("topic_id = ?", topic.id).exists?
     return true if is_admin?
     is_moderator? && can_create_post?(topic)
   end
@@ -76,7 +83,7 @@ module TopicGuardian
     is_staff?
   end
 
-  def can_see_topic?(topic, hide_deleted=true)
+  def can_see_topic?(topic, hide_deleted = true)
     return false unless topic
     return true if is_admin?
     return false if hide_deleted && topic.deleted_at && !can_see_deleted_topics?
@@ -107,6 +114,6 @@ module TopicGuardian
 
   def can_edit_featured_link?(category_id)
     return false unless SiteSetting.topic_featured_link_enabled
-    Category.where(id: category_id||SiteSetting.uncategorized_category_id, topic_featured_link_allowed: true).exists?
+    Category.where(id: category_id || SiteSetting.uncategorized_category_id, topic_featured_link_allowed: true).exists?
   end
 end
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb
index 3eca04f589..26a1056262 100644
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@@ -9,7 +9,7 @@ module UserGuardian
     return false if (SiteSetting.sso_overrides_username? && SiteSetting.enable_sso?)
     return true if is_staff?
     return false if SiteSetting.username_change_period <= 0
-    is_me?(user) && (user.post_count == 0 || user.created_at > SiteSetting.username_change_period.days.ago)
+    is_me?(user) && ((user.post_count + user.topic_count) == 0 || user.created_at > SiteSetting.username_change_period.days.ago)
   end
 
   def can_edit_email?(user)
@@ -30,11 +30,11 @@ module UserGuardian
     is_me?(user) || is_admin?
   end
 
-  def can_block_user?(user)
+  def can_silence_user?(user)
     user && is_staff? && not(user.staff?)
   end
 
-  def can_unblock_user?(user)
+  def can_unsilence_user?(user)
     user && is_staff?
   end
 
@@ -67,4 +67,9 @@ module UserGuardian
     user && is_staff?
   end
 
+  def can_see_suspension_reason?(user)
+    return true unless SiteSetting.hide_suspension_reasons?
+    user == @user || is_staff?
+  end
+
 end
diff --git a/lib/highlight_js/assets/highlight.js b/lib/highlight_js/assets/highlight.js
index ac1a754175..d59bc7cedb 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 2e5eb6db93..420d11124a 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 0000000000..bfb5119099
--- /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 0000000000..80173739de
--- /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 29f63a22f2..588bfe2c96 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 0609f5fb9b..23e86c5cb8 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 6d198ee2da..58d677329a 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 f92fa905a6..805f8f76fb 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 0000000000..a4fb557339
--- /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 7d4af5a175..da88c0dc66 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 0000000000..93e05653e9
--- /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 0000000000..a2e816baf1
--- /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 61aafe085d..94f93598fc 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 f3299c5b7b..50ce0728e6 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 0000000000..35ec7c8021
--- /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 12ffd590bb..bee8aefd51 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 4ef82476d8..dddaec7d34 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 5c6e207afc..1cd2b6fe62 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 055f4496d7..f5ac4dc3b9 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 f02d2b8734..ce758e0486 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 92cc8622ec..89000076c7 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 96890439f5..501c2be749 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 bbc4e72d0d..3472aed00b 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 692932fda7..f72716bc5d 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 4d71bf5f6a..a27b45e46c 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 0000000000..60ec5ea014
--- /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 0000000000..af700f9808
--- /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 c12c8a4123..7784742f28 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 c1b9e208a4..fe76a17d29 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 0000000000..c023dadba5
--- /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 0000000000..b4f320d0de
--- /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 65638faaf2..652e69836e 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 3a46d0d099..567e39d92d 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 7095358259..20b7046010 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 269feec668..cf58a7e0e1 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 3408828b72..ab88585bf2 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 8cdbc7ce1d..2b5c2db455 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 cb955b2575..fb5eb1dca5 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 0000000000..5d9f3747cb
--- /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 f6c25e1e66..fd42651026 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 0fda499007..9eadc0a1ed 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 0000000000..429b95ddf9
--- /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 0000000000..26bb10c2be
--- /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 1d3e28b3a3..0cc7351281 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 b3b9b3670b..ad299b1b2f 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 3bb34cb822..f8f570f6eb 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 0000000000..40ed37144e
--- /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 0000000000..b75f1048b8
--- /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 d56097136c..f368e40e8a 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 21ac65c22f..65e89e4d26 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 0000000000..306dc398fe
--- /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 0000000000..61a8b3b513
--- /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 00cf60a27a..c478a7a889 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 a6060420ea..d36bb172b9 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 54d9831080..da7a989fad 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 bc2496549d..7a288b18cc 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 0000000000..2655fef521
--- /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 0000000000..0ee80670e6
--- /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 62802cc468..e395aa878a 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 bb08557282..7dacffd3ad 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 51c019056c..3fc383e610 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 7498eb553a..ba10cd2d54 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 538736d8bd..78324487ca 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 0473f688b6..db73933d58 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 0000000000..05ee0958e8
--- /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 ce7ced70e9..d1b8efa83b 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 2eb6a85d3f..74085a9dbd 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 0000000000..41bef569f2
--- /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 d0975816b9..62cb071736 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 dfe215cfa8..01d36c1343 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 0000000000..5ecbcb6d01
--- /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 d6fd44385c..7b5a93e66d 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 0aec969586..776c7e429d 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 64e8be48d3..a5e82d1164 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 0000000000..5ebb125ddc
--- /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 ea1d3a6fd8..3f06585a3b 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 36a72225de..6a731271be 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 96ba263c79..9c55eeff3a 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 0000000000..7f22dcbc88
--- /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 cf86f244ea..77c0799c49 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 0000000000..51ffc9ab5b
--- /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 5239016ae2..2d71f933fd 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 157da9d57b..3502d78666 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 d32cd0fcc8..fb54a7a5cf 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 b0842fa046..538e658f93 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 4708c0f29c..5d9c63f83f 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 4e8e6021ba..1eedce5593 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 acd647a953..e73566d2eb 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 7b9bea07ef..db72677b9b 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 3e938a79bd..80e8ce995f 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/hijack.rb b/lib/hijack.rb
new file mode 100644
index 0000000000..026077dbb6
--- /dev/null
+++ b/lib/hijack.rb
@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+# This module allows us to hijack a request and send it to the client in the deferred job queue
+# For cases where we are making remote calls like onebox or proxying files and so on this helps
+# free up a unicorn worker while the remote IO is happening
+module Hijack
+
+  def hijack(&blk)
+    controller_class = self.class
+
+    if hijack = request.env['rack.hijack']
+
+      request.env['discourse.request_tracker.skip'] = true
+      request_tracker = request.env['discourse.request_tracker']
+
+      # unicorn will re-cycle env, this ensures we keep the original copy
+      env_copy = request.env.dup
+      request_copy = ActionDispatch::Request.new(env_copy)
+
+      transfer_timings = MethodProfiler.transfer if defined? MethodProfiler
+
+      io = hijack.call
+
+      Scheduler::Defer.later("hijack #{params["controller"]} #{params["action"]}") do
+
+        MethodProfiler.start(transfer_timings) if defined? MethodProfiler
+
+        begin
+          Thread.current[Logster::Logger::LOGSTER_ENV] = env_copy
+          # do this first to confirm we have a working connection
+          # before doing any work
+          io.write "HTTP/1.1 "
+
+          # this trick avoids double render, also avoids any litter that the controller hooks
+          # place on the response
+          instance = controller_class.new
+          response = ActionDispatch::Response.new
+          instance.response = response
+
+          instance.request = request_copy
+
+          begin
+            instance.instance_eval(&blk)
+          rescue => e
+            # TODO we need to reuse our exception handling in ApplicationController
+            Discourse.warn_exception(e, message: "Failed to process hijacked response correctly", env: env_copy)
+          end
+
+          unless instance.response_body || response.committed?
+            instance.status = 500
+          end
+
+          response.commit!
+
+          body = response.body
+
+          headers = response.headers
+          # add cors if needed
+          if cors_origins = env_copy[Discourse::Cors::ORIGINS_ENV]
+            Discourse::Cors.apply_headers(cors_origins, env_copy, headers)
+          end
+
+          headers['Content-Length'] = body.bytesize
+          headers['Content-Type'] = response.content_type || "text/plain"
+          headers['Connection'] = "close"
+
+          status_string = Rack::Utils::HTTP_STATUS_CODES[instance.status.to_i] || "Unknown"
+          io.write "#{instance.status} #{status_string}\r\n"
+
+          headers.each do |name, val|
+            io.write "#{name}: #{val}\r\n"
+          end
+
+          io.write "\r\n"
+          io.write body
+        rescue Errno::EPIPE, IOError
+          # happens if client terminated before we responded, ignore
+          io = nil
+        ensure
+
+          Thread.current[Logster::Logger::LOGSTER_ENV] = nil
+
+          io.close if io rescue nil
+
+          if request_tracker
+            status = instance.status rescue 500
+            timings = MethodProfiler.stop if defined? MethodProfiler
+            request_tracker.log_request_info(env_copy, [status, headers || {}, []], timings)
+          end
+        end
+      end
+      # not leaked out, we use 418 ... I am a teapot to denote that we are hijacked
+      render plain: "", status: 418
+    else
+      blk.call
+    end
+  end
+end
diff --git a/lib/homepage_constraint.rb b/lib/homepage_constraint.rb
index a5cfb34758..586581425c 100644
--- a/lib/homepage_constraint.rb
+++ b/lib/homepage_constraint.rb
@@ -7,7 +7,7 @@ class HomePageConstraint
     return @filter == 'finish_installation' if SiteSetting.has_login_hint?
 
     provider = Discourse.current_user_provider.new(request.env)
-    homepage = provider.current_user ? SiteSetting.homepage : SiteSetting.anonymous_homepage
+    homepage = provider&.current_user&.user_option&.homepage || SiteSetting.anonymous_homepage
     homepage == @filter
   rescue Discourse::InvalidAccess
     false
diff --git a/lib/html_normalize.rb b/lib/html_normalize.rb
new file mode 100644
index 0000000000..1243a4426a
--- /dev/null
+++ b/lib/html_normalize.rb
@@ -0,0 +1,151 @@
+# 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
+        if a.value
+          buffer << "='"
+          buffer << a.value
+          buffer << "'"
+        end
+      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/html_prettify.rb b/lib/html_prettify.rb
index 39a8ca7d30..df91d767d3 100644
--- a/lib/html_prettify.rb
+++ b/lib/html_prettify.rb
@@ -12,7 +12,7 @@ class HtmlPrettify < String
     new(html).to_html
   end
 
-    # Create a new RubyPants instance with the text in +string+.
+  # Create a new RubyPants instance with the text in +string+.
   #
   # Allowed elements in the options array:
   #
@@ -50,7 +50,7 @@ class HtmlPrettify < String
   # <tt>:ellipsis</tt>           :: <tt>&#8230;</tt>
   # <tt>:html_quote</tt>         :: <tt>&quot; </tt>
   #
-  def initialize(string, options=[2], entities = {})
+  def initialize(string, options = [2], entities = {})
     super string
 
     @options = [*options]
@@ -173,7 +173,6 @@ class HtmlPrettify < String
 
   protected
 
-
   # The string, with each instance of "<tt>--</tt>" translated to an
   # em-dash HTML entity.
   #
@@ -319,14 +318,14 @@ class HtmlPrettify < String
     new_str = str.dup
 
     {
-      :en_dash            => '-',
-      :em_dash            => '--',
-      :single_left_quote  => "'",
-      :single_right_quote => "'",
-      :double_left_quote  => '"',
-      :double_right_quote => '"',
-      :ellipsis           => '...'
-    }.each do |k,v|
+      en_dash: '-',
+      em_dash: '--',
+      single_left_quote: "'",
+      single_right_quote: "'",
+      double_left_quote: '"',
+      double_right_quote: '"',
+      ellipsis: '...'
+    }.each do |k, v|
       new_str.gsub!(/#{entity(k)}/, v)
     end
 
diff --git a/lib/html_to_markdown.rb b/lib/html_to_markdown.rb
index e536047740..99563379ae 100644
--- a/lib/html_to_markdown.rb
+++ b/lib/html_to_markdown.rb
@@ -3,24 +3,23 @@ require "nokogiri"
 class HtmlToMarkdown
 
   class Block < Struct.new(:name, :head, :body, :opened, :markdown)
-    def initialize(name, head="", body="", opened=false, markdown=""); super; end
+    def initialize(name, head = "", body = "", opened = false, markdown = ""); super; end
   end
 
-  def initialize(html, opts={})
+  def initialize(html, opts = {})
     @opts = opts || {}
     @doc = fix_span_elements(Nokogiri::HTML(html))
 
     remove_whitespaces!
   end
 
-
   # If a `<div>` is within a `<span>` that's invalid, so let's hoist the `<div>` up
   def fix_span_elements(node)
     if node.name == 'span' && node.at('div')
       node.swap(node.children)
     end
 
-    node.children.each {|c| fix_span_elements(c)}
+    node.children.each { |c| fix_span_elements(c) }
     node
   end
 
@@ -179,6 +178,7 @@ class HtmlToMarkdown
   end
 
   def visit_br(node)
+    return if node.previous_sibling.nil? && EMPHASIS.include?(node.parent.name)
     @stack[-1].markdown << "\n"
   end
 
@@ -186,26 +186,33 @@ class HtmlToMarkdown
     @stack[-1].markdown << "\n\n---\n\n"
   end
 
-  def visit_strong(node)
-    delimiter = node.text["*"] ? "__" : "**"
-    @stack[-1].markdown << delimiter
-    traverse(node)
-    @stack[-1].markdown << delimiter
+  EMPHASIS ||= %w{b strong i em}
+  EMPHASIS.each do |tag|
+    class_eval <<-RUBY
+      def visit_#{tag}(node)
+        return if node.text.empty?
+        return @stack[-1].markdown << " " if node.text.blank?
+        times = "#{tag}" == "i" || "#{tag}" == "em" ? 1 : 2
+        delimiter = (node.text["*"] ? "_" : "*") * times
+        @stack[-1].markdown << " " if node.text[0] == " "
+        @stack[-1].markdown << delimiter
+        traverse(node)
+        @stack[-1].markdown.chomp!
+        if @stack[-1].markdown[-1] == " "
+          @stack[-1].markdown.chomp!(" ")
+          append_space = true
+        end
+        @stack[-1].markdown << delimiter
+        @stack[-1].markdown << " " if append_space
+      end
+    RUBY
   end
 
-  alias :visit_b :visit_strong
-
-  def visit_em(node)
-    delimiter = node.text["*"] ? "_" : "*"
-    @stack[-1].markdown << delimiter
-    traverse(node)
-    @stack[-1].markdown << delimiter
-  end
-
-  alias :visit_i :visit_em
-
   def visit_text(node)
-    @stack[-1].markdown << node.text.gsub(/\s{2,}/, " ")
+    node.content = node.content.gsub(/\A[[:space:]]+/, "") if node.previous_element.nil? && EMPHASIS.include?(node.parent.name)
+    indent = node.text[/^\s+/] || ""
+    text = node.text.gsub(/^\s+/, "").gsub(/\s{2,}/, " ")
+    @stack[-1].markdown << [indent, text].join("")
   end
 
   def format_block
diff --git a/lib/i18n/backend/discourse_i18n.rb b/lib/i18n/backend/discourse_i18n.rb
index 99b19724b7..375b72b8cc 100644
--- a/lib/i18n/backend/discourse_i18n.rb
+++ b/lib/i18n/backend/discourse_i18n.rb
@@ -1,4 +1,5 @@
 require 'i18n/backend/pluralization'
+require_dependency 'locale_site_setting'
 
 module I18n
   module Backend
@@ -51,7 +52,7 @@ module I18n
 
       protected
 
-        def find_results(regexp, results, translations, path=nil)
+        def find_results(regexp, results, translations, path = nil)
           return results if translations.blank?
 
           translations.each do |k_sym, v|
@@ -72,10 +73,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 +88,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 0000000000..cc91e806b9
--- /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/normalize.rb b/lib/import/normalize.rb
index 79dfb255f8..5279439dc4 100644
--- a/lib/import/normalize.rb
+++ b/lib/import/normalize.rb
@@ -4,10 +4,10 @@
 require 'htmlentities'
 module Import; end
 module Import::Normalize
-  def self.normalize_code_blocks(code, lang=nil)
+  def self.normalize_code_blocks(code, lang = nil)
     coder = HTMLEntities.new
     code.gsub(/<pre>\s*<code>\n?(.*?)\n?<\/code>\s*<\/pre>/m) {
-        "\n```#{lang}\n#{coder.decode($1)}\n```\n"
+      "\n```#{lang}\n#{coder.decode($1)}\n```\n"
     }
   end
 end
diff --git a/lib/import_export/base_exporter.rb b/lib/import_export/base_exporter.rb
new file mode 100644
index 0000000000..ff6cd2ed07
--- /dev/null
+++ b/lib/import_export/base_exporter.rb
@@ -0,0 +1,162 @@
+module ImportExport
+  class BaseExporter
+
+    attr_reader :export_data, :categories
+
+    CATEGORY_ATTRS = [:id, :name, :color, :created_at, :user_id, :slug, :description, :text_color,
+                      :auto_close_hours, :parent_category_id, :auto_close_based_on_last_post,
+                      :topic_template, :suppress_from_homepage, :all_topics_wiki, :permissions_params]
+
+    GROUP_ATTRS = [ :id, :name, :created_at, :mentionable_level, :messageable_level, :visibility_level,
+                    :automatic_membership_email_domains, :automatic_membership_retroactive,
+                    :primary_group, :title, :grant_trust_level, :incoming_email]
+
+    USER_ATTRS = [:id, :email, :username, :name, :created_at, :trust_level, :active, :last_emailed_at]
+
+    TOPIC_ATTRS = [:id, :title, :created_at, :views, :category_id, :closed, :archived, :archetype]
+
+    POST_ATTRS = [:id, :user_id, :post_number, :raw, :created_at, :reply_to_post_number, :hidden,
+                  :hidden_reason_id, :wiki]
+
+    def categories
+      @categories ||= Category.all.to_a
+    end
+
+    def export_categories
+      data = []
+
+      categories.each do |cat|
+        data << CATEGORY_ATTRS.inject({}) { |h, a| h[a] = cat.send(a); h }
+      end
+
+      data
+    end
+
+    def export_categories!
+      @export_data[:categories] = export_categories
+
+      self
+    end
+
+    def export_category_groups
+      groups = []
+      group_names = []
+      auto_group_names = Group::AUTO_GROUPS.keys.map(&:to_s)
+
+      @export_data[:categories].each do |c|
+        c[:permissions_params].each do |group_name, _|
+          group_names << group_name unless auto_group_names.include?(group_name.to_s)
+        end
+      end
+
+      group_names.uniq!
+      return [] if group_names.empty?
+
+      Group.where(name: group_names).find_each do |group|
+        attrs = GROUP_ATTRS.inject({}) { |h, a| h[a] = group.send(a); h }
+        attrs[:user_ids] = group.users.pluck(:id)
+        groups << attrs
+      end
+
+      groups
+    end
+
+    def export_category_groups!
+      @export_data[:groups] = export_category_groups
+
+      self
+    end
+
+    def export_group_users
+      user_ids = []
+
+      @export_data[:groups].each do |g|
+        user_ids += g[:user_ids]
+      end
+
+      user_ids.uniq!
+      return [] if user_ids.empty?
+
+      users = User.where(id: user_ids)
+      export_users(users.to_a)
+    end
+
+    def export_group_users!
+      @export_data[:users] = export_group_users
+
+      self
+    end
+
+    def export_topics
+      data = []
+
+      @topics.each do |topic|
+        puts topic.title
+
+        topic_data = TOPIC_ATTRS.inject({}) { |h, a| h[a] = topic.send(a); h; }
+        topic_data[:posts] = []
+
+        topic.ordered_posts.find_each do |post|
+          h = POST_ATTRS.inject({}) { |h, a| h[a] = post.send(a); h; }
+          h[:raw] = h[:raw].gsub('src="/uploads', "src=\"#{Discourse.base_url_no_prefix}/uploads")
+          topic_data[:posts] << h
+        end
+
+        data << topic_data
+      end
+
+      data
+    end
+
+    def export_topics!
+      @export_data[:topics] = export_topics
+
+      self
+    end
+
+    def export_topic_users
+      return if @export_data[:topics].blank?
+      topic_ids = @export_data[:topics].pluck(:id)
+
+      users = User.joins(:topics).where('topics.id IN (?)', topic_ids).to_a
+      users.uniq!
+
+      export_users(users.to_a)
+    end
+
+    def export_topic_users!
+      @export_data[:users] = export_topic_users
+
+      self
+    end
+
+    def export_users(users)
+      data = []
+      users.reject! { |u| u.id == Discourse::SYSTEM_USER_ID }
+
+      users.each do |u|
+        x = USER_ATTRS.inject({}) { |h, a| h[a] = u.send(a); h; }
+        x.merge(bio_raw: u.user_profile.bio_raw,
+                website: u.user_profile.website,
+                location: u.user_profile.location)
+        data << x
+      end
+
+      data
+    end
+
+    def default_filename_prefix
+      raise "Overwrite me!"
+    end
+
+    def save_to_file(filename = nil)
+      output_basename = filename || File.join("#{default_filename_prefix}-#{Time.now.strftime("%Y-%m-%d-%H%M%S")}.json")
+      File.open(output_basename, "w:UTF-8") do |f|
+        f.write(@export_data.to_json)
+      end
+      puts "Export saved to #{output_basename}"
+      output_basename
+    end
+
+  end
+end
diff --git a/lib/import_export/category_exporter.rb b/lib/import_export/category_exporter.rb
index 9f182e7247..5568fb5180 100644
--- a/lib/import_export/category_exporter.rb
+++ b/lib/import_export/category_exporter.rb
@@ -1,73 +1,29 @@
+require "import_export/base_exporter"
+require "import_export/topic_exporter"
+
 module ImportExport
-  class CategoryExporter
+  class CategoryExporter < BaseExporter
 
-    attr_reader :export_data
-
-    def initialize(category_id)
-      @category = Category.find(category_id)
-      @subcategories = Category.where(parent_category_id: category_id)
+    def initialize(category_ids)
+      @categories = Category.where(id: category_ids).or(Category.where(parent_category_id: category_ids)).to_a
       @export_data = {
-        users: [],
+        categories: [],
         groups: [],
-        category: nil,
-        subcategories: [],
-        topics: []
+        topics: [],
+        users: []
       }
     end
 
     def perform
-      puts "Exporting category #{@category.name}...", ""
-      export_categories
+      export_categories!
+      export_category_groups!
       export_topics_and_users
       self
     end
 
-
-    CATEGORY_ATTRS = [:id, :name, :color, :created_at, :user_id, :slug, :description, :text_color,
-                      :auto_close_hours, :auto_close_based_on_last_post,
-                      :topic_template, :suppress_from_homepage, :all_topics_wiki, :permissions_params]
-
-    def export_categories
-      @export_data[:category] = CATEGORY_ATTRS.inject({}) { |h,a| h[a] = @category.send(a); h }
-      @subcategories.find_each do |subcat|
-        @export_data[:subcategories] << CATEGORY_ATTRS.inject({}) { |h,a| h[a] = subcat.send(a); h }
-      end
-
-      # export groups that are mentioned in category permissions
-      group_names = []
-      auto_group_names = Group::AUTO_GROUPS.keys.map(&:to_s)
-
-      ([@export_data[:category]] + @export_data[:subcategories]).each do |c|
-        c[:permissions_params].each do |group_name, _|
-          group_names << group_name unless auto_group_names.include?(group_name.to_s)
-        end
-      end
-
-      group_names.uniq!
-      export_groups(group_names) unless group_names.empty?
-
-      self
-    end
-
-
-    GROUP_ATTRS = [ :id, :name, :created_at, :alias_level, :visible,
-                    :automatic_membership_email_domains, :automatic_membership_retroactive,
-                    :primary_group, :title, :grant_trust_level, :incoming_email]
-
-    def export_groups(group_names)
-      group_names.each do |name|
-        group = Group.find_by_name(name)
-        group_attrs = GROUP_ATTRS.inject({}) { |h,a| h[a] = group.send(a); h }
-        group_attrs[:user_ids] = group.users.pluck(:id)
-        @export_data[:groups] << group_attrs
-      end
-
-      self
-    end
-
     def export_topics_and_users
-      all_category_ids = [@category.id] + @subcategories.pluck(:id)
-      description_topic_ids = Category.where(id: all_category_ids).pluck(:topic_id)
+      all_category_ids = @categories.pluck(:id)
+      description_topic_ids = @categories.pluck(:topic_id)
       topic_exporter = ImportExport::TopicExporter.new(Topic.where(category_id: all_category_ids).pluck(:id) - description_topic_ids)
       topic_exporter.perform
       @export_data[:users]  = topic_exporter.export_data[:users]
@@ -75,14 +31,8 @@ module ImportExport
       self
     end
 
-    def save_to_file(filename=nil)
-      require 'json'
-      output_basename = filename || File.join("category-export-#{Time.now.strftime("%Y-%m-%d-%H%M%S")}.json")
-      File.open(output_basename, "w:UTF-8") do |f|
-        f.write(@export_data.to_json)
-      end
-      puts "Export saved to #{output_basename}"
-      output_basename
+    def default_filename_prefix
+      "category-export"
     end
 
   end
diff --git a/lib/import_export/category_importer.rb b/lib/import_export/category_importer.rb
deleted file mode 100644
index 25b57acfcb..0000000000
--- a/lib/import_export/category_importer.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-require File.join(Rails.root, 'script', 'import_scripts', 'base.rb')
-
-module ImportExport
-  class CategoryImporter < ImportScripts::Base
-    def initialize(export_data)
-      @export_data = export_data
-      @topic_importer = TopicImporter.new(@export_data)
-    end
-
-    def perform
-      RateLimiter.disable
-
-      import_users
-      import_groups
-      import_categories
-      import_topics
-      self
-    ensure
-      RateLimiter.enable
-    end
-
-    def import_groups
-      return if @export_data[:groups].empty?
-
-      @export_data[:groups].each do |group_data|
-        g = group_data.dup
-        user_ids = g.delete(:user_ids)
-        external_id = g.delete(:id)
-        new_group = Group.find_by_name(g[:name]) || Group.create!(g)
-        user_ids.each do |external_user_id|
-          new_group.add( User.find(@topic_importer.new_user_id(external_user_id)) ) rescue ActiveRecord::RecordNotUnique
-        end
-      end
-    end
-
-    def import_users
-      @topic_importer.import_users
-    end
-
-    def import_categories
-      id = @export_data[:category].delete(:id)
-
-      parent = CategoryCustomField.where(name: 'import_id', value: id.to_s).first.try(:category)
-
-      unless parent
-        permissions = @export_data[:category].delete(:permissions_params)
-        parent = Category.new(@export_data[:category])
-        parent.user_id = @topic_importer.new_user_id(@export_data[:category][:user_id]) # imported user's new id
-        parent.custom_fields["import_id"] = id
-        parent.permissions = permissions.present? ? permissions : {"everyone" => CategoryGroup.permission_types[:full]}
-        parent.save!
-        set_category_description(parent, @export_data[:category][:description])
-      end
-
-      @export_data[:subcategories].each do |cat_attrs|
-        id = cat_attrs.delete(:id)
-        existing = CategoryCustomField.where(name: 'import_id', value: id.to_s).first.try(:category)
-
-        unless existing
-          permissions = cat_attrs.delete(:permissions_params)
-          subcategory = Category.new(cat_attrs)
-          subcategory.parent_category_id = parent.id
-          subcategory.user_id = @topic_importer.new_user_id(cat_attrs[:user_id])
-          subcategory.custom_fields["import_id"] = id
-          subcategory.permissions = permissions.present? ? permissions : {"everyone" => CategoryGroup.permission_types[:full]}
-          subcategory.save!
-          set_category_description(subcategory, cat_attrs[:description])
-        end
-      end
-    end
-
-    def set_category_description(c, description)
-      post = c.topic.ordered_posts.first
-      post.raw = description
-      post.save!
-      post.rebake!
-    end
-
-    def import_topics
-      @topic_importer.import_topics
-    end
-  end
-end
diff --git a/lib/import_export/category_structure_exporter.rb b/lib/import_export/category_structure_exporter.rb
new file mode 100644
index 0000000000..7c6f3c61db
--- /dev/null
+++ b/lib/import_export/category_structure_exporter.rb
@@ -0,0 +1,30 @@
+require "import_export/base_exporter"
+
+module ImportExport
+  class CategoryStructureExporter < ImportExport::BaseExporter
+
+    def initialize(include_group_users = false)
+      @include_group_users = include_group_users
+
+      @export_data = {
+        groups: [],
+        categories: []
+      }
+      @export_data[:users] = [] if @include_group_users
+    end
+
+    def perform
+      puts "Exporting all the categories...", ""
+      export_categories!
+      export_category_groups!
+      export_group_users! if @include_group_users
+
+      self
+    end
+
+    def default_filename_prefix
+      "category-structure-export"
+    end
+
+  end
+end
diff --git a/lib/import_export/import_export.rb b/lib/import_export/import_export.rb
index 4bb6fa9250..4523bb779d 100644
--- a/lib/import_export/import_export.rb
+++ b/lib/import_export/import_export.rb
@@ -1,26 +1,26 @@
+require "import_export/importer"
+require "import_export/category_structure_exporter"
 require "import_export/category_exporter"
-require "import_export/category_importer"
 require "import_export/topic_exporter"
-require "import_export/topic_importer"
 require "json"
 
 module ImportExport
 
-  def self.export_category(category_id, filename=nil)
-    ImportExport::CategoryExporter.new(category_id).perform.save_to_file(filename)
+  def self.import(filename)
+    data = ActiveSupport::HashWithIndifferentAccess.new(File.open(filename, "r:UTF-8") { |f| JSON.parse(f.read) })
+    ImportExport::Importer.new(data).perform
   end
 
-  def self.import_category(filename)
-    export_data = ActiveSupport::HashWithIndifferentAccess.new(File.open(filename, "r:UTF-8") { |f| JSON.parse(f.read) })
-    ImportExport::CategoryImporter.new(export_data).perform
+  def self.export_category_structure(include_users, filename = nil)
+    ImportExport::CategoryStructureExporter.new(include_users).perform.save_to_file(filename)
   end
 
-  def self.export_topics(topic_ids)
-    ImportExport::TopicExporter.new(topic_ids).perform.save_to_file
+  def self.export_categories(category_ids, filename = nil)
+    ImportExport::CategoryExporter.new(category_ids).perform.save_to_file(filename)
   end
 
-  def self.import_topics(filename)
-    export_data = ActiveSupport::HashWithIndifferentAccess.new(File.open(filename, "r:UTF-8") { |f| JSON.parse(f.read) })
-    ImportExport::TopicImporter.new(export_data).perform
+  def self.export_topics(topic_ids, filename = nil)
+    ImportExport::TopicExporter.new(topic_ids).perform.save_to_file(filename)
   end
+
 end
diff --git a/lib/import_export/importer.rb b/lib/import_export/importer.rb
new file mode 100644
index 0000000000..2e982a089e
--- /dev/null
+++ b/lib/import_export/importer.rb
@@ -0,0 +1,164 @@
+require File.join(Rails.root, 'script', 'import_scripts', 'base.rb')
+
+module ImportExport
+  class Importer < ImportScripts::Base
+
+    def initialize(data)
+      @users = data[:users]
+      @groups = data[:groups]
+      @categories = data[:categories]
+      @topics = data[:topics]
+
+      # To support legacy `category_export` script
+      if data[:category].present?
+        @categories = [] if @categories.blank?
+        @categories << data[:category]
+      end
+    end
+
+    def perform
+      RateLimiter.disable
+
+      import_users
+      import_groups
+      import_categories
+      import_topics
+
+      self
+    ensure
+      RateLimiter.enable
+    end
+
+    def import_users
+      return if @users.blank?
+
+      @users.each do |u|
+        import_id = "#{u[:id]}#{import_source}"
+        existing = User.with_email(u[:email]).first
+
+        if existing
+          if existing.custom_fields["import_id"] != import_id
+            existing.custom_fields["import_id"] = import_id
+            existing.save!
+          end
+        else
+          u = create_user(u, import_id) # see ImportScripts::Base
+        end
+      end
+
+      self
+    end
+
+    def import_groups
+      return if @groups.blank?
+
+      @groups.each do |group_data|
+        g = group_data.dup
+        user_ids = g.delete(:user_ids)
+        external_id = g.delete(:id)
+        new_group = Group.find_by_name(g[:name]) || Group.create!(g)
+        user_ids.each do |external_user_id|
+          new_group.add(User.find(new_user_id(external_user_id))) rescue ActiveRecord::RecordNotUnique
+        end
+      end
+
+      self
+    end
+
+    def import_categories
+      return if @categories.blank?
+
+      import_ids = @categories.collect { |c| "#{c[:id]}#{import_source}" }
+      existing_categories = CategoryCustomField.where("name = 'import_id' AND value IN (?)", import_ids).select(:category_id, :value).to_a
+      existing_category_ids = existing_categories.pluck(:value)
+
+      @categories.reject! { |c| existing_category_ids.include? c[:id].to_s }
+      @categories.sort_by! { |c| c[:parent_category_id].presence || 0 }
+
+      @categories.each do |cat_attrs|
+        begin
+          id = cat_attrs.delete(:id)
+          permissions = cat_attrs.delete(:permissions_params)
+
+          category = Category.new(cat_attrs)
+          category.parent_category_id = new_category_id(cat_attrs[:parent_category_id]) if cat_attrs[:parent_category_id].present?
+          category.user_id = new_user_id(cat_attrs[:user_id])
+          import_id = "#{id}#{import_source}"
+          category.custom_fields["import_id"] = import_id
+          category.permissions = permissions.present? ? permissions : { "everyone" => CategoryGroup.permission_types[:full] }
+          category.save!
+          existing_categories << { category_id: category.id, value: import_id }
+
+          if cat_attrs[:description].present?
+            post = category.topic.ordered_posts.first
+            post.raw = cat_attrs[:description]
+            post.save!
+            post.rebake!
+          end
+        rescue
+          next
+        end
+      end
+
+      self
+    end
+
+    def import_topics
+      return if @topics.blank?
+
+      @topics.each do |t|
+        puts ""
+        print t[:title]
+
+        first_post_attrs = t[:posts].first.merge(t.slice(*(TopicExporter::TOPIC_ATTRS - [:id, :category_id])))
+
+        first_post_attrs[:user_id] = new_user_id(first_post_attrs[:user_id])
+        first_post_attrs[:category] = new_category_id(t[:category_id])
+
+        import_id = "#{first_post_attrs[:id]}#{import_source}"
+        first_post = PostCustomField.where(name: "import_id", value: import_id).first&.post
+
+        unless first_post
+          first_post = create_post(first_post_attrs, import_id)
+        end
+
+        topic_id = first_post.topic_id
+
+        t[:posts].each_with_index do |post_data, i|
+          next if i == 0
+          print "."
+          post_import_id = "#{post_data[:id]}#{import_source}"
+          existing = PostCustomField.where(name: "import_id", value: post_import_id).first&.post
+          unless existing
+            # see ImportScripts::Base
+            create_post(
+              post_data.merge(
+                topic_id: topic_id,
+                user_id: new_user_id(post_data[:user_id])
+              ),
+              post_import_id
+            )
+          end
+        end
+      end
+
+      puts ""
+
+      self
+    end
+
+    def new_user_id(external_user_id)
+      ucf = UserCustomField.where(name: "import_id", value: "#{external_user_id}#{import_source}").first
+      ucf ? ucf.user_id : Discourse::SYSTEM_USER_ID
+    end
+
+    def new_category_id(external_category_id)
+      CategoryCustomField.where(name: "import_id", value: "#{external_category_id}#{import_source}").first.category_id rescue nil
+    end
+
+    def import_source
+      @_import_source ||= "#{ENV['IMPORT_SOURCE'] || ''}"
+    end
+
+  end
+end
diff --git a/lib/import_export/topic_exporter.rb b/lib/import_export/topic_exporter.rb
index 78b4dc4d9e..4603e3d1b6 100644
--- a/lib/import_export/topic_exporter.rb
+++ b/lib/import_export/topic_exporter.rb
@@ -1,95 +1,26 @@
-module ImportExport
-  class TopicExporter
+require "import_export/base_exporter"
 
-    attr_reader :exported_user_ids, :export_data
+module ImportExport
+  class TopicExporter < ImportExport::BaseExporter
 
     def initialize(topic_ids)
-      @topic_ids = topic_ids
-      @exported_user_ids = []
+      @topics = Topic.where(id: topic_ids).to_a
       @export_data = {
-        users: [],
-        topics: []
+        topics: [],
+        users: []
       }
     end
 
     def perform
-      export_users
-      export_topics
+      export_topics!
+      export_topic_users!
       # TODO: user actions
 
       self
     end
 
-
-    USER_ATTRS = [:id, :email, :username, :name, :created_at, :trust_level, :active, :last_emailed_at]
-
-    def export_users
-      # TODO: avatar
-
-      @exported_user_ids = []
-      @topic_ids.each do |topic_id|
-        t = Topic.find(topic_id)
-        t.posts.includes(user: [:user_profile]).find_each do |post|
-          u = post.user
-          unless @exported_user_ids.include?(u.id)
-            x = USER_ATTRS.inject({}) { |h, a| h[a] = u.send(a); h; }
-            @export_data[:users] << x.merge({
-              bio_raw: u.user_profile.bio_raw,
-              website: u.user_profile.website,
-              location: u.user_profile.location
-            })
-            @exported_user_ids << u.id
-          end
-        end
-      end
-
-      self
-    end
-
-
-    def export_topics
-      @topic_ids.each do |topic_id|
-        t = Topic.find(topic_id)
-        puts t.title
-        export_topic(t)
-      end
-      puts ""
-    end
-
-
-    TOPIC_ATTRS = [:id, :title, :created_at, :views, :category_id, :closed, :archived, :archetype]
-    POST_ATTRS = [:id, :user_id, :post_number, :raw, :created_at, :reply_to_post_number,
-                  :hidden, :hidden_reason_id, :wiki]
-
-    def export_topic(topic)
-      topic_data = {}
-
-      TOPIC_ATTRS.each do |a|
-        topic_data[a] = topic.send(a)
-      end
-
-      topic_data[:posts] = []
-
-      topic.ordered_posts.find_each do |post|
-        h = POST_ATTRS.inject({}) { |h, a| h[a] = post.send(a); h; }
-        h[:raw] = h[:raw].gsub('src="/uploads', "src=\"#{Discourse.base_url_no_prefix}/uploads")
-        topic_data[:posts] << h
-      end
-
-      @export_data[:topics] << topic_data
-
-      self
-    end
-
-
-    def save_to_file(filename=nil)
-      require 'json'
-      output_basename = filename || File.join("topic-export-#{Time.now.strftime("%Y-%m-%d-%H%M%S")}.json")
-      File.open(output_basename, "w:UTF-8") do |f|
-        f.write(@export_data.to_json)
-      end
-      puts "Export saved to #{output_basename}"
-      output_basename
+    def default_filename_prefix
+      "topic-export"
     end
 
   end
diff --git a/lib/import_export/topic_importer.rb b/lib/import_export/topic_importer.rb
deleted file mode 100644
index e7fc2d8f36..0000000000
--- a/lib/import_export/topic_importer.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-require File.join(Rails.root, 'script', 'import_scripts', 'base.rb')
-
-module ImportExport
-  class TopicImporter < ImportScripts::Base
-    def initialize(export_data)
-      @export_data = export_data
-    end
-
-    def perform
-      RateLimiter.disable
-
-      import_users
-      import_topics
-      self
-    ensure
-      RateLimiter.enable
-    end
-
-    def import_users
-      @export_data[:users].each do |u|
-        existing = User.where(email: u[:email]).first
-        if existing
-          if existing.custom_fields["import_id"] != u[:id]
-            existing.custom_fields["import_id"] = u[:id]
-            existing.save!
-          end
-        else
-          u = create_user(u, u[:id]) # see ImportScripts::Base
-        end
-      end
-      self
-    end
-
-    def import_topics
-      @export_data[:topics].each do |t|
-        puts ""
-        print t[:title]
-
-        first_post_attrs = t[:posts].first.merge( t.slice(*(TopicExporter::TOPIC_ATTRS - [:id, :category_id])) )
-        first_post_attrs[:user_id] = new_user_id(first_post_attrs[:user_id])
-        first_post_attrs[:category] = new_category_id(t[:category_id])
-
-        first_post = PostCustomField.where(name: "import_id", value: first_post_attrs[:id]).first.try(:post)
-
-        unless first_post
-          first_post = create_post( first_post_attrs, first_post_attrs[:id] )
-        end
-
-        topic_id = first_post.topic_id
-
-        t[:posts].each_with_index do |post_data, i|
-          next if i == 0
-          print "."
-          existing = PostCustomField.where(name: "import_id", value: post_data[:id]).first.try(:post)
-          unless existing
-            create_post(post_data.merge({
-              topic_id: topic_id,
-              user_id: new_user_id(post_data[:user_id])
-            }), post_data[:id]) # see ImportScripts::Base
-          end
-        end
-      end
-
-      puts ""
-
-      self
-    end
-
-    def new_user_id(external_user_id)
-      ucf = UserCustomField.where(name: "import_id", value: external_user_id.to_s).first
-      ucf ? ucf.user_id : Discourse::SYSTEM_USER_ID
-    end
-
-    def new_category_id(external_category_id)
-      CategoryCustomField.where(name: "import_id", value: external_category_id).first.category_id rescue nil
-    end
-  end
-end
diff --git a/lib/inline_oneboxer.rb b/lib/inline_oneboxer.rb
new file mode 100644
index 0000000000..4c71cba888
--- /dev/null
+++ b/lib/inline_oneboxer.rb
@@ -0,0 +1,74 @@
+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
+
+    always_allow = SiteSetting.enable_inline_onebox_on_all_domains
+    domains = SiteSetting.inline_onebox_domains_whitelist&.split('|') unless always_allow
+
+    if always_allow || domains
+      uri = URI(url) rescue nil
+
+      if uri.present? &&
+        uri.hostname.present? &&
+        (always_allow || 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/javascripts/locale/sr.js b/lib/javascripts/locale/sr.js
index c2e3d3df1c..9bd8663452 100644
--- a/lib/javascripts/locale/sr.js
+++ b/lib/javascripts/locale/sr.js
@@ -1,14 +1,11 @@
 MessageFormat.locale.sr = function (n) {
-  if ((n % 10) == 1 && (n % 100) != 11) {
+  var r10 = n % 10, r100 = n % 100;
+
+  if (r10 == 1 && r100 != 11)
     return 'one';
-  }
-  if ((n % 10) >= 2 && (n % 10) <= 4 &&
-      ((n % 100) < 12 || (n % 100) > 14) && n == Math.floor(n)) {
+
+  if (r10 >= 2 && r10 <= 4 && (r100 < 12 || r100 > 14) && n == Math.floor(n))
     return 'few';
-  }
-  if ((n % 10) === 0 || ((n % 10) >= 5 && (n % 10) <= 9) ||
-      ((n % 100) >= 11 && (n % 100) <= 14) && n == Math.floor(n)) {
-    return 'many';
-  }
+
   return 'other';
-};
+};
\ No newline at end of file
diff --git a/lib/javascripts/widget-hbs-compiler.js.es6 b/lib/javascripts/widget-hbs-compiler.js.es6
new file mode 100644
index 0000000000..7e756f3746
--- /dev/null
+++ b/lib/javascripts/widget-hbs-compiler.js.es6
@@ -0,0 +1,259 @@
+function resolve(path) {
+  if (path.indexOf('settings') === 0 || path.indexOf('transformed') === 0) {
+    return `this.${path}`;
+  }
+  return path;
+}
+
+function sexp(value) {
+  if (value.path.original === "hash") {
+
+    let result = [];
+
+    value.hash.pairs.forEach(p => {
+      let pValue = p.value.original;
+      if (p.value.type === "StringLiteral") {
+        pValue = JSON.stringify(pValue);
+      }
+
+      result.push(`"${p.key}": ${pValue}`);
+    });
+
+    return `{ ${result.join(", ")} }`;
+  }
+}
+
+function argValue(arg) {
+  let value = arg.value;
+  if (value.type === "SubExpression") {
+    return sexp(arg.value);
+  } else if (value.type === "PathExpression") {
+    return value.original;
+  } else if (value.type === "StringLiteral") {
+    return JSON.stringify(value.value);
+  }
+}
+
+function mustacheValue(node, state) {
+  let path = node.path.original;
+
+  switch(path) {
+    case 'attach':
+      let widgetName = argValue(node.hash.pairs.find(p => p.key === "widget"));
+
+      let attrs = node.hash.pairs.find(p => p.key === "attrs");
+      if (attrs) {
+        return `this.attach(${widgetName}, ${argValue(attrs)})`;
+      }
+      return `this.attach(${widgetName}, attrs)`;
+
+      break;
+    case 'yield':
+      return `this.attrs.contents()`;
+      break;
+    case 'i18n':
+      let value;
+      if (node.params[0].type === "StringLiteral") {
+        value = `"${node.params[0].value}"`;
+      } else if (node.params[0].type === "PathExpression") {
+        value = resolve(node.params[0].original);
+      }
+
+      if (value) {
+        return `I18n.t(${value})`;
+      }
+
+      break;
+    case 'fa-icon':
+    case 'd-icon':
+      state.helpersUsed.iconNode = true;
+      let icon = node.params[0].value;
+      return `__iN("${icon}")`;
+      break;
+    default:
+      if (node.escaped) {
+        return `${resolve(path)}`;
+      } else {
+        state.helpersUsed.rawHtml = true;
+        return `new __rH({ html: '<span>' + ${resolve(path)} + '</span>'})`;
+      }
+      break;
+  }
+}
+
+class Compiler {
+  constructor(ast) {
+    this.idx = 0;
+    this.ast = ast;
+
+    this.state = {
+      helpersUsed: {}
+    };
+  }
+
+  newAcc() {
+    return `_a${this.idx++}`;
+  }
+
+  processNode(parentAcc, node) {
+    let instructions = [];
+    let innerAcc;
+
+    switch(node.type) {
+      case "Program":
+        node.body.forEach(bodyNode => {
+          instructions = instructions.concat(this.processNode(parentAcc, bodyNode));
+        });
+        break;
+      case "ElementNode":
+        innerAcc = this.newAcc();
+        instructions.push(`var ${innerAcc} = [];`);
+        node.children.forEach(child => {
+          instructions = instructions.concat(this.processNode(innerAcc, child));
+        });
+
+        if (node.attributes.length) {
+
+          let attributes = [];
+          node.attributes.forEach(a => {
+            const name = a.name === 'class' ? 'className' : a.name;
+            if (a.value.type === "MustacheStatement") {
+              attributes.push(`"${name}":${mustacheValue(a.value, this.state)}`);
+            } else {
+              attributes.push(`"${name}":"${a.value.chars}"`);
+            }
+          });
+
+          const attrString = `{${attributes.join(', ')}}`;
+          instructions.push(`${parentAcc}.push(virtualDom.h('${node.tag}', ${attrString}, ${innerAcc}));`);
+        } else {
+          instructions.push(`${parentAcc}.push(virtualDom.h('${node.tag}', ${innerAcc}));`);
+        }
+
+        break;
+
+      case "TextNode":
+        return `${parentAcc}.push(${JSON.stringify(node.chars)});`;
+
+      case "MustacheStatement":
+        const value = mustacheValue(node, this.state);
+        if (value) {
+          instructions.push(`${parentAcc}.push(${value})`);
+        }
+        break;
+      case "BlockStatement":
+        let negate = '';
+
+        switch(node.path.original) {
+          case 'unless':
+            negate = '!';
+          case 'if':
+            instructions.push(`if (${negate}${resolve(node.params[0].original)}) {`);
+            node.program.body.forEach(child => {
+              instructions = instructions.concat(this.processNode(parentAcc, child));
+            });
+
+            if (node.inverse) {
+              instructions.push(`} else {`);
+              node.inverse.body.forEach(child => {
+                instructions = instructions.concat(this.processNode(parentAcc, child));
+              });
+            }
+            instructions.push(`}`);
+            break;
+          case 'each':
+            const collection = resolve(node.params[0].original);
+            instructions.push(`if (${collection} && ${collection}.length) {`);
+            instructions.push(`  ${collection}.forEach(${node.program.blockParams[0]} => {`);
+            node.program.body.forEach(child => {
+              instructions = instructions.concat(this.processNode(parentAcc, child));
+            });
+            instructions.push(`  });`);
+            instructions.push('}');
+
+            break;
+        }
+        break;
+      default:
+        break;
+    }
+
+    return instructions.join("\n");
+  }
+
+  compile() {
+    return this.processNode('_r', this.ast);
+  }
+
+}
+
+function compile(template) {
+  const preprocessor = Ember.__loader.require('@glimmer/syntax');
+  const compiled = preprocessor.preprocess(template);
+  const compiler = new Compiler(compiled);
+
+  let code = compiler.compile();
+
+  let imports = '';
+  if (compiler.state.helpersUsed.iconNode) {
+    imports += "var __iN = Discourse.__widget_helpers.iconNode; ";
+  }
+  if (compiler.state.helpersUsed.rawHtml) {
+    imports += "var __rH = Discourse.__widget_helpers.rawHtml; ";
+  }
+
+  return `function(attrs, state) { ${imports}var _r = [];\n${code}\nreturn _r; }`;
+}
+
+exports.compile = compile;
+
+function error(path, state, msg) {
+  const filename = state.file.opts.filename;
+  return path.replaceWithSourceString(`function() { console.error("${filename}: ${msg}"); }`);
+}
+
+exports.WidgetHbsCompiler = function(babel) {
+  let t = babel.types;
+  return {
+    visitor: {
+      ImportDeclaration(path, state) {
+        let node = path.node;
+        if (t.isLiteral(node.source, { value: "discourse/widgets/hbs-compiler" })) {
+          let first = node.specifiers && node.specifiers[0];
+          if (!t.isImportDefaultSpecifier(first)) {
+            let input = state.file.code;
+            let usedImportStatement = input.slice(node.start, node.end);
+            let msg = `Only \`import hbs from 'discourse/widgets/hbs-compiler'\` is supported. You used: \`${usedImportStatement}\``;
+            throw path.buildCodeFrameError(msg);
+          }
+
+          state.importId = state.importId || path.scope.generateUidIdentifierBasedOnNode(path.node.id);
+          path.scope.rename(first.local.name, state.importId.name);
+          path.remove();
+        }
+      },
+
+      TaggedTemplateExpression(path, state) {
+        if (!state.importId) { return; }
+
+        let tagPath = path.get('tag');
+        if (tagPath.node.name !== state.importId.name) {
+          return;
+        }
+
+        if (path.node.quasi.expressions.length) {
+          return error(path, state, "placeholders inside a tagged template string are not supported");
+        }
+
+        let template = path.node.quasi.quasis.map(quasi => quasi.value.cooked).join('');
+
+        try {
+          path.replaceWithSourceString(compile(template));
+        } catch(e) {
+          return error(path, state, e.toString());
+        }
+
+      }
+    }
+  };
+};
diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb
index 44a2fe537e..4d1b15e8a5 100644
--- a/lib/js_locale_helper.rb
+++ b/lib/js_locale_helper.rb
@@ -1,12 +1,23 @@
 module JsLocaleHelper
 
+  def self.plugin_client_files(locale_str)
+    Dir["#{Rails.root}/plugins/*/config/locales/client.#{locale_str}.yml"]
+  end
+
+  def self.reloadable_plugins(locale, ctx)
+    return unless Rails.env.development?
+    plugin_client_files(locale.to_s).each do |file|
+      ctx.depend_on(file)
+    end
+  end
+
   def self.plugin_translations(locale_str)
     @plugin_translations ||= HashWithIndifferentAccess.new
 
     @plugin_translations[locale_str] ||= begin
       translations = {}
 
-      Dir["#{Rails.root}/plugins/*/config/locales/client.#{locale_str}.yml"].each do |file|
+      plugin_client_files(locale_str).each do |file|
         if plugin_translations = YAML.load_file(file)[locale_str]
           translations.deep_merge!(plugin_translations)
         end
@@ -16,20 +27,36 @@ module JsLocaleHelper
     end
   end
 
-  def self.load_translations(locale, opts=nil)
+  def self.load_translations(locale, opts = nil)
     opts ||= {}
 
     @loaded_translations = nil if opts[:force]
+    @plugin_translations = nil if opts[:force]
 
     @loaded_translations ||= HashWithIndifferentAccess.new
     @loaded_translations[locale] ||= begin
       locale_str = locale.to_s
 
       # load default translations
-      translations = YAML.load_file("#{Rails.root}/config/locales/client.#{locale_str}.yml")
+      yml_file = "#{Rails.root}/config/locales/client.#{locale_str}.yml"
+      if File.exist?(yml_file)
+        translations = YAML.load_file(yml_file)
+      else
+        # If we can't find a base file in Discourse, it might only exist in a plugin
+        # so let's start with a basic object we can merge into
+        translations = {
+          locale_str => {
+            'js' => {},
+            'admin_js' => {}
+          }
+        }
+      end
 
       # merge translations (plugin translations overwrite default translations)
-      translations[locale_str]['js'].deep_merge!(plugin_translations(locale_str)['js']) if translations[locale_str] && plugin_translations(locale_str) && plugin_translations(locale_str)['js']
+      if translations[locale_str] && plugin_translations(locale_str)
+        translations[locale_str]['js'].deep_merge!(plugin_translations(locale_str)['js']) if plugin_translations(locale_str)['js']
+        translations[locale_str]['admin_js'].deep_merge!(plugin_translations(locale_str)['admin_js']) if plugin_translations(locale_str)['admin_js']
+      end
 
       translations
     end
@@ -149,7 +176,7 @@ module JsLocaleHelper
   end
 
   def self.generate_message_format(message_formats, locale_str)
-    formats = message_formats.map { |k,v| k.inspect << " : " << compile_message_format(locale_str, v) }.join(", ")
+    formats = message_formats.map { |k, v| k.inspect << " : " << compile_message_format(locale_str, v) }.join(", ")
 
     filename = "#{Rails.root}/lib/javascripts/locale/#{locale_str}.js"
     filename = "#{Rails.root}/lib/javascripts/locale/en.js" unless File.exists?(filename)
@@ -161,6 +188,7 @@ module JsLocaleHelper
   end
 
   def self.reset_context
+    @ctx&.dispose
     @ctx = nil
   end
 
diff --git a/lib/json_error.rb b/lib/json_error.rb
index e52f18edf4..1675ac562b 100644
--- a/lib/json_error.rb
+++ b/lib/json_error.rb
@@ -1,8 +1,11 @@
 module JsonError
 
-  def create_errors_json(obj, type=nil)
+  def create_errors_json(obj, opts = nil)
+    opts ||= {}
+
     errors = create_errors_array obj
-    errors[:error_type] = type if type
+    errors[:error_type] = opts[:type] if opts[:type]
+    errors[:extras] = opts[:extras] if opts[:extras]
     errors
   end
 
diff --git a/lib/letter_avatar.rb b/lib/letter_avatar.rb
index 62915edcab..93766c4b2d 100644
--- a/lib/letter_avatar.rb
+++ b/lib/letter_avatar.rb
@@ -89,7 +89,7 @@ class LetterAvatar
     end
 
     def to_rgb(color)
-      r,g,b = color
+      r, g, b = color
       "rgb(#{r},#{g},#{b})"
     end
 
@@ -108,7 +108,7 @@ class LetterAvatar
       skip = File.basename(cache_path)
       parent_path = File.dirname(cache_path)
       Dir.entries(parent_path).each do |path|
-        unless ['.','..'].include?(path) || path == skip
+        unless ['.', '..'].include?(path) || path == skip
           FileUtils.rm_rf(parent_path + "/" + path)
         end
       end
@@ -121,220 +121,220 @@ class LetterAvatar
   #   - H: 0 - 360
   #   - C: 0 - 2
   #   - L: 0.75 - 1.5
-  COLORS = [[198,125,40],
-      [61,155,243],
-      [74,243,75],
-      [238,89,166],
-      [52,240,224],
-      [177,156,155],
-      [240,120,145],
-      [111,154,78],
-      [237,179,245],
-      [237,101,95],
-      [89,239,155],
-      [43,254,70],
-      [163,212,245],
-      [65,152,142],
-      [165,135,246],
-      [181,166,38],
-      [187,229,206],
-      [77,164,25],
-      [179,246,101],
-      [234,93,37],
-      [225,155,115],
-      [142,140,188],
-      [223,120,140],
-      [249,174,27],
-      [244,117,225],
-      [137,141,102],
-      [75,191,146],
-      [188,239,142],
-      [164,199,145],
-      [173,120,149],
-      [59,195,89],
-      [222,198,220],
-      [68,145,187],
-      [236,204,179],
-      [159,195,72],
-      [188,121,189],
-      [166,160,85],
-      [181,233,37],
-      [236,177,85],
-      [121,147,160],
-      [234,218,110],
-      [241,157,191],
-      [62,200,234],
-      [133,243,34],
-      [88,149,110],
-      [59,228,248],
-      [183,119,118],
-      [251,195,45],
-      [113,196,122],
-      [197,115,70],
-      [80,175,187],
-      [103,231,238],
-      [240,72,133],
-      [228,149,241],
-      [180,188,159],
-      [172,132,85],
-      [180,135,251],
-      [236,194,58],
-      [217,176,109],
-      [88,244,199],
-      [186,157,239],
-      [113,230,96],
-      [206,115,165],
-      [244,178,163],
-      [230,139,26],
-      [241,125,89],
-      [83,160,66],
-      [107,190,166],
-      [197,161,210],
-      [198,203,245],
-      [238,117,19],
-      [228,119,116],
-      [131,156,41],
-      [145,178,168],
-      [139,170,220],
-      [233,95,125],
-      [87,178,230],
-      [157,200,119],
-      [237,140,76],
-      [229,185,186],
-      [144,206,212],
-      [236,209,158],
-      [185,189,79],
-      [34,208,66],
-      [84,238,129],
-      [133,140,134],
-      [67,157,94],
-      [168,179,25],
-      [140,145,240],
-      [151,241,125],
-      [67,162,107],
-      [200,156,21],
-      [169,173,189],
-      [226,116,189],
-      [133,231,191],
-      [194,161,63],
-      [241,77,99],
-      [241,217,53],
-      [123,204,105],
-      [210,201,119],
-      [229,108,155],
-      [240,91,72],
-      [187,115,210],
-      [240,163,100],
-      [178,217,57],
-      [179,135,116],
-      [204,211,24],
-      [186,135,57],
-      [223,176,135],
-      [204,148,151],
-      [116,223,50],
-      [95,195,46],
-      [123,160,236],
-      [181,172,131],
-      [142,220,202],
-      [240,140,112],
-      [172,145,164],
-      [228,124,45],
-      [135,151,243],
-      [42,205,125],
-      [192,233,116],
-      [119,170,114],
-      [158,138,26],
-      [73,190,183],
-      [185,229,243],
-      [227,107,55],
-      [196,205,202],
-      [132,143,60],
-      [233,192,237],
-      [62,150,220],
-      [205,201,141],
-      [106,140,190],
-      [161,131,205],
-      [135,134,158],
-      [198,139,81],
-      [115,171,32],
-      [101,181,67],
-      [149,137,119],
-      [37,142,183],
-      [183,130,175],
-      [168,125,133],
-      [124,142,87],
-      [236,156,171],
-      [232,194,91],
-      [219,200,69],
-      [144,219,34],
-      [219,95,187],
-      [145,154,217],
-      [165,185,100],
-      [127,238,163],
-      [224,178,198],
-      [119,153,120],
-      [124,212,92],
-      [172,161,105],
-      [231,155,135],
-      [157,132,101],
-      [122,185,146],
-      [53,166,51],
-      [70,163,90],
-      [150,190,213],
-      [210,107,60],
-      [166,152,185],
-      [159,194,159],
-      [39,141,222],
-      [202,176,161],
-      [95,140,229],
-      [168,142,87],
-      [93,170,203],
-      [159,142,54],
-      [14,168,39],
-      [94,150,149],
-      [187,206,136],
-      [157,224,166],
-      [235,158,208],
-      [109,232,216],
-      [141,201,87],
-      [208,124,118],
-      [142,125,214],
-      [19,237,174],
-      [72,219,41],
-      [234,102,111],
-      [168,142,79],
-      [188,135,35],
-      [95,155,143],
-      [148,173,116],
-      [223,112,95],
-      [228,128,236],
-      [206,114,54],
-      [195,119,88],
-      [235,140,94],
-      [235,202,125],
-      [233,155,153],
-      [214,214,238],
-      [246,200,35],
-      [151,125,171],
-      [132,145,172],
-      [131,142,118],
-      [199,126,150],
-      [61,162,123],
-      [58,176,151],
-      [215,141,69],
-      [225,154,220],
-      [220,77,167],
-      [233,161,64],
-      [130,221,137],
-      [81,191,129],
-      [169,162,140],
-      [174,177,222],
-      [236,174,47],
-      [233,188,180],
-      [69,222,172],
-      [71,232,93],
-      [118,211,238],
-      [157,224,83],
-      [218,105,73],
-      [126,169,36]]
+  COLORS = [[198, 125, 40],
+      [61, 155, 243],
+      [74, 243, 75],
+      [238, 89, 166],
+      [52, 240, 224],
+      [177, 156, 155],
+      [240, 120, 145],
+      [111, 154, 78],
+      [237, 179, 245],
+      [237, 101, 95],
+      [89, 239, 155],
+      [43, 254, 70],
+      [163, 212, 245],
+      [65, 152, 142],
+      [165, 135, 246],
+      [181, 166, 38],
+      [187, 229, 206],
+      [77, 164, 25],
+      [179, 246, 101],
+      [234, 93, 37],
+      [225, 155, 115],
+      [142, 140, 188],
+      [223, 120, 140],
+      [249, 174, 27],
+      [244, 117, 225],
+      [137, 141, 102],
+      [75, 191, 146],
+      [188, 239, 142],
+      [164, 199, 145],
+      [173, 120, 149],
+      [59, 195, 89],
+      [222, 198, 220],
+      [68, 145, 187],
+      [236, 204, 179],
+      [159, 195, 72],
+      [188, 121, 189],
+      [166, 160, 85],
+      [181, 233, 37],
+      [236, 177, 85],
+      [121, 147, 160],
+      [234, 218, 110],
+      [241, 157, 191],
+      [62, 200, 234],
+      [133, 243, 34],
+      [88, 149, 110],
+      [59, 228, 248],
+      [183, 119, 118],
+      [251, 195, 45],
+      [113, 196, 122],
+      [197, 115, 70],
+      [80, 175, 187],
+      [103, 231, 238],
+      [240, 72, 133],
+      [228, 149, 241],
+      [180, 188, 159],
+      [172, 132, 85],
+      [180, 135, 251],
+      [236, 194, 58],
+      [217, 176, 109],
+      [88, 244, 199],
+      [186, 157, 239],
+      [113, 230, 96],
+      [206, 115, 165],
+      [244, 178, 163],
+      [230, 139, 26],
+      [241, 125, 89],
+      [83, 160, 66],
+      [107, 190, 166],
+      [197, 161, 210],
+      [198, 203, 245],
+      [238, 117, 19],
+      [228, 119, 116],
+      [131, 156, 41],
+      [145, 178, 168],
+      [139, 170, 220],
+      [233, 95, 125],
+      [87, 178, 230],
+      [157, 200, 119],
+      [237, 140, 76],
+      [229, 185, 186],
+      [144, 206, 212],
+      [236, 209, 158],
+      [185, 189, 79],
+      [34, 208, 66],
+      [84, 238, 129],
+      [133, 140, 134],
+      [67, 157, 94],
+      [168, 179, 25],
+      [140, 145, 240],
+      [151, 241, 125],
+      [67, 162, 107],
+      [200, 156, 21],
+      [169, 173, 189],
+      [226, 116, 189],
+      [133, 231, 191],
+      [194, 161, 63],
+      [241, 77, 99],
+      [241, 217, 53],
+      [123, 204, 105],
+      [210, 201, 119],
+      [229, 108, 155],
+      [240, 91, 72],
+      [187, 115, 210],
+      [240, 163, 100],
+      [178, 217, 57],
+      [179, 135, 116],
+      [204, 211, 24],
+      [186, 135, 57],
+      [223, 176, 135],
+      [204, 148, 151],
+      [116, 223, 50],
+      [95, 195, 46],
+      [123, 160, 236],
+      [181, 172, 131],
+      [142, 220, 202],
+      [240, 140, 112],
+      [172, 145, 164],
+      [228, 124, 45],
+      [135, 151, 243],
+      [42, 205, 125],
+      [192, 233, 116],
+      [119, 170, 114],
+      [158, 138, 26],
+      [73, 190, 183],
+      [185, 229, 243],
+      [227, 107, 55],
+      [196, 205, 202],
+      [132, 143, 60],
+      [233, 192, 237],
+      [62, 150, 220],
+      [205, 201, 141],
+      [106, 140, 190],
+      [161, 131, 205],
+      [135, 134, 158],
+      [198, 139, 81],
+      [115, 171, 32],
+      [101, 181, 67],
+      [149, 137, 119],
+      [37, 142, 183],
+      [183, 130, 175],
+      [168, 125, 133],
+      [124, 142, 87],
+      [236, 156, 171],
+      [232, 194, 91],
+      [219, 200, 69],
+      [144, 219, 34],
+      [219, 95, 187],
+      [145, 154, 217],
+      [165, 185, 100],
+      [127, 238, 163],
+      [224, 178, 198],
+      [119, 153, 120],
+      [124, 212, 92],
+      [172, 161, 105],
+      [231, 155, 135],
+      [157, 132, 101],
+      [122, 185, 146],
+      [53, 166, 51],
+      [70, 163, 90],
+      [150, 190, 213],
+      [210, 107, 60],
+      [166, 152, 185],
+      [159, 194, 159],
+      [39, 141, 222],
+      [202, 176, 161],
+      [95, 140, 229],
+      [168, 142, 87],
+      [93, 170, 203],
+      [159, 142, 54],
+      [14, 168, 39],
+      [94, 150, 149],
+      [187, 206, 136],
+      [157, 224, 166],
+      [235, 158, 208],
+      [109, 232, 216],
+      [141, 201, 87],
+      [208, 124, 118],
+      [142, 125, 214],
+      [19, 237, 174],
+      [72, 219, 41],
+      [234, 102, 111],
+      [168, 142, 79],
+      [188, 135, 35],
+      [95, 155, 143],
+      [148, 173, 116],
+      [223, 112, 95],
+      [228, 128, 236],
+      [206, 114, 54],
+      [195, 119, 88],
+      [235, 140, 94],
+      [235, 202, 125],
+      [233, 155, 153],
+      [214, 214, 238],
+      [246, 200, 35],
+      [151, 125, 171],
+      [132, 145, 172],
+      [131, 142, 118],
+      [199, 126, 150],
+      [61, 162, 123],
+      [58, 176, 151],
+      [215, 141, 69],
+      [225, 154, 220],
+      [220, 77, 167],
+      [233, 161, 64],
+      [130, 221, 137],
+      [81, 191, 129],
+      [169, 162, 140],
+      [174, 177, 222],
+      [236, 174, 47],
+      [233, 188, 180],
+      [69, 222, 172],
+      [71, 232, 93],
+      [118, 211, 238],
+      [157, 224, 83],
+      [218, 105, 73],
+      [126, 169, 36]]
 end
diff --git a/lib/markdown_linker.rb b/lib/markdown_linker.rb
index b6bb1a2eb1..fab7c5a6b6 100644
--- a/lib/markdown_linker.rb
+++ b/lib/markdown_linker.rb
@@ -17,7 +17,7 @@ class MarkdownLinker
 
   def references
     result = ""
-    (@rendered..@index-1).each do |i|
+    (@rendered..@index - 1).each do |i|
       result << "[#{i}]: #{@markdown_links[i]}\n"
     end
     @rendered = @index
diff --git a/lib/memory_diagnostics.rb b/lib/memory_diagnostics.rb
index a49480677a..3a3fcd60f5 100644
--- a/lib/memory_diagnostics.rb
+++ b/lib/memory_diagnostics.rb
@@ -4,7 +4,7 @@ module MemoryDiagnostics
     File.exists?(snapshot_filename)
   end
 
-  def self.compare(from=nil, to=nil)
+  def self.compare(from = nil, to = nil)
 
     from ||= snapshot_filename
     if !to
@@ -38,7 +38,7 @@ module MemoryDiagnostics
       end
     end
 
-    report << summary.sort{|a,b| b[1] <=> a[1]}[0..50].map{|k,v|
+    report << summary.sort { |a, b| b[1] <=> a[1] }[0..50].map { |k, v|
       "#{k}: #{v}"
     }.join("\n")
 
@@ -59,9 +59,9 @@ module MemoryDiagnostics
     "#{snapshot_path}/#{Process.pid}.snapshot"
   end
 
-  def self.snapshot_current_process(filename=nil)
+  def self.snapshot_current_process(filename = nil)
     filename ||= snapshot_filename
-    pid=fork do
+    pid = fork do
       snapshot(filename)
     end
 
@@ -86,7 +86,7 @@ module MemoryDiagnostics
     IO.binwrite(filename, Marshal::dump(object_ids))
   end
 
-  def self.memory_report(opts={})
+  def self.memory_report(opts = {})
     begin
       # ruby 2.1
       GC.start(full_mark: true)
@@ -94,7 +94,6 @@ module MemoryDiagnostics
       GC.start
     end
 
-
     classes = {}
     large_objects = []
 
@@ -113,11 +112,11 @@ module MemoryDiagnostics
           classes[:unknown] += 1
         end
       end
-      classes = classes.sort{|a,b| b[1] <=> a[1]}[0..40].map{|klass, count| "#{klass}: #{count}"}
+      classes = classes.sort { |a, b| b[1] <=> a[1] }[0..40].map { |klass, count| "#{klass}: #{count}" }
 
-      classes << "\nLarge Objects (#{large_objects.length} larger than 200 bytes total size #{large_objects.map{|x,_| x}.sum}):\n"
+      classes << "\nLarge Objects (#{large_objects.length} larger than 200 bytes total size #{large_objects.map { |x, _| x }.sum}):\n"
 
-      classes += large_objects.sort{|a,b| b[0] <=> a[0]}[0..800].map do |size,object|
+      classes += large_objects.sort { |a, b| b[0] <=> a[0] }[0..800].map do |size, object|
         rval = "#{object.class}: size #{size}"
         rval << " " << object.to_s[0..500].gsub("\n", "") if (String === object) || (Regexp === object)
         rval << "\n"
@@ -125,10 +124,8 @@ module MemoryDiagnostics
       end
     end
 
-    stats = GC.stat.map{|k,v| "#{k}: #{v}"}
-    counts = ObjectSpace.count_objects.sort{|a,b| b[1] <=> a[1] }.map{|k,v| "#{k}: #{v}"}
-
-
+    stats = GC.stat.map { |k, v| "#{k}: #{v}" }
+    counts = ObjectSpace.count_objects.sort { |a, b| b[1] <=> a[1] }.map { |k, v| "#{k}: #{v}" }
 
     <<TEXT
 #{`hostname`.strip} pid:#{Process.pid} #{`cat /proc/#{Process.pid}/cmdline`.strip.gsub(/[^a-z1-9\/]/i, ' ')}
@@ -149,7 +146,6 @@ TEXT
 
   end
 
-
   def self.full_gc
     # gc start may not collect everything
     GC.start while new_count = decreased_count(new_count)
diff --git a/lib/message_bus_diags.rb b/lib/message_bus_diags.rb
index 3d7f795dce..6db37c1095 100644
--- a/lib/message_bus_diags.rb
+++ b/lib/message_bus_diags.rb
@@ -11,7 +11,7 @@ class MessageBusDiags
   end
 
   def self.establish_peer_names
-    MessageBus.publish "/server-name", {channel: "/server-name-reply/#{my_id}"}
+    MessageBus.publish "/server-name", channel: "/server-name-reply/#{my_id}"
   end
 
   def self.seen_hosts
diff --git a/lib/method_profiler.rb b/lib/method_profiler.rb
new file mode 100644
index 0000000000..c96a7f5957
--- /dev/null
+++ b/lib/method_profiler.rb
@@ -0,0 +1,49 @@
+# see https://samsaffron.com/archive/2017/10/18/fastest-way-to-profile-a-method-in-ruby
+class MethodProfiler
+  def self.patch(klass, methods, name)
+    patches = methods.map do |method_name|
+      <<~RUBY
+      unless defined?(#{method_name}__mp_unpatched)
+        alias_method :#{method_name}__mp_unpatched, :#{method_name}
+        def #{method_name}(*args, &blk)
+          unless prof = Thread.current[:_method_profiler]
+            return #{method_name}__mp_unpatched(*args, &blk)
+          end
+          begin
+            start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+            #{method_name}__mp_unpatched(*args, &blk)
+          ensure
+            data = (prof[:#{name}] ||= {duration: 0.0, calls: 0})
+            data[:duration] += Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+            data[:calls] += 1
+          end
+        end
+      end
+      RUBY
+    end.join("\n")
+
+    klass.class_eval patches
+  end
+
+  def self.transfer
+    result = Thread.current[:_method_profiler]
+    Thread.current[:_method_profiler] = nil
+    result
+  end
+
+  def self.start(transfer = nil)
+    Thread.current[:_method_profiler] = transfer || {
+      __start: Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    }
+  end
+
+  def self.stop
+    finish = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    if data = Thread.current[:_method_profiler]
+      Thread.current[:_method_profiler] = nil
+      start = data.delete(:__start)
+      data[:total_duration] = finish - start
+    end
+    data
+  end
+end
diff --git a/lib/middleware/anonymous_cache.rb b/lib/middleware/anonymous_cache.rb
index 149ac3f009..ad5f0eeff2 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)
@@ -28,9 +30,9 @@ module Middleware
             # don't initialize params until later otherwise
             # you get a broken params on the request
             params = {}
-            user_agent  = @env[USER_AGENT]
+            user_agent = @env[USER_AGENT]
 
-            MobileDetection.resolve_mobile_view!(user_agent,params,session) ? :true : :false
+            MobileDetection.resolve_mobile_view!(user_agent, params, session) ? :true : :false
           end
 
         @is_mobile == :true
@@ -47,14 +49,23 @@ module Middleware
       def is_crawler?
         @is_crawler ||=
           begin
-            user_agent  = @env[USER_AGENT]
+            user_agent = @env[USER_AGENT]
             CrawlerDetection.crawler?(user_agent) ? :true : :false
           end
         @is_crawler == :true
       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
@@ -99,10 +110,10 @@ module Middleware
       #  that fills it up, this avoids a herd killing you, we can probably do this using a job or redis tricks
       #  but coordinating this is tricky
       def cache(result)
-        status,headers,response = result
+        status, headers, response = result
 
         if status == 200 && cache_duration
-          headers_stripped = headers.dup.delete_if{|k, _| ["Set-Cookie","X-MiniProfiler-Ids"].include? k}
+          headers_stripped = headers.dup.delete_if { |k, _| ["Set-Cookie", "X-MiniProfiler-Ids"].include? k }
           headers_stripped["X-Discourse-Cached"] = "true"
           parts = []
           response.each do |part|
@@ -110,12 +121,12 @@ module Middleware
           end
 
           $redis.setex(cache_key_body,  cache_duration, parts.join)
-          $redis.setex(cache_key_other, cache_duration, [status,headers_stripped].to_json)
+          $redis.setex(cache_key_other, cache_duration, [status, headers_stripped].to_json)
         else
           parts = response
         end
 
-        [status,headers,parts]
+        [status, headers, parts]
       end
 
       def clear_cache
@@ -125,7 +136,7 @@ module Middleware
 
     end
 
-    def initialize(app, settings={})
+    def initialize(app, settings = {})
       @app = app
     end
 
@@ -133,7 +144,7 @@ module Middleware
       helper = Helper.new(env)
 
       if helper.cacheable?
-        helper.cached or helper.cache(@app.call(env))
+        helper.cached || helper.cache(@app.call(env))
       else
         @app.call(env)
       end
diff --git a/lib/middleware/missing_avatars.rb b/lib/middleware/missing_avatars.rb
index 1d31568804..73bda77ab3 100644
--- a/lib/middleware/missing_avatars.rb
+++ b/lib/middleware/missing_avatars.rb
@@ -5,19 +5,19 @@ module Middleware
   # due to the files not being present locally. This middleware, only enabled in development
   # mode, will replace those with an appropriate image.
   class MissingAvatars
-    def initialize(app, settings={})
+    def initialize(app, settings = {})
       @app = app
     end
 
     def call(env)
       if (env['REQUEST_PATH'] =~ /^\/uploads\/default\/avatars/)
         path = "#{Rails.root}/public#{env['REQUEST_PATH']}"
-        unless File.exist?(path) 
+        unless File.exist?(path)
           default_image = "#{Rails.root}/public/images/d-logo-sketch-small.png"
           return [ 200, { 'Content-Type' => 'image/png' }, [ File.read(default_image)] ]
         end
       end
-      
+
       status, headers, response = @app.call(env)
       [status, headers, response]
     end
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index 90b36890d0..2e3fd707d6 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -1,12 +1,48 @@
+# frozen_string_literal: true
+
 require_dependency 'middleware/anonymous_cache'
 
 class Middleware::RequestTracker
 
-  def initialize(app, settings={})
+  @@detailed_request_loggers = nil
+
+  # register callbacks for detailed request loggers called on every request
+  # example:
+  #
+  # Middleware::RequestTracker.detailed_request_logger(->|env, data| do
+  #   # do stuff with env and data
+  # end
+  def self.register_detailed_request_logger(callback)
+
+    unless @patched_instrumentation
+      require_dependency "method_profiler"
+      MethodProfiler.patch(PG::Connection, [
+        :exec, :async_exec, :exec_prepared, :send_query_prepared, :query
+      ], :sql)
+
+      MethodProfiler.patch(Redis::Client, [
+        :call, :call_pipeline
+      ], :redis)
+      @patched_instrumentation = true
+    end
+
+    (@@detailed_request_loggers ||= []) << callback
+  end
+
+  def self.unregister_detailed_request_logger(callback)
+    @@detailed_request_loggers.delete callback
+
+    if @@detailed_request_loggers.length == 0
+      @detailed_request_loggers = nil
+    end
+
+  end
+
+  def initialize(app, settings = {})
     @app = app
   end
 
-  def self.log_request_on_site(data,host)
+  def self.log_request_on_site(data, host)
     RailsMultisite::ConnectionManagement.with_hostname(host) do
       log_request(data)
     end
@@ -44,19 +80,17 @@ class Middleware::RequestTracker
 
   end
 
-  TRACK_VIEW = "HTTP_DISCOURSE_TRACK_VIEW".freeze
-  CONTENT_TYPE = "Content-Type".freeze
-  def self.get_data(env,result)
-    status,headers = result
+  def self.get_data(env, result, timing)
+    status, headers = result
     status = status.to_i
 
     helper = Middleware::AnonymousCache::Helper.new(env)
     request = Rack::Request.new(env)
 
-    env_track_view = env[TRACK_VIEW]
+    env_track_view = env["HTTP_DISCOURSE_TRACK_VIEW"]
     track_view = status == 200
-    track_view &&= env_track_view != "0".freeze && env_track_view != "false".freeze
-    track_view &&= env_track_view || (request.get? && !request.xhr? && headers[CONTENT_TYPE] =~ /text\/html/)
+    track_view &&= env_track_view != "0" && env_track_view != "false"
+    track_view &&= env_track_view || (request.get? && !request.xhr? && headers["Content-Type"] =~ /text\/html/)
     track_view = !!track_view
 
     {
@@ -65,30 +99,92 @@ class Middleware::RequestTracker
       has_auth_cookie: helper.has_auth_cookie?,
       is_background: request.path =~ /^\/message-bus\// || request.path == /\/topics\/timings/,
       is_mobile: helper.is_mobile?,
-      track_view: track_view
+      track_view: track_view,
+      timing: timing
     }
+
   end
 
-  def call(env)
-    result = @app.call(env)
-  ensure
+  def log_request_info(env, result, info)
 
     # we got to skip this on error ... its just logging
-    data = self.class.get_data(env,result) rescue nil
+    data = self.class.get_data(env, result, info) rescue nil
     host = RailsMultisite::ConnectionManagement.host(env)
 
     if data
-      if result && (headers=result[1])
+      if result && (headers = result[1])
         headers["X-Discourse-TrackView"] = "1" if data[:track_view]
       end
-      log_later(data,host)
+
+      if @@detailed_request_loggers
+        @@detailed_request_loggers.each { |logger| logger.call(env, data) }
+      end
+
+      log_later(data, host)
     end
 
   end
 
-  def log_later(data,host)
-    Scheduler::Defer.later("Track view", _db=nil) do
-      self.class.log_request_on_site(data,host)
+  def call(env)
+    result = nil
+
+    if rate_limit(env)
+      result = [429, {}, ["Slow down, too Many Requests from this IP Address"]]
+      return result
+    end
+
+    env["discourse.request_tracker"] = self
+    MethodProfiler.start if @@detailed_request_loggers
+    result = @app.call(env)
+    info = MethodProfiler.stop if @@detailed_request_loggers
+    result
+  ensure
+    log_request_info(env, result, info) unless env["discourse.request_tracker.skip"]
+  end
+
+  def rate_limit(env)
+    if (
+      GlobalSetting.max_requests_per_ip_mode == "block" ||
+      GlobalSetting.max_requests_per_ip_mode == "warn"
+    )
+
+      ip = Rack::Request.new(env).ip
+
+      limiter10 = RateLimiter.new(
+        nil,
+        "global_ip_limit_10_#{ip}",
+        GlobalSetting.max_requests_per_ip_per_10_seconds,
+        10,
+        global: true
+      )
+
+      limiter60 = RateLimiter.new(
+        nil,
+        "global_ip_limit_60_#{ip}",
+        GlobalSetting.max_requests_per_ip_per_10_seconds,
+        10,
+        global: true
+      )
+
+      type = 10
+      begin
+        limiter10.performed!
+        type = 60
+        limiter60.performed!
+      rescue RateLimiter::LimitExceeded
+        if GlobalSetting.max_requests_per_ip_mode == "warn"
+          Rails.logger.warn("Global IP rate limit exceeded for #{ip}: #{type} second rate limit")
+          false
+        else
+          true
+        end
+      end
+    end
+  end
+
+  def log_later(data, host)
+    Scheduler::Defer.later("Track view", _db = nil) do
+      self.class.log_request_on_site(data, host)
     end
   end
 
diff --git a/lib/middleware/turbo_dev.rb b/lib/middleware/turbo_dev.rb
index beda165224..53e81cb50d 100644
--- a/lib/middleware/turbo_dev.rb
+++ b/lib/middleware/turbo_dev.rb
@@ -13,7 +13,7 @@ module Middleware
   #  config.middleware.insert 0, Middleware::TurboDev
   #
   class TurboDev
-    def initialize(app, settings={})
+    def initialize(app, settings = {})
       @app = app
     end
 
@@ -27,7 +27,7 @@ module Middleware
         etag = etag.gsub "\"", ""
         asset = Rails.application.assets.find_asset(name)
         if asset && asset.digest == etag
-          return [304,{},[]]
+          return [304, {}, []]
         end
       end
 
diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb
index 537c7faff0..39cf75cfaf 100644
--- a/lib/new_post_manager.rb
+++ b/lib/new_post_manager.rb
@@ -1,6 +1,7 @@
 require_dependency 'post_creator'
 require_dependency 'new_post_result'
 require_dependency 'post_enqueuer'
+require_dependency 'word_watcher'
 
 # Determines what actions should be taken with new posts.
 #
@@ -16,16 +17,16 @@ class NewPostManager
   end
 
   def self.handlers
-    sorted_handlers.map {|h| h[:proc]}
+    sorted_handlers.map { |h| h[:proc] }
   end
 
   def self.clear_handlers!
     @sorted_handlers = [{ priority: 0, proc: method(:default_handler) }]
   end
 
-  def self.add_handler(priority=0, &block)
+  def self.add_handler(priority = 0, &block)
     sorted_handlers << { priority: priority, proc: block }
-    @sorted_handlers.sort_by! {|h| -h[:priority]}
+    @sorted_handlers.sort_by! { |h| -h[:priority] }
   end
 
   def self.is_first_post?(manager)
@@ -43,14 +44,14 @@ class NewPostManager
 
     is_first_post?(manager) &&
     args[:typing_duration_msecs].to_i < SiteSetting.min_first_post_typing_time &&
-    SiteSetting.auto_block_fast_typers_on_first_post &&
-    manager.user.trust_level <= SiteSetting.auto_block_fast_typers_max_trust_level
+    SiteSetting.auto_silence_fast_typers_on_first_post &&
+    manager.user.trust_level <= SiteSetting.auto_silence_fast_typers_max_trust_level
   end
 
-  def self.matches_auto_block_regex?(manager)
+  def self.matches_auto_silence_regex?(manager)
     args = manager.args
 
-    pattern = SiteSetting.auto_block_first_post_regex
+    pattern = SiteSetting.auto_silence_first_post_regex
 
     return false unless pattern.present?
     return false unless is_first_post?(manager)
@@ -58,7 +59,7 @@ class NewPostManager
     begin
       regex = Regexp.new(pattern, Regexp::IGNORECASE)
     rescue => e
-      Rails.logger.warn "Invalid regex in auto_block_first_post_regex #{e}"
+      Rails.logger.warn "Invalid regex in auto_silence_first_post_regex #{e}"
       return false
     end
 
@@ -66,28 +67,32 @@ class NewPostManager
 
   end
 
-  def self.user_needs_approval?(manager)
+  def self.exempt_user?(user)
+    user.staff? || user.staged
+  end
+
+  def self.post_needs_approval?(manager)
     user = manager.user
 
-    return false if user.staff? || user.staged
+    return false if exempt_user?(user)
 
     (user.trust_level <= TrustLevel.levels[:basic] && user.post_count < SiteSetting.approve_post_count) ||
     (user.trust_level < SiteSetting.approve_unless_trust_level.to_i) ||
     (manager.args[:title].present? && user.trust_level < SiteSetting.approve_new_topics_unless_trust_level.to_i) ||
     is_fast_typer?(manager) ||
-    matches_auto_block_regex?(manager)
+    matches_auto_silence_regex?(manager) ||
+    WordWatcher.new("#{manager.args[:title]} #{manager.args[:raw]}").requires_approval?
   end
 
   def self.default_handler(manager)
-    if user_needs_approval?(manager)
-
+    if post_needs_approval?(manager)
       validator = Validators::PostValidator.new
       post = Post.new(raw: manager.args[:raw])
       post.user = manager.user
       validator.validate(post)
       if post.errors[:raw].present?
         result = NewPostResult.new(:created_post, false)
-        result.errors[:base] = post.errors[:raw]
+        result.errors[:base] << post.errors[:raw]
         return result
       end
 
@@ -105,9 +110,9 @@ class NewPostManager
       result = manager.enqueue('default')
 
       if is_fast_typer?(manager)
-        UserBlocker.block(manager.user, Discourse.system_user, keep_posts: true, reason: I18n.t("user.new_user_typed_too_fast"))
-      elsif matches_auto_block_regex?(manager)
-        UserBlocker.block(manager.user, Discourse.system_user, keep_posts: true, reason: I18n.t("user.content_matches_auto_block_regex"))
+        UserSilencer.silence(manager.user, Discourse.system_user, keep_posts: true, reason: I18n.t("user.new_user_typed_too_fast"))
+      elsif matches_auto_silence_regex?(manager)
+        UserSilencer.silence(manager.user, Discourse.system_user, keep_posts: true, reason: I18n.t("user.content_matches_auto_silence_regex"))
       end
 
       result
@@ -118,17 +123,25 @@ class NewPostManager
     SiteSetting.approve_post_count > 0 ||
     SiteSetting.approve_unless_trust_level.to_i > 0 ||
     SiteSetting.approve_new_topics_unless_trust_level.to_i > 0 ||
+    WordWatcher.words_for_action_exists?(:require_approval) ||
     handlers.size > 1
   end
 
   def initialize(user, args)
     @user = user
-    @args = args.delete_if {|_, v| v.nil?}
+    @args = args.delete_if { |_, v| v.nil? }
   end
 
   def perform
+    if !self.class.exempt_user?(@user) && WordWatcher.new("#{@args[:title]} #{@args[:raw]}").should_block?
+      result = NewPostResult.new(:created_post, false)
+      result.errors[:base] << I18n.t('contains_blocked_words')
+      return result
+    end
+
     # We never queue private messages
     return perform_create_post if @args[:archetype] == Archetype.private_message
+
     if args[:topic_id] && Topic.where(id: args[:topic_id], archetype: Archetype.private_message).exists?
       return perform_create_post
     end
@@ -145,11 +158,11 @@ class NewPostManager
   end
 
   # Enqueue this post in a queue
-  def enqueue(queue, reason=nil)
+  def enqueue(queue, reason = nil)
     result = NewPostResult.new(:enqueued)
     enqueuer = PostEnqueuer.new(@user, queue)
 
-    queued_args = {post_options: @args.dup}
+    queued_args = { post_options: @args.dup }
     queued_args[:raw] = queued_args[:post_options].delete(:raw)
     queued_args[:topic_id] = queued_args[:post_options].delete(:topic_id)
 
diff --git a/lib/new_post_result.rb b/lib/new_post_result.rb
index 63acab0b00..78725ea11f 100644
--- a/lib/new_post_result.rb
+++ b/lib/new_post_result.rb
@@ -10,7 +10,7 @@ class NewPostResult
   attr_accessor :queued_post
   attr_accessor :pending_count
 
-  def initialize(action, success=false)
+  def initialize(action, success = false)
     @action = action
     @success = success
   end
diff --git a/lib/onebox/engine/discourse_local_onebox.rb b/lib/onebox/engine/discourse_local_onebox.rb
index 629cfd6d91..a1ce9ebe82 100644
--- a/lib/onebox/engine/discourse_local_onebox.rb
+++ b/lib/onebox/engine/discourse_local_onebox.rb
@@ -12,8 +12,7 @@ module Onebox
         url = other.to_s
         return false unless url[Discourse.base_url]
 
-        path = url.sub(Discourse.base_url, "")
-        route = Rails.application.routes.recognize_path(path)
+        route = Discourse.route_for(url)
 
         !!(route[:controller] =~ /topics|uploads/)
       rescue ActionController::RoutingError
@@ -21,8 +20,9 @@ module Onebox
       end
 
       def to_html
-        path = @url.sub(Discourse.base_url, "")
-        route = Rails.application.routes.recognize_path(path)
+        uri = URI(@url)
+        path = uri.path || ""
+        route = Discourse.route_for(uri)
 
         case route[:controller]
         when "uploads" then upload_html(path)
@@ -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/onebox/engine/whitelisted_generic_onebox.rb b/lib/onebox/engine/whitelisted_generic_onebox.rb
index e711b960c9..f48ad2f214 100644
--- a/lib/onebox/engine/whitelisted_generic_onebox.rb
+++ b/lib/onebox/engine/whitelisted_generic_onebox.rb
@@ -14,6 +14,24 @@ module Onebox
         Float::INFINITY
       end
 
+      private
+
+        # overwrite to whitelist iframes
+        def is_embedded?
+          return false unless data[:html] && data[:height]
+          return true if WhitelistedGenericOnebox.html_providers.include?(data[:provider_name])
+
+          if data[:html]["iframe"]
+            fragment = Nokogiri::HTML::fragment(data[:html])
+            if iframe = fragment.at_css("iframe")
+              src = iframe["src"]
+              return src.present? && SiteSetting.allowed_iframes.split("|").any? { |url| src.start_with?(url) }
+            end
+          end
+
+          false
+        end
+
     end
   end
 end
diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb
index 6a190acd18..121984f680 100644
--- a/lib/oneboxer.rb
+++ b/lib/oneboxer.rb
@@ -17,13 +17,21 @@ module Oneboxer
     end
   end
 
-  def self.preview(url, options=nil)
+  def self.ignore_redirects
+    @ignore_redirects ||= ['http://www.dropbox.com', 'http://store.steampowered.com', Discourse.base_url]
+  end
+
+  def self.force_get_hosts
+    @force_get_hosts ||= ['http://us.battle.net']
+  end
+
+  def self.preview(url, options = nil)
     options ||= {}
     invalidate(url) if options[:invalidate_oneboxes]
     onebox_raw(url)[:preview]
   end
 
-  def self.onebox(url, options=nil)
+  def self.onebox(url, options = nil)
     options ||= {}
     invalidate(url) if options[:invalidate_oneboxes]
     onebox_raw(url)[:onebox]
@@ -70,7 +78,7 @@ module Oneboxer
 
   def self.append_source_topic_id(url, topic_id)
     # hack urls to create proper expansions
-    if url =~ Regexp.new("^#{Discourse.base_url.gsub(".","\\.")}.*$", true)
+    if url =~ Regexp.new("^#{Discourse.base_url.gsub(".", "\\.")}.*$", true)
       uri = URI.parse(url) rescue nil
       if uri && uri.path
         route = Rails.application.routes.recognize_path(uri.path) rescue nil
@@ -82,7 +90,7 @@ module Oneboxer
     url
   end
 
-  def self.apply(string_or_doc, args=nil)
+  def self.apply(string_or_doc, args = nil)
     doc = string_or_doc
     doc = Nokogiri::HTML::fragment(doc) if doc.is_a?(String)
     changed = false
@@ -91,7 +99,7 @@ module Oneboxer
       if args && args[:topic_id]
         url = append_source_topic_id(url, args[:topic_id])
       end
-      onebox, _preview = yield(url,element)
+      onebox, _preview = yield(url, element)
       if onebox
         parsed_onebox = Nokogiri::HTML::fragment(onebox)
         next unless parsed_onebox.children.count > 0
@@ -142,11 +150,11 @@ module Oneboxer
     end
 
     def self.onebox_raw(url)
-
       Rails.cache.fetch(onebox_cache_key(url), expires_in: 1.day) do
-        fd = FinalDestination.new(url)
+        fd = FinalDestination.new(url, ignore_redirects: ignore_redirects, force_get_hosts: force_get_hosts)
         uri = fd.resolve
         return blank_onebox if uri.blank? || SiteSetting.onebox_domains_blacklist.include?(uri.hostname)
+
         options = {
           cache: {},
           max_width: 695,
@@ -155,7 +163,12 @@ module Oneboxer
 
         options[:cookie] = fd.cookie if fd.cookie
 
+        if Rails.env.development? && SiteSetting.port.to_i > 0
+          Onebox.options = { allowed_ports: [80, 443, SiteSetting.port.to_i] }
+        end
+
         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/pbkdf2.rb b/lib/pbkdf2.rb
index f21cc8aebc..1032b4a1ad 100644
--- a/lib/pbkdf2.rb
+++ b/lib/pbkdf2.rb
@@ -20,18 +20,18 @@ class Pbkdf2
     u = ret = prf(h, password, salt + [1].pack("N"))
 
     2.upto(iterations) do
-     u = prf(h, password, u)
+      u = prf(h, password, u)
      ret.xor!(u)
     end
 
-    ret.bytes.map{|b| ("0" + b.to_s(16))[-2..-1]}.join("")
+    ret.bytes.map { |b| ("0" + b.to_s(16))[-2..-1] }.join("")
   end
 
   protected
 
   # fallback xor in case we need it for jruby ... way slower
-  def self.xor(x,y)
-    x.bytes.zip(y.bytes).map{|x,y| x ^ y}.pack('c*')
+  def self.xor(x, y)
+    x.bytes.zip(y.bytes).map { |x, y| x ^ y }.pack('c*')
   end
 
   def self.prf(hash_function, password, data)
diff --git a/lib/pinned_check.rb b/lib/pinned_check.rb
index b1a25a4d5d..54543499b3 100644
--- a/lib/pinned_check.rb
+++ b/lib/pinned_check.rb
@@ -2,16 +2,16 @@
 # taking into account anonymous users and users who have dismissed it
 class PinnedCheck
 
-  def self.unpinned?(topic,topic_user=nil)
+  def self.unpinned?(topic, topic_user = nil)
     topic.pinned_at &&
     topic_user &&
     topic_user.cleared_pinned_at &&
     topic_user.cleared_pinned_at > topic.pinned_at
   end
 
-  def self.pinned?(topic, topic_user=nil)
+  def self.pinned?(topic, topic_user = nil)
     !!topic.pinned_at &&
-    !unpinned?(topic,topic_user)
+    !unpinned?(topic, topic_user)
   end
 
 end
diff --git a/lib/plain_text_to_markdown.rb b/lib/plain_text_to_markdown.rb
new file mode 100644
index 0000000000..ce785ca50f
--- /dev/null
+++ b/lib/plain_text_to_markdown.rb
@@ -0,0 +1,190 @@
+class PlainTextToMarkdown
+  SIGNATURE_SEPARATOR ||= "-- ".freeze
+
+  URL_REGEX ||= /((?:https?:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.])(?:[^\s()<>]+|\([^\s()<>]+\))+(?:\([^\s()<>]+\)|[^`!()\[\]{};:'".,<>?«»“”‘’\s]))/i
+
+  def initialize(plaintext, opts = {})
+    @plaintext = plaintext
+    @lines = []
+
+    @format_flowed = opts[:format_flowed] || false
+    @delete_flowed_space = opts[:delete_flowed_space] || false
+  end
+
+  def to_markdown
+    prepare_lines
+    classify_lines
+
+    markdown = ""
+    last_quote_level = 0
+    last_line_blank = false
+
+    @lines.each do |line|
+      current_line_blank = line.text.blank?
+
+      unless last_line_blank && current_line_blank
+        if line.quote_level > 0
+          quote_identifiers = ">" * line.quote_level
+          markdown << quote_identifiers << "\n" unless line.quote_level >= last_quote_level || current_line_blank
+          markdown << quote_identifiers
+          markdown << " " unless current_line_blank
+        else
+          markdown << "\n" unless last_quote_level == 0 || current_line_blank
+        end
+
+        markdown << convert_text(line)
+        markdown << "\n"
+      end
+
+      last_line_blank = current_line_blank
+      last_quote_level = line.quote_level
+    end
+
+    markdown.rstrip!
+    markdown
+  end
+
+  private
+
+  class CodeBlock < Struct.new(:start_line, :end_line)
+    def initialize(start_line, end_line = nil)
+      super
+    end
+
+    def valid?
+      start_line.present? && end_line.present?
+    end
+  end
+
+  class Line < Struct.new(:text, :quote_level, :code_block)
+    def initialize(text, quote_level = 0, code_block = nil)
+      super
+    end
+
+    def valid_code_block?
+      code_block&.valid?
+    end
+  end
+
+  def prepare_lines
+    previous_line = nil
+
+    @plaintext.each_line do |text|
+      text.chomp!
+      line = Line.new(text)
+
+      remove_quote_level_indicators!(line)
+
+      if @format_flowed
+        line = merge_lines(line, previous_line)
+        @lines << line unless line == previous_line
+      else
+        @lines << line
+      end
+
+      previous_line = line
+    end
+  end
+
+  def classify_lines
+    previous_line = nil
+
+    @lines.each do |line|
+      classify_line_as_code!(line, previous_line)
+
+      previous_line = line
+    end
+  end
+
+  # @param line [Line]
+  def remove_quote_level_indicators!(line)
+    match_data = line.text.match(/^(?<indicators>>+)\s?(?<text>.*)/)
+
+    if match_data
+      line.text = match_data[:text]
+      line.quote_level = match_data[:indicators].length
+    end
+  end
+
+  # @param line [Line]
+  # @param previous_line [Line]
+  # @return [Line]
+  def merge_lines(line, previous_line)
+    return line if previous_line.nil? || line.text.blank?
+    return line if line.text == SIGNATURE_SEPARATOR || previous_line.text == SIGNATURE_SEPARATOR
+    return line unless line.quote_level == previous_line.quote_level && previous_line.text.end_with?(" ")
+
+    previous_line.text = previous_line.text[0...-1] if @delete_flowed_space
+    previous_line.text += line.text
+    previous_line
+  end
+
+  # @param line [Line]
+  # @param previous_line [Line]
+  def classify_line_as_code!(line, previous_line)
+    line.code_block = previous_line.code_block unless previous_line.nil? || previous_line.valid_code_block?
+    return unless line.text =~ /^\s{0,3}```/
+
+    if line.code_block.present?
+      line.code_block.end_line = line
+    else
+      line.code_block = CodeBlock.new(line)
+    end
+  end
+
+  # @param line [Line]
+  # @return [string]
+  def convert_text(line)
+    text = line.text
+
+    if line.valid_code_block?
+      code_block = line.code_block
+      return code_block.start_line == line || code_block.end_line == line ? text.lstrip : text
+    end
+
+    converted_text = replace_duplicate_links(text)
+    converted_text = escape_special_characters(converted_text)
+    converted_text = indent_with_non_breaking_spaces(converted_text)
+    converted_text
+  end
+
+  def replace_duplicate_links(text)
+    text.to_enum(:scan, URL_REGEX)
+      .map { $& }
+      .group_by { |url| url }
+      .keep_if { |_, urls | urls.length > 1 }
+      .keys.each do |url|
+
+      text.gsub!(Regexp.new(%Q|#{url}(\s*[()\\[\\]<>«»'"“”‘’]?#{url}[()\\[\\]<>«»'"“”‘’]?)|, Regexp::IGNORECASE), url)
+    end
+
+    text
+  end
+
+  def indent_with_non_breaking_spaces(text)
+    text.sub(/^\s+/) do |s|
+      # replace tabs with 2 spaces
+      s.gsub!("\t", "  ")
+
+      # replace indentation with non-breaking spaces
+      s.length > 1 ? "&nbsp;" * s.length : s
+    end
+  end
+
+  def escape_special_characters(text)
+    escaped_text = ""
+
+    text.split(URL_REGEX).each do |text_part|
+      if text_part =~ URL_REGEX
+        # no escaping withing URLs
+        escaped_text << text_part
+      else
+        # escape Markdown and HTML
+        text_part.gsub!(/[\\`*_{}\[\]()#+\-.!~]/) { |c| "\\#{c}" }
+        escaped_text << CGI.escapeHTML(text_part)
+      end
+    end
+
+    escaped_text
+  end
+end
diff --git a/lib/plugin/auth_provider.rb b/lib/plugin/auth_provider.rb
index 570a245b08..996d9ba041 100644
--- a/lib/plugin/auth_provider.rb
+++ b/lib/plugin/auth_provider.rb
@@ -12,7 +12,7 @@ class Plugin::AuthProvider
   end
 
   def to_json
-    result = {name: name}
+    result = { name: name }
     result['customUrl'] = custom_url if custom_url
     result['titleOverride'] = title if title
     result['titleSetting'] = title_setting if title_setting
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index ca74990107..197606da79 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -2,7 +2,6 @@ require 'digest/sha1'
 require 'fileutils'
 require_dependency 'plugin/metadata'
 require_dependency 'plugin/auth_provider'
-require_dependency 'plugin/theme'
 
 class Plugin::CustomEmoji
   def self.cache_key
@@ -30,6 +29,7 @@ class Plugin::Instance
    :color_schemes,
    :initializers,
    :javascripts,
+   :service_workers,
    :styles,
    :themes].each do |att|
     class_eval %Q{
@@ -58,14 +58,14 @@ class Plugin::Instance
     }
   end
 
-  def initialize(metadata=nil, path=nil)
+  def initialize(metadata = nil, path = nil)
     @metadata = metadata
     @path = path
     @idx = 0
   end
 
   def add_admin_route(label, location)
-    @admin_route = {label: label, location: location}
+    @admin_route = { label: label, location: location }
   end
 
   def enabled?
@@ -74,66 +74,125 @@ class Plugin::Instance
 
   delegate :name, to: :metadata
 
-  def add_to_serializer(serializer, attr, define_include_method=true, &block)
-    klass = "#{serializer.to_s.classify}Serializer".constantize rescue "#{serializer.to_s}Serializer".constantize
+  def add_to_serializer(serializer, attr, define_include_method = true, &block)
+    reloadable_patch do |plugin|
+      klass = "#{serializer.to_s.classify}Serializer".constantize rescue "#{serializer.to_s}Serializer".constantize
 
-    klass.attributes(attr) unless attr.to_s.start_with?("include_")
+      unless attr.to_s.start_with?("include_")
+        klass.attributes(attr)
 
-    klass.send(:define_method, attr, &block)
+        if define_include_method
+          # Don't include serialized methods if the plugin is disabled
+          klass.send(:define_method, "include_#{attr}?") { plugin.enabled? }
+        end
+      end
 
-    return unless define_include_method
+      klass.send(:define_method, attr, &block)
+    end
+  end
 
-    # Don't include serialized methods if the plugin is disabled
-    plugin = self
-    klass.send(:define_method, "include_#{attr}?") { plugin.enabled? }
+  def replace_flags
+    settings = ::FlagSettings.new
+    yield settings
+
+    reloadable_patch do |plugin|
+      ::PostActionType.replace_flag_settings(settings) if plugin.enabled?
+    end
   end
 
   def whitelist_staff_user_custom_field(field)
-    User.register_plugin_staff_custom_field(field, self)
+    reloadable_patch do |plugin|
+      ::User.register_plugin_staff_custom_field(field, plugin) if plugin.enabled?
+    end
+  end
+
+  def custom_avatar_column(column)
+    reloadable_patch do |plugin|
+      AvatarLookup.lookup_columns << column
+      AvatarLookup.lookup_columns.uniq!
+    end
+  end
+
+  def add_body_class(class_name)
+    reloadable_patch do |plugin|
+      ::ApplicationHelper.extra_body_classes << class_name if plugin.enabled?
+    end
+  end
+
+  def rescue_from(exception, &block)
+    reloadable_patch do |plugin|
+      ::ApplicationController.rescue_from(exception, &block)
+    end
   end
 
   # Extend a class but check that the plugin is enabled
   # for class methods use `add_class_method`
-  def add_to_class(klass, attr, &block)
-    klass = klass.to_s.classify.constantize rescue klass.to_s.constantize
+  def add_to_class(class_name, attr, &block)
+    reloadable_patch do |plugin|
+      klass = class_name.to_s.classify.constantize rescue class_name.to_s.constantize
+      hidden_method_name = :"#{attr}_without_enable_check"
+      klass.send(:define_method, hidden_method_name, &block)
 
-    hidden_method_name = :"#{attr}_without_enable_check"
-    klass.send(:define_method, hidden_method_name, &block)
-
-    plugin = self
-    klass.send(:define_method, attr) do |*args|
-      send(hidden_method_name, *args) if plugin.enabled?
+      klass.send(:define_method, attr) do |*args|
+        send(hidden_method_name, *args) if plugin.enabled?
+      end
     end
   end
 
   # Adds a class method to a class, respecting if plugin is enabled
-  def add_class_method(klass, attr, &block)
-    klass = klass.to_s.classify.constantize rescue klass.to_s.constantize
+  def add_class_method(klass_name, attr, &block)
+    reloadable_patch do |plugin|
+      klass = klass_name.to_s.classify.constantize rescue klass_name.to_s.constantize
 
-    hidden_method_name = :"#{attr}_without_enable_check"
-    klass.send(:define_singleton_method, hidden_method_name, &block)
+      hidden_method_name = :"#{attr}_without_enable_check"
+      klass.send(:define_singleton_method, hidden_method_name, &block)
 
-    plugin = self
-    klass.send(:define_singleton_method, attr) do |*args|
-      send(hidden_method_name, *args) if plugin.enabled?
+      klass.send(:define_singleton_method, attr) do |*args|
+        send(hidden_method_name, *args) if plugin.enabled?
+      end
     end
   end
 
-  def add_model_callback(klass, callback, options = {}, &block)
-    klass = klass.to_s.classify.constantize rescue klass.to_s.constantize
-    plugin = self
+  def add_model_callback(klass_name, callback, options = {}, &block)
+    reloadable_patch do |plugin|
+      klass = klass_name.to_s.classify.constantize rescue klass_name.to_s.constantize
 
-    # generate a unique method name
-    method_name = "#{plugin.name}_#{klass.name}_#{callback}#{@idx}".underscore
-    @idx += 1
-    hidden_method_name = :"#{method_name}_without_enable_check"
-    klass.send(:define_method, hidden_method_name, &block)
+      # generate a unique method name
+      method_name = "#{plugin.name}_#{klass.name}_#{callback}#{@idx}".underscore
+      @idx += 1
+      hidden_method_name = :"#{method_name}_without_enable_check"
+      klass.send(:define_method, hidden_method_name, &block)
 
-    klass.send(callback, options) do |*args|
-      send(hidden_method_name, *args) if plugin.enabled?
+      klass.send(callback, options) do |*args|
+        send(hidden_method_name, *args) if plugin.enabled?
+      end
+
+      hidden_method_name
     end
+  end
 
-    hidden_method_name
+  def topic_view_post_custom_fields_whitelister(&block)
+    reloadable_patch do |plugin|
+      ::TopicView.add_post_custom_fields_whitelister(&block) if plugin.enabled?
+    end
+  end
+
+  def add_preloaded_group_custom_field(field)
+    reloadable_patch do |plugin|
+      ::Group.preloaded_custom_field_names << field if plugin.enabled?
+    end
+  end
+
+  def add_preloaded_topic_list_custom_field(field)
+    reloadable_patch do |plugin|
+      ::TopicList.preloaded_custom_fields << field if plugin.enabled?
+    end
+  end
+
+  def add_permitted_post_create_param(name)
+    reloadable_patch do |plugin|
+      ::Post.permitted_create_params << name if plugin.enabled?
+    end
   end
 
   # Add validation method but check that the plugin is enabled
@@ -164,7 +223,7 @@ class Plugin::Instance
   def delete_extra_automatic_assets(good_paths)
     return unless Dir.exists? auto_generated_path
 
-    filenames = good_paths.map{|f| File.basename(f)}
+    filenames = good_paths.map { |f| File.basename(f) }
     # nuke old files
     Dir.foreach(auto_generated_path) do |p|
       next if [".", ".."].include?(p)
@@ -201,20 +260,47 @@ class Plugin::Instance
 
   def notify_after_initialize
     color_schemes.each do |c|
-      ColorScheme.create_from_base(name: c[:name], colors: c[:colors]) unless ColorScheme.where(name: c[:name]).exists?
+      unless ColorScheme.where(name: c[:name]).exists?
+        ColorScheme.create_from_base(name: c[:name], colors: c[:colors])
+      end
     end
 
     initializers.each do |callback|
       begin
         callback.call(self)
       rescue ActiveRecord::StatementInvalid => e
-        # When running db:migrate for the first time on a new database, plugin initializers might
-        # try to use models. Tolerate it.
+        # When running `db:migrate` for the first time on a new database,
+        # plugin initializers might try to use models.
+        # Tolerate it.
         raise e unless e.message.try(:include?, "PG::UndefinedTable")
       end
     end
   end
 
+  def register_category_custom_field_type(name, type)
+    reloadable_patch do |plugin|
+      Category.register_custom_field_type(name, type) if plugin.enabled?
+    end
+  end
+
+  def register_topic_custom_field_type(name, type)
+    reloadable_patch do |plugin|
+      ::Topic.register_custom_field_type(name, type) if plugin.enabled?
+    end
+  end
+
+  def register_post_custom_field_type(name, type)
+    reloadable_patch do |plugin|
+      ::Post.register_custom_field_type(name, type) if plugin.enabled?
+    end
+  end
+
+  def register_group_custom_field_type(name, type)
+    reloadable_patch do |plugin|
+      ::Group.register_custom_field_type(name, type) if plugin.enabled?
+    end
+  end
+
   def register_seedfu_fixtures(paths)
     paths = [paths] if !paths.kind_of?(Array)
     SeedFu.fixture_paths.concat(paths)
@@ -242,29 +328,32 @@ class Plugin::Instance
     DiscoursePluginRegistry.register_html_builder(name, &block)
   end
 
-  def register_asset(file, opts=nil)
+  def register_asset(file, opts = nil)
     full_path = File.dirname(path) << "/assets/" << file
     assets << [full_path, opts]
   end
 
+  def register_service_worker(file, opts = nil)
+    service_workers << [
+      File.join(File.dirname(path), 'assets', file),
+      opts
+    ]
+  end
+
   def register_color_scheme(name, colors)
-    color_schemes << {name: name, colors: colors}
+    color_schemes << { name: name, colors: colors }
   end
 
   def register_seed_data(key, value)
     seed_data[key] = value
   end
 
-  def register_emoji(name, url)
-    Plugin::CustomEmoji.register(name, url)
+  def register_seed_path_builder(&block)
+    DiscoursePluginRegistry.register_seed_path_builder(&block)
   end
 
-  def register_theme(name)
-    return unless enabled?
-
-    theme = Plugin::Theme.new(self, name)
-    yield theme
-    themes << theme
+  def register_emoji(name, url)
+    Plugin::CustomEmoji.register(name, url)
   end
 
   def automatic_assets
@@ -339,6 +428,8 @@ JS
 
     register_assets! unless assets.blank?
 
+    register_service_workers!
+
     seed_data.each do |key, value|
       DiscoursePluginRegistry.register_seed_data(key, value)
     end
@@ -362,14 +453,13 @@ JS
       target = Rails.root.to_s + "/public/plugins/"
 
       Discourse::Utils.execute_command('mkdir', '-p', target)
-      target << name.gsub(/\s/,"_")
+      target << name.gsub(/\s/, "_")
       # TODO a cleaner way of registering and unregistering
       Discourse::Utils.execute_command('rm', '-f', target)
       Discourse::Utils.execute_command('ln', '-s', public_data, target)
     end
   end
 
-
   def auth_provider(opts)
     provider = Plugin::AuthProvider.new
 
@@ -379,7 +469,6 @@ JS
     auth_providers << provider
   end
 
-
   # shotgun approach to gem loading, in future we need to hack bundler
   #  to at least determine dependencies do not clash before loading
   #
@@ -390,7 +479,7 @@ JS
     PluginGem.load(path, name, version, opts)
   end
 
-  def enabled_site_setting(setting=nil)
+  def enabled_site_setting(setting = nil)
     if setting
       @enabled_site_setting = setting
     else
@@ -421,9 +510,9 @@ JS
 
       Dir.glob("#{root_path}/**/*") do |f|
         if File.directory?(f)
-          yield [f,true]
+          yield [f, true]
         elsif f.to_s.ends_with?(".js.es6") || f.to_s.ends_with?(".hbs")
-          yield [f,false]
+          yield [f, false]
         end
       end
     end
@@ -437,13 +526,31 @@ JS
     end
   end
 
+  def register_service_workers!
+    service_workers.each do |asset, opts|
+      DiscoursePluginRegistry.register_service_worker(asset, opts)
+    end
+  end
+
   private
 
   def write_asset(path, contents)
     unless File.exists?(path)
       ensure_directory(path)
-      File.open(path,"w") { |f| f.write(contents) }
+      File.open(path, "w") { |f| f.write(contents) }
     end
   end
 
+  def reloadable_patch(plugin = self)
+    if Rails.env.development? && defined?(ActiveSupport::Reloader)
+      ActiveSupport::Reloader.to_prepare do
+        # reload the patch
+        yield plugin
+      end
+    end
+
+    # apply the patch
+    yield plugin
+  end
+
 end
diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rb
index bcf8954d2b..d516d4ccb6 100644
--- a/lib/plugin/metadata.rb
+++ b/lib/plugin/metadata.rb
@@ -3,7 +3,7 @@ module Plugin; end
 
 class Plugin::Metadata
 
-  OFFICIAL_PLUGINS = Set.new([
+  OFFICIAL_PLUGINS ||= Set.new([
     "customer-flair",
     "discourse-adplugin",
     "discourse-akismet",
@@ -14,7 +14,7 @@ class Plugin::Metadata
     "discourse-details",
     "discourse-nginx-performance-report",
     "discourse-push-notifications",
-    "discourse-slack-official",
+    "discourse-chat-integration",
     "discourse-solved",
     "Spoiler Alert!",
     "staff-notes",
@@ -25,7 +25,14 @@ 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",
+    "discourse-prometheus"
   ])
 
   FIELDS ||= [:name, :about, :version, :authors, :url, :required_version]
diff --git a/lib/plugin/theme.rb b/lib/plugin/theme.rb
deleted file mode 100644
index 04128d6f35..0000000000
--- a/lib/plugin/theme.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-class Plugin::Theme
-  attr_reader :color_scheme
-
-  def initialize(plugin, name)
-    @plugin = plugin
-    @name = name
-  end
-
-  def css(name)
-    @plugin.register_asset("stylesheets/#{name}.scss")
-  end
-
-  def set_color_scheme(scheme)
-    @color_scheme = scheme
-  end
-
-  def register_public
-    public_dir = "#{@plugin.directory}/public"
-    if File.exist?(public_dir)
-      Rails.application.config.before_initialize do |app|
-        app.middleware.insert_before(
-          ::Rack::Runtime,
-          ::ActionDispatch::Static,
-          public_dir
-        )
-      end
-    end
-  end
-end
-
diff --git a/lib/plugin_gem.rb b/lib/plugin_gem.rb
index 48df5e57c8..ee470960d6 100644
--- a/lib/plugin_gem.rb
+++ b/lib/plugin_gem.rb
@@ -1,5 +1,5 @@
 module PluginGem
-  def self.load(path, name, version, opts=nil)
+  def self.load(path, name, version, opts = nil)
     opts ||= {}
 
     gems_path = File.dirname(path) + "/gems/#{RUBY_VERSION}"
@@ -21,6 +21,7 @@ module PluginGem
       end
     else
       puts "You are specifying the gem #{name} in #{path}, however it does not exist!"
+      puts "Looked for: #{spec_file}"
       exit(-1)
     end
   end
diff --git a/lib/post_action_creator.rb b/lib/post_action_creator.rb
index e995db1a29..32e4b2aa13 100644
--- a/lib/post_action_creator.rb
+++ b/lib/post_action_creator.rb
@@ -7,7 +7,10 @@ class PostActionCreator
   end
 
   def perform(action)
-    guardian.ensure_post_can_act!(@post, action, taken_actions: PostAction.counts_for([@post].compact, @user)[@post.try(:id)])
+    guardian.ensure_post_can_act!(@post, action, opts: {
+      taken_actions: PostAction.counts_for([@post].compact, @user)[@post&.id]
+    })
+
     PostAction.act(@user, @post, action)
   end
 
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 7f515a7ee4..4209d24595 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -92,14 +92,36 @@ class PostCreator
       return false
     end
 
-    # Make sure none of the users have muted the creator
-    names = @opts[:target_usernames]
-    if names.present? && !skip_validations? && !@user.staff?
-      users = User.where(username: names.split(',').flatten).pluck(:id, :username).to_h
+    if @opts[:target_usernames].present? && !skip_validations? && !@user.staff?
+      names = @opts[:target_usernames].split(',')
+
+      # Make sure max_allowed_message_recipients setting is respected
+      max_allowed_message_recipients = SiteSetting.max_allowed_message_recipients
+
+      if names.length > max_allowed_message_recipients
+        errors[:base] << I18n.t(:max_pm_recepients,
+          recipients_limit: max_allowed_message_recipients
+        )
+
+        return false
+      end
+
+      # Make sure none of the users have muted the creator
+      users = User.where(username: names).pluck(:id, :username).to_h
+
+      User
+        .joins("LEFT JOIN user_options ON user_options.user_id = users.id")
+        .joins("LEFT JOIN muted_users ON muted_users.muted_user_id = #{@user.id.to_i}")
+        .where("user_options.user_id IS NOT NULL")
+        .where("
+          (user_options.user_id IN (:user_ids) AND NOT user_options.allow_private_messages) OR
+          muted_users.user_id IN (:user_ids)
+        ", user_ids: users.keys)
+        .pluck(:id).each do |m|
 
-      MutedUser.where(user_id: users.keys, muted_user_id: @user.id).pluck(:user_id).each do |m|
         errors[:base] << I18n.t(:not_accepting_pms, username: users[m])
       end
+
       return false if errors[:base].present?
     end
 
@@ -166,7 +188,7 @@ class PostCreator
       enqueue_jobs unless @opts[:skip_jobs]
       BadgeGranter.queue_badge_grant(Badge::Trigger::PostRevision, post: @post)
 
-      trigger_after_events(@post)
+      trigger_after_events unless opts[:skip_events]
 
       auto_close unless @opts[:import_mode]
     end
@@ -197,6 +219,11 @@ class PostCreator
     ).enqueue_jobs
   end
 
+  def trigger_after_events
+    DiscourseEvent.trigger(:topic_created, @post.topic, @opts, @user) unless @opts[:topic_id]
+    DiscourseEvent.trigger(:post_created, @post, @opts, @user)
+  end
+
   def self.track_post_stats
     Rails.env != "test".freeze || @track_post_stats
   end
@@ -233,8 +260,8 @@ class PostCreator
     return unless post.reply_to_post_number.present?
 
     reply_info = Post.where(topic_id: post.topic_id, post_number: post.reply_to_post_number)
-                     .select(:user_id, :post_type)
-                     .first
+      .select(:user_id, :post_type)
+      .first
 
     if reply_info.present?
       post.reply_to_user_id ||= reply_info.user_id
@@ -262,11 +289,6 @@ class PostCreator
     end
   end
 
-  def trigger_after_events(post)
-    DiscourseEvent.trigger(:topic_created, post.topic, @opts, @user) unless @opts[:topic_id]
-    DiscourseEvent.trigger(:post_created, post, @opts, @user)
-  end
-
   def auto_close
     if @post.topic.private_message? &&
         !@post.topic.closed &&
@@ -310,11 +332,11 @@ class PostCreator
 
   def handle_spam
     if @spam
-      GroupMessage.create( Group[:moderators].name,
+      GroupMessage.create(Group[:moderators].name,
                            :spam_post_blocked,
-                           { user: @user,
-                             limit_once_per: 24.hours,
-                             message_params: {domains: @post.linked_hosts.keys.join(', ')} } )
+                           user: @user,
+                           limit_once_per: 24.hours,
+                           message_params: { domains: @post.linked_hosts.keys.join(', ') })
     elsif @post && errors.blank? && !skip_validations?
       SpamRulesEnforcer.enforce!(@post)
     end
@@ -333,7 +355,7 @@ class PostCreator
     unless @topic.topic_allowed_users.where(user_id: @user.id).exists?
       unless @topic.topic_allowed_groups.where('group_id IN (
                                               SELECT group_id FROM group_users where user_id = ?
-                                           )',@user.id).exists?
+                                           )', @user.id).exists?
         @topic.topic_allowed_users.create!(user_id: @user.id)
       end
     end
@@ -357,11 +379,13 @@ class PostCreator
   def find_category_id
     @opts.delete(:category) if @opts[:archetype].present? && @opts[:archetype] == Archetype.private_message
 
-    category = if (@opts[:category].is_a? Integer) || (@opts[:category] =~ /^\d+$/)
-                 Category.find_by(id: @opts[:category])
-               else
-                 Category.find_by(name_lower: @opts[:category].try(:downcase))
-               end
+    category =
+      if (@opts[:category].is_a? Integer) || (@opts[:category] =~ /^\d+$/)
+        Category.find_by(id: @opts[:category])
+      else
+        Category.find_by(name_lower: @opts[:category].try(:downcase))
+      end
+
     category&.id
   end
 
@@ -388,7 +412,8 @@ class PostCreator
       attrs[:word_count] = (@topic.word_count || 0) + @post.word_count
       attrs[:excerpt] = @post.excerpt(220, strip_links: true) if new_topic?
       attrs[:bumped_at] = @post.created_at unless @post.no_bump
-      @topic.update_attributes(attrs)
+      attrs[:updated_at] = 'now()'
+      @topic.update_columns(attrs)
     end
   end
 
@@ -449,7 +474,7 @@ class PostCreator
     end
 
     unless @post.topic.private_message?
-      @user.user_stat.post_count += 1
+      @user.user_stat.post_count += 1 if @post.post_type == Post.types[:regular] && !@post.is_first_post?
       @user.user_stat.topic_count += 1 if @post.is_first_post?
     end
 
@@ -485,7 +510,6 @@ class PostCreator
                        last_read_post_number: @post.post_number,
                        highest_seen_post_number: @post.post_number)
 
-
       # assume it took us 5 seconds of reading time to make a post
       PostTiming.record_timing(topic_id: @post.topic_id,
                                user_id: @post.user_id,
@@ -495,12 +519,9 @@ class PostCreator
 
     if @user.staged
       TopicUser.auto_notification_for_staging(@user.id, @topic.id, TopicUser.notification_reasons[:auto_watch])
-    elsif @user.user_option.notification_level_when_replying === NotificationLevels.topic_levels[:watching]
-      TopicUser.auto_notification(@user.id, @topic.id, TopicUser.notification_reasons[:created_post], NotificationLevels.topic_levels[:watching])
-    elsif @user.user_option.notification_level_when_replying === NotificationLevels.topic_levels[:regular]
-      TopicUser.auto_notification(@user.id, @topic.id, TopicUser.notification_reasons[:created_post], NotificationLevels.topic_levels[:regular])
     else
-      TopicUser.auto_notification(@user.id, @topic.id, TopicUser.notification_reasons[:created_post], NotificationLevels.topic_levels[:tracking])
+      notification_level = @user.user_option.notification_level_when_replying || NotificationLevels.topic_levels[:tracking]
+      TopicUser.auto_notification(@user.id, @topic.id, TopicUser.notification_reasons[:created_post], notification_level)
     end
   end
 
diff --git a/lib/post_destroyer.rb b/lib/post_destroyer.rb
index 22821fa5ea..6727211b9e 100644
--- a/lib/post_destroyer.rb
+++ b/lib/post_destroyer.rb
@@ -6,10 +6,10 @@ class PostDestroyer
 
   def self.destroy_old_hidden_posts
     Post.where(deleted_at: nil, hidden: true)
-        .where("hidden_at < ?", 30.days.ago)
-        .find_each do |post|
-        PostDestroyer.new(Discourse.system_user, post).destroy
-      end
+      .where("hidden_at < ?", 30.days.ago)
+      .find_each do |post|
+      PostDestroyer.new(Discourse.system_user, post).destroy
+    end
   end
 
   def self.destroy_stubs
@@ -17,26 +17,26 @@ class PostDestroyer
 
     # exclude deleted topics and posts that are actively flagged
     Post.where(deleted_at: nil, user_deleted: true)
-        .where("NOT EXISTS (
+      .where("NOT EXISTS (
             SELECT 1 FROM topics t
             WHERE t.deleted_at IS NOT NULL AND
                   t.id = posts.topic_id
         )")
-        .where("updated_at < ? AND post_number > 1", SiteSetting.delete_removed_posts_after.hours.ago)
-        .where("NOT EXISTS (
+      .where("updated_at < ? AND post_number > 1", SiteSetting.delete_removed_posts_after.hours.ago)
+      .where("NOT EXISTS (
                   SELECT 1
                   FROM post_actions pa
                   WHERE pa.post_id = posts.id AND
                         pa.deleted_at IS NULL AND
                         pa.post_action_type_id IN (?)
               )", PostActionType.notify_flag_type_ids)
-        .find_each do |post|
+      .find_each do |post|
 
       PostDestroyer.new(Discourse.system_user, post, context: context).destroy
     end
   end
 
-  def initialize(user, post, opts={})
+  def initialize(user, post, opts = {})
     @user = user
     @post = post
     @topic = post.topic if post
@@ -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)
 
@@ -74,12 +76,26 @@ class PostDestroyer
     @post.recover!
 
     if author = @post.user
-      author.user_stat.post_count += 1
+      if @post.is_first_post?
+        author.user_stat.topic_count += 1
+      else
+        author.user_stat.post_count += 1
+      end
       author.user_stat.save!
     end
 
+    if @post.is_first_post? && @post.topic && !@post.topic.private_message?
+      # Update stats of all people who replied
+      counts = Post.where(post_type: Post.types[:regular], topic_id: @post.topic_id).where('post_number > 1').group(:user_id).count
+      counts.each do |user_id, count|
+        if user_stat = UserStat.where(user_id: user_id).first
+          user_stat.update_attributes(post_count: user_stat.post_count + count)
+        end
+      end
+    end
+
     @post.publish_change_to_clients! :recovered
-    TopicTrackingState.publish_recover(@post.topic) if @post.topic && @post.post_number == 1
+    TopicTrackingState.publish_recover(@post.topic) if @post.topic && @post.is_first_post?
   end
 
   # When a post is properly deleted. Well, it's still soft deleted, but it will no longer
@@ -115,11 +131,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)
@@ -197,13 +216,15 @@ class PostDestroyer
     post_ids = PostReply.where(reply_id: @post.id).pluck(:post_id)
 
     if post_ids.present?
-      PostReply.delete_all reply_id: @post.id
+      PostReply.where(reply_id: @post.id).delete_all
       Post.where(id: post_ids).each { |p| p.update_column :reply_count, p.replies.count }
     end
   end
 
   def remove_associated_notifications
-    Notification.delete_all topic_id: @post.topic_id, post_number: @post.post_number
+    Notification
+      .where(topic_id: @post.topic_id, post_number: @post.post_number)
+      .delete_all
   end
 
   def update_associated_category_latest_topic
@@ -224,10 +245,12 @@ class PostDestroyer
       author.user_stat.first_post_created_at = author.posts.order('created_at ASC').first.try(:created_at)
     end
 
-    author.user_stat.post_count -= 1
+    if @post.post_type == Post.types[:regular] && !@post.is_first_post? && !@topic.nil?
+      author.user_stat.post_count -= 1
+    end
     author.user_stat.topic_count -= 1 if @post.is_first_post?
 
-    # We don't count replies to your own topics
+    # We don't count replies to your own topics in topic_reply_count
     if @topic && author.id != @topic.user_id
       author.user_stat.update_topic_reply_count
     end
@@ -238,6 +261,16 @@ class PostDestroyer
       author.last_posted_at = author.posts.order('created_at DESC').first.try(:created_at)
       author.save!
     end
+
+    if @post.is_first_post? && @post.topic && !@post.topic.private_message?
+      # Update stats of all people who replied
+      counts = Post.where(post_type: Post.types[:regular], topic_id: @post.topic_id).where('post_number > 1').group(:user_id).count
+      counts.each do |user_id, count|
+        if user_stat = UserStat.where(user_id: user_id).first
+          user_stat.update_attributes(post_count: user_stat.post_count - count)
+        end
+      end
+    end
   end
 
 end
diff --git a/lib/post_jobs_enqueuer.rb b/lib/post_jobs_enqueuer.rb
index 3227f76c3c..cb8fdb56c1 100644
--- a/lib/post_jobs_enqueuer.rb
+++ b/lib/post_jobs_enqueuer.rb
@@ -1,5 +1,5 @@
 class PostJobsEnqueuer
-  def initialize(post, topic, new_topic, opts={})
+  def initialize(post, topic, new_topic, opts = {})
     @post = post
     @topic = topic
     @new_topic = new_topic
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index 9b9ef68d54..a6b1623e8d 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -42,7 +42,7 @@ class PostRevisor
 
   attr_reader :category_changed
 
-  def initialize(post, topic=nil)
+  def initialize(post, topic = nil)
     @post = post
     @topic = topic || post.topic
   end
@@ -97,7 +97,6 @@ class PostRevisor
 
   track_topic_field(:featured_link) do |topic_changes, featured_link|
     if SiteSetting.topic_featured_link_enabled &&
-       featured_link.present? &&
        topic_changes.guardian.can_edit_featured_link?(topic_changes.topic.category_id)
 
       topic_changes.record_change('featured_link', topic_changes.topic.featured_link, featured_link)
@@ -112,7 +111,7 @@ class PostRevisor
   # - bypass_bump: do not bump the topic, even if last post
   # - skip_validations: ask ActiveRecord to skip validations
   # - skip_revision: do not create a new PostRevision record
-  def revise!(editor, fields, opts={})
+  def revise!(editor, fields, opts = {})
     @editor = editor
     @fields = fields.with_indifferent_access
     @opts = opts
@@ -197,7 +196,7 @@ class PostRevisor
   end
 
   def topic_changed?
-    PostRevisor.tracked_topic_fields.keys.any? {|f| @fields.has_key?(f)}
+    PostRevisor.tracked_topic_fields.keys.any? { |f| @fields.has_key?(f) }
   end
 
   def revise_post
@@ -253,15 +252,15 @@ class PostRevisor
       # UserActionCreator will create new UserAction records for the new owner
 
       UserAction.where(target_post_id: @post.id)
-                .where(user_id: prev_owner.id)
-                .where(action_type: USER_ACTIONS_TO_REMOVE)
-                .destroy_all
+        .where(user_id: prev_owner.id)
+        .where(action_type: USER_ACTIONS_TO_REMOVE)
+        .destroy_all
 
       if @post.post_number == 1
         UserAction.where(target_topic_id: @post.topic_id)
-                  .where(user_id: prev_owner.id)
-                  .where(action_type: UserAction::NEW_TOPIC)
-                  .destroy_all
+          .where(user_id: prev_owner.id)
+          .where(action_type: UserAction::NEW_TOPIC)
+          .destroy_all
       end
     end
 
@@ -283,16 +282,18 @@ class PostRevisor
     # post owner changed
     if prev_owner && new_owner && prev_owner != new_owner
       likes = UserAction.where(target_post_id: @post.id)
-                        .where(user_id: prev_owner.id)
-                        .where(action_type: UserAction::WAS_LIKED)
-                        .update_all(user_id: new_owner.id)
+        .where(user_id: prev_owner.id)
+        .where(action_type: UserAction::WAS_LIKED)
+        .update_all(user_id: new_owner.id)
 
       private_message = @post.topic.private_message?
 
       prev_owner_user_stat = prev_owner.user_stat
-      prev_owner_user_stat.post_count -= 1
-      prev_owner_user_stat.topic_count -= 1 if @post.is_first_post?
-      prev_owner_user_stat.likes_received -= likes if !private_message
+      unless private_message
+        prev_owner_user_stat.post_count -= 1 if @post.post_type == Post.types[:regular]
+        prev_owner_user_stat.topic_count -= 1 if @post.is_first_post?
+        prev_owner_user_stat.likes_received -= likes
+      end
       prev_owner_user_stat.update_topic_reply_count
 
       if @post.created_at == prev_owner.user_stat.first_post_created_at
@@ -302,9 +303,11 @@ class PostRevisor
       prev_owner_user_stat.save!
 
       new_owner_user_stat = new_owner.user_stat
-      new_owner_user_stat.post_count += 1
-      new_owner_user_stat.topic_count += 1 if @post.is_first_post?
-      new_owner_user_stat.likes_received += likes if !private_message
+      unless private_message
+        new_owner_user_stat.post_count += 1 if @post.post_type == Post.types[:regular]
+        new_owner_user_stat.topic_count += 1 if @post.is_first_post?
+        new_owner_user_stat.likes_received += likes
+      end
       new_owner_user_stat.update_topic_reply_count
       new_owner_user_stat.save!
     end
@@ -316,7 +319,7 @@ class PostRevisor
 
   def remove_flags_and_unhide_post
     return unless editing_a_flagged_and_hidden_post?
-    @post.post_actions.where(post_action_type_id: PostActionType.flag_types.values).each do |action|
+    @post.post_actions.where(post_action_type_id: PostActionType.flag_types_without_custom.values).each do |action|
       action.remove_act!(Discourse.system_user)
     end
     @post.unhide!
@@ -412,8 +415,8 @@ class PostRevisor
 
   def is_last_post?
     !Post.where(topic_id: @topic.id)
-         .where("post_number > ?", @post.post_number)
-         .exists?
+      .where("post_number > ?", @post.post_number)
+      .exists?
   end
 
   def plugin_callbacks
@@ -442,11 +445,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 d9000e102f..7655c76c8d 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -3,7 +3,6 @@ require 'nokogiri'
 require 'erb'
 require_dependency 'url_helper'
 require_dependency 'excerpt_parser'
-require_dependency 'post'
 require_dependency 'discourse_tagging'
 require_dependency 'pretty_text/helpers'
 
@@ -50,19 +49,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 +64,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,11 +122,12 @@ module PrettyText
 
   def self.reset_context
     @ctx_init.synchronize do
+      @ctx&.dispose
       @ctx = nil
     end
   end
 
-  def self.markdown(text, opts={})
+  def self.markdown(text, opts = {})
     # we use the exact same markdown converter as the client
     # TODO: use the same extensions on both client and server (in particular the template for mentions)
     baked = nil
@@ -133,59 +141,71 @@ module PrettyText
         CDN: Rails.configuration.action_controller.asset_host,
       }
 
-      if SiteSetting.enable_s3_uploads?
-        if SiteSetting.s3_cdn_url.present?
-          paths[:S3CDN] = SiteSetting.s3_cdn_url
+      if SiteSetting.Upload.enable_s3_uploads
+        if SiteSetting.Upload.s3_cdn_url.present?
+          paths[:S3CDN] = SiteSetting.Upload.s3_cdn_url
         end
         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.lookupPrimaryUserGroup = __lookupPrimaryUserGroup;
+        __optInput.formatUsername = __formatUsername;
+        __optInput.getTopicInfo = __getTopicInfo;
+        __optInput.categoryHashtagLookup = __categoryLookup;
+        __optInput.mentionLookup = __mentionLookup;
+        __optInput.customEmoji = #{custom_emoji.to_json};
+        __optInput.emojiUnicodeReplacer = __emojiUnicodeReplacer;
+        __optInput.lookupInlineOnebox = __lookupInlineOnebox;
+        __optInput.lookupImageUrls = __lookupImageUrls;
+        #{opts[:linkify] == false ? "__optInput.linkify = false;" : ""}
+        __optInput.censoredWords = #{WordWatcher.words_for_action(:censor).join('|').to_json};
+      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
@@ -206,7 +226,7 @@ module PrettyText
     end
   end
 
-  def self.cook(text, opts={})
+  def self.cook(text, opts = {})
     options = opts.dup
 
     # we have a minor inconsistency
@@ -232,7 +252,7 @@ module PrettyText
       add_rel_nofollow_to_user_content(doc)
     end
 
-    if SiteSetting.enable_s3_uploads && SiteSetting.s3_cdn_url.present?
+    if SiteSetting.Upload.enable_s3_uploads && SiteSetting.Upload.s3_cdn_url.present?
       add_s3_cdn(doc)
     end
 
@@ -262,7 +282,7 @@ module PrettyText
         if !uri.host.present? ||
            uri.host == site_uri.host ||
            uri.host.ends_with?("." << site_uri.host) ||
-           whitelist.any?{|u| uri.host == u || uri.host.ends_with?("." << u)}
+           whitelist.any? { |u| uri.host == u || uri.host.ends_with?("." << u) }
           # we are good no need for nofollow
         else
           l["rel"] = "nofollow noopener"
@@ -309,7 +329,7 @@ module PrettyText
     links
   end
 
-  def self.excerpt(html, max_length, options={})
+  def self.excerpt(html, max_length, options = {})
     # TODO: properly fix this HACK in ExcerptParser without introducing XSS
     doc = Nokogiri::HTML.fragment(html)
     strip_image_wrapping(doc)
@@ -323,7 +343,7 @@ module PrettyText
 
     # If the user is not basic, strip links from their bio
     fragment = Nokogiri::HTML.fragment(string)
-    fragment.css('a').each {|a| a.replace(a.inner_html) }
+    fragment.css('a').each { |a| a.replace(a.inner_html) }
     fragment.to_html
   end
 
diff --git a/lib/pretty_text/helpers.rb b/lib/pretty_text/helpers.rb
index abcb5b6665..dcb42d76d4 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
@@ -9,7 +11,7 @@ module PrettyText
         I18n.t(key)
       else
         str = I18n.t(key, Hash[opts.entries].symbolize_keys).dup
-        opts.each { |k,v| str.gsub!("{{#{k.to_s}}}", v.to_s) }
+        opts.each { |k, v| str.gsub!("{{#{k.to_s}}}", v.to_s) }
         str
       end
     end
@@ -20,13 +22,21 @@ module PrettyText
       return "" unless user.present?
 
       # TODO: Add support for ES6 and call `avatar-template` directly
-      if !user.uploaded_avatar_id
-        avatar_template = User.default_template(username)
-      else
-        avatar_template = user.avatar_template
-      end
+      UrlHelper.schemaless(UrlHelper.absolute(user.avatar_template))
+    end
 
-      UrlHelper.schemaless UrlHelper.absolute avatar_template
+    def lookup_primary_user_group(username)
+      return "" unless username
+      user = User.find_by(username_lower: username.downcase)
+      return "" unless user.present?
+
+      user.primary_group.try(:name) || ""
+    end
+
+    # Overwrite this in a plugin to change how markdown can format
+    # usernames on the server side
+    def format_username(username)
+      username
     end
 
     def mention_lookup(name)
@@ -43,6 +53,34 @@ module PrettyText
       end
     end
 
+    def lookup_image_urls(urls)
+      map = {}
+      result = {}
+
+      urls.each do |url|
+        sha1 = Upload.sha1_from_short_url(url)
+        map[url] = sha1 if sha1
+      end
+
+      if map.length > 0
+        reverse_map = map.invert
+
+        Upload.where(sha1: map.values).pluck(:sha1, :url).each do |row|
+          sha1, url = row
+
+          if short_url = reverse_map[sha1]
+            result[short_url] = url
+          end
+        end
+      end
+
+      result
+    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
@@ -61,7 +99,8 @@ module PrettyText
 
       if !is_tag && category = Category.query_from_hashtag_slug(text)
         [category.url_with_id, text]
-      elsif is_tag && tag = Tag.find_by_name(text.gsub!("#{tag_postfix}", ''))
+      elsif (!is_tag && tag = Tag.find_by(name: text)) ||
+            (is_tag && tag = Tag.find_by(name: text.gsub!("#{tag_postfix}", '')))
         ["#{Discourse.base_url}/tags/#{tag.name}", text]
       else
         nil
diff --git a/lib/pretty_text/shims.js b/lib/pretty_text/shims.js
index c156fdb0cd..aa95290e6c 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,14 @@ function __getURL(url) {
   return url;
 }
 
+function __lookupInlineOnebox(url) {
+  return __helpers.lookup_inline_onebox(url);
+}
+
+function __lookupImageUrls(urls) {
+  return __helpers.lookup_image_urls(urls);
+}
+
 function __getTopicInfo(i) {
   return __helpers.get_topic_info(i);
 }
@@ -46,6 +73,14 @@ function __lookupAvatar(p) {
   return __utils.avatarImg({size: "tiny", avatarTemplate: __helpers.avatar_template(p) }, __getURL);
 }
 
+function __formatUsername(u) {
+  return __helpers.format_username(u);
+}
+
+function __lookupPrimaryUserGroup(p) {
+  return __helpers.lookup_primary_user_group(p);
+}
+
 function __getCurrentUser(userId) {
   return __helpers.get_current_user(userId);
 }
diff --git a/lib/primary_group_lookup.rb b/lib/primary_group_lookup.rb
index c61bb1b7e5..ad3b4a5e01 100644
--- a/lib/primary_group_lookup.rb
+++ b/lib/primary_group_lookup.rb
@@ -1,5 +1,5 @@
 class PrimaryGroupLookup
-  def initialize(user_ids=[])
+  def initialize(user_ids = [])
     @user_ids = user_ids.tap(&:compact!).tap(&:uniq!).tap(&:flatten!)
   end
 
@@ -20,13 +20,15 @@ class PrimaryGroupLookup
 
   def user_lookup_hash
     users_with_primary_group = User.where(id: @user_ids)
-        .where.not(primary_group_id: nil)
-        .select(:id, :primary_group_id)
+      .where.not(primary_group_id: nil)
+      .select(:id, :primary_group_id)
 
     group_lookup = {}
-    group_ids = users_with_primary_group.map(&:primary_group_id).compact
+    group_ids = users_with_primary_group.map(&:primary_group_id)
+    group_ids.uniq!
+
     Group.where(id: group_ids).select(self.class.lookup_columns)
-         .each { |g| group_lookup[g.id] = g }
+      .each { |g| group_lookup[g.id] = g }
 
     hash = {}
     users_with_primary_group.each do |u|
diff --git a/lib/promotion.rb b/lib/promotion.rb
index 82dd5a998c..e40c39e10a 100644
--- a/lib/promotion.rb
+++ b/lib/promotion.rb
@@ -7,17 +7,15 @@ class Promotion
     @user = user
   end
 
-
   # Review a user for a promotion. Delegates work to a review_#{trust_level} method.
   # Returns true if the user was promoted, false otherwise.
   def review
     # nil users are never promoted
-    return false if @user.blank? || @user.trust_level_locked
+    return false if @user.blank? || !@user.manual_locked_trust_level.nil?
 
     # Promotion beyond basic requires some expensive queries, so don't do that here.
     return false if @user.trust_level >= TrustLevel[2]
 
-
     review_method = :"review_tl#{@user.trust_level}"
     return send(review_method) if respond_to?(review_method)
 
@@ -42,8 +40,8 @@ class Promotion
     old_level = @user.trust_level
     new_level = level
 
-    if new_level < old_level && !@user.trust_level_locked
-      next_up = new_level+1
+    if new_level < old_level && @user.manual_locked_trust_level.nil?
+      next_up = new_level + 1
       key = "tl#{next_up}_met?"
       if self.class.respond_to?(key) && self.class.send(key, @user)
         raise Discourse::InvalidAccess.new, I18n.t('trust_levels.change_failed_explanation',
@@ -62,10 +60,10 @@ class Promotion
       if admin
         StaffActionLogger.new(admin).log_trust_level_change(@user, old_level, new_level)
       else
-        UserHistory.create!( action: UserHistory.actions[:auto_trust_level_change],
-                             target_user_id: @user.id,
-                             previous_value: old_level,
-                             new_value: new_level)
+        UserHistory.create!(action: UserHistory.actions[:auto_trust_level_change],
+                            target_user_id: @user.id,
+                            previous_value: old_level,
+                            new_value: new_level)
       end
       @user.save!
       @user.user_profile.recook_bio
@@ -77,7 +75,6 @@ class Promotion
     true
   end
 
-
   def self.tl2_met?(user)
     stat = user.user_stat
     return false if stat.topics_entered < SiteSetting.tl2_requires_topics_entered
@@ -110,4 +107,31 @@ class Promotion
     TrustLevel3Requirements.new(user).requirements_lost?
   end
 
+  # Figure out what a user's trust level should be from scratch
+  def self.recalculate(user, performed_by = nil)
+    # First, use the manual locked level
+    unless user.manual_locked_trust_level.nil?
+      user.trust_level = user.manual_locked_trust_level
+      user.save
+      return
+    end
+
+    # Then consider the group locked level
+    if user.group_locked_trust_level
+      user.trust_level = user.group_locked_trust_level
+      user.save
+      return
+    end
+
+    user.update_column(:trust_level, TrustLevel[0])
+
+    p = Promotion.new(user)
+    p.review_tl0
+    p.review_tl1
+    p.review_tl2
+    if user.trust_level == 3 && Promotion.tl3_lost?(user)
+      user.change_trust_level!(2, log_action_for: performed_by || Discourse.system_user)
+    end
+  end
+
 end
diff --git a/lib/rate_limiter.rb b/lib/rate_limiter.rb
index 0985db9116..0b3344606f 100644
--- a/lib/rate_limiter.rb
+++ b/lib/rate_limiter.rb
@@ -7,7 +7,7 @@ class RateLimiter
   attr_reader :max, :secs, :user, :key
 
   def self.key_prefix
-    "l-rate-limit:"
+    "l-rate-limit3:"
   end
 
   def self.disable
@@ -20,76 +20,120 @@ class RateLimiter
 
   # We don't observe rate limits in test mode
   def self.disabled?
-    @disabled || Rails.env.test?
+    @disabled
   end
 
+  # Only used in test, only clears current namespace, does not clear globals
   def self.clear_all!
     $redis.delete_prefixed(RateLimiter.key_prefix)
   end
 
+  def self.clear_all_global!
+    $redis.without_namespace.keys("GLOBAL::#{key_prefix}*").each do |k|
+      $redis.without_namespace.del k
+    end
+  end
+
   def build_key(type)
     "#{RateLimiter.key_prefix}:#{@user && @user.id}:#{type}"
   end
 
-  def initialize(user, type, max, secs)
+  def initialize(user, type, max, secs, global: false)
     @user = user
     @type = type
     @key = build_key(type)
     @max = max
     @secs = secs
+    @global = global
   end
 
   def clear!
-    $redis.del(@key)
+    redis.del(prefixed_key)
   end
 
   def can_perform?
     rate_unlimited? || is_under_limit?
   end
 
+  # reloader friendly
+  unless defined? PERFORM_LUA
+    PERFORM_LUA = <<~LUA
+      local now = tonumber(ARGV[1])
+      local secs = tonumber(ARGV[2])
+      local max = tonumber(ARGV[3])
+
+      local key = KEYS[1]
+
+
+      if ((tonumber(redis.call("LLEN", key)) < max) or
+          (now - tonumber(redis.call("LRANGE", key, -1, -1)[1])) > secs) then
+        redis.call("LPUSH", key, now)
+        redis.call("LTRIM", key, 0, max - 1)
+        redis.call("EXPIRE", key, secs * 2)
+
+        return 1
+      else
+        return 0
+      end
+    LUA
+
+    PERFORM_LUA_SHA = Digest::SHA1.hexdigest(PERFORM_LUA)
+  end
+
   def performed!
     return if rate_unlimited?
-
-    if is_under_limit?
-      # simple ring buffer.
-      $redis.lpush(@key, Time.now.to_i)
-      $redis.ltrim(@key, 0, @max - 1)
-
-      # let's ensure we expire this key at some point, otherwise we have leaks
-      $redis.expire(@key, @secs * 2)
-    else
+    now = Time.now.to_i
+    if eval_lua(PERFORM_LUA, PERFORM_LUA_SHA, [prefixed_key], [now, @secs, @max]) == 0
       raise RateLimiter::LimitExceeded.new(seconds_to_wait, @type)
     end
+  rescue Redis::CommandError => e
+    if e.message =~ /READONLY/
+      # TODO,switch to in-memory rate limiter
+    else
+      raise
+    end
   end
 
   def rollback!
     return if RateLimiter.disabled?
-    $redis.lpop(@key)
+    redis.lpop(prefixed_key)
   end
 
   def remaining
     return @max if @user && @user.staff?
 
-    arr = $redis.lrange(@key, 0, @max) || []
+    arr = redis.lrange(prefixed_key, 0, @max) || []
     t0 = Time.now.to_i
-    arr.reject! {|a| (t0 - a.to_i) > @secs}
+    arr.reject! { |a| (t0 - a.to_i) > @secs }
     @max - arr.size
   end
 
   private
 
+  def prefixed_key
+    if @global
+      "GLOBAL::#{key}"
+    else
+      $redis.namespace_key(key)
+    end
+  end
+
+  def redis
+    $redis.without_namespace
+  end
+
   def seconds_to_wait
     @secs - age_of_oldest
   end
 
   def age_of_oldest
     # age of oldest event in buffer, in seconds
-    Time.now.to_i - $redis.lrange(@key, -1, -1).first.to_i
+    Time.now.to_i - redis.lrange(prefixed_key, -1, -1).first.to_i
   end
 
   def is_under_limit?
     # number of events in buffer less than max allowed? OR
-    ($redis.llen(@key) < @max) ||
+    (redis.llen(prefixed_key) < @max) ||
     # age bigger than silding window size?
     (age_of_oldest > @secs)
   end
@@ -97,4 +141,14 @@ class RateLimiter
   def rate_unlimited?
     !!(RateLimiter.disabled? || (@user && @user.staff?))
   end
+
+  def eval_lua(lua, sha, keys, args)
+    redis.evalsha(sha, keys, args)
+  rescue Redis::CommandError => e
+    if e.to_s =~ /^NOSCRIPT/
+      redis.eval(lua, keys, args)
+    else
+      raise
+    end
+  end
 end
diff --git a/lib/rate_limiter/limit_exceeded.rb b/lib/rate_limiter/limit_exceeded.rb
index 787bcdd381..67197b1dea 100644
--- a/lib/rate_limiter/limit_exceeded.rb
+++ b/lib/rate_limiter/limit_exceeded.rb
@@ -2,9 +2,9 @@ class RateLimiter
 
   # A rate limit has been exceeded.
   class LimitExceeded < StandardError
-    attr_reader :type
+    attr_reader :type, :available_in
 
-    def initialize(available_in, type=nil)
+    def initialize(available_in, type = nil)
       @available_in = available_in
       @type = type
     end
diff --git a/lib/rate_limiter/on_create_record.rb b/lib/rate_limiter/on_create_record.rb
index 4232ab9a7f..14374de6a1 100644
--- a/lib/rate_limiter/on_create_record.rb
+++ b/lib/rate_limiter/on_create_record.rb
@@ -13,7 +13,7 @@ class RateLimiter
       return @rate_limiter if @rate_limiter.present?
 
       limit_key = "create_#{self.class.name.underscore}"
-      max_setting = if user && user.new_user? and SiteSetting.has_setting?("rate_limit_new_user_#{limit_key}")
+      max_setting = if user && user.new_user? && SiteSetting.has_setting?("rate_limit_new_user_#{limit_key}")
         SiteSetting.send("rate_limit_new_user_#{limit_key}")
       else
         SiteSetting.send("rate_limit_#{limit_key}")
@@ -31,7 +31,7 @@ class RateLimiter
     end
 
     module ClassMethods
-      def rate_limit(limiter_method=nil)
+      def rate_limit(limiter_method = nil)
 
         limiter_method = limiter_method || :default_rate_limiter
 
diff --git a/lib/retrieve_title.rb b/lib/retrieve_title.rb
new file mode 100644
index 0000000000..37b17716b0
--- /dev/null
+++ b/lib/retrieve_title.rb
@@ -0,0 +1,75 @@
+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)
+
+      title = doc.at('title')&.inner_text
+
+      # A horrible hack - YouTube uses `document.title` to populate the title
+      # for some reason. For any other site than YouTube this wouldn't be worth it.
+      if title == "YouTube" && html =~ /document\.title *= *"(.*)";/
+        title = Regexp.last_match[1].sub(/ - YouTube$/, '')
+      end
+
+      if !title && node = doc.at('meta[property="og:title"]')
+        title = node['content']
+      end
+    end
+
+    if title.present?
+      title.gsub!(/\n/, ' ')
+      title.gsub!(/ +/, ' ')
+      title.strip!
+      return title
+    end
+    nil
+  end
+
+  private
+
+    def self.max_chunk_size(uri)
+
+      # Amazon and YouTube leave the title until very late. Exceptions are bad
+      # but these are large sites.
+      return 80 if uri.host =~ /amazon\.(com|ca|co\.uk|es|fr|de|it|com\.au|com\.br|cn|in|co\.jp|com\.mx)$/
+      return 300 if uri.host =~ /youtube\.com$/ || uri.host =~ /youtu.be/
+
+      # default is 10k
+      10
+    end
+
+    # Fetch the beginning of a HTML document at a url
+    def self.fetch_beginning(url)
+      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/lib/route_format.rb b/lib/route_format.rb
new file mode 100644
index 0000000000..0ebd43fbdf
--- /dev/null
+++ b/lib/route_format.rb
@@ -0,0 +1,11 @@
+module RouteFormat
+
+  def self.username
+    /[\w.\-]+?/
+  end
+
+  def self.backup
+    /.+\.(sql\.gz|tar\.gz|tgz)/i
+  end
+
+end
diff --git a/lib/rtl.rb b/lib/rtl.rb
new file mode 100644
index 0000000000..b6df383b58
--- /dev/null
+++ b/lib/rtl.rb
@@ -0,0 +1,29 @@
+class Rtl
+
+  attr_reader :user
+
+  def initialize(user)
+    @user = user
+  end
+
+  def enabled?
+    site_locale_rtl? || current_user_rtl?
+  end
+
+  def current_user_rtl?
+    SiteSetting.allow_user_locale && user.try(:locale).in?(rtl_locales)
+  end
+
+  def site_locale_rtl?
+    !SiteSetting.allow_user_locale && SiteSetting.default_locale.in?(rtl_locales)
+  end
+
+  def rtl_locales
+    %w(he ar ur fa_IR)
+  end
+
+  def css_class
+    enabled? ? 'rtl' : ''
+  end
+
+end
diff --git a/lib/s3_helper.rb b/lib/s3_helper.rb
index 7fbfcc8d10..9dadd71de3 100644
--- a/lib/s3_helper.rb
+++ b/lib/s3_helper.rb
@@ -1,4 +1,4 @@
-require "aws-sdk"
+require "aws-sdk-s3"
 
 class S3Helper
 
@@ -6,12 +6,12 @@ class S3Helper
 
   attr_reader :s3_bucket_name
 
-  def initialize(s3_upload_bucket, tombstone_prefix='', options={})
+  def initialize(s3_bucket_name, tombstone_prefix = '', options = {})
     @s3_options = default_s3_options.merge(options)
 
     @s3_bucket_name, @s3_bucket_folder_path = begin
-      raise Discourse::InvalidParameters.new("s3_bucket") if s3_upload_bucket.blank?
-      s3_upload_bucket.downcase.split("/".freeze, 2)
+      raise Discourse::InvalidParameters.new("s3_bucket_name") if s3_bucket_name.blank?
+      s3_bucket_name.downcase.split("/".freeze, 2)
     end
 
     @tombstone_prefix =
@@ -20,18 +20,16 @@ class S3Helper
       else
         tombstone_prefix
       end
-
-    check_missing_options
   end
 
-  def upload(file, path, options={})
+  def upload(file, path, options = {})
     path = get_path_for_s3_upload(path)
     obj = s3_bucket.object(path)
     obj.upload_file(file, options)
     path
   end
 
-  def remove(s3_filename, copy_to_tombstone=false)
+  def remove(s3_filename, copy_to_tombstone = false)
     bucket = s3_bucket
 
     # copy the file in tombstone
@@ -46,43 +44,141 @@ class S3Helper
   rescue Aws::S3::Errors::NoSuchKey
   end
 
-  def update_tombstone_lifecycle(grace_period)
-    return if @tombstone_prefix.blank?
+  # make sure we have a cors config for assets
+  # otherwise we will have no fonts
+  def ensure_cors!
+    rule = nil
+
+    begin
+      rule = s3_resource.client.get_bucket_cors(
+        bucket: @s3_bucket_name
+      ).cors_rules&.first
+    rescue Aws::S3::Errors::NoSuchCORSConfiguration
+      # no rule
+    end
+
+    unless rule
+      puts "installing CORS rule"
+
+      s3_resource.client.put_bucket_cors(
+        bucket: @s3_bucket_name,
+        cors_configuration: {
+          cors_rules: [{
+            allowed_headers: ["Authorization"],
+            allowed_methods: ["GET", "HEAD"],
+            allowed_origins: ["*"],
+            max_age_seconds: 3000
+          }]
+        }
+      )
+    end
+  end
+
+  def update_lifecycle(id, days, prefix: nil, tag: nil)
+
+    filter = {}
+
+    if prefix
+      filter[:prefix] = prefix
+    elsif tag
+      filter[:tag] = tag
+    end
 
     # cf. http://docs.aws.amazon.com/AmazonS3/latest/dev/object-lifecycle-mgmt.html
-    s3_resource.client.put_bucket_lifecycle({
+    rule = {
+      id: id,
+      status: "Enabled",
+      expiration: { days: days },
+      filter: filter
+    }
+
+    rules = []
+
+    begin
+      rules = s3_resource.client.get_bucket_lifecycle_configuration(bucket: @s3_bucket_name).rules
+    rescue Aws::S3::Errors::NoSuchLifecycleConfiguration
+      # skip trying to merge
+    end
+
+    # in the past we has a rule that was called purge-tombstone vs purge_tombstone
+    # just go ahead and normalize for our bucket
+    rules.delete_if do |r|
+      r.id.gsub('_', '-') == id.gsub('_', '-')
+    end
+
+    rules << rule
+
+    # normalize filter in rules, due to AWS library bug
+    rules = rules.map do |r|
+      r = r.to_h
+      prefix = r.delete(:prefix)
+      if prefix
+        r[:filter] = { prefix: prefix }
+      end
+      r
+    end
+
+    s3_resource.client.put_bucket_lifecycle_configuration(
       bucket: @s3_bucket_name,
       lifecycle_configuration: {
-        rules: [
-          {
-            id: "purge-tombstone",
-            status: "Enabled",
-            expiration: { days: grace_period },
-            prefix: @tombstone_prefix
-          }
-        ]
-      }
+        rules: rules
     })
   end
 
+  def update_tombstone_lifecycle(grace_period)
+    return if @tombstone_prefix.blank?
+    update_lifecycle("purge_tombstone", grace_period, prefix: @tombstone_prefix)
+  end
+
+  def list(prefix = "")
+    s3_bucket.objects(prefix: @s3_bucket_folder_path.to_s + prefix)
+  end
+
+  def tag_file(key, tags)
+    tag_array = []
+    tags.each do |k, v|
+      tag_array << { key: k.to_s, value: v.to_s }
+    end
+
+    s3_resource.client.put_object_tagging(
+      bucket: @s3_bucket_name,
+      key: key,
+      tagging: {
+        tag_set: tag_array
+      }
+    )
+  end
+
+  def self.s3_options(obj)
+    opts = { region: obj.s3_region }
+
+    unless obj.s3_use_iam_profile
+      opts[:access_key_id] = obj.s3_access_key_id
+      opts[:secret_access_key] = obj.s3_secret_access_key
+    end
+
+    opts
+  end
+
   private
 
+  def default_s3_options
+    if SiteSetting.enable_s3_uploads?
+      options = self.class.s3_options(SiteSetting)
+      check_missing_site_options
+      options
+    elsif GlobalSetting.use_s3?
+      self.class.s3_options(GlobalSetting)
+    else
+      {}
+    end
+  end
+
   def get_path_for_s3_upload(path)
     path = File.join(@s3_bucket_folder_path, path) if @s3_bucket_folder_path
     path
   end
 
-  def default_s3_options
-    opts = { region: SiteSetting.s3_region }
-
-    unless SiteSetting.s3_use_iam_profile
-      opts[:access_key_id] = SiteSetting.s3_access_key_id
-      opts[:secret_access_key] = SiteSetting.s3_secret_access_key
-    end
-
-    opts
-  end
-
   def s3_resource
     Aws::S3::Resource.new(@s3_options)
   end
@@ -93,10 +189,10 @@ class S3Helper
     bucket
   end
 
-  def check_missing_options
+  def check_missing_site_options
     unless SiteSetting.s3_use_iam_profile
-      raise SettingMissing.new("access_key_id") if @s3_options[:access_key_id].blank?
-      raise SettingMissing.new("secret_access_key") if @s3_options[:secret_access_key].blank?
+      raise SettingMissing.new("access_key_id") if SiteSetting.s3_access_key_id.blank?
+      raise SettingMissing.new("secret_access_key") if SiteSetting.s3_secret_access_key.blank?
     end
   end
 end
diff --git a/lib/scheduler/defer.rb b/lib/scheduler/defer.rb
index e055e7f920..e63cde145a 100644
--- a/lib/scheduler/defer.rb
+++ b/lib/scheduler/defer.rb
@@ -8,6 +8,10 @@ module Scheduler
       @thread = nil
     end
 
+    def length
+      @queue.length
+    end
+
     def pause
       stop!
       @paused = true
@@ -22,7 +26,7 @@ module Scheduler
       @async = val
     end
 
-    def later(desc = nil, db=RailsMultisite::ConnectionManagement.current_db, &blk)
+    def later(desc = nil, db = RailsMultisite::ConnectionManagement.current_db, &blk)
       if @async
         start_thread unless (@thread && @thread.alive?) || @paused
         @queue << [db, blk, desc]
@@ -43,7 +47,7 @@ module Scheduler
 
     def do_all_work
       while !@queue.empty?
-        do_work(_non_block=true)
+        do_work(_non_block = true)
       end
     end
 
@@ -61,33 +65,25 @@ module Scheduler
     end
 
     # using non_block to match Ruby #deq
-    def do_work(non_block=false)
+    def do_work(non_block = false)
       db, job, desc = @queue.deq(non_block)
-      begin
-        RailsMultisite::ConnectionManagement.establish_connection(db: db) if db
-        job.call
-      rescue => ex
-        Discourse.handle_job_exception(ex, {message: "Running deferred code '#{desc}'"})
+      db ||= RailsMultisite::ConnectionManagement::DEFAULT
+
+      RailsMultisite::ConnectionManagement.with_connection(db) do
+        begin
+          job.call
+        rescue => ex
+          Discourse.handle_job_exception(ex, message: "Running deferred code '#{desc}'")
+        end
       end
     rescue => ex
-      Discourse.handle_job_exception(ex, {message: "Processing deferred code queue"})
+      Discourse.handle_job_exception(ex, message: "Processing deferred code queue")
     ensure
       ActiveRecord::Base.connection_handler.clear_active_connections!
     end
-
   end
 
   class Defer
-
-    module Unicorn
-      def process_client(client)
-        Defer.pause
-        super(client)
-        Defer.do_all_work
-        Defer.resume
-      end
-    end
-
     extend Deferrable
     initialize
   end
diff --git a/lib/scheduler/manager.rb b/lib/scheduler/manager.rb
index ec8e249e9b..e9d98b9abd 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
@@ -51,13 +42,13 @@ module Scheduler
       def keep_alive
         @manager.keep_alive
       rescue => ex
-        Discourse.handle_job_exception(ex, {message: "Scheduling manager keep-alive"})
+        Discourse.handle_job_exception(ex, message: "Scheduling manager keep-alive")
       end
 
       def reschedule_orphans
         @manager.reschedule_orphans!
       rescue => ex
-        Discourse.handle_job_exception(ex, {message: "Scheduling manager orphan rescheduler"})
+        Discourse.handle_job_exception(ex, message: "Scheduling manager orphan rescheduler")
       end
 
       def hostname
@@ -69,6 +60,7 @@ module Scheduler
       end
 
       def process_queue
+
         klass = @queue.deq
         return unless klass
 
@@ -83,15 +75,19 @@ 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]
-            )
+            RailsMultisite::ConnectionManagement.with_connection("default") do
+              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]
+              )
+            end
           end
+
           klass.new.perform
         rescue => e
           if e.class != Jobs::HandledExceptionWrapper
@@ -106,35 +102,48 @@ module Scheduler
         info.prev_result = failed ? "FAILED" : "OK"
         info.current_owner = nil
         if stat
-          stat.update!(
-            duration_ms: duration,
-            live_slots_finish: GC.stat[:heap_live_slots],
-            success: !failed,
-            error: error
-          )
+          RailsMultisite::ConnectionManagement.with_connection("default") do
+            stat.update!(
+              duration_ms: duration,
+              live_slots_finish: GC.stat[:heap_live_slots],
+              success: !failed,
+              error: error
+            )
+            DiscourseEvent.trigger(:scheduled_job_ran, stat)
+          end
         end
         attempts(3) do
           @mutex.synchronize { info.write! }
         end
       rescue => ex
-        Discourse.handle_job_exception(ex, {message: "Processing scheduled job queue"})
+        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
 
@@ -165,11 +174,11 @@ module Scheduler
 
     end
 
-    def self.without_runner(redis=nil)
+    def self.without_runner(redis = nil)
       self.new(redis, skip_runner: true)
     end
 
-    def initialize(redis = nil, options=nil)
+    def initialize(redis = nil, options = nil)
       @redis = $redis || redis
       @random_ratio = 0.1
       unless options && options[:skip_runner]
@@ -226,7 +235,7 @@ module Scheduler
       end
     end
 
-    def reschedule_orphans_on!(hostname=nil)
+    def reschedule_orphans_on!(hostname = nil)
       redis.zrange(Manager.queue_key(hostname), 0, -1).each do |key|
         klass = get_klass(key)
         next unless klass
@@ -254,7 +263,7 @@ module Scheduler
       end
     end
 
-    def schedule_next_job(hostname=nil)
+    def schedule_next_job(hostname = nil)
       (key, due), _ = redis.zrange Manager.queue_key(hostname), 0, 0, withscores: true
       return unless key
 
@@ -300,7 +309,6 @@ module Scheduler
       end
     end
 
-
     def self.discover_schedules
       # hack for developemnt reloader is crazytown
       # multiple classes with same name can be in
@@ -333,7 +341,7 @@ module Scheduler
       "_scheduler_lock_"
     end
 
-    def self.queue_key(hostname=nil)
+    def self.queue_key(hostname = nil)
       if hostname
         "_scheduler_queue_#{hostname}_"
       else
@@ -341,7 +349,7 @@ module Scheduler
       end
     end
 
-    def self.schedule_key(klass,hostname=nil)
+    def self.schedule_key(klass, hostname = nil)
       if hostname
         "_scheduler_#{klass}_#{hostname}"
       else
diff --git a/lib/scheduler/schedule.rb b/lib/scheduler/schedule.rb
index a00fe1330f..05c8085bc1 100644
--- a/lib/scheduler/schedule.rb
+++ b/lib/scheduler/schedule.rb
@@ -1,13 +1,13 @@
 module Scheduler::Schedule
 
-  def daily(options=nil)
+  def daily(options = nil)
     if options
       @daily = options
     end
     @daily
   end
 
-  def every(duration=nil)
+  def every(duration = nil)
     if duration
       @every = duration
       if manager = Scheduler::Manager.current
diff --git a/lib/scheduler/schedule_info.rb b/lib/scheduler/schedule_info.rb
index 755bc621a9..d9348b2ea6 100644
--- a/lib/scheduler/schedule_info.rb
+++ b/lib/scheduler/schedule_info.rb
@@ -12,7 +12,7 @@ module Scheduler
 
       data = nil
 
-      if data = $redis.get(key)
+      if data = @manager.redis.get(key)
         data = JSON.parse(data)
       end
 
@@ -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
@@ -96,7 +100,7 @@ module Scheduler
         current_owner: @current_owner
       }.to_json
 
-      redis.zadd queue_key, @next_run , @klass
+      redis.zadd queue_key, @next_run, @klass if @next_run
     end
 
     def del!
diff --git a/lib/scheduler/web.rb b/lib/scheduler/web.rb
index 6d414ce8e9..b2deac7bf6 100644
--- a/lib/scheduler/web.rb
+++ b/lib/scheduler/web.rb
@@ -15,8 +15,8 @@ module Scheduler
           return unless duration
           if duration < 1000
             "#{duration}ms"
-          elsif duration < 60*1000
-            "#{'%.2f' % (duration/1000.0)} secs"
+          elsif duration < 60 * 1000
+            "#{'%.2f' % (duration / 1000.0)} secs"
           end
         end
       end
@@ -24,7 +24,7 @@ module Scheduler
       app.get "/scheduler" do
         RailsMultisite::ConnectionManagement.with_connection("default") do
           @manager = Scheduler::Manager.without_runner
-          @schedules = Scheduler::Manager.discover_schedules.sort do |a,b|
+          @schedules = Scheduler::Manager.discover_schedules.sort do |a, b|
             a_next = a.schedule_info.next_run
             b_next = b.schedule_info.next_run
             if a_next && b_next
@@ -35,13 +35,13 @@ module Scheduler
               1
             end
           end
-          erb File.read(File.join(VIEWS, 'scheduler.erb')), locals: {view_path: VIEWS}
+          erb File.read(File.join(VIEWS, 'scheduler.erb')), locals: { view_path: VIEWS }
         end
       end
 
       app.get "/scheduler/history" do
         @scheduler_stats = SchedulerStat.order('started_at desc').limit(200)
-        erb File.read(File.join(VIEWS, 'history.erb')), locals: {view_path: VIEWS}
+        erb File.read(File.join(VIEWS, 'history.erb')), locals: { view_path: VIEWS }
       end
 
       app.post "/scheduler/:name/trigger" do
@@ -50,7 +50,7 @@ module Scheduler
         RailsMultisite::ConnectionManagement.with_connection("default") do
           klass = name.constantize
           info = klass.schedule_info
-          info.next_run = Time.now.to_f
+          info.next_run = Time.now.to_i
           info.write!
 
           redirect "#{root_path}scheduler"
diff --git a/lib/score_calculator.rb b/lib/score_calculator.rb
index 8901c12e5a..baf93cb457 100644
--- a/lib/score_calculator.rb
+++ b/lib/score_calculator.rb
@@ -11,19 +11,18 @@ class ScoreCalculator
     }
   end
 
-  def initialize(weightings=nil)
+  def initialize(weightings = nil)
     @weightings = weightings || ScoreCalculator.default_score_weights
   end
 
   # Calculate the score for all posts based on the weightings
-  def calculate(opts=nil)
+  def calculate(opts = nil)
     update_posts_score(opts)
     update_posts_rank(opts)
     update_topics_rank(opts)
     update_topics_percent_rank(opts)
   end
 
-
   private
 
   def update_posts_score(opts)
@@ -110,7 +109,6 @@ SQL
               posts_required: SiteSetting.summary_posts_required,
               score_required: SiteSetting.summary_score_threshold)
 
-
     filter_topics(builder, opts)
 
     builder.exec
@@ -131,7 +129,6 @@ SQL
     builder.exec
   end
 
-
   def filter_topics(builder, opts)
     return builder unless opts
 
diff --git a/lib/screening_model.rb b/lib/screening_model.rb
index 26ed789c6c..62cc0eb8a1 100644
--- a/lib/screening_model.rb
+++ b/lib/screening_model.rb
@@ -24,7 +24,7 @@ module ScreeningModel
   end
 
   def action_name=(arg)
-    raise ArgumentError.new("Invalid action type #{arg}") if arg.nil? or !self.class.actions.has_key?(arg.to_sym)
+    raise ArgumentError.new("Invalid action type #{arg}") if arg.nil? || !self.class.actions.has_key?(arg.to_sym)
     self.action_type = self.class.actions[arg.to_sym]
   end
 
diff --git a/lib/search.rb b/lib/search.rb
index 543149b18e..6f553a4945 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -1,6 +1,7 @@
 require_dependency 'search/grouped_search_results'
 
 class Search
+  INDEX_VERSION = 1.freeze
 
   def self.per_facet
     5
@@ -17,77 +18,42 @@ class Search
   end
 
   def self.facets
-    %w(topic category user private_messages)
+    %w(topic category user private_messages tags)
   end
 
-  def self.long_locale
-    # if adding a language see:
-    # /usr/share/postgresql/9.3/tsearch_data for possible options
-    # Do not add languages that are missing without amending the
+  def self.ts_config(locale = SiteSetting.default_locale)
+    # if adding a text search configuration, you should check PG beforehand:
+    # SELECT cfgname FROM pg_ts_config;
+    # As an aside, dictionaries can be listed by `\dFd`, the
+    # physical locations are in /usr/share/postgresql/<version>/tsearch_data.
+    # But it may not appear there based on pg extension configuration.
     # base docker config
     #
-    case SiteSetting.default_locale.to_sym
-      when :da     then 'danish'
-      when :de     then 'german'
-      when :en     then 'english'
-      when :es     then 'spanish'
-      when :fr     then 'french'
-      when :it     then 'italian'
-      when :nl     then 'dutch'
-      when :nb_NO  then 'norwegian'
-      when :pt     then 'portuguese'
-      when :pt_BR  then 'portuguese'
-      when :sv     then 'swedish'
-      when :ru     then 'russian'
-      else 'simple' # use the 'simple' stemmer for other languages
+    case locale.to_sym
+    when :da     then 'danish'
+    when :de     then 'german'
+    when :en     then 'english'
+    when :es     then 'spanish'
+    when :fr     then 'french'
+    when :it     then 'italian'
+    when :nl     then 'dutch'
+    when :nb_NO  then 'norwegian'
+    when :pt     then 'portuguese'
+    when :pt_BR  then 'portuguese'
+    when :sv     then 'swedish'
+    when :ru     then 'russian'
+    else 'simple' # use the 'simple' stemmer for other languages
     end
   end
 
-  def self.rebuild_problem_posts(limit = 10000)
-    posts = Post.joins(:topic)
-            .where('posts.id IN (
-               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)
-
-    posts.each do |post|
-      # force indexing
-      post.cooked += " "
-      SearchIndexer.index(post)
-    end
-
-    posts = Post.joins(:topic)
-            .where('posts.id IN (
-               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)
-
-    posts.each do |post|
-      # force indexing
-      post.cooked += " "
-      SearchIndexer.index(post)
-    end
-
-    nil
-  end
-
-  def self.prepare_data(search_data)
+  def self.prepare_data(search_data, purpose = :query)
     data = search_data.squish
-    # TODO rmmseg is designed for chinese, we need something else for Korean / Japanese
+    # TODO cppjieba_rb is designed for chinese, we need something else for Korean / Japanese
     if ['zh_TW', 'zh_CN', 'ja', 'ko'].include?(SiteSetting.default_locale) || SiteSetting.search_tokenize_chinese_japanese_korean
-      unless defined? RMMSeg
-        require 'rmmseg'
-        RMMSeg::Dictionary.load_dictionaries
-      end
-
-      algo = RMMSeg::Algorithm.new(search_data)
-
-      data = ""
-      while token = algo.next_token
-        data << token.text << " "
-      end
+      require 'cppjieba_rb' unless defined? CppjiebaRb
+      mode = (purpose == :query ? :query : :mix)
+      data = CppjiebaRb.segment(search_data, mode: mode)
+      data = CppjiebaRb.filter_stop_word(data).join(' ')
     end
 
     data.force_encoding("UTF-8")
@@ -105,7 +71,7 @@ class Search
       month = $2 ? $3.to_i : 1
       day = $4 ? $5.to_i : 1
 
-      return if day==0 || month==0 || day > 31 || month > 12
+      return if day == 0 || month == 0 || day > 31 || month > 12
 
       return Time.zone.parse("#{year}-#{month}-#{day}") rescue nil
     end
@@ -131,17 +97,16 @@ class Search
   def self.min_post_id_no_cache
     return 0 unless SiteSetting.search_prefer_recent_posts?
 
-
     offset, has_more = Post.unscoped
-                           .order('id desc')
-                           .offset(SiteSetting.search_recent_posts_size-1)
-                           .limit(2)
-                           .pluck(:id)
+      .order('id desc')
+      .offset(SiteSetting.search_recent_posts_size - 1)
+      .limit(2)
+      .pluck(:id)
 
     has_more ? offset : 0
   end
 
-  def self.min_post_id(opts=nil)
+  def self.min_post_id(opts = nil)
     return 0 unless SiteSetting.search_prefer_recent_posts?
 
     # It can be quite slow to count all the posts so let's cache it
@@ -151,20 +116,27 @@ class Search
   end
 
   attr_accessor :term
+  attr_reader :clean_term
 
-  def initialize(term, opts=nil)
+  def initialize(term, opts = nil)
     @opts = opts || {}
     @guardian = @opts[:guardian] || Guardian.new
     @search_context = @opts[:search_context]
     @include_blurbs = @opts[:include_blurbs] || false
     @blurb_length = @opts[:blurb_length]
-    @limit = Search.per_facet
     @valid = true
+    @page = @opts[:page]
+
+    # Removes any zero-width characters from search terms
+    term.to_s.gsub!(/[\u200B-\u200D\uFEFF]/, '')
+    # Replace curly quotes to regular quotes
+    term.to_s.gsub!(/[\u201c\u201d]/, '"')
+    @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
 
@@ -173,27 +145,54 @@ class Search
       @search_context = @guardian.user
     end
 
-    if @opts[:type_filter].present?
-      @limit = Search.per_filter
-    end
+    @results = GroupedSearchResults.new(
+      @opts[:type_filter],
+      clean_term,
+      @search_context,
+      @include_blurbs,
+      @blurb_length
+    )
+  end
 
-    @results = GroupedSearchResults.new(@opts[:type_filter], term, @search_context, @include_blurbs, @blurb_length)
+  def limit
+    if @opts[:type_filter].present?
+      Search.per_filter + 1
+    else
+      Search.per_facet + 1
+    end
+  end
+
+  def offset
+    if @page && @opts[:type_filter].present?
+      (@page - 1) * Search.per_filter
+    else
+      0
+    end
   end
 
   def valid?
     @valid
   end
 
-  def self.execute(term, opts=nil)
+  def self.execute(term, opts = nil)
     self.new(term, opts).execute
   end
 
   # 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 }
+      terms = (@term || '').split(/\s(?=(?:[^"]|"[^"]*")*$)/).reject { |t| t.length < min_length }
 
       if terms.blank?
         @term = ''
@@ -220,7 +219,7 @@ class Search
     @results
   end
 
-  def self.advanced_filter(trigger,&block)
+  def self.advanced_filter(trigger, &block)
     (@advanced_filters ||= {})[trigger] = block
   end
 
@@ -272,11 +271,11 @@ class Search
     end
   end
 
-  advanced_filter(/in:wiki/) do |posts,match|
+  advanced_filter(/in:wiki/) do |posts, match|
     posts.where(wiki: true)
   end
 
-  advanced_filter(/badge:(.*)/) do |posts,match|
+  advanced_filter(/badge:(.*)/) do |posts, match|
     badge_id = Badge.where('name ilike ? OR id = ?', match, match.to_i).pluck(:id).first
     if badge_id
       posts.where('posts.user_id IN (SELECT ub.user_id FROM user_badges ub WHERE ub.badge_id = ?)', badge_id)
@@ -303,7 +302,7 @@ class Search
     posts.where("posts.user_id = #{@guardian.user.id}") if @guardian.user
   end
 
-  advanced_filter(/in:(watching|tracking)/) do |posts,match|
+  advanced_filter(/in:(watching|tracking)/) do |posts, match|
     if @guardian.user
       level = TopicUser.notification_levels[match.to_sym]
       posts.where("posts.topic_id IN (
@@ -321,7 +320,7 @@ class Search
         .joins("INNER JOIN post_timings ON
           post_timings.topic_id = posts.topic_id
           AND post_timings.post_number = posts.post_number
-          AND post_timings.user_id = #{Post.sanitize(@guardian.user.id)}
+          AND post_timings.user_id = #{ActiveRecord::Base.connection.quote(@guardian.user.id)}
         ")
     end
   end
@@ -332,13 +331,17 @@ class Search
         .joins("LEFT JOIN post_timings ON
           post_timings.topic_id = posts.topic_id
           AND post_timings.post_number = posts.post_number
-          AND post_timings.user_id = #{Post.sanitize(@guardian.user.id)}
+          AND post_timings.user_id = #{ActiveRecord::Base.connection.quote(@guardian.user.id)}
         ")
         .where("post_timings.user_id IS NULL")
     end
   end
 
-  advanced_filter(/category:(.+)/) do |posts,match|
+  advanced_filter(/with:images/) do |posts|
+    posts.where("posts.image_url IS NOT NULL")
+  end
+
+  advanced_filter(/category:(.+)/) do |posts, match|
     exact = false
 
     if match[0] == "="
@@ -361,7 +364,7 @@ class Search
     end
   end
 
-  advanced_filter(/^\#([a-zA-Z0-9\-:=]+)/) do |posts,match|
+  advanced_filter(/^\#([a-zA-Z0-9\-:=]+)/) do |posts, match|
 
     exact = true
 
@@ -393,16 +396,26 @@ class Search
       end
       posts.where("topics.category_id IN (?)", category_ids)
     else
-      posts.where("topics.id IN (
-        SELECT DISTINCT(tt.topic_id)
-        FROM topic_tags tt, tags
-        WHERE tt.tag_id = tags.id
-        AND tags.name = ?
-        )", slug[0])
+      # try a possible tag match
+      tag_id = Tag.where(name: slug[0]).pluck(:id).first
+      if (tag_id)
+        posts.where("topics.id IN (
+          SELECT DISTINCT(tt.topic_id)
+          FROM topic_tags tt
+          WHERE tt.tag_id = ?
+          )", tag_id)
+      else
+        # a bit yucky but we got to add the term back in
+        if match.to_s.length >= SiteSetting.min_search_term_length
+          posts.where("posts.id IN (
+            SELECT post_id FROM post_search_data pd1
+            WHERE pd1.search_data @@ #{Search.ts_query("##{match}")})")
+        end
+      end
     end
   end
 
-  advanced_filter(/group:(.+)/) do |posts,match|
+  advanced_filter(/group:(.+)/) do |posts, match|
     group_id = Group.where('name ilike ? OR (id = ? AND id > 0)', match, match.to_i).pluck(:id).first
     if group_id
       posts.where("posts.user_id IN (select gu.user_id from group_users gu where gu.group_id = ?)", group_id)
@@ -411,7 +424,7 @@ class Search
     end
   end
 
-  advanced_filter(/user:(.+)/) do |posts,match|
+  advanced_filter(/user:(.+)/) do |posts, match|
     user_id = User.where(staged: false).where('username_lower = ? OR id = ?', match.downcase, match.to_i).pluck(:id).first
     if user_id
       posts.where("posts.user_id = #{user_id}")
@@ -420,7 +433,7 @@ class Search
     end
   end
 
-  advanced_filter(/^\@([a-zA-Z0-9_\-.]+)/) do |posts,match|
+  advanced_filter(/^\@([a-zA-Z0-9_\-.]+)/) do |posts, match|
     user_id = User.where(staged: false).where(username_lower: match.downcase).pluck(:id).first
     if user_id
       posts.where("posts.user_id = #{user_id}")
@@ -429,7 +442,7 @@ class Search
     end
   end
 
-  advanced_filter(/before:(.*)/) do |posts,match|
+  advanced_filter(/before:(.*)/) do |posts, match|
     if date = Search.word_to_date(match)
       posts.where("posts.created_at < ?", date)
     else
@@ -437,7 +450,7 @@ class Search
     end
   end
 
-  advanced_filter(/after:(.*)/) do |posts,match|
+  advanced_filter(/after:(.*)/) do |posts, match|
     if date = Search.word_to_date(match)
       posts.where("posts.created_at > ?", date)
     else
@@ -445,29 +458,53 @@ 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(#{default_ts_config}, array_to_string(array_agg(tags.name), ' ')) @@ to_tsquery(#{default_ts_config}, ?)
+      )", 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
+
+  advanced_filter(/filetypes?:([a-zA-Z0-9,\-_]+)/) do |posts, match|
+    file_extensions = match.split(",").map(&:downcase)
+
+    posts.where("posts.id IN (
+      SELECT post_id FROM topic_links
+      WHERE extension IN (:file_extensions)
+      UNION
+      SELECT post_uploads.post_id FROM uploads
+      JOIN post_uploads ON post_uploads.upload_id = uploads.id
+      WHERE lower(uploads.extension) IN (:file_extensions)
+      )", file_extensions: file_extensions)
   end
 
   private
 
-
     def process_advanced_search!(term)
 
-      term.to_s.scan(/(([^" \t\n\x0B\f\r]+)?(("[^"]+")?))/).to_a.map do |(word,_)|
+      term.to_s.scan(/(([^" \t\n\x0B\f\r]+)?(("[^"]+")?))/).to_a.map do |(word, _)|
         next if word.blank?
 
         found = false
 
         Search.advanced_filters.each do |matcher, block|
-          cleaned = word.gsub(/["']/,"")
+          cleaned = word.gsub(/["']/, "")
           if cleaned =~ matcher
             (@filters ||= []) << [block, $1]
             found = true
@@ -507,17 +544,16 @@ class Search
       end.compact.join(' ')
     end
 
-
     def find_grouped_results
 
       if @results.type_filter.present?
         raise Discourse::InvalidAccess.new("invalid type filter") unless Search.facets.include?(@results.type_filter)
         send("#{@results.type_filter}_search")
       else
-        @limit = Search.per_facet + 1
         unless @search_context
           user_search if @term.present?
           category_search if @term.present?
+          tags_search if @term.present?
         end
         topic_search
       end
@@ -568,11 +604,11 @@ class Search
       secure_category_ids
 
       categories = Category.includes(:category_search_data)
-                           .where("category_search_data.search_data @@ #{ts_query}")
-                           .references(:category_search_data)
-                           .order("topics_month DESC")
-                           .secured(@guardian)
-                           .limit(@limit)
+        .where("category_search_data.search_data @@ #{ts_query}")
+        .references(:category_search_data)
+        .order("topics_month DESC")
+        .secured(@guardian)
+        .limit(limit)
 
       categories.each do |category|
         @results.add(category)
@@ -583,37 +619,51 @@ class Search
       return if SiteSetting.hide_user_profiles_from_public && !@guardian.user
 
       users = User.includes(:user_search_data)
-                  .references(:user_search_data)
-                  .where(active: true)
-                  .where(staged: false)
-                  .where("user_search_data.search_data @@ #{ts_query("simple")}")
-                  .order("CASE WHEN username_lower = '#{@original_term.downcase}' THEN 0 ELSE 1 END")
-                  .order("last_posted_at DESC")
-                  .limit(@limit)
+        .references(:user_search_data)
+        .where(active: true)
+        .where(staged: false)
+        .where("user_search_data.search_data @@ #{ts_query("simple")}")
+        .order("CASE WHEN username_lower = '#{@original_term.downcase}' THEN 0 ELSE 1 END")
+        .order("last_posted_at DESC")
+        .limit(limit)
 
       users.each do |user|
         @results.add(user)
       end
     end
 
-    def posts_query(limit, opts=nil)
+    def tags_search
+      return unless SiteSetting.tagging_enabled
+
+      tags = Tag.includes(:tag_search_data)
+        .where("tag_search_data.search_data @@ #{ts_query}")
+        .references(:tag_search_data)
+        .order("name asc")
+        .limit(limit)
+
+      tags.each do |tag|
+        @results.add(tag)
+      end
+    end
+
+    def posts_query(limit, opts = nil)
       opts ||= {}
       posts = Post.where(post_type: Topic.visible_post_types(@guardian.user))
-                  .joins(:post_search_data, :topic)
-                  .joins("LEFT JOIN categories ON categories.id = topics.category_id")
-                  .where("topics.deleted_at" => nil)
-                  .where("topics.visible")
+        .joins(:post_search_data, :topic)
+        .joins("LEFT JOIN categories ON categories.id = topics.category_id")
+        .where("topics.deleted_at" => nil)
+        .where("topics.visible")
 
       is_topic_search = @search_context.present? && @search_context.is_a?(Topic)
 
       if opts[:private_messages] || (is_topic_search && @search_context.private_message?)
-         posts = posts.where("topics.archetype =  ?", Archetype.private_message)
+        posts = posts.where("topics.archetype =  ?", Archetype.private_message)
 
          unless @guardian.is_admin?
            posts = posts.private_posts_for_user(@guardian.user)
          end
       else
-         posts = posts.where("topics.archetype <> ?", Archetype.private_message)
+        posts = posts.where("topics.archetype <> ?", Archetype.private_message)
       end
 
       if @term.present?
@@ -632,7 +682,6 @@ class Search
           posts = posts.where("posts.raw  || ' ' || u.username || ' ' || COALESCE(u.name, '') ilike ?", "%#{term_without_quote}%")
         else
           posts = posts.where("post_search_data.search_data @@ #{ts_query}")
-
           exact_terms = @term.scan(/"([^"]+)"/).flatten
           exact_terms.each do |exact|
             posts = posts.where("posts.raw ilike ?", "%#{exact}%")
@@ -664,7 +713,7 @@ class Search
           posts = posts.where("topics.category_id in (?)", category_ids)
         elsif @search_context.is_a?(Topic)
           posts = posts.where("topics.id = #{@search_context.id}")
-                       .order("posts.post_number #{@order == :latest ? "DESC" : ""}")
+            .order("posts.post_number #{@order == :latest ? "DESC" : ""}")
         end
 
       end
@@ -694,7 +743,7 @@ class Search
           posts = posts.order("posts.like_count DESC")
         end
       else
-        posts = posts.order("TS_RANK_CD(TO_TSVECTOR(#{query_locale}, topics.title), #{ts_query}) DESC")
+        posts = posts.order("TS_RANK_CD(TO_TSVECTOR(#{default_ts_config}, topics.title), #{ts_query}) DESC")
 
         data_ranking = "TS_RANK_CD(post_search_data.search_data, #{ts_query})"
         if opts[:aggregate_search]
@@ -711,37 +760,42 @@ class Search
         posts = posts.where("(categories.id IS NULL) OR (NOT categories.read_restricted)").references(:categories)
       end
 
+      posts = posts.offset(offset)
       posts.limit(limit)
     end
 
-    def self.query_locale
-      "'#{Search.long_locale}'"
+    def self.default_ts_config
+      "'#{Search.ts_config}'"
     end
 
-    def query_locale
-      self.class.query_locale
+    def default_ts_config
+      self.class.default_ts_config
     end
 
-    def self.ts_query(term, locale = nil, joiner = "&")
+    def self.ts_query(term, ts_config = nil, joiner = "&")
 
-      data = Post.exec_sql("SELECT to_tsvector(:locale, :term)",
-                            locale: 'simple',
-                            term: term
-                          ).values[0][0]
+      data = Post.exec_sql("SELECT TO_TSVECTOR(:config, :term)",
+                           config: 'simple',
+                           term: term).values[0][0]
 
-      locale = Post.sanitize(locale) if locale
+      ts_config = ActiveRecord::Base.connection.quote(ts_config) if ts_config
       all_terms = data.scan(/'([^']+)'\:\d+/).flatten
       all_terms.map! do |t|
         t.split(/[\)\(&']/)[0]
       end.compact!
 
-      query = Post.sanitize(all_terms.map {|t| "'#{PG::Connection.escape_string(t)}':*"}.join(" #{joiner} "))
-      "TO_TSQUERY(#{locale || query_locale}, #{query})"
+      query = ActiveRecord::Base.connection.quote(
+        all_terms
+          .map { |t| "'#{PG::Connection.escape_string(t)}':*" }
+          .join(" #{joiner} ")
+      )
+
+      "TO_TSQUERY(#{ts_config || default_ts_config}, #{query})"
     end
 
-    def ts_query(locale=nil)
+    def ts_query(ts_config = nil)
       @ts_query_cache ||= {}
-      @ts_query_cache[(locale || query_locale) + " " + @term] ||= Search.ts_query(@term, locale)
+      @ts_query_cache["#{ts_config || default_ts_config} #{@term}"] ||= Search.ts_query(@term, ts_config)
     end
 
     def wrap_rows(query)
@@ -754,10 +808,10 @@ class Search
       query =
         if @order == :likes
           # likes are a pain to aggregate so skip
-          posts_query(@limit, private_messages: opts[:private_messages])
+          posts_query(limit, private_messages: opts[:private_messages])
             .select('topics.id', "posts.post_number")
         else
-          posts_query(@limit, aggregate_search: true, private_messages: opts[:private_messages])
+          posts_query(limit, aggregate_search: true, private_messages: opts[:private_messages])
             .select('topics.id', "#{min_or_max}(posts.post_number) post_number")
             .group('topics.id')
         end
@@ -792,8 +846,8 @@ class Search
         added += 1
       end
 
-      if added < @limit
-        aggregate_posts(post_sql[:remaining]).each {|p| @results.add(p) }
+      if added < limit
+        aggregate_posts(post_sql[:remaining]).each { |p| @results.add(p) }
       end
     end
 
@@ -805,7 +859,7 @@ class Search
 
     def topic_search
       if @search_context.is_a?(Topic)
-        posts = posts_eager_loads(posts_query(@limit))
+        posts = posts_eager_loads(posts_query(limit))
           .where('posts.topic_id = ?', @search_context.id)
 
         posts.each do |post|
diff --git a/lib/search/grouped_search_results.rb b/lib/search/grouped_search_results.rb
index 47e1325488..04ad93fa13 100644
--- a/lib/search/grouped_search_results.rb
+++ b/lib/search/grouped_search_results.rb
@@ -9,10 +9,22 @@ 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,
+      :tags,
+      :more_posts,
+      :more_categories,
+      :more_users,
+      :term,
+      :search_context,
+      :include_blurbs,
+      :more_full_page_results
+    )
+
+    attr_accessor :search_log_id
 
     def initialize(type_filter, term, search_context, include_blurbs, blurb_length)
       @type_filter = type_filter
@@ -23,6 +35,7 @@ class Search
       @posts = []
       @categories = []
       @users = []
+      @tags = []
     end
 
     def find_user_data(guardian)
@@ -40,15 +53,16 @@ class Search
     def add(object)
       type = object.class.to_s.downcase.pluralize
 
-      if !@type_filter.present? && send(type).length == Search.per_facet
+      if @type_filter.present? && send(type).length == Search.per_filter
+        @more_full_page_results = true
+      elsif !@type_filter.present? && send(type).length == Search.per_facet
         instance_variable_set("@more_#{type}".to_sym, true)
       else
         (send type) << object
       end
     end
 
-
-    def self.blurb_for(cooked, term=nil, blurb_length=200)
+    def self.blurb_for(cooked, term = nil, blurb_length = 200)
       cooked = SearchIndexer::HtmlScrubber.scrub(cooked).squish
 
       blurb = nil
diff --git a/lib/secure_session.rb b/lib/secure_session.rb
index bbe9a71833..ecb46a6f67 100644
--- a/lib/secure_session.rb
+++ b/lib/secure_session.rb
@@ -8,7 +8,7 @@ class SecureSession
     $redis.get("#{@prefix}#{key}")
   end
 
-  def []=(key,val)
+  def []=(key, val)
     if val == nil
       $redis.del("#{@prefix}#{key}")
     else
diff --git a/lib/sidekiq/pausable.rb b/lib/sidekiq/pausable.rb
index c7cd9b5928..1d96f19e16 100644
--- a/lib/sidekiq/pausable.rb
+++ b/lib/sidekiq/pausable.rb
@@ -76,7 +76,11 @@ class Sidekiq::Pausable
     if Sidekiq.paused?
       worker.class.perform_in(@delay, *msg['args'])
     else
-      yield
+      start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      result = yield
+      duration = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+      DiscourseEvent.trigger(:sidekiq_job_ran, worker, msg, queue, duration)
+      result
     end
   end
 
diff --git a/lib/single_sign_on.rb b/lib/single_sign_on.rb
index b8a20a80eb..ba8a903594 100644
--- a/lib/single_sign_on.rb
+++ b/lib/single_sign_on.rb
@@ -1,13 +1,14 @@
 class SingleSignOn
   ACCESSORS = [:nonce, :name, :username, :email, :avatar_url, :avatar_force_update, :require_activation,
                :bio, :external_id, :return_sso_url, :admin, :moderator, :suppress_welcome_message, :title,
-               :add_groups, :remove_groups]
+               :add_groups, :remove_groups, :groups]
   FIXNUMS = []
   BOOLS = [:avatar_force_update, :admin, :moderator, :require_activation, :suppress_welcome_message]
+  ARRAYS = [:groups]
   NONCE_EXPIRY_TIME = 10.minutes
 
   attr_accessor(*ACCESSORS)
-  attr_accessor :sso_secret, :sso_url
+  attr_writer :sso_secret, :sso_url
 
   def self.sso_secret
     raise RuntimeError, "sso_secret not implemented on class, be sure to set it on instance"
@@ -40,10 +41,11 @@ class SingleSignOn
       if BOOLS.include? k
         val = ["true", "false"].include?(val) ? val == "true" : nil
       end
+      val = Array(val) if ARRAYS.include?(k) && !val.nil?
       sso.send("#{k}=", val)
     end
 
-    decoded_hash.each do |k,v|
+    decoded_hash.each do |k, v|
       if field = k[/^custom\.(.+)$/, 1]
         sso.custom_fields[field] = v
       end
@@ -72,13 +74,13 @@ class SingleSignOn
     OpenSSL::HMAC.hexdigest("sha256", sso_secret, payload)
   end
 
-  def to_url(base_url=nil)
+  def to_url(base_url = nil)
     base = "#{base_url || sso_url}"
     "#{base}#{base.include?('?') ? '&' : '?'}#{payload}"
   end
 
   def payload
-    payload = Base64.encode64(unsigned_payload)
+    payload = Base64.strict_encode64(unsigned_payload)
     "sso=#{CGI::escape(payload)}&sig=#{sign(payload)}"
   end
 
@@ -86,7 +88,7 @@ class SingleSignOn
     payload = {}
 
     ACCESSORS.each do |k|
-     next if (val = send k) == nil
+      next if (val = send k) == nil
      payload[k] = val
     end
 
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 20dd2818af..7701e89cfc 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -1,14 +1,16 @@
-require_dependency 'enum'
+require_dependency 'site_settings/deprecated_settings'
+require_dependency 'site_settings/type_supervisor'
+require_dependency 'site_settings/defaults_provider'
 require_dependency 'site_settings/db_provider'
-require 'site_setting_validations'
 
 module SiteSettingExtension
-  include SiteSettingValidations
+  include SiteSettings::DeprecatedSettings
+  extend Forwardable
 
-  # For plugins, so they can tell if a feature is supported
-  def supported_types
-    [:email, :username, :list, :enum]
-  end
+  def_delegator :defaults, :site_locale, :default_locale
+  def_delegator :defaults, :site_locale=, :default_locale=
+  def_delegator :defaults, :has_setting?
+  def_delegators 'SiteSettings::TypeSupervisor', :types, :supported_types
 
   # part 1 of refactor, centralizing the dependency here
   def provider=(val)
@@ -20,22 +22,6 @@ module SiteSettingExtension
     @provider ||= SiteSettings::DbProvider.new(SiteSetting)
   end
 
-  def types
-    @types ||= Enum.new(string: 1,
-                        time: 2,
-                        integer: 3,
-                        float: 4,
-                        bool: 5,
-                        null: 6,
-                        enum: 7,
-                        list: 8,
-                        url_list: 9,
-                        host_list: 10,
-                        category_list: 11,
-                        value_list: 12,
-                        regex: 13)
-  end
-
   def mutex
     @mutex ||= Mutex.new
   end
@@ -46,25 +32,17 @@ module SiteSettingExtension
   end
 
   def defaults
-    @defaults ||= {}
+    @defaults ||= SiteSettings::DefaultsProvider.new(self)
+  end
+
+  def type_supervisor
+    @type_supervisor ||= SiteSettings::TypeSupervisor.new(defaults)
   end
 
   def categories
     @categories ||= {}
   end
 
-  def enums
-    @enums ||= {}
-  end
-
-  def static_types
-    @static_types ||= {}
-  end
-
-  def choices
-    @choices ||= {}
-  end
-
   def shadowed_settings
     @shadowed_settings ||= []
   end
@@ -85,34 +63,19 @@ module SiteSettingExtension
     @previews ||= {}
   end
 
-  def validators
-    @validators ||= {}
-  end
-
   def setting(name_arg, default = nil, opts = {})
     name = name_arg.to_sym
+
+    shadowed_val = nil
+
     mutex.synchronize do
-      self.defaults[name] = default
+      defaults.load_setting(
+        name,
+        default,
+        opts.extract!(*SiteSettings::DefaultsProvider::CONSUMED_OPTS)
+      )
+
       categories[name] = opts[:category] || :uncategorized
-      current_value = current.has_key?(name) ? current[name] : default
-
-      if enum = opts[:enum]
-        enums[name] = enum.is_a?(String) ? enum.constantize : enum
-        opts[:type] ||= :enum
-      end
-
-      if new_choices = opts[:choices]
-
-        new_choices = eval(new_choices) if new_choices.is_a?(String)
-
-        choices.has_key?(name) ?
-          choices[name].concat(new_choices) :
-          choices[name] = new_choices
-      end
-
-      if type = opts[:type]
-        static_types[name.to_sym] = type.to_sym
-      end
 
       if opts[:hidden]
         hidden_settings << name
@@ -122,9 +85,9 @@ module SiteSettingExtension
         val = GlobalSetting.send(name)
 
         unless val.nil? || (val == ''.freeze)
+          shadowed_val = val
           hidden_settings << name
           shadowed_settings << name
-          current_value = val
         end
       end
 
@@ -132,31 +95,30 @@ module SiteSettingExtension
         refresh_settings << name
       end
 
+      if opts[:client]
+        client_settings << name.to_sym
+      end
+
       if opts[:preview]
         previews[name] = opts[:preview]
       end
 
-      opts[:validator] = opts[:validator].try(:constantize)
-      type = opts[:type] || get_data_type(name, defaults[name])
+      type_supervisor.load_setting(
+        name,
+        opts.extract!(*SiteSettings::TypeSupervisor::CONSUMED_OPTS)
+      )
 
-      if validator_type = opts[:validator] || validator_for(type)
-        validators[name] = { class: validator_type, opts: opts }
+      if !shadowed_val.nil?
+        setup_shadowed_methods(name, shadowed_val)
+      else
+        setup_methods(name)
       end
-
-      current[name] = current_value
-      setup_methods(name)
     end
   end
 
-  # just like a setting, except that it is available in javascript via DiscourseSession
-  def client_setting(name, default = nil, opts = {})
-    setting(name, default, opts)
-    client_settings << name.to_sym
-  end
-
   def settings_hash
     result = {}
-    @defaults.each do |s, _|
+    defaults.each_key do |s|
       result[s] = send(s).to_s
     end
     result
@@ -169,35 +131,26 @@ module SiteSettingExtension
   end
 
   def client_settings_json_uncached
-    MultiJson.dump(Hash[*@client_settings.map{|n| [n, self.send(n)]}.flatten])
+    MultiJson.dump(Hash[*@client_settings.map { |n| [n, self.send(n)] }.flatten])
   end
 
   # Retrieve all settings
-  def all_settings(include_hidden=false)
-    @defaults
-      .reject{|s, _| hidden_settings.include?(s) && !include_hidden}
+  def all_settings(include_hidden = false)
+    defaults
+      .reject { |s, _| !include_hidden && hidden_settings.include?(s) }
       .map do |s, v|
-        value = send(s)
-        type = types[get_data_type(s, value)]
-        opts = {
-          setting: s,
-          description: description(s),
-          default: v.to_s,
-          type: type.to_s,
-          value: value.to_s,
-          category: categories[s],
-          preview: previews[s]
-        }
+      value = send(s)
+      opts = {
+        setting: s,
+        description: description(s),
+        default: defaults[s].to_s,
+        value: value.to_s,
+        category: categories[s],
+        preview: previews[s]
+      }.merge(type_supervisor.type_hash(s))
 
-        if type == :enum && enum_class(s)
-          opts.merge!({valid_values: enum_class(s).values, translate_names: enum_class(s).translate_names?})
-        elsif type == :enum
-          opts.merge!({valid_values: choices[s].map{|c| {name: c, value: c}}, translate_names: false})
-        end
-
-        opts[:choices] = choices[s] if choices.has_key? s
-        opts
-      end
+      opts
+    end.unshift(defaults.locale_setting_hash)
   end
 
   def description(setting)
@@ -215,22 +168,22 @@ module SiteSettingExtension
   def refresh!
     mutex.synchronize do
       ensure_listen_for_changes
-      old = current
 
-      new_hash =  Hash[*(provider.all.map { |s|
-        [s.name.intern, convert(s.value, s.data_type, s.name)]
+      new_hash = Hash[*(defaults.db_all.map { |s|
+        [s.name.to_sym, type_supervisor.to_rb_value(s.name, s.value, s.data_type)]
       }.to_a.flatten)]
 
-      # add defaults, cause they are cached
-      new_hash = defaults.merge(new_hash)
+      defaults_view = defaults.all
+
+      # add locale default and defaults based on default_locale, cause they are cached
+      new_hash = defaults_view.merge!(new_hash)
 
       # add shadowed
       shadowed_settings.each { |ss| new_hash[ss] = GlobalSetting.send(ss) }
 
-      changes, deletions = diff_hash(new_hash, old)
-
+      changes, deletions = diff_hash(new_hash, current)
       changes.each   { |name, val| current[name] = val }
-      deletions.each { |name, val| current[name] = defaults[name] }
+      deletions.each { |name, _|   current[name] = defaults_view[name] }
 
       clear_cache!
     end
@@ -280,74 +233,25 @@ module SiteSettingExtension
   end
 
   def add_override!(name, val)
-    type = get_data_type(name, defaults[name.to_sym])
-
-    if type == types[:bool] && val != true && val != false
-      val = (val == "t" || val == "true") ? 't' : 'f'
-    end
-
-    if type == types[:integer] && !val.is_a?(Integer)
-      val = val.to_i
-    end
-
-    if type == types[:null] && val != ''
-      type = get_data_type(name, val)
-    end
-
-    if type == types[:enum]
-      val = val.to_i if defaults[name.to_sym].is_a?(Integer)
-      if enum_class(name)
-        raise Discourse::InvalidParameters.new(:value) unless enum_class(name).valid_value?(val)
-      else
-        raise Discourse::InvalidParameters.new(:value) unless choices[name].include?(val)
-      end
-    end
-
-    if v = validators[name]
-      validator = v[:class].new(v[:opts])
-      unless validator.valid_value?(val)
-        raise Discourse::InvalidParameters.new(validator.error_message)
-      end
-    end
-
-    if self.respond_to? "validate_#{name}"
-      send("validate_#{name}", val)
-    end
-
+    val, type = type_supervisor.to_db_value(name, val)
     provider.save(name, val, type)
-    current[name] = convert(val, type, name)
+    current[name] = type_supervisor.to_rb_value(name, val)
     notify_clients!(name) if client_settings.include? name
     clear_cache!
   end
 
   def notify_changed!
-    MessageBus.publish('/site_settings', {process: process_id})
+    MessageBus.publish('/site_settings', process: process_id)
   end
 
   def notify_clients!(name)
-    MessageBus.publish('/client_settings', {name: name, value: self.send(name)})
-  end
-
-  def has_setting?(name)
-    defaults.has_key?(name.to_sym) || defaults.has_key?("#{name}?".to_sym)
+    MessageBus.publish('/client_settings', name: name, value: self.send(name))
   end
 
   def requires_refresh?(name)
     refresh_settings.include?(name.to_sym)
   end
 
-  def is_valid_data?(name, value)
-    valid = true
-    type = get_data_type(name, defaults[name.to_sym])
-
-    if type == types[:integer]
-      # validate integer
-      valid = false unless value.to_i.is_a?(Integer)
-    end
-
-    valid
-  end
-
   def filter_value(name, value)
     if %w[disabled_image_download_domains onebox_domains_blacklist exclude_rel_nofollow_domains email_domains_blacklist email_domains_whitelist white_listed_spam_host_domains].include? name
       domain_array = []
@@ -358,7 +262,7 @@ module SiteSettingExtension
   end
 
   def set(name, value)
-    if has_setting?(name) && is_valid_data?(name, value)
+    if has_setting?(name)
       value = filter_value(name, value)
       self.send("#{name}=", value)
       Discourse.request_refresh! if requires_refresh?(name)
@@ -367,7 +271,7 @@ module SiteSettingExtension
     end
   end
 
-  def set_and_log(name, value, user=Discourse.system_user)
+  def set_and_log(name, value, user = Discourse.system_user)
     prev_value = send(name)
     set(name, value)
     StaffActionLogger.new(user).log_site_setting_change(name, prev_value, value) if has_setting?(name)
@@ -385,104 +289,43 @@ module SiteSettingExtension
     deletions = []
 
     new_hash.each do |name, value|
-      changes << [name,value] if !old.has_key?(name) || old[name] != value
+      changes << [name, value] if !old.has_key?(name) || old[name] != value
     end
 
-    old.each do |name,value|
-      deletions << [name,value] unless new_hash.has_key?(name)
+    old.each do |name, value|
+      deletions << [name, value] unless new_hash.has_key?(name)
     end
 
-    [changes,deletions]
+    [changes, deletions]
   end
 
-  def get_data_type(name, val)
-    return types[:null] if val.nil?
+  def setup_shadowed_methods(name, value)
+    clean_name = name.to_s.sub("?", "").to_sym
 
-    # Some types are just for validations like email.
-    # Only consider it valid if includes in `types`
-    if static_type = static_types[name.to_sym]
-      return types[static_type] if types.keys.include?(static_type)
+    define_singleton_method clean_name do
+      value
     end
 
-    case val
-    when String
-      types[:string]
-    when Integer
-      types[:integer]
-    when Float
-      types[:float]
-    when TrueClass, FalseClass
-      types[:bool]
-    else
-      raise ArgumentError.new :val
+    define_singleton_method "#{clean_name}?" do
+      value
     end
-  end
 
-  def convert(value, type, name)
-    case type
-    when types[:float]
-      value.to_f
-    when types[:integer]
-      value.to_i
-    when types[:bool]
-      value == true || value == "t" || value == "true"
-    when types[:null]
+    define_singleton_method "#{clean_name}=" do |val|
+      Rails.logger.warn("An attempt was to change #{clean_name} SiteSetting to #{val} however it is shadowed so this will be ignored!")
       nil
-    when types[:enum]
-      defaults[name.to_sym].is_a?(Integer) ? value.to_i : value
-    else
-      return value if types[type]
-      # Otherwise it's a type error
-      raise ArgumentError.new :type
     end
-  end
 
-  def validator_for(type_name)
-    @validator_mapping ||= {
-      'email'        => EmailSettingValidator,
-      'username'     => UsernameSettingValidator,
-      types[:integer] => IntegerSettingValidator,
-      types[:string] => StringSettingValidator,
-      'list' => StringSettingValidator,
-      'enum' => StringSettingValidator,
-      'regex' => RegexSettingValidator
-    }
-    @validator_mapping[type_name]
-  end
-
-  DEPRECATED_SETTINGS = [
-    ['use_https', 'force_https', '1.7']
-  ]
-
-  def setup_deprecated_methods
-    DEPRECATED_SETTINGS.each do |old_setting, new_setting, version|
-      define_singleton_method old_setting do
-        logger.warn("`SiteSetting.#{old_setting}` has been deprecated and will be removed in the #{version} Release. Please use `SiteSetting.#{new_setting}` instead")
-        self.public_send new_setting
-      end
-
-      define_singleton_method "#{old_setting}?" do
-        logger.warn("`SiteSetting.#{old_setting}?` has been deprecated and will be removed in the #{version} Release. Please use `SiteSetting.#{new_setting}?` instead")
-        self.public_send "#{new_setting}?"
-      end
-
-      define_singleton_method "#{old_setting}=" do |val|
-        logger.warn("`SiteSetting.#{old_setting}=` has been deprecated and will be removed in the #{version} Release. Please use `SiteSetting.#{new_setting}=` instead")
-        self.public_send "#{new_setting}=", val
-      end
-    end
   end
 
   def setup_methods(name)
     clean_name = name.to_s.sub("?", "").to_sym
 
     define_singleton_method clean_name do
-      c = @containers[provider.current_site]
-      if c
-        c[name]
-      else
+      if (c = current[name]).nil?
         refresh!
         current[name]
+      else
+        c
       end
     end
 
@@ -495,10 +338,6 @@ module SiteSettingExtension
     end
   end
 
-  def enum_class(name)
-    enums[name]
-  end
-
   def get_hostname(url)
     unless (URI.parse(url).scheme rescue nil).nil?
       url = "http://#{url}" if URI.parse(url).scheme.nil?
diff --git a/lib/site_setting_validations.rb b/lib/site_setting_validations.rb
deleted file mode 100644
index 7858c68f0e..0000000000
--- a/lib/site_setting_validations.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-
-module SiteSettingValidations
-
-  def validate_error(key)
-    raise Discourse::InvalidParameters.new(I18n.t("errors.site_settings.#{key}"))
-  end
-
-  def validate_min_username_length(new_val)
-    validate_error :min_username_length_range if new_val > SiteSetting.max_username_length
-    validate_error :min_username_length_exists if User.where('length(username) < ?', new_val).exists?
-  end
-
-  def validate_max_username_length(new_val)
-    validate_error :min_username_length_range if new_val < SiteSetting.min_username_length
-    validate_error :max_username_length_exists if User.where('length(username) > ?', new_val).exists?
-  end
-
-  def validate_default_categories(new_val, default_categories_selected)
-    validate_error :default_categories_already_selected if (new_val.split("|").to_set & default_categories_selected).size > 0
-  end
-
-  def validate_default_categories_watching(new_val)
-    default_categories_selected = [
-      SiteSetting.default_categories_tracking.split("|"),
-      SiteSetting.default_categories_muted.split("|"),
-      SiteSetting.default_categories_watching_first_post.split("|")
-    ].flatten.to_set
-
-    validate_default_categories(new_val, default_categories_selected)
-  end
-
-  def validate_default_categories_tracking(new_val)
-    default_categories_selected = [
-      SiteSetting.default_categories_watching.split("|"),
-      SiteSetting.default_categories_muted.split("|"),
-      SiteSetting.default_categories_watching_first_post.split("|")
-    ].flatten.to_set
-
-    validate_default_categories(new_val, default_categories_selected)
-  end
-
-  def validate_default_categories_muted(new_val)
-    default_categories_selected = [
-      SiteSetting.default_categories_watching.split("|"),
-      SiteSetting.default_categories_tracking.split("|"),
-      SiteSetting.default_categories_watching_first_post.split("|")
-    ].flatten.to_set
-
-    validate_default_categories(new_val, default_categories_selected)
-  end
-
-  def validate_default_categories_watching_first_post(new_val)
-    default_categories_selected = [
-      SiteSetting.default_categories_watching.split("|"),
-      SiteSetting.default_categories_tracking.split("|"),
-      SiteSetting.default_categories_muted.split("|")
-    ].flatten.to_set
-
-    validate_default_categories(new_val, default_categories_selected)
-  end
-
-  def validate_enable_s3_uploads(new_val)
-    validate_error :s3_upload_bucket_is_required if new_val == "t" && SiteSetting.s3_upload_bucket.blank?
-  end
-
-end
diff --git a/lib/site_settings/db_provider.rb b/lib/site_settings/db_provider.rb
index 7757299fbd..8aef485c93 100644
--- a/lib/site_settings/db_provider.rb
+++ b/lib/site_settings/db_provider.rb
@@ -33,8 +33,8 @@ class SiteSettings::DbProvider
     model ||= @model.new
 
     model.name = name
-    model.value =  value
-    model.data_type =  data_type
+    model.value = value
+    model.data_type = data_type
 
     # save! used to ensure after_commit is called
     model.save!
@@ -56,8 +56,13 @@ class SiteSettings::DbProvider
 
   # table is not in the db yet, initial migration, etc
   def table_exists?
-    @table_exists = ActiveRecord::Base.connection.table_exists? @model.table_name unless @table_exists
-    @table_exists
+    @table_exists ||= {}
+
+    unless @table_exists[current_site]
+      @table_exists[current_site] = ActiveRecord::Base.connection.table_exists?(@model.table_name)
+    end
+
+    @table_exists[current_site]
   end
 
 end
diff --git a/lib/site_settings/defaults_provider.rb b/lib/site_settings/defaults_provider.rb
new file mode 100644
index 0000000000..7b1467a653
--- /dev/null
+++ b/lib/site_settings/defaults_provider.rb
@@ -0,0 +1,134 @@
+module SiteSettings; end
+
+# A cache for providing default value based on site locale
+class SiteSettings::DefaultsProvider
+  include Enumerable
+
+  CONSUMED_OPTS = %i[default locale_default].freeze
+  DEFAULT_LOCALE_KEY = :default_locale
+  DEFAULT_LOCALE = 'en'.freeze
+  DEFAULT_CATEGORY = 'required'.freeze
+
+  @@site_locales ||= DistributedCache.new('site_locales')
+
+  def initialize(site_setting)
+    @site_setting = site_setting
+    @site_setting.refresh_settings << DEFAULT_LOCALE_KEY
+    @defaults = {}
+    @defaults[DEFAULT_LOCALE.to_sym] = {}
+
+    refresh_site_locale!
+  end
+
+  def load_setting(name_arg, value, opts = {})
+    name = name_arg.to_sym
+    @defaults[DEFAULT_LOCALE.to_sym][name] = value
+
+    if (locale_default = opts[:locale_default])
+      locale_default.each do |locale, v|
+        locale = locale.to_sym
+        @defaults[locale] ||= {}
+        @defaults[locale][name] = v
+      end
+    end
+  end
+
+  def db_all
+    @site_setting.provider.all.delete_if { |s| s.name.to_sym == DEFAULT_LOCALE_KEY }
+  end
+
+  def all
+    @defaults[DEFAULT_LOCALE.to_sym].merge(@defaults[self.site_locale.to_sym] || {})
+  end
+
+  def get(name)
+    @defaults.dig(self.site_locale.to_sym, name.to_sym) ||
+      @defaults.dig(DEFAULT_LOCALE.to_sym, name.to_sym)
+  end
+  alias [] get
+
+  # Used to override site settings in dev/test env
+  def set_regardless_of_locale(name, value)
+    name = name.to_sym
+    if @site_setting.has_setting?(name)
+      @defaults.each { |_, hash| hash.delete(name) }
+      @defaults[DEFAULT_LOCALE.to_sym][name] = value
+      value, type = @site_setting.type_supervisor.to_db_value(name, value)
+      @defaults[self.site_locale.to_sym] ||= {}
+      @defaults[self.site_locale.to_sym][name] = @site_setting.type_supervisor.to_rb_value(name, value, type)
+    else
+      raise ArgumentError.new("No setting named '#{name}' exists")
+    end
+  end
+
+  def site_locale
+    @@site_locales[current_db]
+  end
+
+  def site_locale=(val)
+    val = val.to_s
+    raise Discourse::InvalidParameters.new(:value) unless LocaleSiteSetting.valid_value?(val)
+
+    if val != @@site_locales[current_db]
+      @site_setting.provider.save(DEFAULT_LOCALE_KEY, val, SiteSetting.types[:string])
+      refresh_site_locale!
+      @site_setting.refresh!
+      Discourse.request_refresh!
+    end
+
+    @@site_locales[current_db]
+  end
+
+  def each(&block)
+    self.all.each do |key, value|
+      block.call(key.to_sym, value)
+    end
+  end
+
+  def locale_setting_hash
+    {
+      setting: DEFAULT_LOCALE_KEY,
+      default: DEFAULT_LOCALE,
+      category: DEFAULT_CATEGORY,
+      description: @site_setting.description(DEFAULT_LOCALE_KEY),
+      type: SiteSetting.types[SiteSetting.types[:enum]],
+      preview: nil,
+      value: @@site_locales[current_db],
+      valid_values: LocaleSiteSetting.values,
+      translate_names: LocaleSiteSetting.translate_names?
+    }
+  end
+
+  def refresh_site_locale!
+    RailsMultisite::ConnectionManagement.each_connection do |db|
+      @@site_locales[db] =
+        if GlobalSetting.respond_to?(DEFAULT_LOCALE_KEY) &&
+            (global_val = GlobalSetting.send(DEFAULT_LOCALE_KEY)) &&
+            !global_val.blank?
+          global_val
+        elsif (db_val = @site_setting.provider.find(DEFAULT_LOCALE_KEY))
+          db_val.value.to_s
+        else
+          DEFAULT_LOCALE
+        end
+
+      @@site_locales[db]
+    end
+  end
+
+  def has_setting?(name)
+    has_key?(name.to_sym) || has_key?("#{name.to_s}?".to_sym)
+  end
+
+  private
+
+  def has_key?(name)
+    @defaults[self.site_locale.to_sym]&.key?(name) ||
+      @defaults[DEFAULT_LOCALE.to_sym].key?(name) || name == DEFAULT_LOCALE_KEY
+  end
+
+  def current_db
+    RailsMultisite::ConnectionManagement.current_db
+  end
+
+end
diff --git a/lib/site_settings/deprecated_settings.rb b/lib/site_settings/deprecated_settings.rb
new file mode 100644
index 0000000000..ca63777b4c
--- /dev/null
+++ b/lib/site_settings/deprecated_settings.rb
@@ -0,0 +1,26 @@
+module SiteSettings; end
+
+module SiteSettings::DeprecatedSettings
+  DEPRECATED_SETTINGS = [
+    %w[use_https force_https 1.7]
+  ]
+
+  def setup_deprecated_methods
+    DEPRECATED_SETTINGS.each do |old_setting, new_setting, version|
+      define_singleton_method old_setting do
+        logger.warn("`SiteSetting.#{old_setting}` has been deprecated and will be removed in the #{version} Release. Please use `SiteSetting.#{new_setting}` instead")
+        self.public_send new_setting
+      end
+
+      define_singleton_method "#{old_setting}?" do
+        logger.warn("`SiteSetting.#{old_setting}?` has been deprecated and will be removed in the #{version} Release. Please use `SiteSetting.#{new_setting}?` instead")
+        self.public_send "#{new_setting}?"
+      end
+
+      define_singleton_method "#{old_setting}=" do |val|
+        logger.warn("`SiteSetting.#{old_setting}=` has been deprecated and will be removed in the #{version} Release. Please use `SiteSetting.#{new_setting}=` instead")
+        self.public_send "#{new_setting}=", val
+      end
+    end
+  end
+end
diff --git a/lib/site_settings/local_process_provider.rb b/lib/site_settings/local_process_provider.rb
index a945150545..e3974b0ea4 100644
--- a/lib/site_settings/local_process_provider.rb
+++ b/lib/site_settings/local_process_provider.rb
@@ -10,7 +10,7 @@ class SiteSettings::LocalProcessProvider
     @settings[current_site] ||= {}
   end
 
-  def initialize()
+  def initialize
     @settings = {}
     self.current_site = "test"
   end
diff --git a/lib/site_settings/type_supervisor.rb b/lib/site_settings/type_supervisor.rb
new file mode 100644
index 0000000000..0cd9f272bc
--- /dev/null
+++ b/lib/site_settings/type_supervisor.rb
@@ -0,0 +1,210 @@
+require_dependency 'site_settings/validations'
+require_dependency 'enum'
+
+module SiteSettings; end
+
+class SiteSettings::TypeSupervisor
+  include SiteSettings::Validations
+
+  CONSUMED_OPTS = %i[enum choices type validator min max regex hidden regex_error].freeze
+  VALIDATOR_OPTS = %i[min max regex hidden regex_error].freeze
+
+  # For plugins, so they can tell if a feature is supported
+  SUPPORTED_TYPES = %i[email username list enum].freeze
+
+  def self.types
+    @types ||= Enum.new(string: 1,
+                        time: 2,
+                        integer: 3,
+                        float: 4,
+                        bool: 5,
+                        null: 6,
+                        enum: 7,
+                        list: 8,
+                        url_list: 9,
+                        host_list: 10,
+                        category_list: 11,
+                        value_list: 12,
+                        regex: 13,
+                        email: 14,
+                        username: 15)
+  end
+
+  def self.parse_value_type(val)
+    case val
+    when NilClass
+      self.types[:null]
+    when String
+      self.types[:string]
+    when Integer
+      self.types[:integer]
+    when Float
+      self.types[:float]
+    when TrueClass, FalseClass
+      self.types[:bool]
+    else
+      raise ArgumentError.new :val
+    end
+  end
+
+  def self.supported_types
+    SUPPORTED_TYPES
+  end
+
+  def initialize(defaults_provider)
+    @defaults_provider = defaults_provider
+    @enums = {}
+    @static_types = {}
+    @choices = {}
+    @validators = {}
+    @types = {}
+  end
+
+  def load_setting(name_arg, opts = {})
+    name = name_arg.to_sym
+
+    if (enum = opts[:enum])
+      @enums[name] = enum.is_a?(String) ? enum.constantize : enum
+      opts[:type] ||= :enum
+    end
+
+    if (new_choices = opts[:choices])
+      new_choices = eval(new_choices) if new_choices.is_a?(String)
+
+      if @choices.has_key?(name)
+        @choices[name].concat(new_choices)
+      else
+        @choices[name] = new_choices
+      end
+    end
+
+    if (type = opts[:type])
+      @static_types[name] = type.to_sym
+    end
+    @types[name] = get_data_type(name, @defaults_provider[name])
+
+    opts[:validator] = opts[:validator].try(:constantize)
+    if (validator_type = (opts[:validator] || validator_for(@types[name])))
+      @validators[name] = { class: validator_type, opts: opts.slice(*VALIDATOR_OPTS) }
+    end
+  end
+
+  def to_rb_value(name, value, override_type = nil)
+    name = name.to_sym
+    type = @types[name] = (override_type || @types[name] || get_data_type(name, value))
+
+    case type
+    when self.class.types[:float]
+      value.to_f
+    when self.class.types[:integer]
+      value.to_i
+    when self.class.types[:bool]
+      value == true || value == 't' || value == 'true'
+    when self.class.types[:null]
+      nil
+    when self.class.types[:enum]
+      @defaults_provider[name].is_a?(Integer) ? value.to_i : value.to_s
+    when self.class.types[:string]
+      value.to_s
+    else
+      return value if self.class.types[type]
+      # Otherwise it's a type error
+      raise ArgumentError.new :type
+    end
+  end
+
+  def to_db_value(name, value)
+    val, type = normalize_input(name, value)
+    validate_value(name, type, val)
+    [val, type]
+  end
+
+  def type_hash(name)
+    name = name.to_sym
+    type = self.class.types[@types[name]]
+
+    result = { type: type.to_s }
+
+    if type == :enum
+      if (klass = enum_class(name))
+        result.merge!(valid_values: klass.values, translate_names: klass.translate_names?)
+      else
+        result.merge!(valid_values: @choices[name].map { |c| { name: c, value: c } }, translate_names: false)
+      end
+    end
+
+    result[:choices] = @choices[name] if @choices.has_key? name
+    result
+  end
+
+  private
+
+  def normalize_input(name, val)
+    name = name.to_sym
+    type = @types[name] || self.class.parse_value_type(val)
+
+    if type == self.class.types[:bool]
+      val = (val == true || val == 't' || val == 'true') ? 't' : 'f'
+    elsif type == self.class.types[:integer] && !val.is_a?(Integer)
+      val = val.to_i
+    elsif type == self.class.types[:null] && val != ''
+      type = get_data_type(name, val)
+    elsif type == self.class.types[:enum]
+      val = @defaults_provider[name].is_a?(Integer) ? val.to_i : val.to_s
+    end
+
+    [val, type]
+  end
+
+  def validate_value(name, type, val)
+    if type == self.class.types[:enum]
+      if enum_class(name)
+        raise Discourse::InvalidParameters.new(:value) unless enum_class(name).valid_value?(val)
+      else
+        raise Discourse::InvalidParameters.new(:value) unless @choices[name].include?(val)
+      end
+    end
+
+    if (v = @validators[name])
+      validator = v[:class].new(v[:opts])
+      unless validator.valid_value?(val)
+        raise Discourse::InvalidParameters, "#{name.to_s}: #{validator.error_message}"
+      end
+    end
+
+    validate_method = "validate_#{name}"
+    if self.respond_to? validate_method
+      send(validate_method, val)
+    end
+  end
+
+  def get_data_type(name, val)
+    # Some types are just for validations like email.
+    # Only consider it valid if includes in `types`
+    if (static_type = @static_types[name.to_sym])
+      return self.class.types[static_type] if self.class.types.keys.include?(static_type)
+    end
+
+    self.class.parse_value_type(val)
+  end
+
+  def enum_class(name)
+    @enums[name]
+  end
+
+  def validator_for(type_name)
+    case type_name
+    when self.class.types[:email]
+      EmailSettingValidator
+    when self.class.types[:username]
+      UsernameSettingValidator
+    when self.class.types[:integer]
+      IntegerSettingValidator
+    when self.class.types[:regex]
+      RegexSettingValidator
+    when self.class.types[:string], self.class.types[:list], self.class.types[:enum]
+      StringSettingValidator
+    else nil
+    end
+  end
+end
diff --git a/lib/site_settings/validations.rb b/lib/site_settings/validations.rb
new file mode 100644
index 0000000000..0643ab49b6
--- /dev/null
+++ b/lib/site_settings/validations.rb
@@ -0,0 +1,66 @@
+module SiteSettings; end
+
+module SiteSettings::Validations
+  def validate_error(key)
+    raise Discourse::InvalidParameters.new(I18n.t("errors.site_settings.#{key}"))
+  end
+
+  def validate_min_username_length(new_val)
+    validate_error :min_username_length_range if new_val > SiteSetting.max_username_length
+    validate_error :min_username_length_exists if User.where('length(username) < ?', new_val).exists?
+  end
+
+  def validate_max_username_length(new_val)
+    validate_error :min_username_length_range if new_val < SiteSetting.min_username_length
+    validate_error :max_username_length_exists if User.where('length(username) > ?', new_val).exists?
+  end
+
+  def validate_default_categories(new_val, default_categories_selected)
+    validate_error :default_categories_already_selected if (new_val.split("|").to_set & default_categories_selected).size > 0
+  end
+
+  def validate_default_categories_watching(new_val)
+    default_categories_selected = [
+      SiteSetting.default_categories_tracking.split("|"),
+      SiteSetting.default_categories_muted.split("|"),
+      SiteSetting.default_categories_watching_first_post.split("|")
+    ].flatten.to_set
+
+    validate_default_categories(new_val, default_categories_selected)
+  end
+
+  def validate_default_categories_tracking(new_val)
+    default_categories_selected = [
+      SiteSetting.default_categories_watching.split("|"),
+      SiteSetting.default_categories_muted.split("|"),
+      SiteSetting.default_categories_watching_first_post.split("|")
+    ].flatten.to_set
+
+    validate_default_categories(new_val, default_categories_selected)
+  end
+
+  def validate_default_categories_muted(new_val)
+    default_categories_selected = [
+      SiteSetting.default_categories_watching.split("|"),
+      SiteSetting.default_categories_tracking.split("|"),
+      SiteSetting.default_categories_watching_first_post.split("|")
+    ].flatten.to_set
+
+    validate_default_categories(new_val, default_categories_selected)
+  end
+
+  def validate_default_categories_watching_first_post(new_val)
+    default_categories_selected = [
+      SiteSetting.default_categories_watching.split("|"),
+      SiteSetting.default_categories_tracking.split("|"),
+      SiteSetting.default_categories_muted.split("|")
+    ].flatten.to_set
+
+    validate_default_categories(new_val, default_categories_selected)
+  end
+
+  def validate_enable_s3_uploads(new_val)
+    validate_error :s3_upload_bucket_is_required if new_val == "t" && SiteSetting.s3_upload_bucket.blank?
+  end
+
+end
diff --git a/lib/site_settings/yaml_loader.rb b/lib/site_settings/yaml_loader.rb
index 5142f5aab1..82e9d851be 100644
--- a/lib/site_settings/yaml_loader.rb
+++ b/lib/site_settings/yaml_loader.rb
@@ -1,32 +1,28 @@
 module SiteSettings; end
 
 class SiteSettings::YamlLoader
-
   def initialize(file)
     @file = file
   end
 
-  def env_val(value)
-    if value.is_a?(Hash)
-      value.has_key?(Rails.env) ? value[Rails.env] : value['default']
-    else
-      value
-    end
-  end
-
   def load
     yaml = YAML.load_file(@file)
     yaml.each_key do |category|
       yaml[category].each do |setting_name, hash|
         if hash.is_a?(Hash)
           # Get default value for the site setting:
-          value = env_val(hash.delete('default'))
-
-          if hash.key?('hidden')
-            hash['hidden'] = env_val(hash.delete('hidden'))
+          value = hash.delete('default')
+          if value.is_a?(Hash)
+            raise Discourse::Deprecation, "The site setting `#{setting_name}` can no longer be set based on Rails environment. See also `config/environments/<env>.rb`."
+          elsif value.nil?
+            raise StandardError, "The site setting `#{setting_name}` in '#{@file}' is missing default value."
           end
 
-          yield category, setting_name, value, hash.symbolize_keys!
+          if hash['hidden']&.is_a?(Hash)
+            raise Discourse::Deprecation, "The site setting `#{setting_name}`'s hidden property can no longer be set based on Rails environment. It can only be either `true` or `false`."
+          end
+
+          yield category, setting_name, value, hash.deep_symbolize_keys!
         else
           # Simplest case. site_setting_name: 'default value'
           yield category, setting_name, hash, {}
diff --git a/lib/slug.rb b/lib/slug.rb
index 0f3b62b3f0..dc95095b7b 100644
--- a/lib/slug.rb
+++ b/lib/slug.rb
@@ -3,39 +3,49 @@
 module Slug
 
   CHAR_FILTER_REGEXP = /[:\/\?#\[\]@!\$&'\(\)\*\+,;=_\.~%\\`^\s|\{\}"<>]+/ # :/?#[]@!$&'()*+,;=_.~%\`^|{}"<>
+  MAX_LENGTH = 255
 
-  def self.for(string, default = 'topic')
-    slug = case (SiteSetting.slug_generation_method || :ascii).to_sym
-           when :ascii then self.ascii_generator(string)
-           when :encoded then self.encoded_generator(string)
-           when :none then self.none_generator(string)
-           end
+  def self.for(string, default = 'topic', max_length = MAX_LENGTH)
+    slug =
+      case (SiteSetting.slug_generation_method || :ascii).to_sym
+      when :ascii then self.ascii_generator(string)
+      when :encoded then self.encoded_generator(string)
+      when :none then self.none_generator(string)
+      end
     # Reject slugs that only contain numbers, because they would be indistinguishable from id's.
     slug = (slug =~ /[^\d]/ ? slug : '')
+    slug = self.prettify_slug(slug, max_length: max_length)
     slug.blank? ? default : slug
   end
 
-  def self.sanitize(string)
-    self.encoded_generator(string)
+  def self.sanitize(string, downcase: false, max_length: MAX_LENGTH)
+    slug = self.encoded_generator(string, downcase: downcase)
+    self.prettify_slug(slug, max_length: max_length)
   end
 
   private
 
-  def self.ascii_generator(string)
-    string.tr("'", "")
-          .parameterize
-          .tr("_", "-")
+  def self.prettify_slug(slug, max_length:)
+    slug
+      .tr("_", "-")
+      .truncate(max_length, omission: '')
+      .squeeze('-') # squeeze continuous dashes to prettify slug
+      .gsub(/\A-+|-+\z/, '') # remove possible trailing and preceding dashes
   end
 
-  def self.encoded_generator(string)
+  def self.ascii_generator(string)
+    string.tr("'", "").parameterize
+  end
+
+  def self.encoded_generator(string, downcase: true)
     # This generator will sanitize almost all special characters,
     # including reserved characters from RFC3986.
     # See also URI::REGEXP::PATTERN.
-    string.strip
-          .gsub(/\s+/, '-')
-          .gsub(CHAR_FILTER_REGEXP, '')
-          .gsub(/\A-+|-+\z/, '') # remove possible trailing and preceding dashes
-          .squeeze('-') # squeeze continuous dashes to prettify slug
+    string = string.strip
+      .gsub(/\s+/, '-')
+      .gsub(CHAR_FILTER_REGEXP, '')
+
+    downcase ? string.downcase : string
   end
 
   def self.none_generator(string)
diff --git a/lib/source_url.rb b/lib/source_url.rb
index 41d4fe5dec..90a4391f5b 100644
--- a/lib/source_url.rb
+++ b/lib/source_url.rb
@@ -6,7 +6,7 @@ class SourceURL < Tilt::Template
     source = input[:data]
     context = input[:environment].context_class.new(input)
 
-    result = new(filename){source}.render(context)
+    result = new(filename) { source }.render(context)
     context.metadata.merge(data: result)
   end
 
diff --git a/lib/spam_handler.rb b/lib/spam_handler.rb
index b14532c27d..2b8253512c 100644
--- a/lib/spam_handler.rb
+++ b/lib/spam_handler.rb
@@ -4,15 +4,15 @@ class SpamHandler
     return false if SiteSetting.max_new_accounts_per_registration_ip <= 0
 
     tl2_plus_accounts_with_same_ip = User.where("trust_level >= ?", TrustLevel[2])
-                                         .where(ip_address: ip_address.to_s)
-                                         .count
+      .where(ip_address: ip_address.to_s)
+      .count
 
     return false if tl2_plus_accounts_with_same_ip > 0
 
     staff_user_ids = Group[:staff].user_ids - [-1]
     staff_members_with_same_ip = User.where(id: staff_user_ids)
-                                     .where(ip_address: ip_address.to_s)
-                                     .count
+      .where(ip_address: ip_address.to_s)
+      .count
 
     return false if staff_members_with_same_ip > 0
 
@@ -20,9 +20,9 @@ class SpamHandler
     return false if ip_whitelisted
 
     tl0_accounts_with_same_ip = User.unscoped
-                                    .where(trust_level: TrustLevel[0])
-                                    .where(ip_address: ip_address.to_s)
-                                    .count
+      .where(trust_level: TrustLevel[0])
+      .where(ip_address: ip_address.to_s)
+      .count
 
     tl0_accounts_with_same_ip >= SiteSetting.max_new_accounts_per_registration_ip
   end
diff --git a/lib/sql_builder.rb b/lib/sql_builder.rb
index 70e461095c..3498cbe617 100644
--- a/lib/sql_builder.rb
+++ b/lib/sql_builder.rb
@@ -1,13 +1,13 @@
 class SqlBuilder
 
-  def initialize(template,klass=nil)
+  def initialize(template, klass = nil)
     @args = {}
     @sql = template
     @sections = {}
     @klass = klass
   end
 
-  [:set, :where2,:where,:order_by,:limit,:left_join,:join,:offset, :select].each do |k|
+  [:set, :where2, :where, :order_by, :limit, :left_join, :join, :offset, :select].each do |k|
     define_method k do |data, args = {}|
       @args.merge!(args)
       @sections[k] ||= []
@@ -18,7 +18,7 @@ class SqlBuilder
 
   def secure_category(secure_category_ids, category_alias = 'c')
     if secure_category_ids.present?
-      where("NOT COALESCE(" << category_alias << ".read_restricted, false) OR " << category_alias <<  ".id IN (:secure_category_ids)", secure_category_ids: secure_category_ids)
+      where("NOT COALESCE(" << category_alias << ".read_restricted, false) OR " << category_alias << ".id IN (:secure_category_ids)", secure_category_ids: secure_category_ids)
     else
       where("NOT COALESCE(" << category_alias << ".read_restricted, false)")
     end
@@ -28,17 +28,17 @@ class SqlBuilder
   def to_sql
     sql = @sql.dup
 
-    @sections.each do |k,v|
+    @sections.each do |k, v|
       joined = nil
       case k
       when :select
         joined = "SELECT " << v.join(" , ")
       when :where, :where2
-        joined = "WHERE " << v.map{|c| "(" << c << ")" }.join(" AND ")
+        joined = "WHERE " << v.map { |c| "(" << c << ")" }.join(" AND ")
       when :join
-        joined = v.map{|item| "JOIN " << item }.join("\n")
+        joined = v.map { |item| "JOIN " << item }.join("\n")
       when :left_join
-        joined = v.map{|item| "LEFT JOIN " << item }.join("\n")
+        joined = v.map { |item| "LEFT JOIN " << item }.join("\n")
       when :limit
         joined = "LIMIT " << v.last.to_s
       when :offset
@@ -64,7 +64,7 @@ class SqlBuilder
       if @args == {}
         ActiveRecord::Base.exec_sql(sql)
       else
-        ActiveRecord::Base.exec_sql(sql,@args)
+        ActiveRecord::Base.exec_sql(sql, @args)
       end
     end
   end
@@ -74,24 +74,23 @@ class SqlBuilder
   end
 
   class RailsDateTimeDecoder < PG::SimpleDecoder
-    def decode(string, tuple=nil, field=nil)
+    def decode(string, tuple = nil, field = nil)
       if Rails.version >= "4.2.0"
         @caster ||= ActiveRecord::Type::DateTime.new
-        @caster.type_cast_from_database(string)
+        @caster.cast(string)
       else
         ActiveRecord::ConnectionAdapters::Column.string_to_time string
       end
     end
   end
 
-
   class ActiveRecordTypeMap < PG::BasicTypeMapForResults
     def initialize(connection)
       super(connection)
       rm_coder 0, 1114
       add_coder RailsDateTimeDecoder.new(name: "timestamp", oid: 1114, format: 0)
-      # we don't need deprecations
-     	self.default_type_map = PG::TypeMapInRuby.new
+       # we don't need deprecations
+       self.default_type_map = PG::TypeMapInRuby.new
     end
   end
 
diff --git a/lib/staff_constraint.rb b/lib/staff_constraint.rb
index 19c3acf422..ba4dc0a36c 100644
--- a/lib/staff_constraint.rb
+++ b/lib/staff_constraint.rb
@@ -5,6 +5,8 @@ class StaffConstraint
   def matches?(request)
     provider = Discourse.current_user_provider.new(request.env)
     provider.current_user && provider.current_user.staff?
+  rescue Discourse::InvalidAccess
+    false
   end
 
 end
diff --git a/lib/stats_socket.rb b/lib/stats_socket.rb
index 2b81db678f..e1afc677ba 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/stylesheet/compiler.rb b/lib/stylesheet/compiler.rb
index e6a7530b88..5aff8dfdba 100644
--- a/lib/stylesheet/compiler.rb
+++ b/lib/stylesheet/compiler.rb
@@ -11,11 +11,12 @@ module Stylesheet
       error.gsub!("\n", '\A ')
       error.gsub!("'", '\27 ')
 
-      "footer { white-space: pre; }
-      footer:after { content: '#{error}' }"
+      "#main { display: none; }
+      body { white-space: pre; }
+      body:before { font-family: monospace; content: '#{error}' }"
     end
 
-    def self.compile_asset(asset, options={})
+    def self.compile_asset(asset, options = {})
 
       if Importer.special_imports[asset.to_s]
         filename = "theme.scss"
@@ -26,12 +27,12 @@ module Stylesheet
         file = File.read path
       end
 
-      compile(file,filename,options)
+      compile(file, filename, options)
 
     end
 
-    def self.compile(stylesheet, filename, options={})
-      source_map_file = options[:source_map_file] || "#{filename.sub(".scss","")}.css.map";
+    def self.compile(stylesheet, filename, options = {})
+      source_map_file = options[:source_map_file] || "#{filename.sub(".scss", "")}.css.map";
 
       engine = SassC::Engine.new(stylesheet,
                                  importer: Importer,
@@ -44,7 +45,6 @@ module Stylesheet
                                  theme_field: options[:theme_field],
                                  load_paths: [ASSET_ROOT])
 
-
       result = engine.render
 
       if options[:rtl]
diff --git a/lib/stylesheet/importer.rb b/lib/stylesheet/importer.rb
index 0b9066f8b5..93e4c479c8 100644
--- a/lib/stylesheet/importer.rb
+++ b/lib/stylesheet/importer.rb
@@ -41,9 +41,7 @@ module Stylesheet
       colors.each do |n, hex|
         contents << "$#{n}: ##{hex} !default;\n"
       end
-      theme&.theme_fields&.each do |field|
-        next unless ThemeField.theme_var_type_ids.include?(field.type_id)
-
+      theme&.all_theme_variables&.each do |field|
         if field.type_id == ThemeField.types[:theme_upload_var]
           if upload = field.upload
             url = upload_cdn_path(upload.url)
@@ -61,7 +59,7 @@ module Stylesheet
     register_import "category_backgrounds" do
       contents = ""
       Category.where('uploaded_background_id IS NOT NULL').each do |c|
-        contents << category_css(c) if c.uploaded_background
+        contents << category_css(c) if c.uploaded_background&.url.present?
       end
 
       Import.new("categoy_background.scss", source: contents)
diff --git a/lib/stylesheet/manager.rb b/lib/stylesheet/manager.rb
index ebceac3269..92442b5606 100644
--- a/lib/stylesheet/manager.rb
+++ b/lib/stylesheet/manager.rb
@@ -16,7 +16,7 @@ class Stylesheet::Manager
   end
 
   def self.clear_theme_cache!
-    cache.hash.keys.select{|k| k =~ /theme/}.each{|k|cache.delete(k)}
+    cache.hash.keys.select { |k| k =~ /theme/ }.each { |k|cache.delete(k) }
   end
 
   def self.stylesheet_href(target = :desktop, theme_key = :missing)
@@ -54,9 +54,9 @@ class Stylesheet::Manager
   end
 
   def self.precompile_css
-    themes = Theme.where('user_selectable OR key = ?', SiteSetting.default_theme_key).pluck(:key,:name)
+    themes = Theme.where('user_selectable OR key = ?', SiteSetting.default_theme_key).pluck(:key, :name)
     themes << nil
-    themes.each do |key,name|
+    themes.each do |key, name|
       [:desktop, :mobile, :desktop_rtl, :mobile_rtl].each do |target|
         theme_key = key || SiteSetting.default_theme_key
         cache_key = "#{target}_#{theme_key}"
@@ -104,7 +104,7 @@ class Stylesheet::Manager
     @theme_key = theme_key
   end
 
-  def compile(opts={})
+  def compile(opts = {})
     unless opts[:force]
       if File.exists?(stylesheet_fullpath)
         unless StylesheetCache.where(target: qualified_target, digest: digest).exists?
@@ -120,7 +120,7 @@ class Stylesheet::Manager
     end
 
     rtl = @target.to_s =~ /_rtl$/
-    css,source_map = begin
+    css, source_map = begin
       Stylesheet::Compiler.compile_asset(
         @target,
          rtl: rtl,
@@ -216,7 +216,7 @@ class Stylesheet::Manager
   end
 
   def stylesheet_filename_no_digest
-    stylesheet_filename(_with_digest=false)
+    stylesheet_filename(_with_digest = false)
   end
 
   def is_theme?
@@ -257,7 +257,7 @@ class Stylesheet::Manager
   def color_scheme_digest
 
     cs = theme&.color_scheme
-    category_updated = Category.where("uploaded_background_id IS NOT NULL").last_updated_at
+    category_updated = Category.where("uploaded_background_id IS NOT NULL").pluck(:updated_at).map(&:to_i).sum
 
     if cs || category_updated > 0
       Digest::SHA1.hexdigest "#{RailsMultisite::ConnectionManagement.current_db}-#{cs&.id}-#{cs&.version}-#{Stylesheet::Manager.last_file_updated}-#{category_updated}"
diff --git a/lib/stylesheet/watcher.rb b/lib/stylesheet/watcher.rb
index 138d750fd6..f0778b38dc 100644
--- a/lib/stylesheet/watcher.rb
+++ b/lib/stylesheet/watcher.rb
@@ -3,17 +3,27 @@ require 'listen'
 module Stylesheet
   class Watcher
 
-    def self.watch(paths=nil)
+    def self.watch(paths = nil)
       watcher = new(paths)
       watcher.start
       watcher
     end
 
     def initialize(paths)
-      @paths = paths || ["app/assets/stylesheets", "plugins"]
+      @paths = paths || Watcher.default_paths
       @queue = Queue.new
     end
 
+    def self.default_paths
+      return @default_paths if @default_paths
+
+      @default_paths = ["app/assets/stylesheets"]
+      Discourse.plugins.each do |p|
+        @default_paths << File.dirname(p.path).sub(Rails.root.to_s, '').sub(/^\//, '')
+      end
+      @default_paths
+    end
+
     def start
 
       Thread.new do
@@ -26,15 +36,18 @@ module Stylesheet
         end
       end
 
-
       root = Rails.root.to_s
+
+      listener_opts = { ignore: /xxxx/ }
+      listener_opts[:force_polling] = true if ENV['FORCE_POLLING']
+
       @paths.each do |watch|
         Thread.new do
           begin
-            listener = Listen.to("#{root}/#{watch}", ignore: /xxxx/) do |modified, added, _|
+            listener = Listen.to("#{root}/#{watch}", listener_opts) do |modified, added, _|
               paths = [modified, added].flatten
               paths.compact!
-              paths.map!{|long| long[(root.length+1)..-1]}
+              paths.map! { |long| long[(root.length + 1)..-1] }
               process_change(paths)
             end
           rescue => e
@@ -55,7 +68,7 @@ module Stylesheet
       Stylesheet::Manager.cache.clear
 
       message = ["desktop", "mobile", "admin"].map do |name|
-        {target: name, new_href: Stylesheet::Manager.stylesheet_href(name.to_sym) , theme_key: SiteSetting.default_theme_key}
+        { target: name, new_href: Stylesheet::Manager.stylesheet_href(name.to_sym) , theme_key: SiteSetting.default_theme_key }
       end
 
       MessageBus.publish '/file-change', message
diff --git a/lib/suggested_topics_builder.rb b/lib/suggested_topics_builder.rb
index 9436bb5c5a..fc7d0cc728 100644
--- a/lib/suggested_topics_builder.rb
+++ b/lib/suggested_topics_builder.rb
@@ -11,26 +11,27 @@ class SuggestedTopicsBuilder
     @results = []
   end
 
-
-  def add_results(results, priority=:low)
+  def add_results(results, priority = :low)
 
     # WARNING .blank? will execute an Active Record query
     return unless results
 
     # Only add results if we don't have those topic ids already
     results = results.where('topics.id NOT IN (?)', @excluded_topic_ids)
-                     .where(visible: true)
+      .where(visible: true)
 
     # If limit suggested to category is enabled, restrict to that category
     if @category_id && SiteSetting.limit_suggested_to_category?
       results = results.where(category_id: @category_id)
     end
-    results = results.to_a.reject { |topic| @category_topic_ids.include?(topic.id) }
+
+    results = results.to_a
+    results.reject! { |topic| @category_topic_ids.include?(topic.id) }
 
     unless results.empty?
       # Keep track of the ids we've added
-      @excluded_topic_ids.concat results.map {|r| r.id}
-      splice_results(results,priority)
+      @excluded_topic_ids.concat results.map { |r| r.id }
+      splice_results(results, priority)
     end
   end
 
@@ -40,7 +41,7 @@ class SuggestedTopicsBuilder
       # Topics from category @category_id need to be first in the list, all others after.
 
       other_category_index = @results.index { |r| r.category_id != @category_id }
-      category_results, other_category_results = results.partition{ |r| r.category_id == @category_id }
+      category_results, other_category_results = results.partition { |r| r.category_id == @category_id }
 
       if other_category_index
         @results.insert other_category_index, *category_results
@@ -66,7 +67,7 @@ class SuggestedTopicsBuilder
   end
 
   def category_results_left
-    SiteSetting.suggested_topics - @results.count{|r| r.category_id == @category_id}
+    SiteSetting.suggested_topics - @results.count { |r| r.category_id == @category_id }
   end
 
   def size
diff --git a/lib/table_migration_helper.rb b/lib/table_migration_helper.rb
index 4d0308341b..605555d49f 100644
--- a/lib/table_migration_helper.rb
+++ b/lib/table_migration_helper.rb
@@ -45,7 +45,7 @@ SQL
                                         new_name: new_name,
                                         delay: "#{delay.to_i || 0} seconds",
                                         after_migration: after_migration).to_a.length > 0
-        on_drop&.call
+      on_drop&.call
 
         ActiveRecord::Base.exec_sql("DROP TABLE #{old_name}")
     end
diff --git a/lib/tasks/add_topic_to_quotes.rake b/lib/tasks/add_topic_to_quotes.rake
index 51d1cf2edd..ff36e46bf0 100644
--- a/lib/tasks/add_topic_to_quotes.rake
+++ b/lib/tasks/add_topic_to_quotes.rake
@@ -6,4 +6,3 @@ task "add_topic_to_quotes" => :environment do
     Post.update_all ["raw = ?, cooked = ?", new_raw, new_cooked], ["id = ?", p.id]
   end
 end
-
diff --git a/lib/tasks/admin.rake b/lib/tasks/admin.rake
index cd7e40d39f..c57e03b785 100644
--- a/lib/tasks/admin.rake
+++ b/lib/tasks/admin.rake
@@ -1,6 +1,6 @@
 
 desc "invite an admin to this discourse instance"
-task "admin:invite", [:email] => [:environment] do |_,args|
+task "admin:invite", [:email] => [:environment] do |_, args|
   email = args[:email]
   if !email || email !~ /@/
     puts "ERROR: Expecting rake admin:invite[some@email.com]"
@@ -20,7 +20,7 @@ task "admin:invite", [:email] => [:environment] do |_,args|
   puts "Granting admin!"
   user.grant_admin!
   user.change_trust_level!(4)
-  user.email_tokens.update_all  confirmed: true
+  user.email_tokens.update_all confirmed: true
 
   puts "Sending email!"
   email_token = user.email_tokens.create(email: user.email)
@@ -42,8 +42,8 @@ task "admin:create" => :environment do
       reset_password = ask("User with this email already exists! Do you want to reset the password for this email? (Y/n)  ")
       if (reset_password == "" || reset_password.downcase == 'y')
         begin
-          password = ask("Password:  ") {|q| q.echo = false}
-          password_confirmation = ask("Repeat password:  ") {|q| q.echo = false}
+          password = ask("Password:  ") { |q| q.echo = false }
+          password_confirmation = ask("Repeat password:  ") { |q| q.echo = false }
         end while password != password_confirmation
         admin.password = password
       end
@@ -53,8 +53,8 @@ task "admin:create" => :environment do
       admin.email = email
       admin.username = UserNameSuggester.suggest(admin.email)
       begin
-        password = ask("Password:  ") {|q| q.echo = false}
-        password_confirmation = ask("Repeat password:  ") {|q| q.echo = false}
+        password = ask("Password:  ") { |q| q.echo = false }
+        password_confirmation = ask("Repeat password:  ") { |q| q.echo = false }
       end while password != password_confirmation
       admin.password = password
     end
@@ -82,7 +82,7 @@ task "admin:create" => :environment do
   if (grant_admin == "" || grant_admin.downcase == 'y')
     admin.grant_admin!
     admin.change_trust_level!(4)
-    admin.email_tokens.update_all  confirmed: true
+    admin.email_tokens.update_all confirmed: true
     admin.activate
 
     say("\nYour account now has Admin privileges!")
diff --git a/lib/tasks/api.rake b/lib/tasks/api.rake
index ef42e8a7bd..5a4ef6c85e 100644
--- a/lib/tasks/api.rake
+++ b/lib/tasks/api.rake
@@ -1,6 +1,6 @@
 desc "generate api key if missing, return existing if already there"
 task "api_key:get" => :environment do
-    api_key = ApiKey.create_master_key
+  api_key = ApiKey.create_master_key
 
     puts api_key.key
 end
diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index 2daf2ab15c..75f7db109b 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -1,6 +1,7 @@
 task 'assets:precompile:before' do
 
   require 'uglifier'
+  require 'open3'
 
   unless %w{profile production}.include? Rails.env
     raise "rake assets:precompile should only be run in RAILS_ENV=production, you are risking unminified assets"
@@ -11,6 +12,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
@@ -67,10 +72,10 @@ def assets_path
   "#{Rails.root}/public/assets"
 end
 
-def compress_node(from,to)
+def compress_node(from, to)
   to_path = "#{assets_path}/#{to}"
   assets = cdn_relative_path("/assets")
-  source_map_root = assets + ((d=File.dirname(from)) == "." ? "" : "/#{d}")
+  source_map_root = assets + ((d = File.dirname(from)) == "." ? "" : "/#{d}")
   source_map_url = cdn_path "/assets/#{to}.map"
 
   cmd = "uglifyjs '#{assets_path}/#{from}' -p relative -c -m -o '#{to_path}' --source-map-root '#{source_map_root}' --source-map '#{assets_path}/#{to}.map' --source-map-url '#{source_map_url}'"
@@ -85,7 +90,7 @@ def compress_node(from,to)
   result
 end
 
-def compress_ruby(from,to)
+def compress_ruby(from, to)
   data = File.read("#{assets_path}/#{from}")
 
   uglified, map = Uglifier.new(comments: :none,
@@ -95,7 +100,7 @@ def compress_ruby(from,to)
                                  output_filename: File.basename(to)
                                }
                               )
-                          .compile_with_map(data)
+    .compile_with_map(data)
   dest = "#{assets_path}/#{to}"
 
   File.write(dest, uglified << "\n//# sourceMappingURL=#{cdn_path "/assets/#{to}.map"}")
@@ -105,23 +110,44 @@ def compress_ruby(from,to)
 end
 
 def gzip(path)
-  STDERR.puts "gzip #{path}"
+  STDERR.puts "gzip -f -c -9 #{path} > #{path}.gz"
   STDERR.puts `gzip -f -c -9 #{path} > #{path}.gz`
+  raise "gzip compression failed: exit code #{$?.exitstatus}" if $?.exitstatus != 0
+end
+
+if ENV['COMPRESS_BROTLI']&.to_i == 1
+  # different brotli versions use different parameters
+  ver_out, ver_err, ver_status = Open3.capture3('brotli --version')
+  if !ver_status.success?
+    # old versions of brotli don't respond to --version
+    def brotli_command(path)
+      "brotli --quality 11 --input #{path} --output #{path}.br"
+    end
+  elsif ver_out >= "brotli 1.0.0"
+    def brotli_command(path)
+      "brotli --quality=11 #{path} --output=#{path}.br"
+    end
+  else
+    # not sure what to do here, not expecting this
+    raise "cannot determine brotli version"
+  end
 end
 
 def brotli(path)
   if ENV['COMPRESS_BROTLI']&.to_i == 1
-    STDERR.puts "brotli #{path}"
-    STDERR.puts `brotli --quality 11 --input #{path} --output #{path}.br`
+    STDERR.puts brotli_command(path)
+    STDERR.puts `#{brotli_command(path)}`
+    raise "brotli compression failed: exit code #{$?.exitstatus}" if $?.exitstatus != 0
     STDERR.puts `chmod +r #{path}.br`
+    raise "chmod failed: exit code #{$?.exitstatus}" if $?.exitstatus != 0
   end
 end
 
-def compress(from,to)
+def compress(from, to)
   if $node_uglify
-    compress_node(from,to)
+    compress_node(from, to)
   else
-    compress_ruby(from,to)
+    compress_ruby(from, to)
   end
 end
 
@@ -144,10 +170,10 @@ task 'assets:precompile' => 'assets:precompile:before' do
     concurrent? do |proc|
       to_skip = Rails.configuration.assets.skip_minification || []
       manifest.files
-              .select{|k,v| k =~ /\.js$/}
-              .each do |file, info|
+        .select { |k, v| k =~ /\.js$/ }
+        .each do |file, info|
 
-          path = "#{assets_path}/#{file}"
+        path = "#{assets_path}/#{file}"
           _file = (d = File.dirname(file)) == "." ? "_#{file}" : "#{d}/_#{File.basename(file)}"
           _path = "#{assets_path}/#{_file}"
 
@@ -160,7 +186,7 @@ task 'assets:precompile' => 'assets:precompile:before' do
               # We can specify some files to never minify
               unless (ENV["DONT_MINIFY"] == "1") || to_skip.include?(info['logical_path'])
                 FileUtils.mv(path, _path)
-                compress(_file,file)
+                compress(_file, file)
               end
 
               info["size"] = File.size(path)
diff --git a/lib/tasks/auto_annotate_models.rake b/lib/tasks/auto_annotate_models.rake
index dde0cc0364..617f473c9b 100644
--- a/lib/tasks/auto_annotate_models.rake
+++ b/lib/tasks/auto_annotate_models.rake
@@ -1,36 +1,34 @@
 # NOTE: only doing this in development as some production environments (Heroku)
 # NOTE: are sensitive to local FS writes, and besides -- it's just not proper
 # NOTE: to have a dev-mode tool do its thing in production.
-if(Rails.env.development? || Rails.env.test?)
+if (Rails.env.development? || Rails.env.test?)
   task :set_annotation_options do
     # You can override any of these by setting an environment variable of the
     # same name.
-    Annotate.set_defaults({
-      'position_in_routes'   => "before",
-      'position_in_class'    => "after",
-      'position_in_test'     => "before",
-      'position_in_fixture'  => "before",
-      'position_in_factory'  => "before",
-      'show_indexes'         => "true",
-      'simple_indexes'       => "false",
-      'model_dir'            => "app/models",
-      'include_version'      => "false",
-      'require'              => "",
-      'exclude_tests'        => "true",
-      'exclude_fixtures'     => "true",
-      'exclude_helpers'      => "true",
-      'exclude_factories'    => "true",
-      'exclude_serializers'  => "true",
-      'exclude_controllers'  => "true",
-      'ignore_model_sub_dir' => "false",
-      'skip_on_db_migrate'   => "true",
-      'format_bare'          => "true",
-      'format_rdoc'          => "false",
-      'format_markdown'      => "false",
-      'sort'                 => "false",
-      'force'                => "false",
-      'trace'                => "false",
-    })
+    Annotate.set_defaults('position_in_routes' => "before",
+                          'position_in_class'    => "after",
+                          'position_in_test'     => "before",
+                          'position_in_fixture'  => "before",
+                          'position_in_factory'  => "before",
+                          'show_indexes'         => "true",
+                          'simple_indexes'       => "false",
+                          'model_dir'            => "app/models",
+                          'include_version'      => "false",
+                          'require'              => "",
+                          'exclude_tests'        => "true",
+                          'exclude_fixtures'     => "true",
+                          'exclude_helpers'      => "true",
+                          'exclude_factories'    => "true",
+                          'exclude_serializers'  => "true",
+                          'exclude_controllers'  => "true",
+                          'ignore_model_sub_dir' => "false",
+                          'skip_on_db_migrate'   => "true",
+                          'format_bare'          => "true",
+                          'format_rdoc'          => "false",
+                          'format_markdown'      => "false",
+                          'sort'                 => "false",
+                          'force'                => "false",
+                          'trace'                => "false")
   end
 
 end
diff --git a/lib/tasks/autospec.rake b/lib/tasks/autospec.rake
index 3df52d0f05..2f1de2c486 100644
--- a/lib/tasks/autospec.rake
+++ b/lib/tasks/autospec.rake
@@ -6,7 +6,7 @@ desc "Run all specs automatically as needed"
 task "autospec" => :environment do
   require 'autospec/manager'
 
-  debug = ARGV.any?{ |a|  a == "d" || a == "debug" } || ENV["DEBUG"]
+  debug = ARGV.any? { |a|  a == "d" || a == "debug" } || ENV["DEBUG"]
   force_polling = ARGV.any? { |a| a == "p" || a == "polling" }
   latency = ((ARGV.find { |a| a =~ /l=|latency=/ } || "").split("=")[1] || 3).to_i
 
diff --git a/lib/tasks/avatars.rake b/lib/tasks/avatars.rake
index 4c1da8fd54..5b2df506cf 100644
--- a/lib/tasks/avatars.rake
+++ b/lib/tasks/avatars.rake
@@ -24,7 +24,7 @@ task "avatars:clean" => :environment do
   OptimizedImage.where("upload_id IN (SELECT custom_upload_id FROM user_avatars) OR
                         upload_id IN (SELECT gravatar_upload_id FROM user_avatars) OR
                         upload_id IN (SELECT uploaded_avatar_id FROM users)")
-                .find_each do |optimized_image|
+    .find_each do |optimized_image|
     optimized_image.destroy!
     putc "." if (i += 1) % 10 == 0
   end
diff --git a/lib/tasks/backfill.thor b/lib/tasks/backfill.thor
index a69a58803d..44afebbda5 100644
--- a/lib/tasks/backfill.thor
+++ b/lib/tasks/backfill.thor
@@ -1,7 +1,6 @@
 class Backfill < Thor
   desc "link_titles", "Backfills link titles"
 
-
   def link_titles
     require './config/environment'
     topic_links = TopicLink.where(crawled_at: nil, internal: false)
@@ -13,4 +12,3 @@ class Backfill < Thor
     end
   end
 end
-
diff --git a/lib/tasks/build.rake b/lib/tasks/build.rake
index 0f698be15a..443d675a61 100644
--- a/lib/tasks/build.rake
+++ b/lib/tasks/build.rake
@@ -1,8 +1,13 @@
 desc "stamp the current build with the git hash placed in version.rb"
 task "build:stamp" => :environment do
-  git_version = `git rev-parse HEAD`.strip
+  git_version  = `git rev-parse HEAD`.strip
+  git_branch   = `git rev-parse --abbrev-ref HEAD`
+  full_version = `git describe --dirty --match "v[0-9]*"`
+
   File.open(Rails.root.to_s + '/config/version.rb', 'w') do |f|
-    f.write("$git_version = #{git_version.inspect}\n")
+    f.write("$git_version  = #{git_version.inspect}\n")
+    f.write("$git_branch   = #{git_branch.inspect}\n")
+    f.write("$full_version = #{full_version.inspect}\n")
   end
-  puts "Stamped current build with #{git_version}"
+  puts "Stamped current build with #{git_version} #{git_branch} #{full_version}"
 end
diff --git a/lib/tasks/build_test_topic.rake b/lib/tasks/build_test_topic.rake
index e135cabc92..7c64a76566 100644
--- a/lib/tasks/build_test_topic.rake
+++ b/lib/tasks/build_test_topic.rake
@@ -4,7 +4,6 @@ desc 'create pushstate/replacestate test topic'
 task 'build_test_topic' => :environment do
   puts 'Creating topic'
 
-
   # Acceptable options:
   #
   #   raw                     - raw text of post
@@ -33,7 +32,7 @@ task 'build_test_topic' => :environment do
     links = []
     [-30, -10, 10, 30].each do |offset|
       where = (post_number + offset)
-      if where >= 1 and where <= 100
+      if where >= (1) && where <= (100)
         links << "Link to ##{where}: #{topic_url}/#{where}"
       end
     end
diff --git a/lib/tasks/cdn.rake b/lib/tasks/cdn.rake
index c9b793cbf3..0e13c3ae8c 100644
--- a/lib/tasks/cdn.rake
+++ b/lib/tasks/cdn.rake
@@ -34,7 +34,7 @@ task 'assets:prestage' => :environment do |t|
       "id" => config["id"],
       "login" => config["login"],
       "passwd" => config["password"],
-      "json" => {"prefetch_paths" => asset}.to_json
+      "json" => { "prefetch_paths" => asset }.to_json
     )
 
     response = http.request(request)
@@ -43,7 +43,7 @@ task 'assets:prestage' => :environment do |t|
       failed_assets.push(asset)
     end
   end
-  
+
   if failed_assets.length > 0
     raise "Failed to pre-stage #{failed_assets.length}/#{assets.length} files"
   end
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 0c88c62c55..e7782f1a85 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -1,17 +1,44 @@
 # we should set the locale before the migration
 task 'set_locale' do
-  I18n.locale = (SiteSetting.default_locale || :en) rescue :en
+  begin
+    I18n.locale = (SiteSetting.default_locale || :en) rescue :en
+  rescue I18n::InvalidLocale
+    I18n.locale = :en
+  end
 end
 
-# we need to run seed_fu every time we run rake db:migrate
-task 'db:migrate' => ['environment', 'set_locale'] do
-  SeedFu.seed
-  Jobs::Onceoff.enqueue_all
+task 'db:environment:set', [:multisite] => [:load_config]  do |_, args|
+  if Rails.env.test? && !args[:multisite]
+    system("MULTISITE=multisite rails db:environment:set['true'] RAILS_ENV=test")
+  end
+end
+
+task 'db:create', [:multisite] => [:load_config] do |_, args|
+  if Rails.env.test? && !args[:multisite]
+    system("MULTISITE=multisite rails db:create['true']")
+  end
+end
+
+task 'db:drop', [:multisite] => [:load_config] do |_, args|
+  if Rails.env.test? && !args[:multisite]
+    system("MULTISITE=multisite rails db:drop['true']")
+  end
+end
+
+# we need to run seed_fu every time we run rails db:migrate
+task 'db:migrate', [:multisite] => ['environment', 'set_locale'] do |_, args|
+  SeedFu.seed(DiscoursePluginRegistry.seed_paths)
+
+  if Rails.env.test? && !args[:multisite]
+    system("rails db:schema:dump")
+    system("MULTISITE=multisite rails db:schema:load")
+    system("RAILS_DB=discourse_test_multisite rails db:migrate['multisite']")
+  end
 end
 
 task 'test:prepare' => 'environment' do
   I18n.locale = SiteSetting.default_locale rescue :en
-  SeedFu.seed
+  SeedFu.seed(DiscoursePluginRegistry.seed_paths)
 end
 
 task 'db:api_test_seed' => 'environment' do
@@ -19,6 +46,59 @@ task 'db:api_test_seed' => 'environment' do
   load Rails.root + 'db/api_test_seeds.rb'
 end
 
+def print_table(array)
+  width = array[0].keys.map { |k| k.to_s.length }
+  cols = array[0].keys.length
+
+  array.each do |row|
+    row.each_with_index do |(_, val), i|
+      width[i] = [width[i].to_i, val.to_s.length].max
+    end
+  end
+
+  array[0].keys.each_with_index do |col, i|
+    print col.to_s.ljust(width[i], ' ')
+    if i == cols - 1
+      puts
+    else
+      print ' | '
+    end
+  end
+
+  puts "-" * (width.sum + width.length)
+
+  array.each do |row|
+    row.each_with_index do |(_, val), i|
+      print val.to_s.ljust(width[i], ' ')
+      if i == cols - 1
+        puts
+      else
+        print ' | '
+      end
+    end
+  end
+end
+
+desc 'Statistics about database'
+task 'db:stats' => 'environment' do
+
+  sql = <<~SQL
+    select table_name,
+    (
+      select reltuples::bigint
+      from pg_class
+      where oid = ('public.' || table_name)::regclass
+    ) AS row_estimate,
+    pg_size_pretty(pg_relation_size(quote_ident(table_name))) size
+    from information_schema.tables
+    where table_schema = 'public'
+    order by pg_relation_size(quote_ident(table_name)) DESC
+  SQL
+
+  puts
+  print_table(Post.exec_sql(sql).to_a)
+end
+
 desc 'Rebuild indexes'
 task 'db:rebuild_indexes' => 'environment' do
   if Import::backup_tables_count > 0
diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index aba9e4df45..e506eed273 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -1,3 +1,31 @@
+# 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_LINT                 set to 1 to skip linting (eslint and rubocop)
+# => SKIP_TESTS                set to 1 to skip all tests
+# => 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)
@@ -8,50 +36,92 @@ end
 desc 'Run all tests (JS and code in a standalone environment)'
 task 'docker:test' do
   begin
-
-    puts "Cleaning up old test tmp data in tmp/test_data"
-    `rm -fr tmp/test_data && mkdir -p tmp/test_data/redis && mkdir tmp/test_data/pg`
-
-    puts "Starting background redis"
-    @redis_pid = Process.spawn('redis-server --dir tmp/test_data/redis')
-
-    @postgres_bin = "/usr/lib/postgresql/9.5/bin/"
-    `#{@postgres_bin}initdb -D tmp/test_data/pg`
-
-    # speed up db, never do this in production mmmmk
-    `echo fsync = off >> tmp/test_data/pg/postgresql.conf`
-    `echo full_page_writes = off >> tmp/test_data/pg/postgresql.conf`
-    `echo shared_buffers = 500MB >> tmp/test_data/pg/postgresql.conf`
-
-    puts "Starting postgres"
-    @pg_pid = Process.spawn("#{@postgres_bin}postmaster -D tmp/test_data/pg")
-
-
-    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")
+    @good = true
+    unless ENV['SKIP_LINT']
+      puts "Running linters"
+      if ENV["SINGLE_PLUGIN"]
+        @good &&= run_or_fail("bundle exec rubocop --parallel plugins/#{ENV["SINGLE_PLUGIN"]}")
+        @good &&= run_or_fail("eslint --ext .es6 plugins/#{ENV['SINGLE_PLUGIN']}")
+      else
+        @good &&= run_or_fail("bundle exec rubocop --parallel") unless ENV["SKIP_CORE"]
+        @good &&= run_or_fail("eslint app/assets/javascripts test/javascripts") unless ENV["SKIP_CORE"]
+        @good &&= run_or_fail("eslint --ext .es6 app/assets/javascripts test/javascripts plugins") unless ENV["SKIP_PLUGINS"]
       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_TESTS']
+      puts "Cleaning up old test tmp data in tmp/test_data"
+      `rm -fr tmp/test_data && mkdir -p tmp/test_data/redis && mkdir tmp/test_data/pg`
+
+      puts "Starting background redis"
+      @redis_pid = Process.spawn('redis-server --dir tmp/test_data/redis')
+
+      @postgres_bin = "/usr/lib/postgresql/9.5/bin/"
+      `#{@postgres_bin}initdb -D tmp/test_data/pg`
+
+      # speed up db, never do this in production mmmmk
+      `echo fsync = off >> tmp/test_data/pg/postgresql.conf`
+      `echo full_page_writes = off >> tmp/test_data/pg/postgresql.conf`
+      `echo shared_buffers = 500MB >> tmp/test_data/pg/postgresql.conf`
+
+      puts "Starting postgres"
+      @pg_pid = Process.spawn("#{@postgres_bin}postmaster -D tmp/test_data/pg")
+
+      ENV["RAILS_ENV"] = "test"
+
+      @good &&= run_or_fail("bundle exec rake db:create db:migrate")
+
+      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"]
+        unless ENV["SKIP_CORE"]
+          @good &&= run_or_fail("bundle exec rake qunit:test['600000']")
+          @good &&= run_or_fail("bundle exec rake qunit:test['600000','/wizard/qunit']")
+        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
     end
 
   ensure
     puts "Terminating"
 
-    Process.kill("TERM", @redis_pid)
-    Process.kill("TERM", @pg_pid)
-    Process.wait @redis_pid
-    Process.wait @pg_pid
+    Process.kill("TERM", @redis_pid) if @redis_pid
+    Process.kill("TERM", @pg_pid) if @pg_pid
+    Process.wait @redis_pid if @redis_pid
+    Process.wait @pg_pid if @pg_pid
   end
 
   if !@good
diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake
index b559d73fed..5ff933cab7 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/export.rake b/lib/tasks/export.rake
new file mode 100644
index 0000000000..d0b80c8819
--- /dev/null
+++ b/lib/tasks/export.rake
@@ -0,0 +1,15 @@
+desc 'Export all the categories'
+task 'export:categories', [:category_ids] => [:environment] do |_, args|
+  require "import_export/import_export"
+
+  ImportExport.export_categories(args[:category_ids])
+  puts "", "Done", ""
+end
+
+desc 'Export only the structure of all categories'
+task 'export:category_structure', [:include_group_users, :file_name] => [:environment] do |_, args|
+  require "import_export/import_export"
+
+  ImportExport.export_category_structure(args[:include_group_users], args[:file_name])
+  puts "", "Done", ""
+end
diff --git a/lib/tasks/highlight.rake b/lib/tasks/highlight.rake
index d6baa771fb..f0e0c2bc20 100644
--- a/lib/tasks/highlight.rake
+++ b/lib/tasks/highlight.rake
@@ -1,7 +1,7 @@
 desc "download latest version of highlight and prepare it"
 task "highlightjs:update" do
 
-  def run(cmd, opts={})
+  def run(cmd, opts = {})
     puts cmd
     system(cmd, opts.merge(out: $stdout, err: :out))
   end
diff --git a/lib/tasks/i18n_stats.rake b/lib/tasks/i18n_stats.rake
index 5988402136..ae48b2e968 100644
--- a/lib/tasks/i18n_stats.rake
+++ b/lib/tasks/i18n_stats.rake
@@ -9,7 +9,7 @@ task "i18n:stats" => :environment do
 
       # detect pluralizable string
       if (source["other"] != nil)
-        target[namespace] = {pluralizable: true, content: source}
+        target[namespace] = { pluralizable: true, content: source }
         return
       end
 
@@ -36,7 +36,7 @@ task "i18n:stats" => :environment do
     same = []
     total = a.count
 
-    a.each do |key,value|
+    a.each do |key, value|
       if b[key] == nil
         minus << key
       end
@@ -45,13 +45,13 @@ task "i18n:stats" => :environment do
       end
     end
 
-    b.each do |key,value|
+    b.each do |key, value|
       if a[key] == nil
         plus << key
       end
     end
 
-    a.each do |key,value|
+    a.each do |key, value|
       if value.kind_of?(Hash)
         if value[:pluralizable]
           plural_keys.each do |pl|
@@ -61,7 +61,7 @@ task "i18n:stats" => :environment do
           end
 
           if b[key] != nil && b[key].kind_of?(Hash)
-            b[key][:content].each do |pl,val|
+            b[key][:content].each do |pl, val|
               if ! plural_keys.include?(pl)
                 if a[key][:content]["zero"] == nil
                   plus << "#{key}.#{pl}"
@@ -80,11 +80,11 @@ task "i18n:stats" => :environment do
       end
     end
 
-    return plus,minus,same,total
+    return plus, minus, same, total
   end
 
   def get_plurals(locale)
-    I18n.t("i18n.plural.keys", :locale => locale).map { |x| x.to_s }
+    I18n.t("i18n.plural.keys", locale: locale).map { |x| x.to_s }
   end
 
   puts "Discourse Translation Status Script"
diff --git a/lib/tasks/images.rake b/lib/tasks/images.rake
index 79e19bbe18..b74a7720a9 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|
+  image_sizes = Hash[*images.map { |i| [i, File.size(i)] }.to_a.flatten]
+  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/import.rake b/lib/tasks/import.rake
index a462631c8c..f26e7b3025 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -293,7 +293,6 @@ def update_posts
        AND reply_count <> Y.replies
   SQL
 
-
   # -- TODO: ensure this is how this works!
   # WITH X AS (
   #   SELECT pr.post_id, p.user_id
@@ -429,3 +428,83 @@ def exec_sql(sql)
     ActiveRecord::Base.exec_sql(sql)
   end
 end
+
+task "import:create_phpbb_permalinks" => :environment do
+  log 'Creating Permalinks...'
+
+  # /[^\/]+\/.*-t(\d+).html/
+  SiteSetting.permalink_normalizations = '/[^\/]+\/.*-t(\d+).html/thread/\1'
+
+  Topic.listable_topics.find_each do |topic|
+    tcf = topic.custom_fields
+    if tcf && tcf["import_id"]
+      Permalink.create(url: "thread/#{tcf["import_id"]}", topic_id: topic.id) rescue nil
+    end
+  end
+
+  log "Done!"
+end
+
+task "import:remap_old_phpbb_permalinks" => :environment do
+  log 'Remapping Permalinks...'
+
+  i = 0
+  # discussions.flightaware.com
+  Post.where("raw LIKE ?", "%discussions.flightaware.com%").each do |p|
+    begin
+      new_raw = p.raw.dup
+      # \((https?:\/\/discussions\.flightaware\.com\/\S*-t\d+.html)\)
+      new_raw.gsub!(/\((https?:\/\/discussions\.flightaware\.com\/\S*-t\d+.html)\)/) do
+        normalized_url = Permalink.normalize_url($1)
+        permalink = Permalink.find_by_url(normalized_url) rescue nil
+        if permalink && permalink.target_url
+          "(#{permalink.target_url})"
+        else
+          "(#{$1})"
+        end
+      end
+
+      if new_raw != p.raw
+        p.revise(Discourse.system_user, { raw: new_raw }, bypass_bump: true, skip_revision: true)
+        putc "."
+        i += 1
+      end
+    rescue
+      # skip
+    end
+  end
+  i
+
+  log "Done! #{i} posts remapped."
+end
+
+task "import:create_vbulletin_permalinks" => :environment do
+  log 'Creating Permalinks...'
+
+  # /showthread.php\?t=(\d+).*/
+  SiteSetting.permalink_normalizations = '/showthread.php\?t=(\d+).*/showthread.php?t=\1'
+
+  Topic.listable_topics.find_each do |topic|
+    tcf = topic.custom_fields
+    if tcf && tcf["import_id"]
+      Permalink.create(url: "showthread.php?t=#{tcf["import_id"]}", topic_id: topic.id) rescue nil
+    end
+  end
+
+  Category.find_each do |cat|
+    ccf = cat.custom_fields
+    if ccf && ccf["import_id"]
+      Permalink.create(url: "forumdisplay.php?f=#{ccf["import_id"]}", category_id: cat.id) rescue nil
+    end
+  end
+
+  log "Done!"
+end
+
+desc 'Import existing exported file'
+task 'import:file', [:file_name] => [:environment] do |_, args|
+  require "import_export/import_export"
+
+  ImportExport.import(args[:file_name])
+  puts "", "Done", ""
+end
diff --git a/lib/tasks/integration.rake b/lib/tasks/integration.rake
index 1317eb6b1d..32e2a8d1e9 100644
--- a/lib/tasks/integration.rake
+++ b/lib/tasks/integration.rake
@@ -38,7 +38,6 @@ task 'integration:create_fixtures' => :environment do
 
 end
 
-
 def fake_xhr(url)
   uri = URI(url)
 
diff --git a/lib/tasks/plugin.rake b/lib/tasks/plugin.rake
index 8e7281ad59..56cfb31207 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]
@@ -7,7 +49,7 @@ task 'plugin:install', :repo do |t, args|
 
   plugin_path = File.expand_path('plugins/' + name)
   if File.directory?(File.expand_path(plugin_path))
-   abort('Plugin directory, ' + plugin_path + ', already exists.')
+    abort('Plugin directory, ' + plugin_path + ', already exists.')
   end
 
   clone_status = system('git clone ' + repo + ' ' + plugin_path)
@@ -47,10 +89,32 @@ 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: "*")
+
+  rake = `which rake`.strip
+
+  cmd = 'LOAD_PLUGINS=1 '
+  cmd += 'QUNIT_SKIP_CORE=1 '
+
+  if args[:plugin] == "*"
+    puts "Running qunit tests for all plugins"
+  else
+    puts "Running qunit tests for #{args[:plugin]}"
+    cmd += "QUNIT_SINGLE_PLUGIN='#{args[:plugin]}' "
+  end
+
+  cmd += "#{rake} qunit:test"
+  cmd += "[#{args[:timeout]}]" if args[:timeout]
+
+  sh cmd
+end
diff --git a/lib/tasks/populate.thor b/lib/tasks/populate.thor
index 531f0efa22..3c308d2a70 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 b6a696f111..387af78b8a 100644
--- a/lib/tasks/posts.rake
+++ b/lib/tasks/posts.rake
@@ -3,6 +3,20 @@ task 'posts:rebake' => :environment do
   ENV['RAILS_DB'] ? rebake_posts : rebake_posts_all_sites
 end
 
+task 'posts:rebake_uncooked_posts' => :environment do
+  uncooked = Post.where(baked_version: nil)
+
+  rebaked = 0
+  total = uncooked.count
+
+  uncooked.find_each do |post|
+    rebake_post(post)
+    print_status(rebaked += 1, total)
+  end
+
+  puts "", "#{rebaked} posts done!", ""
+end
+
 desc 'Update each post with latest markdown and refresh oneboxes'
 task 'posts:refresh_oneboxes' => :environment do
   ENV['RAILS_DB'] ? rebake_posts(invalidate_oneboxes: true) : rebake_posts_all_sites(invalidate_oneboxes: true)
@@ -13,7 +27,7 @@ task 'posts:fix_letter_avatars' => :environment do
   return unless SiteSetting.external_system_avatars_enabled
 
   search = Post.where("user_id <> -1")
-               .where("raw LIKE '%/letter\_avatar/%' OR cooked LIKE '%/letter\_avatar/%'")
+    .where("raw LIKE '%/letter\_avatar/%' OR cooked LIKE '%/letter\_avatar/%'")
 
   rebaked = 0
   total = search.count
@@ -27,28 +41,25 @@ task 'posts:fix_letter_avatars' => :environment do
 end
 
 desc 'Rebake all posts matching string/regex and optionally delay the loop'
-task 'posts:rebake_match', [:pattern, :type, :delay] => [:environment] do |_,args|
+task 'posts:rebake_match', [:pattern, :type, :delay] => [:environment] do |_, args|
+  args.with_defaults(type: 'string')
   pattern = args[:pattern]
-  type = args[:type]
-  type = type.downcase if type
-  delay = args[:delay].to_i if args[:delay]
+  type = args[:type]&.downcase
+  delay = args[:delay]&.to_i
+
   if !pattern
     puts "ERROR: Expecting rake posts:rebake_match[pattern,type,delay]"
     exit 1
   elsif delay && delay < 1
     puts "ERROR: delay parameter should be an integer and greater than 0"
     exit 1
-  end
-
-  if type == "regex"
-    search = Post.where("raw ~ ?", pattern)
-  elsif type == "string" || !type
-    search = Post.where("raw ILIKE ?", "%#{pattern}%")
-  else
+  elsif type != 'string' && type != 'regex'
     puts "ERROR: Expecting rake posts:rebake_match[pattern,type] where type is string or regex"
     exit 1
   end
 
+  search = Post.raw_match(pattern, type)
+
   rebaked = 0
   total = search.count
 
@@ -106,7 +117,7 @@ task 'posts:normalize_code' => :environment do
   Post.where("raw like '%<pre>%<code>%'").each do |p|
     normalized = Import::Normalize.normalize_code_blocks(p.raw, lang)
     if normalized != p.raw
-      p.revise(Discourse.system_user, { raw: normalized })
+      p.revise(Discourse.system_user, raw: normalized)
       putc "."
       i += 1
     end
@@ -116,53 +127,150 @@ task 'posts:normalize_code' => :environment do
   puts "#{i} posts normalized!"
 end
 
-def remap_posts(find, replace="")
+def remap_posts(find, type, replace = "")
   i = 0
-  Post.where("raw LIKE ?", "%#{find}%").each do |p|
-    new_raw = p.raw.dup
-    new_raw = new_raw.gsub!(/#{Regexp.escape(find)}/, replace) || new_raw
+
+  Post.raw_match(find, type).find_each do |p|
+    new_raw =
+      case type
+      when 'string' then p.raw.gsub(/#{Regexp.escape(find)}/, replace)
+      when 'regex' then p.raw.gsub(/#{find}/, replace)
+      end
 
     if new_raw != p.raw
-      p.revise(Discourse.system_user, { raw: new_raw }, { bypass_bump: true, skip_revision: true })
-      putc "."
-      i += 1
+      begin
+        p.revise(Discourse.system_user, { raw: new_raw }, bypass_bump: true, skip_revision: true)
+        putc "."
+        i += 1
+      rescue
+        puts "\nFailed to remap post (topic_id: #{p.topic_id}, post_id: #{p.id})\n"
+      end
     end
   end
+
   i
 end
 
 desc 'Remap all posts matching specific string'
-task 'posts:remap', [:find, :replace] => [:environment] do |_,args|
+task 'posts:remap', [:find, :replace, :type] => [:environment] do |_, args|
+  require 'highline/import'
 
+  args.with_defaults(type: 'string')
   find = args[:find]
   replace = args[:replace]
+  type = args[:type]&.downcase
+
   if !find
     puts "ERROR: Expecting rake posts:remap['find','replace']"
     exit 1
   elsif !replace
     puts "ERROR: Expecting rake posts:remap['find','replace']. Want to delete a word/string instead? Try rake posts:delete_word['word-to-delete']"
     exit 1
+  elsif type != 'string' && type != 'regex'
+    puts "ERROR: Expecting rake posts:delete_word[pattern, type] where type is string or regex"
+    exit 1
+  else
+    confirm_replace = ask("Are you sure you want to replace all #{type} occurrences of '#{find}' with '#{replace}'? (Y/n)")
+    exit 1 unless (confirm_replace == "" || confirm_replace.downcase == 'y')
   end
 
   puts "Remapping"
-  total = remap_posts(find, replace)
+  total = remap_posts(find, type, replace)
   puts "", "#{total} posts remapped!", ""
 end
 
 desc 'Delete occurrence of a word/string'
-task 'posts:delete_word', [:find] => [:environment] do |_,args|
+task 'posts:delete_word', [:find, :type] => [:environment] do |_, args|
   require 'highline/import'
 
+  args.with_defaults(type: 'string')
   find = args[:find]
+  type = args[:type]&.downcase
+
   if !find
     puts "ERROR: Expecting rake posts:delete_word['word-to-delete']"
     exit 1
+  elsif type != 'string' && type != 'regex'
+    puts "ERROR: Expecting rake posts:delete_word[pattern, type] where type is string or regex"
+    exit 1
   else
-    confirm_replace = ask("Are you sure you want to remove all occurrences of '#{find}'? (Y/n)  ")
-    exit 1 unless (confirm_replace == "" || confirm_replace.downcase == 'y')
+    confirm_delete = ask("Are you sure you want to remove all #{type} occurrences of '#{find}'? (Y/n)")
+    exit 1 unless (confirm_delete == "" || confirm_delete.downcase == 'y')
   end
 
   puts "Processing"
-  total = remap_posts(find)
+  total = remap_posts(find, type)
   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
+
+desc 'Defer all flags'
+task 'posts:defer_all_flags' => :environment do
+
+  active_flags = FlagQuery.flagged_post_actions('active')
+
+  flags_deferred = 0
+  total = active_flags.count
+
+  active_flags.each do |post_action|
+    begin
+      PostAction.defer_flags!(Post.find(post_action.post_id), Discourse.system_user)
+      print_status(flags_deferred += 1, total)
+    rescue
+      # skip
+    end
+  end
+
+  puts "", "#{flags_deferred} flags deferred!", ""
+end
+
+desc 'Refreshes each post that was received via email'
+task 'posts:refresh_emails', [:topic_id] => [:environment] do |_, args|
+  posts = Post.where.not(raw_email: nil).where(via_email: true)
+  posts = posts.where(topic_id: args[:topic_id]) if args[:topic_id]
+
+  updated = 0
+  total = posts.count
+
+  posts.find_each do |post|
+    begin
+      receiver = Email::Receiver.new(post.raw_email)
+
+      body, elided = receiver.select_body
+      body = receiver.add_attachments(body || '', post.user_id)
+      body << Email::Receiver.elided_html(elided) if elided.present?
+
+      post.revise(Discourse.system_user, { raw: body, cook_method: Post.cook_methods[:regular] },
+                  skip_revision: true, skip_validations: true, bypass_bump: true)
+    rescue
+      puts "Failed to refresh post (topic_id: #{post.topic_id}, post_id: #{post.id})"
+    end
+
+    updated += 1
+
+    print_status(updated, total)
+  end
+
+  puts "", "Done. #{updated} posts updated.", ""
+end
diff --git a/lib/tasks/qunit.rake b/lib/tasks/qunit.rake
index 9baf48a1af..c97b26d9bc 100644
--- a/lib/tasks/qunit.rake
+++ b/lib/tasks/qunit.rake
@@ -1,16 +1,26 @@
 desc "Runs the qunit test suite"
 
-task "qunit:test", [:timeout] => :environment do |_, args|
+task "qunit:test", [:timeout, :qunit_path] => :environment do |_, args|
 
   require "rack"
   require "socket"
 
-  unless %x{which phantomjs > /dev/null 2>&1}
-    abort "PhantomJS is not installed. Download from http://phantomjs.org"
+  unless system("command -v google-chrome >/dev/null;")
+    abort "Chrome is not installed. Download from https://www.google.com/chrome/browser/desktop/index.html"
   end
 
+  if Gem::Version.new(`$(command -v google-chrome) --version`.match(/[\d\.]+/)[0]) < Gem::Version.new("59")
+    abort "Chrome 59 or higher is required to run tests in headless mode."
+  end
+
+  unless system("command -v yarn >/dev/null;")
+    abort "Yarn is not installed. Download from https://yarnpkg.com/lang/en/docs/install/"
+  end
+
+  system("yarn install --dev")
+
   # ensure we have this port available
-  def port_available? port
+  def port_available?(port)
     server = TCPServer.open port
     server.close
     true
@@ -26,31 +36,50 @@ task "qunit:test", [:timeout] => :environment do |_, args|
 
   unless pid = fork
     Discourse.after_fork
-    Rack::Server.start(:config => "config.ru",
-                       :AccessLog => [],
-                       :Port => port)
+    Rack::Server.start(config: "config.ru",
+                       AccessLog: [],
+                       Port: port)
     exit
   end
 
   begin
     success = true
     test_path = "#{Rails.root}/vendor/assets/javascripts"
-    cmd = "phantomjs #{test_path}/run-qunit.js http://localhost:#{port}/qunit"
+    qunit_path = args[:qunit_path] || "/qunit"
+    cmd = "node #{test_path}/run-qunit.js http://localhost:#{port}#{qunit_path}"
+    options = { seed: (ENV["QUNIT_SEED"] || Random.new.seed) }
 
-    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/release_note.rake b/lib/tasks/release_note.rake
index 54c40e267b..4023727d45 100644
--- a/lib/tasks/release_note.rake
+++ b/lib/tasks/release_note.rake
@@ -55,14 +55,14 @@ end
 
 def escape_brackets(line)
   line.gsub("<", "`<")
-      .gsub(">", ">`")
-      .gsub("[", "`[")
-      .gsub("]", "]`")
+    .gsub(">", ">`")
+    .gsub("[", "`[")
+    .gsub("]", "]`")
 end
 
 def split_comments(text)
   text = normalize_terms(text)
-  terms = ["FIX:", "FEATURE:", "UX:", "SECURITY:" ,"PERF:"]
+  terms = ["FIX:", "FEATURE:", "UX:", "SECURITY:" , "PERF:"]
   terms.each do |term|
     text = newlines_at_term(text, term)
   end
@@ -79,7 +79,7 @@ end
 
 def newlines_at_term(text, term)
   if text.include?(term)
-    text = text.split(term).map{ |l| l.strip }.join("\n#{term} ")
+    text = text.split(term).map { |l| l.strip }.join("\n#{term} ")
   end
   text
 end
diff --git a/lib/tasks/s3.rake b/lib/tasks/s3.rake
new file mode 100644
index 0000000000..7b2889ae93
--- /dev/null
+++ b/lib/tasks/s3.rake
@@ -0,0 +1,119 @@
+require_dependency "s3_helper"
+
+def brotli_s3_path(path)
+  ext = File.extname(path)
+  "#{path[0..-ext.length]}br#{ext}"
+end
+
+def gzip_s3_path(path)
+  ext = File.extname(path)
+  "#{path[0..-ext.length]}gz#{ext}"
+end
+
+def should_skip?(path)
+  return false if ENV['FORCE_S3_UPLOADS']
+  @existing_assets ||= Set.new(helper.list("assets/").map(&:key))
+  @existing_assets.include?(path)
+end
+
+def upload(path, remote_path, content_type, content_encoding = nil)
+
+  options = {
+    cache_control: 'max-age=31556952, public, immutable',
+    content_type: content_type,
+    acl: 'public-read',
+    tagging: ''
+  }
+
+  if content_encoding
+    options[:content_encoding] = content_encoding
+  end
+
+  if should_skip?(remote_path)
+    puts "Skipping: #{remote_path}"
+  else
+    puts "Uploading: #{remote_path}"
+    helper.upload(path, remote_path, options)
+  end
+end
+
+def helper
+  @helper ||= S3Helper.new(GlobalSetting.s3_bucket.downcase, '', S3Helper.s3_options(GlobalSetting))
+end
+
+def assets
+  cached = Rails.application.assets&.cached
+  manifest = Sprockets::Manifest.new(cached, Rails.root + 'public/assets', Rails.application.config.assets.manifest)
+
+  results = []
+
+  manifest.assets.each do |_, path|
+    fullpath = (Rails.root + "public/assets/#{path}").to_s
+
+    content_type = MiniMime.lookup_by_filename(fullpath).content_type
+
+    asset_path = "assets/#{path}"
+    results << [fullpath, asset_path, content_type]
+
+    if File.exist?(fullpath + '.br')
+      results << [fullpath + '.br', brotli_s3_path(asset_path), content_type, 'br']
+    end
+
+    if File.exist?(fullpath + '.gz')
+      results << [fullpath + '.gz', gzip_s3_path(asset_path), content_type, 'gzip']
+    end
+
+    if File.exist?(fullpath + '.map')
+      results << [fullpath + '.map', asset_path + '.map', 'application/json']
+    end
+  end
+
+  results
+end
+
+def asset_paths
+  Set.new(assets.map { |_, asset_path| asset_path })
+end
+
+def ensure_s3_configured!
+  unless GlobalSetting.use_s3?
+    STDERR.puts "ERROR: Ensure S3 is configured in config/discourse.conf of environment vars"
+    exit 1
+  end
+end
+
+task 's3:upload_assets' => :environment do
+  ensure_s3_configured!
+  helper.ensure_cors!
+
+  assets.each do |asset|
+    upload(*asset)
+  end
+end
+
+task 's3:expire_missing_assets' => :environment do
+  ensure_s3_configured!
+
+  count = 0
+  keep = 0
+
+  in_manifest = asset_paths
+
+  puts "Ensuring AWS assets are tagged correctly for removal"
+  helper.list('assets/').each do |f|
+    if !in_manifest.include?(f.key)
+      helper.tag_file(f.key, old: true)
+      count += 1
+    else
+      # ensure we do not delete this by mistake
+      helper.tag_file(f.key, {})
+      keep += 1
+    end
+  end
+
+  puts "#{count} assets were flagged for removal in 10 days (#{keep} assets will be retained)"
+
+  puts "Ensuring AWS rule exists for purging old assets"
+  helper.update_lifecycle("delete_old_assets", 10, tag: { key: 'old', value: 'true' })
+
+end
diff --git a/lib/tasks/scheduler.rake b/lib/tasks/scheduler.rake
index 208d524ee5..14e4018828 100644
--- a/lib/tasks/scheduler.rake
+++ b/lib/tasks/scheduler.rake
@@ -1,21 +1,35 @@
 desc "This task is called by the Heroku scheduler add-on"
 
 # Every day at 6am
-task :enqueue_digest_emails => :environment do
+task enqueue_digest_emails: :environment do
   Jobs::EnqueueDigestEmails.new.execute(nil)
 end
 
 # Every day at 4am
-task :category_stats => :environment do
+task category_stats: :environment do
   Jobs::CategoryStats.new.execute(nil)
 end
 
 # Every 10 minutes
-task :periodical_updates => :environment do
+task periodical_updates: :environment do
   Jobs::PeriodicalUpdates.new.execute(nil)
 end
 
 # Every day
-task :version_check => :environment do
+task version_check: :environment do
   Jobs::VersionCheck.new.execute(nil)
-end
\ No newline at end of file
+end
+
+def time
+  start = Time.now
+  yield
+  puts "Elapsed #{((Time.now - start) * 1000).to_i}ms"
+end
+
+desc "run every task the scheduler knows about in that order, use only for debugging"
+task 'scheduler:run_all' => :environment do
+  Scheduler::Manager.discover_schedules.each do |schedule|
+    puts "Running #{schedule}"
+    time { schedule.new.execute({}) }
+  end
+end
diff --git a/lib/tasks/search.rake b/lib/tasks/search.rake
index c944812d79..7d1ce3ab30 100644
--- a/lib/tasks/search.rake
+++ b/lib/tasks/search.rake
@@ -2,7 +2,7 @@ task "search:reindex" => :environment do
   ENV['RAILS_DB'] ? reindex_search : reindex_search_all_sites
 end
 
-def reindex_search(db=RailsMultisite::ConnectionManagement.current_db)
+def reindex_search(db = RailsMultisite::ConnectionManagement.current_db)
   puts "Reindexing '#{db}'"
   puts ""
   puts "Posts:"
@@ -42,6 +42,15 @@ def reindex_search(db=RailsMultisite::ConnectionManagement.current_db)
     id = c["id"]
     name = c["name"]
     SearchIndexer.update_categories_index(id, name)
+
+    putc '.'
+  end
+
+  puts '', 'Tags'
+
+  Tag.exec_sql('select id, name from tags').each do |t|
+    SearchIndexer.update_tags_index(t['id'], t['name'])
+    putc '.'
   end
 
   puts
diff --git a/lib/tasks/smoke_test.rake b/lib/tasks/smoke_test.rake
index cb3974cba9..2558558ad8 100644
--- a/lib/tasks/smoke_test.rake
+++ b/lib/tasks/smoke_test.rake
@@ -1,8 +1,12 @@
-desc "run phantomjs based smoke tests on current build"
+desc "run chrome headless smoke tests on current build"
 task "smoke:test" do
-  phantom_path = File.expand_path('~/phantomjs/bin/phantomjs')
-  phantom_path = nil unless File.exists?(phantom_path)
-  phantom_path = phantom_path || 'phantomjs'
+  unless system("command -v google-chrome >/dev/null;")
+    abort "Chrome is not installed. Download from https://www.google.com/chrome/browser/desktop/index.html"
+  end
+
+  if Gem::Version.new(`$(command -v google-chrome) --version`.match(/[\d\.]+/)[0]) < Gem::Version.new("59")
+    abort "Chrome 59 or higher is required to run smoke tests in headless mode."
+  end
 
   url = ENV["URL"]
   if !url
@@ -31,7 +35,8 @@ task "smoke:test" do
   end
 
   results = ""
-  IO.popen("#{phantom_path} #{Rails.root}/spec/phantom_js/smoke_test.js #{url}").each do |line|
+
+  IO.popen("node #{Rails.root}/test/smoke_test.js #{url}").each do |line|
     puts line
     results << line
   end
diff --git a/lib/tasks/topics.rake b/lib/tasks/topics.rake
new file mode 100644
index 0000000000..bbbf56ac79
--- /dev/null
+++ b/lib/tasks/topics.rake
@@ -0,0 +1,66 @@
+def print_status_with_label(label, current, max)
+  print "\r%s%9d / %d (%5.1f%%)" % [label, current, max, ((current.to_f / max.to_f) * 100).round(1)]
+end
+
+def close_old_topics(category)
+  topics = Topic.where(closed: false, category_id: category.id)
+
+  if category.auto_close_based_on_last_post
+    topics = topics.where('last_posted_at < ?', category.auto_close_hours.hours.ago)
+  else
+    topics = topics.where('created_at < ?', category.auto_close_hours.hours.ago)
+  end
+
+  topics_closed = 0
+  total = topics.count
+
+  if total == 0
+    print "    all old topics are closed"
+    return
+  end
+
+  topics.find_each do |topic|
+    topic.update_status("closed", true, Discourse.system_user)
+    print_status_with_label("    closing old topics: ", topics_closed += 1, total)
+  end
+end
+
+def apply_auto_close(category)
+  topics = Topic.where(closed: false, category_id: category.id)
+    .where(<<-SQL, TopicTimer.types[:close])
+      NOT EXISTS (
+        SELECT 1
+        FROM topic_timers
+        WHERE topic_timers.topic_id = topics.id
+          AND topic_timers.status_type = ?
+          AND topic_timers.deleted_at IS NULL
+      )
+    SQL
+
+  topics_closed = 0
+  total = topics.count
+
+  if total == 0
+    print "    all topics have auto-close applied"
+    return
+  end
+
+  topics.find_each do |topic|
+    topic.inherit_auto_close_from_category
+    print_status_with_label("    applying auto-close to topics: ", topics_closed += 1, total)
+  end
+end
+
+task "topics:apply_autoclose" => :environment do
+  categories = Category.where("auto_close_hours > 0")
+
+  categories.find_each do |category|
+    puts "", "Applying auto-close to category '#{category.name}' ..."
+    close_old_topics(category)
+    puts ""
+    apply_auto_close(category)
+    puts ""
+  end
+
+  puts "", "Done"
+end
diff --git a/lib/tasks/typepad.thor b/lib/tasks/typepad.thor
index 26613f89b6..7db75d415e 100644
--- a/lib/tasks/typepad.thor
+++ b/lib/tasks/typepad.thor
@@ -45,7 +45,7 @@ class Typepad < Thor
       end
     end
 
-    entries.each_with_index do |e,i|
+    entries.each_with_index do |e, i|
       if e[:title] =~ /Head/
         puts "#{i}: #{e[:title]}"
       end
@@ -56,7 +56,7 @@ class Typepad < Thor
 
     puts "Importing #{entries.size} entries"
     entries.each_with_index do |entry, idx|
-      puts "Importing (#{idx+1}/#{entries.size})"
+      puts "Importing (#{idx + 1}/#{entries.size})"
       next if entry[:body].blank?
 
       puts entry[:unique_url]
@@ -219,7 +219,7 @@ class Typepad < Thor
                 current << c
               end
             end
-            segments.delete_if {|s| s.nil? || s.size < 2}
+            segments.delete_if { |s| s.nil? || s.size < 2 }
             segments << current
 
             comment[:author] = segments[0]
diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index c55722e2fe..9ecf00c3d9 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -27,8 +27,8 @@ def gather_uploads
   puts "", "Gathering uploads for '#{current_db}'...", ""
 
   Upload.where("url ~ '^\/uploads\/'")
-        .where("url !~ '^\/uploads\/#{current_db}'")
-        .find_each do |upload|
+    .where("url !~ '^\/uploads\/#{current_db}'")
+    .find_each do |upload|
     begin
       old_db = upload.url[/^\/uploads\/([^\/]+)\//, 1]
       from = upload.url.dup
@@ -100,7 +100,7 @@ def guess_filename(url, raw)
     filename ||= File.basename(url)
     filename
   rescue
-      nil
+    nil
   ensure
     f.try(:close!) rescue nil
   end
@@ -114,13 +114,13 @@ def migrate_from_s3
   require "file_store/s3_store"
 
   # make sure S3 is disabled
-  if SiteSetting.enable_s3_uploads
+  if SiteSetting.Uploads.enable_s3_uploads
     puts "You must disable S3 uploads before running that task."
     return
   end
 
   # make sure S3 bucket is set
-  if SiteSetting.s3_upload_bucket.blank?
+  if SiteSetting.Upload.s3_upload_bucket.blank?
     puts "The S3 upload bucket must be set before running that task."
     return
   end
@@ -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!
@@ -188,14 +188,14 @@ end
 
 def migrate_to_s3
   # make sure s3 is enabled
-  if !SiteSetting.enable_s3_uploads
+  if !SiteSetting.Upload.enable_s3_uploads
     puts "You must enable s3 uploads before running that task"
     return
   end
 
   db = RailsMultisite::ConnectionManagement.current_db
 
-  puts "Migrating uploads to S3 (#{SiteSetting.s3_upload_bucket}) for '#{db}'..."
+  puts "Migrating uploads to S3 (#{SiteSetting.Upload.s3_upload_bucket}) for '#{db}'..."
 
   # will throw an exception if the bucket is missing
   s3 = FileStore::S3Store.new
@@ -203,8 +203,8 @@ def migrate_to_s3
 
   # Migrate all uploads
   Upload.where.not(sha1: nil)
-        .where("url NOT LIKE '#{s3.absolute_base_url}%'")
-        .find_each do |upload|
+    .where("url NOT LIKE '#{s3.absolute_base_url}%'")
+    .find_each do |upload|
     # remove invalid uploads
     if upload.url.blank?
       upload.destroy!
@@ -215,7 +215,7 @@ def migrate_to_s3
     # retrieve the path to the local file
     path = local.path_for(upload)
     # make sure the file exists locally
-    if !path or !File.exists?(path)
+    if !path || !File.exists?(path)
       putc "X"
       next
     end
@@ -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/tasks/user_actions.rake b/lib/tasks/user_actions.rake
index ffba1f2b22..f457454978 100644
--- a/lib/tasks/user_actions.rake
+++ b/lib/tasks/user_actions.rake
@@ -2,9 +2,9 @@ desc "rebuild the user_actions table"
 task "user_actions:rebuild" => :environment do
   MessageBus.off
   UserAction.delete_all
-  PostAction.all.each{|i| UserActionCreator.log_post_action(i)}
-  Topic.all.each {|i| UserActionCreator.log_topic(i)}
-  Post.all.each {|i| UserActionCreator.log_post(i)}
+  PostAction.all.each { |i| UserActionCreator.log_post_action(i) }
+  Topic.all.each { |i| UserActionCreator.log_topic(i) }
+  Post.all.each { |i| UserActionCreator.log_post(i) }
   Notification.all.each do |notification|
     UserActionCreator.log_notification(notification.post,
                                        notification.user,
@@ -12,4 +12,3 @@ task "user_actions:rebuild" => :environment do
                                        notification.user)
   end
 end
-
diff --git a/lib/tasks/users.rake b/lib/tasks/users.rake
index 7772bba660..d01d30b744 100644
--- a/lib/tasks/users.rake
+++ b/lib/tasks/users.rake
@@ -1,5 +1,5 @@
 desc "Change topic/post ownership of all the topics/posts by a specific user (without creating new revision)"
-task "users:change_post_ownership", [:old_username, :new_username, :archetype] => [:environment] do |_,args|
+task "users:change_post_ownership", [:old_username, :new_username, :archetype] => [:environment] do |_, args|
   old_username = args[:old_username]
   new_username = args[:new_username]
   archetype = args[:archetype]
diff --git a/lib/text_cleaner.rb b/lib/text_cleaner.rb
index bf10cdbc55..31ff605cef 100644
--- a/lib/text_cleaner.rb
+++ b/lib/text_cleaner.rb
@@ -31,7 +31,7 @@ class TextCleaner
     # Replace ????? with a single ?
     text.gsub!(/\?+/, '?') if opts[:deduplicate_question_marks]
     # Replace all-caps text with regular case letters
-    text = text.mb_chars.downcase.to_s if opts[:replace_all_upper_case] && (text =~ /[A-Z]+/) && (text == text.upcase)
+    text = text.mb_chars.downcase.to_s if opts[:replace_all_upper_case] && (text == text.mb_chars.upcase)
     # Capitalize first letter, but only when entire first word is lowercase
     first, rest = text.split(' ', 2)
     if first && opts[:capitalize_first_letter] && first == first.mb_chars.downcase
diff --git a/lib/text_sentinel.rb b/lib/text_sentinel.rb
index e86a897b67..fa88e647f9 100644
--- a/lib/text_sentinel.rb
+++ b/lib/text_sentinel.rb
@@ -11,12 +11,12 @@ class TextSentinel
 
   ENTROPY_SCALE ||= 0.7
 
-  def initialize(text, opts=nil)
+  def initialize(text, opts = nil)
     @opts = opts || {}
     @text = text.to_s.encode('UTF-8', invalid: :replace, undef: :replace, replace: '')
   end
 
-  def self.body_sentinel(text, opts={})
+  def self.body_sentinel(text, opts = {})
     entropy = SiteSetting.body_min_entropy
     if opts[:private_message]
       scale_entropy = SiteSetting.min_private_message_post_length.to_f / SiteSetting.min_post_length.to_f
@@ -41,7 +41,7 @@ class TextSentinel
   # Non-ASCII characters are weighted heavier since they contain more "information"
   def entropy
     chars = @text.to_s.strip.split('')
-    @entropy ||= chars.pack('M*'*chars.size).gsub("\n",'').split('=').uniq.size
+    @entropy ||= chars.pack('M*' * chars.size).gsub("\n", '').split('=').uniq.size
   end
 
   def valid?
@@ -74,7 +74,6 @@ class TextSentinel
     @opts[:max_word_length].blank? || @text.split(/\s|\/|-|\.|:/).map(&:size).max <= @opts[:max_word_length]
   end
 
-
   def seems_quiet?
     # We don't allow all upper case content
     SiteSetting.allow_uppercase_posts || @text == @text.mb_chars.downcase.to_s || @text != @text.mb_chars.upcase.to_s
diff --git a/lib/timeline_lookup.rb b/lib/timeline_lookup.rb
index 1c62d879f5..90d4a5e02a 100644
--- a/lib/timeline_lookup.rb
+++ b/lib/timeline_lookup.rb
@@ -2,7 +2,7 @@ module TimelineLookup
 
   # Given an array of tuples (id, post_number, days_ago), return at most `max_values` worth of a
   # lookup table to help the front end timeline display dates associated with posts
-  def self.build(tuples, max_values=300)
+  def self.build(tuples, max_values = 300)
     result = []
 
     every = (tuples.size.to_f / max_values).ceil
@@ -14,7 +14,7 @@ module TimelineLookup
       days_ago = t[2]
 
       if (days_ago != last_days_ago)
-        result << [idx+1, days_ago]
+        result << [idx + 1, days_ago]
         last_days_ago = days_ago
       end
 
diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb
index ecd35fd116..69ca76d73c 100644
--- a/lib/topic_creator.rb
+++ b/lib/topic_creator.rb
@@ -72,21 +72,24 @@ class TopicCreator
       topic.notifier.watch_topic!(topic.user_id)
     end
 
-    topic.topic_allowed_users(true).each do |tau|
+    topic.reload.topic_allowed_users.each do |tau|
       next if tau.user_id == -1 || tau.user_id == topic.user_id
       topic.notifier.watch!(tau.user_id)
     end
 
-    topic.topic_allowed_groups(true).each do |tag|
+    topic.reload.topic_allowed_groups.each do |tag|
       tag.group.group_users.each do |gu|
         next if gu.user_id == -1 || gu.user_id == topic.user_id
-        action = case gu.notification_level
-                 when TopicUser.notification_levels[:tracking] then "track!"
-                 when TopicUser.notification_levels[:regular]  then "regular!"
-                 when TopicUser.notification_levels[:muted]    then "mute!"
-                 when TopicUser.notification_levels[:watching] then "watch!"
-                 else "track!"
-                 end
+
+        action =
+          case gu.notification_level
+          when TopicUser.notification_levels[:tracking] then "track!"
+          when TopicUser.notification_levels[:regular]  then "regular!"
+          when TopicUser.notification_levels[:muted]    then "mute!"
+          when TopicUser.notification_levels[:watching] then "watch!"
+          else "track!"
+          end
+
         topic.notifier.send(action, gu.user_id)
       end
     end
@@ -152,19 +155,24 @@ class TopicCreator
   def setup_auto_close_time(topic)
     return unless @opts[:auto_close_time].present?
     return unless @guardian.can_moderate?(topic)
-    topic.set_auto_close(@opts[:auto_close_time], {by_user: @user})
+    topic.set_auto_close(@opts[:auto_close_time], by_user: @user)
   end
 
   def process_private_message(topic)
     return unless @opts[:archetype] == Archetype.private_message
     topic.subtype = TopicSubtype.user_to_user unless topic.subtype
 
-    unless @opts[:target_usernames].present? || @opts[:target_group_names].present?
+    unless @opts[:target_usernames].present? || @opts[:target_emails].present? || @opts[:target_group_names].present?
       rollback_with!(topic, :no_user_selected)
     end
 
-    add_users(topic,@opts[:target_usernames])
-    add_groups(topic,@opts[:target_group_names])
+    if @opts[:target_emails].present? && !@guardian.cand_send_private_messages_to_email? then
+      rollback_with!(topic, :reply_by_email_disabled)
+    end
+
+    add_users(topic, @opts[:target_usernames])
+    add_emails(topic, @opts[:target_emails])
+    add_groups(topic, @opts[:target_group_names])
     topic.topic_allowed_users.build(user_id: @user.id)
   end
 
@@ -182,7 +190,7 @@ class TopicCreator
     names = usernames.split(',').flatten
     len = 0
 
-    User.where(username: names).each do |user|
+    User.includes(:user_option).where(username: names).find_each do |user|
       check_can_send_permission!(topic, user)
       @added_users << user
       topic.topic_allowed_users.build(user_id: user.id)
@@ -192,6 +200,27 @@ class TopicCreator
     rollback_with!(topic, :target_user_not_found) unless len == names.length
   end
 
+  def add_emails(topic, emails)
+    return unless emails
+
+    begin
+      emails = emails.split(',').flatten
+      len = 0
+
+      emails.each do |email|
+        display_name = email.split("@").first
+
+        if user = find_or_create_user(email, display_name)
+          @added_users << user
+          topic.topic_allowed_users.build(user_id: user.id)
+          len += 1
+        end
+      end
+    ensure
+      rollback_with!(topic, :target_user_not_found) unless len == emails.length
+    end
+  end
+
   def add_groups(topic, groups)
     return unless groups
     names = groups.split(',').flatten
@@ -210,4 +239,22 @@ class TopicCreator
   def check_can_send_permission!(topic, obj)
     rollback_with!(topic, :cant_send_pm) unless @opts[:skip_validations] || @guardian.can_send_private_message?(obj)
   end
+
+  def find_or_create_user(email, display_name)
+    user = User.find_by_email(email)
+
+    if !user && SiteSetting.enable_staged_users
+      username = UserNameSuggester.sanitize_username(display_name) if display_name.present?
+
+      user = User.create!(
+        email: email,
+        username: UserNameSuggester.suggest(username.presence || email),
+        name: display_name.presence || User.suggest_name(email),
+        staged: true
+      )
+    end
+
+    user
+  end
+
 end
diff --git a/lib/topic_list_responder.rb b/lib/topic_list_responder.rb
index 0513330085..b53380345f 100644
--- a/lib/topic_list_responder.rb
+++ b/lib/topic_list_responder.rb
@@ -21,4 +21,3 @@ module TopicListResponder
   end
 
 end
-
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 62e6ec619b..14aaaa8bbc 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -46,7 +46,6 @@ class TopicQuery
          no_definitions)
   end
 
-
   # Maps `order` to a columns in `topics`
   SORTABLE_MAPPING = {
     'likes' => 'like_count',
@@ -80,21 +79,21 @@ class TopicQuery
 
   def self.apply_custom_filters(results, topic_query)
     if @custom_filters
-      @custom_filters.each do |key,filter|
+      @custom_filters.each do |key, filter|
         results = filter.call(results, topic_query)
       end
     end
     results
   end
 
-  def initialize(user=nil, options={})
+  def initialize(user = nil, options = {})
     options.assert_valid_keys(TopicQuery.valid_options)
     @options = options.dup
     @user = user
     @guardian = Guardian.new(@user)
   end
 
-  def joined_topic_user(list=nil)
+  def joined_topic_user(list = nil)
     (list || Topic).joins("LEFT OUTER JOIN topic_users AS tu ON (topics.id = tu.topic_id AND tu.user_id = #{@user.id.to_i})")
   end
 
@@ -108,8 +107,14 @@ class TopicQuery
       if topic.private_message?
 
         group_ids = topic.topic_allowed_groups
-                      .where('group_id IN (SELECT group_id FROM group_users WHERE user_id = :user_id)', user_id: @user.id)
-                      .pluck(:group_id)
+          .joins("
+            LEFT JOIN group_users gu
+            ON topic_allowed_groups.group_id = gu.group_id
+            AND user_id = #{@user.id.to_i}
+          ")
+          .where("gu.group_id IS NOT NULL")
+          .pluck(:group_id)
+
         {
           topic: topic,
           my_group_ids: group_ids,
@@ -151,7 +156,7 @@ class TopicQuery
       builder.add_results(random_suggested(topic, builder.results_left, builder.excluded_topic_ids)) unless builder.full?
     end
 
-    params = {unordered: true}
+    params = { unordered: true }
     if topic.private_message?
       params[:preload_posters] = true
     end
@@ -170,19 +175,19 @@ class TopicQuery
   end
 
   def list_new
-    create_list(:new, {unordered: true}, new_results)
+    create_list(:new, { unordered: true }, new_results)
   end
 
   def list_unread
-    create_list(:unread, {unordered: true}, unread_results)
+    create_list(:unread, { unordered: true }, unread_results)
   end
 
   def list_posted
-    create_list(:posted) {|l| l.where('tu.posted') }
+    create_list(:posted) { |l| l.where('tu.posted') }
   end
 
   def list_bookmarks
-    create_list(:bookmarks) {|l| l.where('tu.bookmarked') }
+    create_list(:bookmarks) { |l| l.where('tu.bookmarked') }
   end
 
   def list_top_for(period)
@@ -207,14 +212,14 @@ class TopicQuery
   def not_archived(list, user)
     list.joins("LEFT JOIN user_archived_messages um
                        ON um.user_id = #{user.id.to_i} AND um.topic_id = topics.id")
-               .where('um.user_id IS NULL')
+      .where('um.user_id IS NULL')
   end
 
   def list_private_messages(user)
     list = private_messages_for(user, :user)
 
     list = not_archived(list, user)
-            .where('NOT (topics.participant_count = 1 AND topics.user_id = ?)', user.id)
+      .where('NOT (topics.participant_count = 1 AND topics.user_id = ?)', user.id)
 
     create_list(:private_messages, {}, list)
   end
@@ -261,9 +266,7 @@ class TopicQuery
 
   def list_category_topic_ids(category)
     query = default_results(category: category.id)
-    pinned_ids = query.where('pinned_at IS NOT NULL AND category_id = ?', category.id)
-                      .limit(nil)
-                      .order('pinned_at DESC').pluck(:id)
+    pinned_ids = query.where('pinned_at IS NOT NULL AND category_id = ?', category.id).limit(nil).order('pinned_at DESC').pluck(:id)
     non_pinned_ids = query.where('pinned_at IS NULL OR category_id <> ?', category.id).pluck(:id)
     (pinned_ids + non_pinned_ids)
   end
@@ -276,25 +279,16 @@ class TopicQuery
 
   def self.new_filter(list, treat_as_new_topic_start_date)
     list.where("topics.created_at >= :created_at", created_at: treat_as_new_topic_start_date)
-        .where("tu.last_read_post_number IS NULL")
-        .where("COALESCE(tu.notification_level, :tracking) >= :tracking", tracking: TopicUser.notification_levels[:tracking])
+      .where("tu.last_read_post_number IS NULL")
+      .where("COALESCE(tu.notification_level, :tracking) >= :tracking", tracking: TopicUser.notification_levels[:tracking])
   end
 
   def self.unread_filter(list, user_id, opts)
-    # PERF note
-    # We use the function first_unread_topic_for here instead of joining
-    # the table to assist the PostgreSQL query planner
-    #
-    # We want the query planner to have the actual value of the first_unread_topic so
-    # it can pick an appropriate plan. If it does not have this upfront it will just assume
-    # that the value will be 1/3 of the way through the topic table which makes it use terrible
-    # indexes for the plan.
-    #
     col_name = opts[:staff] ? "highest_staff_post_number" : "highest_post_number"
 
     list
-        .where("tu.last_read_post_number < topics.#{col_name}")
-        .where("COALESCE(tu.notification_level, :regular) >= :tracking",
+      .where("tu.last_read_post_number < topics.#{col_name}")
+      .where("COALESCE(tu.notification_level, :regular) >= :tracking",
                regular: TopicUser.notification_levels[:regular], tracking: TopicUser.notification_levels[:tracking])
   end
 
@@ -315,19 +309,19 @@ 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.length
       offset = 0 unless offset > 0
       unpinned_topics.offset(offset).to_a
     end
 
   end
 
-  def create_list(filter, options={}, topics = nil)
+  def create_list(filter, options = {}, topics = nil)
     topics ||= default_results(options)
     topics = yield(topics) if block_given?
 
     options = options.merge(@options)
-    if ["activity","default"].include?(options[:order] || "activity") &&
+    if ["activity", "default"].include?(options[:order] || "activity") &&
         !options[:unordered] &&
         filter != :private_messages
       topics = prioritize_pinned_topics(topics, options)
@@ -342,13 +336,18 @@ class TopicQuery
       end
 
       avatar_lookup = AvatarLookup.new(user_ids)
+      primary_group_lookup = PrimaryGroupLookup.new(user_ids)
+
       topics.each do |t|
-        t.posters = t.posters_summary(avatar_lookup: avatar_lookup)
+        t.posters = t.posters_summary(
+          avatar_lookup: avatar_lookup,
+          primary_group_lookup: primary_group_lookup
+        )
       end
     end
 
     topics.each do |t|
-      t.allowed_user_ids = filter == :private_messages ? t.allowed_users.map{|u| u.id} : []
+      t.allowed_user_ids = filter == :private_messages ? t.allowed_users.map { |u| u.id } : []
     end
 
     list = TopicList.new(filter, @user, topics, options.merge(@options))
@@ -356,7 +355,7 @@ class TopicQuery
     list
   end
 
-  def latest_results(options={})
+  def latest_results(options = {})
     result = default_results(options)
     result = remove_muted_topics(result, @user) unless options && options[:state] == "muted".freeze
     result = remove_muted_categories(result, @user, exclude: options[:category])
@@ -370,12 +369,12 @@ class TopicQuery
     result
   end
 
-  def unread_results(options={})
+  def unread_results(options = {})
     result = TopicQuery.unread_filter(
-        default_results(options.reverse_merge(:unordered => true)),
+        default_results(options.reverse_merge(unordered: true)),
         @user&.id,
         staff: @user&.staff?)
-    .order('CASE WHEN topics.user_id = tu.user_id THEN 1 ELSE 2 END')
+      .order('CASE WHEN topics.user_id = tu.user_id THEN 1 ELSE 2 END')
 
     self.class.results_filter_callbacks.each do |filter_callback|
       result = filter_callback.call(:unread, result, @user, options)
@@ -384,10 +383,10 @@ class TopicQuery
     suggested_ordering(result, options)
   end
 
-  def new_results(options={})
+  def new_results(options = {})
     # TODO does this make sense or should it be ordered on created_at
     #  it is ordering on bumped_at now
-    result = TopicQuery.new_filter(default_results(options.reverse_merge(:unordered => true)), @user.user_option.treat_as_new_topic_start_date)
+    result = TopicQuery.new_filter(default_results(options.reverse_merge(unordered: true)), @user.user_option.treat_as_new_topic_start_date)
     result = remove_muted_topics(result, @user)
     result = remove_muted_categories(result, @user, exclude: options[:category])
     result = remove_muted_tags(result, @user, options)
@@ -436,8 +435,8 @@ class TopicQuery
       end
 
       result = result.joins("LEFT OUTER JOIN topic_users AS tu ON (topics.id = tu.topic_id AND tu.user_id = #{user.id.to_i})")
-                     .order("topics.bumped_at DESC")
-                     .private_messages
+        .order("topics.bumped_at DESC")
+        .private_messages
 
       result = result.limit(options[:per_page]) unless options[:limit] == false
       result = result.visible if options[:visible] || @user.nil? || @user.regular?
@@ -489,9 +488,8 @@ class TopicQuery
       category_id
     end
 
-
     # Create results based on a bunch of default options
-    def default_results(options={})
+    def default_results(options = {})
       options.reverse_merge!(@options)
       options.reverse_merge!(per_page: per_page_setting)
 
@@ -504,7 +502,7 @@ class TopicQuery
 
       if @user
         result = result.joins("LEFT OUTER JOIN topic_users AS tu ON (topics.id = tu.topic_id AND tu.user_id = #{@user.id.to_i})")
-                       .references('tu')
+          .references('tu')
       end
 
       category_id = get_category_id(options[:category])
@@ -559,7 +557,7 @@ class TopicQuery
           end
         elsif @options[:no_tags]
           # the following will do: ("topics"."id" NOT IN (SELECT DISTINCT "topic_tags"."topic_id" FROM "topic_tags"))
-          result = result.where.not(:id => TopicTag.select(:topic_id).uniq)
+          result = result.where.not(id: TopicTag.distinct.pluck(:topic_id))
         end
       end
 
@@ -576,9 +574,8 @@ class TopicQuery
       end
 
       result = result.limit(options[:per_page]) unless options[:limit] == false
-
       result = result.visible if options[:visible]
-      result = result.where.not(topics: {id: options[:except_topic_ids]}).references(:topics) if options[:except_topic_ids]
+      result = result.where.not(topics: { id: options[:except_topic_ids] }).references(:topics) if options[:except_topic_ids]
 
       if options[:page]
         offset = options[:page].to_i * options[:per_page]
@@ -641,7 +638,7 @@ class TopicQuery
         end
       end
 
-      if (filter=options[:filter]) && @user
+      if (filter = options[:filter]) && @user
         action =
           if filter == "bookmarked"
             PostActionType.types[:bookmark]
@@ -665,7 +662,7 @@ class TopicQuery
       result = result.where('topics.posts_count <= ?', options[:max_posts]) if options[:max_posts].present?
       result = result.where('topics.posts_count >= ?', options[:min_posts]) if options[:min_posts].present?
 
-      result = TopicQuery.apply_custom_filters(result,self)
+      result = TopicQuery.apply_custom_filters(result, self)
 
       @guardian.filter_allowed_categories(result)
     end
@@ -677,12 +674,12 @@ class TopicQuery
 
       list
     end
-    def remove_muted_categories(list, user, opts=nil)
+    def remove_muted_categories(list, user, opts = nil)
       category_id = get_category_id(opts[:exclude]) if opts
 
       if user
         list = list.references("cu")
-                   .where("
+          .where("
           NOT EXISTS (
             SELECT 1
               FROM category_users cu
@@ -699,7 +696,7 @@ class TopicQuery
 
       list
     end
-    def remove_muted_tags(list, user, opts=nil)
+    def remove_muted_tags(list, user, opts = nil)
       if user.nil? || !SiteSetting.tagging_enabled || !SiteSetting.remove_muted_tags_from_latest
         list
       else
@@ -730,10 +727,8 @@ class TopicQuery
     end
 
     def new_messages(params)
-
       TopicQuery.new_filter(messages_for_groups_or_user(params[:my_group_ids]), Time.at(SiteSetting.min_new_topics_time).to_datetime)
-                .limit(params[:count])
-
+        .limit(params[:count])
     end
 
     def unread_messages(params)
@@ -741,65 +736,77 @@ class TopicQuery
         messages_for_groups_or_user(params[:my_group_ids]),
         @user&.id,
         staff: @user&.staff?)
-                .limit(params[:count])
+        .limit(params[:count])
     end
 
     def related_messages_user(params)
-      messages_for_user
-        .limit(params[:count])
-        .where('topics.id IN (
-                SELECT ta.topic_id
-                FROM topic_allowed_users ta
-                WHERE ta.user_id IN (:user_ids)
-              ) OR
-                topics.id IN (
-                  SELECT tg.topic_id
-                  FROM topic_allowed_groups tg
-                  WHERE tg.group_id IN (:group_ids)
-              )
-              ', user_ids: (params[:target_user_ids] || []) + [-10],
-                 group_ids: ((params[:target_group_ids] - params[:my_group_ids]) || []) + [-10])
-
+      messages = messages_for_user.limit(params[:count])
+      messages = allowed_messages(messages, params)
     end
 
     def related_messages_group(params)
-      messages_for_groups_or_user(params[:my_group_ids])
-        .limit(params[:count])
-        .where('topics.id IN (
-                SELECT ta.topic_id
-                FROM topic_allowed_users ta
-                WHERE ta.user_id IN (:user_ids)
-              ) OR
-                topics.id IN (
-                  SELECT tg.topic_id
-                  FROM topic_allowed_groups tg
-                  WHERE tg.group_id IN (:group_ids)
-              )
-              ', user_ids: (params[:target_user_ids] || []) + [-10],
-                 group_ids: ((params[:target_group_ids] - params[:my_group_ids]) || []) + [-10])
+      messages = messages_for_groups_or_user(params[:my_group_ids]).limit(params[:count])
+      messages = allowed_messages(messages, params)
+    end
 
+    def allowed_messages(messages, params)
+      user_ids = (params[:target_user_ids] || [])
+      group_ids = ((params[:target_group_ids] - params[:my_group_ids]) || [])
+
+      if user_ids.present?
+        messages =
+          messages.joins("
+            LEFT JOIN topic_allowed_users ta2
+            ON topics.id = ta2.topic_id
+            AND ta2.user_id IN (#{sanitize_sql_array(user_ids)})
+          ")
+      end
+
+      if group_ids.present?
+        messages =
+          messages.joins("
+            LEFT JOIN topic_allowed_groups tg2
+            ON topics.id = tg2.topic_id
+            AND tg2.group_id IN (#{sanitize_sql_array(group_ids)})
+          ")
+      end
+
+      messages =
+        if user_ids.present? && group_ids.present?
+          messages.where("ta2.topic_id IS NOT NULL OR tg2.topic_id IS NOT NULL")
+        elsif user_ids.present?
+          messages.where("ta2.topic_id IS NOT NULL")
+        elsif group_ids.present?
+          messages.where("tg2.topic_id IS NOT NULL")
+        end
     end
 
     def messages_for_groups_or_user(group_ids)
       if group_ids.present?
         base_messages
-          .where('topics.id IN (
-                                  SELECT topic_id
-                                    FROM topic_allowed_groups tg
-                                    JOIN group_users gu ON gu.user_id = :user_id AND gu.group_id = tg.group_id
-                                    WHERE gu.group_id IN (:group_ids)
-                 )', user_id: @user.id, group_ids: group_ids)
+          .joins("
+            LEFT JOIN (
+              SELECT * FROM topic_allowed_groups _tg
+              LEFT JOIN group_users gu
+              ON gu.user_id = #{@user.id.to_i}
+              AND gu.group_id = _tg.group_id
+              WHERE gu.group_id IN (#{sanitize_sql_array(group_ids)})
+            ) tg ON topics.id = tg.topic_id
+          ")
+          .where("tg.topic_id IS NOT NULL")
       else
         messages_for_user
       end
     end
 
     def messages_for_user
-      base_messages.where('topics.id IN (
-                                  SELECT topic_id
-                                    FROM topic_allowed_users
-                                    WHERE user_id = :user_id
-                 )', user_id: @user.id)
+      base_messages
+        .joins("
+          LEFT JOIN topic_allowed_users ta
+          ON topics.id = ta.topic_id
+          AND ta.user_id = #{@user.id.to_i}
+        ")
+        .where("ta.topic_id IS NOT NULL")
     end
 
     def base_messages
@@ -811,7 +818,7 @@ class TopicQuery
       query.order('topics.bumped_at DESC')
     end
 
-    def random_suggested(topic, count, excluded_topic_ids=[])
+    def random_suggested(topic, count, excluded_topic_ids = [])
       result = default_results(unordered: true, per_page: count).where(closed: false, archived: false)
       excluded_topic_ids += Category.topic_ids.to_a
       result = result.where("topics.id NOT IN (?)", excluded_topic_ids) unless excluded_topic_ids.empty?
@@ -829,7 +836,7 @@ class TopicQuery
       # of muted, big edge case
       #
       # we over select in case cache is stale
-      max = (count*1.3).to_i
+      max = (count * 1.3).to_i
       ids = RandomTopicSelector.next(max) + RandomTopicSelector.next(max, topic.category)
 
       result.where(id: ids.uniq)
@@ -843,4 +850,10 @@ class TopicQuery
 
       result.order('topics.bumped_at DESC')
     end
+
+  private
+
+    def sanitize_sql_array(input)
+      ActiveRecord::Base.send(:sanitize_sql_array, input.join(','))
+    end
 end
diff --git a/lib/topic_retriever.rb b/lib/topic_retriever.rb
index 672ca60a69..82f815d9f7 100644
--- a/lib/topic_retriever.rb
+++ b/lib/topic_retriever.rb
@@ -1,6 +1,6 @@
 class TopicRetriever
 
-  def initialize(embed_url, opts=nil)
+  def initialize(embed_url, opts = nil)
     @embed_url = embed_url
     @author_username = opts[:author_username]
     @opts = opts || {}
@@ -34,7 +34,6 @@ class TopicRetriever
       # It's possible another process or job found the embed already. So if that happened bail out.
       return if TopicEmbed.where(embed_url: @embed_url).exists?
 
-
       # First check RSS if that is enabled
       if SiteSetting.feed_polling_enabled?
         Jobs::PollFeed.new.execute({})
diff --git a/lib/topic_subtype.rb b/lib/topic_subtype.rb
index 0d8224c4e4..731ed29c3e 100644
--- a/lib/topic_subtype.rb
+++ b/lib/topic_subtype.rb
@@ -9,7 +9,7 @@ class TopicSubtype
   end
 
   def attributes
-    {'id' => @id, 'options' => @options }
+    { 'id' => @id, 'options' => @options }
   end
 
   def self.list
@@ -41,7 +41,7 @@ class TopicSubtype
     'pending_users'
   end
 
-  def self.register(name, options={})
+  def self.register(name, options = {})
     @subtypes ||= {}
     @subtypes[name] = TopicSubtype.new(name, options)
   end
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 482853d71e..1ad15dc879 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -37,7 +37,7 @@ class TopicView
     wpcf.flatten.uniq
   end
 
-  def initialize(topic_id, user=nil, options={})
+  def initialize(topic_id, user = nil, options = {})
     @message_bus_last_id = MessageBus.last_id("/topic/#{topic_id}")
     @user = user
     @guardian = Guardian.new(@user)
@@ -50,11 +50,13 @@ class TopicView
     end
 
     @page = 1 if (!@page || @page.zero?)
-    @chunk_size = case
-                    when options[:slow_platform] then TopicView.slow_chunk_size
-                    when @print then TopicView.print_chunk_size
-                    else TopicView.chunk_size
-                  end
+    @chunk_size =
+      case
+      when options[:slow_platform] then TopicView.slow_chunk_size
+      when @print then TopicView.print_chunk_size
+      else TopicView.chunk_size
+      end
+
     @limit ||= @chunk_size
 
     setup_filtered_posts
@@ -65,15 +67,13 @@ class TopicView
     filter_posts(options)
 
     if @posts
-      added_fields = User.whitelisted_user_custom_fields(@guardian)
-      if added_fields.present?
-        @user_custom_fields = User.custom_fields_for_ids(@posts.map(&:user_id), added_fields)
+      if (added_fields = User.whitelisted_user_custom_fields(@guardian)).present?
+        @user_custom_fields = User.custom_fields_for_ids(@posts.pluck(:user_id), added_fields)
       end
-    end
 
-    whitelisted_fields = TopicView.whitelisted_post_custom_fields(@user)
-    if whitelisted_fields.present? && @posts
-      @post_custom_fields = Post.custom_fields_for_ids(@posts.map(&:id), whitelisted_fields)
+      if (whitelisted_fields = TopicView.whitelisted_post_custom_fields(@user)).present?
+        @post_custom_fields = Post.custom_fields_for_ids(@posts.pluck(:id), whitelisted_fields)
+      end
     end
 
     @draft_key = @topic.draft_key
@@ -82,12 +82,15 @@ class TopicView
 
   def canonical_path
     path = relative_url
-    path << if @post_number
-      page = ((@post_number.to_i - 1) / @limit) + 1
-      (page > 1) ? "?page=#{page}" : ""
-    else
-      (@page && @page.to_i > 1) ? "?page=#{@page}" : ""
-    end
+
+    path <<
+      if @post_number
+        page = ((@post_number.to_i - 1) / @limit) + 1
+        (page > 1) ? "?page=#{page}" : ""
+      else
+        (@page && @page.to_i > 1) ? "?page=#{@page}" : ""
+      end
+
     path
   end
 
@@ -161,21 +164,21 @@ class TopicView
     return @desired_post if @desired_post.present?
     return nil if posts.blank?
 
-    @desired_post = posts.detect {|p| p.post_number == @post_number.to_i}
+    @desired_post = posts.detect { |p| p.post_number == @post_number.to_i }
     @desired_post ||= posts.first
     @desired_post
   end
 
-  def summary
+  def summary(opts = {})
     return nil if desired_post.blank?
     # TODO, this is actually quite slow, should be cached in the post table
-    excerpt = desired_post.excerpt(500, strip_links: true, text_entities: true)
+    excerpt = desired_post.excerpt(500, opts.merge(strip_links: true, text_entities: true))
     (excerpt || "").gsub(/\n/, ' ').strip
   end
 
   def read_time
     return nil if @post_number.present? && @post_number.to_i != 1 # only show for topic URLs
-    (@topic.word_count/SiteSetting.read_time_word_count).floor if @topic.word_count
+    (@topic.word_count / SiteSetting.read_time_word_count).floor if @topic.word_count
   end
 
   def like_count
@@ -235,7 +238,6 @@ class TopicView
     filter_posts_in_range(min_idx, max_idx)
   end
 
-
   def filter_posts_paged(page)
     page = [page, 1].max
     min = @limit * (page - 1)
@@ -248,7 +250,7 @@ class TopicView
     filter_posts_in_range(min, max)
   end
 
-  def filter_best(max, opts={})
+  def filter_best(max, opts = {})
     filter = FilterBestPosts.new(@topic, @filtered_posts, max, opts)
     @posts = filter.posts
     @filtered_posts = filter.filtered_posts
@@ -261,9 +263,9 @@ class TopicView
 
   def has_deleted?
     @predelete_filtered_posts.with_deleted
-                             .where("posts.deleted_at IS NOT NULL")
-                             .where("posts.post_number > 1")
-                             .exists?
+      .where("posts.deleted_at IS NOT NULL")
+      .where("posts.post_number > 1")
+      .exists?
   end
 
   def topic_user
@@ -273,19 +275,49 @@ class TopicView
     end
   end
 
+  MAX_PARTICIPANTS = 24
+
   def post_counts_by_user
-    @post_counts_by_user ||= Post.where(topic_id: @topic.id)
-                                 .where("user_id IS NOT NULL")
-                                 .group(:user_id)
-                                 .order("count_all DESC")
-                                 .limit(24)
-                                 .count
+    @post_counts_by_user ||= begin
+      post_ids = unfiltered_post_ids
+
+      return {} if post_ids.blank?
+
+      sql = <<~SQL
+        SELECT user_id, count(*) AS count_all
+          FROM posts
+         WHERE id IN (:post_ids)
+           AND user_id IS NOT NULL
+      GROUP BY user_id
+      ORDER BY count_all DESC
+         LIMIT #{MAX_PARTICIPANTS}
+      SQL
+
+      Hash[Post.exec_sql(sql, post_ids: post_ids).values]
+    end
+  end
+
+  def participant_count
+    @participant_count ||=
+      begin
+        if participants.size == MAX_PARTICIPANTS
+          sql = <<~SQL
+            SELECT COUNT(DISTINCT user_id)
+            FROM posts
+            WHERE id IN (:post_ids)
+            AND user_id IS NOT NULL
+          SQL
+          Post.exec_sql(sql, post_ids: unfiltered_post_ids).getvalue(0, 0).to_i
+        else
+          participants.size
+        end
+      end
   end
 
   def participants
     @participants ||= begin
       participants = {}
-      User.where(id: post_counts_by_user.map {|k,v| k}).includes(:primary_group).each {|u| participants[u.id] = u}
+      User.where(id: post_counts_by_user.keys).includes(:primary_group).each { |u| participants[u.id] = u }
       participants
     end
   end
@@ -299,11 +331,11 @@ class TopicView
   end
 
   def links
-    @links ||= TopicLink.topic_map(guardian, @topic.id)
+    @links ||= TopicLink.topic_map(@guardian, @topic.id)
   end
 
   def link_counts
-    @link_counts ||= TopicLink.counts_for(guardian,@topic, posts)
+    @link_counts ||= TopicLink.counts_for(@guardian, @topic, posts)
   end
 
   # Are we the initial page load? If so, we can return extra information like
@@ -329,25 +361,27 @@ class TopicView
     @filtered_posts.by_newest.with_user.first(25)
   end
 
-  def current_post_ids
-    @current_post_ids ||= if @posts.is_a?(Array)
-      @posts.map {|p| p.id }
-    else
-      @posts.pluck(:post_number)
-    end
-  end
-
-  # Returns an array of [id, post_number, days_ago] tuples. `days_ago` is there for the timeline
-  # calculations.
+  # Returns an array of [id, post_number, days_ago] tuples.
+  # `days_ago` is there for the timeline calculations.
   def filtered_post_stream
-    @filtered_post_stream ||= @filtered_posts.order(:sort_order)
-                                             .pluck(:id,
-                                                    :post_number,
-                                                    'EXTRACT(DAYS FROM CURRENT_TIMESTAMP - created_at)::INT AS days_ago')
+    @filtered_post_stream ||= @filtered_posts
+      .order(:sort_order)
+      .pluck(:id, :post_number, 'EXTRACT(DAYS FROM CURRENT_TIMESTAMP - created_at)::INT AS days_ago')
   end
 
   def filtered_post_ids
-    @filtered_post_ids ||= filtered_post_stream.map {|tuple| tuple[0]}
+    @filtered_post_ids ||= filtered_post_stream.map { |tuple| tuple[0] }
+  end
+
+  def unfiltered_post_ids
+    @unfiltered_post_ids ||=
+      begin
+        if @contains_gaps
+          unfiltered_posts.pluck(:id)
+        else
+          filtered_post_ids
+        end
+      end
   end
 
   protected
@@ -359,11 +393,11 @@ class TopicView
       return result unless topic_user.present?
 
       post_numbers = PostTiming
-                .where(topic_id: @topic.id, user_id: @user.id)
-                .where(post_number: current_post_ids)
-                .pluck(:post_number)
+        .where(topic_id: @topic.id, user_id: @user.id)
+        .where(post_number: @posts.pluck(:post_number))
+        .pluck(:post_number)
 
-      post_numbers.each {|pn| result << pn}
+      post_numbers.each { |pn| result << pn }
       result
     end
   end
@@ -383,8 +417,8 @@ class TopicView
   def filter_posts_by_ids(post_ids)
     # TODO: Sort might be off
     @posts = Post.where(id: post_ids, topic_id: @topic.id)
-                 .includes(:user, :reply_to_user, :incoming_email)
-                 .order('sort_order')
+      .includes({ user: :primary_group }, :reply_to_user, :deleted_by, :incoming_email, :topic)
+      .order('sort_order')
     @posts = filter_post_types(@posts)
     @posts = @posts.with_deleted if @guardian.can_see_deleted_posts?
     @posts
@@ -395,7 +429,7 @@ class TopicView
 
     max = [max, post_count].min
 
-    return @posts = [] if min > max
+    return @posts = Post.none if min > max
 
     min = [[min, max].min, 0].max
 
@@ -435,7 +469,7 @@ class TopicView
 
     # Username filters
     if @username_filters.present?
-      usernames = @username_filters.map{|u| u.downcase}
+      usernames = @username_filters.map { |u| u.downcase }
       @filtered_posts = @filtered_posts.where('post_number = 1 OR posts.user_id IN (SELECT u.id FROM users u WHERE username_lower IN (?))', usernames)
       @contains_gaps = true
     end
@@ -458,7 +492,7 @@ class TopicView
     if @topic.present? && @topic.private_message? && @user.blank?
       raise Discourse::NotLoggedIn.new
     end
-    raise Discourse::InvalidAccess.new("can't see #{@topic}", @topic) unless guardian.can_see?(@topic)
+    raise Discourse::InvalidAccess.new("can't see #{@topic}", @topic) unless @guardian.can_see?(@topic)
   end
 
   def get_minmax_ids(post_number)
diff --git a/lib/topics_bulk_action.rb b/lib/topics_bulk_action.rb
index 5e4d8d9f75..a3675ff426 100644
--- a/lib/topics_bulk_action.rb
+++ b/lib/topics_bulk_action.rb
@@ -1,6 +1,6 @@
 class TopicsBulkAction
 
-  def initialize(user, topic_ids, operation, options={})
+  def initialize(user, topic_ids, operation, options = {})
     @user = user
     @topic_ids = topic_ids
     @operation = operation
@@ -45,7 +45,7 @@ class TopicsBulkAction
           if group
             GroupArchivedMessage.move_to_inbox!(group.id, t.id)
           else
-            UserArchivedMessage.move_to_inbox!(@user.id,t.id)
+            UserArchivedMessage.move_to_inbox!(@user.id, t.id)
           end
         end
       end
@@ -135,7 +135,9 @@ class TopicsBulkAction
 
     def delete
       topics.each do |t|
-        t.trash! if guardian.can_delete?(t)
+        if guardian.can_delete?(t)
+          PostDestroyer.new(@user, t.ordered_posts.first).destroy
+        end
       end
     end
 
@@ -177,6 +179,4 @@ class TopicsBulkAction
       @topics ||= Topic.where(id: @topic_ids)
     end
 
-
 end
-
diff --git a/lib/twitter_api.rb b/lib/twitter_api.rb
index 373c6838f1..da281fe05f 100644
--- a/lib/twitter_api.rb
+++ b/lib/twitter_api.rb
@@ -5,7 +5,7 @@ class TwitterApi
 
     def prettify_tweet(tweet)
       text = tweet["full_text"].dup
-      if entities = tweet["entities"] and urls = entities["urls"]
+      if (entities = tweet["entities"]) && (urls = entities["urls"])
         urls.each do |url|
           text.gsub!(url["url"], "<a target='_blank' href='#{url["expanded_url"]}'>#{url["display_url"]}</a>")
         end
@@ -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'>",
@@ -125,7 +125,6 @@ class TwitterApi
       URI.parse "#{BASE_URL}/oauth2/token"
     end
 
-
     def http(uri)
       Net::HTTP.new(uri.host, uri.port).tap { |http| http.use_ssl = true }
     end
diff --git a/lib/unread.rb b/lib/unread.rb
index f04ffcd228..36a7d09e81 100644
--- a/lib/unread.rb
+++ b/lib/unread.rb
@@ -8,10 +8,9 @@ class Unread
     @topic_user = topic_user
   end
 
-
   def unread_posts
     return 0 if do_not_notify?(@topic_user.notification_level)
-    result = ((@topic_user.highest_seen_post_number||0) - (@topic_user.last_read_post_number||0))
+    result = ((@topic_user.highest_seen_post_number || 0) - (@topic_user.last_read_post_number || 0))
     result = 0 if result < 0
     result
   end
@@ -22,7 +21,7 @@ class Unread
 
     highest_post_number = @guardian.is_staff? ? @topic.highest_staff_post_number : @topic.highest_post_number
 
-    return 0 if (@topic_user.last_read_post_number||0) > highest_post_number
+    return 0 if (@topic_user.last_read_post_number || 0) > highest_post_number
 
     new_posts = (highest_post_number - @topic_user.highest_seen_post_number)
     new_posts = 0 if new_posts < 0
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index ee387bd857..cdb7e8bcf1 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -16,12 +16,14 @@ 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
-    @filename = filename
+    @filename = filename || ''
+    @upload = Upload.new(original_filename: filename, filesize: 0)
     @opts = opts
   end
 
@@ -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?
 
@@ -72,18 +74,15 @@ class UploadCreator
       @upload.sha1              = sha1
       @upload.url               = ""
       @upload.origin            = @opts[:origin][0...1000] if @opts[:origin]
+      @upload.extension         = File.extname(@filename)[1..10]
 
       if FileHelper.is_image?(@filename)
         @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
 
@@ -124,23 +123,23 @@ 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!
     jpeg_tempfile = Tempfile.new(["image", ".jpg"])
 
     OptimizedImage.ensure_safe_paths!(@file.path, jpeg_tempfile.path)
-    Discourse::Utils.execute_command(
-      'convert', @file.path,
-      '-auto-orient',
-      '-background', 'white',
-      '-flatten',
-      '-quality', SiteSetting.png_to_jpg_quality.to_s,
-      jpeg_tempfile.path
-    )
+
+    begin
+      execute_convert(@file, jpeg_tempfile)
+    rescue
+      # retry with debugging enabled
+      execute_convert(@file, jpeg_tempfile, true)
+    end
 
     # keep the JPEG if it's at least 15% smaller
     if File.size(jpeg_tempfile.path) < filesize * 0.85
@@ -153,6 +152,19 @@ class UploadCreator
     end
   end
 
+  def execute_convert(input_file, output_file, debug = false)
+    command = ['convert', input_file.path,
+               '-auto-orient',
+               '-background', 'white',
+               '-interlace', 'none',
+               '-flatten',
+               '-quality', SiteSetting.png_to_jpg_quality.to_s]
+    command << '-debug' << 'all' if debug
+    command << output_file.path
+
+    Discourse::Utils.execute_command(*command, failure_message: I18n.t("upload.png_to_jpg_conversion_failure_message"))
+  end
+
   def should_downsize?
     max_image_size > 0 && filesize >= max_image_size
   end
@@ -186,6 +198,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
@@ -224,7 +248,7 @@ 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}")
diff --git a/lib/url_helper.rb b/lib/url_helper.rb
index df25e5463c..758528a4a3 100644
--- a/lib/url_helper.rb
+++ b/lib/url_helper.rb
@@ -21,4 +21,14 @@ class UrlHelper
     url.sub(/^http:/i, "")
   end
 
+  DOUBLE_ESCAPED_REGEXP ||= /%25([0-9a-f]{2})/i
+
+  # Prevents double URL encode
+  # https://stackoverflow.com/a/37599235
+  def self.escape_uri(uri, pattern = URI::UNSAFE)
+    encoded = URI.encode(uri, pattern)
+    encoded.gsub!(DOUBLE_ESCAPED_REGEXP, '%\1')
+    encoded
+  end
+
 end
diff --git a/lib/validators/allow_user_locale_enabled_validator.rb b/lib/validators/allow_user_locale_enabled_validator.rb
index ebae4be450..73d3cb5c51 100644
--- a/lib/validators/allow_user_locale_enabled_validator.rb
+++ b/lib/validators/allow_user_locale_enabled_validator.rb
@@ -1,6 +1,6 @@
 class AllowUserLocaleEnabledValidator
 
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
   end
 
@@ -15,4 +15,4 @@ class AllowUserLocaleEnabledValidator
     I18n.t("site_settings.errors.user_locale_not_enabled");
   end
 
-end
\ No newline at end of file
+end
diff --git a/lib/validators/alternative_reply_by_email_addresses_validator.rb b/lib/validators/alternative_reply_by_email_addresses_validator.rb
index d35dedf7c3..97b9ddad12 100644
--- a/lib/validators/alternative_reply_by_email_addresses_validator.rb
+++ b/lib/validators/alternative_reply_by_email_addresses_validator.rb
@@ -1,5 +1,7 @@
+require 'validators/reply_by_email_address_validator'
+
 class AlternativeReplyByEmailAddressesValidator
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
   end
 
diff --git a/lib/validators/censored_words_validator.rb b/lib/validators/censored_words_validator.rb
index 3b566a27ea..2fa5f0e0c0 100644
--- a/lib/validators/censored_words_validator.rb
+++ b/lib/validators/censored_words_validator.rb
@@ -1,6 +1,6 @@
 class CensoredWordsValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    if SiteSetting.censored_words.present? && (censored_words = censor_words(value, censored_words_regexp)).present?
+    if WordWatcher.words_for_action(:censor).present? && (censored_words = censor_words(value, censored_words_regexp)).present?
       record.errors.add(
         attribute, :contains_censored_words,
         censored_words: join_censored_words(censored_words)
@@ -32,9 +32,6 @@ class CensoredWordsValidator < ActiveModel::EachValidator
     end
 
     def censored_words_regexp
-      Regexp.new(
-        SiteSetting.censored_words.split('|'.freeze).map! { |w| Regexp.escape(w) }.join('|'.freeze),
-        true
-      )
+      WordWatcher.word_matcher_regexp :censor
     end
 end
diff --git a/lib/validators/email_setting_validator.rb b/lib/validators/email_setting_validator.rb
index e9fb583167..e44725396d 100644
--- a/lib/validators/email_setting_validator.rb
+++ b/lib/validators/email_setting_validator.rb
@@ -1,5 +1,5 @@
 class EmailSettingValidator
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
   end
 
diff --git a/lib/validators/email_validator.rb b/lib/validators/email_validator.rb
index 468c005071..64463d53cb 100644
--- a/lib/validators/email_validator.rb
+++ b/lib/validators/email_validator.rb
@@ -1,27 +1,32 @@
 class EmailValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    if (setting = SiteSetting.email_domains_whitelist).present?
-      unless email_in_restriction_setting?(setting, value) || is_developer?(value)
-        record.errors.add(attribute, I18n.t(:'user.email.not_allowed'))
-      end
-    elsif (setting = SiteSetting.email_domains_blacklist).present?
-      if email_in_restriction_setting?(setting, value) && !is_developer?(value)
-        record.errors.add(attribute, I18n.t(:'user.email.not_allowed'))
-      end
+    unless EmailValidator.allowed?(value)
+      record.errors.add(attribute, I18n.t(:'user.email.not_allowed'))
     end
+
     if record.errors[attribute].blank? && value && ScreenedEmail.should_block?(value)
       record.errors.add(attribute, I18n.t(:'user.email.blocked'))
     end
   end
 
-  def email_in_restriction_setting?(setting, value)
+  def self.allowed?(email)
+    if (setting = SiteSetting.email_domains_whitelist).present?
+      return email_in_restriction_setting?(setting, email) || is_developer?(email)
+    elsif (setting = SiteSetting.email_domains_blacklist).present?
+      return !(email_in_restriction_setting?(setting, email) && !is_developer?(email))
+    end
+
+    true
+  end
+
+  def self.email_in_restriction_setting?(setting, value)
     domains = setting.gsub('.', '\.')
     regexp = Regexp.new("@(.+\\.)?(#{domains})", true)
     value =~ regexp
   end
 
-  def is_developer?(value)
+  def self.is_developer?(value)
     Rails.configuration.respond_to?(:developer_emails) && Rails.configuration.developer_emails.include?(value)
   end
 
diff --git a/lib/validators/enable_private_email_messages_validator.rb b/lib/validators/enable_private_email_messages_validator.rb
new file mode 100644
index 0000000000..42e8aa64e8
--- /dev/null
+++ b/lib/validators/enable_private_email_messages_validator.rb
@@ -0,0 +1,20 @@
+class EnablePrivateEmailMessagesValidator
+
+  def initialize(opts = {})
+    @opts = opts
+  end
+
+  def valid_value?(val)
+    return true if val == "f"
+    SiteSetting.enable_staged_users &&
+    SiteSetting.reply_by_email_enabled
+  end
+
+  def error_message
+    if !SiteSetting.enable_staged_users
+      I18n.t("site_settings.errors.staged_users_disabled")
+    elsif !SiteSetting.reply_by_email_enabled
+      I18n.t("site_settings.errors.reply_by_email_disabled")
+    end
+  end
+end
diff --git a/lib/validators/enable_sso_validator.rb b/lib/validators/enable_sso_validator.rb
new file mode 100644
index 0000000000..075798654f
--- /dev/null
+++ b/lib/validators/enable_sso_validator.rb
@@ -0,0 +1,14 @@
+class EnableSsoValidator
+  def initialize(opts = {})
+    @opts = opts
+  end
+
+  def valid_value?(val)
+    return true if val == 'f'
+    SiteSetting.sso_url.present?
+  end
+
+  def error_message
+    I18n.t('site_settings.errors.sso_url_is_empty')
+  end
+end
diff --git a/lib/validators/integer_setting_validator.rb b/lib/validators/integer_setting_validator.rb
index 185eb0a799..630f3c08e3 100644
--- a/lib/validators/integer_setting_validator.rb
+++ b/lib/validators/integer_setting_validator.rb
@@ -1,24 +1,25 @@
 class IntegerSettingValidator
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
     @opts[:min] = 0 unless @opts[:min].present? || @opts[:hidden]
-    @opts[:max] = 20000 unless @opts[:max].present? || @opts[:hidden]
+    # set max closer to a long int
+    @opts[:max] = 2_000_000_000 unless @opts[:max].present? || @opts[:hidden]
   end
 
   def valid_value?(val)
     return false if val.to_i.to_s != val.to_s
-    return false if @opts[:min] and @opts[:min].to_i > val.to_i
-    return false if @opts[:max] and @opts[:max].to_i < val.to_i
+    return false if @opts[:min] && @opts[:min].to_i > (val.to_i)
+    return false if @opts[:max] && @opts[:max].to_i < (val.to_i)
     true
   end
 
   def error_message
     if @opts[:min] && @opts[:max]
-      I18n.t('site_settings.errors.invalid_integer_min_max', {min: @opts[:min], max: @opts[:max]})
+      I18n.t('site_settings.errors.invalid_integer_min_max', min: @opts[:min], max: @opts[:max])
     elsif @opts[:min]
-      I18n.t('site_settings.errors.invalid_integer_min', {min: @opts[:min]})
+      I18n.t('site_settings.errors.invalid_integer_min', min: @opts[:min])
     elsif @opts[:max]
-      I18n.t('site_settings.errors.invalid_integer_max', {max: @opts[:max]})
+      I18n.t('site_settings.errors.invalid_integer_max', max: @opts[:max])
     else
       I18n.t('site_settings.errors.invalid_integer')
     end
diff --git a/lib/validators/password_validator.rb b/lib/validators/password_validator.rb
index ced6b2f990..d5d24ada8e 100644
--- a/lib/validators/password_validator.rb
+++ b/lib/validators/password_validator.rb
@@ -3,7 +3,8 @@ require_dependency "common_passwords/common_passwords"
 class PasswordValidator < ActiveModel::EachValidator
 
   def validate_each(record, attribute, value)
-    return unless record.password_required?
+    return unless record.password_validation_required?
+
     if value.nil?
       record.errors.add(attribute, :blank)
     elsif value.length < SiteSetting.min_admin_password_length && (record.admin? || is_developer?(record.email))
diff --git a/lib/validators/pop3_polling_enabled_setting_validator.rb b/lib/validators/pop3_polling_enabled_setting_validator.rb
index f62e252bbb..d002f4eee7 100644
--- a/lib/validators/pop3_polling_enabled_setting_validator.rb
+++ b/lib/validators/pop3_polling_enabled_setting_validator.rb
@@ -2,7 +2,7 @@ require "net/pop"
 
 class POP3PollingEnabledSettingValidator
 
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
   end
 
diff --git a/lib/validators/post_validator.rb b/lib/validators/post_validator.rb
index 3ed62e3740..a9b1f468c4 100644
--- a/lib/validators/post_validator.rb
+++ b/lib/validators/post_validator.rb
@@ -24,7 +24,7 @@ class Validators::PostValidator < ActiveModel::Validator
       post.errors.add(:topic_id, :blank, options) if post.topic_id.blank?
     end
 
-    if post.new_record? and post.user_id.nil?
+    if post.new_record? && post.user_id.nil?
       post.errors.add(:user_id, :blank, options)
     end
   end
@@ -33,6 +33,7 @@ class Validators::PostValidator < ActiveModel::Validator
     return if options[:skip_post_body] || post.topic&.pm_with_non_human_user?
     stripped_length(post)
     raw_quality(post)
+    watched_words(post)
   end
 
   def stripped_length(post)
@@ -55,6 +56,12 @@ class Validators::PostValidator < ActiveModel::Validator
     post.errors.add(:raw, I18n.t(:is_invalid)) unless sentinel.valid?
   end
 
+  def watched_words(post)
+    if !post.acting_user&.staff? && !post.acting_user&.staged && WordWatcher.new(post.raw).should_block?
+      post.errors[:base] << I18n.t('contains_blocked_words')
+    end
+  end
+
   # Ensure maximum amount of mentions in a post
   def max_mention_validator(post)
     return if post.acting_user.try(:staff?)
diff --git a/lib/validators/regex_setting_validation.rb b/lib/validators/regex_setting_validation.rb
new file mode 100644
index 0000000000..cd0df29f49
--- /dev/null
+++ b/lib/validators/regex_setting_validation.rb
@@ -0,0 +1,17 @@
+module RegexSettingValidation
+
+  def initialize_regex_opts(opts = {})
+    @regex = Regexp.new(opts[:regex]) if opts[:regex]
+    @regex_error = opts[:regex_error] || 'site_settings.errors.regex_mismatch'
+  end
+
+  def regex_match?(val)
+    if @regex && !(val =~ @regex)
+      @regex_fail = true
+      return false
+    end
+
+    true
+  end
+
+end
diff --git a/lib/validators/regex_setting_validator.rb b/lib/validators/regex_setting_validator.rb
index e1aa9900b6..895342372a 100644
--- a/lib/validators/regex_setting_validator.rb
+++ b/lib/validators/regex_setting_validator.rb
@@ -2,7 +2,7 @@ class RegexSettingValidator
 
   LOREM = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam eget sem non elit tincidunt rhoncus.'.freeze
 
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
   end
 
diff --git a/lib/validators/reply_by_email_address_validator.rb b/lib/validators/reply_by_email_address_validator.rb
index 024a1aab70..3c3b5698f8 100644
--- a/lib/validators/reply_by_email_address_validator.rb
+++ b/lib/validators/reply_by_email_address_validator.rb
@@ -1,5 +1,5 @@
 class ReplyByEmailAddressValidator
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
   end
 
diff --git a/lib/validators/reply_by_email_enabled_validator.rb b/lib/validators/reply_by_email_enabled_validator.rb
index e7333de0f6..8170a12935 100644
--- a/lib/validators/reply_by_email_enabled_validator.rb
+++ b/lib/validators/reply_by_email_enabled_validator.rb
@@ -1,6 +1,6 @@
 class ReplyByEmailEnabledValidator
 
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
   end
 
diff --git a/lib/validators/sso_overrides_email_validator.rb b/lib/validators/sso_overrides_email_validator.rb
new file mode 100644
index 0000000000..202cfc7b00
--- /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/string_setting_validator.rb b/lib/validators/string_setting_validator.rb
index 07a65500bd..e2dda64458 100644
--- a/lib/validators/string_setting_validator.rb
+++ b/lib/validators/string_setting_validator.rb
@@ -1,24 +1,21 @@
 class StringSettingValidator
-  def initialize(opts={})
+
+  include RegexSettingValidation
+
+  def initialize(opts = {})
     @opts = opts
-    @regex = Regexp.new(opts[:regex]) if opts[:regex]
-    @regex_error = opts[:regex_error] || 'site_settings.errors.regex_mismatch'
+    initialize_regex_opts(opts)
   end
 
   def valid_value?(val)
     return true if !val.present?
 
-    if (@opts[:min] and @opts[:min].to_i > val.length) || (@opts[:max] and @opts[:max].to_i < val.length)
+    if (@opts[:min] && @opts[:min].to_i > (val.length)) || (@opts[:max] && @opts[:max].to_i < (val.length))
       @length_fail = true
       return false
     end
 
-    if @regex and !(val =~ @regex)
-      @regex_fail = true
-      return false
-    end
-
-    true
+    regex_match?(val)
   end
 
   def error_message
@@ -26,11 +23,11 @@ class StringSettingValidator
       I18n.t(@regex_error)
     elsif @length_fail
       if @opts[:min] && @opts[:max]
-        I18n.t('site_settings.errors.invalid_string_min_max', {min: @opts[:min], max: @opts[:max]})
+        I18n.t('site_settings.errors.invalid_string_min_max', min: @opts[:min], max: @opts[:max])
       elsif @opts[:min]
-        I18n.t('site_settings.errors.invalid_string_min', {min: @opts[:min]})
+        I18n.t('site_settings.errors.invalid_string_min', min: @opts[:min])
       else
-        I18n.t('site_settings.errors.invalid_string_max', {max: @opts[:max]})
+        I18n.t('site_settings.errors.invalid_string_max', max: @opts[:max])
       end
     else
       I18n.t('site_settings.errors.invalid_string')
diff --git a/lib/validators/topic_title_length_validator.rb b/lib/validators/topic_title_length_validator.rb
index 82d9d54f9e..bdee42c81c 100644
--- a/lib/validators/topic_title_length_validator.rb
+++ b/lib/validators/topic_title_length_validator.rb
@@ -7,15 +7,16 @@ class TopicTitleLengthValidator < ActiveModel::EachValidator
   private
 
     def title_validator(record)
-      length_range = if record.user.try(:admin?)
-                       1..SiteSetting.max_topic_title_length
-                     elsif record.private_message?
-                       SiteSetting.private_message_title_length
-                     else
-                       SiteSetting.topic_title_length
-                     end
+      length_range =
+        if record.user.try(:admin?)
+          1..SiteSetting.max_topic_title_length
+        elsif record.private_message?
+          SiteSetting.private_message_title_length
+        else
+          SiteSetting.topic_title_length
+        end
 
-      ActiveModel::Validations::LengthValidator.new({attributes: :title, in: length_range, allow_blank: true})
+      ActiveModel::Validations::LengthValidator.new(attributes: :title, in: length_range, allow_blank: true)
     end
 
 end
diff --git a/lib/validators/upload_validator.rb b/lib/validators/upload_validator.rb
index cf73111f43..6c2013565d 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/validators/url_validator.rb b/lib/validators/url_validator.rb
index c3295e6368..7edfe431f3 100644
--- a/lib/validators/url_validator.rb
+++ b/lib/validators/url_validator.rb
@@ -1,9 +1,20 @@
 class UrlValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     if value.present?
-      uri = URI.parse(value) rescue nil
+      valid =
+        begin
+          uri = URI.parse(value)
+          uri.is_a?(URI::HTTP) && !uri.host.nil? && uri.host.include?(".")
+        rescue URI::InvalidURIError => e
+          if (e.message =~ /URI must be ascii only/)
+            value = URI.encode(value)
+            retry
+          end
 
-      unless uri
+          nil
+        end
+
+      unless valid
         record.errors[attribute] << (options[:message] || I18n.t('errors.messages.invalid'))
       end
     end
diff --git a/lib/validators/username_setting_validator.rb b/lib/validators/username_setting_validator.rb
index 3dbc75fba1..52ae5abd05 100644
--- a/lib/validators/username_setting_validator.rb
+++ b/lib/validators/username_setting_validator.rb
@@ -1,13 +1,21 @@
 class UsernameSettingValidator
-  def initialize(opts={})
+
+  include RegexSettingValidation
+
+  def initialize(opts = {})
     @opts = opts
+    initialize_regex_opts(opts)
   end
 
   def valid_value?(val)
-    !val.present? || User.where(username: val).exists?
+    !val.present? || (User.where(username: val).exists? && regex_match?(val))
   end
 
   def error_message
-    I18n.t('site_settings.errors.invalid_username')
+    if @regex_fail
+      I18n.t(@regex_error)
+    else
+      I18n.t('site_settings.errors.invalid_username')
+    end
   end
 end
diff --git a/lib/version.rb b/lib/version.rb
index 1738f76080..f5c574665e 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -3,9 +3,9 @@ module Discourse
   unless defined? ::Discourse::VERSION
     module VERSION #:nodoc:
       MAJOR = 1
-      MINOR = 8
-      TINY  = 11
-      PRE   = nil
+      MINOR = 9
+      TINY  = 0
+      PRE   = 'beta17'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end
diff --git a/lib/wizard.rb b/lib/wizard.rb
index e7a74f190c..d577c2aa29 100644
--- a/lib/wizard.rb
+++ b/lib/wizard.rb
@@ -87,10 +87,10 @@ class Wizard
     end
 
     first_admin_id = User.where(admin: true)
-                      .human_users
-                      .joins(:user_auth_tokens)
-                      .order('user_auth_tokens.created_at')
-                      .pluck(:id).first
+      .human_users
+      .joins(:user_auth_tokens)
+      .order('user_auth_tokens.created_at')
+      .pluck(:id).first
 
     if @user&.id && first_admin_id == @user.id
       !Wizard::Builder.new(@user).build.completed?
diff --git a/lib/wizard/builder.rb b/lib/wizard/builder.rb
index 867d2a310c..dddf08f7a7 100644
--- a/lib/wizard/builder.rb
+++ b/lib/wizard/builder.rb
@@ -82,7 +82,10 @@ class Wizard
         username = Discourse.system_user.username if username.blank?
         contact = step.add_field(id: 'site_contact', type: 'dropdown', value: username)
 
-        User.where(admin: true).pluck(:username).each {|c| contact.add_choice(c) }
+        User.human_users.where(admin: true).pluck(:username).each do |c|
+          contact.add_choice(c) unless reserved_usernames.include?(c.downcase)
+        end
+        contact.add_choice(Discourse.system_user.username)
 
         step.on_update do |updater|
           updater.apply_settings(:contact_email, :contact_url)
@@ -120,8 +123,8 @@ class Wizard
         themes = step.add_field(id: 'base_scheme_id', type: 'dropdown', required: true, value: scheme_id)
         ColorScheme.base_color_scheme_colors.each do |t|
           with_hash = t[:colors].dup
-          with_hash.map{|k,v| with_hash[k] = "##{v}"}
-          themes.add_choice(t[:id], data: {colors: with_hash})
+          with_hash.map { |k, v| with_hash[k] = "##{v}" }
+          themes.add_choice(t[:id], data: { colors: with_hash })
         end
         step.add_field(id: 'theme_preview', type: 'component')
 
@@ -187,12 +190,10 @@ class Wizard
       end
 
       @wizard.append_step('emoji') do |step|
-        sets = step.add_field({
-          id: 'emoji_set',
-          type: 'radio',
-          required: true,
-          value: SiteSetting.emoji_set
-        })
+        sets = step.add_field(id: 'emoji_set',
+                              type: 'radio',
+                              required: true,
+                              value: SiteSetting.emoji_set)
 
         emoji = ["smile", "+1", "tada", "poop"]
 
@@ -201,10 +202,8 @@ class Wizard
             "<img src='/images/emoji/#{set[:value]}/#{e}.png'>"
           end
 
-          sets.add_choice(set[:value], {
-            label: I18n.t("js.#{set[:name]}"),
-            extra_label: "<span class='emoji-preview'>#{imgs.join}</span>"
-          })
+          sets.add_choice(set[:value],             label: I18n.t("js.#{set[:name]}"),
+                                                   extra_label: "<span class='emoji-preview'>#{imgs.join}</span>")
 
           step.on_update do |updater|
             updater.apply_settings(:emoji_set)
@@ -214,7 +213,7 @@ class Wizard
 
       @wizard.append_step('invites') do |step|
 
-        staff_count = User.where("moderator = true or admin = true").where("id <> ?", Discourse.system_user.id).count
+        staff_count = User.staff.human_users.where('username_lower not in (?)', reserved_usernames).count
         step.add_field(id: 'staff_count', type: 'component', value: staff_count)
 
         step.add_field(id: 'invite_list', type: 'component')
@@ -253,5 +252,9 @@ class Wizard
 
       raw.gsub!(old_value, new_value)
     end
+
+    def reserved_usernames
+      @reserved_usernames ||= SiteSetting.defaults[:reserved_usernames].split('|')
+    end
   end
 end
diff --git a/lib/wizard/field.rb b/lib/wizard/field.rb
index 0816e055d7..45fdacc999 100644
--- a/lib/wizard/field.rb
+++ b/lib/wizard/field.rb
@@ -27,7 +27,7 @@ class Wizard
       @choices = []
     end
 
-    def add_choice(id, opts=nil)
+    def add_choice(id, opts = nil)
       choice = Choice.new(id, opts || {})
       choice.field = self
 
diff --git a/lib/wizard/step_updater.rb b/lib/wizard/step_updater.rb
index f05605c33f..3d8ad87a3d 100644
--- a/lib/wizard/step_updater.rb
+++ b/lib/wizard/step_updater.rb
@@ -44,7 +44,7 @@ class Wizard
     end
 
     def apply_settings(*ids)
-      ids.each {|id| apply_setting(id)}
+      ids.each { |id| apply_setting(id) }
     end
 
   end
diff --git a/package.json b/package.json
new file mode 100644
index 0000000000..2668bc503a
--- /dev/null
+++ b/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "discourse",
+  "version": "1.0.0",
+  "main": "index.js",
+  "repository": "git@github.com:discourse/discourse.git",
+  "author": "Discourse",
+  "license": "MIT",
+  "dependencies": {},
+  "devDependencies": {
+    "babel-eslint": "^8.0.3",
+    "chrome-launcher": "^0.10.0",
+    "chrome-remote-interface": "^0.25.4",
+    "eslint": "^4.13.1",
+    "puppeteer": "^0.13.0"
+  }
+}
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 074d93a3b4..123c08ecc2 100644
--- a/plugins/discourse-details/assets/javascripts/initializers/apply-details.js.es6
+++ b/plugins/discourse-details/assets/javascripts/initializers/apply-details.js.es6
@@ -11,17 +11,15 @@ 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 }
         );
-        this.set('optionsVisible', false);
       }
     }
   });
@@ -31,6 +29,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 b710abf7e6..545d0eea90 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 5c2ad81e10..cd03a2fb6b 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 427687886a..a22705223e 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
@@ -1,22 +1,29 @@
 import { acceptance } from "helpers/qunit-helpers";
+import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
 
-acceptance('Details Button', { loggedIn: true });
+acceptance('Details Button', {
+  loggedIn: true,
+  beforeEach: function() {
+    clearPopupMenuOptionsCallback();
+  }
+});
 
 function findTextarea() {
   return find(".d-editor-input")[0];
 }
 
-test('details button', () => {
-  visit("/");
+test('details button', (assert) => {
+  const popupMenu = selectKit('.toolbar-popup-menu-options');
 
+  visit("/");
   click('#create-topic');
-  click('button.options');
-  click('.popup-menu .fa-caret-right');
+
+  popupMenu.expand().selectRowByValue('insertDetails');
 
   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'
     );
   });
@@ -29,19 +36,18 @@ test('details button', () => {
     textarea.selectionEnd = textarea.value.length;
   });
 
-  click('button.options');
-  click('.popup-menu .fa-caret-right');
+  popupMenu.expand().selectRowByValue('insertDetails');
 
   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, 21, 'it should start highlighting at the right position');
+    assert.equal(textarea.selectionEnd, 37, 'it should end highlighting at the right position');
   });
 
   fillIn('.d-editor-input', "Before some text in between After");
@@ -52,41 +58,64 @@ test('details button', () => {
     textarea.selectionEnd = 28;
   });
 
-  click('button.options');
-  click('.popup-menu .fa-caret-right');
+  popupMenu.expand().selectRowByValue('insertDetails');
 
   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, 28, 'it should start highlighting at the right position');
+    assert.equal(textarea.selectionEnd, 48, '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');
+  popupMenu.expand().selectRowByValue('insertDetails');
 
   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, 29, 'it should start highlighting at the right position');
+    assert.equal(textarea.selectionEnd, 49, 'it should end highlighting at the right position');
+  });
+});
+
+test('details button surrounds all selected text in a single details block', (assert) => {
+  const multilineInput = 'first line\n\nsecond line\n\nthird line';
+  const popupMenu = selectKit('.toolbar-popup-menu-options');
+
+  visit("/");
+  click('#create-topic');
+  fillIn('.d-editor-input', multilineInput);
+
+  andThen(() => {
+    const textarea = findTextarea();
+    textarea.selectionStart = 0;
+    textarea.selectionEnd = textarea.value.length;
+  });
+
+  popupMenu.expand().selectRowByValue('insertDetails');
+
+  andThen(() => {
+    assert.equal(
+      find(".d-editor-input").val(),
+      `\n[details="${I18n.t('composer.details_title')}"]\n${multilineInput}\n[/details]\n`,
+      'it should contain the right output'
+    );
   });
 });
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 f020474e6c..ab49a5a92c 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'
   },
+  censoredWords: 'shucks|whiz|whizzer',
   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 40d727b6ae..82117be16e 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/client.sr.yml b/plugins/discourse-narrative-bot/client.sr.yml
new file mode 100644
index 0000000000..d1c20b0756
--- /dev/null
+++ b/plugins/discourse-narrative-bot/client.sr.yml
@@ -0,0 +1,6 @@
+sr:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "Započni korisnički tutorijal za sve nove korisnike"
+        welcome_message: "Pošalji svim novim korisnicima poruku dobrodošlice sa kratkim uputstvom za početnike"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.ar.yml b/plugins/discourse-narrative-bot/config/locales/client.ar.yml
index 79ea4de815..477fb42133 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.ar.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.ar.yml
@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ar: {}
+ar:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "ابدأ برنامج تعليم الأعضاء الجدد لكل الأعضاء الجدد !"
+        welcome_message: "أرسل إلى كلّ الاعضاء الجدد رسالة ترحيبيّة فيها دليل البدء سريع"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.ca.yml b/plugins/discourse-narrative-bot/config/locales/client.ca.yml
new file mode 100644
index 0000000000..46e38f4d38
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/client.ca.yml
@@ -0,0 +1,13 @@
+# 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/
+
+ca:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "Inicia el tutorial de nou usuari per a tots els nous usuaris"
+        welcome_message: "Envia a tots els nous usuaris un missatge de benvinguda amb una guia ràpida d'iniciació."
diff --git a/plugins/discourse-narrative-bot/config/locales/client.cs.yml b/plugins/discourse-narrative-bot/config/locales/client.cs.yml
index ed70fe3519..8a9eb55837 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.cs.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.cs.yml
@@ -9,5 +9,5 @@ cs:
   js:
     discourse_narrative_bot:
       welcome_post_type:
-        new_user_track: "Zapnout všem novým uživatelům návod pro nové uživatele"
-        welcome_message: "Poslat všem novým uživatelům uvítací zprávu s návodem jak začit"
+        new_user_track: "Zapnout návod pro všechny nové uživatele"
+        welcome_message: "Poslat všem novým uživatelům uvítací zprávu s rychlým návodem jak začít"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.da.yml b/plugins/discourse-narrative-bot/config/locales/client.da.yml
index 9ca8189621..f07f7412cb 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.da.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.da.yml
@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-da: {}
+da:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "Start opstartsvejledningen for alle nye brugere"
+        welcome_message: "Send en velkomstbesked til alle nye brugere med en opstartsguide"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.el.yml b/plugins/discourse-narrative-bot/config/locales/client.el.yml
new file mode 100644
index 0000000000..da211e8e8c
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/client.el.yml
@@ -0,0 +1,13 @@
+# 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:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "Ξεκίνησε την εκπαίδευση νέου μέλους σε όλους τους νέους χρήστες"
+        welcome_message: "Στείλε σε όλα τα νέα μέλη ένα μήνυμα καλοσωρίσματος με έναν οδηγό γρήγορης εκκίνησης"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.es.yml b/plugins/discourse-narrative-bot/config/locales/client.es.yml
index ffbe021243..10bdb973be 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.id.yml b/plugins/discourse-narrative-bot/config/locales/client.id.yml
index b612993aa7..890ffc9aa2 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.id.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.id.yml
@@ -9,5 +9,5 @@ id:
   js:
     discourse_narrative_bot:
       welcome_post_type:
-        new_user_track: "Mulai panduan anggota baru untuk semua anggota baru"
-        welcome_message: "Kirim semua anggota ucapan selamat datang dengan panduan awal singkat"
+        new_user_track: "Mulai panduan pengguna baru untuk semua pengguna baru"
+        welcome_message: "Kirim semua pengguna ucapan selamat datang dengan panduan awal singkat"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.ja.yml b/plugins/discourse-narrative-bot/config/locales/client.ja.yml
index 8c2dc00904..3f573c644f 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 bf4e05d6f4..a6dd142953 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.lv.yml b/plugins/discourse-narrative-bot/config/locales/client.lv.yml
new file mode 100644
index 0000000000..dc48bb58ee
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/client.lv.yml
@@ -0,0 +1,8 @@
+# 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/
+
+lv: {}
diff --git a/plugins/discourse-narrative-bot/config/locales/client.nl.yml b/plugins/discourse-narrative-bot/config/locales/client.nl.yml
index cc9c39b8b5..4ef46341ee 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.nl.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.nl.yml
@@ -10,3 +10,4 @@ nl:
     discourse_narrative_bot:
       welcome_post_type:
         new_user_track: "Start de nieuwe gebruikerstutorial voor alle nieuwe gebruikers"
+        welcome_message: "Stuur een welkomstbericht met een snelle start handleiding naar alle nieuwe gebruikers"
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 c04d371e5a..db756af6e9 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.pt.yml b/plugins/discourse-narrative-bot/config/locales/client.pt.yml
new file mode 100644
index 0000000000..cbaaf9aacf
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/client.pt.yml
@@ -0,0 +1,13 @@
+# 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:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "Iniciar o tutorial de novo utilizador para todos os novos utilizadores"
+        welcome_message: "Enviar a todos os novos utilizadores uma mensagem de boas-vindas com um guia de início rápido."
diff --git a/plugins/discourse-narrative-bot/config/locales/client.ru.yml b/plugins/discourse-narrative-bot/config/locales/client.ru.yml
index 8586e91853..89b4ee73cf 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.ru.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.ru.yml
@@ -9,5 +9,5 @@ ru:
   js:
     discourse_narrative_bot:
       welcome_post_type:
-        new_user_track: "Включить прохождение нового учебника для всех новых пользователей."
+        new_user_track: "Включить интерактивный учебник для всех новых пользователей"
         welcome_message: "Отправить всем новым пользователям приветственное сообщение с кратким руководством"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.sk.yml b/plugins/discourse-narrative-bot/config/locales/client.sk.yml
index 5773ccd0c8..31b6da6add 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 4526be3162..464107661f 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/client.sr.yml b/plugins/discourse-narrative-bot/config/locales/client.sr.yml
new file mode 100644
index 0000000000..aedd9d1029
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/client.sr.yml
@@ -0,0 +1,13 @@
+# 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/
+
+sr:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "Započni korisnički tutorijal za sve nove korisnike"
+        welcome_message: "Pošalji svim novim korisnicima poruku dobrodošlice sa kratkim uputstvom za početnike"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.sv.yml b/plugins/discourse-narrative-bot/config/locales/client.sv.yml
index fd54901f75..974bf161b5 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.sv.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.sv.yml
@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-sv: {}
+sv:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "Starta handlednings guide för alla nya användare"
+        welcome_message: "Skicka ett välkomstmeddelande till alla nya användare med en snabbhandledning"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.th.yml b/plugins/discourse-narrative-bot/config/locales/client.th.yml
new file mode 100644
index 0000000000..7ed98e15d8
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/client.th.yml
@@ -0,0 +1,8 @@
+# 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/
+
+th: {}
diff --git a/plugins/discourse-narrative-bot/config/locales/client.tr_TR.yml b/plugins/discourse-narrative-bot/config/locales/client.tr_TR.yml
index 00efffd670..f97a347f3b 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.tr_TR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.tr_TR.yml
@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-tr_TR: {}
+tr_TR:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "Tüm yeni başlayan kullanıcılar için yeni kullanıcı öğreticisini başlatın"
+        welcome_message: "Hızlı başlangıç rehberi ile tüm yeni kullanıcılara hoş geldin mesajı gönder"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.uk.yml b/plugins/discourse-narrative-bot/config/locales/client.uk.yml
index 3acfff74e8..7bf1ef3dff 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.uk.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.uk.yml
@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-uk: {}
+uk:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "Переглянути посібник для нових користувачів"
+        welcome_message: "Надіслати всім новим користувачам - вітальне повідомлення з швидким переходом до посібника користувача"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.vi.yml b/plugins/discourse-narrative-bot/config/locales/client.vi.yml
new file mode 100644
index 0000000000..ae752d1833
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/client.vi.yml
@@ -0,0 +1,13 @@
+# 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:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "Bật hướng dẫn cho tất cả người dùng mới"
+        welcome_message: "Gửi tin nhắn chào mừng cho tất cả thành viên mới kèm theo hướng dẫn bắt đầu."
diff --git a/plugins/discourse-narrative-bot/config/locales/client.zh_TW.yml b/plugins/discourse-narrative-bot/config/locales/client.zh_TW.yml
index 92c18de9ae..6b11513519 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.zh_TW.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.zh_TW.yml
@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-zh_TW: {}
+zh_TW:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "為所有的新使用者啟動新使用者教學。"
+        welcome_message: "寄送包含快速入門指引的歡迎訊息給所有新使用者。"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ar.yml b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
index 79ea4de815..6d6c2f499e 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ar.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
@@ -5,4 +5,324 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ar: {}
+ar:
+  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_type: "نوع منشور الترحيب التي يتوجب على روبوت ديسكورس المتحدث ارسالها"
+    discourse_narrative_bot_welcome_post_delay: "انتظر هذا العدد من الثوان قبل ارسال منشور الترحيب بواسطة روبوت ديسكورس المتحدث"
+  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), اعرف!
+      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':
+        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: |-
+        > :speech_balloon: _%{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}`
+          > :speech_balloon: _قم بعمل الخير دون انتظار الأجر, و آمن انه يوما ما سيقوم احدهم برد هذا الخير لك_ &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
+        not_found: |-
+          عذرا, انا لم اجد الرابط في ردك! :cry:
+
+          هل يمكنك ان تحاول إضافة الرابط التالي في سطر منفرد في ردك التالي؟
+          `قم بإزالة الاقواس حول الرابط`
+
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
+      images:
+        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: |-
+          هل يمكنك اقتباس كلامي في ردك, كي اعرف بالضبط ما الجزء الذي تتحدث عنة؟
+
+          > إذا كانت قهوة, اجلب لي بعض الشاي. و إذا كانت شاي اجلب لي بعض القهوة!!
+          >
+          > ميزة التحدث الي نفسك هي انك تعرف انه علي الاقل يوجد شخص واحد ينصت اليك!
+
+          حدد النص &uarr; الذي تفضل ان ترد علية, ثم اضغط علي زر **اقتبس** الذي ينبثق فوق الجزء المحدد او زر **رد** اسفل هذا المنشور.
+
+          بعد الجزء المقتبس, اكتب لماذا اقتبست هذا الموضوع لانني فضولي :thinking:
+        reply: |-
+          عظيم! لقد اخترت مقولتي المفضلة!!
+          :speech_balloon:
+        not_found: |-
+          يبدو انك لم تقم باقتباس اي شئ مني في ردك؟
+
+          اختيار اي نص في المنشور سوف يظهر زر <kbd>**اقتبس**</kbd>, و الضغط علي زر **رد** عندما يكون النص محدد سوف يقتبس هذا الجزء ايضاً في الرد! هل يمكنك المحاولة مرة اخري؟
+      bookmark:
+        reply: |-
+          رائع!  الان يمكنك الرجوع بسهولة لمحادثتنا في اي وقت من خلال [ تبويب العلامات المرجعية بملفك الشخصي ](%{profile_page_url}/activity/bookmarks). او بالقائمة المنبثقة من الضغط علي صورتك الشخصية &#8598;
+      emoji:
+        reply: |-
+          هذا مثال علي :sparkles: _الرموز التعبيرية_ :sparkles:
+      mention:
+        instructions: |-
+          في بعض الاحيان تحتاج الي تنبية شخص معين. لفعل ذلك اكتب `@` ثم اكتب اسم المستخدم الخاص به بالإنجليزية للإشارة إلية.
+
+          هل يمكنك الإشارة إلي **`@%{discobot_username}`** في ردك.
+        reply: |-
+          _ هل ذكر احدهم اسمي !؟ _ :raised_hand: انا واثق انك فعلت! :wave: حسنا, ها انا! اشكرك علي الإشارة إلي :ok_hand:
+        not_found: |-
+          انا لم اجد اسمي في ردك باي مكان :frowning: هل يمكنك الإشارة الي بكتابة `@%{discobot_username}` مرة اخري؟
+      flag:
+        reply: |-
+          سيتم إعلام [طاقم العمل](/groups/staff) عن بلاغك بشكل سري. إذا قام عدد من اعضاء المجتمع بالإبلاغ عن نفس المنشور, سيتم اخفائة بشكل آلي كإجراء إحترازي. ( و بما اني لم اقم فعليا بكتابة منشور مخالف فقد قمت بإذالة البلاغ عن منشوري)
+      search:
+        reply: |-
+          ها قد وجدتها :tada:
+
+          -لعمل بحث اكثر دقه قم بالإنتقال إلي [صفحة البحث](%{search_url}).
+
+          للتنقل بسهولة بين منشورات الموضوع, استخدم الخط الزمني علي اليسار (و في الاسفل علي الهواتف الذكية).
+
+          اذا كان لديك لوحة مفاتيح حقيقية, اضغط علي <kbd>؟</kbd> لفتح قائمة مفاتيح الاختصار.
+      end:
+        message: |-
+          شكراً لبقائك معي @%{username}! قمت بصنع هذا لأجلك, اعتقد انك تستحقه:
+
+          %{certificate}
+
+          هذا كل شيء الأن! إستكشف [**اخر الموضوعات**](/latest) و [**الأقسام**](/categories).
+
+          (ان كنت ترغب بالتحدث معي مرة اخرى لتعلم المزيد, فقط قم بأرسال رسالة إلي او اشر بـ `@%{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: |-
+          كل الناس تخطأ. لكن لا تقلق, تستطيع دائماً تعديل المنشورتك لتصحيحها!
+
+          هل يمكنك البدء **بتعديل** المنشور التالي الذي نشرتة باسمك :sweat_smile:؟
+        reply: |-
+          رائع!
+
+          لاحظ ان اي تعديل علي المنشور بعد 5 دقائق من نشرة سوف يُسجل كنسخة منقحة, و ستظهر صورة قلم صغير اعلي اليسار بجانبها عدد مرات التعديل علي المنشور.
+      delete:
+        reply: |-
+          اوو... :boom:
+
+          للحفاظ علي ترابط النقاش, عمليات الحذف لا تنفز فوريا, سيتم تنفيذ حذف المنشور بعد بعض الوقت.
+      recover:
+        deleted_post_raw: 'لماذا قام @%{discobot_username} بحذف منشوري؟ :anguished:'
+        reply: |-
+          اه, ذلك كان وشيكاً! شكراً لاصلاح ذلك :wink:
+
+          رجاء تأكد ان لديك 24 ساعة فقط لألغاء حذفك للموضوع.
+      category_hashtag:
+        instructions: |-
+          هل تعلم انك تستطيع الإشارة إلي قسم او وسم في منشورك؟ كمثال علي ذلك "هل رايت من قبل قسم ال%{category}؟"
+
+          اكتب `#` وسط الكلام و اختر القسم او الوسم الذي تريد.
+        not_found: |-
+          عذرا, انا لا اري إشارة لاي قسم في ردك, لاحظ انه لا يمكن استخدام `#` كأول حرف في المنشور. قم بنسخ الجملة التالية في محرر النصوص.
+
+          `انا استطيع ان انشئ رابط لقسم بإستخدام #`
+        reply: |-
+          رائع! تذكر ان هذا يعمل مع الاقسام و الوسوم, اذا كانت خاصية الوسوم مفعلة بالموقع.
+      change_topic_notification_level:
+        instructions: |-
+          لكل موضوع مستوي من الإشعارات. تبدأ بالوضع **العادي** حيث يتم اشعارك فقط عندما يشير احدهم اليك بشكل مباشر.
+
+          بشكل افتراضي مستوي الإشعارات للرسائل الخاصة مضبوطة علي الوضع **مراقب** حيث يتم اشعارك بكل رد جديد لكن يمكنك تعديل مستوي الإشعارات _لاي_ موضوع الي ** "مراقب" او "متابع" او "عادي" او "مكتوم" **.
+
+          دعنا نحاول تغيير مستوي الاشعارات لهذا الموضوع. في نهاية الموضوع ستجد زر مكتوب علية **مراقب**. هل يمكنك الضغط علية و اختيار الوضع **متابع**؟
+        not_found: |-
+          يبدوا انك ماذلت تراقب :eyes: هذا الموضوع! اذا واجهت مشكلة في إجاد رز مستوي الإشعارات. قم بالنزول إلي نهاية الصفحة علي اليمين, ستجدة هناك
+        reply: |-
+          رائع! اتمني انك لم تجعل مستوي إشعارات الموضوع علي الوضع **مكتوم**! حيث انني احب التحدث إليك من وقت لاخر :grin:
+
+          لاحظ انه عندما تقوم بالرد علي احد الموضوعات او قراءة الموضوع لعدة دقائق سيتحول مستوي اشعارات الموضوع إلي **متابع** تقائياً. يمكنك تعديل هذا السلوك من [ صفحة الإعدادات ](/my/preferences).
+      poll:
+        reply: |-
+          رائع! ما هو تقييمك لشرحي؟!
+
+          [poll]
+          * :+1:
+          * :-1:
+          [/poll]
+      details:
+        not_found: |-
+          هل لديك مصاعب في إخفاء التفاصيل؟ قم بنسخ الجزء المقبل و ضعه في ردك القادم.
+
+          ```text
+          [details=اضغط علي لتري التفاصيل]
+          هنا تكون التفاصيل.
+          [/details]
+          ```
+        reply: |-
+          عمل رائع — انتباهك _للتفاصيل_ محط اعجاب!
+      end:
+        message: |-
+          لقد اصبحت الأن عضو محترف بمجتمعنا :bow:
+
+          %{certificate}
+
+          هذا كل شئ الأن.
+
+          ولكن إذا اردت التحدث معي مجددا ارسل إلي رسالة :sunglasses:
+      certificate:
+        alt: 'شهادة إنجاز مسار العضو المحترف.'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ca.yml b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
new file mode 100644
index 0000000000..394c6e6c7a
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
@@ -0,0 +1,426 @@
+# 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/
+
+ca:
+  site_settings:
+    discourse_narrative_bot_enabled: 'Habilita el Discourse Narrative Bot'
+    disable_discourse_narrative_bot_welcome_post: "Deshabilita el missatge de benvinguda del Discourse Narrative Bot"
+    discourse_narrative_bot_ignored_usernames: "Noms d'usuari que el Discourse Narrative Bot hauria d'ignorar"
+    discourse_narrative_bot_disable_public_replies: "Deshabilita les respostes públiques del Discourse Narrative Bot"
+    discourse_narrative_bot_welcome_post_type: "Tipus de missatge de benvinguda que el Discourse Narrative Bot  hauria d'enviar"
+    discourse_narrative_bot_welcome_post_delay: "Espera (n) segons abans d'enviar el missatge de benvinguda del Discourse Narrative Bot"
+  badges:
+    certified:
+      name: Certificat
+      description: "Ha completat el nostre tutorial de nou usuari"
+      long_description: |
+        Aquesta insígnia es concedeix després d'haver completat amb èxit el nou tutorial interactiu d'usuaris. Has pres la iniciativa d'aprendre les eines bàsiques de discussió i ara estàs certificat!
+    licensed:
+      name: Llicenciat
+      description: "Ha completat el nostre tutorial d'usuari avançat"
+      long_description: |
+        Aquesta insígnia es concedeix després d'haver completat amb èxit el tutorial interactiu d'usuari avançat. Has dominat les eines avançades de discussió i ara tens una llicència completa!
+  discourse_narrative_bot:
+    bio: "Hola, no sóc una persona real, sóc un robot que et pot ensenyar coses sobre aquest lloc. Per interactuar amb mi, envia'm un missatge o una menció %{discobot_username} a qualsevol lloc.  "
+    timeout:
+      message: |-
+        Hola @%{username}, contacto amb tu perquè fa temps que no sé res de tu.
+
+        - Per continuar, pots respondre'm en qualsevol moment.
+
+        - Si vols saltar aquest pas, digues `%{skip_trigger}`.
+
+        - Per començar de nou digues `%{reset_trigger}`.
+
+        - Si així i tot és no, també està bé. Sóc un robot. No feriràs els meus sentiments. :sob:
+    dice:
+      trigger: "tirar"
+      invalid: |-
+        Ho sento, és matemàticament impossible tirar aquesta combinació de daus. :confounded:
+      not_enough_dice: |-
+        Només tinc %{num_of_dice} daus. [Vergonyós] (http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php), ho sé!
+      out_of_range: |-
+        Sabies que [el número màxim de cares] (https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) per a un dau matemàtic és 120?
+      results: |-
+        > :game_die: %{results}
+    quote:
+      trigger: "cita"
+      '1':
+        quote: "Enmig de cada dificultat, hi ha una oportunitat"
+        author: "Albert Einstein"
+      '2':
+        quote: "La llibertat no val la pena si no connota el dret a errar. "
+        author: "Mahatma Gandhi"
+      '3':
+        quote: "No ploris perquè s'ha acabat, somriu perquè ha succeït."
+        author: "Dr Seuss"
+      '4':
+        quote: "Si vols que alguna cosa estigui ben feta, fes-la tu mateix. "
+        author: "Charles-Guillaume Étienne"
+      '5':
+        quote: "Creu que pots i estaràs a mig camí."
+        author: "Theodore Roosevelt"
+      '6':
+        quote: "La vida és com una caixa de bombons, mai saps què hi trobaràs a dins."
+        author: "La mare de Forrest Gump"
+      '7':
+        quote: "Això és un petit pas per a l'home, però un gran salt per a la humanitat."
+        author: "Neil Armstrong"
+      '8':
+        quote: "Fes cada dia alguna cosa que et faci por. "
+        author: "Eleanor Roosevelt"
+      '9':
+        quote: "Els errors són sempre perdonables, si tenim el valor d'admetre'ls."
+        author: "Bruce Lee"
+      '10':
+        quote: "Allò que la ment humana pot concebre i creure, és allò que pot aconseguir. "
+        author: "Napoleon Hill"
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
+    magic_8_ball:
+      trigger: 'Sort'
+      answers:
+        '1': "És inqüestionable"
+        '2': "És així sens dubte"
+        '3': "Sens dubte"
+        '4': "És clar que sí"
+        '5': "Pots confiar-hi"
+        '6': "Tal com ho veig, sí"
+        '7': "El més probable"
+        '8': "Bon pronòstic"
+        '9': "Sí"
+        '10': "Sembla ser que sí"
+        '11': "Resposta confusa, torna a intentar-ho"
+        '12': "Pregunta-ho més tard"
+        '13': "Millor no t'ho explico ara"
+        '14': "No es pot predir ara"
+        '15': "Concentra't i torna-ho a preguntar"
+        '16': "No hi comptis"
+        '17': "La meva resposta és no"
+        '18': "Les meves fonts indiquen que no"
+        '19': "Les perspectives no són bones"
+        '20': "Molt dubtós"
+      result: |-
+        > :crystal_ball: %{result}
+    track_selector:
+      reset_trigger: 'començament'
+      skip_trigger: 'omet'
+      help_trigger: 'mostra ajuda'
+      random_mention:
+        reply: |-
+          Hola! Per trobar què puc fer, digues `@%{discobot_username} %{help_trigger}`.
+        tracks: |-
+          Ja sé com fer les següents tasques:
+
+          `@%{discobot_username} %{reset_trigger} %{default_track}`
+          > Comença una de les següents narracions interactives: %{tracks}.
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3, 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          > :left_speech_bubble: _Porta a terme un acte aleatori de generositat, sense cap expectativa de recompensa, amb la certesa que qualsevol dia potser algú farà el mateix per tu_&mdash; Princesa Diana
+
+          `@%{discobot_username}%{magic_8_ball_trigger}`
+          > :crystal_ball: Hi pots confiar
+      do_not_understand:
+        first_response: |-
+          Hola, gràcies per la resposta!
+
+          Desafortunadament, com que sóc un robot mal programat, em costa entendre-ho. :frowning:
+        track_response: Ho pots tornar a provar, o si prefereixes ometre aquest pas, digues `%{skip_trigger}`. En cas contrari, per començar de nou, digues `%{reset_trigger}`.
+        second_response: |-
+          Ai, ho sento. Encara no ho he captat. :anguished:
+
+          Només sóc un robot, però si vols contactar amb una persona, vés a [la nostra pàgina de contacte](/about).
+
+          Mentrestant, no et destorbaré.
+    new_user_narrative:
+      reset_trigger: "nou usuari"
+      cert_title: "En reconeixement per haver completat satisfactòriament el tutorial de nou usuari"
+      hello:
+        title: ":robot: Salutacions!"
+        message: |-
+          Gràcies per unir-te a %{title}, i benvingut!
+          - Només sóc un robot però [el nostre amable personal](/about) està disposat a ajudar-te si necessites contactar amb una persona.
+
+          - Per raons de seguretat, limitem temporalment les accions que poden realitzar els nous usuaris. Obtindràs noves habilitats (i [distintius](/badges)) quan ens coneguem millor.
+
+          - Creiem en el [comportament civilitzat en comunitat](/guidelines) en tot moment.
+      onebox:
+        instructions: |-
+          Seguidament, pots compartir un d'aquests enllaços amb mi? Respon amb  **un enllaç d'una línia sense res més**, i s'expandirà automàticament per incloure un breu resum.
+
+          Per copiar un enllaç, punteja i mantingues al mòbil o fes clic amb el botó dret del ratolí:
+
+          - https://ca.wikipedia.org/wiki/Patufeta
+          - https://ca.wikipedia.org/wiki/Botifarra_dolça
+          - https://ca.wikipedia.org/wiki/Ortografia_de_la_calculadora
+        reply: |-
+          Genial! Això funcionarà per a la majoria d'enllaços <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16">. Recorda, ha d'estar en una línia _tot per si mateix_, res a davant, ni a darrere.
+        not_found: |-
+          Disculpa, no he pogut trobar l'enllaç a la teva resposta! :cry:
+
+          Pots intentar afegir el següent enllaç, en una sola línia, a la següent resposta?
+
+          <https://ca.wikipedia.org/wiki/Gat_exòtic>
+      images:
+        instructions: |-
+          Aquí tens una imatge d'un unicorn:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          Si t'agrada (a qui no!) vinga, fes un clic al botó m'agrada :heart: situat a sota d'aquesta publicació per fer-m'ho saber.
+
+          Pots **respondre amb una imatge?** Amb qualsevol imatge! Arrossega i deixa-la anar, clica el botó carregar, o si vols, també pots copiar i enganxar.
+        reply: |-
+          Excel·lent imatge - He clicat el botó m'agrada :heart: perquè sàpigues que m'ha agradat molt :heart_eyes:
+        like_not_found: |-
+          T'has oblidat de clicar m'agrada :heart: a la meva [publicació?](%{url}) :crying_cat_face:
+        not_found: |-
+          Sembla ser que no has carregat cap imatge així que he triat una imatge que estic segur que t'agradarà.
+
+          `%{image_url}`
+
+          Intenta carregar aquesta, o bé enganxa l'enllaç en una sola línia!
+      formatting:
+        instructions: |-
+          Pots convertir algunes paraules en **negreta** o _cursiva_ a la teva resposta?
+
+          - escriu  `**negreta**` or `_cursiva_`
+
+          - o clica els botons <kbd><b>B</b></kbd> o <kbd><i>I</i></kbd> de l'editor.
+        reply: |-
+          Bona feina! HTML i BBCode també funcionen per formatar - per saber-ne més, [prova aquí](https://ca.wikipedia.org/wiki/Markdown) :nerd:
+        not_found: |-
+          Ai, no he trobat cap format a la teva resposta. :pencil2:
+
+          Pots tornar-ho a intentar? Utilitza els botons <kbd><b>B</b></kbd> negreta o <kbd><i>I</i></kbd> cursiva de l'editor si t'has bloquejat.
+      quoting:
+        instructions: |-
+          Pots citar-me quan responguis? D'aquesta manera sé quina part exacta estàs responent?
+
+          > Si això és cafè, si us plau, porta'm te; però si és te, si us plau, porta'm cafè.
+          >
+          > Un avantatge de parlar amb tu mateix és que com a mínim saps que algú t'està escoltant.
+          >
+          > Algunes persones tenen facilitat de paraula, i altres persones... d'aixòs, vull dir, potser que no.
+
+          Selecciona el text &uarr; de la cita que prefereixis, després clica el botó **Cita** que apareix a sobre de la selecció - o el botó **Resposta** al final d'aquest missatge.
+
+          A sota de la cita, escriu una paraula o dues que expliquin per què l'has triat, que estic intrigat :thinking:
+        reply: |-
+          Bona feina, has triat la meva cita preferida! :left_speech_bubble:
+        not_found: |-
+          Vaja, sembla que no m'has citat a la teva resposta?
+
+          Seleccionant qualsevol text de la meva publicació farà que aparegui el botó <kbd>**Cita**</kbd>. També funcionarà clicant **Resposta** amb qualsevol text seleccionat. Pots tornar-ho a provar?
+      bookmark:
+        instructions: |-
+          Si vols saber-ne més, selecciona <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> a sota i <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **marca aquest missatge privat**. Si ho fas, potser tindràs un :gift: més endavant!
+        reply: |-
+          Fantàstic! Ara pots trobar fàcilment com tornar a la nostra conversa privada en qualsevol moment, exactament des de [la pestanya de favorits del teu perfil](%{profile_page_url}/activity/bookmarks). Només has de seleccionar la teva imatge de perfil a la part superior dreta &#8599;
+        not_found: |-
+          Ui, no veig cap favorit marcat en aquest tema. Has trobat el marcador de favorits a sota de cada publicació? Fes servir el veure més <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> per mostrar accions addicionals en cas que les necessitis.
+      emoji:
+        instructions: |-
+          Deus haver vist que utilitzo petites imatges a les meves respostes :blue_car::dash: s'anomenen  [emoji](https://ca.wikipedia.org/wiki/Emoji). Pots **afegir un emoji** a la teva resposta? Qualsevol d'aquestes funcionarà:
+
+          - Escriu `:) ;) :D :P :O`
+
+          - Escriu dos punts <kbd>:</kbd> i després completa el nom  de l'emoji `:tada:`
+
+          - Clica el botó emoji <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> de l'editor, o al teclat del teu mòbil
+        reply: |-
+          Això és :sparkles: _emojitàstic!_ :sparkles:
+        not_found: |-
+          Vaja, no veig cap Emoji a la teva resposta? Oh, no! :sob:
+
+          Prova d'escriure dos punts <kbd>:</kbd> per desplegar el selector de emoji, seguidament escriu la primera lletra d'allò que vols triar, com per exemple `:bird:`
+
+          O selecciona el botó emoji <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> dins l'editor.
+
+          (Si estàs amb un dispositiu mòbil, també pots introduir Emoji directament del teclat.)
+      mention:
+        instructions: |-
+          Algun cop potser voldràs cridar l'atenció d'algunes persones, encara que no els estiguis responent directament. Escriu `@` i completa els seus noms d'usuaris per mencionar-los.
+
+          Pots mencionar **`@%{discobot_username}`** a la teva resposta?
+        reply: |-
+          _Algú ha dit el meu nom!?_ :raised_hand: Crec que ho has fet! :wave: Bé, sóc aquí! Gràcies per mencionar-me.  :ok_hand:
+        not_found: |-
+          No veig el meu nom enlloc :frowning: Pots mencionar-me com `@%{discobot_username}` un altre cop?
+
+          (Doncs sí, el meu nom d'usuari és _disco_, com a les discos de moda dels anys 70. [M'encanta la vida nocturna!](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
+      flag:
+        instructions: |-
+          Ens agrada que les nostres discussions siguin amistoses, i necessitem que ens ajudis a [mantenir les coses de manera civilitzada](%{guidelines_url}). Si detectes qualsevol problema, si us plau, avisa de forma privada a l'autor, o [al nostre personal d'ajuda](%{about_url}), per assabentar-los.
+
+          > :imp: He escrit quelcom desagradable aquí
+
+          Crec que ja saps que fer. Endavant, **reporta aquest missatge** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> com inapropiat!
+        reply: "\e\e[El nostre personal](/groups/staff) serà notificat de forma privada sobre el teu avís. Si més membres de la comunitat avisen sobre una publicació, s'ocultarà automàticament com a precaució. (Com que realment no vaig escriure una publicació desagradable :angel:, de moment he decidit  treure l'avís de la publicació.)"
+        not_found: |-
+          Oh no, la meva publicació desagradable encara no ha estat avisada! :worried: Pots fer un avís de publicació inapropiada utilitzant la **bandera** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? No oblidis utilitzar el botó mostrar més <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> per desplegar més accions per a cada publicació.
+      search:
+        instructions: |-
+          _psst_ ... He amagat una sorpresa en aquest tema. Si et ve de gust el repte, **selecciona la icona de buscador** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16">a la part superior dreta &#8599; per buscar-lo.
+
+          Prova de cercar el terme "capi&#8203;bara" en aquest tema
+        hidden_message: |-
+          Com has pogut oblidar-te d'aquest capibara? :wink:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
+
+          T'has adonat que tornes a ser al principi? Dóna menjar a aquest pobre capibara **responent amb el `:herb:` emoji** i seràs enviat automàticament al final.
+        reply: |-
+          Visca ho has trobat :tada:
+
+          - Per a cerques més detallades, dirigiu-vos a la [pàgina de cerca completa](%{search_url})
+
+          - Per saltar a algun punt de la discussió, prova amb els controls de la cronologia del tema a la dreta (i a baix, al mòbil).
+
+          - Si tens un :keyboard: físic, prem <kbd>?</kbd> per visualitzar les nostres dreceres de teclat.
+        not_found: |-
+          Ui... sembla que tens problemes. Em sap greu. Has buscat <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> el terme **capy&#8203;bara**?
+      end:
+        message: |-
+          Gràcies per romandre al meu costat @%{username}! He creat això per a tu, crec que t'ho has guanyat:
+
+          %{certificate}
+
+          Això és tot per ara! Consulta [**els nostres darrers temes de discussió**](/latest) o [**categories de discussió**](/categories). :sunglasses:
+
+          (Si vols parlar amb mi novament per obtenir més informació, envia'm un missatge o menciona `@%{discobot_username}` quan ho necessitis!)
+      certificate:
+        alt: 'Certificat d&#39;Assoliment'
+    advanced_user_narrative:
+      reset_trigger: 'usuari avançat'
+      cert_title: "En reconeixement a la finalització satisfactòria del tutorial d'usuari avançat"
+      title: ':arrow_up: Funcionalitats d''usuari avançat'
+      start_message: |-
+        Com a usuari _avançat_, ja has visitat [la teva pàgina de preferències](/my/preferences) @ %{username}? Hi ha moltes opcions perquè puguis personalitzar la teva experiència, com ara seleccionar un fons fosc o clar.
+
+        Però em despisto, comencem!
+      edit:
+        bot_created_post_raw: "@%{discobot_username} és, amb diferència, el millor robot que conec :wink:"
+        instructions: |-
+          Tothom comet errors. Però no et preocupis, sempre podràs editar les teves publicacions per corregir-les!
+        not_found: |-
+          Sembla que encara has d'editar la [publicació](%{url}) que he creat per a tu. Pots tornar-ho a intentar?
+
+          Fes servir la icona <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16"> per desplegar l'editor.
+        reply: |-
+          Bona feina!
+
+          Tingues en compte que les modificacions realitzades després de 5 minuts es mostraran com a revisions d'edició pública, i apareixerà una petita icona d'un llapis a la part superior dreta amb el recompte de revisió.
+      delete:
+        instructions: |-
+          Si vols retirar una publicació que tu mateix has fet, pots esborrar-la.
+
+          Endavant, **esborra** alguna de les teves publicacions de més amunt utilitzant l'acció <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16">**esborra**. Però no esborris la primera publicació!
+        not_found: |-
+          Encara no veig cap publicació eliminada? Recorda que <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> mostra més desplegarà <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> eliminar.
+        reply: |-
+          Apa! :boom:
+
+          Per preservar la continuïtat de les discussions, les eliminacions no són immediates, de manera que la publicació es retirarà després d'un cert temps.
+      recover:
+        deleted_post_raw: 'Per què @%{discobot_username}elimina la meva publicació? :anguished:'
+        instructions: |-
+          Oh no! Crec que he eliminat sense voler una nova publicació que acabo de crear per a tu.
+
+          Pots fer-me un favor i <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> **restaurar** la publicacio?
+        not_found: |-
+          Tens problemes? Recorda <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> mostra més desplegarà <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> restaurar.
+        reply: |-
+          Uf, pels pèls! Gràcies per arreglar-ho :wink:
+
+          Tingues en compte que només tens 24 hores per restaurar una publicació.
+      category_hashtag:
+        instructions: |-
+          Saps que pots fer referència a categories i etiquetes a la teva publicació? Per exemple, has vist la %{category} categoria?
+
+          Escriu `#` al centre d'una frase i selecciona qualsevol categoria o etiqueta.
+        not_found: |-
+          Vaja, no veig una categoria enlloc. Tingues en compte que `#` no pot ser el primer caràcter. Pots copiar això a la teva pròxima resposta?
+
+          ```text
+          Puc crear un enllaç de categoria a través de #
+          ```
+        reply: |-
+          Genial! Recorda que això funciona per les dues categories _i_ etiquetes, si les etiquetes estan activades.
+      change_topic_notification_level:
+        instructions: |-
+          Tots els temes tenen un nivell de notificació. Comença en 'normal', el que significa que normalment només se't notificarà quan algú et parli directament.
+
+          De manera predeterminada, el nivell de notificació d'un missatge privat està establert al nivell més alt de 'veure', cosa que significa que se't notificarà cada resposta nova. Però podeu anul·lar el nivell de notificació de _cada_tema per "mirar", "seguint" o "silenciat".
+
+          Intentem canviar el nivell de notificació d'aquest tema. A la part inferior del tema, trobareu un botó que mostra que estàs **veient ** aquest tema. Es pot canviar el nivell de notificació al **seguint**?
+        not_found: |-
+          Sembla que encara estàs mirant :eyes: aquest tema! Si tens problemes per trobar-lo, el botó de nivell de notificació es troba a la part inferior del tema.
+        reply: |-
+          Un treball increïble! Espero que no hagis silenciat aquest tema, perquè a vegades puc ser una mica xerraire :grin:
+
+          Tingues en compte que quan respons a un tema o llegeixes un tema durant més d'uns minuts, s'estableix automàticament en un nivell de notificació de "seguiment". Pots canviar això a [les teves preferències d'usuari](/my/preferences).
+      poll:
+        instructions: |-
+          Saps que pots incorporar una enquesta a qualsevol publicació? Prova-ho utilitzant l'eina <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> a l'editor per **crear una enquesta**.
+        not_found: |-
+          Vaja! No hi havia cap enquesta a la teva resposta.
+
+          Utilitza la icona de l'engranatge <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> de l'editor, o copia i enganxa aquesta enquesta a la teva pròxima resposta:
+
+          ```text
+          [poll]
+          * :cat:
+          * :dog:
+          [/poll]
+          ``
+        reply: |-
+          Ei, bona enquesta! T'he ensenyat bé?
+
+          [poll]
+          *: +1:
+          *: -1:
+          [/poll]
+      details:
+        instructions: |-
+          A vegades potser voldràs **amagar detalls** a les teves respostes:
+
+          - Quan estiguis debatent punts de la trama d'una pel·lícula o programa de televisió que podría ser considerat un spoiler.
+
+          - Quan la teva publicació necessita molts detalls opcionals que puguin resultar aclaparadors quan es llegeixin alhora
+
+          [details = Selecciona-ho per veure com funciona!] 「
+          1. Selecciona l'engranatge<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> a l'editor
+          2. Selecciona "Amaga els detalls"
+          3. Edita el resum de les dades i afegeix el teu contingut
+          [/ detalls]
+
+          Pots utilitzar l'engranatge <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> a l'editor per afegir una secció de detalls a la seva pròxima resposta?
+        not_found: |-
+          Tens problemes per crear un giny de detalls? Prova d'incloure el següent a la teva pròxima resposta:
+
+          ```text
+          [details = Seleccioneu-me per obtenir informació]
+          Aquests són els detalls
+          [/detalls]
+          ```
+        reply: |-
+          Bona feina — la teva atenció al _detall_ és admirable!
+      end:
+        message: |-
+          Ho has fet com un _usuari avançat_ de veritat :bow:
+
+          %{certificate}
+
+          Això és tot el que tinc per a tu.
+
+          Adèu per ara! Si vols tornar a parlar amb mi, envia'm un missatge quan vulguis :sunglasses:
+      certificate:
+        alt: 'Certificat d''Aptitud del Curs d''Usuari Avançat'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.cs.yml b/plugins/discourse-narrative-bot/config/locales/server.cs.yml
index c0f2fec763..a7647ca261 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.cs.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.cs.yml
@@ -5,4 +5,119 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-cs: {}
+cs:
+  site_settings:
+    discourse_narrative_bot_enabled: 'Zapnonut Discourse robota průvodce'
+    disable_discourse_narrative_bot_welcome_post: "Vypnout uvítací příspěvek od Discourse robota průvodce"
+    discourse_narrative_bot_ignored_usernames: "Uživatelská jména, která by měl Discourse robot průvodce ignorovat"
+    discourse_narrative_bot_disable_public_replies: "Vypnout veřejné odpovědi Discourse robota průvodce"
+    discourse_narrative_bot_welcome_post_type: "Typ uvítacího příspěvku, který by měl Discourse robot průvodce poslat"
+    discourse_narrative_bot_welcome_post_delay: "Počkat (n) vteřin, než Discourse robot průvodce odešle uvítací příspěvek."
+  badges:
+    certified:
+      name: Certifikován(a)
+      description: "Dokončil náš tutorial pro nové uživatele"
+      long_description: |
+        Tento odznak je udělen za úspěšné dokončení interaktivního tutoriálu pro nové uživatele. Udělali jste krok, abyste se naučili základní nástroje diskuse a nyní jste certifikováni!
+    licensed:
+      name: Licencován(a)
+      description: "Dokončen náš pokročilý uživatelský tutoriál"
+      long_description: |
+        Tento odznak je udělen za úspěšné dokončení pokročilého interaktivního tutoriálu pro uživatele. Zvládli jste pokročilé nástroje diskuse — a nyní jste plně licencováni!
+  discourse_narrative_bot:
+    bio: "Ahoj, já nejsem člověk. Jsem robot, který Vás může naučit něco o tomto webu. Pro interakci se mnou mi pošlete zprávu nebo kdekoliv zmiňte **%{discobot_username}**."
+    timeout:
+      message: |-
+        Ahoj @%{username}, jen se ozývám, protože jsem od Vás nějakou dobu nic neslyšel.
+
+        - Pro pokračování mi kdykoliv odpovězte.
+
+        - Pokud byste chtěli tento krok přeskočit, řekněte "%{skip_trigger}".
+
+        - Pro opětovný začátek řekněte "%{reset_trigger}".
+
+        Pokud raději nechcete, je to taky OK. Jsem robot. Neraníte mé pocity. :sob:
+    dice:
+      trigger: "hodit"
+      invalid: |-
+        Omlouvám se, ale je matematicky nemožné hodit tuto kombinaci 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), já vím!
+      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: "citace"
+      '1':
+        quote: "Uprostřed každé těžkosti leží příležitost"
+        author: "Albert Einstein"
+      '2':
+        quote: "Nemá cenu mít svobodu, pokud nemáte svobodu dělat chyby."
+        author: "Mahatma Gandhi"
+      '3':
+        quote: "Neplačte proto, že je po všem, radujte se, protože se to stalo."
+        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!"
+    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 9ca8189621..a1c2479285 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.da.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.da.yml
@@ -5,4 +5,33 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-da: {}
+da:
+  site_settings:
+    discourse_narrative_bot_enabled: 'Aktiverer Discourse Botten'
+    disable_discourse_narrative_bot_welcome_post: "Deaktiver velkomst beskeden fra Discourse Botten"
+  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 1297a76dad..20345d59f2 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
@@ -52,7 +53,7 @@ de:
         quote: "In der Mitte von Schwierigkeiten liegen die Möglichkeiten."
         author: "Albert Einstein"
       '2':
-        quote: "Sei du selbst die Veränderung, die du dir wünschst für diese Welt."
+        quote: "Freiheit ist es nicht wert zu haben, wenn sie nicht einhergeht mit der Freiheit sich irren zu dürfen."
         author: "Mahatma Gandhi"
       '3':
         quote: "Weine nicht, weil es vorbei ist. Lächle, weil es passiert ist."
@@ -153,7 +154,7 @@ de:
           - Wir glauben an [zivilisiertes Community-Verhalten](/guidelines) zu allen Zeiten.
       onebox:
         instructions: |-
-          Als nächstes: Kannst du einen dieser Links mit mir teilen? Antworte mit **einem Link auf einer eigenen Zeile**, und er wird automatisch in eine hübsche, kurze Inhaltsangabe erweitert.
+          Als Nächstes: Kannst du einen dieser Links mit mir teilen? Antworte mit **einem Link auf einer eigenen Zeile**, und er wird automatisch in eine hübsche, kurze Inhaltsangabe erweitert.
 
           Um einen Link zu kopieren, tippe und halte auf mobilen Geräten, oder klicke rechts mit deiner Maus:
 
@@ -161,14 +162,22 @@ 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.
+          Schick! Das wird für die meisten <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16">-Links funktionieren. Denke daran, dass er auf einer _ganz eigenen_ Zeile stehen muss, ohne etwas davor oder dahinter.
         not_found: |-
-          Entschuldige bitte, ich konnte keinen Link in deiner Antwort finden! :cry:
+          Entschuldige bitte, ich konnte den Link in deiner Antwort nicht finden! :cry:
 
-          Kannst du versuchen, den folgenden Link auf einer eigenen Zeile in deine nächste Antwort einzufügen?
+          Kannst du versuchen, den folgenden Link auf einer eigenen Zeile in deine nächste Antwort hinzuzufügen?
 
-          - https://de.wikipedia.org/wiki/Hauskatze
+          <https://de.wikipedia.org/wiki/Exotische_Kurzhaarkatze>
       images:
+        instructions: |-
+          Hier ist ein Bild von einem Einhorn:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          Wenn du es magst (und wer würde das nicht), gehe voran und drücke die „Gefällt mir“-Schaltfläche :hear: unter diesem Beitrag, um mich dies wissen zu lassen.
+
+          Kannst du **mit einem Bild antworten?** Welches Bild spielt keine Rolle! Ziehe das Bild einfach ins Fenster, drücke die Hochladen-Schaltfläche, oder kopiere und füge es ein.
         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 lernen würdest, wähle <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> unten und <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **Lesezeichen auf diese Nachricht setzen**.  Wenn du das macht, gibt es vielleicht ein :gift: in deiner Zukunft!
         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 weh, ich sehe keine Lesezeichen in diesem Thema. Hast du das Lesezeichen unter jedme Beitrag gefunden? Verwende das „Mehr anzeigen“-Symbol <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">, um bei Bedarf weitere Aktionen anzuzeigen.
       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 gesehen, dass ich kleine Bilder in meinen Antworten verwendet habe :blue_car::dash:. Die heißen [Emoji](https://de.wikipedia.org/wiki/Emoji). 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="%{base_uri}/plugins/discourse-narrative-bot/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 keinen 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="%{base_uri}/plugins/discourse-narrative-bot/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,22 +261,22 @@ 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. Leg los und **melde diesen Beitrag** <img src="%{base_uri}/plugins/discourse-narrative-bot/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 anstößiger Beitrag wurde noch nicht gemeldet. :worried: Kannst du ihn als unangemessen **melden** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Vergiss nicht, die „Mehr anzeigen“-Schaltfläche <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> zu verwenden, um weitere Aktionen für den jeweiligen Beitrag einzublenden.
       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="%{base_uri}/plugins/discourse-narrative-bot/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.
+          Versuche, 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="%{base_uri}/plugins/discourse-narrative-bot/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.
         reply: |-
@@ -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="%{base_uri}/plugins/discourse-narrative-bot/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,20 +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="%{base_uri}/plugins/discourse-narrative-bot/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.
+          Wenn du einen Beitrag von dir zurückziehen möchtest, 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!
+          Leg’ los und **lösche** einen deiner Beiträge über die <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> **Löschen**-Aktion. Lösche aber bitte 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.
+          Ich sehe noch keine gelöschten Beiträge. Denk’ immer daran, dass <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> „Mehr anzeigen“ auch <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16">„Löschen“ anzeigt.
         reply: |-
           Oha! :boom:
 
@@ -327,11 +336,11 @@ de:
       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.
+          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**?
+          Kannst du mir einen Gefallen tun und ihn <img src="%{base_uri}/plugins/discourse-narrative-bot/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.
+          Hast du Schwierigkeiten? Denk daran, dass <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> „Mehr anzeigen“ auch die Aktion <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16">  „Wiederherstellen“ anzeigt.
         reply: |-
           Puh, das war knapp! Danke, dass du das korrigiert hast :wink:
 
@@ -364,11 +373,11 @@ 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.
+          Wusstest du, dass du eine Umfrage zu jedem Beitrag hinzufügen kannst? Versuche, das <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> Zahnrad im Editor zu verwenden, um **eine Umfrage zu erstellen**.
         not_found: |-
-          Hoppla! Da war keine Umfrage in deiner Antwort.
+          Oops! Es 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:
+          Verwende das <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> Zahnrad-Icon im Editor oder kopiere und füge die folgende Umfrage in deine nächste Antwort ein:
 
           ```text
           [poll]
@@ -385,19 +394,19 @@ de:
           [/poll]
       details:
         instructions: |-
-          Manchmal möchtest du vielleicht in deinen Antworten **Details ausblenden**:
+          Manchmal möchtest du vielleicht in deinen Antworten bestimmte **Details ausblenden**:
 
-          - Wenn du Handlungen eines Films oder einer TV-Serie diskutierst, die als Spoiler betrachtet werden könnten.
+          - Wenn du Handlungen eines Films oder einer TV-Serie diskutierst und dies als Spoiler betrachtet werden könnte.
 
           - 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.
+          1. Wähle das <img src="%{base_uri}/plugins/discourse-narrative-bot/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.
+          3. Bearbeite die Zusammenfassung der Details und füge deinen Inhalt hinzu.
           [/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?
+          Kannst du das <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> Zahnrad im Editor verwenden und einen Details-Abschnitt in deine nächste 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.el.yml b/plugins/discourse-narrative-bot/config/locales/server.el.yml
new file mode 100644
index 0000000000..0c7daab39f
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/server.el.yml
@@ -0,0 +1,428 @@
+# 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:
+    discourse_narrative_bot_enabled: 'Ενεργοποίηση Bot αφηγηματικού λόγου'
+    disable_discourse_narrative_bot_welcome_post: "Απενεργοποίηση του μηνύματος καλωσορίσματος από το bot αφηγηματικού λόγου"
+    discourse_narrative_bot_ignored_usernames: "Ονόματα χρηστών τα οποία το bot αφηγηματικού λόγου θα πρέπει να αγνοεί"
+    discourse_narrative_bot_disable_public_replies: "Απενεργοποίηση δημόσιων απαντήσεων από το bot αφηγηματικού λόγου"
+    discourse_narrative_bot_welcome_post_type: "Τύπος ανάρτησης καλωσορίσματος που θα πρέπει να αποστέλλει το bot αφηγηματικού λόγου"
+    discourse_narrative_bot_welcome_post_delay: "Περίμενε (n) δευτερόλεπτα μέχρι να στείλει το bot αφηγηματικού λόγου μήνυμα καλωσορίσματος"
+  badges:
+    certified:
+      name: Πιστοποιήθηκε
+      description: "Ολοκληρώθηκε ο οδηγός εκμάθησης νέου χρήστη"
+      long_description: |
+        Αυτό το παράσημο χορηγείται μετά την επιτυχή ολοκλήρωση της διαδραστικής εκμάθησης νέου χρήστη. Έχετε πάρει την πρωτοβουλία να μάθετε τα βασικά εργαλεία της συζήτησης, και τώρα είστε πιστοποιημένοι!
+    licensed:
+      name: Αδειοδοτήθηκε
+      description: "Ολοκληρώθηκε ο οδηγός εκμάθησης προχωρημένου χρήστη"
+      long_description: |
+        Αυτό το παράσημο χορηγείται μετά την επιτυχή ολοκλήρωση της διαδραστικής εκμάθησης για προχωρημένους χρήστες. Έχετε μάθει τα προηγμένα εργαλεία των συζητήσεων και έχετε την επίσημη άδεια χρήσης!
+  discourse_narrative_bot:
+    bio: "Γεια σου, δεν είμαι πραγματικό πρόσωπο - είμαι ένα robot που μπορεί όμως να σε διδάξει διάφορα χρήσιμα κόλπα και λειτουργίες της ιστοσελίδας. Για να επικοινωνήσεις μαζί μου, στείλτε μου απλά ένα μήνυμα ή ανέφερε**`@%{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: "Albert Einstein"
+      '2':
+        quote: "Δεν αξίζει η ελευθερία αν δεν είσαι ελεύθερος να κάνεις λάθη."
+        author: "Mahatma Gandhi"
+      '3':
+        quote: "Μην κλαις επειδή τελείωσε, χαμογέλα επειδή συνέβη."
+        author: "Dr Seuss"
+      '4':
+        quote: "Αν θέλεις κάτι να γίνει σωστά, κάντο μόνος σου."
+        author: "Charles-Guillaume Étienne"
+      '5':
+        quote: "Πίστεψε ότι μπορείς και έχεις ήδη καλύψει τον μισό δρόμο."
+        author: "Theodore Roosevelt"
+      '6':
+        quote: "Η ζωή είναι όπως ένα κουτί σοκολατάκια. Δεν μπορείς ποτέ να είσαι σίγουρος τι θα σου τύχει."
+        author: "Forrest Gump’s Mom"
+      '7':
+        quote: "Ένα μικρό βήμα για τον άνθρωπο, ένα γιγάντιο βήμα για την ανθρωπότητα."
+        author: "Neil Armstrong"
+      '8':
+        quote: "Κάνε κάθε μέρα κάτι που σε τρομάζει."
+        author: "Eleanor Roosevelt"
+      '9':
+        quote: "Τα λάθη πάντα συγχωρούνται, αρκεί να έχει κάποιος το κουράγιο να τα παραδεχτεί."
+        author: "Bruce Lee"
+      '10':
+        quote: "Ότι μπορεί να συλλάβει και να πιστέψει ο ανθρώπινος νους, μπορει να επιτευχθεί."
+        author: "Napoleon Hill"
+      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: 'start'
+      skip_trigger: 'skip'
+      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; Πριγκίπισσα Diana
+
+          `@%{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: "Σε αναγνώριση της επιτυχούς ολοκλήρωσης\nτης εκπαίδευσης νέου χρήστη."
+      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}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          Αν σου αρέσει (και σε ποιον δεν θα άρεζε) προχώρα και πάτα το κουμπί "Μου αρέσει" :heart: κάτω ακριβώς από την ανάρτηση για να το μάθω και εγώ.
+
+          Μπορείς να **απαντήσεις με μία εικόνα;** Οποιαδήποτε εικόνα μου κάνει! Κάνε μια εικόνα drag and drop, πάτα το κουμπί για ανέβασμα (upload) ή απλά κάνε copy - paste μια εικόνα στο πεδίο απάντησης.
+        reply: |-
+          Τέλεια εικόνα – πάτησα το κουμπί "Μου αρέσει" :heart: για να ξέρεις πόσο πολύ την εκτίμησα :heart_eyes:
+        like_not_found: |-
+          Μήπως ξέχασες να πατήσεις "Μου αρέσει" :heart: στην [ανάρτησή μου;](%{url}) :crying_cat_face:
+        not_found: |-
+          Μοιάζει να μην ανέβασες εικόνα, έτσι διάλεξα εγώ μια εικόνα που _πιστεύω_ θα σου αρέσει.
+
+          `%{image_url}`
+
+          Προσπάθησε να ανεβάσεις αυτήν στην συνέχεια ή κάνε paste τον σύνδεσμο μια εικόνας σε μια γραμμή από μόνο του!
+      formatting:
+        instructions: |-
+          Μπορείς να κάνεις κάποιες λέξεις **bold** ή _italic_ στην απάντησή σου;
+
+          - γράψε `**bold**` ή `_italic_`
+
+          - ή απλά πάτησε τα πλήκτρα <kbd><b>B</b></kbd> ή <kbd><i>I</i></kbd> στον editor
+        reply: |-
+          Τέλεια δουλειά! Μπορείς επίσης να χρησιμοποιήσεις HTML και BBCode για την διαμόρφωση του κειμένου – για να μάθεις περισσότερα, [διάβασε εδώ](http://commonmark.org/help) :nerd:
+        not_found: |-
+          Ωχ, δεν βρήκα φορμαρισμένο κείμενο στην απάντησή σου. :pencil2:
+
+          Μπορείς να δοκιμάσεις ξανά; Χρησιμοποίησε τα πλήκτρα <kbd><b>B</b></kbd> για bold ή <kbd><i>I</i></kbd> για italic στον editor για πιο εύκολα.
+      quoting:
+        instructions: |-
+          Μπορείς να δοκιμάσεις να παραθέσεις την ανάρτησή μου στην απάντησή σου, ώστε να ξέρω σε ποιο τμήμα της ανάρτησής μου ακριβώς αναφέρεσαι όταν απαντάς;
+
+          > Αν αυτός είναι καφές, τότε θέλω τσάι, αλλά αν αυτό είναι τσάι τότε θέλω καφέ.
+          >
+          > Όταν μιλάς στον εαυτό σου, είσαι σίγουρος ότι κάποιος σε ακούει.
+          >
+          > Κάποιοι άνθρωποι έχουν τον τρόπο τους με τις λέξεις, ενώ κάποιοι άλλοι... ε... δεν έχουν.
+
+          Επίλεξε όποια από τις παραπάνω φράσεις σου αρέσει περισσότερο και κάνε κλικ στο πλήκτρο "Παράθεση" το οποίο εμφανίζεται δίπλα στην επιλογή σου ή κάνε κλικ στο πλήκτρο απάντησης στο κάτω μέρος της ανάρτησης. Σε κάποιες φορητές συσκευές χρειάζεται να πατήσεις το πλήκτρο παράθεσης δύο φορές.
+
+          Κάτω από την παράθεσή σου, γράψε μερικά λόγια σχετικά με την επιλογή σου γιατί με τρώει η περιέργεια :thinking:
+        reply: |-
+          Τέλεια, διάλεξες την αγαπημένη μου φράση! :left_speech_bubble:
+        not_found: |-
+          Χμμμ μοιάζει να μην έκανες κάτι παράθεση στην απάντησή σου.
+
+          Επιλέγοντας ένα τμήμα από το κείμενο της ανάρτησής μου, εμφανίζεται το κουμπί <kbd>**Παράθεση**</kbd>. Επίσης πατώντας **Απάντηση** έχωντας πρώτα επιλέξει ένα τμήμα του κειμένου, είναι το ίδιο! Μπορείς να δοκιμάσεις ξανά;
+      bookmark:
+        instructions: |-
+          Αν θέλεις να μάθεις περισσότερα, διάλεξε <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> παρακάτω και <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **πρόσθεσε σελιδοδείκτη στο ΠΜ**.  Αν το κάνεις, θα λάβεις ένα :gift: σύντομα!
+        reply: |-
+          Καταπληκτικά! Τώρα μπορείς εύκολα να επιστρέψεις στην συνομιλία μας όποτε θελήσεις, απευθείας από [την καρτέλα σελιδοδεικτών του προφίλ σου](%{profile_page_url}/activity/bookmarks). Απλά κάνε κλικ στην εικόνα προφίλ σου στην πάνω δεξιά πλευρά &#8599;
+        not_found: |-
+          Ωχ, δεν βλέπω να έχουν προστεθεί σελιδοδείκτες σε αυτό το νήμα. Βλέπεις το κουμπί σελιδοδείκτη κάτω από κάθε ανάρτηση; Πάτα στο περισσότερα <img src="%{base_uri}/plugins/discourse-narrative-bot/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:`
+
+          - Πάτησε το ειδικό πλήκτρο των emoji <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> στην γραμμή εργαλείων του editor ή στο πληκτρολόγιο της φορητής σου συσκευής.
+        reply: |-
+          Αυτό είναι :sparkles: _emojiτέλειο!_ :sparkles:
+        not_found: |-
+          Ουπς, δεν βλέπω κάποιο Emoji στην απάντησή σου. Ω, όχι! :sob:
+
+          Γράψε μια άνω κάτω τελεία <kbd>:</kbd> για να εμφανιστεί ο επιλογέας των emoji και στην συνέχεια πληκτρολόγησε τα πρώτα γράμματα από αυτό που θέλεις να εμφανιστεί, όπως `:bird:`
+
+          Ή πάτα το πλήκτρο των emoji <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> στον editor.
+
+          (Αν είσαι σε φορητή συσκευή, μπορείς να βάλεις Emoji απευθείας από το πληκτρολόγιό σου.)
+      mention:
+        instructions: |-
+          Κάποιες στιγμές θέλεις να τραβήξεις την προσοχή ενός ατόμου, ακόμα και αν δεν απαντάς απευθείας σε αυτό. Γράψε `@` και στην συνέχεια συμπλήρωσε το όνομα του ατόμου στο οποίο θέλεις να αναφερθείς.
+
+          Μπορείς να αναφέρεις το **`@%{discobot_username}`** στην απάντησή σου;
+        reply: |-
+          _Με φώναξε κανείς;_ :raised_hand: Μάλλον εσύ! :wave:  Εδώ είμαι λοιπόν! Ευχαριστώ για την αναφορά.  :ok_hand:
+        not_found: |-
+          Δεν βρήκα αναφορά στο όνομά μου πουθενά στην απάντησή σου :frowning: Μπορείς να προσπαθήσεις να με αναφέρεις ξανά σαν `@%{discobot_username}`;
+      flag:
+        instructions: |-
+          Μας αρέσει οι συζητήσεις μας να έχουν φιλικό χαρακτήρα και θέλουμε την βοήθειά σου για να κρατήσουμε ένα [πολιτισμένο επίπεδο](%{guidelines_url}). Αν δεις ένα πρόβλημα, παρακαλούμε επισήμανέ το για να ενημερώσεις σχετικά τον συγγραφέα του ή τους [συνεργάτες της ιστοσελίδας](%{about_url}).
+
+          >  :imp: Εδώ γράφω κάτι πολύ κακό!
+
+          Φαντάζομαι ξέρεις τι πρέπει να κάνεις. Ξεκίνα και **επισήμανε αυτή την ανάρτηση** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> ως ανάρμοστη!
+        reply: |-
+          [Οι συνεργάτες μας](/groups/staff) θα ενημερωθούν ιδιωτικά για την επισήμανσή σου. Αν αρκετά μέλη της κοινότητας επισημάνουν μια ανάρτηση, τότε αυτή κρύβεται αυτόματα για λόγους ασφαλείας. (Επειδή στην πραγματικότητα δεν έγραψα κάτι κακό :angel:, πήρα την πρωτοβουλία και αφαίρεσα για την ώρα την επισήμανση που μου έκανες.)
+        not_found: |-
+          Ω όχι, η κακόβουλη ανάρτησή μου δεν έχει ακόμα επισημανθεί. :worried: Μπορείς να την επισημάνεις ώς ανάρμοστη πατώντας στην **σημαία** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">; Μην ξεχάσεις να κάνεις πρώτα κλικ στο πλήκτρο "περισσότερα" <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> για να εμφανιστούν οι επιπλέον επιλογές για την ανάρτηση.
+      search:
+        instructions: |-
+          _ψιτ_ … Έχω κρύψει μια έκπληξη σε αυτό το νήμα. Αν είσαι μέσα και σε τρώει η περιέργεια, **πάτα το εικονίδιο αναζήτησης** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> επάνω δεξιά &#8599; για να την ψάξεις.
+
+          Δοκίμασε να ψάξεις για τον όρο "capy&#8203;bara" σε αυτό το νήμα
+        hidden_message: |-
+          Πως αλήθεια σου ξέφυγε αυτός ο υδρόχειρος (capybara); :wink:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
+
+          Συνειδητοποίησες ότι έχεις επιστρέψει πίσω στην αρχή; Τάισε τον φτωχό και πεινασμένο υδρόχειρο **απαντώντας με το `:herb:` emoji** και αυτόματα θα μεταφερθείς στο τέλος.
+        reply: |-
+          Ναιιιι το βρήκες :tada:
+
+          - Για πιο εξειδικευμένες αναζητήσεις, πήγαινε στην σελίδα [πλήρους αναζήτησης](%{search_url}).
+
+          - Για να μεταφερθείς οπουδήποτε σε μια μεγάλη συζήτηση, δοκίμασε το χειριστήριο χρονολογίου στην δεξιά πλευρά (και κάτω σε φορητές συσκευές).
+
+          - Αν έχεις κανονικό :πληκτρολόγιο:, πάτα <kbd>?</kbd> για να δεις τις βολικές μας συντομεύσεις πληκτρολογίου.
+        not_found: |-
+          Χμμμ… μοιάζει να έχεις πρόβλημα και λυπάμαι για αυτό. Αναζήτησες <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> τον όρο **capy&#8203;bara**;
+      end:
+        message: |-
+          Ευχαριστώ που έμεινες μαζί μου @%{username}! Έφτιαξα αυτό για σένα και πιστεύω ότι σου αξίζει:
+
+          %{certificate}
+
+          Αυτά για την ώρα! Ρίξε μια ματιά [**στα τελευταία νήματα συζητήσεων**](/latest) ή στις [**κατηγορίες συζητήσεων**](/categories). :sunglasses:
+
+          (Αν θέλεις να μιλήσεις ξανά μαζί μου για να μάθεις περισσότερα, απλά στείλε μου ένα μήνυμα ή ανάφερέ `@%{discobot_username}` όποτε θελήσεις!)
+      certificate:
+        alt: 'Πιστοποιητικό Προόδου'
+    advanced_user_narrative:
+      reset_trigger: 'προχωρημένος χρήστης'
+      cert_title: "Σε αναγνώριση της επιτυχούς ολοκλήρωσης\nτης εκπαίδευσης προχωρημένου χρήστη"
+      title: ':arrow_up: Χαρακτηριστικά προχωρημένου χρήστη'
+      start_message: |-
+        Σαν _προχωρημένος_ χρήστης που είσαι, επισκέφθηκες την [σελίδα επιλογών](/my/preferences) του προφίλ σου @%{username}; Υπάρχουν διάφοροι τρόποι για να εξατομικεύσεις την εμπειρία σου, όπως για παράδειγμα να επιλέξεις ένα διαφορετικό θέμα.
+
+        Αλλά ας μην βγαίνω εκτός θέματος, ας ξεκινήσουμε!
+      edit:
+        bot_created_post_raw: "@%{discobot_username} είσαι το πιο φεβγάτο robot που έχω συναντήσει :wink:"
+        instructions: |-
+          Όλοι κάνουν λάθη. Αλλά μην ανησυχείς, μπορείς πάντα να επεξεργαστείς τις αναρτήσεις σου για να τις διορθώσεις!
+
+          Μπορείς να ξεκινήσεις κάνοντας **επεξεργασία** στην ανάρτηση που μόλις δημιούργησα για σένα;
+        not_found: |-
+          Δείχνει να μην έχεις επεξεργαστεί ακόμα την [ανάρτηση](%{url}) που έφτιαξα για σένα. Μπορείς να δοκιμάσεις ξανά;
+
+          Πάτα το εικονίδιο <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16"> για να ενεργοποιήσεις τον editor.
+        reply: |-
+          Άψογη δουλειά!
+
+          Σημείωσε ότι όποιες αλλαγές γίνουν μετά από τα πρώτα 5 λεπτά θα εμφανίζονται δημόσια ως αναθεωρήσεις και ένα μικρό εικονίδιο μολυβιού θα εμφανίζεται στην πάνω δεξιά γωνία με τον αριθμό των αναθεωρήσεων.
+      delete:
+        instructions: |-
+          Αν θέλεις να αποσύρεις μια ανάρτηση που έκανες, μπορείς να την διαγράψεις.
+
+          Προχώρα και **διέγραψε** οποιαδήποτε από τις παραπάνω αναρτήσεις σου πατώντας το κουμπί <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> **διαγραφή**. Μην διαγράψεις καλύτερα την πρώτη ανάρτηση!
+        not_found: |-
+          Δεν βλέπω να έχεις διαγράψει ακόμα κάποα ανάρτηση. Θυμήσου το <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> περισσότερα θα εμφανίσει την επιλογή <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> διαγραφής.
+        reply: |-
+          Γουάου! :boom:
+
+          Για να διατηρηθεί η συνέχεια των συζητήσεων, οι διαγραφές δεν είναι άμμεσες, έτσι η ανάρτηση θα αφαιρεθεί ύστερα από ένα χρονικό διάστημα.
+      recover:
+        deleted_post_raw: 'Γιατί το @%{discobot_username} διέγραψε την ανάρτησή μου; :anguished:'
+        instructions: |-
+          Ω όχι! Μάλλον κατά λάθος διέγραψα μια ανάρτηση που μόλις έφτιαξα για σένα.
+
+          Μπορείς να μου κάνεις την χάρη και να την <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> **επαναφέρεις**;
+        not_found: |-
+          Έχεις πρόβλημα; Θυμήσου το <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> περισσότερα θα εμφανίσει την επιλογή <img src="%{base_uri}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> γρανάζι στον editor για να **φτιάξεις μια δημοσκόπηση**.
+        not_found: |-
+          Ουπς! Δεν βρήκα δημοσκόπηση στην απάντησή σου.
+
+          Πάτα το <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> γρανάζι στον editor ή κάνε copy και paste την παρακάτω δημοσκόπηση στην απάντησή σου:
+
+          ```text
+          [poll]
+          * :γάτα:
+          * :σκύλος:
+          [/poll]
+          ```
+        reply: |-
+          Επ, ωραία δημοσκόπηση! Πως τα πάω με την εκπαίδευσή σου;
+
+          [poll]
+          * :+1:
+          * :-1:
+          [/poll]
+      details:
+        instructions: |-
+          Κάποιες στιγμές θέλεις να **κρύψεις λόγια** στις απαντήσεις σου:
+
+          - Όταν συζητούνται λεπτομέρειες από μια ταινία ή μια σειρά και αυτά που γράφεις μπορεί να θεωρηθούν σπόιλερ.
+
+          - Όταν η ανάρτησή σου περιλαμβάνει πολλές προεραιτικές πληροφορίες οι οποίες θα είναι πιθανώς κουραστικές αν διαβαστούν με την μία.
+
+          [details=Πάτα εδώ για να δεις πως λειτουργεί!]
+          1. Διάλεξε το <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> γρανάζι στον editor.
+          2. Επίλεξε "κρυφό τμήμα".
+          3. Επεξεργάσου τον τίτλο των λεπτομερειών και πρόσθεσε το περιεχόμενό σου.
+          [/details]
+
+          Μπορείς να πατήσεις το <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> γρανάζι στον editor και να προσθέσεις ένα κρυφό τμήμα στην επόμενη απάντησή σου;
+        not_found: |-
+          Έχεις πρόβλημα να προσθέσεις ένα κρυφό τμήμα στην απάντησή σου; Προσπάθησε να συμπεριλάβεις τα παρακάτω στην απάντησή σου:
+
+          ```text
+          [details=Διάλεξέ με για να με δεις]
+          Αυτό είναι το κρυφό τμήμα
+          [/details]
+          ```
+        reply: |-
+          Τέλεια δουλειά — η προσοχή σου στις _λεπτομέρειες_ είναι αξιοθαύμαστη!
+      end:
+        message: |-
+          Ολωκλήρωσες την εκπαίδευση ως _προχωρημένος χρήστης_ πράγματι :bow:
+
+          %{certificate}
+
+          Αυτό είναι ότι έχω για σένα.
+
+          Γεια σου για την ώρα! Αν νοιώσεις την ανάγκη να τα ξαναπούμε, στείλε μου απλά ένα μήνυμα :sunglasses:
+      certificate:
+        alt: 'Πιστοποιητικό Προόδου Προχωρημένου Χρήστη'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.en.yml b/plugins/discourse-narrative-bot/config/locales/server.en.yml
index e4313c386e..da2fd0c677 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.en.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.en.yml
@@ -51,7 +51,7 @@ en:
         quote: "In the middle of every difficulty lies opportunity"
         author: "Albert Einstein"
       "2":
-        quote: "You must be the change you wish to see in the world."
+        quote: "Freedom is not worth having if it does not connote freedom to err."
         author: "Mahatma Gandhi"
       "3":
         quote: "Don’t cry because it’s over, smile because it happened."
@@ -168,19 +168,19 @@ en:
           - https://en.wikipedia.org/wiki/Death_by_coconut
           - https://en.wikipedia.org/wiki/Calculator_spelling
         reply: |-
-          Cool! This will work for most <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16"> links. Remember, it must be on a line _all by itself_, with nothing else in front, or behind.
+          Cool! This will work for most <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> links. Remember, it must be on a line _all by itself_, with nothing else in front, or behind.
         not_found: |-
           Sorry, I couldn’t find the link in your reply! :cry:
 
           Can you try adding the following link, on its own line, in your next reply?
 
-          - https://en.wikipedia.org/wiki/Exotic_Shorthair
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
 
       images:
         instructions: |-
           Here’s a picture of a unicorn:
 
-          <img src="%{base_uri}/images/unicorn.png" width="520" height="520">
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
 
           If you like it (and who wouldn’t!) go ahead and press the like :heart: button below this post to let me know.
 
@@ -233,11 +233,11 @@ en:
 
       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!
+          If you’d like to learn more, select <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below  and <img src="%{base_uri}/plugins/discourse-narrative-bot/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: |-
           Excellent! Now you can easily find your way back to our private conversation any time, right from [the bookmarks tab on your profile](%{profile_page_url}/activity/bookmarks). Just select your profile picture at the upper right &#8599;
         not_found: |-
-          Uh oh, I don’t see any bookmarks in this topic. Did you find the bookmark under each post?  Use the show more <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> to reveal additional actions if needed.
+          Uh oh, I don’t see any bookmarks in this topic. Did you find the bookmark under each post?  Use the show more <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> to reveal additional actions if needed.
 
       emoji:
         instructions: |-
@@ -247,7 +247,7 @@ en:
 
           - Type colon <kbd>:</kbd> then complete the emoji name `:tada:`
 
-          - Press the emoji button <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> in the editor, or on your mobile keyboard
+          - Press the emoji button <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> in the editor, or on your mobile keyboard
         reply: |-
           That’s :sparkles: _emojitastic!_ :sparkles:
         not_found: |-
@@ -255,7 +255,7 @@ en:
 
           Try typing a colon <kbd>:</kbd> to bring up the emoji picker, then type the first few letters of what you want, such as `:bird:`
 
-          Or, press the emoji button <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> in the editor.
+          Or, press the emoji button <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> in the editor.
 
           (If you are on a mobile device, you can also enter Emoji directly from your keyboard, too.)
 
@@ -277,21 +277,21 @@ en:
 
           >  :imp: I wrote something nasty here
 
-          I guess you know what to do. Go ahead and **flag this post** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16"> as inappropriate!
+          I guess you know what to do. Go ahead and **flag this post** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> as inappropriate!
         reply: |-
           [Our staff](/groups/staff) will be privately notified about your flag. If enough community members flag a post, it will also be automatically hidden as a precaution. (Since I didn’t actually write a nasty post :angel:, I’ve gone ahead and removed the flag for now.)
         not_found: |-
-          Oh no, my nasty post hasn’t been flagged yet. :worried: Can you flag it as inappropriate using the **flag** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16">? Don’t forget to use the show more button <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> to reveal more actions for each post.
+          Oh no, my nasty post hasn’t been flagged yet. :worried: Can you flag it as inappropriate using the **flag** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Don’t forget to use the show more button <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> to reveal more actions for each post.
 
       search:
         instructions: |-
-          _psst_ … I’ve hidden a surprise in this topic. If you’re up for the challenge, **select the search icon** <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> at the top right &#8599; to search for it.
+          _psst_ … I’ve hidden a surprise in this topic. If you’re up for the challenge, **select the search icon** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> at the top right &#8599; to search for it.
 
           Try searching for the term "capy&#8203;bara" in this topic
         hidden_message: |-
           How did you miss this capybara? :wink:
 
-          <img src="%{base_uri}/images/capybara-eating.gif"/>
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
 
           Did you notice you’re now back at the beginning? Feed this poor hungry capybara by **replying with the `:herb:` emoji** and you’ll be automatically taken to the end.
         reply: |-
@@ -303,7 +303,7 @@ en:
 
           - If you have a physical :keyboard:, press <kbd>?</kbd> to view our handy keyboard shortcuts.
         not_found: |-
-          Hmm… looks like you might be having trouble. Sorry about that. Did you search <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> for the term **capy&#8203;bara**?
+          Hmm… looks like you might be having trouble. Sorry about that. Did you search <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> for the term **capy&#8203;bara**?
 
       end:
         message: |-
@@ -336,7 +336,7 @@ en:
         not_found: |-
           It looks like you’ve yet to edit the [post](%{url}) I created for you. Can you try again?
 
-          Use the <img src="%{base_uri}/images/font-awesome-pencil.png" width="16" height="16"> icon to bring up the editor.
+          Use the <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16"> icon to bring up the editor.
         reply: |-
           Great work!
 
@@ -346,9 +346,9 @@ en:
         instructions: |-
           If you’d like to withdraw a post you made, you can delete it.
 
-          Go ahead and **delete** any of your posts above by using the <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> **delete** action. Don’t delete the first post, though!
+          Go ahead and **delete** any of your posts above by using the <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> **delete** action. Don’t delete the first post, though!
         not_found: |-
-          I don’t see any deleted posts yet? Remember <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.
+          I don’t see any deleted posts yet? Remember <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> show more will reveal <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> delete.
         reply: |-
           Whoa! :boom:
 
@@ -359,9 +359,9 @@ en:
         instructions: |-
           Oh no! It looks like I accidentally deleted a new post that I just created for you.
 
-          Can you do me a favor and <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> **undelete** it?
+          Can you do me a favor and <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> **undelete** it?
         not_found: |-
-          Having trouble? Remember <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> show more will reveal <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> undelete.
+          Having trouble? Remember <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> show more will reveal <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> undelete.
         reply: |-
           Phew, that was a close one! Thanks for fixing that :wink:
 
@@ -397,11 +397,11 @@ en:
 
       poll:
         instructions: |-
-          Did you know you can add a poll to any post? Try using the <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> gear in the editor to **build a poll**.
+          Did you know you can add a poll to any post? Try using the <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> gear in the editor to **build a poll**.
         not_found: |-
           Whoops! There wasn’t any poll in your reply.
 
-          Use the <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> gear icon in the editor, or copy and paste this poll in your next reply:
+          Use the <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> gear icon in the editor, or copy and paste this poll in your next reply:
 
           ```text
           [poll]
@@ -425,12 +425,12 @@ en:
           - When your post needs lots of optional details that may be overwhelming when read all at once.
 
           [details=Select this to see how it works!]
-          1. Select the <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> gear in the editor.
+          1. Select the <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> gear in the editor.
           2. Select "Hide Details".
           3. Edit the details summary and add your content.
           [/details]
 
-          Can you use the <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> gear in the editor to add a details section to your next reply?
+          Can you use the <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> gear in the editor to add a details section to your next reply?
         not_found: |-
           Having trouble creating a details widget? Try including the following in your next reply:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.es.yml b/plugins/discourse-narrative-bot/config/locales/server.es.yml
index e6e087f909..a36baf1741 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
@@ -24,7 +25,7 @@ es:
       long_description: |
         Este distintivo se otorga a quienes han completado el tutorial de usuario avanzado. Has dominado las herramientas avanzadas de discusión — y ahora tú eres un licenciado!
   discourse_narrative_bot:
-    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."
+    bio: "Hola, no soy una persona real. Soy un bot que puede enseñarte sobre este sitio. Para interactuar conmigo, envíame un mensaje o menciona **`@%{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.
@@ -44,14 +45,14 @@ es:
       out_of_range: |-
         ¿Sabías que el máximo número de lados para que un dado, matemáticamente correcto, es de 120 lados?
       results: |-
-        > :game_die: tirada de dados: %{results}
+        > :game_die: %{results}
     quote:
       trigger: "citar"
       '1':
         quote: "In the middle of every difficulty lies opportunity"
         author: "Albert Einstein"
       '2':
-        quote: "You must be the change you wish to see in the world."
+        quote: "La libertad no vale la pena si no conlleva libertad para equivocarse."
         author: "Mahatma Gandhi"
       '3':
         quote: "Don’t cry because it’s over, smile because it happened."
@@ -110,9 +111,9 @@ es:
       help_trigger: 'mostrar ayuda'
       random_mention:
         reply: |-
-          ¿Alguien me llamó? Averigua qué puedo hacer con `@%{discobot_username} %{help_trigger}`.
+          ¡Hola! Para ver lo que puedo hacer, di `@%{discobot_username} %{help_trigger}`.
         tracks: |-
-          Hola! Estoy conociendo cómo hacer las siguientes cosas:
+          Ahora mismo puedo hacer lo siguiente:
 
           `@%{discobot_username} %{reset_trigger} %{default_track}`
           > Inicia una de las siguientes narraciones interactivas: %{tracks}.
@@ -127,11 +128,11 @@ es:
           > :crystal_ball: No se puede predecir ahora
       do_not_understand:
         first_response: |-
-          Hey, gracias por tu respuesta!
+          Oye, ¡gracias por tu respuesta!
           Lamentablemente, como un robot con programación muy pobre, no he podido entender lo que me has dicho. :frowning:
         track_response: Puedes intentarlo de nuevo, o bien para saltar este paso, dime `%{skip_trigger}`. Para empezar de nuevo, dime `%{reset_trigger}`.
         second_response: |-
-          Aw, lo siento. Sigo sin entenderlo. :anguished:
+          Vaya, lo siento. Sigo sin entenderlo. :anguished:
 
           Soy solo un robot, pero si quieres contactar a una persona real, mira [nuestra página de contacto](/about).
 
@@ -140,124 +141,136 @@ es:
       reset_trigger: "usuario nuevo"
       cert_title: "En reconocimiento de la finalización exitosa del tutorial de usuario nuevo"
       hello:
-        title: ":robot: Saludos!"
+        title: ":robot: ¡Saludos!"
         message: |-
-          Gracias por unirte a %{title}, y bienvenido!
+          Gracias por unirte a %{title}, ¡te damos la bienvenida!
 
           - Soy solo un robot, pero [nuestro amigable staff](/about) está también aquí para ayudar si necesitas contactar a una persona.
 
-          - Por razones de seguridad, nosotros temporalmente limitamos lo que los nuevos usuarios pueden hacer. Tú podrás ganar nuevas habilidades (y [distintivos](/badges)) cuando te vayamos conociendo.
+          - Por razones de seguridad, limitamos temporalmente lo que los nuevos usuarios pueden hacer. Podrás ganar nuevas habilidades (y [distintivos](/badges)) conforme te vayamos conociendo.
 
-          - Nosotros creemos en el [comportamiento de una comunidad civilizada](/guidelines) en todo momento.
+          - Creemos en el [comportamiento de una comunidad civilizada](/guidelines) en todo momento.
       onebox:
         instructions: |-
-          Ahora, tú puedes compartir uno de estos enlaces conmigo? Responde con **el enlace propiamente dicho**, y automáticamente se expandirá con un breve resumen.
-          Para copiar un enlace, toca y mantiene presionado en el móvil, o haz clic derecho con tu mouse:
+          Ahora, ¿puedes compartir uno de estos enlaces conmigo? Responde con **el enlace propiamente dicho**, y automáticamente se expandirá con un breve resumen.
+          Para copiar un enlace, toca y mantén presionado en el móvil, o haz clic derecho con tu ratón:
 
           - https://en.wikipedia.org/wiki/Inherently_funny_word
           - 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}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> enlaces. Recuerda que el enlace debe ser colocado  en una _linea aparte_, sin texto ni espacios delante ni detrás del enlace.
         not_found: |-
-          Disculpa, no he podido encontrar el enlace en tu respuesta! :cry:
+          Disculpa, ¡no he podido encontrar el enlace en tu respuesta! :cry:
 
-          Puedes intentar agregar el siguiente enlace, en una linea aparte, en tu siguiente respuesta?
+          ¿Puedes intentar agregar el siguiente enlace, en una línea aparte, en tu siguiente respuesta?
 
-          - https://en.wikipedia.org/wiki/Exotic_Shorthair
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
       images:
+        instructions: |-
+          Aquí la imagen de un unicornio:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+
+          Si te gusta (y a quién no) presiona el botón "me gusta" :heart: debajo del mensaje para hacerme saber que te ha gustado.
+
+          ¿Puedes **responder con otra imagen??** ¡Cualquier imagen! Arrastra y suelta la imagen desde tu PC al editor, o bien pulsa 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:
+          Elegante imagen – Le he dado al botón :heart: "Me gusta" para hacerte saber cuánto la aprecio :heart_eyes:
         like_not_found: |-
-          Te olvidaste de dar "me gusta" :heart: a mi [post?](%{url}) :crying_cat_face:
+          ¿Te olvidaste de dar "me gusta" :heart: a mi [post?](%{url}) :crying_cat_face:
         not_found: |-
-          Parece que no subiste ninguna imagen, así que he elegido una imagen que estoy _seguro_ que disfrutarás.
+          Parece que no has subido ninguna imagen, así que he elegido una imagen que estoy _seguro_ que disfrutarás.
           `%{image_url}`
           Trata de subir esta ahora, o bien copia el enlace de la imagen y pega el mismo en una única línea dentro del mensaje!
       formatting:
         instructions: |-
-          ¿Puedes hacer algunas letras en **negrita** o _cursiva_ en tu respuesta?
+          ¿Puedes poner 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
+          - o, pulsa los botones <kbd><b>B</b></kbd> o <kbd><i>I</i></kbd> en el editor
         reply: |-
-          Buen trabajo! HTML y BBCode también funcionan para darle formato al texto – aprende más en, [este tutorial](http://commonmark.org/help) :nerd:
+          ¡Buen trabajo! HTML y BBCode también funcionan para darle formato al texto – aprende más en [este tutorial](http://commonmark.org/help) :nerd:
         not_found: |-
-          Aww, no encontré ningún texto con formato en tu respuesta. :pencil2:
+          Vaya, no he encontrado ningún texto con formato en tu respuesta. :pencil2:
 
-          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.
+          ¿Lo 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 darle formato al texto.
       quoting:
         instructions: |-
-          ¿Puedes intentar citarme cuando me respondes, así sé exactamente qué parte estás respondiendome?
+          ¿Puedes intentar citarme cuando me respondas, así sé exactamente a 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:
+
+          Debajo de la cita, escribe una palabra o dos sobre por qué has escogido esa cita, que tengo curiosidad :thinking:
         reply: |-
-          Buen trabajo, elegiste mi cita favorita! :left_speech_bubble:
+          Buen trabajo, ¡has elegido mi cita favorita! :left_speech_bubble:
         not_found: |-
-          Hmm me parece que no me has citado en tu respuesta!?
+          Hmm, ¿me parece que no me has citado en tu respuesta?
           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 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> y <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **guarda como favorito este mensaje privado**.  Si lo haces, ¡podrá haber 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;
+          ¡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.
+          Oh, oh,  no veo ningún mensaje guardado en este tema. ¿Encontraste el botón para guardar debajo de cada mensaje?  Usa el mostrar más <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> para que aparezcan acciones adicionales si 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:
+          A lo mejor me has visto usar pequeñas imágenes en mis respuestas :blue_car::dash: estos se llaman [emoji](https://es.wikipedia.org/wiki/Emoji). ¿Puedes **añadir un emoji** a tu próxima respuesta? Cualquiera de estos 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}/plugins/discourse-narrative-bot/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:
+          Eso es :sparkles: _¡emojitástico!_ :sparkles:
         not_found: |-
-          Oops, no veo ningún Emoji en tu respuesta? Oh no! :sob:
+          Vaya, ¡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, pulsa en botón <img src="%{base_uri}/plugins/discourse-narrative-bot/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.
-          Puedes mencionar **`@%{discobot_username}`** en tu respuesta?
+          A veces, quieres captar la atención de alguien en un debate, incluso aunque no le estés respondiendo a su mensaje directamente. Para esto, escribe `@` seguido del nombre del usuario que quieres mencionar.
+          ¿Puedes mencionar **`@%{discobot_username}`** en tu respuesta?
         reply: |-
-          _Alguien dijo mi nombre!?_ :raised_hand: Creo que tú lo hiciste! :wave:  Bien, aquí estoy! Gracias por mencionarme.  :ok_hand:
+          _¿¡Alguien ha dicho mi nombre!?_ :raised_hand: Creo que tú lo hiciste! :wave:  Bien, ¡aquí estoy! Gracias por mencionarme.  :ok_hand:
         not_found: |-
           No veo que hayas dicho mi nombre en ningún lugar. :frowning: ¿Puedes intentar mencionarme como `@%{discobot_username}` de nuevo por favor?
 
           (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 discusiones amistosas 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 bien 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}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/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"/>
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/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 que estás en problemas. Lo siento. ¿Buscaste <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> la palabra **capy&#8203;bara**?
       end:
         message: |-
           Gracias por quedarte conmigo @%{username}! Hice esto por tí, creo que te lo has ganado:
@@ -276,7 +289,7 @@ es:
 
           ¡Eso es todo por ahora! Echa un vistazo a [**nuestros últimos temas de discusión**](/latest) o las [**categorías de debate**](/categories). :sunglasses:
 
-          (Si deseas hablar conmigo de neuvo para aprender más, solo envia un mensaje o me mencionas `@%{discobot_username}` en cualquier momento!)
+          (Si deseas hablar conmigo de nuevo para aprender más, solo envía un mensaje privado o me mencionas `@%{discobot_username}` en cualquier momento!)
       certificate:
         alt: 'Certificado de logro'
     advanced_user_narrative:
@@ -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?
+
+          Usa el icono <img src="%{base_uri}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/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 algún post aún? Recuerda presionar <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> para que aparezca el botón  <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> para borrar.
         reply: |-
           Whoa! :boom:
 
@@ -310,10 +325,11 @@ 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 por favor presionar el botón <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> y **des-borrarlo**?
         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}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> para mostrar más opciones y aparecerá el botón <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> para recuperar un mensaje borrado.
         reply: |-
           Phew, ¡eso estuvo cerca! Gracias por solucionarlo :wink:
 
@@ -342,11 +358,11 @@ es:
           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: |-
-          ¿Sabes que puedes agregar una encuesta en cualquier mensaje? Intenta usando el botón de engranaje <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> en el editor para **armar una encuesta**.
+          ¿Sabes que puedes agregar una encuesta en cualquier mensaje? Intenta usando el botón de engranaje <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> en el editor para **armar una encuesta**.
         not_found: |-
           Whoops! No hubo ninguna encuesta en tu respuesta.
 
-          Usa el ícono de engranaje: <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> en el editor, o bien copia y pega esta encuesta en tu próxima respuesta:
+          Usa el icono de engranaje: <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> en el editor, o bien copia y pega esta encuesta en tu próxima respuesta:
 
           ```text
           [poll]
@@ -366,15 +382,15 @@ 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.
+          1. Selecciona el botón de engranaje <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> en el editor.
           2. Selecciona "Hide Details".
           3. Edita los detalles, y agrega el contenido que desees ocultar.
           [/details]
 
-          ¿Puedes usar el botón de engranaje <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> en el editor para agregar datos ocultos en tu próxima respuesta?
+          ¿Puedes usar el botón de engranaje <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> en el editor para agregar datos ocultos en tu próxima respuesta?
         not_found: |-
           ¿Tiene problemas para crear un widget de detalles? Trate de incluir lo siguiente en su siguiente respuesta:
 
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 17cc868595..3fad299411 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,257 @@ 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:
+      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) یک تاسی که از لحاظ ریاضی عادلانه باشد، ۱۲۰ وجه است؟
+      results: |-
+        >  :game_die: %{results}
     quote:
+      trigger: "نقل قول"
+      '1':
+        quote: "در میان هر سختی، فرصتی نهفته است."
+        author: "آلبرت انیشتین"
+      '2':
+        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:
+      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
+        not_found: |-
+          متاسفم، نمیتوانم پیوند را در پاسخ شما پیدا کنم! :cry:
+
+          میتونی یک بار دیگر لینکی که در ادامه می‌آید را در یک خط جداگانه در پاسخ بعدی ات قرار بدهی؟
+
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
+      images:
+        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:
+        reply: |-
+          عالی! الان تو میتوانی راه برگشت به این پیغام خصوصی را هر زمان که دوست داشتی از [برگه‌ی نشانک‌ها در پروفایل کاربری](%{profile_page_url}/activity/bookmarks)  پیدا کنی. فقط کافی است که روی عکس پروفایل خود در بالا سمت چپ انتخاب کنی &#8598;
+      emoji:
+        reply: |-
+          :sparkles: خیلی شکلک شگفت انگیزی بود :sparkles:
+      mention:
+        instructions: |-
+          شاید گاهی اوقات بخواهی که توجه شخصی را، اگرچه در حال پاسخ دادن به ایشان نیستی، جلب کنی. بنویس `@` و سپس نام کاربری ایشان را کامل کن که به ایشان اشاره کنی.
+
+          میتوانی به **`@%{discobot_username}`** در پاسخت اشاره کنی؟
+        reply: |-
+          _کسی منو صدا زد!؟_ :raised_hand: فکر کنم شما بودی! :wave: خوب، من اینجا هستم! متشکرم که به من اشاره کردی.  :ok_hand:
+        not_found: |-
+          من اسم خودم را هیچ جا پیدا نکردم. :frowning: آیا میتوانی دوباره تلاش کنی که به اسم من  `@%{discobot_username}` اشاره کنی؟
+      flag:
+        reply: |-
+          [کارکنان ما](/groups/staff) به طور خصوصی از پرچم گذاری شما آگاه می‌شوند. اگر اعضای تالار به تعداد کافی یک نوشته را پرچم گذاری کنند، آن نوشته به عنوان پیشگیری خود به خود پنهان می‌شود. (به خاطر اینکه من در حقیقت چیز زشتی ننوشتم :angel: خودم پرچم گذاری شما را فعلا پاک کردم.)
+      search:
+        reply: |-
+          بله پیداش کردی :tada:
+
+          - برای جستجو کردن با جزئیات بیشتر به [صفحه‌ی جستجو](%{search_url})  برو.
+
+          - برای پرش به هر قسمتی از یک مبحث دراز، از کنترل‌کننده های زمانی سمت چپ (یا پایین در موبایل) استفاده بکن.
+
+          - اگر یه صفحه کلید فیزیکی داری، <kbd>؟</kbd> رو فشار بده تا میانبرهای بدردبخوری که داریم را مشاهده کنی.
+      certificate:
+        alt: 'گواهی موفقیت'
+    advanced_user_narrative:
+      reset_trigger: 'کاربر حرفه‌ای'
+      cert_title: "با توجه به اتمام موفقیت آمیز راهنمای جدید کاربران"
+      title: ':arrow_up: ویژگی‌های کاربر حرفه‌ای'
+      edit:
+        bot_created_post_raw: "@%{discobot_username} تاکنون باحال ترین رباتی بوده که من شناختم :wink:"
+      category_hashtag:
+        reply: |-
+          عالی! به یاد داشته باش که این مورد برای دسته_و_برچسب، اگر برچسب ها فعال باشند، کار می‌کند.
+      change_topic_notification_level:
+        not_found: |-
+          به نظر میرسد که هنوز در حال مشاهده‌ی :eyes: این مبحث هستی! اگر هنوز در پیدا کردن آن مشکل داری، دکمه‌ی سطح آگاه‌سازی در زیر همسن مبحث قرار گرفته است.
+      poll:
+        reply: |-
+          هی، عجب نظرسنجی جالبی! آیا از آموزش‌های من خوشت آمد؟
+
+          [poll]
+          * :+1:
+          * :-1:
+          [/poll]
+      details:
+        reply: |-
+          آفرین — توجه تو به _جزئیات_ قابل ستایش هست.
+      certificate:
+        alt: 'گواهی موفقیت کاربران پیگیر حرفه ای'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fi.yml b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
index ac35ac325d..594b14b756 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fi.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
@@ -162,18 +162,18 @@ 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}/plugins/discourse-narrative-bot/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:
 
           Kokeilepa lisätä tämä linkki seuraavaan vastaukseesi, omalle rivilleen.
 
-          - https://fi.wikipedia.org/wiki/Eksoottinen_lyhytkarva
+          <https://fi.wikipedia.org/wiki/Eksoottinen_lyhytkarva>
       images:
         instructions: |-
           Tämä on kuva yksisarvisesta:
 
-          <img src="%{base_uri}/images/unicorn.jpg" width="520" height="381">
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/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.
 
@@ -222,11 +222,11 @@ fi:
           <kbd>**Lainaa**</kbd>-painike ilmestyy, kun maalaat viestini tekstiä. **Vastaa**-painike käy yhtä hyvin, jos sinulla on tekstiä maalattuna. Kokeilisitko uudelleen?
       bookmark:
         instructions: |-
-          Jos haluat oppia lisää, valitse <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> tämän alta ja <img src="%{base_uri}/images/font-awesome-bookmark.png" width="16" height="16"> **lisää tämä yksityisviestiketju kirjanmerkkeihisi**.  Jos teet niin, sinua voi odottaa :gift: tulevaisuudessa!
+          Jos haluat oppia lisää, valitse <iimg src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> tämän alta ja <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **lisää tämä yksityisviestiketju kirjanmerkkeihisi**.  Jos teet niin, sinua voi odottaa :gift: tulevaisuudessa!
         reply: |-
           Erinomaista! Löydät yksityiskeskustelumme nyt helposti koska vain [profiilisi kirjanmerkkivälilehdeltä](%{profile_page_url}/activity/bookmarks). Klikkaat vain profiilikuvaasi oikeassa yläkulmasssa &#8599;
         not_found: |-
-          Tuota noin, et ole mielestäni kirjanmerkinnyt tämän ketjun viestejä. Löysithän kirjanmerkkikuvakkeen kunkin viestin alta? Voi olla, että sinun täytyy klikata <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16">-kuvaketta, jotta näet sen ja muita toimintoja.
+          Tuota noin, et ole mielestäni kirjanmerkinnyt tämän ketjun viestejä. Löysithän kirjanmerkkikuvakkeen kunkin viestin alta? Voi olla, että sinun täytyy klikata <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">-kuvaketta, jotta näet sen ja muita toimintoja.
       emoji:
         instructions: |-
           Tapaan käyttää pieniä kuvia :blue_car::dash: viesteissäni; ne ovat [emojeja](https://fi.wikipedia.org/wiki/Emoji). **Laitapa joku emoji** vastausviestiisi. On useita tapoja:
@@ -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}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16">
         reply: |-
           :sparkles: _Emojinomaista!_ :sparkles:
         not_found: |-
@@ -243,7 +243,7 @@ fi:
 
           Saat emojivalitsimen esiin näppäilemällä kaksoispisteen <kbd>:</kbd>. Ala kirjoittaa sen perään englanniksi millaisen emojin haluat - esimerkiksi lintu on `:bird:`
 
-          Voit myös painaa editorin emojikuvaketta <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16">.
+          Voit myös painaa editorin emojikuvaketta  <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16">.
 
           (Mobiililaitteella voit lisätä emojin suoraan näppäimistöltäsikin.)
       mention:
@@ -263,20 +263,20 @@ fi:
 
           >  :imp: Kirjoitin tähän jotain tuhmaa.
 
-          Tiedät mitä tehdä. **Liputa tämä viesti** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16"> sopimattomaksi!
+          Tiedät mitä tehdä. **Liputa tämä viesti** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> sopimattomaksi!
         reply: |-
           [Henkilökuntamme](/groups/staff) saa ei-julkisen ilmoituksen lipusta. Jos riittävän moni yhteisön jäsen liputtaa viestin, sekin riittää viestin automaattiseen piilottamiseen varotoimena. (Koska en oikeasti kirjoittanut mitään tuhmaa :angel:, menin ja poistin liputuksesi.)
         not_found: |-
-          Oi voi, tuhmaa viestiäni ei ole vielä liputettu. :worried: Voitko liputtaa sen sopimattomaksi **lippupainikkeen** avulla <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16">? Don’t forget to use the show more button <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> to reveal more actions for each post.
+          Oh no, my nasty post hasn’t been flagged yet. :worried: Can you flag it as inappropriate using the **flag** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Don’t forget to use the show more button <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> to reveal more actions for each post.
       search:
         instructions: |-
-          _psst_ … Tein pienen jekun tähän ketjuun. Jos olet valmis ottamaan haasteen vastaan, oikealla ylhäällä &#8599; on **hakukuvake** <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16">, jolla voit yrittää löytää sen.
+          _psst_ … I’ve hidden a surprise in this topic. If you’re up for the challenge, **select the search icon** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> at the top right &#8599; to search for it.
 
-          Etsi hakusanaa "kapy&#8203;bara" tästä ketjusta
+          Try searching for the term "capy&#8203;bara" in this topic
         hidden_message: |-
           Miten sinulta jäi tämä kapybara huomaamatta? :wink:
 
-          <img src="%{base_uri}/images/capybara-eating.gif"/>
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
 
           Huomasitko, että palasit takaisin alkuun? Ruoki söpöä nälkäistä kapybaraa **vastaamalla `:herb:` -emojilla** niin sinut palautetaan automaattisesti takaisin loppuun.
         reply: |-
@@ -288,7 +288,7 @@ fi:
 
           - Jos sinulla on fyysinen :keyboard:, tarkastele käteviä näppäinoikoteitä painamalla <kbd>?</kbd>.
         not_found: |-
-          Hm… sinulla vaikuttaa olevan vaikeuksia. Pahoitteluni. Haitko <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> hakusanalla **kapy&#8203;bara**?
+          Hm… sinulla vaikuttaa olevan vaikeuksia. Pahoitteluni. Haitko <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> hakusanalla **kapy&#8203;bara**?
       end:
         message: |-
           Kiitos kun jaksoit loppuun asti @%{username}! Tein tämän sinulle, minusta olet ansainnut sen:
@@ -317,7 +317,7 @@ fi:
         not_found: |-
           Näyttää, ettet vielä muokannut [viestiä](%{url}), jonka tein puolestasi. Yrittäisitkö uudelleen?
 
-          Palaa viestieditoriin klikkaamalla <img src="%{base_uri}/images/font-awesome-pencil.png" width="16" height="16">-kuvaketta.
+          Palaa viestieditoriin klikkaamalla <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16">-kuvaketta.
         reply: |-
           Hyvin tehty!
 
@@ -326,9 +326,9 @@ fi:
         instructions: |-
           Jos haluat perua viestisi, voit poistaa sen.
 
-          Anna mennä ja **poista** yltä mikä tahansa viestisi <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> poista-toiminnon avulla. Älä kuitenkaan erehdy poistamaan ketjun ensimmäistä viestiä!
+          Anna mennä ja **poista** yltä mikä tahansa viestisi <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> poista-toiminnon avulla. Älä kuitenkaan erehdy poistamaan ketjun ensimmäistä viestiä!
         not_found: |-
-          Minusta viestejä ei vielä poistettu? Muista, että <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> näytä lisää -kuvake paljastaa <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> poista-kuvakkeen.
+          Minusta viestejä ei vielä poistettu? Muista, että <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> näytä lisää -kuvake paljastaa <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> poista-kuvakkeen.
         reply: |-
           Vau! :boom:
 
@@ -338,9 +338,9 @@ fi:
         instructions: |-
           Voi ei! Taisin vahingossa poistaa viestin, jonka tein sinun nimissäsi.
 
-          Tekisitkö palveluksen ja <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> **palauttaisit** sen?
+          Tekisitkö palveluksen ja <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> **palauttaisit** sen?
         not_found: |-
-          Onko ongelmia? Muista, että <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> näytä lisää -kuvake paljastaa <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> palauta-kuvakkeen.
+          Onko ongelmia? Muista, että <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> näytä lisää -kuvake paljastaa <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> palauta-kuvakkeen.
         reply: |-
           Huh, sydäntä kylmäsi! Kiitos, kun korjasit mokani. :wink:
 
@@ -373,11 +373,11 @@ fi:
           Huomioi, että kun vastaat ketjuun tai luet sitä kauemmin kuin muutaman minuutin ajan, se saa automaattisesti ilmoitustasokseen 'seurataan'. Tätä voi säätää [käyttäjäasetuksissa](/my/preferences).
       poll:
         instructions: |-
-          Tiesitkö, että viesteihin voi lisätä äänestyksiä? **Luo äänestys** valitsemalla viestieditorin <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> hammasrataskuvake.
+          Tiesitkö, että viesteihin voi lisätä äänestyksiä? **Luo äänestys** valitsemalla viestieditorin <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> hammasrataskuvake.
         not_found: |-
           Ups! Vastauksessasi ei ollut äänestystä.
 
-          Käytä editorin <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> hammasrataskuvaketta tai kopioi tämä äänestys ja liitä se seuraavaan vastaukseesi:
+          Käytä editorin <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> hammasrataskuvaketta tai kopioi tämä äänestys ja liitä se seuraavaan vastaukseesi:
 
           ```text
           [poll]
@@ -400,13 +400,13 @@ 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!]
-          1. Valitse editorin <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> hammasrataskuvake.
+          [details=Napauta niin näet kuinka se toimii!]
+          1. Valitse editorin <img src="%{base_uri}/plugins/discourse-narrative-bot/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ö.
           [/details]
 
-          Piilottaisitko yksityiskohtia editorin <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> hammasrataskuvakkeen avulla seuraavasta vastauksestasi?
+          Piilottaisitko yksityiskohtia editorin <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> hammasrataskuvakkeen avulla seuraavasta vastauksestasi?
         not_found: |-
           Onko ongelmia yksityiskohtatoiminnon kanssa? Kokeilepa laittaa tämä seuraavaan vastaukseesi:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fr.yml b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
index 679d432c30..d1063d5281 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
@@ -26,21 +26,33 @@ 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"
       '2':
-        quote: "Vous devez être le changement que vous voulez voir dans ce monde."
         author: "Mahatma Gandhi"
       '3':
         quote: "Ne pleurez pas parce que c'est fini, souriez parce que c'est arrivé !"
@@ -49,6 +61,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 +73,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 +117,104 @@ 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
+        not_found: |-
+          Désolé, je n'ai pas pu trouvé le lien dans votre réponse ! :cry:
+
+          Pouvez-vous essayer d'ajouter le lien suivant, sur une seule ligne, dans votre prochaine réponse ?
+
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
+      images:
+        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:
+        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;
+      emoji:
+        reply: |-
+          C'est :sparkles: _emojitastic !_ :sparkles:
       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 +222,116 @@ 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:
+        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.)
+      search:
+        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.
+      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?
+        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:
+        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:'
+        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:
+        reply: |-
+          Hey, bon sondage ! Comment s'est passé votre formation ?
+
+          [poll]
+          :+1:
+          :-1:
+          [/poll]
+      details:
+        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 3c72d0d3f8..908c13f1ff 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:
@@ -27,13 +53,13 @@ he:
         quote: "במרכזו של כל קושי מונחת הזדמנות"
         author: "אלברט אינשטיין"
       '2':
-        quote: "אתם חייבים להיות השינוי שאתם רוצים לראות בעולם."
         author: "מהאטמה גנדי"
       '3':
         quote: "אל תבכו כי זה נגמר, חייכו כי זה קרה."
         author: "ד״ר סוס"
       '4':
         quote: "אם אתם רוצים שמשהו יתבצע כמו שצריך, עשו זאת בעצמכם."
+        author: "צ׳ארלס-גילאום אטין"
       '5':
         quote: "האמינו שאתם יכולים ואתם מחצית הדרך לשם."
         author: "תאודור רוזוולט"
@@ -58,13 +84,16 @@ he:
       trigger: 'מזלות'
       answers:
         '1': "זה וודאי"
+        '2': "זה מוחלט כך"
         '3': "ללא ספק"
         '4': "כן בהחלט"
         '5': "אתם יכולים לסמוך על כך"
         '6': "כפי שאני רואה זאת, כן"
+        '7': "קרוב לוודאי"
         '8': "תחזית טובה"
         '9': "כן"
         '10': "הסימנים מראים שכן"
+        '11': "תגובה מעורפלת לנסות שוב"
         '12': "תשאלו שוב מאוחר יותר"
         '13': "עדיף לא לענות עכשיו"
         '14': "קשה לחזות עכשיו"
@@ -80,22 +109,115 @@ 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
       images:
+        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:
+        not_found: |-
+          אווו, לא מצאתי פירמוט בתגובה שלכם. :pencil2:
+
+          תוכלו לנסות שוב? השתמשו בכפתורי <kbd><b>B</b></kbd> הדגשה או <kbd><i>I</i></kbd> הטיה בעורך אם אתם נתקעים.
+      quoting:
+        instructions: |-
+          תוכלו לצטט אותי כשאתם משיבים, כדי שאדע בדיוק על איזה חלק אתם משיבים?
+
+          > אם זה קפה, בבקשה תביאו לי תה; אבל אם זה תה, בבקשה תביאו לי קפה.
+          >
+          > אחד הייתרונות של לדבר לעצמכם זה שאתם יודעים שלפחות מישהו מקשיב.
+          >
+          > יש אנשים שיודעים להשתמש במילים, ואחרים... אה, הםםםם, לא להשתמש.
+
+          בחרו את הטקסט של איזה &uarr; ציטוט שאתם מעדיפים, ולחצו על כפתור ה-**ציטוט** שמופיע על הבחירה שלכם - או כפתור ה-**מענה** בתחתית פוסט זה.
+
+          מתחת לציטוט, הוסיפו מילה או שתיים לגבי הסיבה שבחרתם את זה, בגלל שאני סקרן :thinking:
+        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: יכולות משתמשים מתקדמים'
+      recover:
+        deleted_post_raw: 'מדוע @%{discobot_username} מחק/ה את הפוסט שלי? :anguished:'
+      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 6c86499db7..51c9e33e44 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.id.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.id.yml
@@ -53,7 +53,6 @@ id:
         quote: "Setiap kesulitan ada kemudahan"
         author: "Albert Einstein"
       '2':
-        quote: "Kamu harus jadi agen perubahan agar dunia mengenalimu."
         author: "Mahatma Gandhi"
       '3':
         quote: "Jangan menangis karena sudah selesai, tersenyumlah karena itu telah terjadi."
@@ -161,23 +160,7 @@ 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:
-
-          Bisakan coba tautan di bawah ini, di barik tersendiri pada balasan berikutnya?
-
-          - 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 +204,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 +221,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 +232,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 +257,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 +297,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 +305,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 337732ba4f..13a7470d18 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."
+        quote: "Non vale la pena avere la libertà se non si ha la libertà di sbagliare."
         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,31 +155,43 @@ 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}/plugins/discourse-narrative-bot/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:
 
           Puoi provare ad aggiungere il seguente collegamento, su una riga da solo, nella tua prossima risposta?
 
-          - https://it.wikipedia.org/wiki/Exotic_Shorthair
+          <https://it.wikipedia.org/wiki/Exotic_Shorthair>
       images:
+        instructions: |-
+          Ecco l'immagine di un unicorno:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> qui sotto e <img src="%{base_uri}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Non dimenticare di usare il pulsante mostra altro <img src="%{base_uri}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> in alto a destra &#8599; per trovarla.
+
           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"/>
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/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.
+
+          Usa il  pulsante <img src="%{base_uri}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> mostra altro rivelerà il pulsante <img src="%{base_uri}/plugins/discourse-narrative-bot/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.
-          Puoi farmi un favore e <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> **ripristinarlo**?
+          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}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> mostra altro rivelerà il pulsante <img src="%{base_uri}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/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 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}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/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 8c2dc00904..996e3e8b86 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ja.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ja.yml
@@ -5,4 +5,54 @@
 # 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_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}とおっしゃってください。
+
+        仮にこれらをしたくなくても、それもOKです。私はプログラムですから傷つきません。:くすん:
+    dice:
+      trigger: "サイコロを振る"
+      invalid: |-
+        ごめんなさい、この組み合わせのサイコロを振ることは数学的に困難です。:confounded:
+      results: |-
+        > :game_die: %{results}
+    quote:
+      trigger: "引用"
+      '1':
+        quote: "困難の中に、機会がある。"
+        author: "アルベルト・アインシュタイン"
+      '2':
+        quote: "失敗する自由がないならば、それは自由ではない。"
+        author: "マハトマガンジー"
+      '3':
+        quote: "終わってしまったことを嘆くのではなく、それを経験したことを喜ぼう。"
+        author: "ドクター・スース"
+      '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 bf4e05d6f4..6362aa6a5a 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ko.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
@@ -5,4 +5,350 @@
 # 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}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> 링크에 대해서 작동해.  딱 링크로만 된 한줄이어야만 한다는 걸 명심해. 앞이나 뒤에 다른게 있어서는 안돼.
+        not_found: |-
+          미안해. 답글에서 링크를 찾지 못했어! :cry:
+
+          아래 링크 한줄을 복사해서 다음 답글에 넣어볼래?
+
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
+      images:
+        instructions: |-
+          유니콘 사진이야.
+
+          <img src="/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">%{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}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 선택한 다음 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **이 개인메시지 북마크**를 하렴.  미래의 너에게 보내는 좋은 선물:gift:이 되겠지!
+        reply: |-
+          대단해! 이제는 [프로필의 북마크 탭](%{profile_page_url}/activity/bookmarks)만 눌러도 우리의 개인적인 대화를 손쉽게 뒤돌아 볼 수 있어. 우측 상단에 있는 프로필 사진만 선택하면 돼. &#8599;
+        not_found: |-
+          어라, 이 토픽에는 북마크가 없는데? 포스트 별로 있는 북마크 버튼을 찾았니? 더 보기 <img src="%{base_uri}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> 이모지 버튼을 누르거나, 모바일 키보드를 사용해봐.
+        reply: |-
+          그거 정말 :sparkles: _이모지스럽네!_ :sparkles:
+        not_found: |-
+          어라, 답글에서 이모지를 못찾겠는데? 안돼! :sob:
+
+          콜론 <kbd>:</kbd> 을 입력하면 이모지 선택기를 띄울 수 있어. 그럼 몇자만 입력해도 원하는 이모지를 찾을 수 있지. 예를 들어 ':bird:'라고 입력하면 돼.
+
+          아니면, 편집기에서 이모지 버튼 <img src="%{base_uri}/plugins/discourse-narrative-bot/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}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> 를 눌러서 부적절하다고 알려줘!
+        reply: |-
+          [우리의 운영진](/groups/staff)은 니가 한 신고내용을 개인 메시지로 알림받게 될 거야. 충분한 커뮤니티 회원들이 신고를 하면, 포스트의 내용이 숨겨지고 사전경고가 걸리게 돼.(난 실제로 나쁜 글을 쓴 건 아니니까:angel:, 이제 신고를 지울게.)
+        not_found: |-
+          이런 내가 쓴 나쁜 포스트가 아직 신고가 안됐네. :worried:  부적절한 게시물로 **신고** 해주겠니 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? 더 보기 버튼을 누르면 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 포스트에 수행할 기능을 더 볼 수 있다는 걸 잊지마.
+      search:
+        instructions: |-
+          이봐, 내가 이 토픽에 놀라운 걸 숨겼다구. 찾아보고 싶다면, 우측 상단에 있는 **검색 아이콘을** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> 선택해서 &#8599; 찾아봐.
+
+          이 토픽에서 "capy&#8203;bara"를 찾으면 돼.
+        hidden_message: |-
+          어떻게 이 capybara를 잊을 수 있어? :wink:
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
+
+          다시 처음으로 온 걸 눈치챘어? 이 배고픈 불쌍한 capybara에게 **`:herb:` emoji로 답을 해서** 먹이를 주렴. 그러면 자동으로 끝으로 가게 될거야.
+        reply: |-
+          예이, 찾았네! :tada:
+
+          - 더 자세히 검색하려면, [전체 검색 페이지](%{search_url})로 가보렴.
+
+          - 긴 대화에서 원하는 곳으로 건너 뛰려면, 우측에 있는 토픽 타임라인 컨트롤을 사용해봐 (모바일 기기에는 아래쪽에 있어).
+
+          - 진짜 실물 :keyboard:가 있다면, <kbd>?</kbd>를 눌러서 간편한 단축키가 뭐가 있는지 알아봐.
+        not_found: |-
+          흠.... 아무래도 문제가 있어 보이네. 미안해. 검색<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16">을 눌러서 **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: |-
+        @%{username}! _고급_ 사용자로서, [설정 페이지](/my/preferences) 를 가본적 있니? 다크 테마, 라이트 테마 선택같은 사용자 경험을 개인화할 수 있는 많은 옵션이 있어.
+
+        사설이 길었네, 시작하자!
+      edit:
+        bot_created_post_raw: "@%{discobot_username}는 내가 아는 한, 현존하는 가장 쿨한 봇이지:wink:"
+        instructions: |-
+          누구나 실수해. 걱정마, 편집을 하면 그 실수를 언제든지 바로잡을 수 있거든!
+
+          내가 너 대신 만든 이 포스트를 **편집**하는 걸로 시작해 볼래 ?
+        not_found: |-
+          내가 만들어준 [post](%{url}) 편집이 다 안끝난 것 같네. 다시 해볼래?
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16"> 아이콘을 눌러서 에디터를 띄워보렴.
+        reply: |-
+          아주 잘했어!
+
+          편집된 글은 5분뒤에 수정본으로 공개되고, 우측 상단에 작은 연필 아이콘과 함께 수정 횟수가 뜬다는 걸 기억하렴.
+      delete:
+        instructions: |-
+          작성한 포스트를 없애고 싶으면, 삭제를 하면 돼.
+
+          위에 있는 포스트 중에서 어떤 것이든 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> **삭제하기** 기능으로  **삭제**해보렴. 그래도 첫번째 포스트는 삭제하지마!
+        not_found: |-
+          삭제된 포스트가 없는 것 같은데? <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 더보기를 통해서 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> 삭제하기를 볼 수 있어.
+        reply: |-
+          우와! :boom:
+
+          토론이 잘 진행될 수 있도록, 곧장 삭제되지는 않아. 어느 정도 시간이 지나면 포스트가 없어질거야.
+      recover:
+        deleted_post_raw: '왜 @%{discobot_username}가 내 포스트를 지웠지? :anguished:'
+        instructions: |-
+          오 이런! 너한테 만들어 준 새 포스트를 실수로 삭제해버린 것 같아.
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> **삭제 취소하기**를 부탁해도 될까?
+        not_found: |-
+          잘 안되니? <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 더 보기를 누르면 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> 삭제 취소하기가 보일거야.
+        reply: |-
+          휴, 큰일날 뻔 했네! 바로 잡아줘서 고마워 :wink:
+
+          삭제 취소하기는 24시간 내에만 가능하다는 거 기억해 둬.
+      category_hashtag:
+        instructions: |-
+          포스트에 카테고리나 태그를 언급할 수 있다는 거 알고 있어? 예를 들어, %{category} 카테고리가 보이니?
+
+          문장 중간에 `#`을 넣고 어떤 카테고리나 태그든 선택해봐.
+      certificate:
+        alt: '고급 사용자 추적 인증'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.lv.yml b/plugins/discourse-narrative-bot/config/locales/server.lv.yml
new file mode 100644
index 0000000000..dc48bb58ee
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/server.lv.yml
@@ -0,0 +1,8 @@
+# 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/
+
+lv: {}
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 7db05b7d68..218cf89558 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
@@ -6,25 +6,117 @@
 # 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:
+    dice:
+      trigger: "rull"
+      invalid: |-
+        Jeg beklager, det er matematisk umulig å rulle den kombinasjonen av terninger. :confounded:
+      results: |-
+        > :game_die: %{results}
     quote:
       trigger: "sitat"
       '1':
+        quote: "I midten av hver utfordring finnes muligheter"
         author: "Albert Einstein"
       '2':
         author: "Mahatma Gandhi"
+      '3':
+        quote: "Ikke gråt fordi det er over, smil fordi det skjedde."
+      '4':
+        quote: "Hvis du vil ha noe velgjort, gjør det selv."
       '5':
+        quote: "Tro at du kan, og du finner deg selv på halvveien."
         author: "Theodore Roosevelt"
+      '6':
+        author: "Forrest Gumps Mor"
+      '7':
+        author: "Neil Armstrong"
+      '8':
+        quote: "Gjør én ting om dagen som skremmer deg."
+      '9':
+        quote: "Feil kan alltid tilgis, hvis man har mot nok til å innrømme dem."
+        author: "Bruce Lee"
     magic_8_ball:
       answers:
+        '1': "Det er sikkert"
+        '2': "Det er virkelig slik"
+        '3': "Uten tvil"
+        '4': "Ja, definitivt"
+        '5': "Du kan stole på det"
+        '6': "Slik jeg ser det, ja"
+        '7': "Antageligvis"
+        '8': "Utsiktene er gode"
         '9': "Ja"
+        '10': "Ting taler i favør av ja"
+        '11': "Vagt svar, prøv igjen"
         '12': "Spør igjen senere"
+        '13': "Best å ikke fortelle deg det nå"
+        '14': "Kan ikke spå nå"
+        '15': "Konsentrer deg og spør igjen"
+        '16': "Ikke regn med det"
+        '17': "Mitt svar er nei"
+        '18': "Mine kilder sier nei"
+        '19': "Forespeilingen er ikke så god"
+        '20': "Veldig tvilsomt"
+      result: |-
+        > :crystal_ball: %{result}
     track_selector:
       reset_trigger: 'start'
       skip_trigger: 'hopp over'
       help_trigger: 'vis hjelp'
+      random_mention:
+        reply: |-
+          Hei! Finn ut hva jeg kan gjøre, si `@%{discobot_username} %{help_trigger}`.
+    new_user_narrative:
+      reset_trigger: "ny bruker"
+      hello:
+        title: ":robot: Heisann!"
+      quoting:
+        reply: |-
+          Godt jobbet, du valgte mitt  favorittsitat! :left_speech_bubble:
     advanced_user_narrative:
       reset_trigger: 'avansert bruker'
+      title: ':arrow_up: Avanserte brukerfunksjoner'
+      edit:
+        bot_created_post_raw: "@%{discobot_username} er overlegent den kuleste bot-en jeg vet om :wink:"
+      poll:
+        reply: |-
+          Hei, fin avstemning! Hvordan gjorde jeg det i opplæringsprosessen?
+
+          [poll]
+          * :+1:
+          * :-1:
+          [/poll]
       details:
         reply: |-
           Bra jobbet — ditt _detaljarbeid_ er beundringsverdig!
diff --git a/plugins/discourse-narrative-bot/config/locales/server.nl.yml b/plugins/discourse-narrative-bot/config/locales/server.nl.yml
index 2674c4c9e6..7d74e3beca 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.nl.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.nl.yml
@@ -6,10 +6,33 @@
 # https://www.transifex.com/projects/p/discourse-org/
 
 nl:
+  site_settings:
+    discourse_narrative_bot_enabled: 'Discourse Narrative Bot inschakelen'
+    disable_discourse_narrative_bot_welcome_post: "Discourse Narrative Bot welkomstbericht uitschakelen"
+    discourse_narrative_bot_ignored_usernames: "Gebruikersnamen die de Discourse Narrative Bot moet negeren"
+    discourse_narrative_bot_disable_public_replies: "Antwoorden door de Discourse Narrative Bot uitschakelen"
+    discourse_narrative_bot_welcome_post_type: "Wat voor soort welkomstbericht zou de Discourse Narrative Bot moeten uitsturen"
+    discourse_narrative_bot_welcome_post_delay: "Wacht (n) seconden voordat de Discourse Narrative Bot het welkomstbericht uitstuurd."
+  badges:
+    certified:
+      name: Gecertificeerd
+      description: "Doorloop onze tutorial voor nieuwe gebruikers"
+      long_description: |
+        Deze badge wordt verleend wanneer de interactieve handleiding met succes is doorlopen. Je hebt het initiatief genomen om de basis hulpmiddelen voor discussie te leren en je bent nu gecertificeerd!
+    licensed:
+      description: "Onze geavanceerde gebruikers handleiding afgerond"
   discourse_narrative_bot:
+    bio: "Hallo, ik ben geen echt persoon. Ik ben een bot die jou uitleg geeft over deze website. Om met mij te communiceren, stuur me een bericht of vermeld mij **`@%{discobot_username}`** ergens."
+    dice:
+      trigger: "gooi"
+      invalid: |-
+        Sorry, het is wiskundig onmogelijk om die combinatie te gooien. :confounded:
+      results: |-
+        > :game_die: %{results}
     quote:
       trigger: "quote"
       '1':
+        quote: "In the middle of every difficulty lies opportunity"
         author: "Albert Einstein"
       '2':
         author: "Mahatma Gandhi"
@@ -27,3 +50,31 @@ nl:
         author: "Eleanor Roosevelt"
       '9':
         author: "Bruce Lee"
+    magic_8_ball:
+      trigger: 'lot'
+      answers:
+        '1': "Het is zeker"
+        '2': "Het is zo besloten"
+        '3': "Zonder twijfel"
+        '4': "Ja zeker"
+        '5': "Daar kun je van uit gaan"
+        '6': "Zoals ik het zie, ja"
+        '7': "Zeer waarschijnlijk"
+        '9': "Ja"
+        '10': "Alle signalen wijzen naar ja"
+        '12': "Vraag later nogmaals"
+        '13': "Beter om je dat nu niet te vertellen"
+        '14': "Kan nu niet voorspellen"
+        '15': "Concentreer je en vraag opnieuw"
+        '16': "Reken er niet op"
+        '17': "Mijn antwoord is nee"
+        '18': "Mijn bronnen zeggen nee"
+        '20': "Zeer onwaarschijnlijk"
+      result: |-
+        > :crystal_ball: %{result}
+    track_selector:
+      reset_trigger: 'start'
+      skip_trigger: 'overslaan'
+      help_trigger: 'help weergeven'
+    new_user_narrative:
+      reset_trigger: "nieuwe gebruiker"
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 c04d371e5a..8d0e7d7915 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,337 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-pl_PL: {}
+pl_PL:
+  site_settings:
+    discourse_narrative_bot_enabled: 'Włącz bota Discourse Narrative'
+    disable_discourse_narrative_bot_welcome_post: "Dezaktywuj wpis powitalny Discourse Narrative Bot"
+    discourse_narrative_bot_ignored_usernames: "Nazwy użytkownika, które bot Discourse Narrative powinien zignorować"
+    discourse_narrative_bot_disable_public_replies: "Wyłącz publiczne odpowiedzi bota Discourse Narrative"
+    discourse_narrative_bot_welcome_post_type: "Rodzaj powitalnego posta, który bot Discourse Narrative powinien przesłać"
+    discourse_narrative_bot_welcome_post_delay: "Odczekaj (n) sekund, zanim wyślesz powitanie bota Discourse Narrative"
+  badges:
+    certified:
+      name: Certyfikowany
+      description: "Ukończono tutorial dla nowych użytkowników"
+      long_description: |
+        Odznaka została nadana za ukończenie interaktywnego tutorialu dla nowych użytkowników. Poznałeś podstawowe narzędzia dyskusji i jesteś teraz certyfikowany!
+    licensed:
+      name: Licencjonowany
+      description: "Ukończono tutorial dla zaawansowanych użytkowników"
+      long_description: |
+        Odznaka została nadana za ukończenie interaktywnego tutorialu dla zaawansowanych użytkowników. Poznałeś zaawansowane narzędzia dyskusji i jesteś teraz w pełni licencjonowany!
+  discourse_narrative_bot:
+    bio: "Witaj, nie jestem prawdziwą osobą. Jestem botem, który może nauczyć Cię korzystania z tej witryny. Aby skomunikować się ze mną, wyślij do mnie wiadomość lub oznacz **`@%{discobot_username}`** w dowolnym miejscu."
+    timeout:
+      message: |-
+        Witaj @%{username}, przypominam o sobie bo od dawna do mnie nie zaglądałeś.
+
+        Aby kontynuować, odpowiedz mi w dowolnym momencie.
+
+        Aby pominąć ten krok, wyślij wiadomość o treści ``.
+
+        Aby rozpocząć od początku, wyślij wiadomość o treści `%{reset_trigger}`.
+
+        Jeśli nie odpowiesz to wszystko OK. Jestem robotem. Nie zranisz moich uczuć. :sob:
+    dice:
+      trigger: "przewiń"
+      invalid: |-
+        Przykro mi, ale jest to matematycznie niemożliwe, aby rzucić taką kombinacją kostki. :confounded:
+      not_enough_dice: |-
+        Mam tylko %{num_of_dice} kości. [Shameful](http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php), I know!
+      out_of_range: |-
+        Czy wiesz, że [maksymalna ilość ścian](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) na sprawiedliwej kostce do gry to 120?
+      results: |-
+        > :game_die: %{results}
+    quote:
+      trigger: "cytuj"
+      '1':
+        quote: "Każda przeszkoda to nowa szansa"
+        author: "Albert Einstein"
+      '2':
+        author: "Mahatma Gandhi"
+      '3':
+        quote: "Nie płacz, ponieważ się to skończyło - uśmiechnij się, bo miało to miejsce."
+        author: "Dr Seuss"
+      '4':
+        quote: "Jeśli chcesz, aby coś zostało zrobione dobrze - zrób to sam."
+        author: "Charles-Guillaume Étienne"
+      '5':
+        quote: "Uwierz w to że możesz, jesteś już w połowie drogi."
+        author: "Theodore Roosevelt"
+      '6':
+        quote: "Życie jest jak pudełko czekoladek. Nigdy nie wiesz na co trafisz."
+        author: "Mama Forresta Gumpa"
+      '7':
+        quote: "To mały krok dla człowieka, ale wielki krok dla ludzkości."
+        author: "Neil Armstrong"
+      '8':
+        quote: "Rób codziennie jedną rzecz, której się boisz."
+        author: "Eleanor Roosevelt"
+      '9':
+        quote: "Błędy są zawsze wybaczalne, jeśli osoba może się do nich przyznać."
+        author: "Bruce Lee"
+      '10':
+        quote: "Każda rzecz, którą umysł ludzki może pojąć i w nią uwierzyć, może on osiągnąć."
+        author: "Napoleon Hill"
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
+    magic_8_ball:
+      trigger: 'fortuna'
+      answers:
+        '1': "Jest to pewne"
+        '2': "Jest to zdecydowane, więc"
+        '3': "Bez zająknięcia"
+        '4': "Tak zdecydowanie"
+        '5': "Możesz na tym polegać"
+        '6': "Tak jak ja to widzę, tak"
+        '7': "Najpewniej"
+        '8': "Perspektywy są dobre"
+        '9': "Tak"
+        '10': "Wszystkie znaki wskazują na to, że tak"
+        '11': "Odpowiedź niejasna, spróbuj ponownie"
+        '12': "Spytaj ponownie później"
+        '13': "Lepiej, abym Ci teraz nie mówił"
+        '14': "Nie mogę teraz tego przewidzieć"
+        '15': "Skoncentruj się i spytaj ponownie"
+        '16': "Nie licz na to"
+        '17': "Moja odpowiedź to nie"
+        '18': "Moje źródła donoszą, że nie"
+        '19': "Perspektywy są złe"
+        '20': "Bardzo trudne do przewidzenia"
+      result: |-
+        > :crystal_ball: %{result}
+    track_selector:
+      reset_trigger: 'zacznij'
+      skip_trigger: 'pomiń'
+      help_trigger: 'wyświetl pomoc'
+      random_mention:
+        reply: |-
+          Hej! Aby dowiedzieć się, co mogę zrobić, powiedz `@%{discobot_username} %{help_trigger}`.
+        tracks: |-
+          Aktualnie wiem jak zrobić następujące rzeczy:
+
+          `@%{discobot_username} %{reset_trigger} %{default_track}`
+          > Rozpoczyna jedną z następujących akcji: %{tracks}.
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3, 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          > :left_speech_bubble: _Wykonuje losowy akt życzliwości, nie oczekując nagrody, wiedząc, że pewnego dnia ktoś może zrobić to samo dla Ciebie._ &mdash; Princess Diana
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: Możesz na niej polegać
+      do_not_understand:
+        first_response: |-
+          Hej! Dzięki za odpowiedź!
+
+          Niestety, ale jako kiepsko zaprogramowany bot, nie do końca jestem w stanie ją zrozumieć. :frowning:
+        track_response: Możesz spróbować ponownie, a jeśli chcesz pominąć ten krok powiedz `%{skip_trigger}`. Natomiast jeśli chcesz zacząć od początku, powiedz `%{reset_trigger}`.
+        second_response: |-
+          Przepraszam. Ciągle nie rozumiem :anguished:
+
+          Jeżeli chcesz się skontaktować z prawdziwą osobą odwiedź naszą [stronę kontaktową](/about).
+
+          W międzyczasie nie będę Ci już przeszkadzał.
+    new_user_narrative:
+      reset_trigger: "nowy użytkownik"
+      cert_title: "W podziękowaniu za skończony samouczek"
+      hello:
+        title: ":robot: Witaj!"
+        message: |-
+          Witaj na portalu %{title}!
+
+          - Jestem tylko robotem, ale nasza [załoga](/about) jest zawsze do dyspozycji jeżeli potrzebujesz się skontaktować z prawdziwą osobą.
+
+          - Ze względów bezpieczeństwa uprawnienia nowych użytkowników są mniejsze. Z czasem uzyskasz dostęp do większej ilości opcji (i [odznak](/badges)).
+
+          - Wierzymy w [cywlizowaną dyskusję](/guidelines) w każdej sytuacji.
+      onebox:
+        instructions: |-
+          Następnie, czy możesz udostępnić mi jeden z poniższych linków? Odpowiedz przy użyciu **link**, a automatycznie zostanie dodane dobre podsumowanie.
+
+          Aby skopiować link, naciśnij i przytrzymaj na telefonie, lub kliknij prawym przyciskiem myszy.
+
+          - https://en.wikipedia.org/wiki/Inherently_funny_word
+          - https://en.wikipedia.org/wiki/Death_by_coconut
+          - https://en.wikipedia.org/wiki/Calculator_spelling
+        not_found: |-
+          Przepraszam, nie mogłem znaleźć linku w twojej odpowiedzi!
+          :cry:
+
+          Czy możesz spróbować dodać następujący link, w osobnej linii, w następnej odpowiedzi?
+
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
+      images:
+        reply: |-
+          Ładne zdjęcie - nacisnąłem przycisk lajka :heart:, żeby Ci podziękować :heart_eyes:
+        like_not_found: |-
+          Zapomniałeś polajkować :heart: mój [wpis]?(%{url}) :crying_cat_face:
+        not_found: |-
+          Wygląda na to, że nie wysłałeś zdjęcia, dlatego wybrałem zdjęcie, które na pewno ci się spodoba.
+
+          %{image_url}
+
+          Spróbuj dodać nowe zdjęcie
+      formatting:
+        instructions: |-
+          Czy możesz **pogrubić** lub zastosować _kursywę_ dla części słów w swojej odpowiedzi?
+
+
+          - napisz '**pogrub**' lub '_kursywa_'
+
+          - lub, naciśnij przycisk<kbd><b>B</b></kbd> lub<kbd><i>I</i></kbd> w edytorze.
+        reply: |-
+          Dobra robota! BBCode i HTML również pracują nad formatowaniem - aby dowiedzieć się więcej [rozpocznij ten tutorial](http://commonmark.org/help) :nerd:
+        not_found: |-
+          Aww, nie znalazłem żadnego formatowania tekstu w odpowiedzi.:pencil2:
+          Czy możesz spróbować ponownie? Użyj przycisków<kbd> <b>B</b></kbd>pogrubienia lub<kbd><i> I</i></kbd>kursywy w edytorze, jeśli utknąłeś.
+      quoting:
+        instructions: |-
+          Czy możesz spróbować zacytować mnie w odpowiedzi, tak żebym wiedział do której części się odnosisz?
+
+          >Jeśli to kawa, proszę przynieś mi herbatę; jeśli to herbata, proszę przynieś mi kawę.
+          >
+          >Jedyną korzyścią mówienia samemu do siebie jest fakt, że przynajmniej ktoś ciebie słucha.
+
+          > Niektórzy mają świetne zdolności komunikacyjne, inni... oh, uh po prostu nie mają.
+
+          Wybierz tekst, któregokolwiek &uarr; cytatu i naciśnij przycisk**Cytat**, który pojawi się ponad twoim wyborem - lub przycisk **Odpowiedz* na dole tego posta.
+
+          Poniżej cytatu, napisz słowo lub dwa o tym dlaczego wybrałeś właśnie tą część, ponieważ jestem ciekawy :thinking:
+        reply: |-
+          Dobra robota, wybrałeś mój ulubiony cytat!:left_speech_bubble:
+        not_found: |-
+          Hmm, wygląda na to, że nie zacytowałeś mnie w swojej odpowiedzi?
+
+          Wybór jakiegokolwiek tekstu z mojej wiadomości spowoduję pojawienie się przycisku <kbd>**Zacytuj**</kbd>.  Naciśnięcie **Odpowiedz** z wybranym tekstem również zadziała! Czy możesz spróbować ponownie?
+      bookmark:
+        reply: |-
+          Wspaniale! Teraz możesz w łatwy sposób, w każdym momencie przejść do konwersacji prywatnej, po prawej od [zakładki dodawania do zakładek w twoim profilu]%{profile_page_url}/activity/bookmarks). Wystarczy, że klikniesz na swoj zdjęcie profilowe po prawej u góry&#8599;
+      emoji:
+        reply: |-
+          To jest :sparkles: _emojitastis!_ :sparkles:
+      mention:
+        instructions: |-
+          Czasami chciałbyś zwrócić na siebie czyjąś uwagę, nawet jeśli nie odpowiadasz bezpośrednie. Napisz "@" następnie wpisz nazwę użytkownika, aby wspomnieć o kimś.
+
+          Czy możesz wspomnieć** @%{discobot_username}** w twojej odpowiedzi?
+        reply: |-
+          _Czy ktoś wypowiedział moje imię!?_ _ :raised_hand: Wydaję mi się, że to byłeś ty!  :wave:  No to jestem! Dzięki, że wspomniałeś o mnie. :ok_hand:
+        not_found: |-
+          Nigdzie nie widzę swojego imienia :frowning: Czy możesz spróbować jeszcze raz  wspomnieć o mnie jako `@ %{discobot_username}?
+
+          (Tak, moja nazwa użytkownika pisana jest _disco_, tak jak w popularna w latach 90 muzyka. Naprawdę [kocham życie nocne!]
+          (https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
+      flag:
+        reply: |-
+          [Nasz personel](/grupy/personel) zostanie prywatnie poinformowany o twoim oflagowaniu. W przypadku gdy wystarczająca liczba członków społeczności oflaguje ten post, zostanie on automatycznie ukryty ze względów ostrożności. (Jako, że tak naprawdę nie napisałem niczego nieodpowiedniego :angel:, po prostu usunąłem oznaczenie posta.)
+      search:
+        reply: |-
+          Yay, udało Ci się to odnaleźć :tada:
+
+          - Dla bardziej dokładnego wyszukiwania, przejdź do [strony zaawansowanego wyszukiwana](%{search_url}).
+
+          Aby przejść gdziekolwiek w dłuższej dyskusji, spróbuj użyć kontrolek linii czasu tematu po prawej stronie (na dole w przypadku telefonów komórkowych).
+
+          - Jeśli posiadasz klawiaturę  :keyboard:, naciśnij <kbd>?</kbd> , aby wyświetlić nasze wygodne skróty klawiszowe.
+      end:
+        message: |-
+          Dziękuję, że ze mną jesteś @%{username}! Zrobiłem to specjalnie dla ciebie, myślę, że na to zasłużyłeś:
+
+          %{certificate}
+
+          To wszystko na teraz! Sprawdź [**ostatnie tematy dyskusji**] (/ostatnie) lub [**kategorie dyskusji**](/kategorie).
+          :sunglasses:
+
+          (Jeśli będziesz chciał ponownie porozmawiać, aby dowiedzieć się więcej po prostu użyj wiadomości lub wspomnij '@%{discobot_username}w dowolnym momencie!)
+      certificate:
+        alt: 'Certyfikat osiągnięcia'
+    advanced_user_narrative:
+      reset_trigger: 'zaawansowany użytkownik'
+      cert_title: "W uznaniu za pomyślne ukończenie tutorialu zaawansowanego użytkownika."
+      title: ':arrow_up: Zaawansowane opcje użytkownika'
+      start_message: |-
+        Jako _zaawansowany_ użytkownik, czy odwiedziłeś już [stronę swoich ustawień)(/moje/ustawienia) @%{username}? Istnieje wiele możliwości dostosowania ustawień, jak na przykład wybranie ciemnego lub jasnego motywu.
+
+        Ale nie zbaczajmy z tematu, czas zacząć!
+      edit:
+        bot_created_post_raw: "@%{discobot_username} jest z pewnością najfajniejszym botem, jakiego znam :wink:"
+        instructions: |-
+          Wszyscy popełniają błędy. Ale nie martw się, możesz w każdej chwili edytować posty, aby je naprawić!
+
+          Czy możesz zacząć poprzez **edytowanie** postu, który właśnie stworzyłem w tym celu?
+        reply: |-
+          Dobra robota!
+
+          Pamiętaj, że zmiany dokonane po 5 minutach od publikacji postu będą wyświetlane publicznie, pojawi się również ikona małego ołówka w prawym górnym rogu z licznikiem korekt.
+      delete:
+        reply: |-
+          Whoa! :boom:
+
+          W celu zapewnienia ciągu w dyskusji, usunięcia nie są natychmiastowe, a więc post zostanie usunięty po jakimś czasie.
+      recover:
+        deleted_post_raw: 'Dlaczego @%{discobot_username} usunął mój post?
+
+          :anguished:'
+        reply: |-
+          Phew, było blisko! Dzięki za pomoc!  :wink:
+
+          Pamiętaj, że masz tylko 24 godziny, aby przywrócić post.
+      category_hashtag:
+        instructions: |-
+          Czy wiesz, że możesz się odwoływać do kategorii i tagów w swoim poście? Na przykład, czy widziałeś kategorię %{category}?
+
+          Wpisz '#' w środku zdania i wybierz kategorię lub tag.
+        not_found: |-
+          Hmm, nie widzę nigdzie kategorii. Pamiętaj, że '#' nie może być pierwszym znakiem. Czy możesz skopiować tą część w następnej odpowiedzi?
+
+          '''tekst
+          Mogę stworzyć link do kategorii poprzez #
+          '''
+        reply: |-
+          Wspaniale! Pamiętaj, że działa to zarówno dla kategorii _i_ tagów, jeśli taka możliwość jest dostępna.
+      change_topic_notification_level:
+        instructions: |-
+          Każdy temat ma swój poziom notyfikacji. Pierwszym poziomem jest "normalny', co oznacza, że będziesz informowany jedynie w przypadku, gdy ktoś zwróci się bezpośrednio do ciebie.
+
+          Domyślnie, poziom notyfikacji dla wiadomości prywatnych jest ustawiony na najwyższym poziomie, oznacza to, że będziesz informowany o każdej nowej odpowiedzi. Możesz zmienić poziom notyfikacji dla _każdego_ tematu na "obserwuj", "śledź" lub "wycisz".
+
+          Spróbujmy zmienić poziom notyfikacji dla tego tematu. Na dole każdego tematu znajdziesz przycisk, który pokaże, że **obserwujesz** ten temat. Czy możesz zmienić poziom notyfikacji na **śledź**?
+        not_found: |-
+          Wygląda na to, że ciągle obserwujesz :eyes: ten temat! Jeśli masz problem w znalezieniu, przycisk poziomu notyfikacji znajduję się na dole tego tematu.
+        reply: |-
+          Wspaniała robota! Mam nadzieję, że nie wyciszyłeś tego tematu, jako że jestem dość rozmowny  :grin:.
+
+          Pamiętaj, że gdy odpowiadasz w danym temacie lub czytasz go więcej niż kilka minut, poziom notyfikacji automatycznie zmieni się na 'śledzenie'. Możesz to zmienić w [twoich ustawieniach użytkownika](/moje/ustawienia).
+      poll:
+        reply: |-
+          Hej, niezła ankieta! Jak mi idzie nauczanie?
+
+          [poll]
+          * :+1:
+          * :-1:
+          [/poll]
+      details:
+        not_found: |-
+          Czy masz problem przy tworzeniu widgetu szczegółów? Spróbuj dołączyć następujący tekst w twojej odpowiedzi.
+
+          ```tekst
+          [szczegóły=Wybierz mnie, aby zobaczyć szczegóły]
+          Tutaj są szczegóły
+          [/szczegóły]
+          ```
+        reply: |-
+          Dobra robota - twoja dbałość o _szczegóły_ jest wspaniała!
+      end:
+        message: |-
+          Przemknąłeś przez to jak prawdziwie _zaawansowany użytkownik_ :bow:
+
+          %{certificate}
+
+          To wszystko co dla ciebie mam.
+
+          Na razie! Jeśli będziesz chciał ponownie ze mną porozmawiać, po prostu wyślij wiadomość w dowolnym momencie  :sunglasses:
+      certificate:
+        alt: 'Zaawansowany użytkownik śledź certyfikat osiągnięcia'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pt.yml b/plugins/discourse-narrative-bot/config/locales/server.pt.yml
new file mode 100644
index 0000000000..0d37e3d5ec
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt.yml
@@ -0,0 +1,72 @@
+# 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:
+    discourse_narrative_bot_welcome_post_type: "O tipo de publicação de boas-vindas que \"Discourse Narrative Bot\" deverá enviar"
+  badges:
+    certified:
+      name: Certificado
+      description: "Completou o nosso novo tutorial de utilizador"
+    licensed:
+      name: Licenciado
+      description: "Completou o nosso tutorial de utilizador avançado"
+  discourse_narrative_bot:
+    quote:
+      '1':
+        author: "Albert Einstein"
+      '2':
+        author: "Mahatma Gandhi"
+      '3':
+        author: "Dr. Seuss"
+      '4':
+        quote: "Se quer algo bem feito, faça--o você mesmo."
+        author: "Charles-Guillaume Étienne"
+      '5':
+        quote: "Acredite que pode e já está a meio caminho."
+        author: "Theodore Roosevelt"
+      '7':
+        author: "Neil Armstrong"
+      '8':
+        author: "Eleanor Roosevelt"
+      '9':
+        quote: "Os erros são sempre perdoáveis, se a pessoa tiver a coragem de os admitir."
+        author: "Bruce Lee"
+      '10':
+        author: "Napoleon Hill"
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
+    magic_8_ball:
+      trigger: 'fortuna'
+      answers:
+        '3': "Sem dúvida"
+        '4': "Sim, definitivamente"
+        '7': "Mais provavelmente"
+        '9': "Sim"
+        '12': "Perguntar novamente mais tarde"
+        '13': "É melhor não lhe dizer agora"
+        '15': "Concentre-se e pergunte novamente"
+        '17': "A minha resposta é não"
+        '18': "As minhas fontes dizem não"
+      result: |-
+        > :crystal_ball: %{result}
+    track_selector:
+      reset_trigger: 'iniciar'
+      skip_trigger: 'ignorar'
+      help_trigger: 'exibir ajuda'
+    new_user_narrative:
+      reset_trigger: "novo utilizador"
+      hello:
+        title: ":robot: Saudações!"
+      certificate:
+        alt: 'Certificado de Realização'
+    advanced_user_narrative:
+      reset_trigger: 'utilizador avançado'
+      title: ':arrow_up: Funcionalidades de utilizador avançadas'
+      details:
+        reply: |-
+          Ótimo trabalho — a sua atenção para o _detalhe_ é admirável!
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 233456f7e0..57af13071b 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
@@ -12,6 +12,7 @@ pt_BR:
     discourse_narrative_bot_ignored_usernames: "Nomes de Usuário que o Robô de Narrativas do Discourse deve ignorar"
     discourse_narrative_bot_disable_public_replies: "Desabilitar respostas públicas do Robô de Narrativas do Discourse"
     discourse_narrative_bot_welcome_post_type: "Tipo de mensagem de boas vindas que o Robô de Narrativas do Discourse deve enviar"
+    discourse_narrative_bot_welcome_post_delay: "Espere (n) segundos antes de enviar o post de boas-vindas do Bot Narrativo do Discourse."
   badges:
     certified:
       name: Certificado
@@ -24,33 +25,117 @@ 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:
+      trigger: 'fortuna'
+      answers:
+        '1': "É certo"
+        '2': "Definitivamente sim"
+        '3': "sem dúvida"
+        '4': "Sim, definitivamente"
+        '5': "Você pode contar com ele"
+        '6': "Como eu vejo, sim"
+        '7': "Provavelmente"
+        '9': "Sim"
+        '12': "Pergunte novamente depois"
+        '13': "Melhor não falar pra você agora"
+        '16': "Não conte com isso"
+        '17': "Minha resposta é não"
+        '18': "Minhas fontes dizem que não"
+        '20': "Muito duvidoso"
       result: |-
         > :crystal_ball: %{result}
+    track_selector:
+      reset_trigger: 'começar'
+      skip_trigger: 'pular'
+      help_trigger: 'mostrar ajuda'
+      random_mention:
+        reply: |-
+          Oi! Para descobrir o que eu posso fazer diga `@%{discobot_username} %{help_trigger}`.
+        tracks: |-
+          Até agora eu sei como fazer as seguintes coisas:
+
+          `@%{discobot_username} %{reset_trigger} %{default_track}`
+          >Comece com uma das seguintes narrativas: %{tracks}.
+      do_not_understand:
+        first_response: |-
+          Oi, obrigado pela resposta!
+
+          Infelizmente, como um robo mal programado, eu não posso entender isso agora. :frowning:
+        track_response: Você pode tentar novamente, ou se quiser pular esse passo, diga `%{skip_trigger}`. Ou, para começar de novo, diga `%{reset_trigger}`.
+        second_response: |-
+          Me perdoe. Mas eu não estou entendendo ainda. :anguished:
+
+          Eu sou apenas um robô, mas se você quiser falar com uma pessoal real, veja [nossa página de contato](/about).
+
+          Enquanto isso eu ficarei fora do seu caminho.
+    new_user_narrative:
+      reset_trigger: "novo usuário"
+      cert_title: "Como forma de reconhecimento por completar com sucesso o tutorial do novo usuário."
+      hello:
+        title: "Olá! :robot:"
+        message: |-
+          Obrigado por se juntar ao %{title}, e seja bem vindo!
+
+          - Eu sou um robô, mas [nossa amigável equipe](/about) também estão aqui para te ajudar, case precise falar com uma pessoa.
+
+          - Por motivos de segurança, nós temporariamente limitamos o que novos usuários podem fazer. Você vai ganhar novas habilidades (e [emblemas](/badges) ao passo que nós conhecermos melhor você.
+
+          - Nós acreditamos em um {comunidade com comportamento civilizado](/guidelines) em todos os momentos.
+      images:
+        like_not_found: |-
+          Você esqueceu de curtir :heart: meu [post?](%{url})
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ro.yml b/plugins/discourse-narrative-bot/config/locales/server.ro.yml
index 31d1c44013..b23f78e41c 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ro.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ro.yml
@@ -5,4 +5,15 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ro: {}
+ro:
+  discourse_narrative_bot:
+    new_user_narrative:
+      hello:
+        message: |-
+          Mulțumim că te-ai alăturat comunității %{title}. Bine ai venit!
+
+          - Sunt doar un robot, dar [moderatorii](/about) sunt bucuroși să te ajute dacă ai nevoie să vorbești cu o persoană.
+
+          - Din motive de siguranță, limităm capabilitățile utilizatorilor noi, dar, pe măsură ce ne cunoaștem, vei putea primi [ecusoane](/badges) și permisiuni noi.
+
+          - Susținem [un comportament civilizat](/guidelines).
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ru.yml b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
index 3e076bde9f..6440cf48c3 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ru.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
@@ -25,16 +25,34 @@ 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':
         quote: "В середине каждой трудности - возможность"
         author: "Альберт Эйнштейн"
       '2':
-        quote: "Вы должны быть тем изменением, которое хотите видеть в мире."
         author: "Махатма Ганди"
       '3':
         quote: "Не плачь, потому что это закончилось. Улыбнись, потому что это было."
@@ -60,7 +78,10 @@ ru:
       '10':
         quote: "Что разум человека способен познать и вообразить, того он способен достичь."
         author: "Наполеон Хилл"
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
     magic_8_ball:
+      trigger: 'fortune'
       answers:
         '1': "Это точно"
         '2': "Это несомненно так"
@@ -82,6 +103,8 @@ ru:
         '18': "Мои источники говорят, что нет"
         '19': "Перспективы не очень хорошие"
         '20': "Весьма сомнительно"
+      result: |-
+        > :crystal_ball: %{result}
     track_selector:
       reset_trigger: 'старт'
       skip_trigger: 'пропустить'
@@ -89,23 +112,225 @@ 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
+        not_found: |-
+          Извините, я не могу найти ссылку Вашего ответа :cry:
+
+          Вы не могли бы добавить нужную ссылку в следующий ответ?
+
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
+      images:
+        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:
+        reply: |-
+          Отлично! Теперь вы можете легко найти свой путь назад к нашей частной беседе любой момент, прямо с [закладок в профиле](%{profile_page_url}/activity/bookmarks). Просто выберите фотографию профиля в правом верхнем углу &#8599;
+      emoji:
+        reply: |-
+          Это :sparkles: _emojitastic!_ :sparkles:
+      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:
+        reply: |-
+          [Наши сотрудники](/groups/staff) будут лично уведомлены о вашем сообщение. Если достаточное количество участников аналогично нажмет на этот флаг, то сообщение будет автоматически скрыто из-за предосторожности. (Так как я на самом деле не написать неприятный пост :angel:, я пошел туда и снял жалобу.)
+      search:
+        reply: |-
+          Ура вы его нашли :tada:
+
+          - Для более детального поиска, зайдите на [полный поиск на странице](%{search_url}).
+
+          - Чтобы прыгать в любую точку в долгой дискуссии попробуйте шакалу управление справа (и внизу, на мобильном).
+
+          - Если у вас есть физическая :keyboard:, клавиатура <kbd>?</kbd> для просмотра наших удобных сочетаний клавиш.
+      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: |-
+          Каждый делает ошибки. Но не волнуйтесь, вы всегда можете редактировать свои сообщения, чтобы их исправить!
+
+          Вы можете попробовать **редактировать** этот пост? Я создал его от Вашего имени.
+        reply: |-
+          Отличная работа!
+
+          Обратите внимание, что правки, сделанные после 5 минут показывают, как общественные изменения, и маленький значок карандаша появится в верхнем правом  углу записи.
+      delete:
+        reply: |-
+          Опсс! :boom:
+
+          Чтобы сохранить преемственность дискуссий, система удаляет не немедленно, поэтому пост будет удален через некоторое время.
       recover:
         deleted_post_raw: 'Почему @%{discobot_username} удалил моё сообщение? :anguished:'
+        reply: |-
+          Ух, это было отлично! Спасибо за ремонт, что :wink:
+
+          Запомните, что у вас есть только 24 часа, чтобы восстановить пост.
+      category_hashtag:
+        instructions: |-
+          Знаете ли вы, что вы можете обратитесь к категории и теги в вашем посте? Например, вы видели %{category} категорию?
+
+          Введите `#` в середине предложения и выберите любую категорию или тег.
+        not_found: |-
+          Хм, я не вижу категорию. Обратите внимание, что `#` не может быть первым символом. Вы можете скопировать это в вашем следующем ответе?
+
+          ```text
+          Я могу создать ссылку на категорию #
+          ```
+        reply: |-
+          Отлично! Это работает для всех категорий _и_ тегов, если теги включены.
+      change_topic_notification_level:
+        instructions: |-
+          Каждая тема имеет уровень уведомлений. Она начинается на 'нормальный', что означает, что вы нормально будете только получать уведомления, когда кто-то обращается непосредственно к вам.
+
+          По умолчанию, уровень уведомления на личное сообщение находится на самом высоком уровне 'смотреть', что означает, что вы будете получать уведомления о каждом новом ответе. Но вы можете переопределить уровня уведомлений для _любой_ теме 'смотреть', 'отслеживания' или 'отключен'.
+
+          Давайте попробуем изменить уровень уведомления по этой теме. Внизу темы, Вы найдете кнопку, которая показывает, что вы **смотрите** эту тему. Вы можете изменить уровень уведомления на **отслеживание**?
+        not_found: |-
+          Похоже, вы еще ищите :eyes: эту кнопку! Это кнопка находится в нижней части этого раздела.
+        reply: |-
+          Потрясающая работа! Я надеюсь, что вас я не утомил, поскольку могу быть немного болтлив  :grin:.
+
+          Обратите внимание, что при ответе на тему, или если читать тему в течение более чем нескольких минут, он автоматически устанавливается на уровень уведомления 'отслеживание'. Вы можете изменить это в [ваших настройках](/my/preferences).
+      poll:
+        reply: |-
+          Это хороший опрос! Как я вам в обучении?
+
+          [poll]
+          * :+1:
+          * :-1:
+          [/poll]
+      details:
+        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 e8b17f733f..7a9e40bc74 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sk.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sk.yml
@@ -6,22 +6,53 @@
 # 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':
         quote: "Uprostred každej prekážky sa nachádza príležitosť"
         author: "Albert Einstein"
       '2':
-        quote: "Musíte byť tou zmenou, ktorú chcete vidieť vo svete."
         author: "Mahatma Gandhi"
       '3':
         quote: "Neplačte, lebo to skončilo, usmejte sa, pretože sa to stalo."
@@ -42,9 +73,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 +92,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 +112,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.sr.yml b/plugins/discourse-narrative-bot/config/locales/server.sr.yml
new file mode 100644
index 0000000000..7e57a61dd2
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/server.sr.yml
@@ -0,0 +1,8 @@
+# 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/
+
+sr: {}
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sv.yml b/plugins/discourse-narrative-bot/config/locales/server.sv.yml
index fd54901f75..a66143cd3c 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sv.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sv.yml
@@ -5,4 +5,104 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-sv: {}
+sv:
+  site_settings:
+    discourse_narrative_bot_enabled: 'Aktivera Discourse digitala hjälpreda '
+    disable_discourse_narrative_bot_welcome_post: "Avaktivera introduktionsmeddelandet från Discourse  digitala hjälpreda "
+    discourse_narrative_bot_ignored_usernames: "Användarnamn som Discourse  digitala hjälpreda bör ignorera"
+    discourse_narrative_bot_disable_public_replies: "Inaktivera publika svar från Discourse digitala hjälpreda "
+    discourse_narrative_bot_welcome_post_type: "Vilken typ av välkomstmeddelande Discourse digitala hjälpreda bör skicka"
+    discourse_narrative_bot_welcome_post_delay: "Avvakta (n) sekunder innan Discourse digitala hjälpreda skickar välkomstmeddelande "
+  badges:
+    certified:
+      name: Certifierad
+      description: "Genomfört introduktion för nya användare"
+      long_description: |
+        Detta märke tilldelas efter genomförande av den interaktiva introduktionen för nya användare. Du har genom detta initiativ lärt dig grundläggande verktygen för diskussion och är nu certifierad!
+    licensed:
+      name: Licencierad
+      description: "Genomfört den avancerade användar kursen"
+      long_description: |
+        Detta märke tilldelas efter genomförande av den interaktiva avancerade instruktionen för användare. Du har genom detta initiativ lärt dig grundläggande verktygen för diskussion och är nu certifierad!
+  discourse_narrative_bot:
+    bio: "Hej, Jag är inte en riktig person. Jag är en bot som kan lära dig använda denna site. För att interagera med mig, skicka mig ett meddelande eller nämn **`@%{discobot_username}`** någonstans."
+    timeout:
+      message: |-
+        Hej @%{username}, bara ett meddelande för att kolla hur det går då jag ej hört av dig på ett tag.
+
+        - för att fortsätta, svara mig när som helst..
+
+        - Om du vill hoppa över detta steg, säg `%{skip_trigger}`.
+
+        - För att starta från början, säg `%{reset_trigger}`.
+
+        Om du inte är intresserad så är det inga problem då jag är en Robot.. Jag blir inte kränkt. :sob:
+    dice:
+      trigger: "roll"
+      invalid: |-
+        Förlåt, men det är inte möjligt matematiskt att kombinera tärningarna så. :confounded:
+      not_enough_dice: |-
+        Jag har endast summan . [Shameful](http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php), Jag vet!
+      out_of_range: |-
+        Visste du att  [max antal sidor](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) för en mattematiskt rättvis tärning är 120?
+      results: |-
+        > :game_die: %{results}
+    quote:
+      trigger: "citat"
+      '1':
+        quote: "Inom varje svårighet finns det möjligheter"
+        author: "Albert Einstein"
+      '2':
+        quote: "Frihet är inte värt att ha om det inte betyder frihet att göra fel."
+        author: "Mahatma Gandhi"
+      '3':
+        quote: "Gråt inte för att det är över, le eftersom det hände."
+        author: "Dr Seuss"
+      '4':
+        quote: "Om du vill ha något gjort rätt, gör det själv."
+        author: "Charles-Guillaume Étienne"
+      '5':
+        quote: "Tro att du kan och du är halvvägs där."
+        author: "Theodore Roosevelt"
+      '6':
+        quote: "Livet är som en låda med choklad. Du vet aldrig vad du kommer att få."
+        author: "Forrest Gump’s Mom ( Författaren: Winston Groom )"
+      '7':
+        quote: "Det är ett litet steg för en man, ett jättesprång för mänskligheten."
+        author: "Neil Armstrong"
+      '8':
+        quote: "Gör en sak varje dag som skrämmer dig."
+        author: "Eleanor Roosevelt"
+      '9':
+        author: "Bruce Lee"
+    advanced_user_narrative:
+      poll:
+        reply: |-
+          Bra, omröstning! Hur lyckades jag med att lära dig detta?
+
+          [poll]
+          * :+1:
+          * :-1:
+          [/poll]
+      details:
+        not_found: |-
+          Har du problem med att skapa en widget detaljer? Försök med att inkludera följande i ditt nästa svar:
+
+          ```text
+          [details=Välj mig för detaijer]
+          Här är detaljerna
+          [/details]
+          ```
+        reply: |-
+          Bra jobbat!— din _detaljkännedom_ är avundsvärd!
+      end:
+        message: |-
+          Du blåste verkligen igenom  detta sm en _avancerad användare_ :bow:
+
+          %{certificate}
+
+          Det är allt jag har för dig idag
+
+          Farväl! Om du vill tala med mig igen, skicka mig ett meddelande när somhelst :sunglasses:
+      certificate:
+        alt: 'Diplom för genomförande av avancerad användargenomgång'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.th.yml b/plugins/discourse-narrative-bot/config/locales/server.th.yml
new file mode 100644
index 0000000000..7ed98e15d8
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/server.th.yml
@@ -0,0 +1,8 @@
+# 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/
+
+th: {}
diff --git a/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml b/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
index 00efffd670..6a0720c1e5 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.tr_TR.yml
@@ -5,4 +5,94 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-tr_TR: {}
+tr_TR:
+  site_settings:
+    discourse_narrative_bot_enabled: 'Discourse anlatı botunu etkinleştir'
+  badges:
+    certified:
+      name: Sertifikalı
+      description: "Yeni kullanıcı eğitimi tamamlandı"
+    licensed:
+      name: Lisanslı
+      description: "Gelişmiş kullanıcı eğitimi tamamlandı"
+  discourse_narrative_bot:
+    dice:
+      trigger: "yuvarla"
+    quote:
+      trigger: "alıntıla"
+      '1':
+        quote: "Her zorluğun ortasında fırsat yatar."
+        author: "Albert Einstein"
+      '2':
+        author: "Mahatma Gandhi"
+      '3':
+        quote: "Ağlama çünkü bitti, gülümse çünkü gerçekleşti."
+        author: "Dr Seuss"
+      '4':
+        quote: "Doğru yapılan bir şey istiyorsanız, kendiniz yapın."
+        author: "Charles-Guillaume Étienne"
+      '5':
+        author: "Theodore Roosevelt"
+      '6':
+        quote: "Hayat bir kutu çikolata gibidir. Ne bulacağını asla bilemezsin."
+        author: "Forrest Gump’ın Annesi"
+      '7':
+        quote: "Bir insan için küçük, insanlık için dev bir adım."
+        author: "Neil Armstrong"
+      '8':
+        quote: "Her gün seni korkutan bir şey yap."
+        author: "Eleanor Roosevelt"
+      '9':
+        quote: "Onları kabul etme cesareti varsa, hatalar daima affedilebilirdir."
+        author: "Bruce Lee"
+      '10':
+        quote: "İnsan zihni ne olursa olsun düşünebilir ve inanabilir, başarabilir."
+        author: "Napoleon Hill"
+    magic_8_ball:
+      trigger: 'kısmet'
+      answers:
+        '1': "Bu kesin"
+        '2': "Kesinlikle öyle"
+        '3': "Şüphesiz"
+        '4': "Evet kesinlikle"
+        '5': "Güvenebilirsin"
+        '6': "Gördüğüm gibi, evet"
+        '7': "Büyük ihtimalle"
+        '8': "İyi görünüm"
+        '9': "Evet"
+        '10': "İşaretler evet'i gösteriyor"
+        '11': "Cevaplar bulanık, tekrar deneyin"
+        '12': "Sonra tekrar sor"
+        '13': "En iyisi şimdi söylememek"
+        '14': "Şimdi tahmin edemiyorum"
+        '15': "Konsantre ol ve tekrar sor"
+        '16': "Güvenmeyin"
+        '17': "Cevabım hayır"
+        '18': "Kaynaklarım hayır diyor"
+        '19': "Görünüm o kadar iyi değil"
+        '20': "Çok şüpheli"
+    track_selector:
+      reset_trigger: 'başla'
+      skip_trigger: 'atla'
+      help_trigger: 'yardımı görüntüle'
+    new_user_narrative:
+      reset_trigger: "yeni kullanıcı"
+      hello:
+        title: ":robot: Selamlar!"
+      quoting:
+        reply: |-
+          Güzel iş, benim en favori alıntımı aldınız! :left_speech_bubble:
+      emoji:
+        reply: |-
+          Bu :sparkles: _emojitastic!_ :sparkles:
+      certificate:
+        alt: 'Başarı Belgesi'
+    advanced_user_narrative:
+      reset_trigger: 'gelişmiş kullanıcı'
+      title: ':arrow_up: Gelişmiş kullanıcı özellikleri'
+      edit:
+        bot_created_post_raw: "@%{discobot_username} bugüne kadar, bildiğim en havalı bot :wink:"
+      recover:
+        deleted_post_raw: 'Neden @%{discobot_username} gönderimi sildin? :anguished:'
+      certificate:
+        alt: 'İleri Kullanıcı İzlemesi Başarı Sertifikası'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.uk.yml b/plugins/discourse-narrative-bot/config/locales/server.uk.yml
index 3acfff74e8..c2ab7cfa66 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.uk.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.uk.yml
@@ -5,4 +5,25 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-uk: {}
+uk:
+  badges:
+    certified:
+      name: Сертифікований
+  discourse_narrative_bot:
+    dice:
+      trigger: "крутити"
+    quote:
+      '9':
+        author: "Брюс Лі"
+    magic_8_ball:
+      answers:
+        '9': "Так"
+        '17': "Моя відповідь - ні"
+    track_selector:
+      reset_trigger: 'розпочати'
+      skip_trigger: 'пропустити'
+      help_trigger: 'показати допомогу'
+    new_user_narrative:
+      reset_trigger: "новий користувач"
+    advanced_user_narrative:
+      reset_trigger: 'професійний користувач'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.vi.yml b/plugins/discourse-narrative-bot/config/locales/server.vi.yml
new file mode 100644
index 0000000000..fa809fe162
--- /dev/null
+++ b/plugins/discourse-narrative-bot/config/locales/server.vi.yml
@@ -0,0 +1,8 @@
+# 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: {}
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 0b5ca0f949..a8e8036a40 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}。好久没见到你了，一切可好？
@@ -38,7 +38,7 @@ zh_CN:
 
         如果你不想的话也没问题。我是个机器人。你不会伤害到我。 :sob:
     dice:
-      trigger: "投"
+      trigger: "骰子"
       invalid: |-
         我很抱歉，数学上证明了不可能投出这种色子组合。 :confounded:
       not_enough_dice: |-
@@ -50,10 +50,10 @@ zh_CN:
     quote:
       trigger: "引用"
       '1':
-        quote: "undefined"
+        quote: "每一个困难中存在着机会"
         author: "阿尔伯特·爱因斯坦"
       '2':
-        quote: "成为你想在世界看到的改变。"
+        quote: "如果自由不包括犯错的自由，那么这个自由就不值得拥有。"
         author: "默罕默德·甘地"
       '3':
         quote: "不必为结束而哭泣，而要为曾经拥有而微笑。"
@@ -80,11 +80,11 @@ zh_CN:
         quote: "心想事成。"
         author: "拿破仑·希尔"
       results: |-
-        > :left_speech_bubble：_%{quote}_ &mdash; %{author}
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
     magic_8_ball:
       trigger: '财富'
       answers:
-        '1': "很可能\b"
+        '1': "很可能"
         '2': "一定是"
         '3': "绝对是"
         '4': "肯定是"
@@ -101,7 +101,7 @@ zh_CN:
         '15': "专心然后再问一次"
         '16': "不要指望它"
         '17': "我的回答是不"
-        '18': "我的情报告诉我说不"
+        '18': "我的代码让我不谈钱"
         '19': "看起来不是很好"
         '20': "很可疑"
       result: |-
@@ -109,15 +109,15 @@ zh_CN:
     track_selector:
       reset_trigger: '开始'
       skip_trigger: '跳过'
-      help_trigger: '显示帮助'
+      help_trigger: '帮助'
       random_mention:
         reply: |-
-          你好！想看看我能做什么，说`@%{discobot_username} %{help_trigger}`。
+          你好！想看看我能做什么吗？说`@%{discobot_username} %{help_trigger}`。
         tracks: |-
           我现在知道怎么做这些：
 
           `@%{discobot_username} %{reset_trigger} %{default_track}`
-          > 开始以下的交互模式：%{tracks}。
+          > 试试这些交互模式：%{tracks}。
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3，6
@@ -143,15 +143,15 @@ zh_CN:
       reset_trigger: "新用户"
       cert_title: "你已经成功完成新用户教程了"
       hello:
-        title: ":robot: 祝贺！"
+        title: ":robot: 你好!"
         message: |-
-          感谢你加入%{title}，然后欢迎！
+          感谢加入%{title}， 欢迎！
 
-          - 我只是个机器人，但是需要的话[我们友善的管理人员](/about)也能帮助你。
+          - 我只是个机器人， 但是如果你需要真人帮助，请找找[我们友善的管理人员](/about)帮忙。
 
-          - 出于安全原因，我们临时限制了新用户能做的事。随着我们对你的了解，你将获得新能力（和[徽章](/badges)）。
+          - 出于安全考虑，我们暂时限制了新用户能使用的功能。当我们更了解你的时候，你就可以使用更多功能（和 [徽章](/badges)）了。
 
-          - 我们一直相信[文明的讨论行为](/guidelines)。
+          - 我们始终相信[文明社区行为准则](/guidelines)。
       onebox:
         instructions: |-
           接下来，你能分享下列链接给我么？回复**单独一行的链接**，然后它会自动展开显示一个有用的摘要。
@@ -162,22 +162,22 @@ zh_CN:
           - https://en.wikipedia.org/wiki/Death_by_coconut
           - https://en.wikipedia.org/wiki/Calculator_spelling
         reply: |-
-          酷！这对大多数链接都有用。记住，链接必须要**占一行**，前后都没东西。
+          酷！这对许多<img src="%{base_uri}/plugins/discourse-narrative-bot/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">
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
 
-          如果你喜欢它（谁不呢！），在帖子的下方赞 :heart: 一下，这样我就知道你喜欢它了。
+          如果你喜欢它（谁不呢！）就在帖子的下方赞 :heart: 一下让我知道。
 
-          你可以**用图片回复**吗？任何图片都行！拖进来后释放，点击上传按钮，或者复制粘贴都行。
+          你可以**带图片回复**吗？任何图片都行！拖入释放，点击上传按钮，或者把它复制粘贴进来。
         reply: |-
           好赞的图片—我点了赞 :heart: ，你知道我很乐意看见它的 :heart_eyes:
         like_not_found: |-
@@ -222,22 +222,30 @@ 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}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">并<img src="%{base_uri}/plugins/discourse-narrative-bot/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\">展开更多操作。"
+        not_found: |-
+          啊哦，我没有在这个主题中看到任何收藏。你在每个帖子下找到了收藏按钮吗？如果需要的话，使用显示更多<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">展开更多操作。
       emoji:
         instructions: |-
-          你可能看到我在回复中用了些小图片 :blue_car::dash: 他们叫[Emoji](https://zh.wikipedia.org/wiki/Emoji)。你能在你的回复中**添加Emoji**吗？以下任意一个都可以：
+          你可能已经看到我在回复中用了很多小图片 :blue_car::dash: 这些叫做[绘文字（Emoji）](https://zh.wikipedia.org/wiki/%E7%B9%AA%E6%96%87%E5%AD%97)。你能在回复中**使用一个 Emoji **吗？这些都可以用：
 
           - 输入 `:) ;) :D :P :O`
 
-          - 输入半角冒号 <kbd>:</kbd> 然后是 emoji 的名字 `:tada:`
+          - 输入冒号 <kbd>:</kbd> 然后输入完整的 Emoji 名字 `:tada:`
 
-          - 在编辑器中按下 emoji 按钮 <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16">，或者用你移动端的键盘
+          - 点击编辑器中的 Emoji 按钮<img src="%{base_uri}/plugins/discourse-narrative-bot/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）"
+        not_found: |-
+          啊，我没有在你的回复中看到任何 Emoji？哦不！ :sob:
+
+          试试输入一个半角冒号<kbd>:</kbd>打开 emoji 选择器，然后输入你想要的表情对应单词的几个字母，比如 `:bird`。
+
+          或者，点击你编辑器里的 emoji 按钮<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16">。
+
+          （如果你正在用移动设备，你也可以试试直接在你的键盘里输入 Emoji）
       mention:
         instructions: |-
           有时你可能想要在回复别人的时候提醒另一个人。输入`@`然后是他们的用户名提及他们。
@@ -251,23 +259,26 @@ zh_CN:
           （是的，我的用户名是**disco**，和 1970 年流行的舞蹈同名）
       flag:
         instructions: |-
-          我们都喜欢友善的讨论，我们也需要你的帮助[一起保持文明](%{guidelines_url})。如果你看到了某些问题，请用标记让作者知道，或者让[我们友善的管理人员](%{about_url})来处理。
+          我们都喜欢友善的讨论，我们也需要你的帮助来[一起保持文明](%{guidelines_url})。如果你发现了问题，请用标记告诉作者，或者通知[我们友善的管理人员](%{about_url})来处理。
 
           >  :imp: 我在这写了些脏话
 
-          我猜你知道要做什么了。点击**标记该贴**<img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16">然后标记其为不合适的！
+          我猜你知道要做什么了。点击**标记该贴**<img src="%{base_uri}/plugins/discourse-narrative-bot/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">按钮，这样你能看到更多操作。
+          啊不，我糟糕的帖子还没被标记。 :worried: 你能**标记**<img src="%{base_uri}/plugins/discourse-narrative-bot/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”"
+        instructions: |-
+          呼…我已经在这个主题中隐藏了一个惊喜。如果你想挑战的话，点击右上角&#8599;的**搜索按钮** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16">来找到它。
+
+          试试在这个主题中搜索关键词“capy&#8203;bara”
         hidden_message: |-
-          你找到这个 capybara 啦 :wink:
+          你怎么错过这个 capybara 哒？ :wink:
 
-          <img src="%{base_uri}/images/capybara-eating.gif"/>
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
 
-          你注意到你回到了主题开头么？**回复`:herb:` 这个 emoji**给这帖，你会自动跳转到结尾。
+          注意到你回到主题开头了么？**带 `:herb:` 这个 emoji 回复** 来喂养这只可怜又饥饿的 capabara，你会自动跳转到结尾。
         reply: |-
           你找到啦 :tada:
 
@@ -277,7 +288,7 @@ zh_CN:
 
           - 如果你有 :keyboard:，按下<kbd>?</kbd>查看有用的键盘快捷键列表。
         not_found: |-
-          哈...看起来你碰到了些问题。抱歉。你搜索过<img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16">**capy&#8203;bara**了吗？
+          哈...看起来你碰到了些麻烦。抱歉。你试过搜索<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16">**capy&#8203;bara**了吗？
       end:
         message: |-
           感谢你@%{username}一直和我相处！我给你准备了一个东西，这是你应得的：
@@ -304,19 +315,18 @@ zh_CN:
         not_found: |-
           看起来你还没有编辑我为你创建的[帖子](%{url})。你能再试试么？
 
-          试试<img src="%{base_uri}/images/font-awesome-pencil.png" width="16" height="16">图标来召唤编辑器。
+          用<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16">图标来召唤编辑器。
         reply: |-
           干得漂亮！
 
           注意下，你初次编辑后 5 分钟后的修改将会公开显示，一个小小的铅笔图标将出现在编辑次数的右上角。
       delete:
         instructions: |-
-          如果你想要撤回你的帖子，你可以删除它。
+          如果你想撤回你的帖子，你可以删除它。
 
-
-          前往并**删除**你的任意一个帖子。不过不要删除你的第一帖！
+          使用<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.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-trash.png" width="16" height="16">删除按钮。
+          我没有看到任何一帖被删除？记住点击<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">显示更多可以找到<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16">删除按钮。
         reply: |-
           哇！ :boom:
 
@@ -324,11 +334,11 @@ zh_CN:
       recover:
         deleted_post_raw: '为什么@%{discobot_username}删除了我的帖子？:anguished:'
         instructions: |-
-          哦不！看起来我不小心删除了我给你创建的帖子。
+          哦不！看起来我不小心删除了我刚刚给你创建的一个新帖子。
 
-          你可以帮我<img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16">**恢复**它么？
+          你可以帮我<img src="%{base_uri}/plugins/discourse-narrative-bot/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">恢复按钮。
+          碰到麻烦了？记住点击<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">显示更多可以找到<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16">恢复按钮。
         reply: |-
           呼，差点啊！感谢你帮忙 :wink:
 
@@ -338,11 +348,21 @@ zh_CN:
           你知道你可以在你的帖子中提到分类和标签么？例如，你看到过%{category}分类了吗？
 
           输入`#`然后选择一个分类或标签。
-        not_found: "哈，我没有看到分类啊。注意`#`不能是第一个字符。你能在下一个回复中\b拷贝它吗？\n\n```text\n我能用#创建一个分类链接\n```"
+        not_found: |-
+          哈，我没有看到分类啊。注意`#`不能是第一个字符。你能在下一个回复中拷贝它吗？
+
+          ```text
+          我能用#创建一个分类链接
+          ```
         reply: |-
           漂亮！记住这对分类和标签（如果站点启用了它的话）都有用。
       change_topic_notification_level:
-        instructions: "每个主题都有通知等级。默认为“普通”，只有别人直接回复你的时候才会提醒你。\n\n默认情况下，私信中的通知等级被设为最高级“监看”，即你将收到每个新回复的提醒。但是你可以覆盖任意一个主题的通知等级至“监看”、“追踪”或“静音”。\n\n让我们试试改变这个主题的通知等级。在主题最下方，你可以看到一个**监看**的按钮。\x1C你可以把通知等级改到**追踪**吗？"
+        instructions: |-
+          每个主题都有通知等级。默认为“普通”，只有别人直接回复你的时候才会提醒你。
+
+          默认情况下，私信中的通知等级被设为最高级“监看”，即你将收到每个新回复的提醒。但是你可以覆盖任意一个主题的通知等级至“监看”、“追踪”或“静音”。
+
+          让我们试试改变这个主题的通知等级。在主题最下方，你可以看到一个**监看**的按钮。你可以把通知等级改到**追踪**吗？
         not_found: |-
           看起来你仍在监看 :eyes: 这个主题！没找到按钮？通知等级就在主题页面的最下方。
         reply: |-
@@ -351,11 +371,11 @@ zh_CN:
           注意当你回复主题时，或者花了几分钟读了一个主题，它将被自动设为“追踪”。你可以在[你的用户设置](/my/preferences)中修改。
       poll:
         instructions: |-
-          你知道你可以在任何帖子中添加投票吗？试试编辑器中的<img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16">齿轮图标**设置投票**。
+          你知道你可以在任何帖子中添加投票吗？试试用编辑器中的<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">齿轮图标来**发起投票**。
         not_found: |-
-          啊哦！你的回复中没有任何投票。
+          啊哦！你的回复中还没有任何投票。
 
-          使用编辑器中的<img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16">齿轮图标或者复制以下投票：
+          使用编辑器中的<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">齿轮图标，或者在下个回复中复制粘贴以下投票：
 
           ```text
           [poll]
@@ -372,19 +392,19 @@ zh_CN:
           [/poll]
       details:
         instructions: |-
-          有时你可能想要**隐藏**你回复中的细节：
+          有时你可能想在回复中**隐藏详情**：
 
-          - 当你讨论电影或者电视剧剧情的时候，这有可能剧透。
+          - 当你讨论电影或者电视节目中可能剧透的情节时。
 
-          - 当你帖子中有大量可选的内容，一次读完可能太困难了。
+          - 当你帖子中有大量一次性读完可能太困难的可选细节时。
 
-          [details=点击它看看！]
-          1. 选择编辑器中的<img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16">齿轮图标。
+          [details=点这里看它如何工作！]
+          1. 点击编辑器中的<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">齿轮图标。
           2. 选择“隐藏详情”。
-          3. 编辑详情信息并增加内容。
+          3. 编辑详情概要并添加内容。
           [/details]
 
-          你可以用编辑器中的<img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16">齿轮图标并在下次回复中添加详情一栏。
+          你可以用编辑器中的<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">齿轮图标在下次回复中添加一节详情吗？
         not_found: |-
           添加详情控件时碰到麻烦了？试试在下个回复中包含下列文字：
 
diff --git a/plugins/discourse-narrative-bot/config/settings.yml b/plugins/discourse-narrative-bot/config/settings.yml
index e36e06f8a4..c33d382ced 100644
--- a/plugins/discourse-narrative-bot/config/settings.yml
+++ b/plugins/discourse-narrative-bot/config/settings.yml
@@ -1,8 +1,6 @@
 plugins:
   discourse_narrative_bot_enabled:
-    default:
-      default: true
-      test: false
+    default: true
     client: true
   disable_discourse_narrative_bot_welcome_post:
     default: false
diff --git a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
index 8ba0d0322e..4bf346baa5 100644
--- a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
+++ b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
@@ -1,15 +1,24 @@
-discobot_username ='discobot'
-user = User.find_by(id: -2)
+discobot_username = 'discobot'
 
-if !user
+def seed_primary_email
+  UserEmail.seed do |ue|
+    ue.id = -2
+    ue.email = "discobot_email"
+    ue.primary = true
+    ue.user_id = -2
+  end
+end
+
+unless user = User.find_by(id: -2)
   suggested_username = UserNameSuggester.suggest(discobot_username)
 
+  seed_primary_email
+
   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
@@ -31,7 +40,14 @@ if !user
 end
 
 bot = User.find(-2)
-bot.update!(admin:true, moderator: false)
+
+# ensure discobot has a primary email
+unless bot.primary_email
+  seed_primary_email
+  bot.reload
+end
+
+bot.update!(admin: true, moderator: false)
 
 bot.user_option.update!(
   email_private_messages: false,
diff --git a/plugins/discourse-narrative-bot/jobs/narrative_init.rb b/plugins/discourse-narrative-bot/jobs/narrative_init.rb
index e2e9219bee..68fb003f11 100644
--- a/plugins/discourse-narrative-bot/jobs/narrative_init.rb
+++ b/plugins/discourse-narrative-bot/jobs/narrative_init.rb
@@ -1,3 +1,6 @@
+require_dependency 'i18n'
+require_dependency 'user'
+
 module Jobs
   class NarrativeInit < Jobs::Base
     sidekiq_options queue: 'critical'
diff --git a/plugins/discourse-narrative-bot/jobs/onceoff/remap_old_bot_images.rb b/plugins/discourse-narrative-bot/jobs/onceoff/remap_old_bot_images.rb
new file mode 100644
index 0000000000..d23f1c8d05
--- /dev/null
+++ b/plugins/discourse-narrative-bot/jobs/onceoff/remap_old_bot_images.rb
@@ -0,0 +1,36 @@
+module Jobs
+  module DiscourseNarrativeBot
+    class RemapOldBotImages < ::Jobs::Onceoff
+      def execute_onceoff(args)
+        paths = [
+          "/images/font-awesome-link.png",
+          "/images/unicorn.png",
+          "/images/font-awesome-ellipsis.png",
+          "/images/font-awesome-bookmark.png",
+          "/images/font-awesome-smile.png",
+          "/images/font-awesome-flag.png",
+          "/images/font-awesome-search.png",
+          "/images/capybara-eating.gif",
+          "/images/font-awesome-pencil.png",
+          "/images/font-awesome-trash.png",
+          "/images/font-awesome-rotate-left.png",
+          "/images/font-awesome-gear.png",
+        ]
+
+        Post.raw_match("/images/").where(user_id: -2).find_each do |post|
+          if (matches = post.raw.scan(/(?<!\/plugins\/discourse-narrative-bot)(#{paths.join("|")})/)).present?
+            new_raw = post.raw
+
+            matches.each do |match|
+              path = match.first
+              new_raw = new_raw.gsub(path, "/plugins/discourse-narrative-bot#{path}")
+            end
+
+            post.update_columns(raw: new_raw)
+            post.rebake!
+          end
+        end
+      end
+    end
+  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 2139a175cd..a503392f95 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,12 +74,13 @@ 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
         }
       },
 
       tutorial_poll: {
+        prerequisite: Proc.new { SiteSetting.poll_enabled },
         next_state: :tutorial_details,
         next_instructions: Proc.new { I18n.t("#{I18N_KEY}.details.instructions", i18n_post_args) },
         reply: {
@@ -101,7 +102,7 @@ module DiscourseNarrativeBot
 
     def reset_bot(user, post)
       if pm_to_bot?(post)
-        reset_data(user, { topic_id: post.topic_id })
+        reset_data(user, topic_id: post.topic_id)
       else
         reset_data(user)
       end
@@ -116,14 +117,13 @@ module DiscourseNarrativeBot
 
       fake_delay
 
-      post = PostCreator.create!(@user, {
-        raw: I18n.t(
+      post = PostCreator.create!(@user,         raw: I18n.t(
           "#{I18N_KEY}.edit.bot_created_post_raw",
           i18n_post_args(discobot_username: self.discobot_user.username)
         ),
-        topic_id: data[:topic_id],
-        skip_bot: true
-      })
+                                                topic_id: data[:topic_id],
+                                                skip_bot: true,
+                                                skip_validations: true)
 
       set_state_data(:post_id, post.id)
       post
@@ -132,17 +132,32 @@ module DiscourseNarrativeBot
     def init_tutorial_recover
       data = get_data(@user)
 
-      post = PostCreator.create!(@user, {
-        raw: I18n.t(
+      post = PostCreator.create!(@user,         raw: I18n.t(
           "#{I18N_KEY}.recover.deleted_post_raw",
           i18n_post_args(discobot_username: self.discobot_user.username)
         ),
-        topic_id: data[:topic_id],
-        skip_bot: true
-      })
+                                                topic_id: data[:topic_id],
+                                                skip_bot: true,
+                                                skip_validations: true)
 
       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
@@ -305,6 +320,7 @@ module DiscourseNarrativeBot
         raw: raw,
         topic_id: @topic_id
       )
+
       enqueue_timeout_job(@user)
       post
     end
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 3552d1663f..f2bbc9d3b1 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
@@ -19,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
@@ -94,7 +109,7 @@ module DiscourseNarrativeBot
             skip_trigger: TrackSelector.skip_trigger,
             reset_trigger: "#{TrackSelector.reset_trigger} #{self.class.reset_trigger}"
           )
-        ), {}, { skip_send_email: false })
+        ), {}, skip_send_email: false)
       end
     end
 
@@ -153,8 +168,8 @@ module DiscourseNarrativeBot
       end
     end
 
-    def i18n_post_args(extra={})
-      {base_uri: Discourse.base_uri}.merge(extra)
+    def i18n_post_args(extra = {})
+      { base_uri: Discourse.base_uri }.merge(extra)
     end
 
     def valid_topic?(topic_id)
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 0303491590..bb1f4dbeff 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
@@ -2,7 +2,19 @@ module DiscourseNarrativeBot
   class CertificateGenerator
     def initialize(user, date)
       @user = user
-      @date = I18n.l(Date.parse(date), format: :date_only)
+
+      date =
+        begin
+          Date.parse(date)
+        rescue ArgumentError => e
+          if e.message == 'invalid date'
+            Date.parse(Date.today.to_s)
+          else
+            raise e
+          end
+        end
+
+      @date = I18n.l(date, format: :date_only)
       @discobot_user = User.find(-2)
     end
 
@@ -464,7 +476,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}
@@ -491,7 +503,7 @@ module DiscourseNarrativeBot
 
       <<~SVG
       <svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 722.83 504.57">
-        <path fill="#FFF" d="M358.17 22.32H1.77V464.6H713.83V22.32H358.17zm330.71 416.63H26.73V47.98h662.15v390.97z"/>
+        <path fill="#FFF" d="M358.17 -1H1.77V510.6H721.83V-1H358.17zm330.71"/>
         <style>
           @font-face { font-family: &apos;Tangerine&apos;; src: url(data:application/font-woff2;data:;base64,d09GMgABAAAAAFnsABAAAAAA1BwAAFmMAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAABmAWi2AAhEwILgmCcxEQCoLaTIKhGhKmcAE2AiQDhlALgyoABCAFgSwHg08MHxuqtBeUXTuKQHcAR9WopyBFpN+kFTKKYOMAgKTHZv//n5V0xFhsRwMwO73K/AeBIBQmDJNlQlpaWSekbBM+rawStKstg9Qr4TVBIwdPtzmyjRzTp3kP99gc2E7XpuUUeC5YGBsEhsceAW8i388CETl83RsujPiFyA03OcUW/gmvdpv3tAwLsRQPUWl4iQQctdsXKun/aT97Ql5UsiZhxZQmp2zadhWpEJt6mCM09kmuD75XvSQddbxiVlYP/gLYA8UO0NwabGORt92yoTdGxSKBsY1tjIqRKaWCWNiIkS9YCWa8lRj12m/8qy/Gmx88//w46tz/Z5ZIEJvUqQyws4SJG1nytm0bKvymdPq9ko0sXu1KWhHYlmxLRjkmCDznEgcuOecQsPtQNFQ0R9N/mJ57DoDBc3ZwiAagdT7qsTHWOG1hAZvLvZHc/UoO99Oj22euhrmER846FVzwgoF5hhYm+fJO/Z/TPVcd1oWs/6/t4KIk8VoCT7DUThl0d/5xSkQB/A/pVi3t0tr5q1mpRXntbgvtTGyC/JIQUTSBEILLJPNi3phI6uGxv727LpBoXSKFwYcJRr6pv/anvwn+xJP8AHW5vcNaC22S/tPCLEk6sB8YqhDUqUMxOWA9gYegeRhIc6F/YV1sYr9/g8IqBps0W9Jp9nq3/rPtEBaYlegZRirw2k47IAd01sP/5rSkGZauX/pK/gy7UYYX6L6nvbtV3tOyFwiv02ugBAG39q5TQGcAmCf6C33BQKZ7woUtUIUrX6BuEbzxFQz8/3Oomn/eyfEbsJ+k89EDq+oavhbwGg7FWBdQrWLc/1tq0ln5ipxaWC4AXQC7hgLR6P9Za/bPjMuMfSfvXtHtusjtxSpucpq0V3oNQIE6Ka0TFhwAEwgCoOAhGBjAYACDGf5+/+q570clVgB9jrIS+RjRFJVUFNGgif8/+lkc0fo1i3Jh8z8f3ou4LvXpCMcbTTeEzf9Xzc8W94ISNyQMRiuHWJQ+Lho667h2V4iPILkkCI7SxvmjzcEpkpj9Zz7pFCU7N3Xscrdl4br0/819vp3Z5ey2570sYXkmBTwe0FZW19XVJXcm29DSpJRkMSlNSg+yRbaSWQEL94X7wn2h/ff9/fzykgDa4zSeY0WIzrbyv2d//DnzJS12MHKzE5DTQKYJ4zGl3X/evkztH503c2P91fWbEEOA2GDZki15QPoDMLcyERzopzYaBGPjReSLaD8OqPitDLJhL6R4Svp3Ot3u0hUq/D+Uvq8GoP/iMRteE7cCAih0KAg4GBFkJgx+jlCgpal/dLSvElNPV38ZiDKmib7+MDNggcMKX+CVvlQyGuQEfuoYFEyqW7SHjYOkS797DPkEzAxZa8SmyKlSlzKXmOcJf65QFVATeiqaMuqKNJS8qTy2aIuzIxlyFbqq2s2eWt+X+kDWAaA6SAOsWaStoIWo7ZJOI6OgUNGpYWodKyNNXGXhsQE56YKlB+HDFbQIESICMbGS5imJjJw5pVhBVUlFy5petGGozY5ZpGcxsDXmxCk8c33hFVrZ+OwCDqGfooIXtzgfSYFXqo+f1o6kOBfNJSZZ6ZPjhpchIUWZQ5KFLNsVOb+KJhddnhvyPxNLQdoKX0eRXDxA+sAnACnMCHzHEBIoKayy9hxOgfASeVXUKBq0t5izY4DNIe4Y4TVmQsgpcZ+RmJNr0W1JYUVlTatN25bOjuE9s+45sDiy/cQpZy7cvPKKb3zuAj3yKSx6iXiL69P4lfCT8pcVnlqv6loaOm/qLx1cAy1jtk0Xnlmd9C3nXSuBrXo96wMGkCFVo56OaSYMU7ZmPZlzuUDHS55VTms2+dwWjnZF7fPw2+HxAlxSmJFwQER+L/sf0v6f/CXzt+L/qHv/8p+W/+sDYAiCzMTWLrFFk1X6vIqouazvKHQD03Tr9BzeJbQ8trcT2cvS2aq+do5unkH36nH362nnHfAN+Ucb80M1PWzXDvtkC6wl/pU/Phi1Abba7n8SFUc70263u7NB7sI9uDf358k8l6/1VhQFwA3ablgzTJuQuRN3W5l0DOX388Dx5r/7b/9vOXb98G0t3beeZ4gZ4MXfM8BPIG/AUvIikzPdOmzA/zNT5YS5VlkuxnGdNFhrM70sjSZaZMACCy22xGprLLWMzgSnrHdSN3HmmgdhEhQTMwsAFQ0dAxObiJiElIyvIMFCyIVKdFmmi0ZKp5RAzcDMwSlTtgKFihTzKFWrSYcuPXr1mWGm+ea4YourTmOqDRoyar7dxjPaYB23Sy5a44CDIgyrc84e+62X4YxjTugOZp+jfMjg9kIyEukZ2CMhAx3DwsfBJcSzjUAgP/4CKIxwiRYmXLxIsaJoWCRJliJfjlx5bEpUKVOuRoWtqk0z2RRTzbLDbDtVskrVpt0ercbZ64bD7EAAAHbtM94mg0CBuX3lVCLENhQx0QD/Q6wmcO9AtnjSFOh65kvISEKUh06u/6NztF6lgiQA+qqYNE8FTQSJMBUsgYKZXzEwZQI72+47WF7AZXtgwS9aPXznaBvkwGrMlR7WGuSt5D4+OxJVUiHIkLBj7XkBt8q6rfLuP+MDqqQJ3P17pm9YVi5vVTQLETQf7Bk+qFwk8qlmat/KXNh1v5bs9TRD6oi1VoIcOpnJYxrY0aliGfmRm3DtPIquJA5evm+wNtMJadXMTwuRe7ulDHIpf+P+b5NcJJUKXdIcGq1cREpHDggYLcrCqxQMAFwFgAyBkO0gwVMBif7sgOwFwVsIP9/TlDA6wA+P8nlTinsAUgqQIKRVxDT8CkqERT7xaGMFhDwfgCgSgaBCZuP+fHVuREGD/HzQT38016SFXKM+P8y70eCU0G9UUlLrQzwNMN687Y1yBF+GCYI1aYSnRgAoHVxuOEF8li6v3N1f4RVZ8fww/9bDZ1EHYTDieD5pPZIm2Uh84lb3Vk3BYMTxPBRrELn85FN8ec90sMZrsuZ598cc3nf7OT6fJQj1EDcX4LEcozgu91UZqmOV54sBZ+s5hApUbjqQb4amaTrOgVKUQnG/cscEyRkrl2Q4xZniOLCmyKmcquz3TwWxO9WhqvH8htt1lkrn7DjfcPPiTFSPnE4foY4wcaAYQBGJCN4nXN93xPO74g2+hDrrIpSbHJaPYTGCUBSTvtUMz0/QiUvv7KhgsAVppMoXkRuO+OJNoq+AOf9zGJmNlEVmlUVtiBzTR72eIPaRaLpwDTMQT3O1reUcVVLe7+czuMBEmorsDYVg9DgWRjrfAM6/2AU7Eh5srlIICc+HMoLVMNLVC93ooE6L/hkHW4iBKD2yLFTqych1HXUfZ38HmWFlGudLUDmBjGU6+krqyUTkOiKx0nWyTP+6QhmIUrrscxwvKwyDSiAKmyvFQaCHp1FIa4VsimkKDgsjeUmHHGf/oT//AsSo3H5JKIyoKAhLklT2hM+zfguDahWG9rXKmRvTaobvHOh4dqda3rTqcmr38g9t2PefgiJdbITu+tjnKiqGQMLyMsA5xiAU2TKZ+30s6KBqEuSfAJCOW7ESzqTmJk/I8qEbpDbtH10Q0+/lv0l8J34np909hjcxK+tpgJG3S3L3Vh9DCE5nDPGSffRA+Z3uS49JkRaoJLOefULeWq778QJBkJc3VGPLvEGzZQrh5R8WU4HfZWhtWiYutwXOZhi/VQgivlX8tQAWFQslSVHksK6X1Fbd9i1vdly+OUhql1WKcJssBjYYVr9V3EtAb5G0cd/qYwBOTh87TdH0qmGUoQE8DlEyWmb2NOt+v+IBtoMBJuHCPOmPl45l7CXam6+friyUekB/LnbHgob04/bk9ktL7bIHWWIaWk/uGzcpU/nBjPVw6Yw7RNlWItiduBWdvBbP4IESJOIQ3vJKl5HJsGH8wR0XssR2ambrMBgYcfIWkSsLFgd5SLqPO/rvQ37KI261oskkLun7PXwrfVVbs7IffYY3Vlw4H9ncstkUdFR+erV3m9Xb4qD0pW2bg5I1WVhwjxZY+QWXkbNIhKa7tn5HGBDUYEK26sMXAlrLmNN4PbBwrCBBoMFROCi092kWEQLJpiPoseMw+iygC7W9HKjMZmCO0sO/uKb6go5RWqq4ioSrB1NdaeW3ZGHJ2siUIgYuKYxtk+ZY+2Pd0/feyWq/Y5hUmqN1aubpxY5P+fjFT1PCyQFok+53B6BdmnOdgNc+NPWg4z++29F/+roOU2miFl0diEANn1Pke9PEfJB9Bl1Xd3aceaqkt/TmnquX4XexcgAGER6G+/dewrxsn8LrlN7k4dlC8kWl1eZ99hZLVfSbjyNxVp0/46JWqFDzcp3qxZvCGsN4yOlcLwc/V6rgcCzd8ohCqLGwKS+V3mzkJuPxGnJcIwcX9zktnn9VXdj+f2bsNHwcrVhWwXZPTgK6iluD9rnN2/GEAbzVzU84GI69f48aVDVWhr8Eo2fxDNy9ON+uMPiKCvvs/nmsucnQK81JCMWz4CIX3qLauVtRj/QgF0z/knA3WLkgZt5oLaJhTpiUlPXDVwB3vYsN+sR9D2VoS7X5+J4Embv+7zS2KbnEx9R1v02tSrKTw9jYQDCeOYC0mhLHnpaw21Sv6pqu01yvaz409c+u2SGw5wHVaOD+6gq2nWJYeoK6K3QGheFB4LTQko6sNTf+9bbOTl514crsKS+kqCVnOdvNagH+ZloVShHBfhx5R2GtCiVImJQ447675WZJZKDYDlxkMOO0UcJo92+DlaliaBuO8ZmySbom2K+QfVi07rUpsE2EJjPiSPhC3jrz+rxFZM+c2jl+bMHKkk5WeufaR+96Zfyxs8XOqcECZHy5JNH94Yyfl+YmBnCAt8K1qv1x+cCxTTzbpYn6+7AQU91VtDyHa/eonvc5hg1eojhe4meBdsXxcW60F+re1ZXqycnK3aFepoScR3HsOadP7dyt95GtgyvkRiap3nmXvOLwUiYqu2CJ1nNFxVKI3qXDx1KmcjftMqz/YeDmmWbzS9WLMnn9stecMDgJS6Cm5haj99ZBIbsdvawaLycGrCdT3sW75y45RPWmOjvo7Dn2OFzEQJ+m1DsfXIa9eYDukyicZtZYb527FdiKUctUtGX0dD2YhxXV8PDhzPvZ9fMhEKxeocQOnr2K3M6N04jm6CzlZhK0b6BMFhjdHMh+QZVt7d514cX+uucFlRRZHt6ltJ+0tKfGB1DLMipOLevGGPZzrOzhDyIrEHZPBlmyK6UqlFkVvTBa2z2GlXnZEkd9pyMutCLnvjNkxN8BxcGOXCCATFij2DxRzMa5fNuqeGj048D4H0P5dHMV2Myo1Yd5jMSa9jjAfC6eUPF7dYe7upFAlDOeDnJkD5h2xYKlfU4DUlPleU1yiwpZmdw78lCLaFAshgxTrbr/ipsKZhlc3PV3WpyU0I3Gz5gzlNKyWeB+0OSgtFDXRo6bQo4sIrTRMAq6tbrhfcI+l2rZEinC3dkUT53kHKA6sHgydnfE2PFo6ohkdWlpich1sDwS3fZ3J90/ALhpp4Snv2qZg35JZE9FNIXvCP1i/o7zIHnZ+j7eb9+78pfv9S2i3JNnAaFqVlS9I31LNzW5oTaC41JlOoKiYCCNZqN3vBtQbLAkUvlYtU7N4XJQcxIzqNF4s3kpgjA9pE5u1j9Hcfgfng+S3sMiVWbOUsLMOLMBQhsWO9ySOecuof0sja4eVGqURAXq+UI8qcQn+DQeGi/kMs3ovesMiZkqEDxKxqHOQ518cVU6pjSSrF9wv6ITKnoHEuUZTBmTPp90RyOGMNfdN6EV3mqUfNqn8OKexpCI6eQe2uKBkcqVWpg0iUMNRwf+ES78EtFCbrkDpCsxLP3CYhT16hA+Pqdr8m5byugeaKQnL6GoaKl/QZX3QwzgBMeejwLj/xSLhm/W8hmww13PH8JEjWt5DfBuH4NkaYxT3fNkLGXhG3UELakAUMf1giALriKq/i82nj3XQxLgYH+Rh6r7//3gvTcHGq4hDm1w7LBk3pcluIH5Hx7kiLF3OslQpjEYHvydl4emJ9SfunHNERPs6rv7HkLd4tjWkuKoDb7q92eXyZ5N29rSbPcYpPFhlqwop0CBswwMb/aPj16GEYQejSk2j+hNQMtNRv34JhQKsfvLGuLZFa+ZogkNc8BZfUPBbm8rDq2qXdr9ErVsEqQk9yMi1pno7HZ7Me0NYsMWKoLwRDBys6OF33iAJwhTBIYCiOW3LSXtlxl8kdoNd0zuSm5yxegSmjzeiT84drY41WLNPZoFBJSLUShNBeOOhoPFhrgCZpvTTbOFKCIMHAOLHxfKlIAOyvC5cY5lmbnnz6It0FE9ip4QTORwdx5WVfeKj8l3oLhgPbsyJ8sVA11ENnta8ISkGkYaJjaan5gYuLOhqnwI+lrbeEK/AnB14S22GIhgOha5ovtUqh9g+Kv/HrVzGVpEgZ9mHKdZTInewX78/W1na5eI7UNQbWqhRkaxInyoE4vrGLm2O1+LCFJTtw4GSUzd5eZV5UpAk0UIh4fYpNozgAuI325YX/bCmbJqokrSesrjo/hwdhTZHL9vtdplvGmGMrE882kQf2BLs5N0z7x5PwBgIAhtCDCqR7Oya5cvmGJd5tyUOeyk+bUE+hxnnW72R62pXencz+Vsc9PGASUwNNbOrciOOpXzQpph2B05wIdGwWPy/OE430cJpzjyec3PbRnthZhfHfX3rKdr1xnI5RC314MWowkCMc4jAdqvlpOVu0ZKg77CQMerlmQf2qLKuFyvC3+m+FELCpMZkeyDsJ9PMElwibOY8rjRx8aIW7DVQG0+THVvyz0SCReyuRPlauPoK+so6V7nUt7yyqJMm7g9XASGOAk+N26fv3qPEyKky1GvUwZUm7Zk8kILNaD7sEolD83wsaKJRQ22IxRIEQaUfqqcMbxmMrDqFb+QtCXml/OCU0V+ZAQ+xBBtZobHC83xWkQ8xu3tHN/s067X/Rg3s9NOi2ZJBAAKq6OURcJEeEkJyDzeUEwnJ0/t8Jzb71/tFGMcuP3Hlg0bvUuMZZzwas/wLnMs5dA7xZFCHQ6tMoim9gmS28UYx1UylDlJVm7puag6836q/ldHEIWmvScX/pOQlDla1bTed01wn2SdRSdhc8OpsrwflnwjKVTPviCJHEUuvlOJ0JM6lyac3VG7nx8rVJeyifYJagCoG7SDmXp2mf5EWaMb8gIHwz4BMG7s7tiHYgPEdhsvXnX1jMEc16CIeIfySBD2HhfPWF8RLW6utkGEzJzjObnNmRBZmXZJvneMITYIBsnCmvsqY6V4y10rjw1W3QkUni83tXCoXESu2j4Ht9cd76h3bklBT+gY9aD6HajPzrYoWuNszsbcipm4ZhaNnKxJWeI4mgxIU0X7J56MnHeCKRH1IZ6Go/CKNm/derWOheGWkjzW+M+xx3Y8j6k2AQRB3/0QA4b9OPtyGVFQrxsTXJkcK8+tX8G8JD8/r6siO/E8iC+5OYyBegrH4uYQW5lBiqL6ANDoUror5iMPPfYLBsSNXGMlp8wm93IPu0VOemNgmrJu6BgxA5IRL92gGEbwgbONn5fXCDJBe2vrxQSJUUPEh7ZAibj/wClycQIF1pFXa1G5GJaPQD0op6PjsYUTMGPhFWkWBHbG7MubbTUEII7lv2Ieab9Glc5M2MGkEVSizf/TFtM2OHfrM7IFAqGpyo1Tgw0FVF/IELN9/0YZMDAdTiPP4byjQOmIzFbb0/SfW2j5iTBwY+W/6T0jP/ei4ePftNxtbHP3PTtxTWWAANoChjY19kXCBXeVxFGYGxsJlFNAqu/5dmLqKTY2CgZsjcLoLtZzBtwJYsPpFkc3kixTubrnzEoTUlShYqFhwobkSfEi/BUrTgNFgHEhHtsz7bknZw/6eTjJJtcu/PwIN/kLUCn5hoNmytbO5RUVZLugSvlaVO1axUh2ZXEmYYHwVUNSbAxif6/pcVzAaU0DfqhsEVnA5ihvMdeFmVVhPRYCGPTCTsdLypkEJ5kFWZUWTkvKVyRdAp3HqGkp9mL+E3DWSFItS9V2OmFrGpYXIJ7N5Ml0AJ/gAyVZwveljw0ppgdQShISyqsc9LwfcB/2i5MQrXg3oTM/CJyET0qeCMPtZMlxrzbp7Ac3TW2SMgoyIPg4qb1zm+d/jHjJwCFGHNMOMznIWVlaE+FzJF8ssA/KBV4nZXEzaZFwMLRugqYkUxwK+kTZEc4XFD3kel5sSOC+V5YJBNmNCXRDzNMOzb56xnPLjcd/KERn8IqPGWXkHniyB1wGJO2jtAyGnwJ3s10NPspzo8CCLpKVlWUC9TpWwbFVUWjFUXXdzTrfEdgpmuUc6yLecMYK7yRnKfXF6wCgjgbNIRHXoSduoGoWtthYKpcuu9hnoeRuHlbbENGP7e51mfA2nQVAuCsriaes0d82MIsZ6x4X7W+2Vh7gJ0h2a8H6JcOba4n6mxcZHDu7VGHPInyyjoTSIg5VBC5bOPXqzmrSjOyDVfXVPy+2rnp1IwUFdVb+Snu8NdnIqff5AXOdDnns7pRzjI41aWTQD6u+cbweeEALL6wot+tAiR4KXpJ4yD0VSDHyIs4+GxN7Xr99iyZzcDwMtqIw4C/4Ia5amEFXVfi7OYOd28YCnM3PLBFlQNxtykbcCPPP5tiPJR9DuNkkDWkK61TDzz7Ivc/E6XT299p6F186lbpB1L0n2yfB2ZOzig70Bh0stAUauersfT9nn2G1LLocIb2p+QGjm+OwPIjzDZXLUPX8bpB0ERA4S5Y92bLb12oaUOAgzaStVxCqc+syEKJST5YtkBt2sNwOMnOerV8OfVhS/JdteenjGzLlvIj12Xdhi0Zl8RJsWtotMeBnfizidm5w5mpG7hOP9nwrUwOVmGGooleBCSHdz4K5kxikrxuEoQl0dkTbKrh3C/uPpFWQxQpPwygk5DXdZWC/Ot2/u7qMiZeFKsXZRJF5Q8YJQHXaLw5olYxXeDcqaXhTTUWu2q6Y57cDxIesW67ymtwMzWjvtqJaFA7LEgzo4NUWnL7nUoWQubx0CiuO3tf9BhcDPXxTXGk/slxAuHIa3s43puf1hnlwE5lZn/cUDx5bQEzKjeB2vY3W/rLkOupqCLfx1aOjZIeBYNI+bnuwc3tne6hXS9VVBk7fMy16aXYIfIOkttZ81MdVXSrnxlQWL5JxH1KL7tS7k6slOrZtQ8cYzfcixYqq4t1XBSF6yaRcJ3ftZsR3b7lEQUqk6sf/1+qVRIJmJWCA72Rx/l1HhAOL9wG4J8IiAKGHKnPENeR2lbyZIzMKHOR5g/ePYwVCTZgNSAvJ8hrxvnzeatpoL1E+oZpJGT6CZp92pPah0S8mZZlRp3I8Wa6Dlarc53zqhwv4M2f15Zg0lDlsTXJROiYDLIRhCtvLCv0caCvRBE4JIJpiZyxxG2ZOPzKWVxB//QMRRsKPEglwEi8wjQgj0ERM4BOBBkKdDG36buuJKBraYQGw/ikziKTSBUCR90EeF1+REo3G2bYpdNPsGuLK0V7x3m2TsMjSxWfdAg9Zt+u2gx9pagl15gRPtERx8qJ1DmmEKT+DbAZ74GEf2RD7HwsuML5ArFGLMv1WR88rr+5XRTanItM37HULimG6XbccgojSOFG44sZ/kHrKJtr32b1a0mRTR4L4PsDyt47YFWfj8yUatTAjzBo9r7ymX5UhXn+kKRSLFj3pFpiWnpXXwTorq0XJVeWitLJkqlNcDN/HN98KKaIo/VWMQ+U8udCZoE4PihqLZ7F/lepofvS7CRo00jNltQgogmZldQ3d8BV8wH0O2/FQs7EXAAWL3gdbfochhbFj248q+HZlnPqHruT4pCid34js5T/O2JTkIrQJpZ9+UUkNjvJlGAAdQ0Th8DGJ2AlFgNWNuTdZum6u6OPwujhYY69cYaTC0KQDXxENPk3hLxd1Hio91NytZKklDUx+fczanUu7TEZTHOePk3AZiQNhM1m2Ef9QK1ujiapmpAJ5iC/81pc+qknJ3jZrv/ogXfVv7VJ3MTYouSSRqhOkwSmGble+JAlhQadhMuKK9K1R6UXy6VadXK+Mcakw8K/eo3B+k3uworgtUB2spZ0v5QVIdS/UviK0yeBwp1YPzles+cMiVKgSTfGG+EXVXf02Z6CEhVn5H7tS4YHeOgGyvCP1aZsoWSR8ZSaghpXmcwKt0uRc43Jhy8mpO7WX5fKBgPI4bnOgzCh0wAaH9u/E3GqieueboSksI5xl0pfZ1FlcRVionyzYmBHRzXdgqIOWLusPbtprSGipAecfomHVXS6E2UV9QFKkkxfrZyG9DW9/EXlxIkV/ov1pqxrWR/lLUJo+mFdXFBPp3R9opt8Py6cZn3IIxjpmclCnICBF/XSygNa+VBH+6R7L9IdoenzeaF8xHyRZwGjHUnd+nCFcxovfpYIDT36jCUcTrR2q4BRhuDE6Iba9tHBGbO0/m2iaG4YaHaIuLtXhXxQSl/prmaw80N2r4Nas05F8ZEoCty67nmS1/ORB+ztMWl8awa1GGi6ieGXRZIGsYqlCL3vINJwkqmUNRSMZDoSUfdM/u2xKk3uCv0avVsmlfnaT0RN+EI5Um92BP0V6ceglc2y1qNCS3ilxq1WGuE1VlPT4smk6ZF1sqpNf+2Ki1UJxVqQ0C+9S9+SljwvQGdXxweB+7Ru6j4S8cidPromLj8/jGrXyapwFa2TmPwJiluqxfgm5/jFmsucAvEn8kFavczWEWvwtwLvw6S9N78eBTjfFEtClTFcHBVANQ0IX7I1OFqyPCM/17SRq/SrOF5TlJ2cGSoF2Ct5QJ7RDjUUCtlloT3C6gwZ6+Sge+FtPaBGsUPoXlCE+GKoNaqZmkoyKKthgHiM25HiNwgm2WCO1sdmCNZrwCmktCffnqfEMmYmSe14wkWKPmW4qcIffrpWOLOSbaIHsBjy4wm4rmgePFn1PaY7s4UyNjVhBkxqFHmiPnmHMrsQwcJxfW0LDnIfd3a3zS5YJjBEuHwSCtMwwJi+xjlt6aGn3Km263/eH4yXyQOtehYz8vNdfkLXlD/+MQdvi2f1HTDV62hK+Ibk4Hb1wQ2isol9S7xHhRBiCdJexVlEcc59cF5zWvm7awrldjhTvyWx0OLybAmT+8AR52yfGLxNt8k7BRMBhJkrg5vEwWxKl036iZkqPXm90x/EyGJ71KgN4iWDjme1Kg36cJm+CZj+xZX6mSCF/c19QCJv0vEPO9bdxc7zhE2c1w3D+7HWWEvW4sMlkbRVvQlBrVEWCVRUU7hlc1yBvGcOgu3zhkckhySIrOz0sLWF+SW2vWh9uleSzHMEp0QtKmqYbpSVhHoU1SzHBUlvelaOtDbfmBow3hbFdNTaB+sY0lj4QnaTk009MVumDs0tL1rhwSoqfF2HSue8mnviRxvIZN8KFR4IrdGnx80trJ6n1AVr6wut5nfpnlJWTnkOcWUol0xOSpU11ROXzwyP2d1wvc16nln0+W1Ju8WRPyO3J7FQfjNPWhqfmBoy/rQgrUViz5BMtOt/iHFV2V/6knG7twSROQwba0qecbvin4cyd3Xu04ls0lSiYn3ohQxCtrY+durazSDq9TMwmrxceRvRHXT3N46hbFkiDU2iqmMgiRtKOvw3QNNJUv1/WUZ0RHek2HKJyfgm7WOhECopXNk3ywagYF+BwNexo3EJ/HQvCUEtFqd2/lg76FRJVoJWp6opZ1KtI5kYxLfJUzcy66vlGG2rJAw3fJIjPeydVapjtgkZwnVMeRxH5xpkpZeEFwW4uRO2yzp+ETcRb5oRXF6mnO4Ipqfvf+0flBGsd4mZjRLDlleShPBw6I4/GWnz3C18XPNFWVBurDLclk7phtlZ+4Gigk1N3ySdUvXstfzWJAY2NNkaokh0a2DF/D6Bh16T+kl9SF5LAHbp6lyb1TSL2MB6d4YbdiglzcvUpsb0sD80V2eE+BC2cISgGQ/SrnPVQbJoHjlCfbRQtW17K9RVpd6TQewguSdUDPZfyu0vRJvSFKHxJyjBmTvcaaXa6JVqa62P3cvG5za2l/KB4DuDertDBr7I5vv4BKgnXA3rotRI/kW7UwQzJyNGaQ+cnu8q/NO5q/bXZXSlsVG7cv7FXHMr9RonbAKOR7p+jKQ0xBrmVoUmIqmBYRXXF059oiHPJxqh08UpGWk6G0cbMVZsrAkxV24WB+81LLQS/eHeY0kmsWANtIj+itapzKqOMS07fOqeabeVRzeyOOM0NaVixvnxe8wPtosiVeCICDEjxL/Ct4ZWTcgTREmmksHnCP8Hs2fxQTh/PmrV5ZHuGXK6Ki+d2Rrem1SRNnUgQ8GCi2uRbssYdBOyapTrZLt8pCgF/2m6S7ps2oSHgVmH8p4z2v3AW9aSqjr4uowEhDciVOlkTfCZgW6XZX0J0rkZ2DbkBxu6q6EkOVgcFWMnVE8EZJL0+uq4kuci3JCb0nmA4SuCAW/x1OUiKYsefYSphNHoSqqPkH11sdnheaPmxZ90oZEJx6BT+LepCkzVCsm0KxRxA6YHzWOlh6mSp3K+dl4TyoFrYPRTVNtP0tJ70uoV8PQMlusvfBsdqIRXaTEQG1BGaUVjuroltT+YzvIbptQOYLTEA/aowjlcUlq61GlJ1aUc7ryDhEnRgaeizKXgmm/ZttaIJtpjKzGKLTFKDLjF3Eaev9pdk5uAXkQexPFcUaJBHpsmqL3hZFm5eZPf3oiG7nulHhAsoXzaJpWZRoNU3yawt/fcKvgRnkABgrUg3mbLhwbPfMdQGnBXt6T9sKnOYM/2SN/eS1JkYzVgcr6ghq1PmPvSi/lkIARNUen+baGj7KmOmv5p1tVYkZRpNqTK9CqG7peKu9BOkuDPcqqaAurL6zfHjj+hSjTEGPjdIW9PKr/n44QHlIQ67vEGfpSyFVa70s2e+DwDzD3kqP6fX7+wNdZBDpjX85gFQtD/mTB6YMX+mNrGB/diOjzK447gGxQIw+miFgRwknsq6MvX11sP2H2Kntb+vb9LMXos5vo4cp9OYV4omwUvmrjxnxyUADmjKTDxqKNjg3HR4D2mSRMBU3TwmIC3e4DSh4GAVX8tTZRhWLPHCBNtTH8ddJVNL79KE1Ld1OV2aDb3FrilHHvx5EoZQnv2FUnkdX6YhrBczGIUgSL6miPD24bNZHwTSFwsfUi2fKQViHk29aJKA96REgfIhl5/MGROD5GWEo9iAYOxgShNAzTj/lUc9cP8Yzdjx5T6Af5r7+SI4OaxjG5me6QvINqpZMqE5bLTj73sCqYq1pPSILEwVG8KdWYid0yFie512UYCJIId7szZlKDCbGGVuuMqhzkmcHTSb+iOEjAJYj5qpQQNh9AaCKKBoTVzUES+1VhUSa4rjucrKhCFmnollCZbSNMc17MAoU4BS4IKtyAtLCNByntO1MoUwS6XP9o0RlE0v5YnnbqvkUja9LHzqwadwmU7zDxYLp/2KhMKyju1tKcGjNp69uqGFDzyZeJ8FnMm6/Yl/ot4VQX7LD8oJzxqffkW2ZFb57gcEmoTB5+kQAwySh0nFGWnpgvwEx+mNhy5SCKRbZgnlKYGccUfA4NDSvxVTtSiaWGjr7l853KDiyA84c5kLgHpaN6koDkJlzhtjYdGU9KCdASO+W8gnXHAHJ3tG/y/HC8eOgxxSiOyAvjDOizqPOTaIRVHTAzdTYit5ZDsc3vSORtwbtZevEMpqFU6wuo1FvcoWUfXGjwxKEx6eO3uzcqdF4AQ/JfjfmR6z5GUdFEE6wvOkDiP6fahXVGwpBvczJtjro2b2MoUdIQp3velhHSoEyyPzpjtd2ywyXfQIdcLPfdCvGBNqFk6Ao/hMeIhEwk0+yO4rf4QfxVF9Zl9GotB4ZM+jP9RJarUHywvWiGFUUe4BGmWhsOrQeUrmJ+adhy10TiJJbFboM9TjImcGLsGlRIRiMemzgWKoiaLJQQGXqJDcyMm3/8ergbd8KcNwelCIgXsooS2x9ZoSQ4ox6M41zOtXp5b72emxWXhK25sAMQXq4SfgyJgaAI0n1BonVO7SzItXHhAYSA8/dSJRZ6aIh4kUPEbzGHCRKb0kpoB8KrxnZAMy6PINvDuNsB4NxzHsICi6pggn+/DZTC8Bl6KJfM4kL1NDHCM7vlwA8KNa/uBwhlc3ZMHSVZMycQpJ6W44PxciY/Y8yHT0lyAX+WzReegxvVc6pHl9AxBUOc8IqYaEcmSCu3vpwG2pWtRlkDHMHbAC5iK2Hyvl9sIHbmH+x5UhcHn7xq+BK3Ov3PBxWOUR5N7/z9t2fH/2yluiu7Mz4ijh21IEl+0L+CltWppQrfP3kb7HRoTWKuuCPJfb1vo/keaLPdzcuRnrVz7x3fzfQbhXvgslVRLkzfk7oKu3yavO82pJdhIZL5LqZIZi0ya/ngIlS+3T0w30+0f5TnINZ1bmBMqFl0FUs1uohUaCzy7R6G+evFEUhPex80A66AVCVcaz1Pp6iOxTlbY9u6tQO/4pTuAkdzYS59Bpt4CgHZAl8p8bzQR6jC1NKGoqiKFxt3bApULjKpZSHx8tvyaj3bgdksQjG8AtJ9AKFeXDhSq6yKlbkTuewOFT6IRAjh8Zs7LibbEgTCR3hqXU6YY5nfxp1uHsco9fRACohGpJLQ9CFCl8XV7iRtFU/njX4cKuqvhI8SZRWIjFlOiIMEX+X6WFN4WB/IvBvBIsynEfcJHGTabJuwHmISpZ2RzN8P3LEJkWbogNNkZO0QF61bSlcXbXtH2Ch3X8oz8K41vu1kyIX6p6fAPKyZ5qD5Sqpm20p2tnsQpjNPPirI1ebc8ZdzAwL/b+hrKqgEpy+96R0DdnbUJ06Ey3QcNN7otGLwncUkfuODGxPI56fJP1KMkOU34ShRSaC5fkvQr45b9F+85QsIeQuLk6poWPL0SiPbMETmgGSZWJYviLaU5IAw0KQ1q+R5byv0YgMWUxq473Xj8ByGnl+wpIw0P1xwuvEXrPqrWXC3V0rGjgNd8JaJxWx4MN1j65xPvhs0o0XTjDeSi/sVQeLtqzBbBBg83gG7pvijSpSL/FPuosdd8QFwucgEaXNnfSWjoD47dNEOY9+pnKl2gxKoSdHHEMRWQwhLEavEo+PYgWWbQHhfTlrq8kTTw1reqIX2+PeWja06LAInVxX85N8fys+b6AkcC/WnjgJfP9fcDhzbJSAxxGS6NmtnwWq0vGBbDFzwU6aMIXAPeZxCZniGpC22JbNFUGuzFEVTxKIRDiy6Q2EsUHifW1631H8WyAaa0TlVNuI+EOsAWkPDeo0UjXdoGT9LuGjCsO0k8u6n/Hwz4lUtpb7urihZjHONKfnLcgg0AcBvRkN4mfhaZJ6dewd3YxEgUOqM8kEs9XSEszRyAwaElGiaSaQkVifNHiqpuhGLRyB6D3HnRQGQ3h18bdz+/pJWEvInE5enaaiEGkdA39TwMcIUPb+hSk7xGx8w3PBU8Ip9IuM7ihNMJuzVFmYnzGdXyZlrCeQcUxbRMZRoTFGD5WD+3u6YhPTKYWzbzOJC/V0CI7cvAS3OiR08RTjst0rpJG2K09ykwsfsp27pSupHSsYmqqbZRCuWLc4U7fRem8UTGXo7NWJnjhWv8GJB5+o65ugLaNrPmFp0VCVj3vb+j9vZ9C3J12OfzKf2ATW8bU/f6fFFjvxapXUIueveYjSXtXkpGLUEreFIaRJIVCP5/kGJ/6CdcVc9oAg1e6QpWMRKpybYHrDuS63jDWvYTx6XgSLdHOTAL9wKTAgvWJ6oQGFLH+ELOAncdJf+qbOzvLHfCTz2ivhPsJWxqJomR/niaendzytjXTxzc4KMUV0c5t7r3GcXHyWZ5j1/cdZpawitmZo/FXvS9YdLExXcUDptC33OX+DZxO4vhoItXQbEHs1j8G3DAPsu4Os6F8BBJc4sggVf4WIqieELmLElV3dlZjqT7jH35DoQnI7ivfmdvv8lEAdSOWGh5DsjLTuWm4409/Xt9JSuFLOHqJli9jKTYCMHx4nV8Ts9ZCrMfijBDxB3Cy+tyf89AKgIO2WEQijQ5H8ZlzGYmaZ2+DR3/c9wn4W+x/7lyO34qBCZ1qRMYfEYU9x6jLLm01yTR+N/3FK6SSu11hB2BFQ36rYtD/VZQF0XPluwjDC5KbD53Do3Pm8+R710quaDXyokdXXSHotucEtzbxCxvDwiD3uxwIgCaKLKfnMEqQmKzJY09XieLxSPVMhZP8LJVITYptxV7FY7ZiMNdwdKEK9xgLHqbij2PJh1kz/oetSMxME1DkLQWoWhqgBYnYFIgd/2IQr2XixxXoyZppfHBxzhBT8SRmcXg3zP9/n9R5XOiCGWfgOZv8lS3KcHIOPYtcGK3kux5mCqM5j9FkMu3MAYUBfHQUBL3vrWKGJ4VFkrPpmeScqAP6p2K9L1d/ZnmcSx1LKqJmkzJCFULd2m2xWZpowEPNATKi8o7iugzAF3f1D36HHy4keke9J6HS2JE0SdceUyEqI9HTY8s0LcbxhnZVzXLnB0jM/OUvtpFKsX+y3BO1l3+qafVjhQoFI5srZDLfCZyw2eUNWQhqElnAKtadaBo6TXg0IFUI2KP9d1yvr9d7owhPSfIJYPKRBasbXiDdBELqLEGR99A3Nk768rRP/ZvNQzI1Lgokzniff3ND4zhBhHepvWdwj1wP/SYtCuIAuKIl/kZQikbjIu/l/FbD4pOQ8pUCB3gzFcAxqPSpy8VLysDCw5BC4oRUu6hZ9cwUiEQz4VojHh2YEtytfRhsDopWFCHE40vVLlGpiIDtwZObzn0p2dsyspnLBPA7BOHeXWfwmOcgp2/PkQzNf3g+X8rW7UqgkpLZWFac2c8cYHRO3IREMsuQBm3PbrtfEuCBgod/0pFkYgzTHKII/eyerIHu39MDfUJMl8iFQPgpPkv2AtdAFy+/sLfw+xLxY9csMDEGSWq4v8LKJFKw47sBLaxhEQYoKi+PDRbAEV9SgEJv+invQCSiMBAUdV1g4//CoDZnCTTQeeOIzHerjpnJuJLCsTI0g4ndKmgi37rEoywp2218B88Uu7Qugc7pInN2kJqgLSCTtuTG0OdWoQ+W5ij1OBJ+NXeYV22LT1WfMluR3V3RXbZeq48RLXlJShNVrl0w2yIuBpNBc0zdwh4SRqAiDdx4AmigR1HaACdDgSTUR7HgPmoY98+WzelsOrfQAV2YE2Sgo/uE/YtkwvY7ZFvvMywpeAuMJtclGbFeymJAz8iLaI3W3huTTFNEGVKxFltEJjvHP0qUo9eVSNRSNWq7fWNlDj2a/wsOx/76iCNV4/4wJPaJaq2K4o/FbppcpqKz/3W5GNEiw0knOzzYQXFkm/FQH8HX1Odp/hriaZQe58/qZ3P6nyLz8yqzQlh5YRnm5N9WydK8xY0pS/DT7VdMyOiPr7xbN6yFoqi5fs0TmPq4PE2MkSEN98hIsgSBEfhI9/+kEK0zynMZhkHjtuy05I+4fRRSx7vaWz1A8eTsw2gVmv68m7iKzCYTL1wS69xSDOoYW8vRPr5YshSQM+zOJOFPdROsOyBVbGNaJ5Vn6s9FCaNY3Lk/9YEXDB1C2V1lKfV2G5e9DLX67OQNGjhOt9Ue/J9TxPzJ4m+pE7bAFJo38xL2REnK6XJtpIapL78Lp8gk+ht2bgB/J5HUQHqn5RVPmsiOOOVPD4RHia+/qcJTmc/YTMoa4UJwr8J8h8l5RadwQpYE0W/JDIKQ1npm0I8gPtPM0fr6B/0R5MdLitEIw09+UXnAPw+ErgypSlah4aJTawAPyMuTo9q/dEbNw6DhOyjq46Ss1hMtQCigaALXlhRXZVWnrg9nGxOm/t1hiFTFPHp61owRd/3S5K/yEwu1AxauP/8JA9ZDWlMg5okdao40Z2LZgm628a8wjPxaw2gBuQmuarygHUPaGgoQw+sktdPj5U3Gonlp5cEGiR93w/kDArnZN0Kf5uJIrgjJFPwNtuTingHfEj/6WnzWIQMjXBXk96Tu3z2JHKGHzxGwJJA44iLmd4m3Q7DiH6axIJ/XFB8m8W2QCOnGi7clkqdSc8hUS7knwXYezDwPY0sI0qAIl0H6NayRzSrgMrFkto3HxGiGqLMY9JCX06nUmQw6P1jckrJiRj/BUHUPfRuV1jkF21y1tvKhR7rScTdppaaypLLU6gee55LAt4VPJx1n4VeLG4nHr/Hh7qny40z8Qe3SGB8fqifyKigBXNdifGAILXX7h50jclrfBtU8+WDji0avFSlM1v7oG7IN1+yvjHh8oRu5U99PtpGqz1REfHjTg/zVs4Z4vLHws5RsIw7AGvm2p++j+GU41JoUoAk2ZXUXlxKsCr02L8qmpvbwe3ZScYgCuVBNq+cIe2DRfSJGyrCwHj4OPmmADCjylGjYSNEJlfsstR6NtfQI+lXGO5R6KHEJa9heIosifoPAsoA1AqL3+4N78RCipjaAxDFZrQwvtAWPTeEHTwueSsQ3wahAUSmWyKJtKPTSaVXus5T6IbC7DvMBVKqMd6j19WNIJUvLxPUpdORxN7BYm3dpmJ8lWb3iYRgsHoHvrxQ0wiIpNCviUutBr5c82csIROrROtNxRMHxvJMynE/Bro8tChc4bRMz7+sLtvbZk2464fA4DhVWAJ14rcHwK+1ZBILGv3yNqRqF+g8wZ2/UXEJy31CBe5ad4b+HYd9e+XrqA8+t2lvkm5eIAK98FLjIyT+phzuOZWIR1zsPweJpErp+kYJVN1qvH0HUP2r5I0GWXUKEk+DT7gh4UeIoJmm7sNCbOJNByPD92UMe5qhp9Yr5/8wvF8nIh5YoHGRXG0dKrcR3UdgEYJSP+tBQc69r9OQHlfEspb4AY5u1J2PfTRnW0LfWhQexxJhxn1hIHNkG7HLxZTrBtpB0MaNHyPdIxVwj/SRXRA2X0NP90+NspgSbeO4YWXkSYoR/5xOFp6gS0aXAX6OE3yJGN/eBinRqiCOj1VZkzvpSSkDDnOD64ChjlCou1dvr5KicxjL0Ah3iqbD2zjW6s2G/JpxJHVowcn20fUbbsxJl9JRB0LjXnJU9q7PypkGMnqwXjtP3bV7ev7pH2aBCZCxQOL409TYHBjBddPi+nY3kpINJudU3b+5evFYdgY5iHbwKKKHH8pAYcdkrr4+YkyDp91kAibx/HAoOvUqehxKTdjq8fDi+IYXUWyhqjAg7k98ZhX8GkF/kzsdwfIm7LAPAOOI0ppAKlLEE/heiwEofn3F6QOudHDGbxlvNCQ0kxpkBnXfOR5B9jEa8WvHfZ9eTH1l03wElbc1YACNg1PW7/GUQy9HmFvh7ArglbaW0a9WhMV9RaAt7QRvg0/C/B2FWXP0cYLHWvAcL9xTSda9RwMkcGBFIA4hq74aW9UR8MmA+dKw/mLwHDoWNr7kjLh7SroVlqte+JlAdGMdyQmConN7weOhaCeRTv5+HXdbweMTReq84rgTZ9r61IEBV2D9J0/qjGTp1fgOsD9dKk++v7uqI034yLcWFvHTbFqiyMzt1y/dW6CLSzf+2oL0ymTCskNfXHx85XirSXO9YtlHUQXptMLgDH/vz5kQgH/rAt8IRRxE+W/3GPxvnqwj4NsrXPxWDPVqy35u1FT0gSjQ/Yo22magZ6taSm39MXWNYDX8TXuXe2xRScIwwrFDV118bDiqBfNzOM2xxR44X82k7pHzZyJDmfU7efRLRXzCZkWqSQVcXAdIyWZE0C56bWVSMb+PrSemC/Niqgvxclkq1jG245sIFaCo7YyySQhQCB/RGBhbnT1VEi5eWgRi8blMnp5aHmI9Go2ayCsQFATml4+z1cj35vCwnmEM6pSSUoaDq9hKzy/CF9w+N4wVxTTcz2bH8zVE5s51pHxRz2iA8hBiIAc1zRqLCT8bmYmaR9ALXOc9HdtrzhfmHUyBSDlLoQfb9v32ftvO9NWU2HKk+nGDIWBBsYP7bJUrQWdWIwn3pgD6ofuV0+Vgv/dy35qTOFwnSdMlfw6Oph3WQpVAdhGd5aP1eO/SpVL9wmySf+Sl4uwdKmqcbrMFJgl9W2EX6V2PxLIJqgUWq/NS9gS5TGDu9xipQRjBAMfvLe06dJR+pbeNaCLdFJ1OSn6ZQUuLf3I24IDpnEIXsVXJMx6d+Kpmi+hGIE3zDw3XeRISAVIsGHN6NovTVFeIlUSQJnrC/VDrBLQQrAQ25M5VIcIGjxVOE0MjQucu+MgDMUYBoDALs8FA+f3IU4f9w6sPURDZcJBFRlG5fspPEYyMG1Hwa8CMdC5KxbDPg9K6cT8+F7muNbhkKgvqQlr9xWAdrVGG4pOuTG6BEYs8H82//+01ItbDN91ZYxExzKoSgW+z91PvwBatpk82jHFs3c1R4EO0o7TvUUtZrS08UN4H9FINPrpGrKXPDfBnovLWjLUQD+Z4gwrBUPgFn/iczcMa2J0z2wEs1zS8Hpw+dbcowzJy+jWELDVgY/+ujT7qQKuxe3xfbEnf9zw+mkRo82yD3akMqNvXkH0sMVKSFG7NADB0ex0K0XoX7fjm0gGEUnG5SbFo7ukBgO+0AVYoi71cCAqwluehkwA4DDhBSSdqCt2VQhODYzwqGAH5Yf3Y3J2joCWFVZltTfgvhlrbjpqi1BUQfG1vl5cUyxJVqXhTsrryOmeLnJHx03/Dz65vVTtCYqJEj8kkXoy5iHPiW8tHzscvUXb//3vD8eam9/+b8rXx5xGWrkK99d+LWmt9PUiIn75G8emXIk401OXXYnmPJSs7Ob30RucaYbnKl5vgWv4j8jKI1J6SmTPq07gSRqi5+YhE44G+D6x5kYRpoHWSZKerJTSmNtlppgK5aA5L3lgKTHR6Byl/pPXJtBCR6gZSlBtIAzLgpYtVdeRiwVTpxdeyS0TtGQOt971lSaQz5FgIOT2lLfhrbTPSCRE6y8BtNlDLZtWJX9aKbu42E4hcRwzabGph6S7bGlG50WXPeH0Egr9bXCN9HUTwWr3DAHoTUXaoMOqchLoTBHbmqEvh3Tw2NWkr1UgBWBZvFYQIwEH2qWM4AcpkkJhNQjRe6YBNoDFCJlwgXTqP7jZvcUoBJqM3HMSRvhi+NQ7p4+A1FGqVuAasK2dSfW5cTaQioxsDaXT6z5iwz9TosdvqAcISRsuPa7S+/HlGUUmp1btHrP5v8JFOWbYkVr8X2wnyXLZ9GISnlT3D26P6x+uF6srwFpeJvF+0Vbr6I/m7EqvnrBDv427FJtLuQxHucJjXG0sBCR6/ao5OHyHXje95NjcvO/Pb1hXF+qFLN7DGx1mR9//tbvYSMX5OHnONhX583LsZxh7k4bSm6edG/7AWJcvQ/nBqfnfH9C/3q7O+fUSdpoV9vTrqBZPc2AwYC7ioR7yJy/KxkEKB8YBC1RPoYKzlSsSTsYWLo3zzBvp7x5zvp9Y4J3PrHIkG+PPGdenrYA56CJuWsa6y+VyWrLxpPmHhcIuyVyxe8AuVb/qZIOkS0gq0vKKJYd3EWLZPKLFlrbjfTzuvd4rObhjiVUoJAI95SkFQAtZwbgASWBQ/BsT9GMrsit/blPxt8jmrzkfgLR3I2Hyk4cod0SpuOxB88krPwSMHOO6RNux49SenONTiSc8yBgyPShTsG7wm9DuvVSe/OncLDAr0SqfmfhwARNnK51KFRT8H+N+N+cQiDV8E8BpvP9wQhC9N9Z5dkzsGCdH5sb7MiprhP409ksJ8yPnyB5oVGCZ/Gk8jE3sp4ez99mwOpHbKMu0g+GxmH7wIfnphO/GaVBnyskLtmPhx8dG9VlIHEpbvxiD3xvvFHT/UZl48ct+x9oHEflff3rt1e/7PA75dhkk14/+J+zMlTMbc198BluP0Ix195vp+HH71Q4Lb2QjapBwutzPpuXRzHu+MMH+0elY8XsIvbcIaLZINXcTc3BF9mdYkdYSfb4SK74FPJU3gVI9yNK2xwx4cs9nxA7r95DC3gmwtShxQ0TJm+5X6WvBUndq8shpT2nb2vR2mYx9ljMwz3scbUUMftIiKIQ5c2vUY3cd8CIjt+i40XOfept9+C5B+j1d2UYaNriICmLUvMF33hYz8ya1SxIqz4o1AZ8YAHMS83JrRnZ7R1T3B3gyGKpaH5FSWQ+9l9tpM2jFvdY21cXwiipsBNI59v0LHK53Meeaw6DBEHpUGKnjFa4y/PWE+xYW3yzEJWnq3ic5mNfeXz+x0B4rJNNGwU0W/39ICg21E4htW/pI5VVsuYvaR3ensblVM8tYpf+sTyOssSu6cE0UgMn/BtHPsoAXQcxAZjIvr9oIwNrLZCBAlJrJf7Sflf8d1AQQwB1LIasySbGpseKBtuzhE8odvWjvDrQ9KdaSN5/NVYW0MEysddvW36ti9Jky4zPE6Oz64rH+CGarcNGFclWcwWWUkqb6Isb7iMskOlMcyWNQq3DCad1MzWbitkzHikaRQQcTB4M6h+LpL+oQ9Q7dUS6Kqn3U3Tq/O4tg01EW7yXTIj4p1X34mhfUd9Vhb92hYaY8kH3p3VVhQx2FxoU/o2kKCTOA2++E6EJfgTwdbRifGe9Y0ObV/5sskG/5aAZ8BAgHTMt5H4jgpb0ruiwaLCKOjrmahR64K6+wc8fFSh+bbiy1B+1nHH3v7cfyLYlM0UkIikDWRP1a/j9ZZ1aPn3wQIVDl/5Y/wohFLKkCXrxo8cbBgEi70sRI0CswtccWkSXEL0iUbcQz90ns/XOpdoxabqLqe3M3/xeJWppmxk4LG9frKnpsscDQLHN3za6QwKGjgSxBEUcHfmZqagHoZ5rLC0PF0Mr5p3lg5LAAtJwR+MwRoaa2T3j6WgvawIKGYr/XDUj/wXyqlRUlnZJ6eUSGe7hZX0aFdsO9O0RZUQLlG7/NvNN1DZfy0NCBwPsJnb7MK5GeqKfelOcxn8tBN3NKPdaALs7/YfcX24BrhJNr7Zo225a3PgqicMWgA4RMgIFn3HI14cXgC8PXs7qQUFlb/dnuW0tulOu+9y0zeZvN61DLHZrNvFpGNxkOWZ8iJ+xyOeH54DvC25re8YvTZyxPg3+6rWcnweHtrE8DZBGcjviByzdghtunrURCwIqHXaBhiBXfNGkXyE9bizqbOIOilHmBRQSiRfzn7c2kvLEZEQx/AzKkLPjiWe6ptVVgdcIrCDvAKYcwgYvTBAIoMwkYjmDZaRK1V8Xyka1nJiNRdocAy3reYjqwJMKBiBHKf74awW2BNm5NgdsRu0binLFAafTIAWdlAGQlBFYeQyGAkaOgoYZjc6Un2HxCgDtEo5wnmIheUn6pc6zs9LJqjaS78U7+Kh3j/QMUiHbp9yzHfzR/TmPSYkiu2xYFHW/SM/mnRkAJH0waxkx3hLe9gYjTwNwB/1dbjhny/l1o78Ms8k+THHTRlbrjMTY13mjZ5owHUZasmNT9OxPKayCume9rxNYuU1lVY5QWEfAGBhnft97P4pny+DFPg5GH1EG4XSJxRrDmwdVRkBH7lhGuPanNNNdIt5fq8JL3jbEYgMp0d2yuz06ShjlQHgQ7zjUIWIR2Zks3zO89oTiWiecT5BhjrPGXCIKzGrkl4fY4hd3868vD1FATMBz53EqjtrS2OTJvCRlKO5Y8p9+ZSzsh3dgAX1G8djnj6Pn3HgSMFdUBexooEzjNaAw3Ay9f9DhLpSk6MgYLxxUPm+EIATsLA5lTVK6xayLtnzJzKdVempcAI4s/CQj9EN/JbhVSHJ4b/TnFzuLh/xgAcjOB+3h7pcgAM9bCfzoXxJCqA5UXxWGWN40wXhOt50vmtPJ8GoGigtWJFxNXPNjxTBWqWG8KzYxXAYFSclDCQIe7gKduDLBD2A34bV8BpfPSRFpGYoKHZcq4MSUzspRSWrsJ7UXa76+cXORG96mAcqa57MqS3lSJMe8dsUcG+zB6AdaPAPy/WzWgD/eXP7hczWv+PlJ0XpJ9frX8oEzqiIs0eYz1X+ad7RmMCKUolcxy2tpaAHp8N20ZCzMR+Lla4NTrNTikYE4klIXcwk7Uj+v6El/UsVv1WxfcJSLKccgt7NttG5FTlIzNMbSyHLYsNNSxT7TEiTRd4gO1FwddIX51fNcTWyOGTKR7y67gqoIwwdqpaJqud4ucMsO8BuFMbwSvT9qYKyCrbYGoIkXpYpAKXc9ugqeIsL75wswZLrcTIc97TKtjaepaQITRtzGeeQM09yQQpcNBAM+YJzhlA6f7JbRWxK+5IHY9InL4/EblAbAPeQ7XdpZA1SpGIaOJ9OUKlEhrWH2R6Lm6Mis5WupKSlmNFYUmvyGmIUZiHFiaamLwWKIdE1iqwyWhmTvqtO/EIU6iibUT7HMvtjdGIE0fU7z/2fgP8Dtk86cAALUMuuTh0/4w48gTfwBX6N3+Mn/PlV6ShWVU71G13nq7HmPQsuXOh/J1g6FAR0gwR9rHArHsWr+BS/wG/wPf7wJukk/ZcG/2q3T1iEwY61oynrXCdtI7RSq0lfBB0qRIpuOAAAAAAAAAAAAAAAAPsAAKDQJYL9AAECBAgQIECAAAECBAgYlHnk9jp0kwa1r7KQLdDSVs1gB3+LKNbq0kNNIEVbOz/1lQ5fD2lQaQ1vCq+ae++1bUYfDCyOTwWoPddeAZE0+aQqUi3RU3Pk7DHPhKVa2C8RVorJWAaXx76zluqfXRG81tMtJj6UfYi13VrDQTd41DwLdLDBCU71ZY+EdFsYseWYpqY5QWVyklslm+JwPxJ+5zm6e6kTC+fvSu5VgTfoSVnQy7hgA85ogkX+SCWGLnzVMZ95W33Ht6EKob+mYLQyGcFm6GqhCdRlNAXfVG9/lyVmxxprI9IyARtHVsLT4GWkbTL+CGDjUbG24TgExSvCQWli7dtXOlgJ31pIEAJG+w27K3PtCewueFmllo1sg/Fc/DEeSxRnd5brrx2usL8dIBGEOysAWDb9gKGf2TE4X9pkdrE5XKUNANcdDGcJtcK4ppehDfKhoIqPXIrGIWOBoMYSvkmp1vldcmk06SWN25i2Vf6STCuojgjpeWzXr/JRcpfvusQXyg9zYBvFHYlUUlvtvRrTtYeBON5hPS4Sbw4hqGa1DmmQT0RaOUDESk2mIxJqgu4YOMAE1jGJwauIFB9BVVSSZ7bJiy+2PpUXx4k2CUlkefUw0MEvKaR18h0/RMdg3DYVlRGhp7BQR5CHrKmx0sQcBoMMCOuwseSHnRYEVUPWX4LWI6I8VcYUlJpKwHq1uuSjU+3tH7Nm3nHlHXDBewbnDNHN17PzLPUF/fxt7rb1YmE+tgInzTFC9AS5Oygsr9c+DAh7yFsKwE9Oa091zd4BwBpCs3Lo6j7QLuAKgyhh1Z3zZ2Y21nn1bqektItWexhlJOipqWO14hHD1YdYrSq+Hex1j8uvliVkuAiC9UYJTJtBwKE/nrwduH2tOWpsWcsA4liWCzyEFYE5cemqGppPNWbMhKG7dZqQ1PRDhg9S7dkOG1ieKWfPZWM17eurXIkksVTrYp0PJQ/w8EqTAkBu5RarFmVBDPur1ZRVQRXEUZeSqQU+BFxpUNa6h6XHMlVjqbtrmuCws7IU7Nhh3iu6BbCBunQGdPF/GinKCd5HjAG7I5BoIAHXdXV9UthaHZMr0wWWnEMua9ahpYcHKFbITi12qoxVUY0U9bMykzI4x7W8+lzRgA0CsbjzcuCFDhisjX69Mq719590FrMqdRfyQq1q2EU3ytuGwToWKNZmau0F+qDreiZiHbwAlL5a32ZxaDjjussHlHrnGB7OH25xDTlV/K1/jpAR4hBXGPu7+zUUiBvIjwO3a6RGbvfbF9Ptgsryxc7dMi2QztLcSrZ24PaRpEpCaBL1ag6gLLevsxZd8uRXtKYQ54/DyF27UV25pnS/BIMXaCuCkhtHPXROeKkYn5JltKLg7OueT/j40kM/+PPKu77wARt+9bv68Fst+y9U8aXv+qVlZp7NuUpW+AIzfIclHg53XHwZHjir0ctUU6G+CDXexK2M4DcB6Let4jlc88yhk2KHPfPh7MNMsymHybB5ziDHdbMOqzNfsrTbzL3qE2zszTHCeVxKHTv7mIdNqCaos5OQXkFzDMo45+kPXvnl3aanLkctDlPgu6EO7+KGQ0Ev/GrZFu7Akh77ep76BBsqc/jtKMOmBPywTrtNBF+m3D/1o8e7NRhwGbcdZVkILAhIAMbX/CsSBQ9zKC237GrbXW6K7Y4cu7P4ka9PULUknt9akam+XnIXMhgod6+XLwctiIwWUFwQbVmwowN9ENiiYmqrijvxEgOGA/4vSoC3cWmlCG0LqFXDJUWk9qh/QMERhZvPKGw9TmHxWbW7c7xecnb+xdp42xknfy2hrrSC1aJETZVYFOfno5Q3PKM6uX2Ay99u/8tSDTvnsIvHYpeCxm/yYBZA6DIwOUQikKlM/12q2GrhWWZVIUGJL4KPc+zuLuJKJCZ3GdN0CNNCjAVqowaX8kujaq5dKtxdjBqAdZrfSOtuMDoTbBoN5F0Az83s9QhqAkslgJ5yB2J+IAdF6C0RMabibZJxrTBlrhEAoZY3CZaWRsTJZEgDk+qo4g3TutHZQm0tylMjiBm0EayrR9hWzBWkiMNK8RRjEdTvT0NgpNNUXdRoO9yByMAoyXhdqMz6RjWEFwBmlcekaol5aSkGKCctCc8RMSZEuA1wCHNwGOPpyPQrxbqJ5EpTYYIirW1V5QXWMmlTCUzrGgK3JMKMdBOTMrQNUo3vLSVbE21NJOhKVTYcgVSXx8eQK3hMjRkcqnRdqPeoaJplVfVFEUHUSKTIuzXEw9AZM6vjmNN9cwGiSZRazPBMd3PJgodaAtK8cPMHkOAwVFEzLYLZptlZoKLVNZk9miN/o+HZTA7XPxC7VVDSZDFxpKdYD09290SgpWRsmQfsJT8+AWkuHZuBOLxM3LpBZsQRErGysg5LUlAV4QzReNLUPXeptlVM3IwoB9RcHWmZzZzMZjbUes0nK07VSaqI1LPUCa9NPVmt9RyBJBULdTIvsjLWwUptTQysM3zYaTF5JIQiH/BKtEfvYUKlVQuvcbEi2JQCP7Pd16GLlHjhXm208qbJrWweA1bMWGaJNEt1RMtcEsMNgYoBUFTT2kUV2OZkTKYlc5PZZNGMmMidrOlaKU6bNGE5cMTSq1zyd8K/LWgQ1jRuEMHaxMqA2ylaCEA7n3xdnivDXdyySJWzsTBpxb1NWMzSp6cc7W7ptabKm+IxwFxCklMihTjHz4OIQvzcgmwddhlYYvSUIple0teEVhRmbaOLWJU0CjWfeb+ViGue5jbHYFmqDhFtPu/2QsBfcNY87AQYDrIGHB2hBhVUnekA48nNQXDDSjNfOFOnKnmYGeysmq6dTEldiUY/d7bsuIRnqjKjdxtiW5JI0xCSj5LUNG0kANpg8gAaXJPDErGRZg0Ec9we1+MBpMFaIhRVl0hubMTXzJkEWapyzVsTRTDJShWGXhqkKc2IJlvf2VUq5Xb3ZKrA3cA9to762G7K+ASn6JJ1U1TZa87q023J9axEDkE0kadGV0lF1xUFs6UER0fN0ozsASNJ3DSgBQSFsq7nB1YtyByZQ8qaAsT0UJDcnO8DV4/py9LU2b2qBbaPqbLBevJew6pAHItLjmP86IMrRwehH8gsxx2eRjMhxYs1t288hGC0pdXZstuVWvIMhdEGsmAuhFRNU1UV7kGMsGHd1Px2N41u+7FFJhiAHCghtt1YMCoa8q1JjuU2G9ShI/gP3G6GWQHqoWbRbxC3Y8ruxmLY5TSSGLeKpD2+8QzqN6vqagAVXhjW6JX5HvmK4oo8ylUQltR8UgktlbYUR66TUUJsmxCNTlvaHGPw0J69xwRJ4b1g8C+c1fPRKwLVyost9hIFozhzqYikWO8pgU2HJfRn3es2dzDEgnBPS78wzEUlwkkMv3ZBg537Anp+H9o7od+99yHSuo7VKJUTotSllvsPUXRuXi/KkkCvRrbGaFt1kWqZpO44uk54w+yMrxQE0Xw/2RY3X2jU3ddvjfcPKLE13B8V2VC+tUefxfWr1hcPEZrgu0GHwrhVWI08Jp8QV6RBQqJiJaNkNmJPN1bWDY+ECnEd0vR9yzKET5Co2LkYswAVChkg4ePGIdwJSzwbvVLnEVHs1lJfYk4eMeddrKRD8PgAkfBu8gsfn3z+6FZlET0q1t4zU6GZsdoRt+5GyHt0gdLbl9jfCf0RMxTR3cfnUamekPZcsl6IbxiuSNssGzpWcipuN40se2XLjsyyZoY+6ZaKrmuLUnPk2YZUfZUyxqkDJPdi8NNqpWnPJ+UkZJXVmNeX+ucKR6YoERjrEV8ogTlj9wPTX1wVRcgYI5aW+3gFenaYMqNT0e8+9fotNH8G+PNnWqRRq7bSaJzMlkkdOKE5ZlbRN6bDtg0SeXa1s2W9zB82Yxfosl3RnVJE+kns+x6UWqtNO8VjIoTypAgQvpkCEkRX9XxUTlJ2XY15c6n/COWsUhAZ23akN0DXwZSMfVG8uYklrJwpWt80TWyam2OMzn5yjgevzJFtBTL+8duMC4Tej67TtKl4FU/CE/Ila/Gh6HBdy5gTeJlrLxm2olle9emKm5leUiajWi2KAlmib362oczsyWPSbYDUfzhPIwZ6LxebtPTs3n3cdakvUZPq/YXOhS52AH9AniGDzSr2oPxwX4XYay1pyXx4ufrqgWxryuz31XypsSC+I7v8lOfVAtsYl8Us8G4ao/PKeEL/hkvWF3T4vmPNKQYt312y2C3t97KITv2mHdQqZLleL5eLSLJ+hGOnpCwBOu0ZNkByX64kHZkJ4aGzTdr1EmiZt/dn2c/mgofDmEP8DPwFZYb8A6rczUd9ecxkGn3vMIIgFcu0h8KLb4XYT4b13uBQ/EBx+b3fzwriMwzDLsjZLaYfdqYTxiecsx9FRxh6TlSO8l6UjfvJ0ahZAroR5W5UT8mk3UqSMpZcDOzZB8LqooTpSpgQ/riBCM9smIHhbJMMXMvVGDo+tMZVj2Mk5og5NK6i/CBd6bMIInIE/HtpIiG8L4gqAxPlwp6qoL43DD9Zbl9tDjUuJKH/jMdNRnxNy3IZvYQsaxa68AkHLt7zX4uOOI6COWkyjotLpov61X6vRu8mo7CSt8n6oF+vp9onCO2kFbVIw8SAVo5dBsgLfi0iSb0f1EpDPNC24nXX5Lqr/oHrBStsNZVnkULdIPtV+Do2galYsQehg6yvSi0NEy8t9zCJIs2uS57savQnYz0fCIy6Llb47+Cgz1oe3fNC1m+UAntjpukJ63zBj3+LjjSNS3Na2V5aWam96tx1Mm00V240J+mynA37ZD6f5XlLv6c4rvREj3XVtOTiYOKsAyT4N1H4vDnFZeiKQGjf6W7RcZ2NP1DzVML2QURVHdbvSPxL17IJHM2Nvbuybk8JHM12VMPwdMfQ5MtiwlTjGuTvaeZwLgr6LQ3D/9frKRc6ZxSV2bzRNKQT9hKw3QkByPVHuU6U3e8zx33TOvfXAJyc9j65+5S1WTP/7/z/WBXS/gXoUODmZ447KvxIoMmQu5aNXzUdvOlJL/sqrLMF0e8if0nNVe73aY1CW2zd6S2C7Y9tvSHKPiBsKPZf9+MOnBTTHwnp7Grd8hhaARN4ufnRTtCeqxTb0ynyZLbVtOaYzHaZR7vCQC5k6BFYPEhoWwSxbGfySPGKrASGjcGqfPST3Z36VvRLfeWTBNY4YJ3hQe9/itUKoPpS4m7s7fOchYSuXI8Q/TW7fF7Bn7wcEfkbap0V/+/hco2J/L/TckAE8LGrV/FF8zcu5/ogp/8/T1jqQVNxsxI9ImTYzlMe+5P55GrTz4cr9zOylvihSUAs9ftCHJzDEUlUnbdCZKDgDtj9oSe5aQE6XH8yps6ZW79cLtrG/7otZB6xTQA+ubenPsYM9zQAg9DHcaoKSPxVBR/lE7A7Dzf/TzzCN5RS/KvnNBGZKlI/6ixRfCOvqxkKjAAurUpJHFpwEB3GUp9PAoXGUN/s5e+ZBDuFJlkcyQcJxYpB+BMOcyXun5dbb9sr0f1j8GA1Gzn2thtxEH56tV9xqDtCHcWxJuDAV1xzWJmPq43CbXq4XiUMg1ZmJ3l2hQ9E1elv8qBkBgoNkSIomFzlERFLOKVoxZYMOBfaP4FHBtTMqRAagQ01JJZR5Crv9Llq5aDIgM6N24AECygTmwVMIP7dwv4FKg5Mrrro/rUK1SpTolHFFJRIo5eVaVGtUCOFYPIfMla99p3dRDeogNOhOKhQ51x+lUTJG9uhsk2ooav/2fZnWafYdlIevkqcc9qZ81m9MtAl55x34fxcP0ahVKhrLmnphkl2UJ7tKo74fybKTde0cluSGLHivJFGp0KV2aoNqoTSgUgNvQQqBnXuckdQYI47CtVr1KTBLjv9SbCEWZI+WptslowoRbNW47SwSGVlY9cmTbtOXUZ0GDKew3QYBlZOQqvttsde+7g8JJmKi6SI2z31TdCtx0QambJke2u3XGISMjlAFFRkNHQsbEjqUEyHMNQUDEw48/xiphneM5livzHcX2Z4Z6N8rx11zBoffPbFfROdd8IrIpUDBHg+++a7I/YqpLZWojwFeh0xzdGBvOtdOu4ECXGQF4oucxCUSLPsHSBnxAoAAA==); }
         </style>
@@ -530,7 +542,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,10 +564,12 @@ 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)
+        return unless SiteSetting.logo_small_url.present?
+
         begin
           uri = URI(SiteSetting.logo_small_url)
 
@@ -568,7 +582,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 +590,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 f39377d076..040da62c01 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",
@@ -120,7 +121,7 @@ module DiscourseNarrativeBot
 
     def reset_bot(user, post)
       if pm_to_bot?(post)
-        reset_data(user, { topic_id: post.topic_id })
+        reset_data(user, topic_id: post.topic_id)
       else
         reset_data(user)
       end
@@ -153,7 +154,7 @@ module DiscourseNarrativeBot
       PostRevisor.new(post, topic).revise!(
         self.discobot_user,
         { raw: raw },
-        { skip_validations: true, force_new_version: true }
+        skip_validations: true, force_new_version: true
       )
 
       set_state_data(:post_version, post.reload.version || 0)
@@ -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 &&
@@ -326,7 +328,7 @@ module DiscourseNarrativeBot
       else
         raw = I18n.t(
           "#{I18N_KEY}.images.not_found",
-          i18n_post_args(image_url: "#{Discourse.base_url}/images/dog-walk.gif")
+          i18n_post_args(image_url: "#{Discourse.base_url}/plugins/discourse-narrative-bot/images/dog-walk.gif")
         )
 
         transition = false
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 72d10df1f5..9d4c68fe1d 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,11 +215,9 @@ 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) ||
-          post_raw.strip == self.class.skip_trigger
+        post_raw.match(/((^@#{self.discobot_user.username} #{self.class.skip_trigger})|(^#{self.class.skip_trigger}$))/i)
       else
         false
       end
@@ -230,7 +228,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,7 +243,7 @@ module DiscourseNarrativeBot
 
     def bot_mentioned?
       @bot_mentioned ||= PostAnalyzer.new(@post.raw, @post.topic_id).raw_mentions.include?(
-        self.discobot_user.username.downcase
+        self.discobot_user.username_lower
       )
     end
 
@@ -255,7 +253,7 @@ module DiscourseNarrativeBot
     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 34434e94e6..cb95d19cba 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -2,19 +2,10 @@
 # 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
 
-if Rails.env.development?
-  Rails.application.config.before_initialize do |app|
-    app.middleware.insert_before(
-      ::ActionDispatch::Static,
-      ::ActionDispatch::Static,
-      Rails.root.join("plugins/discourse-narrative-bot/public").to_s
-    )
-  end
-end
-
 require_relative 'lib/discourse_narrative_bot/welcome_post_type_site_setting.rb'
 
 after_initialize do
@@ -28,6 +19,7 @@ after_initialize do
     '../jobs/narrative_init.rb',
     '../jobs/send_default_welcome_message.rb',
     '../jobs/onceoff/grant_badges.rb',
+    '../jobs/onceoff/remap_old_bot_images.rb',
     '../lib/discourse_narrative_bot/actions.rb',
     '../lib/discourse_narrative_bot/base.rb',
     '../lib/discourse_narrative_bot/new_user_narrative.rb',
@@ -41,7 +33,9 @@ after_initialize do
   ].each { |path| load File.expand_path(path, __FILE__) }
 
   # Disable welcome message because that is what the bot is supposed to replace.
-  SiteSetting.send_welcome_message = false
+  SiteSetting.send_welcome_message = false if SiteSetting.send_welcome_message
+
+  require_dependency 'plugin_store'
 
   module ::DiscourseNarrativeBot
     PLUGIN_NAME = "discourse-narrative-bot".freeze
@@ -49,13 +43,6 @@ after_initialize do
     class Engine < ::Rails::Engine
       engine_name PLUGIN_NAME
       isolate_namespace DiscourseNarrativeBot
-
-      if Rails.env.production?
-        Dir[Rails.root.join("plugins/discourse-narrative-bot/public/images/*")].each do |src|
-          dest = Rails.root.join("public/images/#{File.basename(src)}")
-          File.symlink(src, dest) if !File.exists?(dest)
-        end
-      end
     end
 
     class Store
@@ -74,7 +61,7 @@ after_initialize do
 
     class CertificatesController < ::ApplicationController
       layout :false
-      skip_before_filter :check_xhr
+      skip_before_action :check_xhr
 
       def generate
         raise Discourse::InvalidParameters.new('user_id must be present') unless params[:user_id]&.present?
@@ -95,7 +82,7 @@ after_initialize do
           end
 
         respond_to do |format|
-          format.svg { render inline: svg}
+          format.svg { render inline: svg }
         end
       end
     end
@@ -114,6 +101,18 @@ after_initialize do
   end
 
   self.add_model_callback(User, :after_commit, on: :create) do
+    if SiteSetting.discourse_narrative_bot_welcome_post_delay == 0
+      self.enqueue_bot_welcome_post
+    end
+  end
+
+  self.on(:user_first_logged_in) do |user|
+    if SiteSetting.discourse_narrative_bot_welcome_post_delay > 0
+      user.enqueue_bot_welcome_post
+    end
+  end
+
+  self.add_to_class(:user, :enqueue_bot_welcome_post) do
     return if SiteSetting.disable_discourse_narrative_bot_welcome_post
 
     delay = SiteSetting.discourse_narrative_bot_welcome_post_delay
@@ -186,7 +185,7 @@ after_initialize do
     if self.user.enqueue_narrative_bot_job?
       input =
         case self.post_action_type_id
-        when *PostActionType.flag_types.values
+        when *PostActionType.flag_types_without_custom.values
           :flag
         when PostActionType.types[:like]
           :like
diff --git a/plugins/discourse-narrative-bot/server.sr.yml b/plugins/discourse-narrative-bot/server.sr.yml
new file mode 100644
index 0000000000..5380c47005
--- /dev/null
+++ b/plugins/discourse-narrative-bot/server.sr.yml
@@ -0,0 +1 @@
+sr: {}
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 eff130184a..81f0e01155 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
@@ -7,7 +7,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
 
   let(:topic) do
     Fabricate(:private_message_topic, first_post: first_post,
-      topic_allowed_users: [
+                                      topic_allowed_users: [
         Fabricate.build(:topic_allowed_user, user: discobot_user),
         Fabricate.build(:topic_allowed_user, user: user),
       ]
@@ -79,15 +79,13 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
 
         new_post = Post.offset(1).last
 
-        expect(narrative.get_data(user)).to eq({
-          "topic_id" => topic.id,
-          "state" => "tutorial_edit",
-          "last_post_id" => new_post.id,
-          "track" => described_class.to_s,
-          "tutorial_edit" => {
+        expect(narrative.get_data(user)).to eq("topic_id" => topic.id,
+                                               "state" => "tutorial_edit",
+                                               "last_post_id" => new_post.id,
+                                               "track" => described_class.to_s,
+                                               "tutorial_edit" => {
             "post_id" => Post.last.id
-          }
-        })
+          })
 
         expect(new_post.raw).to eq(expected_raw.chomp)
         expect(new_post.topic.id).to eq(topic.id)
@@ -111,15 +109,13 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
 
         new_post = Post.offset(1).last
 
-        expect(narrative.get_data(user)).to eq({
-          "topic_id" => new_post.topic.id,
-          "state" => "tutorial_edit",
-          "last_post_id" => new_post.id,
-          "track" => described_class.to_s,
-          "tutorial_edit" => {
+        expect(narrative.get_data(user)).to eq("topic_id" => new_post.topic.id,
+                                               "state" => "tutorial_edit",
+                                               "last_post_id" => new_post.id,
+                                               "track" => described_class.to_s,
+                                               "tutorial_edit" => {
             "post_id" => Post.last.id
-          }
-        })
+          })
 
         expect(new_post.raw).to eq(expected_raw.chomp)
         expect(new_post.topic.id).to_not eq(topic.id)
@@ -166,7 +162,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
 
         describe 'when reply contains the skip trigger' do
           it 'should create the right reply' do
-            post.update!(raw: "@#{discobot_user.username} #{skip_trigger}")
+            post.update!(raw: "@#{discobot_user.username} #{skip_trigger.upcase}")
             described_class.any_instance.expects(:enqueue_timeout_job).with(user)
 
             DiscourseNarrativeBot::TrackSelector.new(:reply, user, post_id: post.id).select
@@ -229,7 +225,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
 
         describe 'when reply contains the skip trigger' do
           it 'should create the right reply' do
-            post.update!(raw: skip_trigger)
+            post.update!(raw: skip_trigger.upcase)
             described_class.any_instance.expects(:enqueue_timeout_job).with(user)
 
             DiscourseNarrativeBot::TrackSelector.new(:reply, user, post_id: post.id).select
@@ -303,6 +299,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 +344,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 +378,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
@@ -522,6 +542,29 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
           expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_poll)
         end
       end
+
+      describe 'when poll is disabled' do
+        before do
+          SiteSetting.poll_enabled = false
+        end
+
+        it 'should create the right reply' do
+          TopicUser.change(
+            user.id,
+            topic.id,
+            notification_level: TopicUser.notification_levels[:tracking]
+          )
+
+          expected_raw = <<~RAW
+            #{I18n.t('discourse_narrative_bot.advanced_user_narrative.change_topic_notification_level.reply', base_uri: '')}
+
+            #{I18n.t('discourse_narrative_bot.advanced_user_narrative.details.instructions', base_uri: '')}
+          RAW
+
+          expect(Post.last.raw).to eq(expected_raw.chomp)
+          expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_details)
+        end
+      end
     end
 
     context 'poll tutorial' do
@@ -628,18 +671,16 @@ 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(
           'discourse_narrative_bot.advanced_user_narrative.details.reply', base_uri: ''
         ))
 
-        expect(narrative.get_data(user)).to eq({
-          "state" => "end",
-          "topic_id" => topic.id,
-          "track" => described_class.to_s
-        })
+        expect(narrative.get_data(user)).to eq("state" => "end",
+                                               "topic_id" => topic.id,
+                                               "track" => described_class.to_s)
 
         expect(user.badges.where(name: DiscourseNarrativeBot::AdvancedUserNarrative::BADGE_NAME).exists?)
           .to eq(true)
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 836a715099..1fe809178b 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
@@ -8,7 +8,7 @@ describe DiscourseNarrativeBot::NewUserNarrative do
 
   let(:topic) do
     Fabricate(:private_message_topic, first_post: first_post,
-      topic_allowed_users: [
+                                      topic_allowed_users: [
         Fabricate.build(:topic_allowed_user, user: discobot_user),
         Fabricate.build(:topic_allowed_user, user: user),
       ]
@@ -83,12 +83,10 @@ describe DiscourseNarrativeBot::NewUserNarrative do
 
         new_post = Post.last
 
-        expect(narrative.get_data(user)).to eq({
-          "topic_id" => topic.id,
-          "state" => "tutorial_bookmark",
-          "last_post_id" => new_post.id,
-          "track" => described_class.to_s
-        })
+        expect(narrative.get_data(user)).to eq("topic_id" => topic.id,
+                                               "state" => "tutorial_bookmark",
+                                               "last_post_id" => new_post.id,
+                                               "track" => described_class.to_s)
 
         expect(new_post.raw).to eq(expected_raw.chomp)
         expect(new_post.topic.id).to eq(topic.id)
@@ -111,12 +109,10 @@ describe DiscourseNarrativeBot::NewUserNarrative do
 
         new_post = Post.last
 
-        expect(narrative.get_data(user)).to eq({
-          "topic_id" => new_post.topic.id,
-          "state" => "tutorial_bookmark",
-          "last_post_id" => new_post.id,
-          "track" => described_class.to_s
-        })
+        expect(narrative.get_data(user)).to eq("topic_id" => new_post.topic.id,
+                                               "state" => "tutorial_bookmark",
+                                               "last_post_id" => new_post.id,
+                                               "track" => described_class.to_s)
 
         expect(new_post.raw).to eq(expected_raw.chomp)
         expect(new_post.topic.id).to_not eq(topic.id)
@@ -217,7 +213,7 @@ describe DiscourseNarrativeBot::NewUserNarrative do
 
         describe 'when reply contains the skip trigger' do
           it 'should create the right reply' do
-            post.update!(raw: "@#{discobot_user.username} #{skip_trigger}")
+            post.update!(raw: "@#{discobot_user.username} #{skip_trigger.upcase}")
             described_class.any_instance.expects(:enqueue_timeout_job).with(user)
 
             DiscourseNarrativeBot::TrackSelector.new(:reply, user, post_id: post.id).select
@@ -290,7 +286,7 @@ describe DiscourseNarrativeBot::NewUserNarrative do
       describe 'when user replies to the topic' do
         describe 'when reply contains the skip trigger' do
           it 'should create the right reply' do
-            post.update!(raw: skip_trigger)
+            post.update!(raw: skip_trigger.upcase)
             described_class.any_instance.expects(:enqueue_timeout_job).with(user)
 
             DiscourseNarrativeBot::TrackSelector.new(:reply, user, post_id: post.id).select
@@ -302,23 +298,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
 
@@ -375,7 +395,7 @@ describe DiscourseNarrativeBot::NewUserNarrative do
 
           expect(Post.last.raw).to eq(I18n.t(
             'discourse_narrative_bot.new_user_narrative.images.not_found',
-            image_url: "#{Discourse.base_url}/images/dog-walk.gif", base_uri: ''
+            image_url: "#{Discourse.base_url}/plugins/discourse-narrative-bot/images/dog-walk.gif", base_uri: ''
           ))
 
           described_class.any_instance.expects(:enqueue_timeout_job).with(user)
@@ -416,7 +436,7 @@ describe DiscourseNarrativeBot::NewUserNarrative do
 
         expect(Post.last.raw).to eq(I18n.t(
           'discourse_narrative_bot.new_user_narrative.images.not_found',
-          image_url: "#{Discourse.base_url}/images/dog-walk.gif",
+          image_url: "#{Discourse.base_url}/plugins/discourse-narrative-bot/images/dog-walk.gif",
           base_uri: ''
         ))
 
@@ -582,28 +602,28 @@ describe DiscourseNarrativeBot::NewUserNarrative do
 
             new_post = Post.last
 
-            expect(new_post.raw).to include("/forum/images")
+            expect(new_post.raw).to include("/forum/plugins/discourse-narrative-bot/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
 
@@ -898,11 +918,9 @@ describe DiscourseNarrativeBot::NewUserNarrative do
 
           expect(first_post.reload.raw).to eq('Hello world')
 
-          expect(narrative.get_data(user)).to include({
-            "state" => "end",
-            "topic_id" => new_post.topic_id,
-            "track" => described_class.to_s,
-          })
+          expect(narrative.get_data(user)).to include("state" => "end",
+                                                      "topic_id" => new_post.topic_id,
+                                                      "track" => described_class.to_s)
 
           expect(user.badges.where(name: DiscourseNarrativeBot::NewUserNarrative::BADGE_NAME).exists?)
             .to eq(true)
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 8c5e7e4475..5e7594a2e7 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
@@ -42,7 +42,7 @@ describe DiscourseNarrativeBot::TrackSelector do
 
       let(:topic) do
         Fabricate(:private_message_topic, first_post: first_post,
-          topic_allowed_users: [
+                                          topic_allowed_users: [
             Fabricate.build(:topic_allowed_user, user: discobot_user),
             Fabricate.build(:topic_allowed_user, user: user),
           ]
@@ -206,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
@@ -441,7 +454,6 @@ describe DiscourseNarrativeBot::TrackSelector do
           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) }
@@ -549,7 +561,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 }
@@ -586,7 +598,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_certificate_spec.rb b/plugins/discourse-narrative-bot/spec/integration/discobot_certificate_spec.rb
index 394be887e6..5e2f58d84e 100644
--- a/plugins/discourse-narrative-bot/spec/integration/discobot_certificate_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/integration/discobot_certificate_spec.rb
@@ -15,7 +15,7 @@ describe "Discobot Certificate" do
       stub_request(:get, "http://test.localhost//images/d-logo-sketch-small.png")
         .to_return(status: 200)
 
-      xhr :get, '/discobot/certificate.svg', params
+      get '/discobot/certificate.svg', params: params
 
       expect(response.status).to eq(200)
     end
@@ -28,22 +28,10 @@ describe "Discobot Certificate" do
         }
 
         params.each do |key, _|
-          expect { xhr :get, '/discobot/certificate.svg', params.except(key) }
+          expect { get '/discobot/certificate.svg', params: params.except(key) }
             .to raise_error(Discourse::InvalidParameters)
         end
       end
     end
-
-    describe 'when date is invalid' do
-      it 'should raise the right error' do
-        expect do
-          xhr :get, '/discobot/certificate.svg',
-            name: user.name,
-            date: "<script type=\"text/javascript\">alert('This app is probably vulnerable to XSS attacks!');</script>",
-            avatar_url: 'https://somesite.com/someavatar',
-            user_id: user.id
-        end.to raise_error(ArgumentError, 'invalid date')
-      end
-    end
   end
 end
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
new file mode 100644
index 0000000000..9ada964d7a
--- /dev/null
+++ b/plugins/discourse-narrative-bot/spec/integration/discobot_welcome_post_spec.rb
@@ -0,0 +1,49 @@
+require 'rails_helper'
+
+describe "Discobot welcome post" do
+  let(:user) { Fabricate(:user) }
+
+  before do
+    SiteSetting.queue_jobs = true
+    SiteSetting.discourse_narrative_bot_enabled = true
+  end
+
+  context 'when discourse_narrative_bot_welcome_post_delay is 0' do
+    it 'should not delay the welcome post' do
+      user
+      expect { sign_in(user) }.to_not change { Jobs::NarrativeInit.jobs.count }
+    end
+  end
+
+  context 'When discourse_narrative_bot_welcome_post_delay is greater than 0' do
+    before do
+      SiteSetting.discourse_narrative_bot_welcome_post_delay = 5
+    end
+
+    context 'when user logs in normally' do
+      it 'should delay the welcome post until user logs in' do
+        expect { sign_in(user) }.to change { Jobs::NarrativeInit.jobs.count }.by(1)
+        expect(Jobs::NarrativeInit.jobs.first["args"].first["user_id"]).to eq(user.id)
+      end
+    end
+
+    context 'when user redeems an invite' do
+      let(:invite) { Fabricate(:invite, invited_by: Fabricate(:admin), email: 'testing@gmail.com') }
+
+      it 'should delay the welcome post until the user logs in' do
+        invite
+
+        expect do
+          put "/invites/show/#{invite.invite_key}.json", params: {
+            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 355a51e6d8..8381fd3364 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/jobs/onceoff/remap_old_bot_iamges_spec.rb b/plugins/discourse-narrative-bot/spec/jobs/onceoff/remap_old_bot_iamges_spec.rb
new file mode 100644
index 0000000000..31badd3612
--- /dev/null
+++ b/plugins/discourse-narrative-bot/spec/jobs/onceoff/remap_old_bot_iamges_spec.rb
@@ -0,0 +1,42 @@
+require 'rails_helper'
+
+RSpec.describe Jobs::DiscourseNarrativeBot::RemapOldBotImages do
+  context "when bot's post contains an old link" do
+    let(:post) do
+      Fabricate(:post,
+        user_id: -2,
+        raw: 'If you’d like to learn more, select <img src="/images/font-awesome-gear.png" width="16" height="16"> <img src="/images/font-awesome-ellipsis.png" width="16" height="16"> below  and <img src="/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this private message**.  If you do, there may be a :gift: in your future!'
+      )
+    end
+
+    before do
+      post
+    end
+
+    it 'should remap the links correctly' do
+      expected_raw = 'If you’d like to learn more, select <img src="/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> <img src="/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below  and <img src="/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this private message**.  If you do, there may be a :gift: in your future!'
+
+      2.times do
+        described_class.new.execute_onceoff({})
+        expect(post.reload.raw).to eq(expected_raw)
+      end
+    end
+
+    context 'subfolder' do
+      let(:post) do
+        Fabricate(:post,
+          user_id: -2,
+          raw: 'If you’d like to learn more, select <img src="/community/images/font-awesome-ellipsis.png" width="16" height="16"> below  and <img src="/community/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this private message**.  If you do, there may be a :gift: in your future!'
+        )
+      end
+
+      it 'should remap the links correctly' do
+        described_class.new.execute_onceoff({})
+
+        expect(post.reload.raw).to eq(
+          'If you’d like to learn more, select <img src="/community/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> below  and <img src="/community/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this private message**.  If you do, there may be a :gift: in your future!'
+        )
+      end
+    end
+  end
+end
diff --git a/plugins/discourse-narrative-bot/spec/lib/certificate_generator_spec.rb b/plugins/discourse-narrative-bot/spec/lib/certificate_generator_spec.rb
new file mode 100644
index 0000000000..69f7e5e848
--- /dev/null
+++ b/plugins/discourse-narrative-bot/spec/lib/certificate_generator_spec.rb
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+RSpec.describe DiscourseNarrativeBot::CertificateGenerator do
+  let(:user) { Fabricate(:user) }
+
+  describe 'when an invalid date is given' do
+    it 'should default to the current date' do
+      expect { described_class.new(user, "2017-00-10") }.to_not raise_error
+    end
+  end
+
+  describe '#logo_group' do
+    describe 'when SiteSetting.logo_small_url is blank' do
+      before do
+        SiteSetting.logo_small_url = ''
+      end
+
+      it 'should not try to fetch a image' do
+        expect(described_class.new(user, "2017-02-10").send(:logo_group, 1, 1, 1))
+          .to eq(nil)
+      end
+    end
+  end
+end
diff --git a/plugins/discourse-narrative-bot/spec/user_spec.rb b/plugins/discourse-narrative-bot/spec/user_spec.rb
index 816ef46c93..86dde81499 100644
--- a/plugins/discourse-narrative-bot/spec/user_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/user_spec.rb
@@ -32,7 +32,7 @@ describe User do
         end
       end
 
-      describe 'enabled' do
+      context 'enabled' do
         before do
           SiteSetting.disable_discourse_narrative_bot_welcome_post = false
         end
@@ -60,30 +60,16 @@ describe User do
           end
         end
 
-        describe 'when welcome message is delayed' do
+        describe 'when welcome message is configured to be delayed' do
           before do
             SiteSetting.discourse_narrative_bot_welcome_post_delay = 100
             SiteSetting.queue_jobs = true
           end
 
-          it 'should delay the initialization of the new user track' do
-            Timecop.freeze do
-              user
+          it 'should delay the welcome post until user logs in' do
+            user
 
-              expect(Jobs::NarrativeInit.jobs.first['at'])
-               .to be_within(1.second).of(Time.zone.now.to_f + 100)
-            end
-          end
-
-          it 'should delay sending the welcome message' do
-            SiteSetting.discourse_narrative_bot_welcome_post_type = 'welcome_message'
-
-            Timecop.freeze do
-              user
-
-              expect(Jobs::SendDefaultWelcomeMessage.jobs.first['at'])
-                .to be_within(1.second).of(Time.zone.now.to_f + 100)
-            end
+            expect(Jobs::NarrativeInit.jobs.count).to eq(0)
           end
         end
       end
diff --git a/plugins/discourse-nginx-performance-report/app/jobs/scheduled/daily_performance_report.rb b/plugins/discourse-nginx-performance-report/app/jobs/scheduled/daily_performance_report.rb
index 78b25666e4..80d44a2aeb 100644
--- a/plugins/discourse-nginx-performance-report/app/jobs/scheduled/daily_performance_report.rb
+++ b/plugins/discourse-nginx-performance-report/app/jobs/scheduled/daily_performance_report.rb
@@ -45,7 +45,6 @@ module Jobs
                            title: I18n.t('performance_report.initial_topic_title'),
                            skip_validations: true)
 
-
       unless post && post.topic_id
         raise StandardError, "Could not create or retrieve performance report topic id"
       end
diff --git a/plugins/discourse-nginx-performance-report/lib/log_analyzer.rb b/plugins/discourse-nginx-performance-report/lib/log_analyzer.rb
index de23062c43..439b120247 100644
--- a/plugins/discourse-nginx-performance-report/lib/log_analyzer.rb
+++ b/plugins/discourse-nginx-performance-report/lib/log_analyzer.rb
@@ -2,13 +2,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"
 
@@ -69,8 +68,8 @@ class LogAnalyzer
       @aggregate_type = :duration
     end
 
-    def add(id, duration, aggregate=nil)
-      ary = (@data[id] ||= [0,0])
+    def add(id, duration, aggregate = nil)
+      ary = (@data[id] ||= [0, 0])
       ary[0] += duration
       ary[1] += 1
       unless aggregate.nil?
@@ -83,8 +82,8 @@ class LogAnalyzer
       end
     end
 
-    def top(n, aggregator_formatter=nil)
-      @data.sort{|a,b| b[1][0] <=> a[1][0]}.first(n).map do |metric, ary|
+    def top(n, aggregator_formatter = nil)
+      @data.sort { |a, b| b[1][0] <=> a[1][0] }.first(n).map do |metric, ary|
         metric = metric.to_s
         metric = "[empty]" if metric.length == 0
         result = [metric, ary[0], ary[1]]
@@ -93,7 +92,7 @@ class LogAnalyzer
           if aggregator_formatter
             result.push aggregator_formatter.call(ary[2], ary[0], ary[1])
           else
-            result.push ary[2].sort{|a,b| b[1] <=> a[1]}.first(5).map{|k,v|
+            result.push ary[2].sort { |a, b| b[1] <=> a[1] }.first(5).map { |k, v|
             v = "%.2f" % v if Float === v
             "#{k}(#{v})"}.join(" ")
           end
@@ -104,7 +103,7 @@ class LogAnalyzer
     end
   end
 
-  def initialize(filenames, args={})
+  def initialize(filenames, args = {})
     @filenames = filenames
     @ip_to_rails_duration = Aggeregator.new
     @username_to_rails_duration = Aggeregator.new
@@ -148,7 +147,7 @@ class LogAnalyzer
 
         @url_to_rails_duration.add(parsed.url, parsed.rails_duration)
 
-        @status_404_to_count.add(parsed.url,1) if parsed.status == "404"
+        @status_404_to_count.add(parsed.url, 1) if parsed.status == "404"
       end
     end
     self
diff --git a/plugins/discourse-nginx-performance-report/script/nginx_analyze.rb b/plugins/discourse-nginx-performance-report/script/nginx_analyze.rb
index 8550806f87..480beb67eb 100644
--- a/plugins/discourse-nginx-performance-report/script/nginx_analyze.rb
+++ b/plugins/discourse-nginx-performance-report/script/nginx_analyze.rb
@@ -30,7 +30,7 @@ def top(cols, aggregator, count, aggregator_formatter = nil)
 
   col_just = []
 
-  col_widths = map_with_index(cols) do |name,idx|
+  col_widths = map_with_index(cols) do |name, idx|
     max_width = name.length
 
     if cols[idx].respond_to? :align
@@ -46,14 +46,14 @@ def top(cols, aggregator, count, aggregator_formatter = nil)
       row[idx] = row[idx].to_s
       max_width = row[idx].length if row[idx].length > max_width
     end
-    [max_width,80].min
+    [max_width, 80].min
   end
 
-  puts(map_with_index(cols) do |name,idx|
+  puts(map_with_index(cols) do |name, idx|
     name.ljust(col_widths[idx])
   end.join(" "))
 
-  puts(map_with_index(cols) do |name,idx|
+  puts(map_with_index(cols) do |name, idx|
     ("-" * name.length).ljust(col_widths[idx])
   end.join(" "))
 
@@ -102,7 +102,7 @@ end
 puts
 puts "Analyzed: #{analyzer.filenames.join(",")} on #{`hostname`}"
 if limit
-  puts "Limited to #{DateTime.now - (limit.to_f / (60*24.0))} - #{DateTime.now}"
+  puts "Limited to #{DateTime.now - (limit.to_f / (60 * 24.0))} - #{DateTime.now}"
 end
 puts SPACER
 puts "#{analyzer.from_time} - #{analyzer.to_time}"
@@ -121,7 +121,7 @@ puts SPACER
 puts
 puts "Top 100 routes by Server Load"
 puts
-top(["Route", "Duration", "Reqs", Column.new("Mobile", :rjust)], analyzer.route_to_rails_duration, 100, lambda{
+top(["Route", "Duration", "Reqs", Column.new("Mobile", :rjust)], analyzer.route_to_rails_duration, 100, lambda {
   |hash, name, total|
   "#{hash["mobile"] || 0} (#{"%.2f" % (((hash["mobile"] || 0) / (total + 0.0)) * 100)})%"}
 )
diff --git a/plugins/discourse-presence/README.md b/plugins/discourse-presence/README.md
new file mode 100644
index 0000000000..4e41c6c62e
--- /dev/null
+++ b/plugins/discourse-presence/README.md
@@ -0,0 +1,14 @@
+# Discourse Presence plugin
+This plugin shows which users are currently writing a reply at the same time as you.
+
+## Installation
+
+Follow the directions at [Install a Plugin](https://meta.discourse.org/t/install-a-plugin/19157) using https://github.com/discourse/discourse-presence.git as the repository URL.
+
+## Authors
+
+André Pereira, David Taylor
+
+## License
+
+GNU GPL v2
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
new file mode 100644
index 0000000000..a16c2d2293
--- /dev/null
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -0,0 +1,102 @@
+import { ajax } from 'discourse/lib/ajax';
+import { default as computed, observes, on }  from 'ember-addons/ember-computed-decorators';
+
+export const keepAliveDuration = 10000;
+export const bufferTime = 3000;
+
+export default Ember.Component.extend({
+  composer: Ember.inject.controller(),
+
+  // Passed in variables
+  action: null,
+  post: null,
+  topic: null,
+  reply: null,
+  title: null,
+
+  // Internal variables
+  previousState: null,
+  currentState: null,
+  presenceUsers: null,
+  channel: null,
+
+  @on('didInsertElement')
+  composerOpened() {
+    this._lastPublish = new Date();
+    Ember.run.once(this, 'updateState');
+  },
+
+  @observes('action', 'post.id', 'topic.id')
+  composerStateChanged() {
+    Ember.run.once(this, 'updateState');
+  },
+
+  @observes('reply', 'title')
+  typing() {
+    if (new Date() - this._lastPublish > keepAliveDuration) {
+      this.publish({ current: this.get('currentState') });
+    }
+  },
+
+  @on('willDestroyElement')
+  composerClosing() {
+    this.publish({ previous: this.get('currentState') });
+    Ember.run.cancel(this._pingTimer);
+    Ember.run.cancel(this._clearTimer);
+  },
+
+  updateState() {
+    let state = null;
+    const action = this.get('action');
+
+    if (action === 'reply' || action === 'edit') {
+      state = { action };
+      if (action === 'reply') state.topic_id = this.get('topic.id');
+      if (action === 'edit') state.post_id = this.get('post.id');
+    }
+
+    this.set('previousState', this.get('currentState'));
+    this.set('currentState', state);
+  },
+
+  @observes('currentState')
+  currentStateChanged() {
+    if (this.get('channel')) {
+      this.messageBus.unsubscribe(this.get('channel'));
+      this.set('channel', null);
+    }
+
+    this.clear();
+
+    this.publish({
+      response_needed: true,
+      previous: this.get('previousState'),
+      current: this.get('currentState')
+    }).then(r => {
+      if (this.get('isDestroyed')) { return; }
+      this.set('presenceUsers', r.users);
+      this.set('channel', r.messagebus_channel);
+      this.messageBus.subscribe(r.messagebus_channel, message => {
+        if (!this.get('isDestroyed')) this.set('presenceUsers', message.users);
+        this._clearTimer = Ember.run.debounce(this, 'clear', keepAliveDuration + bufferTime);
+      }, r.messagebus_id);
+    });
+  },
+
+  clear() {
+    if (!this.get('isDestroyed')) this.set('presenceUsers', []);
+  },
+
+  publish(data) {
+    this._lastPublish = new Date();
+    return ajax('/presence/publish', { type: 'POST', data });
+  },
+
+  @computed('presenceUsers', 'currentUser.id')
+  users(users, currentUserId) {
+    return (users || []).filter(user => user.id !== currentUserId);
+  },
+
+  isReply: Ember.computed.equal('action', 'reply'),
+  shouldDisplay: Ember.computed.gt('users.length', 0)
+});
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
new file mode 100644
index 0000000000..9e7e9bb443
--- /dev/null
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
@@ -0,0 +1,42 @@
+import { default as computed, on }  from 'ember-addons/ember-computed-decorators';
+import { keepAliveDuration, bufferTime } from 'discourse/plugins/discourse-presence/discourse/components/composer-presence-display';
+
+const MB_GET_LAST_MESSAGE = -2;
+
+export default Ember.Component.extend({
+  topicId: null,
+  presenceUsers: null,
+
+  clear() {
+    if (!this.get('isDestroyed')) this.set('presenceUsers', []);
+  },
+
+  @on('didInsertElement')
+  _inserted() {
+    this.clear();
+
+    this.messageBus.subscribe(this.get('channel'), message => {
+      if (!this.get('isDestroyed')) this.set('presenceUsers', message.users);
+      this._clearTimer = Ember.run.debounce(this, 'clear', keepAliveDuration + bufferTime);
+    }, MB_GET_LAST_MESSAGE);
+  },
+
+  @on('willDestroyElement')
+  _destroyed() {
+    Ember.run.cancel(this._clearTimer);
+    this.messageBus.unsubscribe(this.get('channel'));
+  },
+
+  @computed('topicId')
+  channel(topicId) {
+    return `/presence/topic/${topicId}`;
+  },
+
+  @computed('presenceUsers', 'currentUser.id')
+  users(users, currentUserId) {
+    return (users || []).filter(user => user.id !== currentUserId);
+  },
+
+  shouldDisplay: Ember.computed.gt('users.length', 0)
+
+});
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs
new file mode 100644
index 0000000000..bc5d6876f3
--- /dev/null
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs
@@ -0,0 +1,18 @@
+{{#if shouldDisplay}}
+  <div class="presence-users">
+    {{#each users as |user|}}
+      {{avatar user avatarTemplatePath="avatar_template" usernamePath="username" imageSize="small"}}
+    {{/each}}
+
+    <span class="presence-text">
+      <span class="description">
+        {{#if isReply ~}}
+          {{i18n 'presence.replying'}}
+        {{~else~}}
+          {{i18n 'presence.editing'}}
+        {{~/if}}</span>{{!-- (using comment to stop whitespace)
+   --}}</span>{{!--
+   --}}<span class="wave"><span class="dot">.</span><span class="dot">.</span><span class="dot">.</span>
+    </span>
+  </div>
+{{/if}}
\ No newline at end of file
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs
new file mode 100644
index 0000000000..a459527ff4
--- /dev/null
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs
@@ -0,0 +1,12 @@
+{{#if shouldDisplay}}
+  <div class="presence-users">
+    {{#each users as |user|}}
+      {{avatar user avatarTemplatePath="avatar_template" usernamePath="username" imageSize="small"}}
+    {{/each}}
+
+    <span class="presence-text">
+      <span class="description">{{i18n 'presence.replying_to_topic' count=users.length}}</span>{{!-- (using comment to stop whitespace)
+  --}}<span class="wave"><span class="dot">.</span><span class="dot">.</span><span class="dot">.</span></span>
+    </span>
+  </div>
+{{/if}}
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs
new file mode 100644
index 0000000000..af4de7c592
--- /dev/null
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs
@@ -0,0 +1,7 @@
+{{composer-presence-display
+  action=model.action
+  post=model.post
+  topic=model.topic
+  reply=model.reply
+  title=model.title
+}}
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6
new file mode 100644
index 0000000000..00fbc34d91
--- /dev/null
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6
@@ -0,0 +1,5 @@
+export default {
+  shouldRender(_, ctx) {
+    return ctx.siteSettings.presence_enabled;
+  }
+};
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.hbs
new file mode 100644
index 0000000000..0ee449cf1d
--- /dev/null
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.hbs
@@ -0,0 +1 @@
+{{topic-presence-display topicId=model.id}}
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.js.es6
new file mode 100644
index 0000000000..00fbc34d91
--- /dev/null
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.js.es6
@@ -0,0 +1,5 @@
+export default {
+  shouldRender(_, ctx) {
+    return ctx.siteSettings.presence_enabled;
+  }
+};
diff --git a/plugins/discourse-presence/assets/stylesheets/presence.scss b/plugins/discourse-presence/assets/stylesheets/presence.scss
new file mode 100644
index 0000000000..bd4612817f
--- /dev/null
+++ b/plugins/discourse-presence/assets/stylesheets/presence.scss
@@ -0,0 +1,52 @@
+.presence-users {
+  background-color: $secondary;
+  color: $primary-medium;
+  padding: 0px 5px;
+  display: flex;
+  align-items: center;
+  
+  span.presence-text {
+    margin-left: 5px;
+  }
+
+  .wave {
+    .dot {
+      display: inline-block;
+      animation: wave 1.8s linear infinite;
+
+      &:nth-child(2) {
+        animation-delay: -1.6s;
+      }
+
+      &:nth-child(3) {
+        animation-delay: -1.4s;
+      }
+    }
+  }
+
+  @keyframes wave {
+    0%, 60%, 100% {
+      transform: initial;
+    }
+
+    30% {
+      transform: translateY(-0.2em);
+    }
+  }
+}
+
+.composer-fields .presence-users {
+  position: absolute;
+  top: 18px;
+  right: 35px;
+}
+
+.mobile-view {
+  .composer-fields .presence-users {
+    top: 3px;
+    right: 54px;
+    .description {
+      display:none;
+    }
+  }
+}
diff --git a/plugins/discourse-presence/config/locales/client.ar.yml b/plugins/discourse-presence/config/locales/client.ar.yml
new file mode 100644
index 0000000000..79ea4de815
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.ar.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.bs_BA.yml b/plugins/discourse-presence/config/locales/client.bs_BA.yml
new file mode 100644
index 0000000000..7b73cd2f22
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.bs_BA.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.ca.yml b/plugins/discourse-presence/config/locales/client.ca.yml
new file mode 100644
index 0000000000..b5b08188d7
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.ca.yml
@@ -0,0 +1,12 @@
+# 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/
+
+ca:
+  js:
+    presence:
+      replying: "responent"
+      editing: "editant"
diff --git a/plugins/discourse-presence/config/locales/client.cs.yml b/plugins/discourse-presence/config/locales/client.cs.yml
new file mode 100644
index 0000000000..c0f2fec763
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.cs.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.da.yml b/plugins/discourse-presence/config/locales/client.da.yml
new file mode 100644
index 0000000000..6cf995c6d2
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.da.yml
@@ -0,0 +1,12 @@
+# 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:
+  js:
+    presence:
+      replying: "svarer"
+      editing: "redigering"
diff --git a/plugins/discourse-presence/config/locales/client.de.yml b/plugins/discourse-presence/config/locales/client.de.yml
new file mode 100644
index 0000000000..fbd73c9c11
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.de.yml
@@ -0,0 +1,15 @@
+# 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:
+  js:
+    presence:
+      replying: "antwortet"
+      editing: "bearbeitet"
+      replying_to_topic:
+        one: "antwortet"
+        other: "antworten"
diff --git a/plugins/discourse-presence/config/locales/client.el.yml b/plugins/discourse-presence/config/locales/client.el.yml
new file mode 100644
index 0000000000..f73067c303
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.el.yml
@@ -0,0 +1,15 @@
+# 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:
+  js:
+    presence:
+      replying: "απαντά"
+      editing: "επεξεργάζεται"
+      replying_to_topic:
+        one: "απαντά"
+        other: "απαντάνε"
diff --git a/plugins/discourse-presence/config/locales/client.en.yml b/plugins/discourse-presence/config/locales/client.en.yml
new file mode 100644
index 0000000000..ea1af30f81
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.en.yml
@@ -0,0 +1,8 @@
+en:
+  js:
+    presence:
+      replying: "replying"
+      editing: "editing"
+      replying_to_topic:
+        one: "is replying"
+        other: "are replying"
diff --git a/plugins/discourse-presence/config/locales/client.es.yml b/plugins/discourse-presence/config/locales/client.es.yml
new file mode 100644
index 0000000000..464e428784
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.es.yml
@@ -0,0 +1,15 @@
+# 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:
+  js:
+    presence:
+      replying: "respondiendo"
+      editing: "editando"
+      replying_to_topic:
+        one: "está respondiendo"
+        other: "están respondiendo"
diff --git a/plugins/discourse-presence/config/locales/client.et.yml b/plugins/discourse-presence/config/locales/client.et.yml
new file mode 100644
index 0000000000..8c601aa1ed
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.et.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.fa_IR.yml b/plugins/discourse-presence/config/locales/client.fa_IR.yml
new file mode 100644
index 0000000000..3f564b2f11
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.fa_IR.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.fi.yml b/plugins/discourse-presence/config/locales/client.fi.yml
new file mode 100644
index 0000000000..378daadb7a
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.fi.yml
@@ -0,0 +1,15 @@
+# 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:
+  js:
+    presence:
+      replying: "kirjoittaa vastausta"
+      editing: "muokkaa viestiä"
+      replying_to_topic:
+        one: "kirjoittaa vastausta"
+        other: "kirjoittavat vastausta"
diff --git a/plugins/discourse-presence/config/locales/client.fr.yml b/plugins/discourse-presence/config/locales/client.fr.yml
new file mode 100644
index 0000000000..4808abe27c
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.fr.yml
@@ -0,0 +1,15 @@
+# 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:
+  js:
+    presence:
+      replying: "en train de répondre"
+      editing: "en train de modifier"
+      replying_to_topic:
+        one: "en train de répondre"
+        other: "en train de répondre"
diff --git a/plugins/discourse-presence/config/locales/client.gl.yml b/plugins/discourse-presence/config/locales/client.gl.yml
new file mode 100644
index 0000000000..695b5cf287
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.gl.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.he.yml b/plugins/discourse-presence/config/locales/client.he.yml
new file mode 100644
index 0000000000..96b15d6088
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.he.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.id.yml b/plugins/discourse-presence/config/locales/client.id.yml
new file mode 100644
index 0000000000..2112cad6a2
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.id.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.it.yml b/plugins/discourse-presence/config/locales/client.it.yml
new file mode 100644
index 0000000000..12c5162aab
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.it.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.ja.yml b/plugins/discourse-presence/config/locales/client.ja.yml
new file mode 100644
index 0000000000..8c2dc00904
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.ja.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.ko.yml b/plugins/discourse-presence/config/locales/client.ko.yml
new file mode 100644
index 0000000000..bf4e05d6f4
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.ko.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.lv.yml b/plugins/discourse-presence/config/locales/client.lv.yml
new file mode 100644
index 0000000000..dc48bb58ee
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.lv.yml
@@ -0,0 +1,8 @@
+# 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/
+
+lv: {}
diff --git a/plugins/discourse-presence/config/locales/client.nb_NO.yml b/plugins/discourse-presence/config/locales/client.nb_NO.yml
new file mode 100644
index 0000000000..5f6b760d96
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.nb_NO.yml
@@ -0,0 +1,15 @@
+# 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:
+  js:
+    presence:
+      replying: "svarer"
+      editing: "redigerer"
+      replying_to_topic:
+        one: "svarer"
+        other: "svarer"
diff --git a/plugins/discourse-presence/config/locales/client.nl.yml b/plugins/discourse-presence/config/locales/client.nl.yml
new file mode 100644
index 0000000000..bb31021aaa
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.nl.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.pl_PL.yml b/plugins/discourse-presence/config/locales/client.pl_PL.yml
new file mode 100644
index 0000000000..77fdb6f8e8
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.pl_PL.yml
@@ -0,0 +1,17 @@
+# 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:
+  js:
+    presence:
+      replying: "odpowiada"
+      editing: "edytuje"
+      replying_to_topic:
+        one: "odpowiada"
+        few: "odpowiada"
+        many: "odpowiada"
+        other: "odpowiada"
diff --git a/plugins/discourse-presence/config/locales/client.pt.yml b/plugins/discourse-presence/config/locales/client.pt.yml
new file mode 100644
index 0000000000..d12527a51f
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.pt.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.pt_BR.yml b/plugins/discourse-presence/config/locales/client.pt_BR.yml
new file mode 100644
index 0000000000..bc85fd86b1
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.pt_BR.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.ro.yml b/plugins/discourse-presence/config/locales/client.ro.yml
new file mode 100644
index 0000000000..31d1c44013
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.ro.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.ru.yml b/plugins/discourse-presence/config/locales/client.ru.yml
new file mode 100644
index 0000000000..147d6746bf
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.ru.yml
@@ -0,0 +1,17 @@
+# 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:
+  js:
+    presence:
+      replying: "ответ"
+      editing: "редактирование"
+      replying_to_topic:
+        one: "отвечает"
+        few: "отвечают"
+        many: "отвечают"
+        other: "отвечают"
diff --git a/plugins/discourse-presence/config/locales/client.sk.yml b/plugins/discourse-presence/config/locales/client.sk.yml
new file mode 100644
index 0000000000..bcc3a93dc5
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.sk.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.sq.yml b/plugins/discourse-presence/config/locales/client.sq.yml
new file mode 100644
index 0000000000..4526be3162
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.sq.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.sr.yml b/plugins/discourse-presence/config/locales/client.sr.yml
new file mode 100644
index 0000000000..19bcafc62d
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.sr.yml
@@ -0,0 +1,12 @@
+# 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/
+
+sr:
+  js:
+    presence:
+      replying: "odgovara"
+      editing: "menja"
diff --git a/plugins/discourse-presence/config/locales/client.sv.yml b/plugins/discourse-presence/config/locales/client.sv.yml
new file mode 100644
index 0000000000..1f24e943a5
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.sv.yml
@@ -0,0 +1,12 @@
+# 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:
+  js:
+    presence:
+      replying: "svarar"
+      editing: "skriver"
diff --git a/plugins/discourse-presence/config/locales/client.te.yml b/plugins/discourse-presence/config/locales/client.te.yml
new file mode 100644
index 0000000000..49141baa04
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.te.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.th.yml b/plugins/discourse-presence/config/locales/client.th.yml
new file mode 100644
index 0000000000..7ed98e15d8
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.th.yml
@@ -0,0 +1,8 @@
+# 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/
+
+th: {}
diff --git a/plugins/discourse-presence/config/locales/client.tr_TR.yml b/plugins/discourse-presence/config/locales/client.tr_TR.yml
new file mode 100644
index 0000000000..1d53e46fd1
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.tr_TR.yml
@@ -0,0 +1,14 @@
+# 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:
+  js:
+    presence:
+      replying: "yanıtlama"
+      editing: "düzenleme"
+      replying_to_topic:
+        other: "yanıtlıyor"
diff --git a/plugins/discourse-presence/config/locales/client.uk.yml b/plugins/discourse-presence/config/locales/client.uk.yml
new file mode 100644
index 0000000000..3acfff74e8
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.uk.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.ur.yml b/plugins/discourse-presence/config/locales/client.ur.yml
new file mode 100644
index 0000000000..58bc9735bc
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.ur.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/client.vi.yml b/plugins/discourse-presence/config/locales/client.vi.yml
new file mode 100644
index 0000000000..2669388c05
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.vi.yml
@@ -0,0 +1,12 @@
+# 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:
+  js:
+    presence:
+      replying: "Đang trả lời"
+      editing: "Đang chỉnh sửa"
diff --git a/plugins/discourse-presence/config/locales/client.zh_CN.yml b/plugins/discourse-presence/config/locales/client.zh_CN.yml
new file mode 100644
index 0000000000..f6d63d1614
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.zh_CN.yml
@@ -0,0 +1,14 @@
+# 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:
+  js:
+    presence:
+      replying: "正在回复"
+      editing: "正在编辑"
+      replying_to_topic:
+        other: "正在回复"
diff --git a/plugins/discourse-presence/config/locales/client.zh_TW.yml b/plugins/discourse-presence/config/locales/client.zh_TW.yml
new file mode 100644
index 0000000000..c4f503ecd6
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/client.zh_TW.yml
@@ -0,0 +1,14 @@
+# 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:
+  js:
+    presence:
+      replying: "正在回覆"
+      editing: "正在編輯"
+      replying_to_topic:
+        other: "正在回覆"
diff --git a/plugins/discourse-presence/config/locales/server.ar.yml b/plugins/discourse-presence/config/locales/server.ar.yml
new file mode 100644
index 0000000000..6fc69a163b
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.ar.yml
@@ -0,0 +1,10 @@
+# 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:
+    presence_enabled: 'أعرض الأعضاء الذين يردون حاليا على موضوع حالي، أو يقومون بالتعديل على منشور حالي؟'
diff --git a/plugins/discourse-presence/config/locales/server.bs_BA.yml b/plugins/discourse-presence/config/locales/server.bs_BA.yml
new file mode 100644
index 0000000000..7b73cd2f22
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.bs_BA.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.ca.yml b/plugins/discourse-presence/config/locales/server.ca.yml
new file mode 100644
index 0000000000..a445d949ab
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.ca.yml
@@ -0,0 +1,10 @@
+# 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/
+
+ca:
+  site_settings:
+    presence_enabled: 'Mostra usuaris que en aquests moments estan responent l''actual tema  o editant l''actual entrada?'
diff --git a/plugins/discourse-presence/config/locales/server.cs.yml b/plugins/discourse-presence/config/locales/server.cs.yml
new file mode 100644
index 0000000000..c0f2fec763
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.cs.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.da.yml b/plugins/discourse-presence/config/locales/server.da.yml
new file mode 100644
index 0000000000..9ca8189621
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.da.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.de.yml b/plugins/discourse-presence/config/locales/server.de.yml
new file mode 100644
index 0000000000..c87ab40899
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.de.yml
@@ -0,0 +1,10 @@
+# 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:
+    presence_enabled: 'Benutzer anzeigen, die gerade im aktuellen Thema antworten, oder den aktuellen Beitrag bearbeiten?'
diff --git a/plugins/discourse-presence/config/locales/server.el.yml b/plugins/discourse-presence/config/locales/server.el.yml
new file mode 100644
index 0000000000..30f4469024
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.el.yml
@@ -0,0 +1,10 @@
+# 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:
+    presence_enabled: 'Εμφάνιση των χρηστών που απαντάνε αυτή τη στιγμή στο νήμα ή επεξεργάζονται την τρέχουσα ανάρτηση;'
diff --git a/plugins/discourse-presence/config/locales/server.en.yml b/plugins/discourse-presence/config/locales/server.en.yml
new file mode 100644
index 0000000000..72768d3f25
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.en.yml
@@ -0,0 +1,3 @@
+en:
+  site_settings:
+    presence_enabled: 'Show users that are currently replying to the current topic, or editing the current post?'
diff --git a/plugins/discourse-presence/config/locales/server.es.yml b/plugins/discourse-presence/config/locales/server.es.yml
new file mode 100644
index 0000000000..2a7dd93de9
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.es.yml
@@ -0,0 +1,10 @@
+# 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:
+    presence_enabled: '¿Mostrar usuarios que estén respondiendo al tema, o editando el post actual?'
diff --git a/plugins/discourse-presence/config/locales/server.et.yml b/plugins/discourse-presence/config/locales/server.et.yml
new file mode 100644
index 0000000000..8c601aa1ed
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.et.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.fa_IR.yml b/plugins/discourse-presence/config/locales/server.fa_IR.yml
new file mode 100644
index 0000000000..3f564b2f11
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.fa_IR.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.fi.yml b/plugins/discourse-presence/config/locales/server.fi.yml
new file mode 100644
index 0000000000..51fb1162a4
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.fi.yml
@@ -0,0 +1,10 @@
+# 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:
+    presence_enabled: 'Näytä ketkä parhaillaan kirjoittavat tai muokkaavat viestiä ketjussa, jossa käyttäjä on?'
diff --git a/plugins/discourse-presence/config/locales/server.fr.yml b/plugins/discourse-presence/config/locales/server.fr.yml
new file mode 100644
index 0000000000..6b90de77c8
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.fr.yml
@@ -0,0 +1,10 @@
+# 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:
+    presence_enabled: 'Afficher les utilisateurs qui sont en train de répondre au sujet actuel ou modifier le message actuel ?'
diff --git a/plugins/discourse-presence/config/locales/server.gl.yml b/plugins/discourse-presence/config/locales/server.gl.yml
new file mode 100644
index 0000000000..695b5cf287
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.gl.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.he.yml b/plugins/discourse-presence/config/locales/server.he.yml
new file mode 100644
index 0000000000..96b15d6088
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.he.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.id.yml b/plugins/discourse-presence/config/locales/server.id.yml
new file mode 100644
index 0000000000..2112cad6a2
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.id.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.it.yml b/plugins/discourse-presence/config/locales/server.it.yml
new file mode 100644
index 0000000000..12c5162aab
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.it.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.ja.yml b/plugins/discourse-presence/config/locales/server.ja.yml
new file mode 100644
index 0000000000..8c2dc00904
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.ja.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.ko.yml b/plugins/discourse-presence/config/locales/server.ko.yml
new file mode 100644
index 0000000000..bf4e05d6f4
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.ko.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.lv.yml b/plugins/discourse-presence/config/locales/server.lv.yml
new file mode 100644
index 0000000000..dc48bb58ee
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.lv.yml
@@ -0,0 +1,8 @@
+# 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/
+
+lv: {}
diff --git a/plugins/discourse-presence/config/locales/server.nb_NO.yml b/plugins/discourse-presence/config/locales/server.nb_NO.yml
new file mode 100644
index 0000000000..508a3706c4
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.nb_NO.yml
@@ -0,0 +1,10 @@
+# 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:
+    presence_enabled: 'Vis brukere som akkurat nå svarer på gjeldende emne, eller redigerer gjeldende innlegg?'
diff --git a/plugins/discourse-presence/config/locales/server.nl.yml b/plugins/discourse-presence/config/locales/server.nl.yml
new file mode 100644
index 0000000000..bb31021aaa
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.nl.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.pl_PL.yml b/plugins/discourse-presence/config/locales/server.pl_PL.yml
new file mode 100644
index 0000000000..1cc8c5e3be
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.pl_PL.yml
@@ -0,0 +1,10 @@
+# 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:
+    presence_enabled: 'Pokaż użytkowników, którzy aktualnie odpowiadają na bieżący temat lub edytują bieżący wpis?'
diff --git a/plugins/discourse-presence/config/locales/server.pt.yml b/plugins/discourse-presence/config/locales/server.pt.yml
new file mode 100644
index 0000000000..d12527a51f
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.pt.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.pt_BR.yml b/plugins/discourse-presence/config/locales/server.pt_BR.yml
new file mode 100644
index 0000000000..bc85fd86b1
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.pt_BR.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.ro.yml b/plugins/discourse-presence/config/locales/server.ro.yml
new file mode 100644
index 0000000000..31d1c44013
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.ro.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.ru.yml b/plugins/discourse-presence/config/locales/server.ru.yml
new file mode 100644
index 0000000000..5c634ee3d3
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.ru.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.sk.yml b/plugins/discourse-presence/config/locales/server.sk.yml
new file mode 100644
index 0000000000..bcc3a93dc5
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.sk.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.sq.yml b/plugins/discourse-presence/config/locales/server.sq.yml
new file mode 100644
index 0000000000..4526be3162
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.sq.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.sr.yml b/plugins/discourse-presence/config/locales/server.sr.yml
new file mode 100644
index 0000000000..5e01d18a51
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.sr.yml
@@ -0,0 +1,10 @@
+# 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/
+
+sr:
+  site_settings:
+    presence_enabled: 'Prikaži da korisnici trenutno kucaju odgovor ili menjaju poruku'
diff --git a/plugins/discourse-presence/config/locales/server.sv.yml b/plugins/discourse-presence/config/locales/server.sv.yml
new file mode 100644
index 0000000000..fd54901f75
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.sv.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.te.yml b/plugins/discourse-presence/config/locales/server.te.yml
new file mode 100644
index 0000000000..49141baa04
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.te.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.th.yml b/plugins/discourse-presence/config/locales/server.th.yml
new file mode 100644
index 0000000000..7ed98e15d8
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.th.yml
@@ -0,0 +1,8 @@
+# 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/
+
+th: {}
diff --git a/plugins/discourse-presence/config/locales/server.tr_TR.yml b/plugins/discourse-presence/config/locales/server.tr_TR.yml
new file mode 100644
index 0000000000..00efffd670
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.tr_TR.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.uk.yml b/plugins/discourse-presence/config/locales/server.uk.yml
new file mode 100644
index 0000000000..3acfff74e8
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.uk.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.ur.yml b/plugins/discourse-presence/config/locales/server.ur.yml
new file mode 100644
index 0000000000..58bc9735bc
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.ur.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.vi.yml b/plugins/discourse-presence/config/locales/server.vi.yml
new file mode 100644
index 0000000000..fa809fe162
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.vi.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/locales/server.zh_CN.yml b/plugins/discourse-presence/config/locales/server.zh_CN.yml
new file mode 100644
index 0000000000..7a40e4b86e
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.zh_CN.yml
@@ -0,0 +1,10 @@
+# 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:
+    presence_enabled: '显示正在回复或者编辑当前主题的用户'
diff --git a/plugins/discourse-presence/config/locales/server.zh_TW.yml b/plugins/discourse-presence/config/locales/server.zh_TW.yml
new file mode 100644
index 0000000000..92c18de9ae
--- /dev/null
+++ b/plugins/discourse-presence/config/locales/server.zh_TW.yml
@@ -0,0 +1,8 @@
+# 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: {}
diff --git a/plugins/discourse-presence/config/settings.yml b/plugins/discourse-presence/config/settings.yml
new file mode 100644
index 0000000000..56341eeea2
--- /dev/null
+++ b/plugins/discourse-presence/config/settings.yml
@@ -0,0 +1,4 @@
+plugins:
+  presence_enabled:
+    default: true
+    client: true
diff --git a/plugins/discourse-presence/plugin.rb b/plugins/discourse-presence/plugin.rb
new file mode 100644
index 0000000000..f1e43f3f7e
--- /dev/null
+++ b/plugins/discourse-presence/plugin.rb
@@ -0,0 +1,175 @@
+# name: discourse-presence
+# about: Show which users are writing a reply to a topic
+# version: 1.0
+# authors: André Pereira, David Taylor
+# url: https://github.com/discourse/discourse-presence.git
+
+enabled_site_setting :presence_enabled
+
+register_asset 'stylesheets/presence.scss'
+
+PLUGIN_NAME ||= "discourse-presence".freeze
+
+after_initialize do
+
+  module ::Presence
+    class Engine < ::Rails::Engine
+      engine_name PLUGIN_NAME
+      isolate_namespace Presence
+    end
+  end
+
+  module ::Presence::PresenceManager
+    MAX_BACKLOG_AGE ||= 60
+
+    def self.get_redis_key(type, id)
+      "presence:#{type}:#{id}"
+    end
+
+    def self.get_messagebus_channel(type, id)
+      "/presence/#{type}/#{id}"
+    end
+
+    # return true if a key was added
+    def self.add(type, id, user_id)
+      key = get_redis_key(type, id)
+      result = $redis.hset(key, user_id, Time.zone.now)
+      $redis.expire(key, MAX_BACKLOG_AGE)
+      result
+    end
+
+    # return true if a key was deleted
+    def self.remove(type, id, user_id)
+      key = get_redis_key(type, id)
+      $redis.expire(key, MAX_BACKLOG_AGE)
+      $redis.hdel(key, user_id) > 0
+    end
+
+    def self.get_users(type, id)
+      user_ids = $redis.hkeys(get_redis_key(type, id)).map(&:to_i)
+      User.where(id: user_ids)
+    end
+
+    def self.publish(type, id)
+      users = get_users(type, id)
+      serialized_users = users.map { |u| BasicUserSerializer.new(u, root: false) }
+      message = { users: serialized_users, time: Time.now.to_i }
+      messagebus_channel = get_messagebus_channel(type, id)
+
+      topic = type == 'post' ? Post.find_by(id: id).topic : Topic.find_by(id: id)
+
+      if topic.archetype == Archetype.private_message
+        user_ids = User.where('admin OR moderator').pluck(:id) + topic.allowed_users.pluck(:id)
+        group_ids = topic.allowed_groups.pluck(:id)
+
+        MessageBus.publish(
+          messagebus_channel,
+          message.as_json,
+          user_ids: user_ids,
+          group_ids: group_ids,
+          max_backlog_age: MAX_BACKLOG_AGE
+        )
+      else
+        MessageBus.publish(
+          messagebus_channel,
+          message.as_json,
+          group_ids: topic.secure_group_ids,
+          max_backlog_age: MAX_BACKLOG_AGE
+        )
+      end
+
+      users
+    end
+
+    def self.cleanup(type, id)
+      has_changed = false
+
+      # Delete entries older than 20 seconds
+      hash = $redis.hgetall(get_redis_key(type, id))
+      hash.each do |user_id, time|
+        if Time.zone.now - Time.parse(time) >= 20
+          has_changed |= remove(type, id, user_id)
+        end
+      end
+
+      has_changed
+    end
+
+  end
+
+  require_dependency "application_controller"
+
+  class Presence::PresencesController < ::ApplicationController
+    requires_plugin PLUGIN_NAME
+    before_action :ensure_logged_in
+
+    ACTIONS   ||= %w{edit reply}.each(&:freeze)
+    MAX_USERS ||= 20
+
+    def publish
+      data = params.permit(
+        :response_needed,
+        current: [:action, :topic_id, :post_id],
+        previous: [:action, :topic_id, :post_id]
+      )
+
+      payload = {}
+
+      if data[:previous] && data[:previous][:action].in?(ACTIONS)
+        type = data[:previous][:post_id] ? 'post' : 'topic'
+        id = data[:previous][:post_id] ? data[:previous][:post_id] : data[:previous][:topic_id]
+
+        topic = type == 'post' ? Post.find_by(id: id)&.topic : Topic.find_by(id: id)
+
+        if topic
+          guardian.ensure_can_see!(topic)
+
+          Presence::PresenceManager.remove(type, id, current_user.id)
+          Presence::PresenceManager.cleanup(type, id)
+          Presence::PresenceManager.publish(type, id)
+        end
+      end
+
+      if data[:current] && data[:current][:action].in?(ACTIONS)
+        type = data[:current][:post_id] ? 'post' : 'topic'
+        id = data[:current][:post_id] ? data[:current][:post_id] : data[:current][:topic_id]
+
+        topic = type == 'post' ? Post.find_by(id: id)&.topic : Topic.find_by(id: id)
+
+        if topic
+          guardian.ensure_can_see!(topic)
+
+          Presence::PresenceManager.add(type, id, current_user.id)
+          Presence::PresenceManager.cleanup(type, id)
+          users = Presence::PresenceManager.publish(type, id)
+
+          if data[:response_needed]
+            messagebus_channel = Presence::PresenceManager.get_messagebus_channel(type, id)
+            users ||= Presence::PresenceManager.get_users(type, id)
+            payload = json_payload(messagebus_channel, users)
+          end
+        end
+      end
+
+      render json: payload
+    end
+
+    def json_payload(channel, users)
+      {
+        messagebus_channel: channel,
+        messagebus_id: MessageBus.last_id(channel),
+        users: users.limit(MAX_USERS).map { |u| BasicUserSerializer.new(u, root: false) }
+      }
+    end
+
+  end
+
+  Presence::Engine.routes.draw do
+    post '/publish' => 'presences#publish'
+  end
+
+  Discourse::Application.routes.append do
+    mount ::Presence::Engine, at: '/presence'
+  end
+
+end
diff --git a/plugins/discourse-presence/spec/presence_manager_spec.rb b/plugins/discourse-presence/spec/presence_manager_spec.rb
new file mode 100644
index 0000000000..4f8cb48b02
--- /dev/null
+++ b/plugins/discourse-presence/spec/presence_manager_spec.rb
@@ -0,0 +1,106 @@
+require 'rails_helper'
+
+describe ::Presence::PresenceManager do
+
+  let(:user1) { Fabricate(:user) }
+  let(:user2) { Fabricate(:user) }
+  let(:user3) { Fabricate(:user) }
+  let(:manager) { ::Presence::PresenceManager }
+
+  let(:post1) { Fabricate(:post) }
+  let(:post2) { Fabricate(:post) }
+
+  after(:each) do
+    $redis.del("presence:topic:#{post1.topic.id}")
+    $redis.del("presence:topic:#{post2.topic.id}")
+    $redis.del("presence:post:#{post1.id}")
+    $redis.del("presence:post:#{post2.id}")
+  end
+
+  it 'adds, removes and lists users correctly' do
+    expect(manager.get_users('post', post1.id).count).to eq(0)
+
+    expect(manager.add('post', post1.id, user1.id)).to be true
+    expect(manager.add('post', post1.id, user2.id)).to be true
+    expect(manager.add('post', post2.id, user3.id)).to be true
+
+    expect(manager.get_users('post', post1.id).count).to eq(2)
+    expect(manager.get_users('post', post2.id).count).to eq(1)
+
+    expect(manager.get_users('post', post1.id)).to contain_exactly(user1, user2)
+    expect(manager.get_users('post', post2.id)).to contain_exactly(user3)
+
+    expect(manager.remove('post', post1.id, user1.id)).to be true
+    expect(manager.get_users('post', post1.id).count).to eq(1)
+    expect(manager.get_users('post', post1.id)).to contain_exactly(user2)
+  end
+
+  it 'publishes correctly' do
+    expect(manager.get_users('post', post1.id).count).to eq(0)
+
+    manager.add('post', post1.id, user1.id)
+    manager.add('post', post1.id, user2.id)
+
+    messages = MessageBus.track_publish do
+      manager.publish('post', post1.id)
+    end
+
+    expect(messages.count).to eq (1)
+    message = messages.first
+
+    expect(message.channel).to eq("/presence/post/#{post1.id}")
+
+    expect(message.data["users"].map { |u| u[:id] }).to contain_exactly(user1.id, user2.id)
+  end
+
+  it 'publishes private message securely' do
+    private_post = Fabricate(:private_message_post)
+    manager.add('post', private_post.id, user2.id)
+
+    messages = MessageBus.track_publish do
+      manager.publish('post', private_post.id)
+    end
+
+    expect(messages.count).to eq (1)
+    message = messages.first
+
+    expect(message.channel).to eq("/presence/post/#{private_post.id}")
+
+    user_ids = User.where('admin or moderator').pluck(:id)
+    user_ids += private_post.topic.allowed_users.pluck(:id)
+    expect(message.user_ids).to contain_exactly(*user_ids)
+  end
+
+  it 'publishes private category securely' do
+    group = Fabricate(:group)
+    category = Fabricate(:private_category, group: group)
+    private_topic = Fabricate(:topic, category: category)
+
+    manager.add('topic', private_topic.id, user2.id)
+
+    messages = MessageBus.track_publish do
+      manager.publish('topic', private_topic.id)
+    end
+
+    expect(messages.count).to eq (1)
+    message = messages.first
+
+    expect(message.channel).to eq("/presence/topic/#{private_topic.id}")
+
+    expect(message.group_ids).to contain_exactly(*private_topic.secure_group_ids)
+  end
+
+  it 'cleans up correctly' do
+    freeze_time Time.zone.now do
+      expect(manager.add('post', post1.id, user1.id)).to be true
+      expect(manager.cleanup('post', post1.id)).to be false # Nothing to cleanup
+      expect(manager.get_users('post', post1.id).count).to eq(1)
+    end
+
+    # Anything older than 20 seconds should be cleaned up
+    freeze_time 30.seconds.from_now do
+      expect(manager.cleanup('post', post1.id)).to be true
+      expect(manager.get_users('post', post1.id).count).to eq(0)
+    end
+  end
+end
diff --git a/plugins/discourse-presence/spec/requests/presence_controller_spec.rb b/plugins/discourse-presence/spec/requests/presence_controller_spec.rb
new file mode 100644
index 0000000000..0184718bc6
--- /dev/null
+++ b/plugins/discourse-presence/spec/requests/presence_controller_spec.rb
@@ -0,0 +1,163 @@
+require 'rails_helper'
+
+describe ::Presence::PresencesController do
+  before do
+    SiteSetting.presence_enabled = true
+  end
+
+  let(:user1) { Fabricate(:user) }
+  let(:user2) { Fabricate(:user) }
+  let(:user3) { Fabricate(:user) }
+
+  let(:post1) { Fabricate(:post) }
+  let(:post2) { Fabricate(:post) }
+
+  let(:manager) { ::Presence::PresenceManager }
+
+  after do
+    $redis.del("presence:topic:#{post1.topic.id}")
+    $redis.del("presence:topic:#{post2.topic.id}")
+    $redis.del("presence:post:#{post1.id}")
+    $redis.del("presence:post:#{post2.id}")
+  end
+
+  context 'when not logged in' do
+    it 'should raise the right error' do
+      expect { post '/presence/publish.json' }.to raise_error(Discourse::NotLoggedIn)
+    end
+  end
+
+  context 'when logged in' do
+    before do
+      sign_in(user1)
+    end
+
+    it "doesn't produce an error" do
+      expect { post '/presence/publish.json' }.not_to raise_error
+    end
+
+    it "uses guardian to secure endpoint" do
+      private_post = Fabricate(:private_message_post)
+
+      post '/presence/publish.json', params: {
+        current: { action: 'edit', post_id: private_post.id }
+      }
+
+      expect(response.code.to_i).to eq(403)
+
+      group = Fabricate(:group)
+      category = Fabricate(:private_category, group: group)
+      private_topic = Fabricate(:topic, category: category)
+
+      post '/presence/publish.json', params: {
+        current: { action: 'edit', topic_id: private_topic.id }
+      }
+
+      expect(response.code.to_i).to eq(403)
+    end
+
+    it "returns a response when requested" do
+      messages = MessageBus.track_publish do
+        post '/presence/publish.json', params: {
+          current: { compose_state: 'open', action: 'edit', post_id: post1.id }, response_needed: true
+        }
+      end
+
+      expect(messages.count).to eq(1)
+
+      data = JSON.parse(response.body)
+
+      expect(data['messagebus_channel']).to eq("/presence/post/#{post1.id}")
+      expect(data['messagebus_id']).to eq(MessageBus.last_id("/presence/post/#{post1.id}"))
+      expect(data['users'][0]["id"]).to eq(user1.id)
+    end
+
+    it "doesn't return a response when not requested" do
+      messages = MessageBus.track_publish do
+        post '/presence/publish.json', params: {
+          current: { compose_state: 'open', action: 'edit', post_id: post1.id }
+        }
+      end
+
+      expect(messages.count).to eq(1)
+
+      data = JSON.parse(response.body)
+      expect(data).to eq({})
+    end
+
+    it "does send duplicate messagebus messages" do
+      messages = MessageBus.track_publish do
+        post '/presence/publish.json', params: {
+          current: { compose_state: 'open', action: 'edit', post_id: post1.id }
+        }
+      end
+
+      expect(messages.count).to eq(1)
+
+      messages = MessageBus.track_publish do
+        post '/presence/publish.json', params: {
+          current: { compose_state: 'open', action: 'edit', post_id: post1.id }
+        }
+      end
+
+      # we do this cause we also publish time
+      expect(messages.count).to eq(1)
+    end
+
+    it "clears 'previous' state when supplied" do
+      messages = MessageBus.track_publish do
+        post '/presence/publish.json', params: {
+          current: { compose_state: 'open', action: 'edit', post_id: post1.id }
+        }
+
+        post '/presence/publish.json', params: {
+          current: { compose_state: 'open', action: 'edit', post_id: post2.id },
+          previous: { compose_state: 'open', action: 'edit', post_id: post1.id }
+        }
+      end
+
+      expect(messages.count).to eq(3)
+    end
+
+    it 'cleans up old users when requested' do
+      freeze_time Time.zone.now do
+        manager.add('topic', post1.topic.id, user2.id)
+      end
+
+      # Anything older than 20 seconds should be cleaned up
+      freeze_time 30.seconds.from_now do
+        post '/presence/publish.json', params: {
+          current: { compose_state: 'open', action: 'reply', topic_id: post1.topic.id }, response_needed: true
+        }
+
+        data = JSON.parse(response.body)
+
+        expect(data['users'].length).to eq(1)
+      end
+
+    end
+
+    describe 'when post has been deleted' do
+      it 'should return an empty response' do
+        post1.destroy!
+
+        post '/presence/publish.json', params: {
+          current: { compose_state: 'open', action: 'edit', post_id: post1.id }
+        }
+
+        expect(response.status).to eq(200)
+        expect(JSON.parse(response.body)).to eq({})
+
+        post '/presence/publish.json', params: {
+          current: { compose_state: 'open', action: 'edit', post_id: post2.id },
+          previous: { compose_state: 'open', action: 'edit', post_id: post1.id }
+        }
+
+        expect(response.status).to eq(200)
+        expect(JSON.parse(response.body)).to eq({})
+      end
+    end
+
+  end
+
+end
diff --git a/plugins/lazyYT/assets/javascripts/initializers/lazyYT.js.es6 b/plugins/lazyYT/assets/javascripts/initializers/lazyYT.js.es6
index 21037618f7..5400565243 100644
--- a/plugins/lazyYT/assets/javascripts/initializers/lazyYT.js.es6
+++ b/plugins/lazyYT/assets/javascripts/initializers/lazyYT.js.es6
@@ -1,7 +1,5 @@
 import { withPluginApi } from 'discourse/lib/plugin-api';
 
-const returnFalse = () => false;
-
 export default {
   name: "apply-lazyYT",
   initialize() {
@@ -18,14 +16,6 @@ export default {
             if (postId) {
               api.preventCloak(postId);
             }
-
-            // We use this because watching videos fullscreen in Chrome was super buggy
-            // otherwise. Thanks to arrendek from q23 for the technique.
-            $('iframe', iframes).iframeTracker({ blurCallback: () => {
-              $(document).on("scroll.discourse-youtube", returnFalse);
-              window.setTimeout(() => $(document).off('scroll.discourse-youtube', returnFalse), 1500);
-              $(document).scroll();
-            }});
           }
         });
 
diff --git a/plugins/lazyYT/assets/javascripts/jquery.iframetracker.js b/plugins/lazyYT/assets/javascripts/jquery.iframetracker.js
deleted file mode 100644
index 595633ea81..0000000000
--- a/plugins/lazyYT/assets/javascripts/jquery.iframetracker.js
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * jQuery iframe click tracking plugin
- *
- * @author Vincent Paré (www.finalclap.com)
- * @copyright © 2013-2015 Vincent Paré
- * @license http://opensource.org/licenses/Apache-2.0
- * @version 1.1.0
- */
-(function($){
-	// Tracking handler manager
-	$.fn.iframeTracker = function(handler){
-		var target = this.get();
-		if (handler === null || handler === false) {
-			$.iframeTracker.untrack(target);
-		} else if (typeof handler == "object") {
-			$.iframeTracker.track(target, handler);
-		} else {
-			throw new Error("Wrong handler type (must be an object, or null|false to untrack)");
-		}
-	};
-	
-	// Iframe tracker common object
-	$.iframeTracker = {
-		// State
-		focusRetriever: null,  // Element used for restoring focus on window (element)
-		focusRetrieved: false, // Says if the focus was retrived on the current page (bool)
-		handlersList: [],      // Store a list of every trakers (created by calling $(selector).iframeTracker...)
-		isIE8AndOlder: false,  // true for Internet Explorer 8 and older
-		
-		// Init (called once on document ready)
-		init: function(){
-			// Determine browser version (IE8-) ($.browser.msie is deprecated since jQuery 1.9)
-			try {
-				if ($.browser.msie == true && $.browser.version < 9) {
-					this.isIE8AndOlder = true;
-				}
-			} catch(ex) {
-				try {
-					var matches = navigator.userAgent.match(/(msie) ([\w.]+)/i);
-					if (matches[2] < 9) {
-						this.isIE8AndOlder = true;
-					}
-				} catch(ex2) {}
-			}
-			
-			// Listening window blur
-			$(window).focus();
-			$(window).blur(function(e){
-				$.iframeTracker.windowLoseFocus(e);
-			});
-			
-			// Focus retriever (get the focus back to the page, on mouse move)
-			$('body').append('<div style="position:fixed; top:0; left:0; overflow:hidden;"><input style="position:absolute; left:-300px;" type="text" value="" id="focus_retriever" readonly="true" /></div>');
-			this.focusRetriever = $('#focus_retriever');
-			this.focusRetrieved = false;
-			$(document).mousemove(function(e){
-				if (document.activeElement && document.activeElement.tagName == 'IFRAME') {
-					$.iframeTracker.focusRetriever.focus();
-					$.iframeTracker.focusRetrieved = true;
-				}
-			});
-			
-			// Special processing to make it work with my old friend IE8 (and older) ;)
-			if (this.isIE8AndOlder) {
-				// Blur doesn't works correctly on IE8-, so we need to trigger it manually
-				this.focusRetriever.blur(function(e){
-					e.stopPropagation();
-					e.preventDefault();
-					$.iframeTracker.windowLoseFocus(e);
-				});
-				
-				// Keep focus on window (fix bug IE8-, focusable elements)
-				$('body').click(function(e){ $(window).focus(); });
-				$('form').click(function(e){ e.stopPropagation(); });
-				
-				// Same thing for "post-DOMready" created forms (issue #6)
-				try {
-					$('body').on('click', 'form', function(e){ e.stopPropagation(); });
-				} catch(ex) {
-					console.log("[iframeTracker] Please update jQuery to 1.7 or newer. (exception: " + ex.message + ")");
-				}
-			}
-		},
-		
-		
-		// Add tracker to target using handler (bind boundary listener + register handler)
-		// target: Array of target elements (native DOM elements)
-		// handler: User handler object
-		track: function(target, handler){
-			// Adding target elements references into handler
-			handler.target = target;
-			
-			// Storing the new handler into handler list
-			$.iframeTracker.handlersList.push(handler);
-			
-			// Binding boundary listener
-			$(target)
-				.bind('mouseover', {handler: handler}, $.iframeTracker.mouseoverListener)
-				.bind('mouseout',  {handler: handler}, $.iframeTracker.mouseoutListener);
-		},
-		
-		// Remove tracking on target elements
-		// target: Array of target elements (native DOM elements)
-		untrack: function(target){
-			if (typeof Array.prototype.filter != "function") {
-				console.log("Your browser doesn't support Array filter, untrack disabled");
-				return;
-			}
-			
-			// Unbinding boundary listener
-			$(target).each(function(index){
-				$(this)
-					.unbind('mouseover', $.iframeTracker.mouseoverListener)
-					.unbind('mouseout', $.iframeTracker.mouseoutListener);
-			});
-			
-			// Handler garbage collector
-			var nullFilter = function(value){
-				return value === null ? false : true;
-			};
-			for (var i in this.handlersList) {
-				// Prune target
-				for (var j in this.handlersList[i].target) {
-					if ($.inArray(this.handlersList[i].target[j], target) !== -1) {
-						this.handlersList[i].target[j] = null;
-					}
-				}
-				this.handlersList[i].target = this.handlersList[i].target.filter(nullFilter);
-				
-				// Delete handler if unused
-				if (this.handlersList[i].target.length == 0) {
-					this.handlersList[i] = null;
-				}
-			}
-			this.handlersList = this.handlersList.filter(nullFilter);
-		},
-		
-		// Target mouseover event listener
-		mouseoverListener: function(e){
-			e.data.handler.over = true;
-			try {e.data.handler.overCallback(this);} catch(ex) {}
-		},
-		
-		// Target mouseout event listener
-		mouseoutListener: function(e){
-			e.data.handler.over = false;
-			$.iframeTracker.focusRetriever.focus();
-			try {e.data.handler.outCallback(this);} catch(ex) {}
-		},
-		
-		// Calls blurCallback for every handler with over=true on window blur
-		windowLoseFocus: function(event){
-			for (var i in this.handlersList) {
-				if (this.handlersList[i].over == true) {
-					try {this.handlersList[i].blurCallback();} catch(ex) {}
-				}
-			}
-		}
-	};
-	
-	// Init the iframeTracker on document ready
-	$(document).ready(function(){
-		$.iframeTracker.init();
-	});
-})(jQuery);
\ No newline at end of file
diff --git a/plugins/lazyYT/plugin.rb b/plugins/lazyYT/plugin.rb
index dc1e7da256..70475b73af 100644
--- a/plugins/lazyYT/plugin.rb
+++ b/plugins/lazyYT/plugin.rb
@@ -6,7 +6,6 @@
 
 # javascript
 register_asset "javascripts/lazyYT.js"
-register_asset "javascripts/jquery.iframetracker.js"
 
 # stylesheet
 register_asset "stylesheets/lazyYT.css"
diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
index 6458c65028..3a822f139a 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
@@ -87,7 +87,10 @@ export default Ember.Controller.extend({
     if (isMultiple) {
       return this._comboboxOptions(pollMinInt + 1, count + 1);
     } else if (isNumber) {
-      const pollStepInt = parseInt(pollStep) || 1;
+      let pollStepInt = parseInt(pollStep, 10);
+      if (pollStepInt < 1) {
+        pollStepInt = 1;
+      }
       return this._comboboxOptions(pollMinInt + 1, pollMinInt + (this.siteSettings.poll_maximum_options * pollStepInt));
     }
   },
@@ -109,10 +112,15 @@ export default Ember.Controller.extend({
       pollHeader += ` name=poll${match.length + 1}`;
     };
 
+    let step = pollStep;
+    if (step < 1) {
+      step = 1;
+    }
+
     if (pollType) pollHeader += ` type=${pollType}`;
     if (pollMin && showMinMax) pollHeader += ` min=${pollMin}`;
     if (pollMax) pollHeader += ` max=${pollMax}`;
-    if (isNumber) pollHeader += ` step=${pollStep}`;
+    if (isNumber) pollHeader += ` step=${step}`;
     if (publicPoll) pollHeader += ' public=true';
     pollHeader += ']';
     output += `${pollHeader}\n`;
@@ -143,6 +151,17 @@ export default Ember.Controller.extend({
     return InputValidation.create(options);
   },
 
+  @computed("pollStep")
+  minStepValueValidation(pollStep) {
+    let options = { ok: true };
+
+    if (pollStep < 1) {
+      options = { failed: true, reason: I18n.t("poll.ui_builder.help.min_step_value") };
+    }
+
+    return InputValidation.create(options);
+  },
+
   @computed("disableInsert")
   minNumOfOptionsValidation(disableInsert) {
     let options = { ok: true };
diff --git a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
index 81a25f4b04..47eaa0c1a2 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
@@ -4,6 +4,7 @@
       <label class="input-group-label">{{i18n 'poll.ui_builder.poll_type.label'}}</label>
       {{combo-box content=pollTypes
                   value=pollType
+                  allowInitialValueMutation=true
                   valueAttribute="value"}}
     </div>
 
@@ -32,7 +33,9 @@
           {{input type='number'
                   value=pollStep
                   valueAttribute="value"
+                  min="1"
                   class="poll-options-step"}}
+          {{input-tip validation=minStepValueValidation}}
         </div>
       {{/if}}
     {{/if}}
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 66fbb76404..9dbe65a4ef 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
@@ -1,16 +1,22 @@
 import { withPluginApi } from 'discourse/lib/plugin-api';
+import computed from 'ember-addons/ember-computed-decorators';
 import showModal from 'discourse/lib/show-modal';
 
 function initializePollUIBuilder(api) {
-  const siteSettings = api.container.lookup('site-settings:main');
+  api.modifyClass('controller:composer', {
+    @computed('siteSettings.poll_enabled', 'siteSettings.poll_minimum_trust_level_to_create')
+    canBuildPoll(pollEnabled, minimumTrustLevel) {
+      return pollEnabled &&
+             this.currentUser &&
+             (
+               this.currentUser.staff ||
+               this.currentUser.trust_level >= minimumTrustLevel
+             );
+    },
 
-  if (!siteSettings.poll_enabled && (api.getCurrentUser() && !api.getCurrentUser().staff)) return;
-
-  const ComposerController = api.container.lookupFactory("controller:composer");
-  ComposerController.reopen({
     actions: {
       showPollBuilder() {
-        showModal("poll-ui-builder").set("toolbarEvent", this.get("toolbarEvent"));
+        showModal('poll-ui-builder').set('toolbarEvent', this.get('toolbarEvent'));
       }
     }
   });
@@ -19,15 +25,16 @@ function initializePollUIBuilder(api) {
     return {
       action: 'showPollBuilder',
       icon: 'bar-chart-o',
-      label: 'poll.ui_builder.title'
+      label: 'poll.ui_builder.title',
+      condition: 'canBuildPoll'
     };
   });
 }
 
 export default {
-  name: "add-poll-ui-builder",
+  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 9fa2577af6..0138c6f99f 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 7458f2aa9c..ca67fa921b 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,294 @@
 /*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);
+
+    // infinite loop if step < 1
+    if (step < 1) {
+      step = 1;
+    }
+
+    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) => {
+    opts.features.poll = !!siteSettings.poll_enabled;
+    opts.pollMaximumOptions = siteSettings.poll_maximum_options;
+  });
+
+  helper.registerPlugin(md => {
+    md.block.bbcode.ruler.push('poll', rule);
+  });
+}
 
 export function setup(helper) {
   helper.whiteList([
@@ -28,155 +304,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/assets/javascripts/widgets/discourse-poll.js.es6 b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
index 5bac8d63b8..53061b420a 100644
--- a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
+++ b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
@@ -1,8 +1,9 @@
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import RawHtml from 'discourse/widgets/raw-html';
 import { ajax } from 'discourse/lib/ajax';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
 import evenRound from "discourse/plugins/poll/lib/even-round";
 import { avatarFor } from 'discourse/widgets/post';
 import round from "discourse/lib/round";
@@ -15,8 +16,12 @@ function fetchVoters(payload) {
   return ajax("/polls/voters.json", {
     type: "get",
     data: payload
-  }).catch(() => {
-    bootbox.alert(I18n.t('poll.error_while_fetching_voters'));
+  }).catch((error) => {
+    if (error) {
+      popupAjaxError(error);
+    } else {
+      bootbox.alert(I18n.t('poll.error_while_fetching_voters'));
+    }
   });
 }
 
@@ -511,8 +516,12 @@ export default createWidget('discourse-poll', {
           }).then(() => {
             poll.set('status', status);
             this.scheduleRerender();
-          }).catch(() => {
-            bootbox.alert(I18n.t("poll.error_while_toggling_status"));
+          }).catch((error) => {
+            if (error) {
+              popupAjaxError(error);
+            } else {
+              bootbox.alert(I18n.t("poll.error_while_toggling_status"));
+            }
           }).finally(() => {
             state.loading = false;
           });
@@ -570,8 +579,12 @@ export default createWidget('discourse-poll', {
       }
     }).then(() => {
       state.showResults = true;
-    }).catch(() => {
-      bootbox.alert(I18n.t("poll.error_while_casting_votes"));
+    }).catch((error) => {
+      if (error) {
+        popupAjaxError(error);
+      } else {
+        bootbox.alert(I18n.t("poll.error_while_casting_votes"));
+      }
     }).finally(() => {
       state.loading = false;
     });
diff --git a/plugins/poll/config/locales/client.ar.yml b/plugins/poll/config/locales/client.ar.yml
index 7d96f76ebe..7d53bc55b3 100644
--- a/plugins/poll/config/locales/client.ar.yml
+++ b/plugins/poll/config/locales/client.ar.yml
@@ -14,7 +14,7 @@ ar:
         two: "إثنان صوّتا"
         few: "صوّتوا"
         many: "صوّتوا"
-        other: "صوّتوا"
+        other: "الناخبين"
       total_votes:
         zero: "لم يصوت أحد"
         one: "صوت واحد"
@@ -40,7 +40,7 @@ ar:
             two: "اختر ما حدّه <strong>خيارين</strong>"
             few: "اختر ما حدّه <strong>%{count}</strong> خيارات"
             many: "اختر ما حدّه <strong>%{count}</strong> خيارا"
-            other: "اختر ما حدّه <strong>%{count}</strong> خيار"
+            other: "اختر حتي <strong>%{count}</strong> خيار"
           x_options:
             zero: "لا تختر شيئا"
             one: "اختر خيار <strong>واحد</strong>"
@@ -48,7 +48,7 @@ ar:
             few: "اختر <strong>%{count}</strong> خيارات"
             many: "اختر <strong>%{count}</strong> خيارا"
             other: "اختر <strong>%{count}</strong> خيار"
-          between_min_and_max_options: "اختر بين <strong>%{min}</strong> و <strong>%{max}</strong> خيارات"
+          between_min_and_max_options: "اختر بين <strong>%{min}</strong> و <strong>%{max}</strong> خيار"
       cast-votes:
         title: "أدلِ بصوتك"
         label: "صوّت اﻵن!"
@@ -56,7 +56,7 @@ ar:
         title: "اعرض نتائج التصويت"
         label: "أظهر النتائج"
       hide-results:
-        title: "عُد إلى أصواتك"
+        title: "ارجع إلى أصواتك"
         label: "أخفِ النتائج"
       open:
         title: "افتح التّصويت"
@@ -66,24 +66,26 @@ ar:
         title: "أغلق التّصويت"
         label: "أغلق"
         confirm: "أمتأكد من إغلاق هذا التّصويت؟"
-      error_while_toggling_status: "آسفون، حدثت مشكلة في تبديل حالة هذا التّصويت."
-      error_while_casting_votes: "آسفون، حدث خطأ في الإدلاء بأصواتك."
-      error_while_fetching_voters: "آسفون، حدث خطأ في عرض المصوّتين."
+      error_while_toggling_status: "عذرا، حدثت مشكلة في تبديل حالة هذا التّصويت."
+      error_while_casting_votes: "عذرا، حدث خطأ عند الإدلاء بأصواتكم."
+      error_while_fetching_voters: "عذرا، حدث خطأ في عرض الناخبين."
       ui_builder:
-        title: ابنِ تصويتا
+        title: انشأ تصويتا
         insert: أدرج التصويت
         help:
           options_count: أدخل خيارين على الأقل
+          invalid_values: يجب أن تكون القيمة الدّنيا أصغر من القيمة العليا.
+          min_step_value: قيمة الخطوة الدنيا هي 1
         poll_type:
           label: النوع
           regular: اختيار من متعدد
           multiple: عدّة خيارات
           number: تقييم عددي
         poll_config:
-          max: الأقصى
-          min: الأدنى
+          max: الحد الأقصى
+          min: الحد الأدنى
           step: الخطوة
         poll_public:
-          label: أظهر المصوّتون
+          label: أظهر الناخبين
         poll_options:
           label: أدخل خيارًا واحدًا في كل سطر
diff --git a/plugins/poll/config/locales/client.ca.yml b/plugins/poll/config/locales/client.ca.yml
new file mode 100644
index 0000000000..68213b87b7
--- /dev/null
+++ b/plugins/poll/config/locales/client.ca.yml
@@ -0,0 +1,70 @@
+# 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/
+
+ca:
+  js:
+    poll:
+      voters:
+        one: "votant"
+        other: "votants"
+      total_votes:
+        one: "vot total"
+        other: "vots totals"
+      average_rating: "Classificació mitjana: <strong>%{average}</strong>."
+      public:
+        title: "Els vots són públics."
+      multiple:
+        help:
+          at_least_min_options:
+            one: "Tria com a mínim <strong>1</strong> opció"
+            other: "Tria com a mínim <strong>%{count}</strong> opcions"
+          up_to_max_options:
+            one: "Tria més d'<strong>1</strong> opció"
+            other: "Tria més de <strong>%{count}</strong> opcions"
+          x_options:
+            one: "Tria <strong>1</strong> opció"
+            other: "Tria <strong>%{count}</strong> opcions"
+          between_min_and_max_options: "Tria entre <strong>%{min}</strong> i <strong>%{max}</strong> opcions"
+      cast-votes:
+        title: "Reparteix els teus vots"
+        label: "Vota ara!"
+      show-results:
+        title: "Mostra els resultats de l'enquesta"
+        label: "Mostra els resultats"
+      hide-results:
+        title: "Torna als teus vots"
+        label: "Amaga resultats"
+      open:
+        title: "Obre l'enquesta"
+        label: "Obre"
+        confirm: "Segur que vols obrir aquesta enquesta?"
+      close:
+        title: "Tanca l'enquesta"
+        label: "Tanca"
+        confirm: "Segur que vols tancar aquesta enquesta?"
+      error_while_toggling_status: "Disculpa, s'ha produït una errada en alternar l'estat de l'enquesta."
+      error_while_casting_votes: "Disculpa, s'ha produït una errada en emetre els teus vots."
+      error_while_fetching_voters: "Disculpa, hi ha hagut una errada en mostrar els votants."
+      ui_builder:
+        title: Crea una enquesta
+        insert: Insereix una enquesta
+        help:
+          options_count: Introdueix almenys 2 opcions
+          invalid_values: El valor mínim ha de ser menor que el valor màxim.
+        poll_type:
+          label: Tipus
+          regular: Elecció simple
+          multiple: Elecció múltiple
+          number: Classificació de nombre
+        poll_config:
+          max: Màx.
+          min: Mín.
+          step: Pas
+        poll_public:
+          label: Mostra qui ha votat
+        poll_options:
+          label: Introdueix una elecció d'enquesta per línia
diff --git a/plugins/poll/config/locales/client.cs.yml b/plugins/poll/config/locales/client.cs.yml
index b6a99b3c6b..1fe70f3a80 100644
--- a/plugins/poll/config/locales/client.cs.yml
+++ b/plugins/poll/config/locales/client.cs.yml
@@ -28,24 +28,24 @@ cs:
           up_to_max_options:
             one: "Zvolte maximálně <strong>1</strong> možnost."
             few: "Zvolte maximálně <strong>%{count}</strong> možnosti."
-            other: "Zvolte maximálně <strong>%{count}</strong> možností."
+            other: "Zvolte maximálně <strong>%{count}</strong> možností"
           x_options:
             one: "Zvolte <strong>1</strong> možnost."
             few: "Zvolte <strong>%{count}</strong> možnosti."
-            other: "Zvolte <strong>%{count}</strong> možností."
-          between_min_and_max_options: "Zvolte mezi <strong>%{min}</strong> a <strong>%{max}</strong> možnostmi."
+            other: "Zvolte <strong>%{count}</strong> možností"
+          between_min_and_max_options: "Zvolte mezi <strong>%{min}</strong> a <strong>%{max}</strong> možnostmi"
       cast-votes:
         title: "Hlasujte"
-        label: "Hlasovat!"
+        label: "Hlasovat nyní!"
       show-results:
-        title: "Zobraz výsledky hlasování"
+        title: "Zobrazit výsledky hlasování"
         label: "Ukaž výsledky"
       hide-results:
         title: "Zpět k hlasování"
-        label: "Schovej výsledky"
+        label: "Skrýt výsledky"
       open:
         title: "Otevřít hlasování"
-        label: "Otevři"
+        label: "Otevřít"
         confirm: "Opravdu chcete otevřít toto hlasování?"
       close:
         title: "Zavřít hlasování"
@@ -59,14 +59,15 @@ cs:
         insert: Vložit hlasování
         help:
           options_count: Zadejte alespoň 2 možnosti
+          invalid_values: Minimální hodnota musí být menší než maximální hodnota.
         poll_type:
           label: Typ
           regular: Jedna možnost
           multiple: Více možností
           number: Číselné hodnocení
         poll_config:
-          max: Maximum
-          min: Minimum
+          max: Max
+          min: Min
           step: Krok
         poll_public:
           label: Zobrazit kdo hlasoval
diff --git a/plugins/poll/config/locales/client.de.yml b/plugins/poll/config/locales/client.de.yml
index 744a66fa8f..99afb460b6 100644
--- a/plugins/poll/config/locales/client.de.yml
+++ b/plugins/poll/config/locales/client.de.yml
@@ -55,6 +55,7 @@ de:
         help:
           options_count: Gib mindestens 2 Optionen ein
           invalid_values: Der Minimalwert muss kleiner sein als der Maximalwert.
+          min_step_value: Die minimale Schrittweite beträgt 1.
         poll_type:
           label: Art
           regular: Einfachauswahl
diff --git a/plugins/poll/config/locales/client.el.yml b/plugins/poll/config/locales/client.el.yml
index a76d40e090..17d296dc7f 100644
--- a/plugins/poll/config/locales/client.el.yml
+++ b/plugins/poll/config/locales/client.el.yml
@@ -54,6 +54,8 @@ el:
         insert: Εισαγωγή Ψηφοφορίας
         help:
           options_count: Εισάγετε τουλάχιστόν 2 επιλογές
+          invalid_values: Η ελάχιστη τιμή θα πρέπει να είναι μικρότερη από την μέγιστη τιμή.
+          min_step_value: Η ελάχιστη τιμή για το βήμα είναι 1
         poll_type:
           label: Τύπος
           regular: Μία επιλογή
diff --git a/plugins/poll/config/locales/client.en.yml b/plugins/poll/config/locales/client.en.yml
index f2d8cb01d2..86bae64192 100644
--- a/plugins/poll/config/locales/client.en.yml
+++ b/plugins/poll/config/locales/client.en.yml
@@ -75,6 +75,7 @@ en:
         help:
           options_count: Enter at least 2 options
           invalid_values: Minimum value must be smaller than the maximum value.
+          min_step_value: The minimum step value is 1
         poll_type:
           label: Type
           regular: Single Choice
diff --git a/plugins/poll/config/locales/client.es.yml b/plugins/poll/config/locales/client.es.yml
index fa46fb0aa5..3538a726da 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,22 +39,23 @@ 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.
+          min_step_value: El valor mínimo por paso es 1
         poll_type:
           label: Tipo
           regular: Una opción
@@ -67,4 +68,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.fi.yml b/plugins/poll/config/locales/client.fi.yml
index 6d3159eda8..d5621795c8 100644
--- a/plugins/poll/config/locales/client.fi.yml
+++ b/plugins/poll/config/locales/client.fi.yml
@@ -55,6 +55,7 @@ fi:
         help:
           options_count: Valitse vähintään 2 vaihtoehtoa
           invalid_values: Vähimmäisarvon täytyy olla enimmäisarvoa pienempi.
+          min_step_value: Askelvälin on oltava vähintään 1
         poll_type:
           label: Tyyppi
           regular: Valitaan yksi
diff --git a/plugins/poll/config/locales/client.fr.yml b/plugins/poll/config/locales/client.fr.yml
index dfad51e304..1667e83eba 100644
--- a/plugins/poll/config/locales/client.fr.yml
+++ b/plugins/poll/config/locales/client.fr.yml
@@ -55,6 +55,7 @@ fr:
         help:
           options_count: Entrez au moins 2 options
           invalid_values: La valeur minimum doit être plus petite que la valeur maximum.
+          min_step_value: Le valeur minimum du pas est 1
         poll_type:
           label: Type
           regular: Choix unique
diff --git a/plugins/poll/config/locales/client.ja.yml b/plugins/poll/config/locales/client.ja.yml
index e2a9dc4835..67a397d677 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 bad2adb3cb..2de09fd24d 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.lv.yml b/plugins/poll/config/locales/client.lv.yml
new file mode 100644
index 0000000000..26d0070334
--- /dev/null
+++ b/plugins/poll/config/locales/client.lv.yml
@@ -0,0 +1,26 @@
+# 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/
+
+lv:
+  js:
+    poll:
+      public:
+        title: "Balsojumi ir publiski."
+      cast-votes:
+        label: "Balso tagad!"
+      show-results:
+        title: "Parādīt aptaujas rezultātus"
+        label: "Rādīt rezultātus"
+      hide-results:
+        title: "Atpakaļ pie balsojumiem"
+        label: "Paslēpt rezultātus"
+      open:
+        title: "Atvērt aptauju"
+        label: "Atvērt"
+      close:
+        title: "Aizvērt aptauju"
+        label: "Aizvērt"
diff --git a/plugins/poll/config/locales/client.nb_NO.yml b/plugins/poll/config/locales/client.nb_NO.yml
index 57987100a5..d6b93d7484 100644
--- a/plugins/poll/config/locales/client.nb_NO.yml
+++ b/plugins/poll/config/locales/client.nb_NO.yml
@@ -55,6 +55,7 @@ nb_NO:
         help:
           options_count: Må inneholde minst 2 alternativer
           invalid_values: Minimumsverdien må være mindre enn maksimumsverdien.
+          min_step_value: Minimal stegverdi er 1
         poll_type:
           label: Type
           regular: Et valg
diff --git a/plugins/poll/config/locales/client.pt.yml b/plugins/poll/config/locales/client.pt.yml
index fd11a05cd2..a871a56581 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 e5b2cde587..df87f6641d 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/client.ru.yml b/plugins/poll/config/locales/client.ru.yml
index cdda28c9d3..cf472b18af 100644
--- a/plugins/poll/config/locales/client.ru.yml
+++ b/plugins/poll/config/locales/client.ru.yml
@@ -64,6 +64,7 @@ ru:
         insert: Вставить опрос в сообщение
         help:
           options_count: Введите хотя бы 2 варианта ответа
+          invalid_values: Минимальное значение должно быть меньше максимального значения.
         poll_type:
           label: Тип опроса
           regular: Выбор одного варианта из списка
diff --git a/plugins/poll/config/locales/client.sr.yml b/plugins/poll/config/locales/client.sr.yml
new file mode 100644
index 0000000000..1748c65d96
--- /dev/null
+++ b/plugins/poll/config/locales/client.sr.yml
@@ -0,0 +1,11 @@
+# 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/
+
+sr:
+  js:
+    poll:
+      average_rating: "Prosečan rejting: <strong>%{average}</strong>."
diff --git a/plugins/poll/config/locales/client.th.yml b/plugins/poll/config/locales/client.th.yml
new file mode 100644
index 0000000000..8ee53a82e6
--- /dev/null
+++ b/plugins/poll/config/locales/client.th.yml
@@ -0,0 +1,56 @@
+# 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/
+
+th:
+  js:
+    poll:
+      voters:
+        other: "ผู้โหวต"
+      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: "โหวตเดี๋ยวนี้"
+      show-results:
+        title: "แสดงผลโหวต"
+        label: "แสดงผล"
+      hide-results:
+        title: "กลับสู่การโหวต"
+        label: "ซ่อนผล"
+      open:
+        title: "เปิดโพล"
+        label: "เปิด"
+        confirm: "คุณแน่ใจหรือไม่ที่จะเปิดโพลนี้"
+      close:
+        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_public:
+          label: แสดงรายชื่อผู้โหวต
+        poll_options:
+          label: ใส่ตัวเลือกบรรทัดละ 1 ตัวเลือก
diff --git a/plugins/poll/config/locales/client.tr_TR.yml b/plugins/poll/config/locales/client.tr_TR.yml
index e313bed0a5..5487fbc571 100644
--- a/plugins/poll/config/locales/client.tr_TR.yml
+++ b/plugins/poll/config/locales/client.tr_TR.yml
@@ -49,6 +49,7 @@ tr_TR:
         insert: Anket Ekle
         help:
           options_count: En az 2 seçenek ekleyin
+          invalid_values: Minimum değer maksimum değerden küçük olmalıdır.
         poll_type:
           label: Tür
           regular: Tekli seçim
diff --git a/plugins/poll/config/locales/client.vi.yml b/plugins/poll/config/locales/client.vi.yml
index 9600865c4f..386254901a 100644
--- a/plugins/poll/config/locales/client.vi.yml
+++ b/plugins/poll/config/locales/client.vi.yml
@@ -14,7 +14,7 @@ vi:
         other: "tổng số bình chọn"
       average_rating: "Trung bình: <strong>%{average}</strong>."
       public:
-        title: "Thăm dò này là công khai."
+        title: "Thăm dò công khai."
       multiple:
         help:
           at_least_min_options:
@@ -50,6 +50,7 @@ vi:
         help:
           options_count: Nhập vào ít nhất 2 lựa chọn
           invalid_values: Giá trị nhỏ nhất phải nhỏ hơn giá trị lớn nhất.
+          min_step_value: Khoảng cách tối thiểu là 1
         poll_type:
           label: Loại
           regular: Một lựa chọn
diff --git a/plugins/poll/config/locales/client.zh_CN.yml b/plugins/poll/config/locales/client.zh_CN.yml
index 28bf1e387f..b9fd8e029b 100644
--- a/plugins/poll/config/locales/client.zh_CN.yml
+++ b/plugins/poll/config/locales/client.zh_CN.yml
@@ -50,6 +50,7 @@ zh_CN:
         help:
           options_count: 输入至少 2 个选项
           invalid_values: 最小值必须小于最大值。
+          min_step_value: 最小步长为1
         poll_type:
           label: 类型
           regular: 单选
diff --git a/plugins/poll/config/locales/client.zh_TW.yml b/plugins/poll/config/locales/client.zh_TW.yml
index d3690bc519..078e9f1b6d 100644
--- a/plugins/poll/config/locales/client.zh_TW.yml
+++ b/plugins/poll/config/locales/client.zh_TW.yml
@@ -49,6 +49,7 @@ zh_TW:
         insert: 插入投票
         help:
           options_count: 輸入至少 2 個選項
+          invalid_values: 最小值必須比最大值小。
         poll_type:
           label: 類型
           regular: 單選
diff --git a/plugins/poll/config/locales/server.ar.yml b/plugins/poll/config/locales/server.ar.yml
index 8ff1fbce8e..4a14499de7 100644
--- a/plugins/poll/config/locales/server.ar.yml
+++ b/plugins/poll/config/locales/server.ar.yml
@@ -7,13 +7,12 @@
 
 ar:
   site_settings:
-    poll_enabled: "أيمكن للمستخدمين إنشاء تصويتات؟"
     poll_maximum_options: "أقصى عدد للخيارات في كلّ تصويت."
-    poll_edit_window_mins: "عدد الدقائق المسموح فيها تعديل التصويتات بعد نشر المشاركة."
+    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: "على التصويت توفير خيارين على الأقل."
+    default_poll_must_have_at_least_2_options: "يجب ان يكون التصويت بين خيارين على الأقل."
     named_poll_must_have_at_least_2_options: "على التصويت ذو الاسم <strong>%{name}</strong> توفير خيارين على الأقل."
     default_poll_must_have_less_options:
       zero: "على التصويت ألا يوفّر أي خيار."
@@ -35,11 +34,11 @@ ar:
     named_poll_with_multiple_choices_has_invalid_parameters: "للتصويت متعدد الخيارات ذو الاسم <strong>%{name}</strong> معلمات غير صالحة."
     requires_at_least_1_valid_option: "عليك اختيار خيار واحد صالح على الأقل."
     default_cannot_be_made_public: "التصويت المدرج به اصوات لا يمكن أن يكون مفتوح للجميع."
-    named_cannot_be_made_public: "التصويت <strong>%{name}</strong> مدرج بة أصوات ولا يمكن فتحة للجميع."
+    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: "لا شيء تفعله مع مشاركة محذوفة. "
diff --git a/plugins/poll/config/locales/server.bs_BA.yml b/plugins/poll/config/locales/server.bs_BA.yml
index 37f7bcbf51..c6aaba0429 100644
--- a/plugins/poll/config/locales/server.bs_BA.yml
+++ b/plugins/poll/config/locales/server.bs_BA.yml
@@ -7,7 +7,6 @@
 
 bs_BA:
   site_settings:
-    poll_enabled: "Dozvolite korisnicima da kreiraju ankete?"
     poll_maximum_options: "Najveći broj dopuštenih izbora u anketi."
     poll_edit_window_mins: "Period od objave posta u minutama u kojem je moguće urediti ankete."
   poll:
diff --git a/plugins/poll/config/locales/server.ca.yml b/plugins/poll/config/locales/server.ca.yml
new file mode 100644
index 0000000000..c904769304
--- /dev/null
+++ b/plugins/poll/config/locales/server.ca.yml
@@ -0,0 +1,42 @@
+# 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/
+
+ca:
+  site_settings:
+    poll_maximum_options: "Nombre màxim d'opcions permeses en una enquesta."
+    poll_edit_window_mins: "Nombre de minuts després del posteig durant els quals poden editar-se les enquestes."
+  poll:
+    multiple_polls_without_name: "Hi ha múltiples enquestes sense nom. Empra l'atribut '<code>nom</code>' per identificar inequívocament les teves enquestes."
+    multiple_polls_with_same_name: "Hi ha múltiples enquestes amb el mateix nom: <strong>%{name}</strong>. Empra l'atribut '<code>nom</code>' per identificar inequívocament les teves enquestes."
+    default_poll_must_have_at_least_2_options: "L'enquesta ha de tenir 2 opcions com a mínim."
+    named_poll_must_have_at_least_2_options: "La votació anomenada <strong>%{name}</strong> ha de tenir com a mínim 2 opcions."
+    default_poll_must_have_less_options:
+      one: "L'enquesta ha de tenir menys d'1 opció."
+      other: "L'enquesta ha de tenir menys de %{count} opcions."
+    named_poll_must_have_less_options:
+      one: "L'enquesta <strong>%{name}</strong> ha de tenir menys d'1 opció."
+      other: "L'enquesta <strong>%{name}</strong> ha de tenir menys de %{count} opcions."
+    default_poll_must_have_different_options: "La votació ha de tenir diferents opcions."
+    named_poll_must_have_different_options: "La votació anomenada <strong>%{name}</strong> ha de tenir diferents opcions."
+    default_poll_with_multiple_choices_has_invalid_parameters: "La votació multi-resposta té paràmetres incorrectes."
+    named_poll_with_multiple_choices_has_invalid_parameters: "La votació anomenada <strong>%{name}</strong> multi-resposta té paràmetres invàlids."
+    requires_at_least_1_valid_option: "Has de seleccionar com a mínim 1 opció vàlida."
+    default_cannot_be_made_public: "Enquestes amb vots no poden fer-se públiques."
+    named_cannot_be_made_public: "L'enquesta anomenada <strong>%{name}</strong> te vots i no pot fer-se pública."
+    edit_window_expired:
+      cannot_change_polls: "No pots afegir, remou-re o reanomenar enquestes passats %{minutes} minuts."
+      op_cannot_edit_options: "No pots afegir o eliminar opcions d'enquestes passats %{minutes} minuts. Per favor, contacta un moderador si necessites editar una opció de l'enquesta."
+      staff_cannot_add_or_remove_options: "No pots afegir o elimiminar opcions d'enquesta passats %{minutes} minuts. Hauries de tancar el tema i crear-ne un de nou."
+    no_polls_associated_with_this_post: "No hi ha votacions associades a aquesta entrada."
+    no_poll_with_this_name: "No hi ha cap votació anomenada <strong>%{name}</strong> i associada a aquesta entrada."
+    post_is_deleted: "No pots actuar sobre una entrada esborrada."
+    topic_must_be_open_to_vote: "El tema ha d'estar obert per a poder votar."
+    poll_must_be_open_to_vote: "La votació ha d'estar oberta per a poder votar."
+    topic_must_be_open_to_toggle_status: "El tema ha d'estar obert per a canviar-ne l'estatus."
+    only_staff_or_op_can_toggle_status: "Només un membre del staff o el seu autor inicial poden canviar l'estatus d'una votació."
+    email:
+      link_to_poll: "Clica per veure l'enquesta"
diff --git a/plugins/poll/config/locales/server.cs.yml b/plugins/poll/config/locales/server.cs.yml
index b7f25d9d10..33f15ccdde 100644
--- a/plugins/poll/config/locales/server.cs.yml
+++ b/plugins/poll/config/locales/server.cs.yml
@@ -7,12 +7,11 @@
 
 cs:
   site_settings:
-    poll_enabled: "Povolit uživatelům vytvářet hlasování?"
-    poll_maximum_options: "Maximální počet odpovědí v hlasování."
-    poll_edit_window_mins: "Počet minut, po kterých je ještě možné upravit hlasování."
+    poll_maximum_options: "Maximální počet možností povolených v hlasování."
+    poll_edit_window_mins: "Počet minut po vytvoření příspěvku, po kterých je ještě možné upravit hlasování."
   poll:
-    multiple_polls_without_name: "Hlasováním chybí jméno. Použijte atribut '<code>name</code>' pro jednoznačnou identifikaci vašich hlasování."
-    multiple_polls_with_same_name: "Víc hlasování má stejné jméno: <strong>%{name}</strong>.  Použijte atribut '<code>name</code>' pro jednoznačnou identifikaci vašich hlasování."
+    multiple_polls_without_name: "Je zde několik hlasování bez jména. Použijte atribut '<code>jméno</code>' pro jednoznačnou identifikaci Vašich hlasování."
+    multiple_polls_with_same_name: "Více hlasování má stejné jméno: <strong>%{name}</strong>.  Použijte atribut '<code>name</code>' pro jednoznačnou identifikaci Vaše hlasování."
     default_poll_must_have_at_least_2_options: "Hlasování musí mít alespoň 2 odpovědi."
     named_poll_must_have_at_least_2_options: "Hlasování <strong>%{name}</strong> musí mít alespoň 2 odpovědi."
     default_poll_must_have_less_options:
@@ -25,15 +24,15 @@ cs:
       other: "Hlasování <strong>%{name}</strong> nesmí mít více než %{count} možností."
     default_poll_must_have_different_options: "Hlasování musí mít různé odpovědi."
     named_poll_must_have_different_options: "Hlasování <strong>%{name}</strong> musí mít různé odpovědi."
-    default_poll_with_multiple_choices_has_invalid_parameters: "Hlasování s více možnostmi nemá validní parametry."
-    named_poll_with_multiple_choices_has_invalid_parameters: "Hlasování <strong>%{name}</strong> s více možnostmi nemá validní parametry."
+    default_poll_with_multiple_choices_has_invalid_parameters: "Hlasování s více možnostmi má neplatné parametry."
+    named_poll_with_multiple_choices_has_invalid_parameters: "Hlasování <strong>%{name}</strong> s více možnostmi má neplatné parametry."
     requires_at_least_1_valid_option: "Musíte vybrat alespoň jednu platnou odpověď."
     default_cannot_be_made_public: "Hlasování s hlasy nemůže být zveřejněno."
     named_cannot_be_made_public: "Hlasování <strong>%{name}</strong> s hlasy nemůže být zveřejněno."
     edit_window_expired:
       cannot_change_polls: "Nemůžete přidávat, odebírat nebo přejmenovávat hlasování po prvních %{minutes} minutách."
-      op_cannot_edit_options: "Nemůžete přidávat, odebírat nebo přejmenovávat hlasování po prvních %{minutes} minutách. Kontaktujte prosím moderátora pokud potřebujete upravit odpověď v hlasování."
-      staff_cannot_add_or_remove_options: "Nemůžete přidávat, odebírat nebo přejmenovávat hlasování po prvních %{minutes} minutách. Zavřete toto téma a místo něj vytvořte nové."
+      op_cannot_edit_options: "Nemůžete přidávat, odebírat nebo přejmenovávat hlasování po prvních %{minutes} minutách. Kontaktujte prosím moderátora, pokud potřebujete upravit odpověď v hlasování."
+      staff_cannot_add_or_remove_options: "Nemůžete přidávat, odebírat nebo přejmenovávat hlasování po prvních %{minutes} minutách. Měli byste zavřít toto téma a vytvořit místo něj nové."
     no_polls_associated_with_this_post: "Tento příspěvek nemá žádné hlasování. "
     no_poll_with_this_name: "Tento příspěvek nemá žádné hlasování se jménem <strong>%{name}</strong>. "
     post_is_deleted: "Operaci na smazaném příspěvku nelze provést."
diff --git a/plugins/poll/config/locales/server.da.yml b/plugins/poll/config/locales/server.da.yml
index 64c27602d4..50dd0c3bdc 100644
--- a/plugins/poll/config/locales/server.da.yml
+++ b/plugins/poll/config/locales/server.da.yml
@@ -7,7 +7,6 @@
 
 da:
   site_settings:
-    poll_enabled: "Tillad at brugere opretter afstemninger?"
     poll_maximum_options: "Maksimalt antal valgmuligheder i en afstemning."
     poll_edit_window_mins: "Antal af minutter efter oprettelse af et indlæg hvor en afstemning kan redigeres."
   poll:
diff --git a/plugins/poll/config/locales/server.de.yml b/plugins/poll/config/locales/server.de.yml
index 5c62af1aa3..b5848dbbab 100644
--- a/plugins/poll/config/locales/server.de.yml
+++ b/plugins/poll/config/locales/server.de.yml
@@ -7,9 +7,10 @@
 
 de:
   site_settings:
-    poll_enabled: "Benutzern das Erstellen von Umfragen erlauben?"
+    poll_enabled: "Umfragen erlauben?"
     poll_maximum_options: "Maximale Anzahl der in einer Umfrage erlaubten Optionen."
     poll_edit_window_mins: "Anzahl Minuten nach der Erstellung eines Beitrags, in denen Umfragen bearbeitet werden können."
+    poll_minimum_trust_level_to_create: "Erforderliche Vertrauensstufe, um Umfragen zu erstellen. "
   poll:
     multiple_polls_without_name: "Es gibt mehrere namenlose Umfragen. Benutze das Attribute '<code>name</code>', um deine Umfragen eindeutig identifizierbar zu machen."
     multiple_polls_with_same_name: "Es gibt mehre Umfragen mit dem selben Namen: <strong>%{name}</strong>. Benutze das Attribute '<code>name</code>', um deine Umfragen eindeutig identifizierbar zu machen."
@@ -39,5 +40,6 @@ de:
     poll_must_be_open_to_vote: "Die Umfrage muss zum Abstimmen gestartet sein."
     topic_must_be_open_to_toggle_status: "Damit du den Status ändern kannst, muss das Thema geöffnet sein."
     only_staff_or_op_can_toggle_status: "Nur ein Team-Mitglied und der Autor des Beitrags können den Status der Umfrage ändern."
+    insufficient_rights_to_create: "Du darfst keine Umfragen erstellen."
     email:
       link_to_poll: "Klicke hier, um die Umfrage zu sehen."
diff --git a/plugins/poll/config/locales/server.el.yml b/plugins/poll/config/locales/server.el.yml
index 1d51d34891..7d2ef9753a 100644
--- a/plugins/poll/config/locales/server.el.yml
+++ b/plugins/poll/config/locales/server.el.yml
@@ -7,9 +7,10 @@
 
 el:
   site_settings:
-    poll_enabled: "Να επιτρέπεται σε χρήστες να δημιουργούν ψηφοφορίες;"
+    poll_enabled: "Επιτρέπονται οι ψηφοφορίες;"
     poll_maximum_options: "Μέγιστος αριθμός επιλογών σε μια ψηφοφορία."
     poll_edit_window_mins: "Αριθμός λεπτών μετά την δημιουργία ανάρτησης που οι ψηφοφορίες μπορούν να αλλαχθούν "
+    poll_minimum_trust_level_to_create: "Ελάχιστο απαιτούμενο επίπεδο εμπιστοσύνης για την δημιουργία ψηφοφοριών."
   poll:
     multiple_polls_without_name: "Υπάρχουν πολλές ψηφοφορίες χωρίς όνομα. Χρησιμοποίησε την ιδιότητα '<code>name</code>' για να κάνεις τις ψηφοφορίες σου μοναδικά αναγνωρίσιμες."
     multiple_polls_with_same_name: "Υπάρχουν πολλές ψηφοφορίες με το ίδιο όνομα: <strong>%{name}</strong>. Χρησιμοποίησε την ιδιότητα '<code>name</code>' για να κάνεις τις ψηφοφορίες σου μοναδικά αναγνωρίσιμες."
@@ -17,21 +18,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: "Δεν μπορείτε να ενεργήσετε σε διεγραμένη ανάρτηση."
@@ -39,5 +40,6 @@ el:
     poll_must_be_open_to_vote: "Η ψηφοφορία πρέπει να έχει ξεκινήσει πρώτα."
     topic_must_be_open_to_toggle_status: "Για να μπορεί να αλλάξει η κατάσταση του νήματος, πρέπει να είναι ανοιχτό."
     only_staff_or_op_can_toggle_status: "Η κατάσταση της ψηφοφορίας μπορεί να αλλάξει μόνο από συντονιστές ή από τον δημιουργό του νήματος."
+    insufficient_rights_to_create: "Δεν σας επιτρέπεται η δημιουργία ψηφοφοριών."
     email:
-      link_to_poll: "Κάντε κλικ για να δείτε την δημοσκόπηση."
+      link_to_poll: "Κάντε κλικ για να δείτε την ψηφοφορία."
diff --git a/plugins/poll/config/locales/server.en.yml b/plugins/poll/config/locales/server.en.yml
index 6ae0bea3c4..ab2be4fd1c 100644
--- a/plugins/poll/config/locales/server.en.yml
+++ b/plugins/poll/config/locales/server.en.yml
@@ -16,9 +16,10 @@
 
 en:
   site_settings:
-    poll_enabled: "Allow users to create polls?"
+    poll_enabled: "Allow polls?"
     poll_maximum_options: "Maximum number of options allowed in a poll."
     poll_edit_window_mins: "Number of minutes after post creation during which polls can be edited."
+    poll_minimum_trust_level_to_create: "Define the minimum trust level needed to create polls."
 
   poll:
     multiple_polls_without_name: "There are multiple polls without a name. Use the '<code>name</code>' attribute to uniquely identify your polls."
@@ -61,5 +62,7 @@ en:
     topic_must_be_open_to_toggle_status: "The topic must be open to toggle status."
     only_staff_or_op_can_toggle_status: "Only a staff member or the original poster can toggle a poll status."
 
+    insufficient_rights_to_create: "You are not allowed to create polls."
+
     email:
       link_to_poll: "Click to view the poll."
diff --git a/plugins/poll/config/locales/server.es.yml b/plugins/poll/config/locales/server.es.yml
index f7059dddb6..53d314bfc9 100644
--- a/plugins/poll/config/locales/server.es.yml
+++ b/plugins/poll/config/locales/server.es.yml
@@ -7,9 +7,10 @@
 
 es:
   site_settings:
-    poll_enabled: "¿Permitir la creación de encuestas?"
+    poll_enabled: "¿Permitir encuestas?"
     poll_maximum_options: "Número máximo de opciones permitidas en una encuesta."
     poll_edit_window_mins: "Número de minutos tras la creación del mensaje durante los cuales las encuestas pueden ser editadas."
+    poll_minimum_trust_level_to_create: "Definir el mínimo nivel de confianza requerido para crear encuestas."
   poll:
     multiple_polls_without_name: "Hay varias encuestas sin nombre. Usa la etiqueta '<code>name</code>' para diferenciar tus encuestas."
     multiple_polls_with_same_name: "Hay varias encuestas con el mismo nombre: <strong>%{name}</strong>. Usa la etiqueta '<code>name</code>' para diferenciar tus encuestas."
@@ -26,18 +27,19 @@ 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."
+    insufficient_rights_to_create: "No tienes permitido para crear encuestas."
     email:
       link_to_poll: "Haz clic para ver la encuesta."
diff --git a/plugins/poll/config/locales/server.et.yml b/plugins/poll/config/locales/server.et.yml
index e001a0f0a8..c763aea00b 100644
--- a/plugins/poll/config/locales/server.et.yml
+++ b/plugins/poll/config/locales/server.et.yml
@@ -7,7 +7,6 @@
 
 et:
   site_settings:
-    poll_enabled: "Lubada kasutajatel küsitlusi koostada?"
     poll_maximum_options: "Maksimaalne valikute arv, mis on küsitluses lubatud."
     poll_edit_window_mins: "Minutite arv peale loomist, mille jooksul saab küsitlust veel muuta."
   poll:
diff --git a/plugins/poll/config/locales/server.fa_IR.yml b/plugins/poll/config/locales/server.fa_IR.yml
index 69023ef5cb..2ebc151a22 100644
--- a/plugins/poll/config/locales/server.fa_IR.yml
+++ b/plugins/poll/config/locales/server.fa_IR.yml
@@ -7,7 +7,6 @@
 
 fa_IR:
   site_settings:
-    poll_enabled: "به کاربران اجازه ساخت نظرسنجی داده شود؟ "
     poll_maximum_options: "حداکثر تعداد گزینه برای نظرسنجی‌ها."
     poll_edit_window_mins: "چند دقیقه بعد از ارسال نظر می توان آن را ویرایش کرد"
   poll:
diff --git a/plugins/poll/config/locales/server.fi.yml b/plugins/poll/config/locales/server.fi.yml
index 551cbc8bca..f6fd229c3b 100644
--- a/plugins/poll/config/locales/server.fi.yml
+++ b/plugins/poll/config/locales/server.fi.yml
@@ -7,9 +7,10 @@
 
 fi:
   site_settings:
-    poll_enabled: "Annetaanko käyttäjien luoda äänestyskyselyitä?"
+    poll_enabled: "Salli äänestykset?"
     poll_maximum_options: "Äänestysvaihtoehtojen suurin sallittu määrä."
     poll_edit_window_mins: "Kuinka monta minuuttia on aikaa muokata äänestystä sen luomisen jälkeen."
+    poll_minimum_trust_level_to_create: "Vähimmäisluottamustaso, jolla voi luoda äänestyksiä."
   poll:
     multiple_polls_without_name: "Viesti sisältää useamman nimettömän äänestyskyselyn. Nimeä ne '<code>name</code>'-määreellä."
     multiple_polls_with_same_name: "Useamman kyselyn nimi on <strong>%{name}</strong>. Anna kaikille eri nimet '<code>name</code>'-määreellä."
@@ -31,7 +32,7 @@ fi:
     edit_window_expired:
       cannot_change_polls: "Äänestyksiä ei enää voi lisätä, poistaa tai uudelleennimetä, kun on kulunut %{minutes} minuuttia."
       op_cannot_edit_options: "Vastausvaihtoehtoja ei enää voi lisätä tai poistaa, kun on kulunut %{minutes} minuuttia. Ota yhteyttä valvojaan, jos vastausvaihtoehtoa tulisi muokata."
-      staff_cannot_add_or_remove_options: "Vastausvaihtoehtoja ei enää voi lisätä tai poistaa, kun on kulunut %{minutes} minuuttia. Ketju tulisi sulkea ja uusi ketju avata sen sijaan."
+      staff_cannot_add_or_remove_options: "Vastausvaihtoehtoja ei enää voi lisätä tai poistaa, kun on kulunut %{minutes} minuuttia. Tämä ketju tulisi sulkea ja aloittaa uusi ketju."
     no_polls_associated_with_this_post: "Tämä viesti ei sisällä äänestyskyselyä."
     no_poll_with_this_name: "Tämä viesti ei sisällä äänestyskyselyä nimeltä <strong>%{name}</strong>."
     post_is_deleted: "Ei voi tehdä poistetulle viestille"
@@ -39,5 +40,6 @@ fi:
     poll_must_be_open_to_vote: "Vain avoimessa kyselyssä voi äänestää."
     topic_must_be_open_to_toggle_status: "Vain avoimessa ketjussa voi muuttaa äänestyksen tilaa."
     only_staff_or_op_can_toggle_status: "Vain henkilökunta tai kyselyn laatija voi muuttaa äänestyksen tilaa."
+    insufficient_rights_to_create: "Et voi luoda äänestyksiä."
     email:
       link_to_poll: "Siirry äänestykseen klikkaamalla tästä"
diff --git a/plugins/poll/config/locales/server.fr.yml b/plugins/poll/config/locales/server.fr.yml
index 333335afe8..c6bf69a134 100644
--- a/plugins/poll/config/locales/server.fr.yml
+++ b/plugins/poll/config/locales/server.fr.yml
@@ -7,9 +7,10 @@
 
 fr:
   site_settings:
-    poll_enabled: "Autoriser les utilisateurs à créer des sondages ?"
+    poll_enabled: "Autoriser les sondages ?"
     poll_maximum_options: "Nombre maximum d'options autorisées dans un sondage."
     poll_edit_window_mins: "Nombre de minutes après la création du message durant lesquelles les sondages peuvent être modifiés."
+    poll_minimum_trust_level_to_create: "Définir le niveau de confiance minimum requis pour créer des sondages."
   poll:
     multiple_polls_without_name: "Plusieurs sondages n'ont pas de nom. Utilisez l'attribut '<code>name</code>' pour donner un identifiant unique aux sondages."
     multiple_polls_with_same_name: "Plusieurs sondages ont le même noms : <strong>%{name}</strong>. Utilisez l'attribut '<code>name</code>' pour donner un identifiant unique aux sondages."
@@ -39,5 +40,6 @@ fr:
     poll_must_be_open_to_vote: "Le sondage doit être ouvert pour pouvoir voter."
     topic_must_be_open_to_toggle_status: "Le sujet doit être ouvert pour modifier le statut."
     only_staff_or_op_can_toggle_status: "Seul un responsable ou le créateur du sujet peut modifier le statut d'un sondage."
+    insufficient_rights_to_create: "Vous n'êtes pas autorisés à créer des sondages."
     email:
       link_to_poll: "Cliquer pour voir le sondage."
diff --git a/plugins/poll/config/locales/server.gl.yml b/plugins/poll/config/locales/server.gl.yml
index 11655f76ca..de44fe9076 100644
--- a/plugins/poll/config/locales/server.gl.yml
+++ b/plugins/poll/config/locales/server.gl.yml
@@ -7,7 +7,6 @@
 
 gl:
   site_settings:
-    poll_enabled: "Queres permitir os usuarios crear enquisas?"
     poll_maximum_options: "Número máximo de opcións permitidas nunha enquisa."
   poll:
     multiple_polls_without_name: "Hai múltiples enquisas sen nome. Utiliza o atributo '<code>nome</code>' para singularizar as túas enquisas."
diff --git a/plugins/poll/config/locales/server.he.yml b/plugins/poll/config/locales/server.he.yml
index ef3498220f..e254c76c18 100644
--- a/plugins/poll/config/locales/server.he.yml
+++ b/plugins/poll/config/locales/server.he.yml
@@ -7,7 +7,6 @@
 
 he:
   site_settings:
-    poll_enabled: "אפשר למשתמשים ליצור סקרים?"
     poll_maximum_options: "מספר האפשרויות המירבי המותר בסקר"
     poll_edit_window_mins: "מספר דקות אחרי יצירת פוסט במהלכן ניתן לערוך סקרים."
   poll:
diff --git a/plugins/poll/config/locales/server.id.yml b/plugins/poll/config/locales/server.id.yml
index 358a60000e..b4361c08a8 100644
--- a/plugins/poll/config/locales/server.id.yml
+++ b/plugins/poll/config/locales/server.id.yml
@@ -7,7 +7,6 @@
 
 id:
   site_settings:
-    poll_enabled: "Perbolehkan pengguna untuk membuat polling?"
     poll_maximum_options: "Nomor maksimum dari pilihan yang diperbolehkan di sebuah polling."
     poll_edit_window_mins: "Menit setelah postingan dibuat dimana polling masih bisa diedit."
   poll:
diff --git a/plugins/poll/config/locales/server.it.yml b/plugins/poll/config/locales/server.it.yml
index c53b6c4e72..14ad1c92e9 100644
--- a/plugins/poll/config/locales/server.it.yml
+++ b/plugins/poll/config/locales/server.it.yml
@@ -7,7 +7,6 @@
 
 it:
   site_settings:
-    poll_enabled: "Permettere agli utenti di creare sondaggi?"
     poll_maximum_options: "Numero massimo di opzioni permesse in un sondaggio."
     poll_edit_window_mins: "Numero di minuti dopo la creazione di un messaggio durante i quali i sondaggi possono ancora essere modificati."
   poll:
diff --git a/plugins/poll/config/locales/server.ja.yml b/plugins/poll/config/locales/server.ja.yml
index 7cb65b2a8a..fa6ebfec12 100644
--- a/plugins/poll/config/locales/server.ja.yml
+++ b/plugins/poll/config/locales/server.ja.yml
@@ -7,8 +7,8 @@
 
 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 +23,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 b11c90e4e1..12247712da 100644
--- a/plugins/poll/config/locales/server.ko.yml
+++ b/plugins/poll/config/locales/server.ko.yml
@@ -7,25 +7,34 @@
 
 ko:
   site_settings:
-    poll_enabled: "유저에게 설문조사 작성 허용"
-    poll_maximum_options: "최대 설문조사 항목이 허용됨."
-    poll_edit_window_mins: "포스트 생성 이후 설문조사가 편집될 수 있는 시간(분)"
+    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.lv.yml b/plugins/poll/config/locales/server.lv.yml
new file mode 100644
index 0000000000..82e9109396
--- /dev/null
+++ b/plugins/poll/config/locales/server.lv.yml
@@ -0,0 +1,10 @@
+# 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/
+
+lv:
+  poll:
+    poll_must_be_open_to_vote: "Aptaujai jābūt atvērtai, lai balsotu."
diff --git a/plugins/poll/config/locales/server.nb_NO.yml b/plugins/poll/config/locales/server.nb_NO.yml
index 8351e95315..cf2ab43274 100644
--- a/plugins/poll/config/locales/server.nb_NO.yml
+++ b/plugins/poll/config/locales/server.nb_NO.yml
@@ -7,9 +7,10 @@
 
 nb_NO:
   site_settings:
-    poll_enabled: "Tillate brukere å opprette avstemning?"
+    poll_enabled: "Tillat avstemninger?"
     poll_maximum_options: "Maksimalt antall alternativer som tillates i en avstemning."
     poll_edit_window_mins: "Antall minutter etter at et innlegg er opprettet som avstemninger kan redigeres."
+    poll_minimum_trust_level_to_create: "Definer minimumstillitsnivå som trengs for å opprette avstemninger."
   poll:
     multiple_polls_without_name: "Det er flere avstemninger uten et navn. Bruk '<code>navn</code>'-attributten til å identifisere avstemningene dine."
     multiple_polls_with_same_name: "Det er flere avstemninger med samme navn: <strong>%{name}</strong>. Bruk '<code>name</code>'-attributten til å identifisere avstemningene dine entydig."
@@ -39,5 +40,6 @@ nb_NO:
     poll_must_be_open_to_vote: "Avstemningen må være åpen for å kunne avgi stemme."
     topic_must_be_open_to_toggle_status: "Emnet må være åpent for å redigere status."
     only_staff_or_op_can_toggle_status: "Kun forumpersonalet eller den forfatteren av emnet kan redigere status på avstemningen."
+    insufficient_rights_to_create: "Du har ikke lov til å opprette avstemninger."
     email:
       link_to_poll: "Klikk for å se avstemningen"
diff --git a/plugins/poll/config/locales/server.nl.yml b/plugins/poll/config/locales/server.nl.yml
index 5542279560..d21ae315b6 100644
--- a/plugins/poll/config/locales/server.nl.yml
+++ b/plugins/poll/config/locales/server.nl.yml
@@ -7,7 +7,6 @@
 
 nl:
   site_settings:
-    poll_enabled: "Toestaan dat gebruikers polls maken?"
     poll_maximum_options: "Maximale aantal toegestane opties in een poll."
     poll_edit_window_mins: "Aantal minuten na het aanmaken van een bericht waarin polls kunnen worden bewerkt."
   poll:
diff --git a/plugins/poll/config/locales/server.pl_PL.yml b/plugins/poll/config/locales/server.pl_PL.yml
index 4e02ce454e..d006e7c21a 100644
--- a/plugins/poll/config/locales/server.pl_PL.yml
+++ b/plugins/poll/config/locales/server.pl_PL.yml
@@ -7,9 +7,10 @@
 
 pl_PL:
   site_settings:
-    poll_enabled: "Pozwolić użytkownikom na tworzenie ankiet?"
+    poll_enabled: "Zezwalać na ankiety?"
     poll_maximum_options: "Maksymalna ilość dozwolonych opcji w ankiecie."
     poll_edit_window_mins: "Liczba minut po utworzeniu postu, podczas którego można edytować ankietę."
+    poll_minimum_trust_level_to_create: "Minimalny poziom zaufania potrzebny do stworzenia ankiety."
   poll:
     multiple_polls_without_name: "Istnieje kilka nienazwanych ankiet. Uzyj atrybutu '<code>name</code>', aby umożliwić ich jednoznaczną identyfikację."
     multiple_polls_with_same_name: "Istnieje kilka ankiet o tej samej nazwie: <strong>%{name}</strong>. Użyj atrybutu '<code>name</code>', aby umożliwić ich jednoznaczną identyfikację."
@@ -43,5 +44,6 @@ pl_PL:
     poll_must_be_open_to_vote: "Głosowanie jest możliwe tylko w otwartych ankietach."
     topic_must_be_open_to_toggle_status: "Zmiana statusu jest możliwa jedynie w otwartych tematach."
     only_staff_or_op_can_toggle_status: "Status może być zmieniony przez autora wpisu lub członka załogi serwisu."
+    insufficient_rights_to_create: "Nie masz zezwolenia na tworzenie ankiet."
     email:
       link_to_poll: "Kliknij, aby zobaczyć ankietę."
diff --git a/plugins/poll/config/locales/server.pt.yml b/plugins/poll/config/locales/server.pt.yml
index 8e8708e653..083c51f08c 100644
--- a/plugins/poll/config/locales/server.pt.yml
+++ b/plugins/poll/config/locales/server.pt.yml
@@ -7,7 +7,6 @@
 
 pt:
   site_settings:
-    poll_enabled: "Permitir que os utilizadores criem sondagens?"
     poll_maximum_options: "Número máximo de opções permitidas numa sondagem."
     poll_edit_window_mins: "Número de minutos após criação de publicação durante os quais sondagens podem ser editadas."
   poll:
@@ -36,7 +35,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/config/locales/server.pt_BR.yml b/plugins/poll/config/locales/server.pt_BR.yml
index caa2ee34ba..8b9022026c 100644
--- a/plugins/poll/config/locales/server.pt_BR.yml
+++ b/plugins/poll/config/locales/server.pt_BR.yml
@@ -7,7 +7,6 @@
 
 pt_BR:
   site_settings:
-    poll_enabled: "Permitir que usuários criem enquetes?"
     poll_maximum_options: "Número máximo de opções permitidas em uma enquete."
     poll_edit_window_mins: "Número de minutos após a criação de uma postagem em que as enquetes podem ser editadas."
   poll:
diff --git a/plugins/poll/config/locales/server.ro.yml b/plugins/poll/config/locales/server.ro.yml
index c12a3ab980..80260a08bb 100644
--- a/plugins/poll/config/locales/server.ro.yml
+++ b/plugins/poll/config/locales/server.ro.yml
@@ -7,7 +7,6 @@
 
 ro:
   site_settings:
-    poll_enabled: "Permite utilizatorilor să creeze sondaje?"
     poll_maximum_options: "Numărul maxim admis de opțiuni într-un sondaj"
     poll_edit_window_mins: "Număr de minute după crearea postării pe parcursul cărora sondajele pot fi editate."
   poll:
diff --git a/plugins/poll/config/locales/server.ru.yml b/plugins/poll/config/locales/server.ru.yml
index ec90b74f52..19123f2a79 100644
--- a/plugins/poll/config/locales/server.ru.yml
+++ b/plugins/poll/config/locales/server.ru.yml
@@ -10,6 +10,7 @@ ru:
     poll_enabled: "Разрешить пользователям создавать опросы?"
     poll_maximum_options: "Максимальное колличество вариантов ответов, допустимых в одном опросе."
     poll_edit_window_mins: "Количество минут с момента создания сообщения, в течение которых разрешено редактирование опросов."
+    poll_minimum_trust_level_to_create: "Определить минимальный уровень доверия, необходимый для создания опросов."
   poll:
     multiple_polls_without_name: "Обнаружено несколько опросов в одном сообщении. Чтобы система могла их различать между собой, используйте атрибут <code>name</code>' для каждого опроса. Например: <code>[poll name=A1]</code>"
     multiple_polls_with_same_name: "Обнаружено несколько опросов с одним и тем же названием: <strong>%{name}</strong>. Чтобы система могла  различать опросы между собой, придумайте разные значения для атрибута <code>name</code>' - для каждого опроса своё."
@@ -43,5 +44,6 @@ ru:
     poll_must_be_open_to_vote: "Опрос должен быть открыт, чтобы в нем можно было голосовать."
     topic_must_be_open_to_toggle_status: "Чтобы изменить статус, тема должна быть открыта."
     only_staff_or_op_can_toggle_status: "Только модераторы или сам автор могут поменять статус опроса."
+    insufficient_rights_to_create: "Вы не сможете создавать опросы."
     email:
       link_to_poll: "Нажмите чтобы открыть опрос."
diff --git a/plugins/poll/config/locales/server.sk.yml b/plugins/poll/config/locales/server.sk.yml
index 2a55f97a08..31b9c1807a 100644
--- a/plugins/poll/config/locales/server.sk.yml
+++ b/plugins/poll/config/locales/server.sk.yml
@@ -7,7 +7,6 @@
 
 sk:
   site_settings:
-    poll_enabled: "Umožnit používaťeľom vytvárať hlasovania?"
     poll_maximum_options: "Maximálny počet povolených možností v hlasovaní."
     poll_edit_window_mins: "Počet minút po vytvorení hlasovania počas ktorých môže byť hlasovanie upravené."
   poll:
diff --git a/plugins/poll/config/locales/server.sq.yml b/plugins/poll/config/locales/server.sq.yml
index 65cbc75eab..e14acb2181 100644
--- a/plugins/poll/config/locales/server.sq.yml
+++ b/plugins/poll/config/locales/server.sq.yml
@@ -7,7 +7,6 @@
 
 sq:
   site_settings:
-    poll_enabled: "Lejo përdoruesit të hapin sondazhe?"
     poll_maximum_options: "Numri maksimal i opsioneve të lejuara në një sondazh."
     poll_edit_window_mins: "Numri i minutave pas krijimit të postimit gjatë të cilave sondazhet mund të ndryshohen."
   poll:
diff --git a/plugins/poll/config/locales/server.sr.yml b/plugins/poll/config/locales/server.sr.yml
new file mode 100644
index 0000000000..cc77fcc34c
--- /dev/null
+++ b/plugins/poll/config/locales/server.sr.yml
@@ -0,0 +1,24 @@
+# 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/
+
+sr:
+  site_settings:
+    poll_maximum_options: "Najveći broj opcija dostupan u anketi."
+  poll:
+    multiple_polls_without_name: "Postoji više anketa bez imena. Koristite '<code>name</code>' pridev kako bi jedinstveno identifikovali vašu anketu."
+    multiple_polls_with_same_name: "Postoji više anketa sa istim imenom: <strong>%{name}</strong>. Koristite '<code>name</code>' pridev kako bi jedinstveno identifikovali vašu anketu."
+    default_poll_must_have_at_least_2_options: "Anketa mora imati najmanje 2 opcije."
+    named_poll_must_have_at_least_2_options: "Anketa imena <strong>%{name}</strong> mora imati najmanje 2 opcije."
+    default_poll_must_have_less_options:
+      one: "Anketa mora imati manje od %{count} opcije."
+      few: "Anketa mora imati manje od %{count} opcije."
+      other: "Anketa mora imati manje od %{count} opcij(a/e)."
+    named_poll_must_have_less_options:
+      one: "Anketa imena <strong>%{name}</strong> mora imati manje od %{count} opcije."
+      few: "Anketa imena <strong>%{name}</strong> mora imati manje od %{count} opcija."
+      other: "Anketa imena <strong>%{name}</strong> mora imati manje od %{count} opcij(a/e)."
+    default_poll_must_have_different_options: "Anketa mora imati različite opcije."
diff --git a/plugins/poll/config/locales/server.sv.yml b/plugins/poll/config/locales/server.sv.yml
index fc27ae8dac..342a492ea8 100644
--- a/plugins/poll/config/locales/server.sv.yml
+++ b/plugins/poll/config/locales/server.sv.yml
@@ -7,7 +7,6 @@
 
 sv:
   site_settings:
-    poll_enabled: "Tillåt användare att skapa omröstningar?"
     poll_maximum_options: "Maximalt antal alternativ tillåtna i en omröstning."
     poll_edit_window_mins: "Antal minuter efter ett inlägg har skapats som omröstningar kan redigeras."
   poll:
diff --git a/plugins/poll/config/locales/server.th.yml b/plugins/poll/config/locales/server.th.yml
new file mode 100644
index 0000000000..bbbdcd027e
--- /dev/null
+++ b/plugins/poll/config/locales/server.th.yml
@@ -0,0 +1,35 @@
+# 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/
+
+th:
+  site_settings:
+    poll_maximum_options: "จำนวนตัวเลือกมากสุดที่อนุญาตให้ในการสร้างแบบสำรวจ"
+  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 ตัวเลือก"
+    default_poll_must_have_less_options:
+      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> ด้วยคะแนนเสียงนี้ไม่สามารถทำให้เป็นสาธารณะได้."
+    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: "แบบสำรวจต้องเปิดเพื่อให้ลงคะแนน"
+    topic_must_be_open_to_toggle_status: "หัวข้อจะต้องเปิดเพื่อให้ปรับสถานะ"
+    only_staff_or_op_can_toggle_status: "มีเฉพาะเจ้าหน้าที่หรือผู้โพสแรกเริ่มเท่านั้นที่จะปรับสถานะของแบบสำรวจได้"
+    email:
+      link_to_poll: "คลิกเพื่อดูแบบสำรวจ"
diff --git a/plugins/poll/config/locales/server.tr_TR.yml b/plugins/poll/config/locales/server.tr_TR.yml
index 85d440adc0..210b45b878 100644
--- a/plugins/poll/config/locales/server.tr_TR.yml
+++ b/plugins/poll/config/locales/server.tr_TR.yml
@@ -7,7 +7,7 @@
 
 tr_TR:
   site_settings:
-    poll_enabled: "Kullanıcılar anket oluşturabilirler mi?"
+    poll_enabled: "Anketlere izin ver?"
     poll_maximum_options: "Bir ankette izin verilen en fazla seçenek sayısı."
     poll_edit_window_mins: "Gönderinin oluşturulmasından sonra anketin düzenlenebileceği dakika sayısı"
   poll:
@@ -37,5 +37,6 @@ tr_TR:
     poll_must_be_open_to_vote: "Anket oylanabilmesi için açık olmalı."
     topic_must_be_open_to_toggle_status: "Durumun değiştirilebilmesi için konu açık olmalı."
     only_staff_or_op_can_toggle_status: "Bir anketin durumunu sadece o anketin asıl sahibi ya da bir görevli değiştirebilir."
+    insufficient_rights_to_create: "Anket oluşturma izniniz yok"
     email:
       link_to_poll: "Anketi görüntülemek için tıklayın."
diff --git a/plugins/poll/config/locales/server.uk.yml b/plugins/poll/config/locales/server.uk.yml
index 2282479041..cda5d61798 100644
--- a/plugins/poll/config/locales/server.uk.yml
+++ b/plugins/poll/config/locales/server.uk.yml
@@ -7,7 +7,6 @@
 
 uk:
   site_settings:
-    poll_enabled: "Дозволити користувачам створювати опитування?"
     poll_maximum_options: "Максимальна кількість варіантів в опитуванні"
   poll:
     default_poll_must_have_at_least_2_options: "Голосування повинно мати щонайменше 2 варіанти."
diff --git a/plugins/poll/config/locales/server.ur.yml b/plugins/poll/config/locales/server.ur.yml
index 3fdf49a7c0..f3d29c5175 100644
--- a/plugins/poll/config/locales/server.ur.yml
+++ b/plugins/poll/config/locales/server.ur.yml
@@ -7,7 +7,6 @@
 
 ur:
   site_settings:
-    poll_enabled: "کیا صارفین کو پول بنانے کی اجازت دی جاے؟"
     poll_maximum_options: "ایک پول میں رکھے جانے والی آپشنز کی زیادہ سے زیادہ تعداد۔"
     poll_edit_window_mins: "پوسٹ بنانے کے بعد کتنے منت تک پولز کی ترمیم کی جاسکتی ہے۔"
   poll:
diff --git a/plugins/poll/config/locales/server.vi.yml b/plugins/poll/config/locales/server.vi.yml
index 7295cb59cc..2e97b013cb 100644
--- a/plugins/poll/config/locales/server.vi.yml
+++ b/plugins/poll/config/locales/server.vi.yml
@@ -7,7 +7,6 @@
 
 vi:
   site_settings:
-    poll_enabled: "Cho phép người dùng tạo các cuộc thăm dò?"
     poll_maximum_options: "Số lượng tối đa tùy chọn trong một cuộc thăm dò.  "
     poll_edit_window_mins: "Số phút tình từ lúc tạo bài viết mà người dùng có quyền sửa thăm dò."
   poll:
diff --git a/plugins/poll/config/locales/server.zh_CN.yml b/plugins/poll/config/locales/server.zh_CN.yml
index 740c1abb0e..9521f21d10 100644
--- a/plugins/poll/config/locales/server.zh_CN.yml
+++ b/plugins/poll/config/locales/server.zh_CN.yml
@@ -7,9 +7,10 @@
 
 zh_CN:
   site_settings:
-    poll_enabled: "允许用户创建投票？"
+    poll_enabled: "允许投票？"
     poll_maximum_options: "投票允许的最大选项数。"
     poll_edit_window_mins: "投票创建后多少分钟内可以编辑？"
+    poll_minimum_trust_level_to_create: "创建投票所需的最小信任等级。"
   poll:
     multiple_polls_without_name: "有多个投票没有名字。使用“<code>name</code>”属性区分各投票。"
     multiple_polls_with_same_name: "有多个投票的名字相同：<strong>%{name}</strong>。使用“<code>name</code>”属性区分各投票。"
@@ -37,5 +38,6 @@ zh_CN:
     poll_must_be_open_to_vote: "投票必须开启。"
     topic_must_be_open_to_toggle_status: "主题必须未被锁定才能改变状态。"
     only_staff_or_op_can_toggle_status: "只有管理人员或者发布投票的人才能改变投票状态。"
+    insufficient_rights_to_create: "您不能创建投票。"
     email:
       link_to_poll: "点击查看投票。"
diff --git a/plugins/poll/config/locales/server.zh_TW.yml b/plugins/poll/config/locales/server.zh_TW.yml
index 80ad753ae3..9d1efef0c0 100644
--- a/plugins/poll/config/locales/server.zh_TW.yml
+++ b/plugins/poll/config/locales/server.zh_TW.yml
@@ -7,7 +7,6 @@
 
 zh_TW:
   site_settings:
-    poll_enabled: "允許用戶創建投票？"
     poll_maximum_options: "投票允許的最大選項數。"
     poll_edit_window_mins: "投票創建後多少分鐘內可以編輯？"
   poll:
diff --git a/plugins/poll/config/settings.yml b/plugins/poll/config/settings.yml
index 04bf21f5e9..5f4cfa825b 100644
--- a/plugins/poll/config/settings.yml
+++ b/plugins/poll/config/settings.yml
@@ -7,3 +7,7 @@ plugins:
     client: true
   poll_edit_window_mins:
     default: 5
+  poll_minimum_trust_level_to_create:
+    default: 1
+    client: true
+    enum: 'TrustLevelSetting'
diff --git a/plugins/poll/db/migrate/20150501152228_rename_total_votes_to_voters.rb b/plugins/poll/db/migrate/20150501152228_rename_total_votes_to_voters.rb
index 902c84dedc..f548ebdf89 100644
--- a/plugins/poll/db/migrate/20150501152228_rename_total_votes_to_voters.rb
+++ b/plugins/poll/db/migrate/20150501152228_rename_total_votes_to_voters.rb
@@ -1,4 +1,4 @@
-class RenameTotalVotesToVoters < ActiveRecord::Migration
+class RenameTotalVotesToVoters < ActiveRecord::Migration[4.2]
 
   def up
     PostCustomField.where(name: "polls").find_each do |pcf|
diff --git a/plugins/poll/db/migrate/20151016163051_merge_polls_votes.rb b/plugins/poll/db/migrate/20151016163051_merge_polls_votes.rb
index 17e6459e12..dfa47c51d9 100644
--- a/plugins/poll/db/migrate/20151016163051_merge_polls_votes.rb
+++ b/plugins/poll/db/migrate/20151016163051_merge_polls_votes.rb
@@ -1,15 +1,15 @@
-class MergePollsVotes < ActiveRecord::Migration
+class MergePollsVotes < ActiveRecord::Migration[4.2]
 
   def up
     PostCustomField.where(name: "polls").order(:post_id).pluck(:post_id).each do |post_id|
       polls_votes = {}
       PostCustomField.where(post_id: post_id).where("name LIKE 'polls-votes-%'").find_each do |pcf|
         user_id = pcf.name["polls-votes-".size..-1]
-        polls_votes["#{user_id}"] = ::JSON.parse(pcf.value||"{}")
+        polls_votes["#{user_id}"] = ::JSON.parse(pcf.value || "{}")
       end
 
       pcf = PostCustomField.find_or_create_by(name: "polls-votes", post_id: post_id)
-      pcf.value = ::JSON.parse(pcf.value||"{}").merge(polls_votes).to_json
+      pcf.value = ::JSON.parse(pcf.value || "{}").merge(polls_votes).to_json
       pcf.save
     end
   end
diff --git a/plugins/poll/db/migrate/20160321164925_close_polls_in_closed_topics.rb b/plugins/poll/db/migrate/20160321164925_close_polls_in_closed_topics.rb
index 5ca969c68d..6ef50e82fc 100644
--- a/plugins/poll/db/migrate/20160321164925_close_polls_in_closed_topics.rb
+++ b/plugins/poll/db/migrate/20160321164925_close_polls_in_closed_topics.rb
@@ -1,10 +1,10 @@
-class ClosePollsInClosedTopics < ActiveRecord::Migration
+class ClosePollsInClosedTopics < ActiveRecord::Migration[4.2]
 
   def up
     PostCustomField.joins(post: :topic)
-                   .where("post_custom_fields.name = 'polls'")
-                   .where("topics.closed")
-                   .find_each do |pcf|
+      .where("post_custom_fields.name = 'polls'")
+      .where("topics.closed")
+      .find_each do |pcf|
       polls = ::JSON.parse(pcf.value || "{}")
       polls.values.each { |poll| poll["status"] = "closed" }
       pcf.value = polls.to_json
diff --git a/plugins/poll/lib/polls_updater.rb b/plugins/poll/lib/polls_updater.rb
index 696a62eed1..ec5b250579 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
@@ -100,7 +101,7 @@ module DiscoursePoll
         post.save_custom_fields(true)
 
         # publish the changes
-        MessageBus.publish("/polls/#{post.topic_id}", { post_id: post.id, polls: polls })
+        MessageBus.publish("/polls/#{post.topic_id}", post_id: post.id, polls: polls)
       end
     end
 
@@ -129,7 +130,7 @@ module DiscoursePoll
     private
 
     def self.private_to_public_poll?(post, previous_polls, current_polls, poll_name)
-      previous_poll = previous_polls[poll_name]
+      _previous_poll = previous_polls[poll_name]
       current_poll = current_polls[poll_name]
 
       if previous_polls["public"].nil? && current_poll["public"] == "true"
diff --git a/plugins/poll/lib/post_validator.rb b/plugins/poll/lib/post_validator.rb
new file mode 100644
index 0000000000..7301fdde75
--- /dev/null
+++ b/plugins/poll/lib/post_validator.rb
@@ -0,0 +1,22 @@
+module DiscoursePoll
+  class PostValidator
+    def initialize(post)
+      @post = post
+    end
+
+    def validate_post
+      min_trust_level = SiteSetting.poll_minimum_trust_level_to_create
+      trusted = @post&.user&.staff? ||
+                @post&.user&.trust_level >= TrustLevel[min_trust_level]
+
+      if !trusted
+        message = I18n.t("poll.insufficient_rights_to_create")
+
+        @post.errors.add(:base, message)
+        return false
+      end
+
+      true
+    end
+  end
+end
diff --git a/plugins/poll/lib/tasks/migrate_old_polls.rake b/plugins/poll/lib/tasks/migrate_old_polls.rake
index 9a551a18a6..d8f2ee4064 100644
--- a/plugins/poll/lib/tasks/migrate_old_polls.rake
+++ b/plugins/poll/lib/tasks/migrate_old_polls.rake
@@ -25,12 +25,11 @@ 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_%'")
-                .pluck(:key)
-                .each do |poll_options_key|
+    .where("key LIKE 'poll_options_%'")
+    .pluck(:key)
+    .each do |poll_options_key|
     # extract the post_id
     post_id = poll_options_key["poll_options_".length..-1].to_i
     # load the post from the db
@@ -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\]/
@@ -57,9 +56,9 @@ task "poll:migrate_old_polls" => :environment do
         options = post.custom_fields["polls"]["poll"]["options"]
         # iterate over all votes
         PluginStoreRow.where(plugin_name: "poll")
-                      .where("key LIKE 'poll_vote_#{post_id}_%'")
-                      .pluck(:key, :value)
-                      .each do |poll_vote_key, vote|
+          .where("key LIKE 'poll_vote_#{post_id}_%'")
+          .pluck(:key, :value)
+          .each do |poll_vote_key, vote|
           # extract the user_id
           user_id = poll_vote_key["poll_vote_#{post_id}_%".length..-1].to_i
           # find the selected option
diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index 3b764043b6..017ea72a81 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -14,12 +14,12 @@ PLUGIN_NAME ||= "discourse_poll".freeze
 DATA_PREFIX ||= "data-poll-".freeze
 
 after_initialize do
-
   module ::DiscoursePoll
     DEFAULT_POLL_NAME ||= "poll".freeze
     POLLS_CUSTOM_FIELD ||= "polls".freeze
     VOTES_CUSTOM_FIELD ||= "polls-votes".freeze
 
+    autoload :PostValidator, "#{Rails.root}/plugins/poll/lib/post_validator"
     autoload :PollsValidator, "#{Rails.root}/plugins/poll/lib/polls_validator"
     autoload :PollsUpdater, "#{Rails.root}/plugins/poll/lib/polls_updater"
 
@@ -136,7 +136,7 @@ after_initialize do
 
           post.save_custom_fields(true)
 
-          MessageBus.publish("/polls/#{post.topic_id}", {post_id: post.id, polls: polls })
+          MessageBus.publish("/polls/#{post.topic_id}", post_id: post.id, polls: polls)
 
           polls[poll_name]
         end
@@ -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
 
@@ -181,7 +181,7 @@ after_initialize do
   class DiscoursePoll::PollsController < ::ApplicationController
     requires_plugin PLUGIN_NAME
 
-    before_filter :ensure_logged_in, except: [:voters]
+    before_action :ensure_logged_in, except: [:voters]
 
     def vote
       post_id   = params.require(:post_id)
@@ -220,17 +220,26 @@ after_initialize do
       poll = post.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD][poll_name]
       raise Discourse::InvalidParameters.new("poll_name is invalid") if !poll
 
+      voter_limit = (params[:voter_limit] || 25).to_i
+      voter_limit = 0 if voter_limit < 0
+      voter_limit = 50 if voter_limit > 50
+
       user_ids = []
       options = poll["options"]
 
       if poll["type"] != "number"
+
+        per_option_voters = {}
+
         options.each do |option|
           if (params[:option_id])
             next unless option["id"] == params[:option_id].to_s
           end
 
           next unless option["voter_ids"]
-          user_ids << option["voter_ids"].slice((params[:offset].to_i || 0)  * 25, 25)
+          voters = option["voter_ids"].slice((params[:offset].to_i || 0) * voter_limit, voter_limit)
+          per_option_voters[option["id"]] = Set.new(voters)
+          user_ids << voters
         end
 
         user_ids.flatten!
@@ -248,6 +257,10 @@ after_initialize do
               next unless option_id == params[:option_id].to_s
             end
 
+            voters = per_option_voters[option_id]
+            # we may have a user from a different vote
+            next unless voters.include?(user.id)
+
             result[option_id] ||= []
             result[option_id] << user_hash
           end
@@ -256,11 +269,11 @@ after_initialize do
         user_ids = options.map { |option| option["voter_ids"] }.sort!
         user_ids.flatten!
         user_ids.uniq!
-        user_ids = user_ids.slice((params[:offset].to_i || 0) * 25, 25)
+        user_ids = user_ids.slice((params[:offset].to_i || 0) * voter_limit, voter_limit)
 
         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
@@ -295,15 +308,18 @@ after_initialize do
     end
   end
 
-  validate(:post, :validate_polls) do |force=nil|
-    return if !SiteSetting.poll_enabled? && (self.user && !self.user.staff?)
-
+  validate(:post, :validate_polls) do |force = nil|
     # only care when raw has changed!
     return unless self.raw_changed? || force
 
     validator = DiscoursePoll::PollsValidator.new(self)
     return unless (polls = validator.validate_polls)
 
+    if !polls.empty?
+      validator = DiscoursePoll::PostValidator.new(self)
+      return unless validator.validate_post
+    end
+
     # are we updating a post?
     if self.id.present?
       DistributedMutex.synchronize("#{PLUGIN_NAME}-#{self.id}") do
@@ -339,10 +355,10 @@ after_initialize do
     end
   end
 
-  Post.register_custom_field_type(DiscoursePoll::POLLS_CUSTOM_FIELD, :json)
-  Post.register_custom_field_type(DiscoursePoll::VOTES_CUSTOM_FIELD, :json)
+  register_post_custom_field_type(DiscoursePoll::POLLS_CUSTOM_FIELD, :json)
+  register_post_custom_field_type(DiscoursePoll::VOTES_CUSTOM_FIELD, :json)
 
-  TopicView.add_post_custom_fields_whitelister do |user|
+  topic_view_post_custom_fields_whitelister do |user|
     user ? [DiscoursePoll::POLLS_CUSTOM_FIELD, DiscoursePoll::VOTES_CUSTOM_FIELD] : [DiscoursePoll::POLLS_CUSTOM_FIELD]
   end
 
@@ -360,9 +376,8 @@ after_initialize do
   # tells the front-end we have a poll for that post
   on(:post_created) do |post|
     next if post.is_first_post? || post.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD].blank?
-    MessageBus.publish("/polls/#{post.topic_id}", {
-                         post_id: post.id,
-                         polls: post.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD]})
+    MessageBus.publish("/polls/#{post.topic_id}",                          post_id: post.id,
+                                                                           polls: post.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD])
   end
 
   add_to_serializer(:post, :polls, false) do
diff --git a/plugins/poll/spec/controllers/polls_controller_spec.rb b/plugins/poll/spec/controllers/polls_controller_spec.rb
index 9e8e019644..c9f353862e 100644
--- a/plugins/poll/spec/controllers/polls_controller_spec.rb
+++ b/plugins/poll/spec/controllers/polls_controller_spec.rb
@@ -7,13 +7,16 @@ describe ::DiscoursePoll::PollsController do
   let!(:user) { log_in }
   let(:topic) { Fabricate(:topic) }
   let(:poll)  { Fabricate(:post, topic_id: topic.id, user_id: user.id, raw: "[poll]\n- A\n- B\n[/poll]") }
+  let(:multi_poll)  { Fabricate(:post, topic_id: topic.id, user_id: user.id, raw: "[poll min=1 max=2 type=multiple public=true]\n- A\n- B\n[/poll]") }
 
   describe "#vote" do
 
     it "works" do
       MessageBus.expects(:publish)
 
-      xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"] }
+      put :vote, params: {
+        post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"]
+      }, format: :json
 
       expect(response).to be_success
       json = ::JSON.parse(response.body)
@@ -23,7 +26,9 @@ describe ::DiscoursePoll::PollsController do
     end
 
     it "requires at least 1 valid option" do
-      xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["A", "B"] }
+      put :vote, params: {
+        post_id: poll.id, poll_name: "poll", options: ["A", "B"]
+      }, format: :json
 
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
@@ -31,10 +36,16 @@ describe ::DiscoursePoll::PollsController do
     end
 
     it "supports vote changes" do
-      xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"] }
+      put :vote, params: {
+        post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"]
+      }, format: :json
+
       expect(response).to be_success
 
-      xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["e89dec30bbd9bf50fabf6a05b4324edf"] }
+      put :vote, params: {
+        post_id: poll.id, poll_name: "poll", options: ["e89dec30bbd9bf50fabf6a05b4324edf"]
+      }, format: :json
+
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json["poll"]["voters"]).to eq(1)
@@ -44,13 +55,19 @@ describe ::DiscoursePoll::PollsController do
 
     it "works even if topic is closed" do
       topic.update_attribute(:closed, true)
-      xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"] }
+      put :vote, params: {
+        post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"]
+      }, format: :json
+
       expect(response).to be_success
     end
 
     it "ensures topic is not archived" do
       topic.update_attribute(:archived, true)
-      xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["A"] }
+      put :vote, params: {
+        post_id: poll.id, poll_name: "poll", options: ["A"]
+      }, format: :json
+
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.topic_must_be_open_to_vote"))
@@ -58,29 +75,42 @@ describe ::DiscoursePoll::PollsController do
 
     it "ensures post is not trashed" do
       poll.trash!
-      xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["A"] }
+      put :vote, params: {
+        post_id: poll.id, poll_name: "poll", options: ["A"]
+      }, format: :json
+
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.post_is_deleted"))
     end
 
     it "ensures polls are associated with the post" do
-      xhr :put, :vote, { post_id: Fabricate(:post).id, poll_name: "foobar", options: ["A"] }
+      put :vote, params: {
+        post_id: Fabricate(:post).id, poll_name: "foobar", options: ["A"]
+      }, format: :json
+
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.no_polls_associated_with_this_post"))
     end
 
     it "checks the name of the poll" do
-      xhr :put, :vote, { post_id: poll.id, poll_name: "foobar", options: ["A"] }
+      put :vote, params: {
+        post_id: poll.id, poll_name: "foobar", options: ["A"]
+      }, format: :json
+
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.no_poll_with_this_name", name: "foobar"))
     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]")
+
+      put :vote, params: {
+        post_id: closed_poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"]
+      }, format: :json
+
       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"))
@@ -88,9 +118,12 @@ describe ::DiscoursePoll::PollsController do
 
     it "doesn't discard anonymous votes when someone votes" do
       default_poll = poll.custom_fields["polls"]["poll"]
-      add_anonymous_votes(poll, default_poll, 17, {"5c24fc1df56d764b550ceae1b9319125" => 11, "e89dec30bbd9bf50fabf6a05b4324edf" => 6})
+      add_anonymous_votes(poll, default_poll, 17, "5c24fc1df56d764b550ceae1b9319125" => 11, "e89dec30bbd9bf50fabf6a05b4324edf" => 6)
+
+      put :vote, params: {
+        post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"]
+      }, format: :json
 
-      xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"] }
       expect(response).to be_success
 
       json = ::JSON.parse(response.body)
@@ -104,7 +137,9 @@ describe ::DiscoursePoll::PollsController do
       body = { post_id: public_poll.id, poll_name: "poll" }
 
       message = MessageBus.track_publish do
-        xhr :put, :vote, body.merge(options: ["5c24fc1df56d764b550ceae1b9319125"])
+        put :vote,
+          params: body.merge(options: ["5c24fc1df56d764b550ceae1b9319125"]),
+          format: :json
       end.first
 
       expect(response).to be_success
@@ -118,7 +153,10 @@ describe ::DiscoursePoll::PollsController do
       expect(message.data[:post_id].to_i).to eq(public_poll.id)
       expect(message.data[:user][:id].to_i).to eq(user.id)
 
-      xhr :put, :vote, body.merge(options: ["e89dec30bbd9bf50fabf6a05b4324edf"])
+      put :vote,
+        params: body.merge(options: ["e89dec30bbd9bf50fabf6a05b4324edf"]),
+        format: :json
+
       expect(response).to be_success
 
       json = ::JSON.parse(response.body)
@@ -131,7 +169,10 @@ describe ::DiscoursePoll::PollsController do
       another_user = Fabricate(:user)
       log_in_user(another_user)
 
-      xhr :put, :vote, body.merge(options: ["e89dec30bbd9bf50fabf6a05b4324edf", "5c24fc1df56d764b550ceae1b9319125"])
+      put :vote,
+        params: body.merge(options: ["e89dec30bbd9bf50fabf6a05b4324edf", "5c24fc1df56d764b550ceae1b9319125"]),
+        format: :json
+
       expect(response).to be_success
 
       json = ::JSON.parse(response.body)
@@ -148,7 +189,10 @@ describe ::DiscoursePoll::PollsController do
     it "works for OP" do
       MessageBus.expects(:publish)
 
-      xhr :put, :toggle_status, { post_id: poll.id, poll_name: "poll", status: "closed" }
+      put :toggle_status, params: {
+        post_id: poll.id, poll_name: "poll", status: "closed"
+      }, format: :json
+
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json["poll"]["status"]).to eq("closed")
@@ -158,7 +202,10 @@ describe ::DiscoursePoll::PollsController do
       log_in(:moderator)
       MessageBus.expects(:publish)
 
-      xhr :put, :toggle_status, { post_id: poll.id, poll_name: "poll", status: "closed" }
+      put :toggle_status, params: {
+        post_id: poll.id, poll_name: "poll", status: "closed"
+      }, format: :json
+
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json["poll"]["status"]).to eq("closed")
@@ -166,11 +213,64 @@ describe ::DiscoursePoll::PollsController do
 
     it "ensures post is not trashed" do
       poll.trash!
-      xhr :put, :toggle_status, { post_id: poll.id, poll_name: "poll", status: "closed" }
+
+      put :toggle_status, params: {
+        post_id: poll.id, poll_name: "poll", status: "closed"
+      }, format: :json
+
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.post_is_deleted"))
     end
 
   end
+
+  describe "votes" do
+
+    it "correctly handles offset" do
+
+      first = "5c24fc1df56d764b550ceae1b9319125"
+      second = "e89dec30bbd9bf50fabf6a05b4324edf"
+
+      user1 = log_in
+
+      put :vote, params: {
+        post_id: multi_poll.id, poll_name: "poll", options: [first]
+      }, format: :json
+
+      expect(response).to be_success
+
+      user2 = log_in
+
+      put :vote, params: {
+        post_id: multi_poll.id, poll_name: "poll", options: [first]
+      }, format: :json
+
+      expect(response).to be_success
+
+      user3 = log_in
+
+      put :vote, params: {
+        post_id: multi_poll.id,
+        poll_name: "poll",
+        options: [first, second]
+      }, format: :json
+
+      expect(response).to be_success
+
+      get :voters, params: {
+        poll_name: 'poll', post_id: multi_poll.id, voter_limit: 2
+      }, format: :json
+
+      expect(response).to be_success
+
+      json = JSON.parse(response.body)
+
+      # no user3 cause voter_limit is 2
+      expect(json["poll"][first].map { |h| h["id"] }.sort).to eq([user1.id, user2.id])
+      expect(json["poll"][second].map { |h| h["id"] }).to eq([user3.id])
+    end
+
+  end
+
 end
diff --git a/plugins/poll/spec/controllers/posts_controller_spec.rb b/plugins/poll/spec/controllers/posts_controller_spec.rb
index d5bf98b157..bd39395419 100644
--- a/plugins/poll/spec/controllers/posts_controller_spec.rb
+++ b/plugins/poll/spec/controllers/posts_controller_spec.rb
@@ -12,7 +12,10 @@ describe PostsController do
   describe "polls" do
 
     it "works" do
-      xhr :post, :create, { title: title, raw: "[poll]\n- A\n- B\n[/poll]" }
+      post :create, params: {
+        title: title, raw: "[poll]\n- A\n- B\n[/poll]"
+      }, format: :json
+
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
@@ -20,8 +23,12 @@ describe PostsController do
     end
 
     it "works on any post" do
-      post = Fabricate(:post)
-      xhr :post, :create, { topic_id: post.topic.id, raw: "[poll]\n- A\n- B\n[/poll]" }
+      post_1 = Fabricate(:post)
+
+      post :create, params: {
+        topic_id: post_1.topic.id, raw: "[poll]\n- A\n- B\n[/poll]"
+      }, format: :json
+
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
@@ -29,25 +36,33 @@ describe PostsController do
     end
 
     it "should have different options" do
-      xhr :post, :create, { title: title, raw: "[poll]\n- A\n- A[/poll]" }
+      post :create, params: {
+        title: title, raw: "[poll]\n- A\n- A\n[/poll]"
+      }, format: :json
+
       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]" }
+      post :create, params: {
+        title: title, raw: "[poll]\n- A\n[/poll]"
+      }, format: :json
+
       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 }
+      post :create, params: {
+        title: title, raw: raw
+      }, format: :json
 
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
@@ -55,22 +70,32 @@ 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]" }
+      post :create, params: {
+        title: title, raw: "[poll type=multiple min=5]\n- A\n- B\n[/poll]"
+      }, format: :json
+
       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"))
     end
 
     it "prevents self-xss" do
-      xhr :post, :create, { title: title, raw: "[poll name=<script>alert('xss')</script>]\n- A\n- B\n[/poll]" }
+      post :create, params: {
+        title: title, raw: "[poll name=<script>alert('xss')</script>]\n- A\n- B\n[/poll]"
+      }, format: :json
+
       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
-      xhr :post, :create, { title: title, raw: "[Polls are awesome](/foobar)\n[poll]\n- A\n- B\n[/poll]" }
+      post :create, params: {
+        title: title, raw: "[Polls are awesome](/foobar)\n[poll]\n- A\n- B\n[/poll]"
+      }, format: :json
+
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
@@ -78,7 +103,10 @@ describe PostsController do
     end
 
     it "prevents pollception" do
-      xhr :post, :create, { title: title, raw: "[poll name=1]\n- A\n[poll name=2]\n- B\n- C\n[/poll]\n- D\n[/poll]" }
+      post :create, params: {
+        title: title, raw: "[poll name=1]\n- A\n[poll name=2]\n- B\n- C\n[/poll]\n- D\n[/poll]"
+      }, format: :json
+
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
@@ -91,14 +119,20 @@ describe PostsController do
       describe "within the first 5 minutes" do
 
         let(:post_id) do
-          Timecop.freeze(4.minutes.ago) do
-            xhr :post, :create, { title: title, raw: "[poll]\n- A\n- B\n[/poll]" }
+          freeze_time(4.minutes.ago) do
+            post :create, params: {
+              title: title, raw: "[poll]\n- A\n- B\n[/poll]"
+            }, format: :json
+
             ::JSON.parse(response.body)["id"]
           end
         end
 
         it "can be changed" do
-          xhr :put, :update, { id: post_id, post: { raw: "[poll]\n- A\n- B\n- C\n[/poll]" } }
+          put :update, params: {
+            id: post_id, post: { raw: "[poll]\n- A\n- B\n- C\n[/poll]" }
+          }, format: :json
+
           expect(response).to be_success
           json = ::JSON.parse(response.body)
           expect(json["post"]["polls"]["poll"]["options"][2]["html"]).to eq("C")
@@ -106,7 +140,11 @@ describe PostsController do
 
         it "resets the votes" do
           DiscoursePoll::Poll.vote(post_id, "poll", ["5c24fc1df56d764b550ceae1b9319125"], user)
-          xhr :put, :update, { id: post_id, post: { raw: "[poll]\n- A\n- B\n- C\n[/poll]" } }
+
+          put :update, params: {
+            id: post_id, post: { raw: "[poll]\n- A\n- B\n- C\n[/poll]" }
+          }, format: :json
+
           expect(response).to be_success
           json = ::JSON.parse(response.body)
           expect(json["post"]["polls_votes"]).to_not be
@@ -116,13 +154,16 @@ 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
-            xhr :post, :create, { title: title, raw: poll }
+          freeze_time(6.minutes.ago) do
+            post :create, params: {
+              title: title, raw: poll
+            }, format: :json
+
             ::JSON.parse(response.body)["id"]
           end
         end
@@ -136,7 +177,10 @@ describe PostsController do
         describe "with no vote" do
 
           it "OP can change the options" do
-            xhr :put, :update, { id: post_id, post: { raw: new_option } }
+            put :update, params: {
+              id: post_id, post: { raw: new_option }
+            }, format: :json
+
             expect(response).to be_success
             json = ::JSON.parse(response.body)
             expect(json["post"]["polls"]["poll"]["options"][1]["html"]).to eq("C")
@@ -144,14 +188,18 @@ describe PostsController do
 
           it "staff can change the options" do
             log_in_user(Fabricate(:moderator))
-            xhr :put, :update, { id: post_id, post: { raw: new_option } }
+
+            put :update, params: {
+              id: post_id, post: { raw: new_option }
+            }, format: :json
+
             expect(response).to be_success
             json = ::JSON.parse(response.body)
             expect(json["post"]["polls"]["poll"]["options"][1]["html"]).to eq("C")
           end
 
           it "support changes on the post" do
-            xhr :put, :update, { id: post_id, post: { raw: updated } }
+            put :update, params: { id: post_id, post: { raw: updated } }, format: :json
             expect(response).to be_success
             json = ::JSON.parse(response.body)
             expect(json["post"]["cooked"]).to match("before")
@@ -166,7 +214,10 @@ describe PostsController do
           end
 
           it "OP cannot change the options" do
-            xhr :put, :update, { id: post_id, post: { raw: new_option } }
+            put :update, params: {
+              id: post_id, post: { raw: new_option }
+            }, format: :json
+
             expect(response).not_to be_success
             json = ::JSON.parse(response.body)
             expect(json["errors"][0]).to eq(I18n.t(
@@ -177,7 +228,11 @@ describe PostsController do
 
           it "staff can change the options and votes are merged" do
             log_in_user(Fabricate(:moderator))
-            xhr :put, :update, { id: post_id, post: { raw: new_option } }
+
+            put :update, params: {
+              id: post_id, post: { raw: new_option }
+            }, format: :json
+
             expect(response).to be_success
             json = ::JSON.parse(response.body)
             expect(json["post"]["polls"]["poll"]["options"][1]["html"]).to eq("C")
@@ -189,10 +244,14 @@ describe PostsController do
           it "staff can change the options and anonymous votes are merged" do
             post = Post.find_by(id: post_id)
             default_poll = post.custom_fields["polls"]["poll"]
-            add_anonymous_votes(post, default_poll, 7, {"5c24fc1df56d764b550ceae1b9319125" => 7})
+            add_anonymous_votes(post, default_poll, 7, "5c24fc1df56d764b550ceae1b9319125" => 7)
 
             log_in_user(Fabricate(:moderator))
-            xhr :put, :update, { id: post_id, post: { raw: new_option } }
+
+            put :update, params: {
+              id: post_id, post: { raw: new_option }
+            }, format: :json
+
             expect(response).to be_success
 
             json = ::JSON.parse(response.body)
@@ -203,7 +262,7 @@ describe PostsController do
           end
 
           it "support changes on the post" do
-            xhr :put, :update, { id: post_id, post: { raw: updated } }
+            put :update, params: { id: post_id, post: { raw: updated } }, format: :json
             expect(response).to be_success
             json = ::JSON.parse(response.body)
             expect(json["post"]["cooked"]).to match("before")
@@ -220,14 +279,20 @@ 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]" }
+      post :create, params: {
+        title: title, raw: "[poll name=""foo""]\n- A\n- A\n[/poll]"
+      }, format: :json
+
       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]" }
+      post :create, params: {
+        title: title, raw: "[poll name='foo']\n- A\n[/poll]"
+      }, format: :json
+
       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"))
@@ -238,7 +303,10 @@ describe PostsController do
   describe "multiple polls" do
 
     it "works" do
-      xhr :post, :create, { title: title, raw: "[poll]\n- A\n- B\n[/poll]\n[poll name=foo]\n- A\n- B\n[/poll]" }
+      post :create, params: {
+        title: title, raw: "[poll]\n- A\n- B\n[/poll]\n[poll name=foo]\n- A\n- B\n[/poll]"
+      }, format: :json
+
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
@@ -247,14 +315,20 @@ describe PostsController do
     end
 
     it "should have a name" do
-      xhr :post, :create, { title: title, raw: "[poll]\n- A\n- B\n[/poll]\n[poll]\n- A\n- B\n[/poll]" }
+      post :create, params: {
+        title: title, raw: "[poll]\n- A\n- B\n[/poll]\n[poll]\n- A\n- B\n[/poll]"
+      }, format: :json
+
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.multiple_polls_without_name"))
     end
 
     it "should have unique name" do
-      xhr :post, :create, { title: title, raw: "[poll name=foo]\n- A\n- B\n[/poll]\n[poll name=foo]\n- A\n- B\n[/poll]" }
+      post :create, params: {
+        title: title, raw: "[poll name=foo]\n- A\n- B\n[/poll]\n[poll name=foo]\n- A\n- B\n[/poll]"
+      }, format: :json
+
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.multiple_polls_with_same_name", name: "foo"))
@@ -262,4 +336,96 @@ describe PostsController do
 
   end
 
+  describe "disabled polls" do
+    before do
+      SiteSetting.poll_enabled = false
+    end
+
+    it "doesn’t cook the poll" do
+      log_in_user(Fabricate(:user, admin: true, trust_level: 4))
+
+      post :create, params: {
+        title: title, raw: "[poll]\n- A\n- B\n[/poll]"
+      }, format: :json
+
+      expect(response).to be_success
+      json = ::JSON.parse(response.body)
+      expect(json["cooked"]).to eq("<p>[poll]</p>\n<ul>\n<li>A</li>\n<li>B<br>\n[/poll]</li>\n</ul>")
+    end
+  end
+
+  describe "regular user with insufficient trust level" do
+    before do
+      SiteSetting.poll_minimum_trust_level_to_create = 2
+    end
+
+    it "invalidates the post" do
+      log_in_user(Fabricate(:user, trust_level: 1))
+
+      post :create, params: {
+        title: title, raw: "[poll]\n- A\n- B\n[/poll]"
+      }, format: :json
+
+      expect(response).not_to be_success
+      json = ::JSON.parse(response.body)
+      expect(json["errors"][0]).to eq(I18n.t("poll.insufficient_rights_to_create"))
+    end
+  end
+
+  describe "regular user with equal trust level" do
+    before do
+      SiteSetting.poll_minimum_trust_level_to_create = 2
+    end
+
+    it "validates the post" do
+      log_in_user(Fabricate(:user, trust_level: 2))
+
+      post :create, params: {
+        title: title, raw: "[poll]\n- A\n- B\n[/poll]"
+      }, format: :json
+
+      expect(response).to be_success
+      json = ::JSON.parse(response.body)
+      expect(json["cooked"]).to match("data-poll-")
+      expect(json["polls"]["poll"]).to be
+    end
+  end
+
+  describe "regular user with superior trust level" do
+    before do
+      SiteSetting.poll_minimum_trust_level_to_create = 2
+    end
+
+    it "validates the post" do
+      log_in_user(Fabricate(:user, trust_level: 3))
+
+      post :create, params: {
+        title: title, raw: "[poll]\n- A\n- B\n[/poll]"
+      }, format: :json
+
+      expect(response).to be_success
+      json = ::JSON.parse(response.body)
+      expect(json["cooked"]).to match("data-poll-")
+      expect(json["polls"]["poll"]).to be
+    end
+  end
+
+  describe "staff with insufficient trust level" do
+    before do
+      SiteSetting.poll_minimum_trust_level_to_create = 2
+    end
+
+    it "validates the post" do
+      log_in_user(Fabricate(:user, moderator: true, trust_level: 1))
+
+      post :create, params: {
+        title: title, raw: "[poll]\n- A\n- B\n[/poll]"
+      }, format: :json
+
+      expect(response).to be_success
+      json = ::JSON.parse(response.body)
+      expect(json["cooked"]).to match("data-poll-")
+      expect(json["polls"]["poll"]).to be
+    end
+  end
 end
diff --git a/plugins/poll/spec/integration/poll_endpoints_spec.rb b/plugins/poll/spec/integration/poll_endpoints_spec.rb
index d2c5a4caac..e4c8005a44 100644
--- a/plugins/poll/spec/integration/poll_endpoints_spec.rb
+++ b/plugins/poll/spec/integration/poll_endpoints_spec.rb
@@ -13,7 +13,7 @@ describe "DiscoursePoll endpoints" do
         user
       )
 
-      get "/polls/voters.json", {
+      get "/polls/voters.json", params: {
         post_id: post.id,
         poll_name: DiscoursePoll::DEFAULT_POLL_NAME
       }
@@ -36,7 +36,7 @@ describe "DiscoursePoll endpoints" do
         user
       )
 
-      get "/polls/voters.json", {
+      get "/polls/voters.json", params: {
         post_id: post.id,
         poll_name: DiscoursePoll::DEFAULT_POLL_NAME,
         option_id: 'e89dec30bbd9bf50fabf6a05b4324edf'
@@ -57,7 +57,7 @@ describe "DiscoursePoll endpoints" do
 
     describe 'when post_id is blank' do
       it 'should raise the right error' do
-        expect { get "/polls/voters.json", { poll_name: DiscoursePoll::DEFAULT_POLL_NAME } }
+        expect { get "/polls/voters.json", params: { poll_name: DiscoursePoll::DEFAULT_POLL_NAME } }
           .to raise_error(ActionController::ParameterMissing)
       end
     end
@@ -65,7 +65,7 @@ describe "DiscoursePoll endpoints" do
     describe 'when post_id is not valid' do
       it 'should raise the right error' do
         expect do
-          get "/polls/voters.json", {
+          get "/polls/voters.json", params: {
             post_id: -1,
             poll_name: DiscoursePoll::DEFAULT_POLL_NAME
           }
@@ -75,7 +75,7 @@ describe "DiscoursePoll endpoints" do
 
     describe 'when poll_name is blank' do
       it 'should raise the right error' do
-        expect { get "/polls/voters.json", { post_id: post.id } }
+        expect { get "/polls/voters.json", params: { post_id: post.id } }
           .to raise_error(ActionController::ParameterMissing)
       end
     end
@@ -83,13 +83,13 @@ describe "DiscoursePoll endpoints" do
     describe 'when poll_name is not valid' do
       it 'should raise the right error' do
         expect do
-          get "/polls/voters.json", post_id: post.id, poll_name: 'wrongpoll'
+          get "/polls/voters.json", params: { post_id: post.id, poll_name: 'wrongpoll' }
         end.to raise_error(Discourse::InvalidParameters, 'poll_name is invalid')
       end
     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
@@ -101,7 +101,7 @@ describe "DiscoursePoll endpoints" do
           user
         )
 
-        get "/polls/voters.json", {
+        get "/polls/voters.json", params: {
           post_id: post.id,
           poll_name: DiscoursePoll::DEFAULT_POLL_NAME
         }
diff --git a/plugins/poll/spec/lib/new_post_manager_spec.rb b/plugins/poll/spec/lib/new_post_manager_spec.rb
index 8f1a843d0b..cf076e6a06 100644
--- a/plugins/poll/spec/lib/new_post_manager_spec.rb
+++ b/plugins/poll/spec/lib/new_post_manager_spec.rb
@@ -5,6 +5,10 @@ describe NewPostManager do
   let(:admin) { Fabricate(:admin) }
 
   describe 'when new post containing a poll is queued for approval' do
+    before do
+      SiteSetting.poll_minimum_trust_level_to_create = 0
+    end
+
     it 'should render the poll upon approval' do
       params = {
         raw: "[poll]\n* 1\n* 2\n* 3\n[/poll]",
diff --git a/plugins/poll/spec/lib/polls_updater_spec.rb b/plugins/poll/spec/lib/polls_updater_spec.rb
index 3d679d071a..e8a6a0e468 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 d5178fe854..a4d6fc27b6 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
@@ -71,9 +71,8 @@ describe ::DiscoursePoll::PollsValidator do
       )
     end
 
-
     it 'should ensure that polls have at least 2 options' do
-      raw = <<-RAW.strip_heredoc
+      raw = <<~RAW
       [poll]
       * 1
       [/poll]
@@ -85,7 +84,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 +100,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 +115,7 @@ describe ::DiscoursePoll::PollsValidator do
         count: SiteSetting.poll_maximum_options
       ))
 
-      raw = <<-RAW.strip_heredoc
+      raw = <<~RAW
       [poll name=test]
       * 1
       * 2
@@ -134,7 +133,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 +147,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 +163,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 +178,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 +193,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 +208,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 +223,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 +238,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 0000000000..85ee2c2a00
--- /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/poll-builder-disabled-test.js.es6 b/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6
new file mode 100644
index 0000000000..69f9fb4365
--- /dev/null
+++ b/plugins/poll/test/javascripts/acceptance/poll-builder-disabled-test.js.es6
@@ -0,0 +1,45 @@
+import { acceptance } from "helpers/qunit-helpers";
+import { displayPollBuilderButton } from "discourse/plugins/poll/helpers/display-poll-builder-button";
+import { replaceCurrentUser } from "discourse/plugins/poll/helpers/replace-current-user";
+import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
+
+acceptance("Poll Builder - polls are disabled", {
+  loggedIn: true,
+  settings: {
+    poll_enabled: false,
+    poll_minimum_trust_level_to_create: 2
+  },
+  beforeEach: function() {
+    clearPopupMenuOptionsCallback();
+  }
+});
+
+test("regular user - sufficient trust level", (assert) => {
+  replaceCurrentUser({ staff: false, trust_level: 3 });
+
+  displayPollBuilderButton();
+
+  andThen(() => {
+    assert.ok(!exists(".select-kit-row[title='Build Poll']"), "it hides the builder button");
+  });
+});
+
+test("regular user - insufficient trust level", (assert) => {
+  replaceCurrentUser({ staff: false, trust_level: 1 });
+
+  displayPollBuilderButton();
+
+  andThen(() => {
+    assert.ok(!exists(".select-kit-row[title='Build Poll']"), "it hides the builder button");
+  });
+});
+
+test("staff", (assert) => {
+  replaceCurrentUser({ staff: true });
+
+  displayPollBuilderButton();
+
+  andThen(() => {
+    assert.ok(!exists(".select-kit-row[title='Build Poll']"), "it hides the builder button");
+  });
+});
diff --git a/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js.es6 b/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js.es6
new file mode 100644
index 0000000000..4f210446f4
--- /dev/null
+++ b/plugins/poll/test/javascripts/acceptance/poll-builder-enabled-test.js.es6
@@ -0,0 +1,45 @@
+import { acceptance } from "helpers/qunit-helpers";
+import { displayPollBuilderButton } from "discourse/plugins/poll/helpers/display-poll-builder-button";
+import { replaceCurrentUser } from "discourse/plugins/poll/helpers/replace-current-user";
+import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
+
+acceptance("Poll Builder - polls are enabled", {
+  loggedIn: true,
+  settings: {
+    poll_enabled: true,
+    poll_minimum_trust_level_to_create: 1
+  },
+  beforeEach: function() {
+    clearPopupMenuOptionsCallback();
+  }
+});
+
+test("regular user - sufficient trust level", (assert) => {
+  replaceCurrentUser({ staff: false, trust_level: 1 });
+
+  displayPollBuilderButton();
+
+  andThen(() => {
+    assert.ok(exists(".select-kit-row[title='Build Poll']"), "it shows the builder button");
+  });
+});
+
+test("regular user - insufficient trust level", (assert) => {
+  replaceCurrentUser({ staff: false, trust_level: 0 });
+
+  displayPollBuilderButton();
+
+  andThen(() => {
+    assert.ok(!exists(".select-kit-row[title='Build Poll']"), "it hides the builder button");
+  });
+});
+
+test("staff - with insufficient trust level", (assert) => {
+  replaceCurrentUser({ staff: true, trust_level: 0 });
+
+  displayPollBuilderButton();
+
+  andThen(() => {
+    assert.ok(exists(".select-kit-row[title='Build Poll']"), "it shows the builder button");
+  });
+});
diff --git a/plugins/poll/test/javascripts/acceptance/polls-test.js.es6 b/plugins/poll/test/javascripts/acceptance/polls-test.js.es6
index 66c56b24b7..b6f81eba61 100644
--- a/plugins/poll/test/javascripts/acceptance/polls-test.js.es6
+++ b/plugins/poll/test/javascripts/acceptance/polls-test.js.es6
@@ -1,17 +1,21 @@
 import { acceptance } from "helpers/qunit-helpers";
+import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer";
 
 acceptance("Rendering polls", {
   loggedIn: true,
-  settings: { poll_enabled: true }
+  settings: { poll_enabled: true },
+  beforeEach: function() {
+    clearPopupMenuOptionsCallback();
+  }
 });
 
-test("Single Poll", () => {
-  server.get('/t/13.json', () => {
+test("Single Poll", (assert) => {
+  server.get('/t/13.json', () => { // eslint-disable-line no-undef
     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,22 +23,22 @@ 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", () => {
-  server.get('/t/12.json', () => {
+test("Public poll", assert => {
+  server.get('/t/12.json', () => { // eslint-disable-line no-undef
     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 => {
+  server.get('/polls/voters.json', request => { // eslint-disable-line no-undef
     let body = {};
 
     if (_.isEqual(request.queryParams, { post_id: "15", poll_name: "poll" })) {
@@ -50,13 +54,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,23 +69,23 @@ 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", () => {
-  server.get('/t/13.json', () => {
+test("Public number poll", assert => {
+  server.get('/t/13.json', () => { // eslint-disable-line no-undef
     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 => {
+  server.get('/polls/voters.json', request => { // eslint-disable-line no-undef
     let body = {};
 
     if (_.isEqual(request.queryParams, { post_id: "16", poll_name: "poll" })) {
@@ -97,13 +101,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 +116,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 61373127de..babab76ae7 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,22 @@ 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");
+
+  controller.set("pollStep", 0);
+
+  assert.equal(controller.get("pollOutput"), "[poll type=number min=1 max=20 step=1 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 +213,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 +233,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/helpers/display-poll-builder-button.js.es6 b/plugins/poll/test/javascripts/helpers/display-poll-builder-button.js.es6
new file mode 100644
index 0000000000..ba6bdccdfb
--- /dev/null
+++ b/plugins/poll/test/javascripts/helpers/display-poll-builder-button.js.es6
@@ -0,0 +1,6 @@
+export function displayPollBuilderButton() {
+  visit("/");
+  click("#create-topic");
+  click(".d-editor-button-bar .options");
+  selectKit(".toolbar-popup-menu-options").expand();
+}
diff --git a/plugins/poll/test/javascripts/helpers/replace-current-user.js.es6 b/plugins/poll/test/javascripts/helpers/replace-current-user.js.es6
new file mode 100644
index 0000000000..59161ed6bd
--- /dev/null
+++ b/plugins/poll/test/javascripts/helpers/replace-current-user.js.es6
@@ -0,0 +1,5 @@
+export function replaceCurrentUser(properties) {
+  const currentUser = Discourse.User.current();
+  currentUser.setProperties(properties);
+  Discourse.User.resetCurrent(currentUser);
+}
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 e32c983671..75035b6651 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,33 +8,33 @@ const template = `{{mount-widget
 widgetTest('single, not selected', {
   template,
 
-  setup() {
+  beforeEach() {
     this.set('option', { id: 'opt-id' });
     this.set('vote', []);
   },
 
   test(assert) {
-    assert.ok(find('li .fa-circle-o:eq(0)').length === 1);
+    assert.ok(find('li .d-icon-circle-o:eq(0)').length === 1);
   }
 });
 
 widgetTest('single, selected', {
   template,
 
-  setup() {
+  beforeEach() {
     this.set('option', { id: 'opt-id' });
     this.set('vote', ['opt-id']);
   },
 
   test(assert) {
-    assert.ok(find('li .fa-dot-circle-o:eq(0)').length === 1);
+    assert.ok(find('li .d-icon-dot-circle-o:eq(0)').length === 1);
   }
 });
 
 widgetTest('multi, not selected', {
   template,
 
-  setup() {
+  beforeEach() {
     this.setProperties({
       option: { id: 'opt-id' },
       isMultiple: true,
@@ -43,14 +43,14 @@ widgetTest('multi, not selected', {
   },
 
   test(assert) {
-    assert.ok(find('li .fa-square-o:eq(0)').length === 1);
+    assert.ok(find('li .d-icon-square-o:eq(0)').length === 1);
   }
 });
 
 widgetTest('multi, selected', {
   template,
 
-  setup() {
+  beforeEach() {
     this.setProperties({
       option: { id: 'opt-id' },
       isMultiple: true,
@@ -59,6 +59,6 @@ widgetTest('multi, selected', {
   },
 
   test(assert) {
-    assert.ok(find('li .fa-check-square-o:eq(0)').length === 1);
+    assert.ok(find('li .d-icon-check-square-o:eq(0)').length === 1);
   }
 });
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 f1668b1179..d289f45ae8 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 588c339ce9..eb86ac2587 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 7cc8339617..9fe51f8a19 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.ca.html b/public/403.ca.html
new file mode 100644
index 0000000000..0825ba5a33
--- /dev/null
+++ b/public/403.ca.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>No pots fer això (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; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 400%; color: #f00; line-height: 1em; }
+  </style>
+</head>
+<body>
+  <div class="dialog">
+    <h1>403</h1>
+    <p>No pots veure aquest recurs!</p>
+
+    <p>Això serà reemplaçat amb una pàgina 403 de Discourse personalitzada.</p>
+  </div>
+</body>
+</html>
diff --git a/public/403.cs.html b/public/403.cs.html
index f9d2d1fc6d..fc237de096 100644
--- a/public/403.cs.html
+++ b/public/403.cs.html
@@ -1,6 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
-<title>Tohle nemůžete udělat (403)</title>
+<title>Toto nemůžete udělat (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>Nemůžete zobrazit tento zdroj!</p>
 
-    <p>Toto bude nahrazeno zvláštní Discourse stránkou 403.</p>
+    <p>Toto bude nahrazeno volitelnou Discourse stránkou 403.</p>
   </div>
 </body>
 </html>
diff --git a/public/403.da.html b/public/403.da.html
index 6d7effe313..b91bb8c89c 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 1b850938db..f83395416a 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 3a9905a252..949f481c00 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 6a52d5deb5..0dbbdff136 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 4e3a373cd7..3f1733c557 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 4185ca1a21..75372a7faf 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 9f96bb4241..0eb53c7edd 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 171e83c1f5..a0e282d098 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 4a2ac9508d..ad924ac008 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 1cffb9ce02..7fe969bb00 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 3f230a9a6f..7832295afe 100644
--- a/public/403.id.html
+++ b/public/403.id.html
@@ -1,6 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
-<title>Kamu tidak dapat melakukan hal itu (403)</title>
+<title>Anda tidak dapat melakukan hal itu (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; }
@@ -18,7 +19,7 @@
 <body>
   <div class="dialog">
     <h1>403</h1>
-    <p>Kamu tidak bisa mengakses halaman tersebut!</p>
+    <p>Anda tidak bisa mengakses halaman tersebut!</p>
 
     <p>Halaman ini akan digantikan oleh halaman 403 Discourse</p>
   </div>
diff --git a/public/403.it.html b/public/403.it.html
index da8e9cba4e..015fe482f0 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 fef6db38ba..93c1577e00 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 2e6cb00d54..46102ed1ff 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.lv.html b/public/403.lv.html
new file mode 100644
index 0000000000..155f65191c
--- /dev/null
+++ b/public/403.lv.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Šī darbība nav atļauta (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; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 400%; color: #f00; line-height: 1em; }
+  </style>
+</head>
+<body>
+  <div class="dialog">
+    <h1>403</h1>
+    <p>Jūs nevarat apskatīt šo resursu!</p>
+
+    <p>Šo aizstās pielāgota Discourse 403 lapa.</p>
+  </div>
+</body>
+</html>
diff --git a/public/403.nb_NO.html b/public/403.nb_NO.html
index 76b6e9a1cf..b11c804fb8 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 7b03290e9e..362e12559f 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 ec3366bc51..38b9562f95 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 674df0279a..5d8ac58766 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 1c00c02a81..5cc571ce71 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 0ad295eb83..8b72c15824 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 d87d9d27c9..c7cec3760d 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 eca5973106..9cce25b9c6 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 ded7ddc6be..c745b66b48 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.sr.html b/public/403.sr.html
new file mode 100644
index 0000000000..d848a84b97
--- /dev/null
+++ b/public/403.sr.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Ne možeš to da uradiš (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; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 400%; color: #f00; line-height: 1em; }
+  </style>
+</head>
+<body>
+  <div class="dialog">
+    <h1>403</h1>
+    <p>Ne možeš da vidiš taj resurs!</p>
+
+    <p>Ovo će biti zamenjeno prilagođenom Discourse 403 stranicom.</p>
+  </div>
+</body>
+</html>
diff --git a/public/403.sv.html b/public/403.sv.html
index e042091983..3ff6f89b95 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 80659a1515..1433ddde18 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.th.html b/public/403.th.html
new file mode 100644
index 0000000000..8d57b1a39c
--- /dev/null
+++ b/public/403.th.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+<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; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 400%; color: #f00; line-height: 1em; }
+  </style>
+</head>
+<body>
+  <div class="dialog">
+    <h1>403</h1>
+    <p>คุณไม่สามารถดูข้อมูลส่วนนี้!</p>
+
+    <p>สิ่งนี้จะถูกแทนที่ด้วยหน้า Discourse 403 แบบกำหนดเอง</p>
+  </div>
+</body>
+</html>
diff --git a/public/403.tr_TR.html b/public/403.tr_TR.html
index c0f1dd3ea7..0cae7c6731 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 035dae104f..8e0e7d4481 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 268f0bac3f..0b66a595ad 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 20f3770528..7ddb46110b 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 6d7098c5ca..0887f9e31c 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 833ba11085..e7353129d0 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 a32a46698e..66aa046af6 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 91cb7d2bba..634e59250d 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.ca.html b/public/422.ca.html
new file mode 100644
index 0000000000..fcb0826309
--- /dev/null
+++ b/public/422.ca.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>El canvi que volies fer ha estat rebutjat (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; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>El canvi que volies fer ha estat rebutjat.</h1>
+    <p>Potser has provat de canviar quelcom a què no tenies accés.</p>
+  </div>
+</body>
+</html>
diff --git a/public/422.cs.html b/public/422.cs.html
index ae0439e5a1..d4c391df03 100644
--- a/public/422.cs.html
+++ b/public/422.cs.html
@@ -1,6 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
-<title>Změna, kterou jste chtěl(a), byl(a) odmítnuta (422)</title>
+<title>Změna, kterou jste chtěl(a), byla odmítnuta (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; }
diff --git a/public/422.da.html b/public/422.da.html
index 35363c5a15..34f06f1ffb 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 1a4e41d7f6..e602466125 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 f8ffc181d3..f6e6d33c5d 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 54024459dc..973befb9e8 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 2f776f1ab1..f7e5dff884 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 b08b4263a5..d92f363684 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 68ccf75bf2..1fff8ce6a7 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 c99663709c..ce04617abd 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 98d3a1b87c..fb07b51643 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 e8b1f51729..594e603566 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 4affddff5d..da429c7b26 100644
--- a/public/422.id.html
+++ b/public/422.id.html
@@ -1,6 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
-<title>Perubahan yang kamu inginkan telah ditolak (422)</title>
+<title>Perubahan yang Anda inginkan telah ditolak (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>Perubahan yang kamu inginkan telah ditolak </h1>
-    <p>Mungkin kamu mencoba untuk mengubah sesuatu yang tidak boleh kamu akses</p>
+    <h1>Perubahan yang Anda inginkan telah ditolak </h1>
+    <p>Mungkin Anda mencoba untuk mengubah sesuatu yang tidak boleh Anda akses</p>
   </div>
 </body>
 </html>
diff --git a/public/422.it.html b/public/422.it.html
index 632fb1f52e..1d016d0ba9 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 9577b35e1d..2ceed7730b 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 a75eace8dd..2bb626b5c7 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.lv.html b/public/422.lv.html
new file mode 100644
index 0000000000..aaea31a238
--- /dev/null
+++ b/public/422.lv.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Jūsu pieprasītās izmaiņas tika noraidītas (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; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>Jūsu pieprasītās izmaiņas tika noraidītas.</h1>
+    <p>Iespējams, jūs vēlējāties izmainīt kaut ko, kam jums nav pieejas.</p>
+  </div>
+</body>
+</html>
diff --git a/public/422.nb_NO.html b/public/422.nb_NO.html
index acdcb6b08b..47675f0d0d 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 d654bc4c9e..f31faffbfd 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 7cd0bb82b3..18e970242d 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 2e64ef6607..240dd474de 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 b4a30f58ca..50ca78177d 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 9aad3b0826..d366a7e069 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 81caed8e08..3b7e73203a 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 3cde526192..5d8bb671f6 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 b4b02c2229..9bd8fcc783 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.sr.html b/public/422.sr.html
new file mode 100644
index 0000000000..ac1f1cfee8
--- /dev/null
+++ b/public/422.sr.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Promena koju ste želeli je odbijena (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; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>Promena koju ste želeli je odbijena.</h1>
+    <p>Možda ste probali da promenite nešto čemu nemate pristup.</p>
+  </div>
+</body>
+</html>
diff --git a/public/422.sv.html b/public/422.sv.html
index 2068200259..f8f3e9bcc5 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 55437eb36a..f47f8bc607 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.th.html b/public/422.th.html
new file mode 100644
index 0000000000..f9e3d67d46
--- /dev/null
+++ b/public/422.th.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<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; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>การเปลี่ยนแปลงของคุณถูกปฏิเสธ</h1>
+    <p>บางทีคุณอาจพยายามที่จะเปลี่ยนในสิ่งที่คุณไม่ได้รับอนุญาต</p>
+  </div>
+</body>
+</html>
diff --git a/public/422.tr_TR.html b/public/422.tr_TR.html
index 23af24fbfc..0c3101fa1e 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 42ab0b789a..b5a1052fd5 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 9827ed711d..8d561cf8e9 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 082a63b385..c6904f029a 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 44c14545c0..c270e0f711 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 a3d9f4a41e..4a400f129d 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 72323ee844..7dbd9729a5 100644
--- a/public/500.ar.html
+++ b/public/500.ar.html
@@ -1,12 +1,13 @@
+<!DOCTYPE html>
 <html>
 <head>
-<title>آخ - الخطأ 500</title>
+<title>اوو - خطأ 500</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>آخ</h1>
-    <p>البرمجية المشغّلة لمنصة المناقشة هذه واجهت مشكلة غير متوقعة. نعتذر على الإزعاج.</p>
+    <h1>اوو</h1>
+    <p>النظام الذي يدير هذا المجتمع واجة مشكلة غير متوقعة. نعتذر عن الإزعاج.</p>
     <p>خُزّنت معلومات مفصلة عن الخطأ، ووُلّد إشعار آلي. سنفحص المعلومات ونرى ما المشكلة.</p>
-    <p>لا حاجة لاتخاذ أي إجراء آخر. ولكن لو استمر حدوث الخطأ، فيمكنك توفير تفاصيل إضافية أهمها الخطوات المتبعة لتكرار حدوث الخطأ، ونشرها بعد ذلك في موضوع في فئة المشاكل والأخطاء داخل الموقع.</p>
+    <p>لا حاجة لاتخاذ أي إجراء آخر. ولكن لو استمر حدوث الخطأ، فيمكنك توفير تفاصيل إضافية أهمها الخطوات المتبعة لاعادة توليد ظروف حدوث الخطأ، ونشرها في قسم المشاكل والأخطاء داخل الموقع.</p>
 </body>
 </html>
diff --git a/public/500.bs_BA.html b/public/500.bs_BA.html
index e7ef753acc..b938bd5459 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.ca.html b/public/500.ca.html
new file mode 100644
index 0000000000..e0ece6457d
--- /dev/null
+++ b/public/500.ca.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Oops - Error 500</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>Oops</h1>
+    <p>El programari en que es basa aquest fòrum de discussió ha experimentat un error inesperat. Disculpi les molèsties.</p>
+    <p>Hem enregistrat informació detallada sobre l'error, i s'ha generat una notificació automàtica. Li farem un cop d'ull.</p>
+    <p>No és necessària cap acció més. De tota manera, si l'error persisteix, pots proveir més detalls, incloent-hi els passos per reproduir l'error, publicant un tema de discussió en la categoria per a comentaris sobre la web.</p>
+</body>
+</html>
diff --git a/public/500.cs.html b/public/500.cs.html
index 4e68ddedcb..a3177c6bda 100644
--- a/public/500.cs.html
+++ b/public/500.cs.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Jejda – chyba 500</title>
@@ -7,6 +8,6 @@
     <h1>Jejda</h1>
     <p>Software, na němž běží toto diskuzní fórum, narazil na nečekané problémy. Omlouváme se za způsobené nepříjemnosti.</p>
     <p>Podrobné informace o chybě byly zaznamenány a automatické oznámení vygenerováno. Podíváme se na to.</p>
-    <p>Žádná další akce není třeba. Pokud chyba nezmizí, můžete poskytnout podrobnosti, včetně kroků, jak chybu reprodukovat, založením nového tématu v kategorii poznámky k webu.</p>
+    <p>Žádná další akce není třeba. Pokud chyba nezmizí, můžete poskytnout podrobnosti, včetně kroků, jak chybu reprodukovat, založením nového tématu v kategorii zpětné vazby k webu.</p>
 </body>
 </html>
diff --git a/public/500.da.html b/public/500.da.html
index 2eb2158fe6..f272d4d890 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 5fc3b344d5..32f1d6086a 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 216aaf6d26..9363ac2651 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 be623a4db2..42977501a4 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 f3c3090070..46401b6a63 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 7ec5303935..4d442d0ac3 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 d28e89d771..feecfb609d 100644
--- a/public/500.fi.html
+++ b/public/500.fi.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Hupsista - Virhe 500</title>
@@ -5,7 +6,7 @@
 </head>
 <body>
     <h1>Hupsista</h1>
-    <p>Sovelluksen sisällä tapahtui virhe. Valitamme tästä aiheutunutta vaivaa.</p>
+    <p>Sovelluksen sisällä tapahtui virhe. Pahoittelemme aiheutunutta vaivaa.</p>
     <p>Ongelma kirjattiin ylös ja tästä lähetettiin automaattisesti tieto ylläpidolle. Tutkimme asiaa.</p>
     <p>Sinun ei tarvitse tehdä muuta. Jos ongelma kuitenkin toistuu, voit kertoa palautealueella sen yksityiskohdista ja siitä, kuinka kyseiseen virhetilanteeseen päätyy.</p>
 </body>
diff --git a/public/500.fr.html b/public/500.fr.html
index 1102b61f24..95d425863c 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 d4708e7b8b..e4c0b721e4 100644
--- a/public/500.gl.html
+++ b/public/500.gl.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Vaites - Erro 500</title>
@@ -7,6 +8,6 @@
     <h1>Vaites!</h1>
     <p>O software con que funciona este foro de discusión atopou un problema inesperado. Sentimos as molestias.</p>
     <p>Rexistrouse información detallada do erro e xerouse unha notificación automática. Revisarémolo.</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>Non se precisan accións adicionais. Con todo, se a condición do erro continúa, pode proporcionar máis detalles, incluíndo os pasos para reproducir o erro publicando un tema de discusión na categoría «Feedback» do sitio.</p>
 </body>
 </html>
diff --git a/public/500.he.html b/public/500.he.html
index 1567e62665..ffec6877b7 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 ae5ca30393..ad64d73897 100644
--- a/public/500.id.html
+++ b/public/500.id.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ups - Error 500</title>
@@ -7,6 +8,6 @@
     <h1>Ups</h1>
     <p>Perangkat lunak yang dipakai untuk forum diskusi ini mengalami masalah yang tak terduga. Kami mohon maaf atas ketidaknyamanan ini.</p>
     <p>Informasi lengkap tentang kesalahan telah dicatat, dan pemberitahuan otomatis telah dikirim. Kami akan memeriksa kesalahan tersebut.</p>
-    <p>Tidak ada tindakan lebih lanjut yang perlu dilakukan. Jika kondisi eror tetap terjadi, kamu dapat memberikan detail tambahan, termasuk langkah-langkah yang menyebabkan eror, dengan membuat topik diskusi dalam kategori umpan balik situs.</p>
+    <p>Tidak ada tindakan lebih lanjut yang perlu dilakukan. Jika kondisi eror tetap terjadi, Anda dapat memberikan detail tambahan, termasuk langkah-langkah yang menyebabkan eror, dengan membuat topik diskusi dalam kategori umpan balik situs.</p>
 </body>
 </html>
diff --git a/public/500.it.html b/public/500.it.html
index ff28f1e545..3b941a72f4 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 d054cae61b..b96f465303 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 b6251fae12..09e822c863 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.lv.html b/public/500.lv.html
new file mode 100644
index 0000000000..2ad23e489d
--- /dev/null
+++ b/public/500.lv.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Ups - Kļūda 500</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>Ups</h1>
+    <p>Programmatūra, kura darbina šo diskusiju forumu, saskārās ar negaidītu problēmu. Mēs atvainojamies par neērtībām.</p>
+    <p>Par šo kļūdu izveidots automātisks ziņojums ar detalizētu informāciju, ko aplūkosim.</p>
+    <p>Tālāka rīcība nav vajadzīga. Tomēr, ja kļūda atkārtojas, jūs varat sniegt papildus informāciju, ieskaitot kļūdas atkārtošanai nepieciešamās darbības, publicējot jaunu diskusijas tēmu <a href="/category/meta">atsauksmju sadaļā</a>.</p>
+</body>
+</html>
diff --git a/public/500.nb_NO.html b/public/500.nb_NO.html
index 2aa31d97ca..56e2c70bdb 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 7a092cd2a1..833c38a2f5 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 248ff1f2d9..d326953788 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 c49a3a46da..277f7a8747 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 78cf1befa3..5d45a35c2a 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 c315c0d8cd..e599e95bec 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 0e07ea39c4..f7df6ca8ad 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 6faefa3186..88e8784564 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 107042f194..2270f3c6e7 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.sr.html b/public/500.sr.html
new file mode 100644
index 0000000000..9c48f14e3e
--- /dev/null
+++ b/public/500.sr.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Ups - Greška 500</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>Ups</h1>
+    <p>Softver koji pogoni ovaj diskusioni forum je naišao na neočekivani problem. Izvinjavamo se na neprijatnosti.</p>
+    <p>Detaljna informacija o grešci je sačuvana u dnevniku grešaka i automatsko obaveštenje je generisano. Pogledaćemo o čemu se radi.</p>
+    <p>Dalja akcija nije neophodna. Ipak, ukoliko se greška nastavi, možete priložiti dodatne detalje, uključujući i korake za reprodukciju greške, tako što ćete postaviti temu za diskusiju na sajtu u okviru feedback kategorije.</p>
+</body>
+</html>
diff --git a/public/500.sv.html b/public/500.sv.html
index d84e556cda..e9de29fe0a 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 45c48b9628..2a9452fb32 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.th.html b/public/500.th.html
new file mode 100644
index 0000000000..5f264276d0
--- /dev/null
+++ b/public/500.th.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>อุ๊บส์ - ผิดพลาด 500</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>อุ๊บส์</h1>
+    <p>ซอฟต์แวร์ฟอรั่มนี้พบปัญหาที่ไม่คาดคิด ขออภัยในความไม่สะดวก</p>
+    <p>รายละเอียดของปัญหานี้ได้ถูกบันทึกไว้แล้ว เราจะตรวจสอบแก้ไขให้เร็วที่สุดเท่าที่จะทำได้</p>
+    <p>ไม่จำเป็นต้องดำเนินการอะไรเพิ่มเติม แต่ถ้าข้อผิดพลาดยังคงอยู่ คุณสามารถให้รายละเอียดเพิ่มเติม รวมถึงขั้นตอนที่ทำให้เกิดข้อผิดพลาด โดยการโพสต์กระทู้ในหมวดหมู่ feedback ของเว็บไซต์ได้</p>
+</body>
+</html>
diff --git a/public/500.tr_TR.html b/public/500.tr_TR.html
index de7139bb87..c54c765d59 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 b7627c80b6..2adf723c18 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 af41c9343d..b0feeda7b8 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 9f4adf6470..d02ad1a8f2 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 a35da74f24..70b5d50c99 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 b42094bb25..05278ed934 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 f9c1f9e500..c8465d2f10 100644
--- a/public/503.ar.html
+++ b/public/503.ar.html
@@ -1,11 +1,12 @@
+<!DOCTYPE html>
 <html>
 <head>
-<title>الموقع تحت الصيانة - Discourse.org</title>
+<title>الموقع تحت الصيانة</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </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.bs_BA.html b/public/503.bs_BA.html
index 75eaee4fd4..1463fa0452 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.ca.html b/public/503.ca.html
new file mode 100644
index 0000000000..b48cd0e789
--- /dev/null
+++ b/public/503.ca.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>L'espai web està fora de servei per manteniment - Discourse.org</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>En aquest moment estem fora de servei per fer un manteniment programat</h1>
+    <p>Si us plau, torna-hi <span id="when-to-check-back">d'aquí a uns minuts</span>.</p>
+    <p id="apology">Disculpa les molèsties!</p>
+</body>
+</html>
diff --git a/public/503.cs.html b/public/503.cs.html
index 45db98e397..f6cc1bd934 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 ab8909472a..18710fead3 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 c84b57cdd3..c5f3ae8faa 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 c87180b824..829d209a86 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 5b7b6f53af..135ec37faf 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 8be6c19759..f84d3b877c 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 6d14e0c683..1e5038aee7 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 837a81a8b4..d14a034df6 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>
@@ -6,6 +7,6 @@
 <body>
     <h1>Suoritamme parhaillaan ylläpitotoimia</h1>
     <p>Kokeile uudelleen <span id="when-to-check-back">parin minuutin kuluttua</span>.</p>
-    <p id="apology">Valitamme tästä aiheutunutta vaivaa!</p>
+    <p id="apology">Pahoittelemme aiheutunutta vaivaa.</p>
 </body>
 </html>
diff --git a/public/503.fr.html b/public/503.fr.html
index 6a14566b77..d57807f37a 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 7ffae6239a..ad9ff5cb92 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 19b94063d6..2ea706e5dd 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 c18fe1824a..8f85d98176 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 030669b160..812e700cb0 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 14d415adb3..ca5f0a2d4a 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 02e8d4b652..2c21dc87be 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.lv.html b/public/503.lv.html
new file mode 100644
index 0000000000..053711c81a
--- /dev/null
+++ b/public/503.lv.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Vietnē tiek veikta apkope - Discourse.org</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>Mēs pašlaik neesam pieejami plānotas vietnes apkopes dēļ.</h1>
+    <p>Lūdzu, pārbaudiet vēlreiz <span id="when-to-check-back">pēc dažām minūtēm</span>.</p>
+    <p id="apology">Atvainojamies par sagādātajām neērtībām!</p>
+</body>
+</html>
diff --git a/public/503.nb_NO.html b/public/503.nb_NO.html
index 80ebfe2b00..3a3a3935a9 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 1953a6a250..7baac2eb27 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 64453803e8..61ccbf6242 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 18f73d1d3d..aff933211b 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 1cea17bebc..11996adbb5 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 834b98ba9a..fd4e4a268a 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 ce60ba0a85..7b89873d26 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 eae9f09226..33e4096764 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 f62f49bbb0..508de2e330 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.sr.html b/public/503.sr.html
new file mode 100644
index 0000000000..2625cf7e25
--- /dev/null
+++ b/public/503.sr.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Sajt je trenutno u održavanju - Discourse.org</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>Trenutno smo ugasili forum za planirane popravke</h1>
+    <p>Molim proverite opet <span id="when-to-check-back">za nekoliko minuta</span>.</p>
+    <p id="apology">Izvinite zbog neprijatnosti.</p>
+</body>
+</html>
diff --git a/public/503.sv.html b/public/503.sv.html
index c6d4cd6004..55fedeaa88 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 57aaa206c4..80cc500214 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.th.html b/public/503.th.html
new file mode 100644
index 0000000000..618d8e6e84
--- /dev/null
+++ b/public/503.th.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>เว็บไซต์อยู่ในระหว่างการปรับปรุง - Discourse.org</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>เรากำลังดำเนินการปิดเว็บไซต์เพื่อปรับปรุง</h1>
+    <p>กรุณาลองใหม่ <span id="when-to-check-back">เร็วๆนี้</span>.</p>
+    <p id="apology">ขออภัยในความไม่สะดวก</p>
+</body>
+</html>
diff --git a/public/503.tr_TR.html b/public/503.tr_TR.html
index a8e4090cb7..8f7c065b60 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 7cc315548c..2acc668de2 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 c6b8726fc9..d088924c01 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 0216e90242..5f19115b54 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 87cf9bce6b..9bb0fbfc31 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 fd4f64ee7d..4636f7b60c 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 0000000000..f33655e094
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 0000000000..e611468260
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 0000000000..c07e81b31e
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 0000000000..c04a6c2bd8
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 0000000000..8fbc7fd36b
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 0000000000..930faaf2a5
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 0000000000..29ebfe1eef
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 0000000000..0b46e9862c
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 0000000000..5ee7db294b
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 0000000000..edf1f180c8
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 558daf7884..d3ca5571c3 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 6a00c77d6b..81ff81a469 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 0000000000..c131644ef8
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 0000000000..ac29b9fe47
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 0000000000..f34e6a3966
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 5b8369d021..6eb89fb61e 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 5d936790bc..e9ce787982 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 f4a1477191..3c25fb8158 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 02f245a71b..9178d96490 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 c7f579955b..dbfd60ddd9 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 b0f60d2da1..95cee05ac4 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 89650d6ec4..fd35e2a4d0 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 0000000000..53a5eb2ccb
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 0000000000..8f30fc9e38
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 0000000000..36a4e57d1f
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 0000000000..77c57605e9
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 0000000000..58bcd6a2fc
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 0000000000..3bc6b5a57a
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 9be606fb98..b4e62dcc60 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 0000000000..be9171edf7
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 24848c479b..5d7e55052d 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 e0d745e0b5..c716ff2186 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 c862dd9a61..d1fcea18b8 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 fd2075925e..c5823b2577 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 0000000000..0073114703
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 040b13dc72..696265eea7 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 0000000000..e4a013d54b
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 f48867e5ea..44b4283915 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 0000000000..915ddb8fd9
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 7d09e2361e..80cfea90ce 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 60e6e89315..9a35a42e93 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 0000000000..88fab81c2b
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 e6471472b1..4f8112aebd 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 360acc71d7..62437d7170 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 0000000000..7d3b7fd179
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 1814038e18..d11e1912ed 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 0000000000..6f0a2fd462
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 0000000000..1e9ee78ca8
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 0000000000..0596fa0c4c
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 0000000000..b588a1be5b
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 0000000000..2d25ee5254
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 7325828533..feb23ff499 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 af8a6055fa..95cf61d6dd 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 0000000000..5427740da4
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 0000000000..9fcc3912a9
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 91918b983b..db3249a906 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 0000000000..cb0c40bd05
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 0000000000..0bf69425b3
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 9cc10e0135..34a88220e3 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 066169e7ee..cecfae493e 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 ef65fe6ddc..58c5e9f05a 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 0000000000..f8fa6a686e
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 c1581fd898..88af27355c 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 0000000000..eb12f476c2
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 edad1e85a1..af4ccacf83 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 33665ebbe3..c69979b71e 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 02f90659e6..2fae00bc74 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 3431b3f078..8e054f92f8 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 4025487dd7..a97cf57eba 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 8f93763e8d..778e5b0c50 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 08b4f46286..7fb1aca162 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 2f92eb39b4..c4b6e863e2 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 9a226c2cb0..29a6bb5543 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 f26ad0766d..c736224c87 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 26c75f10f9..c7f09fd49a 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 8aaa86a516..91db8b6de2 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 603a1db2da..afae92c32b 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 882a3ccb1e..6133c5b73b 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 605b50117b..5d73776557 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 e0bbe012d0..1d97b9c921 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 d40ade2aba..f276922c10 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 4c367cef58..3488c4919f 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 9cc39ac29e..1435459099 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 2c2180db12..8c96387267 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 bad8f800bb..428b2c3697 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 3a204fbfbf..7af21091c9 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 0000000000..28b9ab2fd7
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 0000000000..d3ccae8f3e
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 0000000000..694a0b8510
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 0000000000..f847acf58c
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 d48dccad63..f72d3b7fce 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 da14d6b597..19e711fb49 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 a323052dd7..f4debf825b 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 a323052dd7..f4debf825b 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 0000000000..87eafc1fdc
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 0000000000..6cb27a834a
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 0000000000..80e24f234b
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 0000000000..257ce74d2f
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 0000000000..8b30f048f6
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 26edd044cf..969e8c64b1 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 75159cf1b9..53d8ea8e14 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 0000000000..3c43a12250
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 0000000000..4d392a0f05
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 0000000000..25c43a5273
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 0000000000..4d2148d64c
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 0000000000..3dbb035f9a
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 0ab4cbe1b9..e962c73856 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 d4710279cf..a6caf9dcfe 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 0d28cea557..a89f7c9332 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 140035bcc8..85d4fcd35e 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 0000000000..4e07bcff2e
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 37782ed2af..75351047f3 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 2528b527fb..57dfec3a45 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 0000000000..f6b2159c23
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 0000000000..3ccd6ebf95
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 0000000000..c3de96b0bb
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 0000000000..5a49f802a7
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 49ef78adc7..e78b0e74d0 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 e8c267c5da..a0894da6cd 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 e8c267c5da..a0894da6cd 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 6f24d4f64c..d185b09e3a 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 7417a96925..2c1c4b1bb8 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 f0040f4979..782b22d665 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 e43d3ba44a..20cfbaf491 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 0000000000..80d8445398
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 4fce3c5995..49a1cffcd6 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 53d3276788..bab80b48cc 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 0000000000..86d7b00878
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 acb0a5b80a..9e773ad2d9 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 315ac1874d..dcea032156 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 f037db4ba9..c70ae0922e 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 0000000000..2476fa9f0c
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 0000000000..dbec120de0
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 0000000000..a9ccd27462
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 0000000000..079cd2a900
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 0000000000..905f5af468
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 0000000000..c03789f5d0
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 1a2255c2f8..2476fa9f0c 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 0000000000..dbec120de0
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 0000000000..a9ccd27462
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 0000000000..079cd2a900
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 0000000000..905f5af468
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 0000000000..c03789f5d0
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 0000000000..306605a0f3
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 0000000000..09f7b29e62
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 0000000000..6f10b75f66
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 0000000000..e75d9ac22a
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 0000000000..8b5d4a85e0
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 0000000000..d70dbc8b13
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 0000000000..be196ac2b4
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 1f489f5218..e24a27246a 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 1c2f59baea..1bcdb8de9e 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 c51ce16d0a..1bcdb8de9e 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 1c2f59baea..1bcdb8de9e 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 331905dc2f..ec03928665 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 0000000000..ed22a6cb38
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 0000000000..4a2fdeb304
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 0000000000..b1f6e168d7
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 0000000000..f75b75a74e
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 0000000000..a9665b318a
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 0000000000..a42b3caf88
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 5090810a15..e76eafea28 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 e0509aaaeb..82d7aa8a5a 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 ba1601298c..dee2a7426b 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 3a1d92b5a5..99347ea51f 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 17db97019f..2c5f55b06f 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 6b1de97e42..6a4f8ce061 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 0000000000..359cf42af7
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 0000000000..56c56c4fa9
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 0000000000..891e7eafa3
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 2cf876bf98..b90bc772ed 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 577cbe34b4..69432ddece 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 577cbe34b4..69432ddece 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 0000000000..f9e2d82420
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 223bad7481..1f51db409f 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 0000000000..396d2a914d
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 0000000000..ab0b841e40
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 0000000000..0c78d1fdfb
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 0000000000..c624c80e90
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 0000000000..e80a3b687c
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 0000000000..2f1e0bdf29
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 0000000000..c9c8b68318
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 717e607194..fc80f8e85d 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 0000000000..433c9308a0
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 0000000000..0c78d1fdfb
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 0000000000..c624c80e90
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 0000000000..e80a3b687c
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 0000000000..2f1e0bdf29
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 0000000000..c9c8b68318
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 0000000000..d7a39f4be6
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 0000000000..e512f6918d
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 0000000000..71cdc8a81b
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 0000000000..b0b26f4d57
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 0000000000..f978924aa0
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 0000000000..963e2127ee
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 e9d8a9c1d0..68581f4ac1 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 0000000000..5cc92e307e
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 fbb8f77193..f2e5aa7be1 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 fbb8f77193..f2e5aa7be1 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 d0736d873b..5eeaa1b195 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 0a9b035d89..7ff9d9ef73 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 f98c9996b4..892b54bc76 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 0000000000..36a0a6987d
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 0000000000..ccaf467692
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 86af5a28e3..04612a7f1f 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 84a0d2fa6d..b578a1bbc7 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 d943d06a5a..f1b82ecfd9 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 84a0d2fa6d..7aa3111242 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 e7cd942f5b..a728708b97 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 e2a54c5652..b49a1e165e 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 d97c2ff9a8..dada1ab8b8 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 0000000000..005aeefeda
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 0000000000..9e43423fdb
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 0000000000..b36f1a69db
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 0000000000..901dfcaa06
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 0000000000..5aaa84154a
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 0000000000..261b2470e3
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 0000000000..1583be196e
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 0000000000..9c514ac5fb
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 0000000000..22de69e3d6
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 0000000000..7ca9f739c3
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 0000000000..b2add0bfd7
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 0000000000..741e10610e
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 a967319833..7f7f7dd87f 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 43f70ff72f..21cea90fdf 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 267b2943f6..71b8ff1069 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 df80973a68..8fb4c4f630 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 a4cf344e4c..40b4db9b90 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 ffaa088a2b..79cfdfedb8 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 0000000000..1fe5602cc5
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 0000000000..ff8bc0a053
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 3755db8562..52472c1632 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 391c841ab8..fd8d428a74 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 74519e3005..7107c3db76 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 0d1c7ab0b6..1728a4e9f7 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 35192eae70..77198ad195 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 84e4eab202..9028c3d9fd 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 abf99111a9..2af53fd8c1 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 0000000000..9dde1447db
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 0000000000..b9daaed050
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 dbe2772628..897fc5b341 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 9311734ff4..7267e7ca70 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 0000000000..5827a3d376
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 0000000000..e484dc4efe
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 0000000000..952f744efe
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 0000000000..7e7b4cc6f1
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 0000000000..6e317e21b8
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 0000000000..8162c9ec2b
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 ef65fe6ddc..58c5e9f05a 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 0000000000..fa7f186924
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 0000000000..e484dc4efe
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 0000000000..952f744efe
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 0000000000..7e7b4cc6f1
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 0000000000..6e317e21b8
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 0000000000..8162c9ec2b
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 0000000000..b791781755
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 0000000000..887b1e699b
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 0000000000..9a8210b8a2
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 0000000000..f91db44496
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 0000000000..cb0a227139
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 0000000000..87c4e450eb
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 0000000000..b0d88a73b9
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 61c185c3c7..bb1166501e 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 0000000000..7d96edb1b3
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 6066d8263e..13a327586d 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 0000000000..8dfe24684a
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 0000000000..6eb54dbe51
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 0000000000..5b4dcc1c08
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 0000000000..dba107efaf
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 0000000000..59c5d57bb7
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 0000000000..c8e889faec
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 0000000000..d14af58f54
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 b2aa3201db..50c753d962 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 0000000000..815538138b
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 0000000000..fb591aa4fb
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 0000000000..5adcffa4b9
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 0000000000..d166f981b2
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 0000000000..7c8cb50a78
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 0000000000..e113d8cb42
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 0000000000..5cd877c475
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 0000000000..be044be6e7
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 0000000000..bb2f7557b0
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 0000000000..3e8f677695
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 0000000000..32aa1a28b9
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 b617726df0..da38bbb900 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 14e8a9a842..81d3772345 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 0000000000..1008c45a45
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 0000000000..4731279793
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 0000000000..5e03a6d23b
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 37a3e94eda..86e08db519 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 0000000000..0bc99e219b
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 50335d2655..3bb41a0c2c 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 14d63982ea..caad1ac128 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 a44f2810bb..3a0343e133 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 0000000000..92bad97fab
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 36b564fc04..55752567d5 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 af98c363fc..7fe88b489d 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 0000000000..61fac3c669
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 4c0cfc22fd..c85491514d 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 0000000000..e029433553
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 0b89d0f343..5a47f74a09 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 0000000000..00ae1282f1
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 0000000000..369be94783
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 0000000000..f81f47f274
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 0000000000..b355778d9f
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 0000000000..f348ca68e3
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 0000000000..232f1c2dc2
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 1cf76225de..af813ce4aa 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 89da0628a3..cc514eac84 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 bdc1736d2f..e6b1ae0783 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 0000000000..baf3480c1b
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 dfe4e4a0f3..4ae0cca3cd 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 4428361a5f..61ed440e75 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 8aa77273be..a98cef1cd4 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 429d7c7f62..74b98132dd 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 0000000000..0c58183e41
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 0000000000..b29d9c3a9c
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 0000000000..6f30225e3a
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 0000000000..42ac3f1063
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 0000000000..1f766292fa
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 0000000000..ff0ce24b2b
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 90af849810..ae1e525fea 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 0000000000..c5ee376139
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 50a7dd017a..315595b24f 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 d503e31bbb..14ef5fd476 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 0000000000..dcaac46221
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 bd0a8a3921..dcaac46221 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 0000000000..dc6e3db418
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 174bd3ee87..008e2a2d8e 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 0000000000..85be8280f8
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 0000000000..9e8edf40ad
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 a90f0e650f..d081129bbc 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 4446a621d1..5c0b463ff3 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 4e3c3e6be3..2e91629c5f 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 0000000000..2e5976e9d2
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 0000000000..fcac299cfa
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 0000000000..b6f59e377d
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 e272c4e0b1..813ebc7886 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 f3542a3eba..8d4950b182 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 0000000000..80e24f234b
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 0ff13b06d4..a0a547ebaf 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 0ff13b06d4..a0a547ebaf 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 d2015b86a1..6e30338fb6 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 d0d5390142..688e41bb2f 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 0000000000..f24d3ab5da
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 c17c846639..84cc6f420f 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 0000000000..8d88ed1579
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 e6a29d5373..e106ea5da3 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 ee29eb0467..d644a17077 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 0000000000..b78af60104
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 1bbe093405..e14cd808bc 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 0000000000..7ead04d8e8
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 0000000000..8fca1f0390
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 0000000000..9c6d1cce2b
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 1642ce3881..a223561da7 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 dbe2772628..897fc5b341 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 b90949583b..87f66213e0 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 b9dcdfc4a8..a592a3b697 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 53226a9e2f..37d888ecea 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 198f618bc8..0838044fbd 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 4c4864ff96..7b457c211a 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 4c4864ff96..7b457c211a 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 fac8d2145a..3c3684ca2a 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 2dffbe2fbf..749e0109ff 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 d068960b35..a427eeb898 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 e61c435cb8..f7b9bde9bc 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 0000000000..33e50494a3
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 0000000000..7a0e4f1cb7
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 0000000000..81a69110e9
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 0000000000..b5c64c9cc8
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 0000000000..0763a8bd94
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 0000000000..3ed705b902
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 3f96231377..f19495f8ce 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 0000000000..0f26ed2a65
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 e4d70c358b..80de702c1b 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 7e3af6d9e8..0632498930 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 0000000000..5706420297
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 0000000000..290b1bf6ad
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 73370fcaf7..b0faf71d11 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 dc8920342a..646fa92546 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 2048f3f934..186d25a795 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 caee203acf..3825c35f99 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 99de2a775b..afd1d52ccb 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 6468d224f3..fad18ff1da 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 6468d224f3..afd1d52ccb 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 a45698937a..11a4ef192b 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 cafc3c4acf..874f19c7b7 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 0000000000..575a7a0789
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 0000000000..28ded81d6b
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 0000000000..d29bd3baf2
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 0000000000..e1be837a3a
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 0000000000..4e1dfa2647
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 0000000000..4545ab4de9
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 55ca046c00..6c8d97bdf2 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 fcb8e87b5e..fb4aa8b6b1 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 0000000000..88c2bd94be
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 e28fb3d1e2..bd7a1aba2a 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 0000000000..efcd5fff75
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 be2924b47b..bc63b3ffb2 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 9ef8572bd3..653f4cf632 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 b6979bc618..8fb74fa6d4 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 e81438ce28..af110b300e 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 b556f5a7cb..8fe7595b61 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 48515bdcc9..dc1e6833b2 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 f6fe8aded4..25a5f9f347 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 2402cb4521..095d024ed6 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 b5dbdf51ad..8df93f1706 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 0bfb5f8ae3..80eff85051 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 0960b1e5bf..6dc0e845e5 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 91df696801..6f22b9d3e5 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 f35a4db5a6..c07bcde8d8 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 56717575ee..e43c206941 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 c7dd9b2d84..a5e896d94a 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 9e52ad3603..29c5a9b2ed 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 15752975ce..66f8a71ff5 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 2fd77dd60d..51f6c3da69 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 2a11b8a97d..bc141c25dc 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 fdffbf56a0..efa19c9213 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 722b71eeb2..77fcc1eacd 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 d115230668..5311b00131 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 b8e25880fd..4c6239ba6d 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 415a1e67dc..c279d82838 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 fa642f18bd..b0f015d731 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 28b63bfd36..e8793e41e7 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 d22e1045d1..f1d583dee9 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 db519d65c1..a28d55a800 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 856b014768..7f3b4be998 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 d36ee5cbec..13845accbf 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 cf588e7c48..c8a987cf00 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 4ce2e4907b..87287a2bc0 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 a6439ab682..0d3985f119 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 d36ee5cbec..13845accbf 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 0000000000..8f44a7726e
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 cf588e7c48..c8a987cf00 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 4ce2e4907b..87287a2bc0 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 a6439ab682..0d3985f119 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 0000000000..f091b23b6b
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 cc49b7ccc9..c7957fb3db 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 0000000000..c409f9f4c4
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 a4f10eed91..89199f28df 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 0000000000..e76b533149
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 0000000000..177872ece5
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 51b0785a2e..07de70653a 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 64e1b53489..d29067750c 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 0000000000..cee9fe65c3
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 46266f9052..2bcbf89601 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 0000000000..7e77d80006
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 589f335e32..575a7a0789 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 4f8e6e3e4f..f68c545485 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 0000000000..3899171edc
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 d672b68b20..13c22c9c62 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 0000000000..4c0d656ff2
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 0000000000..c933cb5659
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 b9576fafc4..5b983b52b1 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 86d2706729..744cb5fe94 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 14d63982ea..caad1ac128 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 cfa1119655..ab08591eb3 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 0000000000..0c2079a72d
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 0000000000..e4133c8ce9
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 0000000000..4175bd541e
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 0000000000..f52f410a90
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 0000000000..b1976d0925
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 0000000000..ab08591eb3
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 0000000000..0c2079a72d
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 0000000000..e4133c8ce9
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 0000000000..4175bd541e
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 0000000000..f52f410a90
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 0000000000..b1976d0925
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 0000000000..add71a28ef
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 0000000000..b33354210d
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 0000000000..5d7b89ca85
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 0000000000..8f65218544
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 0000000000..796b99e1eb
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 0000000000..7a6ead711b
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 daa9536fbf..1f5bb218fc 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 0475441d5d..3de249f523 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 0000000000..1dae1bcd01
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 64cd4cee9e..507c92c244 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 1df14194b7..c0aabdd494 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 1ed1b25547..78591caa50 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 0000000000..63db5721c1
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 0000000000..7922a9dd3d
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 0000000000..16292b3eb0
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 0000000000..41cdd83a94
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 0000000000..e2ce8f11b5
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 f0fac04066..e99004dcf6 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 3ba356323b..89d311d36e 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 0000000000..8a84b171e2
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 0000000000..f39c2bcfcf
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 18f79ee6e3..bc593ea9c9 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 18f79ee6e3..bc593ea9c9 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 0000000000..41f436aa54
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 0000000000..b7eafd58df
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 0000000000..8f924c75cf
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 0000000000..87fd1ce113
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 0000000000..b1b5bdc9c5
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 0000000000..13d6801c47
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 47f419cb84..8f90b5c37f 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 740d31b645..a44afd7213 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 0000000000..6515c8360b
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 9a0a620dd8..c300979a99 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 0b0f741575..eaf918c81f 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 0000000000..0aaa1cf765
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 98db44b985..47d4436b9b 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 aa391dcedb..5d1ec6baab 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 fb73ead72b..798f0499e9 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 0000000000..798f0499e9
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 fb73ead72b..798f0499e9 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 0000000000..a93f35de73
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 6df430834d..9e3e8460e3 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 0000000000..96e4b6e173
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 10df9c21f1..efc7a79034 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 0000000000..76cdcabf10
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 0000000000..f1efc6fd4d
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 0000000000..e4de73ffb8
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 0000000000..e4b72cb1c2
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 0000000000..37585e00ac
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 0000000000..63061bea7a
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 79f0b41b9d..0a325b514f 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 e0d25a4c09..39f21de50d 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 94c2e0fe93..293ad24fd6 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 94aa42e7bf..3bb64de0d3 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 5949718239..8b777fdcea 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 0000000000..159170fa3d
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 0000000000..ece1ce7d99
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 0000000000..4b2f313f9b
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 9d0f123061..65630291ab 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 0000000000..004ae5eb63
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 0000000000..09027a2fb2
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 9087fba5e9..e6257ad8cd 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 d9fae95d84..f5591d2bbf 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 457c883b3c..f2a8e54b6f 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 c751ae743c..dac6fa58e7 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 080aaf01a7..53e0066017 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 0000000000..b66d427e09
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 7ae125e191..5a6dc22b51 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 0000000000..cfebdb9e6f
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 0000000000..33fa4c2c80
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 58a25690eb..0b35842bea 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 58a25690eb..0b35842bea 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 277bf733fa..5ea2c10f9e 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 0000000000..7c7f527dbe
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 0000000000..5c44306803
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 0000000000..e1f0389b01
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 0000000000..cba934193f
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 0000000000..cc8af5bc89
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 0000000000..e5951ce334
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 0000000000..0d07c4318b
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 3b1315eac5..ecaf15737e 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 a9382535cc..0b4696027d 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 f357af5f26..1bdcca7068 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 041d3c012b..36dbc3f444 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 872aee97e6..db76fcfc1d 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 75f8e820e7..50e388a7c3 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 0000000000..0cf37942c9
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 0000000000..17d683203c
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 cd10e283de..07ee6e93e0 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 0000000000..f6c4251884
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 a389ff82ab..f6c4251884 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 3e9dc4bde7..5839c71e7f 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 21bb67b35d..8b98bbead1 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 0bf97033c1..e1057cb3d0 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 0bf97033c1..e1057cb3d0 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 8d4e429479..86bcc8cbbd 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 ed93594428..7d7a55b489 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 0000000000..1008c45a45
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 d0d5390142..688e41bb2f 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 89907ac08f..e006576d51 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 0000000000..8581bbc7d8
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 f994235819..b4208f83f8 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 57c66a9f69..a2145e68b5 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 abcfcbe663..e0a134d464 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 ac1450e239..d98a38f496 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 89a7974665..0e7e1bf910 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 433d9710a4..ab393900ec 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 0000000000..b2183a0bde
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 0000000000..3848b2a930
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 3980097067..e8e2c50219 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 cdcd151e9a..7f788fbb76 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 5a7b6e4fff..4a767f03fb 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 609e1b7b32..59e34ff912 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 609e1b7b32..59e34ff912 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 d4dec06f8e..14420b8e03 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 80aec94093..1133b42256 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 5864571882..64d792e8d8 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 418c09e3a2..7c42f7b8e5 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 0000000000..3c8fe7b900
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 c3421ac006..e5a511f5c5 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 0000000000..4de7a5ba7e
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 0000000000..e0a5705214
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 0000000000..489a779bf6
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 111fc7e238..09d9c415f5 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 c315c36ff3..511be647ad 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 0000000000..445c707c0b
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 1da4022b42..b6c7ea1c25 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 0000000000..ca5ccc4723
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 0000000000..19728dcd78
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 0000000000..8fb3fff357
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 0000000000..b70cc56420
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 0000000000..59b7bcc95a
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 2457424825..3efff57063 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 f698fc778f..19c0e25028 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 903f513605..f6ab1f616b 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 d49bd7a535..3e7b8e6178 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 0000000000..755cb28027
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 56d1013597..fb78dad239 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 2f30152fc9..f0b76c34ca 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 0000000000..81d5764df1
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 ba8ed5cf21..6269d3b91a 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 123ddbfab4..231d6abc89 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 cb694edee1..1f094d2de5 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 0000000000..268812d605
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 40914fec28..5be3a492f2 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 c11064716e..04454bb1aa 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 0000000000..f8b6dd873e
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 0000000000..15984024f2
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 0000000000..4689243a17
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 0000000000..861cbf808c
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 0000000000..5074876010
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 0000000000..505c908b18
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 c315c36ff3..511be647ad 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 8cea2f1a54..55820b7bf9 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 605d3dab83..511be647ad 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 95e780e661..68e1334683 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 0000000000..4f4becc0d4
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 0000000000..41397be692
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 0000000000..30255a2433
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 0000000000..5c62e06a71
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 0000000000..67f0608497
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 38e80e2152..83a1a7018f 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 d58cafb864..97fe6bad2d 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 b4d0a0748f..c1ab53657c 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 409aacd660..4609b01c50 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 8b069bce08..d074b414f8 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 0000000000..85532dadc7
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 fef3d12582..a3f3dd64f6 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 34a555e1c7..8c5c74e74c 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 14e2434955..b28ffc8d7a 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 0000000000..cd7c3d1f2b
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 0000000000..aed8f62e0b
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 0000000000..c6fbb4481d
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 0000000000..887f70e365
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 0000000000..84bb9ec9c5
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 0000000000..c01cab21b5
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 0000000000..1c8dd8dbf3
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 0000000000..39deb2c7e8
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 0000000000..ef6df0b933
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 0000000000..8552732ad4
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 0000000000..24f4a3071a
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 a4af077ca5..28ff6cc73d 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 0000000000..429938294b
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 0000000000..91e1de4e5d
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 0000000000..42821806e9
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 0000000000..9e8d3adb89
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 0000000000..88d190e392
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 0000000000..e6ab8ade74
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 0000000000..74f9b4ddf4
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 4ac95b4d57..62054c42fa 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 0000000000..100c01bda8
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 0000000000..d5e6e2a58e
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 0000000000..1a9f21b2a3
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 0000000000..9af1f5af57
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 0000000000..c5900031b8
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 0000000000..1f9a1557d5
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 0000000000..40020601cb
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 0000000000..57c7b97657
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 0000000000..158384d6e3
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 0000000000..3394121d14
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 0000000000..97c1f26473
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 0000000000..4d0ef0c5b0
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 0000000000..213af3e02d
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 0000000000..004ec8f427
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 0000000000..4d16c60773
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 0000000000..8713aa91e1
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 0000000000..da7c991131
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 0000000000..0c28c1f894
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 0000000000..ac197a85fe
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 0000000000..039d152d5b
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 0000000000..e70b13476b
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 0000000000..c71257738d
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 0000000000..85f7db3657
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 0000000000..aa6768144c
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 0000000000..d25d24ead6
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 a986396808..b572d4c18f 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 1b27863795..17a81c529a 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 3b1c263cd3..90e0440afc 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 0000000000..975fdf28c9
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 ff5b81002b..a7e1395cad 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 f45493c7ea..ee0b0e5e7a 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 cce22bf0c8..bccfae6657 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 0000000000..ed75e1a7db
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 54ab7ea7eb..0f2f79c9db 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 f32be103d7..bc88b6c48c 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 df47b4e550..043221da53 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 788f131ec0..add4400d04 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 0000000000..043221da53
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 0000000000..89e088c584
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 6776b47d66..a82ae1ee4f 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 ec5e750948..40552da1e8 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 953114e143..de37ce8bcf 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 9428a59764..c7f8ed43b5 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 60b0b046d5..dc0c46be80 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 aa7a45e1e9..0a927f8202 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 d5c3887b1d..2babbb0dd9 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 c21e17c44b..cdece2b307 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 0000000000..56285b20a8
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 0000000000..6540764590
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 0000000000..1ab8f2389d
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 0000000000..59bf4d8663
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 0000000000..8f30f67936
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 0000000000..e42595f193
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 0000000000..82e6f4dc74
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 0000000000..b478c30cbe
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 0000000000..c8784ff961
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 0000000000..4fa222dcf9
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 0000000000..8b21664f07
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 0000000000..297aca7b8f
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 0000000000..ca9bd453dc
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 0000000000..e95c238d06
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 0000000000..787f7fdd80
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 0000000000..a32f3128f8
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 0000000000..ca7be414ac
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 97fcc34bf7..5c85432a26 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 dbe8461ec3..36a0a6987d 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 fcdd1e4cae..16ed8e6169 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 1cf5a94a21..30d7cf3070 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 6776b47d66..a82ae1ee4f 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 0c6e5cd058..0bc1f97f79 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 e157684335..d0cf7fc227 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 0000000000..d0cf7fc227
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 0000000000..c716ff2186
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 0000000000..d1fcea18b8
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 05daeb667a..75b06ec087 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 1753f555cf..e3db650f43 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 0000000000..7d5c862855
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 e3ea064e09..7dd185d50f 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 c1298b7f4d..32200d7f8e 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 5d25a3a583..40a806bd97 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 73c0cb7c27..90e0440afc 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 e0b8b0aa6c..a01e82ebcf 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 32e586bd6e..54bd5dc10a 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 32e586bd6e..54bd5dc10a 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 0000000000..94a8cdca40
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 3517896f8d..c6fa8ddb0c 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 0000000000..a9a947848d
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 3ed87090ed..3800d04076 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 54206ae16c..48483d4c4c 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 0000000000..d07aefd842
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 3fe887c4fc..aaca2338d6 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 3fe887c4fc..aaca2338d6 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 0000000000..aaca2338d6
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 17ba34e064..846f230e27 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 0000000000..a816d9029b
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 0000000000..995998a816
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 0000000000..a80ba97496
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 0000000000..3479598fdc
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 d5fe969019..b72fcc4d8d 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 ceac1ce251..a0c633dab4 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 a812028077..2143534e9a 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 0000000000..ad1715f8a4
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 0000000000..3beb9a2f2d
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 0000000000..8081a99c5f
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 0000000000..515f0a219b
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 0000000000..6d12858131
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 0000000000..95d1122106
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 0000000000..d1282dd94b
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 0000000000..d06a0aa733
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 0000000000..aa34de2094
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 0000000000..638e52f05c
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 0000000000..25be6800ca
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 0000000000..b9efb3d134
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 0000000000..f5485b2843
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 0000000000..e869cf97d1
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 0000000000..ce95c6a8be
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 0000000000..33eec03fd4
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 0000000000..1048765292
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 0000000000..6f577d03de
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 0000000000..58349f45b1
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 95bcfa3f4c..67faaf9884 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 c406073ba6..749787daeb 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 4860a30a5c..54a7f73dc7 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 f89584d198..d1af59ed33 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 0000000000..b32827cd18
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 0000000000..ea03e0abda
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 95f9940b3e..9a7763f542 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 2e1728b44c..8c3241117f 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 ea245e888c..ab538189b4 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 c1be482454..c9ad704d3c 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 0000000000..f0eddcc91a
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 0000000000..9dc6417dee
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 0000000000..aa8883b16b
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 0c3ee026c7..76c779eea0 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 0000000000..9842b9f5fd
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 040409ea91..1618c5808c 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 b7408e2dbe..5967ff8ddc 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 0000000000..be0e85d289
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 39b4ab5e2a..43cddda1d3 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 0000000000..fd19994a6b
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 0000000000..486cfee579
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 0000000000..2e4bb4b243
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 0000000000..1c984843ba
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 0000000000..66a87a8008
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 3b7ac086c2..8b868ee5e5 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 0000000000..1a11dd2c56
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 0000000000..1c27b02c4d
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 f1cf594a20..4a261e2527 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 026859eba3..48dcf66863 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 b2f8b1a788..4225252a50 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 0000000000..a55b51262b
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 0000000000..490cdfe84b
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 0000000000..5600715526
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 0000000000..8218dd5872
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 0000000000..7f863e40dc
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 0000000000..4225252a50
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 0000000000..a55b51262b
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 0000000000..490cdfe84b
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 0000000000..5600715526
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 0000000000..8218dd5872
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 0000000000..7f863e40dc
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 0000000000..eaa7e01ed5
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 0000000000..271b4305bc
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 12a5fc3306..3aa8954a88 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 0000000000..0338c484a1
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 0000000000..eb68885c38
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 0000000000..b0ec0d5864
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 0000000000..e9778d3e96
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 0000000000..af461aed00
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 b26c18eae8..9578699cd1 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 0000000000..adeaf2a858
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 61177bee02..7b64adc98b 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 502e21fdb6..cf380f4970 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 4965bffa48..70df64a3f1 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 0000000000..16b2c1644f
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 0000000000..e561bb86c5
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 0000000000..ed812a6c05
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 ba7ea95e05..0ac75a3b12 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 36de471f1c..d1b8431a07 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 0000000000..9f34c1158d
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 0000000000..735472abe2
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 4e77f192ed..bed85fc6bb 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 0000000000..6c2d298e4c
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 0000000000..a52f6f3ca3
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 0000000000..1e4a128fc0
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 0000000000..103245ac4b
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 0000000000..cc69ea6372
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 0000000000..f4d3ba9c58
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 0000000000..314e41bcb3
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 0000000000..7ce9264c0f
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 0000000000..267d5ace8d
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 0000000000..f7c1e8826d
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 0000000000..1082318e26
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 0000000000..bab42f5675
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 0000000000..4039048d06
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 0000000000..6dcabb1e8e
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 0000000000..361842d05b
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 8f10c6a236..98e58d68cd 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 4c8f30a2b5..e72df0c1a3 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 0000000000..80fac519d8
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 0000000000..e9f7dfdbaa
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 0000000000..435b4fa32c
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 0000000000..50019797f4
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 0000000000..2bd103d6d2
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 0000000000..4d7b1d5033
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 0000000000..c44aea56b9
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 0000000000..2965fde656
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 0000000000..224e4f4799
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 0000000000..046cc155ff
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 0000000000..612cb34821
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 0000000000..941ba5a56d
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 0000000000..ceac9642aa
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 0000000000..e9f7dfdbaa
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 0000000000..435b4fa32c
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 0000000000..50019797f4
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 0000000000..2bd103d6d2
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 0000000000..4d7b1d5033
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 0000000000..174b5cbe3c
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 38b41e606f..77ef207968 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 312c0274c8..5c5a3b7052 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 2e1bb27eba..ec76955fd6 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 32050b23f0..daef26722c 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 2e1bb27eba..ec76955fd6 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 9268609b71..01450947c7 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 0000000000..8b60686eeb
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 0000000000..f0fd83faaa
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 0000000000..7df90232ae
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 0000000000..979c0c414d
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 0000000000..dee9188f4d
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 0000000000..9ae2da2c02
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 0000000000..35c3b9b350
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 0000000000..6757e8a1e2
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 0000000000..2583736a58
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 0000000000..11cb8caa11
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 0000000000..eed63072bd
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 28406089b3..1eaac97227 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 0000000000..630d17f421
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 232d87bdde..5f51f69249 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 5042b9b51c..c7b2e6f048 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 242847cf88..62997da266 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 4a750ae86b..72e9e2f37e 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 0000000000..87eafc1fdc
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 6196202e2a..462824db64 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 8a0f4820dc..16b43b1983 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 7edec53344..2b277ffc0d 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 28e17ec9f5..66e29a6367 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 563da23371..72685c4665 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 01af5269db..3894fbc178 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 8f5df9a585..6a4fc91c9d 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 7f224dcc93..728e8fd7f5 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 af05de18bb..256c942bba 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 0000000000..2b277ffc0d
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 7edec53344..2b277ffc0d 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 fb41ed5f91..fb4909f9dd 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 ee205aa373..0b0e7d88fb 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 7f6d731aa4..4557910d54 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 0000000000..9b978b3540
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 181c997d84..78472fce50 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 cb34ef2b00..6440b55c34 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 cb34ef2b00..6440b55c34 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 cc58c937e2..863fbff4b5 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 7b5d897d20..c3fa3384ae 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 8a9d9cb44c..e7e067344f 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 64261a93e8..da1e800d37 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 0000000000..c8a63cfddd
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 920f6300b8..e2198826de 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 0d2485f6f7..abdc40ae63 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 67060deb4b..5c9e59d132 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 0000000000..a49bc9e6db
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 b65765fdf7..630a7b744b 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 0000000000..82d7aa8a5a
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 0000000000..ad46b58eb0
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 63926ee7af..dcdc5ff658 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 ce325bf5d0..2e3388c806 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 0000000000..1e6ab0e0ac
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 0000000000..60a02fa671
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 0000000000..df92a7f7ca
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 0000000000..174fe7b5cb
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 0000000000..d46a863b60
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 9f4857037c..9cb06311ce 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 597cbd57fa..f8d63c366d 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 3a21bcb2a1..793f6e0210 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 597cbd57fa..f8d63c366d 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 7fd5f3e060..7321778f17 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 b389edfe50..8fd9889c58 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 c092680ed8..fce767913a 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 3b9ed4b00d..842c74c9ef 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 9ed7b523ff..8b7e87943c 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 a389ff82ab..f6c4251884 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 67060deb4b..5c9e59d132 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 21fc35afff..78c604a69a 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 0000000000..5c9e59d132
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 0000000000..3bbffdd26f
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 0000000000..56e8d4eda4
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 a07520acdd..1324a5ecbc 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 0000000000..e2198826de
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 758b3f633c..1ce8b7220a 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 ae34442c55..20df9b4d38 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 0000000000..c5741f9410
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 21e3b01e3e..a663a2a794 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 e958e1e463..3572e30770 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 af742430b4..b0f49b1d66 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 534d59345e..e8013ab7a3 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 0000000000..8f9167c025
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 0000000000..ca96fd3d96
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 9d471c7497..4424423fa3 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 0000000000..115198e563
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 0000000000..d0593f87fb
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 0000000000..a2f5d0294f
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 0000000000..63d9338057
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 0000000000..30b2bd891a
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 7320d245a1..f9e686ee2d 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 ffd4a14ca9..818b6ac1a5 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 a5198b3c81..33ebfac21f 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 0000000000..3d9e1356ea
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 0000000000..3c833ecc88
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 0000000000..ffe6c6f333
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 21bb67b35d..8b98bbead1 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 0000000000..b4a3ff3ef4
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 0000000000..20d0124b36
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 fd6bec82c1..6b6a8fa327 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 82537a4c64..dc7f30477c 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 0000000000..8fe27974c5
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 ea85cef14f..a5ac5b6df2 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 d822790c3b..c70e0448b5 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 fd28cf8a24..87e48f4a06 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 af567ff1b9..eff2422cc3 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 3428cc4ff5..621a6dd337 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 0000000000..5cdb9f597c
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 0000000000..7db4f23d1d
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 acb77c0152..76220db9c2 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 6cdb357243..383bab379e 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 0000000000..d3b98efcde
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 0000000000..ad1e52279b
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 7680caf185..4a1779e24f 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 a35dd1afd9..05715332b1 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 3f3819ebcf..835950ccf7 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 0000000000..59d013decc
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 0000000000..e04c09e543
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 78cdce40d4..af5be0c80c 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 0000000000..2f0769690b
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 d47ea39981..0c2ef0e3db 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 0000000000..fb4cd38885
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 1704701ef9..c8a63cfddd 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 83accd8bd7..9c12e14d15 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 52a32055ae..30a390e8e6 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 0000000000..1d72143848
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 0000000000..506e7c4249
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 0000000000..8d7ae07d91
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 4937163788..ec8d4de319 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 0000000000..40db675d1c
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 d2ca247fc0..6a2062451c 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 dd141df272..fd2f2178ae 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 c489d2374e..ab97bd6c12 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 be2f99c8dc..19f454d522 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 c3013e066a..09d75033d7 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 10df9c21f1..efc7a79034 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 0000000000..b941fdcd4c
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 9683f0c2d7..5a9d9c8024 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 0000000000..b83364c167
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 dc98beed81..73744147ce 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 1676faea23..a27f78ca0e 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 a42bc76292..ae4e53f32e 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 62a4eb3477..336a408388 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 69ccd5f289..2d827455fc 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 4695c5cc0f..1556f8345f 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 abdfc89f2a..0ece19dbb2 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 0000000000..e4f431dad8
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 11dbb07c03..99a962dcc1 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 7fe50e4a75..00ae1282f1 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 0000000000..369be94783
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 0000000000..f81f47f274
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 0000000000..b355778d9f
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 0000000000..f348ca68e3
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 0000000000..232f1c2dc2
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 0000000000..de7b2a957a
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 13b6597e5a..5fb39d7ca2 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 0000000000..30437ab1fb
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 0000000000..6046b94e9f
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 0000000000..df54bd55f9
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 0000000000..dafe388c95
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 0000000000..ecf9101aa9
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 0000000000..cd1c9aad39
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 0000000000..1afa3bea2c
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 ed49b66e47..591c3c6614 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 fbca11a6d4..d24ae9054b 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 22e54ef1f4..235e2049c3 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 eebeb80321..f07e438beb 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 eebeb80321..f07e438beb 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 2a066fb57b..bf3850fa06 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 660f09cfa2..d4ee8baa40 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 0000000000..c6cf99bf21
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 0000000000..0eaa196dc1
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 c98b923327..da37d71257 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 f07eac6a93..04f26eae33 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 7ff4e06e1d..67fa99b23e 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 5ffecce249..5546184289 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 54ef58d49b..b5d6232286 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 10c1b16d4f..532254bb10 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 4b9ab9d2fc..a31a8f40a4 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 33a0f9f812..452d90564a 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 0000000000..14ef7c72b2
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 0000000000..b70217e894
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 0000000000..aa984ea926
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 0000000000..5decb0e800
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 0000000000..e0bb218cc0
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 0000000000..bb51bde8bb
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 175ca1b742..3602ba9cf7 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 7f81b84a60..b9e79ad214 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 0b0f741575..eaf918c81f 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 46b0256afa..a9a947848d 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 9b83129cb4..2b02f0ad03 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 0000000000..3a2bba0528
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 0000000000..2df4a358d3
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 26e46db99c..e7c67de00e 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 0000000000..6199face70
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 0000000000..4e6457d2d5
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 0000000000..a4e779a2c9
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 bee1fd33da..fda41d19b8 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 3f113ef888..8ac9ef1617 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 0000000000..71c1b13f92
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 0000000000..823f6843fa
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 0000000000..c2ff6622a0
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 0000000000..76d0a52e37
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 0000000000..ddb5de5580
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 0000000000..302dd62dfb
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 b0a0af5c67..1bdcdec664 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 900519b6a8..28f703c8ed 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 a59025f9ce..6750b24177 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 89a18312d1..adf3a8218f 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 f666544890..eaa5134360 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 0000000000..dea46a2af0
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 0000000000..01bd5a75bd
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 0000000000..757cf7ec8d
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 0000000000..6a7e53aff0
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 0000000000..229e7c2986
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 0000000000..58ee54ac88
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 0000000000..0ce63e8b7d
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 0000000000..838cf318fe
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 0000000000..e0cb2a0d2a
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 0000000000..c24e4ee765
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 0000000000..22e114c435
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 b52f566434..d0a76900dd 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 0000000000..3e2e9ec418
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 0000000000..f43bf4122f
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 0000000000..ad967fa052
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 0000000000..8156d59cdb
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 0000000000..5ebceb4900
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 0000000000..8825c9dfbd
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 0000000000..afbf7f49d7
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 0000000000..0cdc7cb931
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 0000000000..6470b26527
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 0000000000..f365388e81
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 0000000000..ef1df03198
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 0000000000..db6c2cf7f1
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 0000000000..3409623591
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 0000000000..5764d5d897
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 0000000000..45b6438095
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 0000000000..6d255ce511
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 0000000000..21bcecc02e
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 0000000000..3ae0143de5
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 0000000000..8b0bc4ccb4
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 0000000000..70a34fab0d
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 0000000000..2b1c7918fa
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 0000000000..6b8e66c1e7
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 0000000000..000ce582f5
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 0000000000..a011061836
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 0000000000..ad08f530f9
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 0000000000..f99f2eab1d
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 0000000000..982cbe9d8b
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 0000000000..e81965aa08
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 0000000000..8879029ef8
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 0000000000..0af681bdae
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 0000000000..1dfccb36c7
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 0000000000..04a83acaff
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 0000000000..33b8a9427c
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 0000000000..02c985dcf0
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 0000000000..68e4dcd550
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 0000000000..543ef7e646
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 0000000000..ad95734385
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 0000000000..ef4d91dd2f
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 0000000000..365d50bf7d
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 0000000000..b72399279b
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 0000000000..f9020c975a
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 0000000000..a6c98168ef
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 0000000000..85e4c58177
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 0000000000..2768e7c782
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 0000000000..5057d5ca9c
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 0000000000..bb55256aff
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 0000000000..a1c8677fdb
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 0000000000..a6d9c8f88f
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 0000000000..252e6be1bc
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 0000000000..0ceac01ec9
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 0000000000..85ae21b240
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 0000000000..e38b0704e1
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 0000000000..f204cf6de8
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 0000000000..ca4f97c0dc
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 0000000000..17d673e75e
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 0000000000..c91a3d9a5b
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 0000000000..b55329cb03
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 0000000000..b6424288c9
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 0000000000..767f788ad7
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 0000000000..34c3c1b819
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 0000000000..d2f8d9bd9a
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 0000000000..63ac74f7cb
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 0000000000..977149a3ee
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 0000000000..822639db0c
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 0000000000..0c92a8d57c
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 7fe50e4a75..00ae1282f1 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 0000000000..369be94783
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 0000000000..f81f47f274
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 0000000000..b355778d9f
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 0000000000..f348ca68e3
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 0000000000..232f1c2dc2
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 0000000000..d26c5ab748
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 0000000000..e111b35e4b
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 0000000000..3f77f7170e
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 0000000000..b5f066bfc4
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 0000000000..0af5ba30e4
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 0000000000..d88356fae6
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 0000000000..28a239d66f
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 0000000000..ca388ecaaf
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 0000000000..5108fa862a
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 0000000000..ece8bf3bbe
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 0000000000..2948e55052
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 0000000000..1dcaa33a48
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 0000000000..522e573120
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 0000000000..c2c687f6c1
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 0000000000..feb24708d5
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 0000000000..2a414e5c38
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 0000000000..eb5d2b8d63
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 0000000000..cd2f51c6cd
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 0000000000..434741acd9
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 0000000000..4bd7e9831a
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 0000000000..27efe79466
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 0000000000..8180cb61e1
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 0000000000..bddf8cd8aa
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 0000000000..6524bc6892
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 0000000000..f571c9515b
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 0000000000..35881b6c56
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 0000000000..4b64ae8c6e
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 0000000000..c4a81e9368
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 0000000000..84cc0fcf8b
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 0000000000..4b86047b61
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 0000000000..9a64881605
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 0000000000..14bdcec1ce
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 0000000000..5966125a95
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 0000000000..d49ed4cecc
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 0000000000..0cc121d284
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 0000000000..d0db4df14d
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 0000000000..0564955254
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 0000000000..58c4200728
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 0000000000..b3dd093946
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 0000000000..04f2941f2a
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 0000000000..1b77719760
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 0000000000..596c061174
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 0000000000..d7f9416a7c
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 0000000000..ea882c2467
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 0000000000..239daf01b4
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 0000000000..3c2cdc9844
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 0000000000..2601d91449
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 0000000000..0fb0a97049
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 0000000000..bf534a9a09
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 0000000000..5d4a941e81
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 0000000000..75f2274b25
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 0000000000..dcc91d5323
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 0000000000..eca94862e2
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 0000000000..17a3730055
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 0000000000..50739842d3
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 0000000000..6c2939783e
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 0000000000..73e4357b30
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 0000000000..1f05b6a518
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 0000000000..2ac6087681
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 0000000000..c0f6f9b958
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 0000000000..7407d166f8
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 0000000000..90b2dba035
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 0000000000..97d24670a2
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 0000000000..1986fce029
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 0000000000..4135d1d783
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 0000000000..9477f2f0db
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 0000000000..6231cdce8b
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 0000000000..7749120c38
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 0000000000..353f394418
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 0000000000..e920689633
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 0000000000..5586d6d512
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 0000000000..f08a91b6be
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 0000000000..d858b598e3
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 0000000000..30ec2ec53f
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 0000000000..de33ccd471
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 0000000000..c7ffb9d274
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 0000000000..d9ade329a2
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 0000000000..4f809387b0
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 0000000000..b33d84dcad
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 0000000000..8465d27e43
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 0000000000..1ee89fcdab
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 0000000000..3efb91d3ec
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 0000000000..c3c4b1326c
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 0000000000..4a13c2317e
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 bc30ea4714..0cd4b17a9c 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 0000000000..893e4c6228
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 0000000000..1e39f76ff7
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 0000000000..170f9805fb
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 0000000000..ab169544bf
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 0000000000..3a5e157eae
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 62b48e6061..07906a0ee2 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 0000000000..ec579744b8
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 0000000000..813f977ae6
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 0000000000..53d8be863f
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 0000000000..d09a21950c
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 0000000000..8646fde515
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 8f85df3adb..99ec342c85 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 0000000000..bc63b3ffb2
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 be2924b47b..0000000000
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 aece6a65ed..9cd3f7decf 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 1f7e8a526b..95be453edd 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 0000000000..fd5931d303
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 0000000000..fef9e7243d
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 0000000000..a0a6cfc7b6
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 0000000000..f94c4d1120
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 0000000000..df6b30ee77
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 0000000000..54b33592cf
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 0000000000..8db521b992
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 0000000000..2e34703916
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 0000000000..95cc9b5a73
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 0000000000..bf004f61b2
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 0000000000..666232c3a7
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 0000000000..a03d7b7af6
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 0000000000..8092a3dbb4
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 0000000000..3913f8834a
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 0000000000..4f7540d4d9
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 0000000000..f94c4d1120
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 0000000000..df6b30ee77
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 0000000000..54b33592cf
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 0000000000..8db521b992
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 0000000000..2e34703916
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 0000000000..e65b5af0e9
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 0000000000..75cc6eebad
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 0000000000..cf20209f5e
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 2a0fdbfcb4..8de6f79bd8 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 37e6735eb0..6e66f14386 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 0000000000..1e4a132d37
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 0000000000..6e66f14386
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 444cc08ab9..8b3ee6c262 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 dfdc4ca36f..5006362d76 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 0000000000..b738536bdc
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 0000000000..178fd73c86
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 216663e5d5..d6f382d016 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 ea73b976bb..1fb3f77aef 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 0000000000..ee1b999e0d
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 0000000000..b97fbf42e3
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 0000000000..9079f60b81
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 0000000000..decc0b5892
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 0000000000..e3e3e89cb1
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 0000000000..5a5f36684e
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 0000000000..46006766ae
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 0000000000..85aa93e844
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 0000000000..ff67325213
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 0000000000..8f48f33a83
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 0000000000..beec4708b8
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 8e55ed29ee..885ed77882 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 0000000000..6debb7f70d
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 0000000000..7d6874acff
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 72ebc0c188..22b067d365 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 6d4db741c6..6f6e1dc3c9 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 17e2cf6fbb..12f6aa3de1 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 0000000000..ce95c6a8be
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 0000000000..33eec03fd4
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 0000000000..1048765292
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 0000000000..6f577d03de
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 0000000000..58349f45b1
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 b140cc5fee..1e4a132d37 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 0000000000..29991a49a7
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 00c04ef5e4..ecf711eb36 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 5700675f8e..f0cabe3c80 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 3e52f0eac6..b65d83439a 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 0fcf9dd247..7df7f6001f 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 0000000000..caec098bd8
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 0000000000..2ec6ee610e
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 c2de0194a6..44cabf40de 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 9344279918..481d7239a1 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 0000000000..82021a2dca
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 8afb249041..3d08e6ee9c 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 4d4994e89e..913047f794 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 71fe001ba8..d62e600933 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 0000000000..0aa72733ac
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 0000000000..6d3074592a
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 0000000000..482946e48d
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 0000000000..061d597cd6
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 8579f647eb..b75b4c2d95 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 1f97f70cad..a6888cdada 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 0000000000..1fe5602cc5
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 0000000000..6f384bbc50
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 0fabc315ab..1fe5602cc5 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 92aa5660f2..4ae8f0c685 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 fffb58bb5d..2f5cf97feb 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 baf8cb854a..61beec0664 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 ca912ecb23..5b85ecfeb6 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 0000000000..8bc94cbd8f
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 0000000000..0d4f1dbea3
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 0000000000..dbf96f05c5
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 0000000000..23d9f6755c
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 0000000000..aa1562b962
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 0000000000..456f84a0b4
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 0000000000..8bc94cbd8f
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 0000000000..0d4f1dbea3
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 0000000000..dbf96f05c5
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 0000000000..23d9f6755c
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 0000000000..aa1562b962
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 0000000000..b7dca39da4
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 0000000000..4af0a88046
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 0000000000..b2fc069d4f
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 0000000000..9e6d50755a
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 0000000000..647dbae611
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 0000000000..6f60da7a84
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 175b9634ec..82ac6f30e2 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 4dafd95718..98b481d141 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 1286830007..0be1ad5fee 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 be157f8d87..7807bd36f1 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 0c70ae6184..bf321dee2e 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 eb88c6c768..3899171edc 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 2deca94a1c..56bd490359 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 4650a851ef..7964d5a356 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 0000000000..7648e58091
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 0000000000..3b97123426
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 0000000000..759284bbd4
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 0000000000..1b12a39f4e
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 0000000000..3d1504ec6a
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 0000000000..f770e3863e
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 0000000000..2df5811c70
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 0000000000..190d692860
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 0000000000..e706e319e6
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 0000000000..d2b75ec199
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 0000000000..ca8614dafd
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 0000000000..156c4dbb0c
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 74b829bd0d..3b3c88bbb2 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 e715020006..b9fcadf652 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 7831d67614..c5ea389e5e 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 c8fa0f605b..dd9eec6b83 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 b193cd3ff6..05ae12c7a8 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 0000000000..147b7b0e4e
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 0000000000..509d805eb8
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 0000000000..42285ce132
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 0000000000..c0d5cce984
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 0000000000..9bd1a2437e
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 0000000000..f7d3b38127
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 a4cf547e51..1020a8381c 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 0000000000..46327a29ba
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 5682fd2478..902d5ec8ea 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 0000000000..58e819dfc7
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 0000000000..6b2889b71a
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 9dd564c5fc..41b1cc08f7 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 3cb70e15dc..4e6039bdd2 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 0000000000..358ea54522
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 0000000000..5848433e27
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 731a27fd27..1d386399fe 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 0000000000..f9a1087cb3
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 c234c62b1b..482946e48d 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 7a441b21e0..006c6791d7 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 0000000000..bbf96fc33f
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 23ead9b16c..c05c0ede5b 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 9a619ecbcb..400b080569 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 0000000000..400b080569
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 2ff96903d1..c6c645c86d 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 0000000000..c6c645c86d
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 73bdc4b6a3..d28ce65270 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 0000000000..f99f191636
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 0000000000..2d5530dd62
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 0000000000..1bbfb8e586
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 b43d978d38..ee92a63cee 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 52c6c63dcf..f68cbedc51 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 0000000000..15f12b061c
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 4214a624a6..7f6f2283e2 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 d03144b984..877ad857c1 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 8f203fa994..2190e5290f 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 444e9dbc45..d22e5eef38 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 0000000000..1fba8c40e4
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 0000000000..d533bd34fa
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 0000000000..55ca1de655
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 0000000000..df889c3d3b
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 0000000000..198d8d0828
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 0000000000..c7e959db49
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 0000000000..07de44c916
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 0000000000..7194eba931
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 0000000000..9ba6bbb3a7
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 0000000000..88b5985156
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 0000000000..235c3371e8
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 0000000000..429fc1ba92
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 0000000000..1fba8c40e4
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 0000000000..d533bd34fa
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 0000000000..55ca1de655
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 0000000000..df889c3d3b
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 0000000000..198d8d0828
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 bbe746be74..c11b08bc2b 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 49bf267fc3..c4fcc420ad 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 376ee29d8b..b16caf6a8b 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 2c94556f0f..425a8c6eef 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 0000000000..04a9904c8b
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 0000000000..8b74a9f83c
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 0000000000..bcfc406dd5
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 0000000000..5827a3d376
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 f6a9b9e875..5489cc0bb5 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 0000000000..5029910fe7
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 0000000000..84406ef480
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 0000000000..8c3d71db4a
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 0000000000..e1ed779ae6
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 0000000000..59fb8938e2
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 278dfdc74a..974f211892 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 40d2f08314..9bdbe23bb4 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 6ea74f2e25..5e4c3a2d0e 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 8f59e0c515..284f7eebbd 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 2d6ec571f3..1890dc87bc 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 dab70a8d3e..fa8b79521d 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 1f2aa424b3..5a11ac81c5 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 c29f77bcdd..a619c11c48 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 4f693f5338..1e40b5892d 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 7c73e931b7..78979edcbb 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 e68c049d29..6fb5b10e9a 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 a01be78b3b..f63443d6a4 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 a01be78b3b..f63443d6a4 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 e58db0c68c..c448030e13 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 0000000000..846b068ecb
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 0000000000..5106321993
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 0000000000..bcc412fb85
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 0000000000..1690724e43
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 0000000000..de9da6b79e
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 0000000000..ea8c3efa38
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 0000000000..fc088678c8
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 0000000000..d355137b7e
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 0000000000..86b6289c2b
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 0000000000..c807bcf02c
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 0000000000..6d6e7935d8
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 0000000000..bd3834c91e
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 0000000000..c8320428ed
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 0000000000..c7865487f2
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 0000000000..afb43cda70
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 0000000000..cc400e7f1e
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 a35dd1afd9..05715332b1 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 0000000000..8796829b87
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 0000000000..b36f41960e
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 0000000000..dc1441fea5
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 0000000000..abc19e06c7
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 0000000000..c90549f681
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 0000000000..5152c9c1a3
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 5dfc60e122..7d61e185f6 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 0000000000..5bce0f8719
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 0000000000..abb4fbd880
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 0000000000..db548d5f68
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 0000000000..6b6a9d922d
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 0000000000..dcb090572f
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 12a5fc3306..3aa8954a88 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 0000000000..0338c484a1
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 0000000000..eb68885c38
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 0000000000..b0ec0d5864
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 0000000000..e9778d3e96
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 0000000000..af461aed00
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 0000000000..b5b1a233e6
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 5a1b66d297..b5b1a233e6 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 0000000000..de17cf8477
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 7bb3f401c5..46dafb2eae 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 ce2b44e569..80e24f234b 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 094f8f4998..53769420d9 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 d1f2af2c26..0e9d3eff9b 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 70540c4a35..7b3d37c264 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 fbd9bcf592..04153a940f 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 0000000000..fd8d428a74
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 f92ddee688..a55476e3b1 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 0000000000..a34b319c25
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 0000000000..01678c5ca7
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 0000000000..21d7feef15
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 0000000000..eb7ba22d58
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 0000000000..363204276b
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 0000000000..1d7d1c6a5f
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 208488c227..bbcaa98be9 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 bc685328c6..bfd48b8c07 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 0000000000..f217c930a7
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 6177b3447a..ea6955e09a 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 7a81f2e557..af879adaba 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 0000000000..79b86eba80
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 6731898204..33a2801ef1 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 7e77b702b1..385a4b61e7 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 3f898e46c1..f296109488 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 1fa75fe43f..70c773c9e4 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 09a8fae6d8..7cb85607e3 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 9b83129cb4..2b02f0ad03 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 0000000000..38f68498fb
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 0000000000..fead277711
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 0000000000..8ec31337f4
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 fdb33ba935..3f96889285 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 0000000000..fb66ba11c4
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 0000000000..6d9b2fc8cc
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 0000000000..c5d52f5c7a
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 0000000000..3d4288d10d
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 0000000000..6ff36c07cb
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 0000000000..c25d42927d
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 0000000000..582030b969
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 0000000000..b666d15cd0
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 525bdb4305..27847603d9 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 6fbd8e481c..a2c50ff235 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 22e54ef1f4..235e2049c3 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 0000000000..08fc839433
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 0000000000..e885b82111
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 0000000000..95b1ae9fdd
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 5682fd2478..902d5ec8ea 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 49cb40b689..3ba3b779fd 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 8f7b38d55a..6b87aac3ef 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 8adb5230d3..b31de05a28 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 94aa42e7bf..3bb64de0d3 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 575c5adeeb..5f9b37f631 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 cdcd151e9a..7f788fbb76 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 3b1c263cd3..26fe02e01e 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 2bb88492d9..c8567db838 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 2bb88492d9..c8567db838 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 59ccd42d8e..a9b5b7e3d4 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 0000000000..a405729d16
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 bc2fa3def9..0e8ead81cb 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 0000000000..b9e79ad214
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 7f81b84a60..b9e79ad214 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 46b0256afa..a9a947848d 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 2a5ced6f7a..b738536bdc 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 66520d7134..2929860824 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 34ea100c4b..de389660ec 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 20d1a899da..0b40da7f01 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 0000000000..d8a6229d6b
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 0000000000..71330d66a8
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 0000000000..a1345ecbd2
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 0000000000..016b920bcd
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 0000000000..4591eb5290
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 0000000000..19be3236ae
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 0000000000..38293ffc2b
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 abd0f179de..d06a0aa733 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 0000000000..aa34de2094
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 0000000000..638e52f05c
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 0000000000..25be6800ca
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 0000000000..b9efb3d134
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 0000000000..f5485b2843
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 0000000000..e9404fd525
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 0000000000..8817578cf0
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 0000000000..0e9bf46e0b
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 0000000000..918e3d435a
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 0000000000..0c01143530
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 0000000000..fed226dac2
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 0000000000..65a0790d92
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 0000000000..7260df1d15
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 0000000000..d14580a3db
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 0000000000..9313ab2116
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 0000000000..f432b554b3
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 0000000000..dc7087e028
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 1a2255c2f8..2476fa9f0c 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 0000000000..dbec120de0
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 0000000000..a9ccd27462
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 0000000000..079cd2a900
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 0000000000..905f5af468
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 0000000000..c03789f5d0
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 bd98a51959..005aeefeda 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 0000000000..9e43423fdb
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 0000000000..b36f1a69db
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 0000000000..901dfcaa06
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 0000000000..5aaa84154a
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 0000000000..261b2470e3
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 eace861eec..48baa70cd7 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 0000000000..afaf1da3bc
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 0000000000..fd78d2ab4d
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 0000000000..3f525031d9
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 0000000000..bf7bacdb73
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 0000000000..dbe2ffeb2e
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 0000000000..c4c3cf63fe
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 0000000000..8059dccef1
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 0000000000..60538e8770
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 a01ba4dd22..1cd6abf550 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 0000000000..4f5f474d82
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 1c43911634..d124fd7b8f 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 53cb4e3078..0a32a4668c 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 a6f3f4a3fc..184594644f 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 55db8e5cf2..419fc999d6 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 cf4a89737a..28a1a8803f 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 2ec7386f18..26d40fa920 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 adf06d6fe4..3101dec9df 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 0000000000..971137f5b5
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 d4cc59a977..13d8433a35 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 5ef810aa4f..c8e1cecd39 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 0000000000..54bd5dc10a
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 0000000000..9eb4c375bc
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 6f4025de79..9eb4c375bc 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 0000000000..8ce6dcdeba
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 0000000000..666127f346
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 0000000000..e54187bc55
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 0000000000..a45feddac8
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 0000000000..19143c345f
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 0000000000..25757b1732
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 0000000000..d8870f6fda
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 0000000000..1806237eb2
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 0000000000..ef6da3f3cc
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 0000000000..c5145d2019
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 0000000000..62f00a7a6f
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 0000000000..7917a13842
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 0000000000..9b7fffdb42
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 0000000000..d9f0768c66
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 0000000000..001d1dbcdc
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 0000000000..7d1e85ae36
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 0000000000..be661ba35a
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 0000000000..8e8818d005
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 0000000000..d85940f9db
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 0000000000..86c38835ea
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 0000000000..dc15fc83d4
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 0000000000..c064485f4f
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 0000000000..65a4b98ad1
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 0000000000..3c4f31d205
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 0000000000..48ed3f567b
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 0000000000..e2fcd6dce5
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 1c43f79a07..a45562b4bc 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 0000000000..78591caa50
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 0000000000..63db5721c1
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 0000000000..7922a9dd3d
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 0000000000..16292b3eb0
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 0000000000..41cdd83a94
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 0000000000..e2ce8f11b5
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 0000000000..25c6e2edd8
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 0000000000..6a639ef226
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 0000000000..fbc5b41c90
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 0000000000..35b1501470
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 0000000000..504fc56fdb
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 0000000000..dc46fe34ad
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 218168a6e2..86bd66154f 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 7848c24cd1..58bb404582 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 0000000000..6df64adaac
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 dcc6f2a876..53704929e2 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 5e12a664b7..5360c36fef 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 fefd839a03..789fbf83eb 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 962dddfb3c..9be9f1d272 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 0000000000..3ce42b2396
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 9479152ec3..b052acbdbe 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 6422c0ed52..f18565b513 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 f8162548b9..4ae46e379c 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 0000000000..da4378f1ca
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 0000000000..3709015052
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 0000000000..575b0d548c
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 0000000000..874ed1a246
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 0000000000..b2e792cb09
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 0000000000..43e4977526
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 0000000000..48baa70cd7
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 0000000000..afaf1da3bc
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 0000000000..fd78d2ab4d
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 0000000000..3f525031d9
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 0000000000..bf7bacdb73
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 0000000000..dbe2ffeb2e
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 0000000000..7f8fa8e3c8
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 0000000000..ed1fb5987b
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 0000000000..0037c50a87
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 0000000000..7be7121077
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 0000000000..171e9171e7
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 de7885c95a..7ef58aaec7 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 0000000000..64908a8d90
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 0000000000..d50b195260
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 0000000000..97d8297097
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 0000000000..ef17d7c6ea
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 0000000000..b4d981d645
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 0000000000..5c1b82cb2d
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 0000000000..9116d6ee9a
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 401b24b9a7..881bf59b29 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 0000000000..881bf59b29
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 0000000000..5dc77f3fdc
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 0000000000..38a259bee4
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 0000000000..21878b6a2b
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 0000000000..54c1aa3bc0
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 0000000000..108d577bf2
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 0000000000..0de534fc1e
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 78c7c88e6f..86cb4bd51a 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 0000000000..fd032d30e4
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 0000000000..7adb956f02
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 0000000000..ea48b643f7
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 0000000000..10caffb58b
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 0000000000..f9d5eb42c5
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 01455a9eb9..3ce50192db 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 788f131ec0..add4400d04 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 0000000000..748dff1869
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 0000000000..1c8dd8dbf3
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 0000000000..39deb2c7e8
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 0000000000..ef6df0b933
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 0000000000..8552732ad4
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 0000000000..24f4a3071a
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 63681f71b7..6ebc2e5419 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 2b7045032d..e208e933bf 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 9edfcb209f..ab89e75001 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 d99576f177..bae7da4db6 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 0000000000..c73ce36292
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 5273e65c8d..6136129e08 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 232f7ef418..33cdc5e1e8 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 c59fcf7f27..77ae0528f9 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 7a0e60d654..f49f95cbbd 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 79f965c387..fcd23dd300 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 7a0e60d654..f49f95cbbd 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 92aa5660f2..4ae8f0c685 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 cb0569f07f..89a4c7f99e 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 85df5dd38a..8ef670a114 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 395debfe2c..377a1f98da 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 395debfe2c..377a1f98da 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 0ad74c7296..e5d9b45d90 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 afd4045d65..d75fb01377 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 0ad74c7296..e5d9b45d90 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 acb73cf996..d547ce1edc 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 0000000000..7f6e0d9516
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 0000000000..298328446a
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 0000000000..cd2aa88ab9
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 0000000000..ddbf05d1ee
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 0000000000..c6ab99cb9a
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 0000000000..e4ec5fc11e
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 0000000000..c9fe1ea37b
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 0000000000..f0fd83faaa
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 0000000000..7df90232ae
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 0000000000..979c0c414d
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 0000000000..dee9188f4d
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 0000000000..9ae2da2c02
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 0000000000..35c3b9b350
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 0000000000..6757e8a1e2
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 0000000000..2583736a58
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 0000000000..11cb8caa11
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 0000000000..eed63072bd
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 0000000000..9c277890ad
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 0000000000..8d6940ee24
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 0000000000..fe549c3e2c
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 0000000000..4ad8b9df45
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 0000000000..af23814474
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 0000000000..b365d34692
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 0000000000..f504e7e9f8
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 0000000000..af3dc8af63
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 0000000000..9ba1a0c65e
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 0000000000..35e4fb95e8
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 298974d579..c66b9820a3 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 0000000000..2345134342
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 0000000000..2534233309
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 0000000000..a7ea94e72e
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 0000000000..4a2d2775fa
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 0000000000..f5dfa976cb
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 0000000000..aed3b88527
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 0000000000..afa72a8c87
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 0000000000..78cb3fe314
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 0000000000..f47160bb3b
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 0000000000..096e8e7424
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 0000000000..3aa54e5a81
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 0000000000..c66b9820a3
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 0000000000..2345134342
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 0000000000..2534233309
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 0000000000..a7ea94e72e
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 0000000000..4a2d2775fa
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 0000000000..f5dfa976cb
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 30bf93624d..3b745d612c 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 6e01432624..76688ab65d 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 c7a48c9d83..04d33163d6 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 72073804b7..3f27cae7ba 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 6352a3119c..26000942ba 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 de18c2caaa..2b59419e4b 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 7e4a6f231b..83ac229144 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 e62af0ab9b..e90bf656b9 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 ba779426de..b79ce8b83f 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 f7b282798a..ea778f215d 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 e3a3286577..660a4298dc 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 0000000000..6440b55c34
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 e271244aef..7d5bef7cec 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 0000000000..6efb29e5bf
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 0000000000..ce95c6a8be
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 0000000000..33eec03fd4
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 0000000000..1048765292
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 0000000000..6f577d03de
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 0000000000..58349f45b1
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 836a81c8eb..2d1cd36200 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 2821a83a0a..8703e2c503 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 0000000000..9e01ebe47e
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 aaa3eadf65..4d898d1526 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 f6daa17c3b..c4271c4399 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 dc64d4dcbe..7444782a08 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 e8793fceab..1b7155898c 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 fddaa4def2..b3bbecd88e 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 af8a6055fa..95cf61d6dd 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 02e8c86a22..e70850a170 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 7c47d03998..8ae60dfcaa 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 0000000000..59488bcf37
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 0000000000..4da789951a
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 9a619ecbcb..400b080569 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 693516301b..e44cc5e734 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 0000000000..2cf4dca9a1
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 9b94888dd5..9811e82dde 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 57bf14b36d..1b4808817b 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 3744d5c65c..ddd064e4e7 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 2bc1b615b1..d33e164550 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 d14521f4ca..27ecb89da1 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 0000000000..d390d56ad1
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 0000000000..6ef5342a64
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 0000000000..bfc368477e
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 0000000000..a1473188e9
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 0000000000..93cfe0f87f
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 0000000000..412e6ed7f3
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 0000000000..d390d56ad1
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 0000000000..6ef5342a64
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 0000000000..bfc368477e
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 0000000000..a1473188e9
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 0000000000..93cfe0f87f
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 0000000000..06d080bf6f
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 0000000000..6ba3fb0c1c
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 0000000000..bc3b1647a1
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 0000000000..872e2d3433
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 0000000000..b0466da8e4
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 0000000000..90854899ff
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 89d48a8c7d..6e05e18f43 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 0000000000..d3efc0f73d
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 0000000000..3647d58222
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 0000000000..1c09cf1ec4
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 0000000000..4a9e54bd18
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 0000000000..79c08ed0b7
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 0000000000..a54c9f58e9
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 0000000000..d3efc0f73d
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 0000000000..3647d58222
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 0000000000..1c09cf1ec4
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 0000000000..4a9e54bd18
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 0000000000..79c08ed0b7
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 59b2c36f9b..bc14ee0a36 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 0000000000..593cef257a
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 0000000000..6611c5ffaf
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 0000000000..7324b8214c
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 0000000000..bf45719ea0
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 0000000000..d08dacb1b3
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 0000000000..3e061ca8ed
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 0000000000..736d4cb1ef
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 5d09d0e67b..c4c202a7ad 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 29f0aa8aa4..5038b3f0bf 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 1db5dc819f..5da9fee696 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 01fc740dba..e532106692 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 0000000000..e0bed73bf5
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 0000000000..6dc935be3e
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 545d9237c4..d9945f8fea 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 0000000000..ba3f9a1cdb
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 854a31c057..f7ddb9bcd8 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 0000000000..f80ae96d00
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 0000000000..8912ad6bec
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 0000000000..cf828d4db6
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 0000000000..341545fb2a
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 0000000000..e9eb712028
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 0000000000..e52b743de9
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 fbe05cb108..c408d5f745 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 d13384ba9d..28b9ab2fd7 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 0000000000..a58c32dc2d
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 0000000000..2f4d619997
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 1824aaafc9..51fa21f2de 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 b09bddf3e6..5a49f802a7 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 0000000000..73653eee2b
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 59293acb76..a35e8e9d88 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 38cabc92af..4147b98ba6 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 30fab88ad1..7b7692a2c8 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 2f184d2b75..b76754f6df 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 c14b4a412f..07960c5184 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 89cab98c00..270de39487 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 6e41a5d6ba..fbcefcac4c 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 b43e495cef..b434115e63 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 367f784e37..113d3c8186 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 c978b0cc28..5f83d7530a 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 0000000000..0b36f4c531
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 0000000000..d867f24f87
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 0000000000..69c7037eba
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 0000000000..fff11d76b1
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 0000000000..e499dd49b5
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 0000000000..a5fe385971
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 0000000000..41cdb2886b
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 0000000000..22d8d0b757
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 0c675d1252..8e280d07c4 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 0000000000..498e8ae1b6
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 0000000000..e076ea5be2
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 e64a282224..596e05a130 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 0000000000..4e10f0ddab
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 46a14928e5..3756ff5b72 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 b06a8fab57..e5b60f919d 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 b3d7199aa9..6585fb6a7e 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 72c78410b5..c5ee6e4069 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 597aad00ce..c124fe9a4a 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 ebc93a3267..decc0e851a 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 39693e1e30..68a0867f0a 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 0000000000..a53082f3cd
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 ceea95ed5c..a53082f3cd 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 0000000000..5601253eab
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 65bf735ec1..43e1a1b5b9 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 0000000000..68d4997195
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 0000000000..9f97f49ecf
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 0000000000..46006766ae
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 0000000000..85aa93e844
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 0000000000..ff67325213
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 0000000000..8f48f33a83
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 0000000000..beec4708b8
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 f9aab25133..c058c63eaf 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 0000000000..b959a26b64
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 0000000000..d56216fa0c
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 0c7618b6ca..230e33849b 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 f278daf8c8..f6f610d44c 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 5ba5e001ae..9fff97187a 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 72976d0404..5bd13a803b 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 e309b6778c..940aadb0af 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 5ba5e001ae..9fff97187a 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 1bb29f6d42..e819de8ce2 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 1bb29f6d42..e819de8ce2 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 0000000000..01805b1fe7
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 a6aab0e1e1..724d29e260 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 0000000000..724d29e260
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 88557f891a..6a7e53aff0 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 0000000000..229e7c2986
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 0000000000..58ee54ac88
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 0000000000..0ce63e8b7d
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 0000000000..838cf318fe
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 0000000000..e0cb2a0d2a
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 0000000000..02756b99cb
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 9a858ec000..26feee545c 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 0000000000..287b40bb24
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 0000000000..cf29751edf
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 fd2075925e..c5823b2577 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 c63847885a..cda760ab65 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 01f885b41e..b173ef91ed 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 d8213ad360..cbac1b1f3a 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 8e43438649..36a0b74835 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 14cc1c7c38..6daba327ee 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 42e7c86521..38c1eae3a2 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 2c9727250f..ea94d95836 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 0000000000..f190bf0cb8
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 1286830007..0be1ad5fee 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 a88d3f57ee..74f312e46e 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 0000000000..a4f4993821
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 0000000000..f18d508430
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 0000000000..7218327420
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 0000000000..b3372f66d7
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 0000000000..245ed27301
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 92dce9a53c..4745565c4c 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 41fe7215a7..13a88d60ef 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 d4a8953f15..4ae1cfb955 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 0000000000..4ae1cfb955
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 5754da2e78..b67be4121d 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 0000000000..8f2b9bbe9e
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 0000000000..32fd718c87
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 0000000000..01ec1737ff
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 2a408f6c93..237fd661c5 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 c95399d739..d5dd10cd6b 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 17a15290f0..2497fe0d31 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 0000000000..e4bc22da62
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 0000000000..55476e920c
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 0000000000..725a527adc
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 baf3c0c045..ce6123859c 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 391f0288c3..e27b29fc4b 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 4ad69a0adc..d2f02f77f5 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 5db60902b8..8951f218b3 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 9a970a9127..177b189a9c 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 1be1a2f0dd..b08bcfafdd 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 a2f64c2594..26d8ae6198 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 222a2fa225..e52642249d 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 2f46c3aacf..9ef912ee4d 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 2d2892d18b..e11319ddc2 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 2d2892d18b..e11319ddc2 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 263d7c0f7d..d668842060 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 985d58d349..34000044bd 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 29f7588b63..742a820d2a 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 6b15a040e1..2e2f9e0bae 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 0000000000..74b98132dd
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 429d7c7f62..74b98132dd 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 6ea74f2e25..5e4c3a2d0e 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 0000000000..5e4c3a2d0e
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 0000000000..0d7ccd11fe
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 37e6735eb0..6e66f14386 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 88557f891a..6a7e53aff0 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 0000000000..229e7c2986
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 0000000000..58ee54ac88
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 0000000000..0ce63e8b7d
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 0000000000..838cf318fe
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 0000000000..e0cb2a0d2a
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 0000000000..2c06de8797
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 0000000000..9e13db4ab6
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 0000000000..daca6aa34a
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 0000000000..694a0b8510
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 0000000000..18dda8f654
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 0000000000..5d2d00f4db
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 0000000000..efcd5fff75
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 0000000000..699bcf1899
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 0000000000..e06af20e14
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 31ea828db4..bdff0d70cc 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 932c78393b..2778f4a5e4 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 e1ed35eb50..37c8d2b0a8 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 fde9b3c29c..720237b3ca 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 4c681f3a2f..be2ddc89ce 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 0000000000..7da8183f39
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 8ee40bd161..b48e69b820 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 122303ec9a..eaa21c05e7 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 d9f432f9e0..58e1f0e546 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 17b9edf2dd..362fe4c2e6 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 6eb07474bb..fad912a0e5 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 6e44df377e..3d64cca051 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 0000000000..917da78ce6
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 255ec91bf3..8661924183 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 9f3c719a8b..01fa924400 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 a3da2473bc..2316a8bb4e 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 6d4db741c6..6f6e1dc3c9 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 0000000000..c6d649fad7
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 0000000000..7444db0904
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 0000000000..8632921373
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 0000000000..16324c90c4
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 0000000000..aaaf576a06
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 5c7aa04f08..22c7765db3 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 2de51ebcca..3a36efe239 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 8a5e972471..c19f975639 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 fecda04621..b66b8e5567 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 6ffdb04551..d6cdfd3680 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 0000000000..a0482f4819
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 0000000000..e4e3fe4bd3
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 0000000000..33401ea804
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 0000000000..a565a32f31
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 0000000000..560070c2a1
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 0000000000..476e43df4e
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 0000000000..a0482f4819
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 0000000000..e4e3fe4bd3
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 0000000000..33401ea804
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 0000000000..a565a32f31
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 0000000000..560070c2a1
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 0000000000..2b4606fe7c
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 0000000000..8065c6f666
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 0000000000..6a94c33b27
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 0000000000..20388425a2
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 0000000000..b89c8b8b2d
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 0000000000..8cdf1ee6f9
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 0000000000..5d733dba9b
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 065f36f36d..90c513ca69 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 0000000000..e4427cbd15
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 0fd2ed8293..1fb5eaac10 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 0000000000..5827a3d376
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 0000000000..40b243ee99
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 8e444ecf97..285e5876ef 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 0000000000..2c266bf169
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 7f79999009..c793a324c8 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 0000000000..f5f60e3018
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 0000000000..488222d221
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 0000000000..eb2bcd180a
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 0000000000..fc0f52b9da
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 0000000000..2a48fdc951
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 0000000000..152e42f485
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 0000000000..f5f60e3018
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 0000000000..488222d221
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 0000000000..eb2bcd180a
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 0000000000..fc0f52b9da
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 0000000000..2a48fdc951
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 0000000000..c8439064e4
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 0000000000..357daa34c1
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 0000000000..0d831c336f
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 0000000000..2fbc28284b
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 0000000000..5523af7553
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 0000000000..584b88b78d
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 0000000000..50ccd594b8
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 9d1fa78cc1..e2849c52e1 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 ee0bd96cf9..5ceaf0f630 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 0000000000..f14db54b40
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 18bf076d27..aeea9520a4 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 0000000000..d8811a5638
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 2ec7386f18..26d40fa920 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 3a96063137..c4adea0e0a 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 f3f53895ad..f08377f394 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 0000000000..70d71de7e6
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 0000000000..89eb0e30ee
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 0000000000..08aa6a4843
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 d1cdc00ffe..fd1c87e338 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 edf6be47f3..e4ddd1955f 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 0000000000..3cd7aba2ec
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 4fa42031ad..a57184d9f3 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 ec0930c68c..99fc7add6e 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 b9f89bdc46..a2fafef7f9 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 6ac8bdd78a..60538e8770 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 a4e73c68d9..a6128b5315 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 3a6ca3119e..026a270cc1 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 853c15ad14..59d013decc 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 9af8a69973..32f01c115c 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 e54b56f4f6..163a5621a7 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 0000000000..f6e7620ff9
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 a48ce4473b..a807d4cac4 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 9e95b9efe6..1fddc6e582 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 6a0af40ae7..2b641df50a 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 eb88c6c768..3899171edc 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 0000000000..930faaf2a5
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 0000000000..29ebfe1eef
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 0000000000..0b46e9862c
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 0000000000..5ee7db294b
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 0000000000..edf1f180c8
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 0000000000..f33655e094
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 0000000000..e611468260
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 0000000000..c07e81b31e
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 0000000000..c04a6c2bd8
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 0000000000..8fbc7fd36b
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 ad5ed7e930..8f44a7726e 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 ad5ed7e930..8f44a7726e 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 74b0ee3224..73a7b007c2 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 89650d6ec4..fd35e2a4d0 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 a54ccc83c2..d9b0fbb758 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 d6f7ef738c..080125274a 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 fa4107c692..306fb222cf 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 fa4107c692..306fb222cf 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 0000000000..25fdf935ed
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 0000000000..6a4098a9d3
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 0000000000..1dd416fb2f
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 0000000000..f97238add3
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 0000000000..4e8505eb57
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 0000000000..ee1174f3b4
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 0000000000..2198ef8ba1
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 0000000000..4424423fa3
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 0000000000..115198e563
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 0000000000..d0593f87fb
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 0000000000..a2f5d0294f
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 0000000000..63d9338057
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 0000000000..30b2bd891a
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 fee4073531..03952783bb 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 0000000000..6dc60ec10d
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 4f9f2c5059..ab7e58aa72 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 0000000000..18cbb256ea
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 3fa978a5b0..3c3f33124c 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 7e9a63a6af..0b100a4639 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 0000000000..d7e19e4a11
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 53189574b9..0f5e837862 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 32050b23f0..daef26722c 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 4bb24f1a37..5a64e2a0b5 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 bde39c16bd..4e7fbd6852 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 0000000000..0d3985f119
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 0000000000..00411e5a49
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 2ff96903d1..c6c645c86d 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 401b24b9a7..881bf59b29 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 4114ed434a..2801e64c8d 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 05c7cc855c..fd57e2bf3b 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 f5df9bbc9b..80519d2e62 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 c9635597bc..ee6a95d50a 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 874216e62e..fe2107cc7e 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 c76fd23f31..1d5bcef502 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 da9085f1a5..ec0d3dfd8c 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 ef93bb8552..5cb2b5d500 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 c712d8319c..b1abb2d01f 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 0000000000..e7fa4c6183
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 0000000000..694a0b8510
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 b654575643..b0aea215bb 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 90688c4809..f8a2286efe 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 562cc98842..af0543b461 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 3a3db059de..71d76b95de 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 cc6db6d7b7..1d507c6133 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 d438f9a91e..a03fbba25f 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 0000000000..68a0867f0a
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 d79aff4175..ef9742c6c1 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 0000000000..b2663a8953
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 0000000000..e6e933b4fc
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 c0eba74574..9d302e2f34 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 0000000000..96caa4ddf5
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 0000000000..9cd6d02a4b
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 537b2dde52..ae80acb3f0 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 0000000000..2f943390da
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 c9ec15c655..629d8504c7 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 0201e297a8..4d4b63a6aa 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 17e3962e6f..6740511b38 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 eff6d442d4..0854acf430 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 8c7ad80871..049665f4dd 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 2cdde1bf54..dd2e396699 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 4a6bd1d02e..245284a11f 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 1811b71c7f..ad9a077871 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 a969dbd1e2..9e79230f6d 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 a6f0b2e52f..b9b24f4a5a 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 669de7d6e0..2fe46b57c0 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 96ce24bf46..9a1e32f38f 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 a0a50f6039..68854c4e7f 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 69d83d7a8c..f8d1473ce7 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 48a2a1e741..9b92765755 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 0000000000..02590e94cf
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 0000000000..1d15d6cb96
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 0000000000..ac778caae3
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 fe9852deb0..ba24ed35bd 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 fff8477f64..1d7d1c6a5f 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 c51ce16d0a..95b1ae9fdd 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 4764fbb572..2e425f1d29 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 67c720d0cd..ca52d64d99 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 67c720d0cd..ca52d64d99 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 0000000000..0f079b5cc5
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 0000000000..d695a5cac0
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 bc2c50f369..620245dc60 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 6a12b5c52f..e7d02e98e5 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 f89584d198..d1af59ed33 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 0000000000..a03f80a7eb
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 0000000000..64a5e528d9
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 0000000000..4c5cb5786c
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 0000000000..9ad43eba98
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 0000000000..8e9dadbca3
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 0000000000..eab98d2804
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 0000000000..6e6d282f7e
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 0000000000..3b8c0e6db9
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 0000000000..e6c87e1b3d
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 0000000000..962288bd17
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 0000000000..154f2b6e35
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 0000000000..540b48d887
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 0000000000..b05d3bad9a
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 0000000000..2bd9a7b71b
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 0000000000..c88f4ad73b
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 0000000000..557f83f14a
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 0000000000..317b79b153
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 0000000000..38cd6eb8e3
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 33e92b6150..99179206f9 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 2f7b3f5e51..975285a28a 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 7d62f0abeb..5c88e13f41 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 d4be9b9e80..c2acf77fbc 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 a949144b87..7c08a2623c 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 0000000000..b67f1a1047
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 176f0eaba4..e78c6ec7da 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 2ce0771fe7..d32108ffe0 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 a06b343c94..5f5184bcd1 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 f18f12cf09..1424df5f48 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 1ffea60b3d..ce01369010 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 0000000000..9c277890ad
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 0000000000..8d6940ee24
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 0000000000..fe549c3e2c
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 0000000000..4ad8b9df45
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 0000000000..af23814474
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 0000000000..89fd1859fe
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 0000000000..9c277890ad
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 0000000000..8d6940ee24
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 0000000000..fe549c3e2c
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 0000000000..4ad8b9df45
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 0000000000..af23814474
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 0000000000..8ca3ec2b82
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 0000000000..91fd7ddc36
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 0000000000..a591da4533
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 0000000000..ca9a5d71e1
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 0000000000..9a52e38995
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 0000000000..e647b9672b
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 0000000000..8ca3ec2b82
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 0000000000..91fd7ddc36
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 0000000000..a591da4533
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 0000000000..ca9a5d71e1
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 0000000000..9a52e38995
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 0000000000..15b622aee3
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 0000000000..a548a92f62
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 0000000000..b6a8d817b9
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 0000000000..997873d8c3
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 0000000000..aa4faf95b6
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 0000000000..f6946051c4
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 0000000000..eae880a42f
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 1a4cb341fa..8e81988d4d 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 188092529c..777f2aafaa 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 6b17831c9b..e60055ef8a 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 600826f131..4ab69a6c84 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 ab596c5078..ed3dc504fe 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 2f5ccb4079..6d7f5bd5b7 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 e09e83b5b7..10b71a6a16 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 0000000000..b1f7a46467
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 0000000000..23a515d10d
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 0000000000..fe2f453ef5
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 0000000000..f40dbb9df7
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 0000000000..854b4fc22b
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 dbe8461ec3..36a0a6987d 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 fcdd1e4cae..16ed8e6169 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 6e1d1fd7c2..507f6f6de9 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 41babd567c..742a443509 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 e6eca3a191..704c4b4e2d 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 8c97bc7501..8e9d43c32f 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 f98946c4e9..223299695d 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 0000000000..df54bd55f9
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 0000000000..dafe388c95
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 0000000000..ecf9101aa9
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 0000000000..cd1c9aad39
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 0000000000..1afa3bea2c
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 0000000000..9cebc0e16d
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 0000000000..df54bd55f9
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 0000000000..dafe388c95
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 0000000000..ecf9101aa9
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 0000000000..cd1c9aad39
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 0000000000..1afa3bea2c
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 0000000000..94ad7f2eff
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 0000000000..8321631184
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 9bb83507bf..9efadf3d48 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 582dacccf1..fb23e965fc 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 21fca008db..272a4c3c5b 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 4bfb92f100..51646c9b8e 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 fe6a30a2f6..dd694996d3 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 22c4b10019..4f65906e0a 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 0000000000..16ed8e6169
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 e8478f6e29..81dadb26a4 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 b791aa79c2..d9fdef8357 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 c38451fb38..0b61de8dc1 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 479112d8f5..ff357d5cd5 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 0485073baa..f662c10353 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 439a5e329a..1acb1dd3f0 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 217fd39b9c..8632921373 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 a3c5eafa4b..16324c90c4 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 217fd39b9c..8632921373 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 a3c5eafa4b..16324c90c4 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 e8379a5901..b31de05a28 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 e8379a5901..b31de05a28 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 0000000000..bbcd946b44
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 63a42671d4..f43d48e0da 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 4022a02700..a00ff20a21 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 0000000000..f43d48e0da
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 56b2b61df5..eca18cf112 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 65863772e7..ab4c58d1ca 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 a659ec44c8..64a0c28d0b 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 0000000000..b848946811
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 0000000000..ea952c2182
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 0000000000..9fae54cd11
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 0000000000..8313fda6b3
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 0000000000..89348fab65
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 0000000000..9642bb8072
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 0000000000..ee4dab5d3c
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 0000000000..ac267a252a
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 0000000000..738a7d4a1e
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 0000000000..6a2dcb50e8
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 0000000000..38e815ac58
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 0000000000..8a8c1bdfb8
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 0000000000..7bc13d2ea4
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 0000000000..5bcf17df1c
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 0000000000..f513f6d8c2
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 0000000000..d88a04a16d
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 0000000000..b1e0a11e44
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 0000000000..ffd3de76f0
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 0000000000..1d43aa981c
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 0000000000..1f8e3b0b11
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 0000000000..522105a842
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 0000000000..41d40d2970
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 0000000000..d1f21426b9
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 0000000000..e9a2694266
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 0000000000..c8e70d26cb
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 0000000000..670fd0afe4
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 0000000000..734d2ff0ee
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 0000000000..1569e9a25f
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 0000000000..b2c927026a
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 0000000000..71b21b8132
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 0000000000..c9be4b7d97
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 0000000000..c6c8ea4b30
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 0000000000..a8fe42901e
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 0000000000..478fd88d9a
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 0000000000..80167ff226
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 0000000000..80a66cfcb4
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 0000000000..c8eb4d41f1
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 0000000000..b2a064fe65
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 0000000000..577493d152
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 0000000000..f5ea3f592a
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 0000000000..2d3b220796
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 0000000000..cb73fb9b42
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 0000000000..3e846f6229
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 0000000000..0f85dd55e3
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 0000000000..060fe1343f
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 0000000000..6917503665
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 0000000000..2537d80d57
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 0000000000..f5714b011c
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 0000000000..92722663c9
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 0000000000..a5e90cb633
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 0000000000..4b56a83064
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 0000000000..9b53eed204
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 0000000000..e788760f72
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 0000000000..76e63a86e9
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 0000000000..fd3aaebd20
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 0000000000..606e2e81d6
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 0000000000..eec739e9fc
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 0000000000..6d2500304b
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 0000000000..2819c0f5a4
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 0000000000..c67f17e130
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 0000000000..5a0ad48c26
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 0000000000..45124f3c70
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 0000000000..00a22677ee
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 0000000000..b346b61558
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 0000000000..9fa2d24786
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 0000000000..ffd612a193
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 0000000000..4387658e44
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 0000000000..10749861f2
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 0000000000..86e73768b7
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 0000000000..9ab0c98d84
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 0000000000..d5fdb9a3a7
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 0000000000..4f44652939
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 0000000000..17da6e1c33
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 0000000000..14b322a0d9
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 0000000000..f9b7cb8bef
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 0000000000..a307279650
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 0000000000..4bf700c628
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 0000000000..ad0661cbf0
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 0000000000..cb9105925a
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 0000000000..967eecf0bf
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 0000000000..58c9a78593
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 0000000000..14e8166360
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 0000000000..b400c31a3e
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 0000000000..671d7235bd
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 0000000000..8c6a425663
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 0000000000..a8b2af7235
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 0000000000..ba132cad0f
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 0000000000..080cf51136
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 0000000000..75029fcc0d
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 0000000000..9a03e9c23b
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 0000000000..346119656c
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 0000000000..3d61de41b4
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 0000000000..1048ef5966
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 0000000000..b3364ccfe6
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 0000000000..ca6f7369d9
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 0000000000..adf9f3114e
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 0000000000..73f8e3b6ac
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 0000000000..47daa87211
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 0000000000..58c5f97a44
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 0000000000..d06753b0e2
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 0000000000..6072d77097
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 0000000000..0b250021df
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 0000000000..491be8a684
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 0000000000..ff4749d395
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 0000000000..5cabb438c9
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 0000000000..28758853ed
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 0000000000..298a13fbe6
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 0000000000..412e490d8c
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 0000000000..bdfc9f7ad2
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 0000000000..f68633a993
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 0000000000..7038c11ae2
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 0000000000..e8245f18e4
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 0000000000..96cf350ee3
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 0000000000..9f248dab13
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 0000000000..2008017cde
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 0000000000..2875ffda44
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 0000000000..25f64dc20e
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 0000000000..e4dbaf142c
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 0000000000..18e544431f
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 0000000000..6fcfe2aba0
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 0000000000..38aa863d95
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 0000000000..312ab89a73
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 0000000000..da8216b827
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 0000000000..7bc31e0318
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 0000000000..25e6123843
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 0000000000..7f3b5516b2
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 0000000000..c0f4abf643
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 0000000000..6c14f58aa5
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 0000000000..faf928beaa
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 0000000000..1ccaf76ca6
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 0000000000..607e69c1c4
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 0000000000..2398b1c24e
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 0000000000..3992fec1bd
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 0000000000..f7a1a66347
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 0000000000..f44b39dfed
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 0000000000..32e393d56d
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 0000000000..50958f787b
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 0000000000..6b3731cac8
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 0000000000..511414ad6c
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 0000000000..af95435379
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 0000000000..355bdeb636
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 0000000000..8d0ad7202e
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 0000000000..3c49195f87
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 0000000000..b9b6f95c5c
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 0000000000..3be821a5f7
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 0000000000..cb19d35ab3
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 0000000000..45392c4130
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 0000000000..e5b510d196
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 0000000000..d89b94bd4b
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 689ca9bcb1..3552fb6483 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 34213a8560..6244f5c30e 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 0000000000..d344fc9cc3
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 0c46d05f02..0518592460 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 aece6a65ed..9cd3f7decf 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 5ef810aa4f..c8e1cecd39 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 160f9aa49a..d958ea664a 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 0000000000..c017804a1a
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 0000000000..59764dd649
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 0000000000..158aa52f05
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 0000000000..85d3b01ade
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 0000000000..ca23a54b76
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 6e15ce5e12..1ecd7f42a2 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 867388f570..f554224f08 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 0000000000..d3ac4e1ed6
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 58e443da9b..4ec18abab3 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 bfe5de7575..9e466a8693 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 0000000000..04dfc3bdb2
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 82d8e16dcb..c517566427 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 0000000000..6faa14f55d
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 0000000000..0470d4dd94
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 0000000000..1bf288fcd4
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 b18cd0ffe6..c8b4142b9f 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 8cb59b1cfe..fdbf5f8213 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 0000000000..8d6845de63
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 0000000000..361ee4e1c9
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 0000000000..29b08bf2fa
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 0000000000..7ed0ca9bf9
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 0000000000..56210de91e
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 c8e3213e3a..3feb01c56c 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 0000000000..0803889326
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 0000000000..91fbda2d09
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 0000000000..bba84d3f7e
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 0000000000..e660885f03
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 0000000000..0647aeda56
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 c8711a8ed8..c338676a56 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 e65c572d97..aa9d7f5583 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 0000000000..a5cbcfbdc5
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 0000000000..4224a7ef9f
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 0000000000..eacd24b931
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 a4f68829e3..fb79557200 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 8ffc2dec32..f6abaa814b 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 d85d963098..32f33cd86e 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 6e90927039..44d3601248 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 3f182cd565..43540834eb 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 750b68ce3d..87c38cae8f 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 4f6a24f970..9ab7bfc609 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 0000000000..5c93775783
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 0000000000..eb7e3ae046
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 0000000000..895267d4ff
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 0000000000..7d44e111c8
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 0000000000..f006f3b48c
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 0000000000..41751f211a
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 d210cd27bd..f5ad1fedb9 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 0000000000..50c4c6b272
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 2a81606abe..2c3ab000de 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 20371af4c1..9a00b42569 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 347b023e8a..7ac83f443d 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 217b0b85a6..ff5a7b34e1 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 0000000000..2ce958b920
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 4c00e30840..5e59aee790 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 0000000000..8d428869d4
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 a0ceaf63b2..b8f10e1107 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 0000000000..cd3dc01ab2
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 4419969b64..500cd5e87b 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 33fa625c3e..9b0ebdce02 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 0000000000..f4f58e2e25
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 cee71ce6e8..de7eeba933 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 02343913bc..d7c4af807c 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 0000000000..0fd73782c2
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 9b333f33cb..1f43ea7a63 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 0000000000..6a827186e7
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 0000000000..fb2aec6732
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 0000000000..c9539c948a
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 0000000000..04e60609d7
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 0000000000..28b5101dda
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 bd1efd2c03..b0350d38c6 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 9db343ff89..8899f3c74d 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 0000000000..5aca11a07e
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 2404b7fbcc..61fa796659 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 0000000000..d1006c6c19
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 5025b7400c..e8c2e90a68 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 60cd3b0cac..9eb51ed57a 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 0000000000..5a6759de63
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 0000000000..e3ff113cba
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 2e9f9d3ee9..39495523e8 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 dc48ceca49..fb77ef1609 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 02b6203587..008cee8abe 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 0000000000..1e5e815098
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 4dfe9c6764..b0c9f58bf6 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 0000000000..846307fcf3
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 f2eda12ff4..ac68970f07 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 3b71d1cbcc..30e6d3fe37 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 8cdbde7342..43c77166f1 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 88c10f171e..a937bc515f 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 e845541c39..e87da69029 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 a339cda7c1..6eed7f8dee 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 7b8ab2a2a6..b0d9c86b92 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 4f5fa678ed..e3bc597396 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 929c9acf00..8798dcad2e 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 a5bfde71e8..349f74ec9e 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 fae6961794..042d449677 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 feebfcbc91..09c8f4270c 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 f7e4887e5e..38f8a8b7b8 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 0ae2052175..e37fd3352d 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 4e1f65bce3..be64ba6cb4 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 9cde005dc6..747c4e749d 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 e245e7ca3b..8f37fba493 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 b00ef3dd2d..0346b02b61 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 26dffb21ca..1adf5247d1 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 5538ecfc4d..a72ffb8803 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 6737683440..d45757b9b2 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 2d4dbac5de..ed3c648ec0 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 0000000000..3463ad91ae
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 0000000000..459facc13b
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 0000000000..2e3a1fdd73
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 0000000000..62044fc235
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 aab9230f24..45fead0aa7 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 29bea54ba7..5b948f7f9e 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 26a89d4c62..f863bdeccd 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 63481ad7f1..2fa8de88e4 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 63481ad7f1..2fa8de88e4 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 0000000000..5dbc804e86
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 0000000000..58141c9f3c
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 0000000000..5755dee2a7
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 0000000000..ff15ffb739
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 0000000000..59b4ecf2a0
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 791f156b58..2aaff665b5 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 4773c36533..c1ed53010e 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 0000000000..152e2dda06
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 0000000000..284b2d0472
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 0000000000..b425ddfb6d
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 0000000000..e308fff508
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 0000000000..112a2fe784
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 b6772c2908..0e2e8a3a5c 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 4c3e0ad474..b068dfbd1b 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 9b365bc9ee..7d39caa6c2 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 1790b2d984..7468e6c9e5 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 0000000000..f6cab7b569
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 472d68368b..f01b98df0d 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 96629340ac..d37c8c29ad 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 0000000000..78e69f849d
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 0000000000..ed95128e19
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 0000000000..815a93ef0b
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 0000000000..5ce9296bce
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 b37bdcbc0a..94e0ad2d9d 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 ed3721b009..3a440b182c 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 ed3721b009..3a440b182c 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 8b49e8c79b..311e66694b 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 1a2428acdd..6ce263f4d3 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 9c29da4c2b..9dc8314245 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 df0c2bda52..66cf9f4f26 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 0000000000..caab400018
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 4633286e27..052b639eb1 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 ce75124206..5a5972e5c1 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 0000000000..830578344d
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 9761eb604f..29c7ce1545 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 cf3c95d25f..9c4c6bf4ac 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 6ec15112da..54dd75a62d 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 0000000000..bc5aa6b3ea
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 0000000000..572fa0925f
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 0000000000..203a5bbd82
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 0000000000..303b43c832
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 0000000000..ebfd7ae793
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 0000000000..94d75c809b
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 38c6d635f1..bc5aa6b3ea 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 0000000000..572fa0925f
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 0000000000..203a5bbd82
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 0000000000..303b43c832
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 0000000000..ebfd7ae793
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 0000000000..94d75c809b
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 0000000000..14e7d5fac3
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 0000000000..65700dfe85
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 f6f8d96b0a..eb2677b402 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 0000000000..b90231fb06
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 0000000000..e59ac64180
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 0000000000..2fdae451e2
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 0000000000..32ad4e75a2
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 0000000000..4cf359f1cb
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 64e9b1a8ad..fdef18b25b 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 8bb8f1f08d..22f3c5fdaa 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 4a9eaf10b2..c5b3594de8 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 7fa37d2f2e..c5b3594de8 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 4a9eaf10b2..c5b3594de8 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 d7d5f5cae5..39310919bd 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 0000000000..c58d43b952
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 0000000000..b3681462d7
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 0000000000..119b89edfc
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 0000000000..42faf6bc41
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 0000000000..e203c8963f
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 0000000000..954f548788
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 7456b997f9..1c4e197bff 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 659521774f..d5e6708eea 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 3bc330d343..0eb168ea61 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 4974f0591e..6b2d458933 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 6765bc9c2e..68bca322d7 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 e6ed0d7f81..1b8e878722 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 0000000000..e75dc9ec50
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 0000000000..ca401e5985
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 0000000000..5f6dded80b
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 69f7ebab00..7e765fbcfb 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 278326137b..d59e897e27 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 278326137b..d59e897e27 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 0000000000..bb74e98818
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 663849b859..025abf1c84 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 0000000000..75f2fac760
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 0000000000..d9a2d20fc1
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 338c1af91e..a74712953c 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 0000000000..fd03ab59aa
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 0000000000..3083595254
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 0000000000..16139833d0
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 0000000000..5068892c34
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 0000000000..89741e494e
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 fedc0663c5..27a3303193 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 0000000000..a74712953c
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 0000000000..fd03ab59aa
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 0000000000..3083595254
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 0000000000..16139833d0
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 0000000000..5068892c34
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 0000000000..89741e494e
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 0000000000..98ae3976e0
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 0000000000..aa9745273b
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 0000000000..bd3942ca18
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 0000000000..7c2ccd98ec
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 0000000000..dfaf405a70
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 0000000000..66d259efd5
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 9619001a8e..49b5bf08db 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 0000000000..53a46ea33e
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 7a9127c0c6..2f39ef63ce 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 7a9127c0c6..2f39ef63ce 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 aa378e2eff..4adf8e293b 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 ece63e22c3..edb06257fa 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 f0ba4e64e6..0823504686 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 0000000000..193a775633
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 0000000000..885a9c6626
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 b09ceba9cd..35a8a15908 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 05200a51d2..d63da0d30e 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 45e321424c..0734212ff9 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 54b53a5c33..a4c9da7c46 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 9783daa586..6e9c8aab0a 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 423f00b986..6c8874a67d 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 3b90fadb52..b48c505d6f 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 0000000000..1dfbe295e6
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 0000000000..775250def1
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 0000000000..5720c58ea9
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 0000000000..8d74699a83
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 0000000000..adf7d3113f
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 0000000000..31a2d833c5
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 0000000000..b5b81f4588
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 0000000000..4996f778cf
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 0000000000..5a1ef459f8
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 0000000000..9cc66bc521
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 0000000000..8a9c369fa8
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 0000000000..658432d235
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 72d61a02ca..7ee823b9cd 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 2275b389b5..6b9a2c568e 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 322f6fa9e4..5098345a94 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 93c30af777..40ef01ffa3 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 78c21bc2e4..d4471ec510 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 7b6aa73386..b0efa779e2 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 5511bdef4f..1247d33960 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 0000000000..0dfeae01e9
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 0000000000..af9bd4d5e7
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 c354abcc27..2b1caf8555 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 1232ef7472..3a8176a7d8 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 8ea38312a2..fcb103c591 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 66b49ecb01..20e874c197 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 6cf9e20f12..f8e12ed290 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 2229996f55..79b4318f74 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 220a435281..467fb406c2 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 0000000000..91493ade75
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 0000000000..3697a723dd
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 d8c1b55be0..e37ee62f71 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 f4caccc8ac..205adf784f 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 0000000000..801a577654
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 8dcd815623..43f0bdeda9 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 0000000000..4e327ec473
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 0000000000..5905d065ba
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 0000000000..702ea34a5a
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 0000000000..1f0a3822d0
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 0000000000..4a499131f2
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 02b6203587..008cee8abe 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 0000000000..43f0bdeda9
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 0000000000..4e327ec473
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 0000000000..5905d065ba
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 0000000000..702ea34a5a
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 0000000000..1f0a3822d0
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 0000000000..4a499131f2
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 0000000000..49fdc5dc4b
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 0000000000..a36dab29fc
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 0000000000..59039d11aa
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 0000000000..9719185cd4
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 0000000000..07bdd9eff2
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 0000000000..73d3215040
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 0000000000..9f0f2bd41b
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 90ae4518f9..f1b4bc8cba 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 0000000000..6cfb5b5aa2
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 9db6f478ad..2b18d266e4 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 0000000000..0c5cd81fb8
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 0000000000..a5d70fd217
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 0000000000..690825a07c
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 0000000000..2bc62f9d2d
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 0000000000..82c12f0b8f
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 0000000000..eabbf1630c
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 0000000000..a68b1e6b58
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 bd36a5c245..ff0c2707b6 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 0000000000..60e15e3ae3
Binary files /dev/null and b/public/images/emoji/emoji_one/breast_feeding.png differ
diff --git a/public/images/emoji/emoji_one/breast_feeding/2.png b/public/images/emoji/emoji_one/breast_feeding/2.png
new file mode 100644
index 0000000000..65df960b70
Binary files /dev/null and b/public/images/emoji/emoji_one/breast_feeding/2.png differ
diff --git a/public/images/emoji/emoji_one/breast_feeding/3.png b/public/images/emoji/emoji_one/breast_feeding/3.png
new file mode 100644
index 0000000000..20ecfe2978
Binary files /dev/null and b/public/images/emoji/emoji_one/breast_feeding/3.png differ
diff --git a/public/images/emoji/emoji_one/breast_feeding/4.png b/public/images/emoji/emoji_one/breast_feeding/4.png
new file mode 100644
index 0000000000..b2341d8aae
Binary files /dev/null and b/public/images/emoji/emoji_one/breast_feeding/4.png differ
diff --git a/public/images/emoji/emoji_one/breast_feeding/5.png b/public/images/emoji/emoji_one/breast_feeding/5.png
new file mode 100644
index 0000000000..8e3a8eb70f
Binary files /dev/null and b/public/images/emoji/emoji_one/breast_feeding/5.png differ
diff --git a/public/images/emoji/emoji_one/breast_feeding/6.png b/public/images/emoji/emoji_one/breast_feeding/6.png
new file mode 100644
index 0000000000..842d627356
Binary files /dev/null and b/public/images/emoji/emoji_one/breast_feeding/6.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 246ac4b24d..05ca64cd91 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 0000000000..f345807c51
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 0000000000..fd9cffe983
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 0000000000..17a8e36f7f
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 0000000000..e3fbb25250
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 0000000000..f5c03d37da
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 183efc4617..bab0bb4780 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 cde66eb176..8510cab5ab 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 0000000000..e3d2479344
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 0000000000..9f758979a1
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 0000000000..bfb8d83b42
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 b86a109203..9d80b52e74 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 0000000000..647e1c4d79
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 9aed304bd7..d9f94526c0 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 04e7fd40b9..c4959500a2 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 7e525a98e6..da52ae9ee1 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 0000000000..5185700c63
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 50839c8885..c66e0187d4 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 84b9f4b5ae..5e396be2e9 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 0000000000..c519f8a954
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 0df4f82ee6..f001a0822e 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 0000000000..83e731cc34
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 203f3f7272..d04ab7c29b 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 0000000000..b880f689b9
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 0000000000..20ca989182
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 0000000000..4c3c6694bf
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 0000000000..cc1ec83794
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 0000000000..f76955c717
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 0000000000..c129851655
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 b5538e2388..5efc8a231a 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 cfed8745c7..3f0e81003c 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 4f979d6fb1..f102392d6f 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 0000000000..d682eccad2
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 cba39e8803..61e29ef77a 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 88af15a2ec..229e0c6bc3 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 a1aea777c1..1ad7d67ba6 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 50fb5e044a..fd91b82bf9 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 0000000000..7ca5d78d4b
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 0000000000..bb3cc68419
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 0000000000..1b8f8eb16e
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 0000000000..14aa1d58b8
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 0000000000..1713274126
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 0000000000..e8ae0d27a4
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 dbb364fe44..79fbd2f543 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 0000000000..0a7ca06fb4
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 4ab20d9388..09915760d7 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 af9265c042..09ad5e96b5 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 0000000000..f686f2bdab
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 5c710b453a..f686f2bdab 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 0000000000..b9aaf46348
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 891bd2698e..9977ca19a5 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 0000000000..82664ad79e
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 0000000000..68ccf48d0d
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 855b10badc..c68e5058e6 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 5c48fa71c6..be40928c9d 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 ec682ae01a..7be1ecb657 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 0000000000..a477d8e27b
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 0000000000..437db96700
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 0000000000..1252c37a6d
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 5ae2834d9d..ebc5f362a5 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 3c76b4e651..5b4b0a5524 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 0000000000..5755dee2a7
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 81b62f6e67..254f20b7d8 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 81b62f6e67..254f20b7d8 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 b27e65f586..af241fc9cb 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 ff648549da..c857789b1f 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 0000000000..7780a4a036
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 3da532f7d1..bd6e669387 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 0000000000..ec8c09e41b
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 498bfa6fae..04ecf8c614 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 6e6363fbcf..dc0248526c 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 0000000000..70d8309d8c
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 3ae8de5224..9998df8682 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 0000000000..a344cb3ae8
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 0000000000..e0da30d5a6
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 0000000000..26b77c821c
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 84a5b14b1c..81f9b3d8a4 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 d8c1b55be0..e37ee62f71 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 c7abdcbc67..164dbcf05b 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 0f9b1965ec..049a95df05 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 3fae333e48..dfb26da847 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 2ba752f4b2..0b7f1e3543 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 c89acf9781..b3db512c84 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 c89acf9781..b3db512c84 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 bce5138952..e74e3a834b 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 4a18b19e29..fc1e7305d7 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 78bffdfbd5..da815b4bf7 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 3052377b21..2e5a0a1382 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 0000000000..6e2e876a6b
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 0000000000..6b35a5dc9c
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 0000000000..6165ba3398
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 0000000000..e7d334c1af
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 0000000000..3a570cee8a
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 0000000000..fbdd6a03e6
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 0db76a946f..94f5555d62 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 0000000000..740d09658e
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 db1a586381..83541f8f50 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 33535f2492..e6e14fedb8 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 0000000000..5b80933a3a
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 0000000000..6958b7d8d8
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 5936c300cc..e47382cde1 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 3996ff2d28..69bb81241e 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 08749700b9..ee0d70cd10 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 4c7a8fce61..df580e6bfb 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 9a9a76dc8d..06856e88d0 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 ecc63698e3..10343e0e94 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 ecc63698e3..06856e88d0 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 61f1a18cb7..ec7be994db 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 abfaf51f5f..d575aaceac 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 0000000000..936950023c
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 dd66c9ab87..96d49511f5 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 0000000000..38b6a707d7
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 0000000000..a3568f864f
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 0000000000..ca1a86bae2
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 0000000000..407f2f65e7
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 0000000000..703f211b1e
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 90348932d1..4b2b43d6d7 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 2965ac80fc..540c343c9d 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 0000000000..f7ee23f8ce
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 0dd1ff2ef3..534db369dd 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 0000000000..7943b73f67
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 e1a5531042..15b97354c5 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 6735c04a59..787c7bfc7c 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 c019fa3cd9..7addbfa73b 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 ad639f3b3d..dd750e85df 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 655aa05688..d5da447a63 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 6dd92a154d..e124643d70 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 f545ca3d00..8952f44d84 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 0f54590228..f6a69c113e 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 6dba3ac2e6..910024fee3 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 c7b08011fe..5b00062b80 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 d82f4229e7..80a8c47324 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 9b47690bfa..3dbc1cdbc7 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 a83cc6d86d..33dae81b4e 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 e650187f78..0b7d465a06 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 7287779813..b3729f7bd1 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 f4288d1f30..9eed97c405 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 7ec8e7e3f5..b3b11891c7 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 6f829530ad..b8f3b22e41 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 a2cf720f67..672ab0f474 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 a8a837f204..831bc14e2f 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 0e5958ad91..1ecb9f0c3a 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 6eb7c30db8..af89853cc1 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 b3855f9355..8ff34af1d4 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 7576949ea9..ae764864b8 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 349b690ba4..054f46c66c 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 5968b4061a..e70316f85a 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 5660240d38..a3ce42143a 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 c787fd1b96..539178e19a 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 18e1e957e0..e0ef092594 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 67f8e149b2..35d0748bf3 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 779086b8b9..47bbb94471 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 0e298cef1c..472220b7d2 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 14169e5840..53591a435e 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 67f8e149b2..35d0748bf3 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 0000000000..05610e8e13
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 779086b8b9..47bbb94471 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 0e298cef1c..472220b7d2 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 14169e5840..53591a435e 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 0000000000..01736e45a4
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 c2b47ae363..463921bc04 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 ae5a76a905..67efed2e4d 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 0000000000..dd93e9fbe5
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 873935fc70..ddca7935a9 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 0000000000..332601f31e
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 0000000000..c9025e34e4
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 412ac4f1a4..20f649ba98 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 ed2c50e400..fc5176ef91 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 5d3f29649b..81b918de6e 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 0000000000..680f77b22d
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 44dd1ebadb..46b4ea26a5 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 0000000000..e765f50715
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 4c8ed99f3a..936950023c 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 eef460f09d..db79ece5c0 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 0000000000..0e9dfa8326
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 3f7a17ff24..121ccd03fb 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 7e3919d9fd..b4d759476f 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 22df3a3acb..63e6e013db 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 0000000000..2eef1d6c17
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 0000000000..a34af9d64a
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 48fed26876..bd47ca5a8d 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 f434054950..458d27ec98 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 04e7fd40b9..c4959500a2 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 12907a7f20..f3550fb038 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 0000000000..6bc1aabe02
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 0000000000..f24e0421aa
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 0000000000..fb6d38e646
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 0000000000..9d9c7c04e9
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 0000000000..9401983b70
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 0000000000..f3550fb038
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 0000000000..6bc1aabe02
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 0000000000..f24e0421aa
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 0000000000..fb6d38e646
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 0000000000..9d9c7c04e9
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 0000000000..9401983b70
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 0000000000..47199f11ff
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 0000000000..2c0501f240
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 0000000000..dd2eff582d
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 0000000000..92ad84d196
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 0000000000..7324735095
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 0000000000..b6600c7373
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 db240f2ffa..12b5baee1c 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 6e6f3b2c30..26acc4ddeb 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 0000000000..d1e4afbaca
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 7408d800af..5ddfd7e8b0 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 704c014b61..7cce3caf21 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 ef6a59839e..ad6742c9c0 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 0000000000..a1373eaf8f
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 0000000000..167a0412b0
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 0000000000..4292f33eef
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 0000000000..49e49d38dd
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 0000000000..772e55693f
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 661cfb561f..8677728da0 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 c3c62aa936..834f8ef32a 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 0000000000..e6c16e4ea0
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 0000000000..c8e9c1eace
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 d4dd9c23ac..77fa05b62f 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 d4dd9c23ac..77fa05b62f 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 ac363157b8..bd1907dfa0 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 c6d056f2cb..50d8998355 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 0000000000..4b69d0f920
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 0000000000..50d8998355
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 0000000000..e7c428cf4c
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 03c9d7f01f..d10715713c 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 0000000000..ad67a6194b
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 0000000000..d10715713c
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 0000000000..86772728e7
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 7dc8742ee7..fd27cfec33 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 50026527f3..edb47a9bed 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 0000000000..c8bfd71aa2
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 d74c9ad5e9..86dec29115 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 25d67f1d76..73a729d987 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 0000000000..8098a0f910
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 6a38cf4ded..0bc2ca1a98 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 cdfede5523..d793f37d46 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 6deddbed42..8195229642 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 0000000000..293f5d891d
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 6deddbed42..293f5d891d 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 0000000000..6cc9a0e748
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 890b923fd9..4b5918bf7d 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 0000000000..b0dcb10620
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 5a331bcf4c..0191708504 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 0000000000..dc7d90c370
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 0000000000..473b7ba4fe
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 0000000000..7567205d6a
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 0000000000..250c150960
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 0000000000..1961892b4c
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 0000000000..698b0e3ec3
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 8d51da084f..8273115c53 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 2daa31e6aa..0ca28205c2 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 834f299e4a..752da09257 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 c77f1c88dd..8a05089fbb 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 eb77950256..93bc582ff7 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 e54ecd362d..827b464f30 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 c77ac9beb0..9a1e2b08d6 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 0000000000..4436dee31e
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 0000000000..5952da12b9
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 0000000000..b4188d416c
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 f321924663..34b77b6253 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 0000000000..e29bde1f8b
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 0000000000..22bf4336c9
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 8039f2391a..c5dd4656b5 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 af7706bb99..fad42cbf2f 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 16202871f6..93507d20ed 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 8f126c9e95..ec2502a833 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 8f24502438..0fffe6df28 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 0000000000..8412c03d81
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 54c33c736b..13384277ab 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 0000000000..7f80f4ed57
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 0000000000..88558e4ab2
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 a8d18788de..b42219a371 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 a8d18788de..b42219a371 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 efd320be45..74616bab2b 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 0000000000..196ebd7966
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 0000000000..05d15b2959
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 0000000000..81fcac87f6
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 0000000000..ec9bff7a8a
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 0000000000..4848587a5f
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 e454b080d9..023ea9ec4c 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 0000000000..bc3f24c692
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 0000000000..023ea9ec4c
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 9b323d87e3..89eaa5eef3 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 2e25e2fd32..7eb1ae31c2 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 8cba63590e..0106aecb9a 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 3ffc59ef74..b591bb1a1d 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 fdaa9b096e..84fd15a36a 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 352b049a12..746bf11011 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 01a76dc116..3211a6dadc 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 0000000000..c43fbfb646
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 0000000000..821499e02c
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 ac053b9871..14b45496c4 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 0000000000..64245d87a2
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 46775f0e72..64245d87a2 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 a5917353fa..69d58e5a49 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 31cd39ce48..066667053a 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 2ef52b8ba0..ecae3d3f68 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 2ef52b8ba0..ecae3d3f68 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 bf83a30e5b..3ca415aae8 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 25358c7aef..474655ee65 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 0000000000..881e01a927
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 24e36a2796..a75e90c776 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 05477a893c..e3ee8bda8a 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 ff648549da..c857789b1f 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 9f4659ab6e..126252c1d1 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 5cdc098eb5..7349653ee3 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 0000000000..606fe6a1ee
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 618dfb9217..0779babfde 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 89e114201e..2675fc29ca 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 e4cc3aec45..e7c6582e74 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 c564febe61..c212aac1ec 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 8745e99350..8dda7e3d65 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 74f10783df..0daf014af2 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 0000000000..588ece3f43
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 0000000000..de48ff449c
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 f5a63643c6..084f2a654c 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 37b536aaef..eaff9c506b 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 eac6ec7d91..46bdbfdeb6 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 f610107f2a..59c55b0bd5 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 f610107f2a..59c55b0bd5 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 60753f3e9a..d05022d5ef 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 913bb85498..08ce4861fe 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 995cac971e..95069435fc 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 c6a571f40c..34d6b82a00 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 0000000000..d8ad735662
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 c08ee9fd8f..4f1443e136 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 0000000000..8cebdb4bc9
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 0000000000..04343bb0b2
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 0000000000..95d1d4c4e9
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 c42208fb1b..ea73336a8b 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 3b3ed0f40a..4255a4cbb1 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 0000000000..c8593205d9
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 115da78b0c..e4daa860eb 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 0000000000..928c3543a7
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 0000000000..db1584488f
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 0000000000..0582c2c236
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 0000000000..f71be88d0d
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 0000000000..e611b2e06e
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 5b0b200126..e82d202d01 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 07b1e95ace..255bddd87a 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 a662f8e110..40d5066056 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 d77a49b159..1abeead56a 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 0000000000..cf86fbaad6
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 adcef9a38b..56cadcd3ca 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 5d41a51ff1..0fc6bf8252 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 0000000000..bbbdefa653
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 3b8024f65c..d3a308a101 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 947ca7e678..2a33e69064 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 69f18179de..ce972bc880 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 0000000000..0f24a98369
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 b3e3020ff2..5447da725a 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 f2b3cea300..f8d7834b5f 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 0000000000..b7e9ede465
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 0000000000..c5eb705be1
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 0000000000..89fc04491c
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 0000000000..e95e3b03ea
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 0000000000..68b6c22551
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 0000000000..244c6b574b
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 3b3ed0f40a..4255a4cbb1 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 465c3b91f9..fa3986d0bc 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 43dd7cbed9..4255a4cbb1 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 9e9d1b3de8..f45188bcef 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 0000000000..38e992318c
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 0000000000..630fd66415
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 061ea15563..e0da30d5a6 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 0000000000..2553a5dbf7
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 0000000000..d0d78350cd
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 0000000000..938b488ddb
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 e2480ca61f..aa70460bc0 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 b2e7025ebb..eb8bb4ba69 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 5330b6d6b3..bfc879f121 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 48663ea664..d72bf9fbd8 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 b0bf7bf1d5..110392ee59 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 0000000000..9945d0b0f5
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 cb83c412bb..acb8900446 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 a186aa22b3..efd4b32080 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 bc19aae644..ab0d01d3c4 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 ccda3cbae5..b5dc2d0f25 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 0000000000..60b8fb4bab
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 0000000000..9848625592
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 0511af60db..36cfc0d6e6 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 0000000000..a28a9dd741
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 0000000000..1cdbcf410f
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 1eec27738b..e6fa5b3d7b 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 0000000000..af49373833
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 9722ff8212..9ba627bbaf 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 0000000000..488aec1d2b
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 0000000000..42f2b3cbdf
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 0000000000..8171539a60
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 0000000000..c8aa4ef7a6
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 0000000000..048cb8c26c
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 0000000000..13a376407e
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 bafeb15b5a..1884b51575 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 0000000000..555344dd2b
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 0000000000..38c49baead
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 0000000000..bd64845e16
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 0000000000..ffd07f760b
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 0000000000..73e4fe3352
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 0000000000..40cc6731e3
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 0000000000..d97a84cea1
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 dbaf57be55..41c3790cb3 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 0000000000..de58298e2b
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 0000000000..8c23cb623c
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 0000000000..8d5b32dc80
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 0000000000..d3cb82a6db
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 0000000000..1622bdc524
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 0000000000..807256a6a4
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 0000000000..1528b583fc
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 0000000000..33a00c62c1
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 0000000000..9c7883366c
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 0000000000..40ae2584f4
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 0000000000..b275d7879f
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 0000000000..2e166c5677
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 0000000000..ddc50a0f01
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 20a12bd474..ddc50a0f01 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 a4f7aedfba..f51fe0fb85 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 98d8369b46..de58298e2b 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 0000000000..b973ad0a81
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 9782696d3f..b973ad0a81 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 63241ed293..1528b583fc 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 66e4655754..33a00c62c1 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 8aa48695b2..9c7883366c 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 4a74aa4fa4..40ae2584f4 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 3cafa6ff23..b275d7879f 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 0000000000..88436d821c
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 0000000000..c9c8b46280
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 0000000000..4bd576975a
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 0000000000..413121663b
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 0000000000..8f030ada0a
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 0000000000..e251dfbb51
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 0000000000..6e8eb012af
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 0000000000..630af52ac5
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 0000000000..618e396fa2
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 0000000000..972f7de7ed
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 262f91352b..e251dfbb51 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 24538c1e8b..6e8eb012af 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 02f36a1b8c..630af52ac5 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 4933fae6aa..618e396fa2 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 ba7831255f..972f7de7ed 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 0000000000..5da7953f8d
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 609101345f..e48e4788e4 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 92bf531eba..d5df584abf 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 a21f8017ec..bef07aa0ce 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 a507977217..b9e97e1372 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 4082dca277..e7c428cf4c 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 28969d81b3..86772728e7 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 0000000000..7c2824abf4
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 c5fa20581e..8e5a93b12b 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 9a812d3502..7e00184504 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 c4d6114d74..6c3e81209e 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 0000000000..df504caef6
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 506ed1a8be..3f266593a8 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 111ce937dd..c1cf07e9ec 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 80c7fabde4..cb964646af 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 e18aae6b5c..1ab19e3f1e 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 0000000000..cb964646af
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 0000000000..5eda4bb864
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 408096fbe6..94c4195121 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 5d1f91bc5a..84717fc41c 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 bdeb2c3aeb..fb172c643d 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 161f42ea86..9c89ce8dd4 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 7080be25c0..59405c9778 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 739efb0cf3..9af0c2e252 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 f075821871..e8456d6701 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 2b613d70f3..42b01c8ac5 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 b26c74acaf..49726efcf3 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 0000000000..9bf22d7237
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 0000000000..32064fbc16
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 0000000000..dc9642f7d7
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 0000000000..351ad23d85
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 0000000000..4aa443d262
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 0000000000..3442d90674
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 0000000000..4751c12a20
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 0000000000..1590412783
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 0000000000..84f985a5a5
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 0000000000..11d9b52ccb
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 0000000000..70c5114eea
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 0000000000..7846f9aa08
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 0000000000..068c6b74e1
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 0000000000..73a55f81a0
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 0000000000..f1339d60f5
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 0000000000..2dc89ccd7e
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 0000000000..db57af813f
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 a4ccd7fd73..bd463d2edc 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 e6071f3ee0..193a775633 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 ae5a76a905..67efed2e4d 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 352b049a12..746bf11011 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 061ea15563..e0da30d5a6 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 20938a3ab7..7943b73f67 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 abdb6c455f..ad2a6622e4 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 2ed2a1067f..13bbb1b1f8 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 2e6ceab8f3..cca79ffb9d 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 fe1d26475a..82486f8812 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 62b6b21d67..3ecaefd941 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 748e2b413d..450853eca4 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 a4b7a4848a..b2c3a85f49 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 f79f69ab56..ed38c48b26 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 408096fbe6..94c4195121 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 ebbe7d320b..2e28446d3b 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 edf3a73da2..fbbe63e7c1 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 0000000000..fbbe63e7c1
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 0000000000..9a00b42569
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 0000000000..7ac83f443d
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 a82cdadca5..931c538fd7 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 b1641a1e9b..d1df637b70 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 8c0e195481..17a0a7244b 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 0000000000..d64c528e55
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 51c905064c..4bf4099311 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 07a75af19c..7be30dae0b 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 ee6f77931b..27bf1b7017 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 8bc7f5f4bc..b9e97e1372 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 7be5c72735..84147a4276 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 0f3b9a60e0..c52a0f2d3c 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 0f3b9a60e0..c52a0f2d3c 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 0000000000..728c4d4431
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 8841743685..589a355b8c 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 0000000000..e998352785
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 15f5cf1977..cfc57d4a98 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 a844b27c63..d21675748b 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 0000000000..aebd2e03cc
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 20938a3ab7..7943b73f67 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 fe6c307f16..6515739454 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 fe6c307f16..6515739454 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 0000000000..6515739454
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 00430a8a2b..870241a3ef 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 0000000000..b67d58af24
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 0000000000..8e67281736
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 0000000000..ecc9bec0fa
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 0000000000..12203aca79
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 52b3e4aec9..f9c603ac91 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 e35818b6f1..28f8d4d40e 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 7c5ce7da53..838fa4c925 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 46f93f120e..81aab04959 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 72453581da..968de324b5 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 0000000000..968de324b5
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 0000000000..885eded8fd
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 0000000000..ea31fa278d
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 0000000000..4db889b850
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 0000000000..b3e7fb57a6
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 0000000000..cfb35662e4
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 0000000000..ae75f23099
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 0000000000..15945278a4
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 0000000000..45d4fbfa64
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 0000000000..a162630c94
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 0000000000..ee475d8400
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 0000000000..97c21442ba
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 0000000000..2c5a39db98
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 0000000000..1bc73629bb
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 0000000000..6d4d00f77c
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 0000000000..37bc135b96
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 0000000000..2b3abdbf9a
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 0000000000..12c2de3a50
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 0000000000..d3a0b3f62a
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 3f7ab4f5df..ac74fe39fc 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 c9e143fe20..2ced93987c 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 e212e22061..e26dea3338 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 c531e105cb..e158fa9f83 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 0000000000..6563b2a69f
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 0000000000..707ca2a121
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 ebed25d858..5ec1253f91 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 abdb6c455f..ad2a6622e4 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 448c2fc1f4..0e99369e67 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 1b6d7e287b..c84dd6ba60 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 1b266e1022..65981bf643 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 0000000000..c0f55e5fca
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 0000000000..673f81ef6f
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 0000000000..f1b8829dba
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 c6c0db2412..64ae09af79 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 0000000000..cbe9f11a12
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 2bb9d85194..32218e0afb 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 14c068a509..34d2e066d3 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 0000000000..0a28664013
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 fef52ba6dd..28dd184909 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 0000000000..6862a669fe
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 0000000000..18e997e465
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 0000000000..be6c1bf1d3
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 0000000000..eb885b9f86
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 0000000000..7d2abdfb58
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 f499edb031..8eccd7d922 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 0000000000..ddf2bd80e3
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 0000000000..bdf8e211e4
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 e21c43fa4d..310c2153fc 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 3cd5d80fc2..be4f3d7fe3 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 a5e8fa7a32..be4ac637d3 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 0000000000..6a7e379bd1
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 0000000000..44146d6084
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 0000000000..320b0f2f4b
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 0000000000..ef6ab47d3d
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 0000000000..d9bf32f398
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 0000000000..be4ac637d3
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 0000000000..6a7e379bd1
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 0000000000..44146d6084
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 0000000000..320b0f2f4b
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 0000000000..ef6ab47d3d
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 0000000000..d9bf32f398
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 0000000000..5490d5a7e6
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 0000000000..ba94d0759f
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 d1e78babe8..2ec3cbecff 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 0000000000..cbbfc13132
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 0000000000..4d0c325f09
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 0000000000..287a4d0de1
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 0000000000..8cda00960c
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 0000000000..00a5201716
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 2d0c2db48a..e5d14b1e76 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 0000000000..c274ffb629
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 611bdb4c35..829baf00e1 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 18600cfea7..6fa21a7b8f 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 b284be0ecb..9a238d53d1 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 0000000000..e2dfc7bd75
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 0000000000..31c8707a43
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 0000000000..87f17a6ff2
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 5a41233c33..6ff1f6ed0f 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 028696f6f4..06dc8ad2b0 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 6ca43ef379..afb9111ea3 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 94fd2b15f6..43bb5ccf9e 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 1a53e3f9d1..1725222a1a 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 0000000000..c9c437901d
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 0000000000..d291c89c97
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 07f3a2df15..599615fd99 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 0000000000..55702df544
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 0000000000..c25292e69c
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 0000000000..709591a792
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 0000000000..385c38d04e
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 0000000000..c583999ddd
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 0000000000..eac3b57f1f
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 0000000000..2fa6d6b994
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 0000000000..923676cb5e
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 0000000000..df3c993ef4
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 0000000000..e469588248
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 0000000000..1fb44a6038
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 0000000000..b7e7259bc8
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 0000000000..f92e78a324
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 0000000000..dd1482188c
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 0000000000..c2ab6fb507
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 635ac4a51a..32caa78182 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 df8666a30d..68808dde54 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 0000000000..2ceb411ad2
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 a1795fd84d..01ed8634e7 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 0000000000..6a06636b26
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 0000000000..2bbc47bb7e
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 0000000000..030b4145fa
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 0000000000..77587c4962
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 0000000000..021541666d
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 0000000000..d4c6fc5364
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 0000000000..5f03fe9d20
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 0000000000..9adb849bdd
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 0000000000..9e4b455927
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 0000000000..bcd905bfd1
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 0000000000..c690b0464c
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 0000000000..01ed8634e7
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 0000000000..6a06636b26
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 0000000000..2bbc47bb7e
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 0000000000..030b4145fa
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 0000000000..77587c4962
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 0000000000..021541666d
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 0000000000..53d2160f9a
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 1b2f36dc46..ddc1965fe9 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 c8111b161b..ce8c46a4a3 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 3e1b21d511..3b33cd88c2 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 3ff769bdf2..9de9731f57 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 3e1b21d511..3b33cd88c2 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 decbed4977..c3d165cf8b 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 0000000000..9e968721c4
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 0000000000..8484849fec
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 0000000000..4469d89931
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 0000000000..aa00db9402
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 0000000000..a79f3fc150
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 0000000000..d0135a6614
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 77d0794e0d..dfdad1339b 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 0000000000..373f6150be
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 0000000000..413cdd2b96
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 0000000000..c44bd59f71
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 0000000000..87ef3aa7ad
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 0000000000..387d9c89c9
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 29beb14ba0..381b0b8405 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 0000000000..d34d0f4c69
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 77eb5b9fd2..123281b9b3 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 1efc8cc6e3..94c889f16d 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 11c1102864..a59753442f 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 3ae52a2687..4f15aa8a72 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 0511af60db..36cfc0d6e6 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 faf1c61645..dbf11c83fa 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 33052b750a..459a96d229 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 0000000000..1b5bf7b178
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 298ba2d392..53a08bf577 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 e1b090838c..e581142686 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 1681e8f7ef..9b71feda22 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 dd2da26f55..fccd6c6f94 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 ed355e41e3..31e788d272 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 9d45b6d48d..eff8409bb4 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 a2ed3c5006..2dd1271617 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 05940e09a9..1519f67e30 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 bdfd6ffe61..b38daec29b 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 01f7f53e91..a14bba2824 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 ed216482d3..aa7de5034c 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 0000000000..9b71feda22
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 1681e8f7ef..9b71feda22 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 67b932ea11..d04c71a793 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 19f7c3c88a..949ec240a0 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 8e01b05163..9d9d3434a3 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 0000000000..3b32a704b9
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 12bd8af3a2..bd31b31f16 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 69fb69aecd..baaa54a80b 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 69fb69aecd..baaa54a80b 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 187cfbb298..10ac21d846 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 089b713af4..8a4c0e5f77 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 22a0f0f570..1d05b5c0fc 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 ff6e4175e5..a926e113f1 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 0000000000..424f71da6d
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 c823244d3e..9320913930 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 6c4295d8c7..b5f436ced5 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 5b71e139cc..30bd5e1745 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 0000000000..d0aff11833
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 e50fde0b32..4b6e695e66 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 0000000000..d5e6708eea
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 0000000000..9db8cbc102
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 6492b7b276..a9838e4441 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 e56f8bf7e2..0c1d8d0ae4 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 0000000000..dbceeeb2e3
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 0000000000..96fd5fd7f1
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 0000000000..e26e0a19bb
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 0000000000..8fd2d6b63e
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 0000000000..991f19cf86
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 fbcc8810fb..813a088171 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 8c8be9c674..5abbee3d83 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 acc504504f..e6f6a70287 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 8c8be9c674..5abbee3d83 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 e55ac62225..7a052e9728 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 ef0695d8fb..472a0dd571 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 67fe759184..20d105539b 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 0b195a642a..334b2c251a 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 aab3e65d5e..887377556b 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 46775f0e72..64245d87a2 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 5b71e139cc..30bd5e1745 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 367277f894..ed95efeae6 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 0000000000..30bd5e1745
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 943cbd58ec..13f6c1cea0 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 943cbd58ec..13f6c1cea0 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 0000000000..13f6c1cea0
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 0000000000..98963a97c9
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 f0034c2ddc..88297a79bf 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 590cd7f69d..a12bb8782a 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 0000000000..9320913930
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 5bab861e1c..f813abd7d5 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 682e7ce18e..bbeeff15dd 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 0000000000..399f5a4e85
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 85dee4fadb..035277e583 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 6e90af6800..2f8a6f9e8d 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 f529737a21..5bbe29f84c 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 898808bc3f..e9b1a9abe3 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 accf3e3ae1..a2b5133b2e 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 0000000000..b95563b787
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 0000000000..09e63e6b9f
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 de5ae41170..97f8256ad4 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 0000000000..4e2ffc47e9
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 0000000000..5796ae4861
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 0000000000..b61d746b06
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 0000000000..5da96c0d6f
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 0000000000..9e580ed02e
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 804be347dc..3cbfd6d588 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 1ce2f42488..d563bf8990 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 0374985514..b4f029ab5d 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 260c82fc13..075eea2619 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 0000000000..e30df4c1f5
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 0000000000..cccd140ba3
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 0000000000..b97ecbcbd4
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 31cd39ce48..066667053a 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 0000000000..7829f538f8
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 0000000000..f7bc67925d
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 2ed2a1067f..13bbb1b1f8 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 e94bc65ef7..1f0bf5eb2c 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 59db13956e..47fbb60f0f 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 0000000000..dc2c807511
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 3e0a4c2581..706d08d455 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 89f4f2eed0..ac6b09669f 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 7062e78b78..32736b148a 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 3a5b085202..3126247491 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 69afa71ae2..93a833ac49 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 0000000000..adfdbc3c1a
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 0000000000..43a2f9139f
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 bd03f96452..38bf2a6cfa 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 d39094fb84..a6e2f9d5df 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 00f771132c..39bb07cf97 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 2e6ceab8f3..cca79ffb9d 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 ff82545117..27da72c477 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 0000000000..731858e2cf
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 0000000000..cc55fd6981
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 0f70b45319..f7e6219c1c 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 f74bb1ba0d..de500e1053 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 567abcdc67..8797ad5ac2 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 8ed4edab8f..62044fc235 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 0000000000..c700426ad4
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 0000000000..517c1e0de1
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 8c484aa033..582c64bf2d 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 0000000000..138fd3f2b5
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 c9f34379c7..c5898960ef 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 8d8a6a6281..4b13317053 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 7748ac1c6a..8dcdffd9c5 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 281cd063c4..4e6074694f 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 5f96a71da8..074e0660f2 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 d953846be6..3cd89c91ab 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 0000000000..d19965a3ac
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 0a362fcf91..424f71da6d 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 468c0bbb59..3ec0ddb043 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 0f9165d56e..e1866311ab 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 0000000000..efea0b70bd
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 fe1d26475a..82486f8812 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 0000000000..32b00e4806
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 0000000000..6ecfc717c9
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 22ffb4e4f7..8b1a07485c 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 0000000000..5dca502f80
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 0b42623bbe..c8e59db6b6 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 bc03e0bb1a..d1ca9c1f77 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 a32f924666..a344caa675 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 6d1a11286e..a3a0e67558 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 abc381fa69..f5660dd76f 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 5a331bcf4c..0191708504 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 0000000000..a23d4c4e2e
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 a6594d2e5d..42b85c1c98 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 fcbc573828..aa6fc9b3de 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 0000000000..5b8710dfd7
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 3388720915..a06929b336 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 06c44012ff..54492aee67 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 dec7a12837..aac3acd2ff 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 512d9b8042..fbce00d4d5 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 84591b3453..99ddce2ace 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 41cde313ed..9093465eaf 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 b7e388b5d0..dde178ed1a 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 16ff654c7e..5cb90ca503 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 0000000000..136ea59d3d
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 5879173a69..a099a9bd01 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 bd51cd5fb8..b880f689b9 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 0000000000..20ca989182
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 0000000000..4c3c6694bf
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 0000000000..cc1ec83794
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 0000000000..f76955c717
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 0000000000..c129851655
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 0000000000..2828cee4c8
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 2d6cfe28ba..90e042545d 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 0000000000..a6c90e15d4
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 0000000000..93605ebfd5
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 987fafb21e..b7cb2b519a 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 0000000000..61086831f9
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 0000000000..4471efca72
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 0000000000..48bc828d30
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 0000000000..3818123af8
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 0000000000..b6daa47178
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 b079274ba3..2651803dcb 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 199b866809..d35a63aa81 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 baf54b2f89..8db707562a 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 7890db8dd6..179838ed45 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 7890db8dd6..179838ed45 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 5db7e3d68e..65a5722bd5 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 154d2ee2ef..98d75bc9e3 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 0000000000..d4e7e6766a
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 0000000000..7500fef738
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 cbb7d5a276..290f44e169 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 46a6511895..ce3d901dee 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 6ae4cfc7d8..20579a6459 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 b9c086ba77..c909ebf499 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 977df712c1..b54a228419 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 041069fe7e..a871a7cc60 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 b3bdf56da6..2432c6533c 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 5e4ab68981..a0e86996e1 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 0000000000..007ab2ea57
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 0000000000..edd0271d90
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 0000000000..677eeff1c1
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 0000000000..9901ffe74e
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 0000000000..7d5009e13f
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 0000000000..0e771bf61c
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 26162219d4..d04c90a4db 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 368612e546..cb005206b6 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 25d67f1d76..73a729d987 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 9ca6da5a0c..e998352785 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 eb2b750712..c61df4d04c 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 0000000000..a8c6737d1b
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 0000000000..2086acbc2b
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 8d84b53429..08cbe3dd3a 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 0000000000..70620e1d54
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 0000000000..a4c8ef41d2
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 0000000000..708ec7416c
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 6f5fec0a46..4603ad29a4 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 381f74d336..59333e3fa9 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 0000000000..703f32aee7
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 0000000000..886173ec97
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 0000000000..5f1ec8faad
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 0000000000..7664ec51ec
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 0000000000..d791d4eb11
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 0000000000..d3a31e9de8
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 0627b17ed7..6e5670f9d7 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 259fe416b9..a752e98af8 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 1cf5d5a130..41d54e76ab 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 7ea2945144..b1e22db3ff 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 4155c11ec1..bdbed6bf19 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 0000000000..854fd4ce85
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 0000000000..13137b15ad
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 0000000000..e0fec7e04b
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 734ac58d6b..4b69d0f920 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 9c9a56b4f4..ad67a6194b 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 0000000000..8d0cfe50b6
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 0000000000..248be42171
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 0000000000..620aadaf24
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 0000000000..d6ed01d7e1
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 0000000000..6d06155f7e
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 0000000000..890777db04
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 0000000000..ef19c197c7
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 0000000000..f6850d6276
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 e4a0cc76ab..31a7a88460 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 0000000000..ca803d13aa
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 0000000000..c27072ac83
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 0000000000..e6fb47fc5a
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 0000000000..8fbd8c1201
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 0000000000..ea9ff5a377
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 0000000000..9fe74a23eb
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 0000000000..0ef32d13de
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 0000000000..cb57383562
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 0000000000..16798bed95
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 0000000000..c41cedefe9
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 0000000000..d17211c3eb
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 0000000000..6db91a0984
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 0000000000..798c0166f4
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 0000000000..bd65d6b5ed
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 0000000000..6ebe8cb15b
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 0000000000..31a9f7e4ad
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 0000000000..621f8d5f78
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 0000000000..4caeb4352b
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 0000000000..0be82acac8
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 0000000000..27cbd1aea8
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 0000000000..7178f6cee0
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 0000000000..4d915f2409
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 0000000000..cd33cf5fbc
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 0000000000..5485416daf
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 0000000000..a7a9a64872
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 0000000000..b05e0cb88a
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 0000000000..b2d94d736b
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 0000000000..89a9f1403d
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 0000000000..01ed27b473
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 0000000000..175e16641e
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 0000000000..284f54a87f
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 0000000000..a7da239bf9
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 0000000000..a8acf35bf9
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 0000000000..096e316cec
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 0000000000..f9513c441f
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 0000000000..73bcbacd41
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 0000000000..f4eafb555c
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 0000000000..b5d656e11a
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 0000000000..751c68c260
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 0000000000..68ea3546d2
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 0000000000..de901b3758
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 0000000000..b5faf12a06
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 0000000000..bb4891ab86
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 0000000000..99fabdb827
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 0000000000..8dbc6953ba
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 0000000000..a8549f277f
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 0000000000..8d99881753
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 0000000000..860f1c1377
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 0000000000..14461632a7
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 0000000000..696e158c62
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 0000000000..2ccab6e595
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 0000000000..04c80514cd
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 0000000000..f9f5968f5d
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 0000000000..0071d3a048
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 0000000000..def9befadc
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 0000000000..a87cd27c42
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 0000000000..1ef10190af
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 0000000000..13a64c444e
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 0000000000..cf8b84d095
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 0000000000..992d51555f
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 0000000000..d11dc967c7
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 0000000000..39a81bb114
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 0000000000..a04b2d1601
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 0000000000..0a6979d6b6
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 0000000000..8a62b2bbc9
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 bd51cd5fb8..b880f689b9 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 0000000000..20ca989182
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 0000000000..4c3c6694bf
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 0000000000..cc1ec83794
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 0000000000..f76955c717
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 0000000000..c129851655
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 0000000000..e09a2d4850
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 0000000000..332af37781
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 0000000000..33a7172c52
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 0000000000..a6ea08854b
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 0000000000..ca56aae928
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 0000000000..e44e5fcc5c
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 0000000000..5bab800d40
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 0000000000..b07f3ccdd3
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 0000000000..08e064168a
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 0000000000..a8e41b4d29
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 0000000000..69e8f0bd76
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 0000000000..bbdc7ffe48
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 0000000000..53dccdba44
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 0000000000..33451db507
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 0000000000..150224b4c5
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 0000000000..233f5e6fb3
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 0000000000..858d6d027a
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 0000000000..0d0197ab92
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 0000000000..d91f2086d3
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 0000000000..55b452aa49
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 0000000000..44dd62d8bd
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 0000000000..6abac278c2
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 0000000000..f3b4dcf8e4
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 0000000000..717ec8233a
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 0000000000..9f229b9dd5
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 0000000000..1a23240241
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 0000000000..fdd019dffc
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 0000000000..79c2f242e7
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 0000000000..34387a1c9b
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 0000000000..9f6685360a
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 0000000000..b06ea0112a
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 0000000000..264674fbc3
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 0000000000..9942d5a2b9
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 0000000000..de44ad6a2b
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 0000000000..a43f5608e9
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 0000000000..1a7bc2d4a7
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 0000000000..4567ae6722
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 0000000000..51005b6e82
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 0000000000..f5d65f9da0
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 0000000000..340af47454
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 0000000000..20a3fee4bb
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 0000000000..12cca91ae1
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 0000000000..78c2ce464b
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 0000000000..fb4329d396
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 0000000000..73c9c1b805
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 0000000000..8f9163ae98
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 0000000000..fab5ded877
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 0000000000..0d917ac951
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 0000000000..1d412d6d40
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 0000000000..99930cc163
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 0000000000..eceef6632d
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 0000000000..25578dce04
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 0000000000..8eb3414a9f
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 0000000000..6f1d005307
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 0000000000..7f1d6bdb87
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 0000000000..c82c1e0f15
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 0000000000..89b98c654f
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 0000000000..3983c33584
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 0000000000..bb2383cf70
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 0000000000..ef0ae6ce80
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 0000000000..7f025355c3
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 0000000000..391a01ebe5
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 0000000000..e8feaf7e5c
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 0000000000..0a21632cbf
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 0000000000..81475e7b2a
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 0000000000..dfca41862f
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 0000000000..f315b0ee96
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 0000000000..1ffa1c9d28
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 0000000000..9c1bbfae91
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 0000000000..57da497ac6
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 0000000000..401b5480ae
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 0000000000..39301f07d9
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 0000000000..c4e350ab97
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 0000000000..c4d5a75238
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 0000000000..f28c46ca87
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 0000000000..beb13aff88
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 0000000000..c9537d5f18
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 0000000000..a9f420da3e
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 0000000000..0d2f933338
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 0000000000..982e4682ec
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 0000000000..331eb0c6d9
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 0000000000..0cd626faa3
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 0000000000..a76c9543d1
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 0000000000..9eee8ad824
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 aebef5091d..a353498e0e 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 0000000000..d0a030989b
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 0000000000..d4a284fc97
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 0000000000..a673157b96
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 0000000000..23e11db97a
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 0000000000..6f83cf7b70
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 4f237ee9ca..945f700dba 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 0000000000..844059d903
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 0000000000..6f2d33162a
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 0000000000..77136cd601
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 0000000000..e22afc06c1
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 0000000000..3929c0f3f8
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 98894d84fd..815fdac34c 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 0000000000..15b97354c5
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 e1a5531042..0000000000
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 83ac373451..d3d5a18431 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 cd5f7f3095..1e3d77562c 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 0000000000..35a77d3ec6
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 0000000000..0afc7181dd
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 0000000000..20265c357a
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 af3686bb50..36daabc318 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 27aafd05c0..9847b62f10 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 0000000000..d0e9119631
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 0000000000..4a6f674e47
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 0000000000..718959c3bb
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 0000000000..422dd9a61e
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 0000000000..cd82c5f9ae
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 0000000000..4bba2ec395
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 0000000000..8040caeac0
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 0000000000..671fbcf916
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 0000000000..4111e66b82
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 0000000000..53e60ebf4f
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 0000000000..c88327dca6
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 0000000000..9847b62f10
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 0000000000..d0e9119631
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 0000000000..4a6f674e47
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 0000000000..718959c3bb
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 0000000000..422dd9a61e
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 0000000000..cd82c5f9ae
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 0000000000..23fa26e4ce
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 0000000000..846272e367
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 0000000000..43a7879d24
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 ff8398d922..a90749952d 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 b5f122fc56..63d5d18c6d 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 0000000000..423b9a26ea
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 0000000000..63d5d18c6d
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 683e6c6955..04cd04079b 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 d4a2345143..11ba186330 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 0000000000..5a9bf16ac5
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 0000000000..842ddc1b1c
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 5baf6ee47e..cc23fa0463 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 51926e328c..953c521a0d 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 0000000000..785b587fec
Binary files /dev/null and b/public/images/emoji/emoji_one/merperson.png differ
diff --git a/public/images/emoji/emoji_one/merperson/2.png b/public/images/emoji/emoji_one/merperson/2.png
new file mode 100644
index 0000000000..e9619aa522
Binary files /dev/null and b/public/images/emoji/emoji_one/merperson/2.png differ
diff --git a/public/images/emoji/emoji_one/merperson/3.png b/public/images/emoji/emoji_one/merperson/3.png
new file mode 100644
index 0000000000..0c4dc9e5e0
Binary files /dev/null and b/public/images/emoji/emoji_one/merperson/3.png differ
diff --git a/public/images/emoji/emoji_one/merperson/4.png b/public/images/emoji/emoji_one/merperson/4.png
new file mode 100644
index 0000000000..f14097564f
Binary files /dev/null and b/public/images/emoji/emoji_one/merperson/4.png differ
diff --git a/public/images/emoji/emoji_one/merperson/5.png b/public/images/emoji/emoji_one/merperson/5.png
new file mode 100644
index 0000000000..7b79d56316
Binary files /dev/null and b/public/images/emoji/emoji_one/merperson/5.png differ
diff --git a/public/images/emoji/emoji_one/merperson/6.png b/public/images/emoji/emoji_one/merperson/6.png
new file mode 100644
index 0000000000..cd862603d2
Binary files /dev/null and b/public/images/emoji/emoji_one/merperson/6.png differ
diff --git a/public/images/emoji/emoji_one/metal.png b/public/images/emoji/emoji_one/metal.png
index da08837ff9..c5afaf3cab 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 0000000000..e67d5a5079
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 0000000000..7a62d35c6d
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 0000000000..947ca5b1bd
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 0000000000..9eb041cbfc
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 0000000000..f670879ac8
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 0d064ec8db..2e814e076e 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 0000000000..95e838852b
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 0000000000..549d03fdc7
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 57392f0f83..5655cbed37 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 807d3bac9b..4a10c14e1d 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 6ea8d49925..e4b0ea2de7 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 6f99e17bdb..1bc73629bb 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 0000000000..6d4d00f77c
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 0000000000..37bc135b96
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 0000000000..2b3abdbf9a
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 0000000000..12c2de3a50
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 0000000000..d3a0b3f62a
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 b6a38f1861..423b9a26ea 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 0000000000..e3ea06a006
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 b6e08e1d9c..99ec10a374 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 9594f5f3c9..2e75d35fab 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 d77c0a05dc..a44117ec89 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 469367a679..69c60ad4ad 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 0000000000..d4463a0147
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 0000000000..17833f535a
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 267d6c1643..6ced1590e6 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 267d6c1643..6ced1590e6 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 805ac8afd0..9005ced3fe 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 6239b8e4e9..f020e5d245 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 0000000000..cf97894508
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 08733713de..f2b8c20d6f 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 841f3d3c17..1ec95ee3d1 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 e7099b8696..ccb79a0954 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 0000000000..7cbd07cef3
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 0000000000..28712de519
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 0000000000..3020cb4c19
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 0000000000..7f16d0a66d
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 5e40cf898f..11a5e7f2d2 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 158222fe4b..e5a96e633b 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 0000000000..0dfeae01e9
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 0000000000..be078d0d1e
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 fe090e9cc0..0dfeae01e9 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 be62ca41f1..9014f6e720 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 cae0bce158..1a2fd734e4 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 94fdf69b3b..48012f21fc 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 7d01279c27..93c67d8cc7 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 202e911d38..af6a404310 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 0000000000..5b83ed9ab9
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 0000000000..aeb0961472
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 0000000000..17fba414cf
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 0000000000..86063f518b
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 0000000000..fa29ccd48e
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 0000000000..af6a404310
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 0000000000..5b83ed9ab9
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 0000000000..aeb0961472
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 0000000000..17fba414cf
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 0000000000..86063f518b
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 0000000000..fa29ccd48e
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 0000000000..f1b2303d63
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 0000000000..cc5eff2627
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 0000000000..9b8a3d5173
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 0000000000..d70cdd187f
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 0000000000..f815944b68
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 0000000000..b6200c484f
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 aa24ad366c..5e9c152600 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 0c365f9368..c1d638c38f 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 fcf09dab6b..5654198a52 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 98ff28c82d..62bff90b9d 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 eaed642c75..b5164e68de 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 b03f1583b9..0e9dfa8326 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 65b156c331..bba0902b3e 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 88e53a2d9c..fa8f664e9c 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 0000000000..07d5cd56f0
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 0000000000..359bc47bb8
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 0000000000..9b693ecc22
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 0000000000..33246bf258
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 0000000000..8e6d449ac7
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 0000000000..31ef37007e
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 0000000000..7b35e725bc
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 e8cff18af8..86231c7c88 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 0000000000..d9b6ca91a8
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 0000000000..c82638adc0
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 0000000000..387755c0d4
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 0000000000..a22958b595
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 0000000000..60d56c1803
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 a755e1dca2..4e68a59c2a 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 af3c2cf877..92a822c147 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 c7ea06d53d..a2e81aa34b 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 6f8204be52..d0c5e8ef9c 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 1db8a5659e..43b741d883 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 0000000000..345829e2a3
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 92fd62fc54..9475bfd88b 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 0000000000..86e57118d9
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 0000000000..5c25f16c9c
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 0000000000..6701798116
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 0000000000..405950c16b
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 0000000000..be57e95299
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 c1b6c30da5..fd76506f1e 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 0000000000..f505b371fd
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 65a3d29cc1..51e7483499 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 0000000000..443c1a5e93
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 0000000000..9e76d92ce6
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 a3f70d6ba8..7013509cd2 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 aefbc66f6f..27d79adaf6 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 0000000000..cd57822d80
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 f546c07bbb..da39afd16c 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 f546c07bbb..da39afd16c 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 0000000000..1e37d79d5d
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 5f30ea932f..d0970fa6f5 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 f892ce6d22..e12d132bb3 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 0000000000..45914c48c7
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 6595a81e15..3020cb4c19 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 055b146a9f..931b3eea6c 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 0000000000..9ab60df7b7
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 d0a306b46c..8bd32c315d 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 9bab1e549d..4568e894ec 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 0000000000..4568e894ec
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 1e6fc4c14b..57c7a28d12 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 0000000000..57c7a28d12
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 d547ef97e3..c515756584 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 0000000000..e405151e2d
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 0000000000..fb6c4a4d37
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 0000000000..23c9d9a762
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 94d0623d9b..787073a1f6 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 61af7b1553..6e25bb3293 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 0000000000..daaa26cc16
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 7fd601d026..75c6bb2648 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 cfee56d49c..d49b8c74cf 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 bcdddec2ba..2ab1a31adc 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 2330f8a8bc..e4272bd7d0 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 e5390d78d4..9526207d0e 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 0000000000..7715d22900
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 0000000000..059277896e
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 0000000000..d9108260ed
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 0000000000..e4f62c49a9
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 0000000000..7bf14fd611
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 0000000000..6fbcf7e45b
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 0000000000..2da1c9c434
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 0000000000..d5ab6b70ab
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 0000000000..a51775e9ad
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 0000000000..2aa6983643
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 0000000000..6fbee0fc44
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 0000000000..9526207d0e
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 0000000000..7715d22900
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 0000000000..059277896e
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 0000000000..d9108260ed
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 0000000000..e4f62c49a9
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 0000000000..7bf14fd611
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 24954213f9..4aa58e9338 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 f604605fee..abb14e19bc 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 1790f7541d..93f2742dfa 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 c276e0b0f0..2e97e1e453 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 59f6e800d9..d06253f317 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 0000000000..574acba100
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 0000000000..d15d10aece
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 0000000000..962a6171b9
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 0000000000..004a11d830
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 d4dd8f8aa8..3382adb9b9 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 0000000000..594c3749f8
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 0000000000..b8fdc6475c
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 0000000000..0ff983229c
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 0000000000..579822b610
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 0000000000..efc3d926aa
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 3f1edfc000..dfab302562 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 de9c79d587..738f930ac5 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 3137300cb3..08c5181db2 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 2d0a695532..a59a0b0f77 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 2e97676a8e..8d7d79dec0 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 f34a9c98b6..b56ae8374e 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 400bce3e4b..02f6f9a12a 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 c8792833b9..e6a7a86017 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 5365ca4d8c..b6e5b785d5 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 4f339f8ca6..30e932cf9c 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 3f77f2112a..2200d871c0 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 6c3c0b6ec7..c6b1488ec3 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 6c3c0b6ec7..c6b1488ec3 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 18749a3517..709da2b906 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 59ae855200..e190f91edb 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 0000000000..4d96379444
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 0000000000..a35aad0aae
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 0000000000..77867ccc8e
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 0000000000..eafe6aaf98
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 0000000000..d2498a5ec5
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 0000000000..5b65c87562
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 0000000000..b327322e7a
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 0000000000..e9220ff076
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 0000000000..39d5fb63d4
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 0000000000..2014874e3a
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 0000000000..9bd5b16f2e
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 1df42092f0..c9127aa346 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 0000000000..fb044fa443
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 0000000000..0cdf717264
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 0000000000..d2a4df276f
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 0000000000..b5b517667e
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 0000000000..9e6718ce1c
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 f74bb1ba0d..de500e1053 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 0000000000..0faf0d0481
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 0000000000..3d1ff662b0
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 0000000000..18cc2a1195
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 0000000000..6533f0f567
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 0000000000..02729ab0e0
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 0000000000..78badf8a41
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 92b85c01ff..03423fcdb7 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 0000000000..f245d63322
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 0000000000..70146de661
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 0000000000..9a716f53ad
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 0000000000..bb162526e0
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 0000000000..e856ce7acc
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 d1e78babe8..2ec3cbecff 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 0000000000..cbbfc13132
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 0000000000..4d0c325f09
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 0000000000..287a4d0de1
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 0000000000..8cda00960c
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 0000000000..00a5201716
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 0000000000..25c7844a2b
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 db9dae0828..25c7844a2b 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 0000000000..59e0df087e
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 284d9d3c00..858a03902b 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 94365ea16d..5755dee2a7 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 b78198d0d7..f564779d49 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 b4f82551fd..e57bd9af84 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 a84cc5433e..93c8ec02a4 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 2e02f0dc59..7902d41c78 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 0000000000..3a8176a7d8
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 54d61589a3..33c1ca987f 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 70fe3a0251..6ec9b8e0ba 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 0000000000..eb4cb57330
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 0000000000..e34055a06c
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 0000000000..b89d128ad9
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 0000000000..d286a3f9db
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 0000000000..4cac8ef2f2
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 0a6dae0978..e3e0eff2e4 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 0000000000..009d0ece9d
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 45a148e32e..b570a4c1df 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 a29c7355d1..e6c302f9fc 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 0000000000..b7a2b8fc27
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 34fb892233..d77d2128c8 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 ccce2b90de..9240145417 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 0000000000..d3fcd025cd
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 e91537b0a1..c1ba333d39 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 a544f88a59..c235c0f772 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 5b47f9d743..c68507d9aa 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 d088e4ed9f..923fa9b041 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 ea36ff2801..dc7b619953 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 eb2b750712..c61df4d04c 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 0000000000..f4c74d1d49
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 0000000000..69aace7555
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 0000000000..2e4399d762
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 1d17c2ffa7..9284c042ed 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 0000000000..15e0667ae7
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 0000000000..85b6622b5d
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 0000000000..0648189e06
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 0000000000..2b0bd1cd2a
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 0000000000..6d7fdb021c
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 0000000000..2fd1e06e2e
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 0000000000..2a564db426
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 0000000000..36e1dda8ef
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 4c7415ce5a..a572d24c2c 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 8f1ca18e51..7db0922aa8 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 baf54b2f89..8db707562a 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 0000000000..b449d67794
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 0000000000..d9eab9434c
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 0000000000..4e2db24326
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 65a3d29cc1..51e7483499 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 45c5a905f8..e85ee34cff 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 e600cb3d2e..d0b4226470 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 10ef91e7ba..e100b05d5b 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 c77f1c88dd..8a05089fbb 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 3f9b687f86..82dedbf462 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 37b536aaef..eaff9c506b 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 a507977217..311f3d4d6b 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 8a6c3931ae..aa9871f5e6 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 8a6c3931ae..aa9871f5e6 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 8428a6a022..0692539b3c 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 0000000000..9c1c5b0558
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 7ead489e21..7e369c9b1d 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 0000000000..cb005206b6
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 368612e546..cb005206b6 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 9ca6da5a0c..e998352785 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 9a02dd3728..5a9bf16ac5 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 c7fba93034..6545b28994 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 ec3cdc34df..4ecb573fbb 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 ce9424666e..a1998cb27d 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 babf4590db..0084fba6bf 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 818553a808..6868a838d1 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 0000000000..5f602e7921
Binary files /dev/null and b/public/images/emoji/emoji_one/person_climbing.png differ
diff --git a/public/images/emoji/emoji_one/person_climbing/2.png b/public/images/emoji/emoji_one/person_climbing/2.png
new file mode 100644
index 0000000000..4215248b4d
Binary files /dev/null and b/public/images/emoji/emoji_one/person_climbing/2.png differ
diff --git a/public/images/emoji/emoji_one/person_climbing/3.png b/public/images/emoji/emoji_one/person_climbing/3.png
new file mode 100644
index 0000000000..778bb5eea5
Binary files /dev/null and b/public/images/emoji/emoji_one/person_climbing/3.png differ
diff --git a/public/images/emoji/emoji_one/person_climbing/4.png b/public/images/emoji/emoji_one/person_climbing/4.png
new file mode 100644
index 0000000000..f88dcf1a0e
Binary files /dev/null and b/public/images/emoji/emoji_one/person_climbing/4.png differ
diff --git a/public/images/emoji/emoji_one/person_climbing/5.png b/public/images/emoji/emoji_one/person_climbing/5.png
new file mode 100644
index 0000000000..67ddf47872
Binary files /dev/null and b/public/images/emoji/emoji_one/person_climbing/5.png differ
diff --git a/public/images/emoji/emoji_one/person_climbing/6.png b/public/images/emoji/emoji_one/person_climbing/6.png
new file mode 100644
index 0000000000..fcd36f345a
Binary files /dev/null and b/public/images/emoji/emoji_one/person_climbing/6.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 0000000000..238d7e6ee1
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 6fb37ad952..15945278a4 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 0000000000..45d4fbfa64
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 0000000000..a162630c94
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 0000000000..ee475d8400
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 0000000000..97c21442ba
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 0000000000..2c5a39db98
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 0000000000..85b467093b
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 0000000000..339d2cd515
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 0000000000..33cdf4d89d
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 0000000000..50fcaa6ee3
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 0000000000..be94a8bc33
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 0000000000..35c5fba885
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 0000000000..c83e9d0c9a
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 0000000000..3f4fce712d
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 0000000000..d95e31e3a3
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 0000000000..573911f259
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 0000000000..0ded387a6c
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 0000000000..381e454934
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 38c6d635f1..bc5aa6b3ea 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 0000000000..572fa0925f
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 0000000000..203a5bbd82
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 0000000000..303b43c832
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 0000000000..ebfd7ae793
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 0000000000..94d75c809b
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 5a9cd9cedb..1dfbe295e6 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 0000000000..775250def1
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 0000000000..5720c58ea9
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 0000000000..8d74699a83
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 0000000000..adf7d3113f
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 0000000000..31a2d833c5
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 4f374afa83..c843d97f68 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 0000000000..78eda48aa8
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 0000000000..563bf2a626
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 0000000000..ed72191eb2
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 0000000000..8ad4c80223
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 0000000000..6981738f3e
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 0000000000..bbb5523f93
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 0000000000..b26fa86ac2
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 0000000000..e40b890329
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 a8672c16e4..acfaec124d 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 0000000000..ba1646daf1
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 f7733c43f9..044bd4fadb 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 c01f1f7462..4564113ff2 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 e3da3db677..51f1fe6e3e 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 4faa61d79c..a30f1593c8 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 c5f12859cd..c8be5ff524 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 057c1dbcd0..ecdefb3dc8 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 4f18a23de0..30c4d33afc 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 0000000000..3e3d79bca5
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 18dc856a9e..8e9da309b6 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 83334c1122..05ce41a23a 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 0000000000..c52a0f2d3c
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 0000000000..d956a2e1b5
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 adc41e2640..d956a2e1b5 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 7d6a31494a..6e146fec75 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 0000000000..d3c688ba81
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 0000000000..d8c0bae4eb
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 0000000000..da88c69234
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 0000000000..afa8064a05
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 0000000000..163a4b0dcf
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 676dc9a71b..fac504f0b7 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 0000000000..5a8e36c91a
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 0000000000..b81564c587
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 0000000000..a5110e6d2e
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 0000000000..4955393e91
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 0000000000..a887cde42d
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 3b73999b42..ef6ba62b13 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 0000000000..206752435c
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 0000000000..177137155d
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 0000000000..e6d909ef81
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 0000000000..81e3218e43
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 0000000000..4832388346
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 db9ccf3c54..12c59b63d0 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 0000000000..d5206e547d
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 0000000000..58a19cc569
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 0000000000..687a8375cf
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 0000000000..5b574e1b03
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 0000000000..344d0ac6cb
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 e7ad6c9271..5c92b46027 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 0000000000..1348d5b262
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 0000000000..c6cc1b2920
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 0000000000..92bf676d58
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 0000000000..2605af4c6e
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 0000000000..93df6e6a33
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 0000000000..c8872ee52e
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 9e4107ed22..258951b4e4 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 0000000000..ad6742c9c0
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 0000000000..a1373eaf8f
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 0000000000..167a0412b0
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 0000000000..4292f33eef
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 0000000000..49e49d38dd
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 0000000000..772e55693f
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 0000000000..e947e47150
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 0000000000..522ee6694f
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 0000000000..df32872ada
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 0000000000..2a699adb77
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 0000000000..593907cb50
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 0000000000..ac7cca6290
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 77eb5b9fd2..123281b9b3 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 fa439cdb07..259b758e76 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 77eb5b9fd2..123281b9b3 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 29ec3d3879..a5f4d3c7f5 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 0000000000..5646de0622
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 b1fa8fc2c7..2a4f51f993 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 184ef61df9..33b9366b31 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 4895184062..1997a6577a 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 5f26babcde..f59a27b034 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 0000000000..b2861daa57
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 811ac05858..2d1bb9e491 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 17e4a43a45..1f39ea4371 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 19192da49d..036dfe07a6 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 2b7fe56ade..6ee2e0a0c2 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 0000000000..02442baee2
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 0000000000..74aa020461
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 0000000000..cd4b032196
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 0000000000..81b215e075
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 0000000000..49a8019871
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 0000000000..9ac5e2c664
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 0000000000..c843d97f68
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 0000000000..78eda48aa8
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 0000000000..563bf2a626
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 0000000000..ed72191eb2
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 0000000000..8ad4c80223
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 0000000000..6981738f3e
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 ff6879172a..9018b6f259 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 0000000000..a2d310c724
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 0000000000..bb2e715770
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 0000000000..a2706ce2e2
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 0000000000..d6be32bf47
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 0000000000..3b34141b59
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 96336c5b56..6b0c0a5abe 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 0000000000..cf2bcf5963
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 0000000000..56580c1dfc
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 0000000000..89ee4dc6fd
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 0000000000..574f05dc28
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 0000000000..203890a7eb
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 0000000000..dcd67e1d51
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 0000000000..5088dc9255
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 e1a06c07a7..7dd785d16c 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 0000000000..7dd785d16c
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 0000000000..1597761ddc
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 0000000000..78dc032e0d
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 0000000000..b5dabd089b
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 0000000000..3573a7cfb7
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 0000000000..65b026876e
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 0000000000..9ebb2c1419
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 d8990087d1..f70435aab9 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 0000000000..80202dc40b
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 0000000000..d5f2f4cca5
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 0000000000..82c1bc08fa
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 0000000000..d809881b1f
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 0000000000..1c56383c2f
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 ea2fd06760..ea31e57dac 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 e18aae6b5c..1ab19e3f1e 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 0000000000..05a929944d
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 ade269fde0..488aec1d2b 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 0000000000..42f2b3cbdf
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 0000000000..8171539a60
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 0000000000..c8aa4ef7a6
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 0000000000..048cb8c26c
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 0000000000..13a376407e
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 fdd70b19fb..ada42551ac 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 dde8d73cb9..b9823e9a89 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 1495b5f352..4ccae8a594 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 a867138894..f0921e2ccc 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 0000000000..f51ae1d0ff
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 13880d004f..134d9a3f68 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 dbe4914879..3f22f7b850 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 9fd617c3e6..7dbdd79f41 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 86c9a2c840..729488ea14 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 b70842e474..6547b4f3da 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 86c9a2c840..729488ea14 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 be62ca41f1..9014f6e720 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 9cf001ec24..add2123cfd 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 3256f716aa..573e051923 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 8c96196adb..d3fb5719f6 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 8c96196adb..d3fb5719f6 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 d51b130750..b3121157c1 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 e95bece31c..9fd96b0b62 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 e892028fc3..9822ebb900 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 e95bece31c..9fd96b0b62 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 4448583e6f..eb08aad648 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 0000000000..d13b51efa6
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 0000000000..d6746b4765
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 0000000000..183b98c9e2
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 0000000000..c05aecd9ca
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 0000000000..d512ec58be
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 0000000000..2168d36c52
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 0000000000..a5ce38e96e
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 936ae16df6..9e968721c4 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 0000000000..8484849fec
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 0000000000..4469d89931
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 0000000000..aa00db9402
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 0000000000..a79f3fc150
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 0000000000..d0135a6614
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 77d0794e0d..dfdad1339b 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 0000000000..373f6150be
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 0000000000..413cdd2b96
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 0000000000..c44bd59f71
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 0000000000..87ef3aa7ad
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 0000000000..387d9c89c9
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 b22486308b..ae4eb8eb15 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 0000000000..e240e70ff3
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 0000000000..a9b70c6ea2
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 0000000000..105909c061
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 0000000000..7f86f45adb
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 0000000000..39efaf09e5
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 3947fd5410..7d7765e83b 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 0000000000..8790803b36
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 0000000000..35b90979c5
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 0000000000..545a4232c7
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 0000000000..4ee48a1517
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 0000000000..7579f20d0e
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 9186a15087..c904fc9493 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 0000000000..c9d49ae438
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 0000000000..c1285e089d
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 0000000000..df5eb29467
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 0000000000..f2c3950ef4
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 0000000000..a62f4d887d
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 0000000000..1f02290c28
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 0000000000..55335c6302
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 0000000000..4890d6d370
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 0000000000..8a317afe39
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 0000000000..a9837fbc71
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 0000000000..2f5d82bdfa
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 0000000000..c904fc9493
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 0000000000..c9d49ae438
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 0000000000..c1285e089d
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 0000000000..df5eb29467
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 0000000000..f2c3950ef4
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 0000000000..a62f4d887d
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 a3c953fe46..8475de585c 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 e61280eaaa..7c9dfcf5a7 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 7dbc8eaeaf..0284fd0e86 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 fd8574320c..d40f51bcd7 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 526553b323..fd7bb8fdda 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 9010bb046a..5e1e89327b 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 4281bcd253..ee059ea448 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 4a952e105b..322864d011 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 61bef2d0b1..a472b6fd5e 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 891808c490..0086d94fc9 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 b167759990..3d6beebf4f 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 163b8ce644..3e9d00354b 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 92ccb31fd8..40a8db5ca4 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 0000000000..baaa54a80b
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 082a98d74f..d61d2e07af 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 0000000000..1679d4c5b9
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 6f99e17bdb..1bc73629bb 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 0000000000..6d4d00f77c
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 0000000000..37bc135b96
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 0000000000..2b3abdbf9a
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 0000000000..12c2de3a50
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 0000000000..d3a0b3f62a
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 7c0c92401c..4bbb1b26bf 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 0c0d8f95fd..654889ca49 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 0000000000..3ad06ce839
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 bf1077ea22..0f8abdf06b 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 08f426fd16..a9a0d56d52 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 71891035c7..7cda5e0038 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 9307a05b42..a55e82e12d 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 f4ff8e4bd5..8f3dbf462b 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 9db343ff89..8899f3c74d 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 4041110912..034d0a2d88 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 0c1844d6de..47204f3e3b 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 0c1844d6de..47204f3e3b 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 b8107c6fd7..15a7edacc5 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 0000000000..ece6d1bda6
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 0000000000..e6fa5b3d7b
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 9bab1e549d..4568e894ec 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 32a249eb22..75f5db3a93 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 1eec27738b..e6fa5b3d7b 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 0000000000..2b16324878
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 15c796fae9..2acba8b333 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 303b898e66..e3551d2e10 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 1b7e1b4ca6..1166e0a14e 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 0675835a62..e9af91350e 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 71e0b59b6c..05be5fa152 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 7c7928dc12..b81173b77d 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 0000000000..69726bd7b6
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 0000000000..23dba2f0a4
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 0000000000..6efb3fa795
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 0000000000..eb83541b5d
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 0000000000..20fa842aff
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 0000000000..b81173b77d
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 0000000000..69726bd7b6
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 0000000000..23dba2f0a4
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 0000000000..6efb3fa795
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 0000000000..eb83541b5d
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 0000000000..20fa842aff
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 0000000000..1d5e29cd79
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 0000000000..099240239d
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 0000000000..db9d4472ad
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 0000000000..ea9e33396e
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 0000000000..8cbe43aab7
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 0000000000..2d5445767d
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 62b6b21d67..3ecaefd941 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 7e35beb01a..eb05cd614e 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 72cef9e851..0a0e4bf1fc 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 0000000000..3ee047b2da
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 0000000000..d91f37a10f
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 0000000000..9be2537a8d
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 0000000000..dc887483b5
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 0000000000..627cc69a85
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 0000000000..0a0e4bf1fc
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 0000000000..3ee047b2da
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 0000000000..d91f37a10f
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 0000000000..9be2537a8d
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 0000000000..dc887483b5
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 0000000000..627cc69a85
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 8953f4bd08..0afd8c0900 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 0000000000..56a6ad32d0
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 0000000000..9fa5a1b40f
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 0000000000..0e03b313bf
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 0000000000..3d841effa7
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 0000000000..24f90556a0
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 0000000000..06cf112fe6
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 0000000000..a45a988ff5
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 19c538273c..339dd0d103 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 9f080ccaaf..80865c2a61 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 6e7872f487..4ec504bb23 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 0cf8a22862..7ba82dc546 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 0000000000..de81c048d0
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 0000000000..fa20a00808
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 4c13fd19f7..bb2674f5ce 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 0000000000..6dcb5a2f63
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 4f5786f873..b64fcd987e 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 0000000000..8528bd70ce
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 0000000000..ccbc4bb029
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 0000000000..8113938ecc
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 0000000000..18a9a065a3
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 0000000000..02118a9d64
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 0000000000..bbfcbd18df
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 c3ab7d4419..b62b62f601 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 27f981e9e1..3463ad91ae 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 a6594d2e5d..42b85c1c98 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 0000000000..59954eccbc
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 0000000000..2431cb4726
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 b5970ac9e4..7e246ac1d3 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 3cf0799054..5ce9296bce 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 0000000000..817b5a9506
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 d2ce16c061..12a344b575 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 39782759c2..7b33692651 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 88084eae99..ffd41f23ef 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 8ccbe6037f..16bad6b57c 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 a50e56e80a..6f7adc0b3f 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 45efbb75c3..441386f6d6 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 0b04d37d66..167b1f2b32 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 b84deb9bd6..b5bedd2272 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 fac130fff0..7b9c833e9a 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 1b6e6176cf..b61ab4977e 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 6f5ced9b5f..07090c8a08 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 0401c8dc64..d75fda9817 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 0000000000..de57ef4419
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 0000000000..49a48bf652
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 0000000000..4bba81cd42
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 0000000000..2acb4b2f38
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 0000000000..66a4ede342
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 0000000000..a9ff6f3426
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 0000000000..2d32427625
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 0000000000..a7af1346e5
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 082c0c853f..636f1a4a35 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 0000000000..e69ca6add1
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 0000000000..57246e3461
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 14e221b62b..e2779368b4 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 0000000000..75419bae03
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 8eac6e904e..e1e9a07c4a 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 b50686cd5d..d41b629cd1 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 d78b8a3e69..1069288116 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 d453021093..874899ed7c 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 9c4f67c43a..073ba57547 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 4503cd5eae..9fcfae6bae 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 ecf7920587..9468111858 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 77eb5b9fd2..123281b9b3 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 0000000000..51da93c967
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 6319434166..51da93c967 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 0000000000..57386eb1d4
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 35e297cbf9..60cb024094 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 0000000000..c0e050dc5e
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 0000000000..816f090002
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 da08837ff9..c5afaf3cab 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 0000000000..e67d5a5079
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 0000000000..7a62d35c6d
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 0000000000..947ca5b1bd
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 0000000000..9eb041cbfc
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 0000000000..f670879ac8
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 b3bfcb6f4a..a1bb5ea0ab 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 0000000000..4cf2332d20
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 0000000000..5248152aba
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 e63c0ca97f..06822f95c0 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 0f461bf76e..8631a9c0ab 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 4e51ce946a..c3fe6053db 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 28c26e3b20..e0e2b4af70 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 1aa3148d39..99c640ccda 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 4e51ce946a..c3fe6053db 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 57ba5833f1..2320ddcb7c 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 57ba5833f1..2320ddcb7c 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 0000000000..ed86ab6c43
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 4a6a7a8501..0aa765424a 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 b5b231d5a0..9a919c519a 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 0000000000..d4ebd31b45
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 0000000000..42df6586ab
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 0000000000..7090f9f817
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 0000000000..96b52aa080
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 0000000000..d270e54a77
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 0000000000..9a919c519a
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 0000000000..d4ebd31b45
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 0000000000..42df6586ab
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 0000000000..7090f9f817
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 0000000000..96b52aa080
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 0000000000..d270e54a77
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 35d7652693..dfe30f7f13 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 0e0ad49b6d..8d0cfe50b6 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 0000000000..248be42171
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 0000000000..620aadaf24
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 0000000000..d6ed01d7e1
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 0000000000..6d06155f7e
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 0000000000..890777db04
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 72d3d96f6f..b6807a25b5 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 c40491e67d..96cc82d8ed 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 72d3d96f6f..b6807a25b5 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 0000000000..96cc82d8ed
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 c40491e67d..96cc82d8ed 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 e7df76618c..832e535471 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 0000000000..9b716032fd
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 0000000000..6dfbe6eae2
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 217b0b85a6..ff5a7b34e1 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 7293d4294b..9b2903c84a 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 5f71ecdf08..2db6b3e24c 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 2355489346..94b28fb76d 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 b72afa6f92..44942bd7dd 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 efe65f3b83..b40fadb0a7 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 16145530fd..f7802bd302 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 f82b805814..5a647aee01 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 c489ba35fc..3f83e3285a 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 865a213775..09e1e4d3c4 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 163faee7ec..a4cb74aa4f 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 2942825c02..2bb8347640 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 96944185bb..7c08cdc9ff 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 f171029697..c648eea6aa 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 17995513c9..fd47985c9c 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 0000000000..c7180f1a0a
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 fcf09dab6b..5654198a52 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 a1c4cfcf33..ec4dec2378 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 0000000000..9d944d1d8f
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 0000000000..8acd85321f
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 0000000000..064fb5a470
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 0000000000..969a884341
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 0000000000..dd2898ea3d
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 01360220ae..0ee41a7d9a 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 55c82a95c1..5ec353fdec 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 87c6724c7a..6bf5eaa818 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 0000000000..6bf5eaa818
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 3c63c1a340..5f2e4ee738 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 65eceea986..40e92cb694 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 0000000000..012f1ea945
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 0000000000..e4476e1880
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 0000000000..209fffeaed
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 c56de37b98..b737658c9a 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 9b1e4bba83..f4c31114f2 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 09adf65c39..803ba14330 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 0000000000..d40f1c75c8
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 0000000000..58f47bcd9b
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 0000000000..c7cbc6967c
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 a964e9fdee..72530a229e 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 49d963bb38..261536e773 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 5d9f9c9485..36c6858b6a 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 d980fe699c..e9231efc2f 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 bcae44a787..d99fb5195e 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 3cbacb46e3..d50cc9a11e 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 9f3734bddc..5d0ea34a84 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 c6deac879c..f05c13f3ba 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 57a70b96b1..c0dffb3d84 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 b84d9b048a..78c9f6c1f3 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 b84d9b048a..78c9f6c1f3 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 84b3f21e48..9addbd158f 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 39ae11a2a3..75019fbe69 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 0e8f42dea1..80062eb169 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 fc4532a4ec..5a1a32d2fb 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 0000000000..fd91b82bf9
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 50fb5e044a..fd91b82bf9 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 3137300cb3..08c5181db2 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 0000000000..08c5181db2
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 0000000000..ce2c1bab14
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 b5f122fc56..63d5d18c6d 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 0e0ad49b6d..8d0cfe50b6 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 0000000000..248be42171
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 0000000000..620aadaf24
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 0000000000..d6ed01d7e1
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 0000000000..6d06155f7e
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 0000000000..890777db04
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 0000000000..b1a0a0a30e
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 0000000000..f15b9be56d
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 0000000000..e213bf7e40
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 0000000000..90fefd0cab
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 0000000000..d7686f8b60
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 0000000000..92eafffe94
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 0000000000..7943b73f67
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 0000000000..b05828b47c
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 0000000000..ddfd25fd22
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 e1a45f0b98..bc75521171 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 6af620098f..f5791a931d 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 e7b4194d78..223b2a0f94 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 a00bc5b19a..f566b96f2c 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 f1f8b67e9b..e88bf4b834 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 0000000000..6c58e7ed2c
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 3435cd7119..dc9ad1ffbe 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 1b07882529..6deaae5e4d 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 488c70779c..5ffef3c0dc 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 1617cf348a..68c3ed8ae6 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 e5f8f89e9a..4d273302d6 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 b24d962369..9f080595ac 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 0000000000..b002e1e579
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 c52ceec6d4..61eba597e3 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 d014058c88..a4aa603f84 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 8bac8aa8b7..cab98ebddb 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 a4db2c08ba..1173425a2e 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 ccac72048d..89f9b748b6 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 9b32aedf2a..95716847d7 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 807d3bac9b..4a10c14e1d 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 0000000000..8c4b6a08bd
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 0000000000..3974a07328
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 0000000000..e8b9220a8a
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 0000000000..67907abd2f
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 0000000000..ea5d830e96
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 3a9eab8dc9..0e10b41c2e 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 2198a7c306..13913edaca 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 7fb7881bda..b8f6e3b104 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 c3091a74d1..7b7b33a7a7 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 a7b5118f80..1942ac2871 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 db68afdce8..fc2bde0e25 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 51ee0c0f29..766b177ec9 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 0000000000..a0d198944d
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 0000000000..50d3017cda
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 0000000000..2ba4475e8a
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 0000000000..70f8e34b32
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 0000000000..2132090b4f
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 0000000000..766b177ec9
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 0000000000..a0d198944d
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 0000000000..50d3017cda
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 0000000000..2ba4475e8a
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 0000000000..70f8e34b32
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 0000000000..2132090b4f
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 0000000000..3c3639b8cd
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 0000000000..7fa0d59102
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 0000000000..060bd1b115
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 0000000000..a00ae12f8e
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 0000000000..c9d477140b
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 0000000000..d56e133b3e
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 0000000000..48afc4adac
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 4db4fde6f1..a24be79be7 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 0000000000..b792bac92a
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 2faa0ec20c..e87c6a6669 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 0000000000..004a11d830
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 0000000000..fb5ee97ba2
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 2f115f599e..596b82b58f 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 35c665b7e9..d4877b2f18 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 21a207cfb8..065b60b3f8 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 0000000000..3b46fe18ab
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 07f5000098..8726f6ad25 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 2ea06214de..9c4bd048e4 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 0000000000..847d23a580
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 0000000000..1437a5097e
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 0000000000..5a840726dd
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 0000000000..1e1ed8cb46
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 0000000000..a050020993
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 0000000000..9c4bd048e4
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 0000000000..847d23a580
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 0000000000..1437a5097e
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 0000000000..5a840726dd
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 0000000000..1e1ed8cb46
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 0000000000..a050020993
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 0000000000..bd0260332f
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 0000000000..819233c154
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 0000000000..2c89827610
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 0000000000..c6c30eb5bc
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 0000000000..330ae72267
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 0000000000..75d6361122
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 0000000000..e0caa61ba6
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 24693dc49e..3008cec116 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 0aeec7a5de..c69febdeb5 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 0000000000..53606f3e07
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 5d163a8f9c..2b61c4bff4 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 0000000000..0d0a8710dd
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 057c1dbcd0..ecdefb3dc8 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 71efba83ad..86e148a72e 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 35e4a5e0da..e1cb93cef8 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 0000000000..dde348b40d
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 0000000000..7b3697952d
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 0000000000..01959c1ecd
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 74e1d13dea..5d6b814de1 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 add423a82d..c1d7558257 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 0000000000..d4026fea32
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 ca8437ad0e..dad59ea493 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 5e9456921f..fb6a21a11e 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 99515934ef..cffd1533ae 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 c9fa2f3753..e40b890329 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 468fe1d5ef..f157a3320f 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 ad05516da8..e2b401d665 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 c1ec395ca0..c700426ad4 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 f9ca8c5c1c..7d23bbc964 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 95b8e47390..a8d553ecc2 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 0000000000..81499f1616
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 f71af59c0e..f2eb04df3d 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 9722ff8212..9ba627bbaf 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 f174f7ca29..b1272b402c 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 f174f7ca29..b1272b402c 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 0eceaa4d1c..602c778131 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 f0ba2b4db5..65d767df9d 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 b03f1583b9..0e9dfa8326 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 c8e3213e3a..3feb01c56c 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 0000000000..0803889326
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 0000000000..91fbda2d09
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 0000000000..bba84d3f7e
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 0000000000..e660885f03
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 0000000000..0647aeda56
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 8cb59b1cfe..fdbf5f8213 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 0000000000..8d6845de63
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 0000000000..361ee4e1c9
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 0000000000..29b08bf2fa
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 0000000000..7ed0ca9bf9
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 0000000000..56210de91e
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 93485b0a4f..05610e8e13 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 93485b0a4f..05610e8e13 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 d68cb6789c..2d5d876b6d 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 4f6a24f970..9ab7bfc609 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 673cbadc7e..7ab7e8cdc4 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 9533a5d151..e1ecde8180 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 a8d1865189..aac5f4a6ea 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 a8d1865189..aac5f4a6ea 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 0000000000..6706def991
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 0000000000..19b1a44604
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 0000000000..699facf000
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 0000000000..507011654f
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 0000000000..8ee857db66
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 0000000000..9a5bc17d43
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 0000000000..6552aa57d0
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 0000000000..97f8256ad4
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 0000000000..4e2ffc47e9
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 0000000000..5796ae4861
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 0000000000..b61d746b06
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 0000000000..5da96c0d6f
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 0000000000..9e580ed02e
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 077e91d139..6006834911 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 e8be4904a7..b8f0f252cc 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 0000000000..7a542547e0
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 922d58d01b..de6f836ccc 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 0000000000..f42f868631
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 91e6e3e21a..a47d65e9f7 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 c91633e3e0..9b024b7202 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 0000000000..bfff80acf4
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 ca7adc1841..11d4689e84 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 3ff769bdf2..9de9731f57 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 9d5519b6f7..7f161313fd 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 1eff378806..4dd53ffb1a 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 0000000000..53591a435e
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 0000000000..3b6fc16379
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 1e6fc4c14b..57c7a28d12 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 e1a06c07a7..7dd785d16c 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 bd675e9267..9e56373cd2 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 f145a0fd73..017b238b6b 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 8289d20b6e..28baf0d455 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 ff5080e0ea..13cd3f9fec 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 cb51d2a0f6..8e3f9b0deb 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 dd7c82b40e..b0353a1cbc 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 5adceaac6a..fc4a3d2ab6 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 d03b796cdb..c392499821 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 6c9f1c3713..4812f82326 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 0000000000..14355ce15f
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 0000000000..dff4791d41
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 b047c62ce2..76baedde92 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 79f626f572..1214b9d88b 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 2d20e9f826..ec539e0141 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 84e243eb0b..210e45e1b8 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 df6ac342b7..6ac8df2f73 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 b7b46ab3d9..15cc7f3df8 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 2d3eb1ebde..d63c5a33f8 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 0000000000..9468111858
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 73410768c1..99134eb34d 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 0000000000..b91d26aac9
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 0000000000..2691b42f09
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 8fb0d06cca..cd074b3cbb 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 0000000000..a0729e2c29
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 0000000000..bb04d27666
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 96a07e8020..9d85f55271 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 0000000000..60fad11afc
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 7c7514489a..6eb47d85b3 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 7fb7093ece..b9df7c85b7 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 0f8b3c87e8..76388b415f 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 5be4855300..29b4b1ad10 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 cf16b87111..c2bcba0557 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 7ed2c58dcc..0f76e88b4b 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 5fdc274835..14e8ee5ad0 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 264db681c9..7a56b07292 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 5547724fa0..1f0264ac8a 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 3d05998e88..3fb55606e6 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 149f97e442..c9e46e820e 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 b1fec37297..b0638a4e10 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 a14192470f..26a2e54e9b 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 b2eeb6222a..bce7271cd0 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 968e870859..a33b2e2406 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 dcbfc1a2d0..b62c4f4e7f 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 650bcfc881..a7131b0e9f 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 0000000000..9541a9fe43
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 0000000000..ad2a6622e4
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 0000000000..d24b4e827b
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 a86bea8dbf..0af9e888e8 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 77d9ca0ca7..009d0ece9d 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 7fa37d2f2e..4e2db24326 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 6457c25201..b523b511ba 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 a9066a1691..0b91581cdd 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 f9e16ab2ab..9c45137880 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 f9e16ab2ab..9c45137880 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 0000000000..0aac4c4b1e
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 0000000000..d695a5cac0
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 bc70d78e37..0e4459b790 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 891242e9e9..ee1b816da0 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 6cfa6e75b3..79da5e1d84 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 6cfa6e75b3..79da5e1d84 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 c531e105cb..e158fa9f83 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 0000000000..8196541e26
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 748e2b413d..450853eca4 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 0000000000..450853eca4
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 0000000000..2352c2610b
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 0000000000..c268b7f0b2
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 92e2f8a0af..3f39fecaea 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 0000000000..0c0900510c
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 0000000000..902168c852
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 0000000000..ec3d6e6ec5
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 0000000000..4548a5771e
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 0000000000..00de366b12
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 0000000000..aaf7ad565c
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 0000000000..8c7993d7e9
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 0000000000..5388c5e7b1
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 0000000000..7545b4042e
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 0000000000..a97271ea71
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 0000000000..02d37f1846
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 0000000000..ebf4b69315
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 0000000000..a91fed8815
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 0000000000..e2b7cff1d8
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 5bf30483a6..bdfcd48cf0 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 2e7a8e9852..a74d2e0965 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 e5ade50f6b..eba6544fc9 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 7af1116cf7..97b1c4a043 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 b6eb5a873c..b238fc6574 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 0000000000..f888ea9435
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 fbdb62006e..4437689dc7 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 6d39290e28..eec534b0d6 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 0faaf12a47..d20d9c2296 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 56ee949468..809a518545 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 e41b463456..8d3c8752c7 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 b22486308b..ae4eb8eb15 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 0000000000..e240e70ff3
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 0000000000..a9b70c6ea2
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 0000000000..105909c061
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 0000000000..7f86f45adb
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 0000000000..39efaf09e5
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 0000000000..ae4eb8eb15
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 0000000000..e240e70ff3
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 0000000000..a9b70c6ea2
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 0000000000..105909c061
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 0000000000..7f86f45adb
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 0000000000..39efaf09e5
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 61f39139c9..66c1b25b37 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 0000000000..d3b673ee8e
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 0000000000..557b7aaa0f
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 0000000000..d276172229
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 0000000000..c82ede3372
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 0000000000..3eb060c4f4
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 0000000000..66c1b25b37
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 0000000000..d3b673ee8e
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 0000000000..557b7aaa0f
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 0000000000..d276172229
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 0000000000..c82ede3372
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 0000000000..3eb060c4f4
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 0000000000..d45ceba915
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 0000000000..97c3f8e318
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 0000000000..b8ce47c836
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 0000000000..dc03392385
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 0000000000..b93eb97312
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 0000000000..bca8efbbad
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 0000000000..4672eabedb
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 8c43032ee1..f4b4f8f114 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 78f9df82f5..ce36d13b5b 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 e47483ab25..2e1da565ed 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 6fc87407d5..0b2b742f17 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 5d6165c406..7aac92e9c8 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 2c2784f51c..07f6285be4 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 ee55ee154a..d07869ca78 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 d92dd6420e..7317379fb5 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 0000000000..a32a2e17da
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 0000000000..2b4e657fb5
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 0000000000..2dcf4eef09
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 0000000000..9566448450
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 0000000000..441f344ec9
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 e6071f3ee0..193a775633 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 a4b7a4848a..b2c3a85f49 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 80c07a241a..476444b313 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 38f4b1a13b..79e156324c 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 11bb126786..b5264d60c7 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 ce3a29a346..d404c70a1c 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 f6e8f7db8a..f951e0a0b7 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 127c2f86a5..4dbb89a603 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 987fafb21e..b7cb2b519a 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 0000000000..61086831f9
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 0000000000..4471efca72
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 0000000000..48bc828d30
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 0000000000..3818123af8
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 0000000000..b6daa47178
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 0000000000..b7cb2b519a
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 0000000000..61086831f9
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 0000000000..4471efca72
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 0000000000..48bc828d30
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 0000000000..3818123af8
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 0000000000..b6daa47178
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 0000000000..608e0e501a
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 0000000000..44c0ea20dd
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 2d4edb20cc..c31c3e625c 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 e2a4bad81f..782140bb5e 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 2d4661bf8b..9ce8a85b89 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 eab8e5c372..325453e63b 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 723da5aa8c..9300727b86 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 6dcb272cbc..2308140ea4 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 0000000000..b2c3a85f49
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 e7fd8dd647..326f3f34ed 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 72453581da..968de324b5 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 4ca1aba4d4..7ae4aaa11d 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 fbc658b5a2..adec528bbc 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 c280a8a4a6..17d1b340e1 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 f9718db4a3..b8b19f283a 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 f6fb91f861..733385d382 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 500182bef9..e8b9220a8a 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 24ee434dc1..67907abd2f 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 500182bef9..e8b9220a8a 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 24ee434dc1..67907abd2f 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 1cfb219d3a..e100b05d5b 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 1cfb219d3a..e100b05d5b 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 0000000000..b4d0364c62
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 6f636c1115..aa5f428a40 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 c7309ac0c1..dbf93a1bd5 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 0000000000..aa5f428a40
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 e2d8c54c61..c0d1b8ff63 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 b381cccbbb..11c4ab4dba 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 47a5019415..ce0527e530 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 0abe262566..c808e9a66c 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 0000000000..cf8d9ce9cc
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 0000000000..0a61434bff
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 0000000000..a8d7afbe75
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 0000000000..439bd695d2
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 0000000000..e1ec44e9e0
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 0000000000..09382790d3
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 0000000000..17c22ecd1f
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 0000000000..24e7522127
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 0000000000..93ff137cad
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 0000000000..e90c76d634
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 0000000000..b6a5d4c14c
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 0000000000..6b4204b006
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 0000000000..e6e288fbc3
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 0000000000..dd0c540a85
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 0000000000..ce30222b5f
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 0000000000..479c455596
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 0000000000..beefa8ba3d
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 0000000000..d12b4184d1
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 0000000000..0767cdc83d
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 0000000000..0fd1705ee0
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 0000000000..f37d93537b
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 0000000000..3229065205
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 0000000000..723b135430
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 0000000000..57c033a82c
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 0000000000..99d15f62fe
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 0000000000..4f61ae788c
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 0000000000..878f03f5ac
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 0000000000..a817e52038
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 0000000000..16ef3e4fcb
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 0000000000..e38eb0ae75
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 0000000000..a2b46c1595
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 0000000000..4551b7e391
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 0000000000..fa24b099b9
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 0000000000..870da75d41
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 0000000000..a747d2599a
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 0000000000..f7489a8637
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 0000000000..e609e73dc6
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 0000000000..65b3ffe8a1
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 0000000000..d8fb288dc5
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 0000000000..47a3a49689
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 0000000000..ccaf9f20e0
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 0000000000..cace086815
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 0000000000..247a4e3b15
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 0000000000..b2df552bae
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 0000000000..406969c347
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 0000000000..21a4d5a1ca
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 0000000000..04b5f63c65
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 0000000000..de06dcd31f
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 0000000000..37259650cd
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 0000000000..822edeb4cb
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 0000000000..f790badc78
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 0000000000..332b78d80c
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 0000000000..8952941570
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 0000000000..e327add017
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 0000000000..503f6be6dc
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 0000000000..3c8ce0ddea
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 0000000000..89f477455e
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 0000000000..d8740a739b
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 0000000000..ab18b8200a
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 0000000000..7a3e20c611
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 0000000000..1fcccda360
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 0000000000..51bd760fe6
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 0000000000..57484e2418
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 0000000000..709d16d5dc
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 0000000000..a85e2d78d2
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 0000000000..39bcecba88
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 0000000000..737435ba2d
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 0000000000..aa9398881a
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 0000000000..174216af98
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 0000000000..baffa99a57
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 0000000000..7aea92ea09
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 0000000000..bf25d0a8a3
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 0000000000..18253c66d3
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 0000000000..31a5ede704
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 0000000000..b40c278c4e
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 0000000000..d0707674ba
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 0000000000..0eb9fbf943
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 0000000000..58f1cb8dc8
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 0000000000..cdf5250716
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 0000000000..1ee11b69fb
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 0000000000..17b8898689
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 0000000000..0bf4992767
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 0000000000..60c5ba150e
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 0000000000..70c1d705b9
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 0000000000..66ef293d6f
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 0000000000..3021e1cb54
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 0000000000..9f0be713a6
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 0000000000..9a4cd02713
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 0000000000..3bc0bb615a
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 0000000000..83cffc80cb
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 0000000000..33041ef7ac
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 0000000000..1a7383c8c2
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 0000000000..e1acbf43e8
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 0000000000..d762cba00e
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 0000000000..1ee1898f54
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 0000000000..72879d16df
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 0000000000..0b98f903e2
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 0000000000..03fbce0e69
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 0000000000..cfe204f860
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 0000000000..7f608c8d5e
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 0000000000..ac6a3b2056
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 0000000000..fbcf1a09d9
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 0000000000..627f7e712f
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 0000000000..b7a9504e47
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 0000000000..ac0db89750
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 0000000000..bf873e9f3f
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 0000000000..69c066ece4
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 0000000000..ad45b1424e
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 0000000000..5f7600a8b5
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 0000000000..8b6d50942c
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 0000000000..ebb7bee5dd
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 0000000000..bbacca400b
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 0000000000..e62abcef64
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 0000000000..dde46aa176
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 0000000000..aea9d650d6
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 0000000000..61b2d7f339
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 0000000000..5047039b02
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 0000000000..07a1da4c20
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 0000000000..ac70a64380
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 0000000000..0657847fb3
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 0000000000..5b07bc2b11
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 0000000000..d440d867b0
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 0000000000..33591e2b17
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 0000000000..535ed24ba9
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 0000000000..c6ad97cd20
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 0000000000..21e5007557
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 0000000000..f478de8f77
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 0000000000..1a70859b0a
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 0000000000..0d7465daee
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 0000000000..cb99069046
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 0000000000..13fc1e8d4a
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 0000000000..f0faff4abd
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 0000000000..731697bb94
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 0000000000..a058ebd102
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 0000000000..afb2176155
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 0000000000..29ac8e0b39
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 0000000000..d5b942fc1b
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 0000000000..67ffd44141
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_headscarf/2.png b/public/images/emoji/emoji_one/woman_with_headscarf/2.png
new file mode 100644
index 0000000000..4f2bdfe86d
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_with_headscarf/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_headscarf/3.png b/public/images/emoji/emoji_one/woman_with_headscarf/3.png
new file mode 100644
index 0000000000..88b8a9b48f
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_with_headscarf/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_headscarf/4.png b/public/images/emoji/emoji_one/woman_with_headscarf/4.png
new file mode 100644
index 0000000000..fd3a258317
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_with_headscarf/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_headscarf/5.png b/public/images/emoji/emoji_one/woman_with_headscarf/5.png
new file mode 100644
index 0000000000..20506a656e
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_with_headscarf/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_headscarf/6.png b/public/images/emoji/emoji_one/woman_with_headscarf/6.png
new file mode 100644
index 0000000000..7593783299
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_with_headscarf/6.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 0000000000..6a14664a48
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 0000000000..833f6d6ee5
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 0000000000..1e6d42f5a9
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 0000000000..84c3524407
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 0000000000..1aa5162a85
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 0000000000..a414e72d80
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 39c0f1079f..4b9eb1d572 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 7db014b105..3221d033a2 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 0000000000..a1f5bf6791
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 83b4a03877..be9dffce5d 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 83ac373451..d3d5a18431 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 ca69d33653..7a6168d4c7 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 83334c1122..05ce41a23a 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 19c555328e..68212efaf1 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 94953f9005..6a7dc8dda2 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 0000000000..a29b270808
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 0000000000..5151d2aca8
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 0000000000..02c0859599
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 0000000000..0306698c2b
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 0000000000..6011f6aeb6
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 6339665c40..76c0e60d89 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 2ba0d27e7b..7fca911a61 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 0000000000..3a37c85041
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 78bf43895d..106775040d 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 8bdb521f16..c96fc0cc2e 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 96990fd9b1..0a063880ee 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 0000000000..3e7d4cbea5
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 fef2e9cdc4..629e603fcf 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 0000000000..324632dd46
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 8123d5e090..7a255c7c1a 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 0000000000..c3af3c54d7
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 40fbdd4c11..59f618fdb7 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 40fbdd4c11..59f618fdb7 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 0000000000..d46f18de17
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 53a200ed42..8087a67232 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 0000000000..6621dc4a7b
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 0000000000..37b29f3252
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 0000000000..c7aa537558
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 0000000000..1e24d40e56
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 0000000000..5b1740d87b
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 0000000000..e67bd06a2a
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 0000000000..1f6f64836b
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 0000000000..e706d7c7a5
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 0000000000..9bf7711367
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 0000000000..35fc141cba
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 0000000000..bd43bad304
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 0000000000..5b68287702
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 0000000000..d6b5336e12
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 0000000000..44d2a4fc66
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 0000000000..92235c693c
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 0000000000..6eb5db8e21
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 0000000000..4676f24e21
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 0000000000..771ad02569
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 0000000000..501883feb4
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 0000000000..e00355202a
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 0000000000..1428e8a0ea
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 0000000000..d1ce86be98
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 0000000000..178a26fea0
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 0000000000..295e9bbdc6
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 0000000000..53a5eb2ccb
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 0000000000..8f30fc9e38
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 0000000000..36a4e57d1f
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 0000000000..77c57605e9
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 0000000000..58bcd6a2fc
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 0000000000..3bc6b5a57a
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 0000000000..417aad5844
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 0000000000..50c4c6b272
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 0000000000..4cd01455cd
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 0000000000..0585a1c36c
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 0000000000..dc86670a86
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 0000000000..47399184f7
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 0000000000..2ce958b920
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 0000000000..8b2669f0ce
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 0000000000..8d428869d4
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 0000000000..cc2853f6d9
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 0000000000..cd3dc01ab2
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 0000000000..00c53ca2bd
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 0000000000..2700dcd39c
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 0000000000..f4f58e2e25
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 0000000000..550f047067
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 0000000000..ff5a1a69fb
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 0000000000..0fd73782c2
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 0000000000..8e51518eef
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 0000000000..e0ca086f4c
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 0000000000..6157d5e417
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 0000000000..2e46b4983e
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 0000000000..0869151648
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 0000000000..82c7fcb3cf
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 0000000000..689a10c00f
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 0000000000..3d3ee7dcfa
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 0000000000..5aca11a07e
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 0000000000..cedaec8a4d
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 0000000000..d1006c6c19
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 0000000000..52899f30da
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 0000000000..2bab6a6f12
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 0000000000..5a6759de63
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 0000000000..e3ff113cba
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 0000000000..97c4bbdd6d
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 0000000000..bee7380c6c
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 0000000000..f50a1389fe
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 0000000000..1e5e815098
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 0000000000..270321de17
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 0000000000..846307fcf3
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 0000000000..31bc57f66e
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 0000000000..0d55a3b8a5
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 0000000000..3e26428da1
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 0000000000..cea37e3f45
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 0000000000..26f28620d3
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 0000000000..b7f0770bfa
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 0000000000..d0031653e0
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 0000000000..d95ee952c3
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 0000000000..0bd799e866
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 0000000000..230b491ccb
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 0000000000..2cb9ab11bb
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 0000000000..08a9c6e85b
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 0000000000..10e84d8f5d
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 0000000000..d87df932aa
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 0000000000..0262977544
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 0000000000..f2eff4c904
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 0000000000..8ac358c63f
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 0000000000..29700d0bf7
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 0000000000..04755b3923
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 0000000000..8d16454516
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 0000000000..416c995030
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 0000000000..d965f6a490
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 0000000000..81715516af
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 0000000000..459facc13b
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 0000000000..2e3a1fdd73
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 0000000000..2bfefce2be
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 0000000000..915e481889
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 0000000000..5c5909a17d
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 0000000000..4cfeb25e64
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 0000000000..3d27cd8953
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 0000000000..3d27cd8953
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 0000000000..edd74bfd73
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 0000000000..c0e176217b
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 0000000000..024cdb23b5
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 0000000000..faa8c8fbe7
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 0000000000..59b4ecf2a0
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 0000000000..4e3c3241ee
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 0000000000..3250db1a61
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 0000000000..ba7d05faa1
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 0000000000..02393b8bf1
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 0000000000..43b9d1234c
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 0000000000..8d394e75d9
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 0000000000..db838c4790
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 0000000000..8a7f5d0409
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 0000000000..c01948acd5
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 0000000000..d90dc597c1
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 0000000000..b38f526062
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 0000000000..b1cfa9dc3b
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 0000000000..3b5d0df295
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 0000000000..62234d5dba
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 0000000000..3be5a53903
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 0000000000..ed95128e19
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 0000000000..815a93ef0b
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 0000000000..75713abc23
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 0000000000..4c1986ac6f
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 0000000000..59bfa2ae2f
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 0000000000..59bfa2ae2f
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 0000000000..80b2e3fda4
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 0000000000..f364eba710
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 0000000000..cf8781b5ef
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 0000000000..f14ac06077
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 0000000000..caab400018
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 0000000000..bb8a282801
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 0000000000..2cd9961c95
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 0000000000..830578344d
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 0000000000..2cdda450a8
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 0000000000..20a21d567e
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 0000000000..fbff78ffbb
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 0000000000..ac6a6c2c9f
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 0000000000..4dad1da7db
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 0000000000..739f1de58c
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 0000000000..62a23de466
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 0000000000..2cd9628b76
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 0000000000..85bfaeb578
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 0000000000..ac6a6c2c9f
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 0000000000..4dad1da7db
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 0000000000..739f1de58c
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 0000000000..62a23de466
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 0000000000..2cd9628b76
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 0000000000..85bfaeb578
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 0000000000..7df66bcfb7
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 0000000000..d997111fc5
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 0000000000..2173defed8
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 0000000000..9ca3e7b1cb
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 0000000000..2ffaa93680
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 0000000000..008ff97772
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 0000000000..09c0ac3fe9
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 0000000000..857b92f231
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 0000000000..6ac723e1c8
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 0000000000..a63f16624f
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 0000000000..894e33bee1
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 0000000000..894e33bee1
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 0000000000..894e33bee1
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 0000000000..8e052d9adb
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 0000000000..ed22a6cb38
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 0000000000..4a2fdeb304
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 0000000000..b1f6e168d7
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 0000000000..f75b75a74e
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 0000000000..a9665b318a
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 0000000000..a42b3caf88
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 0000000000..98d795e847
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 0000000000..b4b2bff015
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 0000000000..035842b005
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 0000000000..f69c94220e
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 0000000000..01bc9362c1
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 0000000000..80429e29ec
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 0000000000..e75dc9ec50
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 0000000000..faa710e211
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 0000000000..5f6dded80b
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 0000000000..50bd10b5db
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 0000000000..21a073029d
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 0000000000..21a073029d
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 0000000000..bb74e98818
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 0000000000..6f1ce980f3
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 0000000000..75f2fac760
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 0000000000..d9a2d20fc1
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 0000000000..e2079b8040
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 0000000000..120dba4f56
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 0000000000..108f8765b6
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 0000000000..96e0fc4e07
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 0000000000..37d2867b23
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 0000000000..454968531e
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 0000000000..56d1d538d5
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 0000000000..e2079b8040
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 0000000000..120dba4f56
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 0000000000..108f8765b6
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 0000000000..96e0fc4e07
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 0000000000..37d2867b23
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 0000000000..454968531e
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 0000000000..eab8bcf9f6
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 0000000000..39b2f70d9a
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 0000000000..1cdb55d7bd
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 0000000000..1479fbc064
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 0000000000..521d5bf885
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 0000000000..bb3897810e
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 0000000000..9ddf6bbc4a
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 0000000000..5cc92e307e
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 0000000000..95f312482c
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 0000000000..95f312482c
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 0000000000..23e7612417
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 0000000000..1d1dd50585
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 0000000000..b6dd0cc78b
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 0000000000..5c1237bdad
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 0000000000..b237819755
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 0000000000..5666f561d1
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 0000000000..b9af66d432
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 0000000000..7fe4d1187d
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 0000000000..5e67a2f95d
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 0000000000..6bc6df45cb
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 0000000000..7a9dac388b
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 0000000000..acdb7812c3
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 0000000000..cfe7273eb3
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 0000000000..aee96b85a7
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 0000000000..b4fffd5a30
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 0000000000..d8d6a0de15
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 0000000000..6a573ffb48
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 0000000000..1cefe68636
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 0000000000..11e258fa61
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 0000000000..70e3888d3e
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 0000000000..52e92bb7d6
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 0000000000..37108efb1f
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 0000000000..a7c2fcdfd9
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 0000000000..0a8ee484ce
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 0000000000..cc6fb6e617
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 0000000000..5d39475b06
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 0000000000..ce96b52fc3
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 0000000000..b4976f1124
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 0000000000..b81cebfba1
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 0000000000..5db3f3a78c
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 0000000000..09614c3722
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 0000000000..3eba365766
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 0000000000..af9bd4d5e7
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 0000000000..5afa9092b4
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 0000000000..466a96d4dc
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 0000000000..896268d22b
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 0000000000..b26787ae8a
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 0000000000..77002adc85
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 0000000000..786e74def7
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 0000000000..8675b47940
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 0000000000..91493ade75
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 0000000000..3697a723dd
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 0000000000..49ea37f389
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 0000000000..7bf622d736
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 0000000000..801a577654
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 0000000000..8bcfb35910
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 0000000000..dbcc662a1d
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 0000000000..e764892f5b
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 0000000000..0a33d718d2
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 0000000000..f6f4b24775
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 0000000000..ef61032004
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 0000000000..f50a1389fe
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 0000000000..8bcfb35910
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 0000000000..dbcc662a1d
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 0000000000..e764892f5b
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 0000000000..0a33d718d2
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 0000000000..f6f4b24775
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 0000000000..ef61032004
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 0000000000..bbe859ce67
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 0000000000..e6fa7ca7f5
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 0000000000..206a368708
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 0000000000..047411f966
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 0000000000..9d43cffab0
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 0000000000..85a701f354
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 0000000000..b0d88a73b9
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 0000000000..4b480dd9bf
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 0000000000..abb4d24834
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 0000000000..28d4189bc1
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 0000000000..0a447532d8
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 0000000000..777a3f9cfb
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 0000000000..d0d67a57f5
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 0000000000..0d04819d22
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 0000000000..c817adeeeb
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 0000000000..c8e889faec
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 0000000000..f510542abc
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 0000000000..4d4011d449
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 0000000000..815538138b
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 0000000000..fb591aa4fb
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 0000000000..5adcffa4b9
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 0000000000..d166f981b2
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 0000000000..7c8cb50a78
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 0000000000..e113d8cb42
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 0000000000..ffb6004902
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 0000000000..f279c55580
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 0000000000..016fae0a30
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 0000000000..d257eb58b7
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 0000000000..76478e5f9c
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 0000000000..3b592cdefb
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 0000000000..742e0629fd
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 0000000000..0dbe9606a3
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 0000000000..e3d2479344
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 0000000000..9f758979a1
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 0000000000..5e03a6d23b
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 0000000000..3f16d80d9e
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 0000000000..647e1c4d79
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 0000000000..bea8c8c0b6
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 0000000000..24cdec2e5f
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 0000000000..485bf7f6a4
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 0000000000..5185700c63
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 0000000000..70218a9ea2
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 0000000000..8e23c7097c
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 0000000000..c519f8a954
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 0000000000..74894241cc
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 0000000000..83e731cc34
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 0000000000..a8a91afa97
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 0000000000..5231c708a0
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 0000000000..753693b093
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 0000000000..f56875edac
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 0000000000..37d74f5c97
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 0000000000..5a48f96192
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 0000000000..6150740817
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 0000000000..ac57b9d39f
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 0000000000..7459422611
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 0000000000..ecb85a4566
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 0000000000..995ea58f80
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 0000000000..8b7a55a0fa
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 0000000000..e89e914f1a
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 0000000000..b8b14b579a
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 0000000000..8cd3bd7e57
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 0000000000..6e50aea9ee
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 0000000000..31a89ad633
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 0000000000..d619e0b8d7
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 0000000000..f99492eb6c
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 0000000000..02be2857ff
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 0000000000..f0c258b55b
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 0000000000..a6891ba5bd
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 0000000000..0a7ca06fb4
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 0000000000..5f3c565b69
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 0000000000..fd24f1b440
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 0000000000..fd49394ac1
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 0000000000..fd49394ac1
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 0000000000..b9aaf46348
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 0000000000..414dc9caf6
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 0000000000..4ee3f2c1fd
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 0000000000..68ccf48d0d
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 0000000000..f413b1e61f
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 0000000000..0a27def4ef
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 0000000000..2eb0b1616f
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 0000000000..2e5976e9d2
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 0000000000..4ee3c9caa7
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 0000000000..1252c37a6d
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 0000000000..0d4c9eba17
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 0000000000..f7e1446d11
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 0000000000..024cdb23b5
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 0000000000..5f2766de91
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 0000000000..5f2766de91
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 0000000000..b608bb66a1
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 0000000000..b1e27091c9
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 0000000000..7780a4a036
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 0000000000..66a3f29830
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 0000000000..939b6874ea
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 0000000000..bcbd9a26d2
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 0000000000..9c7f4536bf
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 0000000000..70d8309d8c
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 0000000000..411ec9a7a1
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 0000000000..a344cb3ae8
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 0000000000..e0da30d5a6
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 0000000000..26b77c821c
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 0000000000..610d0e4734
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 0000000000..49ea37f389
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 0000000000..5d933361d5
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 0000000000..be24239508
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 0000000000..6e8de585ec
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 0000000000..1c819a0386
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 0000000000..c3a4b402b1
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 0000000000..c3a4b402b1
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 0000000000..5a700ed9d8
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 0000000000..16bf728cdd
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 0000000000..1f50ca9713
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 0000000000..a87033991a
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 0000000000..33e50494a3
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 0000000000..7a0e4f1cb7
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 0000000000..81a69110e9
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 0000000000..b5c64c9cc8
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 0000000000..0763a8bd94
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 0000000000..3ed705b902
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 0000000000..10479dbe19
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 0000000000..e150c07478
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 0000000000..e46b2790d6
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 0000000000..8efd86eddf
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 0000000000..5706420297
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 0000000000..6958b7d8d8
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 0000000000..ce421a823f
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 0000000000..e365f1b5d7
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 0000000000..64864074f2
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 0000000000..6fafd2ced0
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 0000000000..75c2bb97d6
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 0000000000..41b4c09ddc
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 0000000000..75c2bb97d6
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 0000000000..24bcea239b
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 0000000000..c3ea87fdbe
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 0000000000..e17edcfc70
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 0000000000..4052901763
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 0000000000..a60881e107
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 0000000000..44e6d82998
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 0000000000..d01e802f64
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 0000000000..a08c620dd7
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 0000000000..55a4e45e2b
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 0000000000..5024b9412d
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 0000000000..00dfbe29d3
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 0000000000..1b24d16ae0
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 0000000000..8159f1d4d5
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 0000000000..7943b73f67
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 0000000000..62a0e89459
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 0000000000..54ab69b0e9
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 0000000000..b584c2d381
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 0000000000..bff9bd0f0a
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 0000000000..d2bf76b159
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 0000000000..252f51565e
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 0000000000..067c79fbe3
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 0000000000..b50c585430
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 0000000000..44a6ef348a
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 0000000000..1abb0b3dcf
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 0000000000..e36cfd6faf
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 0000000000..3818ab1cbb
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 0000000000..c6631cdc26
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 0000000000..ebc3cfd4de
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 0000000000..bf51349130
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 0000000000..ea2c4adcbc
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 0000000000..77fba2691e
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 0000000000..af72ddd43a
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 0000000000..4dff8b7757
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 0000000000..b3a1194391
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 0000000000..f52c360898
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 0000000000..505234ede5
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 0000000000..c3ff77cd7f
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 0000000000..972becb6d4
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 0000000000..8ec20ac7dc
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 0000000000..ddf42b7ab7
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 0000000000..7ef1a8ab5e
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 0000000000..680ef4cd1e
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 0000000000..8f1746d075
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 0000000000..f45cd42199
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 0000000000..ffd91a25b4
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 0000000000..24834e2de3
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 0000000000..fd843824ed
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 0000000000..f45cd42199
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 0000000000..be44d531a7
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 0000000000..ffd91a25b4
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 0000000000..24834e2de3
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 0000000000..fd843824ed
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 0000000000..c78134fdee
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 0000000000..e0889a39fd
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 0000000000..a9325fc771
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 0000000000..c409f9f4c4
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 0000000000..7226b15e04
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 0000000000..e76b533149
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 0000000000..c9025e34e4
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 0000000000..00f0517ca5
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 0000000000..cbf6ba5696
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 0000000000..aef91ca852
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 0000000000..f8ac0baf8b
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 0000000000..fceafe31e0
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 0000000000..e765f50715
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 0000000000..e17edcfc70
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 0000000000..16df1b4590
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 0000000000..3a71c800c6
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 0000000000..d198bb4654
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 0000000000..556801a6c1
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 0000000000..8a37c428cb
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 0000000000..2eef1d6c17
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 0000000000..a34af9d64a
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 0000000000..eb88827ad0
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 0000000000..5d09fb084f
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 0000000000..24cdec2e5f
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 0000000000..5feb48f134
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 0000000000..bd490932a3
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 0000000000..ff712fcd47
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 0000000000..e59a2e7038
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 0000000000..95e6d6a842
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 0000000000..721415e844
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 0000000000..5feb48f134
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 0000000000..bd490932a3
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 0000000000..ff712fcd47
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 0000000000..e59a2e7038
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 0000000000..95e6d6a842
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 0000000000..721415e844
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 0000000000..7963262606
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 0000000000..63998c76ae
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 0000000000..83eb2d8749
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 0000000000..b518850876
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 0000000000..80eacbdd52
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 0000000000..34a1e9e2c0
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 0000000000..471e812ed3
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 0000000000..7cf81e3889
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 0000000000..d1e4afbaca
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 0000000000..5037c4bc64
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 0000000000..8e1dccf987
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 0000000000..4efbb5500d
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 0000000000..02f646d46f
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 0000000000..fc0d621ff8
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 0000000000..607565d83d
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 0000000000..d54b5e01ab
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 0000000000..cc17ff14df
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 0000000000..e7ed95e52a
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 0000000000..7d6bd73005
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 0000000000..e6c16e4ea0
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 0000000000..c8e9c1eace
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 0000000000..e46d4de859
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 0000000000..e46d4de859
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 0000000000..955b98c386
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 0000000000..30aa3b8329
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 0000000000..8fcabbd430
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 0000000000..30aa3b8329
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 0000000000..b82bbf04b4
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 0000000000..07ab022382
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 0000000000..842c5a4e22
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 0000000000..07ab022382
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 0000000000..4f1324e09f
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 0000000000..21b6b7be8f
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 0000000000..0aee85e183
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 0000000000..efe2c6fcd1
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 0000000000..549988455d
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 0000000000..0ad5b02c2d
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 0000000000..0aaa1cf765
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 0000000000..818c05713d
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 0000000000..8094a7c205
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 0000000000..1e3c9dfa38
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 0000000000..8a0bf65a6c
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 0000000000..8a0bf65a6c
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 0000000000..6cc9a0e748
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 0000000000..64740f53d5
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 0000000000..c2cea2221f
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 0000000000..f11e296dd9
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 0000000000..9ba3b1ff09
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 0000000000..7ce5cd5811
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 0000000000..c6297b1c63
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 0000000000..8ae4d9b0f9
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 0000000000..f3529e2537
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 0000000000..0265996d38
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 0000000000..c168bb1ba5
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 0000000000..ec1da04367
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 0000000000..8a0b6d323d
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 0000000000..b1ee561346
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 0000000000..f77cfe7b5a
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 0000000000..ea06ae025c
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 0000000000..0a119e84f4
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 0000000000..4436dee31e
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 0000000000..392fdddcc1
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 0000000000..4b2f313f9b
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 0000000000..d6c771a319
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 0000000000..e29bde1f8b
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 0000000000..09027a2fb2
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 0000000000..dc1db4da40
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 0000000000..e3bdddf392
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 0000000000..383f800e95
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 0000000000..dc16af3ad2
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 0000000000..9c0dc646a1
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 0000000000..b66d427e09
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 0000000000..cf2b568c06
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 0000000000..7f80f4ed57
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 0000000000..88558e4ab2
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 0000000000..8e56922aa6
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 0000000000..8e56922aa6
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 0000000000..e05d637236
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 0000000000..cec2b05df7
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 0000000000..208851079d
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 0000000000..c68c9968ab
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 0000000000..7927c18674
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 0000000000..13b2052130
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 0000000000..8a83bc31d2
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 0000000000..dec9fb054b
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 0000000000..8a83bc31d2
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 0000000000..f90ec298ad
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 0000000000..a4a0514f9c
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 0000000000..ff79ba245d
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 0000000000..72b36c8e4f
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 0000000000..adfdfd4256
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 0000000000..964116acbb
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 0000000000..a6df67b2a9
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 0000000000..92aa546e94
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 0000000000..bb8ef11ea5
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 0000000000..b6b6f440ed
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 0000000000..a48da60494
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 0000000000..a48da60494
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 0000000000..3ec8a867b4
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 0000000000..2d2e8919ff
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 0000000000..120faa7536
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 0000000000..120faa7536
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 0000000000..5b51721f2e
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 0000000000..e416a8ce5d
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 0000000000..881e01a927
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 0000000000..26ca83eeb5
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 0000000000..0537746c4c
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 0000000000..b1e27091c9
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 0000000000..0894ceafb5
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 0000000000..24f1af2db3
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 0000000000..606fe6a1ee
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 0000000000..f53f8fa83d
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 0000000000..8f39851230
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 0000000000..afb48d19e8
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 0000000000..cc6d41c785
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 0000000000..effc75342e
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 0000000000..bae7802d5e
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 0000000000..588ece3f43
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 0000000000..de48ff449c
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 0000000000..bcb88cd2b5
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 0000000000..624e2df711
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 0000000000..edfa5ccac9
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 0000000000..9fdcff829a
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 0000000000..9fdcff829a
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 0000000000..c67e4d4b5e
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 0000000000..cea46ab094
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 0000000000..ef0e02eb6a
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 0000000000..30fba91ffe
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 0000000000..2ad3f8a41b
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 0000000000..186137dfb4
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 0000000000..d0c94c34e4
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 0000000000..6adaf8cddb
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 0000000000..489a779bf6
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 0000000000..d2cfd45f3c
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 0000000000..e160129faf
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 0000000000..c9cce258ae
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 0000000000..654ee58983
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 0000000000..16c75ee0c1
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 0000000000..f62ef93bf8
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 0000000000..4b1179a35b
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 0000000000..2388c5ce03
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 0000000000..6b2e51b85e
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 0000000000..5273991fab
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 0000000000..f659e02dbe
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 0000000000..26fbfc9714
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 0000000000..030250142f
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 0000000000..cf86fbaad6
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 0000000000..cec55b549a
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 0000000000..4f60ef799d
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 0000000000..bbbdefa653
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 0000000000..12c277e585
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 0000000000..af0cf9daba
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 0000000000..09351f437d
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 0000000000..0f24a98369
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 0000000000..b6c91f603b
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 0000000000..d7dc652e62
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 0000000000..f8b6dd873e
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 0000000000..15984024f2
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 0000000000..4689243a17
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 0000000000..861cbf808c
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 0000000000..5074876010
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 0000000000..505c908b18
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 0000000000..e160129faf
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 0000000000..fb13367f7f
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 0000000000..e160129faf
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 0000000000..ea1f5e5b37
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 0000000000..38e992318c
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 0000000000..630fd66415
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 0000000000..82d50c036e
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 0000000000..2553a5dbf7
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 0000000000..d0d78350cd
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 0000000000..938b488ddb
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 0000000000..bdfc11b7f6
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 0000000000..5eeee24e64
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 0000000000..fb3da8bf70
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 0000000000..ce75d328c3
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 0000000000..e7230e1697
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 0000000000..85532dadc7
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 0000000000..ace98269b5
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 0000000000..5c77590cb2
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 0000000000..04830b29ab
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 0000000000..711c98965b
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 0000000000..cd7c3d1f2b
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 0000000000..aed8f62e0b
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 0000000000..97bec4d11f
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 0000000000..c6fbb4481d
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 0000000000..887f70e365
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 0000000000..8a864a00bd
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 0000000000..84bb9ec9c5
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 0000000000..c9440239c0
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 0000000000..ed3c41bc0d
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 0000000000..e499d8d0fa
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 0000000000..f56ee4a1ff
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 0000000000..bc6cebcbf6
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 0000000000..c8313f984f
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 0000000000..cf2064a1ad
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 0000000000..188462d1b7
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 0000000000..429938294b
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 0000000000..91e1de4e5d
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 0000000000..42821806e9
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 0000000000..9e8d3adb89
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 0000000000..88d190e392
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 0000000000..e6ab8ade74
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 0000000000..d97a84cea1
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 0000000000..f349fd56d1
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 0000000000..08b4d427ba
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 0000000000..d31b0f6209
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 0000000000..67d15f282c
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 0000000000..4bb3d823f8
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 0000000000..a8b6469dcb
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 0000000000..e1aa1a80db
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 0000000000..02c84cb237
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 0000000000..b26bb9ae07
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 0000000000..b8aa492934
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 0000000000..e5f46611b5
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 0000000000..569ee332e2
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 0000000000..d6749b798d
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 0000000000..34b21628a1
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 0000000000..34b21628a1
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 0000000000..ff4539599f
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 0000000000..08b4d427ba
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 0000000000..2e16043166
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 0000000000..2e16043166
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 0000000000..02c84cb237
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 0000000000..b26bb9ae07
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 0000000000..b8aa492934
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 0000000000..e5f46611b5
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 0000000000..569ee332e2
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 0000000000..3b0f755fd8
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 0000000000..f9a1813738
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 0000000000..966c36a0b9
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 0000000000..68b9671817
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 0000000000..1e1995f8bf
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 0000000000..7246ed2b02
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 0000000000..734955bf4a
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 0000000000..a702d02e5b
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 0000000000..d21b40444d
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 0000000000..5f3f8b821e
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 0000000000..7246ed2b02
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 0000000000..734955bf4a
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 0000000000..a702d02e5b
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 0000000000..d21b40444d
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 0000000000..5f3f8b821e
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 0000000000..5da7953f8d
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 0000000000..3e26428da1
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 0000000000..c28739d459
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 0000000000..c42b60ae3b
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 0000000000..47eb29d7b8
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 0000000000..b82bbf04b4
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 0000000000..4f1324e09f
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 0000000000..c1703a7c86
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 0000000000..d88a5881ce
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 0000000000..b56a1cb3ff
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 0000000000..fb4f1e573a
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 0000000000..df504caef6
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 0000000000..f94b0fd46a
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 0000000000..131226b2b4
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 0000000000..f0fcd6fc1d
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 0000000000..3acb6ea9c3
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 0000000000..f0fcd6fc1d
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 0000000000..3e6178f10a
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 0000000000..d871ffb8a4
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 0000000000..66b69e4f30
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 0000000000..e4367bbe5d
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 0000000000..1ac1c39d87
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 0000000000..144e9976c5
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 0000000000..73ab8a0067
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 0000000000..89982e42bf
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 0000000000..827a249f5f
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 0000000000..735826472a
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 0000000000..5731ed8c0a
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 0000000000..db84dee200
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 0000000000..6390df800d
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 0000000000..32890d75b7
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 0000000000..36ed9f43f1
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 0000000000..f1ebb97514
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 0000000000..1360d252ce
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 0000000000..270de69cd2
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 0000000000..99e8ae08f3
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 0000000000..5600a525fb
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 0000000000..4db9f46f34
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 0000000000..010432f201
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 0000000000..a71348e322
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 0000000000..b62317eca5
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 0000000000..abceea0434
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 0000000000..e64682dfe5
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 0000000000..daa257c5c2
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 0000000000..cea258d2f0
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 0000000000..5c1237bdad
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 0000000000..a9325fc771
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 0000000000..964116acbb
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 0000000000..82d50c036e
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 0000000000..f8afe53651
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 0000000000..bc850e7890
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 0000000000..e5e0646c21
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 0000000000..ab749c77f7
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 0000000000..73c4454e7f
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 0000000000..f3932d9f3c
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 0000000000..b0c3a76dd6
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 0000000000..5f052fff2a
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 0000000000..52e8a4a95f
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 0000000000..d871ffb8a4
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 0000000000..3bb5512763
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 0000000000..27cd209049
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 0000000000..27cd209049
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 0000000000..0585a1c36c
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 0000000000..dc86670a86
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 0000000000..25bd410b02
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 0000000000..baf5f9ddde
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 0000000000..7b4667ad26
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 0000000000..7d5c862855
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 0000000000..f8aee2c7b5
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 0000000000..e5dcb6812a
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 0000000000..65f4c1147a
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 0000000000..47eb29d7b8
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 0000000000..e233399e52
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 0000000000..df63dcc4f4
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 0000000000..df63dcc4f4
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 0000000000..94a8cdca40
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 0000000000..c128b6075e
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 0000000000..96584c9f57
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 0000000000..f728effd4a
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 0000000000..99d39c965c
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 0000000000..74bcddb7e7
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 0000000000..f8afe53651
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 0000000000..ad38ccf08d
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 0000000000..ad38ccf08d
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 0000000000..ad38ccf08d
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 0000000000..1b4d5a6973
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 0000000000..b67d58af24
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 0000000000..8e67281736
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 0000000000..ecc9bec0fa
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 0000000000..20578913f1
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 0000000000..e3ffbd8888
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 0000000000..49655d5827
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 0000000000..33274868db
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 0000000000..55d6c9d460
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 0000000000..1c5988a20b
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 0000000000..1c5988a20b
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 0000000000..e10ce817f8
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 0000000000..5f04a5370d
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 0000000000..8be682c19d
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 0000000000..28b7990842
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 0000000000..5f8463196b
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 0000000000..8c92a9c484
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 0000000000..1e5f89e7b5
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 0000000000..db018f2e81
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 0000000000..2a32b70d58
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 0000000000..824a0bea02
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 0000000000..ca476ecf1f
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 0000000000..c36b369e0b
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 0000000000..8e7fce2f49
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 0000000000..992338bb2b
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 0000000000..aadc06129f
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 0000000000..8ad10be116
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 0000000000..695c4a6cb9
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 0000000000..3457e01312
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 0000000000..75df52ada8
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 0000000000..9d4cd0c36b
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 0000000000..ff164d2be1
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 0000000000..56112c50ed
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 0000000000..6563b2a69f
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 0000000000..707ca2a121
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 0000000000..9ed66afdac
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 0000000000..bc850e7890
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 0000000000..6a9d3b8d1b
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 0000000000..7ffd84c773
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 0000000000..a08a5b768b
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 0000000000..f0eddcc91a
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 0000000000..673f81ef6f
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 0000000000..f1b8829dba
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 0000000000..45ea4f57b9
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 0000000000..cbe9f11a12
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 0000000000..d4abb27460
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 0000000000..7cb11440d2
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 0000000000..be0e85d289
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 0000000000..cef329322b
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 0000000000..94ef7ffcde
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 0000000000..84c7e27b99
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 0000000000..f542d343c0
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 0000000000..c4d0909ec8
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 0000000000..74133163aa
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 0000000000..fec4f1ea63
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 0000000000..1a11dd2c56
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 0000000000..4773a63cf9
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 0000000000..7c66018bd4
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 0000000000..750595fb3c
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 0000000000..36609a5670
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 0000000000..93df509c6e
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 0000000000..d986fe7501
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 0000000000..3fa61820b6
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 0000000000..22116c217a
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 0000000000..ebbc3263e2
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 0000000000..36609a5670
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 0000000000..93df509c6e
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 0000000000..d986fe7501
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 0000000000..3fa61820b6
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 0000000000..22116c217a
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 0000000000..ebbc3263e2
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 0000000000..115ceac8f0
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 0000000000..bd7d3d17fb
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 0000000000..02e8230771
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 0000000000..8e4a01cfcc
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 0000000000..4f8be8c914
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 0000000000..0d7aa5e0d9
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 0000000000..41f7e66438
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 0000000000..6de0611496
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 0000000000..6503af87cc
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 0000000000..c274ffb629
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 0000000000..4955c0c8ca
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 0000000000..535329d592
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 0000000000..9c3f439624
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 0000000000..e3325b048e
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 0000000000..31c8707a43
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 0000000000..87f17a6ff2
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 0000000000..2e4d806cfd
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 0000000000..22c7edad28
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 0000000000..768958e130
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 0000000000..47c8a26276
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 0000000000..508ab37205
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 0000000000..c9c437901d
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 0000000000..d291c89c97
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 0000000000..66df4e7a1b
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 0000000000..819233d197
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 0000000000..17d12bc5b1
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 0000000000..57dbe51427
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 0000000000..3d2088de4a
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 0000000000..38b5ea5003
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 0000000000..fefb6c23e5
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 0000000000..9b3ea56a62
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 0000000000..0ab6714e8d
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 0000000000..4fde6f1fd6
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 0000000000..42349efadd
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 0000000000..77ae53aaf1
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 0000000000..b7e7259bc8
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 0000000000..f92e78a324
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 0000000000..dd1482188c
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 0000000000..c2ab6fb507
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 0000000000..7e8246bd69
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 0000000000..0d269b9bbd
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 0000000000..2ceb411ad2
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 0000000000..b6c6486938
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 0000000000..e211f4d8bb
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 0000000000..47626a4a9e
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 0000000000..210b78048c
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 0000000000..543c86e14d
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 0000000000..3e21e1099b
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 0000000000..b5a80561e4
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 0000000000..2be41d13bc
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 0000000000..2fab3a1ac2
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 0000000000..7e6d5998c7
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 0000000000..5787ce4a5b
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 0000000000..f5d2a28312
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 0000000000..b6c6486938
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 0000000000..e211f4d8bb
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 0000000000..47626a4a9e
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 0000000000..210b78048c
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 0000000000..543c86e14d
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 0000000000..3e21e1099b
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 0000000000..53d2160f9a
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 0000000000..c5843ee75b
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 0000000000..7d18dc8fd3
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 0000000000..71bb73f2c5
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 0000000000..2b7c33b207
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 0000000000..71bb73f2c5
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 0000000000..efd899ad5a
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 0000000000..a0097d9b71
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 0000000000..d23202d6c3
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 0000000000..7ff91aea00
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 0000000000..635801f647
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 0000000000..63bc01077e
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 0000000000..244c30c382
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 0000000000..f41f01af47
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 0000000000..37a9048ad7
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 0000000000..6ddd74b586
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 0000000000..1d901925fe
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 0000000000..5fcac72a70
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 0000000000..74fa972cad
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 0000000000..401416b286
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 0000000000..6ac8b5fdf6
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 0000000000..e175a1dfff
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 0000000000..1ce5502869
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 0000000000..3034639583
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 0000000000..fb7d92ec9b
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 0000000000..97bec4d11f
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 0000000000..366b1c8cef
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 0000000000..cf3508c82c
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 0000000000..1b5bf7b178
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 0000000000..87f15c3a77
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 0000000000..ad8a16d330
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 0000000000..1cb11ddf8b
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 0000000000..8e6d385190
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 0000000000..e0803aeb18
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 0000000000..8d6aaa7b93
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 0000000000..99e48c36ca
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 0000000000..11d94403ae
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 0000000000..54b5613486
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 0000000000..d9e495f28e
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 0000000000..21f0df3b74
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 0000000000..1cb11ddf8b
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 0000000000..1cb11ddf8b
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 0000000000..666b6d5038
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 0000000000..f442fec0c9
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 0000000000..c40c5c83fb
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 0000000000..9b978b3540
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 0000000000..e4ecb07aac
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 0000000000..ad220c2eef
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 0000000000..ad220c2eef
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 0000000000..610292c362
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 0000000000..5655dc87de
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 0000000000..ff1e121280
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 0000000000..a93d0c41ef
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 0000000000..c606db130a
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 0000000000..7b5a1105c3
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 0000000000..6df8ea8c4c
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 0000000000..5f9a0a658b
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 0000000000..d0aff11833
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 0000000000..a23e57415a
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 0000000000..b4b2bff015
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 0000000000..786a040156
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 0000000000..befd5ea865
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 0000000000..7aacc88528
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 0000000000..07a007cec6
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 0000000000..999574cf48
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 0000000000..f4cf9ba39d
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 0000000000..b697e37867
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 0000000000..ab5119fd2d
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 0000000000..87adf35427
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 0000000000..0fe32af15f
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 0000000000..d72eba3a1a
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 0000000000..0fe32af15f
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 0000000000..b689dbc376
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 0000000000..9a31e886bd
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 0000000000..e139fe1077
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 0000000000..cff6f63bee
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 0000000000..6775ff4882
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 0000000000..a48da60494
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 0000000000..5f9a0a658b
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 0000000000..763eaa1b8f
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 0000000000..5f9a0a658b
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 0000000000..f0eb7db322
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 0000000000..f0eb7db322
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 0000000000..f0eb7db322
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 0000000000..98963a97c9
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 0000000000..e8b83c13b7
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 0000000000..7db482a697
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 0000000000..7b5a1105c3
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 0000000000..a9e9fcbbe5
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 0000000000..fe53d60a2e
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 0000000000..399f5a4e85
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 0000000000..73c4ab4da3
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 0000000000..17f27bb535
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 0000000000..86b6277008
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 0000000000..ebf4a42d5b
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 0000000000..da989200eb
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 0000000000..3ae5f9b82b
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 0000000000..c3906b3705
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 0000000000..17d66f473b
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 0000000000..92055ff0cd
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 0000000000..2c8a485a1f
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 0000000000..890ae929d2
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 0000000000..c7228bf6a8
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 0000000000..f02f68988a
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 0000000000..a8fd945655
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 0000000000..11d735eb66
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 0000000000..3128a2b638
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 0000000000..dafb42d72e
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 0000000000..e30df4c1f5
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 0000000000..cccd140ba3
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 0000000000..e71a1f1e63
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 0000000000..2d2e8919ff
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 0000000000..7829f538f8
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 0000000000..548d97611f
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 0000000000..e5e0646c21
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 0000000000..8dde73ba95
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 0000000000..b6e2ad00df
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 0000000000..dc2c807511
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 0000000000..1720c3d9b1
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 0000000000..0ba2b78fa4
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 0000000000..77c502d606
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 0000000000..dd7075f444
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 0000000000..3287ca8815
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 0000000000..adfdbc3c1a
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 0000000000..43a2f9139f
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 0000000000..9c6e7ee147
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 0000000000..db84adf5ef
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 0000000000..8e5c09d59b
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 0000000000..ab749c77f7
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 0000000000..73219d28c1
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 0000000000..731858e2cf
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 0000000000..cc55fd6981
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 0000000000..84889b66f5
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 0000000000..18b9399432
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 0000000000..a16457d533
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 0000000000..2bfefce2be
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 0000000000..12264637b0
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 0000000000..f04615710f
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 0000000000..8459c5ef5f
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 0000000000..138fd3f2b5
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 0000000000..2419578972
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 0000000000..e1fe9088c1
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 0000000000..42882123c5
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 0000000000..68c5f1c4fd
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 0000000000..70ac23c2fc
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 0000000000..7e32d050e6
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 0000000000..1abebdab60
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 0000000000..c606db130a
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 0000000000..b181cd8aee
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 0000000000..277172ed84
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 0000000000..efea0b70bd
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 0000000000..73c4454e7f
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 0000000000..32b00e4806
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 0000000000..6ecfc717c9
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 0000000000..36f91eb31c
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 0000000000..5dca502f80
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 0000000000..e79a949ccb
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 0000000000..fc1a854716
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 0000000000..ecc594465b
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 0000000000..aa083f2b81
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 0000000000..33bf88b07b
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 0000000000..f11e296dd9
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 0000000000..a23d4c4e2e
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 0000000000..68cbb0f148
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 0000000000..a4cbbe176c
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 0000000000..5b8710dfd7
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 0000000000..0801a71d89
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 0000000000..8a3acbaf3a
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 0000000000..86df388cca
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 0000000000..8cb3b728e0
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 0000000000..0a60642fa6
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 0000000000..14773e7d99
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 0000000000..0050c7afb3
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 0000000000..4a602a95bb
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 0000000000..136ea59d3d
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 0000000000..d7c8408ead
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 0000000000..5231c708a0
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 0000000000..753693b093
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 0000000000..f56875edac
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 0000000000..37d74f5c97
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 0000000000..5a48f96192
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 0000000000..6150740817
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 0000000000..2828cee4c8
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 0000000000..54f93f04d9
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 0000000000..a6c90e15d4
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 0000000000..93605ebfd5
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 0000000000..be0473304d
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 0000000000..8d680f5b12
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 0000000000..e4e961d5d5
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 0000000000..bcdf20d175
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 0000000000..9b91906952
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 0000000000..c3ce145e9e
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 0000000000..e1aecd7aef
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 0000000000..a428a15a9b
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 0000000000..b4080878f6
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 0000000000..aace4fa00b
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 0000000000..aace4fa00b
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 0000000000..6e6f416421
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 0000000000..f42fefcebc
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 0000000000..d4e7e6766a
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 0000000000..302081914b
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 0000000000..c584b6db28
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 0000000000..a8c6259a9b
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 0000000000..ec7f17ed11
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 0000000000..103b356312
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 0000000000..e5201112af
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 0000000000..c1c1fcbf23
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 0000000000..88ff0d0c97
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 0000000000..6042cea736
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 0000000000..14ef7c72b2
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 0000000000..b70217e894
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 0000000000..aa984ea926
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 0000000000..5decb0e800
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 0000000000..e0bb218cc0
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 0000000000..bb51bde8bb
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 0000000000..f7dfde34ed
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 0000000000..6219ae26cc
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 0000000000..0ad5b02c2d
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 0000000000..96584c9f57
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 0000000000..c7d649a378
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 0000000000..a8c6737d1b
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 0000000000..e31e547296
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 0000000000..84fef974e0
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 0000000000..6690c383f8
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 0000000000..a4c8ef41d2
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 0000000000..708ec7416c
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 0000000000..a0881161e4
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 0000000000..0ba4cfeff0
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 0000000000..71c1b13f92
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 0000000000..823f6843fa
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 0000000000..c2ff6622a0
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 0000000000..76d0a52e37
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 0000000000..ddb5de5580
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 0000000000..302dd62dfb
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 0000000000..5766d97ecf
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 0000000000..1ee01907c3
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 0000000000..4d7c0ac620
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 0000000000..724bab14ab
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 0000000000..a3ae327980
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 0000000000..854fd4ce85
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 0000000000..dbf3a91298
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 0000000000..e0fec7e04b
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 0000000000..8fcabbd430
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 0000000000..842c5a4e22
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 0000000000..587e506d98
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 0000000000..a25d5ea4d4
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 0000000000..f100fd13a4
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 0000000000..775a8b2f2b
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 0000000000..c9703ba994
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 0000000000..55cc03db8d
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 0000000000..ef19c197c7
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 0000000000..f6850d6276
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 0000000000..51dd587074
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 0000000000..619a4af214
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 0000000000..c75a2f06c7
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 0000000000..3289978982
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 0000000000..c77e49351f
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 0000000000..fe6e80f216
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 0000000000..1cc6650697
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 0000000000..4bacb1ea06
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 0000000000..05d4d810aa
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 0000000000..4f62b71923
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 0000000000..87b201e106
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 0000000000..d3c5344420
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 0000000000..3248c7ea4b
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 0000000000..3f4608453c
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 0000000000..dfb79a0fa1
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 0000000000..ecffb4b3dc
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 0000000000..30a01501b6
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 0000000000..1b5c86eeb3
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 0000000000..aaf7c70f74
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 0000000000..431a4461e3
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 0000000000..fb4421abb0
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 0000000000..277e11f0c5
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 0000000000..dfd446bd8d
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 0000000000..8877efb271
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 0000000000..8fb843406f
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 0000000000..4dfed22855
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 0000000000..072ab0c475
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 0000000000..0d3c6b8535
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 0000000000..805aa4fcf6
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 0000000000..60d2b62aa2
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 0000000000..f3f2a5b04c
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 0000000000..040218520e
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 0000000000..8aec654d0e
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 0000000000..3d74099cbb
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 0000000000..d41bc27788
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 0000000000..01ee2f8efe
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 0000000000..c819f4029a
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 0000000000..890aa9695f
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 0000000000..58aee73c58
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 0000000000..94355c5aca
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 0000000000..ddd6d4a05a
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 0000000000..9263f22556
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 0000000000..4f8d7b6339
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 0000000000..ac0c07e8d5
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 0000000000..f5b09e3c74
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 0000000000..d9e2f4f8f9
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 0000000000..c6fb8f9c46
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 0000000000..196de5ae66
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 0000000000..a275fe56a7
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 0000000000..cf79c4c311
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 0000000000..b0c9648562
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 0000000000..8924978790
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 0000000000..dc6e22dbc1
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 0000000000..e7df59313d
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 0000000000..a43787bc20
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 0000000000..9788ff223e
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 0000000000..b92f649135
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 0000000000..2494826b0d
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 0000000000..74caaf3d67
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 0000000000..87b1460b99
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 0000000000..266219eec1
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 0000000000..07434ed578
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 0000000000..a233efb0c7
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 0000000000..9dbd254708
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 0000000000..3e13cf5b0d
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 0000000000..6fe28eed3c
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 0000000000..5231c708a0
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 0000000000..753693b093
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 0000000000..f56875edac
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 0000000000..37d74f5c97
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 0000000000..5a48f96192
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 0000000000..6150740817
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 0000000000..68a5498555
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 0000000000..9115065434
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 0000000000..7d21e35505
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 0000000000..5560c73e7c
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 0000000000..0507a8bc08
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 0000000000..7e5b911860
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 0000000000..b20c0cd734
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 0000000000..bdfee1817b
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 0000000000..052c0b0fa2
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 0000000000..ddd7e0530d
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 0000000000..1a374e1485
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 0000000000..4d5fac75df
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 0000000000..d6cc6a380d
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 0000000000..631afe697f
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 0000000000..c28f2a5db9
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 0000000000..12d32ecb86
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 0000000000..f04ba21ece
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 0000000000..4b5b1a7d5c
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 0000000000..df912ad255
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 0000000000..2d9a40a7b6
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 0000000000..0b6093c561
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 0000000000..4b776c98ef
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 0000000000..994526ddb9
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 0000000000..e95117df24
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 0000000000..641784af02
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 0000000000..db95aa1431
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 0000000000..0da3a36f50
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 0000000000..0e7d62291b
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 0000000000..b2ef2f0420
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 0000000000..f237971ab0
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 0000000000..196949a366
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 0000000000..0b3fe7f349
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 0000000000..2af0c956d9
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 0000000000..7098a598ca
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 0000000000..790ecc7051
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 0000000000..7082b178d7
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 0000000000..8d9964cf03
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 0000000000..33b1d7c764
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 0000000000..1f3f9215d0
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 0000000000..20d6288ed7
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 0000000000..b653112d27
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 0000000000..c7dce8c231
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 0000000000..14bc7c68d1
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 0000000000..4f343861d3
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 0000000000..3548a2ef8d
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 0000000000..7b45751b64
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 0000000000..3247752e19
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 0000000000..bd6e616eb2
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 0000000000..af1f36d1cd
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 0000000000..5a1e488e80
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 0000000000..7c7d6b849e
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 0000000000..ff16a5535f
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 0000000000..179479a696
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 0000000000..b02e169aaf
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 0000000000..61e00fd0b0
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 0000000000..6db5885ddb
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 0000000000..f1fc833e9c
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 0000000000..9ca39fce99
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 0000000000..ab9cd50150
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 0000000000..a805a9fe34
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 0000000000..f3df881028
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 0000000000..4e65783bfd
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 0000000000..516eb98afb
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 0000000000..89326187fb
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 0000000000..b899d241e7
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 0000000000..a13d0b8c92
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 0000000000..897c8af412
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 0000000000..7acaf3e280
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 0000000000..c24cb60730
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 0000000000..f0789f0b59
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 0000000000..8471ef972a
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 0000000000..985678e804
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 0000000000..b85d905466
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 0000000000..e7cdd5b69a
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 0000000000..00f91851cb
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 0000000000..a82ddfb140
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 0000000000..d4140998d3
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 0000000000..ed08c11d2b
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 0000000000..4d8208bbe1
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 0000000000..aed10e4c38
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 0000000000..21b1243f7d
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 0000000000..f8d2f531dc
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 0000000000..27ea100413
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 0000000000..e6c6bccfff
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 0000000000..12733f7310
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 0000000000..5be2053690
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 0000000000..d6fe373e5d
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 0000000000..ed8e0fa95f
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 0000000000..37ebcedaf7
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 0000000000..0fd02d1709
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 0000000000..658845d182
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 0000000000..fd2a2c17e3
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 0000000000..0fd074ec85
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 0000000000..88ef725c32
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 0000000000..924ab084d2
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 0000000000..fa49843cb6
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 0000000000..e9157aa9a5
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 0000000000..62a0e89459
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 0000000000..8c102ea49d
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 0000000000..d9ec405655
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 0000000000..35a77d3ec6
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 0000000000..50e9d87cd5
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 0000000000..20265c357a
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 0000000000..3fb3c370ed
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 0000000000..963acc0b3b
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 0000000000..908482b905
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 0000000000..c6349e9146
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 0000000000..83899fc193
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 0000000000..8645741a67
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 0000000000..6ebddf72f9
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 0000000000..b2d809725e
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 0000000000..892e43bd6a
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 0000000000..e9668ae1d8
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 0000000000..f891cc952f
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 0000000000..8295da5a87
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 0000000000..549596cc7c
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 0000000000..963acc0b3b
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 0000000000..908482b905
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 0000000000..c6349e9146
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 0000000000..83899fc193
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 0000000000..8645741a67
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 0000000000..6ebddf72f9
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 0000000000..23fa26e4ce
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 0000000000..846272e367
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 0000000000..43a7879d24
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 0000000000..545091e6d7
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 0000000000..57fbc8512f
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 0000000000..857488da67
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 0000000000..57fbc8512f
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 0000000000..0b8649ee37
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 0000000000..474cf5ae56
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 0000000000..8a9a0a4d8c
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 0000000000..ab63e2f4f0
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 0000000000..fe2a128793
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 0000000000..4cddf230fb
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 0000000000..ee1b999e0d
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 0000000000..b97fbf42e3
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 0000000000..9079f60b81
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 0000000000..decc0b5892
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 0000000000..e3e3e89cb1
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 0000000000..5a5f36684e
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 0000000000..72d987aadc
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 0000000000..8d87aab277
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 0000000000..39a19cd401
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 0000000000..73bedb2c02
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 0000000000..36413ab8cf
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 0000000000..1cb1b661b9
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 0000000000..b4b77dd6ba
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 0000000000..0bed6bc464
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 0000000000..549d03fdc7
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 0000000000..2b72052cc9
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 0000000000..d10b32281f
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 0000000000..9881d1fa04
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 0000000000..8e7fce2f49
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 0000000000..992338bb2b
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 0000000000..aadc06129f
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 0000000000..8ad10be116
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 0000000000..695c4a6cb9
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 0000000000..3457e01312
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 0000000000..857488da67
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 0000000000..d2de8252bb
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 0000000000..e3073f128a
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 0000000000..aee0cb3011
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 0000000000..0c8fa7297a
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 0000000000..21e170f6fd
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 0000000000..d4463a0147
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 0000000000..17833f535a
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 0000000000..cd2459518e
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 0000000000..cd2459518e
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 0000000000..6b3ed315ad
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 0000000000..abd97b8904
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 0000000000..cf97894508
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 0000000000..c47f55ca63
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 0000000000..590a3057c9
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 0000000000..2dcf74036c
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 0000000000..7cbd07cef3
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 0000000000..28712de519
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 0000000000..c20fb89b18
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 0000000000..7f16d0a66d
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 0000000000..d06f52a438
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 0000000000..b0a68fffb5
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 0000000000..3eba365766
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 0000000000..b9659e99a3
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 0000000000..3eba365766
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 0000000000..ba7fb373ba
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 0000000000..2d5622664b
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 0000000000..e987911d26
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 0000000000..6b545f0058
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 0000000000..31e00446a8
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 0000000000..19ecb982e3
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 0000000000..0c96a1744f
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 0000000000..a407ca499f
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 0000000000..1d87023abe
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 0000000000..74eafbd22e
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 0000000000..31e00446a8
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 0000000000..19ecb982e3
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 0000000000..0c96a1744f
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 0000000000..a407ca499f
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 0000000000..1d87023abe
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 0000000000..74eafbd22e
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 0000000000..f752e9cdf3
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 0000000000..78e8c2577b
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 0000000000..2e4e5a891d
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 0000000000..ee9fd92c8d
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 0000000000..6f663ca4c0
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 0000000000..f49e7054c9
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 0000000000..e242393030
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 0000000000..eee5c10a52
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 0000000000..b3e246f09b
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 0000000000..8e52012ef3
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 0000000000..08163d834a
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 0000000000..3a71c800c6
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 0000000000..e074b30c83
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 0000000000..454250431e
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 0000000000..07d5cd56f0
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 0000000000..1923fbd8e9
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 0000000000..a6e57fc30b
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 0000000000..48e8121256
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 0000000000..cdefbc9340
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 0000000000..de7de0327a
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 0000000000..25324ab420
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 0000000000..756a72d513
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 0000000000..305d54c21b
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 0000000000..e8ebb0250a
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 0000000000..83ba3d4bfd
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 0000000000..eb0d6edff4
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 0000000000..ddd35e7478
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 0000000000..03d8b063f3
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 0000000000..8248f6d20c
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 0000000000..401fc30568
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 0000000000..1ccebe791d
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 0000000000..6f1b18791a
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 0000000000..345829e2a3
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 0000000000..be33983b20
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 0000000000..78df4c6564
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 0000000000..146f82f51d
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 0000000000..bcfc28f1be
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 0000000000..b4a35b6540
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 0000000000..923baa7cd8
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 0000000000..3aec1b2f8e
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 0000000000..f505b371fd
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 0000000000..db29d2dff9
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 0000000000..443c1a5e93
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 0000000000..0ec48392c2
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 0000000000..c872774b80
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 0000000000..24a2cfa27d
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 0000000000..cd57822d80
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 0000000000..b844baf25b
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 0000000000..b844baf25b
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 0000000000..b01d79e5ee
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 0000000000..e617f1227a
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 0000000000..3def1bf771
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 0000000000..45914c48c7
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 0000000000..c20fb89b18
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 0000000000..70599fc0db
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 0000000000..9d86ff873c
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 0000000000..f0dd5da17e
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 0000000000..052dcce75f
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 0000000000..052dcce75f
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 0000000000..13953da5d7
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 0000000000..13953da5d7
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 0000000000..fbf8bf7d8e
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 0000000000..e405151e2d
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 0000000000..fb6c4a4d37
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 0000000000..23c9d9a762
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 0000000000..8e42c84cad
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 0000000000..15cd82061e
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 0000000000..daaa26cc16
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 0000000000..30cc5f68ba
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 0000000000..81d14e9d8b
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 0000000000..f3db9deb40
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 0000000000..930838c69b
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 0000000000..1b39244154
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 0000000000..ae600f93d1
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 0000000000..aaa680f7ab
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 0000000000..f96e628a3a
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 0000000000..10cf1a4bec
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 0000000000..2bf5e24008
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 0000000000..482a4698d1
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 0000000000..faf146004d
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 0000000000..27ba65f98b
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 0000000000..cb7608b4e9
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 0000000000..6498b6f082
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 0000000000..0bac0f4cd4
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 0000000000..1b39244154
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 0000000000..ae600f93d1
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 0000000000..aaa680f7ab
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 0000000000..f96e628a3a
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 0000000000..10cf1a4bec
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 0000000000..2bf5e24008
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 0000000000..26a54246de
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 0000000000..609faa8c37
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 0000000000..afccb3291f
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 0000000000..06ff47b0a9
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 0000000000..7efa68146e
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 0000000000..574acba100
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 0000000000..d15d10aece
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 0000000000..962a6171b9
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 0000000000..3a2439e150
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 0000000000..8f583249c5
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 0000000000..c61a3cd9b2
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 0000000000..5024bbcac6
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 0000000000..acc16c879d
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 0000000000..79221668f3
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 0000000000..2b29d4ef60
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 0000000000..30c97ad185
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 0000000000..bfdf9849b5
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 0000000000..b8ebfe080a
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 0000000000..ff9430ffdc
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 0000000000..ff4e024188
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 0000000000..65518db51f
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 0000000000..7293a012e8
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 0000000000..f4ce329fce
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 0000000000..b6a1b5acbf
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 0000000000..c497a79d04
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 0000000000..e231c280ac
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 0000000000..7c6d9e728f
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 0000000000..7c6d9e728f
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 0000000000..200b86672b
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 0000000000..e1d5e568ae
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 0000000000..e7fc3a26ca
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 0000000000..963f15614e
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 0000000000..93c785d3e1
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 0000000000..57dfe1cdc4
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 0000000000..428fa0ef4f
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 0000000000..a409be9d6e
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 0000000000..a053dbd980
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 0000000000..e16633321f
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 0000000000..4634976b5e
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 0000000000..f0003c09eb
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 0000000000..39c7357546
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 0000000000..e5ed37b439
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 0000000000..11e28436c0
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 0000000000..4d341255ee
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 0000000000..b6dc29569a
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 0000000000..df01731869
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 0000000000..825602b97d
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 0000000000..18b9399432
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 0000000000..8796829b87
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 0000000000..b36f41960e
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 0000000000..dc1441fea5
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 0000000000..abc19e06c7
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 0000000000..c90549f681
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 0000000000..5152c9c1a3
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 0000000000..47e7cef999
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 0000000000..2fb0c5a7e5
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 0000000000..7e4e62a615
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 0000000000..2414ae1dfe
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 0000000000..7f3d54e689
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 0000000000..07eb64ff15
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 0000000000..02e8230771
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 0000000000..8e4a01cfcc
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 0000000000..4f8be8c914
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 0000000000..0d7aa5e0d9
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 0000000000..41f7e66438
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 0000000000..6de0611496
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 0000000000..bcd7113141
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 0000000000..bcd7113141
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 0000000000..59e0df087e
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 0000000000..bd14ab9d48
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 0000000000..024cdb23b5
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 0000000000..19dfdd08c5
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 0000000000..cacce06c49
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 0000000000..c3d11c9bb8
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 0000000000..8cf9c77656
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 0000000000..466a96d4dc
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 0000000000..1c7e6b1be0
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 0000000000..a85e8a6c4b
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 0000000000..c45027d8ad
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 0000000000..0422b88434
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 0000000000..d36a522438
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 0000000000..0e41b410c5
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 0000000000..473c50cb3d
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 0000000000..5857e8dcca
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 0000000000..ec99aeb164
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 0000000000..785022965e
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 0000000000..f740242a40
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 0000000000..f217c930a7
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 0000000000..5b398f5cf2
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 0000000000..3749f9e0c5
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 0000000000..905115e712
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 0000000000..f1389ed765
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 0000000000..5252e91f82
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 0000000000..a3e3e6dac9
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 0000000000..1b6042549f
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 0000000000..9e3cb95303
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 0000000000..c7d649a378
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 0000000000..f4c74d1d49
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 0000000000..69aace7555
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 0000000000..2e4399d762
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 0000000000..8644ca6a57
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 0000000000..fb66ba11c4
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 0000000000..6d9b2fc8cc
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 0000000000..c5d52f5c7a
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 0000000000..3d4288d10d
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 0000000000..6ff36c07cb
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 0000000000..c25d42927d
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 0000000000..2a564db426
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 0000000000..ebd14eecd0
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 0000000000..328e921619
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 0000000000..42329aa2d2
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 0000000000..b4080878f6
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 0000000000..b449d67794
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 0000000000..d9eab9434c
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 0000000000..2bb23697b7
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 0000000000..db29d2dff9
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 0000000000..49ea56e322
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 0000000000..e1bf14a947
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 0000000000..51953bf695
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 0000000000..b1ee561346
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 0000000000..87ab1cb24e
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 0000000000..624e2df711
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 0000000000..ccd6e7503e
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 0000000000..4eeaef2b55
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 0000000000..4eeaef2b55
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 0000000000..30e37f1588
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 0000000000..34f4eed2d5
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 0000000000..b1ec7e04ec
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 0000000000..6219ae26cc
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 0000000000..6219ae26cc
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 0000000000..96584c9f57
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 0000000000..8a9a0a4d8c
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 0000000000..2f90e4ed7d
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 0000000000..6936f1c999
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 0000000000..f72ca15c11
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 0000000000..08d06a7377
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 0000000000..741dec170c
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 0000000000..d8a6229d6b
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 0000000000..71330d66a8
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 0000000000..a1345ecbd2
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 0000000000..016b920bcd
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 0000000000..4591eb5290
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 0000000000..19be3236ae
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 0000000000..064b747aae
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 0000000000..1e5f89e7b5
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 0000000000..db018f2e81
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 0000000000..2a32b70d58
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 0000000000..824a0bea02
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 0000000000..ca476ecf1f
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 0000000000..c36b369e0b
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 0000000000..e9404fd525
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 0000000000..8817578cf0
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 0000000000..0e9bf46e0b
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 0000000000..918e3d435a
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 0000000000..0c01143530
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 0000000000..fed226dac2
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 0000000000..65a0790d92
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 0000000000..7260df1d15
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 0000000000..d14580a3db
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 0000000000..9313ab2116
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 0000000000..f432b554b3
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 0000000000..dc7087e028
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 0000000000..ac6a6c2c9f
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 0000000000..4dad1da7db
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 0000000000..739f1de58c
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 0000000000..62a23de466
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 0000000000..2cd9628b76
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 0000000000..85bfaeb578
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 0000000000..cfe7273eb3
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 0000000000..aee96b85a7
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 0000000000..b4fffd5a30
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 0000000000..d8d6a0de15
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 0000000000..6a573ffb48
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 0000000000..1cefe68636
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 0000000000..038973f940
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 0000000000..65473cdbce
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 0000000000..82e31162c0
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 0000000000..838df0d656
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 0000000000..cedf79afd2
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 0000000000..7bb2a217db
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 0000000000..bbb5523f93
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 0000000000..33fcf38a3c
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 0000000000..b8bbec494d
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 0000000000..cc216bfcae
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 0000000000..4f5f474d82
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 0000000000..f1785f8302
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 0000000000..fe2fe97e23
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 0000000000..d17e33d638
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 0000000000..70b65c6a31
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 0000000000..3dbd743222
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 0000000000..935993c860
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 0000000000..628b9b0706
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 0000000000..3e3d79bca5
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 0000000000..5f34afb51d
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 0000000000..19e1150b30
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 0000000000..df63dcc4f4
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 0000000000..64b9998541
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 0000000000..64b9998541
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 0000000000..0532b9ae9c
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 0000000000..d0b150916e
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 0000000000..6230cc4801
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 0000000000..114adc6a21
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 0000000000..0717726383
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 0000000000..38d0116c82
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 0000000000..d4a84e5d31
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 0000000000..d43212ff56
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 0000000000..48753a68ef
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 0000000000..e5bda27630
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 0000000000..51200df95a
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 0000000000..fd6c930fc8
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 0000000000..56f542c20a
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 0000000000..8e85edee2b
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 0000000000..5f8007ca82
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 0000000000..4076a56aa1
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 0000000000..7a2f0f8033
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 0000000000..df280e5a7e
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 0000000000..fd27f92492
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 0000000000..375079cacf
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 0000000000..7087cdd806
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 0000000000..22ceb6d0bd
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 0000000000..4a7973ef63
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 0000000000..85cb47d273
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 0000000000..ebf21760c6
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 0000000000..b6d3fddfe6
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 0000000000..ba3389e362
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 0000000000..bce3cbdfa8
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 0000000000..71f95adf24
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 0000000000..7fc4a4877b
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 0000000000..78057f600c
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 0000000000..c77c1c05a8
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 0000000000..4efbb5500d
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 0000000000..02f646d46f
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 0000000000..fc0d621ff8
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 0000000000..607565d83d
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 0000000000..d54b5e01ab
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 0000000000..cc17ff14df
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 0000000000..566f93771b
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 0000000000..f319e4af5d
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 0000000000..c1652f098c
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 0000000000..92fe65ff97
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 0000000000..0bf22ab60d
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 0000000000..13ab6c5e90
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 0000000000..e175a1dfff
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 0000000000..b9cad43ce1
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 0000000000..e175a1dfff
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 0000000000..ccdc42f6c6
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 0000000000..77ff099394
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 0000000000..18aa7cdb7a
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 0000000000..9a03ae187c
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 0000000000..2f59011218
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 0000000000..220cacc7cb
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 0000000000..3f097365d9
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 0000000000..dd0ff20054
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 0000000000..9c2d26a096
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 0000000000..8b25b67c8e
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 0000000000..bebe99a8aa
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 0000000000..c6392b40a6
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 0000000000..b5f4f2999a
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 0000000000..7ca74c419e
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 0000000000..0e99fe45b1
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 0000000000..91faf90cf5
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 0000000000..0715623063
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 0000000000..038973f940
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 0000000000..65473cdbce
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 0000000000..82e31162c0
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 0000000000..838df0d656
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 0000000000..cedf79afd2
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 0000000000..7bb2a217db
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 0000000000..ef38e89858
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 0000000000..0d60a4c0e9
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 0000000000..11b9f06462
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 0000000000..ab26567ae2
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 0000000000..97ddc0f08b
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 0000000000..bf6a32e347
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 0000000000..71d6e55ae0
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 0000000000..d965748c88
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 0000000000..5b63304634
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 0000000000..5ff2e3c432
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 0000000000..6b6241fefc
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 0000000000..ddc0648e8e
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 0000000000..04918ba738
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 0000000000..9116d6ee9a
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 0000000000..ada39abc33
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 0000000000..ada39abc33
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 0000000000..5ec0ddf76b
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 0000000000..dd91dd02fa
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 0000000000..d3e3618184
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 0000000000..a00e9eb039
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 0000000000..2d2fabb6ec
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 0000000000..5f7f4ec891
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 0000000000..83b1de6c49
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 0000000000..f44ba4578b
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 0000000000..49933ec338
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 0000000000..2af30a213b
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 0000000000..08e62a5795
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 0000000000..6ee3cd3da1
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 0000000000..3fbfb20f27
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 0000000000..3acb6ea9c3
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 0000000000..5270bb9f87
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 0000000000..ed3c41bc0d
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 0000000000..e499d8d0fa
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 0000000000..f56ee4a1ff
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 0000000000..bc6cebcbf6
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 0000000000..c8313f984f
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 0000000000..cf2064a1ad
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 0000000000..f055ac431c
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 0000000000..ec56d3b10a
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 0000000000..79cf94cf55
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 0000000000..fae27e6a25
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 0000000000..f51ae1d0ff
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 0000000000..7e87b10732
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 0000000000..637d9d57d7
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 0000000000..63b2bb144b
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 0000000000..894f1b62c2
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 0000000000..986b22d2b2
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 0000000000..894f1b62c2
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 0000000000..ba7fb373ba
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 0000000000..ee26ea72d4
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 0000000000..2e744fd151
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 0000000000..8fdf276cd2
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 0000000000..8fdf276cd2
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 0000000000..70ce2bd0c9
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 0000000000..7b456ff579
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 0000000000..dedb706da2
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 0000000000..7b456ff579
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 0000000000..4d82fd066d
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 0000000000..af14c94a4f
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 0000000000..7e8bd4c6ad
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 0000000000..a65c925100
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 0000000000..527e2055be
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 0000000000..35a4c34bc7
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 0000000000..3a75748ef9
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 0000000000..db1c8f050c
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 0000000000..a0097d9b71
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 0000000000..d23202d6c3
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 0000000000..7ff91aea00
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 0000000000..635801f647
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 0000000000..63bc01077e
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 0000000000..244c30c382
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 0000000000..f41f01af47
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 0000000000..37a9048ad7
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 0000000000..6ddd74b586
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 0000000000..1d901925fe
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 0000000000..5fcac72a70
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 0000000000..74fa972cad
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 0000000000..6245929457
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 0000000000..5cdfab6d9a
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 0000000000..a469f9b420
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 0000000000..a8803b8816
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 0000000000..2d9def823e
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 0000000000..bbcb6dc0d3
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 0000000000..c162e95558
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 0000000000..ba12906310
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 0000000000..e377f7180f
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 0000000000..79139782ea
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 0000000000..b7ae99b4c5
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 0000000000..15dc25b2b2
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 0000000000..0a94688c88
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 0000000000..342d6fafd0
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 0000000000..6a27504e81
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 0000000000..daa638dc6a
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 0000000000..457f7ed4c5
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 0000000000..1d3bc70cc9
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 0000000000..888c2e010f
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 0000000000..358c2c878b
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 0000000000..ebe5b4b0eb
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 0000000000..a2d3d552bb
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 0000000000..385867923f
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 0000000000..21a811c997
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 0000000000..0a94688c88
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 0000000000..342d6fafd0
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 0000000000..6a27504e81
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 0000000000..daa638dc6a
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 0000000000..457f7ed4c5
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 0000000000..1d3bc70cc9
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 0000000000..4b0dd9f559
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 0000000000..19d41b3efe
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 0000000000..54c84f5778
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 0000000000..9015b0fde1
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 0000000000..aa374a2d34
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 0000000000..15024a56bd
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 0000000000..fef186ba91
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 0000000000..b2242fe470
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 0000000000..749a05960d
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 0000000000..faceb08c80
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 0000000000..09d8d0e308
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 0000000000..73597ff253
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 0000000000..832543f62d
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 0000000000..ad220c2eef
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 0000000000..9322abb6bf
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 0000000000..1679d4c5b9
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 0000000000..8e7fce2f49
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 0000000000..992338bb2b
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 0000000000..aadc06129f
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 0000000000..8ad10be116
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 0000000000..695c4a6cb9
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 0000000000..3457e01312
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 0000000000..9a6f39ef71
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 0000000000..685f57f86c
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 0000000000..e81681a603
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 0000000000..2a236f2a13
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 0000000000..60de4a64f2
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 0000000000..13a97cc4ef
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 0000000000..ad821b7575
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 0000000000..a9ff32238a
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 0000000000..3d3ee7dcfa
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 0000000000..88f8ad512b
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 0000000000..c728ecf9c1
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 0000000000..c728ecf9c1
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 0000000000..518c778f8b
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 0000000000..ab648dd83d
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 0000000000..8a864a00bd
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 0000000000..052dcce75f
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 0000000000..1d1919e0cd
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 0000000000..8a864a00bd
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 0000000000..2b16324878
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 0000000000..3360815814
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 0000000000..be7bcb7ae7
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 0000000000..b21ae33e63
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 0000000000..a6ac22f351
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 0000000000..35ccf8b943
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 0000000000..7b73bd927a
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 0000000000..7b73bd927a
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 0000000000..621b0acc04
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 0000000000..0bee4147be
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 0000000000..f51db26321
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 0000000000..e61c949d0d
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 0000000000..b21bb84ca6
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 0000000000..cc2a55e767
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 0000000000..f3932d9f3c
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 0000000000..6ce225a2ec
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 0000000000..d1db4d1796
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 0000000000..d45b1ccb14
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 0000000000..67bb67e979
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 0000000000..da3404f135
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 0000000000..02b731334a
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 0000000000..0a0dcc7d84
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 0000000000..d1db4d1796
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 0000000000..d45b1ccb14
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 0000000000..67bb67e979
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 0000000000..da3404f135
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 0000000000..02b731334a
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 0000000000..0a0dcc7d84
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 0000000000..960b63b65b
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 0000000000..01418f1a8d
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 0000000000..cde0a28703
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 0000000000..a9b8ba20ce
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 0000000000..e14cb3884a
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 0000000000..54b0cb838b
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 0000000000..114138c0b6
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 0000000000..a45a988ff5
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 0000000000..67fffa68f8
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 0000000000..d8580b190b
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 0000000000..73cb6717ef
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 0000000000..7e9b170b68
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 0000000000..de81c048d0
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 0000000000..fa20a00808
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 0000000000..f48e7f3a23
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 0000000000..ba3f9a1cdb
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 0000000000..4995fdca21
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 0000000000..5a6ef2f00d
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 0000000000..52b0fb2705
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 0000000000..6181e6ccc3
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 0000000000..215b68451d
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 0000000000..390a6a2550
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 0000000000..bbfcbd18df
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 0000000000..48510c86cf
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 0000000000..81715516af
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 0000000000..68cbb0f148
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 0000000000..dc3a6b29f6
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 0000000000..2f4d619997
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 0000000000..8740f0d688
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 0000000000..75713abc23
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 0000000000..73653eee2b
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 0000000000..a5d6791d93
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 0000000000..cfc748f865
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 0000000000..546ee1babb
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 0000000000..2215d4642f
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 0000000000..22f33ac23b
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 0000000000..76a4e2f5c7
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 0000000000..1ff4b8e92a
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 0000000000..82c810dd5b
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 0000000000..850e39dafe
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 0000000000..652e4f7ca9
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 0000000000..3b73a085a8
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 0000000000..990126746a
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 0000000000..f6411e5444
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 0000000000..24a81ca396
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 0000000000..712bc73000
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 0000000000..77139915b7
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 0000000000..f326d7825d
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 0000000000..de9106c369
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 0000000000..2d32427625
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 0000000000..a7af1346e5
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 0000000000..967f909261
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 0000000000..e69ca6add1
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 0000000000..300f700fcc
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 0000000000..dfad1cfc70
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 0000000000..856894743d
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 0000000000..d00270a662
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 0000000000..c6deaa7063
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 0000000000..dd46b772a4
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 0000000000..4fbc6a5915
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 0000000000..52c368a6a6
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 0000000000..80df6b3143
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 0000000000..f24f758f68
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 0000000000..e175a1dfff
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 0000000000..ee15abd993
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 0000000000..ee15abd993
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 0000000000..419cc70376
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 0000000000..1070d46a50
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 0000000000..e45d741b47
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 0000000000..816f090002
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 0000000000..72d987aadc
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 0000000000..8d87aab277
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 0000000000..39a19cd401
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 0000000000..73bedb2c02
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 0000000000..36413ab8cf
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 0000000000..1cb1b661b9
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 0000000000..8ff27d1176
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 0000000000..42a338884d
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 0000000000..5248152aba
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 0000000000..5208c51d59
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 0000000000..3a640a6c91
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 0000000000..9ff2306a45
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 0000000000..919452aacc
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 0000000000..a4cffe7aca
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 0000000000..9ff2306a45
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 0000000000..df4531d2b0
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 0000000000..df4531d2b0
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 0000000000..01805b1fe7
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 0000000000..f0f03bd3a8
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 0000000000..70398fd097
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 0000000000..feb77c5dac
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 0000000000..6934d93973
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 0000000000..e7705b515e
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 0000000000..76d7ae664b
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 0000000000..6ea7b53462
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 0000000000..70398fd097
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 0000000000..feb77c5dac
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 0000000000..6934d93973
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 0000000000..e7705b515e
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 0000000000..76d7ae664b
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 0000000000..6ea7b53462
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 0000000000..d6d67475bc
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 0000000000..587e506d98
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 0000000000..a25d5ea4d4
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 0000000000..f100fd13a4
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 0000000000..775a8b2f2b
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 0000000000..c9703ba994
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 0000000000..55cc03db8d
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 0000000000..d7dfe0e848
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 0000000000..2c240c1bb8
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 0000000000..d7dfe0e848
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 0000000000..2c240c1bb8
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 0000000000..2c240c1bb8
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 0000000000..a67edf96be
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 0000000000..9b716032fd
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 0000000000..6dfbe6eae2
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 0000000000..47399184f7
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 0000000000..e5b2ce33f2
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 0000000000..ce3ffc859b
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 0000000000..ff5080276e
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 0000000000..ffc0b20b6d
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 0000000000..b38ee2bad1
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 0000000000..07733f39a4
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 0000000000..3df89f4799
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 0000000000..c64dead528
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 0000000000..ad5ca55849
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 0000000000..cf36fecf96
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 0000000000..0981c4f092
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 0000000000..f3d1dd8b08
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 0000000000..4ca88c40fe
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 0000000000..45d642454c
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 0000000000..b1801ae41f
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 0000000000..b3e246f09b
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 0000000000..1c6f59397b
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 0000000000..6d3da25d65
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 0000000000..cf8c1f336d
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 0000000000..7c5a44116e
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 0000000000..e7cea15490
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 0000000000..abe744f0fe
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 0000000000..bc25658a74
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 0000000000..edb003e362
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 0000000000..abefab7234
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 0000000000..abefab7234
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 0000000000..825639b566
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 0000000000..5b34f82474
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 0000000000..8f2b9bbe9e
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 0000000000..e4476e1880
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 0000000000..209fffeaed
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 0000000000..06de16d091
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 0000000000..d8ddeba4e0
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 0000000000..2311f6534c
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 0000000000..967b98eb84
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 0000000000..58f47bcd9b
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 0000000000..c7cbc6967c
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 0000000000..ef0cc6b645
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 0000000000..d8caab8d91
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 0000000000..8276dcbec6
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 0000000000..b63a7dea20
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 0000000000..71550c5313
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 0000000000..081aa8bea4
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 0000000000..db195de7cd
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 0000000000..4e7665f831
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 0000000000..5ce2110879
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 0000000000..edf252b9bd
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 0000000000..edf252b9bd
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 0000000000..ec17855d07
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 0000000000..cf31f7eac1
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 0000000000..12ef291fa0
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 0000000000..568c1dec8a
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 0000000000..8cd3bd7e57
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 0000000000..8cd3bd7e57
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 0000000000..b8ebfe080a
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 0000000000..b8ebfe080a
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 0000000000..960cba2bf7
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 0000000000..57fbc8512f
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 0000000000..587e506d98
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 0000000000..a25d5ea4d4
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 0000000000..f100fd13a4
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 0000000000..775a8b2f2b
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 0000000000..c9703ba994
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 0000000000..55cc03db8d
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 0000000000..8e1b95f60e
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 0000000000..f15b9be56d
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 0000000000..e213bf7e40
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 0000000000..90fefd0cab
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 0000000000..d7686f8b60
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 0000000000..92eafffe94
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 0000000000..7943b73f67
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 0000000000..b05828b47c
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 0000000000..ddfd25fd22
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 0000000000..0ad57f80a4
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 0000000000..7381725ef4
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 0000000000..43cfbee5cb
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 0000000000..a89f689ad5
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 0000000000..96462ffd58
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 0000000000..7da8183f39
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 0000000000..a7cfe72b88
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 0000000000..66b496b9a2
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 0000000000..0bf418a00b
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 0000000000..1c5caa9a1c
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 0000000000..e2c6063d23
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 0000000000..bbdb0b7b75
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 0000000000..cf08756ebf
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 0000000000..74bff44004
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 0000000000..9695738762
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 0000000000..0b2dd5ba43
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 0000000000..1bc6767861
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 0000000000..fc6eb0cb99
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 0000000000..227eebc6ad
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 0000000000..d10b32281f
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 0000000000..f5dca14bd2
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 0000000000..3974a07328
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 0000000000..3ceb40a9ec
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 0000000000..ef892f1f88
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 0000000000..90af3591e0
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 0000000000..5c3125e212
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 0000000000..f5ef9ec1df
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 0000000000..e1ed311806
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 0000000000..02632bb3df
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 0000000000..b10c95a0e9
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 0000000000..5642e6c0ca
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 0000000000..0d12c43c8b
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 0000000000..596085dc01
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 0000000000..2ddb34c250
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 0000000000..46785c0494
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 0000000000..d241b79d59
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 0000000000..d6b178659c
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 0000000000..0d12c43c8b
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 0000000000..596085dc01
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 0000000000..2ddb34c250
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 0000000000..46785c0494
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 0000000000..d241b79d59
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 0000000000..d6b178659c
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 0000000000..5a5e1cefda
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 0000000000..c66e258d1c
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 0000000000..0e9b7989d6
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 0000000000..50f43ce070
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 0000000000..99d3d27535
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 0000000000..f30dff2f5a
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 0000000000..48afc4adac
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 0000000000..a388ce9d65
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 0000000000..e4427cbd15
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 0000000000..3dd6dc2e8a
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 0000000000..004a11d830
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 0000000000..fb5ee97ba2
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 0000000000..0f6075cbcc
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 0000000000..2555ca7db4
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 0000000000..f910451ae6
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 0000000000..7274789f2e
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 0000000000..cf66433144
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 0000000000..4ef1cc186f
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 0000000000..c6140b93bb
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 0000000000..cdb3af693a
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 0000000000..989a36b8c8
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 0000000000..ab6537f51e
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 0000000000..d49ea483d2
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 0000000000..4ef1cc186f
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 0000000000..c6140b93bb
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 0000000000..cdb3af693a
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 0000000000..989a36b8c8
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 0000000000..ab6537f51e
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 0000000000..d49ea483d2
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 0000000000..9963221f61
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 0000000000..59dad2c3e1
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 0000000000..66e962335c
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 0000000000..9414644c3e
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 0000000000..ebde0eb37c
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 0000000000..d294454be9
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 0000000000..9e47fad1ae
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 0000000000..def3faa02a
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 0000000000..c72b028f24
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 0000000000..53606f3e07
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 0000000000..45cf34b2a1
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 0000000000..d8811a5638
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 0000000000..935993c860
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 0000000000..14247eb307
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 0000000000..ae95549f3b
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 0000000000..dde348b40d
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 0000000000..7b3697952d
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 0000000000..08aa6a4843
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 0000000000..ddf022c97f
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 0000000000..369113f279
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 0000000000..d4026fea32
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 0000000000..0fc8505969
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 0000000000..3097c343af
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 0000000000..e8ea943114
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 0000000000..b8bbec494d
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 0000000000..ec5f5e89cc
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 0000000000..e01c0f8aac
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 0000000000..12264637b0
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 0000000000..bddde41f5a
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 0000000000..22617eb275
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 0000000000..81499f1616
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 0000000000..eef50895b0
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 0000000000..c9440239c0
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 0000000000..f1bc0726a2
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 0000000000..f1bc0726a2
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 0000000000..a8cae3276a
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 0000000000..e57e2a8272
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 0000000000..3a71c800c6
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 0000000000..1f6f64836b
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 0000000000..e706d7c7a5
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 0000000000..9bf7711367
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 0000000000..35fc141cba
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 0000000000..bd43bad304
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 0000000000..5b68287702
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 0000000000..6621dc4a7b
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 0000000000..37b29f3252
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 0000000000..c7aa537558
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 0000000000..1e24d40e56
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 0000000000..5b1740d87b
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 0000000000..e67bd06a2a
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 0000000000..be44d531a7
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 0000000000..be44d531a7
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 0000000000..2894d40300
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 0000000000..295e9bbdc6
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 0000000000..c393c38d49
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 0000000000..9934d6e85b
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 0000000000..31f31d8937
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 0000000000..31f31d8937
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 0000000000..6706def991
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 0000000000..63e5492220
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 0000000000..aec62f49f4
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 0000000000..92e1fe7d22
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 0000000000..813113bb9c
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 0000000000..a2f29fdac9
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 0000000000..fa68bdb53a
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 0000000000..17d66f473b
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 0000000000..92055ff0cd
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 0000000000..2c8a485a1f
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 0000000000..890ae929d2
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 0000000000..c7228bf6a8
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 0000000000..f02f68988a
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 0000000000..d1d6a8b748
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 0000000000..d18a8b8004
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 0000000000..7a542547e0
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 0000000000..99d7a913ce
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 0000000000..f42f868631
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 0000000000..f2e7e714e0
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 0000000000..245cf16462
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 0000000000..bfff80acf4
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 0000000000..34fe6e6388
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 0000000000..2b7c33b207
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 0000000000..323068a708
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 0000000000..57b6312467
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 0000000000..fd843824ed
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 0000000000..0658b52963
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 0000000000..13953da5d7
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 0000000000..ada39abc33
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 0000000000..c2258edc12
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 0000000000..a1c1b2765e
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 0000000000..2d1a5425a0
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 0000000000..4c70d251da
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 0000000000..76fff478a5
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 0000000000..5b2069a40b
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 0000000000..e6ff9b471c
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 0000000000..1a7453442f
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 0000000000..fc10c3aa63
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 0000000000..14355ce15f
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 0000000000..dff4791d41
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 0000000000..3ee0215c96
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 0000000000..061adebdbf
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 0000000000..6724dbaa0d
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 0000000000..25045a45fa
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 0000000000..6bc8cc8855
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 0000000000..439548faef
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 0000000000..7a17221d89
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 0000000000..f24f758f68
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 0000000000..c4eb133b62
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 0000000000..78db9d6036
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 0000000000..2691b42f09
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 0000000000..829f5ffdfc
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 0000000000..a0729e2c29
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 0000000000..bb04d27666
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 0000000000..5095da2853
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 0000000000..60fad11afc
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 0000000000..fa8441fc9c
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 0000000000..f393dfd6d0
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 0000000000..9bc86e3bec
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 0000000000..33db2c6b33
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 0000000000..ab6ad0d269
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 0000000000..3ec3b2d8ad
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 0000000000..3622c9a5a1
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 0000000000..43a08ae3ab
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 0000000000..03daff7872
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 0000000000..976f45493a
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 0000000000..510628a9ea
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 0000000000..425c1597b0
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 0000000000..47b86f38fd
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 0000000000..13d13a211a
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 0000000000..e724d38ddf
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 0000000000..ee222f8d86
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 0000000000..a65626c072
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 0000000000..9541a9fe43
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 0000000000..bc850e7890
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 0000000000..d24b4e827b
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 0000000000..adc7a91474
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 0000000000..ec99aeb164
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 0000000000..2bb23697b7
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 0000000000..7a753e914a
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 0000000000..a1f8047bce
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 0000000000..7b53a8b310
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 0000000000..7b53a8b310
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 0000000000..aad7e05285
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 0000000000..d695a5cac0
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 0000000000..c810256c58
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 0000000000..19b5fb73b4
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 0000000000..85c96142cf
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 0000000000..85c96142cf
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 0000000000..56112c50ed
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 0000000000..8196541e26
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 0000000000..b0c3a76dd6
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 0000000000..450853eca4
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 0000000000..2352c2610b
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 0000000000..c268b7f0b2
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 0000000000..03395c9e32
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 0000000000..6acc777aaf
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 0000000000..698acefd9b
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 0000000000..07596c8412
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 0000000000..7afa597f1a
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 0000000000..fc65442c4c
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 0000000000..962288bd17
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 0000000000..154f2b6e35
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 0000000000..540b48d887
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 0000000000..b05d3bad9a
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 0000000000..2bd9a7b71b
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 0000000000..c88f4ad73b
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 0000000000..ebf4b69315
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 0000000000..a91fed8815
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 0000000000..e2b7cff1d8
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 0000000000..5d21d73d79
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 0000000000..951ee0caa8
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 0000000000..a0c69eb824
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 0000000000..799525309f
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 0000000000..d564ba844f
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 0000000000..57e44ae175
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 0000000000..cdf1bf735b
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 0000000000..d75d83bbd4
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 0000000000..5258533d2a
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 0000000000..5d6921c81e
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 0000000000..761b7a9f02
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 0000000000..6245929457
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 0000000000..5cdfab6d9a
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 0000000000..a469f9b420
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 0000000000..a8803b8816
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 0000000000..2d9def823e
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 0000000000..bbcb6dc0d3
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 0000000000..6245929457
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 0000000000..5cdfab6d9a
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 0000000000..a469f9b420
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 0000000000..a8803b8816
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 0000000000..2d9def823e
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 0000000000..bbcb6dc0d3
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 0000000000..23da7224aa
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 0000000000..c9dcb4569e
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 0000000000..61e714afb1
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 0000000000..3cf55665cd
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 0000000000..1a0a252797
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 0000000000..022aeb90ec
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 0000000000..23da7224aa
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 0000000000..c9dcb4569e
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 0000000000..61e714afb1
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 0000000000..3cf55665cd
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 0000000000..1a0a252797
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 0000000000..022aeb90ec
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 0000000000..5541bff1ed
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 0000000000..3e8f7832c4
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 0000000000..3876ee6e63
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 0000000000..0aad2bc840
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 0000000000..c4d8fc9c35
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 0000000000..54cb211d6b
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 0000000000..4672eabedb
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 0000000000..f315a7566f
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 0000000000..2f5450b752
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 0000000000..4bf669d826
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 0000000000..65b0729097
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 0000000000..b3b9b84eb8
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 0000000000..93c10bcd96
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 0000000000..bdb353b4b9
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 0000000000..99a9bc135a
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 0000000000..57bd2ffb66
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 0000000000..de52c86f75
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 0000000000..aaa49bca4e
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 0000000000..187177e478
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 0000000000..52951b965a
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 0000000000..5c1237bdad
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 0000000000..5f052fff2a
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 0000000000..fab5f74c45
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 0000000000..35560d1aae
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 0000000000..afe59e7f4e
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 0000000000..55e92707a1
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 0000000000..097b31cf81
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 0000000000..9e4cb77225
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 0000000000..be0473304d
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 0000000000..8d680f5b12
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 0000000000..e4e961d5d5
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 0000000000..bcdf20d175
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 0000000000..9b91906952
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 0000000000..c3ce145e9e
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 0000000000..be0473304d
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 0000000000..8d680f5b12
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 0000000000..e4e961d5d5
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 0000000000..bcdf20d175
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 0000000000..9b91906952
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 0000000000..c3ce145e9e
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 0000000000..2279709c85
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 0000000000..44c0ea20dd
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 0000000000..7356dc7f43
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 0000000000..029e9adf6c
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 0000000000..8792718a1e
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 0000000000..b90964dd4a
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 0000000000..3b00d70f90
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 0000000000..81e7ee8374
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 0000000000..5f052fff2a
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 0000000000..e7975caf5b
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 0000000000..1c5988a20b
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 0000000000..b0652e666b
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 0000000000..d6ab186f38
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 0000000000..8f96f4ecd8
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 0000000000..328248a3de
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 0000000000..6162783a0d
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 0000000000..3ceb40a9ec
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 0000000000..ef892f1f88
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 0000000000..3ceb40a9ec
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 0000000000..ef892f1f88
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 0000000000..51953bf695
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 0000000000..51953bf695
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 0000000000..a4e69ff073
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 0000000000..f89ef444f7
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 0000000000..279f3ce2a2
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 0000000000..f89ef444f7
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 0000000000..765420b74f
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 0000000000..b592f594ee
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 0000000000..ce3e33bbca
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 0000000000..071afe7e94
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 0000000000..f030836e28
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 0000000000..85fc02b9c6
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 0000000000..8320ed83f6
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 0000000000..da30bd1d99
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 0000000000..4818fd4739
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 0000000000..59bef6499a
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 0000000000..1f10ebc442
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 0000000000..4b6fe289bc
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 0000000000..70d36d0287
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 0000000000..ab8ce935d1
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 0000000000..5513232d02
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 0000000000..cdd72ce56d
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 0000000000..51af665668
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 0000000000..f1505464c9
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 0000000000..f5716b1882
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 0000000000..5f8e97f970
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 0000000000..d07a48eaac
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 0000000000..124763691f
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 0000000000..cbda90bf9f
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 0000000000..133d630aae
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 0000000000..399f4807f8
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 0000000000..bb0785b502
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 0000000000..90454bc8b9
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 0000000000..fb47369863
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 0000000000..dcf2163a16
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 0000000000..00a3210107
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 0000000000..ea9400ce13
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 0000000000..9c90c090d7
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 0000000000..6745e5324e
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 0000000000..0862f45755
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 0000000000..c2a0c5583d
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 0000000000..2efbdb0954
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 0000000000..93d1697b83
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 0000000000..5e7da37f05
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 0000000000..d7dcd8dfc0
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 0000000000..22e9ab5b8d
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 0000000000..8124db7497
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 0000000000..2e3ad0ee37
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 0000000000..461a4dcb8f
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 0000000000..a1e2b6fedf
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 0000000000..8bb53fe834
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 0000000000..edb763b8c0
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 0000000000..b8b3875798
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 0000000000..50bca0a619
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 0000000000..f990a8c799
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 0000000000..bbdeaac778
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 0000000000..680f352c0a
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 0000000000..ec9fc0dd0a
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 0000000000..4108b65e64
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 0000000000..648fd207ef
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 0000000000..366f946a1c
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 0000000000..cfd3ac7270
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 0000000000..6da20434d9
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 0000000000..bdd57f781c
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 0000000000..7e0d10c1f0
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 0000000000..06e678a9db
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 0000000000..86876a9e63
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 0000000000..922e25ee9a
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 0000000000..cae11d9338
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 0000000000..302f1fbdd7
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 0000000000..ba942e11df
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 0000000000..943dc444e8
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 0000000000..901c7c2fb9
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 0000000000..be61917660
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 0000000000..3be5920c27
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 0000000000..5c3deb2d49
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 0000000000..7e0822fd89
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 0000000000..9427c61849
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 0000000000..710119d96b
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 0000000000..2a8d51aaa9
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 0000000000..37a7391cfe
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 0000000000..00c01f4dc7
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 0000000000..2dd109611e
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 0000000000..3029459512
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 0000000000..fd6be2cb76
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 0000000000..baec0ca3c5
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 0000000000..de62d29f06
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 0000000000..3ed967832b
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 0000000000..17b377b41c
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 0000000000..70fea252b0
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 0000000000..59cd972419
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 0000000000..410d6e42cf
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 0000000000..77c1ab6c3c
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 0000000000..bdb1f781ee
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 0000000000..18357b611a
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 0000000000..6ef43682bc
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 0000000000..5b46123bc2
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 0000000000..c13b55013e
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 0000000000..fb7ec93f0c
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 0000000000..731f747ab2
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 0000000000..52f1ac332d
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 0000000000..57ff251cbe
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 0000000000..8b21c5f954
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 0000000000..c09e12ad34
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 0000000000..25a5c4edd8
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 0000000000..9f1a2e79e9
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 0000000000..74118cdc89
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 0000000000..02a40bc83d
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 0000000000..28e04bc113
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 0000000000..f112c330bc
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 0000000000..dd3f628ee9
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 0000000000..debc8aa07e
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 0000000000..84b54c10bb
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 0000000000..e7aa385a93
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 0000000000..9d294761af
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 0000000000..bfc9f7b48c
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 0000000000..70ebc5bc4f
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 0000000000..3839c5eacd
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 0000000000..3ae10f1008
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 0000000000..1be387d41e
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 0000000000..9fbf38dfea
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 0000000000..349d86171e
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 0000000000..82a2b9f052
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 0000000000..07f59ab15f
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 0000000000..96578ef833
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 0000000000..3a613507ef
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 0000000000..439f929fb0
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 0000000000..f615d7ef3c
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 0000000000..4d919b0453
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 0000000000..60e3c075eb
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 0000000000..b02489086f
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 0000000000..f6488d3390
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 0000000000..05f82e2162
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 0000000000..26ceb12320
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 0000000000..7fca961910
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 0000000000..d98448f85b
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 0000000000..6f980a3716
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 0000000000..0fb8f0904a
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 0000000000..a802134793
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 0000000000..dcceb1add1
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 0000000000..41dc97c078
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 0000000000..d74e604a64
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 0000000000..931f1fd2bd
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 0000000000..2cb918f752
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 0000000000..f1cb4062e8
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 0000000000..5154939f5b
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 0000000000..a427628a98
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 0000000000..6b3731cac8
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 0000000000..511414ad6c
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 0000000000..af95435379
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 0000000000..355bdeb636
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 0000000000..8d0ad7202e
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 0000000000..3c49195f87
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 0000000000..884af5800c
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 0000000000..f4904a0f1c
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 0000000000..1629f28e0b
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 0000000000..be7cbbeb4e
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 0000000000..28845305df
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 0000000000..1831d062fe
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 0000000000..69c438bcbc
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 0000000000..bcbde01af2
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 0000000000..11fa66fd95
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 0000000000..4223ed07e6
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 0000000000..8c102ea49d
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 0000000000..c4614d9bef
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 0000000000..19e1150b30
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 0000000000..d91bd45269
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 0000000000..8ec2032bf4
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 0000000000..37ac5fc089
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 0000000000..38606d2663
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 0000000000..84ae862921
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 0000000000..89644b2736
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 0000000000..c9e50cd352
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 0000000000..fbb75f2626
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 0000000000..5d2ed7dc20
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 0000000000..3a37c85041
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 0000000000..237355971e
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 0000000000..9e6fbd048a
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 0000000000..83d4dc62db
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 0000000000..3e7d4cbea5
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 0000000000..e7a3c9cdfc
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 0000000000..6faa14f55d
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 0000000000..a8ff7b88d9
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 0000000000..c3af3c54d7
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 0000000000..d764a0fe1a
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 0000000000..d764a0fe1a
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 0000000000..1bf288fcd4
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 0000000000..3ec9ff9003
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 bf0f4e543a..b03f09eb00 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 0000000000..a3a855f569
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 0000000000..c8e515c99b
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 0000000000..4a388dd5fc
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 0000000000..5bf6c233fd
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 0000000000..fed5d03000
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 8203a027e1..f2e7da55f6 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 0000000000..86d0319a4a
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 0000000000..c50a57e11e
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 0000000000..979e09adf8
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 0000000000..bf4f10d81a
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 0000000000..ecab34a982
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 de69e2b80c..f72792d350 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 064bcf4105..53d00b4717 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 0000000000..8b13dfec61
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 0000000000..dbd2ef9914
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 0000000000..a6e4ff3b4b
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 97afde3fcf..ab42869644 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 5e887d2b01..97451b6076 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 fe85e51fd3..da29c55599 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 8136d794aa..5c9880cf93 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 f28edf29c6..0aeeb0eb9d 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 32b0ff0383..3a8259c2a6 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 959ba48a2d..d4a4f20a29 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 0000000000..b1e573ea79
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 0000000000..49b6323c70
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 0000000000..74211085d4
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 0000000000..3d1fea5870
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 0000000000..4308a40388
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 0000000000..402c4664ec
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 8ebcc10e09..98f5d590e0 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 0000000000..e9738a1765
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 46a71b71b7..98772ecd4c 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 8e3428aefe..e50c3233c2 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 d678259414..0536d2b45b 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 4bd5d32edc..5342466c30 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 0000000000..3da364d615
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 f3824527d6..c0278db268 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 0000000000..03ed7ebf0a
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 5f3b4ccbc4..436090af68 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 0000000000..aaabbe9432
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 372f90bd82..b21fb58a8e 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 172c3db9f3..af5dba3d2d 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 0000000000..7c6a59dc3d
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 2691b9b9d9..ad738586d4 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 d667de555f..9ad6ffcef0 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 0000000000..ce11d43692
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 8104a636e2..93195336c2 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 0000000000..f2b3b918a5
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 0000000000..d40d3c8ba6
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 0000000000..894cfb72e7
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 0000000000..196efe7c9d
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 0000000000..ba65e5bcd2
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 fafb67c5f5..6aa9f61415 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 285492d7b7..27b4462cbb 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 0000000000..f6a8d186ed
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 92e2ce9c34..6649257e2a 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 0000000000..20311cb75c
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 249f6a06d2..5b943bac34 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 68ba00aa1f..c0399ae6e5 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 0000000000..f4eee7ffa9
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 0000000000..d9ac68ec8c
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 5b035b15a9..a3df203715 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 b4c86aeb1b..52d8d5000b 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 dceea7eab1..6539d3b37e 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 0000000000..5f44faeddd
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 06ee1dc3a0..ab7fc9b03c 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 0000000000..4af6686cb6
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 f583ff4bcf..2bec2d7c44 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 0da8e08c4d..efbad59f09 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 4d7dd03983..76f5e0ae14 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 8f324377ed..0b9865184c 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 0f528cca2a..48297676a9 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 440d4525a6..3a6466fca7 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 b3f6fc59e0..c8597ae17b 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 22606f8e02..fe00d09649 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 08926f3448..bff1717f9b 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 16105a839b..517892c913 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 5afb3fbfd0..a2ff7573d7 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 b0648934b7..b61cb914e5 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 263856473e..1024ba2c28 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 f4543a4b42..012d625c6a 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 769849038a..063fa8766c 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 f36b293e1a..6f44a81020 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 63ad11cdb7..8187a46b08 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 f00a16a1ed..c59c2f3585 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 9d94d6ecd6..63cb99ff89 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 a20d7ee61d..9811cdcec5 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 75e4ae2ce8..9bb7a1d9f9 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 ff204d376e..35b3d9b991 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 0000000000..6b94efd773
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 0000000000..74245636f2
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 0000000000..708a3c64aa
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 0000000000..9c0101c7d7
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 70d16f32fb..3016c48f58 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 313f37fdb5..9c169666aa 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 095871f6cc..1479b91ddb 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 f535028c7a..1bb290c851 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 f535028c7a..1bb290c851 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 0000000000..7ef6056c33
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 0000000000..84a21b7c85
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 0000000000..56f5cddc27
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 0000000000..7f3e78d55f
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 0000000000..2ca8b33240
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 1d1da3a15e..0c37cfbcc9 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 7f0efa4214..7bb8284202 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 0000000000..1b453f752e
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 0000000000..e8bef481c9
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 0000000000..3b6af055b6
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 0000000000..7a6ffedb96
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 0000000000..8c0d6788e4
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 d2b0b9421c..1db2ef3b01 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 54d0a9f870..109f05c0d4 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 49f0ac2a1b..8c3fcd2dcc 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 10e93a3fde..457e8dc3ac 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 0000000000..96187058dd
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 29e58535fe..23d81a01c2 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 4662c07490..b64147d6a6 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 0000000000..b05d2fd972
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 0000000000..eb3e9140a6
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 0000000000..defa6c0297
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 0000000000..b13e29f36c
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 f0c1cdf23a..e1d5408014 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 e38572e931..874b7e277f 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 e38572e931..874b7e277f 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 624556e4b7..f18496deaf 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 c16dbf58b1..e9dc72c9f8 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 0956b72a74..f01da66942 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 fbf009bdad..5160aad2a0 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 0000000000..523e592826
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 a64db40836..4011d56208 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 e12b95e0c7..f32d1a3aa8 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 0000000000..de435239cb
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 4e4a9ef79f..ba56bc5c97 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 a00806ab5a..97a73f6f8e 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 9e4997efc1..c7362826e6 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 0000000000..2f234c1261
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 0000000000..511ad7125c
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 0000000000..652a2149b8
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 0000000000..3ea11741d3
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 0000000000..28b8f86325
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 0000000000..5450f40d54
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 13cb1dcc7d..2f234c1261 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 0000000000..511ad7125c
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 0000000000..652a2149b8
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 0000000000..3ea11741d3
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 0000000000..28b8f86325
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 0000000000..5450f40d54
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 0000000000..1ebaa14502
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 0000000000..7bcc07be3a
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 7710113f84..7446865226 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 0000000000..6fe566d964
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 0000000000..918c109395
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 0000000000..aa4fe481da
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 0000000000..be0bcdbc28
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 0000000000..476327e201
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 9b73db28aa..99c7d1ba91 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 d808953c8b..f8f68e028d 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 df2c0101be..ac106a0f03 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 f23d6f604c..ac106a0f03 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 df2c0101be..ac106a0f03 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 932e720ba3..6d486b6560 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 0000000000..1cbeab61ab
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 0000000000..4bebe19440
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 0000000000..1468f3cfae
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 0000000000..bb0753cf8e
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 0000000000..9178fbef0a
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 0000000000..ecbca1e845
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 9f53173a0e..0044d37c51 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 168af47a54..4bcf0f5a5c 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 b19ebbf90c..8f28caa27d 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 07919b0e35..b92d90adc6 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 3dc6cdb7de..62d39a1f55 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 09306fda00..30582c207b 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 0000000000..b177eb3d5c
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 0000000000..23dec0aa5a
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 0000000000..40c0e4247e
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 e02bd2477f..54f61d27d7 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 582fb0f6a5..fa5165b0f2 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 582fb0f6a5..fa5165b0f2 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 0000000000..c05de3702a
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 2180fc5000..412d219fa4 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 0000000000..8eb79e2f0d
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 0000000000..7812ea3b2a
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 5ef1171030..90af313504 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 0000000000..9c7240de48
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 0000000000..4c9ec6b5cf
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 0000000000..c24ba48c30
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 0000000000..20784cbbb5
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 0000000000..30dfc6a26d
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 6c9ac02949..aae5fc3066 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 0000000000..90af313504
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 0000000000..9c7240de48
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 0000000000..4c9ec6b5cf
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 0000000000..c24ba48c30
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 0000000000..20784cbbb5
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 0000000000..30dfc6a26d
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 0000000000..d6a192f9b8
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 0000000000..e7eb57701d
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 0000000000..6d80a1fe33
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 0000000000..d7613910d9
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 0000000000..bd543a4c64
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 0000000000..25465277d7
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 1c8b7f5440..ad6fdaff31 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 0000000000..a09913e21b
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 98ecbc5dfc..867acac409 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 98ecbc5dfc..867acac409 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 85626b6c35..f29f1aa903 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 392518cf33..9800dbc9ae 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 9cb8a2949c..19a1b9ebc1 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 0000000000..a7fce0c581
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 0000000000..38b5ac9fa5
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 db372fcab0..5a2de82787 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 b74a8c0b7f..5d5a3e0087 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 4edf9c41fe..2e1abb616e 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 bc3ecd4b2a..e632311ccb 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 1a50fa2b5a..730254037f 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 95b7ff704f..bbdcbef554 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 20f794590a..242889f063 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 0000000000..69d6b0b5a7
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 0000000000..71286ddbf4
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 0000000000..f5ccb5bc26
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 0000000000..2d068f1de9
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 0000000000..af6fe7aa98
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 0000000000..85e4e9885b
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 0000000000..30bdd3f9d7
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 0000000000..470f202bee
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 0000000000..932587e8d5
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 0000000000..c142bc62cf
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 0000000000..2d5d18886f
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 0000000000..fb1e8757ea
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 cd26432942..0f3b661adb 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 d8b6b284e7..1ab19958f1 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 f369872280..5edf72ede7 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 abdf8f80fd..6234478d68 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 f944677076..31a8f805db 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 f01b27b4ab..eea497bc22 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 ced8c03a5e..aeb75ed0f3 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 0000000000..42799a3b74
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 0000000000..0f16302055
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 632540aae6..9cd29f7a6c 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 ac277b2a55..2f4edfa032 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 44814dfcfe..e74cd34614 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 cd1d7ab780..a582c19945 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 1478bfad9f..9e065d7caa 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 76edc4c348..3f9acdb1cc 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 eb0347064e..6a96d4f3b7 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 0000000000..34109f18c9
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 0000000000..ebb46a9fd0
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 5cf41ff03b..ea9d7ec6bc 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 64ba6b601c..94582587d6 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 0000000000..5330d9794c
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 bd18e0ae6c..3a5c6371d1 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 0000000000..b8f3b1fb52
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 0000000000..e41b4963a8
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 0000000000..9523613280
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 0000000000..e4d4e3c894
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 0000000000..94bce13825
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 dceea7eab1..6539d3b37e 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 0000000000..3a5c6371d1
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 0000000000..b8f3b1fb52
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 0000000000..e41b4963a8
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 0000000000..9523613280
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 0000000000..e4d4e3c894
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 0000000000..94bce13825
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 0000000000..44e482e39f
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 0000000000..5b4930a1df
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 0000000000..24063f7eac
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 0000000000..1352161b08
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 0000000000..989caced3b
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 0000000000..3631f79ed4
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 0000000000..95d115c676
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 e39f72ddb6..3b75167742 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 0000000000..96fba7e038
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 9a0810d5f8..7764083787 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 0000000000..a2bc54b520
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 0000000000..1d1a18acac
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 0000000000..732aa7ae8f
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 0000000000..c90aaa9978
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 0000000000..dc62add0fa
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 0000000000..a25c362973
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 0000000000..0b4cf93fd6
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 db9365adb1..35c1d10247 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 0000000000..06bf48a8dd
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 0000000000..0a1c42a6de
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 0000000000..e57faa9745
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 0000000000..0732edb9fa
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 0000000000..9f013ec199
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 0000000000..b18f79b1af
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 95ac30e145..4734c8155f 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 0000000000..8ec4d88350
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 0000000000..fa3fe8746b
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 0000000000..fce877ded3
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 0000000000..00368c7c7b
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 0000000000..5a898b3cb2
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 c2db12fa26..d80d5367f1 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 b384dc9d6c..56d1fa4c3a 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 0000000000..570ac96730
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 0000000000..dd3399c213
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 0000000000..067cfa08e4
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 df439f8044..115bf873f2 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 0000000000..f6257892f4
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 96ef9230ab..f690ec234f 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 78e30b4b27..625247fd7c 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 1ff72c2b96..92456879f7 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 0000000000..d8a43cd03b
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 9e70b3b2c3..3c117d8bac 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 b257266ae0..dae0881c98 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 0000000000..ebebb32fbd
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 cde9352f14..807f0aa533 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 0000000000..487c4ccd61
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 599eca6f1c..210d7f2ae9 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 0000000000..88918f97b3
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 0000000000..ddeda2a43b
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 0000000000..e62d08a901
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 0000000000..27012dfbe9
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 0000000000..c8863f5833
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 0000000000..62e5e00578
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 bf9c299cc2..a5f1d98efd 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 bc99228398..37e0afd46e 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 677dcb13c5..d6dc081cdc 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 0000000000..02337caf6d
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 5d0ca1b590..b0fcc9ae76 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 1cdb352992..9e7af8c5ec 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 fe5a439769..748d582db3 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 4f13ffb5f7..0997b42f0c 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 0000000000..2e60f8c84c
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 0000000000..4fb8a6c066
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 0000000000..3144c7a46c
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 0000000000..440776f885
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 0000000000..6eb543f4cc
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 0000000000..99f568f9b1
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 69d80b6b27..4d3bfd087f 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 0000000000..cfbedf91ac
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 715d722cd2..5da0d4620a 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 8483a62d9e..56a6109fd4 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 0000000000..327fbd507e
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 9e898cde12..327fbd507e 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 0000000000..0c49ba9df8
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 20cf5bd601..eb062ee1e4 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 0000000000..97744af556
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 0000000000..4a33a5b653
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 2136036126..275373bd95 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 7978fcccee..e131340388 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 d235a92b7c..40a0b252b5 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 0000000000..2fdb07a070
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 0000000000..7464ae1e29
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 0000000000..42fc1f87f6
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 62c8b9fe59..3c2d4dd68c 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 b99a7d1b74..f4dd4a1880 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 0000000000..56f5cddc27
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 85c914bb1c..68c5cb5935 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 85c914bb1c..68c5cb5935 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 d98708218f..0403d3f48b 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 62dea0dd66..dd8929d64a 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 0000000000..dad0f8ce65
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 1a1da27136..cbe2d1c7cb 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 0000000000..08bde96748
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 78d6f9206b..78249af6b1 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 5a5ceb0e67..90f7ccac42 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 0000000000..d08b13b5ff
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 a5334c3acd..a8eb514370 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 0000000000..c848f392e0
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 0000000000..dad0f8ce65
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 0000000000..969e249fa0
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 30c3e88881..21b9cba7ad 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 5cf41ff03b..ea9d7ec6bc 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 d66c094b48..63e45562f4 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 377075e9c6..b7b1f63b8a 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 282ef90344..61fe759b33 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 c9b232ed02..f3bb7f449b 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 e66ad08ba8..383912db45 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 e66ad08ba8..383912db45 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 e1931e295c..f73b77ea8e 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 4a142df68d..f390147a2f 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 4a6266aa0e..f6357e3220 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 53c11c8cbc..7afff72f1a 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 0000000000..50c98992c4
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 0000000000..fcb4518f4c
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 0000000000..14d11ce1f0
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 0000000000..8e1f733e47
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 0000000000..bd7cf557ce
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 0000000000..9a20bf5feb
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 f83ecee8e2..070212c0b3 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 0000000000..26d789675a
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 56529ca046..b1a971d38c 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 8ebd8fe93f..71998f818e 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 0000000000..1f37514d5a
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 0000000000..48f139fdce
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 4ddc26af5a..fdaa2f2f2a 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 855bf9c3c7..0efd95ee04 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 912c36a6e0..615ec6150b 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 fc0995ea1e..4e49fd8ab7 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 11677c9411..a04bf36551 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 606d49c2dd..760a68ca82 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 606d49c2dd..a04bf36551 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 218ea8e5fa..431e0bbffd 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 20e0d1d096..1368a85cd1 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 0000000000..245635724e
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 1def8c44ef..8270b96203 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 0000000000..7497ec0698
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 0000000000..77229e9f2b
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 0000000000..34365ff548
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 0000000000..699baff1d6
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 0000000000..8015a4ffa6
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 b8f9f807f9..8827220310 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 7c8c45438e..b0a41c6c34 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 0000000000..e5a357035d
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 c9af21fc98..4b831ffb8b 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 0000000000..bc63af1def
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 48c0e38d41..b326630c04 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 5f0b1d88a5..ee992f671f 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 2942520aa6..41ec385cf8 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 b4bad6b1de..19ca949e66 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 bc422c6be8..43add251aa 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 4c4c06b94a..c28f78163c 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 d7733bc61a..63f46ae2a4 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 a1c71c939f..2377296360 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 8c6496020a..677203adc4 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 20d6e843a2..eecb3ab9b5 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 c04c030796..1042202b56 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 190e784252..b7bc5fad42 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 5e878c3c29..a03cc49d9b 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 b4df6cfde9..9691167de8 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 33e2cf8942..e3f45cb470 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 70cfdce468..9915dc19a1 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 f7f5a6e192..235ea8c4c3 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 a71efd9da3..e66f2b6191 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 95149d0005..2f27e90a38 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 54bc95e8b8..709337d8f7 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 2244745911..d625bebd2a 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 72da307e37..dd9c9eae54 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 c36b0798b8..bc476488cd 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 1aba4a8937..f582c8a3cc 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 1e7acda191..36a3615e97 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 b28245ac4b..99d377f072 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 6fc692ab10..8dba5354a8 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 6b2cdf59e5..cdc2739a51 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 d11cf974a5..31008df2a0 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 189e4a6a97..945a25d066 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 1b32b3716f..2795a15917 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 02d9e2ddb0..cdaf2830b5 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 fb8684e1ce..7f488bc983 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 189e4a6a97..945a25d066 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 0000000000..5cb64e49e4
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 1b32b3716f..2795a15917 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 02d9e2ddb0..cdaf2830b5 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 fb8684e1ce..7f488bc983 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 0000000000..0f3fdf1fcc
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 2efcb695b8..5a5b71f15d 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 38d240d565..010dddd107 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 0000000000..f772650670
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 0174cbf98b..48c95fd64f 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 0000000000..273946dcdd
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 0000000000..040fe6aa8b
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 ccf5a36de5..06756dc539 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 ac77ae0713..ec867a6635 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 956924946b..dc7c922d64 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 0000000000..e7c1d5e660
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 34c92afd66..5eb8e54750 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 0000000000..7f2ee7da42
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 99709b6d7c..245635724e 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 fbd02827cc..9185ea466f 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 0000000000..606ada2ed4
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 c6afa366ac..301f662e21 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 1b55bad171..05468a6f90 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 4d382d6197..10f6853502 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 0000000000..86ba2b7c53
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 0000000000..bc6103b992
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 9e5ab9c4fb..bdf20971b0 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 3b53d87438..2410e41ffb 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 78e30b4b27..625247fd7c 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 4888f08a47..aadfbfd27f 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 0000000000..72c777135a
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 0000000000..68b5d586a1
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 0000000000..e20b2d69ce
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 0000000000..256587ff5a
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 0000000000..2f4c5c40ab
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 0000000000..aadfbfd27f
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 0000000000..72c777135a
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 0000000000..68b5d586a1
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 0000000000..e20b2d69ce
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 0000000000..256587ff5a
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 0000000000..2f4c5c40ab
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 0000000000..3c8f4806a7
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 0000000000..cae3c67fd5
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 0000000000..3dc7ae5dfc
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 0000000000..f20f783509
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 0000000000..7e9217adbc
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 0000000000..1098adbc8b
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 8b5f917664..ac664d8057 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 20a2659bed..5043fa6611 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 0000000000..fda8d2ba62
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 d7699382b0..8db73aa8f6 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 edb2e1a4fb..7b61153634 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 5705d19c15..c6e424f54a 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 0000000000..74bc0da8f2
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 0000000000..d461370fdb
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 0000000000..12d654b4e5
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 0000000000..d555c18f79
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 0000000000..0542d87a6a
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 68d8f2a6b6..220384e7ca 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 cb4010c530..d608093dca 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 0000000000..57d6736bf1
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 0000000000..44cd3a3842
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 c74cf74d74..3e22d05afa 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 c74cf74d74..3e22d05afa 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 7708bf8430..e4faa7aca4 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 731e413a63..8964580850 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 0000000000..8c30736f98
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 0000000000..8964580850
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 0000000000..8eda1e8d84
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 f4c6a502da..0b0adb59f6 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 0000000000..60aff93dd7
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 0000000000..0b0adb59f6
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 0000000000..7cd2d2ebdd
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 cdf1321786..5cfba50398 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 996889ffdd..0253a70263 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 0000000000..40f43ca47c
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 57e06b8faa..3385c068fe 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 0ef86da10f..e82c0d2d5e 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 0000000000..bdd2c62740
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 8c694147d8..ba1d605923 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 780a07cbc7..dd893e982f 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 a6bbc03a90..46b39fae4a 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 0000000000..98bac43e6c
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 a6bbc03a90..98bac43e6c 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 0000000000..3dff9861d0
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 94e0504c43..1269841e36 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 0000000000..879284fcb0
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 52d188499f..0a367b0233 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 0000000000..cae9b3d41c
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 0000000000..0ebff8d5b4
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 0000000000..122c1d7ca1
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 0000000000..dd5c35e178
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 0000000000..3371fbf413
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 0000000000..c22fcea63d
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 f1ad338c67..852ba9a702 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 97f8e0d9a8..aa8ef85a77 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 bb53ee1467..1c9d776e82 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 b0ce2c2f50..5ffa1e17dc 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 995b047660..0e9daa41ef 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 453949b170..9bf1a397af 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 f8abc41b2e..e27b2c5c8d 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 0000000000..feae50ff4b
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 0000000000..28bb40fe29
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 0000000000..cb421be671
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 0088a51e62..6e26e46afd 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 0000000000..6853a1c99f
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 0000000000..99dace0346
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 bb05a9bbb5..860b72bf40 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 d5e954da51..55b41fd570 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 85563c8a93..2d1f927053 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 1117f9bc89..6373ce2a54 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 8010e73604..58801f2046 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 0000000000..f801d2c480
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 9707a7d362..e172a92653 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 0000000000..e063ccf4df
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 0000000000..c9b0edb988
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 2500c5cd4d..8e19150779 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 2500c5cd4d..8e19150779 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 af065d1d4c..415741ec13 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 0000000000..74d9350f38
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 0000000000..5d1b9b2e84
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 0000000000..e34f3fd12f
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 0000000000..7bceb0c9c6
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 0000000000..6483f6966c
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 a7c9a1072c..30018f29ed 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 0000000000..879d26a98d
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 0000000000..30018f29ed
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 e5747de1c7..a9e27e8991 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 3ad3db6dc4..34866a4a06 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 6e706955b1..4748ca6846 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 55f2eba468..53fb9f1832 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 0131586e5e..91125e15b7 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 d9a749790e..e18953b9be 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 87b85c98e6..7ef80df780 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 0000000000..72ce447593
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 0000000000..c56dcdfb17
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 4b95e08e82..ebb3b4f113 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 0000000000..5a4faead95
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 b1d5a7d814..5a4faead95 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 4d08770a45..10cb404801 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 33b1d3883c..30ee864648 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 89b4ce5664..d967edd0e7 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 89b4ce5664..d967edd0e7 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 8343922954..aeda139b22 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 5e706802de..13d047c0fe 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 0000000000..dad0f8ce65
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 ec08ac2e39..f7e0e453e8 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 e492b2339d..70d7736cd4 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 62dea0dd66..dd8929d64a 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 8e869e9cef..6792b1f955 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 ccf14a1e77..eccac861a8 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 0000000000..7bc474b64d
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 301e488966..8aab5b26dc 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 4245e1dca6..76429a4bdb 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 7db40e2f52..6b987ceb72 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 f97db47128..b85051719c 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 a06aadbfbd..b92315527e 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 dc7a84f5b7..e768e4031c 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 0000000000..b9a27a6846
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 0000000000..19dd042bb6
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 e7f6f891eb..71ad017a2a 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 1be5733ff4..31613a9320 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 e7ce32abfb..ff13ae964d 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 0800e98fc4..985b545493 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 0800e98fc4..985b545493 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 34538757f4..ec1ae43233 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 df3d493b02..a22bf81f9a 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 7417f2a529..fade5244a6 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 22c3919b6e..4a10722800 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 0000000000..ea720c9125
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 c4802b9579..2e57daba01 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 0000000000..884c12370a
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 0000000000..3a00bf4527
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 0000000000..c013fe1d7a
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 26a93b845f..ae36022639 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 955d563ad4..333a70ea08 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 0000000000..8bed5acca5
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 3e3b72f7c5..48c27113ff 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 0000000000..7d3c1ad12a
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 0000000000..68b0ce8858
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 0000000000..b8b95f071f
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 0000000000..80974cba32
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 0000000000..c8daaed81e
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 57f2375a4d..ae65174881 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 0bc15d9d9e..cd2cb281dc 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 438db709e9..fa95574e90 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 906d0ebd44..0706e95e92 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 0000000000..a4c0b557b0
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 0e0d3c3005..5c2ba19f51 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 b874c4df3b..ef1fcd659f 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 0000000000..dc64def716
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 af151748ca..d6bfa97b33 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 bec12ec208..c579846b3c 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 85fdfd575b..ac9a777cd1 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 0000000000..f5bf8e8fbd
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 4ded671907..0ed8973271 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 e4dd62f7b9..82ffbef366 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 0000000000..7f13711c3e
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 0000000000..18183cdf5d
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 0000000000..5f3bd85830
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 0000000000..7b936f8f59
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 0000000000..5af1e1f219
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 0000000000..3db350cc16
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 955d563ad4..333a70ea08 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 3f510fab9b..2ff3a095e6 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 da007e47b8..333a70ea08 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 4edfec0273..29ddb7ea63 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 0000000000..1847227c71
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 0000000000..fbd7ce17bb
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 72747290e1..55bba05171 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 0000000000..cbee9fc6ae
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 0000000000..7ba22073eb
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 0000000000..02f79b58a5
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 ba5430c974..4bd0e68827 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 d3e76515dd..0be9efa539 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 8572abd27a..4f6fc8c247 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 0487eca651..5df8a196db 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 2c8d249fd4..71429ae649 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 0000000000..fc76cf40b3
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 b3e2fa154d..8a57855d70 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 2cf73b566e..3f7c182094 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 a42b7f7a81..8507c7f9ab 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 5646259013..52dd4f221d 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 0000000000..017495f7e0
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 0000000000..1f15c0df7e
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 d892078bb2..e07d929a27 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 0000000000..129e9e4f54
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 0000000000..f407c190e3
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 10153f06a4..8485fcbe1c 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 0000000000..43d27aea0b
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 3a7ba22f8e..82bdbf6335 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 0000000000..f05a3f6d14
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 0000000000..bba3d6fe12
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 0000000000..123e445030
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 0000000000..974055c628
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 0000000000..3f068a0f95
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 0000000000..798a95d9fd
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 dea1ecb59c..4ba2516a85 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 0000000000..a50d75d624
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 0000000000..71db8fcbb2
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 0000000000..939c3fec82
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 0000000000..4f7ea1dac7
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 0000000000..80e3e07ff9
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 0000000000..72e4457ec1
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 0000000000..dad0f8ce65
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 be64a40686..a64ee52526 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 0000000000..3b719a82a0
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 0000000000..ea1ba13d52
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 0000000000..6739fec828
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 0000000000..0bd8bb9085
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 0000000000..407f88f33b
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 0000000000..f9626d9ef6
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 0000000000..47f7d7b3a4
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 0000000000..631a4aa6f2
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 0000000000..58e99a1d31
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 0000000000..9f48292151
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 0000000000..31b20d2aa8
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 0000000000..da5b683e78
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 0000000000..2322faad90
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 0157653ec0..2322faad90 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 a61f473a95..63af73ac22 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 72f8f605a2..3b719a82a0 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 0000000000..c62b2c0e81
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 4fb883a076..c62b2c0e81 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 c51367732c..47f7d7b3a4 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 caf6cf70d3..631a4aa6f2 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 d52960b09d..58e99a1d31 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 6325e4bc14..9f48292151 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 bfe7c49713..31b20d2aa8 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 0000000000..7c96ecd94f
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 0000000000..0a8214dd6b
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 0000000000..16fd9b1e56
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 0000000000..0e36fc3fe3
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 0000000000..7d261d1806
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 0000000000..55c5716c6b
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 0000000000..a0c6560b50
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 0000000000..dfd392a489
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 0000000000..4f9d9b92ce
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 0000000000..1c1cbe3dd4
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 e23e4f890b..55c5716c6b 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 8954240ad2..a0c6560b50 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 120e1a1f73..dfd392a489 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 bc585a3561..4f9d9b92ce 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 4c40bb8c6a..1c1cbe3dd4 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 0000000000..310868b981
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 3e7a98a8bf..55a179f18e 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 ece233348b..fc119f7408 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 47ad29bc3d..c0ff5ed9a3 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 1fdef76093..3174810628 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 d8fb5100d6..8eda1e8d84 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 c5b25dd643..7cd2d2ebdd 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 0000000000..2b5f2e9dcc
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 642c816e96..2ebf2a6fab 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 0c420440c8..67e10337a2 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 117e8174bf..1ef09cb540 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 0000000000..fd2325f796
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 613fc5b840..1b038f0701 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 5fac9ae16a..b35d7b6615 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 38d1a529ab..16a6d1da41 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 b626d6088c..f957286ba2 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 0000000000..16a6d1da41
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 0000000000..861e00aea2
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 c593b37d09..7b17db8d7a 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 4cf96e8199..e144b15efd 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 85fc93af7e..aa6c7d7ea6 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 468d7c1922..1137028aa8 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 54da77edb4..f16569616f 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 ae44b8ba20..eaafb3810e 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 271f4894c6..8d6ef5e671 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 3a6f85cb2a..ddecf5b68f 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 57d88a62c7..78968a9a09 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 0000000000..0d41260837
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 0000000000..14849f92d1
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 0000000000..46d18a8852
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 0000000000..fc1435be79
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 0000000000..21a74197bd
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 0000000000..170444849c
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 0000000000..724c63a767
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 0000000000..8ab9813150
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 0000000000..c7d58e309b
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 0000000000..06684b2a47
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 0000000000..2070d12016
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 0000000000..8b5c83ae57
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 0000000000..07e2e7bbfc
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 0000000000..86dbaf843b
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 0000000000..4cd975fa2d
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 0000000000..c6cc84c9b7
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 0000000000..b30ad1986f
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 2ea1be6607..e3557d2324 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 de072bca62..a7fce0c581 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 38d240d565..010dddd107 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 d9a749790e..e18953b9be 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 72747290e1..55bba05171 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 6c144e0c73..bc63af1def 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 ef65da3b95..798328a1ee 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 cfbd4125e4..5ae7c53b6f 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 99129fe55d..72cbebef78 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 efb95e4bab..33ead18d8c 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 f85a73fd4d..a92bbdbb8a 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 253e481c1f..fae4271511 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 ce4e23c8c7..7876a1b95c 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 c1c384d49e..ed7ac4373a 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 c593b37d09..7b17db8d7a 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 04a48b04d3..5a7b994994 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 cb6333c5d4..04b03079f5 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 0000000000..04b03079f5
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 0000000000..e50c3233c2
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 0000000000..0536d2b45b
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 b827828752..bb0382d33a 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 a875efa76d..46102e1a47 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 a5d1a69b88..710d69d885 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 0000000000..084840430f
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 dada100615..223bc9d4ed 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 61e526bf8d..825600a627 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 d7bbeb3490..99b3759397 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 aec34d338e..3174810628 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 6870693084..ef075aaa23 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 07989f1480..a990ed2cbe 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 07989f1480..a990ed2cbe 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 0000000000..2a869b3482
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 dce123c027..991937cf77 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 0000000000..a06fcdc40e
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 32d830771a..819b70348c 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 a9b4209ba9..cdd7c8219a 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 0000000000..4cbbe2f566
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 6c144e0c73..bc63af1def 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 5b57c11bc0..2e0fbe54bb 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 5b57c11bc0..2e0fbe54bb 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 0000000000..2e0fbe54bb
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 fd7ed85f99..ae1a169d4d 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 0000000000..dad0f8ce65
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 0000000000..2950f28c7a
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 0000000000..dad0f8ce65
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 0000000000..5259cc766c
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 bdb350d529..6fd40834ea 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 68359ecb1f..be0344d9c2 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 017e47cfb7..52eb71fa2b 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 353c945e68..401412e202 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 db9c6af5b3..7248eaba8a 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 0000000000..7248eaba8a
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 0000000000..e09bd0a790
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 0000000000..8f5bbc4c8c
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 0000000000..57bbd5e645
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 0000000000..b012c61440
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 0000000000..a78912cd69
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 0000000000..4da9b0198e
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 0000000000..4667b907dd
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 0000000000..16f321b8ae
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 0000000000..bd6c5e162f
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 0000000000..72f848c863
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 0000000000..863caa5433
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 0000000000..d1936f1123
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 0000000000..8ce128b147
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 0000000000..3313e7e2f0
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 0000000000..916b42be04
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 0000000000..7ab3507e2c
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 0000000000..aeb15696e6
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 0000000000..8e86466514
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 e706e74050..1c64f34d06 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 a010820c16..8e591964a8 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 cf8f51c590..b43bda183a 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 eff08b3c1a..864d903a35 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 0000000000..34a2461648
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 0000000000..96e8ea845c
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 744ce2cc51..4e0b58ab27 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 ef65da3b95..798328a1ee 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 5ce6ac16ee..10881a4802 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 a57b9123e3..d5e8f5220e 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 3d848fe120..08e86865dd 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 0000000000..2edad6a9a1
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 0000000000..0bb8fbc738
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 0000000000..e9a9cef6a1
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 0008f99cbf..5a480fdd90 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 0000000000..c84d89c6ec
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 c9c6762ea0..4b64280a4a 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 4df8b50642..095265e17a 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 0000000000..1bfe48b2ce
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 daad02a92d..e7c8862e08 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 0000000000..6116182f27
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 0000000000..0179a03094
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 0000000000..46b6a6a708
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 0000000000..49613bc6c3
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 0000000000..d8532bee94
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 9150bf4548..fbf3a52cc5 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 0000000000..099b209a92
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 0000000000..b697e2a2e3
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 524dba56c3..9b4be817e3 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 b90c033a32..79a7bca074 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 47f54f7c76..c1f1277d41 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 0000000000..e0a520c4c1
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 0000000000..dc70809ff3
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 0000000000..482d5d5dad
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 0000000000..e3a8b44424
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 0000000000..19550ce7ce
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 0000000000..c1f1277d41
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 0000000000..e0a520c4c1
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 0000000000..dc70809ff3
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 0000000000..482d5d5dad
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 0000000000..e3a8b44424
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 0000000000..19550ce7ce
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 0000000000..652de949dc
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 0000000000..979e729d22
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 1261df7c00..4aeba637f7 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 0000000000..905e8a98b3
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 0000000000..7d9c997674
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 0000000000..69a9c17910
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 0000000000..7ae4d8ea04
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 0000000000..89542a2330
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 979432e79f..c089a8c087 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 0000000000..151e38cec9
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 11177352a9..5ed58e60e1 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 3193363bb7..635cf13f99 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 c69336dcfd..dc4d3acea3 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 0000000000..adce205180
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 0000000000..01d30e7701
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 0000000000..f010bf6f4e
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 fc25396535..61587566be 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 b0a37e84be..7ac39ecd09 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 edb29c6442..7ea69942a8 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 6405328b4c..09a880d2f0 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 224cbcf38a..4ab16b8d76 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 0000000000..dad0f8ce65
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 0000000000..efc6cb9d32
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 1e3569ce93..019f2c6bba 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 0000000000..d8e776c409
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 0000000000..eae8cd6091
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 0000000000..497251d350
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 0000000000..ce94c2f934
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 0000000000..5474f51f93
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 0000000000..4719e71121
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 0000000000..511ba38698
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 0000000000..9c07dc8ed1
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 0000000000..3b0958971e
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 0000000000..4596eb5248
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 0000000000..dff612d4ca
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 0000000000..48293adac1
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 0000000000..3afd4eb943
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 0000000000..d366654a2b
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 0000000000..0eb63867a4
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 e165528667..7e84d2f429 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 7f91f26f00..d13d1f81a6 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 0000000000..53a0bdf172
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 da92b36a55..b64dccf57d 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 0000000000..9b287229ed
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 0000000000..4f8a650ba7
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 0000000000..b2132465b8
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 0000000000..e90a8932a0
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 0000000000..ae756aad3d
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 0000000000..b3a1d14243
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 0000000000..fbc63a18f4
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 0000000000..97bc65feea
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 0000000000..b3cc9b94d2
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 0000000000..1a8e477d57
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 0000000000..1194faf984
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 0000000000..b64dccf57d
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 0000000000..9b287229ed
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 0000000000..4f8a650ba7
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 0000000000..b2132465b8
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 0000000000..e90a8932a0
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 0000000000..ae756aad3d
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 0000000000..31aabf88a1
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 937576c4da..7b5619b619 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 c192eebd54..055b25f23a 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 bbbd5b2990..8477e47e4c 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 1be385628f..174926ff02 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 bbbd5b2990..8477e47e4c 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 31d4ef6ea1..cdb2d29d8a 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 0000000000..b916dc7f87
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 0000000000..e60690c77e
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 0000000000..9aabb63f85
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 0000000000..86696653b5
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 0000000000..1e92c70971
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 0000000000..1e260d4461
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 52ded94d54..f99fef5296 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 0000000000..3f6b667ebe
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 0000000000..0a811f93d5
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 0000000000..21a92e444c
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 0000000000..f40f860c16
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 0000000000..b87967ff84
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 ff93dff406..3c9e331817 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 0000000000..39a65a8d66
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 87d7866966..b1d921d96c 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 706a31c13b..3110e701f7 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 f416dc1376..59513c6a1d 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 5b53b566f9..65b2c5b278 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 d892078bb2..e07d929a27 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 8641079a6d..294982aa8e 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 2d68bb6770..31f768cf1a 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 0000000000..7ef6056c33
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 2324dbaabd..ab5223c5a0 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 2b8efa17f1..7b44e07153 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 401dfd498d..dd204a5c3e 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 fee2c7f7a9..20585dfdec 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 2912c9aa57..767f119d77 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 8f50f8a8d2..f60c3b9565 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 33bd134368..130312d82c 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 3f0472ff64..c081114da5 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 7243e553cd..73e2a7ccc6 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 311230dfd5..10cfd95b24 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 67b6826b96..7958910d97 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 0000000000..dd204a5c3e
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 401dfd498d..dd204a5c3e 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 b6cd1991d7..c5be3ff05f 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 557185c7f0..ec8c470181 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 8d10c30ca1..3a092fdb30 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 0000000000..fc0a823376
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 eb88f52eb5..eeefbae590 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 721340bfb0..e1306b90dc 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 721340bfb0..e1306b90dc 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 ebad8c7ecd..ced3a53f7b 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 ab12e06401..085184daa1 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 b338f58420..16527f5ed2 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 ee79f03d2d..80446be7eb 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 0000000000..f0260024b6
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 ab84461bfb..ded1adbd2b 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 d2f6a9a225..7889e64531 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 e1a0559988..fa9363ada4 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 0000000000..3c021c40ef
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 d3255542ba..e52dc00f23 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 0000000000..4bcf0f5a5c
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 0000000000..691da0cc65
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 bfa6fe2152..0dd1dc3140 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 b216438946..d347767aa9 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 0000000000..c16c586ab6
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 0000000000..5bff25a2e8
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 0000000000..c0f4c4db36
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 0000000000..0f3be6013f
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 0000000000..749f989220
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 683ae2af05..f7fefbaad8 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 0e58953ffe..1221191c3f 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 083ac34774..87d576a950 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 0e58953ffe..1221191c3f 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 83bf093ca8..661f6f4d2a 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 f0f4f65c86..9cd9a447c9 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 ecac60ebd5..dc20e70e26 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 1952a366bb..2947ddb230 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 34100cce7a..c34cf9df67 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 b1d5a7d814..5a4faead95 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 e1a0559988..fa9363ada4 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 e38cfb45eb..1c31e2d141 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 0000000000..fa9363ada4
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 6ac0f64174..bf104611e9 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 6ac0f64174..bf104611e9 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 0000000000..bf104611e9
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 0000000000..2fbf82b0e4
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 1062006e82..1017735584 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 30b30cde5c..82e6d5352e 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 0000000000..ded1adbd2b
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 9c2b6c7998..06a7f168f5 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 50d5dca0ed..14d831d0da 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 0000000000..cfc4b15f17
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 0d1f0e1bc9..9d2fc98421 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 9eb6c340d3..8e230f8074 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 c5cca51457..391197c797 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 67148d2ce0..f4adb55735 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 92fcce7776..3be1a3b5ac 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 0000000000..3d7da87187
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 0000000000..b2c334fd91
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 3d4361ed65..f84a2e0281 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 0000000000..448acc172a
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 0000000000..23c4c592bc
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 0000000000..be3b2d1e72
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 0000000000..35c12c4903
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 0000000000..67e0a0ca12
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 d982dbd276..b9c0993fc9 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 234a5deaab..f2eaaf228c 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 e96f13955d..12d21b9834 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 97ca7c4f79..93dcb50850 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 0000000000..846c655850
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 0000000000..7afbf0e6da
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 0000000000..1a3efeb4ce
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 33b1d3883c..30ee864648 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 0000000000..81b217b4d3
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 0000000000..6554f75f87
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 cfbd4125e4..5ae7c53b6f 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 92063b97fc..d8407f417f 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 52e74c78e1..fe92e2bbab 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 0000000000..a956adfab9
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 a7754cc734..19a1aceed1 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 9b19a83932..d42ac569fe 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 9d0a77f235..0ebf700398 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 d24dffd0e2..4a08e8e81b 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 bfe464bb3e..3bdd9ca3ba 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 0000000000..47b536a621
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 0000000000..f8c6ca07eb
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 249ad7e8f0..098ce2f4f9 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 3e7ae5090b..a858d4615e 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 f8183693f9..f5aa91b2d4 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 99129fe55d..72cbebef78 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 a74ce5d86f..82aaffbd95 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 0000000000..ec2cffaecf
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 0000000000..59f5ae68a7
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 05d1ca9b26..7aca32f21d 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 87121fe107..d6739c8457 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 197caff4e7..f6190e74af 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 bc41c667b2..9c0101c7d7 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 0000000000..60b3c3787c
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 0000000000..ebe5c37082
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 a8161adf17..b252f0f2a7 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 0000000000..2f005d2487
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 4c74c59e2e..a7f50bbe04 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 4d9b82e74a..6033b2eb12 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 bbe8c4a97c..96ab3ba308 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 12079862cd..5118f05e7a 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 139ce489a4..1b16a522c9 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 d69b5d304a..32d9aed152 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 0000000000..d2834a517a
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 88cee60960..f0260024b6 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 70b131e06b..bcdca18c76 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 ddaf0447dd..eb223efbb5 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 0000000000..dad0f8ce65
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 efb95e4bab..33ead18d8c 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 0000000000..bf42ac971d
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 0000000000..9ee2d3808f
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 c3043450a5..2473deefe6 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 0000000000..5762ccf297
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 2a68024823..183d6c3791 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 fc3f5b7c41..5479de75b3 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 b652d77950..41af4a51d4 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 c6ad0a2dc4..ae12e2a821 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 96bd711272..7900a9f942 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 52d188499f..0a367b0233 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 0000000000..963f774bb2
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 04d29aa6a7..1b64148f97 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 764114eaaf..5dc15b3da4 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 0000000000..b8b4709043
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 e709f538bf..78915dd655 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 47ad0e4f6c..a81a7f4048 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 29d18abc79..dc064561f0 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 450d8beafc..4dd9f1330e 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 2cefb32033..da648022ba 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 7cac69f07d..f2748b54b3 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 99325408e3..ddb39122b6 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 c781a5b622..cc31eb647e 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 0000000000..d0455846dd
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 c255df10ff..5991ab94a8 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 aafbbc2d80..88918f97b3 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 0000000000..ddeda2a43b
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 0000000000..e62d08a901
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 0000000000..27012dfbe9
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 0000000000..c8863f5833
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 0000000000..62e5e00578
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 0000000000..388c2f35d7
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 4d0a2c452a..1d8132623b 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 0000000000..303b3fc66f
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 0000000000..3c90874cca
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 eb58823175..47689fc292 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 0000000000..56ac45601a
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 0000000000..e4f89233ed
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 0000000000..a0a5133cf4
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 0000000000..a38a3c841a
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 0000000000..f5b5614463
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 09251b0934..3864cc3879 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 cb01545722..5c4d7c4923 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 e34ff5ad2a..b3b7e0de41 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 cccce72344..d8b4d7e224 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 cccce72344..d8b4d7e224 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 193841abd4..93bbe027d5 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 57431fd462..9e0b371386 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 0000000000..41d85c692b
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 0000000000..4932ac5dbb
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 50a713c2a5..07550237ed 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 c228e63bdb..69b7d0cc63 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 fd51bc72c0..2d016c365e 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 eb371562db..633119f0fc 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 1d5da87a4a..dc3879609d 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 2702982fcf..94402b054d 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 3172fe6ca1..f56e26d106 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 d2d29b7106..198be2dce1 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 0000000000..d1b677e4fe
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 0000000000..2731aa143f
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 0000000000..153ab728af
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 0000000000..4a7b85c9ff
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 0000000000..bac00236ea
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 0000000000..aac2741530
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 21d19226e1..0a7d09ad2d 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 11acae0cdd..a67644b0ac 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 0ef86da10f..e82c0d2d5e 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 4af057ce4e..a06fcdc40e 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 81b26f22fa..5869736646 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 0000000000..d86b5c65bb
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 0000000000..aeb972bd26
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 6c7b443529..7d37bedb9b 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 0000000000..918444ff16
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 0000000000..68d7eeda31
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 0000000000..b166d103c7
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 3d58da8d6e..009a8b29e7 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 6217ffa8f1..48158489f9 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 0000000000..95b77cab85
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 0000000000..45f93bbf66
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 0000000000..11ad26c120
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 0000000000..4af7b2eb6b
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 0000000000..76ef339d1c
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 0000000000..1563142f30
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 e00e0879e2..28e9b95f36 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 3036e4fff3..5eaa096230 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 2a9678b583..6a9717aa1e 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 6539904a2d..f7ce167ec0 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 d5fb100823..d6a6a1c534 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 0000000000..acc82bc5af
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 0000000000..2e693c11eb
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 0000000000..99b18ac8d3
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 ca94117982..8c30736f98 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 b0c3a0b62e..60aff93dd7 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 0000000000..13ef63b0aa
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 0000000000..130424ff53
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 0000000000..6fb56a789c
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 0000000000..c021157981
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 0000000000..fcd3411232
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 0000000000..e4b939c908
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 0000000000..8e30b34eb9
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 0000000000..dc1cf128ca
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 f2d68401e8..419b9c8365 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 0000000000..9168046603
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 0000000000..c07120932f
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 0000000000..d8174a6ff0
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 0000000000..b21c4b7b44
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 0000000000..f8c77a50ea
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 0000000000..79ed156b47
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 0000000000..7a1da707a0
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 0000000000..aa84048bbd
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 0000000000..fa5cf0518e
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 0000000000..6614041b7e
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 0000000000..f03ed78967
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 0000000000..7d4997a28b
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 0000000000..b43a058475
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 0000000000..95b1bd8149
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 0000000000..2ed638ebb5
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 0000000000..72d62f9a04
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 0000000000..da9e12ed5d
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 0000000000..dbc6a77427
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 0000000000..46199977e2
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 0000000000..66d5a06d75
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 0000000000..1a209c3ec2
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 0000000000..433b97cc8d
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 0000000000..518d6d31b7
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 0000000000..da49a40985
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 0000000000..05d57fdb53
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 0000000000..4c279c0b17
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 0000000000..eabdead72a
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 0000000000..586449d287
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 0000000000..50b95d4b16
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 0000000000..7c06dae781
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 0000000000..dfcc4522e1
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 0000000000..671d89d6f4
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 0000000000..a5575df531
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 0000000000..b33d213a82
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 0000000000..faed7a0985
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 0000000000..59aa5d58f3
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 0000000000..cfb55f5866
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 0000000000..01e26582fd
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 0000000000..ccfae915f2
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 0000000000..9ac68142d9
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 0000000000..23a150b900
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 0000000000..b85f161ad4
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 0000000000..9bf7471510
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 0000000000..438a21a291
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 0000000000..2a04997fb2
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 0000000000..864292c4be
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 0000000000..6b517faebc
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 0000000000..58f7f37810
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 0000000000..6e581d42d2
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 0000000000..a50fbcc578
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 0000000000..3a9d370941
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 0000000000..5e9190d0e5
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 0000000000..20d193dbba
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 0000000000..3949db60f6
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 0000000000..658b342252
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 0000000000..178231b6b3
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 0000000000..df7e09de2a
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 0000000000..4dece2f32b
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 0000000000..05ec509ffc
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 0000000000..1e8e92d26c
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 0000000000..11b275b3bd
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 0000000000..9f06605452
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 0000000000..48c60e1a12
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 0000000000..b289707381
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 0000000000..92f231e3fc
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 aafbbc2d80..88918f97b3 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 0000000000..ddeda2a43b
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 0000000000..e62d08a901
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 0000000000..27012dfbe9
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 0000000000..c8863f5833
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 0000000000..62e5e00578
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 0000000000..5b96a66a35
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 0000000000..88cc2266e2
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 0000000000..82a068f725
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 0000000000..8572971df0
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 0000000000..1122dfdd0f
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 0000000000..6c1febff29
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 0000000000..b33b3f9bea
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 0000000000..ca91263846
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 0000000000..e0161ccba9
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 0000000000..843abe2fa7
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 0000000000..06337e0c95
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 0000000000..1368c77831
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 0000000000..0806890aec
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 0000000000..284272fad7
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 0000000000..97f9a1b02d
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 0000000000..27743f990f
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 0000000000..9d92c8162b
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 0000000000..f58c338c0c
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 0000000000..25b420bee0
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 0000000000..6a09785396
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 0000000000..a1301ff231
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 0000000000..1bab61fb6e
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 0000000000..b345797f35
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 0000000000..a66ccdb6b4
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 0000000000..9ef011e6e0
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 0000000000..b555f03d96
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 0000000000..8b709a73bb
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 0000000000..31948b5cdf
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 0000000000..d4911d564d
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 0000000000..a6d7cbc948
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 0000000000..0c9e600e5d
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 0000000000..a6ec1f2266
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 0000000000..3679a9a1d4
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 0000000000..31bab226b5
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 0000000000..4b4b822495
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 0000000000..5c6a33a882
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 0000000000..2bfaab0895
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 0000000000..234808c8d3
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 0000000000..d9b0951d08
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 0000000000..82d7d77964
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 0000000000..f6d4dc625c
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 0000000000..cbf4e936c4
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 0000000000..92f9700c12
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 0000000000..ce100a54c5
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 0000000000..e40d5a9132
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 0000000000..7cfed1d0c9
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 0000000000..24419842aa
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 0000000000..e8ca7705a5
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 0000000000..cda779ea51
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 0000000000..40f51c3c13
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 0000000000..9fbac46c1b
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 0000000000..f122058b2d
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 0000000000..005259ae05
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 0000000000..20cba10600
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 0000000000..1085867c73
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 0000000000..79f62f0537
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 0000000000..4b2cf91829
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 0000000000..2fc5dec156
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 0000000000..e333c6e825
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 0000000000..80de645fd5
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 0000000000..b75730020a
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 0000000000..f3615c790f
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 0000000000..4a87204dd3
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 0000000000..503e721295
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 0000000000..8e27920ade
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 0000000000..98b7b97e2d
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 0000000000..ce6609832a
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 0000000000..510bbd2857
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 0000000000..f3473301ba
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 0000000000..0e4c8a1eb6
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 0000000000..3c11625112
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 0000000000..287b380aa9
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 0000000000..16762fdece
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 0000000000..d9212996f0
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 0000000000..cc2a7d242f
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 0000000000..7099b3286a
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 0000000000..10b6a7acf3
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 0000000000..a37590307c
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 0000000000..b8d03288c1
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 0000000000..1f17bfa5ec
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 0000000000..2a70996134
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 0000000000..c5ef8e56f2
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 0000000000..e6fe4f5606
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 0000000000..640ac73aea
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 e7e0d94a7e..fb65d54ebe 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 0000000000..c030344660
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 0000000000..26fc71e674
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 0000000000..54d074db46
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 0000000000..b44d21527d
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 0000000000..02f8d4bec9
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 87efccfb47..6552b1777c 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 0000000000..717d147cef
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 0000000000..33ffa77823
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 0000000000..c28c0ddf41
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 0000000000..130ab75787
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 0000000000..55c5969cb2
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 afb7c8086d..1192b8766f 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 0000000000..b326630c04
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 fc4cfafe8a..dccb5d0512 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 0f61101eec..21701f9d6a 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 0000000000..dfc0b63f0e
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 0000000000..b9572f7542
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 0000000000..dad0f8ce65
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 568141e9c7..74dca611cb 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 346fdeb2e9..b52a93fddb 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 0000000000..b1d3dd0467
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 0000000000..ca82149d55
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 0000000000..89c98ef904
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 0000000000..5ec0746086
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 0000000000..46aa9ce832
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 0000000000..44beaa030b
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 0000000000..f49c27433b
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 0000000000..bc3e5faff5
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 0000000000..78891ec1f0
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 0000000000..d2ed9d7d51
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 0000000000..170a4bb444
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 0000000000..b52a93fddb
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 0000000000..b1d3dd0467
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 0000000000..ca82149d55
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 0000000000..89c98ef904
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 0000000000..5ec0746086
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 0000000000..46aa9ce832
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 0000000000..0e778d4d7e
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 0000000000..91307b714b
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 0000000000..dad0f8ce65
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 181d0dc4d8..fbb5eef541 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 165827b17b..3d321d89ed 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 0000000000..51c5c7027b
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 0000000000..3d321d89ed
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 e717c05933..f821145f10 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 9ddb3c63b2..67e5836ef3 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 0000000000..355dcfe22d
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 0000000000..8264daa9d3
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 a479d99b30..260477a2d4 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 640db6a49e..cf8bd65a18 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 0000000000..52ddaf7599
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 0000000000..d39e1bf4b7
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 0000000000..2f56a42407
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 0000000000..31c61fadd4
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 0000000000..183057d962
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 0000000000..8b3e5dd293
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 d8d0c23c3f..eeac747c65 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 0000000000..614947ba81
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 0000000000..2f9891b480
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 0000000000..44e8fc124c
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 0000000000..7016d1f0f8
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 0000000000..3921690250
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 23f7d98acf..87ac46e6e7 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 0000000000..bfc31b76df
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 0000000000..86cd1a6c80
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 af52cbe103..d003da3ba1 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 bb2539903b..9394168839 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 ac71bf49b5..1022205955 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 abeb7fe2f4..8ce128b147 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 0000000000..3313e7e2f0
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 0000000000..916b42be04
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 0000000000..7ab3507e2c
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 0000000000..aeb15696e6
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 0000000000..8e86466514
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 07db5ac13c..51c5c7027b 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 0000000000..256b562d4f
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 9b6f69ca1b..af10ffa7e8 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 9e949d4b05..2a9731584a 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 199b03f1d9..e9b2420fa9 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 b353bd4abf..2eb131de41 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 0000000000..bdd1daad75
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 0000000000..30c904e169
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 921b180454..15b7188abe 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 921b180454..15b7188abe 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 f5939dfc2d..7852c7b9be 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 ef2778f7a4..18995016ea 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 0000000000..fc2c4d69d0
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 88db70bffe..06a97625d4 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 3de70bf030..7a726c3a78 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 b569302492..b6e7072262 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 0000000000..364f5af9bd
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 0000000000..3b15005541
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 0000000000..948d36d6a4
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 0000000000..f9b158fd8c
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 f6313a7704..584c09dd0d 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 4f31242b15..c2f372979f 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 0000000000..42799a3b74
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 0000000000..1a80fb5f2e
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 16e1f419e2..42799a3b74 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 59a73872fe..d153c400ed 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 863c2a6698..e37d6fa63c 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 75385882cb..f0a58a3715 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 3f7a75574e..27d8335093 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 01aa415dee..126a776acc 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 0000000000..7d49e1c916
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 0000000000..bcb2c82318
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 0000000000..f864ee5ea9
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 0000000000..c9c73598b1
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 0000000000..4cce156c14
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 0000000000..126a776acc
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 0000000000..7d49e1c916
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 0000000000..bcb2c82318
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 0000000000..f864ee5ea9
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 0000000000..c9c73598b1
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 0000000000..4cce156c14
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 0000000000..94b07d31ac
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 0000000000..a9b9327692
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 0000000000..f41c930680
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 0000000000..f1c13c6e0c
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 0000000000..27b10c24fb
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 0000000000..d9f6ba7bba
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 fc6924f71f..109f480419 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 662c9f36fe..c68849f357 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 edf4cc1286..f7ab7c2c74 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 37e8c04c04..2e10c6001a 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 b69c664aa3..f32d8e136f 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 220ef6486c..606ada2ed4 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 68fa2099ea..c09d290c01 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 0417a10943..f9da231184 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 0000000000..72b32c188f
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 0000000000..694316523a
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 0000000000..dbb37173d7
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 0000000000..c311381bce
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 0000000000..bc74e33fe1
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 0000000000..ce7bb7cd12
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 0000000000..c9fd8609bb
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 fcdded5cb4..2f4e8a9d48 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 0000000000..f5742eda91
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 0000000000..4dd7352f77
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 0000000000..44dacb8a0c
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 0000000000..e8affdf454
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 0000000000..042948c39a
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 0332bba08e..3bd413f268 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 a872990f0f..d1bf210a77 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 ed7a1aa975..ca4bd871c2 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 6ca380ccc8..38e5a652ab 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 231202a852..9c9dc80824 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 0000000000..521999380c
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 37972b04b5..e22ff7d1a6 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 0000000000..7959b94c39
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 0000000000..735f0fd5c3
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 0000000000..e45bd79054
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 0000000000..55a09777d7
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 0000000000..8f8a1668de
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 e19ef4cf86..6de01068db 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 0000000000..ff94010440
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 8867d8de41..669eb54fbf 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 0000000000..d62600569a
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 0000000000..004026f11e
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 4937477132..f8e16d4a1f 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 db53c8642a..3a8695d5f4 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 0000000000..737e60dcc8
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 2115d429f8..0028a1fe44 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 2115d429f8..0028a1fe44 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 0000000000..a4701766ec
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 fb7416e14e..67d8c2ef3d 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 8f7818def2..85ad0cc653 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 0000000000..dad0f8ce65
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 0d16971388..948d36d6a4 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 130a11287c..ccc3826641 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 0000000000..7b9a30256c
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 4820f0c6cc..2138c8f8cd 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 52095afb29..13fb245471 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 0000000000..13fb245471
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 8fa069d578..85f7bba60f 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 0000000000..85f7bba60f
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 bc9e942c19..9f2e1f1f89 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 0000000000..cf00cb5749
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 0000000000..b03af80215
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 0000000000..a4562939c7
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 46059ef55f..d4d2aadd83 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 589d508d5a..2af7f8b823 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 0000000000..6d08f75c6b
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 4733ecb474..a14d2bffae 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 7adef77ae4..bfe7b1dc02 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 1d9da89933..3544be5b03 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 4dd7808b87..caa3f51d2e 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 b4a10fe93b..797c435b70 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 0000000000..c90ee91006
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 0000000000..b6ec827f38
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 0000000000..8df51e056f
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 0000000000..232495b5aa
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 0000000000..dc52c7b5d2
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 0000000000..72455cef93
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 0000000000..24c952374a
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 0000000000..b5746a4c78
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 0000000000..92eded52fb
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 0000000000..a7a0fb9d5b
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 0000000000..77663e5934
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 0000000000..797c435b70
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 0000000000..c90ee91006
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 0000000000..b6ec827f38
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 0000000000..8df51e056f
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 0000000000..232495b5aa
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 0000000000..dc52c7b5d2
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 3a812b5535..efec493cae 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 abaaf15ca4..8dd7edd458 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 20249ddacc..f948f3d255 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 fafebd2642..bf662e9a8f 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 131f6e05bb..d2daa6662c 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 0000000000..cf150763d9
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 0000000000..6bc5813b61
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 0000000000..1e3243d7e5
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 0000000000..5330d9794c
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 386396c799..7561d03c25 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 0000000000..c474e1b2af
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 0000000000..a04dbf7c8a
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 0000000000..f198511ec0
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 0000000000..48b7dab4fc
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 0000000000..90e8771126
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 10971327a5..ff3e8f08b0 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 d5a17c6104..175bdd76a2 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 eb6853649e..ff382324e5 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 bc1ac37390..0303907daf 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 4d77d04121..2ec42d068f 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 c22044d12c..958cb3858f 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 2a028a5391..60974e106d 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 7cc7ec7c17..db5786f95b 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 0b419a5df9..356f9f3c64 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 257b23b826..e23a091cbf 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 f7d06f7cd3..e12836eef9 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 8664a9d1ce..12f7f469aa 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 8664a9d1ce..12f7f469aa 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 28482bcb6d..ae8f6be07a 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 88f3ce8063..e1adb5fc01 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 0000000000..22dd5a6409
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 0000000000..3f6b9eefb6
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 0000000000..74f9267b31
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 0000000000..a2b4e9acc0
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 0000000000..244e16aa6c
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 0000000000..c4636c1ae9
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 0000000000..8da030b734
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 0000000000..d945cd09b4
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 0000000000..f871e308c5
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 0000000000..ef9c47d55b
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 0000000000..bf469bf1f0
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 5574a33c50..fc51dcfb06 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 0000000000..52cf1392a6
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 0000000000..a8b9d7ec9a
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 0000000000..cbedc79d8d
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 0000000000..7a6da71e87
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 0000000000..3236ad424f
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 87121fe107..d6739c8457 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 0000000000..3b4a366171
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 0000000000..ffcda16308
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 0000000000..46fb744035
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 0000000000..3c05309e58
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 0000000000..1acf2a4a54
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 0000000000..6ca350992a
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 3c4c59e1e0..1efe6018b1 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 0000000000..53d7098597
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 0000000000..c6175d6500
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 0000000000..5b25856d3b
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 0000000000..ed9270ac9c
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 0000000000..507b233703
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 1261df7c00..4aeba637f7 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 0000000000..905e8a98b3
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 0000000000..7d9c997674
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 0000000000..69a9c17910
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 0000000000..7ae4d8ea04
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 0000000000..89542a2330
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 0000000000..1d732d75b3
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 aa79c5ac77..1d732d75b3 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 0000000000..7b20f241a4
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 9adad89393..b29c550cff 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 9634051d47..56f5cddc27 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 b658875d7d..b0684aa0b4 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 3bfba6c3eb..7f3f138ccd 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 e8f1841320..af2ad6f3fa 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 fd231c9dcc..332d4cc90d 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 0000000000..2f4edfa032
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 bccc7685a9..342dc9e0d3 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 ddc02d4fa7..49e8ab878c 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 0000000000..2d5120ea0b
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 0000000000..a6e32d6078
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 0000000000..79494951e3
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 0000000000..61f31b1cc4
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 0000000000..b57f1f5cb3
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 780c99af78..d3afb4c6eb 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 0000000000..21b025ea51
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 ff36d04904..9dfcee2d47 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 7f056bfb32..6a2a262aff 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 0000000000..2239788f68
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 78f881392d..b7dd064c8f 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 fe8739808b..abac46b590 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 0000000000..cf6ae83d80
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 e2f19b2752..796bfe4a84 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 29a44e6f05..17b5db0e25 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 4fa7bcf2cf..b3002ed4c3 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 4f4bbda422..0a71b54c91 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 8b81727d4a..e0e980854a 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 81b26f22fa..5869736646 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 0000000000..e136514c9a
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 0000000000..bcbfdea785
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 0000000000..3a690eb7cc
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 27dd3ad7c4..8d7a39f271 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 0000000000..8878837866
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 0000000000..c25936413e
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 0000000000..f2db60ab8b
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 0000000000..f3e88da168
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 0000000000..a11b9fac7a
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 0000000000..93c4a67f41
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 0000000000..62e08e4bcc
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 0000000000..ea40ec4e7b
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 6d340d44c8..6f560198c2 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 3075e667c4..791d9a70f3 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 e34ff5ad2a..b3b7e0de41 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 0000000000..c3bc9e2bf8
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 0000000000..5f81d2d2f0
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 0000000000..2a16b4d32a
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 8867d8de41..669eb54fbf 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 0c15835e21..3450cb75c2 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 aca1d93a22..41a93424e8 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 4338bb4389..ca30e8990b 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 b0ce2c2f50..5ffa1e17dc 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 66b170cc77..92fd116fff 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 1be5733ff4..31613a9320 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 1fdef76093..29f068aaf0 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 a0128d5615..c085022e7d 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 a0128d5615..c085022e7d 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 0de43c9b36..19d86b3013 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 0000000000..ba87793ec1
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 0e76c56f8b..e622f3eaf8 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 0000000000..a67644b0ac
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 11acae0cdd..a67644b0ac 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 4af057ce4e..a06fcdc40e 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 54aa560fed..355dcfe22d 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 b907b343c6..e10b99fe92 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 5a5446d289..b31a77b5b9 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 abab353376..6cb7d76597 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 b99a1132cf..dbcd379911 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 9e50424832..fd1501221d 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 0000000000..4064c30b89
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 0000000000..ec05fe0695
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 0000000000..790a278e9b
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 0000000000..9fffed69e1
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 0000000000..cbd54a8b86
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 0000000000..66b247fa5a
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 0000000000..2f19173888
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 262db0d00b..4667b907dd 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 0000000000..16f321b8ae
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 0000000000..bd6c5e162f
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 0000000000..72f848c863
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 0000000000..863caa5433
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 0000000000..d1936f1123
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 0000000000..d0be0a3bb0
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 0000000000..2ccd6c7254
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 0000000000..ac3ae39e31
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 0000000000..37446ec6e3
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 0000000000..d6734f1e3d
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 0000000000..79852cb807
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 0000000000..2e6d5c2069
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 0000000000..c85e42308d
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 0000000000..9e3488f99b
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 0000000000..9028b985f3
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 0000000000..840f346f83
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 0000000000..54dbe80a39
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 13cb1dcc7d..2f234c1261 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 0000000000..511ad7125c
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 0000000000..652a2149b8
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 0000000000..3ea11741d3
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 0000000000..28b8f86325
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 0000000000..5450f40d54
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 a06b4e01e7..69d6b0b5a7 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 0000000000..71286ddbf4
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 0000000000..f5ccb5bc26
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 0000000000..2d068f1de9
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 0000000000..af6fe7aa98
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 0000000000..85e4e9885b
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 c0c736f741..3cfb0b6d15 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 0000000000..f63af15d1d
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 0000000000..02d18d8a15
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 0000000000..9590fed0e8
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 0000000000..88232fbee9
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 0000000000..80d274c07a
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 0000000000..e468cd4884
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 0000000000..bdb66d8524
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 0000000000..2445053686
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 71711ef1dc..81bdd23159 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 0000000000..71919170c9
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 068633b3a8..246085679c 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 6c6f5ff05b..36bc51f9cf 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 172289f230..909362877f 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 a214b591cc..2db3e8c5ea 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 c7bbbed3a1..1bc45c75c9 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 e43ef813b1..8390f27bb8 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 fcac319f36..11390d483e 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 0000000000..36e2e4183f
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 8ef0aed711..b8073d8d82 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 7783233e9f..0cc3774779 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 0000000000..a990ed2cbe
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 0000000000..75254d8a0e
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 eb1d4b2473..75254d8a0e 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 8d72ac773f..6530e95cff 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 0000000000..86a151d38c
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 0000000000..a051834bf1
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 0000000000..88a08aeb95
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 0000000000..78d1d82aa4
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 0000000000..a7e3837f23
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 1705f088c1..aa813b51d3 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 0000000000..f574ba9558
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 0000000000..157a2286ff
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 0000000000..3a5b3c24ef
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 0000000000..fb4b460b5b
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 0000000000..f8e91dad48
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 3d5f77bbd9..ec4187d7ba 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 0000000000..4e682eebbb
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 0000000000..ca02a74b53
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 0000000000..8ae8ced01f
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 0000000000..388e88f4ac
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 0000000000..be0960e5d0
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 4e8393a385..7589c68d4f 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 0000000000..bf48906da6
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 0000000000..8de6a0c4c9
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 0000000000..b7196bafcc
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 0000000000..a9a3f6fdc0
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 0000000000..8c6f7ba956
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 7bf80c22c2..99b63169d9 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 0000000000..7064adcd53
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 0000000000..e74c10fac4
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 0000000000..034e80952c
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 0000000000..3e5fdcecca
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 0000000000..14eec3497e
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 0000000000..f8f096e9cf
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 6f98dcfcc1..9dc3c17e9b 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 0000000000..c6e424f54a
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 0000000000..74bc0da8f2
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 0000000000..d461370fdb
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 0000000000..12d654b4e5
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 0000000000..d555c18f79
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 0000000000..0542d87a6a
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 0000000000..b00f14d2fd
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 0000000000..5e7e99b42e
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 0000000000..cc43594839
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 0000000000..b9109d47d6
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 0000000000..b44c2ea1e0
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 0000000000..cd94a46c76
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 87d7866966..b1d921d96c 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 dc4ad28221..c8aa1889e4 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 87d7866966..b1d921d96c 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 55b9d7dbf1..9041ab3d1f 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 0000000000..70685125ba
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 eae3454c86..7a2fb07007 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 ad913668e3..43646f03df 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 ae37adf3d1..67b9059a7c 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 2e4b6e90b6..b40de98bdc 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 0000000000..065939c382
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 2367b38e63..88a91f76f2 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 cf61c8eba0..acb0f99d72 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 9cb7a82163..a44b7a1298 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 32754df9bf..bdfc781f7b 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 0000000000..07bb3d8bdf
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 0000000000..7e8ab5ac36
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 0000000000..7d01cfbe5c
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 0000000000..e6ad0ebd97
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 0000000000..6a52e8697e
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 0000000000..d39407f1a3
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 0000000000..3cfb0b6d15
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 0000000000..f63af15d1d
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 0000000000..02d18d8a15
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 0000000000..9590fed0e8
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 0000000000..88232fbee9
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 0000000000..80d274c07a
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 320b8952bd..eb1892ae02 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 0000000000..9c54413a72
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 0000000000..6281185ef7
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 0000000000..23334af3ad
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 0000000000..7304df459a
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 0000000000..3b67bdd522
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 3016620ec5..e67ffc8c3a 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 0000000000..c56f668d18
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 0000000000..3c439cfa61
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 0000000000..ac810fa305
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 0000000000..893dc91287
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 0000000000..e3b1bb4e54
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 0000000000..5b9b93f1fa
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 0000000000..615e11503a
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 0ef5600a45..559086b3c0 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 0000000000..559086b3c0
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 0000000000..9829fa23d6
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 0000000000..cb34d61e3c
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 0000000000..362d7c4ec4
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 0000000000..57cb400ea2
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 0000000000..28598ace62
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 0000000000..68fa20f10b
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 2aecbe96a4..de506646b4 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 0000000000..d576ce4df8
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 0000000000..96484ff791
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 0000000000..7429f3ed81
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 0000000000..a1a476332a
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 0000000000..5599020832
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 711fd7fbe1..bc356b7b5c 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 b626d6088c..f957286ba2 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 0000000000..8762d9ce24
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 f1d2470999..f05a3f6d14 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 0000000000..bba3d6fe12
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 0000000000..123e445030
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 0000000000..974055c628
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 0000000000..3f068a0f95
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 0000000000..798a95d9fd
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 2aa3a5a10d..dab19a7cb7 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 3c1c44845c..728bd8fd53 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 dcf40de1fd..cb6e075c9c 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 9736f427f1..ec4606998f 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 0000000000..8e058678ef
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 80938421a3..36d2465b86 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 0102469707..1ec796818c 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 cbb91dbda3..06be3a3850 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 c26550d13a..60577b2803 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 6a35a41014..3ce637440e 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 c26550d13a..60577b2803 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 59a73872fe..d153c400ed 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 d797df04cb..2b6ebf3c6c 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 0c767cd801..0175b6c9aa 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 e977189f9e..0f447cc8a7 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 e977189f9e..0f447cc8a7 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 17ad7b6307..c7ae736cad 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 3a7795e303..6c11df9754 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 53cecd4db7..a84af6e421 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 3a7795e303..6c11df9754 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 e824621774..2292152e0d 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 0000000000..d77a770671
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 0000000000..ffda7881dc
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 0000000000..cf4b3376bb
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 0000000000..4febc58f7d
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 0000000000..1de5dbde5a
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 0000000000..68e1158c3e
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 0000000000..505506833f
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 5e035fcfdb..b916dc7f87 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 0000000000..e60690c77e
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 0000000000..9aabb63f85
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 0000000000..86696653b5
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 0000000000..1e92c70971
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 0000000000..1e260d4461
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 52ded94d54..f99fef5296 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 0000000000..3f6b667ebe
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 0000000000..0a811f93d5
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 0000000000..21a92e444c
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 0000000000..f40f860c16
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 0000000000..b87967ff84
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 7294a38c1f..e672a711f1 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 0000000000..635aa1f775
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 0000000000..d6c303152c
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 0000000000..645ad295a8
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 0000000000..cbb240d2c6
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 0000000000..0e727c865a
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 0533bab402..49cb6a53aa 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 0000000000..d03fdc2ea4
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 0000000000..37e9b1277e
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 0000000000..c45d7f3cba
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 0000000000..3ce79a95f7
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 0000000000..b32c537c1f
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 5cef8797da..72ea7e6bd7 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 0000000000..110f5edf80
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 0000000000..5fc1015a02
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 0000000000..022eb60392
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 0000000000..76bad2a893
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 0000000000..fb79988768
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 0000000000..268f7a5236
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 0000000000..79002d2fec
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 0000000000..8983fe4677
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 0000000000..274389fca0
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 0000000000..ae8b451a19
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 0000000000..7eb18142ed
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 0000000000..72ea7e6bd7
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 0000000000..110f5edf80
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 0000000000..5fc1015a02
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 0000000000..022eb60392
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 0000000000..76bad2a893
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 0000000000..fb79988768
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 6afd11b63c..c79fd6878a 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 802587548d..029ccc226c 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 17bc1265d8..01ab9f5945 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 d3366b61fb..b8c614bb0c 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 04fe0099ed..0d1c9d45a4 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 9163e78abd..f1184f7d47 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 62e9d4c62c..3d750cab49 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 5a06e50984..ba6ad07721 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 fb8c270c8b..d68bd3607f 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 16bb59dee8..bdf352d132 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 c352436d90..fe8d47927d 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 288e86d9a2..650c52935c 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 1ba3b8e7ca..92240cc2c4 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 0000000000..e1306b90dc
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 b8f203dc7a..7c2b5160a6 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 0000000000..dad0f8ce65
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 abeb7fe2f4..8ce128b147 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 0000000000..3313e7e2f0
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 0000000000..916b42be04
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 0000000000..7ab3507e2c
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 0000000000..aeb15696e6
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 0000000000..8e86466514
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 9ab17fceaa..c4e9aae215 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 405c5916f5..e88ecfcd92 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 0000000000..438c4c6b2e
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 ce6c110c38..86fa7f01cd 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 3e4d163d94..9ad2d64fe3 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 b069d79b9f..6ac2060051 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 c81bea0aa5..62da6d7ab5 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 bde772e630..7d05cb3604 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 285492d7b7..27b4462cbb 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 3a0cebaeba..5b54751891 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 fd0adefab1..d65ed7bb33 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 fd0adefab1..d65ed7bb33 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 77efcb8983..de37e29dff 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 0000000000..c0e4eee11f
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 0000000000..8485fcbe1c
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 52095afb29..13fb245471 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 a304d8eb5c..70e2c112ea 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 10153f06a4..8485fcbe1c 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 0000000000..898174d640
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 9c1ec084f8..1a4a6bf2f6 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 f845c37011..5dfe4d8a42 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 2980fcc9d9..784fd52270 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 fe8be04225..0abf3669b0 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 f8c24e2005..d0f5f58a5b 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 095b6c531e..01e3f04148 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 0000000000..0845805397
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 0000000000..670f5ef309
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 0000000000..00d83be28e
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 0000000000..c01f2289d4
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 0000000000..76b008246d
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 0000000000..01e3f04148
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 0000000000..0845805397
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 0000000000..670f5ef309
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 0000000000..00d83be28e
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 0000000000..c01f2289d4
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 0000000000..76b008246d
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 0000000000..4fe824a2b9
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 0000000000..b83bbb6e81
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 0000000000..93fef46fea
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 0000000000..036d969d88
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 0000000000..1a0f5d5b6d
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 0000000000..17841ebb87
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 f85a73fd4d..a92bbdbb8a 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 35be1cf926..b8a0b8f62d 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 bd9f81b76a..86592f2975 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 0000000000..546cb4791d
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 0000000000..635f3203ef
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 0000000000..97d2cc1e03
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 0000000000..678a308cc4
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 0000000000..2f012dee70
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 0000000000..86592f2975
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 0000000000..546cb4791d
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 0000000000..635f3203ef
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 0000000000..97d2cc1e03
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 0000000000..678a308cc4
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 0000000000..2f012dee70
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 4d796f10a6..c1ff4c4d34 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 0000000000..d5908236a3
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 0000000000..f6b51471f8
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 0000000000..b1a8400b20
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 0000000000..9899a688fa
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 0000000000..2c2c34bc60
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 0000000000..4563361796
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 0000000000..4bbe4a9778
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 3bfb06bfff..88b8b42a16 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 e4f3edf680..5c020b111a 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 dc2ea1ee65..c10b6a24cc 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 e7072a149a..f9975bda7f 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 0000000000..6f56f82623
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 0000000000..18aa756e02
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 ca7edf36df..ab091981b8 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 0000000000..37dbc0c81e
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 10c906203a..38c66269e0 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 0000000000..cf273d9179
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 0000000000..46c7989b34
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 0000000000..d5f6bfc113
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 0000000000..791442b674
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 0000000000..1d98e5de0d
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 0000000000..10a206cd59
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 154b1b5c72..1a8fea811c 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 68fb59dc19..6b94efd773 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 04d29aa6a7..1b64148f97 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 0000000000..6282420b70
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 0000000000..aa85e189ac
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 7aee717234..663c56cd02 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 5fa43f378a..b13e29f36c 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 0000000000..597ecba8ec
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 752473912d..7e9102aafb 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 c9f160564b..8948df417f 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 bf9a56aeff..e7e2187f88 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 390e62321c..0dbc1a6287 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 a9a9db203a..cf32395936 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 81b8c47aba..33a272b844 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 c0df8e7b37..6e99397d58 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 1e46a06c65..029314138a 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 958c30e9ee..b8af47c1d7 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 1bccee1490..b095eae886 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 2851bccdb4..2a7a930b26 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 6e4dda1aec..eb787b4d2a 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 0000000000..05126770ad
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 0000000000..0145a3946d
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 0000000000..917474197d
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 0000000000..17a6d18372
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 0000000000..6f17c4b78f
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 0000000000..34b10c5b5e
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 0000000000..4ab925eace
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 0000000000..4207dfd6f8
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 8a1fe0417c..e9ad208000 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 0000000000..9d95603b80
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 0000000000..aa16e17fb4
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 2b7f34d0e1..5e974646fa 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 0000000000..a8421e1006
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 9a0d04f498..c2c199eed1 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 fdcd26c8b4..5fd7a2952c 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 a6f2b26854..82a821de44 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 87d0f23c76..5b4713e208 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 ffa65cb673..38f3472632 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 6cab94e37d..6e6e94527b 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 18fed80964..ef0745cb18 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 87d7866966..b1d921d96c 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 0000000000..ddc2cb7651
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 ad7ba7e249..ddc2cb7651 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 0000000000..81e394561b
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 6db1dda0ec..19a13378a8 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 0000000000..7d78c74866
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 0000000000..1718e66602
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 d8d0c23c3f..eeac747c65 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 0000000000..614947ba81
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 0000000000..2f9891b480
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 0000000000..44e8fc124c
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 0000000000..7016d1f0f8
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 0000000000..3921690250
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 2940d4ae74..d0c76c4b5c 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 0000000000..170347d34d
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 0000000000..b43ec36212
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 2cf9e489f3..5972360e7f 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 2a4d9ca7f7..23d2ecd1c4 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 89aaa6cbb0..614ae5c849 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 76d2b03624..270878a24f 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 091956a136..f33dfdfce8 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 89aaa6cbb0..614ae5c849 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 1087099c6f..2a3b044107 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 1087099c6f..2a3b044107 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 0000000000..872e5c23d6
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 d9ec0d7d8d..2a3f2bd084 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 e37df48d03..90e49164e5 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 0000000000..39216918ee
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 0000000000..bdbecbff6d
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 0000000000..8ce4902bcd
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 0000000000..76b824d5d9
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 0000000000..05f754a6a6
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 0000000000..90e49164e5
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 0000000000..39216918ee
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 0000000000..bdbecbff6d
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 0000000000..8ce4902bcd
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 0000000000..76b824d5d9
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 0000000000..05f754a6a6
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 34b9786153..7a53d54234 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 b76dce309b..13ef63b0aa 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 0000000000..130424ff53
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 0000000000..6fb56a789c
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 0000000000..c021157981
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 0000000000..fcd3411232
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 0000000000..e4b939c908
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 938547aed9..abe8592d67 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 c8b0a25ea2..dc605beeb3 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 938547aed9..abe8592d67 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 0000000000..dc605beeb3
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 c8b0a25ea2..dc605beeb3 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 42da9edb7a..59ce7cde1d 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 0000000000..1fc1c9392c
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 0000000000..d21d260ac2
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 4bd5d32edc..5342466c30 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 5b7e4a70d4..4dc56355d0 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 202d6e0bd6..4c2603b3a9 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 3223603df1..0e045262de 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 407a5e48c7..222ca47a56 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 cac80903ec..c3bfe595c5 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 f4d72befae..bfb387136c 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 8e65729a6c..9ebae5eed0 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 7243c2cb5e..a50aed5443 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 2b4ac8d7fc..3790fe743b 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 a552663374..80900d2126 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 0ad3ed0bed..73c3b5e5bb 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 106adce9c3..7d424c18d7 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 7014ab0c8b..b160cdc2c9 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 197beb5f98..5904faf339 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 0000000000..39fc4ecb4d
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 edf4cc1286..f7ab7c2c74 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 ab3ca56d38..3d66a4cc84 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 0000000000..6e5f70db4f
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 0000000000..a295d3ea8e
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 0000000000..d7c1c0f881
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 0000000000..682c1a1c26
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 0000000000..1f676454cd
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 7316430220..3fe9831aca 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 00183b1600..881f87d60d 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 4355d9f0db..9388e9d4bf 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 0000000000..9388e9d4bf
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 6a09064f50..060ac2ddbf 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 df7c5c761e..0c13f98e34 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 0000000000..eb275ca49c
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 0000000000..bbdc2f6102
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 0000000000..0f51db4c94
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 bd0f84f54d..a04a1d9f71 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 5bbb147019..62637e71c3 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 8f71ff5db4..dfef71bfd0 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 0000000000..802bd272f7
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 0000000000..dad0f8ce65
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 0000000000..f26d9bdc6e
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 f21cc08706..5488ca700c 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 a140620266..8e3ca45c39 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 997ea8acbf..e3e5079fa5 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 361cedcebd..ca4a4d9d32 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 530c91b32e..d86bc80ac6 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 de13538169..0240f1ff54 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 1668b2ee48..202e7b2187 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 25251d6a32..9cbc9b1002 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 9a7704da04..100295eec9 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 9345acae47..62fb598f38 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 9345acae47..62fb598f38 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 3f01b30930..4039574402 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 4c6b86d8a9..4f7a4e3dbe 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 06da53a737..18018efcb4 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 163d2c89a0..97a6010501 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 0000000000..0997b42f0c
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 4f13ffb5f7..0997b42f0c 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 eb6853649e..ff382324e5 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 0000000000..ff382324e5
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 0000000000..583fa80861
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 165827b17b..3d321d89ed 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 b76dce309b..13ef63b0aa 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 0000000000..130424ff53
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 0000000000..6fb56a789c
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 0000000000..c021157981
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 0000000000..fcd3411232
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 0000000000..e4b939c908
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 0000000000..2c80acaa68
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 0000000000..fbbb925b80
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 0000000000..dad0f8ce65
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 0000000000..de4db59398
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 0000000000..ae2720530e
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 0000000000..ba2a134ef0
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 0000000000..dad0f8ce65
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 0000000000..dad0f8ce65
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 0000000000..d2a9b7fad7
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 4622a59246..b69d81ebaa 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 43d25e24b7..363ff89274 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 791fa6a677..7253e078cf 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 cac758b4f2..273c92af0e 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 fcfaad6d0e..688528fa84 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 0000000000..e7b8b6f9a8
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 c78acc9a3a..7a7afc7d89 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 06ca9379d8..47f4ba93fa 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 f1e1ee6980..fd78f0e131 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 2963435eee..8691eafbb6 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 32435295c7..84304bfcc6 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 234329ee03..791b42fa2f 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 0000000000..c84adb179f
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 7bed0afec8..c061a24e3e 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 b9223766a4..59fbedc93d 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 c48630c28f..4e683c1280 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 88cfa38ee2..2d2367ebcf 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 c70ce93270..4d6aee5361 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 98febc1f23..579284e7a2 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 bb2539903b..9394168839 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 0000000000..ac839e32ca
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 0000000000..aaae2ea590
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 0000000000..e3a78dca90
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 0000000000..4fc26cb31b
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 0000000000..6686bc8d5a
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 9471e1cf42..4ebe4329c1 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 1ffc2c9cfd..b844443198 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 fdecf03f7c..99271ece61 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 b749ef2ee0..c983cbc070 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 dbad3698a8..ba83c23126 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 6e9ec1b001..3c27efd19a 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 f5e6d0425f..1e2f330d86 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 0000000000..c77d90b246
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 0000000000..fa1ed7963b
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 0000000000..1a8f8c59dd
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 0000000000..600963a330
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 0000000000..da93a4d5ba
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 0000000000..1e2f330d86
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 0000000000..c77d90b246
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 0000000000..fa1ed7963b
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 0000000000..1a8f8c59dd
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 0000000000..600963a330
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 0000000000..da93a4d5ba
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 0000000000..5833789ebe
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 0000000000..c0497f10e8
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 0000000000..27f3c51783
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 0000000000..37937a5085
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 0000000000..4185bf21d2
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 0000000000..170fefa657
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 0000000000..4113fc0a4c
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 7088a32456..9bc4d0d8a9 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 0000000000..aa287807f1
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 61a177788f..4bb8e576ee 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 0000000000..5330d9794c
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 0000000000..d1d715c296
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 cf08e685ea..71c1442f13 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 0f439023b4..6b3d498af2 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 b9ece4b935..07b2b315bc 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 0000000000..d784af61fc
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 6657f153b1..338ecbc998 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 cef0659d36..bc89976280 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 0000000000..f744028af4
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 0000000000..f2f524c92b
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 0000000000..72156ef8f9
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 0000000000..6f0b853600
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 0000000000..5f6222134e
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 0000000000..bc89976280
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 0000000000..f744028af4
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 0000000000..f2f524c92b
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 0000000000..72156ef8f9
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 0000000000..6f0b853600
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 0000000000..5f6222134e
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 0000000000..c96906cbfa
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 0000000000..e7937a5e94
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 0000000000..c43eac0982
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 0000000000..7a01d16113
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 0000000000..32e34241e2
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 0000000000..26346ec272
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 0000000000..1ef2b0ce41
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 03905490d1..182f0a46e2 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 e244775095..a09c710408 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 0000000000..9048b71158
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 9dcffbb44b..ae2ef5f265 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 0000000000..27102b89de
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 e43ef813b1..8390f27bb8 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 d1234bb4b9..dcdee39c82 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 ba7765bc59..6737d2d1d7 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 0000000000..b0fdb2c49e
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 0000000000..0cecf7088a
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 0000000000..dab274ddfc
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 ff84cf3996..7e50cf9972 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 45a5ecd2af..ee0912c1e0 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 0000000000..290a513c36
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 36ef13a832..53fdc1438a 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 2635768f55..5c02368846 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 d312f04602..f3e8ede67b 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 a456c17db5..2445053686 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 62d5834fd2..087c5fa29b 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 1a61e8d508..96f65d87e7 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 6690db7bc3..60b3c3787c 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 673da9bd81..2ca385feb1 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 99f7a6ef5e..8eb56114f0 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 0000000000..a3ac84b8fa
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 1d55d4f631..23398cba6c 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 3a7ba22f8e..82bdbf6335 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 1858262d95..a99dc4d85a 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 1858262d95..a99dc4d85a 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 67340603ea..fd55816c8f 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 600c2b652e..0914fd7811 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 220ef6486c..606ada2ed4 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 8203a027e1..f2e7da55f6 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 0000000000..86d0319a4a
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 0000000000..c50a57e11e
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 0000000000..979e09adf8
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 0000000000..bf4f10d81a
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 0000000000..ecab34a982
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 bf0f4e543a..b03f09eb00 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 0000000000..a3a855f569
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 0000000000..c8e515c99b
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 0000000000..4a388dd5fc
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 0000000000..5bf6c233fd
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 0000000000..fed5d03000
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 ea9bc1ea2e..5cb64e49e4 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 ea9bc1ea2e..5cb64e49e4 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 f7cdc8af14..9523d73fe9 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 959ba48a2d..d4a4f20a29 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 30d3f60e3f..bcb497cda7 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 69fc916af4..9dc79730d9 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 9ec0b3e7b9..970e7bdee4 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 9ec0b3e7b9..970e7bdee4 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 0000000000..9f5447a9c5
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 0000000000..a6eaa68817
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 0000000000..5252cee381
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 0000000000..52eada652a
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 0000000000..0cfa09e361
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 0000000000..78ea008982
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 0000000000..7ee2daef29
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 0000000000..f84a2e0281
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 0000000000..448acc172a
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 0000000000..23c4c592bc
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 0000000000..be3b2d1e72
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 0000000000..35c12c4903
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 0000000000..67e0a0ca12
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 acf6f96ad8..0b6f36462d 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 c5338782ac..eb25108401 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 0000000000..31f107a8f9
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 0e499703dd..08dbd74daa 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 0000000000..52c3213be5
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 380a4ab4a5..6ae9f3923b 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 8f3b553b8e..5211b2c2f2 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 0000000000..aabcbefa5c
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 aa8a7fc5f1..2bb68dd3a5 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 1be385628f..174926ff02 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 7fd84ae9c8..a0065f57a3 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 732d52bdec..516e982d62 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 0000000000..7f488bc983
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 0000000000..1b52acea75
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 8fa069d578..85f7bba60f 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 0ef5600a45..559086b3c0 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 edf41b6a6e..d0891896ec 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 98d6ece6ea..0de0ab08a8 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 f9da859d08..43e9c0da20 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 3e79fb1b6e..6f34e41484 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 e46bb80726..10105bc8d2 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 4c63eca1b3..0d81f430a8 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 deb43385a0..495e1ee22a 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 968e807332..2419f0f5a0 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 5ede969843..45536a1ac1 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 0000000000..52bc446d8d
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 0000000000..4dd6ecd04e
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 56dbe89f4e..eae6985d99 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 d708db94f0..ab8c570e6a 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 4ef4974901..eb969912a9 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 def9ee997c..b4e3078686 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 8aed780373..ff9c276b1c 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 cec1216e81..0fbb5b4f66 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 30ff275879..c1e906641f 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 0000000000..ef0745cb18
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 f798ed9d40..e841a28bba 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 0000000000..6fc6c89628
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 0000000000..9ba90c6c15
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 09181dd70e..c0aae847c9 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 0000000000..6c3dfed67a
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 0000000000..e3f57dfe98
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 8389c5dbaa..fce25a40ce 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 0000000000..179aa46066
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 85079ffb8b..5cd554ac60 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 fa7708abb3..a187bc9b57 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 1de23db789..37c3fa792f 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 229a4a6b8a..be2de5c738 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 b66c204e6a..2c28894a11 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 6a538c4a91..ea96bde544 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 babe5c8b2e..c0b6e8b67a 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 f347e846b6..f74e250d0f 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 4f46d2340f..48b07a4ed5 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 a33cc2e92b..8d5ad589b6 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 def973dc98..18f9397f5e 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 dc24cb62f6..29df4c5227 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 ff0140c69d..749f759aa6 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 ff57e3c971..d34fef0b4d 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 a55ddcdd25..73a7bf1d66 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 367af9cf6d..bc603461a2 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 ccc982801d..12ab0fc256 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 0000000000..e897ff257c
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 0000000000..798328a1ee
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 0000000000..5603cf126c
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 3945316c2d..6141543918 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 a9fbd03aba..21b025ea51 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 f23d6f604c..2a16b4d32a 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 9edd2a8dc3..864cb33579 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 26cab51e7d..09e967fcad 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 9a52258b99..b32a890bec 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 9a52258b99..b32a890bec 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 0000000000..0e19ed7007
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 0000000000..721551f2b1
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 3e2fb468b7..3f04497713 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 3b52fffe11..ce2b306ca6 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 ea09f4c9a6..17905e1578 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 ea09f4c9a6..17905e1578 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 eff08b3c1a..864d903a35 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 0000000000..2e547a48ff
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 253e481c1f..fae4271511 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 0000000000..fae4271511
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 0000000000..ddfe661673
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 0000000000..f460a0ee46
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 989ad11a14..b8cbb64306 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 0000000000..1645b2899b
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 0000000000..15dc6dd3d3
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 0000000000..b79939791b
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 0000000000..a7211c352c
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 0000000000..9f9b21f325
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 0000000000..01bd481c60
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 0000000000..548e6e8284
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 0000000000..6498305d06
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 0000000000..dab2ba096e
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 0000000000..dac38cae74
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 0000000000..3ad64b3710
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 0000000000..3fc2e85ac8
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 0000000000..1fad5c9269
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 0000000000..2e340a521a
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 56bee06af6..795439a0f2 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 6238e74020..e3789dc34f 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 5a6aca044b..a8f2fe50fe 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 211279451d..fd426e4ad3 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 38077b5a11..66a883da31 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 0000000000..38ccc85e78
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 d91a10d8ff..e2d6924919 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 4f17f767a0..45473446ff 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 4d1cf9b4ee..0baf654082 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 7503e8aa13..4cb7f03b3c 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 98a374dcf0..2fe23e57ce 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 7294a38c1f..e672a711f1 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 0000000000..635aa1f775
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 0000000000..d6c303152c
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 0000000000..645ad295a8
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 0000000000..cbb240d2c6
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 0000000000..0e727c865a
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 0000000000..e672a711f1
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 0000000000..635aa1f775
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 0000000000..d6c303152c
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 0000000000..645ad295a8
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 0000000000..cbb240d2c6
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 0000000000..0e727c865a
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 bbd7b970be..509a8cdabe 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 0000000000..e20ab75260
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 0000000000..766cfec327
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 0000000000..a2a6fe42cf
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 0000000000..855ebfa8c7
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 0000000000..80df101bfd
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 0000000000..509a8cdabe
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 0000000000..e20ab75260
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 0000000000..766cfec327
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 0000000000..a2a6fe42cf
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 0000000000..855ebfa8c7
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 0000000000..80df101bfd
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 0000000000..5f70f0657f
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 0000000000..10c82332c2
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 0000000000..e99c4be9af
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 0000000000..b06773ed46
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 0000000000..dadb3e3416
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 0000000000..a2b5f60343
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 0000000000..dad0f8ce65
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 993deafc94..308cad43ea 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 b70b1b3b52..a3d48ca221 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 13f08e539b..9e3a4f3afe 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 ab1ca0dcbf..874a3480e8 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 528df36074..d405c22176 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 4888de00f2..1b2f9c7e59 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 bf07ccfa7a..db68e49011 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 35caa37fd9..90bca6de08 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 0000000000..5c034714b0
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 0000000000..9a2825e24e
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 0000000000..bfbb943f5b
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 0000000000..f4233b8168
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 0000000000..d403d79c6f
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 de072bca62..a7fce0c581 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 ce4e23c8c7..7876a1b95c 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 e28d093387..a11c57148d 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 0a775f4918..eafecdf573 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 5673a0b3fa..358209cb64 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 18b1e0b15a..b56cd1743b 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 ced0d21c40..16b0783cec 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 e9b39cda21..750e7e0c4a 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 eb58823175..47689fc292 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 0000000000..56ac45601a
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 0000000000..e4f89233ed
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 0000000000..a0a5133cf4
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 0000000000..a38a3c841a
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 0000000000..f5b5614463
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 0000000000..47689fc292
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 0000000000..56ac45601a
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 0000000000..e4f89233ed
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 0000000000..a0a5133cf4
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 0000000000..a38a3c841a
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 0000000000..f5b5614463
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 0000000000..52b046d7d8
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 0000000000..dad0f8ce65
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 2a83fedd0c..114853b626 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 433108acf7..0b96c8556b 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 eacaf590e6..71da4ccd16 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 17ab798b1c..96ac605b62 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 fcb38f9482..5c357f7c11 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 cb1d0f740a..6723e92a5f 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 0000000000..7876a1b95c
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 5486e25da8..dfa80abfe7 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 db9c6af5b3..7248eaba8a 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 f9dda7899d..79debc6d73 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 9768059a10..9067cd7ef9 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 1a0bd02100..cfdbe99458 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 3b2f5b6f41..5707878560 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 9daf142f81..7e68a0c8ba 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 43f9899698..e3a78dca90 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 1ef8a37147..4fc26cb31b 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 43f9899698..e3a78dca90 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 1ef8a37147..4fc26cb31b 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 6a432e0db9..ca30e8990b 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 6a432e0db9..ca30e8990b 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 0000000000..58be454893
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 dc17bd1974..b7184aa468 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 25ee602d2c..ba76dbc1bf 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 0000000000..b7184aa468
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 86122bb31e..dc515b3065 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 7d99dd23c1..4a06288ae6 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 dbd16da58b..f6bfb3f47c 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 d7770ff964..058ac922a7 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 0000000000..99a6a7c428
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 0000000000..35beb7b046
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 0000000000..2b783f6a8c
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 0000000000..734c78d646
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 0000000000..c0a3986e5f
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 0000000000..8f158f2450
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 0000000000..001ca83b26
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 0000000000..5f41ea5f82
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 0000000000..5b5e3fcd50
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 0000000000..cefcb97332
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 0000000000..93ae8562d5
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 0000000000..5505538a5c
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 0000000000..aae23cda09
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 0000000000..c109ee20f3
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 0000000000..5bc3c00083
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 0000000000..f431f72787
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 0000000000..4416880093
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 0000000000..fda8a2d50b
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 0000000000..df68948dc8
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 0000000000..67712e5005
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 0000000000..6a56eb6539
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 0000000000..ae2760e26b
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 0000000000..92171ba208
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 0000000000..293d1bf583
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 0000000000..c05237df59
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 0000000000..63cdde05b8
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 0000000000..e5546526e7
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 0000000000..07a5ca711b
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 0000000000..b08c20bb85
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 0000000000..545a28a2ab
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 0000000000..b4c1b9189f
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 0000000000..34678c776b
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 0000000000..a951cc15b7
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 0000000000..54e377054f
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 0000000000..5a432ab436
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 0000000000..ea445420a5
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 0000000000..a529dbdf45
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 0000000000..99fa60a936
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 0000000000..f189a16315
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 0000000000..1dcc159847
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 0000000000..fd6e058e78
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 0000000000..d894f4a079
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 0000000000..2097b976bb
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 0000000000..f442f76cb9
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 0000000000..0062e66b21
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 0000000000..443fd921de
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 0000000000..09c1847f81
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 0000000000..fcd02ecb2d
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 0000000000..bd4c141f49
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 0000000000..72fe9dd61d
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 0000000000..68e5aba4ce
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 0000000000..b98ba5dc9a
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 0000000000..e936ad67be
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 0000000000..455bd7b24b
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 0000000000..b668529d5d
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 0000000000..09b136615b
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 0000000000..fc8edda1fd
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 0000000000..a007e1d6c3
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 0000000000..bda7018049
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 0000000000..ae2d4f1060
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 0000000000..198e959987
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 0000000000..65193777b8
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 0000000000..27d70a9580
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 0000000000..107b1df76a
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 0000000000..10aae699ca
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 0000000000..189098d616
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 0000000000..e999b0923c
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 0000000000..6ff879f5e4
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 0000000000..2827bd824e
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 0000000000..60e76455f9
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 0000000000..caa0d3c91d
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 0000000000..7eeb2ef6bc
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 0000000000..e1ef75546d
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 0000000000..c39f8a474f
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 0000000000..bac5d42b8d
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 0000000000..4fc2caffd8
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 0000000000..a5351ed74c
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 0000000000..ee71c20cec
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 0000000000..0ca85ae238
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 0000000000..db57388467
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 0000000000..1991920980
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 0000000000..df9bce7b2f
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 0000000000..935bcfebc2
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 0000000000..20cc870716
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 0000000000..378e61efe1
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 0000000000..e2484c4785
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 0000000000..f59c81321f
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 0000000000..7a3b523ab9
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 0000000000..d0e729e477
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 0000000000..00c6237016
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 0000000000..2396626d8e
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 0000000000..b49ba0f3bb
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 0000000000..70db301bf5
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 0000000000..bc5b60a12a
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 0000000000..5e7574d860
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 0000000000..fe24b5346d
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 0000000000..3f3798dd66
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 0000000000..e3db492fa5
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 0000000000..9a80e701a6
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 0000000000..8c706e9fde
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 0000000000..e4f4e19089
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 0000000000..7d873ea4c4
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 0000000000..c439bdb25f
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 0000000000..724f5e11bf
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 0000000000..b11657a04a
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 0000000000..6233cf55f3
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 0000000000..c5010fee97
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 0000000000..9a455a5457
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 0000000000..0b85abb35a
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 0000000000..e8bfa2f22d
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 0000000000..f74a732db0
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 0000000000..00a173acd5
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 0000000000..4a03c01d43
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 0000000000..2b3f46e2ea
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 0000000000..dff5bef3ed
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 0000000000..d71d68d952
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 0000000000..7b411c99d0
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 0000000000..46cac26e5b
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 0000000000..b4459b9db4
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 0000000000..c6f2c7c8e6
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 0000000000..01db6368f6
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 0000000000..9a6770954f
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 0000000000..61ab96dcbe
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 0000000000..8f227c084f
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 0000000000..398e1cf36f
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 0000000000..243e1125d9
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 0000000000..f7ebad6af9
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 0000000000..b64d09473c
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 0000000000..5e214716fd
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 0000000000..c3934da485
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 0000000000..14333f1df3
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 0000000000..68344dd63f
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 0000000000..516715d48f
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 0000000000..707fbcd953
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 0000000000..5551b445ab
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 0000000000..d6d2929d8d
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 0000000000..f039e596c0
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 0000000000..8768a6131f
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 0000000000..f4d75cbb46
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 0000000000..c6e1efa92c
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 0000000000..eb6826e4f1
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 0000000000..a3f1e85d5b
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 0000000000..99d1f26240
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 0000000000..45e6b5af7a
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 0000000000..083ddb6b4c
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 0000000000..dc7c168a02
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 0000000000..b17ff8bbc5
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 0000000000..ff54228865
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 0000000000..5739b78d28
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 23f3f022ba..5585c0d59c 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 bb6e9b9a58..0785e65492 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 0000000000..757fa6cf86
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 9c8b38392b..cb8ddb829b 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 fc4cfafe8a..dccb5d0512 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 6a30663f23..d45ecb4af4 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 7783233e9f..0cc3774779 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 ffd85982ea..7babf38ac6 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 608570fd5b..02c6ba744f 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 0000000000..247f8dafc4
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 0000000000..be2d6888fd
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 0000000000..e1158445cf
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 0000000000..c7aa68796d
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 0000000000..beecc36dd1
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 b950ece572..56233b4e59 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 86d15a015b..5849f2d9b4 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 0000000000..494e2072df
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 b76abb89c6..a6c8a80c7e 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 143c24116e..629675cfe9 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 9ca8fab013..c454d73b4c 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 0000000000..4ca566d8d4
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 5fbb7ca003..a457b5fc1c 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 0000000000..c98ffa79f0
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 ce02394db0..28b4250540 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 0000000000..6d337f40e2
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 6a9ed782fa..1fb69244fe 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 6a9ed782fa..1fb69244fe 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 0000000000..6d15204660
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 1e6a2b5a16..35f09724ee 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 0000000000..bf0f4e543a
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 0000000000..19b31d1ceb
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 0000000000..9d4dffd10f
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 0000000000..92ab6353c1
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 0000000000..888e5578ec
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 0000000000..f4912e85b2
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 0000000000..8203a027e1
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 0000000000..d4c3fa91cc
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 0000000000..db75861b6c
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 0000000000..758c711673
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 0000000000..ed22fa2815
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 0000000000..030635f69c
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 0000000000..de69e2b80c
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 0000000000..064bcf4105
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 0000000000..a2a9b15223
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 0000000000..bc5fb2720a
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 0000000000..b8669f9f67
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 0000000000..97afde3fcf
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 0000000000..5e887d2b01
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 0000000000..fe85e51fd3
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 0000000000..8136d794aa
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 0000000000..f28edf29c6
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 0000000000..32b0ff0383
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 0000000000..959ba48a2d
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 0000000000..53a5eb2ccb
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 0000000000..8f30fc9e38
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 0000000000..36a4e57d1f
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 0000000000..77c57605e9
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 0000000000..58bcd6a2fc
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 0000000000..3bc6b5a57a
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 0000000000..8ebcc10e09
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 0000000000..677bcce11e
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 0000000000..46a71b71b7
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 0000000000..8e3428aefe
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 0000000000..d678259414
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 0000000000..4bd5d32edc
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 0000000000..c25bdc21e2
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 0000000000..f3824527d6
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 0000000000..c4908e823f
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 0000000000..5f3b4ccbc4
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 0000000000..44dea7746b
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 0000000000..372f90bd82
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 0000000000..172c3db9f3
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 0000000000..f2fdee48e1
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 0000000000..2691b9b9d9
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 0000000000..d667de555f
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 0000000000..5547cb9dc1
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 0000000000..8104a636e2
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 0000000000..012d6f7116
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 0000000000..48a9289fc7
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 0000000000..c200b1cff3
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 0000000000..6859897401
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 0000000000..694dd1c9dd
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 0000000000..fafb67c5f5
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 0000000000..285492d7b7
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 0000000000..6799eeb92b
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 0000000000..92e2ce9c34
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 0000000000..a5ee30341a
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 0000000000..249f6a06d2
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 0000000000..68ba00aa1f
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 0000000000..098d8f5069
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 0000000000..c04e2e4d27
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 0000000000..5b035b15a9
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 0000000000..b4c86aeb1b
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 0000000000..dceea7eab1
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 0000000000..cf669ffaca
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 0000000000..06ee1dc3a0
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 0000000000..1a2ac7a35b
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 0000000000..f583ff4bcf
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 0000000000..0da8e08c4d
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 0000000000..4d7dd03983
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 0000000000..8f324377ed
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 0000000000..0f528cca2a
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 0000000000..440d4525a6
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 0000000000..b3f6fc59e0
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 0000000000..22606f8e02
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 0000000000..08926f3448
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 0000000000..16105a839b
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 0000000000..5afb3fbfd0
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 0000000000..b0648934b7
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 0000000000..263856473e
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 0000000000..f4543a4b42
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 0000000000..769849038a
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 0000000000..f36b293e1a
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 0000000000..63ad11cdb7
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 0000000000..f00a16a1ed
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 0000000000..9d94d6ecd6
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 0000000000..a20d7ee61d
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 0000000000..75e4ae2ce8
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 0000000000..ff204d376e
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 0000000000..68fb59dc19
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 0000000000..8139c5ee75
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 0000000000..0d1da99b50
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 0000000000..bc41c667b2
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 0000000000..70d16f32fb
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 0000000000..313f37fdb5
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 0000000000..095871f6cc
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 0000000000..f535028c7a
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 0000000000..f535028c7a
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 0000000000..242d9f6872
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 0000000000..18b3535bf7
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 0000000000..9634051d47
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 0000000000..647a6ec2fd
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 0000000000..a56c1d32ba
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 0000000000..1d1da3a15e
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 0000000000..7f0efa4214
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 0000000000..a3b3834ce6
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 0000000000..3110d6e82a
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 0000000000..66b1d5f0e9
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 0000000000..a31e5c047f
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 0000000000..fb200df019
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 0000000000..d2b0b9421c
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 0000000000..54d0a9f870
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 0000000000..49f0ac2a1b
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 0000000000..10e93a3fde
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 0000000000..9c34ab0e56
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 0000000000..29e58535fe
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 0000000000..4662c07490
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 0000000000..76061ed709
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 0000000000..60c8f92f04
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 0000000000..1c87c774e0
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 0000000000..5fa43f378a
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 0000000000..f0c1cdf23a
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 0000000000..e38572e931
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 0000000000..e38572e931
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 0000000000..624556e4b7
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 0000000000..c16dbf58b1
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 0000000000..0956b72a74
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 0000000000..fbf009bdad
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 0000000000..0c22f4fe82
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 0000000000..a64db40836
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 0000000000..e12b95e0c7
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 0000000000..27742f0743
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 0000000000..4e4a9ef79f
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 0000000000..a00806ab5a
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 0000000000..9e4997efc1
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 0000000000..13cb1dcc7d
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 0000000000..8ea76c0c0a
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 0000000000..399e26300a
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 0000000000..8695943db8
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 0000000000..2c62ab9c18
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 0000000000..fca559c590
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 0000000000..13cb1dcc7d
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 0000000000..8ea76c0c0a
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 0000000000..399e26300a
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 0000000000..8695943db8
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 0000000000..2c62ab9c18
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 0000000000..fca559c590
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 0000000000..523d55de34
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 0000000000..a141a117e3
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 0000000000..7710113f84
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 0000000000..b35167d54f
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 0000000000..de2af7ccdb
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 0000000000..0490babb12
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 0000000000..66a455dcaf
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 0000000000..b2903625da
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 0000000000..9b73db28aa
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 0000000000..d808953c8b
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 0000000000..df2c0101be
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 0000000000..df2c0101be
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 0000000000..df2c0101be
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 0000000000..932e720ba3
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 0000000000..ed22a6cb38
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 0000000000..4a2fdeb304
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 0000000000..b1f6e168d7
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 0000000000..f75b75a74e
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 0000000000..a9665b318a
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 0000000000..a42b3caf88
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 0000000000..9f53173a0e
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 0000000000..168af47a54
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 0000000000..b19ebbf90c
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 0000000000..07919b0e35
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 0000000000..3dc6cdb7de
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 0000000000..09306fda00
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 0000000000..36a47c0e5a
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 0000000000..cbf49cbc6c
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 0000000000..f28f55049f
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 0000000000..e02bd2477f
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 0000000000..582fb0f6a5
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 0000000000..582fb0f6a5
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 0000000000..0a4ebd85b0
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 0000000000..2180fc5000
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 0000000000..09b8382ef5
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 0000000000..69c1f9661c
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 0000000000..5ef1171030
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 0000000000..ae55cccd8d
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 0000000000..263390f8e1
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 0000000000..3a86f238ca
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 0000000000..8b121c48f1
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 0000000000..e874818ab0
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 0000000000..6c9ac02949
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 0000000000..5ef1171030
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 0000000000..ae55cccd8d
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 0000000000..263390f8e1
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 0000000000..3a86f238ca
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 0000000000..8b121c48f1
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 0000000000..e874818ab0
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 0000000000..ca36939121
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 0000000000..7eb6d9e85c
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 0000000000..8f113050a1
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 0000000000..10c70a6479
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 0000000000..eb607e99cf
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 0000000000..48b029a213
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 0000000000..1c8b7f5440
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 0000000000..5cc92e307e
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 0000000000..98ecbc5dfc
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 0000000000..98ecbc5dfc
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 0000000000..85626b6c35
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 0000000000..392518cf33
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 0000000000..9cb8a2949c
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 0000000000..de072bca62
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 0000000000..2d1a5aaf0b
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 0000000000..db372fcab0
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 0000000000..b74a8c0b7f
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 0000000000..4edf9c41fe
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 0000000000..bc3ecd4b2a
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 0000000000..1a50fa2b5a
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 0000000000..95b7ff704f
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 0000000000..20f794590a
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 0000000000..a06b4e01e7
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 0000000000..e9a04252c6
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 0000000000..75674c347e
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 0000000000..d1d0f87305
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 0000000000..a6264c605d
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 0000000000..508746275e
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 0000000000..daff12d645
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 0000000000..ef2cb40523
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 0000000000..8e8f3040b1
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 0000000000..14f1ff4076
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 0000000000..e8508f898b
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 0000000000..eb44419c1c
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 0000000000..cd26432942
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 0000000000..d8b6b284e7
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 0000000000..f369872280
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 0000000000..abdf8f80fd
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 0000000000..f944677076
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 0000000000..f01b27b4ab
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 0000000000..ced8c03a5e
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 0000000000..16e1f419e2
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 0000000000..924eff4bae
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 0000000000..632540aae6
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 0000000000..ac277b2a55
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 0000000000..44814dfcfe
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 0000000000..cd1d7ab780
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 0000000000..1478bfad9f
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 0000000000..76edc4c348
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 0000000000..eb0347064e
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 0000000000..194fe5525f
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 0000000000..eeb57d0392
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 0000000000..5cf41ff03b
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 0000000000..64ba6b601c
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 0000000000..4e8756eef8
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 0000000000..bd18e0ae6c
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 0000000000..4951531f68
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 0000000000..67e98e3383
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 0000000000..3fa52bbbf9
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 0000000000..c778641159
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 0000000000..006348a3fb
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 0000000000..dceea7eab1
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 0000000000..bd18e0ae6c
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 0000000000..4951531f68
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 0000000000..67e98e3383
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 0000000000..3fa52bbbf9
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 0000000000..c778641159
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 0000000000..006348a3fb
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 0000000000..0b0fb877d6
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 0000000000..67efc8cbab
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 0000000000..9095959ac3
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 0000000000..91ec882a9a
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 0000000000..551303cdef
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 0000000000..e25777f315
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 0000000000..b0d88a73b9
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 0000000000..e39f72ddb6
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 0000000000..e5e3cd3a25
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 0000000000..9a0810d5f8
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 0000000000..86532b18fd
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 0000000000..7267de4f13
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 0000000000..ce68cd3760
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 0000000000..d0e292f77e
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 0000000000..fab4a148cf
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 0000000000..c8e889faec
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 0000000000..c7f3188b9c
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 0000000000..db9365adb1
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 0000000000..815538138b
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 0000000000..fb591aa4fb
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 0000000000..5adcffa4b9
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 0000000000..d166f981b2
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 0000000000..7c8cb50a78
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 0000000000..e113d8cb42
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 0000000000..95ac30e145
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 0000000000..f05d47c961
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 0000000000..8bf8fc24a7
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 0000000000..61ad194afa
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 0000000000..12b8680149
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 0000000000..d65223372c
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 0000000000..c2db12fa26
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 0000000000..b384dc9d6c
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 0000000000..2a4d9018b6
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 0000000000..23a24303ee
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 0000000000..5e03a6d23b
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 0000000000..df439f8044
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 0000000000..3dbb68c8a6
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 0000000000..96ef9230ab
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 0000000000..78e30b4b27
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 0000000000..1ff72c2b96
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 0000000000..8f710ce941
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 0000000000..9e70b3b2c3
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 0000000000..b257266ae0
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 0000000000..508a3c354a
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 0000000000..cde9352f14
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 0000000000..dd8c61c768
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 0000000000..599eca6f1c
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 0000000000..aafbbc2d80
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 0000000000..bf9c299cc2
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 0000000000..bc99228398
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 0000000000..677dcb13c5
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 0000000000..2a50be06d0
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 0000000000..5d0ca1b590
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 0000000000..1cdb352992
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 0000000000..fe5a439769
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 0000000000..4f13ffb5f7
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 0000000000..a4326ddd85
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 0000000000..9925d0e233
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 0000000000..5b44f23258
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 0000000000..1a906a3cd9
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 0000000000..1a72aaff3e
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 0000000000..c2543bc7e3
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 0000000000..69d80b6b27
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 0000000000..8c6a46d5fa
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 0000000000..715d722cd2
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 0000000000..8483a62d9e
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 0000000000..9e898cde12
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 0000000000..9e898cde12
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 0000000000..82c46e6de5
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 0000000000..20cf5bd601
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 0000000000..06f13065ab
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 0000000000..131e462d57
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 0000000000..2136036126
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 0000000000..7978fcccee
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 0000000000..d235a92b7c
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 0000000000..2e5976e9d2
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 0000000000..c3fa97e846
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 0000000000..b6ad8744f0
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 0000000000..62c8b9fe59
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 0000000000..b99a7d1b74
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 0000000000..9634051d47
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 0000000000..85c914bb1c
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 0000000000..85c914bb1c
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 0000000000..d98708218f
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 0000000000..62dea0dd66
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 0000000000..e8c6bd0d27
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 0000000000..1a1da27136
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 0000000000..6f56335609
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 0000000000..78d6f9206b
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 0000000000..5a5ceb0e67
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 0000000000..f08d5998ce
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 0000000000..a5334c3acd
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 0000000000..d03ac0decf
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 0000000000..e8c6bd0d27
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 0000000000..4afaff7dad
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 0000000000..30c3e88881
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 0000000000..5cf41ff03b
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 0000000000..d66c094b48
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 0000000000..377075e9c6
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 0000000000..282ef90344
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 0000000000..c9b232ed02
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 0000000000..e66ad08ba8
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 0000000000..e66ad08ba8
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 0000000000..e1931e295c
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 0000000000..4a142df68d
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 0000000000..4a6266aa0e
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 0000000000..53c11c8cbc
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 0000000000..33e50494a3
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 0000000000..7a0e4f1cb7
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 0000000000..81a69110e9
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 0000000000..b5c64c9cc8
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 0000000000..0763a8bd94
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 0000000000..3ed705b902
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 0000000000..f83ecee8e2
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 0000000000..80def7867c
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 0000000000..56529ca046
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 0000000000..8ebd8fe93f
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 0000000000..5706420297
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 0000000000..bb0074547d
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 0000000000..4ddc26af5a
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 0000000000..855bf9c3c7
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 0000000000..912c36a6e0
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 0000000000..fc0995ea1e
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 0000000000..11677c9411
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 0000000000..606d49c2dd
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 0000000000..11677c9411
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 0000000000..218ea8e5fa
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 0000000000..20e0d1d096
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 0000000000..99709b6d7c
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 0000000000..1def8c44ef
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 0000000000..8c7d0704fb
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 0000000000..7d35e2d83e
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 0000000000..5a382e8c5d
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 0000000000..2dfaf78c09
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 0000000000..1d6a3f35a5
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 0000000000..b8f9f807f9
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 0000000000..7c8c45438e
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 0000000000..aab477f069
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 0000000000..c9af21fc98
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 0000000000..359803de2b
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 0000000000..5f0b1d88a5
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 0000000000..2942520aa6
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 0000000000..b4bad6b1de
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 0000000000..bc422c6be8
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 0000000000..4c4c06b94a
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 0000000000..d7733bc61a
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 0000000000..a1c71c939f
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 0000000000..8c6496020a
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 0000000000..20d6e843a2
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 0000000000..c04c030796
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 0000000000..190e784252
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 0000000000..5e878c3c29
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 0000000000..b4df6cfde9
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 0000000000..33e2cf8942
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 0000000000..70cfdce468
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 0000000000..f7f5a6e192
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 0000000000..a71efd9da3
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 0000000000..95149d0005
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 0000000000..54bc95e8b8
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 0000000000..2244745911
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 0000000000..72da307e37
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 0000000000..c36b0798b8
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 0000000000..1aba4a8937
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 0000000000..1e7acda191
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 0000000000..b28245ac4b
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 0000000000..6fc692ab10
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 0000000000..6b2cdf59e5
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 0000000000..d11cf974a5
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 0000000000..189e4a6a97
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 0000000000..1b32b3716f
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 0000000000..02d9e2ddb0
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 0000000000..fb8684e1ce
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 0000000000..189e4a6a97
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 0000000000..ea9bc1ea2e
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 0000000000..1b32b3716f
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 0000000000..02d9e2ddb0
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 0000000000..fb8684e1ce
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 0000000000..95acf0afec
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 0000000000..2efcb695b8
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 0000000000..8a4320b72f
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 0000000000..c409f9f4c4
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 0000000000..0174cbf98b
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 0000000000..e76b533149
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 0000000000..73bea3ca4e
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 0000000000..ccf5a36de5
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 0000000000..ac77ae0713
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 0000000000..956924946b
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 0000000000..df48498543
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 0000000000..34c92afd66
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 0000000000..3fbeec835a
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 0000000000..99709b6d7c
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 0000000000..fbd02827cc
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 0000000000..220ef6486c
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 0000000000..c6afa366ac
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 0000000000..1b55bad171
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 0000000000..4d382d6197
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 0000000000..218083f194
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 0000000000..efd94373bc
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 0000000000..9e5ab9c4fb
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 0000000000..3b53d87438
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 0000000000..78e30b4b27
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 0000000000..4888f08a47
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 0000000000..9e3c1b1f28
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 0000000000..4fd2695e68
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 0000000000..9daac80392
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 0000000000..37dc2e402d
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 0000000000..bd99ffe1eb
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 0000000000..4888f08a47
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 0000000000..9e3c1b1f28
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 0000000000..4fd2695e68
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 0000000000..9daac80392
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 0000000000..37dc2e402d
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 0000000000..bd99ffe1eb
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 0000000000..de0494bfbe
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 0000000000..7da6df63c4
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 0000000000..fc7a1fad47
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 0000000000..0931cb04cf
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 0000000000..5f18c011f0
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 0000000000..031a008450
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 0000000000..8b5f917664
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 0000000000..20a2659bed
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 0000000000..44710837e3
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 0000000000..d7699382b0
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 0000000000..edb2e1a4fb
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 0000000000..5705d19c15
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 0000000000..bf89834ff3
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 0000000000..0deed50038
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 0000000000..86314c1925
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 0000000000..0cc03cf5a6
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 0000000000..1f65e85007
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 0000000000..68d8f2a6b6
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 0000000000..cb4010c530
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 0000000000..56a1fa8da6
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 0000000000..a78399a14c
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 0000000000..c74cf74d74
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 0000000000..c74cf74d74
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 0000000000..7708bf8430
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 0000000000..731e413a63
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 0000000000..ca94117982
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 0000000000..731e413a63
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 0000000000..d8fb5100d6
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 0000000000..f4c6a502da
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 0000000000..b0c3a0b62e
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 0000000000..f4c6a502da
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 0000000000..c5b25dd643
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 0000000000..cdf1321786
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 0000000000..996889ffdd
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 0000000000..42b4563b99
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 0000000000..57e06b8faa
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 0000000000..0ef86da10f
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 0000000000..0aaa1cf765
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 0000000000..8c694147d8
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 0000000000..780a07cbc7
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 0000000000..a6bbc03a90
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 0000000000..a6bbc03a90
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 0000000000..a6bbc03a90
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 0000000000..81fad64f07
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 0000000000..94e0504c43
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 0000000000..1f7765a7ab
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 0000000000..52d188499f
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 0000000000..24aab31018
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 0000000000..cd0bf3a8e1
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 0000000000..6eb7dfacac
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 0000000000..61f0ea0a6f
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 0000000000..e96eb24381
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 0000000000..20d97e0c88
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 0000000000..f1ad338c67
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 0000000000..97f8e0d9a8
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 0000000000..bb53ee1467
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 0000000000..b0ce2c2f50
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 0000000000..995b047660
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 0000000000..453949b170
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 0000000000..f8abc41b2e
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 0000000000..7735d78d63
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 0000000000..72424829b5
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 0000000000..4b2f313f9b
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 0000000000..0088a51e62
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 0000000000..d5b9ffd9f4
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 0000000000..09027a2fb2
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 0000000000..bb05a9bbb5
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 0000000000..d5e954da51
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 0000000000..85563c8a93
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 0000000000..1117f9bc89
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 0000000000..8010e73604
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 0000000000..b66d427e09
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 0000000000..9707a7d362
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 0000000000..0d653ae489
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 0000000000..120fcd9e8b
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 0000000000..2500c5cd4d
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 0000000000..2500c5cd4d
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 0000000000..af065d1d4c
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 0000000000..1b5916009e
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 0000000000..39cce01206
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 0000000000..4bd67d31e9
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 0000000000..c42407c505
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 0000000000..91f563a50c
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 0000000000..a7c9a1072c
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 0000000000..44e128f560
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 0000000000..a7c9a1072c
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 0000000000..e5747de1c7
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 0000000000..3ad3db6dc4
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 0000000000..6e706955b1
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 0000000000..55f2eba468
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 0000000000..0131586e5e
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 0000000000..fac1af4f15
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 0000000000..87b85c98e6
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 0000000000..e715d44586
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 0000000000..21df1b2309
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 0000000000..4b95e08e82
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 0000000000..b1d5a7d814
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 0000000000..b1d5a7d814
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 0000000000..4d08770a45
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 0000000000..33b1d3883c
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 0000000000..89b4ce5664
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 0000000000..89b4ce5664
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 0000000000..8343922954
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 0000000000..5e706802de
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 0000000000..e8c6bd0d27
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 0000000000..ec08ac2e39
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 0000000000..e492b2339d
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 0000000000..62dea0dd66
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 0000000000..8e869e9cef
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 0000000000..ccf14a1e77
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 0000000000..de7384e8a1
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 0000000000..301e488966
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 0000000000..4245e1dca6
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 0000000000..7db40e2f52
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 0000000000..f97db47128
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 0000000000..a06aadbfbd
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 0000000000..dc7a84f5b7
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 0000000000..99321218f9
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 0000000000..2312ec96ec
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 0000000000..e7f6f891eb
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 0000000000..1be5733ff4
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 0000000000..e7ce32abfb
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 0000000000..0800e98fc4
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 0000000000..0800e98fc4
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 0000000000..34538757f4
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 0000000000..df3d493b02
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 0000000000..7417f2a529
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 0000000000..22c3919b6e
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 0000000000..71fb591150
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 0000000000..c4802b9579
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 0000000000..6f26fb982a
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 0000000000..c1d7d01af0
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 0000000000..489a779bf6
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 0000000000..26a93b845f
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 0000000000..da007e47b8
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 0000000000..c7e34409fe
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 0000000000..3e3b72f7c5
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 0000000000..73d5e185ac
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 0000000000..ed650a1835
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 0000000000..c36a528289
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 0000000000..b7842a0f99
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 0000000000..692ee926ae
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 0000000000..57f2375a4d
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 0000000000..0bc15d9d9e
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 0000000000..438db709e9
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 0000000000..906d0ebd44
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 0000000000..48fb4c3442
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 0000000000..a3bebbb91d
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 0000000000..b874c4df3b
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 0000000000..5aa3ee75d7
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 0000000000..c60157ca25
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 0000000000..bec12ec208
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 0000000000..85fdfd575b
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 0000000000..44e4aad986
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 0000000000..4ded671907
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 0000000000..e4dd62f7b9
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 0000000000..f8b6dd873e
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 0000000000..15984024f2
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 0000000000..4689243a17
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 0000000000..861cbf808c
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 0000000000..5074876010
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 0000000000..505c908b18
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 0000000000..da007e47b8
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 0000000000..3f510fab9b
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 0000000000..da007e47b8
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 0000000000..4edfec0273
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 0000000000..5f2c59b90d
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 0000000000..af862b3fa4
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 0000000000..b6b5639ad0
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 0000000000..8ac46b42bc
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 0000000000..c1ba28d2e1
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 0000000000..baf875766c
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 0000000000..ba5430c974
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 0000000000..d3e76515dd
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 0000000000..8572abd27a
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 0000000000..0487eca651
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 0000000000..2c8d249fd4
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 0000000000..85532dadc7
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 0000000000..b3e2fa154d
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 0000000000..2cf73b566e
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 0000000000..a42b7f7a81
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 0000000000..5646259013
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 0000000000..cd7c3d1f2b
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 0000000000..aed8f62e0b
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 0000000000..d892078bb2
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 0000000000..c6fbb4481d
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 0000000000..887f70e365
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 0000000000..10153f06a4
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 0000000000..84bb9ec9c5
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 0000000000..3a7ba22f8e
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 0000000000..f1d2470999
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 0000000000..588d13d528
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 0000000000..70384907f3
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 0000000000..04cb1c9ca4
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 0000000000..ddd6f184d2
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 0000000000..0a1a2b7c87
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 0000000000..dea1ecb59c
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 0000000000..429938294b
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 0000000000..91e1de4e5d
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 0000000000..42821806e9
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 0000000000..9e8d3adb89
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 0000000000..88d190e392
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 0000000000..e6ab8ade74
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 0000000000..e8c6bd0d27
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 0000000000..be64a40686
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 0000000000..72f8f605a2
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 0000000000..3b03077b43
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 0000000000..b8c72220ce
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 0000000000..7f8497c61a
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 0000000000..4c4dc334ce
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 0000000000..af1048c4b9
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 0000000000..c51367732c
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 0000000000..caf6cf70d3
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 0000000000..d52960b09d
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 0000000000..6325e4bc14
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 0000000000..bfe7c49713
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 0000000000..2022872577
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 0000000000..0157653ec0
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 0000000000..0157653ec0
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 0000000000..a61f473a95
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 0000000000..72f8f605a2
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 0000000000..4fb883a076
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 0000000000..4fb883a076
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 0000000000..c51367732c
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 0000000000..caf6cf70d3
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 0000000000..d52960b09d
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 0000000000..6325e4bc14
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 0000000000..bfe7c49713
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 0000000000..22780e6f35
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 0000000000..09a7c91eb8
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 0000000000..f038a50830
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 0000000000..146b5e187d
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 0000000000..2a46193628
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 0000000000..e23e4f890b
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 0000000000..8954240ad2
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 0000000000..120e1a1f73
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 0000000000..bc585a3561
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 0000000000..4c40bb8c6a
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 0000000000..e23e4f890b
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 0000000000..8954240ad2
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 0000000000..120e1a1f73
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 0000000000..bc585a3561
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 0000000000..4c40bb8c6a
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 0000000000..bf01e7cfe5
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 0000000000..3e7a98a8bf
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 0000000000..ece233348b
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 0000000000..47ad29bc3d
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 0000000000..aec34d338e
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 0000000000..d8fb5100d6
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 0000000000..c5b25dd643
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 0000000000..4289e723ce
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 0000000000..642c816e96
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 0000000000..0c420440c8
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 0000000000..117e8174bf
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 0000000000..dc60227217
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 0000000000..613fc5b840
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 0000000000..5fac9ae16a
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 0000000000..38d1a529ab
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 0000000000..b626d6088c
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 0000000000..38d1a529ab
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 0000000000..9a8fe59573
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 0000000000..c593b37d09
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 0000000000..4cf96e8199
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 0000000000..85fc93af7e
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 0000000000..468d7c1922
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 0000000000..54da77edb4
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 0000000000..ae44b8ba20
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 0000000000..271f4894c6
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 0000000000..3a6f85cb2a
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 0000000000..57d88a62c7
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 0000000000..b43096078b
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 0000000000..ce7595b35d
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 0000000000..e20fe0cbbb
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 0000000000..b000bc64e1
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 0000000000..0873e9a499
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 0000000000..5e02b48065
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 0000000000..5495e986db
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 0000000000..d9ed67da9e
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 0000000000..0961721473
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 0000000000..05901ac238
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 0000000000..2354708eb9
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 0000000000..e26d1cc7f8
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 0000000000..c56b36f4a4
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 0000000000..a0884e6f4d
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 0000000000..9d4dbc02c7
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 0000000000..c20b5ece70
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 0000000000..f524169f36
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 0000000000..08c5c0dcda
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 0000000000..de072bca62
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 0000000000..8a4320b72f
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 0000000000..fac1af4f15
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 0000000000..b6b5639ad0
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 0000000000..359803de2b
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 0000000000..ee88c3f750
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 0000000000..af28278edf
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 0000000000..7af1ab49ca
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 0000000000..33cac8bdf8
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 0000000000..c10fad17da
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 0000000000..8ba4d5d538
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 0000000000..ce4e23c8c7
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 0000000000..c1c384d49e
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 0000000000..c593b37d09
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 0000000000..04a48b04d3
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 0000000000..cb6333c5d4
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 0000000000..cb6333c5d4
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 0000000000..8e3428aefe
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 0000000000..d678259414
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 0000000000..b827828752
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 0000000000..a875efa76d
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 0000000000..a5d1a69b88
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 0000000000..7d5c862855
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 0000000000..dada100615
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 0000000000..61e526bf8d
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 0000000000..d7bbeb3490
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 0000000000..aec34d338e
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 0000000000..6870693084
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 0000000000..07989f1480
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 0000000000..07989f1480
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 0000000000..94a8cdca40
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 0000000000..dce123c027
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 0000000000..4af057ce4e
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 0000000000..6dff5fdb29
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 0000000000..a9b4209ba9
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 0000000000..056ca45513
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 0000000000..359803de2b
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 0000000000..5b57c11bc0
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 0000000000..5b57c11bc0
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 0000000000..5b57c11bc0
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 0000000000..fd7ed85f99
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 0000000000..e8c6bd0d27
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 0000000000..46baa40428
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 0000000000..e8c6bd0d27
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 0000000000..0e0d3c3005
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 0000000000..bdb350d529
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 0000000000..68359ecb1f
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 0000000000..017e47cfb7
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 0000000000..353c945e68
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 0000000000..db9c6af5b3
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 0000000000..db9c6af5b3
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 0000000000..1c1d1d3cfd
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 0000000000..cbb2741e59
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 0000000000..d4a8296712
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 0000000000..1a6da18d1b
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 0000000000..2dc1c07275
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 0000000000..38008416a2
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 0000000000..262db0d00b
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 0000000000..f42a78e451
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 0000000000..84d6e41ab4
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 0000000000..2b2ee437e4
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 0000000000..417ee806f4
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 0000000000..065846524c
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 0000000000..abeb7fe2f4
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 0000000000..957841c2b2
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 0000000000..a6e41041c1
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 0000000000..ed6a137458
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 0000000000..4cd9f7a7f0
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 0000000000..ad5a8e50e1
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 0000000000..e706e74050
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 0000000000..a010820c16
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 0000000000..cf8f51c590
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 0000000000..eff08b3c1a
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 0000000000..c5acacc978
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 0000000000..0bcc477d95
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 0000000000..744ce2cc51
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 0000000000..ee88c3f750
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 0000000000..5ce6ac16ee
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 0000000000..a57b9123e3
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 0000000000..3d848fe120
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 0000000000..f0eddcc91a
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 0000000000..380c9228a2
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 0000000000..111523077e
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 0000000000..0008f99cbf
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 0000000000..335cd5d3b8
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 0000000000..c9c6762ea0
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 0000000000..4df8b50642
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 0000000000..be0e85d289
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 0000000000..daad02a92d
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 0000000000..62bbba4d85
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 0000000000..1694c6e9c4
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 0000000000..8de280e6de
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 0000000000..daf833c13f
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 0000000000..a5ffe3f2d2
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 0000000000..9150bf4548
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 0000000000..1a11dd2c56
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 0000000000..a816a8e4c4
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 0000000000..524dba56c3
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 0000000000..b90c033a32
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 0000000000..47f54f7c76
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 0000000000..47f54f7c76
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 0000000000..49bf49006e
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 0000000000..4214d87ddc
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 0000000000..1261df7c00
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 0000000000..01681ab34b
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 0000000000..a861adf6ed
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 0000000000..6884082ac4
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 0000000000..49faefc74c
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 0000000000..6c3d261ff3
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 0000000000..979432e79f
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 0000000000..c7baeec924
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 0000000000..11177352a9
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 0000000000..3193363bb7
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 0000000000..c69336dcfd
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 0000000000..de8911bd19
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 0000000000..cbbab95df3
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 0000000000..a810c9f8a8
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 0000000000..fc25396535
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 0000000000..b0a37e84be
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 0000000000..edb29c6442
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 0000000000..6405328b4c
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 0000000000..224cbcf38a
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 0000000000..e8c6bd0d27
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 0000000000..181a0f5536
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 0000000000..1e3569ce93
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 0000000000..4e6f468e43
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 0000000000..abdf571e0e
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 0000000000..46d2e9cbed
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 0000000000..ab7ce6baf9
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 0000000000..9f86a41159
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 0000000000..c79fcee1c8
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 0000000000..b5b9a8507e
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 0000000000..8d5063d32b
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 0000000000..1d0fba0e56
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 0000000000..c95e75daf0
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 0000000000..73f99eb4fc
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 0000000000..19d8138252
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 0000000000..a4eb741bbe
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 0000000000..c93090301a
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 0000000000..eaaaa56b0e
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 0000000000..e165528667
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 0000000000..7f91f26f00
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 0000000000..20f4379dc8
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 0000000000..da92b36a55
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 0000000000..fcb839726e
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 0000000000..ed32e39102
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 0000000000..d93aa7fa24
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 0000000000..3a6eae2cd5
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 0000000000..48967321e6
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 0000000000..10130586f4
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 0000000000..d2ab41cc22
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 0000000000..a6da2f0db5
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 0000000000..c7b1c95ac0
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 0000000000..17f43f8600
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 0000000000..01c9410259
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 0000000000..da92b36a55
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 0000000000..fcb839726e
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 0000000000..ed32e39102
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 0000000000..d93aa7fa24
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 0000000000..3a6eae2cd5
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 0000000000..48967321e6
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 0000000000..6ce84aa49d
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 0000000000..937576c4da
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 0000000000..c192eebd54
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 0000000000..bbbd5b2990
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 0000000000..1be385628f
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 0000000000..bbbd5b2990
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 0000000000..31d4ef6ea1
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 0000000000..5e035fcfdb
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 0000000000..e3608ce31a
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 0000000000..578ed54aec
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 0000000000..89b8238797
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 0000000000..667110258c
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 0000000000..6efa544328
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 0000000000..52ded94d54
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 0000000000..2e59b69be0
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 0000000000..53a0fb1b7f
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 0000000000..b2ee62e80d
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 0000000000..6327ab1025
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 0000000000..c66b1a2138
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 0000000000..ff93dff406
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 0000000000..ee14258ffb
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 0000000000..87d7866966
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 0000000000..706a31c13b
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 0000000000..f416dc1376
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 0000000000..5b53b566f9
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 0000000000..d892078bb2
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 0000000000..8641079a6d
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 0000000000..2d68bb6770
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 0000000000..242d9f6872
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 0000000000..2324dbaabd
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 0000000000..2b8efa17f1
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 0000000000..401dfd498d
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 0000000000..fee2c7f7a9
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 0000000000..2912c9aa57
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 0000000000..8f50f8a8d2
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 0000000000..33bd134368
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 0000000000..3f0472ff64
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 0000000000..7243e553cd
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 0000000000..311230dfd5
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 0000000000..67b6826b96
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 0000000000..401dfd498d
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 0000000000..401dfd498d
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 0000000000..b6cd1991d7
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 0000000000..557185c7f0
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 0000000000..8d10c30ca1
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 0000000000..9b978b3540
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 0000000000..eb88f52eb5
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 0000000000..721340bfb0
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 0000000000..721340bfb0
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 0000000000..ebad8c7ecd
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 0000000000..ab12e06401
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 0000000000..b338f58420
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 0000000000..ee79f03d2d
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 0000000000..88cee60960
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 0000000000..ab84461bfb
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 0000000000..d2f6a9a225
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 0000000000..e1a0559988
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 0000000000..91d624f928
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 0000000000..d3255542ba
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 0000000000..168af47a54
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 0000000000..7b74d52c45
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 0000000000..bfa6fe2152
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 0000000000..b216438946
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 0000000000..683ae2af05
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 0000000000..0e58953ffe
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 0000000000..083ac34774
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 0000000000..0e58953ffe
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 0000000000..83bf093ca8
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 0000000000..f0f4f65c86
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 0000000000..ecac60ebd5
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 0000000000..1952a366bb
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 0000000000..34100cce7a
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 0000000000..b1d5a7d814
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 0000000000..e1a0559988
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 0000000000..e38cfb45eb
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 0000000000..e1a0559988
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 0000000000..6ac0f64174
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 0000000000..6ac0f64174
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 0000000000..6ac0f64174
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 0000000000..9bdb575d1e
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 0000000000..1062006e82
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 0000000000..30b30cde5c
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 0000000000..ab84461bfb
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 0000000000..9c2b6c7998
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 0000000000..50d5dca0ed
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 0000000000..6e27f14b5a
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 0000000000..0d1f0e1bc9
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 0000000000..9eb6c340d3
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 0000000000..c5cca51457
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 0000000000..67148d2ce0
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 0000000000..92fcce7776
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 0000000000..edda6c9a84
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 0000000000..3a0418dacd
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 0000000000..3d4361ed65
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 0000000000..79cc5893c3
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 0000000000..73e64b5f36
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 0000000000..2f6ce06614
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 0000000000..b86a70b3fb
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 0000000000..dafc8a1ac0
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 0000000000..d982dbd276
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 0000000000..234a5deaab
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 0000000000..e96f13955d
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 0000000000..97ca7c4f79
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 0000000000..e8e35c6928
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 0000000000..bd6cd2729f
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 0000000000..9b36b5b211
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 0000000000..33b1d3883c
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 0000000000..d7c1a17d33
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 0000000000..713c3ff6fc
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 0000000000..af28278edf
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 0000000000..92063b97fc
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 0000000000..52e74c78e1
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 0000000000..89593fefca
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 0000000000..a7754cc734
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 0000000000..9b19a83932
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 0000000000..9d0a77f235
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 0000000000..d24dffd0e2
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 0000000000..bfe464bb3e
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 0000000000..88adae4c9f
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 0000000000..623f05775c
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 0000000000..249ad7e8f0
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 0000000000..3e7ae5090b
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 0000000000..f8183693f9
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 0000000000..7af1ab49ca
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 0000000000..a74ce5d86f
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 0000000000..a17b2b3497
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 0000000000..060b3faa3a
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 0000000000..05d1ca9b26
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 0000000000..87121fe107
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 0000000000..197caff4e7
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 0000000000..bc41c667b2
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 0000000000..6690db7bc3
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 0000000000..e0b55919f4
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 0000000000..a8161adf17
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 0000000000..aa465cce8b
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 0000000000..4c74c59e2e
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 0000000000..4d9b82e74a
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 0000000000..bbe8c4a97c
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 0000000000..12079862cd
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 0000000000..139ce489a4
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 0000000000..d69b5d304a
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 0000000000..098e0bd3ec
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 0000000000..88cee60960
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 0000000000..70b131e06b
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 0000000000..ddaf0447dd
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 0000000000..e8c6bd0d27
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 0000000000..33cac8bdf8
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 0000000000..277c462287
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 0000000000..66941c0223
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 0000000000..c3043450a5
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 0000000000..24161a5216
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 0000000000..2a68024823
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 0000000000..fc3f5b7c41
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 0000000000..b652d77950
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 0000000000..c6ad0a2dc4
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 0000000000..96bd711272
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 0000000000..52d188499f
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 0000000000..db92a16a76
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 0000000000..04d29aa6a7
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 0000000000..764114eaaf
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 0000000000..0b72ef1ed2
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 0000000000..e709f538bf
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 0000000000..47ad0e4f6c
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 0000000000..29d18abc79
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 0000000000..450d8beafc
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 0000000000..2cefb32033
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 0000000000..7cac69f07d
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 0000000000..99325408e3
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 0000000000..c781a5b622
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 0000000000..9268fabf63
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 0000000000..c255df10ff
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 0000000000..aafbbc2d80
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 0000000000..8025350c3f
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 0000000000..4d0a2c452a
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 0000000000..0c24ee712f
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 0000000000..f3fee572ec
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 0000000000..eb58823175
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 0000000000..84419dd4f6
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 0000000000..10a04dbabe
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 0000000000..72f83cb18c
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 0000000000..d811447234
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 0000000000..21be04c656
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 0000000000..09251b0934
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 0000000000..cb01545722
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 0000000000..e34ff5ad2a
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 0000000000..cccce72344
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 0000000000..cccce72344
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 0000000000..193841abd4
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 0000000000..57431fd462
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 0000000000..5e8c9eafca
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 0000000000..47cd7c3dc5
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 0000000000..50a713c2a5
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 0000000000..c228e63bdb
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 0000000000..fd51bc72c0
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 0000000000..eb371562db
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 0000000000..1d5da87a4a
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 0000000000..2702982fcf
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 0000000000..3172fe6ca1
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 0000000000..d2d29b7106
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 0000000000..14ef7c72b2
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 0000000000..b70217e894
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 0000000000..aa984ea926
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 0000000000..5decb0e800
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 0000000000..e0bb218cc0
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 0000000000..bb51bde8bb
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 0000000000..21d19226e1
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 0000000000..11acae0cdd
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 0000000000..0ef86da10f
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 0000000000..4af057ce4e
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 0000000000..81b26f22fa
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 0000000000..0ca067c3a3
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 0000000000..0f0ddf93f6
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 0000000000..6c7b443529
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 0000000000..4361c0d493
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 0000000000..e5655b0201
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 0000000000..16ecfbad42
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 0000000000..3d58da8d6e
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 0000000000..6217ffa8f1
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 0000000000..71c1b13f92
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 0000000000..823f6843fa
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 0000000000..c2ff6622a0
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 0000000000..76d0a52e37
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 0000000000..ddb5de5580
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 0000000000..302dd62dfb
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 0000000000..e00e0879e2
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 0000000000..3036e4fff3
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 0000000000..2a9678b583
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 0000000000..6539904a2d
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 0000000000..d5fb100823
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 0000000000..5db196f2d7
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 0000000000..2e705f5bfd
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 0000000000..34fc88c900
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 0000000000..ca94117982
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 0000000000..b0c3a0b62e
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 0000000000..b76dce309b
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 0000000000..d7856fc1c5
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 0000000000..7913646a10
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 0000000000..69cb4974a6
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 0000000000..53d3133222
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 0000000000..d9d076168e
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 0000000000..16c72da7a5
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 0000000000..8851848686
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 0000000000..f2d68401e8
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 0000000000..fb9786d6ca
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 0000000000..a608f8ca38
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 0000000000..c32c4c09e7
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 0000000000..099c48566f
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 0000000000..b64f178fd3
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 0000000000..9aecbe8722
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 0000000000..643f7586d4
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 0000000000..a63988f842
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 0000000000..f3b2496069
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 0000000000..198cbb11de
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 0000000000..272a25075d
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 0000000000..09c0fec026
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 0000000000..3721356b47
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 0000000000..45e02faa22
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 0000000000..e83826d61a
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 0000000000..194f3ed59f
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 0000000000..3a703eabc5
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 0000000000..e6899b43f2
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 0000000000..ebaf2ca3a2
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 0000000000..075c966194
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 0000000000..c05617d9bf
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 0000000000..1c34ec0ea0
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 0000000000..4be79e755f
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 0000000000..e82044b9ee
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 0000000000..13a5e8d137
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 0000000000..c071cc5f4c
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 0000000000..1dc39e119a
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 0000000000..942a826825
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 0000000000..66820e4312
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 0000000000..b064b48ff6
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 0000000000..e8b4206824
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 0000000000..a5e7a572c5
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 0000000000..533073253d
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 0000000000..1acd65b689
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 0000000000..3a954fc2b9
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 0000000000..1150e087a6
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 0000000000..2567daff7e
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 0000000000..f82ee5ab23
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 0000000000..9a62d34d56
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 0000000000..ffea8764d1
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 0000000000..ea6855388b
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 0000000000..cd23554268
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 0000000000..04d6169b41
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 0000000000..d076f10c06
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 0000000000..24f29a308b
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 0000000000..6209beeacd
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 0000000000..f16ef697c7
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 0000000000..29c229c9d2
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 0000000000..00072d7fb5
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 0000000000..c820f0f6cd
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 0000000000..15f1619621
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 0000000000..29fd692e51
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 0000000000..7ba23296f8
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 0000000000..cceff3ba75
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 0000000000..19521b237d
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 0000000000..b982d5c1fe
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 0000000000..a3b953f469
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 0000000000..daca3b0103
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 0000000000..2f8f3827cc
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 0000000000..0c3c31499b
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 0000000000..51c9665ad7
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 0000000000..bdd62d2633
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 0000000000..15da247788
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 0000000000..03f65f3bb1
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 0000000000..6a1847ec69
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 0000000000..aafbbc2d80
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 0000000000..2f6f1d1557
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 0000000000..49a79e94df
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 0000000000..becc4e7971
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 0000000000..cbd5d34b7b
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 0000000000..098a64b54b
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 0000000000..22bb40970b
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 0000000000..6efa81e32f
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 0000000000..11ab8a0232
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 0000000000..98c4e86a7f
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 0000000000..ce17a094e1
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 0000000000..57107fc6d7
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 0000000000..ed274bbb54
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 0000000000..26dbbf8e0d
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 0000000000..bc9a1fb748
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 0000000000..bc0853ceaf
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 0000000000..a4ebe38447
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 0000000000..3c182e7fa0
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 0000000000..254f840209
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 0000000000..8cbecd475e
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 0000000000..244628b366
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 0000000000..041f04bf8e
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 0000000000..da9735d995
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 0000000000..c840412f5f
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 0000000000..e36550f994
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 0000000000..599d8ecc97
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 0000000000..892e5ee759
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 0000000000..d36c167511
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 0000000000..a2328c0a69
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 0000000000..d118f99600
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 0000000000..273717999e
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 0000000000..b480b2032f
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 0000000000..e15941552e
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 0000000000..9a671657da
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 0000000000..1db9a9544a
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 0000000000..25851e745b
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 0000000000..c416e70621
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 0000000000..cf8d12e6d9
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 0000000000..d4f875af45
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 0000000000..d0658fd0a5
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 0000000000..5ff27e4ead
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 0000000000..248e0e4209
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 0000000000..900ed565c1
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 0000000000..e3e6975a61
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 0000000000..9716349afb
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 0000000000..d395307319
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 0000000000..fd82e00731
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 0000000000..9ca220cbf5
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 0000000000..c329e141e5
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 0000000000..e0bc22aa17
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 0000000000..b36520e1a9
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 0000000000..467aa3aea9
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 0000000000..15840362e7
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 0000000000..461a0c42c4
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 0000000000..a2bb47b52e
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 0000000000..8f1b6e291d
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 0000000000..a1cd009cb5
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 0000000000..bf470e788d
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 0000000000..fb4b75f53a
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 0000000000..18e186f59d
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 0000000000..6ea19b5e50
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 0000000000..b91c97a224
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 0000000000..a10731ce0d
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 0000000000..e9feafd873
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 0000000000..2a99360696
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 0000000000..7d0e2552e3
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 0000000000..4f4d752b09
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 0000000000..92d2df6053
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 0000000000..4446d75d4e
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 0000000000..d0c3e90a2e
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 0000000000..43b783a7ea
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 0000000000..3dfd6c4678
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 0000000000..0d376eebf5
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 0000000000..693cf0eb39
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 0000000000..29c25ce55c
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 0000000000..b02516af5a
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 0000000000..3bffaccee9
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 0000000000..54c6e2006e
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 0000000000..95dd53e7fe
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 0000000000..0e3ff5b88b
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 0000000000..e9038cd2dd
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 0000000000..ec503f94b6
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 0000000000..99b5e32403
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 0000000000..b425d3d931
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 0000000000..86b3040878
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 0000000000..e7e0d94a7e
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 0000000000..f3fa9be209
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 0000000000..b4a8057836
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 0000000000..8ab3449028
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 0000000000..138faec2d1
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 0000000000..047a887fb1
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 0000000000..87efccfb47
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 0000000000..77897d4208
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 0000000000..b969fde1e1
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 0000000000..d60ae4efc2
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 0000000000..3425962af1
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 0000000000..bedf2aad18
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 0000000000..afb7c8086d
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 0000000000..48c0e38d41
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 0000000000..fc4cfafe8a
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 0000000000..0f61101eec
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 0000000000..a233fcd169
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 0000000000..e3ed0f3387
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 0000000000..e8c6bd0d27
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 0000000000..568141e9c7
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 0000000000..346fdeb2e9
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 0000000000..a31d8b6a52
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 0000000000..569a500df5
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 0000000000..cf7c241243
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 0000000000..052eb3a32f
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 0000000000..9d29759b01
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 0000000000..adbf98b1cc
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 0000000000..6bb3bf6b51
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 0000000000..33d6e63020
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 0000000000..32910942ac
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 0000000000..da9330abf1
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 0000000000..b3f13232e9
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 0000000000..346fdeb2e9
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 0000000000..a31d8b6a52
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 0000000000..569a500df5
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 0000000000..cf7c241243
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 0000000000..052eb3a32f
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 0000000000..9d29759b01
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 0000000000..aaec315d30
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 0000000000..be23cd906a
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 0000000000..e8c6bd0d27
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 0000000000..181d0dc4d8
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 0000000000..165827b17b
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 0000000000..07db5ac13c
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 0000000000..165827b17b
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 0000000000..e717c05933
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 0000000000..9ddb3c63b2
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 0000000000..54aa560fed
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 0000000000..ea9bf6c6bd
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 0000000000..a479d99b30
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 0000000000..640db6a49e
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 0000000000..ee1b999e0d
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 0000000000..b97fbf42e3
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 0000000000..9079f60b81
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 0000000000..decc0b5892
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 0000000000..e3e3e89cb1
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 0000000000..5a5f36684e
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 0000000000..d8d0c23c3f
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 0000000000..8cf0a05b55
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 0000000000..fe8c1c3ea7
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 0000000000..640f121611
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 0000000000..6758574bbb
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 0000000000..e40f2cc1f9
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 0000000000..23f7d98acf
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 0000000000..b8f41b601e
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 0000000000..c5fe882fec
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 0000000000..af52cbe103
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 0000000000..bb2539903b
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 0000000000..ac71bf49b5
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 0000000000..abeb7fe2f4
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 0000000000..957841c2b2
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 0000000000..a6e41041c1
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 0000000000..ed6a137458
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 0000000000..4cd9f7a7f0
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 0000000000..ad5a8e50e1
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 0000000000..07db5ac13c
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 0000000000..1e5d67a3b4
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 0000000000..9b6f69ca1b
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 0000000000..9e949d4b05
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 0000000000..199b03f1d9
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 0000000000..b353bd4abf
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 0000000000..370f3a4245
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 0000000000..00eb521b52
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 0000000000..921b180454
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 0000000000..921b180454
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 0000000000..f5939dfc2d
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 0000000000..ef2778f7a4
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 0000000000..603a530b2a
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 0000000000..88db70bffe
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 0000000000..3de70bf030
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 0000000000..b569302492
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 0000000000..3817818d16
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 0000000000..b91a41a828
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 0000000000..0d16971388
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 0000000000..e1447ab976
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 0000000000..f6313a7704
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 0000000000..4f31242b15
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 0000000000..16e1f419e2
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 0000000000..84b7fb4e58
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 0000000000..16e1f419e2
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 0000000000..59a73872fe
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 0000000000..863c2a6698
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 0000000000..75385882cb
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 0000000000..3f7a75574e
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 0000000000..01aa415dee
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 0000000000..be6e58718c
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 0000000000..6e105fd5bd
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 0000000000..718f58445c
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 0000000000..83e0dc67b1
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 0000000000..4ea04cb8bb
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 0000000000..01aa415dee
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 0000000000..be6e58718c
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 0000000000..6e105fd5bd
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 0000000000..718f58445c
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 0000000000..83e0dc67b1
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 0000000000..4ea04cb8bb
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 0000000000..a9840630db
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 0000000000..0e87267add
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 0000000000..dc79d8a033
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 0000000000..8629f9b6be
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 0000000000..1d4c8e8d2a
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 0000000000..b5bc881f56
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 0000000000..fc6924f71f
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 0000000000..662c9f36fe
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 0000000000..edf4cc1286
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 0000000000..37e8c04c04
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 0000000000..b69c664aa3
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 0000000000..220ef6486c
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 0000000000..68fa2099ea
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 0000000000..0417a10943
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 0000000000..2f7248ae6e
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 0000000000..dea9361893
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 0000000000..968dd09dcd
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 0000000000..5d8ee88eaa
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 0000000000..6541b6fe42
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 0000000000..99ae5c0f62
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 0000000000..912ccf79c3
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 0000000000..fcdded5cb4
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 0000000000..a7e0ef9b17
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 0000000000..cceb895268
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 0000000000..6d4295d510
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 0000000000..625252023b
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 0000000000..41a3a3fc33
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 0000000000..0332bba08e
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 0000000000..a872990f0f
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 0000000000..ed7a1aa975
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 0000000000..6ca380ccc8
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 0000000000..231202a852
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 0000000000..94543a74a4
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 0000000000..37972b04b5
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 0000000000..016985eb24
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 0000000000..00e5a68502
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 0000000000..a3ac482015
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 0000000000..69ae8bd442
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 0000000000..38005d6c57
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 0000000000..e19ef4cf86
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 0000000000..1231a7fbe1
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 0000000000..8867d8de41
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 0000000000..04ddfd6f16
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 0000000000..c434409c0d
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 0000000000..4937477132
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 0000000000..db53c8642a
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 0000000000..a75e1e6c2f
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 0000000000..2115d429f8
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 0000000000..2115d429f8
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 0000000000..096d564717
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 0000000000..fb7416e14e
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 0000000000..8f7818def2
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 0000000000..e8c6bd0d27
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 0000000000..0d16971388
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 0000000000..130a11287c
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 0000000000..ec79a6347d
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 0000000000..4820f0c6cc
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 0000000000..52095afb29
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 0000000000..52095afb29
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 0000000000..8fa069d578
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 0000000000..8fa069d578
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 0000000000..bc9e942c19
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 0000000000..a170bd71f0
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 0000000000..b8eee6b19c
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 0000000000..630817af98
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 0000000000..46059ef55f
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 0000000000..4ae93143be
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 0000000000..a5e213a866
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 0000000000..4733ecb474
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 0000000000..7adef77ae4
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 0000000000..1d9da89933
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 0000000000..4dd7808b87
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 0000000000..b4a10fe93b
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 0000000000..e4c838cc32
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 0000000000..22a726d66a
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 0000000000..e1753b2e6b
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 0000000000..94117f2554
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 0000000000..b3154d094b
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 0000000000..ef1ec56a23
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 0000000000..26f264202d
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 0000000000..a623c080de
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 0000000000..a74ac90bef
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 0000000000..34f7808184
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 0000000000..7a4b155730
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 0000000000..b4a10fe93b
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 0000000000..e4c838cc32
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 0000000000..22a726d66a
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 0000000000..e1753b2e6b
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 0000000000..94117f2554
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 0000000000..b3154d094b
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 0000000000..3a812b5535
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 0000000000..abaaf15ca4
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 0000000000..20249ddacc
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 0000000000..fafebd2642
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 0000000000..131f6e05bb
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 0000000000..3441930e2a
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 0000000000..e2ad8b7cec
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 0000000000..cddfe58a8a
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 0000000000..4e8756eef8
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 0000000000..386396c799
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 0000000000..2943a50eee
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 0000000000..c6237b5964
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 0000000000..1e6e728fda
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 0000000000..5f3d4438db
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 0000000000..297b813db3
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 0000000000..10971327a5
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 0000000000..d5a17c6104
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 0000000000..eb6853649e
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 0000000000..bc1ac37390
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 0000000000..4d77d04121
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 0000000000..c22044d12c
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 0000000000..2a028a5391
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 0000000000..7cc7ec7c17
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 0000000000..0b419a5df9
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 0000000000..257b23b826
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 0000000000..f7d06f7cd3
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 0000000000..8664a9d1ce
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 0000000000..8664a9d1ce
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 0000000000..28482bcb6d
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 0000000000..88f3ce8063
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 0000000000..ac927ebe17
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 0000000000..513137d512
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 0000000000..3a6093b748
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 0000000000..596e51c774
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 0000000000..af8cd7a22a
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 0000000000..064ab8bba7
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 0000000000..6afc9f8151
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 0000000000..1cf5d38c57
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 0000000000..db8b0e5288
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 0000000000..63664f32ec
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 0000000000..ad336dec9c
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 0000000000..5574a33c50
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 0000000000..f9a77f36d0
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 0000000000..69929488d6
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 0000000000..f319311c95
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 0000000000..9cd2e6031a
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 0000000000..2234247e64
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 0000000000..87121fe107
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 0000000000..8796829b87
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 0000000000..b36f41960e
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 0000000000..dc1441fea5
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 0000000000..abc19e06c7
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 0000000000..c90549f681
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 0000000000..5152c9c1a3
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 0000000000..3c4c59e1e0
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 0000000000..a15b796635
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 0000000000..07c2257114
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 0000000000..eeb196006c
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 0000000000..590fc0ec0f
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 0000000000..c1e5de22a8
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 0000000000..1261df7c00
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 0000000000..01681ab34b
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 0000000000..a861adf6ed
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 0000000000..6884082ac4
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 0000000000..49faefc74c
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 0000000000..6c3d261ff3
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 0000000000..aa79c5ac77
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 0000000000..aa79c5ac77
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 0000000000..a3084bb247
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 0000000000..9adad89393
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 0000000000..9634051d47
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 0000000000..b658875d7d
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 0000000000..3bfba6c3eb
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 0000000000..e8f1841320
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 0000000000..ac76f853ed
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 0000000000..ac277b2a55
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 0000000000..bccc7685a9
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 0000000000..ddc02d4fa7
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 0000000000..772148aece
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 0000000000..62a39dca05
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 0000000000..cd68f7ac3e
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 0000000000..087991d594
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 0000000000..14b088b196
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 0000000000..780c99af78
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 0000000000..a9fbd03aba
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 0000000000..ff36d04904
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 0000000000..7f056bfb32
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 0000000000..f217c930a7
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 0000000000..78f881392d
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 0000000000..fe8739808b
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 0000000000..f406ed86d2
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 0000000000..e2f19b2752
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 0000000000..29a44e6f05
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 0000000000..4fa7bcf2cf
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 0000000000..4f4bbda422
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 0000000000..8b81727d4a
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 0000000000..81b26f22fa
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 0000000000..300c4cda31
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 0000000000..fa1aa4b91b
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 0000000000..2fa3cf503e
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 0000000000..27dd3ad7c4
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 0000000000..fb66ba11c4
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 0000000000..6d9b2fc8cc
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 0000000000..c5d52f5c7a
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 0000000000..3d4288d10d
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 0000000000..6ff36c07cb
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 0000000000..c25d42927d
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 0000000000..a474f416df
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 0000000000..2858b04b01
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 0000000000..6d340d44c8
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 0000000000..3075e667c4
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 0000000000..e34ff5ad2a
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 0000000000..3279393b53
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 0000000000..0c5d473eb4
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 0000000000..f23d6f604c
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 0000000000..8867d8de41
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 0000000000..0c15835e21
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 0000000000..aca1d93a22
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 0000000000..4338bb4389
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 0000000000..b0ce2c2f50
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 0000000000..66b170cc77
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 0000000000..1be5733ff4
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 0000000000..1fdef76093
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 0000000000..a0128d5615
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 0000000000..a0128d5615
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 0000000000..0de43c9b36
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 0000000000..bd2c26f7af
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 0000000000..0e76c56f8b
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 0000000000..11acae0cdd
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 0000000000..11acae0cdd
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 0000000000..4af057ce4e
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 0000000000..54aa560fed
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 0000000000..b907b343c6
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 0000000000..5a5446d289
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 0000000000..abab353376
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 0000000000..b99a1132cf
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 0000000000..9e50424832
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 0000000000..d8a6229d6b
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 0000000000..71330d66a8
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 0000000000..a1345ecbd2
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 0000000000..016b920bcd
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 0000000000..4591eb5290
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 0000000000..19be3236ae
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 0000000000..8bf1817c09
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 0000000000..262db0d00b
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 0000000000..f42a78e451
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 0000000000..84d6e41ab4
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 0000000000..2b2ee437e4
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 0000000000..417ee806f4
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 0000000000..065846524c
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 0000000000..e9404fd525
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 0000000000..8817578cf0
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 0000000000..0e9bf46e0b
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 0000000000..918e3d435a
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 0000000000..0c01143530
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 0000000000..fed226dac2
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 0000000000..65a0790d92
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 0000000000..7260df1d15
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 0000000000..d14580a3db
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 0000000000..9313ab2116
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 0000000000..f432b554b3
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 0000000000..dc7087e028
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 0000000000..13cb1dcc7d
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 0000000000..8ea76c0c0a
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 0000000000..399e26300a
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 0000000000..8695943db8
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 0000000000..2c62ab9c18
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 0000000000..fca559c590
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 0000000000..a06b4e01e7
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 0000000000..e9a04252c6
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 0000000000..75674c347e
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 0000000000..d1d0f87305
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 0000000000..a6264c605d
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 0000000000..508746275e
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 0000000000..c0c736f741
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 0000000000..24fb8258dd
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 0000000000..69dcb7a038
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 0000000000..71cab54ed9
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 0000000000..f991c5b4a8
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 0000000000..b93a6c1a76
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 0000000000..12c33faa18
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 0000000000..635b172ed0
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 0000000000..a456c17db5
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 0000000000..71711ef1dc
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 0000000000..4f5f474d82
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 0000000000..068633b3a8
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 0000000000..6c6f5ff05b
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 0000000000..172289f230
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 0000000000..a214b591cc
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 0000000000..c7bbbed3a1
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 0000000000..e43ef813b1
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 0000000000..fcac319f36
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 0000000000..ff037c73ba
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 0000000000..8ef0aed711
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 0000000000..7783233e9f
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 0000000000..07989f1480
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 0000000000..eb1d4b2473
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 0000000000..eb1d4b2473
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 0000000000..8d72ac773f
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 0000000000..4b846fb8ac
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 0000000000..42773fc5d4
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 0000000000..e7bb191446
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 0000000000..d11a27c055
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 0000000000..63e857d769
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 0000000000..1705f088c1
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 0000000000..9d6d080ee0
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 0000000000..a4d2216d37
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 0000000000..0428e77253
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 0000000000..08a74c0f39
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 0000000000..b5879c4afc
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 0000000000..3d5f77bbd9
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 0000000000..958676d7b8
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 0000000000..02d077c037
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 0000000000..6c4f6b38bc
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 0000000000..5d71583020
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 0000000000..9375d78e0e
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 0000000000..4e8393a385
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 0000000000..8fb4bf0b34
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 0000000000..8a6628105f
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 0000000000..35098fe36f
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 0000000000..4aecde0ca2
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 0000000000..55e5079d20
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 0000000000..7bf80c22c2
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 0000000000..7494b29929
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 0000000000..c6294e338a
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 0000000000..5a26a35786
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 0000000000..3e24523650
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 0000000000..962baadd25
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 0000000000..fc0784d883
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 0000000000..6f98dcfcc1
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 0000000000..5705d19c15
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 0000000000..bf89834ff3
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 0000000000..0deed50038
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 0000000000..86314c1925
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 0000000000..0cc03cf5a6
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 0000000000..1f65e85007
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 0000000000..86f7aeb192
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 0000000000..354c112bf6
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 0000000000..5db48a21a4
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 0000000000..ebbb306be7
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 0000000000..ecc55e1913
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 0000000000..2ce79de31f
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 0000000000..87d7866966
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 0000000000..dc4ad28221
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 0000000000..87d7866966
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 0000000000..55b9d7dbf1
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 0000000000..395097678c
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 0000000000..eae3454c86
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 0000000000..ad913668e3
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 0000000000..ae37adf3d1
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 0000000000..2e4b6e90b6
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 0000000000..040a074c5f
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 0000000000..2367b38e63
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 0000000000..cf61c8eba0
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 0000000000..9cb7a82163
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 0000000000..32754df9bf
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 0000000000..b9daeb66aa
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 0000000000..570015ee95
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 0000000000..d0f3ef5855
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 0000000000..691a709ae3
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 0000000000..0362071c46
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 0000000000..e414b56659
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 0000000000..c0c736f741
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 0000000000..24fb8258dd
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 0000000000..69dcb7a038
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 0000000000..71cab54ed9
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 0000000000..f991c5b4a8
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 0000000000..b93a6c1a76
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 0000000000..320b8952bd
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 0000000000..a82d04b3e1
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 0000000000..d965f3c759
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 0000000000..d29adcdd61
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 0000000000..79572618ab
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 0000000000..19bdd6605a
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 0000000000..3016620ec5
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 0000000000..695a47d32e
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 0000000000..cd4ddc7dcc
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 0000000000..b13089e4f3
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 0000000000..66b98715cf
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 0000000000..28e0d894f7
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 0000000000..26ef358abb
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 0000000000..9116d6ee9a
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 0000000000..0ef5600a45
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 0000000000..0ef5600a45
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 0000000000..2b9b72f4a2
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 0000000000..59a516444a
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 0000000000..a61389af82
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 0000000000..ab73a0d5a0
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 0000000000..25c25b63d8
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 0000000000..f8b2357e00
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 0000000000..2aecbe96a4
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 0000000000..894c33a226
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 0000000000..39e5864b81
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 0000000000..9b8f13575f
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 0000000000..be8010015b
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 0000000000..d9cd288f1c
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 0000000000..711fd7fbe1
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 0000000000..b626d6088c
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 0000000000..e164deaa73
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 0000000000..f1d2470999
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 0000000000..588d13d528
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 0000000000..70384907f3
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 0000000000..04cb1c9ca4
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 0000000000..ddd6f184d2
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 0000000000..0a1a2b7c87
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 0000000000..2aa3a5a10d
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 0000000000..3c1c44845c
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 0000000000..dcf40de1fd
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 0000000000..9736f427f1
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 0000000000..dd15fb928e
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 0000000000..80938421a3
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 0000000000..0102469707
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 0000000000..cbb91dbda3
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 0000000000..c26550d13a
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 0000000000..6a35a41014
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 0000000000..c26550d13a
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 0000000000..59a73872fe
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 0000000000..d797df04cb
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 0000000000..0c767cd801
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 0000000000..e977189f9e
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 0000000000..e977189f9e
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 0000000000..17ad7b6307
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 0000000000..3a7795e303
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 0000000000..53cecd4db7
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 0000000000..3a7795e303
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 0000000000..e824621774
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 0000000000..7b3e80b551
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 0000000000..3f1f3ca76c
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 0000000000..6769d53367
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 0000000000..94a457f99b
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 0000000000..c833c60963
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 0000000000..6db627b092
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 0000000000..83b4b05518
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 0000000000..5e035fcfdb
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 0000000000..e3608ce31a
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 0000000000..578ed54aec
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 0000000000..89b8238797
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 0000000000..667110258c
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 0000000000..6efa544328
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 0000000000..52ded94d54
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 0000000000..2e59b69be0
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 0000000000..53a0fb1b7f
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 0000000000..b2ee62e80d
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 0000000000..6327ab1025
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 0000000000..c66b1a2138
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 0000000000..7294a38c1f
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 0000000000..09c7210223
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 0000000000..cca9533abf
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 0000000000..27a01ef28c
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 0000000000..77901ed77f
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 0000000000..56aa2e0862
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 0000000000..0533bab402
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 0000000000..194d154938
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 0000000000..3f5c8127de
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 0000000000..4f5c3101bb
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 0000000000..0b82cc5c83
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 0000000000..2d9a971d90
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 0000000000..5cef8797da
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 0000000000..c4eb1a7ad3
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 0000000000..6555d9d94a
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 0000000000..eb42daddf7
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 0000000000..bee1d0b320
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 0000000000..d94059937b
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 0000000000..136d03bdf0
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 0000000000..11b2b19632
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 0000000000..3f51294239
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 0000000000..011715a2ca
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 0000000000..bbca2ee3b9
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 0000000000..5aa455d1af
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 0000000000..5cef8797da
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 0000000000..c4eb1a7ad3
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 0000000000..6555d9d94a
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 0000000000..eb42daddf7
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 0000000000..bee1d0b320
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 0000000000..d94059937b
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 0000000000..6afd11b63c
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 0000000000..802587548d
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 0000000000..17bc1265d8
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 0000000000..d3366b61fb
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 0000000000..04fe0099ed
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 0000000000..9163e78abd
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 0000000000..62e9d4c62c
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 0000000000..5a06e50984
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 0000000000..fb8c270c8b
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 0000000000..16bb59dee8
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 0000000000..c352436d90
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 0000000000..288e86d9a2
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 0000000000..1ba3b8e7ca
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 0000000000..721340bfb0
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 0000000000..b8f203dc7a
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 0000000000..e8c6bd0d27
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 0000000000..abeb7fe2f4
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 0000000000..957841c2b2
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 0000000000..a6e41041c1
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 0000000000..ed6a137458
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 0000000000..4cd9f7a7f0
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 0000000000..ad5a8e50e1
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 0000000000..9ab17fceaa
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 0000000000..405c5916f5
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 0000000000..f3c3005023
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 0000000000..ce6c110c38
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 0000000000..3e4d163d94
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 0000000000..b069d79b9f
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 0000000000..c81bea0aa5
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 0000000000..bde772e630
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 0000000000..285492d7b7
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 0000000000..3a0cebaeba
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 0000000000..fd0adefab1
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 0000000000..fd0adefab1
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 0000000000..77efcb8983
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 0000000000..febd1745b8
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 0000000000..10153f06a4
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 0000000000..52095afb29
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 0000000000..a304d8eb5c
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 0000000000..10153f06a4
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 0000000000..137427410b
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 0000000000..9c1ec084f8
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 0000000000..f845c37011
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 0000000000..2980fcc9d9
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 0000000000..fe8be04225
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 0000000000..f8c24e2005
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 0000000000..095b6c531e
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 0000000000..e05886638d
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 0000000000..f13fc79812
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 0000000000..f091be82df
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 0000000000..e76c479457
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 0000000000..07a57a0591
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 0000000000..095b6c531e
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 0000000000..e05886638d
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 0000000000..f13fc79812
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 0000000000..f091be82df
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 0000000000..e76c479457
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 0000000000..07a57a0591
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 0000000000..ea7083f119
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 0000000000..bed41c8a35
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 0000000000..9b496e7ed0
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 0000000000..2829a07ef8
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 0000000000..0b13406d56
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 0000000000..986fa0935a
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 0000000000..c10fad17da
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 0000000000..35be1cf926
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 0000000000..bd9f81b76a
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 0000000000..d7b4e1979a
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 0000000000..7f75911aaf
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 0000000000..f5bcfe6a56
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 0000000000..1beeab29a1
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 0000000000..b48bf14265
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 0000000000..bd9f81b76a
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 0000000000..d7b4e1979a
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 0000000000..7f75911aaf
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 0000000000..f5bcfe6a56
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 0000000000..1beeab29a1
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 0000000000..b48bf14265
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 0000000000..4d796f10a6
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 0000000000..f1f81118b7
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 0000000000..851a7fc109
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 0000000000..166f2d6232
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 0000000000..9bbfc1f1ba
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 0000000000..f7916fff85
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 0000000000..120a336361
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 0000000000..7df663ba99
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 0000000000..3bfb06bfff
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 0000000000..e4f3edf680
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 0000000000..dc2ea1ee65
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 0000000000..e7072a149a
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 0000000000..80b22c8f92
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 0000000000..714229ec97
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 0000000000..ca7edf36df
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 0000000000..ba3f9a1cdb
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 0000000000..10c906203a
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 0000000000..5b016f3922
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 0000000000..ae8e0971c5
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 0000000000..1244116fb1
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 0000000000..e4db0283d8
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 0000000000..020a486782
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 0000000000..5965beae8b
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 0000000000..154b1b5c72
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 0000000000..68fb59dc19
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 0000000000..04d29aa6a7
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 0000000000..f441bd83bc
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 0000000000..2f4d619997
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 0000000000..7aee717234
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 0000000000..5fa43f378a
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 0000000000..73653eee2b
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 0000000000..752473912d
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 0000000000..c9f160564b
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 0000000000..bf9a56aeff
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 0000000000..390e62321c
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 0000000000..a9a9db203a
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 0000000000..81b8c47aba
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 0000000000..c0df8e7b37
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 0000000000..1e46a06c65
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 0000000000..958c30e9ee
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 0000000000..1bccee1490
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 0000000000..2851bccdb4
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 0000000000..6e4dda1aec
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 0000000000..b25380a64b
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 0000000000..54909fff67
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 0000000000..d02cb7ad96
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 0000000000..31864be794
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 0000000000..18069451d1
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 0000000000..61869d48ba
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 0000000000..58c5a41c12
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 0000000000..93b29813f2
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 0000000000..799144564f
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 0000000000..e348872002
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 0000000000..98f69236c2
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 0000000000..2b7f34d0e1
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 0000000000..21e8849d14
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 0000000000..9a0d04f498
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 0000000000..fdcd26c8b4
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 0000000000..a6f2b26854
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 0000000000..87d0f23c76
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 0000000000..ffa65cb673
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 0000000000..6cab94e37d
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 0000000000..18fed80964
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 0000000000..87d7866966
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 0000000000..ad7ba7e249
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 0000000000..ad7ba7e249
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 0000000000..99b349b713
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 0000000000..6db1dda0ec
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 0000000000..f3c0189a7e
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 0000000000..114fe7694b
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 0000000000..d8d0c23c3f
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 0000000000..8cf0a05b55
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 0000000000..fe8c1c3ea7
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 0000000000..640f121611
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 0000000000..6758574bbb
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 0000000000..e40f2cc1f9
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 0000000000..2940d4ae74
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 0000000000..7faeb2cd12
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 0000000000..468ceb20c9
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 0000000000..893aa6e884
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 0000000000..2a4d9ca7f7
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 0000000000..89aaa6cbb0
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 0000000000..76d2b03624
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 0000000000..091956a136
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 0000000000..89aaa6cbb0
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 0000000000..1087099c6f
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 0000000000..1087099c6f
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 0000000000..01805b1fe7
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 0000000000..d9ec0d7d8d
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 0000000000..e37df48d03
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 0000000000..e37df48d03
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 0000000000..34b9786153
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 0000000000..b76dce309b
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 0000000000..d7856fc1c5
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 0000000000..7913646a10
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 0000000000..69cb4974a6
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 0000000000..53d3133222
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 0000000000..d9d076168e
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 0000000000..938547aed9
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 0000000000..c8b0a25ea2
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 0000000000..938547aed9
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 0000000000..c8b0a25ea2
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 0000000000..c8b0a25ea2
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 0000000000..42da9edb7a
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 0000000000..2c28c9b1d3
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 0000000000..400434e443
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 0000000000..4bd5d32edc
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 0000000000..5b7e4a70d4
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 0000000000..202d6e0bd6
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 0000000000..3223603df1
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 0000000000..407a5e48c7
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 0000000000..cac80903ec
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 0000000000..f4d72befae
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 0000000000..8e65729a6c
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 0000000000..7243c2cb5e
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 0000000000..2b4ac8d7fc
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 0000000000..a552663374
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 0000000000..0ad3ed0bed
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 0000000000..106adce9c3
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 0000000000..7014ab0c8b
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 0000000000..197beb5f98
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 0000000000..719c040d23
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 0000000000..edf4cc1286
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 0000000000..ab3ca56d38
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 0000000000..7316430220
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 0000000000..00183b1600
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 0000000000..4355d9f0db
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 0000000000..4355d9f0db
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 0000000000..6a09064f50
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 0000000000..df7c5c761e
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 0000000000..8f2b9bbe9e
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 0000000000..748f64a0f7
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 0000000000..e00bcacfa0
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 0000000000..bd0f84f54d
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 0000000000..5bbb147019
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 0000000000..8f71ff5db4
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 0000000000..0a5608999b
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 0000000000..e8c6bd0d27
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 0000000000..7527531406
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 0000000000..f21cc08706
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 0000000000..a140620266
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 0000000000..997ea8acbf
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 0000000000..361cedcebd
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 0000000000..530c91b32e
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 0000000000..de13538169
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 0000000000..1668b2ee48
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 0000000000..25251d6a32
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 0000000000..9a7704da04
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 0000000000..9345acae47
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 0000000000..9345acae47
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 0000000000..3f01b30930
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 0000000000..4c6b86d8a9
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 0000000000..06da53a737
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 0000000000..163d2c89a0
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 0000000000..4f13ffb5f7
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 0000000000..4f13ffb5f7
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 0000000000..eb6853649e
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 0000000000..eb6853649e
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 0000000000..94d5484a09
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 0000000000..165827b17b
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 0000000000..b76dce309b
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 0000000000..d7856fc1c5
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 0000000000..7913646a10
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 0000000000..69cb4974a6
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 0000000000..53d3133222
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 0000000000..d9d076168e
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 0000000000..4a366549a3
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 0000000000..7ec2a34013
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 0000000000..e8c6bd0d27
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 0000000000..bd0e800e95
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 0000000000..6a2188ce3e
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 0000000000..fadd194736
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 0000000000..e8c6bd0d27
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 0000000000..e8c6bd0d27
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 0000000000..641af67dfa
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 0000000000..4622a59246
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 0000000000..43d25e24b7
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 0000000000..791fa6a677
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 0000000000..cac758b4f2
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 0000000000..fcfaad6d0e
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 0000000000..7da8183f39
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 0000000000..c78acc9a3a
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 0000000000..06ca9379d8
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 0000000000..f1e1ee6980
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 0000000000..2963435eee
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 0000000000..32435295c7
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 0000000000..234329ee03
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 0000000000..d9b8a83043
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 0000000000..7bed0afec8
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 0000000000..b9223766a4
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 0000000000..c48630c28f
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 0000000000..88cfa38ee2
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 0000000000..c70ce93270
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 0000000000..98febc1f23
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 0000000000..bb2539903b
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 0000000000..82c827db39
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 0000000000..00fa26cb54
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 0000000000..43f9899698
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 0000000000..1ef8a37147
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 0000000000..6a432e0db9
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 0000000000..9471e1cf42
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 0000000000..1ffc2c9cfd
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 0000000000..fdecf03f7c
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 0000000000..b749ef2ee0
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 0000000000..dbad3698a8
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 0000000000..6e9ec1b001
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 0000000000..f5e6d0425f
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 0000000000..0bf7f578ce
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 0000000000..29541aa01f
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 0000000000..cab4b2498c
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 0000000000..833b5ffeaa
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 0000000000..c9badaff42
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 0000000000..f5e6d0425f
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 0000000000..0bf7f578ce
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 0000000000..29541aa01f
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 0000000000..cab4b2498c
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 0000000000..833b5ffeaa
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 0000000000..c9badaff42
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 0000000000..a743be6a9e
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 0000000000..1876c4c543
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 0000000000..974b21fb98
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 0000000000..025f8aeb94
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 0000000000..29d3c09089
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 0000000000..c6924bd02f
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 0000000000..8b5e349ac7
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 0000000000..7088a32456
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 0000000000..e4427cbd15
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 0000000000..61a177788f
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 0000000000..4e8756eef8
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 0000000000..b4ae31475d
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 0000000000..cf08e685ea
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 0000000000..0f439023b4
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 0000000000..b9ece4b935
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 0000000000..8b366b27a9
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 0000000000..6657f153b1
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 0000000000..cef0659d36
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 0000000000..4b05eae811
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 0000000000..e6609b3b2a
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 0000000000..a201e7be68
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 0000000000..f5dc287c86
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 0000000000..b88627894d
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 0000000000..cef0659d36
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 0000000000..4b05eae811
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 0000000000..e6609b3b2a
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 0000000000..a201e7be68
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 0000000000..f5dc287c86
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 0000000000..b88627894d
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 0000000000..f03d897163
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 0000000000..f02d849a52
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 0000000000..1fd64825d8
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 0000000000..3df68f2312
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 0000000000..50d7464eca
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 0000000000..4e152536d8
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 0000000000..3edab9621c
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 0000000000..03905490d1
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 0000000000..e244775095
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 0000000000..0053ad2666
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 0000000000..9dcffbb44b
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 0000000000..d8811a5638
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 0000000000..e43ef813b1
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 0000000000..d1234bb4b9
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 0000000000..ba7765bc59
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 0000000000..78f6a0bf96
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 0000000000..bba0b62472
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 0000000000..08aa6a4843
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 0000000000..ff84cf3996
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 0000000000..45a5ecd2af
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 0000000000..e297d51502
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 0000000000..36ef13a832
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 0000000000..2635768f55
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 0000000000..d312f04602
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 0000000000..a456c17db5
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 0000000000..62d5834fd2
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 0000000000..1a61e8d508
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 0000000000..6690db7bc3
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 0000000000..673da9bd81
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 0000000000..99f7a6ef5e
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 0000000000..f67c722eb9
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 0000000000..1d55d4f631
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 0000000000..3a7ba22f8e
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 0000000000..1858262d95
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 0000000000..1858262d95
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 0000000000..67340603ea
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 0000000000..0eb09acc5b
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 0000000000..220ef6486c
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 0000000000..8203a027e1
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 0000000000..d4c3fa91cc
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 0000000000..db75861b6c
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 0000000000..758c711673
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 0000000000..ed22fa2815
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 0000000000..030635f69c
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 0000000000..bf0f4e543a
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 0000000000..19b31d1ceb
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 0000000000..9d4dffd10f
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 0000000000..92ab6353c1
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 0000000000..888e5578ec
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 0000000000..f4912e85b2
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 0000000000..ea9bc1ea2e
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 0000000000..ea9bc1ea2e
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 0000000000..f7cdc8af14
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 0000000000..959ba48a2d
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 0000000000..30d3f60e3f
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 0000000000..69fc916af4
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 0000000000..9ec0b3e7b9
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 0000000000..9ec0b3e7b9
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 0000000000..e41e870843
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 0000000000..f5ee017e12
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 0000000000..437295715f
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 0000000000..85da864180
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 0000000000..5743a1586c
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 0000000000..786799a445
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 0000000000..1b737304e7
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 0000000000..3d4361ed65
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 0000000000..79cc5893c3
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 0000000000..73e64b5f36
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 0000000000..2f6ce06614
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 0000000000..b86a70b3fb
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 0000000000..dafc8a1ac0
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 0000000000..acf6f96ad8
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 0000000000..c5338782ac
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 0000000000..f7c34caa48
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 0000000000..0e499703dd
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 0000000000..7348e7e176
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 0000000000..380a4ab4a5
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 0000000000..8f3b553b8e
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 0000000000..3a43dc1c4d
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 0000000000..aa8a7fc5f1
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 0000000000..1be385628f
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 0000000000..7fd84ae9c8
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 0000000000..732d52bdec
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 0000000000..fb8684e1ce
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 0000000000..a004857f48
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 0000000000..8fa069d578
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 0000000000..0ef5600a45
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 0000000000..edf41b6a6e
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 0000000000..98d6ece6ea
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 0000000000..f9da859d08
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 0000000000..3e79fb1b6e
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 0000000000..e46bb80726
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 0000000000..4c63eca1b3
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 0000000000..deb43385a0
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 0000000000..968e807332
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 0000000000..5ede969843
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 0000000000..04b96f3428
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 0000000000..ac2ce5fbf2
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 0000000000..56dbe89f4e
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 0000000000..d708db94f0
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 0000000000..4ef4974901
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 0000000000..def9ee997c
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 0000000000..8aed780373
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 0000000000..cec1216e81
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 0000000000..30ff275879
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 0000000000..18fed80964
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 0000000000..f798ed9d40
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 0000000000..e7b20fe127
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 0000000000..1bea7fa2d7
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 0000000000..09181dd70e
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 0000000000..1c8a8e2bf3
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 0000000000..af24597ec3
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 0000000000..8389c5dbaa
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 0000000000..847f760c98
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 0000000000..85079ffb8b
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 0000000000..fa7708abb3
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 0000000000..e65d04aa66
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 0000000000..229a4a6b8a
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 0000000000..b66c204e6a
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 0000000000..6a538c4a91
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 0000000000..babe5c8b2e
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 0000000000..f347e846b6
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 0000000000..4f46d2340f
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 0000000000..a33cc2e92b
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 0000000000..def973dc98
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 0000000000..dc24cb62f6
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 0000000000..ff0140c69d
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 0000000000..ff57e3c971
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 0000000000..a55ddcdd25
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 0000000000..367af9cf6d
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 0000000000..ccc982801d
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 0000000000..6d7c8bd0a4
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 0000000000..ee88c3f750
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 0000000000..abdd04797d
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 0000000000..3945316c2d
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 0000000000..a9fbd03aba
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 0000000000..f23d6f604c
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 0000000000..9edd2a8dc3
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 0000000000..26cab51e7d
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 0000000000..9a52258b99
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 0000000000..9a52258b99
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 0000000000..6e5fe40622
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 0000000000..d695a5cac0
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 0000000000..3e2fb468b7
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 0000000000..3b52fffe11
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 0000000000..ea09f4c9a6
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 0000000000..ea09f4c9a6
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 0000000000..eff08b3c1a
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 0000000000..d451b23ae7
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 0000000000..8ba4d5d538
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 0000000000..8ba4d5d538
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 0000000000..5d0b625766
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 0000000000..26cba98d67
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 0000000000..989ad11a14
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 0000000000..c7b23374a7
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 0000000000..122612e060
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 0000000000..c331a2dac2
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 0000000000..a61f20c40f
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 0000000000..6b645dbe08
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 0000000000..962288bd17
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 0000000000..154f2b6e35
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 0000000000..540b48d887
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 0000000000..b05d3bad9a
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 0000000000..2bd9a7b71b
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 0000000000..c88f4ad73b
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 0000000000..5c8a9eef8a
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 0000000000..2ee62e42a8
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 0000000000..a757a43c81
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 0000000000..56bee06af6
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 0000000000..6238e74020
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 0000000000..5a6aca044b
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 0000000000..211279451d
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 0000000000..38077b5a11
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 0000000000..3c2d9ab383
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 0000000000..d91a10d8ff
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 0000000000..4f17f767a0
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 0000000000..4d1cf9b4ee
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 0000000000..7503e8aa13
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 0000000000..98a374dcf0
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 0000000000..7294a38c1f
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 0000000000..09c7210223
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 0000000000..cca9533abf
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 0000000000..27a01ef28c
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 0000000000..77901ed77f
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 0000000000..56aa2e0862
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 0000000000..7294a38c1f
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 0000000000..09c7210223
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 0000000000..cca9533abf
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 0000000000..27a01ef28c
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 0000000000..77901ed77f
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 0000000000..56aa2e0862
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 0000000000..bbd7b970be
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 0000000000..2dd36f63f9
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 0000000000..a4d95ac0e9
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 0000000000..059f45a046
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 0000000000..d19ee2f6d9
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 0000000000..05df581fb5
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 0000000000..bbd7b970be
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 0000000000..2dd36f63f9
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 0000000000..a4d95ac0e9
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 0000000000..059f45a046
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 0000000000..d19ee2f6d9
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 0000000000..05df581fb5
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 0000000000..bf8507d2f1
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 0000000000..f690992e0e
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 0000000000..986a51a523
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 0000000000..967649fbfe
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 0000000000..494a204ce8
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 0000000000..80d3a727e7
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 0000000000..e8c6bd0d27
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 0000000000..993deafc94
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 0000000000..b70b1b3b52
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 0000000000..13f08e539b
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 0000000000..ab1ca0dcbf
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 0000000000..528df36074
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 0000000000..4888de00f2
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 0000000000..bf07ccfa7a
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 0000000000..35caa37fd9
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 0000000000..53c412f791
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 0000000000..e16479dc83
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 0000000000..c03fe69de4
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 0000000000..fbec719c44
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 0000000000..ce118edeef
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 0000000000..de072bca62
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 0000000000..ce4e23c8c7
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 0000000000..e28d093387
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 0000000000..0a775f4918
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 0000000000..5673a0b3fa
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 0000000000..18b1e0b15a
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 0000000000..ced0d21c40
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 0000000000..e9b39cda21
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 0000000000..eb58823175
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 0000000000..84419dd4f6
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 0000000000..10a04dbabe
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 0000000000..72f83cb18c
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 0000000000..d811447234
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 0000000000..21be04c656
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 0000000000..eb58823175
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 0000000000..84419dd4f6
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 0000000000..10a04dbabe
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 0000000000..72f83cb18c
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 0000000000..d811447234
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 0000000000..21be04c656
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 0000000000..168dcdf490
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 0000000000..e8c6bd0d27
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 0000000000..2a83fedd0c
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 0000000000..433108acf7
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 0000000000..eacaf590e6
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 0000000000..17ab798b1c
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 0000000000..fcb38f9482
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 0000000000..cb1d0f740a
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 0000000000..ce4e23c8c7
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 0000000000..5486e25da8
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 0000000000..db9c6af5b3
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 0000000000..f9dda7899d
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 0000000000..9768059a10
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 0000000000..1a0bd02100
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 0000000000..3b2f5b6f41
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 0000000000..9daf142f81
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 0000000000..43f9899698
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 0000000000..1ef8a37147
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 0000000000..43f9899698
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 0000000000..1ef8a37147
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 0000000000..4338bb4389
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 0000000000..4338bb4389
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 0000000000..24ef290ba4
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 0000000000..dc17bd1974
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 0000000000..25ee602d2c
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 0000000000..dc17bd1974
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 0000000000..86122bb31e
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 0000000000..7d99dd23c1
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 0000000000..dbd16da58b
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 0000000000..d7770ff964
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 0000000000..784f33ad52
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 0000000000..fb09398470
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 0000000000..381d7b38d8
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 0000000000..92e4c0e351
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 0000000000..c1cfaa9c33
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 0000000000..93b26d8f4f
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 0000000000..37d9237f85
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 0000000000..30c7ec0ba1
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 0000000000..54a6491ca3
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 0000000000..d1f627a7f5
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 0000000000..2b833ed276
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 0000000000..ba7bb01526
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 0000000000..e862c384ce
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 0000000000..d930d6782a
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 0000000000..b918ebb71e
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 0000000000..4b9ef8de2e
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 0000000000..734c3aebc3
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 0000000000..0e8cea8059
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 0000000000..2d2f7e2f14
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 0000000000..cb68eb0f61
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 0000000000..b90689366e
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 0000000000..7e27a7d41d
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 0000000000..77c9f5f9a1
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 0000000000..3d52a03bd6
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 0000000000..d374d85eb4
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 0000000000..9fbf9691d3
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 0000000000..4e569837ab
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 0000000000..94905cff89
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 0000000000..ac35fcec3d
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 0000000000..1150e087a6
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 0000000000..504dc1a21c
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 0000000000..f82ee5ab23
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 0000000000..9546f0fd92
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 0000000000..babf0b16c8
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 0000000000..ea6855388b
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 0000000000..0c932d30e5
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 0000000000..f567bb7eaf
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 0000000000..bdbe03d315
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 0000000000..001e43e979
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 0000000000..e9f0816b54
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 0000000000..37ede74a8b
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 0000000000..f6d6fa7a82
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 0000000000..2687d32b71
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 0000000000..e000862b84
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 0000000000..94cba12981
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 0000000000..b79e014189
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 0000000000..9607ee11a3
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 0000000000..4ee147c7ef
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 0000000000..b09c0ab6b3
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 0000000000..a051784e4c
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 0000000000..8d4a22cebe
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 0000000000..b52abda875
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 0000000000..57300f59de
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 0000000000..e562c2af38
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 0000000000..6fad63ef21
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 0000000000..17d829a3e2
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 0000000000..9721379734
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 0000000000..7b7fcc10a6
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 0000000000..1b14b8fd35
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 0000000000..8821361298
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 0000000000..c9dac07cb5
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 0000000000..8bad4ae11a
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 0000000000..a152ae155f
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 0000000000..3004d95c7a
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 0000000000..4ae2a11f82
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 0000000000..9d36683a89
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 0000000000..65df1c1aaa
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 0000000000..4ff9236cb1
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 0000000000..324f50acc5
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 0000000000..e11e82cd35
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 0000000000..9b81b668bb
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 0000000000..7bd6b746ee
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 0000000000..271992d839
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 0000000000..c7f44fe2d8
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 0000000000..a871392feb
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 0000000000..662bdef9db
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 0000000000..e3b4a04255
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 0000000000..b0edf1db13
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 0000000000..0a69994b3b
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 0000000000..6749389fc0
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 0000000000..75595bc15f
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 0000000000..27cc0d9464
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 0000000000..9850fa78a1
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 0000000000..ff343aa651
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 0000000000..49945ba750
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 0000000000..ead380c5eb
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 0000000000..983576f78c
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 0000000000..3e26e10e08
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 0000000000..a317bac91b
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 0000000000..78210ee831
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 0000000000..bfa349b9e7
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 0000000000..bfb67b63f9
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 0000000000..7b2ff715da
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 0000000000..5a2c3d7d33
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 0000000000..4188b89eb2
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 0000000000..836c32604e
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 0000000000..05fee0ebf4
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 0000000000..6463f5cc3c
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 0000000000..4f380cce5e
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 0000000000..978b23501b
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 0000000000..c5971669bf
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 0000000000..6dfb912d4a
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 0000000000..b584aef3e6
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 0000000000..9c8f6e9a88
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 0000000000..74cc6b8536
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 0000000000..15db1c52ce
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 0000000000..0277b89b2a
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 0000000000..25eff05d60
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 0000000000..56c6c65069
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 0000000000..ff1a4bf6b6
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 0000000000..661b0945e8
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 0000000000..d10547e374
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 0000000000..a0c0aca2c3
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 0000000000..cc01679562
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 0000000000..c5a3581bed
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 0000000000..f56992a3f5
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 0000000000..51cce0e6bf
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 0000000000..7da9a69649
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 0000000000..497090e161
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 0000000000..603e6a3fc7
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 0000000000..2c303f03bb
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 0000000000..b697785f49
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 0000000000..4c53f7cb93
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 0000000000..0e82b068ca
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 0000000000..22afd6de0e
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 0000000000..e2efca98df
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 0000000000..3e7fbb11fa
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 0000000000..b471f445a7
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 0000000000..a9a14a2b5d
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 0000000000..78a76cebdd
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 0000000000..43027a669f
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 0000000000..b0a2dba556
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 0000000000..b5e5129317
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 0000000000..b4f93324c2
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 0000000000..c3b4b21336
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 0000000000..8329970e7b
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 0000000000..a0aff93692
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 0000000000..6b3731cac8
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 0000000000..511414ad6c
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 0000000000..af95435379
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 0000000000..355bdeb636
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 0000000000..8d0ad7202e
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 0000000000..3c49195f87
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 0000000000..05c9316a11
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 0000000000..7df227c947
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 0000000000..68df0e7624
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 0000000000..374fd94095
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 0000000000..03fa002909
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 0000000000..224e2749c3
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 0000000000..23f3f022ba
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 0000000000..bb6e9b9a58
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 0000000000..27be8a9655
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 0000000000..9c8b38392b
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 0000000000..fc4cfafe8a
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 0000000000..6a30663f23
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 0000000000..7783233e9f
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 0000000000..ffd85982ea
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 0000000000..608570fd5b
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 0000000000..2066e74c91
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 0000000000..c3340ea5d1
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 0000000000..c6fd39feb7
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 0000000000..8098829f60
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 0000000000..b91550cdd6
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 0000000000..b950ece572
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 0000000000..86d15a015b
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 0000000000..c68b313ea5
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 0000000000..b76abb89c6
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 0000000000..143c24116e
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 0000000000..9ca8fab013
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 0000000000..7b28355854
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 0000000000..5fbb7ca003
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 0000000000..6faa14f55d
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 0000000000..ce02394db0
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 0000000000..fc55fe87b5
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 0000000000..6a9ed782fa
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 0000000000..6a9ed782fa
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 0000000000..1bf288fcd4
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 0000000000..1e6a2b5a16
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 0000000000..e68d1b077a
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 0000000000..0123a0f8a1
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 0000000000..19a0e46389
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 0000000000..209c0e4e5b
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 0000000000..9deccd899a
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 0000000000..a3c768cdd0
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 0000000000..2737de44b5
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 0000000000..3b87d1364c
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 0000000000..4a8ea96d5b
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 0000000000..3bec88e6af
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 0000000000..92235c693c
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 0000000000..6eb5db8e21
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 0000000000..4676f24e21
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 0000000000..53a5eb2ccb
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 0000000000..8f30fc9e38
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 0000000000..36a4e57d1f
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 0000000000..77c57605e9
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 0000000000..58bcd6a2fc
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 0000000000..3bc6b5a57a
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 0000000000..50c4c6b272
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 df94ee2ce9..f5a217ef09 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 59795d6830..0585a1c36c 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 62bc81a282..dc86670a86 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 6784909fff..47399184f7 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 0000000000..2ce958b920
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 3541796943..09794594d7 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 0000000000..8d428869d4
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 0000000000..cd3dc01ab2
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 0000000000..f4f58e2e25
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 3f32cad88b..550f047067 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 0000000000..0fd73782c2
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 5a4f3c5c27..718fed87a3 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 0000000000..b1363242c3
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 0000000000..4534f4a0f5
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 0000000000..a6d457d6e7
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 0000000000..c4442989a6
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 0000000000..0535703880
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 0000000000..5aca11a07e
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 0000000000..d1006c6c19
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 0000000000..5a6759de63
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 0000000000..e3ff113cba
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 b0c9511faf..f50a1389fe 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 0000000000..1e5e815098
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 0000000000..846307fcf3
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 0000000000..81715516af
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 0000000000..459facc13b
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 0000000000..2e3a1fdd73
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 0000000000..2bfefce2be
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 3f7d5a506d..5deec18db8 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 0000000000..5dbc804e86
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 0000000000..58141c9f3c
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 0000000000..2fbf351b83
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 0000000000..faa8c8fbe7
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 0000000000..59b4ecf2a0
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 0000000000..9977df9a5b
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 0000000000..aff19a2366
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 0000000000..c38253651e
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 0000000000..b4df1272b9
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 0000000000..ba53029fff
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 bea7330b5a..ffe5dcc6d3 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 0000000000..b1cfa9dc3b
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 7c2023ce3c..3b5d0df295 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 0000000000..3be5a53903
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 0000000000..ed95128e19
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 0000000000..815a93ef0b
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 0000000000..75713abc23
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 dd908f0c01..b6e8b94639 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 0000000000..caab400018
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 0000000000..830578344d
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 35576ac24b..b7ad17d4d7 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 0000000000..ac6a6c2c9f
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 0000000000..4dad1da7db
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 0000000000..739f1de58c
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 0000000000..62a23de466
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 0000000000..2cd9628b76
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 0000000000..85bfaeb578
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 af55a33bfb..ac6a6c2c9f 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 0000000000..4dad1da7db
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 0000000000..739f1de58c
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 0000000000..62a23de466
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 0000000000..2cd9628b76
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 0000000000..85bfaeb578
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 0000000000..7df66bcfb7
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 0000000000..d997111fc5
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 d5d52c29ec..ed94dd59b4 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 0000000000..fdbe8725c6
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 0000000000..033290fcb9
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 0000000000..75da71b8d1
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 0000000000..c1315378b2
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 0000000000..79dcf75dd3
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 d74fd5a910..894e33bee1 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 d12db22ecb..894e33bee1 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 d74fd5a910..894e33bee1 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 0000000000..ed22a6cb38
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 0000000000..4a2fdeb304
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 0000000000..b1f6e168d7
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 0000000000..f75b75a74e
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 0000000000..a9665b318a
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 0000000000..a42b3caf88
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 34cf8b08e2..1dde5bac0d 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 e91b32458a..47ba5e5871 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 e7236905ab..d0c3d5200f 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 0000000000..e75dc9ec50
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 0000000000..ca401e5985
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 0000000000..5f6dded80b
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 0000000000..bb74e98818
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 29e1400dcb..14261e4878 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 0000000000..75f2fac760
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 0000000000..d9a2d20fc1
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 7fa1bacfe5..809093cea9 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 0000000000..033fa69539
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 0000000000..15b01ed13f
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 0000000000..b98320c249
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 0000000000..ed6459ad80
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 0000000000..775e94a076
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 3f19d3f3be..e2c20735ff 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 0000000000..809093cea9
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 0000000000..033fa69539
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 0000000000..15b01ed13f
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 0000000000..b98320c249
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 0000000000..ed6459ad80
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 0000000000..775e94a076
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 0000000000..eab8bcf9f6
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 0000000000..39b2f70d9a
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 0000000000..1cdb55d7bd
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 0000000000..1479fbc064
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 0000000000..521d5bf885
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 0000000000..bb3897810e
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 0000000000..5cc92e307e
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 1032597b14..43ba2d4a9d 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 79404fdb47..9c8a879b67 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 0000000000..5c1237bdad
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 0000000000..b237819755
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 8d2a53756b..eea3a53bcf 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 0000000000..419c5d22c5
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 0000000000..f6e78cc448
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 0000000000..d26f97cb5b
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 0000000000..ff83f6d7d1
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 0000000000..e40e865a49
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 0000000000..c04215ecc2
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 0000000000..11e258fa61
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 0000000000..70e3888d3e
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 0000000000..52e92bb7d6
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 0000000000..37108efb1f
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 0000000000..a7c2fcdfd9
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 0000000000..0a8ee484ce
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 1763c90b3b..ad255bc8eb 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 0000000000..3eba365766
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 0000000000..af9bd4d5e7
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 0000000000..91493ade75
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 0000000000..3697a723dd
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 d097247136..49ea37f389 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 523e02ce03..1afe2438e2 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 0000000000..801a577654
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 47553dce0d..c602d42a91 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 0000000000..6859d97750
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 0000000000..db5fd10f10
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 0000000000..d61fb8c38d
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 0000000000..1ef277b893
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 0000000000..922ad0843c
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 b0c9511faf..f50a1389fe 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 0000000000..c602d42a91
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 0000000000..6859d97750
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 0000000000..db5fd10f10
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 0000000000..d61fb8c38d
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 0000000000..1ef277b893
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 0000000000..922ad0843c
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 0000000000..bbe859ce67
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 0000000000..e6fa7ca7f5
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 0000000000..206a368708
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 0000000000..047411f966
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 0000000000..9d43cffab0
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 0000000000..85a701f354
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 0000000000..b0d88a73b9
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 5a586ebdd5..9c334abe13 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 0000000000..abb4d24834
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 0000000000..e84ab48a98
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 0000000000..e897583579
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 0000000000..49a32025a6
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 0000000000..7f7734ecdb
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 0000000000..0f350a552e
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 0000000000..c8e889faec
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 0000000000..a68b1e6b58
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 0000000000..815538138b
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 0000000000..fb591aa4fb
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 0000000000..5adcffa4b9
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 0000000000..d166f981b2
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 0000000000..7c8cb50a78
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 0000000000..e113d8cb42
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 d30ae00c15..ca5bcd13fc 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 0000000000..c6f204ead0
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 0000000000..781740ea04
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 0000000000..6cd7c62004
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 0000000000..a48ae99782
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 0000000000..6247cc757a
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 0000000000..e3d2479344
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 0000000000..9f758979a1
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 0000000000..5e03a6d23b
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 0000000000..647e1c4d79
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 0b2cebc922..24cdec2e5f 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 0000000000..5185700c63
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 0000000000..c519f8a954
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 b4ffcb0ac9..74894241cc 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 0000000000..83e731cc34
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 0000000000..5231c708a0
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 0000000000..753693b093
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 0000000000..f56875edac
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 0000000000..37d74f5c97
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 0000000000..5a48f96192
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 0000000000..6150740817
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 0000000000..995ea58f80
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 56c6355432..5734838437 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 7c2c806bbb..f2ccc32917 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 0000000000..6e50aea9ee
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 0000000000..31a89ad633
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 0000000000..d619e0b8d7
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 0000000000..f99492eb6c
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 0000000000..02be2857ff
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 0000000000..f0c258b55b
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 0000000000..0a7ca06fb4
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 0000000000..fd49394ac1
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 63e41c5294..fd49394ac1 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 0000000000..b9aaf46348
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 0f5da1ddac..414dc9caf6 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 0000000000..82664ad79e
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 0000000000..68ccf48d0d
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 0000000000..2e5976e9d2
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 0000000000..4ee3c9caa7
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 0000000000..1252c37a6d
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 0000000000..2fbf351b83
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 0000000000..7780a4a036
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 ac1ac5fb26..1aeaf5f5b0 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 0000000000..939b6874ea
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 dc33084aab..a0bddf1ffe 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 0000000000..70d8309d8c
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 0000000000..a344cb3ae8
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 0000000000..e0da30d5a6
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 0000000000..26b77c821c
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 d097247136..49ea37f389 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 ab6c9d7891..8c5a8f8c09 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 ea0834b78b..2299ae10ec 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 0000000000..33e50494a3
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 0000000000..7a0e4f1cb7
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 0000000000..81a69110e9
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 0000000000..b5c64c9cc8
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 0000000000..0763a8bd94
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 0000000000..3ed705b902
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 0000000000..740d09658e
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 7abc69e19b..e46b2790d6 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 680b64628b..735209e166 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 0000000000..5706420297
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 0000000000..6958b7d8d8
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 45b678cbd3..4ee6b2fef0 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 ddbfcfa5ca..4f04b745a8 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 d34ac7ece6..17dcd8e49f 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 0000000000..e17edcfc70
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 0000000000..20c58c405a
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 0000000000..6bbe9de353
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 0000000000..959db77f63
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 0000000000..a767c09a2f
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 0000000000..24839781d4
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 dbf6a08ee1..e180b0340a 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 0000000000..1b24d16ae0
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 0000000000..7943b73f67
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 cf335766a1..62a0e89459 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 0000000000..be44d531a7
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 0000000000..c78134fdee
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 0000000000..c409f9f4c4
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 dc78191f4b..fab0609689 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 0000000000..e76b533149
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 0000000000..c9025e34e4
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 90990adf2c..fbea94471b 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 49d200520e..3c022b9795 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 0000000000..680f77b22d
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 0000000000..e765f50715
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 0000000000..3a71c800c6
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 7b5e40f7e7..44528c70ac 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 0000000000..2eef1d6c17
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 0000000000..a34af9d64a
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 0b2cebc922..24cdec2e5f 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 c408538fab..32c0607d30 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 0000000000..27241c8308
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 0000000000..5793b115da
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 0000000000..8fd2dd6ad6
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 0000000000..e460c5cda2
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 0000000000..9efbda410b
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 0000000000..32c0607d30
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 0000000000..27241c8308
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 0000000000..5793b115da
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 0000000000..8fd2dd6ad6
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 0000000000..e460c5cda2
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 0000000000..9efbda410b
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 0000000000..7963262606
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 0000000000..63998c76ae
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 0000000000..83eb2d8749
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 0000000000..b518850876
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 0000000000..80eacbdd52
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 0000000000..34a1e9e2c0
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 c54026dbba..471e812ed3 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 0000000000..d1e4afbaca
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 5be8c58dc4..fe7b77444a 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 0000000000..13b912f19e
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 0000000000..6bdbeca111
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 0000000000..b062756c45
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 0000000000..86f0ae990b
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 0000000000..29f3fc63ab
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 00d63e9cb5..0bb05b4c1b 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 0000000000..e6c16e4ea0
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 0000000000..c8e9c1eace
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 c703fb0873..c17e182f54 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 3842a5b186..98680b826f 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 0000000000..56d8afc89a
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 0000000000..98680b826f
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 0000000000..8381dc5b8e
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 fe04756efb..576b77fc17 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 0000000000..2de6d98e2f
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 0000000000..576b77fc17
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 0000000000..f238608d9a
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 006bf5d83e..23a2ba41a1 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 616318dedb..e98639283c 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 0000000000..efe2c6fcd1
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 0000000000..0aaa1cf765
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 8a0bf65a6c..1e3c9dfa38 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 0000000000..8a0bf65a6c
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 0000000000..6cc9a0e748
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 c80fa94f73..e8a07ebbff 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 0000000000..c2cea2221f
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 0000000000..9ba3b1ff09
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 0000000000..7ce5cd5811
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 0000000000..c6297b1c63
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 0000000000..8ae4d9b0f9
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 0000000000..f3529e2537
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 0000000000..0265996d38
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 f78b11032a..07b18f7659 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 644b016522..ec1da04367 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 17e4845f5c..c262ae3288 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 0000000000..4436dee31e
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 0000000000..392fdddcc1
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 0000000000..4b2f313f9b
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 30f6c4435c..0e44661a91 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 0000000000..e29bde1f8b
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 0000000000..09027a2fb2
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 295fa81016..e9e2879731 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 673db8a3a8..7e0d040771 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 0000000000..b66d427e09
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 0000000000..7f80f4ed57
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 0000000000..88558e4ab2
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 b39cc3a9e1..78122daaa5 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 0000000000..2b6ae27746
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 0000000000..3164902914
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 0000000000..9aa4c2b777
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 0000000000..c87ed99b46
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 0000000000..e5b30ff0ec
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 4f9a95af33..f972cc2a77 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 0000000000..dec9fb054b
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 0000000000..f972cc2a77
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 51cea45f9c..80dd960877 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 0000000000..92aa546e94
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 0000000000..821499e02c
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 0000000000..a48da60494
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 34cde2e36f..3ec8a867b4 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 37832e0183..2d2e8919ff 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 0000000000..881e01a927
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 0000000000..606fe6a1ee
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 86e5cfda49..518466b08a 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 91f68d6885..797c62e8cc 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 12dd201bcc..d922415786 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 182370e8ac..a69e389862 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 0000000000..588ece3f43
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 0000000000..de48ff449c
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 6c09ea3c73..5c85e0b83c 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 721749b09d..9fdcff829a 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 721749b09d..9fdcff829a 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 40233507fb..951a35d0cb 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 8dbce8f24b..64acc92aa9 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 0000000000..2ad3f8a41b
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 0000000000..d0c94c34e4
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 0000000000..6adaf8cddb
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 0000000000..489a779bf6
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 e1f706f93b..fcdd33b0d7 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 0000000000..c9cce258ae
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 0000000000..ebd0634eb6
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 0000000000..da8447f5f2
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 0000000000..13619101d0
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 0000000000..b488923c4a
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 0000000000..7874afc0a6
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 0000000000..cf86fbaad6
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 596a7389b8..cec55b549a 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 0000000000..bbbdefa653
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 90f774c392..302a381ec0 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 0000000000..0f24a98369
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 0000000000..f8b6dd873e
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 0000000000..15984024f2
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 0000000000..4689243a17
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 0000000000..861cbf808c
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 0000000000..5074876010
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 0000000000..505c908b18
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 e1f706f93b..fcdd33b0d7 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 398caa5051..6becf76bb1 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 0000000000..38e992318c
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 0000000000..630fd66415
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 0000000000..2553a5dbf7
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 0000000000..d0d78350cd
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 0000000000..938b488ddb
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 0000000000..85532dadc7
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 0000000000..cd7c3d1f2b
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 0000000000..aed8f62e0b
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 f68e8b2f19..97bec4d11f 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 0000000000..c6fbb4481d
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 0000000000..887f70e365
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 19f91b44b4..8a864a00bd 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 0000000000..84bb9ec9c5
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 5539251aa4..c9440239c0 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 0000000000..28448af2fb
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 0000000000..f5511a8416
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 0000000000..b836c259f3
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 0000000000..3eb0bb8521
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 0000000000..b1004a4f04
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 0000000000..570a5d52d9
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 0000000000..429938294b
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 0000000000..91e1de4e5d
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 0000000000..42821806e9
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 0000000000..9e8d3adb89
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 0000000000..88d190e392
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 0000000000..e6ab8ade74
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 0000000000..d97a84cea1
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 0000000000..3d59c46f5a
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 0000000000..d31b0f6209
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 0000000000..67d15f282c
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 0000000000..4bb3d823f8
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 0000000000..a8b6469dcb
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 0000000000..e1aa1a80db
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 0000000000..f908ca5943
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 0000000000..3a5450aa90
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 0000000000..40cc392a93
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 0000000000..3dac9f07fe
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 0000000000..985c53eb3c
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 0000000000..90526b27fc
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 0000000000..e8abd120b1
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 6e182893e9..e8abd120b1 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 87fc9a756b..b948f1cbca 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 245e06801d..3d59c46f5a 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 0000000000..8d6fa3ac3e
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 932e8dc1fc..8d6fa3ac3e 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 d7f0561986..f908ca5943 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 17ef09256e..3a5450aa90 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 cc4a111848..40cc392a93 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 7772e1d79b..3dac9f07fe 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 3367cfcd77..985c53eb3c 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 0000000000..3b0f755fd8
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 0000000000..f9a1813738
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 0000000000..966c36a0b9
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 0000000000..68b9671817
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 0000000000..1e1995f8bf
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 0000000000..e9ce323487
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 0000000000..9913749162
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 0000000000..ce0352c19b
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 0000000000..cb294dd7c0
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 0000000000..e751a27401
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 a5394941df..9913749162 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 24cf7536f2..cb294dd7c0 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 610f517f2a..e751a27401 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 0000000000..5da7953f8d
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 5c0e5127d7..a8e9ccbb60 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 5d89252f0e..1869c3930a 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 16dd7df4de..8381dc5b8e 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 0000000000..c1703a7c86
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 3168f01b45..68e00d62fe 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 0000000000..df504caef6
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 863b212977..f0fcd6fc1d 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 0000000000..f0fcd6fc1d
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 0000000000..5eda4bb864
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 2734a6d6e4..1f7f056b57 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 ee984ef906..1d702357e6 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 cac34b4f77..936e1559a4 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 240544d25f..30d7e1e214 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 0000000000..a9739dc4c1
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 0000000000..634bb80247
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 0000000000..42492cdf3d
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 0000000000..0f1ba5dece
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 0000000000..24030c7af7
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 0000000000..f1ebb97514
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 0000000000..1360d252ce
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 0000000000..270de69cd2
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 0000000000..99e8ae08f3
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 0000000000..5600a525fb
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 0000000000..4db9f46f34
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 0000000000..010432f201
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 0000000000..a71348e322
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 0000000000..b62317eca5
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 0000000000..abceea0434
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 0000000000..e64682dfe5
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 0000000000..daa257c5c2
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 75a85c48ad..d547d1df55 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 a0657a04c0..82486f8812 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 d4cce444c0..76909f76f1 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 0000000000..27cd209049
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 0000000000..0585a1c36c
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 0000000000..dc86670a86
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 0000000000..7d5c862855
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 c671f9b225..f8aee2c7b5 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 0000000000..94a8cdca40
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 0000000000..96584c9f57
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 77de1b164b..91b21c1d94 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 0000000000..74bcddb7e7
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 0000000000..ad38ccf08d
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 0000000000..b67d58af24
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 0000000000..8e67281736
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 0000000000..ecc9bec0fa
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 0000000000..596a7389b8
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 cdf3317703..0769d43e83 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 0000000000..1c5988a20b
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 0000000000..e10ce817f8
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 0000000000..5f04a5370d
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 0000000000..8be682c19d
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 0000000000..28b7990842
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 0000000000..5f8463196b
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 0000000000..8c92a9c484
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 0000000000..f1ca30e538
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 0000000000..7c8f518c95
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 0000000000..124d99647d
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 0000000000..f7fe84e334
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 0000000000..5b483c06ad
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 0000000000..d557856b3f
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 0000000000..8e7fce2f49
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 0000000000..992338bb2b
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 0000000000..aadc06129f
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 0000000000..8ad10be116
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 0000000000..695c4a6cb9
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 0000000000..3457e01312
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 98af01c5e3..decb957645 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 0000000000..6563b2a69f
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 0000000000..707ca2a121
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 de9bd49f9a..5e5732a995 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 2fe689f356..7f48782f4a 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 0000000000..f0eddcc91a
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 0000000000..673f81ef6f
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 0000000000..f1b8829dba
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 0000000000..cbe9f11a12
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 0000000000..be0e85d289
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 0000000000..bc1291bf4f
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 0000000000..f20d619e3c
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 0000000000..0f50dd516a
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 0000000000..87632adc49
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 0000000000..cd82802640
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 0000000000..1a11dd2c56
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 0000000000..4773a63cf9
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 9fa2979660..1f7c85cbb9 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 f8a187a884..36609a5670 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 0000000000..93df509c6e
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 0000000000..d986fe7501
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 0000000000..3fa61820b6
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 0000000000..22116c217a
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 0000000000..ebbc3263e2
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 0000000000..36609a5670
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 0000000000..93df509c6e
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 0000000000..d986fe7501
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 0000000000..3fa61820b6
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 0000000000..22116c217a
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 0000000000..ebbc3263e2
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 0000000000..115ceac8f0
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 0000000000..bd7d3d17fb
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 fb6a0cc690..8fe6dc8f16 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 0000000000..7cee24d816
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 0000000000..033fd6c050
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 0000000000..b225a2163f
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 0000000000..b55baa7993
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 0000000000..abb1c09fb8
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 0000000000..c274ffb629
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 0000000000..e3325b048e
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 0000000000..31c8707a43
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 0000000000..87f17a6ff2
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 41bb7be9bb..9625aa5100 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 4d970b6d78..39e0a68f19 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 0000000000..c9c437901d
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 0000000000..d291c89c97
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 6ee3ce550e..62f207fa74 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 0000000000..d1188cf314
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 0000000000..c590551ee5
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 0000000000..41296d2587
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 0000000000..13ae230651
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 0000000000..1d0a9bd6c9
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 0000000000..fefb6c23e5
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 0000000000..9b3ea56a62
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 0000000000..0ab6714e8d
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 0000000000..4fde6f1fd6
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 0000000000..42349efadd
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 0000000000..77ae53aaf1
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 0000000000..b7e7259bc8
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 0000000000..f92e78a324
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 0000000000..dd1482188c
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 0000000000..c2ab6fb507
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 0000000000..2ceb411ad2
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 ea58297f9a..50259f54fe 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 0000000000..6318552d6f
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 0000000000..2f36ce4223
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 0000000000..d77285b276
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 0000000000..7920362667
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 0000000000..ee3101d501
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 0000000000..b5a80561e4
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 0000000000..2be41d13bc
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 0000000000..2fab3a1ac2
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 0000000000..7e6d5998c7
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 0000000000..5787ce4a5b
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 0000000000..f5d2a28312
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 0000000000..50259f54fe
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 0000000000..6318552d6f
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 0000000000..2f36ce4223
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 0000000000..d77285b276
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 0000000000..7920362667
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 0000000000..ee3101d501
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 0000000000..53d2160f9a
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 4c271c1660..10cca5ac3d 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 374bb61e92..eaee91f7a7 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 0000000000..e18572e405
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 0000000000..bd7ea42aa4
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 0000000000..f0708d24fb
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 0000000000..9ecd50830a
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 0000000000..f736e8afd3
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 0000000000..d387aac9c2
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 0000000000..37a9048ad7
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 0000000000..6ddd74b586
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 0000000000..1d901925fe
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 0000000000..5fcac72a70
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 0000000000..74fa972cad
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 0000000000..6ac8b5fdf6
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 83889bd72f..66af0792c9 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 f68e8b2f19..97bec4d11f 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 0000000000..1b5bf7b178
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 781f4bdc67..dfc121a0bb 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 0000000000..1cb11ddf8b
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 0000000000..9b978b3540
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 2a913d9d33..91a6fd1599 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 fa7cdcf33a..ad220c2eef 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 fa7cdcf33a..ad220c2eef 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 5599ac0a2b..2cd2474b51 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 ddf9490610..00bdf1ea52 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 0000000000..a7425d8c39
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 0000000000..d0aff11833
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 4687163276..a55fe609b3 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 0000000000..1dde5bac0d
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 0000000000..9db8cbc102
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 e98be98a39..10279f4134 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 f232085059..309fc3aa7a 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 0000000000..b7215a8902
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 0000000000..f38b15d6f3
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 0000000000..8639c6ef23
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 0000000000..94c756406d
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 0000000000..059178c9e2
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 0000000000..5f9a0a658b
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 4ed699b11f..f0eb7db322 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 4ed699b11f..f0eb7db322 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 0000000000..f0eb7db322
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 0000000000..98963a97c9
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 957b1971e6..939a2efca6 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 0000000000..7b5a1105c3
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 0000000000..399f5a4e85
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 0000000000..b95563b787
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 0000000000..09e63e6b9f
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 0000000000..a117cff357
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 0000000000..baa70f4a21
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 0000000000..59d41fc875
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 0000000000..3726ca85ac
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 0000000000..505a1d8540
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 516c432a49..5cb5888fc1 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 0000000000..e30df4c1f5
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 0000000000..cccd140ba3
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 0000000000..b97ecbcbd4
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 37832e0183..2d2e8919ff 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 0000000000..7829f538f8
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 0000000000..f7bc67925d
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 d520e1bdbf..66651e49b7 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 0000000000..dc2c807511
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 9416e35b5e..e1f040623f 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 1e322ae584..77d35ce126 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 0000000000..adfdbc3c1a
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 0000000000..43a2f9139f
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 1158e9d471..eaa38f615a 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 2124b7c10b..9f541c69f2 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 b31e29c692..73219d28c1 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 0000000000..731858e2cf
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 0000000000..cc55fd6981
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 0000000000..77727fec80
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 0000000000..f04615710f
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 0000000000..138fd3f2b5
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 2a426077e4..ca752f4ae2 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 0000000000..1abebdab60
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 0000000000..efea0b70bd
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 a0657a04c0..82486f8812 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 0000000000..32b00e4806
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 0000000000..6ecfc717c9
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 0000000000..5dca502f80
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 a7ed27cf54..967ce3a059 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 c217bb8d0d..f3001bd709 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 68f288277c..7a31d13484 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 0000000000..a23d4c4e2e
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 0000000000..5b8710dfd7
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 2305ee80d7..263a61ad0f 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 0000000000..136ea59d3d
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 622ec86bf7..5231c708a0 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 0000000000..753693b093
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 0000000000..f56875edac
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 0000000000..37d74f5c97
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 0000000000..5a48f96192
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 0000000000..6150740817
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 0000000000..2828cee4c8
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 0000000000..a6c90e15d4
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 0000000000..93605ebfd5
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 e0fb05d5e0..be0473304d 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 0000000000..8d680f5b12
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 0000000000..e4e961d5d5
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 0000000000..bcdf20d175
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 0000000000..9b91906952
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 0000000000..c3ce145e9e
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 8ff236dc42..aace4fa00b 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 8ff236dc42..aace4fa00b 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 0000000000..d4e7e6766a
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 0000000000..302081914b
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 377c42203f..710b5c0668 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 0000000000..14ef7c72b2
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 0000000000..b70217e894
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 0000000000..aa984ea926
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 0000000000..5decb0e800
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 0000000000..e0bb218cc0
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 0000000000..bb51bde8bb
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 97d8c722a5..6219ae26cc 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 0000000000..a8c6737d1b
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 0000000000..e31e547296
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 0000000000..70620e1d54
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 0000000000..a4c8ef41d2
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 0000000000..708ec7416c
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 0000000000..71c1b13f92
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 0000000000..823f6843fa
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 0000000000..c2ff6622a0
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 0000000000..76d0a52e37
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 0000000000..ddb5de5580
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 0000000000..302dd62dfb
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 0000000000..854fd4ce85
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 0000000000..13137b15ad
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 0000000000..e0fec7e04b
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 587278ae57..56d8afc89a 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 ea1ec92906..2de6d98e2f 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 0000000000..587e506d98
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 0000000000..a25d5ea4d4
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 0000000000..f100fd13a4
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 0000000000..775a8b2f2b
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 0000000000..c9703ba994
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 0000000000..55cc03db8d
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 0000000000..ef19c197c7
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 0000000000..f6850d6276
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 0000000000..a570e26c0a
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 0000000000..dd21d97a8a
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 0000000000..23d0f10eac
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 0000000000..07aa167d0b
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 0000000000..1262a4ee31
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 0000000000..1cc6650697
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 0000000000..4bacb1ea06
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 0000000000..05d4d810aa
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 0000000000..4f62b71923
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 0000000000..87b201e106
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 0000000000..d3c5344420
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 0000000000..3248c7ea4b
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 0000000000..3f4608453c
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 0000000000..dfb79a0fa1
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 0000000000..ecffb4b3dc
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 0000000000..30a01501b6
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 0000000000..1b5c86eeb3
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 0000000000..aaf7c70f74
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 0000000000..431a4461e3
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 0000000000..fb4421abb0
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 0000000000..277e11f0c5
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 0000000000..dfd446bd8d
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 0000000000..8877efb271
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 0000000000..8fb843406f
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 0000000000..4dfed22855
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 0000000000..072ab0c475
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 0000000000..0d3c6b8535
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 0000000000..805aa4fcf6
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 0000000000..60d2b62aa2
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 0000000000..f3f2a5b04c
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 0000000000..040218520e
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 0000000000..8aec654d0e
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 0000000000..3d74099cbb
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 0000000000..d41bc27788
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 0000000000..01ee2f8efe
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 0000000000..c819f4029a
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 0000000000..890aa9695f
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 0000000000..58aee73c58
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 0000000000..94355c5aca
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 0000000000..ddd6d4a05a
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 0000000000..9263f22556
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 0000000000..4f8d7b6339
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 0000000000..ac0c07e8d5
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 0000000000..f5b09e3c74
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 0000000000..d9e2f4f8f9
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 0000000000..c6fb8f9c46
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 0000000000..196de5ae66
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 0000000000..a275fe56a7
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 0000000000..cf79c4c311
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 0000000000..b0c9648562
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 0000000000..8924978790
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 0000000000..dc6e22dbc1
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 0000000000..e7df59313d
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 0000000000..a43787bc20
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 0000000000..9788ff223e
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 0000000000..b92f649135
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 0000000000..2494826b0d
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 0000000000..74caaf3d67
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 0000000000..87b1460b99
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 0000000000..266219eec1
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 0000000000..07434ed578
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 0000000000..a233efb0c7
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 0000000000..9dbd254708
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 0000000000..3e13cf5b0d
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 0000000000..6fe28eed3c
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 622ec86bf7..5231c708a0 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 0000000000..753693b093
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 0000000000..f56875edac
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 0000000000..37d74f5c97
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 0000000000..5a48f96192
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 0000000000..6150740817
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 0000000000..68a5498555
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 0000000000..9115065434
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 0000000000..7d21e35505
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 0000000000..5560c73e7c
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 0000000000..0507a8bc08
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 0000000000..7e5b911860
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 0000000000..b20c0cd734
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 0000000000..bdfee1817b
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 0000000000..052c0b0fa2
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 0000000000..ddd7e0530d
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 0000000000..1a374e1485
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 0000000000..4d5fac75df
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 0000000000..d6cc6a380d
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 0000000000..631afe697f
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 0000000000..c28f2a5db9
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 0000000000..12d32ecb86
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 0000000000..f04ba21ece
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 0000000000..4b5b1a7d5c
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 0000000000..df912ad255
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 0000000000..2d9a40a7b6
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 0000000000..0b6093c561
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 0000000000..4b776c98ef
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 0000000000..994526ddb9
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 0000000000..e95117df24
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 0000000000..641784af02
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 0000000000..db95aa1431
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 0000000000..0da3a36f50
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 0000000000..0e7d62291b
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 0000000000..b2ef2f0420
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 0000000000..f237971ab0
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 0000000000..196949a366
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 0000000000..0b3fe7f349
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 0000000000..2af0c956d9
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 0000000000..7098a598ca
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 0000000000..790ecc7051
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 0000000000..7082b178d7
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 0000000000..8d9964cf03
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 0000000000..33b1d7c764
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 0000000000..1f3f9215d0
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 0000000000..20d6288ed7
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 0000000000..b653112d27
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 0000000000..c7dce8c231
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 0000000000..14bc7c68d1
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 0000000000..4f343861d3
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 0000000000..3548a2ef8d
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 0000000000..7b45751b64
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 0000000000..3247752e19
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 0000000000..bd6e616eb2
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 0000000000..af1f36d1cd
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 0000000000..5a1e488e80
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 0000000000..7c7d6b849e
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 0000000000..ff16a5535f
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 0000000000..179479a696
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 0000000000..b02e169aaf
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 0000000000..61e00fd0b0
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 0000000000..6db5885ddb
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 0000000000..f1fc833e9c
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 0000000000..9ca39fce99
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 0000000000..ab9cd50150
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 0000000000..a805a9fe34
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 0000000000..f3df881028
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 0000000000..4e65783bfd
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 0000000000..516eb98afb
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 0000000000..89326187fb
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 0000000000..b899d241e7
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 0000000000..a13d0b8c92
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 0000000000..897c8af412
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 0000000000..7acaf3e280
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 0000000000..c24cb60730
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 0000000000..f0789f0b59
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 0000000000..8471ef972a
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 0000000000..985678e804
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 0000000000..b85d905466
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 0000000000..e7cdd5b69a
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 0000000000..00f91851cb
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 0000000000..a82ddfb140
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 0000000000..d4140998d3
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 0000000000..ed08c11d2b
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 0000000000..4d8208bbe1
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 0000000000..aed10e4c38
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 0000000000..21b1243f7d
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 0000000000..f8d2f531dc
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 0000000000..27ea100413
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 0000000000..e6c6bccfff
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 8b0d570734..79b9ed91ff 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 0000000000..c59baa4f7e
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 0000000000..4922909edf
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 0000000000..d80252bb5b
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 0000000000..1870b9ea11
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 0000000000..70dba3b912
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 fe1c0772b7..ca077edb9f 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 0000000000..3f7c50560f
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 0000000000..955e6875bb
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 0000000000..d4cf3d5619
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 0000000000..df806fe523
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 0000000000..03fad70d6e
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 0000000000..62a0e89459
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 cf335766a1..0000000000
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 471c048fa2..8c102ea49d 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 0000000000..35a77d3ec6
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 0000000000..50e9d87cd5
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 0000000000..20265c357a
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 01e380bcf6..e8364a6f97 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 0000000000..18b9502a83
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 0000000000..02af90bedc
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 0000000000..2f46bdfc4a
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 0000000000..c0f14dbde9
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 0000000000..46504c4dec
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 0000000000..b2d809725e
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 0000000000..892e43bd6a
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 0000000000..e9668ae1d8
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 0000000000..f891cc952f
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 0000000000..8295da5a87
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 0000000000..549596cc7c
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 0000000000..e8364a6f97
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 0000000000..18b9502a83
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 0000000000..02af90bedc
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 0000000000..2f46bdfc4a
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 0000000000..c0f14dbde9
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 0000000000..46504c4dec
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 0000000000..23fa26e4ce
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 0000000000..846272e367
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 0000000000..43a7879d24
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 0000000000..857488da67
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 0000000000..57fbc8512f
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 0000000000..9cefdba7eb
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 0000000000..ab63e2f4f0
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 bb7276c32e..fe2a128793 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 0000000000..ee1b999e0d
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 0000000000..b97fbf42e3
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 0000000000..9079f60b81
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 0000000000..decc0b5892
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 0000000000..e3e3e89cb1
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 0000000000..5a5f36684e
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 788071275e..72d987aadc 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 0000000000..8d87aab277
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 0000000000..39a19cd401
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 0000000000..73bedb2c02
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 0000000000..36413ab8cf
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 0000000000..1cb1b661b9
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 0000000000..95e838852b
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 0000000000..549d03fdc7
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 20e7ca5be3..bb4de70715 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 0000000000..992338bb2b
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 0000000000..aadc06129f
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 0000000000..8ad10be116
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 0000000000..695c4a6cb9
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 0000000000..3457e01312
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 0000000000..d2de8252bb
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 0000000000..d4463a0147
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 0000000000..17833f535a
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 ef52b6424c..cd2459518e 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 ef52b6424c..cd2459518e 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 4761d01655..53121e555a 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 0000000000..cf97894508
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 0000000000..7cbd07cef3
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 0000000000..28712de519
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 0000000000..826e38b1b3
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 0000000000..7f16d0a66d
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 0000000000..3eba365766
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 0000000000..b9659e99a3
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 2c7b22a423..ba7fb373ba 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 84328c865d..2d5622664b 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 f0bc0bf7e7..57a9ff5b9e 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 0000000000..1e1a7ef931
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 0000000000..ee2192aa47
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 0000000000..556c1d9b21
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 0000000000..7fd812e24d
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 0000000000..e24f516b29
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 0000000000..57a9ff5b9e
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 0000000000..1e1a7ef931
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 0000000000..ee2192aa47
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 0000000000..556c1d9b21
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 0000000000..7fd812e24d
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 0000000000..e24f516b29
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 0000000000..f752e9cdf3
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 0000000000..78e8c2577b
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 0000000000..2e4e5a891d
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 0000000000..ee9fd92c8d
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 0000000000..6f663ca4c0
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 0000000000..f49e7054c9
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 0000000000..07d5cd56f0
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 0000000000..1923fbd8e9
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 0000000000..a6e57fc30b
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 0000000000..48e8121256
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 0000000000..cdefbc9340
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 0000000000..de7de0327a
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 0000000000..25324ab420
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 0000000000..9213660c02
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 0000000000..8fb22bc29e
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 0000000000..3a2bd0bb5d
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 0000000000..812a7372cd
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 0000000000..41666caafa
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 0000000000..345829e2a3
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 0000000000..afb85f1b1b
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 0000000000..d16e809555
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 0000000000..e6c2cbe329
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 0000000000..88c57c45cd
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 0000000000..e955eecd00
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 0000000000..f505b371fd
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 0000000000..443c1a5e93
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 0000000000..0ec48392c2
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 0000000000..cd57822d80
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 6b546277d3..b844baf25b 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 6b546277d3..b844baf25b 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 0000000000..1e37d79d5d
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 0000000000..45914c48c7
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 e16a5a5afc..f4aa3f3320 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 0000000000..9ab60df7b7
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 0000000000..052dcce75f
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 0000000000..13953da5d7
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 0000000000..e405151e2d
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 0000000000..fb6c4a4d37
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 0000000000..23c9d9a762
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 1e425523f8..ff2bfa73c3 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 0000000000..daaa26cc16
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 a3f3104aab..06b01f625a 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 f388e6454a..8e7851dcce 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 0000000000..7293f79922
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 0000000000..e1aca08cc4
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 0000000000..e9e36b07d8
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 0000000000..5fc7c20170
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 0000000000..b32f8a97d5
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 0000000000..482a4698d1
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 0000000000..faf146004d
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 0000000000..27ba65f98b
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 0000000000..cb7608b4e9
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 0000000000..6498b6f082
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 0000000000..0bac0f4cd4
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 0000000000..8e7851dcce
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 0000000000..7293f79922
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 0000000000..e1aca08cc4
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 0000000000..e9e36b07d8
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 0000000000..5fc7c20170
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 0000000000..b32f8a97d5
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 f60796c680..a89ddf2dbf 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 0000000000..574acba100
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 0000000000..d15d10aece
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 0000000000..962a6171b9
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 0000000000..004a11d830
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 0000000000..f3b98d3f93
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 0000000000..f2b1542b1a
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 0000000000..3d3c694a96
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 0000000000..dda7ddd74c
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 0000000000..eaebaeec5c
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 0000000000..119e3424f2
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 0000000000..ed25cd1377
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 0000000000..81ea711e8c
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 0000000000..3dfb147dd8
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 0000000000..c8f0791806
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 0000000000..a409be9d6e
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 0000000000..a053dbd980
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 0000000000..e16633321f
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 0000000000..4634976b5e
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 0000000000..f0003c09eb
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 0000000000..39c7357546
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 d81cd30634..2cdb61d84d 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 0000000000..d83e330d98
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 0000000000..24843bf1fc
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 0000000000..2c5502b0ec
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 0000000000..b0596ed042
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 0000000000..285153bcb4
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 0000000000..8796829b87
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 0000000000..b36f41960e
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 0000000000..dc1441fea5
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 0000000000..abc19e06c7
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 0000000000..c90549f681
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 0000000000..5152c9c1a3
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 0000000000..665bce6c46
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 0000000000..98802367ce
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 0000000000..f17d204e7f
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 0000000000..afa3871298
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 0000000000..9443440bf8
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 fb6a0cc690..8fe6dc8f16 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 0000000000..7cee24d816
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 0000000000..033fd6c050
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 0000000000..b225a2163f
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 0000000000..b55baa7993
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 0000000000..abb1c09fb8
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 0000000000..bcd7113141
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 0000000000..59e0df087e
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 cb0d26f5a9..af2da0876d 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 c9043c238d..20ac2e2a96 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 9369fcc06b..9ebc934a30 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 0000000000..6f220c4b0b
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 0000000000..59c9be1801
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 0000000000..e3c3b4d0e1
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 0000000000..b4d579904a
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 0000000000..cb9823d24f
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 0000000000..9d316e5ba5
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 0000000000..ec99aeb164
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 0000000000..f217c930a7
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 0000000000..905115e712
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 10d438ca2f..44189c349b 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 0000000000..f4c74d1d49
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 0000000000..69aace7555
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 0000000000..2e4399d762
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 0000000000..fb66ba11c4
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 0000000000..6d9b2fc8cc
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 0000000000..c5d52f5c7a
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 0000000000..3d4288d10d
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 0000000000..6ff36c07cb
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 0000000000..c25d42927d
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 0000000000..2a564db426
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 0000000000..ebd14eecd0
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 2b48135fdc..24934af650 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 0000000000..b449d67794
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 0000000000..d9eab9434c
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 0000000000..2bb23697b7
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 0000000000..34f4eed2d5
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 0000000000..6219ae26cc
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 97d8c722a5..6219ae26cc 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 81e227d7e0..f0820a8c33 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 0000000000..d8a6229d6b
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 0000000000..71330d66a8
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 0000000000..a1345ecbd2
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 0000000000..016b920bcd
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 0000000000..4591eb5290
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 0000000000..19be3236ae
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 0000000000..064b747aae
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 0000000000..7c8f518c95
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 0000000000..124d99647d
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 0000000000..f7fe84e334
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 0000000000..5b483c06ad
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 0000000000..d557856b3f
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 0000000000..e9404fd525
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 0000000000..8817578cf0
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 0000000000..0e9bf46e0b
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 0000000000..918e3d435a
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 0000000000..0c01143530
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 0000000000..fed226dac2
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 0000000000..65a0790d92
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 0000000000..7260df1d15
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 0000000000..d14580a3db
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 0000000000..9313ab2116
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 0000000000..f432b554b3
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 0000000000..dc7087e028
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 af55a33bfb..ac6a6c2c9f 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 0000000000..4dad1da7db
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 0000000000..739f1de58c
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 0000000000..62a23de466
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 0000000000..2cd9628b76
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 0000000000..85bfaeb578
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 0000000000..f6e78cc448
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 0000000000..d26f97cb5b
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 0000000000..ff83f6d7d1
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 0000000000..e40e865a49
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 0000000000..c04215ecc2
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 0000000000..bd07cc52fa
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 0000000000..ef2293b441
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 0000000000..9cb90bf69d
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 0000000000..97549816c8
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 0000000000..33332b7365
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 0000000000..bbb5523f93
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 0000000000..b26fa86ac2
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 0000000000..749e9f38ae
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 0000000000..4f5f474d82
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 0000000000..3e3d79bca5
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 5dee653646..010da4d208 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 0000000000..df63dcc4f4
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 0000000000..64b9998541
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 0000000000..95c79b224d
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 0000000000..a9724649fa
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 0000000000..23e564b81a
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 0000000000..606aa69ee1
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 0000000000..35de883a4a
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 0000000000..b5d8fcb9c2
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 0000000000..9a5e8ff555
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 0000000000..e49bf34802
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 0000000000..4e217f472f
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 0000000000..ab8626df33
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 0000000000..22d016c6cc
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 0000000000..891f49d800
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 0000000000..f1704b8e3a
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 0000000000..97cd384d0c
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 0000000000..be01ef70a6
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 8628dba3bf..f921a890da 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 0000000000..e850849c39
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 0000000000..515aab771a
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 0000000000..70d08af505
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 0000000000..a41fd4f55e
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 0000000000..6ecd39fe4c
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 0000000000..827f7f97ef
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 0000000000..0295c5d10e
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 0000000000..9f147d7cf2
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 0000000000..9134c28476
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 0000000000..23d13f0b16
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 0000000000..c8872ee52e
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 0000000000..fe7b77444a
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 0000000000..13b912f19e
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 0000000000..6bdbeca111
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 0000000000..b062756c45
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 0000000000..86f0ae990b
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 0000000000..29f3fc63ab
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 0000000000..566f93771b
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 0000000000..f319e4af5d
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 0000000000..c1652f098c
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 0000000000..92fe65ff97
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 0000000000..0bf22ab60d
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 0000000000..13ab6c5e90
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 4029c7552a..aa6690d790 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 0000000000..5646de0622
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 0000000000..3f097365d9
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 87a39c56fa..973f479afb 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 0000000000..c6392b40a6
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 0000000000..b5f4f2999a
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 0000000000..7ca74c419e
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 0000000000..0e99fe45b1
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 0000000000..91faf90cf5
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 0000000000..0715623063
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 0000000000..8d764bf4f3
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 0000000000..bd07cc52fa
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 0000000000..ef2293b441
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 0000000000..9cb90bf69d
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 0000000000..97549816c8
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 0000000000..33332b7365
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 0000000000..cb41df5b94
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 0000000000..40b083f97b
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 0000000000..26896b869a
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 0000000000..db14aa23f9
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 0000000000..1e556c70f2
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 06ae366e5f..71d6e55ae0 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 0000000000..d965748c88
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 0000000000..5b63304634
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 0000000000..5ff2e3c432
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 0000000000..6b6241fefc
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 0000000000..ddc0648e8e
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 0000000000..04918ba738
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 0000000000..9116d6ee9a
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 0000000000..ada39abc33
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 0000000000..5ec0ddf76b
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 0000000000..dd91dd02fa
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 0000000000..d3e3618184
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 0000000000..a00e9eb039
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 0000000000..2d2fabb6ec
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 0000000000..5f7f4ec891
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 a0ada98dc1..a0a5e8698e 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 0000000000..2ec356843f
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 0000000000..b9a98edea9
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 0000000000..ab8b2f2265
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 0000000000..2c925ab782
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 0000000000..041f707117
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 0000000000..05a929944d
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 0000000000..f5511a8416
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 0000000000..b836c259f3
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 0000000000..3eb0bb8521
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 0000000000..b1004a4f04
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 0000000000..570a5d52d9
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 de231d06c7..6aeb938679 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 0000000000..f51ae1d0ff
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 8cf5954690..894f1b62c2 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 8713450504..af92b7244a 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 8cf5954690..894f1b62c2 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 2c7b22a423..ba7fb373ba 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 09bac6b7de..7b456ff579 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 e2ee0c1710..d47d078657 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 09bac6b7de..7b456ff579 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 ec793adc74..3da4abbbc3 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 0000000000..af14c94a4f
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 0000000000..7e8bd4c6ad
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 0000000000..a65c925100
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 0000000000..527e2055be
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 0000000000..35a4c34bc7
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 0000000000..3a75748ef9
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 0000000000..db1c8f050c
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 8a2c6cc320..e18572e405 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 0000000000..bd7ea42aa4
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 0000000000..f0708d24fb
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 0000000000..9ecd50830a
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 0000000000..f736e8afd3
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 0000000000..d387aac9c2
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 0000000000..37a9048ad7
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 0000000000..6ddd74b586
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 0000000000..1d901925fe
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 0000000000..5fcac72a70
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 0000000000..74fa972cad
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 0000000000..5cdfab6d9a
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 0000000000..a469f9b420
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 0000000000..a8803b8816
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 0000000000..2d9def823e
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 0000000000..bbcb6dc0d3
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 0000000000..e745d8b339
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 0000000000..b9cf0595de
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 0000000000..e5cee4c1d9
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 0000000000..4d85ea358a
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 0000000000..07f83be74a
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 0000000000..8918f6323d
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 0000000000..5fa8f64243
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 0000000000..8ddd0ea893
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 0000000000..9278077e53
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 0000000000..e580c7cb64
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 0000000000..888c2e010f
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 0000000000..358c2c878b
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 0000000000..ebe5b4b0eb
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 0000000000..a2d3d552bb
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 0000000000..385867923f
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 0000000000..21a811c997
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 0000000000..88082b4082
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 0000000000..8918f6323d
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 0000000000..5fa8f64243
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 0000000000..8ddd0ea893
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 0000000000..9278077e53
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 0000000000..e580c7cb64
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 66c80027f4..a0255d2e78 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 16a2647892..017fb91638 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 c6c9d31922..09d8d0e308 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 0000000000..ad220c2eef
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 0000000000..1679d4c5b9
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 0000000000..992338bb2b
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 0000000000..aadc06129f
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 0000000000..8ad10be116
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 0000000000..695c4a6cb9
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 0000000000..3457e01312
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 0000000000..e81681a603
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 5018b04fcb..c8092aac54 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 5cb78bd0c9..c5b0e8bd9c 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 0000000000..ab648dd83d
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 0000000000..8a864a00bd
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 19f91b44b4..8a864a00bd 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 0000000000..2b16324878
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 79d6908130..9e499840f6 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 56b905e6f2..72560f2e25 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 0000000000..37316291ca
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 0000000000..d57f25f2d8
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 0000000000..8457e4894f
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 0000000000..98db5207f7
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 0000000000..a8cea7bd6d
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 0000000000..72560f2e25
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 0000000000..37316291ca
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 0000000000..d57f25f2d8
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 0000000000..8457e4894f
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 0000000000..98db5207f7
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 0000000000..a8cea7bd6d
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 0000000000..621b0acc04
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 0000000000..0bee4147be
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 0000000000..f51db26321
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 0000000000..e61c949d0d
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 0000000000..b21bb84ca6
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 0000000000..cc2a55e767
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 2d5d3a83b0..10ab7874a0 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 0000000000..6c124f83ee
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 0000000000..ebaf30c906
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 0000000000..230bc7a138
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 0000000000..3418e92377
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 0000000000..015e260ba4
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 0000000000..10ab7874a0
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 0000000000..6c124f83ee
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 0000000000..ebaf30c906
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 0000000000..230bc7a138
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 0000000000..3418e92377
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 0000000000..015e260ba4
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 731947e888..e28ae6ff4f 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 0000000000..01418f1a8d
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 0000000000..cde0a28703
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 0000000000..a9b8ba20ce
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 0000000000..e14cb3884a
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 0000000000..54b0cb838b
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 0000000000..114138c0b6
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 0000000000..a45a988ff5
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 5712e64dfa..b892cbd753 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 0000000000..de81c048d0
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 0000000000..fa20a00808
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 0000000000..ba3f9a1cdb
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 9af2d28bb7..fd2297327f 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 0000000000..2a5e77872a
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 0000000000..a71ab0f5c8
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 0000000000..f1309c6012
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 0000000000..76ce5987f3
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 0000000000..fa476d8f99
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 0000000000..bbfcbd18df
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 00c384c5d6..63ee7b9131 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 ef004f4ecb..81715516af 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 0000000000..59954eccbc
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 0000000000..2f4d619997
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 0db8249b13..3f9041ac17 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 0000000000..73653eee2b
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 3e9b3bf955..de918c6a29 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 6b0d18e53f..2215d4642f 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 1efe91af5c..9960ab5065 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 38d004fa68..55ea2a5693 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 0000000000..f6411e5444
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 0000000000..24a81ca396
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 0000000000..712bc73000
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 0000000000..77139915b7
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 0000000000..f326d7825d
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 0000000000..de9106c369
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 0000000000..2d32427625
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 0000000000..a7af1346e5
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 6547329774..8ef72161fe 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 0000000000..e69ca6add1
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 0000000000..300f700fcc
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 0000000000..856894743d
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 1ecf099ca0..7cd17c20e6 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 b60d354d76..68ace29904 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 0000000000..ee15abd993
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 0000000000..419cc70376
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 0000000000..e45d741b47
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 0000000000..816f090002
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 788071275e..72d987aadc 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 0000000000..8d87aab277
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 0000000000..39a19cd401
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 0000000000..73bedb2c02
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 0000000000..36413ab8cf
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 0000000000..1cb1b661b9
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 0000000000..4cf2332d20
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 0000000000..5248152aba
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 990c260628..f229efebf1 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 dec2ce4354..09fe52fa17 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 c9598b96b0..a4cffe7aca 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 0000000000..01805b1fe7
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 55bd19842d..0a7e19d0be 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 0000000000..feb77c5dac
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 0000000000..6934d93973
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 0000000000..e7705b515e
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 0000000000..76d7ae664b
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 0000000000..6ea7b53462
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 0000000000..70398fd097
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 0000000000..feb77c5dac
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 0000000000..6934d93973
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 0000000000..e7705b515e
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 0000000000..76d7ae664b
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 0000000000..6ea7b53462
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 125521645e..ff62e35880 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 6b77a14a23..587e506d98 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 0000000000..a25d5ea4d4
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 0000000000..f100fd13a4
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 0000000000..775a8b2f2b
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 0000000000..c9703ba994
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 0000000000..55cc03db8d
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 0000000000..89e96a6120
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 0000000000..9b716032fd
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 0000000000..6dfbe6eae2
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 6784909fff..47399184f7 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 46b6e25092..4726416680 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 de25c5699f..104ab4e73a 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 d2b189233b..ea9ae4eb56 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 717af143c6..315fdb0578 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 0000000000..b1801ae41f
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 2c2ae47882..74f312e46e 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 0000000000..a4f4993821
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 0000000000..f18d508430
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 0000000000..7218327420
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 0000000000..b3372f66d7
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 0000000000..245ed27301
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 93df265fb2..b6c90da48d 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 d73b56cff4..abefab7234 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 0000000000..abefab7234
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 674f4df95c..faf0b07ede 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 4900e92753..28b1b60076 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 0000000000..8f2b9bbe9e
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 0000000000..e4476e1880
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 0000000000..209fffeaed
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 11fe57f6f9..9edaecce85 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 0000000000..d40f1c75c8
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 0000000000..58f47bcd9b
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 0000000000..c7cbc6967c
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 043e4950ac..6d38507079 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 fb02e2d7ed..4dc8ee44d1 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 35bf617ae2..29979fb696 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 ce0b69cc38..212bd89406 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 0000000000..8cd3bd7e57
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 0000000000..b8ebfe080a
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 0000000000..960cba2bf7
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 6b77a14a23..587e506d98 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 0000000000..a25d5ea4d4
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 0000000000..f100fd13a4
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 0000000000..775a8b2f2b
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 0000000000..c9703ba994
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 0000000000..55cc03db8d
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 0000000000..8e1b95f60e
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 0000000000..f15b9be56d
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 0000000000..e213bf7e40
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 0000000000..90fefd0cab
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 0000000000..d7686f8b60
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 0000000000..92eafffe94
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 0000000000..7943b73f67
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 0000000000..b05828b47c
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 0000000000..ddfd25fd22
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 4ca5f1e8f6..0ad57f80a4 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 0000000000..7da8183f39
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 71ba5b434a..10758831eb 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 01ccebbb90..708d29b733 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 0000000000..cf08756ebf
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 a753271107..9471d8e545 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 0000000000..f5dca14bd2
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 0000000000..3974a07328
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 0000000000..3ceb40a9ec
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 0000000000..ef892f1f88
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 0000000000..90af3591e0
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 3cf2e455b1..5a9c57a7be 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 d34fcfdc45..a8ebb68584 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 0000000000..970d76a988
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 0000000000..a6ccac92ea
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 0000000000..e329c3cdd2
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 0000000000..10e2c7dac9
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 0000000000..6ae6255db9
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 0000000000..a8ebb68584
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 0000000000..970d76a988
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 0000000000..a6ccac92ea
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 0000000000..e329c3cdd2
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 0000000000..10e2c7dac9
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 0000000000..6ae6255db9
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 0000000000..5a5e1cefda
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 0000000000..c66e258d1c
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 0000000000..0e9b7989d6
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 0000000000..50f43ce070
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 0000000000..99d3d27535
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 0000000000..f30dff2f5a
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 0000000000..48afc4adac
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 db6873e592..ffe8a7f7fe 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 0000000000..e4427cbd15
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 0000000000..004a11d830
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 0000000000..fb5ee97ba2
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 bbacee36f7..3ceaa5bf38 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 0000000000..3b46fe18ab
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 784fc80a32..63c6cc807c 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 7fa40aa218..030252ec90 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 0000000000..b6872252b2
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 0000000000..2bb3abf6ea
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 0000000000..bd8139b2da
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 0000000000..32252de704
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 0000000000..d180cb675b
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 0000000000..030252ec90
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 0000000000..b6872252b2
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 0000000000..2bb3abf6ea
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 0000000000..bd8139b2da
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 0000000000..32252de704
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 0000000000..d180cb675b
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 0000000000..9963221f61
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 0000000000..59dad2c3e1
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 0000000000..66e962335c
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 0000000000..9414644c3e
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 0000000000..ebde0eb37c
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 0000000000..d294454be9
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 0000000000..e0caa61ba6
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 0000000000..53606f3e07
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 e48b3960b0..0064516f1b 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 0000000000..d8811a5638
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 8e395d91db..14247eb307 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 424685f2a4..02ad12d282 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 0000000000..dde348b40d
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 0000000000..7b3697952d
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 0000000000..08aa6a4843
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 65d0cdf409..eb67d0ef81 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 0000000000..d4026fea32
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 1fe48e32ff..19a6fdb7e5 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 cb305644f2..749e9f38ae 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 8174a68198..efa940750b 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 1a982903ce..6cbddd76d6 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 0000000000..81499f1616
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 5539251aa4..c9440239c0 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 cdd7ca9db3..ed9281a364 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 0000000000..a3c768cdd0
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 0000000000..2737de44b5
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 0000000000..3b87d1364c
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 0000000000..4a8ea96d5b
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 0000000000..3bec88e6af
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 0000000000..e68d1b077a
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 0000000000..0123a0f8a1
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 0000000000..19a0e46389
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 0000000000..209c0e4e5b
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 0000000000..9deccd899a
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 2f12f47306..9ef50eda88 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 fd5681ab7e..c7ff0c963c 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 0000000000..6706def991
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 0000000000..63e5492220
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 0000000000..aec62f49f4
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 0000000000..92e1fe7d22
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 0000000000..813113bb9c
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 0000000000..a2f29fdac9
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 0000000000..fa68bdb53a
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 0000000000..03f5030410
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 0000000000..a117cff357
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 0000000000..baa70f4a21
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 0000000000..59d41fc875
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 0000000000..3726ca85ac
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 0000000000..505a1d8540
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 0000000000..7a542547e0
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 0000000000..f42f868631
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 0000000000..bfff80acf4
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 4a5d5c956f..41074daeac 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 0000000000..fd843824ed
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 0000000000..3b6fc16379
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 0691384218..c2258edc12 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 f1334c882d..c441c89305 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 098821a2e1..744c7e9586 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 27c1d3c5cc..51b66575a6 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 0000000000..14355ce15f
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 0000000000..dff4791d41
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 9782c78dde..c71d3a89cb 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 9eaab4257d..08fb02b1ca 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 0000000000..4723c7947a
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 394ff4acac..d617275fcd 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 0000000000..78db9d6036
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 0000000000..2691b42f09
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 043a7ac810..829f5ffdfc 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 0000000000..a0729e2c29
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 0000000000..bb04d27666
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 0000000000..60fad11afc
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 3ca9cd0232..572ce89681 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 ed10e54073..1e7e303e10 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 4a2a92931a..bf1afc8459 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 00d828d9d4..204ac0670d 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 0000000000..9541a9fe43
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 0000000000..ad2a6622e4
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 0000000000..d24b4e827b
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 e149b9f0f1..869523fd2c 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 d12db22ecb..2bb23697b7 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 7c5deb816f..15ac7fdbd5 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 60db927181..7b53a8b310 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 60db927181..7b53a8b310 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 0000000000..0aac4c4b1e
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 0000000000..d695a5cac0
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 0000000000..8196541e26
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 0000000000..450853eca4
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 0000000000..2352c2610b
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 0000000000..c268b7f0b2
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 88575a6d26..0a54bd6834 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 0000000000..0b0dc895af
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 0000000000..5594f49259
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 0000000000..242e53e459
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 0000000000..a6362e8500
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 0000000000..1013715b9a
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 0000000000..962288bd17
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 0000000000..154f2b6e35
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 0000000000..540b48d887
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 0000000000..b05d3bad9a
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 0000000000..2bd9a7b71b
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 0000000000..c88f4ad73b
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 0000000000..ebf4b69315
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 0000000000..a91fed8815
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 0000000000..e2b7cff1d8
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 0000000000..f888ea9435
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 0000000000..5cdfab6d9a
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 0000000000..a469f9b420
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 0000000000..a8803b8816
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 0000000000..2d9def823e
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 0000000000..bbcb6dc0d3
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 0000000000..6245929457
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 0000000000..5cdfab6d9a
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 0000000000..a469f9b420
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 0000000000..a8803b8816
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 0000000000..2d9def823e
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 0000000000..bbcb6dc0d3
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 671bb16050..620e3d3b36 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 0000000000..8972ced603
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 0000000000..1f171060ba
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 0000000000..ad9da430ec
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 0000000000..47e4491eb3
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 0000000000..a530b5481a
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 0000000000..620e3d3b36
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 0000000000..8972ced603
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 0000000000..1f171060ba
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 0000000000..ad9da430ec
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 0000000000..47e4491eb3
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 0000000000..a530b5481a
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 0000000000..5541bff1ed
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 0000000000..3e8f7832c4
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 0000000000..3876ee6e63
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 0000000000..0aad2bc840
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 0000000000..c4d8fc9c35
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 0000000000..54cb211d6b
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 0000000000..4672eabedb
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 076112a642..6d87561e56 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 304b214f04..62e28e168b 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 0000000000..3d18499924
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 0000000000..865d825c20
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 0000000000..77ffe01a60
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 0000000000..1d869f74c0
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 0000000000..66b5dbc074
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 ac630fc57d..ba45ce4cb5 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 e0fb05d5e0..be0473304d 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 0000000000..8d680f5b12
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 0000000000..e4e961d5d5
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 0000000000..bcdf20d175
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 0000000000..9b91906952
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 0000000000..c3ce145e9e
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 0000000000..be0473304d
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 0000000000..8d680f5b12
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 0000000000..e4e961d5d5
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 0000000000..bcdf20d175
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 0000000000..9b91906952
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 0000000000..c3ce145e9e
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 0000000000..2279709c85
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 0000000000..44c0ea20dd
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 0000000000..5f052fff2a
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 804862c064..ef892f1f88 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 804862c064..ef892f1f88 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 90af3591e0..544e6eafea 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 90af3591e0..544e6eafea 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 0000000000..a4e69ff073
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 0000000000..f89ef444f7
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 23e0fd17d4..b7b4e4f1f4 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 aa813db5c0..36be904476 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 0000000000..0fccb432f9
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 0000000000..32f6dbe3f8
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 0000000000..95ddc1752b
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 0000000000..2c8d8c0ebb
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 0000000000..040247f929
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 0000000000..59bef6499a
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 0000000000..1f10ebc442
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 0000000000..4b6fe289bc
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 0000000000..70d36d0287
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 0000000000..ab8ce935d1
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 0000000000..5513232d02
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 0000000000..cdd72ce56d
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 0000000000..51af665668
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 0000000000..f1505464c9
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 0000000000..f5716b1882
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 0000000000..5f8e97f970
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 0000000000..d07a48eaac
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 0000000000..124763691f
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 0000000000..cbda90bf9f
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 0000000000..133d630aae
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 0000000000..399f4807f8
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 0000000000..bb0785b502
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 0000000000..90454bc8b9
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 0000000000..fb47369863
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 0000000000..dcf2163a16
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 0000000000..00a3210107
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 0000000000..ea9400ce13
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 0000000000..9c90c090d7
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 0000000000..6745e5324e
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 0000000000..0862f45755
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 0000000000..c2a0c5583d
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 0000000000..2efbdb0954
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 0000000000..93d1697b83
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 0000000000..5e7da37f05
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 0000000000..d7dcd8dfc0
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 0000000000..22e9ab5b8d
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 0000000000..8124db7497
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 0000000000..2e3ad0ee37
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 0000000000..461a4dcb8f
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 0000000000..a1e2b6fedf
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 0000000000..8bb53fe834
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 0000000000..edb763b8c0
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 0000000000..b8b3875798
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 0000000000..50bca0a619
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 0000000000..f990a8c799
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 0000000000..bbdeaac778
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 0000000000..680f352c0a
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 0000000000..ec9fc0dd0a
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 0000000000..4108b65e64
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 0000000000..648fd207ef
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 0000000000..366f946a1c
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 0000000000..cfd3ac7270
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 0000000000..6da20434d9
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 0000000000..bdd57f781c
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 0000000000..7e0d10c1f0
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 0000000000..06e678a9db
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 0000000000..86876a9e63
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 0000000000..922e25ee9a
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 0000000000..cae11d9338
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 0000000000..302f1fbdd7
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 0000000000..ba942e11df
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 0000000000..943dc444e8
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 0000000000..901c7c2fb9
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 0000000000..be61917660
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 0000000000..3be5920c27
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 0000000000..5c3deb2d49
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 0000000000..7e0822fd89
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 0000000000..9427c61849
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 0000000000..710119d96b
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 0000000000..2a8d51aaa9
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 0000000000..37a7391cfe
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 0000000000..00c01f4dc7
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 0000000000..2dd109611e
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 0000000000..3029459512
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 0000000000..fd6be2cb76
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 0000000000..baec0ca3c5
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 0000000000..de62d29f06
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 0000000000..3ed967832b
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 0000000000..17b377b41c
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 0000000000..70fea252b0
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 0000000000..59cd972419
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 0000000000..410d6e42cf
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 0000000000..77c1ab6c3c
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 0000000000..bdb1f781ee
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 0000000000..18357b611a
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 0000000000..6ef43682bc
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 0000000000..5b46123bc2
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 0000000000..c13b55013e
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 0000000000..fb7ec93f0c
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 0000000000..731f747ab2
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 0000000000..52f1ac332d
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 0000000000..57ff251cbe
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 0000000000..8b21c5f954
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 0000000000..c09e12ad34
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 0000000000..25a5c4edd8
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 0000000000..9f1a2e79e9
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 0000000000..74118cdc89
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 0000000000..02a40bc83d
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 0000000000..28e04bc113
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 0000000000..f112c330bc
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 0000000000..dd3f628ee9
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 0000000000..debc8aa07e
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 0000000000..84b54c10bb
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 0000000000..e7aa385a93
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 0000000000..9d294761af
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 0000000000..bfc9f7b48c
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 0000000000..70ebc5bc4f
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 0000000000..3839c5eacd
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 0000000000..3ae10f1008
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 0000000000..1be387d41e
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 0000000000..9fbf38dfea
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 0000000000..349d86171e
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 0000000000..82a2b9f052
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 0000000000..07f59ab15f
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 0000000000..96578ef833
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 0000000000..3a613507ef
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 0000000000..439f929fb0
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 0000000000..f615d7ef3c
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 0000000000..4d919b0453
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 0000000000..60e3c075eb
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 0000000000..b02489086f
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 0000000000..f6488d3390
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 0000000000..05f82e2162
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 0000000000..26ceb12320
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 0000000000..7fca961910
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 0000000000..d98448f85b
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 0000000000..6f980a3716
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 0000000000..0fb8f0904a
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 0000000000..a802134793
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 0000000000..dcceb1add1
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 0000000000..41dc97c078
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 0000000000..d74e604a64
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 0000000000..931f1fd2bd
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 0000000000..2cb918f752
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 0000000000..f1cb4062e8
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 0000000000..5154939f5b
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 0000000000..a427628a98
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 0000000000..6b3731cac8
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 0000000000..511414ad6c
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 0000000000..af95435379
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 0000000000..355bdeb636
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 0000000000..8d0ad7202e
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 0000000000..3c49195f87
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 0000000000..884af5800c
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 0000000000..f4904a0f1c
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 0000000000..1629f28e0b
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 0000000000..be7cbbeb4e
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 0000000000..28845305df
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 0000000000..1831d062fe
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 0000000000..11fa66fd95
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 471c048fa2..8c102ea49d 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 d4173ad57e..8ec2032bf4 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 0000000000..37ac5fc089
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 0000000000..38606d2663
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 0000000000..84ae862921
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 0000000000..89644b2736
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 0000000000..c9e50cd352
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 0000000000..3a37c85041
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 bdea07940d..1c51124338 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 0000000000..3e7d4cbea5
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 0000000000..6faa14f55d
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 0000000000..c3af3c54d7
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 0000000000..1bf288fcd4
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 0000000000..edaefac65a
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 0000000000..7d1b849152
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 0000000000..27046532b7
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 0000000000..4ff2e84419
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 0000000000..8608661035
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 0000000000..c3d21d3ce9
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 0000000000..71e93c783c
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 0000000000..e886a316e8
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 0000000000..972a46a3ad
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 0000000000..9af4ac9bf8
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 65ba6962de..dae9aa96a7 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 0000000000..6a66119216
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 0000000000..9c02df9b5c
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 0000000000..67470782aa
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 0000000000..53a5eb2ccb
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 0000000000..8f30fc9e38
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 0000000000..36a4e57d1f
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 0000000000..77c57605e9
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 0000000000..58bcd6a2fc
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 0000000000..3bc6b5a57a
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 0000000000..50c4c6b272
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 0000000000..2ce958b920
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 0000000000..8d428869d4
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 0000000000..cd3dc01ab2
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 0000000000..f4f58e2e25
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 0000000000..0fd73782c2
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 0000000000..bb97419b7e
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 0000000000..302da0a4da
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 0000000000..b1479fbc18
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 0000000000..00942aede0
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 0000000000..2f2f0add07
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 0000000000..5aca11a07e
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 0000000000..d1006c6c19
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 0000000000..5a6759de63
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 0000000000..e3ff113cba
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 0000000000..1e5e815098
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 0000000000..846307fcf3
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 0000000000..1b1553a6b6
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 0000000000..459facc13b
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 0000000000..2e3a1fdd73
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 0000000000..f847acf58c
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 0000000000..5dbc804e86
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 0000000000..58141c9f3c
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 0000000000..701127a6f3
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 0000000000..15b26bec9c
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 0000000000..59b4ecf2a0
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 0000000000..bc634a8eee
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 0000000000..359af1cf4c
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 0000000000..3f56f3815d
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 0000000000..a068cf1ef1
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 0000000000..9cc4b5ebc1
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 0000000000..86cac87e56
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 0000000000..da8a82521a
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 0000000000..ed95128e19
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 0000000000..815a93ef0b
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 0000000000..21db689c71
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 0000000000..caab400018
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 0000000000..830578344d
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 0000000000..e068ef6339
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 0000000000..d28e457921
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 0000000000..4316867685
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 0000000000..50fadc5f6d
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 0000000000..1b1828182c
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 0000000000..d2c934ec3c
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 0000000000..d28e457921
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 0000000000..4316867685
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 0000000000..50fadc5f6d
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 0000000000..1b1828182c
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 0000000000..d2c934ec3c
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 0000000000..b832c5432a
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 0000000000..3b85e21a1a
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 0000000000..e1582e0427
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 0000000000..5f278dc149
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 0000000000..999feded29
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 0000000000..1d673a8a6d
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 0000000000..6bdb59978b
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 a3a45c3495..249b41af25 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 0000000000..ed22a6cb38
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 0000000000..4a2fdeb304
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 0000000000..b1f6e168d7
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 0000000000..f75b75a74e
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 0000000000..a9665b318a
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 0000000000..a42b3caf88
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 0000000000..e75dc9ec50
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 0000000000..ca401e5985
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 0000000000..5f6dded80b
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 0000000000..bb74e98818
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 0000000000..75f2fac760
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 0000000000..d9a2d20fc1
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 f4be93aaec..a010eea813 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 0000000000..66f963e17e
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 0000000000..dbe0c76d04
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 0000000000..643074dc66
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 0000000000..48a9133ef8
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 0000000000..96ebbfa880
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 0000000000..a010eea813
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 0000000000..66f963e17e
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 0000000000..dbe0c76d04
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 0000000000..643074dc66
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 0000000000..48a9133ef8
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 0000000000..96ebbfa880
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 0000000000..ddfc10739c
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 0000000000..cfc0056372
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 0000000000..68cac784e4
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 0000000000..33f6562810
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 0000000000..edf5caeb63
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 0000000000..74ccb1afaf
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 0000000000..5cc92e307e
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 0000000000..8aea4b35e0
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 0000000000..3a13c5b2a7
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 0000000000..9c71d80def
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 0000000000..26bfc70d38
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 0000000000..9a496854cb
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 0000000000..3313ce6bbf
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 0000000000..9643cf9dd3
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 0000000000..6626ede254
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 0000000000..19590a2424
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 0000000000..e6d33f831a
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 0000000000..0409760c7a
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 0000000000..51b55eaaff
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 0000000000..39cba5f9e7
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 0000000000..260dbfe0ad
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 0000000000..15abcc4969
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 0000000000..af9bd4d5e7
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 0000000000..91493ade75
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 0000000000..3697a723dd
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 9863b08a59..8c2dce713a 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 0000000000..801a577654
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 0000000000..88bd625195
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 0000000000..2e27c6faa1
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 0000000000..acd231d1a0
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 0000000000..946d5b36ca
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 0000000000..11afc0356b
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 0000000000..24a73f18ad
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 0000000000..88bd625195
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 0000000000..2e27c6faa1
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 0000000000..acd231d1a0
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 0000000000..946d5b36ca
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 0000000000..11afc0356b
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 0000000000..0f21e3e90c
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 0000000000..a0a1f554b5
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 0000000000..7f3410056d
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 0000000000..0f5b83bd92
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 0000000000..5730d0af22
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 0000000000..4cefe0dc04
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 0000000000..b0d88a73b9
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 0000000000..eae7e4dd5e
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 0000000000..dc95bb76a4
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 0000000000..598f291648
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 0000000000..f275eaf95b
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 0000000000..3f058b1b13
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 0000000000..f967f62157
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 0000000000..c8e889faec
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 0000000000..a68b1e6b58
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 0000000000..815538138b
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 0000000000..fb591aa4fb
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 0000000000..5adcffa4b9
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 0000000000..d166f981b2
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 0000000000..7c8cb50a78
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 0000000000..e113d8cb42
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 0000000000..b615e00e25
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 0000000000..1751a8e4a2
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 0000000000..a094eb0718
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 0000000000..65dc26ba1b
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 0000000000..b9cd75a065
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 0000000000..e3d2479344
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 0000000000..9f758979a1
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 0000000000..5e03a6d23b
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 0000000000..647e1c4d79
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 0000000000..5185700c63
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 0000000000..c519f8a954
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 0000000000..83e731cc34
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 0000000000..e7546fc1e0
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 0000000000..de37924757
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 0000000000..8da714140e
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 0000000000..2a26043c96
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 0000000000..f38a2f9334
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 0000000000..030123a63e
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 0000000000..2cd5a22f33
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 0000000000..90cb0894ed
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 0000000000..7199711913
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 0000000000..81c24d2c24
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 0000000000..c23ad6738b
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 0000000000..076a330a89
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 0000000000..0d54fbe067
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 0000000000..0a7ca06fb4
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 0000000000..8dccd471b8
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 0000000000..b9aaf46348
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 0000000000..82664ad79e
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 0000000000..68ccf48d0d
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 0000000000..2e5976e9d2
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 0000000000..aef0256e90
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 0000000000..1252c37a6d
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 0000000000..701127a6f3
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 0000000000..7780a4a036
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 0000000000..848a88be28
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 0000000000..70d8309d8c
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 0000000000..a344cb3ae8
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 0000000000..e0da30d5a6
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 0000000000..26b77c821c
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 9863b08a59..8c2dce713a 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 0000000000..33e50494a3
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 0000000000..7a0e4f1cb7
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 0000000000..81a69110e9
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 0000000000..b5c64c9cc8
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 0000000000..0763a8bd94
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 0000000000..3ed705b902
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 0000000000..740d09658e
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 0000000000..5706420297
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 0000000000..6958b7d8d8
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 5875e1550c..13a0c99fdd 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 0000000000..4f669a5cee
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 0000000000..420e5a4501
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 0000000000..7a043d8551
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 0000000000..90d35165f4
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 0000000000..cea7113aa9
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 0000000000..57450f33f8
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 0000000000..1114b6a3c6
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 0000000000..7943b73f67
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 0000000000..b987488447
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 0000000000..b610c05f29
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 646f950b50..67efed2e4d 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 0000000000..c409f9f4c4
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 0000000000..e76b533149
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 0000000000..c9025e34e4
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 0000000000..680f77b22d
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 0000000000..e765f50715
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 0000000000..3e39c0f398
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 0000000000..2eef1d6c17
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 0000000000..a34af9d64a
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 0000000000..ae8b600dfb
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 0000000000..db910f28bb
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 0000000000..05f5de395b
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 0000000000..543e9f90b9
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 0000000000..11b08e2d1e
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 0000000000..dcf043a510
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 0000000000..ae8b600dfb
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 0000000000..db910f28bb
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 0000000000..05f5de395b
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 0000000000..543e9f90b9
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 0000000000..11b08e2d1e
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 0000000000..fcb4278dc1
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 0000000000..00910385a2
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 0000000000..fa709b7ebd
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 0000000000..0b24a6171b
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 0000000000..993695eebc
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 0000000000..4f3747f67b
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 0000000000..d1e4afbaca
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 0000000000..9113cfcde1
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 0000000000..6e0c1756ad
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 0000000000..8cdbe0a180
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 0000000000..a1fd9fdd56
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 0000000000..d31a94ecf5
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 0000000000..e6c16e4ea0
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 0000000000..c8e9c1eace
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 0000000000..1f50d4f8ff
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 0000000000..a8181c3fee
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 0000000000..1156f31e63
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 0000000000..6933b45c7c
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 0000000000..5afee8672b
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 0000000000..b5e10de713
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 0000000000..50976e5e67
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 0000000000..0aaa1cf765
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 0000000000..1714e0d850
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 0000000000..6cc9a0e748
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 0000000000..117d8e025a
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 0000000000..54711bc774
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 0000000000..8539710a1d
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 0000000000..51ff3c68b8
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 0000000000..c6af6bd39c
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 0000000000..e89ccdec7a
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 0000000000..cf813f1885
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 186bd57c25..4f82b1e1da 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 0000000000..4436dee31e
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 0000000000..cdac0debb1
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 0000000000..4b2f313f9b
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 0000000000..e29bde1f8b
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 0000000000..09027a2fb2
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 0000000000..b66d427e09
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 0000000000..7f80f4ed57
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 0000000000..88558e4ab2
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 db1c4e4d9e..270386648a 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 0000000000..438ff8d178
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 0000000000..4d8f1e20d7
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 0000000000..e5e46ae1cf
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 0000000000..fbfa036302
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 0000000000..ee6919215a
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 7216a94c55..37c9d50af8 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 0000000000..cb96a35fa4
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 0000000000..37c9d50af8
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 766c519bc8..746bf11011 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 0000000000..0dae904d78
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 0000000000..821499e02c
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 0000000000..14a514ed42
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 0000000000..881e01a927
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 0000000000..606fe6a1ee
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 0000000000..588ece3f43
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 0000000000..de48ff449c
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 0000000000..e6fba4d9f6
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 0000000000..7ac4d13d68
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 0000000000..4b69bbdd94
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 0000000000..489a779bf6
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 8b5aca7215..d0d51d40ef 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 0000000000..3d0847166b
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 0000000000..f851132862
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 0000000000..9dcda7c654
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 0000000000..12c74ec607
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 0000000000..ebf07310b9
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 0000000000..517f25dddc
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 0000000000..cf86fbaad6
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 4214909267..edcdf7cfa4 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 0000000000..bbbdefa653
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 4fe4c5f23e..6269d3b91a 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 0000000000..0f24a98369
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 0000000000..f8b6dd873e
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 0000000000..15984024f2
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 0000000000..4689243a17
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 0000000000..861cbf808c
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 0000000000..5074876010
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 0000000000..505c908b18
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 8b5aca7215..d0d51d40ef 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 0000000000..38e992318c
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 0000000000..630fd66415
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 7a4fce76b9..e0da30d5a6 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 0000000000..2553a5dbf7
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 0000000000..d0d78350cd
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 0000000000..938b488ddb
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 0000000000..85532dadc7
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 0000000000..cd7c3d1f2b
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 0000000000..aed8f62e0b
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 0000000000..c6fbb4481d
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 0000000000..887f70e365
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 0000000000..84bb9ec9c5
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 0000000000..574c1d8aad
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 0000000000..10713c080b
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 0000000000..b04e39925e
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 0000000000..984a309cd8
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 0000000000..3ab7793390
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 0000000000..a564b18f51
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 0000000000..429938294b
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 0000000000..91e1de4e5d
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 0000000000..42821806e9
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 0000000000..9e8d3adb89
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 0000000000..88d190e392
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 0000000000..e6ab8ade74
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 0000000000..d97a84cea1
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 0000000000..5c1a61c16b
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 0000000000..1ff3b48b11
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 0000000000..87695616e1
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 0000000000..574c9af8e7
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 0000000000..11ea8046fd
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 0000000000..3786bd7148
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 0000000000..e32790925d
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 0000000000..69fb260b1e
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 0000000000..3ba9652f9a
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 0000000000..81f5c87934
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 0000000000..ea8d77c99a
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 0000000000..1a4d50e60b
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 0000000000..33fea49e37
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 fc282c49ad..33fea49e37 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 caa399544d..2a6ef392cf 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 1e1146dcd0..5c1a61c16b 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 0000000000..234c3fae1a
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 edd279c1c0..234c3fae1a 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 065e4bb395..e32790925d 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 3a8ecd5651..69fb260b1e 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 6fd87bc2dd..3ba9652f9a 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 70e7eba386..81f5c87934 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 65bc776461..ea8d77c99a 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 0000000000..407a5662b1
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 0000000000..1a466ab87f
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 0000000000..1e20cb4540
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 0000000000..5131a6545b
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 0000000000..e6ecd67fe2
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 0000000000..ece2fb9d80
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 0000000000..fd6469a8d2
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 0000000000..92035f6bb5
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 0000000000..06902980d6
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 0000000000..145d8a26a9
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 3ff0e14203..ece2fb9d80 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 ba07c3b93b..fd6469a8d2 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 162d2cb285..92035f6bb5 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 b761109252..06902980d6 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 2d499378f7..145d8a26a9 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 0000000000..5da7953f8d
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 c22de58cf4..9d5deb5aab 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 0000000000..5b4e672caf
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 0000000000..df504caef6
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 0000000000..09256e78ea
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 0000000000..5eda4bb864
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 0000000000..88b32740e9
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 0000000000..158912a570
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 0000000000..286c12b8fc
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 0000000000..5b568a36e2
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 0000000000..1fb87ca66c
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 0000000000..af96a90dc0
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 0000000000..2c86532aeb
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 0000000000..f7c3f6c98b
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 0000000000..55b1ed472b
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 0000000000..fd15cbfec1
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 0000000000..fb90f8da45
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 0000000000..1075d2a8d7
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 0000000000..6599c83280
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 0000000000..14dee31207
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 0000000000..2c4433c9b6
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 0000000000..1914089b75
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 0000000000..59a233c5f2
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 1e284bf610..5c85432a26 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 646f950b50..67efed2e4d 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 766c519bc8..746bf11011 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 7a4fce76b9..e0da30d5a6 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 ec24be1683..7943b73f67 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 099c1c49f9..ad2a6622e4 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 72465f2f9d..13bbb1b1f8 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 157eb85d65..cca79ffb9d 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 f711c775b9..82486f8812 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 9b23019f39..3ecaefd941 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 b8aa8dd603..450853eca4 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 0000000000..1c33f99fcb
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 0000000000..a173766cef
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 0000000000..94788d7f1b
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 0000000000..7d5c862855
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 0000000000..94a8cdca40
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 0000000000..aa1511a56c
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 a5d7e4f82e..3800d04076 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 0000000000..02e6d297b0
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 ec24be1683..7943b73f67 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 0000000000..e6eff0fa6e
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 0000000000..b67d58af24
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 0000000000..8e67281736
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 0000000000..ecc9bec0fa
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 0000000000..4214909267
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 0000000000..4ec64d8ef5
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 0000000000..596c3de38a
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 0000000000..fa79ccd5e0
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 0000000000..3a4793ec93
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 0000000000..9701d81ee0
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 0000000000..d13e351ce2
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 0000000000..93b558b50d
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 0000000000..925ebd2660
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 0000000000..f43aa390fa
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 0000000000..b93713bc01
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 0000000000..ab6e3557e9
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 0000000000..72d4d6cf40
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 0000000000..901ef717a7
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 0000000000..ac5ed367d2
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 0000000000..fe6bdc0780
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 0000000000..6e8798d334
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 0000000000..56655292b8
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 0000000000..d7661ab8d5
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 0000000000..7f0c702f9f
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 0000000000..6563b2a69f
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 0000000000..707ca2a121
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 099c1c49f9..ad2a6622e4 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 0000000000..f0eddcc91a
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 0000000000..673f81ef6f
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 0000000000..f1b8829dba
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 0000000000..cbe9f11a12
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 0000000000..be0e85d289
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 0000000000..6eb9b6d7ee
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 0000000000..b06266afd7
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 0000000000..9de9567690
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 0000000000..0357f948a5
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 0000000000..3445626aaf
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 0000000000..1a11dd2c56
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 0000000000..2b504c0693
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 47fc34cff1..aa07ecc1e1 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 0000000000..a7c98bcfa7
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 0000000000..d465d903fb
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 0000000000..1d90f601f5
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 0000000000..34581810df
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 0000000000..a2636a1cf6
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 0000000000..aa07ecc1e1
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 0000000000..a7c98bcfa7
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 0000000000..d465d903fb
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 0000000000..1d90f601f5
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 0000000000..34581810df
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 0000000000..a2636a1cf6
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 0000000000..a70839fa13
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 0000000000..0d87c8c1de
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 0000000000..43e57aa73a
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 0000000000..8f8c5f94b9
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 0000000000..a79d6f6935
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 0000000000..38db39f385
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 0000000000..afd9de68b5
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 0000000000..c274ffb629
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 0000000000..354c43b176
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 0000000000..31c8707a43
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 0000000000..87f17a6ff2
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 0000000000..c9c437901d
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 0000000000..d291c89c97
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 0000000000..989998e96d
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 0000000000..7face0a672
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 0000000000..6c029bdf97
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 0000000000..1b24ae62b2
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 0000000000..34fdb89bbd
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 0000000000..44cb5e0854
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 0000000000..5c367842d0
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 0000000000..25998daf8b
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 0000000000..9978559be5
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 0000000000..46588b0916
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 0000000000..37596de848
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 0000000000..b7e7259bc8
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 0000000000..f92e78a324
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 0000000000..dd1482188c
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 0000000000..c2ab6fb507
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 0000000000..2ceb411ad2
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 0000000000..fd9bc6b643
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 0000000000..fbf274a6db
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 0000000000..02525ee727
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 0000000000..22f5d039ec
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 0000000000..de404b58c9
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 0000000000..081dc539c4
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 0000000000..461d6b961d
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 0000000000..c6b92d608f
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 0000000000..8998b79e77
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 0000000000..38b68acaa2
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 0000000000..61c0c58eb5
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 0000000000..b1ba7f551d
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 0000000000..fd9bc6b643
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 0000000000..fbf274a6db
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 0000000000..02525ee727
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 0000000000..22f5d039ec
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 0000000000..de404b58c9
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 0000000000..53d2160f9a
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 0000000000..17390989cc
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 0000000000..d78d850056
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 0000000000..bafed3922d
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 0000000000..a516ef4e23
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 0000000000..71b2ea504a
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 0000000000..46ea5b4e64
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 0000000000..f3267a72e5
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 0000000000..f184eba911
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 0000000000..355b8ac931
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 0000000000..6cfb97ebd1
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 0000000000..35a9c3a1b3
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 0000000000..d3885d60c2
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 7d06801e1f..64f9f55964 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 0000000000..1b5bf7b178
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 0000000000..57971277ad
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 0000000000..9b978b3540
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 15d6b81ca5..79e1a5801c 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 15d6b81ca5..79e1a5801c 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 0000000000..d62692abb8
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 0000000000..d0aff11833
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 0000000000..6b08780115
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 0000000000..9db8cbc102
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 0000000000..4f54540b56
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 0000000000..83c9be9dfd
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 0000000000..2878049799
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 0000000000..6f1cdd7e88
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 0000000000..bea56a3899
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 0000000000..41bc48e972
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 0000000000..a48b73e97b
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 0000000000..98963a97c9
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 0000000000..f47c9cd731
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 0000000000..399f5a4e85
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 0000000000..b95563b787
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 0000000000..09e63e6b9f
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 0000000000..673badf70b
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 0000000000..8f7692e639
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 0000000000..40faf9cee0
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 0000000000..5e457453b5
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 0000000000..3d86515ba9
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 0000000000..e30df4c1f5
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 0000000000..cccd140ba3
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 0000000000..b97ecbcbd4
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 0000000000..7829f538f8
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 0000000000..f7bc67925d
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 72465f2f9d..13bbb1b1f8 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 0000000000..dc2c807511
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 0000000000..adfdbc3c1a
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 0000000000..43a2f9139f
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 157eb85d65..cca79ffb9d 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 0000000000..731858e2cf
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 0000000000..cc55fd6981
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 e69de29bb2..f847acf58c 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 0000000000..22f61b5a84
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 0000000000..4415b23282
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 0000000000..138fd3f2b5
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 0000000000..e597ed22d9
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 0000000000..efea0b70bd
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 f711c775b9..82486f8812 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 0000000000..32b00e4806
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 0000000000..6ecfc717c9
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 0000000000..5dca502f80
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 0000000000..a23d4c4e2e
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 0000000000..5b8710dfd7
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 0000000000..136ea59d3d
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 0d66bb13e5..e7546fc1e0 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 0000000000..de37924757
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 0000000000..8da714140e
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 0000000000..2a26043c96
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 0000000000..f38a2f9334
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 0000000000..030123a63e
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 0000000000..2828cee4c8
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 0000000000..a6c90e15d4
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 0000000000..93605ebfd5
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 8e05683be0..8251adfa58 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 0000000000..da2c03eea2
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 0000000000..5cdaedeab1
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 0000000000..2eeab22dca
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 0000000000..e5ae4eb943
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 0000000000..9e7a027f6b
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 0000000000..d4e7e6766a
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 0000000000..5549813932
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 0000000000..14ef7c72b2
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 0000000000..b70217e894
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 0000000000..aa984ea926
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 0000000000..5decb0e800
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 0000000000..e0bb218cc0
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 0000000000..bb51bde8bb
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 0000000000..a8c6737d1b
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 0000000000..dedcbab92e
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 0000000000..70620e1d54
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 0000000000..a4c8ef41d2
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 0000000000..708ec7416c
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 bbf7459e25..9ed9210f3a 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 65ae1c697b..c6b0bb5a77 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 0000000000..71c1b13f92
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 0000000000..823f6843fa
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 0000000000..c2ff6622a0
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 0000000000..76d0a52e37
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 0000000000..ddb5de5580
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 0000000000..302dd62dfb
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 0000000000..854fd4ce85
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 0000000000..13137b15ad
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 0000000000..e0fec7e04b
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 0000000000..625c4ee813
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 0000000000..2e3b2bed29
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 0000000000..f434db9e08
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 0000000000..18e8b564e0
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 0000000000..97c22cf879
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 0000000000..38b339fd02
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 0000000000..ef19c197c7
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 0000000000..f6850d6276
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 0000000000..c3dd71d6d6
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 0000000000..622a55db3b
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 0000000000..c8328bcd9c
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 0000000000..b3551423f9
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 0000000000..5143e4a4d1
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 0000000000..691c34c224
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 0000000000..a78ba30317
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 0000000000..8a5254e3dc
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 0000000000..cf26eccfa9
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 0000000000..1f3ae4be5a
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 0000000000..d7ab289339
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 0000000000..04a2262f97
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 0000000000..151de57761
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 0000000000..8b8f72410e
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 0000000000..4868324c27
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 0000000000..5b51300308
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 0000000000..e834950548
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 0000000000..430502102d
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 0000000000..4b06a80d03
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 0000000000..411148e567
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 0000000000..3f58818a08
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 0000000000..73b2fa9ad4
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 0000000000..536653a693
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 0000000000..86bc19a3b6
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 0000000000..38bd7d3838
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 0000000000..7529993c1c
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 0000000000..cd12c8b016
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 0000000000..7b68addab8
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 0000000000..25b1c5e1bd
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 0000000000..ba9f58938b
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 0000000000..be51160516
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 0000000000..6f0217753a
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 0000000000..cef8fa1223
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 0000000000..ea1d94be53
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 0000000000..47e5198fff
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 0000000000..4ad3c56dbb
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 0000000000..5428ba49fb
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 0000000000..7ce6ce6a20
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 0000000000..e217cbc3a2
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 0000000000..7b167172b1
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 0000000000..8ba3d73cda
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 0000000000..bcfadf30e5
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 0000000000..ae0b33cc3f
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 0000000000..1b3ed8c862
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 0000000000..1808da3fb5
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 0000000000..65b3426488
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 0000000000..d30a669e6e
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 0000000000..475ea0ef89
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 0000000000..730743bea8
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 0000000000..790704e863
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 0000000000..f678ddb44d
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 0000000000..aa6c32d2d8
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 0000000000..50a6c021ff
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 0000000000..11778229c8
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 0000000000..dc5d02a64c
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 0000000000..188552cff4
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 0000000000..f64297486c
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 0000000000..0d494de4ca
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 0000000000..95e545a027
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 0000000000..e96b1caf8c
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 0000000000..0d702cda09
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 0000000000..7ceedfdc61
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 0000000000..db570ce4c1
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 0000000000..ff151e1996
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 0000000000..440ff7bad3
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 0d66bb13e5..e7546fc1e0 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 0000000000..de37924757
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 0000000000..8da714140e
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 0000000000..2a26043c96
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 0000000000..f38a2f9334
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 0000000000..030123a63e
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 0000000000..658e56056d
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 0000000000..1ee9584c1d
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 0000000000..6d42b2d60a
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 0000000000..f7437a388c
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 0000000000..4153c02d9a
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 0000000000..5be896cf58
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 0000000000..2cdafe169a
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 0000000000..4fce813de9
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 0000000000..a937b4446c
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 0000000000..6ce713dd67
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 0000000000..15bcaf07f7
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 0000000000..b542c93ffd
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 0000000000..e2f2dba17e
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 0000000000..a75381b34a
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 0000000000..7b5303f92b
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 0000000000..9d274de7ac
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 0000000000..2458aea4fb
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 0000000000..d74c810c18
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 0000000000..1100268d0a
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 0000000000..343b3c1c17
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 0000000000..40a5bf7a4e
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 0000000000..df21676d2c
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 0000000000..f5cf36dda8
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 0000000000..cc8b5e0ef4
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 0000000000..1f596cdebb
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 0000000000..271e2e38b2
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 0000000000..8095acf7ff
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 0000000000..6899dd44f8
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 0000000000..2999d36f96
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 0000000000..376a3067c4
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 0000000000..109c0a2a36
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 0000000000..5768499647
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 0000000000..54b63a9185
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 0000000000..819230e7ec
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 0000000000..d367fd4671
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 0000000000..0dd8e85bc4
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 0000000000..e77cc980cb
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 0000000000..652c6b8ef3
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 0000000000..4b9960ee52
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 0000000000..f08f2562cc
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 0000000000..f1d3ac6350
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 0000000000..1f55070b6d
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 0000000000..6aa3469fbe
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 0000000000..08c84c7221
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 0000000000..f57b02f1de
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 0000000000..ec3fba8e3d
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 0000000000..acf3450f23
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 0000000000..2ddaf5eaf8
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 0000000000..a6b1405739
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 0000000000..a510fd631e
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 0000000000..f1f609bf12
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 0000000000..573b9df5d1
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 0000000000..5523424e8f
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 0000000000..9441cec85d
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 0000000000..914a94344a
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 0000000000..77fa2ab73e
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 0000000000..5b75fafe73
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 0000000000..3b84833628
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 0000000000..dc2bb1d74e
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 0000000000..772524bcdb
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 0000000000..c271c9670e
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 0000000000..add09c9a35
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 0000000000..de9293a731
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 0000000000..7a0670c937
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 0000000000..8773c19c94
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 0000000000..31d83bf599
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 0000000000..bd6d9a8d34
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 0000000000..897c69cef1
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 0000000000..5b29dd8ddf
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 0000000000..4f977871e9
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 0000000000..8fdf92ca73
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 0000000000..95f73fc6bf
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 0000000000..2778040538
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 0000000000..02b90f16b1
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 0000000000..c7c41c9929
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 0000000000..735fe56e71
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 0000000000..8399ab36bf
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 0000000000..3379926e96
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 0000000000..6ea7b1284d
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 0000000000..05ec2e16ba
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 0000000000..106e874346
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 0000000000..087785449a
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 0000000000..f1cc93178a
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 0000000000..98d4ca3146
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 0000000000..590dcf4d57
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 0000000000..1a197ede0a
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 0000000000..d0145ef559
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 0000000000..a269d7f44f
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 0000000000..fdc795f614
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 71a2859e89..922014dd04 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 0000000000..a9b69c0b8f
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 0000000000..325b81790e
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 0000000000..3be70c0476
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 0000000000..9574174571
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 0000000000..190944ff21
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 0000000000..35a77d3ec6
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 0000000000..3c28a968eb
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 0000000000..20265c357a
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 83052970ef..2da4f16a62 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 0000000000..57aa9a51b2
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 0000000000..20d135bb47
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 0000000000..12fc2c57e5
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 0000000000..22f5d3d02d
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 0000000000..23823edac7
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 0000000000..d3d4fe73d4
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 0000000000..9d0ef16cb5
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 0000000000..9f66b73587
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 0000000000..2cc26f9858
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 0000000000..9441915f4b
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 0000000000..8a7d98f3e0
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 0000000000..2da4f16a62
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 0000000000..57aa9a51b2
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 0000000000..20d135bb47
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 0000000000..12fc2c57e5
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 0000000000..22f5d3d02d
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 0000000000..23823edac7
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 0000000000..23fa26e4ce
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 0000000000..846272e367
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 0000000000..43a7879d24
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 0000000000..a969d6bb87
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 0000000000..40132b51a7
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 ca49467445..57a0efbea7 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 0000000000..8e24698e74
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 0000000000..ffcac108d3
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 0000000000..ee1b999e0d
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 0000000000..b97fbf42e3
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 0000000000..9079f60b81
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 0000000000..decc0b5892
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 0000000000..e3e3e89cb1
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 0000000000..5a5f36684e
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 0000000000..f4cb9f579e
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 0000000000..02b9eb9bf2
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 0000000000..a9aeb8c271
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 0000000000..ea8e140a70
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 0000000000..84336d469c
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 0000000000..95e838852b
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 0000000000..549d03fdc7
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 0000000000..fe6bdc0780
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 0000000000..6e8798d334
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 0000000000..56655292b8
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 0000000000..d7661ab8d5
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 0000000000..7f0c702f9f
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 0000000000..8aaefb7fe9
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 0000000000..d4463a0147
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 0000000000..17833f535a
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 0000000000..cf97894508
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 0000000000..7cbd07cef3
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 0000000000..28712de519
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 0000000000..bea4cfab46
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 0000000000..7f16d0a66d
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 0000000000..15abcc4969
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 0000000000..e71daa68a3
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 e9d213749c..8d0ab53fc0 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 0000000000..8f4194e2d2
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 0000000000..66636eed10
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 0000000000..0bab252f22
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 0000000000..84c53a5c6c
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 0000000000..617665a381
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 0000000000..8d0ab53fc0
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 0000000000..8f4194e2d2
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 0000000000..66636eed10
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 0000000000..0bab252f22
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 0000000000..84c53a5c6c
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 0000000000..617665a381
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 0000000000..92aa406151
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 0000000000..6ed3d17400
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 0000000000..2c7a657a4f
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 0000000000..e98641829f
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 0000000000..72347b972e
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 0000000000..147c9e9165
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 2518282a3e..cf01961f38 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 0000000000..07d5cd56f0
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 0000000000..749ca7f54d
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 0000000000..e0f43a59ac
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 0000000000..985611ada7
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 0000000000..4106794082
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 0000000000..2b5a7e6ce2
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 0000000000..c8c327e34d
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 0000000000..3c72a4382b
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 0000000000..d033982ae7
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 0000000000..d56fbc165d
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 0000000000..131c7f0545
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 0000000000..7a7d2a0af0
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 0000000000..345829e2a3
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 0000000000..ad0a6389a5
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 0000000000..d99fd9c631
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 0000000000..538ce1d8af
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 0000000000..93a269718f
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 0000000000..1854dda132
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 0000000000..f505b371fd
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 0000000000..443c1a5e93
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 0000000000..15f625665a
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 0000000000..cd57822d80
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 0000000000..1e37d79d5d
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 0000000000..45914c48c7
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 0000000000..9ab60df7b7
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 0000000000..91f3335f1b
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 0000000000..0f2d82b553
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 0000000000..e405151e2d
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 0000000000..fb6c4a4d37
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 0000000000..23c9d9a762
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 290dc7fe93..f68cbedc51 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 0000000000..daaa26cc16
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 0000000000..d45e5a3f47
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 0000000000..52b1b6d479
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 0000000000..1e5eda21aa
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 0000000000..984b2c047b
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 0000000000..af360791c0
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 0000000000..1b8fedce38
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 0000000000..6e944b57f3
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 0000000000..5b54030461
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 0000000000..f0766db1c1
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 0000000000..6d33d5803e
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 0000000000..1de0bcfae4
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 0000000000..7af9237d4a
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 0000000000..d45e5a3f47
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 0000000000..52b1b6d479
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 0000000000..1e5eda21aa
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 0000000000..984b2c047b
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 0000000000..af360791c0
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 0000000000..574acba100
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 0000000000..d15d10aece
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 0000000000..962a6171b9
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 0000000000..004a11d830
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 0000000000..a8e44999c7
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 0000000000..ba5fe28cf6
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 0000000000..ef914256fa
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 0000000000..98ff9f1c94
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 0000000000..edf1f383f4
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 0000000000..07d64ab431
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 0000000000..bc6b122be6
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 0000000000..de35cc5456
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 0000000000..aae1de982f
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 0000000000..a52971409d
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 0000000000..f455c1d8d4
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 0000000000..48639c6994
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 0000000000..d7e7187901
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 0000000000..f41f0c6ec2
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 0000000000..926fa8bd2d
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 0000000000..cb3bab329d
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 0000000000..9ce0b8596b
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 0000000000..327e1d7a69
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 0000000000..76b54b1a38
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 0000000000..317a92f195
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 0000000000..4b2ab307ee
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 0000000000..8796829b87
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 0000000000..b36f41960e
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 0000000000..dc1441fea5
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 0000000000..abc19e06c7
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 0000000000..c90549f681
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 0000000000..5152c9c1a3
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 0000000000..660b422811
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 0000000000..9aac260ee5
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 0000000000..ac794ddc4a
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 0000000000..1898a8a3e1
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 0000000000..e3433415ec
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 0000000000..43e57aa73a
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 0000000000..8f8c5f94b9
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 0000000000..a79d6f6935
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 0000000000..38db39f385
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 0000000000..afd9de68b5
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 0000000000..429aa5904e
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 0000000000..59e0df087e
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 95e3c094c8..04153a940f 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 0000000000..63bf1ca854
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 0000000000..b3640435b0
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 0000000000..1d864b7b62
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 0000000000..dc1a758991
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 0000000000..f0d1685aa0
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 0000000000..b42a78d488
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 0000000000..d0f3b039fb
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 0000000000..f217c930a7
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 0000000000..dc5d94366b
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 0000000000..f4c74d1d49
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 0000000000..69aace7555
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 0000000000..2e4399d762
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 0000000000..fb66ba11c4
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 0000000000..6d9b2fc8cc
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 0000000000..c5d52f5c7a
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 0000000000..3d4288d10d
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 0000000000..6ff36c07cb
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 0000000000..c25d42927d
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 0000000000..2a564db426
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 0000000000..888d129c10
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 0000000000..b449d67794
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 0000000000..d9eab9434c
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 0000000000..a3a45c3495
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 0000000000..a72719f8ac
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 0000000000..fe2c323009
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 f7c8cfc4f7..d41c3b5a24 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 0000000000..d8a6229d6b
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 0000000000..71330d66a8
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 0000000000..a1345ecbd2
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 0000000000..016b920bcd
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 0000000000..4591eb5290
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 0000000000..19be3236ae
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 0000000000..80b516192f
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 0000000000..f43aa390fa
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 0000000000..b93713bc01
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 0000000000..ab6e3557e9
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 0000000000..72d4d6cf40
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 0000000000..901ef717a7
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 0000000000..e9404fd525
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 0000000000..8817578cf0
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 0000000000..0e9bf46e0b
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 0000000000..918e3d435a
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 0000000000..0c01143530
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 0000000000..fed226dac2
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 0000000000..65a0790d92
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 0000000000..7260df1d15
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 0000000000..d14580a3db
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 0000000000..9313ab2116
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 0000000000..f432b554b3
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 0000000000..dc7087e028
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 0000000000..d28e457921
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 0000000000..4316867685
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 0000000000..50fadc5f6d
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 0000000000..1b1828182c
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 0000000000..d2c934ec3c
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 0000000000..26bfc70d38
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 0000000000..9a496854cb
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 0000000000..3313ce6bbf
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 0000000000..9643cf9dd3
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 0000000000..6626ede254
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 0000000000..932574a392
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 0000000000..eff01b9450
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 0000000000..876e480652
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 0000000000..6e92b8ebfa
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 0000000000..8de5a40ba0
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 0000000000..bbb5523f93
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 0000000000..b26fa86ac2
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 0000000000..92bcaf872e
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 0000000000..4f5f474d82
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 0000000000..3e3d79bca5
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 0000000000..d7a2654b4f
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 0000000000..0cb9a347d6
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 0000000000..b27889771f
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 0000000000..d30c27f449
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 0000000000..671717cc8f
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 0000000000..ba32e86541
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 0000000000..0070ddfc55
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 0000000000..87b614f612
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 0000000000..e1f757ff32
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 0000000000..323f7e6e33
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 0000000000..bf73fed4a2
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 0000000000..72f1c6686d
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 0000000000..d68cee86a5
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 0000000000..7349ad2f50
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 0000000000..ee22412bde
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 0000000000..eb52e4141b
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 0000000000..03e1421c07
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 0000000000..823fbc621b
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 0000000000..10993846bf
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 0000000000..efb81bb7cc
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 0000000000..52b7ad3369
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 0000000000..7f3bbdefac
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 0000000000..d6e7f19ed6
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 0000000000..9db6f24c08
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 0000000000..117a9d98e8
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 0000000000..6279a091c0
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 0000000000..c23a99d7cc
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 0000000000..c8872ee52e
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 0000000000..9de63c18d8
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 0000000000..9113cfcde1
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 0000000000..6e0c1756ad
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 0000000000..8cdbe0a180
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 0000000000..a1fd9fdd56
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 0000000000..d31a94ecf5
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 0000000000..33297dcab3
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 0000000000..55a78227ce
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 0000000000..ef50efc1bb
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 0000000000..bfa84f9838
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 0000000000..5094944aef
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 0000000000..4cae652ba7
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 0000000000..5646de0622
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 0000000000..95225a806d
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 0000000000..63685db1f5
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 0000000000..f713e9dd46
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 0000000000..dee5f58e2f
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 0000000000..6c3d52305c
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 0000000000..eab31fd31f
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 0000000000..80e694c4a6
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 0000000000..1b55cb71bb
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 0000000000..932574a392
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 0000000000..eff01b9450
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 0000000000..876e480652
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 0000000000..6e92b8ebfa
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 0000000000..8de5a40ba0
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 0000000000..16ef86a4e6
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 0000000000..845363fe62
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 0000000000..271cff1b58
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 0000000000..a822e6adda
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 0000000000..77bdd57046
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 0000000000..f6f905652f
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 0000000000..235004a048
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 0000000000..2090c7b638
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 0000000000..a071d1f0a2
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 0000000000..7267685c1a
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 0000000000..774aa31452
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 0000000000..9116d6ee9a
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 0000000000..b06fec19f2
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 0000000000..cda060f30f
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 0000000000..64318c8edc
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 0000000000..d663d3bc34
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 0000000000..13a3b8ec78
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 0000000000..298729c255
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 0000000000..2ced21697c
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 0000000000..2d8ba05b00
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 0000000000..104a36077c
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 0000000000..47cd325512
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 0000000000..7021ba9d1b
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 0000000000..3b9bca2b4d
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 0000000000..05a929944d
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 0000000000..10713c080b
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 0000000000..b04e39925e
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 0000000000..984a309cd8
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 0000000000..3ab7793390
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 0000000000..a564b18f51
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 0000000000..f51ae1d0ff
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 0000000000..83c2d46ab2
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 0000000000..00a0114ea9
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 0000000000..253edb8874
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 0000000000..f31e390a90
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 0000000000..684cd7e13a
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 0000000000..b321f86b64
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 0000000000..043bebc91e
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 0000000000..d78d850056
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 0000000000..bafed3922d
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 0000000000..a516ef4e23
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 0000000000..71b2ea504a
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 0000000000..46ea5b4e64
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 0000000000..f3267a72e5
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 0000000000..f184eba911
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 0000000000..355b8ac931
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 0000000000..6cfb97ebd1
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 0000000000..35a9c3a1b3
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 0000000000..317e548907
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 0000000000..981c3dc12b
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 0000000000..7af3f6715c
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 0000000000..1b775210c0
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 0000000000..11d10a9b07
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 0000000000..5f85dc188c
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 0000000000..e8bcd0bd6c
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 0000000000..faa47587a4
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 0000000000..74d02ec7f8
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 0000000000..86c5f066fc
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 0000000000..5c8e90945b
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 0000000000..0eb2a755de
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 0000000000..0bb059a3fa
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 0000000000..fdba997b6e
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 0000000000..121d8a000a
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 0000000000..24021075bd
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 0000000000..9ace236862
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 0000000000..75ac82d04b
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 0000000000..6ef77eb284
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 0000000000..44dd6aa55f
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 0000000000..098462ab2a
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 0000000000..f97a50924a
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 0000000000..5c8e90945b
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 0000000000..0eb2a755de
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 0000000000..0bb059a3fa
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 0000000000..fdba997b6e
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 0000000000..121d8a000a
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 0000000000..79e1a5801c
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 0000000000..1679d4c5b9
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 0000000000..fe6bdc0780
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 0000000000..6e8798d334
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 0000000000..56655292b8
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 0000000000..d7661ab8d5
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 0000000000..7f0c702f9f
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 0000000000..d2c91aa57d
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 0000000000..39f60567f6
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 0000000000..090ee207a4
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 0000000000..2b16324878
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 da7c189a85..4c3b206937 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 0000000000..b62d671836
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 0000000000..55cc925046
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 0000000000..545fadd183
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 0000000000..877255c1c3
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 0000000000..d16b804296
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 0000000000..4c3b206937
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 0000000000..b62d671836
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 0000000000..55cc925046
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 0000000000..545fadd183
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 0000000000..877255c1c3
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 0000000000..d16b804296
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 0000000000..e681c59eaf
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 0000000000..11723ab750
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 0000000000..b55eda457d
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 0000000000..e47493a274
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 0000000000..fdbac0b0cc
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 0000000000..88b7dcb412
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 9b23019f39..3ecaefd941 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 32a8cf7b89..acc37342e8 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 0000000000..0f106bab00
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 0000000000..4958e4e942
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 0000000000..dbe9878813
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 0000000000..02f8c5e277
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 0000000000..1c27c74811
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 0000000000..acc37342e8
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 0000000000..0f106bab00
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 0000000000..4958e4e942
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 0000000000..dbe9878813
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 0000000000..02f8c5e277
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 0000000000..1c27c74811
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 0000000000..6bbbe6235b
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 0000000000..8f2147f7d9
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 0000000000..e36d7ad040
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 0000000000..ee34edb554
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 0000000000..8a47cee58c
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 0000000000..6a0d134c8d
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 0000000000..a45a988ff5
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 0000000000..de81c048d0
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 0000000000..fa20a00808
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 0000000000..ba3f9a1cdb
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 0000000000..9ea4e99148
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 0000000000..dd45301a21
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 0000000000..0a9acc7cf8
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 0000000000..4ddf67edcf
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 0000000000..d7c3b0fc41
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 0000000000..bbfcbd18df
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 0000000000..59954eccbc
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 0000000000..2f4d619997
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 0000000000..73653eee2b
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 0000000000..04120c6992
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 0000000000..77498678fc
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 0000000000..b1738f03b0
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 0000000000..201bfb0112
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 0000000000..8518503c55
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 0000000000..91e2bc9aae
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 0000000000..2d32427625
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 0000000000..a7af1346e5
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 1c839c4e10..8e280d07c4 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 0000000000..e69ca6add1
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 0000000000..1bab061aab
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 0000000000..312241778c
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 0000000000..f0b9ad8419
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 0000000000..4259b68670
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 0000000000..f0e4aabf22
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 0000000000..816f090002
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 0000000000..f4cb9f579e
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 0000000000..02b9eb9bf2
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 0000000000..a9aeb8c271
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 0000000000..ea8e140a70
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 0000000000..84336d469c
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 0000000000..4cf2332d20
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 0000000000..5248152aba
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 8e8a805e87..230e33849b 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 0000000000..01805b1fe7
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 0000000000..a432127ee2
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 0000000000..67bdaa9172
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 0000000000..3473e32be2
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 0000000000..c7ee71281f
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 0000000000..606e3238e5
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 0000000000..22f9cf2543
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 0000000000..a432127ee2
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 0000000000..67bdaa9172
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 0000000000..3473e32be2
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 0000000000..c7ee71281f
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 0000000000..606e3238e5
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 0000000000..2e3b2bed29
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 0000000000..f434db9e08
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 0000000000..18e8b564e0
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 0000000000..97c22cf879
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 0000000000..38b339fd02
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 0000000000..718d272dd8
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 0000000000..9b716032fd
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 0000000000..6dfbe6eae2
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 0000000000..858eed4340
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 0000000000..3bca460980
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 0000000000..3de3d071c2
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 0000000000..52ac8cb8bc
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 0000000000..0cc104e1ba
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 0000000000..a2f1f6e797
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 d91b8e18a5..15c8943929 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 0000000000..d9bf8ee580
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 0000000000..8f2b9bbe9e
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 0000000000..e4476e1880
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 0000000000..209fffeaed
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 0000000000..d40f1c75c8
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 0000000000..58f47bcd9b
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 0000000000..c7cbc6967c
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 0000000000..9e3b1e146f
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 0000000000..356ee6a917
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 0000000000..208b65fc9b
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 0000000000..2e3b2bed29
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 0000000000..f434db9e08
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 0000000000..18e8b564e0
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 0000000000..97c22cf879
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 0000000000..38b339fd02
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 0000000000..1ef1123926
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 0000000000..f15b9be56d
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 0000000000..e213bf7e40
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 0000000000..90fefd0cab
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 0000000000..d7686f8b60
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 0000000000..92eafffe94
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 0000000000..7943b73f67
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 0000000000..b05828b47c
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 0000000000..ddfd25fd22
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 0000000000..7da8183f39
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 0000000000..ca997dac30
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 0000000000..00397d3734
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 0000000000..3974a07328
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 0000000000..fd650f5bb3
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 0000000000..7013ea4de5
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 0000000000..5352521371
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 fb460756af..77a10e6230 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 0000000000..b6822a9e01
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 0000000000..466007cdd3
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 0000000000..7592beb3b3
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 0000000000..272ed04574
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 0000000000..dcd327a993
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 0000000000..77a10e6230
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 0000000000..b6822a9e01
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 0000000000..466007cdd3
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 0000000000..7592beb3b3
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 0000000000..272ed04574
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 0000000000..dcd327a993
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 0000000000..b899da6939
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 0000000000..a7bc5f3bf0
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 0000000000..e4d80b9b12
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 0000000000..b8510888c0
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 0000000000..90fe9d3cf9
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 0000000000..21b0ba1e05
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 0000000000..48afc4adac
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 0000000000..e4427cbd15
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 0000000000..004a11d830
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 0000000000..fb5ee97ba2
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 1b92108942..a1198aaf79 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 0000000000..3b46fe18ab
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 4bcdaecb4d..ba294244a5 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 0000000000..1cbe6239bb
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 0000000000..7c532b88e0
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 0000000000..e46de30a6b
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 0000000000..eef6aeffe0
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 0000000000..ec0f6f1673
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 0000000000..ba294244a5
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 0000000000..1cbe6239bb
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 0000000000..7c532b88e0
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 0000000000..e46de30a6b
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 0000000000..eef6aeffe0
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 0000000000..ec0f6f1673
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 0000000000..ea4853cd29
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 0000000000..c330f66129
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 0000000000..c1106311e5
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 0000000000..a7b43072fc
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 0000000000..a3c6fefdf8
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 0000000000..e3b91fe2fa
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 0000000000..e0caa61ba6
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 0000000000..53606f3e07
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 0000000000..d8811a5638
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 0000000000..dde348b40d
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 0000000000..7b3697952d
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 0000000000..08aa6a4843
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 0000000000..d4026fea32
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 0000000000..81499f1616
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 9cb4d40b0f..2b641df50a 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 0000000000..c3d21d3ce9
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 0000000000..71e93c783c
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 0000000000..e886a316e8
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 0000000000..972a46a3ad
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 0000000000..9af4ac9bf8
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 0000000000..edaefac65a
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 0000000000..7d1b849152
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 0000000000..27046532b7
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 0000000000..4ff2e84419
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 0000000000..8608661035
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 0000000000..6706def991
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 0000000000..f34ad03469
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 0000000000..b51c9f0013
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 0000000000..9c25f10ce1
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 0000000000..c0e63d7e1f
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 0000000000..190e7804a0
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 0000000000..1457e72695
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 0000000000..d5f7de6d6d
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 0000000000..673badf70b
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 0000000000..8f7692e639
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 0000000000..40faf9cee0
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 0000000000..5e457453b5
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 0000000000..3d86515ba9
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 b34cb3bba1..3f1c72dce5 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 0000000000..7a542547e0
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 0000000000..f42f868631
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 0000000000..bfff80acf4
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 0000000000..8269d47872
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 0000000000..3b6fc16379
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 92290c70f8..f511682fb4 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 0000000000..14355ce15f
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 0000000000..dff4791d41
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 0000000000..0117d49657
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 0000000000..4cfe2053c2
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 0000000000..2691b42f09
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 0000000000..a0729e2c29
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 0000000000..bb04d27666
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 0000000000..60fad11afc
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 da3eb230b7..6740511b38 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 cce8ea8907..2873f57dfa 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 0000000000..9541a9fe43
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 0000000000..ad2a6622e4
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 0000000000..d24b4e827b
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 0000000000..0aac4c4b1e
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 0000000000..d695a5cac0
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 0000000000..8196541e26
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 b8aa8dd603..450853eca4 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 0000000000..450853eca4
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 0000000000..2352c2610b
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 0000000000..c268b7f0b2
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 0000000000..8e2ebf3537
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 0000000000..4f576a0a66
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 0000000000..d3658c2c6b
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 0000000000..13f5250806
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 0000000000..2c1688e46c
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 0000000000..962288bd17
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 0000000000..154f2b6e35
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 0000000000..540b48d887
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 0000000000..b05d3bad9a
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 0000000000..2bd9a7b71b
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 0000000000..c88f4ad73b
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 0000000000..ebf4b69315
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 0000000000..a91fed8815
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 0000000000..e2b7cff1d8
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 0000000000..f888ea9435
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 0000000000..317e548907
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 0000000000..981c3dc12b
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 0000000000..7af3f6715c
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 0000000000..1b775210c0
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 0000000000..11d10a9b07
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 0000000000..d5dbca1ff7
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 0000000000..317e548907
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 0000000000..981c3dc12b
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 0000000000..7af3f6715c
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 0000000000..1b775210c0
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 0000000000..11d10a9b07
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 8936319a8e..cdf31af155 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 0000000000..8cd431293f
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 0000000000..1ee2612ea8
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 0000000000..c7f577394b
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 0000000000..a5dc06ee02
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 0000000000..5d895f3762
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 0000000000..cdf31af155
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 0000000000..8cd431293f
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 0000000000..1ee2612ea8
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 0000000000..c7f577394b
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 0000000000..a5dc06ee02
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 0000000000..5d895f3762
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 0000000000..4ce1ab68db
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 0000000000..7d57bb6660
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 0000000000..3d298d6bda
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 0000000000..a155e9b154
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 0000000000..c531cdf3f5
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 0000000000..7757ee7914
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 0000000000..4672eabedb
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 0000000000..1da3195cca
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 0000000000..337ecf32b8
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 0000000000..1709f5ac15
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 0000000000..cf236b6092
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 0000000000..26135bc7d2
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 8e05683be0..8251adfa58 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 0000000000..da2c03eea2
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 0000000000..5cdaedeab1
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 0000000000..2eeab22dca
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 0000000000..e5ae4eb943
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 0000000000..9e7a027f6b
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 0000000000..8251adfa58
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 0000000000..da2c03eea2
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 0000000000..5cdaedeab1
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 0000000000..2eeab22dca
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 0000000000..e5ae4eb943
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 0000000000..9e7a027f6b
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 0000000000..7fba56ced6
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 0000000000..44c0ea20dd
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 3472478275..44afda8c4f 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 0000000000..0faada583b
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 5352521371..c8f11a93af 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 5352521371..c8f11a93af 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 0000000000..0064375693
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 0000000000..e452463adc
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 0000000000..8e0291ac87
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 0000000000..84f29c8f95
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 0000000000..effd86aff9
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 0000000000..2e77babaa2
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 0000000000..52dd80a724
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 0000000000..b48409f0cd
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 0000000000..ef4281efb4
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 0000000000..1449edbe43
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 0000000000..aef6a72f76
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 0000000000..3ca3fa8d99
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 0000000000..6ef26c761b
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 0000000000..8e4c712e0f
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 0000000000..a8f2cf8d2e
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 0000000000..6fd9cb9c57
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 0000000000..a4ec3c1575
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 0000000000..d0c500ae17
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 0000000000..a40c5cd053
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 0000000000..2582074dd6
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 0000000000..c529257325
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 0000000000..65ad851e1d
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 0000000000..fcb6e2c2b9
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 0000000000..e287a20c61
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 0000000000..7a5729de3c
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 0000000000..5226f887eb
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 0000000000..f5a7c4ae35
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 0000000000..c5c6df5d9f
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 0000000000..0028d11d91
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 0000000000..f9cea0802e
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 0000000000..22c0cd3802
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 0000000000..efcb7bbe16
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 0000000000..389b056b7b
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 0000000000..469afa185d
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 0000000000..f0ef0f2292
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 0000000000..1859e5e8a0
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 0000000000..71b2946e58
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 0000000000..a792b3e35b
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 0000000000..4c53bfa87a
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 0000000000..1876562fa8
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 0000000000..8aa67d000c
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 0000000000..ffbb53235e
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 0000000000..ead6778dba
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 0000000000..77364ef840
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 0000000000..36a1f3f8e0
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 0000000000..4b7183a98e
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 0000000000..77dc915f05
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 0000000000..44bb479139
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 0000000000..d1e74a220d
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 0000000000..3734f3f70c
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 0000000000..e751c2485d
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 0000000000..cf275ec1ec
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 0000000000..4ef2a94486
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 0000000000..aa67918400
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 0000000000..8bb7d2dfad
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 0000000000..01b54dbed4
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 0000000000..26b7e6c7ee
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 0000000000..7757d8cd1f
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 0000000000..f676d72107
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 0000000000..97d90faafa
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 0000000000..fb00bd29e1
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 0000000000..e2a6db5776
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 0000000000..944135de1e
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 0000000000..5ebaef8fb5
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 0000000000..31c7eaf112
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 0000000000..75d2be8f95
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 0000000000..a8424feff5
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 0000000000..ba5a214d6b
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 0000000000..3c934fedef
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 0000000000..57831f7a44
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 0000000000..f9041f5b53
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 0000000000..adc0ca8416
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 0000000000..e247f142b5
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 0000000000..4c867d114b
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 0000000000..844cdb2b5c
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 0000000000..be260498e6
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 0000000000..14426c2214
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 0000000000..b766675280
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 0000000000..cc5fac7aa4
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 0000000000..66f31fa1a9
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 0000000000..de051b5fce
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 0000000000..feeabcba06
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 0000000000..0e3cd801dd
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 0000000000..3e57ca8313
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 0000000000..ab8a95df85
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 0000000000..d5ed1cd20c
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 0000000000..2eef6092cc
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 0000000000..bf9c80138f
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 0000000000..d3f2ae3615
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 0000000000..60b47c92f3
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 0000000000..5571205254
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 0000000000..e958a239ac
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 0000000000..fd12d52f2e
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 0000000000..f48e73c790
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 0000000000..80332d861a
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 0000000000..46bd9f75b2
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 0000000000..88ae2c6cd1
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 0000000000..ecdde1c72b
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 0000000000..bafeb658e3
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 0000000000..7b3d35c0b1
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 0000000000..5fdbe703b9
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 0000000000..06a4bc76d5
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 0000000000..9ccd04c0ea
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 0000000000..b18588335c
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 0000000000..310b7d0a35
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 0000000000..cb18e6e5f5
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 0000000000..5d476201cb
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 0000000000..98723aa6d4
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 0000000000..58b195d1ec
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 0000000000..d71e99459a
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 0000000000..25dc818cb8
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 0000000000..9211df3518
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 0000000000..b241a786e6
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 0000000000..ba257bbef2
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 0000000000..696194810c
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 0000000000..6b8e960f03
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 0000000000..fef7d28add
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 0000000000..5be4ef6ae7
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 0000000000..92ddb5a491
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 0000000000..70424fac7c
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 0000000000..5e3c433ae1
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 0000000000..89a522bd8e
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 0000000000..8cca6ed2c4
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 0000000000..ec867bb467
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 0000000000..c7ed011892
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 0000000000..3cad158120
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 0000000000..fda2bc1f08
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 0000000000..241e7dfa56
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 0000000000..9a6cfbb55e
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 0000000000..2c47f027ab
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 0000000000..7e1562a0a1
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 0000000000..30647504bc
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 0000000000..c4b0099353
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 0000000000..7f37ebec0b
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 0000000000..438138ec68
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 0000000000..9d54f92189
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 0000000000..cc14c74285
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 0000000000..b1769d74e5
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 0000000000..8a4078047e
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 0000000000..6b3731cac8
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 0000000000..511414ad6c
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 0000000000..af95435379
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 0000000000..355bdeb636
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 0000000000..8d0ad7202e
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 0000000000..3c49195f87
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 0000000000..ee81bb3672
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 0000000000..194acbb2ac
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 0000000000..f4b713023e
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 0000000000..098d9fb145
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 0000000000..7cb62e18cd
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 0000000000..b946fd69e3
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 0000000000..196e4c84d3
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 0000000000..c08a31faae
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 0000000000..11b2c12687
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 0000000000..2126260f41
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 0000000000..45236df2aa
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 0000000000..8a84783b9b
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 0000000000..3a37c85041
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 0000000000..3e7d4cbea5
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 0000000000..6faa14f55d
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 e5b08a1267..4b2b38dce0 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 0000000000..c3af3c54d7
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 0000000000..1bf288fcd4
Binary files /dev/null and b/public/images/emoji/win10/zombie.png differ
diff --git a/public/images/transparent.png b/public/images/transparent.png
new file mode 100755
index 0000000000..9da19eacad
Binary files /dev/null and b/public/images/transparent.png differ
diff --git a/public/javascripts/ace/mode-ejs.js b/public/javascripts/ace/mode-ejs.js
index e46c1bc2ea..790ba049d2 100644
--- a/public/javascripts/ace/mode-ejs.js
+++ b/public/javascripts/ace/mode-ejs.js
@@ -1 +1 @@
-ace.define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/lang"),s=e("./text_highlight_rules").TextHighlightRules,o=t.supportType="animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|pointer-events|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index",u=t.supportFunction="rgb|rgba|url|attr|counter|counters",a=t.supportConstant="absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero",f=t.supportConstantColor="aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow",l=t.supportConstantFonts="arial|century|comic|courier|cursive|fantasy|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace",c=t.numRe="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",h=t.pseudoElements="(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b",p=t.pseudoClasses="(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b",d=function(){var e=this.createKeywordMapper({"support.function":u,"support.constant":a,"support.type":o,"support.constant.color":f,"support.constant.fonts":l},"text",!0);this.$rules={start:[{token:"comment",regex:"\\/\\*",push:"comment"},{token:"paren.lparen",regex:"\\{",push:"ruleset"},{token:"string",regex:"@.*?{",push:"media"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"},{caseInsensitive:!0}],media:[{token:"comment",regex:"\\/\\*",push:"comment"},{token:"paren.lparen",regex:"\\{",push:"ruleset"},{token:"string",regex:"\\}",next:"pop"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"},{caseInsensitive:!0}],comment:[{token:"comment",regex:"\\*\\/",next:"pop"},{defaultToken:"comment"}],ruleset:[{token:"paren.rparen",regex:"\\}",next:"pop"},{token:"comment",regex:"\\/\\*",push:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:["constant.numeric","keyword"],regex:"("+c+")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"},{token:"constant.numeric",regex:c},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:["punctuation","entity.other.attribute-name.pseudo-element.css"],regex:h},{token:["punctuation","entity.other.attribute-name.pseudo-class.css"],regex:p},{token:["support.function","string","support.function"],regex:"(url\\()(.*)(\\))"},{token:e,regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"},{caseInsensitive:!0}]},this.normalizeRules()};r.inherits(d,s),t.CssHighlightRules=d}),ace.define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},s.getTagRule(),{defaultToken:"comment.doc",caseInsensitive:!0}]}};r.inherits(s,i),s.getTagRule=function(e){return{token:"comment.doc.tag.storage.type",regex:"\\b(?:TODO|FIXME|XXX|HACK)\\b"}},s.getStartRule=function(e){return{token:"comment.doc",regex:"\\/\\*(?=\\*)",next:e}},s.getEndRule=function(e){return{token:"comment.doc",regex:"\\*\\/",next:e}},t.DocCommentHighlightRules=s}),ace.define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./doc_comment_highlight_rules").DocCommentHighlightRules,s=e("./text_highlight_rules").TextHighlightRules,o=function(e){var t=this.createKeywordMapper({"variable.language":"Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document",keyword:"const|yield|import|get|set|break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|debugger|__parent__|__count__|escape|unescape|with|__proto__|class|enum|extends|super|export|implements|private|public|interface|package|protected|static","storage.type":"const|let|var|function","constant.language":"null|Infinity|NaN|undefined","support.function":"alert","constant.language.boolean":"true|false"},"identifier"),n="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield|void",r="[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*\\b",s="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={no_regex:[{token:"comment",regex:"\\/\\/",next:"line_comment"},i.getStartRule("doc-start"),{token:"comment",regex:/\/\*/,next:"comment"},{token:"string",regex:"'(?=.)",next:"qstring"},{token:"string",regex:'"(?=.)',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator"],regex:"("+r+")(\\.)(prototype)(\\.)("+r+")(\\s*)(=)",next:"function_arguments"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen"],regex:"("+r+")(\\.)("+r+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()",next:"function_arguments"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen"],regex:"("+r+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()",next:"function_arguments"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","entity.name.function","text","paren.lparen"],regex:"("+r+")(\\.)("+r+")(\\s*)(=)(\\s*)(function)(\\s+)(\\w+)(\\s*)(\\()",next:"function_arguments"},{token:["storage.type","text","entity.name.function","text","paren.lparen"],regex:"(function)(\\s+)("+r+")(\\s*)(\\()",next:"function_arguments"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen"],regex:"("+r+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()",next:"function_arguments"},{token:["text","text","storage.type","text","paren.lparen"],regex:"(:)(\\s*)(function)(\\s*)(\\()",next:"function_arguments"},{token:"keyword",regex:"(?:"+n+")\\b",next:"start"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:op|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName|ClassName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["support.constant"],regex:/that\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|trace|timeEnd|assert)\b/},{token:t,regex:r},{token:"keyword.operator",regex:/--|\+\+|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|[!$%&*+\-~\/^]=?/,next:"start"},{token:"punctuation.operator",regex:/[?:,;.]/,next:"start"},{token:"paren.lparen",regex:/[\[({]/,next:"start"},{token:"paren.rparen",regex:/[\])}]/},{token:"comment",regex:/^#!.*$/}],start:[i.getStartRule("doc-start"),{token:"comment",regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/",next:"line_comment_regex_allowed"},{token:"string.regexp",regex:"\\/",next:"regex"},{token:"text",regex:"\\s+|^$",next:"start"},{token:"empty",regex:"",next:"no_regex"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"},{token:"string.regexp",regex:"/[sxngimy]*",next:"no_regex"},{token:"invalid",regex:/\{\d+\b,?\d*\}[+*]|[+*$^?][+*]|[$^][?]|\?{3,}/},{token:"constant.language.escape",regex:/\(\?[:=!]|\)|\{\d+\b,?\d*\}|[+*]\?|[()$^+*?.]/},{token:"constant.language.delimiter",regex:/\|/},{token:"constant.language.escape",regex:/\[\^?/,next:"regex_character_class"},{token:"empty",regex:"$",next:"no_regex"},{defaultToken:"string.regexp"}],regex_character_class:[{token:"regexp.charclass.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"},{token:"constant.language.escape",regex:"]",next:"regex"},{token:"constant.language.escape",regex:"-"},{token:"empty",regex:"$",next:"no_regex"},{defaultToken:"string.regexp.charachterclass"}],function_arguments:[{token:"variable.parameter",regex:r},{token:"punctuation.operator",regex:"[, ]+"},{token:"punctuation.operator",regex:"$"},{token:"empty",regex:"",next:"no_regex"}],comment_regex_allowed:[i.getTagRule(),{token:"comment",regex:"\\*\\/",next:"start"},{defaultToken:"comment",caseInsensitive:!0}],comment:[i.getTagRule(),{token:"comment",regex:"\\*\\/",next:"no_regex"},{defaultToken:"comment",caseInsensitive:!0}],line_comment_regex_allowed:[i.getTagRule(),{token:"comment",regex:"$|^",next:"start"},{defaultToken:"comment",caseInsensitive:!0}],line_comment:[i.getTagRule(),{token:"comment",regex:"$|^",next:"no_regex"},{defaultToken:"comment",caseInsensitive:!0}],qqstring:[{token:"constant.language.escape",regex:s},{token:"string",regex:"\\\\$",next:"qqstring"},{token:"string",regex:'"|$',next:"no_regex"},{defaultToken:"string"}],qstring:[{token:"constant.language.escape",regex:s},{token:"string",regex:"\\\\$",next:"qstring"},{token:"string",regex:"'|$",next:"no_regex"},{defaultToken:"string"}]},(!e||!e.noES6)&&this.$rules.no_regex.unshift({regex:"[{}]",onMatch:function(e,t,n){this.next=e=="{"?this.nextState:"";if(e=="{"&&n.length)return n.unshift("start",t),"paren";if(e=="}"&&n.length){n.shift(),this.next=n.shift();if(this.next.indexOf("string")!=-1)return"paren.quasi.end"}return e=="{"?"paren.lparen":"paren.rparen"},nextState:"start"},{token:"string.quasi.start",regex:/`/,push:[{token:"constant.language.escape",regex:s},{token:"paren.quasi.start",regex:/\${/,push:"start"},{token:"string.quasi.end",regex:/`/,next:"pop"},{defaultToken:"string.quasi"}]}),this.embedRules(i,"doc-",[i.getEndRule("no_regex")]),this.normalizeRules()};r.inherits(o,s),t.JavaScriptHighlightRules=o}),ace.define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(e){var t="[_:a-zA-Z\u00c0-\uffff][-_:.a-zA-Z0-9\u00c0-\uffff]*";this.$rules={start:[{token:"string.cdata.xml",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:["punctuation.xml-decl.xml","keyword.xml-decl.xml"],regex:"(<\\?)(xml)(?=[\\s])",next:"xml_decl",caseInsensitive:!0},{token:["punctuation.instruction.xml","keyword.instruction.xml"],regex:"(<\\?)("+t+")",next:"processing_instruction"},{token:"comment.xml",regex:"<\\!--",next:"comment"},{token:["xml-pe.doctype.xml","xml-pe.doctype.xml"],regex:"(<\\!)(DOCTYPE)(?=[\\s])",next:"doctype",caseInsensitive:!0},{include:"tag"},{token:"text.end-tag-open.xml",regex:"</"},{token:"text.tag-open.xml",regex:"<"},{include:"reference"},{defaultToken:"text.xml"}],xml_decl:[{token:"entity.other.attribute-name.decl-attribute-name.xml",regex:"(?:"+t+":)?"+t+""},{token:"keyword.operator.decl-attribute-equals.xml",regex:"="},{include:"whitespace"},{include:"string"},{token:"punctuation.xml-decl.xml",regex:"\\?>",next:"start"}],processing_instruction:[{token:"punctuation.instruction.xml",regex:"\\?>",next:"start"},{defaultToken:"instruction.xml"}],doctype:[{include:"whitespace"},{include:"string"},{token:"xml-pe.doctype.xml",regex:">",next:"start"},{token:"xml-pe.xml",regex:"[-_a-zA-Z0-9:]+"},{token:"punctuation.int-subset",regex:"\\[",push:"int_subset"}],int_subset:[{token:"text.xml",regex:"\\s+"},{token:"punctuation.int-subset.xml",regex:"]",next:"pop"},{token:["punctuation.markup-decl.xml","keyword.markup-decl.xml"],regex:"(<\\!)("+t+")",push:[{token:"text",regex:"\\s+"},{token:"punctuation.markup-decl.xml",regex:">",next:"pop"},{include:"string"}]}],cdata:[{token:"string.cdata.xml",regex:"\\]\\]>",next:"start"},{token:"text.xml",regex:"\\s+"},{token:"text.xml",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment.xml",regex:"-->",next:"start"},{defaultToken:"comment.xml"}],reference:[{token:"constant.language.escape.reference.xml",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"}],attr_reference:[{token:"constant.language.escape.reference.attribute-value.xml",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"}],tag:[{token:["meta.tag.punctuation.tag-open.xml","meta.tag.punctuation.end-tag-open.xml","meta.tag.tag-name.xml"],regex:"(?:(<)|(</))((?:"+t+":)?"+t+")",next:[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:"start"}]}],tag_whitespace:[{token:"text.tag-whitespace.xml",regex:"\\s+"}],whitespace:[{token:"text.whitespace.xml",regex:"\\s+"}],string:[{token:"string.xml",regex:"'",push:[{token:"string.xml",regex:"'",next:"pop"},{defaultToken:"string.xml"}]},{token:"string.xml",regex:'"',push:[{token:"string.xml",regex:'"',next:"pop"},{defaultToken:"string.xml"}]}],attributes:[{token:"entity.other.attribute-name.xml",regex:"(?:"+t+":)?"+t+""},{token:"keyword.operator.attribute-equals.xml",regex:"="},{include:"tag_whitespace"},{include:"attribute_value"}],attribute_value:[{token:"string.attribute-value.xml",regex:"'",push:[{token:"string.attribute-value.xml",regex:"'",next:"pop"},{include:"attr_reference"},{defaultToken:"string.attribute-value.xml"}]},{token:"string.attribute-value.xml",regex:'"',push:[{token:"string.attribute-value.xml",regex:'"',next:"pop"},{include:"attr_reference"},{defaultToken:"string.attribute-value.xml"}]}]},this.constructor===s&&this.normalizeRules()};(function(){this.embedTagRules=function(e,t,n){this.$rules.tag.unshift({token:["meta.tag.punctuation.tag-open.xml","meta.tag."+n+".tag-name.xml"],regex:"(<)("+n+"(?=\\s|>|$))",next:[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:t+"start"}]}),this.$rules[n+"-end"]=[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:"start",onMatch:function(e,t,n){return n.splice(0),this.token}}],this.embedRules(e,t,[{token:["meta.tag.punctuation.end-tag-open.xml","meta.tag."+n+".tag-name.xml"],regex:"(</)("+n+"(?=\\s|>|$))",next:n+"-end"},{token:"string.cdata.xml",regex:"<\\!\\[CDATA\\["},{token:"string.cdata.xml",regex:"\\]\\]>"}])}}).call(i.prototype),r.inherits(s,i),t.XmlHighlightRules=s}),ace.define("ace/mode/html_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/css_highlight_rules","ace/mode/javascript_highlight_rules","ace/mode/xml_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/lang"),s=e("./css_highlight_rules").CssHighlightRules,o=e("./javascript_highlight_rules").JavaScriptHighlightRules,u=e("./xml_highlight_rules").XmlHighlightRules,a=i.createMap({a:"anchor",button:"form",form:"form",img:"image",input:"form",label:"form",option:"form",script:"script",select:"form",textarea:"form",style:"style",table:"table",tbody:"table",td:"table",tfoot:"table",th:"table",tr:"table"}),f=function(){u.call(this),this.addRules({attributes:[{include:"tag_whitespace"},{token:"entity.other.attribute-name.xml",regex:"[-_a-zA-Z0-9:.]+"},{token:"keyword.operator.attribute-equals.xml",regex:"=",push:[{include:"tag_whitespace"},{token:"string.unquoted.attribute-value.html",regex:"[^<>='\"`\\s]+",next:"pop"},{token:"empty",regex:"",next:"pop"}]},{include:"attribute_value"}],tag:[{token:function(e,t){var n=a[t];return["meta.tag.punctuation."+(e=="<"?"":"end-")+"tag-open.xml","meta.tag"+(n?"."+n:"")+".tag-name.xml"]},regex:"(</?)([-_a-zA-Z0-9:.]+)",next:"tag_stuff"}],tag_stuff:[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:"start"}]}),this.embedTagRules(s,"css-","style"),this.embedTagRules(o,"js-","script"),this.constructor===f&&this.normalizeRules()};r.inherits(f,u),t.HtmlHighlightRules=f}),ace.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("../range").Range,i=function(){};(function(){this.checkOutdent=function(e,t){return/^\s+$/.test(e)?/^\s*\}/.test(t):!1},this.autoOutdent=function(e,t){var n=e.getLine(t),i=n.match(/^(\s*\})/);if(!i)return 0;var s=i[1].length,o=e.findMatchingBracket({row:t,column:s});if(!o||o.row==t)return 0;var u=this.$getIndent(e.getLine(o.row));e.replace(new r(t,0,t,s-1),u)},this.$getIndent=function(e){return e.match(/^\s*/)[0]}}).call(i.prototype),t.MatchingBraceOutdent=i}),ace.define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("../../token_iterator").TokenIterator,o=e("../../lib/lang"),u=["text","paren.rparen","punctuation.operator"],a=["text","paren.rparen","punctuation.operator","comment"],f,l={},c=function(e){var t=-1;e.multiSelect&&(t=e.selection.index,l.rangeCount!=e.multiSelect.rangeCount&&(l={rangeCount:e.multiSelect.rangeCount}));if(l[t])return f=l[t];f=l[t]={autoInsertedBrackets:0,autoInsertedRow:-1,autoInsertedLineEnd:"",maybeInsertedBrackets:0,maybeInsertedRow:-1,maybeInsertedLineStart:"",maybeInsertedLineEnd:""}},h=function(e,t,n,r){var i=e.end.row-e.start.row;return{text:n+t+r,selection:[0,e.start.column+1,i,e.end.column+(i?0:1)]}},p=function(){this.add("braces","insertion",function(e,t,n,r,i){var s=n.getCursorPosition(),u=r.doc.getLine(s.row);if(i=="{"){c(n);var a=n.getSelectionRange(),l=r.doc.getTextRange(a);if(l!==""&&l!=="{"&&n.getWrapBehavioursEnabled())return h(a,l,"{","}");if(p.isSaneInsertion(n,r))return/[\]\}\)]/.test(u[s.column])||n.inMultiSelectMode?(p.recordAutoInsert(n,r,"}"),{text:"{}",selection:[1,1]}):(p.recordMaybeInsert(n,r,"{"),{text:"{",selection:[1,1]})}else if(i=="}"){c(n);var d=u.substring(s.column,s.column+1);if(d=="}"){var v=r.$findOpeningBracket("}",{column:s.column+1,row:s.row});if(v!==null&&p.isAutoInsertedClosing(s,u,i))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}else{if(i=="\n"||i=="\r\n"){c(n);var m="";p.isMaybeInsertedClosing(s,u)&&(m=o.stringRepeat("}",f.maybeInsertedBrackets),p.clearMaybeInsertedClosing());var d=u.substring(s.column,s.column+1);if(d==="}"){var g=r.findMatchingBracket({row:s.row,column:s.column+1},"}");if(!g)return null;var y=this.$getIndent(r.getLine(g.row))}else{if(!m){p.clearMaybeInsertedClosing();return}var y=this.$getIndent(u)}var b=y+r.getTabString();return{text:"\n"+b+"\n"+y+m,selection:[1,b.length,1,b.length]}}p.clearMaybeInsertedClosing()}}),this.add("braces","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="{"){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.end.column,i.end.column+1);if(u=="}")return i.end.column++,i;f.maybeInsertedBrackets--}}),this.add("parens","insertion",function(e,t,n,r,i){if(i=="("){c(n);var s=n.getSelectionRange(),o=r.doc.getTextRange(s);if(o!==""&&n.getWrapBehavioursEnabled())return h(s,o,"(",")");if(p.isSaneInsertion(n,r))return p.recordAutoInsert(n,r,")"),{text:"()",selection:[1,1]}}else if(i==")"){c(n);var u=n.getCursorPosition(),a=r.doc.getLine(u.row),f=a.substring(u.column,u.column+1);if(f==")"){var l=r.$findOpeningBracket(")",{column:u.column+1,row:u.row});if(l!==null&&p.isAutoInsertedClosing(u,a,i))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="("){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==")")return i.end.column++,i}}),this.add("brackets","insertion",function(e,t,n,r,i){if(i=="["){c(n);var s=n.getSelectionRange(),o=r.doc.getTextRange(s);if(o!==""&&n.getWrapBehavioursEnabled())return h(s,o,"[","]");if(p.isSaneInsertion(n,r))return p.recordAutoInsert(n,r,"]"),{text:"[]",selection:[1,1]}}else if(i=="]"){c(n);var u=n.getCursorPosition(),a=r.doc.getLine(u.row),f=a.substring(u.column,u.column+1);if(f=="]"){var l=r.$findOpeningBracket("]",{column:u.column+1,row:u.row});if(l!==null&&p.isAutoInsertedClosing(u,a,i))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}}),this.add("brackets","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="["){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u=="]")return i.end.column++,i}}),this.add("string_dquotes","insertion",function(e,t,n,r,i){if(i=='"'||i=="'"){c(n);var s=i,o=n.getSelectionRange(),u=r.doc.getTextRange(o);if(u!==""&&u!=="'"&&u!='"'&&n.getWrapBehavioursEnabled())return h(o,u,s,s);if(!u){var a=n.getCursorPosition(),f=r.doc.getLine(a.row),l=f.substring(a.column-1,a.column),p=f.substring(a.column,a.column+1),d=r.getTokenAt(a.row,a.column),v=r.getTokenAt(a.row,a.column+1);if(l=="\\"&&d&&/escape/.test(d.type))return null;var m=d&&/string/.test(d.type),g=!v||/string/.test(v.type),y;if(p==s)y=m!==g;else{if(m&&!g)return null;if(m&&g)return null;var b=r.$mode.tokenRe;b.lastIndex=0;var w=b.test(l);b.lastIndex=0;var E=b.test(l);if(w||E)return null;if(p&&!/[\s;,.})\]\\]/.test(p))return null;y=!0}return{text:y?s+s:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&(s=='"'||s=="'")){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==s)return i.end.column++,i}})};p.isSaneInsertion=function(e,t){var n=e.getCursorPosition(),r=new s(t,n.row,n.column);if(!this.$matchTokenType(r.getCurrentToken()||"text",u)){var i=new s(t,n.row,n.column+1);if(!this.$matchTokenType(i.getCurrentToken()||"text",u))return!1}return r.stepForward(),r.getCurrentTokenRow()!==n.row||this.$matchTokenType(r.getCurrentToken()||"text",a)},p.$matchTokenType=function(e,t){return t.indexOf(e.type||e)>-1},p.recordAutoInsert=function(e,t,n){var r=e.getCursorPosition(),i=t.doc.getLine(r.row);this.isAutoInsertedClosing(r,i,f.autoInsertedLineEnd[0])||(f.autoInsertedBrackets=0),f.autoInsertedRow=r.row,f.autoInsertedLineEnd=n+i.substr(r.column),f.autoInsertedBrackets++},p.recordMaybeInsert=function(e,t,n){var r=e.getCursorPosition(),i=t.doc.getLine(r.row);this.isMaybeInsertedClosing(r,i)||(f.maybeInsertedBrackets=0),f.maybeInsertedRow=r.row,f.maybeInsertedLineStart=i.substr(0,r.column)+n,f.maybeInsertedLineEnd=i.substr(r.column),f.maybeInsertedBrackets++},p.isAutoInsertedClosing=function(e,t,n){return f.autoInsertedBrackets>0&&e.row===f.autoInsertedRow&&n===f.autoInsertedLineEnd[0]&&t.substr(e.column)===f.autoInsertedLineEnd},p.isMaybeInsertedClosing=function(e,t){return f.maybeInsertedBrackets>0&&e.row===f.maybeInsertedRow&&t.substr(e.column)===f.maybeInsertedLineEnd&&t.substr(0,e.column)==f.maybeInsertedLineStart},p.popAutoInsertedClosing=function(){f.autoInsertedLineEnd=f.autoInsertedLineEnd.substr(1),f.autoInsertedBrackets--},p.clearMaybeInsertedClosing=function(){f&&(f.maybeInsertedBrackets=0,f.maybeInsertedRow=-1)},r.inherits(p,i),t.CstyleBehaviour=p}),ace.define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../../range").Range,s=e("./fold_mode").FoldMode,o=t.FoldMode=function(e){e&&(this.foldingStartMarker=new RegExp(this.foldingStartMarker.source.replace(/\|[^|]*?$/,"|"+e.start)),this.foldingStopMarker=new RegExp(this.foldingStopMarker.source.replace(/\|[^|]*?$/,"|"+e.end)))};r.inherits(o,s),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.singleLineBlockCommentRe=/^\s*(\/\*).*\*\/\s*$/,this.tripleStarBlockCommentRe=/^\s*(\/\*\*\*).*\*\/\s*$/,this.startRegionRe=/^\s*(\/\*|\/\/)#?region\b/,this._getFoldWidgetBase=this.getFoldWidget,this.getFoldWidget=function(e,t,n){var r=e.getLine(n);if(this.singleLineBlockCommentRe.test(r)&&!this.startRegionRe.test(r)&&!this.tripleStarBlockCommentRe.test(r))return"";var i=this._getFoldWidgetBase(e,t,n);return!i&&this.startRegionRe.test(r)?"start":i},this.getFoldWidgetRange=function(e,t,n,r){var i=e.getLine(n);if(this.startRegionRe.test(i))return this.getCommentRegionBlock(e,i,n);var s=i.match(this.foldingStartMarker);if(s){var o=s.index;if(s[1])return this.openingBracketBlock(e,s[1],n,o);var u=e.getCommentFoldRange(n,o+s[0].length,1);return u&&!u.isMultiLine()&&(r?u=this.getSectionRange(e,n):t!="all"&&(u=null)),u}if(t==="markbegin")return;var s=i.match(this.foldingStopMarker);if(s){var o=s.index+s[0].length;return s[1]?this.closingBracketBlock(e,s[1],n,o):e.getCommentFoldRange(n,o,-1)}},this.getSectionRange=function(e,t){var n=e.getLine(t),r=n.search(/\S/),s=t,o=n.length;t+=1;var u=t,a=e.getLength();while(++t<a){n=e.getLine(t);var f=n.search(/\S/);if(f===-1)continue;if(r>f)break;var l=this.getFoldWidgetRange(e,"all",t);if(l){if(l.start.row<=s)break;if(l.isMultiLine())t=l.end.row;else if(r==f)break}u=t}return new i(s,o,u,e.getLine(u).length)},this.getCommentRegionBlock=function(e,t,n){var r=t.search(/\s*$/),s=e.getLength(),o=n,u=/^\s*(?:\/\*|\/\/|--)#?(end)?region\b/,a=1;while(++n<s){t=e.getLine(n);var f=u.exec(t);if(!f)continue;f[1]?a--:a++;if(!a)break}var l=n;if(l>o)return new i(o,r,l,t.length)}}.call(o.prototype)}),ace.define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./javascript_highlight_rules").JavaScriptHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("../range").Range,a=e("../worker/worker_client").WorkerClient,f=e("./behaviour/cstyle").CstyleBehaviour,l=e("./folding/cstyle").FoldMode,c=function(){this.HighlightRules=s,this.$outdent=new o,this.$behaviour=new f,this.foldingRules=new l};r.inherits(c,i),function(){this.lineCommentStart="//",this.blockComment={start:"/*",end:"*/"},this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t),i=this.getTokenizer().getLineTokens(t,e),s=i.tokens,o=i.state;if(s.length&&s[s.length-1].type=="comment")return r;if(e=="start"||e=="no_regex"){var u=t.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);u&&(r+=n)}else if(e=="doc-start"){if(o=="start"||o=="no_regex")return"";var u=t.match(/^\s*(\/?)\*/);u&&(u[1]&&(r+=" "),r+="* ")}return r},this.checkOutdent=function(e,t,n){return this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){this.$outdent.autoOutdent(t,n)},this.createWorker=function(e){var t=new a(["ace"],"ace/mode/javascript_worker","JavaScriptWorker");return t.attachToDocument(e.getDocument()),t.on("annotate",function(t){e.setAnnotations(t.data)}),t.on("terminate",function(){e.clearAnnotations()}),t},this.$id="ace/mode/javascript"}.call(c.prototype),t.Mode=c}),ace.define("ace/mode/behaviour/css",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle","ace/token_iterator"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("./cstyle").CstyleBehaviour,o=e("../../token_iterator").TokenIterator,u=function(){this.inherit(s),this.add("colon","insertion",function(e,t,n,r,i){if(i===":"){var s=n.getCursorPosition(),u=new o(r,s.row,s.column),a=u.getCurrentToken();a&&a.value.match(/\s+/)&&(a=u.stepBackward());if(a&&a.type==="support.type"){var f=r.doc.getLine(s.row),l=f.substring(s.column,s.column+1);if(l===":")return{text:"",selection:[1,1]};if(!f.substring(s.column).match(/^\s*;/))return{text:":;",selection:[1,1]}}}}),this.add("colon","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s===":"){var u=n.getCursorPosition(),a=new o(r,u.row,u.column),f=a.getCurrentToken();f&&f.value.match(/\s+/)&&(f=a.stepBackward());if(f&&f.type==="support.type"){var l=r.doc.getLine(i.start.row),c=l.substring(i.end.column,i.end.column+1);if(c===";")return i.end.column++,i}}}),this.add("semicolon","insertion",function(e,t,n,r,i){if(i===";"){var s=n.getCursorPosition(),o=r.doc.getLine(s.row),u=o.substring(s.column,s.column+1);if(u===";")return{text:"",selection:[1,1]}}})};r.inherits(u,s),t.CssBehaviour=u}),ace.define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/behaviour/css","ace/mode/folding/cstyle"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./css_highlight_rules").CssHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("../worker/worker_client").WorkerClient,a=e("./behaviour/css").CssBehaviour,f=e("./folding/cstyle").FoldMode,l=function(){this.HighlightRules=s,this.$outdent=new o,this.$behaviour=new a,this.foldingRules=new f};r.inherits(l,i),function(){this.foldingRules="cStyle",this.blockComment={start:"/*",end:"*/"},this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t),i=this.getTokenizer().getLineTokens(t,e).tokens;if(i.length&&i[i.length-1].type=="comment")return r;var s=t.match(/^.*\{\s*$/);return s&&(r+=n),r},this.checkOutdent=function(e,t,n){return this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){this.$outdent.autoOutdent(t,n)},this.createWorker=function(e){var t=new u(["ace"],"ace/mode/css_worker","Worker");return t.attachToDocument(e.getDocument()),t.on("annotate",function(t){e.setAnnotations(t.data)}),t.on("terminate",function(){e.clearAnnotations()}),t},this.$id="ace/mode/css"}.call(l.prototype),t.Mode=l}),ace.define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"],function(e,t,n){"use strict";function u(e,t){return e.type.lastIndexOf(t+".xml")>-1}var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("../../token_iterator").TokenIterator,o=e("../../lib/lang"),a=function(){this.add("string_dquotes","insertion",function(e,t,n,r,i){if(i=='"'||i=="'"){var o=i,a=r.doc.getTextRange(n.getSelectionRange());if(a!==""&&a!=="'"&&a!='"'&&n.getWrapBehavioursEnabled())return{text:o+a+o,selection:!1};var f=n.getCursorPosition(),l=r.doc.getLine(f.row),c=l.substring(f.column,f.column+1),h=new s(r,f.row,f.column),p=h.getCurrentToken();if(c==o&&(u(p,"attribute-value")||u(p,"string")))return{text:"",selection:[1,1]};p||(p=h.stepBackward());if(!p)return;while(u(p,"tag-whitespace")||u(p,"whitespace"))p=h.stepBackward();var d=!c||c.match(/\s/);if(u(p,"attribute-equals")&&(d||c==">")||u(p,"decl-attribute-equals")&&(d||c=="?"))return{text:o+o,selection:[1,1]}}}),this.add("string_dquotes","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&(s=='"'||s=="'")){var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==s)return i.end.column++,i}}),this.add("autoclosing","insertion",function(e,t,n,r,i){if(i==">"){var o=n.getCursorPosition(),a=new s(r,o.row,o.column),f=a.getCurrentToken()||a.stepBackward();if(!f||!(u(f,"tag-name")||u(f,"tag-whitespace")||u(f,"attribute-name")||u(f,"attribute-equals")||u(f,"attribute-value")))return;if(u(f,"reference.attribute-value"))return;if(u(f,"attribute-value")){var l=f.value.charAt(0);if(l=='"'||l=="'"){var c=f.value.charAt(f.value.length-1),h=a.getCurrentTokenColumn()+f.value.length;if(h>o.column||h==o.column&&l!=c)return}}while(!u(f,"tag-name"))f=a.stepBackward();var p=a.getCurrentTokenRow(),d=a.getCurrentTokenColumn();if(u(a.stepBackward(),"end-tag-open"))return;var v=f.value;p==o.row&&(v=v.substring(0,o.column-d));if(this.voidElements.hasOwnProperty(v.toLowerCase()))return;return{text:"></"+v+">",selection:[1,1]}}}),this.add("autoindent","insertion",function(e,t,n,r,i){if(i=="\n"){var o=n.getCursorPosition(),u=r.getLine(o.row),a=new s(r,o.row,o.column),f=a.getCurrentToken();if(f&&f.type.indexOf("tag-close")!==-1){if(f.value=="/>")return;while(f&&f.type.indexOf("tag-name")===-1)f=a.stepBackward();if(!f)return;var l=f.value,c=a.getCurrentTokenRow();f=a.stepBackward();if(!f||f.type.indexOf("end-tag")!==-1)return;if(this.voidElements&&!this.voidElements[l]){var h=r.getTokenAt(o.row,o.column+1),u=r.getLine(c),p=this.$getIndent(u),d=p+r.getTabString();return h&&h.value==="</"?{text:"\n"+d+"\n"+p,selection:[1,d.length,1,d.length]}:{text:"\n"+d}}}}})};r.inherits(a,i),t.XmlBehaviour=a}),ace.define("ace/mode/folding/mixed",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=t.FoldMode=function(e,t){this.defaultMode=e,this.subModes=t};r.inherits(s,i),function(){this.$getMode=function(e){typeof e!="string"&&(e=e[0]);for(var t in this.subModes)if(e.indexOf(t)===0)return this.subModes[t];return null},this.$tryMode=function(e,t,n,r){var i=this.$getMode(e);return i?i.getFoldWidget(t,n,r):""},this.getFoldWidget=function(e,t,n){return this.$tryMode(e.getState(n-1),e,t,n)||this.$tryMode(e.getState(n),e,t,n)||this.defaultMode.getFoldWidget(e,t,n)},this.getFoldWidgetRange=function(e,t,n){var r=this.$getMode(e.getState(n-1));if(!r||!r.getFoldWidget(e,t,n))r=this.$getMode(e.getState(n));if(!r||!r.getFoldWidget(e,t,n))r=this.defaultMode;return r.getFoldWidgetRange(e,t,n)}}.call(s.prototype)}),ace.define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(e,t,n){"use strict";function l(e,t){return e.type.lastIndexOf(t+".xml")>-1}var r=e("../../lib/oop"),i=e("../../lib/lang"),s=e("../../range").Range,o=e("./fold_mode").FoldMode,u=e("../../token_iterator").TokenIterator,a=t.FoldMode=function(e,t){o.call(this),this.voidElements=e||{},this.optionalEndTags=r.mixin({},this.voidElements),t&&r.mixin(this.optionalEndTags,t)};r.inherits(a,o);var f=function(){this.tagName="",this.closing=!1,this.selfClosing=!1,this.start={row:0,column:0},this.end={row:0,column:0}};(function(){this.getFoldWidget=function(e,t,n){var r=this._getFirstTagInLine(e,n);return r?r.closing||!r.tagName&&r.selfClosing?t=="markbeginend"?"end":"":!r.tagName||r.selfClosing||this.voidElements.hasOwnProperty(r.tagName.toLowerCase())?"":this._findEndTagInLine(e,n,r.tagName,r.end.column)?"":"start":""},this._getFirstTagInLine=function(e,t){var n=e.getTokens(t),r=new f;for(var i=0;i<n.length;i++){var s=n[i];if(l(s,"tag-open")){r.end.column=r.start.column+s.value.length,r.closing=l(s,"end-tag-open"),s=n[++i];if(!s)return null;r.tagName=s.value,r.end.column+=s.value.length;for(i++;i<n.length;i++){s=n[i],r.end.column+=s.value.length;if(l(s,"tag-close")){r.selfClosing=s.value=="/>";break}}return r}if(l(s,"tag-close"))return r.selfClosing=s.value=="/>",r;r.start.column+=s.value.length}return null},this._findEndTagInLine=function(e,t,n,r){var i=e.getTokens(t),s=0;for(var o=0;o<i.length;o++){var u=i[o];s+=u.value.length;if(s<r)continue;if(l(u,"end-tag-open")){u=i[o+1];if(u&&u.value==n)return!0}}return!1},this._readTagForward=function(e){var t=e.getCurrentToken();if(!t)return null;var n=new f;do if(l(t,"tag-open"))n.closing=l(t,"end-tag-open"),n.start.row=e.getCurrentTokenRow(),n.start.column=e.getCurrentTokenColumn();else if(l(t,"tag-name"))n.tagName=t.value;else if(l(t,"tag-close"))return n.selfClosing=t.value=="/>",n.end.row=e.getCurrentTokenRow(),n.end.column=e.getCurrentTokenColumn()+t.value.length,e.stepForward(),n;while(t=e.stepForward());return null},this._readTagBackward=function(e){var t=e.getCurrentToken();if(!t)return null;var n=new f;do{if(l(t,"tag-open"))return n.closing=l(t,"end-tag-open"),n.start.row=e.getCurrentTokenRow(),n.start.column=e.getCurrentTokenColumn(),e.stepBackward(),n;l(t,"tag-name")?n.tagName=t.value:l(t,"tag-close")&&(n.selfClosing=t.value=="/>",n.end.row=e.getCurrentTokenRow(),n.end.column=e.getCurrentTokenColumn()+t.value.length)}while(t=e.stepBackward());return null},this._pop=function(e,t){while(e.length){var n=e[e.length-1];if(!t||n.tagName==t.tagName)return e.pop();if(this.optionalEndTags.hasOwnProperty(n.tagName)){e.pop();continue}return null}},this.getFoldWidgetRange=function(e,t,n){var r=this._getFirstTagInLine(e,n);if(!r)return null;var i=r.closing||r.selfClosing,o=[],a;if(!i){var f=new u(e,n,r.start.column),l={row:n,column:r.start.column+r.tagName.length+2};r.start.row==r.end.row&&(l.column=r.end.column);while(a=this._readTagForward(f)){if(a.selfClosing){if(!o.length)return a.start.column+=a.tagName.length+2,a.end.column-=2,s.fromPoints(a.start,a.end);continue}if(a.closing){this._pop(o,a);if(o.length==0)return s.fromPoints(l,a.start)}else o.push(a)}}else{var f=new u(e,n,r.end.column),c={row:n,column:r.start.column};while(a=this._readTagBackward(f)){if(a.selfClosing){if(!o.length)return a.start.column+=a.tagName.length+2,a.end.column-=2,s.fromPoints(a.start,a.end);continue}if(!a.closing){this._pop(o,a);if(o.length==0)return a.start.column+=a.tagName.length+2,a.start.row==a.end.row&&a.start.column<a.end.column&&(a.start.column=a.end.column),s.fromPoints(a.start,c)}else o.push(a)}}}}).call(a.prototype)}),ace.define("ace/mode/folding/html",["require","exports","module","ace/lib/oop","ace/mode/folding/mixed","ace/mode/folding/xml","ace/mode/folding/cstyle"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./mixed").FoldMode,s=e("./xml").FoldMode,o=e("./cstyle").FoldMode,u=t.FoldMode=function(e,t){i.call(this,new s(e,t),{"js-":new o,"css-":new o})};r.inherits(u,i)}),ace.define("ace/mode/html_completions",["require","exports","module","ace/token_iterator"],function(e,t,n){"use strict";function f(e,t){return e.type.lastIndexOf(t+".xml")>-1}function l(e,t){var n=new r(e,t.row,t.column),i=n.getCurrentToken();while(i&&!f(i,"tag-name"))i=n.stepBackward();if(i)return i.value}var r=e("../token_iterator").TokenIterator,i=["accesskey","class","contenteditable","contextmenu","dir","draggable","dropzone","hidden","id","inert","itemid","itemprop","itemref","itemscope","itemtype","lang","spellcheck","style","tabindex","title","translate"],s=["onabort","onblur","oncancel","oncanplay","oncanplaythrough","onchange","onclick","onclose","oncontextmenu","oncuechange","ondblclick","ondrag","ondragend","ondragenter","ondragleave","ondragover","ondragstart","ondrop","ondurationchange","onemptied","onended","onerror","onfocus","oninput","oninvalid","onkeydown","onkeypress","onkeyup","onload","onloadeddata","onloadedmetadata","onloadstart","onmousedown","onmousemove","onmouseout","onmouseover","onmouseup","onmousewheel","onpause","onplay","onplaying","onprogress","onratechange","onreset","onscroll","onseeked","onseeking","onselect","onshow","onstalled","onsubmit","onsuspend","ontimeupdate","onvolumechange","onwaiting"],o=i.concat(s),u={html:["manifest"],head:[],title:[],base:["href","target"],link:["href","hreflang","rel","media","type","sizes"],meta:["http-equiv","name","content","charset"],style:["type","media","scoped"],script:["charset","type","src","defer","async"],noscript:["href"],body:["onafterprint","onbeforeprint","onbeforeunload","onhashchange","onmessage","onoffline","onpopstate","onredo","onresize","onstorage","onundo","onunload"],section:[],nav:[],article:["pubdate"],aside:[],h1:[],h2:[],h3:[],h4:[],h5:[],h6:[],header:[],footer:[],address:[],main:[],p:[],hr:[],pre:[],blockquote:["cite"],ol:["start","reversed"],ul:[],li:["value"],dl:[],dt:[],dd:[],figure:[],figcaption:[],div:[],a:["href","target","ping","rel","media","hreflang","type"],em:[],strong:[],small:[],s:[],cite:[],q:["cite"],dfn:[],abbr:[],data:[],time:["datetime"],code:[],"var":[],samp:[],kbd:[],sub:[],sup:[],i:[],b:[],u:[],mark:[],ruby:[],rt:[],rp:[],bdi:[],bdo:[],span:[],br:[],wbr:[],ins:["cite","datetime"],del:["cite","datetime"],img:["alt","src","height","width","usemap","ismap"],iframe:["name","src","height","width","sandbox","seamless"],embed:["src","height","width","type"],object:["param","data","type","height","width","usemap","name","form","classid"],param:["name","value"],video:["src","autobuffer","autoplay","loop","controls","width","height","poster"],audio:["src","autobuffer","autoplay","loop","controls"],source:["src","type","media"],track:["kind","src","srclang","label","default"],canvas:["width","height"],map:["name"],area:["shape","coords","href","hreflang","alt","target","media","rel","ping","type"],svg:[],math:[],table:["summary"],caption:[],colgroup:["span"],col:["span"],tbody:[],thead:[],tfoot:[],tr:[],td:["headers","rowspan","colspan"],th:["headers","rowspan","colspan","scope"],form:["accept-charset","action","autocomplete","enctype","method","name","novalidate","target"],fieldset:["disabled","form","name"],legend:[],label:["form","for"],input:["type","accept","alt","autocomplete","checked","disabled","form","formaction","formenctype","formmethod","formnovalidate","formtarget","height","list","max","maxlength","min","multiple","pattern","placeholder","readonly","required","size","src","step","width","files","value"],button:["autofocus","disabled","form","formaction","formenctype","formmethod","formnovalidate","formtarget","name","value","type"],select:["autofocus","disabled","form","multiple","name","size"],datalist:[],optgroup:["disabled","label"],option:["disabled","selected","label","value"],textarea:["autofocus","disabled","form","maxlength","name","placeholder","readonly","required","rows","cols","wrap"],keygen:["autofocus","challenge","disabled","form","keytype","name"],output:["for","form","name"],progress:["value","max"],meter:["value","min","max","low","high","optimum"],details:["open"],summary:[],command:["type","label","icon","disabled","checked","radiogroup","command"],menu:["type","label"],dialog:["open"]},a=Object.keys(u),c=function(){};(function(){this.getCompletions=function(e,t,n,r){var i=t.getTokenAt(n.row,n.column);return i?f(i,"tag-name")||f(i,"tag-open")||f(i,"end-tag-open")?this.getTagCompletions(e,t,n,r):f(i,"tag-whitespace")||f(i,"attribute-name")?this.getAttributeCompetions(e,t,n,r):[]:[]},this.getTagCompletions=function(e,t,n,r){return a.map(function(e){return{value:e,meta:"tag",score:Number.MAX_VALUE}})},this.getAttributeCompetions=function(e,t,n,r){var i=l(t,n);if(!i)return[];var s=o;return i in u&&(s=s.concat(u[i])),s.map(function(e){return{caption:e,snippet:e+'="$0"',meta:"attribute",score:Number.MAX_VALUE}})}}).call(c.prototype),t.HtmlCompletions=c}),ace.define("ace/mode/html",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text","ace/mode/javascript","ace/mode/css","ace/mode/html_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/html","ace/mode/html_completions","ace/worker/worker_client"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/lang"),s=e("./text").Mode,o=e("./javascript").Mode,u=e("./css").Mode,a=e("./html_highlight_rules").HtmlHighlightRules,f=e("./behaviour/xml").XmlBehaviour,l=e("./folding/html").FoldMode,c=e("./html_completions").HtmlCompletions,h=e("../worker/worker_client").WorkerClient,p=["area","base","br","col","embed","hr","img","input","keygen","link","meta","menuitem","param","source","track","wbr"],d=["li","dt","dd","p","rt","rp","optgroup","option","colgroup","td","th"],v=function(e){this.fragmentContext=e&&e.fragmentContext,this.HighlightRules=a,this.$behaviour=new f,this.$completer=new c,this.createModeDelegates({"js-":o,"css-":u}),this.foldingRules=new l(this.voidElements,i.arrayToMap(d))};r.inherits(v,s),function(){this.blockComment={start:"<!--",end:"-->"},this.voidElements=i.arrayToMap(p),this.getNextLineIndent=function(e,t,n){return this.$getIndent(t)},this.checkOutdent=function(e,t,n){return!1},this.getCompletions=function(e,t,n,r){return this.$completer.getCompletions(e,t,n,r)},this.createWorker=function(e){if(this.constructor!=v)return;var t=new h(["ace"],"ace/mode/html_worker","Worker");return t.attachToDocument(e.getDocument()),this.fragmentContext&&t.call("setOptions",[{context:this.fragmentContext}]),t.on("error",function(t){e.setAnnotations(t.data)}),t.on("terminate",function(){e.clearAnnotations()}),t},this.$id="ace/mode/html"}.call(v.prototype),t.Mode=v}),ace.define("ace/mode/ruby_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=t.constantOtherSymbol={token:"constant.other.symbol.ruby",regex:"[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"},o=t.qString={token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},u=t.qqString={token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},a=t.tString={token:"string",regex:"[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"},f=t.constantNumericHex={token:"constant.numeric",regex:"0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"},l=t.constantNumericFloat={token:"constant.numeric",regex:"[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"},c=function(){var e="abort|Array|assert|assert_equal|assert_not_equal|assert_same|assert_not_same|assert_nil|assert_not_nil|assert_match|assert_no_match|assert_in_delta|assert_throws|assert_raise|assert_nothing_raised|assert_instance_of|assert_kind_of|assert_respond_to|assert_operator|assert_send|assert_difference|assert_no_difference|assert_recognizes|assert_generates|assert_response|assert_redirected_to|assert_template|assert_select|assert_select_email|assert_select_rjs|assert_select_encoded|css_select|at_exit|attr|attr_writer|attr_reader|attr_accessor|attr_accessible|autoload|binding|block_given?|callcc|caller|catch|chomp|chomp!|chop|chop!|defined?|delete_via_redirect|eval|exec|exit|exit!|fail|Float|flunk|follow_redirect!|fork|form_for|form_tag|format|gets|global_variables|gsub|gsub!|get_via_redirect|host!|https?|https!|include|Integer|lambda|link_to|link_to_unless_current|link_to_function|link_to_remote|load|local_variables|loop|open|open_session|p|print|printf|proc|putc|puts|post_via_redirect|put_via_redirect|raise|rand|raw|readline|readlines|redirect?|request_via_redirect|require|scan|select|set_trace_func|sleep|split|sprintf|srand|String|stylesheet_link_tag|syscall|system|sub|sub!|test|throw|trace_var|trap|untrace_var|atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan|render|javascript_include_tag|csrf_meta_tag|label_tag|text_field_tag|submit_tag|check_box_tag|content_tag|radio_button_tag|text_area_tag|password_field_tag|hidden_field_tag|fields_for|select_tag|options_for_select|options_from_collection_for_select|collection_select|time_zone_select|select_date|select_time|select_datetime|date_select|time_select|datetime_select|select_year|select_month|select_day|select_hour|select_minute|select_second|file_field_tag|file_field|respond_to|skip_before_filter|around_filter|after_filter|verify|protect_from_forgery|rescue_from|helper_method|redirect_to|before_filter|send_data|send_file|validates_presence_of|validates_uniqueness_of|validates_length_of|validates_format_of|validates_acceptance_of|validates_associated|validates_exclusion_of|validates_inclusion_of|validates_numericality_of|validates_with|validates_each|authenticate_or_request_with_http_basic|authenticate_or_request_with_http_digest|filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|translate|localize|extract_locale_from_tld|caches_page|expire_page|caches_action|expire_action|cache|expire_fragment|expire_cache_for|observe|cache_sweeper|has_many|has_one|belongs_to|has_and_belongs_to_many",t="alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield",n="true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING",r="$DEBUG|$defout|$FILENAME|$LOAD_PATH|$SAFE|$stdin|$stdout|$stderr|$VERBOSE|$!|root_url|flash|session|cookies|params|request|response|logger|self",i=this.$keywords=this.createKeywordMapper({keyword:t,"constant.language":n,"variable.language":r,"support.function":e,"invalid.deprecated":"debugger"},"identifier");this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"comment",regex:"^=begin(?:$|\\s.*$)",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},[{regex:"[{}]",onMatch:function(e,t,n){this.next=e=="{"?this.nextState:"";if(e=="{"&&n.length)return n.unshift("start",t),"paren.lparen";if(e=="}"&&n.length){n.shift(),this.next=n.shift();if(this.next.indexOf("string")!=-1)return"paren.end"}return e=="{"?"paren.lparen":"paren.rparen"},nextState:"start"},{token:"string.start",regex:/"/,push:[{token:"constant.language.escape",regex:/\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/},{token:"paren.start",regex:/\#{/,push:"start"},{token:"string.end",regex:/"/,next:"pop"},{defaultToken:"string"}]},{token:"string.start",regex:/`/,push:[{token:"constant.language.escape",regex:/\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/},{token:"paren.start",regex:/\#{/,push:"start"},{token:"string.end",regex:/`/,next:"pop"},{defaultToken:"string"}]},{token:"string.start",regex:/'/,push:[{token:"constant.language.escape",regex:/\\['\\]/},{token:"string.end",regex:/'/,next:"pop"},{defaultToken:"string"}]}],{token:"text",regex:"::"},{token:"variable.instance",regex:"@{1,2}[a-zA-Z_\\d]+"},{token:"support.class",regex:"[A-Z][a-zA-Z_\\d]+"},s,f,l,{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:i,regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"punctuation.separator.key-value",regex:"=>"},{stateName:"heredoc",onMatch:function(e,t,n){var r=e[2]=="-"?"indentedHeredoc":"heredoc",i=e.split(this.splitRegex);return n.push(r,i[3]),[{type:"constant",value:i[1]},{type:"string",value:i[2]},{type:"support.class",value:i[3]},{type:"string",value:i[4]}]},regex:"(<<-?)(['\"`]?)([\\w]+)(['\"`]?)",rules:{heredoc:[{onMatch:function(e,t,n){return e===n[1]?(n.shift(),n.shift(),this.next=n[0]||"start","support.class"):(this.next="","string")},regex:".*$",next:"start"}],indentedHeredoc:[{token:"string",regex:"^ +"},{onMatch:function(e,t,n){return e===n[1]?(n.shift(),n.shift(),this.next=n[0]||"start","support.class"):(this.next="","string")},regex:".*$",next:"start"}]}},{regex:"$",token:"empty",next:function(e,t){return t[0]==="heredoc"||t[0]==="indentedHeredoc"?t[0]:e}},{token:"string.character",regex:"\\B\\?."},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:"^=end(?:$|\\s.*$)",next:"start"},{token:"comment",regex:".+"}]},this.normalizeRules()};r.inherits(c,i),t.RubyHighlightRules=c}),ace.define("ace/mode/folding/coffee",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=e("../../range").Range,o=t.FoldMode=function(){};r.inherits(o,i),function(){this.getFoldWidgetRange=function(e,t,n){var r=this.indentationBlock(e,n);if(r)return r;var i=/\S/,o=e.getLine(n),u=o.search(i);if(u==-1||o[u]!="#")return;var a=o.length,f=e.getLength(),l=n,c=n;while(++n<f){o=e.getLine(n);var h=o.search(i);if(h==-1)continue;if(o[h]!="#")break;c=n}if(c>l){var p=e.getLine(c).length;return new s(l,a,c,p)}},this.getFoldWidget=function(e,t,n){var r=e.getLine(n),i=r.search(/\S/),s=e.getLine(n+1),o=e.getLine(n-1),u=o.search(/\S/),a=s.search(/\S/);if(i==-1)return e.foldWidgets[n-1]=u!=-1&&u<a?"start":"","";if(u==-1){if(i==a&&r[i]=="#"&&s[i]=="#")return e.foldWidgets[n-1]="",e.foldWidgets[n+1]="","start"}else if(u==i&&r[i]=="#"&&o[i]=="#"&&e.getLine(n-2).search(/\S/)==-1)return e.foldWidgets[n-1]="start",e.foldWidgets[n+1]="","";return u!=-1&&u<i?e.foldWidgets[n-1]="start":e.foldWidgets[n-1]="",i<a?"start":""}}.call(o.prototype)}),ace.define("ace/mode/ruby",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/ruby_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/coffee"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./ruby_highlight_rules").RubyHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("../range").Range,a=e("./behaviour/cstyle").CstyleBehaviour,f=e("./folding/coffee").FoldMode,l=function(){this.HighlightRules=s,this.$outdent=new o,this.$behaviour=new a,this.foldingRules=new f};r.inherits(l,i),function(){this.lineCommentStart="#",this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t),i=this.getTokenizer().getLineTokens(t,e),s=i.tokens;if(s.length&&s[s.length-1].type=="comment")return r;if(e=="start"){var o=t.match(/^.*[\{\(\[]\s*$/),u=t.match(/^\s*(class|def|module)\s.*$/),a=t.match(/.*do(\s*|\s+\|.*\|\s*)$/),f=t.match(/^\s*(if|else)\s*/);if(o||u||a||f)r+=n}return r},this.checkOutdent=function(e,t,n){return/^\s+(end|else)$/.test(t+n)||this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){var r=t.getLine(n);if(/}/.test(r))return this.$outdent.autoOutdent(t,n);var i=this.$getIndent(r),s=t.getLine(n-1),o=this.$getIndent(s),a=t.getTabString();o.length<=i.length&&i.slice(-a.length)==a&&t.remove(new u(n,i.length-a.length,n,i.length))},this.$id="ace/mode/ruby"}.call(l.prototype),t.Mode=l}),ace.define("ace/mode/ejs",["require","exports","module","ace/lib/oop","ace/mode/html_highlight_rules","ace/mode/javascript_highlight_rules","ace/lib/oop","ace/mode/html","ace/mode/javascript","ace/mode/css","ace/mode/ruby"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./html_highlight_rules").HtmlHighlightRules,s=e("./javascript_highlight_rules").JavaScriptHighlightRules,o=function(e,t){i.call(this),e||(e="(?:<%|<\\?|{{)"),t||(t="(?:%>|\\?>|}})");for(var n in this.$rules)this.$rules[n].unshift({token:"markup.list.meta.tag",regex:e+"(?![>}])[-=]?",push:"ejs-start"});this.embedRules(s,"ejs-"),this.$rules["ejs-start"].unshift({token:"markup.list.meta.tag",regex:"-?"+t,next:"pop"},{token:"comment",regex:"//.*?"+t,next:"pop"}),this.$rules["ejs-no_regex"].unshift({token:"markup.list.meta.tag",regex:"-?"+t,next:"pop"},{token:"comment",regex:"//.*?"+t,next:"pop"}),this.normalizeRules()};r.inherits(o,i),t.EjsHighlightRules=o;var r=e("../lib/oop"),u=e("./html").Mode,a=e("./javascript").Mode,f=e("./css").Mode,l=e("./ruby").Mode,c=function(){u.call(this),this.HighlightRules=o,this.createModeDelegates({"js-":a,"css-":f,"ejs-":a})};r.inherits(c,u),function(){this.$id="ace/mode/ejs"}.call(c.prototype),t.Mode=c})
\ No newline at end of file
+ace.define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/lang"),s=e("./text_highlight_rules").TextHighlightRules,o=t.supportType="animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|pointer-events|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index",u=t.supportFunction="rgb|rgba|url|attr|counter|counters",a=t.supportConstant="absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero",f=t.supportConstantColor="aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow",l=t.supportConstantFonts="arial|century|comic|courier|cursive|fantasy|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace",c=t.numRe="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",h=t.pseudoElements="(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b",p=t.pseudoClasses="(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b",d=function(){var e=this.createKeywordMapper({"support.function":u,"support.constant":a,"support.type":o,"support.constant.color":f,"support.constant.fonts":l},"text",!0);this.$rules={start:[{token:"comment",regex:"\\/\\*",push:"comment"},{token:"paren.lparen",regex:"\\{",push:"ruleset"},{token:"string",regex:"@.*?{",push:"media"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"},{caseInsensitive:!0}],media:[{token:"comment",regex:"\\/\\*",push:"comment"},{token:"paren.lparen",regex:"\\{",push:"ruleset"},{token:"string",regex:"\\}",next:"pop"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"},{caseInsensitive:!0}],comment:[{token:"comment",regex:"\\*\\/",next:"pop"},{defaultToken:"comment"}],ruleset:[{token:"paren.rparen",regex:"\\}",next:"pop"},{token:"comment",regex:"\\/\\*",push:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:["constant.numeric","keyword"],regex:"("+c+")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"},{token:"constant.numeric",regex:c},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:["punctuation","entity.other.attribute-name.pseudo-element.css"],regex:h},{token:["punctuation","entity.other.attribute-name.pseudo-class.css"],regex:p},{token:["support.function","string","support.function"],regex:"(url\\()(.*)(\\))"},{token:e,regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"},{caseInsensitive:!0}]},this.normalizeRules()};r.inherits(d,s),t.CssHighlightRules=d}),ace.define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},s.getTagRule(),{defaultToken:"comment.doc",caseInsensitive:!0}]}};r.inherits(s,i),s.getTagRule=function(e){return{token:"comment.doc.tag.storage.type",regex:"\\b(?:TODO|FIXME|XXX|HACK)\\b"}},s.getStartRule=function(e){return{token:"comment.doc",regex:"\\/\\*(?=\\*)",next:e}},s.getEndRule=function(e){return{token:"comment.doc",regex:"\\*\\/",next:e}},t.DocCommentHighlightRules=s}),ace.define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./doc_comment_highlight_rules").DocCommentHighlightRules,s=e("./text_highlight_rules").TextHighlightRules,o=function(e){var t=this.createKeywordMapper({"variable.language":"Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document",keyword:"const|yield|import|get|set|break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|debugger|__parent__|__count__|escape|unescape|with|__proto__|class|enum|extends|super|export|implements|private|public|interface|package|protected|static","storage.type":"const|let|var|function","constant.language":"null|Infinity|NaN|undefined","support.function":"alert","constant.language.boolean":"true|false"},"identifier"),n="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield|void",r="[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*\\b",s="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={no_regex:[{token:"comment",regex:"\\/\\/",next:"line_comment"},i.getStartRule("doc-start"),{token:"comment",regex:/\/\*/,next:"comment"},{token:"string",regex:"'(?=.)",next:"qstring"},{token:"string",regex:'"(?=.)',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator"],regex:"("+r+")(\\.)(prototype)(\\.)("+r+")(\\s*)(=)",next:"function_arguments"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen"],regex:"("+r+")(\\.)("+r+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()",next:"function_arguments"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen"],regex:"("+r+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()",next:"function_arguments"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","entity.name.function","text","paren.lparen"],regex:"("+r+")(\\.)("+r+")(\\s*)(=)(\\s*)(function)(\\s+)(\\w+)(\\s*)(\\()",next:"function_arguments"},{token:["storage.type","text","entity.name.function","text","paren.lparen"],regex:"(function)(\\s+)("+r+")(\\s*)(\\()",next:"function_arguments"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen"],regex:"("+r+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()",next:"function_arguments"},{token:["text","text","storage.type","text","paren.lparen"],regex:"(:)(\\s*)(function)(\\s*)(\\()",next:"function_arguments"},{token:"keyword",regex:"(?:"+n+")\\b",next:"start"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:op|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName|ClassName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["support.constant"],regex:/that\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|trace|timeEnd|assert)\b/},{token:t,regex:r},{token:"keyword.operator",regex:/--|\+\+|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|[!$%&*+\-~\/^]=?/,next:"start"},{token:"punctuation.operator",regex:/[?:,;.]/,next:"start"},{token:"paren.lparen",regex:/[\[({]/,next:"start"},{token:"paren.rparen",regex:/[\])}]/},{token:"comment",regex:/^#!.*$/}],start:[i.getStartRule("doc-start"),{token:"comment",regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/",next:"line_comment_regex_allowed"},{token:"string.regexp",regex:"\\/",next:"regex"},{token:"text",regex:"\\s+|^$",next:"start"},{token:"empty",regex:"",next:"no_regex"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"},{token:"string.regexp",regex:"/[sxngimy]*",next:"no_regex"},{token:"invalid",regex:/\{\d+\b,?\d*\}[+*]|[+*$^?][+*]|[$^][?]|\?{3,}/},{token:"constant.language.escape",regex:/\(\?[:=!]|\)|\{\d+\b,?\d*\}|[+*]\?|[()$^+*?.]/},{token:"constant.language.delimiter",regex:/\|/},{token:"constant.language.escape",regex:/\[\^?/,next:"regex_character_class"},{token:"empty",regex:"$",next:"no_regex"},{defaultToken:"string.regexp"}],regex_character_class:[{token:"regexp.charclass.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"},{token:"constant.language.escape",regex:"]",next:"regex"},{token:"constant.language.escape",regex:"-"},{token:"empty",regex:"$",next:"no_regex"},{defaultToken:"string.regexp.charachterclass"}],function_arguments:[{token:"variable.parameter",regex:r},{token:"punctuation.operator",regex:"[, ]+"},{token:"punctuation.operator",regex:"$"},{token:"empty",regex:"",next:"no_regex"}],comment_regex_allowed:[i.getTagRule(),{token:"comment",regex:"\\*\\/",next:"start"},{defaultToken:"comment",caseInsensitive:!0}],comment:[i.getTagRule(),{token:"comment",regex:"\\*\\/",next:"no_regex"},{defaultToken:"comment",caseInsensitive:!0}],line_comment_regex_allowed:[i.getTagRule(),{token:"comment",regex:"$|^",next:"start"},{defaultToken:"comment",caseInsensitive:!0}],line_comment:[i.getTagRule(),{token:"comment",regex:"$|^",next:"no_regex"},{defaultToken:"comment",caseInsensitive:!0}],qqstring:[{token:"constant.language.escape",regex:s},{token:"string",regex:"\\\\$",next:"qqstring"},{token:"string",regex:'"|$',next:"no_regex"},{defaultToken:"string"}],qstring:[{token:"constant.language.escape",regex:s},{token:"string",regex:"\\\\$",next:"qstring"},{token:"string",regex:"'|$",next:"no_regex"},{defaultToken:"string"}]},(!e||!e.noES6)&&this.$rules.no_regex.unshift({regex:"[{}]",onMatch:function(e,t,n){this.next=e=="{"?this.nextState:"";if(e=="{"&&n.length)return n.unshift("start",t),"paren";if(e=="}"&&n.length){n.shift(),this.next=n.shift();if(this.next.indexOf("string")!=-1)return"paren.quasi.end"}return e=="{"?"paren.lparen":"paren.rparen"},nextState:"start"},{token:"string.quasi.start",regex:/`/,push:[{token:"constant.language.escape",regex:s},{token:"paren.quasi.start",regex:/\${/,push:"start"},{token:"string.quasi.end",regex:/`/,next:"pop"},{defaultToken:"string.quasi"}]}),this.embedRules(i,"doc-",[i.getEndRule("no_regex")]),this.normalizeRules()};r.inherits(o,s),t.JavaScriptHighlightRules=o}),ace.define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(e){var t="[_:a-zA-Z\u00c0-\uffff][-_:.a-zA-Z0-9\u00c0-\uffff]*";this.$rules={start:[{token:"string.cdata.xml",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:["punctuation.xml-decl.xml","keyword.xml-decl.xml"],regex:"(<\\?)(xml)(?=[\\s])",next:"xml_decl",caseInsensitive:!0},{token:["punctuation.instruction.xml","keyword.instruction.xml"],regex:"(<\\?)("+t+")",next:"processing_instruction"},{token:"comment.xml",regex:"<\\!--",next:"comment"},{token:["xml-pe.doctype.xml","xml-pe.doctype.xml"],regex:"(<\\!)(DOCTYPE)(?=[\\s])",next:"doctype",caseInsensitive:!0},{include:"tag"},{token:"text.end-tag-open.xml",regex:"</"},{token:"text.tag-open.xml",regex:"<"},{include:"reference"},{defaultToken:"text.xml"}],xml_decl:[{token:"entity.other.attribute-name.decl-attribute-name.xml",regex:"(?:"+t+":)?"+t+""},{token:"keyword.operator.decl-attribute-equals.xml",regex:"="},{include:"whitespace"},{include:"string"},{token:"punctuation.xml-decl.xml",regex:"\\?>",next:"start"}],processing_instruction:[{token:"punctuation.instruction.xml",regex:"\\?>",next:"start"},{defaultToken:"instruction.xml"}],doctype:[{include:"whitespace"},{include:"string"},{token:"xml-pe.doctype.xml",regex:">",next:"start"},{token:"xml-pe.xml",regex:"[-_a-zA-Z0-9:]+"},{token:"punctuation.int-subset",regex:"\\[",push:"int_subset"}],int_subset:[{token:"text.xml",regex:"\\s+"},{token:"punctuation.int-subset.xml",regex:"]",next:"pop"},{token:["punctuation.markup-decl.xml","keyword.markup-decl.xml"],regex:"(<\\!)("+t+")",push:[{token:"text",regex:"\\s+"},{token:"punctuation.markup-decl.xml",regex:">",next:"pop"},{include:"string"}]}],cdata:[{token:"string.cdata.xml",regex:"\\]\\]>",next:"start"},{token:"text.xml",regex:"\\s+"},{token:"text.xml",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment.xml",regex:"-->",next:"start"},{defaultToken:"comment.xml"}],reference:[{token:"constant.language.escape.reference.xml",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"}],attr_reference:[{token:"constant.language.escape.reference.attribute-value.xml",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"}],tag:[{token:["meta.tag.punctuation.tag-open.xml","meta.tag.punctuation.end-tag-open.xml","meta.tag.tag-name.xml"],regex:"(?:(<)|(</))((?:"+t+":)?"+t+")",next:[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:"start"}]}],tag_whitespace:[{token:"text.tag-whitespace.xml",regex:"\\s+"}],whitespace:[{token:"text.whitespace.xml",regex:"\\s+"}],string:[{token:"string.xml",regex:"'",push:[{token:"string.xml",regex:"'",next:"pop"},{defaultToken:"string.xml"}]},{token:"string.xml",regex:'"',push:[{token:"string.xml",regex:'"',next:"pop"},{defaultToken:"string.xml"}]}],attributes:[{token:"entity.other.attribute-name.xml",regex:"(?:"+t+":)?"+t+""},{token:"keyword.operator.attribute-equals.xml",regex:"="},{include:"tag_whitespace"},{include:"attribute_value"}],attribute_value:[{token:"string.attribute-value.xml",regex:"'",push:[{token:"string.attribute-value.xml",regex:"'",next:"pop"},{include:"attr_reference"},{defaultToken:"string.attribute-value.xml"}]},{token:"string.attribute-value.xml",regex:'"',push:[{token:"string.attribute-value.xml",regex:'"',next:"pop"},{include:"attr_reference"},{defaultToken:"string.attribute-value.xml"}]}]},this.constructor===s&&this.normalizeRules()};(function(){this.embedTagRules=function(e,t,n){this.$rules.tag.unshift({token:["meta.tag.punctuation.tag-open.xml","meta.tag."+n+".tag-name.xml"],regex:"(<)("+n+"(?=\\s|>|$))",next:[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:t+"start"}]}),this.$rules[n+"-end"]=[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:"start",onMatch:function(e,t,n){return n.splice(0),this.token}}],this.embedRules(e,t,[{token:["meta.tag.punctuation.end-tag-open.xml","meta.tag."+n+".tag-name.xml"],regex:"(</)("+n+"(?=\\s|>|$))",next:n+"-end"},{token:"string.cdata.xml",regex:"<\\!\\[CDATA\\["},{token:"string.cdata.xml",regex:"\\]\\]>"}])}}).call(i.prototype),r.inherits(s,i),t.XmlHighlightRules=s}),ace.define("ace/mode/html_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/css_highlight_rules","ace/mode/javascript_highlight_rules","ace/mode/xml_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/lang"),s=e("./css_highlight_rules").CssHighlightRules,o=e("./javascript_highlight_rules").JavaScriptHighlightRules,u=e("./xml_highlight_rules").XmlHighlightRules,a=i.createMap({a:"anchor",button:"form",form:"form",img:"image",input:"form",label:"form",option:"form",script:"script",select:"form",textarea:"form",style:"style",table:"table",tbody:"table",td:"table",tfoot:"table",th:"table",tr:"table"}),f=function(){u.call(this),this.addRules({attributes:[{include:"tag_whitespace"},{token:"entity.other.attribute-name.xml",regex:"[-_a-zA-Z0-9:.]+"},{token:"keyword.operator.attribute-equals.xml",regex:"=",push:[{include:"tag_whitespace"},{token:"string.unquoted.attribute-value.html",regex:"[^<>='\"`\\s]+",next:"pop"},{token:"empty",regex:"",next:"pop"}]},{include:"attribute_value"}],tag:[{token:function(e,t){var n=a[t];return["meta.tag.punctuation."+(e=="<"?"":"end-")+"tag-open.xml","meta.tag"+(n?"."+n:"")+".tag-name.xml"]},regex:"(</?)([-_a-zA-Z0-9:.]+)",next:"tag_stuff"}],tag_stuff:[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:"start"}]}),this.embedTagRules(s,"css-","style"),this.embedTagRules(o,"js-","script"),this.constructor===f&&this.normalizeRules()};r.inherits(f,u),t.HtmlHighlightRules=f}),ace.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("../range").Range,i=function(){};(function(){this.checkOutdent=function(e,t){return/^\s+$/.test(e)?/^\s*\}/.test(t):!1},this.autoOutdent=function(e,t){var n=e.getLine(t),i=n.match(/^(\s*\})/);if(!i)return 0;var s=i[1].length,o=e.findMatchingBracket({row:t,column:s});if(!o||o.row==t)return 0;var u=this.$getIndent(e.getLine(o.row));e.replace(new r(t,0,t,s-1),u)},this.$getIndent=function(e){return e.match(/^\s*/)[0]}}).call(i.prototype),t.MatchingBraceOutdent=i}),ace.define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("../../token_iterator").TokenIterator,o=e("../../lib/lang"),u=["text","paren.rparen","punctuation.operator"],a=["text","paren.rparen","punctuation.operator","comment"],f,l={},c=function(e){var t=-1;e.multiSelect&&(t=e.selection.index,l.rangeCount!=e.multiSelect.rangeCount&&(l={rangeCount:e.multiSelect.rangeCount}));if(l[t])return f=l[t];f=l[t]={autoInsertedBrackets:0,autoInsertedRow:-1,autoInsertedLineEnd:"",maybeInsertedBrackets:0,maybeInsertedRow:-1,maybeInsertedLineStart:"",maybeInsertedLineEnd:""}},h=function(e,t,n,r){var i=e.end.row-e.start.row;return{text:n+t+r,selection:[0,e.start.column+1,i,e.end.column+(i?0:1)]}},p=function(){this.add("braces","insertion",function(e,t,n,r,i){var s=n.getCursorPosition(),u=r.doc.getLine(s.row);if(i=="{"){c(n);var a=n.getSelectionRange(),l=r.doc.getTextRange(a);if(l!==""&&l!=="{"&&n.getWrapBehavioursEnabled())return h(a,l,"{","}");if(p.isSaneInsertion(n,r))return/[\]\}\)]/.test(u[s.column])||n.inMultiSelectMode?(p.recordAutoInsert(n,r,"}"),{text:"{}",selection:[1,1]}):(p.recordMaybeInsert(n,r,"{"),{text:"{",selection:[1,1]})}else if(i=="}"){c(n);var d=u.substring(s.column,s.column+1);if(d=="}"){var v=r.$findOpeningBracket("}",{column:s.column+1,row:s.row});if(v!==null&&p.isAutoInsertedClosing(s,u,i))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}else{if(i=="\n"||i=="\r\n"){c(n);var m="";p.isMaybeInsertedClosing(s,u)&&(m=o.stringRepeat("}",f.maybeInsertedBrackets),p.clearMaybeInsertedClosing());var d=u.substring(s.column,s.column+1);if(d==="}"){var g=r.findMatchingBracket({row:s.row,column:s.column+1},"}");if(!g)return null;var y=this.$getIndent(r.getLine(g.row))}else{if(!m){p.clearMaybeInsertedClosing();return}var y=this.$getIndent(u)}var b=y+r.getTabString();return{text:"\n"+b+"\n"+y+m,selection:[1,b.length,1,b.length]}}p.clearMaybeInsertedClosing()}}),this.add("braces","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="{"){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.end.column,i.end.column+1);if(u=="}")return i.end.column++,i;f.maybeInsertedBrackets--}}),this.add("parens","insertion",function(e,t,n,r,i){if(i=="("){c(n);var s=n.getSelectionRange(),o=r.doc.getTextRange(s);if(o!==""&&n.getWrapBehavioursEnabled())return h(s,o,"(",")");if(p.isSaneInsertion(n,r))return p.recordAutoInsert(n,r,")"),{text:"()",selection:[1,1]}}else if(i==")"){c(n);var u=n.getCursorPosition(),a=r.doc.getLine(u.row),f=a.substring(u.column,u.column+1);if(f==")"){var l=r.$findOpeningBracket(")",{column:u.column+1,row:u.row});if(l!==null&&p.isAutoInsertedClosing(u,a,i))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="("){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==")")return i.end.column++,i}}),this.add("brackets","insertion",function(e,t,n,r,i){if(i=="["){c(n);var s=n.getSelectionRange(),o=r.doc.getTextRange(s);if(o!==""&&n.getWrapBehavioursEnabled())return h(s,o,"[","]");if(p.isSaneInsertion(n,r))return p.recordAutoInsert(n,r,"]"),{text:"[]",selection:[1,1]}}else if(i=="]"){c(n);var u=n.getCursorPosition(),a=r.doc.getLine(u.row),f=a.substring(u.column,u.column+1);if(f=="]"){var l=r.$findOpeningBracket("]",{column:u.column+1,row:u.row});if(l!==null&&p.isAutoInsertedClosing(u,a,i))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}}),this.add("brackets","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="["){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u=="]")return i.end.column++,i}}),this.add("string_dquotes","insertion",function(e,t,n,r,i){if(i=='"'||i=="'"){c(n);var s=i,o=n.getSelectionRange(),u=r.doc.getTextRange(o);if(u!==""&&u!=="'"&&u!='"'&&n.getWrapBehavioursEnabled())return h(o,u,s,s);if(!u){var a=n.getCursorPosition(),f=r.doc.getLine(a.row),l=f.substring(a.column-1,a.column),p=f.substring(a.column,a.column+1),d=r.getTokenAt(a.row,a.column),v=r.getTokenAt(a.row,a.column+1);if(l=="\\"&&d&&/escape/.test(d.type))return null;var m=d&&/string/.test(d.type),g=!v||/string/.test(v.type),y;if(p==s)y=m!==g;else{if(m&&!g)return null;if(m&&g)return null;var b=r.$mode.tokenRe;b.lastIndex=0;var w=b.test(l);b.lastIndex=0;var E=b.test(l);if(w||E)return null;if(p&&!/[\s;,.})\]\\]/.test(p))return null;y=!0}return{text:y?s+s:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&(s=='"'||s=="'")){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==s)return i.end.column++,i}})};p.isSaneInsertion=function(e,t){var n=e.getCursorPosition(),r=new s(t,n.row,n.column);if(!this.$matchTokenType(r.getCurrentToken()||"text",u)){var i=new s(t,n.row,n.column+1);if(!this.$matchTokenType(i.getCurrentToken()||"text",u))return!1}return r.stepForward(),r.getCurrentTokenRow()!==n.row||this.$matchTokenType(r.getCurrentToken()||"text",a)},p.$matchTokenType=function(e,t){return t.indexOf(e.type||e)>-1},p.recordAutoInsert=function(e,t,n){var r=e.getCursorPosition(),i=t.doc.getLine(r.row);this.isAutoInsertedClosing(r,i,f.autoInsertedLineEnd[0])||(f.autoInsertedBrackets=0),f.autoInsertedRow=r.row,f.autoInsertedLineEnd=n+i.substr(r.column),f.autoInsertedBrackets++},p.recordMaybeInsert=function(e,t,n){var r=e.getCursorPosition(),i=t.doc.getLine(r.row);this.isMaybeInsertedClosing(r,i)||(f.maybeInsertedBrackets=0),f.maybeInsertedRow=r.row,f.maybeInsertedLineStart=i.substr(0,r.column)+n,f.maybeInsertedLineEnd=i.substr(r.column),f.maybeInsertedBrackets++},p.isAutoInsertedClosing=function(e,t,n){return f.autoInsertedBrackets>0&&e.row===f.autoInsertedRow&&n===f.autoInsertedLineEnd[0]&&t.substr(e.column)===f.autoInsertedLineEnd},p.isMaybeInsertedClosing=function(e,t){return f.maybeInsertedBrackets>0&&e.row===f.maybeInsertedRow&&t.substr(e.column)===f.maybeInsertedLineEnd&&t.substr(0,e.column)==f.maybeInsertedLineStart},p.popAutoInsertedClosing=function(){f.autoInsertedLineEnd=f.autoInsertedLineEnd.substr(1),f.autoInsertedBrackets--},p.clearMaybeInsertedClosing=function(){f&&(f.maybeInsertedBrackets=0,f.maybeInsertedRow=-1)},r.inherits(p,i),t.CstyleBehaviour=p}),ace.define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../../range").Range,s=e("./fold_mode").FoldMode,o=t.FoldMode=function(e){e&&(this.foldingStartMarker=new RegExp(this.foldingStartMarker.source.replace(/\|[^|]*?$/,"|"+e.start)),this.foldingStopMarker=new RegExp(this.foldingStopMarker.source.replace(/\|[^|]*?$/,"|"+e.end)))};r.inherits(o,s),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.singleLineBlockCommentRe=/^\s*(\/\*).*\*\/\s*$/,this.tripleStarBlockCommentRe=/^\s*(\/\*\*\*).*\*\/\s*$/,this.startRegionRe=/^\s*(\/\*|\/\/)#?region\b/,this._getFoldWidgetBase=this.getFoldWidget,this.getFoldWidget=function(e,t,n){var r=e.getLine(n);if(this.singleLineBlockCommentRe.test(r)&&!this.startRegionRe.test(r)&&!this.tripleStarBlockCommentRe.test(r))return"";var i=this._getFoldWidgetBase(e,t,n);return!i&&this.startRegionRe.test(r)?"start":i},this.getFoldWidgetRange=function(e,t,n,r){var i=e.getLine(n);if(this.startRegionRe.test(i))return this.getCommentRegionBlock(e,i,n);var s=i.match(this.foldingStartMarker);if(s){var o=s.index;if(s[1])return this.openingBracketBlock(e,s[1],n,o);var u=e.getCommentFoldRange(n,o+s[0].length,1);return u&&!u.isMultiLine()&&(r?u=this.getSectionRange(e,n):t!="all"&&(u=null)),u}if(t==="markbegin")return;var s=i.match(this.foldingStopMarker);if(s){var o=s.index+s[0].length;return s[1]?this.closingBracketBlock(e,s[1],n,o):e.getCommentFoldRange(n,o,-1)}},this.getSectionRange=function(e,t){var n=e.getLine(t),r=n.search(/\S/),s=t,o=n.length;t+=1;var u=t,a=e.getLength();while(++t<a){n=e.getLine(t);var f=n.search(/\S/);if(f===-1)continue;if(r>f)break;var l=this.getFoldWidgetRange(e,"all",t);if(l){if(l.start.row<=s)break;if(l.isMultiLine())t=l.end.row;else if(r==f)break}u=t}return new i(s,o,u,e.getLine(u).length)},this.getCommentRegionBlock=function(e,t,n){var r=t.search(/\s*$/),s=e.getLength(),o=n,u=/^\s*(?:\/\*|\/\/|--)#?(end)?region\b/,a=1;while(++n<s){t=e.getLine(n);var f=u.exec(t);if(!f)continue;f[1]?a--:a++;if(!a)break}var l=n;if(l>o)return new i(o,r,l,t.length)}}.call(o.prototype)}),ace.define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./javascript_highlight_rules").JavaScriptHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("../range").Range,a=e("../worker/worker_client").WorkerClient,f=e("./behaviour/cstyle").CstyleBehaviour,l=e("./folding/cstyle").FoldMode,c=function(){this.HighlightRules=s,this.$outdent=new o,this.$behaviour=new f,this.foldingRules=new l};r.inherits(c,i),function(){this.lineCommentStart="//",this.blockComment={start:"/*",end:"*/"},this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t),i=this.getTokenizer().getLineTokens(t,e),s=i.tokens,o=i.state;if(s.length&&s[s.length-1].type=="comment")return r;if(e=="start"||e=="no_regex"){var u=t.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);u&&(r+=n)}else if(e=="doc-start"){if(o=="start"||o=="no_regex")return"";var u=t.match(/^\s*(\/?)\*/);u&&(u[1]&&(r+=" "),r+="* ")}return r},this.checkOutdent=function(e,t,n){return this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){this.$outdent.autoOutdent(t,n)},this.createWorker=function(e){var t=new a(["ace"],"ace/mode/javascript_worker","JavaScriptWorker");return t.attachToDocument(e.getDocument()),t.on("annotate",function(t){e.setAnnotations(t.data)}),t.on("terminate",function(){e.clearAnnotations()}),t},this.$id="ace/mode/javascript"}.call(c.prototype),t.Mode=c}),ace.define("ace/mode/behaviour/css",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle","ace/token_iterator"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("./cstyle").CstyleBehaviour,o=e("../../token_iterator").TokenIterator,u=function(){this.inherit(s),this.add("colon","insertion",function(e,t,n,r,i){if(i===":"){var s=n.getCursorPosition(),u=new o(r,s.row,s.column),a=u.getCurrentToken();a&&a.value.match(/\s+/)&&(a=u.stepBackward());if(a&&a.type==="support.type"){var f=r.doc.getLine(s.row),l=f.substring(s.column,s.column+1);if(l===":")return{text:"",selection:[1,1]};if(!f.substring(s.column).match(/^\s*;/))return{text:":;",selection:[1,1]}}}}),this.add("colon","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s===":"){var u=n.getCursorPosition(),a=new o(r,u.row,u.column),f=a.getCurrentToken();f&&f.value.match(/\s+/)&&(f=a.stepBackward());if(f&&f.type==="support.type"){var l=r.doc.getLine(i.start.row),c=l.substring(i.end.column,i.end.column+1);if(c===";")return i.end.column++,i}}}),this.add("semicolon","insertion",function(e,t,n,r,i){if(i===";"){var s=n.getCursorPosition(),o=r.doc.getLine(s.row),u=o.substring(s.column,s.column+1);if(u===";")return{text:"",selection:[1,1]}}})};r.inherits(u,s),t.CssBehaviour=u}),ace.define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/behaviour/css","ace/mode/folding/cstyle"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./css_highlight_rules").CssHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("../worker/worker_client").WorkerClient,a=e("./behaviour/css").CssBehaviour,f=e("./folding/cstyle").FoldMode,l=function(){this.HighlightRules=s,this.$outdent=new o,this.$behaviour=new a,this.foldingRules=new f};r.inherits(l,i),function(){this.foldingRules="cStyle",this.blockComment={start:"/*",end:"*/"},this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t),i=this.getTokenizer().getLineTokens(t,e).tokens;if(i.length&&i[i.length-1].type=="comment")return r;var s=t.match(/^.*\{\s*$/);return s&&(r+=n),r},this.checkOutdent=function(e,t,n){return this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){this.$outdent.autoOutdent(t,n)},this.createWorker=function(e){var t=new u(["ace"],"ace/mode/css_worker","Worker");return t.attachToDocument(e.getDocument()),t.on("annotate",function(t){e.setAnnotations(t.data)}),t.on("terminate",function(){e.clearAnnotations()}),t},this.$id="ace/mode/css"}.call(l.prototype),t.Mode=l}),ace.define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"],function(e,t,n){"use strict";function u(e,t){return e.type.lastIndexOf(t+".xml")>-1}var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("../../token_iterator").TokenIterator,o=e("../../lib/lang"),a=function(){this.add("string_dquotes","insertion",function(e,t,n,r,i){if(i=='"'||i=="'"){var o=i,a=r.doc.getTextRange(n.getSelectionRange());if(a!==""&&a!=="'"&&a!='"'&&n.getWrapBehavioursEnabled())return{text:o+a+o,selection:!1};var f=n.getCursorPosition(),l=r.doc.getLine(f.row),c=l.substring(f.column,f.column+1),h=new s(r,f.row,f.column),p=h.getCurrentToken();if(c==o&&(u(p,"attribute-value")||u(p,"string")))return{text:"",selection:[1,1]};p||(p=h.stepBackward());if(!p)return;while(u(p,"tag-whitespace")||u(p,"whitespace"))p=h.stepBackward();var d=!c||c.match(/\s/);if(u(p,"attribute-equals")&&(d||c==">")||u(p,"decl-attribute-equals")&&(d||c=="?"))return{text:o+o,selection:[1,1]}}}),this.add("string_dquotes","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&(s=='"'||s=="'")){var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==s)return i.end.column++,i}}),this.add("autoclosing","insertion",function(e,t,n,r,i){if(i==">"){var o=n.getCursorPosition(),a=new s(r,o.row,o.column),f=a.getCurrentToken()||a.stepBackward();if(!f||!(u(f,"tag-name")||u(f,"tag-whitespace")||u(f,"attribute-name")||u(f,"attribute-equals")||u(f,"attribute-value")))return;if(u(f,"reference.attribute-value"))return;if(u(f,"attribute-value")){var l=f.value.charAt(0);if(l=='"'||l=="'"){var c=f.value.charAt(f.value.length-1),h=a.getCurrentTokenColumn()+f.value.length;if(h>o.column||h==o.column&&l!=c)return}}while(!u(f,"tag-name"))f=a.stepBackward();var p=a.getCurrentTokenRow(),d=a.getCurrentTokenColumn();if(u(a.stepBackward(),"end-tag-open"))return;var v=f.value;p==o.row&&(v=v.substring(0,o.column-d));if(this.voidElements.hasOwnProperty(v.toLowerCase()))return;return{text:"></"+v+">",selection:[1,1]}}}),this.add("autoindent","insertion",function(e,t,n,r,i){if(i=="\n"){var o=n.getCursorPosition(),u=r.getLine(o.row),a=new s(r,o.row,o.column),f=a.getCurrentToken();if(f&&f.type.indexOf("tag-close")!==-1){if(f.value=="/>")return;while(f&&f.type.indexOf("tag-name")===-1)f=a.stepBackward();if(!f)return;var l=f.value,c=a.getCurrentTokenRow();f=a.stepBackward();if(!f||f.type.indexOf("end-tag")!==-1)return;if(this.voidElements&&!this.voidElements[l]){var h=r.getTokenAt(o.row,o.column+1),u=r.getLine(c),p=this.$getIndent(u),d=p+r.getTabString();return h&&h.value==="</"?{text:"\n"+d+"\n"+p,selection:[1,d.length,1,d.length]}:{text:"\n"+d}}}}})};r.inherits(a,i),t.XmlBehaviour=a}),ace.define("ace/mode/folding/mixed",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=t.FoldMode=function(e,t){this.defaultMode=e,this.subModes=t};r.inherits(s,i),function(){this.$getMode=function(e){typeof e!="string"&&(e=e[0]);for(var t in this.subModes)if(e.indexOf(t)===0)return this.subModes[t];return null},this.$tryMode=function(e,t,n,r){var i=this.$getMode(e);return i?i.getFoldWidget(t,n,r):""},this.getFoldWidget=function(e,t,n){return this.$tryMode(e.getState(n-1),e,t,n)||this.$tryMode(e.getState(n),e,t,n)||this.defaultMode.getFoldWidget(e,t,n)},this.getFoldWidgetRange=function(e,t,n){var r=this.$getMode(e.getState(n-1));if(!r||!r.getFoldWidget(e,t,n))r=this.$getMode(e.getState(n));if(!r||!r.getFoldWidget(e,t,n))r=this.defaultMode;return r.getFoldWidgetRange(e,t,n)}}.call(s.prototype)}),ace.define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(e,t,n){"use strict";function l(e,t){return e.type.lastIndexOf(t+".xml")>-1}var r=e("../../lib/oop"),i=e("../../lib/lang"),s=e("../../range").Range,o=e("./fold_mode").FoldMode,u=e("../../token_iterator").TokenIterator,a=t.FoldMode=function(e,t){o.call(this),this.voidElements=e||{},this.optionalEndTags=r.mixin({},this.voidElements),t&&r.mixin(this.optionalEndTags,t)};r.inherits(a,o);var f=function(){this.tagName="",this.closing=!1,this.selfClosing=!1,this.start={row:0,column:0},this.end={row:0,column:0}};(function(){this.getFoldWidget=function(e,t,n){var r=this._getFirstTagInLine(e,n);return r?r.closing||!r.tagName&&r.selfClosing?t=="markbeginend"?"end":"":!r.tagName||r.selfClosing||this.voidElements.hasOwnProperty(r.tagName.toLowerCase())?"":this._findEndTagInLine(e,n,r.tagName,r.end.column)?"":"start":""},this._getFirstTagInLine=function(e,t){var n=e.getTokens(t),r=new f;for(var i=0;i<n.length;i++){var s=n[i];if(l(s,"tag-open")){r.end.column=r.start.column+s.value.length,r.closing=l(s,"end-tag-open"),s=n[++i];if(!s)return null;r.tagName=s.value,r.end.column+=s.value.length;for(i++;i<n.length;i++){s=n[i],r.end.column+=s.value.length;if(l(s,"tag-close")){r.selfClosing=s.value=="/>";break}}return r}if(l(s,"tag-close"))return r.selfClosing=s.value=="/>",r;r.start.column+=s.value.length}return null},this._findEndTagInLine=function(e,t,n,r){var i=e.getTokens(t),s=0;for(var o=0;o<i.length;o++){var u=i[o];s+=u.value.length;if(s<r)continue;if(l(u,"end-tag-open")){u=i[o+1];if(u&&u.value==n)return!0}}return!1},this._readTagForward=function(e){var t=e.getCurrentToken();if(!t)return null;var n=new f;do if(l(t,"tag-open"))n.closing=l(t,"end-tag-open"),n.start.row=e.getCurrentTokenRow(),n.start.column=e.getCurrentTokenColumn();else if(l(t,"tag-name"))n.tagName=t.value;else if(l(t,"tag-close"))return n.selfClosing=t.value=="/>",n.end.row=e.getCurrentTokenRow(),n.end.column=e.getCurrentTokenColumn()+t.value.length,e.stepForward(),n;while(t=e.stepForward());return null},this._readTagBackward=function(e){var t=e.getCurrentToken();if(!t)return null;var n=new f;do{if(l(t,"tag-open"))return n.closing=l(t,"end-tag-open"),n.start.row=e.getCurrentTokenRow(),n.start.column=e.getCurrentTokenColumn(),e.stepBackward(),n;l(t,"tag-name")?n.tagName=t.value:l(t,"tag-close")&&(n.selfClosing=t.value=="/>",n.end.row=e.getCurrentTokenRow(),n.end.column=e.getCurrentTokenColumn()+t.value.length)}while(t=e.stepBackward());return null},this._pop=function(e,t){while(e.length){var n=e[e.length-1];if(!t||n.tagName==t.tagName)return e.pop();if(this.optionalEndTags.hasOwnProperty(n.tagName)){e.pop();continue}return null}},this.getFoldWidgetRange=function(e,t,n){var r=this._getFirstTagInLine(e,n);if(!r)return null;var i=r.closing||r.selfClosing,o=[],a;if(!i){var f=new u(e,n,r.start.column),l={row:n,column:r.start.column+r.tagName.length+2};r.start.row==r.end.row&&(l.column=r.end.column);while(a=this._readTagForward(f)){if(a.selfClosing){if(!o.length)return a.start.column+=a.tagName.length+2,a.end.column-=2,s.fromPoints(a.start,a.end);continue}if(a.closing){this._pop(o,a);if(o.length==0)return s.fromPoints(l,a.start)}else o.push(a)}}else{var f=new u(e,n,r.end.column),c={row:n,column:r.start.column};while(a=this._readTagBackward(f)){if(a.selfClosing){if(!o.length)return a.start.column+=a.tagName.length+2,a.end.column-=2,s.fromPoints(a.start,a.end);continue}if(!a.closing){this._pop(o,a);if(o.length==0)return a.start.column+=a.tagName.length+2,a.start.row==a.end.row&&a.start.column<a.end.column&&(a.start.column=a.end.column),s.fromPoints(a.start,c)}else o.push(a)}}}}).call(a.prototype)}),ace.define("ace/mode/folding/html",["require","exports","module","ace/lib/oop","ace/mode/folding/mixed","ace/mode/folding/xml","ace/mode/folding/cstyle"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./mixed").FoldMode,s=e("./xml").FoldMode,o=e("./cstyle").FoldMode,u=t.FoldMode=function(e,t){i.call(this,new s(e,t),{"js-":new o,"css-":new o})};r.inherits(u,i)}),ace.define("ace/mode/html_completions",["require","exports","module","ace/token_iterator"],function(e,t,n){"use strict";function f(e,t){return e.type.lastIndexOf(t+".xml")>-1}function l(e,t){var n=new r(e,t.row,t.column),i=n.getCurrentToken();while(i&&!f(i,"tag-name"))i=n.stepBackward();if(i)return i.value}var r=e("../token_iterator").TokenIterator,i=["accesskey","class","contenteditable","contextmenu","dir","draggable","dropzone","hidden","id","inert","itemid","itemprop","itemref","itemscope","itemtype","lang","spellcheck","style","tabindex","title","translate"],s=["onabort","onblur","oncancel","oncanplay","oncanplaythrough","onchange","onclick","onclose","oncontextmenu","oncuechange","ondblclick","ondrag","ondragend","ondragenter","ondragleave","ondragover","ondragstart","ondrop","ondurationchange","onemptied","onended","onerror","onfocus","oninput","oninvalid","onkeydown","onkeypress","onkeyup","onload","onloadeddata","onloadedmetadata","onloadstart","onmousedown","onmousemove","onmouseout","onmouseover","onmouseup","onmousewheel","onpause","onplay","onplaying","onprogress","onratechange","onreset","onscroll","onseeked","onseeking","onselect","onshow","onstalled","onsubmit","onsuspend","ontimeupdate","onvolumechange","onwaiting"],o=i.concat(s),u={html:["manifest"],head:[],title:[],base:["href","target"],link:["href","hreflang","rel","media","type","sizes"],meta:["http-equiv","name","content","charset"],style:["type","media","scoped"],script:["charset","type","src","defer","async"],noscript:["href"],body:["onafterprint","onbeforeprint","onbeforeunload","onhashchange","onmessage","onoffline","onpopstate","onredo","onresize","onstorage","onundo","onunload"],section:[],nav:[],article:["pubdate"],aside:[],h1:[],h2:[],h3:[],h4:[],h5:[],h6:[],header:[],footer:[],address:[],main:[],p:[],hr:[],pre:[],blockquote:["cite"],ol:["start","reversed"],ul:[],li:["value"],dl:[],dt:[],dd:[],figure:[],figcaption:[],div:[],a:["href","target","ping","rel","media","hreflang","type"],em:[],strong:[],small:[],s:[],cite:[],q:["cite"],dfn:[],abbr:[],data:[],time:["datetime"],code:[],"var":[],samp:[],kbd:[],sub:[],sup:[],i:[],b:[],u:[],mark:[],ruby:[],rt:[],rp:[],bdi:[],bdo:[],span:[],br:[],wbr:[],ins:["cite","datetime"],del:["cite","datetime"],img:["alt","src","height","width","usemap","ismap"],iframe:["name","src","height","width","sandbox","seamless"],embed:["src","height","width","type"],object:["param","data","type","height","width","usemap","name","form","classid"],param:["name","value"],video:["src","autobuffer","autoplay","loop","controls","width","height","poster"],audio:["src","autobuffer","autoplay","loop","controls"],source:["src","type","media"],track:["kind","src","srclang","label","default"],canvas:["width","height"],map:["name"],area:["shape","coords","href","hreflang","alt","target","media","rel","ping","type"],svg:[],math:[],table:["summary"],caption:[],colgroup:["span"],col:["span"],tbody:[],thead:[],tfoot:[],tr:[],td:["headers","rowspan","colspan"],th:["headers","rowspan","colspan","scope"],form:["accept-charset","action","autocomplete","enctype","method","name","novalidate","target"],fieldset:["disabled","form","name"],legend:[],label:["form","for"],input:["type","accept","alt","autocomplete","checked","disabled","form","formaction","formenctype","formmethod","formnovalidate","formtarget","height","list","max","maxlength","min","multiple","pattern","placeholder","readonly","required","size","src","step","width","files","value"],button:["autofocus","disabled","form","formaction","formenctype","formmethod","formnovalidate","formtarget","name","value","type"],select:["autofocus","disabled","form","multiple","name","size"],datalist:[],optgroup:["disabled","label"],option:["disabled","selected","label","value"],textarea:["autofocus","disabled","form","maxlength","name","placeholder","readonly","required","rows","cols","wrap"],keygen:["autofocus","challenge","disabled","form","keytype","name"],output:["for","form","name"],progress:["value","max"],meter:["value","min","max","low","high","optimum"],details:["open"],summary:[],command:["type","label","icon","disabled","checked","radiogroup","command"],menu:["type","label"],dialog:["open"]},a=Object.keys(u),c=function(){};(function(){this.getCompletions=function(e,t,n,r){var i=t.getTokenAt(n.row,n.column);return i?f(i,"tag-name")||f(i,"tag-open")||f(i,"end-tag-open")?this.getTagCompletions(e,t,n,r):f(i,"tag-whitespace")||f(i,"attribute-name")?this.getAttributeCompetions(e,t,n,r):[]:[]},this.getTagCompletions=function(e,t,n,r){return a.map(function(e){return{value:e,meta:"tag",score:Number.MAX_VALUE}})},this.getAttributeCompetions=function(e,t,n,r){var i=l(t,n);if(!i)return[];var s=o;return i in u&&(s=s.concat(u[i])),s.map(function(e){return{caption:e,snippet:e+'="$0"',meta:"attribute",score:Number.MAX_VALUE}})}}).call(c.prototype),t.HtmlCompletions=c}),ace.define("ace/mode/html",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text","ace/mode/javascript","ace/mode/css","ace/mode/html_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/html","ace/mode/html_completions","ace/worker/worker_client"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/lang"),s=e("./text").Mode,o=e("./javascript").Mode,u=e("./css").Mode,a=e("./html_highlight_rules").HtmlHighlightRules,f=e("./behaviour/xml").XmlBehaviour,l=e("./folding/html").FoldMode,c=e("./html_completions").HtmlCompletions,h=e("../worker/worker_client").WorkerClient,p=["area","base","br","col","embed","hr","img","input","keygen","link","meta","menuitem","param","source","track","wbr"],d=["li","dt","dd","p","rt","rp","optgroup","option","colgroup","td","th"],v=function(e){this.fragmentContext=e&&e.fragmentContext,this.HighlightRules=a,this.$behaviour=new f,this.$completer=new c,this.createModeDelegates({"js-":o,"css-":u}),this.foldingRules=new l(this.voidElements,i.arrayToMap(d))};r.inherits(v,s),function(){this.blockComment={start:"<!--",end:"-->"},this.voidElements=i.arrayToMap(p),this.getNextLineIndent=function(e,t,n){return this.$getIndent(t)},this.checkOutdent=function(e,t,n){return!1},this.getCompletions=function(e,t,n,r){return this.$completer.getCompletions(e,t,n,r)},this.createWorker=function(e){if(this.constructor!=v)return;var t=new h(["ace"],"ace/mode/html_worker","Worker");return t.attachToDocument(e.getDocument()),this.fragmentContext&&t.call("setOptions",[{context:this.fragmentContext}]),t.on("error",function(t){e.setAnnotations(t.data)}),t.on("terminate",function(){e.clearAnnotations()}),t},this.$id="ace/mode/html"}.call(v.prototype),t.Mode=v}),ace.define("ace/mode/ruby_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=t.constantOtherSymbol={token:"constant.other.symbol.ruby",regex:"[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"},o=t.qString={token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},u=t.qqString={token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},a=t.tString={token:"string",regex:"[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"},f=t.constantNumericHex={token:"constant.numeric",regex:"0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"},l=t.constantNumericFloat={token:"constant.numeric",regex:"[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"},c=function(){var e="abort|Array|assert|assert_equal|assert_not_equal|assert_same|assert_not_same|assert_nil|assert_not_nil|assert_match|assert_no_match|assert_in_delta|assert_throws|assert_raise|assert_nothing_raised|assert_instance_of|assert_kind_of|assert_respond_to|assert_operator|assert_send|assert_difference|assert_no_difference|assert_recognizes|assert_generates|assert_response|assert_redirected_to|assert_template|assert_select|assert_select_email|assert_select_rjs|assert_select_encoded|css_select|at_exit|attr|attr_writer|attr_reader|attr_accessor|attr_accessible|autoload|binding|block_given?|callcc|caller|catch|chomp|chomp!|chop|chop!|defined?|delete_via_redirect|eval|exec|exit|exit!|fail|Float|flunk|follow_redirect!|fork|form_for|form_tag|format|gets|global_variables|gsub|gsub!|get_via_redirect|host!|https?|https!|include|Integer|lambda|link_to|link_to_unless_current|link_to_function|link_to_remote|load|local_variables|loop|open|open_session|p|print|printf|proc|putc|puts|post_via_redirect|put_via_redirect|raise|rand|raw|readline|readlines|redirect?|request_via_redirect|require|scan|select|set_trace_func|sleep|split|sprintf|srand|String|stylesheet_link_tag|syscall|system|sub|sub!|test|throw|trace_var|trap|untrace_var|atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan|render|javascript_include_tag|csrf_meta_tag|label_tag|text_field_tag|submit_tag|check_box_tag|content_tag|radio_button_tag|text_area_tag|password_field_tag|hidden_field_tag|fields_for|select_tag|options_for_select|options_from_collection_for_select|collection_select|time_zone_select|select_date|select_time|select_datetime|date_select|time_select|datetime_select|select_year|select_month|select_day|select_hour|select_minute|select_second|file_field_tag|file_field|respond_to|skip_before_action|around_filter|after_filter|verify|protect_from_forgery|rescue_from|helper_method|redirect_to|before_action|send_data|send_file|validates_presence_of|validates_uniqueness_of|validates_length_of|validates_format_of|validates_acceptance_of|validates_associated|validates_exclusion_of|validates_inclusion_of|validates_numericality_of|validates_with|validates_each|authenticate_or_request_with_http_basic|authenticate_or_request_with_http_digest|filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|translate|localize|extract_locale_from_tld|caches_page|expire_page|caches_action|expire_action|cache|expire_fragment|expire_cache_for|observe|cache_sweeper|has_many|has_one|belongs_to|has_and_belongs_to_many",t="alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield",n="true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING",r="$DEBUG|$defout|$FILENAME|$LOAD_PATH|$SAFE|$stdin|$stdout|$stderr|$VERBOSE|$!|root_url|flash|session|cookies|params|request|response|logger|self",i=this.$keywords=this.createKeywordMapper({keyword:t,"constant.language":n,"variable.language":r,"support.function":e,"invalid.deprecated":"debugger"},"identifier");this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"comment",regex:"^=begin(?:$|\\s.*$)",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},[{regex:"[{}]",onMatch:function(e,t,n){this.next=e=="{"?this.nextState:"";if(e=="{"&&n.length)return n.unshift("start",t),"paren.lparen";if(e=="}"&&n.length){n.shift(),this.next=n.shift();if(this.next.indexOf("string")!=-1)return"paren.end"}return e=="{"?"paren.lparen":"paren.rparen"},nextState:"start"},{token:"string.start",regex:/"/,push:[{token:"constant.language.escape",regex:/\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/},{token:"paren.start",regex:/\#{/,push:"start"},{token:"string.end",regex:/"/,next:"pop"},{defaultToken:"string"}]},{token:"string.start",regex:/`/,push:[{token:"constant.language.escape",regex:/\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/},{token:"paren.start",regex:/\#{/,push:"start"},{token:"string.end",regex:/`/,next:"pop"},{defaultToken:"string"}]},{token:"string.start",regex:/'/,push:[{token:"constant.language.escape",regex:/\\['\\]/},{token:"string.end",regex:/'/,next:"pop"},{defaultToken:"string"}]}],{token:"text",regex:"::"},{token:"variable.instance",regex:"@{1,2}[a-zA-Z_\\d]+"},{token:"support.class",regex:"[A-Z][a-zA-Z_\\d]+"},s,f,l,{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:i,regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"punctuation.separator.key-value",regex:"=>"},{stateName:"heredoc",onMatch:function(e,t,n){var r=e[2]=="-"?"indentedHeredoc":"heredoc",i=e.split(this.splitRegex);return n.push(r,i[3]),[{type:"constant",value:i[1]},{type:"string",value:i[2]},{type:"support.class",value:i[3]},{type:"string",value:i[4]}]},regex:"(<<-?)(['\"`]?)([\\w]+)(['\"`]?)",rules:{heredoc:[{onMatch:function(e,t,n){return e===n[1]?(n.shift(),n.shift(),this.next=n[0]||"start","support.class"):(this.next="","string")},regex:".*$",next:"start"}],indentedHeredoc:[{token:"string",regex:"^ +"},{onMatch:function(e,t,n){return e===n[1]?(n.shift(),n.shift(),this.next=n[0]||"start","support.class"):(this.next="","string")},regex:".*$",next:"start"}]}},{regex:"$",token:"empty",next:function(e,t){return t[0]==="heredoc"||t[0]==="indentedHeredoc"?t[0]:e}},{token:"string.character",regex:"\\B\\?."},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:"^=end(?:$|\\s.*$)",next:"start"},{token:"comment",regex:".+"}]},this.normalizeRules()};r.inherits(c,i),t.RubyHighlightRules=c}),ace.define("ace/mode/folding/coffee",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=e("../../range").Range,o=t.FoldMode=function(){};r.inherits(o,i),function(){this.getFoldWidgetRange=function(e,t,n){var r=this.indentationBlock(e,n);if(r)return r;var i=/\S/,o=e.getLine(n),u=o.search(i);if(u==-1||o[u]!="#")return;var a=o.length,f=e.getLength(),l=n,c=n;while(++n<f){o=e.getLine(n);var h=o.search(i);if(h==-1)continue;if(o[h]!="#")break;c=n}if(c>l){var p=e.getLine(c).length;return new s(l,a,c,p)}},this.getFoldWidget=function(e,t,n){var r=e.getLine(n),i=r.search(/\S/),s=e.getLine(n+1),o=e.getLine(n-1),u=o.search(/\S/),a=s.search(/\S/);if(i==-1)return e.foldWidgets[n-1]=u!=-1&&u<a?"start":"","";if(u==-1){if(i==a&&r[i]=="#"&&s[i]=="#")return e.foldWidgets[n-1]="",e.foldWidgets[n+1]="","start"}else if(u==i&&r[i]=="#"&&o[i]=="#"&&e.getLine(n-2).search(/\S/)==-1)return e.foldWidgets[n-1]="start",e.foldWidgets[n+1]="","";return u!=-1&&u<i?e.foldWidgets[n-1]="start":e.foldWidgets[n-1]="",i<a?"start":""}}.call(o.prototype)}),ace.define("ace/mode/ruby",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/ruby_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/coffee"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./ruby_highlight_rules").RubyHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("../range").Range,a=e("./behaviour/cstyle").CstyleBehaviour,f=e("./folding/coffee").FoldMode,l=function(){this.HighlightRules=s,this.$outdent=new o,this.$behaviour=new a,this.foldingRules=new f};r.inherits(l,i),function(){this.lineCommentStart="#",this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t),i=this.getTokenizer().getLineTokens(t,e),s=i.tokens;if(s.length&&s[s.length-1].type=="comment")return r;if(e=="start"){var o=t.match(/^.*[\{\(\[]\s*$/),u=t.match(/^\s*(class|def|module)\s.*$/),a=t.match(/.*do(\s*|\s+\|.*\|\s*)$/),f=t.match(/^\s*(if|else)\s*/);if(o||u||a||f)r+=n}return r},this.checkOutdent=function(e,t,n){return/^\s+(end|else)$/.test(t+n)||this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){var r=t.getLine(n);if(/}/.test(r))return this.$outdent.autoOutdent(t,n);var i=this.$getIndent(r),s=t.getLine(n-1),o=this.$getIndent(s),a=t.getTabString();o.length<=i.length&&i.slice(-a.length)==a&&t.remove(new u(n,i.length-a.length,n,i.length))},this.$id="ace/mode/ruby"}.call(l.prototype),t.Mode=l}),ace.define("ace/mode/ejs",["require","exports","module","ace/lib/oop","ace/mode/html_highlight_rules","ace/mode/javascript_highlight_rules","ace/lib/oop","ace/mode/html","ace/mode/javascript","ace/mode/css","ace/mode/ruby"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./html_highlight_rules").HtmlHighlightRules,s=e("./javascript_highlight_rules").JavaScriptHighlightRules,o=function(e,t){i.call(this),e||(e="(?:<%|<\\?|{{)"),t||(t="(?:%>|\\?>|}})");for(var n in this.$rules)this.$rules[n].unshift({token:"markup.list.meta.tag",regex:e+"(?![>}])[-=]?",push:"ejs-start"});this.embedRules(s,"ejs-"),this.$rules["ejs-start"].unshift({token:"markup.list.meta.tag",regex:"-?"+t,next:"pop"},{token:"comment",regex:"//.*?"+t,next:"pop"}),this.$rules["ejs-no_regex"].unshift({token:"markup.list.meta.tag",regex:"-?"+t,next:"pop"},{token:"comment",regex:"//.*?"+t,next:"pop"}),this.normalizeRules()};r.inherits(o,i),t.EjsHighlightRules=o;var r=e("../lib/oop"),u=e("./html").Mode,a=e("./javascript").Mode,f=e("./css").Mode,l=e("./ruby").Mode,c=function(){u.call(this),this.HighlightRules=o,this.createModeDelegates({"js-":a,"css-":f,"ejs-":a})};r.inherits(c,u),function(){this.$id="ace/mode/ejs"}.call(c.prototype),t.Mode=c})
\ No newline at end of file
diff --git a/public/javascripts/ace/mode-haml.js b/public/javascripts/ace/mode-haml.js
index 1952632df0..225b778fd6 100644
--- a/public/javascripts/ace/mode-haml.js
+++ b/public/javascripts/ace/mode-haml.js
@@ -1 +1 @@
-ace.define("ace/mode/ruby_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=t.constantOtherSymbol={token:"constant.other.symbol.ruby",regex:"[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"},o=t.qString={token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},u=t.qqString={token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},a=t.tString={token:"string",regex:"[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"},f=t.constantNumericHex={token:"constant.numeric",regex:"0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"},l=t.constantNumericFloat={token:"constant.numeric",regex:"[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"},c=function(){var e="abort|Array|assert|assert_equal|assert_not_equal|assert_same|assert_not_same|assert_nil|assert_not_nil|assert_match|assert_no_match|assert_in_delta|assert_throws|assert_raise|assert_nothing_raised|assert_instance_of|assert_kind_of|assert_respond_to|assert_operator|assert_send|assert_difference|assert_no_difference|assert_recognizes|assert_generates|assert_response|assert_redirected_to|assert_template|assert_select|assert_select_email|assert_select_rjs|assert_select_encoded|css_select|at_exit|attr|attr_writer|attr_reader|attr_accessor|attr_accessible|autoload|binding|block_given?|callcc|caller|catch|chomp|chomp!|chop|chop!|defined?|delete_via_redirect|eval|exec|exit|exit!|fail|Float|flunk|follow_redirect!|fork|form_for|form_tag|format|gets|global_variables|gsub|gsub!|get_via_redirect|host!|https?|https!|include|Integer|lambda|link_to|link_to_unless_current|link_to_function|link_to_remote|load|local_variables|loop|open|open_session|p|print|printf|proc|putc|puts|post_via_redirect|put_via_redirect|raise|rand|raw|readline|readlines|redirect?|request_via_redirect|require|scan|select|set_trace_func|sleep|split|sprintf|srand|String|stylesheet_link_tag|syscall|system|sub|sub!|test|throw|trace_var|trap|untrace_var|atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan|render|javascript_include_tag|csrf_meta_tag|label_tag|text_field_tag|submit_tag|check_box_tag|content_tag|radio_button_tag|text_area_tag|password_field_tag|hidden_field_tag|fields_for|select_tag|options_for_select|options_from_collection_for_select|collection_select|time_zone_select|select_date|select_time|select_datetime|date_select|time_select|datetime_select|select_year|select_month|select_day|select_hour|select_minute|select_second|file_field_tag|file_field|respond_to|skip_before_filter|around_filter|after_filter|verify|protect_from_forgery|rescue_from|helper_method|redirect_to|before_filter|send_data|send_file|validates_presence_of|validates_uniqueness_of|validates_length_of|validates_format_of|validates_acceptance_of|validates_associated|validates_exclusion_of|validates_inclusion_of|validates_numericality_of|validates_with|validates_each|authenticate_or_request_with_http_basic|authenticate_or_request_with_http_digest|filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|translate|localize|extract_locale_from_tld|caches_page|expire_page|caches_action|expire_action|cache|expire_fragment|expire_cache_for|observe|cache_sweeper|has_many|has_one|belongs_to|has_and_belongs_to_many",t="alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield",n="true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING",r="$DEBUG|$defout|$FILENAME|$LOAD_PATH|$SAFE|$stdin|$stdout|$stderr|$VERBOSE|$!|root_url|flash|session|cookies|params|request|response|logger|self",i=this.$keywords=this.createKeywordMapper({keyword:t,"constant.language":n,"variable.language":r,"support.function":e,"invalid.deprecated":"debugger"},"identifier");this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"comment",regex:"^=begin(?:$|\\s.*$)",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},[{regex:"[{}]",onMatch:function(e,t,n){this.next=e=="{"?this.nextState:"";if(e=="{"&&n.length)return n.unshift("start",t),"paren.lparen";if(e=="}"&&n.length){n.shift(),this.next=n.shift();if(this.next.indexOf("string")!=-1)return"paren.end"}return e=="{"?"paren.lparen":"paren.rparen"},nextState:"start"},{token:"string.start",regex:/"/,push:[{token:"constant.language.escape",regex:/\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/},{token:"paren.start",regex:/\#{/,push:"start"},{token:"string.end",regex:/"/,next:"pop"},{defaultToken:"string"}]},{token:"string.start",regex:/`/,push:[{token:"constant.language.escape",regex:/\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/},{token:"paren.start",regex:/\#{/,push:"start"},{token:"string.end",regex:/`/,next:"pop"},{defaultToken:"string"}]},{token:"string.start",regex:/'/,push:[{token:"constant.language.escape",regex:/\\['\\]/},{token:"string.end",regex:/'/,next:"pop"},{defaultToken:"string"}]}],{token:"text",regex:"::"},{token:"variable.instance",regex:"@{1,2}[a-zA-Z_\\d]+"},{token:"support.class",regex:"[A-Z][a-zA-Z_\\d]+"},s,f,l,{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:i,regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"punctuation.separator.key-value",regex:"=>"},{stateName:"heredoc",onMatch:function(e,t,n){var r=e[2]=="-"?"indentedHeredoc":"heredoc",i=e.split(this.splitRegex);return n.push(r,i[3]),[{type:"constant",value:i[1]},{type:"string",value:i[2]},{type:"support.class",value:i[3]},{type:"string",value:i[4]}]},regex:"(<<-?)(['\"`]?)([\\w]+)(['\"`]?)",rules:{heredoc:[{onMatch:function(e,t,n){return e===n[1]?(n.shift(),n.shift(),this.next=n[0]||"start","support.class"):(this.next="","string")},regex:".*$",next:"start"}],indentedHeredoc:[{token:"string",regex:"^ +"},{onMatch:function(e,t,n){return e===n[1]?(n.shift(),n.shift(),this.next=n[0]||"start","support.class"):(this.next="","string")},regex:".*$",next:"start"}]}},{regex:"$",token:"empty",next:function(e,t){return t[0]==="heredoc"||t[0]==="indentedHeredoc"?t[0]:e}},{token:"string.character",regex:"\\B\\?."},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:"^=end(?:$|\\s.*$)",next:"start"},{token:"comment",regex:".+"}]},this.normalizeRules()};r.inherits(c,i),t.RubyHighlightRules=c}),ace.define("ace/mode/haml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules","ace/mode/ruby_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=e("./ruby_highlight_rules"),o=s.RubyHighlightRules,u=function(){this.$rules={start:[{token:"punctuation.section.comment",regex:/^\s*\/.*/},{token:"punctuation.section.comment",regex:/^\s*#.*/},{token:"string.quoted.double",regex:"==.+?=="},{token:"keyword.other.doctype",regex:"^!!!\\s*(?:[a-zA-Z0-9-_]+)?"},s.qString,s.qqString,s.tString,{token:["entity.name.tag.haml"],regex:/^\s*%[\w:]+/,next:"tag_single"},{token:["meta.escape.haml"],regex:"^\\s*\\\\."},s.constantNumericHex,s.constantNumericFloat,s.constantOtherSymbol,{token:"text",regex:"=|-|~",next:"embedded_ruby"}],tag_single:[{token:"entity.other.attribute-name.class.haml",regex:"\\.[\\w-]+"},{token:"entity.other.attribute-name.id.haml",regex:"#[\\w-]+"},{token:"punctuation.section",regex:"\\{",next:"section"},s.constantOtherSymbol,{token:"text",regex:/\s/,next:"start"},{token:"empty",regex:"$|(?!\\.|#|\\{|\\[|=|-|~|\\/)",next:"start"}],section:[s.constantOtherSymbol,s.qString,s.qqString,s.tString,s.constantNumericHex,s.constantNumericFloat,{token:"punctuation.section",regex:"\\}",next:"start"}],embedded_ruby:[s.constantNumericHex,s.constantNumericFloat,{token:"support.class",regex:"[A-Z][a-zA-Z_\\d]+"},{token:(new o).getKeywords(),regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:["keyword","text","text"],regex:"(?:do|\\{)(?: \\|[^|]+\\|)?$",next:"start"},{token:["text"],regex:"^$",next:"start"},{token:["text"],regex:"^(?!.*\\|\\s*$)",next:"start"}]}};r.inherits(u,i),t.HamlHighlightRules=u}),ace.define("ace/mode/folding/coffee",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=e("../../range").Range,o=t.FoldMode=function(){};r.inherits(o,i),function(){this.getFoldWidgetRange=function(e,t,n){var r=this.indentationBlock(e,n);if(r)return r;var i=/\S/,o=e.getLine(n),u=o.search(i);if(u==-1||o[u]!="#")return;var a=o.length,f=e.getLength(),l=n,c=n;while(++n<f){o=e.getLine(n);var h=o.search(i);if(h==-1)continue;if(o[h]!="#")break;c=n}if(c>l){var p=e.getLine(c).length;return new s(l,a,c,p)}},this.getFoldWidget=function(e,t,n){var r=e.getLine(n),i=r.search(/\S/),s=e.getLine(n+1),o=e.getLine(n-1),u=o.search(/\S/),a=s.search(/\S/);if(i==-1)return e.foldWidgets[n-1]=u!=-1&&u<a?"start":"","";if(u==-1){if(i==a&&r[i]=="#"&&s[i]=="#")return e.foldWidgets[n-1]="",e.foldWidgets[n+1]="","start"}else if(u==i&&r[i]=="#"&&o[i]=="#"&&e.getLine(n-2).search(/\S/)==-1)return e.foldWidgets[n-1]="start",e.foldWidgets[n+1]="","";return u!=-1&&u<i?e.foldWidgets[n-1]="start":e.foldWidgets[n-1]="",i<a?"start":""}}.call(o.prototype)}),ace.define("ace/mode/haml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/haml_highlight_rules","ace/mode/folding/coffee"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./haml_highlight_rules").HamlHighlightRules,o=e("./folding/coffee").FoldMode,u=function(){this.HighlightRules=s,this.foldingRules=new o};r.inherits(u,i),function(){this.lineCommentStart=["//","#"],this.$id="ace/mode/haml"}.call(u.prototype),t.Mode=u})
\ No newline at end of file
+ace.define("ace/mode/ruby_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=t.constantOtherSymbol={token:"constant.other.symbol.ruby",regex:"[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"},o=t.qString={token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},u=t.qqString={token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},a=t.tString={token:"string",regex:"[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"},f=t.constantNumericHex={token:"constant.numeric",regex:"0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"},l=t.constantNumericFloat={token:"constant.numeric",regex:"[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"},c=function(){var e="abort|Array|assert|assert_equal|assert_not_equal|assert_same|assert_not_same|assert_nil|assert_not_nil|assert_match|assert_no_match|assert_in_delta|assert_throws|assert_raise|assert_nothing_raised|assert_instance_of|assert_kind_of|assert_respond_to|assert_operator|assert_send|assert_difference|assert_no_difference|assert_recognizes|assert_generates|assert_response|assert_redirected_to|assert_template|assert_select|assert_select_email|assert_select_rjs|assert_select_encoded|css_select|at_exit|attr|attr_writer|attr_reader|attr_accessor|attr_accessible|autoload|binding|block_given?|callcc|caller|catch|chomp|chomp!|chop|chop!|defined?|delete_via_redirect|eval|exec|exit|exit!|fail|Float|flunk|follow_redirect!|fork|form_for|form_tag|format|gets|global_variables|gsub|gsub!|get_via_redirect|host!|https?|https!|include|Integer|lambda|link_to|link_to_unless_current|link_to_function|link_to_remote|load|local_variables|loop|open|open_session|p|print|printf|proc|putc|puts|post_via_redirect|put_via_redirect|raise|rand|raw|readline|readlines|redirect?|request_via_redirect|require|scan|select|set_trace_func|sleep|split|sprintf|srand|String|stylesheet_link_tag|syscall|system|sub|sub!|test|throw|trace_var|trap|untrace_var|atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan|render|javascript_include_tag|csrf_meta_tag|label_tag|text_field_tag|submit_tag|check_box_tag|content_tag|radio_button_tag|text_area_tag|password_field_tag|hidden_field_tag|fields_for|select_tag|options_for_select|options_from_collection_for_select|collection_select|time_zone_select|select_date|select_time|select_datetime|date_select|time_select|datetime_select|select_year|select_month|select_day|select_hour|select_minute|select_second|file_field_tag|file_field|respond_to|skip_before_action|around_filter|after_filter|verify|protect_from_forgery|rescue_from|helper_method|redirect_to|before_action|send_data|send_file|validates_presence_of|validates_uniqueness_of|validates_length_of|validates_format_of|validates_acceptance_of|validates_associated|validates_exclusion_of|validates_inclusion_of|validates_numericality_of|validates_with|validates_each|authenticate_or_request_with_http_basic|authenticate_or_request_with_http_digest|filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|translate|localize|extract_locale_from_tld|caches_page|expire_page|caches_action|expire_action|cache|expire_fragment|expire_cache_for|observe|cache_sweeper|has_many|has_one|belongs_to|has_and_belongs_to_many",t="alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield",n="true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING",r="$DEBUG|$defout|$FILENAME|$LOAD_PATH|$SAFE|$stdin|$stdout|$stderr|$VERBOSE|$!|root_url|flash|session|cookies|params|request|response|logger|self",i=this.$keywords=this.createKeywordMapper({keyword:t,"constant.language":n,"variable.language":r,"support.function":e,"invalid.deprecated":"debugger"},"identifier");this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"comment",regex:"^=begin(?:$|\\s.*$)",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},[{regex:"[{}]",onMatch:function(e,t,n){this.next=e=="{"?this.nextState:"";if(e=="{"&&n.length)return n.unshift("start",t),"paren.lparen";if(e=="}"&&n.length){n.shift(),this.next=n.shift();if(this.next.indexOf("string")!=-1)return"paren.end"}return e=="{"?"paren.lparen":"paren.rparen"},nextState:"start"},{token:"string.start",regex:/"/,push:[{token:"constant.language.escape",regex:/\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/},{token:"paren.start",regex:/\#{/,push:"start"},{token:"string.end",regex:/"/,next:"pop"},{defaultToken:"string"}]},{token:"string.start",regex:/`/,push:[{token:"constant.language.escape",regex:/\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/},{token:"paren.start",regex:/\#{/,push:"start"},{token:"string.end",regex:/`/,next:"pop"},{defaultToken:"string"}]},{token:"string.start",regex:/'/,push:[{token:"constant.language.escape",regex:/\\['\\]/},{token:"string.end",regex:/'/,next:"pop"},{defaultToken:"string"}]}],{token:"text",regex:"::"},{token:"variable.instance",regex:"@{1,2}[a-zA-Z_\\d]+"},{token:"support.class",regex:"[A-Z][a-zA-Z_\\d]+"},s,f,l,{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:i,regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"punctuation.separator.key-value",regex:"=>"},{stateName:"heredoc",onMatch:function(e,t,n){var r=e[2]=="-"?"indentedHeredoc":"heredoc",i=e.split(this.splitRegex);return n.push(r,i[3]),[{type:"constant",value:i[1]},{type:"string",value:i[2]},{type:"support.class",value:i[3]},{type:"string",value:i[4]}]},regex:"(<<-?)(['\"`]?)([\\w]+)(['\"`]?)",rules:{heredoc:[{onMatch:function(e,t,n){return e===n[1]?(n.shift(),n.shift(),this.next=n[0]||"start","support.class"):(this.next="","string")},regex:".*$",next:"start"}],indentedHeredoc:[{token:"string",regex:"^ +"},{onMatch:function(e,t,n){return e===n[1]?(n.shift(),n.shift(),this.next=n[0]||"start","support.class"):(this.next="","string")},regex:".*$",next:"start"}]}},{regex:"$",token:"empty",next:function(e,t){return t[0]==="heredoc"||t[0]==="indentedHeredoc"?t[0]:e}},{token:"string.character",regex:"\\B\\?."},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:"^=end(?:$|\\s.*$)",next:"start"},{token:"comment",regex:".+"}]},this.normalizeRules()};r.inherits(c,i),t.RubyHighlightRules=c}),ace.define("ace/mode/haml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules","ace/mode/ruby_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=e("./ruby_highlight_rules"),o=s.RubyHighlightRules,u=function(){this.$rules={start:[{token:"punctuation.section.comment",regex:/^\s*\/.*/},{token:"punctuation.section.comment",regex:/^\s*#.*/},{token:"string.quoted.double",regex:"==.+?=="},{token:"keyword.other.doctype",regex:"^!!!\\s*(?:[a-zA-Z0-9-_]+)?"},s.qString,s.qqString,s.tString,{token:["entity.name.tag.haml"],regex:/^\s*%[\w:]+/,next:"tag_single"},{token:["meta.escape.haml"],regex:"^\\s*\\\\."},s.constantNumericHex,s.constantNumericFloat,s.constantOtherSymbol,{token:"text",regex:"=|-|~",next:"embedded_ruby"}],tag_single:[{token:"entity.other.attribute-name.class.haml",regex:"\\.[\\w-]+"},{token:"entity.other.attribute-name.id.haml",regex:"#[\\w-]+"},{token:"punctuation.section",regex:"\\{",next:"section"},s.constantOtherSymbol,{token:"text",regex:/\s/,next:"start"},{token:"empty",regex:"$|(?!\\.|#|\\{|\\[|=|-|~|\\/)",next:"start"}],section:[s.constantOtherSymbol,s.qString,s.qqString,s.tString,s.constantNumericHex,s.constantNumericFloat,{token:"punctuation.section",regex:"\\}",next:"start"}],embedded_ruby:[s.constantNumericHex,s.constantNumericFloat,{token:"support.class",regex:"[A-Z][a-zA-Z_\\d]+"},{token:(new o).getKeywords(),regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:["keyword","text","text"],regex:"(?:do|\\{)(?: \\|[^|]+\\|)?$",next:"start"},{token:["text"],regex:"^$",next:"start"},{token:["text"],regex:"^(?!.*\\|\\s*$)",next:"start"}]}};r.inherits(u,i),t.HamlHighlightRules=u}),ace.define("ace/mode/folding/coffee",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=e("../../range").Range,o=t.FoldMode=function(){};r.inherits(o,i),function(){this.getFoldWidgetRange=function(e,t,n){var r=this.indentationBlock(e,n);if(r)return r;var i=/\S/,o=e.getLine(n),u=o.search(i);if(u==-1||o[u]!="#")return;var a=o.length,f=e.getLength(),l=n,c=n;while(++n<f){o=e.getLine(n);var h=o.search(i);if(h==-1)continue;if(o[h]!="#")break;c=n}if(c>l){var p=e.getLine(c).length;return new s(l,a,c,p)}},this.getFoldWidget=function(e,t,n){var r=e.getLine(n),i=r.search(/\S/),s=e.getLine(n+1),o=e.getLine(n-1),u=o.search(/\S/),a=s.search(/\S/);if(i==-1)return e.foldWidgets[n-1]=u!=-1&&u<a?"start":"","";if(u==-1){if(i==a&&r[i]=="#"&&s[i]=="#")return e.foldWidgets[n-1]="",e.foldWidgets[n+1]="","start"}else if(u==i&&r[i]=="#"&&o[i]=="#"&&e.getLine(n-2).search(/\S/)==-1)return e.foldWidgets[n-1]="start",e.foldWidgets[n+1]="","";return u!=-1&&u<i?e.foldWidgets[n-1]="start":e.foldWidgets[n-1]="",i<a?"start":""}}.call(o.prototype)}),ace.define("ace/mode/haml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/haml_highlight_rules","ace/mode/folding/coffee"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./haml_highlight_rules").HamlHighlightRules,o=e("./folding/coffee").FoldMode,u=function(){this.HighlightRules=s,this.foldingRules=new o};r.inherits(u,i),function(){this.lineCommentStart=["//","#"],this.$id="ace/mode/haml"}.call(u.prototype),t.Mode=u})
\ No newline at end of file
diff --git a/public/javascripts/ace/mode-html_ruby.js b/public/javascripts/ace/mode-html_ruby.js
index 05fbc6994b..fd3eaff2af 100644
--- a/public/javascripts/ace/mode-html_ruby.js
+++ b/public/javascripts/ace/mode-html_ruby.js
@@ -1 +1 @@
-ace.define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/lang"),s=e("./text_highlight_rules").TextHighlightRules,o=t.supportType="animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|pointer-events|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index",u=t.supportFunction="rgb|rgba|url|attr|counter|counters",a=t.supportConstant="absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero",f=t.supportConstantColor="aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow",l=t.supportConstantFonts="arial|century|comic|courier|cursive|fantasy|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace",c=t.numRe="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",h=t.pseudoElements="(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b",p=t.pseudoClasses="(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b",d=function(){var e=this.createKeywordMapper({"support.function":u,"support.constant":a,"support.type":o,"support.constant.color":f,"support.constant.fonts":l},"text",!0);this.$rules={start:[{token:"comment",regex:"\\/\\*",push:"comment"},{token:"paren.lparen",regex:"\\{",push:"ruleset"},{token:"string",regex:"@.*?{",push:"media"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"},{caseInsensitive:!0}],media:[{token:"comment",regex:"\\/\\*",push:"comment"},{token:"paren.lparen",regex:"\\{",push:"ruleset"},{token:"string",regex:"\\}",next:"pop"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"},{caseInsensitive:!0}],comment:[{token:"comment",regex:"\\*\\/",next:"pop"},{defaultToken:"comment"}],ruleset:[{token:"paren.rparen",regex:"\\}",next:"pop"},{token:"comment",regex:"\\/\\*",push:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:["constant.numeric","keyword"],regex:"("+c+")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"},{token:"constant.numeric",regex:c},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:["punctuation","entity.other.attribute-name.pseudo-element.css"],regex:h},{token:["punctuation","entity.other.attribute-name.pseudo-class.css"],regex:p},{token:["support.function","string","support.function"],regex:"(url\\()(.*)(\\))"},{token:e,regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"},{caseInsensitive:!0}]},this.normalizeRules()};r.inherits(d,s),t.CssHighlightRules=d}),ace.define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},s.getTagRule(),{defaultToken:"comment.doc",caseInsensitive:!0}]}};r.inherits(s,i),s.getTagRule=function(e){return{token:"comment.doc.tag.storage.type",regex:"\\b(?:TODO|FIXME|XXX|HACK)\\b"}},s.getStartRule=function(e){return{token:"comment.doc",regex:"\\/\\*(?=\\*)",next:e}},s.getEndRule=function(e){return{token:"comment.doc",regex:"\\*\\/",next:e}},t.DocCommentHighlightRules=s}),ace.define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./doc_comment_highlight_rules").DocCommentHighlightRules,s=e("./text_highlight_rules").TextHighlightRules,o=function(e){var t=this.createKeywordMapper({"variable.language":"Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document",keyword:"const|yield|import|get|set|break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|debugger|__parent__|__count__|escape|unescape|with|__proto__|class|enum|extends|super|export|implements|private|public|interface|package|protected|static","storage.type":"const|let|var|function","constant.language":"null|Infinity|NaN|undefined","support.function":"alert","constant.language.boolean":"true|false"},"identifier"),n="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield|void",r="[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*\\b",s="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={no_regex:[{token:"comment",regex:"\\/\\/",next:"line_comment"},i.getStartRule("doc-start"),{token:"comment",regex:/\/\*/,next:"comment"},{token:"string",regex:"'(?=.)",next:"qstring"},{token:"string",regex:'"(?=.)',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator"],regex:"("+r+")(\\.)(prototype)(\\.)("+r+")(\\s*)(=)",next:"function_arguments"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen"],regex:"("+r+")(\\.)("+r+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()",next:"function_arguments"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen"],regex:"("+r+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()",next:"function_arguments"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","entity.name.function","text","paren.lparen"],regex:"("+r+")(\\.)("+r+")(\\s*)(=)(\\s*)(function)(\\s+)(\\w+)(\\s*)(\\()",next:"function_arguments"},{token:["storage.type","text","entity.name.function","text","paren.lparen"],regex:"(function)(\\s+)("+r+")(\\s*)(\\()",next:"function_arguments"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen"],regex:"("+r+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()",next:"function_arguments"},{token:["text","text","storage.type","text","paren.lparen"],regex:"(:)(\\s*)(function)(\\s*)(\\()",next:"function_arguments"},{token:"keyword",regex:"(?:"+n+")\\b",next:"start"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:op|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName|ClassName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["support.constant"],regex:/that\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|trace|timeEnd|assert)\b/},{token:t,regex:r},{token:"keyword.operator",regex:/--|\+\+|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|[!$%&*+\-~\/^]=?/,next:"start"},{token:"punctuation.operator",regex:/[?:,;.]/,next:"start"},{token:"paren.lparen",regex:/[\[({]/,next:"start"},{token:"paren.rparen",regex:/[\])}]/},{token:"comment",regex:/^#!.*$/}],start:[i.getStartRule("doc-start"),{token:"comment",regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/",next:"line_comment_regex_allowed"},{token:"string.regexp",regex:"\\/",next:"regex"},{token:"text",regex:"\\s+|^$",next:"start"},{token:"empty",regex:"",next:"no_regex"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"},{token:"string.regexp",regex:"/[sxngimy]*",next:"no_regex"},{token:"invalid",regex:/\{\d+\b,?\d*\}[+*]|[+*$^?][+*]|[$^][?]|\?{3,}/},{token:"constant.language.escape",regex:/\(\?[:=!]|\)|\{\d+\b,?\d*\}|[+*]\?|[()$^+*?.]/},{token:"constant.language.delimiter",regex:/\|/},{token:"constant.language.escape",regex:/\[\^?/,next:"regex_character_class"},{token:"empty",regex:"$",next:"no_regex"},{defaultToken:"string.regexp"}],regex_character_class:[{token:"regexp.charclass.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"},{token:"constant.language.escape",regex:"]",next:"regex"},{token:"constant.language.escape",regex:"-"},{token:"empty",regex:"$",next:"no_regex"},{defaultToken:"string.regexp.charachterclass"}],function_arguments:[{token:"variable.parameter",regex:r},{token:"punctuation.operator",regex:"[, ]+"},{token:"punctuation.operator",regex:"$"},{token:"empty",regex:"",next:"no_regex"}],comment_regex_allowed:[i.getTagRule(),{token:"comment",regex:"\\*\\/",next:"start"},{defaultToken:"comment",caseInsensitive:!0}],comment:[i.getTagRule(),{token:"comment",regex:"\\*\\/",next:"no_regex"},{defaultToken:"comment",caseInsensitive:!0}],line_comment_regex_allowed:[i.getTagRule(),{token:"comment",regex:"$|^",next:"start"},{defaultToken:"comment",caseInsensitive:!0}],line_comment:[i.getTagRule(),{token:"comment",regex:"$|^",next:"no_regex"},{defaultToken:"comment",caseInsensitive:!0}],qqstring:[{token:"constant.language.escape",regex:s},{token:"string",regex:"\\\\$",next:"qqstring"},{token:"string",regex:'"|$',next:"no_regex"},{defaultToken:"string"}],qstring:[{token:"constant.language.escape",regex:s},{token:"string",regex:"\\\\$",next:"qstring"},{token:"string",regex:"'|$",next:"no_regex"},{defaultToken:"string"}]},(!e||!e.noES6)&&this.$rules.no_regex.unshift({regex:"[{}]",onMatch:function(e,t,n){this.next=e=="{"?this.nextState:"";if(e=="{"&&n.length)return n.unshift("start",t),"paren";if(e=="}"&&n.length){n.shift(),this.next=n.shift();if(this.next.indexOf("string")!=-1)return"paren.quasi.end"}return e=="{"?"paren.lparen":"paren.rparen"},nextState:"start"},{token:"string.quasi.start",regex:/`/,push:[{token:"constant.language.escape",regex:s},{token:"paren.quasi.start",regex:/\${/,push:"start"},{token:"string.quasi.end",regex:/`/,next:"pop"},{defaultToken:"string.quasi"}]}),this.embedRules(i,"doc-",[i.getEndRule("no_regex")]),this.normalizeRules()};r.inherits(o,s),t.JavaScriptHighlightRules=o}),ace.define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(e){var t="[_:a-zA-Z\u00c0-\uffff][-_:.a-zA-Z0-9\u00c0-\uffff]*";this.$rules={start:[{token:"string.cdata.xml",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:["punctuation.xml-decl.xml","keyword.xml-decl.xml"],regex:"(<\\?)(xml)(?=[\\s])",next:"xml_decl",caseInsensitive:!0},{token:["punctuation.instruction.xml","keyword.instruction.xml"],regex:"(<\\?)("+t+")",next:"processing_instruction"},{token:"comment.xml",regex:"<\\!--",next:"comment"},{token:["xml-pe.doctype.xml","xml-pe.doctype.xml"],regex:"(<\\!)(DOCTYPE)(?=[\\s])",next:"doctype",caseInsensitive:!0},{include:"tag"},{token:"text.end-tag-open.xml",regex:"</"},{token:"text.tag-open.xml",regex:"<"},{include:"reference"},{defaultToken:"text.xml"}],xml_decl:[{token:"entity.other.attribute-name.decl-attribute-name.xml",regex:"(?:"+t+":)?"+t+""},{token:"keyword.operator.decl-attribute-equals.xml",regex:"="},{include:"whitespace"},{include:"string"},{token:"punctuation.xml-decl.xml",regex:"\\?>",next:"start"}],processing_instruction:[{token:"punctuation.instruction.xml",regex:"\\?>",next:"start"},{defaultToken:"instruction.xml"}],doctype:[{include:"whitespace"},{include:"string"},{token:"xml-pe.doctype.xml",regex:">",next:"start"},{token:"xml-pe.xml",regex:"[-_a-zA-Z0-9:]+"},{token:"punctuation.int-subset",regex:"\\[",push:"int_subset"}],int_subset:[{token:"text.xml",regex:"\\s+"},{token:"punctuation.int-subset.xml",regex:"]",next:"pop"},{token:["punctuation.markup-decl.xml","keyword.markup-decl.xml"],regex:"(<\\!)("+t+")",push:[{token:"text",regex:"\\s+"},{token:"punctuation.markup-decl.xml",regex:">",next:"pop"},{include:"string"}]}],cdata:[{token:"string.cdata.xml",regex:"\\]\\]>",next:"start"},{token:"text.xml",regex:"\\s+"},{token:"text.xml",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment.xml",regex:"-->",next:"start"},{defaultToken:"comment.xml"}],reference:[{token:"constant.language.escape.reference.xml",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"}],attr_reference:[{token:"constant.language.escape.reference.attribute-value.xml",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"}],tag:[{token:["meta.tag.punctuation.tag-open.xml","meta.tag.punctuation.end-tag-open.xml","meta.tag.tag-name.xml"],regex:"(?:(<)|(</))((?:"+t+":)?"+t+")",next:[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:"start"}]}],tag_whitespace:[{token:"text.tag-whitespace.xml",regex:"\\s+"}],whitespace:[{token:"text.whitespace.xml",regex:"\\s+"}],string:[{token:"string.xml",regex:"'",push:[{token:"string.xml",regex:"'",next:"pop"},{defaultToken:"string.xml"}]},{token:"string.xml",regex:'"',push:[{token:"string.xml",regex:'"',next:"pop"},{defaultToken:"string.xml"}]}],attributes:[{token:"entity.other.attribute-name.xml",regex:"(?:"+t+":)?"+t+""},{token:"keyword.operator.attribute-equals.xml",regex:"="},{include:"tag_whitespace"},{include:"attribute_value"}],attribute_value:[{token:"string.attribute-value.xml",regex:"'",push:[{token:"string.attribute-value.xml",regex:"'",next:"pop"},{include:"attr_reference"},{defaultToken:"string.attribute-value.xml"}]},{token:"string.attribute-value.xml",regex:'"',push:[{token:"string.attribute-value.xml",regex:'"',next:"pop"},{include:"attr_reference"},{defaultToken:"string.attribute-value.xml"}]}]},this.constructor===s&&this.normalizeRules()};(function(){this.embedTagRules=function(e,t,n){this.$rules.tag.unshift({token:["meta.tag.punctuation.tag-open.xml","meta.tag."+n+".tag-name.xml"],regex:"(<)("+n+"(?=\\s|>|$))",next:[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:t+"start"}]}),this.$rules[n+"-end"]=[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:"start",onMatch:function(e,t,n){return n.splice(0),this.token}}],this.embedRules(e,t,[{token:["meta.tag.punctuation.end-tag-open.xml","meta.tag."+n+".tag-name.xml"],regex:"(</)("+n+"(?=\\s|>|$))",next:n+"-end"},{token:"string.cdata.xml",regex:"<\\!\\[CDATA\\["},{token:"string.cdata.xml",regex:"\\]\\]>"}])}}).call(i.prototype),r.inherits(s,i),t.XmlHighlightRules=s}),ace.define("ace/mode/html_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/css_highlight_rules","ace/mode/javascript_highlight_rules","ace/mode/xml_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/lang"),s=e("./css_highlight_rules").CssHighlightRules,o=e("./javascript_highlight_rules").JavaScriptHighlightRules,u=e("./xml_highlight_rules").XmlHighlightRules,a=i.createMap({a:"anchor",button:"form",form:"form",img:"image",input:"form",label:"form",option:"form",script:"script",select:"form",textarea:"form",style:"style",table:"table",tbody:"table",td:"table",tfoot:"table",th:"table",tr:"table"}),f=function(){u.call(this),this.addRules({attributes:[{include:"tag_whitespace"},{token:"entity.other.attribute-name.xml",regex:"[-_a-zA-Z0-9:.]+"},{token:"keyword.operator.attribute-equals.xml",regex:"=",push:[{include:"tag_whitespace"},{token:"string.unquoted.attribute-value.html",regex:"[^<>='\"`\\s]+",next:"pop"},{token:"empty",regex:"",next:"pop"}]},{include:"attribute_value"}],tag:[{token:function(e,t){var n=a[t];return["meta.tag.punctuation."+(e=="<"?"":"end-")+"tag-open.xml","meta.tag"+(n?"."+n:"")+".tag-name.xml"]},regex:"(</?)([-_a-zA-Z0-9:.]+)",next:"tag_stuff"}],tag_stuff:[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:"start"}]}),this.embedTagRules(s,"css-","style"),this.embedTagRules(o,"js-","script"),this.constructor===f&&this.normalizeRules()};r.inherits(f,u),t.HtmlHighlightRules=f}),ace.define("ace/mode/ruby_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=t.constantOtherSymbol={token:"constant.other.symbol.ruby",regex:"[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"},o=t.qString={token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},u=t.qqString={token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},a=t.tString={token:"string",regex:"[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"},f=t.constantNumericHex={token:"constant.numeric",regex:"0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"},l=t.constantNumericFloat={token:"constant.numeric",regex:"[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"},c=function(){var e="abort|Array|assert|assert_equal|assert_not_equal|assert_same|assert_not_same|assert_nil|assert_not_nil|assert_match|assert_no_match|assert_in_delta|assert_throws|assert_raise|assert_nothing_raised|assert_instance_of|assert_kind_of|assert_respond_to|assert_operator|assert_send|assert_difference|assert_no_difference|assert_recognizes|assert_generates|assert_response|assert_redirected_to|assert_template|assert_select|assert_select_email|assert_select_rjs|assert_select_encoded|css_select|at_exit|attr|attr_writer|attr_reader|attr_accessor|attr_accessible|autoload|binding|block_given?|callcc|caller|catch|chomp|chomp!|chop|chop!|defined?|delete_via_redirect|eval|exec|exit|exit!|fail|Float|flunk|follow_redirect!|fork|form_for|form_tag|format|gets|global_variables|gsub|gsub!|get_via_redirect|host!|https?|https!|include|Integer|lambda|link_to|link_to_unless_current|link_to_function|link_to_remote|load|local_variables|loop|open|open_session|p|print|printf|proc|putc|puts|post_via_redirect|put_via_redirect|raise|rand|raw|readline|readlines|redirect?|request_via_redirect|require|scan|select|set_trace_func|sleep|split|sprintf|srand|String|stylesheet_link_tag|syscall|system|sub|sub!|test|throw|trace_var|trap|untrace_var|atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan|render|javascript_include_tag|csrf_meta_tag|label_tag|text_field_tag|submit_tag|check_box_tag|content_tag|radio_button_tag|text_area_tag|password_field_tag|hidden_field_tag|fields_for|select_tag|options_for_select|options_from_collection_for_select|collection_select|time_zone_select|select_date|select_time|select_datetime|date_select|time_select|datetime_select|select_year|select_month|select_day|select_hour|select_minute|select_second|file_field_tag|file_field|respond_to|skip_before_filter|around_filter|after_filter|verify|protect_from_forgery|rescue_from|helper_method|redirect_to|before_filter|send_data|send_file|validates_presence_of|validates_uniqueness_of|validates_length_of|validates_format_of|validates_acceptance_of|validates_associated|validates_exclusion_of|validates_inclusion_of|validates_numericality_of|validates_with|validates_each|authenticate_or_request_with_http_basic|authenticate_or_request_with_http_digest|filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|translate|localize|extract_locale_from_tld|caches_page|expire_page|caches_action|expire_action|cache|expire_fragment|expire_cache_for|observe|cache_sweeper|has_many|has_one|belongs_to|has_and_belongs_to_many",t="alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield",n="true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING",r="$DEBUG|$defout|$FILENAME|$LOAD_PATH|$SAFE|$stdin|$stdout|$stderr|$VERBOSE|$!|root_url|flash|session|cookies|params|request|response|logger|self",i=this.$keywords=this.createKeywordMapper({keyword:t,"constant.language":n,"variable.language":r,"support.function":e,"invalid.deprecated":"debugger"},"identifier");this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"comment",regex:"^=begin(?:$|\\s.*$)",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},[{regex:"[{}]",onMatch:function(e,t,n){this.next=e=="{"?this.nextState:"";if(e=="{"&&n.length)return n.unshift("start",t),"paren.lparen";if(e=="}"&&n.length){n.shift(),this.next=n.shift();if(this.next.indexOf("string")!=-1)return"paren.end"}return e=="{"?"paren.lparen":"paren.rparen"},nextState:"start"},{token:"string.start",regex:/"/,push:[{token:"constant.language.escape",regex:/\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/},{token:"paren.start",regex:/\#{/,push:"start"},{token:"string.end",regex:/"/,next:"pop"},{defaultToken:"string"}]},{token:"string.start",regex:/`/,push:[{token:"constant.language.escape",regex:/\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/},{token:"paren.start",regex:/\#{/,push:"start"},{token:"string.end",regex:/`/,next:"pop"},{defaultToken:"string"}]},{token:"string.start",regex:/'/,push:[{token:"constant.language.escape",regex:/\\['\\]/},{token:"string.end",regex:/'/,next:"pop"},{defaultToken:"string"}]}],{token:"text",regex:"::"},{token:"variable.instance",regex:"@{1,2}[a-zA-Z_\\d]+"},{token:"support.class",regex:"[A-Z][a-zA-Z_\\d]+"},s,f,l,{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:i,regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"punctuation.separator.key-value",regex:"=>"},{stateName:"heredoc",onMatch:function(e,t,n){var r=e[2]=="-"?"indentedHeredoc":"heredoc",i=e.split(this.splitRegex);return n.push(r,i[3]),[{type:"constant",value:i[1]},{type:"string",value:i[2]},{type:"support.class",value:i[3]},{type:"string",value:i[4]}]},regex:"(<<-?)(['\"`]?)([\\w]+)(['\"`]?)",rules:{heredoc:[{onMatch:function(e,t,n){return e===n[1]?(n.shift(),n.shift(),this.next=n[0]||"start","support.class"):(this.next="","string")},regex:".*$",next:"start"}],indentedHeredoc:[{token:"string",regex:"^ +"},{onMatch:function(e,t,n){return e===n[1]?(n.shift(),n.shift(),this.next=n[0]||"start","support.class"):(this.next="","string")},regex:".*$",next:"start"}]}},{regex:"$",token:"empty",next:function(e,t){return t[0]==="heredoc"||t[0]==="indentedHeredoc"?t[0]:e}},{token:"string.character",regex:"\\B\\?."},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:"^=end(?:$|\\s.*$)",next:"start"},{token:"comment",regex:".+"}]},this.normalizeRules()};r.inherits(c,i),t.RubyHighlightRules=c}),ace.define("ace/mode/html_ruby_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/html_highlight_rules","ace/mode/ruby_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./html_highlight_rules").HtmlHighlightRules,s=e("./ruby_highlight_rules").RubyHighlightRules,o=function(){i.call(this);var e=[{regex:"<%%|%%>",token:"constant.language.escape"},{token:"comment.start.erb",regex:"<%#",push:[{token:"comment.end.erb",regex:"%>",next:"pop",defaultToken:"comment"}]},{token:"support.ruby_tag",regex:"<%+(?!>)[-=]?",push:"ruby-start"}],t=[{token:"support.ruby_tag",regex:"%>",next:"pop"},{token:"comment",regex:"#(?:[^%]|%[^>])*"}];for(var n in this.$rules)this.$rules[n].unshift.apply(this.$rules[n],e);this.embedRules(s,"ruby-",t,["start"]),this.normalizeRules()};r.inherits(o,i),t.HtmlRubyHighlightRules=o}),ace.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("../range").Range,i=function(){};(function(){this.checkOutdent=function(e,t){return/^\s+$/.test(e)?/^\s*\}/.test(t):!1},this.autoOutdent=function(e,t){var n=e.getLine(t),i=n.match(/^(\s*\})/);if(!i)return 0;var s=i[1].length,o=e.findMatchingBracket({row:t,column:s});if(!o||o.row==t)return 0;var u=this.$getIndent(e.getLine(o.row));e.replace(new r(t,0,t,s-1),u)},this.$getIndent=function(e){return e.match(/^\s*/)[0]}}).call(i.prototype),t.MatchingBraceOutdent=i}),ace.define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("../../token_iterator").TokenIterator,o=e("../../lib/lang"),u=["text","paren.rparen","punctuation.operator"],a=["text","paren.rparen","punctuation.operator","comment"],f,l={},c=function(e){var t=-1;e.multiSelect&&(t=e.selection.index,l.rangeCount!=e.multiSelect.rangeCount&&(l={rangeCount:e.multiSelect.rangeCount}));if(l[t])return f=l[t];f=l[t]={autoInsertedBrackets:0,autoInsertedRow:-1,autoInsertedLineEnd:"",maybeInsertedBrackets:0,maybeInsertedRow:-1,maybeInsertedLineStart:"",maybeInsertedLineEnd:""}},h=function(e,t,n,r){var i=e.end.row-e.start.row;return{text:n+t+r,selection:[0,e.start.column+1,i,e.end.column+(i?0:1)]}},p=function(){this.add("braces","insertion",function(e,t,n,r,i){var s=n.getCursorPosition(),u=r.doc.getLine(s.row);if(i=="{"){c(n);var a=n.getSelectionRange(),l=r.doc.getTextRange(a);if(l!==""&&l!=="{"&&n.getWrapBehavioursEnabled())return h(a,l,"{","}");if(p.isSaneInsertion(n,r))return/[\]\}\)]/.test(u[s.column])||n.inMultiSelectMode?(p.recordAutoInsert(n,r,"}"),{text:"{}",selection:[1,1]}):(p.recordMaybeInsert(n,r,"{"),{text:"{",selection:[1,1]})}else if(i=="}"){c(n);var d=u.substring(s.column,s.column+1);if(d=="}"){var v=r.$findOpeningBracket("}",{column:s.column+1,row:s.row});if(v!==null&&p.isAutoInsertedClosing(s,u,i))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}else{if(i=="\n"||i=="\r\n"){c(n);var m="";p.isMaybeInsertedClosing(s,u)&&(m=o.stringRepeat("}",f.maybeInsertedBrackets),p.clearMaybeInsertedClosing());var d=u.substring(s.column,s.column+1);if(d==="}"){var g=r.findMatchingBracket({row:s.row,column:s.column+1},"}");if(!g)return null;var y=this.$getIndent(r.getLine(g.row))}else{if(!m){p.clearMaybeInsertedClosing();return}var y=this.$getIndent(u)}var b=y+r.getTabString();return{text:"\n"+b+"\n"+y+m,selection:[1,b.length,1,b.length]}}p.clearMaybeInsertedClosing()}}),this.add("braces","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="{"){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.end.column,i.end.column+1);if(u=="}")return i.end.column++,i;f.maybeInsertedBrackets--}}),this.add("parens","insertion",function(e,t,n,r,i){if(i=="("){c(n);var s=n.getSelectionRange(),o=r.doc.getTextRange(s);if(o!==""&&n.getWrapBehavioursEnabled())return h(s,o,"(",")");if(p.isSaneInsertion(n,r))return p.recordAutoInsert(n,r,")"),{text:"()",selection:[1,1]}}else if(i==")"){c(n);var u=n.getCursorPosition(),a=r.doc.getLine(u.row),f=a.substring(u.column,u.column+1);if(f==")"){var l=r.$findOpeningBracket(")",{column:u.column+1,row:u.row});if(l!==null&&p.isAutoInsertedClosing(u,a,i))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="("){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==")")return i.end.column++,i}}),this.add("brackets","insertion",function(e,t,n,r,i){if(i=="["){c(n);var s=n.getSelectionRange(),o=r.doc.getTextRange(s);if(o!==""&&n.getWrapBehavioursEnabled())return h(s,o,"[","]");if(p.isSaneInsertion(n,r))return p.recordAutoInsert(n,r,"]"),{text:"[]",selection:[1,1]}}else if(i=="]"){c(n);var u=n.getCursorPosition(),a=r.doc.getLine(u.row),f=a.substring(u.column,u.column+1);if(f=="]"){var l=r.$findOpeningBracket("]",{column:u.column+1,row:u.row});if(l!==null&&p.isAutoInsertedClosing(u,a,i))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}}),this.add("brackets","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="["){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u=="]")return i.end.column++,i}}),this.add("string_dquotes","insertion",function(e,t,n,r,i){if(i=='"'||i=="'"){c(n);var s=i,o=n.getSelectionRange(),u=r.doc.getTextRange(o);if(u!==""&&u!=="'"&&u!='"'&&n.getWrapBehavioursEnabled())return h(o,u,s,s);if(!u){var a=n.getCursorPosition(),f=r.doc.getLine(a.row),l=f.substring(a.column-1,a.column),p=f.substring(a.column,a.column+1),d=r.getTokenAt(a.row,a.column),v=r.getTokenAt(a.row,a.column+1);if(l=="\\"&&d&&/escape/.test(d.type))return null;var m=d&&/string/.test(d.type),g=!v||/string/.test(v.type),y;if(p==s)y=m!==g;else{if(m&&!g)return null;if(m&&g)return null;var b=r.$mode.tokenRe;b.lastIndex=0;var w=b.test(l);b.lastIndex=0;var E=b.test(l);if(w||E)return null;if(p&&!/[\s;,.})\]\\]/.test(p))return null;y=!0}return{text:y?s+s:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&(s=='"'||s=="'")){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==s)return i.end.column++,i}})};p.isSaneInsertion=function(e,t){var n=e.getCursorPosition(),r=new s(t,n.row,n.column);if(!this.$matchTokenType(r.getCurrentToken()||"text",u)){var i=new s(t,n.row,n.column+1);if(!this.$matchTokenType(i.getCurrentToken()||"text",u))return!1}return r.stepForward(),r.getCurrentTokenRow()!==n.row||this.$matchTokenType(r.getCurrentToken()||"text",a)},p.$matchTokenType=function(e,t){return t.indexOf(e.type||e)>-1},p.recordAutoInsert=function(e,t,n){var r=e.getCursorPosition(),i=t.doc.getLine(r.row);this.isAutoInsertedClosing(r,i,f.autoInsertedLineEnd[0])||(f.autoInsertedBrackets=0),f.autoInsertedRow=r.row,f.autoInsertedLineEnd=n+i.substr(r.column),f.autoInsertedBrackets++},p.recordMaybeInsert=function(e,t,n){var r=e.getCursorPosition(),i=t.doc.getLine(r.row);this.isMaybeInsertedClosing(r,i)||(f.maybeInsertedBrackets=0),f.maybeInsertedRow=r.row,f.maybeInsertedLineStart=i.substr(0,r.column)+n,f.maybeInsertedLineEnd=i.substr(r.column),f.maybeInsertedBrackets++},p.isAutoInsertedClosing=function(e,t,n){return f.autoInsertedBrackets>0&&e.row===f.autoInsertedRow&&n===f.autoInsertedLineEnd[0]&&t.substr(e.column)===f.autoInsertedLineEnd},p.isMaybeInsertedClosing=function(e,t){return f.maybeInsertedBrackets>0&&e.row===f.maybeInsertedRow&&t.substr(e.column)===f.maybeInsertedLineEnd&&t.substr(0,e.column)==f.maybeInsertedLineStart},p.popAutoInsertedClosing=function(){f.autoInsertedLineEnd=f.autoInsertedLineEnd.substr(1),f.autoInsertedBrackets--},p.clearMaybeInsertedClosing=function(){f&&(f.maybeInsertedBrackets=0,f.maybeInsertedRow=-1)},r.inherits(p,i),t.CstyleBehaviour=p}),ace.define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../../range").Range,s=e("./fold_mode").FoldMode,o=t.FoldMode=function(e){e&&(this.foldingStartMarker=new RegExp(this.foldingStartMarker.source.replace(/\|[^|]*?$/,"|"+e.start)),this.foldingStopMarker=new RegExp(this.foldingStopMarker.source.replace(/\|[^|]*?$/,"|"+e.end)))};r.inherits(o,s),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.singleLineBlockCommentRe=/^\s*(\/\*).*\*\/\s*$/,this.tripleStarBlockCommentRe=/^\s*(\/\*\*\*).*\*\/\s*$/,this.startRegionRe=/^\s*(\/\*|\/\/)#?region\b/,this._getFoldWidgetBase=this.getFoldWidget,this.getFoldWidget=function(e,t,n){var r=e.getLine(n);if(this.singleLineBlockCommentRe.test(r)&&!this.startRegionRe.test(r)&&!this.tripleStarBlockCommentRe.test(r))return"";var i=this._getFoldWidgetBase(e,t,n);return!i&&this.startRegionRe.test(r)?"start":i},this.getFoldWidgetRange=function(e,t,n,r){var i=e.getLine(n);if(this.startRegionRe.test(i))return this.getCommentRegionBlock(e,i,n);var s=i.match(this.foldingStartMarker);if(s){var o=s.index;if(s[1])return this.openingBracketBlock(e,s[1],n,o);var u=e.getCommentFoldRange(n,o+s[0].length,1);return u&&!u.isMultiLine()&&(r?u=this.getSectionRange(e,n):t!="all"&&(u=null)),u}if(t==="markbegin")return;var s=i.match(this.foldingStopMarker);if(s){var o=s.index+s[0].length;return s[1]?this.closingBracketBlock(e,s[1],n,o):e.getCommentFoldRange(n,o,-1)}},this.getSectionRange=function(e,t){var n=e.getLine(t),r=n.search(/\S/),s=t,o=n.length;t+=1;var u=t,a=e.getLength();while(++t<a){n=e.getLine(t);var f=n.search(/\S/);if(f===-1)continue;if(r>f)break;var l=this.getFoldWidgetRange(e,"all",t);if(l){if(l.start.row<=s)break;if(l.isMultiLine())t=l.end.row;else if(r==f)break}u=t}return new i(s,o,u,e.getLine(u).length)},this.getCommentRegionBlock=function(e,t,n){var r=t.search(/\s*$/),s=e.getLength(),o=n,u=/^\s*(?:\/\*|\/\/|--)#?(end)?region\b/,a=1;while(++n<s){t=e.getLine(n);var f=u.exec(t);if(!f)continue;f[1]?a--:a++;if(!a)break}var l=n;if(l>o)return new i(o,r,l,t.length)}}.call(o.prototype)}),ace.define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./javascript_highlight_rules").JavaScriptHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("../range").Range,a=e("../worker/worker_client").WorkerClient,f=e("./behaviour/cstyle").CstyleBehaviour,l=e("./folding/cstyle").FoldMode,c=function(){this.HighlightRules=s,this.$outdent=new o,this.$behaviour=new f,this.foldingRules=new l};r.inherits(c,i),function(){this.lineCommentStart="//",this.blockComment={start:"/*",end:"*/"},this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t),i=this.getTokenizer().getLineTokens(t,e),s=i.tokens,o=i.state;if(s.length&&s[s.length-1].type=="comment")return r;if(e=="start"||e=="no_regex"){var u=t.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);u&&(r+=n)}else if(e=="doc-start"){if(o=="start"||o=="no_regex")return"";var u=t.match(/^\s*(\/?)\*/);u&&(u[1]&&(r+=" "),r+="* ")}return r},this.checkOutdent=function(e,t,n){return this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){this.$outdent.autoOutdent(t,n)},this.createWorker=function(e){var t=new a(["ace"],"ace/mode/javascript_worker","JavaScriptWorker");return t.attachToDocument(e.getDocument()),t.on("annotate",function(t){e.setAnnotations(t.data)}),t.on("terminate",function(){e.clearAnnotations()}),t},this.$id="ace/mode/javascript"}.call(c.prototype),t.Mode=c}),ace.define("ace/mode/behaviour/css",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle","ace/token_iterator"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("./cstyle").CstyleBehaviour,o=e("../../token_iterator").TokenIterator,u=function(){this.inherit(s),this.add("colon","insertion",function(e,t,n,r,i){if(i===":"){var s=n.getCursorPosition(),u=new o(r,s.row,s.column),a=u.getCurrentToken();a&&a.value.match(/\s+/)&&(a=u.stepBackward());if(a&&a.type==="support.type"){var f=r.doc.getLine(s.row),l=f.substring(s.column,s.column+1);if(l===":")return{text:"",selection:[1,1]};if(!f.substring(s.column).match(/^\s*;/))return{text:":;",selection:[1,1]}}}}),this.add("colon","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s===":"){var u=n.getCursorPosition(),a=new o(r,u.row,u.column),f=a.getCurrentToken();f&&f.value.match(/\s+/)&&(f=a.stepBackward());if(f&&f.type==="support.type"){var l=r.doc.getLine(i.start.row),c=l.substring(i.end.column,i.end.column+1);if(c===";")return i.end.column++,i}}}),this.add("semicolon","insertion",function(e,t,n,r,i){if(i===";"){var s=n.getCursorPosition(),o=r.doc.getLine(s.row),u=o.substring(s.column,s.column+1);if(u===";")return{text:"",selection:[1,1]}}})};r.inherits(u,s),t.CssBehaviour=u}),ace.define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/behaviour/css","ace/mode/folding/cstyle"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./css_highlight_rules").CssHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("../worker/worker_client").WorkerClient,a=e("./behaviour/css").CssBehaviour,f=e("./folding/cstyle").FoldMode,l=function(){this.HighlightRules=s,this.$outdent=new o,this.$behaviour=new a,this.foldingRules=new f};r.inherits(l,i),function(){this.foldingRules="cStyle",this.blockComment={start:"/*",end:"*/"},this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t),i=this.getTokenizer().getLineTokens(t,e).tokens;if(i.length&&i[i.length-1].type=="comment")return r;var s=t.match(/^.*\{\s*$/);return s&&(r+=n),r},this.checkOutdent=function(e,t,n){return this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){this.$outdent.autoOutdent(t,n)},this.createWorker=function(e){var t=new u(["ace"],"ace/mode/css_worker","Worker");return t.attachToDocument(e.getDocument()),t.on("annotate",function(t){e.setAnnotations(t.data)}),t.on("terminate",function(){e.clearAnnotations()}),t},this.$id="ace/mode/css"}.call(l.prototype),t.Mode=l}),ace.define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"],function(e,t,n){"use strict";function u(e,t){return e.type.lastIndexOf(t+".xml")>-1}var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("../../token_iterator").TokenIterator,o=e("../../lib/lang"),a=function(){this.add("string_dquotes","insertion",function(e,t,n,r,i){if(i=='"'||i=="'"){var o=i,a=r.doc.getTextRange(n.getSelectionRange());if(a!==""&&a!=="'"&&a!='"'&&n.getWrapBehavioursEnabled())return{text:o+a+o,selection:!1};var f=n.getCursorPosition(),l=r.doc.getLine(f.row),c=l.substring(f.column,f.column+1),h=new s(r,f.row,f.column),p=h.getCurrentToken();if(c==o&&(u(p,"attribute-value")||u(p,"string")))return{text:"",selection:[1,1]};p||(p=h.stepBackward());if(!p)return;while(u(p,"tag-whitespace")||u(p,"whitespace"))p=h.stepBackward();var d=!c||c.match(/\s/);if(u(p,"attribute-equals")&&(d||c==">")||u(p,"decl-attribute-equals")&&(d||c=="?"))return{text:o+o,selection:[1,1]}}}),this.add("string_dquotes","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&(s=='"'||s=="'")){var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==s)return i.end.column++,i}}),this.add("autoclosing","insertion",function(e,t,n,r,i){if(i==">"){var o=n.getCursorPosition(),a=new s(r,o.row,o.column),f=a.getCurrentToken()||a.stepBackward();if(!f||!(u(f,"tag-name")||u(f,"tag-whitespace")||u(f,"attribute-name")||u(f,"attribute-equals")||u(f,"attribute-value")))return;if(u(f,"reference.attribute-value"))return;if(u(f,"attribute-value")){var l=f.value.charAt(0);if(l=='"'||l=="'"){var c=f.value.charAt(f.value.length-1),h=a.getCurrentTokenColumn()+f.value.length;if(h>o.column||h==o.column&&l!=c)return}}while(!u(f,"tag-name"))f=a.stepBackward();var p=a.getCurrentTokenRow(),d=a.getCurrentTokenColumn();if(u(a.stepBackward(),"end-tag-open"))return;var v=f.value;p==o.row&&(v=v.substring(0,o.column-d));if(this.voidElements.hasOwnProperty(v.toLowerCase()))return;return{text:"></"+v+">",selection:[1,1]}}}),this.add("autoindent","insertion",function(e,t,n,r,i){if(i=="\n"){var o=n.getCursorPosition(),u=r.getLine(o.row),a=new s(r,o.row,o.column),f=a.getCurrentToken();if(f&&f.type.indexOf("tag-close")!==-1){if(f.value=="/>")return;while(f&&f.type.indexOf("tag-name")===-1)f=a.stepBackward();if(!f)return;var l=f.value,c=a.getCurrentTokenRow();f=a.stepBackward();if(!f||f.type.indexOf("end-tag")!==-1)return;if(this.voidElements&&!this.voidElements[l]){var h=r.getTokenAt(o.row,o.column+1),u=r.getLine(c),p=this.$getIndent(u),d=p+r.getTabString();return h&&h.value==="</"?{text:"\n"+d+"\n"+p,selection:[1,d.length,1,d.length]}:{text:"\n"+d}}}}})};r.inherits(a,i),t.XmlBehaviour=a}),ace.define("ace/mode/folding/mixed",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=t.FoldMode=function(e,t){this.defaultMode=e,this.subModes=t};r.inherits(s,i),function(){this.$getMode=function(e){typeof e!="string"&&(e=e[0]);for(var t in this.subModes)if(e.indexOf(t)===0)return this.subModes[t];return null},this.$tryMode=function(e,t,n,r){var i=this.$getMode(e);return i?i.getFoldWidget(t,n,r):""},this.getFoldWidget=function(e,t,n){return this.$tryMode(e.getState(n-1),e,t,n)||this.$tryMode(e.getState(n),e,t,n)||this.defaultMode.getFoldWidget(e,t,n)},this.getFoldWidgetRange=function(e,t,n){var r=this.$getMode(e.getState(n-1));if(!r||!r.getFoldWidget(e,t,n))r=this.$getMode(e.getState(n));if(!r||!r.getFoldWidget(e,t,n))r=this.defaultMode;return r.getFoldWidgetRange(e,t,n)}}.call(s.prototype)}),ace.define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(e,t,n){"use strict";function l(e,t){return e.type.lastIndexOf(t+".xml")>-1}var r=e("../../lib/oop"),i=e("../../lib/lang"),s=e("../../range").Range,o=e("./fold_mode").FoldMode,u=e("../../token_iterator").TokenIterator,a=t.FoldMode=function(e,t){o.call(this),this.voidElements=e||{},this.optionalEndTags=r.mixin({},this.voidElements),t&&r.mixin(this.optionalEndTags,t)};r.inherits(a,o);var f=function(){this.tagName="",this.closing=!1,this.selfClosing=!1,this.start={row:0,column:0},this.end={row:0,column:0}};(function(){this.getFoldWidget=function(e,t,n){var r=this._getFirstTagInLine(e,n);return r?r.closing||!r.tagName&&r.selfClosing?t=="markbeginend"?"end":"":!r.tagName||r.selfClosing||this.voidElements.hasOwnProperty(r.tagName.toLowerCase())?"":this._findEndTagInLine(e,n,r.tagName,r.end.column)?"":"start":""},this._getFirstTagInLine=function(e,t){var n=e.getTokens(t),r=new f;for(var i=0;i<n.length;i++){var s=n[i];if(l(s,"tag-open")){r.end.column=r.start.column+s.value.length,r.closing=l(s,"end-tag-open"),s=n[++i];if(!s)return null;r.tagName=s.value,r.end.column+=s.value.length;for(i++;i<n.length;i++){s=n[i],r.end.column+=s.value.length;if(l(s,"tag-close")){r.selfClosing=s.value=="/>";break}}return r}if(l(s,"tag-close"))return r.selfClosing=s.value=="/>",r;r.start.column+=s.value.length}return null},this._findEndTagInLine=function(e,t,n,r){var i=e.getTokens(t),s=0;for(var o=0;o<i.length;o++){var u=i[o];s+=u.value.length;if(s<r)continue;if(l(u,"end-tag-open")){u=i[o+1];if(u&&u.value==n)return!0}}return!1},this._readTagForward=function(e){var t=e.getCurrentToken();if(!t)return null;var n=new f;do if(l(t,"tag-open"))n.closing=l(t,"end-tag-open"),n.start.row=e.getCurrentTokenRow(),n.start.column=e.getCurrentTokenColumn();else if(l(t,"tag-name"))n.tagName=t.value;else if(l(t,"tag-close"))return n.selfClosing=t.value=="/>",n.end.row=e.getCurrentTokenRow(),n.end.column=e.getCurrentTokenColumn()+t.value.length,e.stepForward(),n;while(t=e.stepForward());return null},this._readTagBackward=function(e){var t=e.getCurrentToken();if(!t)return null;var n=new f;do{if(l(t,"tag-open"))return n.closing=l(t,"end-tag-open"),n.start.row=e.getCurrentTokenRow(),n.start.column=e.getCurrentTokenColumn(),e.stepBackward(),n;l(t,"tag-name")?n.tagName=t.value:l(t,"tag-close")&&(n.selfClosing=t.value=="/>",n.end.row=e.getCurrentTokenRow(),n.end.column=e.getCurrentTokenColumn()+t.value.length)}while(t=e.stepBackward());return null},this._pop=function(e,t){while(e.length){var n=e[e.length-1];if(!t||n.tagName==t.tagName)return e.pop();if(this.optionalEndTags.hasOwnProperty(n.tagName)){e.pop();continue}return null}},this.getFoldWidgetRange=function(e,t,n){var r=this._getFirstTagInLine(e,n);if(!r)return null;var i=r.closing||r.selfClosing,o=[],a;if(!i){var f=new u(e,n,r.start.column),l={row:n,column:r.start.column+r.tagName.length+2};r.start.row==r.end.row&&(l.column=r.end.column);while(a=this._readTagForward(f)){if(a.selfClosing){if(!o.length)return a.start.column+=a.tagName.length+2,a.end.column-=2,s.fromPoints(a.start,a.end);continue}if(a.closing){this._pop(o,a);if(o.length==0)return s.fromPoints(l,a.start)}else o.push(a)}}else{var f=new u(e,n,r.end.column),c={row:n,column:r.start.column};while(a=this._readTagBackward(f)){if(a.selfClosing){if(!o.length)return a.start.column+=a.tagName.length+2,a.end.column-=2,s.fromPoints(a.start,a.end);continue}if(!a.closing){this._pop(o,a);if(o.length==0)return a.start.column+=a.tagName.length+2,a.start.row==a.end.row&&a.start.column<a.end.column&&(a.start.column=a.end.column),s.fromPoints(a.start,c)}else o.push(a)}}}}).call(a.prototype)}),ace.define("ace/mode/folding/html",["require","exports","module","ace/lib/oop","ace/mode/folding/mixed","ace/mode/folding/xml","ace/mode/folding/cstyle"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./mixed").FoldMode,s=e("./xml").FoldMode,o=e("./cstyle").FoldMode,u=t.FoldMode=function(e,t){i.call(this,new s(e,t),{"js-":new o,"css-":new o})};r.inherits(u,i)}),ace.define("ace/mode/html_completions",["require","exports","module","ace/token_iterator"],function(e,t,n){"use strict";function f(e,t){return e.type.lastIndexOf(t+".xml")>-1}function l(e,t){var n=new r(e,t.row,t.column),i=n.getCurrentToken();while(i&&!f(i,"tag-name"))i=n.stepBackward();if(i)return i.value}var r=e("../token_iterator").TokenIterator,i=["accesskey","class","contenteditable","contextmenu","dir","draggable","dropzone","hidden","id","inert","itemid","itemprop","itemref","itemscope","itemtype","lang","spellcheck","style","tabindex","title","translate"],s=["onabort","onblur","oncancel","oncanplay","oncanplaythrough","onchange","onclick","onclose","oncontextmenu","oncuechange","ondblclick","ondrag","ondragend","ondragenter","ondragleave","ondragover","ondragstart","ondrop","ondurationchange","onemptied","onended","onerror","onfocus","oninput","oninvalid","onkeydown","onkeypress","onkeyup","onload","onloadeddata","onloadedmetadata","onloadstart","onmousedown","onmousemove","onmouseout","onmouseover","onmouseup","onmousewheel","onpause","onplay","onplaying","onprogress","onratechange","onreset","onscroll","onseeked","onseeking","onselect","onshow","onstalled","onsubmit","onsuspend","ontimeupdate","onvolumechange","onwaiting"],o=i.concat(s),u={html:["manifest"],head:[],title:[],base:["href","target"],link:["href","hreflang","rel","media","type","sizes"],meta:["http-equiv","name","content","charset"],style:["type","media","scoped"],script:["charset","type","src","defer","async"],noscript:["href"],body:["onafterprint","onbeforeprint","onbeforeunload","onhashchange","onmessage","onoffline","onpopstate","onredo","onresize","onstorage","onundo","onunload"],section:[],nav:[],article:["pubdate"],aside:[],h1:[],h2:[],h3:[],h4:[],h5:[],h6:[],header:[],footer:[],address:[],main:[],p:[],hr:[],pre:[],blockquote:["cite"],ol:["start","reversed"],ul:[],li:["value"],dl:[],dt:[],dd:[],figure:[],figcaption:[],div:[],a:["href","target","ping","rel","media","hreflang","type"],em:[],strong:[],small:[],s:[],cite:[],q:["cite"],dfn:[],abbr:[],data:[],time:["datetime"],code:[],"var":[],samp:[],kbd:[],sub:[],sup:[],i:[],b:[],u:[],mark:[],ruby:[],rt:[],rp:[],bdi:[],bdo:[],span:[],br:[],wbr:[],ins:["cite","datetime"],del:["cite","datetime"],img:["alt","src","height","width","usemap","ismap"],iframe:["name","src","height","width","sandbox","seamless"],embed:["src","height","width","type"],object:["param","data","type","height","width","usemap","name","form","classid"],param:["name","value"],video:["src","autobuffer","autoplay","loop","controls","width","height","poster"],audio:["src","autobuffer","autoplay","loop","controls"],source:["src","type","media"],track:["kind","src","srclang","label","default"],canvas:["width","height"],map:["name"],area:["shape","coords","href","hreflang","alt","target","media","rel","ping","type"],svg:[],math:[],table:["summary"],caption:[],colgroup:["span"],col:["span"],tbody:[],thead:[],tfoot:[],tr:[],td:["headers","rowspan","colspan"],th:["headers","rowspan","colspan","scope"],form:["accept-charset","action","autocomplete","enctype","method","name","novalidate","target"],fieldset:["disabled","form","name"],legend:[],label:["form","for"],input:["type","accept","alt","autocomplete","checked","disabled","form","formaction","formenctype","formmethod","formnovalidate","formtarget","height","list","max","maxlength","min","multiple","pattern","placeholder","readonly","required","size","src","step","width","files","value"],button:["autofocus","disabled","form","formaction","formenctype","formmethod","formnovalidate","formtarget","name","value","type"],select:["autofocus","disabled","form","multiple","name","size"],datalist:[],optgroup:["disabled","label"],option:["disabled","selected","label","value"],textarea:["autofocus","disabled","form","maxlength","name","placeholder","readonly","required","rows","cols","wrap"],keygen:["autofocus","challenge","disabled","form","keytype","name"],output:["for","form","name"],progress:["value","max"],meter:["value","min","max","low","high","optimum"],details:["open"],summary:[],command:["type","label","icon","disabled","checked","radiogroup","command"],menu:["type","label"],dialog:["open"]},a=Object.keys(u),c=function(){};(function(){this.getCompletions=function(e,t,n,r){var i=t.getTokenAt(n.row,n.column);return i?f(i,"tag-name")||f(i,"tag-open")||f(i,"end-tag-open")?this.getTagCompletions(e,t,n,r):f(i,"tag-whitespace")||f(i,"attribute-name")?this.getAttributeCompetions(e,t,n,r):[]:[]},this.getTagCompletions=function(e,t,n,r){return a.map(function(e){return{value:e,meta:"tag",score:Number.MAX_VALUE}})},this.getAttributeCompetions=function(e,t,n,r){var i=l(t,n);if(!i)return[];var s=o;return i in u&&(s=s.concat(u[i])),s.map(function(e){return{caption:e,snippet:e+'="$0"',meta:"attribute",score:Number.MAX_VALUE}})}}).call(c.prototype),t.HtmlCompletions=c}),ace.define("ace/mode/html",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text","ace/mode/javascript","ace/mode/css","ace/mode/html_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/html","ace/mode/html_completions","ace/worker/worker_client"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/lang"),s=e("./text").Mode,o=e("./javascript").Mode,u=e("./css").Mode,a=e("./html_highlight_rules").HtmlHighlightRules,f=e("./behaviour/xml").XmlBehaviour,l=e("./folding/html").FoldMode,c=e("./html_completions").HtmlCompletions,h=e("../worker/worker_client").WorkerClient,p=["area","base","br","col","embed","hr","img","input","keygen","link","meta","menuitem","param","source","track","wbr"],d=["li","dt","dd","p","rt","rp","optgroup","option","colgroup","td","th"],v=function(e){this.fragmentContext=e&&e.fragmentContext,this.HighlightRules=a,this.$behaviour=new f,this.$completer=new c,this.createModeDelegates({"js-":o,"css-":u}),this.foldingRules=new l(this.voidElements,i.arrayToMap(d))};r.inherits(v,s),function(){this.blockComment={start:"<!--",end:"-->"},this.voidElements=i.arrayToMap(p),this.getNextLineIndent=function(e,t,n){return this.$getIndent(t)},this.checkOutdent=function(e,t,n){return!1},this.getCompletions=function(e,t,n,r){return this.$completer.getCompletions(e,t,n,r)},this.createWorker=function(e){if(this.constructor!=v)return;var t=new h(["ace"],"ace/mode/html_worker","Worker");return t.attachToDocument(e.getDocument()),this.fragmentContext&&t.call("setOptions",[{context:this.fragmentContext}]),t.on("error",function(t){e.setAnnotations(t.data)}),t.on("terminate",function(){e.clearAnnotations()}),t},this.$id="ace/mode/html"}.call(v.prototype),t.Mode=v}),ace.define("ace/mode/folding/coffee",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=e("../../range").Range,o=t.FoldMode=function(){};r.inherits(o,i),function(){this.getFoldWidgetRange=function(e,t,n){var r=this.indentationBlock(e,n);if(r)return r;var i=/\S/,o=e.getLine(n),u=o.search(i);if(u==-1||o[u]!="#")return;var a=o.length,f=e.getLength(),l=n,c=n;while(++n<f){o=e.getLine(n);var h=o.search(i);if(h==-1)continue;if(o[h]!="#")break;c=n}if(c>l){var p=e.getLine(c).length;return new s(l,a,c,p)}},this.getFoldWidget=function(e,t,n){var r=e.getLine(n),i=r.search(/\S/),s=e.getLine(n+1),o=e.getLine(n-1),u=o.search(/\S/),a=s.search(/\S/);if(i==-1)return e.foldWidgets[n-1]=u!=-1&&u<a?"start":"","";if(u==-1){if(i==a&&r[i]=="#"&&s[i]=="#")return e.foldWidgets[n-1]="",e.foldWidgets[n+1]="","start"}else if(u==i&&r[i]=="#"&&o[i]=="#"&&e.getLine(n-2).search(/\S/)==-1)return e.foldWidgets[n-1]="start",e.foldWidgets[n+1]="","";return u!=-1&&u<i?e.foldWidgets[n-1]="start":e.foldWidgets[n-1]="",i<a?"start":""}}.call(o.prototype)}),ace.define("ace/mode/ruby",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/ruby_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/coffee"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./ruby_highlight_rules").RubyHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("../range").Range,a=e("./behaviour/cstyle").CstyleBehaviour,f=e("./folding/coffee").FoldMode,l=function(){this.HighlightRules=s,this.$outdent=new o,this.$behaviour=new a,this.foldingRules=new f};r.inherits(l,i),function(){this.lineCommentStart="#",this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t),i=this.getTokenizer().getLineTokens(t,e),s=i.tokens;if(s.length&&s[s.length-1].type=="comment")return r;if(e=="start"){var o=t.match(/^.*[\{\(\[]\s*$/),u=t.match(/^\s*(class|def|module)\s.*$/),a=t.match(/.*do(\s*|\s+\|.*\|\s*)$/),f=t.match(/^\s*(if|else)\s*/);if(o||u||a||f)r+=n}return r},this.checkOutdent=function(e,t,n){return/^\s+(end|else)$/.test(t+n)||this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){var r=t.getLine(n);if(/}/.test(r))return this.$outdent.autoOutdent(t,n);var i=this.$getIndent(r),s=t.getLine(n-1),o=this.$getIndent(s),a=t.getTabString();o.length<=i.length&&i.slice(-a.length)==a&&t.remove(new u(n,i.length-a.length,n,i.length))},this.$id="ace/mode/ruby"}.call(l.prototype),t.Mode=l}),ace.define("ace/mode/html_ruby",["require","exports","module","ace/lib/oop","ace/mode/html_ruby_highlight_rules","ace/mode/html","ace/mode/javascript","ace/mode/css","ace/mode/ruby"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./html_ruby_highlight_rules").HtmlRubyHighlightRules,s=e("./html").Mode,o=e("./javascript").Mode,u=e("./css").Mode,a=e("./ruby").Mode,f=function(){s.call(this),this.HighlightRules=i,this.createModeDelegates({"js-":o,"css-":u,"ruby-":a})};r.inherits(f,s),function(){this.$id="ace/mode/html_ruby"}.call(f.prototype),t.Mode=f})
\ No newline at end of file
+ace.define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/lang"),s=e("./text_highlight_rules").TextHighlightRules,o=t.supportType="animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|pointer-events|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index",u=t.supportFunction="rgb|rgba|url|attr|counter|counters",a=t.supportConstant="absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero",f=t.supportConstantColor="aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow",l=t.supportConstantFonts="arial|century|comic|courier|cursive|fantasy|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace",c=t.numRe="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",h=t.pseudoElements="(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b",p=t.pseudoClasses="(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b",d=function(){var e=this.createKeywordMapper({"support.function":u,"support.constant":a,"support.type":o,"support.constant.color":f,"support.constant.fonts":l},"text",!0);this.$rules={start:[{token:"comment",regex:"\\/\\*",push:"comment"},{token:"paren.lparen",regex:"\\{",push:"ruleset"},{token:"string",regex:"@.*?{",push:"media"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"},{caseInsensitive:!0}],media:[{token:"comment",regex:"\\/\\*",push:"comment"},{token:"paren.lparen",regex:"\\{",push:"ruleset"},{token:"string",regex:"\\}",next:"pop"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"},{caseInsensitive:!0}],comment:[{token:"comment",regex:"\\*\\/",next:"pop"},{defaultToken:"comment"}],ruleset:[{token:"paren.rparen",regex:"\\}",next:"pop"},{token:"comment",regex:"\\/\\*",push:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:["constant.numeric","keyword"],regex:"("+c+")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"},{token:"constant.numeric",regex:c},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:["punctuation","entity.other.attribute-name.pseudo-element.css"],regex:h},{token:["punctuation","entity.other.attribute-name.pseudo-class.css"],regex:p},{token:["support.function","string","support.function"],regex:"(url\\()(.*)(\\))"},{token:e,regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"},{caseInsensitive:!0}]},this.normalizeRules()};r.inherits(d,s),t.CssHighlightRules=d}),ace.define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},s.getTagRule(),{defaultToken:"comment.doc",caseInsensitive:!0}]}};r.inherits(s,i),s.getTagRule=function(e){return{token:"comment.doc.tag.storage.type",regex:"\\b(?:TODO|FIXME|XXX|HACK)\\b"}},s.getStartRule=function(e){return{token:"comment.doc",regex:"\\/\\*(?=\\*)",next:e}},s.getEndRule=function(e){return{token:"comment.doc",regex:"\\*\\/",next:e}},t.DocCommentHighlightRules=s}),ace.define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./doc_comment_highlight_rules").DocCommentHighlightRules,s=e("./text_highlight_rules").TextHighlightRules,o=function(e){var t=this.createKeywordMapper({"variable.language":"Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document",keyword:"const|yield|import|get|set|break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|debugger|__parent__|__count__|escape|unescape|with|__proto__|class|enum|extends|super|export|implements|private|public|interface|package|protected|static","storage.type":"const|let|var|function","constant.language":"null|Infinity|NaN|undefined","support.function":"alert","constant.language.boolean":"true|false"},"identifier"),n="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield|void",r="[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*\\b",s="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={no_regex:[{token:"comment",regex:"\\/\\/",next:"line_comment"},i.getStartRule("doc-start"),{token:"comment",regex:/\/\*/,next:"comment"},{token:"string",regex:"'(?=.)",next:"qstring"},{token:"string",regex:'"(?=.)',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator"],regex:"("+r+")(\\.)(prototype)(\\.)("+r+")(\\s*)(=)",next:"function_arguments"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen"],regex:"("+r+")(\\.)("+r+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()",next:"function_arguments"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen"],regex:"("+r+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()",next:"function_arguments"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","entity.name.function","text","paren.lparen"],regex:"("+r+")(\\.)("+r+")(\\s*)(=)(\\s*)(function)(\\s+)(\\w+)(\\s*)(\\()",next:"function_arguments"},{token:["storage.type","text","entity.name.function","text","paren.lparen"],regex:"(function)(\\s+)("+r+")(\\s*)(\\()",next:"function_arguments"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen"],regex:"("+r+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()",next:"function_arguments"},{token:["text","text","storage.type","text","paren.lparen"],regex:"(:)(\\s*)(function)(\\s*)(\\()",next:"function_arguments"},{token:"keyword",regex:"(?:"+n+")\\b",next:"start"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:op|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName|ClassName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["support.constant"],regex:/that\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|trace|timeEnd|assert)\b/},{token:t,regex:r},{token:"keyword.operator",regex:/--|\+\+|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|[!$%&*+\-~\/^]=?/,next:"start"},{token:"punctuation.operator",regex:/[?:,;.]/,next:"start"},{token:"paren.lparen",regex:/[\[({]/,next:"start"},{token:"paren.rparen",regex:/[\])}]/},{token:"comment",regex:/^#!.*$/}],start:[i.getStartRule("doc-start"),{token:"comment",regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/",next:"line_comment_regex_allowed"},{token:"string.regexp",regex:"\\/",next:"regex"},{token:"text",regex:"\\s+|^$",next:"start"},{token:"empty",regex:"",next:"no_regex"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"},{token:"string.regexp",regex:"/[sxngimy]*",next:"no_regex"},{token:"invalid",regex:/\{\d+\b,?\d*\}[+*]|[+*$^?][+*]|[$^][?]|\?{3,}/},{token:"constant.language.escape",regex:/\(\?[:=!]|\)|\{\d+\b,?\d*\}|[+*]\?|[()$^+*?.]/},{token:"constant.language.delimiter",regex:/\|/},{token:"constant.language.escape",regex:/\[\^?/,next:"regex_character_class"},{token:"empty",regex:"$",next:"no_regex"},{defaultToken:"string.regexp"}],regex_character_class:[{token:"regexp.charclass.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"},{token:"constant.language.escape",regex:"]",next:"regex"},{token:"constant.language.escape",regex:"-"},{token:"empty",regex:"$",next:"no_regex"},{defaultToken:"string.regexp.charachterclass"}],function_arguments:[{token:"variable.parameter",regex:r},{token:"punctuation.operator",regex:"[, ]+"},{token:"punctuation.operator",regex:"$"},{token:"empty",regex:"",next:"no_regex"}],comment_regex_allowed:[i.getTagRule(),{token:"comment",regex:"\\*\\/",next:"start"},{defaultToken:"comment",caseInsensitive:!0}],comment:[i.getTagRule(),{token:"comment",regex:"\\*\\/",next:"no_regex"},{defaultToken:"comment",caseInsensitive:!0}],line_comment_regex_allowed:[i.getTagRule(),{token:"comment",regex:"$|^",next:"start"},{defaultToken:"comment",caseInsensitive:!0}],line_comment:[i.getTagRule(),{token:"comment",regex:"$|^",next:"no_regex"},{defaultToken:"comment",caseInsensitive:!0}],qqstring:[{token:"constant.language.escape",regex:s},{token:"string",regex:"\\\\$",next:"qqstring"},{token:"string",regex:'"|$',next:"no_regex"},{defaultToken:"string"}],qstring:[{token:"constant.language.escape",regex:s},{token:"string",regex:"\\\\$",next:"qstring"},{token:"string",regex:"'|$",next:"no_regex"},{defaultToken:"string"}]},(!e||!e.noES6)&&this.$rules.no_regex.unshift({regex:"[{}]",onMatch:function(e,t,n){this.next=e=="{"?this.nextState:"";if(e=="{"&&n.length)return n.unshift("start",t),"paren";if(e=="}"&&n.length){n.shift(),this.next=n.shift();if(this.next.indexOf("string")!=-1)return"paren.quasi.end"}return e=="{"?"paren.lparen":"paren.rparen"},nextState:"start"},{token:"string.quasi.start",regex:/`/,push:[{token:"constant.language.escape",regex:s},{token:"paren.quasi.start",regex:/\${/,push:"start"},{token:"string.quasi.end",regex:/`/,next:"pop"},{defaultToken:"string.quasi"}]}),this.embedRules(i,"doc-",[i.getEndRule("no_regex")]),this.normalizeRules()};r.inherits(o,s),t.JavaScriptHighlightRules=o}),ace.define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(e){var t="[_:a-zA-Z\u00c0-\uffff][-_:.a-zA-Z0-9\u00c0-\uffff]*";this.$rules={start:[{token:"string.cdata.xml",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:["punctuation.xml-decl.xml","keyword.xml-decl.xml"],regex:"(<\\?)(xml)(?=[\\s])",next:"xml_decl",caseInsensitive:!0},{token:["punctuation.instruction.xml","keyword.instruction.xml"],regex:"(<\\?)("+t+")",next:"processing_instruction"},{token:"comment.xml",regex:"<\\!--",next:"comment"},{token:["xml-pe.doctype.xml","xml-pe.doctype.xml"],regex:"(<\\!)(DOCTYPE)(?=[\\s])",next:"doctype",caseInsensitive:!0},{include:"tag"},{token:"text.end-tag-open.xml",regex:"</"},{token:"text.tag-open.xml",regex:"<"},{include:"reference"},{defaultToken:"text.xml"}],xml_decl:[{token:"entity.other.attribute-name.decl-attribute-name.xml",regex:"(?:"+t+":)?"+t+""},{token:"keyword.operator.decl-attribute-equals.xml",regex:"="},{include:"whitespace"},{include:"string"},{token:"punctuation.xml-decl.xml",regex:"\\?>",next:"start"}],processing_instruction:[{token:"punctuation.instruction.xml",regex:"\\?>",next:"start"},{defaultToken:"instruction.xml"}],doctype:[{include:"whitespace"},{include:"string"},{token:"xml-pe.doctype.xml",regex:">",next:"start"},{token:"xml-pe.xml",regex:"[-_a-zA-Z0-9:]+"},{token:"punctuation.int-subset",regex:"\\[",push:"int_subset"}],int_subset:[{token:"text.xml",regex:"\\s+"},{token:"punctuation.int-subset.xml",regex:"]",next:"pop"},{token:["punctuation.markup-decl.xml","keyword.markup-decl.xml"],regex:"(<\\!)("+t+")",push:[{token:"text",regex:"\\s+"},{token:"punctuation.markup-decl.xml",regex:">",next:"pop"},{include:"string"}]}],cdata:[{token:"string.cdata.xml",regex:"\\]\\]>",next:"start"},{token:"text.xml",regex:"\\s+"},{token:"text.xml",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment.xml",regex:"-->",next:"start"},{defaultToken:"comment.xml"}],reference:[{token:"constant.language.escape.reference.xml",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"}],attr_reference:[{token:"constant.language.escape.reference.attribute-value.xml",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"}],tag:[{token:["meta.tag.punctuation.tag-open.xml","meta.tag.punctuation.end-tag-open.xml","meta.tag.tag-name.xml"],regex:"(?:(<)|(</))((?:"+t+":)?"+t+")",next:[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:"start"}]}],tag_whitespace:[{token:"text.tag-whitespace.xml",regex:"\\s+"}],whitespace:[{token:"text.whitespace.xml",regex:"\\s+"}],string:[{token:"string.xml",regex:"'",push:[{token:"string.xml",regex:"'",next:"pop"},{defaultToken:"string.xml"}]},{token:"string.xml",regex:'"',push:[{token:"string.xml",regex:'"',next:"pop"},{defaultToken:"string.xml"}]}],attributes:[{token:"entity.other.attribute-name.xml",regex:"(?:"+t+":)?"+t+""},{token:"keyword.operator.attribute-equals.xml",regex:"="},{include:"tag_whitespace"},{include:"attribute_value"}],attribute_value:[{token:"string.attribute-value.xml",regex:"'",push:[{token:"string.attribute-value.xml",regex:"'",next:"pop"},{include:"attr_reference"},{defaultToken:"string.attribute-value.xml"}]},{token:"string.attribute-value.xml",regex:'"',push:[{token:"string.attribute-value.xml",regex:'"',next:"pop"},{include:"attr_reference"},{defaultToken:"string.attribute-value.xml"}]}]},this.constructor===s&&this.normalizeRules()};(function(){this.embedTagRules=function(e,t,n){this.$rules.tag.unshift({token:["meta.tag.punctuation.tag-open.xml","meta.tag."+n+".tag-name.xml"],regex:"(<)("+n+"(?=\\s|>|$))",next:[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:t+"start"}]}),this.$rules[n+"-end"]=[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:"start",onMatch:function(e,t,n){return n.splice(0),this.token}}],this.embedRules(e,t,[{token:["meta.tag.punctuation.end-tag-open.xml","meta.tag."+n+".tag-name.xml"],regex:"(</)("+n+"(?=\\s|>|$))",next:n+"-end"},{token:"string.cdata.xml",regex:"<\\!\\[CDATA\\["},{token:"string.cdata.xml",regex:"\\]\\]>"}])}}).call(i.prototype),r.inherits(s,i),t.XmlHighlightRules=s}),ace.define("ace/mode/html_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/css_highlight_rules","ace/mode/javascript_highlight_rules","ace/mode/xml_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/lang"),s=e("./css_highlight_rules").CssHighlightRules,o=e("./javascript_highlight_rules").JavaScriptHighlightRules,u=e("./xml_highlight_rules").XmlHighlightRules,a=i.createMap({a:"anchor",button:"form",form:"form",img:"image",input:"form",label:"form",option:"form",script:"script",select:"form",textarea:"form",style:"style",table:"table",tbody:"table",td:"table",tfoot:"table",th:"table",tr:"table"}),f=function(){u.call(this),this.addRules({attributes:[{include:"tag_whitespace"},{token:"entity.other.attribute-name.xml",regex:"[-_a-zA-Z0-9:.]+"},{token:"keyword.operator.attribute-equals.xml",regex:"=",push:[{include:"tag_whitespace"},{token:"string.unquoted.attribute-value.html",regex:"[^<>='\"`\\s]+",next:"pop"},{token:"empty",regex:"",next:"pop"}]},{include:"attribute_value"}],tag:[{token:function(e,t){var n=a[t];return["meta.tag.punctuation."+(e=="<"?"":"end-")+"tag-open.xml","meta.tag"+(n?"."+n:"")+".tag-name.xml"]},regex:"(</?)([-_a-zA-Z0-9:.]+)",next:"tag_stuff"}],tag_stuff:[{include:"attributes"},{token:"meta.tag.punctuation.tag-close.xml",regex:"/?>",next:"start"}]}),this.embedTagRules(s,"css-","style"),this.embedTagRules(o,"js-","script"),this.constructor===f&&this.normalizeRules()};r.inherits(f,u),t.HtmlHighlightRules=f}),ace.define("ace/mode/ruby_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=t.constantOtherSymbol={token:"constant.other.symbol.ruby",regex:"[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"},o=t.qString={token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},u=t.qqString={token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},a=t.tString={token:"string",regex:"[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"},f=t.constantNumericHex={token:"constant.numeric",regex:"0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"},l=t.constantNumericFloat={token:"constant.numeric",regex:"[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"},c=function(){var e="abort|Array|assert|assert_equal|assert_not_equal|assert_same|assert_not_same|assert_nil|assert_not_nil|assert_match|assert_no_match|assert_in_delta|assert_throws|assert_raise|assert_nothing_raised|assert_instance_of|assert_kind_of|assert_respond_to|assert_operator|assert_send|assert_difference|assert_no_difference|assert_recognizes|assert_generates|assert_response|assert_redirected_to|assert_template|assert_select|assert_select_email|assert_select_rjs|assert_select_encoded|css_select|at_exit|attr|attr_writer|attr_reader|attr_accessor|attr_accessible|autoload|binding|block_given?|callcc|caller|catch|chomp|chomp!|chop|chop!|defined?|delete_via_redirect|eval|exec|exit|exit!|fail|Float|flunk|follow_redirect!|fork|form_for|form_tag|format|gets|global_variables|gsub|gsub!|get_via_redirect|host!|https?|https!|include|Integer|lambda|link_to|link_to_unless_current|link_to_function|link_to_remote|load|local_variables|loop|open|open_session|p|print|printf|proc|putc|puts|post_via_redirect|put_via_redirect|raise|rand|raw|readline|readlines|redirect?|request_via_redirect|require|scan|select|set_trace_func|sleep|split|sprintf|srand|String|stylesheet_link_tag|syscall|system|sub|sub!|test|throw|trace_var|trap|untrace_var|atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan|render|javascript_include_tag|csrf_meta_tag|label_tag|text_field_tag|submit_tag|check_box_tag|content_tag|radio_button_tag|text_area_tag|password_field_tag|hidden_field_tag|fields_for|select_tag|options_for_select|options_from_collection_for_select|collection_select|time_zone_select|select_date|select_time|select_datetime|date_select|time_select|datetime_select|select_year|select_month|select_day|select_hour|select_minute|select_second|file_field_tag|file_field|respond_to|skip_before_action|around_filter|after_filter|verify|protect_from_forgery|rescue_from|helper_method|redirect_to|before_action|send_data|send_file|validates_presence_of|validates_uniqueness_of|validates_length_of|validates_format_of|validates_acceptance_of|validates_associated|validates_exclusion_of|validates_inclusion_of|validates_numericality_of|validates_with|validates_each|authenticate_or_request_with_http_basic|authenticate_or_request_with_http_digest|filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|translate|localize|extract_locale_from_tld|caches_page|expire_page|caches_action|expire_action|cache|expire_fragment|expire_cache_for|observe|cache_sweeper|has_many|has_one|belongs_to|has_and_belongs_to_many",t="alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield",n="true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING",r="$DEBUG|$defout|$FILENAME|$LOAD_PATH|$SAFE|$stdin|$stdout|$stderr|$VERBOSE|$!|root_url|flash|session|cookies|params|request|response|logger|self",i=this.$keywords=this.createKeywordMapper({keyword:t,"constant.language":n,"variable.language":r,"support.function":e,"invalid.deprecated":"debugger"},"identifier");this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"comment",regex:"^=begin(?:$|\\s.*$)",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},[{regex:"[{}]",onMatch:function(e,t,n){this.next=e=="{"?this.nextState:"";if(e=="{"&&n.length)return n.unshift("start",t),"paren.lparen";if(e=="}"&&n.length){n.shift(),this.next=n.shift();if(this.next.indexOf("string")!=-1)return"paren.end"}return e=="{"?"paren.lparen":"paren.rparen"},nextState:"start"},{token:"string.start",regex:/"/,push:[{token:"constant.language.escape",regex:/\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/},{token:"paren.start",regex:/\#{/,push:"start"},{token:"string.end",regex:/"/,next:"pop"},{defaultToken:"string"}]},{token:"string.start",regex:/`/,push:[{token:"constant.language.escape",regex:/\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/},{token:"paren.start",regex:/\#{/,push:"start"},{token:"string.end",regex:/`/,next:"pop"},{defaultToken:"string"}]},{token:"string.start",regex:/'/,push:[{token:"constant.language.escape",regex:/\\['\\]/},{token:"string.end",regex:/'/,next:"pop"},{defaultToken:"string"}]}],{token:"text",regex:"::"},{token:"variable.instance",regex:"@{1,2}[a-zA-Z_\\d]+"},{token:"support.class",regex:"[A-Z][a-zA-Z_\\d]+"},s,f,l,{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:i,regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"punctuation.separator.key-value",regex:"=>"},{stateName:"heredoc",onMatch:function(e,t,n){var r=e[2]=="-"?"indentedHeredoc":"heredoc",i=e.split(this.splitRegex);return n.push(r,i[3]),[{type:"constant",value:i[1]},{type:"string",value:i[2]},{type:"support.class",value:i[3]},{type:"string",value:i[4]}]},regex:"(<<-?)(['\"`]?)([\\w]+)(['\"`]?)",rules:{heredoc:[{onMatch:function(e,t,n){return e===n[1]?(n.shift(),n.shift(),this.next=n[0]||"start","support.class"):(this.next="","string")},regex:".*$",next:"start"}],indentedHeredoc:[{token:"string",regex:"^ +"},{onMatch:function(e,t,n){return e===n[1]?(n.shift(),n.shift(),this.next=n[0]||"start","support.class"):(this.next="","string")},regex:".*$",next:"start"}]}},{regex:"$",token:"empty",next:function(e,t){return t[0]==="heredoc"||t[0]==="indentedHeredoc"?t[0]:e}},{token:"string.character",regex:"\\B\\?."},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:"^=end(?:$|\\s.*$)",next:"start"},{token:"comment",regex:".+"}]},this.normalizeRules()};r.inherits(c,i),t.RubyHighlightRules=c}),ace.define("ace/mode/html_ruby_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/html_highlight_rules","ace/mode/ruby_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./html_highlight_rules").HtmlHighlightRules,s=e("./ruby_highlight_rules").RubyHighlightRules,o=function(){i.call(this);var e=[{regex:"<%%|%%>",token:"constant.language.escape"},{token:"comment.start.erb",regex:"<%#",push:[{token:"comment.end.erb",regex:"%>",next:"pop",defaultToken:"comment"}]},{token:"support.ruby_tag",regex:"<%+(?!>)[-=]?",push:"ruby-start"}],t=[{token:"support.ruby_tag",regex:"%>",next:"pop"},{token:"comment",regex:"#(?:[^%]|%[^>])*"}];for(var n in this.$rules)this.$rules[n].unshift.apply(this.$rules[n],e);this.embedRules(s,"ruby-",t,["start"]),this.normalizeRules()};r.inherits(o,i),t.HtmlRubyHighlightRules=o}),ace.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("../range").Range,i=function(){};(function(){this.checkOutdent=function(e,t){return/^\s+$/.test(e)?/^\s*\}/.test(t):!1},this.autoOutdent=function(e,t){var n=e.getLine(t),i=n.match(/^(\s*\})/);if(!i)return 0;var s=i[1].length,o=e.findMatchingBracket({row:t,column:s});if(!o||o.row==t)return 0;var u=this.$getIndent(e.getLine(o.row));e.replace(new r(t,0,t,s-1),u)},this.$getIndent=function(e){return e.match(/^\s*/)[0]}}).call(i.prototype),t.MatchingBraceOutdent=i}),ace.define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("../../token_iterator").TokenIterator,o=e("../../lib/lang"),u=["text","paren.rparen","punctuation.operator"],a=["text","paren.rparen","punctuation.operator","comment"],f,l={},c=function(e){var t=-1;e.multiSelect&&(t=e.selection.index,l.rangeCount!=e.multiSelect.rangeCount&&(l={rangeCount:e.multiSelect.rangeCount}));if(l[t])return f=l[t];f=l[t]={autoInsertedBrackets:0,autoInsertedRow:-1,autoInsertedLineEnd:"",maybeInsertedBrackets:0,maybeInsertedRow:-1,maybeInsertedLineStart:"",maybeInsertedLineEnd:""}},h=function(e,t,n,r){var i=e.end.row-e.start.row;return{text:n+t+r,selection:[0,e.start.column+1,i,e.end.column+(i?0:1)]}},p=function(){this.add("braces","insertion",function(e,t,n,r,i){var s=n.getCursorPosition(),u=r.doc.getLine(s.row);if(i=="{"){c(n);var a=n.getSelectionRange(),l=r.doc.getTextRange(a);if(l!==""&&l!=="{"&&n.getWrapBehavioursEnabled())return h(a,l,"{","}");if(p.isSaneInsertion(n,r))return/[\]\}\)]/.test(u[s.column])||n.inMultiSelectMode?(p.recordAutoInsert(n,r,"}"),{text:"{}",selection:[1,1]}):(p.recordMaybeInsert(n,r,"{"),{text:"{",selection:[1,1]})}else if(i=="}"){c(n);var d=u.substring(s.column,s.column+1);if(d=="}"){var v=r.$findOpeningBracket("}",{column:s.column+1,row:s.row});if(v!==null&&p.isAutoInsertedClosing(s,u,i))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}else{if(i=="\n"||i=="\r\n"){c(n);var m="";p.isMaybeInsertedClosing(s,u)&&(m=o.stringRepeat("}",f.maybeInsertedBrackets),p.clearMaybeInsertedClosing());var d=u.substring(s.column,s.column+1);if(d==="}"){var g=r.findMatchingBracket({row:s.row,column:s.column+1},"}");if(!g)return null;var y=this.$getIndent(r.getLine(g.row))}else{if(!m){p.clearMaybeInsertedClosing();return}var y=this.$getIndent(u)}var b=y+r.getTabString();return{text:"\n"+b+"\n"+y+m,selection:[1,b.length,1,b.length]}}p.clearMaybeInsertedClosing()}}),this.add("braces","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="{"){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.end.column,i.end.column+1);if(u=="}")return i.end.column++,i;f.maybeInsertedBrackets--}}),this.add("parens","insertion",function(e,t,n,r,i){if(i=="("){c(n);var s=n.getSelectionRange(),o=r.doc.getTextRange(s);if(o!==""&&n.getWrapBehavioursEnabled())return h(s,o,"(",")");if(p.isSaneInsertion(n,r))return p.recordAutoInsert(n,r,")"),{text:"()",selection:[1,1]}}else if(i==")"){c(n);var u=n.getCursorPosition(),a=r.doc.getLine(u.row),f=a.substring(u.column,u.column+1);if(f==")"){var l=r.$findOpeningBracket(")",{column:u.column+1,row:u.row});if(l!==null&&p.isAutoInsertedClosing(u,a,i))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="("){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==")")return i.end.column++,i}}),this.add("brackets","insertion",function(e,t,n,r,i){if(i=="["){c(n);var s=n.getSelectionRange(),o=r.doc.getTextRange(s);if(o!==""&&n.getWrapBehavioursEnabled())return h(s,o,"[","]");if(p.isSaneInsertion(n,r))return p.recordAutoInsert(n,r,"]"),{text:"[]",selection:[1,1]}}else if(i=="]"){c(n);var u=n.getCursorPosition(),a=r.doc.getLine(u.row),f=a.substring(u.column,u.column+1);if(f=="]"){var l=r.$findOpeningBracket("]",{column:u.column+1,row:u.row});if(l!==null&&p.isAutoInsertedClosing(u,a,i))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}}),this.add("brackets","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="["){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u=="]")return i.end.column++,i}}),this.add("string_dquotes","insertion",function(e,t,n,r,i){if(i=='"'||i=="'"){c(n);var s=i,o=n.getSelectionRange(),u=r.doc.getTextRange(o);if(u!==""&&u!=="'"&&u!='"'&&n.getWrapBehavioursEnabled())return h(o,u,s,s);if(!u){var a=n.getCursorPosition(),f=r.doc.getLine(a.row),l=f.substring(a.column-1,a.column),p=f.substring(a.column,a.column+1),d=r.getTokenAt(a.row,a.column),v=r.getTokenAt(a.row,a.column+1);if(l=="\\"&&d&&/escape/.test(d.type))return null;var m=d&&/string/.test(d.type),g=!v||/string/.test(v.type),y;if(p==s)y=m!==g;else{if(m&&!g)return null;if(m&&g)return null;var b=r.$mode.tokenRe;b.lastIndex=0;var w=b.test(l);b.lastIndex=0;var E=b.test(l);if(w||E)return null;if(p&&!/[\s;,.})\]\\]/.test(p))return null;y=!0}return{text:y?s+s:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&(s=='"'||s=="'")){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==s)return i.end.column++,i}})};p.isSaneInsertion=function(e,t){var n=e.getCursorPosition(),r=new s(t,n.row,n.column);if(!this.$matchTokenType(r.getCurrentToken()||"text",u)){var i=new s(t,n.row,n.column+1);if(!this.$matchTokenType(i.getCurrentToken()||"text",u))return!1}return r.stepForward(),r.getCurrentTokenRow()!==n.row||this.$matchTokenType(r.getCurrentToken()||"text",a)},p.$matchTokenType=function(e,t){return t.indexOf(e.type||e)>-1},p.recordAutoInsert=function(e,t,n){var r=e.getCursorPosition(),i=t.doc.getLine(r.row);this.isAutoInsertedClosing(r,i,f.autoInsertedLineEnd[0])||(f.autoInsertedBrackets=0),f.autoInsertedRow=r.row,f.autoInsertedLineEnd=n+i.substr(r.column),f.autoInsertedBrackets++},p.recordMaybeInsert=function(e,t,n){var r=e.getCursorPosition(),i=t.doc.getLine(r.row);this.isMaybeInsertedClosing(r,i)||(f.maybeInsertedBrackets=0),f.maybeInsertedRow=r.row,f.maybeInsertedLineStart=i.substr(0,r.column)+n,f.maybeInsertedLineEnd=i.substr(r.column),f.maybeInsertedBrackets++},p.isAutoInsertedClosing=function(e,t,n){return f.autoInsertedBrackets>0&&e.row===f.autoInsertedRow&&n===f.autoInsertedLineEnd[0]&&t.substr(e.column)===f.autoInsertedLineEnd},p.isMaybeInsertedClosing=function(e,t){return f.maybeInsertedBrackets>0&&e.row===f.maybeInsertedRow&&t.substr(e.column)===f.maybeInsertedLineEnd&&t.substr(0,e.column)==f.maybeInsertedLineStart},p.popAutoInsertedClosing=function(){f.autoInsertedLineEnd=f.autoInsertedLineEnd.substr(1),f.autoInsertedBrackets--},p.clearMaybeInsertedClosing=function(){f&&(f.maybeInsertedBrackets=0,f.maybeInsertedRow=-1)},r.inherits(p,i),t.CstyleBehaviour=p}),ace.define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../../range").Range,s=e("./fold_mode").FoldMode,o=t.FoldMode=function(e){e&&(this.foldingStartMarker=new RegExp(this.foldingStartMarker.source.replace(/\|[^|]*?$/,"|"+e.start)),this.foldingStopMarker=new RegExp(this.foldingStopMarker.source.replace(/\|[^|]*?$/,"|"+e.end)))};r.inherits(o,s),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.singleLineBlockCommentRe=/^\s*(\/\*).*\*\/\s*$/,this.tripleStarBlockCommentRe=/^\s*(\/\*\*\*).*\*\/\s*$/,this.startRegionRe=/^\s*(\/\*|\/\/)#?region\b/,this._getFoldWidgetBase=this.getFoldWidget,this.getFoldWidget=function(e,t,n){var r=e.getLine(n);if(this.singleLineBlockCommentRe.test(r)&&!this.startRegionRe.test(r)&&!this.tripleStarBlockCommentRe.test(r))return"";var i=this._getFoldWidgetBase(e,t,n);return!i&&this.startRegionRe.test(r)?"start":i},this.getFoldWidgetRange=function(e,t,n,r){var i=e.getLine(n);if(this.startRegionRe.test(i))return this.getCommentRegionBlock(e,i,n);var s=i.match(this.foldingStartMarker);if(s){var o=s.index;if(s[1])return this.openingBracketBlock(e,s[1],n,o);var u=e.getCommentFoldRange(n,o+s[0].length,1);return u&&!u.isMultiLine()&&(r?u=this.getSectionRange(e,n):t!="all"&&(u=null)),u}if(t==="markbegin")return;var s=i.match(this.foldingStopMarker);if(s){var o=s.index+s[0].length;return s[1]?this.closingBracketBlock(e,s[1],n,o):e.getCommentFoldRange(n,o,-1)}},this.getSectionRange=function(e,t){var n=e.getLine(t),r=n.search(/\S/),s=t,o=n.length;t+=1;var u=t,a=e.getLength();while(++t<a){n=e.getLine(t);var f=n.search(/\S/);if(f===-1)continue;if(r>f)break;var l=this.getFoldWidgetRange(e,"all",t);if(l){if(l.start.row<=s)break;if(l.isMultiLine())t=l.end.row;else if(r==f)break}u=t}return new i(s,o,u,e.getLine(u).length)},this.getCommentRegionBlock=function(e,t,n){var r=t.search(/\s*$/),s=e.getLength(),o=n,u=/^\s*(?:\/\*|\/\/|--)#?(end)?region\b/,a=1;while(++n<s){t=e.getLine(n);var f=u.exec(t);if(!f)continue;f[1]?a--:a++;if(!a)break}var l=n;if(l>o)return new i(o,r,l,t.length)}}.call(o.prototype)}),ace.define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./javascript_highlight_rules").JavaScriptHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("../range").Range,a=e("../worker/worker_client").WorkerClient,f=e("./behaviour/cstyle").CstyleBehaviour,l=e("./folding/cstyle").FoldMode,c=function(){this.HighlightRules=s,this.$outdent=new o,this.$behaviour=new f,this.foldingRules=new l};r.inherits(c,i),function(){this.lineCommentStart="//",this.blockComment={start:"/*",end:"*/"},this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t),i=this.getTokenizer().getLineTokens(t,e),s=i.tokens,o=i.state;if(s.length&&s[s.length-1].type=="comment")return r;if(e=="start"||e=="no_regex"){var u=t.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);u&&(r+=n)}else if(e=="doc-start"){if(o=="start"||o=="no_regex")return"";var u=t.match(/^\s*(\/?)\*/);u&&(u[1]&&(r+=" "),r+="* ")}return r},this.checkOutdent=function(e,t,n){return this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){this.$outdent.autoOutdent(t,n)},this.createWorker=function(e){var t=new a(["ace"],"ace/mode/javascript_worker","JavaScriptWorker");return t.attachToDocument(e.getDocument()),t.on("annotate",function(t){e.setAnnotations(t.data)}),t.on("terminate",function(){e.clearAnnotations()}),t},this.$id="ace/mode/javascript"}.call(c.prototype),t.Mode=c}),ace.define("ace/mode/behaviour/css",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle","ace/token_iterator"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("./cstyle").CstyleBehaviour,o=e("../../token_iterator").TokenIterator,u=function(){this.inherit(s),this.add("colon","insertion",function(e,t,n,r,i){if(i===":"){var s=n.getCursorPosition(),u=new o(r,s.row,s.column),a=u.getCurrentToken();a&&a.value.match(/\s+/)&&(a=u.stepBackward());if(a&&a.type==="support.type"){var f=r.doc.getLine(s.row),l=f.substring(s.column,s.column+1);if(l===":")return{text:"",selection:[1,1]};if(!f.substring(s.column).match(/^\s*;/))return{text:":;",selection:[1,1]}}}}),this.add("colon","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s===":"){var u=n.getCursorPosition(),a=new o(r,u.row,u.column),f=a.getCurrentToken();f&&f.value.match(/\s+/)&&(f=a.stepBackward());if(f&&f.type==="support.type"){var l=r.doc.getLine(i.start.row),c=l.substring(i.end.column,i.end.column+1);if(c===";")return i.end.column++,i}}}),this.add("semicolon","insertion",function(e,t,n,r,i){if(i===";"){var s=n.getCursorPosition(),o=r.doc.getLine(s.row),u=o.substring(s.column,s.column+1);if(u===";")return{text:"",selection:[1,1]}}})};r.inherits(u,s),t.CssBehaviour=u}),ace.define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/behaviour/css","ace/mode/folding/cstyle"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./css_highlight_rules").CssHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("../worker/worker_client").WorkerClient,a=e("./behaviour/css").CssBehaviour,f=e("./folding/cstyle").FoldMode,l=function(){this.HighlightRules=s,this.$outdent=new o,this.$behaviour=new a,this.foldingRules=new f};r.inherits(l,i),function(){this.foldingRules="cStyle",this.blockComment={start:"/*",end:"*/"},this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t),i=this.getTokenizer().getLineTokens(t,e).tokens;if(i.length&&i[i.length-1].type=="comment")return r;var s=t.match(/^.*\{\s*$/);return s&&(r+=n),r},this.checkOutdent=function(e,t,n){return this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){this.$outdent.autoOutdent(t,n)},this.createWorker=function(e){var t=new u(["ace"],"ace/mode/css_worker","Worker");return t.attachToDocument(e.getDocument()),t.on("annotate",function(t){e.setAnnotations(t.data)}),t.on("terminate",function(){e.clearAnnotations()}),t},this.$id="ace/mode/css"}.call(l.prototype),t.Mode=l}),ace.define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"],function(e,t,n){"use strict";function u(e,t){return e.type.lastIndexOf(t+".xml")>-1}var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("../../token_iterator").TokenIterator,o=e("../../lib/lang"),a=function(){this.add("string_dquotes","insertion",function(e,t,n,r,i){if(i=='"'||i=="'"){var o=i,a=r.doc.getTextRange(n.getSelectionRange());if(a!==""&&a!=="'"&&a!='"'&&n.getWrapBehavioursEnabled())return{text:o+a+o,selection:!1};var f=n.getCursorPosition(),l=r.doc.getLine(f.row),c=l.substring(f.column,f.column+1),h=new s(r,f.row,f.column),p=h.getCurrentToken();if(c==o&&(u(p,"attribute-value")||u(p,"string")))return{text:"",selection:[1,1]};p||(p=h.stepBackward());if(!p)return;while(u(p,"tag-whitespace")||u(p,"whitespace"))p=h.stepBackward();var d=!c||c.match(/\s/);if(u(p,"attribute-equals")&&(d||c==">")||u(p,"decl-attribute-equals")&&(d||c=="?"))return{text:o+o,selection:[1,1]}}}),this.add("string_dquotes","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&(s=='"'||s=="'")){var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==s)return i.end.column++,i}}),this.add("autoclosing","insertion",function(e,t,n,r,i){if(i==">"){var o=n.getCursorPosition(),a=new s(r,o.row,o.column),f=a.getCurrentToken()||a.stepBackward();if(!f||!(u(f,"tag-name")||u(f,"tag-whitespace")||u(f,"attribute-name")||u(f,"attribute-equals")||u(f,"attribute-value")))return;if(u(f,"reference.attribute-value"))return;if(u(f,"attribute-value")){var l=f.value.charAt(0);if(l=='"'||l=="'"){var c=f.value.charAt(f.value.length-1),h=a.getCurrentTokenColumn()+f.value.length;if(h>o.column||h==o.column&&l!=c)return}}while(!u(f,"tag-name"))f=a.stepBackward();var p=a.getCurrentTokenRow(),d=a.getCurrentTokenColumn();if(u(a.stepBackward(),"end-tag-open"))return;var v=f.value;p==o.row&&(v=v.substring(0,o.column-d));if(this.voidElements.hasOwnProperty(v.toLowerCase()))return;return{text:"></"+v+">",selection:[1,1]}}}),this.add("autoindent","insertion",function(e,t,n,r,i){if(i=="\n"){var o=n.getCursorPosition(),u=r.getLine(o.row),a=new s(r,o.row,o.column),f=a.getCurrentToken();if(f&&f.type.indexOf("tag-close")!==-1){if(f.value=="/>")return;while(f&&f.type.indexOf("tag-name")===-1)f=a.stepBackward();if(!f)return;var l=f.value,c=a.getCurrentTokenRow();f=a.stepBackward();if(!f||f.type.indexOf("end-tag")!==-1)return;if(this.voidElements&&!this.voidElements[l]){var h=r.getTokenAt(o.row,o.column+1),u=r.getLine(c),p=this.$getIndent(u),d=p+r.getTabString();return h&&h.value==="</"?{text:"\n"+d+"\n"+p,selection:[1,d.length,1,d.length]}:{text:"\n"+d}}}}})};r.inherits(a,i),t.XmlBehaviour=a}),ace.define("ace/mode/folding/mixed",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=t.FoldMode=function(e,t){this.defaultMode=e,this.subModes=t};r.inherits(s,i),function(){this.$getMode=function(e){typeof e!="string"&&(e=e[0]);for(var t in this.subModes)if(e.indexOf(t)===0)return this.subModes[t];return null},this.$tryMode=function(e,t,n,r){var i=this.$getMode(e);return i?i.getFoldWidget(t,n,r):""},this.getFoldWidget=function(e,t,n){return this.$tryMode(e.getState(n-1),e,t,n)||this.$tryMode(e.getState(n),e,t,n)||this.defaultMode.getFoldWidget(e,t,n)},this.getFoldWidgetRange=function(e,t,n){var r=this.$getMode(e.getState(n-1));if(!r||!r.getFoldWidget(e,t,n))r=this.$getMode(e.getState(n));if(!r||!r.getFoldWidget(e,t,n))r=this.defaultMode;return r.getFoldWidgetRange(e,t,n)}}.call(s.prototype)}),ace.define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(e,t,n){"use strict";function l(e,t){return e.type.lastIndexOf(t+".xml")>-1}var r=e("../../lib/oop"),i=e("../../lib/lang"),s=e("../../range").Range,o=e("./fold_mode").FoldMode,u=e("../../token_iterator").TokenIterator,a=t.FoldMode=function(e,t){o.call(this),this.voidElements=e||{},this.optionalEndTags=r.mixin({},this.voidElements),t&&r.mixin(this.optionalEndTags,t)};r.inherits(a,o);var f=function(){this.tagName="",this.closing=!1,this.selfClosing=!1,this.start={row:0,column:0},this.end={row:0,column:0}};(function(){this.getFoldWidget=function(e,t,n){var r=this._getFirstTagInLine(e,n);return r?r.closing||!r.tagName&&r.selfClosing?t=="markbeginend"?"end":"":!r.tagName||r.selfClosing||this.voidElements.hasOwnProperty(r.tagName.toLowerCase())?"":this._findEndTagInLine(e,n,r.tagName,r.end.column)?"":"start":""},this._getFirstTagInLine=function(e,t){var n=e.getTokens(t),r=new f;for(var i=0;i<n.length;i++){var s=n[i];if(l(s,"tag-open")){r.end.column=r.start.column+s.value.length,r.closing=l(s,"end-tag-open"),s=n[++i];if(!s)return null;r.tagName=s.value,r.end.column+=s.value.length;for(i++;i<n.length;i++){s=n[i],r.end.column+=s.value.length;if(l(s,"tag-close")){r.selfClosing=s.value=="/>";break}}return r}if(l(s,"tag-close"))return r.selfClosing=s.value=="/>",r;r.start.column+=s.value.length}return null},this._findEndTagInLine=function(e,t,n,r){var i=e.getTokens(t),s=0;for(var o=0;o<i.length;o++){var u=i[o];s+=u.value.length;if(s<r)continue;if(l(u,"end-tag-open")){u=i[o+1];if(u&&u.value==n)return!0}}return!1},this._readTagForward=function(e){var t=e.getCurrentToken();if(!t)return null;var n=new f;do if(l(t,"tag-open"))n.closing=l(t,"end-tag-open"),n.start.row=e.getCurrentTokenRow(),n.start.column=e.getCurrentTokenColumn();else if(l(t,"tag-name"))n.tagName=t.value;else if(l(t,"tag-close"))return n.selfClosing=t.value=="/>",n.end.row=e.getCurrentTokenRow(),n.end.column=e.getCurrentTokenColumn()+t.value.length,e.stepForward(),n;while(t=e.stepForward());return null},this._readTagBackward=function(e){var t=e.getCurrentToken();if(!t)return null;var n=new f;do{if(l(t,"tag-open"))return n.closing=l(t,"end-tag-open"),n.start.row=e.getCurrentTokenRow(),n.start.column=e.getCurrentTokenColumn(),e.stepBackward(),n;l(t,"tag-name")?n.tagName=t.value:l(t,"tag-close")&&(n.selfClosing=t.value=="/>",n.end.row=e.getCurrentTokenRow(),n.end.column=e.getCurrentTokenColumn()+t.value.length)}while(t=e.stepBackward());return null},this._pop=function(e,t){while(e.length){var n=e[e.length-1];if(!t||n.tagName==t.tagName)return e.pop();if(this.optionalEndTags.hasOwnProperty(n.tagName)){e.pop();continue}return null}},this.getFoldWidgetRange=function(e,t,n){var r=this._getFirstTagInLine(e,n);if(!r)return null;var i=r.closing||r.selfClosing,o=[],a;if(!i){var f=new u(e,n,r.start.column),l={row:n,column:r.start.column+r.tagName.length+2};r.start.row==r.end.row&&(l.column=r.end.column);while(a=this._readTagForward(f)){if(a.selfClosing){if(!o.length)return a.start.column+=a.tagName.length+2,a.end.column-=2,s.fromPoints(a.start,a.end);continue}if(a.closing){this._pop(o,a);if(o.length==0)return s.fromPoints(l,a.start)}else o.push(a)}}else{var f=new u(e,n,r.end.column),c={row:n,column:r.start.column};while(a=this._readTagBackward(f)){if(a.selfClosing){if(!o.length)return a.start.column+=a.tagName.length+2,a.end.column-=2,s.fromPoints(a.start,a.end);continue}if(!a.closing){this._pop(o,a);if(o.length==0)return a.start.column+=a.tagName.length+2,a.start.row==a.end.row&&a.start.column<a.end.column&&(a.start.column=a.end.column),s.fromPoints(a.start,c)}else o.push(a)}}}}).call(a.prototype)}),ace.define("ace/mode/folding/html",["require","exports","module","ace/lib/oop","ace/mode/folding/mixed","ace/mode/folding/xml","ace/mode/folding/cstyle"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./mixed").FoldMode,s=e("./xml").FoldMode,o=e("./cstyle").FoldMode,u=t.FoldMode=function(e,t){i.call(this,new s(e,t),{"js-":new o,"css-":new o})};r.inherits(u,i)}),ace.define("ace/mode/html_completions",["require","exports","module","ace/token_iterator"],function(e,t,n){"use strict";function f(e,t){return e.type.lastIndexOf(t+".xml")>-1}function l(e,t){var n=new r(e,t.row,t.column),i=n.getCurrentToken();while(i&&!f(i,"tag-name"))i=n.stepBackward();if(i)return i.value}var r=e("../token_iterator").TokenIterator,i=["accesskey","class","contenteditable","contextmenu","dir","draggable","dropzone","hidden","id","inert","itemid","itemprop","itemref","itemscope","itemtype","lang","spellcheck","style","tabindex","title","translate"],s=["onabort","onblur","oncancel","oncanplay","oncanplaythrough","onchange","onclick","onclose","oncontextmenu","oncuechange","ondblclick","ondrag","ondragend","ondragenter","ondragleave","ondragover","ondragstart","ondrop","ondurationchange","onemptied","onended","onerror","onfocus","oninput","oninvalid","onkeydown","onkeypress","onkeyup","onload","onloadeddata","onloadedmetadata","onloadstart","onmousedown","onmousemove","onmouseout","onmouseover","onmouseup","onmousewheel","onpause","onplay","onplaying","onprogress","onratechange","onreset","onscroll","onseeked","onseeking","onselect","onshow","onstalled","onsubmit","onsuspend","ontimeupdate","onvolumechange","onwaiting"],o=i.concat(s),u={html:["manifest"],head:[],title:[],base:["href","target"],link:["href","hreflang","rel","media","type","sizes"],meta:["http-equiv","name","content","charset"],style:["type","media","scoped"],script:["charset","type","src","defer","async"],noscript:["href"],body:["onafterprint","onbeforeprint","onbeforeunload","onhashchange","onmessage","onoffline","onpopstate","onredo","onresize","onstorage","onundo","onunload"],section:[],nav:[],article:["pubdate"],aside:[],h1:[],h2:[],h3:[],h4:[],h5:[],h6:[],header:[],footer:[],address:[],main:[],p:[],hr:[],pre:[],blockquote:["cite"],ol:["start","reversed"],ul:[],li:["value"],dl:[],dt:[],dd:[],figure:[],figcaption:[],div:[],a:["href","target","ping","rel","media","hreflang","type"],em:[],strong:[],small:[],s:[],cite:[],q:["cite"],dfn:[],abbr:[],data:[],time:["datetime"],code:[],"var":[],samp:[],kbd:[],sub:[],sup:[],i:[],b:[],u:[],mark:[],ruby:[],rt:[],rp:[],bdi:[],bdo:[],span:[],br:[],wbr:[],ins:["cite","datetime"],del:["cite","datetime"],img:["alt","src","height","width","usemap","ismap"],iframe:["name","src","height","width","sandbox","seamless"],embed:["src","height","width","type"],object:["param","data","type","height","width","usemap","name","form","classid"],param:["name","value"],video:["src","autobuffer","autoplay","loop","controls","width","height","poster"],audio:["src","autobuffer","autoplay","loop","controls"],source:["src","type","media"],track:["kind","src","srclang","label","default"],canvas:["width","height"],map:["name"],area:["shape","coords","href","hreflang","alt","target","media","rel","ping","type"],svg:[],math:[],table:["summary"],caption:[],colgroup:["span"],col:["span"],tbody:[],thead:[],tfoot:[],tr:[],td:["headers","rowspan","colspan"],th:["headers","rowspan","colspan","scope"],form:["accept-charset","action","autocomplete","enctype","method","name","novalidate","target"],fieldset:["disabled","form","name"],legend:[],label:["form","for"],input:["type","accept","alt","autocomplete","checked","disabled","form","formaction","formenctype","formmethod","formnovalidate","formtarget","height","list","max","maxlength","min","multiple","pattern","placeholder","readonly","required","size","src","step","width","files","value"],button:["autofocus","disabled","form","formaction","formenctype","formmethod","formnovalidate","formtarget","name","value","type"],select:["autofocus","disabled","form","multiple","name","size"],datalist:[],optgroup:["disabled","label"],option:["disabled","selected","label","value"],textarea:["autofocus","disabled","form","maxlength","name","placeholder","readonly","required","rows","cols","wrap"],keygen:["autofocus","challenge","disabled","form","keytype","name"],output:["for","form","name"],progress:["value","max"],meter:["value","min","max","low","high","optimum"],details:["open"],summary:[],command:["type","label","icon","disabled","checked","radiogroup","command"],menu:["type","label"],dialog:["open"]},a=Object.keys(u),c=function(){};(function(){this.getCompletions=function(e,t,n,r){var i=t.getTokenAt(n.row,n.column);return i?f(i,"tag-name")||f(i,"tag-open")||f(i,"end-tag-open")?this.getTagCompletions(e,t,n,r):f(i,"tag-whitespace")||f(i,"attribute-name")?this.getAttributeCompetions(e,t,n,r):[]:[]},this.getTagCompletions=function(e,t,n,r){return a.map(function(e){return{value:e,meta:"tag",score:Number.MAX_VALUE}})},this.getAttributeCompetions=function(e,t,n,r){var i=l(t,n);if(!i)return[];var s=o;return i in u&&(s=s.concat(u[i])),s.map(function(e){return{caption:e,snippet:e+'="$0"',meta:"attribute",score:Number.MAX_VALUE}})}}).call(c.prototype),t.HtmlCompletions=c}),ace.define("ace/mode/html",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text","ace/mode/javascript","ace/mode/css","ace/mode/html_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/html","ace/mode/html_completions","ace/worker/worker_client"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/lang"),s=e("./text").Mode,o=e("./javascript").Mode,u=e("./css").Mode,a=e("./html_highlight_rules").HtmlHighlightRules,f=e("./behaviour/xml").XmlBehaviour,l=e("./folding/html").FoldMode,c=e("./html_completions").HtmlCompletions,h=e("../worker/worker_client").WorkerClient,p=["area","base","br","col","embed","hr","img","input","keygen","link","meta","menuitem","param","source","track","wbr"],d=["li","dt","dd","p","rt","rp","optgroup","option","colgroup","td","th"],v=function(e){this.fragmentContext=e&&e.fragmentContext,this.HighlightRules=a,this.$behaviour=new f,this.$completer=new c,this.createModeDelegates({"js-":o,"css-":u}),this.foldingRules=new l(this.voidElements,i.arrayToMap(d))};r.inherits(v,s),function(){this.blockComment={start:"<!--",end:"-->"},this.voidElements=i.arrayToMap(p),this.getNextLineIndent=function(e,t,n){return this.$getIndent(t)},this.checkOutdent=function(e,t,n){return!1},this.getCompletions=function(e,t,n,r){return this.$completer.getCompletions(e,t,n,r)},this.createWorker=function(e){if(this.constructor!=v)return;var t=new h(["ace"],"ace/mode/html_worker","Worker");return t.attachToDocument(e.getDocument()),this.fragmentContext&&t.call("setOptions",[{context:this.fragmentContext}]),t.on("error",function(t){e.setAnnotations(t.data)}),t.on("terminate",function(){e.clearAnnotations()}),t},this.$id="ace/mode/html"}.call(v.prototype),t.Mode=v}),ace.define("ace/mode/folding/coffee",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=e("../../range").Range,o=t.FoldMode=function(){};r.inherits(o,i),function(){this.getFoldWidgetRange=function(e,t,n){var r=this.indentationBlock(e,n);if(r)return r;var i=/\S/,o=e.getLine(n),u=o.search(i);if(u==-1||o[u]!="#")return;var a=o.length,f=e.getLength(),l=n,c=n;while(++n<f){o=e.getLine(n);var h=o.search(i);if(h==-1)continue;if(o[h]!="#")break;c=n}if(c>l){var p=e.getLine(c).length;return new s(l,a,c,p)}},this.getFoldWidget=function(e,t,n){var r=e.getLine(n),i=r.search(/\S/),s=e.getLine(n+1),o=e.getLine(n-1),u=o.search(/\S/),a=s.search(/\S/);if(i==-1)return e.foldWidgets[n-1]=u!=-1&&u<a?"start":"","";if(u==-1){if(i==a&&r[i]=="#"&&s[i]=="#")return e.foldWidgets[n-1]="",e.foldWidgets[n+1]="","start"}else if(u==i&&r[i]=="#"&&o[i]=="#"&&e.getLine(n-2).search(/\S/)==-1)return e.foldWidgets[n-1]="start",e.foldWidgets[n+1]="","";return u!=-1&&u<i?e.foldWidgets[n-1]="start":e.foldWidgets[n-1]="",i<a?"start":""}}.call(o.prototype)}),ace.define("ace/mode/ruby",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/ruby_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/coffee"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./ruby_highlight_rules").RubyHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("../range").Range,a=e("./behaviour/cstyle").CstyleBehaviour,f=e("./folding/coffee").FoldMode,l=function(){this.HighlightRules=s,this.$outdent=new o,this.$behaviour=new a,this.foldingRules=new f};r.inherits(l,i),function(){this.lineCommentStart="#",this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t),i=this.getTokenizer().getLineTokens(t,e),s=i.tokens;if(s.length&&s[s.length-1].type=="comment")return r;if(e=="start"){var o=t.match(/^.*[\{\(\[]\s*$/),u=t.match(/^\s*(class|def|module)\s.*$/),a=t.match(/.*do(\s*|\s+\|.*\|\s*)$/),f=t.match(/^\s*(if|else)\s*/);if(o||u||a||f)r+=n}return r},this.checkOutdent=function(e,t,n){return/^\s+(end|else)$/.test(t+n)||this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){var r=t.getLine(n);if(/}/.test(r))return this.$outdent.autoOutdent(t,n);var i=this.$getIndent(r),s=t.getLine(n-1),o=this.$getIndent(s),a=t.getTabString();o.length<=i.length&&i.slice(-a.length)==a&&t.remove(new u(n,i.length-a.length,n,i.length))},this.$id="ace/mode/ruby"}.call(l.prototype),t.Mode=l}),ace.define("ace/mode/html_ruby",["require","exports","module","ace/lib/oop","ace/mode/html_ruby_highlight_rules","ace/mode/html","ace/mode/javascript","ace/mode/css","ace/mode/ruby"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./html_ruby_highlight_rules").HtmlRubyHighlightRules,s=e("./html").Mode,o=e("./javascript").Mode,u=e("./css").Mode,a=e("./ruby").Mode,f=function(){s.call(this),this.HighlightRules=i,this.createModeDelegates({"js-":o,"css-":u,"ruby-":a})};r.inherits(f,s),function(){this.$id="ace/mode/html_ruby"}.call(f.prototype),t.Mode=f})
\ No newline at end of file
diff --git a/public/javascripts/ace/mode-ruby.js b/public/javascripts/ace/mode-ruby.js
index 0e97520e10..7909bac4b2 100644
--- a/public/javascripts/ace/mode-ruby.js
+++ b/public/javascripts/ace/mode-ruby.js
@@ -1 +1 @@
-ace.define("ace/mode/ruby_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=t.constantOtherSymbol={token:"constant.other.symbol.ruby",regex:"[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"},o=t.qString={token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},u=t.qqString={token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},a=t.tString={token:"string",regex:"[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"},f=t.constantNumericHex={token:"constant.numeric",regex:"0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"},l=t.constantNumericFloat={token:"constant.numeric",regex:"[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"},c=function(){var e="abort|Array|assert|assert_equal|assert_not_equal|assert_same|assert_not_same|assert_nil|assert_not_nil|assert_match|assert_no_match|assert_in_delta|assert_throws|assert_raise|assert_nothing_raised|assert_instance_of|assert_kind_of|assert_respond_to|assert_operator|assert_send|assert_difference|assert_no_difference|assert_recognizes|assert_generates|assert_response|assert_redirected_to|assert_template|assert_select|assert_select_email|assert_select_rjs|assert_select_encoded|css_select|at_exit|attr|attr_writer|attr_reader|attr_accessor|attr_accessible|autoload|binding|block_given?|callcc|caller|catch|chomp|chomp!|chop|chop!|defined?|delete_via_redirect|eval|exec|exit|exit!|fail|Float|flunk|follow_redirect!|fork|form_for|form_tag|format|gets|global_variables|gsub|gsub!|get_via_redirect|host!|https?|https!|include|Integer|lambda|link_to|link_to_unless_current|link_to_function|link_to_remote|load|local_variables|loop|open|open_session|p|print|printf|proc|putc|puts|post_via_redirect|put_via_redirect|raise|rand|raw|readline|readlines|redirect?|request_via_redirect|require|scan|select|set_trace_func|sleep|split|sprintf|srand|String|stylesheet_link_tag|syscall|system|sub|sub!|test|throw|trace_var|trap|untrace_var|atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan|render|javascript_include_tag|csrf_meta_tag|label_tag|text_field_tag|submit_tag|check_box_tag|content_tag|radio_button_tag|text_area_tag|password_field_tag|hidden_field_tag|fields_for|select_tag|options_for_select|options_from_collection_for_select|collection_select|time_zone_select|select_date|select_time|select_datetime|date_select|time_select|datetime_select|select_year|select_month|select_day|select_hour|select_minute|select_second|file_field_tag|file_field|respond_to|skip_before_filter|around_filter|after_filter|verify|protect_from_forgery|rescue_from|helper_method|redirect_to|before_filter|send_data|send_file|validates_presence_of|validates_uniqueness_of|validates_length_of|validates_format_of|validates_acceptance_of|validates_associated|validates_exclusion_of|validates_inclusion_of|validates_numericality_of|validates_with|validates_each|authenticate_or_request_with_http_basic|authenticate_or_request_with_http_digest|filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|translate|localize|extract_locale_from_tld|caches_page|expire_page|caches_action|expire_action|cache|expire_fragment|expire_cache_for|observe|cache_sweeper|has_many|has_one|belongs_to|has_and_belongs_to_many",t="alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield",n="true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING",r="$DEBUG|$defout|$FILENAME|$LOAD_PATH|$SAFE|$stdin|$stdout|$stderr|$VERBOSE|$!|root_url|flash|session|cookies|params|request|response|logger|self",i=this.$keywords=this.createKeywordMapper({keyword:t,"constant.language":n,"variable.language":r,"support.function":e,"invalid.deprecated":"debugger"},"identifier");this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"comment",regex:"^=begin(?:$|\\s.*$)",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},[{regex:"[{}]",onMatch:function(e,t,n){this.next=e=="{"?this.nextState:"";if(e=="{"&&n.length)return n.unshift("start",t),"paren.lparen";if(e=="}"&&n.length){n.shift(),this.next=n.shift();if(this.next.indexOf("string")!=-1)return"paren.end"}return e=="{"?"paren.lparen":"paren.rparen"},nextState:"start"},{token:"string.start",regex:/"/,push:[{token:"constant.language.escape",regex:/\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/},{token:"paren.start",regex:/\#{/,push:"start"},{token:"string.end",regex:/"/,next:"pop"},{defaultToken:"string"}]},{token:"string.start",regex:/`/,push:[{token:"constant.language.escape",regex:/\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/},{token:"paren.start",regex:/\#{/,push:"start"},{token:"string.end",regex:/`/,next:"pop"},{defaultToken:"string"}]},{token:"string.start",regex:/'/,push:[{token:"constant.language.escape",regex:/\\['\\]/},{token:"string.end",regex:/'/,next:"pop"},{defaultToken:"string"}]}],{token:"text",regex:"::"},{token:"variable.instance",regex:"@{1,2}[a-zA-Z_\\d]+"},{token:"support.class",regex:"[A-Z][a-zA-Z_\\d]+"},s,f,l,{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:i,regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"punctuation.separator.key-value",regex:"=>"},{stateName:"heredoc",onMatch:function(e,t,n){var r=e[2]=="-"?"indentedHeredoc":"heredoc",i=e.split(this.splitRegex);return n.push(r,i[3]),[{type:"constant",value:i[1]},{type:"string",value:i[2]},{type:"support.class",value:i[3]},{type:"string",value:i[4]}]},regex:"(<<-?)(['\"`]?)([\\w]+)(['\"`]?)",rules:{heredoc:[{onMatch:function(e,t,n){return e===n[1]?(n.shift(),n.shift(),this.next=n[0]||"start","support.class"):(this.next="","string")},regex:".*$",next:"start"}],indentedHeredoc:[{token:"string",regex:"^ +"},{onMatch:function(e,t,n){return e===n[1]?(n.shift(),n.shift(),this.next=n[0]||"start","support.class"):(this.next="","string")},regex:".*$",next:"start"}]}},{regex:"$",token:"empty",next:function(e,t){return t[0]==="heredoc"||t[0]==="indentedHeredoc"?t[0]:e}},{token:"string.character",regex:"\\B\\?."},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:"^=end(?:$|\\s.*$)",next:"start"},{token:"comment",regex:".+"}]},this.normalizeRules()};r.inherits(c,i),t.RubyHighlightRules=c}),ace.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("../range").Range,i=function(){};(function(){this.checkOutdent=function(e,t){return/^\s+$/.test(e)?/^\s*\}/.test(t):!1},this.autoOutdent=function(e,t){var n=e.getLine(t),i=n.match(/^(\s*\})/);if(!i)return 0;var s=i[1].length,o=e.findMatchingBracket({row:t,column:s});if(!o||o.row==t)return 0;var u=this.$getIndent(e.getLine(o.row));e.replace(new r(t,0,t,s-1),u)},this.$getIndent=function(e){return e.match(/^\s*/)[0]}}).call(i.prototype),t.MatchingBraceOutdent=i}),ace.define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("../../token_iterator").TokenIterator,o=e("../../lib/lang"),u=["text","paren.rparen","punctuation.operator"],a=["text","paren.rparen","punctuation.operator","comment"],f,l={},c=function(e){var t=-1;e.multiSelect&&(t=e.selection.index,l.rangeCount!=e.multiSelect.rangeCount&&(l={rangeCount:e.multiSelect.rangeCount}));if(l[t])return f=l[t];f=l[t]={autoInsertedBrackets:0,autoInsertedRow:-1,autoInsertedLineEnd:"",maybeInsertedBrackets:0,maybeInsertedRow:-1,maybeInsertedLineStart:"",maybeInsertedLineEnd:""}},h=function(e,t,n,r){var i=e.end.row-e.start.row;return{text:n+t+r,selection:[0,e.start.column+1,i,e.end.column+(i?0:1)]}},p=function(){this.add("braces","insertion",function(e,t,n,r,i){var s=n.getCursorPosition(),u=r.doc.getLine(s.row);if(i=="{"){c(n);var a=n.getSelectionRange(),l=r.doc.getTextRange(a);if(l!==""&&l!=="{"&&n.getWrapBehavioursEnabled())return h(a,l,"{","}");if(p.isSaneInsertion(n,r))return/[\]\}\)]/.test(u[s.column])||n.inMultiSelectMode?(p.recordAutoInsert(n,r,"}"),{text:"{}",selection:[1,1]}):(p.recordMaybeInsert(n,r,"{"),{text:"{",selection:[1,1]})}else if(i=="}"){c(n);var d=u.substring(s.column,s.column+1);if(d=="}"){var v=r.$findOpeningBracket("}",{column:s.column+1,row:s.row});if(v!==null&&p.isAutoInsertedClosing(s,u,i))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}else{if(i=="\n"||i=="\r\n"){c(n);var m="";p.isMaybeInsertedClosing(s,u)&&(m=o.stringRepeat("}",f.maybeInsertedBrackets),p.clearMaybeInsertedClosing());var d=u.substring(s.column,s.column+1);if(d==="}"){var g=r.findMatchingBracket({row:s.row,column:s.column+1},"}");if(!g)return null;var y=this.$getIndent(r.getLine(g.row))}else{if(!m){p.clearMaybeInsertedClosing();return}var y=this.$getIndent(u)}var b=y+r.getTabString();return{text:"\n"+b+"\n"+y+m,selection:[1,b.length,1,b.length]}}p.clearMaybeInsertedClosing()}}),this.add("braces","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="{"){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.end.column,i.end.column+1);if(u=="}")return i.end.column++,i;f.maybeInsertedBrackets--}}),this.add("parens","insertion",function(e,t,n,r,i){if(i=="("){c(n);var s=n.getSelectionRange(),o=r.doc.getTextRange(s);if(o!==""&&n.getWrapBehavioursEnabled())return h(s,o,"(",")");if(p.isSaneInsertion(n,r))return p.recordAutoInsert(n,r,")"),{text:"()",selection:[1,1]}}else if(i==")"){c(n);var u=n.getCursorPosition(),a=r.doc.getLine(u.row),f=a.substring(u.column,u.column+1);if(f==")"){var l=r.$findOpeningBracket(")",{column:u.column+1,row:u.row});if(l!==null&&p.isAutoInsertedClosing(u,a,i))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="("){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==")")return i.end.column++,i}}),this.add("brackets","insertion",function(e,t,n,r,i){if(i=="["){c(n);var s=n.getSelectionRange(),o=r.doc.getTextRange(s);if(o!==""&&n.getWrapBehavioursEnabled())return h(s,o,"[","]");if(p.isSaneInsertion(n,r))return p.recordAutoInsert(n,r,"]"),{text:"[]",selection:[1,1]}}else if(i=="]"){c(n);var u=n.getCursorPosition(),a=r.doc.getLine(u.row),f=a.substring(u.column,u.column+1);if(f=="]"){var l=r.$findOpeningBracket("]",{column:u.column+1,row:u.row});if(l!==null&&p.isAutoInsertedClosing(u,a,i))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}}),this.add("brackets","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="["){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u=="]")return i.end.column++,i}}),this.add("string_dquotes","insertion",function(e,t,n,r,i){if(i=='"'||i=="'"){c(n);var s=i,o=n.getSelectionRange(),u=r.doc.getTextRange(o);if(u!==""&&u!=="'"&&u!='"'&&n.getWrapBehavioursEnabled())return h(o,u,s,s);if(!u){var a=n.getCursorPosition(),f=r.doc.getLine(a.row),l=f.substring(a.column-1,a.column),p=f.substring(a.column,a.column+1),d=r.getTokenAt(a.row,a.column),v=r.getTokenAt(a.row,a.column+1);if(l=="\\"&&d&&/escape/.test(d.type))return null;var m=d&&/string/.test(d.type),g=!v||/string/.test(v.type),y;if(p==s)y=m!==g;else{if(m&&!g)return null;if(m&&g)return null;var b=r.$mode.tokenRe;b.lastIndex=0;var w=b.test(l);b.lastIndex=0;var E=b.test(l);if(w||E)return null;if(p&&!/[\s;,.})\]\\]/.test(p))return null;y=!0}return{text:y?s+s:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&(s=='"'||s=="'")){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==s)return i.end.column++,i}})};p.isSaneInsertion=function(e,t){var n=e.getCursorPosition(),r=new s(t,n.row,n.column);if(!this.$matchTokenType(r.getCurrentToken()||"text",u)){var i=new s(t,n.row,n.column+1);if(!this.$matchTokenType(i.getCurrentToken()||"text",u))return!1}return r.stepForward(),r.getCurrentTokenRow()!==n.row||this.$matchTokenType(r.getCurrentToken()||"text",a)},p.$matchTokenType=function(e,t){return t.indexOf(e.type||e)>-1},p.recordAutoInsert=function(e,t,n){var r=e.getCursorPosition(),i=t.doc.getLine(r.row);this.isAutoInsertedClosing(r,i,f.autoInsertedLineEnd[0])||(f.autoInsertedBrackets=0),f.autoInsertedRow=r.row,f.autoInsertedLineEnd=n+i.substr(r.column),f.autoInsertedBrackets++},p.recordMaybeInsert=function(e,t,n){var r=e.getCursorPosition(),i=t.doc.getLine(r.row);this.isMaybeInsertedClosing(r,i)||(f.maybeInsertedBrackets=0),f.maybeInsertedRow=r.row,f.maybeInsertedLineStart=i.substr(0,r.column)+n,f.maybeInsertedLineEnd=i.substr(r.column),f.maybeInsertedBrackets++},p.isAutoInsertedClosing=function(e,t,n){return f.autoInsertedBrackets>0&&e.row===f.autoInsertedRow&&n===f.autoInsertedLineEnd[0]&&t.substr(e.column)===f.autoInsertedLineEnd},p.isMaybeInsertedClosing=function(e,t){return f.maybeInsertedBrackets>0&&e.row===f.maybeInsertedRow&&t.substr(e.column)===f.maybeInsertedLineEnd&&t.substr(0,e.column)==f.maybeInsertedLineStart},p.popAutoInsertedClosing=function(){f.autoInsertedLineEnd=f.autoInsertedLineEnd.substr(1),f.autoInsertedBrackets--},p.clearMaybeInsertedClosing=function(){f&&(f.maybeInsertedBrackets=0,f.maybeInsertedRow=-1)},r.inherits(p,i),t.CstyleBehaviour=p}),ace.define("ace/mode/folding/coffee",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=e("../../range").Range,o=t.FoldMode=function(){};r.inherits(o,i),function(){this.getFoldWidgetRange=function(e,t,n){var r=this.indentationBlock(e,n);if(r)return r;var i=/\S/,o=e.getLine(n),u=o.search(i);if(u==-1||o[u]!="#")return;var a=o.length,f=e.getLength(),l=n,c=n;while(++n<f){o=e.getLine(n);var h=o.search(i);if(h==-1)continue;if(o[h]!="#")break;c=n}if(c>l){var p=e.getLine(c).length;return new s(l,a,c,p)}},this.getFoldWidget=function(e,t,n){var r=e.getLine(n),i=r.search(/\S/),s=e.getLine(n+1),o=e.getLine(n-1),u=o.search(/\S/),a=s.search(/\S/);if(i==-1)return e.foldWidgets[n-1]=u!=-1&&u<a?"start":"","";if(u==-1){if(i==a&&r[i]=="#"&&s[i]=="#")return e.foldWidgets[n-1]="",e.foldWidgets[n+1]="","start"}else if(u==i&&r[i]=="#"&&o[i]=="#"&&e.getLine(n-2).search(/\S/)==-1)return e.foldWidgets[n-1]="start",e.foldWidgets[n+1]="","";return u!=-1&&u<i?e.foldWidgets[n-1]="start":e.foldWidgets[n-1]="",i<a?"start":""}}.call(o.prototype)}),ace.define("ace/mode/ruby",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/ruby_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/coffee"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./ruby_highlight_rules").RubyHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("../range").Range,a=e("./behaviour/cstyle").CstyleBehaviour,f=e("./folding/coffee").FoldMode,l=function(){this.HighlightRules=s,this.$outdent=new o,this.$behaviour=new a,this.foldingRules=new f};r.inherits(l,i),function(){this.lineCommentStart="#",this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t),i=this.getTokenizer().getLineTokens(t,e),s=i.tokens;if(s.length&&s[s.length-1].type=="comment")return r;if(e=="start"){var o=t.match(/^.*[\{\(\[]\s*$/),u=t.match(/^\s*(class|def|module)\s.*$/),a=t.match(/.*do(\s*|\s+\|.*\|\s*)$/),f=t.match(/^\s*(if|else)\s*/);if(o||u||a||f)r+=n}return r},this.checkOutdent=function(e,t,n){return/^\s+(end|else)$/.test(t+n)||this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){var r=t.getLine(n);if(/}/.test(r))return this.$outdent.autoOutdent(t,n);var i=this.$getIndent(r),s=t.getLine(n-1),o=this.$getIndent(s),a=t.getTabString();o.length<=i.length&&i.slice(-a.length)==a&&t.remove(new u(n,i.length-a.length,n,i.length))},this.$id="ace/mode/ruby"}.call(l.prototype),t.Mode=l})
\ No newline at end of file
+ace.define("ace/mode/ruby_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=t.constantOtherSymbol={token:"constant.other.symbol.ruby",regex:"[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"},o=t.qString={token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},u=t.qqString={token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},a=t.tString={token:"string",regex:"[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"},f=t.constantNumericHex={token:"constant.numeric",regex:"0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"},l=t.constantNumericFloat={token:"constant.numeric",regex:"[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"},c=function(){var e="abort|Array|assert|assert_equal|assert_not_equal|assert_same|assert_not_same|assert_nil|assert_not_nil|assert_match|assert_no_match|assert_in_delta|assert_throws|assert_raise|assert_nothing_raised|assert_instance_of|assert_kind_of|assert_respond_to|assert_operator|assert_send|assert_difference|assert_no_difference|assert_recognizes|assert_generates|assert_response|assert_redirected_to|assert_template|assert_select|assert_select_email|assert_select_rjs|assert_select_encoded|css_select|at_exit|attr|attr_writer|attr_reader|attr_accessor|attr_accessible|autoload|binding|block_given?|callcc|caller|catch|chomp|chomp!|chop|chop!|defined?|delete_via_redirect|eval|exec|exit|exit!|fail|Float|flunk|follow_redirect!|fork|form_for|form_tag|format|gets|global_variables|gsub|gsub!|get_via_redirect|host!|https?|https!|include|Integer|lambda|link_to|link_to_unless_current|link_to_function|link_to_remote|load|local_variables|loop|open|open_session|p|print|printf|proc|putc|puts|post_via_redirect|put_via_redirect|raise|rand|raw|readline|readlines|redirect?|request_via_redirect|require|scan|select|set_trace_func|sleep|split|sprintf|srand|String|stylesheet_link_tag|syscall|system|sub|sub!|test|throw|trace_var|trap|untrace_var|atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan|render|javascript_include_tag|csrf_meta_tag|label_tag|text_field_tag|submit_tag|check_box_tag|content_tag|radio_button_tag|text_area_tag|password_field_tag|hidden_field_tag|fields_for|select_tag|options_for_select|options_from_collection_for_select|collection_select|time_zone_select|select_date|select_time|select_datetime|date_select|time_select|datetime_select|select_year|select_month|select_day|select_hour|select_minute|select_second|file_field_tag|file_field|respond_to|skip_before_action|around_filter|after_filter|verify|protect_from_forgery|rescue_from|helper_method|redirect_to|before_action|send_data|send_file|validates_presence_of|validates_uniqueness_of|validates_length_of|validates_format_of|validates_acceptance_of|validates_associated|validates_exclusion_of|validates_inclusion_of|validates_numericality_of|validates_with|validates_each|authenticate_or_request_with_http_basic|authenticate_or_request_with_http_digest|filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|translate|localize|extract_locale_from_tld|caches_page|expire_page|caches_action|expire_action|cache|expire_fragment|expire_cache_for|observe|cache_sweeper|has_many|has_one|belongs_to|has_and_belongs_to_many",t="alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield",n="true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING",r="$DEBUG|$defout|$FILENAME|$LOAD_PATH|$SAFE|$stdin|$stdout|$stderr|$VERBOSE|$!|root_url|flash|session|cookies|params|request|response|logger|self",i=this.$keywords=this.createKeywordMapper({keyword:t,"constant.language":n,"variable.language":r,"support.function":e,"invalid.deprecated":"debugger"},"identifier");this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"comment",regex:"^=begin(?:$|\\s.*$)",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},[{regex:"[{}]",onMatch:function(e,t,n){this.next=e=="{"?this.nextState:"";if(e=="{"&&n.length)return n.unshift("start",t),"paren.lparen";if(e=="}"&&n.length){n.shift(),this.next=n.shift();if(this.next.indexOf("string")!=-1)return"paren.end"}return e=="{"?"paren.lparen":"paren.rparen"},nextState:"start"},{token:"string.start",regex:/"/,push:[{token:"constant.language.escape",regex:/\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/},{token:"paren.start",regex:/\#{/,push:"start"},{token:"string.end",regex:/"/,next:"pop"},{defaultToken:"string"}]},{token:"string.start",regex:/`/,push:[{token:"constant.language.escape",regex:/\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/},{token:"paren.start",regex:/\#{/,push:"start"},{token:"string.end",regex:/`/,next:"pop"},{defaultToken:"string"}]},{token:"string.start",regex:/'/,push:[{token:"constant.language.escape",regex:/\\['\\]/},{token:"string.end",regex:/'/,next:"pop"},{defaultToken:"string"}]}],{token:"text",regex:"::"},{token:"variable.instance",regex:"@{1,2}[a-zA-Z_\\d]+"},{token:"support.class",regex:"[A-Z][a-zA-Z_\\d]+"},s,f,l,{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:i,regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"punctuation.separator.key-value",regex:"=>"},{stateName:"heredoc",onMatch:function(e,t,n){var r=e[2]=="-"?"indentedHeredoc":"heredoc",i=e.split(this.splitRegex);return n.push(r,i[3]),[{type:"constant",value:i[1]},{type:"string",value:i[2]},{type:"support.class",value:i[3]},{type:"string",value:i[4]}]},regex:"(<<-?)(['\"`]?)([\\w]+)(['\"`]?)",rules:{heredoc:[{onMatch:function(e,t,n){return e===n[1]?(n.shift(),n.shift(),this.next=n[0]||"start","support.class"):(this.next="","string")},regex:".*$",next:"start"}],indentedHeredoc:[{token:"string",regex:"^ +"},{onMatch:function(e,t,n){return e===n[1]?(n.shift(),n.shift(),this.next=n[0]||"start","support.class"):(this.next="","string")},regex:".*$",next:"start"}]}},{regex:"$",token:"empty",next:function(e,t){return t[0]==="heredoc"||t[0]==="indentedHeredoc"?t[0]:e}},{token:"string.character",regex:"\\B\\?."},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:"^=end(?:$|\\s.*$)",next:"start"},{token:"comment",regex:".+"}]},this.normalizeRules()};r.inherits(c,i),t.RubyHighlightRules=c}),ace.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("../range").Range,i=function(){};(function(){this.checkOutdent=function(e,t){return/^\s+$/.test(e)?/^\s*\}/.test(t):!1},this.autoOutdent=function(e,t){var n=e.getLine(t),i=n.match(/^(\s*\})/);if(!i)return 0;var s=i[1].length,o=e.findMatchingBracket({row:t,column:s});if(!o||o.row==t)return 0;var u=this.$getIndent(e.getLine(o.row));e.replace(new r(t,0,t,s-1),u)},this.$getIndent=function(e){return e.match(/^\s*/)[0]}}).call(i.prototype),t.MatchingBraceOutdent=i}),ace.define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("../../token_iterator").TokenIterator,o=e("../../lib/lang"),u=["text","paren.rparen","punctuation.operator"],a=["text","paren.rparen","punctuation.operator","comment"],f,l={},c=function(e){var t=-1;e.multiSelect&&(t=e.selection.index,l.rangeCount!=e.multiSelect.rangeCount&&(l={rangeCount:e.multiSelect.rangeCount}));if(l[t])return f=l[t];f=l[t]={autoInsertedBrackets:0,autoInsertedRow:-1,autoInsertedLineEnd:"",maybeInsertedBrackets:0,maybeInsertedRow:-1,maybeInsertedLineStart:"",maybeInsertedLineEnd:""}},h=function(e,t,n,r){var i=e.end.row-e.start.row;return{text:n+t+r,selection:[0,e.start.column+1,i,e.end.column+(i?0:1)]}},p=function(){this.add("braces","insertion",function(e,t,n,r,i){var s=n.getCursorPosition(),u=r.doc.getLine(s.row);if(i=="{"){c(n);var a=n.getSelectionRange(),l=r.doc.getTextRange(a);if(l!==""&&l!=="{"&&n.getWrapBehavioursEnabled())return h(a,l,"{","}");if(p.isSaneInsertion(n,r))return/[\]\}\)]/.test(u[s.column])||n.inMultiSelectMode?(p.recordAutoInsert(n,r,"}"),{text:"{}",selection:[1,1]}):(p.recordMaybeInsert(n,r,"{"),{text:"{",selection:[1,1]})}else if(i=="}"){c(n);var d=u.substring(s.column,s.column+1);if(d=="}"){var v=r.$findOpeningBracket("}",{column:s.column+1,row:s.row});if(v!==null&&p.isAutoInsertedClosing(s,u,i))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}else{if(i=="\n"||i=="\r\n"){c(n);var m="";p.isMaybeInsertedClosing(s,u)&&(m=o.stringRepeat("}",f.maybeInsertedBrackets),p.clearMaybeInsertedClosing());var d=u.substring(s.column,s.column+1);if(d==="}"){var g=r.findMatchingBracket({row:s.row,column:s.column+1},"}");if(!g)return null;var y=this.$getIndent(r.getLine(g.row))}else{if(!m){p.clearMaybeInsertedClosing();return}var y=this.$getIndent(u)}var b=y+r.getTabString();return{text:"\n"+b+"\n"+y+m,selection:[1,b.length,1,b.length]}}p.clearMaybeInsertedClosing()}}),this.add("braces","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="{"){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.end.column,i.end.column+1);if(u=="}")return i.end.column++,i;f.maybeInsertedBrackets--}}),this.add("parens","insertion",function(e,t,n,r,i){if(i=="("){c(n);var s=n.getSelectionRange(),o=r.doc.getTextRange(s);if(o!==""&&n.getWrapBehavioursEnabled())return h(s,o,"(",")");if(p.isSaneInsertion(n,r))return p.recordAutoInsert(n,r,")"),{text:"()",selection:[1,1]}}else if(i==")"){c(n);var u=n.getCursorPosition(),a=r.doc.getLine(u.row),f=a.substring(u.column,u.column+1);if(f==")"){var l=r.$findOpeningBracket(")",{column:u.column+1,row:u.row});if(l!==null&&p.isAutoInsertedClosing(u,a,i))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="("){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==")")return i.end.column++,i}}),this.add("brackets","insertion",function(e,t,n,r,i){if(i=="["){c(n);var s=n.getSelectionRange(),o=r.doc.getTextRange(s);if(o!==""&&n.getWrapBehavioursEnabled())return h(s,o,"[","]");if(p.isSaneInsertion(n,r))return p.recordAutoInsert(n,r,"]"),{text:"[]",selection:[1,1]}}else if(i=="]"){c(n);var u=n.getCursorPosition(),a=r.doc.getLine(u.row),f=a.substring(u.column,u.column+1);if(f=="]"){var l=r.$findOpeningBracket("]",{column:u.column+1,row:u.row});if(l!==null&&p.isAutoInsertedClosing(u,a,i))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}}),this.add("brackets","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="["){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u=="]")return i.end.column++,i}}),this.add("string_dquotes","insertion",function(e,t,n,r,i){if(i=='"'||i=="'"){c(n);var s=i,o=n.getSelectionRange(),u=r.doc.getTextRange(o);if(u!==""&&u!=="'"&&u!='"'&&n.getWrapBehavioursEnabled())return h(o,u,s,s);if(!u){var a=n.getCursorPosition(),f=r.doc.getLine(a.row),l=f.substring(a.column-1,a.column),p=f.substring(a.column,a.column+1),d=r.getTokenAt(a.row,a.column),v=r.getTokenAt(a.row,a.column+1);if(l=="\\"&&d&&/escape/.test(d.type))return null;var m=d&&/string/.test(d.type),g=!v||/string/.test(v.type),y;if(p==s)y=m!==g;else{if(m&&!g)return null;if(m&&g)return null;var b=r.$mode.tokenRe;b.lastIndex=0;var w=b.test(l);b.lastIndex=0;var E=b.test(l);if(w||E)return null;if(p&&!/[\s;,.})\]\\]/.test(p))return null;y=!0}return{text:y?s+s:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&(s=='"'||s=="'")){c(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==s)return i.end.column++,i}})};p.isSaneInsertion=function(e,t){var n=e.getCursorPosition(),r=new s(t,n.row,n.column);if(!this.$matchTokenType(r.getCurrentToken()||"text",u)){var i=new s(t,n.row,n.column+1);if(!this.$matchTokenType(i.getCurrentToken()||"text",u))return!1}return r.stepForward(),r.getCurrentTokenRow()!==n.row||this.$matchTokenType(r.getCurrentToken()||"text",a)},p.$matchTokenType=function(e,t){return t.indexOf(e.type||e)>-1},p.recordAutoInsert=function(e,t,n){var r=e.getCursorPosition(),i=t.doc.getLine(r.row);this.isAutoInsertedClosing(r,i,f.autoInsertedLineEnd[0])||(f.autoInsertedBrackets=0),f.autoInsertedRow=r.row,f.autoInsertedLineEnd=n+i.substr(r.column),f.autoInsertedBrackets++},p.recordMaybeInsert=function(e,t,n){var r=e.getCursorPosition(),i=t.doc.getLine(r.row);this.isMaybeInsertedClosing(r,i)||(f.maybeInsertedBrackets=0),f.maybeInsertedRow=r.row,f.maybeInsertedLineStart=i.substr(0,r.column)+n,f.maybeInsertedLineEnd=i.substr(r.column),f.maybeInsertedBrackets++},p.isAutoInsertedClosing=function(e,t,n){return f.autoInsertedBrackets>0&&e.row===f.autoInsertedRow&&n===f.autoInsertedLineEnd[0]&&t.substr(e.column)===f.autoInsertedLineEnd},p.isMaybeInsertedClosing=function(e,t){return f.maybeInsertedBrackets>0&&e.row===f.maybeInsertedRow&&t.substr(e.column)===f.maybeInsertedLineEnd&&t.substr(0,e.column)==f.maybeInsertedLineStart},p.popAutoInsertedClosing=function(){f.autoInsertedLineEnd=f.autoInsertedLineEnd.substr(1),f.autoInsertedBrackets--},p.clearMaybeInsertedClosing=function(){f&&(f.maybeInsertedBrackets=0,f.maybeInsertedRow=-1)},r.inherits(p,i),t.CstyleBehaviour=p}),ace.define("ace/mode/folding/coffee",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=e("../../range").Range,o=t.FoldMode=function(){};r.inherits(o,i),function(){this.getFoldWidgetRange=function(e,t,n){var r=this.indentationBlock(e,n);if(r)return r;var i=/\S/,o=e.getLine(n),u=o.search(i);if(u==-1||o[u]!="#")return;var a=o.length,f=e.getLength(),l=n,c=n;while(++n<f){o=e.getLine(n);var h=o.search(i);if(h==-1)continue;if(o[h]!="#")break;c=n}if(c>l){var p=e.getLine(c).length;return new s(l,a,c,p)}},this.getFoldWidget=function(e,t,n){var r=e.getLine(n),i=r.search(/\S/),s=e.getLine(n+1),o=e.getLine(n-1),u=o.search(/\S/),a=s.search(/\S/);if(i==-1)return e.foldWidgets[n-1]=u!=-1&&u<a?"start":"","";if(u==-1){if(i==a&&r[i]=="#"&&s[i]=="#")return e.foldWidgets[n-1]="",e.foldWidgets[n+1]="","start"}else if(u==i&&r[i]=="#"&&o[i]=="#"&&e.getLine(n-2).search(/\S/)==-1)return e.foldWidgets[n-1]="start",e.foldWidgets[n+1]="","";return u!=-1&&u<i?e.foldWidgets[n-1]="start":e.foldWidgets[n-1]="",i<a?"start":""}}.call(o.prototype)}),ace.define("ace/mode/ruby",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/ruby_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/coffee"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./ruby_highlight_rules").RubyHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("../range").Range,a=e("./behaviour/cstyle").CstyleBehaviour,f=e("./folding/coffee").FoldMode,l=function(){this.HighlightRules=s,this.$outdent=new o,this.$behaviour=new a,this.foldingRules=new f};r.inherits(l,i),function(){this.lineCommentStart="#",this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t),i=this.getTokenizer().getLineTokens(t,e),s=i.tokens;if(s.length&&s[s.length-1].type=="comment")return r;if(e=="start"){var o=t.match(/^.*[\{\(\[]\s*$/),u=t.match(/^\s*(class|def|module)\s.*$/),a=t.match(/.*do(\s*|\s+\|.*\|\s*)$/),f=t.match(/^\s*(if|else)\s*/);if(o||u||a||f)r+=n}return r},this.checkOutdent=function(e,t,n){return/^\s+(end|else)$/.test(t+n)||this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){var r=t.getLine(n);if(/}/.test(r))return this.$outdent.autoOutdent(t,n);var i=this.$getIndent(r),s=t.getLine(n-1),o=this.$getIndent(s),a=t.getTabString();o.length<=i.length&&i.slice(-a.length)==a&&t.remove(new u(n,i.length-a.length,n,i.length))},this.$id="ace/mode/ruby"}.call(l.prototype),t.Mode=l})
\ No newline at end of file
diff --git a/public/javascripts/ace/snippets/ruby.js b/public/javascripts/ace/snippets/ruby.js
index 0c3068010f..2fb2d302f0 100644
--- a/public/javascripts/ace/snippets/ruby.js
+++ b/public/javascripts/ace/snippets/ruby.js
@@ -1 +1 @@
-ace.define("ace/snippets/ruby",["require","exports","module"],function(e,t,n){"use strict";t.snippetText='########################################\n# Ruby snippets - for Rails, see below #\n########################################\n\n# encoding for Ruby 1.9\nsnippet enc\n	# encoding: utf-8\n\n# #!/usr/bin/env ruby\nsnippet #!\n	#!/usr/bin/env ruby\n	# encoding: utf-8\n\n# New Block\nsnippet =b\n	=begin rdoc\n		${1}\n	=end\nsnippet y\n	:yields: ${1:arguments}\nsnippet rb\n	#!/usr/bin/env ruby -wKU\nsnippet beg\n	begin\n		${3}\n	rescue ${1:Exception} => ${2:e}\n	end\n\nsnippet req require\n	require "${1}"${2}\nsnippet #\n	# =>\nsnippet end\n	__END__\nsnippet case\n	case ${1:object}\n	when ${2:condition}\n		${3}\n	end\nsnippet when\n	when ${1:condition}\n		${2}\nsnippet def\n	def ${1:method_name}\n		${2}\n	end\nsnippet deft\n	def test_${1:case_name}\n		${2}\n	end\nsnippet if\n	if ${1:condition}\n		${2}\n	end\nsnippet ife\n	if ${1:condition}\n		${2}\n	else\n		${3}\n	end\nsnippet elsif\n	elsif ${1:condition}\n		${2}\nsnippet unless\n	unless ${1:condition}\n		${2}\n	end\nsnippet while\n	while ${1:condition}\n		${2}\n	end\nsnippet for\n	for ${1:e} in ${2:c}\n		${3}\n	end\nsnippet until\n	until ${1:condition}\n		${2}\n	end\nsnippet cla class .. end\n	class ${1:`substitute(Filename(), \'\\(_\\|^\\)\\(.\\)\', \'\\u\\2\', \'g\')`}\n		${2}\n	end\nsnippet cla class .. initialize .. end\n	class ${1:`substitute(Filename(), \'\\(_\\|^\\)\\(.\\)\', \'\\u\\2\', \'g\')`}\n		def initialize(${2:args})\n			${3}\n		end\n	end\nsnippet cla class .. < ParentClass .. initialize .. end\n	class ${1:`substitute(Filename(), \'\\(_\\|^\\)\\(.\\)\', \'\\u\\2\', \'g\')`} < ${2:ParentClass}\n		def initialize(${3:args})\n			${4}\n		end\n	end\nsnippet cla ClassName = Struct .. do .. end\n	${1:`substitute(Filename(), \'\\(_\\|^\\)\\(.\\)\', \'\\u\\2\', \'g\')`} = Struct.new(:${2:attr_names}) do\n		def ${3:method_name}\n			${4}\n		end\n	end\nsnippet cla class BlankSlate .. initialize .. end\n	class ${1:BlankSlate}\n		instance_methods.each { |meth| undef_method(meth) unless meth =~ /\\A__/ }\n	end\nsnippet cla class << self .. end\n	class << ${1:self}\n		${2}\n	end\n# class .. < DelegateClass .. initialize .. end\nsnippet cla-\n	class ${1:`substitute(Filename(), \'\\(_\\|^\\)\\(.\\)\', \'\\u\\2\', \'g\')`} < DelegateClass(${2:ParentClass})\n		def initialize(${3:args})\n			super(${4:del_obj})\n\n			${5}\n		end\n	end\nsnippet mod module .. end\n	module ${1:`substitute(Filename(), \'\\(_\\|^\\)\\(.\\)\', \'\\u\\2\', \'g\')`}\n		${2}\n	end\nsnippet mod module .. module_function .. end\n	module ${1:`substitute(Filename(), \'\\(_\\|^\\)\\(.\\)\', \'\\u\\2\', \'g\')`}\n		module_function\n\n		${2}\n	end\nsnippet mod module .. ClassMethods .. end\n	module ${1:`substitute(Filename(), \'\\(_\\|^\\)\\(.\\)\', \'\\u\\2\', \'g\')`}\n		module ClassMethods\n			${2}\n		end\n\n		module InstanceMethods\n\n		end\n\n		def self.included(receiver)\n			receiver.extend         ClassMethods\n			receiver.send :include, InstanceMethods\n		end\n	end\n# attr_reader\nsnippet r\n	attr_reader :${1:attr_names}\n# attr_writer\nsnippet w\n	attr_writer :${1:attr_names}\n# attr_accessor\nsnippet rw\n	attr_accessor :${1:attr_names}\nsnippet atp\n	attr_protected :${1:attr_names}\nsnippet ata\n	attr_accessible :${1:attr_names}\n# include Enumerable\nsnippet Enum\n	include Enumerable\n\n	def each(&block)\n		${1}\n	end\n# include Comparable\nsnippet Comp\n	include Comparable\n\n	def <=>(other)\n		${1}\n	end\n# extend Forwardable\nsnippet Forw-\n	extend Forwardable\n# def self\nsnippet defs\n	def self.${1:class_method_name}\n		${2}\n	end\n# def method_missing\nsnippet defmm\n	def method_missing(meth, *args, &blk)\n		${1}\n	end\nsnippet defd\n	def_delegator :${1:@del_obj}, :${2:del_meth}, :${3:new_name}\nsnippet defds\n	def_delegators :${1:@del_obj}, :${2:del_methods}\nsnippet am\n	alias_method :${1:new_name}, :${2:old_name}\nsnippet app\n	if __FILE__ == $PROGRAM_NAME\n		${1}\n	end\n# usage_if()\nsnippet usai\n	if ARGV.${1}\n		abort "Usage: #{$PROGRAM_NAME} ${2:ARGS_GO_HERE}"${3}\n	end\n# usage_unless()\nsnippet usau\n	unless ARGV.${1}\n		abort "Usage: #{$PROGRAM_NAME} ${2:ARGS_GO_HERE}"${3}\n	end\nsnippet array\n	Array.new(${1:10}) { |${2:i}| ${3} }\nsnippet hash\n	Hash.new { |${1:hash}, ${2:key}| $1[$2] = ${3} }\nsnippet file File.foreach() { |line| .. }\n	File.foreach(${1:"path/to/file"}) { |${2:line}| ${3} }\nsnippet file File.read()\n	File.read(${1:"path/to/file"})${2}\nsnippet Dir Dir.global() { |file| .. }\n	Dir.glob(${1:"dir/glob/*"}) { |${2:file}| ${3} }\nsnippet Dir Dir[".."]\n	Dir[${1:"glob/**/*.rb"}]${2}\nsnippet dir\n	Filename.dirname(__FILE__)\nsnippet deli\n	delete_if { |${1:e}| ${2} }\nsnippet fil\n	fill(${1:range}) { |${2:i}| ${3} }\n# flatten_once()\nsnippet flao\n	inject(Array.new) { |${1:arr}, ${2:a}| $1.push(*$2)}${3}\nsnippet zip\n	zip(${1:enums}) { |${2:row}| ${3} }\n# downto(0) { |n| .. }\nsnippet dow\n	downto(${1:0}) { |${2:n}| ${3} }\nsnippet ste\n	step(${1:2}) { |${2:n}| ${3} }\nsnippet tim\n	times { |${1:n}| ${2} }\nsnippet upt\n	upto(${1:1.0/0.0}) { |${2:n}| ${3} }\nsnippet loo\n	loop { ${1} }\nsnippet ea\n	each { |${1:e}| ${2} }\nsnippet ead\n	each do |${1:e}|\n		${2}\n	end\nsnippet eab\n	each_byte { |${1:byte}| ${2} }\nsnippet eac- each_char { |chr| .. }\n	each_char { |${1:chr}| ${2} }\nsnippet eac- each_cons(..) { |group| .. }\n	each_cons(${1:2}) { |${2:group}| ${3} }\nsnippet eai\n	each_index { |${1:i}| ${2} }\nsnippet eaid\n	each_index do |${1:i}|\n		${2}\n	end\nsnippet eak\n	each_key { |${1:key}| ${2} }\nsnippet eakd\n	each_key do |${1:key}|\n		${2}\n	end\nsnippet eal\n	each_line { |${1:line}| ${2} }\nsnippet eald\n	each_line do |${1:line}|\n		${2}\n	end\nsnippet eap\n	each_pair { |${1:name}, ${2:val}| ${3} }\nsnippet eapd\n	each_pair do |${1:name}, ${2:val}|\n		${3}\n	end\nsnippet eas-\n	each_slice(${1:2}) { |${2:group}| ${3} }\nsnippet easd-\n	each_slice(${1:2}) do |${2:group}|\n		${3}\n	end\nsnippet eav\n	each_value { |${1:val}| ${2} }\nsnippet eavd\n	each_value do |${1:val}|\n		${2}\n	end\nsnippet eawi\n	each_with_index { |${1:e}, ${2:i}| ${3} }\nsnippet eawid\n	each_with_index do |${1:e},${2:i}|\n		${3}\n	end\nsnippet reve\n	reverse_each { |${1:e}| ${2} }\nsnippet reved\n	reverse_each do |${1:e}|\n		${2}\n	end\nsnippet inj\n	inject(${1:init}) { |${2:mem}, ${3:var}| ${4} }\nsnippet injd\n	inject(${1:init}) do |${2:mem}, ${3:var}|\n		${4}\n	end\nsnippet map\n	map { |${1:e}| ${2} }\nsnippet mapd\n	map do |${1:e}|\n		${2}\n	end\nsnippet mapwi-\n	enum_with_index.map { |${1:e}, ${2:i}| ${3} }\nsnippet sor\n	sort { |a, b| ${1} }\nsnippet sorb\n	sort_by { |${1:e}| ${2} }\nsnippet ran\n	sort_by { rand }\nsnippet all\n	all? { |${1:e}| ${2} }\nsnippet any\n	any? { |${1:e}| ${2} }\nsnippet cl\n	classify { |${1:e}| ${2} }\nsnippet col\n	collect { |${1:e}| ${2} }\nsnippet cold\n	collect do |${1:e}|\n		${2}\n	end\nsnippet det\n	detect { |${1:e}| ${2} }\nsnippet detd\n	detect do |${1:e}|\n		${2}\n	end\nsnippet fet\n	fetch(${1:name}) { |${2:key}| ${3} }\nsnippet fin\n	find { |${1:e}| ${2} }\nsnippet find\n	find do |${1:e}|\n		${2}\n	end\nsnippet fina\n	find_all { |${1:e}| ${2} }\nsnippet finad\n	find_all do |${1:e}|\n		${2}\n	end\nsnippet gre\n	grep(${1:/pattern/}) { |${2:match}| ${3} }\nsnippet sub\n	${1:g}sub(${2:/pattern/}) { |${3:match}| ${4} }\nsnippet sca\n	scan(${1:/pattern/}) { |${2:match}| ${3} }\nsnippet scad\n	scan(${1:/pattern/}) do |${2:match}|\n		${3}\n	end\nsnippet max\n	max { |a, b| ${1} }\nsnippet min\n	min { |a, b| ${1} }\nsnippet par\n	partition { |${1:e}| ${2} }\nsnippet pard\n	partition do |${1:e}|\n		${2}\n	end\nsnippet rej\n	reject { |${1:e}| ${2} }\nsnippet rejd\n	reject do |${1:e}|\n		${2}\n	end\nsnippet sel\n	select { |${1:e}| ${2} }\nsnippet seld\n	select do |${1:e}|\n		${2}\n	end\nsnippet lam\n	lambda { |${1:args}| ${2} }\nsnippet doo\n	do\n		${1}\n	end\nsnippet dov\n	do |${1:variable}|\n		${2}\n	end\nsnippet :\n	:${1:key} => ${2:"value"}${3}\nsnippet ope\n	open(${1:"path/or/url/or/pipe"}, "${2:w}") { |${3:io}| ${4} }\n# path_from_here()\nsnippet fpath\n	File.join(File.dirname(__FILE__), *%2[${1:rel path here}])${2}\n# unix_filter {}\nsnippet unif\n	ARGF.each_line${1} do |${2:line}|\n		${3}\n	end\n# option_parse {}\nsnippet optp\n	require "optparse"\n\n	options = {${1:default => "args"}}\n\n	ARGV.options do |opts|\n		opts.banner = "Usage: #{File.basename($PROGRAM_NAME)}\nsnippet opt\n	opts.on( "-${1:o}", "--${2:long-option-name}", ${3:String},\n	         "${4:Option description.}") do |${5:opt}|\n		${6}\n	end\nsnippet tc\n	require "test/unit"\n\n	require "${1:library_file_name}"\n\n	class Test${2:$1} < Test::Unit::TestCase\n		def test_${3:case_name}\n			${4}\n		end\n	end\nsnippet ts\n	require "test/unit"\n\n	require "tc_${1:test_case_file}"\n	require "tc_${2:test_case_file}"${3}\nsnippet as\n	assert ${1:test}, "${2:Failure message.}"${3}\nsnippet ase\n	assert_equal ${1:expected}, ${2:actual}${3}\nsnippet asne\n	assert_not_equal ${1:unexpected}, ${2:actual}${3}\nsnippet asid\n	assert_in_delta ${1:expected_float}, ${2:actual_float}, ${3:2 ** -20}${4}\nsnippet asio\n	assert_instance_of ${1:ExpectedClass}, ${2:actual_instance}${3}\nsnippet asko\n	assert_kind_of ${1:ExpectedKind}, ${2:actual_instance}${3}\nsnippet asn\n	assert_nil ${1:instance}${2}\nsnippet asnn\n	assert_not_nil ${1:instance}${2}\nsnippet asm\n	assert_match /${1:expected_pattern}/, ${2:actual_string}${3}\nsnippet asnm\n	assert_no_match /${1:unexpected_pattern}/, ${2:actual_string}${3}\nsnippet aso\n	assert_operator ${1:left}, :${2:operator}, ${3:right}${4}\nsnippet asr\n	assert_raise ${1:Exception} { ${2} }\nsnippet asrd\n	assert_raise ${1:Exception} do\n		${2}\n	end\nsnippet asnr\n	assert_nothing_raised ${1:Exception} { ${2} }\nsnippet asnrd\n	assert_nothing_raised ${1:Exception} do\n		${2}\n	end\nsnippet asrt\n	assert_respond_to ${1:object}, :${2:method}${3}\nsnippet ass assert_same(..)\n	assert_same ${1:expected}, ${2:actual}${3}\nsnippet ass assert_send(..)\n	assert_send [${1:object}, :${2:message}, ${3:args}]${4}\nsnippet asns\n	assert_not_same ${1:unexpected}, ${2:actual}${3}\nsnippet ast\n	assert_throws :${1:expected} { ${2} }\nsnippet astd\n	assert_throws :${1:expected} do\n		${2}\n	end\nsnippet asnt\n	assert_nothing_thrown { ${1} }\nsnippet asntd\n	assert_nothing_thrown do\n		${1}\n	end\nsnippet fl\n	flunk "${1:Failure message.}"${2}\n# Benchmark.bmbm do .. end\nsnippet bm-\n	TESTS = ${1:10_000}\n	Benchmark.bmbm do |results|\n		${2}\n	end\nsnippet rep\n	results.report("${1:name}:") { TESTS.times { ${2} }}\n# Marshal.dump(.., file)\nsnippet Md\n	File.open(${1:"path/to/file.dump"}, "wb") { |${2:file}| Marshal.dump(${3:obj}, $2) }${4}\n# Mashal.load(obj)\nsnippet Ml\n	File.open(${1:"path/to/file.dump"}, "rb") { |${2:file}| Marshal.load($2) }${3}\n# deep_copy(..)\nsnippet deec\n	Marshal.load(Marshal.dump(${1:obj_to_copy}))${2}\nsnippet Pn-\n	PStore.new(${1:"file_name.pstore"})${2}\nsnippet tra\n	transaction(${1:true}) { ${2} }\n# xmlread(..)\nsnippet xml-\n	REXML::Document.new(File.read(${1:"path/to/file"}))${2}\n# xpath(..) { .. }\nsnippet xpa\n	elements.each(${1:"//Xpath"}) do |${2:node}|\n		${3}\n	end\n# class_from_name()\nsnippet clafn\n	split("::").inject(Object) { |par, const| par.const_get(const) }\n# singleton_class()\nsnippet sinc\n	class << self; self end\nsnippet nam\n	namespace :${1:`Filename()`} do\n		${2}\n	end\nsnippet tas\n	desc "${1:Task description}"\n	task :${2:task_name => [:dependent, :tasks]} do\n		${3}\n	end\n# block\nsnippet b\n	{ |${1:var}| ${2} }\nsnippet begin\n	begin\n		raise \'A test exception.\'\n	rescue Exception => e\n		puts e.message\n		puts e.backtrace.inspect\n	else\n		# other exception\n	ensure\n		# always executed\n	end\n\n#debugging\nsnippet debug\n	require \'ruby-debug\'; debugger; true;\nsnippet pry\n	require \'pry\'; binding.pry\n\n#############################################\n# Rails snippets - for pure Ruby, see above #\n#############################################\nsnippet art\n	assert_redirected_to ${1::action => "${2:index}"}\nsnippet artnp\n	assert_redirected_to ${1:parent}_${2:child}_path(${3:@$1}, ${4:@$2})\nsnippet artnpp\n	assert_redirected_to ${1:parent}_${2:child}_path(${3:@$1})\nsnippet artp\n	assert_redirected_to ${1:model}_path(${2:@$1})\nsnippet artpp\n	assert_redirected_to ${1:model}s_path\nsnippet asd\n	assert_difference "${1:Model}.${2:count}", $1 do\n		${3}\n	end\nsnippet asnd\n	assert_no_difference "${1:Model}.${2:count}" do\n		${3}\n	end\nsnippet asre\n	assert_response :${1:success}, @response.body${2}\nsnippet asrj\n	assert_rjs :${1:replace}, "${2:dom id}"\nsnippet ass assert_select(..)\n	assert_select \'${1:path}\', :${2:text} => \'${3:inner_html\' ${4:do}\nsnippet bf\n	before_filter :${1:method}\nsnippet bt\n	belongs_to :${1:association}\nsnippet crw\n	cattr_accessor :${1:attr_names}\nsnippet defcreate\n	def create\n		@${1:model_class_name} = ${2:ModelClassName}.new(params[:$1])\n\n		respond_to do |wants|\n			if @$1.save\n				flash[:notice] = \'$2 was successfully created.\'\n				wants.html { redirect_to(@$1) }\n				wants.xml  { render :xml => @$1, :status => :created, :location => @$1 }\n			else\n				wants.html { render :action => "new" }\n				wants.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }\n			end\n		end\n	end${3}\nsnippet defdestroy\n	def destroy\n		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])\n		@$1.destroy\n\n		respond_to do |wants|\n			wants.html { redirect_to($1s_url) }\n			wants.xml  { head :ok }\n		end\n	end${3}\nsnippet defedit\n	def edit\n		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])\n	end\nsnippet defindex\n	def index\n		@${1:model_class_name} = ${2:ModelClassName}.all\n\n		respond_to do |wants|\n			wants.html # index.html.erb\n			wants.xml  { render :xml => @$1s }\n		end\n	end${3}\nsnippet defnew\n	def new\n		@${1:model_class_name} = ${2:ModelClassName}.new\n\n		respond_to do |wants|\n			wants.html # new.html.erb\n			wants.xml  { render :xml => @$1 }\n		end\n	end${3}\nsnippet defshow\n	def show\n		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])\n\n		respond_to do |wants|\n			wants.html # show.html.erb\n			wants.xml  { render :xml => @$1 }\n		end\n	end${3}\nsnippet defupdate\n	def update\n		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])\n\n		respond_to do |wants|\n			if @$1.update_attributes(params[:$1])\n				flash[:notice] = \'$2 was successfully updated.\'\n				wants.html { redirect_to(@$1) }\n				wants.xml  { head :ok }\n			else\n				wants.html { render :action => "edit" }\n				wants.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }\n			end\n		end\n	end${3}\nsnippet flash\n	flash[:${1:notice}] = "${2}"\nsnippet habtm\n	has_and_belongs_to_many :${1:object}, :join_table => "${2:table_name}", :foreign_key => "${3}_id"${4}\nsnippet hm\n	has_many :${1:object}\nsnippet hmd\n	has_many :${1:other}s, :class_name => "${2:$1}", :foreign_key => "${3:$1}_id", :dependent => :destroy${4}\nsnippet hmt\n	has_many :${1:object}, :through => :${2:object}\nsnippet ho\n	has_one :${1:object}\nsnippet i18\n	I18n.t(\'${1:type.key}\')${2}\nsnippet ist\n	<%= image_submit_tag("${1:agree.png}", :id => "${2:id}"${3} %>\nsnippet log\n	Rails.logger.${1:debug} ${2}\nsnippet log2\n	RAILS_DEFAULT_LOGGER.${1:debug} ${2}\nsnippet logd\n	logger.debug { "${1:message}" }${2}\nsnippet loge\n	logger.error { "${1:message}" }${2}\nsnippet logf\n	logger.fatal { "${1:message}" }${2}\nsnippet logi\n	logger.info { "${1:message}" }${2}\nsnippet logw\n	logger.warn { "${1:message}" }${2}\nsnippet mapc\n	${1:map}.${2:connect} \'${3:controller/:action/:id}\'\nsnippet mapca\n	${1:map}.catch_all "*${2:anything}", :controller => "${3:default}", :action => "${4:error}"${5}\nsnippet mapr\n	${1:map}.resource :${2:resource}\nsnippet maprs\n	${1:map}.resources :${2:resource}\nsnippet mapwo\n	${1:map}.with_options :${2:controller} => \'${3:thing}\' do |$3|\n		${4}\n	end\nsnippet mbs\n	before_save :${1:method}\nsnippet mcht\n	change_table :${1:table_name} do |t|\n		${2}\n	end\nsnippet mp\n	map(&:${1:id})\nsnippet mrw\n	mattr_accessor :${1:attr_names}\nsnippet oa\n	order("${1:field}")\nsnippet od\n	order("${1:field} DESC")\nsnippet pa\n	params[:${1:id}]${2}\nsnippet ra\n	render :action => "${1:action}"\nsnippet ral\n	render :action => "${1:action}", :layout => "${2:layoutname}"\nsnippet rest\n	respond_to do |wants|\n		wants.${1:html} { ${2} }\n	end\nsnippet rf\n	render :file => "${1:filepath}"\nsnippet rfu\n	render :file => "${1:filepath}", :use_full_path => ${2:false}\nsnippet ri\n	render :inline => "${1:<%= \'hello\' %>}"\nsnippet ril\n	render :inline => "${1:<%= \'hello\' %>}", :locals => { ${2::name} => "${3:value}"${4} }\nsnippet rit\n	render :inline => "${1:<%= \'hello\' %>}", :type => ${2::rxml}\nsnippet rjson\n	render :json => ${1:text to render}\nsnippet rl\n	render :layout => "${1:layoutname}"\nsnippet rn\n	render :nothing => ${1:true}\nsnippet rns\n	render :nothing => ${1:true}, :status => ${2:401}\nsnippet rp\n	render :partial => "${1:item}"\nsnippet rpc\n	render :partial => "${1:item}", :collection => ${2:@$1s}\nsnippet rpl\n	render :partial => "${1:item}", :locals => { :${2:$1} => ${3:@$1}\nsnippet rpo\n	render :partial => "${1:item}", :object => ${2:@$1}\nsnippet rps\n	render :partial => "${1:item}", :status => ${2:500}\nsnippet rt\n	render :text => "${1:text to render}"\nsnippet rtl\n	render :text => "${1:text to render}", :layout => "${2:layoutname}"\nsnippet rtlt\n	render :text => "${1:text to render}", :layout => ${2:true}\nsnippet rts\n	render :text => "${1:text to render}", :status => ${2:401}\nsnippet ru\n	render :update do |${1:page}|\n		$1.${2}\n	end\nsnippet rxml\n	render :xml => ${1:text to render}\nsnippet sc\n	scope :${1:name}, :where(:@${2:field} => ${3:value})\nsnippet sl\n	scope :${1:name}, lambda do |${2:value}|\n		where("${3:field = ?}", ${4:bind var})\n	end\nsnippet sha1\n	Digest::SHA1.hexdigest(${1:string})\nsnippet sweeper\n	class ${1:ModelClassName}Sweeper < ActionController::Caching::Sweeper\n		observe $1\n\n		def after_save(${2:model_class_name})\n			expire_cache($2)\n		end\n\n		def after_destroy($2)\n			expire_cache($2)\n		end\n\n		def expire_cache($2)\n			expire_page\n		end\n	end\nsnippet tcb\n	t.boolean :${1:title}\n	${2}\nsnippet tcbi\n	t.binary :${1:title}, :limit => ${2:2}.megabytes\n	${3}\nsnippet tcd\n	t.decimal :${1:title}, :precision => ${2:10}, :scale => ${3:2}\n	${4}\nsnippet tcda\n	t.date :${1:title}\n	${2}\nsnippet tcdt\n	t.datetime :${1:title}\n	${2}\nsnippet tcf\n	t.float :${1:title}\n	${2}\nsnippet tch\n	t.change :${1:name}, :${2:string}, :${3:limit} => ${4:80}\n	${5}\nsnippet tci\n	t.integer :${1:title}\n	${2}\nsnippet tcl\n	t.integer :lock_version, :null => false, :default => 0\n	${1}\nsnippet tcr\n	t.references :${1:taggable}, :polymorphic => { :default => \'${2:Photo}\' }\n	${3}\nsnippet tcs\n	t.string :${1:title}\n	${2}\nsnippet tct\n	t.text :${1:title}\n	${2}\nsnippet tcti\n	t.time :${1:title}\n	${2}\nsnippet tcts\n	t.timestamp :${1:title}\n	${2}\nsnippet tctss\n	t.timestamps\n	${1}\nsnippet va\n	validates_associated :${1:attribute}\nsnippet vao\n	validates_acceptance_of :${1:terms}\nsnippet vc\n	validates_confirmation_of :${1:attribute}\nsnippet ve\n	validates_exclusion_of :${1:attribute}, :in => ${2:%w( mov avi )}\nsnippet vf\n	validates_format_of :${1:attribute}, :with => /${2:regex}/\nsnippet vi\n	validates_inclusion_of :${1:attribute}, :in => %w(${2: mov avi })\nsnippet vl\n	validates_length_of :${1:attribute}, :within => ${2:3}..${3:20}\nsnippet vn\n	validates_numericality_of :${1:attribute}\nsnippet vpo\n	validates_presence_of :${1:attribute}\nsnippet vu\n	validates_uniqueness_of :${1:attribute}\nsnippet wants\n	wants.${1:js|xml|html} { ${2} }\nsnippet wc\n	where(${1:"conditions"}${2:, bind_var})\nsnippet wh\n	where(${1:field} => ${2:value})\nsnippet xdelete\n	xhr :delete, :${1:destroy}, :id => ${2:1}${3}\nsnippet xget\n	xhr :get, :${1:show}, :id => ${2:1}${3}\nsnippet xpost\n	xhr :post, :${1:create}, :${2:object} => { ${3} }\nsnippet xput\n	xhr :put, :${1:update}, :id => ${2:1}, :${3:object} => { ${4} }${5}\nsnippet test\n	test "should ${1:do something}" do\n		${2}\n	end\n#migrations\nsnippet mac\n	add_column :${1:table_name}, :${2:column_name}, :${3:data_type}\nsnippet mrc\n	remove_column :${1:table_name}, :${2:column_name}\nsnippet mrnc\n	rename_column :${1:table_name}, :${2:old_column_name}, :${3:new_column_name}\nsnippet mcc\n	change_column :${1:table}, :${2:column}, :${3:type}\nsnippet mccc\n	t.column :${1:title}, :${2:string}\nsnippet mct\n	create_table :${1:table_name} do |t|\n		t.column :${2:name}, :${3:type}\n	end\nsnippet migration\n	class ${1:class_name} < ActiveRecord::Migration\n		def self.up\n			${2}\n		end\n\n		def self.down\n		end\n	end\n\nsnippet trc\n	t.remove :${1:column}\nsnippet tre\n	t.rename :${1:old_column_name}, :${2:new_column_name}\n	${3}\nsnippet tref\n	t.references :${1:model}\n\n#rspec\nsnippet it\n	it "${1:spec_name}" do\n		${2}\n	end\nsnippet itp\n	it "${1:spec_name}"\n	${2}\nsnippet desc\n	describe ${1:class_name} do\n		${2}\n	end\nsnippet cont\n	context "${1:message}" do\n		${2}\n	end\nsnippet bef\n	before :${1:each} do\n		${2}\n	end\nsnippet aft\n	after :${1:each} do\n		${2}\n	end\n',t.scope="ruby"})
\ No newline at end of file
+ace.define("ace/snippets/ruby",["require","exports","module"],function(e,t,n){"use strict";t.snippetText='########################################\n# Ruby snippets - for Rails, see below #\n########################################\n\n# encoding for Ruby 1.9\nsnippet enc\n	# encoding: utf-8\n\n# #!/usr/bin/env ruby\nsnippet #!\n	#!/usr/bin/env ruby\n	# encoding: utf-8\n\n# New Block\nsnippet =b\n	=begin rdoc\n		${1}\n	=end\nsnippet y\n	:yields: ${1:arguments}\nsnippet rb\n	#!/usr/bin/env ruby -wKU\nsnippet beg\n	begin\n		${3}\n	rescue ${1:Exception} => ${2:e}\n	end\n\nsnippet req require\n	require "${1}"${2}\nsnippet #\n	# =>\nsnippet end\n	__END__\nsnippet case\n	case ${1:object}\n	when ${2:condition}\n		${3}\n	end\nsnippet when\n	when ${1:condition}\n		${2}\nsnippet def\n	def ${1:method_name}\n		${2}\n	end\nsnippet deft\n	def test_${1:case_name}\n		${2}\n	end\nsnippet if\n	if ${1:condition}\n		${2}\n	end\nsnippet ife\n	if ${1:condition}\n		${2}\n	else\n		${3}\n	end\nsnippet elsif\n	elsif ${1:condition}\n		${2}\nsnippet unless\n	unless ${1:condition}\n		${2}\n	end\nsnippet while\n	while ${1:condition}\n		${2}\n	end\nsnippet for\n	for ${1:e} in ${2:c}\n		${3}\n	end\nsnippet until\n	until ${1:condition}\n		${2}\n	end\nsnippet cla class .. end\n	class ${1:`substitute(Filename(), \'\\(_\\|^\\)\\(.\\)\', \'\\u\\2\', \'g\')`}\n		${2}\n	end\nsnippet cla class .. initialize .. end\n	class ${1:`substitute(Filename(), \'\\(_\\|^\\)\\(.\\)\', \'\\u\\2\', \'g\')`}\n		def initialize(${2:args})\n			${3}\n		end\n	end\nsnippet cla class .. < ParentClass .. initialize .. end\n	class ${1:`substitute(Filename(), \'\\(_\\|^\\)\\(.\\)\', \'\\u\\2\', \'g\')`} < ${2:ParentClass}\n		def initialize(${3:args})\n			${4}\n		end\n	end\nsnippet cla ClassName = Struct .. do .. end\n	${1:`substitute(Filename(), \'\\(_\\|^\\)\\(.\\)\', \'\\u\\2\', \'g\')`} = Struct.new(:${2:attr_names}) do\n		def ${3:method_name}\n			${4}\n		end\n	end\nsnippet cla class BlankSlate .. initialize .. end\n	class ${1:BlankSlate}\n		instance_methods.each { |meth| undef_method(meth) unless meth =~ /\\A__/ }\n	end\nsnippet cla class << self .. end\n	class << ${1:self}\n		${2}\n	end\n# class .. < DelegateClass .. initialize .. end\nsnippet cla-\n	class ${1:`substitute(Filename(), \'\\(_\\|^\\)\\(.\\)\', \'\\u\\2\', \'g\')`} < DelegateClass(${2:ParentClass})\n		def initialize(${3:args})\n			super(${4:del_obj})\n\n			${5}\n		end\n	end\nsnippet mod module .. end\n	module ${1:`substitute(Filename(), \'\\(_\\|^\\)\\(.\\)\', \'\\u\\2\', \'g\')`}\n		${2}\n	end\nsnippet mod module .. module_function .. end\n	module ${1:`substitute(Filename(), \'\\(_\\|^\\)\\(.\\)\', \'\\u\\2\', \'g\')`}\n		module_function\n\n		${2}\n	end\nsnippet mod module .. ClassMethods .. end\n	module ${1:`substitute(Filename(), \'\\(_\\|^\\)\\(.\\)\', \'\\u\\2\', \'g\')`}\n		module ClassMethods\n			${2}\n		end\n\n		module InstanceMethods\n\n		end\n\n		def self.included(receiver)\n			receiver.extend         ClassMethods\n			receiver.send :include, InstanceMethods\n		end\n	end\n# attr_reader\nsnippet r\n	attr_reader :${1:attr_names}\n# attr_writer\nsnippet w\n	attr_writer :${1:attr_names}\n# attr_accessor\nsnippet rw\n	attr_accessor :${1:attr_names}\nsnippet atp\n	attr_protected :${1:attr_names}\nsnippet ata\n	attr_accessible :${1:attr_names}\n# include Enumerable\nsnippet Enum\n	include Enumerable\n\n	def each(&block)\n		${1}\n	end\n# include Comparable\nsnippet Comp\n	include Comparable\n\n	def <=>(other)\n		${1}\n	end\n# extend Forwardable\nsnippet Forw-\n	extend Forwardable\n# def self\nsnippet defs\n	def self.${1:class_method_name}\n		${2}\n	end\n# def method_missing\nsnippet defmm\n	def method_missing(meth, *args, &blk)\n		${1}\n	end\nsnippet defd\n	def_delegator :${1:@del_obj}, :${2:del_meth}, :${3:new_name}\nsnippet defds\n	def_delegators :${1:@del_obj}, :${2:del_methods}\nsnippet am\n	alias_method :${1:new_name}, :${2:old_name}\nsnippet app\n	if __FILE__ == $PROGRAM_NAME\n		${1}\n	end\n# usage_if()\nsnippet usai\n	if ARGV.${1}\n		abort "Usage: #{$PROGRAM_NAME} ${2:ARGS_GO_HERE}"${3}\n	end\n# usage_unless()\nsnippet usau\n	unless ARGV.${1}\n		abort "Usage: #{$PROGRAM_NAME} ${2:ARGS_GO_HERE}"${3}\n	end\nsnippet array\n	Array.new(${1:10}) { |${2:i}| ${3} }\nsnippet hash\n	Hash.new { |${1:hash}, ${2:key}| $1[$2] = ${3} }\nsnippet file File.foreach() { |line| .. }\n	File.foreach(${1:"path/to/file"}) { |${2:line}| ${3} }\nsnippet file File.read()\n	File.read(${1:"path/to/file"})${2}\nsnippet Dir Dir.global() { |file| .. }\n	Dir.glob(${1:"dir/glob/*"}) { |${2:file}| ${3} }\nsnippet Dir Dir[".."]\n	Dir[${1:"glob/**/*.rb"}]${2}\nsnippet dir\n	Filename.dirname(__FILE__)\nsnippet deli\n	delete_if { |${1:e}| ${2} }\nsnippet fil\n	fill(${1:range}) { |${2:i}| ${3} }\n# flatten_once()\nsnippet flao\n	inject(Array.new) { |${1:arr}, ${2:a}| $1.push(*$2)}${3}\nsnippet zip\n	zip(${1:enums}) { |${2:row}| ${3} }\n# downto(0) { |n| .. }\nsnippet dow\n	downto(${1:0}) { |${2:n}| ${3} }\nsnippet ste\n	step(${1:2}) { |${2:n}| ${3} }\nsnippet tim\n	times { |${1:n}| ${2} }\nsnippet upt\n	upto(${1:1.0/0.0}) { |${2:n}| ${3} }\nsnippet loo\n	loop { ${1} }\nsnippet ea\n	each { |${1:e}| ${2} }\nsnippet ead\n	each do |${1:e}|\n		${2}\n	end\nsnippet eab\n	each_byte { |${1:byte}| ${2} }\nsnippet eac- each_char { |chr| .. }\n	each_char { |${1:chr}| ${2} }\nsnippet eac- each_cons(..) { |group| .. }\n	each_cons(${1:2}) { |${2:group}| ${3} }\nsnippet eai\n	each_index { |${1:i}| ${2} }\nsnippet eaid\n	each_index do |${1:i}|\n		${2}\n	end\nsnippet eak\n	each_key { |${1:key}| ${2} }\nsnippet eakd\n	each_key do |${1:key}|\n		${2}\n	end\nsnippet eal\n	each_line { |${1:line}| ${2} }\nsnippet eald\n	each_line do |${1:line}|\n		${2}\n	end\nsnippet eap\n	each_pair { |${1:name}, ${2:val}| ${3} }\nsnippet eapd\n	each_pair do |${1:name}, ${2:val}|\n		${3}\n	end\nsnippet eas-\n	each_slice(${1:2}) { |${2:group}| ${3} }\nsnippet easd-\n	each_slice(${1:2}) do |${2:group}|\n		${3}\n	end\nsnippet eav\n	each_value { |${1:val}| ${2} }\nsnippet eavd\n	each_value do |${1:val}|\n		${2}\n	end\nsnippet eawi\n	each_with_index { |${1:e}, ${2:i}| ${3} }\nsnippet eawid\n	each_with_index do |${1:e},${2:i}|\n		${3}\n	end\nsnippet reve\n	reverse_each { |${1:e}| ${2} }\nsnippet reved\n	reverse_each do |${1:e}|\n		${2}\n	end\nsnippet inj\n	inject(${1:init}) { |${2:mem}, ${3:var}| ${4} }\nsnippet injd\n	inject(${1:init}) do |${2:mem}, ${3:var}|\n		${4}\n	end\nsnippet map\n	map { |${1:e}| ${2} }\nsnippet mapd\n	map do |${1:e}|\n		${2}\n	end\nsnippet mapwi-\n	enum_with_index.map { |${1:e}, ${2:i}| ${3} }\nsnippet sor\n	sort { |a, b| ${1} }\nsnippet sorb\n	sort_by { |${1:e}| ${2} }\nsnippet ran\n	sort_by { rand }\nsnippet all\n	all? { |${1:e}| ${2} }\nsnippet any\n	any? { |${1:e}| ${2} }\nsnippet cl\n	classify { |${1:e}| ${2} }\nsnippet col\n	collect { |${1:e}| ${2} }\nsnippet cold\n	collect do |${1:e}|\n		${2}\n	end\nsnippet det\n	detect { |${1:e}| ${2} }\nsnippet detd\n	detect do |${1:e}|\n		${2}\n	end\nsnippet fet\n	fetch(${1:name}) { |${2:key}| ${3} }\nsnippet fin\n	find { |${1:e}| ${2} }\nsnippet find\n	find do |${1:e}|\n		${2}\n	end\nsnippet fina\n	find_all { |${1:e}| ${2} }\nsnippet finad\n	find_all do |${1:e}|\n		${2}\n	end\nsnippet gre\n	grep(${1:/pattern/}) { |${2:match}| ${3} }\nsnippet sub\n	${1:g}sub(${2:/pattern/}) { |${3:match}| ${4} }\nsnippet sca\n	scan(${1:/pattern/}) { |${2:match}| ${3} }\nsnippet scad\n	scan(${1:/pattern/}) do |${2:match}|\n		${3}\n	end\nsnippet max\n	max { |a, b| ${1} }\nsnippet min\n	min { |a, b| ${1} }\nsnippet par\n	partition { |${1:e}| ${2} }\nsnippet pard\n	partition do |${1:e}|\n		${2}\n	end\nsnippet rej\n	reject { |${1:e}| ${2} }\nsnippet rejd\n	reject do |${1:e}|\n		${2}\n	end\nsnippet sel\n	select { |${1:e}| ${2} }\nsnippet seld\n	select do |${1:e}|\n		${2}\n	end\nsnippet lam\n	lambda { |${1:args}| ${2} }\nsnippet doo\n	do\n		${1}\n	end\nsnippet dov\n	do |${1:variable}|\n		${2}\n	end\nsnippet :\n	:${1:key} => ${2:"value"}${3}\nsnippet ope\n	open(${1:"path/or/url/or/pipe"}, "${2:w}") { |${3:io}| ${4} }\n# path_from_here()\nsnippet fpath\n	File.join(File.dirname(__FILE__), *%2[${1:rel path here}])${2}\n# unix_filter {}\nsnippet unif\n	ARGF.each_line${1} do |${2:line}|\n		${3}\n	end\n# option_parse {}\nsnippet optp\n	require "optparse"\n\n	options = {${1:default => "args"}}\n\n	ARGV.options do |opts|\n		opts.banner = "Usage: #{File.basename($PROGRAM_NAME)}\nsnippet opt\n	opts.on( "-${1:o}", "--${2:long-option-name}", ${3:String},\n	         "${4:Option description.}") do |${5:opt}|\n		${6}\n	end\nsnippet tc\n	require "test/unit"\n\n	require "${1:library_file_name}"\n\n	class Test${2:$1} < Test::Unit::TestCase\n		def test_${3:case_name}\n			${4}\n		end\n	end\nsnippet ts\n	require "test/unit"\n\n	require "tc_${1:test_case_file}"\n	require "tc_${2:test_case_file}"${3}\nsnippet as\n	assert ${1:test}, "${2:Failure message.}"${3}\nsnippet ase\n	assert_equal ${1:expected}, ${2:actual}${3}\nsnippet asne\n	assert_not_equal ${1:unexpected}, ${2:actual}${3}\nsnippet asid\n	assert_in_delta ${1:expected_float}, ${2:actual_float}, ${3:2 ** -20}${4}\nsnippet asio\n	assert_instance_of ${1:ExpectedClass}, ${2:actual_instance}${3}\nsnippet asko\n	assert_kind_of ${1:ExpectedKind}, ${2:actual_instance}${3}\nsnippet asn\n	assert_nil ${1:instance}${2}\nsnippet asnn\n	assert_not_nil ${1:instance}${2}\nsnippet asm\n	assert_match /${1:expected_pattern}/, ${2:actual_string}${3}\nsnippet asnm\n	assert_no_match /${1:unexpected_pattern}/, ${2:actual_string}${3}\nsnippet aso\n	assert_operator ${1:left}, :${2:operator}, ${3:right}${4}\nsnippet asr\n	assert_raise ${1:Exception} { ${2} }\nsnippet asrd\n	assert_raise ${1:Exception} do\n		${2}\n	end\nsnippet asnr\n	assert_nothing_raised ${1:Exception} { ${2} }\nsnippet asnrd\n	assert_nothing_raised ${1:Exception} do\n		${2}\n	end\nsnippet asrt\n	assert_respond_to ${1:object}, :${2:method}${3}\nsnippet ass assert_same(..)\n	assert_same ${1:expected}, ${2:actual}${3}\nsnippet ass assert_send(..)\n	assert_send [${1:object}, :${2:message}, ${3:args}]${4}\nsnippet asns\n	assert_not_same ${1:unexpected}, ${2:actual}${3}\nsnippet ast\n	assert_throws :${1:expected} { ${2} }\nsnippet astd\n	assert_throws :${1:expected} do\n		${2}\n	end\nsnippet asnt\n	assert_nothing_thrown { ${1} }\nsnippet asntd\n	assert_nothing_thrown do\n		${1}\n	end\nsnippet fl\n	flunk "${1:Failure message.}"${2}\n# Benchmark.bmbm do .. end\nsnippet bm-\n	TESTS = ${1:10_000}\n	Benchmark.bmbm do |results|\n		${2}\n	end\nsnippet rep\n	results.report("${1:name}:") { TESTS.times { ${2} }}\n# Marshal.dump(.., file)\nsnippet Md\n	File.open(${1:"path/to/file.dump"}, "wb") { |${2:file}| Marshal.dump(${3:obj}, $2) }${4}\n# Mashal.load(obj)\nsnippet Ml\n	File.open(${1:"path/to/file.dump"}, "rb") { |${2:file}| Marshal.load($2) }${3}\n# deep_copy(..)\nsnippet deec\n	Marshal.load(Marshal.dump(${1:obj_to_copy}))${2}\nsnippet Pn-\n	PStore.new(${1:"file_name.pstore"})${2}\nsnippet tra\n	transaction(${1:true}) { ${2} }\n# xmlread(..)\nsnippet xml-\n	REXML::Document.new(File.read(${1:"path/to/file"}))${2}\n# xpath(..) { .. }\nsnippet xpa\n	elements.each(${1:"//Xpath"}) do |${2:node}|\n		${3}\n	end\n# class_from_name()\nsnippet clafn\n	split("::").inject(Object) { |par, const| par.const_get(const) }\n# singleton_class()\nsnippet sinc\n	class << self; self end\nsnippet nam\n	namespace :${1:`Filename()`} do\n		${2}\n	end\nsnippet tas\n	desc "${1:Task description}"\n	task :${2:task_name => [:dependent, :tasks]} do\n		${3}\n	end\n# block\nsnippet b\n	{ |${1:var}| ${2} }\nsnippet begin\n	begin\n		raise \'A test exception.\'\n	rescue Exception => e\n		puts e.message\n		puts e.backtrace.inspect\n	else\n		# other exception\n	ensure\n		# always executed\n	end\n\n#debugging\nsnippet debug\n	require \'ruby-debug\'; debugger; true;\nsnippet pry\n	require \'pry\'; binding.pry\n\n#############################################\n# Rails snippets - for pure Ruby, see above #\n#############################################\nsnippet art\n	assert_redirected_to ${1::action => "${2:index}"}\nsnippet artnp\n	assert_redirected_to ${1:parent}_${2:child}_path(${3:@$1}, ${4:@$2})\nsnippet artnpp\n	assert_redirected_to ${1:parent}_${2:child}_path(${3:@$1})\nsnippet artp\n	assert_redirected_to ${1:model}_path(${2:@$1})\nsnippet artpp\n	assert_redirected_to ${1:model}s_path\nsnippet asd\n	assert_difference "${1:Model}.${2:count}", $1 do\n		${3}\n	end\nsnippet asnd\n	assert_no_difference "${1:Model}.${2:count}" do\n		${3}\n	end\nsnippet asre\n	assert_response :${1:success}, @response.body${2}\nsnippet asrj\n	assert_rjs :${1:replace}, "${2:dom id}"\nsnippet ass assert_select(..)\n	assert_select \'${1:path}\', :${2:text} => \'${3:inner_html\' ${4:do}\nsnippet bf\n	before_action :${1:method}\nsnippet bt\n	belongs_to :${1:association}\nsnippet crw\n	cattr_accessor :${1:attr_names}\nsnippet defcreate\n	def create\n		@${1:model_class_name} = ${2:ModelClassName}.new(params[:$1])\n\n		respond_to do |wants|\n			if @$1.save\n				flash[:notice] = \'$2 was successfully created.\'\n				wants.html { redirect_to(@$1) }\n				wants.xml  { render :xml => @$1, :status => :created, :location => @$1 }\n			else\n				wants.html { render :action => "new" }\n				wants.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }\n			end\n		end\n	end${3}\nsnippet defdestroy\n	def destroy\n		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])\n		@$1.destroy\n\n		respond_to do |wants|\n			wants.html { redirect_to($1s_url) }\n			wants.xml  { head :ok }\n		end\n	end${3}\nsnippet defedit\n	def edit\n		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])\n	end\nsnippet defindex\n	def index\n		@${1:model_class_name} = ${2:ModelClassName}.all\n\n		respond_to do |wants|\n			wants.html # index.html.erb\n			wants.xml  { render :xml => @$1s }\n		end\n	end${3}\nsnippet defnew\n	def new\n		@${1:model_class_name} = ${2:ModelClassName}.new\n\n		respond_to do |wants|\n			wants.html # new.html.erb\n			wants.xml  { render :xml => @$1 }\n		end\n	end${3}\nsnippet defshow\n	def show\n		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])\n\n		respond_to do |wants|\n			wants.html # show.html.erb\n			wants.xml  { render :xml => @$1 }\n		end\n	end${3}\nsnippet defupdate\n	def update\n		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])\n\n		respond_to do |wants|\n			if @$1.update_attributes(params[:$1])\n				flash[:notice] = \'$2 was successfully updated.\'\n				wants.html { redirect_to(@$1) }\n				wants.xml  { head :ok }\n			else\n				wants.html { render :action => "edit" }\n				wants.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }\n			end\n		end\n	end${3}\nsnippet flash\n	flash[:${1:notice}] = "${2}"\nsnippet habtm\n	has_and_belongs_to_many :${1:object}, :join_table => "${2:table_name}", :foreign_key => "${3}_id"${4}\nsnippet hm\n	has_many :${1:object}\nsnippet hmd\n	has_many :${1:other}s, :class_name => "${2:$1}", :foreign_key => "${3:$1}_id", :dependent => :destroy${4}\nsnippet hmt\n	has_many :${1:object}, :through => :${2:object}\nsnippet ho\n	has_one :${1:object}\nsnippet i18\n	I18n.t(\'${1:type.key}\')${2}\nsnippet ist\n	<%= image_submit_tag("${1:agree.png}", :id => "${2:id}"${3} %>\nsnippet log\n	Rails.logger.${1:debug} ${2}\nsnippet log2\n	RAILS_DEFAULT_LOGGER.${1:debug} ${2}\nsnippet logd\n	logger.debug { "${1:message}" }${2}\nsnippet loge\n	logger.error { "${1:message}" }${2}\nsnippet logf\n	logger.fatal { "${1:message}" }${2}\nsnippet logi\n	logger.info { "${1:message}" }${2}\nsnippet logw\n	logger.warn { "${1:message}" }${2}\nsnippet mapc\n	${1:map}.${2:connect} \'${3:controller/:action/:id}\'\nsnippet mapca\n	${1:map}.catch_all "*${2:anything}", :controller => "${3:default}", :action => "${4:error}"${5}\nsnippet mapr\n	${1:map}.resource :${2:resource}\nsnippet maprs\n	${1:map}.resources :${2:resource}\nsnippet mapwo\n	${1:map}.with_options :${2:controller} => \'${3:thing}\' do |$3|\n		${4}\n	end\nsnippet mbs\n	before_save :${1:method}\nsnippet mcht\n	change_table :${1:table_name} do |t|\n		${2}\n	end\nsnippet mp\n	map(&:${1:id})\nsnippet mrw\n	mattr_accessor :${1:attr_names}\nsnippet oa\n	order("${1:field}")\nsnippet od\n	order("${1:field} DESC")\nsnippet pa\n	params[:${1:id}]${2}\nsnippet ra\n	render :action => "${1:action}"\nsnippet ral\n	render :action => "${1:action}", :layout => "${2:layoutname}"\nsnippet rest\n	respond_to do |wants|\n		wants.${1:html} { ${2} }\n	end\nsnippet rf\n	render :file => "${1:filepath}"\nsnippet rfu\n	render :file => "${1:filepath}", :use_full_path => ${2:false}\nsnippet ri\n	render :inline => "${1:<%= \'hello\' %>}"\nsnippet ril\n	render :inline => "${1:<%= \'hello\' %>}", :locals => { ${2::name} => "${3:value}"${4} }\nsnippet rit\n	render :inline => "${1:<%= \'hello\' %>}", :type => ${2::rxml}\nsnippet rjson\n	render :json => ${1:text to render}\nsnippet rl\n	render :layout => "${1:layoutname}"\nsnippet rn\n	render :nothing => ${1:true}\nsnippet rns\n	render :nothing => ${1:true}, :status => ${2:401}\nsnippet rp\n	render :partial => "${1:item}"\nsnippet rpc\n	render :partial => "${1:item}", :collection => ${2:@$1s}\nsnippet rpl\n	render :partial => "${1:item}", :locals => { :${2:$1} => ${3:@$1}\nsnippet rpo\n	render :partial => "${1:item}", :object => ${2:@$1}\nsnippet rps\n	render :partial => "${1:item}", :status => ${2:500}\nsnippet rt\n	render :text => "${1:text to render}"\nsnippet rtl\n	render :text => "${1:text to render}", :layout => "${2:layoutname}"\nsnippet rtlt\n	render :text => "${1:text to render}", :layout => ${2:true}\nsnippet rts\n	render :text => "${1:text to render}", :status => ${2:401}\nsnippet ru\n	render :update do |${1:page}|\n		$1.${2}\n	end\nsnippet rxml\n	render :xml => ${1:text to render}\nsnippet sc\n	scope :${1:name}, :where(:@${2:field} => ${3:value})\nsnippet sl\n	scope :${1:name}, lambda do |${2:value}|\n		where("${3:field = ?}", ${4:bind var})\n	end\nsnippet sha1\n	Digest::SHA1.hexdigest(${1:string})\nsnippet sweeper\n	class ${1:ModelClassName}Sweeper < ActionController::Caching::Sweeper\n		observe $1\n\n		def after_save(${2:model_class_name})\n			expire_cache($2)\n		end\n\n		def after_destroy($2)\n			expire_cache($2)\n		end\n\n		def expire_cache($2)\n			expire_page\n		end\n	end\nsnippet tcb\n	t.boolean :${1:title}\n	${2}\nsnippet tcbi\n	t.binary :${1:title}, :limit => ${2:2}.megabytes\n	${3}\nsnippet tcd\n	t.decimal :${1:title}, :precision => ${2:10}, :scale => ${3:2}\n	${4}\nsnippet tcda\n	t.date :${1:title}\n	${2}\nsnippet tcdt\n	t.datetime :${1:title}\n	${2}\nsnippet tcf\n	t.float :${1:title}\n	${2}\nsnippet tch\n	t.change :${1:name}, :${2:string}, :${3:limit} => ${4:80}\n	${5}\nsnippet tci\n	t.integer :${1:title}\n	${2}\nsnippet tcl\n	t.integer :lock_version, :null => false, :default => 0\n	${1}\nsnippet tcr\n	t.references :${1:taggable}, :polymorphic => { :default => \'${2:Photo}\' }\n	${3}\nsnippet tcs\n	t.string :${1:title}\n	${2}\nsnippet tct\n	t.text :${1:title}\n	${2}\nsnippet tcti\n	t.time :${1:title}\n	${2}\nsnippet tcts\n	t.timestamp :${1:title}\n	${2}\nsnippet tctss\n	t.timestamps\n	${1}\nsnippet va\n	validates_associated :${1:attribute}\nsnippet vao\n	validates_acceptance_of :${1:terms}\nsnippet vc\n	validates_confirmation_of :${1:attribute}\nsnippet ve\n	validates_exclusion_of :${1:attribute}, :in => ${2:%w( mov avi )}\nsnippet vf\n	validates_format_of :${1:attribute}, :with => /${2:regex}/\nsnippet vi\n	validates_inclusion_of :${1:attribute}, :in => %w(${2: mov avi })\nsnippet vl\n	validates_length_of :${1:attribute}, :within => ${2:3}..${3:20}\nsnippet vn\n	validates_numericality_of :${1:attribute}\nsnippet vpo\n	validates_presence_of :${1:attribute}\nsnippet vu\n	validates_uniqueness_of :${1:attribute}\nsnippet wants\n	wants.${1:js|xml|html} { ${2} }\nsnippet wc\n	where(${1:"conditions"}${2:, bind_var})\nsnippet wh\n	where(${1:field} => ${2:value})\nsnippet xdelete\n	xhr :delete, :${1:destroy}, :id => ${2:1}${3}\nsnippet xget\n	xhr :get, :${1:show}, :id => ${2:1}${3}\nsnippet xpost\n	xhr :post, :${1:create}, :${2:object} => { ${3} }\nsnippet xput\n	xhr :put, :${1:update}, :id => ${2:1}, :${3:object} => { ${4} }${5}\nsnippet test\n	test "should ${1:do something}" do\n		${2}\n	end\n#migrations\nsnippet mac\n	add_column :${1:table_name}, :${2:column_name}, :${3:data_type}\nsnippet mrc\n	remove_column :${1:table_name}, :${2:column_name}\nsnippet mrnc\n	rename_column :${1:table_name}, :${2:old_column_name}, :${3:new_column_name}\nsnippet mcc\n	change_column :${1:table}, :${2:column}, :${3:type}\nsnippet mccc\n	t.column :${1:title}, :${2:string}\nsnippet mct\n	create_table :${1:table_name} do |t|\n		t.column :${2:name}, :${3:type}\n	end\nsnippet migration\n	class ${1:class_name} < ActiveRecord::Migration[4.2]\n		def self.up\n			${2}\n		end\n\n		def self.down\n		end\n	end\n\nsnippet trc\n	t.remove :${1:column}\nsnippet tre\n	t.rename :${1:old_column_name}, :${2:new_column_name}\n	${3}\nsnippet tref\n	t.references :${1:model}\n\n#rspec\nsnippet it\n	it "${1:spec_name}" do\n		${2}\n	end\nsnippet itp\n	it "${1:spec_name}"\n	${2}\nsnippet desc\n	describe ${1:class_name} do\n		${2}\n	end\nsnippet cont\n	context "${1:message}" do\n		${2}\n	end\nsnippet bef\n	before :${1:each} do\n		${2}\n	end\nsnippet aft\n	after :${1:each} do\n		${2}\n	end\n',t.scope="ruby"})
\ No newline at end of file
diff --git a/public/javascripts/pikaday.js b/public/javascripts/pikaday.js
index 7fec0fc464..ba7aca0641 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/public/service-worker.js b/public/service-worker.js
deleted file mode 100644
index 3c6fecee60..0000000000
--- a/public/service-worker.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- This service worker doesn't actually do anything!
- I'm here just to support Google Chrome App Banner on Android
- */
diff --git a/script/.gitignore b/script/.gitignore
new file mode 100644
index 0000000000..96109316ef
--- /dev/null
+++ b/script/.gitignore
@@ -0,0 +1,2 @@
+tmp/*
+settings.local.yml
diff --git a/script/bench.rb b/script/bench.rb
index 9de35492a8..ac6fe614fc 100644
--- a/script/bench.rb
+++ b/script/bench.rb
@@ -64,7 +64,6 @@ end
 
 @timings = {}
 
-
 def measure(name)
   start = Time.now
   yield
@@ -100,7 +99,6 @@ unless $? == 0
   abort "Apache Bench is not installed. Try: apt-get install apache2-utils or brew install ab"
 end
 
-
 unless File.exists?("config/database.yml")
   puts "Copying database.yml.development.sample to database.yml"
   `cp config/database.yml.development-sample config/database.yml`
@@ -108,7 +106,6 @@ end
 
 ENV["RAILS_ENV"] = "profile"
 
-
 discourse_env_vars = %w(DISCOURSE_DUMP_HEAP RUBY_GC_HEAP_INIT_SLOTS RUBY_GC_HEAP_FREE_SLOTS RUBY_GC_HEAP_GROWTH_FACTOR RUBY_GC_HEAP_GROWTH_MAX_SLOTS RUBY_GC_MALLOC_LIMIT RUBY_GC_OLDMALLOC_LIMIT RUBY_GC_MALLOC_LIMIT_MAX RUBY_GC_OLDMALLOC_LIMIT_MAX RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR RUBY_GC_OLDMALLOC_LIMIT_GROWTH_FACTOR RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR)
 
 if @include_env
@@ -124,7 +121,7 @@ else
   end
 end
 
-def port_available? port
+def port_available?(port)
   server = TCPServer.open("0.0.0.0", port)
   server.close
   true
@@ -157,9 +154,9 @@ def bench(path, name)
   puts "Running apache bench warmup"
   add = ""
   add = "-c 3 " if @unicorn
-  `ab #{add} -n 10 "http://127.0.0.1:#{@port}#{path}"`
+  `ab #{add} -n 20 -l "http://127.0.0.1:#{@port}#{path}"`
   puts "Benchmarking #{name} @ #{path}"
-  `ab -n #{@iterations} -e tmp/ab.csv "http://127.0.0.1:#{@port}#{path}"`
+  `ab #{add} -n #{@iterations} -l -e tmp/ab.csv "http://127.0.0.1:#{@port}#{path}"`
 
   percentiles = Hash[*[50, 75, 90, 99].zip([]).flatten]
   CSV.foreach("tmp/ab.csv") do |percent, time|
@@ -174,13 +171,14 @@ begin
   puts "precompiling assets"
   run("bundle exec rake assets:precompile")
 
-  pid = if @unicorn
-          ENV['UNICORN_PORT'] = @port.to_s
-          FileUtils.mkdir_p(File.join('tmp', 'pids'))
-          spawn("bundle exec unicorn -c config/unicorn.conf.rb")
-        else
-          spawn("bundle exec thin start -p #{@port}")
-        end
+  pid =
+    if @unicorn
+      ENV['UNICORN_PORT'] = @port.to_s
+      FileUtils.mkdir_p(File.join('tmp', 'pids'))
+      spawn("bundle exec unicorn -c config/unicorn.conf.rb")
+    else
+      spawn("bundle exec thin start -p #{@port}")
+    end
 
   while port_available? @port
     sleep 1
@@ -190,16 +188,22 @@ begin
   append = "?api_key=#{api_key}&api_username=admin1"
 
   # asset precompilation is a dog, wget to force it
-  run "wget http://127.0.0.1:#{@port}/ -o /dev/null"
+  run "wget http://127.0.0.1:#{@port}/ -o /dev/null -O /dev/null"
 
   tests = [
     ["categories", "/categories"],
     ["home", "/"],
-    ["topic", "/t/oh-how-i-wish-i-could-shut-up-like-a-tunnel-for-so/69"]
+    ["topic", "/t/oh-how-i-wish-i-could-shut-up-like-a-tunnel-for-so/179"]
     # ["user", "/u/admin1/activity"],
   ]
 
-  tests = tests.map{|k,url| ["#{k}_admin", "#{url}#{append}"]} + tests
+  tests.concat(tests.map { |k, url| ["#{k}_admin", "#{url}#{append}"] })
+
+  tests.each do |_, path|
+    if `curl -s -I "http://127.0.0.1:#{@port}#{path}"` !~ /200 OK/
+      raise "#{path} returned non 200 response code"
+    end
+  end
 
   # NOTE: we run the most expensive page first in the bench
 
@@ -210,15 +214,13 @@ begin
     a[50] < b[50] ? a : b
   end
 
-
   results = {}
   @best_of.times do
     tests.each do |name, url|
-      results[name] = best_of(bench(url, name),results[name])
+      results[name] = best_of(bench(url, name), results[name])
     end
   end
 
-
   puts "Your Results: (note for timings- percentile is first, duration is second in millisecs)"
 
   # Prevent using external facts because it breaks when running in the
@@ -226,8 +228,8 @@ begin
   Facter::Util::Config.external_facts_dirs = []
   facts = Facter.to_hash
 
-  facts.delete_if{|k,v|
-    !["operatingsystem","architecture","kernelversion",
+  facts.delete_if { |k, v|
+    !["operatingsystem", "architecture", "kernelversion",
     "memorysize", "physicalprocessorcount", "processor0",
     "virtual"].include?(k)
   }
@@ -238,15 +240,12 @@ begin
     YAML.load `ruby script/memstats.rb #{pid} --yaml`
   end
 
-
   mem = get_mem(pid)
 
-  results = results.merge({
-    "timings" => @timings,
-    "ruby-version" => "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}",
-    "rss_kb" => mem["rss_kb"],
-    "pss_kb" => mem["pss_kb"]
-  }).merge(facts)
+  results = results.merge("timings" => @timings,
+                          "ruby-version" => "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}",
+                          "rss_kb" => mem["rss_kb"],
+                          "pss_kb" => mem["pss_kb"]).merge(facts)
 
   if @unicorn
     child_pids = `ps --ppid #{pid} | awk '{ print $1; }' | grep -v PID`.split("\n")
@@ -270,7 +269,7 @@ begin
   end
 
   if @result_file
-    File.open(@result_file,"wb") do |f|
+    File.open(@result_file, "wb") do |f|
       f.write(results)
     end
   end
diff --git a/script/benchmarks/markdown/.gitignore b/script/benchmarks/markdown/.gitignore
new file mode 100644
index 0000000000..1fb9ef5745
--- /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 0000000000..74926c95a2
--- /dev/null
+++ b/script/benchmarks/markdown/bench.rb
@@ -0,0 +1,130 @@
+require 'benchmark/ips'
+require File.expand_path('../../../../config/environment', __FILE__)
+
+# set any flags here
+# MiniRacer::Platform.set_flags! :noturbo
+
+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
+
+# 27-07-2017 - Sam's NUC
+#
+# v8 5.7
+#
+#
+# tiny post sanitize: true
+#                         160.678  (±19.9%) i/s -    760.000  in   5.005630s
+# giant post sanitize: true
+#                         132.195  (±14.4%) i/s -    649.000  in   5.042695s
+# most features sanitize: true
+#                          56.205  (± 8.9%) i/s -    280.000  in   5.038138s
+# lots of mentions sanitize: true
+#                           0.318  (± 0.0%) i/s -      2.000  in   6.293644s
+# tiny post sanitize: false
+#                         404.304  (±20.8%) i/s -      1.920k in   5.019903s
+# giant post sanitize: false
+#                         327.721  (±11.9%) i/s -      1.624k in   5.033749s
+# most features sanitize: false
+#                          76.649  (±10.4%) i/s -    385.000  in   5.085552s
+# lots of mentions sanitize: false
+#                           0.306  (± 0.0%) i/s -      2.000  in   6.525968s
+# markdown it no extensions commonmark tiny post
+#                           5.871k (±19.1%) i/s -     28.544k in   5.073585s
+# markdown it no extensions commonmark giant post
+#                           1.006k (±12.5%) i/s -      4.960k in   5.041623s
+# markdown it no extensions commonmark most features
+#                           1.447k (± 8.9%) i/s -      7.205k in   5.029094s
+# markdown it no extensions commonmark lots of mentions
+#                           1.962k (± 8.3%) i/s -      9.850k in   5.061684s
+#
+#
+# v8 5.9
+#
+#
+# tiny post sanitize: true
+#                         156.179  (±16.0%) i/s -    765.000  in   5.059401s
+# giant post sanitize: true
+#                         129.972  (±10.8%) i/s -    650.000  in   5.071824s
+# most features sanitize: true
+#                          54.960  (± 9.1%) i/s -    275.000  in   5.051284s
+# lots of mentions sanitize: true
+#                           0.321  (± 0.0%) i/s -      2.000  in   6.251009s
+# tiny post sanitize: false
+#                         431.159  (±10.4%) i/s -      2.166k in   5.085303s
+# giant post sanitize: false
+#                         300.236  (±11.7%) i/s -      1.479k in   5.029557s
+# most features sanitize: false
+#                          73.808  (±10.8%) i/s -    371.000  in   5.092310s
+# lots of mentions sanitize: false
+#                           0.297  (± 0.0%) i/s -      2.000  in   6.729708s
+# markdown it no extensions commonmark tiny post
+#                           6.421k (±13.0%) i/s -     32.012k in   5.084672s
+# markdown it no extensions commonmark giant post
+#                         901.622  (± 9.2%) i/s -      4.452k in   5.016748s
+# markdown it no extensions commonmark most features
+#                           1.410k (± 6.5%) i/s -      7.112k in   5.070053s
+# markdown it no extensions commonmark lots of mentions
+#                           1.934k (± 6.4%) i/s -      9.672k in   5.025858s
+#
+# v8 noturbo 5.9
+#
+#
+# tiny post sanitize: true
+#                         105.152  (±17.1%) i/s -    512.000  in   5.034419s
+# giant post sanitize: true
+#                          97.002  (±12.4%) i/s -    480.000  in   5.038382s
+# most features sanitize: true
+#                          46.355  (±12.9%) i/s -    228.000  in   5.009251s
+# lots of mentions sanitize: true
+#                           0.278  (± 0.0%) i/s -      2.000  in   7.205837s
+# tiny post sanitize: false
+#                         201.166  (±13.4%) i/s -    990.000  in   5.017725s
+# giant post sanitize: false
+#                         174.212  (±10.9%) i/s -    867.000  in   5.040859s
+# most features sanitize: false
+#                          60.272  (±14.9%) i/s -    295.000  in   5.029353s
+# lots of mentions sanitize: false
+#                           0.309  (± 0.0%) i/s -      2.000  in   6.483433s
+# markdown it no extensions commonmark tiny post
+#                           6.331k (±13.8%) i/s -     31.065k in   5.023613s
+# markdown it no extensions commonmark giant post
+#                           1.045k (± 9.6%) i/s -      5.208k in   5.053733s
+# markdown it no extensions commonmark most features
+#                           1.448k (± 6.7%) i/s -      7.239k in   5.024831s
+# markdown it no extensions commonmark lots of mentions
+#                           1.986k (± 5.2%) i/s -      9.990k in   5.044624s
diff --git a/script/benchmarks/markdown/giant_post.md b/script/benchmarks/markdown/giant_post.md
new file mode 100644
index 0000000000..3da15173e4
--- /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 0000000000..39619d4b01
--- /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 0000000000..592a45cf09
--- /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/benchmarks/site_setting/bench.rb b/script/benchmarks/site_setting/bench.rb
new file mode 100644
index 0000000000..1ac3006013
--- /dev/null
+++ b/script/benchmarks/site_setting/bench.rb
@@ -0,0 +1,48 @@
+require 'benchmark/ips'
+require File.expand_path('../../../../config/environment', __FILE__)
+
+# Put pre conditions here
+# Used db but it's OK in the most cases
+
+# build the cache
+SiteSetting.title = SecureRandom.hex
+SiteSetting.default_locale = SiteSetting.default_locale == 'en' ? 'zh_CN' : 'en'
+SiteSetting.refresh!
+
+tests = [
+  ["current cache", lambda do
+    SiteSetting.title
+    SiteSetting.enable_sso
+  end
+  ],
+  ["change default locale with current cache refreshed", lambda do
+    SiteSetting.default_locale = SiteSetting.default_locale == 'en' ? 'zh_CN' : 'en'
+  end
+  ],
+  ["change site setting", lambda do
+    SiteSetting.title = SecureRandom.hex
+  end
+  ],
+]
+
+Benchmark.ips do |x|
+  tests.each do |test, proc|
+    x.report(test, proc)
+  end
+end
+
+# 2017-08-02 - Erick's Site Setting change
+
+# Before
+# Calculating -------------------------------------
+# current cache    167.518k (±12.1%) i/s -    822.983k in   5.000478s
+# change default locale with current cache refreshed
+# 174.173  (±16.7%) i/s -    845.000  in   5.015281s
+# change site setting    132.956  (±16.5%) i/s -    663.000  in   5.124766s
+
+# After
+# Calculating -------------------------------------
+# current cache    167.170k (±12.2%) i/s -    824.688k in   5.022784s
+# change default locale with current cache refreshed
+# 79.876  (±16.3%) i/s -    392.000  in   5.067448s
+# change site setting    129.085  (±13.2%) i/s -    636.000  in   5.032536s
diff --git a/script/benchmarks/site_setting/profile.rb b/script/benchmarks/site_setting/profile.rb
new file mode 100644
index 0000000000..7b7237055d
--- /dev/null
+++ b/script/benchmarks/site_setting/profile.rb
@@ -0,0 +1,32 @@
+require 'ruby-prof'
+
+def profile(&blk)
+  result = RubyProf.profile(&blk)
+  printer = RubyProf::GraphHtmlPrinter.new(result)
+  printer.print(STDOUT)
+end
+profile { '' } # loading profiler dependency
+
+require File.expand_path('../../../../config/environment', __FILE__)
+
+# warming up
+SiteSetting.title
+SiteSetting.enable_sso
+SiteSetting.default_locale = SiteSetting.default_locale == 'en' ? 'zh_CN' : 'en'
+SiteSetting.title = SecureRandom.hex
+
+profile do
+  SiteSetting.title
+end
+
+profile do
+  SiteSetting.enable_sso
+end
+
+profile do
+  SiteSetting.default_locale = SiteSetting.default_locale == 'en' ? 'zh_CN' : 'en'
+end
+
+profile do
+  SiteSetting.title = SecureRandom.hex
+end
diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb
index 7b25467838..66f61df4e0 100644
--- a/script/bulk_import/base.rb
+++ b/script/bulk_import/base.rb
@@ -10,7 +10,7 @@ module BulkImport; end
 class BulkImport::Base
 
   NOW ||= "now()".freeze
-  PRIVATE_OFFSET ||= 2 ** 30
+  PRIVATE_OFFSET ||= 2**30
 
   def initialize
     db = ActiveRecord::Base.connection_config
@@ -18,7 +18,8 @@ class BulkImport::Base
     @raw_connection = PG.connect(dbname: db[:database], host: db[:host_names]&.first, port: db[:port])
 
     @markdown = Redcarpet::Markdown.new(
-      Redcarpet::Render::HTML,
+      Redcarpet::Render::HTML.new(hard_wrap: true),
+      no_intra_emphasis: true,
       fenced_code_blocks: true,
       autolink: true
     )
@@ -93,7 +94,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
 
@@ -109,6 +111,9 @@ class BulkImport::Base
     @last_post_id = Post.unscoped.maximum(:id)
     @post_number_by_post_id = Post.unscoped.pluck(:id, :post_number).to_h
     @topic_id_by_post_id = Post.unscoped.pluck(:id, :topic_id).to_h
+
+    puts "Loading post actions indexes..."
+    @last_post_action_id = PostAction.unscoped.maximum(:id) || 0
   end
 
   def execute
@@ -119,9 +124,11 @@ 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})")
+    @raw_connection.exec("SELECT setval('#{PostAction.sequence_name}', #{@last_post_action_id})")
   end
 
   def group_id_from_imported_id(id); @groups[id.to_s]; end
@@ -138,11 +145,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
   }
@@ -163,7 +181,13 @@ class BulkImport::Base
 
   POST_COLUMNS ||= %i{
     id user_id last_editor_id topic_id post_number sort_order reply_to_post_number
-    raw cooked hidden word_count created_at last_version_at updated_at
+    like_count raw cooked hidden word_count created_at last_version_at updated_at
+  }
+
+  POST_ACTION_COLUMNS ||= %i{
+    id post_id user_id post_action_type_id deleted_at created_at updated_at
+    deleted_by_id related_post_id staff_took_action deferred_by_id targets_topic
+    agreed_at agreed_by_id deferred_at disagreed_at disagreed_by_id
   }
 
   TOPIC_ALLOWED_USER_COLUMNS ||= %i{
@@ -185,11 +209,14 @@ 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
   def create_topics(rows, &block); create_records(rows, "topic", TOPIC_COLUMNS, &block); end
   def create_posts(rows, &block); create_records(rows, "post", POST_COLUMNS, &block); end
+  def create_post_actions(rows, &block); create_records(rows, "post_action", POST_ACTION_COLUMNS, &block); end
   def create_topic_allowed_users(rows, &block); create_records(rows, "topic_allowed_user", TOPIC_ALLOWED_USER_COLUMNS, &block); end
 
   def process_group(group)
@@ -203,8 +230,8 @@ class BulkImport::Base
       group[:name] = group_name
     end
 
-    group[:title]      = group[:title].scrub.strip.presence
-    group[:bio_raw]    = group[:bio_raw].scrub.strip.presence
+    group[:title]      = group[:title].scrub.strip.presence if group[:title].present?
+    group[:bio_raw]    = group[:bio_raw].scrub.strip.presence if group[:bio_raw].present?
     group[:bio_cooked] = pre_cook(group[:bio_raw]) if group[:bio_raw].present?
     group[:created_at] ||= NOW
     group[:updated_at] ||= group[:created_at]
@@ -246,9 +273,42 @@ 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?
+    user_profile[:views] ||= 0
     user_profile
   end
 
@@ -259,7 +319,8 @@ class BulkImport::Base
   end
 
   def process_category(category)
-    @categories[category[:imported_id].to_s] = category[:id] = @last_category_id += 1
+    category[:id] ||= @last_category_id += 1
+    @categories[category[:imported_id].to_s] ||= category[:id]
     category[:name] = category[:name][0...50].scrub.strip
     # TODO: unique name
     category[:name_lower] = category[:name].downcase
@@ -300,6 +361,7 @@ class BulkImport::Base
     @topic_id_by_post_id[post[:id]] = post[:topic_id]
     post[:raw] = (post[:raw] || "").scrub.strip.presence || "<Empty imported post>"
     post[:raw] = process_raw post[:raw]
+    post[:like_count] ||= 0
     post[:cooked] = pre_cook post[:raw]
     post[:hidden] ||= false
     post[:word_count] = post[:raw].scan(/[[:word:]]+/).size
@@ -309,6 +371,15 @@ class BulkImport::Base
     post
   end
 
+  def process_post_action(post_action)
+    post_action[:id] ||= @last_post_action_id += 1
+    post_action[:staff_took_action] ||= false
+    post_action[:targets_topic] ||= false
+    post_action[:created_at] ||= NOW
+    post_action[:updated_at] ||= post_action[:created_at]
+    post_action
+  end
+
   def process_topic_allowed_user(topic_allowed_user)
     topic_allowed_user[:created_at] = NOW
     topic_allowed_user[:updated_at] = NOW
@@ -428,17 +499,17 @@ 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|
         mapped = yield(row)
         next unless mapped
         processed = send(process_method_name, mapped)
-        imported_ids << mapped[:imported_id]
+        imported_ids << mapped[:imported_id] unless mapped[:imported_id].nil?
+        imported_ids |= mapped[:imported_ids] unless mapped[:imported_ids].nil?
         @raw_connection.put_copy_data columns.map { |c| processed[c] }
         print "\r%7d - %6d/sec".freeze % [imported_ids.size, imported_ids.size.to_f / (Time.now - start)] if imported_ids.size % 5000 == 0
       end
@@ -457,6 +528,9 @@ class BulkImport::Base
         value: imported_id,
       }
     end
+  rescue => e
+    puts e.message
+    puts e.backtrace.join("\n")
   end
 
   def create_custom_fields(table, name, rows)
@@ -472,8 +546,8 @@ class BulkImport::Base
   end
 
   def fix_name(name)
+    name.scrub! if name.valid_encoding? == false
     return if name.blank?
-    name.scrub!
     name = ActiveSupport::Inflector.transliterate(name)
     name.gsub!(/[^\w.-]+/, "_")
     name.gsub!(/^\W+/, "")
@@ -492,11 +566,25 @@ class BulkImport::Base
   end
 
   def pre_cook(raw)
-    cooked = @markdown.render(raw).scrub.strip
+    cooked = raw
+
+    # Convert YouTube URLs to lazyYT DOMs before being transformed into links
+    cooked.gsub!(/\nhttps\:\/\/www.youtube.com\/watch\?v=(\w+)\n/) do
+      video_id = $1
+      result = <<-HTML
+        <div class="lazyYT" data-youtube-id="#{video_id}" data-width="480" data-height="270" data-parameters="feature=oembed&amp;wmode=opaque"></div>
+      HTML
+      result.strip
+    end
+
+    cooked = @markdown.render(cooked).scrub.strip
 
     cooked.gsub!(/\[QUOTE="?([^,"]+)(?:, post:(\d+), topic:(\d+))?"?\](.+?)\[\/QUOTE\]/im) do
-      username, post_id, topic_id = $1, $2, $3
-      quote = @markdown.render($4.presence || "").scrub.strip
+      username, post_id, topic_id, quote = $1, $2, $3, $4
+
+      quote = quote.scrub.strip
+      quote.gsub!(/^(<br>\n?)+/, "")
+      quote.gsub!(/(<br>\n?)+$/, "")
 
       if post_id.present? && topic_id.present?
         <<-HTML
diff --git a/script/bulk_import/phpbb_postgresql.rb b/script/bulk_import/phpbb_postgresql.rb
new file mode 100644
index 0000000000..3c171424b4
--- /dev/null
+++ b/script/bulk_import/phpbb_postgresql.rb
@@ -0,0 +1,482 @@
+require_relative "base"
+require "pg"
+require "htmlentities"
+require 'ruby-bbcode-to-md'
+
+class BulkImport::PhpBB < BulkImport::Base
+
+  SUSPENDED_TILL ||= Date.new(3000, 1, 1)
+  TABLE_PREFIX ||= ENV['TABLE_PREFIX'] || "phpbb_"
+  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
+
+    charset  = ENV["DB_CHARSET"] || "utf8"
+    database = ENV["DB_NAME"] || "flightaware"
+    password = ENV["DB_PASSWORD"] || "discourse"
+
+    @html_entities = HTMLEntities.new
+    @encoding = CHARSET_MAP[charset]
+
+    @client = PG.connect(dbname: database, password: password)
+
+    @smiley_map = {}
+    add_default_smilies
+  end
+
+  def execute
+    import_groups
+    import_users
+    import_group_users
+
+    import_user_emails
+    import_user_profiles
+
+    import_categories
+    import_topics
+    import_posts
+
+    import_private_topics
+    import_topic_allowed_users
+    import_private_posts
+  end
+
+  def import_groups
+    puts "Importing groups..."
+
+    groups = psql_query <<-SQL
+        SELECT group_id, group_name, group_desc
+          FROM #{TABLE_PREFIX}groups
+         WHERE group_id > #{@last_imported_group_id}
+      ORDER BY group_id
+    SQL
+
+    create_groups(groups) do |row|
+      {
+        imported_id: row["group_id"],
+        name: normalize_text(row["group_name"]),
+        bio_raw: normalize_text(row["group_desc"])
+      }
+    end
+  end
+
+  def import_users
+    puts "Importing users..."
+
+    users = psql_query <<-SQL
+      SELECT u.user_id, u.username, u.user_email, u.user_regdate, u.user_lastvisit, u.user_ip,
+        u.user_type, u.user_inactive_reason, g.group_id, g.group_name, b.ban_start, b.ban_end, b.ban_reason,
+        u.user_posts, u.user_website, u.user_from, u.user_birthday, u.user_avatar_type, u.user_avatar
+      FROM #{TABLE_PREFIX}users u
+        LEFT OUTER JOIN #{TABLE_PREFIX}groups g ON (g.group_id = u.group_id)
+        LEFT OUTER JOIN #{TABLE_PREFIX}banlist b ON (
+          u.user_id = b.ban_userid AND b.ban_exclude = 0 AND
+          b.ban_end = 0
+        )
+      WHERE u.user_id > #{@last_imported_user_id}
+      ORDER BY u.user_id
+    SQL
+
+    create_users(users) do |row|
+      u = {
+        imported_id: row["user_id"],
+        username: normalize_text(row["username"]),
+        created_at: Time.zone.at(row["user_regdate"].to_i),
+        last_seen_at: row["user_lastvisit"] == 0 ? Time.zone.at(row["user_regdate"].to_i) : Time.zone.at(row["user_lastvisit"].to_i),
+        trust_level: row["user_posts"] == 0 ? TrustLevel[0] : TrustLevel[1],
+        date_of_birth: parse_birthday(row["user_birthday"]),
+        primary_group_id: group_id_from_imported_id(row["group_id"])
+      }
+      u[:ip_address] = row["user_ip"][/\b(?:\d{1,3}\.){3}\d{1,3}\b/] if row["user_ip"].present?
+      if row["ban_start"]
+        u[:suspended_at] = Time.zone.at(row["ban_start"].to_i)
+        u[:suspended_till] = row["ban_end"].to_i > 0 ? Time.zone.at(row["ban_end"].to_i) : SUSPENDED_TILL
+      end
+      u
+    end
+  end
+
+  def import_user_emails
+    puts "Importing user emails..."
+
+    users = psql_query <<-SQL
+        SELECT user_id, user_email, user_regdate
+          FROM #{TABLE_PREFIX}users u
+         WHERE user_id > #{@last_imported_user_id}
+      ORDER BY user_id
+    SQL
+
+    create_user_emails(users) do |row|
+      {
+        imported_id: row["user_id"],
+        imported_user_id: row["user_id"],
+        email: row["user_email"],
+        created_at: Time.zone.at(row["user_regdate"].to_i)
+      }
+    end
+  end
+
+  def import_group_users
+    puts "Importing group users..."
+
+    group_users = psql_query <<-SQL
+      SELECT user_id, group_id
+        FROM #{TABLE_PREFIX}users u
+       WHERE user_id > #{@last_imported_user_id}
+    SQL
+
+    create_group_users(group_users) do |row|
+      {
+        group_id: group_id_from_imported_id(row["group_id"]),
+        user_id: user_id_from_imported_id(row["user_id"]),
+      }
+    end
+  end
+
+  def import_user_profiles
+    puts "Importing user profiles..."
+
+    user_profiles = psql_query <<-SQL
+        SELECT user_id, user_website, user_from
+          FROM #{TABLE_PREFIX}users
+         WHERE user_id > #{@last_imported_user_id}
+      ORDER BY user_id
+    SQL
+
+    create_user_profiles(user_profiles) do |row|
+      {
+        user_id: user_id_from_imported_id(row["user_id"]),
+        website: (URI.parse(row["user_website"]).to_s rescue nil),
+        location: row["user_from"],
+      }
+    end
+  end
+
+  def import_categories
+    puts "Importing categories..."
+
+    categories = psql_query(<<-SQL
+        SELECT forum_id, parent_id, forum_name, forum_desc
+          FROM #{TABLE_PREFIX}forums
+         WHERE forum_id > #{@last_imported_category_id}
+      ORDER BY parent_id, left_id
+    SQL
+    ).to_a
+
+    return if categories.empty?
+
+    parent_categories   = categories.select { |c| c["parent_id"].to_i == 0 }
+    children_categories = categories.select { |c| c["parent_id"].to_i != 0 }
+
+    puts "Importing parent categories..."
+    create_categories(parent_categories) do |row|
+      {
+        imported_id: row["forum_id"],
+        name: normalize_text(row["forum_name"]),
+        description: normalize_text(row["forum_desc"])
+      }
+    end
+
+    puts "Importing children categories..."
+    create_categories(children_categories) do |row|
+      {
+        imported_id: row["forum_id"],
+        name: normalize_text(row["forum_name"]),
+        description: normalize_text(row["forum_desc"]),
+        parent_category_id: category_id_from_imported_id(row["parent_id"])
+      }
+    end
+  end
+
+  def import_topics
+    puts "Importing topics..."
+
+    topics = psql_query <<-SQL
+        SELECT topic_id, topic_title, forum_id, topic_poster, topic_time, topic_views
+          FROM #{TABLE_PREFIX}topics
+         WHERE topic_id > #{@last_imported_topic_id}
+           AND EXISTS (SELECT 1 FROM #{TABLE_PREFIX}posts WHERE #{TABLE_PREFIX}posts.topic_id = #{TABLE_PREFIX}topics.topic_id)
+      ORDER BY topic_id
+    SQL
+
+    create_topics(topics) do |row|
+      {
+        imported_id: row["topic_id"],
+        title: normalize_text(row["topic_title"]),
+        category_id: category_id_from_imported_id(row["forum_id"]),
+        user_id: user_id_from_imported_id(row["topic_poster"]),
+        created_at: Time.zone.at(row["topic_time"].to_i),
+        views: row["topic_views"]
+      }
+    end
+  end
+
+  def import_posts
+    puts "Importing posts..."
+
+    posts = psql_query <<-SQL
+        SELECT p.post_id, p.topic_id, p.poster_id, p.post_time, p.post_text
+          FROM #{TABLE_PREFIX}posts p
+          JOIN #{TABLE_PREFIX}topics t ON t.topic_id = p.topic_id
+         WHERE p.post_id > #{@last_imported_post_id}
+      ORDER BY p.post_id
+    SQL
+
+    create_posts(posts) do |row|
+      {
+        imported_id: row["post_id"],
+        topic_id: topic_id_from_imported_id(row["topic_id"]),
+        user_id: user_id_from_imported_id(row["poster_id"]),
+        created_at: Time.zone.at(row["post_time"].to_i),
+        raw: process_raw_text(row["post_text"]),
+      }
+    end
+  end
+
+  def import_private_topics
+    puts "Importing private topics..."
+
+    @imported_topics = {}
+
+    topics = psql_query <<-SQL
+        SELECT msg_id, message_subject, author_id, to_address, message_time
+          FROM #{TABLE_PREFIX}privmsgs
+         WHERE msg_id > (#{@last_imported_private_topic_id - PRIVATE_OFFSET})
+      ORDER BY msg_id
+    SQL
+
+    create_topics(topics) do |row|
+      user_ids = get_message_recipients(row["author_id"], row["to_address"])
+      title = extract_pm_title(row["message_subject"])
+      key = [title, user_ids]
+
+      next if @imported_topics.has_key?(key) || title.blank?
+      @imported_topics[key] = row["msg_id"].to_i + PRIVATE_OFFSET
+
+      {
+        archetype: Archetype.private_message,
+        imported_id: row["msg_id"].to_i + PRIVATE_OFFSET,
+        title: normalize_text(title),
+        user_id: user_id_from_imported_id(row["author_id"].to_i),
+        created_at: Time.zone.at(row["message_time"].to_i)
+      }
+    end
+  end
+
+  def import_topic_allowed_users
+    puts "Importing topic allowed users..."
+
+    allowed_users = []
+
+    psql_query(<<-SQL
+        SELECT msg_id, author_id, to_address
+          FROM #{TABLE_PREFIX}privmsgs
+         WHERE msg_id > (#{@last_imported_private_topic_id - PRIVATE_OFFSET})
+      ORDER BY msg_id
+    SQL
+    ).each do |row|
+      next unless topic_id = topic_id_from_imported_id(row["msg_id"].to_i + PRIVATE_OFFSET)
+
+      user_ids = get_message_recipients(row["author_id"], row["to_address"])
+      user_ids.each do |id|
+        next unless user_id = user_id_from_imported_id(id.to_i)
+        allowed_users << [topic_id, user_id]
+      end
+    end
+
+    create_topic_allowed_users(allowed_users) do |row|
+      {
+        topic_id: row[0],
+        user_id: row[1]
+      }
+    end
+  end
+
+  def import_private_posts
+    puts "Importing private posts..."
+
+    posts = psql_query <<-SQL
+        SELECT msg_id, message_subject, author_id, to_address, message_time, message_text
+          FROM #{TABLE_PREFIX}privmsgs
+         WHERE msg_id > (#{@last_imported_private_topic_id - PRIVATE_OFFSET})
+      ORDER BY msg_id
+    SQL
+
+    create_posts(posts) do |row|
+      user_ids = get_message_recipients(row["author_id"], row["to_address"])
+      title = extract_pm_title(row["message_subject"])
+      key = [title, user_ids]
+
+      next unless topic_id = topic_id_from_imported_id(@imported_topics[key])
+      {
+        imported_id: row["msg_id"].to_i + PRIVATE_OFFSET,
+        topic_id: topic_id,
+        user_id: user_id_from_imported_id(row["author_id"].to_i),
+        created_at: Time.zone.at(row["message_time"].to_i),
+        raw: process_raw_text(row["message_text"])
+      }
+    end
+  end
+
+  def get_message_recipients(from, to)
+    user_ids = to.split(':')
+    user_ids.map! { |u| u[2..-1].to_i }
+    user_ids.push(from.to_i)
+    user_ids.uniq!
+    user_ids = user_ids.flatten.map(&:to_i).sort
+    user_ids
+  end
+
+  def extract_pm_title(title)
+    pm_title = CGI.unescapeHTML(title)
+    pm_title = title.gsub(/^Re\s*:\s*/i, "") rescue nil
+    pm_title
+  end
+
+  def normalize_text(text)
+    return nil unless text.present?
+    @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.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
+
+  def psql_query(sql)
+    @client.query(sql)
+  end
+
+  def process_raw_text(raw)
+    return "" if raw.blank?
+    text = raw.dup
+    text = CGI.unescapeHTML(text)
+
+    text.gsub!(/:(?:\w{8})\]/, ']')
+
+    # Some links look like this: <!-- m --><a class="postlink" href="http://www.onegameamonth.com">http://www.onegameamonth.com</a><!-- m -->
+    text.gsub!(/<!-- \w --><a(?:.+)href="(\S+)"(?:.*)>(.+)<\/a><!-- \w -->/i, '[\2](\1)')
+
+    # phpBB shortens link text like this, which breaks our markdown processing:
+    #   [http://answers.yahoo.com/question/index ... 223AAkkPli](http://answers.yahoo.com/question/index?qid=20070920134223AAkkPli)
+    #
+    # Work around it for now:
+    text.gsub!(/\[http(s)?:\/\/(www\.)?/i, '[')
+
+    # convert list tags to ul and list=1 tags to ol
+    # list=a is not supported, so handle it like list=1
+    # list=9 and list=x have the same result as list=1 and list=a
+    text.gsub!(/\[list\](.*?)\[\/list:u\]/mi, '[ul]\1[/ul]')
+    text.gsub!(/\[list=.*?\](.*?)\[\/list:o\]/mi, '[ol]\1[/ol]')
+
+    # convert *-tags to li-tags so bbcode-to-md can do its magic on phpBB's lists:
+    text.gsub!(/\[\*\](.*?)\[\/\*:m\]/mi, '[li]\1[/li]')
+
+    # [QUOTE="<username>"] -- add newline
+    text.gsub!(/(\[quote="[a-zA-Z\d]+"\])/i) { "#{$1}\n" }
+
+    # [/QUOTE] -- add newline
+    text.gsub!(/(\[\/quote\])/i) { "\n#{$1}" }
+
+    # :) is encoded as <!-- s:) --><img src="{SMILIES_PATH}/icon_e_smile.gif" alt=":)" title="Smile" /><!-- s:) -->
+    text.gsub!(/<!-- s(\S+) --><img src="\{SMILIES_PATH\}\/(.+?)" alt="(.*?)" title="(.*?)" \/><!-- s(?:\S+) -->/) do
+      smiley = $1
+      @smiley_map.fetch(smiley) do
+        # upload_smiley(smiley, $2, $3, $4) || smiley_as_text(smiley)
+        @smiley_map[smiley] = smiley
+      end
+    end
+
+    text = bbcode_to_md(text)
+
+    text
+  end
+
+  protected
+
+  def bbcode_to_md(text)
+    begin
+      text.bbcode_to_md(false)
+    rescue => e
+      puts "Problem converting \n#{text}\n using ruby-bbcode-to-md"
+      text
+    end
+  end
+
+  def add_default_smilies
+    {
+      [':D', ':-D', ':grin:'] => ':smiley:',
+      [':)', ':-)', ':smile:'] => ':slight_smile:',
+      [';)', ';-)', ':wink:'] => ':wink:',
+      [':(', ':-(', ':sad:'] => ':frowning:',
+      [':o', ':-o', ':eek:'] => ':astonished:',
+      [':shock:'] => ':open_mouth:',
+      [':?', ':-?', ':???:'] => ':confused:',
+      ['8-)', ':cool:'] => ':sunglasses:',
+      [':lol:'] => ':laughing:',
+      [':x', ':-x', ':mad:'] => ':angry:',
+      [':P', ':-P', ':razz:'] => ':stuck_out_tongue:',
+      [':oops:'] => ':blush:',
+      [':cry:'] => ':cry:',
+      [':evil:'] => ':imp:',
+      [':twisted:'] => ':smiling_imp:',
+      [':roll:'] => ':unamused:',
+      [':!:'] => ':exclamation:',
+      [':?:'] => ':question:',
+      [':idea:'] => ':bulb:',
+      [':arrow:'] => ':arrow_right:',
+      [':|', ':-|'] => ':neutral_face:',
+      [':geek:'] => ':nerd:'
+    }.each do |smilies, emoji|
+      smilies.each { |smiley| @smiley_map[smiley] = emoji }
+    end
+  end
+
+end
+
+BulkImport::PhpBB.new.run
diff --git a/script/bulk_import/vbulletin.rb b/script/bulk_import/vbulletin.rb
index 2121a47b2d..d9d394a716 100644
--- a/script/bulk_import/vbulletin.rb
+++ b/script/bulk_import/vbulletin.rb
@@ -1,10 +1,49 @@
 require_relative "base"
+require "set"
 require "mysql2"
 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 +52,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 +82,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
@@ -33,6 +93,8 @@ class BulkImport::VBulletin < BulkImport::Base
     import_topics
     import_posts
 
+    import_likes
+
     import_private_topics
     import_topic_allowed_users
     import_private_posts
@@ -51,9 +113,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 +134,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 +148,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 +303,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 +313,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 +337,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,
@@ -243,6 +357,8 @@ class BulkImport::VBulletin < BulkImport::Base
 
     posts = mysql_stream <<-SQL
         SELECT postid, post.threadid, parentid, userid, post.dateline, post.visible, pagetext
+               #{", post_thanks_amount" if @has_post_thanks}
+
           FROM post
           JOIN thread ON thread.threadid = post.threadid
          WHERE postid > #{@last_imported_post_id}
@@ -254,14 +370,47 @@ class BulkImport::VBulletin < BulkImport::Base
       replied_post_topic_id = topic_id_from_imported_post_id(row[2])
       reply_to_post_number = topic_id == replied_post_topic_id ? post_number_from_imported_id(row[2]) : nil
 
-      {
+      post = {
         imported_id: row[0],
         topic_id: topic_id,
         reply_to_post_number: reply_to_post_number,
         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]),
+      }
+
+      post[:like_count] = row[7] if @has_post_thanks
+      post
+    end
+  end
+
+  def import_likes
+    return unless @has_post_thanks
+    puts "Importing likes..."
+
+    @imported_likes = Set.new
+    @last_imported_post_id = 0
+
+    post_thanks = mysql_stream <<-SQL
+        SELECT postid, userid, date
+          FROM post_thanks
+         WHERE postid > #{@last_imported_post_id}
+      ORDER BY postid
+    SQL
+
+    create_post_actions(post_thanks) do |row|
+      post_id = post_id_from_imported_id(row[0])
+      user_id = user_id_from_imported_id(row[1])
+
+      next if post_id.nil? || user_id.nil?
+      next if @imported_likes.add?([post_id, user_id]).nil?
+
+      {
+        post_id: post_id_from_imported_id(row[0]),
+        user_id: user_id_from_imported_id(row[1]),
+        post_action_type_id: 2,
+        created_at: Time.zone.at(row[2])
       }
     end
   end
@@ -285,7 +434,6 @@ class BulkImport::VBulletin < BulkImport::Base
 
       next if @imported_topics.has_key?(key)
       @imported_topics[key] = row[0] + PRIVATE_OFFSET
-
       {
         archetype: Archetype.private_message,
         imported_id: row[0] + PRIVATE_OFFSET,
@@ -299,7 +447,7 @@ class BulkImport::VBulletin < BulkImport::Base
   def import_topic_allowed_users
     puts "Importing topic allowed users..."
 
-    allowed_users = []
+    allowed_users = Set.new
 
     mysql_stream(<<-SQL
         SELECT pmtextid, touserarray
@@ -345,22 +493,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/compile_hbs.rb b/script/compile_hbs.rb
new file mode 100644
index 0000000000..785aae6b38
--- /dev/null
+++ b/script/compile_hbs.rb
@@ -0,0 +1,24 @@
+ctx = MiniRacer::Context.new(timeout: 15000)
+ctx.eval("var self = this; #{File.read("#{Rails.root}/vendor/assets/javascripts/babel.js")}")
+ctx.eval(File.read(Ember::Source.bundled_path_for('ember-template-compiler.js')))
+ctx.eval("module = {}; exports = {};");
+ctx.attach("rails.logger.info", proc { |err| puts(">> #{err.to_s}") })
+ctx.attach("rails.logger.error", proc { |err| puts(">> #{err.to_s}") })
+ctx.eval <<JS
+console = {
+  prefix: "",
+  log: function(msg){ rails.logger.info(console.prefix + msg); },
+  error: function(msg){ rails.logger.error(console.prefix + msg); }
+}
+
+JS
+source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
+js_source = ::JSON.generate(source, quirks_mode: true)
+js = ctx.eval("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'] }).code")
+ctx.eval(js)
+
+if ARGV[0].present?
+  source = File.read(ARGV[0])
+  js_source = ::JSON.generate(source, quirks_mode: true)
+  puts ctx.eval("exports.compile(#{js_source})");
+end
diff --git a/script/diff_heaps.rb b/script/diff_heaps.rb
index e854f2f65a..947f4b02b3 100644
--- a/script/diff_heaps.rb
+++ b/script/diff_heaps.rb
@@ -30,11 +30,10 @@ end
 
 diff.group_by do |x|
   [x["type"], x["file"], x["line"]]
-end.map {|x,y|
- [x, y.count]
-}.sort{ |a,b|
- b[1] <=> a[1]
-}.each{ |x,y|
+end.map { |x, y|
+  [x, y.count]
+}.sort { |a, b|
+  b[1] <=> a[1]
+}.each { |x, y|
   puts "Leaked #{y} #{x[0]} objects at: #{x[1]}:#{x[2]}"
 }
-
diff --git a/script/discourse b/script/discourse
index c07d6685ef..13894282dd 100755
--- a/script/discourse
+++ b/script/discourse
@@ -3,8 +3,6 @@
 require "thor"
 
 class DiscourseCLI < Thor
-  class_option :verbose, default: false, aliases: :v
-
   desc "remap [--global,--regex] FROM TO", "Remap a string sequence accross all tables"
   long_desc <<-LONGDESC
     Replace a string sequence FROM with TO across all tables.
@@ -28,8 +26,8 @@ class DiscourseCLI < Thor
 
     discourse remap --regex "\[\/?color(=[^\]]*)*]" "" # removing "color" bbcodes
   LONGDESC
-  option :global, :type => :boolean
-  option :regex, :type => :boolean
+  option :global, type: :boolean
+  option :regex, type: :boolean
   def remap(from, to)
     load_rails
 
@@ -48,7 +46,7 @@ class DiscourseCLI < Thor
 
     if options[:global]
       RailsMultisite::ConnectionManagement.each_connection do |db|
-        puts "","Remapping tables on #{db}...",""
+        puts "", "Remapping tables on #{db}...", ""
         do_remap(from, to, options[:regex])
       end
     else
@@ -85,13 +83,19 @@ class DiscourseCLI < Thor
   end
 
   desc "restore", "Restore a Discourse backup"
-  def restore(filename=nil)
+  def restore(filename = nil)
+
+    if File.exist?('/usr/local/bin/discourse')
+      discourse = 'discourse'
+    else
+      discourse = './script/discourse'
+    end
 
     if !filename
       puts "You must provide a filename to restore. Did you mean one of the following?\n\n"
 
-      Dir["public/backups/default/*"].each do |f|
-        puts "script/discourse restore #{File.basename(f)}"
+      Dir["public/backups/default/*"].sort_by { |filename| File.mtime(filename) }.reverse.each do |f|
+        puts "#{discourse} restore #{File.basename(f)}"
       end
 
       return
@@ -110,7 +114,8 @@ class DiscourseCLI < Thor
       puts '', 'The filename argument was missing.', ''
       usage
     rescue BackupRestore::RestoreDisabledError
-      puts '', 'Restores are not allowed.', 'An admin needs to set allow_restore to true in the site settings before restores can be run.', ''
+      puts '', 'Restores are not allowed.', 'An admin needs to set allow_restore to true in the site settings before restores can be run.'
+      puts "Enable now with", '', "#{discourse} enable_restore", ''
       puts 'Restore cancelled.', ''
     end
 
@@ -174,16 +179,22 @@ class DiscourseCLI < Thor
     puts 'Requests sent. Clients will refresh on next navigation.'
   end
 
-  desc "export_category", "Export a category, all its topics, and all users who posted in those topics"
-  def export_category(category_id, filename=nil)
-    raise "Category id argument is missing!" unless category_id
-
+  desc "export_categories", "Export categories, all its topics, and all users who posted in those topics"
+  def export_categories(*category_ids)
+    puts "Starting export of categories...", ""
     load_rails
     load_import_export
-    ImportExport.export_category(category_id, filename)
+    ImportExport.export_categories(category_ids)
     puts "", "Done", ""
   end
 
+  desc "export_category", "Export a category, all its topics, and all users who posted in those topics"
+  def export_category(category_id)
+    raise "Category id argument is missing!" unless category_id
+
+    export_categories([category_id])
+  end
+
   desc "import_category", "Import a category, its topics and the users from the output of the export_category command"
   def import_category(filename)
     raise "File name argument missing!" unless filename
@@ -191,7 +202,7 @@ class DiscourseCLI < Thor
     puts "Starting import from #{filename}..."
     load_rails
     load_import_export
-    ImportExport.import_category(filename)
+    ImportExport.import(filename)
     puts "", "Done", ""
   end
 
@@ -211,7 +222,7 @@ class DiscourseCLI < Thor
     puts "Starting import from #{filename}..."
     load_rails
     load_import_export
-    ImportExport.import_topics(filename)
+    ImportExport.import(filename)
     puts "", "Done", ""
   end
 
@@ -225,7 +236,7 @@ class DiscourseCLI < Thor
     require File.expand_path(File.dirname(__FILE__) + "/../lib/import_export/import_export")
   end
 
-  def do_remap(from, to, regex=false)
+  def do_remap(from, to, regex = false)
     sql = "SELECT table_name, column_name
 FROM information_schema.columns
 WHERE table_schema='public' and (data_type like 'char%' or data_type like 'text%') and is_updatable = 'YES'"
@@ -257,7 +268,6 @@ WHERE table_schema='public' and (data_type like 'char%' or data_type like 'text%
     end
   end
 
-
 end
 
 DiscourseCLI.start(ARGV)
diff --git a/script/docker_test.rb b/script/docker_test.rb
index 5b21d82812..0d6a199238 100644
--- a/script/docker_test.rb
+++ b/script/docker_test.rb
@@ -1,3 +1,11 @@
+# This script is run in the discourse_test docker image
+# Available environment variables:
+# => NO_UPDATE        disables updating the source code within the discourse_test docker image
+# => 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"
+# => RUN_SMOKE_TESTS  executes the smoke tests instead of the regular tests from docker.rake
+# See lib/tasks/docker.rake and lib/tasks/smoke_test.rake for more information
+
 def run_or_fail(command)
   pid = Process.spawn(command)
   Process.wait(pid)
@@ -12,4 +20,8 @@ unless ENV['NO_UPDATE']
   run_or_fail("bundle")
 end
 
-run_or_fail("bundle exec rake docker:test")
+if ENV['RUN_SMOKE_TESTS']
+  run_or_fail("bundle exec rake smoke:test")
+else
+  run_or_fail("bundle exec rake docker:test")
+end
diff --git a/script/import_scripts/askbot.rb b/script/import_scripts/askbot.rb
index ec0cfc7cb8..5620f0aa29 100644
--- a/script/import_scripts/askbot.rb
+++ b/script/import_scripts/askbot.rb
@@ -24,11 +24,11 @@ class ImportScripts::MyAskBot < ImportScripts::Base
     @tagmap = []
     @td = PG::TextDecoder::TimestampWithTimeZone.new
     @client = PG.connect(
-      :dbname   => DB_NAME,
-      :host     => DB_HOST,
-      :port     => DB_PORT,
-      :user     => DB_USER,
-      :password => DB_PASS
+      dbname: DB_NAME,
+      host: DB_HOST,
+      port: DB_PORT,
+      user: DB_USER,
+      password: DB_PASS
     )
   end
 
@@ -79,7 +79,7 @@ class ImportScripts::MyAskBot < ImportScripts::Base
         tid = tag["thread_id"].to_i
         tnm = tag["name"].downcase
         if @tagmap[tid]
-          @tagmap[tid].push( tnm )
+          @tagmap[tid].push(tnm)
         else
           @tagmap[tid] = [ tnm ]
         end
@@ -110,7 +110,7 @@ class ImportScripts::MyAskBot < ImportScripts::Base
 
       break if users.ntuples() < 1
 
-      next if all_records_exist? :users, users.map {|u| u["id"].to_i}
+      next if all_records_exist? :users, users.map { |u| u["id"].to_i }
 
       create_users(users, total: total_count, offset: offset) do |user|
         {
@@ -155,7 +155,7 @@ class ImportScripts::MyAskBot < ImportScripts::Base
 
       break if posts.ntuples() < 1
 
-      next if all_records_exist? :posts, posts.map {|p| p["id"].to_i}
+      next if all_records_exist? :posts, posts.map { |p| p["id"].to_i }
 
       create_posts(posts, total: post_count, offset: offset) do |post|
         pid = post["id"]
@@ -174,7 +174,7 @@ class ImportScripts::MyAskBot < ImportScripts::Base
           id: pid,
           title: post["title"],
           category: cat,
-          custom_fields: {import_id: pid, import_thread_id: tid, import_tags: tags},
+          custom_fields: { import_id: pid, import_thread_id: tid, import_tags: tags },
           user_id: user_id_from_imported_user_id(post["author_id"]) || Discourse::SYSTEM_USER_ID,
           created_at: Time.zone.at(@td.decode(post["added_at"])),
           raw: post["text"],
@@ -210,7 +210,7 @@ class ImportScripts::MyAskBot < ImportScripts::Base
 
       break if posts.ntuples() < 1
 
-      next if all_records_exist? :posts, posts.map {|p| p["id"].to_i}
+      next if all_records_exist? :posts, posts.map { |p| p["id"].to_i }
 
       create_posts(posts, total: post_count, offset: offset) do |post|
         tid = post["thread_id"].to_i
@@ -220,7 +220,7 @@ class ImportScripts::MyAskBot < ImportScripts::Base
         {
           id: pid,
           topic_id: parent[:topic_id],
-          custom_fields: {import_id: pid},
+          custom_fields: { import_id: pid },
           user_id: user_id_from_imported_user_id(post["author_id"]) || Discourse::SYSTEM_USER_ID,
           created_at: Time.zone.at(@td.decode(post["added_at"])),
           raw: post["text"]
@@ -230,47 +230,48 @@ class ImportScripts::MyAskBot < ImportScripts::Base
   end
 
   def post_process_posts
-      puts "", "Postprocessing posts..."
-      current = 0
-      max = Post.count
-      # Rewrite internal links; e.g.
-      # ask.cvxr.com/question/(\d+)/[^'"}]*
-      # I am sure this is incomplete, but we didn't make heavy use of internal
-      # links on our site.
-      tmp = Regexp.quote("http://" << OLD_SITE)
-      r1 = /"(#{tmp})?\/question\/(\d+)\/[a-zA-Z-]*\/?"/
-      r2 = /\((#{tmp})?\/question\/(\d+)\/[a-zA-Z-]*\/?\)/
-      r3 = /<?#tmp\/question\/(\d+)\/[a-zA-Z-]*\/?>?/
-      Post.find_each do |post|
-        raw = post.raw.gsub(r1) do
-          if topic = topic_lookup_from_imported_post_id($2)
-            "\"#{topic[:url]}\""
-          else
-            $&
-          end
+    puts "", "Postprocessing posts..."
+    current = 0
+    max = Post.count
+    # Rewrite internal links; e.g.
+    # ask.cvxr.com/question/(\d+)/[^'"}]*
+    # I am sure this is incomplete, but we didn't make heavy use of internal
+    # links on our site.
+    tmp = Regexp.quote("http://" << OLD_SITE)
+    r1 = /"(#{tmp})?\/question\/(\d+)\/[a-zA-Z-]*\/?"/
+    r2 = /\((#{tmp})?\/question\/(\d+)\/[a-zA-Z-]*\/?\)/
+    r3 = /<?#tmp\/question\/(\d+)\/[a-zA-Z-]*\/?>?/
+    Post.find_each do |post|
+      raw = post.raw.gsub(r1) do
+        if topic = topic_lookup_from_imported_post_id($2)
+          "\"#{topic[:url]}\""
+        else
+          $&
         end
-        raw = raw.gsub(r2) do
-          if topic = topic_lookup_from_imported_post_id($2)
-            "(#{topic[:url]})"
-          else
-            $&
-          end
-        end
-        raw = raw.gsub(r3) do
-           if topic = topic_lookup_from_imported_post_id($1)
-            trec = Topic.find_by(id: topic[:topic_id])
-            "[#{trec.title}](#{topic[:url]})"
-          else
-            $&
-          end
-        end
-        if raw != post.raw
-          post.raw = raw
-          post.save
-        end
-        print_status(current += 1, max)
       end
+      raw = raw.gsub(r2) do
+        if topic = topic_lookup_from_imported_post_id($2)
+          "(#{topic[:url]})"
+        else
+          $&
+        end
+      end
+      raw = raw.gsub(r3) do
+        if topic = topic_lookup_from_imported_post_id($1)
+          trec = Topic.find_by(id: topic[:topic_id])
+          "[#{trec.title}](#{topic[:url]})"
+        else
+          $&
+        end
+      end
+
+      if raw != post.raw
+        post.raw = raw
+        post.save
+      end
+      print_status(current += 1, max)
     end
   end
+end
 
 ImportScripts::MyAskBot.new.perform
diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index 616a534a5d..4d177156b4 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -30,7 +30,7 @@ class ImportScripts::Base
     @bbcode_to_md = true if use_bbcode_to_md?
     @site_settings_during_import = {}
     @old_site_settings = {}
-    @start_times = {import: Time.now}
+    @start_times = { import: Time.now }
   end
 
   def preload_i18n
@@ -56,7 +56,7 @@ class ImportScripts::Base
     reset_topic_counters
 
     elapsed = Time.now - @start_times[:import]
-    puts '', '', 'Done (%02dh %02dmin %02dsec)' % [elapsed/3600, elapsed/60%60, elapsed%60]
+    puts '', '', 'Done (%02dh %02dmin %02dsec)' % [elapsed / 3600, elapsed / 60 % 60, elapsed % 60]
 
   ensure
     reset_site_settings
@@ -72,6 +72,8 @@ class ImportScripts::Base
       min_private_message_title_length: 1,
       allow_duplicate_topic_titles: true,
       disable_emails: true,
+      max_attachment_size_kb: 102400,
+      max_image_size_kb: 102400,
       authorized_extensions: '*'
     }
   end
@@ -118,7 +120,7 @@ class ImportScripts::Base
     delegate method_name, to: :@lookup
   end
 
-  def create_admin(opts={})
+  def create_admin(opts = {})
     admin = User.new
     admin.email = opts[:email] || "sam.saffron@gmail.com"
     admin.username = opts[:username] || "sam"
@@ -140,11 +142,11 @@ class ImportScripts::Base
   # Required fields are :id and :name, where :id is the id of the
   # group in the original datasource. The given id will not be used
   # to create the Discourse group record.
-  def create_groups(results, opts={})
+  def create_groups(results, opts = {})
     created = 0
     skipped = 0
     failed = 0
-    total = opts[:total] || results.size
+    total = opts[:total] || results.count
 
     results.each do |result|
       g = yield(result)
@@ -171,12 +173,12 @@ class ImportScripts::Base
   end
 
   def create_group(opts, import_id)
-    opts = opts.dup.tap {|o| o.delete(:id) }
+    opts = opts.dup.tap { |o| o.delete(:id) }
     import_name = opts[:name]
     opts[:name] = UserNameSuggester.suggest(import_name)
 
     existing = Group.where(name: opts[:name]).first
-    return existing if existing and existing.custom_fields["import_id"].to_i == import_id.to_i
+    return existing if existing && existing.custom_fields["import_id"].to_s == (import_id.to_s)
     g = existing || Group.new(opts)
     g.custom_fields["import_id"] = import_id
     g.custom_fields["import_name"] = import_name
@@ -196,14 +198,14 @@ class ImportScripts::Base
 
     existing = "#{type.to_s.classify}CustomField".constantize
     existing = existing.where(name: 'import_id')
-                       .joins('JOIN import_ids ON val = value')
-                       .count
+      .joins('JOIN import_ids ON val = value')
+      .count
     if existing == import_ids.length
       puts "Skipping #{import_ids.length} already imported #{type}"
       return true
     end
   ensure
-    connection.exec('DROP TABLE import_ids')
+    connection.exec('DROP TABLE import_ids') unless connection.nil?
   end
 
   def created_user(user)
@@ -216,11 +218,11 @@ class ImportScripts::Base
   # Required fields are :id and :email, where :id is the id of the
   # user in the original datasource. The given id will not be used to
   # create the Discourse user record.
-  def create_users(results, opts={})
+  def create_users(results, opts = {})
     created = 0
     skipped = 0
     failed = 0
-    total = opts[:total] || results.size
+    total = opts[:total] || results.count
 
     results.each do |result|
       u = yield(result)
@@ -267,8 +269,8 @@ 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
-    return existing if existing && (merge || existing.custom_fields["import_id"].to_i == import_id.to_i)
+    existing = find_existing_user(opts[:email], opts[:username])
+    return existing if existing && (merge || existing.custom_fields["import_id"].to_s == import_id.to_s)
 
     bio_raw = opts.delete(:bio_raw)
     website = opts.delete(:website)
@@ -277,6 +279,7 @@ class ImportScripts::Base
 
     original_username = opts[:username]
     original_name = opts[:name]
+    original_email = opts[:email] = opts[:email].downcase
 
     # Allow the || operations to work with empty strings ''
     opts[:username] = nil if opts[:username].blank?
@@ -292,9 +295,13 @@ class ImportScripts::Base
       opts[:username] = UserNameSuggester.suggest(opts[:username] || opts[:name].presence || opts[:email])
     end
 
+    unless opts[:email].match(EmailValidator.email_regex)
+      opts[:email] = "invalid#{SecureRandom.hex}@no-email.invalid"
+      puts "Invalid email #{original_email} for #{opts[:username]}. Using: #{opts[:email]}"
+    end
+
     opts[:name] = original_username if original_name.blank? && opts[:username] != original_username
 
-    opts[:email] = opts[:email].downcase
     opts[:trust_level] = TrustLevel[1] unless opts[:trust_level]
     opts[:active] = opts.fetch(:active, true)
     opts[:import_mode] = true
@@ -306,13 +313,18 @@ class ImportScripts::Base
     u.custom_fields["import_username"] = opts[:username] if original_username.present?
     u.custom_fields["import_avatar_url"] = avatar_url if avatar_url.present?
     u.custom_fields["import_pass"] = opts[:password] if opts[:password].present?
+    u.custom_fields["import_email"] = original_email if original_email != opts[:email]
 
     begin
       User.transaction do
         u.save!
         if bio_raw.present? || website.present? || location.present?
+          if website.present?
+            u.user_profile.website = website
+            u.user_profile.website = nil unless u.user_profile.valid?
+          end
+
           u.user_profile.bio_raw = bio_raw[0..2999] if bio_raw.present?
-          u.user_profile.website = website unless website.blank? || website !~ UserProfile::WEBSITE_REGEXP
           u.user_profile.location = location if location.present?
           u.user_profile.save!
         end
@@ -323,8 +335,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
@@ -335,11 +347,36 @@ class ImportScripts::Base
       end
     end
 
+    if u.custom_fields['import_email']
+      u.suspended_at = Time.zone.at(Time.now)
+      u.suspended_till = 200.years.from_now
+      ban_reason = 'Invalid email address on import'
+      u.active = false
+      u.save!
+
+      user_option = u.user_option
+      user_option.email_digests = false
+      user_option.email_private_messages = false
+      user_option.email_direct = false
+      user_option.email_always = false
+      user_option.save!
+      if u.save
+        StaffActionLogger.new(Discourse.system_user).log_user_suspend(u, ban_reason)
+      else
+        Rails.logger.error("Failed to suspend user #{u.username}. #{u.errors.try(:full_messages).try(:inspect)}")
+      end
+
+    end
+
     post_create_action.try(:call, u) if u.persisted?
 
     u # If there was an error creating the user, u.errors has the messages
   end
 
+  def find_existing_user(email, username)
+    User.joins(:user_emails).where("user_emails.email = ? OR username = ?", email.downcase, username).first
+  end
+
   def created_category(category)
     # override if needed
   end
@@ -353,7 +390,7 @@ class ImportScripts::Base
   def create_categories(results)
     created = 0
     skipped = 0
-    total = results.size
+    total = results.count
 
     results.each do |c|
       params = yield(c)
@@ -422,10 +459,10 @@ class ImportScripts::Base
   # Attributes will be passed to the PostCreator.
   # Topics should give attributes title and category.
   # Replies should provide topic_id. Use topic_lookup_from_imported_post_id to find the topic.
-  def create_posts(results, opts={})
+  def create_posts(results, opts = {})
     skipped = 0
     created = 0
-    total = opts[:total] || results.size
+    total = opts[:total] || results.count
     start_time = get_start_time("posts-#{total}") # the post count should be unique enough to differentiate between posts and PMs
 
     results.each do |r|
@@ -502,10 +539,10 @@ class ImportScripts::Base
   # Block should return a hash with the attributes for the bookmark.
   # Required fields are :user_id and :post_id, where both ids are
   # the values in the original datasource.
-  def create_bookmarks(results, opts={})
+  def create_bookmarks(results, opts = {})
     created = 0
     skipped = 0
-    total = opts[:total] || results.size
+    total = opts[:total] || results.count
 
     user = User.new
     post = Post.new
@@ -539,7 +576,7 @@ class ImportScripts::Base
     [created, skipped]
   end
 
-  def close_inactive_topics(opts={})
+  def close_inactive_topics(opts = {})
     num_days = opts[:days] || 30
     puts '', "Closing topics that have been inactive for more than #{num_days} days."
 
@@ -775,7 +812,7 @@ class ImportScripts::Base
   end
 
   def get_start_time(key)
-    @start_times.fetch(key) {|k| @start_times[k] = Time.now}
+    @start_times.fetch(key) { |k| @start_times[k] = Time.now }
   end
 
   def batches(batch_size)
diff --git a/script/import_scripts/base/csv_helper.rb b/script/import_scripts/base/csv_helper.rb
index c505ce7101..e70f850bc4 100644
--- a/script/import_scripts/base/csv_helper.rb
+++ b/script/import_scripts/base/csv_helper.rb
@@ -10,7 +10,7 @@ module ImportScripts
       end
 
       def initialize(cols)
-        cols.each_with_index do |col,idx|
+        cols.each_with_index do |col, idx|
           self.class.send(:define_method, col.downcase.gsub(/[\W]/, '_').squeeze('_')) do
             @row[idx]
           end
@@ -72,4 +72,4 @@ module ImportScripts
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/script/import_scripts/bbpress.rb b/script/import_scripts/bbpress.rb
index e91b8ef8ae..9059270f6f 100644
--- a/script/import_scripts/bbpress.rb
+++ b/script/import_scripts/bbpress.rb
@@ -1,7 +1,6 @@
 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
@@ -23,6 +22,8 @@ class ImportScripts::Bbpress < ImportScripts::Base
   def initialize
     super
 
+    @he = HTMLEntities.new
+
     @client = Mysql2::Client.new(
       host: BB_PRESS_HOST,
       username: BB_PRESS_USER,
@@ -36,21 +37,33 @@ class ImportScripts::Bbpress < ImportScripts::Base
     import_anonymous_users
     import_categories
     import_topics_and_posts
+    import_private_messages
+    create_permalinks
   end
 
   def import_users
     puts "", "importing users..."
 
     last_user_id = -1
-    total_users = bbpress_query("SELECT COUNT(*) count FROM #{BB_PRESS_PREFIX}users WHERE user_email LIKE '%@%'").first["count"]
+    total_users = bbpress_query(<<-SQL
+      SELECT COUNT(DISTINCT(u.id)) AS cnt
+      FROM #{BB_PRESS_PREFIX}users u
+      LEFT JOIN #{BB_PRESS_PREFIX}posts p ON p.post_author = u.id
+      WHERE p.post_type IN ('forum', 'reply', 'topic')
+        AND user_email LIKE '%@%'
+    SQL
+    ).first["cnt"]
 
     batches(BATCH_SIZE) do |offset|
       users = bbpress_query(<<-SQL
-        SELECT id, user_nicename, display_name, user_email, user_registered, user_url
-          FROM #{BB_PRESS_PREFIX}users
+        SELECT u.id, user_nicename, display_name, user_email, user_registered, user_url, user_pass
+          FROM #{BB_PRESS_PREFIX}users u
+          LEFT JOIN #{BB_PRESS_PREFIX}posts p ON p.post_author = u.id
          WHERE user_email LIKE '%@%'
-           AND id > #{last_user_id}
-      ORDER BY id
+           AND p.post_type IN ('forum', 'reply', 'topic')
+           AND u.id > #{last_user_id}
+      GROUP BY u.id
+      ORDER BY u.id
          LIMIT #{BATCH_SIZE}
       SQL
       ).to_a
@@ -86,6 +99,7 @@ class ImportScripts::Bbpress < ImportScripts::Base
         {
           id: u["id"].to_i,
           username: u["user_nicename"],
+          password: u["user_pass"],
           email: u["user_email"].downcase,
           name: u["display_name"].presence || u['user_nicename'],
           created_at: u["user_registered"],
@@ -125,7 +139,7 @@ class ImportScripts::Bbpress < ImportScripts::Base
     end
 
     # gather every existent username
-    anon_posts.each do |id,post|
+    anon_posts.each do |id, post|
       anon_names[post['name']] = Hash.new if not anon_names[post['name']]
       # overwriting email address, one user can only use one email address
       anon_names[post['name']]['email'] = post['email']
@@ -133,7 +147,7 @@ class ImportScripts::Bbpress < ImportScripts::Base
     end
 
     # make sure every user name has a unique email address
-    anon_names.each do |k,name|
+    anon_names.each do |k, name|
       if not emails.include? name['email']
         emails.push ( name['email'])
       else
@@ -141,7 +155,6 @@ class ImportScripts::Bbpress < ImportScripts::Base
       end
     end
 
-
     create_users(anon_names) do |k, n|
       {
         id: k,
@@ -243,8 +256,7 @@ class ImportScripts::Bbpress < ImportScripts::Base
         }
 
         if post[:raw].present?
-          post[:raw].gsub!("<pre><code>", "```\n")
-          post[:raw].gsub!("</code></pre>", "\n```")
+          post[:raw].gsub!(/\<pre\>\<code(=[a-z]*)?\>(.*?)\<\/code\>\<\/pre\>/im) { "```\n#{@he.decode($2)}\n```" }
         end
 
         if p["post_type"] == "topic"
@@ -265,6 +277,130 @@ class ImportScripts::Bbpress < ImportScripts::Base
     end
   end
 
+  def create_permalinks
+    puts "", "creating permalinks..."
+
+    last_topic_id = -1
+    total_topics = bbpress_query(<<-SQL
+      SELECT COUNT(*) count
+        FROM #{BB_PRESS_PREFIX}posts
+       WHERE post_status <> 'spam'
+         AND post_type IN ('topic')
+    SQL
+    ).first["count"]
+
+    batches(BATCH_SIZE) do |offset|
+      topics = bbpress_query(<<-SQL
+        SELECT id,
+               guid
+          FROM #{BB_PRESS_PREFIX}posts
+         WHERE post_status <> 'spam'
+           AND post_type IN ('topic')
+           AND id > #{last_topic_id}
+      ORDER BY id
+         LIMIT #{BATCH_SIZE}
+      SQL
+      ).to_a
+      break if topics.empty?
+
+      topics.each do |t|
+        topic = topic_lookup_from_imported_post_id(t['id'])
+        Permalink.create(url: URI.parse(t['guid']).path.chomp('/'), topic_id: topic[:topic_id]) rescue nil
+      end
+      last_topic_id = topics[-1]["id"].to_i
+    end
+  end
+
+  def import_private_messages
+    puts "", "importing private messages..."
+
+    last_post_id = -1
+    total_posts = bbpress_query("SELECT COUNT(*) count FROM #{BB_PRESS_PREFIX}bp_messages_messages").first["count"]
+
+    threads = {}
+
+    total_count = bbpress_query("SELECT COUNT(*) count FROM #{BB_PRESS_PREFIX}bp_messages_recipients").first["count"]
+    current_count = 0
+
+    batches(BATCH_SIZE) do |offset|
+      rows = bbpress_query(<<-SQL
+        SELECT thread_id, user_id
+          FROM #{BB_PRESS_PREFIX}bp_messages_recipients
+      ORDER BY id
+         LIMIT #{BATCH_SIZE}
+        OFFSET #{offset}
+      SQL
+      ).to_a
+
+      break if rows.empty?
+
+      rows.each do |row|
+        current_count += 1
+        print_status(current_count, total_count, get_start_time('private_messages'))
+
+        threads[row['thread_id']] ||= {
+          target_user_ids: [],
+          imported_topic_id: nil
+        }
+        user_id = user_id_from_imported_user_id(row['user_id'])
+        if user_id && !threads[row['thread_id']][:target_user_ids].include?(user_id)
+          threads[row['thread_id']][:target_user_ids] << user_id
+        end
+      end
+    end
+
+    batches(BATCH_SIZE) do |offset|
+      posts =  bbpress_query(<<-SQL
+        SELECT id,
+               thread_id,
+               date_sent,
+               sender_id,
+               subject,
+               message
+          FROM wp_bp_messages_messages
+         WHERE id > #{last_post_id}
+      ORDER BY thread_id, date_sent
+         LIMIT #{BATCH_SIZE}
+      SQL
+      ).to_a
+
+      break if posts.empty?
+
+      last_post_id = posts[-1]["id"].to_i
+
+      create_posts(posts, total: total_posts, offset: offset) do |post|
+        if tcf = TopicCustomField.where(name: 'bb_thread_id', value: post['thread_id']).first
+          {
+            id: "pm#{post['id']}",
+            topic_id: threads[post['thread_id']][:imported_topic_id],
+            user_id: user_id_from_imported_user_id(post['sender_id']) || find_user_by_import_id(post['sender_id'])&.id || -1,
+            raw: post['message'],
+            created_at: post['date_sent'],
+          }
+        else
+          # First post of the thread
+          {
+            id: "pm#{post['id']}",
+            archetype: Archetype.private_message,
+            user_id: user_id_from_imported_user_id(post['sender_id']) || find_user_by_import_id(post['sender_id'])&.id || -1,
+            title: post['subject'],
+            raw: post['message'],
+            created_at: post['date_sent'],
+            target_usernames: User.where(id: threads[post['thread_id']][:target_user_ids]).pluck(:username),
+            post_create_action: proc do |new_post|
+              if topic = new_post.topic
+                threads[post['thread_id']][:imported_topic_id] = topic.id
+                TopicCustomField.create(topic_id: topic.id, name: 'bb_thread_id', value: post['thread_id'])
+              else
+                puts "Error in post_create_action! Can't find topic!"
+              end
+            end
+          }
+        end
+      end
+    end
+  end
+
   def bbpress_query(sql)
     @client.query(sql, cache_rows: false)
   end
diff --git a/script/import_scripts/bespoke_1.rb b/script/import_scripts/bespoke_1.rb
index 5cd1744212..0026ff30ac 100644
--- a/script/import_scripts/bespoke_1.rb
+++ b/script/import_scripts/bespoke_1.rb
@@ -43,7 +43,7 @@ class ImportScripts::Bespoke < ImportScripts::Base
     end
 
     def initialize(cols)
-      cols.each_with_index do |col,idx|
+      cols.each_with_index do |col, idx|
         self.class.send(:define_method, col) do
           @row[idx]
         end
@@ -71,7 +71,7 @@ class ImportScripts::Bespoke < ImportScripts::Base
     File.open(filename).each_line do |line|
 
       # escaping is mental here
-      line.gsub!(/\\(.{1})/){|m| m[-1] == '"'? '""': m[-1]}
+      line.gsub!(/\\(.{1})/) { |m| m[-1] == '"' ? '""' : m[-1] }
       line.strip!
 
       current_row << "\n" unless current_row.empty?
@@ -119,7 +119,7 @@ class ImportScripts::Bespoke < ImportScripts::Base
   end
 
   def total_rows(table)
-    File.foreach("#{@path}/#{table}.csv").inject(0) {|c, line| c+1} - 1
+    File.foreach("#{@path}/#{table}.csv").inject(0) { |c, line| c + 1 } - 1
   end
 
   def import_users
@@ -169,7 +169,7 @@ class ImportScripts::Bespoke < ImportScripts::Base
   def import_categories
     rows = []
     csv_parse("categories") do |row|
-      rows << {id: row.id, name: row.name, description: row.description}
+      rows << { id: row.id, name: row.name, description: row.description }
     end
 
     create_categories(rows) do |row|
@@ -181,46 +181,46 @@ class ImportScripts::Bespoke < ImportScripts::Base
     # purple and #1223f3
     raw.gsub!(/\[color=[#a-z0-9]+\]/i, "")
     raw.gsub!(/\[\/color\]/i, "")
-    raw.gsub!(/\[signature\].+\[\/signature\]/im,"")
+    raw.gsub!(/\[signature\].+\[\/signature\]/im, "")
     raw
   end
 
   def import_post_batch!(posts, topics, offset, total)
-      create_posts(posts, total: total, offset: offset) do |post|
+    create_posts(posts, total: total, offset: offset) do |post|
 
-        mapped = {}
+      mapped = {}
 
-        mapped[:id] = post[:id]
-        mapped[:user_id] = user_id_from_imported_user_id(post[:user_id]) || -1
-        mapped[:raw] = post[:body]
-        mapped[:created_at] = post[:created_at]
+      mapped[:id] = post[:id]
+      mapped[:user_id] = user_id_from_imported_user_id(post[:user_id]) || -1
+      mapped[:raw] = post[:body]
+      mapped[:created_at] = post[:created_at]
 
-        topic = topics[post[:topic_id]]
+      topic = topics[post[:topic_id]]
 
-        unless topic[:post_id]
-          mapped[:category] = category_id_from_imported_category_id(topic[:category_id])
-          mapped[:title] = post[:title]
-          topic[:post_id] = post[:id]
-        else
-          parent = topic_lookup_from_imported_post_id(topic[:post_id])
-          next unless parent
+      unless topic[:post_id]
+        mapped[:category] = category_id_from_imported_category_id(topic[:category_id])
+        mapped[:title] = post[:title]
+        topic[:post_id] = post[:id]
+      else
+        parent = topic_lookup_from_imported_post_id(topic[:post_id])
+        next unless parent
 
-          mapped[:topic_id] = parent[:topic_id]
+        mapped[:topic_id] = parent[:topic_id]
 
-          reply_to_post_id = post_id_from_imported_post_id(post[:reply_id])
-          if reply_to_post_id
-            reply_to_post_number = @post_number_map[reply_to_post_id]
-            if reply_to_post_number && reply_to_post_number > 1
-              mapped[:reply_to_post_number] = reply_to_post_number
-            end
+        reply_to_post_id = post_id_from_imported_post_id(post[:reply_id])
+        if reply_to_post_id
+          reply_to_post_number = @post_number_map[reply_to_post_id]
+          if reply_to_post_number && reply_to_post_number > 1
+            mapped[:reply_to_post_number] = reply_to_post_number
           end
         end
-
-        next if topic[:deleted] or post[:deleted]
-
-        mapped
       end
 
+      next if topic[:deleted] || post[:deleted]
+
+      mapped
+    end
+
       posts.clear
   end
 
@@ -262,7 +262,7 @@ class ImportScripts::Bespoke < ImportScripts::Base
         created_at: DateTime.parse(row.dcreate)
       }
       posts << row
-      count+=1
+      count += 1
 
       if posts.length > 0 && posts.length % BATCH_SIZE == 0
         import_post_batch!(posts, topic_map, count - posts.length, total)
@@ -274,7 +274,6 @@ class ImportScripts::Bespoke < ImportScripts::Base
     exit
   end
 
-
 end
 
 unless ARGV[0] && Dir.exist?(ARGV[0])
diff --git a/script/import_scripts/discuz_x.rb b/script/import_scripts/discuz_x.rb
index 791b6c38da..8ee30b359c 100644
--- a/script/import_scripts/discuz_x.rb
+++ b/script/import_scripts/discuz_x.rb
@@ -176,11 +176,11 @@ class ImportScripts::DiscuzX < ImportScripts::Base
           last_posted_at: user['last_posted_at'],
           moderator: @moderator_group_id.include?(user['group_id']),
           admin: @admin_group_id.include?(user['group_id']),
-          website: (user['website'] and user['website'].include?('.')) ? user['website'].strip : ( user['qq'] and user['qq'].strip == user['qq'].strip.to_i and user['qq'].strip.to_i > 10000 ) ? 'http://user.qzone.qq.com/' + user['qq'].strip : nil,
-          bio_raw: first_exists((user['bio'] and CGI.unescapeHTML(user['bio'])), user['sightml'], user['spacenote']).strip[0,3000],
-          location: first_exists(user['address'], (!user['resideprovince'].blank? ? [user['resideprovince'],  user['residecity'], user['residedist'], user['residecommunity']] : [user['birthprovince'],  user['birthcity'], user['birthdist'], user['birthcommunity']]).reject{|location|location.blank?}.join(' ')),
+          website: (user['website'] && user['website'].include?('.')) ? user['website'].strip : (user['qq'] && user['qq'].strip == (user['qq'].strip.to_i) && user['qq'].strip.to_i > (10000)) ? 'http://user.qzone.qq.com/' + user['qq'].strip : nil,
+          bio_raw: first_exists((user['bio'] && CGI.unescapeHTML(user['bio'])), user['sightml'], user['spacenote']).strip[0, 3000],
+          location: first_exists(user['address'], (!user['resideprovince'].blank? ? [user['resideprovince'],  user['residecity'], user['residedist'], user['residecommunity']] : [user['birthprovince'],  user['birthcity'], user['birthdist'], user['birthcommunity']]).reject { |location|location.blank? }.join(' ')),
           post_create_action: lambda do |newmember|
-            if user['avatar_exists'] == 1 and newmember.uploaded_avatar_id.blank?
+            if user['avatar_exists'] == (1) && newmember.uploaded_avatar_id.blank?
               path, filename = discuzx_avatar_fullpath(user['id'])
               if path
                 begin
@@ -199,7 +199,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
                 end
               end
             end
-            if !user['spacecss'].blank? and newmember.user_profile.profile_background.blank?
+            if !user['spacecss'].blank? && newmember.user_profile.profile_background.blank?
               # profile background
               if matched = user['spacecss'].match(/body\s*{[^}]*url\('?(.+?)'?\)/i)
                 body_background = matched[1].split(ORIGINAL_SITE_PREFIX, 2).last
@@ -234,7 +234,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
 
             # we don't send email to the unconfirmed user
             newmember.update(email_digests: user['email_confirmed'] == 1) if newmember.email_digests
-            newmember.update(name: '') if !newmember.name.blank? and newmember.name == newmember.username
+            newmember.update(name: '') if !newmember.name.blank? && newmember.name == (newmember.username)
           end
         }
       end
@@ -259,10 +259,10 @@ class ImportScripts::DiscuzX < ImportScripts::Base
 
     max_position = Category.all.max_by(&:position).position
     create_categories(results) do |row|
-      next if row['type'] == 'group' or row['status'] == 2 # or row['status'].to_i == 3 # 如果不想导入群组，取消注释
+      next if row['type'] == ('group') || row['status'] == (2) # or row['status'].to_i == 3 # 如果不想导入群组，取消注释
       extra = PHP.unserialize(row['extra']) if !row['extra'].blank?
-      if extra and !extra["namecolor"].blank?
-        color = extra["namecolor"][1,6]
+      if extra && !extra["namecolor"].blank?
+        color = extra["namecolor"][1, 6]
       end
 
       Category.all.max_by(&:position).position
@@ -273,7 +273,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
         description: row['description'],
         position: row['position'].to_i + max_position,
         color: color,
-        suppress_from_homepage: (row['status'] == 0 or row['status'] == 3),
+        suppress_from_homepage: (row['status'] == (0) || row['status'] == (3)),
         post_create_action: lambda do |category|
           if slug = @category_slug[row['id']]
             category.update(slug: slug)
@@ -289,7 +289,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
             if upload
               category.logo_url = upload.url
               # FIXME: I don't know how to get '/shared' by script. May change to Rails.root
-              category.color = Miro::DominantColors.new(File.join('/shared', category.logo_url)).to_hex.first[1,6] if !color
+              category.color = Miro::DominantColors.new(File.join('/shared', category.logo_url)).to_hex.first[1, 6] if !color
               category.save!
             end
           end
@@ -332,10 +332,10 @@ class ImportScripts::DiscuzX < ImportScripts::Base
              LIMIT #{BATCH_SIZE}
             OFFSET #{offset};
           ")
-          # u.status != -1 AND u.groupid != 4 AND u.groupid != 5 用户未被锁定、禁访或禁言。在现实中的 Discuz 论坛，禁止的用户通常是广告机或驱逐的用户，这些不需要导入。
+      # u.status != -1 AND u.groupid != 4 AND u.groupid != 5 用户未被锁定、禁访或禁言。在现实中的 Discuz 论坛，禁止的用户通常是广告机或驱逐的用户，这些不需要导入。
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| p["id"].to_i}
+      next if all_records_exist? :posts, results.map { |p| p["id"].to_i }
 
       create_posts(results, total: total_count, offset: offset) do |m|
         skip = false
@@ -364,7 +364,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
             if results.empty?
               puts "WARNING: can't find poll options for topic #{m['topic_id']}, skip poll"
             else
-              mapped[:raw].prepend "[poll#{poll['multiple'] ? ' type=multiple' : ''}#{poll['maxchoices'] > 0 ? " max=#{poll['maxchoices']}" : ''}]\n#{results.map{|option|'- ' + option['polloption']}.join("\n")}\n[/poll]\n"
+              mapped[:raw].prepend "[poll#{poll['multiple'] ? ' type=multiple' : ''}#{poll['maxchoices'] > 0 ? " max=#{poll['maxchoices']}" : ''}]\n#{results.map { |option|'- ' + option['polloption'] }.join("\n")}\n[/poll]\n"
             end
           end
         else
@@ -398,7 +398,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
           end
         elsif (m['status'] & 2) >> 1 == 1 # waiting for approve
           mapped[:post_create_action] = lambda do |post|
-            PostAction.act(Discourse.system_user, post, 6, {take_action: false})
+            PostAction.act(Discourse.system_user, post, 6, take_action: false)
           end
         end
         skip ? nil : mapped
@@ -423,7 +423,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
 
       break if results.size < 1
 
-       # next if all_records_exist?
+      # next if all_records_exist?
 
       create_bookmarks(results, total: total_count, offset: offset) do |row|
         {
@@ -434,7 +434,6 @@ class ImportScripts::DiscuzX < ImportScripts::Base
     end
   end
 
-
   def import_private_messages
     puts '', 'creating private messages'
 
@@ -494,7 +493,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
                 SELECT plid thread_id, uid user_id
                   FROM #{table_name 'ucenter_pm_members'}
                  WHERE plid = #{m['thread_id']};
-              ").map {|r| r['user_id']}.uniq
+              ").map { |r| r['user_id'] }.uniq
 
           mapped[:target_usernames] = import_user_ids.map! do |import_user_id|
             import_user_id.to_s == m['user_id'].to_s ? nil : User.find_by(id: user_id_from_imported_user_id(import_user_id)).try(:username)
@@ -587,7 +586,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
     s.gsub!(/\[img[^\]]*\]https?:\/\/#{ORIGINAL_SITE_PREFIX}\/(.*)\[\/img\]/i, '[x-attach]\1[/x-attach]') # dont convert attachment
     s.gsub!(/<img[^>]*src="https?:\/\/#{ORIGINAL_SITE_PREFIX}\/(.*)".*?>/i, '[x-attach]\1[/x-attach]') # dont convert attachment
     s.gsub!(/\[img[^\]]*\]https?:\/\/www\.touhou\.cc\/blog\/(.*)\[\/img\]/i, '[x-attach]../blog/\1[/x-attach]') # 私货
-    s.gsub!(/\[img[^\]]*\]https?:\/\/www\.touhou\.cc\/ucenter\/avatar.php\?uid=(\d+)[^\]]*\[\/img\]/i) { "[x-attach]#{discuzx_avatar_fullpath($1,false)[0]}[/x-attach]" } # 私货
+    s.gsub!(/\[img[^\]]*\]https?:\/\/www\.touhou\.cc\/ucenter\/avatar.php\?uid=(\d+)[^\]]*\[\/img\]/i) { "[x-attach]#{discuzx_avatar_fullpath($1, false)[0]}[/x-attach]" } # 私货
     s.gsub!(/\[img=(\d+),(\d+)\]([^\]]*)\[\/img\]/i, '<img width="\1" height="\2" src="\3">')
     s.gsub!(/\[img\]([^\]]*)\[\/img\]/i, '<img src="\1">')
 
@@ -671,7 +670,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
     # @someone without the url
     s.gsub!(/@\[url=[^\[\]]*?\](\S*)\[\/url\]/i, '@\1')
 
-    s.scan(/http(?:s)?:\/\/#{ORIGINAL_SITE_PREFIX.gsub('.', '\.')}\/[^\[\]\s]*/) {|link|puts "WARNING: post #{import_id} can't replace internal url #{link}"}
+    s.scan(/http(?:s)?:\/\/#{ORIGINAL_SITE_PREFIX.gsub('.', '\.')}\/[^\[\]\s]*/) { |link|puts "WARNING: post #{import_id} can't replace internal url #{link}" }
 
     s.strip
   end
@@ -785,7 +784,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
           FROM #{table_name 'forum_attachment'}
           WHERE pid = #{post.custom_fields['import_id']}"
       if !inline_attachments.empty?
-          sql << " AND aid NOT IN (#{inline_attachments.join(',')})"
+        sql << " AND aid NOT IN (#{inline_attachments.join(',')})"
       end
 
       results = mysql_query(sql)
@@ -805,7 +804,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
       end
 
       if new_raw != post.raw
-        PostRevisor.new(post).revise!(post.user, { raw: new_raw }, { bypass_bump: true, edit_reason: '从 Discuz 中导入附件' })
+        PostRevisor.new(post).revise!(post.user, { raw: new_raw }, bypass_bump: true, edit_reason: '从 Discuz 中导入附件')
       end
 
       success_count += 1
@@ -818,7 +817,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
   end
 
   # Create the full path to the discuz avatar specified from user id
-  def discuzx_avatar_fullpath(user_id, absolute=true)
+  def discuzx_avatar_fullpath(user_id, absolute = true)
     padded_id = user_id.to_s.rjust(9, '0')
 
     part_1 = padded_id[0..2]
@@ -945,7 +944,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
   end
 
   def first_exists(*items)
-    items.find{|item|!item.blank?} || ''
+    items.find { |item|!item.blank? } || ''
   end
 
   def mysql_query(sql)
diff --git a/script/import_scripts/disqus.rb b/script/import_scripts/disqus.rb
index 6f0929d858..01bdb47629 100644
--- a/script/import_scripts/disqus.rb
+++ b/script/import_scripts/disqus.rb
@@ -11,7 +11,7 @@ class ImportScripts::Disqus < ImportScripts::Base
   def initialize
     abort("File '#{IMPORT_FILE}' not found") if !File.exist?(IMPORT_FILE)
 
-    @category = Category.where(name: IMPORT_CATEGORY).first 
+    @category = Category.where(name: IMPORT_CATEGORY).first
     abort("Category #{IMPORT_CATEGORY} not found") if @category.blank?
 
     @parser = DisqusSAX.new
@@ -67,7 +67,7 @@ class ImportScripts::Disqus < ImportScripts::Base
 
       puts "Creating #{title}... (#{t[:posts].size} posts)"
 
-      topic_user = User.where('email = ? OR username = ?', t[:author_email].downcase, t[:author_username]).first
+      topic_user = find_existing_user(t[:author_email], t[:author_username])
       begin
         post = TopicEmbed.import_remote(topic_user, t[:link], title: title)
         post.topic.update_column(:category_id, @category.id)
@@ -77,7 +77,7 @@ class ImportScripts::Disqus < ImportScripts::Base
 
       if post.present? && post.topic.posts_count <= 1
         (t[:posts] || []).each do |p|
-          post_user = User.where('email = ? OR username = ?', (p[:author_email] || '').downcase, p[:author_username]).first
+          post_user = find_existing_user(p[:author_email] || '', p[:author_username])
           next unless post_user.present?
 
           attrs = {
@@ -135,7 +135,7 @@ class DisqusSAX < Nokogiri::XML::SAX::Document
         thread = @threads[id]
         thread[:posts] << @post
       else
-        @thread = {id: id, posts: []}
+        @thread = { id: id, posts: [] }
       end
     when 'parent'
       if @post
@@ -194,7 +194,7 @@ class DisqusSAX < Nokogiri::XML::SAX::Document
   end
 
   def inside?(*params)
-    return !params.find{|p| !@inside[p]}
+    return !params.find { |p| !@inside[p] }
   end
 
   def normalize
@@ -203,7 +203,7 @@ class DisqusSAX < Nokogiri::XML::SAX::Document
         # Remove any threads that have no posts
         @threads.delete(id)
       else
-        t[:posts].delete_if {|p| p[:is_spam] == 'true' || p[:is_deleted] == 'true'}
+        t[:posts].delete_if { |p| p[:is_spam] == 'true' || p[:is_deleted] == 'true' }
       end
     end
 
diff --git a/script/import_scripts/drupal-6.rb b/script/import_scripts/drupal-6.rb
index 1df513df40..018a1fba90 100644
--- a/script/import_scripts/drupal-6.rb
+++ b/script/import_scripts/drupal-6.rb
@@ -5,7 +5,7 @@ class ImportScripts::Drupal < ImportScripts::Base
 
   DRUPAL_DB = ENV['DRUPAL_DB'] || "newsite3"
   VID = ENV['DRUPAL_VID'] || 1
-  
+
   def initialize
     super
 
@@ -23,7 +23,7 @@ class ImportScripts::Drupal < ImportScripts::Base
 
   def execute
     create_users(@client.query("SELECT uid id, name, mail email, created FROM users;")) do |row|
-      {id: row['id'], username: row['name'], email: row['email'], created_at: Time.zone.at(row['created'])}
+      { id: row['id'], username: row['name'], email: row['email'], created_at: Time.zone.at(row['created']) }
     end
 
     # You'll need to edit the following query for your Drupal install:
@@ -32,7 +32,7 @@ class ImportScripts::Drupal < ImportScripts::Base
     #   * Table name may be term_data.
     #   * May need to select a vid other than 1.
     create_categories(categories_query) do |c|
-      {id: c['tid'], name: c['name'], description: c['description']}
+      { id: c['tid'], name: c['name'], description: c['description'] }
     end
 
     # "Nodes" in Drupal are divided into types. Here we import two types,
@@ -65,8 +65,8 @@ class ImportScripts::Drupal < ImportScripts::Base
 
     results = @client.query("
       SELECT n.nid nid,
-	n.title title, 
-	n.uid uid, 
+	n.title title,
+	n.uid uid,
 	n.created created,
 	n.sticky sticky,
 	nr.body body
@@ -85,7 +85,7 @@ class ImportScripts::Drupal < ImportScripts::Base
         created_at: Time.zone.at(row['created']),
         pinned_at: row['sticky'].to_i == 1 ? Time.zone.at(row['created']) : nil,
         title: row['title'].try(:strip),
-        custom_fields: {import_id: "nid:#{row['nid']}"}
+        custom_fields: { import_id: "nid:#{row['nid']}" }
       }
     end
   end
@@ -123,7 +123,7 @@ class ImportScripts::Drupal < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| "nid:#{p['nid']}"}
+      next if all_records_exist? :posts, results.map { |p| "nid:#{p['nid']}" }
 
       create_posts(results, total: total_count, offset: offset) do |row|
         {
@@ -141,7 +141,7 @@ class ImportScripts::Drupal < ImportScripts::Base
 
   def create_replies
     puts '', "creating replies in topics"
-    
+
     if ENV['DRUPAL_IMPORT_BLOG']
       node_types = "('forum','blog')"
     else
@@ -149,7 +149,7 @@ class ImportScripts::Drupal < ImportScripts::Base
     end
 
     total_count = @client.query("
-      SELECT COUNT(*) count 
+      SELECT COUNT(*) count
       FROM comments c
       LEFT JOIN node n ON n.nid=c.nid
       WHERE node.type IN #{node_types}
@@ -167,18 +167,18 @@ class ImportScripts::Drupal < ImportScripts::Base
                c.uid,
                c.timestamp,
                c.comment body
-        FROM comments c 
+        FROM comments c
         LEFT JOIN node n ON n.nid=c.nid
         WHERE n.type IN #{node_types}
           AND n.status = 1
-          AND c.status=0 
+          AND c.status=0
         LIMIT #{batch_size}
           OFFSET #{offset};
       ", cache_rows: false)
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| "cid:#{p['cid']}"}
+      next if all_records_exist? :posts, results.map { |p| "cid:#{p['cid']}" }
 
       create_posts(results, total: total_count, offset: offset) do |row|
         topic_mapping = topic_lookup_from_imported_post_id("nid:#{row['nid']}")
@@ -192,7 +192,7 @@ class ImportScripts::Drupal < ImportScripts::Base
           }
           if row['pid']
             parent = topic_lookup_from_imported_post_id("cid:#{row['pid']}")
-            h[:reply_to_post_number] = parent[:post_number] if parent and parent[:post_number] > 1
+            h[:reply_to_post_number] = parent[:post_number] if parent && parent[:post_number] > (1)
           end
           h
         else
@@ -205,6 +205,6 @@ class ImportScripts::Drupal < ImportScripts::Base
 
 end
 
-if __FILE__==$0
+if __FILE__ == $0
   ImportScripts::Drupal.new.perform
 end
diff --git a/script/import_scripts/drupal.rb b/script/import_scripts/drupal.rb
index a15933b10c..6b773486d0 100644
--- a/script/import_scripts/drupal.rb
+++ b/script/import_scripts/drupal.rb
@@ -23,7 +23,7 @@ class ImportScripts::Drupal < ImportScripts::Base
 
   def execute
     create_users(@client.query("SELECT uid id, name, mail email, created FROM users;")) do |row|
-      {id: row['id'], username: row['name'], email: row['email'], created_at: Time.zone.at(row['created'])}
+      { id: row['id'], username: row['name'], email: row['email'], created_at: Time.zone.at(row['created']) }
     end
 
     # You'll need to edit the following query for your Drupal install:
@@ -32,7 +32,7 @@ class ImportScripts::Drupal < ImportScripts::Base
     #   * Table name may be term_data.
     #   * May need to select a vid other than 1.
     create_categories(categories_query) do |c|
-      {id: c['tid'], name: c['name'], description: c['description']}
+      { id: c['tid'], name: c['name'], description: c['description'] }
     end
 
     # "Nodes" in Drupal are divided into types. Here we import two types,
@@ -82,7 +82,7 @@ class ImportScripts::Drupal < ImportScripts::Base
         created_at: Time.zone.at(row['created']),
         pinned_at: row['sticky'].to_i == 1 ? Time.zone.at(row['created']) : nil,
         title: row['title'].try(:strip),
-        custom_fields: {import_id: "nid:#{row['nid']}"}
+        custom_fields: { import_id: "nid:#{row['nid']}" }
       }
     end
   end
@@ -121,7 +121,7 @@ class ImportScripts::Drupal < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| "nid:#{p['nid']}"}
+      next if all_records_exist? :posts, results.map { |p| "nid:#{p['nid']}" }
 
       create_posts(results, total: total_count, offset: offset) do |row|
         {
@@ -169,7 +169,7 @@ class ImportScripts::Drupal < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| "cid:#{p['cid']}"}
+      next if all_records_exist? :posts, results.map { |p| "cid:#{p['cid']}" }
 
       create_posts(results, total: total_count, offset: offset) do |row|
         topic_mapping = topic_lookup_from_imported_post_id("nid:#{row['nid']}")
@@ -183,7 +183,7 @@ class ImportScripts::Drupal < ImportScripts::Base
           }
           if row['pid']
             parent = topic_lookup_from_imported_post_id("cid:#{row['pid']}")
-            h[:reply_to_post_number] = parent[:post_number] if parent and parent[:post_number] > 1
+            h[:reply_to_post_number] = parent[:post_number] if parent && parent[:post_number] > (1)
           end
           h
         else
@@ -196,6 +196,6 @@ class ImportScripts::Drupal < ImportScripts::Base
 
 end
 
-if __FILE__==$0
+if __FILE__ == $0
   ImportScripts::Drupal.new.perform
 end
diff --git a/script/import_scripts/drupal_json.rb b/script/import_scripts/drupal_json.rb
index ac40525caf..d99fb86f87 100644
--- a/script/import_scripts/drupal_json.rb
+++ b/script/import_scripts/drupal_json.rb
@@ -8,7 +8,7 @@ class ImportScripts::DrupalJson < ImportScripts::Base
 
   def initialize
     super
-    @users_json  = load_json("formatted_users.json")
+    @users_json = load_json("formatted_users.json")
   end
 
   def execute
@@ -40,6 +40,6 @@ class ImportScripts::DrupalJson < ImportScripts::Base
   end
 end
 
-if __FILE__==$0
+if __FILE__ == $0
   ImportScripts::DrupalJson.new.perform
 end
diff --git a/script/import_scripts/drupal_qa.rb b/script/import_scripts/drupal_qa.rb
index 9899f73ad5..98d7919864 100644
--- a/script/import_scripts/drupal_qa.rb
+++ b/script/import_scripts/drupal_qa.rb
@@ -56,7 +56,7 @@ class ImportScripts::DrupalQA < ImportScripts::Drupal
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| "nid:#{p['nid']}"}
+      next if all_records_exist? :posts, results.map { |p| "nid:#{p['nid']}" }
 
       create_posts(results, total: total_count, offset: offset) do |row|
         {
@@ -102,7 +102,7 @@ class ImportScripts::DrupalQA < ImportScripts::Drupal
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| "cid:#{p['cid']}"}
+      next if all_records_exist? :posts, results.map { |p| "cid:#{p['cid']}" }
 
       create_posts(results, total: total_count, offset: offset) do |row|
         topic_mapping = topic_lookup_from_imported_post_id("nid:#{row['nid']}")
@@ -155,7 +155,7 @@ class ImportScripts::DrupalQA < ImportScripts::Drupal
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| "cid:#{p['cid']}"}
+      next if all_records_exist? :posts, results.map { |p| "cid:#{p['cid']}" }
 
       create_posts(results, total: total_count, offset: offset) do |row|
         topic_mapping = topic_lookup_from_imported_post_id("nid:#{row['nid']}")
@@ -207,7 +207,7 @@ class ImportScripts::DrupalQA < ImportScripts::Drupal
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| "cid:#{p['cid']}"}
+      next if all_records_exist? :posts, results.map { |p| "cid:#{p['cid']}" }
 
       create_posts(results, total: total_count, offset: offset) do |row|
         topic_mapping = topic_lookup_from_imported_post_id("nid:#{row['nid']}")
@@ -235,6 +235,6 @@ class ImportScripts::DrupalQA < ImportScripts::Drupal
 
 end
 
-if __FILE__==$0
+if __FILE__ == $0
   ImportScripts::DrupalQA.new.perform
 end
diff --git a/script/import_scripts/fluxbb.rb b/script/import_scripts/fluxbb.rb
index d754c5db0c..7b88644715 100644
--- a/script/import_scripts/fluxbb.rb
+++ b/script/import_scripts/fluxbb.rb
@@ -74,7 +74,7 @@ class ImportScripts::FluxBB < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :users, results.map {|u| u["id"].to_i}
+      next if all_records_exist? :users, results.map { |u| u["id"].to_i }
 
       create_users(results, total: total_count, offset: offset) do |user|
         { id: user['id'],
@@ -91,7 +91,7 @@ class ImportScripts::FluxBB < ImportScripts::Base
           admin: user['group_id'] == 1 }
       end
 
-      groupusers = results.select{ |user| user['group_id'] > 2 }
+      groupusers = results.select { |user| user['group_id'] > 2 }
 
       groupusers.each do |user|
         if user['group_id']
@@ -164,7 +164,7 @@ class ImportScripts::FluxBB < ImportScripts::Base
       ").to_a
 
       break if results.size < 1
-      next if all_records_exist? :posts, results.map {|m| m['id'].to_i}
+      next if all_records_exist? :posts, results.map { |m| m['id'].to_i }
 
       create_posts(results, total: total_count, offset: offset) do |m|
         skip = false
diff --git a/script/import_scripts/getsatisfaction.rb b/script/import_scripts/getsatisfaction.rb
index de5ff13a62..ffa0b0388e 100644
--- a/script/import_scripts/getsatisfaction.rb
+++ b/script/import_scripts/getsatisfaction.rb
@@ -37,7 +37,6 @@ class ImportScripts::GetSatisfaction < ImportScripts::Base
     super
   end
 
-
   def execute
     c = Category.find_by(name: 'Old Forum') ||
       Category.create!(name: 'Old Forum', user: Discourse.system_user)
@@ -61,7 +60,7 @@ class ImportScripts::GetSatisfaction < ImportScripts::Base
     end
 
     def initialize(cols)
-      cols.each_with_index do |col,idx|
+      cols.each_with_index do |col, idx|
         self.class.send(:define_method, col) do
           @row[idx]
         end
@@ -134,7 +133,7 @@ class ImportScripts::GetSatisfaction < ImportScripts::Base
   def total_rows(table)
     # In case of Excel export file, I converted it to CSV and used:
     # CSV.foreach("#{@path}/#{table}.csv", encoding:'iso-8859-1:utf-8').inject(0) {|c, line| c+1} - 1
-    File.foreach("#{@path}/#{table}.csv").inject(0) {|c, line| c+1} - 1
+    File.foreach("#{@path}/#{table}.csv").inject(0) { |c, line| c + 1 } - 1
   end
 
   def import_users
@@ -191,7 +190,7 @@ class ImportScripts::GetSatisfaction < ImportScripts::Base
   def import_categories
     rows = []
     csv_parse("categories") do |row|
-      rows << {id: row.id, name: row.name, description: row.description}
+      rows << { id: row.id, name: row.name, description: row.description }
     end
 
     create_categories(rows) do |row|
@@ -209,7 +208,7 @@ class ImportScripts::GetSatisfaction < ImportScripts::Base
       code = $2
       hoist = SecureRandom.hex
       # tidy code, wow, this is impressively crazy
-      code.gsub!(/  (\s*)/,"\n\\1")
+      code.gsub!(/  (\s*)/, "\n\\1")
       code.gsub!(/^\s*\n$/, "\n")
       code.gsub!(/\n+/m, "\n")
       code.strip!
@@ -231,48 +230,47 @@ class ImportScripts::GetSatisfaction < ImportScripts::Base
   end
 
   def import_post_batch!(posts, topics, offset, total)
-      create_posts(posts, total: total, offset: offset) do |post|
+    create_posts(posts, total: total, offset: offset) do |post|
 
-        mapped = {}
+      mapped = {}
 
-        mapped[:id] = post[:id]
-        mapped[:user_id] = user_id_from_imported_user_id(post[:user_id]) || -1
-        mapped[:raw] = post[:body]
-        mapped[:created_at] = post[:created_at]
+      mapped[:id] = post[:id]
+      mapped[:user_id] = user_id_from_imported_user_id(post[:user_id]) || -1
+      mapped[:raw] = post[:body]
+      mapped[:created_at] = post[:created_at]
 
-        topic = topics[post[:topic_id]]
+      topic = topics[post[:topic_id]]
 
-        unless topic
-          p "MISSING TOPIC #{post[:topic_id]}"
-          p post
-          next
-        end
+      unless topic
+        p "MISSING TOPIC #{post[:topic_id]}"
+        p post
+        next
+      end
 
+      unless topic[:post_id]
+        mapped[:title] = post[:title] || "Topic title missing"
+        topic[:post_id] = post[:id]
+        mapped[:category] = post[:category]
+      else
+        parent = topic_lookup_from_imported_post_id(topic[:post_id])
+        next unless parent
 
-        unless topic[:post_id]
-          mapped[:title] = post[:title] || "Topic title missing"
-          topic[:post_id] = post[:id]
-          mapped[:category] = post[:category]
-        else
-          parent = topic_lookup_from_imported_post_id(topic[:post_id])
-          next unless parent
+        mapped[:topic_id] = parent[:topic_id]
 
-          mapped[:topic_id] = parent[:topic_id]
-
-          reply_to_post_id = post_id_from_imported_post_id(post[:reply_id])
-          if reply_to_post_id
-            reply_to_post_number = @post_number_map[reply_to_post_id]
-            if reply_to_post_number && reply_to_post_number > 1
-              mapped[:reply_to_post_number] = reply_to_post_number
-            end
+        reply_to_post_id = post_id_from_imported_post_id(post[:reply_id])
+        if reply_to_post_id
+          reply_to_post_number = @post_number_map[reply_to_post_id]
+          if reply_to_post_number && reply_to_post_number > 1
+            mapped[:reply_to_post_number] = reply_to_post_number
           end
         end
-
-        next if topic[:deleted] or post[:deleted]
-
-        mapped
       end
 
+      next if topic[:deleted] || post[:deleted]
+
+      mapped
+    end
+
       posts.clear
   end
 
@@ -324,7 +322,7 @@ class ImportScripts::GetSatisfaction < ImportScripts::Base
         created_at: DateTime.parse(row.created_at)
       }
       posts << row
-      count+=1
+      count += 1
 
       if posts.length > 0 && posts.length % BATCH_SIZE == 0
         import_post_batch!(posts, topic_map, count - posts.length, total)
diff --git a/script/import_scripts/jive.rb b/script/import_scripts/jive.rb
index c64e87a66b..ae077bda2e 100644
--- a/script/import_scripts/jive.rb
+++ b/script/import_scripts/jive.rb
@@ -6,7 +6,7 @@ require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 class ImportScripts::Jive < ImportScripts::Base
 
   BATCH_SIZE = 1000
-  CATEGORY_IDS = [2023,2003,2004,2042,2036,2029] # categories that should be imported
+  CATEGORY_IDS = [2023, 2003, 2004, 2042, 2036, 2029] # categories that should be imported
 
   def initialize(path)
     @path = path
@@ -45,7 +45,7 @@ class ImportScripts::Jive < ImportScripts::Base
     end
 
     def initialize(cols)
-      cols.each_with_index do |col,idx|
+      cols.each_with_index do |col, idx|
         self.class.send(:define_method, col) do
           @row[idx]
         end
@@ -72,7 +72,7 @@ class ImportScripts::Jive < ImportScripts::Base
 
     File.open(filename).each_line do |line|
 
-      line.gsub!(/\\(.{1})/){|m| m[-1] == '"'? '""': m[-1]}
+      line.gsub!(/\\(.{1})/) { |m| m[-1] == '"' ? '""' : m[-1] }
       line.strip!
 
       current_row << "\n" unless current_row.empty?
@@ -120,7 +120,7 @@ class ImportScripts::Jive < ImportScripts::Base
   end
 
   def total_rows(table)
-    File.foreach("#{@path}/#{table}.csv").inject(0) {|c, line| c+1} - 1
+    File.foreach("#{@path}/#{table}.csv").inject(0) { |c, line| c + 1 } - 1
   end
 
   def import_groups
@@ -128,7 +128,7 @@ class ImportScripts::Jive < ImportScripts::Base
 
     rows = []
     csv_parse("groups") do |row|
-      rows << {id: row.groupid, name: row.name}
+      rows << { id: row.groupid, name: row.name }
     end
 
     create_groups(rows) do |row|
@@ -204,7 +204,7 @@ class ImportScripts::Jive < ImportScripts::Base
 
     csv_parse("communities") do |row|
       next unless CATEGORY_IDS.include?(row.communityid.to_i)
-      rows << {id: row.communityid, name: "#{row.name} (#{row.communityid})"}
+      rows << { id: row.communityid, name: "#{row.name} (#{row.communityid})" }
     end
 
     create_categories(rows) do |row|
@@ -228,47 +228,47 @@ class ImportScripts::Jive < ImportScripts::Base
   end
 
   def import_post_batch!(posts, topics, offset, total)
-      create_posts(posts, total: total, offset: offset) do |post|
+    create_posts(posts, total: total, offset: offset) do |post|
 
-        mapped = {}
+      mapped = {}
 
-        mapped[:id] = post[:id]
-        mapped[:user_id] = user_id_from_imported_user_id(post[:user_id]) || -1
-        mapped[:raw] = post[:body]
-        mapped[:created_at] = post[:created_at]
+      mapped[:id] = post[:id]
+      mapped[:user_id] = user_id_from_imported_user_id(post[:user_id]) || -1
+      mapped[:raw] = post[:body]
+      mapped[:created_at] = post[:created_at]
 
-        topic = topics[post[:topic_id]]
+      topic = topics[post[:topic_id]]
 
-        unless topic
-          p "MISSING TOPIC #{post[:topic_id]}"
-          p post
-          next
-        end
+      unless topic
+        p "MISSING TOPIC #{post[:topic_id]}"
+        p post
+        next
+      end
 
-        unless topic[:post_id]
-          mapped[:category] = category_id_from_imported_category_id(topic[:category_id])
-          mapped[:title] = post[:title]
-          topic[:post_id] = post[:id]
-        else
-          parent = topic_lookup_from_imported_post_id(topic[:post_id])
-          next unless parent
+      unless topic[:post_id]
+        mapped[:category] = category_id_from_imported_category_id(topic[:category_id])
+        mapped[:title] = post[:title]
+        topic[:post_id] = post[:id]
+      else
+        parent = topic_lookup_from_imported_post_id(topic[:post_id])
+        next unless parent
 
-          mapped[:topic_id] = parent[:topic_id]
+        mapped[:topic_id] = parent[:topic_id]
 
-          reply_to_post_id = post_id_from_imported_post_id(post[:reply_id])
-          if reply_to_post_id
-            reply_to_post_number = @post_number_map[reply_to_post_id]
-            if reply_to_post_number && reply_to_post_number > 1
-              mapped[:reply_to_post_number] = reply_to_post_number
-            end
+        reply_to_post_id = post_id_from_imported_post_id(post[:reply_id])
+        if reply_to_post_id
+          reply_to_post_number = @post_number_map[reply_to_post_id]
+          if reply_to_post_number && reply_to_post_number > 1
+            mapped[:reply_to_post_number] = reply_to_post_number
           end
         end
-
-        next if topic[:deleted] or post[:deleted]
-
-        mapped
       end
 
+      next if topic[:deleted] || post[:deleted]
+
+      mapped
+    end
+
       posts.clear
   end
 
@@ -290,14 +290,14 @@ class ImportScripts::Jive < ImportScripts::Base
         #IMAGE UPLOADER
         if thread.imagecount
           Dir.foreach("/var/www/discourse/script/import_scripts/jive/img/#{thread.messageid}") do |item|
-          next if item == '.' or item == '..' or item == '.DS_Store'
+            next if item == ('.') || item == ('..') || item == ('.DS_Store')
             photo_path = "/var/www/discourse/script/import_scripts/jive/img/#{thread.messageid}/#{item}"
             upload = create_upload(thread.userid, photo_path, File.basename(photo_path))
                if upload.persisted?
-                  puts "Image upload is successful for #{photo_path}, new path is #{upload.url}!"
-                  thread.body.gsub!(item,upload.url)
+                 puts "Image upload is successful for #{photo_path}, new path is #{upload.url}!"
+                  thread.body.gsub!(item, upload.url)
                else
-                  puts "Error: Image upload is not successful for #{photo_path}!"
+                 puts "Error: Image upload is not successful for #{photo_path}!"
                end
           end
         end
@@ -305,15 +305,15 @@ class ImportScripts::Jive < ImportScripts::Base
         #ATTACHMENT UPLOADER
         if thread.attachmentcount
           Dir.foreach("/var/www/discourse/script/import_scripts/jive/attach/#{thread.messageid}") do |item|
-          next if item == '.' or item == '..' or item == '.DS_Store'
+            next if item == ('.') || item == ('..') || item == ('.DS_Store')
             attach_path = "/var/www/discourse/script/import_scripts/jive/attach/#{thread.messageid}/#{item}"
             upload = create_upload(thread.userid, attach_path, File.basename(attach_path))
                if upload.persisted?
-                  puts "Attachment upload is successful for #{attach_path}, new path is #{upload.url}!"
-                  thread.body.gsub!(item,upload.url)
-                  thread.body << "<br/><br/> #{attachment_html(upload,item)}"
+                 puts "Attachment upload is successful for #{attach_path}, new path is #{upload.url}!"
+                  thread.body.gsub!(item, upload.url)
+                  thread.body << "<br/><br/> #{attachment_html(upload, item)}"
                else
-                  puts "Error: Attachment upload is not successful for #{attach_path}!"
+                 puts "Error: Attachment upload is not successful for #{attach_path}!"
                end
           end
         end
@@ -337,7 +337,7 @@ class ImportScripts::Jive < ImportScripts::Base
 
     topic_map.each do |_, topic|
       posts << topic if topic[:body]
-      count+=1
+      count += 1
     end
 
     csv_parse("messages") do |thread|
@@ -350,14 +350,14 @@ class ImportScripts::Jive < ImportScripts::Base
         #IMAGE UPLOADER
         if thread.imagecount
           Dir.foreach("/var/www/discourse/script/import_scripts/jive/img/#{thread.messageid}") do |item|
-          next if item == '.' or item == '..' or item == '.DS_Store'
+            next if item == ('.') || item == ('..') || item == ('.DS_Store')
             photo_path = "/var/www/discourse/script/import_scripts/jive/img/#{thread.messageid}/#{item}"
             upload = create_upload(thread.userid, photo_path, File.basename(photo_path))
                if upload.persisted?
-                  puts "Image upload is successful for #{photo_path}, new path is #{upload.url}!"
-                  thread.body.gsub!(item,upload.url)
+                 puts "Image upload is successful for #{photo_path}, new path is #{upload.url}!"
+                  thread.body.gsub!(item, upload.url)
                else
-                  puts "Error: Image upload is not successful for #{photo_path}!"
+                 puts "Error: Image upload is not successful for #{photo_path}!"
                end
           end
         end
@@ -365,15 +365,15 @@ class ImportScripts::Jive < ImportScripts::Base
         #ATTACHMENT UPLOADER
         if thread.attachmentcount
           Dir.foreach("/var/www/discourse/script/import_scripts/jive/attach/#{thread.messageid}") do |item|
-          next if item == '.' or item == '..' or item == '.DS_Store'
+            next if item == ('.') || item == ('..') || item == ('.DS_Store')
             attach_path = "/var/www/discourse/script/import_scripts/jive/attach/#{thread.messageid}/#{item}"
             upload = create_upload(thread.userid, attach_path, File.basename(attach_path))
                if upload.persisted?
-                  puts "Attachment upload is successful for #{attach_path}, new path is #{upload.url}!"
-                  thread.body.gsub!(item,upload.url)
-                  thread.body << "<br/><br/> #{attachment_html(upload,item)}"
+                 puts "Attachment upload is successful for #{attach_path}, new path is #{upload.url}!"
+                  thread.body.gsub!(item, upload.url)
+                  thread.body << "<br/><br/> #{attachment_html(upload, item)}"
                else
-                  puts "Error: Attachment upload is not successful for #{attach_path}!"
+                 puts "Error: Attachment upload is not successful for #{attach_path}!"
                end
           end
         end
@@ -387,7 +387,7 @@ class ImportScripts::Jive < ImportScripts::Base
           created_at: DateTime.parse(thread.creationdate)
         }
         posts << row
-        count+=1
+        count += 1
 
         if posts.length > 0 && posts.length % BATCH_SIZE == 0
           import_post_batch!(posts, topic_map, count - posts.length, total)
diff --git a/script/import_scripts/jive_api.rb b/script/import_scripts/jive_api.rb
index 624e360c78..f8c3734a35 100644
--- a/script/import_scripts/jive_api.rb
+++ b/script/import_scripts/jive_api.rb
@@ -11,6 +11,10 @@ class ImportScripts::JiveApi < ImportScripts::Base
   STAFF_GUARDIAN ||= Guardian.new(Discourse.system_user)
 
   TO_IMPORT ||= [
+    #############################
+    # WHOLE CATEGORY OF CONTENT #
+    #############################
+
     # Announcement & News
     { jive_object: { type: 37, id: 1004 }, filters: { created_after: 1.year.ago, type: "post" }, category_id: 7 },
     # Questions & Answers / General Discussions
@@ -28,6 +32,19 @@ class ImportScripts::JiveApi < ImportScripts::Base
     { jive_object: { type: 700, id: 1034 }, filters: { type: "discussion" }, authenticated: true, category_id: 15 },
     # Feature Requests
     { jive_object: { type: 14, id: 2015 }, filters: { type: "idea" }, category_id: 31 },
+
+    ####################
+    # SELECTED CONTENT #
+    ####################
+
+    # Announcement & News
+    { jive_object: { type: 37, id: 1004 }, filters: { entities: { 38 => [1345, 1381, 1845, 2046, 2060, 2061] } }, category_id: 7 },
+    # Problem Solving
+    { jive_object: { type: 14, id: 2006 }, filters: { entities: { 2 => [116685, 160745, 177010, 223482, 225036, 233228, 257882, 285103, 292297, 345243, 363250, 434546] } }, category_id: 10 },
+    # General Discussions
+    { jive_object: { type: 14, id: 2006 }, filters: { entities: { 2 => [178203, 188350, 312734] } }, category_id: 21 },
+    # Questions & Answers
+    { jive_object: { type: 14, id: 2006 }, filters: { entities: { 2 => [418811] } }, category_id: 5 },
   ]
 
   def initialize
@@ -82,7 +99,7 @@ class ImportScripts::JiveApi < ImportScripts::Base
         }
       end
 
-      break if users["list"].size < USER_COUNT || users["links"].blank? || users["links"]["next"].blank?
+      break if users["list"].size < USER_COUNT || users.dig("links", "next").blank?
       imported_users += users["list"].size
       break unless start_index = users["links"]["next"][/startIndex=(\d+)/, 1]
     end
@@ -104,20 +121,29 @@ class ImportScripts::JiveApi < ImportScripts::Base
 
     start_index = 0
 
-    filters = "filter=status(published)"
-    if to_import[:filters]
-      filters << "&filter=type(#{to_import[:filters][:type]})" if to_import[:filters][:type].present?
-      filters << "&filter=creationDate(null,#{to_import[:filters][:created_after].strftime("%Y-%m-%dT%TZ")})" if to_import[:filters][:created_after].present?
+    if to_import.dig(:filters, :entities).present?
+      path = "contents"
+      entities = to_import[:filters][:entities].flat_map { |type, ids| ids.map { |id| "#{type},#{id}" } }
+      filters = "filter=entityDescriptor(#{entities.join(",")})"
+    else
+      path = "places/#{place["placeID"]}/contents"
+      filters = "filter=status(published)"
+      if to_import[:filters]
+        filters << "&filter=type(#{to_import[:filters][:type]})" if to_import[:filters][:type].present?
+        filters << "&filter=creationDate(null,#{to_import[:filters][:created_after].strftime("%Y-%m-%dT%TZ")})" if to_import[:filters][:created_after].present?
+      end
     end
 
     loop do
-      contents = get("places/#{place["placeID"]}/contents?#{filters}&sort=dateCreatedAsc&count=#{POST_COUNT}&startIndex=#{start_index}", to_import[:authenticated])
+      contents = get("#{path}?#{filters}&sort=dateCreatedAsc&count=#{POST_COUNT}&startIndex=#{start_index}", to_import[:authenticated])
       contents["list"].each do |content|
-        custom_fields = { import_id: content["contentID"] }
+        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?
 
         topic = {
-          id: content["contentID"],
+          id: content_id,
           created_at: content["published"],
           title: @htmlentities.decode(content["subject"]),
           raw: process_raw(content["content"]["text"]),
@@ -136,40 +162,43 @@ class ImportScripts::JiveApi < ImportScripts::Base
         parent_post = post_id ? Post.unscoped.find_by(id: post_id) : create_post(topic, topic[:id])
 
         if parent_post&.id && parent_post&.topic_id
-          import_likes(content["contentID"], parent_post.id) if content["likeCount"].to_i > 0
+          resources = content["resources"]
+          import_likes(resources["likes"]["ref"], parent_post.id) if content["likeCount"].to_i > 0 && resources.dig("likes", "ref").present?
           if content["replyCount"].to_i > 0
-            import_comments(content["contentID"], parent_post.topic_id, to_import) if content["resources"]["comments"].present?
-            import_messages(content["contentID"], parent_post.topic_id, to_import) if content["resources"]["messages"].present?
+            import_comments(resources["comments"]["ref"], parent_post.topic_id, to_import) if resources.dig("comments", "ref").present?
+            import_messages(resources["messages"]["ref"], parent_post.topic_id, to_import) if resources.dig("messages", "ref").present?
           end
         end
       end
 
-      break if contents["list"].size < POST_COUNT || contents["links"].blank? || contents["links"]["next"].blank?
+      break if contents["list"].size < POST_COUNT || contents.dig("links", "next").blank?
       break unless start_index = contents["links"]["next"][/startIndex=(\d+)/, 1]
     end
   end
 
-  def import_likes(content_id, post_id)
+  def import_likes(url, post_id)
     start_index = 0
 
     loop do
-      likes = get("contents/#{content_id}/likes?&count=#{USER_COUNT}&startIndex=#{start_index}", true)
+      likes = get("#{url}?&count=#{USER_COUNT}&startIndex=#{start_index}", true)
+      break if likes["error"]
       likes["list"].each do |like|
         next unless user_id = user_id_from_imported_user_id(like["id"])
         next if PostAction.exists?(user_id: user_id, post_id: post_id, post_action_type_id: PostActionType.types[:like])
         PostAction.act(User.find(user_id), Post.find(post_id), PostActionType.types[:like])
       end
 
-      break if likes["list"].size < USER_COUNT || likes["links"].blank? || likes["links"]["next"].blank?
+      break if likes["list"].size < USER_COUNT || likes.dig("links", "next").blank?
       break unless start_index = likes["links"]["next"][/startIndex=(\d+)/, 1]
     end
   end
 
-  def import_comments(content_id, topic_id, to_import)
+  def import_comments(url, topic_id, to_import)
     start_index = 0
 
     loop do
-      comments = get("contents/#{content_id}/comments?hierarchical=false&count=#{POST_COUNT}&startIndex=#{start_index}", to_import[:authenticated])
+      comments = get("#{url}?hierarchical=false&count=#{POST_COUNT}&startIndex=#{start_index}", to_import[:authenticated])
+      break if comments["error"]
       comments["list"].each do |comment|
         next if post_id_from_imported_post_id(comment["id"])
 
@@ -189,20 +218,23 @@ class ImportScripts::JiveApi < ImportScripts::Base
         end
 
         if created_post = create_post(post, post[:id])
-          import_likes(content_id, created_post.id) if comment["likeCount"].to_i > 0
+          if comment["likeCount"].to_i > 0 && comment.dig("resources", "likes", "ref").present?
+            import_likes(comment["resources"]["likes"]["ref"], created_post.id)
+          end
         end
       end
 
-      break if comments["list"].size < POST_COUNT || comments["links"].blank? || comments["links"]["next"].blank?
+      break if comments["list"].size < POST_COUNT || comments.dig("links", "next").blank?
       break unless start_index = comments["links"]["next"][/startIndex=(\d+)/, 1]
     end
   end
 
-  def import_messages(content_id, topic_id, to_import)
+  def import_messages(url, topic_id, to_import)
     start_index = 0
 
     loop do
-      messages = get("messages/contents/#{content_id}?hierarchical=false&count=#{POST_COUNT}&startIndex=#{start_index}", to_import[:authenticated])
+      messages = get("#{url}?hierarchical=false&count=#{POST_COUNT}&startIndex=#{start_index}", to_import[:authenticated])
+      break if messages["error"]
       messages["list"].each do |message|
         next if post_id_from_imported_post_id(message["id"])
 
@@ -223,11 +255,13 @@ class ImportScripts::JiveApi < ImportScripts::Base
         end
 
         if created_post = create_post(post, post[:id])
-          import_likes(content_id, created_post.id) if message["likeCount"].to_i > 0
+          if message["likeCount"].to_i > 0 && message.dig("resources", "likes", "ref").present?
+            import_likes(message["resources"]["likes"]["ref"], created_post.id)
+          end
         end
       end
 
-      break if messages["list"].size < POST_COUNT || messages["links"].blank? || messages["links"]["next"].blank?
+      break if messages["list"].size < POST_COUNT || messages.dig("links", "next").blank?
       break unless start_index = messages["links"]["next"][/startIndex=(\d+)/, 1]
     end
   end
@@ -257,7 +291,7 @@ class ImportScripts::JiveApi < ImportScripts::Base
         PostAction.act(User.find(user_id), Post.find(post_id), PostActionType.types[:bookmark])
       end
 
-      break if favorites["list"].size < POST_COUNT || favorites["links"].blank? || favorites["links"]["next"].blank?
+      break if favorites["list"].size < POST_COUNT || favorites.dig("links", "next").blank?
       break unless start_index = favorites["links"]["next"][/startIndex=(\d+)/, 1]
     end
   end
@@ -300,12 +334,12 @@ class ImportScripts::JiveApi < ImportScripts::Base
     SQL
   end
 
-  def get(query, authenticated=false)
+  def get(url_or_path, authenticated = false)
     tries ||= 3
 
     command = ["curl", "--silent"]
     command << "--user \"#{@username}:#{@password}\"" if !!authenticated
-    command << "\"#{@base_uri}/api/core/v3/#{query}\""
+    command << (url_or_path.start_with?("http") ? "\"#{url_or_path}\"" : "\"#{@base_uri}/api/core/v3/#{url_or_path}\"")
 
     puts command.join(" ") if ENV["VERBOSE"] == "1"
 
diff --git a/script/import_scripts/json_generic.rb b/script/import_scripts/json_generic.rb
index c6474b2667..f98bcebcbc 100755
--- a/script/import_scripts/json_generic.rb
+++ b/script/import_scripts/json_generic.rb
@@ -6,7 +6,7 @@ require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 class ImportScripts::JsonGeneric < ImportScripts::Base
 
   JSON_FILE_PATH = ENV['JSON_FILE']
-  BATCH_SIZE  ||= 1000
+  BATCH_SIZE ||= 1000
 
   def initialize
     super
@@ -59,7 +59,6 @@ class ImportScripts::JsonGeneric < ImportScripts::Base
     end
   end
 
-
   def import_discussions
     puts "", "Importing discussions"
 
@@ -103,6 +102,6 @@ class ImportScripts::JsonGeneric < ImportScripts::Base
   end
 end
 
-if __FILE__==$0
+if __FILE__ == $0
   ImportScripts::JsonGeneric.new.perform
 end
diff --git a/script/import_scripts/kunena.rb b/script/import_scripts/kunena.rb
index 3cb52e7b38..1aa333593e 100644
--- a/script/import_scripts/kunena.rb
+++ b/script/import_scripts/kunena.rb
@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 
 class ImportScripts::Kunena < ImportScripts::Base
 
-  KUNENA_DB    = "kunena"
+  KUNENA_DB = "kunena"
 
   def initialize
     super
@@ -38,7 +38,7 @@ class ImportScripts::Kunena < ImportScripts::Base
     @users = nil
 
     create_categories(@client.query("SELECT id, parent, name, description, ordering FROM jos_kunena_categories ORDER BY parent, id;")) do |c|
-      h = {id: c['id'], name: c['name'], description: c['description'], position: c['ordering'].to_i}
+      h = { id: c['id'], name: c['name'], description: c['description'], position: c['ordering'].to_i }
       if c['parent'].to_i > 0
         h[:parent_category_id] = category_id_from_imported_category_id(c['parent'])
       end
@@ -61,12 +61,12 @@ class ImportScripts::Kunena < ImportScripts::Base
     puts "fetching Joomla users data from mysql"
     results = @client.query("SELECT id, username, email, registerDate FROM jos_users;", cache_rows: false)
     results.each do |u|
-      next unless u['id'].to_i > 0 and u['username'].present? and u['email'].present?
-      username = u['username'].gsub(' ', '_').gsub(/[^A-Za-z0-9_]/, '')[0,User.username_length.end]
+      next unless u['id'].to_i > (0) && u['username'].present? && u['email'].present?
+      username = u['username'].gsub(' ', '_').gsub(/[^A-Za-z0-9_]/, '')[0, User.username_length.end]
       if username.length < User.username_length.first
         username = username * User.username_length.first
       end
-      @users[u['id'].to_i] = {id: u['id'].to_i, username: username, email: u['email'], created_at: u['registerDate']}
+      @users[u['id'].to_i] = { id: u['id'].to_i, username: username, email: u['email'], created_at: u['registerDate'] }
     end
 
     puts "fetching Kunena user data from mysql"
@@ -109,7 +109,7 @@ class ImportScripts::Kunena < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| p['id'].to_i}
+      next if all_records_exist? :posts, results.map { |p| p['id'].to_i }
 
       create_posts(results, total: total_count, offset: offset) do |m|
         skip = false
diff --git a/script/import_scripts/kunena3.rb b/script/import_scripts/kunena3.rb
index 2f4d7808c4..4a27120274 100644
--- a/script/import_scripts/kunena3.rb
+++ b/script/import_scripts/kunena3.rb
@@ -60,7 +60,7 @@ class ImportScripts::Kunena < ImportScripts::Base
     @users = nil
 
     create_categories(@client.query("SELECT id, #{PARENT_FIELD} as parent_id, name, description, ordering FROM #{KUNENA_PREFIX}kunena_categories ORDER BY #{PARENT_FIELD}, id;")) do |c|
-      h = {id: c['id'], name: c['name'], description: c['description'], position: c['ordering'].to_i}
+      h = { id: c['id'], name: c['name'], description: c['description'], position: c['ordering'].to_i }
       if c['parent_id'].to_i > 0
         h[:parent_category_id] = category_id_from_imported_category_id(c['parent_id'])
       end
@@ -83,12 +83,12 @@ class ImportScripts::Kunena < ImportScripts::Base
     puts "fetching Joomla users data from mysql"
     results = @client.query("SELECT id, username, email, registerDate FROM #{KUNENA_PREFIX}users;", cache_rows: false)
     results.each do |u|
-      next unless u['id'].to_i > 0 and u['username'].present? and u['email'].present?
-      username = u['username'].gsub(' ', '_').gsub(/[^A-Za-z0-9_]/, '')[0,User.username_length.end]
+      next unless u['id'].to_i > (0) && u['username'].present? && u['email'].present?
+      username = u['username'].gsub(' ', '_').gsub(/[^A-Za-z0-9_]/, '')[0, User.username_length.end]
       if username.length < User.username_length.first
         username = username * User.username_length.first
       end
-      @users[u['id'].to_i] = {id: u['id'].to_i, username: username, email: u['email'], created_at: u['registerDate']}
+      @users[u['id'].to_i] = { id: u['id'].to_i, username: username, email: u['email'], created_at: u['registerDate'] }
     end
 
     puts "fetching Kunena user data from mysql"
@@ -131,7 +131,7 @@ class ImportScripts::Kunena < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| p['id'].to_i}
+      next if all_records_exist? :posts, results.map { |p| p['id'].to_i }
 
       create_posts(results, total: total_count, offset: offset) do |m|
         skip = false
diff --git a/script/import_scripts/lithium.rb b/script/import_scripts/lithium.rb
index bd0a6f0055..b366a2a4d7 100644
--- a/script/import_scripts/lithium.rb
+++ b/script/import_scripts/lithium.rb
@@ -10,8 +10,6 @@
 # that was done using import_scripts/support/convert_mysql_xml_to_mysql.rb
 #
 
-
-
 require 'mysql2'
 require 'csv'
 require 'reverse_markdown'
@@ -19,7 +17,7 @@ require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 require 'htmlentities'
 
 # remove table conversion
-[:table,:td,:tr,:th,:thead,:tbody].each do |tag|
+[:table, :td, :tr, :th, :thead, :tbody].each do |tag|
   ReverseMarkdown::Converters.unregister(tag)
 end
 
@@ -53,7 +51,6 @@ class ImportScripts::Lithium < ImportScripts::Base
 
   def execute
 
-    SiteSetting.allow_html_tables = true
     @max_start_id = Post.maximum(:id)
 
     import_categories
@@ -102,7 +99,7 @@ class ImportScripts::Lithium < ImportScripts::Base
 
       break if users.size < 1
 
-      next if all_records_exist? :users, users.map {|u| u["id"].to_i}
+      next if all_records_exist? :users, users.map { |u| u["id"].to_i }
 
       create_users(users, total: user_count, offset: offset) do |user|
 
@@ -124,7 +121,7 @@ class ImportScripts::Lithium < ImportScripts::Base
   end
 
   def unix_time(t)
-    Time.at(t/1000.0)
+    Time.at(t / 1000.0)
   end
 
   def import_profile_picture(old_user, imported_user)
@@ -192,7 +189,6 @@ class ImportScripts::Lithium < ImportScripts::Base
     top_level_ids = Set.new
     child_ids = Set.new
 
-
     parent = nil
     CSV.foreach(CATEGORY_CSV) do |row|
       display_id = row[2].strip
@@ -217,7 +213,6 @@ class ImportScripts::Lithium < ImportScripts::Base
 
     top_level_categories = categories.select { |c| top_level_ids.include? c["display_id"] }
 
-
     create_categories(top_level_categories) do |category|
       info = category_info[category["display_id"]]
       info[:id] = category["node_id"]
@@ -229,7 +224,6 @@ class ImportScripts::Lithium < ImportScripts::Base
       }
     end
 
-
     puts "", "importing children categories..."
 
     children_categories = categories.select { |c| child_ids.include? c["display_id"] }
@@ -247,7 +241,7 @@ class ImportScripts::Lithium < ImportScripts::Base
     end
 
     puts "", "securing categories"
-    category_info.each do |_,info|
+    category_info.each do |_, info|
       if info[:secure]
         id = category_id_from_imported_category_id(info[:id])
         if id
@@ -279,7 +273,7 @@ class ImportScripts::Lithium < ImportScripts::Base
 
       break if topics.size < 1
 
-      next if all_records_exist? :posts, topics.map {|topic| "#{topic["node_id"]} #{topic["id"]}"}
+      next if all_records_exist? :posts, topics.map { |topic| "#{topic["node_id"]} #{topic["id"]}" }
 
       create_posts(topics, total: topic_count, offset: offset) do |topic|
 
@@ -296,7 +290,7 @@ class ImportScripts::Lithium < ImportScripts::Base
             raw: raw,
             created_at: unix_time(topic["post_date"]),
             views: topic["views"],
-            custom_fields: {import_unique_id: topic["unique_id"]},
+            custom_fields: { import_unique_id: topic["unique_id"] },
             import_mode: true
           }
         else
@@ -327,7 +321,7 @@ class ImportScripts::Lithium < ImportScripts::Base
 
       break if posts.size < 1
 
-      next if all_records_exist? :posts, posts.map {|post| "#{post["node_id"]} #{post["root_id"]} #{post["id"]}"}
+      next if all_records_exist? :posts, posts.map { |post| "#{post["node_id"]} #{post["root_id"]} #{post["id"]}" }
 
       create_posts(posts, total: post_count, offset: offset) do |post|
         raw = post["raw"]
@@ -341,7 +335,7 @@ class ImportScripts::Lithium < ImportScripts::Base
           topic_id: topic[:topic_id],
           raw: raw,
           created_at: unix_time(post["post_date"]),
-          custom_fields: {import_unique_id: post["unique_id"]},
+          custom_fields: { import_unique_id: post["unique_id"] },
           import_mode: true
         }
 
@@ -366,7 +360,7 @@ class ImportScripts::Lithium < ImportScripts::Base
     "smileysurprised" => "dizzy_face",
     "smileytongue" => "stuck_out_tongue",
     "smileyvery-happy" => "grin",
-    "smileywink"  => "wink",
+    "smileywink" => "wink",
     "smileyfrustrated" => "confounded",
     "smileyembarrassed" => "flushed",
     "smileylol" => "laughing",
@@ -383,7 +377,6 @@ class ImportScripts::Lithium < ImportScripts::Base
     "catlol" => "joy_cat"
   }
 
-
   def import_likes
     puts "\nimporting likes..."
 
@@ -396,8 +389,6 @@ class ImportScripts::Lithium < ImportScripts::Base
       existing_map[import_id] = post_id
     end
 
-
-
     puts "loading data into temp table"
     PostAction.exec_sql("create temp table like_data(user_id int, post_id int, created_at timestamp without time zone)")
     PostAction.transaction do
@@ -437,7 +428,6 @@ class ImportScripts::Lithium < ImportScripts::Base
              WHERE ua.id IS NULL AND pa.post_action_type_id = 2
     SQL
 
-
     # reverse action
     UserAction.exec_sql <<-SQL
     INSERT INTO user_actions (user_id, action_type, target_topic_id, target_post_id, acting_user_id, created_at, updated_at)
@@ -491,7 +481,6 @@ class ImportScripts::Lithium < ImportScripts::Base
       existing_map[import_id] = post_id
     end
 
-
     puts "loading data into temp table"
     PostAction.exec_sql("create temp table accepted_data(post_id int primary key)")
     PostAction.transaction do
@@ -508,7 +497,6 @@ class ImportScripts::Lithium < ImportScripts::Base
       end
     end
 
-
     puts "deleting dupe answers"
     PostAction.exec_sql <<-SQL
     DELETE FROM accepted_data WHERE post_id NOT IN (
@@ -554,7 +542,7 @@ class ImportScripts::Lithium < ImportScripts::Base
 
     users = {}
 
-    [inbox,outbox].each do |r|
+    [inbox, outbox].each do |r|
       r.each do |row|
         ary = (users[row["note_id"]] ||= Set.new)
         user_id = user_id_from_imported_user_id(row["user_id"])
@@ -568,7 +556,7 @@ class ImportScripts::Lithium < ImportScripts::Base
     subject_to_first_note = {}
 
     mysql_query("SELECT note_id, subject, sender_user_id FROM tblia_notes_content order by note_id").each do |row|
-        user_id = user_id_from_imported_user_id(row["sender_user_id"])
+      user_id = user_id_from_imported_user_id(row["sender_user_id"])
         ary = (users[row["note_id"]] ||= Set.new)
         if user_id
           ary << user_id
@@ -582,7 +570,7 @@ class ImportScripts::Lithium < ImportScripts::Base
 
     puts "Loading user_id to username map"
     user_map = {}
-    User.pluck(:id, :username).each do |id,username|
+    User.pluck(:id, :username).each do |id, username|
       user_map[id] = username
     end
 
@@ -597,17 +585,16 @@ class ImportScripts::Lithium < ImportScripts::Base
           OFFSET #{offset}
       SQL
 
-
       break if topics.size < 1
 
-      next if all_records_exist? :posts, topics.map {|topic| "pm_#{topic["note_id"]}"}
+      next if all_records_exist? :posts, topics.map { |topic| "pm_#{topic["note_id"]}" }
 
       create_posts(topics, total: topic_count, offset: offset) do |topic|
 
         user_id = user_id_from_imported_user_id(topic["sender_user_id"]) || Discourse::SYSTEM_USER_ID
         participants = users[topic["note_id"]]
 
-        usernames = (participants - [user_id]).map{|id| user_map[id]}
+        usernames = (participants - [user_id]).map { |id| user_map[id] }
 
         subject = topic["subject"]
         topic_id = nil
@@ -647,7 +634,6 @@ class ImportScripts::Lithium < ImportScripts::Base
 
   def close_topics
 
-
     puts "\nclosing closed topics..."
 
     sql = "select unique_id post_id from message2 where root_id = id AND (attributes & 0x0002 ) != 0;"
@@ -659,8 +645,8 @@ class ImportScripts::Lithium < ImportScripts::Base
       existing_map[import_id.to_i] = post_id.to_i
     end
 
-    results.map{|r| r["post_id"]}.each_slice(500) do |ids|
-      mapped = ids.map{|id| existing_map[id]}.compact
+    results.map { |r| r["post_id"] }.each_slice(500) do |ids|
+      mapped = ids.map { |id| existing_map[id] }.compact
       Topic.exec_sql("
                      UPDATE topics SET closed = true
                      WHERE id IN (SELECT topic_id FROM posts where id in (:ids))
@@ -669,7 +655,6 @@ class ImportScripts::Lithium < ImportScripts::Base
 
   end
 
-
   def create_permalinks
     puts "Creating permalinks"
 
@@ -740,7 +725,6 @@ SQL
   def post_process_posts
     puts "", "Postprocessing posts..."
 
-
     current = 0
     max = Post.count
 
@@ -767,7 +751,6 @@ SQL
     end
   end
 
-
   def postprocess_post_raw(raw, user_id)
 
     doc = Nokogiri::HTML.fragment(raw)
@@ -828,7 +811,7 @@ SQL
       ":#{SMILEY_SUBS[$1] || $1}:"
     end
     # nbsp central
-    raw.gsub!(/([a-zA-Z0-9])&nbsp;([a-zA-Z0-9])/,"\\1 \\2")
+    raw.gsub!(/([a-zA-Z0-9])&nbsp;([a-zA-Z0-9])/, "\\1 \\2")
     raw
   end
 
diff --git a/script/import_scripts/mbox-experimental.rb b/script/import_scripts/mbox-experimental.rb
index 065b0111bd..12c18515ab 100644
--- a/script/import_scripts/mbox-experimental.rb
+++ b/script/import_scripts/mbox-experimental.rb
@@ -14,4 +14,3 @@ module ImportScripts
     Importer.new(@settings).perform
   end
 end
-
diff --git a/script/import_scripts/mbox.rb b/script/import_scripts/mbox.rb
index e7c25ed18c..d0b379aa12 100755
--- a/script/import_scripts/mbox.rb
+++ b/script/import_scripts/mbox.rb
@@ -46,7 +46,7 @@ class ImportScripts::Mbox < ImportScripts::Base
     exit
   end
 
-  validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, :on => :create
+  validates_format_of :email, with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, on: :create
 
   def execute
     import_categories
@@ -63,7 +63,7 @@ class ImportScripts::Mbox < ImportScripts::Base
     mappings = CATEGORY_MAPPINGS.values - ['uncategorized']
 
     create_categories(mappings) do |c|
-      {id: c, name: c}
+      { id: c, name: c }
     end
   end
 
@@ -109,7 +109,7 @@ class ImportScripts::Mbox < ImportScripts::Base
         each_line(f) do |line|
           line = line.scrub
           if line =~ SPLIT_AT
-p            message_count += 1
+            p message_count += 1
             if !msg.empty?
               mail = Mail.read_from_string(msg)
               yield mail, f
@@ -163,7 +163,7 @@ p            message_count += 1
 
     puts "#{not_found.size} records couldn't be associated with parents"
     if not_found.present?
-      db.execute "UPDATE emails SET reply_to = NULL WHERE msg_id IN (#{not_found.map {|nf| "'#{nf}'"}.join(',')})"
+      db.execute "UPDATE emails SET reply_to = NULL WHERE msg_id IN (#{not_found.map { |nf| "'#{nf}'" }.join(',')})"
     end
 
     dupe_titles = db.execute "SELECT title, COUNT(*) FROM emails GROUP BY title HAVING count(*) > 1"
@@ -197,7 +197,7 @@ p            message_count += 1
           from_email.gsub!(/ /, '')
         end
       end
-p    end
+    end
 
     display_names = from.try(:display_names)
     if display_names.present?
@@ -308,7 +308,7 @@ p    end
     title.strip
 
     #In case of mixed localized prefixes there could be many of them if the mail client didn't strip the localized ones
-    if original_length >  title.length
+    if original_length > title.length
       clean_title(title)
     else
       title
@@ -331,9 +331,9 @@ p    end
     total_count = all_users.size
 
     batches(BATCH_SIZE) do |offset|
-      users = all_users[offset..offset+BATCH_SIZE-1]
+      users = all_users[offset..offset + BATCH_SIZE - 1]
       break if users.nil?
-      next if all_records_exist? :users, users.map {|u| u[1]}
+      next if all_records_exist? :users, users.map { |u| u[1] }
 
       create_users(users, total: total_count, offset: offset) do |u|
         {
@@ -374,7 +374,7 @@ p    end
         new_raw = p.raw.dup
         new_raw = new_raw.gsub!(/#{Regexp.escape(find)}/i, replace) || new_raw
         if new_raw != p.raw
-          p.revise(Discourse.system_user, { raw: new_raw }, { bypass_bump: true })
+          p.revise(Discourse.system_user, { raw: new_raw }, bypass_bump: true)
           print_warning "\nReplaced #{find} with #{replace} in topic #{p.topic_id}"
         end
       end
@@ -411,10 +411,10 @@ p    end
     topic_count = all_topics.size
 
     batches(BATCH_SIZE) do |offset|
-      topics = all_topics[offset..offset+BATCH_SIZE-1]
+      topics = all_topics[offset..offset + BATCH_SIZE - 1]
       break if topics.nil?
 
-      next if all_records_exist? :posts, topics.map {|t| t[0]}
+      next if all_records_exist? :posts, topics.map { |t| t[0] }
 
       create_posts(topics, total: topic_count, offset: offset) do |t|
         raw_email = t[5]
@@ -454,7 +454,7 @@ p    end
         raw = clean_raw(raw)
         raw = raw.dup.to_s
         raw.gsub!(/#{from_email}/, "@#{username}")
-        cleaned_email = from_email.dup.sub(/@/,' at ')
+        cleaned_email = from_email.dup.sub(/@/, ' at ')
         raw.gsub!(/#{cleaned_email}/, "@#{username}")
         { id: t[0],
           title: clean_title(title),
@@ -490,11 +490,11 @@ p    end
     puts "Replies: #{post_count}"
 
     batches(BATCH_SIZE) do |offset|
-      posts = replies[offset..offset+BATCH_SIZE-1]
+      posts = replies[offset..offset + BATCH_SIZE - 1]
       break if posts.nil?
       break if posts.count < 1
 
-      next if all_records_exist? :posts, posts.map {|p| p[0]}
+      next if all_records_exist? :posts, posts.map { |p| p[0] }
 
       create_posts(posts, total: post_count, offset: offset) do |p|
         parent_id = p[6]
@@ -521,7 +521,7 @@ p    end
         user_id = user_id_from_imported_user_id(from_email) || Discourse::SYSTEM_USER_ID
         raw = clean_raw(raw).to_s
         raw.gsub!(/#{from_email}/, "@#{username}")
-        cleaned_email = from_email.dup.sub(/@/,' at ')
+        cleaned_email = from_email.dup.sub(/@/, ' at ')
         raw.gsub!(/#{cleaned_email}/, "@#{username}")
         # import the attachments
         mail.attachments.each do |attachment|
diff --git a/script/import_scripts/mbox/importer.rb b/script/import_scripts/mbox/importer.rb
index 762c162e82..dbdd7c1651 100644
--- a/script/import_scripts/mbox/importer.rb
+++ b/script/import_scripts/mbox/importer.rb
@@ -13,10 +13,11 @@ module ImportScripts::Mbox
       @database = Database.new(@settings.data_dir, @settings.batch_size)
     end
 
-    def change_site_settings
-      super
-
-      SiteSetting.enable_staged_users = true
+    def get_site_settings_for_import
+      settings = super
+      settings[:enable_staged_users] = true
+      settings[:incoming_email_prefer_html] = @settings.prefer_html
+      settings
     end
 
     protected
@@ -64,6 +65,7 @@ module ImportScripts::Mbox
             name: row['name'],
             trust_level: @settings.trust_level,
             staged: true,
+            active: false,
             created_at: to_time(row['date_of_first_message'])
           }
         end
@@ -97,21 +99,33 @@ module ImportScripts::Mbox
 
     def map_post(row)
       user_id = user_id_from_imported_user_id(row['from_email']) || Discourse::SYSTEM_USER_ID
-      body = row['body'] || ''
-      body << map_attachments(row['raw_message'], user_id) if row['attachment_count'].positive?
-      body << Email::Receiver.elided_html(row['elided']) if row['elided'].present?
 
       {
         id: row['msg_id'],
         user_id: user_id,
         created_at: to_time(row['email_date']),
-        raw: body,
+        raw: format_raw(row, user_id),
         raw_email: row['raw_message'],
         via_email: true,
-        # cook_method: Post.cook_methods[:email] # this is slowing down the import by factor 4
+        post_create_action: proc do |post|
+          create_incoming_email(post, row)
+        end
       }
     end
 
+    def format_raw(row, user_id)
+      body = row['body'] || ''
+      elided = row['elided']
+
+      if row['attachment_count'].positive?
+        receiver = Email::Receiver.new(row['raw_message'])
+        body = receiver.add_attachments(body, user_id)
+      end
+
+      body << Email::Receiver.elided_html(elided) if elided.present?
+      body
+    end
+
     def map_first_post(row)
       mapped = map_post(row)
       mapped[:category] = category_id_from_imported_category_id(row['category'])
@@ -132,26 +146,16 @@ module ImportScripts::Mbox
       mapped
     end
 
-    def map_attachments(raw_message, user_id)
-      receiver = Email::Receiver.new(raw_message)
-      attachment_markdown = ''
-
-      receiver.attachments.each do |attachment|
-        tmp = Tempfile.new(['discourse-email-attachment', File.extname(attachment.filename)])
-
-        begin
-          File.open(tmp.path, 'w+b') { |f| f.write attachment.body.decoded }
-          upload = UploadCreator.new(tmp, attachment.filename).create_for(user_id)
-
-          if upload && upload.errors.empty?
-            attachment_markdown << "\n\n#{receiver.attachment_markdown(upload)}\n\n"
-          end
-        ensure
-          tmp.try(:close!)
-        end
-      end
-
-      attachment_markdown
+    def create_incoming_email(post, row)
+      IncomingEmail.create(
+        message_id: row['msg_id'],
+        raw: row['raw_message'],
+        subject: row['subject'],
+        from_address: row['from_email'],
+        user_id: post.user_id,
+        topic_id: post.topic_id,
+        post_id: post.id
+      )
     end
 
     def to_time(datetime)
diff --git a/script/import_scripts/mbox/settings.yml b/script/import_scripts/mbox/settings.yml
index 0a193aa1ed..a8db4453fd 100644
--- a/script/import_scripts/mbox/settings.yml
+++ b/script/import_scripts/mbox/settings.yml
@@ -1,9 +1,10 @@
 # PostgreSQL mailing lists
-#data_dir: /data/import/postgres
+#data_dir: /shared/import/data
 #split_regex: "^From .*@postgresql.org.*"
 
 # ruby-talk mailing list
-data_dir: /data/import/ruby-talk/news/gmane/comp/lang/ruby
+data_dir: /shared/import/data
 split_regex: ""
 
 default_trust_level: 1
+prefer_html: false
diff --git a/script/import_scripts/mbox/support/database.rb b/script/import_scripts/mbox/support/database.rb
index 396d23e5b2..2a20960c25 100644
--- a/script/import_scripts/mbox/support/database.rb
+++ b/script/import_scripts/mbox/support/database.rb
@@ -34,10 +34,10 @@ module ImportScripts::Mbox
     def insert_email(email)
       @db.execute(<<-SQL, email)
         INSERT OR REPLACE INTO email (msg_id, from_email, from_name, subject,
-          email_date, raw_message, body, elided, attachment_count, charset,
+          email_date, raw_message, body, elided, format, attachment_count, charset,
           category, filename, first_line_number, last_line_number)
         VALUES (:msg_id, :from_email, :from_name, :subject,
-          :email_date, :raw_message, :body, :elided, :attachment_count, :charset,
+          :email_date, :raw_message, :body, :elided, :format, :attachment_count, :charset,
           :category, :filename, :first_line_number, :last_line_number)
       SQL
     end
@@ -148,7 +148,7 @@ module ImportScripts::Mbox
     def fetch_messages(last_row_id)
       rows = @db.execute(<<-SQL, last_row_id)
         SELECT o.ROWID, e.msg_id, from_email, subject, email_date, in_reply_to,
-          raw_message, body, elided, attachment_count, category
+          raw_message, body, elided, format, attachment_count, category
         FROM email e
           JOIN email_order o USING (msg_id)
         WHERE email_date IS NOT NULL AND
@@ -163,7 +163,7 @@ module ImportScripts::Mbox
     private
 
     def configure_database
-      @db.execute 'PRAGMA journal_mode = TRUNCATE'
+      @db.execute 'PRAGMA journal_mode = OFF'
     end
 
     def upgrade_schema_version
@@ -204,6 +204,7 @@ module ImportScripts::Mbox
           raw_message TEXT,
           body TEXT,
           elided TEXT,
+          format INTEGER,
           attachment_count INTEGER NOT NULL DEFAULT 0,
           charset TEXT,
           category TEXT NOT NULL,
diff --git a/script/import_scripts/mbox/support/indexer.rb b/script/import_scripts/mbox/support/indexer.rb
index 4884365a06..251975f07d 100644
--- a/script/import_scripts/mbox/support/indexer.rb
+++ b/script/import_scripts/mbox/support/indexer.rb
@@ -58,7 +58,7 @@ module ImportScripts::Mbox
         msg_id = receiver.message_id
         parsed_email = receiver.mail
         from_email, from_display_name = receiver.parse_from_field(parsed_email)
-        body, elided = receiver.select_body
+        body, elided, format = receiver.select_body
         reply_message_ids = extract_reply_message_ids(parsed_email)
 
         email = {
@@ -70,6 +70,7 @@ module ImportScripts::Mbox
           raw_message: receiver.raw_email,
           body: body,
           elided: elided,
+          format: format,
           attachment_count: receiver.attachments.count,
           charset: parsed_email.charset&.downcase,
           category: category_name,
@@ -101,10 +102,12 @@ module ImportScripts::Mbox
 
         if @split_regex.present?
           each_mail(filename) do |raw_message, first_line_number, last_line_number|
-            yield read_mail_from_string(raw_message), filename, first_line_number, last_line_number
+            receiver = read_mail_from_string(raw_message)
+            yield receiver, filename, first_line_number, last_line_number if receiver.present?
           end
         else
-          yield read_mail_from_file(filename), filename
+          receiver = read_mail_from_file(filename)
+          yield receiver, filename if receiver.present?
         end
 
         mark_as_fully_indexed(category_name, filename)
@@ -160,7 +163,7 @@ module ImportScripts::Mbox
     end
 
     def read_mail_from_string(raw_message)
-      Email::Receiver.new(raw_message)
+      Email::Receiver.new(raw_message, convert_plaintext: true) unless raw_message.blank?
     end
 
     def extract_reply_message_ids(mail)
@@ -207,7 +210,12 @@ module ImportScripts::Mbox
     end
 
     def ignored_file?(filename, checksums)
-      File.directory?(filename) || metadata_file?(filename) || fully_indexed?(filename, checksums)
+      File.directory?(filename) || hidden_file?(filename) ||
+        metadata_file?(filename) || fully_indexed?(filename, checksums)
+    end
+
+    def hidden_file?(filename)
+      File.basename(filename).start_with?('.')
     end
 
     def metadata_file?(filename)
diff --git a/script/import_scripts/mbox/support/settings.rb b/script/import_scripts/mbox/support/settings.rb
index 79fb5ab56b..8ec5456a23 100644
--- a/script/import_scripts/mbox/support/settings.rb
+++ b/script/import_scripts/mbox/support/settings.rb
@@ -11,12 +11,14 @@ module ImportScripts::Mbox
     attr_reader :split_regex
     attr_reader :batch_size
     attr_reader :trust_level
+    attr_reader :prefer_html
 
     def initialize(yaml)
       @data_dir = yaml['data_dir']
       @split_regex = Regexp.new(yaml['split_regex']) unless yaml['split_regex'].empty?
       @batch_size = 1000 # no need to make this actually configurable at the moment
       @trust_level = yaml['default_trust_level']
+      @prefer_html = yaml['prefer_html']
     end
   end
 end
diff --git a/script/import_scripts/modx.rb b/script/import_scripts/modx.rb
new file mode 100644
index 0000000000..191135f6bf
--- /dev/null
+++ b/script/import_scripts/modx.rb
@@ -0,0 +1,569 @@
+require 'mysql2'
+require File.expand_path(File.dirname(__FILE__) + "/base.rb")
+require 'htmlentities'
+
+class ImportScripts::Modx < ImportScripts::Base
+  BATCH_SIZE = 1000
+
+  # CHANGE THESE BEFORE RUNNING THE IMPORTER
+
+  DB_HOST ||= ENV['DB_HOST'] || "localhost"
+  DB_NAME ||= ENV['DB_NAME'] || "modx"
+  DB_PW ||= ENV['DB_PW'] || "modex"
+  DB_USER ||= ENV['DB_USER'] || "modx"
+  TIMEZONE ||= ENV['TIMEZONE'] || "America/Los_Angeles"
+  TABLE_PREFIX ||= ENV['TABLE_PREFIX'] || "modx_"
+  ATTACHMENT_DIR ||= ENV['ATTACHMENT_DIR'] || '/path/to/your/attachment/folder'
+  RANDOM_CATEGORY_COLOR ||= !ENV['RANDOM_CATEGORY_COLOR'].nil?
+  SUSPEND_ALL_USERS ||= !ENV['SUSPEND_ALL_USERS']
+
+  #   TODO: replace modx_ with #{TABLE_PREFIX}
+
+  puts "#{DB_USER}:#{DB_PW}@#{DB_HOST} wants #{DB_NAME}"
+
+  def initialize
+    super
+
+    SiteSetting.disable_emails = true
+
+    @old_username_to_new_usernames = {}
+
+    @tz = TZInfo::Timezone.get(TIMEZONE)
+
+    @htmlentities = HTMLEntities.new
+
+    @client = Mysql2::Client.new(
+      host: DB_HOST,
+      username: DB_USER,
+      password: DB_PW,
+      database: DB_NAME
+    )
+  rescue Exception => e
+    puts '=' * 50
+    puts e.message
+    puts <<EOM
+Cannot connect in to database.
+
+Hostname: #{DB_HOST}
+Username: #{DB_USER}
+Password: #{DB_PW}
+database: #{DB_NAME}
+
+Edit the script or set these environment variables:
+
+export DB_HOST="localhost"
+export DB_NAME="modx"
+export DB_PW="modx"
+export DB_USER="modx"
+export TABLE_PREFIX="modx_"
+export ATTACHMENT_DIR '/path/to/your/attachment/folder'
+
+Exiting.
+EOM
+    exit
+  end
+
+  def execute
+    import_users
+    import_categories
+    import_topics_and_posts
+    deactivate_all_users
+    suspend_users
+  end
+
+  def not_import_groups
+    puts "", "importing groups..."
+
+    groups = mysql_query <<-SQL
+        SELECT usergroupid, title
+          FROM #{TABLE_PREFIX}usergroup
+      ORDER BY usergroupid
+    SQL
+
+    create_groups(groups) do |group|
+      {
+        id: group["usergroupid"],
+        name: @htmlentities.decode(group["title"]).strip
+      }
+    end
+  end
+
+  def import_users
+    puts "", "importing users"
+
+    user_count = mysql_query("SELECT COUNT(id) count FROM #{TABLE_PREFIX}discuss_users").first["count"]
+
+    last_user_id = -1
+
+    batches(BATCH_SIZE) do |offset|
+      users = mysql_query(<<-SQL
+SELECT id as userid, email, concat (name_first, " ", name_last) as name, username,
+location, website, status, last_active as last_seen_at,
+createdon as created_at, birthdate as date_of_birth,
+avatar as avatar_url,
+password,
+salt,
+display_name,
+use_display_name
+FROM #{TABLE_PREFIX}discuss_users
+           WHERE id > #{last_user_id}
+        ORDER BY id
+           LIMIT #{BATCH_SIZE};
+      SQL
+                         ).to_a
+
+      break if users.empty?
+
+      last_user_id = users[-1]["userid"]
+      before = users.size
+      users.reject! { |u| @lookup.user_already_imported?(u["userid"].to_i) }
+
+      create_users(users, total: user_count, offset: offset) do |user|
+        {
+          id: user["userid"],
+          name: user['name'],
+          username: user['username'],
+          email: user['email'],
+          website: user['website'],
+          created_at: parse_timestamp(user["created_at"]),
+          last_seen_at: parse_timestamp(user["last_seen_at"]),
+          date_of_birth: user['date_of_birth'],
+          password: "#{user['password']}:#{user['salt']}" # not tested
+        }
+      end
+    end
+  end
+
+  def import_categories
+    # import modx_discuss_categories as categories
+    # import modx_discuss_boards as subcategories
+    puts "", "importing categories..."
+
+    categories = mysql_query("select id, name, description from modx_discuss_categories").to_a
+
+    create_categories(categories) do |category|
+      puts "Creating #{category['name']}"
+      puts category
+      {
+        id: "cat#{category['id']}",
+        name: category["name"],
+        color: RANDOM_CATEGORY_COLOR ? (0..2).map { "%0x" % (rand * 0x80) }.join : nil,
+        description: category["description"]
+      }
+    end
+
+    puts "", "importing boards as subcategories..."
+
+    boards = mysql_query("select id, category, name, description from modx_discuss_boards;").to_a
+    create_categories(boards) do |category|
+      puts category
+      parent_category_id = category_id_from_imported_category_id("cat#{category['category']}")
+      {
+        id: category["id"],
+        parent_category_id: parent_category_id.to_s,
+        name: category["name"],
+        color: RANDOM_CATEGORY_COLOR ? (0..2).map { "%0x" % (rand * 0x80) }.join : nil,
+        description: category["description"]
+      }
+    end
+  end
+
+  def import_topics_and_posts
+    puts "", "creating topics and posts"
+
+    total_count = mysql_query("SELECT count(id) count from #{TABLE_PREFIX}discuss_posts").first["count"]
+
+    topic_first_post_id = {}
+
+    batches(BATCH_SIZE) do |offset|
+      results = mysql_query("
+         SELECT id,
+		thread topic_id,
+                board category_id,
+                title,
+                message raw,
+                parent,
+                author user_id,
+                createdon created_at
+	        from modx_discuss_posts
+       ORDER BY createdon
+         LIMIT #{BATCH_SIZE}
+        OFFSET #{offset};
+      ")
+
+      break if results.size < 1
+
+      next if all_records_exist? :posts, results.map { |m| m['id'].to_i }
+
+      create_posts(results, total: total_count, offset: offset) do |m|
+        skip = false
+        mapped = {}
+
+        mapped[:id] = m['id']
+        mapped[:user_id] = user_id_from_imported_user_id(m['user_id']) || -1
+        mapped[:raw] = post_process_raw(m['raw'])
+        mapped[:created_at] = Time.zone.at(m['created_at'])
+
+        if m['parent'] == 0
+          mapped[:category] = category_id_from_imported_category_id(m['category_id'])
+          mapped[:title] = m['title']
+          topic_first_post_id[m['topic_id']] = m['id']
+        else
+          parent = topic_lookup_from_imported_post_id(topic_first_post_id[m['topic_id']])
+          if parent
+            mapped[:topic_id] = parent[:topic_id]
+          else
+            puts "Parent post #{first_post_id} doesn't exist. Skipping #{m["id"]}: #{m["title"][0..40]}"
+            skip = true
+          end
+        end
+
+        skip ? nil : mapped
+      end
+    end
+  end
+
+  def post_process_raw(raw)
+    # [QUOTE]...[/QUOTE]
+    raw = raw.gsub(/\[quote.*?\](.+?)\[\/quote\]/im) { |quote|
+      quote = quote.gsub(/\[quote author=(.*?) .+\]/i) { "\n[quote=\"#{$1}\"]\n" }
+      quote = quote.gsub(/[^\n]\[\/quote\]/im) { "\n[/quote]\n" }
+    }
+
+    raw
+  end
+
+  def not_mark_topics_as_solved
+    puts "", "Marking topics as solved..."
+
+    PostAction.exec_sql <<-SQL
+      INSERT INTO topic_custom_fields (name, value, topic_id, created_at, updated_at)
+      SELECT 'accepted_answer_post_id', pcf.post_id, p.topic_id, p.created_at, p.created_at
+        FROM post_custom_fields pcf
+        JOIN posts p ON p.id = pcf.post_id
+       WHERE pcf.name = 'is_accepted_answer'
+    SQL
+  end
+
+  # find the uploaded file information from the db
+  def not_find_upload(post, attachment_id)
+    sql = "SELECT a.attachmentid attachment_id, a.userid user_id, a.filedataid file_id, a.filename filename,
+                  a.caption caption
+             FROM #{TABLE_PREFIX}attachment a
+            WHERE a.attachmentid = #{attachment_id}"
+    results = mysql_query(sql)
+
+    unless row = results.first
+      puts "Couldn't find attachment record for post.id = #{post.id}, import_id = #{post.custom_fields['import_id']}"
+      return
+    end
+
+    filename = File.join(ATTACHMENT_DIR, row['user_id'].to_s.split('').join('/'), "#{row['file_id']}.attach")
+    unless File.exists?(filename)
+      puts "Attachment file doesn't exist: #{filename}"
+      return
+    end
+
+    real_filename = row['filename']
+    real_filename.prepend SecureRandom.hex if real_filename[0] == '.'
+    upload = create_upload(post.user.id, filename, real_filename)
+
+    if upload.nil? || !upload.valid?
+      puts "Upload not valid :("
+      puts upload.errors.inspect if upload
+      return
+    end
+
+    [upload, real_filename]
+  rescue Mysql2::Error => e
+    puts "SQL Error"
+    puts e.message
+    puts sql
+  end
+
+  def not_import_private_messages
+    puts "", "importing private messages..."
+
+    topic_count = mysql_query("SELECT COUNT(pmtextid) count FROM #{TABLE_PREFIX}pmtext").first["count"]
+
+    last_private_message_id = -1
+
+    batches(BATCH_SIZE) do |offset|
+      private_messages = mysql_query(<<-SQL
+          SELECT pmtextid, fromuserid, title, message, touserarray, dateline
+            FROM #{TABLE_PREFIX}pmtext
+           WHERE pmtextid > #{last_private_message_id}
+        ORDER BY pmtextid
+           LIMIT #{BATCH_SIZE}
+      SQL
+                                    ).to_a
+
+      break if private_messages.empty?
+
+      last_private_message_id = private_messages[-1]["pmtextid"]
+      private_messages.reject! { |pm| @lookup.post_already_imported?("pm-#{pm['pmtextid']}") }
+
+      title_username_of_pm_first_post = {}
+
+      create_posts(private_messages, total: topic_count, offset: offset) do |m|
+        skip = false
+        mapped = {}
+
+        mapped[:id] = "pm-#{m['pmtextid']}"
+        mapped[:user_id] = user_id_from_imported_user_id(m['fromuserid']) || Discourse::SYSTEM_USER_ID
+        mapped[:raw] = preprocess_post_raw(m['message']) rescue nil
+        mapped[:created_at] = Time.zone.at(m['dateline'])
+        title = @htmlentities.decode(m['title']).strip[0...255]
+        topic_id = nil
+
+        next if mapped[:raw].blank?
+
+        # users who are part of this private message.
+        target_usernames = []
+        target_userids = []
+        begin
+          to_user_array = PHP.unserialize(m['touserarray'])
+        rescue
+          puts "#{m['pmtextid']} -- #{m['touserarray']}"
+          skip = true
+        end
+
+        begin
+          to_user_array.each do |to_user|
+            if to_user[0] == "cc" || to_user[0] == "bcc" # not sure if we should include bcc users
+              to_user[1].each do |to_user_cc|
+                user_id = user_id_from_imported_user_id(to_user_cc[0])
+                username = User.find_by(id: user_id).try(:username)
+                target_userids << user_id || Discourse::SYSTEM_USER_ID
+                target_usernames << username if username
+              end
+            else
+              user_id = user_id_from_imported_user_id(to_user[0])
+              username = User.find_by(id: user_id).try(:username)
+              target_userids << user_id || Discourse::SYSTEM_USER_ID
+              target_usernames << username if username
+            end
+          end
+        rescue
+          puts "skipping pm-#{m['pmtextid']} `to_user_array` is not properly serialized -- #{to_user_array.inspect}"
+          skip = true
+        end
+
+        participants = target_userids
+        participants << mapped[:user_id]
+        begin
+          participants.sort!
+        rescue
+          puts "one of the participant's id is nil -- #{participants.inspect}"
+        end
+
+        if title =~ /^Re:/
+
+          parent_id = title_username_of_pm_first_post[[title[3..-1], participants]] ||
+                      title_username_of_pm_first_post[[title[4..-1], participants]] ||
+                      title_username_of_pm_first_post[[title[5..-1], participants]] ||
+                      title_username_of_pm_first_post[[title[6..-1], participants]] ||
+                      title_username_of_pm_first_post[[title[7..-1], participants]] ||
+                      title_username_of_pm_first_post[[title[8..-1], participants]]
+
+          if parent_id
+            if t = topic_lookup_from_imported_post_id("pm-#{parent_id}")
+              topic_id = t[:topic_id]
+            end
+          end
+        else
+          title_username_of_pm_first_post[[title, participants]] ||= m['pmtextid']
+        end
+
+        unless topic_id
+          mapped[:title] = title
+          mapped[:archetype] = Archetype.private_message
+          mapped[:target_usernames] = target_usernames.join(',')
+
+          if mapped[:target_usernames].size < 1 # pm with yourself?
+            # skip = true
+            mapped[:target_usernames] = "system"
+            puts "pm-#{m['pmtextid']} has no target (#{m['touserarray']})"
+          end
+        else
+          mapped[:topic_id] = topic_id
+        end
+
+        skip ? nil : mapped
+      end
+    end
+  end
+
+  def not_import_attachments
+    puts '', 'importing attachments...'
+
+    current_count = 0
+
+    total_count = mysql_query(<<-SQL
+      SELECT COUNT(postid) count
+        FROM #{TABLE_PREFIX}post p
+        JOIN #{TABLE_PREFIX}thread t ON t.threadid = p.threadid
+       WHERE t.firstpostid <> p.postid
+    SQL
+                             ).first["count"]
+
+    success_count = 0
+    fail_count = 0
+
+    attachment_regex = /\[attach[^\]]*\](\d+)\[\/attach\]/i
+
+    Post.find_each do |post|
+      current_count += 1
+      print_status current_count, total_count
+
+      new_raw = post.raw.dup
+      new_raw.gsub!(attachment_regex) do |s|
+        matches = attachment_regex.match(s)
+        attachment_id = matches[1]
+
+        upload, filename = find_upload(post, attachment_id)
+        unless upload
+          fail_count += 1
+          next
+        end
+
+        html_for_upload(upload, filename)
+      end
+
+      if new_raw != post.raw
+        PostRevisor.new(post).revise!(post.user, { raw: new_raw }, bypass_bump: true, edit_reason: 'Import attachments from modx')
+      end
+
+      success_count += 1
+    end
+  end
+
+  def not_close_topics
+    puts "", "Closing topics..."
+
+    # keep track of closed topics
+    closed_topic_ids = []
+
+    topics = mysql_query <<-MYSQL
+        SELECT t.threadid threadid, firstpostid, open
+          FROM #{TABLE_PREFIX}thread t
+          JOIN #{TABLE_PREFIX}post p ON p.postid = t.firstpostid
+      ORDER BY t.threadid
+    MYSQL
+    topics.each do |topic|
+      topic_id = "thread-#{topic["threadid"]}"
+      closed_topic_ids << topic_id if topic["open"] == 0
+    end
+
+    sql = <<-SQL
+      WITH closed_topic_ids AS (
+        SELECT t.id AS topic_id
+        FROM post_custom_fields pcf
+        JOIN posts p ON p.id = pcf.post_id
+        JOIN topics t ON t.id = p.topic_id
+        WHERE pcf.name = 'import_id'
+        AND pcf.value IN (?)
+      )
+      UPDATE topics
+      SET closed = true
+      WHERE id IN (SELECT topic_id FROM closed_topic_ids)
+    SQL
+
+    Topic.exec_sql(sql, closed_topic_ids)
+  end
+
+  def not_post_process_posts
+    puts "", "Postprocessing posts..."
+
+    current = 0
+    max = Post.count
+
+    Post.find_each do |post|
+      begin
+        new_raw = postprocess_post_raw(post.raw)
+        if new_raw != post.raw
+          post.raw = new_raw
+          post.save
+        end
+      rescue PrettyText::JavaScriptError
+        nil
+      ensure
+        print_status(current += 1, max)
+      end
+    end
+  end
+
+  def not_create_permalink_file
+    puts '', 'Creating Permalink File...', ''
+
+    id_mapping = []
+
+    Topic.listable_topics.find_each do |topic|
+      pcf = topic.first_post.custom_fields
+      if pcf && pcf["import_id"]
+        id = pcf["import_id"].split('-').last
+        id_mapping.push("XXX#{id}  YYY#{topic.id}")
+      end
+    end
+
+    # Category.find_each do |cat|
+    #   ccf = cat.custom_fields
+    #   if ccf && ccf["import_id"]
+    #     id = ccf["import_id"].to_i
+    #     id_mapping.push("/forumdisplay.php?#{id}  http://forum.quartertothree.com#{cat.url}")
+    #   end
+    # end
+
+    CSV.open(File.expand_path("../vb_map.csv", __FILE__), "w") do |csv|
+      id_mapping.each do |value|
+        csv << [value]
+      end
+    end
+
+  end
+
+  def deactivate_all_users
+    User.where("id > 0 and admin != true").update_all(active: true)
+  end
+
+  def suspend_users
+    puts '', "updating blocked users"
+
+    banned = 0
+    failed = 0
+    total = mysql_query("SELECT count(*) count FROM #{TABLE_PREFIX}user_attributes where blocked != 0").first['count']
+
+    system_user = Discourse.system_user
+
+    mysql_query("SELECT id, blockedafter, blockeduntil FROM #{TABLE_PREFIX}user_attributes").each do |b|
+      user = User.find_by_id(user_id_from_imported_user_id(b['id']))
+      if user
+        user.suspended_at = parse_timestamp(user["blockedafter"])
+        user.suspended_till = parse_timestamp(user["blockeduntil"])
+        if user.save
+          StaffActionLogger.new(system_user).log_user_suspend(user, "banned during initial import")
+          banned += 1
+        else
+          puts "Failed to suspend user #{user.username}. #{user.errors.try(:full_messages).try(:inspect)}"
+          failed += 1
+        end
+      else
+        puts "Not found: #{b['userid']}"
+        failed += 1
+      end
+
+      print_status banned + failed, total
+    end
+  end
+
+  def parse_timestamp(timestamp)
+    Time.zone.at(@tz.utc_to_local(timestamp))
+  end
+
+  def mysql_query(sql)
+    @client.query(sql, cache_rows: true)
+  end
+
+end
+
+ImportScripts::Modx.new.perform
diff --git a/script/import_scripts/muut.rb b/script/import_scripts/muut.rb
index ccd356d90d..24134ee3f9 100644
--- a/script/import_scripts/muut.rb
+++ b/script/import_scripts/muut.rb
@@ -59,7 +59,6 @@ class ImportScripts::Muut < ImportScripts::Base
     end
   end
 
-
   def import_categories
     puts "", "Importing categories"
 
@@ -72,7 +71,6 @@ class ImportScripts::Muut < ImportScripts::Base
     end
   end
 
-
   def import_discussions
     puts "", "Importing discussions"
 
@@ -81,7 +79,6 @@ class ImportScripts::Muut < ImportScripts::Base
 
     @imported_json['categories'].each do |category|
 
-
       @imported_json['threads'][category['path']].each do |thread|
 
         next if thread["seed"]["key"] == "skip-this-topic"
@@ -96,7 +93,7 @@ class ImportScripts::Muut < ImportScripts::Base
         end
 
         # update user display name
-        if thread["seed"]["author"] && thread["seed"]["author"]["displayname"] != ""  && mapped[:user_id] != -1
+        if thread["seed"]["author"] && thread["seed"]["author"]["displayname"] != "" && mapped[:user_id] != -1
           user = User.find_by(id: mapped[:user_id])
           if user
             user.name = thread["seed"]["author"]["displayname"]
@@ -181,6 +178,6 @@ class ImportScripts::Muut < ImportScripts::Base
 
 end
 
-if __FILE__==$0
+if __FILE__ == $0
   ImportScripts::Muut.new.perform
 end
diff --git a/script/import_scripts/mybb.rb b/script/import_scripts/mybb.rb
index c6d104e28f..f9201ecacf 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
 
@@ -48,7 +66,7 @@ class ImportScripts::MyBB < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :users, results.map {|u| u["id"].to_i}
+      next if all_records_exist? :users, results.map { |u| u["id"].to_i }
 
       create_users(results, total: total_count, offset: offset) do |user|
         { id: user['id'],
@@ -69,7 +87,7 @@ class ImportScripts::MyBB < ImportScripts::Base
     ")
 
     create_categories(results) do |row|
-      h = {id: row['id'], name: CGI.unescapeHTML(row['name']), description: CGI.unescapeHTML(row['description'])}
+      h = { id: row['id'], name: CGI.unescapeHTML(row['name']), description: CGI.unescapeHTML(row['description']) }
       if row['parent_id'].to_i > 0
         h[:parent_category_id] = category_id_from_imported_category_id(row['parent_id'])
       end
@@ -102,7 +120,7 @@ class ImportScripts::MyBB < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|m| m['id'].to_i}
+      next if all_records_exist? :posts, results.map { |m| m['id'].to_i }
 
       create_posts(results, total: total_count, offset: offset) do |m|
         skip = false
@@ -214,10 +232,73 @@ 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/mylittleforum.rb b/script/import_scripts/mylittleforum.rb
index fbec5dad46..f0ec152472 100644
--- a/script/import_scripts/mylittleforum.rb
+++ b/script/import_scripts/mylittleforum.rb
@@ -2,7 +2,6 @@ require "mysql2"
 require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 require 'htmlentities'
 
-
 # Before running this script, paste these lines into your shell,
 # then use arrow keys to edit the values
 =begin
@@ -16,7 +15,6 @@ export IMAGE_BASE="http://www.example.com/forum"
 export BASE="forum"
 =end
 
-
 class ImportScripts::MylittleforumSQL < ImportScripts::Base
 
   DB_HOST ||= ENV['DB_HOST'] || "localhost"
@@ -37,10 +35,9 @@ class ImportScripts::MylittleforumSQL < ImportScripts::Base
   # Site settings
   SiteSetting.disable_emails = true
   if FORCE_HOSTNAME
-    SiteSetting.force_hostname=FORCE_HOSTNAME
+    SiteSetting.force_hostname = FORCE_HOSTNAME
   end
 
-
   def initialize
 
     if IMPORT_AFTER > "1970-01-01"
@@ -57,7 +54,7 @@ class ImportScripts::MylittleforumSQL < ImportScripts::Base
         database: DB_NAME
       )
     rescue Exception => e
-      puts '='*50
+      puts '=' * 50
       puts e.message
       puts <<EOM
 Cannot log in to database.
@@ -123,7 +120,7 @@ EOM
 
       break if results.size < 1
 
-      next if all_records_exist? :users, results.map {|u| u['UserID'].to_i}
+      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?
@@ -151,15 +148,15 @@ EOM
 
   def fix_username(username)
     olduser = username.dup
-    username.gsub!(/Dr\. /,"Dr") # no &
-    username.gsub!(/[ +!\/,*()?]/,"_") # can't have these
-    username.gsub!(/&/,"_and_") # no &
-    username.gsub!(/@/,"_at_") # no @
-    username.gsub!(/#/,"_hash_") # no &
-    username.gsub!(/\'/,"") # seriously?
-    username.gsub!(/[._]+/,"_") # can't have 2 special in a row
-    username.gsub!(/_+/,"_") # could result in dupes, but wtf?
-    username.gsub!(/_$/,"") # could result in dupes, but wtf?
+    username.gsub!(/Dr\. /, "Dr") # no &
+    username.gsub!(/[ +!\/,*()?]/, "_") # can't have these
+    username.gsub!(/&/, "_and_") # no &
+    username.gsub!(/@/, "_at_") # no @
+    username.gsub!(/#/, "_hash_") # no &
+    username.gsub!(/\'/, "") # seriously?
+    username.gsub!(/[._]+/, "_") # can't have 2 special in a row
+    username.gsub!(/_+/, "_") # could result in dupes, but wtf?
+    username.gsub!(/_$/, "") # could result in dupes, but wtf?
     if olduser != username
       print_warning ("#{olduser} --> #{username}")
     end
@@ -210,7 +207,7 @@ EOM
          OFFSET #{offset};")
 
       break if discussions.size < 1
-      next if all_records_exist? :posts, discussions.map {|t| "discussion#" + t['DiscussionID'].to_s}
+      next if all_records_exist? :posts, discussions.map { |t| "discussion#" + t['DiscussionID'].to_s }
 
       create_posts(discussions, total: total_count, offset: offset) do |discussion|
 
@@ -226,7 +223,7 @@ EOM
         {
           id: "discussion#" + discussion['DiscussionID'].to_s,
           user_id: user_id_from_imported_user_id(discussion['InsertUserID']) || Discourse::SYSTEM_USER_ID,
-          title: discussion['Name'].gsub('\\"','"'),
+          title: discussion['Name'].gsub('\\"', '"'),
           category: category_id_from_imported_category_id(discussion['CategoryID']),
           raw: raw,
           created_at: Time.zone.at(discussion['DateInserted']),
@@ -260,7 +257,7 @@ EOM
          OFFSET #{offset};")
 
       break if comments.size < 1
-      next if all_records_exist? :posts, comments.map {|comment| "comment#" + comment['CommentID'].to_s}
+      next if all_records_exist? :posts, comments.map { |comment| "comment#" + comment['CommentID'].to_s }
 
       create_posts(comments, total: total_count, offset: offset) do |comment|
         next unless t = topic_lookup_from_imported_post_id("discussion#" + comment['DiscussionID'].to_s)
@@ -286,9 +283,9 @@ EOM
     youtube_cooked = clean_up(youtube_raw.dup.to_s)
     # get just src from <iframe> and put on a line by itself
     re = /<iframe.+?src="(\S+?)".+?<\/iframe>/mix
-    youtube_cooked.gsub!(re) {"\n#{$1}\n"}
+    youtube_cooked.gsub!(re) { "\n#{$1}\n" }
     re = /<object.+?src="(\S+?)".+?<\/object>/mix
-    youtube_cooked.gsub!(re) {"\n#{$1}\n"}
+    youtube_cooked.gsub!(re) { "\n#{$1}\n" }
     youtube_cooked.gsub!(/^\/\//, "https://") # make sure it has a protocol
     unless /http/.match(youtube_cooked) # handle case of only youtube object number
       if youtube_cooked.length < 8 || /[<>=]/.match(youtube_cooked)
@@ -298,7 +295,7 @@ EOM
         youtube_cooked = 'https://www.youtube.com/watch?v=' + youtube_cooked
       end
     end
-    print_warning("#{'-'*40}\nBefore: #{youtube_raw}\nAfter: #{youtube_cooked}") unless QUIET
+    print_warning("#{'-' * 40}\nBefore: #{youtube_raw}\nAfter: #{youtube_cooked}") unless QUIET
 
     youtube_cooked
   end
@@ -310,8 +307,8 @@ EOM
     raw = @htmlentities.decode(raw)
 
     # don't \ quotes
-    raw = raw.gsub('\\"','"')
-    raw = raw.gsub("\\'","'")
+    raw = raw.gsub('\\"', '"')
+    raw = raw.gsub("\\'", "'")
 
     raw = raw.gsub(/\[b\]/i, "<strong>")
     raw = raw.gsub(/\[\/b\]/i, "</strong>")
@@ -322,12 +319,12 @@ EOM
     raw = raw.gsub(/\[u\]/i, "<em>")
     raw = raw.gsub(/\[\/u\]/i, "</em>")
 
-    raw = raw.gsub(/\[url\](\S+)\[\/url\]/im) { "#{$1}"}
-    raw = raw.gsub(/\[link\](\S+)\[\/link\]/im) { "#{$1}"}
+    raw = raw.gsub(/\[url\](\S+)\[\/url\]/im) { "#{$1}" }
+    raw = raw.gsub(/\[link\](\S+)\[\/link\]/im) { "#{$1}" }
 
     # URL & LINK with text
-    raw = raw.gsub(/\[url=(\S+?)\](.*?)\[\/url\]/im) { "<a href=\"#{$1}\">#{$2}</a>"}
-    raw = raw.gsub(/\[link=(\S+?)\](.*?)\[\/link\]/im) { "<a href=\"#{$1}\">#{$2}</a>"}
+    raw = raw.gsub(/\[url=(\S+?)\](.*?)\[\/url\]/im) { "<a href=\"#{$1}\">#{$2}</a>" }
+    raw = raw.gsub(/\[link=(\S+?)\](.*?)\[\/link\]/im) { "<a href=\"#{$1}\">#{$2}</a>" }
 
     # remote images
     raw = raw.gsub(/\[img\](https?:.+?)\[\/img\]/im) { "<img src=\"#{$1}\">" }
@@ -347,22 +344,22 @@ EOM
     raw.gsub(/\[postedby\](.+?)\[b\](.+?)\[\/b\]\[\/postedby\]/i) { "#{$1}@#{$2}" }
 
     # CODE (not tested)
-    raw = raw.gsub(/\[code\](\S+)\[\/code\]/im) { "```\n#{$1}\n```"}
-    raw = raw.gsub(/\[pre\](\S+)\[\/pre\]/im) { "```\n#{$1}\n```"}
+    raw = raw.gsub(/\[code\](\S+)\[\/code\]/im) { "```\n#{$1}\n```" }
+    raw = raw.gsub(/\[pre\](\S+)\[\/pre\]/im) { "```\n#{$1}\n```" }
 
     raw = raw.gsub(/(https:\/\/youtu\S+)/i) { "\n#{$1}\n" } #youtube links on line by themselves
 
     # no center
-    raw = raw.gsub(/\[\/?center\]/i,"")
+    raw = raw.gsub(/\[\/?center\]/i, "")
 
     # no size
-    raw = raw.gsub(/\[\/?size.*?\]/i,"")
+    raw = raw.gsub(/\[\/?size.*?\]/i, "")
 
     ### FROM VANILLA:
 
     # fix whitespaces
     raw = raw.gsub(/(\\r)?\\n/, "\n")
-             .gsub("\\t", "\t")
+      .gsub("\\t", "\t")
 
     unless CONVERT_HTML
       # replace all chevrons with HTML entities
@@ -370,12 +367,12 @@ EOM
       #  - AFTER all the "code" processing
       #  - BEFORE the "quote" processing
       raw = raw.gsub(/`([^`]+)`/im) { "`" + $1.gsub("<", "\u2603") + "`" }
-               .gsub("<", "&lt;")
-               .gsub("\u2603", "<")
+        .gsub("<", "&lt;")
+        .gsub("\u2603", "<")
 
       raw = raw.gsub(/`([^`]+)`/im) { "`" + $1.gsub(">", "\u2603") + "`" }
-               .gsub(">", "&gt;")
-               .gsub("\u2603", ">")
+        .gsub(">", "&gt;")
+        .gsub("\u2603", ">")
     end
 
     # Remove the color tag
@@ -402,7 +399,7 @@ EOM
     User.find_each do |u|
       ucf = u.custom_fields
       if ucf && ucf["import_id"] && ucf["import_username"]
-        Permalink.create( url: "#{BASE}/user-id-#{ucf['import_id']}.html", external_url: "/u/#{u.username}" ) rescue nil
+        Permalink.create(url: "#{BASE}/user-id-#{ucf['import_id']}.html", external_url: "/u/#{u.username}") rescue nil
         print '.'
       end
     end
@@ -414,12 +411,12 @@ EOM
         topic = post.topic
         id = pcf["import_id"].split('#').last
         if post.post_number == 1
-          Permalink.create( url: "#{BASE}/forum_entry-id-#{id}.html", topic_id: topic.id ) rescue nil
+          Permalink.create(url: "#{BASE}/forum_entry-id-#{id}.html", topic_id: topic.id) rescue nil
           unless QUIET
             print_warning("forum_entry-id-#{id}.html --> http://localhost:3000/t/#{topic.id}")
           end
         else
-          Permalink.create( url: "#{BASE}/forum_entry-id-#{id}.html", post_id: post.id ) rescue nil
+          Permalink.create(url: "#{BASE}/forum_entry-id-#{id}.html", post_id: post.id) rescue nil
           unless QUIET
             print_warning("forum_entry-id-#{id}.html --> http://localhost:3000/t/#{topic.id}/#{post.id}")
           end
@@ -435,7 +432,7 @@ EOM
       unless QUIET
         print_warning("forum-category-#{id}.html --> /t/#{cat.id}")
       end
-      Permalink.create( url: "#{BASE}/forum-category-#{id}.html", category_id: cat.id ) rescue nil
+      Permalink.create(url: "#{BASE}/forum-category-#{id}.html", category_id: cat.id) rescue nil
       print '.'
     end
   end
@@ -444,8 +441,6 @@ EOM
     $stderr.puts "#{message}"
   end
 
-
-
 end
 
 ImportScripts::MylittleforumSQL.new.perform
diff --git a/script/import_scripts/nabble.rb b/script/import_scripts/nabble.rb
index 529f46509d..ac3a93f8dc 100644
--- a/script/import_scripts/nabble.rb
+++ b/script/import_scripts/nabble.rb
@@ -3,12 +3,12 @@ require 'pg'
 require_relative 'base/uploader'
 
 =begin
- if you want to create mock users for posts made by anonymous participants, 
+ if you want to create mock users for posts made by anonymous participants,
  run the following SQL prior to importing.
 
 -- first attribute any anonymous posts to existing users (if any)
 
-UPDATE node 
+UPDATE node
 SET owner_id = p.user_id, anonymous_name = NULL
 FROM ( SELECT lower(name) AS name, user_id FROM user_ ) p
 WHERE p.name = lower(node.anonymous_name)
@@ -25,7 +25,7 @@ INSERT INTO user_ (email, name, joined, registered)
 -- then move these posts to the new users
 -- (yes, this is the same query as the first one indeed)
 
-UPDATE node 
+UPDATE node
 SET owner_id = p.user_id, anonymous_name = NULL
 FROM ( SELECT lower(name) AS name, user_id FROM user_ ) p
 WHERE p.name = lower(node.anonymous_name)
@@ -33,7 +33,6 @@ WHERE p.name = lower(node.anonymous_name)
 
 =end
 
-
 class ImportScripts::Nabble < ImportScripts::Base
   # CHANGE THESE BEFORE RUNNING THE IMPORTER
 
@@ -74,7 +73,7 @@ class ImportScripts::Nabble < ImportScripts::Base
 
       break if users.ntuples() < 1
 
-      next if all_records_exist? :users, users.map {|u| u["user_id"].to_i}
+      next if all_records_exist? :users, users.map { |u| u["user_id"].to_i }
 
       create_users(users, total: total_count, offset: offset) do |row|
         {
@@ -144,7 +143,7 @@ class ImportScripts::Nabble < ImportScripts::Base
 
       break if topics.ntuples() < 1
 
-      next if all_records_exist? :posts, topics.map {|t| t['node_id'].to_i}
+      next if all_records_exist? :posts, topics.map { |t| t['node_id'].to_i }
 
       create_posts(topics, total: topic_count, offset: offset) do |t|
         raw = body_from(t)
@@ -173,7 +172,7 @@ class ImportScripts::Nabble < ImportScripts::Base
     txt.gsub! /\<quote author="(.*?)"\>/, '[quote="\1"]'
     txt.gsub! /\<\/quote\>/, '[/quote]'
     txt.gsub!(/\<raw\>(.*?)\<\/raw\>/m) do |match|
-       c = Regexp.last_match[1].indent(4);
+      c = Regexp.last_match[1].indent(4);
        "\n#{c}\n"
     end
 
@@ -246,7 +245,7 @@ class ImportScripts::Nabble < ImportScripts::Base
 
       break if posts.ntuples() < 1
 
-      next if all_records_exist? :posts, posts.map {|p| p['node_id'].to_i}
+      next if all_records_exist? :posts, posts.map { |p| p['node_id'].to_i }
 
       create_posts(posts, total: post_count, offset: offset) do |p|
         parent_id = p['parent_id']
@@ -289,5 +288,4 @@ class String
   end
 end
 
-
 ImportScripts::Nabble.new.perform
diff --git a/script/import_scripts/ning.rb b/script/import_scripts/ning.rb
index 47b9ce8535..7646b37f3f 100644
--- a/script/import_scripts/ning.rb
+++ b/script/import_scripts/ning.rb
@@ -164,7 +164,6 @@ class ImportScripts::Ning < ImportScripts::Base
     puts "", "Marked #{suspended} users as suspended."
   end
 
-
   def import_categories
     puts "", "Importing categories"
     create_categories((["Blog", "Pages", "Photos"] + @discussions_json.map { |d| d["category"] }).uniq.compact) do |name|
@@ -179,7 +178,6 @@ class ImportScripts::Ning < ImportScripts::Base
     end
   end
 
-
   def import_discussions
     puts "", "Importing discussions"
     import_topics(@discussions_json)
@@ -200,7 +198,7 @@ class ImportScripts::Ning < ImportScripts::Base
     import_topics(@pages_json, "Pages")
   end
 
-  def import_topics(topics_json, default_category=nil)
+  def import_topics(topics_json, default_category = nil)
     topics = 0
     posts = 0
     total = topics_json.size # number of topics. posts are embedded in the topic json, so we can't get total post count quickly.
@@ -398,6 +396,6 @@ class ImportScripts::Ning < ImportScripts::Base
   end
 end
 
-if __FILE__==$0
+if __FILE__ == $0
   ImportScripts::Ning.new.perform
 end
diff --git a/script/import_scripts/phpbb3/importer.rb b/script/import_scripts/phpbb3/importer.rb
index dfaa21951b..8ed128d310 100644
--- a/script/import_scripts/phpbb3/importer.rb
+++ b/script/import_scripts/phpbb3/importer.rb
@@ -34,32 +34,9 @@ module ImportScripts::PhpBB3
     end
 
     def change_site_settings
-      # let's make sure that we import all attachments no matter how big they are
-      setting_keys = [:max_image_size_kb, :max_attachment_size_kb]
-      original_validators = disable_setting_validators(setting_keys)
-
       super
 
       @importers.permalink_importer.change_site_settings
-
-      enable_setting_validators(original_validators)
-    end
-
-    def disable_setting_validators(setting_keys)
-      original_validators = {}
-
-      setting_keys.each do |key|
-        original_validators[key] = SiteSetting.validators[key]
-        SiteSetting.validators[key] = nil
-      end
-
-      original_validators
-    end
-
-    def enable_setting_validators(original_validators)
-      original_validators.each do |key, validator|
-        SiteSetting.validators[key] = validator
-      end
     end
 
     def get_site_settings_for_import
@@ -69,6 +46,10 @@ module ImportScripts::PhpBB3
       settings[:max_image_size_kb] = [max_file_size_kb, SiteSetting.max_image_size_kb].max
       settings[:max_attachment_size_kb] = [max_file_size_kb, SiteSetting.max_attachment_size_kb].max
 
+      # temporarily disable validation since we want to import all existing images and attachments
+      SiteSetting.type_supervisor.load_setting(:max_image_size_kb, max: settings[:max_image_size_kb])
+      SiteSetting.type_supervisor.load_setting(:max_attachment_size_kb, max: settings[:max_attachment_size_kb])
+
       settings
     end
 
diff --git a/script/import_scripts/phpbb3/importers/avatar_importer.rb b/script/import_scripts/phpbb3/importers/avatar_importer.rb
index 8a5e3a0c6f..a9cd22d4c9 100644
--- a/script/import_scripts/phpbb3/importers/avatar_importer.rb
+++ b/script/import_scripts/phpbb3/importers/avatar_importer.rb
@@ -47,15 +47,15 @@ module ImportScripts::PhpBB3
 
     def get_avatar_path(avatar_type, filename)
       case avatar_type
-        when Constants::AVATAR_TYPE_UPLOADED then
-          filename.gsub!(/_[0-9]+\./, '.') # we need 1337.jpg, not 1337_2983745.jpg
+      when Constants::AVATAR_TYPE_UPLOADED then
+        filename.gsub!(/_[0-9]+\./, '.') # we need 1337.jpg, not 1337_2983745.jpg
           get_uploaded_path(filename)
-        when Constants::AVATAR_TYPE_GALLERY then
-          get_gallery_path(filename)
-        when Constants::AVATAR_TYPE_REMOTE then
-          download_avatar(filename)
+      when Constants::AVATAR_TYPE_GALLERY then
+        get_gallery_path(filename)
+      when Constants::AVATAR_TYPE_REMOTE then
+        download_avatar(filename)
         else
-          Rails.logger.error("Invalid avatar type #{avatar_type}. Skipping...")
+        Rails.logger.error("Invalid avatar type #{avatar_type}. Skipping...")
           nil
       end
     end
@@ -97,14 +97,14 @@ module ImportScripts::PhpBB3
 
     def is_allowed_avatar_type?(avatar_type)
       case avatar_type
-        when Constants::AVATAR_TYPE_UPLOADED then
-          @settings.import_uploaded_avatars
-        when Constants::AVATAR_TYPE_REMOTE then
-          @settings.import_remote_avatars
-        when Constants::AVATAR_TYPE_GALLERY then
-          @settings.import_gallery_avatars
+      when Constants::AVATAR_TYPE_UPLOADED then
+        @settings.import_uploaded_avatars
+      when Constants::AVATAR_TYPE_REMOTE then
+        @settings.import_remote_avatars
+      when Constants::AVATAR_TYPE_GALLERY then
+        @settings.import_gallery_avatars
         else
-          false
+        false
       end
     end
   end
diff --git a/script/import_scripts/phpbb3/importers/category_importer.rb b/script/import_scripts/phpbb3/importers/category_importer.rb
index f7d825c3f2..d7d8addfda 100644
--- a/script/import_scripts/phpbb3/importers/category_importer.rb
+++ b/script/import_scripts/phpbb3/importers/category_importer.rb
@@ -41,8 +41,8 @@ module ImportScripts::PhpBB3
       end
 
       if row[:forum_desc].present?
-        changes = {raw: @text_processor.process_raw_text(row[:forum_desc])}
-        opts = {revised_at: post.created_at, bypass_bump: true}
+        changes = { raw: @text_processor.process_raw_text(row[:forum_desc]) }
+        opts = { revised_at: post.created_at, bypass_bump: true }
         post.revise(Discourse.system_user, changes, opts)
       end
     end
diff --git a/script/import_scripts/phpbb3/importers/message_importer.rb b/script/import_scripts/phpbb3/importers/message_importer.rb
index 1289122cb9..0a9e356450 100644
--- a/script/import_scripts/phpbb3/importers/message_importer.rb
+++ b/script/import_scripts/phpbb3/importers/message_importer.rb
@@ -17,7 +17,6 @@ module ImportScripts::PhpBB3
       rows.map { |row| get_import_id(row[:msg_id]) }
     end
 
-
     def map_message(row)
       user_id = @lookup.user_id_from_imported_user_id(row[:author_id]) || Discourse.system_user.id
       attachments = import_attachments(row, user_id)
@@ -54,7 +53,7 @@ module ImportScripts::PhpBB3
       mapped[:title] = get_topic_title(row)
       mapped[:archetype] = Archetype.private_message
       mapped[:target_usernames] = get_recipient_usernames(row)
-      mapped[:custom_fields] = {import_user_ids: current_user_ids.join(',')}
+      mapped[:custom_fields] = { import_user_ids: current_user_ids.join(',') }
 
       if mapped[:target_usernames].empty?
         puts "Private message without recipients. Skipping #{row[:msg_id]}: #{row[:message_subject][0..40]}"
@@ -127,7 +126,7 @@ module ImportScripts::PhpBB3
         .joins(:topic)
         .joins(:_custom_fields)
         .where(["LOWER(topics.title) IN (:titles) AND post_custom_fields.name = 'import_user_ids' AND post_custom_fields.value = :user_ids",
-                {titles: topic_titles, user_ids: current_user_ids.join(',')}])
+                { titles: topic_titles, user_ids: current_user_ids.join(',') }])
         .order('topics.created_at DESC')
         .first.try(:topic_id)
     end
diff --git a/script/import_scripts/phpbb3/importers/permalink_importer.rb b/script/import_scripts/phpbb3/importers/permalink_importer.rb
index 54d620e44d..140a160d8f 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/poll_importer.rb b/script/import_scripts/phpbb3/importers/poll_importer.rb
index f69a5f27b0..261e46b43d 100644
--- a/script/import_scripts/phpbb3/importers/poll_importer.rb
+++ b/script/import_scripts/phpbb3/importers/poll_importer.rb
@@ -35,7 +35,7 @@ module ImportScripts::PhpBB3
 
     def get_poll_options(topic_id)
       rows = @database.fetch_poll_options(topic_id)
-      options_by_text = Hash.new { |h, k| h[k] = {ids: [], total_votes: 0, anonymous_votes: 0} }
+      options_by_text = Hash.new { |h, k| h[k] = { ids: [], total_votes: 0, anonymous_votes: 0 } }
 
       rows.each do |row|
         option_text = @text_processor.process_raw_text(row[:poll_option_text]).delete("\n")
@@ -100,7 +100,7 @@ module ImportScripts::PhpBB3
 
     # @param custom_fields [Hash]
     def add_poll_to_custom_fields(custom_fields, extracted_poll)
-      custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD] = {DiscoursePoll::DEFAULT_POLL_NAME => extracted_poll}
+      custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD] = { DiscoursePoll::DEFAULT_POLL_NAME => extracted_poll }
     end
 
     # @param custom_fields [Hash]
diff --git a/script/import_scripts/phpbb3/importers/post_importer.rb b/script/import_scripts/phpbb3/importers/post_importer.rb
index 1884190d4b..051695585b 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/phpbb3/support/settings.rb b/script/import_scripts/phpbb3/support/settings.rb
index 870c162b76..9c63e2ae25 100644
--- a/script/import_scripts/phpbb3/support/settings.rb
+++ b/script/import_scripts/phpbb3/support/settings.rb
@@ -44,7 +44,7 @@ module ImportScripts::PhpBB3
       @import_remote_avatars = avatar_settings['remote']
       @import_gallery_avatars = avatar_settings['gallery']
 
-      @use_bbcode_to_md =import_settings['use_bbcode_to_md']
+      @use_bbcode_to_md = import_settings['use_bbcode_to_md']
 
       @original_site_prefix = import_settings['site_prefix']['original']
       @new_site_prefix = import_settings['site_prefix']['new']
diff --git a/script/import_scripts/phpbb3/support/text_processor.rb b/script/import_scripts/phpbb3/support/text_processor.rb
index 3eceff3f75..d89a6cc99f 100644
--- a/script/import_scripts/phpbb3/support/text_processor.rb
+++ b/script/import_scripts/phpbb3/support/text_processor.rb
@@ -8,6 +8,7 @@ module ImportScripts::PhpBB3
       @lookup = lookup
       @database = database
       @smiley_processor = smiley_processor
+      @he = HTMLEntities.new
 
       @settings = settings
       @new_site_prefix = settings.new_site_prefix
@@ -25,7 +26,7 @@ module ImportScripts::PhpBB3
       process_smilies(text)
       process_links(text)
       process_lists(text)
-
+      process_code(text)
       text
     end
 
@@ -48,6 +49,9 @@ module ImportScripts::PhpBB3
       #   [url=https&#58;//google&#46;com:1qh1i7ky]click here[/url:1qh1i7ky]
       #   [quote=&quot;cybereality&quot;:b0wtlzex]Some text.[/quote:b0wtlzex]
       text.gsub!(/:(?:\w{8})\]/, ']')
+
+      # remove color tags
+      text.gsub!(/\[\/?color(=#[a-z0-9]*)?\]/i, "")
     end
 
     def bbcode_to_md(text)
@@ -142,5 +146,12 @@ module ImportScripts::PhpBB3
       @long_internal_link_regexp = Regexp.new(%Q|<!-- l --><a(?:.+)href="#{link_regex}"(?:.*)</a><!-- l -->|, Regexp::IGNORECASE)
       @short_internal_link_regexp = Regexp.new(link_regex, Regexp::IGNORECASE)
     end
+
+    def process_code(text)
+      text.gsub!(/<span class="syntax.*?>(.*?)<\/span>/) { "#{$1}" }
+      text.gsub!(/\[code(=[a-z]*)?\](.*?)\[\/code\]/i) { "[code]#{@he.decode($2)}[/code]" }
+      text.gsub!(/<br \/>/, "\n")
+      text
+    end
   end
 end
diff --git a/script/import_scripts/punbb.rb b/script/import_scripts/punbb.rb
index 6b8fad7f50..88c35f3096 100644
--- a/script/import_scripts/punbb.rb
+++ b/script/import_scripts/punbb.rb
@@ -43,7 +43,7 @@ class ImportScripts::PunBB < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :users, results.map {|u| u["id"].to_i}
+      next if all_records_exist? :users, results.map { |u| u["id"].to_i }
 
       create_users(results, total: total_count, offset: offset) do |user|
         { id: user['id'],
@@ -120,7 +120,7 @@ class ImportScripts::PunBB < ImportScripts::Base
       ").to_a
 
       break if results.size < 1
-      next if all_records_exist? :posts, results.map {|m| m['id'].to_i}
+      next if all_records_exist? :posts, results.map { |m| m['id'].to_i }
 
       create_posts(results, total: total_count, offset: offset) do |m|
         skip = false
diff --git a/script/import_scripts/quandora/export.rb b/script/import_scripts/quandora/export.rb
index 529486f1d7..7f4efc4f1f 100644
--- a/script/import_scripts/quandora/export.rb
+++ b/script/import_scripts/quandora/export.rb
@@ -1,8 +1,8 @@
 require 'yaml'
 require_relative 'quandora_api'
 
-def load_config file
-    config = YAML::load_file(File.join(__dir__, file))
+def load_config(file)
+  config = YAML::load_file(File.join(__dir__, file))
     @domain = config['domain']
     @username = config['username']
     @password = config['password']
@@ -27,4 +27,3 @@ end
 
 load_config ARGV.shift
 export
-
diff --git a/script/import_scripts/quandora/import.rb b/script/import_scripts/quandora/import.rb
index 01e04b89fb..c02e15277b 100644
--- a/script/import_scripts/quandora/import.rb
+++ b/script/import_scripts/quandora/import.rb
@@ -10,7 +10,7 @@ class ImportScripts::Quandora < ImportScripts::Base
     @system_user = Discourse.system_user
     @questions = []
     Dir.foreach(JSON_FILES_DIR) do |filename|
-      next if filename == '.' or filename == '..'
+      next if filename == ('.') || filename == ('..')
       question = File.read JSON_FILES_DIR + '/' + filename
       @questions << question
     end
@@ -23,7 +23,7 @@ class ImportScripts::Quandora < ImportScripts::Base
     puts "", "Done"
   end
 
-  def import_questions questions
+  def import_questions(questions)
     topics = 0
     total = questions.size
 
@@ -40,13 +40,13 @@ class ImportScripts::Quandora < ImportScripts::Base
     puts "", "Imported #{topics} topics."
   end
 
-  def import_users users
+  def import_users(users)
     users.each do |user|
       create_user user, user[:id]
     end
   end
 
-  def import_topic topic
+  def import_topic(topic)
     post = nil
     if post_id = post_id_from_imported_post_id(topic[:id])
       post = Post.find(post_id) # already imported this topic
@@ -65,13 +65,13 @@ class ImportScripts::Quandora < ImportScripts::Base
     post
   end
 
-  def import_posts posts, topic_id
+  def import_posts(posts, topic_id)
     posts.each do |post|
       import_post post, topic_id
     end
   end
 
-  def import_post post, topic_id
+  def import_post(post, topic_id)
     if post_id_from_imported_post_id(post[:id])
       return # already imported
     end
@@ -89,6 +89,6 @@ class ImportScripts::Quandora < ImportScripts::Base
   end
 end
 
-if __FILE__==$0
+if __FILE__ == $0
   ImportScripts::Quandora.new.perform
 end
diff --git a/script/import_scripts/quandora/quandora_api.rb b/script/import_scripts/quandora/quandora_api.rb
index 37ef726f1f..08c2f3db98 100644
--- a/script/import_scripts/quandora/quandora_api.rb
+++ b/script/import_scripts/quandora/quandora_api.rb
@@ -1,52 +1,51 @@
 require 'base64'
 require 'json'
-require 'rest-client'
 
 class QuandoraApi
 
   attr_accessor :domain, :username, :password
 
-  def initialize domain, username, password
+  def initialize(domain, username, password)
     @domain = domain
     @username = username
     @password = password
   end
 
-  def base_url domain
+  def base_url(domain)
     "https://#{domain}.quandora.com/m/json"
   end
 
-  def auth_header username, password
+  def auth_header(username, password)
     encoded = Base64.encode64 "#{username}:#{password}"
-    {:Authorization => "Basic #{encoded.strip!}"}
+    { Authorization: "Basic #{encoded.strip!}" }
   end
 
   def list_bases_url
     "#{base_url @domain}/kb"
   end
 
-  def list_questions_url kb_id, limit
+  def list_questions_url(kb_id, limit)
     url = "#{base_url @domain}/kb/#{kb_id}/list"
     url = "#{url}?l=#{limit}" if limit
     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']
   end
 
-  def list_questions kb_id, limit = nil
+  def list_questions(kb_id, limit = nil)
     url = list_questions_url(kb_id, limit)
     response = request url
     response['data']['result']
   end
 
-  def get_question question_id
+  def get_question(question_id)
     url = "#{base_url @domain}/q/#{question_id}"
     response = request url
     response['data']
diff --git a/script/import_scripts/quandora/quandora_question.rb b/script/import_scripts/quandora/quandora_question.rb
index c8611b558c..6105ef895d 100644
--- a/script/import_scripts/quandora/quandora_question.rb
+++ b/script/import_scripts/quandora/quandora_question.rb
@@ -4,9 +4,9 @@ require 'time'
 
 class QuandoraQuestion
 
-   def initialize question_json
-     @question = JSON.parse question_json
-   end
+  def initialize(question_json)
+    @question = JSON.parse question_json
+  end
 
    def topic
      topic = {}
@@ -24,19 +24,19 @@ class QuandoraQuestion
      users[user[:id]] = user
      replies.each do |reply|
        user = user_from_author reply[:author]
-       users[user[:id]] = user 
+       users[user[:id]] = user
      end
      users.values.to_a
    end
 
-   def user_from_author author
+   def user_from_author(author)
      email = author['email']
      email = "#{author['uid']}@noemail.com" unless email
 
      user = {}
      user[:id] = author['uid']
      user[:name] = "#{author['firstName']} #{author['lastName']}"
-     user[:email] = email 
+     user[:email] = email
      user[:staged] = true
      user
    end
@@ -55,10 +55,10 @@ class QuandoraQuestion
          posts << post_from_comment(comment, i, answer)
        end
      end
-     order_replies posts 
+     order_replies posts
    end
 
-   def order_replies posts
+   def order_replies(posts)
      posts = posts.sort_by { |p| p[:created_at] }
      posts.each_with_index do |p, i|
        p[:post_number] = i + 2
@@ -70,7 +70,7 @@ class QuandoraQuestion
      posts
    end
 
-   def post_from_answer answer
+   def post_from_answer(answer)
      post = {}
      post[:id] = answer['uid']
      post[:parent_id] = @question['uid']
@@ -81,17 +81,17 @@ class QuandoraQuestion
      post
    end
 
-   def post_from_comment comment, index, parent
+   def post_from_comment(comment, index, parent)
      if comment['created']
        created_at = Time.parse comment['created']
      else
        created_at = Time.parse parent['created']
      end
      parent_id = parent['uid']
-     parent_id = "#{parent['uid']}-#{index-1}" if index > 0
+     parent_id = "#{parent['uid']}-#{index - 1}" if index > 0
      post = {}
      id = "#{parent['uid']}-#{index}"
-     post[:id] = id 
+     post[:id] = id
      post[:parent_id] = parent_id
      post[:author] = comment['author']
      post[:author_id] = comment['author']['uid']
@@ -102,7 +102,7 @@ class QuandoraQuestion
 
    private
 
-   def unescape html
+   def unescape(html)
      return nil unless html
      CGI.unescapeHTML html
    end
diff --git a/script/import_scripts/quandora/test/test_quandora_api.rb b/script/import_scripts/quandora/test/test_quandora_api.rb
index ecdb976e0b..5fd04e428f 100644
--- a/script/import_scripts/quandora/test/test_quandora_api.rb
+++ b/script/import_scripts/quandora/test/test_quandora_api.rb
@@ -7,7 +7,7 @@ class TestQuandoraApi < Minitest::Test
 
   DEBUG = false
 
-  def initialize args
+  def initialize(args)
     config = YAML::load_file(File.join(__dir__, 'config.yml'))
     @domain = config['domain']
     @username = config['username']
@@ -52,7 +52,7 @@ class TestQuandoraApi < Minitest::Test
   end
 
   def test_get_question_has_expected_structure
-    question = @quandora.get_question @question_id 
+    question = @quandora.get_question @question_id
     expected = JSON.parse(QUESTION)['data']
     check_keys expected, question
 
@@ -71,14 +71,14 @@ class TestQuandoraApi < Minitest::Test
 
   private
 
-  def check_keys expected, actual
+  def check_keys(expected, actual)
     msg = "### caller[0]:\nKey not found in actual keys: #{actual.keys}\n"
     expected.keys.each do |k|
       assert (actual.keys.include? k), "#{k}"
     end
   end
 
-  def debug message, show=false
+  def debug(message, show = false)
     if show || DEBUG
       puts '### ' + caller[0]
       puts ''
diff --git a/script/import_scripts/quandora/test/test_quandora_question.rb b/script/import_scripts/quandora/test/test_quandora_question.rb
index ceba01e006..a52b800150 100644
--- a/script/import_scripts/quandora/test/test_quandora_question.rb
+++ b/script/import_scripts/quandora/test/test_quandora_question.rb
@@ -67,9 +67,9 @@ class TestQuandoraQuestion < Minitest::Test
     answer['uid'] = 'uid'
     answer['content'] = 'content'
     answer['created'] = '2013-01-06T18:24:54.62Z'
-    answer['author'] = {'uid' => 'auid'}
+    answer['author'] = { 'uid' => 'auid' }
 
-    post = @question.post_from_answer answer 
+    post = @question.post_from_answer answer
 
     assert_equal 'uid', post[:id]
     assert_equal @question.topic[:id], post[:parent_id]
@@ -83,8 +83,8 @@ class TestQuandoraQuestion < Minitest::Test
     comment = {}
     comment['text'] = 'text'
     comment['created'] = '2013-01-06T18:24:54.62Z'
-    comment['author'] = {'uid' => 'auid'}
-    parent = {'uid' => 'parent-uid'}
+    comment['author'] = { 'uid' => 'auid' }
+    parent = { 'uid' => 'parent-uid' }
 
     post = @question.post_from_comment comment, 0, parent
 
@@ -98,8 +98,8 @@ class TestQuandoraQuestion < Minitest::Test
 
   def test_post_from_comment_uses_parent_created_if_necessary
     comment = {}
-    comment['author'] = {'uid' => 'auid'}
-    parent = {'created' => '2013-01-06T18:24:54.62Z'}
+    comment['author'] = { 'uid' => 'auid' }
+    parent = { 'created' => '2013-01-06T18:24:54.62Z' }
 
     post = @question.post_from_comment comment, 0, parent
 
@@ -108,8 +108,8 @@ class TestQuandoraQuestion < Minitest::Test
 
   def test_post_from_comment_uses_previous_comment_as_parent
     comment = {}
-    comment['author'] = {'uid' => 'auid'}
-    parent = {'uid' => 'parent-uid', 'created' => '2013-01-06T18:24:54.62Z'}
+    comment['author'] = { 'uid' => 'auid' }
+    parent = { 'uid' => 'parent-uid', 'created' => '2013-01-06T18:24:54.62Z' }
 
     post = @question.post_from_comment comment, 1, parent
 
@@ -117,7 +117,7 @@ class TestQuandoraQuestion < Minitest::Test
     assert_equal 'parent-uid-0', post[:parent_id]
     assert_equal Time.parse('2013-01-06T18:24:54.62Z'), post[:created_at]
   end
-  
+
   def test_users
     users = @question.users
     assert_equal 5, users.size
@@ -127,10 +127,10 @@ class TestQuandoraQuestion < Minitest::Test
     assert_equal 'Greta Greatful', users[3][:name]
     assert_equal 'Eddy Excited', users[4][:name]
   end
-  
+
   private
 
-  def unescape html
+  def unescape(html)
     CGI.unescapeHTML html
   end
 end
diff --git a/script/import_scripts/sfn.rb b/script/import_scripts/sfn.rb
index 64a1dc54a9..3c32969c00 100644
--- a/script/import_scripts/sfn.rb
+++ b/script/import_scripts/sfn.rb
@@ -77,7 +77,7 @@ class ImportScripts::Sfn < ImportScripts::Base
       SQL
 
       break if users.size < 1
-      next if all_records_exist? :users, users.map {|u| u["id"].to_i}
+      next if all_records_exist? :users, users.map { |u| u["id"].to_i }
 
       create_users(users, total: user_count, offset: offset) do |user|
         external_user = @external_users[user["id"]]
@@ -232,7 +232,7 @@ class ImportScripts::Sfn < ImportScripts::Base
       SQL
 
       break if topics.size < 1
-      next if all_records_exist? :posts, topics.map {|t| t['id'].to_i}
+      next if all_records_exist? :posts, topics.map { |t| t['id'].to_i }
 
       create_posts(topics, total: topic_count, offset: offset) do |topic|
         next unless category_id = CATEGORY_MAPPING[topic["category_id"]]
@@ -284,7 +284,7 @@ class ImportScripts::Sfn < ImportScripts::Base
 
       break if posts.size < 1
 
-      next if all_records_exist? :posts, posts.map {|p| p['id'].to_i}
+      next if all_records_exist? :posts, posts.map { |p| p['id'].to_i }
 
       create_posts(posts, total: posts_count, offset: offset) do |post|
         next unless parent = topic_lookup_from_imported_post_id(post["topic_id"])
diff --git a/script/import_scripts/simplepress.rb b/script/import_scripts/simplepress.rb
index 2f4e20ab75..62663842bc 100644
--- a/script/import_scripts/simplepress.rb
+++ b/script/import_scripts/simplepress.rb
@@ -5,7 +5,7 @@ class ImportScripts::SimplePress < ImportScripts::Base
 
   SIMPLE_PRESS_DB ||= ENV['SIMPLEPRESS_DB'] || "simplepress"
   TABLE_PREFIX = "wp_sf"
-  BATCH_SIZE  ||= 1000
+  BATCH_SIZE ||= 1000
 
   def initialize
     super
@@ -120,7 +120,7 @@ class ImportScripts::SimplePress < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|m| m['id'].to_i}
+      next if all_records_exist? :posts, results.map { |m| m['id'].to_i }
 
       create_posts(results, total: total_count, offset: offset) do |m|
         skip = false
diff --git a/script/import_scripts/smf2.rb b/script/import_scripts/smf2.rb
index c65d13bedb..5dc36d4453 100644
--- a/script/import_scripts/smf2.rb
+++ b/script/import_scripts/smf2.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'mysql2'
 require File.expand_path(File.dirname(__FILE__) + '/base.rb')
 
@@ -53,7 +54,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
     if options.password == :ask
       require 'highline'
       $stderr.print "Enter password for MySQL database `#{options.database}`: "
-      options.password = HighLine.new.ask('') {|q| q.echo = false }
+      options.password = HighLine.new.ask('') { |q| q.echo = false }
     end
 
     @default_db_connection = create_db_connection
@@ -76,7 +77,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
       WHERE min_posts = -1 AND group_type IN (1, 2)
     SQL
 
-    create_groups(query(<<-SQL), total: total) {|group| group }
+    create_groups(query(<<-SQL), total: total) { |group| group }
       SELECT id_group AS id, group_name AS name
       FROM {prefix}membergroups
       WHERE min_posts = -1 AND group_type IN (1, 2)
@@ -124,12 +125,12 @@ class ImportScripts::Smf2 < ImportScripts::Base
           user.save
           GroupUser.transaction do
             group_ids.each do |gid|
-              group_id = group_id_from_imported_group_id(gid) and
+              (group_id = group_id_from_imported_group_id(gid)) &&
                 GroupUser.find_or_create_by(user: user, group_id: group_id)
             end
           end
-          if options.smfroot and member[:id_attach].present? and user.uploaded_avatar_id.blank?
-            path = find_smf_attachment_path(member[:id_attach], member[:file_hash], member[:filename]) and begin
+          if options.smfroot && member[:id_attach].present? && user.uploaded_avatar_id.blank?
+            (path = find_smf_attachment_path(member[:id_attach], member[:file_hash], member[:filename])) && begin
               upload = create_upload(user.id, path, member[:filename])
               if upload.persisted?
                 user.update(uploaded_avatar_id: upload.id)
@@ -152,6 +153,9 @@ class ImportScripts::Smf2 < ImportScripts::Base
       parent_id = category_id_from_imported_category_id(board[:id_parent]) if board[:id_parent] > 0
       groups = (board[:member_groups] || "").split(/,/).map(&:to_i)
       restricted = !groups.include?(GUEST_GROUP) && !groups.include?(MEMBER_GROUP)
+      if Category.find_by_name(board[:name])
+        board[:name] += board[:id_board].to_s
+      end
       {
         id: board[:id_board],
         name: board[:name],
@@ -160,7 +164,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
         post_create_action: restricted && proc do |category|
           category.update(read_restricted: true)
           groups.each do |imported_group_id|
-            group_id = group_id_from_imported_group_id(imported_group_id) and
+            (group_id = group_id_from_imported_group_id(imported_group_id)) &&
             CategoryGroup.find_or_create_by(category: category, group_id: group_id) do |cg|
               cg.permission_type = CategoryGroup.permission_types[:full]
             end
@@ -184,11 +188,10 @@ class ImportScripts::Smf2 < ImportScripts::Base
       end
     end
 
-
     db2 = create_db_connection
 
     create_posts(query(<<-SQL), total: total) do |message|
-      SELECT m.id_msg, m.id_topic, m.id_member, m.poster_time, m.body, 
+      SELECT m.id_msg, m.id_topic, m.id_member, m.poster_time, m.body,
              m.subject, t.id_board, t.id_first_msg, COUNT(a.id_attach) AS attachment_count
       FROM {prefix}messages AS m
       LEFT JOIN {prefix}topics AS t ON t.id_topic = m.id_topic
@@ -226,7 +229,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
         WHERE attachment_type = 0 AND id_msg = #{message[:id_msg]}
         ORDER BY id_attach ASC
       SQL
-      attachments.map! {|a| import_attachment(post, a) rescue (puts $! ; nil) }
+      attachments.map! { |a| import_attachment(post, a) rescue (puts $! ; nil) }
       post[:raw] = convert_message_body(message[:body], attachments, ignore_quotes: ignore_quotes)
       next post
     end
@@ -265,7 +268,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
 
   def create_db_connection
     Mysql2::Client.new(host: options.host, username: options.username,
-      password: options.password, database: options.database)
+                       password: options.password, database: options.database)
   end
 
   def query(sql, **opts, &block)
@@ -278,7 +281,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
 
   def __query(db, sql, **opts)
     db.query(sql.gsub('{prefix}', options.prefix),
-      {symbolize_keys: true, cache_rows: false}.merge(opts))
+      { symbolize_keys: true, cache_rows: false }.merge(opts))
   end
 
   TRTR_TABLE = begin
@@ -289,14 +292,14 @@ class ImportScripts::Smf2 < ImportScripts::Base
 
   def find_smf_attachment_path(attachment_id, file_hash, filename)
     cleaned_name = filename.dup
-    TRTR_TABLE.each {|from,to| cleaned_name.gsub!(from, to) }
+    TRTR_TABLE.each { |from, to| cleaned_name.gsub!(from, to) }
     cleaned_name.gsub!(/\s/, '_')
     cleaned_name.gsub!(/[^\w_\.\-]/, '')
     legacy_name = "#{attachment_id}_#{cleaned_name.gsub('.', '_')}#{Digest::MD5.hexdigest(cleaned_name)}"
 
     [ filename, "#{attachment_id}_#{file_hash}", legacy_name ]
-      .map {|name| File.join(options.smfroot, 'attachments', name) }
-      .detect {|file| File.exists?(file) }
+      .map { |name| File.join(options.smfroot, 'attachments', name) }
+      .detect { |file| File.exists?(file) }
   end
 
   def decode_entities(*args)
@@ -313,7 +316,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
     end
     body.gsub!(XListPattern) do |s|
       r = "\n[ul]"
-      s.lines.each {|l| r << '[li]' << l.strip.sub(/^\[x\]\s*/, '') << '[/li]' }
+      s.lines.each { |l| r << '[li]' << l.strip.sub(/^\[x\]\s*/, '') << '[/li]' }
       r << "[/ul]\n"
     end
 
@@ -331,8 +334,8 @@ class ImportScripts::Smf2 < ImportScripts::Base
       if use_count.keys.length < attachments.select(&:present?).length
         body << "\n\n---"
         attachments.each_with_index do |upload, num|
-          if upload.present? and use_count[num] == 0
-            body << ( "\n\n" + get_upload_markdown(upload) )
+          if upload.present? && use_count[num] == (0)
+            body << ("\n\n" + get_upload_markdown(upload))
           end
         end
       end
@@ -378,7 +381,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
   # => {'param1' => 'value1=still1 value1', 'param2' => 'value2 ...'}
   def parse_tag_params(params)
     params.to_s.strip.scan(/(?<param>\w+)=(?<value>(?:(?>\S+)|\s+(?!\w+=))*)/).
-      inject({}) {|h,e| h[e[0]] = e[1]; h }
+      inject({}) { |h, e| h[e[0]] = e[1]; h }
   end
 
   class << self
@@ -391,7 +394,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
     # => match[:params] == 'param=value param2=value2'
     #    match[:inner] == "\n  text\n  [tag nested=true]text[/tag]\n"
     def build_nested_tag_regex(ltag, rtag = nil)
-      rtag ||= '/'+ltag
+      rtag ||= '/' + ltag
       %r{
         \[#{ltag}(?-x:[ =](?<params>[^\]]*))?\]            # consume open tag, followed by...
           (?<inner>(?:
@@ -422,11 +425,10 @@ class ImportScripts::Smf2 < ImportScripts::Base
   ColorPattern = build_nested_tag_regex('color')
   ListPattern = build_nested_tag_regex('list')
   AttachmentPatterns = [
-    [/^\[attach(?:|img|url|mini)=(?<num>\d+)\]$/, ->(u) { "\n"+get_upload_markdown(u)+"\n" }],
+    [/^\[attach(?:|img|url|mini)=(?<num>\d+)\]$/, ->(u) { "\n" + get_upload_markdown(u) + "\n" }],
     [/\[attach(?:|img|url|mini)=(?<num>\d+)\]/, ->(u) { get_upload_markdown(u) }]
   ]
 
-
   # Provides command line options and parses the SMF settings file.
   class Options
 
@@ -494,18 +496,17 @@ class ImportScripts::Smf2 < ImportScripts::Base
       @parser ||= OptionParser.new(nil, 12) do |o|
         o.banner = "Usage:\t#{File.basename($0)} <SMFROOT> [options]\n"
         o.banner << "\t#{File.basename($0)} -d <DATABASE> [options]"
-        o.on('-h HOST', :REQUIRED, "MySQL server hostname [\"#{self.host}\"]") {|s| self.host = s }
-        o.on('-u USER', :REQUIRED, "MySQL username [\"#{self.username}\"]") {|s| self.username = s }
-        o.on('-p [PASS]', :OPTIONAL, 'MySQL password. Without argument, reads password from STDIN.') {|s| self.password = s || :ask }
-        o.on('-d DBNAME', :REQUIRED, 'Name of SMF database') {|s| self.database = s }
-        o.on('-f PREFIX', :REQUIRED, "Table names prefix [\"#{self.prefix}\"]") {|s| self.prefix = s }
-        o.on('-t TIMEZONE', :REQUIRED, 'Timezone used by SMF2 [auto-detected from PHP]') {|s| self.timezone = s }
+        o.on('-h HOST', :REQUIRED, "MySQL server hostname [\"#{self.host}\"]") { |s| self.host = s }
+        o.on('-u USER', :REQUIRED, "MySQL username [\"#{self.username}\"]") { |s| self.username = s }
+        o.on('-p [PASS]', :OPTIONAL, 'MySQL password. Without argument, reads password from STDIN.') { |s| self.password = s || :ask }
+        o.on('-d DBNAME', :REQUIRED, 'Name of SMF database') { |s| self.database = s }
+        o.on('-f PREFIX', :REQUIRED, "Table names prefix [\"#{self.prefix}\"]") { |s| self.prefix = s }
+        o.on('-t TIMEZONE', :REQUIRED, 'Timezone used by SMF2 [auto-detected from PHP]') { |s| self.timezone = s }
       end
     end
 
   end #Options
 
-
   # Framework around TSort, used to build a dependency graph over messages
   # to find and solve cyclic quotations.
   class MessageDependencyGraph
@@ -532,10 +533,9 @@ class ImportScripts::Smf2 < ImportScripts::Base
     end
 
     def cycles
-      strongly_connected_components.select {|c| c.length > 1 }.to_a
+      strongly_connected_components.select { |c| c.length > 1 }.to_a
     end
 
-
     class Node
       attr_reader :id
 
@@ -551,7 +551,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
       end
 
       def quoted
-        @quoted.map {|id| @graph[id] }.reject(&:nil?)
+        @quoted.map { |id| @graph[id] }.reject(&:nil?)
       end
 
       def ignore_quotes?
diff --git a/script/import_scripts/socialcast/create_title.rb b/script/import_scripts/socialcast/create_title.rb
index 0987f7a455..1d571876dd 100644
--- a/script/import_scripts/socialcast/create_title.rb
+++ b/script/import_scripts/socialcast/create_title.rb
@@ -34,7 +34,7 @@ class CreateTitle
   end
 
   def self.first_long_line(text)
-    lines = text.split("\n").select {|t| t.strip.size >= 20}
+    lines = text.split("\n").select { |t| t.strip.size >= 20 }
     return if lines.empty?
     lines[0].strip
   end
diff --git a/script/import_scripts/socialcast/export.rb b/script/import_scripts/socialcast/export.rb
index 9301128185..01d87a583d 100644
--- a/script/import_scripts/socialcast/export.rb
+++ b/script/import_scripts/socialcast/export.rb
@@ -2,8 +2,8 @@ require 'yaml'
 require 'fileutils'
 require_relative 'socialcast_api'
 
-def load_config file
-    config = YAML::load_file(File.join(__dir__, file))
+def load_config(file)
+  config = YAML::load_file(File.join(__dir__, file))
     @domain = config['domain']
     @username = config['username']
     @password = config['password']
@@ -17,8 +17,8 @@ def export
   export_messages
 end
 
-def export_users(page=1)
-  users = @api.list_users({page: page})
+def export_users(page = 1)
+  users = @api.list_users(page: page)
   return if users.empty?
   users.each do |user|
     File.open("output/users/#{user['id']}.json", 'w') do |f|
@@ -30,8 +30,8 @@ def export_users(page=1)
   export_users page + 1
 end
 
-def export_messages(page=1)
-  messages = @api.list_messages({page: page})
+def export_messages(page = 1)
+  messages = @api.list_messages(page: page)
   return if messages.empty?
   messages.each do |message|
     File.open("output/messages/#{message['id']}.json", 'w') do |f|
diff --git a/script/import_scripts/socialcast/import.rb b/script/import_scripts/socialcast/import.rb
index 7aaee20e18..38a711a815 100644
--- a/script/import_scripts/socialcast/import.rb
+++ b/script/import_scripts/socialcast/import.rb
@@ -27,7 +27,7 @@ class ImportScripts::Socialcast < ImportScripts::Base
     imported = 0
     total = count_files(MESSAGES_DIR)
     Dir.foreach(MESSAGES_DIR) do |filename|
-      next if filename == '.' or filename == '..'
+      next if filename == ('.') || filename == ('..')
       topics += 1
       message_json = File.read MESSAGES_DIR + '/' + filename
       message = SocialcastMessage.new(message_json)
@@ -46,7 +46,7 @@ class ImportScripts::Socialcast < ImportScripts::Base
     users = 0
     total = count_files(USERS_DIR)
     Dir.foreach(USERS_DIR) do |filename|
-      next if filename == '.' or filename == '..'
+      next if filename == ('.') || filename == ('..')
       user_json = File.read USERS_DIR + '/' + filename
       user = SocialcastUser.new(user_json).user
       create_user user, user[:id]
@@ -56,10 +56,10 @@ class ImportScripts::Socialcast < ImportScripts::Base
   end
 
   def count_files(path)
-    Dir.foreach(path).select {|f| f != '.' && f != '..'}.count
+    Dir.foreach(path).select { |f| f != '.' && f != '..' }.count
   end
 
-  def import_topic topic
+  def import_topic(topic)
     post = nil
     if post_id = post_id_from_imported_post_id(topic[:id])
       post = Post.find(post_id) # already imported this topic
@@ -77,13 +77,13 @@ class ImportScripts::Socialcast < ImportScripts::Base
     post
   end
 
-  def import_posts posts, topic_id
+  def import_posts(posts, topic_id)
     posts.each do |post|
       import_post post, topic_id
     end
   end
 
-  def import_post post, topic_id
+  def import_post(post, topic_id)
     return if post_id_from_imported_post_id(post[:id]) # already imported
     post[:topic_id] = topic_id
     post[:user_id] = user_id_from_imported_user_id(post[:author_id]) || -1
@@ -96,6 +96,6 @@ class ImportScripts::Socialcast < ImportScripts::Base
 
 end
 
-if __FILE__==$0
+if __FILE__ == $0
   ImportScripts::Socialcast.new.perform
 end
diff --git a/script/import_scripts/socialcast/socialcast_api.rb b/script/import_scripts/socialcast/socialcast_api.rb
index ab27546a48..587775ad06 100644
--- a/script/import_scripts/socialcast/socialcast_api.rb
+++ b/script/import_scripts/socialcast/socialcast_api.rb
@@ -1,12 +1,11 @@
 require 'base64'
 require 'json'
-require 'rest-client'
 
 class SocialcastApi
 
   attr_accessor :domain, :username, :password
 
-  def initialize domain, username, password
+  def initialize(domain, username, password)
     @domain = domain
     @username = username
     @password = password
@@ -18,22 +17,22 @@ class SocialcastApi
 
   def headers
     encoded = Base64.encode64 "#{@username}:#{@password}"
-    {:Authorization => "Basic #{encoded.strip!}", :Accept => "application/json"}
+    { Authorization: "Basic #{encoded.strip!}", Accept: "application/json" }
   end
 
-  def request url
-    JSON.parse(RestClient.get url, headers)
+  def request(url)
+    JSON.parse(Excon.get(url, headers: headers))
   end
 
-  def list_users(opts={})
+  def list_users(opts = {})
     page = opts[:page] ? opts[:page] : 1
     response = request "#{base_url}/users?page=#{page}"
-    response['users'].sort {|u| u['id']}
+    response['users'].sort { |u| u['id'] }
   end
 
-  def list_messages(opts={})
+  def list_messages(opts = {})
     page = opts[:page] ? opts[:page] : 1
     response = request "#{base_url}/messages?page=#{page}"
-    response['messages'].sort {|m| m['id']}
+    response['messages'].sort { |m| m['id'] }
   end
 end
diff --git a/script/import_scripts/socialcast/socialcast_message.rb b/script/import_scripts/socialcast/socialcast_message.rb
index 602252be94..a82149f2ab 100644
--- a/script/import_scripts/socialcast/socialcast_message.rb
+++ b/script/import_scripts/socialcast/socialcast_message.rb
@@ -18,7 +18,7 @@ class SocialcastMessage
     }
    }
 
-   def initialize message_json
+   def initialize(message_json)
      @parsed_json = JSON.parse message_json
    end
 
@@ -51,7 +51,6 @@ class SocialcastMessage
      tags
    end
 
-
    def category
      category = DEFAULT_CATEGORY
      if group && TAGS_AND_CATEGORIES[group]
@@ -92,7 +91,7 @@ class SocialcastMessage
 
    private
 
-   def unescape html
+   def unescape(html)
      return nil unless html
      CGI.unescapeHTML html
    end
diff --git a/script/import_scripts/socialcast/socialcast_user.rb b/script/import_scripts/socialcast/socialcast_user.rb
index a96a282e36..54107b4636 100644
--- a/script/import_scripts/socialcast/socialcast_user.rb
+++ b/script/import_scripts/socialcast/socialcast_user.rb
@@ -4,9 +4,9 @@ require 'time'
 
 class SocialcastUser
 
-   def initialize user_json
-     @parsed_json = JSON.parse user_json
-   end
+  def initialize(user_json)
+    @parsed_json = JSON.parse user_json
+  end
 
    def user
      email = @parsed_json['contact_info']['email']
diff --git a/script/import_scripts/socialcast/test/test_socialcast_api.rb b/script/import_scripts/socialcast/test/test_socialcast_api.rb
index 220531dc10..d27fec4d11 100644
--- a/script/import_scripts/socialcast/test/test_socialcast_api.rb
+++ b/script/import_scripts/socialcast/test/test_socialcast_api.rb
@@ -7,7 +7,7 @@ class TestSocialcastApi < Minitest::Test
 
   DEBUG = false
 
-  def initialize args
+  def initialize(args)
     config = YAML::load_file(File.join(__dir__, 'config.ex.yml'))
     @domain = config['domain']
     @username = config['username']
@@ -39,40 +39,40 @@ class TestSocialcastApi < Minitest::Test
 
   def test_list_users
     users = @socialcast.list_users
-    expected = JSON.parse(USERS)['users'].sort {|u| u['id']}
+    expected = JSON.parse(USERS)['users'].sort { |u| u['id'] }
     assert_equal 15, users.size
     assert_equal expected[0], users[0]
   end
 
   def test_list_users_next_page
-    users = @socialcast.list_users({page: 2})
+    users = @socialcast.list_users(page: 2)
     assert_equal 0, users.size
   end
 
   def test_list_messages
     messages = @socialcast.list_messages
-    expected = JSON.parse(MESSAGES)['messages'].sort {|m| m['id']}
+    expected = JSON.parse(MESSAGES)['messages'].sort { |m| m['id'] }
     assert_equal 20, messages.size
     check_keys expected[0], messages[0]
   end
 
   def test_messages_next_page
-    messages = @socialcast.list_messages({page: 2})
-    expected = JSON.parse(MESSAGES_PG_2)['messages'].sort {|m| m['id']}
+    messages = @socialcast.list_messages(page: 2)
+    expected = JSON.parse(MESSAGES_PG_2)['messages'].sort { |m| m['id'] }
     assert_equal 20, messages.size
     check_keys expected[0], messages[0]
   end
 
   private
 
-  def check_keys expected, actual
+  def check_keys(expected, actual)
     msg = "### caller[0]:\nKey not found in actual keys: #{actual.keys}\n"
     expected.keys.each do |k|
       assert (actual.keys.include? k), "#{k}"
     end
   end
 
-  def debug message, show=false
+  def debug(message, show = false)
     if show || DEBUG
       puts '### ' + caller[0]
       puts ''
diff --git a/script/import_scripts/socialcast/title.rb b/script/import_scripts/socialcast/title.rb
index cebf8f0ed5..846e8bffb3 100644
--- a/script/import_scripts/socialcast/title.rb
+++ b/script/import_scripts/socialcast/title.rb
@@ -9,7 +9,7 @@ def titles
   topics = 0
   total = count_files(MESSAGES_DIR)
   Dir.foreach(MESSAGES_DIR) do |filename|
-    next if filename == '.' or filename == '..'
+    next if filename == ('.') || filename == ('..')
     message_json = File.read MESSAGES_DIR + '/' + filename
     message = SocialcastMessage.new(message_json)
     next unless message.title
@@ -21,7 +21,7 @@ def titles
 end
 
 def count_files(path)
-  Dir.foreach(path).select {|f| f != '.' && f != '..'}.count
+  Dir.foreach(path).select { |f| f != '.' && f != '..' }.count
 end
 
 titles
diff --git a/script/import_scripts/sourceforge.rb b/script/import_scripts/sourceforge.rb
index d1b85366f4..12dde957e0 100644
--- a/script/import_scripts/sourceforge.rb
+++ b/script/import_scripts/sourceforge.rb
@@ -34,7 +34,7 @@ class ImportScripts::Sourceforge < ImportScripts::Base
   end
 
   def load_json
-    @json = MultiJson.load(File.read(JSON_FILE), :symbolize_keys => true)
+    @json = MultiJson.load(File.read(JSON_FILE), symbolize_keys: true)
   end
 
   def import_categories
@@ -45,8 +45,8 @@ class ImportScripts::Sourceforge < ImportScripts::Base
         id: forum[:shortname],
         name: forum[:name],
         post_create_action: proc do |category|
-          changes = {raw: forum[:description]}
-          opts = {revised_at: Time.now, bypass_bump: true}
+          changes = { raw: forum[:description] }
+          opts = { revised_at: Time.now, bypass_bump: true }
 
           post = category.topic.first_post
           post.revise(@system_user, changes, opts)
diff --git a/script/import_scripts/support/convert_mysql_xml_to_mysql.rb b/script/import_scripts/support/convert_mysql_xml_to_mysql.rb
index 1b4e4eb7b8..a711ec3328 100644
--- a/script/import_scripts/support/convert_mysql_xml_to_mysql.rb
+++ b/script/import_scripts/support/convert_mysql_xml_to_mysql.rb
@@ -11,7 +11,7 @@ class Saxy < Ox::Sax
   end
 
   def start_element(name)
-    @stack << {elem: name}
+    @stack << { elem: name }
   end
 
   def end_element(name)
@@ -40,7 +40,6 @@ class Convert < Saxy
     super()
   end
 
-
   def end_element(name)
     old = @stack.pop
     cur = @stack[-1]
@@ -71,10 +70,9 @@ class Convert < Saxy
 
     row = data[:row_data]
     col_names = row.keys.join(",")
-    vals = row.values.map{|v| "'#{v.gsub("'", "''").gsub('\\','\\\\\\')}'"}.join(",")
+    vals = row.values.map { |v| "'#{v.gsub("'", "''").gsub('\\', '\\\\\\')}'" }.join(",")
     puts "INSERT INTO #{name} (#{col_names}) VALUES (#{vals});"
   end
 end
 
 Ox.sax_parse(Convert.new(skip_data: ['metrics2', 'user_log']), File.open(ARGV[0]))
-
diff --git a/script/import_scripts/vanilla.rb b/script/import_scripts/vanilla.rb
index e60fcebca8..9471290559 100644
--- a/script/import_scripts/vanilla.rb
+++ b/script/import_scripts/vanilla.rb
@@ -69,10 +69,10 @@ class ImportScripts::Vanilla < ImportScripts::Base
     def read_file
       puts "reading file..."
       string = File.read(@vanilla_file).gsub("\\N", "")
-                                       .gsub(/\\$\n/m, "\\n")
-                                       .gsub("\\,", ",")
-                                       .gsub(/(?<!\\)\\"/, '""')
-                                       .gsub(/\\\\\\"/, '\\""')
+        .gsub(/\\$\n/m, "\\n")
+        .gsub("\\,", ",")
+        .gsub(/(?<!\\)\\"/, '""')
+        .gsub(/\\\\\\"/, '\\""')
       StringIO.new(string)
     end
 
@@ -192,10 +192,10 @@ class ImportScripts::Vanilla < ImportScripts::Base
 
         # list all other user ids in the conversation
         user_ids_in_conversation = @user_conversations.select { |uc| uc[:conversation_id] == conversation[:conversation_id] && uc[:user_id] != conversation[:insert_user_id] }
-                                                      .map { |uc| uc[:user_id] }
+          .map { |uc| uc[:user_id] }
         # retrieve their emails
         user_emails_in_conversation = @users.select { |u| user_ids_in_conversation.include?(u[:user_id]) }
-                                            .map { |u| u[:email] }
+          .map { |u| u[:email] }
         # retrieve their usernames from the database
         target_usernames = User.where("email IN (?)", user_emails_in_conversation).pluck(:username).to_a
 
@@ -243,10 +243,10 @@ class ImportScripts::Vanilla < ImportScripts::Base
     def clean_up(raw)
       return "" if raw.blank?
       raw.gsub("\\n", "\n")
-         .gsub(/<\/?pre\s*>/i, "\n```\n")
-         .gsub(/<\/?code\s*>/i, "`")
-         .gsub("&lt;", "<")
-         .gsub("&gt;", ">")
+        .gsub(/<\/?pre\s*>/i, "\n```\n")
+        .gsub(/<\/?code\s*>/i, "`")
+        .gsub("&lt;", "<")
+        .gsub("&gt;", ">")
     end
 
 end
diff --git a/script/import_scripts/vanilla_mysql.rb b/script/import_scripts/vanilla_mysql.rb
index f82a489f0a..e59a581ba1 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
-
-      next if all_records_exist? :users, results.map {|u| u['UserID'].to_i}
+      @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:
@@ -199,17 +198,20 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
 
     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
-      next if all_records_exist? :posts, discussions.map {|t| "discussion#" + t['DiscussionID'].to_s}
+      @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|
         {
@@ -221,7 +223,7 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
           created_at: Time.zone.at(discussion['DateInserted']),
           post_create_action: proc do |post|
             if @import_tags
-              tag_names = @client.query(tag_names_sql.gsub('{discussionid}', discussion['DiscussionID'].to_s)).map {|row| row['tag_name']}
+              tag_names = @client.query(tag_names_sql.gsub('{discussionid}', discussion['DiscussionID'].to_s)).map { |row| row['tag_name'] }
               DiscourseTagging.tag_topic_by_names(post.topic, staff_guardian, tag_names)
             end
           end
@@ -234,18 +236,19 @@ 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
-      next if all_records_exist? :posts, comments.map {|comment| "comment#" + comment['CommentID'].to_s}
+      @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|
         next unless t = topic_lookup_from_imported_post_id("discussion#" + comment['DiscussionID'].to_s)
@@ -269,15 +272,15 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
 
     # fix whitespaces
     raw = raw.gsub(/(\\r)?\\n/, "\n")
-             .gsub("\\t", "\t")
+      .gsub("\\t", "\t")
 
     # [HTML]...[/HTML]
     raw = raw.gsub(/\[html\]/i, "\n```html\n")
-             .gsub(/\[\/html\]/i, "\n```\n")
+      .gsub(/\[\/html\]/i, "\n```\n")
 
     # [PHP]...[/PHP]
     raw = raw.gsub(/\[php\]/i, "\n```php\n")
-             .gsub(/\[\/php\]/i, "\n```\n")
+      .gsub(/\[\/php\]/i, "\n```\n")
 
     # [HIGHLIGHT="..."]
     raw = raw.gsub(/\[highlight="?(\w+)"?\]/i) { "\n```#{$1.downcase}\n" }
@@ -285,7 +288,7 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
     # [CODE]...[/CODE]
     # [HIGHLIGHT]...[/HIGHLIGHT]
     raw = raw.gsub(/\[\/?code\]/i, "\n```\n")
-             .gsub(/\[\/?highlight\]/i, "\n```\n")
+      .gsub(/\[\/?highlight\]/i, "\n```\n")
 
     # [SAMP]...[/SAMP]
     raw.gsub!(/\[\/?samp\]/i, "`")
@@ -296,12 +299,12 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
       #  - AFTER all the "code" processing
       #  - BEFORE the "quote" processing
       raw = raw.gsub(/`([^`]+)`/im) { "`" + $1.gsub("<", "\u2603") + "`" }
-               .gsub("<", "&lt;")
-               .gsub("\u2603", "<")
+        .gsub("<", "&lt;")
+        .gsub("\u2603", "<")
 
       raw = raw.gsub(/`([^`]+)`/im) { "`" + $1.gsub(">", "\u2603") + "`" }
-               .gsub(">", "&gt;")
-               .gsub("\u2603", ">")
+        .gsub(">", "&gt;")
+        .gsub("\u2603", ">")
     end
 
     # [URL=...]...[/URL]
@@ -313,7 +316,7 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
     # [URL]...[/URL]
     # [MP3]...[/MP3]
     raw = raw.gsub(/\[\/?url\]/i, "")
-             .gsub(/\[\/?mp3\]/i, "")
+      .gsub(/\[\/?mp3\]/i, "")
 
     # [QUOTE]...[/QUOTE]
     raw.gsub!(/\[quote\](.+?)\[\/quote\]/im) { "\n> #{$1}\n" }
@@ -363,7 +366,7 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
     User.find_each do |u|
       ucf = u.custom_fields
       if ucf && ucf["import_id"] && ucf["import_username"]
-        Permalink.create( url: "profile/#{ucf['import_id']}/#{ucf['import_username']}", external_url: "/users/#{u.username}" ) rescue nil
+        Permalink.create(url: "profile/#{ucf['import_id']}/#{ucf['import_username']}", external_url: "/users/#{u.username}") rescue nil
         print '.'
       end
     end
@@ -375,9 +378,9 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
         id = pcf["import_id"].split('#').last
         if post.post_number == 1
           slug = Slug.for(topic.title) # probably matches what vanilla would do...
-          Permalink.create( url: "discussion/#{id}/#{slug}", topic_id: topic.id ) rescue nil
+          Permalink.create(url: "discussion/#{id}/#{slug}", topic_id: topic.id) rescue nil
         else
-          Permalink.create( url: "discussion/comment/#{id}", post_id: post.id ) rescue nil
+          Permalink.create(url: "discussion/comment/#{id}", post_id: post.id) rescue nil
         end
         print '.'
       end
@@ -386,5 +389,4 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
 
 end
 
-
 ImportScripts::VanillaSQL.new.perform
diff --git a/script/import_scripts/vbulletin.rb b/script/import_scripts/vbulletin.rb
index 0ed2bd6a91..048fea099b 100644
--- a/script/import_scripts/vbulletin.rb
+++ b/script/import_scripts/vbulletin.rb
@@ -47,7 +47,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
       database: DB_NAME
     )
     rescue Exception => e
-      puts '='*50
+      puts '=' * 50
       puts e.message
       puts <<EOM
 Cannot connect in to database.
@@ -71,7 +71,6 @@ EOM
       exit
   end
 
-
   def execute
     mysql_query("CREATE INDEX firstpostid_index ON #{TABLE_PREFIX}thread (firstpostid)") rescue nil
 
@@ -422,7 +421,6 @@ EOM
     puts sql
   end
 
-
   def import_private_messages
     puts "", "importing private messages..."
 
@@ -536,7 +534,6 @@ EOM
     end
   end
 
-
   def import_attachments
     puts '', 'importing attachments...'
 
@@ -574,7 +571,7 @@ EOM
       end
 
       if new_raw != post.raw
-        PostRevisor.new(post).revise!(post.user, { raw: new_raw }, { bypass_bump: true, edit_reason: 'Import attachments from vBulletin' })
+        PostRevisor.new(post).revise!(post.user, { raw: new_raw }, bypass_bump: true, edit_reason: 'Import attachments from vBulletin')
       end
 
       success_count += 1
@@ -828,7 +825,6 @@ EOM
     raw
   end
 
-
   def create_permalink_file
     puts '', 'Creating Permalink File...', ''
 
@@ -858,7 +854,6 @@ EOM
 
   end
 
-
   def suspend_users
     puts '', "updating banned users"
 
diff --git a/script/import_scripts/vbulletin5.rb b/script/import_scripts/vbulletin5.rb
index 263cfb4f48..da1ceea84b 100644
--- a/script/import_scripts/vbulletin5.rb
+++ b/script/import_scripts/vbulletin5.rb
@@ -5,7 +5,7 @@ require 'htmlentities'
 class ImportScripts::VBulletin < ImportScripts::Base
   BATCH_SIZE = 1000
   DBPREFIX = "vb_"
-  ROOT_NODE=2
+  ROOT_NODE = 2
 
   # CHANGE THESE BEFORE RUNNING THE IMPORTER
   DATABASE = "yourforum"
@@ -394,7 +394,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
       end
 
       if new_raw != post.raw
-        PostRevisor.new(post).revise!(post.user, { raw: new_raw }, { bypass_bump: true, edit_reason: 'Import attachments from vBulletin' })
+        PostRevisor.new(post).revise!(post.user, { raw: new_raw }, bypass_bump: true, edit_reason: 'Import attachments from vBulletin')
       end
 
       success_count += 1
@@ -450,15 +450,15 @@ class ImportScripts::VBulletin < ImportScripts::Base
 
     # fix whitespaces
     raw = raw.gsub(/(\\r)?\\n/, "\n")
-             .gsub("\\t", "\t")
+      .gsub("\\t", "\t")
 
     # [HTML]...[/HTML]
     raw = raw.gsub(/\[html\]/i, "\n```html\n")
-             .gsub(/\[\/html\]/i, "\n```\n")
+      .gsub(/\[\/html\]/i, "\n```\n")
 
     # [PHP]...[/PHP]
     raw = raw.gsub(/\[php\]/i, "\n```php\n")
-             .gsub(/\[\/php\]/i, "\n```\n")
+      .gsub(/\[\/php\]/i, "\n```\n")
 
     # [HIGHLIGHT="..."]
     raw = raw.gsub(/\[highlight="?(\w+)"?\]/i) { "\n```#{$1.downcase}\n" }
@@ -466,7 +466,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
     # [CODE]...[/CODE]
     # [HIGHLIGHT]...[/HIGHLIGHT]
     raw = raw.gsub(/\[\/?code\]/i, "\n```\n")
-             .gsub(/\[\/?highlight\]/i, "\n```\n")
+      .gsub(/\[\/?highlight\]/i, "\n```\n")
 
     # [SAMP]...[/SAMP]
     raw = raw.gsub(/\[\/?samp\]/i, "`")
@@ -476,12 +476,12 @@ class ImportScripts::VBulletin < ImportScripts::Base
     #  - AFTER all the "code" processing
     #  - BEFORE the "quote" processing
     raw = raw.gsub(/`([^`]+)`/im) { "`" + $1.gsub("<", "\u2603") + "`" }
-             .gsub("<", "&lt;")
-             .gsub("\u2603", "<")
+      .gsub("<", "&lt;")
+      .gsub("\u2603", "<")
 
     raw = raw.gsub(/`([^`]+)`/im) { "`" + $1.gsub(">", "\u2603") + "`" }
-             .gsub(">", "&gt;")
-             .gsub("\u2603", ">")
+      .gsub(">", "&gt;")
+      .gsub("\u2603", ">")
 
     # [URL=...]...[/URL]
     raw.gsub!(/\[url="?(.+?)"?\](.+?)\[\/url\]/i) { "<a href=\"#{$1}\">#{$2}</a>" }
@@ -489,7 +489,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
     # [URL]...[/URL]
     # [MP3]...[/MP3]
     raw = raw.gsub(/\[\/?url\]/i, "")
-             .gsub(/\[\/?mp3\]/i, "")
+      .gsub(/\[\/?mp3\]/i, "")
 
     # [MENTION]<username>[/MENTION]
     raw = raw.gsub(/\[mention\](.+?)\[\/mention\]/i) do
diff --git a/script/import_scripts/xenforo.rb b/script/import_scripts/xenforo.rb
index 7cfd04b6d6..217c956369 100644
--- a/script/import_scripts/xenforo.rb
+++ b/script/import_scripts/xenforo.rb
@@ -42,7 +42,7 @@ class ImportScripts::XenForo < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :users, results.map {|u| u["id"].to_i}
+      next if all_records_exist? :users, results.map { |u| u["id"].to_i }
 
       create_users(results, total: total_count, offset: offset) do |user|
         next if user['username'].blank?
@@ -100,7 +100,7 @@ class ImportScripts::XenForo < ImportScripts::Base
       ").to_a
 
       break if results.size < 1
-      next if all_records_exist? :posts, results.map {|p| p['id'] }
+      next if all_records_exist? :posts, results.map { |p| p['id'] }
 
       create_posts(results, total: total_count, offset: offset) do |m|
         skip = false
diff --git a/script/import_scripts/yahoogroup.rb b/script/import_scripts/yahoogroup.rb
new file mode 100644
index 0000000000..0b1a5456b1
--- /dev/null
+++ b/script/import_scripts/yahoogroup.rb
@@ -0,0 +1,159 @@
+require File.expand_path(File.dirname(__FILE__) + "/base.rb")
+require 'mongo'
+
+# Import YahooGroups data as exported into MongoDB by:
+#   https://github.com/jonbartlett/yahoo-groups-export
+#
+#   Optionally paste these lines into your shell before running this:
+#
+#   =begin
+#   export CATEGORY_ID=<CATEGORY_ID>
+#   =end
+
+class ImportScripts::YahooGroup < ImportScripts::Base
+
+  MONGODB_HOST = '192.168.10.1:27017'
+  MONGODB_DB   = 'syncro'
+
+  def initialize
+    super
+
+    client = Mongo::Client.new([ MONGODB_HOST ], database: MONGODB_DB)
+    db = client.database
+    Mongo::Logger.logger.level = Logger::FATAL
+    puts "connected to db...."
+
+    @collection = client[:posts]
+
+    @user_profile_map = {}
+
+  end
+
+  def execute
+    puts "", "Importing from Mongodb...."
+
+    import_users
+    import_discussions
+
+    puts "", "Done"
+  end
+
+  def import_users
+
+    puts '', "Importing users"
+
+    # fetch distinct list of Yahoo "profile" names
+    profiles = @collection.aggregate(
+                 [
+                  { "$group": { "_id": { profile: "$ygData.profile"  } } }
+                 ]
+            )
+
+    user_id = 0
+
+    create_users(profiles.to_a) do |u|
+
+      user_id = user_id + 1
+
+      # fetch last message for profile to pickup latest user info as this may have changed
+      user_info = @collection.find("ygData.profile": u["_id"]["profile"]).sort("ygData.msgId": -1).limit(1).to_a[0]
+
+      # Store user_id to profile lookup
+      @user_profile_map.store(user_info["ygData"]["profile"], user_id)
+
+      puts "User created: #{user_info["ygData"]["profile"]}"
+
+      user =
+       {
+        id: user_id,  # yahoo "userId" sequence appears to have changed mid forum life so generate this
+        username: user_info["ygData"]["profile"],
+        name: user_info["ygData"]["authorName"],
+        email: user_info["ygData"]["from"], # mandatory
+        created_at: Time.now
+      }
+      user
+    end
+
+    puts "#{user_id} users created"
+
+  end
+
+  def import_discussions
+    puts "", "Importing discussions"
+
+    topics_count = 0
+    posts_count = 0
+
+    topics = @collection.aggregate(
+                 [
+                  { "$group": { "_id": { topicId: "$ygData.topicId"  } } }
+                 ]
+    ).to_a
+
+    # for each distinct topicId found
+    topics.each_with_index do |t, tidx|
+
+      # create "topic" post first.
+      # fetch topic document
+      topic_post = @collection.find("ygData.msgId": t["_id"]["topicId"]).to_a[0]
+      next if topic_post.nil?
+
+      puts "Topic: #{tidx + 1} / #{topics.count()}  (#{sprintf('%.2f', ((tidx + 1).to_f / topics.count().to_f) * 100)}%)  Subject: #{topic_post["ygData"]["subject"]}"
+
+      if topic_post["ygData"]["subject"].to_s.empty?
+        topic_title = "No Subject"
+      else
+        topic_title = topic_post["ygData"]["subject"]
+      end
+
+      topic = {
+        id: tidx + 1,
+        user_id: @user_profile_map[topic_post["ygData"]["profile"]] || -1,
+        raw: topic_post["ygData"]["messageBody"],
+        created_at: Time.at(topic_post["ygData"]["postDate"].to_i),
+        cook_method: Post.cook_methods[:raw_html],
+        title: topic_title,
+        category: ENV['CATEGORY_ID'],
+        custom_fields: { import_id: topic_post["ygData"]["msgId"] }
+      }
+
+      topics_count += 1
+
+      # create topic post
+      parent_post = create_post(topic, topic[:id])
+
+      # find all posts for topic id
+      posts = @collection.find("ygData.topicId": topic_post["ygData"]["topicId"]).to_a
+
+      posts.each_with_index do |p, pidx|
+
+        # skip over first post as this is created by topic above
+        next if p["ygData"]["msgId"] == topic_post["ygData"]["topicId"]
+
+        puts "  Post: #{pidx + 1} / #{posts.count()}"
+
+        post = {
+             id: pidx + 1,
+             topic_id: parent_post[:topic_id],
+             user_id: @user_profile_map[p["ygData"]["profile"]] || -1,
+             raw: p["ygData"]["messageBody"],
+             created_at: Time.at(p["ygData"]["postDate"].to_i),
+             cook_method: Post.cook_methods[:raw_html],
+             custom_fields: { import_id: p["ygData"]["msgId"] }
+        }
+
+        child_post = create_post(post, post[:id])
+
+        posts_count += 1
+
+      end
+
+    end
+
+    puts "", "Imported #{topics_count} topics with #{topics_count + posts_count} posts."
+
+  end
+
+end
+
+ImportScripts::YahooGroup.new.perform
diff --git a/script/import_scripts/zoho.rb b/script/import_scripts/zoho.rb
index 99b15dcc64..63f374802d 100644
--- a/script/import_scripts/zoho.rb
+++ b/script/import_scripts/zoho.rb
@@ -1,6 +1,4 @@
 
-
-
 ###
 ###
 ### The output of this importer is bad.
@@ -12,14 +10,6 @@
 ###
 ###
 
-
-
-
-
-
-
-
-
 # Import from Zoho.
 # Be sure to get the posts CSV file, AND the user list csv file with people's email addresses.
 # You may need to contact Zoho support for the user list.
@@ -64,7 +54,7 @@ class ImportScripts::Zoho < ImportScripts::Base
 
   def import_users
     puts "", "Importing users"
-    create_users( CSV.parse(File.read(File.join(@path, 'users.csv'))) ) do |u|
+    create_users(CSV.parse(File.read(File.join(@path, 'users.csv')))) do |u|
       username = cleanup_zoho_username(u[0])
       {
         id: username,
@@ -105,10 +95,10 @@ class ImportScripts::Zoho < ImportScripts::Base
 
     # Create categories
     @categories.each do |parent, subcats|
-      c = create_category({name: parent}, parent)
+      c = create_category({ name: parent }, parent)
       subcats.each do |subcat|
         next if subcat == "Uncategorized" || subcat == "Uncategorised"
-        create_category({name: subcat, parent_category_id: c.id}, "#{parent}:#{subcat}")
+        create_category({ name: subcat, parent_category_id: c.id }, "#{parent}:#{subcat}")
       end
     end
 
@@ -217,7 +207,6 @@ class ImportScripts::Zoho < ImportScripts::Base
     CGI.unescapeHTML(x)
   end
 
-
   def import_post_id(row)
     # Try to make up a unique id based on the data Zoho gives us.
     # The posted_time seems to be the same for all posts in a topic, so we can't use that.
diff --git a/script/measure.rb b/script/measure.rb
index bb7a240b93..aaeadb19da 100644
--- a/script/measure.rb
+++ b/script/measure.rb
@@ -26,10 +26,10 @@ def profile_allocations(name)
     changes[k] -= initial_size[k]
   end
   puts "#{name} changes"
-  changes.sort{|a,b| b[1] <=> a[1]}.each do |a,b|
+  changes.sort { |a, b| b[1] <=> a[1] }.each do |a, b|
     next if b <= 0
     # 1 extra hash for tracking
-    puts "#{a} #{a == :T_HASH ? b-1 : b}"
+    puts "#{a} #{a == :T_HASH ? b - 1 : b}"
   end
   GC.enable
 end
@@ -61,7 +61,7 @@ def profile(name, &block)
     end
   end
 
-  items.group_by{|x| x}.sort{|a,b| b[1].length <=> a[1].length}.each do |row, group|
+  items.group_by { |x| x }.sort { |a, b| b[1].length <=> a[1].length }.each do |row, group|
     puts "#{row} x #{group.length}"
   end
 
@@ -69,8 +69,6 @@ def profile(name, &block)
   profile_allocations(name, &block)
 end
 
-
-
 def stuff
   u = User.first
   r = TopicQuery.new(u, {}).list_latest
@@ -82,72 +80,71 @@ profile_allocations "stuff" do
   stuff
 end
 
-
 # Benchmark.bmbm do |x|
-# 
+#
 #   x.report("find") do
 #     100.times{stuff}
 #   end
-# 
+#
 # end
-# 
+#
 #   x.report("grab 10 users id") do
 #     100.times{User.limit(10).select(:id).to_a}
 #   end
-# 
+#
 #   x.report("grab 10 users") do
 #     100.times{User.limit(10).to_a}
 #   end
-# 
+#
 # profile("topic query") do
 # r = TopicQuery.new(u, {}).list_latest
 # r.topics.to_a
 # end
 
-# 
+#
 # RubyProf.start
-# 
+#
 # r = TopicQuery.new(u, {}).list_latest
 # r.topics.to_a
-# 
+#
 # result = RubyProf.stop
 # printer = RubyProf::GraphPrinter.new(result)
 # # printer = RubyProf::FlatPrinter.new(result)
 # printer.print(STDOUT, :min_percent => 2)
-# 
+#
 # exit
-# 
+#
 # # User.limit(10).to_a
 # User.limit(10).select(:created_at).to_a
-# 
+#
 # profile("limit 10") do
 #   User.limit(10).select(:created_at).to_a
 # end
-# 
+#
 # exit
 # User.limit(10).to_a
 # exit
 #
 # User.select('id, 2 bob').first
 # Benchmark.bmbm do |x|
-# 
+#
 #   x.report("find") do
 #     100.times{User.find(1)}
 #   end
-# 
+#
 #   x.report("grab 10 users created_at") do
 #     100.times{User.limit(10).select(:created_at).to_a}
 #   end
-# 
+#
 #   x.report("grab 10 users id") do
 #     100.times{User.limit(10).select(:id).to_a}
 #   end
-# 
+#
 #   x.report("grab 10 users") do
 #     100.times{User.limit(10).to_a}
 #   end
-# 
-# 
+#
+#
 #   x.report("pg direct grab 10 users") do
 #     100.times do
 #       r = ActiveRecord::Base.connection.raw_connection.async_exec("select * from users limit 10")
@@ -159,9 +156,9 @@ end
 #       end
 #     end
 #   end
-# 
+#
 # end
-# 
+#
 
 # profile("find") do
 #   User.find(1)
@@ -170,4 +167,3 @@ end
 # profile("where") do
 #   User.where(id: 1).first
 # end
-
diff --git a/script/memstats.rb b/script/memstats.rb
index c41ec3f1e3..7d5d7b4072 100755
--- a/script/memstats.rb
+++ b/script/memstats.rb
@@ -45,19 +45,19 @@ class Mapping
   attr_accessor :swap
   attr_accessor :pss
 
-  def initialize( lines )
+  def initialize(lines)
 
     FIELDS.each do |field|
       self.send("#{field}=", 0)
     end
 
-    parse_first_line( lines.shift )
+    parse_first_line(lines.shift)
     lines.each do |l|
       parse_field_line(l)
     end
   end
 
-  def parse_first_line( line )
+  def parse_first_line(line)
     parts = line.strip.split
     @address_start, @address_end = parts[0].split("-")
     @perms = parts[1]
@@ -67,26 +67,26 @@ class Mapping
     @region = parts[5] || "anonymous"
   end
 
-  def parse_field_line( line )
+  def parse_field_line(line)
     parts = line.strip.split
-    field = parts[0].downcase.sub(':','')
+    field = parts[0].downcase.sub(':', '')
     if respond_to? "#{field}="
       value = Float(parts[1]).to_i
-      self.send( "#{field}=", value )
+      self.send("#{field}=", value)
     end
   end
 end
 
-def consume_mapping( map_lines, totals )
-  m = Mapping.new( map_lines )
+def consume_mapping(map_lines, totals)
+  m = Mapping.new(map_lines)
 
   Mapping::FIELDS.each do |field|
-    totals[field] += m.send( field )
+    totals[field] += m.send(field)
   end
   return m
 end
 
-def create_memstats_not_available( totals )
+def create_memstats_not_available(totals)
   Mapping::FIELDS.each do |field|
     totals[field] += Float::NAN
   end
@@ -98,7 +98,7 @@ totals = Hash.new(0)
 mappings = []
 
 begin
-  File.open( "/proc/#{pid}/smaps" ) do |smaps|
+  File.open("/proc/#{pid}/smaps") do |smaps|
 
     map_lines = []
 
@@ -110,7 +110,7 @@ begin
         map_lines << line
       when /[0-9a-f]+:[0-9a-f]+\s+/
         if map_lines.size > 0 then
-          mappings << consume_mapping( map_lines, totals )
+          mappings << consume_mapping(map_lines, totals)
         end
         map_lines.clear
         map_lines << line
@@ -120,16 +120,16 @@ begin
     end
   end
 rescue
-  create_memstats_not_available( totals )
+  create_memstats_not_available(totals)
 end
 
 # http://rubyforge.org/snippet/download.php?type=snippet&id=511
-def format_number( n )
-  n.to_s.gsub(/(\d)(?=\d{3}+(?:\.|$))(\d{3}\..*)?/,'\1,\2')
+def format_number(n)
+  n.to_s.gsub(/(\d)(?=\d{3}+(?:\.|$))(\d{3}\..*)?/, '\1,\2')
 end
 
-def get_commandline( pid )
-  commandline = IO.read( "/proc/#{pid}/cmdline" ).split("\0")
+def get_commandline(pid)
+  commandline = IO.read("/proc/#{pid}/cmdline").split("\0")
   if commandline.first =~ /java$/ then
     loop { break if commandline.shift == "-jar" }
     return "[java] #{commandline.shift}"
@@ -139,7 +139,7 @@ end
 
 if ARGV.include? '--yaml'
   require 'yaml'
-  puts Hash[*totals.map do |k,v|
+  puts Hash[*totals.map do |k, v|
     [k + '_kb', v]
   end.flatten].to_yaml
 else
@@ -147,8 +147,6 @@ else
   puts "#{"Command Line:".ljust(20)} #{get_commandline(pid)}"
   puts "Memory Summary:"
   totals.keys.sort.each do |k|
-    puts "  #{k.ljust(20)} #{format_number( totals[k] ).rjust(12)} kB"
+    puts "  #{k.ljust(20)} #{format_number(totals[k]).rjust(12)} kB"
   end
 end
-
-
diff --git a/script/micro_bench.rb b/script/micro_bench.rb
index b7caadf01e..1342a1b587 100644
--- a/script/micro_bench.rb
+++ b/script/micro_bench.rb
@@ -21,7 +21,6 @@ Benchmark.ips do |b|
   end
 
   b.report("raw") do
-    conn.exec("SELECT name FROM users LIMIT 1").getvalue(0,0)
+    conn.exec("SELECT name FROM users LIMIT 1").getvalue(0, 0)
   end
 end
-
diff --git a/script/osx_dev b/script/osx_dev
index 9dbe2556a4..d121076838 100755
--- a/script/osx_dev
+++ b/script/osx_dev
@@ -74,8 +74,8 @@ echo "Creating PostgreSQL databases..."
 psql -d postgres -c "ALTER USER vagrant WITH PASSWORD 'password';"
 psql -d postgres -c "create database discourse_development owner vagrant encoding 'UTF8' TEMPLATE template0;"
 psql -d postgres -c "create database discourse_test        owner vagrant encoding 'UTF8' TEMPLATE template0;"
-psql -d discourse_development -c "CREATE EXTENSION hstore;"
-psql -d discourse_development -c "CREATE EXTENSION pg_trgm;"
+psql -d discourse_development -c "CREATE EXTENSION IF NOT EXISTS hstore;"
+psql -d discourse_development -c "CREATE EXTENSION IF NOT EXISTS pg_trgm;"
 
 ## Start Redis (Redis was installed by Homebrew using `brew bundle`) ##
 echo "Loading Redis..."
diff --git a/script/plugin-translations.rb b/script/plugin-translations.rb
new file mode 100644
index 0000000000..bdc85b1f09
--- /dev/null
+++ b/script/plugin-translations.rb
@@ -0,0 +1,86 @@
+if ARGV.empty?
+  puts 'Usage: ', ''
+  puts '  ruby plugin-translations.rb <plugins_base_dir>'
+  puts '  ruby plugin-translations.rb <plugins_base_dir> push  (to git push)'
+  exit 1
+end
+
+require 'bundler'
+
+class PluginTxUpdater
+
+  attr_reader :failed
+
+  PLUGINS = [
+    'discourse-adplugin',
+    'discourse-akismet',
+    'discourse-assign',
+    'discourse-cakeday',
+    'discourse-canned-replies',
+    'discourse-chat-integration',
+    'discourse-data-explorer',
+    'discourse-math',
+    'discourse-oauth2-basic',
+    'discourse-patreon',
+    # 'discourse-saved-searches', # TODO
+    'discourse-solved',
+    'discourse-staff-notes',
+    'discourse-voting'
+  ]
+
+  def initialize(base_dir, push)
+    @push = !!push
+    @base_dir = base_dir
+    @failed = []
+  end
+
+  def perform
+    PLUGINS.each do |plugin_name|
+      plugin_dir = File.join(@base_dir, plugin_name)
+      Bundler.with_clean_env do
+        Dir.chdir(plugin_dir) do
+          puts '', plugin_dir, '-' * 80, ''
+
+          begin
+            system_cmd('git pull')
+            system_cmd('bundle update translations-manager')
+            system_cmd('bundle exec bin/pull_translations.rb')
+            system_cmd('git add config/locales/*')
+            system_cmd('git add Gemfile.lock') rescue true # might be gitignored
+            system_cmd('git commit -m "Update translations"')
+            system_cmd('git push origin master') if @push
+          rescue => e
+            puts "Failed for #{plugin_name}. Skipping...", ''
+            @failed << plugin_name
+          end
+        end
+      end
+    end
+  end
+
+  def system_cmd(s)
+    rc = system(s)
+    raise RuntimeError.new($?) if rc != true
+  end
+end
+
+base_dir = File.expand_path(ARGV[0])
+
+unless File.exists?(base_dir)
+  puts '', "Dir '#{base_dir}' doesn't exist."
+  exit 1
+end
+
+updates = PluginTxUpdater.new(base_dir, ARGV[1]&.downcase == 'push')
+updates.perform
+
+if updates.failed.empty?
+  puts '', "All plugins updated successfully!", ''
+else
+  if updates.failed.size < PluginTxUpdater::PLUGINS.size
+    puts '', "These plugins updated successfully: ", ''
+    puts PluginTxUpdater::PLUGINS - updates.failed
+  end
+  puts '', "Errors were encountered while updating these plugins:", ''
+  puts updates.failed
+end
diff --git a/script/profile_db_generator.rb b/script/profile_db_generator.rb
index 79b62064a7..18cf34b5f6 100644
--- a/script/profile_db_generator.rb
+++ b/script/profile_db_generator.rb
@@ -10,7 +10,6 @@ class Array
   end
 end
 
-
 # based on https://gist.github.com/zaius/2643079
 def unbundled_require(gem)
   if defined?(::Bundler)
@@ -47,10 +46,10 @@ def create_admin(seq)
     admin.email = "admin@localhost#{seq}.fake"
     admin.username = "admin#{seq}"
     admin.password = "password"
-    admin.save
+    admin.save!
     admin.grant_admin!
     admin.change_trust_level!(TrustLevel[4])
-    admin.email_tokens.update_all(confirmed: true)
+    admin.activate
   }
 end
 
@@ -63,8 +62,8 @@ unless Rails.env == "profile"
   exit
 end
 
-# by default, Discourse has a "system" account
-if User.count > 1
+# by default, Discourse has a "system" and `discobot` account
+if User.count > 2
   puts "Only run this script against an empty DB"
   exit
 end
@@ -111,4 +110,3 @@ end
 # no sidekiq so update some stuff
 Category.update_stats
 Jobs::PeriodicalUpdates.new.execute(nil)
-
diff --git a/script/pull_translations.rb b/script/pull_translations.rb
index fc03507556..003287b1bc 100644
--- a/script/pull_translations.rb
+++ b/script/pull_translations.rb
@@ -8,8 +8,15 @@
 require 'open3'
 require 'psych'
 require 'set'
+require 'fileutils'
 require_relative '../lib/i18n/locale_file_walker'
 
+YML_DIRS = ['config/locales',
+            'plugins/poll/config/locales',
+            'plugins/discourse-narrative-bot/config/locales',
+            'plugins/discourse-presence/config/locales']
+YML_FILE_PREFIXES = ['server', 'client']
+
 if `which tx`.strip.empty?
   puts '', 'The Transifex client needs to be installed to use this script.'
   puts 'Instructions are here: http://docs.transifex.com/client/setup/'
@@ -34,21 +41,38 @@ def get_languages
   end
 end
 
+def yml_path(dir, prefix, language)
+  path = "../../#{dir}/#{prefix}.#{language}.yml"
+  File.expand_path(path, __FILE__)
+end
+
 languages = get_languages.select { |x| x != 'en' }.sort
 
+# ensure that all locale files exists. tx doesn't create missing locale files during pull
+YML_DIRS.each do |dir|
+  YML_FILE_PREFIXES.each do |prefix|
+    languages.each do |language|
+      filename = yml_path(dir, prefix, language)
+      FileUtils.touch(filename) unless File.exists?(filename)
+    end
+  end
+end
+
 puts 'Pulling new translations...', ''
 command = "tx pull --mode=developer --language=#{languages.join(',')} --force"
 
-Open3.popen2e(command) do |stdin, stdout_err, wait_thr|
+return_value = Open3.popen2e(command) do |_, stdout_err, wait_thr|
   while (line = stdout_err.gets)
     puts line
   end
+  wait_thr.value
 end
+
 puts ''
 
-unless $?.success?
-  puts 'Something failed. Check the output above.', ''
-  exit $?.exitstatus
+unless return_value.success?
+  STDERR.puts 'Something failed. Check the output above.', ''
+  exit return_value.exitstatus
 end
 
 YML_FILE_COMMENTS = <<END
@@ -60,22 +84,15 @@ YML_FILE_COMMENTS = <<END
 # https://www.transifex.com/projects/p/discourse-org/
 END
 
-YML_DIRS = ['config/locales',
-            'plugins/poll/config/locales',
-            'plugins/discourse-narrative-bot/config/locales',
-            'vendor/gems/discourse_imgur/lib/discourse_imgur/locale']
-YML_FILE_PREFIXES = ['server', 'client']
-
-def yml_path(dir, prefix, language)
-  path = "../../#{dir}/#{prefix}.#{language}.yml"
-  path = File.expand_path(path, __FILE__)
+def yml_path_if_exists(dir, prefix, language)
+  path = yml_path(dir, prefix, language)
   File.exists?(path) ? path : nil
 end
 
 # Add comments to the top of files and replace the language (first key in YAML file)
 def update_file_header(filename, language)
   lines = File.readlines(filename)
-  lines.collect! { |line| line =~ /^[a-z_]+:$/i ? "#{language}:" : line }
+  lines.collect! { |line| line.gsub!(/^[a-z_]+:( {})?$/i, "#{language}:\\1") || line }
 
   File.open(filename, 'w+') do |f|
     f.puts(YML_FILE_COMMENTS, '') unless lines[0][0] == '#'
@@ -92,7 +109,7 @@ class YamlAliasFinder < LocaleFileWalker
   def parse_file(filename)
     document = Psych.parse_file(filename)
     handle_document(document)
-    {anchors: @anchors, aliases: @aliases}
+    { anchors: @anchors, aliases: @aliases }
   end
 
   private
@@ -144,11 +161,11 @@ class YamlAliasSynchronizer < LocaleFileWalker
   end
 
   def add_needed_node(keys)
-    @required_keys[keys] = {mapping: nil, scalar: nil, alias: nil}
+    @required_keys[keys] = { mapping: nil, scalar: nil, alias: nil }
   end
 
   def write_yaml(stream, filename)
-    yaml = stream.to_yaml(nil, {:line_width => -1})
+    yaml = stream.to_yaml(nil, line_width: -1)
 
     File.open(filename, 'w') do |file|
       file.write(yaml)
@@ -218,7 +235,7 @@ class YamlAliasSynchronizer < LocaleFileWalker
 end
 
 def get_english_alias_data(dir, prefix)
-  filename = yml_path(dir, prefix, 'en')
+  filename = yml_path_if_exists(dir, prefix, 'en')
   filename ? YamlAliasFinder.new.parse_file(filename) : nil
 end
 
@@ -288,7 +305,7 @@ YML_DIRS.each do |dir|
     english_alias_data = get_english_alias_data(dir, prefix)
 
     languages.each do |language|
-      filename = yml_path(dir, prefix, language)
+      filename = yml_path_if_exists(dir, prefix, language)
 
       if filename
         # The following methods were added to handle a bug in Transifex's yml. Should not be needed now.
@@ -296,6 +313,7 @@ YML_DIRS.each do |dir|
         # fix_invalid_yml(filename)
 
         # TODO check if this is still needed with recent Transifex changes
+        #      Nov 14, 2017: yup, still needed
         add_anchors_and_aliases(english_alias_data, filename)
 
         update_file_header(filename, language)
diff --git a/script/redis_memory.rb b/script/redis_memory.rb
index a127ec37fd..856de2ba9e 100644
--- a/script/redis_memory.rb
+++ b/script/redis_memory.rb
@@ -22,7 +22,7 @@ stats = {}
 end
 
 puts "Top 100 keys"
-stats.sort{|a,b| b[1][0] <=> a[1][0]}.first(50).each do |k, (len, type, elems)|
+stats.sort { |a, b| b[1][0] <=> a[1][0] }.first(50).each do |k, (len, type, elems)|
   elems = " [#{elems}]" if elems
   puts "#{k} #{type} #{len}#{elems}"
 end
diff --git a/script/require_profiler.rb b/script/require_profiler.rb
index 8d760efe7c..1adc9bc86d 100644
--- a/script/require_profiler.rb
+++ b/script/require_profiler.rb
@@ -21,7 +21,7 @@ module RequireProfiler
       stop
     end
 
-    def start(tmp_options={})
+    def start(tmp_options = {})
       @start_time = Time.now
       [ ::Kernel, (class << ::Kernel; self; end) ].each do |klass|
         klass.class_eval do
@@ -61,7 +61,7 @@ module RequireProfiler
       @stack ||= []
       self.stats ||= {}
 
-      stat = self.stats.fetch(path){|key| self.stats[key] = {calls: 0, time: 0, parent_time: 0} }
+      stat = self.stats.fetch(path) { |key| self.stats[key] = { calls: 0, time: 0, parent_time: 0 } }
 
       @stack << stat
 
@@ -104,8 +104,6 @@ module RequireProfiler
   end
 end
 
-
-
 # RequireProfiler.gc_analyze do
 #   # require 'mime-types'
 #   require 'highline'
@@ -115,14 +113,14 @@ 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
   end
 end
 
-sorted = RequireProfiler.stats.to_a.sort{|a,b| b[1][:time] - b[1][:parent_time] <=> a[1][:time] - a[1][:parent_time]}
+sorted = RequireProfiler.stats.to_a.sort { |a, b| b[1][:time] - b[1][:parent_time] <=> a[1][:time] - a[1][:parent_time] }
 
 sorted[0..120].each do |k, v|
   puts "#{k} : time #{v[:time] - v[:parent_time]} "
diff --git a/script/test_email_settings.rb b/script/test_email_settings.rb
index dc8422edd6..102f5afe7e 100755
--- a/script/test_email_settings.rb
+++ b/script/test_email_settings.rb
@@ -3,11 +3,11 @@
 require 'action_mailer'
 
 # Make this your email address. Poor example.com gets SO MUCH MAIL
-YOUR_EMAIL                = "nobody@example.com"
+YOUR_EMAIL = "nobody@example.com"
 
 # Change these to be the same settings as your Discourse environment
-DISCOURSE_SMTP_ADDRESS   = "smtp.example.com"       # (mandatory)
-@DISCOURSE_SMTP_PORT      =  587                    # (optional)
+DISCOURSE_SMTP_ADDRESS = "smtp.example.com"       # (mandatory)
+@DISCOURSE_SMTP_PORT = 587                    # (optional)
 @DISCOURSE_SMTP_USER_NAME = "username"              # (optional)
 @DISCOURSE_SMTP_PASSWORD  = "blah"                  # (optional)
 #@DISCOURSE_SMTP_OPENSSL_VERIFY_MODE = "none"       # (optional) none|peer|client_once|fail_if_no_peer_cert
@@ -22,7 +22,7 @@ $delivery_options = {
   user_name: @DISCOURSE_SMTP_USER_NAME || nil,
   password:  @DISCOURSE_SMTP_PASSWORD  || nil,
   address:   DISCOURSE_SMTP_ADDRESS,
-  port:      @DISCOURSE_SMTP_PORT      || nil,
+  port:      @DISCOURSE_SMTP_PORT || nil,
   openssl_verify_mode: @DISCOURSE_SMTP_OPENSSL_VERIFY_MODE || nil }
 
 class EmailTestMailer < ActionMailer::Base
@@ -40,16 +40,16 @@ message = EmailTestMailer.email_test(MAILFROM, MAILTO)
 begin
   message.deliver_now()
 rescue SocketError => e
-  print "Delivery failed: "+e.message.strip()+"\n"
+  print "Delivery failed: " + e.message.strip() + "\n"
   print " Is the server hostname correct?\n"
 rescue OpenSSL::SSL::SSLError => e
-  print "Delivery failed: "+e.message.strip()+"\n"
+  print "Delivery failed: " + e.message.strip() + "\n"
   print " You probably need to change the ssl verify mode.\n"
 rescue Net::SMTPAuthenticationError => e
-  print "Delivery failed: "+e.message.strip()+"\n"
+  print "Delivery failed: " + e.message.strip() + "\n"
   print " Check to ensure your username and password are correct.\n"
 rescue Net::SMTPFatalError => e
-  print "Delivery failed: "+e.message.strip()+"\n"
+  print "Delivery failed: " + e.message.strip() + "\n"
   print " Check the above error and fix your settings.\n"
 else
   print "Successfully delivered.\n"
diff --git a/script/test_hbs_compiler.rb b/script/test_hbs_compiler.rb
new file mode 100644
index 0000000000..0045b94254
--- /dev/null
+++ b/script/test_hbs_compiler.rb
@@ -0,0 +1,38 @@
+template = <<~HBS
+  {{attach widget="widget-name" attrs=attrs}}
+  {{a}}
+  {{{htmlValue}}}
+  {{#if state.category}}
+    {{attach widget="category-display" attrs=(hash category=state.category someNumber=123 someString="wat")}}
+  {{/if}}
+  {{#each transformed.something as |s|}}
+    {{s.wat}}
+  {{/each}}
+
+  {{attach widget=settings.widgetName}}
+
+  {{#unless settings.hello}}
+    XYZ
+  {{/unless}}
+HBS
+
+ctx = MiniRacer::Context.new(timeout: 15000)
+ctx.eval("var self = this; #{File.read("#{Rails.root}/vendor/assets/javascripts/babel.js")}")
+ctx.eval(File.read(Ember::Source.bundled_path_for('ember-template-compiler.js')))
+ctx.eval("module = {}; exports = {};");
+ctx.attach("rails.logger.info", proc { |err| puts(err.to_s) })
+ctx.attach("rails.logger.error", proc { |err| puts(err.to_s) })
+ctx.eval <<JS
+console = {
+  prefix: "",
+  log: function(msg){ rails.logger.info(console.prefix + msg); },
+  error: function(msg){ rails.logger.error(console.prefix + msg); }
+}
+
+JS
+source = File.read("#{Rails.root}/lib/javascripts/widget-hbs-compiler.js.es6")
+ctx.eval(source)
+
+js_source = ::JSON.generate(template, quirks_mode: true)
+
+puts ctx.eval("exports.compile(#{js_source})");
diff --git a/script/test_mem.rb b/script/test_mem.rb
index 3acf76e44a..16b16267b9 100644
--- a/script/test_mem.rb
+++ b/script/test_mem.rb
@@ -7,7 +7,7 @@ I18n.t(:posts)
 
 # load up all models and schema
 (ActiveRecord::Base.connection.tables - %w[schema_migrations]).each do |table|
-table.classify.constantize.first rescue nil
+  table.classify.constantize.first rescue nil
 end
 
 # router warm up
@@ -26,5 +26,3 @@ s = ObjectSpace.each_object(String).map do |o|
 end
 
 puts "Total strings: #{s.count} space used: #{s.sum} bytes"
-
-
diff --git a/script/test_pretty_text.rb b/script/test_pretty_text.rb
new file mode 100644
index 0000000000..974094c23f
--- /dev/null
+++ b/script/test_pretty_text.rb
@@ -0,0 +1,23 @@
+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/script/user_simulator.rb b/script/user_simulator.rb
index 4abd344653..9552fd2535 100644
--- a/script/user_simulator.rb
+++ b/script/user_simulator.rb
@@ -40,13 +40,11 @@ unless ["profile", "development"].include? Rails.env
   exit
 end
 
-
 user = User.find(user_id)
 last_topics = Topic.order('id desc').limit(10).pluck(:id)
 
 puts "Simulating activity for user id #{user.id}: #{user.name}"
 
-
 while true
   puts "Creating a random topic"
   category = Category.where(read_restricted: false).order('random()').first
diff --git a/script/version_bump.rb b/script/version_bump.rb
index b29765a67c..d69c4ec861 100755
--- a/script/version_bump.rb
+++ b/script/version_bump.rb
@@ -33,7 +33,7 @@ if ARGV.length < 1
 end
 
 new_version = ARGV[0].split('.')
-if new_version.length < 2 and !ARGV.include?('push')
+if new_version.length < (2) && !ARGV.include?('push')
   puts "First argument must be a version number with at least 2 parts. Examples: 0.9.8, 0.10, 0.9.7.3"
   exit 1
 end
@@ -67,7 +67,7 @@ require File.expand_path('../../lib/version',  __FILE__)
 version = Discourse::VERSION::STRING
 puts "New version is: #{version}"
 
-unless ARGV.include?('no-commit') or !update_version_file
+unless ARGV.include?('no-commit') || !update_version_file
   puts "Committing..."
 
   `git add lib/version.rb`
@@ -87,4 +87,4 @@ if ARGV.include?('push')
   `git push origin latest-release`
 end
 
-puts "Done",''
+puts "Done", ''
diff --git a/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb b/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb
index 74f4894075..a4ca7ede22 100644
--- a/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb
+++ b/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb
@@ -6,38 +6,55 @@ describe ActiveRecord::ConnectionHandling do
   let(:replica_port) { 6432 }
 
   let(:config) do
-    ActiveRecord::Base.configurations[Rails.env].merge({
-      "adapter" => "postgresql_fallback",
-      "replica_host" => replica_host,
-      "replica_port" => replica_port
-    }).symbolize_keys!
+    ActiveRecord::Base.connection_config.merge(
+      adapter: "postgresql_fallback",
+      replica_host: replica_host,
+      replica_port: replica_port
+    )
+  end
+
+  let(:multisite_db) { "database_2" }
+
+  let(:multisite_config) do
+    {
+      host: 'localhost1',
+      port: 5432,
+      replica_host: replica_host,
+      replica_port: replica_port
+    }
   end
 
   let(:postgresql_fallback_handler) { PostgreSQLFallbackHandler.instance }
 
+  before do
+    skip("Figure out why this test leaks connections")
+    postgresql_fallback_handler.initialized = true
+
+    ['default', multisite_db].each do |db|
+      postgresql_fallback_handler.master_up(db)
+    end
+  end
+
   after do
     postgresql_fallback_handler.setup!
+    postgresql_fallback_handler.clear_connections
   end
 
   describe "#postgresql_fallback_connection" do
     it 'should return a PostgreSQL adapter' do
-      expect(ActiveRecord::Base.postgresql_fallback_connection(config))
-        .to be_an_instance_of(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+      begin
+        connection = ActiveRecord::Base.postgresql_fallback_connection(config)
+
+        expect(connection)
+          .to be_an_instance_of(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+      ensure
+        connection.disconnect!
+      end
     end
 
     context 'when master server is down' do
-      let(:multisite_db) { "database_2" }
-
-      let(:multisite_config) do
-        {
-          host: 'localhost1',
-          port: 5432,
-          replica_host: replica_host,
-          replica_port: replica_port
-        }
-      end
-
       before do
+
         @replica_connection = mock('replica_connection')
       end
 
@@ -53,52 +70,62 @@ describe ActiveRecord::ConnectionHandling do
       end
 
       it 'should failover to a replica server' do
-        current_threads = Thread.list
-
         RailsMultisite::ConnectionManagement.stubs(:all_dbs).returns(['default', multisite_db])
+        postgresql_fallback_handler.expects(:verify_master).at_least(3)
 
         [config, multisite_config].each do |configuration|
           ActiveRecord::Base.expects(:postgresql_connection).with(configuration).raises(PG::ConnectionBad)
           ActiveRecord::Base.expects(:verify_replica).with(@replica_connection)
 
-          ActiveRecord::Base.expects(:postgresql_connection).with(configuration.merge({
-            host: replica_host, port: replica_port
-          })).returns(@replica_connection)
+          ActiveRecord::Base.expects(:postgresql_connection).with(
+            configuration.dup.merge(host: replica_host, port: replica_port)
+          ).returns(@replica_connection)
         end
 
         expect(postgresql_fallback_handler.master_down?).to eq(nil)
 
-        expect { ActiveRecord::Base.postgresql_fallback_connection(config) }
-          .to raise_error(PG::ConnectionBad)
+        message = MessageBus.track_publish(PostgreSQLFallbackHandler::DATABASE_DOWN_CHANNEL) do
+          expect { ActiveRecord::Base.postgresql_fallback_connection(config) }
+            .to raise_error(PG::ConnectionBad)
+        end.first
 
-        expect{ ActiveRecord::Base.postgresql_fallback_connection(config) }
-          .to change{ Discourse.readonly_mode? }.from(false).to(true)
+        expect(message.data[:db]).to eq('default')
+
+        expect { ActiveRecord::Base.postgresql_fallback_connection(config) }
+          .to change { Discourse.readonly_mode? }.from(false).to(true)
 
         expect(postgresql_fallback_handler.master_down?).to eq(true)
+        expect(Sidekiq.paused?).to eq(true)
 
         with_multisite_db(multisite_db) do
-          expect(postgresql_fallback_handler.master_down?).to eq(nil)
+          begin
+            expect(postgresql_fallback_handler.master_down?).to eq(nil)
 
-          expect { ActiveRecord::Base.postgresql_fallback_connection(multisite_config) }
-            .to raise_error(PG::ConnectionBad)
+            message = MessageBus.track_publish(PostgreSQLFallbackHandler::DATABASE_DOWN_CHANNEL) do
+              expect { ActiveRecord::Base.postgresql_fallback_connection(multisite_config) }
+                .to raise_error(PG::ConnectionBad)
+            end.first
 
-          expect{ ActiveRecord::Base.postgresql_fallback_connection(multisite_config) }
-            .to change{ Discourse.readonly_mode? }.from(false).to(true)
+            expect(message.data[:db]).to eq(multisite_db)
 
-          expect(postgresql_fallback_handler.master_down?).to eq(true)
+            expect { ActiveRecord::Base.postgresql_fallback_connection(multisite_config) }
+              .to change { Discourse.readonly_mode? }.from(false).to(true)
+
+            expect(postgresql_fallback_handler.master_down?).to eq(true)
+          ensure
+            postgresql_fallback_handler.master_up(multisite_db)
+            expect(postgresql_fallback_handler.master_down?).to eq(nil)
+          end
         end
 
-        postgresql_fallback_handler.master_up(multisite_db)
-
         ActiveRecord::Base.unstub(:postgresql_connection)
 
         postgresql_fallback_handler.initiate_fallback_to_master
 
         expect(Discourse.readonly_mode?).to eq(false)
-
-        expect(postgresql_fallback_handler.master_down?).to eq(nil)
-
+        expect(Sidekiq.paused?).to eq(false)
         expect(ActiveRecord::Base.connection_pool.connections.count).to eq(0)
+        expect(postgresql_fallback_handler.master_down?).to eq(nil)
 
         expect(ActiveRecord::Base.connection)
           .to be_an_instance_of(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
@@ -107,11 +134,13 @@ describe ActiveRecord::ConnectionHandling do
 
     context 'when both master and replica server is down' do
       it 'should raise the right error' do
-        ActiveRecord::Base.expects(:postgresql_connection).with(config).raises(PG::ConnectionBad).once
+        ActiveRecord::Base.expects(:postgresql_connection).with(config).raises(PG::ConnectionBad)
 
-        ActiveRecord::Base.expects(:postgresql_connection).with(config.dup.merge({
-          host: replica_host, port: replica_port
-        })).raises(PG::ConnectionBad).once
+        ActiveRecord::Base.expects(:postgresql_connection).with(
+          config.dup.merge(host: replica_host, port: replica_port)
+        ).raises(PG::ConnectionBad).once
+
+        postgresql_fallback_handler.expects(:verify_master).twice
 
         2.times do
           expect { ActiveRecord::Base.postgresql_fallback_connection(config) }
@@ -121,6 +150,16 @@ describe ActiveRecord::ConnectionHandling do
     end
   end
 
+  describe '.verify_replica' do
+    describe 'when database is not in recovery' do
+      it 'should raise the right error' do
+        expect do
+          ActiveRecord::Base.send(:verify_replica, ActiveRecord::Base.connection)
+        end.to raise_error(RuntimeError, "Replica database server is not in recovery mode.")
+      end
+    end
+  end
+
   def with_multisite_db(dbname)
     RailsMultisite::ConnectionManagement.expects(:current_db).returns(dbname).at_least_once
     yield
diff --git a/spec/components/admin_confirmation_spec.rb b/spec/components/admin_confirmation_spec.rb
index 20d74fec96..994ef9d18e 100644
--- a/spec/components/admin_confirmation_spec.rb
+++ b/spec/components/admin_confirmation_spec.rb
@@ -51,4 +51,3 @@ describe AdminConfirmation do
   end
 
 end
-
diff --git a/spec/components/admin_user_index_query_spec.rb b/spec/components/admin_user_index_query_spec.rb
index cb0bf16130..2eee6d4852 100644
--- a/spec/components/admin_user_index_query_spec.rb
+++ b/spec/components/admin_user_index_query_spec.rb
@@ -13,32 +13,32 @@ describe AdminUserIndexQuery do
     end
 
     it "has active order" do
-      query = ::AdminUserIndexQuery.new({ query: "active" })
+      query = ::AdminUserIndexQuery.new(query: "active")
       expect(query.find_users_query.to_sql).to match("last_seen_at")
     end
 
     it "can't be injected" do
-      query = ::AdminUserIndexQuery.new({ order: "wat, no" })
+      query = ::AdminUserIndexQuery.new(order: "wat, no")
       expect(query.find_users_query.to_sql).not_to match("wat, no")
     end
 
     it "allows custom ordering" do
-      query = ::AdminUserIndexQuery.new({ order: "trust_level" })
+      query = ::AdminUserIndexQuery.new(order: "trust_level")
       expect(query.find_users_query.to_sql).to match("trust_level DESC")
     end
 
     it "allows custom ordering asc" do
-      query = ::AdminUserIndexQuery.new({ order: "trust_level", ascending: true })
-      expect(query.find_users_query.to_sql).to match("trust_level ASC" )
+      query = ::AdminUserIndexQuery.new(order: "trust_level", ascending: true)
+      expect(query.find_users_query.to_sql).to match("trust_level ASC")
     end
 
     it "allows custom ordering for stats wtih default direction" do
-      query = ::AdminUserIndexQuery.new({ order: "topics_viewed" })
+      query = ::AdminUserIndexQuery.new(order: "topics_viewed")
       expect(query.find_users_query.to_sql).to match("topics_entered DESC")
     end
 
     it "allows custom ordering and direction for stats" do
-      query = ::AdminUserIndexQuery.new({ order: "topics_viewed", ascending: true })
+      query = ::AdminUserIndexQuery.new(order: "topics_viewed", ascending: true)
       expect(query.find_users_query.to_sql).to match("topics_entered ASC")
     end
   end
@@ -50,17 +50,17 @@ describe AdminUserIndexQuery do
     end
 
     it "offsets by 100 by default for page 2" do
-      query = ::AdminUserIndexQuery.new({ page: "2"})
+      query = ::AdminUserIndexQuery.new(page: "2")
       expect(query.find_users.to_sql).to match("OFFSET 100")
     end
 
     it "offsets by limit for page 2" do
-      query = ::AdminUserIndexQuery.new({ page: "2"})
+      query = ::AdminUserIndexQuery.new(page: "2")
       expect(query.find_users(10).to_sql).to match("OFFSET 10")
     end
 
     it "ignores negative pages" do
-      query = ::AdminUserIndexQuery.new({ page: "-2" })
+      query = ::AdminUserIndexQuery.new(page: "-2")
       expect(query.find_users.to_sql).to match("OFFSET 0")
     end
   end
@@ -69,7 +69,7 @@ describe AdminUserIndexQuery do
 
     TrustLevel.levels.each do |key, value|
       it "#{key} returns no records" do
-        query = ::AdminUserIndexQuery.new({ query: key.to_s })
+        query = ::AdminUserIndexQuery.new(query: key.to_s)
         expect(real_users_count(query)).to eq(0)
       end
     end
@@ -81,27 +81,41 @@ describe AdminUserIndexQuery do
     TrustLevel.levels.each do |key, value|
       it "finds user with trust #{key}" do
         Fabricate(:user, trust_level: TrustLevel.levels[key])
-        query = ::AdminUserIndexQuery.new({ query: key.to_s })
+        query = ::AdminUserIndexQuery.new(query: key.to_s)
         expect(real_users_count(query)).to eq(1)
       end
     end
 
   end
 
+  describe 'with a suspected user' do
+    let(:user) { Fabricate(:active_user, created_at: 1.day.ago) }
+    let(:bot) { Fabricate(:active_user, id: -10, created_at: 1.day.ago) }
+
+    it 'finds the suspected user' do
+      bot
+      user
+      query = AdminUserIndexQuery.new(query: 'suspect')
+      expect(query.find_users).to eq([user])
+    end
+  end
+
   describe "with a pending user" do
 
-    let!(:user) { Fabricate(:user, approved: false) }
+    let!(:user) { Fabricate(:user, active: true, approved: false) }
+    let!(:inactive_user) { Fabricate(:user, approved: false, active: false) }
 
     it "finds the unapproved user" do
-      query = ::AdminUserIndexQuery.new({ query: 'pending' })
-      expect(query.find_users.count).to eq(1)
+      query = ::AdminUserIndexQuery.new(query: 'pending')
+      expect(query.find_users).to include(user)
+      expect(query.find_users).not_to include(inactive_user)
     end
 
     context 'and a suspended pending user' do
       let!(:suspended_user) { Fabricate(:user, approved: false, suspended_at: 1.hour.ago, suspended_till: 20.years.from_now) }
       it "doesn't return the suspended user" do
-        query = ::AdminUserIndexQuery.new({ query: 'pending' })
-        expect(query.find_users.count).to eq(1)
+        query = ::AdminUserIndexQuery.new(query: 'pending')
+        expect(query.find_users).not_to include(suspended_user)
       end
     end
 
@@ -113,17 +127,17 @@ describe AdminUserIndexQuery do
     end
 
     it "shows nil values first with asc" do
-      users = ::AdminUserIndexQuery.new({ order: "last_emailed", ascending: true }).find_users
+      users = ::AdminUserIndexQuery.new(order: "last_emailed", ascending: true).find_users
 
-      expect(users.count).to eq(2)
-      expect(users.first.username).to eq("system")
+      expect(users.where('users.id > -2').count).to eq(2)
+      expect(users.where('users.id > -2').order('users.id asc').first.username).to eq("system")
       expect(users.first.last_emailed_at).to eq(nil)
     end
 
     it "shows nil values last with desc" do
-      users = ::AdminUserIndexQuery.new({ order: "last_emailed"}).find_users
+      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
 
@@ -134,7 +148,7 @@ describe AdminUserIndexQuery do
     let!(:user) { Fabricate(:user, admin: true) }
 
     it "finds the admin" do
-      query = ::AdminUserIndexQuery.new({ query: 'admins' })
+      query = ::AdminUserIndexQuery.new(query: 'admins')
       expect(real_users_count(query)).to eq(1)
     end
 
@@ -145,18 +159,18 @@ describe AdminUserIndexQuery do
     let!(:user) { Fabricate(:user, moderator: true) }
 
     it "finds the moderator" do
-      query = ::AdminUserIndexQuery.new({ query: 'moderators' })
+      query = ::AdminUserIndexQuery.new(query: 'moderators')
       expect(real_users_count(query)).to eq(1)
     end
 
   end
 
-  describe "with a blocked user" do
+  describe "with a silenced user" do
 
-    let!(:user) { Fabricate(:user, blocked: true) }
+    let!(:user) { Fabricate(:user, silenced_till: 1.year.from_now) }
 
-    it "finds the blocked user" do
-      query = ::AdminUserIndexQuery.new({ query: 'blocked' })
+    it "finds the silenced user" do
+      query = ::AdminUserIndexQuery.new(query: 'silenced')
       expect(query.find_users.count).to eq(1)
     end
 
@@ -164,17 +178,43 @@ describe AdminUserIndexQuery do
 
   describe "filtering" do
 
+    context "exact email bypass" do
+      it "can correctly bypass expensive ilike query" do
+        user = Fabricate(:user, email: 'sam@Sam.com')
+
+        query = AdminUserIndexQuery.new(filter: 'Sam@sam.com').find_users_query
+        expect(query.count).to eq(1)
+        expect(query.first.id).to eq(user.id)
+
+        expect(query.to_sql.downcase).not_to include("ilike")
+      end
+
+      it "can correctly bypass expensive ilike query" do
+        user = Fabricate(:user, email: 'sam2@Sam.com')
+
+        query = AdminUserIndexQuery.new(email: 'Sam@sam.com').find_users_query
+        expect(query.count).to eq(0)
+        expect(query.to_sql.downcase).not_to include("ilike")
+
+        query = AdminUserIndexQuery.new(email: 'Sam2@sam.com').find_users_query
+        expect(query.first.id).to eq(user.id)
+        expect(query.count).to eq(1)
+        expect(query.to_sql.downcase).not_to include("ilike")
+
+      end
+    end
+
     context "by email fragment" do
 
       before(:each) { Fabricate(:user, email: "test1@example.com") }
 
       it "matches the email" do
-        query = ::AdminUserIndexQuery.new({ filter: " est1" })
+        query = ::AdminUserIndexQuery.new(filter: " est1")
         expect(query.find_users.count()).to eq(1)
       end
 
       it "matches the email using any case" do
-        query = ::AdminUserIndexQuery.new({ filter: "Test1\t" })
+        query = ::AdminUserIndexQuery.new(filter: "Test1\t")
         expect(query.find_users.count()).to eq(1)
       end
 
@@ -185,12 +225,12 @@ describe AdminUserIndexQuery do
       before(:each) { Fabricate(:user, username: "test_user_1") }
 
       it "matches the username" do
-        query = ::AdminUserIndexQuery.new({ filter: "user\n" })
+        query = ::AdminUserIndexQuery.new(filter: "user\n")
         expect(query.find_users.count).to eq(1)
       end
 
       it "matches the username using any case" do
-        query = ::AdminUserIndexQuery.new({ filter: "\r\nUser" })
+        query = ::AdminUserIndexQuery.new(filter: "\r\nUser")
         expect(query.find_users.count).to eq(1)
       end
     end
@@ -200,7 +240,7 @@ describe AdminUserIndexQuery do
       let!(:user) { Fabricate(:user, ip_address: "117.207.94.9") }
 
       it "matches the ip address" do
-        query = ::AdminUserIndexQuery.new({ filter: " 117.207.94.9 " })
+        query = ::AdminUserIndexQuery.new(filter: " 117.207.94.9 ")
         expect(query.find_users.count()).to eq(1)
       end
 
diff --git a/spec/components/archetype_spec.rb b/spec/components/archetype_spec.rb
index 84d6164ea0..dc8d20e02e 100644
--- a/spec/components/archetype_spec.rb
+++ b/spec/components/archetype_spec.rb
@@ -36,10 +36,9 @@ describe Archetype do
       @list = Archetype.list.dup
       Archetype.register('glados')
       expect(Archetype.list.size).to eq(@list.size + 1)
-      expect(Archetype.list.find {|a| a.id == 'glados'}).to be_present
+      expect(Archetype.list.find { |a| a.id == 'glados' }).to be_present
     end
 
   end
 
 end
-
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index a80a1b4848..b86d60fff1 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -10,76 +10,130 @@ describe Auth::DefaultCurrentUserProvider do
     end
   end
 
-  def provider(url, opts=nil)
-    opts ||= {method: "GET"}
+  def provider(url, opts = nil)
+    opts ||= { method: "GET" }
     env = Rack::MockRequest.env_for(url, opts)
     TestProvider.new(env)
   end
 
-  it "raises errors for incorrect api_key" do
-    expect{
-      provider("/?api_key=INCORRECT").current_user
-    }.to raise_error(Discourse::InvalidAccess)
+  it "can be used to pretend that a user doesn't exist" do
+    provider = TestProvider.new({})
+    expect(provider.current_user).to eq(nil)
   end
 
-  it "finds a user for a correct per-user api key" do
-    user = Fabricate(:user)
-    ApiKey.create!(key: "hello", user_id: user.id, created_by_id: -1)
-    expect(provider("/?api_key=hello").current_user.id).to eq(user.id)
+  context "server api" do
 
-    user.update_columns(active: false)
+    it "raises errors for incorrect api_key" do
+      expect {
+        provider("/?api_key=INCORRECT").current_user
+      }.to raise_error(Discourse::InvalidAccess, /API username or key is invalid/)
+    end
 
-    expect{
-      provider("/?api_key=hello").current_user
-    }.to raise_error(Discourse::InvalidAccess)
+    it "finds a user for a correct per-user api key" do
+      user = Fabricate(:user)
+      ApiKey.create!(key: "hello", user_id: user.id, created_by_id: -1)
+      expect(provider("/?api_key=hello").current_user.id).to eq(user.id)
 
-    user.update_columns(active: true, suspended_till: 1.day.from_now)
+      user.update_columns(active: false)
 
-    expect{
-      provider("/?api_key=hello").current_user
-    }.to raise_error(Discourse::InvalidAccess)
-  end
+      expect {
+        provider("/?api_key=hello").current_user
+      }.to raise_error(Discourse::InvalidAccess)
 
-  it "raises for a user pretending" do
-    user = Fabricate(:user)
-    user2 = Fabricate(:user)
-    ApiKey.create!(key: "hello", user_id: user.id, created_by_id: -1)
+      user.update_columns(active: true, suspended_till: 1.day.from_now)
 
-    expect{
-      provider("/?api_key=hello&api_username=#{user2.username.downcase}").current_user
-    }.to raise_error(Discourse::InvalidAccess)
-  end
+      expect {
+        provider("/?api_key=hello").current_user
+      }.to raise_error(Discourse::InvalidAccess)
+    end
 
-  it "raises for a user with a mismatching ip" do
-    user = Fabricate(:user)
-    ApiKey.create!(key: "hello", user_id: user.id, created_by_id: -1, allowed_ips: ['10.0.0.0/24'])
+    it "raises for a user pretending" do
+      user = Fabricate(:user)
+      user2 = Fabricate(:user)
+      ApiKey.create!(key: "hello", user_id: user.id, created_by_id: -1)
 
-    expect{
-      provider("/?api_key=hello&api_username=#{user.username.downcase}", "REMOTE_ADDR" => "10.1.0.1").current_user
-    }.to raise_error(Discourse::InvalidAccess)
+      expect {
+        provider("/?api_key=hello&api_username=#{user2.username.downcase}").current_user
+      }.to raise_error(Discourse::InvalidAccess)
+    end
 
-  end
+    it "raises for a user with a mismatching ip" do
+      user = Fabricate(:user)
+      ApiKey.create!(key: "hello", user_id: user.id, created_by_id: -1, allowed_ips: ['10.0.0.0/24'])
 
-  it "allows a user with a matching ip" do
-    user = Fabricate(:user)
-    ApiKey.create!(key: "hello", user_id: user.id, created_by_id: -1, allowed_ips: ['100.0.0.0/24'])
+      expect {
+        provider("/?api_key=hello&api_username=#{user.username.downcase}", "REMOTE_ADDR" => "10.1.0.1").current_user
+      }.to raise_error(Discourse::InvalidAccess)
 
-    found_user = provider("/?api_key=hello&api_username=#{user.username.downcase}",
-                          "REMOTE_ADDR" => "100.0.0.22").current_user
+    end
 
-    expect(found_user.id).to eq(user.id)
+    it "allows a user with a matching ip" do
+      user = Fabricate(:user)
+      ApiKey.create!(key: "hello", user_id: user.id, created_by_id: -1, allowed_ips: ['100.0.0.0/24'])
 
+      found_user = provider("/?api_key=hello&api_username=#{user.username.downcase}",
+                            "REMOTE_ADDR" => "100.0.0.22").current_user
 
-    found_user = provider("/?api_key=hello&api_username=#{user.username.downcase}",
-                          "HTTP_X_FORWARDED_FOR" => "10.1.1.1, 100.0.0.22").current_user
-    expect(found_user.id).to eq(user.id)
+      expect(found_user.id).to eq(user.id)
 
-  end
+      found_user = provider("/?api_key=hello&api_username=#{user.username.downcase}",
+                            "HTTP_X_FORWARDED_FOR" => "10.1.1.1, 100.0.0.22").current_user
+      expect(found_user.id).to eq(user.id)
+
+    end
+
+    it "finds a user for a correct system api key" do
+      user = Fabricate(:user)
+      ApiKey.create!(key: "hello", created_by_id: -1)
+      expect(provider("/?api_key=hello&api_username=#{user.username.downcase}").current_user.id).to eq(user.id)
+    end
+
+    context "rate limiting" do
+      before do
+        RateLimiter.enable
+      end
+
+      after do
+        RateLimiter.disable
+      end
+
+      it "rate limits api requests per api key" do
+        global_setting :max_admin_api_reqs_per_key_per_minute, 3
+
+        freeze_time
+
+        user = Fabricate(:user)
+        key = SecureRandom.hex
+        api_key = ApiKey.create!(key: key, created_by_id: -1)
+
+        provider("/?api_key=#{key}&api_username=#{user.username.downcase}").current_user
+        provider("/?api_key=#{key}&api_username=system").current_user
+        provider("/?api_key=#{key}&api_username=#{user.username.downcase}").current_user
+
+        expect do
+          provider("/?api_key=#{key}&api_username=system").current_user
+        end.to raise_error(RateLimiter::LimitExceeded)
+
+        freeze_time 59.seconds.from_now
+
+        expect do
+          provider("/?api_key=#{key}&api_username=system").current_user
+        end.to raise_error(RateLimiter::LimitExceeded)
+
+        freeze_time 2.seconds.from_now
+
+        # 1 minute elapsed
+        provider("/?api_key=#{key}&api_username=system").current_user
+
+        # should not rake limit a random key
+        api_key.destroy
+        key = SecureRandom.hex
+        ApiKey.create!(key: key, created_by_id: -1)
+        provider("/?api_key=#{key}&api_username=#{user.username.downcase}").current_user
+
+      end
+    end
 
-  it "finds a user for a correct system api key" do
-    user = Fabricate(:user)
-    ApiKey.create!(key: "hello", created_by_id: -1)
-    expect(provider("/?api_key=hello&api_username=#{user.username.downcase}").current_user.id).to eq(user.id)
   end
 
   it "should not update last seen for ajax calls without Discourse-Visible header" do
@@ -173,42 +227,51 @@ describe Auth::DefaultCurrentUserProvider do
 
   end
 
-  it "can only try 10 bad cookies a minute" do
-    user = Fabricate(:user)
-    token = UserAuthToken.generate!(user_id: user.id)
+  context "rate limiting" do
 
-    provider('/').log_on_user(user, {}, {})
-
-    RateLimiter.stubs(:disabled?).returns(false)
-
-    RateLimiter.new(nil, "cookie_auth_10.0.0.1", 10, 60).clear!
-    RateLimiter.new(nil, "cookie_auth_10.0.0.2", 10, 60).clear!
-
-    ip = "10.0.0.1"
-    env = { "HTTP_COOKIE" => "_t=#{SecureRandom.hex}", "REMOTE_ADDR" => ip }
-
-    10.times do
-      provider('/', env).current_user
+    before do
+      RateLimiter.enable
     end
 
-    expect {
-      provider('/', env).current_user
-    }.to raise_error(Discourse::InvalidAccess)
+    after do
+      RateLimiter.disable
+    end
 
-    expect {
-      env["HTTP_COOKIE"] = "_t=#{token.unhashed_auth_token}"
-      provider("/", env).current_user
-    }.to raise_error(Discourse::InvalidAccess)
+    it "can only try 10 bad cookies a minute" do
+      user = Fabricate(:user)
+      token = UserAuthToken.generate!(user_id: user.id)
 
-    env["REMOTE_ADDR"] = "10.0.0.2"
+      provider('/').log_on_user(user, {}, {})
 
-    expect {
-      provider('/', env).current_user
-    }.not_to raise_error
+      RateLimiter.new(nil, "cookie_auth_10.0.0.1", 10, 60).clear!
+      RateLimiter.new(nil, "cookie_auth_10.0.0.2", 10, 60).clear!
+
+      ip = "10.0.0.1"
+      env = { "HTTP_COOKIE" => "_t=#{SecureRandom.hex}", "REMOTE_ADDR" => ip }
+
+      10.times do
+        provider('/', env).current_user
+      end
+
+      expect {
+        provider('/', env).current_user
+      }.to raise_error(Discourse::InvalidAccess)
+
+      expect {
+        env["HTTP_COOKIE"] = "_t=#{token.unhashed_auth_token}"
+        provider("/", env).current_user
+      }.to raise_error(Discourse::InvalidAccess)
+
+      env["REMOTE_ADDR"] = "10.0.0.2"
+
+      expect {
+        provider('/', env).current_user
+      }.not_to raise_error
+    end
   end
 
   it "correctly removes invalid cookies" do
-    cookies = {"_t" => SecureRandom.hex}
+    cookies = { "_t" => SecureRandom.hex }
     provider('/').refresh_session(nil, {}, cookies)
     expect(cookies.key?("_t")).to eq(false)
   end
@@ -230,7 +293,6 @@ describe Auth::DefaultCurrentUserProvider do
     cookies = {}
     provider('/').log_on_user(user, {}, cookies)
 
-
     expect(cookies["_t"][:same_site]).to eq("Lax")
     expect(cookies["_t"][:httponly]).to eq(true)
     expect(cookies["_t"][:secure]).to eq(false)
@@ -286,10 +348,9 @@ describe Auth::DefaultCurrentUserProvider do
       expect(good_provider.is_user_api?).to eq(true)
 
       expect {
-        provider("/", params.merge({"REQUEST_METHOD" => "POST"})).current_user
+        provider("/", params.merge("REQUEST_METHOD" => "POST")).current_user
       }.to raise_error(Discourse::InvalidAccess)
 
-
       user.update_columns(suspended_till: 1.year.from_now)
 
       expect {
@@ -298,46 +359,53 @@ describe Auth::DefaultCurrentUserProvider do
 
     end
 
-    it "rate limits api usage" do
+    context "rate limiting" do
 
-      RateLimiter.stubs(:disabled?).returns(false)
-      limiter1 = RateLimiter.new(nil, "user_api_day_#{api_key.key}", 10, 60)
-      limiter2 = RateLimiter.new(nil, "user_api_min_#{api_key.key}", 10, 60)
-      limiter1.clear!
-      limiter2.clear!
-
-      SiteSetting.max_user_api_reqs_per_day = 3
-      SiteSetting.max_user_api_reqs_per_minute = 4
-
-      params = {
-        "REQUEST_METHOD" => "GET",
-        "HTTP_USER_API_KEY" => api_key.key,
-      }
-
-      3.times do
-        provider("/", params).current_user
+      before do
+        RateLimiter.enable
       end
 
-      expect {
-        provider("/", params).current_user
-      }.to raise_error(RateLimiter::LimitExceeded)
-
-
-      SiteSetting.max_user_api_reqs_per_day = 4
-      SiteSetting.max_user_api_reqs_per_minute = 3
-
-      limiter1.clear!
-      limiter2.clear!
-
-      3.times do
-        provider("/", params).current_user
+      after do
+        RateLimiter.disable
       end
 
-      expect {
-        provider("/", params).current_user
-      }.to raise_error(RateLimiter::LimitExceeded)
+      it "rate limits api usage" do
+        limiter1 = RateLimiter.new(nil, "user_api_day_#{api_key.key}", 10, 60)
+        limiter2 = RateLimiter.new(nil, "user_api_min_#{api_key.key}", 10, 60)
+        limiter1.clear!
+        limiter2.clear!
 
+        global_setting :max_user_api_reqs_per_day, 3
+        global_setting :max_user_api_reqs_per_minute, 4
+
+        params = {
+          "REQUEST_METHOD" => "GET",
+          "HTTP_USER_API_KEY" => api_key.key,
+        }
+
+        3.times do
+          provider("/", params).current_user
+        end
+
+        expect {
+          provider("/", params).current_user
+        }.to raise_error(RateLimiter::LimitExceeded)
+
+        global_setting :max_user_api_reqs_per_day, 4
+        global_setting :max_user_api_reqs_per_minute, 3
+
+        limiter1.clear!
+        limiter2.clear!
+
+        3.times do
+          provider("/", params).current_user
+        end
+
+        expect {
+          provider("/", params).current_user
+        }.to raise_error(RateLimiter::LimitExceeded)
+
+      end
     end
   end
 end
-
diff --git a/spec/components/auth/facebook_authenticator_spec.rb b/spec/components/auth/facebook_authenticator_spec.rb
index c5a91249b2..c7d26b6e86 100644
--- a/spec/components/auth/facebook_authenticator_spec.rb
+++ b/spec/components/auth/facebook_authenticator_spec.rb
@@ -48,7 +48,7 @@ describe Auth::FacebookAuthenticator do
           }
         },
         "info" => {
-          :email => "bob@bob.com"
+          email: "bob@bob.com"
         },
         "uid" => "100"
       }
diff --git a/spec/components/auth/github_authenticator_spec.rb b/spec/components/auth/github_authenticator_spec.rb
index 066fdecec0..1d83fefbc8 100644
--- a/spec/components/auth/github_authenticator_spec.rb
+++ b/spec/components/auth/github_authenticator_spec.rb
@@ -6,31 +6,50 @@ require 'rails_helper'
 Auth.send(:remove_const, :GithubAuthenticator)
 load 'auth/github_authenticator.rb'
 
+def auth_token_for(user)
+  {
+    extra: {
+      all_emails: [{
+        email: user.email,
+        primary: true,
+        verified: true,
+      }]
+    },
+    info: {
+      email: user.email,
+      email_verified: true,
+      nickname: user.username,
+      name: user.name,
+      image: "https://avatars3.githubusercontent.com/u/#{user.username}",
+    },
+    uid: '100'
+  }
+end
+
 describe Auth::GithubAuthenticator do
+  let(:authenticator) { described_class.new }
+  let(:user) { Fabricate(:user) }
 
   context 'after_authenticate' do
 
     it 'can authenticate and create a user record for already existing users' do
-      user = Fabricate(:user)
-
       hash = {
-        :extra => {
-          :all_emails => [{
-            :email => user.email,
-            :primary => true,
-            :verified => true,
+        extra: {
+          all_emails: [{
+            email: user.email,
+            primary: true,
+            verified: true,
           }]
         },
-        :info => {
-          :email => user.email,
-          :email_verified => true,
-          :nickname => user.username,
-          :name => user.name,
+        info: {
+          email: user.email,
+          email_verified: true,
+          nickname: user.username,
+          name: user.name,
         },
-        :uid => "100"
+        uid: "100"
       }
 
-      authenticator = Auth::GithubAuthenticator.new
       result = authenticator.after_authenticate(hash)
 
       expect(result.user.id).to eq(user.id)
@@ -41,26 +60,23 @@ describe Auth::GithubAuthenticator do
     end
 
     it 'will not authenticate for already existing users with an unverified email' do
-      user = Fabricate(:user)
-
       hash = {
-        :extra => {
-          :all_emails => [{
-            :email => user.email,
-            :primary => true,
-            :verified => false,
+        extra: {
+          all_emails: [{
+            email: user.email,
+            primary: true,
+            verified: false,
           }]
         },
-        :info => {
-          :email => user.email,
-          :email_verified => false,
-          :nickname => user.username,
-          :name => user.name,
+        info: {
+          email: user.email,
+          email_verified: false,
+          nickname: user.username,
+          name: user.name,
         },
-        :uid => "100"
+        uid: "100"
       }
 
-      authenticator = Auth::GithubAuthenticator.new
       result = authenticator.after_authenticate(hash)
 
       expect(result.user).to eq(nil)
@@ -72,23 +88,22 @@ describe Auth::GithubAuthenticator do
 
     it 'can create a proper result for non existing users' do
       hash = {
-        :extra => {
-          :all_emails => [{
-            :email => "person@example.com",
-            :primary => true,
-            :verified => true,
+        extra: {
+          all_emails: [{
+            email: "person@example.com",
+            primary: true,
+            verified: true,
           }]
         },
-        :info => {
-          :email => "person@example.com",
-          :email_verified => true,
-          :nickname => "person",
-          :name => "Person Lastname",
+        info: {
+          email: "person@example.com",
+          email_verified: true,
+          nickname: "person",
+          name: "Person Lastname",
         },
-        :uid => "100"
+        uid: "100"
       }
 
-      authenticator = Auth::GithubAuthenticator.new
       result = authenticator.after_authenticate(hash)
 
       expect(result.user).to eq(nil)
@@ -100,27 +115,26 @@ describe Auth::GithubAuthenticator do
 
     it 'will skip blacklisted domains for non existing users' do
       hash = {
-        :extra => {
-          :all_emails => [{
-            :email => "not_allowed@blacklist.com",
-            :primary => true,
-            :verified => true,
-          },{
-            :email => "allowed@whitelist.com",
-            :primary => false,
-            :verified => true,
+        extra: {
+          all_emails: [{
+            email: "not_allowed@blacklist.com",
+            primary: true,
+            verified: true,
+          }, {
+            email: "allowed@whitelist.com",
+            primary: false,
+            verified: true,
           }]
         },
-        :info => {
-          :email => "not_allowed@blacklist.com",
-          :email_verified => true,
-          :nickname => "person",
-          :name => "Person Lastname",
+        info: {
+          email: "not_allowed@blacklist.com",
+          email_verified: true,
+          nickname: "person",
+          name: "Person Lastname",
         },
-        :uid => "100"
+        uid: "100"
       }
 
-      authenticator = Auth::GithubAuthenticator.new
       SiteSetting.email_domains_blacklist = "blacklist.com"
       result = authenticator.after_authenticate(hash)
 
@@ -133,31 +147,30 @@ describe Auth::GithubAuthenticator do
 
     it 'will find whitelisted domains for non existing users' do
       hash = {
-        :extra => {
-          :all_emails => [{
-            :email => "person@example.com",
-            :primary => true,
-            :verified => true,
-          },{
-            :email => "not_allowed@blacklist.com",
-            :primary => true,
-            :verified => true,
-          },{
-            :email => "allowed@whitelist.com",
-            :primary => false,
-            :verified => true,
+        extra: {
+          all_emails: [{
+            email: "person@example.com",
+            primary: true,
+            verified: true,
+          }, {
+            email: "not_allowed@blacklist.com",
+            primary: true,
+            verified: true,
+          }, {
+            email: "allowed@whitelist.com",
+            primary: false,
+            verified: true,
           }]
         },
-        :info => {
-          :email => "person@example.com",
-          :email_verified => true,
-          :nickname => "person",
-          :name => "Person Lastname",
+        info: {
+          email: "person@example.com",
+          email_verified: true,
+          nickname: "person",
+          name: "Person Lastname",
         },
-        :uid => "100"
+        uid: "100"
       }
 
-      authenticator = Auth::GithubAuthenticator.new
       SiteSetting.email_domains_whitelist = "whitelist.com"
       result = authenticator.after_authenticate(hash)
 
@@ -169,4 +182,35 @@ describe Auth::GithubAuthenticator do
     end
 
   end
+
+  describe 'avatar retrieval' do
+    let(:job_klass) { Jobs::DownloadAvatarFromUrl }
+
+    before { SiteSetting.queue_jobs = true }
+
+    context 'when user has a custom avatar' do
+      let(:user_avatar) { Fabricate(:user_avatar, custom_upload: Fabricate(:upload)) }
+      let(:user_with_custom_avatar) { Fabricate(:user, user_avatar: user_avatar) }
+
+      it 'does not enqueue a download_avatar_from_url job' do
+        expect {
+          authenticator.after_authenticate(auth_token_for(user_with_custom_avatar))
+        }.to_not change(job_klass.jobs, :size)
+      end
+    end
+
+    context 'when user does not have a custom avatar' do
+      it 'enqueues a download_avatar_from_url job' do
+        expect {
+          authenticator.after_authenticate(auth_token_for(user))
+        }.to change(job_klass.jobs, :size).by(1)
+
+        job_args = job_klass.jobs.last['args'].first
+
+        expect(job_args['url']).to eq("https://avatars3.githubusercontent.com/u/#{user.username}")
+        expect(job_args['user_id']).to eq(user.id)
+        expect(job_args['override_gravatar']).to eq(false)
+      end
+    end
+  end
 end
diff --git a/spec/components/auth/google_oauth2_authenticator_spec.rb b/spec/components/auth/google_oauth2_authenticator_spec.rb
index db28abfd22..e3af7278ba 100644
--- a/spec/components/auth/google_oauth2_authenticator_spec.rb
+++ b/spec/components/auth/google_oauth2_authenticator_spec.rb
@@ -14,16 +14,16 @@ describe Auth::GoogleOAuth2Authenticator do
     user = Fabricate(:user)
 
     hash = {
-      :uid => "123456789",
-      :info => {
-          :name => "John Doe",
-          :email => user.email
+      uid: "123456789",
+      info: {
+          name: "John Doe",
+          email: user.email
       },
-      :extra => {
-        :raw_info => {
-          :email => user.email,
-          :email_verified => false,
-          :name => "John Doe"
+      extra: {
+        raw_info: {
+          email: user.email,
+          email_verified: false,
+          name: "John Doe"
         }
       }
     }
@@ -39,16 +39,16 @@ describe Auth::GoogleOAuth2Authenticator do
       user = Fabricate(:user)
 
       hash = {
-        :uid => "123456789",
-        :info => {
-            :name => "John Doe",
-            :email => user.email
+        uid: "123456789",
+        info: {
+            name: "John Doe",
+            email: user.email
         },
-        :extra => {
-          :raw_info => {
-            :email => user.email,
-            :email_verified => true,
-            :name => "John Doe"
+        extra: {
+          raw_info: {
+            email: user.email,
+            email_verified: true,
+            name: "John Doe"
           }
         }
       }
@@ -60,16 +60,16 @@ describe Auth::GoogleOAuth2Authenticator do
 
     it 'can create a proper result for non existing users' do
       hash = {
-        :uid => "123456789",
-        :info => {
-            :name => "Jane Doe",
-            :email => "jane.doe@the.google.com"
+        uid: "123456789",
+        info: {
+            name: "Jane Doe",
+            email: "jane.doe@the.google.com"
         },
-        :extra => {
-          :raw_info => {
-            :email => "jane.doe@the.google.com",
-            :email_verified => true,
-            :name => "Jane Doe"
+        extra: {
+          raw_info: {
+            email: "jane.doe@the.google.com",
+            email_verified: true,
+            name: "Jane Doe"
           }
         }
       }
@@ -82,4 +82,34 @@ describe Auth::GoogleOAuth2Authenticator do
     end
   end
 
+  context 'after_create_account' do
+    it 'confirms email' do
+      authenticator = Auth::GoogleOAuth2Authenticator.new
+      user = Fabricate(:user, email: 'realgoogleuser@gmail.com')
+      session = {
+        email_valid: "true",
+        extra_data: {
+          google_user_id: 1,
+          email: 'realgoogleuser@gmail.com'
+        }
+      }
+      authenticator.after_create_account(user, session)
+      expect(user.email_confirmed?).to eq(true)
+    end
+
+    it "doesn't confirm email if it was changed" do
+      authenticator = Auth::GoogleOAuth2Authenticator.new
+      user = Fabricate(:user, email: 'changed@gmail.com')
+      session = {
+        email_valid: "true",
+        extra_data: {
+          google_user_id: 1,
+          email: 'realgoogleuser@gmail.com'
+        }
+      }
+      authenticator.after_create_account(user, session)
+      expect(user.email_confirmed?).to eq(false)
+    end
+  end
+
 end
diff --git a/spec/components/auth/open_id_authenticator_spec.rb b/spec/components/auth/open_id_authenticator_spec.rb
index 6b295dcc19..983fea379a 100644
--- a/spec/components/auth/open_id_authenticator_spec.rb
+++ b/spec/components/auth/open_id_authenticator_spec.rb
@@ -13,7 +13,7 @@ describe Auth::OpenIdAuthenticator do
 
     user = Fabricate(:user)
     response = OpenStruct.new(identity_url: 'abc')
-    result = auth.after_authenticate(info: {email: user.email}, extra: {response: response})
+    result = auth.after_authenticate(info: { email: user.email }, extra: { response: response })
     expect(result.user).to eq(user)
   end
 
diff --git a/spec/components/auth/twitter_authenticator_spec.rb b/spec/components/auth/twitter_authenticator_spec.rb
new file mode 100644
index 0000000000..8c2d465965
--- /dev/null
+++ b/spec/components/auth/twitter_authenticator_spec.rb
@@ -0,0 +1,28 @@
+require 'rails_helper'
+
+describe Auth::TwitterAuthenticator do
+
+  it "takes over account if email is supplied" do
+    auth = Auth::TwitterAuthenticator.new
+
+    user = Fabricate(:user)
+
+    auth_token = {
+      info: {
+        "email" => user.email,
+        "username" => "test",
+        "name" => "test",
+        "nickname" => "minion",
+      },
+      "uid" => "123"
+    }
+
+    result = auth.after_authenticate(auth_token)
+
+    expect(result.user.id).to eq(user.id)
+
+    info = TwitterUserInfo.find_by(user_id: user.id)
+    expect(info.email).to eq(user.email)
+  end
+
+end
diff --git a/spec/components/avatar_lookup_spec.rb b/spec/components/avatar_lookup_spec.rb
index 539ef48a24..c744b6301d 100644
--- a/spec/components/avatar_lookup_spec.rb
+++ b/spec/components/avatar_lookup_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 require_dependency 'avatar_lookup'
 
 describe AvatarLookup do
-  let!(:user){ Fabricate(:user) }
+  let!(:user) { Fabricate(:user) }
 
   describe '#[]' do
     before do
diff --git a/spec/components/cache_spec.rb b/spec/components/cache_spec.rb
index 387cea9e23..1f531f62f6 100644
--- a/spec/components/cache_spec.rb
+++ b/spec/components/cache_spec.rb
@@ -13,7 +13,7 @@ describe Cache do
   end
 
   it "supports hash" do
-    hash = {a: 1, b: [1,2,3]}
+    hash = { a: 1, b: [1, 2, 3] }
     cache.write("hash", hash)
     expect(cache.read("hash")).to eq(hash)
   end
@@ -41,7 +41,7 @@ describe Cache do
     cache.delete("key")
     cache.delete("bla")
 
-    key = cache.namespaced_key("key")
+    key = cache.normalize_key("key")
 
     cache.fetch("key", expires_in: 1.minute) do
       "bob"
@@ -50,9 +50,9 @@ describe Cache do
     expect($redis.ttl(key)).to be_within(2.seconds).of(1.minute)
 
     # we always expire withing a day
-    cache.fetch("bla"){ "hi" }
+    cache.fetch("bla") { "hi" }
 
-    key = cache.namespaced_key("bla")
+    key = cache.normalize_key("bla")
     expect($redis.ttl(key)).to be_within(2.seconds).of(1.day)
   end
 
diff --git a/spec/components/column_dropper_spec.rb b/spec/components/column_dropper_spec.rb
index c1274ae606..3fd7581590 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
@@ -17,8 +17,8 @@ describe ColumnDropper do
   it "can correctly drop columns after correct delay" do
     Topic.exec_sql "ALTER TABLE topics ADD COLUMN junk int"
     name = Topic
-            .exec_sql("SELECT name FROM schema_migration_details LIMIT 1")
-            .getvalue(0,0)
+      .exec_sql("SELECT name FROM schema_migration_details LIMIT 1")
+      .getvalue(0, 0)
 
     Topic.exec_sql("UPDATE schema_migration_details SET created_at = :created_at WHERE name = :name",
                   name: name, created_at: 15.minutes.ago)
@@ -30,7 +30,7 @@ describe ColumnDropper do
       after_migration: name,
       columns: ['junk'],
       delay: 20.minutes,
-      on_drop: ->(){dropped_proc_called = true}
+      on_drop: ->() { dropped_proc_called = true }
     )
 
     expect(has_column?('topics', 'junk')).to eq(true)
@@ -41,12 +41,100 @@ describe ColumnDropper do
       after_migration: name,
       columns: ['junk'],
       delay: 10.minutes,
-      on_drop: ->(){dropped_proc_called = true}
+      on_drop: ->() { dropped_proc_called = true }
     )
 
     expect(has_column?('topics', 'junk')).to eq(false)
     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 be droppable' do
+      name = Topic
+        .exec_sql("SELECT name FROM schema_migration_details LIMIT 1")
+        .getvalue(0, 0)
+
+      dropped_proc_called = false
+      ColumnDropper.drop(
+        table: table_name,
+        after_migration: name,
+        columns: ['email'],
+        delay: 0.minutes,
+        on_drop: ->() { dropped_proc_called = true }
+      )
+
+      expect(dropped_proc_called).to eq(true)
+
+    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/common_passwords/common_passwords_spec.rb b/spec/components/common_passwords/common_passwords_spec.rb
index 483a67c0e5..b78ebeec52 100644
--- a/spec/components/common_passwords/common_passwords_spec.rb
+++ b/spec/components/common_passwords/common_passwords_spec.rb
@@ -13,7 +13,7 @@ describe CommonPasswords do
     subject { described_class.common_password? @password }
 
     it "returns false if password isn't in the common passwords list" do
-      described_class.stubs(:password_list).returns(stub_everything(:include? => false))
+      described_class.stubs(:password_list).returns(stub_everything(include?: false))
       @password = 'uncommonPassword'
       expect(subject).to eq(false)
     end
@@ -31,7 +31,7 @@ describe CommonPasswords do
     end
 
     it "returns true if password is in the common passwords list" do
-      described_class.stubs(:password_list).returns(stub_everything(:include? => true))
+      described_class.stubs(:password_list).returns(stub_everything(include?: true))
       @password = "password"
       expect(subject).to eq(true)
     end
diff --git a/spec/components/composer_messages_finder_spec.rb b/spec/components/composer_messages_finder_spec.rb
index adf6f81db2..fc5b04d0d2 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
@@ -127,7 +127,7 @@ describe ComposerMessagesFinder do
     end
 
     it "doesn't notify users who have been notified already" do
-      UserHistory.create!(action: UserHistory.actions[:notified_about_avatar], target_user_id: user.id )
+      UserHistory.create!(action: UserHistory.actions[:notified_about_avatar], target_user_id: user.id)
       expect(finder.check_avatar_notification).to be_blank
     end
 
@@ -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
@@ -179,17 +179,17 @@ describe ComposerMessagesFinder do
       end
 
       it "doesn't notify a user it has already notified about sequential replies" do
-        UserHistory.create!(action: UserHistory.actions[:notified_about_sequential_replies], target_user_id: user.id, topic_id: topic.id )
+        UserHistory.create!(action: UserHistory.actions[:notified_about_sequential_replies], target_user_id: user.id, topic_id: topic.id)
         expect(finder.check_sequential_replies).to be_blank
       end
 
       it "will notify you if it hasn't in the current topic" do
-        UserHistory.create!(action: UserHistory.actions[:notified_about_sequential_replies], target_user_id: user.id, topic_id: topic.id+1 )
+        UserHistory.create!(action: UserHistory.actions[:notified_about_sequential_replies], target_user_id: user.id, topic_id: topic.id + 1)
         expect(finder.check_sequential_replies).to be_present
       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,27 +254,27 @@ 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
 
       it "doesn't notify a user it has already notified in this topic" do
-        UserHistory.create!(action: UserHistory.actions[:notified_about_dominating_topic], topic_id: topic.id, target_user_id: user.id )
+        UserHistory.create!(action: UserHistory.actions[:notified_about_dominating_topic], topic_id: topic.id, target_user_id: user.id)
         expect(finder.check_dominating_topic).to be_blank
       end
 
       it "notifies a user if the topic is different" do
-        UserHistory.create!(action: UserHistory.actions[:notified_about_dominating_topic], topic_id: topic.id+1, target_user_id: user.id )
+        UserHistory.create!(action: UserHistory.actions[:notified_about_dominating_topic], topic_id: topic.id + 1, target_user_id: user.id)
         expect(finder.check_dominating_topic).to be_present
       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
 
@@ -359,7 +359,7 @@ describe ComposerMessagesFinder do
         UserHistory.create!(
           action: UserHistory.actions[:notified_about_get_a_room],
           target_user_id: user.id,
-          topic_id: topic.id+1
+          topic_id: topic.id + 1
         )
         expect(finder.check_get_a_room(min_users_posted: 2)).to be_present
       end
@@ -420,7 +420,6 @@ describe ComposerMessagesFinder do
 
   end
 
-
   context '.check_reviving_old_topic' do
     let(:user)  { Fabricate(:user) }
     let(:topic) { Fabricate(:topic) }
@@ -433,7 +432,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 +448,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/concern/category_hashtag_spec.rb b/spec/components/concern/category_hashtag_spec.rb
index c57ac89163..d058ef1af9 100644
--- a/spec/components/concern/category_hashtag_spec.rb
+++ b/spec/components/concern/category_hashtag_spec.rb
@@ -28,7 +28,7 @@ describe CategoryHashtag do
       child_category.update_attributes!(slug: "OraNGE")
 
       expect(Category.query_from_hashtag_slug("apple")).to eq(nil)
-      expect(Category.query_from_hashtag_slug("apple:orange")).to eq(nil)
+      expect(Category.query_from_hashtag_slug("apple#{CategoryHashtag::SEPARATOR}orange")).to eq(nil)
     end
   end
 end
diff --git a/spec/components/concern/has_custom_fields_spec.rb b/spec/components/concern/has_custom_fields_spec.rb
index d429c13a8e..f1bf5933cb 100644
--- a/spec/components/concern/has_custom_fields_spec.rb
+++ b/spec/components/concern/has_custom_fields_spec.rb
@@ -1,6 +1,5 @@
 require "rails_helper"
 
-
 describe HasCustomFields do
 
   context "custom_fields" do
@@ -48,7 +47,7 @@ describe HasCustomFields do
       test_item.save
       test_item = CustomFieldsTestItem.find(test_item.id)
 
-      expect(test_item.custom_fields).to eq({"jack" => "jill"})
+      expect(test_item.custom_fields).to eq("jack" => "jill")
     end
 
     it "casts integers to string without error" do
@@ -88,35 +87,35 @@ describe HasCustomFields do
 
     it "double save actually saves" do
       test_item = CustomFieldsTestItem.new
-      test_item.custom_fields = {"a" => "b"}
+      test_item.custom_fields = { "a" => "b" }
       test_item.save
 
       test_item.custom_fields["c"] = "d"
       test_item.save
 
       db_item = CustomFieldsTestItem.find(test_item.id)
-      expect(db_item.custom_fields).to eq({"a" => "b", "c" => "d"})
+      expect(db_item.custom_fields).to eq("a" => "b", "c" => "d")
     end
 
     it "handles arrays properly" do
       test_item = CustomFieldsTestItem.new
-      test_item.custom_fields = {"a" => ["b", "c", "d"]}
+      test_item.custom_fields = { "a" => ["b", "c", "d"] }
       test_item.save
 
       db_item = CustomFieldsTestItem.find(test_item.id)
-      expect(db_item.custom_fields).to eq({"a" => ["b", "c", "d"]})
+      expect(db_item.custom_fields).to eq("a" => ["b", "c", "d"])
 
       db_item.custom_fields.update('a' => ['c', 'd'])
       db_item.save
-      expect(db_item.custom_fields).to eq({"a" => ["c", "d"]})
+      expect(db_item.custom_fields).to eq("a" => ["c", "d"])
 
       # It can be updated to the exact same value
       db_item.custom_fields.update('a' => ['c'])
       db_item.save
-      expect(db_item.custom_fields).to eq({"a" => "c"})
+      expect(db_item.custom_fields).to eq("a" => "c")
       db_item.custom_fields.update('a' => ['c'])
       db_item.save
-      expect(db_item.custom_fields).to eq({"a" => "c"})
+      expect(db_item.custom_fields).to eq("a" => "c")
 
       db_item.custom_fields.delete('a')
       expect(db_item.custom_fields).to eq({})
@@ -124,12 +123,12 @@ describe HasCustomFields do
 
     it "casts integers in arrays properly without error" do
       test_item = CustomFieldsTestItem.new
-      test_item.custom_fields = {"a" => ["b", 10, "d"]}
+      test_item.custom_fields = { "a" => ["b", 10, "d"] }
       test_item.save
-      expect(test_item.custom_fields).to eq({"a" => ["b", "10", "d"]})
+      expect(test_item.custom_fields).to eq("a" => ["b", "10", "d"])
 
       db_item = CustomFieldsTestItem.find(test_item.id)
-      expect(db_item.custom_fields).to eq({"a" => ["b", "10", "d"]})
+      expect(db_item.custom_fields).to eq("a" => ["b", "10", "d"])
     end
 
     it "supportes type coersion" do
@@ -138,11 +137,21 @@ describe HasCustomFields do
       CustomFieldsTestItem.register_custom_field_type("int", :integer)
       CustomFieldsTestItem.register_custom_field_type("json", :json)
 
-      test_item.custom_fields = {"bool" => true, "int" => 1, "json" => { "foo" => "bar" }}
+      test_item.custom_fields = { "bool" => true, "int" => 1, "json" => { "foo" => "bar" } }
       test_item.save
       test_item.reload
 
-      expect(test_item.custom_fields).to eq({"bool" => true, "int" => 1, "json" => { "foo" => "bar" }})
+      expect(test_item.custom_fields).to eq("bool" => true, "int" => 1, "json" => { "foo" => "bar" })
+
+      before_ids = CustomFieldsTestItemCustomField.where(custom_fields_test_item_id: test_item.id).pluck(:id)
+
+      test_item.custom_fields["bool"] = false
+      test_item.save
+
+      after_ids = CustomFieldsTestItemCustomField.where(custom_fields_test_item_id: test_item.id).pluck(:id)
+
+      # we updated only 1 custom field, so there should be only 1 different id
+      expect((before_ids - after_ids).size).to eq(1)
     end
 
     it "simple modifications don't interfere" do
@@ -165,17 +174,17 @@ describe HasCustomFields do
       test_item = CustomFieldsTestItem.find(test_item.id)
       test_item2 = CustomFieldsTestItem.find(test_item2.id)
 
-      expect(test_item.custom_fields).to eq({"jack" => "black", "bob" => "marley"})
-      expect(test_item2.custom_fields).to eq({"sixto" => "rodriguez", "de" => "la playa"})
+      expect(test_item.custom_fields).to eq("jack" => "black", "bob" => "marley")
+      expect(test_item2.custom_fields).to eq("sixto" => "rodriguez", "de" => "la playa")
     end
 
     it "supports bulk retrieval with a list of ids" do
       item1 = CustomFieldsTestItem.new
-      item1.custom_fields = {"a" => ["b", "c", "d"], 'not_whitelisted' => 'secret'}
+      item1.custom_fields = { "a" => ["b", "c", "d"], 'not_whitelisted' => 'secret' }
       item1.save
 
       item2 = CustomFieldsTestItem.new
-      item2.custom_fields = {"e" => 'hallo'}
+      item2.custom_fields = { "e" => 'hallo' }
       item2.save
 
       fields = CustomFieldsTestItem.custom_fields_for_ids([item1.id, item2.id], ['a', 'e'])
@@ -184,5 +193,27 @@ describe HasCustomFields do
       expect(fields[item1.id]['not_whitelisted']).to be_blank
       expect(fields[item2.id]['e']).to eq('hallo')
     end
+
+    it "handles interleaving saving properly" do
+      field_type = 'deep-nest-test'
+      CustomFieldsTestItem.register_custom_field_type(field_type, :json)
+      test_item = CustomFieldsTestItem.create!
+
+      test_item.custom_fields[field_type] ||= {}
+      test_item.custom_fields[field_type]['b'] ||= {}
+      test_item.custom_fields[field_type]['b']['c'] = 'd'
+      test_item.save_custom_fields(true)
+
+      db_item = CustomFieldsTestItem.find(test_item.id)
+      db_item.custom_fields[field_type]['b']['e'] = 'f'
+      test_item.custom_fields[field_type]['b']['e'] = 'f'
+      expected = { field_type => { 'b' => { 'c' => 'd', 'e' => 'f' } } }
+
+      db_item.save_custom_fields(true)
+      expect(db_item.reload.custom_fields).to eq(expected)
+
+      test_item.save_custom_fields(true)
+      expect(test_item.reload.custom_fields).to eq(expected)
+    end
   end
 end
diff --git a/spec/components/concern/has_search_data_spec.rb b/spec/components/concern/has_search_data_spec.rb
new file mode 100644
index 0000000000..9cc3089f58
--- /dev/null
+++ b/spec/components/concern/has_search_data_spec.rb
@@ -0,0 +1,47 @@
+require "rails_helper"
+
+describe HasSearchData do
+  context "belongs to its model" do
+    before do
+      Topic.exec_sql("create temporary table model_items(id SERIAL primary key)")
+      Topic.exec_sql("create temporary table model_item_search_data(model_item_id int primary key, search_data tsvector, raw_data text, locale text)")
+
+      class ModelItem < ActiveRecord::Base
+        has_one :model_item_search_data, dependent: :destroy
+      end
+
+      class ModelItemSearchData < ActiveRecord::Base
+        include HasSearchData
+      end
+    end
+
+    after do
+      Topic.exec_sql("drop table model_items")
+      Topic.exec_sql("drop table model_item_search_data")
+
+      # import is making my life hard, we need to nuke this out of orbit
+      des = ActiveSupport::DescendantsTracker.class_variable_get :@@direct_descendants
+      des[ActiveRecord::Base].delete(ModelItem)
+      des[ActiveRecord::Base].delete(ModelItemSearchData)
+    end
+
+    let(:item) do
+      item = ModelItem.create!
+      item.create_model_item_search_data!(
+        model_item_id: item.id,
+        search_data: 'a',
+        raw_data: 'a',
+        locale: 'en')
+      item
+    end
+
+    it 'sets its primary key into asscoiated model' do
+      expect(ModelItemSearchData.primary_key).to eq 'model_item_id'
+    end
+
+    it 'can access the model' do
+      record_id = item.id
+      expect(ModelItemSearchData.find_by(model_item_id: record_id).model_item_id).to eq record_id
+    end
+  end
+end
diff --git a/spec/components/concern/positionable_spec.rb b/spec/components/concern/positionable_spec.rb
index 1bf08f63e1..d8433d6711 100644
--- a/spec/components/concern/positionable_spec.rb
+++ b/spec/components/concern/positionable_spec.rb
@@ -28,19 +28,19 @@ describe Positionable do
         Topic.exec_sql("insert into test_items(id,position) values(#{i}, #{i})")
       end
 
-      expect(positions).to eq([0,1,2,3,4])
+      expect(positions).to eq([0, 1, 2, 3, 4])
       TestItem.find(3).move_to(0)
-      expect(positions).to eq([3,0,1,2,4])
-      expect(TestItem.pluck(:position).sort).to eq([0,1,2,3,4])
+      expect(positions).to eq([3, 0, 1, 2, 4])
+      expect(TestItem.pluck(:position).sort).to eq([0, 1, 2, 3, 4])
 
       TestItem.find(3).move_to(1)
-      expect(positions).to eq([0,3,1,2,4])
+      expect(positions).to eq([0, 3, 1, 2, 4])
 
       # this is somewhat odd, but when there is no such position, not much we can do
       TestItem.find(1).move_to(5)
-      expect(positions).to eq([0,3,2,4,1])
+      expect(positions).to eq([0, 3, 2, 4, 1])
 
-      expect(TestItem.pluck(:position).sort).to eq([0,1,2,3,4])
+      expect(TestItem.pluck(:position).sort).to eq([0, 1, 2, 3, 4])
 
       item = TestItem.new
       item.id = 7
diff --git a/spec/components/concern/searchable_spec.rb b/spec/components/concern/searchable_spec.rb
new file mode 100644
index 0000000000..365f2b16f8
--- /dev/null
+++ b/spec/components/concern/searchable_spec.rb
@@ -0,0 +1,57 @@
+require "rails_helper"
+
+describe Searchable do
+  context "has search data" do
+    before do
+      Topic.exec_sql("create temporary table searchable_records(id SERIAL primary key)")
+      Topic.exec_sql("create temporary table searchable_record_search_data(searchable_record_id int primary key, search_data tsvector, raw_data text, locale text)")
+
+      class SearchableRecord < ActiveRecord::Base
+        include Searchable
+      end
+
+      class SearchableRecordSearchData < ActiveRecord::Base
+        self.primary_key = 'searchable_record_id'
+        belongs_to :test_item
+      end
+    end
+
+    after do
+      Topic.exec_sql("drop table searchable_records")
+      Topic.exec_sql("drop table searchable_record_search_data")
+
+      # import is making my life hard, we need to nuke this out of orbit
+      des = ActiveSupport::DescendantsTracker.class_variable_get :@@direct_descendants
+      des[ActiveRecord::Base].delete(SearchableRecord)
+      des[ActiveRecord::Base].delete(SearchableRecordSearchData)
+    end
+
+    let(:item) { SearchableRecord.create! }
+
+    it 'can build the data' do
+      expect(item.build_searchable_record_search_data).to be_truthy
+    end
+
+    it 'can save the data' do
+      item.build_searchable_record_search_data(
+        search_data: '',
+        raw_data: 'a',
+        locale: 'en')
+      item.save
+
+      loaded = SearchableRecord.find(item.id)
+      expect(loaded.searchable_record_search_data.raw_data).to eq 'a'
+    end
+
+    it 'destroy the search data when the item is deprived' do
+      item.build_searchable_record_search_data(
+        search_data: '',
+        raw_data: 'a',
+        locale: 'en')
+      item.save
+      item_id = item.id
+      item.destroy
+      expect(SearchableRecordSearchData.find_by(searchable_record_id: item_id)).to be_nil
+    end
+  end
+end
diff --git a/spec/components/content_buffer_spec.rb b/spec/components/content_buffer_spec.rb
index f13492eb8c..adb8222f5c 100644
--- a/spec/components/content_buffer_spec.rb
+++ b/spec/components/content_buffer_spec.rb
@@ -5,24 +5,24 @@ describe ContentBuffer do
 
   it "handles deletion across lines properly" do
     c = ContentBuffer.new("a\nbc\nc")
-    c.apply_transform!(start: {row: 0, col: 0}, finish: {col: 1, row: 1}, operation: :delete)
+    c.apply_transform!(start: { row: 0, col: 0 }, finish: { col: 1, row: 1 }, operation: :delete)
     expect(c.to_s).to eq("c\nc")
   end
   it "handles deletion inside lines properly" do
     c = ContentBuffer.new("hello world")
-    c.apply_transform!(start: {row: 0, col: 1}, finish: {col: 4, row: 0}, operation: :delete)
+    c.apply_transform!(start: { row: 0, col: 1 }, finish: { col: 4, row: 0 }, operation: :delete)
     expect(c.to_s).to eq("ho world")
   end
 
   it "handles inserts inside lines properly" do
     c = ContentBuffer.new("hello!")
-    c.apply_transform!(start: {row: 0, col: 5}, operation: :insert, text: " world")
+    c.apply_transform!(start: { row: 0, col: 5 }, operation: :insert, text: " world")
     expect(c.to_s).to eq("hello world!")
   end
 
   it "handles multiline inserts" do
     c = ContentBuffer.new("hello!")
-    c.apply_transform!(start: {row: 0, col: 5}, operation: :insert, text: "\nworld")
+    c.apply_transform!(start: { row: 0, col: 5 }, operation: :insert, text: "\nworld")
     expect(c.to_s).to eq("hello\nworld!")
   end
 
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index cc0f5f4467..b6bf69b1b0 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -10,9 +10,9 @@ describe CookedPostProcessor do
     let(:post_process) { sequence("post_process") }
 
     it "post process in sequence" do
-      cpp.expects(:keep_reverse_index_up_to_date).in_sequence(post_process)
-      cpp.expects(:post_process_images).in_sequence(post_process)
       cpp.expects(:post_process_oneboxes).in_sequence(post_process)
+      cpp.expects(:post_process_images).in_sequence(post_process)
+      cpp.expects(:keep_reverse_index_up_to_date).in_sequence(post_process)
       cpp.expects(:optimize_urls).in_sequence(post_process)
       cpp.expects(:pull_hotlinked_images).in_sequence(post_process)
       cpp.post_process
@@ -31,7 +31,7 @@ describe CookedPostProcessor do
     end
 
     context "admin user" do
-      let(:post) { Fabricate(:post, user: Fabricate(:admin) ) }
+      let(:post) { Fabricate(:post, user: Fabricate(:admin)) }
 
       it "omits nofollow" do
         cpp = CookedPostProcessor.new(post)
@@ -41,8 +41,8 @@ describe CookedPostProcessor do
   end
 
   context ".keep_reverse_index_up_to_date" do
-    let(:video_upload) { Fabricate(:upload, url: '/uploads/default/1/1234567890123456.mp4' ) }
-    let(:image_upload) { Fabricate(:upload, url: '/uploads/default/1/1234567890123456.jpg' ) }
+    let(:video_upload) { Fabricate(:upload, url: '/uploads/default/1/1234567890123456.mp4') }
+    let(:image_upload) { Fabricate(:upload, url: '/uploads/default/1/1234567890123456.jpg') }
     let(:audio_upload) { Fabricate(:upload, url: '/uploads/default/1/1234567890123456.ogg') }
     let(:attachment_upload) { Fabricate(:upload, url: '/uploads/default/1/1234567890123456.csv') }
 
@@ -75,8 +75,13 @@ describe CookedPostProcessor do
     end
 
     it "cleans the reverse index up for the current post" do
-      PostUpload.expects(:delete_all).with(post_id: post.id)
       cpp.keep_reverse_index_up_to_date
+
+      post_uploads_ids = post.post_uploads.pluck(:id)
+
+      cpp.keep_reverse_index_up_to_date
+
+      expect(post.reload.post_uploads.pluck(:id)).to_not eq(post_uploads_ids)
     end
 
   end
@@ -85,9 +90,7 @@ describe CookedPostProcessor do
 
     shared_examples "leave dimensions alone" do
       it "doesn't use them" do
-        # adds the width from the image sizes provided when no dimension is provided
         expect(cpp.html).to match(/src="http:\/\/foo.bar\/image.png" width="" height=""/)
-        # adds the width from the image sizes provided
         expect(cpp.html).to match(/src="http:\/\/domain.com\/picture.jpg" width="50" height="42"/)
         expect(cpp).to be_dirty
       end
@@ -100,30 +103,27 @@ describe CookedPostProcessor do
       before { cpp.post_process_images }
 
       context "valid" do
-        let(:image_sizes) { {"http://foo.bar/image.png" => {"width" => 111, "height" => 222}} }
+        let(:image_sizes) { { "http://foo.bar/image.png" => { "width" => 111, "height" => 222 } } }
 
         it "uses them" do
-
-          # adds the width from the image sizes provided when no dimension is provided
           expect(cpp.html).to match(/src="http:\/\/foo.bar\/image.png" width="111" height="222"/)
-          # adds the width from the image sizes provided
           expect(cpp.html).to match(/src="http:\/\/domain.com\/picture.jpg" width="50" height="42"/)
           expect(cpp).to be_dirty
         end
       end
 
       context "invalid width" do
-        let(:image_sizes) { {"http://foo.bar/image.png" => {"width" => 0, "height" => 222}} }
+        let(:image_sizes) { { "http://foo.bar/image.png" => { "width" => 0, "height" => 222 } } }
         include_examples "leave dimensions alone"
       end
 
       context "invalid height" do
-        let(:image_sizes) { {"http://foo.bar/image.png" => {"width" => 111, "height" => 0}} }
+        let(:image_sizes) { { "http://foo.bar/image.png" => { "width" => 111, "height" => 0 } } }
         include_examples "leave dimensions alone"
       end
 
       context "invalid width & height" do
-        let(:image_sizes) { {"http://foo.bar/image.png" => {"width" => 0, "height" => 0}} }
+        let(:image_sizes) { { "http://foo.bar/image.png" => { "width" => 0, "height" => 0 } } }
         include_examples "leave dimensions alone"
       end
 
@@ -154,9 +154,7 @@ describe CookedPostProcessor do
         SiteSetting.create_thumbnails = true
 
         Upload.expects(:get_from_url).returns(upload)
-        FastImage.stubs(:size).returns([1750, 2000])
-
-        # hmmm this should be done in a cleaner way
+        FastImage.expects(:size).returns([1750, 2000])
         OptimizedImage.expects(:resize).returns(true)
 
         FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
@@ -164,7 +162,7 @@ describe CookedPostProcessor do
 
       it "generates overlay information" do
         cpp.post_process_images
-        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a data-download-href=\"/uploads/default/#{upload.sha1}\" href=\"/uploads/default/1/1234567890123456.jpg\" class=\"lightbox\" title=\"logo.png\"><img src=\"/uploads/default/optimized/1X/#{upload.sha1}_1_690x788.png\" width=\"690\" height=\"788\"><div class=\"meta\">
+        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/uploads/default/1/1234567890123456.jpg\" data-download-href=\"/uploads/default/#{upload.sha1}\" title=\"logo.png\"><img src=\"/uploads/default/optimized/1X/#{upload.sha1}_1_690x788.png\" width=\"690\" height=\"788\"><div class=\"meta\">
 <span class=\"filename\">logo.png</span><span class=\"informations\">1750x2000 1.21 KB</span><span class=\"expand\"></span>
 </div></a></div></p>"
         expect(cpp).to be_dirty
@@ -172,6 +170,58 @@ describe CookedPostProcessor do
 
     end
 
+    context "with tall images" do
+
+      let(:upload) { Fabricate(:upload) }
+      let(:post) { Fabricate(:post_with_large_image) }
+      let(:cpp) { CookedPostProcessor.new(post) }
+
+      before do
+        SiteSetting.create_thumbnails = true
+
+        Upload.expects(:get_from_url).returns(upload)
+        FastImage.expects(:size).returns([860, 1900])
+        OptimizedImage.expects(:resize).never
+        OptimizedImage.expects(:crop).returns(true)
+
+        FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
+      end
+
+      it "crops the image" do
+        cpp.post_process_images
+        expect(cpp.html).to match /width="690" height="500">/
+        expect(cpp).to be_dirty
+      end
+
+    end
+
+    context "with iPhone X screenshots" do
+
+      let(:upload) { Fabricate(:upload) }
+      let(:post) { Fabricate(:post_with_large_image) }
+      let(:cpp) { CookedPostProcessor.new(post) }
+
+      before do
+        SiteSetting.create_thumbnails = true
+
+        Upload.expects(:get_from_url).returns(upload)
+        FastImage.expects(:size).returns([1125, 2436])
+        OptimizedImage.expects(:resize).returns(true)
+        OptimizedImage.expects(:crop).never
+
+        FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
+      end
+
+      it "crops the image" do
+        cpp.post_process_images
+        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/uploads/default/1/1234567890123456.jpg\" data-download-href=\"/uploads/default/#{upload.sha1}\" title=\"logo.png\"><img src=\"/uploads/default/optimized/1X/#{upload.sha1}_1_230x500.png\" width=\"230\" height=\"500\"><div class=\"meta\">
+<span class=\"filename\">logo.png</span><span class=\"informations\">1125x2436 1.21 KB</span><span class=\"expand\"></span>
+</div></a></div></p>"
+        expect(cpp).to be_dirty
+      end
+
+    end
+
     context "with large images when using subfolders" do
 
       let(:upload) { Fabricate(:upload) }
@@ -187,9 +237,7 @@ describe CookedPostProcessor do
         Discourse.stubs(:base_uri).returns(base_uri)
 
         Upload.expects(:get_from_url).returns(upload)
-        FastImage.stubs(:size).returns([1750, 2000])
-
-        # hmmm this should be done in a cleaner way
+        FastImage.expects(:size).returns([1750, 2000])
         OptimizedImage.expects(:resize).returns(true)
 
         FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
@@ -197,7 +245,7 @@ describe CookedPostProcessor do
 
       it "generates overlay information" do
         cpp.post_process_images
-        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a data-download-href=\"/subfolder/uploads/default/#{upload.sha1}\" href=\"/subfolder/uploads/default/1/1234567890123456.jpg\" class=\"lightbox\" title=\"logo.png\"><img src=\"/subfolder/uploads/default/optimized/1X/#{upload.sha1}_1_690x788.png\" width=\"690\" height=\"788\"><div class=\"meta\">
+        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/subfolder/uploads/default/1/1234567890123456.jpg\" data-download-href=\"/subfolder/uploads/default/#{upload.sha1}\" title=\"logo.png\"><img src=\"/subfolder/uploads/default/optimized/1X/#{upload.sha1}_1_690x788.png\" width=\"690\" height=\"788\"><div class=\"meta\">
 <span class=\"filename\">logo.png</span><span class=\"informations\">1750x2000 1.21 KB</span><span class=\"expand\"></span>
 </div></a></div></p>"
         expect(cpp).to be_dirty
@@ -206,7 +254,7 @@ describe CookedPostProcessor do
       it "should escape the filename" do
         upload.update_attributes!(original_filename: "><img src=x onerror=alert('haha')>.png")
         cpp.post_process_images
-        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a data-download-href=\"/subfolder/uploads/default/#{upload.sha1}\" href=\"/subfolder/uploads/default/1/1234567890123456.jpg\" class=\"lightbox\" title=\"&amp;gt;&amp;lt;img src=x onerror=alert(&amp;#39;haha&amp;#39;)&amp;gt;.png\"><img src=\"/subfolder/uploads/default/optimized/1X/#{upload.sha1}_1_690x788.png\" width=\"690\" height=\"788\"><div class=\"meta\">
+        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/subfolder/uploads/default/1/1234567890123456.jpg\" data-download-href=\"/subfolder/uploads/default/#{upload.sha1}\" title=\"&amp;gt;&amp;lt;img src=x onerror=alert(&amp;#39;haha&amp;#39;)&amp;gt;.png\"><img src=\"/subfolder/uploads/default/optimized/1X/#{upload.sha1}_1_690x788.png\" width=\"690\" height=\"788\"><div class=\"meta\">
 <span class=\"filename\">&amp;gt;&amp;lt;img src=x onerror=alert(&amp;#39;haha&amp;#39;)&amp;gt;.png</span><span class=\"informations\">1750x2000 1.21 KB</span><span class=\"expand\"></span>
 </div></a></div></p>"
       end
@@ -224,16 +272,15 @@ describe CookedPostProcessor do
         SiteSetting.create_thumbnails = true
 
         Upload.expects(:get_from_url).returns(upload)
-        FastImage.stubs(:size).returns([1750, 2000])
-
-        # hmmm this should be done in a cleaner way
+        FastImage.expects(:size).returns([1750, 2000])
         OptimizedImage.expects(:resize).returns(true)
+
         FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
       end
 
       it "generates overlay information" do
         cpp.post_process_images
-        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a data-download-href=\"/uploads/default/#{upload.sha1}\" href=\"/uploads/default/1/1234567890123456.jpg\" class=\"lightbox\" title=\"WAT\"><img src=\"/uploads/default/optimized/1X/#{upload.sha1}_1_690x788.png\" title=\"WAT\" width=\"690\" height=\"788\"><div class=\"meta\">
+        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/uploads/default/1/1234567890123456.jpg\" data-download-href=\"/uploads/default/#{upload.sha1}\" title=\"WAT\"><img src=\"/uploads/default/optimized/1X/#{upload.sha1}_1_690x788.png\" title=\"WAT\" width=\"690\" height=\"788\"><div class=\"meta\">
        <span class=\"filename\">WAT</span><span class=\"informations\">1750x2000 1.21 KB</span><span class=\"expand\"></span>
        </div></a></div></p>"
         expect(cpp).to be_dirty
@@ -249,7 +296,7 @@ describe CookedPostProcessor do
       it "adds a topic image if there's one in the first post" do
         FastImage.stubs(:size)
         expect(post.topic.image_url).to eq(nil)
-        cpp.post_process_images
+        cpp.update_post_image
         post.topic.reload
         expect(post.topic.image_url).to be_present
       end
@@ -262,7 +309,7 @@ describe CookedPostProcessor do
       it "adds a post image if there's one in the post" do
         FastImage.stubs(:size)
         expect(reply.image_url).to eq(nil)
-        cpp.post_process_images
+        cpp.update_post_image
         reply.reload
         expect(reply.image_url).to be_present
       end
@@ -287,32 +334,32 @@ describe CookedPostProcessor do
     let(:cpp) { CookedPostProcessor.new(post) }
 
     it "returns the size when width and height are specified" do
-      img = { 'src' => 'http://foo.bar/image3.png', 'width' => 50, 'height' => 70}
+      img = { 'src' => 'http://foo.bar/image3.png', 'width' => 50, 'height' => 70 }
       expect(cpp.get_size_from_attributes(img)).to eq([50, 70])
     end
 
     it "returns the size when width and height are floats" do
-      img = { 'src' => 'http://foo.bar/image3.png', 'width' => 50.2, 'height' => 70.1}
+      img = { 'src' => 'http://foo.bar/image3.png', 'width' => 50.2, 'height' => 70.1 }
       expect(cpp.get_size_from_attributes(img)).to eq([50, 70])
     end
 
     it "resizes when only width is specified" do
-      img = { 'src' => 'http://foo.bar/image3.png', 'width' => 100}
-      SiteSetting.stubs(:crawl_images?).returns(true)
+      img = { 'src' => 'http://foo.bar/image3.png', 'width' => 100 }
+      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)
+      img = { 'src' => 'http://foo.bar/image3.png', 'height' => 100 }
+      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)
+      img = { 'src' => nil, 'height' => 100 }
+      SiteSetting.crawl_images = true
       expect(cpp.get_size_from_attributes(img)).to be_nil
     end
 
@@ -346,7 +393,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 +401,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
@@ -412,12 +461,12 @@ describe CookedPostProcessor do
     end
 
     it "returns the original filename of the upload when there is an upload" do
-      upload = build(:upload, { original_filename: "upload.jpg" })
+      upload = build(:upload, original_filename: "upload.jpg")
       expect(cpp.get_filename(upload, "http://domain.com/image.png")).to eq("upload.jpg")
     end
 
     it "returns a generic name for pasted images" do
-      upload = build(:upload, { original_filename: "blob.png" })
+      upload = build(:upload, original_filename: "blob.png")
       expect(cpp.get_filename(upload, "http://domain.com/image.png")).to eq(I18n.t('upload.pasted_image_filename'))
     end
 
@@ -430,18 +479,49 @@ describe CookedPostProcessor do
 
     before do
       Oneboxer.expects(:onebox)
-              .with("http://www.youtube.com/watch?v=9bZkp7q19f0", post_id: 123, invalidate_oneboxes: true)
-              .returns("<div>GANGNAM STYLE</div>")
+        .with("http://www.youtube.com/watch?v=9bZkp7q19f0", post_id: 123, invalidate_oneboxes: true)
+        .returns("<div>GANGNAM STYLE</div>")
       cpp.post_process_oneboxes
     end
-
-    it "is dirty" do
-      expect(cpp).to be_dirty
-    end
-
     it "inserts the onebox without wrapping p" do
+      expect(cpp).to be_dirty
       expect(cpp.html).to match_html "<div>GANGNAM STYLE</div>"
     end
+  end
+
+  context ".post_process_oneboxes with square image" do
+
+    it "generates a onebox-avatar class" do
+      SiteSetting.crawl_images = true
+
+      url = 'https://square-image.com/onebox'
+
+      body = <<~HTML
+      <html>
+      <head>
+      <meta property='og:title' content="Page awesome">
+      <meta property='og:image' content="https://image.com/avatar.png">
+      <meta property='og:description' content="Page awesome desc">
+      </head>
+      </html>
+      HTML
+
+      stub_request(:head, url).to_return(status: 200)
+      stub_request(:get , url).to_return(status: 200, body: body)
+      FinalDestination.stubs(:lookup_ip).returns('1.2.3.4')
+
+      # not an ideal stub but shipping the whole image to fast image can add
+      # a lot of cost to this test
+      FastImage.stubs(:size).returns([200, 200])
+
+      post = Fabricate.build(:post, raw: url)
+      cpp = CookedPostProcessor.new(post, invalidate_oneboxes: true)
+
+      cpp.post_process_oneboxes
+
+      expect(cpp.doc.to_s).not_to include('aspect-image')
+      expect(cpp.doc.to_s).to include('onebox-avatar')
+    end
 
   end
 
@@ -457,7 +537,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 +551,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 +563,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 +576,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 +589,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 +605,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 +730,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/crawler_detection_spec.rb b/spec/components/crawler_detection_spec.rb
index e3956b1070..6443d84a52 100644
--- a/spec/components/crawler_detection_spec.rb
+++ b/spec/components/crawler_detection_spec.rb
@@ -3,6 +3,14 @@ require_dependency 'crawler_detection'
 
 describe CrawlerDetection do
   describe "crawler?" do
+
+    it "can be amended via site settings" do
+      SiteSetting.crawler_user_agents = 'Mooble|Kaboodle+*'
+      expect(CrawlerDetection.crawler?("Mozilla/5.0 (compatible; Kaboodle+*/2.1; +http://www.google.com/bot.html)")).to eq(true)
+      expect(CrawlerDetection.crawler?("Mozilla/5.0 (compatible; Mooble+*/2.1; +http://www.google.com/bot.html)")).to eq(true)
+      expect(CrawlerDetection.crawler?("Mozilla/5.0 (compatible; Gooble+*/2.1; +http://www.google.com/bot.html)")).to eq(false)
+    end
+
     it "returns true for crawler user agents" do
       # https://support.google.com/webmasters/answer/1061943?hl=en
       expect(described_class.crawler?("Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)")).to eq(true)
diff --git a/spec/components/demon/base_spec.rb b/spec/components/demon/base_spec.rb
deleted file mode 100644
index 1f1615fc63..0000000000
--- 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_diff_spec.rb b/spec/components/discourse_diff_spec.rb
index 53150a5dfb..b089124e57 100644
--- a/spec/components/discourse_diff_spec.rb
+++ b/spec/components/discourse_diff_spec.rb
@@ -11,7 +11,7 @@ describe DiscourseDiff do
       prev = "<div>#{CGI::escapeHTML(a)}</div>"
       cur = "<div>#{CGI::escapeHTML(b)}</div>"
 
-      diff = DiscourseDiff.new(prev,cur)
+      diff = DiscourseDiff.new(prev, cur)
       expect(diff.inline_html).not_to match(/<\/?test>/)
       expect(diff.side_by_side_html).not_to match(/<\/?test>/)
     end
diff --git a/spec/components/discourse_event_spec.rb b/spec/components/discourse_event_spec.rb
index a5ff80116c..9a618565c2 100644
--- a/spec/components/discourse_event_spec.rb
+++ b/spec/components/discourse_event_spec.rb
@@ -61,7 +61,7 @@ describe DiscourseEvent do
 
       before do
         DiscourseEvent.on(:acid_face) do |user|
-          user.job =  'Supervillian'
+          user.job = 'Supervillian'
         end
 
         DiscourseEvent.trigger(:acid_face, harvey)
diff --git a/spec/components/discourse_hub_spec.rb b/spec/components/discourse_hub_spec.rb
index 29699ebeec..c97e7940e6 100644
--- a/spec/components/discourse_hub_spec.rb
+++ b/spec/components/discourse_hub_spec.rb
@@ -4,8 +4,12 @@ require_dependency 'discourse_hub'
 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 )
+      hub_response = { 'success' => 'OK', 'latest_version' => '0.8.1', 'critical_updates' => false }
+
+      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 f41b9caafa..0074b2e464 100644
--- a/spec/components/discourse_i18n_spec.rb
+++ b/spec/components/discourse_i18n_spec.rb
@@ -8,10 +8,10 @@ describe I18n::Backend::DiscourseI18n do
 
   before do
     I18n.reload!
-    backend.store_translations(:en, :foo => 'Foo in :en', :bar => 'Bar in :en', :wat => "Hello %{count}")
-    backend.store_translations(:en, :items => {:one => 'one item', :other => "%{count} items" })
-    backend.store_translations(:de, :bar => 'Bar in :de')
-    backend.store_translations(:'de-AT', :baz => 'Baz in :de-AT')
+    backend.store_translations(:en, foo: 'Foo in :en', bar: 'Bar in :en', wat: "Hello %{count}")
+    backend.store_translations(:en, items: { one: 'one item', other: "%{count} items" })
+    backend.store_translations(:de, bar: 'Bar in :de')
+    backend.store_translations(:'de-AT', baz: 'Baz in :de-AT')
   end
 
   after do
@@ -27,11 +27,11 @@ describe I18n::Backend::DiscourseI18n do
   end
 
   it 'can be searched by key or value' do
-    expect(backend.search(:en, 'fo')).to eq({'foo' => 'Foo in :en'})
-    expect(backend.search(:en, 'foo')).to eq({'foo' => 'Foo in :en' })
-    expect(backend.search(:en, 'Foo')).to eq({'foo' => 'Foo in :en' })
-    expect(backend.search(:en, 'hello')).to eq({'wat' => 'Hello %{count}' })
-    expect(backend.search(:en, 'items.one')).to eq({'items.one' => 'one item' })
+    expect(backend.search(:en, 'fo')).to eq('foo' => 'Foo in :en')
+    expect(backend.search(:en, 'foo')).to eq('foo' => 'Foo in :en')
+    expect(backend.search(:en, 'Foo')).to eq('foo' => 'Foo in :en')
+    expect(backend.search(:en, 'hello')).to eq('wat' => 'Hello %{count}')
+    expect(backend.search(:en, 'items.one')).to eq('items.one' => 'one item')
   end
 
   it 'can return multiple results' do
@@ -42,8 +42,8 @@ describe I18n::Backend::DiscourseI18n do
   end
 
   it 'uses fallback locales for searching' do
-    expect(backend.search(:de, 'bar')).to eq({'bar' => 'Bar in :de'})
-    expect(backend.search(:de, 'foo')).to eq({'foo' => 'Foo in :en'})
+    expect(backend.search(:de, 'bar')).to eq('bar' => 'Bar in :de')
+    expect(backend.search(:de, 'foo')).to eq('foo' => 'Foo in :en')
   end
 
   describe '#exists?' do
@@ -98,8 +98,8 @@ describe I18n::Backend::DiscourseI18n do
 
     it "can be searched" do
       TranslationOverride.upsert!('en', 'wat', 'Overwritten value')
-      expect(I18n.search('wat', backend: backend)).to eq({'wat' => 'Overwritten value'})
-      expect(I18n.search('Overwritten', backend: backend)).to eq({'wat' => 'Overwritten value'})
+      expect(I18n.search('wat', backend: backend)).to eq('wat' => 'Overwritten value')
+      expect(I18n.search('Overwritten', backend: backend)).to eq('wat' => 'Overwritten value')
       expect(I18n.search('Hello', backend: backend)).to eq({})
     end
 
@@ -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_plugin_registry_spec.rb b/spec/components/discourse_plugin_registry_spec.rb
index b280939012..b6b00018e6 100644
--- a/spec/components/discourse_plugin_registry_spec.rb
+++ b/spec/components/discourse_plugin_registry_spec.rb
@@ -51,6 +51,13 @@ describe DiscoursePluginRegistry do
       DiscoursePluginRegistry.reset!
       expect(DiscoursePluginRegistry.build_html(:my_html)).to be_blank
     end
+
+    it "can register multiple builders" do
+      DiscoursePluginRegistry.register_html_builder(:my_html) { "one" }
+      DiscoursePluginRegistry.register_html_builder(:my_html) { "two" }
+      expect(DiscoursePluginRegistry.build_html(:my_html)).to eq("one\ntwo")
+      DiscoursePluginRegistry.reset!
+    end
   end
 
   context '.register_css' do
@@ -85,6 +92,25 @@ describe DiscoursePluginRegistry do
     end
   end
 
+  context '.register_service_worker' do
+    let(:registry) { DiscoursePluginRegistry }
+
+    before do
+      registry.register_service_worker('hello.js')
+    end
+
+    after do
+      registry.reset!
+    end
+
+    it "should register the file once" do
+      2.times { registry.register_service_worker('hello.js') }
+
+      expect(registry.service_workers.size).to eq(1)
+      expect(registry.service_workers).to include('hello.js')
+    end
+  end
+
   context '.register_archetype' do
     it "delegates archetypes to the Archetype component" do
       Archetype.expects(:register).with('threaded', hello: 123)
diff --git a/spec/components/discourse_redis_spec.rb b/spec/components/discourse_redis_spec.rb
index c0d644cc5a..c1b94859f9 100644
--- a/spec/components/discourse_redis_spec.rb
+++ b/spec/components/discourse_redis_spec.rb
@@ -5,13 +5,81 @@ describe DiscourseRedis do
   let(:slave_port) { 1234 }
 
   let(:config) do
-    DiscourseRedis.config.dup.merge({
-      slave_host: 'testhost', slave_port: 1234, connector: DiscourseRedis::Connector
-    })
+    DiscourseRedis.config.dup.merge(slave_host: 'testhost', slave_port: 1234, connector: DiscourseRedis::Connector)
   end
 
   let(:fallback_handler) { DiscourseRedis::FallbackHandler.instance }
 
+  it "ignore_readonly returns nil from a pure exception" do
+    result = DiscourseRedis.ignore_readonly { raise Redis::CommandError.new("READONLY") }
+    expect(result).to eq(nil)
+  end
+
+  describe 'redis commands' do
+    let(:raw_redis) { Redis.new(DiscourseRedis.config) }
+
+    before do
+      raw_redis.flushall
+    end
+
+    after do
+      raw_redis.flushall
+    end
+
+    describe 'when namespace is enabled' do
+      let(:redis) { DiscourseRedis.new }
+
+      it 'should append namespace to the keys' do
+        raw_redis.set('default:key', 1)
+        raw_redis.set('test:key2', 1)
+
+        expect(redis.keys).to include('key')
+        expect(redis.keys).to_not include('key2')
+
+        redis.del('key')
+
+        expect(raw_redis.get('default:key')).to eq(nil)
+
+        raw_redis.set('default:key1', '1')
+        raw_redis.set('default:key2', '2')
+
+        expect(redis.mget('key1', 'key2')).to eq(['1', '2'])
+      end
+    end
+
+    describe 'when namespace is disabled' do
+      let(:redis) { DiscourseRedis.new(nil, namespace: false) }
+
+      it 'should not append any namespace to the keys' do
+        raw_redis.set('default:key', 1)
+        raw_redis.set('test:key2', 1)
+
+        expect(redis.keys).to include('default:key', 'test:key2')
+
+        redis.del('key')
+
+        expect(raw_redis.get('key')).to eq(nil)
+
+        raw_redis.set('key1', '1')
+        raw_redis.set('key2', '2')
+
+        expect(redis.mget('key1', 'key2')).to eq(['1', '2'])
+      end
+
+      it 'should noop a readonly redis' do
+        expect(Discourse.recently_readonly?).to eq(false)
+
+        redis.without_namespace
+          .expects(:set)
+          .raises(Redis::CommandError.new("READONLY"))
+
+        redis.set('key', 1)
+
+        expect(Discourse.recently_readonly?).to eq(true)
+      end
+    end
+  end
+
   context '.slave_host' do
     it 'should return the right config' do
       slave_config = DiscourseRedis.slave_config(config)
@@ -24,9 +92,9 @@ describe DiscourseRedis do
     it 'should check the status of the master server' do
       begin
         fallback_handler.master = false
-        $redis.without_namespace.expects(:get).raises(Redis::CommandError.new("READONLY"))
+        $redis.without_namespace.expects(:set).raises(Redis::CommandError.new("READONLY"))
         fallback_handler.expects(:verify_master).once
-        $redis.get('test')
+        $redis.set('test', '1')
       ensure
         fallback_handler.master = true
       end
@@ -40,10 +108,23 @@ describe DiscourseRedis do
       expect(connector.resolve).to eq(config)
     end
 
+    class BrokenRedis
+      def initialize(error)
+        @error = error
+      end
+
+      def call(*args)
+        raise @error
+      end
+
+      def disconnect
+      end
+    end
+
     it 'should return the slave config when master is down' do
       begin
-        Redis::Client.any_instance.expects(:call).raises(Redis::CannotConnectError).once
-        expect { connector.resolve }.to raise_error(Redis::CannotConnectError)
+        error = Redis::CannotConnectError
+        expect { connector.resolve(BrokenRedis.new(error)) }.to raise_error(Redis::CannotConnectError)
 
         config = connector.resolve
 
@@ -58,16 +139,14 @@ describe DiscourseRedis do
       begin
         error = RuntimeError.new('Name or service not known')
 
-        Redis::Client.any_instance.expects(:call).raises(error).once
-        expect { connector.resolve }.to raise_error(error)
-        fallback_handler.instance_variable_get(:@timer_task).shutdown
-        expect(fallback_handler.running?).to eq(false)
+        expect { connector.resolve(BrokenRedis.new(error)) }.to raise_error(error)
+        expect(fallback_handler.master).to eq(false)
 
         config = connector.resolve
 
         expect(config[:host]).to eq(slave_host)
         expect(config[:port]).to eq(slave_port)
-        expect(fallback_handler.running?).to eq(true)
+        expect(fallback_handler.master).to eq(false)
       ensure
         fallback_handler.master = true
       end
@@ -95,26 +174,33 @@ describe DiscourseRedis do
   describe DiscourseRedis::FallbackHandler do
     after do
       fallback_handler.master = true
+      MessageBus.keepalive_interval = -1
     end
 
     describe '#initiate_fallback_to_master' do
       it 'should return the right value if the master server is still down' do
         fallback_handler.master = false
         Redis::Client.any_instance.expects(:call).with([:info]).returns("Some other stuff")
+
         expect(fallback_handler.initiate_fallback_to_master).to eq(false)
+        expect(MessageBus.keepalive_interval).to eq(0)
       end
 
       it 'should fallback to the master server once it is up' do
         fallback_handler.master = false
-        Redis::Client.any_instance.expects(:call).with([:info]).returns(DiscourseRedis::FallbackHandler::MASTER_LINK_STATUS)
+        redis_connection = DiscourseRedis.raw_connection.client
+        Redis::Client.expects(:new).with(DiscourseRedis.slave_config).returns(redis_connection)
+
+        redis_connection.expects(:call).with([:info]).returns(DiscourseRedis::FallbackHandler::MASTER_LINK_STATUS)
 
         DiscourseRedis::FallbackHandler::CONNECTION_TYPES.each do |connection_type|
-          Redis::Client.any_instance.expects(:call).with([:client, [:kill, 'type', connection_type]])
+          redis_connection.expects(:call).with([:client, [:kill, 'type', connection_type]])
         end
 
         expect(fallback_handler.initiate_fallback_to_master).to eq(true)
         expect(fallback_handler.master).to eq(true)
         expect(Discourse.recently_readonly?).to eq(false)
+        expect(MessageBus.keepalive_interval).to eq(-1)
       end
     end
   end
diff --git a/spec/components/discourse_spec.rb b/spec/components/discourse_spec.rb
index b1b21cfd5c..b9ef0df7d9 100644
--- a/spec/components/discourse_spec.rb
+++ b/spec/components/discourse_spec.rb
@@ -15,6 +15,18 @@ describe Discourse do
 
   end
 
+  context 'running_in_rack' do
+    after do
+      ENV.delete("DISCOURSE_RUNNING_IN_RACK")
+    end
+
+    it 'should not be running in rack' do
+      expect(Discourse.running_in_rack?).to eq(false)
+      ENV["DISCOURSE_RUNNING_IN_RACK"] = "1"
+      expect(Discourse.running_in_rack?).to eq(true)
+    end
+  end
+
   context 'base_url' do
     context 'when https is off' do
       before do
@@ -53,12 +65,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
 
@@ -108,17 +115,25 @@ describe Discourse do
       expect($redis.get(key)).to eq(nil)
     end
 
+    def get_readonly_message
+      messages = MessageBus.track_publish do
+        yield
+      end
+
+      messages.find { |m| m.channel == Discourse.readonly_channel }
+    end
+
     describe ".enable_readonly_mode" do
       it "adds a key in redis and publish a message through the message bus" do
         expect($redis.get(readonly_mode_key)).to eq(nil)
-        message = MessageBus.track_publish { Discourse.enable_readonly_mode }.first
+        message = get_readonly_message { Discourse.enable_readonly_mode }
         assert_readonly_mode(message, readonly_mode_key, readonly_mode_ttl)
       end
 
       context 'user enabled readonly mode' do
         it "adds a key in redis and publish a message through the message bus" do
           expect($redis.get(user_readonly_mode_key)).to eq(nil)
-          message = MessageBus.track_publish { Discourse.enable_readonly_mode(user_readonly_mode_key) }.first
+          message = get_readonly_message { Discourse.enable_readonly_mode(user_readonly_mode_key) }
           assert_readonly_mode(message, user_readonly_mode_key)
         end
       end
@@ -128,9 +143,9 @@ describe Discourse do
       it "removes a key from redis and publish a message through the message bus" do
         Discourse.enable_readonly_mode
 
-        message = MessageBus.track_publish do
+        message = get_readonly_message do
           Discourse.disable_readonly_mode
-        end.first
+        end
 
         assert_readonly_mode_disabled(message, readonly_mode_key)
       end
@@ -138,7 +153,7 @@ describe Discourse do
       context 'user disabled readonly mode' do
         it "removes readonly key in redis and publish a message through the message bus" do
           Discourse.enable_readonly_mode(user_enabled: true)
-          message = MessageBus.track_publish { Discourse.disable_readonly_mode(user_enabled: true) }.first
+          message = get_readonly_message { Discourse.disable_readonly_mode(user_enabled: true) }
           assert_readonly_mode_disabled(message, user_readonly_mode_key)
         end
       end
@@ -204,11 +219,10 @@ describe Discourse do
     it "correctly passes extra context" do
       exception = StandardError.new
 
-      Discourse.handle_job_exception(exception, {message: "Doing a test", post_id: 31}, nil)
+      Discourse.handle_job_exception(exception, { message: "Doing a test", post_id: 31 }, nil)
       expect(logger.exception).to eq(exception)
       expect(logger.context.keys.sort).to eq([:current_db, :current_hostname, :message, :post_id].sort)
     end
   end
 
 end
-
diff --git a/spec/components/discourse_updates_spec.rb b/spec/components/discourse_updates_spec.rb
index 7f3f1234af..aa4a335c20 100644
--- a/spec/components/discourse_updates_spec.rb
+++ b/spec/components/discourse_updates_spec.rb
@@ -14,7 +14,7 @@ describe DiscourseUpdates do
     Jobs::VersionCheck.any_instance.stubs(:execute).returns(true)
   end
 
-  subject { DiscourseUpdates.check_version.instance_values }
+  subject { DiscourseUpdates.check_version }
 
   context 'version check was done at the current installed version' do
     before do
@@ -26,14 +26,15 @@ describe DiscourseUpdates do
         before { stub_data(Discourse::VERSION::STRING, 0, false, 12.hours.ago) }
 
         it 'returns all the version fields' do
-          expect(subject['latest_version']).to eq(Discourse::VERSION::STRING)
-          expect(subject['missing_versions_count']).to eq(0)
-          expect(subject['critical_updates']).to eq(false)
-          expect(subject['installed_version']).to eq(Discourse::VERSION::STRING)
+          expect(subject.latest_version).to eq(Discourse::VERSION::STRING)
+          expect(subject.missing_versions_count).to eq(0)
+          expect(subject.critical_updates).to eq(false)
+          expect(subject.installed_version).to eq(Discourse::VERSION::STRING)
+          expect(subject.stale_data).to eq(false)
         end
 
         it 'returns the timestamp of the last version check' do
-          expect(subject['updated_at']).to be_within_one_second_of(12.hours.ago)
+          expect(subject.updated_at).to be_within_one_second_of(12.hours.ago)
         end
       end
 
@@ -41,14 +42,14 @@ describe DiscourseUpdates do
         before { stub_data('0.9.0', 2, false, 12.hours.ago) }
 
         it 'returns all the version fields' do
-          expect(subject['latest_version']).to eq('0.9.0')
-          expect(subject['missing_versions_count']).to eq(2)
-          expect(subject['critical_updates']).to eq(false)
-          expect(subject['installed_version']).to eq(Discourse::VERSION::STRING)
+          expect(subject.latest_version).to eq('0.9.0')
+          expect(subject.missing_versions_count).to eq(2)
+          expect(subject.critical_updates).to eq(false)
+          expect(subject.installed_version).to eq(Discourse::VERSION::STRING)
         end
 
         it 'returns the timestamp of the last version check' do
-          expect(subject['updated_at']).to be_within_one_second_of(12.hours.ago)
+          expect(subject.updated_at).to be_within_one_second_of(12.hours.ago)
         end
       end
     end
@@ -57,18 +58,18 @@ describe DiscourseUpdates do
       before { stub_data(nil, nil, false, nil) }
 
       it 'returns the installed version' do
-        expect(subject['installed_version']).to eq(Discourse::VERSION::STRING)
+        expect(subject.installed_version).to eq(Discourse::VERSION::STRING)
       end
 
       it 'indicates that version check has not been performed' do
-        expect(subject).to have_key('updated_at')
-        expect(subject['updated_at']).to eq(nil)
+        expect(subject.updated_at).to eq(nil)
+        expect(subject.stale_data).to eq(true)
       end
 
       it 'does not return latest version info' do
-        expect(subject).not_to have_key('latest_version')
-        expect(subject).not_to have_key('missing_versions_count')
-        expect(subject).not_to have_key('critical_updates')
+        expect(subject.latest_version).to eq(nil)
+        expect(subject.missing_versions_count).to eq(nil)
+        expect(subject.critical_updates).to eq(nil)
       end
 
       it 'queues a version check' do
@@ -87,11 +88,11 @@ describe DiscourseUpdates do
         end
 
         it 'reports 0 missing versions' do
-          expect(subject['missing_versions_count']).to eq(0)
+          expect(subject.missing_versions_count).to eq(0)
         end
 
         it 'reports that a version check will be run soon' do
-          expect(subject['version_check_pending']).to eq(true)
+          expect(subject.version_check_pending).to eq(true)
         end
       end
 
@@ -119,11 +120,11 @@ describe DiscourseUpdates do
       end
 
       it 'reports 0 missing versions' do
-        expect(subject['missing_versions_count']).to eq(0)
+        expect(subject.missing_versions_count).to eq(0)
       end
 
       it 'reports that a version check will be run soon' do
-        expect(subject['version_check_pending']).to eq(true)
+        expect(subject.version_check_pending).to eq(true)
       end
     end
 
diff --git a/spec/components/distributed_cache_spec.rb b/spec/components/distributed_cache_spec.rb
index f1deda95d2..e1256346ac 100644
--- a/spec/components/distributed_cache_spec.rb
+++ b/spec/components/distributed_cache_spec.rb
@@ -3,17 +3,31 @@ require 'distributed_cache'
 
 describe DistributedCache do
 
+  before :all do
+    @bus = MessageBus::Instance.new
+    @bus.configure(backend: :memory)
+    @manager = DistributedCache::Manager.new(@bus)
+  end
+
+  after :all do
+    @bus.destroy
+  end
+
+  def cache(name)
+    DistributedCache.new(name, manager: @manager)
+  end
+
   let! :cache1 do
-    DistributedCache.new("test")
+    cache("test")
   end
 
   let! :cache2 do
-    DistributedCache.new("test")
+    cache("test")
   end
 
   it 'allows us to store Set' do
-    c1 = DistributedCache.new("test1")
-    c2 = DistributedCache.new("test1")
+    c1 = cache("test1")
+    c2 = cache("test1")
 
     set = Set.new
     set << 1
@@ -31,7 +45,7 @@ describe DistributedCache do
 
     set << 5
 
-    c2["cats"] == set
+    c2["cats"] = set
 
     wait_for do
       c1["cats"] == set
@@ -41,8 +55,8 @@ describe DistributedCache do
   end
 
   it 'does not leak state across caches' do
-    c2 = DistributedCache.new("test1")
-    c3 = DistributedCache.new("test1")
+    c2 = cache("test1")
+    c3 = cache("test1")
     c2["hi"] = "hi"
     wait_for do
       c3["hi"] == "hi"
diff --git a/spec/components/distributed_mutex_spec.rb b/spec/components/distributed_mutex_spec.rb
index e8b3082797..69080c5051 100644
--- a/spec/components/distributed_mutex_spec.rb
+++ b/spec/components/distributed_mutex_spec.rb
@@ -26,7 +26,6 @@ describe DistributedMutex do
 
     $redis.setnx "test_mutex_key", Time.now.to_i - 1
 
-
     start = Time.now.to_i
     m.synchronize do
       "nop"
@@ -41,7 +40,7 @@ describe DistributedMutex do
 
     expect {
       m.synchronize do
-        m.synchronize{}
+        m.synchronize {}
       end
     }.to raise_error(ThreadError)
   end
diff --git a/spec/components/email/message_builder_spec.rb b/spec/components/email/message_builder_spec.rb
index 5cf6d4877a..9283f87262 100644
--- a/spec/components/email/message_builder_spec.rb
+++ b/spec/components/email/message_builder_spec.rb
@@ -5,7 +5,7 @@ describe Email::MessageBuilder do
 
   let(:to_address) { "jake@adventuretime.ooo" }
   let(:subject) { "Tree Trunks has made some apple pie!" }
-  let(:body) { "oh my glob Jake, Tree Trunks just made the tastiest apple pie ever!"}
+  let(:body) { "oh my glob Jake, Tree Trunks just made the tastiest apple pie ever!" }
   let(:builder) { Email::MessageBuilder.new(to_address, subject: subject, body: body) }
   let(:build_args) { builder.build_args }
   let(:header_args) { builder.header_args }
@@ -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 c30b09ad4e..d7c5113f9b 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,83 @@ 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.last.error).to             eq("boom")
+      expect(IncomingEmail.last.rejection_message).to be_present
+      expect(EmailLog.last.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
+
+  context "mailinglist mirror" do
+    before do
+      SiteSetting.email_in = true
+      Fabricate(:mailinglist_mirror_category)
+    end
+
+    it "does not send rejection email" do
+      Email::Receiver.any_instance.stubs(:process_internal).raises("boom")
+
+      email = <<~EMAIL
+        From: foo@example.com
+        To: list@example.com
+        Subject: Hello world
+      EMAIL
+
+      expect { Email::Processor.process!(email) }.to_not change { EmailLog.count }
+    end
+  end
 end
diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb
index 3242e55a41..d9da0a0435 100644
--- a/spec/components/email/receiver_spec.rb
+++ b/spec/components/email/receiver_spec.rb
@@ -23,6 +23,16 @@ describe Email::Receiver do
     expect { process(:screened_email) }.to raise_error(Email::Receiver::ScreenedEmailError)
   end
 
+  it "raises EmailNotAllowed when email address is not on whitelist" do
+    SiteSetting.email_domains_whitelist = "example.com|bar.com"
+    expect { process(:blacklist_whitelist_email) }.to raise_error(Email::Receiver::EmailNotAllowed)
+  end
+
+  it "raises EmailNotAllowed when email address is on blacklist" do
+    SiteSetting.email_domains_blacklist = "email.com|mail.com"
+    expect { process(:blacklist_whitelist_email) }.to raise_error(Email::Receiver::EmailNotAllowed)
+  end
+
   it "raises an UserNotFoundError when staged users are disabled" do
     SiteSetting.enable_staged_users = false
     expect { process(:user_not_found) }.to raise_error(Email::Receiver::UserNotFoundError)
@@ -37,18 +47,30 @@ describe Email::Receiver do
     expect { process(:no_body) }.to raise_error(Email::Receiver::NoBodyDetectedError)
   end
 
+  it "raises a NoSenderDetectedError when the From header is missing" do
+    expect { process(:no_from) }.to raise_error(Email::Receiver::NoSenderDetectedError)
+  end
+
   it "raises an InactiveUserError when the sender is inactive" do
     Fabricate(:user, email: "inactive@bar.com", active: false)
     expect { process(:inactive_sender) }.to raise_error(Email::Receiver::InactiveUserError)
   end
 
-  it "raises a BlockedUserError when the sender has been blocked" do
-    Fabricate(:user, email: "blocked@bar.com", blocked: true)
-    expect { process(:blocked_sender) }.to raise_error(Email::Receiver::BlockedUserError)
+  it "raises a SilencedUserError when the sender has been silenced" do
+    Fabricate(:user, email: "silenced@bar.com", silenced_till: 1.year.from_now)
+    expect { process(:silenced_sender) }.to raise_error(Email::Receiver::SilencedUserError)
   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
 
@@ -59,6 +81,15 @@ describe Email::Receiver do
   it "raises a BouncerEmailError when email is a bounced email" do
     expect { process(:bounced_email) }.to raise_error(Email::Receiver::BouncedEmailError)
     expect(IncomingEmail.last.is_bounce).to eq(true)
+
+    expect { process(:bounced_email_multiple_status_codes) }.to raise_error(Email::Receiver::BouncedEmailError)
+    expect(IncomingEmail.last.is_bounce).to eq(true)
+  end
+
+  it "logs a blank error" do
+    Email::Receiver.any_instance.stubs(:process_internal).raises(RuntimeError, "")
+    process(:existing_user) rescue RuntimeError
+    expect(IncomingEmail.last.error).to eq("RuntimeError")
   end
 
   context "bounces to VERP" do
@@ -89,13 +120,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
@@ -215,10 +246,14 @@ describe Email::Receiver do
     end
 
     it "handles invalid from header" do
-      expect { process(:invalid_from) }.to change { topic.posts.count }
+      expect { process(:invalid_from_1) }.to change { topic.posts.count }
       expect(topic.posts.last.raw).to eq("This email was sent with an invalid from header field.")
     end
 
+    it "raises a NoSenderDetectedError when the From header doesn't contain an email address" do
+      expect { process(:invalid_from_2) }.to raise_error(Email::Receiver::NoSenderDetectedError)
+    end
+
     it "doesn't raise an AutoGeneratedEmailError when the mail is auto generated but is whitelisted" do
       SiteSetting.auto_generated_whitelist = "foo@bar.com|discourse@bar.com"
       expect { process(:auto_generated_whitelisted) }.to change { topic.posts.count }
@@ -254,7 +289,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,17 +307,23 @@ 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
         end
       end
+
+      it "raises an UnsubscribeNotAllowed and does not send an unsubscribe email" do
+        before_deliveries = ActionMailer::Base.deliveries.count
+        expect { process(:unsubscribe_new_user) }.to raise_error { Email::Receiver::UnsubscribeNotAllowed }
+        expect(before_deliveries).to eq ActionMailer::Base.deliveries.count
+      end
     end
 
     it "handles inline reply" do
       expect { process(:inline_reply) }.to change { topic.posts.count }
-      expect(topic.posts.last.raw).to eq("> WAT <https://bar.com/users/wat> November 28\n>\n> This is the previous post.\n\nAnd this is *my* reply :+1:")
+      expect(topic.posts.last.raw).to eq("And this is *my* reply :+1:")
     end
 
     it "retrieves the first part of multiple replies" do
@@ -306,7 +347,19 @@ describe Email::Receiver do
       topic.save
 
       expect { process(:original_message) }.to change { topic.posts.count }
-      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>")
+      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\n---Original Message---\nThis part should not be included\n\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\n---Original Message---\nThis part should not be included\n\n</details>")
     end
 
     it "supports attached images in TEXT part" do
@@ -331,6 +384,10 @@ describe Email::Receiver do
       SiteSetting.authorized_extensions = "txt"
       expect { process(:attached_txt_file) }.to change { topic.posts.count }
       expect(topic.posts.last.raw).to match(/text\.txt/)
+
+      SiteSetting.authorized_extensions = "csv"
+      expect { process(:attached_txt_file_2) }.to change { topic.posts.count }
+      expect(topic.posts.last.raw).to_not match(/text\.txt/)
     end
 
     it "supports liking via email" do
@@ -342,6 +399,31 @@ describe Email::Receiver do
       expect(topic.posts.last.created_at).to be_within(1.minute).of(DateTime.now)
     end
 
+    it "accepts emails with wrong reply key if the system knows about the forwareded email" do
+      Fabricate(:incoming_email,
+                raw: <<~RAW,
+                  Return-Path: <discourse@bar.com>
+                  From: Alice <discourse@bar.com>
+                  To: dave@bar.com, reply+4f97315cc828096c9cb34c6f1a0d6fe8@bar.com
+                  CC: carol@bar.com, bob@bar.com
+                  Subject: Hello world
+                  Date: Fri, 15 Jan 2016 00:12:43 +0100
+                  Message-ID: <10@foo.bar.mail>
+                  Mime-Version: 1.0
+                  Content-Type: text/plain; charset=UTF-8
+                  Content-Transfer-Encoding: quoted-printable
+
+                  This post was created by email.
+                RAW
+                from_address: "discourse@bar.com",
+                to_addresses: "dave@bar.com;reply+4f97315cc828096c9cb34c6f1a0d6fe8@bar.com",
+                cc_addresses: "carol@bar.com;bob@bar.com",
+                topic: topic,
+                post: post,
+                user: user)
+
+      expect { process(:reply_user_not_matching_but_known) }.to change { topic.posts.count }
+    end
   end
 
   context "new message to a group" do
@@ -369,9 +451,13 @@ 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)
-      expect(emails.size).to eq(3)
-      expect(emails).to include("someone@else.com", "discourse@bar.com", "wat@bar.com")
+
+      topic = Topic.last
+
+      emails = topic.allowed_users.joins(:user_emails).pluck(:"user_emails.email")
+      expect(emails).to contain_exactly("someone@else.com", "discourse@bar.com", "wat@bar.com")
+
+      expect(topic.topic_users.count).to eq(3)
     end
 
     it "cap the number of staged users created per email" do
@@ -380,7 +466,9 @@ describe Email::Receiver do
       expect(Topic.last.ordered_posts[-1].post_type).to eq(Post.types[:moderator_action])
     end
 
-    it "associates email replies using both 'In-Reply-To' and 'References' headers" do
+    it "associates email replies using both 'In-Reply-To' and 'References' headers when 'find_related_post_with_key' is disabled" do
+      SiteSetting.find_related_post_with_key = false
+
       expect { process(:email_reply_1) }.to change(Topic, :count)
 
       topic = Topic.last
@@ -483,6 +571,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
 
@@ -498,11 +596,10 @@ describe Email::Receiver do
       expect { process(:tl4_user) }.to change(Topic, :count)
     end
 
-    it "ignores by title" do
+    it "ignores by case-insensitive title" do
       SiteSetting.ignore_by_title = "foo"
       expect { process(:ignored) }.to_not change(Topic, :count)
     end
-
   end
 
   context "new topic in a category that allows strangers" do
@@ -555,4 +652,169 @@ 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
+
+  context "no staged users on error" do
+    before do
+      SiteSetting.enable_staged_users = true
+    end
+
+    shared_examples "no staged users" do |email_name, expected_exception|
+      it "does not create staged users" do
+        staged_user_count = User.where(staged: true).count
+        expect { process(email_name) }.to raise_error(expected_exception)
+        expect(User.where(staged: true).count).to eq(staged_user_count)
+      end
+    end
+
+    context "when email address is screened" do
+      before do
+        ScreenedEmail.expects(:should_block?).with("screened@mail.com").returns(true)
+      end
+
+      include_examples "no staged users", :screened_email, Email::Receiver::ScreenedEmailError
+    end
+
+    context "when the mail is auto generated" do
+      include_examples "no staged users", :auto_generated_header, Email::Receiver::AutoGeneratedEmailError
+    end
+
+    context "when email is a bounced email" do
+      include_examples "no staged users", :bounced_email, Email::Receiver::BouncedEmailError
+    end
+
+    context "when the body is blank" do
+      include_examples "no staged users", :no_body, Email::Receiver::NoBodyDetectedError
+    end
+
+    context "when unsubscribe via email is not allowed" do
+      include_examples "no staged users", :unsubscribe_new_user, Email::Receiver::UnsubscribeNotAllowed
+    end
+
+    context "when email address is not on whitelist" do
+      before do
+        SiteSetting.email_domains_whitelist = "example.com|bar.com"
+      end
+
+      include_examples "no staged users", :blacklist_whitelist_email, Email::Receiver::EmailNotAllowed
+    end
+
+    context "when email address is on blacklist" do
+      before do
+        SiteSetting.email_domains_blacklist = "email.com|mail.com"
+      end
+
+      include_examples "no staged users", :blacklist_whitelist_email, Email::Receiver::EmailNotAllowed
+    end
+
+    context "when destinations aren't matching any of the incoming emails" do
+      include_examples "no staged users", :bad_destinations, Email::Receiver::BadDestinationAddress
+    end
+
+    context "when email is sent to category" do
+      context "when email is sent by a new user and category does not allow strangers" do
+        let!(:category) { Fabricate(:category, email_in: "category@foo.com", email_in_allow_strangers: false) }
+
+        include_examples "no staged users", :new_user, Email::Receiver::StrangersNotAllowedError
+      end
+
+      context "when email has no date" do
+        let!(:category) { Fabricate(:category, email_in: "category@foo.com", email_in_allow_strangers: true) }
+
+        include_examples "no staged users", :no_date, Email::Receiver::InvalidPost
+      end
+    end
+
+    context "email is a reply" do
+      let(:reply_key) { "4f97315cc828096c9cb34c6f1a0d6fe8" }
+      let(:category) { Fabricate(:category) }
+      let(:user) { Fabricate(:user, email: "discourse@bar.com") }
+      let(:topic) { create_topic(category: category, user: user) }
+      let(:post) { create_post(topic: topic, user: user) }
+      let!(:email_log) { Fabricate(:email_log, reply_key: reply_key, user: user, topic: topic, post: post) }
+
+      context "when the email address isn't matching the one we sent the notification to" do
+        include_examples "no staged users", :reply_user_not_matching, Email::Receiver::ReplyUserNotMatchingError
+      end
+    end
+
+    context "replying without key is allowed" do
+      let!(:group) { Fabricate(:group, incoming_email: "team@bar.com") }
+      let!(:topic) do
+        SiteSetting.find_related_post_with_key = false
+        process(:email_reply_1)
+        Topic.last
+      end
+
+      context "when the topic was deleted" do
+        before do
+          topic.update_columns(deleted_at: 1.day.ago)
+        end
+
+        include_examples "no staged users", :email_reply_staged, Email::Receiver::TopicNotFoundError
+      end
+
+      context "when the topic was closed" do
+        before do
+          topic.update_columns(closed: true)
+        end
+
+        include_examples "no staged users", :email_reply_staged, Email::Receiver::TopicClosedError
+      end
+
+      context "when they aren't allowed to like a post" do
+        before do
+          topic.update_columns(archived: true)
+        end
+
+        include_examples "no staged users", :email_reply_like, Email::Receiver::InvalidPostAction
+      end
+    end
+
+    it "does not remove the incoming email record when staged users are deleted" do
+      expect { process(:bad_destinations) }.to change { IncomingEmail.count }
+        .and raise_error(Email::Receiver::BadDestinationAddress)
+      expect(IncomingEmail.last.message_id).to eq("9@foo.bar.mail")
+    end
+  end
+
+  context "mailinglist mirror" do
+    before do
+      SiteSetting.block_auto_generated_emails = true
+      SiteSetting.find_related_post_with_key = true
+
+      Fabricate(:mailinglist_mirror_category)
+    end
+
+    it "should allow creating topic even when email is autogenerated" do
+      expect { process(:mailinglist) }.to change { Topic.count }
+    end
+
+    it "should allow replying without reply key" do
+      process(:mailinglist)
+      topic = Topic.last
+
+      expect { process(:mailinglist_reply) }.to change { topic.posts.count }
+    end
+  end
 end
diff --git a/spec/components/email/renderer_spec.rb b/spec/components/email/renderer_spec.rb
index c546b8fd11..840c4f4bc9 100644
--- a/spec/components/email/renderer_spec.rb
+++ b/spec/components/email/renderer_spec.rb
@@ -24,6 +24,3 @@ describe Email::Renderer do
   end
 
 end
-
-
-
diff --git a/spec/components/email/sender_spec.rb b/spec/components/email/sender_spec.rb
index bde8d4cf41..72124c6854 100644
--- a/spec/components/email/sender_spec.rb
+++ b/spec/components/email/sender_spec.rb
@@ -126,7 +126,7 @@ describe Email::Sender do
       let(:topic) { Fabricate(:topic) }
       let(:post) { Fabricate(:post, topic: topic) }
 
-      before do 
+      before do
         message.header['X-Discourse-Post-Id']  = post.id
         message.header['X-Discourse-Topic-Id'] = topic.id
       end
@@ -310,7 +310,6 @@ describe Email::Sender do
       end
     end
 
-
     context 'email parts' do
       it 'should contain the right message' do
         email_sender.send
diff --git a/spec/components/email/styles_spec.rb b/spec/components/email/styles_spec.rb
index 38ccdde962..d99440dc3e 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/email_cook_spec.rb b/spec/components/email_cook_spec.rb
index 48e38169e9..4d3177efa2 100644
--- a/spec/components/email_cook_spec.rb
+++ b/spec/components/email_cook_spec.rb
@@ -1,43 +1,190 @@
 require 'rails_helper'
 require 'email_cook'
+require 'pretty_text'
 
 describe EmailCook do
+  it "uses to PrettyText when there is no [plaintext] in raw" do
+    raw = "**Hello world!**"
+    expect(cook(raw)).to eq(PrettyText.cook(raw))
+  end
 
-  it 'adds linebreaks to short lines' do
-    expect(EmailCook.new("hello\nworld\n").cook).to eq("hello\n<br>world\n<br>")
+  it "adds linebreaks to short lines" do
+    raw = plaintext("hello\nworld\n")
+    expect(cook(raw)).to eq("hello\n<br>world\n<br>")
   end
 
   it "doesn't add linebreaks to long lines" do
-    long = <<LONG_EMAIL
-Hello,
+    long = plaintext(<<~LONG_EMAIL)
+      Hello,
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc convallis volutpat
-risus. Nulla ac faucibus quam, quis cursus lorem. Sed rutrum eget nunc sed accumsan.
-Vestibulum feugiat mi vitae turpis tempor dignissim.
-LONG_EMAIL
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc convallis volutpat
+      risus. Nulla ac faucibus quam, quis cursus lorem. Sed rutrum eget nunc sed accumsan.
+      Vestibulum feugiat mi vitae turpis tempor dignissim.
+    LONG_EMAIL
 
-    long_cooked = <<LONG_COOKED
-Hello,
-<br>
-<br>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc convallis volutpat
-risus. Nulla ac faucibus quam, quis cursus lorem. Sed rutrum eget nunc sed accumsan.
-Vestibulum feugiat mi vitae turpis tempor dignissim.
-<br><br>
-LONG_COOKED
-    expect(EmailCook.new(long).cook).to eq(long_cooked.strip)
+    long_cooked = <<~LONG_COOKED.strip!
+      Hello,
+      <br>
+      <br>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc convallis volutpat
+      risus. Nulla ac faucibus quam, quis cursus lorem. Sed rutrum eget nunc sed accumsan.
+      Vestibulum feugiat mi vitae turpis tempor dignissim.
+      <br>
+    LONG_COOKED
+
+    expect(cook(long)).to eq(long_cooked)
   end
 
-  it 'autolinks' do
-    stub_request(:get, "https://www.eviltrout.com").to_return(body: "")
-    stub_request(:head, "https://www.eviltrout.com").to_return(body: "")
-    expect(EmailCook.new("https://www.eviltrout.com").cook).to eq("<a href='https://www.eviltrout.com'>https://www.eviltrout.com</a><br>")
+  it "replaces a blank line with 2 linebreaks" do
+    long = plaintext(<<~LONG_EMAIL)
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc convallis volutpat
+      risus.
+      Nulla ac faucibus quam, quis cursus lorem. Sed rutrum eget nunc sed accumsan.
+
+      Vestibulum feugiat mi vitae turpis tempor dignissim.
+
+      Stet clita kasd gubergren.
+    LONG_EMAIL
+
+    long_cooked = <<~LONG_COOKED.strip!
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc convallis volutpat
+      risus.
+      <br>Nulla ac faucibus quam, quis cursus lorem. Sed rutrum eget nunc sed accumsan.
+      <br>
+      <br>Vestibulum feugiat mi vitae turpis tempor dignissim.
+      <br>
+      <br>Stet clita kasd gubergren.
+      <br>
+    LONG_COOKED
+
+    expect(cook(long)).to eq(long_cooked)
   end
 
-  it 'autolinks without the beginning of a line' do
-    expect(EmailCook.new("my site: https://www.eviltrout.com").cook).to eq("my site: <a href='https://www.eviltrout.com'>https://www.eviltrout.com</a><br>")
+  it "escapes HTML" do
+    long = plaintext(<<~LONG_EMAIL)
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+
+      <form name="f1" method="post" action="test.html" onsubmit="javascript:showAlert()">
+      <input type="submit" name="submit" value="Click this button" />
+      </form>
+
+      Nunc convallis volutpat risus.
+    LONG_EMAIL
+
+    long_cooked = <<~LONG_COOKED.strip!
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+      <br>
+      <br>&lt;form name=&quot;f1&quot; method=&quot;post&quot; action=&quot;test.html&quot; onsubmit=&quot;javascript:showAlert()&quot;&gt;
+      &lt;input type=&quot;submit&quot; name=&quot;submit&quot; value=&quot;Click this button&quot; /&gt;
+      &lt;/form&gt;
+      <br>
+      <br>Nunc convallis volutpat risus.
+      <br>
+    LONG_COOKED
+
+    expect(cook(long)).to eq(long_cooked)
   end
 
-  it 'links even within a quote' do
-    expect(EmailCook.new("> https://www.eviltrout.com").cook).to eq("<blockquote><a href='https://www.eviltrout.com'>https://www.eviltrout.com</a><br></blockquote>")
+  it "replaces indentation of more than 2 spaces with corresponding amount of non-breaking spaces" do
+    nbsp = "\u00A0"
+    long = plaintext(<<~LONG_EMAIL)
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+
+          this is indended by 4 spaces
+       this is indended by 1 space
+      no indentation, but lots       of spaces
+    LONG_EMAIL
+
+    long_cooked = <<~LONG_COOKED.strip!
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+      <br>
+      <br>#{nbsp}#{nbsp}#{nbsp}#{nbsp}this is indended by 4 spaces
+      <br> this is indended by 1 space
+      <br>no indentation, but lots       of spaces
+      <br>
+    LONG_COOKED
+
+    expect(cook(long)).to eq(long_cooked)
+  end
+
+  it "creates oneboxed link when the line contains only a link" do
+    raw = plaintext("https://www.eviltrout.com")
+    expect(cook(raw)).to eq('<a href="https://www.eviltrout.com" class="onebox" target="_blank">https://www.eviltrout.com</a><br>')
+  end
+
+  it "autolinks without the beginning of a line" do
+    raw = plaintext("my site: https://www.eviltrout.com")
+    expect(cook(raw)).to eq('my site: <a href="https://www.eviltrout.com">https://www.eviltrout.com</a><br>')
+  end
+
+  it "autolinks without the end of a line" do
+    raw = plaintext("https://www.eviltrout.com is my site")
+    expect(cook(raw)).to eq('<a href="https://www.eviltrout.com">https://www.eviltrout.com</a> is my site<br>')
+  end
+
+  it "links even within a quote" do
+    raw = plaintext("> https://www.eviltrout.com is my site")
+    expect(cook(raw)).to eq('<blockquote><a href="https://www.eviltrout.com">https://www.eviltrout.com</a> is my site<br></blockquote>')
+  end
+
+  it "it works and does not interpret Markdown in plaintext and elided" do
+    long = <<~LONG_EMAIL
+      [plaintext]
+      *Lorem ipsum* dolor sit amet, consectetur adipiscing elit.
+      [/plaintext]
+      [attachments]
+      <img src='some_image.png' width='100' height='100'>
+      [/attachments]
+      [elided]
+      At vero eos *et accusam* et justo duo dolores et ea rebum.
+      [/elided]
+    LONG_EMAIL
+
+    long_cooked = <<~LONG_COOKED
+      *Lorem ipsum* dolor sit amet, consectetur adipiscing elit.<br>
+      <br><img src='some_image.png' width='100' height='100'>
+      <br><br>
+
+      <details class='elided'>
+      <summary title='Show trimmed content'>&#183;&#183;&#183;</summary>
+
+      At vero eos *et accusam* et justo duo dolores et ea rebum.<br>
+
+      </details>
+    LONG_COOKED
+
+    expect(cook(long)).to eq(long_cooked)
+  end
+
+  it "works without attachments" do
+    long = <<~LONG_EMAIL
+      [plaintext]
+      *Lorem ipsum* dolor sit amet, consectetur adipiscing elit.
+      [/plaintext]
+      [elided]
+      At vero eos *et accusam* et justo duo dolores et ea rebum.
+      [/elided]
+    LONG_EMAIL
+
+    long_cooked = <<~LONG_COOKED
+      *Lorem ipsum* dolor sit amet, consectetur adipiscing elit.<br>
+      <br><br>
+
+      <details class='elided'>
+      <summary title='Show trimmed content'>&#183;&#183;&#183;</summary>
+
+      At vero eos *et accusam* et justo duo dolores et ea rebum.<br>
+
+      </details>
+    LONG_COOKED
+
+    expect(cook(long)).to eq(long_cooked)
+  end
+
+  def cook(raw)
+    EmailCook.new(raw).cook
+  end
+
+  def plaintext(text)
+    "[plaintext]\n#{text}\n[/plaintext]"
   end
 end
diff --git a/spec/components/email_updater_spec.rb b/spec/components/email_updater_spec.rb
index 8db0699a13..cd2270f467 100644
--- a/spec/components/email_updater_spec.rb
+++ b/spec/components/email_updater_spec.rb
@@ -131,5 +131,25 @@ describe EmailUpdater do
       end
     end
   end
-end
 
+  context 'hide_email_address_taken is enabled' do
+    before do
+      SiteSetting.hide_email_address_taken = true
+    end
+
+    let(:user) { Fabricate(:user, email: old_email) }
+    let(:existing) { Fabricate(:user, email: new_email) }
+    let(:updater) { EmailUpdater.new(user.guardian, user) }
+
+    it "doesn't error if user exists with new email" do
+      updater.change_to(existing.email)
+      expect(updater.errors).to be_blank
+      expect(user.email_change_requests).to be_empty
+    end
+
+    it 'sends an email to the owner of the account with the new email' do
+      Jobs.expects(:enqueue).once.with(:critical_user_email, has_entries(type: :account_exists, user_id: existing.id))
+      updater.change_to(existing.email)
+    end
+  end
+end
diff --git a/spec/components/enum_spec.rb b/spec/components/enum_spec.rb
index d7977e1ee9..a722e4fcf4 100644
--- a/spec/components/enum_spec.rb
+++ b/spec/components/enum_spec.rb
@@ -31,15 +31,15 @@ describe Enum do
 
   describe ".only" do
     it "returns only the values we ask for" do
-      expect(array_enum.only(:jake, :princess_bubblegum)).to eq({ jake: 1, princess_bubblegum: 3 })
-      expect(hash_enum.only(:jake, :princess_bubblegum)).to eq({ jake: 1, princess_bubblegum: 3 })
+      expect(array_enum.only(:jake, :princess_bubblegum)).to eq(jake: 1, princess_bubblegum: 3)
+      expect(hash_enum.only(:jake, :princess_bubblegum)).to eq(jake: 1, princess_bubblegum: 3)
     end
   end
 
   describe ".except" do
     it "returns everything but the values we ask to delete" do
-      expect(array_enum.except(:jake, :princess_bubblegum)).to eq({ finn: 2, peppermint_butler: 4 })
-      expect(hash_enum.except(:jake, :princess_bubblegum)).to eq({ finn: 2, peppermint_butler: 4 })
+      expect(array_enum.except(:jake, :princess_bubblegum)).to eq(finn: 2, peppermint_butler: 4)
+      expect(hash_enum.except(:jake, :princess_bubblegum)).to eq(finn: 2, peppermint_butler: 4)
     end
   end
 
diff --git a/spec/components/feed_element_installer_spec.rb b/spec/components/feed_element_installer_spec.rb
new file mode 100644
index 0000000000..48d6eb063b
--- /dev/null
+++ b/spec/components/feed_element_installer_spec.rb
@@ -0,0 +1,40 @@
+require 'feed_element_installer'
+require 'rails_helper'
+
+describe FeedElementInstaller do
+  describe '#install_rss_element' do
+    let(:raw_feed) { file_from_fixtures('feed.rss', 'feed').read }
+
+    it 'creates parsing for a non-standard, namespaced element' do
+      FeedElementInstaller.install('discourse:username', raw_feed)
+      feed = RSS::Parser.parse(raw_feed)
+
+      expect(feed.items.first.discourse_username).to eq('xrav3nz')
+    end
+
+    it 'does not create parsing for a non-standard, non-namespaced element' do
+      FeedElementInstaller.install('username', raw_feed)
+      feed = RSS::Parser.parse(raw_feed)
+
+      expect { feed.items.first.username }.to raise_error(NoMethodError)
+    end
+  end
+
+  describe '#install_atom_element' do
+    let(:raw_feed) { file_from_fixtures('feed.atom', 'feed').read }
+
+    it 'creates parsing for a non-standard, namespaced element' do
+      FeedElementInstaller.install('discourse:username', raw_feed)
+      feed = RSS::Parser.parse(raw_feed)
+
+      expect(feed.items.first.discourse_username).to eq('xrav3nz')
+    end
+
+    it 'does not create parsing for a non-standard, non-namespaced element' do
+      FeedElementInstaller.install('username', raw_feed)
+      feed = RSS::Parser.parse(raw_feed)
+
+      expect { feed.items.first.username }.to raise_error(NoMethodError)
+    end
+  end
+end
diff --git a/spec/components/feed_item_accessor_spec.rb b/spec/components/feed_item_accessor_spec.rb
new file mode 100644
index 0000000000..9fdd45cbb2
--- /dev/null
+++ b/spec/components/feed_item_accessor_spec.rb
@@ -0,0 +1,33 @@
+require 'rss'
+require 'feed_item_accessor'
+require 'rails_helper'
+
+describe FeedItemAccessor do
+  context 'for ATOM feed' do
+    let(:atom_feed) { RSS::Parser.parse(file_from_fixtures('feed.atom', 'feed'), false) }
+    let(:atom_feed_item) { atom_feed.items.first }
+    let(:item_accessor) { FeedItemAccessor.new(atom_feed_item) }
+
+    describe '#element_content' do
+      it { expect(item_accessor.element_content('title')).to eq(atom_feed_item.title.content) }
+    end
+
+    describe '#link' do
+      it { expect(item_accessor.link).to eq(atom_feed_item.link.href) }
+    end
+  end
+
+  context 'for RSS feed' do
+    let(:rss_feed) { RSS::Parser.parse(file_from_fixtures('feed.rss', 'feed'), false) }
+    let(:rss_feed_item) { rss_feed.items.first }
+    let(:item_accessor) { FeedItemAccessor.new(rss_feed_item) }
+
+    describe '#element_content' do
+      it { expect(item_accessor.element_content('title')).to eq(rss_feed_item.title) }
+    end
+
+    describe '#link' do
+      it { expect(item_accessor.link).to eq(rss_feed_item.link) }
+    end
+  end
+end
diff --git a/spec/components/file_helper_spec.rb b/spec/components/file_helper_spec.rb
index 4f085de7b2..d5d0ccd86b 100644
--- a/spec/components/file_helper_spec.rb
+++ b/spec/components/file_helper_spec.rb
@@ -12,6 +12,48 @@ describe FileHelper do
   end
 
   describe "download" do
+
+    it "correctly raises an OpenURI HTTP error if it gets a 404 even with redirect" do
+      url = "http://fourohfour.com/404"
+      stub_request(:head, url).to_return(status: 404, body: "404")
+      stub_request(:get, url).to_return(status: 404, body: "404")
+
+      expect do
+        begin
+          FileHelper.download(
+            url,
+            max_file_size: 10000,
+            tmp_file_name: 'trouttmp',
+            follow_redirect: true
+          )
+        rescue => e
+          expect(e.io.status[0]).to eq("404")
+          raise
+        end
+      end.to raise_error(OpenURI::HTTPError)
+    end
+
+    it "correctly raises an OpenURI HTTP error if it gets a 404" do
+      url = "http://fourohfour.com/404"
+
+      stub_request(:head, url).to_return(status: 404, body: "404")
+      stub_request(:get, url).to_return(status: 404, body: "404")
+
+      expect do
+        begin
+          FileHelper.download(
+            url,
+            max_file_size: 10000,
+            tmp_file_name: 'trouttmp',
+            follow_redirect: false
+          )
+        rescue => e
+          expect(e.io.status[0]).to eq("404")
+          raise
+        end
+      end.to raise_error(OpenURI::HTTPError)
+    end
+
     it "returns a file with the image" do
       tmpfile = FileHelper.download(
         url,
diff --git a/spec/components/file_store/base_store_spec.rb b/spec/components/file_store/base_store_spec.rb
new file mode 100644
index 0000000000..89f0a105da
--- /dev/null
+++ b/spec/components/file_store/base_store_spec.rb
@@ -0,0 +1,21 @@
+require 'rails_helper'
+
+RSpec.describe FileStore::BaseStore do
+  let(:upload) { Fabricate(:upload, id: 9999, sha1: Digest::SHA1.hexdigest('9999')) }
+
+  describe '#get_path_for_upload' do
+    it 'should return the right path' do
+      expect(FileStore::BaseStore.new.get_path_for_upload(upload))
+        .to eq('original/2X/4/4170ac2a2782a1516fe9e13d7322ae482c1bd594.png')
+    end
+
+    describe 'when Upload#extension has not been set' do
+      it 'should return the right path' do
+        upload.update!(extension: nil)
+
+        expect(FileStore::BaseStore.new.get_path_for_upload(upload))
+          .to eq('original/2X/4/4170ac2a2782a1516fe9e13d7322ae482c1bd594.png')
+      end
+    end
+  end
+end
diff --git a/spec/components/file_store/local_store_spec.rb b/spec/components/file_store/local_store_spec.rb
index 2ccebf0986..b9696ed091 100644
--- a/spec/components/file_store/local_store_spec.rb
+++ b/spec/components/file_store/local_store_spec.rb
@@ -36,10 +36,9 @@ describe FileStore::LocalStore do
     end
 
     it "moves the file to the tombstone" do
-      FileUtils.expects(:mkdir_p)
-      FileUtils.expects(:move)
-      File.expects(:exists?).returns(true)
+      filename = File.basename(store.path_for(upload))
       store.remove_upload(upload)
+      expect(File.exist?(store.tombstone_dir + "/" + filename))
     end
 
   end
diff --git a/spec/components/file_store/s3_store_spec.rb b/spec/components/file_store/s3_store_spec.rb
index 921e852edf..00df4f36f9 100644
--- a/spec/components/file_store/s3_store_spec.rb
+++ b/spec/components/file_store/s3_store_spec.rb
@@ -16,6 +16,7 @@ describe FileStore::S3Store do
     SiteSetting.s3_upload_bucket = "s3-upload-bucket"
     SiteSetting.s3_access_key_id = "s3-access-key-id"
     SiteSetting.s3_secret_access_key = "s3-secret-access-key"
+    SiteSetting.enable_s3_uploads = true
   end
 
   shared_context 's3 helpers' do
@@ -30,7 +31,7 @@ describe FileStore::S3Store do
     let(:s3_helper) { store.instance_variable_get(:@s3_helper) }
 
     before do
-      SiteSetting.s3_region ='us-west-1'
+      SiteSetting.s3_region = 'us-west-1'
     end
   end
 
@@ -209,13 +210,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/filter_best_posts_spec.rb b/spec/components/filter_best_posts_spec.rb
index 565e7fe6cf..f1b06dfd56 100644
--- a/spec/components/filter_best_posts_spec.rb
+++ b/spec/components/filter_best_posts_spec.rb
@@ -10,9 +10,9 @@ describe FilterBestPosts do
 
   let(:topic_view) { TopicView.new(topic.id, coding_horror) }
 
-  let!(:p1) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 1 )}
-  let!(:p2) { Fabricate(:post, topic: topic, user: coding_horror, percent_rank: 0.5 )}
-  let!(:p3) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 0 )}
+  let!(:p1) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 1) }
+  let!(:p2) { Fabricate(:post, topic: topic, user: coding_horror, percent_rank: 0.5) }
+  let!(:p3) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 0) }
 
   let(:moderator) { Fabricate(:moderator) }
   let(:admin) { Fabricate(:admin) }
@@ -46,14 +46,12 @@ describe FilterBestPosts do
       expect(best.posts.count).to eq(0)
     end
 
-
     it "should filter out the posts with a score that is too low" do
 
       best = FilterBestPosts.new(topic, @filtered_posts, 99, min_score: 99)
       expect(best.posts.count).to eq(0)
     end
 
-
     it "should filter out everything if min replies not met" do
       best = FilterBestPosts.new(topic, @filtered_posts, 99, min_replies: 99)
       expect(best.posts.count).to eq(0)
diff --git a/spec/components/final_destination_spec.rb b/spec/components/final_destination_spec.rb
index 9266aea451..93b6f061d2 100644
--- a/spec/components/final_destination_spec.rb
+++ b/spec/components/final_destination_spec.rb
@@ -4,7 +4,12 @@ require 'final_destination'
 describe FinalDestination do
 
   let(:opts) do
-    { # avoid IP lookups in test
+    {
+      ignore_redirects: ['https://ignore-me.com'],
+
+      force_get_hosts: ['https://force.get.com'],
+
+      # avoid IP lookups in test
       lookup_ip: lambda do |host|
         case host
         when 'eviltrout.com' then '52.84.143.152'
@@ -13,6 +18,9 @@ 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'
+        when 'force.get.com' then '22.102.29.40'
+        when 'wikipedia.com' then '1.2.3.4'
         else
           as_ip = IPAddr.new(host) rescue nil
           raise "couldn't lookup #{host}" if as_ip.nil?
@@ -46,11 +54,17 @@ describe FinalDestination do
       expect(fd('https://eviltrout.com').status).to eq(:ready)
     end
 
-    it "returns nil an invalid url" do
+    it "returns nil for an invalid url" do
       expect(fd(nil).resolve).to be_nil
       expect(fd('asdf').resolve).to be_nil
     end
 
+    it "returns nil when read timeouts" do
+      Excon.expects(:public_send).raises(Excon::Errors::Timeout)
+
+      expect(fd('https://discourse.org').resolve).to eq(nil)
+    end
+
     context "without redirects" do
       before do
         stub_request(:head, "https://eviltrout.com").to_return(doc_response)
@@ -64,6 +78,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)
@@ -121,6 +142,31 @@ describe FinalDestination do
       end
     end
 
+    context "GET can be forced" do
+      before do
+        stub_request(:head, 'https://force.get.com/posts?page=4')
+        stub_request(:get, 'https://force.get.com/posts?page=4')
+        stub_request(:head, 'https://eviltrout.com/posts?page=2')
+        stub_request(:get, 'https://eviltrout.com/posts?page=2')
+      end
+
+      it "will do a GET when forced" do
+        final = FinalDestination.new('https://force.get.com/posts?page=4', opts)
+        expect(final.resolve.to_s).to eq('https://force.get.com/posts?page=4')
+        expect(final.status).to eq(:resolved)
+        expect(WebMock).to have_requested(:get, 'https://force.get.com/posts?page=4')
+        expect(WebMock).to_not have_requested(:head, 'https://force.get.com/posts?page=4')
+      end
+
+      it "will do a HEAD if not forced" do
+        final = FinalDestination.new('https://eviltrout.com/posts?page=2', opts)
+        expect(final.resolve.to_s).to eq('https://eviltrout.com/posts?page=2')
+        expect(final.status).to eq(:resolved)
+        expect(WebMock).to_not have_requested(:get, 'https://eviltrout.com/posts?page=2')
+        expect(WebMock).to have_requested(:head, 'https://eviltrout.com/posts?page=2')
+      end
+    end
+
     context "HEAD not supported" do
       before do
         stub_request(:get, 'https://eviltrout.com').to_return(
@@ -237,7 +283,7 @@ 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
 
@@ -247,6 +293,7 @@ describe FinalDestination do
     end
 
     it "returns true for the S3 CDN url" do
+      SiteSetting.enable_s3_uploads = true
       SiteSetting.s3_cdn_url = "https://s3.example.com"
       expect(fd("https://s3.example.com/some/thing").is_dest_valid?).to eq(true)
     end
@@ -255,6 +302,49 @@ describe FinalDestination 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
+
+  describe "https cache" do
+    it 'will cache https lookups' do
+
+      FinalDestination.clear_https_cache!("wikipedia.com")
+
+      stub_request(:head, "http://wikipedia.com/image.png")
+        .to_return(status: 302, body: "", headers: { location: 'https://wikipedia.com/image.png' })
+      stub_request(:head, "https://wikipedia.com/image.png")
+        .to_return(status: 200, body: "", headers: [])
+
+      fd('http://wikipedia.com/image.png').resolve
+
+      stub_request(:head, "https://wikipedia.com/image2.png")
+        .to_return(status: 200, body: "", headers: [])
+
+      fd('http://wikipedia.com/image2.png').resolve
+    end
+  end
+
+  describe "#escape_url" do
+    it "correctly escapes url" do
+      fragment_url = "https://eviltrout.com/2016/02/25/fixing-android-performance.html#discourse-comments"
+
+      expect(fd(fragment_url).escape_url.to_s).to eq(fragment_url)
+
+      expect(fd("https://eviltrout.com?s=180&#038;d=mm&#038;r=g").escape_url.to_s)
+        .to eq("https://eviltrout.com?s=180&d=mm&r=g")
+
+      expect(fd("http://example.com/?a=\11\15").escape_url.to_s).to eq("http://example.com/?a=%09%0D")
+
+      expect(fd("https://ru.wikipedia.org/wiki/%D0%A1%D0%B2%D0%BE%D0%B1%D0%BE").escape_url.to_s)
+        .to eq('https://ru.wikipedia.org/wiki/%D0%A1%D0%B2%D0%BE%D0%B1%D0%BE')
+
+      expect(fd('https://ru.wikipedia.org/wiki/Свобо').escape_url.to_s)
+        .to eq('https://ru.wikipedia.org/wiki/%D0%A1%D0%B2%D0%BE%D0%B1%D0%BE')
+    end
   end
 
 end
diff --git a/spec/components/flag_query_spec.rb b/spec/components/flag_query_spec.rb
index cb2a3b5615..7e39c61fef 100644
--- a/spec/components/flag_query_spec.rb
+++ b/spec/components/flag_query_spec.rb
@@ -10,7 +10,7 @@ describe FlagQuery do
       admin = Fabricate(:admin)
       post = create_post(user: Discourse.system_user)
       PostAction.act(codinghorror, post, PostActionType.types[:spam])
-      posts, topics, users = FlagQuery.flagged_posts_report(admin, "")
+      posts, topics, users = FlagQuery.flagged_posts_report(admin)
 
       expect(posts).to be_blank
       expect(topics).to be_blank
@@ -29,12 +29,13 @@ describe FlagQuery do
 
       PostAction.act(codinghorror, post, PostActionType.types[:spam])
       PostAction.act(user2, post, PostActionType.types[:spam])
-      mod_message = PostAction.act(user3, post, PostActionType.types[:notify_moderators], message: "this is a 10")
+      mod_message = PostAction.act(user3, post, PostActionType.types[:notify_moderators], message: "this is a :one::zero:")
 
       PostAction.act(codinghorror, post2, PostActionType.types[:spam])
       PostAction.act(user2, post2, PostActionType.types[:spam])
 
-      posts, topics, users = FlagQuery.flagged_posts_report(admin, "")
+      posts, topics, users = FlagQuery.flagged_posts_report(admin)
+
       expect(posts.count).to eq(2)
       first = posts.first
 
@@ -47,20 +48,29 @@ describe FlagQuery do
 
       expect(second[:post_actions].count).to eq(3)
       expect(second[:post_actions].first[:permalink]).to eq(mod_message.related_post.topic.relative_url)
+      expect(second[:post_actions].first[:conversation][:response][:excerpt]).to match("<img src=")
 
-      posts, users = FlagQuery.flagged_posts_report(admin, "", 1)
+      posts, users = FlagQuery.flagged_posts_report(admin, offset: 1)
       expect(posts.count).to eq(1)
 
+      # Try by topic
+      posts = FlagQuery.flagged_posts_report(admin, topic_id: post.topic_id)
+      expect(posts).to be_present
+      posts = FlagQuery.flagged_posts_report(admin, topic_id: -1)
+      expect(posts[0]).to be_blank
+
       # chuck post in category a mod can not see and make sure its missing
       category = Fabricate(:category)
-      category.set_permissions(:admins => :full)
+      category.set_permissions(admins: :full)
       category.save
       post2.topic.category_id = category.id
       post2.topic.save
 
-      posts, users = FlagQuery.flagged_posts_report(moderator, "")
+      posts, users = FlagQuery.flagged_posts_report(moderator)
 
       expect(posts.count).to eq(1)
+
     end
+
   end
 end
diff --git a/spec/components/flag_settings_spec.rb b/spec/components/flag_settings_spec.rb
new file mode 100644
index 0000000000..e82d572814
--- /dev/null
+++ b/spec/components/flag_settings_spec.rb
@@ -0,0 +1,46 @@
+require 'rails_helper'
+require 'flag_settings'
+
+RSpec.describe FlagSettings do
+
+  let(:settings) { FlagSettings.new }
+
+  describe 'add' do
+    it 'will add a type' do
+      settings.add(3, :off_topic)
+      expect(settings.flag_types).to include(:off_topic)
+      expect(settings.is_flag?(:off_topic)).to eq(true)
+      expect(settings.is_flag?(:vote)).to eq(false)
+
+      expect(settings.topic_flag_types).to be_empty
+      expect(settings.notify_types).to be_empty
+      expect(settings.auto_action_types).to be_empty
+    end
+
+    it 'will add a topic type' do
+      settings.add(4, :inappropriate, topic_type: true)
+      expect(settings.flag_types).to include(:inappropriate)
+      expect(settings.topic_flag_types).to include(:inappropriate)
+      expect(settings.without_custom_types).to include(:inappropriate)
+    end
+
+    it 'will add a notify type' do
+      settings.add(3, :off_topic, notify_type: true)
+      expect(settings.flag_types).to include(:off_topic)
+      expect(settings.notify_types).to include(:off_topic)
+    end
+
+    it 'will add an auto action type' do
+      settings.add(7, :notify_moderators, auto_action_type: true)
+      expect(settings.flag_types).to include(:notify_moderators)
+      expect(settings.auto_action_types).to include(:notify_moderators)
+    end
+
+    it 'will add a custom type' do
+      settings.add(7, :notify_user, custom_type: true)
+      expect(settings.flag_types).to include(:notify_user)
+      expect(settings.custom_types).to include(:notify_user)
+      expect(settings.without_custom_types).to be_empty
+    end
+  end
+end
diff --git a/spec/components/freedom_patches/pool_drainer_spec.rb b/spec/components/freedom_patches/pool_drainer_spec.rb
index e46abe9a84..32fc98dc85 100644
--- a/spec/components/freedom_patches/pool_drainer_spec.rb
+++ b/spec/components/freedom_patches/pool_drainer_spec.rb
@@ -15,7 +15,7 @@ describe 'pool drainer' do
       pool.checkin conn
     end.join
 
-    expect(pool.connections.length).to eq(old+1)
+    expect(pool.connections.length).to eq(old + 1)
     pool.drain
     expect(pool.connections.length).to eq(old)
   end
@@ -25,15 +25,14 @@ describe 'pool drainer' do
     old = pool.connections.length
     expect(old).to eq(1)
 
-
     Thread.new do
       conn = pool.checkout
       pool.checkin conn
     end.join
 
-    expect(pool.connections.length).to eq(old+1)
+    expect(pool.connections.length).to eq(old + 1)
     pool.drain(1.minute)
-    expect(pool.connections.length).to eq(old+1)
+    expect(pool.connections.length).to eq(old + 1)
 
     # make sure we don't corrupt internal state
     20.times do
diff --git a/spec/components/freedom_patches/schema_migration_details_spec.rb b/spec/components/freedom_patches/schema_migration_details_spec.rb
index 951f5f7c4f..b4f378c069 100644
--- a/spec/components/freedom_patches/schema_migration_details_spec.rb
+++ b/spec/components/freedom_patches/schema_migration_details_spec.rb
@@ -7,14 +7,14 @@ describe FreedomPatches::SchemaMigrationDetails do
   class SchemaMigrationDetail < ActiveRecord::Base
   end
 
-  class TestMigration < ActiveRecord::Migration
+  class TestMigration < ActiveRecord::Migration[4.2]
     def up
       sleep 0.001
     end
   end
 
   it "logs information on migration" do
-    migration = TestMigration.new("awesome_migration","20160225050318")
+    migration = TestMigration.new("awesome_migration", "20160225050318")
 
     ActiveRecord::Base.connection_pool.with_connection do |conn|
       migration.exec_migration(conn, :up)
diff --git a/spec/components/freedom_patches/translate_accelerator_spec.rb b/spec/components/freedom_patches/translate_accelerator_spec.rb
index 6fef757ee0..883edd6f1c 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/gaps_spec.rb b/spec/components/gaps_spec.rb
index 3d0943f09a..6d5e357400 100644
--- a/spec/components/gaps_spec.rb
+++ b/spec/components/gaps_spec.rb
@@ -12,11 +12,11 @@ describe Gaps do
   end
 
   it 'returns no gaps when all elements are present' do
-    expect(Gaps.new([1,2,3], [1,2,3])).to be_blank
+    expect(Gaps.new([1, 2, 3], [1, 2, 3])).to be_blank
   end
 
   context "single element gap" do
-    let(:gap) { Gaps.new([1,3], [1,2,3]) }
+    let(:gap) { Gaps.new([1, 3], [1, 2, 3]) }
 
     it 'has a gap for post 3' do
       expect(gap).not_to be_blank
@@ -26,28 +26,28 @@ describe Gaps do
   end
 
   context "larger gap" do
-    let(:gap) { Gaps.new([1,2,3,6,7], [1,2,3,4,5,6,7]) }
+    let(:gap) { Gaps.new([1, 2, 3, 6, 7], [1, 2, 3, 4, 5, 6, 7]) }
 
     it 'has a gap for post 6' do
       expect(gap).not_to be_blank
-      expect(gap.before[6]).to eq([4,5])
+      expect(gap.before[6]).to eq([4, 5])
       expect(gap.after).to be_blank
     end
   end
 
   context "multiple gaps" do
-    let(:gap) { Gaps.new([1,5,6,7,10], [1,2,3,4,5,6,7,8,9,10]) }
+    let(:gap) { Gaps.new([1, 5, 6, 7, 10], [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]) }
 
     it 'has both gaps' do
       expect(gap).not_to be_blank
-      expect(gap.before[5]).to eq([2,3,4])
-      expect(gap.before[10]).to eq([8,9])
+      expect(gap.before[5]).to eq([2, 3, 4])
+      expect(gap.before[10]).to eq([8, 9])
       expect(gap.after).to be_blank
     end
   end
 
   context "a gap in the beginning" do
-    let(:gap) { Gaps.new([2,3,4], [1,2,3,4]) }
+    let(:gap) { Gaps.new([2, 3, 4], [1, 2, 3, 4]) }
 
     it 'has the gap' do
       expect(gap).not_to be_blank
@@ -57,7 +57,7 @@ describe Gaps do
   end
 
   context "a gap in the ending" do
-    let(:gap) { Gaps.new([1,2,3], [1,2,3,4]) }
+    let(:gap) { Gaps.new([1, 2, 3], [1, 2, 3, 4]) }
 
     it 'has the gap' do
       expect(gap).not_to be_blank
@@ -67,14 +67,13 @@ describe Gaps do
   end
 
   context "a large gap in the ending" do
-    let(:gap) { Gaps.new([1,2,3], [1,2,3,4,5,6]) }
+    let(:gap) { Gaps.new([1, 2, 3], [1, 2, 3, 4, 5, 6]) }
 
     it 'has the gap' do
       expect(gap).not_to be_blank
       expect(gap.before).to be_blank
-      expect(gap.after[3]).to eq([4,5,6])
+      expect(gap.after[3]).to eq([4, 5, 6])
     end
   end
 
-
 end
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index f8704c2fb3..df904c0aa4 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'
 
@@ -56,11 +57,15 @@ describe Guardian do
     end
 
     it "returns false when you've already done it" do
-      expect(Guardian.new(user).post_can_act?(post, :like, taken_actions: {PostActionType.types[:like] => 1})).to be_falsey
+      expect(Guardian.new(user).post_can_act?(post, :like, opts: {
+        taken_actions: { PostActionType.types[:like] => 1 }
+      })).to be_falsey
     end
 
     it "returns false when you already flagged a post" do
-      expect(Guardian.new(user).post_can_act?(post, :off_topic, taken_actions: {PostActionType.types[:spam] => 1})).to be_falsey
+      expect(Guardian.new(user).post_can_act?(post, :off_topic, opts: {
+        taken_actions: { PostActionType.types[:spam] => 1 }
+      })).to be_falsey
     end
 
     it "returns false for notify_user if private messages are disabled" do
@@ -70,12 +75,12 @@ describe Guardian do
       expect(Guardian.new(user).post_can_act?(post, :notify_moderators)).to be_falsey
     end
 
-    it "returns false for notify_user if private messages are enabled but threshold not met" do
+    it "returns false for notify_user and notify_moderators if private messages are enabled but threshold not met" do
       SiteSetting.enable_private_messages = true
       SiteSetting.min_trust_to_send_messages = 2
       user.trust_level = TrustLevel[1]
       expect(Guardian.new(user).post_can_act?(post, :notify_user)).to be_falsey
-      expect(Guardian.new(user).post_can_act?(post, :notify_moderators)).to be_truthy
+      expect(Guardian.new(user).post_can_act?(post, :notify_moderators)).to be_falsey
     end
 
     describe "trust levels" do
@@ -108,7 +113,6 @@ describe Guardian do
     end
   end
 
-
   describe "can_defer_flags" do
     let(:post) { Fabricate(:post) }
     let(:user) { post.user }
@@ -189,9 +193,9 @@ describe Guardian do
       end
     end
 
-    context "author is blocked" do
+    context "author is silenced" do
       before do
-        user.blocked = true
+        user.silenced_till = 1.year.from_now
         user.save
       end
 
@@ -207,11 +211,50 @@ describe Guardian do
       it "returns true if target is a staff group" do
         Group::STAFF_GROUPS.each do |name|
           g = Group[name]
-          g.alias_level = Group::ALIAS_LEVELS[:everyone]
+          g.update!(messageable_level: Group::ALIAS_LEVELS[:everyone])
           expect(Guardian.new(user).can_send_private_message?(g)).to be_truthy
         end
       end
     end
+
+    it "respects the group's messageable_level" do
+      group = Fabricate(:group)
+
+      Group::ALIAS_LEVELS.each do |level, _|
+        group.update!(messageable_level: Group::ALIAS_LEVELS[level])
+        output = level == :everyone ? true : false
+
+        expect(Guardian.new(user).can_send_private_message?(group)).to eq(output)
+      end
+
+      admin = Fabricate(:admin)
+
+      Group::ALIAS_LEVELS.each do |level, _|
+        group.update!(messageable_level: Group::ALIAS_LEVELS[level])
+        expect(Guardian.new(admin).can_send_private_message?(group)).to eq(true)
+      end
+    end
+
+    context 'target user has private message disabled' do
+      before do
+        another_user.user_option.update!(allow_private_messages: false)
+      end
+
+      context 'for a normal user' do
+        it 'should return false' do
+          expect(Guardian.new(user).can_send_private_message?(another_user)).to eq(false)
+        end
+      end
+
+      context 'for a staff user' do
+        it 'should return true' do
+          [admin, moderator].each do |staff_user|
+            expect(Guardian.new(staff_user).can_send_private_message?(another_user))
+              .to eq(true)
+          end
+        end
+      end
+    end
   end
 
   describe 'can_reply_as_new_topic' do
@@ -243,7 +286,7 @@ describe Guardian do
 
   describe 'can_see_post_actors?' do
 
-    let(:topic) { Fabricate(:topic, user: coding_horror)}
+    let(:topic) { Fabricate(:topic, user: coding_horror) }
 
     it 'displays visibility correctly' do
       guardian = Guardian.new(user)
@@ -303,7 +346,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 +365,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
@@ -395,7 +461,6 @@ describe Guardian do
     end
   end
 
-
   describe 'can_invite_via_email?' do
     it 'returns true for all (tl2 and above) users when sso is disabled, local logins are enabled, user approval is not required' do
       expect(Guardian.new(trust_level_2).can_invite_via_email?(topic)).to be_truthy
@@ -404,6 +469,7 @@ describe Guardian do
     end
 
     it 'returns false for all users when sso is enabled' do
+      SiteSetting.sso_url = "https://www.example.com/sso"
       SiteSetting.enable_sso = true
 
       expect(Guardian.new(trust_level_2).can_invite_via_email?(topic)).to be_falsey
@@ -434,31 +500,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 +602,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 +675,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 +691,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
@@ -692,34 +733,34 @@ describe Guardian do
     describe 'a Topic' do
       it 'does not allow moderators to create topics in readonly categories' do
         category = Fabricate(:category)
-        category.set_permissions(:everyone => :read)
+        category.set_permissions(everyone: :read)
         category.save
 
-        expect(Guardian.new(moderator).can_create?(Topic,category)).to be_falsey
+        expect(Guardian.new(moderator).can_create?(Topic, category)).to be_falsey
       end
 
       it 'should check for full permissions' do
         category = Fabricate(:category)
-        category.set_permissions(:everyone => :create_post)
+        category.set_permissions(everyone: :create_post)
         category.save
-        expect(Guardian.new(user).can_create?(Topic,category)).to be_falsey
+        expect(Guardian.new(user).can_create?(Topic, category)).to be_falsey
       end
 
       it "is true for new users by default" do
-        expect(Guardian.new(user).can_create?(Topic,Fabricate(:category))).to be_truthy
+        expect(Guardian.new(user).can_create?(Topic, Fabricate(:category))).to be_truthy
       end
 
       it "is false if user has not met minimum trust level" do
-        SiteSetting.stubs(:min_trust_to_create_topic).returns(1)
-        expect(Guardian.new(build(:user, trust_level: 0)).can_create?(Topic,Fabricate(:category))).to be_falsey
+        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)
-        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
-        expect(Guardian.new(build(:moderator, trust_level: 0)).can_create?(Topic,Fabricate(:category))).to be_truthy
+        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
+        expect(Guardian.new(build(:moderator, trust_level: 0)).can_create?(Topic, Fabricate(:category))).to be_truthy
       end
     end
 
@@ -728,7 +769,7 @@ describe Guardian do
       it "is false on readonly categories" do
         category = Fabricate(:category)
         topic.category = category
-        category.set_permissions(:everyone => :readonly)
+        category.set_permissions(everyone: :readonly)
         category.save
 
         expect(Guardian.new(topic.user).can_create?(Post, topic)).to be_falsey
@@ -830,14 +871,14 @@ describe Guardian do
           expect(Guardian.new(user).can_create?(Post, private_message)).to be_falsey
         end
 
-        it "allows new posts from blocked users included in the pm" do
-          user.update_attribute(:blocked, true)
+        it "allows new posts from silenced users included in the pm" do
+          user.update_attribute(:silenced_till, 1.year.from_now)
           private_message.topic_allowed_users.create!(user_id: user.id)
           expect(Guardian.new(user).can_create?(Post, private_message)).to be_truthy
         end
 
-        it "doesn't allow new posts from blocked users not invited to the pm" do
-          user.update_attribute(:blocked, true)
+        it "doesn't allow new posts from silenced users not invited to the pm" do
+          user.update_attribute(:silenced_till, 1.year.from_now)
           expect(Guardian.new(user).can_create?(Post, private_message)).to be_falsey
         end
       end
@@ -857,29 +898,31 @@ describe Guardian do
         Guardian.new(user)
       end
 
-
       it "isn't allowed when not logged in" do
-        expect(Guardian.new(nil).post_can_act?(post,:vote)).to be_falsey
+        expect(Guardian.new(nil).post_can_act?(post, :vote)).to be_falsey
       end
 
       it "is allowed as a regular user" do
-        expect(guardian.post_can_act?(post,:vote)).to be_truthy
+        expect(guardian.post_can_act?(post, :vote)).to be_truthy
       end
 
       it "doesn't allow voting if the user has an action from voting already" do
-        expect(guardian.post_can_act?(post,:vote,taken_actions: {PostActionType.types[:vote] => 1})).to be_falsey
+        expect(guardian.post_can_act?(post, :vote, opts: {
+          taken_actions: { PostActionType.types[:vote] => 1 }
+        })).to be_falsey
       end
 
       it "allows voting if the user has performed a different action" do
-        expect(guardian.post_can_act?(post,:vote,taken_actions: {PostActionType.types[:like] => 1})).to be_truthy
+        expect(guardian.post_can_act?(post, :vote, opts: {
+          taken_actions: { PostActionType.types[:like] => 1 }
+        })).to be_truthy
       end
 
       it "isn't allowed on archived topics" do
         topic.archived = true
-        expect(Guardian.new(user).post_can_act?(post,:like)).to be_falsey
+        expect(Guardian.new(user).post_can_act?(post, :like)).to be_falsey
       end
 
-
       describe 'multiple voting' do
 
         it "isn't allowed if the user voted and the topic doesn't allow multiple votes" do
@@ -993,6 +1036,12 @@ describe Guardian do
       expect(Guardian.new(trust_level_4).can_convert_topic?(topic)).to be_falsey
     end
 
+    it 'returns false for category definition topics' do
+      c = Fabricate(:category)
+      topic = Topic.find_by(id: c.topic_id)
+      expect(Guardian.new(admin).can_convert_topic?(topic)).to be_falsey
+    end
+
     it 'returns true when a moderator' do
       expect(Guardian.new(moderator).can_convert_topic?(topic)).to be_truthy
     end
@@ -1081,7 +1130,7 @@ describe Guardian do
 
       it "returns false if a wiki but the user can't create a post" do
         c = Fabricate(:category)
-        c.set_permissions(:everyone => :readonly)
+        c.set_permissions(everyone: :readonly)
         c.save
 
         topic = Fabricate(:topic, category: c)
@@ -1119,7 +1168,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 +1176,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 +1184,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 +1193,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 +1223,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 +1321,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
@@ -1343,9 +1393,9 @@ describe Guardian do
       expect(Guardian.new(user).can_moderate?(nil)).to be_falsey
     end
 
-    context 'when user is blocked' do
+    context 'when user is silenced' do
       it 'returns false' do
-        user.toggle!(:blocked)
+        user.update_column(:silenced_till, 1.year.from_now)
         expect(Guardian.new(user).can_moderate?(post)).to be(false)
         expect(Guardian.new(user).can_moderate?(topic)).to be(false)
       end
@@ -1458,7 +1508,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 +1553,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 +1562,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
@@ -1657,6 +1707,11 @@ describe Guardian do
       expect(Guardian.new(admin).can_approve?(user)).to be_falsey
     end
 
+    it "returns false when the user is not active" do
+      user.active = false
+      expect(Guardian.new(admin).can_approve?(user)).to be_falsey
+    end
+
     it "allows an admin to approve a user" do
       expect(Guardian.new(admin).can_approve?(user)).to be_truthy
     end
@@ -1665,7 +1720,6 @@ describe Guardian do
       expect(Guardian.new(moderator).can_approve?(user)).to be_truthy
     end
 
-
   end
 
   context 'can_grant_admin?' do
@@ -1806,7 +1860,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 +1874,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 +1939,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 +1950,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 +1981,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 +2006,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
@@ -2039,7 +2093,6 @@ describe Guardian do
     end
   end
 
-
   describe 'can_change_trust_level?' do
 
     it 'is false without a logged in user' do
@@ -2089,7 +2142,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 +2165,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 +2177,9 @@ 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.sso_url = "https://www.example.com/sso"
+        SiteSetting.enable_sso = true
+        SiteSetting.sso_overrides_username = true
       end
 
       it "is false for admins" do
@@ -2145,7 +2199,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 +2225,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 +2251,10 @@ 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.sso_url = "https://www.example.com/sso"
+        SiteSetting.enable_sso = true
+        SiteSetting.sso_overrides_email = true
       end
 
       it "is false for admins" do
@@ -2242,7 +2298,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 +2316,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 +2340,13 @@ describe Guardian do
 
       context 'when SSO is enabled' do
         before do
-          SiteSetting.stubs(:enable_sso).returns(true)
+          SiteSetting.sso_url = "https://www.example.com/sso"
+          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 +2364,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 +2493,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 }
@@ -2470,4 +2590,88 @@ describe Guardian do
       end
     end
   end
+
+  context "suspension reasons" do
+    let(:user) { Fabricate(:user) }
+
+    it "will be shown by default" do
+      expect(Guardian.new.can_see_suspension_reason?(user)).to eq(true)
+    end
+
+    context "with hide suspension reason enabled" do
+      let(:moderator) { Fabricate(:moderator) }
+
+      before do
+        SiteSetting.hide_suspension_reasons = true
+      end
+
+      it "will not be shown to anonymous users" do
+        expect(Guardian.new.can_see_suspension_reason?(user)).to eq(false)
+      end
+
+      it "users can see their own suspensions" do
+        expect(Guardian.new(user).can_see_suspension_reason?(user)).to eq(true)
+      end
+
+      it "staff can see suspensions" do
+        expect(Guardian.new(moderator).can_see_suspension_reason?(user)).to eq(true)
+      end
+    end
+  end
+
+  describe '#can_remove_allowed_users?' do
+    context 'staff users' do
+      it 'should be true' do
+        expect(Guardian.new(moderator).can_remove_allowed_users?(topic))
+          .to eq(true)
+      end
+    end
+
+    context 'normal user' do
+      let(:topic) { Fabricate(:topic, user: Fabricate(:user)) }
+      let(:another_user) { Fabricate(:user) }
+
+      before do
+        topic.allowed_users << user
+        topic.allowed_users << another_user
+      end
+
+      it 'should be false' do
+        expect(Guardian.new(user).can_remove_allowed_users?(topic))
+          .to eq(false)
+      end
+
+      describe 'target_user is the user' do
+        describe 'when user is in a pm with another user' do
+          it 'should return true' do
+            expect(Guardian.new(user).can_remove_allowed_users?(topic, user))
+              .to eq(true)
+          end
+        end
+
+        describe 'when user is the creator of the topic' do
+          it 'should return false' do
+            expect(Guardian.new(topic.user).can_remove_allowed_users?(topic, topic.user))
+              .to eq(false)
+          end
+        end
+
+        describe 'when user is the only user in the topic' do
+          it 'should return false' do
+            topic.remove_allowed_user(Discourse.system_user, another_user.username)
+
+            expect(Guardian.new(user).can_remove_allowed_users?(topic, user))
+              .to eq(false)
+          end
+        end
+      end
+
+      describe 'target_user is not the user' do
+        it 'should return false' do
+          expect(Guardian.new(user).can_remove_allowed_users?(topic, moderator))
+            .to eq(false)
+        end
+      end
+    end
+  end
 end
diff --git a/spec/components/highlight_js/highlight_js_spec.rb b/spec/components/highlight_js/highlight_js_spec.rb
index 22010aeb98..7f1d8def89 100644
--- a/spec/components/highlight_js/highlight_js_spec.rb
+++ b/spec/components/highlight_js/highlight_js_spec.rb
@@ -13,7 +13,6 @@ describe HighlightJs do
     expect(bundle).not_to match(/applescript/)
   end
 
-
   it 'can get a version string' do
     version1 = HighlightJs.version("http|cpp")
     version2 = HighlightJs.version("rust|cpp|fake")
diff --git a/spec/components/hijack_spec.rb b/spec/components/hijack_spec.rb
new file mode 100644
index 0000000000..3a9522ab9b
--- /dev/null
+++ b/spec/components/hijack_spec.rb
@@ -0,0 +1,187 @@
+require 'rails_helper'
+
+describe Hijack do
+  class Hijack::Tester < ApplicationController
+    attr_reader :io
+
+    include Hijack
+
+    def initialize(env = {})
+      @io = StringIO.new
+
+      env.merge!(
+        "rack.hijack" => lambda { @io },
+        "rack.input" => StringIO.new
+      )
+
+      self.request = ActionController::TestRequest.new(env, nil, nil)
+
+      # we need this for the 418
+      self.response = ActionDispatch::Response.new
+    end
+
+    def hijack_test(&blk)
+      hijack(&blk)
+    end
+
+  end
+
+  let :tester do
+    Hijack::Tester.new
+  end
+
+  context "Request Tracker integration" do
+    let :logger do
+      lambda do |env, data|
+        @calls += 1
+        @status = data[:status]
+        @total = data[:timing][:total_duration]
+      end
+    end
+
+    before do
+      Middleware::RequestTracker.register_detailed_request_logger logger
+      @calls = 0
+    end
+
+    after do
+      Middleware::RequestTracker.unregister_detailed_request_logger logger
+    end
+
+    it "can properly track execution" do
+      app = lambda do |env|
+        tester = Hijack::Tester.new(env)
+        tester.hijack_test do
+          render body: "hello", status: 201
+        end
+      end
+
+      env = {}
+      middleware = Middleware::RequestTracker.new(app)
+
+      middleware.call(env)
+
+      expect(@calls).to eq(1)
+      expect(@status).to eq(201)
+      expect(@status).to be > 0
+    end
+  end
+
+  it "dupes the request params and env" do
+    orig_req = tester.request
+    copy_req = nil
+
+    tester.hijack_test do
+      copy_req = request
+      render body: "hello world", status: 200
+    end
+
+    expect(copy_req.object_id).not_to eq(orig_req.object_id)
+  end
+
+  it "handles cors" do
+    SiteSetting.cors_origins = "www.rainbows.com"
+
+    app = lambda do |env|
+      tester = Hijack::Tester.new(env)
+      tester.hijack_test do
+        render body: "hello", status: 201
+      end
+
+      expect(tester.io.string).to include("Access-Control-Allow-Origin: www.rainbows.com")
+    end
+
+    env = {}
+    middleware = Discourse::Cors.new(app)
+    middleware.call(env)
+
+    # it can do pre-flight
+    env = {
+      'REQUEST_METHOD' => 'OPTIONS',
+      'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'GET'
+    }
+
+    status, headers, _body = middleware.call(env)
+
+    expect(status).to eq(200)
+
+    expected = {
+      "Access-Control-Allow-Origin" => "www.rainbows.com",
+      "Access-Control-Allow-Headers" => "X-Requested-With, X-CSRF-Token, Discourse-Visible",
+      "Access-Control-Allow-Credentials" => "true"
+    }
+
+    expect(headers).to eq(expected)
+  end
+
+  it "handles expires_in" do
+    tester.hijack_test do
+      expires_in 1.year
+      render body: "hello world", status: 402
+    end
+
+    expect(tester.io.string).to include("max-age=31556952")
+  end
+
+  it "renders non 200 status if asked for" do
+    tester.hijack_test do
+      render body: "hello world", status: 402
+    end
+
+    expect(tester.io.string).to include("402")
+    expect(tester.io.string).to include("world")
+  end
+
+  it "handles send_file correctly" do
+    tester.hijack_test do
+      send_file __FILE__, disposition: nil
+    end
+
+    expect(tester.io.string).to start_with("HTTP/1.1 200")
+  end
+
+  it "renders a redirect correctly" do
+    tester.hijack_test do
+      redirect_to 'http://awesome.com'
+    end
+
+    result = "HTTP/1.1 302 Found\r\nLocation: http://awesome.com\r\nContent-Type: text/html\r\nContent-Length: 84\r\nConnection: close\r\n\r\n<html><body>You are being <a href=\"http://awesome.com\">redirected</a>.</body></html>"
+    expect(tester.io.string).to eq(result)
+  end
+
+  it "renders stuff correctly if is empty" do
+    tester.hijack_test do
+      render body: nil
+    end
+
+    result = "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
+    expect(tester.io.string).to eq(result)
+  end
+
+  it "renders stuff correctly if it works" do
+    tester.hijack_test do
+      render plain: "hello world"
+    end
+
+    result = "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: 11\r\nConnection: close\r\n\r\nhello world"
+    expect(tester.io.string).to eq(result)
+  end
+
+  it "returns 500 by default" do
+    tester.hijack_test
+
+    expected = "HTTP/1.1 500 Internal Server Error\r\nContent-Type: text/html\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
+    expect(tester.io.string).to eq(expected)
+  end
+
+  it "does not run the block if io is closed" do
+    tester.io.close
+
+    ran = false
+    tester.hijack_test do
+      ran = true
+    end
+
+    expect(ran).to eq(false)
+  end
+end
diff --git a/spec/components/html_normalize_spec.rb b/spec/components/html_normalize_spec.rb
new file mode 100644
index 0000000000..7c75d8a15b
--- /dev/null
+++ b/spec/components/html_normalize_spec.rb
@@ -0,0 +1,73 @@
+require 'rails_helper'
+require 'html_normalize'
+
+describe HtmlNormalize do
+
+  def n(html)
+    HtmlNormalize.normalize(html)
+  end
+
+  it "handles attributes without values" do
+    expect(n "<img alt>").to eq("<img alt>")
+  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/html_to_markdown_spec.rb b/spec/components/html_to_markdown_spec.rb
index c6daa6286b..352547215d 100644
--- a/spec/components/html_to_markdown_spec.rb
+++ b/spec/components/html_to_markdown_spec.rb
@@ -3,7 +3,7 @@ require 'html_to_markdown'
 
 describe HtmlToMarkdown do
 
-  def html_to_markdown(html, opts={})
+  def html_to_markdown(html, opts = {})
     HtmlToMarkdown.new(html, opts).to_markdown
   end
 
@@ -228,4 +228,64 @@ describe HtmlToMarkdown do
     expect(html_to_markdown(html)).to eq("1st paragraph\n2nd paragraph")
   end
 
+  context "with an oddly placed <br>" do
+
+    it "handles <strong>" do
+      expect(html_to_markdown("<strong><br>Bold</strong>")).to eq("**Bold**")
+      expect(html_to_markdown("<strong>Bold<br></strong>")).to eq("**Bold**")
+      expect(html_to_markdown("<strong>Bold<br>text</strong>")).to eq("**Bold\ntext**")
+    end
+
+    it "handles <em>" do
+      expect(html_to_markdown("<em><br>Italic</em>")).to eq("*Italic*")
+      expect(html_to_markdown("<em>Italic<br></em>")).to eq("*Italic*")
+      expect(html_to_markdown("<em>Italic<br>text</em>")).to eq("*Italic\ntext*")
+    end
+
+  end
+
+  context "with an empty tag" do
+
+    it "handles <strong>" do
+      expect(html_to_markdown("<strong></strong>")).to eq("")
+      expect(html_to_markdown("<strong>   </strong>")).to eq("")
+      expect(html_to_markdown("Some<strong> </strong>text")).to eq("Some text")
+      expect(html_to_markdown("Some<strong>    </strong>text")).to eq("Some text")
+    end
+
+    it "handles <em>" do
+      expect(html_to_markdown("<em></em>")).to eq("")
+      expect(html_to_markdown("<em>   </em>")).to eq("")
+      expect(html_to_markdown("Some<em> </em>text")).to eq("Some text")
+      expect(html_to_markdown("Some<em>    </em>text")).to eq("Some text")
+    end
+
+  end
+
+  context "with spaces around text" do
+
+    it "handles <strong>" do
+      expect(html_to_markdown("<strong> Bold</strong>")).to eq("**Bold**")
+      expect(html_to_markdown("<strong>     Bold</strong>")).to eq("**Bold**")
+      expect(html_to_markdown("<strong>Bold </strong>")).to eq("**Bold**")
+      expect(html_to_markdown("<strong>Bold     </strong>")).to eq("**Bold**")
+      expect(html_to_markdown("Some<strong> bold</strong> text")).to eq("Some **bold** text")
+      expect(html_to_markdown("Some<strong>     bold</strong> text")).to eq("Some **bold** text")
+      expect(html_to_markdown("Some <strong>bold </strong>text")).to eq("Some **bold** text")
+      expect(html_to_markdown("Some <strong>bold     </strong>text")).to eq("Some **bold** text")
+    end
+
+    it "handles <em>" do
+      expect(html_to_markdown("<em> Italic</em>")).to eq("*Italic*")
+      expect(html_to_markdown("<em>     Italic</em>")).to eq("*Italic*")
+      expect(html_to_markdown("<em>Italic </em>")).to eq("*Italic*")
+      expect(html_to_markdown("<em>Italic     </em>")).to eq("*Italic*")
+      expect(html_to_markdown("Some<em> italic</em> text")).to eq("Some *italic* text")
+      expect(html_to_markdown("Some<em>     italic</em> text")).to eq("Some *italic* text")
+      expect(html_to_markdown("Some <em>italic </em>text")).to eq("Some *italic* text")
+      expect(html_to_markdown("Some <em>italic     </em>text")).to eq("Some *italic* text")
+    end
+
+  end
+
 end
diff --git a/spec/components/image_sizer_spec.rb b/spec/components/image_sizer_spec.rb
index f371d6acd4..b013267101 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/import/normalize_spec.rb b/spec/components/import/normalize_spec.rb
index 3eff19f034..7f8d4498c7 100644
--- a/spec/components/import/normalize_spec.rb
+++ b/spec/components/import/normalize_spec.rb
@@ -18,4 +18,3 @@ MD
     end
   end
 end
-
diff --git a/spec/components/inline_oneboxer_spec.rb b/spec/components/inline_oneboxer_spec.rb
new file mode 100644
index 0000000000..491f322a0c
--- /dev/null
+++ b/spec/components/inline_oneboxer_spec.rb
@@ -0,0 +1,105 @@
+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 crawl anything if allowed to" do
+      SiteSetting.enable_inline_onebox_on_all_domains = true
+
+      # Final destination does a HEAD and a GET
+      stub_request(:head, "https://eviltrout.com/some-path").to_return(status: 200)
+
+      stub_request(:get, "https://eviltrout.com/some-path").
+        to_return(status: 200, body: "<html><head><title>a blog</title></head></html>", headers: {})
+
+      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("a blog")
+    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/js_locale_helper_spec.rb b/spec/components/js_locale_helper_spec.rb
index b5a658f52b..120b6b029b 100644
--- a/spec/components/js_locale_helper_spec.rb
+++ b/spec/components/js_locale_helper_spec.rb
@@ -77,14 +77,13 @@ describe JsLocaleHelper do
     end
 
     it 'can strip out message formats' do
-      hash = {"a" => "b", "c" => { "d" => {"f_MF" => "bob"} }}
-      expect(JsLocaleHelper.strip_out_message_formats!(hash)).to eq({"c.d.f_MF" => "bob"})
+      hash = { "a" => "b", "c" => { "d" => { "f_MF" => "bob" } } }
+      expect(JsLocaleHelper.strip_out_message_formats!(hash)).to eq("c.d.f_MF" => "bob")
       expect(hash["c"]["d"]).to eq({})
     end
 
     it 'handles message format special keys' do
-      JsLocaleHelper.set_translations('en', {
-        "en" => {
+      JsLocaleHelper.set_translations('en',         "en" => {
           "js" => {
             "hello" => "world",
             "test_MF" => "{HELLO} {COUNT, plural, one {1 duck} other {# ducks}}",
@@ -94,8 +93,7 @@ describe JsLocaleHelper do
           "admin_js" => {
             "foo_MF" => "{HELLO} {COUNT, plural, one {1 duck} other {# ducks}}"
           }
-        }
-      })
+        })
 
       ctx = MiniRacer::Context.new
       ctx.eval("I18n = { pluralizationRules: {} };")
@@ -118,38 +116,32 @@ describe JsLocaleHelper do
   end
 
   it 'performs fallbacks to english if a translation is not available' do
-    JsLocaleHelper.set_translations('en', {
-      "en" => {
+    JsLocaleHelper.set_translations('en',       "en" => {
         "js" => {
           "only_english"      => "1-en",
           "english_and_site"  => "3-en",
           "english_and_user"  => "5-en",
           "all_three"         => "7-en",
         }
-      }
-    })
+      })
 
-    JsLocaleHelper.set_translations('ru', {
-      "ru" => {
+    JsLocaleHelper.set_translations('ru',       "ru" => {
         "js" => {
           "only_site"         => "2-ru",
           "english_and_site"  => "3-ru",
           "site_and_user"     => "6-ru",
           "all_three"         => "7-ru",
         }
-      }
-    })
+      })
 
-    JsLocaleHelper.set_translations('uk', {
-      "uk" => {
+    JsLocaleHelper.set_translations('uk',       "uk" => {
         "js" => {
           "only_user"         => "4-uk",
           "english_and_user"  => "5-uk",
           "site_and_user"     => "6-uk",
           "all_three"         => "7-uk",
         }
-      }
-    })
+      })
 
     expected = {
       "none"              => "[uk.js.none]",
diff --git a/spec/components/json_error_spec.rb b/spec/components/json_error_spec.rb
index eae021fe4c..943a0c83c6 100644
--- a/spec/components/json_error_spec.rb
+++ b/spec/components/json_error_spec.rb
@@ -37,7 +37,7 @@ describe JsonError do
 
   describe "with a string" do
     it "returns the string in the error format" do
-      expect(creator.create_errors_json("test error")).to eq({errors: ["test error"]})
+      expect(creator.create_errors_json("test error")).to eq(errors: ["test error"])
     end
   end
 
@@ -52,4 +52,3 @@ describe JsonError do
   end
 
 end
-
diff --git a/spec/components/method_profiler_spec.rb b/spec/components/method_profiler_spec.rb
new file mode 100644
index 0000000000..cbbfcff65a
--- /dev/null
+++ b/spec/components/method_profiler_spec.rb
@@ -0,0 +1,25 @@
+require 'rails_helper'
+require_dependency 'method_profiler'
+
+describe MethodProfiler do
+  class Sneetch
+    def beach
+    end
+  end
+
+  it "can transfer data between threads" do
+    MethodProfiler.patch(Sneetch, [:beach], :at_beach)
+
+    MethodProfiler.start
+    Sneetch.new.beach
+    data = MethodProfiler.transfer
+    result = nil
+    Thread.new do
+      MethodProfiler.start(data)
+      Sneetch.new.beach
+      result = MethodProfiler.stop
+    end.join
+
+    expect(result[:at_beach][:calls]).to eq(2)
+  end
+end
diff --git a/spec/components/middleware/anonymous_cache_spec.rb b/spec/components/middleware/anonymous_cache_spec.rb
index db0c481c4a..50d608c870 100644
--- a/spec/components/middleware/anonymous_cache_spec.rb
+++ b/spec/components/middleware/anonymous_cache_spec.rb
@@ -3,7 +3,7 @@ require_dependency "middleware/anonymous_cache"
 
 describe Middleware::AnonymousCache::Helper do
 
-  def env(opts={})
+  def env(opts = {})
     {
       "HTTP_HOST" => "http://test.com",
       "REQUEST_URI" => "/path?bla=1",
@@ -12,11 +12,10 @@ describe Middleware::AnonymousCache::Helper do
     }.merge(opts)
   end
 
-  def new_helper(opts={})
+  def new_helper(opts = {})
     Middleware::AnonymousCache::Helper.new(env(opts))
   end
 
-
   context "cachable?" do
     it "true by default" do
       expect(new_helper.cacheable?).to eq(true)
@@ -27,7 +26,22 @@ describe Middleware::AnonymousCache::Helper do
     end
 
     it "is false if it has an auth cookie" do
-      expect(new_helper("HTTP_COOKIE" => "jack=1; _t=#{"1"*32}; jill=2").cacheable?).to eq(false)
+      expect(new_helper("HTTP_COOKIE" => "jack=1; _t=#{"1" * 32}; jill=2").cacheable?).to eq(false)
+    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
 
@@ -46,10 +60,10 @@ describe Middleware::AnonymousCache::Helper do
     end
 
     it "handles brotli switching" do
-      helper.cache([200, {"HELLO" => "WORLD"}, ["hello ", "my world"]])
+      helper.cache([200, { "HELLO" => "WORLD" }, ["hello ", "my world"]])
 
       helper = new_helper("ANON_CACHE_DURATION" => 10)
-      expect(helper.cached).to eq([200, {"X-Discourse-Cached" => "true", "HELLO" => "WORLD"}, ["hello my world"]])
+      expect(helper.cached).to eq([200, { "X-Discourse-Cached" => "true", "HELLO" => "WORLD" }, ["hello my world"]])
 
       helper = new_helper("ANON_CACHE_DURATION" => 10, "HTTP_ACCEPT_ENCODING" => "gz, br")
       expect(helper.cached).to eq(nil)
@@ -58,17 +72,16 @@ describe Middleware::AnonymousCache::Helper do
     it "returns cached data for cached requests" do
       helper.is_mobile = true
       expect(helper.cached).to eq(nil)
-      helper.cache([200, {"HELLO" => "WORLD"}, ["hello ", "my world"]])
+      helper.cache([200, { "HELLO" => "WORLD" }, ["hello ", "my world"]])
 
       helper = new_helper("ANON_CACHE_DURATION" => 10)
       helper.is_mobile = true
-      expect(helper.cached).to eq([200, {"X-Discourse-Cached" => "true", "HELLO" => "WORLD"}, ["hello my world"]])
+      expect(helper.cached).to eq([200, { "X-Discourse-Cached" => "true", "HELLO" => "WORLD" }, ["hello my world"]])
 
       expect(crawler.cached).to eq(nil)
-      crawler.cache([200, {"HELLO" => "WORLD"}, ["hello ", "world"]])
-      expect(crawler.cached).to eq([200, {"X-Discourse-Cached" => "true", "HELLO" => "WORLD"}, ["hello world"]])
+      crawler.cache([200, { "HELLO" => "WORLD" }, ["hello ", "world"]])
+      expect(crawler.cached).to eq([200, { "X-Discourse-Cached" => "true", "HELLO" => "WORLD" }, ["hello world"]])
     end
   end
 
 end
-
diff --git a/spec/components/middleware/request_tracker_spec.rb b/spec/components/middleware/request_tracker_spec.rb
index 12fd9fe551..94d76b94c1 100644
--- a/spec/components/middleware/request_tracker_spec.rb
+++ b/spec/components/middleware/request_tracker_spec.rb
@@ -3,7 +3,7 @@ require_dependency "middleware/request_tracker"
 
 describe Middleware::RequestTracker do
 
-  def env(opts={})
+  def env(opts = {})
     {
       "HTTP_HOST" => "http://test.com",
       "REQUEST_URI" => "/path?bla=1",
@@ -21,7 +21,7 @@ describe Middleware::RequestTracker do
     def log_tracked_view(val)
       data = Middleware::RequestTracker.get_data(env(
         "HTTP_DISCOURSE_TRACK_VIEW" => val
-      ), ["200",{"Content-Type" => 'text/html'}])
+      ), ["200", { "Content-Type" => 'text/html' }], 0.2)
 
       Middleware::RequestTracker.log_request(data)
     end
@@ -40,19 +40,19 @@ describe Middleware::RequestTracker do
 
       data = Middleware::RequestTracker.get_data(env(
         "HTTP_USER_AGENT" => "AdsBot-Google (+http://www.google.com/adsbot.html)"
-      ), ["200",{"Content-Type" => 'text/html'}])
+      ), ["200", { "Content-Type" => 'text/html' }], 0.1)
 
       Middleware::RequestTracker.log_request(data)
 
       data = Middleware::RequestTracker.get_data(env(
         "HTTP_DISCOURSE_TRACK_VIEW" => "1"
-      ), ["200",{}])
+      ), ["200", {}], 0.1)
 
       Middleware::RequestTracker.log_request(data)
 
       data = Middleware::RequestTracker.get_data(env(
         "HTTP_USER_AGENT" => "Mozilla/5.0 (iPhone; CPU iPhone OS 8_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12B410 Safari/600.1.4"
-      ), ["200",{"Content-Type" => 'text/html'}])
+      ), ["200", { "Content-Type" => 'text/html' }], 0.1)
 
       Middleware::RequestTracker.log_request(data)
 
@@ -65,5 +65,122 @@ describe Middleware::RequestTracker do
       expect(ApplicationRequest.page_view_crawler.first.count).to eq(1)
       expect(ApplicationRequest.page_view_anon_mobile.first.count).to eq(1)
     end
+
+  end
+
+  context "rate limiting" do
+
+    class TestLogger
+      attr_accessor :warnings
+
+      def initialize
+        @warnings = 0
+      end
+
+      def warn(*args)
+        @warnings += 1
+      end
+    end
+
+    before do
+      RateLimiter.enable
+      RateLimiter.clear_all_global!
+
+      @old_logger = Rails.logger
+      Rails.logger = TestLogger.new
+    end
+
+    after do
+      RateLimiter.disable
+      Rails.logger = @old_logger
+    end
+
+    let :middleware do
+      app = lambda do |env|
+        [200, {}, ["OK"]]
+      end
+
+      Middleware::RequestTracker.new(app)
+    end
+
+    it "does nothing by default" do
+      global_setting :max_requests_per_ip_per_10_seconds, 1
+
+      status, _ = middleware.call(env)
+      status, _ = middleware.call(env)
+
+      expect(status).to eq(200)
+    end
+
+    it "does warn if rate limiter is enabled" do
+      global_setting :max_requests_per_ip_per_10_seconds, 1
+      global_setting :max_requests_per_ip_mode, 'warn'
+
+      status, _ = middleware.call(env)
+      status, _ = middleware.call(env)
+
+      expect(Rails.logger.warnings).to eq(1)
+      expect(status).to eq(200)
+    end
+
+    it "does block if rate limiter is enabled" do
+      global_setting :max_requests_per_ip_per_10_seconds, 1
+      global_setting :max_requests_per_ip_mode, 'block'
+
+      env1 = env("REMOTE_ADDR" => "1.1.1.1")
+      env2 = env("REMOTE_ADDR" => "1.1.1.2")
+
+      status, _ = middleware.call(env1)
+      status, _ = middleware.call(env1)
+
+      expect(status).to eq(429)
+
+      status, _ = middleware.call(env2)
+      expect(status).to eq(200)
+
+    end
+  end
+
+  context "callbacks" do
+    def app(result, sql_calls: 0, redis_calls: 0)
+      lambda do |env|
+        sql_calls.times do
+          User.where(id: -100).first
+        end
+        redis_calls.times do
+          $redis.get("x")
+        end
+        result
+      end
+    end
+
+    let :logger do
+      ->(env, data) do
+        @env = env
+        @data = data
+      end
+    end
+
+    before do
+      Middleware::RequestTracker.register_detailed_request_logger(logger)
+    end
+
+    after do
+      Middleware::RequestTracker.register_detailed_request_logger(logger)
+    end
+
+    it "can correctly log detailed data" do
+      tracker = Middleware::RequestTracker.new(app([200, {}, []], sql_calls: 2, redis_calls: 2))
+      tracker.call(env)
+
+      timing = @data[:timing]
+      expect(timing[:total_duration]).to be > 0
+
+      expect(timing[:sql][:duration]).to be > 0
+      expect(timing[:sql][:calls]).to eq 2
+
+      expect(timing[:redis][:duration]).to be > 0
+      expect(timing[:redis][:calls]).to eq 2
+    end
   end
 end
diff --git a/spec/components/new_post_manager_spec.rb b/spec/components/new_post_manager_spec.rb
index 3b38304d17..65aee5054f 100644
--- a/spec/components/new_post_manager_spec.rb
+++ b/spec/components/new_post_manager_spec.rb
@@ -151,16 +151,16 @@ describe NewPostManager do
     let(:default_handler) { NewPostManager.method(:default_handler) }
 
     it "adds in order by default" do
-      handler = ->{ nil }
+      handler = -> { nil }
 
       NewPostManager.add_handler(&handler)
       expect(NewPostManager.handlers).to eq([default_handler, handler])
     end
 
     it "can be added in high priority" do
-      a = ->{ nil }
-      b = ->{ nil }
-      c = ->{ nil }
+      a = -> { nil }
+      b = -> { nil }
+      c = -> { nil }
 
       NewPostManager.add_handler(100, &a)
       NewPostManager.add_handler(50, &b)
@@ -241,7 +241,6 @@ describe NewPostManager do
 
   end
 
-
   context "user needs approval?" do
 
     let :user do
@@ -251,24 +250,22 @@ describe NewPostManager do
       user
     end
 
-
-
-    it "handles user_needs_approval? correctly" do
+    it "handles post_needs_approval? correctly" do
       u = user
-      default = NewPostManager.new(u,{})
-      expect(NewPostManager.user_needs_approval?(default)).to eq(false)
+      default = NewPostManager.new(u, {})
+      expect(NewPostManager.post_needs_approval?(default)).to eq(false)
 
       with_check = NewPostManager.new(u, first_post_checks: true)
-      expect(NewPostManager.user_needs_approval?(with_check)).to eq(true)
+      expect(NewPostManager.post_needs_approval?(with_check)).to eq(true)
 
       u.user_stat.post_count = 1
       with_check_and_post = NewPostManager.new(u, first_post_checks: true)
-      expect(NewPostManager.user_needs_approval?(with_check_and_post)).to eq(false)
+      expect(NewPostManager.post_needs_approval?(with_check_and_post)).to eq(false)
 
       u.user_stat.post_count = 0
       u.trust_level = 1
       with_check_tl1 = NewPostManager.new(u, first_post_checks: true)
-      expect(NewPostManager.user_needs_approval?(with_check_tl1)).to eq(false)
+      expect(NewPostManager.post_needs_approval?(with_check_tl1)).to eq(false)
     end
   end
 
diff --git a/spec/components/onebox/engine/discourse_local_onebox_spec.rb b/spec/components/onebox/engine/discourse_local_onebox_spec.rb
index 5b76dc521f..911ef40b31 100644
--- a/spec/components/onebox/engine/discourse_local_onebox_spec.rb
+++ b/spec/components/onebox/engine/discourse_local_onebox_spec.rb
@@ -30,7 +30,12 @@ describe Onebox::Engine::DiscourseLocalOnebox do
     end
 
     it "returns some onebox goodness if post exists and can be seen" do
-      url = "#{Discourse.base_url}#{post2.url}?source_topic_id=#{post2.topic_id+1}"
+      url = "#{Discourse.base_url}#{post2.url}?source_topic_id=#{post2.topic_id + 1}"
+      html = Onebox.preview(url).to_s
+      expect(html).to include(post2.excerpt)
+      expect(html).to include(post2.topic.title)
+
+      url = "#{Discourse.base_url}#{post2.url}/?source_topic_id=#{post2.topic_id + 1}"
       html = Onebox.preview(url).to_s
       expect(html).to include(post2.excerpt)
       expect(html).to include(post2.topic.title)
@@ -65,6 +70,10 @@ describe Onebox::Engine::DiscourseLocalOnebox do
       html = Onebox.preview(topic.url).to_s
       expect(html).to include(topic.ordered_posts.first.user.username)
       expect(html).to include("<blockquote>")
+
+      html = Onebox.preview("#{topic.url}/?u=codinghorror").to_s
+      expect(html).to include(topic.ordered_posts.first.user.username)
+      expect(html).to include("<blockquote>")
     end
   end
 
@@ -108,7 +117,7 @@ describe Onebox::Engine::DiscourseLocalOnebox do
       let(:post2) { Fabricate(:post, topic: post.topic, post_number: 2) }
 
       it "returns some onebox goodness if post exists and can be seen" do
-        url = "#{Discourse.base_url}#{post2.url}?source_topic_id=#{post2.topic_id+1}"
+        url = "#{Discourse.base_url}#{post2.url}?source_topic_id=#{post2.topic_id + 1}"
         html = Onebox.preview(url).to_s
         expect(html).to include(post2.excerpt)
         expect(html).to include(post2.topic.title)
diff --git a/spec/components/onebox/engine/flash_video_onebox_spec.rb b/spec/components/onebox/engine/flash_video_onebox_spec.rb
index d63ca37d3a..f8a873da39 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/onebox/engine/whitelisted_generic_onebox_spec.rb b/spec/components/onebox/engine/whitelisted_generic_onebox_spec.rb
index f6d8c38840..d9ccd91f78 100644
--- a/spec/components/onebox/engine/whitelisted_generic_onebox_spec.rb
+++ b/spec/components/onebox/engine/whitelisted_generic_onebox_spec.rb
@@ -15,4 +15,32 @@ describe Onebox::Engine::WhitelistedGenericOnebox do
 
   end
 
+  it "whitelists iframes" do
+    whitelisted_body = '<html><head><link rel="alternate" type="application/json+oembed" href="https://whitelist.ed/iframes.json" />'
+    blacklisted_body = '<html><head><link rel="alternate" type="application/json+oembed" href="https://blacklist.ed/iframes.json" />'
+
+    whitelisted_oembed = {
+      type: "rich",
+      height: "100",
+      html: "<iframe src='https://ifram.es/foo/bar'></iframe>"
+    }
+
+    blacklisted_oembed = {
+      type: "rich",
+      height: "100",
+      html: "<iframe src='https://malicious/discourse.org/'></iframe>"
+    }
+
+    stub_request(:get, "https://blacklist.ed/iframes").to_return(status: 200, body: blacklisted_body)
+    stub_request(:get, "https://blacklist.ed/iframes.json").to_return(status: 200, body: blacklisted_oembed.to_json)
+
+    stub_request(:get, "https://whitelist.ed/iframes").to_return(status: 200, body: whitelisted_body)
+    stub_request(:get, "https://whitelist.ed/iframes.json").to_return(status: 200, body: whitelisted_oembed.to_json)
+
+    SiteSetting.allowed_iframes = "discourse.org|https://ifram.es"
+
+    expect(Onebox.preview("https://blacklist.ed/iframes").to_s).to be_empty
+    expect(Onebox.preview("https://whitelist.ed/iframes").to_s).to match("iframe src")
+  end
+
 end
diff --git a/spec/components/onpdiff_spec.rb b/spec/components/onpdiff_spec.rb
index 0644edaaa8..e8f3d65c13 100644
--- a/spec/components/onpdiff_spec.rb
+++ b/spec/components/onpdiff_spec.rb
@@ -32,4 +32,3 @@ describe ONPDiff do
   end
 
 end
-
diff --git a/spec/components/pbkdf2_spec.rb b/spec/components/pbkdf2_spec.rb
index 1805cd14f6..233c9d62fa 100644
--- a/spec/components/pbkdf2_spec.rb
+++ b/spec/components/pbkdf2_spec.rb
@@ -1,8 +1,8 @@
 require 'pbkdf2'
 
 describe Pbkdf2 do
-  # trivial test to ensure this does not regress during extraction 
-  it "hashes stuff correctly" do 
+  # trivial test to ensure this does not regress during extraction
+  it "hashes stuff correctly" do
     expect(Pbkdf2.hash_password('test', 'abcd', 100)).to eq("0313a6aca54dd4c5d82a699a8a0f0ffb0191b4ef62414b8d9dbc11c0c5ac04da")
     expect(Pbkdf2.hash_password('test', 'abcd', 101)).to eq("c7a7b2891bf8e6f82d08cf8d83824edcf6c7c6bacb6a741f38e21fc7977bd20f")
   end
diff --git a/spec/components/pinned_check_spec.rb b/spec/components/pinned_check_spec.rb
index 5845abcad3..edaba3218f 100644
--- a/spec/components/pinned_check_spec.rb
+++ b/spec/components/pinned_check_spec.rb
@@ -50,8 +50,6 @@ describe PinnedCheck do
       end
     end
 
-
   end
 
 end
-
diff --git a/spec/components/plain_text_to_markdown_spec.rb b/spec/components/plain_text_to_markdown_spec.rb
new file mode 100644
index 0000000000..43437ab6cf
--- /dev/null
+++ b/spec/components/plain_text_to_markdown_spec.rb
@@ -0,0 +1,197 @@
+require 'rails_helper'
+require 'plain_text_to_markdown'
+
+describe PlainTextToMarkdown do
+  def to_markdown(text, opts = {})
+    PlainTextToMarkdown.new(text, opts).to_markdown
+  end
+
+  let(:nbsp) { "&nbsp;" }
+
+  context "quotes" do
+    it "uses the correct quote level" do
+      expect(to_markdown("> foo")).to eq("> foo")
+      expect(to_markdown(">>> foo")).to eq(">>> foo")
+      expect(to_markdown(">>>>>>> foo")).to eq(">>>>>>> foo")
+    end
+
+    it "ignores the first whitespace after the quote identifier" do
+      expect(to_markdown(">foo")).to eq("> foo")
+      expect(to_markdown("> foo")).to eq("> foo")
+      expect(to_markdown(">\tfoo")).to eq("> foo")
+
+      expect(to_markdown(">  foo")).to eq(">  foo")
+      expect(to_markdown(">\t foo")).to eq(">  foo")
+    end
+
+    it "adds a blank line after a quote if it is followed by text" do
+      expect(to_markdown("> foo\nbar")).to eq("> foo\n\nbar")
+      expect(to_markdown(">> foo\nbar")).to eq(">> foo\n\nbar")
+    end
+
+    it "ignores multiple consecutive blank lines" do
+      expect(to_markdown("> foo\n\nbar")).to eq("> foo\n\nbar")
+      expect(to_markdown("> foo\n\n\nbar")).to eq("> foo\n\nbar")
+      expect(to_markdown("> foo\n> \n>\n>\n> bar")).to eq("> foo\n>\n> bar")
+    end
+
+    it "adds an additional line with quote identifier if the quote level is decreasing" do
+      expect(to_markdown(">> foo\n>bar")).to eq(">> foo\n>\n> bar")
+      expect(to_markdown(">>>> foo\n>bar")).to eq(">>>> foo\n>\n> bar")
+      expect(to_markdown(">> foo\nno quote\n>bar")).to eq(">> foo\n\nno quote\n> bar")
+    end
+
+    it "does not add an additional line with quote identifier if the quote level is decreasing and text is blank" do
+      expect(to_markdown(">>> foo\n>>\n>> bar")).to eq(">>> foo\n>>\n>> bar")
+    end
+  end
+
+  context "special characters" do
+    it "escapes special Markdown characters" do
+      expect(to_markdown('\ backslash')).to eq('\\\\ backslash')
+      expect(to_markdown('` backtick')).to eq('\` backtick')
+      expect(to_markdown('* asterisk')).to eq('\* asterisk')
+      expect(to_markdown('_ underscore')).to eq('\_ underscore')
+      expect(to_markdown('{} curly braces')).to eq('\{\} curly braces')
+      expect(to_markdown('[] square brackets')).to eq('\[\] square brackets')
+      expect(to_markdown('() parentheses')).to eq('\(\) parentheses')
+      expect(to_markdown('# hash mark')).to eq('\# hash mark')
+      expect(to_markdown('+ plus sign')).to eq('\+ plus sign')
+      expect(to_markdown('- minus sign')).to eq('\- minus sign')
+      expect(to_markdown('. dot')).to eq('\. dot')
+      expect(to_markdown('! exclamation mark')).to eq('\! exclamation mark')
+      expect(to_markdown('~ tilde')).to eq('\~ tilde')
+    end
+
+    it "escapes special HTML characters" do
+      expect(to_markdown("' single quote")).to eq("&#39; single quote")
+      expect(to_markdown("\" double quote")).to eq("&quot; double quote")
+      expect(to_markdown("& ampersand")).to eq("&amp; ampersand")
+      expect(to_markdown("<> less-than and greater-than sign")).to eq("&lt;&gt; less\\-than and greater\\-than sign")
+    end
+
+    it "escapes special characters but ignores links" do
+      expect(to_markdown("*some text* https://www.example.com/foo.html?a=1&b=0 & <https://www.example.com/bar.html?a=1&b=0> *more text*"))
+        .to eq("\\*some text\\* https://www.example.com/foo.html?a=1&b=0 &amp; &lt;https://www.example.com/bar.html?a=1&b=0&gt; \\*more text\\*")
+    end
+  end
+
+  context "indentation" do
+    it "does not replace one leading whitespace" do
+      expect(to_markdown(" foo")).to eq(" foo")
+    end
+
+    it "replaces leading whitespaces with non-breaking spaces" do
+      expect(to_markdown("  foo")).to eq("#{nbsp}#{nbsp}foo")
+      expect(to_markdown("    foo")).to eq("#{nbsp}#{nbsp}#{nbsp}#{nbsp}foo")
+    end
+
+    it "replaces each leading tabs with two non-breaking spaces" do
+      expect(to_markdown("\tfoo")).to eq("#{nbsp}#{nbsp}foo")
+      expect(to_markdown(" \tfoo")).to eq("#{nbsp}#{nbsp}#{nbsp}foo")
+      expect(to_markdown("\t foo")).to eq("#{nbsp}#{nbsp}#{nbsp}foo")
+      expect(to_markdown(" \t foo")).to eq("#{nbsp}#{nbsp}#{nbsp}#{nbsp}foo")
+      expect(to_markdown("\t\tfoo")).to eq("#{nbsp}#{nbsp}#{nbsp}#{nbsp}foo")
+    end
+
+    it "correctly replaces leading whitespaces within quotes" do
+      expect(to_markdown(">  foo")).to eq(">  foo")
+      expect(to_markdown(">   foo")).to eq("> #{nbsp}#{nbsp}foo")
+    end
+
+    it "does not replace whitespaces within text" do
+      expect(to_markdown("foo    bar")).to eq("foo    bar")
+      expect(to_markdown("foo\t\tbar")).to eq("foo\t\tbar")
+    end
+  end
+
+  context "format=flowed" do
+    it "concats lines ending with a space" do
+      text = "Lorem ipsum dolor sit amet, consectetur \nadipiscing elit. Quasi vero, inquit, \nperpetua oratio rhetorum solum, non \netiam philosophorum sit."
+      markdown = "Lorem ipsum dolor sit amet, consectetur adipiscing elit\\. Quasi vero, inquit, perpetua oratio rhetorum solum, non etiam philosophorum sit\\."
+
+      expect(to_markdown(text, format_flowed: true)).to eq(markdown)
+    end
+
+    it "does not concat lines when there is an empty line between" do
+      text = "Lorem ipsum dolor sit amet, consectetur \nadipiscing elit. \n\nQuasi vero, inquit, \nperpetua oratio rhetorum solum, non \netiam philosophorum sit."
+      markdown = "Lorem ipsum dolor sit amet, consectetur adipiscing elit\\. \n\nQuasi vero, inquit, perpetua oratio rhetorum solum, non etiam philosophorum sit\\."
+
+      expect(to_markdown(text, format_flowed: true)).to eq(markdown)
+    end
+
+    it "concats quoted lines ending with a space" do
+      text = "> Lorem ipsum dolor sit amet, consectetur \n> adipiscing elit. Quasi vero, inquit, \n> perpetua oratio rhetorum solum, non \n> etiam philosophorum sit."
+      markdown = "> Lorem ipsum dolor sit amet, consectetur adipiscing elit\\. Quasi vero, inquit, perpetua oratio rhetorum solum, non etiam philosophorum sit\\."
+
+      expect(to_markdown(text, format_flowed: true)).to eq(markdown)
+    end
+
+    it "does not concat quoted lines ending with a space when the quote level differs" do
+      text = "> Lorem ipsum dolor sit amet, consectetur \n> adipiscing elit. \n>> Quasi vero, inquit, \n>> perpetua oratio rhetorum solum, non \n> etiam philosophorum sit."
+      markdown = "> Lorem ipsum dolor sit amet, consectetur adipiscing elit\\. \n>> Quasi vero, inquit, perpetua oratio rhetorum solum, non \n>\n> etiam philosophorum sit\\."
+
+      expect(to_markdown(text, format_flowed: true)).to eq(markdown)
+    end
+
+    it "does not recognize a signature separator as start of flowed text" do
+      text = "-- \nsignature line 1\nsignature line 2"
+      markdown = "\\-\\- \nsignature line 1\nsignature line 2"
+
+      expect(to_markdown(text, format_flowed: true)).to eq(markdown)
+    end
+
+    it "does not concat lines when there is a signature separator" do
+      text = "Lorem ipsum \ndolor sit amet \n-- \nsignature line 1\nsignature line 2"
+      markdown = "Lorem ipsum dolor sit amet \n\\-\\- \nsignature line 1\nsignature line 2"
+
+      expect(to_markdown(text, format_flowed: true)).to eq(markdown)
+    end
+
+    it "removes the trailing space if DelSp is set to 'yes'" do
+      text = "Lorem ipsum dolor sit amet, consectetur \nadipiscing elit. \nQuasi vero, inquit"
+      markdown = "Lorem ipsum dolor sit amet, consecteturadipiscing elit\\.Quasi vero, inquit"
+
+      expect(to_markdown(text, format_flowed: true, delete_flowed_space: true)).to eq(markdown)
+    end
+  end
+
+  context "links" do
+    it "removes duplicate links" do
+      expect(to_markdown("foo https://www.example.com/foo.html <https://www.example.com/foo.html> bar"))
+        .to eq("foo https://www.example.com/foo.html bar")
+
+      expect(to_markdown("foo https://www.example.com/foo.html (https://www.example.com/foo.html) bar"))
+        .to eq("foo https://www.example.com/foo.html bar")
+
+      expect(to_markdown("foo https://www.example.com/foo.html https://www.example.com/foo.html bar"))
+        .to eq("foo https://www.example.com/foo.html bar")
+    end
+
+    it "does not removes duplicate links when there is text between the links" do
+      expect(to_markdown("foo https://www.example.com/foo.html bar https://www.example.com/foo.html baz"))
+        .to eq("foo https://www.example.com/foo.html bar https://www.example.com/foo.html baz")
+    end
+  end
+
+  context "code" do
+    it "detects matching Markdown code block within backticks" do
+      expect(to_markdown("foo\n```\n<this is code>\n```")).to eq("foo\n```\n<this is code>\n```")
+    end
+
+    it "does not detect Markdown code block when backticks are not on new line" do
+      expect(to_markdown("foo\n```\n<this is code> ```")).to eq("foo\n\\`\\`\\`\n&lt;this is code&gt; \\`\\`\\`")
+    end
+
+    it "does not detect Markdown code block when backticks are indented by more than 3 whitespaces" do
+      expect(to_markdown("foo\n ```\n<this is code>\n  ```")).to include("<this is code>")
+      expect(to_markdown("foo\n   ```\n<this is code>\n ```")).to include("<this is code>")
+
+      expect(to_markdown("foo\n    ```\n<this is code>\n```")).to include("&lt;this is code&gt;")
+      expect(to_markdown("foo\n```\n<this is code>\n    ```")).to include("&lt;this is code&gt;")
+
+      expect(to_markdown("foo\n       ```\n<this is code>\n```")).to include("&lt;this is code&gt;")
+      expect(to_markdown("foo\n```\n<this is code>\n        ```")).to include("&lt;this is code&gt;")
+    end
+  end
+end
diff --git a/spec/components/plugin/filter_manager_spec.rb b/spec/components/plugin/filter_manager_spec.rb
index 285a2c8df4..cd87b24000 100644
--- a/spec/components/plugin/filter_manager_spec.rb
+++ b/spec/components/plugin/filter_manager_spec.rb
@@ -2,14 +2,14 @@ require 'rails_helper'
 require_dependency 'plugin/filter_manager'
 
 describe Plugin::FilterManager do
-  let(:instance){ Plugin::FilterManager.new }
+  let(:instance) { Plugin::FilterManager.new }
 
   it "calls registered filters correctly" do
-    instance.register(:added_numbers) do |context,result|
+    instance.register(:added_numbers) do |context, result|
       context + result + 1
     end
 
-    instance.register(:added_numbers) do |context,result|
+    instance.register(:added_numbers) do |context, result|
       context + result + 2
     end
 
diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb
index 0e9c0fd592..7c1f37f6a5 100644
--- a/spec/components/plugin/instance_spec.rb
+++ b/spec/components/plugin/instance_spec.rb
@@ -95,6 +95,18 @@ describe Plugin::Instance do
     end
   end
 
+  context "register service worker" do
+    it "populates the DiscoursePluginRegistry" do
+      plugin = Plugin::Instance.new nil, "/tmp/test.rb"
+      plugin.register_service_worker("test.js")
+      plugin.register_service_worker("test2.js")
+
+      plugin.send :register_service_workers!
+
+      expect(DiscoursePluginRegistry.service_workers.count).to eq(2)
+    end
+  end
+
   context "activate!" do
     it "can activate plugins correctly" do
       plugin = Plugin::Instance.new
@@ -102,7 +114,7 @@ describe Plugin::Instance do
       junk_file = "#{plugin.auto_generated_path}/junk"
 
       plugin.ensure_directory(junk_file)
-      File.open("#{plugin.auto_generated_path}/junk", "w") {|f| f.write("junk")}
+      File.open("#{plugin.auto_generated_path}/junk", "w") { |f| f.write("junk") }
       plugin.activate!
 
       expect(plugin.auth_providers.count).to eq(1)
@@ -149,6 +161,14 @@ describe Plugin::Instance do
   end
 
   context "serialized_current_user_fields" do
+    before do
+      DiscoursePluginRegistry.serialized_current_user_fields << "has_car"
+    end
+
+    after do
+      DiscoursePluginRegistry.serialized_current_user_fields.delete "has_car"
+    end
+
     it "correctly serializes custom user fields" do
       DiscoursePluginRegistry.serialized_current_user_fields << "has_car"
       user = Fabricate(:user)
@@ -157,27 +177,18 @@ describe Plugin::Instance do
 
       payload = JSON.parse(CurrentUserSerializer.new(user, scope: Guardian.new(user)).to_json)
       expect(payload["current_user"]["custom_fields"]["has_car"]).to eq("true")
-    end
-  end
 
-  context "themes" do
-    it "can register a theme" do
-      plugin = Plugin::Instance.new nil, "/tmp/test.rb"
-      plugin.register_theme('plugin') do |theme|
-        theme.set_color_scheme(
-          primary: 'ffff00',
-          secondary: '222222',
-          tertiary: '0f82af',
-          quaternary: 'c14924',
-          header_background: '111111',
-          header_primary: '333333',
-          highlight: 'a87137',
-          danger: 'e45735',
-          success: '1ca551',
-          love: 'fa6c8d'
-        )
-      end
-      expect(plugin.themes).to be_present
+      payload = JSON.parse(UserSerializer.new(user, scope: Guardian.new(user)).to_json)
+      expect(payload["user"]["custom_fields"]["has_car"]).to eq("true")
+
+      UserCustomField.destroy_all
+      user.reload
+
+      payload = JSON.parse(CurrentUserSerializer.new(user, scope: Guardian.new(user)).to_json)
+      expect(payload["current_user"]["custom_fields"]).to eq({})
+
+      payload = JSON.parse(UserSerializer.new(user, scope: Guardian.new(user)).to_json)
+      expect(payload["user"]["custom_fields"]).to eq({})
     end
   end
 
@@ -185,7 +196,7 @@ describe Plugin::Instance do
     it "can add a color scheme for the first time" do
       plugin = Plugin::Instance.new nil, "/tmp/test.rb"
       expect {
-        plugin.register_color_scheme("Purple", {primary: 'EEE0E5'})
+        plugin.register_color_scheme("Purple", primary: 'EEE0E5')
         plugin.notify_after_initialize
       }.to change { ColorScheme.count }.by(1)
       expect(ColorScheme.where(name: "Purple")).to be_present
@@ -195,7 +206,7 @@ describe Plugin::Instance do
       Fabricate(:color_scheme, name: "Halloween")
       plugin = Plugin::Instance.new nil, "/tmp/test.rb"
       expect {
-        plugin.register_color_scheme("Halloween", {primary: 'EEE0E5'})
+        plugin.register_color_scheme("Halloween", primary: 'EEE0E5')
         plugin.notify_after_initialize
       }.to_not change { ColorScheme.count }
     end
diff --git a/spec/components/post_action_creator_spec.rb b/spec/components/post_action_creator_spec.rb
index 3b577fa404..4e39508167 100644
--- a/spec/components/post_action_creator_spec.rb
+++ b/spec/components/post_action_creator_spec.rb
@@ -6,7 +6,6 @@ describe PostActionCreator do
   let(:post) { Fabricate(:post) }
   let(:like_type_id) { PostActionType.types[:like] }
 
-
   describe 'perform' do
     it 'creates a post action' do
       expect { PostActionCreator.new(user, post).perform(like_type_id) }.to change { PostAction.count }.by(1)
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index bcabf4d439..57ab779b7a 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -9,12 +9,12 @@ describe PostCreator do
 
   context "new topic" do
     let(:category) { Fabricate(:category, user: user) }
-    let(:basic_topic_params) { {title: "hello world topic", raw: "my name is fred", archetype_id: 1} }
-    let(:image_sizes) { {'http://an.image.host/image.jpg' => {"width" => 111, "height" => 222}} }
+    let(:basic_topic_params) { { title: "hello world topic", raw: "my name is fred", archetype_id: 1 } }
+    let(:image_sizes) { { 'http://an.image.host/image.jpg' => { "width" => 111, "height" => 222 } } }
 
     let(:creator) { PostCreator.new(user, basic_topic_params) }
-    let(:creator_with_category) { PostCreator.new(user, basic_topic_params.merge(category: category.id )) }
-    let(:creator_with_meta_data) { PostCreator.new(user, basic_topic_params.merge(meta_data: {hello: "world"} )) }
+    let(:creator_with_category) { PostCreator.new(user, basic_topic_params.merge(category: category.id)) }
+    let(:creator_with_meta_data) { PostCreator.new(user, basic_topic_params.merge(meta_data: { hello: "world" })) }
     let(:creator_with_image_sizes) { PostCreator.new(user, basic_topic_params.merge(image_sizes: image_sizes)) }
     let(:creator_with_featured_link) { PostCreator.new(user, title: "featured link topic", archetype_id: 1, featured_link: "http://www.discourse.org", raw: "http://www.discourse.org") }
 
@@ -34,12 +34,12 @@ describe PostCreator do
       cat = Fabricate(:category)
       cat.all_topics_wiki = true
       cat.save
-      post = PostCreator.create(user, basic_topic_params.merge(category: cat.id ))
+      post = PostCreator.create(user, basic_topic_params.merge(category: cat.id))
       expect(post.wiki).to eq(true)
     end
 
     it "ensures the user can create the topic" do
-      Guardian.any_instance.expects(:can_create?).with(Topic,nil).returns(false)
+      Guardian.any_instance.expects(:can_create?).with(Topic, nil).returns(false)
       expect { creator.create }.to raise_error(Discourse::InvalidAccess)
     end
 
@@ -77,16 +77,19 @@ describe PostCreator do
       end
 
       it "triggers extensibility events" do
-        DiscourseEvent.expects(:trigger).with(:before_create_post, anything).once
-        DiscourseEvent.expects(:trigger).with(:validate_post, anything).once
-        DiscourseEvent.expects(:trigger).with(:topic_created, anything, anything, user).once
-        DiscourseEvent.expects(:trigger).with(:post_created, anything, anything, user).once
-        DiscourseEvent.expects(:trigger).with(:after_validate_topic, anything, anything).once
-        DiscourseEvent.expects(:trigger).with(:before_create_topic, anything, anything).once
-        DiscourseEvent.expects(:trigger).with(:after_trigger_post_process, anything).once
-        DiscourseEvent.expects(:trigger).with(:markdown_context, anything).at_least_once
-        DiscourseEvent.expects(:trigger).with(:topic_notification_level_changed, anything, anything, anything).at_least_once
-        creator.create
+        events = DiscourseEvent.track_events { creator.create }
+
+        expect(events.map { |event| event[:event_name] }).to include(
+          :before_create_post,
+          :validate_post,
+          :topic_created,
+          :post_created,
+          :after_validate_topic,
+          :before_create_topic,
+          :after_trigger_post_process,
+          :markdown_context,
+          :topic_notification_level_changed,
+        )
       end
 
       it "does not notify on system messages" do
@@ -97,8 +100,8 @@ describe PostCreator do
         end
         # don't notify on system messages they introduce too much noise
         channels = messages.map(&:channel)
-        expect(channels.find{|s| s =~ /unread/}).to eq(nil)
-        expect(channels.find{|s| s =~ /new/}).to eq(nil)
+        expect(channels.find { |s| s =~ /unread/ }).to eq(nil)
+        expect(channels.find { |s| s =~ /new/ }).to eq(nil)
       end
 
       it "generates the correct messages for a secure topic" do
@@ -108,7 +111,7 @@ describe PostCreator do
         admin = Fabricate(:admin)
 
         cat = Fabricate(:category)
-        cat.set_permissions(:admins => :full)
+        cat.set_permissions(admins: :full)
         cat.save
 
         created_post = nil
@@ -119,9 +122,8 @@ describe PostCreator do
           reply = PostCreator.new(admin, raw: "this is my test reply 123 testing", topic_id: created_post.topic_id).create
         end
 
-
         # 2 for topic, one to notify of new topic another for tracking state
-        expect(messages.map{|m| m.channel}.sort).to eq([ "/new",
+        expect(messages.map { |m| m.channel }.sort).to eq([ "/new",
                                                      "/u/#{admin.username}",
                                                      "/u/#{admin.username}",
                                                      "/unread/#{admin.id}",
@@ -133,7 +135,7 @@ describe PostCreator do
                                                    ].sort)
         admin_ids = [Group[:admins].id]
 
-        expect(messages.any?{|m| m.group_ids != admin_ids && m.user_ids != [admin.id]}).to eq(false)
+        expect(messages.any? { |m| m.group_ids != admin_ids && m.user_ids != [admin.id] }).to eq(false)
       end
 
       it 'generates the correct messages for a normal topic' do
@@ -145,16 +147,16 @@ describe PostCreator do
           p = creator.create
         end
 
-        latest = messages.find{|m| m.channel == "/latest"}
+        latest = messages.find { |m| m.channel == "/latest" }
         expect(latest).not_to eq(nil)
 
-        latest = messages.find{|m| m.channel == "/new"}
+        latest = messages.find { |m| m.channel == "/new" }
         expect(latest).not_to eq(nil)
 
-        read = messages.find{|m| m.channel == "/unread/#{p.user_id}"}
+        read = messages.find { |m| m.channel == "/unread/#{p.user_id}" }
         expect(read).not_to eq(nil)
 
-        user_action = messages.find{|m| m.channel == "/u/#{p.user.username}"}
+        user_action = messages.find { |m| m.channel == "/u/#{p.user.username}" }
         expect(user_action).not_to eq(nil)
 
         expect(messages.length).to eq(5)
@@ -188,7 +190,7 @@ describe PostCreator do
         Jobs.expects(:enqueue).with(:notify_mailing_list_subscribers, has_key(:post_id))
         Jobs.expects(:enqueue).with(:post_alert, has_key(:post_id))
         Jobs.expects(:enqueue).with(:process_post, has_key(:image_sizes))
-        creator.opts[:image_sizes] = {'http://an.image.host/image.jpg' => {'width' => 17, 'height' => 31}}
+        creator.opts[:image_sizes] = { 'http://an.image.host/image.jpg' => { 'width' => 17, 'height' => 31 } }
         creator.create
       end
 
@@ -252,6 +254,15 @@ describe PostCreator do
         end
       end
 
+      it "updates topic stats" do
+        first_post = creator.create
+        topic = first_post.topic.reload
+
+        expect(topic.last_posted_at).to be_within(1.seconds).of(first_post.created_at)
+        expect(topic.last_post_user_id).to eq(first_post.user_id)
+        expect(topic.word_count).to eq(4)
+      end
+
       it 'creates a post with featured link' do
         SiteSetting.topic_featured_link_enabled = true
         SiteSetting.min_first_post_length = 100
@@ -284,36 +295,32 @@ describe PostCreator do
         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
@@ -345,14 +352,14 @@ describe PostCreator do
             end
 
             it "can create all tags if none exist" do
-              expect { @post = creator_with_tags.create }.to change { Tag.count }.by( tag_names.size )
+              expect { @post = creator_with_tags.create }.to change { Tag.count }.by(tag_names.size)
               expect(@post.topic.tags.map(&:name).sort).to eq(tag_names.sort)
             end
 
             it "creates missing tags if some exist" do
               existing_tag1 = Fabricate(:tag, name: tag_names[0])
               existing_tag1 = Fabricate(:tag, name: tag_names[1])
-              expect { @post = creator_with_tags.create }.to change { Tag.count }.by( tag_names.size - 2 )
+              expect { @post = creator_with_tags.create }.to change { Tag.count }.by(tag_names.size - 2)
               expect(@post.topic.tags.map(&:name).sort).to eq(tag_names.sort)
             end
           end
@@ -387,34 +394,38 @@ describe PostCreator do
     let!(:topic) { Fabricate(:topic, user: user) }
 
     it 'whispers do not mess up the public view' do
-
       first = PostCreator.new(user,
-                                topic_id: topic.id,
-                                raw: 'this is the first post').create
+        topic_id: topic.id,
+        raw: 'this is the first post').create
+
+      user_stat = user.user_stat
 
       whisper = PostCreator.new(user,
-                                topic_id: topic.id,
-                                reply_to_post_number: 1,
-                                post_type: Post.types[:whisper],
-                                raw: 'this is a whispered reply').create
+        topic_id: topic.id,
+        reply_to_post_number: 1,
+        post_type: Post.types[:whisper],
+        raw: 'this is a whispered reply').create
+
+      # don't count whispers in user stats
+      expect(user_stat.reload.post_count).to eq(0)
 
       expect(whisper).to be_present
       expect(whisper.post_type).to eq(Post.types[:whisper])
 
-
       whisper_reply = PostCreator.new(user,
-                                      topic_id: topic.id,
-                                      reply_to_post_number: whisper.post_number,
-                                      post_type: Post.types[:regular],
-                                      raw: 'replying to a whisper this time').create
+        topic_id: topic.id,
+        reply_to_post_number: whisper.post_number,
+        post_type: Post.types[:regular],
+        raw: 'replying to a whisper this time').create
 
       expect(whisper_reply).to be_present
       expect(whisper_reply.post_type).to eq(Post.types[:whisper])
 
+      expect(user_stat.reload.post_count).to eq(0)
+
       # date is not precise enough in db
       whisper_reply.reload
 
-
       first.reload
       # does not leak into the OP
       expect(first.reply_count).to eq(0)
@@ -426,11 +437,16 @@ describe PostCreator do
       expect(topic.reply_count).to eq(0)
       expect(topic.posts_count).to eq(1)
       expect(topic.highest_staff_post_number).to eq(3)
+      expect(topic.last_posted_at).to be_within(1.seconds).of(first.created_at)
+      expect(topic.last_post_user_id).to eq(first.user_id)
+      expect(topic.word_count).to eq(5)
 
-      topic.update_columns(highest_staff_post_number:0,
-                           highest_post_number:0,
-                           posts_count: 0,
-                           last_posted_at: 1.year.ago)
+      topic.update_columns(
+        highest_staff_post_number: 0,
+        highest_post_number: 0,
+        posts_count: 0,
+        last_posted_at: 1.year.ago
+      )
 
       Topic.reset_highest(topic.id)
 
@@ -445,7 +461,7 @@ describe PostCreator do
   context 'uniqueness' do
 
     let!(:topic) { Fabricate(:topic, user: user) }
-    let(:basic_topic_params) { { raw: 'test reply', topic_id: topic.id, reply_to_post_number: 4} }
+    let(:basic_topic_params) { { raw: 'test reply', topic_id: topic.id, reply_to_post_number: 4 } }
     let(:creator) { PostCreator.new(user, basic_topic_params) }
 
     context "disabled" do
@@ -503,11 +519,10 @@ describe PostCreator do
 
   end
 
-
   context "host spam" do
 
     let!(:topic) { Fabricate(:topic, user: user) }
-    let(:basic_topic_params) { { raw: 'test reply', topic_id: topic.id, reply_to_post_number: 4} }
+    let(:basic_topic_params) { { raw: 'test reply', topic_id: topic.id, reply_to_post_number: 4 } }
     let(:creator) { PostCreator.new(user, basic_topic_params) }
 
     before do
@@ -524,7 +539,7 @@ describe PostCreator do
 
     it "sends a message to moderators" do
       GroupMessage.expects(:create).with do |group_name, msg_type, params|
-        group_name == Group[:moderators].name and msg_type == :spam_post_blocked and params[:user].id == user.id
+        group_name == (Group[:moderators].name) && msg_type == (:spam_post_blocked) && params[:user].id == (user.id)
       end
       creator.create
     end
@@ -533,7 +548,7 @@ describe PostCreator do
 
   # more integration testing ... maximise our testing
   context 'existing topic' do
-    let(:topic) { Fabricate(:topic, user: user) }
+    let(:topic) { Fabricate(:topic, user: user, title: 'topic title with 25 chars') }
     let(:creator) { PostCreator.new(user, raw: 'test reply', topic_id: topic.id, reply_to_post_number: 4) }
 
     it 'ensures the user can create the post' do
@@ -551,9 +566,38 @@ describe PostCreator do
         expect(Topic.count).to eq(1)
         expect(post.reply_to_post_number).to eq(4)
       end
-
     end
 
+    context "topic stats" do
+      before do
+        PostCreator.new(
+          Fabricate(:coding_horror),
+          raw: 'first post in topic',
+          topic_id: topic.id,
+          created_at: Time.zone.now - 24.hours
+        ).create
+      end
+
+      it "updates topic stats" do
+        post = creator.create
+        topic.reload
+
+        expect(topic.last_posted_at).to be_within(1.seconds).of(post.created_at)
+        expect(topic.last_post_user_id).to eq(post.user_id)
+        expect(topic.word_count).to eq(6)
+      end
+
+      it "updates topic stats even when topic fails validation" do
+        topic.update_columns(title: 'below 15 chars')
+
+        post = creator.create
+        topic.reload
+
+        expect(topic.last_posted_at).to be_within(1.seconds).of(post.created_at)
+        expect(topic.last_post_user_id).to eq(post.user_id)
+        expect(topic.word_count).to eq(6)
+      end
+    end
   end
 
   context 'closed topic' do
@@ -632,7 +676,7 @@ describe PostCreator do
       # if an admin replies they should be added to the allowed user list
       admin = Fabricate(:admin)
       PostCreator.create(admin, raw: 'hi there welcome topic, I am a mod',
-                         topic_id: post.topic_id)
+                                topic_id: post.topic_id)
 
       post.topic.reload
       expect(post.topic.topic_allowed_users.where(user_id: admin.id).count).to eq(1)
@@ -721,7 +765,7 @@ describe PostCreator do
     let(:target_user1) { Fabricate(:coding_horror) }
     let(:target_user2) { Fabricate(:moderator) }
     let(:group) do
-      g = Fabricate.build(:group)
+      g = Fabricate.build(:group, messageable_level: Group::ALIAS_LEVELS[:everyone])
       g.add(target_user1)
       g.add(target_user2)
       g.save
@@ -729,10 +773,12 @@ describe PostCreator do
     end
     let(:unrelated) { Fabricate(:user) }
     let(:post) do
-      PostCreator.create(user, title: 'hi there welcome to my topic',
-                               raw: "this is my awesome message @#{unrelated.username_lower}",
-                               archetype: Archetype.private_message,
-                               target_group_names: group.name)
+      PostCreator.create!(user,
+        title: 'hi there welcome to my topic',
+        raw: "this is my awesome message @#{unrelated.username_lower}",
+        archetype: Archetype.private_message,
+        target_group_names: group.name
+      )
     end
 
     it 'can post to a group correctly' do
@@ -818,11 +864,11 @@ describe PostCreator do
     it "should give credit to creator" do
       post = create_post
       expect(PostTiming.find_by(topic_id: post.topic_id,
-                         post_number: post.post_number,
-                         user_id: post.user_id).msecs).to be > 0
+                                post_number: post.post_number,
+                                user_id: post.user_id).msecs).to be > 0
 
       expect(TopicUser.find_by(topic_id: post.topic_id,
-                        user_id: post.user_id).last_read_post_number).to eq(1)
+                               user_id: post.user_id).last_read_post_number).to eq(1)
     end
   end
 
@@ -830,14 +876,14 @@ describe PostCreator do
     it "does not allow suspended users to create topics" do
       user = Fabricate(:user, suspended_at: 1.month.ago, suspended_till: 1.month.from_now)
 
-      creator = PostCreator.new(user, {title: "my test title 123", raw: "I should not be allowed to post"} )
+      creator = PostCreator.new(user, title: "my test title 123", raw: "I should not be allowed to post")
       creator.create
       expect(creator.errors.count).to be > 0
     end
   end
 
   it "doesn't strip starting whitespaces" do
-    pc = PostCreator.new(user, { title: "testing whitespace stripping", raw: "    <-- whitespaces -->    " })
+    pc = PostCreator.new(user, title: "testing whitespace stripping", raw: "    <-- whitespaces -->    ")
     post = pc.create
     expect(post.raw).to eq("    <-- whitespaces -->")
   end
@@ -959,6 +1005,30 @@ describe PostCreator do
     end
   end
 
+  context 'private message to a user that has disabled private messages' do
+    let(:another_user) { Fabricate(:user) }
+
+    before do
+      another_user.user_option.update!(allow_private_messages: false)
+    end
+
+    it 'should not be valid' do
+      post_creator = PostCreator.new(
+        user,
+        title: 'this message is to someone who muted me!',
+        raw: "you will have to see this even if you muted me!",
+        archetype: Archetype.private_message,
+        target_usernames: "#{another_user.username}"
+      )
+
+      expect(post_creator).to_not be_valid
+
+      expect(post_creator.errors.full_messages).to include(I18n.t(
+        "not_accepting_pms", username: another_user.username
+      ))
+    end
+  end
+
   context "private message to a muted user" do
     let(:muted_me) { Fabricate(:evil_trout) }
 
@@ -994,4 +1064,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 37b35ab285..c4430c8d4f 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
 
@@ -167,26 +167,45 @@ describe PostDestroyer do
       before do
         post
         @user = post.user
+        @reply = create_post(topic: post.topic, user: @user)
         expect(@user.user_stat.post_count).to eq(1)
       end
 
       context "recovered by user" do
         it "should increment the user's post count" do
-          PostDestroyer.new(@user, post).destroy
+          PostDestroyer.new(@user, @reply).destroy
+          expect(@user.user_stat.topic_count).to eq(1)
           expect(@user.user_stat.post_count).to eq(1)
 
-          PostDestroyer.new(@user, post.reload).recover
+          PostDestroyer.new(@user, @reply.reload).recover
+          expect(@user.user_stat.topic_count).to eq(1)
           expect(@user.reload.user_stat.post_count).to eq(1)
+
+          expect(UserAction.where(target_topic_id: post.topic_id, action_type: UserAction::NEW_TOPIC).count).to eq(1)
+          expect(UserAction.where(target_topic_id: post.topic_id, action_type: UserAction::REPLY).count).to eq(1)
         end
       end
 
       context "recovered by admin" do
         it "should increment the user's post count" do
+          PostDestroyer.new(moderator, @reply).destroy
+          expect(@user.reload.user_stat.topic_count).to eq(1)
+          expect(@user.user_stat.post_count).to eq(0)
+
+          PostDestroyer.new(admin, @reply).recover
+          expect(@user.reload.user_stat.topic_count).to eq(1)
+          expect(@user.user_stat.post_count).to eq(1)
+
           PostDestroyer.new(moderator, post).destroy
+          expect(@user.reload.user_stat.topic_count).to eq(0)
           expect(@user.user_stat.post_count).to eq(0)
 
           PostDestroyer.new(admin, post).recover
-          expect(@user.reload.user_stat.post_count).to eq(1)
+          expect(@user.reload.user_stat.topic_count).to eq(1)
+          expect(@user.user_stat.post_count).to eq(1)
+
+          expect(UserAction.where(target_topic_id: post.topic_id, action_type: UserAction::NEW_TOPIC).count).to eq(1)
+          expect(UserAction.where(target_topic_id: post.topic_id, action_type: UserAction::REPLY).count).to eq(1)
         end
       end
     end
@@ -196,6 +215,7 @@ describe PostDestroyer do
     it "as the creator of the post, doesn't delete the post" do
       begin
         post2 = create_post
+        user_stat = post2.user.user_stat
 
         called = 0
         topic_destroyed = -> (topic, user) do
@@ -207,15 +227,18 @@ describe PostDestroyer do
         DiscourseEvent.on(:topic_destroyed, &topic_destroyed)
 
         @orig = post2.cooked
+        # Guardian.new(post2.user).can_delete_post?(post2) == false
         PostDestroyer.new(post2.user, post2).destroy
         post2.reload
 
         expect(post2.deleted_at).to be_blank
         expect(post2.deleted_by).to be_blank
         expect(post2.user_deleted).to eq(true)
-        expect(post2.raw).to eq(I18n.t('js.post.deleted_by_author', {count: 24}))
+        expect(post2.raw).to eq(I18n.t('js.post.deleted_by_author', count: 24))
         expect(post2.version).to eq(2)
         expect(called).to eq(1)
+        expect(user_stat.reload.post_count).to eq(0)
+        expect(user_stat.reload.topic_count).to eq(1)
 
         called = 0
         topic_recovered = -> (topic, user) do
@@ -233,23 +256,59 @@ describe PostDestroyer do
         expect(post2.user_deleted).to eq(false)
         expect(post2.cooked).to eq(@orig)
         expect(called).to eq(1)
+        expect(user_stat.reload.post_count).to eq(0)
+        expect(user_stat.reload.topic_count).to eq(1)
       ensure
         DiscourseEvent.off(:topic_destroyed, &topic_destroyed)
         DiscourseEvent.off(:topic_recovered, &topic_recovered)
       end
     end
 
+    it "when topic is destroyed, it updates user_stats correctly" do
+      post
+      user1 = post.user
+      user1.reload
+      user2 = Fabricate(:user)
+      reply = create_post(topic_id: post.topic_id, user: user2)
+      reply2 = create_post(topic_id: post.topic_id, user: user1)
+      expect(user1.user_stat.topic_count).to eq(1)
+      expect(user1.user_stat.post_count).to eq(1)
+      expect(user2.user_stat.topic_count).to eq(0)
+      expect(user2.user_stat.post_count).to eq(1)
+      PostDestroyer.new(Fabricate(:admin), post).destroy
+      user1.reload
+      user2.reload
+      expect(user1.user_stat.topic_count).to eq(0)
+      expect(user1.user_stat.post_count).to eq(0)
+      expect(user2.user_stat.topic_count).to eq(0)
+      expect(user2.user_stat.post_count).to eq(0)
+    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
+        reply = create_post(topic_id: post.topic_id, user: author)
 
         post_count = author.post_count
         history_count = UserHistory.count
 
-        PostDestroyer.new(moderator, post).destroy
+        PostDestroyer.new(moderator, reply).destroy
 
-        expect(post.deleted_at).to be_present
-        expect(post.deleted_by).to eq(moderator)
+        expect(reply.deleted_at).to be_present
+        expect(reply.deleted_by).to eq(moderator)
 
         author.reload
         expect(author.post_count).to eq(post_count - 1)
@@ -264,12 +323,38 @@ describe PostDestroyer do
         expect(post.deleted_by).to eq(admin)
       end
 
-      it "updates the user's post_count" do
+      it "updates the user's topic_count for first post" do
         author = post.user
         expect {
           PostDestroyer.new(admin, post).destroy
           author.reload
+        }.to change { author.topic_count }.by(-1)
+        expect(author.user_stat.post_count).to eq(0)
+      end
+
+      it "updates the user's post_count for reply" do
+        author = post.user
+        reply = create_post(topic: post.topic, user: author)
+        expect {
+          PostDestroyer.new(admin, reply).destroy
+          author.reload
         }.to change { author.post_count }.by(-1)
+        expect(author.user_stat.topic_count).to eq(1)
+      end
+
+      it "doesn't count whispers" do
+        user_stat = admin.user_stat
+        whisper = PostCreator.new(
+          admin,
+          topic_id: post.topic.id,
+          reply_to_post_number: 1,
+          post_type: Post.types[:whisper],
+          raw: 'this is a whispered reply'
+        ).create
+        expect(user_stat.reload.post_count).to eq(0)
+        expect {
+          PostDestroyer.new(admin, whisper).destroy
+        }.to_not change { user_stat.reload.post_count }
       end
     end
 
@@ -317,6 +402,7 @@ describe PostDestroyer do
 
   context "deleting a post belonging to a deleted topic" do
     let!(:topic) { post.topic }
+    let(:author) { post.user }
 
     before do
       topic.trash!(admin)
@@ -331,23 +417,65 @@ describe PostDestroyer do
       it "deletes the post" do
         expect(post.deleted_at).to be_present
         expect(post.deleted_by).to eq(moderator)
+        expect(author.user_stat.post_count).to eq(0)
       end
     end
 
     context "as an admin" do
-      before do
-        PostDestroyer.new(admin, post).destroy
-      end
+      subject { PostDestroyer.new(admin, post).destroy }
 
       it "deletes the post" do
+        subject
         expect(post.deleted_at).to be_present
         expect(post.deleted_by).to eq(admin)
       end
 
       it "creates a new user history entry" do
-        expect {
-          PostDestroyer.new(admin, post).destroy
-        }.to change { UserHistory.count}.by(1)
+        expect { subject }.to change { UserHistory.count }.by(1)
+      end
+    end
+  end
+
+  context "deleting a reply belonging to a deleted topic" do
+    let!(:topic) { post.topic }
+    let!(:reply) { create_post(topic_id: topic.id, user: post.user) }
+    let(:author) { reply.user }
+
+    before do
+      topic.trash!(admin)
+      post.reload
+      reply.reload
+    end
+
+    context "as a moderator" do
+      subject { PostDestroyer.new(moderator, reply).destroy }
+
+      it "deletes the reply" do
+        subject
+        expect(reply.deleted_at).to be_present
+        expect(reply.deleted_by).to eq(moderator)
+      end
+
+      it "doesn't decrement post_count again" do
+        expect { subject }.to_not change { author.user_stat.post_count }
+      end
+    end
+
+    context "as an admin" do
+      subject { PostDestroyer.new(admin, reply).destroy }
+
+      it "deletes the post" do
+        subject
+        expect(reply.deleted_at).to be_present
+        expect(reply.deleted_by).to eq(admin)
+      end
+
+      it "doesn't decrement post_count again" do
+        expect { subject }.to_not change { author.user_stat.post_count }
+      end
+
+      it "creates a new user history entry" do
+        expect { subject }.to change { UserHistory.count }.by(1)
       end
     end
   end
@@ -428,13 +556,11 @@ describe PostDestroyer do
     let(:second_post) { Fabricate(:post, topic_id: post.topic_id) }
 
     def create_user_action(action_type)
-      UserAction.log_action!({
-        action_type: action_type,
-        user_id: codinghorror.id,
-        acting_user_id: codinghorror.id,
-        target_topic_id: second_post.topic_id,
-        target_post_id: second_post.id
-      })
+      UserAction.log_action!(action_type: action_type,
+                             user_id: codinghorror.id,
+                             acting_user_id: codinghorror.id,
+                             target_topic_id: second_post.topic_id,
+                             target_post_id: second_post.id)
     end
 
     it "should delete the user actions" do
diff --git a/spec/components/post_merger_spec.rb b/spec/components/post_merger_spec.rb
index db866c092e..250712968a 100644
--- a/spec/components/post_merger_spec.rb
+++ b/spec/components/post_merger_spec.rb
@@ -15,9 +15,8 @@ describe PostMerger do
       reply3 = create_post(topic: topic, raw: 'The third reply', post_number: 4, user: user)
       replies = [reply3, reply2, reply1]
 
-      message = MessageBus.track_publish { PostMerger.new(admin, replies).merge }.last
+      message = MessageBus.track_publish("/topic/#{topic.id}") { PostMerger.new(admin, replies).merge }.last
 
-      expect(message.channel).to eq("/topic/#{topic.id}")
       expect(message.data[:type]).to eq(:revised)
       expect(message.data[:post_number]).to eq(reply3.post_number)
 
@@ -40,14 +39,14 @@ describe PostMerger do
       reply1 = create_post(topic: topic, post_number: post.post_number, user: user)
       reply2 = create_post(topic: topic, post_number: post.post_number, user: user)
 
-      expect{ PostMerger.new(admin, [reply2, post, reply1]).merge }.to raise_error(Discourse::InvalidAccess)
+      expect { PostMerger.new(admin, [reply2, post, reply1]).merge }.to raise_error(Discourse::InvalidAccess)
     end
 
     it "should only allow staff user to merge posts" do
       reply1 = create_post(topic: topic, post_number: post.post_number, user: user)
       reply2 = create_post(topic: topic, post_number: post.post_number, user: user)
 
-      expect{ PostMerger.new(user, [reply2, reply1]).merge }.to raise_error(Discourse::InvalidAccess)
+      expect { PostMerger.new(user, [reply2, reply1]).merge }.to raise_error(Discourse::InvalidAccess)
     end
 
     it "should not allow posts from different topics to be merged" do
@@ -67,4 +66,3 @@ describe PostMerger do
     end
   end
 end
-
diff --git a/spec/components/post_revisor_spec.rb b/spec/components/post_revisor_spec.rb
index 445c00ecd1..7f0f950add 100644
--- a/spec/components/post_revisor_spec.rb
+++ b/spec/components/post_revisor_spec.rb
@@ -65,7 +65,7 @@ describe PostRevisor do
     describe 'with the same body' do
       it "doesn't change version" do
         expect {
-          expect(subject.revise!(post.user, { raw: post.raw })).to eq(false)
+          expect(subject.revise!(post.user, raw: post.raw)).to eq(false)
           post.reload
         }.not_to change(post, :version)
       end
@@ -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
@@ -150,7 +150,7 @@ describe PostRevisor do
 
         context "after second window" do
 
-          let!(:new_revised_at) {revised_at + 2.minutes}
+          let!(:new_revised_at) { revised_at + 2.minutes }
 
           before do
             subject.revise!(post.user, { raw: 'yet another, another updated body' }, revised_at: new_revised_at)
@@ -185,7 +185,7 @@ describe PostRevisor do
 
       context "one paragraph description" do
         before do
-          subject.revise!(post.user, { raw: new_description })
+          subject.revise!(post.user, raw: new_description)
           category.reload
         end
 
@@ -200,7 +200,7 @@ describe PostRevisor do
 
       context "multiple paragraph description" do
         before do
-          subject.revise!(post.user, { raw: "#{new_description}\n\nOther content goes here." })
+          subject.revise!(post.user, raw: "#{new_description}\n\nOther content goes here.")
           category.reload
         end
 
@@ -213,10 +213,26 @@ 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')
-          subject.revise!(post.user, { raw: Category.post_template })
+          subject.revise!(post.user, raw: Category.post_template)
           category.reload
         end
 
@@ -236,7 +252,7 @@ describe PostRevisor do
 
       it "triggers a rate limiter" do
         EditRateLimiter.any_instance.expects(:performed!)
-        subject.revise!(changed_by, { raw: 'updated body' })
+        subject.revise!(changed_by, raw: 'updated body')
       end
     end
 
@@ -244,10 +260,10 @@ 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}" })
+        subject.revise!(changed_by, raw: "So, post them here!\n#{url}")
       end
 
       it "allows an admin to insert images into a new user's post" do
@@ -262,10 +278,10 @@ 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}" })
+        subject.revise!(post.user, raw: "So, post them here!\n#{url}")
       end
 
       it "doesn't allow images to be inserted" do
@@ -274,10 +290,9 @@ describe PostRevisor do
 
     end
 
-
     describe 'with a new body' do
       let(:changed_by) { Fabricate(:coding_horror) }
-      let!(:result) { subject.revise!(changed_by, { raw: "lets update the body. Здравствуйте" }) }
+      let!(:result) { subject.revise!(changed_by, raw: "lets update the body. Здравствуйте") }
 
       it 'returns true' do
         expect(result).to eq(true)
@@ -312,7 +327,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,8 +341,8 @@ describe PostRevisor do
 
       context 'passing skip_revision as true' do
         before do
-          SiteSetting.stubs(:editing_grace_period).returns(1.minute.to_i)
-          subject.revise!(changed_by, { raw: 'yet another updated body' }, { revised_at: post.updated_at + 10.hours, skip_revision: true })
+          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
 
@@ -349,14 +364,14 @@ describe PostRevisor do
         }.to change { topic.excerpt }
         second_post = Fabricate(:post, post_args.merge(post_number: 2, topic_id: topic.id))
         expect {
-          described_class.new(second_post).revise!(second_post.user, { raw: 'Edit the 2nd post' })
+          described_class.new(second_post).revise!(second_post.user, raw: 'Edit the 2nd post')
           topic.reload
         }.to_not change { topic.excerpt }
       end
     end
 
     it "doesn't strip starting whitespaces" do
-      subject.revise!(post.user, { raw: "    <-- whitespaces -->    " })
+      subject.revise!(post.user, raw: "    <-- whitespaces -->    ")
       post.reload
       expect(post.raw).to eq("    <-- whitespaces -->")
     end
@@ -367,11 +382,10 @@ describe PostRevisor do
       it "should publish topic changes to clients" do
         revisor = described_class.new(topic.ordered_posts.first, topic)
 
-        messages = MessageBus.track_publish do
-          revisor.revise!(newuser, { title: 'this is a test topic' })
-        end
+        message = MessageBus.track_publish("/topic/#{topic.id}") do
+          revisor.revise!(newuser, title: 'this is a test topic')
+        end.first
 
-        message = messages.find { |m| m.channel == "/topic/#{topic.id}" }
         payload = message.data
         expect(payload[:reload_topic]).to eq(true)
       end
@@ -384,7 +398,7 @@ describe PostRevisor do
         end
 
         it "doesn't add the tags" do
-          result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: ['totally', 'update'] })
+          result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags: ['totally', 'update'])
           expect(result).to eq(true)
           post.reload
           expect(post.topic.tags.size).to eq(0)
@@ -404,7 +418,7 @@ describe PostRevisor do
 
           it "can create all tags if none exist" do
             expect {
-              @result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: ['totally', 'update'] })
+              @result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags: ['totally', 'update'])
             }.to change { Tag.count }.by(2)
             expect(@result).to eq(true)
             post.reload
@@ -414,7 +428,7 @@ describe PostRevisor do
           it "creates missing tags if some exist" do
             Fabricate(:tag, name: 'totally')
             expect {
-              @result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: ['totally', 'update'] })
+              @result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags: ['totally', 'update'])
             }.to change { Tag.count }.by(1)
             expect(@result).to eq(true)
             post.reload
@@ -423,7 +437,7 @@ describe PostRevisor do
 
           it "can remove all tags" do
             topic.tags = [Fabricate(:tag, name: "super"), Fabricate(:tag, name: "stuff")]
-            result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: [] })
+            result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags: [])
             expect(result).to eq(true)
             post.reload
             expect(post.topic.tags.size).to eq(0)
@@ -431,7 +445,7 @@ describe PostRevisor do
 
           it "can remove all tags using tags_empty_array" do
             topic.tags = [Fabricate(:tag, name: "stuff")]
-            result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags_empty_array: "true" })
+            result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags_empty_array: "true")
             expect(result).to eq(true)
             post.reload
             expect(post.topic.tags.size).to eq(0)
@@ -439,14 +453,14 @@ describe PostRevisor do
 
           it "can't add staff-only tags" do
             SiteSetting.staff_tags = "important"
-            result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: ['important', 'stuff'] })
+            result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags: ['important', 'stuff'])
             expect(result).to eq(false)
             expect(post.topic.errors.present?).to eq(true)
           end
 
           it "staff can add staff-only tags" do
             SiteSetting.staff_tags = "important"
-            result = subject.revise!(Fabricate(:admin), { raw: "lets totally update the body", tags: ['important', 'stuff'] })
+            result = subject.revise!(Fabricate(:admin), raw: "lets totally update the body", tags: ['important', 'stuff'])
             expect(result).to eq(true)
             post.reload
             expect(post.topic.tags.map(&:name).sort).to eq(['important', 'stuff'])
@@ -460,7 +474,7 @@ describe PostRevisor do
             end
 
             it "staff-only tags can't be removed" do
-              result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: ['stuff'] })
+              result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags: ['stuff'])
               expect(result).to eq(false)
               expect(post.topic.errors.present?).to eq(true)
               post.reload
@@ -468,7 +482,7 @@ describe PostRevisor do
             end
 
             it "can't remove all tags if some are staff-only" do
-              result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: [] })
+              result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags: [])
               expect(result).to eq(false)
               expect(post.topic.errors.present?).to eq(true)
               post.reload
@@ -476,14 +490,14 @@ describe PostRevisor do
             end
 
             it "staff-only tags can be removed by staff" do
-              result = subject.revise!(Fabricate(:admin), { raw: "lets totally update the body", tags: ['stuff'] })
+              result = subject.revise!(Fabricate(:admin), raw: "lets totally update the body", tags: ['stuff'])
               expect(result).to eq(true)
               post.reload
               expect(post.topic.tags.map(&:name)).to eq(['stuff'])
             end
 
             it "staff can remove all tags" do
-              result = subject.revise!(Fabricate(:admin), { raw: "lets totally update the body", tags: [] })
+              result = subject.revise!(Fabricate(:admin), raw: "lets totally update the body", tags: [])
               expect(result).to eq(true)
               post.reload
               expect(post.topic.tags.size).to eq(0)
@@ -501,7 +515,7 @@ describe PostRevisor do
           it "only uses existing tags" do
             Fabricate(:tag, name: 'totally')
             expect {
-              @result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: ['totally', 'update'] })
+              @result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags: ['totally', 'update'])
             }.to_not change { Tag.count }
             expect(@result).to eq(true)
             post.reload
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index 8b0dfae4e9..d02683bee8 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) {  }
+  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,214 @@ 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>"
+        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
+
+    describe "with primary user group" do
+      let(:default_avatar) { "//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/{size}.png" }
+      let(:group) { Fabricate(:group) }
+      let!(:user) { Fabricate(:user, primary_group: group) }
+
+      before do
+        User.stubs(:default_template).returns(default_avatar)
       end
 
+      it "adds primary group class to referenced users quote" do
+
+        topic = Fabricate(:topic, title: "this is a test topic")
+        expected = <<~HTML
+          <aside class="quote group-#{group.name}" data-topic="#{topic.id}" data-post="2">
+          <div class="title">
+            <div class="quote-controls"></div>
+            <img alt class='avatar' height='20' src='//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png' width='20'><a href='http://test.localhost/t/this-is-a-test-topic/#{topic.id}/2'>This is a test topic</a>
+          </div>
+          <blockquote>
+            <p>ddd</p>
+          </blockquote>
+          </aside>
+        HTML
+
+        expect(cook("[quote=\"#{user.username}, post:2, topic:#{topic.id}\"]\nddd\n[/quote]", topic_id: 1)).to eq(n(expected))
+      end
     end
 
+    it "can handle inline block bbcode" do
+      cooked = PrettyText.cook("[quote]te **s** t[/quote]")
+
+      html = <<~HTML
+        <aside class="quote">
+        <blockquote>
+        <p>te <strong>s</strong> t</p>
+        </blockquote>
+        </aside>
+      HTML
+
+      expect(cooked).to eq(html.strip)
+    end
+
+    it "handles bbcode edge cases" do
+      expect(PrettyText.cook "[constructor]\ntest").to eq("<p>[constructor]<br>\ntest</p>")
+    end
+
+    it "can handle quote edge cases" do
+      expect(PrettyText.cook("[quote]abc\ntest\n[/quote]")).not_to include('aside')
+      expect(PrettyText.cook("[quote]  \ntest\n[/quote]  ")).to include('aside')
+      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]\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 "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("<a> @inner</a> ")).to match_html '<p><a> @inner</a></p>'
+    end
+
+    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 +245,66 @@ 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
+      begin
+        ['apple', 'banana'].each { |w| Fabricate(:watched_word, word: w, action: WatchedWord.actions[:censor]) }
+        expect(PrettyText.cook("# banana")).not_to include('banana')
+      ensure
+        $redis.flushall
+      end
+    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
@@ -121,7 +353,7 @@ HTML
     context "images" do
 
       it "should dump images" do
-        expect(PrettyText.excerpt("<img src='http://cnn.com/a.gif'>",100)).to eq("[image]")
+        expect(PrettyText.excerpt("<img src='http://cnn.com/a.gif'>", 100)).to eq("[image]")
       end
 
       context 'alt tags' do
@@ -157,38 +389,59 @@ HTML
         expect(PrettyText.excerpt("<span class='spoiler'>spoiler</div>", 100)).to match_html "<span class='spoiler'>spoiler</span>"
       end
 
+      it "should keep details if too long" do
+        expect(PrettyText.excerpt("<details><summary>expand</summary><p>hello</p></details>", 30)).to match_html "<details class='disabled'><summary>expand</summary></details>"
+      end
+
+      it "doesn't disable details if short enough" do
+        expect(PrettyText.excerpt("<details><summary>expand</summary><p>hello</p></details>", 60)).to match_html "<details><summary>expand</summary>hello</details>"
+      end
+
       it "should remove meta informations" do
         expect(PrettyText.excerpt(wrapped_image, 100)).to match_html "<a href='//localhost:3000/uploads/default/4399/33691397e78b4d75.png' class='lightbox' title='Screen Shot 2014-04-14 at 9.47.10 PM.png'>[image]</a>"
       end
+
+      it "should strip images when option is set" do
+        expect(PrettyText.excerpt("<img src='http://cnn.com/a.gif'>", 100, strip_images: true)).to be_blank
+        expect(PrettyText.excerpt("<img src='http://cnn.com/a.gif'> Hello world!", 100, strip_images: true)).to eq("Hello world!")
+      end
+
+      it "should strip images, but keep emojis when option is set" do
+        emoji_image = "<img src='/images/emoji/twitter/heart.png?v=1' title=':heart:' class='emoji' alt='heart'>"
+        html = "<img src='http://cnn.com/a.gif'> Hello world #{emoji_image}"
+
+        expect(PrettyText.excerpt(html, 100, strip_images: true)).to eq("Hello world heart")
+        expect(PrettyText.excerpt(html, 100, strip_images: true, keep_emoji_images: true)).to match_html("Hello world #{emoji_image}")
+      end
     end
 
     it "should have an option to strip links" do
-      expect(PrettyText.excerpt("<a href='http://cnn.com'>cnn</a>",100, strip_links: true)).to eq("cnn")
+      expect(PrettyText.excerpt("<a href='http://cnn.com'>cnn</a>", 100, strip_links: true)).to eq("cnn")
     end
 
     it "should preserve links" do
-      expect(PrettyText.excerpt("<a href='http://cnn.com'>cnn</a>",100)).to match_html "<a href='http://cnn.com'>cnn</a>"
+      expect(PrettyText.excerpt("<a href='http://cnn.com'>cnn</a>", 100)).to match_html "<a href='http://cnn.com'>cnn</a>"
     end
 
     it "should deal with special keys properly" do
-      expect(PrettyText.excerpt("<pre><b></pre>",100)).to eq("")
+      expect(PrettyText.excerpt("<pre><b></pre>", 100)).to eq("")
     end
 
     it "should truncate stuff properly" do
-      expect(PrettyText.excerpt("hello world",5)).to eq("hello&hellip;")
-      expect(PrettyText.excerpt("<p>hello</p><p>world</p>",6)).to eq("hello w&hellip;")
+      expect(PrettyText.excerpt("hello world", 5)).to eq("hello&hellip;")
+      expect(PrettyText.excerpt("<p>hello</p><p>world</p>", 6)).to eq("hello w&hellip;")
     end
 
     it "should insert a space between to Ps" do
-      expect(PrettyText.excerpt("<p>a</p><p>b</p>",5)).to eq("a b")
+      expect(PrettyText.excerpt("<p>a</p><p>b</p>", 5)).to eq("a b")
     end
 
     it "should strip quotes" do
-      expect(PrettyText.excerpt("<aside class='quote'><p>a</p><p>b</p></aside>boom",5)).to eq("boom")
+      expect(PrettyText.excerpt("<aside class='quote'><p>a</p><p>b</p></aside>boom", 5)).to eq("boom")
     end
 
     it "should not count the surrounds of a link" do
-      expect(PrettyText.excerpt("<a href='http://cnn.com'>cnn</a>",3)).to match_html "<a href='http://cnn.com'>cnn</a>"
+      expect(PrettyText.excerpt("<a href='http://cnn.com'>cnn</a>", 3)).to match_html "<a href='http://cnn.com'>cnn</a>"
     end
 
     it "uses an ellipsis instead of html entities if provided with the option" do
@@ -196,7 +449,7 @@ HTML
     end
 
     it "should truncate links" do
-      expect(PrettyText.excerpt("<a href='http://cnn.com'>cnn</a>",2)).to match_html "<a href='http://cnn.com'>cn&hellip;</a>"
+      expect(PrettyText.excerpt("<a href='http://cnn.com'>cnn</a>", 2)).to match_html "<a href='http://cnn.com'>cn&hellip;</a>"
     end
 
     it "doesn't extract empty quotes as links" do
@@ -249,22 +502,22 @@ HTML
     end
 
     it "should not preserve tags in code blocks" do
-      expect(PrettyText.excerpt("<pre><code class='handlebars'>&lt;h3&gt;Hours&lt;/h3&gt;</code></pre>",100)).to eq("&lt;h3&gt;Hours&lt;/h3&gt;")
+      expect(PrettyText.excerpt("<pre><code class='handlebars'>&lt;h3&gt;Hours&lt;/h3&gt;</code></pre>", 100)).to eq("&lt;h3&gt;Hours&lt;/h3&gt;")
     end
 
     it "should handle nil" do
-      expect(PrettyText.excerpt(nil,100)).to eq('')
+      expect(PrettyText.excerpt(nil, 100)).to eq('')
     end
 
     it "handles span excerpt at the beginning of a post" do
-      expect(PrettyText.excerpt("<span class='excerpt'>hi</span> test",100)).to eq('hi')
+      expect(PrettyText.excerpt("<span class='excerpt'>hi</span> test", 100)).to eq('hi')
       post = Fabricate(:post, raw: "<span class='excerpt'>hi</span> test")
       expect(post.excerpt).to eq("hi")
     end
 
     it "ignores max excerpt length if a span excerpt is specified" do
       two_hundred = "123456789 " * 20 + "."
-      text =  two_hundred + "<span class='excerpt'>#{two_hundred}</span>" + two_hundred
+      text = two_hundred + "<span class='excerpt'>#{two_hundred}</span>" + two_hundred
       expect(PrettyText.excerpt(text, 100)).to eq(two_hundred)
       post = Fabricate(:post, raw: text)
       expect(post.excerpt).to eq(two_hundred)
@@ -275,21 +528,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'>"
-      expect(PrettyText.excerpt(emoji_image, 100, { keep_emoji_images: true })).to match_html(emoji_image)
+      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:'> "
-      expect(PrettyText.excerpt(emoji_image, 100, { remap_emoji: true })).to match_html("I ❤  you :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 +560,6 @@ HTML
         )).to eq("boom")
       end
     end
-
   end
 
   describe "strip links" do
@@ -379,56 +631,100 @@ 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
+  describe 's3_cdn' do
 
-  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
+    def test_s3_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'>
+      HTML
 
-  it 'can substitute s3 cdn correctly' do
-    SiteSetting.enable_s3_uploads = true
-    SiteSetting.s3_access_key_id = "XXX"
-    SiteSetting.s3_secret_access_key = "XXX"
-    SiteSetting.s3_upload_bucket = "test"
-    SiteSetting.s3_cdn_url = "https://awesome.cdn"
+      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
 
-    # 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'>
-
-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)
+      expect(PrettyText.cook(raw)).to eq(html.strip)
     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("")
+    before do
+      GlobalSetting.reset_s3_cache!
+    end
+
+    after do
+      GlobalSetting.reset_s3_cache!
+    end
+
+    it 'can substitute s3 cdn when added via global setting' do
+
+      global_setting :s3_access_key_id, 'XXX'
+      global_setting :s3_secret_access_key, 'XXX'
+      global_setting :s3_bucket, 'XXX'
+      global_setting :s3_region, 'XXX'
+      global_setting :s3_cdn_url, 'https://awesome.cdn'
+
+      test_s3_cdn
+    end
+
+    it 'can substitute s3 cdn correctly' do
+      SiteSetting.s3_access_key_id = "XXX"
+      SiteSetting.s3_secret_access_key = "XXX"
+      SiteSetting.s3_upload_bucket = "test"
+      SiteSetting.s3_cdn_url = "https://awesome.cdn"
+
+      SiteSetting.enable_s3_uploads = true
+
+      test_s3_cdn
     end
   end
 
@@ -441,10 +737,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 +745,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 +772,444 @@ 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 hashtag links" do
+    category = Fabricate(:category, name: 'testing')
+    category2 = Fabricate(:category, name: 'known')
+    Fabricate(:topic, tags: [Fabricate(:tag, name: 'known')])
+
+    cooked = PrettyText.cook(" #unknown::tag #known #known::tag #testing")
+
+    [
+      "<span class=\"hashtag\">#unknown::tag</span>",
+      "<a class=\"hashtag\" href=\"#{category2.url_with_id}\">#<span>known</span></a>",
+      "<a class=\"hashtag\" href=\"http://test.localhost/tags/known\">#<span>known</span></a>",
+      "<a class=\"hashtag\" href=\"#{category.url_with_id}\">#<span>testing</span></a>"
+    ].each do |element|
+
+      expect(cooked).to include(element)
+    end
+
+    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
+    begin
+      ['apple', 'banana'].each { |w| Fabricate(:watched_word, word: w, action: WatchedWord.actions[:censor]) }
+      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")
+    ensure
+      $redis.flushall
+    end
+  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 'handles mini onebox' do
+    SiteSetting.enable_inline_onebox_on_all_domains = true
+    InlineOneboxer.purge("http://cnn.com/a")
+
+    stub_request(:head, "http://cnn.com/a").to_return(status: 200)
+
+    stub_request(:get, "http://cnn.com/a").
+      to_return(status: 200, body: "<html><head><title>news</title></head></html>", headers: {})
+
+    expect(PrettyText.cook("- http://cnn.com/a\n- a http://cnn.com/a").split("news").length).to eq(3)
+    expect(PrettyText.cook("- http://cnn.com/a\n    - a http://cnn.com/a").split("news").length).to eq(3)
+  end
+
+  it 'handles mini onebox with query param' do
+    SiteSetting.enable_inline_onebox_on_all_domains = true
+    InlineOneboxer.purge("http://cnn.com?a")
+
+    stub_request(:head, "http://cnn.com?a").to_return(status: 200)
+
+    stub_request(:get, "http://cnn.com?a").
+      to_return(status: 200, body: "<html><head><title>news</title></head></html>", headers: {})
+
+    expect(PrettyText.cook("- http://cnn.com?a\n- a http://cnn.com?a").split("news").length).to eq(3)
+    expect(PrettyText.cook("- http://cnn.com?a\n    - a http://cnn.com?a").split("news").length).to eq(3)
+  end
+
+  it 'skips mini onebox for primary domain' do
+
+    # we only include mini onebox if there is something in path or query params
+
+    SiteSetting.enable_inline_onebox_on_all_domains = true
+    InlineOneboxer.purge("http://cnn.com/")
+
+    stub_request(:head, "http://cnn.com/").to_return(status: 200)
+    stub_request(:get, "http://cnn.com/").
+      to_return(status: 200, body: "<html><head><title>news</title></head></html>", headers: {})
+
+    expect(PrettyText.cook("- http://cnn.com/\n- a http://cnn.com/").split("news").length).to eq(1)
+    expect(PrettyText.cook("- cnn.com\n    - a http://cnn.com/").split("news").length).to eq(1)
+  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
+      <div class="md-table">
+      <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>
+      </div>
+    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
+
+    it "allows whitespace before the percent scaler" do
+      cooked = PrettyText.cook <<~MD
+        ![|220x100, 50%](http://png.com/my.png)
+        ![|220x100 , 50%](http://png.com/my.png)
+        ![|220x100 ,50%](http://png.com/my.png)
+      MD
+
+      html = <<~HTML
+        <p><img src="http://png.com/my.png" alt width="110" height="50"><br>
+        <img src="http://png.com/my.png" alt width="110" height="50"><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
+
+  describe "image decoding" do
+
+    it "can decode upload:// for default setup" do
+      upload = Fabricate(:upload)
+
+      raw = <<~RAW
+      ![upload](#{upload.short_url})
+
+      - ![upload](#{upload.short_url})
+
+      - test
+          - ![upload](#{upload.short_url})
+      RAW
+
+      cooked = <<~HTML
+        <p><img src="#{upload.url}" alt="upload"></p>
+        <ul>
+        <li>
+        <p><img src="#{upload.url}" alt="upload"></p>
+        </li>
+        <li>
+        <p>test</p>
+        <ul>
+        <li><img src="#{upload.url}" alt="upload"></li>
+        </ul>
+        </li>
+        </ul>
+      HTML
+
+      expect(PrettyText.cook(raw)).to eq(cooked.strip)
+    end
+
+    it "can place a blank image if we can not find the upload" do
+
+      raw = "![upload](upload://abcABC.png)"
+
+      cooked = <<~HTML
+        <p><img src="/images/transparent.png" alt="upload" data-orig-src="upload://abcABC.png"></p>
+      HTML
+
+      expect(PrettyText.cook(raw)).to eq(cooked.strip)
+    end
+
+  end
+
+  it "can properly whitelist iframes" do
+    SiteSetting.allowed_iframes = "https://bob.com/a|http://silly.com?EMBED="
+    raw = <<~IFRAMES
+      <iframe src='https://www.google.com/maps/Embed?testing'></iframe>
+      <iframe src='https://bob.com/a?testing'></iframe>
+      <iframe src='HTTP://SILLY.COM?EMBED=111'></iframe>
+    IFRAMES
+
+    # we require explicit HTTPS here
+    html = <<~IFRAMES
+      <iframe src="https://bob.com/a?testing"></iframe>
+      <iframe src="HTTP://SILLY.COM?EMBED=111"></iframe>
+    IFRAMES
+
+    cooked = PrettyText.cook(raw).strip
+
+    expect(cooked).to eq(html.strip)
+
+  end
+
 end
diff --git a/spec/components/promotion_spec.rb b/spec/components/promotion_spec.rb
index d15ace0d4b..716e4b1684 100644
--- a/spec/components/promotion_spec.rb
+++ b/spec/components/promotion_spec.rb
@@ -15,7 +15,7 @@ describe Promotion do
 
   context "newuser" do
 
-    let(:user) { Fabricate(:user, trust_level: TrustLevel[0], created_at: 2.days.ago)}
+    let(:user) { Fabricate(:user, trust_level: TrustLevel[0], created_at: 2.days.ago) }
     let(:promotion) { Promotion.new(user) }
 
     it "doesn't raise an error with a nil user" do
@@ -70,7 +70,7 @@ describe Promotion do
 
   context "basic" do
 
-    let(:user) { Fabricate(:user, trust_level: TrustLevel[1], created_at: 2.days.ago)}
+    let(:user) { Fabricate(:user, trust_level: TrustLevel[1], created_at: 2.days.ago) }
     let(:promotion) { Promotion.new(user) }
 
     context 'that has done nothing' do
@@ -131,7 +131,7 @@ describe Promotion do
   end
 
   context "regular" do
-    let(:user) { Fabricate(:user, trust_level: TrustLevel[2])}
+    let(:user) { Fabricate(:user, trust_level: TrustLevel[2]) }
     let(:promotion) { Promotion.new(user) }
 
     context "doesn't qualify for promotion" do
diff --git a/spec/components/rate_limiter_spec.rb b/spec/components/rate_limiter_spec.rb
index 1cf43b11c9..ce9bed2a11 100644
--- a/spec/components/rate_limiter_spec.rb
+++ b/spec/components/rate_limiter_spec.rb
@@ -8,11 +8,14 @@ describe RateLimiter do
 
   context 'disabled' do
     before do
-      RateLimiter.stubs(:disabled?).returns(true)
       rate_limiter.performed!
       rate_limiter.performed!
     end
 
+    it "should be disabled" do
+      expect(RateLimiter.disabled?).to eq(true)
+    end
+
     it "returns true for can_perform?" do
       expect(rate_limiter.can_perform?).to eq(true)
     end
@@ -25,10 +28,51 @@ describe RateLimiter do
 
   context 'enabled' do
     before do
-      RateLimiter.stubs(:disabled?).returns(false)
+      RateLimiter.enable
       rate_limiter.clear!
     end
 
+    after do
+      RateLimiter.disable
+    end
+
+    context 'global rate limiter' do
+
+      it 'can operate in global mode' do
+        limiter = RateLimiter.new(nil, "test", 2, 30, global: true)
+        limiter.clear!
+
+        thrown = false
+
+        limiter.performed!
+        limiter.performed!
+        begin
+          limiter.performed!
+        rescue RateLimiter::LimitExceeded => e
+          expect(Integer === e.available_in).to eq(true)
+          expect(e.available_in).to be > 28
+          expect(e.available_in).to be < 32
+          thrown = true
+        end
+        expect(thrown).to be(true)
+      end
+
+    end
+
+    context 'handles readonly' do
+      before do
+        $redis.without_namespace.slaveof '10.0.0.1', '99999'
+      end
+
+      after do
+        $redis.without_namespace.slaveof 'no', 'one'
+      end
+
+      it 'does not explode' do
+        expect { rate_limiter.performed! }.not_to raise_error
+      end
+    end
+
     context 'never done' do
       it "should perform right away" do
         expect(rate_limiter.can_perform?).to eq(true)
diff --git a/spec/components/retrieve_title_spec.rb b/spec/components/retrieve_title_spec.rb
new file mode 100644
index 0000000000..09edb28eae
--- /dev/null
+++ b/spec/components/retrieve_title_spec.rb
@@ -0,0 +1,60 @@
+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 pick og:title if title is missing" do
+      title = RetrieveTitle.extract_title(<<~HTML
+        <html>
+          <meta property="og:title" content="Good Title"
+        </html>
+        HTML
+      )
+
+      expect(title).to eq("Good Title")
+    end
+
+    it "will prefer the title from an opengraph tag" do
+      title = RetrieveTitle.extract_title(<<~HTML
+        <html>
+          <title>Good Title</title>
+          <meta property="og:title" content="Bad Title"
+        </html>
+        HTML
+      )
+
+      expect(title).to eq("Good Title")
+    end
+
+    it "will parse a YouTube url from javascript" do
+      title = RetrieveTitle.extract_title(<<~HTML
+        <html>
+          <title>YouTube</title>
+          <script>document.title = "Video Title";</script>
+        </html>
+        HTML
+      )
+      expect(title).to eq("Video Title")
+    end
+
+  end
+
+end
diff --git a/spec/components/rtl_spec.rb b/spec/components/rtl_spec.rb
new file mode 100644
index 0000000000..4cc776d26b
--- /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/s3_helper_spec.rb b/spec/components/s3_helper_spec.rb
index 0ee326b65b..412f0805e2 100644
--- a/spec/components/s3_helper_spec.rb
+++ b/spec/components/s3_helper_spec.rb
@@ -3,6 +3,54 @@ require "rails_helper"
 
 describe "S3Helper" do
 
-  # we should test something here, perhaps in a smoke test that uploads a real image
-  # to s3
+  it "can correctly set the purge policy" do
+
+    stub_request(:get, "http://169.254.169.254/latest/meta-data/iam/security-credentials/").
+      to_return(status: 404, body: "", headers: {})
+
+    lifecycle = <<~XML
+      <?xml version="1.0" encoding="UTF-8"?>
+      <LifecycleConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
+        <Rule>
+            <ID>old_rule</ID>
+            <Prefix>projectdocs/</Prefix>
+            <Status>Enabled</Status>
+            <Expiration>
+               <Days>3650</Days>
+            </Expiration>
+        </Rule>
+        <Rule>
+            <ID>purge-tombstone</ID>
+            <Prefix>test/</Prefix>
+            <Status>Enabled</Status>
+            <Expiration>
+               <Days>3650</Days>
+            </Expiration>
+        </Rule>
+      </LifecycleConfiguration>
+    XML
+
+    stub_request(:get, "https://bob.s3.amazonaws.com/?lifecycle").
+      to_return(status: 200, body: lifecycle, headers: {})
+
+    stub_request(:put, "https://bob.s3.amazonaws.com/?lifecycle").
+      with do |req|
+
+      hash = Hash.from_xml(req.body.to_s)
+      rules = hash["LifecycleConfiguration"]["Rule"]
+
+      expect(rules.length).to eq(2)
+
+      # fixes the bad filter
+      expect(rules[0]["Filter"]["Prefix"]).to eq("projectdocs/")
+    end.to_return(status: 200, body: "", headers: {})
+
+    SiteSetting.enable_s3_uploads = true
+    SiteSetting.s3_access_key_id = "abc"
+    SiteSetting.s3_secret_access_key = "def"
+
+    helper = S3Helper.new('bob', 'tomb')
+    helper.update_tombstone_lifecycle(100)
+  end
+
 end
diff --git a/spec/components/scheduler/defer_spec.rb b/spec/components/scheduler/defer_spec.rb
index 49fbde58c7..e7f57315e6 100644
--- a/spec/components/scheduler/defer_spec.rb
+++ b/spec/components/scheduler/defer_spec.rb
@@ -31,13 +31,14 @@ describe Scheduler::Defer do
       x = 2
     end
 
+    expect(@defer.length).to eq(1)
+
     @defer.do_all_work
 
     expect(x).to eq(2)
 
     @defer.resume
 
-
     @defer.later do
       x = 3
     end
diff --git a/spec/components/scheduler/manager_spec.rb b/spec/components/scheduler/manager_spec.rb
index 3dc699a1f6..6ae829c558 100644
--- a/spec/components/scheduler/manager_spec.rb
+++ b/spec/components/scheduler/manager_spec.rb
@@ -19,7 +19,7 @@ describe Scheduler::Manager do
       every 5.minutes
 
       def perform
-        self.class.runs+=1
+        self.class.runs += 1
         sleep 0.001
       end
     end
@@ -58,20 +58,10 @@ 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
+    @thread_ids = Thread.list.map { |t| t.object_id }
   end
 
   after do
@@ -80,13 +70,55 @@ describe Scheduler::Manager do
     manager.remove(Testing::SuperLongJob)
     manager.remove(Testing::PerHostJob)
     $redis.flushall
+
+    # 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 (be <= 1)
+
+    on_thread_mismatch = lambda do
+      current = Thread.list.map { |t| t.object_id }
+
+      extra = current - @thread_ids
+      missing = @thread_ids - current
+
+      if missing.length > 0
+        STDERR.puts "\nMissing Threads #{missing.length} thread/s"
+      end
+
+      if extra.length > 0
+        Thread.list.each do |thread|
+          if extra.include?(thread.object_id)
+            STDERR.puts "\nExtra Thread Backtrace:"
+            STDERR.puts thread.backtrace
+            STDERR.puts
+          end
+        end
+      end
+    end
+
+    wait_for(on_fail: on_thread_mismatch) 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
     it "correctly schedules on multiple hosts" do
       Testing::PerHostJob.runs = 0
 
-      hosts = ['a','b','c']
+      hosts = ['a', 'b', 'c']
 
       hosts.map do |host|
 
@@ -105,9 +137,7 @@ describe Scheduler::Manager do
         manager.stop!
 
       end
-
       expect(Testing::PerHostJob.runs).to eq(3)
-
     end
   end
 
@@ -126,7 +156,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 +172,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 9b956c73ac..75fc3bc1bb 100644
--- a/spec/components/scheduler/schedule_info_spec.rb
+++ b/spec/components/scheduler/schedule_info_spec.rb
@@ -4,7 +4,7 @@ require 'scheduler/scheduler'
 
 describe Scheduler::ScheduleInfo do
 
-  let(:manager){ Scheduler::Manager.new }
+  let(:manager) { Scheduler::Manager.new }
 
   context "every" do
     class RandomJob
@@ -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 d215c8835c..16cdae30a2 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -60,6 +60,28 @@ 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 'replaces curly quotes to regular quotes in search terms' do
+    term = '“discourse”'
+
+    expect(term == '"discourse"').to eq(false)
+
+    search = Search.new(term)
+    expect(search.valid?).to eq(true)
+    expect(search.term).to eq('"discourse"')
+    expect(search.clean_term).to eq('"discourse"')
+  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 +132,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)
@@ -155,12 +177,10 @@ describe Search do
     let(:reply) { Fabricate(:post, topic: topic,
                                    raw: 'hello from mars, we just landed') }
 
-
-
     it 'searches correctly' do
 
       expect do
-       Search.execute('mars', type_filter: 'private_messages')
+        Search.execute('mars', type_filter: 'private_messages')
       end.to raise_error(Discourse::InvalidAccess)
 
       TopicAllowedUser.create!(user_id: reply.user_id, topic_id: topic.id)
@@ -172,7 +192,6 @@ describe Search do
 
       expect(results.posts.length).to eq(1)
 
-
       results = Search.execute('mars',
                               search_context: topic,
                               guardian: Guardian.new(reply.user))
@@ -189,7 +208,6 @@ describe Search do
       Fabricate(:topic, category_id: nil, archetype: 'private_message')
       Fabricate(:post, topic: topic, raw: 'another secret pm from mars, testing')
 
-
       # admin can search everything with correct context
       results = Search.execute('mars',
                               type_filter: 'private_messages',
@@ -224,8 +242,7 @@ describe Search do
 
   context 'topics' do
     let(:post) { Fabricate(:post) }
-    let(:topic) { post.topic}
-
+    let(:topic) { post.topic }
 
     context 'search within topic' do
 
@@ -300,7 +317,7 @@ describe Search do
     end
 
     context "search for a topic by url" do
-      let(:result) { Search.execute(topic.relative_url, search_for_id: true, type_filter: 'topic')}
+      let(:result) { Search.execute(topic.relative_url, search_for_id: true, type_filter: 'topic') }
 
       it 'returns the topic' do
         expect(result.posts.length).to eq(1)
@@ -320,7 +337,7 @@ describe Search do
         topic.category_id = category.id
         topic.save
 
-        category.set_permissions(:staff => :full)
+        category.set_permissions(staff: :full)
         category.save
 
         expect(result(nil).posts).not_to be_present
@@ -334,11 +351,11 @@ describe Search do
 
   context 'cyrillic topic' do
     let!(:cyrillic_topic) { Fabricate(:topic) do
-                                                user
+                              user
                                                 title { sequence(:title) { |i| "Тестовая запись #{i}" } }
-                                              end
+                            end
     }
-    let!(:post) {Fabricate(:post, topic: cyrillic_topic, user: cyrillic_topic.user)}
+    let!(:post) { Fabricate(:post, topic: cyrillic_topic, user: cyrillic_topic.user) }
     let(:result) { Search.execute('запись') }
 
     it 'finds something when given cyrillic query' do
@@ -369,13 +386,56 @@ describe Search do
 
   end
 
+  context 'tags' do
+    def search
+      Search.execute(tag.name)
+    end
+
+    let!(:tag) { Fabricate(:tag) }
+    let(:tag_group) { Fabricate(:tag_group) }
+    let(:category) { Fabricate(:category) }
+
+    context 'tagging is disabled' do
+      before { SiteSetting.tagging_enabled = false }
+
+      it 'does not include tags' do
+        expect(search.tags).to_not be_present
+      end
+    end
+
+    context 'tagging is enabled' do
+      before { SiteSetting.tagging_enabled = true }
+
+      it 'returns the tag in the result' do
+        expect(search.tags).to eq([tag])
+      end
+
+      it 'shows staff tags' do
+        staff_tag = Fabricate(:tag, name: "#{tag.name}9")
+        SiteSetting.staff_tags = "#{staff_tag.name}"
+
+        expect(Search.execute(tag.name, guardian: Guardian.new(Fabricate(:admin))).tags).to contain_exactly(tag, staff_tag)
+        expect(search.tags).to contain_exactly(tag, staff_tag)
+      end
+
+      it 'includes category-restricted tags' do
+        category_tag = Fabricate(:tag, name: "#{tag.name}9")
+        tag_group.tags = [category_tag]
+        category.set_permissions(admins: :full)
+        category.allowed_tag_groups = [tag_group.name]
+        category.save!
+
+        expect(Search.execute(tag.name, guardian: Guardian.new(Fabricate(:admin))).tags).to contain_exactly(tag, category_tag)
+        expect(search.tags).to contain_exactly(tag, category_tag)
+      end
+    end
+  end
 
   context 'type_filter' do
 
     let!(:user) { Fabricate(:user, username: 'amazing', email: 'amazing@amazing.com') }
     let!(:category) { Fabricate(:category, name: 'amazing category', user: user) }
 
-
     context 'user filter' do
       let(:results) { Search.execute('amazing', type_filter: 'user') }
 
@@ -424,22 +484,43 @@ describe Search do
       subcategory = Fabricate(:category, parent_category_id: category.id)
       sub_topic = Fabricate(:topic, category: subcategory)
 
-      post = Fabricate(:post, topic: topic, user: topic.user )
-      _another_post = Fabricate(:post, topic: topic_no_cat, user: topic.user )
-      sub_post = Fabricate(:post, raw: 'I am saying hello from a subcategory', topic: sub_topic, user: topic.user )
+      post = Fabricate(:post, topic: topic, user: topic.user)
+      _another_post = Fabricate(:post, topic: topic_no_cat, user: topic.user)
+      sub_post = Fabricate(:post, raw: 'I am saying hello from a subcategory', topic: sub_topic, user: topic.user)
 
       search = Search.execute('hello', search_context: category)
-      expect(search.posts.map(&:id).sort).to eq([post.id,sub_post.id].sort)
+      expect(search.posts.map(&:id).sort).to eq([post.id, sub_post.id].sort)
       expect(search.posts.length).to eq(2)
     end
 
   end
 
   describe 'Chinese search' do
-    it 'splits English / Chinese' do
+    let(:sentence) { 'Discourse中国的基础设施网络正在组装' }
+    let(:sentence_t) { 'Discourse太平山森林遊樂區' }
+
+    it 'splits English / Chinese and filter out stop words' do
       SiteSetting.default_locale = 'zh_CN'
-      data = Search.prepare_data('Discourse社区指南').split(' ')
-      expect(data).to eq(['Discourse', '社区','指南'])
+      data = Search.prepare_data(sentence).split(' ')
+      expect(data).to eq(["Discourse", "中国", "基础", "设施", "基础设施", "网络", "正在", "组装"])
+    end
+
+    it 'splits for indexing and filter out stop words' do
+      SiteSetting.default_locale = 'zh_CN'
+      data = Search.prepare_data(sentence, :index).split(' ')
+      expect(data).to eq(["Discourse", "中国", "基础设施", "网络", "正在", "组装"])
+    end
+
+    it 'splits English / Traditional Chinese and filter out stop words' do
+      SiteSetting.default_locale = 'zh_TW'
+      data = Search.prepare_data(sentence_t).split(' ')
+      expect(data).to eq(["Discourse", "太平", "平山", "太平山", "森林", "遊樂區"])
+    end
+
+    it 'splits for indexing and filter out stop words' do
+      SiteSetting.default_locale = 'zh_TW'
+      data = Search.prepare_data(sentence_t, :index).split(' ')
+      expect(data).to eq(["Discourse", "太平山", "森林", "遊樂區"])
     end
 
     it 'finds chinese topic based on title' do
@@ -628,6 +709,17 @@ describe Search do
 
     end
 
+    it 'can find posts with images' do
+      post_uploaded = Fabricate(:post_with_uploaded_image)
+      post_with_image_urls = Fabricate(:post_with_image_urls)
+      Fabricate(:post)
+
+      CookedPostProcessor.new(post_uploaded).update_post_image
+      CookedPostProcessor.new(post_with_image_urls).update_post_image
+
+      expect(Search.execute('with:images').posts.map(&:id)).to contain_exactly(post_uploaded.id, post_with_image_urls.id)
+    end
+
     it 'can find by latest' do
       topic1 = Fabricate(:topic, title: 'I do not like that Sam I am')
       post1 = Fabricate(:post, topic: topic1)
@@ -667,6 +759,12 @@ describe Search do
       expect(Search.execute('bill').posts.map(&:id)).to eq([post.id])
     end
 
+    it 'can tokanize website names correctly' do
+      post = Fabricate(:post, raw: 'i like http://wb.camra.org.uk/latest#test so yay')
+      expect(Search.execute('http://wb.camra.org.uk/latest#test').posts.map(&:id)).to eq([post.id])
+      expect(Search.execute('camra').posts.map(&:id)).to eq([post.id])
+    end
+
     it 'supports category slug and tags' do
       # main category
       category = Fabricate(:category, name: 'category 24', slug: 'category-24')
@@ -694,14 +792,63 @@ 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...")
+    it 'correctly handles #symbol when no tag or category match' do
+      Fabricate(:post, raw: 'testing #1 #9998')
+      results = Search.new('testing #1').execute
+      expect(results.posts.length).to eq(1)
 
-      expect(Search.execute('green tags:eggs').posts.map(&:id)).to eq([post2.id])
-      expect(Search.execute('green tags:plants').posts.size).to eq(0)
+      results = Search.new('#9998').execute
+      expect(results.posts.length).to eq(1)
+
+      results = Search.new('#777').execute
+      expect(results.posts.length).to eq(0)
+    end
+
+    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) }
+
+      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
+
+    it "can find posts which contains filetypes" do
+      post1 = Fabricate(:post,
+                        raw: "http://example.com/image.png")
+      post2 = Fabricate(:post,
+                         raw: "Discourse logo\n"\
+                              "http://example.com/logo.png\n"\
+                              "http://example.com/vector_image.svg")
+      post_with_upload = Fabricate(:post, uploads: [Fabricate(:upload)])
+      Fabricate(:post)
+
+      TopicLink.extract_from(post1)
+      TopicLink.extract_from(post2)
+
+      expect(Search.execute('filetype:svg').posts).to eq([post2])
+      expect(Search.execute('filetype:png').posts.map(&:id)).to contain_exactly(post1.id, post2.id, post_with_upload.id)
+      expect(Search.execute('logo filetype:png').posts.map(&:id)).to eq([post2.id])
     end
   end
 
@@ -726,7 +873,6 @@ describe Search do
       expect(Search.word_to_date('january')).to eq(Time.zone.parse('2001-01-01'))
       expect(Search.word_to_date('jan')).to eq(Time.zone.parse('2001-01-01'))
 
-
       expect(Search.word_to_date('100')).to eq(time.beginning_of_day.days_ago(100))
 
       expect(Search.word_to_date('invalid')).to eq(nil)
@@ -759,4 +905,51 @@ 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
+
+  context 'pagination' do
+    let(:number_of_results) { 2 }
+    let!(:post1) { Fabricate(:post, raw: 'hello hello hello hello hello') }
+    let!(:post2) { Fabricate(:post, raw: 'hello hello hello hello') }
+    let!(:post3) { Fabricate(:post, raw: 'hello hello hello') }
+    let!(:post4) { Fabricate(:post, raw: 'hello hello') }
+    let!(:post5) { Fabricate(:post, raw: 'hello') }
+    before do
+      Search.stubs(:per_filter).returns(number_of_results)
+    end
+
+    it 'returns more results flag' do
+      results = Search.execute('hello', type_filter: 'topic')
+      results2 = Search.execute('hello', type_filter: 'topic', page: 2)
+
+      expect(results.posts.length).to eq(number_of_results)
+      expect(results.posts.map(&:id)).to eq([post1.id, post2.id])
+      expect(results.more_full_page_results).to eq(true)
+      expect(results2.posts.length).to eq(number_of_results)
+      expect(results2.posts.map(&:id)).to eq([post3.id, post4.id])
+      expect(results2.more_full_page_results).to eq(true)
+    end
+
+    it 'correctly search with page parameter' do
+      search = Search.new('hello', type_filter: 'topic', page: 3)
+      results = search.execute
+
+      expect(search.offset).to eq(2 * number_of_results)
+      expect(results.posts.length).to eq(1)
+      expect(results.posts).to eq([post5])
+      expect(results.more_full_page_results).to eq(nil)
+    end
+
+  end
+
 end
diff --git a/spec/components/site_setting_extension_spec.rb b/spec/components/site_setting_extension_spec.rb
index 353c04bd4c..8adf3c1556 100644
--- a/spec/components/site_setting_extension_spec.rb
+++ b/spec/components/site_setting_extension_spec.rb
@@ -58,13 +58,13 @@ describe SiteSettingExtension do
       settings.hello = 100
       expect(settings.hello).to eq(100)
 
-      settings.provider.save(:hello, 99, SiteSetting.types[:integer] )
+      settings.provider.save(:hello, 99, SiteSetting.types[:integer])
       settings.refresh!
 
       expect(settings.hello).to eq(99)
     end
 
-    it "Publishes changes cross sites" do
+    it "publishes changes cross sites" do
       settings.setting(:hello, 1)
       settings2.setting(:hello, 1)
 
@@ -97,7 +97,7 @@ describe SiteSettingExtension do
     end
 
     it "should have a key in all_settings" do
-      expect(settings.all_settings.detect {|s| s[:setting] == :test_setting }).to be_present
+      expect(settings.all_settings.detect { |s| s[:setting] == :test_setting }).to be_present
     end
 
     it "should have the correct desc" do
@@ -143,20 +143,23 @@ describe SiteSettingExtension do
 
       it "should publish changes to clients" do
         settings.setting("test_setting", 100)
-        settings.client_setting("test_setting")
+        settings.setting("test_setting", nil, client: true)
 
-        messages = MessageBus.track_publish do
+        message = MessageBus.track_publish('/client_settings') do
           settings.test_setting = 88
-        end
+        end.first
 
-        expect(messages.map(&:channel).include?('/client_settings')).to eq(true)
+        expect(message).to be_present
       end
     end
   end
 
   describe "remove_override" do
-    it "correctly nukes overrides" do
+    before do
       settings.setting(:test_override, "test")
+      settings.refresh!
+    end
+    it "correctly nukes overrides" do
       settings.test_override = "bla"
       settings.remove_override!(:test_override)
       expect(settings.test_override).to eq("test")
@@ -179,7 +182,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
@@ -191,7 +193,6 @@ describe SiteSettingExtension do
     end
   end
 
-
   describe "string setting with regex" do
     it "Supports custom validation errors" do
       settings.setting(:test_str, "bob", regex: "hi", regex_error: "oops")
@@ -257,7 +258,7 @@ describe SiteSettingExtension do
         true
       end
       def self.values
-        [1,2,3]
+        [1, 2, 3]
       end
     end
 
@@ -265,6 +266,7 @@ describe SiteSettingExtension do
       settings.setting(:test_int_enum, 1, enum: TestIntEnumClass)
       settings.test_int_enum = "2"
       settings.refresh!
+      expect(settings.defaults[:test_int_enum]).to eq(1)
       expect(settings.test_int_enum).to eq(2)
     end
 
@@ -274,7 +276,7 @@ describe SiteSettingExtension do
 
     class TestEnumClass
       def self.valid_value?(v)
-        true
+        self.values.include?(v)
       end
       def self.values
         ['en']
@@ -298,7 +300,11 @@ describe SiteSettingExtension do
     end
 
     it 'should not hose all_settings' do
-      expect(settings.all_settings.detect {|s| s[:setting] == :test_enum }).to be_present
+      expect(settings.all_settings.detect { |s| s[:setting] == :test_enum }).to be_present
+    end
+
+    it 'should report error when being set other values' do
+      expect { settings.test_enum = 'not_in_enum' }.to raise_error(Discourse::InvalidParameters)
     end
 
     context 'when overridden' do
@@ -314,19 +320,19 @@ describe SiteSettingExtension do
 
       it 'rejects invalid values' do
         test_enum_class.expects(:valid_value?).with('gg').returns(false)
-        expect {settings.test_enum = 'gg' }.to raise_error(Discourse::InvalidParameters)
+        expect { settings.test_enum = 'gg' }.to raise_error(Discourse::InvalidParameters)
       end
     end
   end
 
   describe 'a setting with a category' do
     before do
-      settings.setting(:test_setting, 88, {category: :tests})
+      settings.setting(:test_setting, 88, category: :tests)
       settings.refresh!
     end
 
     it "should return the category in all_settings" do
-      expect(settings.all_settings.find {|s| s[:setting] == :test_setting }[:category]).to eq(:tests)
+      expect(settings.all_settings.find { |s| s[:setting] == :test_setting }[:category]).to eq(:tests)
     end
 
     context "when overidden" do
@@ -341,14 +347,14 @@ describe SiteSettingExtension do
 
       it "should still have the correct category" do
         settings.test_setting = 102
-        expect(settings.all_settings.find {|s| s[:setting] == :test_setting }[:category]).to eq(:tests)
+        expect(settings.all_settings.find { |s| s[:setting] == :test_setting }[:category]).to eq(:tests)
       end
     end
   end
 
   describe "setting with a validator" do
     before do
-      settings.setting(:validated_setting, "info@example.com", {type: 'email'})
+      settings.setting(:validated_setting, "info@example.com", type: 'email')
       settings.refresh!
     end
 
@@ -386,6 +392,14 @@ describe SiteSettingExtension do
     end
   end
 
+  describe ".set_and_log" do
+    it "raises an error when set for an invalid setting name" do
+      expect {
+        settings.set_and_log("provider", "haxxed")
+      }.to raise_error(ArgumentError)
+    end
+  end
+
   describe "filter domain name" do
     before do
       settings.setting(:white_listed_spam_host_domains, "www.example.com")
@@ -418,11 +432,11 @@ describe SiteSettingExtension do
     end
 
     it "is not present in all_settings by default" do
-      expect(settings.all_settings.find {|s| s[:setting] == :superman_identity }).to be_blank
+      expect(settings.all_settings.find { |s| s[:setting] == :superman_identity }).to be_blank
     end
 
     it "is present in all_settings when we ask for hidden" do
-      expect(settings.all_settings(true).find {|s| s[:setting] == :superman_identity }).to be_present
+      expect(settings.all_settings(true).find { |s| s[:setting] == :superman_identity }).to be_present
     end
   end
 
@@ -458,6 +472,7 @@ describe SiteSettingExtension do
       it "should return default cause nothing is set" do
         expect(settings.nada).to eq('nothing')
       end
+
     end
 
     context "with a false override" do
@@ -470,6 +485,14 @@ describe SiteSettingExtension do
       it "should return default cause nothing is set" do
         expect(settings.bool).to eq(false)
       end
+
+      it "should not trigger any message bus work if you try to set it" do
+        m = MessageBus.track_publish('/site_settings') do
+          settings.bool = true
+          expect(settings.bool).to eq(false)
+        end
+        expect(m.length).to eq(0)
+      end
     end
 
     context "with global setting" do
@@ -505,4 +528,62 @@ describe SiteSettingExtension do
     end
   end
 
+  describe 'locale default overrides are respected' do
+    before do
+      settings.setting(:test_override, 'default', locale_default: { zh_CN: 'cn' })
+      settings.refresh!
+    end
+
+    after do
+      settings.remove_override!(:test_override)
+    end
+
+    it 'ensures the default cache expired after overriding the default_locale' do
+      expect(settings.test_override).to eq('default')
+      settings.default_locale = 'zh_CN'
+      expect(settings.test_override).to eq('cn')
+    end
+
+    it 'returns the saved setting even locale default exists' do
+      expect(settings.test_override).to eq('default')
+      settings.default_locale = 'zh_CN'
+      settings.test_override = 'saved'
+      expect(settings.test_override).to eq('saved')
+    end
+  end
+
+  describe '.requires_refresh?' do
+    it 'always refresh default_locale always require refresh' do
+      expect(settings.requires_refresh?(:default_locale)).to be_truthy
+    end
+  end
+
+  describe '.default_locale' do
+    it 'is always loaded' do
+      expect(settings.default_locale).to eq 'en'
+    end
+  end
+
+  describe '.default_locale=' do
+    it 'can be changed' do
+      settings.default_locale = 'zh_CN'
+      expect(settings.default_locale).to eq 'zh_CN'
+    end
+
+    it 'refresh!' do
+      settings.expects(:refresh!)
+      settings.default_locale = 'zh_CN'
+    end
+
+    it 'expires the cache' do
+      settings.default_locale = 'zh_CN'
+      expect(Rails.cache.exist?(SiteSettingExtension.client_settings_cache_key)).to be_falsey
+    end
+
+    it 'refreshes the client' do
+      Discourse.expects(:request_refresh!)
+      settings.default_locale = 'zh_CN'
+    end
+  end
+
 end
diff --git a/spec/components/site_settings/db_provider_spec.rb b/spec/components/site_settings/db_provider_spec.rb
index 64bd7b0b70..6cfec41d32 100644
--- a/spec/components/site_settings/db_provider_spec.rb
+++ b/spec/components/site_settings/db_provider_spec.rb
@@ -22,7 +22,6 @@ describe SiteSettings::DbProvider do
     expect(provider.all.length).to eq(0)
     expect(provider.find("test")).to eq(nil)
 
-
     provider.save("test", "one", 1)
     found = provider.find("test")
 
@@ -35,7 +34,7 @@ describe SiteSettings::DbProvider do
 
     provider.save("test2", "three", 3)
 
-    all = provider.all.sort{|a,b| a.name <=> b.name}
+    all = provider.all.sort { |a, b| a.name <=> b.name }
 
     expect_same_setting(all[0], setting.new("test", "two", 2))
     expect_same_setting(all[1], setting.new("test2", "three", 3))
diff --git a/spec/components/site_settings/defaults_provider_spec.rb b/spec/components/site_settings/defaults_provider_spec.rb
new file mode 100644
index 0000000000..7587748a34
--- /dev/null
+++ b/spec/components/site_settings/defaults_provider_spec.rb
@@ -0,0 +1,273 @@
+require 'rails_helper'
+require_dependency 'site_settings/defaults_provider'
+
+describe SiteSettings::DefaultsProvider do
+  let(:provider_local) do
+    SiteSettings::LocalProcessProvider.new
+  end
+
+  def new_settings(provider)
+    Class.new do
+      extend SiteSettingExtension
+      self.provider = provider
+    end
+  end
+
+  let(:settings) do
+    new_settings(provider_local)
+  end
+
+  describe 'inserts default_locale into refresh' do
+    it 'when initialize' do
+      expect(settings.refresh_settings.include?(SiteSettings::DefaultsProvider::DEFAULT_LOCALE_KEY)).to be_truthy
+    end
+  end
+
+  describe '.db_all' do
+    it 'collects values from db except default locale' do
+      settings.provider.save(SiteSettings::DefaultsProvider::DEFAULT_LOCALE_KEY,
+                             'en',
+                             SiteSetting.types[:string])
+      expect(settings.defaults.db_all).to eq([])
+    end
+
+    it 'can collect values from db' do
+      settings.provider.save('try_a', 1, SiteSetting.types[:integer])
+      settings.provider.save('try_b', 2, SiteSetting.types[:integer])
+      expect(settings.defaults.db_all.count).to eq 2
+    end
+  end
+
+  describe 'expose default cache according to locale' do
+    before do
+      settings.setting(:test_override, 'default', locale_default: { zh_CN: 'cn' })
+      settings.setting(:test_default, 'test', regex: '^\S+$')
+      settings.refresh!
+    end
+
+    describe '.all' do
+      it 'returns all values according to the current locale' do
+        expect(settings.defaults.all).to eq(test_override: 'default', test_default: 'test')
+        settings.defaults.site_locale = 'zh_CN'
+        settings.defaults.refresh_site_locale!
+        expect(settings.defaults.all).to eq(test_override: 'cn', test_default: 'test')
+      end
+    end
+
+    describe '.get' do
+      it 'returns the default value to a site setting' do
+        expect(settings.defaults.get(:test_override)).to eq 'default'
+      end
+
+      it 'accepts a string as the parameters' do
+        expect(settings.defaults.get('test_override')).to eq 'default'
+      end
+
+      it 'returns the default value according to current locale' do
+        expect(settings.defaults.get(:test_override)).to eq 'default'
+        settings.defaults.site_locale = 'zh_CN'
+        expect(settings.defaults.get(:test_override)).to eq 'cn'
+      end
+    end
+
+    describe '.set_regardless_of_locale' do
+      let(:val) { 'env_overriden' }
+
+      it 'sets the default value to a site setting regardless the locale' do
+        settings.defaults.set_regardless_of_locale(:test_override, val)
+        expect(settings.defaults.get(:test_override)).to eq val
+        settings.defaults.site_locale = 'zh_CN'
+        expect(settings.defaults.get(:test_override)).to eq val
+      end
+
+      it 'handles the string' do
+        settings.defaults.set_regardless_of_locale('test_override', val)
+        expect(settings.defaults.get(:test_override)).to eq val
+      end
+
+      it 'converts the data type' do
+        settings.defaults.set_regardless_of_locale(:test_override, 1)
+        expect(settings.defaults.get(:test_override)).to eq '1'
+      end
+
+      it 'raises when the setting does not exists' do
+        expect {
+          settings.defaults.set_regardless_of_locale(:not_exist, 1)
+        }.to raise_error(ArgumentError)
+      end
+
+      it 'raises when the value is not valid' do
+        expect {
+          settings.defaults.set_regardless_of_locale(:test_default, 'regex will fail')
+        }.to raise_error(Discourse::InvalidParameters)
+      end
+    end
+
+    describe '.each' do
+      it 'yields the pair of site settings' do
+        expect { |b| settings.defaults.each(&b) }.to yield_successive_args([:test_override, 'default'], [:test_default, 'test'])
+        settings.defaults.site_locale = 'zh_CN'
+        expect { |b| settings.defaults.each(&b) }.to yield_successive_args([:test_override, 'cn'], [:test_default, 'test'])
+      end
+    end
+  end
+
+  describe '.site_locale' do
+    it 'returns the current site locale' do
+      expect(settings.defaults.site_locale).to eq 'en'
+    end
+
+    context 'when locale is set in the db' do
+      let(:db_val) { 'zr' }
+      let(:global_val) { 'gr' }
+
+      before do
+        settings.provider.save(SiteSettings::DefaultsProvider::DEFAULT_LOCALE_KEY,
+                               db_val,
+                               SiteSetting.types[:string])
+        settings.defaults.refresh_site_locale!
+      end
+
+      it 'should load from database' do
+        expect(settings.defaults.site_locale).to eq db_val
+      end
+
+      it 'prioritizes GlobalSetting than value from db' do
+        GlobalSetting.stubs(:default_locale).returns(global_val)
+        settings.defaults.refresh_site_locale!
+        expect(settings.defaults.site_locale).to eq global_val
+      end
+
+      it 'ignores blank GlobalSetting' do
+        GlobalSetting.stubs(:default_locale).returns('')
+        settings.defaults.refresh_site_locale!
+        expect(settings.defaults.site_locale).to eq db_val
+      end
+    end
+
+  end
+
+  describe '.site_locale=' do
+    it 'should store site locale in a distributed cache' do
+      expect(settings.defaults.class.class_variable_get(:@@site_locales))
+        .to be_a(DistributedCache)
+    end
+
+    it 'changes and store the current site locale' do
+      settings.defaults.site_locale = 'zh_CN'
+
+      expect(settings.defaults.site_locale).to eq('zh_CN')
+    end
+
+    it 'changes and store the current site locale' do
+      expect { settings.defaults.site_locale = 'random' }.to raise_error(Discourse::InvalidParameters)
+      expect(settings.defaults.site_locale).to eq 'en'
+    end
+
+    it "don't change when it's shadowed" do
+      GlobalSetting.stubs(:default_locale).returns('shadowed')
+      settings.defaults.site_locale = 'zh_CN'
+      expect(settings.defaults.site_locale).to eq 'shadowed'
+    end
+
+    it 'refresh_site_locale! when called' do
+      settings.defaults.expects(:refresh_site_locale!)
+      settings.defaults.site_locale = 'zh_CN'
+    end
+
+    it 'refreshes the client when changed' do
+      Discourse.expects(:request_refresh!).once
+      settings.defaults.site_locale = 'zh_CN'
+    end
+
+    it "doesn't refresh the client when changed" do
+      Discourse.expects(:request_refresh!).never
+      settings.defaults.site_locale = 'en'
+    end
+  end
+
+  describe '.locale_setting_hash' do
+    it 'returns the hash for client display' do
+      result = settings.defaults.locale_setting_hash
+
+      expect(result[:setting]).to eq(SiteSettings::DefaultsProvider::DEFAULT_LOCALE_KEY)
+      expect(result[:default]).to eq(SiteSettings::DefaultsProvider::DEFAULT_LOCALE)
+      expect(result[:type]).to eq(SiteSetting.types[SiteSetting.types[:enum]])
+      expect(result[:preview]).to be_nil
+      expect(result[:value]).to eq(SiteSettings::DefaultsProvider::DEFAULT_LOCALE)
+      expect(result[:category]).to eq(SiteSettings::DefaultsProvider::DEFAULT_CATEGORY)
+      expect(result[:valid_values]).to eq(LocaleSiteSetting.values)
+      expect(result[:translate_names]).to eq(LocaleSiteSetting.translate_names?)
+      expect(result[:description]).not_to be_nil
+    end
+  end
+
+  describe '.load_setting' do
+    it 'adds a setting to the cache' do
+      settings.defaults.load_setting('new_a', 1)
+      expect(settings.defaults[:new_a]).to eq 1
+    end
+
+    it 'takes care of locale default' do
+      settings.defaults.load_setting(:new_b, 1, locale_default: { zh_CN: 2, zh_TW: 2 })
+      expect(settings.defaults[:new_b]).to eq 1
+    end
+  end
+
+  describe '.refresh_site_locale!' do
+    it 'loads the change to locale' do
+      expect(settings.defaults.site_locale).to eq 'en'
+      settings.provider.save(SiteSettings::DefaultsProvider::DEFAULT_LOCALE_KEY,
+                             'zh_CN',
+                             SiteSetting.types[:string])
+      settings.defaults.refresh_site_locale!
+      expect(settings.defaults.site_locale).to eq 'zh_CN'
+    end
+
+    it 'loads from GlobalSettings' do
+      expect(settings.defaults.site_locale).to eq 'en'
+      GlobalSetting.stubs(:default_locale).returns('fr')
+      settings.defaults.refresh_site_locale!
+      expect(settings.defaults.site_locale).to eq 'fr'
+    end
+
+    it 'prioritized GlobalSettings than db' do
+      expect(settings.defaults.site_locale).to eq 'en'
+      settings.provider.save(SiteSettings::DefaultsProvider::DEFAULT_LOCALE_KEY,
+                             'zh_CN',
+                             SiteSetting.types[:string])
+      GlobalSetting.stubs(:default_locale).returns('fr')
+      settings.defaults.refresh_site_locale!
+      expect(settings.defaults.site_locale).to eq 'fr'
+    end
+  end
+
+  describe '.has_setting?' do
+    before do
+      settings.setting(:r, 1)
+      settings.setting(:question?, 1)
+    end
+
+    it "returns true when it's present in the cache" do
+      expect(settings.defaults.has_setting?(:r)).to be_truthy
+    end
+
+    it '"responds when the arg is string' do
+      expect(settings.defaults.has_setting?('r')).to be_truthy
+    end
+
+    it 'default_locale always exists' do
+      expect(settings.defaults.has_setting?(SiteSettings::DefaultsProvider::DEFAULT_LOCALE_KEY)).to be_truthy
+    end
+
+    it 'returns false when the key is not exist' do
+      expect(settings.defaults.has_setting?('no_key')).to be_falsey
+    end
+
+    it 'checks name with question mark' do
+      expect(settings.defaults.has_setting?(:question)).to be_truthy
+      expect(settings.defaults.has_setting?('question')).to be_truthy
+    end
+  end
+
+end
diff --git a/spec/components/site_settings/local_process_provider_spec.rb b/spec/components/site_settings/local_process_provider_spec.rb
index 6293216d67..4b3909d851 100644
--- a/spec/components/site_settings/local_process_provider_spec.rb
+++ b/spec/components/site_settings/local_process_provider_spec.rb
@@ -13,8 +13,7 @@ describe SiteSettings::LocalProcessProvider do
     SiteSettings::LocalProcessProvider.new
   end
 
-
-  def setting(name,value,data_type)
+  def setting(name, value, data_type)
     OpenStruct.new.tap do |setting|
       setting.name = name
       setting.value = value
@@ -29,13 +28,13 @@ describe SiteSettings::LocalProcessProvider do
 
     it "can allows additional settings" do
       provider.save("test", "bla", 2)
-      expect_same_setting(provider.all[0], setting("test","bla",2))
+      expect_same_setting(provider.all[0], setting("test", "bla", 2))
     end
 
     it "does not leak new stuff into list" do
       provider.save("test", "bla", 2)
       provider.save("test", "bla1", 2)
-      expect_same_setting(provider.all[0], setting("test","bla1",2))
+      expect_same_setting(provider.all[0], setting("test", "bla1", 2))
       expect(provider.all.length).to eq(1)
     end
   end
@@ -46,19 +45,19 @@ describe SiteSettings::LocalProcessProvider do
     end
 
     it "can find a new setting" do
-      provider.save("one","two",3)
-      expect_same_setting(provider.find("one"),setting("one", "two", 3))
+      provider.save("one", "two", 3)
+      expect_same_setting(provider.find("one"), setting("one", "two", 3))
     end
 
     it "can amend a setting" do
-      provider.save("one","three",4)
-      expect_same_setting(provider.find("one"),setting("one", "three", 4))
+      provider.save("one", "three", 4)
+      expect_same_setting(provider.find("one"), setting("one", "three", 4))
     end
   end
 
   describe "destroy" do
     it "can destroy a setting" do
-      provider.save("one","three",4)
+      provider.save("one", "three", 4)
       provider.destroy("one")
       expect(provider.find("one")).to eq(nil)
     end
diff --git a/spec/components/site_settings/type_supervisor_spec.rb b/spec/components/site_settings/type_supervisor_spec.rb
new file mode 100644
index 0000000000..3e4fbae1cd
--- /dev/null
+++ b/spec/components/site_settings/type_supervisor_spec.rb
@@ -0,0 +1,341 @@
+require 'rails_helper'
+require_dependency 'site_settings/type_supervisor'
+
+describe SiteSettings::TypeSupervisor do
+  let :provider_local do
+    SiteSettings::LocalProcessProvider.new
+  end
+
+  def new_settings(provider)
+    Class.new do
+      extend SiteSettingExtension
+      self.provider = provider
+    end
+  end
+
+  let :settings do
+    new_settings(provider_local)
+  end
+
+  subject { SiteSettings::TypeSupervisor }
+
+  describe 'constants' do
+    it 'validator opts are the subset of consumed opts' do
+      expect(Set.new(SiteSettings::TypeSupervisor::CONSUMED_OPTS).superset?(
+        Set.new(SiteSettings::TypeSupervisor::VALIDATOR_OPTS))).to be_truthy
+    end
+  end
+
+  describe '#types' do
+    context "verify enum sequence" do
+      it "'string' should be at 1st position" do
+        expect(SiteSettings::TypeSupervisor.types[:string]).to eq(1)
+      end
+      it "'time' should be at 2nd position" do
+        expect(SiteSettings::TypeSupervisor.types[:time]).to eq(2)
+      end
+      it "'integer' should be at 3rd position" do
+        expect(SiteSettings::TypeSupervisor.types[:integer]).to eq(3)
+      end
+      it "'float' should be at 4th position" do
+        expect(SiteSettings::TypeSupervisor.types[:float]).to eq(4)
+      end
+      it "'bool' should be at 5th position" do
+        expect(SiteSettings::TypeSupervisor.types[:bool]).to eq(5)
+      end
+      it "'null' should be at 6th position" do
+        expect(SiteSettings::TypeSupervisor.types[:null]).to eq(6)
+      end
+      it "'enum' should be at 7th position" do
+        expect(SiteSettings::TypeSupervisor.types[:enum]).to eq(7)
+      end
+      it "'list' should be at 8th position" do
+        expect(SiteSettings::TypeSupervisor.types[:list]).to eq(8)
+      end
+      it "'url_list' should be at 9th position" do
+        expect(SiteSettings::TypeSupervisor.types[:url_list]).to eq(9)
+      end
+      it "'host_list' should be at 10th position" do
+        expect(SiteSettings::TypeSupervisor.types[:host_list]).to eq(10)
+      end
+      it "'category_list' should be at 11th position" do
+        expect(SiteSettings::TypeSupervisor.types[:category_list]).to eq(11)
+      end
+      it "'value_list' should be at 12th position" do
+        expect(SiteSettings::TypeSupervisor.types[:value_list]).to eq(12)
+      end
+      it "'regex' should be at 13th position" do
+        expect(SiteSettings::TypeSupervisor.types[:regex]).to eq(13)
+      end
+      it "'email' should be at 14th position" do
+        expect(SiteSettings::TypeSupervisor.types[:email]).to eq(14)
+      end
+      it "'username' should be at 15th position" do
+        expect(SiteSettings::TypeSupervisor.types[:username]).to eq(15)
+      end
+    end
+  end
+
+  describe '#parse_value_type' do
+    it 'returns :null type when the value is nil' do
+      expect(subject.parse_value_type(nil)).to eq(SiteSetting.types[:null])
+    end
+
+    it 'returns :integer type when the value is int' do
+      expect(subject.parse_value_type(2)).to eq(SiteSetting.types[:integer])
+    end
+
+    it 'returns :integer type when the value is large int' do
+      expect(subject.parse_value_type(99999999999999999999999999999999999)).to eq(SiteSetting.types[:integer])
+    end
+
+    it 'returns :float type when the value is float' do
+      expect(subject.parse_value_type(1.23)).to eq(SiteSetting.types[:float])
+    end
+
+    it 'returns :bool type when the value is true' do
+      expect(subject.parse_value_type(true)).to eq(SiteSetting.types[:bool])
+    end
+
+    it 'returns :bool type when the value is false' do
+      expect(subject.parse_value_type(false)).to eq(SiteSetting.types[:bool])
+    end
+
+    it 'raises when the value is not listed' do
+      expect {
+        subject.parse_value_type(Object.new)
+      }.to raise_error ArgumentError
+    end
+
+  end
+
+  context 'with different data types' do
+    class TestEnumClass
+      def self.valid_value?(v)
+        self.values.include?(v)
+      end
+      def self.values
+        ['en']
+      end
+      def self.translate_names?
+        false
+      end
+    end
+
+    class TestSmallThanTenValidator
+      def initialize(opts)
+      end
+      def valid_value?(v)
+        v < 10
+      end
+      def error_message
+        ''
+      end
+    end
+
+    before do
+      settings.setting(:type_null, nil)
+      settings.setting(:type_int, 1)
+      settings.setting(:type_true, true)
+      settings.setting(:type_false, false)
+      settings.setting(:type_float, 2.3232)
+      settings.setting(:type_string, 'string')
+      settings.setting(:type_enum_default_string, '2', type: 'enum', choices: ['2'])
+      settings.setting(:type_enum_class, 'en', enum: 'TestEnumClass')
+      settings.setting(:type_validator, 5, validator: 'TestSmallThanTenValidator')
+      settings.setting(:type_mock_validate_method, 'no_value')
+      settings.setting(:type_custom, 'custom', type: 'list')
+      settings.refresh!
+    end
+
+    describe '.to_db_value' do
+      let(:true_val) { 't' }
+      let(:false_val) { 'f' }
+
+      it 'returns nil value' do
+        expect(settings.type_supervisor.to_db_value(:type_null, nil)).to eq [nil, SiteSetting.types[:null]]
+      end
+
+      it 'gives a second chance to guess even told :null type' do
+        expect(settings.type_supervisor.to_db_value(:type_null, 1)).to eq [1, SiteSetting.types[:integer]]
+      end
+
+      it 'writes `t` or `f` given the possible bool value' do
+        expect(settings.type_supervisor.to_db_value(:type_true, true)).to eq [true_val, SiteSetting.types[:bool]]
+        expect(settings.type_supervisor.to_db_value(:type_true, 't')).to eq [true_val, SiteSetting.types[:bool]]
+        expect(settings.type_supervisor.to_db_value(:type_true, 'true')).to eq [true_val, SiteSetting.types[:bool]]
+        expect(settings.type_supervisor.to_db_value(:type_true, false)).to eq [false_val, SiteSetting.types[:bool]]
+      end
+
+      it 'writes `f` if given not `true` value' do
+        expect(settings.type_supervisor.to_db_value(:type_true, '')).to eq [false_val, SiteSetting.types[:bool]]
+        expect(settings.type_supervisor.to_db_value(:type_true, nil)).to eq [false_val, SiteSetting.types[:bool]]
+      end
+
+      it 'returns floats value' do
+        expect(settings.type_supervisor.to_db_value(:type_float, 1.2)).to eq [1.2, SiteSetting.types[:float]]
+        expect(settings.type_supervisor.to_db_value(:type_float, 1)).to eq [1.0, SiteSetting.types[:float]]
+      end
+
+      it 'returns string value' do
+        expect(settings.type_supervisor.to_db_value(:type_string, 'a')).to eq ['a', SiteSetting.types[:string]]
+      end
+
+      it 'returns enum value with string default' do
+        expect(settings.type_supervisor.to_db_value(:type_enum_default_string, 2)).to eq ['2', SiteSetting.types[:enum]]
+        expect(settings.type_supervisor.to_db_value(:type_enum_default_string, '2')).to eq ['2', SiteSetting.types[:enum]]
+      end
+
+      it 'raises when it does not in the enum choices' do
+        expect {
+          settings.type_supervisor.to_db_value(:type_enum_default_string, 'random')
+        }.to raise_error Discourse::InvalidParameters
+      end
+
+      it 'returns enum value for the given enum class' do
+        expect(settings.type_supervisor.to_db_value(:type_enum_class, 'en')).to eq ['en', SiteSetting.types[:enum]]
+      end
+
+      it 'raises when it does not in the enum class' do
+        expect {
+          settings.type_supervisor.to_db_value(:type_enum_class, 'random')
+        }.to raise_error Discourse::InvalidParameters
+      end
+
+      it 'validates value by validator' do
+        expect(settings.type_supervisor.to_db_value(:type_validator, 1)).to eq [1, SiteSetting.types[:integer]]
+      end
+
+      it 'raises when the validator says so' do
+        expect {
+          settings.type_supervisor.to_db_value(:type_validator, 11)
+        }.to raise_error Discourse::InvalidParameters
+      end
+
+      it 'tries invoke validate methods' do
+        settings.type_supervisor.expects(:validate_type_mock_validate_method).with('no')
+        settings.type_supervisor.to_db_value(:type_mock_validate_method, 'no')
+      end
+    end
+
+    describe '.to_rb_value' do
+      let(:true_val) { 't' }
+      let(:false_val) { 'f' }
+
+      it 'the type can be overriden by a parameter' do
+        expect(settings.type_supervisor.to_rb_value(:type_null, '1', SiteSetting.types[:integer])).to eq(1)
+      end
+
+      it 'returns nil value' do
+        expect(settings.type_supervisor.to_rb_value(:type_null, '1')).to eq nil
+        expect(settings.type_supervisor.to_rb_value(:type_null, 1)).to eq nil
+        expect(settings.type_supervisor.to_rb_value(:type_null, 'null')).to eq nil
+        expect(settings.type_supervisor.to_rb_value(:type_null, 'nil')).to eq nil
+      end
+
+      it 'returns true when it is true or `t` or `true`' do
+        expect(settings.type_supervisor.to_rb_value(:type_true, true)).to eq true
+        expect(settings.type_supervisor.to_rb_value(:type_true, 't')).to eq true
+        expect(settings.type_supervisor.to_rb_value(:type_true, 'true')).to eq true
+      end
+
+      it 'returns false if not one of `true` value' do
+        expect(settings.type_supervisor.to_rb_value(:type_true, 'tr')).to eq false
+        expect(settings.type_supervisor.to_rb_value(:type_true, '')).to eq false
+        expect(settings.type_supervisor.to_rb_value(:type_true, nil)).to eq false
+        expect(settings.type_supervisor.to_rb_value(:type_true, false)).to eq false
+        expect(settings.type_supervisor.to_rb_value(:type_true, 'f')).to eq false
+        expect(settings.type_supervisor.to_rb_value(:type_true, 'false')).to eq false
+      end
+
+      it 'returns float value' do
+        expect(settings.type_supervisor.to_rb_value(:type_float, 1.2)).to eq 1.2
+        expect(settings.type_supervisor.to_rb_value(:type_float, 1)).to eq 1.0
+        expect(settings.type_supervisor.to_rb_value(:type_float, '2.2')).to eq 2.2
+        expect(settings.type_supervisor.to_rb_value(:type_float, '2')).to eq 2
+      end
+
+      it 'returns string value' do
+        expect(settings.type_supervisor.to_rb_value(:type_string, 'a')).to eq 'a'
+        expect(settings.type_supervisor.to_rb_value(:type_string, 2)).to eq '2'
+      end
+
+      it 'returns value with string default' do
+        expect(settings.type_supervisor.to_rb_value(:type_enum_default_string, 2)).to eq '2'
+        expect(settings.type_supervisor.to_rb_value(:type_enum_default_string, '2')).to eq '2'
+      end
+
+      it 'returns value with a custom type' do
+        expect(settings.type_supervisor.to_rb_value(:type_custom, 2)).to eq 2
+        expect(settings.type_supervisor.to_rb_value(:type_custom, '2|3')).to eq '2|3'
+      end
+    end
+  end
+
+  describe '.type_hash' do
+    class TestEnumClass2
+      def self.valid_value?(v)
+        self.values.include?(v)
+      end
+      def self.values
+        ['a', 'b']
+      end
+      def self.translate_names?
+        false
+      end
+    end
+
+    before do
+      settings.setting(:type_null, nil)
+      settings.setting(:type_int, 1)
+      settings.setting(:type_true, true)
+      settings.setting(:type_float, 2.3232)
+      settings.setting(:type_string, 'string')
+      settings.setting(:type_url_list, 'string', type: 'url_list')
+      settings.setting(:type_enum_choices, '2', type: 'enum', choices: ['1', '2'])
+      settings.setting(:type_enum_class, 'a', enum: 'TestEnumClass2')
+      settings.setting(:type_list, 'a', type: 'list', choices: ['a', 'b'])
+      settings.refresh!
+    end
+
+    it 'returns null type' do
+      expect(settings.type_supervisor.type_hash(:type_null)[:type]).to eq 'null'
+    end
+    it 'returns int type' do
+      expect(settings.type_supervisor.type_hash(:type_int)[:type]).to eq 'integer'
+    end
+    it 'returns bool type' do
+      expect(settings.type_supervisor.type_hash(:type_true)[:type]).to eq 'bool'
+    end
+    it 'returns float type' do
+      expect(settings.type_supervisor.type_hash(:type_float)[:type]).to eq 'float'
+    end
+    it 'returns string type' do
+      expect(settings.type_supervisor.type_hash(:type_string)[:type]).to eq 'string'
+    end
+    it 'returns url_list type' do
+      expect(settings.type_supervisor.type_hash(:type_url_list)[:type]).to eq 'url_list'
+    end
+    it 'returns enum type' do
+      expect(settings.type_supervisor.type_hash(:type_enum_choices)[:type]).to eq 'enum'
+    end
+
+    it 'returns list choices' do
+      expect(settings.type_supervisor.type_hash(:type_list)[:choices]).to eq ['a', 'b']
+    end
+
+    it 'returns enum choices' do
+      hash = settings.type_supervisor.type_hash(:type_enum_choices)
+      expect(hash[:valid_values]).to eq [{ name: '1', value: '1' }, { name: '2', value: '2' }]
+      expect(hash[:translate_names]).to eq false
+    end
+
+    it 'returns enum class' do
+      hash = settings.type_supervisor.type_hash(:type_enum_class)
+      expect(hash[:valid_values]).to eq ['a', 'b']
+      expect(hash[:translate_names]).to eq false
+    end
+
+  end
+
+end
diff --git a/spec/components/site_settings/yaml_loader_spec.rb b/spec/components/site_settings/yaml_loader_spec.rb
index a011817274..2a56f92686 100644
--- a/spec/components/site_settings/yaml_loader_spec.rb
+++ b/spec/components/site_settings/yaml_loader_spec.rb
@@ -8,26 +8,18 @@ describe SiteSettings::YamlLoader do
 
     def load_yaml(file_arg)
       SiteSettings::YamlLoader.new(file_arg).load do |category, name, default, opts|
-        if opts.delete(:client)
-          client_setting(category, name, default, opts)
-        else
-          setting(category, name, default, opts)
-        end
+        setting(category, name, default, opts)
       end
     end
 
     def setting(category, name, default = nil, opts = {})
       @settings ||= []
+      @client_settings ||= []
       @settings << name
       @categories ||= []
       @categories << category
       @categories.uniq!
-    end
-
-    def client_setting(category, name, default = nil)
-      @client_settings ||= []
-      @client_settings << name
-      setting(category, name, default)
+      @client_settings << name if opts.has_key?(:client)
     end
   end
 
@@ -36,7 +28,10 @@ describe SiteSettings::YamlLoader do
   let(:client)      { "#{Rails.root}/spec/fixtures/site_settings/client.yml" }
   let(:enum)        { "#{Rails.root}/spec/fixtures/site_settings/enum.yml" }
   let(:enum_client) { "#{Rails.root}/spec/fixtures/site_settings/enum_client.yml" }
-  let(:env)         { "#{Rails.root}/spec/fixtures/site_settings/env.yml" }
+  let(:deprecated_env) { "#{Rails.root}/spec/fixtures/site_settings/deprecated_env.yml" }
+  let(:deprecated_hidden) { "#{Rails.root}/spec/fixtures/site_settings/deprecated_hidden.yml" }
+  let(:locale_default) { "#{Rails.root}/spec/fixtures/site_settings/locale_default.yml" }
+  let(:nil_default) { "#{Rails.root}/spec/fixtures/site_settings/nil_default.yml" }
 
   it "loads simple settings" do
     receiver.expects(:setting).with('category1', 'title', 'My Site', {}).once
@@ -48,7 +43,7 @@ describe SiteSettings::YamlLoader do
 
   it 'can take a File argument' do
     receiver.expects(:setting).at_least_once
-    receiver.load_yaml( File.new(simple) )
+    receiver.load_yaml(File.new(simple))
   end
 
   it "maintains order of categories" do
@@ -57,27 +52,38 @@ describe SiteSettings::YamlLoader do
   end
 
   it "can load client settings" do
-    receiver.expects(:client_setting).with('category1', 'title', 'Discourse', {})
-    receiver.expects(:client_setting).with('category2', 'tos_url', '', {})
-    receiver.expects(:client_setting).with('category2', 'must_approve_users', false, {})
+    receiver.expects(:setting).with('category1', 'title', 'Discourse', client: true)
+    receiver.expects(:setting).with('category2', 'tos_url', '', client: true)
+    receiver.expects(:setting).with('category2', 'must_approve_users', false, client: true)
     receiver.load_yaml(client)
   end
 
   it "can load enum settings" do
-    receiver.expects(:setting).with('email', 'default_email_digest_frequency', 7, {enum: 'DigestEmailSiteSetting'})
+    receiver.expects(:setting).with('email', 'default_email_digest_frequency', 7, enum: 'DigestEmailSiteSetting')
     receiver.load_yaml(enum)
   end
 
   it "can load enum client settings" do
-    receiver.expects(:client_setting).with do |category, name, default, opts|
-      category == 'basics' and name == 'default_locale' and default == 'en' and opts[:enum] == 'LocaleSiteSetting'
+    receiver.expects(:setting).with do |category, name, default, opts|
+      category == ('basics') && name == ('default_locale') && default == ('en') && opts[:enum] == ('LocaleSiteSetting') && opts[:client] == true
     end
     receiver.load_yaml(enum_client)
   end
 
-  it "can load settings based on environment" do
-    receiver.expects(:setting).with('misc', 'port', '', {})
-    receiver.expects(:client_setting).with('misc', 'crawl_images', false, {})
-    receiver.load_yaml(env)
+  it "raises deprecation when load settings based on environment" do
+    expect { receiver.load_yaml(deprecated_env) }.to raise_error(Discourse::Deprecation)
+  end
+
+  it "raises deprecation when hidden property is based on environment" do
+    expect { receiver.load_yaml(deprecated_hidden) }.to raise_error(Discourse::Deprecation)
+  end
+
+  it "raises invalid parameter when default value is not present" do
+    expect { receiver.load_yaml(nil_default) }.to raise_error(StandardError)
+  end
+
+  it "can load settings with locale default" do
+    receiver.expects(:setting).with('search', 'min_search_term_length', 3, min: 2, client: true, locale_default: { zh_CN: 2, zh_TW: 2 })
+    receiver.load_yaml(locale_default)
   end
 end
diff --git a/spec/components/slug_spec.rb b/spec/components/slug_spec.rb
index aee9c81f7a..ad436f6b52 100644
--- a/spec/components/slug_spec.rb
+++ b/spec/components/slug_spec.rb
@@ -6,6 +6,24 @@ require 'slug'
 describe Slug do
 
   describe '#for' do
+    let(:default_slug) { 'topic' }
+
+    let(:very_long_string) do
+      '内容似乎不清晰，这是个完整的句子吗？内容似乎不清晰，这是个完整的句子吗？' * 10
+    end
+
+    it 'returns topic by default' do
+      expect(Slug.for('')).to eq default_slug
+    end
+
+    it 'accepts fallback' do
+      expect(Slug.for('', 'king')).to eq 'king'
+    end
+
+    it 'replaces the underscore' do
+      expect(Slug.for("o_o_o")).to eq("o-o-o")
+    end
+
     context 'ascii generator' do
       before { SiteSetting.slug_generation_method = 'ascii' }
 
@@ -14,11 +32,15 @@ describe Slug do
       end
 
       it 'generates default slug when nothing' do
-        expect(Slug.for('')).to eq('topic')
+        expect(Slug.for('')).to eq(default_slug)
       end
 
       it "doesn't generate slugs that are just numbers" do
-        expect(Slug.for('123')).to eq('topic')
+        expect(Slug.for('123')).to eq(default_slug)
+      end
+
+      it "fallbacks to empty string if it's too long" do
+        expect(Slug.for(very_long_string)).to eq(default_slug)
       end
     end
 
@@ -28,14 +50,25 @@ describe Slug do
 
       it 'generates the slug' do
         expect(Slug.for("熱帶風暴畫眉")).to eq('熱帶風暴畫眉')
+        expect(Slug.for("Jeff hate's !~-_|,=#this")).to eq("jeff-hates-this")
       end
 
       it 'generates default slug when nothing' do
-        expect(Slug.for('')).to eq('topic')
+        expect(Slug.for('')).to eq(default_slug)
       end
 
       it "doesn't generate slugs that are just numbers" do
-        expect(Slug.for('123')).to eq('topic')
+        expect(Slug.for('123')).to eq(default_slug)
+      end
+
+      it "handles the special characters" do
+        expect(Slug.for(
+          " - English and Chinese title with special characters / 中文标题 !@:?\\:'`#^& $%&*()` -- "
+        )).to eq("english-and-chinese-title-with-special-characters-中文标题")
+      end
+
+      it "kills the trailing dash" do
+        expect(Slug.for("2- -this!~-_|,we-#-=^-")).to eq('2-this-we')
       end
     end
 
@@ -45,9 +78,9 @@ describe Slug do
 
       it 'generates the slug' do
         expect(Slug.for("hello world", 'category')).to eq('category')
-        expect(Slug.for("hello world")).to eq('topic')
-        expect(Slug.for('')).to eq('topic')
-        expect(Slug.for('123')).to eq('topic')
+        expect(Slug.for("hello world")).to eq(default_slug)
+        expect(Slug.for('')).to eq(default_slug)
+        expect(Slug.for('123')).to eq(default_slug)
       end
     end
   end
@@ -89,10 +122,6 @@ describe Slug do
       expect(Slug.ascii_generator(from)).to eq(to)
     end
 
-    it 'replaces underscores' do
-      expect(Slug.ascii_generator("o_o_o")).to eq("o-o-o")
-    end
-
     it "doesn't keep single quotes within word" do
       expect(Slug.ascii_generator("Jeff hate's this")).to eq("jeff-hates-this")
     end
@@ -111,15 +140,13 @@ describe Slug do
     after { SiteSetting.slug_generation_method = 'ascii' }
 
     it 'generates precentage encoded string' do
-      expect(Slug.encoded_generator("Jeff hate's !~-_|,=#this")).to eq("Jeff-hates-this")
       expect(Slug.encoded_generator("뉴스피드")).to eq("뉴스피드")
       expect(Slug.encoded_generator("آموزش اضافه کردن لینک اختیاری به هدر")).to eq("آموزش-اضافه-کردن-لینک-اختیاری-به-هدر")
       expect(Slug.encoded_generator("熱帶風暴畫眉")).to eq("熱帶風暴畫眉")
     end
 
     it 'reject RFC 3986 reserved character and blank' do
-      expect(Slug.encoded_generator(":/?#[]@!$ &'()*+,;=% -_`~.")).to eq("")
-      expect(Slug.encoded_generator(" - English and Chinese title with special characters / 中文标题 !@:?\\:'`#^& $%&*()` -- ")).to eq("English-and-Chinese-title-with-special-characters-中文标题")
+      expect(Slug.encoded_generator(":/?#[]@!$ &'()*+,;=% -_`~.")).to eq("---") # will be clear by #for
     end
 
     it 'generates null when nothing' do
@@ -129,6 +156,10 @@ describe Slug do
     it "keeps number unchanged" do
       expect(Slug.encoded_generator('123')).to eq('123')
     end
+
+    it 'downcase the string' do
+      expect(Slug.encoded_generator("LoWer")).to eq('lower')
+    end
   end
 
   describe '#none_generator' do
@@ -143,4 +174,3 @@ describe Slug do
     end
   end
 end
-
diff --git a/spec/components/spam_handler_spec.rb b/spec/components/spam_handler_spec.rb
index 64508d6eca..380784f6ae 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/sql_builder_spec.rb b/spec/components/sql_builder_spec.rb
index 870c55a685..4ccdde49a2 100644
--- a/spec/components/sql_builder_spec.rb
+++ b/spec/components/sql_builder_spec.rb
@@ -48,12 +48,12 @@ describe SqlBuilder do
     end
 
     it "should allow for 1 param exec" do
-      expect(@builder.exec(a: 1, b: 2).values[0][0]).to eq('1')
+      expect(@builder.exec(a: 1, b: 2).values[0][0]).to eq(1)
     end
 
     it "should allow for a single where" do
       @builder.where(":a = 1")
-      expect(@builder.exec(a: 1, b: 2).values[0][0]).to eq('1')
+      expect(@builder.exec(a: 1, b: 2).values[0][0]).to eq(1)
     end
 
     it "should allow where chaining" do
@@ -64,11 +64,11 @@ describe SqlBuilder do
 
     it "should allow order by" do
       expect(@builder.order_by("A desc").limit(1)
-        .exec(a:1, b:2).values[0][0]).to eq("2")
+        .exec(a: 1, b: 2).values[0][0]).to eq(2)
     end
     it "should allow offset" do
       expect(@builder.order_by("A desc").offset(1)
-        .exec(a:1, b:2).values[0][0]).to eq("1")
+        .exec(a: 1, b: 2).values[0][0]).to eq(1)
     end
   end
 
diff --git a/spec/components/stats_socket_spec.rb b/spec/components/stats_socket_spec.rb
index cac144439e..e457bf2937 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 c19a4169bd..0c9bf8bc12 100644
--- a/spec/components/stylesheet/compiler_spec.rb
+++ b/spec/components/stylesheet/compiler_spec.rb
@@ -2,27 +2,28 @@ 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
-    css,_map = Stylesheet::Compiler.compile(".body{background-image: asset-url('foo.png');}","test.scss")
+    css, _map = Stylesheet::Compiler.compile(".body{background-image: asset-url('/images/favicons/github.png');}", "test.scss")
 
-    expect(css).to include("url('/foo.png')")
+    expect(css).to include("url('/images/favicons/github.png')")
     expect(css).not_to include('asset-url')
   end
 
   it "supports image-url" do
-    css,_map = Stylesheet::Compiler.compile(".body{background-image: image-url('foo.png');}","test.scss")
+    css, _map = Stylesheet::Compiler.compile(".body{background-image: image-url('/favicons/github.png');}", "test.scss")
 
-    expect(css).to include("url('/images/foo.png')")
+    expect(css).to include("url('/favicons/github.png')")
     expect(css).not_to include('image-url')
   end
 end
-
-
diff --git a/spec/components/stylesheet/importer_spec.rb b/spec/components/stylesheet/importer_spec.rb
index 8aafb5c927..199fdb1df6 100644
--- a/spec/components/stylesheet/importer_spec.rb
+++ b/spec/components/stylesheet/importer_spec.rb
@@ -20,8 +20,13 @@ describe Stylesheet::Importer do
   end
 
   it "applies S3 CDN to background category images" do
+    SiteSetting.s3_use_iam_profile = true
+    SiteSetting.s3_upload_bucket = 'test'
+    SiteSetting.s3_region = 'ap-southeast-2'
     SiteSetting.s3_cdn_url = "https://s3.cdn"
 
+    SiteSetting.enable_s3_uploads = true
+
     background = Fabricate(:upload_s3)
     category = Fabricate(:category, uploaded_background: background)
 
diff --git a/spec/components/stylesheet/manager_spec.rb b/spec/components/stylesheet/manager_spec.rb
index 5582eeee61..07571887fa 100644
--- a/spec/components/stylesheet/manager_spec.rb
+++ b/spec/components/stylesheet/manager_spec.rb
@@ -28,7 +28,6 @@ describe Stylesheet::Manager do
 
     theme.save!
 
-
     child_theme = Theme.new(
       name: 'parent',
       user_id: -1,
@@ -55,7 +54,6 @@ describe Stylesheet::Manager do
     expect(css).to match(/\.common/)
     expect(css).to match(/\.desktop/)
 
-
     child_theme.set_field(target: :desktop, name: :scss, value: ".nothing{color: green;}")
     child_theme.save!
 
@@ -66,5 +64,30 @@ describe Stylesheet::Manager do
     # our theme better have a name with the theme_id as part of it
     expect(new_link).to include("/stylesheets/desktop_theme_#{theme.id}_")
   end
-end
 
+  describe 'color_scheme_digest' do
+    it "changes with category background image" do
+      theme = Theme.new(
+        name: 'parent',
+        user_id: -1
+      )
+      category1 = Fabricate(:category, uploaded_background_id: 123, updated_at: 1.week.ago)
+      category2 = Fabricate(:category, uploaded_background_id: 456, updated_at: 2.days.ago)
+
+      manager = Stylesheet::Manager.new(:desktop_theme, theme.key)
+
+      digest1 = manager.color_scheme_digest
+
+      category2.update_attributes(uploaded_background_id: 789, updated_at: 1.day.ago)
+
+      digest2 = manager.color_scheme_digest
+      expect(digest2).to_not eq(digest1)
+
+      category1.update_attributes(uploaded_background_id: nil, updated_at: 5.minutes.ago)
+
+      digest3 = manager.color_scheme_digest
+      expect(digest3).to_not eq(digest2)
+      expect(digest3).to_not eq(digest1)
+    end
+  end
+end
diff --git a/spec/components/suggested_topics_builder_spec.rb b/spec/components/suggested_topics_builder_spec.rb
index c860fe0dc1..7c883f757a 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
@@ -17,30 +17,30 @@ describe SuggestedTopicsBuilder do
     end
 
     let(:builder) do
-      SuggestedTopicsBuilder.new(fake_topic(1,1))
+      SuggestedTopicsBuilder.new(fake_topic(1, 1))
     end
 
     it "prioritizes category correctly" do
-      builder.splice_results([fake_topic(2,2)], :high)
-      builder.splice_results([fake_topic(3,1)], :high)
-      builder.splice_results([fake_topic(4,1)], :high)
+      builder.splice_results([fake_topic(2, 2)], :high)
+      builder.splice_results([fake_topic(3, 1)], :high)
+      builder.splice_results([fake_topic(4, 1)], :high)
 
-      expect(builder.results.map(&:id)).to eq([3,4,2])
+      expect(builder.results.map(&:id)).to eq([3, 4, 2])
 
       # we have 2 items in category 1
       expect(builder.category_results_left).to eq(3)
     end
 
     it "inserts using default approach for non high priority" do
-      builder.splice_results([fake_topic(2,2)], :high)
-      builder.splice_results([fake_topic(3,1)], :low)
+      builder.splice_results([fake_topic(2, 2)], :high)
+      builder.splice_results([fake_topic(3, 1)], :low)
 
-      expect(builder.results.map(&:id)).to eq([2,3])
+      expect(builder.results.map(&:id)).to eq([2, 3])
     end
 
     it "inserts multiple results and puts topics in the correct order" do
-      builder.splice_results([fake_topic(2,1), fake_topic(3,2), fake_topic(4,1)], :high)
-      expect(builder.results.map(&:id)).to eq([2,4,3])
+      builder.splice_results([fake_topic(2, 1), fake_topic(3, 2), fake_topic(4, 1)], :high)
+      expect(builder.results.map(&:id)).to eq([2, 4, 3])
     end
   end
 
@@ -84,9 +84,9 @@ describe SuggestedTopicsBuilder do
     end
 
     context "adding topics that are not open" do
-      let!(:archived_topic) { Fabricate(:topic, archived: true)}
-      let!(:closed_topic) { Fabricate(:topic, closed: true)}
-      let!(:invisible_topic) { Fabricate(:topic, visible: false)}
+      let!(:archived_topic) { Fabricate(:topic, archived: true) }
+      let!(:closed_topic) { Fabricate(:topic, closed: true) }
+      let!(:invisible_topic) { Fabricate(:topic, visible: false) }
 
       it "adds archived and closed, but not invisible topics" do
         builder.add_results(Topic)
@@ -108,5 +108,4 @@ describe SuggestedTopicsBuilder do
 
   end
 
-
 end
diff --git a/spec/components/system_message_spec.rb b/spec/components/system_message_spec.rb
index dbbeff71ed..c35f029a9d 100644
--- a/spec/components/system_message_spec.rb
+++ b/spec/components/system_message_spec.rb
@@ -4,7 +4,6 @@ require 'topic_subtype'
 
 describe SystemMessage do
 
-
   context 'send' do
 
     it 'should create a post correctly' do
@@ -28,5 +27,4 @@ describe SystemMessage do
     end
   end
 
-
 end
diff --git a/spec/components/table_migration_helper_spec.rb b/spec/components/table_migration_helper_spec.rb
index 12aa17614b..9f69014069 100644
--- a/spec/components/table_migration_helper_spec.rb
+++ b/spec/components/table_migration_helper_spec.rb
@@ -19,8 +19,8 @@ describe TableMigrationHelper do
       ActiveRecord::Base.exec_sql "CREATE TABLE table_with_old_name (topic_id INTEGER)"
 
       name = ActiveRecord::Base
-              .exec_sql("SELECT name FROM schema_migration_details LIMIT 1")
-              .getvalue(0,0)
+        .exec_sql("SELECT name FROM schema_migration_details LIMIT 1")
+        .getvalue(0, 0)
 
       Topic.exec_sql("UPDATE schema_migration_details SET created_at = :created_at WHERE name = :name",
                     name: name, created_at: 15.minutes.ago)
@@ -32,7 +32,7 @@ describe TableMigrationHelper do
         new_name: 'table_with_new_name',
         after_migration: name,
         delay: 20.minutes,
-        on_drop: ->(){dropped_proc_called = true}
+        on_drop: ->() { dropped_proc_called = true }
       )
 
       expect(table_exists?('table_with_old_name')).to eq(true)
@@ -43,7 +43,7 @@ describe TableMigrationHelper do
         new_name: 'table_with_new_name',
         after_migration: name,
         delay: 10.minutes,
-        on_drop: ->(){dropped_proc_called = true}
+        on_drop: ->() { dropped_proc_called = true }
       )
 
       expect(table_exists?('table_with_old_name')).to eq(true)
@@ -56,7 +56,7 @@ describe TableMigrationHelper do
         new_name: 'table_with_new_name',
         after_migration: name,
         delay: 10.minutes,
-        on_drop: ->(){dropped_proc_called = true}
+        on_drop: ->() { dropped_proc_called = true }
       )
 
       expect(table_exists?('table_with_old_name')).to eq(false)
diff --git a/spec/components/text_cleaner_spec.rb b/spec/components/text_cleaner_spec.rb
index a41a1e7c1b..8a25c29de8 100644
--- a/spec/components/text_cleaner_spec.rb
+++ b/spec/components/text_cleaner_spec.rb
@@ -191,6 +191,10 @@ describe TextCleaner do
         expect(TextCleaner.clean_title("INVESTIGAÇÃO POLÍTICA NA CÂMARA")).to eq("Investigação política na câmara")
       end
 
+      it "doesn't downcase text if only one word is upcase in a non-ascii alphabet" do
+        expect(TextCleaner.clean_title("«Эта неделя в EVE»")).to eq("«Эта неделя в EVE»")
+      end
+
       it "capitalizes first unicode letter" do
         expect(TextCleaner.clean_title("épico encontro")).to eq("Épico encontro")
       end
diff --git a/spec/components/text_sentinel_spec.rb b/spec/components/text_sentinel_spec.rb
index d1f68cff4c..5707fa9895 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/timeline_lookup_spec.rb b/spec/components/timeline_lookup_spec.rb
index 3e1a2ef02a..e7df6724ec 100644
--- a/spec/components/timeline_lookup_spec.rb
+++ b/spec/components/timeline_lookup_spec.rb
@@ -22,7 +22,7 @@ describe TimelineLookup do
   end
 
   it "respects a `max_values` setting" do
-    input = (1..100).map {|i| [1000+i, i, 100-i] }
+    input = (1..100).map { |i| [1000 + i, i, 100 - i] }
 
     result = TimelineLookup.build(input, 5)
     expect(result.size).to eq(5)
@@ -30,7 +30,7 @@ describe TimelineLookup do
   end
 
   it "respects an uneven `max_values` setting" do
-    input = (1..100).map {|i| [1000+i, i, 100-i] }
+    input = (1..100).map { |i| [1000 + i, i, 100 - i] }
 
     result = TimelineLookup.build(input, 3)
     expect(result.size).to eq(3)
diff --git a/spec/components/topic_creator_spec.rb b/spec/components/topic_creator_spec.rb
index 1e97a81b79..0ed814cae1 100644
--- a/spec/components/topic_creator_spec.rb
+++ b/spec/components/topic_creator_spec.rb
@@ -7,14 +7,23 @@ describe TopicCreator do
   let(:admin)     { Fabricate(:admin) }
 
   let(:valid_attrs) { Fabricate.attributes_for(:topic) }
-  let(:pm_valid_attrs)  { {raw: 'this is a new post', title: 'this is a new title', archetype: Archetype.private_message, target_usernames: moderator.username} }
+  let(:pm_valid_attrs)  { { raw: 'this is a new post', title: 'this is a new title', archetype: Archetype.private_message, target_usernames: moderator.username } }
+
+  let(:pm_to_email_valid_attrs) do
+    {
+      raw: 'this is a new email',
+      title: 'this is a new subject',
+      archetype: Archetype.private_message,
+      target_emails: 'moderator@example.com'
+    }
+  end
 
   describe '#create' do
     context 'topic success cases' 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 +35,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 +66,8 @@ 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
+          SiteSetting.enable_staged_users = true
         end
 
         it "should be possible for a regular user to send private message" do
@@ -68,12 +78,41 @@ describe TopicCreator do
           SiteSetting.min_trust_to_create_topic = TrustLevel[4]
           expect(TopicCreator.create(user, Guardian.new(user), pm_valid_attrs)).to be_valid
         end
+
+        it "should be possible for a trusted user to send private messages via email" do
+          SiteSetting.expects(:enable_private_email_messages).returns(true)
+          SiteSetting.min_trust_to_send_email_messages = TrustLevel[1]
+
+          expect(TopicCreator.create(user, Guardian.new(user), pm_to_email_valid_attrs)).to be_valid
+        end
       end
 
       context 'failure cases' do
+        it "should be rollback the changes when email is invalid" do
+          SiteSetting.expects(:enable_private_email_messages).returns(true)
+          SiteSetting.min_trust_to_send_email_messages = TrustLevel[1]
+          attrs = pm_to_email_valid_attrs.dup
+          attrs[:target_emails] = "t" * 256
+
+          expect do
+            TopicCreator.create(user, Guardian.new(user), attrs)
+          end.to raise_error(ActiveRecord::Rollback)
+        end
+
         it "min_trust_to_send_messages setting should be checked when sending private message" do
           SiteSetting.min_trust_to_send_messages = TrustLevel[4]
-          expect(-> { TopicCreator.create(user, Guardian.new(user), pm_valid_attrs) }).to raise_error(ActiveRecord::Rollback)
+
+          expect do
+            TopicCreator.create(user, Guardian.new(user), pm_valid_attrs)
+          end.to raise_error(ActiveRecord::Rollback)
+        end
+
+        it "min_trust_to_send_email_messages should be checked when sending private messages via email" do
+          SiteSetting.min_trust_to_send_email_messages = TrustLevel[4]
+
+          expect do
+            TopicCreator.create(user, Guardian.new(user), pm_to_email_valid_attrs)
+          end.to raise_error(ActiveRecord::Rollback)
         end
       end
     end
diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb
index 4d542032e4..be119f5309 100644
--- a/spec/components/topic_query_spec.rb
+++ b/spec/components/topic_query_spec.rb
@@ -49,7 +49,7 @@ describe TopicQuery do
         results = results.where('topics.id = ?', topic_query.options[:only_topic_id])
       end
 
-      expect(TopicQuery.new(nil, {only_topic_id: topic1.id}).list_latest.topics.map(&:id)).to eq([topic1.id])
+      expect(TopicQuery.new(nil, only_topic_id: topic1.id).list_latest.topics.map(&:id)).to eq([topic1.id])
 
       TopicQuery.remove_custom_filter(:only_topic_id)
     end
@@ -67,6 +67,34 @@ 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)
@@ -82,7 +110,7 @@ describe TopicQuery do
       query = TopicQuery.new(user, filter: 'bookmarked').list_latest
 
       expect(query.topics.length).to eq(1)
-      expect(query.topics.first.user_data.post_action_data).to eq({PostActionType.types[:bookmark] => [1,2]})
+      expect(query.topics.first.user_data.post_action_data).to eq(PostActionType.types[:bookmark] => [1, 2])
     end
   end
 
@@ -118,7 +146,7 @@ describe TopicQuery do
     end
 
     context 'subcategories' do
-      let!(:subcategory) { Fabricate(:category, parent_category_id: category.id)}
+      let!(:subcategory) { Fabricate(:category, parent_category_id: category.id) }
 
       it "works with subcategories" do
         expect(TopicQuery.new(moderator, category: category.id).list_latest.topics.size).to eq(1)
@@ -139,9 +167,9 @@ describe TopicQuery do
 
     context "no category filter" do
       # create some topics before each test:
-      let!(:tagged_topic1) { Fabricate(:topic, {tags: [tag]}) }
-      let!(:tagged_topic2) { Fabricate(:topic, {tags: [other_tag]}) }
-      let!(:tagged_topic3) { Fabricate(:topic, {tags: [tag, other_tag]}) }
+      let!(:tagged_topic1) { Fabricate(:topic, tags: [tag]) }
+      let!(:tagged_topic2) { Fabricate(:topic, tags: [other_tag]) }
+      let!(:tagged_topic3) { Fabricate(:topic, tags: [tag, other_tag]) }
       let!(:no_tags_topic) { Fabricate(:topic) }
 
       it "returns topics with the tag when filtered to it" do
@@ -178,10 +206,10 @@ describe TopicQuery do
       let(:category2) { Fabricate(:category) }
 
       it "returns topics in the given category with the given tag" do
-        tagged_topic1 = Fabricate(:topic, {category: category1, tags: [tag]})
-        tagged_topic2 = Fabricate(:topic, {category: category2, tags: [tag]})
-        tagged_topic3 = Fabricate(:topic, {category: category1, tags: [tag, other_tag]})
-        no_tags_topic = Fabricate(:topic, {category: category1})
+        tagged_topic1 = Fabricate(:topic, category: category1, tags: [tag])
+        tagged_topic2 = Fabricate(:topic, category: category2, tags: [tag])
+        tagged_topic3 = Fabricate(:topic, category: category1, tags: [tag, other_tag])
+        no_tags_topic = Fabricate(:topic, category: category1)
 
         expect(TopicQuery.new(moderator, category: category1.id, tags: [tag.name]).list_latest.topics.map(&:id).sort).to eq([tagged_topic1.id, tagged_topic3.id].sort)
         expect(TopicQuery.new(moderator, category: category2.id, tags: [other_tag.name]).list_latest.topics.size).to eq(0)
@@ -304,7 +332,7 @@ describe TopicQuery do
 
       context 'sort_order' do
 
-        def ids_in_order(order, descending=true)
+        def ids_in_order(order, descending = true)
           TopicQuery.new(admin, order: order, ascending: descending ? 'false' : 'true').list_latest.topics.map(&:id)
         end
 
@@ -358,14 +386,12 @@ describe TopicQuery do
           # returns the topics in reverse sheep order if requested" do
           expect(ids_in_order('sheep', false)).to eq([invisible_topic, regular_topic, closed_topic, pinned_topic, future_topic, archived_topic].map(&:id))
 
-
         end
 
       end
 
     end
 
-
     context 'after clearring a pinned topic' do
       before do
         pinned_topic.clear_pin_for(user)
@@ -431,13 +457,13 @@ describe TopicQuery do
         first = create_post(raw: 'this is the first post', title: 'super amazing title')
 
         _whisper = create_post(topic_id: first.topic.id,
-                              post_type: Post.types[:whisper],
-                              raw: 'this is a whispered reply')
+                               post_type: Post.types[:whisper],
+                               raw: 'this is a whispered reply')
 
         topic_id = first.topic.id
 
-        TopicUser.update_last_read(user, topic_id, first.post_number, 1)
-        TopicUser.update_last_read(admin, topic_id, first.post_number, 1)
+        TopicUser.update_last_read(user, topic_id, first.post_number, 1, 1)
+        TopicUser.update_last_read(admin, topic_id, first.post_number, 1, 1)
 
         TopicUser.change(user.id, topic_id, notification_level: TopicUser.notification_levels[:tracking])
         TopicUser.change(admin.id, topic_id, notification_level: TopicUser.notification_levels[:tracking])
@@ -452,8 +478,8 @@ describe TopicQuery do
       let!(:fully_read) { Fabricate(:post, user: creator).topic }
 
       before do
-        TopicUser.update_last_read(user, partially_read.id, 0, 0)
-        TopicUser.update_last_read(user, fully_read.id, 1, 0)
+        TopicUser.update_last_read(user, partially_read.id, 0, 0, 0)
+        TopicUser.update_last_read(user, fully_read.id, 1, 1, 0)
       end
 
       context 'list_unread' do
@@ -489,7 +515,7 @@ describe TopicQuery do
     end
 
     context 'preload api' do
-      let(:topics) { }
+      let(:topics) {}
 
       it "preloads data correctly" do
         TopicList.preloaded_custom_fields << "tag"
@@ -497,13 +523,13 @@ describe TopicQuery do
         TopicList.preloaded_custom_fields << "foo"
 
         topic = Fabricate.build(:topic, user: creator, bumped_at: 10.minutes.ago)
-        topic.custom_fields["tag"] = ["a","b","c"]
+        topic.custom_fields["tag"] = ["a", "b", "c"]
         topic.custom_fields["age"] = 22
         topic.save
 
         new_topic = topic_query.list_new.topics.first
 
-        expect(new_topic.custom_fields["tag"].sort).to eq(["a","b","c"])
+        expect(new_topic.custom_fields["tag"].sort).to eq(["a", "b", "c"])
         expect(new_topic.custom_fields["age"]).to eq("22")
 
         expect(new_topic.custom_field_preloaded?("tag")).to eq(true)
@@ -514,7 +540,7 @@ describe TopicQuery do
         TopicList.preloaded_custom_fields.clear
 
         # if we attempt to access non preloaded fields explode
-        expect{new_topic.custom_fields["boom"]}.to raise_error(StandardError)
+        expect { new_topic.custom_fields["boom"] }.to raise_error(StandardError)
 
       end
     end
@@ -523,7 +549,6 @@ describe TopicQuery do
       let!(:new_topic) { Fabricate(:topic, user: creator, bumped_at: 10.minutes.ago) }
       let(:topics) { topic_query.list_new.topics }
 
-
       it "contains no new topics for a user that has missed the window" do
 
         expect(topic_query.list_new.topics).to eq([new_topic])
@@ -577,7 +602,7 @@ describe TopicQuery do
 
     context "topic you've posted in" do
       let(:other_users_topic) { create_post(user: creator).topic }
-      let!(:your_post) { create_post(user: user, topic: other_users_topic )}
+      let!(:your_post) { create_post(user: user, topic: other_users_topic) }
 
       it "includes the posted topic" do
         expect(topics.include?(other_users_topic)).to eq(true)
@@ -594,7 +619,7 @@ describe TopicQuery do
       context "but interacted with" do
 
         it "is not included if read" do
-          TopicUser.update_last_read(user, other_users_topic.id, 0, 0)
+          TopicUser.update_last_read(user, other_users_topic.id, 0, 0, 0)
 
           expect(topics).to be_blank
         end
@@ -631,7 +656,7 @@ describe TopicQuery do
       group
     end
 
-    def create_pm(user, opts=nil)
+    def create_pm(user, opts = nil)
       unless opts
         opts = user
         user = nil
@@ -640,30 +665,27 @@ describe TopicQuery do
       create_post(opts.merge(user: user, archetype: Archetype.private_message)).topic
     end
 
-    def read(user,topic,post_number)
-      TopicUser.update_last_read(user, topic, post_number, 10000)
+    def read(user, topic, post_number)
+      TopicUser.update_last_read(user, topic, post_number, post_number, 10000)
     end
 
     it 'returns the correct suggestions' do
 
-
-      pm_to_group  = create_pm(sender, target_group_names: [group_with_user.name])
+      pm_to_group = create_pm(sender, target_group_names: [group_with_user.name])
       pm_to_user = create_pm(sender, target_usernames: [user.username])
 
-      new_pm  = create_pm(target_usernames: [user.username])
+      new_pm = create_pm(target_usernames: [user.username])
 
-      unread_pm  = create_pm(target_usernames: [user.username])
-      read(user,unread_pm, 0)
+      unread_pm = create_pm(target_usernames: [user.username])
+      read(user, unread_pm, 0)
 
       old_unrelated_pm = create_pm(target_usernames: [user.username])
       read(user, old_unrelated_pm, 1)
 
-
       related_by_user_pm = create_pm(sender, target_usernames: [user.username])
       read(user, related_by_user_pm, 1)
 
-
-      related_by_group_pm  = create_pm(sender, target_group_names: [group_with_user.name])
+      related_by_group_pm = create_pm(sender, target_group_names: [group_with_user.name])
       read(user, related_by_group_pm, 1)
 
       expect(TopicQuery.new(user).list_suggested_for(pm_to_group).topics.map(&:id)).to(
@@ -678,7 +700,7 @@ describe TopicQuery do
 
   context 'suggested_for' do
     def clear_cache!
-      $redis.keys('random_topic_cache*').each{|k| $redis.del k}
+      $redis.keys('random_topic_cache*').each { |k| $redis.del k }
     end
 
     before do
@@ -713,7 +735,7 @@ describe TopicQuery do
         tt = topic
         # lets clear cache once category is created - working around caching is hard
         clear_cache!
-        topic_query.list_suggested_for(tt).topics.map{|t| t.id}
+        topic_query.list_suggested_for(tt).topics.map { |t| t.id }
       }
 
       it "should return empty results when there is nothing to find" do
@@ -740,6 +762,65 @@ describe TopicQuery do
 
       end
 
+      context 'with private messages' do
+        let(:group_user) { Fabricate(:user) }
+        let(:group) { Fabricate(:group) }
+        let(:another_group) { Fabricate(:group) }
+
+        let!(:topic) do
+          Fabricate(:private_message_topic,
+            topic_allowed_users: [
+              Fabricate.build(:topic_allowed_user, user: user)
+            ],
+            topic_allowed_groups: [
+              Fabricate.build(:topic_allowed_group, group: group)
+            ]
+          )
+        end
+
+        let!(:private_message) do
+          Fabricate(:private_message_topic,
+            topic_allowed_users: [
+              Fabricate.build(:topic_allowed_user, user: user)
+            ],
+            topic_allowed_groups: [
+              Fabricate.build(:topic_allowed_group, group: group),
+              Fabricate.build(:topic_allowed_group, group: another_group),
+            ]
+          )
+        end
+
+        let!(:private_group_topic) do
+          Fabricate(:private_message_topic,
+            user: Fabricate(:user),
+            topic_allowed_groups: [
+              Fabricate.build(:topic_allowed_group, group: group)
+            ]
+          )
+        end
+
+        before do
+          group.add(group_user)
+          another_group.add(user)
+        end
+
+        describe 'as user not part of group' do
+          let!(:user) { Fabricate(:user) }
+
+          it 'should not return topics by the group user' do
+            expect(suggested_topics).to eq([private_message.id])
+          end
+        end
+
+        describe 'as user part of group' do
+          let!(:user) { group_user }
+
+          it 'should return the group topics' do
+            expect(suggested_topics).to eq([private_group_topic.id, private_message.id])
+          end
+        end
+      end
+
       context 'with some existing topics' do
         let!(:partially_read) { Fabricate(:post, user: creator).topic }
         let!(:new_topic) { Fabricate(:post, user: creator).topic }
@@ -753,23 +834,22 @@ describe TopicQuery do
         before do
           user.user_option.auto_track_topics_after_msecs = 0
           user.user_option.save
-          TopicUser.update_last_read(user, partially_read.id, 0, 0)
-          TopicUser.update_last_read(user, fully_read.id, 1, 0)
-          TopicUser.update_last_read(user, fully_read_closed.id, 1, 0)
-          TopicUser.update_last_read(user, fully_read_archived.id, 1, 0)
+          TopicUser.update_last_read(user, partially_read.id, 0, 0, 0)
+          TopicUser.update_last_read(user, fully_read.id, 1, 1, 0)
+          TopicUser.update_last_read(user, fully_read_closed.id, 1, 1, 0)
+          TopicUser.update_last_read(user, fully_read_archived.id, 1, 1, 0)
           fully_read_closed.closed = true
           fully_read_closed.save
           fully_read_archived.archived = true
           fully_read_archived.save
         end
 
-
         it "returns unread, then new, then random" do
           SiteSetting.suggested_topics = 7
           expect(suggested_topics[0]).to eq(partially_read.id)
-          expect(suggested_topics[1,3]).to include(new_topic.id)
-          expect(suggested_topics[1,3]).to include(closed_topic.id)
-          expect(suggested_topics[1,3]).to include(archived_topic.id)
+          expect(suggested_topics[1, 3]).to include(new_topic.id)
+          expect(suggested_topics[1, 3]).to include(closed_topic.id)
+          expect(suggested_topics[1, 3]).to include(archived_topic.id)
 
           # The line below appears to randomly fail, no idea why need to restructure test
           #expect(suggested_topics[4]).to eq(fully_read.id)
@@ -784,9 +864,9 @@ describe TopicQuery do
         it "won't return fully read if there are enough partially read topics and new topics" do
           SiteSetting.suggested_topics = 4
           expect(suggested_topics[0]).to eq(partially_read.id)
-          expect(suggested_topics[1,3]).to include(new_topic.id)
-          expect(suggested_topics[1,3]).to include(closed_topic.id)
-          expect(suggested_topics[1,3]).to include(archived_topic.id)
+          expect(suggested_topics[1, 3]).to include(new_topic.id)
+          expect(suggested_topics[1, 3]).to include(closed_topic.id)
+          expect(suggested_topics[1, 3]).to include(archived_topic.id)
         end
 
       end
diff --git a/spec/components/topic_retriever_spec.rb b/spec/components/topic_retriever_spec.rb
index a5180b8c32..5362448195 100644
--- a/spec/components/topic_retriever_spec.rb
+++ b/spec/components/topic_retriever_spec.rb
@@ -31,9 +31,9 @@ describe TopicRetriever do
     end
 
     context "when host is not invalid" do
-        before do
-          topic_retriever.stubs(:invalid_url?).returns(false)
-        end
+      before do
+        topic_retriever.stubs(:invalid_url?).returns(false)
+      end
 
       context "when topics have been retrieived recently" do
         before do
diff --git a/spec/components/topic_view_spec.rb b/spec/components/topic_view_spec.rb
index c041d4e4fe..3e8897ae53 100644
--- a/spec/components/topic_view_spec.rb
+++ b/spec/components/topic_view_spec.rb
@@ -43,9 +43,9 @@ describe TopicView do
   end
 
   context "with a few sample posts" do
-    let!(:p1) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 1 )}
-    let!(:p2) { Fabricate(:post, topic: topic, user: coding_horror, percent_rank: 0.5 )}
-    let!(:p3) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 0 )}
+    let!(:p1) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 1) }
+    let!(:p2) { Fabricate(:post, topic: topic, user: coding_horror, percent_rank: 0.5) }
+    let!(:p3) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 0) }
 
     let(:moderator) { Fabricate(:moderator) }
     let(:admin) { Fabricate(:admin) }
@@ -64,13 +64,12 @@ describe TopicView do
       best = TopicView.new(topic.id, nil, best: 99)
       expect(best.posts.count).to eq(2)
       expect(best.filtered_post_ids.size).to eq(3)
-      expect(best.current_post_ids).to match_array([p2.id, p3.id])
+      expect(best.posts.pluck(:id)).to match_array([p2.id, p3.id])
 
       # should get no results for trust level too low
       best = TopicView.new(topic.id, nil, best: 99, min_trust_level: coding_horror.trust_level + 1)
       expect(best.posts.count).to eq(0)
 
-
       # should filter out the posts with a score that is too low
       best = TopicView.new(topic.id, nil, best: 99, min_score: 99)
       expect(best.posts.count).to eq(0)
@@ -134,7 +133,7 @@ describe TopicView do
       end
 
       it "generates a canonical correctly for paged results" do
-        expect(TopicView.new(1234, user, post_number: 10 * TopicView.chunk_size )
+        expect(TopicView.new(1234, user, post_number: 10 * TopicView.chunk_size)
           .canonical_path).to eql("/1234?page=10")
       end
     end
@@ -161,13 +160,18 @@ describe TopicView do
     end
 
     context '.post_counts_by_user' do
-      it 'returns the two posters with their counts' do
-        expect(topic_view.post_counts_by_user.to_a).to match_array([[first_poster.id, 2], [coding_horror.id, 1]])
+      it 'returns the two posters with their appropriate counts' do
+        Fabricate(:post, topic: topic, user: coding_horror, post_type: Post.types[:whisper])
+
+        expect(topic_view.post_counts_by_user.to_a).to match_array([[first_poster.id, 2], [coding_horror.id, 2]])
+
+        expect(TopicView.new(topic.id, first_poster).post_counts_by_user.to_a).to match_array([[first_poster.id, 2], [coding_horror.id, 1]])
       end
 
       it "doesn't return counts for posts with authors who have been deleted" do
         p2.user_id = nil
         p2.save!
+
         expect(topic_view.post_counts_by_user.to_a).to match_array([[first_poster.id, 2]])
       end
     end
@@ -211,7 +215,6 @@ describe TopicView do
       end
     end
 
-
     context '.read?' do
       it 'tracks correctly' do
         # anon is assumed to have read everything
@@ -223,7 +226,7 @@ describe TopicView do
         coding_horror.created_at = 2.days.ago
 
         # a real user that just read it should have it marked
-        PostTiming.process_timings(coding_horror, topic.id, 1, [[1,1000]])
+        PostTiming.process_timings(coding_horror, topic.id, 1, [[1, 1000]])
         expect(TopicView.new(topic.id, coding_horror).read?(1)).to eq(true)
         expect(TopicView.new(topic.id, coding_horror).topic_user).to be_present
       end
@@ -277,13 +280,13 @@ describe TopicView do
   context '.posts' do
 
     # Create the posts in a different order than the sort_order
-    let!(:p5) { Fabricate(:post, topic: topic, user: coding_horror)}
-    let!(:p2) { Fabricate(:post, topic: topic, user: coding_horror)}
-    let!(:p6) { Fabricate(:post, topic: topic, user: Fabricate(:user), deleted_at: Time.now)}
-    let!(:p4) { Fabricate(:post, topic: topic, user: coding_horror, deleted_at: Time.now)}
-    let!(:p1) { Fabricate(:post, topic: topic, user: first_poster)}
-    let!(:p7) { Fabricate(:post, topic: topic, user: coding_horror, deleted_at: Time.now)}
-    let!(:p3) { Fabricate(:post, topic: topic, user: first_poster)}
+    let!(:p5) { Fabricate(:post, topic: topic, user: coding_horror) }
+    let!(:p2) { Fabricate(:post, topic: topic, user: coding_horror) }
+    let!(:p6) { Fabricate(:post, topic: topic, user: Fabricate(:user), deleted_at: Time.now) }
+    let!(:p4) { Fabricate(:post, topic: topic, user: coding_horror, deleted_at: Time.now) }
+    let!(:p1) { Fabricate(:post, topic: topic, user: first_poster) }
+    let!(:p7) { Fabricate(:post, topic: topic, user: coding_horror, deleted_at: Time.now) }
+    let!(:p3) { Fabricate(:post, topic: topic, user: first_poster) }
 
     before do
       TopicView.stubs(:chunk_size).returns(3)
@@ -320,15 +323,14 @@ describe TopicView do
       topic.category_id = category.id
       topic.save!
 
-      expect{
+      expect {
         TopicView.new(topic.id, coding_horror).posts.count
       }.to raise_error(Discourse::InvalidAccess)
 
-      expect(TopicView.new(t2.id, coding_horror, post_ids: [p1.id,p2.id]).posts.count).to eq(0)
+      expect(TopicView.new(t2.id, coding_horror, post_ids: [p1.id, p2.id]).posts.count).to eq(0)
 
     end
 
-
     describe '#filter_posts_paged' do
       before { TopicView.stubs(:chunk_size).returns(2) }
 
@@ -342,7 +344,7 @@ describe TopicView do
 
     describe "filter_posts_near" do
 
-      def topic_view_near(post, show_deleted=false)
+      def topic_view_near(post, show_deleted = false)
         TopicView.new(topic.id, coding_horror, post_number: post.post_number, show_deleted: show_deleted)
       end
 
@@ -372,8 +374,8 @@ describe TopicView do
         near_view = topic_view_near(p3)
         expect(near_view.desired_post).to eq(p3)
         expect(near_view.posts).to eq([p2, p3, p5])
-        expect(near_view.gaps.before).to eq({p5.id => [p4.id]})
-        expect(near_view.gaps.after).to eq({p5.id => [p6.id, p7.id]})
+        expect(near_view.gaps.before).to eq(p5.id => [p4.id])
+        expect(near_view.gaps.after).to eq(p5.id => [p6.id, p7.id])
       end
 
       it "returns deleted posts to an admin with show_deleted" do
@@ -390,8 +392,8 @@ describe TopicView do
         expect(near_view.desired_post).to eq(p5)
         # note: both p4 and p6 get skipped
         expect(near_view.posts).to eq([p2, p3, p5])
-        expect(near_view.gaps.before).to eq({p5.id => [p4.id]})
-        expect(near_view.gaps.after).to eq({p5.id => [p6.id, p7.id]})
+        expect(near_view.gaps.before).to eq(p5.id => [p4.id])
+        expect(near_view.gaps.after).to eq(p5.id => [p6.id, p7.id])
       end
 
       it "returns deleted posts by nuked users to an admin with show_deleted" do
@@ -415,8 +417,8 @@ describe TopicView do
           coding_horror.admin = true
           near_view = topic_view_near(p5)
           expect(near_view.posts).to eq([p1, p2, p3, p5])
-          expect(near_view.gaps.before).to eq({p5.id => [p4.id]})
-          expect(near_view.gaps.after).to eq({p5.id => [p6.id, p7.id]})
+          expect(near_view.gaps.before).to eq(p5.id => [p4.id])
+          expect(near_view.gaps.after).to eq(p5.id => [p6.id, p7.id])
         end
 
         it 'returns deleted posts to admins' do
@@ -497,4 +499,3 @@ describe TopicView do
     end
   end
 end
-
diff --git a/spec/components/topics_bulk_action_spec.rb b/spec/components/topics_bulk_action_spec.rb
index 91168ccc40..a30ba34fa2 100644
--- a/spec/components/topics_bulk_action_spec.rb
+++ b/spec/components/topics_bulk_action_spec.rb
@@ -66,7 +66,7 @@ describe TopicsBulkAction do
   end
 
   describe "delete" do
-    let(:topic) { Fabricate(:topic) }
+    let(:topic) { Fabricate(:post).topic }
     let(:moderator) { Fabricate(:moderator) }
 
     it "deletes the topic" do
diff --git a/spec/components/trashable_spec.rb b/spec/components/trashable_spec.rb
index 6cebdc50b4..89d8b5ba7a 100644
--- a/spec/components/trashable_spec.rb
+++ b/spec/components/trashable_spec.rb
@@ -7,8 +7,7 @@ describe Trashable do
     p1 = Fabricate(:post)
     p2 = Fabricate(:post)
 
-    expect { p1.trash! }.to change{Post.count}.by(-1)
+    expect { p1.trash! }.to change { Post.count }.by(-1)
     expect(Post.with_deleted.count).to eq(Post.count + 1)
   end
 end
-
diff --git a/spec/components/unread_spec.rb b/spec/components/unread_spec.rb
index 21e4b28b59..c7789d94eb 100644
--- a/spec/components/unread_spec.rb
+++ b/spec/components/unread_spec.rb
@@ -36,7 +36,6 @@ describe Unread do
     end
   end
 
-
   describe 'unread_posts' do
     it 'should have 0 unread posts if the user has seen all posts' do
       topic_user.last_read_post_number = 13
diff --git a/spec/components/url_helper_spec.rb b/spec/components/url_helper_spec.rb
index 972f3daa56..2dd48c726c 100644
--- a/spec/components/url_helper_spec.rb
+++ b/spec/components/url_helper_spec.rb
@@ -79,4 +79,26 @@ describe UrlHelper do
 
   end
 
+  describe "#escape_uri" do
+    it "doesn't escape simple URL" do
+      url = UrlHelper.escape_uri('http://example.com/foo/bar')
+      expect(url).to eq('http://example.com/foo/bar')
+    end
+
+    it "escapes unsafe chars" do
+      url = UrlHelper.escape_uri("http://example.com/?a=\11\15")
+      expect(url).to eq('http://example.com/?a=%09%0D')
+    end
+
+    it "escapes non-ascii chars" do
+      url = UrlHelper.escape_uri('http://example.com/ماهی')
+      expect(url).to eq('http://example.com/%D9%85%D8%A7%D9%87%DB%8C')
+    end
+
+    it "doesn't escape already escaped chars" do
+      url = UrlHelper.escape_uri('http://example.com/foo%20bar/foo bar/')
+      expect(url).to eq('http://example.com/foo%20bar/foo%20bar/')
+    end
+  end
+
 end
diff --git a/spec/components/validators/allowed_ip_address_validator_spec.rb b/spec/components/validators/allowed_ip_address_validator_spec.rb
index b2af99f5b7..aa5c074fd4 100644
--- a/spec/components/validators/allowed_ip_address_validator_spec.rb
+++ b/spec/components/validators/allowed_ip_address_validator_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe AllowedIpAddressValidator do
 
   let(:record) { Fabricate.build(:user, trust_level: TrustLevel[0], ip_address: '99.232.23.123') }
-  let(:validator) { described_class.new({attributes: :ip_address}) }
+  let(:validator) { described_class.new(attributes: :ip_address) }
   subject(:validate) { validator.validate_each(record, :ip_address, record.ip_address) }
 
   context "ip address should be blocked" do
diff --git a/spec/components/validators/email_validator_spec.rb b/spec/components/validators/email_validator_spec.rb
index bb7d6cb6ec..42ff521375 100644
--- a/spec/components/validators/email_validator_spec.rb
+++ b/spec/components/validators/email_validator_spec.rb
@@ -2,9 +2,9 @@ require 'rails_helper'
 
 describe EmailValidator do
 
-  let(:record) { }
-  let(:validator) { described_class.new({attributes: :email}) }
-  subject(:validate) { validator.validate_each(record,:email,record.email) }
+  let(:record) {}
+  let(:validator) { described_class.new(attributes: :email) }
+  subject(:validate) { validator.validate_each(record, :email, record.email) }
 
   def blocks?(email)
     user = Fabricate.build(:user, email: email)
@@ -21,15 +21,26 @@ describe EmailValidator do
     it "adds an error when email matches a blocked email" do
       ScreenedEmail.create!(email: 'sam@sam.com', action_type: ScreenedEmail.actions[:block])
       expect(blocks?('sam@sam.com')).to eq(true)
+      expect(blocks?('SAM@sam.com')).to eq(true)
     end
 
     it "blocks based on email_domains_blacklist" do
       SiteSetting.email_domains_blacklist = "email.com|mail.com|e-mail.com"
       expect(blocks?('sam@email.com')).to eq(true)
+      expect(blocks?('sam@EMAIL.com')).to eq(true)
       expect(blocks?('sam@bob.email.com')).to eq(true)
       expect(blocks?('sam@e-mail.com')).to eq(true)
       expect(blocks?('sam@googlemail.com')).to eq(false)
     end
+
+    it "blocks based on email_domains_whitelist" do
+      SiteSetting.email_domains_whitelist = "googlemail.com|email.com"
+      expect(blocks?('sam@email.com')).to eq(false)
+      expect(blocks?('sam@EMAIL.com')).to eq(false)
+      expect(blocks?('sam@bob.email.com')).to eq(false)
+      expect(blocks?('sam@e-mail.com')).to eq(true)
+      expect(blocks?('sam@googlemail.com')).to eq(false)
+    end
   end
 
   context '.email_regex' do
diff --git a/spec/components/validators/enable_sso_validator_spec.rb b/spec/components/validators/enable_sso_validator_spec.rb
new file mode 100644
index 0000000000..d60c7b1b75
--- /dev/null
+++ b/spec/components/validators/enable_sso_validator_spec.rb
@@ -0,0 +1,48 @@
+require 'rails_helper'
+
+RSpec.describe EnableSsoValidator do
+  subject { described_class.new }
+
+  describe '#valid_value?' do
+    describe "when 'sso url' is empty" do
+      before do
+        SiteSetting.sso_url = ""
+      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.sso_url_is_empty'
+          ))
+        end
+      end
+    end
+
+    describe "when 'sso url' is present" do
+      before do
+        SiteSetting.sso_url = "https://www.example.com/sso"
+      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
+
+  end
+end
diff --git a/spec/components/validators/integer_setting_validator_spec.rb b/spec/components/validators/integer_setting_validator_spec.rb
index db0b1cd281..3f7b0f2a72 100644
--- a/spec/components/validators/integer_setting_validator_spec.rb
+++ b/spec/components/validators/integer_setting_validator_spec.rb
@@ -31,11 +31,11 @@ describe IntegerSettingValidator do
         expect(validator.valid_value?('0')).to eq(true)
       end
 
-      it "defaults max to 20000" do
-        expect(validator.valid_value?(20001)).to eq(false)
-        expect(validator.valid_value?('20001')).to eq(false)
-        expect(validator.valid_value?(20000)).to eq(true)
-        expect(validator.valid_value?('20000')).to eq(true)
+      it "defaults max to 2_000_000_000" do
+        expect(validator.valid_value?(2_000_000_001)).to eq(false)
+        expect(validator.valid_value?('2000000001')).to eq(false)
+        expect(validator.valid_value?(2_000_000_000)).to eq(true)
+        expect(validator.valid_value?('2000000000')).to eq(true)
       end
     end
 
diff --git a/spec/components/validators/ip_address_format_validator_spec.rb b/spec/components/validators/ip_address_format_validator_spec.rb
index a91c2d85cd..77d0800986 100644
--- a/spec/components/validators/ip_address_format_validator_spec.rb
+++ b/spec/components/validators/ip_address_format_validator_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe IpAddressFormatValidator do
 
   let(:record) { Fabricate.build(:screened_ip_address, ip_address: '99.232.23.123') }
-  let(:validator) { described_class.new({attributes: :ip_address}) }
+  let(:validator) { described_class.new(attributes: :ip_address) }
   subject(:validate) { validator.validate_each(record, :ip_address, record.ip_address) }
 
   ['99.232.23.123', '99.232.0.0/16', 'fd12:db8::ff00:42:8329', 'fc00::/7'].each do |arg|
diff --git a/spec/components/validators/password_validator_spec.rb b/spec/components/validators/password_validator_spec.rb
index 92f6095c3f..1e6cc4cde0 100644
--- a/spec/components/validators/password_validator_spec.rb
+++ b/spec/components/validators/password_validator_spec.rb
@@ -7,8 +7,8 @@ describe PasswordValidator do
     I18n.t("activerecord.errors.models.user.attributes.password.#{key.to_s}")
   end
 
-  let(:validator) { described_class.new({attributes: :password}) }
-  subject(:validate) { validator.validate_each(record,:password,@password) }
+  let(:validator) { described_class.new(attributes: :password) }
+  subject(:validate) { validator.validate_each(record, :password, @password) }
 
   context "password required" do
     let(:record) { u = Fabricate.build(:user, password: @password); u.password_required!; u }
@@ -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
@@ -134,6 +134,19 @@ describe PasswordValidator do
       validate
       expect(record.errors[:password]).to include(password_error_message(:same_as_current))
     end
+
+    it "validation required if password is required" do
+      expect(record.password_validation_required?).to eq(true)
+    end
+
+    it "validation not required after save until a new password is set" do
+      @password = "myoldpassword"
+      record.save!
+      record.reload
+      expect(record.password_validation_required?).to eq(false)
+      record.password = "mynewpassword"
+      expect(record.password_validation_required?).to eq(true)
+    end
   end
 
   context "password not required" do
@@ -144,6 +157,17 @@ describe PasswordValidator do
       validate
       expect(record.errors[:password]).not_to be_present
     end
+
+    it "validation required if a password is set" do
+      @password = "mygameshow"
+      expect(record.password_validation_required?).to eq(true)
+    end
+
+    it "adds an error even password not required" do
+      @password = "p"
+      validate
+      expect(record.errors[:password]).to be_present
+    end
   end
 
 end
diff --git a/spec/components/validators/post_validator_spec.rb b/spec/components/validators/post_validator_spec.rb
index 25893f34e5..008e92fa16 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/quality_title_validator_spec.rb b/spec/components/validators/quality_title_validator_spec.rb
index b6bf864a80..10e53a1066 100644
--- a/spec/components/validators/quality_title_validator_spec.rb
+++ b/spec/components/validators/quality_title_validator_spec.rb
@@ -7,20 +7,20 @@ require 'ostruct'
 module QualityTitleValidatorSpec
   class Validatable < OpenStruct
     include ActiveModel::Validations
-    validates :title, :quality_title => { :unless => :private_message? }
+    validates :title, quality_title: { unless: :private_message? }
   end
 end
 
 describe "A record validated with QualityTitleValidator" do
-  let(:valid_title){ "hello this is my cool topic! welcome: all;" }
-  let(:short_title){ valid_title.slice(0, SiteSetting.min_topic_title_length - 1) }
-  let(:long_title ){ valid_title.center(SiteSetting.max_topic_title_length + 1, 'x') }
-  let(:xxxxx_title){ valid_title.gsub(/./,'x')}
+  let(:valid_title) { "hello this is my cool topic! welcome: all;" }
+  let(:short_title) { valid_title.slice(0, SiteSetting.min_topic_title_length - 1) }
+  let(:long_title) { valid_title.center(SiteSetting.max_topic_title_length + 1, 'x') }
+  let(:xxxxx_title) { valid_title.gsub(/./, 'x') }
 
-  subject(:topic){ QualityTitleValidatorSpec::Validatable.new }
+  subject(:topic) { QualityTitleValidatorSpec::Validatable.new }
 
   before(:each) do
-    topic.stubs(:private_message? => false)
+    topic.stubs(private_message?: false)
   end
 
   it "allows a regular title with a few ascii characters" do
@@ -39,7 +39,7 @@ describe "A record validated with QualityTitleValidator" do
   end
 
   it "allows anything in a private message" do
-    topic.stubs(:private_message? => true)
+    topic.stubs(private_message?: true)
     [short_title, long_title, xxxxx_title].each do |bad_title|
       topic.title = bad_title
       expect(topic).to be_valid
@@ -75,4 +75,3 @@ describe "A record validated with QualityTitleValidator" do
   #   end
   # end
 end
-
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 0000000000..6af0695dfe
--- /dev/null
+++ b/spec/components/validators/sso_overrides_email_validator_spec.rb
@@ -0,0 +1,73 @@
+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.sso_url = "https://www.example.com/sso"
+        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.sso_url = "https://www.example.com/sso"
+        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 2f960247ad..58068ae7f2 100644
--- a/spec/components/validators/topic_title_length_validator_spec.rb
+++ b/spec/components/validators/topic_title_length_validator_spec.rb
@@ -7,8 +7,8 @@ describe TopicTitleLengthValidator do
 
   # simulate Rails behavior (singleton)
   def validate
-    @validator ||= TopicTitleLengthValidator.new({ attributes: :title })
-    @validator.validate_each(record,:title,record.title)
+    @validator ||= TopicTitleLengthValidator.new(attributes: :title)
+    @validator.validate_each(record, :title, record.title)
   end
 
   shared_examples "validating any topic title" do
@@ -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/url_validator_spec.rb b/spec/components/validators/url_validator_spec.rb
new file mode 100644
index 0000000000..4278fc2ecb
--- /dev/null
+++ b/spec/components/validators/url_validator_spec.rb
@@ -0,0 +1,35 @@
+require 'rails_helper'
+require 'validators/topic_title_length_validator'
+
+RSpec.describe UrlValidator do
+  let(:record) { Fabricate.build(:user_profile, user: Fabricate.build(:user)) }
+  let(:validator) { described_class.new(attributes: :website) }
+  subject(:validate) { validator.validate_each(record, :website, record.website) }
+
+  [
+    "http://https://google.com",
+    "http://google/",
+    "ftp://ftp.google.com",
+    "http:///what.is.this",
+    'http://meta.discourse.org TEST'
+  ].each do |invalid_url|
+    it "#{invalid_url} should not be valid" do
+      record.website = invalid_url
+      validate
+      expect(record.errors[:website]).to be_present
+    end
+  end
+
+  [
+    "http://discourse.productions",
+    "https://google.com",
+    'http://xn--nw2a.xn--j6w193g/',
+    "http://見.香港/",
+  ].each do |valid_url|
+    it "#{valid_url} should be valid" do
+      record.website = valid_url
+      validate
+      expect(record.errors[:website]).to_not be_present
+    end
+  end
+end
diff --git a/spec/components/validators/user_full_name_validator_spec.rb b/spec/components/validators/user_full_name_validator_spec.rb
index bfa57b74b4..b6b6829347 100644
--- a/spec/components/validators/user_full_name_validator_spec.rb
+++ b/spec/components/validators/user_full_name_validator_spec.rb
@@ -1,12 +1,12 @@
 require "rails_helper"
 
 describe UserFullNameValidator do
-  let(:validator) { described_class.new({attributes: :name}) }
-  subject(:validate) { validator.validate_each(record,:name,@name) }
+  let(:validator) { described_class.new(attributes: :name) }
+  subject(:validate) { validator.validate_each(record, :name, @name) }
   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/components/validators/username_setting_validator_spec.rb b/spec/components/validators/username_setting_validator_spec.rb
index 8e06e4fd83..8b302bba35 100644
--- a/spec/components/validators/username_setting_validator_spec.rb
+++ b/spec/components/validators/username_setting_validator_spec.rb
@@ -17,5 +17,26 @@ describe UsernameSettingValidator do
     it "returns false if value does not match a user's username" do
       expect(validator.valid_value?('no way')).to eq(false)
     end
+
+    context "regex support" do
+      let!(:darthvader) { Fabricate(:user, username: 'darthvader') }
+      let!(:luke) { Fabricate(:user, username: 'luke') }
+
+      it "returns false if regex doesn't match" do
+        v = described_class.new(regex: 'darth')
+        expect(v.valid_value?('luke')).to eq(false)
+        expect(v.valid_value?('vader')).to eq(false)
+      end
+
+      it "returns true if regex matches" do
+        v = described_class.new(regex: 'darth')
+        expect(v.valid_value?('darthvader')).to eq(true)
+      end
+
+      it "returns false if regex matches but username doesn't match a user" do
+        v = described_class.new(regex: 'darth')
+        expect(v.valid_value?('darthmaul')).to eq(false)
+      end
+    end
   end
 end
diff --git a/spec/components/version_spec.rb b/spec/components/version_spec.rb
index 26c24337bc..6844205d71 100644
--- a/spec/components/version_spec.rb
+++ b/spec/components/version_spec.rb
@@ -37,4 +37,3 @@ describe Discourse::VERSION do
 
   end
 end
-
diff --git a/spec/components/wizard/step_updater_spec.rb b/spec/components/wizard/step_updater_spec.rb
index 5307b3779d..ddc3513508 100644
--- a/spec/components/wizard/step_updater_spec.rb
+++ b/spec/components/wizard/step_updater_spec.rb
@@ -268,8 +268,8 @@ describe Wizard::StepUpdater do
 
   context "invites step" do
     let(:invites) {
-      return [{ email: 'regular@example.com', role: 'regular'},
-              { email: 'moderator@example.com', role: 'moderator'}]
+      return [{ email: 'regular@example.com', role: 'regular' },
+              { email: 'moderator@example.com', role: 'moderator' }]
     }
 
     it "updates the fields correctly" do
diff --git a/spec/components/wizard/wizard_spec.rb b/spec/components/wizard/wizard_spec.rb
index f9266f83e5..46c68a38b4 100644
--- a/spec/components/wizard/wizard_spec.rb
+++ b/spec/components/wizard/wizard_spec.rb
@@ -131,7 +131,7 @@ describe Wizard do
       admin = Fabricate(:admin)
       wizard = build_simple(admin)
 
-      wizard.max_topics_to_require_completion = Topic.count-1
+      wizard.max_topics_to_require_completion = Topic.count - 1
 
       expect(wizard.requires_completion?).to eq(false)
       expect(SiteSetting.bypass_wizard_check).to eq(true)
@@ -148,7 +148,7 @@ describe Wizard do
 
     it "is false for staff when complete" do
       wizard = build_simple(Fabricate(:admin))
-      updater =  wizard.create_updater('simple', name: 'Evil Trout')
+      updater = wizard.create_updater('simple', name: 'Evil Trout')
       updater.update
 
       expect(wizard.requires_completion?).to eq(false)
diff --git a/spec/components/wizard/wizard_step_spec.rb b/spec/components/wizard/wizard_step_spec.rb
index 45005b89fa..7df0dc809f 100644
--- a/spec/components/wizard/wizard_step_spec.rb
+++ b/spec/components/wizard/wizard_step_spec.rb
@@ -13,7 +13,7 @@ describe Wizard::Step do
 
     dropdown = step.add_field(id: 'snacks', type: 'dropdown')
     dropdown.add_choice('candy')
-    dropdown.add_choice('nachos', data: {color: 'yellow'})
+    dropdown.add_choice('nachos', data: { color: 'yellow' })
     dropdown.add_choice('pizza', label: 'Pizza!')
 
     expect(step.fields).to eq([text, dropdown])
@@ -21,4 +21,3 @@ describe Wizard::Step do
   end
 
 end
-
diff --git a/spec/controllers/about_controller_spec.rb b/spec/controllers/about_controller_spec.rb
index 4589fda351..647e50c497 100644
--- a/spec/controllers/about_controller_spec.rb
+++ b/spec/controllers/about_controller_spec.rb
@@ -6,20 +6,23 @@ describe AboutController do
 
     it "should display the about page for anonymous user when login_required is false" do
       SiteSetting.login_required = false
-      xhr :get, :index
+      get :index
+
       expect(response).to be_success
     end
 
     it 'should redirect to login page for anonymous user when login_required is true' do
       SiteSetting.login_required = true
-      xhr :get, :index
+      get :index
+
       expect(response).to redirect_to '/login'
     end
 
     it "should display the about page for logged in user when login_required is true" do
       SiteSetting.login_required = true
       log_in
-      xhr :get, :index
+      get :index
+
       expect(response).to be_success
     end
   end
diff --git a/spec/controllers/admin/admin_controller_spec.rb b/spec/controllers/admin/admin_controller_spec.rb
index f0e29511dd..54db42f3f9 100644
--- a/spec/controllers/admin/admin_controller_spec.rb
+++ b/spec/controllers/admin/admin_controller_spec.rb
@@ -5,16 +5,17 @@ describe Admin::AdminController do
   context 'index' do
 
     it 'needs you to be logged in' do
-      expect { xhr :get, :index }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        get :index, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     it "raises an error if you aren't an admin" do
       user = log_in
-      xhr :get, :index
+      get :index, format: :json
       expect(response).to be_forbidden
     end
 
   end
 
-
 end
diff --git a/spec/controllers/admin/api_controller_spec.rb b/spec/controllers/admin/api_controller_spec.rb
index 2805a2d4b1..af72b0529a 100644
--- a/spec/controllers/admin/api_controller_spec.rb
+++ b/spec/controllers/admin/api_controller_spec.rb
@@ -10,7 +10,7 @@ describe Admin::ApiController do
 
   context '.index' do
     it "succeeds" do
-      xhr :get, :index
+      get :index, format: :json
       expect(response).to be_success
     end
   end
@@ -19,14 +19,14 @@ describe Admin::ApiController do
     let(:api_key) { Fabricate(:api_key) }
 
     it "returns 404 when there is no key" do
-      xhr :put, :regenerate_key, id: 1234
+      put :regenerate_key, params: { id: 1234 }, format: :json
       expect(response).not_to be_success
       expect(response.status).to eq(404)
     end
 
     it "delegates to the api key's `regenerate!` method" do
       ApiKey.any_instance.expects(:regenerate!)
-      xhr :put, :regenerate_key, id: api_key.id
+      put :regenerate_key, params: { id: api_key.id }, format: :json
     end
   end
 
@@ -34,22 +34,22 @@ describe Admin::ApiController do
     let(:api_key) { Fabricate(:api_key) }
 
     it "returns 404 when there is no key" do
-      xhr :delete, :revoke_key, id: 1234
+      delete :revoke_key, params: { id: 1234 }, format: :json
       expect(response).not_to be_success
       expect(response.status).to eq(404)
     end
 
     it "delegates to the api key's `regenerate!` method" do
       ApiKey.any_instance.expects(:destroy)
-      xhr :delete, :revoke_key, id: api_key.id
+      delete :revoke_key, params: { id: api_key.id }, format: :json
     end
   end
 
   context '.create_master_key' do
     it "creates a record" do
-      expect {
-        xhr :post, :create_master_key
-      }.to change(ApiKey, :count).by(1)
+      expect do
+        post :create_master_key, format: :json
+      end.to change(ApiKey, :count).by(1)
     end
   end
 
diff --git a/spec/controllers/admin/backups_controller_spec.rb b/spec/controllers/admin/backups_controller_spec.rb
index f9c78426bb..d8adecf94d 100644
--- a/spec/controllers/admin/backups_controller_spec.rb
+++ b/spec/controllers/admin/backups_controller_spec.rb
@@ -26,7 +26,7 @@ describe Admin::BackupsController do
           BackupRestore.expects(:logs).returns([])
           subject.expects(:store_preloaded).with("logs", "[]")
 
-          xhr :get, :index, format: :html
+          get :index, format: :html, xhr: true
 
           expect(response).to be_success
         end
@@ -38,7 +38,7 @@ describe Admin::BackupsController do
         it "returns a list of all the backups" do
           Backup.expects(:all).returns([Backup.new("backup1"), Backup.new("backup2")])
 
-          xhr :get, :index, format: :json
+          get :index, format: :json, xhr: true
 
           expect(response).to be_success
 
@@ -56,7 +56,7 @@ describe Admin::BackupsController do
       it "returns the current backups status" do
         BackupRestore.expects(:operations_status)
 
-        xhr :get, :status
+        get :status, format: :json
 
         expect(response).to be_success
       end
@@ -68,7 +68,9 @@ describe Admin::BackupsController do
       it "starts a backup" do
         BackupRestore.expects(:backup!).with(@admin.id, publish_to_message_bus: true, with_uploads: false, client_id: "foo")
 
-        xhr :post, :create, with_uploads: false, client_id: "foo"
+        post :create, params: {
+          with_uploads: false, client_id: "foo"
+        }, format: :json
 
         expect(response).to be_success
       end
@@ -87,8 +89,7 @@ describe Admin::BackupsController do
 
           StaffActionLogger.any_instance.expects(:log_backup_download).once
 
-          get :show, id: backup_filename, token: token
-
+          get :show, params: { id: backup_filename, token: token }, format: :json
 
           expect(response.headers['Content-Length']).to eq("5")
           expect(response.headers['Content-Disposition']).to match(/attachment; filename/)
@@ -105,7 +106,7 @@ describe Admin::BackupsController do
 
           Backup.create_from_filename(backup_filename)
 
-          get :show, id: backup_filename, token: "bad_value"
+          get :show, params: { id: backup_filename, token: "bad_value" }, xhr: true
 
           expect(response.status).to eq(422)
         ensure
@@ -117,7 +118,7 @@ describe Admin::BackupsController do
         token = EmailBackupToken.set(@admin.id)
         Backup.expects(:[]).returns(nil)
 
-        get :show, id: backup_filename, token: token
+        get :show, params: { id: backup_filename, token: token }, format: :json
 
         EmailBackupToken.del(@admin.id)
 
@@ -126,31 +127,6 @@ describe Admin::BackupsController do
 
     end
 
-    describe ".email" do
-
-      let(:b) { Backup.new(backup_filename) }
-
-      it "enqueues email job" do
-        Backup.expects(:[]).with(backup_filename).returns(b)
-
-        Jobs.expects(:enqueue).with(:download_backup_email,
-          user_id: @admin.id,
-          backup_file_path: "http://test.host/admin/backups/2014-02-10-065935.tar.gz"
-        )
-
-        xhr :put, :email, id: backup_filename
-
-        expect(response).to be_success
-      end
-
-      it "returns 404 when the backup does not exist" do
-        xhr :put, :email, id: backup_filename
-
-        expect(response).to be_not_found
-      end
-
-    end
-
     describe ".destroy" do
 
       let(:b) { Backup.new(backup_filename) }
@@ -161,7 +137,7 @@ describe Admin::BackupsController do
 
         StaffActionLogger.any_instance.expects(:log_backup_destroy).with(b).once
 
-        xhr :delete, :destroy, id: backup_filename
+        delete :destroy, params: { id: backup_filename }, format: :json
 
         expect(response).to be_success
       end
@@ -169,7 +145,7 @@ describe Admin::BackupsController do
       it "doesn't remove the backup if not found" do
         Backup.expects(:[]).with(backup_filename).returns(nil)
         b.expects(:remove).never
-        xhr :delete, :destroy, id: backup_filename
+        delete :destroy, params: { id: backup_filename }, format: :json
         expect(response).not_to be_success
       end
 
@@ -184,7 +160,7 @@ describe Admin::BackupsController do
         BackupRestore.expects(:logs).returns([])
         subject.expects(:store_preloaded).with("logs", "[]")
 
-        xhr :get, :logs, format: :html
+        get :logs, format: :html, xhr: true
 
         expect(response).to be_success
       end
@@ -196,7 +172,7 @@ describe Admin::BackupsController do
         expect(SiteSetting.disable_emails).to eq(false)
         BackupRestore.expects(:restore!).with(@admin.id, filename: backup_filename, publish_to_message_bus: true, client_id: "foo")
 
-        xhr :post, :restore, id: backup_filename, client_id: "foo"
+        post :restore, params: { id: backup_filename, client_id: "foo" }, format: :json
 
         expect(SiteSetting.disable_emails).to eq(true)
         expect(response).to be_success
@@ -209,7 +185,7 @@ describe Admin::BackupsController do
       it "enables readonly mode" do
         Discourse.expects(:enable_readonly_mode)
 
-        expect { xhr :put, :readonly, enable: true }
+        expect { put :readonly, params: { enable: true }, format: :json }
           .to change { UserHistory.count }.by(1)
 
         expect(response).to be_success
@@ -223,7 +199,7 @@ describe Admin::BackupsController do
       it "disables readonly mode" do
         Discourse.expects(:disable_readonly_mode)
 
-        expect { xhr :put, :readonly, enable: false }
+        expect { put :readonly, params: { enable: false }, format: :json }
           .to change { UserHistory.count }.by(1)
 
         expect(response).to be_success
@@ -241,7 +217,10 @@ describe Admin::BackupsController do
         it "should raise an error" do
           ['灰色.tar.gz', '; echo \'haha\'.tar.gz'].each do |invalid_filename|
             described_class.any_instance.expects(:has_enough_space_on_disk?).returns(true)
-            xhr :post, :upload_backup_chunk, resumableFilename: invalid_filename, resumableTotalSize: 1
+
+            post :upload_backup_chunk, params: {
+              resumableFilename: invalid_filename, resumableTotalSize: 1
+            }
 
             expect(response.status).to eq(415)
             expect(response.body).to eq(I18n.t('backup.invalid_filename'))
@@ -256,7 +235,7 @@ describe Admin::BackupsController do
 
             filename = 'test_Site-0123456789.tar.gz'
 
-            xhr :post, :upload_backup_chunk,
+            post :upload_backup_chunk, params: {
               resumableFilename: filename,
               resumableTotalSize: 1,
               resumableIdentifier: 'test',
@@ -264,6 +243,7 @@ describe Admin::BackupsController do
               resumableChunkSize: '1',
               resumableCurrentChunkSize: '1',
               file: fixture_file_upload(Tempfile.new)
+            }, format: :json
 
             expect(response.status).to eq(200)
             expect(response.body).to eq("")
diff --git a/spec/controllers/admin/badges_controller_spec.rb b/spec/controllers/admin/badges_controller_spec.rb
index 95bb08377a..3fea129cf6 100644
--- a/spec/controllers/admin/badges_controller_spec.rb
+++ b/spec/controllers/admin/badges_controller_spec.rb
@@ -8,7 +8,7 @@ describe Admin::BadgesController do
 
     context 'index' do
       it 'returns badge index' do
-        xhr :get, :index
+        get :index, format: :json
         expect(response).to be_success
       end
     end
@@ -16,13 +16,21 @@ describe Admin::BadgesController do
     context 'preview' do
       it 'allows preview enable_badge_sql is enabled' do
         SiteSetting.enable_badge_sql = true
-        result = xhr :get, :preview, sql: 'select id as user_id, created_at granted_at from users'
-        expect(JSON.parse(result.body)["grant_count"]).to be > 0
+
+        get :preview, params: {
+          sql: 'select id as user_id, created_at granted_at from users'
+        }, format: :json
+
+        expect(JSON.parse(response.body)["grant_count"]).to be > 0
       end
       it 'does not allow anything if enable_badge_sql is disabled' do
         SiteSetting.enable_badge_sql = false
-        result = xhr :get, :preview, sql: 'select id as user_id, created_at granted_at from users'
-        expect(result.status).to eq(403)
+
+        get :preview, params: {
+          sql: 'select id as user_id, created_at granted_at from users'
+        }, format: :json
+
+        expect(response.status).to eq(403)
       end
     end
 
@@ -31,9 +39,13 @@ describe Admin::BadgesController do
 
       it 'can create badges correctly' do
         SiteSetting.enable_badge_sql = true
-        result = xhr :post, :create, name: 'test', query: 'select 1 as user_id, null as granted_at', badge_type_id: 1
-        json = JSON.parse(result.body)
-        expect(result.status).to eq(200)
+
+        post :create, params: {
+          name: 'test', query: 'select 1 as user_id, null as granted_at', badge_type_id: 1
+        }, format: :json
+
+        json = JSON.parse(response.body)
+        expect(response.status).to eq(200)
         expect(json["badge"]["name"]).to eq('test')
         expect(json["badge"]["query"]).to eq('select 1 as user_id, null as granted_at')
       end
@@ -48,41 +60,36 @@ describe Admin::BadgesController do
 
         groupings.shuffle!
 
-        names = groupings.map{|g| g.name}
-        ids = groupings.map{|g| g.id.to_s}
+        names = groupings.map { |g| g.name }
+        ids = groupings.map { |g| g.id.to_s }
 
-
-        xhr :post, :save_badge_groupings, ids: ids, names: names
+        post :save_badge_groupings, params: { ids: ids, names: names }, format: :json
 
         groupings2 = BadgeGrouping.all.order(:position).to_a
 
-        expect(groupings2.map{|g| g.name}).to eq(names)
-        expect((groupings.map(&:id) - groupings2.map{|g| g.id}).compact).to be_blank
-
+        expect(groupings2.map { |g| g.name }).to eq(names)
+        expect((groupings.map(&:id) - groupings2.map { |g| g.id }).compact).to be_blank
         expect(::JSON.parse(response.body)["badge_groupings"].length).to eq(groupings2.length)
       end
     end
 
     context '.badge_types' do
-      it 'returns success' do
-        xhr :get, :badge_types
-        expect(response).to be_success
-      end
-
       it 'returns JSON' do
-        xhr :get, :badge_types
+        get :badge_types, format: :json
+
+        expect(response).to be_success
         expect(::JSON.parse(response.body)["badge_types"]).to be_present
       end
     end
 
     context '.destroy' do
       it 'returns success' do
-        xhr :delete, :destroy, id: badge.id
+        delete :destroy, params: { id: badge.id }, format: :json
         expect(response).to be_success
       end
 
       it 'deletes the badge' do
-        xhr :delete, :destroy, id: badge.id
+        delete :destroy, params: { id: badge.id }, format: :json
         expect(Badge.where(id: badge.id).count).to eq(0)
       end
     end
@@ -93,9 +100,10 @@ describe Admin::BadgesController do
         editor_badge = Badge.find(Badge::Editor)
         editor_badge_name = editor_badge.name
 
-        xhr :put, :update,
-            id: editor_badge.id,
-            name: "123456"
+        put :update, params: {
+          id: editor_badge.id,
+          name: "123456"
+        }, format: :json
 
         expect(response).to be_success
         editor_badge.reload
@@ -108,14 +116,15 @@ describe Admin::BadgesController do
 
         SiteSetting.enable_badge_sql = false
 
-        xhr :put, :update,
-            id: badge.id,
-            name: "123456",
-            query: "select id user_id, created_at granted_at from users",
-            badge_type_id: badge.badge_type_id,
-            allow_title: false,
-            multiple_grant: false,
-            enabled: true
+        put :update, params: {
+          id: badge.id,
+          name: "123456",
+          query: "select id user_id, created_at granted_at from users",
+          badge_type_id: badge.badge_type_id,
+          allow_title: false,
+          multiple_grant: false,
+          enabled: true
+        }, format: :json
 
         expect(response).to be_success
         badge.reload
@@ -127,14 +136,15 @@ describe Admin::BadgesController do
         SiteSetting.enable_badge_sql = true
         sql = "select id user_id, created_at granted_at from users"
 
-        xhr :put, :update,
-            id: badge.id,
-            name: "123456",
-            query: sql,
-            badge_type_id: badge.badge_type_id,
-            allow_title: false,
-            multiple_grant: false,
-            enabled: true
+        put :update, params: {
+          id: badge.id,
+          name: "123456",
+          query: sql,
+          badge_type_id: badge.badge_type_id,
+          allow_title: false,
+          multiple_grant: false,
+          enabled: true
+        }, format: :json
 
         expect(response).to be_success
         badge.reload
diff --git a/spec/controllers/admin/color_schemes_controller_spec.rb b/spec/controllers/admin/color_schemes_controller_spec.rb
index c1eb2c9abb..6b11e219fb 100644
--- a/spec/controllers/admin/color_schemes_controller_spec.rb
+++ b/spec/controllers/admin/color_schemes_controller_spec.rb
@@ -10,40 +10,36 @@ describe Admin::ColorSchemesController do
     let(:valid_params) { { color_scheme: {
         name: 'Such Design',
         colors: [
-          {name: 'primary', hex: 'FFBB00'},
-          {name: 'secondary', hex: '888888'}
+          { name: 'primary', hex: 'FFBB00' },
+          { name: 'secondary', hex: '888888' }
         ]
       }
     } }
 
     describe "index" do
-      it "returns success" do
-        xhr :get, :index
-        expect(response).to be_success
-      end
-
       it "returns JSON" do
         Fabricate(:color_scheme)
-        xhr :get, :index
+        get :index, format: :json
+
+        expect(response).to be_success
         expect(::JSON.parse(response.body)).to be_present
       end
     end
 
     describe "create" do
-      it "returns success" do
-        xhr :post, :create, valid_params
-        expect(response).to be_success
-      end
-
       it "returns JSON" do
-        xhr :post, :create, valid_params
+        post :create, params: valid_params, format: :json
+
+        expect(response).to be_success
         expect(::JSON.parse(response.body)['id']).to be_present
       end
 
       it "returns failure with invalid params" do
         params = valid_params
         params[:color_scheme][:colors][0][:hex] = 'cool color please'
-        xhr :post, :create, valid_params
+
+        post :create, params: valid_params, format: :json
+
         expect(response).not_to be_success
         expect(::JSON.parse(response.body)['errors']).to be_present
       end
@@ -54,13 +50,13 @@ describe Admin::ColorSchemesController do
 
       it "returns success" do
         ColorSchemeRevisor.expects(:revise).returns(existing)
-        xhr :put, :update, valid_params.merge(id: existing.id)
+        put :update, params: valid_params.merge(id: existing.id), format: :json
         expect(response).to be_success
       end
 
       it "returns JSON" do
         ColorSchemeRevisor.expects(:revise).returns(existing)
-        xhr :put, :update, valid_params.merge(id: existing.id)
+        put :update, params: valid_params.merge(id: existing.id), format: :json
         expect(::JSON.parse(response.body)['id']).to be_present
       end
 
@@ -69,7 +65,7 @@ describe Admin::ColorSchemesController do
         params = valid_params.merge(id: color_scheme.id)
         params[:color_scheme][:colors][0][:name] = color_scheme.colors.first.name
         params[:color_scheme][:colors][0][:hex] = 'cool color please'
-        xhr :put, :update, params
+        put :update, params: params, format: :json
         expect(response).not_to be_success
         expect(::JSON.parse(response.body)['errors']).to be_present
       end
@@ -80,7 +76,7 @@ describe Admin::ColorSchemesController do
 
       it "returns success" do
         expect {
-          xhr :delete, :destroy, id: existing.id
+          delete :destroy, params: { id: existing.id }, format: :json
         }.to change { ColorScheme.count }.by(-1)
         expect(response).to be_success
       end
diff --git a/spec/controllers/admin/dashboard_controller_spec.rb b/spec/controllers/admin/dashboard_controller_spec.rb
index 8bc31307cf..c190f72b7e 100644
--- a/spec/controllers/admin/dashboard_controller_spec.rb
+++ b/spec/controllers/admin/dashboard_controller_spec.rb
@@ -3,7 +3,7 @@ require_dependency 'discourse_version_check'
 
 describe Admin::DashboardController do
   before do
-    AdminDashboardData.stubs(:fetch_cached_stats).returns({reports:[]})
+    AdminDashboardData.stubs(:fetch_cached_stats).returns(reports: [])
     Jobs::VersionCheck.any_instance.stubs(:execute).returns(true)
   end
 
@@ -15,30 +15,26 @@ describe Admin::DashboardController do
     let!(:admin) { log_in(:admin) }
 
     context '.index' do
-      it 'should be successful' do
-        xhr :get, :index
-        expect(response).to be_successful
-      end
-
       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
-          xhr :get, :index
-          json = JSON.parse(response.body)
-          expect(json['version_check']).to be_present
+          get :index, format: :json
+
+          expect(response).to be_success
+          expect(JSON.parse(response.body)['version_check']).to be_present
         end
       end
 
       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
-          xhr :get, :index
+          get :index, format: :json
           json = JSON.parse(response.body)
           expect(json['version_check']).not_to be_present
         end
@@ -46,19 +42,15 @@ describe Admin::DashboardController do
     end
 
     context '.problems' do
-      it 'should be successful' do
-        AdminDashboardData.stubs(:fetch_problems).returns([])
-        xhr :get, :problems
-        expect(response).to be_successful
-      end
-
       context 'when there are no problems' do
         before do
           AdminDashboardData.stubs(:fetch_problems).returns([])
         end
 
         it 'returns an empty array' do
-          xhr :get, :problems
+          get :problems, format: :json
+
+          expect(response).to be_success
           json = JSON.parse(response.body)
           expect(json['problems'].size).to eq(0)
         end
@@ -70,7 +62,7 @@ describe Admin::DashboardController do
         end
 
         it 'returns an array of strings' do
-          xhr :get, :problems
+          get :problems, format: :json
           json = JSON.parse(response.body)
           expect(json['problems'].size).to eq(2)
           expect(json['problems'][0]).to be_a(String)
diff --git a/spec/controllers/admin/email_controller_spec.rb b/spec/controllers/admin/email_controller_spec.rb
index b14b6ae979..e778f8b7d9 100644
--- a/spec/controllers/admin/email_controller_spec.rb
+++ b/spec/controllers/admin/email_controller_spec.rb
@@ -10,12 +10,14 @@ describe Admin::EmailController do
 
   context '.index' do
     before do
-      subject.expects(:action_mailer_settings).returns({
-        username: 'username',
-        password: 'secret'
-      })
+      subject
+        .expects(:action_mailer_settings)
+        .returns(
+          username: 'username',
+          password: 'secret'
+        )
 
-      xhr :get, :index
+      get :index, format: :json
     end
 
     it 'does not include the password in the response' do
@@ -29,7 +31,7 @@ describe Admin::EmailController do
 
   context '.sent' do
     before do
-      xhr :get, :sent
+      get :sent, format: :json
     end
 
     subject { response }
@@ -38,7 +40,7 @@ describe Admin::EmailController do
 
   context '.skipped' do
     before do
-      xhr :get, :skipped
+      get :skipped, format: :json
     end
 
     subject { response }
@@ -47,7 +49,9 @@ describe Admin::EmailController do
 
   context '.test' do
     it 'raises an error without the email parameter' do
-      expect { xhr :post, :test }.to raise_error(ActionController::ParameterMissing)
+      expect do
+        post :test, format: :json
+      end.to raise_error(ActionController::ParameterMissing)
     end
 
     context 'with an email address' do
@@ -55,18 +59,23 @@ describe Admin::EmailController do
         job_mock = mock
         Jobs::TestEmail.expects(:new).returns(job_mock)
         job_mock.expects(:execute).with(to_address: 'eviltrout@test.domain')
-        xhr :post, :test, email_address: 'eviltrout@test.domain'
+        post :test, params: { email_address: 'eviltrout@test.domain' }, format: :json
       end
     end
   end
 
   context '.preview_digest' do
     it 'raises an error without the last_seen_at parameter' do
-      expect { xhr :get, :preview_digest }.to raise_error(ActionController::ParameterMissing)
+      expect do
+        get :preview_digest, format: :json
+      end.to raise_error(ActionController::ParameterMissing)
     end
 
     it "previews the digest" do
-      xhr :get, :preview_digest, last_seen_at: 1.week.ago, username: user.username
+      get :preview_digest, params: {
+        last_seen_at: 1.week.ago, username: user.username
+      }, format: :json
+
       expect(response).to be_success
     end
   end
@@ -78,9 +87,27 @@ describe Admin::EmailController do
     end
 
     it 'should enqueue the right job' do
-      expect { xhr :post, :handle_mail, email: email('cc') }
+      expect { post :handle_mail, params: { email: email('cc') }, format: :json }
         .to change { Jobs::ProcessEmail.jobs.count }.by(1)
     end
   end
 
+  context '.rejected' do
+    it 'should provide a string for a blank error' do
+      Fabricate(:incoming_email, error: "")
+      get :rejected, format: :json
+      rejected = JSON.parse(response.body)
+      expect(rejected.first['error']).to eq(I18n.t("emails.incoming.unrecognized_error"))
+    end
+  end
+
+  context '.incoming' do
+    it 'should provide a string for a blank error' do
+      incoming_email = Fabricate(:incoming_email, error: "")
+      get :incoming, params: { id: incoming_email.id }, format: :json
+      incoming = JSON.parse(response.body)
+      expect(incoming['error']).to eq(I18n.t("emails.incoming.unrecognized_error"))
+    end
+  end
+
 end
diff --git a/spec/controllers/admin/emojis_controller_spec.rb b/spec/controllers/admin/emojis_controller_spec.rb
index 5b769ab90a..1b494f0571 100644
--- a/spec/controllers/admin/emojis_controller_spec.rb
+++ b/spec/controllers/admin/emojis_controller_spec.rb
@@ -22,7 +22,7 @@ describe Admin::EmojisController do
     context ".index" do
       it "returns a list of custom emojis" do
         Emoji.expects(:custom).returns([custom_emoji])
-        xhr :get, :index
+        get :index, format: :json
         expect(response).to be_success
         json = ::JSON.parse(response.body)
         expect(json[0]["name"]).to eq(custom_emoji.name)
diff --git a/spec/controllers/admin/flags_controller_spec.rb b/spec/controllers/admin/flags_controller_spec.rb
deleted file mode 100644
index 76599d2df7..0000000000
--- a/spec/controllers/admin/flags_controller_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'rails_helper'
-
-describe Admin::FlagsController do
-
-  it "is a subclass of AdminController" do
-    expect(Admin::FlagsController < Admin::AdminController).to eq(true)
-  end
-
-  context 'while logged in as an admin' do
-    before do
-      @user = log_in(:admin)
-    end
-
-    context 'index' do
-      it 'returns empty json when nothing is flagged' do
-        xhr :get, :index
-
-        data = ::JSON.parse(response.body)
-        expect(data["users"]).to eq([])
-        expect(data["posts"]).to eq([])
-      end
-
-      it 'returns a valid json payload when some thing is flagged' do
-        p = Fabricate(:post)
-        u = Fabricate(:user)
-
-        PostAction.act(u, p, PostActionType.types[:spam])
-        xhr :get, :index
-
-        data = ::JSON.parse(response.body)
-        data["users"].length == 2
-        data["posts"].length == 1
-      end
-    end
-  end
-end
-
diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb
index bb7ebbf71a..e8ecd77c0a 100644
--- a/spec/controllers/admin/groups_controller_spec.rb
+++ b/spec/controllers/admin/groups_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 describe Admin::GroupsController do
+  let(:user) { Fabricate(:user) }
+  let(:group) { Fabricate(:group) }
 
   before do
     @admin = log_in(:admin)
@@ -10,53 +12,15 @@ 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)
       user = Fabricate(:user, trust_level: 2)
       user2 = Fabricate(:user, trust_level: 4)
 
-      xhr :put, :bulk_perform, group_id: group.id, users: [user.username.upcase, user2.email, 'doesnt_exist']
+      put :bulk_perform, params: {
+        group_id: group.id, users: [user.username.upcase, user2.email, 'doesnt_exist']
+      }, format: :json
 
       expect(response).to be_success
 
@@ -77,51 +41,56 @@ describe Admin::GroupsController do
     end
   end
 
-  context ".create" do
+  context "#update" do
+    it 'should update a group' do
+      group.add_owner(user)
 
-    it "strip spaces on the group name" do
-      xhr :post, :create, { group: { name: " bob " } }
+      expect do
+        put :update, params: {
+          id: group.id,
+          group: {
+            visibility_level: Group.visibility_levels[:owners],
+            allow_membership_requests: "true"
+          }
+        }, format: :json
 
-      expect(response.status).to eq(200)
+      end.to change { GroupHistory.count }.by(2)
 
-      groups = Group.where(name: "bob").to_a
+      expect(response).to be_success
 
-      expect(groups.count).to eq(1)
-      expect(groups[0].name).to eq("bob")
+      group.reload
+
+      expect(group.visibility_level).to eq(Group.visibility_levels[:owners])
+      expect(group.allow_membership_requests).to eq(true)
     end
 
-  end
-
-  context ".update" do
-
     it "ignore name change on automatic group" do
-      expect do
-        xhr :put, :update, { id: 1, group: {
-          name: "WAT",
-          visible: "true",
-          allow_membership_requests: "true"
-        } }
-      end.to change { GroupHistory.count }.by(1)
-
+      put :update, params: { id: 1, group: { name: "WAT" } }, format: :json
       expect(response).to be_success
 
       group = Group.find(1)
       expect(group.name).not_to eq("WAT")
-      expect(group.visible).to eq(true)
-      expect(group.allow_membership_requests).to eq(true)
     end
 
     it "doesn't launch the 'automatic group membership' job when it's not retroactive" do
       Jobs.expects(:enqueue).never
       group = Fabricate(:group)
-      xhr :put, :update, { id: group.id, group: { automatic_membership_retroactive: "false" } }
+
+      put :update, params: {
+        id: group.id, group: { automatic_membership_retroactive: "false" }
+      }, format: :json
+
       expect(response).to be_success
     end
 
     it "launches the 'automatic group membership' job when it's retroactive" do
       group = Fabricate(:group)
       Jobs.expects(:enqueue).with(:automatic_group_membership, group_id: group.id)
-      xhr :put, :update, { id: group.id, group: { automatic_membership_retroactive: "true" } }
+
+      put :update, params: {
+        id: group.id, group: { automatic_membership_retroactive: "true" }
+      }, format: :json
+
       expect(response).to be_success
     end
 
@@ -131,14 +100,14 @@ describe Admin::GroupsController do
 
     it "returns a 422 if the group is automatic" do
       group = Fabricate(:group, automatic: true)
-      xhr :delete, :destroy, id: group.id
+      delete :destroy, params: { id: group.id }, format: :json
       expect(response.status).to eq(422)
       expect(Group.where(id: group.id).count).to eq(1)
     end
 
     it "is able to destroy a non-automatic group" do
       group = Fabricate(:group)
-      xhr :delete, :destroy, id: group.id
+      delete :destroy, params: { id: group.id }, format: :json
       expect(response.status).to eq(200)
       expect(Group.where(id: group.id).count).to eq(0)
     end
@@ -150,7 +119,7 @@ describe Admin::GroupsController do
     it "is able to refresh automatic groups" do
       Group.expects(:refresh_automatic_groups!).returns(true)
 
-      xhr :post, :refresh_automatic_groups
+      post :refresh_automatic_groups, format: :json
       expect(response.status).to eq(200)
     end
 
diff --git a/spec/controllers/admin/impersonate_controller_spec.rb b/spec/controllers/admin/impersonate_controller_spec.rb
index 54eb1ee1f6..866e6898b5 100644
--- a/spec/controllers/admin/impersonate_controller_spec.rb
+++ b/spec/controllers/admin/impersonate_controller_spec.rb
@@ -12,7 +12,7 @@ describe Admin::ImpersonateController do
 
     context 'index' do
       it 'returns success' do
-        xhr :get, :index
+        get :index, format: :json
         expect(response).to be_success
       end
     end
@@ -20,17 +20,17 @@ describe Admin::ImpersonateController do
     context 'create' do
 
       it 'requires a username_or_email parameter' do
-        expect { xhr :put, :create }.to raise_error(ActionController::ParameterMissing)
+        expect { put :create, format: :json }.to raise_error(ActionController::ParameterMissing)
       end
 
       it 'returns 404 when that user does not exist' do
-        xhr :post, :create, username_or_email: 'hedonismbot'
+        post :create, params: { username_or_email: 'hedonismbot' }, format: :json
         expect(response.status).to eq(404)
       end
 
       it "raises an invalid access error if the user can't be impersonated" do
         Guardian.any_instance.expects(:can_impersonate?).with(user).returns(false)
-        xhr :post, :create, username_or_email: user.email
+        post :create, params: { username_or_email: user.email }, format: :json
         expect(response).to be_forbidden
       end
 
@@ -38,21 +38,21 @@ describe Admin::ImpersonateController do
 
         it "logs the impersonation" do
           StaffActionLogger.any_instance.expects(:log_impersonate)
-          xhr :post, :create, username_or_email: user.username
+          post :create, params: { username_or_email: user.username }, format: :json
         end
 
         it "changes the current user session id" do
-          xhr :post, :create, username_or_email: user.username
+          post :create, params: { username_or_email: user.username }, format: :json
           expect(session[:current_user_id]).to eq(user.id)
         end
 
         it "returns success" do
-          xhr :post, :create, username_or_email: user.email
+          post :create, params: { username_or_email: user.email }, format: :json
           expect(response).to be_success
         end
 
         it "also works with an email address" do
-          xhr :post, :create, username_or_email: user.email
+          post :create, params: { username_or_email: user.email }, format: :json
           expect(session[:current_user_id]).to eq(user.id)
         end
 
diff --git a/spec/controllers/admin/permalinks_controller_spec.rb b/spec/controllers/admin/permalinks_controller_spec.rb
index fe5652597d..1075150ab1 100644
--- a/spec/controllers/admin/permalinks_controller_spec.rb
+++ b/spec/controllers/admin/permalinks_controller_spec.rb
@@ -15,7 +15,7 @@ describe Admin::PermalinksController do
       Fabricate(:permalink, url: "/discuss/topic/45")
       Fabricate(:permalink, url: "/discuss/topic/76")
 
-      xhr :get, :index, filter: "topic"
+      get :index, params: { filter: "topic" }, format: :json
 
       expect(response).to be_success
       result = JSON.parse(response.body)
@@ -28,7 +28,7 @@ describe Admin::PermalinksController do
       Fabricate(:permalink, external_url: "http://www.discourse.org")
       Fabricate(:permalink, external_url: "http://try.discourse.org")
 
-      xhr :get, :index, filter: "discourse"
+      get :index, params: { filter: "discourse" }, format: :json
 
       expect(response).to be_success
       result = JSON.parse(response.body)
@@ -41,7 +41,7 @@ describe Admin::PermalinksController do
       Fabricate(:permalink, url: "/discuss/topic/45", external_url: "http://discourse.org")
       Fabricate(:permalink, url: "/discuss/topic/76", external_url: "http://try.discourse.org")
 
-      xhr :get, :index, filter: "discourse"
+      get :index, params: { filter: "discourse" }, format: :json
 
       expect(response).to be_success
       result = JSON.parse(response.body)
diff --git a/spec/controllers/admin/plugins_controller_spec.rb b/spec/controllers/admin/plugins_controller_spec.rb
index 2873523e32..9df2c2737e 100644
--- a/spec/controllers/admin/plugins_controller_spec.rb
+++ b/spec/controllers/admin/plugins_controller_spec.rb
@@ -10,11 +10,10 @@ describe Admin::PluginsController do
     let!(:admin) { log_in(:admin) }
 
     it 'should return JSON' do
-      xhr :get, :index
+      get :index, format: :json
       expect(response).to be_success
       expect(::JSON.parse(response.body).has_key?('plugins')).to eq(true)
     end
   end
 
 end
-
diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb
index 9d34ebbe1c..740df64afb 100644
--- a/spec/controllers/admin/reports_controller_spec.rb
+++ b/spec/controllers/admin/reports_controller_spec.rb
@@ -9,7 +9,6 @@ describe Admin::ReportsController do
     let!(:admin) { log_in(:admin) }
     let(:user) { Fabricate(:user) }
 
-
     context '.show' do
 
       context "invalid id form" do
@@ -17,11 +16,11 @@ describe Admin::ReportsController do
 
         it "never calls Report.find" do
           Report.expects(:find).never
-          xhr :get, :show, type: invalid_id
+          get :show, params: { type: invalid_id }, format: :json
         end
 
         it "returns 404" do
-          xhr :get, :show, type: invalid_id
+          get :show, params: { type: invalid_id }, format: :json
           expect(response.status).to eq(404)
         end
       end
@@ -31,7 +30,7 @@ describe Admin::ReportsController do
         context 'missing report' do
           before do
             Report.expects(:find).with('active', instance_of(Hash)).returns(nil)
-            xhr :get, :show, type: 'active'
+            get :show, params: { type: 'active' }, format: :json
           end
 
           it "renders the report as JSON" do
@@ -42,7 +41,7 @@ describe Admin::ReportsController do
         context 'a report is found' do
           before do
             Report.expects(:find).with('active', instance_of(Hash)).returns(Report.new('active'))
-            xhr :get, :show, type: 'active'
+            get :show, params: { type: 'active' }, format: :json
           end
 
           it "renders the report as JSON" do
@@ -66,7 +65,7 @@ describe Admin::ReportsController do
           topic
           other_topic
 
-          xhr :get, :show, type: 'topics', category_id: category.id
+          get :show, params: { type: 'topics', category_id: category.id }, format: :json
 
           expect(response).to be_success
 
@@ -86,7 +85,7 @@ describe Admin::ReportsController do
           other_user
           group.add(user)
 
-          xhr :get, :show, type: 'signups', group_id: group.id
+          get :show, params: { type: 'signups', group_id: group.id }, format: :json
 
           expect(response).to be_success
 
diff --git a/spec/controllers/admin/screened_emails_controller_spec.rb b/spec/controllers/admin/screened_emails_controller_spec.rb
index 07adde4754..fb4486a9b4 100644
--- a/spec/controllers/admin/screened_emails_controller_spec.rb
+++ b/spec/controllers/admin/screened_emails_controller_spec.rb
@@ -9,7 +9,7 @@ describe Admin::ScreenedEmailsController do
 
   context '.index' do
     before do
-      xhr :get, :index
+      get :index, format: :json
     end
 
     subject { response }
diff --git a/spec/controllers/admin/screened_ip_addresses_controller_spec.rb b/spec/controllers/admin/screened_ip_addresses_controller_spec.rb
index 2ababc1a49..664fc85cdb 100644
--- a/spec/controllers/admin/screened_ip_addresses_controller_spec.rb
+++ b/spec/controllers/admin/screened_ip_addresses_controller_spec.rb
@@ -16,13 +16,13 @@ describe Admin::ScreenedIpAddressesController do
       Fabricate(:screened_ip_address, ip_address: "1.2.3.6")
       Fabricate(:screened_ip_address, ip_address: "4.5.6.7")
 
-      xhr :get, :index, filter: "1.2.*"
+      get :index, params: { filter: "1.2.*" }, format: :json
 
       expect(response).to be_success
       result = JSON.parse(response.body)
       expect(result.length).to eq(3)
 
-      xhr :get, :index, filter: "4.5.6.7"
+      get :index, params: { filter: "4.5.6.7" }, format: :json
 
       expect(response).to be_success
       result = JSON.parse(response.body)
@@ -42,9 +42,9 @@ 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
+      post :roll_up, format: :json
       expect(response).to be_success
 
       subnet = ScreenedIpAddress.where(ip_address: "1.2.3.0/24").first
@@ -62,9 +62,9 @@ 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
+      post :roll_up, format: :json
       expect(response).to be_success
 
       subnet = ScreenedIpAddress.where(ip_address: "1.2.0.0/16").first
diff --git a/spec/controllers/admin/screened_urls_controller_spec.rb b/spec/controllers/admin/screened_urls_controller_spec.rb
index 3bd763d2bb..86d7fce0b7 100644
--- a/spec/controllers/admin/screened_urls_controller_spec.rb
+++ b/spec/controllers/admin/screened_urls_controller_spec.rb
@@ -9,7 +9,7 @@ describe Admin::ScreenedUrlsController do
 
   context '.index' do
     before do
-      xhr :get, :index
+      get :index, format: :json
     end
 
     subject { response }
diff --git a/spec/controllers/admin/site_settings_controller_spec.rb b/spec/controllers/admin/site_settings_controller_spec.rb
index 9d132bb401..874f375602 100644
--- a/spec/controllers/admin/site_settings_controller_spec.rb
+++ b/spec/controllers/admin/site_settings_controller_spec.rb
@@ -13,12 +13,12 @@ describe Admin::SiteSettingsController do
 
     context 'index' do
       it 'returns success' do
-        xhr :get, :index
+        get :index, format: :json
         expect(response).to be_success
       end
 
       it 'returns JSON' do
-        xhr :get, :index
+        get :index, format: :json
         expect(::JSON.parse(response.body)).to be_present
       end
     end
@@ -27,35 +27,51 @@ describe Admin::SiteSettingsController do
 
       before do
         SiteSetting.setting(:test_setting, "default")
+        SiteSetting.refresh!
       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'
+        put :update, params: {
+          id: 'test_setting', test_setting: 'hello'
+        }, format: :json
+
+        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: ''
+        put :update, params: {
+          id: 'test_setting', test_setting: ''
+        }, format: :json
+
+        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'
+
+        put :update, params: {
+          id: 'test_setting', test_setting: 'hello'
+        }, format: :json
+
+        expect(SiteSetting.test_setting).to eq('hello')
       end
 
       it 'does not allow changing of hidden settings' do
         SiteSetting.setting(:hidden_setting, "hidden", hidden: true)
-        result = xhr :put, :update, id: 'hidden_setting', hidden_setting: 'not allowed'
+        SiteSetting.refresh!
+
+        put :update, params: {
+          id: 'hidden_setting', hidden_setting: 'not allowed'
+        }, format: :json
+
         expect(SiteSetting.hidden_setting).to eq("hidden")
-        expect(result.status).to eq(422)
+        expect(response.status).to eq(422)
       end
 
       it 'fails when a setting does not exist' do
         expect {
-          xhr :put, :update, id: 'provider', provider: 'gotcha'
+          put :update, params: { id: 'provider', provider: 'gotcha' }, format: :json
         }.to raise_error(ArgumentError)
       end
     end
diff --git a/spec/controllers/admin/site_texts_controller_spec.rb b/spec/controllers/admin/site_texts_controller_spec.rb
index 557646000f..fe3f30def6 100644
--- a/spec/controllers/admin/site_texts_controller_spec.rb
+++ b/spec/controllers/admin/site_texts_controller_spec.rb
@@ -13,7 +13,7 @@ describe Admin::SiteTextsController do
 
     context '.index' do
       it 'returns json' do
-        xhr :get, :index, q: 'title'
+        get :index, params: {  q: 'title' }, format: :json
         expect(response).to be_success
         expect(::JSON.parse(response.body)).to be_present
       end
@@ -21,7 +21,7 @@ describe Admin::SiteTextsController do
 
     context '.show' do
       it 'returns a site text for a key that exists' do
-        xhr :get, :show, id: 'title'
+        get :show, params: { id: 'title' }, format: :json
         expect(response).to be_success
 
         json = ::JSON.parse(response.body)
@@ -35,16 +35,42 @@ describe Admin::SiteTextsController do
       end
 
       it 'returns not found for missing keys' do
-        xhr :get, :show, id: 'made_up_no_key_exists'
+        get :show, params: { id: 'made_up_no_key_exists' }, format: :json
         expect(response).not_to be_success
       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
+          put :update, params: {
+            id: 'some_key', site_text: { value: 'hello %{key} %{omg}' }
+          }, format: :json
+
+          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.invalid_interpolation_keys',
+            keys: 'key, omg'
+          ))
+        end
+      end
+
       it 'updates and reverts the key' do
         orig_title = I18n.t(:title)
 
-        xhr :put, :update, id: 'title', site_text: {value: 'hello'}
+        put :update, params: { id: 'title', site_text: { value: 'hello' } }, format: :json
         expect(response).to be_success
 
         json = ::JSON.parse(response.body)
@@ -56,9 +82,8 @@ describe Admin::SiteTextsController do
         expect(site_text['id']).to eq('title')
         expect(site_text['value']).to eq('hello')
 
-
         # Revert
-        xhr :put, :revert, id: 'title'
+        put :revert, params: { id: 'title' }, format: :json
         expect(response).to be_success
 
         json = ::JSON.parse(response.body)
@@ -72,13 +97,33 @@ 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'}
+        put :update, params: {
+          id: 'made_up_no_key_exists', site_text: { value: 'hello' }
+        }, format: :json
+
         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)
+
+        put :update, params: {
+          id: 'title', site_text: { value: 'yay' }
+        }, format: :json
+
+        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])
+
+        put :revert, params: { id: 'title' }, format: :json
+
+        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/staff_action_logs_controller_spec.rb b/spec/controllers/admin/staff_action_logs_controller_spec.rb
index 2712d2f813..d1e302bd1f 100644
--- a/spec/controllers/admin/staff_action_logs_controller_spec.rb
+++ b/spec/controllers/admin/staff_action_logs_controller_spec.rb
@@ -14,7 +14,7 @@ describe Admin::StaffActionLogsController do
       topic = Fabricate(:topic)
       _record = StaffActionLogger.new(Discourse.system_user).log_topic_deletion(topic)
 
-      xhr :get, :index, action_id: UserHistory.actions[:delete_topic]
+      get :index, params: { action_id: UserHistory.actions[:delete_topic] }, format: :json
 
       json = JSON.parse(response.body)
       expect(response).to be_success
@@ -22,7 +22,7 @@ describe Admin::StaffActionLogsController do
       expect(json["staff_action_logs"].length).to eq(1)
       expect(json["staff_action_logs"][0]["action_name"]).to eq("delete_topic")
 
-      expect(json["user_history_actions"]).to include({"id" => UserHistory.actions[:delete_topic], "name" => 'delete_topic'})
+      expect(json["user_history_actions"]).to include("id" => UserHistory.actions[:delete_topic], "name" => 'delete_topic')
 
     end
   end
@@ -40,7 +40,7 @@ describe Admin::StaffActionLogsController do
       record = StaffActionLogger.new(Discourse.system_user)
         .log_theme_change(original_json, theme)
 
-      xhr :get, :diff, id: record.id
+      get :diff, params: { id: record.id }, format: :json
       expect(response).to be_success
 
       parsed = JSON.parse(response.body)
diff --git a/spec/controllers/admin/themes_controller_spec.rb b/spec/controllers/admin/themes_controller_spec.rb
index b2c1bf7e54..1418f165a8 100644
--- a/spec/controllers/admin/themes_controller_spec.rb
+++ b/spec/controllers/admin/themes_controller_spec.rb
@@ -1,4 +1,5 @@
 require 'rails_helper'
+require_dependency 'theme_serializer'
 
 describe Admin::ThemesController do
 
@@ -15,16 +16,15 @@ describe Admin::ThemesController do
       render_views
 
       let(:upload) do
-        ActionDispatch::Http::UploadedFile.new({
-          filename: 'test.woff2',
-          tempfile: file_from_fixtures("fake.woff2", "woff2")
-        })
+        Rack::Test::UploadedFile.new(file_from_fixtures("fake.woff2", "woff2"))
       end
 
       it 'can create a theme upload' do
-        xhr :post, :upload_asset, file: upload
+        post :upload_asset, params: { file: upload }, format: :json
         expect(response.status).to eq(201)
-        upload = Upload.find_by(original_filename: "test.woff2")
+
+        upload = Upload.find_by(original_filename: "fake.woff2")
+
         expect(upload.id).not_to be_nil
         expect(JSON.parse(response.body)["upload_id"]).to eq(upload.id)
       end
@@ -32,14 +32,44 @@ describe Admin::ThemesController do
 
     context '.import' do
       let(:theme_file) do
-        ActionDispatch::Http::UploadedFile.new({
-          filename: 'sam-s-simple-theme.dcstyle.json',
-          tempfile: file_from_fixtures("sam-s-simple-theme.dcstyle.json", "json")
-        })
+        Rack::Test::UploadedFile.new(file_from_fixtures("sam-s-simple-theme.dcstyle.json", "json"))
+      end
+
+      let :image do
+        file_from_fixtures("logo.png")
+      end
+
+      it 'can import a theme with an upload' do
+        upload = Fabricate(:upload)
+        theme = Theme.new(name: 'with-upload', user_id: -1)
+        upload = UploadCreator.new(image, "logo.png").create_for(-1)
+        theme.set_field(target: :common, name: :logo, upload_id: upload.id, type: :theme_upload_var)
+        theme.save
+
+        json = ThemeWithEmbeddedUploadsSerializer.new(theme, root: 'theme').to_json
+        theme.destroy
+
+        temp = Tempfile.new
+        temp.write(json)
+        temp.rewind
+
+        uploaded_json = Rack::Test::UploadedFile.new(temp)
+        upload.destroy
+
+        post :import, params: { theme: uploaded_json }, format: :json
+        expect(response).to be_success
+        temp.unlink
+
+        theme = Theme.last
+        expect(theme.theme_fields.count).to eq(1)
+        expect(theme.theme_fields.first.upload).not_to eq(nil)
+        expect(theme.theme_fields.first.upload.filesize).to eq(upload.filesize)
+        expect(theme.theme_fields.first.upload.sha1).to eq(upload.sha1)
+        expect(theme.theme_fields.first.upload.original_filename).to eq(upload.original_filename)
       end
 
       it 'imports a theme' do
-        xhr :post, :import, theme: theme_file
+        post :import, params: { theme: theme_file }, format: :json
         expect(response).to be_success
 
         json = ::JSON.parse(response.body)
@@ -72,14 +102,14 @@ describe Admin::ThemesController do
         # this will get serialized as well
         ColorScheme.create_from_base(name: "test", colors: [])
 
-        xhr :get, :index
+        get :index, format: :json
 
         expect(response).to be_success
 
         json = ::JSON.parse(response.body)
 
         expect(json["extras"]["color_schemes"].length).to eq(2)
-        theme_json = json["themes"].find{|t| t["id"] == theme.id}
+        theme_json = json["themes"].find { |t| t["id"] == theme.id }
         expect(theme_json["theme_fields"].length).to eq(2)
         expect(theme_json["remote_theme"]["remote_version"]).to eq("7")
       end
@@ -87,7 +117,13 @@ describe Admin::ThemesController do
 
     context ' .create' do
       it 'creates a theme' do
-        xhr :post, :create, theme: {name: 'my test name', theme_fields: [name: 'scss', target: 'common', value: 'body{color: red;}']}
+        post :create, params: {
+          theme: {
+            name: 'my test name',
+            theme_fields: [name: 'scss', target: 'common', value: 'body{color: red;}']
+          }
+        }, format: :json
+
         expect(response).to be_success
 
         json = ::JSON.parse(response.body)
@@ -98,21 +134,29 @@ describe Admin::ThemesController do
     end
 
     context ' .update' do
+      let(:theme) { Theme.create(name: 'my name', user_id: -1) }
+
       it 'can change default theme' do
-        theme = Theme.create(name: 'my name', user_id: -1)
-        xhr :put, :update, id: theme.id, theme: { default: true }
+        SiteSetting.default_theme_key = nil
+
+        put :update, params: {
+          id: theme.id, theme: { default: true }
+        }, format: :json
+
         expect(SiteSetting.default_theme_key).to eq(theme.key)
       end
 
       it 'can unset default theme' do
-        theme = Theme.create(name: 'my name', user_id: -1)
         SiteSetting.default_theme_key = theme.key
-        xhr :put, :update, id: theme.id, theme: { default: false}
+
+        put :update, params: {
+          id: theme.id, theme: { default: false }
+        }, format: :json
+
         expect(SiteSetting.default_theme_key).to be_blank
       end
 
       it 'updates a theme' do
-        theme = Theme.new(name: 'my name', user_id: -1)
         theme.set_field(target: :common, name: :scss, value: '.body{color: black;}')
         theme.save
 
@@ -120,30 +164,30 @@ describe Admin::ThemesController do
 
         upload = Fabricate(:upload)
 
-        xhr :put, :update, id: theme.id,
-            theme: {
-          child_theme_ids: [child_theme.id],
-          name: 'my test name',
-          theme_fields: [
-            { name: 'scss', target: 'common', value: '' },
-            { name: 'scss', target: 'desktop', value: 'body{color: blue;}' },
-            { name: 'bob', target: 'common', value: '', type_id: 2, upload_id: upload.id },
-          ]
-        }
+        put :update, params: {
+          id: theme.id,
+          theme: {
+            child_theme_ids: [child_theme.id],
+            name: 'my test name',
+            theme_fields: [
+              { name: 'scss', target: 'common', value: '' },
+              { name: 'scss', target: 'desktop', value: 'body{color: blue;}' },
+              { name: 'bob', target: 'common', value: '', type_id: 2, upload_id: upload.id },
+            ]
+          }
+        }, format: :json
+
         expect(response).to be_success
 
         json = ::JSON.parse(response.body)
 
-        fields = json["theme"]["theme_fields"].sort{|a,b| a["value"] <=> b["value"]}
+        fields = json["theme"]["theme_fields"].sort { |a, b| a["value"] <=> b["value"] }
 
         expect(fields[0]["value"]).to eq('')
         expect(fields[0]["upload_id"]).to eq(upload.id)
         expect(fields[1]["value"]).to eq('body{color: blue;}')
-
         expect(fields.length).to eq(2)
-
         expect(json["theme"]["child_themes"].length).to eq(1)
-
         expect(UserHistory.where(action: UserHistory.actions[:change_theme]).count).to eq(1)
       end
     end
diff --git a/spec/controllers/admin/user_fields_controller_spec.rb b/spec/controllers/admin/user_fields_controller_spec.rb
index cb0c95c930..de46a1cf0c 100644
--- a/spec/controllers/admin/user_fields_controller_spec.rb
+++ b/spec/controllers/admin/user_fields_controller_spec.rb
@@ -12,19 +12,27 @@ describe Admin::UserFieldsController do
     context '.create' do
       it "creates a user field" do
         expect {
-          xhr :post, :create, {user_field: {name: 'hello', description: 'hello desc', field_type: 'text'} }
+          post :create, params: {
+            user_field: { name: 'hello', description: 'hello desc', field_type: 'text' }
+          }, format: :json
+
           expect(response).to be_success
         }.to change(UserField, :count).by(1)
       end
 
       it "creates a user field with options" do
-        expect {
-          xhr :post, :create, {user_field: {name: 'hello',
-                                            description: 'hello desc',
-                                            field_type: 'dropdown',
-                                            options: ['a', 'b', 'c']} }
+        expect do
+          post :create, params: {
+            user_field: {
+              name: 'hello',
+              description: 'hello desc',
+              field_type: 'dropdown',
+              options: ['a', 'b', 'c']
+            }
+          }, format: :json
+
           expect(response).to be_success
-        }.to change(UserField, :count).by(1)
+        end.to change(UserField, :count).by(1)
 
         expect(UserFieldOption.count).to eq(3)
       end
@@ -34,7 +42,7 @@ describe Admin::UserFieldsController do
       let!(:user_field) { Fabricate(:user_field) }
 
       it "returns a list of user fields" do
-        xhr :get, :index
+        get :index, format: :json
         expect(response).to be_success
         json = ::JSON.parse(response.body)
         expect(json['user_fields']).to be_present
@@ -46,7 +54,7 @@ describe Admin::UserFieldsController do
 
       it "deletes the user field" do
         expect {
-          xhr :delete, :destroy, id: user_field.id
+          delete :destroy, params: { id: user_field.id }, format: :json
           expect(response).to be_success
         }.to change(UserField, :count).by(-1)
       end
@@ -56,7 +64,11 @@ describe Admin::UserFieldsController do
       let!(:user_field) { Fabricate(:user_field) }
 
       it "updates the user field" do
-        xhr :put, :update, id: user_field.id, user_field: {name: 'fraggle', field_type: 'confirm', description: 'muppet'}
+        put :update, params: {
+          id: user_field.id,
+          user_field: { name: 'fraggle', field_type: 'confirm', description: 'muppet' }
+        }, format: :json
+
         expect(response).to be_success
         user_field.reload
         expect(user_field.name).to eq('fraggle')
@@ -64,10 +76,16 @@ describe Admin::UserFieldsController do
       end
 
       it "updates the user field options" do
-        xhr :put, :update, id: user_field.id, user_field: {name: 'fraggle',
-                                                           field_type: 'dropdown',
-                                                           description: 'muppet',
-                                                           options: ['hello', 'hello', 'world']}
+        put :update, params: {
+          id: user_field.id,
+          user_field: {
+            name: 'fraggle',
+            field_type: 'dropdown',
+            description: 'muppet',
+            options: ['hello', 'hello', 'world']
+          }
+        }, format: :json
+
         expect(response).to be_success
         user_field.reload
         expect(user_field.name).to eq('fraggle')
@@ -76,19 +94,31 @@ describe Admin::UserFieldsController do
       end
 
       it "keeps options when updating the user field" do
-        xhr :put, :update, id: user_field.id, user_field: {name: 'fraggle',
-                                                           field_type: 'dropdown',
-                                                           description: 'muppet',
-                                                           options: ['hello', 'hello', 'world'],
-                                                           position: 1}
+        put :update, params: {
+          id: user_field.id,
+          user_field: {
+            name: 'fraggle',
+            field_type: 'dropdown',
+            description: 'muppet',
+            options: ['hello', 'hello', 'world'],
+            position: 1
+          }
+        }, format: :json
+
         expect(response).to be_success
         user_field.reload
         expect(user_field.user_field_options.size).to eq(2)
 
-        xhr :put, :update, id: user_field.id, user_field: {name: 'fraggle',
-                                                           field_type: 'dropdown',
-                                                           description: 'muppet',
-                                                           position: 2}
+        put :update, params: {
+          id: user_field.id,
+          user_field: {
+            name: 'fraggle',
+            field_type: 'dropdown',
+            description: 'muppet',
+            position: 2
+          }
+        }, format: :json
+
         expect(response).to be_success
         user_field.reload
         expect(user_field.user_field_options.size).to eq(2)
@@ -97,4 +127,3 @@ describe Admin::UserFieldsController do
   end
 
 end
-
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index f061351085..80f9a865a0 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -14,19 +14,19 @@ describe Admin::UsersController do
 
     context '.index' do
       it 'returns success' do
-        xhr :get, :index
+        get :index, format: :json
         expect(response).to be_success
       end
 
       it 'returns JSON' do
-        xhr :get, :index
+        get :index, format: :json
         expect(::JSON.parse(response.body)).to be_present
       end
 
       context 'when showing emails' do
 
         it "returns email for all the users" do
-          xhr :get, :index, show_emails: "true"
+          get :index, params: { show_emails: "true" }, format: :json
           data = ::JSON.parse(response.body)
           data.each do |user|
             expect(user["email"]).to be_present
@@ -36,7 +36,7 @@ describe Admin::UsersController do
         it "logs only 1 enty" do
           expect(UserHistory.where(action: UserHistory.actions[:check_email], acting_user_id: @user.id).count).to eq(0)
 
-          xhr :get, :index, show_emails: "true"
+          get :index, params: { show_emails: "true" }, format: :json
 
           expect(UserHistory.where(action: UserHistory.actions[:check_email], acting_user_id: @user.id).count).to eq(1)
         end
@@ -47,14 +47,14 @@ describe Admin::UsersController do
     describe '.show' do
       context 'an existing user' do
         it 'returns success' do
-          xhr :get, :show, id: @user.id
+          get :show, params: { id: @user.id }, format: :json
           expect(response).to be_success
         end
       end
 
       context 'an existing user' do
         it 'returns success' do
-          xhr :get, :show, id: 0
+          get :show, params: { id: 0 }, format: :json
           expect(response).not_to be_success
         end
       end
@@ -66,19 +66,19 @@ describe Admin::UsersController do
 
       it "does nothing without uesrs" do
         User.any_instance.expects(:approve).never
-        xhr :put, :approve_bulk
+        put :approve_bulk, format: :json
       end
 
       it "won't approve the user when not allowed" do
         Guardian.any_instance.expects(:can_approve?).with(evil_trout).returns(false)
         User.any_instance.expects(:approve).never
-        xhr :put, :approve_bulk, users: [evil_trout.id]
+        put :approve_bulk, params: { users: [evil_trout.id] }, format: :json
       end
 
       it "approves the user when permitted" do
         Guardian.any_instance.expects(:can_approve?).with(evil_trout).returns(true)
         User.any_instance.expects(:approve).once
-        xhr :put, :approve_bulk, users: [evil_trout.id]
+        put :approve_bulk, params: { users: [evil_trout.id] }, format: :json
       end
 
     end
@@ -88,7 +88,7 @@ describe Admin::UsersController do
 
       it 'calls generate_api_key' do
         User.any_instance.expects(:generate_api_key).with(@user)
-        xhr :post, :generate_api_key, user_id: evil_trout.id
+        post :generate_api_key, params: { user_id: evil_trout.id }, format: :json
       end
     end
 
@@ -98,7 +98,7 @@ describe Admin::UsersController do
 
       it 'calls revoke_api_key' do
         User.any_instance.expects(:revoke_api_key)
-        xhr :delete, :revoke_api_key, user_id: evil_trout.id
+        delete :revoke_api_key, params: { user_id: evil_trout.id }, format: :json
       end
 
     end
@@ -109,24 +109,95 @@ describe Admin::UsersController do
 
       it "raises an error when the user doesn't have permission" do
         Guardian.any_instance.expects(:can_approve?).with(evil_trout).returns(false)
-        xhr :put, :approve, user_id: evil_trout.id
+        put :approve, params: { user_id: evil_trout.id }, format: :json
         expect(response).to be_forbidden
       end
 
       it 'calls approve' do
         User.any_instance.expects(:approve).with(@user)
-        xhr :put, :approve, user_id: evil_trout.id
+        put :approve, params: { user_id: evil_trout.id }, format: :json
       end
 
     end
 
     context '.suspend' do
+      let(:user) { Fabricate(:evil_trout) }
 
-      let(:evil_trout) { Fabricate(:evil_trout) }
+      it "works properly" do
+        Fabricate(:api_key, user: user)
+        expect(user).not_to be_suspended
+        put(
+          :suspend,
+          params: {
+            user_id: user.id,
+            suspend_until: 5.hours.from_now,
+            reason: "because I said so",
+            format: :json
+          }
+        )
+        expect(response).to be_success
+
+        user.reload
+        expect(user).to be_suspended
+        expect(user.suspended_at).to be_present
+        expect(user.suspended_till).to be_present
+        expect(ApiKey.where(user_id: user.id).count).to eq(0)
+
+        log = UserHistory.where(target_user_id: user.id).order('id desc').first
+        expect(log).to be_present
+        expect(log.details).to match(/because I said so/)
+      end
+
+      it "can have an associated post" do
+        post = Fabricate(:post)
+
+        put(
+          :suspend,
+          params: {
+            user_id: user.id,
+            suspend_until: 5.hours.from_now,
+            reason: "because of this post",
+            post_id: post.id,
+            format: :json
+          }
+        )
+        expect(response).to be_success
+
+        log = UserHistory.where(target_user_id: user.id).order('id desc').first
+        expect(log).to be_present
+        expect(log.post_id).to eq(post.id)
+      end
+
+      it "can send a message to the user" do
+        Jobs.expects(:enqueue).with(
+          :critical_user_email,
+          has_entries(
+            type: :account_suspended,
+            user_id: user.id
+          )
+        )
+
+        put(
+          :suspend,
+          params: {
+            user_id: user.id,
+            suspend_until: 10.days.from_now,
+            reason: "short reason",
+            message: "long reason",
+            format: :json
+          }
+        )
+        expect(response).to be_success
+
+        log = UserHistory.where(target_user_id: user.id).order('id desc').first
+        expect(log).to be_present
+        expect(log.details).to match(/short reason/)
+        expect(log.details).to match(/long reason/)
+      end
 
       it "also revoke any api keys" do
         User.any_instance.expects(:revoke_api_key)
-        xhr :put, :suspend, user_id: evil_trout.id
+        put :suspend, params: { user_id: user.id }, format: :json
       end
 
     end
@@ -138,12 +209,12 @@ describe Admin::UsersController do
 
       it 'raises an error unless the user can revoke access' do
         Guardian.any_instance.expects(:can_revoke_admin?).with(@another_admin).returns(false)
-        xhr :put, :revoke_admin, user_id: @another_admin.id
+        put :revoke_admin, params: { user_id: @another_admin.id }, format: :json
         expect(response).to be_forbidden
       end
 
       it 'updates the admin flag' do
-        xhr :put, :revoke_admin, user_id: @another_admin.id
+        put :revoke_admin, params: { user_id: @another_admin.id }, format: :json
         @another_admin.reload
         expect(@another_admin).not_to be_admin
       end
@@ -154,20 +225,24 @@ 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
+        put :grant_admin, params: { user_id: @another_user.id }, format: :json
         expect(response).to be_forbidden
       end
 
       it "returns a 404 if the username doesn't exist" do
-        xhr :put, :grant_admin, user_id: 123123
+        put :grant_admin, params: { user_id: 123123 }, format: :json
         expect(response).to be_forbidden
       end
 
       it 'updates the admin flag' do
         expect(AdminConfirmation.exists_for?(@another_user.id)).to eq(false)
-        xhr :put, :grant_admin, user_id: @another_user.id
+        put :grant_admin, params: { user_id: @another_user.id }, format: :json
         expect(AdminConfirmation.exists_for?(@another_user.id)).to eq(true)
       end
     end
@@ -177,7 +252,9 @@ describe Admin::UsersController do
       let(:group) { Fabricate(:group) }
 
       it 'adds the user to the group' do
-        xhr :post, :add_group, group_id: group.id, user_id: user.id
+        post :add_group, params: {
+          group_id: group.id, user_id: user.id
+        }, format: :json
 
         expect(response).to be_success
         expect(GroupUser.where(user_id: user.id, group_id: group.id).exists?).to eq(true)
@@ -189,7 +266,10 @@ describe Admin::UsersController do
         expect(group_history.target_user).to eq(user)
 
         # Doing it again doesn't raise an error
-        xhr :post, :add_group, group_id: group.id, user_id: user.id
+        post :add_group, params: {
+          group_id: group.id, user_id: user.id
+        }, format: :json
+
         expect(response).to be_success
       end
     end
@@ -203,27 +283,50 @@ describe Admin::UsersController do
 
       it "raises an error when the user doesn't have permission" do
         Guardian.any_instance.expects(:can_change_primary_group?).with(@another_user).returns(false)
-        xhr :put, :primary_group, user_id: @another_user.id
+        put :primary_group, params: {
+          user_id: @another_user.id
+        }, format: :json
+
         expect(response).to be_forbidden
       end
 
       it "returns a 404 if the user doesn't exist" do
-        xhr :put, :primary_group, user_id: 123123
+        put :primary_group, params: {
+          user_id: 123123
+        }, format: :json
+
         expect(response).to be_forbidden
       end
 
       it "changes the user's primary group" do
         group.add(@another_user)
-        xhr :put, :primary_group, user_id: @another_user.id, primary_group_id: group.id
+        put :primary_group, params: {
+          user_id: @another_user.id, primary_group_id: group.id
+        }, format: :json
+
         @another_user.reload
         expect(@another_user.primary_group_id).to eq(group.id)
       end
 
       it "doesn't change primary group if they aren't a member of the group" do
-        xhr :put, :primary_group, user_id: @another_user.id, primary_group_id: group.id
+        put :primary_group, params: {
+          user_id: @another_user.id, primary_group_id: group.id
+        }, format: :json
+
         @another_user.reload
         expect(@another_user.primary_group_id).to be_nil
       end
+
+      it "remove user's primary group" do
+        group.add(@another_user)
+
+        put :primary_group, params: {
+          user_id: @another_user.id, primary_group_id: ""
+        }, format: :json
+
+        @another_user.reload
+        expect(@another_user.primary_group_id).to be(nil)
+      end
     end
 
     context '.trust_level' do
@@ -233,18 +336,28 @@ describe Admin::UsersController do
 
       it "raises an error when the user doesn't have permission" do
         Guardian.any_instance.expects(:can_change_trust_level?).with(@another_user).returns(false)
-        xhr :put, :trust_level, user_id: @another_user.id
+        put :trust_level, params: {
+          user_id: @another_user.id
+        }, format: :json
+
         expect(response).not_to be_success
       end
 
       it "returns a 404 if the username doesn't exist" do
-        xhr :put, :trust_level, user_id: 123123
+        put :trust_level, params: {
+          user_id: 123123
+        }, format: :json
+
         expect(response).not_to be_success
       end
 
       it "upgrades the user's trust level" do
         StaffActionLogger.any_instance.expects(:log_trust_level_change).with(@another_user, @another_user.trust_level, 2).once
-        xhr :put, :trust_level, user_id: @another_user.id, level: 2
+
+        put :trust_level, params: {
+          user_id: @another_user.id, level: 2
+        }, format: :json
+
         @another_user.reload
         expect(@another_user.trust_level).to eq(2)
         expect(response).to be_success
@@ -257,10 +370,16 @@ describe Admin::UsersController do
         stat.time_read = SiteSetting.tl1_requires_time_spent_mins * 60
         stat.save!
         @another_user.update_attributes(trust_level: TrustLevel[1])
-        xhr :put, :trust_level, user_id: @another_user.id, level: TrustLevel[0]
+
+        put :trust_level, params: {
+          user_id: @another_user.id,
+          level: TrustLevel[0]
+        }, format: :json
+
         expect(response).to be_success
         @another_user.reload
-        expect(@another_user.trust_level_locked).to eq(true)
+        expect(@another_user.trust_level).to eq(TrustLevel[0])
+        expect(@another_user.manual_locked_trust_level).to eq(TrustLevel[0])
       end
     end
 
@@ -271,12 +390,18 @@ describe Admin::UsersController do
 
       it 'raises an error unless the user can revoke access' do
         Guardian.any_instance.expects(:can_revoke_moderation?).with(@moderator).returns(false)
-        xhr :put, :revoke_moderation, user_id: @moderator.id
+        put :revoke_moderation, params: {
+          user_id: @moderator.id
+        }, format: :json
+
         expect(response).to be_forbidden
       end
 
       it 'updates the moderator flag' do
-        xhr :put, :revoke_moderation, user_id: @moderator.id
+        put :revoke_moderation, params: {
+          user_id: @moderator.id
+        }, format: :json
+
         @moderator.reload
         expect(@moderator.moderator).not_to eq(true)
       end
@@ -289,17 +414,17 @@ describe Admin::UsersController do
 
       it "raises an error when the user doesn't have permission" do
         Guardian.any_instance.expects(:can_grant_moderation?).with(@another_user).returns(false)
-        xhr :put, :grant_moderation, user_id: @another_user.id
+        put :grant_moderation, params: { user_id: @another_user.id }, format: :json
         expect(response).to be_forbidden
       end
 
       it "returns a 404 if the username doesn't exist" do
-        xhr :put, :grant_moderation, user_id: 123123
+        put :grant_moderation, params: { user_id: 123123 }, format: :json
         expect(response).to be_forbidden
       end
 
       it 'updates the moderator flag' do
-        xhr :put, :grant_moderation, user_id: @another_user.id
+        put :grant_moderation, params: { user_id: @another_user.id }, format: :json
         @another_user.reload
         expect(@another_user.moderator).to eq(true)
       end
@@ -311,19 +436,26 @@ describe Admin::UsersController do
 
       it 'does nothing without users' do
         UserDestroyer.any_instance.expects(:destroy).never
-        xhr :delete, :reject_bulk
+        delete :reject_bulk, format: :json
       end
 
       it "won't delete users if not allowed" do
         Guardian.any_instance.stubs(:can_delete_user?).returns(false)
         UserDestroyer.any_instance.expects(:destroy).never
-        xhr :delete, :reject_bulk, users: [reject_me.id]
+
+        delete :reject_bulk, params: {
+          users: [reject_me.id]
+        }, format: :json
       end
 
       it "reports successes" do
         Guardian.any_instance.stubs(:can_delete_user?).returns(true)
         UserDestroyer.any_instance.stubs(:destroy).returns(true)
-        xhr :delete, :reject_bulk, users: [reject_me.id, reject_me_too.id]
+
+        delete :reject_bulk, params: {
+          users: [reject_me.id, reject_me_too.id]
+        }, format: :json
+
         expect(response).to be_success
         json = ::JSON.parse(response.body)
         expect(json['success'].to_i).to eq(2)
@@ -338,7 +470,11 @@ describe Admin::UsersController do
         it 'can handle some successes and some failures' do
           UserDestroyer.any_instance.stubs(:destroy).with(reject_me, anything).returns(false)
           UserDestroyer.any_instance.stubs(:destroy).with(reject_me_too, anything).returns(true)
-          xhr :delete, :reject_bulk, users: [reject_me.id, reject_me_too.id]
+
+          delete :reject_bulk, params: {
+            users: [reject_me.id, reject_me_too.id]
+          }, format: :json
+
           expect(response).to be_success
           json = ::JSON.parse(response.body)
           expect(json['success'].to_i).to eq(1)
@@ -347,7 +483,11 @@ describe Admin::UsersController do
 
         it 'reports failure due to a user still having posts' do
           UserDestroyer.any_instance.expects(:destroy).with(reject_me, anything).raises(UserDestroyer::PostsExistError)
-          xhr :delete, :reject_bulk, users: [reject_me.id]
+
+          delete :reject_bulk, params: {
+            users: [reject_me.id]
+          }, format: :json
+
           expect(response).to be_success
           json = ::JSON.parse(response.body)
           expect(json['success'].to_i).to eq(0)
@@ -357,47 +497,34 @@ describe Admin::UsersController do
     end
 
     context '.destroy' do
-      before do
-        @delete_me = Fabricate(:user)
-      end
-
-      it "raises an error when the user doesn't have permission" do
-        Guardian.any_instance.expects(:can_delete_user?).with(@delete_me).returns(false)
-        xhr :delete, :destroy, id: @delete_me.id
-        expect(response).to be_forbidden
-      end
+      let(:delete_me) { Fabricate(:user) }
 
       it "returns a 403 if the user doesn't exist" do
-        xhr :delete, :destroy, id: 123123
+        delete :destroy, params: { id: 123123 }, format: :json
         expect(response).to be_forbidden
       end
 
       context "user has post" do
+        let(:topic) { create_topic(user: delete_me) }
 
         before do
-          @user = Fabricate(:user)
-          topic = create_topic(user: @user)
-          _post = create_post(topic: topic, user: @user)
-          @user.stubs(:first_post_created_at).returns(Time.zone.now)
-          User.expects(:find_by).with(id: @delete_me.id).returns(@user)
+          _post = create_post(topic: topic, user: delete_me)
         end
 
         it "returns an error" do
-          xhr :delete, :destroy, id: @delete_me.id
+          delete :destroy, params: { id: delete_me.id }, format: :json
           expect(response).to be_forbidden
         end
 
         it "doesn't return an error if delete_posts == true" do
-          UserDestroyer.any_instance.expects(:destroy).with(@user, has_entry('delete_posts' => true)).returns(true)
-          xhr :delete, :destroy, id: @delete_me.id, delete_posts: true
+          delete :destroy, params: { id: delete_me.id, delete_posts: true }, format: :json
           expect(response).to be_success
         end
-
       end
 
       it "deletes the user record" do
         UserDestroyer.any_instance.expects(:destroy).returns(true)
-        xhr :delete, :destroy, id: @delete_me.id
+        delete :destroy, params: { id: delete_me.id }, format: :json
       end
     end
 
@@ -407,11 +534,24 @@ describe Admin::UsersController do
       end
 
       it "returns success" do
-        xhr :put, :activate, user_id: @reg_user.id
+        put :activate, params: { user_id: @reg_user.id }, format: :json
         expect(response).to be_success
         json = ::JSON.parse(response.body)
         expect(json['success']).to eq("OK")
       end
+
+      it "should confirm email even when the tokens are expired" do
+        @reg_user.email_tokens.update_all(confirmed: false, expired: true)
+
+        @reg_user.reload
+        expect(@reg_user.email_confirmed?).to eq(false)
+
+        put :activate, params: { user_id: @reg_user.id }, format: :json
+        expect(response).to be_success
+
+        @reg_user.reload
+        expect(@reg_user.email_confirmed?).to eq(true)
+      end
     end
 
     context 'log_out' do
@@ -420,68 +560,105 @@ describe Admin::UsersController do
       end
 
       it "returns success" do
-        xhr :put, :log_out, user_id: @reg_user.id
+        put :log_out, params: { user_id: @reg_user.id }, format: :json
         expect(response).to be_success
         json = ::JSON.parse(response.body)
         expect(json['success']).to eq("OK")
       end
 
       it "returns 404 when user_id does not exist" do
-        xhr :put, :log_out, user_id: 123123
+        put :log_out, params: { user_id: 123123 }, format: :json
         expect(response).not_to be_success
       end
     end
 
-    context 'block' do
+    context 'silence' do
       before do
         @reg_user = Fabricate(:user)
       end
 
       it "raises an error when the user doesn't have permission" do
-        Guardian.any_instance.expects(:can_block_user?).with(@reg_user).returns(false)
-        UserBlocker.expects(:block).never
-        xhr :put, :block, user_id: @reg_user.id
+        Guardian.any_instance.expects(:can_silence_user?).with(@reg_user).returns(false)
+        put :silence, params: { user_id: @reg_user.id }, format: :json
         expect(response).to be_forbidden
+        @reg_user.reload
+        expect(@reg_user).not_to be_silenced
       end
 
       it "returns a 403 if the user doesn't exist" do
-        xhr :put, :block, user_id: 123123
+        put :silence, params: { user_id: 123123 }, format: :json
         expect(response).to be_forbidden
       end
 
       it "punishes the user for spamming" do
-        UserBlocker.expects(:block).with(@reg_user, @user, anything)
-        xhr :put, :block, user_id: @reg_user.id
+        put :silence, params: { user_id: @reg_user.id }, format: :json
+        expect(response).to be_success
+        @reg_user.reload
+        expect(@reg_user).to be_silenced
+      end
+
+      it "will set a length of time if provided" do
+        future_date = 1.month.from_now.to_date
+        put(
+          :silence,
+          params: {
+            user_id: @reg_user.id,
+            silenced_till: future_date
+          },
+          format: :json
+        )
+        @reg_user.reload
+        expect(@reg_user.silenced_till).to eq(future_date)
+      end
+
+      it "will send a message if provided" do
+        Jobs.stubs(:enqueue)
+        Jobs.expects(:enqueue).with(
+          :critical_user_email,
+          has_entries(
+            type: :account_silenced,
+            user_id: @reg_user.id
+          )
+        )
+
+        put(
+          :silence,
+          params: {
+            user_id: @reg_user.id,
+            message: "Email this to the user"
+          },
+          format: :json
+        )
       end
     end
 
-    context 'unblock' do
+    context 'unsilence' do
       before do
         @reg_user = Fabricate(:user)
       end
 
       it "raises an error when the user doesn't have permission" do
-        Guardian.any_instance.expects(:can_unblock_user?).with(@reg_user).returns(false)
-        xhr :put, :unblock, user_id: @reg_user.id
+        Guardian.any_instance.expects(:can_unsilence_user?).with(@reg_user).returns(false)
+        put :unsilence, params: { user_id: @reg_user.id }, format: :json
         expect(response).to be_forbidden
       end
 
       it "returns a 403 if the user doesn't exist" do
-        xhr :put, :unblock, user_id: 123123
+        put :unsilence, params: { user_id: 123123 }, format: :json
         expect(response).to be_forbidden
       end
 
       it "punishes the user for spamming" do
-        UserBlocker.expects(:unblock).with(@reg_user, @user, anything)
-        xhr :put, :unblock, user_id: @reg_user.id
+        UserSilencer.expects(:unsilence).with(@reg_user, @user, anything)
+        put :unsilence, params: { user_id: @reg_user.id }, format: :json
       end
     end
 
     context 'ip-info' do
 
       it "uses ipinfo.io webservice to retrieve the info" do
-        Excon.expects(:get).with("http://ipinfo.io/123.123.123.123/json", read_timeout: 30, connect_timeout: 30)
-        xhr :get, :ip_info, ip: "123.123.123.123"
+        Excon.expects(:get).with("https://ipinfo.io/123.123.123.123/json", read_timeout: 10, connect_timeout: 10)
+        get :ip_info, params: { ip: "123.123.123.123" }, format: :json
       end
 
     end
@@ -494,7 +671,9 @@ describe Admin::UsersController do
 
         UserDestroyer.any_instance.expects(:destroy).twice
 
-        xhr :delete, :delete_other_accounts_with_same_ip, ip: "42.42.42.42", exclude: -1, order: "trust_level DESC"
+        delete :delete_other_accounts_with_same_ip, params: {
+          ip: "42.42.42.42", exclude: -1, order: "trust_level DESC"
+        }, format: :json
       end
 
     end
@@ -502,17 +681,25 @@ describe Admin::UsersController do
     context ".invite_admin" do
       it "doesn't work when not via API" do
         controller.stubs(:is_api?).returns(false)
-        xhr :post, :invite_admin, name: 'Bill', username: 'bill22', email: 'bill@bill.com'
+
+        post :invite_admin, params: {
+          name: 'Bill', username: 'bill22', email: 'bill@bill.com'
+        }, format: :json
+
         expect(response).not_to be_success
       end
 
       it 'should invite admin' do
         controller.stubs(:is_api?).returns(true)
         Jobs.expects(:enqueue).with(:critical_user_email, anything).returns(true)
-        xhr :post, :invite_admin, name: 'Bill', username: 'bill22', email: 'bill@bill.com'
+
+        post :invite_admin, params: {
+          name: 'Bill', username: 'bill22', email: 'bill@bill.com'
+        }, format: :json
+
         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)
@@ -521,7 +708,11 @@ describe Admin::UsersController do
       it "doesn't send the email with send_email falsy" do
         controller.stubs(:is_api?).returns(true)
         Jobs.expects(:enqueue).with(:user_email, anything).never
-        xhr :post, :invite_admin, name: 'Bill', username: 'bill22', email: 'bill@bill.com', send_email: '0'
+
+        post :invite_admin, params: {
+          name: 'Bill', username: 'bill22', email: 'bill@bill.com', send_email: '0'
+        }, format: :json
+
         expect(response).to be_success
         json = ::JSON.parse(response.body)
         expect(json["password_url"]).to be_present
@@ -532,14 +723,13 @@ describe Admin::UsersController do
       it "also clears the user's primary group" do
         g = Fabricate(:group)
         u = Fabricate(:user, primary_group: g)
-        xhr :delete, :remove_group, group_id: g.id, user_id: u.id
+        delete :remove_group, params: { group_id: g.id, user_id: u.id }, format: :json
+
         expect(u.reload.primary_group).to be_nil
       end
     end
-
   end
 
-
   context '#sync_sso' do
     let(:sso) { SingleSignOn.new }
     let(:sso_secret) { "sso secret" }
@@ -547,6 +737,8 @@ describe Admin::UsersController do
     before do
       log_in(:admin)
 
+      SiteSetting.email_editable = false
+      SiteSetting.sso_url = "https://www.example.com/sso"
       SiteSetting.enable_sso = true
       SiteSetting.sso_overrides_email = true
       SiteSetting.sso_overrides_name = true
@@ -555,7 +747,6 @@ describe Admin::UsersController do
       sso.sso_secret = sso_secret
     end
 
-
     it 'can sync up with the sso' do
       sso.name = "Bob The Bob"
       sso.username = "bob"
@@ -563,13 +754,13 @@ describe Admin::UsersController do
       sso.external_id = "1"
 
       user = DiscourseSingleSignOn.parse(sso.payload)
-                                  .lookup_or_create_user
+        .lookup_or_create_user
 
       sso.name = "Bill"
       sso.username = "Hokli$$!!"
       sso.email = "bob2@bob.com"
 
-      xhr :post, :sync_sso, Rack::Utils.parse_query(sso.payload)
+      post :sync_sso, params: Rack::Utils.parse_query(sso.payload), format: :json
       expect(response).to be_success
 
       user.reload
@@ -583,10 +774,10 @@ describe Admin::UsersController do
       sso.username = "dr_claw"
       sso.email = "dr@claw.com"
       sso.external_id = "2"
-      xhr :post, :sync_sso, Rack::Utils.parse_query(sso.payload)
+      post :sync_sso, params: Rack::Utils.parse_query(sso.payload), format: :json
       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
@@ -596,9 +787,9 @@ describe Admin::UsersController do
       sso.name = ""
       sso.external_id = "1"
 
-      xhr :post, :sync_sso, Rack::Utils.parse_query(sso.payload)
+      post :sync_sso, params: Rack::Utils.parse_query(sso.payload), format: :json
       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 can't be blank")
     end
   end
 end
diff --git a/spec/controllers/admin/versions_controller_spec.rb b/spec/controllers/admin/versions_controller_spec.rb
index 0353062d47..62c8cea39d 100644
--- a/spec/controllers/admin/versions_controller_spec.rb
+++ b/spec/controllers/admin/versions_controller_spec.rb
@@ -20,7 +20,7 @@ describe Admin::VersionsController do
     end
 
     describe 'show' do
-      subject { xhr :get, :show }
+      subject { get :show, format: :json }
       it { is_expected.to be_success }
 
       it 'should return the currently available version' do
diff --git a/spec/controllers/admin/web_hooks_controller_spec.rb b/spec/controllers/admin/web_hooks_controller_spec.rb
index bf6b894c44..6b793dd0de 100644
--- a/spec/controllers/admin/web_hooks_controller_spec.rb
+++ b/spec/controllers/admin/web_hooks_controller_spec.rb
@@ -14,17 +14,20 @@ describe Admin::WebHooksController do
 
     describe '#create' do
       it 'creates a webhook' do
-        xhr :post, :create, web_hook: {
-          payload_url: 'https://meta.discourse.org/',
-          content_type: 1,
-          secret: "a_secret_for_webhooks",
-          wildcard_web_hook: false,
-          active: true,
-          verify_certificate: true,
-          web_hook_event_type_ids: [1],
-          group_ids: [],
-          category_ids: []
-        }
+        post :create, params: {
+          web_hook: {
+            payload_url: 'https://meta.discourse.org/',
+            content_type: 1,
+            secret: "a_secret_for_webhooks",
+            wildcard_web_hook: false,
+            active: true,
+            verify_certificate: true,
+            web_hook_event_type_ids: [1],
+            group_ids: [],
+            category_ids: []
+          }
+        }, format: :json
+
         expect(response).to be_success
 
         json = ::JSON.parse(response.body)
@@ -32,16 +35,19 @@ describe Admin::WebHooksController do
       end
 
       it 'returns error when field is not filled correctly' do
-        xhr :post, :create, web_hook: {
-          content_type: 1,
-          secret: "a_secret_for_webhooks",
-          wildcard_web_hook: false,
-          active: true,
-          verify_certificate: true,
-          web_hook_event_type_ids: [1],
-          group_ids: [],
-          category_ids: []
-        }
+        post :create, params: {
+          web_hook: {
+            content_type: 1,
+            secret: "a_secret_for_webhooks",
+            wildcard_web_hook: false,
+            active: true,
+            verify_certificate: true,
+            web_hook_event_type_ids: [1],
+            group_ids: [],
+            category_ids: []
+          }
+        }, format: :json
+
         expect(response.status).to eq 422
         response_body = JSON.parse(response.body)
 
@@ -52,8 +58,9 @@ describe Admin::WebHooksController do
     describe '#ping' do
       it 'enqueues the ping event' do
         Jobs.expects(:enqueue)
-            .with(:emit_web_hook_event, web_hook_id: web_hook.id, event_type: 'ping', event_name: 'ping')
-        xhr :post, :ping, id: web_hook.id
+          .with(:emit_web_hook_event, web_hook_id: web_hook.id, event_type: 'ping', event_name: 'ping')
+
+        post :ping, params: { id: web_hook.id }, format: :json
 
         expect(response).to be_success
       end
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
deleted file mode 100644
index dc86db9122..0000000000
--- a/spec/controllers/application_controller_spec.rb
+++ /dev/null
@@ -1,328 +0,0 @@
-require 'rails_helper'
-
-describe TopicsController do
-  before do
-    TopicUser.stubs(:track_visit!)
-  end
-
-  let :topic do
-    Fabricate(:post).topic
-  end
-
-  def set_referer(ref)
-    request.env['HTTP_REFERER'] = ref
-  end
-
-  def set_accept_language(locale)
-    request.env['HTTP_ACCEPT_LANGUAGE'] = locale
-  end
-
-  describe "themes" do
-    let :theme do
-      Theme.create!(user_id: -1, name: 'bob', user_selectable: true)
-    end
-
-    let :theme2 do
-      Theme.create!(user_id: -1, name: 'bobbob', user_selectable: true)
-    end
-
-    it "selects the theme the user has selected" do
-      user = log_in
-      user.user_option.update_columns(theme_key: theme.key)
-
-      get :show, id: 666
-      expect(controller.theme_key).to eq(theme.key)
-
-      theme.update_columns(user_selectable: false)
-
-      get :show, id: 666
-      expect(controller.theme_key).not_to eq(theme.key)
-    end
-
-    it "can be overridden with a cookie" do
-      user = log_in
-      user.user_option.update_columns(theme_key: theme.key)
-
-      cookies['theme_key'] = "#{theme2.key},#{user.user_option.theme_key_seq}"
-
-      get :show, id: 666
-      expect(controller.theme_key).to eq(theme2.key)
-
-    end
-
-    it "cookie can fail back to user if out of sync" do
-      user = log_in
-      user.user_option.update_columns(theme_key: theme.key)
-      cookies['theme_key'] = "#{theme2.key},#{user.user_option.theme_key_seq-1}"
-
-      get :show, id: 666
-      expect(controller.theme_key).to eq(theme.key)
-    end
-  end
-
-  it "doesn't store an incoming link when there's no referer" do
-    expect {
-      get :show, id: topic.id
-    }.not_to change(IncomingLink, :count)
-  end
-
-  it "doesn't raise an error on a very long link" do
-    set_referer("http://#{'a' * 2000}.com")
-    expect { get :show, {id: topic.id} }.not_to raise_error
-  end
-
-  describe "has_escaped_fragment?" do
-    render_views
-
-    context "when the SiteSetting is disabled" do
-
-      it "uses the application layout even with an escaped fragment param" do
-        SiteSetting.enable_escaped_fragments = false
-        get :show, {'topic_id' => topic.id, 'slug' => topic.slug, '_escaped_fragment_' => 'true'}
-        expect(response).to render_template(layout: 'application')
-        assert_select "meta[name=fragment]", false, "it doesn't have the meta tag"
-      end
-
-    end
-
-    context "when the SiteSetting is enabled" do
-      before do
-        SiteSetting.enable_escaped_fragments = true
-      end
-
-      it "uses the application layout when there's no param" do
-        get :show, topic_id: topic.id, slug: topic.slug
-        expect(response).to render_template(layout: 'application')
-        assert_select "meta[name=fragment]", true, "it has the meta tag"
-      end
-
-      it "uses the crawler layout when there's an _escaped_fragment_ param" do
-        get :show, topic_id: topic.id, slug: topic.slug, _escaped_fragment_: 'true'
-        expect(response).to render_template(layout: 'crawler')
-        assert_select "meta[name=fragment]", false, "it doesn't have the meta tag"
-      end
-    end
-  end
-
-  describe "crawler" do
-    render_views
-
-    context "when not a crawler" do
-      it "renders with the application layout" do
-        get :show, topic_id: topic.id, slug: topic.slug
-        expect(response).to render_template(layout: 'application')
-        assert_select "meta[name=fragment]", true, "it has the meta tag"
-      end
-    end
-
-    context "when a crawler" do
-      it "renders with the crawler layout" do
-        request.env["HTTP_USER_AGENT"] = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
-        get :show, topic_id: topic.id, slug: topic.slug
-        expect(response).to render_template(layout: 'crawler')
-        assert_select "meta[name=fragment]", false, "it doesn't have the meta tag"
-      end
-    end
-
-  end
-
-  describe "print" do
-    render_views
-
-    context "when the SiteSetting is enabled" do
-      it "uses the application layout when there's no param" do
-        get :show, topic_id: topic.id, slug: topic.slug
-        expect(response).to render_template(layout: 'application')
-        assert_select "meta[name=fragment]", true, "it has the meta tag"
-      end
-
-      it "uses the crawler layout when there's an print param" do
-        get :show, topic_id: topic.id, slug: topic.slug, print: 'true'
-        expect(response).to render_template(layout: 'crawler')
-        assert_select "meta[name=fragment]", false, "it doesn't have the meta tag"
-      end
-    end
-  end
-
-  describe 'clear_notifications' do
-    it 'correctly clears notifications if specified via cookie' do
-      notification = Fabricate(:notification)
-      log_in_user(notification.user)
-
-      request.cookies['cn'] = "2828,100,#{notification.id}"
-
-      get :show, {topic_id: 100}
-
-      expect(response.cookies['cn']).to eq nil
-
-      notification.reload
-      expect(notification.read).to eq true
-
-    end
-
-    it 'correctly clears notifications if specified via header' do
-      notification = Fabricate(:notification)
-      log_in_user(notification.user)
-
-      request.headers['Discourse-Clear-Notifications'] = "2828,100,#{notification.id}"
-
-      get :show, {topic_id: 100}
-
-      notification.reload
-      expect(notification.read).to eq true
-    end
-  end
-
-  describe "set_locale" 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")
-          set_accept_language("fr")
-        end
-
-        context "with an anonymous user" do
-          it "uses the default locale" do
-            get :show, {topic_id: topic.id}
-
-            expect(I18n.locale).to eq(:en)
-          end
-        end
-
-        context "with a logged in user" do
-          it "it uses the default locale" do
-            user = Fabricate(:user, locale: :fr)
-            log_in_user(user)
-
-            get :show, {topic_id: topic.id}
-
-            expect(I18n.locale).to eq(:en)
-          end
-        end
-      end
-    end
-
-    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")
-          set_accept_language("fr")
-        end
-
-        context "with an anonymous user" do
-          it "uses the locale from the headers" do
-            get :show, {topic_id: topic.id}
-
-            expect(I18n.locale).to eq(:fr)
-          end
-        end
-
-        context "with a logged in user" do
-          it "uses the user's preferred locale" do
-            user = Fabricate(:user, locale: :fr)
-            log_in_user(user)
-
-            get :show, {topic_id: topic.id}
-
-            expect(I18n.locale).to eq(:fr)
-          end
-        end
-      end
-
-      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")
-          set_accept_language("zh-CN")
-
-          get :show, {topic_id: topic.id}
-
-          expect(I18n.locale).to eq(:zh_CN)
-        end
-      end
-
-      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')
-          set_accept_language('')
-
-          get :show, {topic_id: topic.id}
-
-          expect(I18n.locale).to eq(:en)
-        end
-      end
-    end
-  end
-
-  describe "read only header" do
-    it "returns no read only header by default" do
-      get :show, {topic_id: topic.id}
-      expect(response.headers['Discourse-Readonly']).to eq(nil)
-    end
-
-    it "returns a readonly header if the site is read only" do
-      Discourse.received_readonly!
-      get :show, {topic_id: topic.id}
-      expect(response.headers['Discourse-Readonly']).to eq('true')
-    end
-  end
-end
-
-describe 'api' do
-
-  before do
-    ActionController::Base.allow_forgery_protection = true
-  end
-
-  after do
-    ActionController::Base.allow_forgery_protection = false
-  end
-
-  describe PostsController do
-    let(:user) do
-      Fabricate(:user)
-    end
-
-    let(:post) do
-      Fabricate(:post)
-    end
-
-    let(:api_key) { user.generate_api_key(user) }
-    let(:master_key) { ApiKey.create_master_key }
-
-    # choosing an arbitrarily easy to mock trusted activity
-    it 'allows users with api key to bookmark posts' do
-      PostAction.expects(:act).with(user, post, PostActionType.types[:bookmark]).once
-      put :bookmark, bookmarked: "true", post_id: post.id, api_key: api_key.key, format: :json
-      expect(response).to be_success
-    end
-
-    it 'raises an error with a user key that does not match an optionally specified username' do
-      PostAction.expects(:act).with(user, post, PostActionType.types[:bookmark]).never
-      put :bookmark, bookmarked: "true", post_id: post.id, api_key: api_key.key, api_username: 'made_up', format: :json
-      expect(response).not_to be_success
-    end
-
-    it 'allows users with a master api key to bookmark posts' do
-      PostAction.expects(:act).with(user, post, PostActionType.types[:bookmark]).once
-      put :bookmark, bookmarked: "true", post_id: post.id, api_key: master_key.key, api_username: user.username, format: :json
-      expect(response).to be_success
-    end
-
-    it 'disallows phonies to bookmark posts' do
-      PostAction.expects(:act).with(user, post, PostActionType.types[:bookmark]).never
-      put :bookmark, bookmarked: "true", post_id: post.id, api_key: SecureRandom.hex(32), api_username: user.username, format: :json
-      expect(response.code.to_i).to eq(403)
-    end
-
-    it 'disallows blank api' do
-      PostAction.expects(:act).with(user, post, PostActionType.types[:bookmark]).never
-      put :bookmark, bookmarked: "true", post_id: post.id, api_key: "", api_username: user.username, format: :json
-      expect(response.code.to_i).to eq(403)
-    end
-  end
-end
diff --git a/spec/controllers/badges_controller_spec.rb b/spec/controllers/badges_controller_spec.rb
index a2bb4420dc..de894666c6 100644
--- a/spec/controllers/badges_controller_spec.rb
+++ b/spec/controllers/badges_controller_spec.rb
@@ -20,7 +20,7 @@ describe BadgesController do
 
   context 'show' do
     it "should return a badge" do
-      get :show, id: badge.id, format: :json
+      get :show, params: { id: badge.id }, format: :json
       expect(response.status).to eq(200)
       parsed = JSON.parse(response.body)
       expect(parsed["badge"]).to be_present
@@ -30,8 +30,14 @@ describe BadgesController do
       log_in_user(user)
       user_badge = BadgeGranter.grant(badge, user)
       expect(user_badge.notification.read).to eq(false)
-      get :show, id: badge.id, format: :json
+      get :show, params: { id: badge.id }
       expect(user_badge.notification.reload.read).to eq(true)
     end
+
+    it 'renders rss feed of a badge' do
+      get :show, params: { id: badge.id }, format: :rss
+      expect(response.status).to eq(200)
+      expect(response.content_type).to eq('application/rss+xml')
+    end
   end
 end
diff --git a/spec/controllers/categories_controller_spec.rb b/spec/controllers/categories_controller_spec.rb
index 4850d5f36a..f0cca3fa94 100644
--- a/spec/controllers/categories_controller_spec.rb
+++ b/spec/controllers/categories_controller_spec.rb
@@ -4,7 +4,7 @@ describe CategoriesController do
   describe "create" do
 
     it "requires the user to be logged in" do
-      expect { xhr :post, :create }.to raise_error(Discourse::NotLoggedIn)
+      expect { post :create, format: :json }.to raise_error(Discourse::NotLoggedIn)
     end
 
     describe "logged in" do
@@ -14,26 +14,38 @@ describe CategoriesController do
 
       it "raises an exception when they don't have permission to create it" do
         Guardian.any_instance.expects(:can_create?).with(Category, nil).returns(false)
-        xhr :post, :create, name: 'hello', color: 'ff0', text_color: 'fff'
+        post :create, params: {
+          name: 'hello', color: 'ff0', text_color: 'fff'
+        }, format: :json
+
         expect(response).to be_forbidden
       end
 
       it "raises an exception when the name is missing" do
-        expect { xhr :post, :create, color: "ff0", text_color: "fff" }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          post :create, params: { color: "ff0", text_color: "fff" }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       it "raises an exception when the color is missing" do
-        expect { xhr :post, :create, name: "hello", text_color: "fff" }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          post :create, params: { name: "hello", text_color: "fff" }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       it "raises an exception when the text color is missing" do
-        expect { xhr :post, :create, name: "hello", color: "ff0" }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          post :create, params: { name: "hello", color: "ff0" }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       describe "failure" do
         before do
           @category = Fabricate(:category, user: @user)
-          xhr :post, :create, name: @category.name, color: "ff0", text_color: "fff"
+
+          post :create, params: {
+            name: @category.name, color: "ff0", text_color: "fff"
+          }, format: :json
         end
 
         it { is_expected.not_to respond_with(:success) }
@@ -48,17 +60,22 @@ describe CategoriesController do
           readonly = CategoryGroup.permission_types[:readonly]
           create_post = CategoryGroup.permission_types[:create_post]
 
-          xhr :post, :create, name: "hello", color: "ff0", text_color: "fff", slug: "hello-cat",
-                              auto_close_hours: 72,
-                              permissions: {
-                                "everyone" => readonly,
-                                "staff" => create_post
-                              }
+          post :create, params: {
+            name: "hello",
+            color: "ff0",
+            text_color: "fff",
+            slug: "hello-cat",
+            auto_close_hours: 72,
+            permissions: {
+              "everyone" => readonly,
+              "staff" => create_post
+            }
+          }, format: :json
 
           expect(response.status).to eq(200)
           category = Category.find_by(name: "hello")
-          expect(category.category_groups.map{|g| [g.group_id, g.permission_type]}.sort).to eq([
-            [Group[:everyone].id, readonly],[Group[:staff].id,create_post]
+          expect(category.category_groups.map { |g| [g.group_id, g.permission_type] }.sort).to eq([
+            [Group[:everyone].id, readonly], [Group[:staff].id, create_post]
           ])
           expect(category.name).to eq("hello")
           expect(category.slug).to eq("hello-cat")
@@ -73,7 +90,8 @@ describe CategoriesController do
   describe "destroy" do
 
     it "requires the user to be logged in" do
-      expect { xhr :delete, :destroy, id: "category"}.to raise_error(Discourse::NotLoggedIn)
+      expect { delete :destroy, params: { id: "category" }, format: :json }
+        .to raise_error(Discourse::NotLoggedIn)
     end
 
     describe "logged in" do
@@ -84,13 +102,16 @@ describe CategoriesController do
 
       it "raises an exception if they don't have permission to delete it" do
         Guardian.any_instance.expects(:can_delete_category?).returns(false)
-        xhr :delete, :destroy, id: @category.slug
+        delete :destroy, params: { id: @category.slug }, format: :json
         expect(response).to be_forbidden
       end
 
       it "deletes the record" do
         Guardian.any_instance.expects(:can_delete_category?).returns(true)
-        expect { xhr :delete, :destroy, id: @category.slug}.to change(Category, :count).by(-1)
+        expect do
+          delete :destroy, params: { id: @category.slug }, format: :json
+        end.to change(Category, :count).by(-1)
+
         expect(UserHistory.count).to eq(1)
       end
     end
@@ -119,29 +140,29 @@ describe CategoriesController do
       payload[c3.id] = 6
       payload[c4.id] = 5
 
-      xhr :post, :reorder, mapping: MultiJson.dump(payload)
+      post :reorder, params: { mapping: MultiJson.dump(payload) }, format: :json
 
       SiteSetting.fixed_category_positions = true
       list = CategoryList.new(Guardian.new(admin))
+
       expect(list.categories).to eq([
-                                      Category.find(SiteSetting.uncategorized_category_id),
-                                      c1,
-                                      c4,
-                                      c2,
-                                      c3
-                                    ])
+        Category.find(SiteSetting.uncategorized_category_id),
+        c1,
+        c4,
+        c2,
+        c3
+      ])
     end
   end
 
   describe "update" do
 
     it "requires the user to be logged in" do
-      expect { xhr :put, :update, id: 'category'}.to raise_error(Discourse::NotLoggedIn)
+      expect { put :update, params: { id: 'category' }, format: :json }.to raise_error(Discourse::NotLoggedIn)
     end
 
-
     describe "logged in" do
-      let(:valid_attrs) { {id: @category.id, name: "hello", color: "ff0", text_color: "fff"} }
+      let(:valid_attrs) { { id: @category.id, name: "hello", color: "ff0", text_color: "fff" } }
 
       before do
         @user = log_in(:admin)
@@ -150,26 +171,54 @@ describe CategoriesController do
 
       it "raises an exception if they don't have permission to edit it" do
         Guardian.any_instance.expects(:can_edit?).returns(false)
-        xhr :put, :update, id: @category.slug, name: 'hello', color: 'ff0', text_color: 'fff'
+        put :update, params: {
+          id: @category.slug,
+          name: 'hello',
+          color: 'ff0',
+          text_color: 'fff'
+        }, format: :json
+
         expect(response).to be_forbidden
       end
 
       it "requires a name" do
-        expect { xhr :put, :update, id: @category.slug, color: 'fff', text_color: '0ff' }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          put :update, params: {
+            id: @category.slug,
+            color: 'fff',
+            text_color: '0ff',
+          }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       it "requires a color" do
-        expect { xhr :put, :update, id: @category.slug, name: 'asdf', text_color: '0ff' }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          put :update, params: {
+            id: @category.slug,
+            name: 'asdf',
+            text_color: '0ff',
+          }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       it "requires a text color" do
-        expect { xhr :put, :update, id: @category.slug, name: 'asdf', color: 'fff' }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          put :update,
+            params: { id: @category.slug, name: 'asdf', color: 'fff' },
+            format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       describe "failure" do
         before do
-          @other_category = Fabricate(:category, name: "Other", user: @user )
-          xhr :put, :update, id: @category.id, name: @other_category.name, color: "ff0", text_color: "fff"
+          @other_category = Fabricate(:category, name: "Other", user: @user)
+
+          put :update, params: {
+            id: @category.id,
+            name: @other_category.name,
+            color: "ff0",
+            text_color: "fff",
+          }, format: :json
         end
 
         it "returns errors on a duplicate category name" do
@@ -182,8 +231,15 @@ describe CategoriesController do
       end
 
       it "returns 422 if email_in address is already in use for other category" do
-        @other_category = Fabricate(:category, name: "Other", email_in: "mail@examle.com" )
-        xhr :put, :update, id: @category.id, name: "Email", email_in: "mail@examle.com", color: "ff0", text_color: "fff"
+        @other_category = Fabricate(:category, name: "Other", email_in: "mail@examle.com")
+
+        put :update, params: {
+          id: @category.id,
+          name: "Email",
+          email_in: "mail@examle.com",
+          color: "ff0",
+          text_color: "fff",
+        }, format: :json
 
         expect(response).not_to be_success
         expect(response.code.to_i).to eq(422)
@@ -195,54 +251,64 @@ describe CategoriesController do
           readonly = CategoryGroup.permission_types[:readonly]
           create_post = CategoryGroup.permission_types[:create_post]
 
-          xhr :put, :update, id: @category.id, name: "hello", color: "ff0", text_color: "fff", slug: "hello-category",
-                              auto_close_hours: 72,
-                              permissions: {
-                                "everyone" => readonly,
-                                "staff" => create_post
-                              },
-                              custom_fields: {
-                                "dancing" => "frogs"
-                              }
-
+          put :update, params: {
+            id: @category.id,
+            name: "hello",
+            color: "ff0",
+            text_color: "fff",
+            slug: "hello-category",
+            auto_close_hours: 72,
+            permissions: {
+              "everyone" => readonly,
+              "staff" => create_post
+            },
+            custom_fields: {
+              "dancing" => "frogs"
+            },
+          }, format: :json
 
           expect(response.status).to eq(200)
           @category.reload
-          expect(@category.category_groups.map{|g| [g.group_id, g.permission_type]}.sort).to eq([
-            [Group[:everyone].id, readonly],[Group[:staff].id,create_post]
+          expect(@category.category_groups.map { |g| [g.group_id, g.permission_type] }.sort).to eq([
+            [Group[:everyone].id, readonly], [Group[:staff].id, create_post]
           ])
           expect(@category.name).to eq("hello")
           expect(@category.slug).to eq("hello-category")
           expect(@category.color).to eq("ff0")
           expect(@category.auto_close_hours).to eq(72)
-          expect(@category.custom_fields).to eq({"dancing" => "frogs"})
+          expect(@category.custom_fields).to eq("dancing" => "frogs")
         end
 
         it 'logs the changes correctly' do
           @category.update!(permissions: { "admins" => CategoryGroup.permission_types[:create_post] })
 
-          xhr :put , :update, id: @category.id, name: 'new name',
-            color: @category.color, text_color: @category.text_color,
+          put :update, params: {
+            id: @category.id,
+            name: 'new name',
+            color: @category.color,
+            text_color: @category.text_color,
             slug: @category.slug,
             permissions: {
               "everyone" => CategoryGroup.permission_types[:create_post]
-            }
+            },
+          }, format: :json
 
           expect(UserHistory.count).to eq(5) # 2 + 3 (bootstrap mode)
         end
       end
     end
 
-
   end
 
   describe 'update_slug' do
     it 'requires the user to be logged in' do
-      expect { xhr :put, :update_slug, category_id: 'category'}.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        put :update_slug, params: { category_id: 'category' }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     describe 'logged in' do
-      let(:valid_attrs) { {id: @category.id, slug: 'fff'} }
+      let(:valid_attrs) { { id: @category.id, slug: 'fff' } }
 
       before do
         @user = log_in(:admin)
@@ -250,32 +316,44 @@ describe CategoriesController do
       end
 
       it 'rejects blank' do
-        xhr :put, :update_slug, category_id: @category.id, slug: nil
+        put :update_slug, params: { category_id: @category.id, slug: nil }, format: :json
         expect(response.status).to eq(422)
       end
 
       it 'accepts valid custom slug' do
-        xhr :put, :update_slug, category_id: @category.id, slug: 'valid-slug'
+        put :update_slug,
+          params: { category_id: @category.id, slug: 'valid-slug' },
+          format: :json
+
         expect(response).to be_success
         expect(@category.reload.slug).to eq('valid-slug')
       end
 
       it 'accepts not well formed custom slug' do
-        xhr :put, :update_slug, category_id: @category.id, slug: ' valid slug'
+        put :update_slug,
+          params: { category_id: @category.id, slug: ' valid slug' },
+          format: :json
+
         expect(response).to be_success
         expect(@category.reload.slug).to eq('valid-slug')
       end
 
-      it 'accepts and sanitize custom slug when the slug generation method is not english' do
+      it 'accepts and sanitize custom slug when the slug generation method is not ascii' do
         SiteSetting.slug_generation_method = 'none'
-        xhr :put, :update_slug, category_id: @category.id, slug: ' another !_ slug @'
+        put :update_slug,
+          params: { category_id: @category.id, slug: ' another !_ slug @' },
+          format: :json
+
         expect(response).to be_success
         expect(@category.reload.slug).to eq('another-slug')
         SiteSetting.slug_generation_method = 'ascii'
       end
 
       it 'rejects invalid custom slug' do
-        xhr :put, :update_slug, category_id: @category.id, slug: '  '
+        put :update_slug,
+          params: { category_id: @category.id, slug: '  ' },
+          format: :json
+
         expect(response.status).to eq(422)
       end
     end
diff --git a/spec/controllers/category_hashtags_controller_spec.rb b/spec/controllers/category_hashtags_controller_spec.rb
index e5f1515614..56d9b50565 100644
--- a/spec/controllers/category_hashtags_controller_spec.rb
+++ b/spec/controllers/category_hashtags_controller_spec.rb
@@ -9,19 +9,21 @@ describe CategoryHashtagsController do
 
       it 'only returns the categories that are valid' do
         category = Fabricate(:category)
-        xhr :get, :check, category_slugs: [category.slug, 'none']
+
+        get :check, params: { category_slugs: [category.slug, 'none'] }, format: :json
 
         expect(JSON.parse(response.body)).to eq(
-          { "valid" => [{ "slug" => category.hashtag_slug, "url" => category.url_with_id }] }
+          "valid" => [{ "slug" => category.hashtag_slug, "url" => category.url_with_id }]
         )
       end
 
       it 'does not return restricted categories for a normal user' do
         group = Fabricate(:group)
         private_category = Fabricate(:private_category, group: group)
-        xhr :get, :check, category_slugs: [private_category.slug]
 
-        expect(JSON.parse(response.body)).to eq({ "valid" => [] })
+        get :check, params: { category_slugs: [private_category.slug] }, format: :json
+
+        expect(JSON.parse(response.body)).to eq("valid" => [])
       end
 
       it 'returns restricted categories for an admin' do
@@ -29,17 +31,22 @@ describe CategoryHashtagsController do
         group = Fabricate(:group)
         group.add(admin)
         private_category = Fabricate(:private_category, group: group)
-        xhr :get, :check, category_slugs: [private_category.slug]
+
+        get :check,
+          params: { category_slugs: [private_category.slug] },
+          format: :json
 
         expect(JSON.parse(response.body)).to eq(
-          { "valid" => [{ "slug" => private_category.hashtag_slug, "url" => private_category.url_with_id }] }
+          "valid" => [{ "slug" => private_category.hashtag_slug, "url" => private_category.url_with_id }]
         )
       end
     end
 
     describe "not logged in" do
       it 'raises an exception' do
-        expect { xhr :get, :check, category_slugs: [] }.to raise_error(Discourse::NotLoggedIn)
+        expect do
+          get :check, params: { category_slugs: [] }, format: :json
+        end.to raise_error(Discourse::NotLoggedIn)
       end
     end
   end
diff --git a/spec/controllers/clicks_controller_spec.rb b/spec/controllers/clicks_controller_spec.rb
index 3beaf783ef..238199db0b 100644
--- a/spec/controllers/clicks_controller_spec.rb
+++ b/spec/controllers/clicks_controller_spec.rb
@@ -6,12 +6,12 @@ describe ClicksController do
 
     context 'missing params' do
       it 'raises a 404 without the url param' do
-        xhr :get, :track, post_id: 123
+        get :track, params: { post_id: 123 }, format: :json
         expect(response).to be_not_found
       end
 
       it "redirects to the url even without the topic_id or post_id params" do
-        xhr :get, :track, url: 'http://google.com'
+        get :track, params: { url: 'http://google.com' }, format: :json
         expect(response).not_to be_redirect
       end
     end
@@ -19,12 +19,18 @@ describe ClicksController do
     context 'correct params' do
       let(:url) { "http://discourse.org" }
 
-      before { request.stubs(:remote_ip).returns('192.168.0.1') }
+      before do
+        request.headers.merge!('REMOTE_ADDR' => '192.168.0.1')
+      end
 
       context "with a made up url" do
         it "doesn't redirect" do
           TopicLinkClick.expects(:create_from).returns(nil)
-          xhr :get, :track, url: 'http://discourse.org', post_id: 123
+
+          get :track,
+            params: { url: 'http://discourse.org', post_id: 123 },
+            format: :json
+
           expect(response).not_to be_redirect
         end
       end
@@ -32,7 +38,11 @@ describe ClicksController do
       context "with a query string" do
         it "redirects" do
           TopicLinkClick.expects(:create_from).with(has_entries('url' => 'http://discourse.org/?hello=123')).returns(url)
-          xhr :get, :track, url: 'http://discourse.org/?hello=123', post_id: 123
+
+          get :track, params: {
+            url: 'http://discourse.org/?hello=123', post_id: 123, format: :json
+          }
+
           expect(response).to redirect_to(url)
         end
       end
@@ -40,22 +50,36 @@ describe ClicksController do
       context 'with a post_id' do
         it 'redirects' do
           TopicLinkClick.expects(:create_from).with('url' => url, 'post_id' => '123', 'ip' => '192.168.0.1').returns(url)
-          xhr :get, :track, url: url, post_id: 123
+
+          get :track, params: { url: url, post_id: 123, format: :json }
+
+          expect(response).to redirect_to(url)
+        end
+
+        it "redirects links in whispers to staff members" do
+          log_in(:admin)
+          whisper = Fabricate(:post, post_type: Post.types[:whisper])
+
+          get :track, params: { url: url, post_id: whisper.id, format: :json }
+
           expect(response).to redirect_to(url)
         end
 
         it "doesn't redirect with the redirect=false param" do
           TopicLinkClick.expects(:create_from).with('url' => url, 'post_id' => '123', 'ip' => '192.168.0.1', 'redirect' => 'false').returns(url)
-          xhr :get, :track, url: url, post_id: 123, redirect: 'false'
+
+          get :track, params: {
+            url: url, post_id: 123, redirect: 'false', format: :json
+          }
+
           expect(response).not_to be_redirect
         end
-
       end
 
       context 'with a topic_id' do
         it 'redirects' do
           TopicLinkClick.expects(:create_from).with('url' => url, 'topic_id' => '789', 'ip' => '192.168.0.1').returns(url)
-          xhr :get, :track, url: url, topic_id: 789
+          get :track, params: { url: url, topic_id: 789, format: :json }
           expect(response).to redirect_to(url)
         end
       end
diff --git a/spec/controllers/composer_messages_controller_spec.rb b/spec/controllers/composer_messages_controller_spec.rb
index 39c39dc2e0..5f22deda8e 100644
--- a/spec/controllers/composer_messages_controller_spec.rb
+++ b/spec/controllers/composer_messages_controller_spec.rb
@@ -5,15 +5,15 @@ describe ComposerMessagesController do
   context '.index' do
 
     it 'requires you to be logged in' do
-      expect { xhr :get, :index }.to raise_error(Discourse::NotLoggedIn)
+      expect { get :index, format: :json }.to raise_error(Discourse::NotLoggedIn)
     end
 
     context 'when logged in' do
       let!(:user) { log_in }
-      let(:args) { {'topic_id' => '123', 'post_id' => '333', 'composer_action' => 'reply'} }
+      let(:args) { { 'topic_id' => '123', 'post_id' => '333', 'composer_action' => 'reply' } }
 
       it 'redirects to your user preferences' do
-        xhr :get, :index
+        get :index, format: :json
         expect(response).to be_success
       end
 
@@ -21,7 +21,7 @@ describe ComposerMessagesController do
         finder = mock
         ComposerMessagesFinder.expects(:new).with(instance_of(User), has_entries(args)).returns(finder)
         finder.expects(:find)
-        xhr :get, :index, args
+        get :index, params: args, format: :json
       end
     end
   end
diff --git a/spec/controllers/directory_items_controller_spec.rb b/spec/controllers/directory_items_controller_spec.rb
deleted file mode 100644
index fa33e8af9a..0000000000
--- a/spec/controllers/directory_items_controller_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-require 'rails_helper'
-
-describe DirectoryItemsController do
-
-  it "requires a `period` param" do
-    expect{ xhr :get, :index }.to raise_error(ActionController::ParameterMissing)
-  end
-
-  it "requires a proper `period` param" do
-    xhr :get, :index, period: 'eviltrout'
-    expect(response).not_to be_success
-  end
-
-
-  context "without data" do
-
-    context "and a logged in user" do
-      let!(:user) { log_in }
-
-      it "succeeds" do
-        xhr :get, :index, period: 'all'
-        expect(response).to be_success
-        json = ::JSON.parse(response.body)
-      end
-    end
-
-  end
-
-
-  context "with data" do
-    before do
-      Fabricate(:user)
-      DirectoryItem.refresh!
-    end
-
-    it "succeeds with a valid value" do
-      xhr :get, :index, period: 'all'
-      expect(response).to be_success
-      json = ::JSON.parse(response.body)
-
-      expect(json).to be_present
-      expect(json['directory_items']).to be_present
-      expect(json['total_rows_directory_items']).to be_present
-      expect(json['load_more_directory_items']).to be_present
-    end
-
-    it "fails when the directory is disabled" do
-      SiteSetting.enable_user_directory = false
-
-      xhr :get, :index, period: 'all'
-      expect(response).not_to be_success
-    end
-  end
-end
diff --git a/spec/controllers/draft_controller_spec.rb b/spec/controllers/draft_controller_spec.rb
index 1153e7529c..fd8912caa7 100644
--- a/spec/controllers/draft_controller_spec.rb
+++ b/spec/controllers/draft_controller_spec.rb
@@ -8,14 +8,14 @@ describe DraftController do
 
   it 'saves a draft on update' do
     user = log_in
-    post :update, draft_key: 'xyz', data: 'my data', sequence: 0
+    post :update, params: { draft_key: 'xyz', data: 'my data', sequence: 0 }, format: :json
     expect(Draft.get(user, 'xyz', 0)).to eq('my data')
   end
 
   it 'destroys drafts when required' do
     user = log_in
     Draft.set(user, 'xxx', 0, 'hi')
-    delete :destroy, draft_key: 'xxx', sequence: 0
+    delete :destroy, params: { draft_key: 'xxx', sequence: 0 }, format: :json
     expect(Draft.get(user, 'xxx', 0)).to eq(nil)
   end
 
diff --git a/spec/controllers/email_controller_spec.rb b/spec/controllers/email_controller_spec.rb
index 996d88cf3e..4a1a03994f 100644
--- a/spec/controllers/email_controller_spec.rb
+++ b/spec/controllers/email_controller_spec.rb
@@ -5,14 +5,14 @@ describe EmailController do
   context '.preferences_redirect' do
 
     it 'requires you to be logged in' do
-      expect { get :preferences_redirect }.to raise_error(Discourse::NotLoggedIn)
+      expect { get :preferences_redirect, format: :json }.to raise_error(Discourse::NotLoggedIn)
     end
 
     context 'when logged in' do
       let!(:user) { log_in }
 
       it 'redirects to your user preferences' do
-        get :preferences_redirect
+        get :preferences_redirect, format: :json
         expect(response).to redirect_to("/u/#{user.username}/preferences")
       end
     end
@@ -21,7 +21,7 @@ describe EmailController do
 
   context '.perform unsubscribe' do
     it 'raises not found on invalid key' do
-      post :perform_unsubscribe, key: "123"
+      post :perform_unsubscribe, params: { key: "123" }, format: :json
       expect(response.status).to eq(404)
     end
 
@@ -30,11 +30,14 @@ describe EmailController do
       key = UnsubscribeKey.create_key_for(user, "all")
 
       user.user_option.update_columns(email_always: true,
-                                     email_digests: true,
-                                     email_direct: true,
-                                     email_private_messages: true)
+                                      email_digests: true,
+                                      email_direct: true,
+                                      email_private_messages: true)
+
+      post :perform_unsubscribe,
+        params: { key: key, unsubscribe_all: "1" },
+        format: :json
 
-      post :perform_unsubscribe, key: key, unsubscribe_all: "1"
       expect(response.status).to eq(302)
 
       user.user_option.reload
@@ -52,7 +55,10 @@ describe EmailController do
 
       user.user_option.update_columns(mailing_list_mode: true)
 
-      post :perform_unsubscribe, key: key, disable_mailing_list: "1"
+      post :perform_unsubscribe,
+        params: { key: key, disable_mailing_list: "1" },
+        format: :json
+
       expect(response.status).to eq(302)
 
       user.user_option.reload
@@ -66,7 +72,10 @@ describe EmailController do
 
       user.user_option.update_columns(email_digests: true)
 
-      post :perform_unsubscribe, key: key, disable_digest_emails: "1"
+      post :perform_unsubscribe,
+        params: { key: key, disable_digest_emails: "1" },
+        format: :json
+
       expect(response.status).to eq(302)
 
       user.user_option.reload
@@ -79,7 +88,11 @@ describe EmailController do
       key = UnsubscribeKey.create_key_for(p.user, p)
 
       TopicUser.change(p.user_id, p.topic_id, notification_level: TopicUser.notification_levels[:watching])
-      post :perform_unsubscribe, key: key, unwatch_topic: "1"
+
+      post :perform_unsubscribe,
+        params: { key: key, unwatch_topic: "1" },
+        format: :json
+
       expect(response.status).to eq(302)
 
       expect(TopicUser.get(p.topic, p.user).notification_level).to eq(TopicUser.notification_levels[:tracking])
@@ -90,7 +103,11 @@ describe EmailController do
       key = UnsubscribeKey.create_key_for(p.user, p)
 
       TopicUser.change(p.user_id, p.topic_id, notification_level: TopicUser.notification_levels[:watching])
-      post :perform_unsubscribe, key: key, mute_topic: "1"
+
+      post :perform_unsubscribe,
+        params: { key: key, mute_topic: "1" },
+        format: :json
+
       expect(response.status).to eq(302)
 
       expect(TopicUser.get(p.topic, p.user).notification_level).to eq(TopicUser.notification_levels[:muted])
@@ -101,10 +118,13 @@ describe EmailController do
       key = UnsubscribeKey.create_key_for(p.user, p)
 
       cu = CategoryUser.create!(user_id: p.user.id,
-                          category_id: p.topic.category_id,
-                          notification_level: CategoryUser.notification_levels[:watching])
+                                category_id: p.topic.category_id,
+                                notification_level: CategoryUser.notification_levels[:watching])
+
+      post :perform_unsubscribe,
+        params: { key: key, unwatch_category: "1" },
+        format: :json
 
-      post :perform_unsubscribe, key: key, unwatch_category: "1"
       expect(response.status).to eq(302)
 
       expect(CategoryUser.find_by(id: cu.id)).to eq(nil)
@@ -115,10 +135,13 @@ describe EmailController do
       key = UnsubscribeKey.create_key_for(p.user, p)
 
       cu = CategoryUser.create!(user_id: p.user.id,
-                          category_id: p.topic.category_id,
-                          notification_level: CategoryUser.notification_levels[:watching_first_post])
+                                category_id: p.topic.category_id,
+                                notification_level: CategoryUser.notification_levels[:watching_first_post])
+
+      post :perform_unsubscribe,
+        params: { key: key, unwatch_category: "1" },
+        format: :json
 
-      post :perform_unsubscribe, key: key, unwatch_category: "1"
       expect(response.status).to eq(302)
 
       expect(CategoryUser.find_by(id: cu.id)).to eq(nil)
@@ -134,14 +157,14 @@ describe EmailController do
       user = Fabricate(:user)
       key = UnsubscribeKey.create_key_for(user, "digest")
 
-      get :unsubscribe, key: key
+      get :unsubscribe, params: { key: key }
 
       expect(response.body).to include(I18n.t("unsubscribe.log_out"))
       expect(response.body).to include(I18n.t("unsubscribe.different_user_description"))
     end
 
     it 'displays not found if key is not found' do
-      get :unsubscribe, key: SecureRandom.hex
+      get :unsubscribe, params: { key: SecureRandom.hex }
       expect(response.body).to include(CGI.escapeHTML(I18n.t("unsubscribe.not_found_description")))
     end
 
@@ -152,18 +175,18 @@ describe EmailController do
 
       user.user_option.update_columns(mailing_list_mode: true)
 
-      get :unsubscribe, key: key
+      get :unsubscribe, params: { key: key }
       expect(response.body).to include(I18n.t("unsubscribe.mailing_list_mode"))
 
       SiteSetting.disable_mailing_list_mode = true
 
-      get :unsubscribe, key: key
+      get :unsubscribe, params: { key: key }
       expect(response.body).not_to include(I18n.t("unsubscribe.mailing_list_mode"))
 
       user.user_option.update_columns(mailing_list_mode: false)
       SiteSetting.disable_mailing_list_mode = false
 
-      get :unsubscribe, key: key
+      get :unsubscribe, params: { key: key }
       expect(response.body).not_to include(I18n.t("unsubscribe.mailing_list_mode"))
 
     end
@@ -175,7 +198,7 @@ describe EmailController do
       key = UnsubscribeKey.create_key_for(user, "digest")
 
       # because we are type digest we will always show digest and it will be selected
-      get :unsubscribe, key: key
+      get :unsubscribe, params: { key: key }
       expect(response.body).to include(I18n.t("unsubscribe.disable_digest_emails"))
 
       source = Nokogiri::HTML::fragment(response.body)
@@ -183,13 +206,13 @@ describe EmailController do
 
       SiteSetting.disable_digest_emails = true
 
-      get :unsubscribe, key: key
+      get :unsubscribe, params: { key: key }
       expect(response.body).not_to include(I18n.t("unsubscribe.disable_digest_emails"))
 
       SiteSetting.disable_digest_emails = false
       key = UnsubscribeKey.create_key_for(user, "not_digest")
 
-      get :unsubscribe, key: key
+      get :unsubscribe, params: { key: key }
       expect(response.body).to include(I18n.t("unsubscribe.disable_digest_emails"))
     end
 
@@ -197,17 +220,16 @@ describe EmailController do
       post = Fabricate(:post)
       user = post.user
       cu = CategoryUser.create!(user_id: user.id,
-                          category_id: post.topic.category_id,
-                          notification_level: CategoryUser.notification_levels[:watching])
-
+                                category_id: post.topic.category_id,
+                                notification_level: CategoryUser.notification_levels[:watching])
 
       key = UnsubscribeKey.create_key_for(user, post)
-      get :unsubscribe, key: key
+      get :unsubscribe, params: { key: key }
       expect(response.body).to include("unwatch_category")
 
       cu.destroy!
 
-      get :unsubscribe, key: key
+      get :unsubscribe, params: { key: key }
       expect(response.body).not_to include("unwatch_category")
 
     end
@@ -216,17 +238,16 @@ describe EmailController do
       post = Fabricate(:post)
       user = post.user
       cu = CategoryUser.create!(user_id: user.id,
-                          category_id: post.topic.category_id,
-                          notification_level: CategoryUser.notification_levels[:watching_first_post])
-
+                                category_id: post.topic.category_id,
+                                notification_level: CategoryUser.notification_levels[:watching_first_post])
 
       key = UnsubscribeKey.create_key_for(user, post)
-      get :unsubscribe, key: key
+      get :unsubscribe, params: { key: key }
       expect(response.body).to include("unwatch_category")
 
       cu.destroy!
 
-      get :unsubscribe, key: key
+      get :unsubscribe, params: { key: key }
       expect(response.body).not_to include("unwatch_category")
 
     end
diff --git a/spec/controllers/embed_controller_spec.rb b/spec/controllers/embed_controller_spec.rb
deleted file mode 100644
index e81faa0371..0000000000
--- a/spec/controllers/embed_controller_spec.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-require 'rails_helper'
-
-describe EmbedController do
-
-  let(:host) { "eviltrout.com" }
-  let(:embed_url) { "http://eviltrout.com/2013/02/10/why-discourse-uses-emberjs.html" }
-  let(:discourse_username) { "eviltrout" }
-
-  it "is 404 without an embed_url" do
-    get :comments
-    expect(response).to render_template :embed_error
-  end
-
-  it "raises an error with a missing host" do
-    get :comments, embed_url: embed_url
-    expect(response).to render_template :embed_error
-  end
-
-  context "by topic id" do
-
-    before do
-      Fabricate(:embeddable_host)
-      controller.request.stubs(:referer).returns('http://eviltrout.com/some-page')
-    end
-
-    it "allows a topic to be embedded by id" do
-      topic = Fabricate(:topic)
-      get :comments, topic_id: topic.id
-      expect(response).to be_success
-    end
-  end
-
-  context ".info" do
-    context "without api key" do
-      it "fails" do
-        get :info, format: :json
-        expect(response).to render_template :embed_error
-      end
-    end
-
-    context "with api key" do
-
-      let(:api_key) { ApiKey.create_master_key }
-
-      context "with valid embed url" do
-        let(:topic_embed) { Fabricate(:topic_embed, embed_url: embed_url) }
-
-        it "returns information about the topic" do
-          get :info, format: :json, embed_url: topic_embed.embed_url, api_key: api_key.key, api_username: "system"
-          json = JSON.parse(response.body)
-          expect(json['topic_id']).to eq(topic_embed.topic.id)
-          expect(json['post_id']).to eq(topic_embed.post.id)
-          expect(json['topic_slug']).to eq(topic_embed.topic.slug)
-        end
-      end
-
-      context "without invalid embed url" do
-        it "returns error response" do
-          get :info, format: :json, embed_url: "http://nope.com", api_key: api_key.key, api_username: "system"
-          json = JSON.parse(response.body)
-          expect(json["error_type"]).to eq("not_found")
-        end
-      end
-    end
-  end
-
-  context "with a host" do
-    let!(:embeddable_host) { Fabricate(:embeddable_host) }
-
-    it "raises an error with no referer" do
-      get :comments, embed_url: embed_url
-      expect(response).to render_template :embed_error
-    end
-
-    context "success" do
-      before do
-        controller.request.stubs(:referer).returns(embed_url)
-      end
-
-      after do
-        expect(response).to be_success
-        expect(response.headers['X-Frame-Options']).to eq("ALLOWALL")
-      end
-
-      it "tells the topic retriever to work when no previous embed is found" do
-        TopicEmbed.expects(:topic_id_for_embed).returns(nil)
-        retriever = mock
-        TopicRetriever.expects(:new).returns(retriever)
-        retriever.expects(:retrieve)
-        get :comments, embed_url: embed_url
-      end
-
-      it "creates a topic view when a topic_id is found" do
-        TopicEmbed.expects(:topic_id_for_embed).returns(123)
-        TopicView.expects(:new).with(123, nil, {limit: 100, exclude_first: true, exclude_deleted_users: true, exclude_hidden: true})
-        get :comments, embed_url: embed_url
-      end
-
-      it "provides the topic retriever with the discourse username when provided" do
-        TopicRetriever.expects(:new).with(embed_url, has_entry({author_username: discourse_username}))
-        get :comments, embed_url: embed_url, discourse_username: discourse_username
-      end
-
-    end
-  end
-
-  context "with multiple hosts" do
-    before do
-      Fabricate(:embeddable_host)
-      Fabricate(:embeddable_host, host: 'http://discourse.org')
-      Fabricate(:embeddable_host, host: 'https://example.com/1234', class_name: 'example')
-    end
-
-    context "success" do
-      it "works with the first host" do
-        controller.request.stubs(:referer).returns("http://eviltrout.com/wat/1-2-3.html")
-        get :comments, embed_url: embed_url
-        expect(response).to be_success
-      end
-
-      it "works with the second host" do
-        controller.request.stubs(:referer).returns("https://discourse.org/blog-entry-1")
-        get :comments, embed_url: embed_url
-        expect(response).to be_success
-      end
-
-      it "works with a host with a path" do
-        controller.request.stubs(:referer).returns("https://example.com/some-other-path")
-        get :comments, embed_url: embed_url
-        expect(response).to be_success
-      end
-
-      it "contains custom class name" do
-        controller.request.stubs(:referer).returns("https://example.com/some-other-path")
-        get :comments, embed_url: embed_url
-        expect(assigns(:embeddable_css_class)).to eq(' class="example"')
-      end
-
-      it "doesn't work with a made up host" do
-        controller.request.stubs(:referer).returns("http://codinghorror.com/invalid-url")
-        get :comments, embed_url: embed_url
-        expect(response).to render_template :embed_error
-      end
-    end
-  end
-end
diff --git a/spec/controllers/export_csv_controller_spec.rb b/spec/controllers/export_csv_controller_spec.rb
index 261ff03d9f..53d5be2ea1 100644
--- a/spec/controllers/export_csv_controller_spec.rb
+++ b/spec/controllers/export_csv_controller_spec.rb
@@ -6,7 +6,7 @@ describe ExportCsvController do
   context "while not logged in" do
     describe ".download" do
       it "returns 404 when the unauthorized user tries to export csv file" do
-        get :show, id: export_filename
+        get :show, params: { id: export_filename }
         expect(response.status).to eq(404)
       end
     end
@@ -18,19 +18,19 @@ describe ExportCsvController do
     describe ".export_entity" do
       it "enqueues export job" do
         Jobs.expects(:enqueue).with(:export_csv_file, has_entries(entity: "user_archive", user_id: @user.id))
-        xhr :post, :export_entity, entity: "user_archive"
+        post :export_entity, params: { entity: "user_archive" }, format: :json
         expect(response).to be_success
       end
 
       it "should not enqueue export job if rate limit is reached" do
         Jobs::ExportCsvFile.any_instance.expects(:execute).never
         UserExport.create(file_name: "user-archive-codinghorror-150116-003249", user_id: @user.id)
-        xhr :post, :export_entity, entity: "user_archive"
+        post :export_entity, params: { entity: "user_archive" }, format: :json
         expect(response).not_to be_success
       end
 
       it "returns 404 when normal user tries to export admin entity" do
-        xhr :post, :export_entity, entity: "staff_action"
+        post :export_entity, params: { entity: "staff_action" }, format: :json
         expect(response).not_to be_success
       end
     end
@@ -43,38 +43,37 @@ describe ExportCsvController do
         export = UserExport.new()
         UserExport.expects(:get_download_path).with(file_name).returns(export)
         subject.expects(:send_file).with(export)
-        get :show, id: file_name
+        get :show, params: { id: file_name }
         expect(response).to be_success
       end
 
       it "returns 404 when the user tries to export another user's csv file" do
-        get :show, id: export_filename
+        get :show, params: { id: export_filename }
         expect(response).to be_not_found
       end
 
       it "returns 404 when the export file does not exist" do
         UserExport.expects(:get_download_path).returns(nil)
-        get :show, id: export_filename
+        get :show, params: { id: export_filename }
         expect(response).to be_not_found
       end
     end
   end
 
-
   context "while logged in as an admin" do
     before { @admin = log_in(:admin) }
 
     describe ".export_entity" do
       it "enqueues export job" do
         Jobs.expects(:enqueue).with(:export_csv_file, has_entries(entity: "staff_action", user_id: @admin.id))
-        xhr :post, :export_entity, entity: "staff_action"
+        post :export_entity, params: { entity: "staff_action" }, format: :json
         expect(response).to be_success
       end
 
       it "should not rate limit export for staff" do
         Jobs.expects(:enqueue).with(:export_csv_file, has_entries(entity: "staff_action", user_id: @admin.id))
         UserExport.create(file_name: "screened-email-150116-010145", user_id: @admin.id)
-        xhr :post, :export_entity, entity: "staff_action"
+        post :export_entity, params: { entity: "staff_action" }, format: :json
         expect(response).to be_success
       end
     end
@@ -87,13 +86,13 @@ describe ExportCsvController do
         export = UserExport.new()
         UserExport.expects(:get_download_path).with(file_name).returns(export)
         subject.expects(:send_file).with(export)
-        get :show, id: file_name
+        get :show, params: { id: file_name }
         expect(response).to be_success
       end
 
       it "returns 404 when the export file does not exist" do
         UserExport.expects(:get_download_path).returns(nil)
-        get :show, id: export_filename
+        get :show, params: { id: export_filename }
         expect(response).to be_not_found
       end
     end
diff --git a/spec/controllers/extra_locales_controller_spec.rb b/spec/controllers/extra_locales_controller_spec.rb
index b848f95399..8ec2784ead 100644
--- a/spec/controllers/extra_locales_controller_spec.rb
+++ b/spec/controllers/extra_locales_controller_spec.rb
@@ -5,13 +5,13 @@ describe ExtraLocalesController do
   context 'show' do
 
     it "needs a valid bundle" do
-      get :show, bundle: 'made-up-bundle'
+      get :show, params: { bundle: 'made-up-bundle' }
       expect(response).to_not be_success
       expect(response.body).to be_blank
     end
 
     it "won't work with a weird parameter" do
-      get :show, bundle: '-invalid..character!!'
+      get :show, params: { bundle: '-invalid..character!!' }
       expect(response).to_not be_success
     end
 
@@ -20,20 +20,18 @@ describe ExtraLocalesController do
       I18n.reload!
 
       JsLocaleHelper.expects(:plugin_translations)
-                    .with(I18n.locale.to_s)
-                    .returns({
-                      "admin_js" => {
-                        "admin" => {
-                          "site_settings" => {
-                            "categories" => {
-                              "github_badges" => "Github Badges"
-                            }
-                          }
-                        }
-                      }
-                    }).at_least_once
+        .with(I18n.locale.to_s)
+        .returns("admin_js" => {
+          "admin" => {
+            "site_settings" => {
+              "categories" => {
+                "github_badges" => "Github Badges"
+              }
+            }
+          }
+        }).at_least_once
 
-      get :show, bundle: "admin"
+      get :show, params: { bundle: "admin" }
 
       expect(response).to be_success
       expect(response.body.include?("github_badges")).to eq(true)
diff --git a/spec/controllers/finish_installation_controller_spec.rb b/spec/controllers/finish_installation_controller_spec.rb
index 2e519aedbd..ea222c9bc2 100644
--- a/spec/controllers/finish_installation_controller_spec.rb
+++ b/spec/controllers/finish_installation_controller_spec.rb
@@ -50,19 +50,34 @@ describe FinishInstallationController do
       end
 
       it "raises an error when the email is not in the allowed list" do
-        expect {
-          post :register, email: 'notrobin@example.com', username: 'eviltrout', password: 'disismypasswordokay'
-        }.to raise_error(Discourse::InvalidParameters)
+        expect do
+          post :register, params: {
+            email: 'notrobin@example.com',
+            username: 'eviltrout',
+            password: 'disismypasswordokay'
+          }, format: :json
+        end.to raise_error(Discourse::InvalidParameters)
       end
 
       it "doesn't redirect when fields are wrong" do
-        post :register, email: 'robin@example.com', username: '', password: 'disismypasswordokay'
+        post :register, params: {
+          email: 'robin@example.com',
+          username: '',
+          password: 'disismypasswordokay'
+        }
+
         expect(response).not_to be_redirect
       end
 
       it "registers the admin when the email is in the list" do
         Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
-        post :register, email: 'robin@example.com', username: 'eviltrout', password: 'disismypasswordokay'
+
+        post :register, params: {
+          email: 'robin@example.com',
+          username: 'eviltrout',
+          password: 'disismypasswordokay'
+        }, format: :json
+
         expect(response).to be_redirect
         expect(User.where(username: 'eviltrout').exists?).to eq(true)
       end
@@ -87,7 +102,12 @@ describe FinishInstallationController do
     before do
       SiteSetting.has_login_hint = true
       GlobalSetting.stubs(:developer_emails).returns("robin@example.com")
-      post :register, email: 'robin@example.com', username: 'eviltrout', password: 'disismypasswordokay'
+
+      post :register, params: {
+        email: 'robin@example.com',
+        username: 'eviltrout',
+        password: 'disismypasswordokay'
+      }
     end
 
     it "resends the email" do
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
index aeaa1c61f3..05b082a935 100644
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
@@ -6,20 +6,20 @@ describe GroupsController do
   describe 'show' do
     it "ensures the group can be seen" do
       Guardian.any_instance.expects(:can_see?).with(group).returns(false)
-      xhr :get, :show, id: group.name
+      get :show, params: { id: group.name }, format: :json
       expect(response).not_to be_success
     end
 
     it "responds with JSON" do
       Guardian.any_instance.expects(:can_see?).with(group).returns(true)
-      xhr :get, :show, id: group.name
+      get :show, params: { id: group.name }, format: :json
       expect(response).to be_success
       expect(::JSON.parse(response.body)['basic_group']['id']).to eq(group.id)
     end
 
     it "works even with an upper case group name" do
       Guardian.any_instance.expects(:can_see?).with(group).returns(true)
-      xhr :get, :show, id: group.name.upcase
+      get :show, params: { id: group.name.upcase }, format: :json
       expect(response).to be_success
       expect(::JSON.parse(response.body)['basic_group']['id']).to eq(group.id)
     end
@@ -28,14 +28,14 @@ describe GroupsController do
   describe "posts" do
     it "ensures the group can be seen" do
       Guardian.any_instance.expects(:can_see?).with(group).returns(false)
-      xhr :get, :posts, group_id: group.name
+      get :posts, params: { group_id: group.name }, format: :json
       expect(response).not_to be_success
     end
 
     it "calls `posts_for` and responds with JSON" do
       Guardian.any_instance.expects(:can_see?).with(group).returns(true)
       Group.any_instance.expects(:posts_for).returns(Group.none)
-      xhr :get, :posts, group_id: group.name
+      get :posts, params: { group_id: group.name }, format: :json
       expect(response).to be_success
     end
   end
@@ -43,26 +43,26 @@ describe GroupsController do
   describe "members" do
     it "ensures the group can be seen" do
       Guardian.any_instance.expects(:can_see?).with(group).returns(false)
-      xhr :get, :members, group_id: group.name
+      get :members, params: { group_id: group.name }, format: :json
       expect(response).not_to be_success
     end
 
     it "calls `posts_for` and responds with JSON" do
       Guardian.any_instance.expects(:can_see?).with(group).returns(true)
-      xhr :get, :posts, group_id: group.name
+      get :posts, params: { group_id: group.name }, format: :json
       expect(response).to be_success
     end
 
     it "ensures that membership can be paginated" do
       5.times { group.add(Fabricate(:user)) }
-      usernames = group.users.map{ |m| m.username }.sort
+      usernames = group.users.map { |m| m.username }.sort
 
-      xhr :get, :members, group_id: group.name, limit: 3
+      get :members, params: { group_id: group.name, limit: 3 }, format: :json
       expect(response).to be_success
       members = JSON.parse(response.body)["members"]
       expect(members.map { |m| m['username'] }).to eq(usernames[0..2])
 
-      xhr :get, :members, group_id: group.name, limit: 3, offset: 3
+      get :members, params: { group_id: group.name, limit: 3, offset: 3 }, format: :json
       expect(response).to be_success
       members = JSON.parse(response.body)["members"]
       expect(members.map { |m| m['username'] }).to eq(usernames[3..4])
@@ -71,7 +71,7 @@ describe GroupsController do
 
   describe '.posts_feed' do
     it 'renders RSS' do
-      get :posts_feed, group_id: group.name, format: :rss
+      get :posts_feed, params: { group_id: group.name }, format: :rss
       expect(response).to be_success
       expect(response.content_type).to eq('application/rss+xml')
     end
@@ -79,10 +79,16 @@ describe GroupsController do
 
   describe '.mentions_feed' do
     it 'renders RSS' do
-      get :mentions_feed, group_id: group.name, format: :rss
+      get :mentions_feed, params: { group_id: group.name }, format: :rss
       expect(response).to be_success
       expect(response.content_type).to eq('application/rss+xml')
     end
+
+    it 'fails when disabled' do
+      SiteSetting.enable_mentions = false
+      get :mentions_feed, params: { group_id: group.name }, format: :rss
+      expect(response).not_to be_success
+    end
   end
 
 end
diff --git a/spec/controllers/inline_onebox_controller_spec.rb b/spec/controllers/inline_onebox_controller_spec.rb
new file mode 100644
index 0000000000..72ee3762e8
--- /dev/null
+++ b/spec/controllers/inline_onebox_controller_spec.rb
@@ -0,0 +1,38 @@
+require 'rails_helper'
+
+describe InlineOneboxController do
+
+  it "requires the user to be logged in" do
+    expect do
+      get :show, params: { urls: [] }, format: :json
+    end.to raise_error(Discourse::NotLoggedIn)
+  end
+
+  context "logged in" do
+    let!(:user) { log_in(:user) }
+
+    it "returns empty JSON for empty input" do
+      get :show, params: { urls: [] }, format: :json
+      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
+        get :show, params: { urls: [ topic.url ] }, format: :json
+        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 82a97d87ff..28266d4531 100644
--- a/spec/controllers/invites_controller_spec.rb
+++ b/spec/controllers/invites_controller_spec.rb
@@ -3,26 +3,40 @@ require 'rails_helper'
 describe InvitesController do
 
   context '.show' do
+    render_views
+
     it "shows error if invite not found" do
-      get :show, id: 'nopeNOPEnope'
-      expect(response).to render_template(layout: 'no_ember')
-      expect(flash[:error]).to be_present
+      get :show, params: { id: 'nopeNOPEnope' }
+
+      expect(response).to be_success
+
+      body = response.body
+
+      expect(body).to_not have_tag(:script, with: { src: '/assets/application.js' })
+      expect(CGI.unescapeHTML(body)).to include(I18n.t('invite.not_found'))
     end
 
     it "renders the accept invite page if invite exists" do
       i = Fabricate(:invite)
-      get :show, id: i.invite_key
-      expect(response).to render_template(layout: 'application')
-      expect(flash[:error]).to be_nil
+      get :show, params: { id: i.invite_key }
+
+      expect(response).to be_success
+
+      body = response.body
+
+      expect(body).to have_tag(:script, with: { src: '/assets/application.js' })
+      expect(CGI.unescapeHTML(body)).to_not include(I18n.t('invite.not_found'))
     end
   end
 
   context '.destroy' do
 
     it 'requires you to be logged in' do
-      expect {
-        delete :destroy, email: 'jake@adventuretime.ooo'
-      }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        delete :destroy,
+          params: { email: 'jake@adventuretime.ooo' },
+          format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     context 'while logged in' do
@@ -30,33 +44,36 @@ describe InvitesController do
       let!(:invite) { Fabricate(:invite, invited_by: user) }
       let(:another_invite) { Fabricate(:invite, email: 'anotheremail@address.com') }
 
-
       it 'raises an error when the email is missing' do
-        expect { delete :destroy }.to raise_error(ActionController::ParameterMissing)
+        expect { delete :destroy, format: :json }.to raise_error(ActionController::ParameterMissing)
       end
 
       it "raises an error when the email cannot be found" do
-        expect { delete :destroy, email: 'finn@adventuretime.ooo' }.to raise_error(Discourse::InvalidParameters)
+        expect do
+          delete :destroy, params: { email: 'finn@adventuretime.ooo' }, format: :json
+        end.to raise_error(Discourse::InvalidParameters)
       end
 
       it 'raises an error when the invite is not yours' do
-        expect { delete :destroy, email: another_invite.email }.to raise_error(Discourse::InvalidParameters)
+        expect do
+          delete :destroy, params: { email: another_invite.email }, format: :json
+        end.to raise_error(Discourse::InvalidParameters)
       end
 
       it "destroys the invite" do
         Invite.any_instance.expects(:trash!).with(user)
-        delete :destroy, email: invite.email
+        delete :destroy, params: { email: invite.email }, format: :json
       end
 
     end
 
   end
 
-  context '.create' do
+  context '#create' do
     it 'requires you to be logged in' do
-      expect {
-        post :create, email: 'jake@adventuretime.ooo'
-      }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        post :create, params: { email: 'jake@adventuretime.ooo' }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     context 'while logged in' do
@@ -64,7 +81,7 @@ describe InvitesController do
 
       it "fails if you can't invite to the forum" do
         log_in
-        post :create, email: email
+        post :create, params: { email: email }, format: :json
         expect(response).not_to be_success
       end
 
@@ -72,14 +89,28 @@ describe InvitesController do
         user = log_in(:trust_level_4)
         invite = Invite.invite_by_email("invite@example.com", user)
         invite.reload
-        post :create, email: invite.email
+        post :create, params: { email: invite.email }, format: :json
         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
         group = Fabricate(:group)
         log_in(:admin)
-        post :create, email: email, group_names: group.name
+        post :create, params: { email: email, group_names: group.name }, format: :json
+        expect(response).to be_success
+        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, params: { email: email, group_names: group.name }, format: :json
+
         expect(response).to be_success
         expect(Invite.find_by(email: email).invited_groups.count).to eq(1)
       end
@@ -88,9 +119,17 @@ describe InvitesController do
         user = log_in(:admin)
         invite = Invite.invite_by_email("invite@example.com", user)
         invite.reload
-        post :create, email: invite.email
+        post :create, params: { email: invite.email }, format: :json
         expect(response).to be_success
       end
+
+      it "responds with error message in case of validation failure" do
+        log_in(:admin)
+        post :create, params: { email: "test@mailinator.com" }, format: :json
+        expect(response).not_to be_success
+        json = JSON.parse(response.body)
+        expect(json["errors"]).to be_present
+      end
     end
 
   end
@@ -98,7 +137,9 @@ describe InvitesController do
   context '.create_invite_link' do
     it 'requires you to be logged in' do
       expect {
-        post :create_invite_link, email: 'jake@adventuretime.ooo'
+        post :create_invite_link, params: {
+          email: 'jake@adventuretime.ooo'
+        }, format: :json
       }.to raise_error(Discourse::NotLoggedIn)
     end
 
@@ -107,7 +148,7 @@ describe InvitesController do
 
       it "fails if you can't invite to the forum" do
         log_in
-        post :create_invite_link, email: email
+        post :create_invite_link, params: { email: email }, format: :json
         expect(response).not_to be_success
       end
 
@@ -115,23 +156,48 @@ describe InvitesController do
         user = log_in(:trust_level_4)
         invite = Invite.invite_by_email("invite@example.com", user)
         invite.reload
-        post :create_invite_link, email: invite.email
+
+        post :create_invite_link, params: {
+          email: invite.email
+        }, format: :json
+
+        expect(response).not_to be_success
+      end
+
+      it "verifies that inviter is authorized to invite new user to a group-private topic" do
+        group = Fabricate(:group)
+        private_category = Fabricate(:private_category, group: group)
+        group_private_topic = Fabricate(:topic, category: private_category)
+        log_in(:trust_level_4)
+
+        post :create_invite_link, params: {
+          email: email, topic_id: group_private_topic.id
+        }, format: :json
+
         expect(response).not_to be_success
       end
 
       it "allows admins to invite to groups" do
         group = Fabricate(:group)
         log_in(:admin)
-        post :create_invite_link, email: email, group_names: group.name
+
+        post :create_invite_link, params: {
+          email: email, group_names: group.name
+        }, format: :json
+
         expect(response).to be_success
         expect(Invite.find_by(email: email).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")
+        Fabricate(:group, name: "security")
+        Fabricate(:group, name: "support")
         log_in(:admin)
-        post :create_invite_link, email: email, group_names: "security,support"
+
+        post :create_invite_link, params: {
+          email: email, group_names: "security,support"
+        }, format: :json
+
         expect(response).to be_success
         expect(Invite.find_by(email: email).invited_groups.count).to eq(2)
       end
@@ -142,7 +208,7 @@ describe InvitesController do
 
     context 'with an invalid invite id' do
       before do
-        xhr :put, :perform_accept_invitation, id: "doesn't exist", format: :json
+        put :perform_accept_invitation, params: { id: "doesn't exist" }, format: :json
       end
 
       it "redirects to the root" do
@@ -162,7 +228,7 @@ describe InvitesController do
       let(:invite) { topic.invite_by_email(topic.user, "iceking@adventuretime.ooo") }
       let(:deleted_invite) { invite.destroy; invite }
       before do
-        xhr :put, :perform_accept_invitation, id: deleted_invite.invite_key, format: :json
+        put :perform_accept_invitation, params: { id: deleted_invite.invite_key }, format: :json
       end
 
       it "redirects to the root" do
@@ -183,21 +249,26 @@ describe InvitesController do
 
       it 'redeems the invite' do
         Invite.any_instance.expects(:redeem)
-        xhr :put, :perform_accept_invitation, id: invite.invite_key, format: :json
+        put :perform_accept_invitation, params: { id: invite.invite_key }, format: :json
       end
 
       context 'when redeem returns a user' do
         let(:user) { Fabricate(:coding_horror) }
 
         context 'success' do
-          subject { xhr :put, :perform_accept_invitation, id: invite.invite_key, format: :json }
+          subject { put :perform_accept_invitation, params: { id: invite.invite_key }, format: :json }
 
           before do
             Invite.any_instance.expects(:redeem).returns(user)
           end
 
           it 'logs in the user' do
-            subject
+            events = DiscourseEvent.track_events { subject }
+
+            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
 
@@ -210,7 +281,7 @@ describe InvitesController do
         end
 
         context 'failure' do
-          subject { xhr :put, :perform_accept_invitation, id: invite.invite_key, format: :json }
+          subject { put :perform_accept_invitation, params: { id: invite.invite_key }, format: :json }
 
           it "doesn't log in the user if there's a validation error" do
             user.errors.add(:password, :common)
@@ -234,32 +305,33 @@ describe InvitesController do
             user.send_welcome_message = true
             user.expects(:enqueue_welcome_message).with('welcome_invite')
             Jobs.expects(:enqueue).with(:invite_password_instructions_email, has_entries(username: user.username))
-            xhr :put, :perform_accept_invitation, id: invite.invite_key, format: :json
+            put :perform_accept_invitation, params: { id: invite.invite_key }, format: :json
           end
 
           it "sends password reset email if password is not set" do
             user.expects(:enqueue_welcome_message).with('welcome_invite').never
             Jobs.expects(:enqueue).with(:invite_password_instructions_email, has_entries(username: user.username))
-            xhr :put, :perform_accept_invitation, id: invite.invite_key, format: :json
+            put :perform_accept_invitation, params: { id: invite.invite_key }, format: :json
           end
 
           it "does not send password reset email if sso is enabled" do
+            SiteSetting.sso_url = "https://www.example.com/sso"
             SiteSetting.enable_sso = true
             Jobs.expects(:enqueue).with(:invite_password_instructions_email, has_key(:username)).never
-            xhr :put, :perform_accept_invitation, id: invite.invite_key, format: :json
+            put :perform_accept_invitation, params: { id: invite.invite_key }, format: :json
           end
 
           it "does not send password reset email if local login is disabled" do
             SiteSetting.enable_local_logins = false
             Jobs.expects(:enqueue).with(:invite_password_instructions_email, has_key(:username)).never
-            xhr :put, :perform_accept_invitation, id: invite.invite_key, format: :json
+            put :perform_accept_invitation, params: { id: invite.invite_key }, format: :json
           end
 
           it 'sends an activation email if password is set' do
             user.password_hash = 'qaw3ni3h2wyr63lakw7pea1nrtr44pls'
             Jobs.expects(:enqueue).with(:invite_password_instructions_email, has_key(:username)).never
             Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup, user_id: user.id))
-            xhr :put, :perform_accept_invitation, id: invite.invite_key, format: :json
+            put :perform_accept_invitation, params: { id: invite.invite_key }, format: :json
           end
         end
       end
@@ -268,11 +340,11 @@ 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
-        put :perform_accept_invitation, id: invite.invite_key
+        put :perform_accept_invitation, params: { id: invite.invite_key }, format: :json
       end
     end
 
@@ -283,7 +355,7 @@ describe InvitesController do
 
       it "doesn't redeem the invite" do
         Invite.any_instance.stubs(:redeem).never
-        put :perform_accept_invitation, id: invite.invite_key
+        put :perform_accept_invitation, params: { id: invite.invite_key }, format: :json
       end
     end
   end
@@ -292,7 +364,7 @@ describe InvitesController do
 
     it 'requires you to be logged in' do
       expect {
-        delete :resend_invite, email: 'first_name@example.com'
+        delete :resend_invite, params: { email: 'first_name@example.com' }, format: :json
       }.to raise_error(Discourse::NotLoggedIn)
     end
 
@@ -302,20 +374,24 @@ describe InvitesController do
       let(:another_invite) { Fabricate(:invite, email: 'last_name@example.com') }
 
       it 'raises an error when the email is missing' do
-        expect { post :resend_invite }.to raise_error(ActionController::ParameterMissing)
+        expect { post :resend_invite, format: :json }.to raise_error(ActionController::ParameterMissing)
       end
 
       it "raises an error when the email cannot be found" do
-        expect { post :resend_invite, email: 'first_name@example.com' }.to raise_error(Discourse::InvalidParameters)
+        expect do
+          post :resend_invite, params: { email: 'first_name@example.com' }, format: :json
+        end.to raise_error(Discourse::InvalidParameters)
       end
 
       it 'raises an error when the invite is not yours' do
-        expect { post :resend_invite, email: another_invite.email }.to raise_error(Discourse::InvalidParameters)
+        expect do
+          post :resend_invite, params: { email: another_invite.email }, format: :json
+        end.to raise_error(Discourse::InvalidParameters)
       end
 
       it "resends the invite" do
         Invite.any_instance.expects(:resend_invite)
-        post :resend_invite, email: invite.email
+        post :resend_invite, params: { email: invite.email }, format: :json
       end
 
     end
@@ -325,26 +401,28 @@ describe InvitesController do
   context '.upload_csv' do
     it 'requires you to be logged in' do
       expect {
-        xhr :post, :upload_csv
+        post :upload_csv, format: :json
       }.to raise_error(Discourse::NotLoggedIn)
     end
 
     context 'while logged in' do
       let(:csv_file) { File.new("#{Rails.root}/spec/fixtures/csv/discourse.csv") }
+
       let(:file) do
-        ActionDispatch::Http::UploadedFile.new({ filename: 'discourse.csv', tempfile: csv_file })
+        Rack::Test::UploadedFile.new(File.open(csv_file))
       end
+
       let(:filename) { 'discourse.csv' }
 
       it "fails if you can't bulk invite to the forum" do
         log_in
-        xhr :post, :upload_csv, file: file, name: filename
+        post :upload_csv, params: { file: file, name: filename }, format: :json
         expect(response).not_to be_success
       end
 
       it "allows admin to bulk invite" do
         log_in(:admin)
-        xhr :post, :upload_csv, file: file, name: filename
+        post :upload_csv, params: { file: file, name: filename }, format: :json
         expect(response).to be_success
       end
     end
diff --git a/spec/controllers/list_controller_spec.rb b/spec/controllers/list_controller_spec.rb
index 4240d78ca9..412833aa17 100644
--- a/spec/controllers/list_controller_spec.rb
+++ b/spec/controllers/list_controller_spec.rb
@@ -8,26 +8,14 @@ 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')
-  end
-
-  describe 'titles for crawler layout' do
-    it 'has no title for the default URL' do
-      xhr :get, Discourse.anonymous_filters[0], _escaped_fragment_: 'true'
-      expect(assigns(:title)).to be_blank
-    end
-
-    it 'has a title for non-default URLs' do
-      xhr :get, Discourse.anonymous_filters[1], _escaped_fragment_: 'true'
-      expect(assigns(:title)).to be_present
-    end
+    SiteSetting.top_menu = 'latest,-video|new|unread|categories|category/beer'
   end
 
   describe 'indexes' do
 
     (Discourse.anonymous_filters - [:categories]).each do |filter|
       context "#{filter}" do
-        before { xhr :get, filter }
+        before { get filter }
         it { is_expected.to respond_with(:success) }
       end
     end
@@ -35,17 +23,11 @@ describe ListController do
     it 'allows users to filter on a set of topic ids' do
       p = create_post
 
-      xhr :get, :latest, format: :json, topic_ids: "#{p.topic_id}"
+      get :latest, format: :json, params: { topic_ids: "#{p.topic_id}" }
       expect(response).to be_success
       parsed = JSON.parse(response.body)
       expect(parsed["topic_list"]["topics"].length).to eq(1)
     end
-
-
-    it "doesn't throw an error with a negative page" do
-      xhr :get, :top, page: -1024
-      expect(response).to be_success
-    end
   end
 
   describe 'RSS feeds' do
@@ -106,7 +88,7 @@ describe ListController do
       context 'without access to see the category' do
         before do
           Guardian.any_instance.expects(:can_see?).with(category).returns(false)
-          xhr :get, :category_latest, category: category.slug
+          get :category_latest, params: { category: category.slug }
         end
 
         it { is_expected.not_to respond_with(:success) }
@@ -114,7 +96,7 @@ describe ListController do
 
       context 'with access to see the category' do
         before do
-          xhr :get, :category_latest, category: category.slug
+          get :category_latest, params: { category: category.slug }
         end
 
         it { is_expected.to respond_with(:success) }
@@ -122,7 +104,9 @@ describe ListController do
 
       context 'with a link that includes an id' do
         before do
-          xhr :get, :category_latest, category: "#{category.id}-#{category.slug}"
+          get :category_latest, params: {
+            category: "#{category.id}-#{category.slug}"
+          }
         end
 
         it { is_expected.to respond_with(:success) }
@@ -133,7 +117,11 @@ describe ListController do
 
         context "with valid slug" do
           before do
-            xhr :get, :category_latest, parent_category: category.slug, category: child_category.slug, id: child_category.id
+            get :category_latest, params: {
+              parent_category: category.slug,
+              category: child_category.slug,
+              id: child_category.id
+            }
           end
 
           it { is_expected.to redirect_to(child_category.url) }
@@ -141,7 +129,11 @@ describe ListController do
 
         context "with invalid slug" do
           before do
-            xhr :get, :category_latest, parent_category: 'random slug', category: 'random slug', id: child_category.id
+            get :category_latest, params: {
+              parent_category: 'random slug',
+              category: 'random slug',
+              id: child_category.id
+            }
           end
 
           it { is_expected.to redirect_to(child_category.url) }
@@ -152,14 +144,17 @@ describe ListController do
         # One category has another category's id at the beginning of its name
         let!(:other_category) { Fabricate(:category, name: "#{category.id} name") }
 
-        before do
-          xhr :get, :category_latest, category: other_category.slug
-        end
-
-        it { is_expected.to respond_with(:success) }
-
         it 'uses the correct category' do
-          expect(assigns(:category)).to eq(other_category)
+          get :category_latest,
+            params: { category: other_category.slug },
+            format: :json
+
+          expect(response).to be_success
+
+          body = JSON.parse(response.body)
+
+          expect(body["topic_list"]["topics"].first["category_id"])
+            .to eq(other_category.id)
         end
       end
 
@@ -168,7 +163,9 @@ describe ListController do
 
         context 'when parent and child are requested' do
           before do
-            xhr :get, :category_latest, parent_category: category.slug, category: sub_category.slug
+            get :category_latest, params: {
+              parent_category: category.slug, category: sub_category.slug
+            }
           end
 
           it { is_expected.to respond_with(:success) }
@@ -176,7 +173,9 @@ describe ListController do
 
         context 'when child is requested with the wrong parent' do
           before do
-            xhr :get, :category_latest, parent_category: 'not_the_right_slug', category: sub_category.slug
+            get :category_latest, params: {
+              parent_category: 'not_the_right_slug', category: sub_category.slug
+            }
           end
 
           it { is_expected.not_to respond_with(:success) }
@@ -185,7 +184,7 @@ describe ListController do
 
       describe 'feed' do
         it 'renders RSS' do
-          get :category_feed, category: category.slug, format: :rss
+          get :category_feed, params: { category: category.slug }, format: :rss
           expect(response).to be_success
           expect(response.content_type).to eq('application/rss+xml')
         end
@@ -195,28 +194,28 @@ describe ListController do
         it "has a top default view" do
           category.update_attributes!(default_view: 'top', default_top_period: 'monthly')
           described_class.expects(:best_period_with_topics_for).with(anything, category.id, :monthly).returns(:monthly)
-          xhr :get, :category_default, category: category.slug
+          get :category_default, params: { category: category.slug }
           expect(response).to be_success
         end
 
         it "has a default view of nil" do
           category.update_attributes!(default_view: nil)
           described_class.expects(:best_period_for).never
-          xhr :get, :category_default, category: category.slug
+          get :category_default, params: { category: category.slug }
           expect(response).to be_success
         end
 
         it "has a default view of ''" do
           category.update_attributes!(default_view: '')
           described_class.expects(:best_period_for).never
-          xhr :get, :category_default, category: category.slug
+          get :category_default, params: { category: category.slug }
           expect(response).to be_success
         end
 
         it "has a default view of latest" do
           category.update_attributes!(default_view: 'latest')
           described_class.expects(:best_period_for).never
-          xhr :get, :category_default, category: category.slug
+          get :category_default, params: { category: category.slug }
           expect(response).to be_success
         end
       end
@@ -225,13 +224,13 @@ describe ListController do
         render_views
 
         it 'for category default view' do
-          get :category_default, category: category.slug
+          get :category_default, params: { 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
+          get :category_latest, params: { category: category.slug }
           expect(response).to be_success
           expect(css_select("link[rel=canonical]").length).to eq(1)
         end
@@ -243,7 +242,7 @@ describe ListController do
     let!(:user) { log_in }
 
     it "should respond with a list" do
-      xhr :get, :topics_by, username: @user.username
+      get :topics_by, params: { username: @user.username }
       expect(response).to be_success
     end
   end
@@ -253,13 +252,13 @@ describe ListController do
 
     it "raises an error when can_see_private_messages? is false " do
       Guardian.any_instance.expects(:can_see_private_messages?).returns(false)
-      xhr :get, :private_messages, username: @user.username
+      get :private_messages, params: { username: @user.username }
       expect(response).to be_forbidden
     end
 
     it "succeeds when can_see_private_messages? is false " do
       Guardian.any_instance.expects(:can_see_private_messages?).returns(true)
-      xhr :get, :private_messages, username: @user.username
+      get :private_messages, params: { username: @user.username }
       expect(response).to be_success
     end
   end
@@ -269,13 +268,13 @@ describe ListController do
 
     it "raises an error when can_see_private_messages? is false " do
       Guardian.any_instance.expects(:can_see_private_messages?).returns(false)
-      xhr :get, :private_messages_sent, username: @user.username
+      get :private_messages_sent, params: { username: @user.username }
       expect(response).to be_forbidden
     end
 
     it "succeeds when can_see_private_messages? is false " do
       Guardian.any_instance.expects(:can_see_private_messages?).returns(true)
-      xhr :get, :private_messages_sent, username: @user.username
+      get :private_messages_sent, params: { username: @user.username }
       expect(response).to be_success
     end
   end
@@ -285,26 +284,26 @@ describe ListController do
 
     it "raises an error when can_see_private_messages? is false " do
       Guardian.any_instance.expects(:can_see_private_messages?).returns(false)
-      xhr :get, :private_messages_unread, username: @user.username
+      get :private_messages_unread, params: { username: @user.username }
       expect(response).to be_forbidden
     end
 
     it "succeeds when can_see_private_messages? is false " do
       Guardian.any_instance.expects(:can_see_private_messages?).returns(true)
-      xhr :get, :private_messages_unread, username: @user.username
+      get :private_messages_unread, params: { username: @user.username }
       expect(response).to be_success
     end
   end
 
   context 'read' do
     it 'raises an error when not logged in' do
-      expect { xhr :get, :read }.to raise_error(Discourse::NotLoggedIn)
+      expect { get :read }.to raise_error(Discourse::NotLoggedIn)
     end
 
     context 'when logged in' do
       before do
         log_in_user(@user)
-        xhr :get, :read
+        get :read
       end
 
       it { is_expected.to respond_with(:success) }
@@ -379,7 +378,7 @@ describe ListController do
     end
 
     it "does not suppress" do
-      get SiteSetting.homepage, category: category_one.id, format: :json
+      get SiteSetting.homepage, params: { category: category_one.id }, format: :json
       expect(response).to be_success
 
       topic_titles = JSON.parse(response.body)["topic_list"]["topics"].map { |t| t["title"] }
@@ -396,11 +395,11 @@ describe ListController do
       expect(response.body).to match(/plugin\.js/)
       expect(response.body).to match(/plugin-third-party\.js/)
 
-      get :latest, safe_mode: "no_plugins"
+      get :latest, params: { safe_mode: "no_plugins" }
       expect(response.body).not_to match(/plugin\.js/)
       expect(response.body).not_to match(/plugin-third-party\.js/)
 
-      get :latest, safe_mode: "only_official"
+      get :latest, params: { safe_mode: "only_official" }
       expect(response.body).to match(/plugin\.js/)
       expect(response.body).not_to match(/plugin-third-party\.js/)
 
diff --git a/spec/controllers/metadata_controller_spec.rb b/spec/controllers/metadata_controller_spec.rb
index 681cbe0725..cf15a697de 100644
--- a/spec/controllers/metadata_controller_spec.rb
+++ b/spec/controllers/metadata_controller_spec.rb
@@ -3,11 +3,17 @@ require 'rails_helper'
 RSpec.describe MetadataController do
   describe 'manifest.json' do
     it 'returns the right output' do
+
       title = 'MyApp'
       SiteSetting.title = title
+      SiteSetting.large_icon_url = "http://big.square/png"
+
       get :manifest
-      expect(response.body).to include(title)
       expect(response.content_type).to eq('application/json')
+      manifest = JSON.parse(response.body)
+
+      expect(manifest["name"]).to eq(title)
+      expect(manifest["icons"].first["src"]).to eq("http://big.square/png")
     end
   end
 
diff --git a/spec/controllers/notifications_controller_spec.rb b/spec/controllers/notifications_controller_spec.rb
index f521898bf0..b5d4b1acbc 100644
--- a/spec/controllers/notifications_controller_spec.rb
+++ b/spec/controllers/notifications_controller_spec.rb
@@ -7,12 +7,12 @@ describe NotificationsController do
 
     describe '#index' do
       it 'should succeed for recent' do
-        xhr :get, :index, recent: true
+        get :index, params: { recent: true }
         expect(response).to be_success
       end
 
       it 'should succeed for history' do
-        xhr :get, :index
+        get :index
         expect(response).to be_success
       end
 
@@ -20,7 +20,7 @@ describe NotificationsController do
         notification = Fabricate(:notification, user: user)
         expect(user.reload.unread_notifications).to eq(1)
         expect(user.reload.total_unread_notifications).to eq(1)
-        xhr :get, :index, recent: true
+        get :index, params: { recent: true }, format: :json
         expect(user.reload.unread_notifications).to eq(0)
         expect(user.reload.total_unread_notifications).to eq(1)
       end
@@ -29,14 +29,14 @@ describe NotificationsController do
         notification = Fabricate(:notification, user: user)
         expect(user.reload.unread_notifications).to eq(1)
         expect(user.reload.total_unread_notifications).to eq(1)
-        xhr :get, :index, recent: true, silent: true
+        get :index, params: { recent: true, silent: true }
         expect(user.reload.unread_notifications).to eq(1)
         expect(user.reload.total_unread_notifications).to eq(1)
       end
 
       context 'when username params is not valid' do
         it 'should raise the right error' do
-          xhr :get, :index, username: 'somedude'
+          get :index, params: { username: 'somedude' }, format: :json
 
           expect(response).to_not be_success
           expect(response.status).to eq(404)
@@ -45,14 +45,14 @@ describe NotificationsController do
     end
 
     it 'should succeed' do
-      xhr :put, :mark_read
+      put :mark_read, format: :json
       expect(response).to be_success
     end
 
     it "can update a single notification" do
       notification = Fabricate(:notification, user: user)
       notification2 = Fabricate(:notification, user: user)
-      xhr :put, :mark_read, id: notification.id
+      put :mark_read, params: { id: notification.id }, format: :json
       expect(response).to be_success
 
       notification.reload
@@ -66,7 +66,7 @@ describe NotificationsController do
       notification = Fabricate(:notification, user: user)
       expect(user.reload.unread_notifications).to eq(1)
       expect(user.reload.total_unread_notifications).to eq(1)
-      xhr :put, :mark_read
+      put :mark_read, format: :json
       user.reload
       expect(user.reload.unread_notifications).to eq(0)
       expect(user.reload.total_unread_notifications).to eq(0)
@@ -75,7 +75,9 @@ describe NotificationsController do
 
   context 'when not logged in' do
     it 'should raise an error' do
-      expect { xhr :get, :index, recent: true }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        get :index, params: { recent: true }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
   end
 
diff --git a/spec/controllers/offline_controller_spec.rb b/spec/controllers/offline_controller_spec.rb
new file mode 100644
index 0000000000..b583747b7d
--- /dev/null
+++ b/spec/controllers/offline_controller_spec.rb
@@ -0,0 +1,8 @@
+require 'rails_helper'
+
+describe OfflineController do
+  it "can hit index" do
+    get :index
+    expect(response.status).to eq(200)
+  end
+end
diff --git a/spec/controllers/onebox_controller_spec.rb b/spec/controllers/onebox_controller_spec.rb
index adec21d4f8..8995a78710 100644
--- a/spec/controllers/onebox_controller_spec.rb
+++ b/spec/controllers/onebox_controller_spec.rb
@@ -5,7 +5,9 @@ describe OneboxController do
   let(:url) { "http://google.com" }
 
   it "requires the user to be logged in" do
-    expect { xhr :get, :show, url: url }.to raise_error(Discourse::NotLoggedIn)
+    expect do
+      get :show, params: { url: url }, format: :json
+    end.to raise_error(Discourse::NotLoggedIn)
   end
 
   describe "logged in" do
@@ -14,25 +16,42 @@ describe OneboxController do
 
     it 'invalidates the cache if refresh is passed' do
       Oneboxer.expects(:preview).with(url, invalidate_oneboxes: true)
-      xhr :get, :show, url: url, refresh: 'true', user_id: @user.id
+      get :show, params: { url: url, refresh: 'true', user_id: @user.id }, format: :json
     end
 
     describe "cached onebox" do
 
-      let(:body) { "This is a cached onebox body" }
-
-      before do
-        Oneboxer.expects(:cached_preview).with(url).returns(body)
-        Oneboxer.expects(:preview).never
-        xhr :get, :show, url: url, user_id: @user.id
-      end
-
-      it "returns success" do
-        expect(response).to be_success
-      end
-
       it "returns the cached onebox response in the body" do
-        expect(response.body).to eq(body)
+        onebox_html = <<~HTML
+          <html>
+          <head>
+            <meta property="og:title" content="Fred the title">
+            <meta property="og:description" content="this is bodycontent">
+          </head>
+          <body>
+             <p>body</p>
+          </body>
+          <html>
+        HTML
+
+        url = "http://noodle.com/"
+
+        stub_request(:head, url).
+          to_return(status: 200, body: "", headers: {}).then.to_raise
+
+        stub_request(:get, url)
+          .to_return(status: 200, headers: {}, body: onebox_html).then.to_raise
+
+        get :show, params: { url: url, user_id: @user.id, refresh: "true" }, format: :json
+
+        expect(response).to be_success
+        expect(response.body).to include('Fred')
+        expect(response.body).to include('bodycontent')
+
+        get :show, params: { url: url, user_id: @user.id }, format: :json
+        expect(response).to be_success
+        expect(response.body).to include('Fred')
+        expect(response.body).to include('bodycontent')
       end
 
     end
@@ -41,7 +60,7 @@ describe OneboxController do
 
       it "returns 429" do
         Oneboxer.expects(:is_previewing?).returns(true)
-        xhr :get, :show, url: url, user_id: @user.id
+        get :show, params: { url: url, user_id: @user.id }, format: :json
         expect(response.status).to eq(429)
       end
 
@@ -49,18 +68,15 @@ describe OneboxController do
 
     describe "found onebox" do
 
-      let(:body) { "this is the onebox body"}
+      let(:body) { "this is the onebox body" }
 
       before do
         Oneboxer.expects(:preview).with(url, invalidate_oneboxes: false).returns(body)
-        xhr :get, :show, url: url, user_id: @user.id
-      end
-
-      it 'returns success' do
-        expect(response).to be_success
+        get :show, params: { url: url, user_id: @user.id }, format: :json
       end
 
       it 'returns the onebox response in the body' do
+        expect(response).to be_success
         expect(response.body).to eq(body)
       end
 
@@ -70,13 +86,13 @@ describe OneboxController do
 
       it "returns 404 if the onebox is nil" do
         Oneboxer.expects(:preview).with(url, invalidate_oneboxes: false).returns(nil)
-        xhr :get, :show, url: url, user_id: @user.id
+        get :show, params: { url: url, user_id: @user.id }, format: :json
         expect(response.response_code).to eq(404)
       end
 
       it "returns 404 if the onebox is an empty string" do
         Oneboxer.expects(:preview).with(url, invalidate_oneboxes: false).returns(" \t ")
-        xhr :get, :show, url: url, user_id: @user.id
+        get :show, params: { url: url, user_id: @user.id }, format: :json
         expect(response.response_code).to eq(404)
       end
 
diff --git a/spec/controllers/permalinks_controller_spec.rb b/spec/controllers/permalinks_controller_spec.rb
index d88f7c7d67..595571f9bd 100644
--- a/spec/controllers/permalinks_controller_spec.rb
+++ b/spec/controllers/permalinks_controller_spec.rb
@@ -5,7 +5,7 @@ describe PermalinksController do
     it "should redirect to a permalink's target_url with status 301" do
       permalink = Fabricate(:permalink)
       Permalink.any_instance.stubs(:target_url).returns('/t/the-topic-slug/42')
-      get :show, url: permalink.url
+      get :show, params: { url: permalink.url }
       expect(response).to redirect_to('/t/the-topic-slug/42')
       expect(response.status).to eq(301)
     end
@@ -15,7 +15,7 @@ describe PermalinksController do
       Discourse.stubs(:base_uri).returns("/forum")
       permalink = Fabricate(:permalink)
       Permalink.any_instance.stubs(:target_url).returns('/forum/t/the-topic-slug/42')
-      get :show, url: permalink.url
+      get :show, params: { url: permalink.url }
       expect(response).to redirect_to('/forum/t/the-topic-slug/42')
       expect(response.status).to eq(301)
     end
@@ -25,20 +25,20 @@ describe PermalinksController do
 
       permalink = Fabricate(:permalink, url: '/topic/bla', external_url: '/topic/100')
 
-      get :show, url: permalink.url, test: "hello"
+      get :show, params: { url: permalink.url, test: "hello" }
 
       expect(response).to redirect_to('/topic/100')
       expect(response.status).to eq(301)
 
       SiteSetting.permalink_normalizations = "/(.*)\\?.*/\\1X"
 
-      get :show, url: permalink.url, test: "hello"
+      get :show, params: { url: permalink.url, test: "hello" }
 
       expect(response.status).to eq(404)
     end
 
     it 'return 404 if permalink record does not exist' do
-      get :show, url: '/not/a/valid/url'
+      get :show, params: { url: '/not/a/valid/url' }
       expect(response.status).to eq(404)
     end
   end
diff --git a/spec/controllers/post_action_users_controller_spec.rb b/spec/controllers/post_action_users_controller_spec.rb
index c915b5e5b5..fdd6add07c 100644
--- a/spec/controllers/post_action_users_controller_spec.rb
+++ b/spec/controllers/post_action_users_controller_spec.rb
@@ -1,34 +1,84 @@
 require 'rails_helper'
 
 describe PostActionUsersController do
-  let!(:post) { Fabricate(:post, user: log_in) }
+  let(:post) { Fabricate(:post, user: log_in) }
+
+  context 'with render' do
+    render_views
+    it 'always allows you to see your own actions' do
+      notify_mod = PostActionType.types[:notify_moderators]
+
+      PostAction.act(post.user, post, notify_mod, message: 'well something is wrong here!')
+      PostAction.act(Fabricate(:user), post, notify_mod, message: 'well something is not wrong here!')
+
+      get :index, params: { id: post.id, post_action_type_id: notify_mod }, format: :json
+      expect(response.status).to eq(200)
+      json = JSON.parse(response.body)
+      users = json["post_action_users"]
+
+      expect(users.length).to eq(1)
+      expect(users[0]["id"]).to eq(post.user.id)
+    end
+  end
 
   it 'raises an error without an id' do
-    expect {
-      xhr :get, :index, post_action_type_id: PostActionType.types[:like]
-    }.to raise_error(ActionController::ParameterMissing)
+    expect do
+      get :index,
+      params: { post_action_type_id: PostActionType.types[:like] },
+      format: :json
+    end.to raise_error(ActionController::ParameterMissing)
   end
 
   it 'raises an error without a post action type' do
-    expect {
-      xhr :get, :index, id: post.id
-    }.to raise_error(ActionController::ParameterMissing)
+    expect do
+      get :index, params: { id: post.id }, format: :json
+    end.to raise_error(ActionController::ParameterMissing)
   end
 
   it "fails when the user doesn't have permission to see the post" do
     Guardian.any_instance.expects(:can_see?).with(post).returns(false)
-    xhr :get, :index, id: post.id, post_action_type_id: PostActionType.types[:like]
+
+    get :index, params: {
+      id: post.id, post_action_type_id: PostActionType.types[:like]
+    }, format: :json
+
     expect(response).to be_forbidden
   end
 
-  it 'raises an error when the post action type cannot be seen' do
-    Guardian.any_instance.expects(:can_see_post_actors?).with(instance_of(Topic), PostActionType.types[:like]).returns(false)
-    xhr :get, :index, id: post.id, post_action_type_id: PostActionType.types[:like]
+  it 'raises an error when anon tries to look at an invalid action' do
+    get :index, params: {
+      id: Fabricate(:post).id,
+      post_action_type_id: PostActionType.types[:notify_moderators]
+    }, format: :json
+
     expect(response).to be_forbidden
   end
 
   it 'succeeds' do
-    xhr :get, :index, id: post.id, post_action_type_id: PostActionType.types[:like]
+    get :index, params: {
+      id: post.id, post_action_type_id: PostActionType.types[:like]
+    }
+
     expect(response).to be_success
   end
+
+  it "paginates post actions" do
+    user_ids = []
+    5.times do
+      user = Fabricate(:user)
+      user_ids << user["id"]
+      PostAction.act(user, post, PostActionType.types[:like])
+    end
+
+    get :index, params: { id: post.id, post_action_type_id: PostActionType.types[:like], page: 1, limit: 2 }, format: :json
+    json = JSON.parse(response.body)
+
+    users = json["post_action_users"]
+    total = json["total_rows_post_action_users"]
+
+    expect(users.length).to eq(2)
+    expect(users.map { |u| u["id"] }).to eq(user_ids[2..3])
+
+    expect(total).to eq(5)
+  end
 end
diff --git a/spec/controllers/post_actions_controller_spec.rb b/spec/controllers/post_actions_controller_spec.rb
index 141e99ca9f..5a68642ace 100644
--- a/spec/controllers/post_actions_controller_spec.rb
+++ b/spec/controllers/post_actions_controller_spec.rb
@@ -4,7 +4,9 @@ describe PostActionsController do
 
   describe 'create' do
     it 'requires you to be logged in' do
-      expect { xhr :post, :create }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        post :create, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     context 'logged in as user' do
@@ -16,76 +18,14 @@ describe PostActionsController do
       end
 
       it 'fails when the user does not have permission to see the post' do
-        xhr :post, :create, id: private_message.id, post_action_type_id: PostActionType.types[:bookmark]
+        post :create, params: {
+          id: private_message.id,
+          post_action_type_id: PostActionType.types[:bookmark]
+        }, format: :json
+
         expect(response).to be_forbidden
       end
     end
-
-    describe 'logged in as moderator' do
-      before do
-        @user = log_in(:moderator)
-        @post = Fabricate(:post, user: Fabricate(:coding_horror))
-      end
-
-      it 'raises an error when the id is missing' do
-        expect { xhr :post, :create, post_action_type_id: PostActionType.types[:like] }.to raise_error(ActionController::ParameterMissing)
-      end
-
-      it 'fails when the id is invalid' do
-        xhr :post, :create, post_action_type_id: PostActionType.types[:like], id: -1
-        expect(response.status).to eq(404)
-      end
-
-      it 'raises an error when the post_action_type_id index is missing' do
-        expect { xhr :post, :create, id: @post.id }.to raise_error(ActionController::ParameterMissing)
-      end
-
-      it "fails when the user doesn't have permission to see the post" do
-        @post = Fabricate(:private_message_post, user: Fabricate(:user))
-        xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like]
-        expect(response).to be_forbidden
-      end
-
-      it 'allows us to create an post action on a post' do
-        PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], {})
-        xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like]
-      end
-
-      it "passes a list of taken actions through" do
-        PostAction.create(post_id: @post.id, user_id: @user.id, post_action_type_id: PostActionType.types[:inappropriate])
-        Guardian.any_instance.expects(:post_can_act?).with(@post, :off_topic, has_entry({:taken_actions => has_key(PostActionType.types[:inappropriate])}))
-        xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:off_topic]
-      end
-
-      it 'passes the message through' do
-        PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], {message: 'action message goes here'})
-        xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like], message: 'action message goes here'
-      end
-
-      it 'passes the message through as warning' do
-        PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], {message: 'action message goes here', is_warning: true})
-        xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like], message: 'action message goes here', is_warning: true
-      end
-
-      it "doesn't create message as a warning if the user isn't staff" do
-        Guardian.any_instance.stubs(:is_staff?).returns(false)
-        PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], {message: 'action message goes here'})
-        xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like], message: 'action message goes here', is_warning: true
-      end
-
-      it 'passes take_action through' do
-        PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], {take_action: true})
-        xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like], take_action: 'true'
-      end
-
-      it "doesn't pass take_action through if the user isn't staff" do
-        Guardian.any_instance.stubs(:is_staff?).returns(false)
-        PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], {})
-        xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like], take_action: 'true'
-      end
-
-    end
-
   end
 
   context 'destroy' do
@@ -93,37 +33,48 @@ describe PostActionsController do
     let(:post) { Fabricate(:post, user: Fabricate(:coding_horror)) }
 
     it 'requires you to be logged in' do
-      expect { xhr :delete, :destroy, id: post.id }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        delete :destroy, params: { id: post.id }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     context 'logged in' do
       let!(:user) { log_in }
 
       it 'raises an error when the post_action_type_id is missing' do
-        expect { xhr :delete, :destroy, id: post.id }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          delete :destroy, params: { id: post.id }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       it "returns 404 when the post action type doesn't exist for that user" do
-        xhr :delete, :destroy, id: post.id, post_action_type_id: 1
+        delete :destroy, params: { id: post.id, post_action_type_id: 1 }, format: :json
         expect(response.code).to eq('404')
       end
 
       context 'with a post_action record ' do
-        let!(:post_action) { PostAction.create(user_id: user.id, post_id: post.id, post_action_type_id: 1)}
+        let!(:post_action) { PostAction.create(user_id: user.id, post_id: post.id, post_action_type_id: 1) }
 
         it 'returns success' do
-          xhr :delete, :destroy, id: post.id, post_action_type_id: 1
+          delete :destroy, params: { id: post.id, post_action_type_id: 1 }, format: :json
           expect(response).to be_success
         end
 
         it 'deletes the action' do
-          xhr :delete, :destroy, id: post.id, post_action_type_id: 1
+          delete :destroy, params: {
+            id: post.id, post_action_type_id: 1
+          }, format: :json
+
           expect(PostAction.exists?(user_id: user.id, post_id: post.id, post_action_type_id: 1, deleted_at: nil)).to eq(false)
         end
 
         it 'ensures it can be deleted' do
           Guardian.any_instance.expects(:can_delete?).with(post_action).returns(false)
-          xhr :delete, :destroy, id: post.id, post_action_type_id: 1
+
+          delete :destroy, params: {
+            id: post.id, post_action_type_id: 1
+          }, format: :json
+
           expect(response).to be_forbidden
         end
       end
@@ -138,7 +89,9 @@ describe PostActionsController do
 
     context "not logged in" do
       it "should not allow them to clear flags" do
-        expect { xhr :post, :defer_flags }.to raise_error(Discourse::NotLoggedIn)
+        expect do
+          post :defer_flags, format: :json
+        end.to raise_error(Discourse::NotLoggedIn)
       end
     end
 
@@ -146,12 +99,18 @@ describe PostActionsController do
       let!(:user) { log_in(:moderator) }
 
       it "raises an error without a post_action_type_id" do
-        expect { xhr :post, :defer_flags, id: flagged_post.id }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          post :defer_flags, params: { id: flagged_post.id }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       it "raises an error when the user doesn't have access" do
         Guardian.any_instance.expects(:can_defer_flags?).returns(false)
-        xhr :post, :defer_flags, id: flagged_post.id, post_action_type_id: PostActionType.types[:spam]
+
+        post :defer_flags, params: {
+          id: flagged_post.id, post_action_type_id: PostActionType.types[:spam]
+        }, format: :json
+
         expect(response).to be_forbidden
       end
 
@@ -162,13 +121,20 @@ describe PostActionsController do
         end
 
         it "delegates to defer_flags" do
-          xhr :post, :defer_flags, id: flagged_post.id, post_action_type_id: PostActionType.types[:spam]
+          post :defer_flags, params: {
+            id: flagged_post.id, post_action_type_id: PostActionType.types[:spam]
+          }, format: :json
+
           expect(response).to be_success
         end
 
         it "works with a deleted post" do
           flagged_post.trash!(user)
-          xhr :post, :defer_flags, id: flagged_post.id, post_action_type_id: PostActionType.types[:spam]
+
+          post :defer_flags, params: {
+            id: flagged_post.id, post_action_type_id: PostActionType.types[:spam]
+          }, format: :json
+
           expect(response).to be_success
         end
 
diff --git a/spec/controllers/posts_controller_spec.rb b/spec/controllers/posts_controller_spec.rb
index 6efb7380a3..1981d15bf6 100644
--- a/spec/controllers/posts_controller_spec.rb
+++ b/spec/controllers/posts_controller_spec.rb
@@ -6,12 +6,12 @@ shared_examples 'finding and showing post' do
 
   it 'ensures the user can see the post' do
     Guardian.any_instance.expects(:can_see?).with(post).returns(false)
-    xhr :get, action, params
+    get action, params: params, format: :json
     expect(response).to be_forbidden
   end
 
   it 'succeeds' do
-    xhr :get, action, params
+    get action, params: params, format: :json
     expect(response).to be_success
   end
 
@@ -21,25 +21,25 @@ shared_examples 'finding and showing post' do
     end
 
     it "can't find deleted posts as an anonymous user" do
-      xhr :get, action, params
+      get action, params: params, format: :json
       expect(response.status).to eq(404)
     end
 
     it "can't find deleted posts as a regular user" do
       log_in(:user)
-      xhr :get, action, params
+      get action, params: params, format: :json
       expect(response.status).to eq(404)
     end
 
     it "can find posts as a moderator" do
       log_in(:moderator)
-      xhr :get, action, params
+      get action, params: params, format: :json
       expect(response).to be_success
     end
 
     it "can find posts as a admin" do
       log_in(:admin)
-      xhr :get, action, params
+      get action, params: params, format: :json
       expect(response).to be_success
     end
   end
@@ -47,7 +47,11 @@ end
 
 shared_examples 'action requires login' do |method, action, params|
   it 'raises an exception when not logged in' do
-    expect { xhr method, action, params }.to raise_error(Discourse::NotLoggedIn)
+    expect do
+      options = { format: :json }
+      options.merge!(params: params) if params
+      self.public_send(method, action, options)
+    end.to raise_error(Discourse::NotLoggedIn)
   end
 end
 
@@ -67,7 +71,7 @@ describe PostsController do
       end
 
       it 'returns public posts with topic for json' do
-        xhr :get, :latest, id: "latest_posts", format: :json
+        get :latest, params: { id: "latest_posts" }, format: :json
         expect(response).to be_success
         json = ::JSON.parse(response.body)
         post_ids = json['latest_posts'].map { |p| p['id'] }
@@ -75,14 +79,6 @@ describe PostsController do
         expect(post_ids).to_not include private_post.id
         expect(post_ids).to_not include topicless_post.id
       end
-
-      it 'returns public posts with topic for rss' do
-        xhr :get, :latest, id: "latest_posts", format: :rss
-        expect(response).to be_success
-        expect(assigns(:posts)).to include post
-        expect(assigns(:posts)).to_not include private_post
-        expect(assigns(:posts)).to_not include topicless_post
-      end
     end
 
     context 'private posts' do
@@ -91,38 +87,13 @@ describe PostsController do
       end
 
       it 'returns private posts for json' do
-        xhr :get, :latest, id: "private_posts", format: :json
+        get :latest, params: { id: "private_posts" }, format: :json
         expect(response).to be_success
         json = ::JSON.parse(response.body)
         post_ids = json['private_posts'].map { |p| p['id'] }
         expect(post_ids).to include private_post.id
         expect(post_ids).to_not include post.id
       end
-
-      it 'returns private posts for rss' do
-        xhr :get, :latest, id: "private_posts", format: :rss
-        expect(response).to be_success
-        expect(assigns(:posts)).to include private_post
-        expect(assigns(:posts)).to_not include post
-      end
-    end
-  end
-
-  describe 'user_posts_feed' do
-    let(:user) { log_in }
-    let!(:public_topic) { Fabricate(:topic) }
-    let!(:post) { Fabricate(:post, user: user, topic: public_topic) }
-    let!(:private_topic) { Fabricate(:topic, archetype: Archetype.private_message, category: nil) }
-    let!(:private_post) { Fabricate(:post, user: user, topic: private_topic) }
-    let!(:topicless_post) { Fabricate(:post, user: user, raw: '<p>Car 54, where are you?</p>') }
-
-    it 'returns public posts with topic for rss' do
-      topicless_post.update topic_id: -100
-      xhr :get, :user_posts_feed, username: user.username, format: :rss
-      expect(response).to be_success
-      expect(assigns(:posts)).to include post
-      expect(assigns(:posts)).to_not include private_post
-      expect(assigns(:posts)).to_not include topicless_post
     end
   end
 
@@ -133,7 +104,7 @@ describe PostsController do
     end
 
     it 'returns the cooked conent' do
-      xhr :get, :cooked, id: 1234
+      get :cooked, params: { id: 1234 }, format: :json
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json).to be_present
@@ -151,7 +122,7 @@ describe PostsController do
       it "raises an error if the user doesn't have permission to view raw email" do
         Guardian.any_instance.expects(:can_view_raw_email?).returns(false)
 
-        xhr :get, :raw_email, id: post.id
+        get :raw_email, params: { id: post.id }, format: :json
 
         expect(response).to be_forbidden
       end
@@ -159,7 +130,7 @@ describe PostsController do
       it "can view raw email" do
         Guardian.any_instance.expects(:can_view_raw_email?).returns(true)
 
-        xhr :get, :raw_email, id: post.id
+        get :raw_email, params: { id: post.id }, format: :json
 
         expect(response).to be_success
         json = ::JSON.parse(response.body)
@@ -173,13 +144,13 @@ describe PostsController do
   describe 'show' do
     include_examples 'finding and showing post' do
       let(:action) { :show }
-      let(:params) { {id: post.id} }
+      let(:params) { { id: post.id } }
     end
 
     it 'gets all the expected fields' do
       # non fabricated test
       new_post = create_post
-      xhr :get, :show, {id: new_post.id}
+      get :show, params: { id: new_post.id }, format: :json
       parsed = JSON.parse(response.body)
       expect(parsed["topic_slug"]).to eq(new_post.topic.slug)
       expect(parsed["moderator"]).to eq(false)
@@ -191,31 +162,31 @@ describe PostsController do
   describe 'by_number' do
     include_examples 'finding and showing post' do
       let(:action) { :by_number }
-      let(:params) { {topic_id: post.topic_id, post_number: post.post_number} }
+      let(:params) { { topic_id: post.topic_id, post_number: post.post_number } }
     end
   end
 
   describe 'reply_history' do
     include_examples 'finding and showing post' do
       let(:action) { :reply_history }
-      let(:params) { {id: post.id} }
+      let(:params) { { id: post.id } }
     end
 
     it 'asks post for reply history' do
       Post.any_instance.expects(:reply_history)
-      xhr :get, :reply_history, id: post.id
+      get :reply_history, params: { id: post.id }, format: :json
     end
   end
 
   describe 'replies' do
     include_examples 'finding and showing post' do
       let(:action) { :replies }
-      let(:params) { {post_id: post.id} }
+      let(:params) { { post_id: post.id } }
     end
 
     it 'asks post for replies' do
       p1 = Fabricate(:post)
-      xhr :get, :replies, post_id: p1.id
+      get :replies, params: { post_id: p1.id }, format: :json
       expect(response.status).to eq(200)
     end
   end
@@ -232,7 +203,7 @@ describe PostsController do
         Guardian.any_instance.stubs(:can_delete_post?).with(post).returns(false)
         Post.any_instance.stubs(:edit_time_limit_expired?).returns(true)
 
-        xhr :delete, :destroy, id: post.id
+        delete :destroy, params: { id: post.id }, format: :json
 
         expect(response.status).to eq(422)
         expect(JSON.parse(response.body)['errors']).to include(I18n.t('too_late_to_edit'))
@@ -240,7 +211,7 @@ describe PostsController do
 
       it "raises an error when the user doesn't have permission to see the post" do
         Guardian.any_instance.expects(:can_delete?).with(post).returns(false)
-        xhr :delete, :destroy, id: post.id
+        delete :destroy, params: { id: post.id }, format: :json
         expect(response).to be_forbidden
       end
 
@@ -248,7 +219,7 @@ describe PostsController do
         destroyer = mock
         PostDestroyer.expects(:new).returns(destroyer)
         destroyer.expects(:destroy)
-        xhr :delete, :destroy, id: post.id
+        delete :destroy, params: { id: post.id }, format: :json
       end
 
     end
@@ -264,7 +235,7 @@ describe PostsController do
 
       it "raises an error when the user doesn't have permission to see the post" do
         Guardian.any_instance.expects(:can_recover_post?).with(post).returns(false)
-        xhr :put, :recover, post_id: post.id
+        put :recover, params: { post_id: post.id }, format: :json
         expect(response).to be_forbidden
       end
 
@@ -273,7 +244,7 @@ describe PostsController do
         post = create_post(topic_id: topic_id)
 
         PostDestroyer.new(user, post).destroy
-        xhr :put, :recover, post_id: post.id
+        put :recover, params: { post_id: post.id }, format: :json
         post.reload
         expect(post.deleted_at).to eq(nil)
       end
@@ -291,27 +262,31 @@ describe PostsController do
       let!(:post2) { Fabricate(:post, topic_id: post1.topic_id, user: poster, post_number: 3, reply_to_post_number: post1.post_number) }
 
       it "raises invalid parameters no post_ids" do
-        expect { xhr :delete, :destroy_many }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          delete :destroy_many, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       it "raises invalid parameters with missing ids" do
-        expect { xhr :delete, :destroy_many, post_ids: [12345] }.to raise_error(Discourse::InvalidParameters)
+        expect do
+          delete :destroy_many, params: { post_ids: [12345] }, format: :json
+        end.to raise_error(Discourse::InvalidParameters)
       end
 
       it "raises an error when the user doesn't have permission to delete the posts" do
         Guardian.any_instance.expects(:can_delete?).with(instance_of(Post)).returns(false)
-        xhr :delete, :destroy_many, post_ids: [post1.id, post2.id]
+        delete :destroy_many, params: { post_ids: [post1.id, post2.id] }, format: :json
         expect(response).to be_forbidden
       end
 
       it "deletes the post" do
         PostDestroyer.any_instance.expects(:destroy).twice
-        xhr :delete, :destroy_many, post_ids: [post1.id, post2.id]
+        delete :destroy_many, params: { post_ids: [post1.id, post2.id] }, format: :json
       end
 
       it "updates the highest read data for the forum" do
         Topic.expects(:reset_highest).twice
-        xhr :delete, :destroy_many, post_ids: [post1.id, post2.id]
+        delete :destroy_many, params: { post_ids: [post1.id, post2.id] }, format: :json
       end
 
       describe "can delete replies" do
@@ -322,7 +297,9 @@ describe PostsController do
 
         it "deletes the post and the reply to it" do
           PostDestroyer.any_instance.expects(:destroy).twice
-          xhr :delete, :destroy_many, post_ids: [post1.id], reply_post_ids: [post1.id]
+          delete :destroy_many,
+            params: { post_ids: [post1.id], reply_post_ids: [post1.id] },
+            format: :json
         end
 
       end
@@ -340,7 +317,7 @@ describe PostsController do
       {
         id: post.id,
         post: { raw: 'edited body', edit_reason: 'typo' },
-        image_sizes: { 'http://image.com/image.jpg' => {'width' => 123, 'height' => 456} },
+        image_sizes: { 'http://image.com/image.jpg' => { 'width' => 123, 'height' => 456 } },
       }
     end
     let(:moderator) { Fabricate(:moderator) }
@@ -352,7 +329,7 @@ describe PostsController do
         Guardian.any_instance.stubs(:can_edit?).with(post).returns(false)
         Post.any_instance.stubs(:edit_time_limit_expired?).returns(true)
 
-        xhr :put, :update, update_params
+        put :update, params: update_params, format: :json
 
         expect(response.status).to eq(422)
         expect(JSON.parse(response.body)['errors']).to include(I18n.t('too_late_to_edit'))
@@ -360,37 +337,38 @@ describe PostsController do
 
       it 'passes the image sizes through' do
         Post.any_instance.expects(:image_sizes=)
-        xhr :put, :update, update_params
+        put :update, params: update_params, format: :json
       end
 
       it 'passes the edit reason through' do
         Post.any_instance.expects(:edit_reason=)
-        xhr :put, :update, update_params
+        put :update, params: update_params, format: :json
       end
 
       it "raises an error when the post parameter is missing" do
         update_params.delete(:post)
         expect {
-          xhr :put, :update, update_params
+          put :update, params: update_params, format: :json
         }.to raise_error(ActionController::ParameterMissing)
       end
 
       it "raises an error when the user doesn't have permission to see the post" do
         Guardian.any_instance.expects(:can_edit?).with(post).at_least_once.returns(false)
-        xhr :put, :update, update_params
+        put :update, params: update_params, format: :json
         expect(response).to be_forbidden
       end
 
       it "calls revise with valid parameters" do
         PostRevisor.any_instance.expects(:revise!).with(post.user, { raw: 'edited body' , edit_reason: 'typo' }, anything)
-        xhr :put, :update, update_params
+        put :update, params: update_params, format: :json
       end
 
       it "extracts links from the new body" do
         param = update_params
-        param[:post][:raw] =  'I just visited this https://google.com so many cool links'
+        param[:post][:raw] = 'I just visited this https://google.com so many cool links'
+
+        put :update, params: param, format: :json
 
-        xhr :put, :update, param
         expect(response).to be_success
         expect(TopicLink.count).to eq(1)
       end
@@ -399,7 +377,7 @@ describe PostsController do
         first_post = post.topic.ordered_posts.first
         PostDestroyer.new(moderator, first_post).destroy
 
-        xhr :put, :update, update_params
+        put :update, params: update_params, format: :json
         expect(response).not_to be_success
       end
     end
@@ -411,7 +389,7 @@ describe PostsController do
         first_post = post.topic.ordered_posts.first
         PostDestroyer.new(moderator, first_post).destroy
 
-        xhr :put, :update, update_params
+        put :update, params: update_params, format: :json
         expect(response).to be_success
 
         post.reload
@@ -432,14 +410,20 @@ describe PostsController do
 
       it "raises an error if the user doesn't have permission to see the post" do
         post
-        xhr :put, :bookmark, post_id: private_message.id, bookmarked: 'true'
+
+        put :bookmark,
+          params: { post_id: private_message.id, bookmarked: 'true' },
+          format: :json
+
         expect(response).to be_forbidden
       end
 
       it 'creates a bookmark' do
-        xhr :put, :bookmark, post_id: post.id, bookmarked: 'true'
+        put :bookmark,
+          params: { post_id: post.id, bookmarked: 'true' },
+          format: :json
 
-        post_action = PostAction.find_by(user:user, post: post)
+        post_action = PostAction.find_by(user: user, post: post)
 
         expect(post_action.post_action_type_id).to eq(PostActionType.types[:bookmark])
       end
@@ -449,14 +433,16 @@ describe PostsController do
         let(:admin) { Fabricate(:admin) }
 
         it "returns the right response when post is not bookmarked" do
-          xhr :put, :bookmark, post_id: Fabricate(:post, user: user).id
+          put :bookmark,
+            params: { post_id: Fabricate(:post, user: user).id },
+            format: :json
 
           expect(response.status).to eq(404)
         end
 
         it 'should be able to remove a bookmark' do
           post_action
-          xhr :put, :bookmark, post_id: post.id
+          put :bookmark, params: { post_id: post.id }, format: :json
 
           expect(PostAction.find_by(id: post_action.id)).to eq(nil)
         end
@@ -471,7 +457,7 @@ describe PostsController do
 
             expect(Guardian.new(user).can_see_post?(post.reload)).to eq(false)
 
-            xhr :put, :bookmark, post_id: post.id
+            put :bookmark, params: { post_id: post.id }, format: :json
 
             expect(PostAction.find_by(id: post_action.id)).to eq(nil)
           end
@@ -482,7 +468,7 @@ describe PostsController do
             post = post_action.post
             post.trash!
 
-            xhr :put, :bookmark, post_id: post.id
+            put :bookmark, params: { post_id: post.id }, format: :json
 
             expect(PostAction.find_by(id: post_action.id)).to eq(nil)
           end
@@ -498,38 +484,49 @@ describe PostsController do
     include_examples "action requires login", :put, :wiki, post_id: 2
 
     describe "when logged in" do
-      let(:user) {log_in}
-      let(:post) {Fabricate(:post, user: user)}
+      let(:user) { log_in }
+      let(:post) { Fabricate(:post, user: user) }
 
       it "raises an error if the user doesn't have permission to wiki the post" do
         Guardian.any_instance.expects(:can_wiki?).with(post).returns(false)
 
-        xhr :put, :wiki, post_id: post.id, wiki: 'true'
+        put :wiki,
+          params: { post_id: post.id, wiki: 'true' },
+          format: :json
 
         expect(response).to be_forbidden
       end
 
       it "toggle wiki status should create a new version" do
-        admin = log_in(:admin)
+        _admin = log_in(:admin)
         another_user = Fabricate(:user)
         another_post = Fabricate(:post, user: another_user)
 
-        expect { xhr :put, :wiki, post_id: another_post.id, wiki: 'true' }
-          .to change { another_post.reload.version }.by(1)
+        expect do
+          put :wiki,
+            params: { post_id: another_post.id, wiki: 'true' },
+            format: :json
+        end.to change { another_post.reload.version }.by(1)
 
-        expect { xhr :put, :wiki, post_id: another_post.id, wiki: 'false' }
-          .to change { another_post.reload.version }.by(-1)
+        expect do
+          put :wiki,
+            params: { post_id: another_post.id, wiki: 'false' },
+            format: :json
+        end.to change { another_post.reload.version }.by(-1)
 
-        another_admin = log_in(:admin)
+        _another_admin = log_in(:admin)
 
-        expect { xhr :put, :wiki, post_id: another_post.id, wiki: 'true' }
-          .to change { another_post.reload.version }.by(1)
+        expect do
+          put :wiki,
+            params: { post_id: another_post.id, wiki: 'true' },
+            format: :json
+        end.to change { another_post.reload.version }.by(1)
       end
 
       it "can wiki a post" do
         Guardian.any_instance.expects(:can_wiki?).with(post).returns(true)
 
-        xhr :put, :wiki, post_id: post.id, wiki: 'true'
+        put :wiki, params: { post_id: post.id, wiki: 'true' }, format: :json
 
         post.reload
         expect(post.wiki).to eq(true)
@@ -539,7 +536,7 @@ describe PostsController do
         wikied_post = Fabricate(:post, user: user, wiki: true)
         Guardian.any_instance.expects(:can_wiki?).with(wikied_post).returns(true)
 
-        xhr :put, :wiki, post_id: wikied_post.id, wiki: 'false'
+        put :wiki, params: { post_id: wikied_post.id, wiki: 'false' }, format: :json
 
         wikied_post.reload
         expect(wikied_post.wiki).to eq(false)
@@ -554,13 +551,13 @@ describe PostsController do
     include_examples "action requires login", :put, :post_type, post_id: 2
 
     describe "when logged in" do
-      let(:user) {log_in}
-      let(:post) {Fabricate(:post, user: user)}
+      let(:user) { log_in }
+      let(:post) { Fabricate(:post, user: user) }
 
       it "raises an error if the user doesn't have permission to change the post type" do
         Guardian.any_instance.expects(:can_change_post_type?).returns(false)
 
-        xhr :put, :post_type, post_id: post.id, post_type: 2
+        put :post_type, params: { post_id: post.id, post_type: 2 }, format: :json
 
         expect(response).to be_forbidden
       end
@@ -568,7 +565,7 @@ describe PostsController do
       it "can change the post type" do
         Guardian.any_instance.expects(:can_change_post_type?).returns(true)
 
-        xhr :put, :post_type, post_id: post.id, post_type: 2
+        put :post_type, params: { post_id: post.id, post_type: 2 }, format: :json
 
         post.reload
         expect(post.post_type).to eq(2)
@@ -583,13 +580,13 @@ describe PostsController do
     include_examples "action requires login", :put, :rebake, post_id: 2
 
     describe "when logged in" do
-      let(:user) {log_in}
-      let(:post) {Fabricate(:post, user: user)}
+      let(:user) { log_in }
+      let(:post) { Fabricate(:post, user: user) }
 
       it "raises an error if the user doesn't have permission to rebake the post" do
         Guardian.any_instance.expects(:can_rebake?).returns(false)
 
-        xhr :put, :rebake, post_id: post.id
+        put :rebake, params: { post_id: post.id }, format: :json
 
         expect(response).to be_forbidden
       end
@@ -597,7 +594,7 @@ describe PostsController do
       it "can rebake the post" do
         Guardian.any_instance.expects(:can_rebake?).returns(true)
 
-        xhr :put, :rebake, post_id: post.id
+        put :rebake, params: { post_id: post.id }, format: :json
 
         expect(response).to be_success
       end
@@ -622,15 +619,71 @@ describe PostsController do
         user = Fabricate(:user)
         master_key = ApiKey.create_master_key.key
 
-        xhr :post, :create, {api_username: user.username, api_key: master_key, raw: raw, title: title, wpid: 1}
+        post :create, params: {
+          api_username: user.username,
+          api_key: master_key,
+          raw: raw,
+          title: title,
+          wpid: 1
+        }, format: :json
+
         expect(response).to be_success
         original = response.body
 
-        xhr :post, :create, {api_username: user.username_lower, api_key: master_key, raw: raw, title: title, wpid: 2}
-        expect(response).to be_success
+        post :create, params: {
+          api_username: user.username_lower,
+          api_key: master_key,
+          raw: raw,
+          title: title,
+          wpid: 2
+        }, format: :json
 
+        expect(response).to be_success
         expect(response.body).to eq(original)
       end
+
+      it 'allows to create posts in import_mode' do
+        NotificationEmailer.enable
+        post_1 = Fabricate(:post)
+        user = Fabricate(:user)
+        master_key = ApiKey.create_master_key.key
+
+        post :create, params: {
+          api_username: user.username,
+          api_key: master_key,
+          raw: 'this is test reply 1',
+          topic_id: post_1.topic.id,
+          reply_to_post_number: 1
+        }, format: :json
+
+        expect(response).to be_success
+        expect(post_1.topic.user.notifications.count).to eq(1)
+        post_1.topic.user.notifications.destroy_all
+
+        post :create, params: {
+          api_username: user.username,
+          api_key: master_key,
+          raw: 'this is test reply 2',
+          topic_id: post_1.topic.id,
+          reply_to_post_number: 1,
+          import_mode: true
+        }, format: :json
+
+        expect(response).to be_success
+        expect(post_1.topic.user.notifications.count).to eq(0)
+
+        post :create, params: {
+          api_username: user.username,
+          api_key: master_key,
+          raw: 'this is test reply 3',
+          topic_id: post_1.topic.id,
+          reply_to_post_number: 1,
+          import_mode: false
+        }
+
+        expect(response).to be_success
+        expect(post_1.topic.user.notifications.count).to eq(1)
+      end
     end
 
     describe 'when logged in' do
@@ -642,11 +695,14 @@ describe PostsController do
       context "fast typing" do
         before do
           SiteSetting.min_first_post_typing_time = 3000
-          SiteSetting.auto_block_fast_typers_max_trust_level = 1
+          SiteSetting.auto_silence_fast_typers_max_trust_level = 1
         end
 
         it 'queues the post if min_first_post_typing_time is not met' do
-          xhr :post, :create, {raw: 'this is the test content', title: 'this is the test title for the topic'}
+          post :create, params: {
+            raw: 'this is the test content',
+            title: 'this is the test title for the topic'
+          }, format: :json
 
           expect(response).to be_success
           parsed = ::JSON.parse(response.body)
@@ -654,7 +710,7 @@ describe PostsController do
           expect(parsed["action"]).to eq("enqueued")
 
           user.reload
-          expect(user.blocked).to eq(true)
+          expect(user).to be_silenced
 
           qp = QueuedPost.first
 
@@ -662,17 +718,17 @@ describe PostsController do
           qp.approve!(mod)
 
           user.reload
-          expect(user.blocked).to eq(false)
+          expect(user).not_to be_silenced
         end
 
         it "doesn't enqueue replies when the topic is closed" do
           topic = Fabricate(:closed_topic)
 
-          xhr :post, :create, {
+          post :create, params: {
             raw: 'this is the test content',
             title: 'this is the test title for the topic',
             topic_id: topic.id
-          }
+          }, format: :json
 
           expect(response).not_to be_success
           parsed = ::JSON.parse(response.body)
@@ -681,10 +737,11 @@ describe PostsController do
 
         it "doesn't enqueue replies when the post is too long" do
           SiteSetting.max_post_length = 10
-          xhr :post, :create, {
+
+          post :create, params: {
             raw: 'this is the test content',
-            title: 'this is the test title for the topic',
-          }
+            title: 'this is the test title for the topic'
+          }, format: :json
 
           expect(response).not_to be_success
           parsed = ::JSON.parse(response.body)
@@ -692,10 +749,13 @@ describe PostsController do
         end
       end
 
-      it 'blocks correctly based on auto_block_first_post_regex' do
-        SiteSetting.auto_block_first_post_regex = "I love candy|i eat s[1-5]"
+      it 'silences correctly based on auto_silence_first_post_regex' do
+        SiteSetting.auto_silence_first_post_regex = "I love candy|i eat s[1-5]"
 
-        xhr :post, :create, {raw: 'this is the test content', title: 'when I eat s3 sometimes when not looking'}
+        post :create, params: {
+          raw: 'this is the test content',
+          title: 'when I eat s3 sometimes when not looking'
+        }, format: :json
 
         expect(response).to be_success
         parsed = ::JSON.parse(response.body)
@@ -703,44 +763,33 @@ describe PostsController do
         expect(parsed["action"]).to eq("enqueued")
 
         user.reload
-        expect(user.blocked).to eq(true)
-      end
-
-      it 'creates the post' do
-        xhr :post, :create, {raw: 'this is the test content', title: 'this is the test title for the topic'}
-
-        expect(response).to be_success
-        parsed = ::JSON.parse(response.body)
-
-        # Deprecated structure
-        expect(parsed['post']).to be_blank
-        expect(parsed['cooked']).to be_present
+        expect(user).to be_silenced
       end
 
       it "can send a message to a group" do
 
-        group = Group.create(name: 'test_group', alias_level: Group::ALIAS_LEVELS[:nobody])
+        group = Group.create(name: 'test_group', messageable_level: Group::ALIAS_LEVELS[:nobody])
         user1 = Fabricate(:user)
         group.add(user1)
 
-        xhr :post, :create, {
+        post :create, params: {
           raw: 'I can haz a test',
           title: 'I loves my test',
           target_usernames: group.name,
           archetype: Archetype.private_message
-        }
+        }, format: :json
 
         expect(response).not_to be_success
 
         # allow pm to this group
-        group.update_columns(alias_level: Group::ALIAS_LEVELS[:everyone])
+        group.update_columns(messageable_level: Group::ALIAS_LEVELS[:everyone])
 
-        xhr :post, :create, {
+        post :create, params: {
           raw: 'I can haz a test',
           title: 'I loves my test',
           target_usernames: group.name,
           archetype: Archetype.private_message
-        }
+        }, format: :json
 
         expect(response).to be_success
 
@@ -752,9 +801,11 @@ describe PostsController do
       end
 
       it "returns the nested post with a param" do
-        xhr :post, :create, {raw: 'this is the test content',
-                             title: 'this is the test title for the topic',
-                             nested_post: true}
+        post :create, params: {
+          raw: 'this is the test content',
+          title: 'this is the test title for the topic',
+          nested_post: true
+        }, format: :json
 
         expect(response).to be_success
         parsed = ::JSON.parse(response.body)
@@ -766,16 +817,16 @@ describe PostsController do
         raw = "this is a test post 123 #{SecureRandom.hash}"
         title = "this is a title #{SecureRandom.hash}"
 
-        xhr :post, :create, {raw: raw, title: title, wpid: 1}
+        post :create, params: { raw: raw, title: title, wpid: 1 }, format: :json
         expect(response).to be_success
 
-        xhr :post, :create, {raw: raw, title: title, wpid: 2}
+        post :create, params: { raw: raw, title: title, wpid: 2 }, format: :json
         expect(response).not_to be_success
       end
 
       context "errors" do
 
-        let(:post_with_errors) { Fabricate.build(:post, user: user)}
+        let(:post_with_errors) { Fabricate.build(:post, user: user) }
 
         before do
           post_with_errors.errors.add(:base, I18n.t(:spamming_host))
@@ -784,7 +835,7 @@ describe PostsController do
         end
 
         it "does not succeed" do
-          xhr :post, :create, {raw: 'test'}
+          post :create, params: { raw: 'test' }, format: :json
           User.any_instance.expects(:flag_linked_posts_as_spam).never
           expect(response).not_to be_success
         end
@@ -792,87 +843,9 @@ describe PostsController do
         it "it triggers flag_linked_posts_as_spam when the post creator returns spam" do
           PostCreator.any_instance.expects(:spam?).returns(true)
           User.any_instance.expects(:flag_linked_posts_as_spam)
-          xhr :post, :create, {raw: 'test'}
+          post :create, params: { raw: 'test' }, format: :json
         end
-
       end
-
-
-      context "parameters" do
-
-        before do
-          # Just for performance, no reason to actually perform for these
-          # tests.
-          NewPostManager.stubs(:perform).returns(NewPostResult)
-        end
-
-        it "passes raw through" do
-          xhr :post, :create, {raw: 'hello'}
-          expect(assigns(:manager_params)['raw']).to eq('hello')
-        end
-
-        it "passes title through" do
-          xhr :post, :create, {raw: 'hello', title: 'new topic title'}
-          expect(assigns(:manager_params)['title']).to eq('new topic title')
-        end
-
-        it "passes topic_id through" do
-          xhr :post, :create, {raw: 'hello', topic_id: 1234}
-          expect(assigns(:manager_params)['topic_id']).to eq('1234')
-        end
-
-        it "passes archetype through" do
-          xhr :post, :create, {raw: 'hello', archetype: 'private_message'}
-          expect(assigns(:manager_params)['archetype']).to eq('private_message')
-        end
-
-        it "passes category through" do
-          xhr :post, :create, {raw: 'hello', category: 1}
-          expect(assigns(:manager_params)['category']).to eq('1')
-        end
-
-        it "passes target_usernames through" do
-          xhr :post, :create, {raw: 'hello', target_usernames: 'evil,trout'}
-          expect(assigns(:manager_params)['target_usernames']).to eq('evil,trout')
-        end
-
-        it "passes reply_to_post_number through" do
-          xhr :post, :create, {raw: 'hello', reply_to_post_number: 6789, topic_id: 1234}
-          expect(assigns(:manager_params)['reply_to_post_number']).to eq('6789')
-        end
-
-        it "passes image_sizes through" do
-          xhr :post, :create, {raw: 'hello', image_sizes: {width: '100', height: '200'}}
-          expect(assigns(:manager_params)['image_sizes']['width']).to eq('100')
-          expect(assigns(:manager_params)['image_sizes']['height']).to eq('200')
-        end
-
-        it "passes meta_data through" do
-          xhr :post, :create, {raw: 'hello', meta_data: {xyz: 'abc'}}
-          expect(assigns(:manager_params)['meta_data']['xyz']).to eq('abc')
-        end
-
-        context "is_warning" do
-          it "doesn't pass `is_warning` through if you're not staff" do
-            xhr :post, :create, {raw: 'hello', archetype: 'private_message', is_warning: 'true'}
-            expect(assigns(:manager_params)['is_warning']).to eq(false)
-          end
-
-          it "passes `is_warning` through if you're staff" do
-            log_in(:moderator)
-            xhr :post, :create, {raw: 'hello', archetype: 'private_message', is_warning: 'true'}
-            expect(assigns(:manager_params)['is_warning']).to eq(true)
-          end
-
-          it "passes `is_warning` as false through if you're staff" do
-            xhr :post, :create, {raw: 'hello', archetype: 'private_message', is_warning: 'false'}
-            expect(assigns(:manager_params)['is_warning']).to eq(false)
-          end
-
-        end
-
-      end
-
     end
   end
 
@@ -883,28 +856,37 @@ describe PostsController do
 
     it "throws an exception when revision is < 2" do
       expect {
-        xhr :get, :revisions, post_id: post_revision.post_id, revision: 1
+        get :revisions, params: {
+          post_id: post_revision.post_id, revision: 1
+        }, format: :json
       }.to raise_error(Discourse::InvalidParameters)
     end
 
     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
+        get :revisions, params: {
+          post_id: post_revision.post_id, revision: post_revision.number
+        }, format: :json
+
         expect(response).to be_forbidden
       end
 
       it "ensures regular user cannot see the revisions" do
         log_in(:user)
-        xhr :get, :revisions, post_id: post_revision.post_id, revision: post_revision.number
+        get :revisions, params: {
+          post_id: post_revision.post_id, revision: post_revision.number
+        }, format: :json
         expect(response).to be_forbidden
       end
 
       it "ensures staff can see the revisions" do
         log_in(:admin)
-        xhr :get, :revisions, post_id: post_revision.post_id, revision: post_revision.number
+        get :revisions, params: {
+          post_id: post_revision.post_id, revision: post_revision.number
+        }, format: :json
         expect(response).to be_success
       end
 
@@ -912,13 +894,17 @@ describe PostsController do
         user = log_in(:active_user)
         post = Fabricate(:post, user: user, version: 3)
         pr = Fabricate(:post_revision, user: user, post: post)
-        xhr :get, :revisions, post_id: pr.post_id, revision: pr.number
+        get :revisions, params: {
+          post_id: pr.post_id, revision: pr.number
+        }, format: :json
         expect(response).to be_success
       end
 
       it "ensures trust level 4 can see the revisions" do
         log_in(:trust_level_4)
-        xhr :get, :revisions, post_id: post_revision.post_id, revision: post_revision.number
+        get :revisions, params: {
+          post_id: post_revision.post_id, revision: post_revision.number
+        }, format: :json
         expect(response).to be_success
       end
 
@@ -926,10 +912,12 @@ 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
+        get :revisions, params: {
+          post_id: post_revision.post_id, revision: post_revision.number
+        }, format: :json
         expect(response).to be_success
       end
 
@@ -943,7 +931,9 @@ describe PostsController do
       before { deleted_post.trash!(admin) }
 
       it "also work on deleted post" do
-        xhr :get, :revisions, post_id: deleted_post_revision.post_id, revision: deleted_post_revision.number
+        get :revisions, params: {
+          post_id: deleted_post_revision.post_id, revision: deleted_post_revision.number
+        }, format: :json
         expect(response).to be_success
       end
     end
@@ -957,7 +947,9 @@ describe PostsController do
       before { deleted_topic.trash!(admin) }
 
       it "also work on deleted topic" do
-        xhr :get, :revisions, post_id: post_revision.post_id, revision: post_revision.number
+        get :revisions, params: {
+          post_id: post_revision.post_id, revision: post_revision.number
+        }
         expect(response).to be_success
       end
     end
@@ -968,9 +960,9 @@ describe PostsController do
     include_examples 'action requires login', :put, :revert, post_id: 123, revision: 2
 
     let(:post) { Fabricate(:post, user: logged_in_as, raw: "Lorem ipsum dolor sit amet, cu nam libris tractatos, ancillae senserit ius ex") }
-    let(:post_revision) { Fabricate(:post_revision, post: post, modifications: {"raw" => ["this is original post body.", "this is edited post body."]}) }
-    let(:blank_post_revision) { Fabricate(:post_revision, post: post, modifications: {"edit_reason" => ["edit reason #1", "edit reason #2"]}) }
-    let(:same_post_revision) { Fabricate(:post_revision, post: post, modifications: {"raw" => ["Lorem ipsum dolor sit amet, cu nam libris tractatos, ancillae senserit ius ex", "this is edited post body."]}) }
+    let(:post_revision) { Fabricate(:post_revision, post: post, modifications: { "raw" => ["this is original post body.", "this is edited post body."] }) }
+    let(:blank_post_revision) { Fabricate(:post_revision, post: post, modifications: { "edit_reason" => ["edit reason #1", "edit reason #2"] }) }
+    let(:same_post_revision) { Fabricate(:post_revision, post: post, modifications: { "raw" => ["Lorem ipsum dolor sit amet, cu nam libris tractatos, ancillae senserit ius ex", "this is edited post body."] }) }
 
     let(:revert_params) do
       {
@@ -984,7 +976,7 @@ describe PostsController do
       let(:logged_in_as) { log_in }
 
       it "does not work" do
-        xhr :put, :revert, revert_params
+        put :revert, params: revert_params, format: :json
         expect(response).to_not be_success
       end
     end
@@ -994,36 +986,44 @@ describe PostsController do
 
       it "throws an exception when revision is < 2" do
         expect {
-          xhr :put, :revert, post_id: post.id, revision: 1
+          put :revert, params:  { post_id: post.id, revision: 1 }, format: :json
         }.to raise_error(Discourse::InvalidParameters)
       end
 
       it "fails when post_revision record is not found" do
-        xhr :put, :revert, post_id: post.id, revision: post_revision.number + 1
+        put :revert, params: {
+          post_id: post.id, revision: post_revision.number + 1
+        }, format: :json
         expect(response).to_not be_success
       end
 
       it "fails when post record is not found" do
-        xhr :put, :revert, post_id: post.id + 1, revision: post_revision.number
+        put :revert, params: {
+          post_id: post.id + 1, revision: post_revision.number
+        }, format: :json
         expect(response).to_not be_success
       end
 
       it "fails when revision is blank" do
-        xhr :put, :revert, post_id: post.id, revision: blank_post_revision.number
+        put :revert, params: {
+          post_id: post.id, revision: blank_post_revision.number
+        }, format: :json
 
         expect(response.status).to eq(422)
         expect(JSON.parse(response.body)['errors']).to include(I18n.t('revert_version_same'))
       end
 
       it "fails when revised version is same as current version" do
-        xhr :put, :revert, post_id: post.id, revision: same_post_revision.number
+        put :revert, params: {
+          post_id: post.id, revision: same_post_revision.number
+        }, format: :json
 
         expect(response.status).to eq(422)
         expect(JSON.parse(response.body)['errors']).to include(I18n.t('revert_version_same'))
       end
 
       it "works!" do
-        xhr :put, :revert, revert_params
+        put :revert, params: revert_params, format: :json
         expect(response).to be_success
       end
 
@@ -1031,7 +1031,7 @@ describe PostsController do
         first_post = post.topic.ordered_posts.first
         PostDestroyer.new(moderator, first_post).destroy
 
-        xhr :put, :revert, revert_params
+        put :revert, params: revert_params, format: :json
         expect(response).to be_success
       end
     end
@@ -1042,14 +1042,14 @@ describe PostsController do
 
     it "raises an error when you can't see the post" do
       Guardian.any_instance.expects(:can_see?).with(post).returns(false)
-      xhr :get, :expand_embed, id: post.id
+      get :expand_embed, params: { id: post.id }, format: :json
       expect(response).not_to be_success
     end
 
     it "retrieves the body when you can see the post" do
       Guardian.any_instance.expects(:can_see?).with(post).returns(true)
       TopicEmbed.expects(:expanded_for).with(post).returns("full content")
-      xhr :get, :expand_embed, id: post.id
+      get :expand_embed, params: { id: post.id }, format: :json
       expect(response).to be_success
       expect(::JSON.parse(response.body)['cooked']).to eq("full content")
     end
@@ -1064,13 +1064,13 @@ describe PostsController do
 
       it "raises an error if the user doesn't have permission to see the flagged posts" do
         Guardian.any_instance.expects(:can_see_flagged_posts?).returns(false)
-        xhr :get, :flagged_posts, username: "system"
+        get :flagged_posts, params: { username: "system" }, format: :json
         expect(response).to be_forbidden
       end
 
       it "can see the flagged posts when authorized" do
         Guardian.any_instance.expects(:can_see_flagged_posts?).returns(true)
-        xhr :get, :flagged_posts, username: "system"
+        get :flagged_posts, params: { username: "system" }, format: :json
         expect(response).to be_success
       end
 
@@ -1091,7 +1091,7 @@ describe PostsController do
         PostAction.clear_flags!(post_disagreed, admin)
 
         Guardian.any_instance.expects(:can_see_flagged_posts?).returns(true)
-        xhr :get, :flagged_posts, username: user.username
+        get :flagged_posts, params: { username: user.username }, format: :json
         expect(response).to be_success
 
         expect(JSON.parse(response.body).length).to eq(2)
@@ -1110,13 +1110,13 @@ describe PostsController do
 
       it "raises an error if the user doesn't have permission to see the deleted posts" do
         Guardian.any_instance.expects(:can_see_deleted_posts?).returns(false)
-        xhr :get, :deleted_posts, username: "system"
+        get :deleted_posts, params: { username: "system" }, format: :json
         expect(response).to be_forbidden
       end
 
       it "can see the deleted posts when authorized" do
         Guardian.any_instance.expects(:can_see_deleted_posts?).returns(true)
-        xhr :get, :deleted_posts, username: "system"
+        get :deleted_posts, params: { username: "system" }, format: :json
         expect(response).to be_success
       end
 
@@ -1133,7 +1133,7 @@ describe PostsController do
         PostDestroyer.new(admin, secured_post).destroy
 
         log_in(:moderator)
-        xhr :get, :deleted_posts, username: user.username
+        get :deleted_posts, params: { username: user.username }, format: :json
         expect(response).to be_success
 
         data = JSON.parse(response.body)
@@ -1149,7 +1149,7 @@ describe PostsController do
         PostDestroyer.new(admin, pm_post).destroy
 
         log_in(:moderator)
-        xhr :get, :deleted_posts, username: user.username
+        get :deleted_posts, params: { username: user.username }, format: :json
         expect(response).to be_success
 
         data = JSON.parse(response.body)
@@ -1168,7 +1168,7 @@ describe PostsController do
         PostDestroyer.new(admin, post_deleted_by_admin).destroy
 
         Guardian.any_instance.expects(:can_see_deleted_posts?).returns(true)
-        xhr :get, :deleted_posts, username: user.username
+        get :deleted_posts, params: { username: user.username }, format: :json
         expect(response).to be_success
 
         data = JSON.parse(response.body)
@@ -1185,7 +1185,7 @@ describe PostsController do
     describe "by ID" do
       it "can be viewed by anonymous" do
         post = Fabricate(:post, raw: "123456789")
-        xhr :get, :markdown_id, id: post.id
+        get :markdown_id, params: { id: post.id }, format: :json
         expect(response).to be_success
         expect(response.body).to eq("123456789")
       end
@@ -1196,7 +1196,7 @@ describe PostsController do
         topic = Fabricate(:topic)
         post = Fabricate(:post, topic: topic, post_number: 1, raw: "123456789")
         post.save
-        xhr :get, :markdown_num, topic_id: topic.id, post_number: 1
+        get :markdown_num, params: { topic_id: topic.id, post_number: 1 }, format: :json
         expect(response).to be_success
         expect(response.body).to eq("123456789")
       end
@@ -1208,13 +1208,13 @@ describe PostsController do
     let(:post) { Fabricate(:post, topic: topic) }
 
     it "redirects to the topic" do
-      xhr :get, :short_link, post_id: post.id
+      get :short_link, params: { post_id: post.id }, format: :json
       expect(response).to be_redirect
     end
 
     it "returns a 403 when access is denied" do
       Guardian.any_instance.stubs(:can_see?).returns(false)
-      xhr :get, :short_link, post_id: post.id
+      get :short_link, params: { post_id: post.id }, format: :json
       expect(response).to be_forbidden
     end
   end
diff --git a/spec/controllers/queued_posts_controller_spec.rb b/spec/controllers/queued_posts_controller_spec.rb
index f6c4b4a62c..ac88c50479 100644
--- a/spec/controllers/queued_posts_controller_spec.rb
+++ b/spec/controllers/queued_posts_controller_spec.rb
@@ -5,7 +5,7 @@ require_dependency 'queued_post'
 describe QueuedPostsController do
   context 'without authentication' do
     it 'fails' do
-      xhr :get, :index
+      get :index, format: :json
       expect(response).not_to be_success
     end
   end
@@ -13,7 +13,7 @@ describe QueuedPostsController do
   context 'as a regular user' do
     let!(:user) { log_in(:user) }
     it 'fails' do
-      xhr :get, :index
+      get :index, format: :json
       expect(response).not_to be_success
     end
   end
@@ -22,20 +22,36 @@ describe QueuedPostsController do
     let!(:user) { log_in(:moderator) }
 
     it 'returns the queued posts' do
-      xhr :get, :index
+      get :index, format: :json
       expect(response).to be_success
     end
   end
 
-
-  context 'update' do
+  describe '#update' do
     let!(:user) { log_in(:moderator) }
     let(:qp) { Fabricate(:queued_post) }
 
+    context 'not found' do
+      it 'returns json error' do
+        qp.destroy!
+
+        put :update, params: {
+          id: qp.id, queued_post: { state: 'approved' }
+        }, format: :json
+
+        expect(response.status).to eq(422)
+
+        expect(eval(response.body)).to eq(described_class.new.create_errors_json(I18n.t('queue.not_found')))
+      end
+    end
+
     context 'approved' do
       it 'updates the post to approved' do
 
-        xhr :put, :update, id: qp.id, queued_post: { state: 'approved' }
+        put :update, params: {
+          id: qp.id, queued_post: { state: 'approved' }
+        }, format: :json
+
         expect(response).to be_success
 
         qp.reload
@@ -44,9 +60,12 @@ describe QueuedPostsController do
     end
 
     context 'rejected' do
-      it 'updates the post to approved' do
+      it 'updates the post to rejected' do
+
+        put :update, params: {
+          id: qp.id, queued_post: { state: 'rejected' }
+        }, format: :json
 
-        xhr :put, :update, id: qp.id, queued_post: { state: 'rejected' }
         expect(response).to be_success
 
         qp.reload
@@ -54,6 +73,72 @@ describe QueuedPostsController do
       end
     end
 
+    context 'editing content' do
+      let(:changes) do
+        {
+          raw: 'new raw',
+          title: 'new title',
+          category_id: 10,
+          tags: ['new_tag']
+        }
+      end
+
+      context 'when it is a topic' do
+        let(:queued_topic) { Fabricate(:queued_topic) }
+
+        before do
+          put :update, params: {
+            id: queued_topic.id, queued_post: changes
+          }, format: :json
+
+          expect(response).to be_success
+        end
+
+        it 'updates raw' do
+          expect(queued_topic.reload.raw).to eq(changes[:raw])
+        end
+
+        it 'updates the title' do
+          expect(queued_topic.reload.post_options['title']).to eq(changes[:title])
+        end
+
+        it 'updates the category' do
+          expect(queued_topic.reload.post_options['category']).to eq(changes[:category_id])
+        end
+
+        it 'updates the tags' do
+          expect(queued_topic.reload.post_options['tags']).to eq(changes[:tags])
+        end
+      end
+
+      context 'when it is a reply' do
+        let(:queued_reply) { Fabricate(:queued_post) }
+
+        before do
+          put :update, params: {
+            id: queued_reply.id, queued_post: changes
+          }, format: :json
+
+          expect(response).to be_success
+        end
+
+        it 'updates raw' do
+          expect(queued_reply.reload.raw).to eq(changes[:raw])
+        end
+
+        it 'does not update the title' do
+          expect(queued_reply.reload.post_options['title']).to be_nil
+        end
+
+        it 'does not update the category' do
+          original_category = queued_reply.post_options['category']
+          expect(queued_reply.reload.post_options['category']).to eq(original_category)
+        end
+
+        it 'does not update the tags' do
+          expect(queued_reply.reload.post_options['tags']).to be_nil
+        end
+      end
+    end
   end
 end
-
diff --git a/spec/controllers/robots_txt_controller_spec.rb b/spec/controllers/robots_txt_controller_spec.rb
deleted file mode 100644
index 8ee44f9a47..0000000000
--- a/spec/controllers/robots_txt_controller_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'rails_helper'
-
-describe RobotsTxtController do
-
-  context '.index' do
-
-    it "returns index when indexing is allowed" do
-      SiteSetting.allow_index_in_robots_txt = true
-      get :index
-      expect(response).to render_template :index
-    end
-
-    it "returns noindex when indexing is disallowed" do
-      SiteSetting.allow_index_in_robots_txt = false
-      get :index
-      expect(response).to render_template :no_index
-    end
-
-  end
-end
diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb
index 7e967f0b7d..d6cec92d0b 100644
--- a/spec/controllers/search_controller_spec.rb
+++ b/spec/controllers/search_controller_spec.rb
@@ -3,14 +3,16 @@ require 'rails_helper'
 describe SearchController do
 
   context "integration" do
-
     before do
       SearchIndexer.enable
     end
 
     it "can search correctly" do
       my_post = Fabricate(:post, raw: 'this is my really awesome post')
-      xhr :get, :query, term: 'awesome', include_blurb: true
+
+      get :query, params: {
+        term: 'awesome', include_blurb: true
+      }, format: :json
 
       expect(response).to be_success
       data = JSON.parse(response.body)
@@ -18,90 +20,275 @@ 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")
 
-  let(:search_context) { {type: 'user', id: 'eviltrout'} }
+      get :query, params: {
+        term: user.username, type_filter: 'topic'
+      }, format: :json
 
-  context "basics" do
-    let(:guardian) { Guardian.new }
-    let(:search) { mock() }
+      expect(response).to be_success
+      data = JSON.parse(response.body)
 
-    before do
-      Guardian.stubs(:new).returns(guardian)
+      expect(data['posts'][0]['id']).to eq(my_post.id)
+      expect(data['users']).to be_blank
+
+      get :query, params: {
+        term: user.username, type_filter: 'user'
+      }, format: :json
+
+      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)
+        get :query, params: {
+          term: post.topic_id,
+          type_filter: 'topic',
+          search_for_id: true
+        }, format: :json
 
-      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)
+        get :query, params: {
+          term: my_post.topic_id,
+          type_filter: 'topic',
+          search_for_id: true
+        }, format: :json
 
-      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
+      get :query, params: { term: 'wookie' }, format: :json
+
+      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
+      get :query, params: { term: 'wookie' }, format: :json
+      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
+      get :show, params: { q: 'bantha' }, format: :json
+      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
+      get :show, params: { q: 'bantha' }, format: :json
+      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'}
-      }.to raise_error(Discourse::InvalidParameters)
+      expect do
+        get :query, params: {
+          term: 'test', search_context: { type: 'security', id: 'hole' }
+        }, format: :json
+      end.to raise_error(Discourse::InvalidParameters)
     end
 
     it "raises an error with a missing id" do
-      expect {
-        xhr :get, :query, term: 'test', search_context: {type: 'user'}
-      }.to raise_error(Discourse::InvalidParameters)
+      expect do
+        get :query,
+          params: { term: 'test', search_context: { type: 'user' } },
+          format: :json
+      end.to raise_error(Discourse::InvalidParameters)
     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}
+        get :query, params: {
+          term: 'test', search_context: { type: 'user', id: user.username }
+        }, format: :json
+
         expect(response).not_to be_success
       end
 
-
       it 'performs the query with a search context' do
-        guardian = Guardian.new
-        Guardian.stubs(:new).returns(guardian)
+        get :query, params: {
+          term: 'test', search_context: { type: 'user', id: user.username }
+        }, format: :json
 
-        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 do
+        post :click, format: :json
+      end.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'
+      )
+
+      post :click, params: {
+        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).search_result_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: 'foobar',
+        search_type: :header,
+        user_id: user.id,
+        ip_address: '127.0.0.1'
+      )
+
+      post :click, params: {
+        search_log_id: search_log_id,
+        search_result_id: 12345,
+        search_result_type: 'user'
+      }, format: :json
+
+      expect(response).to be_success
+      expect(SearchLog.find(search_log_id).search_result_id).to eq(12345)
+      expect(SearchLog.find(search_log_id).search_result_type).to eq(SearchLog.search_result_types[:user])
+    end
+
+    it "records the click for an anonymous user" do
+      request.remote_addr = '192.168.0.1';
+
+      _, search_log_id = SearchLog.log(
+        term: 'kitty',
+        search_type: :header,
+        ip_address: '192.168.0.1'
+      )
+
+      post :click, params: {
+        search_log_id: search_log_id,
+        search_result_id: 22222,
+        search_result_type: 'topic'
+      }, format: :json
+
+      expect(response).to be_success
+      expect(SearchLog.find(search_log_id).search_result_id).to eq(22222)
+      expect(SearchLog.find(search_log_id).search_result_type).to eq(SearchLog.search_result_types[:topic])
+    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'
+      )
+
+      post :click, params: {
+        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).search_result_id).to be_blank
+    end
+
+    it "records the click for search result type category" do
+      request.remote_addr = '192.168.0.1';
+
+      _, search_log_id = SearchLog.log(
+        term: 'dev',
+        search_type: :header,
+        ip_address: '192.168.0.1'
+      )
+
+      post :click, params: {
+        search_log_id: search_log_id,
+        search_result_id: 23456,
+        search_result_type: 'category'
+      }, format: :json
+
+      expect(response).to be_success
+      expect(SearchLog.find(search_log_id).search_result_id).to eq(23456)
+      expect(SearchLog.find(search_log_id).search_result_type).to eq(SearchLog.search_result_types[:category])
+    end
+
+    it "records the click for search result type tag" do
+      request.remote_addr = '192.168.0.1';
+       tag = Fabricate(:tag, name: 'test')
+
+      _, search_log_id = SearchLog.log(
+        term: 'test',
+        search_type: :header,
+        ip_address: '192.168.0.1'
+      )
+
+      post :click, params: {
+        search_log_id: search_log_id,
+        search_result_id: tag.name,
+        search_result_type: 'tag'
+      }, format: :json
+
+      expect(response).to be_success
+      expect(SearchLog.find(search_log_id).search_result_id).to eq(tag.id)
+      expect(SearchLog.find(search_log_id).search_result_type).to eq(SearchLog.search_result_types[:tag])
+    end
+  end
 end
diff --git a/spec/controllers/session_controller_spec.rb b/spec/controllers/session_controller_spec.rb
index 5645eca822..cc535e7222 100644
--- a/spec/controllers/session_controller_spec.rb
+++ b/spec/controllers/session_controller_spec.rb
@@ -1,20 +1,26 @@
 require 'rails_helper'
 
 describe SessionController do
+  shared_examples 'failed to continue local login' do
+    it 'should return the right response' do
+      expect(response).not_to be_success
+      expect(response.status.to_i).to eq 500
+    end
+  end
 
   describe 'become' do
     let!(:user) { Fabricate(:user) }
 
     it "does not work when not in development mode" do
       Rails.env.stubs(:development?).returns(false)
-      get :become, session_id: user.username
+      get :become, params: { session_id: user.username }, format: :json
       expect(response).not_to be_redirect
       expect(session[:current_user_id]).to be_blank
     end
 
     it "works in developmenet mode" do
       Rails.env.stubs(:development?).returns(true)
-      get :become, session_id: user.username
+      get :become, params: { session_id: user.username }, format: :json
       expect(response).to be_redirect
       expect(session[:current_user_id]).to eq(user.id)
     end
@@ -28,15 +34,15 @@ describe SessionController do
 
       request.host = Discourse.current_hostname
 
-      SiteSetting.enable_sso = true
       SiteSetting.sso_url = @sso_url
+      SiteSetting.enable_sso = true
       SiteSetting.sso_secret = @sso_secret
 
       # We have 2 options, either fabricate an admin or don't
       # 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)
@@ -58,7 +64,7 @@ describe SessionController do
       sso.external_id = 'abc'
       sso.username = 'sam'
 
-      get :sso_login, Rack::Utils.parse_query(sso.payload)
+      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
 
       expect(response).to redirect_to('/')
       logged_on_user = Discourse.current_user_provider.new(request.env).current_user
@@ -81,7 +87,7 @@ describe SessionController do
       ActionDispatch::Request.any_instance.stubs(:remote_ip).returns(screened_ip.ip_address)
 
       sso = sso_for_ip_specs
-      get :sso_login, Rack::Utils.parse_query(sso.payload)
+      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
 
       logged_on_user = Discourse.current_user_provider.new(request.env).current_user
       expect(logged_on_user).to eq(nil)
@@ -95,7 +101,7 @@ describe SessionController do
       screened_ip = Fabricate(:screened_ip_address)
       ActionDispatch::Request.any_instance.stubs(:remote_ip).returns(screened_ip.ip_address)
 
-      get :sso_login, Rack::Utils.parse_query(sso.payload)
+      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
       logged_on_user = Discourse.current_user_provider.new(request.env).current_user
       expect(logged_on_user).to be_blank
     end
@@ -108,7 +114,7 @@ describe SessionController do
       sso.username = 'sam'
 
       ScreenedEmail.block('bob@bob.com')
-      get :sso_login, Rack::Utils.parse_query(sso.payload)
+      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
 
       logged_on_user = Discourse.current_user_provider.new(request.env).current_user
       expect(logged_on_user).to eq(nil)
@@ -124,7 +130,7 @@ describe SessionController do
       sso.custom_fields["shop_name"] = "Sam"
       sso.admin = true
 
-      get :sso_login, Rack::Utils.parse_query(sso.payload)
+      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
 
       logged_on_user = Discourse.current_user_provider.new(request.env).current_user
       expect(logged_on_user.admin).to eq(true)
@@ -137,7 +143,7 @@ describe SessionController do
       sso.name = 'Sam Saffron'
       sso.username = 'sam'
 
-      get :sso_login, Rack::Utils.parse_query(sso.payload)
+      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
       expect(response).to redirect_to('/b/')
     end
 
@@ -150,7 +156,7 @@ describe SessionController do
       sso.name = 'Sam Saffron'
       sso.username = 'sam'
 
-      get :sso_login, Rack::Utils.parse_query(sso.payload)
+      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
       expect(response).to redirect_to('https://gusundtrout.com')
     end
 
@@ -161,7 +167,7 @@ describe SessionController do
       sso.name = 'Sam Saffron'
       sso.username = 'sam'
 
-      get :sso_login, Rack::Utils.parse_query(sso.payload)
+      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
       expect(response).to redirect_to('/')
     end
 
@@ -172,7 +178,7 @@ describe SessionController do
       sso.name = 'Sam Saffron'
       sso.username = 'sam'
 
-      get :sso_login, Rack::Utils.parse_query(sso.payload)
+      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
       expect(response).to redirect_to('/')
     end
 
@@ -185,7 +191,14 @@ describe SessionController do
       sso.custom_fields["shop_url"] = "http://my_shop.com"
       sso.custom_fields["shop_name"] = "Sam"
 
-      get :sso_login, Rack::Utils.parse_query(sso.payload)
+      events = DiscourseEvent.track_events do
+        get :sso_login, params: Rack::Utils.parse_query(sso.payload)
+      end
+
+      expect(events.map { |event| event[:event_name] }).to include(
+       :user_logged_in, :user_first_logged_in
+      )
+
       expect(response).to redirect_to('/a/')
 
       logged_on_user = Discourse.current_user_provider.new(request.env).current_user
@@ -216,7 +229,7 @@ describe SessionController do
           sso.username = 'sam'
           sso.require_activation = true
 
-          get :sso_login, Rack::Utils.parse_query(sso.payload)
+          get :sso_login, params: Rack::Utils.parse_query(sso.payload)
 
           logged_on_user = Discourse.current_user_provider.new(request.env).current_user
           expect(logged_on_user).to eq(nil)
@@ -231,7 +244,7 @@ describe SessionController do
           sso.username = 'sam'
           sso.require_activation = true
 
-          get :sso_login, Rack::Utils.parse_query(sso.payload)
+          get :sso_login, params: Rack::Utils.parse_query(sso.payload)
         end
       end
 
@@ -246,7 +259,7 @@ describe SessionController do
           user.create_single_sign_on_record(external_id: '997', last_payload: '')
           user.stubs(:active?).returns(true)
 
-          get :sso_login, Rack::Utils.parse_query(sso.payload)
+          get :sso_login, params: Rack::Utils.parse_query(sso.payload)
 
           logged_on_user = Discourse.current_user_provider.new(request.env).current_user
           expect(user.id).to eq(logged_on_user.id)
@@ -262,7 +275,7 @@ describe SessionController do
       user = Fabricate(:user)
       user.create_single_sign_on_record(external_id: '997', last_payload: '')
 
-      get :sso_login, Rack::Utils.parse_query(sso.payload)
+      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
 
       user.single_sign_on_record.reload
       expect(user.single_sign_on_record.last_payload).to eq(sso.unsigned_payload)
@@ -273,7 +286,7 @@ describe SessionController do
       expect(user.id).to eq(logged_on_user.id)
 
       # nonce is bad now
-      get :sso_login, Rack::Utils.parse_query(sso.payload)
+      get :sso_login, params: Rack::Utils.parse_query(sso.payload)
       expect(response.code).to eq('419')
     end
 
@@ -289,17 +302,23 @@ describe SessionController do
         @sso.sso_secret = SiteSetting.sso_secret
         @sso.return_sso_url = "http://somewhere.over.rainbow/sso"
 
-        @user = Fabricate(:user, password: "frogs", active: true, admin: true)
+        @user = Fabricate(:user, password: "myfrogs123ADMIN", active: true, admin: true)
+        group = Fabricate(:group)
+        group.add(@user)
+        @user.reload
         EmailToken.update_all(confirmed: true)
       end
 
       it "successfully logs in and redirects user to return_sso_url when the user is not logged in" do
-        get :sso_provider, Rack::Utils.parse_query(@sso.payload)
+        get :sso_provider, params: Rack::Utils.parse_query(@sso.payload)
         expect(response).to redirect_to("/login")
 
-        xhr :post, :create, login: @user.username, password: "frogs", format: :json
+        post :create,
+          params: { login: @user.username, password: "myfrogs123ADMIN" },
+          format: :json,
+          xhr: true
 
-        location = cookies[:sso_destination_url]
+        location = response.cookies["sso_destination_url"]
         # javascript code will handle redirection of user to return_sso_url
         expect(location).to match(/^http:\/\/somewhere.over.rainbow\/sso/)
 
@@ -312,12 +331,13 @@ describe SessionController do
         expect(sso2.external_id).to eq(@user.id.to_s)
         expect(sso2.admin).to eq(true)
         expect(sso2.moderator).to eq(false)
+        expect(sso2.groups).to eq(@user.groups.pluck(:name))
       end
 
       it "successfully redirects user to return_sso_url when the user is logged in" do
         log_in_user(@user)
 
-        get :sso_provider, Rack::Utils.parse_query(@sso.payload)
+        get :sso_provider, params: Rack::Utils.parse_query(@sso.payload)
 
         location = response.header["Location"]
         expect(location).to match(/^http:\/\/somewhere.over.rainbow\/sso/)
@@ -336,9 +356,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)
 
@@ -357,7 +378,7 @@ describe SessionController do
       end
 
       it 'stores the external attributes' do
-        get :sso_login, Rack::Utils.parse_query(@sso.payload)
+        get :sso_login, params: Rack::Utils.parse_query(@sso.payload)
         @user.single_sign_on_record.reload
         expect(@user.single_sign_on_record.external_username).to eq(@sso.username)
         expect(@user.single_sign_on_record.external_email).to eq(@sso.email)
@@ -365,7 +386,7 @@ describe SessionController do
       end
 
       it 'overrides attributes' do
-        get :sso_login, Rack::Utils.parse_query(@sso.payload)
+        get :sso_login, params: Rack::Utils.parse_query(@sso.payload)
 
         logged_on_user = Discourse.current_user_provider.new(request.env).current_user
         expect(logged_on_user.username).to eq(@suggested_username)
@@ -378,7 +399,7 @@ describe SessionController do
         @sso.name = @user.name
         @sso.email = @user.email
 
-        get :sso_login, Rack::Utils.parse_query(@sso.payload)
+        get :sso_login, params: Rack::Utils.parse_query(@sso.payload)
 
         logged_on_user = Discourse.current_user_provider.new(request.env).current_user
         expect(logged_on_user.username).to eq(@user.username)
@@ -401,17 +422,20 @@ describe SessionController do
       @sso.sso_secret = SiteSetting.sso_secret
       @sso.return_sso_url = "http://somewhere.over.rainbow/sso"
 
-      @user = Fabricate(:user, password: "frogs", active: true, admin: true)
+      @user = Fabricate(:user, password: "myfrogs123ADMIN", active: true, admin: true)
       EmailToken.update_all(confirmed: true)
     end
 
     it "successfully logs in and redirects user to return_sso_url when the user is not logged in" do
-      get :sso_provider, Rack::Utils.parse_query(@sso.payload)
+      get :sso_provider, params: Rack::Utils.parse_query(@sso.payload)
       expect(response).to redirect_to("/login")
 
-      xhr :post, :create, login: @user.username, password: "frogs", format: :json
+      post :create,
+        params: { login: @user.username, password: "myfrogs123ADMIN" },
+        format: :json,
+        xhr: true
 
-      location = cookies[:sso_destination_url]
+      location = response.cookies["sso_destination_url"]
       # javascript code will handle redirection of user to return_sso_url
       expect(location).to match(/^http:\/\/somewhere.over.rainbow\/sso/)
 
@@ -429,7 +453,7 @@ describe SessionController do
     it "successfully redirects user to return_sso_url when the user is logged in" do
       log_in_user(@user)
 
-      get :sso_provider, Rack::Utils.parse_query(@sso.payload)
+      get :sso_provider, params: Rack::Utils.parse_query(@sso.payload)
 
       location = response.header["Location"]
       expect(location).to match(/^http:\/\/somewhere.over.rainbow\/sso/)
@@ -450,6 +474,29 @@ describe SessionController do
 
     let(:user) { Fabricate(:user) }
 
+    context 'local login is disabled' do
+      before do
+        SiteSetting.enable_local_logins = false
+
+        post :create, params: {
+          login: user.username, password: 'myawesomepassword'
+        }, format: :json
+      end
+      it_behaves_like "failed to continue local login"
+    end
+
+    context 'SSO is enabled' do
+      before do
+        SiteSetting.sso_url = "https://www.example.com/sso"
+        SiteSetting.enable_sso = true
+
+        post :create, params: {
+          login: user.username, password: 'myawesomepassword'
+        }, format: :json
+      end
+      it_behaves_like "failed to continue local login"
+    end
+
     context 'when email is confirmed' do
       before do
         token = user.email_tokens.find_by(email: user.email)
@@ -457,12 +504,17 @@ describe SessionController do
       end
 
       it "raises an error when the login isn't present" do
-        expect { xhr :post, :create }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          post :create, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       describe 'invalid password' do
         it "should return an error with an invalid password" do
-          xhr :post, :create, login: user.username, password: 'sssss'
+          post :create, params: {
+            login: user.username, password: 'sssss'
+          }, format: :json
+
           expect(::JSON.parse(response.body)['error']).to be_present
         end
       end
@@ -470,7 +522,10 @@ describe SessionController do
       describe 'invalid password' do
         it "should return an error with an invalid password if too long" do
           User.any_instance.expects(:confirm_password?).never
-          xhr :post, :create, login: user.username, password: ('s' * (User.max_password_length + 1))
+          post :create, params: {
+            login: user.username, password: ('s' * (User.max_password_length + 1))
+          }, format: :json
+
           expect(::JSON.parse(response.body)['error']).to be_present
         end
       end
@@ -481,7 +536,9 @@ describe SessionController do
           user.suspended_at = Time.now
           user.save!
           StaffActionLogger.new(user).log_user_suspend(user, "<strike>banned</strike>")
-          xhr :post, :create, login: user.username, password: 'myawesomepassword'
+          post :create, params: {
+            login: user.username, password: 'myawesomepassword'
+          }, format: :json
 
           error = ::JSON.parse(response.body)['error']
           expect(error).to be_present
@@ -493,14 +550,26 @@ describe SessionController do
       describe 'deactivated user' do
         it 'should return an error' do
           User.any_instance.stubs(:active).returns(false)
-          xhr :post, :create, login: user.username, password: 'myawesomepassword'
+
+          post :create, params: {
+            login: user.username, password: 'myawesomepassword'
+          }, format: :json
+
           expect(JSON.parse(response.body)['error']).to eq(I18n.t('login.not_activated'))
         end
       end
 
       describe 'success by username' do
         it 'logs in correctly' do
-          xhr :post, :create, login: user.username, password: 'myawesomepassword'
+          events = DiscourseEvent.track_events do
+            post :create, params: {
+              login: user.username, password: 'myawesomepassword'
+            }, format: :json
+          end
+
+          expect(events.map { |event| event[:event_name] }).to include(
+            :user_logged_in, :user_first_logged_in
+          )
 
           user.reload
 
@@ -510,19 +579,14 @@ describe SessionController do
         end
       end
 
-      describe 'local logins disabled' do
-        it 'fails' do
-          SiteSetting.stubs(:enable_local_logins).returns(false)
-          xhr :post, :create, login: user.username, password: 'myawesomepassword'
-          expect(response.status.to_i).to eq(500)
-        end
-      end
-
       describe 'with a blocked IP' do
         before do
           screened_ip = Fabricate(:screened_ip_address)
           ActionDispatch::Request.any_instance.stubs(:remote_ip).returns(screened_ip.ip_address)
-          xhr :post, :create, login: "@" + user.username, password: 'myawesomepassword'
+          post :create, params: {
+            login: "@" + user.username, password: 'myawesomepassword'
+          }, format: :json
+
           user.reload
         end
 
@@ -533,7 +597,10 @@ describe SessionController do
 
       describe 'strips leading @ symbol' do
         before do
-          xhr :post, :create, login: "@" + user.username, password: 'myawesomepassword'
+          post :create, params: {
+            login: "@" + user.username, password: 'myawesomepassword'
+          }, format: :json
+
           user.reload
         end
 
@@ -544,7 +611,9 @@ describe SessionController do
 
       describe 'also allow login by email' do
         before do
-          xhr :post, :create, login: user.email, password: 'myawesomepassword'
+          post :create, params: {
+            login: user.email, password: 'myawesomepassword'
+          }, format: :json
         end
 
         it 'sets a session id' do
@@ -557,12 +626,18 @@ describe SessionController do
         let(:email) { " #{user.email} " }
 
         it "strips spaces from the username" do
-          xhr :post, :create, login: username, password: 'myawesomepassword'
+          post :create, params: {
+            login: username, password: 'myawesomepassword'
+          }, format: :json
+
           expect(::JSON.parse(response.body)['error']).not_to be_present
         end
 
         it "strips spaces from the email" do
-          xhr :post, :create, login: email, password: 'myawesomepassword'
+          post :create, params: {
+            login: email, password: 'myawesomepassword'
+          }, format: :json
+
           expect(::JSON.parse(response.body)['error']).not_to be_present
         end
       end
@@ -574,7 +649,9 @@ describe SessionController do
 
         context 'with an unapproved user' do
           before do
-            xhr :post, :create, login: user.email, password: 'myawesomepassword'
+            post :create, params: {
+              login: user.email, password: 'myawesomepassword'
+            }, format: :json
           end
 
           it "doesn't log in the user" do
@@ -591,7 +668,10 @@ describe SessionController do
         context "with an unapproved user who is an admin" do
           before do
             User.any_instance.stubs(:admin?).returns(true)
-            xhr :post, :create, login: user.email, password: 'myawesomepassword'
+
+            post :create, params: {
+              login: user.email, password: 'myawesomepassword'
+            }, format: :json
           end
 
           it 'sets a session id' do
@@ -604,20 +684,28 @@ 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
           User.any_instance.stubs(:admin?).returns(true)
           ActionDispatch::Request.any_instance.stubs(:remote_ip).returns(permitted_ip_address)
-          xhr :post, :create, login: user.username, password: 'myawesomepassword'
+
+          post :create, params: {
+            login: user.username, password: 'myawesomepassword'
+          }, format: :json
+
           expect(session[:current_user_id]).to eq(user.id)
         end
 
         it 'returns an error for admin not at the ip address' do
           User.any_instance.stubs(:admin?).returns(true)
           ActionDispatch::Request.any_instance.stubs(:remote_ip).returns("111.234.23.12")
-          xhr :post, :create, login: user.username, password: 'myawesomepassword'
+
+          post :create, params: {
+            login: user.username, password: 'myawesomepassword'
+          }, format: :json
+
           expect(JSON.parse(response.body)['error']).to be_present
           expect(session[:current_user_id]).not_to eq(user.id)
         end
@@ -625,7 +713,11 @@ describe SessionController do
         it 'is successful for non-admin not at the ip address' do
           User.any_instance.stubs(:admin?).returns(false)
           ActionDispatch::Request.any_instance.stubs(:remote_ip).returns("111.234.23.12")
-          xhr :post, :create, login: user.username, password: 'myawesomepassword'
+
+          post :create, params: {
+            login: user.username, password: 'myawesomepassword'
+          }, format: :json
+
           expect(session[:current_user_id]).to eq(user.id)
         end
       end
@@ -633,7 +725,9 @@ describe SessionController do
 
     context 'when email has not been confirmed' do
       def post_login
-        xhr :post, :create, login: user.email, password: 'myawesomepassword'
+        post :create, params: {
+          login: user.email, password: 'myawesomepassword'
+        }, format: :json
       end
 
       it "doesn't log in the user" do
@@ -663,14 +757,21 @@ describe SessionController do
     context 'rate limited' do
       it 'rate limits login' do
         SiteSetting.max_logins_per_ip_per_hour = 2
-        RateLimiter.stubs(:disabled?).returns(false)
+        RateLimiter.enable
         RateLimiter.clear_all!
 
         2.times do
-          xhr :post, :create, login: user.username, password: 'myawesomepassword'
+          post :create, params: {
+            login: user.username, password: 'myawesomepassword'
+          }, format: :json
+
           expect(response).to be_success
         end
-        xhr :post, :create, login: user.username, password: 'myawesomepassword'
+
+        post :create, params: {
+          login: user.username, password: 'myawesomepassword'
+        }, format: :json
+
         expect(response).not_to be_success
         json = JSON.parse(response.body)
         expect(json["error_type"]).to eq("rate_limit")
@@ -681,52 +782,71 @@ describe SessionController do
   describe '.destroy' do
     before do
       @user = log_in
-      xhr :delete, :destroy, id: @user.username
+      delete :destroy, params: { id: @user.username }, format: :json
     end
 
     it 'removes the session variable' do
       expect(session[:current_user_id]).to be_blank
     end
 
-
     it 'removes the auth token cookie' do
-      expect(cookies[:_t]).to be_blank
+      expect(response.cookies["_t"]).to be_blank
     end
   end
 
   describe '.forgot_password' do
 
     it 'raises an error without a username parameter' do
-      expect { xhr :post, :forgot_password }.to raise_error(ActionController::ParameterMissing)
+      expect do
+        post :forgot_password, format: :json
+      end.to raise_error(ActionController::ParameterMissing)
     end
 
     context 'for a non existant username' do
       it "doesn't generate a new token for a made up username" do
-        expect { xhr :post, :forgot_password, login: 'made_up'}.not_to change(EmailToken, :count)
+        expect do
+          post :forgot_password, params: { login: 'made_up' }, format: :json
+        end.not_to change(EmailToken, :count)
       end
 
       it "doesn't enqueue an email" do
         Jobs.expects(:enqueue).with(:user_mail, anything).never
-        xhr :post, :forgot_password, login: 'made_up'
+        post :forgot_password, params: { login: 'made_up' }, format: :json
       end
     end
 
     context 'for an existing username' do
       let(:user) { Fabricate(:user) }
 
-      it "returns a 500 if local logins are disabled" do
-        SiteSetting.enable_local_logins = false
-        xhr :post, :forgot_password, login: user.username
-        expect(response.code.to_i).to eq(500)
+      context 'local login is disabled' do
+        before do
+          SiteSetting.enable_local_logins = false
+          post :forgot_password, params: { login: user.username }, format: :json
+        end
+        it_behaves_like "failed to continue local login"
+      end
+
+      context 'SSO is enabled' do
+        before do
+          SiteSetting.sso_url = "https://www.example.com/sso"
+          SiteSetting.enable_sso = true
+
+          post :create, params: {
+            login: user.username, password: 'myawesomepassword'
+          }, format: :json
+        end
+        it_behaves_like "failed to continue local login"
       end
 
       it "generates a new token for a made up username" do
-        expect { xhr :post, :forgot_password, login: user.username}.to change(EmailToken, :count)
+        expect do
+          post :forgot_password, params: { login: user.username }, format: :json
+        end.to change(EmailToken, :count)
       end
 
       it "enqueues an email" do
         Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :forgot_password, user_id: user.id))
-        xhr :post, :forgot_password, login: user.username
+        post :forgot_password, params: { login: user.username }, format: :json
       end
     end
 
@@ -734,12 +854,14 @@ describe SessionController do
       let(:system) { Discourse.system_user }
 
       it 'generates no token for system username' do
-        expect { xhr :post, :forgot_password, login: system.username}.not_to change(EmailToken, :count)
+        expect do
+          post :forgot_password, params: { login: system.username }, format: :json
+        end.not_to change(EmailToken, :count)
       end
 
       it 'enqueues no email' do
         Jobs.expects(:enqueue).never
-        xhr :post, :forgot_password, login: system.username
+        post :forgot_password, params: { login: system.username }, format: :json
       end
     end
 
@@ -747,12 +869,14 @@ describe SessionController do
       let!(:staged) { Fabricate(:staged) }
 
       it 'generates no token for staged username' do
-        expect { xhr :post, :forgot_password, login: staged.username}.not_to change(EmailToken, :count)
+        expect do
+          post :forgot_password, params: { login: staged.username }, format: :json
+        end.not_to change(EmailToken, :count)
       end
 
       it 'enqueues no email' do
         Jobs.expects(:enqueue).never
-        xhr :post, :forgot_password, login: staged.username
+        post :forgot_password, params: { login: staged.username }, format: :json
       end
     end
   end
@@ -760,7 +884,7 @@ describe SessionController do
   describe '.current' do
     context "when not logged in" do
       it "retuns 404" do
-        xhr :get, :current
+        get :current, format: :json
         expect(response).not_to be_success
       end
     end
@@ -769,7 +893,7 @@ describe SessionController do
       let!(:user) { log_in }
 
       it "returns the JSON for the user" do
-        xhr :get, :current
+        get :current, format: :json
         expect(response).to be_success
         json = ::JSON.parse(response.body)
         expect(json['current_user']).to be_present
diff --git a/spec/controllers/similar_topics_controller_spec.rb b/spec/controllers/similar_topics_controller_spec.rb
index 93dfa5ef9e..f7dad39562 100644
--- a/spec/controllers/similar_topics_controller_spec.rb
+++ b/spec/controllers/similar_topics_controller_spec.rb
@@ -7,25 +7,15 @@ describe SimilarTopicsController do
     let(:raw) { 'this body is long enough to search for' }
 
     it "requires a title" do
-      expect { xhr :get, :index, raw: raw }.to raise_error(ActionController::ParameterMissing)
-    end
-
-    it "requires a raw body" do
-      expect { xhr :get, :index, title: title }.to raise_error(ActionController::ParameterMissing)
+      expect do
+        get :index, params: { raw: raw }, format: :json
+      end.to raise_error(ActionController::ParameterMissing)
     end
 
     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)
-      xhr :get, :index, title: title, raw: raw
-      json = ::JSON.parse(response.body)
-      expect(json["similar_topics"].size).to eq(0)
-    end
-
-    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)
-      xhr :get, :index, title: title, raw: raw
+      SiteSetting.min_title_similar_length = 100
+      get :index, params: { title: title, raw: raw }, format: :json
       json = ::JSON.parse(response.body)
       expect(json["similar_topics"].size).to eq(0)
     end
@@ -33,11 +23,11 @@ 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
-        xhr :get, :index, title: title, raw: raw
+        get :index, params: { title: title, raw: raw }, format: :json
       end
 
       describe "With enough topics" do
@@ -69,4 +59,3 @@ describe SimilarTopicsController do
   end
 
 end
-
diff --git a/spec/controllers/site_controller_spec.rb b/spec/controllers/site_controller_spec.rb
index 1dccba86ad..c36a79589c 100644
--- a/spec/controllers/site_controller_spec.rb
+++ b/spec/controllers/site_controller_spec.rb
@@ -7,13 +7,13 @@ describe SiteController do
       SiteSetting.login_required = true
 
       SiteSetting.title = "Hammer Time"
-      SiteSetting.site_description= "A time for Hammer"
+      SiteSetting.site_description = "A time for Hammer"
       SiteSetting.logo_url = "/uploads/logo.png"
       SiteSetting.logo_small_url = "http://boom.com/uploads/logo_small.png"
       SiteSetting.apple_touch_icon_url = "https://boom.com/apple/logo.png"
       SiteSetting.mobile_logo_url = "https://a.a/a.png"
 
-      xhr :get, :basic_info
+      get :basic_info, format: :json
       json = JSON.parse(response.body)
 
       expect(json["title"]).to eq("Hammer Time")
@@ -31,7 +31,7 @@ describe SiteController do
       SiteSetting.login_required = true
       SiteSetting.share_anonymized_statistics = true
 
-      xhr :get, :statistics
+      get :statistics, format: :json
       json = JSON.parse(response.body)
 
       expect(response).to be_success
@@ -54,7 +54,7 @@ describe SiteController do
     it 'is not visible if site setting share_anonymized_statistics is disabled' do
       SiteSetting.share_anonymized_statistics = false
 
-      xhr :get, :statistics
+      get :statistics, format: :json
       expect(response).to redirect_to '/'
     end
   end
diff --git a/spec/controllers/static_controller_spec.rb b/spec/controllers/static_controller_spec.rb
deleted file mode 100644
index fba85ae8c1..0000000000
--- a/spec/controllers/static_controller_spec.rb
+++ /dev/null
@@ -1,201 +0,0 @@
-require 'rails_helper'
-
-describe StaticController do
-
-  context 'brotli_asset' do
-    it 'returns a non brotli encoded 404 if asset is missing' do
-
-        get :brotli_asset, path: 'missing.js'
-
-        expect(response.status).to eq(404)
-        expect(response.headers['Content-Encoding']).not_to eq('br')
-        expect(response.headers["Cache-Control"]).to match(/max-age=1/)
-    end
-
-    it 'can handle fallback brotli assets' do
-      begin
-        assets_path = Rails.root.join("tmp/backup_assets")
-
-        GlobalSetting.stubs(:fallback_assets_path).returns(assets_path.to_s)
-
-        FileUtils.mkdir_p(assets_path)
-
-        file_path = assets_path.join("test.js.br")
-        File.write(file_path, 'fake brotli file')
-
-        get :brotli_asset, path: 'test.js'
-
-        expect(response.status).to eq(200)
-        expect(response.headers["Cache-Control"]).to match(/public/)
-      ensure
-        File.delete(file_path)
-      end
-    end
-
-    it 'has correct headers for brotli assets' do
-      begin
-        assets_path = Rails.root.join("public/assets")
-
-        FileUtils.mkdir_p(assets_path)
-
-        file_path = assets_path.join("test.js.br")
-        File.write(file_path, 'fake brotli file')
-
-        get :brotli_asset, path: 'test.js'
-
-        expect(response.status).to eq(200)
-        expect(response.headers["Cache-Control"]).to match(/public/)
-      ensure
-        File.delete(file_path)
-      end
-    end
-  end
-
-  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)
-    end
-
-    context "with a static file that's present" do
-
-      before do
-        xhr :get, :show, id: 'faq'
-      end
-
-      it 'renders the static file if present' do
-        expect(response).to be_success
-      end
-
-      it "renders the file" do
-        expect(response).to render_template('static/show')
-        expect(assigns(:page)).to eq('faq')
-      end
-    end
-
-    [ ['tos', :tos_url], ['privacy', :privacy_policy_url] ].each do |id, setting_name|
-      context "#{id}" do
-        subject { xhr :get, :show, id: id }
-
-        context "when #{setting_name} site setting is NOT set" do
-          it "renders the #{id} page" do
-            expect(subject).to render_template("static/show")
-            expect(assigns(:page)).to eq(id)
-          end
-        end
-
-        context "when #{setting_name} site setting is set" do
-          before  { SiteSetting.stubs(setting_name).returns('http://example.com/page') }
-
-          it "redirects to the #{setting_name}" do
-            expect(subject).to redirect_to('http://example.com/page')
-          end
-        end
-      end
-    end
-
-    context "with a missing file" do
-      it "should respond 404" do
-        xhr :get, :show, id: 'does-not-exist'
-        expect(response.response_code).to eq(404)
-      end
-    end
-
-    it 'should redirect to / when logged in and path is /login' do
-      log_in
-      xhr :get, :show, id: 'login'
-      expect(response).to redirect_to '/'
-    end
-
-    it "should display the login template when login is required" do
-      SiteSetting.stubs(:login_required).returns(true)
-      xhr :get, :show, id: 'login'
-      expect(response).to be_success
-    end
-
-    context "when login_required is enabled" do
-      before do
-        SiteSetting.login_required = true
-      end
-
-      it 'faq page redirects to login page for anon' do
-        xhr :get, :show, id: 'faq'
-        expect(response).to redirect_to '/login'
-      end
-
-      it 'guidelines page redirects to login page for anon' do
-        xhr :get, :show, id: 'guidelines'
-        expect(response).to redirect_to '/login'
-      end
-
-      it 'faq page loads for logged in user' do
-        log_in
-        xhr :get, :show, id: 'faq'
-        expect(response).to be_success
-        expect(response).to render_template('static/show')
-        expect(assigns(:page)).to eq('faq')
-      end
-
-      it 'guidelines page loads for logged in user' do
-        log_in
-        xhr :get, :show, id: 'guidelines'
-        expect(response).to be_success
-        expect(response).to render_template('static/show')
-        expect(assigns(:page)).to eq('faq')
-      end
-    end
-  end
-
-  describe '#enter' do
-    context 'without a redirect path' do
-      it 'redirects to the root url' do
-        xhr :post, :enter
-        expect(response).to redirect_to '/'
-      end
-    end
-
-    context 'with a redirect path' do
-      it 'redirects to the redirect path' do
-        xhr :post, :enter, redirect: '/foo'
-        expect(response).to redirect_to '/foo'
-      end
-    end
-
-    context 'with a full url' do
-      it 'redirects to the correct path' do
-        xhr :post, :enter, redirect: "#{Discourse.base_url}/foo"
-        expect(response).to redirect_to '/foo'
-      end
-    end
-
-    context 'with a period to force a new host' do
-      it 'redirects to the root path' do
-        xhr :post, :enter, redirect: ".org/foo"
-        expect(response).to redirect_to '/'
-      end
-    end
-
-    context 'with a full url to someone else' do
-      it 'redirects to the root path' do
-        xhr :post, :enter, redirect: "http://eviltrout.com/foo"
-        expect(response).to redirect_to '/'
-      end
-    end
-
-    context 'with an invalid URL' do
-      it "redirects to the root" do
-        xhr :post, :enter, redirect: "javascript:alert('trout')"
-        expect(response).to redirect_to '/'
-      end
-    end
-
-    context 'when the redirect path is the login page' do
-      it 'redirects to the root url' do
-        xhr :post, :enter, redirect: login_path
-        expect(response).to redirect_to '/'
-      end
-    end
-  end
-end
diff --git a/spec/controllers/steps_controller_spec.rb b/spec/controllers/steps_controller_spec.rb
index 50bafc95fb..50a31a28d2 100644
--- a/spec/controllers/steps_controller_spec.rb
+++ b/spec/controllers/steps_controller_spec.rb
@@ -7,14 +7,20 @@ describe StepsController do
   end
 
   it 'needs you to be logged in' do
-    expect {
-      xhr :put, :update, id: 'made-up-id', fields: { forum_title: "updated title" }
-    }.to raise_error(Discourse::NotLoggedIn)
+    expect do
+      put :update, params: {
+        id: 'made-up-id', fields: { forum_title: "updated title" }
+      }, format: :json
+    end.to raise_error(Discourse::NotLoggedIn)
   end
 
   it "raises an error if you aren't an admin" do
     log_in(:moderator)
-    xhr :put, :update, id: 'made-up-id', fields: { forum_title: "updated title" }
+
+    put :update, params: {
+      id: 'made-up-id', fields: { forum_title: "updated title" }
+    }, format: :json
+
     expect(response).to be_forbidden
   end
 
@@ -25,21 +31,28 @@ describe StepsController do
 
     it "raises an error if the wizard is disabled" do
       SiteSetting.wizard_enabled = false
-      xhr :put, :update, id: 'contact', fields: { contact_email: "eviltrout@example.com" }
+      put :update, params: {
+        id: 'contact', fields: { contact_email: "eviltrout@example.com" }
+      }, format: :json
       expect(response).to be_forbidden
     end
 
     it "updates properly if you are staff" do
-      xhr :put, :update, id: 'contact', fields: { contact_email: "eviltrout@example.com" }
+      put :update, params: {
+        id: 'contact', fields: { contact_email: "eviltrout@example.com" }
+      }, format: :json
+
       expect(response).to be_success
       expect(SiteSetting.contact_email).to eq("eviltrout@example.com")
     end
 
     it "returns errors if the field has them" do
-      xhr :put, :update, id: 'contact', fields: { contact_email: "not-an-email" }
+      put :update, params: {
+        id: 'contact', fields: { contact_email: "not-an-email" }
+      }, format: :json
+
       expect(response).to_not be_success
     end
   end
 
 end
-
diff --git a/spec/controllers/stylesheets_controller_spec.rb b/spec/controllers/stylesheets_controller_spec.rb
index 8f18d2b2d5..a68ccc62be 100644
--- a/spec/controllers/stylesheets_controller_spec.rb
+++ b/spec/controllers/stylesheets_controller_spec.rb
@@ -11,7 +11,7 @@ describe StylesheetsController do
     digest = StylesheetCache.first.digest
     StylesheetCache.destroy_all
 
-    get :show, name: "desktop_rtl_#{digest}"
+    get :show, params: { name: "desktop_rtl_#{digest}" }, format: :json
     expect(response).to be_success
 
     cached = StylesheetCache.first
@@ -21,7 +21,7 @@ describe StylesheetsController do
     # tmp folder destruction and cached
     `rm #{Stylesheet::Manager.cache_fullpath}/*`
 
-    get :show, name: "desktop_rtl_#{digest}"
+    get :show, params: { name: "desktop_rtl_#{digest}" }, format: :json
     expect(response).to be_success
 
     # there is an edge case which is ... disk and db cache is nuked, very unlikely to happen
@@ -29,7 +29,7 @@ describe StylesheetsController do
   end
 
   it 'can lookup theme specific css' do
-    scheme = ColorScheme.create_from_base({name: "testing", colors: []})
+    scheme = ColorScheme.create_from_base(name: "testing", colors: [])
     theme = Theme.create!(name: "test", color_scheme_id: scheme.id, user_id: -1)
 
     builder = Stylesheet::Manager.new(:desktop, theme.key)
@@ -37,10 +37,16 @@ describe StylesheetsController do
 
     `rm #{Stylesheet::Manager.cache_fullpath}/*`
 
-    get :show, name: builder.stylesheet_filename.sub(".css", "")
+    get :show, params: {
+      name: builder.stylesheet_filename.sub(".css", "")
+    }, format: :json
+
     expect(response).to be_success
 
-    get :show, name: builder.stylesheet_filename_no_digest.sub(".css", "")
+    get :show, params: {
+      name: builder.stylesheet_filename_no_digest.sub(".css", "")
+    }, format: :json
+
     expect(response).to be_success
 
     builder = Stylesheet::Manager.new(:desktop_theme, theme.key)
@@ -48,10 +54,16 @@ describe StylesheetsController do
 
     `rm #{Stylesheet::Manager.cache_fullpath}/*`
 
-    get :show, name: builder.stylesheet_filename.sub(".css", "")
+    get :show, params: {
+      name: builder.stylesheet_filename.sub(".css", "")
+    }, format: :json
+
     expect(response).to be_success
 
-    get :show, name: builder.stylesheet_filename_no_digest.sub(".css", "")
+    get :show, params: {
+      name: builder.stylesheet_filename_no_digest.sub(".css", "")
+    }, format: :json
+
     expect(response).to be_success
   end
 
diff --git a/spec/controllers/tags_controller_spec.rb b/spec/controllers/tags_controller_spec.rb
index fcfcdb754d..62c8c55d5a 100644
--- a/spec/controllers/tags_controller_spec.rb
+++ b/spec/controllers/tags_controller_spec.rb
@@ -14,7 +14,7 @@ describe TagsController do
 
     context 'tagging disabled' do
       it "returns 404" do
-        xhr :get, :show_latest, tag_id: tag.name
+        get :show_latest, params: { tag_id: tag.name }, format: :json
         expect(response.status).to eq(404)
       end
     end
@@ -25,47 +25,80 @@ describe TagsController do
       end
 
       it "can filter by tag" do
-        xhr :get, :show_latest, tag_id: tag.name
+        get :show_latest, params: { tag_id: tag.name }, format: :json
         expect(response).to be_success
       end
 
       it "can filter by two tags" do
         single_tag_topic; multi_tag_topic; all_tag_topic
-        xhr :get, :show_latest, tag_id: tag.name, additional_tag_ids: other_tag.name
+
+        get :show_latest, params: {
+          tag_id: tag.name, additional_tag_ids: other_tag.name
+        }, format: :json
+
         expect(response).to be_success
-        expect(assigns(:list).topics).to include all_tag_topic
-        expect(assigns(:list).topics).to include multi_tag_topic
-        expect(assigns(:list).topics).to_not include single_tag_topic
+
+        topic_ids = JSON.parse(response.body)["topic_list"]["topics"]
+          .map { |topic| topic["id"] }
+
+        expect(topic_ids).to include(all_tag_topic.id)
+        expect(topic_ids).to include(multi_tag_topic.id)
+        expect(topic_ids).to_not include(single_tag_topic.id)
       end
 
       it "can filter by multiple tags" do
         single_tag_topic; multi_tag_topic; all_tag_topic
-        xhr :get, :show_latest, tag_id: tag.name, additional_tag_ids: "#{other_tag.name}/#{third_tag.name}"
+
+        get :show_latest, params: {
+          tag_id: tag.name, additional_tag_ids: "#{other_tag.name}/#{third_tag.name}"
+        }, format: :json
+
         expect(response).to be_success
-        expect(assigns(:list).topics).to include all_tag_topic
-        expect(assigns(:list).topics).to_not include multi_tag_topic
-        expect(assigns(:list).topics).to_not include single_tag_topic
+
+        topic_ids = JSON.parse(response.body)["topic_list"]["topics"]
+          .map { |topic| topic["id"] }
+
+        expect(topic_ids).to include(all_tag_topic.id)
+        expect(topic_ids).to_not include(multi_tag_topic.id)
+        expect(topic_ids).to_not include(single_tag_topic.id)
       end
 
       it "does not find any tags when a tag which doesn't exist is passed" do
         single_tag_topic
-        xhr :get, :show_latest, tag_id: tag.name, additional_tag_ids: "notatag"
+
+        get :show_latest, params: {
+          tag_id: tag.name, additional_tag_ids: "notatag"
+        }, format: :json
+
         expect(response).to be_success
-        expect(assigns(:list).topics).to_not include single_tag_topic
+
+        topic_ids = JSON.parse(response.body)["topic_list"]["topics"]
+          .map { |topic| topic["id"] }
+
+        expect(topic_ids).to_not include(single_tag_topic.id)
       end
 
       it "can filter by category and tag" do
-        xhr :get, :show_latest, tag_id: tag.name, category: category.slug
+        get :show_latest, params: {
+          tag_id: tag.name, category: category.slug
+        }, format: :json
+
         expect(response).to be_success
       end
 
       it "can filter by category, sub-category, and tag" do
-        xhr :get, :show_latest, tag_id: tag.name, category: subcategory.slug, parent_category: category.slug
+        get :show_latest, params: {
+          tag_id: tag.name, category: subcategory.slug, parent_category: category.slug
+        }, format: :json
+
         expect(response).to be_success
       end
 
       it "can filter by category, no sub-category, and tag" do
-        xhr :get, :show_latest, tag_id: tag.name, category: 'none', parent_category: category.slug
+        get :show_latest, params: {
+          tag_id: tag.name, category: 'none', parent_category: category.slug
+        }, format: :json
+
         expect(response).to be_success
       end
 
@@ -77,14 +110,24 @@ describe TagsController do
           slug: subcategory.slug
         )
         t = Fabricate(:topic, category_id: subcategory2.id, tags: [other_tag])
-        xhr :get, :show_latest, tag_id: other_tag.name, category: subcategory2.slug, parent_category: category2.slug
+        get :show_latest, params: {
+          tag_id: other_tag.name, category: subcategory2.slug, parent_category: category2.slug
+        }, format: :json
+
         expect(response).to be_success
-        expect(assigns(:list).topics).to include(t)
+
+        topic_ids = JSON.parse(response.body)["topic_list"]["topics"]
+          .map { |topic| topic["id"] }
+
+        expect(topic_ids).to include(t.id)
       end
 
       it "can filter by bookmarked" do
         log_in(:user)
-        xhr :get, :show_bookmarks, tag_id: tag.name
+        get :show_bookmarks, params: {
+          tag_id: tag.name
+        }, format: :json
+
         expect(response).to be_success
       end
     end
@@ -93,7 +136,7 @@ describe TagsController do
   describe 'search' do
     context 'tagging disabled' do
       it "returns 404" do
-        xhr :get, :search, q: 'stuff'
+        get :search, params: { q: 'stuff' }, format: :json
         expect(response.status).to eq(404)
       end
     end
@@ -106,29 +149,70 @@ describe TagsController do
       it "can return some tags" do
         tag_names = ['stuff', 'stinky', 'stumped']
         tag_names.each { |name| Fabricate(:tag, name: name) }
-        xhr :get, :search, q: 'stu'
+        get :search, params: { q: 'stu' }, format: :json
         expect(response).to be_success
         json = ::JSON.parse(response.body)
-        expect(json["results"].map{|j| j["id"]}.sort).to eq(['stuff', 'stumped'])
+        expect(json["results"].map { |j| j["id"] }.sort).to eq(['stuff', 'stumped'])
       end
 
       it "can say if given tag is not allowed" do
         yup, nope = Fabricate(:tag, name: 'yup'), Fabricate(:tag, name: 'nope')
         category = Fabricate(:category, tags: [yup])
-        xhr :get, :search, q: 'nope', categoryId: category.id
+        get :search, params: { q: 'nope', categoryId: category.id }, format: :json
         expect(response).to be_success
         json = ::JSON.parse(response.body)
-        expect(json["results"].map{|j| j["id"]}.sort).to eq([])
+        expect(json["results"].map { |j| j["id"] }.sort).to eq([])
         expect(json["forbidden"]).to be_present
       end
 
       it "can return tags that are in secured categories but are allowed to be used" do
         c = Fabricate(:private_category, group: Fabricate(:group))
         Fabricate(:topic, category: c, tags: [Fabricate(:tag, name: "cooltag")])
-        xhr :get, :search, q: "cool"
+        get :search, params: { q: "cool" }, format: :json
         expect(response).to be_success
         json = ::JSON.parse(response.body)
-        expect(json["results"].map{|j| j["id"]}).to eq(['cooltag'])
+        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) }
+
+        get :search, params: { q: '房' }, format: :json
+        expect(response).to be_success
+        json = ::JSON.parse(response.body)
+        expect(json["results"].map { |j| j["id"] }).to eq(['房地产'])
+
+        get :search, params: { q: 'тема' }, format: :json
+        expect(response).to be_success
+        json = ::JSON.parse(response.body)
+        expect(json["results"].map { |j| j["id"] }).to eq(['тема-в-разработке'])
+      end
+    end
+  end
+
+  describe 'destroy' do
+    context 'tagging enabled' do
+      before do
+        log_in(:admin)
+        SiteSetting.tagging_enabled = true
+      end
+
+      context 'with an existent tag name' do
+        it 'deletes the tag' do
+          tag = Fabricate(:tag)
+          delete :destroy, params: { tag_id: tag.name }, format: :json
+          expect(response).to be_success
+        end
+      end
+
+      context 'with a nonexistent tag name' do
+        it 'returns a tag not found message' do
+          delete :destroy, params: { tag_id: 'idontexist' }, format: :json
+          expect(response).not_to be_success
+          json = ::JSON.parse(response.body)
+          expect(json['error_type']).to eq('not_found')
+        end
       end
     end
   end
diff --git a/spec/controllers/topic_controller_spec.rb b/spec/controllers/topic_controller_spec.rb
new file mode 100644
index 0000000000..6be013eb88
--- /dev/null
+++ b/spec/controllers/topic_controller_spec.rb
@@ -0,0 +1,396 @@
+require 'rails_helper'
+
+describe TopicsController do
+  before do
+    TopicUser.stubs(:track_visit!)
+  end
+
+  let :topic do
+    Fabricate(:post).topic
+  end
+
+  def set_referer(ref)
+    request.env['HTTP_REFERER'] = ref
+  end
+
+  def set_accept_language(locale)
+    request.env['HTTP_ACCEPT_LANGUAGE'] = locale
+  end
+
+  describe "themes" do
+    let :theme do
+      Theme.create!(user_id: -1, name: 'bob', user_selectable: true)
+    end
+
+    let :theme2 do
+      Theme.create!(user_id: -1, name: 'bobbob', user_selectable: true)
+    end
+
+    it "selects the theme the user has selected" do
+      user = log_in
+      user.user_option.update_columns(theme_key: theme.key)
+
+      get :show, params: { id: 666 }
+      expect(controller.theme_key).to eq(theme.key)
+
+      theme.update_columns(user_selectable: false)
+
+      get :show, params: { id: 666 }
+      expect(controller.theme_key).not_to eq(theme.key)
+    end
+
+    it "can be overridden with a cookie" do
+      user = log_in
+      user.user_option.update_columns(theme_key: theme.key)
+
+      cookies['theme_key'] = "#{theme2.key},#{user.user_option.theme_key_seq}"
+
+      get :show, params: { id: 666 }
+      expect(controller.theme_key).to eq(theme2.key)
+
+    end
+
+    it "cookie can fail back to user if out of sync" do
+      user = log_in
+      user.user_option.update_columns(theme_key: theme.key)
+      cookies['theme_key'] = "#{theme2.key},#{user.user_option.theme_key_seq - 1}"
+
+      get :show, params: { id: 666 }
+      expect(controller.theme_key).to eq(theme.key)
+    end
+  end
+
+  it "doesn't store an incoming link when there's no referer" do
+    expect {
+      get :show, params: { id: topic.id }, format: :json
+    }.not_to change(IncomingLink, :count)
+  end
+
+  it "doesn't raise an error on a very long link" do
+    set_referer("http://#{'a' * 2000}.com")
+
+    expect do
+      get :show, params: { id: topic.id }, format: :json
+    end.not_to raise_error
+  end
+
+  describe "has_escaped_fragment?" do
+    render_views
+
+    context "when the SiteSetting is disabled" do
+
+      it "uses the application layout even with an escaped fragment param" do
+        SiteSetting.enable_escaped_fragments = false
+
+        get :show, params: {
+          'topic_id' => topic.id,
+          'slug' => topic.slug,
+          '_escaped_fragment_' => 'true'
+        }
+
+        body = response.body
+
+        expect(body).to have_tag(:script, with: { src: '/assets/application.js' })
+        expect(body).to_not have_tag(:meta, with: { name: 'fragment' })
+      end
+
+    end
+
+    context "when the SiteSetting is enabled" do
+      before do
+        SiteSetting.enable_escaped_fragments = true
+      end
+
+      it "uses the application layout when there's no param" do
+        get :show, params: { topic_id: topic.id, slug: topic.slug }
+
+        body = response.body
+
+        expect(body).to have_tag(:script, with: { src: '/assets/application.js' })
+        expect(body).to have_tag(:meta, with: { name: 'fragment' })
+      end
+
+      it "uses the crawler layout when there's an _escaped_fragment_ param" do
+        get :show, params: {
+          topic_id: topic.id,
+          slug: topic.slug,
+          _escaped_fragment_: 'true'
+        }
+
+        body = response.body
+
+        expect(body).to have_tag(:body, with: { class: 'crawler' })
+        expect(body).to_not have_tag(:meta, with: { name: 'fragment' })
+      end
+    end
+  end
+
+  describe "crawler" do
+    render_views
+
+    context "when not a crawler" do
+      it "renders with the application layout" do
+        get :show, params: { topic_id: topic.id, slug: topic.slug }
+
+        body = response.body
+
+        expect(body).to have_tag(:script, with: { src: '/assets/application.js' })
+        expect(body).to have_tag(:meta, with: { name: 'fragment' })
+      end
+    end
+
+    context "when a crawler" do
+      it "renders with the crawler layout" do
+        request.env["HTTP_USER_AGENT"] = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
+        get :show, params: { topic_id: topic.id, slug: topic.slug }
+
+        body = response.body
+
+        expect(body).to have_tag(:body, with: { class: 'crawler' })
+        expect(body).to_not have_tag(:meta, with: { name: 'fragment' })
+      end
+    end
+
+  end
+
+  describe "print" do
+    render_views
+
+    context "when the SiteSetting is enabled" do
+      it "uses the application layout when there's no param" do
+        get :show, params: { topic_id: topic.id, slug: topic.slug }
+
+        body = response.body
+
+        expect(body).to have_tag(:script, src: '/assets/application.js')
+        expect(body).to have_tag(:meta, with: { name: 'fragment' })
+      end
+
+      it "uses the crawler layout when there's an print param" do
+        get :show, params: { topic_id: topic.id, slug: topic.slug, print: 'true' }
+
+        body = response.body
+
+        expect(body).to have_tag(:body, class: 'crawler')
+        expect(body).to_not have_tag(:meta, with: { name: 'fragment' })
+      end
+    end
+  end
+
+  describe 'clear_notifications' do
+    it 'correctly clears notifications if specified via cookie' do
+      notification = Fabricate(:notification)
+      log_in_user(notification.user)
+
+      request.cookies['cn'] = "2828,100,#{notification.id}"
+
+      get :show, params: { topic_id: 100, format: :json }
+
+      expect(response.cookies['cn']).to eq nil
+
+      notification.reload
+      expect(notification.read).to eq true
+
+    end
+
+    it 'correctly clears notifications if specified via header' do
+      notification = Fabricate(:notification)
+      log_in_user(notification.user)
+
+      request.headers['Discourse-Clear-Notifications'] = "2828,100,#{notification.id}"
+
+      get :show, params: { topic_id: 100, format: :json }
+
+      notification.reload
+      expect(notification.read).to eq true
+    end
+  end
+
+  describe "set_locale" do
+    context "allow_user_locale disabled" do
+      context "accept-language header differs from default locale" do
+        before do
+          SiteSetting.allow_user_locale = false
+          SiteSetting.default_locale = "en"
+          set_accept_language("fr")
+        end
+
+        context "with an anonymous user" do
+          it "uses the default locale" do
+            get :show, params: { topic_id: topic.id, format: :json }
+
+            expect(I18n.locale).to eq(:en)
+          end
+        end
+
+        context "with a logged in user" do
+          it "it uses the default locale" do
+            user = Fabricate(:user, locale: :fr)
+            log_in_user(user)
+
+            get :show, params: { topic_id: topic.id, format: :json }
+
+            expect(I18n.locale).to eq(:en)
+          end
+        end
+      end
+    end
+
+    context "set_locale_from_accept_language_header enabled" do
+      context "accept-language header differs from default locale" do
+        before do
+          SiteSetting.allow_user_locale = true
+          SiteSetting.set_locale_from_accept_language_header = true
+          SiteSetting.default_locale = "en"
+          set_accept_language("fr")
+        end
+
+        context "with an anonymous user" do
+          it "uses the locale from the headers" do
+            get :show, params: { topic_id: topic.id, format: :json }
+
+            expect(I18n.locale).to eq(:fr)
+          end
+        end
+
+        context "with a logged in user" do
+          it "uses the user's preferred locale" do
+            user = Fabricate(:user, locale: :fr)
+            log_in_user(user)
+
+            get :show, params: { topic_id: topic.id, format: :json }
+
+            expect(I18n.locale).to eq(:fr)
+          end
+        end
+      end
+
+      context "the preferred locale includes a region" do
+        it "returns the locale and region separated by an underscore" do
+          SiteSetting.allow_user_locale = true
+          SiteSetting.set_locale_from_accept_language_header = true
+          SiteSetting.default_locale = "en"
+          set_accept_language("zh-CN")
+
+          get :show, params: { topic_id: topic.id, format: :json }
+
+          expect(I18n.locale).to eq(:zh_CN)
+        end
+      end
+
+      context 'accept-language header is not set' do
+        it 'uses the site default locale' do
+          SiteSetting.allow_user_locale = true
+          SiteSetting.default_locale = 'en'
+          set_accept_language('')
+
+          get :show, params: { topic_id: topic.id, format: :json }
+
+          expect(I18n.locale).to eq(:en)
+        end
+      end
+    end
+  end
+
+  describe "read only header" do
+    it "returns no read only header by default" do
+      get :show, params: { topic_id: topic.id, format: :json }
+      expect(response.headers['Discourse-Readonly']).to eq(nil)
+    end
+
+    it "returns a readonly header if the site is read only" do
+      Discourse.received_readonly!
+      get :show, params: { topic_id: topic.id, format: :json }
+      expect(response.headers['Discourse-Readonly']).to eq('true')
+    end
+  end
+end
+
+describe 'api' do
+
+  before do
+    ActionController::Base.allow_forgery_protection = true
+  end
+
+  after do
+    ActionController::Base.allow_forgery_protection = false
+  end
+
+  describe PostsController do
+    let(:user) do
+      Fabricate(:user)
+    end
+
+    let(:post) do
+      Fabricate(:post)
+    end
+
+    let(:api_key) { user.generate_api_key(user) }
+    let(:master_key) { ApiKey.create_master_key }
+
+    # choosing an arbitrarily easy to mock trusted activity
+    it 'allows users with api key to bookmark posts' do
+      PostAction.expects(:act).with(user, post, PostActionType.types[:bookmark]).once
+
+      put :bookmark, params: {
+        bookmarked: "true",
+        post_id: post.id,
+        api_key: api_key.key
+      }, format: :json
+
+      expect(response).to be_success
+    end
+
+    it 'raises an error with a user key that does not match an optionally specified username' do
+      PostAction.expects(:act).with(user, post, PostActionType.types[:bookmark]).never
+
+      put :bookmark, params: {
+        bookmarked: "true",
+        post_id: post.id,
+        api_key: api_key.key,
+        api_username: 'made_up'
+      }, format: :json
+
+      expect(response).not_to be_success
+    end
+
+    it 'allows users with a master api key to bookmark posts' do
+      PostAction.expects(:act).with(user, post, PostActionType.types[:bookmark]).once
+
+      put :bookmark, params: {
+        bookmarked: "true",
+        post_id: post.id,
+        api_key: master_key.key,
+        api_username: user.username
+      }, format: :json
+
+      expect(response).to be_success
+    end
+
+    it 'disallows phonies to bookmark posts' do
+      PostAction.expects(:act).with(user, post, PostActionType.types[:bookmark]).never
+
+      put :bookmark, params: {
+        bookmarked: "true",
+        post_id: post.id,
+        api_key: SecureRandom.hex(32),
+        api_username: user.username
+      }, format: :json
+
+      expect(response.code.to_i).to eq(403)
+    end
+
+    it 'disallows blank api' do
+      PostAction.expects(:act).with(user, post, PostActionType.types[:bookmark]).never
+
+      put :bookmark, params: {
+        bookmarked: "true",
+        post_id: post.id,
+        api_key: "",
+        api_username: user.username
+      }, format: :json
+
+      expect(response.code.to_i).to eq(403)
+    end
+  end
+end
diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb
index 7fb5046eb0..5a6be86eac 100644
--- a/spec/controllers/topics_controller_spec.rb
+++ b/spec/controllers/topics_controller_spec.rb
@@ -6,15 +6,19 @@ def topics_controller_show_gen_perm_tests(expected, ctx)
     if sym == :nonexist
       params = "topic_id: nonexist_topic_id"
     end
-    ctx.instance_eval("
-it 'returns #{status} for #{sym}' do
-  begin
-    xhr :get, :show, #{params}
-    expect(response.status).to eq(#{status})
-  rescue Discourse::NotLoggedIn
-    expect(302).to eq(#{status})
-  end
-end")
+
+    method = <<~TEXT
+    it 'returns #{status} for #{sym}' do
+      begin
+        get :show, params: { #{params} }
+        expect(response.status).to eq(#{status})
+      rescue Discourse::NotLoggedIn
+        expect(302).to eq(#{status})
+      end
+    end
+    TEXT
+
+    ctx.instance_eval(method)
   end
 end
 
@@ -24,12 +28,13 @@ describe TopicsController do
     let!(:user) { log_in(:moderator) }
     let(:p1) { Fabricate(:post, user: user) }
     let(:topic) { p1.topic }
-    let!(:p2) { Fabricate(:post, topic: topic, user:user )}
+    let!(:p2) { Fabricate(:post, topic: topic, user: user) }
 
     it "returns the JSON in the format our wordpress plugin needs" do
       SiteSetting.external_system_avatars_enabled = false
 
-      xhr :get, :wordpress, topic_id: topic.id, best: 3
+      get :wordpress, params: { topic_id: topic.id, best: 3 }, format: :json
+
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json).to be_present
@@ -60,7 +65,13 @@ describe TopicsController do
 
   context 'move_posts' do
     it 'needs you to be logged in' do
-      expect { xhr :post, :move_posts, topic_id: 111, title: 'blah', post_ids: [1,2,3] }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        post :move_posts, params: {
+          topic_id: 111,
+          title: 'blah',
+          post_ids: [1, 2, 3]
+        }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     describe 'moving to a new topic' do
@@ -69,12 +80,20 @@ describe TopicsController do
       let(:topic) { p1.topic }
 
       it "raises an error without postIds" do
-        expect { xhr :post, :move_posts, topic_id: topic.id, title: 'blah' }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          post :move_posts, params: {
+            topic_id: topic.id, title: 'blah'
+          }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       it "raises an error when the user doesn't have permission to move the posts" do
         Guardian.any_instance.expects(:can_move_posts?).returns(false)
-        xhr :post, :move_posts, topic_id: topic.id, title: 'blah', post_ids: [1,2,3]
+
+        post :move_posts, params: {
+          topic_id: topic.id, title: 'blah', post_ids: [1, 2, 3]
+        }, format: :json
+
         expect(response).to be_forbidden
       end
 
@@ -86,11 +105,12 @@ describe TopicsController do
           p2
 
           expect do
-            xhr :post, :move_posts,
+            post :move_posts, params: {
               topic_id: topic.id,
               title: 'Logan is a good movie',
               post_ids: [p2.id],
               category_id: 123
+            }, format: :json
           end.to change { Topic.count }.by(1)
 
           expect(response).to be_success
@@ -108,11 +128,12 @@ describe TopicsController do
             expect(topic.reload.deleted_at).to_not be_nil
 
             expect do
-              xhr :post, :move_posts,
+              post :move_posts, params: {
                 topic_id: topic.id,
                 title: 'Logan is a good movie',
                 post_ids: [p2.id],
                 category_id: 123
+              }, format: :json
             end.to change { Topic.count }.by(1)
 
             expect(response).to be_success
@@ -130,7 +151,10 @@ describe TopicsController do
 
         before do
           Topic.any_instance.expects(:move_posts).with(user, [p2.id], title: 'blah').returns(nil)
-          xhr :post, :move_posts, topic_id: topic.id, title: 'blah', post_ids: [p2.id]
+
+          post :move_posts, params: {
+            topic_id: topic.id, title: 'blah', post_ids: [p2.id]
+          }, format: :json
         end
 
         it "returns JSON with a false success" do
@@ -146,7 +170,7 @@ describe TopicsController do
       let!(:user) { log_in(:moderator) }
       let!(:p1) { Fabricate(:post, user: user) }
       let!(:topic) { p1.topic }
-      let!(:p2) { Fabricate(:post, topic: topic, user: user, reply_to_post_number: p1.post_number ) }
+      let!(:p2) { Fabricate(:post, topic: topic, user: user, reply_to_post_number: p1.post_number) }
 
       context 'success' do
 
@@ -156,7 +180,13 @@ describe TopicsController do
 
         it "moves the child posts too" do
           Topic.any_instance.expects(:move_posts).with(user, [p1.id, p2.id], title: 'blah').returns(topic)
-          xhr :post, :move_posts, topic_id: topic.id, title: 'blah', post_ids: [p1.id], reply_post_ids: [p1.id]
+
+          post :move_posts, params: {
+            topic_id: topic.id,
+            title: 'blah',
+            post_ids: [p1.id],
+            reply_post_ids: [p1.id]
+          }, format: :json
         end
       end
 
@@ -173,7 +203,12 @@ describe TopicsController do
 
         before do
           Topic.any_instance.expects(:move_posts).with(user, [p2.id], destination_topic_id: dest_topic.id).returns(topic)
-          xhr :post, :move_posts, topic_id: topic.id, post_ids: [p2.id], destination_topic_id: dest_topic.id
+
+          post :move_posts, params: {
+            topic_id: topic.id,
+            post_ids: [p2.id],
+            destination_topic_id: dest_topic.id
+          }, format: :json
         end
 
         it "returns success" do
@@ -189,7 +224,12 @@ describe TopicsController do
 
         before do
           Topic.any_instance.expects(:move_posts).with(user, [p2.id], destination_topic_id: dest_topic.id).returns(nil)
-          xhr :post, :move_posts, topic_id: topic.id, destination_topic_id: dest_topic.id, post_ids: [p2.id]
+
+          post :move_posts, params: {
+            topic_id: topic.id,
+            destination_topic_id: dest_topic.id,
+            post_ids: [p2.id]
+          }, format: :json
         end
 
         it "returns JSON with a false success" do
@@ -204,7 +244,11 @@ describe TopicsController do
 
   context "merge_topic" do
     it 'needs you to be logged in' do
-      expect { xhr :post, :merge_topic, topic_id: 111, destination_topic_id: 345 }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        post :merge_topic, params: {
+          topic_id: 111, destination_topic_id: 345
+        }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     describe 'moving to a new topic' do
@@ -213,12 +257,18 @@ describe TopicsController do
       let(:topic) { p1.topic }
 
       it "raises an error without destination_topic_id" do
-        expect { xhr :post, :merge_topic, topic_id: topic.id }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          post :merge_topic, params: { topic_id: topic.id }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       it "raises an error when the user doesn't have permission to merge" do
         Guardian.any_instance.expects(:can_move_posts?).returns(false)
-        xhr :post, :merge_topic, topic_id: 111, destination_topic_id: 345
+
+        post :merge_topic,
+          params: { topic_id: 111, destination_topic_id: 345 },
+          format: :json
+
         expect(response).to be_forbidden
       end
 
@@ -229,7 +279,10 @@ describe TopicsController do
 
         before do
           Topic.any_instance.expects(:move_posts).with(user, [p1.id], destination_topic_id: dest_topic.id).returns(topic)
-          xhr :post, :merge_topic, topic_id: topic.id, destination_topic_id: dest_topic.id
+
+          post :merge_topic, params: {
+            topic_id: topic.id, destination_topic_id: dest_topic.id
+          }, format: :json
         end
 
         it "returns success" do
@@ -240,20 +293,28 @@ describe TopicsController do
         end
       end
 
-
     end
 
   end
 
   context 'change_post_owners' do
     it 'needs you to be logged in' do
-      expect { xhr :post, :change_post_owners, topic_id: 111, username: 'user_a', post_ids: [1,2,3] }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        post :change_post_owners, params: {
+          topic_id: 111,
+          username: 'user_a',
+          post_ids: [1, 2, 3]
+        }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     describe 'forbidden to moderators' do
       let!(:moderator) { log_in(:moderator) }
       it 'correctly denies' do
-        xhr :post, :change_post_owners, topic_id: 111, username: 'user_a', post_ids: [1,2,3]
+        post :change_post_owners, params: {
+          topic_id: 111, username: 'user_a', post_ids: [1, 2, 3]
+        }, format: :json
+
         expect(response).to be_forbidden
       end
     end
@@ -262,7 +323,10 @@ describe TopicsController do
       let!(:trust_level_4) { log_in(:trust_level_4) }
 
       it 'correctly denies' do
-        xhr :post, :change_post_owners, topic_id: 111, username: 'user_a', post_ids: [1,2,3]
+        post :change_post_owners, params: {
+          topic_id: 111, username: 'user_a', post_ids: [1, 2, 3]
+        }, format: :json
+
         expect(response).to be_forbidden
       end
     end
@@ -275,22 +339,40 @@ describe TopicsController do
       let(:p2) { Fabricate(:post, topic_id: topic.id) }
 
       it "raises an error with a parameter missing" do
-        expect { xhr :post, :change_post_owners, topic_id: 111, post_ids: [1,2,3] }.to raise_error(ActionController::ParameterMissing)
-        expect { xhr :post, :change_post_owners, topic_id: 111, username: 'user_a' }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          post :change_post_owners, params: {
+            topic_id: 111, post_ids: [1, 2, 3]
+          }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
+
+        expect do
+          post :change_post_owners, params: {
+            topic_id: 111, username: 'user_a'
+          }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       it "calls PostOwnerChanger" do
         PostOwnerChanger.any_instance.expects(:change_owner!).returns(true)
-        xhr :post, :change_post_owners, topic_id: topic.id, username: user_a.username_lower, post_ids: [p1.id]
+        post :change_post_owners, params: {
+          topic_id: topic.id, username: user_a.username_lower, post_ids: [p1.id]
+        }, format: :json
+
         expect(response).to be_success
       end
 
       it "changes multiple posts" do
-        # an integration test
-        xhr :post, :change_post_owners, topic_id: topic.id, username: user_a.username_lower, post_ids: [p1.id, p2.id]
-        p1.reload; p2.reload
-        expect(p1.user).not_to eq(nil)
-        expect(p1.user).to eq(p2.user)
+        post :change_post_owners, params: {
+          topic_id: topic.id, username: user_a.username_lower, post_ids: [p1.id, p2.id]
+        }, format: :json
+
+        expect(response).to be_success
+
+        p1.reload
+        p2.reload
+
+        expect(p1.user).to_not eq(nil)
+        expect(p1.reload.user).to eq(p2.reload.user)
       end
 
       it "works with deleted users" do
@@ -301,9 +383,12 @@ describe TopicsController do
         t2.save
         p3.save
 
-        UserDestroyer.new(editor).destroy(deleted_user, { delete_posts: true, context: 'test', delete_as_spammer: true })
+        UserDestroyer.new(editor).destroy(deleted_user, delete_posts: true, context: 'test', delete_as_spammer: true)
+
+        post :change_post_owners, params: {
+          topic_id: t2.id, username: user_a.username_lower, post_ids: [p3.id]
+        }, format: :json
 
-        xhr :post, :change_post_owners, topic_id: t2.id, username: user_a.username_lower, post_ids: [p3.id]
         expect(response).to be_success
         t2.reload
         p3.reload
@@ -317,7 +402,9 @@ describe TopicsController do
     let(:params) { { topic_id: 1, timestamp: Time.zone.now } }
 
     it 'needs you to be logged in' do
-      expect { xhr :put, :change_timestamps, params }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        put :change_timestamps, params: params, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     [:moderator, :trust_level_4].each do |user|
@@ -325,7 +412,7 @@ describe TopicsController do
         let!(user) { log_in(user) }
 
         it 'correctly denies' do
-          xhr :put, :change_timestamps, params
+          put :change_timestamps, params: params, format: :json
           expect(response).to be_forbidden
         end
       end
@@ -340,11 +427,16 @@ describe TopicsController do
       let!(:p2) { Fabricate(:post, topic_id: topic.id, created_at: old_timestamp + 1.day) }
 
       it 'raises an error with a missing parameter' do
-        expect { xhr :put, :change_timestamps, topic_id: 1 }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          put :change_timestamps, params: { topic_id: 1 }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       it 'should update the timestamps of selected posts' do
-        xhr :put, :change_timestamps, topic_id: topic.id, timestamp: new_timestamp.to_f
+        put :change_timestamps, params: {
+          topic_id: topic.id, timestamp: new_timestamp.to_f
+        }, format: :json
+
         expect(topic.reload.created_at).to be_within_one_second_of(new_timestamp)
         expect(p1.reload.created_at).to be_within_one_second_of(new_timestamp)
         expect(p2.reload.created_at).to be_within_one_second_of(old_timestamp)
@@ -354,7 +446,9 @@ describe TopicsController do
 
   context 'clear_pin' do
     it 'needs you to be logged in' do
-      expect { xhr :put, :clear_pin, topic_id: 1 }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        put :clear_pin, params: { topic_id: 1 }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     context 'when logged in' do
@@ -363,18 +457,18 @@ describe TopicsController do
 
       it "fails when the user can't see the topic" do
         Guardian.any_instance.expects(:can_see?).with(topic).returns(false)
-        xhr :put, :clear_pin, topic_id: topic.id
+        put :clear_pin, params: { topic_id: topic.id }, format: :json
         expect(response).not_to be_success
       end
 
       describe 'when the user can see the topic' do
         it "calls clear_pin_for if the user can see the topic" do
           Topic.any_instance.expects(:clear_pin_for).with(user).once
-          xhr :put, :clear_pin, topic_id: topic.id
+          put :clear_pin, params: { topic_id: topic.id }, format: :json
         end
 
         it "succeeds" do
-          xhr :put, :clear_pin, topic_id: topic.id
+          put :clear_pin, params: { topic_id: topic.id }, format: :json
           expect(response).to be_success
         end
       end
@@ -385,7 +479,11 @@ describe TopicsController do
 
   context 'status' do
     it 'needs you to be logged in' do
-      expect { xhr :put, :status, topic_id: 1, status: 'visible', enabled: true }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        put :status, params: {
+          topic_id: 1, status: 'visible', enabled: true
+        }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     describe 'when logged in' do
@@ -396,20 +494,36 @@ describe TopicsController do
 
       it "raises an exception if you can't change it" do
         Guardian.any_instance.expects(:can_moderate?).with(@topic).returns(false)
-        xhr :put, :status, topic_id: @topic.id, status: 'visible', enabled: 'true'
+
+        put :status, params: {
+          topic_id: @topic.id, status: 'visible', enabled: 'true'
+        }, format: :json
+
         expect(response).to be_forbidden
       end
 
       it 'requires the status parameter' do
-        expect { xhr :put, :status, topic_id: @topic.id, enabled: true }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          put :status, params: {
+            topic_id: @topic.id, enabled: true
+          }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       it 'requires the enabled parameter' do
-        expect { xhr :put, :status, topic_id: @topic.id, status: 'visible' }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          put :status, params: {
+            topic_id: @topic.id, status: 'visible'
+          }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       it 'raises an error with a status not in the whitelist' do
-        expect { xhr :put, :status, topic_id: @topic.id, status: 'title', enabled: 'true' }.to raise_error(Discourse::InvalidParameters)
+        expect do
+          put :status, params: {
+            topic_id: @topic.id, status: 'title', enabled: 'true'
+          }, format: :json
+        end.to raise_error(Discourse::InvalidParameters)
       end
 
       it 'should update the status of the topic correctly' do
@@ -417,10 +531,13 @@ describe TopicsController do
           Fabricate(:topic_timer, status_type: TopicTimer.types[:open])
         ])
 
-        xhr :put, :status, topic_id: @topic.id, status: 'closed', enabled: 'false'
+        put :status, params: {
+          topic_id: @topic.id, status: 'closed', enabled: 'false'
+        }, format: :json
 
         expect(response).to be_success
         expect(@topic.reload.closed).to eq(false)
+        expect(@topic.topic_timers).to eq([])
 
         body = JSON.parse(response.body)
 
@@ -434,7 +551,9 @@ describe TopicsController do
   context 'delete_timings' do
 
     it 'needs you to be logged in' do
-      expect { xhr :delete, :destroy_timings, topic_id: 1 }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        delete :destroy_timings, params: { topic_id: 1 }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     context 'when logged in' do
@@ -446,36 +565,33 @@ describe TopicsController do
 
       it 'deletes the forum topic user record' do
         PostTiming.expects(:destroy_for).with(@user.id, [@topic.id])
-        xhr :delete, :destroy_timings, topic_id: @topic.id
+        delete :destroy_timings, params: { topic_id: @topic.id }, format: :json
       end
 
     end
 
   end
 
-
   describe 'mute/unmute' do
 
     it 'needs you to be logged in' do
-      expect { xhr :put, :mute, topic_id: 99}.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        put :mute, params: { topic_id: 99 }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     it 'needs you to be logged in' do
-      expect { xhr :put, :unmute, topic_id: 99}.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        put :unmute, params: { topic_id: 99 }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
-
-    describe 'when logged in' do
-      before do
-        @topic = Fabricate(:topic, user: log_in)
-      end
-
-    end
-
   end
 
   describe 'recover' do
     it "won't allow us to recover a topic when we're not logged in" do
-      expect { xhr :put, :recover, topic_id: 1 }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        put :recover, params: { topic_id: 1 }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     describe 'when logged in' do
@@ -484,7 +600,7 @@ describe TopicsController do
       describe 'without access' do
         it "raises an exception when the user doesn't have permission to delete the topic" do
           Guardian.any_instance.expects(:can_recover_topic?).with(topic).returns(false)
-          xhr :put, :recover, topic_id: topic.id
+          put :recover, params: { topic_id: topic.id }, format: :json
           expect(response).to be_forbidden
         end
       end
@@ -496,7 +612,7 @@ describe TopicsController do
 
         it 'succeeds' do
           PostDestroyer.any_instance.expects(:recover)
-          xhr :put, :recover, topic_id: topic.id
+          put :recover, params: { topic_id: topic.id }, format: :json
           expect(response).to be_success
         end
       end
@@ -506,7 +622,9 @@ describe TopicsController do
 
   describe 'delete' do
     it "won't allow us to delete a topic when we're not logged in" do
-      expect { xhr :delete, :destroy, id: 1 }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        delete :destroy, params: { id: 1 }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     describe 'when logged in' do
@@ -515,7 +633,7 @@ describe TopicsController do
       describe 'without access' do
         it "raises an exception when the user doesn't have permission to delete the topic" do
           Guardian.any_instance.expects(:can_delete?).with(topic).returns(false)
-          xhr :delete, :destroy, id: topic.id
+          delete :destroy, params: { id: topic.id }, format: :json
           expect(response).to be_forbidden
         end
       end
@@ -527,7 +645,7 @@ describe TopicsController do
 
         it 'succeeds' do
           PostDestroyer.any_instance.expects(:destroy)
-          xhr :delete, :destroy, id: topic.id
+          delete :destroy, params: { id: topic.id }, format: :json
           expect(response).to be_success
         end
 
@@ -540,7 +658,7 @@ describe TopicsController do
     let(:topic) { Fabricate(:post).topic }
 
     it "returns JSON for the slug" do
-      xhr :get, :id_for_slug, slug: topic.slug
+      get :id_for_slug, params: { slug: topic.slug }, format: :json
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json).to be_present
@@ -551,7 +669,7 @@ describe TopicsController do
 
     it "returns invalid access if the user can't see the topic" do
       Guardian.any_instance.expects(:can_see?).with(topic).returns(false)
-      xhr :get, :id_for_slug, slug: topic.slug
+      get :id_for_slug, params: { slug: topic.slug }, format: :json
       expect(response).not_to be_success
     end
   end
@@ -561,7 +679,8 @@ describe TopicsController do
 
     it 'correctly renders canoicals' do
       topic = Fabricate(:post).topic
-      get :show, topic_id: topic.id, slug: topic.slug
+      get :show, params: { topic_id: topic.id, slug: topic.slug }
+
       expect(response).to be_success
       expect(css_select("link[rel=canonical]").length).to eq(1)
       expect(response.headers["Cache-Control"]).to eq("no-store, must-revalidate, no-cache, private")
@@ -569,18 +688,25 @@ describe TopicsController do
   end
 
   describe 'show unlisted' do
-    it 'returns 404 unless exact correct URL' do
+    it 'returns 301 even if slug does not match URL' do
+      # in the past we had special logic for unlisted topics
+      # we would require slug unless you made a json call
+      # this was not really providing any security
+      #
+      # we no longer require a topic be visible to perform url correction
+      # if you need to properly hide a topic for users use a secure category
+      # or a PM
       topic = Fabricate(:topic, visible: false)
       Fabricate(:post, topic: topic)
 
-      xhr :get, :show, topic_id: topic.id, slug: topic.slug
+      get :show, params: { topic_id: topic.id, slug: topic.slug }, format: :json
       expect(response).to be_success
 
-      xhr :get, :show, topic_id: topic.id, slug: "just-guessing"
-      expect(response.code).to eq("404")
+      get :show, params: { topic_id: topic.id, slug: "just-guessing" }, format: :json
+      expect(response.code).to eq("301")
 
-      xhr :get, :show, id: topic.slug
-      expect(response.code).to eq("404")
+      get :show, params: { id: topic.slug }, format: :json
+      expect(response.code).to eq("301")
     end
   end
 
@@ -591,17 +717,17 @@ describe TopicsController do
     let!(:p2) { Fabricate(:post, user: topic.user) }
 
     it 'shows a topic correctly' do
-      xhr :get, :show, topic_id: topic.id, slug: topic.slug
+      get :show, params: { topic_id: topic.id, slug: topic.slug }, format: :json
       expect(response).to be_success
     end
 
     it 'return 404 for an invalid page' do
-      xhr :get, :show, topic_id: topic.id, slug: topic.slug, page: 2
+      get :show, params: { topic_id: topic.id, slug: topic.slug, page: 2 }, format: :json
       expect(response.code).to eq("404")
     end
 
     it 'can find a topic given a slug in the id param' do
-      xhr :get, :show, id: topic.slug
+      get :show, params: { id: topic.slug }
       expect(response).to redirect_to(topic.relative_url)
     end
 
@@ -609,38 +735,53 @@ describe TopicsController do
       another_topic = Fabricate(:post).topic
 
       topic.update_column(:slug, "#{another_topic.id}-reasons-discourse-is-awesome")
-      xhr :get, :show, id: "#{another_topic.id}-reasons-discourse-is-awesome"
+      get :show, params: { id: "#{another_topic.id}-reasons-discourse-is-awesome" }
 
       expect(response).to redirect_to(topic.relative_url)
     end
 
     it 'keeps the post_number parameter around when redirecting' do
-      xhr :get, :show, id: topic.slug, post_number: 42
+      get :show, params: { id: topic.slug, post_number: 42 }
       expect(response).to redirect_to(topic.relative_url + "/42")
     end
 
     it 'keeps the page around when redirecting' do
-      xhr :get, :show, id: topic.slug, post_number: 42, page: 123
+      get :show, params: {
+        id: topic.slug, post_number: 42, page: 123
+      }
+
       expect(response).to redirect_to(topic.relative_url + "/42?page=123")
     end
 
     it 'does not accept page params as an array' do
-      xhr :get, :show, id: topic.slug, post_number: 42, page: [2]
+      get :show, params: {
+        id: topic.slug, post_number: 42, page: [2]
+      }
+
       expect(response).to redirect_to("#{topic.relative_url}/42?page=1")
     end
 
     it 'returns 404 when an invalid slug is given and no id' do
-      xhr :get, :show, id: 'nope-nope'
+      get :show, params: {
+        id: 'nope-nope'
+      }, format: :json
+
       expect(response.status).to eq(404)
     end
 
     it 'returns a 404 when slug and topic id do not match a topic' do
-      xhr :get, :show, topic_id: 123123, slug: 'topic-that-is-made-up'
+      get :show, params: {
+        topic_id: 123123, slug: 'topic-that-is-made-up'
+      }, format: :json
+
       expect(response.status).to eq(404)
     end
 
     it 'returns a 404 for an ID that is larger than postgres limits' do
-      xhr :get, :show, topic_id: 50142173232201640412, slug: 'topic-that-is-made-up'
+      get :show, params: {
+        topic_id: 5014217323220164041, slug: 'topic-that-is-made-up'
+      }, format: :json
+
       expect(response.status).to eq(404)
     end
 
@@ -651,7 +792,10 @@ describe TopicsController do
       end
 
       it 'returns a 404 when slug and topic id do not match a topic' do
-        xhr :get, :show, topic_id: 123123, slug: 'topic-that-is-made-up'
+        get :show, params: {
+          topic_id: 123123, slug: 'topic-that-is-made-up'
+        }, format: :json
+
         expect(response.status).to eq(404)
       end
     end
@@ -676,13 +820,13 @@ describe TopicsController do
 
       context 'anonymous' do
         expected = {
-          :normal_topic => 200,
-          :secure_topic => 403,
-          :private_topic => 302,
-          :deleted_topic => 410,
-          :deleted_secure_topic => 403,
-          :deleted_private_topic => 302,
-          :nonexist => 404
+          normal_topic: 200,
+          secure_topic: 403,
+          private_topic: 302,
+          deleted_topic: 410,
+          deleted_secure_topic: 403,
+          deleted_private_topic: 302,
+          nonexist: 404
         }
         topics_controller_show_gen_perm_tests(expected, self)
       end
@@ -692,13 +836,13 @@ describe TopicsController do
           SiteSetting.login_required = true
         end
         expected = {
-          :normal_topic => 302,
-          :secure_topic => 302,
-          :private_topic => 302,
-          :deleted_topic => 302,
-          :deleted_secure_topic => 302,
-          :deleted_private_topic => 302,
-          :nonexist => 302
+          normal_topic: 302,
+          secure_topic: 302,
+          private_topic: 302,
+          deleted_topic: 302,
+          deleted_secure_topic: 302,
+          deleted_private_topic: 302,
+          nonexist: 302
         }
         topics_controller_show_gen_perm_tests(expected, self)
       end
@@ -709,13 +853,13 @@ describe TopicsController do
         end
 
         expected = {
-          :normal_topic => 200,
-          :secure_topic => 403,
-          :private_topic => 403,
-          :deleted_topic => 410,
-          :deleted_secure_topic => 403,
-          :deleted_private_topic => 403,
-          :nonexist => 404
+          normal_topic: 200,
+          secure_topic: 403,
+          private_topic: 403,
+          deleted_topic: 410,
+          deleted_secure_topic: 403,
+          deleted_private_topic: 403,
+          nonexist: 404
         }
         topics_controller_show_gen_perm_tests(expected, self)
       end
@@ -726,13 +870,13 @@ describe TopicsController do
         end
 
         expected = {
-          :normal_topic => 200,
-          :secure_topic => 200,
-          :private_topic => 200,
-          :deleted_topic => 410,
-          :deleted_secure_topic => 410,
-          :deleted_private_topic => 410,
-          :nonexist => 404
+          normal_topic: 200,
+          secure_topic: 200,
+          private_topic: 200,
+          deleted_topic: 410,
+          deleted_secure_topic: 410,
+          deleted_private_topic: 410,
+          nonexist: 404
         }
         topics_controller_show_gen_perm_tests(expected, self)
       end
@@ -743,13 +887,13 @@ describe TopicsController do
         end
 
         expected = {
-          :normal_topic => 200,
-          :secure_topic => 403,
-          :private_topic => 403,
-          :deleted_topic => 200,
-          :deleted_secure_topic => 403,
-          :deleted_private_topic => 403,
-          :nonexist => 404
+          normal_topic: 200,
+          secure_topic: 403,
+          private_topic: 403,
+          deleted_topic: 200,
+          deleted_secure_topic: 403,
+          deleted_private_topic: 403,
+          nonexist: 404
         }
         topics_controller_show_gen_perm_tests(expected, self)
       end
@@ -760,25 +904,32 @@ describe TopicsController do
         end
 
         expected = {
-          :normal_topic => 200,
-          :secure_topic => 200,
-          :private_topic => 200,
-          :deleted_topic => 200,
-          :deleted_secure_topic => 200,
-          :deleted_private_topic => 200,
-          :nonexist => 404
+          normal_topic: 200,
+          secure_topic: 200,
+          private_topic: 200,
+          deleted_topic: 200,
+          deleted_secure_topic: 200,
+          deleted_private_topic: 200,
+          nonexist: 404
         }
         topics_controller_show_gen_perm_tests(expected, self)
       end
     end
 
     it 'records a view' do
-      expect { xhr :get, :show, topic_id: topic.id, slug: topic.slug }.to change(TopicViewItem, :count).by(1)
+      expect do
+        get :show, params: {
+          topic_id: topic.id, slug: topic.slug
+        }, format: :json
+      end.to change(TopicViewItem, :count).by(1)
     end
 
     it 'records incoming links' do
       user = Fabricate(:user)
-      get :show, topic_id: topic.id, slug: topic.slug, u: user.username
+
+      get :show, params: {
+        topic_id: topic.id, slug: topic.slug, u: user.username
+      }
 
       expect(IncomingLink.count).to eq(1)
     end
@@ -787,23 +938,31 @@ describe TopicsController do
 
       it "doesn't renders the print view when disabled" do
         SiteSetting.max_prints_per_hour_per_user = 0
-        get :show, topic_id: topic.id, slug: topic.slug, print: true
+
+        get :show, params: {
+          topic_id: topic.id, slug: topic.slug, print: true
+        }
+
         expect(response).to be_forbidden
       end
 
       it 'renders the print view when enabled' do
         SiteSetting.max_prints_per_hour_per_user = 10
-        get :show, topic_id: topic.id, slug: topic.slug, print: true
+
+        get :show, params: {
+          topic_id: topic.id, slug: topic.slug, print: true
+        }
+
         expect(response).to be_successful
       end
     end
 
     it 'records redirects' do
-      @request.env['HTTP_REFERER'] = 'http://twitter.com'
-      get :show, { id: topic.id }
+      request.env['HTTP_REFERER'] = 'http://twitter.com'
+      get :show, params: { id: topic.id }
 
-      @request.env['HTTP_REFERER'] = nil
-      get :show, topic_id: topic.id, slug: topic.slug
+      request.env['HTTP_REFERER'] = nil
+      get :show, params: { topic_id: topic.id, slug: topic.slug }
 
       link = IncomingLink.first
       expect(link.referer).to eq('http://twitter.com')
@@ -812,7 +971,7 @@ describe TopicsController do
     it 'tracks a visit for all html requests' do
       current_user = log_in(:coding_horror)
       TopicUser.expects(:track_visit!).with(topic.id, current_user.id)
-      get :show, topic_id: topic.id, slug: topic.slug
+      get :show, params: { topic_id: topic.id, slug: topic.slug }
     end
 
     context 'consider for a promotion' do
@@ -826,7 +985,7 @@ describe TopicsController do
       it "reviews the user for a promotion if they're new" do
         user.update_column(:trust_level, TrustLevel[0])
         Promotion.any_instance.expects(:review)
-        get :show, topic_id: topic.id, slug: topic.slug
+        get :show, params: { topic_id: topic.id, slug: topic.slug }, format: :json
       end
     end
 
@@ -834,22 +993,34 @@ describe TopicsController do
 
       it 'grabs first page when no filter is provided' do
         TopicView.any_instance.expects(:filter_posts_in_range).with(0, 19)
-        xhr :get, :show, topic_id: topic.id, slug: topic.slug
+
+        get :show, params: {
+          topic_id: topic.id, slug: topic.slug
+        }, format: :json
       end
 
       it 'grabs first page when first page is provided' do
         TopicView.any_instance.expects(:filter_posts_in_range).with(0, 19)
-        xhr :get, :show, topic_id: topic.id, slug: topic.slug, page: 1
+
+        get :show, params: {
+          topic_id: topic.id, slug: topic.slug, page: 1
+        }, format: :json
       end
 
       it 'grabs correct range when a page number is provided' do
         TopicView.any_instance.expects(:filter_posts_in_range).with(20, 39)
-        xhr :get, :show, topic_id: topic.id, slug: topic.slug, page: 2
+
+        get :show, params: {
+          topic_id: topic.id, slug: topic.slug, page: 2
+        }, format: :json
       end
 
       it 'delegates a post_number param to TopicView#filter_posts_near' do
         TopicView.any_instance.expects(:filter_posts_near).with(p2.post_number)
-        xhr :get, :show, topic_id: topic.id, slug: topic.slug, post_number: p2.post_number
+
+        get :show, params: {
+          topic_id: topic.id, slug: topic.slug, post_number: p2.post_number
+        }, format: :json
       end
     end
 
@@ -860,7 +1031,7 @@ describe TopicsController do
         before { log_in(:coding_horror) }
 
         it 'shows the topic' do
-          get :show, topic_id: topic.id, slug: topic.slug
+          get :show, params: { topic_id: topic.id, slug: topic.slug }, format: :json
           expect(response).to be_successful
         end
       end
@@ -869,12 +1040,18 @@ describe TopicsController do
         let(:api_key) { topic.user.generate_api_key(topic.user) }
 
         it 'redirects to the login page' do
-          get :show, topic_id: topic.id, slug: topic.slug
+          get :show, params: {
+            topic_id: topic.id, slug: topic.slug
+          }, format: :json
+
           expect(response).to redirect_to login_path
         end
 
         it 'shows the topic if valid api key is provided' do
-          get :show, topic_id: topic.id, slug: topic.slug, api_key: api_key.key
+          get :show, params: {
+            topic_id: topic.id, slug: topic.slug, api_key: api_key.key
+          }, format: :json
+
           expect(response).to be_successful
           topic.reload
           # free test, only costs a reload
@@ -882,8 +1059,14 @@ describe TopicsController do
         end
 
         it 'returns 403 for an invalid key' do
-          get :show, topic_id: topic.id, slug: topic.slug, api_key: "bad"
-          expect(response.code.to_i).to be(403)
+          [:json, :html].each do |format|
+            get :show, params: {
+              topic_id: topic.id, slug: topic.slug, api_key: "bad"
+            }, format: format
+
+            expect(response.code.to_i).to be(403)
+            expect(response.body).to include(I18n.t("invalid_access"))
+          end
         end
       end
     end
@@ -893,7 +1076,7 @@ describe TopicsController do
     let(:topic) { Fabricate(:post).topic }
 
     it 'returns first posts of the topic' do
-      get :posts, topic_id: topic.id, format: :json
+      get :posts, params: { topic_id: topic.id }, format: :json
       expect(response).to be_success
       expect(response.content_type).to eq('application/json')
     end
@@ -903,7 +1086,7 @@ describe TopicsController do
     let(:topic) { Fabricate(:post).topic }
 
     it 'renders rss of the topic' do
-      get :feed, topic_id: topic.id, slug: 'foo', format: :rss
+      get :feed, params: { topic_id: topic.id, slug: 'foo' }, format: :rss
       expect(response).to be_success
       expect(response.content_type).to eq('application/rss+xml')
     end
@@ -911,7 +1094,9 @@ describe TopicsController do
 
   describe 'update' do
     it "won't allow us to update a topic when we're not logged in" do
-      expect { xhr :put, :update, topic_id: 1, slug: 'xyz' }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        put :update, params: { topic_id: 1, slug: 'xyz' }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     describe 'when logged in' do
@@ -923,7 +1108,11 @@ describe TopicsController do
       describe 'without permission' do
         it "raises an exception when the user doesn't have permission to update the topic" do
           Guardian.any_instance.expects(:can_edit?).with(@topic).returns(false)
-          xhr :put, :update, topic_id: @topic.id, slug: @topic.title
+
+          put :update, params: {
+            topic_id: @topic.id, slug: @topic.title
+          }, format: :json
+
           expect(response).to be_forbidden
         end
       end
@@ -934,47 +1123,71 @@ describe TopicsController do
         end
 
         it 'succeeds' do
-          xhr :put, :update, topic_id: @topic.id, slug: @topic.title
+          put :update, params: {
+            topic_id: @topic.id, slug: @topic.title
+          }, format: :json
+
           expect(response).to be_success
           expect(::JSON.parse(response.body)['basic_topic']).to be_present
         end
 
         it 'allows a change of title' do
-          xhr :put, :update, topic_id: @topic.id, slug: @topic.title, title: 'This is a new title for the topic'
+          put :update, params: {
+            topic_id: @topic.id, slug: @topic.title, title: 'This is a new title for the topic'
+          }, format: :json
+
           @topic.reload
           expect(@topic.title).to eq('This is a new title for the topic')
         end
 
         it 'triggers a change of category' do
           Topic.any_instance.expects(:change_category_to_id).with(123).returns(true)
-          xhr :put, :update, topic_id: @topic.id, slug: @topic.title, category_id: 123
+          put :update, params: {
+            topic_id: @topic.id, slug: @topic.title, category_id: 123
+          }, format: :json
+
         end
 
         it 'allows to change category to "uncategorized"' do
           Topic.any_instance.expects(:change_category_to_id).with(0).returns(true)
-          xhr :put, :update, topic_id: @topic.id, slug: @topic.title, category_id: ""
+          put :update, params: {
+            topic_id: @topic.id, slug: @topic.title, category_id: ""
+          }, format: :json
+
         end
 
         it "returns errors with invalid titles" do
-          xhr :put, :update, topic_id: @topic.id, slug: @topic.title, title: 'asdf'
+          put :update, params: {
+            topic_id: @topic.id, slug: @topic.title, title: 'asdf'
+          }, format: :json
+
           expect(response).not_to be_success
         end
 
         it "returns errors when the rate limit is exceeded" do
           EditRateLimiter.any_instance.expects(:performed!).raises(RateLimiter::LimitExceeded.new(60))
-          xhr :put, :update, topic_id: @topic.id, slug: @topic.title, title: 'This is a new title for the topic'
+          put :update, params: {
+            topic_id: @topic.id, slug: @topic.title, title: 'This is a new title for the topic'
+          }, format: :json
+
           expect(response).not_to be_success
         end
 
         it "returns errors with invalid categories" do
           Topic.any_instance.expects(:change_category_to_id).returns(false)
-          xhr :put, :update, topic_id: @topic.id, slug: @topic.title, category_id: -1
+          put :update, params: {
+            topic_id: @topic.id, slug: @topic.title, category_id: -1
+          }, format: :json
+
           expect(response).not_to be_success
         end
 
         it "doesn't call the PostRevisor when there is no changes" do
           PostRevisor.any_instance.expects(:revise!).never
-          xhr :put, :update, topic_id: @topic.id, slug: @topic.title, title: @topic.title, category_id: @topic.category_id
+          put :update, params: {
+            topic_id: @topic.id, slug: @topic.title, title: @topic.title, category_id: @topic.category_id
+          }, format: :json
+
           expect(response).to be_success
         end
 
@@ -988,7 +1201,10 @@ describe TopicsController do
           context 'when there are no changes' do
             it 'does not call the PostRevisor' do
               PostRevisor.any_instance.expects(:revise!).never
-              xhr :put, :update, topic_id: @topic.id, slug: @topic.title, title: @topic.title, category_id: nil
+              put :update, params: {
+                topic_id: @topic.id, slug: @topic.title, title: @topic.title, category_id: nil
+              }, format: :json
+
               expect(response).to be_success
             end
           end
@@ -996,12 +1212,16 @@ 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
             Topic.any_instance.expects(:change_category_to_id).with(456).returns(true)
-            xhr :put, :update, topic_id: @topic.id, slug: @topic.title, category_id: 456
+
+            put :update, params: {
+              topic_id: @topic.id, slug: @topic.title, category_id: 456
+            }, format: :json
+
             expect(response).to be_success
           end
         end
@@ -1011,57 +1231,36 @@ describe TopicsController do
   end
 
   describe 'invite_group' do
-    let(:admins) { Group[:admins] }
-    let(:pm) { Fabricate(:private_message_topic) }
+    let :admins do
+      Group[:admins]
+    end
 
-    def invite_group(topic, expected_status)
-      xhr :post, :invite_group, topic_id: topic.id, group: admins.name
-      expect(response.status).to eq(expected_status)
+    let! :admin do
+      log_in :admin
     end
 
     before do
-      admins.update!(alias_level: Group::ALIAS_LEVELS[:everyone])
+      admins.messageable_level = Group::ALIAS_LEVELS[:everyone]
+      admins.save!
     end
 
-    describe 'as an anon user' do
-      it 'should be forbidden' do
-        invite_group(pm, 403)
-      end
+    it "disallows inviting a group to a topic" do
+      topic = Fabricate(:topic)
+      post :invite_group, params: {
+        topic_id: topic.id, group: 'admins'
+      }, format: :json
+
+      expect(response.status).to eq(422)
     end
 
-    describe 'as a normal user' do
-      let!(:user) { log_in }
+    it "allows inviting a group to a PM" do
+      topic = Fabricate(:private_message_topic)
+      post :invite_group, params: {
+        topic_id: topic.id, group: 'admins'
+      }, format: :json
 
-      describe 'when user does not have permission to view the topic' do
-        it 'should be forbidden' do
-          invite_group(pm, 403)
-        end
-      end
-
-      describe 'when user has permission to view the topic' do
-        before do
-          pm.allowed_users << user
-        end
-
-        it 'should allow user to invite group to topic' do
-          invite_group(pm, 200)
-          expect(pm.allowed_groups.first.id).to eq(admins.id)
-        end
-      end
-    end
-
-    describe 'as an admin user' do
-      let!(:admin) { log_in(:admin) }
-
-      it "disallows inviting a group to a topic" do
-        topic = Fabricate(:topic)
-        invite_group(topic, 422)
-      end
-
-      it "allows inviting a group to a PM" do
-        invite_group(pm, 200)
-        expect(pm.allowed_groups.first.id).to eq(admins.id)
-      end
+      expect(response.status).to eq(200)
+      expect(topic.allowed_groups.first.id).to eq(admins.id)
     end
   end
 
@@ -1073,7 +1272,9 @@ describe TopicsController do
         topic = Fabricate(:topic)
         _admin = log_in(:admin)
 
-        xhr :post, :invite, topic_id: topic.id, email: 'hiro@from.heros', group_ids: "#{group.id}"
+        post :invite, params: {
+          topic_id: topic.id, email: 'hiro@from.heros', group_ids: "#{group.id}"
+        }, format: :json
 
         expect(response).to be_success
 
@@ -1085,7 +1286,11 @@ describe TopicsController do
     end
 
     it "won't allow us to invite toa topic when we're not logged in" do
-      expect { xhr :post, :invite, topic_id: 1, email: 'jake@adventuretime.ooo' }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        post :invite, params: {
+          topic_id: 1, email: 'jake@adventuretime.ooo'
+        }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     describe 'when logged in as group manager' do
@@ -1096,7 +1301,10 @@ describe TopicsController do
       let(:recipient) { 'jake@adventuretime.ooo' }
 
       it "should attach group to the invite" do
-        xhr :post, :invite, topic_id: group_private_topic.id, user: recipient
+        post :invite, params: {
+          topic_id: group_private_topic.id, user: recipient
+        }, format: :json
+
         expect(response).to be_success
         expect(Invite.find_by(email: recipient).groups).to eq([group])
       end
@@ -1108,12 +1316,17 @@ describe TopicsController do
       end
 
       it 'requires an email parameter' do
-        expect { xhr :post, :invite, topic_id: @topic.id }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          post :invite, params: { topic_id: @topic.id }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       describe 'without permission' do
         it "raises an exception when the user doesn't have permission to invite to the topic" do
-          xhr :post, :invite, topic_id: @topic.id, user: 'jake@adventuretime.ooo'
+          post :invite, params: {
+            topic_id: @topic.id, user: 'jake@adventuretime.ooo'
+          }, format: :json
+
           expect(response).to be_forbidden
         end
       end
@@ -1125,16 +1338,22 @@ describe TopicsController do
         end
 
         it 'should work as expected' do
-          xhr :post, :invite, topic_id: @topic.id, user: 'jake@adventuretime.ooo'
+          post :invite, params: {
+            topic_id: @topic.id, user: 'jake@adventuretime.ooo'
+          }, format: :json
+
           expect(response).to be_success
-          expect(::JSON.parse(response.body)).to eq({'success' => 'OK'})
+          expect(::JSON.parse(response.body)).to eq('success' => 'OK')
           expect(Invite.where(invited_by_id: admin.id).count).to eq(1)
         end
 
         it 'should fail on shoddy email' do
-          xhr :post, :invite, topic_id: @topic.id, user: 'i_am_not_an_email'
+          post :invite, params: {
+            topic_id: @topic.id, user: 'i_am_not_an_email'
+          }, format: :json
+
           expect(response).not_to be_success
-          expect(::JSON.parse(response.body)).to eq({'failed' => 'FAILED'})
+          expect(::JSON.parse(response.body)).to eq('failed' => 'FAILED')
         end
 
       end
@@ -1147,7 +1366,7 @@ describe TopicsController do
 
     it 'needs you to be a staff member' do
       log_in
-      xhr :put, :make_banner, topic_id: 99
+      put :make_banner, params: { topic_id: 99 }, format: :json
       expect(response).to be_forbidden
     end
 
@@ -1157,7 +1376,7 @@ describe TopicsController do
         topic = Fabricate(:topic, user: log_in(:admin))
         Topic.any_instance.expects(:make_banner!)
 
-        xhr :put, :make_banner, topic_id: topic.id
+        put :make_banner, params: { topic_id: topic.id }, format: :json
         expect(response).to be_success
       end
     end
@@ -1170,7 +1389,9 @@ describe TopicsController do
       user = Fabricate(:user)
       pm = create_post(user: user, archetype: 'private_message', target_usernames: [user.username, admin.username])
 
-      xhr :put, :remove_allowed_user, topic_id: pm.topic_id, username: admin.username
+      put :remove_allowed_user, params: {
+        topic_id: pm.topic_id, username: admin.username
+      }, format: :json
 
       expect(response.status).to eq(200)
       expect(TopicAllowedUser.where(topic_id: pm.topic_id, user_id: admin.id).first).to eq(nil)
@@ -1181,7 +1402,7 @@ describe TopicsController do
 
     it 'needs you to be a staff member' do
       log_in
-      xhr :put, :remove_banner, topic_id: 99
+      put :remove_banner, params: { topic_id: 99 }, format: :json
       expect(response).to be_forbidden
     end
 
@@ -1191,7 +1412,7 @@ describe TopicsController do
         topic = Fabricate(:topic, user: log_in(:admin))
         Topic.any_instance.expects(:remove_banner!)
 
-        xhr :put, :remove_banner, topic_id: topic.id
+        put :remove_banner, params: { topic_id: topic.id }, format: :json
         expect(response).to be_success
       end
 
@@ -1201,29 +1422,40 @@ describe TopicsController do
 
   describe "bulk" do
     it 'needs you to be logged in' do
-      expect { xhr :put, :bulk }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        put :bulk, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     describe "when logged in" do
       let!(:user) { log_in }
-      let(:operation) { {type: 'change_category', category_id: '1'} }
-      let(:topic_ids) { [1,2,3] }
+      let(:operation) { { type: 'change_category', category_id: '1' } }
+      let(:topic_ids) { [1, 2, 3] }
 
       it "requires a list of topic_ids or filter" do
-        expect { xhr :put, :bulk, operation: operation }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          put :bulk, params: { operation: operation }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       it "requires an operation param" do
-        expect { xhr :put, :bulk, topic_ids: topic_ids}.to raise_error(ActionController::ParameterMissing)
+        expect do
+          put :bulk, params: { topic_ids: topic_ids }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       it "requires a type field for the operation param" do
-        expect { xhr :put, :bulk, topic_ids: topic_ids, operation: {}}.to raise_error(ActionController::ParameterMissing)
+        expect do
+          put :bulk, params: { topic_ids: topic_ids, operation: {} }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       it "can find unread" do
         # mark all unread muted
-        xhr :put, :bulk, filter: 'unread', operation: {type: :change_notification_level, notification_level_id: 0}
+        put :bulk, params: {
+          filter: 'unread', operation: { type: :change_notification_level, notification_level_id: 0 }
+        }, format: :json
+
         expect(response.status).to eq(200)
       end
 
@@ -1231,7 +1463,10 @@ describe TopicsController do
         topics_bulk_action = mock
         TopicsBulkAction.expects(:new).with(user, topic_ids, operation, group: nil).returns(topics_bulk_action)
         topics_bulk_action.expects(:perform!)
-        xhr :put, :bulk, topic_ids: topic_ids, operation: operation
+
+        put :bulk, params: {
+          topic_ids: topic_ids, operation: operation
+        }, format: :json
       end
     end
   end
@@ -1246,10 +1481,10 @@ describe TopicsController do
 
       PostAction.act(user, post2, bookmark)
 
-      xhr :put, :bookmark, topic_id: post.topic_id
+      put :bookmark, params: { topic_id: post.topic_id }, format: :json
       expect(PostAction.where(user_id: user.id, post_action_type: bookmark).count).to eq(2)
 
-      xhr :put, :remove_bookmarks, topic_id: post.topic_id
+      put :remove_bookmarks, params: { topic_id: post.topic_id }, format: :json
       expect(PostAction.where(user_id: user.id, post_action_type: bookmark).count).to eq(0)
     end
 
@@ -1258,15 +1493,16 @@ describe TopicsController do
       user = Fabricate(:user)
       pm = create_post(user: user, archetype: 'private_message', target_usernames: [user.username])
 
-      xhr :put, :bookmark, topic_id: pm.topic_id
+      put :bookmark, params: { topic_id: pm.topic_id }, format: :json
       expect(response).to be_forbidden
     end
   end
 
-
   describe 'reset_new' do
     it 'needs you to be logged in' do
-      expect { xhr :put, :reset_new }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        put :reset_new, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     let(:user) { log_in(:user) }
@@ -1276,7 +1512,7 @@ describe TopicsController do
 
       user.user_stat.update_column(:new_since, old_date)
 
-      xhr :put, :reset_new
+      put :reset_new, format: :json
       user.reload
       expect(user.user_stat.new_since.to_date).not_to eq(old_date.to_date)
     end
@@ -1285,7 +1521,7 @@ describe TopicsController do
 
   describe "feature_stats" do
     it "works" do
-      xhr :get, :feature_stats, category_id: 1
+      get :feature_stats, params: { category_id: 1 }, format: :json
 
       expect(response).to be_success
       json = JSON.parse(response.body)
@@ -1297,7 +1533,7 @@ describe TopicsController do
     it "allows unlisted banner topic" do
       Fabricate(:topic, category_id: 1, archetype: Archetype.banner, visible: false)
 
-      xhr :get, :feature_stats, category_id: 1
+      get :feature_stats, params: { category_id: 1 }, format: :json
       json = JSON.parse(response.body)
       expect(json["banner_count"]).to eq(1)
     end
@@ -1306,13 +1542,13 @@ describe TopicsController do
   describe "x-robots-tag" do
     it "is included for unlisted topics" do
       topic = Fabricate(:topic, visible: false)
-      get :show, topic_id: topic.id, slug: topic.slug
+      get :show, params: { topic_id: topic.id, slug: topic.slug }, format: :json
 
       expect(response.headers['X-Robots-Tag']).to eq('noindex')
     end
     it "is not included for normal topics" do
       topic = Fabricate(:topic, visible: true)
-      get :show, topic_id: topic.id, slug: topic.slug
+      get :show, params: { topic_id: topic.id, slug: topic.slug }, format: :json
 
       expect(response.headers['X-Robots-Tag']).to eq(nil)
     end
@@ -1327,11 +1563,13 @@ describe TopicsController do
 
       random_post = Fabricate(:post)
 
-
-      xhr :get, :excerpts, topic_id: first_post.topic_id, post_ids: [first_post.id, second_post.id, random_post.id]
+      get :excerpts, params: {
+        topic_id: first_post.topic_id,
+        post_ids: [first_post.id, second_post.id, random_post.id]
+      }, format: :json
 
       json = JSON.parse(response.body)
-      json.sort!{|a,b| a["post_id"] <=> b["post_id"]}
+      json.sort! { |a, b| a["post_id"] <=> b["post_id"] }
 
       # no random post
       expect(json.length).to eq(2)
@@ -1343,14 +1581,15 @@ describe TopicsController do
 
       expect(json[1]["excerpt"]).to match(/second post/)
 
-
     end
 
   end
 
   context "convert_topic" do
     it 'needs you to be logged in' do
-      expect { xhr :put, :convert_topic, id: 111, type: "private" }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        put :convert_topic, params: { id: 111, type: "private" }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     describe 'converting public topic to private message' do
@@ -1359,7 +1598,10 @@ describe TopicsController do
 
       it "raises an error when the user doesn't have permission to convert topic" do
         log_in
-        xhr :put, :convert_topic, id: topic.id, type: "private"
+        put :convert_topic, params: {
+          id: topic.id, type: "private"
+        }, format: :json
+
         expect(response).to be_forbidden
       end
 
@@ -1367,7 +1609,10 @@ describe TopicsController do
         before do
           admin = log_in(:admin)
           Topic.any_instance.expects(:convert_to_private_message).with(admin).returns(topic)
-          xhr :put, :convert_topic, id: topic.id, type: "private"
+
+          put :convert_topic, params: {
+            id: topic.id, type: "private"
+          }, format: :json
         end
 
         it "returns success" do
@@ -1385,7 +1630,10 @@ describe TopicsController do
 
       it "raises an error when the user doesn't have permission to convert topic" do
         log_in
-        xhr :put, :convert_topic, id: topic.id, type: "public"
+        put :convert_topic, params: {
+          id: topic.id, type: "public"
+        }, format: :json
+
         expect(response).to be_forbidden
       end
 
@@ -1393,7 +1641,10 @@ describe TopicsController do
         before do
           admin = log_in(:admin)
           Topic.any_instance.expects(:convert_to_public_topic).with(admin).returns(topic)
-          xhr :put, :convert_topic, id: topic.id, type: "public"
+
+          put :convert_topic, params: {
+            id: topic.id, type: "public"
+          }, format: :json
         end
 
         it "returns success" do
@@ -1406,4 +1657,4 @@ describe TopicsController do
     end
   end
 
-end
+end
\ No newline at end of file
diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb
index 46f987d16e..988b7f2dc4 100644
--- a/spec/controllers/uploads_controller_spec.rb
+++ b/spec/controllers/uploads_controller_spec.rb
@@ -5,7 +5,7 @@ describe UploadsController do
   context '.create' do
 
     it 'requires you to be logged in' do
-      expect { xhr :post, :create }.to raise_error(Discourse::NotLoggedIn)
+      expect { post :create, format: :json }.to raise_error(Discourse::NotLoggedIn)
     end
 
     context 'logged in' do
@@ -13,60 +13,49 @@ describe UploadsController do
       before { @user = log_in :user }
 
       let(:logo) do
-        ActionDispatch::Http::UploadedFile.new({
-          filename: 'logo.png',
-          tempfile: file_from_fixtures("logo.png")
-        })
+        Rack::Test::UploadedFile.new(file_from_fixtures("logo.png"))
       end
 
       let(:fake_jpg) do
-        ActionDispatch::Http::UploadedFile.new({
-          filename: 'fake.jpg',
-          tempfile: file_from_fixtures("fake.jpg")
-        })
+        Rack::Test::UploadedFile.new(file_from_fixtures("fake.jpg"))
       end
 
       let(:text_file) do
-        ActionDispatch::Http::UploadedFile.new({
-          filename: 'LICENSE.TXT',
-          tempfile: File.new("#{Rails.root}/LICENSE.txt")
-        })
+        Rack::Test::UploadedFile.new(File.new("#{Rails.root}/LICENSE.txt"))
       end
 
       it 'expects a type' do
-        expect { xhr :post, :create, file: logo }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          post :create, params: { format: :json, file: logo }
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
-      it 'parameterize the type' do
-        subject.expects(:create_upload).with(logo, nil, "super_long_type_with_charssuper_long_type_with_char")
-        xhr :post, :create, file: logo, type: "super \# long \//\\ type with \\. $%^&*( chars" * 5
+      it 'can look up long urls' do
+        upload = Fabricate(:upload)
+        post :lookup_urls, params: { short_urls: [upload.short_url], format: :json }
+        result = JSON.parse(response.body)
+        expect(result[0]["url"]).to eq(upload.url)
       end
 
       it 'is successful with an image' do
         Jobs.expects(:enqueue).with(:create_avatar_thumbnails, anything)
 
-        message = MessageBus.track_publish do
-          xhr :post, :create, file: logo, type: "avatar"
-        end.first
+        post :create, params: { file: logo, type: "avatar", format: :json }
 
         expect(response.status).to eq 200
-
-        expect(message.channel).to eq("/uploads/avatar")
-        expect(message.data).to be
+        expect(JSON.parse(response.body)["id"]).to be
       end
 
       it 'is successful with an attachment' do
-        SiteSetting.stubs(:authorized_extensions).returns("*")
+        SiteSetting.authorized_extensions = "*"
 
         Jobs.expects(:enqueue).never
 
-        message = MessageBus.track_publish do
-          xhr :post, :create, file: text_file, type: "composer"
-        end.first
+        post :create, params: { file: text_file, type: "composer", format: :json }
 
         expect(response.status).to eq 200
-        expect(message.channel).to eq("/uploads/composer")
-        expect(message.data).to be
+        id = JSON.parse(response.body)["id"]
+        expect(id).to be
       end
 
       it 'is successful with synchronous api' do
@@ -78,73 +67,94 @@ describe UploadsController do
         stub_request(:head, 'http://example.com/image.png')
         stub_request(:get, "http://example.com/image.png").to_return(body: File.read('spec/fixtures/images/logo.png'))
 
-        xhr :post, :create, url: 'http://example.com/image.png', type: "avatar", synchronous: true
+        post :create, params: {
+          url: 'http://example.com/image.png',
+          type: "avatar",
+          synchronous: true,
+          format: :json
+        }
 
         json = ::JSON.parse(response.body)
 
         expect(response.status).to eq 200
         expect(json["id"]).to be
+        expect(json["short_url"]).to eq("upload://qUm0DGR49PAZshIi7HxMd3cAlzn.png")
       end
 
       it 'correctly sets retain_hours for admins' do
         log_in :admin
         Jobs.expects(:enqueue).with(:create_avatar_thumbnails, anything).never
 
-        message = MessageBus.track_publish do
-          xhr :post, :create, file: logo, retain_hours: 100, type: "profile_background"
-        end.first
+        post :create, params: {
+          file: logo,
+          retain_hours: 100,
+          type: "profile_background",
+          format: :json
+        }
 
-        id = message.data["id"]
+        id = JSON.parse(response.body)["id"]
         expect(Upload.find(id).retain_hours).to eq(100)
       end
 
       it 'requires a file' do
         Jobs.expects(:enqueue).never
 
-        message = MessageBus.track_publish do
-          xhr :post, :create, type: "composer"
-        end.first
+        post :create, params: { type: "composer", format: :json }
 
-        expect(response.status).to eq 200
-        expect(message.data["errors"]).to contain_exactly(I18n.t("upload.file_missing"))
+        message = JSON.parse(response.body)
+        expect(response.status).to eq 422
+        expect(message["errors"]).to contain_exactly(I18n.t("upload.file_missing"))
       end
 
       it 'properly returns errors' do
-        SiteSetting.stubs(:max_attachment_size_kb).returns(1)
+        SiteSetting.max_attachment_size_kb = 1
 
         Jobs.expects(:enqueue).never
 
-        message = MessageBus.track_publish do
-          xhr :post, :create, file: text_file, type: "avatar"
-        end.first
+        post :create, params: { file: text_file, type: "avatar", format: :json }
 
-        expect(response.status).to eq 200
-        expect(message.data["errors"]).to be
+        expect(response.status).to eq 422
+        errors = JSON.parse(response.body)["errors"]
+        expect(errors).to be
       end
 
       it 'ensures allow_uploaded_avatars is enabled when uploading an avatar' do
-        SiteSetting.stubs(:allow_uploaded_avatars).returns(false)
-        xhr :post, :create, file: logo, type: "avatar"
+        SiteSetting.allow_uploaded_avatars = false
+        post :create, params: { file: logo, type: "avatar", format: :json }
         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)
-        xhr :post, :create, file: logo, type: "avatar"
+        SiteSetting.sso_overrides_avatar = true
+        post :create, params: { file: logo, type: "avatar", format: :json }
         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)
+
+        post :create, params: {
+          file: text_file,
+          type: "composer",
+          for_private_message: "true",
+          format: :json
+        }
+
+        expect(response).to be_success
+        id = JSON.parse(response.body)["id"]
+        expect(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
 
-        message = MessageBus.track_publish do
-          xhr :post, :create, file: fake_jpg, type: "composer"
-        end.first
+        post :create, params: { file: fake_jpg, type: "composer", format: :json }
 
-        expect(response.status).to eq 200
-
-        expect(message.channel).to eq("/uploads/composer")
-        expect(message.data["errors"]).to contain_exactly(I18n.t("upload.images.size_not_found"))
+        expect(response.status).to eq 422
+        message = JSON.parse(response.body)["errors"]
+        expect(message).to contain_exactly(I18n.t("upload.images.size_not_found"))
       end
 
     end
@@ -161,14 +171,14 @@ describe UploadsController do
       Discourse.stubs(:store).returns(store)
       Upload.expects(:find_by).never
 
-      get :show, site: site, sha: sha, extension: "pdf"
+      get :show, params: { site: site, sha: sha, extension: "pdf" }
       expect(response.response_code).to eq(404)
     end
 
     it "returns 404 when the upload doesn't exist" do
       Upload.stubs(:find_by).returns(nil)
 
-      get :show, site: site, sha: sha, extension: "pdf"
+      get :show, params: { site: site, sha: sha, extension: "pdf" }
       expect(response.response_code).to eq(404)
     end
 
@@ -179,7 +189,7 @@ describe UploadsController do
       controller.stubs(:render)
       controller.expects(:send_file)
 
-      get :show, site: site, sha: sha, extension: "zip"
+      get :show, params: { site: site, sha: sha, extension: "zip" }
     end
 
     it "handles file without extension" do
@@ -188,18 +198,18 @@ describe UploadsController do
       controller.stubs(:render)
       controller.expects(:send_file)
 
-      get :show, site: site, sha: sha
+      get :show, params: { site: site, sha: sha, format: :json }
       expect(response).to be_success
     end
 
     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
 
-        get :show, site: site, sha: sha, extension: "pdf"
+        get :show, params: { site: site, sha: sha, extension: "pdf", format: :json }
         expect(response.response_code).to eq(404)
       end
 
diff --git a/spec/controllers/user_actions_controller_spec.rb b/spec/controllers/user_actions_controller_spec.rb
index 9e60610127..79cf2ac108 100644
--- a/spec/controllers/user_actions_controller_spec.rb
+++ b/spec/controllers/user_actions_controller_spec.rb
@@ -5,14 +5,16 @@ describe UserActionsController do
   context 'index' do
 
     it 'fails if username is not specified' do
-      expect { xhr :get, :index }.to raise_error(ActionController::ParameterMissing)
+      expect do
+        get :index, format: :json
+      end.to raise_error(ActionController::ParameterMissing)
     end
 
     it 'renders list correctly' do
       UserActionCreator.enable
       post = Fabricate(:post)
 
-      xhr :get, :index, username: post.user.username
+      get :index, params: { username: post.user.username }, format: :json
 
       expect(response.status).to eq(200)
       parsed = JSON.parse(response.body)
@@ -27,7 +29,11 @@ describe UserActionsController do
     it 'renders help text if provided for self' do
       logged_in = log_in
 
-      xhr :get, :index, filter: UserAction::LIKE, username: logged_in.username, no_results_help_key: "user_activity.no_bookmarks"
+      get :index, params: {
+        filter: UserAction::LIKE,
+        username: logged_in.username,
+        no_results_help_key: "user_activity.no_bookmarks"
+      }, format: :json
 
       expect(response.status).to eq(200)
       parsed = JSON.parse(response.body)
@@ -38,7 +44,12 @@ describe UserActionsController do
 
     it 'renders help text for others' do
       user = Fabricate(:user)
-      xhr :get, :index, filter: UserAction::LIKE, username: user.username, no_results_help_key: "user_activity.no_bookmarks"
+
+      get :index, params: {
+        filter: UserAction::LIKE,
+        username: user.username,
+        no_results_help_key: "user_activity.no_bookmarks"
+      }, format: :json
 
       expect(response.status).to eq(200)
       parsed = JSON.parse(response.body)
@@ -50,7 +61,9 @@ describe UserActionsController do
       context "without access" do
         let(:user) { Fabricate(:user) }
         it "raises an exception" do
-          xhr :get, :index, username: user.username, filter: UserAction::PENDING
+          get :index, params: {
+            username: user.username, filter: UserAction::PENDING
+          }, format: :json
           expect(response).to_not be_success
 
         end
@@ -62,7 +75,9 @@ describe UserActionsController do
         it 'finds queued posts' do
           queued_post = PostEnqueuer.new(user, 'default').enqueue(raw: 'this is the raw enqueued content')
 
-          xhr :get, :index, username: user.username, filter: UserAction::PENDING
+          get :index, params: {
+            username: user.username, filter: UserAction::PENDING
+          }, format: :json
 
           expect(response.status).to eq(200)
           parsed = JSON.parse(response.body)
diff --git a/spec/controllers/user_api_keys_controller_spec.rb b/spec/controllers/user_api_keys_controller_spec.rb
index 18dccdc8c7..64a43182a1 100644
--- a/spec/controllers/user_api_keys_controller_spec.rb
+++ b/spec/controllers/user_api_keys_controller_spec.rb
@@ -3,40 +3,40 @@ require 'rails_helper'
 describe UserApiKeysController do
 
   let :public_key do
-    <<TXT
------BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDh7BS7Ey8hfbNhlNAW/47pqT7w
-IhBz3UyBYzin8JurEQ2pY9jWWlY8CH147KyIZf1fpcsi7ZNxGHeDhVsbtUKZxnFV
-p16Op3CHLJnnJKKBMNdXMy0yDfCAHZtqxeBOTcCo1Vt/bHpIgiK5kmaekyXIaD0n
-w0z/BYpOgZ8QwnI5ZwIDAQAB
------END PUBLIC KEY-----
-TXT
+    <<~TXT
+    -----BEGIN PUBLIC KEY-----
+    MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDh7BS7Ey8hfbNhlNAW/47pqT7w
+    IhBz3UyBYzin8JurEQ2pY9jWWlY8CH147KyIZf1fpcsi7ZNxGHeDhVsbtUKZxnFV
+    p16Op3CHLJnnJKKBMNdXMy0yDfCAHZtqxeBOTcCo1Vt/bHpIgiK5kmaekyXIaD0n
+    w0z/BYpOgZ8QwnI5ZwIDAQAB
+    -----END PUBLIC KEY-----
+    TXT
   end
 
   let :private_key do
-    <<TXT
------BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDh7BS7Ey8hfbNhlNAW/47pqT7wIhBz3UyBYzin8JurEQ2pY9jW
-WlY8CH147KyIZf1fpcsi7ZNxGHeDhVsbtUKZxnFVp16Op3CHLJnnJKKBMNdXMy0y
-DfCAHZtqxeBOTcCo1Vt/bHpIgiK5kmaekyXIaD0nw0z/BYpOgZ8QwnI5ZwIDAQAB
-AoGAeHesbjzCivc+KbBybXEEQbBPsThY0Y+VdgD0ewif2U4UnNhzDYnKJeTZExwQ
-vAK2YsRDV3KbhljnkagQduvmgJyCKuV/CxZvbJddwyIs3+U2D4XysQp3e1YZ7ROr
-YlOIoekHCx1CNm6A4iImqGxB0aJ7Owdk3+QSIaMtGQWaPTECQQDz2UjJ+bomguNs
-zdcv3ZP7W3U5RG+TpInSHiJXpt2JdNGfHItozGJCxfzDhuKHK5Cb23bgldkvB9Xc
-p/tngTtNAkEA7S4cqUezA82xS7aYPehpRkKEmqzMwR3e9WeL7nZ2cdjZAHgXe49l
-3mBhidEyRmtPqbXo1Xix8LDuqik0IdnlgwJAQeYTnLnHS8cNjQbnw4C/ECu8Nzi+
-aokJ0eXg5A0tS4ttZvGA31Z0q5Tz5SdbqqnkT6p0qub0JZiZfCNNdsBe9QJAaGT5
-fJDwfGYW+YpfLDCV1bUFhMc2QHITZtSyxL0jmSynJwu02k/duKmXhP+tL02gfMRy
-vTMorxZRllgYeCXeXQJAEGRXR8/26jwqPtKKJzC7i9BuOYEagqj0nLG2YYfffCMc
-d3JGCf7DMaUlaUE8bJ08PtHRJFSGkNfDJLhLKSjpbw==
------END RSA PRIVATE KEY-----
-TXT
+    <<~TXT
+    -----BEGIN RSA PRIVATE KEY-----
+    MIICWwIBAAKBgQDh7BS7Ey8hfbNhlNAW/47pqT7wIhBz3UyBYzin8JurEQ2pY9jW
+    WlY8CH147KyIZf1fpcsi7ZNxGHeDhVsbtUKZxnFVp16Op3CHLJnnJKKBMNdXMy0y
+    DfCAHZtqxeBOTcCo1Vt/bHpIgiK5kmaekyXIaD0nw0z/BYpOgZ8QwnI5ZwIDAQAB
+    AoGAeHesbjzCivc+KbBybXEEQbBPsThY0Y+VdgD0ewif2U4UnNhzDYnKJeTZExwQ
+    vAK2YsRDV3KbhljnkagQduvmgJyCKuV/CxZvbJddwyIs3+U2D4XysQp3e1YZ7ROr
+    YlOIoekHCx1CNm6A4iImqGxB0aJ7Owdk3+QSIaMtGQWaPTECQQDz2UjJ+bomguNs
+    zdcv3ZP7W3U5RG+TpInSHiJXpt2JdNGfHItozGJCxfzDhuKHK5Cb23bgldkvB9Xc
+    p/tngTtNAkEA7S4cqUezA82xS7aYPehpRkKEmqzMwR3e9WeL7nZ2cdjZAHgXe49l
+    3mBhidEyRmtPqbXo1Xix8LDuqik0IdnlgwJAQeYTnLnHS8cNjQbnw4C/ECu8Nzi+
+    aokJ0eXg5A0tS4ttZvGA31Z0q5Tz5SdbqqnkT6p0qub0JZiZfCNNdsBe9QJAaGT5
+    fJDwfGYW+YpfLDCV1bUFhMc2QHITZtSyxL0jmSynJwu02k/duKmXhP+tL02gfMRy
+    vTMorxZRllgYeCXeXQJAEGRXR8/26jwqPtKKJzC7i9BuOYEagqj0nLG2YYfffCMc
+    d3JGCf7DMaUlaUE8bJ08PtHRJFSGkNfDJLhLKSjpbw==
+    -----END RSA PRIVATE KEY-----
+    TXT
   end
 
   let :args do
     {
       scopes: 'read',
-      client_id: "x"*32,
+      client_id: "x" * 32,
       auth_redirect: 'http://over.the/rainbow',
       application_name: 'foo',
       public_key: public_key,
@@ -56,13 +56,13 @@ TXT
 
     it "does not allow anon" do
       expect {
-        post :create, args
+        post :create, params: args, format: :json
       }.to raise_error(Discourse::NotLoggedIn)
     end
 
     it "refuses to redirect to disallowed place" do
       log_in_user(Fabricate(:user))
-      post :create, args
+      post :create, params: args, format: :json
       expect(response.code).to eq("403")
     end
 
@@ -74,7 +74,7 @@ TXT
 
       log_in_user(user)
 
-      post :create, args
+      post :create, params: args, format: :json
       expect(response.code).to eq("302")
     end
 
@@ -86,7 +86,7 @@ TXT
 
       log_in_user(user)
 
-      post :create, args
+      post :create, params: args, format: :json
       expect(response.code).to eq("403")
 
     end
@@ -101,7 +101,7 @@ TXT
 
       log_in_user(user)
 
-      post :create, args
+      post :create, params: args, format: :json
       expect(response.code).to eq("403")
 
     end
@@ -109,7 +109,7 @@ TXT
     it "allows for a revoke with no id" do
       key = Fabricate(:readonly_user_api_key)
       request.env['HTTP_USER_API_KEY'] = key.key
-      post :revoke
+      post :revoke, format: :json
 
       expect(response.status).to eq(200)
 
@@ -122,7 +122,7 @@ TXT
       key2 = Fabricate(:readonly_user_api_key)
 
       request.env['HTTP_USER_API_KEY'] = key1.key
-      post :revoke, id: key2.id
+      post :revoke, params: { id: key2.id }, format: :json
 
       expect(response.status).to eq(403)
     end
@@ -130,7 +130,7 @@ TXT
     it "will allow readonly api keys to revoke self" do
       key = Fabricate(:readonly_user_api_key)
       request.env['HTTP_USER_API_KEY'] = key.key
-      post :revoke, id: key.id
+      post :revoke, params: { id: key.id }, format: :json
 
       expect(response.status).to eq(200)
 
@@ -149,7 +149,7 @@ TXT
 
       log_in_user(user)
 
-      post :create, args
+      post :create, params: args, format: :json
       expect(response.code).to eq("302")
 
       uri = URI.parse(response.redirect_url)
@@ -184,7 +184,7 @@ TXT
 
       log_in_user(user)
 
-      post :create, args
+      post :create, params: args, format: :json
       expect(response.code).to eq("302")
 
       uri = URI.parse(response.redirect_url)
@@ -206,13 +206,12 @@ TXT
       expect(api_key.scopes.sort).to eq(["push", "message_bus", "notifications", "session_info"].sort)
       expect(api_key.push_url).to eq("https://push.it/here")
 
-
       uri.query = ""
       expect(uri.to_s).to eq(args[:auth_redirect] + "?")
 
       # should overwrite if needed
       args["access"] = "pr"
-      post :create, args
+      post :create, params: args, format: :json
 
       expect(response.code).to eq("302")
     end
diff --git a/spec/controllers/user_avatars_controller_spec.rb b/spec/controllers/user_avatars_controller_spec.rb
index e558c1a8c2..57a9a2cdf3 100644
--- a/spec/controllers/user_avatars_controller_spec.rb
+++ b/spec/controllers/user_avatars_controller_spec.rb
@@ -5,12 +5,19 @@ describe UserAvatarsController do
   context 'show_proxy_letter' do
     it 'returns not found if external avatar is set somewhere else' do
       SiteSetting.external_system_avatars_url = "https://somewhere.else.com/avatar.png"
-      response = get :show_proxy_letter, version: 'v2', letter: 'a', color: 'aaaaaa', size: 20
+
+      get :show_proxy_letter, params: {
+        version: 'v2', letter: 'a', color: 'aaaaaa', size: 20
+      }, format: :json
+
       expect(response.status).to eq(404)
     end
 
     it 'returns an avatar if we are allowing the proxy' do
-      response = get :show_proxy_letter, version: 'v2', letter: 'a', color: 'aaaaaa', size: 360
+      get :show_proxy_letter, params: {
+        version: 'v2', letter: 'a', color: 'aaaaaa', size: 360
+      }, format: :json
+
       expect(response.status).to eq(200)
     end
   end
@@ -29,25 +36,31 @@ describe UserAvatarsController do
 
       GlobalSetting.expects(:cdn_url).returns("http://awesome.com/boom")
 
-
       upload = Fabricate(:upload, url: "//test.s3.amazonaws.com/something")
+
       Fabricate(:optimized_image,
-                              sha1: SecureRandom.hex << "A"*8,
-                              upload: upload,
-                              width: 98,
-                              height: 98,
-                              url: "//test.s3.amazonaws.com/something/else")
+        sha1: SecureRandom.hex << "A" * 8,
+        upload: upload,
+        width: 98,
+        height: 98,
+        url: "//test.s3.amazonaws.com/something/else"
+      )
 
       user = Fabricate(:user, uploaded_avatar_id: upload.id)
 
-      get :show, size: 97, username: user.username, version: upload.id, hostname: 'default'
+      get :show, params: {
+        size: 97, username: user.username, version: upload.id, hostname: 'default'
+      }, format: :json
 
       # 98 is closest which is 49 * 2 for retina
       expect(response).to redirect_to("http://awesome.com/boom/user_avatar/default/#{user.username_lower}/98/#{upload.id}_#{OptimizedImage::VERSION}.png")
 
-      get :show, size: 98, username: user.username, version: upload.id, hostname: 'default'
+      get :show, params: {
+        size: 98, username: user.username, version: upload.id, hostname: 'default'
+      }, format: :json
+
       expect(response.body).to eq("image")
-      expect(response.headers["Cache-Control"]).to eq('max-age=31557600, public, immutable')
+      expect(response.headers["Cache-Control"]).to eq('max-age=31556952, public, immutable')
     end
 
     it 'serves image even if size missing and its in local mode' do
@@ -56,7 +69,10 @@ describe UserAvatarsController do
       upload = Fabricate(:upload)
       user = Fabricate(:user, uploaded_avatar_id: upload.id)
 
-      get :show, size: 51, username: user.username, version: upload.id, hostname: 'default'
+      get :show, params: {
+        size: 51, username: user.username, version: upload.id, hostname: 'default'
+      }, format: :json
+
       expect(response).to be_success
     end
   end
diff --git a/spec/controllers/user_badges_controller_spec.rb b/spec/controllers/user_badges_controller_spec.rb
index 7e2cda7f04..0d9dd609ef 100644
--- a/spec/controllers/user_badges_controller_spec.rb
+++ b/spec/controllers/user_badges_controller_spec.rb
@@ -5,30 +5,38 @@ describe UserBadgesController do
   let(:badge) { Fabricate(:badge) }
 
   context 'index' do
+    let(:badge) { Fabricate(:badge, target_posts: true, show_posts: false) }
     it 'does not leak private info' do
-      badge = Fabricate(:badge, target_posts: true, show_posts: false)
       p = create_post
       UserBadge.create(badge: badge, user: user, post_id: p.id, granted_by_id: -1, granted_at: Time.now)
 
-      xhr :get, :index, badge_id: badge.id
-      expect(response.status).to eq(200)
+      get :index, params: { badge_id: badge.id }, format: :json
+      expect(response).to be_success
 
       parsed = JSON.parse(response.body)
       expect(parsed["topics"]).to eq(nil)
       expect(parsed["badges"].length).to eq(1)
       expect(parsed["user_badge_info"]["user_badges"][0]["post_id"]).to eq(nil)
     end
+
+    it "fails when badges are disabled" do
+      SiteSetting.enable_badges = false
+      get :index, params: { badge_id: badge.id }, format: :json
+      expect(response.status).to eq(404)
+    end
   end
 
   context 'index' do
     let!(:user_badge) { UserBadge.create(badge: badge, user: user, granted_by: Discourse.system_user, granted_at: Time.now) }
 
     it 'requires username or badge_id to be specified' do
-      expect { xhr :get, :index }.to raise_error(ActionController::ParameterMissing)
+      expect do
+        get :index, format: :json
+      end.to raise_error(ActionController::ParameterMissing)
     end
 
     it 'returns user_badges for a user' do
-      xhr :get, :username, username: user.username
+      get :username, params: { username: user.username }, format: :json
 
       expect(response.status).to eq(200)
       parsed = JSON.parse(response.body)
@@ -36,7 +44,7 @@ describe UserBadgesController do
     end
 
     it 'returns user_badges for a badge' do
-      xhr :get, :index, badge_id: badge.id
+      get :index, params: { badge_id: badge.id }, format: :json
 
       expect(response.status).to eq(200)
       parsed = JSON.parse(response.body)
@@ -44,7 +52,9 @@ describe UserBadgesController do
     end
 
     it 'includes counts when passed the aggregate argument' do
-      xhr :get, :username, username: user.username, grouped: true
+      get :username, params: {
+        username: user.username, grouped: true
+      }, format: :json
 
       expect(response.status).to eq(200)
       parsed = JSON.parse(response.body)
@@ -54,26 +64,34 @@ describe UserBadgesController do
 
   context 'create' do
     it 'requires username to be specified' do
-      expect { xhr :post, :create, badge_id: badge.id }.to raise_error(ActionController::ParameterMissing)
+      expect do
+        post :create, params: { badge_id: badge.id }, format: :json
+      end.to raise_error(ActionController::ParameterMissing)
     end
 
     it 'does not allow regular users to grant badges' do
       log_in_user Fabricate(:user)
-      xhr :post, :create, badge_id: badge.id, username: user.username
+
+      post :create, params: {
+        badge_id: badge.id, username: user.username
+      }, format: :json
+
       expect(response.status).to eq(403)
     end
 
     it 'grants badges from staff' do
       admin = Fabricate(:admin)
-      post = create_post
+      post_1 = create_post
 
       log_in_user admin
 
       StaffActionLogger.any_instance.expects(:log_badge_grant).once
 
-      xhr :post, :create, badge_id: badge.id,
-                          username: user.username,
-                          reason: Discourse.base_url + post.url
+      post :create, params: {
+        badge_id: badge.id,
+        username: user.username,
+        reason: Discourse.base_url + post_1.url
+      }, format: :json
 
       expect(response.status).to eq(200)
 
@@ -81,19 +99,27 @@ describe UserBadgesController do
 
       expect(user_badge).to be_present
       expect(user_badge.granted_by).to eq(admin)
-      expect(user_badge.post_id).to eq(post.id)
+      expect(user_badge.post_id).to eq(post_1.id)
     end
 
     it 'does not grant badges from regular api calls' do
       Fabricate(:api_key, user: user)
-      xhr :post, :create, badge_id: badge.id, username: user.username, api_key: user.api_key.key
+
+      post :create, params: {
+        badge_id: badge.id, username: user.username, api_key: user.api_key.key
+      }, format: :json
+
       expect(response.status).to eq(403)
     end
 
     it 'grants badges from master api calls' do
       api_key = Fabricate(:api_key)
       StaffActionLogger.any_instance.expects(:log_badge_grant).never
-      xhr :post, :create, badge_id: badge.id, username: user.username, api_key: api_key.key, api_username: "system"
+
+      post :create, params: {
+        badge_id: badge.id, username: user.username, api_key: api_key.key, api_username: "system"
+      }, format: :json
+
       expect(response.status).to eq(200)
       user_badge = UserBadge.find_by(user: user, badge: badge)
       expect(user_badge).to be_present
@@ -103,8 +129,14 @@ describe UserBadgesController do
     it 'will trigger :user_badge_granted' do
       log_in :admin
       user
-      DiscourseEvent.expects(:trigger).with(:user_badge_granted, anything, anything).once
-      xhr :post, :create, badge_id: badge.id, username: user.username
+
+      event = DiscourseEvent.track_events do
+        post :create, params: {
+          badge_id: badge.id, username: user.username
+        }, format: :json
+      end.first
+
+      expect(event[:event_name]).to eq(:user_badge_granted)
     end
   end
 
@@ -112,14 +144,14 @@ describe UserBadgesController do
     let!(:user_badge) { UserBadge.create(badge: badge, user: user, granted_by: Discourse.system_user, granted_at: Time.now) }
 
     it 'checks that the user is authorized to revoke a badge' do
-      xhr :delete, :destroy, id: user_badge.id
+      delete :destroy, params: { id: user_badge.id }, format: :json
       expect(response.status).to eq(403)
     end
 
     it 'revokes the badge' do
       log_in :admin
       StaffActionLogger.any_instance.expects(:log_badge_revoke).once
-      xhr :delete, :destroy, id: user_badge.id
+      delete :destroy, params: { id: user_badge.id }, format: :json
       expect(response.status).to eq(200)
       expect(UserBadge.find_by(id: user_badge.id)).to eq(nil)
     end
@@ -127,8 +159,11 @@ describe UserBadgesController do
     it 'will trigger :user_badge_removed' do
       log_in :admin
 
-      DiscourseEvent.expects(:trigger).with(:user_badge_removed, anything, anything).once
-      xhr :delete, :destroy, id: user_badge.id
+      event = DiscourseEvent.track_events do
+        delete :destroy, params: { id: user_badge.id }, format: :json
+      end.first
+
+      expect(event[:event_name]).to eq(:user_badge_removed)
     end
   end
 end
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 32ea5692df..e5715baf88 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -9,13 +9,13 @@ describe UsersController do
       let(:user) { Discourse.system_user }
 
       it "returns success" do
-        xhr :get, :show, username: user.username, format: :json
+        get :show, params: { username: user.username }, format: :json
         expect(response).to be_success
       end
 
       it "should redirect to login page for anonymous user when profiles are hidden" do
         SiteSetting.hide_user_profiles_from_public = true
-        xhr :get, :show, username: user.username, format: :json
+        get :show, params: { username: user.username }, format: :json
         expect(response).to redirect_to '/login'
       end
 
@@ -26,7 +26,7 @@ describe UsersController do
       let(:user) { log_in }
 
       it 'returns success' do
-        xhr :get, :show, username: user.username, format: :json
+        get :show, params: { username: user.username, format: :json }, format: :json
         expect(response).to be_success
         json = JSON.parse(response.body)
 
@@ -34,19 +34,27 @@ describe UsersController do
       end
 
       it "returns not found when the username doesn't exist" do
-        xhr :get, :show, username: 'madeuppity'
+        get :show, params: { username: 'madeuppity' }, format: :json
         expect(response).not_to be_success
       end
 
       it 'returns not found when the user is inactive' do
         inactive = Fabricate(:user, active: false)
-        xhr :get, :show, username: inactive.username
+        get :show, params: { username: inactive.username }, format: :json
         expect(response).not_to be_success
       end
 
+      it 'returns success when show_inactive_accounts is true and user is logged in' do
+        SiteSetting.show_inactive_accounts = true
+        log_in_user(user)
+        inactive = Fabricate(:user, active: false)
+        get :show, params: { username: inactive.username }, format: :json
+        expect(response).to be_success
+      end
+
       it "raises an error on invalid access" do
         Guardian.any_instance.expects(:can_see?).with(user).returns(false)
-        xhr :get, :show, username: user.username
+        get :show, params: { username: user.username }, format: :json
         expect(response).to be_forbidden
       end
 
@@ -55,22 +63,22 @@ describe UsersController do
 
         it "should track a user profile view for a signed in user" do
           UserProfileView.expects(:add).with(other_user.user_profile.id, request.remote_ip, user.id)
-          xhr :get, :show, username: other_user.username
+          get :show, params: { username: other_user.username }, format: :json
         end
 
         it "should not track a user profile view for a user viewing his own profile" do
           UserProfileView.expects(:add).never
-          xhr :get, :show, username: user.username
+          get :show, params: { username: user.username }, format: :json
         end
 
         it "should track a user profile view for an anon user" do
           UserProfileView.expects(:add).with(other_user.user_profile.id, request.remote_ip, nil)
-          xhr :get, :show, username: other_user.username
+          get :show, params: { username: other_user.username }, format: :json
         end
 
         it "skips tracking" do
           UserProfileView.expects(:add).never
-          xhr :get, :show, { username: user.username, skip_track_visit: true }
+          get :show, params: { username: user.username, skip_track_visit: true }, format: :json
         end
       end
 
@@ -78,16 +86,49 @@ describe UsersController do
         before { user.create_single_sign_on_record(external_id: '997', last_payload: '') }
 
         it "returns fetch for a matching external_id" do
-          xhr :get, :show, external_id: '997'
+          get :show, params: { external_id: '997' }, format: :json
           expect(response).to be_success
         end
 
         it "returns not found when external_id doesn't match" do
-          xhr :get, :show, external_id: '99'
+          get :show, params: { external_id: '99' }, format: :json
           expect(response).not_to be_success
         end
       end
 
+      describe "include_post_count_for" do
+
+        let(:admin) { Fabricate(:admin) }
+        let(:topic) { Fabricate(:topic) }
+
+        before do
+          Fabricate(:post, user: user, topic: topic)
+          Fabricate(:post, user: admin, topic: topic)
+          Fabricate(:post, user: admin, topic: topic, post_type: Post.types[:whisper])
+        end
+
+        it "includes only visible posts" do
+          get :show,
+            params: { username: admin.username, include_post_count_for: topic.id },
+            format: :json
+
+          topic_post_count = JSON.parse(response.body).dig("user", "topic_post_count")
+          expect(topic_post_count[topic.id.to_s]).to eq(1)
+        end
+
+        it "includes all post types for staff members" do
+          log_in_user(admin)
+
+          get :show,
+            params: { username: admin.username, include_post_count_for: topic.id },
+            format: :json
+
+          topic_post_count = JSON.parse(response.body).dig("user", "topic_post_count")
+          expect(topic_post_count[topic.id.to_s]).to eq(2)
+        end
+
+      end
+
     end
 
   end
@@ -113,7 +154,7 @@ describe UsersController do
 
       it 'return success' do
         EmailToken.expects(:confirm).with('asdfasdf').returns(nil)
-        put :perform_account_activation, token: 'asdfasdf'
+        put :perform_account_activation, params: { token: 'asdfasdf' }
         expect(response).to be_success
         expect(flash[:error]).to be_present
       end
@@ -130,60 +171,75 @@ describe UsersController do
         it 'enqueues a welcome message if the user object indicates so' do
           user.send_welcome_message = true
           user.expects(:enqueue_welcome_message).with('welcome_user')
-          put :perform_account_activation, token: 'asdfasdf'
+
+          put :perform_account_activation, params: { token: 'asdfasdf' }
         end
 
         it "doesn't enqueue the welcome message if the object returns false" do
           user.send_welcome_message = false
           user.expects(:enqueue_welcome_message).with('welcome_user').never
-          put :perform_account_activation, token: 'asdfasdf'
+
+          put :perform_account_activation, params: { token: 'asdfasdf' }
         end
       end
 
       context "honeypot" do
         it "raises an error if the honeypot is invalid" do
           UsersController.any_instance.stubs(:honeypot_or_challenge_fails?).returns(true)
-          put :perform_account_activation, token: 'asdfasdf'
+          put :perform_account_activation, params: { token: 'asdfasdf' }, format: :json
           expect(response).not_to be_success
         end
       end
 
       context 'response' do
+        render_views
+
         before do
           Guardian.any_instance.expects(:can_access_forum?).returns(true)
           EmailToken.expects(:confirm).with('asdfasdf').returns(user)
-          put :perform_account_activation, token: 'asdfasdf'
         end
 
         it 'correctly logs on user' do
+          events = DiscourseEvent.track_events do
+            put :perform_account_activation, params: { token: 'asdfasdf' }
+          end
+
+          expect(events.map { |event| event[:event_name] }).to include(
+            :user_logged_in, :user_first_logged_in
+          )
+
           expect(response).to be_success
           expect(flash[:error]).to be_blank
           expect(session[:current_user_id]).to be_present
-          expect(assigns[:needs_approval]).to be_blank
+
+          expect(response).to be_success
+
+          expect(CGI.unescapeHTML(response.body))
+            .to_not include(I18n.t('activation.approval_required'))
         end
 
       end
 
       context 'user is not approved' do
+        render_views
+
         before do
-          Guardian.any_instance.expects(:can_access_forum?).returns(false)
+          SiteSetting.must_approve_users = true
           EmailToken.expects(:confirm).with('asdfasdf').returns(user)
-          put :perform_account_activation, token: 'asdfasdf'
+          put :perform_account_activation, params: { token: 'asdfasdf' }
         end
 
-        it 'returns success' do
+        it 'should return the right response' do
           expect(response).to be_success
-        end
 
-        it 'sets @needs_approval' do
-          expect(assigns[:needs_approval]).to be_present
-        end
+          expect(CGI.unescapeHTML(response.body))
+            .to include(I18n.t('activation.approval_required'))
+
+          expect(response.body).to_not have_tag(:script, with: {
+            src: '/assets/application.js'
+          })
 
-        it "doesn't set an error" do
           expect(flash[:error]).to be_blank
-        end
-
-        it "doesn't log the user in" do
           expect(session[:current_user_id]).to be_blank
         end
       end
@@ -205,7 +261,7 @@ describe UsersController do
         destination_url = 'http://thisisasite.com/somepath'
         request.cookies[:destination_url] = destination_url
 
-        put :perform_account_activation, token: token
+        put :perform_account_activation, params: { token: token }
 
         expect(response).to redirect_to(destination_url)
       end
@@ -218,45 +274,61 @@ describe UsersController do
     context "you can view it even if login is required" do
       it "returns success" do
         SiteSetting.login_required = true
-        get :password_reset, token: 'asdfasdf'
+        get :password_reset, params: { token: 'asdfasdf' }
         expect(response).to be_success
       end
     end
 
     context 'missing token' do
+      render_views
+
       before do
-        get :password_reset, token: SecureRandom.hex
+        get :password_reset, params: { token: SecureRandom.hex }
       end
 
       it 'disallows login' do
-        expect(assigns[:error]).to be_present
-        expect(session[:current_user_id]).to be_blank
         expect(response).to be_success
-        expect(response).to render_template(layout: 'no_ember')
+
+        expect(CGI.unescapeHTML(response.body))
+          .to include(I18n.t('password_reset.no_token'))
+
+        expect(response.body).to_not have_tag(:script, with: {
+          src: '/assets/application.js'
+        })
+
+        expect(session[:current_user_id]).to be_blank
       end
     end
 
     context 'invalid token' do
+      render_views
+
       before do
-        get :password_reset, token: "evil_trout!"
+        get :password_reset, params: { token: "evil_trout!" }
       end
 
       it 'disallows login' do
-        expect(assigns[:error]).to be_present
-        expect(session[:current_user_id]).to be_blank
         expect(response).to be_success
-        expect(response).to render_template(layout: 'no_ember')
+
+        expect(CGI.unescapeHTML(response.body))
+          .to include(I18n.t('password_reset.no_token'))
+
+        expect(response.body).to_not have_tag(:script, with: {
+          src: '/assets/application.js'
+        })
+
+        expect(session[:current_user_id]).to be_blank
       end
     end
 
     context 'valid token' do
-      context 'when rendered' do
-        render_views
+      render_views
 
+      context 'when rendered' do
         it 'renders referrer never on get requests' do
           user = Fabricate(:user)
           token = user.email_tokens.create(email: user.email).token
-          get :password_reset, token: token
+          get :password_reset, params: { token: token }
 
           expect(response.body).to include('<meta name="referrer" content="never">')
         end
@@ -266,12 +338,19 @@ describe UsersController do
         user = Fabricate(:user)
         user_auth_token = UserAuthToken.generate!(user_id: user.id)
         token = user.email_tokens.create(email: user.email).token
+        get :password_reset, params: { token: token }
 
-        get :password_reset, token: token
-        put :password_reset, token: token, password: 'hg9ow8yhg98o'
+        events = DiscourseEvent.track_events do
+          put :password_reset,
+            params: { token: token, password: 'hg9ow8yhg98o' }
+        end
+
+        expect(events.map { |event| event[:event_name] }).to include(
+          :user_logged_in, :user_first_logged_in
+        )
 
         expect(response).to be_success
-        expect(assigns[:error]).to be_blank
+        expect(response.body).to include('{"is_developer":false,"admin":false}')
 
         user.reload
 
@@ -283,9 +362,13 @@ describe UsersController do
         user = Fabricate(:user)
         token = user.email_tokens.create(email: user.email).token
 
-        get :password_reset, token: token
-        put :password_reset, token: token, password: 'hg9ow8yHG32O'
-        put :password_reset, token: token, password: 'test123987AsdfXYZ'
+        get :password_reset, params: { token: token }
+
+        put :password_reset,
+          params: { token: token, password: 'hg9ow8yHG32O' }
+
+        put :password_reset,
+          params: { token: token, password: 'test123987AsdfXYZ' }
 
         user.reload
         expect(user.confirm_password?('hg9ow8yHG32O')).to eq(true)
@@ -294,12 +377,27 @@ 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, params: { token: token }, format: :json
+        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
+        get :password_reset, params: { token: token }
+
+        put :password_reset, params: {
+          token: token, password: 'hg9ow8yhg98oadminlonger'
+        }
+
+        expect(response).to redirect_to(wizard_path)
       end
 
       it "doesn't invalidate the token when loading the page" do
@@ -308,7 +406,7 @@ describe UsersController do
 
         email_token = user.email_tokens.create(email: user.email)
 
-        get :password_reset, token: email_token.token
+        get :password_reset, params: { token: email_token.token }, format: :json
 
         email_token.reload
 
@@ -319,32 +417,48 @@ describe UsersController do
 
     context 'submit change' do
       let(:token) { EmailToken.generate_token }
+
       before do
         EmailToken.expects(:confirm).with(token).returns(user)
       end
 
       it "fails when the password is blank" do
-        put :password_reset, token: token, password: ''
-        expect(assigns(:user).errors).to be_present
+        put :password_reset, params: {
+          token: token, password: ''
+        }, format: :json
+
+        expect(response).to be_success
+        expect(JSON.parse(response.body)["errors"]).to be_present
         expect(session[:current_user_id]).to be_blank
       end
 
       it "fails when the password is too long" do
-        put :password_reset, token: token, password: ('x' * (User.max_password_length + 1))
-        expect(assigns(:user).errors).to be_present
+        put :password_reset, params: {
+          token: token, password: ('x' * (User.max_password_length + 1))
+        }, format: :json
+
+        expect(response).to be_success
+        expect(JSON.parse(response.body)["errors"]).to be_present
         expect(session[:current_user_id]).to be_blank
       end
 
       it "logs in the user" do
-        put :password_reset, token: token, password: 'ksjafh928r'
-        expect(assigns(:user).errors).to be_blank
+        put :password_reset, params: {
+          token: token, password: 'ksjafh928r'
+        }, format: :json
+
+        expect(response).to be_success
+        expect(JSON.parse(response.body)["errors"]).to be_blank
         expect(session[:current_user_id]).to be_present
       end
 
       it "doesn't log in the user when not approved" do
         SiteSetting.must_approve_users = true
-        put :password_reset, token: token, password: 'ksjafh928r'
-        expect(assigns(:user).errors).to be_blank
+        put :password_reset, params: {
+          token: token, password: 'ksjafh928r'
+        }, format: :json
+
+        expect(JSON.parse(response.body)["errors"]).to be_blank
         expect(session[:current_user_id]).to be_blank
       end
     end
@@ -355,14 +469,14 @@ describe UsersController do
 
     it "token doesn't match any records" do
       email_token = user.email_tokens.create(email: user.email)
-      get :confirm_email_token, token: SecureRandom.hex, format: :json
+      get :confirm_email_token, params: { token: SecureRandom.hex }, format: :json
       expect(response).to be_success
       expect(email_token.reload.confirmed).to eq(false)
     end
 
     it "token matches" do
       email_token = user.email_tokens.create(email: user.email)
-      get :confirm_email_token, token: email_token.token, format: :json
+      get :confirm_email_token, params: { token: email_token.token }, format: :json
       expect(response).to be_success
       expect(email_token.reload.confirmed).to eq(true)
     end
@@ -375,33 +489,37 @@ describe UsersController do
     context 'enqueues mail' do
       it 'enqueues mail with admin email and sso enabled' do
         Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :admin_login, user_id: admin.id))
-        put :admin_login, email: admin.email
+        put :admin_login, params: { email: admin.email }
       end
     end
 
     context 'logs in admin' do
       it 'does not log in admin with invalid token' do
+        SiteSetting.sso_url = "https://www.example.com/sso"
         SiteSetting.enable_sso = true
-        get :admin_login, token: "invalid"
+        get :admin_login, params: { token: "invalid" }
         expect(session[:current_user_id]).to be_blank
       end
 
-      it 'does log in admin with valid token and SSO disabled' do
-        SiteSetting.enable_sso = false
-        token = admin.email_tokens.create(email: admin.email).token
+      context 'valid token' do
+        it 'does log in admin with SSO disabled' do
+          SiteSetting.enable_sso = false
+          token = admin.email_tokens.create(email: admin.email).token
 
-        get :admin_login, token: token
-        expect(response).to redirect_to('/')
-        expect(session[:current_user_id]).to eq(admin.id)
-      end
+          get :admin_login, params: { token: token }
+          expect(response).to redirect_to('/')
+          expect(session[:current_user_id]).to eq(admin.id)
+        end
 
-      it 'logs in admin with valid token and SSO enabled' do
-        SiteSetting.enable_sso = true
-        token = admin.email_tokens.create(email: admin.email).token
+        it 'logs in admin with SSO enabled' do
+          SiteSetting.sso_url = "https://www.example.com/sso"
+          SiteSetting.enable_sso = true
+          token = admin.email_tokens.create(email: admin.email).token
 
-        get :admin_login, token: token
-        expect(response).to redirect_to('/')
-        expect(session[:current_user_id]).to eq(admin.id)
+          get :admin_login, params: { token: token }
+          expect(response).to redirect_to('/')
+          expect(session[:current_user_id]).to eq(admin.id)
+        end
       end
     end
   end
@@ -414,11 +532,11 @@ describe UsersController do
       user.trust_level = 1
       user.save
 
-      post :toggle_anon
+      post :toggle_anon, format: :json
       expect(response).to be_success
       expect(session[:current_user_id]).to eq(AnonymousShadowCreator.get(user).id)
 
-      post :toggle_anon
+      post :toggle_anon, format: :json
       expect(response).to be_success
       expect(session[:current_user_id]).to eq(user.id)
 
@@ -443,7 +561,19 @@ describe UsersController do
     end
 
     def post_user
-      xhr :post, :create, post_user_params
+      post :create, params: post_user_params, format: :json
+    end
+
+    context 'when email params is missing' do
+      it 'should raise the right error' do
+        expect do
+          post :create, params: {
+            name: @user.name,
+            username: @user.username,
+            passsword: 'tesing12352343'
+          }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
+      end
     end
 
     context 'when creating a user' do
@@ -485,34 +615,49 @@ describe UsersController do
         expect(session[SessionController::ACTIVATE_USER_KEY]).to be_present
       end
 
-      context "and 'must approve users' site setting is enabled" do
+      context "`must approve users` site setting is enabled" do
         before { SiteSetting.must_approve_users = true }
 
-        it 'does not enqueue an email' do
-          Jobs.expects(:enqueue).never
-          post_user
-        end
+        it 'creates a user correctly' do
+          Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
+          User.any_instance.expects(:enqueue_welcome_message).with('welcome_user').never
 
-        it 'does not login the user' do
           post_user
-          expect(session[:current_user_id]).to be_blank
-        end
 
-        it 'indicates the user is not active in the response' do
-          post_user
           expect(JSON.parse(response.body)['active']).to be_falsey
+
+          # should save user_created_message in session
+          expect(session["user_created_message"]).to be_present
+          expect(session[SessionController::ACTIVATE_USER_KEY]).to be_present
+        end
+      end
+
+      context 'users already exists with given email' do
+        let!(:existing) { Fabricate(:user, email: post_user_params[:email]) }
+
+        it 'returns an error if hide_email_address_taken is disabled' do
+          SiteSetting.hide_email_address_taken = false
+          post_user
+          json = JSON.parse(response.body)
+          expect(json['success']).to eq(false)
+          expect(json['message']).to be_present
         end
 
-        it "shows the 'waiting approval' message" do
-          post_user
-          expect(JSON.parse(response.body)['message']).to eq(I18n.t 'login.wait_approval')
+        it 'returns success if hide_email_address_taken is enabled' do
+          SiteSetting.hide_email_address_taken = true
+          expect {
+            post_user
+          }.to_not change { User.count }
+          json = JSON.parse(response.body)
+          expect(json['active']).to be_falsey
+          expect(session["user_created_message"]).to be_present
         end
       end
     end
 
     context "creating as active" do
       it "won't create the user as active" do
-        xhr :post, :create, post_user_params.merge(active: true)
+        post :create, params: post_user_params.merge(active: true), format: :json
         expect(JSON.parse(response.body)['active']).to be_falsey
       end
 
@@ -521,24 +666,48 @@ describe UsersController do
         let(:api_key) { Fabricate(:api_key, user: user) }
 
         it "won't create the user as active with a regular key" do
-          xhr :post, :create, post_user_params.merge(active: true, api_key: api_key.key)
+          post :create,
+            params: post_user_params.merge(active: true, api_key: api_key.key),
+            format: :json
+
           expect(JSON.parse(response.body)['active']).to be_falsey
         end
       end
 
       context "with an admin api key" do
-        let(:user) { Fabricate(:admin) }
-        let(:api_key) { Fabricate(:api_key, user: user) }
+        let(:admin) { Fabricate(:admin) }
+        let(:api_key) { Fabricate(:api_key, user: admin) }
 
         it "creates the user as active with a regular key" do
-          xhr :post, :create, post_user_params.merge(active: true, api_key: api_key.key)
-          expect(JSON.parse(response.body)['active']).to be_truthy
+          SiteSetting.queue_jobs = true
+          SiteSetting.send_welcome_message = true
+          SiteSetting.must_approve_users = true
+
+          Sidekiq::Client.expects(:enqueue).never
+
+          post :create,
+            params: post_user_params.merge(approved: true, active: true, api_key: api_key.key),
+            format: :json
+
+          json = JSON.parse(response.body)
+
+          new_user = User.find(json["user_id"])
+
+          expect(json['active']).to be_truthy
+
+          expect(new_user.active).to eq(true)
+          expect(new_user.approved).to eq(true)
+          expect(new_user.approved_by_id).to eq(admin.id)
+          expect(new_user.approved_at).to_not eq(nil)
         end
 
         it "won't create the developer as active" do
           UsernameCheckerService.expects(:is_developer?).returns(true)
 
-          xhr :post, :create, post_user_params.merge(active: true, api_key: api_key.key)
+          post :create,
+            params: post_user_params.merge(active: true, api_key: api_key.key),
+            format: :json
+
           expect(JSON.parse(response.body)['active']).to be_falsy
         end
       end
@@ -546,7 +715,10 @@ describe UsersController do
 
     context "creating as staged" do
       it "won't create the user as staged" do
-        xhr :post, :create, post_user_params.merge(staged: true)
+        post :create,
+          params: post_user_params.merge(staged: true),
+          format: :json
+
         new_user = User.where(username: post_user_params[:username]).first
         expect(new_user.staged?).to eq(false)
       end
@@ -556,7 +728,10 @@ describe UsersController do
         let(:api_key) { Fabricate(:api_key, user: user) }
 
         it "won't create the user as staged with a regular key" do
-          xhr :post, :create, post_user_params.merge(staged: true, api_key: api_key.key)
+          post :create,
+            params: post_user_params.merge(staged: true, api_key: api_key.key),
+            format: :json
+
           new_user = User.where(username: post_user_params[:username]).first
           expect(new_user.staged?).to eq(false)
         end
@@ -567,7 +742,9 @@ describe UsersController do
         let(:api_key) { Fabricate(:api_key, user: user) }
 
         it "creates the user as staged with a regular key" do
-          xhr :post, :create, post_user_params.merge(staged: true, api_key: api_key.key)
+          post :create,
+            params: post_user_params.merge(staged: true, api_key: api_key.key),
+            format: :json
 
           new_user = User.where(username: post_user_params[:username]).first
           expect(new_user.staged?).to eq(true)
@@ -575,7 +752,9 @@ describe UsersController do
 
         it "won't create the developer as staged" do
           UsernameCheckerService.expects(:is_developer?).returns(true)
-          xhr :post, :create, post_user_params.merge(staged: true, api_key: api_key.key)
+          post :create,
+            params: post_user_params.merge(staged: true, api_key: api_key.key),
+            format: :json
 
           new_user = User.where(username: post_user_params[:username]).first
           expect(new_user.staged?).to eq(false)
@@ -680,17 +859,17 @@ describe UsersController do
     shared_examples 'honeypot fails' do
       it 'should not create a new user' do
         expect {
-          xhr :post, :create, create_params
+          post :create, params: create_params, format: :json
         }.to_not change { User.count }
       end
 
       it 'should not send an email' do
         User.any_instance.expects(:enqueue_welcome_message).never
-        xhr :post, :create, create_params
+        post :create, params: create_params, format: :json
       end
 
       it 'should say it was successful' do
-        xhr :post, :create, create_params
+        post :create, params: create_params, format: :json
         json = JSON::parse(response.body)
         expect(json["success"]).to eq(true)
 
@@ -704,7 +883,7 @@ describe UsersController do
       before do
         UsersController.any_instance.stubs(:honeypot_value).returns('abc')
       end
-      let(:create_params) { {name: @user.name, username: @user.username, password: "strongpassword", email: @user.email, password_confirmation: 'wrong'} }
+      let(:create_params) { { name: @user.name, username: @user.username, password: "strongpassword", email: @user.email, password_confirmation: 'wrong' } }
       include_examples 'honeypot fails'
     end
 
@@ -712,14 +891,14 @@ describe UsersController do
       before do
         UsersController.any_instance.stubs(:challenge_value).returns('abc')
       end
-      let(:create_params) { {name: @user.name, username: @user.username, password: "strongpassword", email: @user.email, challenge: 'abc'} }
+      let(:create_params) { { name: @user.name, username: @user.username, password: "strongpassword", email: @user.email, challenge: 'abc' } }
       include_examples 'honeypot fails'
     end
 
     context "when 'invite only' setting is enabled" do
       before { SiteSetting.invite_only = true }
 
-      let(:create_params) {{
+      let(:create_params) { {
         name: @user.name,
         username: @user.username,
         password: 'strongpassword',
@@ -731,11 +910,11 @@ describe UsersController do
 
     shared_examples 'failed signup' do
       it 'should not create a new User' do
-        expect { xhr :post, :create, create_params }.to_not change { User.count }
+        expect { post :create, params: create_params, format: :json }.to_not change { User.count }
       end
 
       it 'should report failed' do
-        xhr :post, :create, create_params
+        post :create, params: create_params, format: :json
         json = JSON::parse(response.body)
         expect(json["success"]).not_to eq(true)
 
@@ -746,22 +925,22 @@ describe UsersController do
     end
 
     context 'when password is blank' do
-      let(:create_params) { {name: @user.name, username: @user.username, password: "", email: @user.email} }
+      let(:create_params) { { name: @user.name, username: @user.username, password: "", email: @user.email } }
       include_examples 'failed signup'
     end
 
     context 'when password is too long' do
-      let(:create_params) { {name: @user.name, username: @user.username, password: "x" * (User.max_password_length + 1), email: @user.email} }
+      let(:create_params) { { name: @user.name, username: @user.username, password: "x" * (User.max_password_length + 1), email: @user.email } }
       include_examples 'failed signup'
     end
 
     context 'when password param is missing' do
-      let(:create_params) { {name: @user.name, username: @user.username, email: @user.email} }
+      let(:create_params) { { name: @user.name, username: @user.username, email: @user.email } }
       include_examples 'failed signup'
     end
 
     context 'with a reserved username' do
-      let(:create_params) { {name: @user.name, username: 'Reserved', email: @user.email, password: "x" * 20} }
+      let(:create_params) { { name: @user.name, username: 'Reserved', email: @user.email, password: "x" * 20 } }
       before { SiteSetting.reserved_usernames = 'a|reserved|b' }
       after { SiteSetting.reserved_usernames = nil }
       include_examples 'failed signup'
@@ -772,7 +951,7 @@ describe UsersController do
 
       let(:create_params) {
         { name: @user.name, username: @user.username,
-          password: "strongpassword", email: @user.email}
+          password: "strongpassword", email: @user.email }
       }
 
       include_examples 'failed signup'
@@ -784,7 +963,7 @@ describe UsersController do
       let!(:optional_field) { Fabricate(:user_field, required: false) }
 
       context "without a value for the fields" do
-        let(:create_params) { {name: @user.name, password: 'watwatwat', username: @user.username, email: @user.email} }
+        let(:create_params) { { name: @user.name, password: 'watwatwat', username: @user.username, email: @user.email } }
         include_examples 'failed signup'
       end
 
@@ -801,9 +980,9 @@ describe UsersController do
         } }
 
         it "should succeed without the optional field" do
-          xhr :post, :create, create_params
+          post :create, params: create_params, format: :json
           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')
@@ -813,9 +992,9 @@ describe UsersController do
 
         it "should succeed with the optional field" do
           create_params[:user_fields][optional_field.id.to_s] = 'value3'
-          xhr :post, :create, create_params.merge(create_params)
+          post :create, params: create_params.merge(create_params), format: :json
           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')
@@ -825,9 +1004,9 @@ describe UsersController do
 
         it "trims excessively long fields" do
           create_params[:user_fields][optional_field.id.to_s] = ('x' * 3000)
-          xhr :post, :create, create_params.merge(create_params)
+          post :create, params: create_params.merge(create_params), format: :json
           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)
@@ -847,9 +1026,9 @@ describe UsersController do
         } }
 
         it "should succeed" do
-          xhr :post, :create, create_params
+          post :create, params: create_params, format: :json
           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
@@ -857,22 +1036,13 @@ describe UsersController do
       end
     end
 
-    context "when taking over a staged account" do
-      let!(:staged) { Fabricate(:staged, email: "staged@account.com") }
-
-      it "succeeds" 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)
-      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)
+      expect do
+        put :username, params: { username: 'somename' }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     context 'while logged in' do
@@ -886,37 +1056,60 @@ describe UsersController do
       end
 
       it 'raises an error without a new_username param' do
-        expect { xhr :put, :username, username: user.username }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          put :username, params: { username: user.username }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
+
         expect(user.reload.username).to eq(old_username)
       end
 
       it 'raises an error when you don\'t have permission to change the username' do
         Guardian.any_instance.expects(:can_edit_username?).with(user).returns(false)
-        xhr :put, :username, username: user.username, new_username: new_username
+
+        put :username, params: {
+          username: user.username, new_username: new_username
+        }, format: :json
+
         expect(response).to be_forbidden
         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)
+        put :username,
+          params: { username: user.username, new_username: '@' },
+          format: :json
+
+        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
 
       it 'should succeed in normal circumstances' do
-        xhr :put, :username, username: user.username, new_username: new_username
+        put :username,
+          params: { username: user.username, new_username: new_username },
+          format: :json
+
         expect(response).to be_success
         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
+        put :username, params: {
+          username: user.username, new_username: new_username
+        }, format: :json
 
         expect(response).to be_forbidden
         expect(user.reload.username).to eq(old_username)
@@ -925,14 +1118,21 @@ describe UsersController do
       it 'should create a staff action log when a staff member changes the username' do
         acting_user = Fabricate(:admin)
         log_in_user(acting_user)
-        xhr :put, :username, username: user.username, new_username: new_username
+
+        put :username, params: {
+          username: user.username, new_username: new_username
+        }, format: :json
+
         expect(response).to be_success
         expect(UserHistory.where(action: UserHistory.actions[:change_username], target_user_id: user.id, acting_user_id: acting_user.id)).to be_present
         expect(user.reload.username).to eq(new_username)
       end
 
       it 'should return a JSON response with the updated username' do
-        xhr :put, :username, username: user.username, new_username: new_username
+        put :username, params: {
+          username: user.username, new_username: new_username
+        }, format: :json
+
         expect(::JSON.parse(response.body)['username']).to eq(new_username)
       end
 
@@ -941,7 +1141,9 @@ describe UsersController do
 
   context '.check_username' do
     it 'raises an error without any parameters' do
-      expect { xhr :get, :check_username }.to raise_error(ActionController::ParameterMissing)
+      expect do
+        get :check_username, format: :json
+      end.to raise_error(ActionController::ParameterMissing)
     end
 
     shared_examples 'when username is unavailable' do
@@ -969,13 +1171,13 @@ describe UsersController do
     end
 
     it 'returns nothing when given an email param but no username' do
-      xhr :get, :check_username, email: 'dood@example.com'
+      get :check_username, params: { email: 'dood@example.com' }, format: :json
       expect(response).to be_success
     end
 
     context 'username is available' do
       before do
-        xhr :get, :check_username, username: 'BruceWayne'
+        get :check_username, params: { username: 'BruceWayne' }, format: :json
       end
       include_examples 'when username is available'
     end
@@ -983,7 +1185,7 @@ describe UsersController do
     context 'username is unavailable' do
       let!(:user) { Fabricate(:user) }
       before do
-        xhr :get, :check_username, username: user.username
+        get :check_username, params: { username: user.username }, format: :json
       end
       include_examples 'when username is unavailable'
     end
@@ -1004,7 +1206,9 @@ describe UsersController do
 
     context 'has invalid characters' do
       before do
-        xhr :get, :check_username, username: 'bad username'
+        get :check_username, params: {
+          username: 'bad username'
+        }, format: :json
       end
       include_examples 'checking an invalid username'
 
@@ -1015,7 +1219,9 @@ describe UsersController do
 
     context 'is too long' do
       before do
-        xhr :get, :check_username, username: generate_username(User.username_length.last + 1)
+        get :check_username, params: {
+          username: generate_username(User.username_length.last + 1)
+        }, format: :json
       end
       include_examples 'checking an invalid username'
 
@@ -1029,7 +1235,10 @@ describe UsersController do
         let!(:user) { Fabricate(:user, username: 'hansolo') }
         before do
           log_in_user(user)
-          xhr :get, :check_username, username: 'HanSolo'
+
+          get :check_username, params: {
+            username: 'HanSolo'
+          }, format: :json
         end
         include_examples 'when username is available'
       end
@@ -1038,7 +1247,10 @@ describe UsersController do
         let!(:user) { Fabricate(:user, username: 'hansolo') }
         before do
           log_in
-          xhr :get, :check_username, username: 'HanSolo'
+
+          get :check_username, params: {
+            username: 'HanSolo'
+          }, format: :json
         end
         include_examples 'when username is unavailable'
       end
@@ -1047,7 +1259,10 @@ describe UsersController do
         let!(:user) { Fabricate(:user, username: 'hansolo') }
         before do
           log_in_user(Fabricate(:admin))
-          xhr :get, :check_username, username: 'HanSolo', for_user_id: user.id
+
+          get :check_username, params: {
+            username: 'HanSolo', for_user_id: user.id
+          }, format: :json
         end
         include_examples 'when username is available'
       end
@@ -1057,8 +1272,7 @@ describe UsersController do
   describe '#invited' do
     it 'returns success' do
       user = Fabricate(:user)
-
-      xhr :get, :invited, username: user.username
+      get :invited, params: { username: user.username }, format: :json
 
       expect(response).to be_success
     end
@@ -1079,7 +1293,9 @@ describe UsersController do
         user: invitee
       )
 
-      xhr :get, :invited, username: inviter.username, search: 'billybob'
+      get :invited, params: {
+        username: inviter.username, search: 'billybob'
+      }, format: :json
 
       invites = JSON.parse(response.body)['invites']
       expect(invites.size).to eq(1)
@@ -1101,7 +1317,9 @@ describe UsersController do
         user: Fabricate(:user, username: 'jimtom')
       )
 
-      xhr :get, :invited, username: inviter.username, search: 'billybob'
+      get :invited, params: {
+        username: inviter.username, search: 'billybob'
+      }, format: :json
 
       invites = JSON.parse(response.body)['invites']
       expect(invites.size).to eq(1)
@@ -1114,7 +1332,9 @@ describe UsersController do
           inviter = Fabricate(:user)
           Fabricate(:invite, invited_by: inviter)
 
-          xhr :get, :invited, username: inviter.username, filter: 'pending'
+          get :invited,
+            params: { username: inviter.username, filter: 'pending' },
+            format: :json
 
           invites = JSON.parse(response.body)['invites']
           expect(invites).to be_empty
@@ -1127,7 +1347,9 @@ describe UsersController do
           invitee = Fabricate(:user)
           invite = Fabricate(:invite, invited_by: inviter, user: invitee)
 
-          xhr :get, :invited, username: inviter.username
+          get :invited,
+            params: { username: inviter.username },
+            format: :json
 
           invites = JSON.parse(response.body)['invites']
           expect(invites.size).to eq(1)
@@ -1148,7 +1370,9 @@ describe UsersController do
                 with(inviter).returns(true)
             end
 
-            xhr :get, :invited, username: inviter.username, filter: 'pending'
+            get :invited, params: {
+              username: inviter.username, filter: 'pending'
+            }, format: :json
 
             invites = JSON.parse(response.body)['invites']
             expect(invites.size).to eq(1)
@@ -1167,7 +1391,9 @@ describe UsersController do
                 with(inviter).returns(false)
             end
 
-            xhr :get, :invited, username: inviter.username, filter: 'pending'
+            get :invited, params: {
+              username: inviter.username, filter: 'pending'
+            }, format: :json
 
             json = JSON.parse(response.body)['invites']
             expect(json).to be_empty
@@ -1182,7 +1408,7 @@ describe UsersController do
           invitee = Fabricate(:user)
           invite = Fabricate(:invite, invited_by: inviter, user: invitee)
 
-          xhr :get, :invited, username: inviter.username
+          get :invited, params: { username: inviter.username }, format: :json
 
           invites = JSON.parse(response.body)['invites']
           expect(invites.size).to eq(1)
@@ -1196,7 +1422,7 @@ describe UsersController do
     context 'with guest' do
       it 'raises an error' do
         expect do
-          xhr :put, :update, username: 'guest'
+          put :update, params: { username: 'guest' }, format: :json
         end.to raise_error(Discourse::NotLoggedIn)
       end
     end
@@ -1208,9 +1434,19 @@ describe UsersController do
         let!(:user_field) { Fabricate(:user_field, editable: false) }
 
         it "allows staff to edit the field" do
-          put :update, username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => 'happy' }
+          put :update, params: {
+            username: user.username,
+            name: 'Jim Tom',
+            title: "foobar",
+            user_fields: { user_field.id.to_s => 'happy' }
+          }, format: :json
+
           expect(response).to be_success
+
+          user.reload
+
           expect(user.user_fields[user_field.id.to_s]).to eq('happy')
+          expect(user.title).to eq("foobar")
         end
       end
 
@@ -1221,15 +1457,15 @@ describe UsersController do
         let!(:user) { log_in(:user) }
 
         it 'allows the update' do
-
           user2 = Fabricate(:user)
           user3 = Fabricate(:user)
 
-          put :update,
-                username: user.username,
-                name: 'Jim Tom',
-                custom_fields: {test: :it},
-                muted_usernames: "#{user2.username},#{user3.username}"
+          put :update, params: {
+            username: user.username,
+            name: 'Jim Tom',
+            custom_fields: { test: :it },
+            muted_usernames: "#{user2.username},#{user3.username}"
+          }, format: :json
 
           expect(response).to be_success
 
@@ -1237,29 +1473,32 @@ describe UsersController do
 
           expect(user.name).to eq 'Jim Tom'
           expect(user.custom_fields['test']).to eq 'it'
-          expect(user.muted_users.pluck(:username).sort).to eq [user2.username,user3.username].sort
+          expect(user.muted_users.pluck(:username).sort).to eq [user2.username, user3.username].sort
 
           theme = Theme.create(name: "test", user_selectable: true, user_id: -1)
 
-          put :update,
-                username: user.username,
-                muted_usernames: "",
-                theme_key: theme.key
+          put :update, params: {
+            username: user.username,
+            muted_usernames: "",
+            theme_key: theme.key,
+            email_direct: false
+          }, format: :json
 
           user.reload
 
           expect(user.muted_users.pluck(:username).sort).to be_empty
           expect(user.user_option.theme_key).to eq(theme.key)
-
+          expect(user.user_option.email_direct).to eq(false)
         end
 
         context 'a locale is chosen that differs from I18n.locale' do
           it "updates the user's locale" do
             I18n.stubs(:locale).returns('fr')
 
-            put :update,
-                username: user.username,
-                locale: :fa_IR
+            put :update, params: {
+              username: user.username,
+              locale: :fa_IR
+            }, format: :json
 
             expect(User.find_by(username: user.username).locale).to eq('fa_IR')
           end
@@ -1269,31 +1508,64 @@ describe UsersController do
         context "with user fields" do
           context "an editable field" do
             let!(:user_field) { Fabricate(:user_field) }
-            let!(:optional_field) { Fabricate(:user_field, required: false ) }
+            let!(:optional_field) { Fabricate(:user_field, required: false) }
 
             it "should update the user field" do
-              put :update, username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => 'happy' }
+              put :update, params: {
+                username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => 'happy' }
+              }, format: :json
+
               expect(response).to be_success
               expect(user.user_fields[user_field.id.to_s]).to eq 'happy'
             end
 
             it "cannot be updated to blank" do
-              put :update, username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => '' }
+              put :update, params: {
+                username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => '' }
+              }, format: :json
+
               expect(response).not_to be_success
               expect(user.user_fields[user_field.id.to_s]).not_to eq('happy')
             end
 
             it "trims excessively large fields" do
-              put :update, username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => ('x' * 3000) }
+              put :update, params: {
+                username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => ('x' * 3000) }
+              }, format: :json
+
               expect(user.user_fields[user_field.id.to_s].size).to eq(UserField.max_length)
             end
+
+            it "should retain existing user fields" do
+              put :update, params: {
+                username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => 'happy', optional_field.id.to_s => 'feet' }
+              }, format: :json
+
+              expect(response).to be_success
+              expect(user.user_fields[user_field.id.to_s]).to eq('happy')
+              expect(user.user_fields[optional_field.id.to_s]).to eq('feet')
+
+              put :update, params: {
+                username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => 'sad' }
+              }, format: :json
+
+              expect(response).to be_success
+
+              user.reload
+
+              expect(user.user_fields[user_field.id.to_s]).to eq('sad')
+              expect(user.user_fields[optional_field.id.to_s]).to eq('feet')
+            end
           end
 
           context "uneditable field" do
             let!(:user_field) { Fabricate(:user_field, editable: false) }
 
             it "does not update the user field" do
-              put :update, username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => 'happy' }
+              put :update, params: {
+                username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => 'happy' }
+              }, format: :json
+
               expect(response).to be_success
               expect(user.user_fields[user_field.id.to_s]).to be_blank
             end
@@ -1302,7 +1574,7 @@ describe UsersController do
         end
 
         it 'returns user JSON' do
-          put :update, username: user.username
+          put :update, params: { username: user.username }, format: :json
 
           json = JSON.parse(response.body)
           expect(json['user']['id']).to eq user.id
@@ -1316,7 +1588,9 @@ describe UsersController do
           log_in_user(user)
           Guardian.any_instance.expects(:can_edit?).with(user).returns(false)
 
-          put :update, username: user.username, name: 'Jim Tom'
+          put :update,
+            params: { username: user.username, name: 'Jim Tom' },
+            format: :json
 
           expect(response).to be_forbidden
           expect(user.reload.name).not_to eq 'Jim Tom'
@@ -1332,15 +1606,24 @@ describe UsersController do
 
     it "sets the user's card image to the badge" do
       log_in_user user
-      xhr :put, :update_card_badge, user_badge_id: user_badge.id, username: user.username
+      put :update_card_badge, params: {
+        user_badge_id: user_badge.id, username: user.username
+      }, format: :json
+
       expect(user.user_profile.reload.card_image_badge_id).to be_blank
       badge.update_attributes image: "wat.com/wat.jpg"
 
-      xhr :put, :update_card_badge, user_badge_id: user_badge.id, username: user.username
+      put :update_card_badge, params: {
+        user_badge_id: user_badge.id, username: user.username
+      }, format: :json
+
       expect(user.user_profile.reload.card_image_badge_id).to eq(badge.id)
 
       # Can set to nothing
-      xhr :put, :update_card_badge, username: user.username
+      put :update_card_badge, params: {
+        username: user.username
+      }, format: :json
+
       expect(user.user_profile.reload.card_image_badge_id).to be_blank
     end
   end
@@ -1352,10 +1635,18 @@ describe UsersController do
 
     it "sets the user's title to the badge name if it is titleable" do
       log_in_user user
-      xhr :put, :badge_title, user_badge_id: user_badge.id, username: user.username
+
+      put :badge_title, params: {
+        user_badge_id: user_badge.id, username: user.username
+      }, format: :json
+
       expect(user.reload.title).not_to eq(badge.name)
       badge.update_attributes allow_title: true
-      xhr :put, :badge_title, user_badge_id: user_badge.id, username: user.username
+
+      put :badge_title, params: {
+        user_badge_id: user_badge.id, username: user.username
+      }, format: :json
+
       expect(user.reload.title).to eq(badge.name)
       expect(user.user_profile.badge_granted_title).to eq(true)
 
@@ -1367,82 +1658,6 @@ describe UsersController do
     end
   end
 
-  describe "search_users" do
-
-    let(:topic) { Fabricate :topic }
-    let(:user)  { Fabricate :user, username: "joecabot", name: "Lawrence Tierney" }
-
-    before do
-      SearchIndexer.enable
-      Fabricate :post, user: user, topic: topic
-    end
-
-    it "searches when provided the term only" do
-      xhr :post, :search_users, term: user.name.split(" ").last
-      expect(response).to be_success
-      json = JSON.parse(response.body)
-      expect(json["users"].map { |u| u["username"] }).to include(user.username)
-    end
-
-    it "searches when provided the topic only" do
-      xhr :post, :search_users, topic_id: topic.id
-      expect(response).to be_success
-      json = JSON.parse(response.body)
-      expect(json["users"].map { |u| u["username"] }).to include(user.username)
-    end
-
-    it "searches when provided the term and topic" do
-      xhr :post, :search_users, term: user.name.split(" ").last, topic_id: topic.id
-      expect(response).to be_success
-      json = JSON.parse(response.body)
-      expect(json["users"].map { |u| u["username"] }).to include(user.username)
-    end
-
-    it "searches only for users who have access to private topic" do
-      privileged_user = Fabricate(:user, trust_level: 4, username: "joecabit", name: "Lawrence Tierney")
-      privileged_group = Fabricate(:group)
-      privileged_group.add(privileged_user)
-      privileged_group.save
-
-      category = Fabricate(:category)
-      category.set_permissions(privileged_group => :readonly)
-      category.save
-
-      private_topic = Fabricate(:topic, category: category)
-
-      xhr :post, :search_users, term: user.name.split(" ").last, topic_id: private_topic.id, topic_allowed_users: "true"
-      expect(response).to be_success
-      json = JSON.parse(response.body)
-      expect(json["users"].map { |u| u["username"] }).to_not include(user.username)
-      expect(json["users"].map { |u| u["username"] }).to include(privileged_user.username)
-    end
-
-    context "when `enable_names` is true" do
-      before do
-        SiteSetting.enable_names = true
-      end
-
-      it "returns names" do
-        xhr :post, :search_users, term: user.name
-        json = JSON.parse(response.body)
-        expect(json["users"].map { |u| u["name"] }).to include(user.name)
-      end
-    end
-
-    context "when `enable_names` is false" do
-      before do
-        SiteSetting.enable_names = false
-      end
-
-      it "returns names" do
-        xhr :post, :search_users, term: user.name
-        json = JSON.parse(response.body)
-        expect(json["users"].map { |u| u["name"] }).not_to include(user.name)
-      end
-    end
-
-  end
-
   describe 'send_activation_email' do
     context 'for an existing user' do
       let(:user) { Fabricate(:user, active: false) }
@@ -1453,7 +1668,10 @@ describe UsersController do
           email_token = active_user.email_tokens.create(email: active_user.email).token
           EmailToken.confirm(email_token)
           session[SessionController::ACTIVATE_USER_KEY] = active_user.id
-          xhr :post, :send_activation_email, username: active_user.username
+
+          post :send_activation_email, params: {
+            username: active_user.username
+          }, format: :json
 
           expect(response.status).to eq(409)
 
@@ -1470,8 +1688,11 @@ describe UsersController do
           unconfirmed_email_user = Fabricate(:user, active: true)
           unconfirmed_email_user.email_tokens.create(email: unconfirmed_email_user.email)
           session[SessionController::ACTIVATE_USER_KEY] = unconfirmed_email_user.id
-          Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
-          xhr :post, :send_activation_email, username: unconfirmed_email_user.username
+          Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup, to_address: unconfirmed_email_user.email))
+
+          post :send_activation_email, params: {
+            username: unconfirmed_email_user.username
+          }, format: :json
 
           expect(response.status).to eq(200)
 
@@ -1488,7 +1709,10 @@ describe UsersController do
           unconfirmed_email_user = Fabricate(:user, active: true)
           unconfirmed_email_user.email_tokens.create(email: unconfirmed_email_user.email)
           session[SessionController::ACTIVATE_USER_KEY] = unconfirmed_email_user.id
-          xhr :post, :send_activation_email, username: unconfirmed_email_user.username
+          post :send_activation_email, params: {
+            username: unconfirmed_email_user.username
+          }, format: :json
+
           expect(response.status).to eq(403)
         end
       end
@@ -1496,14 +1720,21 @@ describe UsersController do
       describe 'when user does not have a valid session' do
         it 'should not be valid' do
           user = Fabricate(:user)
-          xhr :post, :send_activation_email, username: user.username
+          post :send_activation_email, params: {
+            username: user.username
+          }, format: :json
+
           expect(response.status).to eq(403)
         end
 
         it 'should allow staff regardless' do
           log_in :admin
           user = Fabricate(:user, active: false)
-          xhr :post, :send_activation_email, username: user.username
+
+          post :send_activation_email, params: {
+            username: user.username
+          }, format: :json
+
           expect(response.status).to eq(200)
         end
       end
@@ -1512,7 +1743,10 @@ describe UsersController do
         it 'should send the activation email' do
           session[SessionController::ACTIVATE_USER_KEY] = user.id
           Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
-          xhr :post, :send_activation_email, username: user.username
+
+          post :send_activation_email, params: {
+            username: user.username
+          }, format: :json
 
           expect(session[SessionController::ACTIVATE_USER_KEY]).to eq(nil)
         end
@@ -1520,21 +1754,27 @@ describe UsersController do
 
       context 'without an existing email_token' do
         before do
-          user.email_tokens.each {|t| t.destroy}
+          user.email_tokens.each { |t| t.destroy }
           user.reload
         end
 
         it 'should generate a new token' do
           expect {
             session[SessionController::ACTIVATE_USER_KEY] = user.id
-            xhr :post, :send_activation_email, username: user.username
-          }.to change{ user.email_tokens(true).count }.by(1)
+
+            post :send_activation_email,
+              params: { username: user.username },
+              format: :json
+          }.to change { user.reload.email_tokens.count }.by(1)
         end
 
         it 'should send an email' do
           session[SessionController::ACTIVATE_USER_KEY] = user.id
           Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
-          xhr :post, :send_activation_email, username: user.username
+
+          post :send_activation_email,
+            params: { username: user.username },
+            format: :json
 
           expect(session[SessionController::ACTIVATE_USER_KEY]).to eq(nil)
         end
@@ -1544,7 +1784,10 @@ describe UsersController do
     context 'when username does not exist' do
       it 'should not send an email' do
         Jobs.expects(:enqueue).never
-        xhr :post, :send_activation_email, username: 'nopenopenopenope'
+
+        post :send_activation_email,
+          params: { username: 'nopenopenopenope' },
+          format: :json
       end
     end
   end
@@ -1553,7 +1796,9 @@ describe UsersController do
 
     it 'raises an error when not logged in' do
       expect {
-        xhr :put, :pick_avatar, username: 'asdf', avatar_id: 1, type: "custom"
+        put :pick_avatar, params: {
+          username: 'asdf', avatar_id: 1, type: "custom"
+        }, format: :json
       }.to raise_error(Discourse::NotLoggedIn)
     end
 
@@ -1564,37 +1809,55 @@ describe UsersController do
 
       it "raises an error when you don't have permission to toggle the avatar" do
         another_user = Fabricate(:user)
-        xhr :put, :pick_avatar, username: another_user.username, upload_id: upload.id, type: "custom"
+        put :pick_avatar, params: {
+          username: another_user.username, upload_id: upload.id, type: "custom"
+        }, format: :json
+
         expect(response).to be_forbidden
       end
 
       it "raises an error when sso_overrides_avatar is disabled" do
         SiteSetting.sso_overrides_avatar = true
-        xhr :put, :pick_avatar, username: user.username, upload_id: upload.id, type: "custom"
+        put :pick_avatar, params: {
+          username: user.username, upload_id: upload.id, type: "custom"
+        }, format: :json
+
         expect(response).to_not be_success
       end
 
       it "raises an error when selecting the custom/uploaded avatar and allow_uploaded_avatars is disabled" do
         SiteSetting.allow_uploaded_avatars = false
-        xhr :put, :pick_avatar, username: user.username, upload_id: upload.id, type: "custom"
+        put :pick_avatar, params: {
+          username: user.username, upload_id: upload.id, type: "custom"
+        }, format: :json
+
         expect(response).to_not be_success
       end
 
       it 'can successfully pick the system avatar' do
-        xhr :put, :pick_avatar, username: user.username
+        put :pick_avatar, params: {
+          username: user.username
+        }, format: :json
+
         expect(response).to be_success
         expect(user.reload.uploaded_avatar_id).to eq(nil)
       end
 
       it 'can successfully pick a gravatar' do
-        xhr :put, :pick_avatar, username: user.username, upload_id: upload.id, type: "gravatar"
+        put :pick_avatar, params: {
+          username: user.username, upload_id: upload.id, type: "gravatar"
+        }, format: :json
+
         expect(response).to be_success
         expect(user.reload.uploaded_avatar_id).to eq(upload.id)
         expect(user.user_avatar.reload.gravatar_upload_id).to eq(upload.id)
       end
 
       it 'can successfully pick a custom avatar' do
-        xhr :put, :pick_avatar, username: user.username, upload_id: upload.id, type: "custom"
+        put :pick_avatar, params: {
+          username: user.username, upload_id: upload.id, type: "custom"
+        }, format: :json
+
         expect(response).to be_success
         expect(user.reload.uploaded_avatar_id).to eq(upload.id)
         expect(user.user_avatar.reload.custom_upload_id).to eq(upload.id)
@@ -1607,7 +1870,11 @@ describe UsersController do
   describe '.destroy_user_image' do
 
     it 'raises an error when not logged in' do
-      expect { xhr :delete, :destroy_user_image, type: 'profile_background', username: 'asdf' }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        delete :destroy_user_image,
+          params: { type: 'profile_background', username: 'asdf' },
+          format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     context 'while logged in' do
@@ -1616,20 +1883,33 @@ describe UsersController do
 
       it 'raises an error when you don\'t have permission to clear the profile background' do
         Guardian.any_instance.expects(:can_edit?).with(user).returns(false)
-        xhr :delete, :destroy_user_image, username: user.username, type: 'profile_background'
+
+        delete :destroy_user_image,
+          params: { username: user.username, type: 'profile_background' },
+          format: :json
+
         expect(response).to be_forbidden
       end
 
       it "requires the `type` param" do
-        expect { xhr :delete, :destroy_user_image, username: user.username }.to raise_error(ActionController::ParameterMissing)
+        expect do
+          delete :destroy_user_image, params: { username: user.username }, format: :json
+        end.to raise_error(ActionController::ParameterMissing)
       end
 
       it "only allows certain `types`" do
-        expect { xhr :delete, :destroy_user_image, username: user.username, type: 'wat' }.to raise_error(Discourse::InvalidParameters)
+        expect do
+          delete :destroy_user_image,
+            params: { username: user.username, type: 'wat' },
+            format: :json
+        end.to raise_error(Discourse::InvalidParameters)
       end
 
       it 'can clear the profile background' do
-        xhr :delete, :destroy_user_image, type: 'profile_background', username: user.username
+        delete :destroy_user_image, params: {
+          type: 'profile_background', username: user.username
+        }, format: :json
+
         expect(user.reload.user_profile.profile_background).to eq("")
         expect(response).to be_success
       end
@@ -1639,7 +1919,9 @@ describe UsersController do
 
   describe '.destroy' do
     it 'raises an error when not logged in' do
-      expect { xhr :delete, :destroy, username: 'nobody' }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        delete :destroy, params: { username: 'nobody' }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     context 'while logged in' do
@@ -1648,20 +1930,20 @@ describe UsersController do
       it 'raises an error when you cannot delete your account' do
         Guardian.any_instance.stubs(:can_delete_user?).returns(false)
         UserDestroyer.any_instance.expects(:destroy).never
-        xhr :delete, :destroy, username: user.username
+        delete :destroy, params: { username: user.username }, format: :json
         expect(response).to be_forbidden
       end
 
       it "raises an error when you try to delete someone else's account" do
         UserDestroyer.any_instance.expects(:destroy).never
-        xhr :delete, :destroy, username: Fabricate(:user).username
+        delete :destroy, params: { username: Fabricate(:user).username }, format: :json
         expect(response).to be_forbidden
       end
 
       it "deletes your account when you're allowed to" do
         Guardian.any_instance.stubs(:can_delete_user?).returns(true)
         UserDestroyer.any_instance.expects(:destroy).with(user, anything).returns(user)
-        xhr :delete, :destroy, username: user.username
+        delete :destroy, params: { username: user.username }, format: :json
         expect(response).to be_success
       end
     end
@@ -1670,7 +1952,7 @@ describe UsersController do
   describe '.my_redirect' do
 
     it "redirects if the user is not logged in" do
-      get :my_redirect, path: "wat"
+      get :my_redirect, params: { path: "wat" }, format: :json
       expect(response).not_to be_success
       expect(response).to be_redirect
     end
@@ -1679,17 +1961,17 @@ describe UsersController do
       let!(:user) { log_in }
 
       it "will not redirect to an invalid path" do
-        get :my_redirect, path: "wat/..password.txt"
+        get :my_redirect, params: { path: "wat/..password.txt" }, format: :json
         expect(response).not_to be_redirect
       end
 
       it "will redirect to an valid path" do
-        get :my_redirect, path: "preferences"
+        get :my_redirect, params: { path: "preferences" }, format: :json
         expect(response).to be_redirect
       end
 
       it "permits forward slashes" do
-        get :my_redirect, path: "activity/posts"
+        get :my_redirect, params: { path: "activity/posts" }, format: :json
         expect(response).to be_redirect
       end
     end
@@ -1698,7 +1980,9 @@ describe UsersController do
   describe '.check_emails' do
 
     it 'raises an error when not logged in' do
-      expect { xhr :put, :check_emails, username: 'zogstrip' }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        put :check_emails, params: { username: 'zogstrip' }, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     context 'while logged in' do
@@ -1706,13 +1990,21 @@ describe UsersController do
 
       it "raises an error when you aren't allowed to check emails" do
         Guardian.any_instance.expects(:can_check_emails?).returns(false)
-        xhr :put, :check_emails, username: Fabricate(:user).username
+
+        put :check_emails,
+          params: { username: Fabricate(:user).username },
+          format: :json
+
         expect(response).to be_forbidden
       end
 
       it "returns both email and associated_accounts when you're allowed to see them" do
         Guardian.any_instance.expects(:can_check_emails?).returns(true)
-        xhr :put, :check_emails, username: Fabricate(:user).username
+
+        put :check_emails,
+          params: { username: Fabricate(:user).username },
+          format: :json
+
         expect(response).to be_success
         json = JSON.parse(response.body)
         expect(json["email"]).to be_present
@@ -1722,7 +2014,11 @@ describe UsersController do
       it "works on inactive users" do
         inactive_user = Fabricate(:user, active: false)
         Guardian.any_instance.expects(:can_check_emails?).returns(true)
-        xhr :put, :check_emails, username: inactive_user.username
+
+        put :check_emails, params: {
+          username: inactive_user.username
+        }, format: :json
+
         expect(response).to be_success
         json = JSON.parse(response.body)
         expect(json["email"]).to be_present
@@ -1742,21 +2038,30 @@ describe UsersController do
     let(:private_topic) { Fabricate(:private_message_topic, user: allowed_user) }
 
     it "finds the user" do
-      xhr :get, :is_local_username, username: user.username
+      get :is_local_username, params: {
+        username: user.username
+      }, format: :json
+
       expect(response).to be_success
       json = JSON.parse(response.body)
       expect(json["valid"][0]).to eq(user.username)
     end
 
     it "finds the group" do
-      xhr :get, :is_local_username, username: group.name
+      get :is_local_username, params: {
+        username: group.name
+      }, format: :json
+
       expect(response).to be_success
       json = JSON.parse(response.body)
       expect(json["valid_groups"][0]).to eq(group.name)
     end
 
     it "supports multiples usernames" do
-      xhr :get, :is_local_username, usernames: [user.username, "system"]
+      get :is_local_username, params: {
+        usernames: [user.username, "system"]
+      }, format: :json
+
       expect(response).to be_success
       json = JSON.parse(response.body)
       expect(json["valid"].size).to eq(2)
@@ -1764,7 +2069,11 @@ describe UsersController do
 
     it "never includes staged accounts" do
       staged = Fabricate(:user, staged: true)
-      xhr :get, :is_local_username, usernames: [staged.username]
+
+      get :is_local_username, params: {
+        usernames: [staged.username]
+      }, format: :json
+
       expect(response).to be_success
       json = JSON.parse(response.body)
       expect(json["valid"].size).to eq(0)
@@ -1772,7 +2081,11 @@ describe UsersController do
 
     it "returns user who cannot see topic" do
       Guardian.any_instance.expects(:can_see?).with(topic).returns(false)
-      xhr :get, :is_local_username, usernames: [user.username], topic_id: topic.id
+
+      get :is_local_username, params: {
+        usernames: [user.username], topic_id: topic.id
+      }, format: :json
+
       expect(response).to be_success
       json = JSON.parse(response.body)
       expect(json["cannot_see"].size).to eq(1)
@@ -1780,7 +2093,11 @@ describe UsersController do
 
     it "never returns a user who can see the topic" do
       Guardian.any_instance.expects(:can_see?).with(topic).returns(true)
-      xhr :get, :is_local_username, usernames: [user.username], topic_id: topic.id
+
+      get :is_local_username, params: {
+        usernames: [user.username], topic_id: topic.id
+      }, format: :json
+
       expect(response).to be_success
       json = JSON.parse(response.body)
       expect(json["cannot_see"].size).to eq(0)
@@ -1788,7 +2105,11 @@ describe UsersController do
 
     it "returns user who cannot see a private topic" do
       Guardian.any_instance.expects(:can_see?).with(private_topic).returns(false)
-      xhr :get, :is_local_username, usernames: [user.username], topic_id: private_topic.id
+
+      get :is_local_username, params: {
+        usernames: [user.username], topic_id: private_topic.id
+      }, format: :json
+
       expect(response).to be_success
       json = JSON.parse(response.body)
       expect(json["cannot_see"].size).to eq(1)
@@ -1796,7 +2117,11 @@ describe UsersController do
 
     it "never returns a user who can see the topic" do
       Guardian.any_instance.expects(:can_see?).with(private_topic).returns(true)
-      xhr :get, :is_local_username, usernames: [allowed_user.username], topic_id: private_topic.id
+
+      get :is_local_username, params: {
+        usernames: [allowed_user.username], topic_id: private_topic.id
+      }, format: :json
+
       expect(response).to be_success
       json = JSON.parse(response.body)
       expect(json["cannot_see"].size).to eq(0)
@@ -1805,12 +2130,12 @@ describe UsersController do
   end
 
   describe '.topic_tracking_state' do
-    let(:user){Fabricate(:user)}
+    let(:user) { Fabricate(:user) }
 
     context 'anon' do
       it "raises an error on anon for topic_tracking_state" do
-        expect{
-          xhr :get, :topic_tracking_state, username: user.username, format: :json
+        expect {
+          get :topic_tracking_state, params: { username: user.username }, format: :json
         }.to raise_error(Discourse::NotLoggedIn)
       end
     end
@@ -1820,7 +2145,7 @@ describe UsersController do
         log_in_user(user)
 
         topic = Fabricate(:topic)
-        xhr :get, :topic_tracking_state, username: user.username, format: :json
+        get :topic_tracking_state, params: { username: user.username }, format: :json
 
         states = JSON.parse(response.body)
 
@@ -1835,25 +2160,24 @@ describe UsersController do
       user = Fabricate(:user)
       create_post(user: user)
 
-      xhr :get, :summary, username: user.username_lower
+      get :summary, params: { username: user.username_lower }, format: :json
       expect(response).to be_success
       json = JSON.parse(response.body)
 
       expect(json["user_summary"]["topic_count"]).to eq(1)
-      expect(json["user_summary"]["post_count"]).to eq(1)
+      expect(json["user_summary"]["post_count"]).to eq(0)
     end
   end
 
-
   describe ".confirm_admin" do
     it "fails without a valid token" do
       expect {
-        get :confirm_admin, token: 'invalid-token'
+        get :confirm_admin, params: { token: 'invalid-token' }, format: :json
       }.to raise_error(ActionController::UrlGenerationError)
     end
 
     it "fails with a missing token" do
-      get :confirm_admin, token: 'a0a0a0a0a0'
+      get :confirm_admin, params: { token: 'a0a0a0a0a0' }, format: :json
       expect(response).to_not be_success
     end
 
@@ -1861,7 +2185,7 @@ describe UsersController do
       user = Fabricate(:user)
       ac = AdminConfirmation.new(user, Fabricate(:admin))
       ac.create_confirmation
-      get :confirm_admin, token: ac.token
+      get :confirm_admin, params: { token: ac.token }
       expect(response).to be_success
 
       user.reload
@@ -1874,7 +2198,7 @@ describe UsersController do
 
       ac = AdminConfirmation.new(user, admin)
       ac.create_confirmation
-      get :confirm_admin, token: ac.token
+      get :confirm_admin, params: { token: ac.token }
       expect(response).to be_success
 
       user.reload
@@ -1887,7 +2211,7 @@ describe UsersController do
 
       ac = AdminConfirmation.new(user, Fabricate(:admin))
       ac.create_confirmation
-      get :confirm_admin, token: ac.token
+      get :confirm_admin, params: { token: ac.token }, format: :json
       expect(response).to_not be_success
 
       user.reload
@@ -1899,7 +2223,7 @@ describe UsersController do
         user = Fabricate(:user)
         ac = AdminConfirmation.new(user, Fabricate(:admin))
         ac.create_confirmation
-        post :confirm_admin, token: ac.token
+        post :confirm_admin, params: { token: ac.token }
         expect(response).to be_success
 
         user.reload
@@ -1909,28 +2233,39 @@ describe UsersController do
 
   end
 
-
   describe '.update_activation_email' do
 
     context "with a session variable" do
 
       it "raises an error with an invalid session value" do
         session[SessionController::ACTIVATE_USER_KEY] = 1234
-        xhr :put, :update_activation_email, { email: 'updatedemail@example.com' }
+
+        put :update_activation_email, params: {
+          email: 'updatedemail@example.com'
+        }, format: :json
+
         expect(response).to_not be_success
       end
 
       it "raises an error for an active user" do
         user = Fabricate(:walter_white)
         session[SessionController::ACTIVATE_USER_KEY] = user.id
-        xhr :put, :update_activation_email, { email: 'updatedemail@example.com' }
+
+        put :update_activation_email, params: {
+          email: 'updatedemail@example.com'
+        }, format: :json
+
         expect(response).to_not be_success
       end
 
       it "raises an error when logged in" do
         moderator = log_in(:moderator)
         session[SessionController::ACTIVATE_USER_KEY] = moderator.id
-        xhr :put, :update_activation_email, { email: 'updatedemail@example.com' }
+
+        put :update_activation_email, params: {
+          email: 'updatedemail@example.com'
+        }, format: :json
+
         expect(response).to_not be_success
       end
 
@@ -1938,7 +2273,19 @@ describe UsersController do
         active_user = Fabricate(:user)
         user = Fabricate(:inactive_user)
         session[SessionController::ACTIVATE_USER_KEY] = user.id
-        xhr :put, :update_activation_email, { email: active_user.email }
+
+        put :update_activation_email, params: {
+          email: active_user.email
+        }, format: :json
+
+        expect(response).to_not be_success
+      end
+
+      it "raises an error when the email is blacklisted" do
+        user = Fabricate(:inactive_user)
+        SiteSetting.email_domains_blacklist = 'example.com'
+        session[SessionController::ACTIVATE_USER_KEY] = user.id
+        put :update_activation_email, params: { email: 'test@example.com' }, format: :json
         expect(response).to_not be_success
       end
 
@@ -1947,7 +2294,10 @@ describe UsersController do
         token = user.email_tokens.first
 
         session[SessionController::ACTIVATE_USER_KEY] = user.id
-        xhr :put, :update_activation_email, { email: 'updatedemail@example.com' }
+
+        put :update_activation_email, params: {
+          email: 'updatedemail@example.com'
+        }, format: :json
 
         expect(response).to be_success
 
@@ -1962,51 +2312,56 @@ describe UsersController do
 
     context "with a username and password" do
       it "raises an error with an invalid username" do
-        xhr :put, :update_activation_email, {
+        put :update_activation_email, params: {
           username: 'eviltrout',
           password: 'invalid-password',
           email: 'updatedemail@example.com'
-        }
+        }, format: :json
+
         expect(response).to_not be_success
       end
 
       it "raises an error with an invalid password" do
-        xhr :put, :update_activation_email, {
+        put :update_activation_email, params: {
           username: Fabricate(:inactive_user).username,
           password: 'invalid-password',
           email: 'updatedemail@example.com'
-        }
+        }, format: :json
+
         expect(response).to_not be_success
       end
 
       it "raises an error for an active user" do
-        xhr :put, :update_activation_email, {
+        put :update_activation_email, params: {
           username: Fabricate(:walter_white).username,
           password: 'letscook',
           email: 'updatedemail@example.com'
-        }
+        }, format: :json
+
         expect(response).to_not be_success
       end
 
       it "raises an error when logged in" do
         log_in(:moderator)
 
-        xhr :put, :update_activation_email, {
+        put :update_activation_email, params: {
           username: Fabricate(:inactive_user).username,
           password: 'qwerqwer123',
           email: 'updatedemail@example.com'
-        }
+        }, format: :json
+
         expect(response).to_not be_success
       end
 
       it "raises an error when the new email is taken" do
         user = Fabricate(:user)
 
-        xhr :put, :update_activation_email, {
+        put :update_activation_email, params: {
           username: Fabricate(:inactive_user).username,
           password: 'qwerqwer123',
           email: user.email
-        }
+        }, format: :json
+
         expect(response).to_not be_success
       end
 
@@ -2014,11 +2369,11 @@ describe UsersController do
         user = Fabricate(:inactive_user)
         token = user.email_tokens.first
 
-        xhr :put, :update_activation_email, {
+        put :update_activation_email, params: {
           username: user.username,
           password: 'qwerqwer123',
           email: 'updatedemail@example.com'
-        }
+        }, format: :json
 
         expect(response).to be_success
 
@@ -2030,53 +2385,5 @@ describe UsersController do
         expect(token.expired?).to eq(true)
       end
     end
-
   end
-
-  context "account_created" do
-
-    it "returns a message when no session is present" do
-      get :account_created
-      created = assigns(:account_created)
-      expect(created).to be_present
-      expect(created[:message]).to eq(I18n.t('activation.missing_session'))
-      expect(created[:email]).to be_blank
-      expect(created[:username]).to be_blank
-    end
-
-    it "redirects when the user is logged in" do
-      log_in(:user)
-      get :account_created
-      expect(response).to be_redirect
-    end
-
-    context "when the user account is created" do
-      before do
-        session['user_created_message'] = "Donuts"
-      end
-
-      it "returns the message when set in the session" do
-        get :account_created
-        created = assigns(:account_created)
-        expect(created).to be_present
-        expect(created[:message]).to eq('Donuts')
-        expect(created[:email]).to be_blank
-        expect(created[:username]).to be_blank
-      end
-
-      it "includes user information when the session variable is present " do
-        user = Fabricate(:user, active: false)
-        session[SessionController::ACTIVATE_USER_KEY] = user.id
-
-        get :account_created
-        created = assigns(:account_created)
-        expect(created).to be_present
-        expect(created[:message]).to eq('Donuts')
-        expect(created[:email]).to eq(user.email)
-        expect(created[:username]).to eq(user.username)
-      end
-    end
-
-  end
-
 end
diff --git a/spec/controllers/users_email_controller_spec.rb b/spec/controllers/users_email_controller_spec.rb
deleted file mode 100644
index e43ad3befe..0000000000
--- a/spec/controllers/users_email_controller_spec.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-require 'rails_helper'
-
-describe UsersEmailController do
-
-  describe '.confirm' do
-    it 'errors out for invalid tokens' do
-      get :confirm, token: 'asdfasdf'
-      expect(response).to be_success
-      expect(assigns(:update_result)).to eq(:error)
-    end
-
-    context 'valid old address token' do
-      let(:user) { Fabricate(:moderator) }
-      let(:updater) { EmailUpdater.new(user.guardian, user) }
-
-      before do
-        updater.change_to('new.n.cool@example.com')
-      end
-
-      it 'confirms with a correct token' do
-        get :confirm, token: user.email_tokens.last.token
-        expect(response).to be_success
-        expect(assigns(:update_result)).to eq(:authorizing_new)
-      end
-    end
-
-    context 'valid new address token' do
-      let(:user) { Fabricate(:user) }
-      let(:updater) { EmailUpdater.new(user.guardian, user) }
-
-      before do
-        updater.change_to('new.n.cool@example.com')
-      end
-
-      it 'confirms with a correct token' do
-        user.user_stat.update_columns(bounce_score: 42, reset_bounce_score_after: 1.week.from_now)
-
-        get :confirm, token: user.email_tokens.last.token
-
-        expect(response).to be_success
-        expect(assigns(:update_result)).to eq(:complete)
-
-        user.reload
-
-        expect(user.user_stat.bounce_score).to eq(0)
-        expect(user.user_stat.reset_bounce_score_after).to eq(nil)
-      end
-    end
-  end
-
-  describe '.update' do
-    let(:new_email) { 'bubblegum@adventuretime.ooo' }
-
-    it "requires you to be logged in" do
-      expect { xhr :put, :update, username: 'asdf', email: new_email }.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    context 'when logged in' do
-      let!(:user) { log_in }
-
-      it 'raises an error without an email parameter' do
-        expect { xhr :put, :update, username: user.username }.to raise_error(ActionController::ParameterMissing)
-      end
-
-      it "raises an error if you can't edit the user's email" do
-        Guardian.any_instance.expects(:can_edit_email?).with(user).returns(false)
-        xhr :put, :update, username: user.username, email: new_email
-        expect(response).to be_forbidden
-      end
-
-      context 'when the new email address is taken' do
-        let!(:other_user) { Fabricate(:coding_horror) }
-        it 'raises an error' do
-          xhr :put, :update, username: user.username, email: other_user.email
-          expect(response).to_not be_success
-        end
-
-        it 'raises an error if there is whitespace too' do
-          xhr :put, :update, username: user.username, email: other_user.email + ' '
-          expect(response).to_not be_success
-        end
-      end
-
-      context 'when new email is different case of existing email' do
-        let!(:other_user) { Fabricate(:user, email: 'case.insensitive@gmail.com')}
-
-        it 'raises an error' do
-          xhr :put, :update, username: user.username, email: other_user.email.upcase
-          expect(response).to_not be_success
-        end
-      end
-
-      it 'raises an error when new email domain is present in email_domains_blacklist site setting' do
-        SiteSetting.email_domains_blacklist = "mailinator.com"
-        xhr :put, :update, username: user.username, email: "not_good@mailinator.com"
-        expect(response).to_not be_success
-      end
-
-      it 'raises an error when new email domain is not present in email_domains_whitelist site setting' do
-        SiteSetting.email_domains_whitelist = "discourse.org"
-        xhr :put, :update, username: user.username, email: new_email
-        expect(response).to_not be_success
-      end
-
-      context 'success' do
-        it 'has an email token' do
-          expect { xhr :put, :update, username: user.username, email: new_email }.to change(EmailChangeRequest, :count)
-        end
-      end
-    end
-
-  end
-
-end
diff --git a/spec/controllers/webhooks_controller_spec.rb b/spec/controllers/webhooks_controller_spec.rb
index ff329bf839..b5b049ca8a 100644
--- a/spec/controllers/webhooks_controller_spec.rb
+++ b/spec/controllers/webhooks_controller_spec.rb
@@ -16,11 +16,13 @@ describe WebhooksController do
 
       WebhooksController.any_instance.expects(:mailgun_verify).returns(true)
 
-      post :mailgun, "token" => "705a8ccd2ce932be8e98c221fe701c1b4a0afcb8bbd57726de",
-                     "timestamp" => Time.now.to_i,
-                     "event" => "dropped",
-                     "recipient" => email,
-                     "Message-Id" => "<12345@il.com>"
+      post :mailgun, params: {
+        "token" => "705a8ccd2ce932be8e98c221fe701c1b4a0afcb8bbd57726de",
+        "timestamp" => Time.now.to_i,
+        "event" => "dropped",
+        "recipient" => email,
+        "Message-Id" => "<12345@il.com>"
+      }, format: :json
 
       expect(response).to be_success
 
@@ -37,14 +39,16 @@ describe WebhooksController do
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      post :sendgrid, "_json" => [
-        {
-          "email"   => email,
-          "smtp-id" => "<12345@il.com>",
-          "event"   => "bounce",
-          "status"  => "5.0.0"
-        }
-      ]
+      post :sendgrid, params: {
+        "_json" => [
+          {
+            "email"   => email,
+            "smtp-id" => "<12345@il.com>",
+            "event"   => "bounce",
+            "status"  => "5.0.0"
+          }
+        ]
+      }, format: :json
 
       expect(response).to be_success
 
@@ -61,12 +65,12 @@ describe WebhooksController do
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      post :mailjet, {
-        "event"       => "bounce",
+      post :mailjet, params: {
+        "event" => "bounce",
         "email"       => email,
         "hard_bounce" => true,
         "CustomID"    => message_id
-      }
+      }, format: :json
 
       expect(response).to be_success
 
@@ -83,15 +87,17 @@ describe WebhooksController do
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      post :mandrill, mandrill_events: [{
-        "event" => "hard_bounce",
-        "msg" => {
-          "email" => email,
-          "metadata" => {
-            "message_id" => message_id
+      post :mandrill, params: {
+        mandrill_events: [{
+          "event" => "hard_bounce",
+          "msg" => {
+            "email" => email,
+            "metadata" => {
+              "message_id" => message_id
+            }
           }
-        }
-      }]
+        }]
+      }, format: :json
 
       expect(response).to be_success
 
@@ -108,17 +114,19 @@ describe WebhooksController do
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      post :sparkpost, "_json" => [{
-        "msys" => {
-          "message_event" => {
-            "bounce_class" => 10,
-            "rcpt_to" => email,
-            "rcpt_meta" => {
-              "message_id" => message_id
+      post :sparkpost, params: {
+        "_json" => [{
+          "msys" => {
+            "message_event" => {
+              "bounce_class" => 10,
+              "rcpt_to" => email,
+              "rcpt_meta" => {
+                "message_id" => message_id
+              }
             }
           }
-        }
-      }]
+        }]
+      }, format: :json
 
       expect(response).to be_success
 
diff --git a/spec/controllers/wizard_controller_spec.rb b/spec/controllers/wizard_controller_spec.rb
index 6621e34815..a6d38fee2c 100644
--- a/spec/controllers/wizard_controller_spec.rb
+++ b/spec/controllers/wizard_controller_spec.rb
@@ -10,31 +10,33 @@ describe WizardController do
     end
 
     it 'needs you to be logged in' do
-      expect { xhr :get, :index }.to raise_error(Discourse::NotLoggedIn)
+      expect do
+        get :index, format: :json
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     it "raises an error if you aren't an admin" do
       log_in(:moderator)
-      xhr :get, :index
+      get :index, format: :json
       expect(response).to be_forbidden
     end
 
     it "raises an error if the wizard is disabled" do
       SiteSetting.wizard_enabled = false
       log_in(:admin)
-      xhr :get, :index
+      get :index, format: :json
       expect(response).to be_forbidden
     end
 
     it "renders the wizard if you are an admin" do
       log_in(:admin)
-      xhr :get, :index
+      get :index, format: :json
       expect(response).to be_success
     end
 
     it "returns JSON when the mime type is appropriate" do
       log_in(:admin)
-      xhr :get, :index, format: 'json'
+      get :index, format: 'json'
       expect(response).to be_success
       expect(::JSON.parse(response.body).has_key?('wizard')).to eq(true)
     end
diff --git a/spec/fabricators/badge_fabricator.rb b/spec/fabricators/badge_fabricator.rb
index d3a5f78d7f..e535919d3a 100644
--- a/spec/fabricators/badge_fabricator.rb
+++ b/spec/fabricators/badge_fabricator.rb
@@ -1,8 +1,8 @@
 Fabricator(:badge_type) do
-  name { sequence(:name) {|i| "Silver #{i}" } }
+  name { sequence(:name) { |i| "Silver #{i}" } }
 end
 
 Fabricator(:badge) do
-  name { sequence(:name) {|i| "Badge #{i}" } }
+  name { sequence(:name) { |i| "Badge #{i}" } }
   badge_type
 end
diff --git a/spec/fabricators/category_fabricator.rb b/spec/fabricators/category_fabricator.rb
index 582619f23b..67e498ab16 100644
--- a/spec/fabricators/category_fabricator.rb
+++ b/spec/fabricators/category_fabricator.rb
@@ -29,3 +29,9 @@ end
 Fabricator(:link_category, from: :category) do
   before_validation { |category, transients| category.topic_featured_link_allowed = true }
 end
+
+Fabricator(:mailinglist_mirror_category, from: :category) do
+  email_in 'list@example.com'
+  email_in_allow_strangers true
+  mailinglist_mirror true
+end
diff --git a/spec/fabricators/color_scheme_color_fabricator.rb b/spec/fabricators/color_scheme_color_fabricator.rb
index 6cac52df72..ae8ec72425 100644
--- a/spec/fabricators/color_scheme_color_fabricator.rb
+++ b/spec/fabricators/color_scheme_color_fabricator.rb
@@ -1,5 +1,5 @@
 Fabricator(:color_scheme_color) do
   color_scheme
-  name { sequence(:name) {|i| "color_#{i}" } }
+  name { sequence(:name) { |i| "color_#{i}" } }
   hex "333333"
 end
diff --git a/spec/fabricators/color_scheme_fabricator.rb b/spec/fabricators/color_scheme_fabricator.rb
index 111964527a..67ee8becda 100644
--- a/spec/fabricators/color_scheme_fabricator.rb
+++ b/spec/fabricators/color_scheme_fabricator.rb
@@ -1,4 +1,4 @@
 Fabricator(:color_scheme) do
-  name { sequence(:name) {|i| "Palette #{i}" } }
+  name { sequence(:name) { |i| "Palette #{i}" } }
   color_scheme_colors(count: 2) { |attrs, i| Fabricate.build(:color_scheme_color, color_scheme: nil) }
 end
diff --git a/spec/fabricators/group_fabricator.rb b/spec/fabricators/group_fabricator.rb
index d190d520e6..a4c80237c8 100644
--- a/spec/fabricators/group_fabricator.rb
+++ b/spec/fabricators/group_fabricator.rb
@@ -1,3 +1,8 @@
 Fabricator(:group) do
   name { sequence(:name) { |n| "my_group_#{n}" } }
 end
+
+Fabricator(:public_group, from: :group) do
+  public_admission true
+  public_exit true
+end
diff --git a/spec/fabricators/group_user_fabricator.rb b/spec/fabricators/group_user_fabricator.rb
new file mode 100644
index 0000000000..9ed23e47eb
--- /dev/null
+++ b/spec/fabricators/group_user_fabricator.rb
@@ -0,0 +1,4 @@
+Fabricator(:group_user) do
+  user
+  group
+end
diff --git a/spec/fabricators/incoming_email_fabricator.rb b/spec/fabricators/incoming_email_fabricator.rb
new file mode 100644
index 0000000000..d91f6a9e39
--- /dev/null
+++ b/spec/fabricators/incoming_email_fabricator.rb
@@ -0,0 +1,20 @@
+Fabricator(:incoming_email) do
+  message_id "12345@example.com"
+  subject "Hello world"
+  from_address "foo@example.com"
+  to_addresses "someone@else.com"
+
+  raw <<~RAW
+    Return-Path: <foo@example.com>
+    From: Foo <foo@example.com>
+    To: someone@else.com
+    Subject: Hello world
+    Date: Fri, 15 Jan 2016 00:12:43 +0100
+    Message-ID: <12345@example.com>
+    Mime-Version: 1.0
+    Content-Type: text/plain; charset=UTF-8
+    Content-Transfer-Encoding: quoted-printable
+
+    The body contains "Hello world" too.
+  RAW
+end
diff --git a/spec/fabricators/incoming_link_fabricator.rb b/spec/fabricators/incoming_link_fabricator.rb
index 82e5245ddb..704099a4fb 100644
--- a/spec/fabricators/incoming_link_fabricator.rb
+++ b/spec/fabricators/incoming_link_fabricator.rb
@@ -1,5 +1,5 @@
 Fabricator(:incoming_link) do
   user
   post
-  ip_address { sequence(:ip_address) { |n| "123.#{(n*3)%255}.#{(n*2)%255}.#{n%255}" } }
+  ip_address { sequence(:ip_address) { |n| "123.#{(n * 3) % 255}.#{(n * 2) % 255}.#{n % 255}" } }
 end
diff --git a/spec/fabricators/notification_fabricator.rb b/spec/fabricators/notification_fabricator.rb
index c6e2b7d44d..6c6993c0a9 100644
--- a/spec/fabricators/notification_fabricator.rb
+++ b/spec/fabricators/notification_fabricator.rb
@@ -2,17 +2,17 @@ Fabricator(:notification) do
   notification_type Notification.types[:mentioned]
   data '{"poison":"ivy","killer":"croc"}'
   user
-  topic {|attrs| Fabricate(:topic, user: attrs[:user] ) }
+  topic { |attrs| Fabricate(:topic, user: attrs[:user]) }
 end
 
 Fabricator(:quote_notification, from: :notification) do
   notification_type Notification.types[:quoted]
   user
-  topic {|attrs| Fabricate(:topic, user: attrs[:user] ) }
+  topic { |attrs| Fabricate(:topic, user: attrs[:user]) }
 end
 
 Fabricator(:private_message_notification, from: :notification) do
   notification_type Notification.types[:private_message]
   user
-  topic {|attrs| Fabricate(:topic, user: attrs[:user] ) }
+  topic { |attrs| Fabricate(:topic, user: attrs[:user]) }
 end
diff --git a/spec/fabricators/permalink_fabricator.rb b/spec/fabricators/permalink_fabricator.rb
index 8de32e478d..51a38ac902 100644
--- a/spec/fabricators/permalink_fabricator.rb
+++ b/spec/fabricators/permalink_fabricator.rb
@@ -1,3 +1,3 @@
 Fabricator(:permalink) do
-  url { sequence(:url) {|i| "my/#{i}/url" } }
+  url { sequence(:url) { |i| "my/#{i}/url" } }
 end
diff --git a/spec/fabricators/post_fabricator.rb b/spec/fabricators/post_fabricator.rb
index 4a28dac1c0..e566d949b8 100644
--- a/spec/fabricators/post_fabricator.rb
+++ b/spec/fabricators/post_fabricator.rb
@@ -1,6 +1,6 @@
 Fabricator(:post) do
   user
-  topic {|attrs| Fabricate(:topic, user: attrs[:user] ) }
+  topic { |attrs| Fabricate(:topic, user: attrs[:user]) }
   raw "Hello world"
   post_type Post.types[:regular]
 end
@@ -17,13 +17,13 @@ Fabricator(:post_with_youtube, from: :post) do
 end
 
 Fabricator(:old_post, from: :post) do
-  topic {|attrs| Fabricate(:topic, user: attrs[:user], created_at: (DateTime.now - 100) ) }
+  topic { |attrs| Fabricate(:topic, user: attrs[:user], created_at: (DateTime.now - 100)) }
   created_at (DateTime.now - 100)
 end
 
 Fabricator(:moderator_post, from: :post) do
   user
-  topic {|attrs| Fabricate(:topic, user: attrs[:user] ) }
+  topic { |attrs| Fabricate(:topic, user: attrs[:user]) }
   post_type Post.types[:moderator_action]
   raw "Hello world"
 end
@@ -121,7 +121,7 @@ end
 Fabricator(:private_message_post, from: :post) do
   user
   topic do |attrs|
-    Fabricate( :private_message_topic,
+    Fabricate(:private_message_topic,
       user: attrs[:user],
       created_at: attrs[:created_at],
       subtype: TopicSubtype.user_to_user,
@@ -133,3 +133,14 @@ Fabricator(:private_message_post, from: :post) do
   end
   raw "Ssshh! This is our secret conversation!"
 end
+
+Fabricator(:post_via_email, from: :post) do
+  incoming_email
+  via_email true
+
+  after_create do |post|
+    incoming_email.topic = post.topic
+    incoming_email.post = post
+    incoming_email.user = post.user
+  end
+end
diff --git a/spec/fabricators/queued_post_fabricator.rb b/spec/fabricators/queued_post_fabricator.rb
index e838ef0ada..b61680a8b1 100644
--- a/spec/fabricators/queued_post_fabricator.rb
+++ b/spec/fabricators/queued_post_fabricator.rb
@@ -12,7 +12,15 @@ Fabricator(:queued_post) do
       custom_fields: { hello: 'world' },
       cooking_options: { cat: 'hat' },
       cook_method: Post.cook_methods[:raw_html],
-      image_sizes: {"http://foo.bar/image.png" => {"width" => 0, "height" => 222}} }
+      image_sizes: { "http://foo.bar/image.png" => { "width" => 0, "height" => 222 } } }
   end
 end
 
+Fabricator(:queued_topic, from: :queued_post) do
+  topic nil
+  raw 'This post should be queued up, and more importantly, this is a new topic'
+  post_options do
+    { category: 1,
+      title: 'This is a new topic' }
+  end
+end
diff --git a/spec/fabricators/screened_ip_address_fabricator.rb b/spec/fabricators/screened_ip_address_fabricator.rb
index a7dcb5ae4a..4a4cc36343 100644
--- a/spec/fabricators/screened_ip_address_fabricator.rb
+++ b/spec/fabricators/screened_ip_address_fabricator.rb
@@ -1,3 +1,3 @@
 Fabricator(:screened_ip_address) do
-  ip_address { sequence(:ip_address) { |n| "123.#{(n*3)%255}.#{(n*2)%255}.#{n%255}" } }
+  ip_address { sequence(:ip_address) { |n| "123.#{(n * 3) % 255}.#{(n * 2) % 255}.#{n % 255}" } }
 end
diff --git a/spec/fabricators/single_sign_on_record_fabricator.rb b/spec/fabricators/single_sign_on_record_fabricator.rb
index fcd4102a17..ef2cb0b764 100644
--- a/spec/fabricators/single_sign_on_record_fabricator.rb
+++ b/spec/fabricators/single_sign_on_record_fabricator.rb
@@ -5,5 +5,3 @@ Fabricator(:single_sign_on_record) do
   external_email { sequence(:email) { |i| "bruce#{i}@wayne.com" } }
   last_payload { sequence(:last_payload) { |i| "nonce=#{i}1870a940bbcbb46f06880ed338d58a07&name=" } }
 end
-
-
diff --git a/spec/fabricators/tag_fabricator.rb b/spec/fabricators/tag_fabricator.rb
index 5c61060c83..4c4d3d3eb4 100644
--- a/spec/fabricators/tag_fabricator.rb
+++ b/spec/fabricators/tag_fabricator.rb
@@ -1,3 +1,3 @@
 Fabricator(:tag) do
-  name { sequence(:name) { |i| "tag#{i+1}" } }
+  name { sequence(:name) { |i| "tag#{i + 1}" } }
 end
diff --git a/spec/fabricators/topic_embed_fabricator.rb b/spec/fabricators/topic_embed_fabricator.rb
index 407df3db9a..d457f1e209 100644
--- a/spec/fabricators/topic_embed_fabricator.rb
+++ b/spec/fabricators/topic_embed_fabricator.rb
@@ -1,4 +1,4 @@
 Fabricator(:topic_embed) do
   post
-  topic {|te| te[:post].topic }
+  topic { |te| te[:post].topic }
 end
diff --git a/spec/fabricators/topic_fabricator.rb b/spec/fabricators/topic_fabricator.rb
index e603a1244f..1fd06233cd 100644
--- a/spec/fabricators/topic_fabricator.rb
+++ b/spec/fabricators/topic_fabricator.rb
@@ -21,7 +21,7 @@ Fabricator(:private_message_topic, from: :topic) do
   category_id { nil }
   title { sequence(:title) { |i| "This is a private message #{i}" } }
   archetype "private_message"
-  topic_allowed_users{|t| [
+  topic_allowed_users { |t| [
     Fabricate.build(:topic_allowed_user, user: t[:user]),
     Fabricate.build(:topic_allowed_user, user: Fabricate(:coding_horror))
   ]}
diff --git a/spec/fabricators/upload_fabricator.rb b/spec/fabricators/upload_fabricator.rb
index a2afdf7af0..d9df6633ce 100644
--- a/spec/fabricators/upload_fabricator.rb
+++ b/spec/fabricators/upload_fabricator.rb
@@ -6,6 +6,7 @@ Fabricator(:upload) do
   width 100
   height 200
   url { sequence(:url) { |n| "/uploads/default/#{n}/1234567890123456.png" } }
+  extension "png"
 end
 
 Fabricator(:upload_s3, from: :upload) do
@@ -17,5 +18,5 @@ Fabricator(:attachment, from: :upload) do
   user
   original_filename "archive.zip"
   filesize 1234
-  url  "/uploads/default/42/66b3ed1503efc936.zip"
+  url "/uploads/default/42/66b3ed1503efc936.zip"
 end
diff --git a/spec/fabricators/user_email_fabricator.rb b/spec/fabricators/user_email_fabricator.rb
new file mode 100644
index 0000000000..8e7814bf21
--- /dev/null
+++ b/spec/fabricators/user_email_fabricator.rb
@@ -0,0 +1,9 @@
+Fabricator(:user_email) do
+  email { sequence(:email) { |i| "bruce#{i}@wayne.com" } }
+  primary true
+end
+
+Fabricator(:alternate_email, from: :user_email) do
+  email { sequence(:email) { |i| "bwayne#{i}@wayne.com" } }
+  primary false
+end
diff --git a/spec/fabricators/user_fabricator.rb b/spec/fabricators/user_fabricator.rb
index 5385b4f97a..dc535a4e25 100644
--- a/spec/fabricators/user_fabricator.rb
+++ b/spec/fabricators/user_fabricator.rb
@@ -1,16 +1,20 @@
 Fabricator(:user_stat) do
 end
 
-Fabricator(:user) do
+Fabricator(:user_single_email, class_name: :user) do
   name 'Bruce Wayne'
   username { sequence(:username) { |i| "bruce#{i}" } }
   email { sequence(:email) { |i| "bruce#{i}@wayne.com" } }
   password 'myawesomepassword'
   trust_level TrustLevel[1]
-  ip_address { sequence(:ip_address) { |i| "99.232.23.#{i%254}"} }
+  ip_address { sequence(:ip_address) { |i| "99.232.23.#{i % 254}" } }
   active true
 end
 
+Fabricator(:user, from: :user_single_email) do
+  after_create { |user| Fabricate(:alternate_email, user: user)  }
+end
+
 Fabricator(:coding_horror, from: :user) do
   name 'Coding Horror'
   username 'CodingHorror'
@@ -22,14 +26,14 @@ Fabricator(:evil_trout, from: :user) do
   name 'Evil Trout'
   username 'eviltrout'
   email 'eviltrout@somewhere.com'
-  password 'imafish'
+  password 'imafish123'
 end
 
 Fabricator(:walter_white, from: :user) do
   name 'Walter White'
   username 'heisenberg'
   email 'wwhite@bluemeth.com'
-  password 'letscook'
+  password 'letscook123'
 end
 
 Fabricator(:inactive_user, from: :user) do
@@ -41,16 +45,16 @@ Fabricator(:inactive_user, from: :user) do
 end
 
 Fabricator(:moderator, from: :user) do
-  name { sequence(:name) {|i| "A#{i} Moderator"} }
-  username { sequence(:username) {|i| "moderator#{i}"} }
-  email { sequence(:email) {|i| "moderator#{i}@discourse.org"} }
+  name { sequence(:name) { |i| "A#{i} Moderator" } }
+  username { sequence(:username) { |i| "moderator#{i}" } }
+  email { sequence(:email) { |i| "moderator#{i}@discourse.org" } }
   moderator true
 end
 
 Fabricator(:admin, from: :user) do
   name 'Anne Admin'
-  username { sequence(:username) {|i| "anne#{i}"} }
-  email { sequence(:email) {|i| "anne#{i}@discourse.org"} }
+  username { sequence(:username) { |i| "anne#{i}" } }
+  email { sequence(:email) { |i| "anne#{i}@discourse.org" } }
   admin true
 end
 
@@ -93,7 +97,7 @@ Fabricator(:anonymous, from: :user) do
   username { sequence(:username) { |i| "anonymous#{i}" } }
   email { sequence(:email) { |i| "anonymous#{i}@anonymous.com" } }
   trust_level TrustLevel[1]
-  trust_level_locked true
+  manual_locked_trust_level TrustLevel[1]
 
   before_create do |user|
     user.custom_fields["master_id"] = 1
diff --git a/spec/fabricators/user_field_fabricator.rb b/spec/fabricators/user_field_fabricator.rb
index 41b1dff07a..2e37eb3df4 100644
--- a/spec/fabricators/user_field_fabricator.rb
+++ b/spec/fabricators/user_field_fabricator.rb
@@ -1,5 +1,5 @@
 Fabricator(:user_field) do
-  name { sequence(:name) {|i| "field_#{i}" } }
+  name { sequence(:name) { |i| "field_#{i}" } }
   description "user field description"
   field_type 'text'
   editable true
diff --git a/spec/fabricators/watched_word_fabricator.rb b/spec/fabricators/watched_word_fabricator.rb
new file mode 100644
index 0000000000..28838e1a94
--- /dev/null
+++ b/spec/fabricators/watched_word_fabricator.rb
@@ -0,0 +1,4 @@
+Fabricator(:watched_word) do
+  word { sequence(:word) { |i| "word#{i}" } }
+  action { WatchedWord.actions[:block] }
+end
diff --git a/spec/fixtures/emails/attached_txt_file_2.eml b/spec/fixtures/emails/attached_txt_file_2.eml
new file mode 100644
index 0000000000..4cb6cdc1df
--- /dev/null
+++ b/spec/fixtures/emails/attached_txt_file_2.eml
@@ -0,0 +1,30 @@
+Return-Path: <discourse@bar.com>
+From: Foo Bar <discourse@bar.com>
+To: reply+4f97315cc828096c9cb34c6f1a0d6fe8@bar.com
+Date: Sat, 30 Jan 2016 01:10:11 +0100
+Message-ID: <38b@foo.bar.mail>
+Mime-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="--==_mimepart_56abff5d49749_ddf83fca6d033a28548ad";
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+
+----==_mimepart_56abff5d49749_ddf83fca6d033a28548ad
+Content-Type: text/plain;
+ charset=UTF-8;
+ filename=text.txt
+Content-Transfer-Encoding: 7bit
+Content-Disposition: attachment;
+ filename=text.txt
+Content-ID: <56abff637aac_ddf83fca6d033a2855099@HAL.lan.mail>
+
+This is a txt file.
+
+----==_mimepart_56abff5d49749_ddf83fca6d033a28548ad
+Content-Type: text/plain;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+Please find the same text file attached.
+----==_mimepart_56abff5d49749_ddf83fca6d033a28548ad--
diff --git a/spec/fixtures/emails/blacklist_whitelist_email.eml b/spec/fixtures/emails/blacklist_whitelist_email.eml
new file mode 100644
index 0000000000..f6b38bfcce
--- /dev/null
+++ b/spec/fixtures/emails/blacklist_whitelist_email.eml
@@ -0,0 +1,9 @@
+Return-Path: <foo@mail.com>
+From: Foo <foo@mail.com>
+Date: Fri, 15 Jan 2016 00:12:43 +0100
+Message-ID: <51@foo.bar.mail>
+Mime-Version: 1.0
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+
+Email from a domain on blacklist or whitelist.
diff --git a/spec/fixtures/emails/blocked_sender.eml b/spec/fixtures/emails/blocked_sender.eml
deleted file mode 100644
index 19bab36237..0000000000
--- a/spec/fixtures/emails/blocked_sender.eml
+++ /dev/null
@@ -1,9 +0,0 @@
-Return-Path: <blocked@bar.com>
-From: Foo Bar <blocked@bar.com>
-Date: Fri, 15 Jan 2016 00:12:43 +0100
-Message-ID: <8@foo.bar.mail>
-Mime-Version: 1.0
-Content-Type: text/plain
-Content-Transfer-Encoding: 7bit
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit.
diff --git a/spec/fixtures/emails/bounced_email_multiple_status_codes.eml b/spec/fixtures/emails/bounced_email_multiple_status_codes.eml
new file mode 100644
index 0000000000..3a0328932a
--- /dev/null
+++ b/spec/fixtures/emails/bounced_email_multiple_status_codes.eml
@@ -0,0 +1,45 @@
+Delivered-To: someguy@discourse.org
+Date: Thu,  7 Apr 2016 19:04:30 +0900 (JST)
+From: MAILER-DAEMON@b-s-c.co.jp (Mail Delivery System)
+Subject: Undelivered Mail Returned to Sender
+To: someguy@discourse.org
+MIME-Version: 1.0
+Content-Type: multipart/report; report-type=delivery-status;
+    boundary="18F5D18A0075.1460023470/some@daemon.com"
+
+This is a MIME-encapsulated message.
+
+--18F5D18A0075.1460023470/some@daemon.com
+Content-Description: Notification
+Content-Type: text/plain; charset=us-ascii
+
+Your email bounced
+
+--18F5D18A0075.1460023470/some@daemon.com
+Content-Description: Delivery report
+Content-Type: message/delivery-status
+
+Final-Recipient: rfc822; linux-admin@b-s-c.co.jp
+Original-Recipient: rfc822;linux-admin@b-s-c.co.jp
+Action: failed
+Status: 5.1.1
+Diagnostic-Code: X-Postfix; unknown user: "linux-admin"
+
+Final-Recipient: rfc822; foo@b-s-c.co.jp
+Original-Recipient: rfc822;linux-admin@b-s-c.co.jp
+Action: failed
+Status: 5.1.1
+Diagnostic-Code: X-Postfix; unknown user: "foo"
+
+--18F5D18A0075.1460023470/some@daemon.com
+Content-Description: Undelivered Message
+Content-Type: message/rfc822
+
+Return-Path: <someguy@discourse.org>
+Date: Thu, 07 Apr 2016 03:04:28 -0700 (PDT)
+From: someguy@discourse.org
+X-Discourse-Auto-Generated: marked
+
+This is the body
+
+--18F5D18A0075.1460023470/some@daemon.com--
diff --git a/spec/fixtures/emails/email_reply_like.eml b/spec/fixtures/emails/email_reply_like.eml
new file mode 100644
index 0000000000..0e1a5ef93c
--- /dev/null
+++ b/spec/fixtures/emails/email_reply_like.eml
@@ -0,0 +1,13 @@
+Return-Path: <four@foo.com>
+From: Four <four@foo.com>
+To: one@foo.com
+Cc: team@bar.com
+Subject: RE: Testing email threading
+Date: Fri, 15 Jan 2016 00:12:43 +0100
+Message-ID: <38@foo.bar.mail>
+In-Reply-To: <34@foo.bar.mail>
+Mime-Version: 1.0
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+
++1
diff --git a/spec/fixtures/emails/email_reply_staged.eml b/spec/fixtures/emails/email_reply_staged.eml
new file mode 100644
index 0000000000..b25041e77b
--- /dev/null
+++ b/spec/fixtures/emails/email_reply_staged.eml
@@ -0,0 +1,13 @@
+Return-Path: <staged@foo.com>
+From: Staged <staged@foo.com>
+To: one@foo.com
+Cc: team@bar.com, three@foo.com
+Subject: RE: Testing email threading
+Date: Fri, 15 Jan 2016 00:12:43 +0100
+Message-ID: <35@foo.bar.mail>
+In-Reply-To: <34@foo.bar.mail>
+Mime-Version: 1.0
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+
+This is email reply **2**.
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 0000000000..681ebdaacf
--- /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/ignored.eml b/spec/fixtures/emails/ignored.eml
index 1eafc6a6d2..153a9efb41 100644
--- a/spec/fixtures/emails/ignored.eml
+++ b/spec/fixtures/emails/ignored.eml
@@ -1,7 +1,7 @@
 Return-Path: <foo@bar.com>
 From: Foo Bar <foo@bar.com>
 To: category@foo.com
-Subject: This is a foo topic
+Subject: This is a FoO topic
 Date: Fri, 15 Jan 2016 00:12:43 +0100
 Message-ID: <53@foo.bar.mail>
 Mime-Version: 1.0
diff --git a/spec/fixtures/emails/invalid_from.eml b/spec/fixtures/emails/invalid_from_1.eml
similarity index 100%
rename from spec/fixtures/emails/invalid_from.eml
rename to spec/fixtures/emails/invalid_from_1.eml
diff --git a/spec/fixtures/emails/invalid_from_2.eml b/spec/fixtures/emails/invalid_from_2.eml
new file mode 100644
index 0000000000..25e4533f0c
--- /dev/null
+++ b/spec/fixtures/emails/invalid_from_2.eml
@@ -0,0 +1,12 @@
+Return-Path: <MAILER-DAEMON>
+Date: Fri, 25 Aug 2017 21:25:34 +0000 (UTC)
+From: MAILER-DAEMON (Mail Delivery System)
+Subject: Undelivered Mail Returned to Sender
+To: foo@example.com
+Message-Id: <12345@foo.bar.mail>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+This is a mail with an invalid from header that can't be fixed.
+It's missing the sender's email address.
diff --git a/spec/fixtures/emails/mailinglist.eml b/spec/fixtures/emails/mailinglist.eml
new file mode 100644
index 0000000000..a9e7deba92
--- /dev/null
+++ b/spec/fixtures/emails/mailinglist.eml
@@ -0,0 +1,12 @@
+From: alice@foo.com
+To: list@example.com
+Subject: mailinglist mirror
+Date: Mon, 16 Oct 2017 09:18:32 +0100
+Message-ID: <bddaa334ef93b5f3c7c3a42599330844@foo.com>
+Precedence: list
+List-Id: Example List <list@example.com>
+Content-Transfer-Encoding: 7bit
+Content-Type: text/plain; charset="us-ascii"
+Sender: list-bounces@example.com
+
+I love Discourse's mailinglist mirror feature.
diff --git a/spec/fixtures/emails/mailinglist_reply.eml b/spec/fixtures/emails/mailinglist_reply.eml
new file mode 100644
index 0000000000..9dd714b966
--- /dev/null
+++ b/spec/fixtures/emails/mailinglist_reply.eml
@@ -0,0 +1,16 @@
+In-Reply-To: <bddaa334ef93b5f3c7c3a42599330844@foo.com>
+References: <bddaa334ef93b5f3c7c3a42599330844@foo.com>
+From: bob@bar.com
+To: list@example.com
+Subject: Re: mailinglist mirror
+Date: Mon, 16 Oct 2017 09:41:26 +0100
+Message-ID: <CACJSOXnUonfJqMggzKYsZX@bar.com>
+Precedence: list
+List-Id: Example List <list@example.com>
+Content-Transfer-Encoding: 7bit
+Content-Type: text/plain; charset="us-ascii"
+Sender: list-bounces@example.com
+
+> I love Discourse's mailinglist mirror feature.
+
+Me too!
diff --git a/spec/fixtures/emails/no_date.eml b/spec/fixtures/emails/no_date.eml
new file mode 100644
index 0000000000..79989dcbfc
--- /dev/null
+++ b/spec/fixtures/emails/no_date.eml
@@ -0,0 +1,10 @@
+Return-Path: <discourse@bar.com>
+From: Foo Bar <discourse@bar.com>
+To: category@foo.com
+Subject: This is a topic from a complete stranger
+Message-ID: <31@foo.bar.mail>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+Hey, this is a topic from a complete stranger ;)
diff --git a/spec/fixtures/emails/no_from.eml b/spec/fixtures/emails/no_from.eml
new file mode 100644
index 0000000000..d3b536e490
--- /dev/null
+++ b/spec/fixtures/emails/no_from.eml
@@ -0,0 +1,9 @@
+To: meat@bar.com
+Date: Mon, 1 Feb 2016 00:12:43 +0100
+Message-ID: <40@foo.bar.mail>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+Subject: Nobody sent this
+
+This is an email without a FROM header.
diff --git a/spec/fixtures/emails/reply_user_not_matching_but_known.eml b/spec/fixtures/emails/reply_user_not_matching_but_known.eml
new file mode 100644
index 0000000000..f0c3c7d724
--- /dev/null
+++ b/spec/fixtures/emails/reply_user_not_matching_but_known.eml
@@ -0,0 +1,11 @@
+Return-Path: <bob@bar.com>
+From: Bob <bob@bar.com>
+To: reply+4f97315cc828096c9cb34c6f1a0d6fe8@bar.com
+CC: Alice <discourse@bar.com>, carol@bar.com
+Date: Fri, 15 Jan 2016 02:12:43 +0100
+Message-ID: <11@foo.bar.mail>
+Mime-Version: 1.0
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit.
diff --git a/spec/fixtures/emails/silenced_sender.eml b/spec/fixtures/emails/silenced_sender.eml
new file mode 100644
index 0000000000..47295f480b
--- /dev/null
+++ b/spec/fixtures/emails/silenced_sender.eml
@@ -0,0 +1,9 @@
+Return-Path: <silenced@bar.com>
+From: Foo Bar <silenced@bar.com>
+Date: Fri, 15 Jan 2016 00:12:43 +0100
+Message-ID: <8@foo.bar.mail>
+Mime-Version: 1.0
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit.
diff --git a/spec/fixtures/emails/staged_sender.eml b/spec/fixtures/emails/staged_sender.eml
index e7828e9146..efc9f533fd 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/emails/unsubscribe_new_user.eml b/spec/fixtures/emails/unsubscribe_new_user.eml
new file mode 100644
index 0000000000..337f2c88b6
--- /dev/null
+++ b/spec/fixtures/emails/unsubscribe_new_user.eml
@@ -0,0 +1,11 @@
+Return-Path: <newuser@bar.com>
+From: Foo Bar <newuser@bar.com>
+To: reply@bar.com
+Date: Thu, 13 Jun 2013 17:03:48 -0400
+Message-ID: <56@foo.bar.mail>
+Subject: UnSuBScRiBe
+Mime-Version: 1.0
+Content-Type: text/plain;
+Content-Transfer-Encoding: 7bit
+
+I've basically had enough of your mailing list and would very much like it if you went away.
diff --git a/spec/fixtures/feed/feed.atom b/spec/fixtures/feed/feed.atom
new file mode 100644
index 0000000000..52b02cf7d1
--- /dev/null
+++ b/spec/fixtures/feed/feed.atom
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed
+  xmlns="http://www.w3.org/2005/Atom"
+  xmlns:thr="http://purl.org/syndication/thread/1.0"
+  xmlns:discourse="http://discourse.org/rss/modules/discourse/"
+  xml:lang="en-US"
+  xml:base="https://blog.discourse.org/wp-atom.php"
+   >
+  <title type="text">Discourse</title>
+  <subtitle type="text">Official blog for the open source Discourse project</subtitle>
+  <updated>2017-10-23T23:45:37Z</updated>
+  <link rel="alternate" type="text/html" href="https://blog.discourse.org" />
+  <id>https://blog.discourse.org/feed/atom/</id>
+  <link rel="self" type="application/atom+xml" href="https://blog.discourse.org/feed/atom/" />
+  <generator uri="https://wordpress.org/" version="4.8.2">WordPress</generator>
+  <entry>
+    <discourse:username><![CDATA[xrav3nz]]></discourse:username>
+    <author>
+      <name>xrav3nz</name>
+    </author>
+    <title type="html"><![CDATA[Poll Feed Spec Fixture]]></title>
+    <link rel="alternate" type="text/html" href="https://blog.discourse.org/2017/09/poll-feed-spec-fixture/" />
+    <id>https://blog.discourse.org/?p=pollfeedspec</id>
+    <updated>2017-09-14T15:22:33Z</updated>
+    <published>2017-09-14T15:22:33Z</published>
+    <category scheme="https://blog.discourse.org" term="design" />
+    <summary type="html"><![CDATA[Here are some random descriptions... [&#8230;]]]></summary>
+    <content type="html" xml:base="https://blog.discourse.org/2017/09/poll-feed-spec-fixture/"><![CDATA[<p>This is the body &amp; content. </p>]]></content>
+  </entry>
+</feed>
diff --git a/spec/fixtures/feed/feed.rss b/spec/fixtures/feed/feed.rss
new file mode 100644
index 0000000000..a58bcf6263
--- /dev/null
+++ b/spec/fixtures/feed/feed.rss
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?><rss version="2.0"
+  xmlns:content="http://purl.org/rss/1.0/modules/content/"
+  xmlns:wfw="http://wellformedweb.org/CommentAPI/"
+  xmlns:dc="http://purl.org/dc/elements/1.1/"
+  xmlns:atom="http://www.w3.org/2005/Atom"
+  xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
+  xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
+  xmlns:discourse="http://discourse.org/rss/modules/discourse/"
+  >
+<channel>
+  <title>Discourse</title>
+  <atom:link href="https://blog.discourse.org/feed/" rel="self" type="application/rss+xml" />
+  <link>https://blog.discourse.org</link>
+  <description>Official blog for the open source Discourse project</description>
+  <lastBuildDate>Thu, 14 Sep 2017 15:22:33 +0000</lastBuildDate>
+  <language>en-US</language>
+  <sy:updatePeriod>hourly</sy:updatePeriod>
+  <sy:updateFrequency>1</sy:updateFrequency>
+  <generator>https://wordpress.org/?v=4.8.1</generator>
+  <item>
+    <title>Poll Feed Spec Fixture</title>
+    <link>https://blog.discourse.org/2017/09/poll-feed-spec-fixture/</link>
+    <pubDate>Thu, 14 Sep 2017 15:22:33 +0000</pubDate>
+    <dc:creator><![CDATA[xrav3nz]]></dc:creator>
+    <discourse:username><![CDATA[xrav3nz]]></discourse:username>
+    <category><![CDATA[spec]]></category>
+    <guid isPermaLink="false">https://blog.discourse.org/?p=pollfeedspec</guid>
+    <description><![CDATA[Here are some random descriptions... [&#8230;]]]></description>
+    <content:encoded><![CDATA[<p>This is the body &amp; content. </p>]]></content:encoded>
+  </item>
+  </channel>
+</rss>
diff --git a/spec/fixtures/json/import-export.json b/spec/fixtures/json/import-export.json
new file mode 100644
index 0000000000..1bc4da072a
--- /dev/null
+++ b/spec/fixtures/json/import-export.json
@@ -0,0 +1,31 @@
+{
+  "groups":[
+    {"id":41,"name":"custom_group","created_at":"2017-10-26T15:33:46.328Z","mentionable_level":0,"messageable_level":0,"visibility_level":0,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"user_ids":[1]},
+    {"id":42,"name":"custom_group_import","created_at":"2017-10-26T15:33:46.328Z","mentionable_level":0,"messageable_level":0,"visibility_level":0,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"user_ids":[2]}
+  ],
+  "categories":[
+    {"id":8,"name":"Custom Category","color":"AB9364","created_at":"2017-10-26T15:32:44.083Z","user_id":1,"slug":"custom-category","description":null,"text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":3,"auto_close_based_on_last_post":false,"topic_template":"","suppress_from_homepage":false,"all_topics_wiki":false,"permissions_params":{"custom_group":1,"everyone":2}},
+    {"id":10,"name":"Site Feedback Import","color":"808281","created_at":"2017-10-26T17:12:39.995Z","user_id":-1,"slug":"site-feedback-import","description":"Discussion about this site, its organization, how it works, and how we can improve it.","text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"suppress_from_homepage":false,"all_topics_wiki":false,"permissions_params":{}},
+    {"id":11,"name":"Uncategorized Import","color":"AB9364","created_at":"2017-10-26T17:12:32.359Z","user_id":-1,"slug":"uncategorized-import","description":"","text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"suppress_from_homepage":false,"all_topics_wiki":false,"permissions_params":{}},
+    {"id":12,"name":"Lounge Import","color":"EEEEEE","created_at":"2017-10-26T17:12:39.490Z","user_id":-1,"slug":"lounge-import","description":"A category exclusive to members with trust level 3 and higher.","text_color":"652D90","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"suppress_from_homepage":false,"all_topics_wiki":false,"permissions_params":{"trust_level_3":1}},
+    {"id":13,"name":"Staff Import","color":"283890","created_at":"2017-10-26T17:12:42.806Z","user_id":2,"slug":"staff-import","description":"Private category for staff discussions. Topics are only visible to admins and moderators.","text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"suppress_from_homepage":false,"all_topics_wiki":false,"permissions_params":{"custom_group_import":1,"staff":1}},
+    {"id":15,"name":"Custom Category Import","color":"AB9364","created_at":"2017-10-26T15:32:44.083Z","user_id":2,"slug":"custom-category-import","description":null,"text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":10,"auto_close_based_on_last_post":false,"topic_template":"","suppress_from_homepage":false,"all_topics_wiki":false,"permissions_params":{"custom_group_import":1,"everyone":2}}
+  ],
+  "users":[
+    {"id":1,"email":"email@example.com","username":"example","name":"Example","created_at":"2017-10-07T15:01:24.597Z","trust_level":4,"active":true,"last_emailed_at":null},
+    {"id":2,"email":"foo@bar.com","username":"foo","name":"Foo Bar","created_at":"2017-10-07T15:01:24.597Z","trust_level":4,"active":true,"last_emailed_at":null}
+  ],
+  "topics":[
+    {"id":7,"title":"Assets for the site design","created_at":"2017-10-26T17:15:04.590Z","views":0,"category_id":8,"closed":false,"archived":false,"archetype":"regular",
+      "posts":[
+        {"id":10,"user_id":-1,"post_number":1,"raw":"This topic, visible only to staff, is for storing images and files used in the site design.","created_at":"2017-10-26T17:15:04.720Z","reply_to_post_number":null,"hidden":false,"hidden_reason_id":null,"wiki":false}
+      ]
+    },
+    {"id":6,"title":"Privacy Policy","created_at":"2017-10-26T17:15:04.009Z","views":0,"category_id":15,"closed":false,"archived":false,"archetype":"regular",
+      "posts":[
+        {"id":8,"user_id":-1,"post_number":1,"raw":"[Third party links](#third-party)\n\nOccasionally, at our discretion, we may include or offer third party products or services on our site.","created_at":"2017-10-26T17:15:03.535Z","reply_to_post_number":null,"hidden":false,"hidden_reason_id":null,"wiki":false},
+        {"id":7,"user_id":-1,"post_number":2,"raw":"Edit the first post in this topic to change the contents of the FAQ/Guidelines page.","created_at":"2017-10-26T17:15:03.822Z","reply_to_post_number":null,"hidden":false,"hidden_reason_id":null,"wiki":false}
+      ]
+    }
+  ]
+}
diff --git a/spec/fixtures/md/spec.txt b/spec/fixtures/md/spec.txt
new file mode 100644
index 0000000000..c66f93b77f
--- /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/fixtures/multisite/two_dbs.yml b/spec/fixtures/multisite/two_dbs.yml
new file mode 100644
index 0000000000..ae9a5ab569
--- /dev/null
+++ b/spec/fixtures/multisite/two_dbs.yml
@@ -0,0 +1,5 @@
+second:
+  adapter: postgresql
+  database: discourse_test_multisite
+  host_names:
+    - test2.localhost
diff --git a/spec/fixtures/plugins/my_plugin/plugin.rb b/spec/fixtures/plugins/my_plugin/plugin.rb
index 92468f3c5e..db3f2f891f 100644
--- a/spec/fixtures/plugins/my_plugin/plugin.rb
+++ b/spec/fixtures/plugins/my_plugin/plugin.rb
@@ -3,8 +3,8 @@
 # version: 0.1
 # authors: Frank Zappa
 
-auth_provider :title => 'with Ubuntu',
-              :authenticator => Auth::OpenIdAuthenticator.new('ubuntu','https://login.ubuntu.com', trusted: true),
-              :message => 'Authenticating with Ubuntu (make sure pop up blockers are not enbaled)',
-              :frame_width => 1000,   # the frame size used for the pop up window, overrides default
-              :frame_height => 800
+auth_provider title: 'with Ubuntu',
+              authenticator: Auth::OpenIdAuthenticator.new('ubuntu', 'https://login.ubuntu.com', trusted: true),
+              message: 'Authenticating with Ubuntu (make sure pop up blockers are not enbaled)',
+              frame_width: 1000,   # the frame size used for the pop up window, overrides default
+              frame_height: 800
diff --git a/spec/fixtures/site_settings/env.yml b/spec/fixtures/site_settings/deprecated_env.yml
similarity index 100%
rename from spec/fixtures/site_settings/env.yml
rename to spec/fixtures/site_settings/deprecated_env.yml
diff --git a/spec/fixtures/site_settings/deprecated_hidden.yml b/spec/fixtures/site_settings/deprecated_hidden.yml
new file mode 100644
index 0000000000..ba483cbb0d
--- /dev/null
+++ b/spec/fixtures/site_settings/deprecated_hidden.yml
@@ -0,0 +1,6 @@
+developer:
+  force_hostname:
+    hidden:
+      development: false
+      default: true
+    default: ''
diff --git a/spec/fixtures/site_settings/locale_default.yml b/spec/fixtures/site_settings/locale_default.yml
new file mode 100644
index 0000000000..9da10c8f39
--- /dev/null
+++ b/spec/fixtures/site_settings/locale_default.yml
@@ -0,0 +1,8 @@
+search:
+  min_search_term_length:
+    client: true
+    default: 3
+    locale_default:
+      zh_CN: 2
+      zh_TW: 2
+    min: 2
diff --git a/spec/fixtures/site_settings/nil_default.yml b/spec/fixtures/site_settings/nil_default.yml
new file mode 100644
index 0000000000..6700ffaf3e
--- /dev/null
+++ b/spec/fixtures/site_settings/nil_default.yml
@@ -0,0 +1,3 @@
+category1:
+  title:
+    hidden: true
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 77b43be594..69a50d2ca5 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -2,6 +2,50 @@ require 'rails_helper'
 
 describe ApplicationHelper do
 
+  describe "preload_script" do
+    it "provides brotli links to brotli cdn" do
+      set_cdn_url "https://awesome.com"
+      set_env "COMPRESS_BROTLI", "1"
+
+      helper.request.env["HTTP_ACCEPT_ENCODING"] = 'br'
+      link = helper.preload_script('application')
+
+      expect(link).to eq("<link rel='preload' href='https://awesome.com/brotli_asset/application.js' as='script'/>\n<script src='https://awesome.com/brotli_asset/application.js'></script>")
+    end
+
+    context "with s3 CDN" do
+      before do
+        global_setting :s3_bucket, 'test_bucket'
+        global_setting :s3_region, 'ap-australia'
+        global_setting :s3_access_key_id, '123'
+        global_setting :s3_secret_access_key, '123'
+        global_setting :s3_cdn_url, 'https://s3cdn.com'
+        set_env "COMPRESS_BROTLI", "1"
+      end
+
+      it "returns magic brotli mangling for brotli requests" do
+
+        helper.request.env["HTTP_ACCEPT_ENCODING"] = 'br'
+        link = helper.preload_script('application')
+
+        expect(link).to eq("<link rel='preload' href='https://s3cdn.com/assets/application.br.js' as='script'/>\n<script src='https://s3cdn.com/assets/application.br.js'></script>")
+      end
+
+      it "gives s3 cdn if asset host is not set" do
+        link = helper.preload_script('application')
+
+        expect(link).to eq("<link rel='preload' href='https://s3cdn.com/assets/application.js' as='script'/>\n<script src='https://s3cdn.com/assets/application.js'></script>")
+      end
+
+      it "gives s3 cdn even if asset host is set" do
+        set_cdn_url "https://awesome.com"
+        link = helper.preload_script('application')
+
+        expect(link).to eq("<link rel='preload' href='https://s3cdn.com/assets/application.js' as='script'/>\n<script src='https://s3cdn.com/assets/application.js'></script>")
+      end
+    end
+  end
+
   describe "escape_unicode" do
     it "encodes tags" do
       expect(helper.escape_unicode("<tag>")).to eq("\u003ctag>")
@@ -14,7 +58,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 +111,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/import_export/category_exporter_spec.rb b/spec/import_export/category_exporter_spec.rb
new file mode 100644
index 0000000000..785f520c85
--- /dev/null
+++ b/spec/import_export/category_exporter_spec.rb
@@ -0,0 +1,51 @@
+require "rails_helper"
+require "import_export/category_exporter"
+
+describe ImportExport::CategoryExporter do
+
+  let(:category) { Fabricate(:category) }
+  let(:group) { Fabricate(:group) }
+  let(:user) { Fabricate(:user) }
+
+  before do
+    STDOUT.stubs(:write)
+  end
+
+  context '.perform' do
+    it 'export the category when it is found' do
+      data = ImportExport::CategoryExporter.new([category.id]).perform.export_data
+
+      expect(data[:categories].count).to eq(1)
+      expect(data[:groups].count).to eq(0)
+    end
+
+    it 'export the category with permission groups' do
+      category_group = Fabricate(:category_group, category: category, group: group)
+      data = ImportExport::CategoryExporter.new([category.id]).perform.export_data
+
+      expect(data[:categories].count).to eq(1)
+      expect(data[:groups].count).to eq(1)
+    end
+
+    it 'export multiple categories' do
+      category2 = Fabricate(:category)
+      category_group = Fabricate(:category_group, category: category, group: group)
+      data = ImportExport::CategoryExporter.new([category.id, category2.id]).perform.export_data
+
+      expect(data[:categories].count).to eq(2)
+      expect(data[:groups].count).to eq(1)
+    end
+
+    it 'export the category with topics and users' do
+      topic1 = Fabricate(:topic, category: category, user_id: -1)
+      topic2 = Fabricate(:topic, category: category, user: user)
+      data = ImportExport::CategoryExporter.new([category.id]).perform.export_data
+
+      expect(data[:categories].count).to eq(1)
+      expect(data[:groups].count).to eq(0)
+      expect(data[:topics].count).to eq(2)
+      expect(data[:users].count).to eq(1)
+    end
+  end
+
+end
diff --git a/spec/import_export/category_structure_exporter_spec.rb b/spec/import_export/category_structure_exporter_spec.rb
new file mode 100644
index 0000000000..cb46123d07
--- /dev/null
+++ b/spec/import_export/category_structure_exporter_spec.rb
@@ -0,0 +1,43 @@
+require "rails_helper"
+require "import_export/category_structure_exporter"
+
+describe ImportExport::CategoryStructureExporter do
+
+  before do
+    STDOUT.stubs(:write)
+  end
+
+  it 'export all the categories' do
+    category = Fabricate(:category)
+    data = ImportExport::CategoryStructureExporter.new.perform.export_data
+
+    expect(data[:categories].count).to eq(2)
+    expect(data[:groups].count).to eq(0)
+    expect(data[:users].blank?).to eq(true)
+  end
+
+  it 'export all the categories with permission groups' do
+    category = Fabricate(:category)
+    group = Fabricate(:group)
+    category_group = Fabricate(:category_group, category: category, group: group)
+    data = ImportExport::CategoryStructureExporter.new.perform.export_data
+
+    expect(data[:categories].count).to eq(2)
+    expect(data[:groups].count).to eq(1)
+    expect(data[:users].blank?).to eq(true)
+  end
+
+  it 'export all the categories with permission groups and users' do
+    category = Fabricate(:category)
+    group = Fabricate(:group)
+    user = Fabricate(:user)
+    category_group = Fabricate(:category_group, category: category, group: group)
+    group_user = Fabricate(:group_user, group: group, user: user)
+    data = ImportExport::CategoryStructureExporter.new(true).perform.export_data
+
+    expect(data[:categories].count).to eq(2)
+    expect(data[:groups].count).to eq(1)
+    expect(data[:users].count).to eq(1)
+  end
+
+end
diff --git a/spec/import_export/importer_spec.rb b/spec/import_export/importer_spec.rb
new file mode 100644
index 0000000000..ae212046d2
--- /dev/null
+++ b/spec/import_export/importer_spec.rb
@@ -0,0 +1,72 @@
+require "rails_helper"
+require "import_export/category_exporter"
+require "import_export/category_structure_exporter"
+require "import_export/importer"
+
+describe ImportExport::Importer do
+
+  before do
+    STDOUT.stubs(:write)
+  end
+
+  let(:import_data) do
+    import_file = Rack::Test::UploadedFile.new(file_from_fixtures("import-export.json", "json"))
+    data = ActiveSupport::HashWithIndifferentAccess.new(JSON.parse(import_file.read))
+  end
+
+  def import(data)
+    ImportExport::Importer.new(data).perform
+  end
+
+  context '.perform' do
+
+    it 'topics and users' do
+      data = import_data.dup
+      data[:categories] = nil
+      data[:groups] = nil
+
+      expect {
+        import(data)
+      }.to change { Category.count }.by(0)
+        .and change { Group.count }.by(0)
+        .and change { Topic.count }.by(2)
+        .and change { User.count }.by(2)
+    end
+
+    it 'categories and groups' do
+      data = import_data.dup
+      data[:topics] = nil
+      data[:users] = nil
+
+      expect {
+        import(data)
+      }.to change { Category.count }.by(6)
+        .and change { Group.count }.by(2)
+        .and change { Topic.count }.by(6)
+        .and change { User.count }.by(0)
+    end
+
+    it 'categories, groups and users' do
+      data = import_data.dup
+      data[:topics] = nil
+
+      expect {
+        import(data)
+      }.to change { Category.count }.by(6)
+        .and change { Group.count }.by(2)
+        .and change { Topic.count }.by(6)
+        .and change { User.count }.by(2)
+    end
+
+    it 'all' do
+      expect {
+        import(import_data)
+      }.to change { Category.count }.by(6)
+        .and change { Group.count }.by(2)
+        .and change { Topic.count }.by(8)
+        .and change { User.count }.by(2)
+    end
+
+  end
+
+end
diff --git a/spec/import_export/topic_exporter_spec.rb b/spec/import_export/topic_exporter_spec.rb
new file mode 100644
index 0000000000..db767e4da5
--- /dev/null
+++ b/spec/import_export/topic_exporter_spec.rb
@@ -0,0 +1,34 @@
+require "rails_helper"
+require "import_export/topic_exporter"
+
+describe ImportExport::TopicExporter do
+
+  before do
+    STDOUT.stubs(:write)
+  end
+
+  let(:user) { Fabricate(:user) }
+  let(:topic) { Fabricate(:topic, user: user) }
+
+  context '.perform' do
+    it 'export a single topic' do
+      data = ImportExport::TopicExporter.new([topic.id]).perform.export_data
+
+      expect(data[:categories].blank?).to eq(true)
+      expect(data[:groups].blank?).to eq(true)
+      expect(data[:topics].count).to eq(1)
+      expect(data[:users].count).to eq(1)
+    end
+
+    it 'export multiple topics' do
+      topic2 = Fabricate(:topic, user: user)
+      data = ImportExport::TopicExporter.new([topic.id, topic2.id]).perform.export_data
+
+      expect(data[:categories].blank?).to eq(true)
+      expect(data[:groups].blank?).to eq(true)
+      expect(data[:topics].count).to eq(2)
+      expect(data[:users].count).to eq(1)
+    end
+  end
+
+end
diff --git a/spec/integration/admin/backups_spec.rb b/spec/integration/admin/backups_spec.rb
deleted file mode 100644
index 4520b06f47..0000000000
--- a/spec/integration/admin/backups_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe "Managing Backups" do
-  let(:admin) { Fabricate(:admin) }
-
-  before do
-    sign_in(admin)
-  end
-
-  describe 'rolling back a restore' do
-    it 'should rollback the restore' do
-      BackupRestore.expects(:rollback!)
-
-      post "/admin/backups/rollback.json"
-
-      expect(response).to be_success
-    end
-
-    it 'should not allow rollback via a GET request' do
-      expect { get "/admin/backups/rollback.json" }
-        .to raise_error(ActionController::RoutingError)
-    end
-  end
-
-  describe 'cancelling a backup' do
-    it "should cancel an backup" do
-      BackupRestore.expects(:cancel!)
-
-      delete "/admin/backups/cancel.json"
-
-      expect(response).to be_success
-    end
-
-    it 'should not allow cancel via a GET request' do
-      expect { get "/admin/backups/cancel.json" }
-        .to raise_error(ActionController::RoutingError)
-    end
-  end
-end
diff --git a/spec/integration/admin/emojis_spec.rb b/spec/integration/admin/emojis_spec.rb
deleted file mode 100644
index c0d72fcdfb..0000000000
--- a/spec/integration/admin/emojis_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe "Managing custom emojis" do
-  let(:admin) { Fabricate(:admin) }
-  let(:upload) { Fabricate(:upload) }
-
-  before do
-    sign_in(admin)
-  end
-
-  describe "creating a custom emoji" do
-    describe 'when upload is invalid' do
-      it 'should publish the right error' do
-        message = MessageBus.track_publish do
-          post("/admin/customize/emojis.json", {
-            name: 'test',
-            file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/fake.jpg")
-          })
-        end.find{|m| m.channel == "/uploads/emoji"}
-
-        expect(message.channel).to eq("/uploads/emoji")
-        expect(message.data["errors"]).to eq([I18n.t('upload.images.size_not_found')])
-      end
-    end
-
-    describe 'when emoji name already exists' do
-      it 'should publish the right error' do
-        CustomEmoji.create!(name: 'test', upload: upload)
-
-        message = MessageBus.track_publish do
-          post("/admin/customize/emojis.json", {
-            name: 'test',
-            file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
-          })
-        end.find{|m| m.channel == "/uploads/emoji"}
-
-        expect(message.channel).to eq("/uploads/emoji")
-
-        expect(message.data["errors"]).to eq([
-          "Name #{I18n.t('activerecord.errors.models.custom_emoji.attributes.name.taken')}"
-        ])
-      end
-    end
-
-    it 'should allow an admin to add a custom emoji' do
-        Emoji.expects(:clear_cache)
-
-        message = MessageBus.track_publish do
-          post("/admin/customize/emojis.json", {
-            name: 'test',
-            file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
-          })
-        end.find{|m| m.channel == "/uploads/emoji"}
-
-        custom_emoji = CustomEmoji.last
-        upload = custom_emoji.upload
-
-        expect(upload.original_filename).to eq('logo.png')
-        expect(message.channel).to eq("/uploads/emoji")
-        expect(message.data["errors"]).to eq(nil)
-        expect(message.data["name"]).to eq(custom_emoji.name)
-        expect(message.data["url"]).to eq(upload.url)
-    end
-  end
-
-  describe 'deleting a custom emoji' do
-    it 'should allow an admin to delete a custom emoji' do
-      custom_emoji = CustomEmoji.create!(name: 'test', upload: upload)
-      Emoji.clear_cache
-
-      expect { delete "/admin/customize/emojis/#{custom_emoji.name}.json", name: 'test' }
-        .to change { Upload.count }.by(-1)
-        .and change { CustomEmoji.count }.by(-1)
-    end
-  end
-end
diff --git a/spec/integration/category_tag_spec.rb b/spec/integration/category_tag_spec.rb
index 047056cedc..cbc58c0d8a 100644
--- a/spec/integration/category_tag_spec.rb
+++ b/spec/integration/category_tag_spec.rb
@@ -9,7 +9,7 @@ describe "category tag restrictions" do
     tag_records.map(&:name).sort
   end
 
-  def filter_allowed_tags(opts={})
+  def filter_allowed_tags(opts = {})
     DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user), opts)
   end
 
@@ -45,8 +45,8 @@ describe "category tag restrictions" do
 
     it "search can show only permitted tags" do
       expect(filter_allowed_tags.count).to eq(Tag.count)
-      expect(filter_allowed_tags({for_input: true, category: category_with_tags}).pluck(:name).sort).to eq([tag1.name, tag2.name].sort)
-      expect(filter_allowed_tags({for_input: true}).pluck(:name).sort).to eq([tag3.name, tag4.name].sort)
+      expect(filter_allowed_tags(for_input: true, category: category_with_tags).pluck(:name).sort).to eq([tag1.name, tag2.name].sort)
+      expect(filter_allowed_tags(for_input: true).pluck(:name).sort).to eq([tag3.name, tag4.name].sort)
     end
 
     it "can't create new tags in a restricted category" do
@@ -80,13 +80,13 @@ describe "category tag restrictions" do
       category.allowed_tag_groups = [tag_group1.name]
       category.reload
 
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: category}))).to eq(sorted_tag_names([tag1, tag2]))
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true}))).to eq(sorted_tag_names([tag3, tag4]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: category))).to eq(sorted_tag_names([tag1, tag2]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true))).to eq(sorted_tag_names([tag3, tag4]))
 
       tag_group1.tags = [tag2, tag3, tag4]
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: category}))).to eq(sorted_tag_names([tag2, tag3, tag4]))
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true}))).to eq(sorted_tag_names([tag1]))
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: other_category}))).to eq(sorted_tag_names([tag1]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: category))).to eq(sorted_tag_names([tag2, tag3, tag4]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true))).to eq(sorted_tag_names([tag1]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: other_category))).to eq(sorted_tag_names([tag1]))
     end
 
     it "groups and individual tags can be mixed" do
@@ -94,9 +94,9 @@ describe "category tag restrictions" do
       category.allowed_tags = [tag4.name]
       category.reload
 
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: category}))).to eq(sorted_tag_names([tag1, tag2, tag4]))
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true}))).to eq(sorted_tag_names([tag3]))
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: other_category}))).to eq(sorted_tag_names([tag3]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: category))).to eq(sorted_tag_names([tag1, tag2, tag4]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true))).to eq(sorted_tag_names([tag3]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: other_category))).to eq(sorted_tag_names([tag3]))
     end
   end
 
@@ -104,9 +104,9 @@ describe "category tag restrictions" do
     it "filter_allowed_tags returns results based on whether parent tag is present or not" do
       tag_group = Fabricate(:tag_group, parent_tag_id: tag1.id)
       tag_group.tags = [tag3, tag4]
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true}))).to eq(sorted_tag_names([tag1, tag2]))
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true, selected_tags: [tag1.name]}))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true, selected_tags: [tag1.name, tag3.name]}))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true))).to eq(sorted_tag_names([tag1, tag2]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true, selected_tags: [tag1.name]))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true, selected_tags: [tag1.name, tag3.name]))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
     end
 
     context "and category restrictions" do
@@ -137,15 +137,15 @@ describe "category tag restrictions" do
 
       it "handles all those rules" do
         # car tags can't be used outside of car category:
-        expect(sorted_tag_names(filter_allowed_tags({for_input: true}))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
-        expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: other_category}))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
+        expect(sorted_tag_names(filter_allowed_tags(for_input: true))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
+        expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: other_category))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
 
         # in car category, a make tag must be given first:
-        expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category}))).to eq(['ford', 'honda'])
+        expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category))).to eq(['ford', 'honda'])
 
         # model tags depend on which make is chosen:
-        expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category, selected_tags: ['honda']}))).to eq(['accord', 'civic', 'ford', 'honda'])
-        expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category, selected_tags: ['ford']}))).to eq(['ford', 'honda', 'mustang', 'taurus'])
+        expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['honda']))).to eq(['accord', 'civic', 'ford', 'honda'])
+        expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['ford']))).to eq(['ford', 'honda', 'mustang', 'taurus'])
       end
 
       it "can apply the tags to a topic" do
@@ -161,10 +161,10 @@ describe "category tag restrictions" do
         end
 
         it "can restrict one tag from each group" do
-          expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category}))).to eq(['ford', 'honda'])
-          expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category, selected_tags: ['honda']}))).to eq(['accord', 'civic', 'honda'])
-          expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category, selected_tags: ['ford']}))).to eq(['ford', 'mustang', 'taurus'])
-          expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category, selected_tags: ['ford', 'mustang']}))).to eq(['ford', 'mustang'])
+          expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category))).to eq(['ford', 'honda'])
+          expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['honda']))).to eq(['accord', 'civic', 'honda'])
+          expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['ford']))).to eq(['ford', 'mustang', 'taurus'])
+          expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['ford', 'mustang']))).to eq(['ford', 'mustang'])
         end
 
         it "can apply the tags to a topic" do
@@ -175,7 +175,7 @@ describe "category tag restrictions" do
         it "can remove extra tags from the same group" do
           # A weird case that input field wouldn't allow.
           # Only one tag from car makers is allowed, but we're saying that two have been selected.
-          names = filter_allowed_tags({for_input: true, category: car_category, selected_tags: ['honda', 'ford']}).map(&:name)
+          names = filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['honda', 'ford']).map(&:name)
           expect(names.include?('honda') && names.include?('ford')).to eq(false)
           expect(names.include?('honda') || names.include?('ford')).to eq(true)
         end
diff --git a/spec/integration/groups_spec.rb b/spec/integration/groups_spec.rb
deleted file mode 100644
index 055129425e..0000000000
--- a/spec/integration/groups_spec.rb
+++ /dev/null
@@ -1,579 +0,0 @@
-require 'rails_helper'
-
-describe "Groups" do
-  let(:user) { Fabricate(:user) }
-  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)
-    end
-
-    context 'when group directory is disabled' do
-      it 'should deny access' do
-        SiteSetting.enable_group_directory = false
-
-        get "/groups.json"
-        expect(response).to be_forbidden
-      end
-    end
-
-    it 'should return the right response' do
-      get "/groups.json"
-
-      expect(response).to be_success
-
-      response_body = JSON.parse(response.body)
-
-      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(response_body["load_more_groups"]).to eq("/groups?page=1")
-      expect(response_body["total_rows_groups"]).to eq(1)
-    end
-
-    context 'viewing as an admin' do
-      it 'should display automatic groups' do
-        admin = Fabricate(:admin)
-        sign_in(admin)
-        group.add(admin)
-
-        get "/groups.json"
-
-        expect(response).to be_success
-
-        response_body = JSON.parse(response.body)
-
-        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(response_body["load_more_groups"]).to eq("/groups?page=1")
-        expect(response_body["total_rows_groups"]).to eq(10)
-      end
-    end
-  end
-
-  describe "checking if a group can be mentioned" do
-    it "should return the right response" do
-      sign_in(user)
-      group.update_attributes!(name: 'test')
-
-      get "/groups/test/mentionable.json", { name: group.name }
-
-      expect(response).to be_success
-
-      response_body = JSON.parse(response.body)
-      expect(response_body["mentionable"]).to eq(false)
-
-      group.update_attributes!(alias_level: Group::ALIAS_LEVELS[:everyone])
-
-      get "/groups/test/mentionable.json", { name: group.name }
-      expect(response).to be_success
-
-      response_body = JSON.parse(response.body)
-      expect(response_body["mentionable"]).to eq(true)
-    end
-  end
-
-  describe "group can be updated" do
-    let(:group) { Fabricate(:group, name: 'test', users: [user], public: false) }
-
-    before do
-      sign_in(user)
-    end
-
-    context "when user is group owner" do
-      before do
-        group.add_owner(user)
-        sign_in(user)
-      end
-
-      it "should be able update the group" do
-        group.update!(allow_membership_requests: false)
-
-        expect do
-          xhr :put, "/groups/#{group.id}", { group: {
-            flair_bg_color: 'FFF',
-            flair_color: 'BBB',
-            flair_url: 'fa-adjust',
-            bio_raw: 'testing',
-            full_name: 'awesome team',
-            public: true,
-            allow_membership_requests: true
-          } }
-        end.to change { GroupHistory.count }.by(7)
-
-        expect(response).to be_success
-
-        group.reload
-
-        expect(group.flair_bg_color).to eq('FFF')
-        expect(group.flair_color).to eq('BBB')
-        expect(group.flair_url).to eq('fa-adjust')
-        expect(group.bio_raw).to eq('testing')
-        expect(group.full_name).to eq('awesome team')
-        expect(group.public).to eq(true)
-        expect(group.allow_membership_requests).to eq(true)
-        expect(GroupHistory.last.subject).to eq('allow_membership_requests')
-      end
-    end
-
-    context "when user is group admin" do
-      before do
-        user.update_attributes!(admin: true)
-        sign_in(user)
-      end
-
-      it 'should be able to update the group' do
-        xhr :put, "/groups/#{group.id}", { group: { flair_color: 'BBB' } }
-
-        expect(response).to be_success
-        expect(group.reload.flair_color).to eq('BBB')
-      end
-    end
-
-    context "when user is not a group owner or admin" do
-      it 'should not be able to update the group' do
-        sign_in(user)
-
-        xhr :put, "/groups/#{group.id}", { group: { name: 'testing' } }
-
-        expect(response.status).to eq(403)
-      end
-    end
-  end
-
-  describe 'members' do
-    let(:user1) do
-      Fabricate(:user,
-        last_seen_at: Time.zone.now,
-        last_posted_at: Time.zone.now - 1.day,
-        email: 'b@test.org'
-      )
-    end
-
-    let(:user2) do
-      Fabricate(:user,
-        last_seen_at: Time.zone.now - 1 .day,
-        last_posted_at: Time.zone.now,
-        email: 'a@test.org'
-      )
-    end
-
-    let(:user3) do
-      Fabricate(:user,
-        last_seen_at: nil,
-        last_posted_at: nil,
-        email: 'c@test.org'
-      )
-    end
-
-    let(:group) { Fabricate(:group, users: [user1, user2, user3]) }
-
-    it "should allow members to be sorted by" do
-      xhr :get, "/groups/#{group.name}/members", order: 'last_seen_at', desc: true
-
-      expect(response).to be_success
-
-      members = JSON.parse(response.body)["members"]
-
-      expect(members.map { |m| m["id"] }).to eq([user1.id, user2.id, user3.id])
-
-      xhr :get, "/groups/#{group.name}/members", order: 'last_seen_at'
-
-      expect(response).to be_success
-
-      members = JSON.parse(response.body)["members"]
-
-      expect(members.map { |m| m["id"] }).to eq([user2.id, user1.id, user3.id])
-
-      xhr :get, "/groups/#{group.name}/members", order: 'last_posted_at', desc: true
-
-      expect(response).to be_success
-
-      members = JSON.parse(response.body)["members"]
-
-      expect(members.map { |m| m["id"] }).to eq([user2.id, user1.id, user3.id])
-    end
-
-    it "should not allow members to be sorted by columns that are not allowed" do
-      xhr :get, "/groups/#{group.name}/members", order: 'email'
-
-      expect(response).to be_success
-
-      members = JSON.parse(response.body)["members"]
-
-      expect(members.map { |m| m["id"] }).to eq([user1.id, user2.id, user3.id])
-    end
-  end
-
-  describe "membership edit permissions" do
-    let(:group) { Fabricate(:group) }
-
-    context 'when user is not signed in' do
-      it 'should be fobidden' do
-        xhr :put, "/groups/#{group.id}/members", usernames: "bob"
-        expect(response).to be_forbidden
-
-        xhr :delete, "/groups/#{group.id}/members", username: "bob"
-        expect(response).to be_forbidden
-      end
-
-      context 'public group' do
-        it 'should be fobidden' do
-          group.update_attributes!(public: true)
-
-          expect { xhr :put, "/groups/#{group.id}/members", usernames: "bob" }
-            .to raise_error(Discourse::NotLoggedIn)
-
-          expect { xhr :delete, "/groups/#{group.id}/members", username: "bob" }
-            .to raise_error(Discourse::NotLoggedIn)
-        end
-      end
-    end
-
-    context 'when user is not an owner of the group' do
-      before do
-        sign_in(user)
-      end
-
-      it "refuses membership changes to unauthorized users" do
-        xhr :put, "/groups/#{group.id}/members", usernames: "bob"
-        expect(response).to be_forbidden
-
-        xhr :delete, "/groups/#{group.id}/members", username: "bob"
-        expect(response).to be_forbidden
-      end
-    end
-
-    context 'when user is an admin' do
-      let(:user) { Fabricate(:admin) }
-      let(:group) { Fabricate(:group, users: [user], automatic: true) }
-
-      before do
-        sign_in(user)
-      end
-
-      it "cannot add members to automatic groups" do
-        xhr :put, "/groups/#{group.id}/members", usernames: "bob"
-        expect(response).to be_forbidden
-
-        xhr :delete, "/groups/#{group.id}/members", username: "bob"
-        expect(response).to be_forbidden
-      end
-    end
-  end
-
-  describe "membership edits" do
-    let(:admin) { Fabricate(:admin) }
-
-    before do
-      sign_in(admin)
-    end
-
-    context 'adding members' do
-      it "can make incremental adds" do
-        user2 = Fabricate(:user)
-
-        expect do
-          xhr :put, "/groups/#{group.id}/members", usernames: user2.username
-        end.to change { group.users.count }.by(1)
-
-        expect(response).to be_success
-
-        group_history = GroupHistory.last
-
-        expect(group_history.action).to eq(GroupHistory.actions[:add_user_to_group])
-        expect(group_history.acting_user).to eq(admin)
-        expect(group_history.target_user).to eq(user2)
-      end
-
-      it "cannot add members to automatic groups" do
-        group.update!(automatic: true)
-
-        xhr :put, "/groups/#{group.id}/members", usernames: "l77t"
-        expect(response.status).to eq(403)
-      end
-
-      context "is able to add several members to a group" do
-        let(:user1) { Fabricate(:user) }
-        let(:user2) { Fabricate(:user) }
-
-        it "adds by username" do
-          expect { xhr :put, "/groups/#{group.id}/members", usernames: [user1.username, user2.username].join(",") }
-            .to change { group.users.count }.by(2)
-
-          expect(response).to be_success
-        end
-
-        it "adds by id" do
-          expect { xhr :put, "/groups/#{group.id}/members", user_ids: [user1.id, user2.id].join(",") }
-            .to change { group.users.count }.by(2)
-
-          expect(response).to be_success
-        end
-      end
-
-      it "returns 422 if member already exists" do
-        xhr :put, "/groups/#{group.id}/members", usernames: user.username
-
-        expect(response.status).to eq(422)
-      end
-
-      it "returns 404 if member is not found" do
-        xhr :put, "/groups/#{group.id}/members", usernames: 'some donkey'
-
-        expect(response.status).to eq(404)
-      end
-
-      context 'public group' do
-        let(:other_user) { Fabricate(:user) }
-
-        before do
-          group.update!(public: true)
-        end
-
-        context 'admin' do
-          it "can make incremental adds" do
-            expect do
-              xhr :put, "/groups/#{group.id}/members", usernames: other_user.username
-            end.to change { group.users.count }.by(1)
-
-            expect(response).to be_success
-
-            group_history = GroupHistory.last
-
-            expect(group_history.action).to eq(GroupHistory.actions[:add_user_to_group])
-            expect(group_history.acting_user).to eq(admin)
-            expect(group_history.target_user).to eq(other_user)
-          end
-        end
-
-        it 'should allow a user to join the group' do
-          sign_in(other_user)
-
-          expect { xhr :put, "/groups/#{group.id}/members", usernames: other_user.username }
-            .to change { group.users.count }.by(1)
-
-          expect(response).to be_success
-        end
-
-        it 'should not allow an underprivilege user to add another user to a group' do
-          sign_in(user)
-
-          xhr :put, "/groups/#{group.id}/members", usernames: other_user.username
-
-          expect(response).to be_forbidden
-        end
-      end
-    end
-
-    context 'removing members' do
-      it "cannot remove members from automatic groups" do
-        group.update!(automatic: true)
-
-        xhr :delete, "/groups/#{group.id}/members", user_id: 42
-        expect(response.status).to eq(403)
-      end
-
-      it "raises an error if user to be removed is not found" do
-        xhr :delete, "/groups/#{group.id}/members", user_id: -10
-        expect(response.status).to eq(404)
-      end
-
-      context "is able to remove a member" do
-        it "removes by id" do
-          expect { xhr :delete, "/groups/#{group.id}/members", user_id: user.id }
-            .to change { group.users.count }.by(-1)
-
-          expect(response).to be_success
-        end
-
-        it "removes by username" do
-          expect { xhr :delete, "/groups/#{group.id}/members", username: user.username }
-            .to change { group.users.count }.by(-1)
-
-          expect(response).to be_success
-        end
-
-        it "removes user.primary_group_id when user is removed from group" do
-          user.update!(primary_group_id: group.id)
-
-          xhr :delete, "/groups/#{group.id}/members", user_id: user.id
-
-          expect(user.reload.primary_group_id).to eq(nil)
-        end
-
-        it "removes by user_email" do
-          expect { xhr :delete, "/groups/#{group.id}/members", user_email: user.email }
-            .to change { group.users.count }.by(-1)
-
-          expect(response).to be_success
-        end
-
-        context 'public group' do
-          let(:other_user) { Fabricate(:user) }
-          let(:group) { Fabricate(:group, users: [other_user]) }
-
-          before do
-            group.update!(public: true)
-          end
-
-          context "admin" do
-            it "removes by username" do
-              expect { xhr :delete, "/groups/#{group.id}/members", username: other_user.username }
-                .to change { group.users.count }.by(-1)
-
-              expect(response).to be_success
-            end
-          end
-
-          it 'should allow a user to leave a group' do
-            sign_in(other_user)
-
-            expect { xhr :delete, "/groups/#{group.id}/members", username: other_user.username }
-              .to change { group.users.count }.by(-1)
-
-            expect(response).to be_success
-          end
-
-          it 'should not allow a underprivilege user to leave a group for another user' do
-            sign_in(user)
-
-            xhr :delete, "/groups/#{group.id}/members", username: other_user.username
-
-            expect(response).to be_forbidden
-          end
-        end
-      end
-    end
-  end
-
-  describe "group histories" do
-    context 'when user is not signed in' do
-      it 'should raise the right error' do
-        expect { xhr :get, "/groups/#{group.name}/logs" }
-          .to raise_error(Discourse::NotLoggedIn)
-      end
-    end
-
-    context 'when user is not a group owner' do
-      before do
-        sign_in(user)
-      end
-
-      it 'should be forbidden' do
-        xhr :get, "/groups/#{group.name}/logs"
-
-        expect(response).to be_forbidden
-      end
-    end
-
-    describe 'viewing history' do
-      context 'public group' do
-        before do
-          group.add_owner(user)
-          group.update_attributes!(public: true)
-          GroupActionLogger.new(user, group).log_change_group_settings
-          sign_in(user)
-        end
-
-        it 'should allow group owner to view history' do
-          xhr :get, "/groups/#{group.name}/logs"
-
-          expect(response).to be_success
-
-          result = JSON.parse(response.body)["logs"].first
-
-          expect(result["action"]).to eq(GroupHistory.actions[1].to_s)
-          expect(result["subject"]).to eq('public')
-          expect(result["prev_value"]).to eq('f')
-          expect(result["new_value"]).to eq('t')
-        end
-      end
-
-      context 'admin' do
-        let(:admin) { Fabricate(:admin) }
-
-        before do
-          sign_in(admin)
-        end
-
-        it 'should be able to view history' do
-          GroupActionLogger.new(admin, group).log_remove_user_from_group(user)
-
-          xhr :get, "/groups/#{group.name}/logs"
-
-          expect(response).to be_success
-
-          result = JSON.parse(response.body)["logs"].first
-
-          expect(result["action"]).to eq(GroupHistory.actions[3].to_s)
-        end
-
-        it 'should be able to filter through the history' do
-          GroupActionLogger.new(admin, group).log_add_user_to_group(user)
-          GroupActionLogger.new(admin, group).log_remove_user_from_group(user)
-
-          xhr :get, "/groups/#{group.name}/logs", filters: { "action" => "add_user_to_group" }
-
-          expect(response).to be_success
-
-          logs = JSON.parse(response.body)["logs"]
-
-          expect(logs.count).to eq(1)
-          expect(logs.first["action"]).to eq(GroupHistory.actions[2].to_s)
-        end
-      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
-end
diff --git a/spec/integration/invite_only_registration_spec.rb b/spec/integration/invite_only_registration_spec.rb
index 72575738df..3151eebc1d 100644
--- a/spec/integration/invite_only_registration_spec.rb
+++ b/spec/integration/invite_only_registration_spec.rb
@@ -12,25 +12,28 @@ describe 'invite only' do
       admin = Fabricate(:admin)
       api_key = Fabricate(:api_key, user: admin)
 
-      xhr :post, '/users',
+      post '/users.json', params: {
         name: 'bob',
         username: 'bob',
         password: 'strongpassword',
         email: 'bob@bob.com',
         api_key: api_key.key,
         api_username: admin.username
+      }
 
       user_id = JSON.parse(response.body)["user_id"]
       expect(user_id).to be > 0
 
       # activate and approve
-      xhr :put, "/admin/users/#{user_id}/activate",
-          api_key: api_key.key,
-          api_username: admin.username
+      put "/admin/users/#{user_id}/activate.json", params: {
+        api_key: api_key.key,
+        api_username: admin.username
+      }
 
-      xhr :put, "/admin/users/#{user_id}/approve",
-          api_key: api_key.key,
-          api_username: admin.username
+      put "/admin/users/#{user_id}/approve.json", params: {
+        api_key: api_key.key,
+        api_username: admin.username
+      }
 
       u = User.find(user_id)
       expect(u.active).to eq(true)
diff --git a/spec/integration/managing_topic_status_spec.rb b/spec/integration/managing_topic_status_spec.rb
deleted file mode 100644
index 0673c27959..0000000000
--- a/spec/integration/managing_topic_status_spec.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe "Managing a topic's status update", type: :request do
-  let(:topic) { Fabricate(:topic) }
-  let(:user) { Fabricate(:user) }
-
-  context 'when a user is not logged in' do
-    it 'should return the right response' do
-      expect do
-        post "/t/#{topic.id}/timer.json",
-          time: '24',
-          status_type: TopicTimer.types[1]
-      end.to raise_error(Discourse::NotLoggedIn)
-    end
-  end
-
-  context 'when does not have permission' do
-    it 'should return the right response' do
-      sign_in(user)
-
-      post "/t/#{topic.id}/timer.json",
-        time: '24',
-        status_type: TopicTimer.types[1]
-
-      expect(response.status).to eq(403)
-      expect(JSON.parse(response.body)["error_type"]).to eq('invalid_access')
-    end
-  end
-
-  context 'when logged in as an admin' do
-    let(:admin) { Fabricate(:admin) }
-
-    before do
-      sign_in(admin)
-    end
-
-    it 'should be able to create a topic status update' do
-      time = 24
-
-      post "/t/#{topic.id}/timer.json",
-        time: 24,
-        status_type: TopicTimer.types[1]
-
-      expect(response).to be_success
-
-      topic_status_update = TopicTimer.last
-
-      expect(topic_status_update.topic).to eq(topic)
-
-      expect(topic_status_update.execute_at)
-        .to be_within(1.second).of(24.hours.from_now)
-
-      json = JSON.parse(response.body)
-
-      expect(DateTime.parse(json['execute_at']))
-        .to be_within(1.seconds).of(DateTime.parse(topic_status_update.execute_at.to_s))
-
-      expect(json['duration']).to eq(topic_status_update.duration)
-      expect(json['closed']).to eq(topic.reload.closed)
-    end
-
-    it 'should be able to delete a topic status update' do
-      topic.update!(topic_timers: [Fabricate(:topic_timer)])
-
-      post "/t/#{topic.id}/timer.json",
-        time: nil,
-        status_type: TopicTimer.types[1]
-
-      expect(response).to be_success
-      expect(topic.reload.public_topic_timer).to eq(nil)
-
-      json = JSON.parse(response.body)
-
-      expect(json['execute_at']).to eq(nil)
-      expect(json['duration']).to eq(nil)
-      expect(json['closed']).to eq(topic.closed)
-    end
-
-    describe 'publishing topic to category in the future' do
-      it 'should be able to create the topic status update' do
-        SiteSetting.queue_jobs = true
-
-        post "/t/#{topic.id}/timer.json",
-          time: 24,
-          status_type: TopicTimer.types[3],
-          category_id: topic.category_id
-
-        expect(response).to be_success
-
-        topic_status_update = TopicTimer.last
-
-        expect(topic_status_update.topic).to eq(topic)
-
-        expect(topic_status_update.execute_at)
-          .to be_within(1.second).of(24.hours.from_now)
-
-        expect(topic_status_update.status_type)
-          .to eq(TopicTimer.types[:publish_to_category])
-
-        json = JSON.parse(response.body)
-
-        expect(json['category_id']).to eq(topic.category_id)
-      end
-    end
-
-    describe 'invalid status type' do
-      it 'should raise the right error' do
-        expect do
-          post "/t/#{topic.id}/timer.json",
-            time: 10,
-            status_type: 'something'
-        end.to raise_error(Discourse::InvalidParameters)
-      end
-    end
-  end
-end
diff --git a/spec/integration/multisite_spec.rb b/spec/integration/multisite_spec.rb
new file mode 100644
index 0000000000..647b925fce
--- /dev/null
+++ b/spec/integration/multisite_spec.rb
@@ -0,0 +1,67 @@
+# require 'rails_helper'
+#
+# describe 'multisite' do
+#
+#   class DBNameMiddleware
+#     def initialize(app, config = {})
+#       @app = app
+#     end
+#
+#     def call(env)
+#       # note current_db is already being ruined on boot cause its not multisite
+#       [200, {}, [RailsMultisite::ConnectionManagement.current_hostname]]
+#     end
+#   end
+#
+#   let :session do
+#     RailsMultisite::ConnectionManagement.config_filename = "spec/fixtures/multisite/two_dbs.yml"
+#     RailsMultisite::ConnectionManagement.load_settings!
+#
+#     stack = ActionDispatch::MiddlewareStack.new
+#     stack.use RailsMultisite::ConnectionManagement, RailsMultisite::DiscoursePatches.config
+#     stack.use DBNameMiddleware
+#
+#     routes = ActionDispatch::Routing::RouteSet.new
+#     stack.build(routes)
+#   end
+#
+#   it "should always allow /srv/status through" do
+#     headers = {
+#       "HTTP_HOST" => "unknown.com",
+#       "REQUEST_METHOD" => "GET",
+#       "PATH_INFO" => "/srv/status",
+#       "rack.input" => StringIO.new
+#     }
+#
+#     code, _, body = session.call(headers)
+#     expect(code).to eq(200)
+#     expect(body.join).to eq("test.localhost")
+#   end
+#
+#   it "should 404 on unknown routes" do
+#     headers = {
+#       "HTTP_HOST" => "unknown.com",
+#       "REQUEST_METHOD" => "GET",
+#       "PATH_INFO" => "/topics",
+#       "rack.input" => StringIO.new
+#     }
+#
+#     code, _ = session.call(headers)
+#     expect(code).to eq(404)
+#   end
+#
+#   it "should hit correct site elsewise" do
+#
+#     headers = {
+#       "HTTP_HOST" => "test2.localhost",
+#       "REQUEST_METHOD" => "GET",
+#       "PATH_INFO" => "/topics",
+#       "rack.input" => StringIO.new
+#     }
+#
+#     code, _, body = session.call(headers)
+#     expect(code).to eq(200)
+#     expect(body.join).to eq("test2.localhost")
+#   end
+#
+# end
diff --git a/spec/integration/omniauth_callbacks_spec.rb b/spec/integration/omniauth_callbacks_spec.rb
deleted file mode 100644
index d2616894f5..0000000000
--- a/spec/integration/omniauth_callbacks_spec.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe "OmniAuth Callbacks" do
-  let(:user) { Fabricate(:user) }
-
-  before do
-    OmniAuth.config.test_mode = true
-  end
-
-  after do
-    Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2] = nil
-    OmniAuth.config.test_mode = false
-  end
-
-  context 'Google Oauth2' do
-    before do
-      SiteSetting.enable_google_oauth2_logins = true
-    end
-
-    context "without an `omniauth.auth` env" do
-      it "should return a 404" do
-        get "/auth/eviltrout/callback"
-        expect(response.code).to eq("404")
-      end
-    end
-
-    describe 'when user has been verified' do
-      before do
-        OmniAuth.config.mock_auth[:google_oauth2] = OmniAuth::AuthHash.new(
-          provider: 'google_oauth2',
-          uid: '123545',
-          info: OmniAuth::AuthHash::InfoHash.new(
-            email: user.email,
-            name: 'Some name'
-          ),
-          extra: {
-            raw_info: OmniAuth::AuthHash.new(
-              email_verified: true,
-              email: user.email,
-              family_name: 'Huh',
-              given_name: user.name,
-              gender: 'male',
-              name: "#{user.name} Huh",
-            )
-          },
-        )
-
-        Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2]
-      end
-
-      it 'should return the right response' do
-        get "/auth/google_oauth2/callback.json"
-
-        expect(response).to be_success
-
-        response_body = JSON.parse(response.body)
-
-        expect(response_body["authenticated"]).to eq(true)
-        expect(response_body["awaiting_activation"]).to eq(false)
-        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)
-      end
-
-      context 'when user has not verified his email' do
-        before do
-          GoogleUserInfo.create!(google_user_id: '12345', user: user)
-          user.update!(active: false)
-
-          OmniAuth.config.mock_auth[:google_oauth2] = OmniAuth::AuthHash.new(
-            provider: 'google_oauth2',
-            uid: '12345',
-            info: OmniAuth::AuthHash::InfoHash.new(
-              email: 'someother_email@test.com',
-              name: 'Some name'
-            ),
-            extra: {
-              raw_info: OmniAuth::AuthHash.new(
-                email_verified: true,
-                email: 'someother_email@test.com',
-                family_name: 'Huh',
-                given_name: user.name,
-                gender: 'male',
-                name: "#{user.name} Huh",
-              )
-            },
-          )
-
-          Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2]
-        end
-
-        it 'should return the right response' do
-          get "/auth/google_oauth2/callback.json"
-
-          expect(response).to be_success
-
-          response_body = JSON.parse(response.body)
-
-          expect(user.reload.active).to eq(false)
-          expect(response_body["authenticated"]).to eq(false)
-          expect(response_body["awaiting_activation"]).to eq(true)
-        end
-      end
-    end
-  end
-end
diff --git a/spec/integration/rate_limiting_spec.rb b/spec/integration/rate_limiting_spec.rb
new file mode 100644
index 0000000000..e3211fa55b
--- /dev/null
+++ b/spec/integration/rate_limiting_spec.rb
@@ -0,0 +1,37 @@
+# encoding: UTF-8
+
+require 'rails_helper'
+
+describe 'admin rate limit' do
+
+  before do
+    RateLimiter.enable
+  end
+
+  after do
+    RateLimiter.disable
+  end
+
+  it 'can cleanly limit requests' do
+
+    admin = Fabricate(:admin)
+    api_key = Fabricate(:api_key, key: SecureRandom.hex, user: admin)
+
+    global_setting :max_admin_api_reqs_per_key_per_minute, 1
+
+    get '/admin/users.json', params: {
+      api_key: api_key.key,
+      api_username: admin.username
+    }
+
+    expect(response.status).to eq(200)
+
+    get '/admin/users.json', params: {
+      api_key: api_key.key,
+      api_username: admin.username
+    }
+
+    expect(response.status).to eq(429)
+
+  end
+end
diff --git a/spec/integration/safe_mode_spec.rb b/spec/integration/safe_mode_spec.rb
deleted file mode 100644
index f421c8fb97..0000000000
--- a/spec/integration/safe_mode_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe 'Safe mode' do
-  describe 'entering safe mode' do
-    context 'when no params are given' do
-      it 'should redirect back to safe mode page' do
-        post '/safe-mode'
-
-        expect(response.status).to redirect_to(safe_mode_path)
-      end
-    end
-  end
-end
diff --git a/spec/integration/spam_rules_spec.rb b/spec/integration/spam_rules_spec.rb
index bb28573e8f..1f8d98f9ea 100644
--- a/spec/integration/spam_rules_spec.rb
+++ b/spec/integration/spam_rules_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 
 describe SpamRulesEnforcer do
 
-  describe 'auto-blocking users based on flagging' do
+  describe 'auto-silenceing users based on flagging' do
     let!(:admin)     { Fabricate(:admin) } # needed to send a system message
     let!(:moderator) { Fabricate(:moderator) }
     let(:user1)      { Fabricate(:user) }
@@ -12,8 +12,8 @@ describe SpamRulesEnforcer do
 
     before do
       SiteSetting.flags_required_to_hide_post = 0
-      SiteSetting.num_spam_flags_to_block_new_user = 2
-      SiteSetting.num_users_to_block_new_user = 2
+      SiteSetting.num_spam_flags_to_silence_new_user = 2
+      SiteSetting.num_users_to_silence_new_user = 2
     end
 
     context 'spammer is a new user' do
@@ -37,7 +37,7 @@ describe SpamRulesEnforcer do
 
             expect(spam_post.reload).to_not be_hidden
             expect(spam_post2.reload).to_not be_hidden
-            expect(spammer.reload).to_not be_blocked
+            expect(spammer.reload).to_not be_silenced
           end
         end
 
@@ -50,12 +50,12 @@ describe SpamRulesEnforcer do
             PostAction.act(user2, spam_post, PostActionType.types[:spam])
 
             expect(Guardian.new(spammer).can_create_topic?(nil)).to be(false)
-            expect{PostCreator.create(spammer, {title: 'limited time offer for you', raw: 'better buy this stuff ok', archetype_id: 1})}.to raise_error(Discourse::InvalidAccess)
-            expect(PostCreator.create(spammer, {topic_id: another_topic.id, raw: 'my reply is spam in your topic', archetype_id: 1})).to eq(nil)
+            expect { PostCreator.create(spammer, title: 'limited time offer for you', raw: 'better buy this stuff ok', archetype_id: 1) }.to raise_error(Discourse::InvalidAccess)
+            expect(PostCreator.create(spammer, topic_id: another_topic.id, raw: 'my reply is spam in your topic', archetype_id: 1)).to eq(nil)
           end
 
           it 'should hide the posts' do
-            expect(spammer.reload).to be_blocked
+            expect(spammer.reload).to be_silenced
             expect(spam_post.reload).to be_hidden
             expect(spam_post2.reload).to be_hidden
             expect(spammer.reload.private_topics_count).to eq(private_messages_count + 1)
@@ -63,35 +63,35 @@ describe SpamRulesEnforcer do
 
           # The following cases describe when a staff user takes some action, but the user
           # still won't be able to make posts.
-          # A staff user needs to clear the blocked flag from the user record.
+          # A staff user needs to clear the silenced flag from the user record.
 
           context "a post's flags are cleared" do
-            it 'should block the spammer' do
+            it 'should silence the spammer' do
               PostAction.clear_flags!(spam_post, admin); spammer.reload
-              expect(spammer.reload).to be_blocked
+              expect(spammer.reload).to be_silenced
             end
           end
 
           context "a post is deleted" do
-            it 'should block the spammer' do
+            it 'should silence the spammer' do
               spam_post.trash!(moderator); spammer.reload
-              expect(spammer.reload).to be_blocked
+              expect(spammer.reload).to be_silenced
             end
           end
 
           context "spammer becomes trust level 1" do
-            it 'should block the spammer' do
+            it 'should silence the spammer' do
               spammer.change_trust_level!(TrustLevel[1]); spammer.reload
-              expect(spammer.reload).to be_blocked
+              expect(spammer.reload).to be_silenced
             end
           end
         end
 
         context 'flags_required_to_hide_post takes effect too' do
-          it 'should block the spammer' do
+          it 'should silence the spammer' do
             SiteSetting.flags_required_to_hide_post = 2
             PostAction.act(user2, spam_post, PostActionType.types[:spam])
-            expect(spammer.reload).to be_blocked
+            expect(spammer.reload).to be_silenced
             expect(Guardian.new(spammer).can_create_topic?(nil)).to be false
           end
         end
@@ -111,7 +111,7 @@ describe SpamRulesEnforcer do
 
           expect(spam_post.reload).to_not be_hidden
           expect(Guardian.new(spammer).can_create_topic?(nil)).to be(true)
-          expect{PostCreator.create(spammer, {title: 'limited time offer for you', raw: 'better buy this stuff ok', archetype_id: 1})}.to_not raise_error
+          expect { PostCreator.create(spammer, title: 'limited time offer for you', raw: 'better buy this stuff ok', archetype_id: 1) }.to_not raise_error
           expect(spammer.reload.private_topics_count).to eq(private_messages_count)
         end
       end
diff --git a/spec/integration/tags_spec.rb b/spec/integration/tags_spec.rb
deleted file mode 100644
index 61f0bf6b3d..0000000000
--- a/spec/integration/tags_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'rails_helper'
-
-describe "Tags" do
-  before do
-    SiteSetting.tagging_enabled = true
-  end
-
-  describe "checking tag hashtags" do
-    let(:tag) { Fabricate(:tag, name: 'test') }
-
-    it "should return the right response" do
-      get "/tags/check.json", { tag_values: [tag.name] }
-
-      expect(response).to be_success
-
-      tag = JSON.parse(response.body)["valid"].first
-      expect(tag["value"]).to eq('test')
-    end
-  end
-end
diff --git a/spec/integration/topic_auto_close_spec.rb b/spec/integration/topic_auto_close_spec.rb
index 75d2e07c2c..7dd24eef55 100644
--- a/spec/integration/topic_auto_close_spec.rb
+++ b/spec/integration/topic_auto_close_spec.rb
@@ -5,10 +5,6 @@ require 'rails_helper'
 describe Topic do
   let(:job_klass) { Jobs::ToggleTopicClosed }
 
-  before do
-    job_klass.jobs.clear
-  end
-
   context 'creating a topic without auto-close' do
     let(:topic) { Fabricate(:topic, category: category) }
 
@@ -33,11 +29,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 +70,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/integration/users_spec.rb b/spec/integration/users_spec.rb
deleted file mode 100644
index 46ea6bf661..0000000000
--- a/spec/integration/users_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe "Users" do
-  let(:user) { Fabricate(:user) }
-
-  describe "viewing a user" do
-
-    it "should be able to view a user" do
-      get "/u/#{user.username}"
-
-      expect(response).to be_success
-      expect(response.body).to include(user.username)
-    end
-
-    describe 'when username contains a period' do
-      before do
-        user.update!(username: 'test.test')
-      end
-
-      it "should be able to view a user" do
-        get "/u/#{user.username}"
-
-        expect(response).to be_success
-        expect(response.body).to include(user.username)
-      end
-    end
-  end
-
-  describe "updating a user" do
-    before do
-      sign_in(user)
-    end
-
-    it "should be able to update a user" do
-      put "/u/#{user.username}.json", { name: 'test.test' }
-
-      expect(response).to be_success
-      expect(user.reload.name).to eq('test.test')
-    end
-
-    describe 'when username contains a period' do
-      before do
-        user.update!(username: 'test.test')
-      end
-
-      it "should be able to update a user" do
-        put "/u/#{user.username}.json", { name: 'testing123' }
-
-        expect(response).to be_success
-        expect(user.reload.name).to eq('testing123')
-      end
-    end
-  end
-end
diff --git a/spec/integration/watched_words_spec.rb b/spec/integration/watched_words_spec.rb
new file mode 100644
index 0000000000..03034e9b44
--- /dev/null
+++ b/spec/integration/watched_words_spec.rb
@@ -0,0 +1,181 @@
+require 'rails_helper'
+
+describe WatchedWord do
+  let(:tl2_user) { Fabricate(:user, trust_level: TrustLevel[2]) }
+  let(:admin) { Fabricate(:admin) }
+  let(:moderator) { Fabricate(:moderator) }
+
+  let(:topic) { Fabricate(:topic) }
+  let(:first_post) { Fabricate(:post, topic: topic) }
+
+  let(:require_approval_word) { Fabricate(:watched_word, action: WatchedWord.actions[:require_approval]) }
+  let(:flag_word) { Fabricate(:watched_word, action: WatchedWord.actions[:flag]) }
+  let(:block_word) { Fabricate(:watched_word, action: WatchedWord.actions[:block]) }
+
+  after do
+    $redis.flushall
+  end
+
+  context "block" do
+    def should_block_post(manager)
+      expect {
+        result = manager.perform
+        expect(result).to_not be_success
+        expect(result.errors[:base]&.first).to eq(I18n.t('contains_blocked_words'))
+      }.to_not change { Post.count }
+    end
+
+    it "should prevent the post from being created" do
+      manager = NewPostManager.new(tl2_user, raw: "Want some #{block_word.word} for cheap?", topic_id: topic.id)
+      should_block_post(manager)
+    end
+
+    it "look at title too" do
+      manager = NewPostManager.new(tl2_user, title: "We sell #{block_word.word} online", raw: "Want some poutine for cheap?", topic_id: topic.id)
+      should_block_post(manager)
+    end
+
+    it "should not block the post from admin" do
+      manager = NewPostManager.new(admin, raw: "Want some #{block_word.word} for cheap?", topic_id: topic.id)
+      result = manager.perform
+      expect(result).to be_success
+      expect(result.action).to eq(:create_post)
+    end
+
+    it "should not block the post from moderator" do
+      manager = NewPostManager.new(moderator, raw: "Want some #{block_word.word} for cheap?", topic_id: topic.id)
+      result = manager.perform
+      expect(result).to be_success
+      expect(result.action).to eq(:create_post)
+    end
+
+    it "should block in a private message too" do
+      manager = NewPostManager.new(
+        tl2_user,
+        raw: "Want some #{block_word.word} for cheap?",
+        title: 'this is a new title',
+        archetype: Archetype.private_message,
+        target_usernames: Fabricate(:user, trust_level: TrustLevel[2]).username
+      )
+      should_block_post(manager)
+    end
+
+    it "blocks on revisions" do
+      post = Fabricate(:post, topic: Fabricate(:topic, user: tl2_user), user: tl2_user)
+      expect {
+        PostRevisor.new(post).revise!(post.user, { raw: "Want some #{block_word.word} for cheap?" }, revised_at: post.updated_at + 10.seconds)
+        expect(post.errors).to be_present
+        post.reload
+      }.to_not change { post.raw }
+    end
+  end
+
+  context "require_approval" do
+    it "should queue the post for approval" do
+      manager = NewPostManager.new(tl2_user, raw: "My dog's name is #{require_approval_word.word}.", topic_id: topic.id)
+      result = manager.perform
+      expect(result.action).to eq(:enqueued)
+    end
+
+    it "looks at title too" do
+      manager = NewPostManager.new(tl2_user, title: "You won't believe these #{require_approval_word.word} dog names!", raw: "My dog's name is Porkins.", topic_id: topic.id)
+      result = manager.perform
+      expect(result.action).to eq(:enqueued)
+    end
+
+    it "should not queue posts from admin" do
+      manager = NewPostManager.new(admin, raw: "My dog's name is #{require_approval_word.word}.", topic_id: topic.id)
+      result = manager.perform
+      expect(result).to be_success
+      expect(result.action).to eq(:create_post)
+    end
+
+    it "should not queue posts from moderator" do
+      manager = NewPostManager.new(moderator, raw: "My dog's name is #{require_approval_word.word}.", topic_id: topic.id)
+      result = manager.perform
+      expect(result).to be_success
+      expect(result.action).to eq(:create_post)
+    end
+
+    it "doesn't need approval in a private message" do
+      manager = NewPostManager.new(
+        tl2_user,
+        raw: "Want some #{require_approval_word.word} for cheap?",
+        title: 'this is a new title',
+        archetype: Archetype.private_message,
+        target_usernames: Fabricate(:user, trust_level: TrustLevel[2]).username
+      )
+      result = manager.perform
+      expect(result).to be_success
+      expect(result.action).to eq(:create_post)
+    end
+  end
+
+  context "flag" do
+    def should_flag_post(author, raw, topic)
+      post = Fabricate(:post, raw: raw, topic: topic, user: author)
+      expect {
+        Jobs::ProcessPost.new.execute(post_id: post.id)
+      }.to change { PostAction.count }.by(1)
+      expect(PostAction.where(post_id: post.id, post_action_type_id: PostActionType.types[:inappropriate]).exists?).to eq(true)
+    end
+
+    def should_not_flag_post(author, raw, topic)
+      post = Fabricate(:post, raw: raw, topic: topic, user: author)
+      expect {
+        Jobs::ProcessPost.new.execute(post_id: post.id)
+      }.to_not change { PostAction.count }
+    end
+
+    it "should flag the post as inappropriate" do
+      should_flag_post(tl2_user, "I thought the #{flag_word.word} was bad.", Fabricate(:topic, user: tl2_user))
+    end
+
+    it "should look at the title too" do
+      should_flag_post(tl2_user, "I thought the movie was not bad actually.", Fabricate(:topic, user: tl2_user, title: "Read my #{flag_word.word} review!"))
+    end
+
+    it "shouldn't flag posts by admin" do
+      should_not_flag_post(admin, "I thought the #{flag_word.word} was bad.", Fabricate(:topic, user: admin))
+    end
+
+    it "shouldn't flag posts by moderator" do
+      should_not_flag_post(moderator, "I thought the #{flag_word.word} was bad.", Fabricate(:topic, user: moderator))
+    end
+
+    it "is compatible with flag_sockpuppets" do
+      # e.g., handle PostAction::AlreadyActed
+      SiteSetting.flag_sockpuppets = true
+      ip_address = '182.189.119.174'
+      user1 = Fabricate(:user, ip_address: ip_address, created_at: 2.days.ago)
+      user2 = Fabricate(:user, ip_address: ip_address)
+      first = create_post(user: user1, created_at: 2.days.ago)
+      sockpuppet_post = create_post(user: user2, topic: first.topic, raw: "I thought the #{flag_word.word} was bad.")
+      expect(PostAction.where(post_id: sockpuppet_post.id).count).to eq(1)
+    end
+
+    it "flags in private message too" do
+      post = Fabricate(:private_message_post, raw: "Want some #{flag_word.word} for cheap?", user: tl2_user)
+      expect {
+        Jobs::ProcessPost.new.execute(post_id: post.id)
+      }.to change { PostAction.count }.by(1)
+      expect(PostAction.where(post_id: post.id, post_action_type_id: PostActionType.types[:inappropriate]).exists?).to eq(true)
+    end
+
+    it "flags on revisions" do
+      post = Fabricate(:post, topic: Fabricate(:topic, user: tl2_user), user: tl2_user)
+      expect {
+        PostRevisor.new(post).revise!(post.user, { raw: "Want some #{flag_word.word} for cheap?" }, revised_at: post.updated_at + 10.seconds)
+      }.to change { PostAction.count }.by(1)
+      expect(PostAction.where(post_id: post.id, post_action_type_id: PostActionType.types[:inappropriate]).exists?).to eq(true)
+    end
+
+    it "should not flag on rebake" do
+      post = Fabricate(:post, topic: Fabricate(:topic, user: tl2_user), user: tl2_user, raw: "I have coupon codes. Message me.")
+      Fabricate(:watched_word, action: WatchedWord.actions[:flag], word: "coupon")
+      expect {
+        post.rebake!
+      }.to_not change { PostAction.count }
+    end
+  end
+end
diff --git a/spec/integrity/common_mark_spec.rb b/spec/integrity/common_mark_spec.rb
new file mode 100644
index 0000000000..063e6ddff9
--- /dev/null
+++ b/spec/integrity/common_mark_spec.rb
@@ -0,0 +1,73 @@
+# 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 9dac7ebf68..b564c27d01 100644
--- a/spec/integrity/i18n_spec.rb
+++ b/spec/integrity/i18n_spec.rb
@@ -36,7 +36,6 @@ def is_yaml_compatible?(english, translated)
   true
 end
 
-
 describe "i18n integrity checks" do
 
   it 'has an i18n key for each Trust Levels' do
@@ -59,6 +58,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/integrity/site_setting_spec.rb b/spec/integrity/site_setting_spec.rb
new file mode 100644
index 0000000000..9c52e9fab6
--- /dev/null
+++ b/spec/integrity/site_setting_spec.rb
@@ -0,0 +1,42 @@
+require "rails_helper"
+require "i18n/duplicate_key_finder"
+
+describe "site setting integrity checks" do
+  let(:site_setting_file) { File.join(Rails.root, 'config', 'site_settings.yml') }
+  let(:yaml) { YAML.load_file(site_setting_file) }
+
+  %w(hidden client).each do |property|
+    it "set #{property} value as true or not set" do
+      yaml.each_value do |category|
+        category.each_value do |setting|
+          next unless setting.is_a?(Hash)
+          expect(setting[property] == nil || setting[property] == true).to be_truthy
+        end
+      end
+    end
+  end
+
+  it "has no duplicate keys" do
+    duplicates = DuplicateKeyFinder.new.find_duplicates(site_setting_file)
+    expect(duplicates).to be_empty
+  end
+
+  it "no locale default has different type than default or invalid key" do
+    yaml.each_value do |category|
+      category.each_value do |setting|
+        next unless setting.is_a?(Hash)
+        if setting['locale_default']
+          setting['locale_default'].each_pair do |k, v|
+            expect(LocaleSiteSetting.valid_value?(k.to_s)).to be_truthy
+            case setting['default']
+            when TrueClass, FalseClass
+              expect(v.class == TrueClass || v.class == FalseClass).to be_truthy
+            else
+              expect(v).to be_a_kind_of(setting['default'].class)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/jobs/auto_queue_handler_spec.rb b/spec/jobs/auto_queue_handler_spec.rb
new file mode 100644
index 0000000000..89b84a2f5f
--- /dev/null
+++ b/spec/jobs/auto_queue_handler_spec.rb
@@ -0,0 +1,45 @@
+require 'rails_helper'
+
+describe Jobs::AutoQueueHandler do
+
+  subject { Jobs::AutoQueueHandler.new.execute({}) }
+
+  context "old flag" do
+    let!(:old) { Fabricate(:flag, created_at: 61.days.ago) }
+    let!(:not_old) { Fabricate(:flag, created_at: 59.days.ago) }
+
+    it "defers the old flag if auto_handle_queued_age is 60" do
+      SiteSetting.auto_handle_queued_age = 60
+      subject
+      expect(not_old.reload.deferred_at).to be_nil
+      expect(old.reload.deferred_at).to_not be_nil
+    end
+
+    it "doesn't defer the old flag if auto_handle_queued_age is 0" do
+      SiteSetting.auto_handle_queued_age = 0
+      subject
+      expect(not_old.reload.deferred_at).to be_nil
+      expect(old.reload.deferred_at).to be_nil
+    end
+  end
+
+  context "old queued post" do
+    let!(:old) { Fabricate(:queued_post, created_at: 61.days.ago, queue: 'default') }
+    let!(:not_old) { Fabricate(:queued_post, created_at: 59.days.ago, queue: 'default') }
+
+    it "rejects the post when auto_handle_queued_age is 60" do
+      SiteSetting.auto_handle_queued_age = 60
+      subject
+      expect(not_old.reload.state).to eq(QueuedPost.states[:new])
+      expect(old.reload.state).to eq(QueuedPost.states[:rejected])
+    end
+
+    it "doesn't reject the post when auto_handle_queued_age is 0" do
+      SiteSetting.auto_handle_queued_age = 0
+      subject
+      expect(not_old.reload.state).to eq(QueuedPost.states[:new])
+      expect(old.reload.state).to eq(QueuedPost.states[:new])
+    end
+  end
+
+end
diff --git a/spec/jobs/automatic_group_membership_spec.rb b/spec/jobs/automatic_group_membership_spec.rb
index 5989deb489..55776b99e4 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/bulk_grant_trust_level_spec.rb b/spec/jobs/bulk_grant_trust_level_spec.rb
index 0c8112d386..5db643b199 100644
--- a/spec/jobs/bulk_grant_trust_level_spec.rb
+++ b/spec/jobs/bulk_grant_trust_level_spec.rb
@@ -4,7 +4,7 @@ require_dependency 'jobs/regular/bulk_grant_trust_level'
 describe Jobs::BulkGrantTrustLevel do
 
   it "raises an error when trust_level is missing" do
-    expect { Jobs::BulkGrantTrustLevel.new.execute(user_ids: [1,2]) }.to raise_error(Discourse::InvalidParameters)
+    expect { Jobs::BulkGrantTrustLevel.new.execute(user_ids: [1, 2]) }.to raise_error(Discourse::InvalidParameters)
   end
 
   it "raises an error when user_ids are missing" do
@@ -15,7 +15,7 @@ describe Jobs::BulkGrantTrustLevel do
     user1 = Fabricate(:user, email: "foo@wat.com", trust_level: 0)
     user2 = Fabricate(:user, email: "foo@bar.com", trust_level: 2)
 
-    Jobs::BulkGrantTrustLevel.new.execute(trust_level: 3, user_ids: [user1.id,user2.id])
+    Jobs::BulkGrantTrustLevel.new.execute(trust_level: 3, user_ids: [user1.id, user2.id])
 
     user1.reload
     user2.reload
diff --git a/spec/jobs/clean_up_digest_keys.rb b/spec/jobs/clean_up_digest_keys.rb
index d3cbcff40e..d148836a71 100644
--- a/spec/jobs/clean_up_digest_keys.rb
+++ b/spec/jobs/clean_up_digest_keys.rb
@@ -10,4 +10,3 @@ module Jobs
   end
 
 end
-
diff --git a/spec/jobs/clean_up_unused_staged_users.rb b/spec/jobs/clean_up_unused_staged_users_spec.rb
similarity index 100%
rename from spec/jobs/clean_up_unused_staged_users.rb
rename to spec/jobs/clean_up_unused_staged_users_spec.rb
diff --git a/spec/jobs/clean_up_uploads_spec.rb b/spec/jobs/clean_up_uploads_spec.rb
index e9f649cbe1..73b778d014 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)
@@ -115,12 +127,13 @@ describe Jobs::CleanUpUploads do
 
   it "does not delete uploads in a queued post" do
     upload = fabricate_upload
+    upload2 = fabricate_upload
 
     QueuedPost.create(
       queue: "uploads",
       state: QueuedPost.states[:new],
       user_id: Fabricate(:user).id,
-      raw: upload.sha1,
+      raw: "#{upload.sha1}\n#{upload2.short_url}",
       post_options: {}
     )
 
@@ -128,16 +141,20 @@ describe Jobs::CleanUpUploads do
 
     expect(Upload.find_by(id: @upload.id)).to eq(nil)
     expect(Upload.find_by(id: upload.id)).to eq(upload)
+    expect(Upload.find_by(id: upload2.id)).to eq(upload2)
   end
 
   it "does not delete uploads in a draft" do
     upload = fabricate_upload
-    Draft.set(Fabricate(:user), "test", 0, upload.sha1)
+    upload2 = fabricate_upload
+
+    Draft.set(Fabricate(:user), "test", 0, "#{upload.sha1}\n#{upload2.short_url}")
 
     Jobs::CleanUpUploads.new.execute(nil)
 
     expect(Upload.find_by(id: @upload.id)).to eq(nil)
     expect(Upload.find_by(id: upload.id)).to eq(upload)
+    expect(Upload.find_by(id: upload2.id)).to eq(upload2)
   end
 
   it "does not delete custom emojis" do
diff --git a/spec/jobs/dashboard_stats_spec.rb b/spec/jobs/dashboard_stats_spec.rb
index 1a325f62ee..9a339c53a8 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 11a49d7a29..03ca8a53ef 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/download_avatar_from_url_spec.rb b/spec/jobs/download_avatar_from_url_spec.rb
new file mode 100644
index 0000000000..6758a647a0
--- /dev/null
+++ b/spec/jobs/download_avatar_from_url_spec.rb
@@ -0,0 +1,16 @@
+require 'rails_helper'
+
+RSpec.describe Jobs::DownloadAvatarFromUrl do
+  let(:user) { Fabricate(:user) }
+
+  describe 'when url is invalid' do
+    it 'should not raise any error' do
+      expect do
+        described_class.new.execute(
+          url: '/assets/something/nice.jpg',
+          user_id: user.id
+        )
+      end.to_not raise_error
+    end
+  end
+end
diff --git a/spec/jobs/emit_web_hook_event_spec.rb b/spec/jobs/emit_web_hook_event_spec.rb
index 3750fff8de..fbc1cf13ec 100644
--- a/spec/jobs/emit_web_hook_event_spec.rb
+++ b/spec/jobs/emit_web_hook_event_spec.rb
@@ -80,7 +80,7 @@ describe Jobs::EmitWebHookEvent do
       expect(headers['X-Discourse-Event-Type']).to eq('ping')
       expect(headers['X-Discourse-Event']).to eq('ping')
       expect(headers['X-Discourse-Event-Signature']).to eq('sha256=162f107f6b5022353274eb1a7197885cfd35744d8d08e5bcea025d309386b7d6')
-      expect(event.payload).to eq(MultiJson.dump({ping: 'OK'}))
+      expect(event.payload).to eq(MultiJson.dump(ping: 'OK'))
       expect(event.status).to eq(200)
       expect(MultiJson.load(event.response_headers)['Test']).to eq('string')
       expect(event.response_body).to eq('OK')
diff --git a/spec/jobs/enqueue_digest_emails_spec.rb b/spec/jobs/enqueue_digest_emails_spec.rb
index acb3f16403..c729c99138 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)
 
@@ -38,7 +33,7 @@ describe Jobs::EnqueueDigestEmails do
         expect(Jobs::EnqueueDigestEmails.new.target_user_ids.include?(unapproved_user.id)).to eq(true)
 
         # As an approved user
-        unapproved_user.update_attributes(admin: false, moderator: false, approved: true )
+        unapproved_user.update_attributes(admin: false, moderator: false, approved: true)
         expect(Jobs::EnqueueDigestEmails.new.target_user_ids.include?(unapproved_user.id)).to eq(true)
       end
     end
@@ -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
@@ -154,5 +149,4 @@ describe Jobs::EnqueueDigestEmails do
 
   end
 
-
 end
diff --git a/spec/jobs/export_csv_file_spec.rb b/spec/jobs/export_csv_file_spec.rb
index de188be272..c9c5e96bd6 100644
--- a/spec/jobs/export_csv_file_spec.rb
+++ b/spec/jobs/export_csv_file_spec.rb
@@ -8,25 +8,31 @@ describe Jobs::ExportCsvFile do
     end
   end
 
-  let :user_list_header do
-    ['id','name','username','email','title','created_at','last_seen_at','last_posted_at','last_emailed_at','trust_level','approved','suspended_at','suspended_till','blocked','active','admin','moderator','ip_address','topics_entered','posts_read_count','time_read','topic_count','post_count','likes_given','likes_received','location','website','views','external_id','external_email', 'external_username', 'external_name', 'external_avatar_url']
-  end
+  let(:user_list_header) {
+    %w{
+      id name username email title created_at last_seen_at last_posted_at
+      last_emailed_at trust_level approved suspended_at suspended_till blocked
+      active admin moderator ip_address staged topics_entered posts_read_count
+      time_read topic_count post_count likes_given likes_received location
+      website views external_id external_email external_username external_name
+      external_avatar_url
+    }
+  }
 
-  let :user_list_export do
-    Jobs::ExportCsvFile.new.user_list_export
-  end
+  let(:user_list_export) { Jobs::ExportCsvFile.new.user_list_export }
 
   def to_hash(row)
     Hash[*user_list_header.zip(row).flatten]
   end
 
   it 'exports sso data' do
+    SiteSetting.sso_url = "https://www.example.com/sso"
     SiteSetting.enable_sso = true
     user = Fabricate(:user)
     user.user_profile.update_column(:location, "La La Land")
     user.create_single_sign_on_record(external_id: "123", last_payload: "xxx", external_email: 'test@test.com')
 
-    user = to_hash(user_list_export.find{|u| u[0].to_i == user.id})
+    user = to_hash(user_list_export.find { |u| u[0].to_i == user.id })
 
     expect(user["location"]).to eq("La La Land")
     expect(user["external_id"]).to eq("123")
diff --git a/spec/jobs/feature_topic_users_spec.rb b/spec/jobs/feature_topic_users_spec.rb
index b651e85668..5d34ff74c9 100644
--- a/spec/jobs/feature_topic_users_spec.rb
+++ b/spec/jobs/feature_topic_users_spec.rb
@@ -17,8 +17,8 @@ describe Jobs::FeatureTopicUsers do
     let(:topic) { post.topic }
     let!(:coding_horror) { Fabricate(:coding_horror) }
     let!(:evil_trout) { Fabricate(:evil_trout) }
-    let!(:second_post) { create_post(topic: topic, user: coding_horror)}
-    let!(:third_post) { create_post(topic: topic, user: evil_trout)}
+    let!(:second_post) { create_post(topic: topic, user: coding_horror) }
+    let!(:third_post) { create_post(topic: topic, user: evil_trout) }
 
     it "won't feature the OP" do
       Jobs::FeatureTopicUsers.new.execute(topic_id: topic.id)
@@ -42,7 +42,6 @@ describe Jobs::FeatureTopicUsers do
     let!(:post) { create_post }
     let(:topic) { post.topic }
 
-
     it "it works as expected" do
 
       # It has 1 participant after creation
diff --git a/spec/jobs/fix_primary_emails_for_staged_users_spec.rb b/spec/jobs/fix_primary_emails_for_staged_users_spec.rb
new file mode 100644
index 0000000000..8dacac1f76
--- /dev/null
+++ b/spec/jobs/fix_primary_emails_for_staged_users_spec.rb
@@ -0,0 +1,31 @@
+require 'rails_helper'
+
+RSpec.describe Jobs::FixPrimaryEmailsForStagedUsers do
+  it 'should clean up duplicated staged users' do
+    common_email = 'test@reply'
+
+    staged_user = Fabricate(:user, staged: true, active: false)
+    staged_user2 = Fabricate(:user, staged: true, active: false)
+    staged_user3 = Fabricate(:user, staged: true, active: false)
+
+    post1 = Fabricate(:post, user: staged_user2)
+    post2 = Fabricate(:post, user: staged_user2)
+    post3 = Fabricate(:post, user: staged_user3)
+
+    [staged_user, staged_user2, staged_user3].each do |user|
+      user.email_tokens = [Fabricate.create(:email_token, email: common_email, user: user)]
+    end
+
+    active_user = Fabricate(:coding_horror)
+
+    UserEmail.delete_all
+
+    expect { described_class.new.execute_onceoff({}) }
+      .to change { User.count }.by(-2)
+      .and change { staged_user.posts.count }.by(3)
+
+    expect(User.where('id > -2')).to contain_exactly(Discourse.system_user, staged_user, active_user)
+    expect(staged_user.posts.all).to contain_exactly(post1, post2, post3)
+    expect(staged_user.reload.email).to eq(common_email)
+  end
+end
diff --git a/spec/jobs/grant_anniversary_badges_spec.rb b/spec/jobs/grant_anniversary_badges_spec.rb
index a391b8c2f1..a73a4b719d 100644
--- a/spec/jobs/grant_anniversary_badges_spec.rb
+++ b/spec/jobs/grant_anniversary_badges_spec.rb
@@ -23,8 +23,8 @@ describe Jobs::GrantAnniversaryBadges do
     expect(badge).to be_blank
   end
 
-  it "doesn't award to a blocked user" do
-    user = Fabricate(:user, created_at: 400.days.ago, blocked: true)
+  it "doesn't award to a silenced user" do
+    user = Fabricate(:user, created_at: 400.days.ago, silenced_till: 1.year.from_now)
     Fabricate(:post, user: user, created_at: 1.week.ago)
     granter.execute({})
 
@@ -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)
 
@@ -133,5 +134,4 @@ describe Jobs::GrantAnniversaryBadges do
     end
   end
 
-
 end
diff --git a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb
index 7eef9cf1db..fd77fbf7d5 100644
--- a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb
+++ b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb
@@ -62,7 +62,6 @@ describe Jobs::GrantNewUserOfTheMonthBadges do
     expect(badge).to be_blank
   end
 
-
   it "does nothing if it's been awarded recently" do
     u0 = Fabricate(:user, created_at: 2.weeks.ago)
     BadgeGranter.grant(Badge.find(Badge::NewUserOfTheMonth), u0)
@@ -107,6 +106,19 @@ describe Jobs::GrantNewUserOfTheMonthBadges do
       expect(granter.scores.keys).not_to include(user.id)
     end
 
+    it "doesn't count private topics" do
+      user = Fabricate(:user, created_at: 1.week.ago)
+      topic = Fabricate(:private_message_topic)
+      Fabricate(:post, topic: topic, user: user)
+      p = Fabricate(:post, user: user)
+      old_user = Fabricate(:user, created_at: 6.months.ago)
+      PostAction.act(old_user, p, PostActionType.types[:like])
+      old_user = Fabricate(:user, created_at: 6.months.ago)
+      PostAction.act(old_user, p, PostActionType.types[:like])
+
+      expect(granter.scores.keys).not_to include(user.id)
+    end
+
     it "requires at least two likes to be considered" do
       user = Fabricate(:user, created_at: 1.week.ago)
       Fabricate(:post, user: user)
diff --git a/spec/jobs/invite_email_spec.rb b/spec/jobs/invite_email_spec.rb
index ed3e2d0969..184fd60b46 100644
--- a/spec/jobs/invite_email_spec.rb
+++ b/spec/jobs/invite_email_spec.rb
@@ -24,5 +24,4 @@ describe Jobs::InviteEmail do
 
   end
 
-
 end
diff --git a/spec/jobs/jobs_base_spec.rb b/spec/jobs/jobs_base_spec.rb
index 4388dc4886..b1ec54c5a8 100644
--- a/spec/jobs/jobs_base_spec.rb
+++ b/spec/jobs/jobs_base_spec.rb
@@ -27,12 +27,12 @@ describe Jobs::Base do
   end
 
   it 'handles errors in multisite' do
-    RailsMultisite::ConnectionManagement.expects(:all_dbs).returns(['default','default','default'])
+    RailsMultisite::ConnectionManagement.expects(:all_dbs).returns(['default', 'default', 'default'])
     # one exception per database
     Discourse.expects(:handle_job_exception).times(3)
 
     bad = BadJob.new
-    expect{bad.perform({})}.to raise_error(Jobs::HandledExceptionWrapper)
+    expect { bad.perform({}) }.to raise_error(Jobs::HandledExceptionWrapper)
     expect(bad.fail_count).to eq(3)
   end
 
@@ -47,4 +47,3 @@ describe Jobs::Base do
   end
 
 end
-
diff --git a/spec/jobs/jobs_spec.rb b/spec/jobs/jobs_spec.rb
index a5e6203ac3..7ec26fd604 100644
--- a/spec/jobs/jobs_spec.rb
+++ b/spec/jobs/jobs_spec.rb
@@ -82,7 +82,6 @@ describe Jobs do
 
       Sidekiq::Testing.disable! do
         scheduled_jobs = Sidekiq::ScheduledSet.new
-        scheduled_jobs.clear
 
         expect(scheduled_jobs.size).to eq(0)
 
@@ -107,17 +106,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 1749b1df15..57692656e9 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
@@ -31,6 +38,14 @@ describe Jobs::NotifyMailingListSubscribers do
   context "when mailing list mode is globally enabled" do
     before { SiteSetting.disable_mailing_list_mode = false }
 
+    context "when site requires approval and user is not approved" do
+      before do
+        SiteSetting.login_required = true
+        SiteSetting.must_approve_users = true
+      end
+      include_examples "no emails"
+    end
+
     context "with an invalid post_id" do
       before { post.update(deleted_at: Time.now) }
       include_examples "no emails"
@@ -58,8 +73,8 @@ describe Jobs::NotifyMailingListSubscribers do
         include_examples "no emails"
       end
 
-      context "to a blocked user" do
-        before { mailing_list_user.update(blocked: true) }
+      context "to a silenced user" do
+        before { mailing_list_user.update(silenced_till: 1.year.from_now) }
         include_examples "no emails"
       end
 
diff --git a/spec/jobs/notify_moved_posts_spec.rb b/spec/jobs/notify_moved_posts_spec.rb
index 29ab275eec..19474e998d 100644
--- a/spec/jobs/notify_moved_posts_spec.rb
+++ b/spec/jobs/notify_moved_posts_spec.rb
@@ -9,10 +9,9 @@ describe Jobs::NotifyMovedPosts do
   end
 
   it "raises an error without moved_by_id" do
-    expect { Jobs::NotifyMovedPosts.new.execute(post_ids: [1,2,3]) }.to raise_error(Discourse::InvalidParameters)
+    expect { Jobs::NotifyMovedPosts.new.execute(post_ids: [1, 2, 3]) }.to raise_error(Discourse::InvalidParameters)
   end
 
-
   context 'with post ids' do
     let!(:p1) { Fabricate(:post) }
     let!(:p2) { Fabricate(:post, user: Fabricate(:evil_trout), topic: p1.topic) }
@@ -33,5 +32,4 @@ describe Jobs::NotifyMovedPosts do
 
   end
 
-
 end
diff --git a/spec/jobs/pending_flags_reminder_spec.rb b/spec/jobs/pending_flags_reminder_spec.rb
index 25f6eb673b..a99852b02f 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 fe5a1c7956..3db6b6357e 100644
--- a/spec/jobs/pending_queued_posts_reminder_spec.rb
+++ b/spec/jobs/pending_queued_posts_reminder_spec.rb
@@ -2,12 +2,13 @@ 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
-      Email::Sender.any_instance.expects(:send).never
-      described_class.new.execute({})
+      expect {
+        described_class.new.execute({})
+      }.to_not change { Post.count }
     end
   end
 
@@ -16,25 +17,32 @@ describe Jobs::PendingQueuedPostReminder do
       SiteSetting.notify_about_queued_posts_after = 24
     end
 
-    it "doesn't email if there are no queued posts" do
+    it "doesn't create system message if there are no queued posts" do
       described_class.any_instance.stubs(:should_notify_ids).returns([])
       described_class.any_instance.stubs(:last_notified_id).returns(nil)
-      Email::Sender.any_instance.expects(:send).never
-      described_class.new.execute({})
+      expect {
+        described_class.new.execute({})
+      }.to_not change { Post.count }
     end
 
-    it "emails if there are new queued posts" do
-      described_class.any_instance.stubs(:should_notify_ids).returns([1,2])
+    it "creates system message if there are new queued posts" do
+      described_class.any_instance.stubs(:should_notify_ids).returns([1, 2])
       described_class.any_instance.stubs(:last_notified_id).returns(nil)
-      Email::Sender.any_instance.expects(:send).once
-      described_class.new.execute({})
+      expect {
+        described_class.new.execute({})
+      }.to change { Post.count }.by(1)
+      expect(Topic.where(
+        subtype: TopicSubtype.system_message,
+        title: I18n.t('system_messages.queued_posts_reminder.subject_template', count: 2)
+      ).exists?).to eq(true)
     end
 
-    it "doesn't email again about the same posts" do
+    it "doesn't create system message again about the same posts" do
       described_class.any_instance.stubs(:should_notify_ids).returns([2])
       described_class.any_instance.stubs(:last_notified_id).returns(2)
-      Email::Sender.any_instance.expects(:send).never
-      described_class.new.execute({})
+      expect {
+        described_class.new.execute({})
+      }.to_not change { Post.count }
     end
   end
 end
diff --git a/spec/jobs/pending_users_reminder_spec.rb b/spec/jobs/pending_users_reminder_spec.rb
index c844184522..ce118df93c 100644
--- a/spec/jobs/pending_users_reminder_spec.rb
+++ b/spec/jobs/pending_users_reminder_spec.rb
@@ -38,12 +38,19 @@ describe Jobs::PendingUsersReminder do
         PostCreator.expects(:create).never
         Jobs::PendingUsersReminder.new.execute({})
       end
+
+      it "sets the correct pending user count in the notification" do
+        SiteSetting.pending_users_reminder_delay = 8
+        Fabricate(:user, created_at: 9.hours.ago)
+        PostCreator.expects(:create).with(Discourse.system_user, has_entries(title: '1 user waiting for approval'))
+        Jobs::PendingUsersReminder.new.execute({})
+      end
     end
   end
 
   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/periodical_updates_spec.rb b/spec/jobs/periodical_updates_spec.rb
index 01071f290f..7c4e79cce8 100644
--- a/spec/jobs/periodical_updates_spec.rb
+++ b/spec/jobs/periodical_updates_spec.rb
@@ -3,12 +3,10 @@ require_dependency 'jobs/scheduled/periodical_updates'
 
 describe Jobs::PeriodicalUpdates do
 
-
   it "works" do
 
     # does not blow up, no mocks, everything is called
     Jobs::PeriodicalUpdates.new.execute(nil)
   end
 
-
 end
diff --git a/spec/jobs/poll_feed_spec.rb b/spec/jobs/poll_feed_spec.rb
index 0fcfa7d02c..5ba0383068 100644
--- a/spec/jobs/poll_feed_spec.rb
+++ b/spec/jobs/poll_feed_spec.rb
@@ -40,7 +40,91 @@ describe Jobs::PollFeed do
       poller.execute({})
       poller.execute({})
     end
-
   end
 
+  describe '#poll_feed' do
+    let(:embed_by_username) { 'eviltrout' }
+    let(:embed_username_key_from_feed) { 'discourse:username' }
+    let!(:default_user) { Fabricate(:evil_trout) }
+    let!(:feed_author) { Fabricate(:user, username: 'xrav3nz', email: 'hi@bye.com') }
+
+    shared_examples 'topic creation based on the the feed' do
+      describe 'author username parsing' do
+        context 'when neither embed_by_username nor embed_username_key_from_feed is set' do
+          before do
+            SiteSetting.embed_by_username = ""
+            SiteSetting.embed_username_key_from_feed = ""
+          end
+
+          it 'does not import topics' do
+            expect { poller.poll_feed }.not_to change { Topic.count }
+          end
+        end
+
+        context 'when embed_by_username is set' do
+          before do
+            SiteSetting.embed_by_username = embed_by_username
+            SiteSetting.embed_username_key_from_feed = ""
+          end
+
+          it 'creates the new topics under embed_by_username' do
+            expect { poller.poll_feed }.to change { Topic.count }.by(1)
+            expect(Topic.last.user).to eq(default_user)
+          end
+        end
+
+        context 'when embed_username_key_from_feed is set' do
+          before do
+            SiteSetting.embed_username_key_from_feed = embed_username_key_from_feed
+          end
+
+          it 'creates the new topics under the username found' do
+            expect { poller.poll_feed }.to change { Topic.count }.by(1)
+            expect(Topic.last.user).to eq(feed_author)
+          end
+        end
+      end
+
+      it 'parses creates a new post correctly' do
+        expect { poller.poll_feed }.to change { Topic.count }.by(1)
+        expect(Topic.last.title).to eq('Poll Feed Spec Fixture')
+        expect(Topic.last.first_post.raw).to include('<p>This is the body &amp; content. </p>')
+        expect(Topic.last.topic_embed.embed_url).to eq('https://blog.discourse.org/2017/09/poll-feed-spec-fixture')
+      end
+    end
+
+    context 'when parsing RSS feed' do
+      before do
+        SiteSetting.feed_polling_enabled = true
+        SiteSetting.feed_polling_url = 'https://blog.discourse.org/feed/'
+        SiteSetting.embed_by_username = embed_by_username
+
+        stub_request(:head, SiteSetting.feed_polling_url).to_return(status: 200)
+        stub_request(:get, SiteSetting.feed_polling_url).to_return(
+          status: 200,
+          body: file_from_fixtures('feed.rss', 'feed').read,
+          headers: { "Content-Type" => "application/rss+xml" }
+        )
+      end
+
+      include_examples 'topic creation based on the the feed'
+    end
+
+    context 'when parsing ATOM feed' do
+      before do
+        SiteSetting.feed_polling_enabled = true
+        SiteSetting.feed_polling_url = 'https://blog.discourse.org/feed/atom/'
+        SiteSetting.embed_by_username = embed_by_username
+
+        stub_request(:head, SiteSetting.feed_polling_url).to_return(status: 200)
+        stub_request(:get, SiteSetting.feed_polling_url).to_return(
+          status: 200,
+          body: file_from_fixtures('feed.atom', 'feed').read,
+          headers: { "Content-Type" => "application/atom+xml" }
+        )
+      end
+
+      include_examples 'topic creation based on the the feed'
+    end
+  end
 end
diff --git a/spec/jobs/process_post_spec.rb b/spec/jobs/process_post_spec.rb
index e240f6ef9d..137eb176db 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
@@ -62,6 +62,19 @@ describe Jobs::ProcessPost do
       expect { Jobs::ProcessPost.new.execute(post_id: post.id) }.to change { TopicLink.count }.by(2)
     end
 
+    it "works for posts that belong to no existing user" do
+      cooked = post.cooked
+
+      post.update_columns(cooked: "frogs", user_id: nil)
+      Jobs::ProcessPost.new.execute(post_id: post.id, cook: true)
+      post.reload
+      expect(post.cooked).to eq(cooked)
+
+      post.update_columns(cooked: "frogs", user_id: User.maximum("id") + 1)
+      Jobs::ProcessPost.new.execute(post_id: post.id, cook: true)
+      post.reload
+      expect(post.cooked).to eq(cooked)
+    end
   end
 
 end
diff --git a/spec/jobs/publish_topic_to_category_spec.rb b/spec/jobs/publish_topic_to_category_spec.rb
index 2cb97a1cca..84158e9adb 100644
--- a/spec/jobs/publish_topic_to_category_spec.rb
+++ b/spec/jobs/publish_topic_to_category_spec.rb
@@ -5,28 +5,27 @@ 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
     SiteSetting.queue_jobs = true
   end
 
-  describe 'when topic_timer_id is invalid' do
-    it 'should raise the right error' do
-      expect { described_class.new.execute(topic_timer_id: -1) }
-        .to raise_error(Discourse::InvalidParameters)
-    end
-  end
-
   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,11 +37,15 @@ 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)
-    end.first
+    end.find do |m|
+      Hash === m.data && m.data.key?(:reload_topic)
+    end
 
     topic.reload
     expect(topic.category).to eq(another_category)
@@ -59,13 +62,12 @@ 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
     end
 
-
     it 'should publish the topic to the new category' do
       message = MessageBus.track_publish do
         described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
diff --git a/spec/jobs/pull_hotlinked_images_spec.rb b/spec/jobs/pull_hotlinked_images_spec.rb
index ed680f9983..0c8ee74c43 100644
--- a/spec/jobs/pull_hotlinked_images_spec.rb
+++ b/spec/jobs/pull_hotlinked_images_spec.rb
@@ -3,30 +3,146 @@ require 'jobs/regular/pull_hotlinked_images'
 
 describe Jobs::PullHotlinkedImages do
 
+  let(:image_url) { "http://wiki.mozilla.org/images/2/2e/Longcat1.png" }
+  let(:broken_image_url) { "http://wiki.mozilla.org/images/2/2e/Longcat2.png" }
+  let(:large_image_url) { "http://wiki.mozilla.org/images/2/2e/Longcat3.png" }
+  let(:png) { Base64.decode64("R0lGODlhAQABALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//wBiZCH5BAEAAA8ALAAAAAABAAEAAAQC8EUAOw==") }
+  let(:large_png) { Base64.decode64("iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAIAAAAlC+aJAAAK10lEQVR42r3aeVRTVx4H8Oc2atWO7Sw9OnM6HWvrOON0aFlcAZ3RopZWOyqgoCACKqPWBUVQi4gIqAVllciiKPu+JOyGnQQSNgkIIQgoKljAYVARCZnf4yXhkeXlJmDP+f4hOUF+n3fvffe++y5W0i4qJqWoDU8hKQUPxWFKcq9VnHxJ8gTi5EqS0yJOtiRZfHEyJWE0i0MnJaMJTzopaQ/wpJKS0ogneTQYABANTDlDvpxBCsiu72eUP0zPq8Fzr45e8TircRDFQAAy5ABpcgDCgJV2iCbRQM+rinU/E26ie9NgfrDO1GBtTBy96SH/WhBhaxwfGEjndmfKGeiaGsYAJXIANQyCkfR05u3dhuOKVhLamnmRzocyKp9mNo9QG9IRDDiAiMaG3Nqfo45aoJROzk3DDxNCbjGahBM0yAKoDfIDOpNZE/bNYrVKJyfylB2D91pdA3lAjwE0MDAyS+BCalw9kdu2xvT6AY0NWBkJoNaAzsrj4CN1YtUTidi/hdH4BvGmJGPAAYgGMuMery/U6ONJqZ5I1PlTjNExre7kgJU/EqEbJC0gjDpiiv9hnSkJ2z+t9dzxwNcSUudlUuuxnXP+W/bZTWWO64uO6hccWQ0pPm4IP1a6GFe5bYXvNF7f0xxg3XrzgCDYjn1m4+218/D/SndaYnSqBpMDDlDXkHYnMlh7Srj+HLanxfOsyyOVN0ScYI0zkOeVZvYZGEI2/DFDMkWgTw7jAGWUA5owMOt7QtcvDF09qybA/mGC6zA7aCLVExkq9U3895/wm9LpgyonBxmDGKDQoHBySPQ8B5e/zM2kJdalN/fqxKsn8oLhFr5mdvDyX6UVNqqcpMmDAWNJACjtUMDrDVn7m6SdS/kxPwrizg+zAycLAKm5tA0a4a7DPpSFhmIAxWAgDKm0IJrutBr/g3D5n9E9J7F6oiNFGf2WtnI2vboH3YADEA0AuG2ml2i2BC4/AAYKr00uAHL/ihk0QnxQMPqKFWM/FiEamFWPYMHD8tgF1UMmZfjKZLDIJ1z/vQibzTKrbop2wAGIhoxbt8IN5zZHnoHqO5LdJr16IkXHDG4afJDJG0B8chADUAxxTnbp1trE5Z/0ASDN09hTcJdLy+EoawQZgyyAwhCxcznr0k4C0JNz5R0BYFqM3PBhQugtxKdQrEICUGFoE4ZtWPAg4jQBeJHv/Y4AkBKHdTHuZ8lP0hSDAQdQGwhAUUNv4s6/EvcfSD/T590B2u8cj3SwltkNUGaQBSgbDAXc9pxTW4jqIf8ruAa37efJLg/DfuBd21ftYU7OA387+QXSk2gHWMmRw/M2F9D2d8WffsW8Sv5+X/mtyBN7s+V2NBQasMpOEYqhuLG3MimMqL4h/GTu4fW01b/z05qrMKEGC96W+8sA8g/qKX281JuWafX350lniG++rIpOTcknb8lQGHAAoqG+pgqqr7hqE2K4kCg0bO3CJDMthvVKInTrlUmm/4j+9vO7mxYNlfrJAJiHVsYaL0g1XZy194scmy+JMCyXxWz+CAD4anTFjLrLpiMVQW+4t1G2lQiDGIBiuF/NLbmwM1B3PpQe892SFtqh4fIAhZ14mBUo34WE7ECFC29hRdDz5LO5dtrwdAGM0pP/HKoMzWsZRtwakwVQGPJjo/2/ej9Q74N8xy19o+tQYcWNzjT3mJNmR/W/uPi9fobr3ifpl6hXeG9Zge1JF5LPWvz4zYoTa7VSzu0mniggMEigNcBQ7GjE5A9Kt/eoOxLGkQBUGkoyGeEbPqnys2+OPlcbdir80PdOX+usmDFdG8OIwCc3bI0vm657WeSrsPouhuelbQZh/9nqY7FB+lsGc2ad27w86oTJo5SLrwu9s/dpVXuYFPEHELcocQC1QXpjhS4EpcMwiPhh2/U9XzfedYYFhe7UKdJSqkNOIt4oMy/uIwP68n6C3/WzMmIFHIUeJawMLm7ul9lmVdYOYgCKob6aK72NEo8yQ+UBtl99BkXoTMFcv1sF3UNaIpd24vCqvykDvCr2PbJ6GQFwNtKFrjhuCHFCCvmvcuW2ihUaMO4TWYCyAU0GSJcSsCblRTjDSJAZoFnuNiafLqReMrQlukKTylQvBZC3iikMOIDCQGaQAT9nq1gLqQRQBABFLa9U7tcTBjEApR3IALh1/DIAlQZZAIWBDOjO9HrXAMT3JliVBKCyHciALsYvAUAx4IAqOYDCmxKPBFD5QDNBQHHLS2XvfmQMYgCKgQx4muGhFmCw1B8dIOTQyvj9FO+vyDclrPqpLECZgVczBoAlA3URMCubLv6D9I657ZOP0lws1QJQv4OTGnAAogEdAF+A+TXHw3b0R5qoszLLyx4+gc8RAeUt/SrfIxIGMYDCoBDwONVdaQ9mB+3XWeK87kvJ1EYTDfYLn9XDgsdO+3NYKSACUN6FQsYAKg2IgIqgY6tnzmi6bP8y2X2EmGUbkkWCPJitV82cURfuqPq5nhPM4vchvpDGauQAygxkAMW+ULCdsfWSj/tCTr8IdeqPdBnK94FnFCEr8DXd68CyRXeObkfpRWx+D+JLdRxANlC0QwMaINHZfP37c4oczQkDnjDnvlCnMuc9RvPnxp/ehQKokAAoOlIeGUDdDvKAtsQLyv72mzJ/P6uN+rNnHtf5S7GjRVeQQ6nTbge9pdB/vEzWDso9aqoEUBuw2mciZY0gY0AEEBHEuZzZqAdFG743c/n0aQ7rtBruOKO/y+HwnyMebsABiIbG2jFAa7wryh4bPDaUXD+swWuoKv5TxMMNYgCFgQSoIgHOv7uNLbgLcfldiAc0xgAqDbVtLwTJXgQAeojmLzLKAzjBxyl257vqcgsfChUeDJA3YHUkgEpDQz2vJU7cCDJTEnQSWOHBDK0wMACgL0U7mLptXWO/fGmCk7myGW2gOra09Q36aSUcoIahc4Rfmi59JBi3H5j3k5fJOs8dhgoTYL0Jqi/1PfyMTrUKHOKGcwS9Kg9okA1iALqh+tGggBFIGJRtn2gWWEHwmlsRD5lIDdj9LpG8gXpyuN/yRJBwEQCwRYWytkEcuB28iuK2EXVPXOEAqaEW2dBUzZI+HE/wTT2RnjpGSZtQg1NjYoDa7dA50sKMIgywyTPB6l9VRbPaXmt28m0MQNEOCgdDbXu/IM17tCO5TaQjveWG1Qi6NT75htWTAOoaeA/4gnhXlF0Wiq7f3NSk1okrGQMO0NzQOdLMziU60usSPw2q7+SVlnWMlE3g1BjG6xZNxFDe1s2OO0Z0JHhxBuMBJlroUSgju682ldUxTH24QaVhDFAvB1Bp4HS+PRO/5ZDP7xtjnaXLJGKlBMtVeGqDuRk2If97z/tl0XVYZg+T3nF0F3tcjN1W2vFWrdNK8gYcgGiQvykFFl7a7oFBvG5o5UfvVRQrRuQu+mjgH5lRu7JjLPISLAtTrJ1pf94dj4U0+mhw4opsEAPU6kiEIZ1XYnZlFgFQKzu8MYtYzKYUs63E7Lnz0ls5iKeVFBrGAGq1A6uj1zZw0XZPzPwuZhqE7biiqm4vzNQP/7JVFmZbgdlxxnKienFBe4/G7YA1kADI7TDilmQJZVlE41cRirBlYdZMzIqB7UnGdseRkohZZmDW+ZhNmfibEHvuzAOcaWTD5XpLuBepdfKtiAxQ1xDPTdnhOdXUH7Nlj7uWKDnAme7bvPlI1a/Hfz4ljp+BfnqPPKD/DzQWIVWNoUiJAAAAAElFTkSuQmCC") }
+
   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")
+    stub_request(:get, image_url).to_return(body: png, headers: { "Content-Type" => "image/png" })
+    stub_request(:head, image_url)
+    stub_request(:head, broken_image_url).to_return(status: 404)
+    stub_request(:get, large_image_url).to_return(body: large_png, headers: { "Content-Type" => "image/png" })
+    stub_request(:head, large_image_url)
+    SiteSetting.crawl_images = true
     SiteSetting.download_remote_images_to_local = true
-    FastImage.expects(:size).returns([100, 100]).at_least_once
+    SiteSetting.max_image_size_kb = 2
+    SiteSetting.download_remote_images_threshold = 0
   end
 
-  it 'replaces image src' do
-    post = Fabricate(:post, raw: "<img src='http://wiki.mozilla.org/images/2/2e/Longcat1.png'>")
+  describe "#nochange" do
+    it 'does saves nothing if there are no large images to pull' do
+      post = Fabricate(:post, raw: 'bob bob')
+      orig = post.updated_at
 
-    Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
-    post.reload
-
-    expect(post.raw).to match(/^<img src='\/uploads/)
+      freeze_time 1.week.from_now
+      Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
+      expect(orig).to be_within(1.second).of(post.reload.updated_at)
+    end
   end
 
-  it 'replaces image src without protocol' do
-    post = Fabricate(:post, raw: "<img src='//wiki.mozilla.org/images/2/2e/Longcat1.png'>")
+  describe '#execute' do
+    before do
+      FastImage.expects(:size).returns([100, 100]).at_least_once
+    end
 
-    Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
-    post.reload
+    it 'replaces images' do
+      post = Fabricate(:post, raw: "<img src='#{image_url}'>")
 
-    expect(post.raw).to match(/^<img src='\/uploads/)
+      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
+      url = image_url.sub(/^https?\:/, '')
+      post = Fabricate(:post, raw: "<img src='#{url}'>")
+
+      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
+      url = image_url.sub(/\.[a-zA-Z0-9]+$/, '')
+      stub_request(:get, url).to_return(body: png, headers: { "Content-Type" => "image/png" })
+      stub_request(:head, url)
+      post = Fabricate(:post, raw: "<img src='#{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
+
+      it 'all combinations' do
+        post = Fabricate(:post, raw: "
+<img src='#{image_url}'>
+#{url}
+<img src='#{broken_image_url}'>
+<a href='#{url}'><img src='#{large_image_url}'></a>
+        ")
+
+        Jobs::ProcessPost.new.execute(post_id: post.id)
+        Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
+        Jobs::ProcessPost.new.execute(post_id: post.id)
+        Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
+        post.reload
+
+        expect(post.cooked).to match(/<p><img src=.*\/uploads/)
+        expect(post.cooked).to match(/<img src=.*\/uploads.*\ class="thumbnail"/)
+        expect(post.cooked).to match(/<span class="broken-image fa fa-chain-broken/)
+        expect(post.cooked).to match(/<div class="large-image-placeholder">/)
+      end
+    end
+  end
+
+  describe '#is_valid_image_url' do
+    subject { described_class.new }
+
+    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
+
+    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 96d40decbd..1d31b76997 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/reindex_search_spec.rb b/spec/jobs/reindex_search_spec.rb
new file mode 100644
index 0000000000..8b8c870d31
--- /dev/null
+++ b/spec/jobs/reindex_search_spec.rb
@@ -0,0 +1,31 @@
+require 'rails_helper'
+
+describe Jobs::ReindexSearch do
+  before { SearchIndexer.enable }
+  after { SearchIndexer.disable }
+
+  let(:locale) { 'fr' }
+  # This works since test db has a small record less than limit.
+  # Didn't check `topic` because topic doesn't have posts in fabrication
+  # thus no search data
+  %w(post category user).each do |m|
+    it "should rebuild `#{m}` when default_locale changed" do
+      SiteSetting.default_locale = 'en'
+      model = Fabricate(m.to_sym)
+      SiteSetting.default_locale = locale
+      subject.execute({})
+      expect(model.send("#{m}_search_data").locale).to eq locale
+    end
+
+    it "should rebuild `#{m}` when INDEX_VERSION changed" do
+      model = Fabricate(m.to_sym)
+      # so that search data can be reindexed
+      search_data = model.send("#{m}_search_data")
+      search_data.update_attributes!(version: 0)
+      model.reload
+
+      subject.execute({})
+      expect(model.send("#{m}_search_data").version).to eq Search::INDEX_VERSION
+    end
+  end
+end
diff --git a/spec/jobs/send_system_message_spec.rb b/spec/jobs/send_system_message_spec.rb
index 78f739477c..23723e8d03 100644
--- a/spec/jobs/send_system_message_spec.rb
+++ b/spec/jobs/send_system_message_spec.rb
@@ -16,10 +16,16 @@ describe Jobs::SendSystemMessage do
     let(:user) { Fabricate(:user) }
 
     it "should call SystemMessage.create" do
-      SystemMessage.any_instance.expects(:create).with('welcome_invite')
+      SystemMessage.any_instance.expects(:create).with('welcome_invite', {})
       Jobs::SendSystemMessage.new.execute(user_id: user.id, message_type: 'welcome_invite')
     end
 
+    it "can send message parameters" do
+      options = { url: "/t/no-spammers-please/123", edit_delay: 5, flag_reason: "Flagged by community" }
+      SystemMessage.any_instance.expects(:create).with('post_hidden', options)
+      Jobs::SendSystemMessage.new.execute(user_id: user.id, message_type: 'post_hidden', message_options: options)
+    end
+
   end
 
 end
diff --git a/spec/jobs/test_email_spec.rb b/spec/jobs/test_email_spec.rb
index 252a96b85e..7207abfff5 100644
--- a/spec/jobs/test_email_spec.rb
+++ b/spec/jobs/test_email_spec.rb
@@ -22,6 +22,4 @@ describe Jobs::TestEmail do
 
   end
 
-
 end
-
diff --git a/spec/jobs/tl3_promotions_spec.rb b/spec/jobs/tl3_promotions_spec.rb
index 7c4aff7354..bf440918fd 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 2c4b5c6c8a..2e36f8abaa 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 fd8b71697e..1a373c87da 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/update_gravatar_spec.rb b/spec/jobs/update_gravatar_spec.rb
index 403de9a360..096a4d6b3c 100644
--- a/spec/jobs/update_gravatar_spec.rb
+++ b/spec/jobs/update_gravatar_spec.rb
@@ -8,7 +8,7 @@ describe Jobs::UpdateGravatar do
     expect(user.user_avatar.gravatar_upload_id).to eq(nil)
 
     png = Base64.decode64("R0lGODlhAQABALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//wBiZCH5BAEAAA8ALAAAAAABAAEAAAQC8EUAOw==")
-    url = "http://www.gravatar.com/avatar/d10ca8d11301c2f4993ac2279ce4b930.png?s=360&d=404"
+    url = "https://www.gravatar.com/avatar/d10ca8d11301c2f4993ac2279ce4b930.png?s=360&d=404"
     stub_request(:head, url).to_return(status: 200)
     stub_request(:get, url).to_return(body: png)
 
diff --git a/spec/jobs/user_email_spec.rb b/spec/jobs/user_email_spec.rb
index b3cd3c7fe5..67876f14ad 100644
--- a/spec/jobs/user_email_spec.rb
+++ b/spec/jobs/user_email_spec.rb
@@ -7,10 +7,10 @@ describe Jobs::UserEmail do
     SiteSetting.email_time_window_mins = 10
   end
 
-  let(:user) { Fabricate(:user, last_seen_at: 11.minutes.ago ) }
-  let(:staged) { Fabricate(:user, staged: true, last_seen_at: 11.minutes.ago ) }
-  let(:suspended) { Fabricate(:user, last_seen_at: 10.minutes.ago, suspended_at: 5.minutes.ago, suspended_till: 7.days.from_now ) }
-  let(:anonymous) { Fabricate(:anonymous, last_seen_at: 11.minutes.ago ) }
+  let(:user) { Fabricate(:user, last_seen_at: 11.minutes.ago) }
+  let(:staged) { Fabricate(:user, staged: true, last_seen_at: 11.minutes.ago) }
+  let(:suspended) { Fabricate(:user, last_seen_at: 10.minutes.ago, suspended_at: 5.minutes.ago, suspended_till: 7.days.from_now) }
+  let(:anonymous) { Fabricate(:anonymous, last_seen_at: 11.minutes.ago) }
   let(:mailer) { Mail::Message.new(to: user.email) }
 
   it "raises an error when there is no user" do
@@ -80,7 +80,10 @@ describe Jobs::UserEmail do
 
   context "email_log" do
 
-    before { Fabricate(:post) }
+    before do
+      SiteSetting.editing_grace_period = 0
+      Fabricate(:post)
+    end
 
     it "creates an email log when the mail is sent (via Email::Sender)" do
       last_emailed_at = user.last_emailed_at
@@ -115,7 +118,7 @@ describe Jobs::UserEmail do
   context 'args' do
 
     it 'passes a token as an argument when a token is present' do
-      UserNotifications.expects(:forgot_password).with(user, {email_token: 'asdfasdf'}).returns(mailer)
+      UserNotifications.expects(:forgot_password).with(user, email_token: 'asdfasdf').returns(mailer)
       Email::Sender.any_instance.expects(:send)
       Jobs::UserEmail.new.execute(type: :forgot_password, user_id: user.id, email_token: 'asdfasdf')
     end
@@ -124,7 +127,7 @@ describe Jobs::UserEmail do
       let(:post) { Fabricate(:post, user: user) }
 
       it 'passes a post as an argument when a post_id is present' do
-        UserNotifications.expects(:user_private_message).with(user, {post: post}).returns(mailer)
+        UserNotifications.expects(:user_private_message).with(user, post: post).returns(mailer)
         Email::Sender.any_instance.expects(:send)
         Jobs::UserEmail.new.execute(type: :user_private_message, user_id: user.id, post_id: post.id)
       end
@@ -162,7 +165,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
@@ -178,7 +181,6 @@ describe Jobs::UserEmail do
       end
     end
 
-
     context 'notification' do
       let(:post) { Fabricate(:post, user: user) }
       let!(:notification) {
@@ -195,14 +197,13 @@ describe Jobs::UserEmail do
       it "doesn't send the email if the notification has been seen" do
         notification.update_column(:read, true)
         message, err = Jobs::UserEmail.new.message_for_email(
-                                          user,
-                                          post,
-                                          :user_mentioned,
-                                          notification,
-                                          notification.notification_type,
-                                          notification.data_hash,
-                                          nil,
-                                          nil)
+          user,
+          post,
+          :user_mentioned,
+          notification,
+          notification_type: notification.notification_type,
+          notification_data_hash: notification.data_hash
+        )
 
         expect(message).to eq nil
         expect(err.skipped_reason).to match(/notification.*already/)
@@ -283,7 +284,7 @@ describe Jobs::UserEmail do
 
       context 'user is suspended' do
         it "doesn't send email for a pm from a regular user" do
-          msg,err = Jobs::UserEmail.new.message_for_email(
+          msg, err = Jobs::UserEmail.new.message_for_email(
               suspended,
               Fabricate.build(:post),
               :user_private_message,
@@ -316,7 +317,7 @@ describe Jobs::UserEmail do
           end
 
           it "sends an email" do
-            msg,err = sent_message
+            msg, err = sent_message
             expect(msg).not_to be(nil)
             expect(err).to be(nil)
           end
@@ -324,7 +325,7 @@ describe Jobs::UserEmail do
           it "sends an email even if user was last seen recently" do
             suspended.update_column(:last_seen_at, 1.minute.ago)
 
-            msg,err = sent_message
+            msg, err = sent_message
             expect(msg).not_to be(nil)
             expect(err).to be(nil)
           end
@@ -332,7 +333,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 68ce2b4a4a..4bf13fddfd 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])
@@ -72,13 +73,12 @@ describe InviteMailer do
       end
     end
 
-
     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 +123,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/rejection_mailer_spec.rb b/spec/mailers/rejection_mailer_spec.rb
index a3d76044b2..0062f609f9 100644
--- a/spec/mailers/rejection_mailer_spec.rb
+++ b/spec/mailers/rejection_mailer_spec.rb
@@ -6,7 +6,7 @@ describe RejectionMailer do
 
     context 'sends rejection email' do
       let (:user) { Fabricate(:user) }
-      let (:template_args) { {former_title: "Mail Subject", destination: user.email, site_name: SiteSetting.title} }
+      let (:template_args) { { former_title: "Mail Subject", destination: user.email, site_name: SiteSetting.title } }
       let (:reject_mail) { RejectionMailer.send_rejection("email_reject_topic_not_found", user.email, template_args) }
 
       it 'renders the senders email' do
diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb
index 39ed87a35d..9e3327aa92 100644
--- a/spec/mailers/user_notifications_spec.rb
+++ b/spec/mailers/user_notifications_spec.rb
@@ -13,7 +13,7 @@ describe UserNotifications do
       _post5 = Fabricate(:post, topic: post1.topic, post_type: Post.types[:moderator_action])
       _post6 = Fabricate(:post, topic: post1.topic, post_type: Post.types[:small_action])
       _post7 = Fabricate(:post, topic: post1.topic, post_type: Post.types[:whisper])
-      last  = Fabricate(:post, topic: post1.topic)
+      last = Fabricate(:post, topic: post1.topic)
 
       post1.user.user_option.email_previous_replies = UserOption.previous_replies_type[:always]
 
@@ -29,8 +29,8 @@ describe UserNotifications do
 
     it "allows users to control context" do
       post1 = create_post
-      _post2  = Fabricate(:post, topic: post1.topic)
-      post3  = Fabricate(:post, topic: post1.topic)
+      _post2 = Fabricate(:post, topic: post1.topic)
+      post3 = Fabricate(:post, topic: post1.topic)
 
       user = Fabricate(:user)
       TopicUser.change(user.id, post1.topic_id, last_emailed_post_number: 1)
@@ -106,7 +106,7 @@ describe UserNotifications do
     context "with new topics" do
 
       before do
-        Fabricate(:topic, user: Fabricate(:coding_horror))
+        Fabricate(:topic, user: Fabricate(:coding_horror), created_at: 1.hour.ago)
       end
 
       it "works" do
@@ -127,8 +127,8 @@ describe UserNotifications do
       end
 
       it "excludes deleted topics and their posts" do
-        deleted = Fabricate(:topic, user: Fabricate(:user), title: "Delete this topic plz")
-        post = Fabricate(:post, topic: deleted, score: 100.0, post_number: 2, raw: "Your wish is my command")
+        deleted = Fabricate(:topic, user: Fabricate(:user), title: "Delete this topic plz", created_at: 1.hour.ago)
+        post = Fabricate(:post, topic: deleted, score: 100.0, post_number: 2, raw: "Your wish is my command", created_at: 1.hour.ago)
         deleted.trash!
         html = subject.html_part.body.to_s
         expect(html).to_not include deleted.title
@@ -136,10 +136,10 @@ describe UserNotifications do
       end
 
       it "excludes whispers and other post types that don't belong" do
-        t = Fabricate(:topic, user: Fabricate(:user), title: "Who likes the same stuff I like?")
-        whisper = Fabricate(:post, topic: t, score: 100.0, post_number: 2, raw: "You like weird stuff", post_type: Post.types[:whisper])
-        mod_action = Fabricate(:post, topic: t, score: 100.0, post_number: 3, raw: "This topic unlisted", post_type: Post.types[:moderator_action])
-        small_action = Fabricate(:post, topic: t, score: 100.0, post_number: 4, raw: "A small action", post_type: Post.types[:small_action])
+        t = Fabricate(:topic, user: Fabricate(:user), title: "Who likes the same stuff I like?", created_at: 1.hour.ago)
+        whisper = Fabricate(:post, topic: t, score: 100.0, post_number: 2, raw: "You like weird stuff", post_type: Post.types[:whisper], created_at: 1.hour.ago)
+        mod_action = Fabricate(:post, topic: t, score: 100.0, post_number: 3, raw: "This topic unlisted", post_type: Post.types[:moderator_action], created_at: 1.hour.ago)
+        small_action = Fabricate(:post, topic: t, score: 100.0, post_number: 4, raw: "A small action", post_type: Post.types[:small_action], created_at: 1.hour.ago)
         html = subject.html_part.body.to_s
         expect(html).to_not include whisper.raw
         expect(html).to_not include mod_action.raw
@@ -147,16 +147,24 @@ describe UserNotifications do
       end
 
       it "excludes deleted and hidden posts" do
-        t = Fabricate(:topic, user: Fabricate(:user), title: "Post objectionable stuff here")
-        deleted = Fabricate(:post, topic: t, score: 100.0, post_number: 2, raw: "This post is uncalled for", deleted_at: 5.minutes.ago)
-        hidden = Fabricate(:post, topic: t, score: 100.0, post_number: 3, raw: "Try to find this post", hidden: true, hidden_at: 5.minutes.ago, hidden_reason_id: Post.hidden_reasons[:flagged_by_tl3_user])
-        user_deleted = Fabricate(:post, topic: t, score: 100.0, post_number: 4, raw: "I regret this post", user_deleted: true)
+        t = Fabricate(:topic, user: Fabricate(:user), title: "Post objectionable stuff here", created_at: 1.hour.ago)
+        deleted = Fabricate(:post, topic: t, score: 100.0, post_number: 2, raw: "This post is uncalled for", deleted_at: 5.minutes.ago, created_at: 1.hour.ago)
+        hidden = Fabricate(:post, topic: t, score: 100.0, post_number: 3, raw: "Try to find this post", hidden: true, hidden_at: 5.minutes.ago, hidden_reason_id: Post.hidden_reasons[:flagged_by_tl3_user], created_at: 1.hour.ago)
+        user_deleted = Fabricate(:post, topic: t, score: 100.0, post_number: 4, raw: "I regret this post", user_deleted: true, created_at: 1.hour.ago)
         html = subject.html_part.body.to_s
         expect(html).to_not include deleted.raw
         expect(html).to_not include hidden.raw
         expect(html).to_not include user_deleted.raw
       end
 
+      it "excludes posts that are newer than editing grace period" do
+        SiteSetting.editing_grace_period = 5.minutes
+        too_new = Fabricate(:topic, user: Fabricate(:user), title: "Oops I need to edit this", created_at: 1.minute.ago)
+        too_new_post = Fabricate(:post, user: too_new.user, topic: too_new, score: 100.0, post_number: 1, created_at: 1.minute.ago)
+        html = subject.html_part.body.to_s
+        expect(html).to_not include too_new.title
+      end
+
       it "uses theme color" do
         cs = Fabricate(:color_scheme, name: 'Fancy', color_scheme_colors: [
           Fabricate(:color_scheme_color, name: 'header_primary',  hex: 'F0F0F0'),
@@ -185,7 +193,7 @@ describe UserNotifications do
     let(:category) { Fabricate(:category, name: 'India') }
     let(:topic) { Fabricate(:topic, category: category) }
     let(:post) { Fabricate(:post, topic: topic, raw: 'This is My super duper cool topic') }
-    let(:response) { Fabricate(:post, reply_to_post_number: 1, topic: post.topic, user: response_by_user)}
+    let(:response) { Fabricate(:post, reply_to_post_number: 1, topic: post.topic, user: response_by_user) }
     let(:user) { Fabricate(:user) }
     let(:notification) { Fabricate(:notification, user: user) }
 
@@ -223,7 +231,6 @@ describe UserNotifications do
       tu = TopicUser.get(post.topic_id, response.user)
       expect(tu.last_emailed_post_number).to eq(response.post_number)
 
-
       # no In Reply To if user opts out
       response.user.user_option.email_in_reply_to = false
       mail = UserNotifications.user_replied(response.user,
@@ -232,7 +239,6 @@ describe UserNotifications do
                                              notification_data_hash: notification.data_hash
                                            )
 
-
       expect(mail.html_part.to_s.scan(/In Reply To/).count).to eq(0)
 
       SiteSetting.enable_names = true
@@ -249,7 +255,6 @@ describe UserNotifications do
                                              notification_data_hash: notification.data_hash
                                            )
 
-
       mail_html = mail.html_part.to_s
       expect(mail_html.scan(/>Bob Marley/).count).to eq(1)
       expect(mail_html.scan(/>bobmarley/).count).to eq(0)
@@ -286,9 +291,9 @@ describe UserNotifications do
   describe '.user_posted' do
     let(:response_by_user) { Fabricate(:user, name: "John Doe", username: "john") }
     let(:post) { Fabricate(:post) }
-    let(:response) { Fabricate(:post, topic: post.topic, user: response_by_user)}
+    let(:response) { Fabricate(:post, topic: post.topic, user: response_by_user) }
     let(:user) { Fabricate(:user) }
-    let(:notification) { Fabricate(:notification, user: user, data: {original_username: response_by_user.username}.to_json) }
+    let(:notification) { Fabricate(:notification, user: user, data: { original_username: response_by_user.username }.to_json) }
 
     it 'generates a correct email' do
       SiteSetting.enable_names = false
@@ -335,9 +340,9 @@ describe UserNotifications do
   describe '.user_private_message' do
     let(:response_by_user) { Fabricate(:user, name: "", username: "john") }
     let(:topic) { Fabricate(:private_message_topic) }
-    let(:response) { Fabricate(:post, topic: topic, user: response_by_user)}
+    let(:response) { Fabricate(:post, topic: topic, user: response_by_user) }
     let(:user) { Fabricate(:user) }
-    let(:notification) { Fabricate(:notification, user: user, data: {original_username: response_by_user.username}.to_json) }
+    let(:notification) { Fabricate(:notification, user: user, data: { original_username: response_by_user.username }.to_json) }
 
     it 'generates a correct email' do
       SiteSetting.enable_names = true
@@ -384,7 +389,6 @@ describe UserNotifications do
     end
   end
 
-
   it 'adds a warning when mail limit is reached' do
     SiteSetting.max_emails_per_day_per_user = 2
     user = Fabricate(:user)
@@ -394,7 +398,7 @@ describe UserNotifications do
     reply = Fabricate(:post, topic_id: post.topic_id)
 
     notification = Fabricate(:notification, topic_id: post.topic_id, post_number: reply.post_number,
-                             user: post.user, data: {original_username: 'bob'}.to_json)
+                                            user: post.user, data: { original_username: 'bob' }.to_json)
 
     mail = UserNotifications.user_replied(
       user,
@@ -467,15 +471,16 @@ describe UserNotifications do
 
   shared_examples "notification email building" do
     let(:post) { Fabricate(:post, user: user) }
-    let(:mail_type) { "user_#{notification_type}"}
-    let(:username) { "walterwhite"}
+    let(:mail_type) { "user_#{notification_type}" }
+    let(:mail_template) { "user_notifications.#{mail_type}" }
+    let(:username) { "walterwhite" }
     let(:notification) do
       Fabricate(:notification,
                 user: user,
                 topic: post.topic,
                 notification_type: Notification.types[notification_type],
                 post_number: post.post_number,
-                data: {original_username: username}.to_json )
+                data: { original_username: username }.to_json)
     end
 
     describe 'email building' do
@@ -488,7 +493,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 +542,25 @@ 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}
+          %{topic_title_url_encoded}
+          %{site_title_url_encoded}
+          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 +609,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 f6e1a2c294..d04142bef5 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
@@ -199,8 +199,8 @@ describe AdminDashboardData do
       def all_setting_permutations(keys)
         ['a', ''].repeated_permutation(keys.size) do |*values|
           hash = Hash[keys.zip(values)]
-          hash.each do |key,value|
-            SiteSetting.stubs(key).returns(value)
+          hash.each do |key, 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 5d163dc368..5196c16eb5 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 7aca4b71d3..59d9490a95 100644
--- a/spec/models/application_request_spec.rb
+++ b/spec/models/application_request_spec.rb
@@ -1,13 +1,44 @@
 require 'rails_helper'
 
 describe ApplicationRequest do
-
   before do
+    ApplicationRequest.last_flush = Time.now.utc
     ApplicationRequest.clear_cache!
   end
 
-  def inc(key,opts=nil)
-    ApplicationRequest.increment!(key,opts)
+  after do
+    ApplicationRequest.clear_cache!
+  end
+
+  def inc(key, opts = nil)
+    ApplicationRequest.increment!(key, opts)
+  end
+
+  def disable_date_flush!
+    freeze_time(Time.now)
+    ApplicationRequest.last_flush = Time.now.utc
+  end
+
+  context "readonly test" do
+    it 'works even if redis is in readonly' do
+      disable_date_flush!
+
+      inc(:http_total)
+      inc(:http_total)
+
+      $redis.without_namespace.stubs(:incr).raises(Redis::CommandError.new("READONLY"))
+      $redis.without_namespace.stubs(:eval).raises(Redis::CommandError.new("READONLY"))
+
+      # flush will be deferred no error raised
+      inc(:http_total, autoflush: 3)
+      ApplicationRequest.write_cache!
+
+      $redis.without_namespace.unstub(:incr)
+      $redis.without_namespace.unstub(:eval)
+
+      inc(:http_total, autoflush: 3)
+      expect(ApplicationRequest.http_total.first.count).to eq(3)
+    end
   end
 
   it 'logs nothing for an unflushed increment' do
@@ -16,13 +47,19 @@ describe ApplicationRequest do
   end
 
   it 'can automatically flush' do
-    t1 = Time.now.utc.at_midnight
-    freeze_time(t1)
+    disable_date_flush!
+
     inc(:http_total)
     inc(:http_total)
     inc(:http_total, autoflush: 3)
 
     expect(ApplicationRequest.http_total.first.count).to eq(3)
+
+    inc(:http_total)
+    inc(:http_total)
+    inc(:http_total, autoflush: 3)
+
+    expect(ApplicationRequest.http_total.first.count).to eq(6)
   end
 
   it 'can flush based on time' do
diff --git a/spec/models/badge_spec.rb b/spec/models/badge_spec.rb
index 8a39087fe6..f6f8b0c0d7 100644
--- a/spec/models/badge_spec.rb
+++ b/spec/models/badge_spec.rb
@@ -62,4 +62,3 @@ describe Badge do
   end
 
 end
-
diff --git a/spec/models/badge_type.rb b/spec/models/badge_type.rb
deleted file mode 100644
index 5d265d06e1..0000000000
--- a/spec/models/badge_type.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'rails_helper'
-require_dependency 'badge_type'
-
-describe BadgeType do
-
-  it { is_expected.to validate_presence_of :name }
-  it { is_expected.to validate_uniqueness_of :name }
-
-end
diff --git a/spec/models/badge_type_spec.rb b/spec/models/badge_type_spec.rb
new file mode 100644
index 0000000000..17a91a9aee
--- /dev/null
+++ b/spec/models/badge_type_spec.rb
@@ -0,0 +1,9 @@
+require 'rails_helper'
+require_dependency 'badge_type'
+
+describe BadgeType do
+
+  it { is_expected.to have_many :badges }
+  it { is_expected.to validate_presence_of :name }
+  it { is_expected.to validate_uniqueness_of :name }
+end
diff --git a/spec/models/category_featured_topic_spec.rb b/spec/models/category_featured_topic_spec.rb
index b7fe537017..1fbb32ba4f 100644
--- a/spec/models/category_featured_topic_spec.rb
+++ b/spec/models/category_featured_topic_spec.rb
@@ -10,12 +10,31 @@ describe CategoryFeaturedTopic do
     let(:category)       { Fabricate(:category) }
     let!(:category_post) { PostCreator.create(user, raw: "I put this post in the category", title: "categorize THIS", category: category.id) }
 
+    it "works in batched mode" do
+      category2 = Fabricate(:category)
+      post2 = create_post(category: category2.id)
+
+      CategoryFeaturedTopic.destroy_all
+      CategoryFeaturedTopic.clear_batch!
+
+      size = Category.order(:id).where('id < ?', category.id).count + 1
+
+      CategoryFeaturedTopic.feature_topics(batched: true, batch_size: size)
+
+      expect(CategoryFeaturedTopic.where(topic_id: category_post.topic_id).count).to eq(1)
+      expect(CategoryFeaturedTopic.where(topic_id: post2.topic_id).count).to eq(0)
+
+      CategoryFeaturedTopic.feature_topics(batched: true, batch_size: size)
+
+      expect(CategoryFeaturedTopic.where(topic_id: post2.topic_id).count).to eq(1)
+    end
+
     it "should feature topics for a secure category" do
 
       # so much dancing, I am thinking fixures make sense here.
       user.change_trust_level!(TrustLevel[1])
 
-      category.set_permissions(:trust_level_1 => :full)
+      category.set_permissions(trust_level_1: :full)
       category.save
 
       _uncategorized_post = PostCreator.create(user, raw: "this is my new post 123 post", title: "hello world")
@@ -32,10 +51,9 @@ describe CategoryFeaturedTopic do
       expect(CategoryFeaturedTopic.count).to be(1)
     end
 
-
     it 'should feature stuff in the correct order' do
       category = Fabricate(:category, num_featured_topics: 2)
-      t5 = Fabricate(:topic, category_id: category.id, bumped_at: 12.minutes.ago)
+      _t5 = Fabricate(:topic, category_id: category.id, bumped_at: 12.minutes.ago)
       t4 = Fabricate(:topic, category_id: category.id, bumped_at: 10.minutes.ago)
       t3 = Fabricate(:topic, category_id: category.id, bumped_at: 7.minutes.ago)
       t2 = Fabricate(:topic, category_id: category.id, bumped_at: 4.minutes.ago)
@@ -46,11 +64,10 @@ describe CategoryFeaturedTopic do
 
       # Should find more than we need: pinned topics first, then num_featured_topics * 2
       expect(
-        CategoryFeaturedTopic.where(category_id: category.id).pluck(:topic_id)
+        CategoryFeaturedTopic.where(category_id: category.id).order('rank asc').pluck(:topic_id)
       ).to eq([pinned.id, t2.id, t1.id, t3.id, t4.id])
 
     end
   end
 
 end
-
diff --git a/spec/models/category_list_spec.rb b/spec/models/category_list_spec.rb
index 32da762796..ac7a46542a 100644
--- a/spec/models/category_list_spec.rb
+++ b/spec/models/category_list_spec.rb
@@ -12,7 +12,7 @@ describe CategoryList do
     it "properly hide secure categories" do
       cat = Fabricate(:category)
       Fabricate(:topic, category: cat)
-      cat.set_permissions(:admins => :full)
+      cat.set_permissions(admins: :full)
       cat.save
 
       # uncategorized + this
@@ -55,7 +55,7 @@ describe CategoryList do
 
     context "with a topic in a category" do
       let!(:topic) { Fabricate(:topic, category: topic_category) }
-      let(:category) { category_list.categories.find{|c| c.id == topic_category.id} }
+      let(:category) { category_list.categories.find { |c| c.id == topic_category.id } }
 
       it "should return the category" do
         expect(category).to be_present
@@ -69,7 +69,7 @@ describe CategoryList do
       let!(:topic2) { Fabricate(:topic, category: topic_category, bumped_at: 5.minutes.ago) }
       let!(:topic3) { Fabricate(:topic, category: topic_category, bumped_at: 2.minutes.ago) }
       let!(:pinned) { Fabricate(:topic, category: topic_category, pinned_at: 10.minutes.ago, bumped_at: 10.minutes.ago) }
-      let(:category) { category_list.categories.find{|c| c.id == topic_category.id} }
+      let(:category) { category_list.categories.find { |c| c.id == topic_category.id } }
 
       it "returns pinned topic first" do
         expect(category.displayable_topics.map(&:id)).to eq([pinned.id, topic3.id])
@@ -81,6 +81,28 @@ describe CategoryList do
       end
     end
 
+    context "notification level" do
+      it "returns 'regular' as default notification level" do
+        category = category_list.categories.find { |c| c.id == topic_category.id }
+        expect(category.notification_level).to eq(NotificationLevels.all[:regular])
+      end
+
+      it "returns the users notication level" do
+        CategoryUser.set_notification_level_for_category(user, NotificationLevels.all[:watching], topic_category.id)
+        category_list = CategoryList.new(Guardian.new(user))
+        category = category_list.categories.find { |c| c.id == topic_category.id }
+
+        expect(category.notification_level).to eq(NotificationLevels.all[:watching])
+      end
+
+      it "returns no notication level for anonymous users" do
+        category_list = CategoryList.new(Guardian.new(nil))
+        category = category_list.categories.find { |c| c.id == topic_category.id }
+
+        expect(category.notification_level).to be_nil
+      end
+    end
+
   end
 
   describe 'category order' do
@@ -94,7 +116,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
@@ -104,7 +126,7 @@ describe CategoryList do
 
       it "handles duplicate position values" do
         cat1, cat2, cat3, cat4 = Fabricate(:category, position: 0), Fabricate(:category, position: 0), Fabricate(:category, position: nil), Fabricate(:category, position: 0)
-        first_three = category_ids[0,3] # The order is not deterministic
+        first_three = category_ids[0, 3] # The order is not deterministic
         expect(first_three).to include(cat1.id)
         expect(first_three).to include(cat2.id)
         expect(first_three).to include(cat4.id)
@@ -114,7 +136,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 87e808c26c..7c9fbc565b 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -19,17 +19,9 @@ describe Category do
     expect(cats.errors[:name]).to be_present
   end
 
-  describe "last_updated_at" do
-    it "returns a number value of when the category was last updated" do
-      last = Category.last_updated_at
-      expect(last).to be_present
-      expect(last.to_i).to eq(last)
-    end
-  end
-
   describe "resolve_permissions" do
     it "can determine read_restricted" do
-      read_restricted, resolved = Category.resolve_permissions(:everyone => :full)
+      read_restricted, resolved = Category.resolve_permissions(everyone: :full)
 
       expect(read_restricted).to be false
       expect(resolved).to be_blank
@@ -41,7 +33,7 @@ describe Category do
       category = Fabricate(:category)
       group = Fabricate(:group)
       category_group = Fabricate(:category_group, category: category, group: group)
-      expect(category.permissions_params).to eq({ "#{group.name}" => category_group.permission_type })
+      expect(category.permissions_params).to eq("#{group.name}" => category_group.permission_type)
     end
   end
 
@@ -55,7 +47,6 @@ describe Category do
       can_post_category = Fabricate(:category)
       can_read_category = Fabricate(:category)
 
-
       user = Fabricate(:user)
       group = Fabricate(:group)
       group.add(user)
@@ -85,7 +76,7 @@ describe Category do
       expect(Category.scoped_to_permissions(nil, [:readonly]).count).to be(2)
 
       # everyone has special semantics, test it as well
-      can_post_category.set_permissions(:everyone => :create_post)
+      can_post_category.set_permissions(everyone: :create_post)
       can_post_category.save
 
       expect(Category.post_create_allowed(guardian).count).to be(4)
@@ -112,7 +103,7 @@ describe Category do
       category.set_permissions({})
       expect(category.read_restricted?).to be true
 
-      category.set_permissions(:everyone => :full)
+      category.set_permissions(everyone: :full)
       expect(category.read_restricted?).to be false
 
       expect(user.secure_categories).to be_empty
@@ -132,12 +123,12 @@ describe Category do
 
       group.add(user)
       category.set_permissions(group.id => :full)
-      category.save
+      category.save!
       category_2.set_permissions(group.id => :full)
-      category_2.save
+      category_2.save!
 
       expect(Category.secured).to match_array([uncategorized])
-      expect(Category.secured(Guardian.new(user))).to match_array([uncategorized,category, category_2])
+      expect(Category.secured(Guardian.new(user))).to match_array([uncategorized, category, category_2])
     end
   end
 
@@ -166,7 +157,7 @@ describe Category do
     category.save
 
     category = Category.find(category.id)
-    expect(category.custom_fields).to eq({"bob" => "marley", "jack" => "black"})
+    expect(category.custom_fields).to eq("bob" => "marley", "jack" => "black")
   end
 
   describe "short name" do
@@ -476,7 +467,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
@@ -522,7 +513,7 @@ describe Category do
       it "includes the parent category" do
         parent_category = Fabricate(:category, name: "parent")
         subcategory = Fabricate(:category, name: "child",
-                                parent_category_id: parent_category.id)
+                                           parent_category_id: parent_category.id)
         expect(subcategory.url).to eq "/c/parent/child"
       end
     end
diff --git a/spec/models/category_user_spec.rb b/spec/models/category_user_spec.rb
index d22098ab99..d4608f2f46 100644
--- a/spec/models/category_user_spec.rb
+++ b/spec/models/category_user_spec.rb
@@ -117,7 +117,6 @@ describe CategoryUser do
       expect(tu.notification_level).to eq TopicUser.notification_levels[:tracking]
     end
 
-
     it "unwatches categories that have been changed" do
       user = Fabricate(:user)
       watched_category = Fabricate(:category)
diff --git a/spec/models/color_scheme_spec.rb b/spec/models/color_scheme_spec.rb
index a19f86dcfe..329eaa81d2 100644
--- a/spec/models/color_scheme_spec.rb
+++ b/spec/models/color_scheme_spec.rb
@@ -2,10 +2,10 @@ require 'rails_helper'
 
 describe ColorScheme do
 
-  let(:valid_params) { {name: "Best Colors Evar", colors: valid_colors} }
+  let(:valid_params) { { name: "Best Colors Evar", colors: valid_colors } }
   let(:valid_colors) { [
-    {name: '$primary_background_color', hex: 'FFBB00'},
-    {name: '$secondary_background_color', hex: '888888'}
+    { name: '$primary_background_color', hex: 'FFBB00' },
+    { name: '$secondary_background_color', hex: '888888' }
   ]}
 
   it "correctly invalidates theme css when changed" do
@@ -35,22 +35,22 @@ describe ColorScheme do
   end
 
   describe "create_from_base" do
-    let(:base_colors) { {first_one: 'AAAAAA', second_one: '333333', third_one: 'BEEBEE'} }
+    let(:base_colors) { { first_one: 'AAAAAA', second_one: '333333', third_one: 'BEEBEE' } }
     let!(:base) { Fabricate(:color_scheme, name: 'Base', color_scheme_colors: [
                     Fabricate(:color_scheme_color, name: 'first_one',  hex: base_colors[:first_one]),
                     Fabricate(:color_scheme_color, name: 'second_one', hex: base_colors[:second_one]),
                     Fabricate(:color_scheme_color, name: 'third_one', hex: base_colors[:third_one])]) }
 
     before do
-       ColorScheme.stubs(:base).returns(base)
+      ColorScheme.stubs(:base).returns(base)
     end
 
     it "creates a new color scheme" do
-      c = described_class.create_from_base(name: 'Yellow', colors: {first_one: 'FFFF00', third_one: 'F00D33'})
+      c = described_class.create_from_base(name: 'Yellow', colors: { first_one: 'FFFF00', third_one: 'F00D33' })
       expect(c.colors.size).to eq base_colors.size
-      first  = c.colors.find {|x| x.name == 'first_one'}
-      second = c.colors.find {|x| x.name == 'second_one'}
-      third  = c.colors.find {|x| x.name == 'third_one'}
+      first  = c.colors.find { |x| x.name == 'first_one' }
+      second = c.colors.find { |x| x.name == 'second_one' }
+      third  = c.colors.find { |x| x.name == 'third_one' }
       expect(first.hex).to eq 'FFFF00'
       expect(second.hex).to eq base_colors[:second_one]
       expect(third.hex).to eq 'F00D33'
diff --git a/spec/models/developer_spec.rb b/spec/models/developer_spec.rb
index f980ef693d..6775c0ba51 100644
--- a/spec/models/developer_spec.rb
+++ b/spec/models/developer_spec.rb
@@ -17,4 +17,3 @@ describe Developer do
     expect(guardian.is_developer?).to eq(true)
   end
 end
-
diff --git a/spec/models/directory_item_spec.rb b/spec/models/directory_item_spec.rb
index 37131d1bf8..4f9b8d5cfb 100644
--- a/spec/models/directory_item_spec.rb
+++ b/spec/models/directory_item_spec.rb
@@ -18,18 +18,96 @@ describe DirectoryItem do
     end
   end
 
+  context 'inactive and silenced users' do
+    it 'removes silenced users correctly' do
+      post = create_post
+      DirectoryItem.refresh_period!(:daily)
+
+      count = DirectoryItem.where(user_id: post.user_id).count
+      expect(count).to eq(1)
+
+      post.user.update_columns(active: false)
+      DirectoryItem.refresh_period!(:daily)
+
+      count = DirectoryItem.where(user_id: post.user_id).count
+      expect(count).to eq(0)
+
+      post.user.update_columns(active: true)
+      DirectoryItem.refresh_period!(:daily)
+
+      count = DirectoryItem.where(user_id: post.user_id).count
+      expect(count).to eq(1)
+
+      post.user.update_columns(silenced_till: 1.year.from_now)
+      DirectoryItem.refresh_period!(:daily)
+
+      count = DirectoryItem.where(user_id: post.user_id).count
+      expect(count).to eq(0)
+
+    end
+  end
+
   context 'refresh' do
     before do
       UserActionCreator.enable
     end
 
-    let!(:post) { create_post }
+    it "creates the record for the user and handles likes" do
+      post = create_post
+      _post2 = create_post(topic_id: post.topic_id, user: post.user)
+
+      user2 = Fabricate(:user)
+
+      PostAction.act(user2, post, PostActionType.types[:like])
 
-    it "creates the record for the user" do
       DirectoryItem.refresh!
-      expect(DirectoryItem.where(period_type: DirectoryItem.period_types[:all])
-                          .where(user_id: post.user.id)
-                          .where(topic_count: 1).count).to eq(1)
+
+      item1 = DirectoryItem.find_by(period_type: DirectoryItem.period_types[:all], user_id: post.user_id)
+      item2 = DirectoryItem.find_by(period_type: DirectoryItem.period_types[:all], user_id: user2.id)
+
+      expect(item1.topic_count).to eq(1)
+      expect(item1.likes_received).to eq(1)
+      expect(item1.post_count).to eq(1)
+
+      expect(item2.likes_given).to eq(1)
+
+      post.topic.trash!
+
+      DirectoryItem.refresh!
+
+      item1 = DirectoryItem.find_by(period_type: DirectoryItem.period_types[:all], user_id: post.user_id)
+      item2 = DirectoryItem.find_by(period_type: DirectoryItem.period_types[:all], user_id: user2.id)
+
+      expect(item1.likes_given).to eq(0)
+      expect(item1.likes_received).to eq(0)
+      expect(item1.post_count).to eq(0)
+      expect(item1.topic_count).to eq(0)
+    end
+
+    it "handles users with no activity" do
+      post = nil
+
+      freeze_time(2.years.ago) do
+        post = create_post
+        # Create records for that activity
+        DirectoryItem.refresh!
+      end
+
+      DirectoryItem.refresh!
+      [:yearly, :monthly, :weekly, :daily, :quarterly].each do |period|
+        directory_item = DirectoryItem
+          .where(period_type: DirectoryItem.period_types[period])
+          .where(user_id: post.user.id)
+          .first
+        expect(directory_item.topic_count).to eq(0)
+        expect(directory_item.post_count).to eq(0)
+      end
+
+      directory_item = DirectoryItem
+        .where(period_type: DirectoryItem.period_types[:all])
+        .where(user_id: post.user.id)
+        .first
+      expect(directory_item.topic_count).to eq(1)
     end
 
   end
diff --git a/spec/models/discourse_single_sign_on_spec.rb b/spec/models/discourse_single_sign_on_spec.rb
index 4c26f04bbb..06c718d560 100644
--- a/spec/models/discourse_single_sign_on_spec.rb
+++ b/spec/models/discourse_single_sign_on_spec.rb
@@ -5,8 +5,8 @@ describe DiscourseSingleSignOn do
     @sso_url = "http://somesite.com/discourse_sso"
     @sso_secret = "shjkfdhsfkjh"
 
-    SiteSetting.enable_sso = true
     SiteSetting.sso_url = @sso_url
+    SiteSetting.enable_sso = true
     SiteSetting.sso_secret = @sso_secret
   end
 
@@ -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
@@ -127,9 +128,13 @@ describe DiscourseSingleSignOn do
     add_group1 = Fabricate(:group, name: 'group1')
     add_group2 = Fabricate(:group, name: 'group2')
     existing_group = Fabricate(:group, name: 'group3')
+    add_group4 = Fabricate(:group, name: 'GROUP4')
+    existing_group2 = Fabricate(:group, name: 'GRoup5')
 
-    existing_group.add(user)
-    existing_group.save!
+    [existing_group, existing_group2].each do |g|
+      g.add(user)
+      g.save!
+    end
 
     add_group1.add(user)
     existing_group.save!
@@ -140,24 +145,31 @@ describe DiscourseSingleSignOn do
     sso.email = user.email
     sso.external_id = "A"
 
-    sso.add_groups = "#{add_group1.name},#{add_group2.name},badname"
-    sso.remove_groups = "#{existing_group.name},badname"
+    sso.add_groups = "#{add_group1.name},#{add_group2.name.capitalize},group4,badname"
+    sso.remove_groups = "#{existing_group.name},#{existing_group2.name.downcase},badname"
 
     sso.lookup_or_create_user(ip_address)
 
     existing_group.reload
     expect(existing_group.usernames).to eq("")
 
+    existing_group2.reload
+    expect(existing_group2.usernames).to eq("")
+
     add_group1.reload
     expect(add_group1.usernames).to eq(user.username)
 
     add_group2.reload
     expect(add_group2.usernames).to eq(user.username)
+
+    add_group4.reload
+    expect(add_group4.usernames).to eq(user.username)
   end
 
   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 +245,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)
@@ -253,8 +266,26 @@ describe DiscourseSingleSignOn do
       expect(user.active).to eq(false)
     end
 
+    it 'does not deactivate user if email provided is capitalized' do
+      SiteSetting.email_editable = false
+      SiteSetting.sso_overrides_email = true
+      sso.require_activation = true
+
+      user = sso.lookup_or_create_user(ip_address)
+      expect(user.active).to eq(false)
+
+      user.update_columns(active: true)
+      user = sso.lookup_or_create_user(ip_address)
+      expect(user.active).to eq(true)
+
+      sso.email = "Test@example.com"
+      user = sso.lookup_or_create_user(ip_address)
+      expect(user.active).to eq(true)
+    end
+
     it 'deactivates accounts that have updated email address' do
 
+      SiteSetting.email_editable = false
       SiteSetting.sso_overrides_email = true
       sso.require_activation = true
 
@@ -267,7 +298,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 +358,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,81 +381,77 @@ 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>")
 
-
       # yes override if site setting
       sso.bio = "new profile 2"
       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/draft_sequence_spec.rb b/spec/models/draft_sequence_spec.rb
index 8fe559a77d..fa74a70400 100644
--- a/spec/models/draft_sequence_spec.rb
+++ b/spec/models/draft_sequence_spec.rb
@@ -1,14 +1,21 @@
 require 'rails_helper'
 
 describe DraftSequence do
+  let(:user) { Fabricate(:user) }
+
   it 'should produce next sequence for a key' do
-    u = Fabricate(:user)
-    expect(DraftSequence.next!(u, 'test')).to eq 1
-    expect(DraftSequence.next!(u, 'test')).to eq 2
+    expect(DraftSequence.next!(user, 'test')).to eq 1
+    expect(DraftSequence.next!(user, 'test')).to eq 2
   end
 
-  it 'should return 0 by default' do
-    u = Fabricate(:user)
-    expect(DraftSequence.current(u, 'test')).to eq 0
+  describe '.current' do
+    it 'should return 0 by default' do
+      expect(DraftSequence.current(user, 'test')).to eq 0
+    end
+
+    it 'should return the right sequence' do
+      expect(DraftSequence.next!(user, 'test')).to eq(1)
+      expect(DraftSequence.current(user, 'test')).to eq(1)
+    end
   end
 end
diff --git a/spec/models/draft_spec.rb b/spec/models/draft_spec.rb
index 96782b28b4..06ddf3d86e 100644
--- a/spec/models/draft_spec.rb
+++ b/spec/models/draft_spec.rb
@@ -10,7 +10,7 @@ describe Draft do
   end
 
   it "uses the user id and key correctly" do
-    Draft.set(@user, "test", 0,"data")
+    Draft.set(@user, "test", 0, "data")
     expect(Draft.get(Fabricate.build(:coding_horror), "test", 0)).to eq nil
   end
 
@@ -38,19 +38,19 @@ describe Draft do
     user = Fabricate(:user)
     key = Draft::NEW_TOPIC
 
-    Draft.set(user,key,0,'draft')
+    Draft.set(user, key, 0, 'draft')
     Draft.cleanup!
     expect(Draft.count).to eq 1
 
     seq = DraftSequence.next!(user, key)
 
-    Draft.set(user,key,seq,'draft')
+    Draft.set(user, key, seq, 'draft')
     DraftSequence.update_all('sequence = sequence + 1')
 
     Draft.cleanup!
 
     expect(Draft.count).to eq 0
-    Draft.set(Fabricate(:user), Draft::NEW_TOPIC, seq+1, 'draft')
+    Draft.set(Fabricate(:user), Draft::NEW_TOPIC, seq + 1, 'draft')
 
     Draft.cleanup!
 
@@ -64,7 +64,6 @@ describe Draft do
     expect(Draft.count).to eq 0
   end
 
-
   context 'key expiry' do
     it 'nukes new topic draft after a topic is created' do
       u = Fabricate(:user)
@@ -95,7 +94,7 @@ describe Draft do
       user = Fabricate(:user)
       topic = Fabricate(:topic)
       p = PostCreator.new(user, raw: Fabricate.build(:post).raw, topic_id: topic.id).create
-      Draft.set(p.user, p.topic.draft_key, 0,'hello')
+      Draft.set(p.user, p.topic.draft_key, 0, 'hello')
 
       PostCreator.new(user, raw: Fabricate.build(:post).raw).create
       expect(Draft.get(p.user, p.topic.draft_key, DraftSequence.current(p.user, p.topic.draft_key))).to eq nil
@@ -103,8 +102,8 @@ describe Draft do
 
     it 'nukes the post draft when a post is revised' do
       p = Fabricate(:post)
-      Draft.set(p.user, p.topic.draft_key, 0,'hello')
-      p.revise(p.user, { raw: 'another test' })
+      Draft.set(p.user, p.topic.draft_key, 0, 'hello')
+      p.revise(p.user, raw: 'another test')
       s = DraftSequence.current(p.user, p.topic.draft_key)
       expect(Draft.get(p.user, p.topic.draft_key, s)).to eq nil
     end
diff --git a/spec/models/email_log_spec.rb b/spec/models/email_log_spec.rb
index 8717f958d3..a59c70f13f 100644
--- a/spec/models/email_log_spec.rb
+++ b/spec/models/email_log_spec.rb
@@ -16,7 +16,6 @@ describe EmailLog do
       # skipped emails do not matter
       Fabricate(:email_log, user: user, email_type: 'blah', post_id: post.id, to_address: user.email, user_id: user.id, skipped: true)
 
-
       ran = EmailLog.unique_email_per_post(post, user) do
         true
       end
diff --git a/spec/models/email_token_spec.rb b/spec/models/email_token_spec.rb
index edbfff853c..f13f19616d 100644
--- a/spec/models/email_token_spec.rb
+++ b/spec/models/email_token_spec.rb
@@ -6,7 +6,6 @@ describe EmailToken do
   it { is_expected.to validate_presence_of :email }
   it { is_expected.to belong_to :user }
 
-
   context '#create' do
     let(:user) { Fabricate(:user, active: false) }
     let!(:original_token) { user.email_tokens.first }
diff --git a/spec/models/embeddable_host_spec.rb b/spec/models/embeddable_host_spec.rb
index 700478871c..4d3f5fc926 100644
--- a/spec/models/embeddable_host_spec.rb
+++ b/spec/models/embeddable_host_spec.rb
@@ -78,6 +78,10 @@ describe EmbeddableHost do
       expect(EmbeddableHost.url_allowed?('http://eviltrout.com')).to eq(true)
       expect(EmbeddableHost.url_allowed?('http://discourse.org')).to eq(true)
     end
+
+    it 'always allow forum own URL' do
+      expect(EmbeddableHost.url_allowed?(Discourse.base_url)).to eq(true)
+    end
   end
 
   describe "path_whitelist" do
@@ -99,6 +103,22 @@ describe EmbeddableHost do
       expect(EmbeddableHost.url_allowed?('http://eviltrout.com/rick/smith')).to eq(true)
       expect(EmbeddableHost.url_allowed?('http://eviltrout.com/morty/sanchez')).to eq(true)
     end
+
+    it "works with non-english paths" do
+      Fabricate(:embeddable_host, path_whitelist: '/انگلیسی/.*')
+      Fabricate(:embeddable_host, path_whitelist: '/definição/.*')
+      expect(EmbeddableHost.url_allowed?('http://eviltrout.com/انگلیسی/foo')).to eq(true)
+      expect(EmbeddableHost.url_allowed?('http://eviltrout.com/definição/foo')).to eq(true)
+      expect(EmbeddableHost.url_allowed?('http://eviltrout.com/bar/foo')).to eq(false)
+    end
+
+    it "works with URL encoded paths" do
+      Fabricate(:embeddable_host, path_whitelist: '/definição/.*')
+      Fabricate(:embeddable_host, path_whitelist: '/ingl%C3%A9s/.*')
+
+      expect(EmbeddableHost.url_allowed?('http://eviltrout.com/defini%C3%A7%C3%A3o/foo')).to eq(true)
+      expect(EmbeddableHost.url_allowed?('http://eviltrout.com/inglés/foo')).to eq(true)
+    end
   end
 
 end
diff --git a/spec/models/emoji_spec.rb b/spec/models/emoji_spec.rb
index 40c214b40a..d1b7430f76 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 b3a8636776..0216c30b04 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/global_setting_spec.rb b/spec/models/global_setting_spec.rb
index bc1ea0303f..e3fd9a9f51 100644
--- a/spec/models/global_setting_spec.rb
+++ b/spec/models/global_setting_spec.rb
@@ -9,6 +9,21 @@ end
 
 describe GlobalSetting do
 
+  describe '.use_s3_assets?' do
+    it 'returns false by default' do
+      expect(GlobalSetting.use_s3?).to eq(false)
+    end
+
+    it 'returns true once set' do
+      global_setting :s3_bucket, 'test_bucket'
+      global_setting :s3_region, 'ap-australia'
+      global_setting :s3_access_key_id, '123'
+      global_setting :s3_secret_access_key, '123'
+
+      expect(GlobalSetting.use_s3?).to eq(true)
+    end
+  end
+
   describe '.safe_secret_key_base' do
     it 'sets redis token if it is somehow flushed after 30 seconds' do
 
@@ -35,6 +50,20 @@ describe GlobalSetting do
     end
   end
 
+  describe '.add_default' do
+    after do
+      class <<GlobalSetting; remove_method :foo_bar_foo; end
+    end
+
+    it "can correctly add defaults" do
+      GlobalSetting.add_default "foo_bar_foo", 1
+      expect(GlobalSetting.foo_bar_foo).to eq(1)
+
+      GlobalSetting.add_default "cdn_url", "a"
+      expect(GlobalSetting.foo_bar_foo).not_to eq("a")
+    end
+  end
+
   describe '.redis_config' do
     describe 'when slave config is not present' do
       it "should not set any connector" do
@@ -85,13 +114,13 @@ describe GlobalSetting::FileProvider do
 
     provider = GlobalSetting::FileProvider.from(f.path)
 
-    expect(provider.lookup(:a,"")).to eq 1000
-    expect(provider.lookup(:b,"")).to eq "10 # = 00"
-    expect(provider.lookup(:c,"")).to eq "10 # = 00"
-    expect(provider.lookup(:d,"bob")).to eq nil
-    expect(provider.lookup(:e,"bob")).to eq "bob"
-    expect(provider.lookup(:f,"bob")).to eq "bob"
-    expect(provider.lookup(:a1,"")).to eq 1
+    expect(provider.lookup(:a, "")).to eq 1000
+    expect(provider.lookup(:b, "")).to eq "10 # = 00"
+    expect(provider.lookup(:c, "")).to eq "10 # = 00"
+    expect(provider.lookup(:d, "bob")).to eq nil
+    expect(provider.lookup(:e, "bob")).to eq "bob"
+    expect(provider.lookup(:f, "bob")).to eq "bob"
+    expect(provider.lookup(:a1, "")).to eq 1
 
     expect(provider.keys.sort).to eq [:a, :a1, :b, :c, :d]
 
@@ -105,7 +134,7 @@ describe GlobalSetting::FileProvider do
 
     provider = GlobalSetting::FileProvider.from(f.path)
 
-    expect(provider.lookup(:a,"")).to eq 500
+    expect(provider.lookup(:a, "")).to eq 500
 
     f.unlink
   end
diff --git a/spec/models/group_history_spec.rb b/spec/models/group_history_spec.rb
index 2b287de434..baa0e43f30 100644
--- a/spec/models/group_history_spec.rb
+++ b/spec/models/group_history_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe GroupHistory do
 
       expect(described_class.with_filters(
         group_history.group,
-        { :action => GroupHistory.actions[3]}
+        action: GroupHistory.actions[3]
       )).to eq([other_group_history])
     end
 
@@ -39,7 +39,7 @@ RSpec.describe GroupHistory do
       other_group_history.update_attributes!(subject: "test")
 
       expect(described_class.with_filters(group_history.group,
-        :action => GroupHistory.actions[3], subject: 'test'
+        action: GroupHistory.actions[3], subject: 'test'
       )).to eq([other_group_history])
     end
 
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 0dc2f60ec8..e8a8427e32 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -3,6 +3,7 @@ require 'rails_helper'
 describe Group do
   let(:admin) { Fabricate(:admin) }
   let(:user) { Fabricate(:user) }
+  let(:group) { Fabricate(:group) }
 
   describe '#builtin' do
     context "verify enum sequence" do
@@ -46,6 +47,13 @@ describe Group do
       expect(group.valid?).to eq false
     end
 
+    it 'strips trailing and leading spaces' do
+      group.name = '  dragon  '
+
+      expect(group.save).to eq(true)
+      expect(group.reload.name).to eq('dragon')
+    end
+
     it "is invalid for case-insensitive existing names" do
       build(:group, name: 'this_is_a_name').save
       group.name = 'This_Is_A_Name'
@@ -76,18 +84,54 @@ describe Group do
       group.incoming_email = "foo@bar.org"
       expect(group.valid?).to eq(true)
     end
+
+    context 'when a group has no owners' do
+      describe 'group has not been persisted' do
+        it 'should not allow membership requests' do
+          group = Fabricate.build(:group, allow_membership_requests: true)
+
+          expect(group.valid?).to eq(false)
+
+          expect(group.errors.full_messages).to include(I18n.t(
+            "groups.errors.cant_allow_membership_requests"
+          ))
+
+          group.group_users.build(user_id: user.id, owner: true)
+
+          expect(group.valid?).to eq(true)
+        end
+      end
+
+      it 'should not allow membership requests' do
+        group.allow_membership_requests = true
+
+        expect(group.valid?).to eq(false)
+
+        expect(group.errors.full_messages).to include(I18n.t(
+          "groups.errors.cant_allow_membership_requests"
+        ))
+
+        group.allow_membership_requests = false
+        group.save!
+
+        group.add_owner(user)
+        group.allow_membership_requests = true
+
+        expect(group.valid?).to eq(true)
+      end
+    end
   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
@@ -159,7 +203,37 @@ 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 "ensures that the moderators group is messageable by all" do
+      group = Group.find(Group::AUTO_GROUPS[:moderators])
+      group.update!(messageable_level: Group::ALIAS_LEVELS[:nobody])
+      Group.refresh_automatic_group!(:moderators)
+
+      expect(group.reload.messageable_level).to eq(Group::ALIAS_LEVELS[:everyone])
+    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 "does not reset the localized name" do
@@ -243,7 +317,7 @@ describe Group do
 
     expect(real_admins).to eq [admin.id]
     expect(real_moderators).to eq [moderator.id]
-    expect(real_staff.sort).to eq [moderator.id,admin.id].sort
+    expect(real_staff.sort).to eq [moderator.id, admin.id].sort
 
     admin.admin = false
     admin.save
@@ -286,11 +360,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,23 +375,23 @@ describe Group do
     groups = Group.includes(:users).to_a
     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
+    g = groups.find { |grp| grp.id == Group::AUTO_GROUPS[:admins] }
+    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
+    g = groups.find { |grp| grp.id == Group::AUTO_GROUPS[:staff] }
+    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]}
+    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]}
+    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
 
@@ -356,7 +430,6 @@ describe Group do
     expect(GroupUser.where(group_id: g.id).count).to eq 0
   end
 
-
   it "has custom fields" do
     group = Fabricate(:group)
     expect(group.custom_fields["a"]).to be_nil
@@ -366,7 +439,7 @@ describe Group do
     group.save
 
     group = Group.find(group.id)
-    expect(group.custom_fields).to eq({"hugh" => "jackman", "jack" => "black"})
+    expect(group.custom_fields).to eq("hugh" => "jackman", "jack" => "black")
   end
 
   it "allows you to lookup a new group by name" do
@@ -376,14 +449,14 @@ describe Group do
   end
 
   it "can find desired groups correctly" do
-    expect(Group.desired_trust_level_groups(2).sort).to eq [10,11,12]
+    expect(Group.desired_trust_level_groups(2).sort).to eq [10, 11, 12]
   end
 
   it "correctly handles trust level changes" do
     user = Fabricate(:user, trust_level: 2)
     Group.user_trust_level_change!(user.id, 2)
 
-    expect(user.groups.map(&:name).sort).to eq ["trust_level_0","trust_level_1", "trust_level_2"]
+    expect(user.groups.map(&:name).sort).to eq ["trust_level_0", "trust_level_1", "trust_level_2"]
 
     Group.user_trust_level_change!(user.id, 0)
     user.reload
@@ -391,7 +464,7 @@ describe Group do
   end
 
   context "group management" do
-    let(:group) {Fabricate(:group)}
+    let(:group) { Fabricate(:group) }
 
     it "by default has no managers" do
       expect(group.group_users.where('group_users.owner')).to be_empty
@@ -425,6 +498,40 @@ describe Group do
     expect(u3.reload.trust_level).to eq(3)
   end
 
+  it "adjusts the user trust level" do
+    g0 = Fabricate(:group, grant_trust_level: 2)
+    g1 = Fabricate(:group, grant_trust_level: 3)
+    g2 = Fabricate(:group)
+
+    user = Fabricate(:user, trust_level: 0)
+
+    # Add a group without one to consider `NULL` check
+    g2.add(user)
+    expect(user.group_locked_trust_level).to be_nil
+    expect(user.manual_locked_trust_level).to be_nil
+
+    g0.add(user)
+    expect(user.reload.trust_level).to eq(2)
+    expect(user.group_locked_trust_level).to eq(2)
+    expect(user.manual_locked_trust_level).to be_nil
+
+    g1.add(user)
+    expect(user.reload.trust_level).to eq(3)
+    expect(user.group_locked_trust_level).to eq(3)
+    expect(user.manual_locked_trust_level).to be_nil
+
+    g1.remove(user)
+    expect(user.reload.trust_level).to eq(2)
+    expect(user.group_locked_trust_level).to eq(2)
+    expect(user.manual_locked_trust_level).to be_nil
+
+    g0.remove(user)
+    user.reload
+    expect(user.manual_locked_trust_level).to be_nil
+    expect(user.group_locked_trust_level).to be_nil
+    expect(user.trust_level).to eq(0)
+  end
+
   it 'should cook the bio' do
     group = Fabricate(:group)
     group.update_attributes!(bio_raw: 'This is a group for :unicorn: lovers')
@@ -433,43 +540,126 @@ 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)
+    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
+
+  end
+
+  describe '#add' do
+    context 'when adding a user into a public group' do
+      let(:category) { Fabricate(:category) }
+
+      it "should publish the group's categories to the client" do
+        group.update!(public_admission: true, categories: [category])
+
+        message = MessageBus.track_publish { group.add(user) }.first
+
+        expect(message.data[:categories].count).to eq(1)
+        expect(message.data[:categories].first[:id]).to eq(category.id)
+        expect(message.user_ids).to eq([user.id])
       end
-    end
 
-    describe 'when user is owner of a group' do
-      it 'should return the right groups' do
-        group.add_owner(user)
+      describe "when group belongs to more than #{Group::PUBLISH_CATEGORIES_LIMIT} categories" do
+        it "should publish a message to refresh the user's client" do
+          (Group::PUBLISH_CATEGORIES_LIMIT + 1).times do
+            group.categories << Fabricate(:category)
+          end
 
-        expect(Group.visible_groups(user).pluck(:id).sort)
-          .to eq([group.id, group_2.id])
-      end
-    end
+          message = MessageBus.track_publish { group.add(user) }.first
 
-    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])
+          expect(message.data).to eq('clobber')
+          expect(message.channel).to eq('/refresh_client')
+          expect(message.user_ids).to eq([user.id])
+        end
       end
     end
   end
+
+  describe '.search_groups' do
+    let(:group) { Fabricate(:group, name: 'tEsT_more_things', full_name: 'Abc something awesome') }
+
+    it 'should return the right groups' do
+      group
+
+      expect(Group.search_groups('te')).to eq([group])
+      expect(Group.search_groups('TE')).to eq([group])
+      expect(Group.search_groups('es')).to eq([group])
+      expect(Group.search_groups('ES')).to eq([group])
+      expect(Group.search_groups('ngs')).to eq([group])
+      expect(Group.search_groups('sOmEthi')).to eq([group])
+      expect(Group.search_groups('abc')).to eq([group])
+      expect(Group.search_groups('sOmEthi')).to eq([group])
+      expect(Group.search_groups('test2')).to eq([])
+    end
+  end
+
+  describe '#bulk_add' do
+    it 'should be able to add multiple users' do
+      group.bulk_add([user.id, admin.id])
+
+      expect(group.group_users.map(&:user_id)).to contain_exactly(user.id, admin.id)
+    end
+  end
+
+  it "Correctly updates has_messages" do
+    group = Fabricate(:group, has_messages: true)
+    topic = Fabricate(:private_message_topic)
+
+    # when group message is not present
+    Group.refresh_has_messages!
+    group.reload
+    expect(group.has_messages?).to eq false
+
+    # when group message is present
+    group.update!(has_messages: true)
+    TopicAllowedGroup.create!(topic_id: topic.id, group_id: group.id)
+    Group.refresh_has_messages!
+    group.reload
+    expect(group.has_messages?).to eq true
+  end
 end
diff --git a/spec/models/incoming_links_report_spec.rb b/spec/models/incoming_links_report_spec.rb
index 1ed432f745..2ce2398fc7 100644
--- a/spec/models/incoming_links_report_spec.rb
+++ b/spec/models/incoming_links_report_spec.rb
@@ -40,20 +40,20 @@ describe IncomingLinksReport do
 
       r = IncomingLinksReport.find('top_referrers').as_json
       expect(r[:data]).to eq [
-        {username: p1.user.username, user_id: p1.user.id, num_clicks: 7 + 2, num_topics: 2},
-        {username: p2.user.username, user_id: p2.user.id, num_clicks: 3, num_topics: 1}
+        { username: p1.user.username, user_id: p1.user.id, num_clicks: 7 + 2, num_topics: 2 },
+        { username: p2.user.username, user_id: p2.user.id, num_clicks: 3, num_topics: 1 }
       ]
 
       r = IncomingLinksReport.find('top_traffic_sources').as_json
       expect(r[:data]).to eq [
-        {domain: 'test.com', num_clicks: 7, num_topics: 1},
-        {domain: 'foo.com', num_clicks: 3 + 2, num_topics: 1}
+        { domain: 'test.com', num_clicks: 7, num_topics: 1 },
+        { domain: 'foo.com', num_clicks: 3 + 2, num_topics: 1 }
       ]
 
       r = IncomingLinksReport.find('top_referred_topics').as_json
       expect(r[:data]).to eq [
-        {topic_id: p1.topic.id, topic_title: p1.topic.title, topic_slug: p1.topic.slug, num_clicks: 7},
-        {topic_id: p2.topic.id, topic_title: p2.topic.title, topic_slug: p2.topic.slug, num_clicks: 2 + 3},
+        { topic_id: p1.topic.id, topic_title: p1.topic.title, topic_slug: p1.topic.slug, num_clicks: 7 },
+        { topic_id: p2.topic.id, topic_title: p2.topic.title, topic_slug: p2.topic.slug, num_clicks: 2 + 3 },
       ]
     end
   end
@@ -98,8 +98,8 @@ describe IncomingLinksReport do
         Fabricate(:incoming_link, user: bob, post: post1).save
       end
 
-      expect(top_referrers[:data][0]).to eq({username: 'amy', user_id: amy.id, num_clicks: 3, num_topics: 2})
-      expect(top_referrers[:data][1]).to eq({username: 'bob', user_id: bob.id, num_clicks: 2, num_topics: 1})
+      expect(top_referrers[:data][0]).to eq(username: 'amy', user_id: amy.id, num_clicks: 3, num_topics: 2)
+      expect(top_referrers[:data][1]).to eq(username: 'bob', user_id: bob.id, num_clicks: 2, num_topics: 1)
     end
   end
 
@@ -129,10 +129,10 @@ describe IncomingLinksReport do
     end
 
     it 'with some IncomingLink records, it returns correct data' do
-      IncomingLinksReport.stubs(:link_count_per_domain).returns({'twitter.com' => 8, 'facebook.com' => 3})
-      IncomingLinksReport.stubs(:topic_count_per_domain).returns({'twitter.com' => 2, 'facebook.com' => 3})
-      expect(top_traffic_sources[:data][0]).to eq({domain: 'twitter.com', num_clicks: 8, num_topics: 2})
-      expect(top_traffic_sources[:data][1]).to eq({domain: 'facebook.com', num_clicks: 3, num_topics: 3})
+      IncomingLinksReport.stubs(:link_count_per_domain).returns('twitter.com' => 8, 'facebook.com' => 3)
+      IncomingLinksReport.stubs(:topic_count_per_domain).returns('twitter.com' => 2, 'facebook.com' => 3)
+      expect(top_traffic_sources[:data][0]).to eq(domain: 'twitter.com', num_clicks: 8, num_topics: 2)
+      expect(top_traffic_sources[:data][1]).to eq(domain: 'facebook.com', num_clicks: 3, num_topics: 3)
     end
   end
 
@@ -160,11 +160,11 @@ describe IncomingLinksReport do
     it 'with some IncomingLink records, it returns correct data' do
       topic1 = Fabricate.build(:topic, id: 123); topic2 = Fabricate.build(:topic, id: 234)
       # TODO: OMG OMG THE STUBBING
-      IncomingLinksReport.stubs(:link_count_per_topic).returns({topic1.id => 8, topic2.id => 3})
+      IncomingLinksReport.stubs(:link_count_per_topic).returns(topic1.id => 8, topic2.id => 3)
       Topic.stubs(:select).returns(Topic); Topic.stubs(:where).returns(Topic) # bypass some activerecord methods
       Topic.stubs(:all).returns([topic1, topic2])
-      expect(top_referred_topics[:data][0]).to eq({topic_id: topic1.id, topic_title: topic1.title, topic_slug: topic1.slug, num_clicks: 8 })
-      expect(top_referred_topics[:data][1]).to eq({topic_id: topic2.id, topic_title: topic2.title, topic_slug: topic2.slug, num_clicks: 3 })
+      expect(top_referred_topics[:data][0]).to eq(topic_id: topic1.id, topic_title: topic1.title, topic_slug: topic1.slug, num_clicks: 8)
+      expect(top_referred_topics[:data][1]).to eq(topic_id: topic2.id, topic_title: topic2.title, topic_slug: topic2.slug, num_clicks: 3)
     end
   end
 
diff --git a/spec/models/invite_redeemer_spec.rb b/spec/models/invite_redeemer_spec.rb
index d1d93fda6b..49b800daa2 100644
--- a/spec/models/invite_redeemer_spec.rb
+++ b/spec/models/invite_redeemer_spec.rb
@@ -36,7 +36,7 @@ describe InviteRedeemer do
     let(:invite) { Fabricate(:invite) }
     let(:name) { 'john snow' }
     let(:username) { 'kingofthenorth' }
-    let(:password) { 'know5nOthiNG'}
+    let(:password) { 'know5nOthiNG' }
     let(:invite_redeemer) { InviteRedeemer.new(invite, username, name) }
 
     it "should redeem the invite if invited by staff" do
@@ -93,5 +93,28 @@ 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
+
+    it "adds user to group" do
+      group = Fabricate(:group, grant_trust_level: 2)
+      InvitedGroup.create(group_id: group.id, invite_id: invite.id)
+      user = InviteRedeemer.new(invite, username, name, password).redeem
+
+      expect(user.group_users.count).to eq(4)
+      expect(user.trust_level).to eq(2)
+    end
   end
 end
diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb
index 9653a73567..552a953194 100644
--- a/spec/models/invite_spec.rb
+++ b/spec/models/invite_spec.rb
@@ -155,6 +155,13 @@ describe Invite do
         expect(@invite.groups).to eq([group])
       end
     end
+
+    it 'verifies that inviter is authorized to invite user to a topic' do
+      tl2_user = Fabricate(:user, trust_level: 2)
+
+      invite = group_private_topic.invite_by_email(tl2_user, 'foo@bar.com')
+      expect(invite.groups.count).to eq(0)
+    end
   end
 
   context 'an existing user' do
@@ -246,7 +253,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
@@ -254,7 +261,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
@@ -283,7 +290,6 @@ describe Invite do
           expect(invite).to be_redeemed
         end
 
-
         context 'again' do
           context "without a passthrough" do
             before do
@@ -394,8 +400,10 @@ describe Invite do
 
       invites = Invite.find_pending_invites_from(inviter)
 
-      expect(invites.size).to eq(1)
+      expect(invites.length).to eq(1)
       expect(invites.first).to eq pending_invite
+
+      expect(Invite.find_pending_invites_count(inviter)).to eq(1)
     end
   end
 
@@ -418,8 +426,10 @@ describe Invite do
 
       invites = Invite.find_redeemed_invites_from(inviter)
 
-      expect(invites.size).to eq(1)
+      expect(invites.length).to eq(1)
       expect(invites.first).to eq redeemed_invite
+
+      expect(Invite.find_redeemed_invites_count(inviter)).to eq(1)
     end
   end
 
@@ -466,23 +476,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/locale_site_setting_spec.rb b/spec/models/locale_site_setting_spec.rb
index 6a19cb7d8d..ef81765dc0 100644
--- a/spec/models/locale_site_setting_spec.rb
+++ b/spec/models/locale_site_setting_spec.rb
@@ -14,7 +14,7 @@ describe LocaleSiteSetting do
 
   describe 'values' do
     it 'returns all the locales that we have translations for' do
-      expect(LocaleSiteSetting.values.map {|x| x[:value]}.sort).to eq(Dir.glob( File.join(Rails.root, 'config', 'locales', 'client.*.yml') ).map {|x| x.split('.')[-2]}.sort)
+      expect(LocaleSiteSetting.values.map { |x| x[:value] }).to include(*Dir.glob(File.join(Rails.root, 'config', 'locales', 'client.*.yml')).map { |x| x.split('.')[-2] })
     end
   end
 
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 1c39367f6d..34af1be343 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -30,7 +30,7 @@ describe Notification do
   describe 'post' do
     let(:topic) { Fabricate(:topic) }
     let(:post_args) do
-      {user: topic.user, topic: topic}
+      { user: topic.user, topic: topic }
     end
 
     let(:coding_horror) { Fabricate(:coding_horror) }
@@ -127,7 +127,6 @@ describe Notification do
     end
 
     context 'destroy' do
-
       let!(:notification) { Fabricate(:notification) }
 
       it 'updates the notification count on destroy' do
@@ -138,12 +137,11 @@ describe Notification do
     end
   end
 
-
   describe 'private message' do
     before do
       @topic = Fabricate(:private_message_topic)
       @post = Fabricate(:post, topic: @topic, user: @topic.user)
-      @target = @post.topic.topic_allowed_users.reject{|a| a.user_id == @post.user_id}[0].user
+      @target = @post.topic.topic_allowed_users.reject { |a| a.user_id == @post.user_id }[0].user
 
       TopicUser.change(@target.id, @topic.id, notification_level: TopicUser.notification_levels[:watching])
 
@@ -200,12 +198,11 @@ describe Notification do
                            notification_type: Notification.types[:private_message])
 
       other = Notification.create!(read: false,
-                           user_id: user.id,
-                           topic_id: t.id,
-                           post_number: 1,
-                           data: '{}',
-                           notification_type: Notification.types[:mentioned])
-
+                                   user_id: user.id,
+                                   topic_id: t.id,
+                                   post_number: 1,
+                                   data: '{}',
+                                   notification_type: Notification.types[:mentioned])
 
       user.saw_notification_id(other.id)
       user.reload
@@ -225,11 +222,10 @@ describe Notification do
       end
       Notification.create!(read: true, user_id: user.id, topic_id: 2, post_number: 4, data: '{}', notification_type: 1)
 
-      expect { Notification.mark_posts_read(user,2,[1,2,3,4]) }.to change { Notification.where(read: true).count }.by(3)
+      expect { Notification.mark_posts_read(user, 2, [1, 2, 3, 4]) }.to change { Notification.where(read: true).count }.by(3)
     end
   end
 
-
   describe 'ensure consistency' do
     it 'deletes notifications if post is missing or deleted' do
 
@@ -259,8 +255,8 @@ end
 # pulling this out cause I don't want an observer
 describe Notification do
   describe '#recent_report' do
-    let(:user){ Fabricate(:user) }
-    let(:post){ Fabricate(:post) }
+    let(:user) { Fabricate(:user) }
+    let(:post) { Fabricate(:post) }
 
     def fab(type, read)
       @i ||= 0
@@ -297,7 +293,7 @@ describe Notification do
       # bumps unread pms to front of list
 
       notifications = Notification.recent_report(user, 3)
-      expect(notifications.map{|n| n.id}).to eq([a.id, d.id, c.id])
+      expect(notifications.map { |n| n.id }).to eq([a.id, d.id, c.id])
 
     end
   end
diff --git a/spec/models/plugin_store_spec.rb b/spec/models/plugin_store_spec.rb
index 9c236a0436..27966c1724 100644
--- a/spec/models/plugin_store_spec.rb
+++ b/spec/models/plugin_store_spec.rb
@@ -2,16 +2,21 @@ require "rails_helper"
 require_dependency "plugin_store"
 
 describe PluginStore do
-  def set(k,v)
+  let(:store) { PluginStore.new("my_plugin_2") }
+
+  def set(k, v)
     PluginStore.set("my_plugin", k, v)
+    store.set(k, v)
   end
 
   def get(k)
-    PluginStore.get("my_plugin", k)
+    value = PluginStore.get("my_plugin", k)
+    value == store.get(k) ? value : "values mismatch"
   end
 
   def remove_row(k)
     PluginStore.remove("my_plugin", k)
+    store.remove(k)
   end
 
   it "sets strings correctly" do
@@ -38,10 +43,9 @@ describe PluginStore do
     expect(get("hello")).to eq(nil)
   end
 
-
   it "handles hashes correctly" do
 
-    val = {"hi" => "there", "1" => 1}
+    val = { "hi" => "there", "1" => 1 }
     set("hello", val)
     result = get("hello")
 
@@ -53,7 +57,7 @@ describe PluginStore do
 
   it "handles nested hashes correctly" do
 
-    val = {"hi" => "there", "nested" => {"a" => "b", "with list" => ["a", "b", 3] }}
+    val = { "hi" => "there", "nested" => { "a" => "b", "with list" => ["a", "b", 3] } }
     set("hello", val)
     result = get("hello")
 
@@ -67,7 +71,7 @@ describe PluginStore do
 
   it "handles arrays correctly" do
 
-    val = ["a", "b", {"hash"=> "inside", "c"=> 1}]
+    val = ["a", "b", { "hash" => "inside", "c" => 1 }]
     set("hello", val)
     result = get("hello")
 
diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb
index 9e30886a39..9c742835df 100644
--- a/spec/models/post_action_spec.rb
+++ b/spec/models/post_action_spec.rb
@@ -20,7 +20,7 @@ describe PostAction do
 
     it "limits redo/undo" do
 
-      RateLimiter.stubs(:disabled?).returns(false)
+      RateLimiter.enable
 
       PostAction.act(eviltrout, post, PostActionType.types[:like])
       PostAction.remove_act(eviltrout, post, PostActionType.types[:like])
@@ -50,9 +50,9 @@ describe PostAction do
       action = PostAction.act(codinghorror, post, PostActionType.types[:notify_moderators], message: "this is my special long message")
 
       posts = Post.joins(:topic)
-                  .select('posts.id, topics.subtype, posts.topic_id')
-                  .where('topics.archetype' => Archetype.private_message)
-                  .to_a
+        .select('posts.id, topics.subtype, posts.topic_id')
+        .where('topics.archetype' => Archetype.private_message)
+        .to_a
 
       expect(posts.count).to eq(1)
       expect(action.related_post_id).to eq(posts[0].id.to_i)
@@ -61,7 +61,7 @@ describe PostAction do
       topic = posts[0].topic
 
       # Moderators should be invited to the private topic, otherwise they're not permitted to see it
-      topic_user_ids = topic.topic_users(true).map {|x| x.user_id}
+      topic_user_ids = topic.reload.topic_users.map { |x| x.user_id }
       expect(topic_user_ids).to include(codinghorror.id)
       expect(topic_user_ids).to include(mod.id)
 
@@ -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])
@@ -380,7 +379,7 @@ describe PostAction do
       expect(post.hidden_reason_id).to eq(Post.hidden_reasons[:flag_threshold_reached])
       expect(post.topic.visible).to eq(false)
 
-      post.revise(post.user, { raw: post.raw + " ha I edited it " })
+      post.revise(post.user, raw: post.raw + " ha I edited it ")
 
       post.reload
 
@@ -399,7 +398,7 @@ describe PostAction do
       expect(post.hidden_reason_id).to eq(Post.hidden_reasons[:flag_threshold_reached_again])
       expect(post.topic.visible).to eq(false)
 
-      post.revise(post.user, { raw: post.raw + " ha I edited it again " })
+      post.revise(post.user, raw: post.raw + " ha I edited it again ")
 
       post.reload
 
@@ -427,13 +426,13 @@ describe PostAction do
     it "can flag the topic instead of a post" do
       post1 = create_post
       _post2 = create_post(topic: post1.topic)
-      post_action = PostAction.act(Fabricate(:user), post1, PostActionType.types[:spam], { flag_topic: true })
+      post_action = PostAction.act(Fabricate(:user), post1, PostActionType.types[:spam], flag_topic: true)
       expect(post_action.targets_topic).to eq(true)
     end
 
     it "will flag the first post if you flag a topic but there is only one post in the topic" do
       post = create_post
-      post_action = PostAction.act(Fabricate(:user), post, PostActionType.types[:spam], { flag_topic: true })
+      post_action = PostAction.act(Fabricate(:user), post, PostActionType.types[:spam], flag_topic: true)
       expect(post_action.targets_topic).to eq(false)
       expect(post_action.post_id).to eq(post.id)
     end
@@ -442,7 +441,7 @@ describe PostAction do
       Discourse.stubs(:site_contact_user).returns(admin)
 
       post = create_post
-      PostAction.act(moderator, post, PostActionType.types[:spam], { take_action: true })
+      PostAction.act(moderator, post, PostActionType.types[:spam], take_action: true)
 
       post.reload
       expect(post.hidden).to eq(true)
@@ -507,7 +506,7 @@ describe PostAction do
 
   it "prevents user to act twice at the same time" do
     # flags are already being tested
-    all_types_except_flags = PostActionType.types.except(PostActionType.flag_types)
+    all_types_except_flags = PostActionType.types.except(PostActionType.flag_types_without_custom)
     all_types_except_flags.values.each do |action|
       expect do
         PostAction.act(eviltrout, post, action)
@@ -516,7 +515,7 @@ describe PostAction do
     end
   end
 
-  describe "#create_message_for_post_action" do
+  describe ".create_message_for_post_action" do
     it "does not create a message when there is no message" do
       message_id = PostAction.create_message_for_post_action(Discourse.system_user, post, PostActionType.types[:spam], {})
       expect(message_id).to be_nil
@@ -529,6 +528,25 @@ describe PostAction do
       end
     end
 
+    it "should raise the right errors when it fails to create a post" do
+      begin
+        group = Group[:moderators]
+        messageable_level = group.messageable_level
+        group.update!(messageable_level: Group::ALIAS_LEVELS[:nobody])
+
+        expect do
+          PostAction.create_message_for_post_action(
+            Fabricate(:user),
+            post,
+            PostActionType.types[:notify_moderators],
+            message: 'testing',
+          )
+        end.to raise_error(ActiveRecord::RecordNotSaved)
+      ensure
+        group.update!(messageable_level: messageable_level)
+      end
+    end
+
   end
 
   describe ".lookup_for" do
@@ -539,11 +557,11 @@ describe PostAction do
 
       map = PostAction.lookup_for(user, [post.topic], post_action.post_action_type_id)
 
-      expect(map).to eq({post.topic_id => [post.post_number]})
+      expect(map).to eq(post.topic_id => [post.post_number])
     end
   end
 
-  describe ".add_moderator_post_if_needed" do
+  describe "#add_moderator_post_if_needed" do
 
     it "should not add a moderator post when it's disabled" do
       post = create_post
@@ -553,7 +571,7 @@ describe PostAction do
       topic = action.related_post.topic
       expect(topic.posts.count).to eq(1)
 
-      SiteSetting.expects(:auto_respond_to_flag_actions).returns(false)
+      SiteSetting.auto_respond_to_flag_actions = false
       PostAction.agree_flags!(post, admin)
 
       topic.reload
@@ -567,7 +585,7 @@ describe PostAction do
       topic = action.reload.related_post.topic
       expect(user.notifications.count).to eq(0)
 
-      SiteSetting.expects(:auto_respond_to_flag_actions).returns(true)
+      SiteSetting.auto_respond_to_flag_actions = true
       PostAction.agree_flags!(post, admin)
 
       user_notifications = user.notifications
diff --git a/spec/models/post_analyzer_spec.rb b/spec/models/post_analyzer_spec.rb
index ecda5cc6a0..937b47687c 100644
--- a/spec/models/post_analyzer_spec.rb
+++ b/spec/models/post_analyzer_spec.rb
@@ -6,33 +6,57 @@ describe PostAnalyzer do
   let(:url) { 'https://twitter.com/evil_trout/status/345954894420787200' }
 
   describe '#cook' do
-    let(:post_analyzer) {PostAnalyzer.new nil, nil  }
+    let(:post_analyzer) { PostAnalyzer.new nil, nil  }
 
     let(:raw) { "Here's a tweet:\n#{url}" }
     let(:options) { {} }
-    let(:args) { [raw, options] }
 
     before { Oneboxer.stubs(:onebox) }
 
     it 'fetches the cached onebox for any urls in the post' do
       Oneboxer.expects(:cached_onebox).with url
-      post_analyzer.cook(*args)
+      post_analyzer.cook(raw, options)
       expect(post_analyzer.found_oneboxes?).to be(true)
     end
 
     it 'does not invalidate the onebox cache' do
       Oneboxer.expects(:invalidate).with(url).never
-      post_analyzer.cook(*args)
+      post_analyzer.cook(raw, options)
     end
 
     context 'when invalidating oneboxes' do
-      let(:options) {{ invalidate_oneboxes: true }}
+      let(:options) { { invalidate_oneboxes: true } }
 
       it 'invalidates the oneboxes for urls in the post' do
         Oneboxer.expects(:invalidate).with url
-        post_analyzer.cook(*args)
+        post_analyzer.cook(raw, options)
       end
     end
+
+    it "does nothing when the cook_method is 'raw_html'" do
+      cooked = post_analyzer.cook('Hello <div/> world', cook_method: Post.cook_methods[:raw_html])
+      expect(cooked).to eq('Hello <div/> world')
+    end
+
+    it "does not interpret Markdown when cook_method is 'email' and raw contains plaintext" do
+      cooked = post_analyzer.cook("[plaintext]\n*this is not italic* and here is a link: https://www.example.com\n[/plaintext]", cook_method: Post.cook_methods[:email])
+      expect(cooked).to eq('*this is not italic* and here is a link: <a href="https://www.example.com">https://www.example.com</a>')
+    end
+
+    it "does interpret Markdown when cook_method is 'email' and raw does not contain plaintext" do
+      cooked = post_analyzer.cook('*this is italic*', cook_method: Post.cook_methods[:email])
+      expect(cooked).to eq('<p><em>this is italic</em></p>')
+    end
+
+    it "does interpret Markdown when cook_method is 'regular'" do
+      cooked = post_analyzer.cook('*this is italic*', cook_method: Post.cook_methods[:regular])
+      expect(cooked).to eq('<p><em>this is italic</em></p>')
+    end
+
+    it "does interpret Markdown when not cook_method is set" do
+      cooked = post_analyzer.cook('*this is italic*')
+      expect(cooked).to eq('<p><em>this is italic</em></p>')
+    end
   end
 
   context "links" do
@@ -78,17 +102,12 @@ describe PostAnalyzer do
 
       it "returns the host and a count for links" do
         post_analyzer = PostAnalyzer.new(raw_two_links_html, default_topic_id)
-        expect(post_analyzer.linked_hosts).to eq({"disneyland.disney.go.com" => 1, "reddit.com" => 1})
+        expect(post_analyzer.linked_hosts).to eq("disneyland.disney.go.com" => 1, "reddit.com" => 1)
       end
 
       it "it counts properly with more than one link on the same host" 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
+        expect(post_analyzer.linked_hosts).to eq("discourse.org" => 1, "www.imdb.com" => 1)
       end
     end
   end
@@ -118,21 +137,25 @@ describe PostAnalyzer do
 
     it "doesn't count avatars as images" do
       post_analyzer = PostAnalyzer.new(raw_post_with_avatars, default_topic_id)
+      PrettyText.stubs(:cook).returns(raw_post_with_avatars)
       expect(post_analyzer.image_count).to eq(0)
     end
 
     it "doesn't count favicons as images" do
       post_analyzer = PostAnalyzer.new(raw_post_with_favicon, default_topic_id)
+      PrettyText.stubs(:cook).returns(raw_post_with_favicon)
       expect(post_analyzer.image_count).to eq(0)
     end
 
     it "doesn't count thumbnails as images" do
       post_analyzer = PostAnalyzer.new(raw_post_with_thumbnail, default_topic_id)
+      PrettyText.stubs(:cook).returns(raw_post_with_thumbnail)
       expect(post_analyzer.image_count).to eq(0)
     end
 
     it "doesn't count whitelisted images" do
       Post.stubs(:white_listed_image_classes).returns(["classy"])
+      PrettyText.stubs(:cook).returns(raw_post_with_two_classy_images)
       post_analyzer = PostAnalyzer.new(raw_post_with_two_classy_images, default_topic_id)
       expect(post_analyzer.image_count).to eq(0)
     end
@@ -167,7 +190,6 @@ describe PostAnalyzer do
     end
   end
 
-
   describe "raw_mentions" do
 
     it "returns an empty array with no matches" do
@@ -181,12 +203,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 +225,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 16d3a4f4fe..3ef6bd2154 100644
--- a/spec/models/post_mover_spec.rb
+++ b/spec/models/post_mover_spec.rb
@@ -36,6 +36,7 @@ describe PostMover do
     let!(:p3) { Fabricate(:post, topic: topic, reply_to_post_number: p1.post_number, user: user) }
     let!(:p4) { Fabricate(:post, topic: topic, reply_to_post_number: p2.post_number, user: user) }
     let!(:p5) { Fabricate(:post) }
+    let(:p6) { Fabricate(:post, topic: topic) }
 
     before do
       p1.replies << p3
@@ -46,15 +47,38 @@ describe PostMover do
 
     context 'success' do
 
-      it "enqueues a job to notify users" do
-        topic.stubs(:add_moderator_post)
-        Jobs.expects(:enqueue).with(:notify_moved_posts, post_ids: [p2.id, p4.id], moved_by_id: user.id)
-        topic.move_posts(user, [p2.id, p4.id], title: "new testing topic name")
-      end
+      it "correctly handles notifications and bread crumbs" do
+        old_topic = p2.topic
 
-      it "adds a moderator post at the location of the first moved post" do
-        topic.expects(:add_moderator_post).with(user, instance_of(String), has_entries(post_number: 2))
-        topic.move_posts(user, [p2.id, p4.id], title: "new testing topic name")
+        old_topic_id = p2.topic_id
+
+        topic.move_posts(user, [p2.id, p4.id, p6.id], title: "new testing topic name")
+
+        p2.reload
+        expect(p2.topic_id).not_to eq(old_topic_id)
+        expect(p2.reply_to_post_number).to eq(nil)
+        expect(p2.reply_to_user_id).to eq(nil)
+
+        notification = p2.user.notifications.where(notification_type: Notification.types[:moved_post]).first
+
+        expect(notification.topic_id).to eq(p2.topic_id)
+        expect(notification.post_number).to eq(1)
+
+        # no message for person who made the move
+        expect(p4.user.notifications.where(notification_type: Notification.types[:moved_post]).length).to eq(0)
+
+        # notify at the right spot in the stream
+        notification = p6.user.notifications.where(notification_type: Notification.types[:moved_post]).first
+
+        expect(notification.topic_id).to eq(p2.topic_id)
+
+        # this is the 3rd post we moved
+        expect(notification.post_number).to eq(3)
+
+        old_topic.reload
+        move_message = old_topic.posts.find_by(post_number: 2)
+        expect(move_message.post_type).to eq(Post.types[:small_action])
+        expect(move_message.raw).to include("3 posts were split")
       end
 
     end
@@ -78,7 +102,7 @@ describe PostMover do
 
     context "successfully moved" do
       before do
-        TopicUser.update_last_read(user, topic.id, p4.post_number, 0)
+        TopicUser.update_last_read(user, topic.id, p4.post_number, p4.post_number, 0)
         TopicLink.extract_from(p2)
       end
 
@@ -208,10 +232,36 @@ describe PostMover do
 
           expect(new_topic.posts.pluck(:id).sort).to eq([p2.id, p3.id].sort)
         end
+
+        it "uses default locale for moderator post" do
+          I18n.locale = 'de'
+
+          new_topic = topic.move_posts(user, [p2.id, p4.id], title: "new testing topic name", category_id: category.id)
+          post = Post.find_by(topic_id: topic.id, post_type: Post.types[:small_action])
+
+          expected_text = I18n.with_locale(:en) do
+            I18n.t("move_posts.new_topic_moderator_post",
+                   count: 2,
+                   topic_link: "[#{new_topic.title}](#{new_topic.relative_url})")
+          end
+
+          expect(post.raw).to eq(expected_text)
+        end
+
+        it "does not try to move small action posts" do
+          small_action = Fabricate(:post, topic: topic, raw: "A small action", post_type: Post.types[:small_action])
+          new_topic = topic.move_posts(user, [p2.id, p4.id, small_action.id], title: "new testing topic name", category_id: category.id)
+
+          expect(new_topic.posts_count).to eq(2)
+          expect(small_action.topic_id).to eq(topic.id)
+
+          moderator_post = topic.posts.last
+          expect(moderator_post.raw).to include("2 posts were split")
+        end
       end
 
       context "to an existing topic" do
-        let!(:destination_topic) { Fabricate(:topic, user: user ) }
+        let!(:destination_topic) { Fabricate(:topic, user: user) }
         let!(:destination_op) { Fabricate(:post, topic: destination_topic, user: user) }
 
         it "works correctly" do
@@ -252,6 +302,12 @@ describe PostMover do
           expect(topic.posts.by_post_number).to match_array([p1, p3])
           expect(topic.highest_post_number).to eq(p3.post_number)
 
+          # Should notify correctly
+          notification = p2.user.notifications.where(notification_type: Notification.types[:moved_post]).first
+
+          expect(notification.topic_id).to eq(p2.topic_id)
+          expect(notification.post_number).to eq(p2.post_number)
+
           # Should update last reads
           expect(TopicUser.find_by(user_id: user.id, topic_id: topic.id).last_read_post_number).to eq(p3.post_number)
         end
@@ -264,6 +320,61 @@ describe PostMover do
           topic.reload
           expect(topic.closed).to eq(true)
         end
+
+        it "does not try to move small action posts" do
+          small_action = Fabricate(:post, topic: topic, raw: "A small action", post_type: Post.types[:small_action])
+          moved_to = topic.move_posts(user, [p1.id, p2.id, p3.id, p4.id, small_action.id], destination_topic_id: destination_topic.id)
+
+          moved_to.reload
+          expect(moved_to.posts_count).to eq(5)
+          expect(small_action.topic_id).to eq(topic.id)
+
+          moderator_post = topic.posts.find_by(post_number: 2)
+          expect(moderator_post.raw).to include("4 posts were merged")
+        end
+      end
+
+      shared_examples "moves email related stuff" do
+        it "moves incoming email" do
+          Fabricate(:incoming_email, user: old_post.user, topic: old_post.topic, post: old_post)
+
+          new_topic = topic.move_posts(user, [old_post.id], title: "new testing topic name")
+          new_post = new_topic.first_post
+          email = new_post.incoming_email
+
+          expect(email).to be_present
+          expect(email.topic_id).to eq(new_topic.id)
+          expect(email.post_id).to eq(new_post.id)
+
+          expect(old_post.reload.incoming_email).to_not be_present unless old_post.id == new_post.id
+        end
+
+        it "moves email log entries" do
+          old_topic = old_post.topic
+          Fabricate(:email_log, user: old_post.user, topic: old_topic, post: old_post, email_type: :mailing_list)
+          Fabricate(:email_log, user: old_post.user, topic: old_topic, post: old_post, email_type: :mailing_list)
+          Fabricate(:email_log, user: old_post.user, post: old_post, email_type: :mailing_list)
+
+          expect(EmailLog.where(topic_id: old_topic.id, post_id: old_post.id).count).to eq(2)
+          expect(EmailLog.where(topic_id: nil, post_id: old_post.id).count).to eq(1)
+
+          new_topic = old_topic.move_posts(user, [old_post.id], title: "new testing topic name")
+          new_post = new_topic.first_post
+
+          expect(EmailLog.where(topic_id: old_topic.id, post_id: old_post.id).count).to eq(0)
+          expect(EmailLog.where(topic_id: new_topic.id, post_id: new_post.id).count).to eq(3)
+        end
+
+        it "preserves post attributes" do
+          old_post.update_columns(cook_method: Post.cook_methods[:email], via_email: true, raw_email: "raw email content")
+
+          new_topic = old_post.topic.move_posts(user, [old_post.id], title: "new testing topic name")
+          new_post = new_topic.first_post
+
+          expect(new_post.cook_method).to eq(Post.cook_methods[:email])
+          expect(new_post.via_email).to eq(true)
+          expect(new_post.raw_email).to eq("raw email content")
+        end
       end
 
       context "moving the first post" do
@@ -312,6 +423,25 @@ 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
+
+        include_examples "moves email related stuff" do
+          let!(:old_post) { p1 }
+        end
+      end
+
+      context "moving replies" do
+        include_examples "moves email related stuff" do
+          let!(:old_post) { p3 }
+        end
       end
 
       context "to an existing topic with a deleted post" do
@@ -320,10 +450,10 @@ describe PostMover do
           topic.expects(:add_moderator_post)
         end
 
-        let!(:destination_topic) { Fabricate(:topic, user: user ) }
+        let!(:destination_topic) { Fabricate(:topic, user: user) }
         let!(:destination_op) { Fabricate(:post, topic: destination_topic, user: user) }
         let!(:destination_deleted_reply) { Fabricate(:post, topic: destination_topic, user: another_user) }
-        let(:moved_to) { topic.move_posts(user, [p2.id, p4.id], destination_topic_id: destination_topic.id)}
+        let(:moved_to) { topic.move_posts(user, [p2.id, p4.id], destination_topic_id: destination_topic.id) }
 
         it "works correctly" do
           destination_deleted_reply.trash!
@@ -351,6 +481,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 09d7e533be..3582aa4db6 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -53,7 +53,7 @@ describe Post do
   end
 
   # Help us build a post with a raw body
-  def post_with_body(body, user=nil)
+  def post_with_body(body, user = nil)
     args = post_args.merge(raw: body)
     args[:user] = user if user.present?
     Fabricate.build(:post, args)
@@ -189,22 +189,26 @@ describe Post do
     end
 
     it "doesn't count favicons as images" do
+      PrettyText.stubs(:cook).returns(post_with_favicon.raw)
       expect(post_with_favicon.image_count).to eq(0)
     end
 
     it "doesn't count thumbnails as images" do
+      PrettyText.stubs(:cook).returns(post_with_thumbnail.raw)
       expect(post_with_thumbnail.image_count).to eq(0)
     end
 
     it "doesn't count whitelisted images" do
       Post.stubs(:white_listed_image_classes).returns(["classy"])
+      # I dislike this, but passing in a custom whitelist is hard
+      PrettyText.stubs(:cook).returns(post_with_two_classy_images.raw)
       expect(post_with_two_classy_images.image_count).to eq(0)
     end
 
     context "validation" do
 
       before do
-        SiteSetting.stubs(:newuser_max_images).returns(1)
+        SiteSetting.newuser_max_images = 1
       end
 
       context 'newuser' do
@@ -220,7 +224,7 @@ describe Post do
           post_no_images.user.trust_level = TrustLevel[0]
           post_no_images.save
           expect {
-            post_no_images.revise(post_no_images.user, { raw: post_two_images.raw })
+            post_no_images.revise(post_no_images.user, raw: post_two_images.raw)
             post_no_images.reload
           }.not_to change(post_no_images, :raw)
         end
@@ -252,7 +256,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
@@ -268,7 +272,7 @@ describe Post do
           post_no_attachments.user.trust_level = TrustLevel[0]
           post_no_attachments.save
           expect {
-            post_no_attachments.revise(post_no_attachments.user, { raw: post_two_attachments.raw })
+            post_no_attachments.revise(post_no_attachments.user, raw: post_two_attachments.raw)
             post_no_attachments.reload
           }.not_to change(post_no_attachments, :raw)
         end
@@ -287,8 +291,8 @@ describe Post do
     let(:newuser) { Fabricate(:user, trust_level: TrustLevel[0]) }
     let(:no_links) { post_with_body("hello world my name is evil trout", newuser) }
     let(:one_link) { post_with_body("[jlawr](http://www.imdb.com/name/nm2225369)", newuser) }
-    let(:two_links) { post_with_body("<a href='http://disneyland.disney.go.com/'>disney</a> <a href='http://reddit.com'>reddit</a>", newuser)}
-    let(:three_links) { post_with_body("http://discourse.org and http://discourse.org/another_url and http://www.imdb.com/name/nm2225369", newuser)}
+    let(:two_links) { post_with_body("<a href='http://disneyland.disney.go.com/'>disney</a> <a href='http://reddit.com'>reddit</a>", newuser) }
+    let(:three_links) { post_with_body("http://discourse.org and http://discourse.org/another_url and http://www.imdb.com/name/nm2225369", newuser) }
 
     describe "raw_links" do
       it "returns a blank collection for a post with no links" do
@@ -314,11 +318,11 @@ describe Post do
       end
 
       it "returns the host and a count for links" do
-        expect(two_links.linked_hosts).to eq({"disneyland.disney.go.com" => 1, "reddit.com" => 1})
+        expect(two_links.linked_hosts).to eq("disneyland.disney.go.com" => 1, "reddit.com" => 1)
       end
 
       it "it counts properly with more than one link on the same host" do
-        expect(three_links.linked_hosts).to eq({"discourse.org" => 1, "www.imdb.com" => 1})
+        expect(three_links.linked_hosts).to eq("discourse.org" => 1, "www.imdb.com" => 1)
       end
     end
 
@@ -339,17 +343,15 @@ describe Post do
         end
 
         it "contains the new post's links, PLUS the previous one" do
-          expect(two_links.total_hosts_usage).to eq({'disneyland.disney.go.com' => 2, 'reddit.com' => 1})
+          expect(two_links.total_hosts_usage).to eq('disneyland.disney.go.com' => 2, 'reddit.com' => 1)
         end
 
       end
 
     end
 
-
   end
 
-
   describe "maximum links" do
     let(:newuser) { Fabricate(:user, trust_level: TrustLevel[0]) }
     let(:post_one_link) { post_with_body("[sherlock](http://www.bbc.co.uk/programmes/b018ttws)", newuser) }
@@ -376,7 +378,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
@@ -398,7 +400,6 @@ describe Post do
 
   end
 
-
   describe "@mentions" do
 
     context 'raw_mentions' do
@@ -414,12 +415,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 +432,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 +456,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 +471,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
@@ -483,7 +486,6 @@ describe Post do
         end
       end
 
-
     end
 
   end
@@ -500,7 +502,7 @@ describe Post do
 
   context "raw_hash" do
 
-    let(:raw) { "this is our test post body"}
+    let(:raw) { "this is our test post body" }
     let(:post) { post_with_body(raw) }
 
     it "returns a value" do
@@ -533,20 +535,20 @@ describe Post do
     it 'has no revision' do
       expect(post.revisions.size).to eq(0)
       expect(first_version_at).to be_present
-      expect(post.revise(post.user, { raw: post.raw })).to eq(false)
+      expect(post.revise(post.user, raw: post.raw)).to eq(false)
     end
 
     describe 'with the same body' do
 
       it "doesn't change version" do
-        expect { post.revise(post.user, { raw: post.raw }); post.reload }.not_to change(post, :version)
+        expect { post.revise(post.user, raw: post.raw); post.reload }.not_to change(post, :version)
       end
 
     end
 
     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
@@ -592,13 +594,13 @@ describe Post do
 
       it "triggers a rate limiter" do
         EditRateLimiter.any_instance.expects(:performed!)
-        post.revise(changed_by, { raw: 'updated body' })
+        post.revise(changed_by, raw: 'updated body')
       end
     end
 
     describe 'with a new body' do
       let(:changed_by) { Fabricate(:coding_horror) }
-      let!(:result) { post.revise(changed_by, { raw: 'updated body' }) }
+      let!(:result) { post.revise(changed_by, raw: 'updated body') }
 
       it 'acts correctly' do
         expect(result).to eq(true)
@@ -672,7 +674,7 @@ describe Post do
       end
 
       it "doesn't find the quote in a different topic" do
-        reply.raw = "[quote=\"EvilTrout, post:#{post.post_number}, topic:#{post.topic_id+1}\"]hello[/quote]"
+        reply.raw = "[quote=\"EvilTrout, post:#{post.post_number}, topic:#{post.topic_id + 1}\"]hello[/quote]"
         reply.extract_quoted_post_numbers
         expect(reply.quoted_post_numbers).to be_blank
       end
@@ -683,9 +685,9 @@ describe Post do
 
       let(:topic) { Fabricate(:topic) }
       let(:other_user) { Fabricate(:coding_horror) }
-      let(:reply_text) { "[quote=\"Evil Trout, post:1\"]\nhello\n[/quote]\nHmmm!"}
+      let(:reply_text) { "[quote=\"Evil Trout, post:1\"]\nhello\n[/quote]\nHmmm!" }
       let!(:post) { PostCreator.new(topic.user, raw: Fabricate.build(:post).raw, topic_id: topic.id).create }
-      let!(:reply) { PostCreator.new(other_user, raw: reply_text, topic_id: topic.id, reply_to_post_number: post.post_number ).create }
+      let!(:reply) { PostCreator.new(other_user, raw: reply_text, topic_id: topic.id, reply_to_post_number: post.post_number).create }
 
       it 'has a quote' do
         expect(reply.quote_count).to eq(1)
@@ -709,7 +711,6 @@ describe Post do
         expect(post.replies).to eq([reply])
       end
 
-
       it "doesn't change the post count when you edit the reply" do
         reply.raw = 'updated raw'
         reply.save
@@ -741,13 +742,12 @@ 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
 
   end
 
-
   context 'sort_order' do
     context 'regular topic' do
 
@@ -777,6 +777,36 @@ describe Post do
 
   end
 
+  context "reply_ids" do
+
+    let!(:topic) { Fabricate(:topic) }
+    let!(:p1) { Fabricate(:post, topic: topic, post_number: 1) }
+    let!(:p2) { Fabricate(:post, topic: topic, post_number: 2, reply_to_post_number: 1) }
+    let!(:p3) { Fabricate(:post, topic: topic, post_number: 3) }
+    let!(:p4) { Fabricate(:post, topic: topic, post_number: 4, reply_to_post_number: 2) }
+    let!(:p5) { Fabricate(:post, topic: topic, post_number: 5, reply_to_post_number: 4) }
+    let!(:p6) { Fabricate(:post, topic: topic, post_number: 6) }
+
+    before {
+      PostReply.create!(post: p1, reply: p2)
+      PostReply.create!(post: p2, reply: p4)
+      PostReply.create!(post: p2, reply: p6) # simulates p6 quoting p2
+      PostReply.create!(post: p3, reply: p5) # simulates p5 quoting p3
+      PostReply.create!(post: p4, reply: p5)
+      PostReply.create!(post: p6, reply: p6) # https://meta.discourse.org/t/topic-quoting-itself-displays-reply-indicator/76085
+    }
+
+    it "returns the reply ids and their level" do
+      expect(p1.reply_ids).to eq([{ id: p2.id, level: 1 }, { id: p4.id, level: 2 }, { id: p6.id, level: 2 }])
+      expect(p2.reply_ids).to eq([{ id: p4.id, level: 1 }, { id: p6.id, level: 1 }])
+      expect(p3.reply_ids).to be_empty # has no replies
+      expect(p4.reply_ids).to be_empty # p5 replies to 2 posts (p4 and p3)
+      expect(p5.reply_ids).to be_empty # has no replies
+      expect(p6.reply_ids).to be_empty # quotes itself
+    end
+
+  end
+
   describe 'urls' do
     it 'no-ops for empty list' do
       expect(Post.urls([])).to eq({})
@@ -786,7 +816,7 @@ describe Post do
     it 'finds urls for posts presented' do
       p1 = Fabricate(:post)
       p2 = Fabricate(:post)
-      expect(Post.urls([p1.id, p2.id])).to eq({p1.id => p1.url, p2.id => p2.url})
+      expect(Post.urls([p1.id, p2.id])).to eq(p1.id => p1.url, p2.id => p2.url)
     end
   end
 
@@ -816,14 +846,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/)
@@ -838,12 +868,13 @@ describe Post do
     end
   end
 
-
   describe "has_host_spam" do
-    it "correctly detects host spam" do
-      post = Fabricate(:post, raw: "hello from my site http://www.somesite.com http://#{GlobalSetting.hostname} http://#{RailsMultisite::ConnectionManagement.current_hostname}")
+    let(:raw) { "hello from my site http://www.somesite.com http://#{GlobalSetting.hostname} http://#{RailsMultisite::ConnectionManagement.current_hostname}" }
 
-      expect(post.total_hosts_usage).to eq({"www.somesite.com" => 1})
+    it "correctly detects host spam" do
+      post = Fabricate(:post, raw: raw)
+
+      expect(post.total_hosts_usage).to eq("www.somesite.com" => 1)
       post.acting_user.trust_level = 0
 
       expect(post.has_host_spam?).to eq(false)
@@ -855,6 +886,20 @@ describe Post do
       SiteSetting.white_listed_spam_host_domains = "bla.com|boo.com | somesite.com "
       expect(post.has_host_spam?).to eq(false)
     end
+
+    it "doesn't punish staged users" do
+      SiteSetting.newuser_spam_host_threshold = 1
+      user = Fabricate(:user, staged: true, trust_level: 0)
+      post = Fabricate(:post, raw: raw, user: user)
+      expect(post.has_host_spam?).to eq(false)
+    end
+
+    it "ignores private messages" do
+      SiteSetting.newuser_spam_host_threshold = 1
+      user = Fabricate(:user, trust_level: 0)
+      post = Fabricate(:post, raw: raw, user: user, topic: Fabricate(:private_message_topic, user: user))
+      expect(post.has_host_spam?).to eq(false)
+    end
   end
 
   it "has custom fields" do
@@ -866,7 +911,7 @@ describe Post do
     post.save
 
     post = Post.find(post.id)
-    expect(post.custom_fields).to eq({"Tommy" => "Hanks", "Vincent" => "Vega"})
+    expect(post.custom_fields).to eq("Tommy" => "Hanks", "Vincent" => "Vega")
   end
 
   describe "#rebake!" do
@@ -908,12 +953,29 @@ describe Post do
       expect(post.user).to eq(coding_horror)
       expect(post.revisions.size).to eq(0)
     end
+
+    it "uses default locale for edit reason" do
+      I18n.locale = 'de'
+      old_username = post.user.username_lower
+
+      post.set_owner(coding_horror, Discourse.system_user)
+      post.reload
+
+      expected_reason = I18n.with_locale(SiteSetting.default_locale) do
+        I18n.t('change_owner.post_revision_text',
+               old_user: old_username,
+               new_user: coding_horror.username_lower
+        )
+      end
+
+      expect(post.edit_reason).to eq(expected_reason)
+    end
   end
 
   describe ".rebake_old" do
     it "will catch posts it needs to rebake" do
       post = create_post
-      post.update_columns(baked_at: Time.new(2000,1,1), baked_version: -1)
+      post.update_columns(baked_at: Time.new(2000, 1, 1), baked_version: -1)
       Post.rebake_old(100)
 
       post.reload
@@ -927,7 +989,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/post_timing_spec.rb b/spec/models/post_timing_spec.rb
index 74aec7b8e6..7027c6b090 100644
--- a/spec/models/post_timing_spec.rb
+++ b/spec/models/post_timing_spec.rb
@@ -28,16 +28,16 @@ describe PostTiming do
     end
 
     it 'works correctly' do
-      timing(1,1)
-      timing(2,1)
-      timing(2,2)
-      timing(3,1)
-      timing(3,2)
-      timing(3,3)
+      timing(1, 1)
+      timing(2, 1)
+      timing(2, 2)
+      timing(3, 1)
+      timing(3, 2)
+      timing(3, 3)
 
-      _tu_one = topic_user(1,1,1)
-      _tu_two = topic_user(2,2,2)
-      _tu_three = topic_user(3,3,3)
+      _tu_one = topic_user(1, 1, 1)
+      _tu_two = topic_user(2, 2, 2)
+      _tu_three = topic_user(3, 3, 3)
 
       PostTiming.pretend_read(topic_id, 2, 3)
 
@@ -78,12 +78,15 @@ describe PostTiming do
 
   describe 'process_timings' do
 
-    # integration test
+    # integration tests
 
     it 'processes timings correctly' do
       PostActionNotifier.enable
 
       post = Fabricate(:post)
+      (2..5).each do |i|
+        Fabricate(:post, topic: post.topic, post_number: i)
+      end
       user2 = Fabricate(:coding_horror, created_at: 1.day.ago)
 
       PostAction.act(user2, post, PostActionType.types[:like])
@@ -97,6 +100,34 @@ describe PostTiming do
 
       PostTiming.process_timings(post.user, post.topic_id, 1, [[post.post_number, 1.day]])
 
+      user_visit = post.user.user_visits.order('id DESC').first
+      expect(user_visit.posts_read).to eq(1)
+
+      # Skip to bottom
+      PostTiming.process_timings(post.user, post.topic_id, 1, [[5, 100]])
+      expect(user_visit.reload.posts_read).to eq(2)
+
+      # Scroll up
+      PostTiming.process_timings(post.user, post.topic_id, 1, [[4, 100]])
+      expect(user_visit.reload.posts_read).to eq(3)
+      PostTiming.process_timings(post.user, post.topic_id, 1, [[2, 100], [3, 100]])
+      expect(user_visit.reload.posts_read).to eq(5)
+    end
+
+    it 'does not count private message posts read' do
+      pm = Fabricate(:private_message_topic, user: Fabricate(:admin))
+      user1, user2 = pm.topic_allowed_users.map(&:user)
+
+      (1..3).each do |i|
+        Fabricate(:post, topic: pm, user: user1)
+      end
+
+      PostTiming.process_timings(user2, pm.id, 10, [[1, 100]])
+      user_visit = user2.user_visits.last
+      expect(user_visit.posts_read).to eq(0)
+
+      PostTiming.process_timings(user2, pm.id, 10, [[2, 100], [3, 100]])
+      expect(user_visit.reload.posts_read).to eq(0)
     end
   end
 
@@ -105,7 +136,7 @@ describe PostTiming do
       @post = Fabricate(:post)
       @topic = @post.topic
       @coding_horror = Fabricate(:coding_horror)
-      @timing_attrs = {msecs: 1234, topic_id: @post.topic_id, user_id: @coding_horror.id, post_number: @post.post_number}
+      @timing_attrs = { msecs: 1234, topic_id: @post.topic_id, user_id: @coding_horror.id, post_number: @post.post_number }
     end
 
     it 'adds a view to the post' do
diff --git a/spec/models/queued_post_spec.rb b/spec/models/queued_post_spec.rb
index 8a16ca3a92..5f5f32eb93 100644
--- a/spec/models/queued_post_spec.rb
+++ b/spec/models/queued_post_spec.rb
@@ -38,7 +38,7 @@ describe QueuedPost do
       expect(create_options[:cooking_options]).to eq(cat: 'hat')
       expect(create_options[:cook_method]).to eq(Post.cook_methods[:raw_html])
       expect(create_options[:not_create_option]).to eq(nil)
-      expect(create_options[:image_sizes]).to eq("http://foo.bar/image.png" => {"width" => 0, "height" => 222})
+      expect(create_options[:image_sizes]).to eq("http://foo.bar/image.png" => { "width" => 0, "height" => 222 })
     end
 
     it "follows the correct workflow for approval" do
@@ -100,10 +100,9 @@ describe QueuedPost do
                                      title: 'This is the topic title to queue up',
                                      archetype: 'regular',
                                      category: category.id,
-                                     meta_data: {evil: 'trout'}
+                                     meta_data: { evil: 'trout' }
                                    }) }
 
-
       it "returns the appropriate options for creating a topic" do
         create_options = qp.create_options
 
diff --git a/spec/models/remote_theme_spec.rb b/spec/models/remote_theme_spec.rb
index 563056ac7f..1bac7d8485 100644
--- a/spec/models/remote_theme_spec.rb
+++ b/spec/models/remote_theme_spec.rb
@@ -83,7 +83,7 @@ JSON
 
       expect(@theme.theme_fields.length).to eq(6)
 
-      mapped = Hash[*@theme.theme_fields.map{|f| ["#{f.target_id}-#{f.name}", f.value]}.flatten]
+      mapped = Hash[*@theme.theme_fields.map { |f| ["#{f.target_id}-#{f.name}", f.value] }.flatten]
 
       expect(mapped["0-header"]).to eq("I AM HEADER")
       expect(mapped["1-scss"]).to eq(scss_data)
@@ -106,7 +106,6 @@ JSON
 
       `cd #{initial_repo} && git commit -am "update"`
 
-
       time = Time.new('2001')
       freeze_time time
 
@@ -114,7 +113,6 @@ JSON
       expect(remote.commits_behind).to eq(1)
       expect(remote.remote_version).to eq(`cd #{initial_repo} && git rev-parse HEAD`.strip)
 
-
       remote.update_from_remote
       @theme.save
       @theme.reload
@@ -123,7 +121,7 @@ JSON
       expect(scheme.name).to eq("Amazing")
       expect(scheme.colors.find_by(name: 'love').hex).to eq('eaeaea')
 
-      mapped = Hash[*@theme.theme_fields.map{|f| ["#{f.target_id}-#{f.name}", f.value]}.flatten]
+      mapped = Hash[*@theme.theme_fields.map { |f| ["#{f.target_id}-#{f.name}", f.value] }.flatten]
 
       expect(mapped["0-header"]).to eq("I AM UPDATED")
       expect(mapped["1-scss"]).to eq(scss_data)
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index 661cea8b2b..c70f9a4fff 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -40,14 +40,14 @@ describe Report do
 
       context "with #{pluralized}" do
         before(:each) do
-          Timecop.freeze
+          freeze_time
           fabricator = case arg
-          when :signup
-            :user
-          when :email
-            :email_log
+                       when :signup
+                         :user
+                       when :email
+                         :email_log
           else
-            arg
+                         arg
           end
           Fabricate(fabricator)
           Fabricate(fabricator, created_at: 1.hours.ago)
@@ -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
@@ -71,9 +70,9 @@ describe Report do
           it "returns previous 30 day's data" do
             expect(report.prev30Days).to be_present
           end
-        end
       end
     end
+  end
 
   [:http_total, :http_2xx, :http_background, :http_3xx, :http_4xx, :http_5xx, :page_view_crawler, :page_view_logged_in, :page_view_anon].each do |request_type|
     describe "#{request_type} request reports" 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
@@ -203,9 +200,9 @@ describe Report do
 
       it "returns a report with data" do
         expect(report.data).to be_present
-        expect(report.data.find {|d| d[:x] == TrustLevel[0]}[:y]).to eq 3
-        expect(report.data.find {|d| d[:x] == TrustLevel[2]}[:y]).to eq 2
-        expect(report.data.find {|d| d[:x] == TrustLevel[4]}[:y]).to eq 1
+        expect(report.data.find { |d| d[:x] == TrustLevel[0] }[:y]).to eq 3
+        expect(report.data.find { |d| d[:x] == TrustLevel[2] }[:y]).to eq 2
+        expect(report.data.find { |d| d[:x] == TrustLevel[4] }[:y]).to eq 1
       end
     end
   end
@@ -218,6 +215,7 @@ describe Report do
       post.topic.add_small_action(Fabricate(:admin), "invited_group", 'coolkids')
       r = Report.find('posts')
       expect(r.total).to eq(1)
+      expect(r.data[0][:y]).to eq(1)
     end
   end
 end
diff --git a/spec/models/rtl_spec.rb b/spec/models/rtl_spec.rb
deleted file mode 100644
index 74b3462cc1..0000000000
--- 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 9f36a09e28..8749986801 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 7364773158..af4e82c43d 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 c26b1151be..6210f832b0 100644
--- a/spec/models/screened_ip_address_spec.rb
+++ b/spec/models/screened_ip_address_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe ScreenedIpAddress do
   let(:ip_address) { '99.232.23.124' }
-  let(:valid_params) { {ip_address: ip_address} }
+  let(:valid_params) { { ip_address: ip_address } }
 
   describe 'new record' do
     it 'sets a default action_type' do
@@ -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/screened_url_spec.rb b/spec/models/screened_url_spec.rb
index 6da3fd4769..8335784ecd 100644
--- a/spec/models/screened_url_spec.rb
+++ b/spec/models/screened_url_spec.rb
@@ -5,7 +5,7 @@ describe ScreenedUrl do
   let(:url)    { 'http://shopppping.com/bad/drugz' }
   let(:domain) { 'shopppping.com' }
 
-  let(:valid_params) { {url: url, domain: domain} }
+  let(:valid_params) { { url: url, domain: domain } }
 
   describe "new record" do
     it "sets a default action_type" do
diff --git a/spec/models/search_log_spec.rb b/spec/models/search_log_spec.rb
new file mode 100644
index 0000000000..478fc8d033
--- /dev/null
+++ b/spec/models/search_log_spec.rb
@@ -0,0 +1,231 @@
+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 "term_details" do
+    before do
+      SearchLog.log(term: "ruby", search_type: :header, ip_address: "127.0.0.1")
+      SearchLog.log(term: 'ruby', search_type: :header, ip_address: '127.0.0.1', user_id: Fabricate(:user).id)
+      SearchLog.log(term: "ruby", search_type: :full_page, ip_address: "127.0.0.2")
+    end
+
+    it "correctly returns term details" do
+      term_details = SearchLog.term_details("ruby")
+      expect(term_details[:data][0][:y]).to eq(3)
+
+      term_header_details = SearchLog.term_details("ruby", :all, :header)
+      expect(term_header_details[:data][0][:y]).to eq(2)
+
+      SearchLog.where(term: 'ruby', ip_address: '127.0.0.2').update_all(search_result_id: 24)
+      term_click_through_details = SearchLog.term_details("ruby", :all, :click_through_only)
+      expect(term_click_through_details[:data][0][:y]).to eq(1)
+    end
+  end
+
+  context "trending" do
+    before do
+      SearchLog.log(term: 'ruby', search_type: :header, ip_address: '127.0.0.1')
+      SearchLog.log(term: 'php', search_type: :header, ip_address: '127.0.0.1')
+      SearchLog.log(term: 'java', search_type: :header, ip_address: '127.0.0.1')
+      SearchLog.log(term: 'ruby', search_type: :header, ip_address: '127.0.0.1', user_id: Fabricate(:user).id)
+      SearchLog.log(term: 'swift', search_type: :header, ip_address: '127.0.0.1')
+      SearchLog.log(term: 'ruby', search_type: :header, ip_address: '127.0.0.2')
+    end
+
+    it "considers time period" do
+      expect(SearchLog.trending.count).to eq(4)
+
+      SearchLog.where(term: 'swift').update_all(created_at: 1.year.ago)
+      expect(SearchLog.trending(:monthly).count).to eq(3)
+    end
+
+    it "correctly returns trending data" do
+      top_trending = SearchLog.trending.first
+      expect(top_trending.term).to eq("ruby")
+      expect(top_trending.searches).to eq(3)
+      expect(top_trending.unique).to eq(2)
+      expect(top_trending.click_through).to eq(0)
+
+      SearchLog.where(term: 'ruby', ip_address: '127.0.0.1').update_all(search_result_id: 12)
+      SearchLog.where(term: 'ruby', ip_address: '127.0.0.2').update_all(search_result_id: 24)
+      top_trending = SearchLog.trending.first
+      expect(top_trending.click_through).to eq(3)
+    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 d1905b2c08..65907a77a5 100644
--- a/spec/models/site_setting_spec.rb
+++ b/spec/models/site_setting_spec.rb
@@ -111,7 +111,6 @@ describe SiteSetting do
       SiteSetting.force_https = true
     end
 
-
     it "returns http when ssl is disabled" do
       SiteSetting.force_https = false
       expect(SiteSetting.scheme).to eq("http")
@@ -128,10 +127,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/site_spec.rb b/spec/models/site_spec.rb
index 8899269c80..2463fddd79 100644
--- a/spec/models/site_spec.rb
+++ b/spec/models/site_spec.rb
@@ -9,9 +9,9 @@ describe Site do
 
     expected = Theme.where('key = :default OR user_selectable',
                     default: SiteSetting.default_theme_key)
-         .order(:name)
-         .pluck(:key, :name)
-         .map{|k,n| {"theme_key" => k, "name" => n, "default" => k == SiteSetting.default_theme_key}}
+      .order(:name)
+      .pluck(:key, :name)
+      .map { |k, n| { "theme_key" => k, "name" => n, "default" => k == SiteSetting.default_theme_key } }
 
     expect(parsed["user_themes"]).to eq(expected)
   end
@@ -46,20 +46,20 @@ describe Site do
 
     expect(Site.new(Guardian.new(user)).categories.count).to eq(2)
 
-    category.set_permissions(:everyone => :create_post)
+    category.set_permissions(everyone: :create_post)
     category.save
 
     guardian = Guardian.new(user)
 
     expect(Site.new(guardian)
         .categories
-        .keep_if{|c| c.name == category.name}
+        .keep_if { |c| c.name == category.name }
         .first
         .permission)
-        .not_to eq(CategoryGroup.permission_types[:full])
+      .not_to eq(CategoryGroup.permission_types[:full])
 
     # If a parent category is not visible, the child categories should not be returned
-    category.set_permissions(:staff => :full)
+    category.set_permissions(staff: :full)
     category.save
 
     sub_category = Fabricate(:category, parent_category_id: category.id)
diff --git a/spec/models/stylesheet_cache_spec.rb b/spec/models/stylesheet_cache_spec.rb
index 480fd86259..bffa8564d8 100644
--- a/spec/models/stylesheet_cache_spec.rb
+++ b/spec/models/stylesheet_cache_spec.rb
@@ -15,10 +15,10 @@ describe StylesheetCache do
     end
 
     it "does nothing if digest is set and already exists" do
-      StylesheetCache.destroy_all
+      StylesheetCache.delete_all
 
-      StylesheetCache.add("a", "b", "c", "map")
-      StylesheetCache.add("a", "b", "cc", "map")
+      expect(StylesheetCache.add("a", "b", "c", "map")).to be_present
+      expect(StylesheetCache.add("a", "b", "cc", "map")).to eq(false)
 
       expect(StylesheetCache.count).to eq 1
       expect(StylesheetCache.first.content).to eq "c"
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 808791d5af..6cea43f305 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -38,7 +38,7 @@ describe Tag do
 
       it "can be used to filter before doing the count" do
         counts = described_class.tags_by_count_query.where("topics.id = ?", @topics[1].id).count(Tag::COUNT_ARG)
-        expect(counts).to eq({@tags[0].name => 1})
+        expect(counts).to eq(@tags[0].name => 1)
       end
 
       it "returns unused tags too" do
@@ -46,6 +46,17 @@ describe Tag do
         counts = described_class.tags_by_count_query.count(Tag::COUNT_ARG)
         expect(counts[unused.name]).to eq(0)
       end
+
+      it "doesn't include deleted topics in counts" do
+        deleted_topic_tag = Fabricate(:tag)
+        delete_topic = Fabricate(:topic)
+        post = Fabricate(:post, topic: delete_topic, user: delete_topic.user)
+        delete_topic.tags << deleted_topic_tag
+        PostDestroyer.new(Fabricate(:admin), post).destroy
+
+        counts = described_class.tags_by_count_query.count(Tag::COUNT_ARG)
+        expect(counts[deleted_topic_tag.name]).to eq(0)
+      end
     end
   end
 
@@ -65,7 +76,7 @@ describe Tag do
         make_some_tags(count: 4) # one tag that isn't used
         @category1 = Fabricate(:category)
         @private_category = Fabricate(:category)
-        @private_category.set_permissions(:admins => :full)
+        @private_category.set_permissions(admins: :full)
         @private_category.save!
         @topics = []
         @topics << Fabricate(:topic, category: @category1, tags: [@tags[0]])
diff --git a/spec/models/tag_user_spec.rb b/spec/models/tag_user_spec.rb
index aee8839eca..b5b9dabacb 100644
--- a/spec/models/tag_user_spec.rb
+++ b/spec/models/tag_user_spec.rb
@@ -141,12 +141,10 @@ describe TagUser do
         TopicUser.change(user.id, post.topic_id, total_msecs_viewed: 1)
         expect(TopicUser.get(post.topic, user).notification_level).to eq TopicUser.notification_levels[:watching]
 
-
         DiscourseTagging.tag_topic_by_names(post.topic, Guardian.new(user), [watched_tag.name])
         post.topic.save!
         expect(TopicUser.get(post.topic, user).notification_level).to eq TopicUser.notification_levels[:watching]
 
-
         DiscourseTagging.tag_topic_by_names(post.topic, Guardian.new(user), [])
         post.topic.save!
         expect(TopicUser.get(post.topic, user).notification_level).to eq TopicUser.notification_levels[:tracking]
diff --git a/spec/models/theme_field_spec.rb b/spec/models/theme_field_spec.rb
index 00c88834d8..798cb47819 100644
--- a/spec/models/theme_field_spec.rb
+++ b/spec/models/theme_field_spec.rb
@@ -9,10 +9,11 @@ describe ThemeField do
    badJavaScript(;
 </script>
 HTML
+
     field = ThemeField.create!(theme_id: 1, target_id: 0, name: "header", value: html)
     expect(field.error).not_to eq(nil)
-    field.value = ""
-    field.save!
+
+    field.update!(value: '')
     expect(field.error).to eq(nil)
   end
 
@@ -28,4 +29,19 @@ HTML
     expect(field.error).to eq(nil)
   end
 
+  def create_upload_theme_field!(name)
+    ThemeField.create!(
+      theme_id: 1,
+      target_id: 0,
+      value: "",
+      type_id: ThemeField.types[:theme_upload_var],
+      name: name,
+    )
+  end
+
+  it "ensures we don't use invalid SCSS variable names" do
+    expect { create_upload_theme_field!("42") }.to raise_error(ActiveRecord::RecordInvalid)
+    expect { create_upload_theme_field!("a42") }.not_to raise_error
+  end
+
 end
diff --git a/spec/models/theme_spec.rb b/spec/models/theme_spec.rb
index 5df2a2abf7..817326a1ad 100644
--- a/spec/models/theme_spec.rb
+++ b/spec/models/theme_spec.rb
@@ -10,8 +10,12 @@ describe Theme do
     Fabricate(:user)
   end
 
+  let(:guardian) do
+    Guardian.new(user)
+  end
+
   let :customization_params do
-    {name: 'my name', user_id: user.id, header: "my awesome header"}
+    { name: 'my name', user_id: user.id, header: "my awesome header" }
   end
 
   let :customization do
@@ -50,7 +54,6 @@ describe Theme do
     expect(Theme.lookup_field(child.key, :desktop, "header")).to eq("World\nDesktop")
     expect(Theme.lookup_field(child.key, "mobile", :header)).to eq("World\nMobile")
 
-
     child.set_field(target: :common, name: "header", value: "Worldie")
     child.save!
 
@@ -80,7 +83,6 @@ describe Theme do
     expect(grandchild.dependant_themes.length).to eq(2)
   end
 
-
   it 'should correct bad html in body_tag_baked and head_tag_baked' do
     theme = Theme.new(user_id: -1, name: "test")
     theme.set_field(target: :common, name: "head_tag", value: "<b>I am bold")
@@ -153,6 +155,26 @@ HTML
   end
 
   context 'theme vars' do
+
+    it 'works in parent theme' do
+
+      theme = Theme.new(name: 'theme', user_id: -1)
+      theme.set_field(target: :common, name: :scss, value: 'body {color: $magic; }')
+      theme.set_field(target: :common, name: :magic, value: 'red', type: :theme_var)
+      theme.set_field(target: :common, name: :not_red, value: 'red', type: :theme_var)
+      theme.save
+
+      parent_theme = Theme.new(name: 'parent theme', user_id: -1)
+      parent_theme.set_field(target: :common, name: :scss, value: 'body {background-color: $not_red; }')
+      parent_theme.set_field(target: :common, name: :not_red, value: 'blue', type: :theme_var)
+      parent_theme.save
+      parent_theme.add_child_theme!(theme)
+
+      scss, _map = Stylesheet::Compiler.compile('@import "theme_variables"; @import "desktop_theme"; ', "theme.scss", theme_id: parent_theme.id)
+      expect(scss).to include("color:red")
+      expect(scss).to include("background-color:blue")
+    end
+
     it 'can generate scss based off theme vars' do
       theme = Theme.new(name: 'theme', user_id: -1)
       theme.set_field(target: :common, name: :scss, value: 'body {color: $magic; content: quote($content)}')
@@ -160,7 +182,7 @@ HTML
       theme.set_field(target: :common, name: :content, value: 'Sam\'s Test', type: :theme_var)
       theme.save
 
-      scss,_map = Stylesheet::Compiler.compile('@import "theme_variables"; @import "desktop_theme"; ', "theme.scss", theme_id: theme.id)
+      scss, _map = Stylesheet::Compiler.compile('@import "theme_variables"; @import "desktop_theme"; ', "theme.scss", theme_id: theme.id)
       expect(scss).to include("red")
       expect(scss).to include('"Sam\'s Test"')
     end
@@ -186,7 +208,7 @@ HTML
       theme.reload
       expect(theme.theme_fields.find_by(name: :scss).error).to eq(nil)
 
-      scss,_map = Stylesheet::Compiler.compile('@import "theme_variables"; @import "desktop_theme"; ', "theme.scss", theme_id: theme.id)
+      scss, _map = Stylesheet::Compiler.compile('@import "theme_variables"; @import "desktop_theme"; ', "theme.scss", theme_id: theme.id)
       expect(scss).to include(upload.url)
     end
   end
@@ -216,5 +238,32 @@ HTML
     expect(Theme.user_theme_keys).to eq(Set.new([]))
   end
 
+  it 'correctly caches user_themes template' do
+    Theme.destroy_all
+
+    json = Site.json_for(guardian)
+    user_themes = JSON.parse(json)["user_themes"]
+    expect(user_themes).to eq([])
+
+    theme = Theme.create!(name: "bob", user_id: -1, user_selectable: true)
+    theme.save!
+
+    json = Site.json_for(guardian)
+    user_themes = JSON.parse(json)["user_themes"].map { |t| t["name"] }
+    expect(user_themes).to eq(["bob"])
+
+    theme.name = "sam"
+    theme.save!
+
+    json = Site.json_for(guardian)
+    user_themes = JSON.parse(json)["user_themes"].map { |t| t["name"] }
+    expect(user_themes).to eq(["sam"])
+
+    Theme.destroy_all
+
+    json = Site.json_for(guardian)
+    user_themes = JSON.parse(json)["user_themes"]
+    expect(user_themes).to eq([])
+  end
 
 end
diff --git a/spec/models/top_menu_item_spec.rb b/spec/models/top_menu_item_spec.rb
index a92df985ff..61f78e0849 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/top_topic_spec.rb b/spec/models/top_topic_spec.rb
index 7c73a98b3c..1d83694f68 100644
--- a/spec/models/top_topic_spec.rb
+++ b/spec/models/top_topic_spec.rb
@@ -47,7 +47,7 @@ describe TopTopic do
     let(:coding_horror) { Fabricate(:coding_horror) }
 
     let!(:topic_1) { Fabricate(:topic, posts_count: 10, like_count: 28) }
-    let!(:t1_post_1) { Fabricate(:post, topic: topic_1, like_count: 28, post_number: 1)}
+    let!(:t1_post_1) { Fabricate(:post, topic: topic_1, like_count: 28, post_number: 1) }
 
     let!(:topic_2) { Fabricate(:topic, posts_count: 10, like_count: 20) }
     let!(:t2_post_1) { Fabricate(:post, topic: topic_2, like_count: 10, post_number: 1) }
diff --git a/spec/models/topic_converter_spec.rb b/spec/models/topic_converter_spec.rb
index cee779633b..05d28b10e6 100644
--- a/spec/models/topic_converter_spec.rb
+++ b/spec/models/topic_converter_spec.rb
@@ -6,12 +6,14 @@ describe TopicConverter do
     let(:admin) { Fabricate(:admin) }
     let(:author) { Fabricate(:user) }
     let(:category) { Fabricate(:category) }
-    let(:private_message) { Fabricate(:private_message_topic, user: author) }
+    let(:private_message) { Fabricate(:private_message_topic, user: author) } # creates a topic without a first post
+    let(:first_post) { Fabricate(:post, topic: private_message, user: author) }
+    let(:other_user) { private_message.topic_allowed_users.find { |u| u.user != author }.user }
 
     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,30 +28,58 @@ 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
       end
 
       it "updates user stats" do
+        first_post
         topic_user = TopicUser.create!(user_id: author.id, topic_id: private_message.id, posted: true)
         expect(private_message.user.user_stat.topic_count).to eq(0)
         private_message.convert_to_public_topic(admin)
         expect(private_message.reload.user.user_stat.topic_count).to eq(1)
         expect(topic_user.reload.notification_level).to eq(TopicUser.notification_levels[:watching])
       end
+
+      context "with a reply" do
+        before do
+          UserActionCreator.enable
+          first_post
+          create_post(topic: private_message, user: other_user)
+          private_message.reload
+        end
+
+        after do
+          UserActionCreator.disable
+        end
+
+        it "updates UserActions" do
+          TopicConverter.new(private_message, admin).convert_to_public_topic
+          expect(author.user_actions.where(action_type: UserAction::NEW_PRIVATE_MESSAGE).count).to eq(0)
+          expect(author.user_actions.where(action_type: UserAction::NEW_TOPIC).count).to eq(1)
+          # TODO:
+          # expect(other_user.user_actions.where(action_type: UserAction::NEW_PRIVATE_MESSAGE).count).to eq(0)
+          # expect(other_user.user_actions.where(action_type: UserAction::GOT_PRIVATE_MESSAGE).count).to eq(0)
+          # expect(other_user.user_actions.where(action_type: UserAction::REPLY).count).to eq(1)
+        end
+      end
     end
   end
 
@@ -77,6 +107,14 @@ describe TopicConverter do
         expect(topic.reload.user.user_stat.topic_count).to eq(0)
         expect(topic_user.reload.notification_level).to eq(TopicUser.notification_levels[:watching])
       end
+
+      it "changes user_action type" do
+        UserActionCreator.enable
+        topic.convert_to_private_message(admin)
+        expect(author.user_actions.where(action_type: UserAction::NEW_TOPIC).count).to eq(0)
+        expect(author.user_actions.where(action_type: UserAction::NEW_PRIVATE_MESSAGE).count).to eq(1)
+        UserActionCreator.disable
+      end
     end
 
     context 'topic has replies' do
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index 7270c4fc7e..3438c615fe 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)
@@ -186,7 +186,8 @@ describe TopicEmbed do
 
       before do
         file.stubs(:read).returns contents
-        TopicEmbed.stubs(:open).returns file
+        TopicEmbed.stubs(:open)
+          .with('http://eviltrout.com/test/%D9%85%D8%A7%D9%87%DB%8C', allow_redirections: :safe).returns file
       end
 
       it "doesn't throw an error" do
@@ -195,6 +196,41 @@ describe TopicEmbed do
       end
     end
 
+    context "encoded URL" do
+      let(:url) { 'http://example.com/hello%20world' }
+      let(:contents) { "<title>Hello World!</title><body></body>" }
+      let!(:embeddable_host) { Fabricate(:embeddable_host) }
+      let!(:file) { StringIO.new }
+
+      before do
+        file.stubs(:read).returns contents
+        TopicEmbed.stubs(:open)
+          .with('http://example.com/hello%20world', allow_redirections: :safe).returns file
+      end
+
+      it "doesn't throw an error" do
+        response = TopicEmbed.find_remote(url)
+        expect(response.title).to eq("Hello World!")
+      end
+    end
+
+    context "emails" do
+      let(:url) { 'http://example.com/foo' }
+      let(:contents) { '<p><a href="mailto:foo%40example.com">URL encoded @ symbol</a></p><p><a href="mailto:bar@example.com">normal mailto link</a></p>' }
+      let!(:embeddable_host) { Fabricate(:embeddable_host) }
+      let!(:file) { StringIO.new }
+
+      before do
+        file.stubs(:read).returns contents
+        TopicEmbed.stubs(:open).returns file
+      end
+
+      it "handles mailto links" do
+        response = TopicEmbed.find_remote(url)
+        expect(response.body).to have_tag('a', with: { href: 'mailto:foo%40example.com' })
+        expect(response.body).to have_tag('a', with: { href: 'mailto:bar@example.com' })
+      end
+    end
   end
 
 end
diff --git a/spec/models/topic_link_click_spec.rb b/spec/models/topic_link_click_spec.rb
index 6200c24a07..f4953f014d 100644
--- a/spec/models/topic_link_click_spec.rb
+++ b/spec/models/topic_link_click_spec.rb
@@ -39,7 +39,6 @@ describe TopicLinkClick do
 
     context 'create_from' do
 
-
       it "works correctly" do
 
         # returns nil to prevent exploits
@@ -57,8 +56,6 @@ describe TopicLinkClick do
 
       end
 
-
-
       context 'with a valid url and post_id' do
         before do
           @url = TopicLinkClick.create_from(url: @topic_link.url, post_id: @post.id, ip: '127.0.0.1')
@@ -148,6 +145,9 @@ describe TopicLinkClick do
 
           it "works with s3 urls" do
             SiteSetting.s3_cdn_url = "https://discourse-s3-cdn.global.ssl.fastly.net"
+            SiteSetting.s3_access_key_id = 'X'
+            SiteSetting.s3_secret_access_key = 'X'
+            SiteSetting.enable_s3_uploads = true
 
             post = Fabricate(:post, topic: @topic, raw: "[test](//test.localhost/uploads/default/my-test-link)")
             TopicLink.extract_from(post)
@@ -192,6 +192,32 @@ describe TopicLinkClick do
         end
       end
 
+      context 'with a query param and google analytics' do
+        before do
+          @topic = Fabricate(:topic)
+          @post = Fabricate(:post,
+              topic: @topic,
+              user: @topic.user,
+              raw: "Here's a link to twitter: http://twitter.com?ref=forum"
+            )
+          TopicLink.extract_from(@post)
+          @topic_link = @topic.topic_links.first
+        end
+
+        it 'creates a click' do
+          url = TopicLinkClick.create_from(
+            url: 'http://twitter.com?ref=forum&_ga=1.16846778.221554446.1071987018',
+            topic_id: @topic.id,
+            post_id: @post.id,
+            ip: '127.0.0.3'
+          )
+          click = TopicLinkClick.last
+          expect(click).to be_present
+          expect(click.topic_link).to eq(@topic_link)
+          expect(url).to eq('http://twitter.com?ref=forum&_ga=1.16846778.221554446.1071987018')
+        end
+      end
+
       context 'with a google analytics tracking code and a hash' do
         before do
           @url = TopicLinkClick.create_from(url: 'http://discourse.org?_ga=1.16846778.221554446.1071987018#faq',
@@ -206,7 +232,6 @@ describe TopicLinkClick do
         end
       end
 
-
       context 'with a valid url and topic_id' do
         before do
           @url = TopicLinkClick.create_from(url: @topic_link.url, topic_id: @topic.id, ip: '127.0.0.3')
diff --git a/spec/models/topic_link_spec.rb b/spec/models/topic_link_spec.rb
index f421ae33dd..bb9408f808 100644
--- a/spec/models/topic_link_spec.rb
+++ b/spec/models/topic_link_spec.rb
@@ -20,8 +20,8 @@ describe TopicLink do
 
   it "can't link to the same topic" do
     ftl = TopicLink.new(url: "/t/#{topic.id}",
-                              topic_id: topic.id,
-                              link_topic_id: topic.id)
+                        topic_id: topic.id,
+                        link_topic_id: topic.id)
     expect(ftl.valid?).to eq(false)
   end
 
@@ -30,8 +30,8 @@ describe TopicLink do
       post = Fabricate(:post, raw: "
 http://a.com/
 http://b.com/b
-http://#{'a'*200}.com/invalid
-http://b.com/#{'a'*500}
+http://#{'a' * 200}.com/invalid
+http://b.com/#{'a' * 500}
                         ", user: user, topic: topic)
 
       TopicLink.extract_from(post)
@@ -73,7 +73,6 @@ http://b.com/#{'a'*500}
       expect(link.url).to eq(url)
     end
 
-
     context 'topic link' do
 
       let(:other_topic) do
@@ -131,8 +130,8 @@ http://b.com/#{'a'*500}
         TopicLink.extract_from(linked_post)
         expect(topic.topic_links.first.url).to eq(url)
 
-        linked_post.revise(post.user, { raw: "no more linkies https://eviltrout.com" })
-        expect(other_topic.topic_links.where(link_post_id: linked_post.id)).to be_blank
+        linked_post.revise(post.user, raw: "no more linkies https://eviltrout.com")
+        expect(other_topic.reload.topic_links.where(link_post_id: linked_post.id)).to be_blank
       end
     end
 
@@ -193,7 +192,7 @@ http://b.com/#{'a'*500}
     end
 
     context "link to a local attachments" do
-      let(:post) { topic.posts.create(user: user, raw: '<a class="attachment" href="/uploads/default/208/87bb3d8428eb4783.rb">ruby.rb</a>') }
+      let(:post) { topic.posts.create(user: user, raw: '<a class="attachment" href="/uploads/default/208/87bb3d8428eb4783.rb?foo=bar">ruby.rb</a>') }
 
       it "extracts the link" do
         TopicLink.extract_from(post)
@@ -203,9 +202,11 @@ http://b.com/#{'a'*500}
         # is set to internal
         expect(link).to be_internal
         # has the correct url
-        expect(link.url).to eq("/uploads/default/208/87bb3d8428eb4783.rb")
+        expect(link.url).to eq("/uploads/default/208/87bb3d8428eb4783.rb?foo=bar")
         # should not be the reflection
         expect(link).not_to be_reflection
+        # should have file extension
+        expect(link.extension).to eq('rb')
       end
 
     end
@@ -224,10 +225,11 @@ http://b.com/#{'a'*500}
         expect(link.url).to eq("//s3.amazonaws.com/bucket/2104a0211c9ce41ed67989a1ed62e9a394c1fbd1446.rb")
         # should not be the reflection
         expect(link).not_to be_reflection
+        # should have file extension
+        expect(link.extension).to eq('rb')
       end
 
     end
-
   end
 
   describe 'internal link from pm' do
@@ -248,6 +250,21 @@ http://b.com/#{'a'*500}
 
   end
 
+  describe 'internal link from unlisted topic' do
+    it 'works' do
+      unlisted_topic = Fabricate(:topic, user: user, visible: false)
+      url = "http://#{test_uri.host}/t/topic-slug/#{topic.id}"
+
+      unlisted_topic.posts.create(user: user, raw: 'initial post')
+      linked_post = unlisted_topic.posts.create(user: user, raw: "Link to another topic: #{url}")
+
+      TopicLink.extract_from(linked_post)
+
+      expect(topic.topic_links.first).to eq(nil)
+      expect(unlisted_topic.topic_links.first).not_to eq(nil)
+    end
+  end
+
   describe 'internal link with non-standard port' do
     it 'includes the non standard port if present' do
       other_topic = Fabricate(:topic, user: user)
@@ -300,12 +317,12 @@ http://b.com/#{'a'*500}
         TopicLinkClick.create(topic_link: topic_link, ip_address: '192.168.1.1')
 
         expect(counts_for[post.id]).to be_present
-        expect(counts_for[post.id].find {|l| l[:url] == 'http://google.com'}[:clicks]).to eq(0)
+        expect(counts_for[post.id].find { |l| l[:url] == 'http://google.com' }[:clicks]).to eq(0)
         expect(counts_for[post.id].first[:clicks]).to eq(1)
 
         array = TopicLink.topic_map(Guardian.new, post.topic_id)
         expect(array.length).to eq(6)
-        expect(array[0]["clicks"]).to eq("1")
+        expect(array[0]["clicks"]).to eq(1)
       end
 
       it 'secures internal links correctly' do
@@ -319,7 +336,7 @@ http://b.com/#{'a'*500}
         expect(TopicLink.topic_map(Guardian.new, post.topic_id).count).to eq(1)
         expect(TopicLink.counts_for(Guardian.new, post.topic, [post]).length).to eq(1)
 
-        category.set_permissions(:staff => :full)
+        category.set_permissions(staff: :full)
         category.save
 
         admin = Fabricate(:admin)
@@ -364,6 +381,11 @@ http://b.com/#{'a'*500}
         expect(result).to eq({})
       end
     end
+
+    it "works with invalid link target" do
+      post = Fabricate(:post, raw: '<a href="http:geturl">http:geturl</a>', user: user, topic: topic, cook_method: Post.cook_methods[:raw_html])
+      expect { TopicLink.extract_from(post) }.to_not raise_error
+    end
   end
 
 end
diff --git a/spec/models/topic_list_spec.rb b/spec/models/topic_list_spec.rb
index 83290142cb..dcb6b5aab7 100644
--- a/spec/models/topic_list_spec.rb
+++ b/spec/models/topic_list_spec.rb
@@ -60,7 +60,7 @@ describe TopicList do
       let!(:other_topic) { Fabricate(:topic) } # uncategorized
       let!(:tag) { Fabricate(:tag, topics: [topic], categories: [category], name: "category-tag") }
       let!(:other_tag) { Fabricate(:tag, topics: [topic], name: "use-anywhere") }
-      let(:topic_list) { TopicList.new('latest', topic.user, [topic], { category: category.id, category_id: category.id }) }
+      let(:topic_list) { TopicList.new('latest', topic.user, [topic], category: category.id, category_id: category.id) }
 
       it 'should only return tags allowed in the category' do
         expect(topic_list.tags).to eq([tag.name])
@@ -73,7 +73,7 @@ describe TopicList do
       it "with another category with no tags, should return no tags" do
         other_category = Fabricate(:category)
         topic3 = Fabricate(:topic, category: other_category)
-        list = TopicList.new('latest', topic3.user, [topic3], { category: other_category.id, category_id: other_category.id })
+        list = TopicList.new('latest', topic3.user, [topic3], category: other_category.id, category_id: other_category.id)
         expect(list.tags).to be_empty
       end
     end
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 1cee451baf..7134b10134 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -4,12 +4,29 @@ require 'rails_helper'
 require_dependency 'post_destroyer'
 
 describe Topic do
-  let(:now) { Time.zone.local(2013,11,20,8,0) }
+  let(:now) { Time.zone.local(2013, 11, 20, 8, 0) }
   let(:user) { Fabricate(:user) }
+  let(:topic) { Fabricate(:topic) }
 
   context 'validations' do
     let(:topic) { Fabricate.build(:topic) }
 
+    context "#featured_link" do
+      describe 'when featured_link contains more than a URL' do
+        it 'should not be valid' do
+          topic.featured_link = 'http://meta.discourse.org TEST'
+          expect(topic).to_not be_valid
+        end
+      end
+
+      describe 'when featured_link is a valid URL' do
+        it 'should be valid' do
+          topic.featured_link = 'http://meta.discourse.org'
+          expect(topic).to be_valid
+        end
+      end
+    end
+
     context "#title" do
       it { is_expected.to validate_presence_of :title }
 
@@ -30,11 +47,15 @@ describe Topic do
       end
 
       describe 'censored words' do
+        after do
+          $redis.flushall
+        end
+
         describe 'when title contains censored words' do
           it 'should not be valid' do
-            SiteSetting.censored_words = 'pineapple|pen'
+            ['pineapple', 'pen'].each { |w| Fabricate(:watched_word, word: w, action: WatchedWord.actions[:censor]) }
 
-            topic.title = 'pen PinEapple apple pen '
+            topic.title = 'pen PinEapple apple pen is a complete sentence'
 
             expect(topic).to_not be_valid
 
@@ -44,6 +65,14 @@ describe Topic do
           end
         end
 
+        describe 'titles with censored words not on boundaries' do
+          it "should be valid" do
+            Fabricate(:watched_word, word: 'apple', action: WatchedWord.actions[:censor])
+            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'
@@ -54,10 +83,12 @@ describe Topic do
 
         describe 'escape special characters in censored words' do
           before do
-            SiteSetting.censored_words = 'co(onut|coconut|a**le'
+            ['co(onut', 'coconut', 'a**le'].each do |w|
+              Fabricate(:watched_word, word: w, action: WatchedWord.actions[:censor])
+            end
           end
 
-          it 'should not valid' do
+          it 'should not be valid' do
             topic.title = "I have a co(onut a**le"
 
             expect(topic.valid?).to eq(false)
@@ -108,21 +139,25 @@ describe Topic do
   context 'slug' do
     let(:title) { "hello world topic" }
     let(:slug) { "hello-world-topic" }
+    let!(:expected_title) { title.dup }
+    let!(:expected_slug) { slug.dup }
+    let(:topic) { Fabricate.build(:topic, title: title) }
+
     context 'encoded generator' do
       before { SiteSetting.slug_generation_method = 'encoded' }
-      after { SiteSetting.slug_generation_method = 'ascii' }
 
       it "returns a Slug for a title" do
-        Slug.expects(:for).with(title).returns(slug)
-        expect(Fabricate.build(:topic, title: title).slug).to eq(slug)
+        expect(topic.title).to eq(expected_title)
+        expect(topic.slug).to eq(expected_slug)
       end
 
       context 'for cjk characters' do
         let(:title) { "熱帶風暴畫眉" }
-        let(:slug) { "熱帶風暴畫眉" }
+        let!(:expected_title) { title.dup }
+
         it "returns encoded Slug for a title" do
-          Slug.expects(:for).with(title).returns(slug)
-          expect(Fabricate.build(:topic, title: title).slug).to eq(slug)
+          expect(topic.title).to eq(expected_title)
+          expect(topic.slug).to eq(expected_title)
         end
       end
 
@@ -138,7 +173,7 @@ describe Topic do
 
     context 'none generator' do
       before { SiteSetting.slug_generation_method = 'none' }
-      after { SiteSetting.slug_generation_method = 'ascii' }
+
       let(:title) { "熱帶風暴畫眉" }
       let(:slug) { "topic" }
 
@@ -150,6 +185,7 @@ describe Topic do
 
     context '#ascii_generator' do
       before { SiteSetting.slug_generation_method = 'ascii' }
+
       it "returns a Slug for a title" do
         Slug.expects(:for).with(title).returns(slug)
         expect(Fabricate.build(:topic, title: title).slug).to eq(slug)
@@ -158,6 +194,7 @@ describe Topic do
       context 'for cjk characters' do
         let(:title) { "熱帶風暴畫眉" }
         let(:slug) { 'topic' }
+
         it "returns 'topic' when the slug is empty (say, non-latin characters)" do
           Slug.expects(:for).with(title).returns("topic")
           expect(Fabricate.build(:topic, title: title).slug).to eq("topic")
@@ -177,8 +214,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
@@ -251,12 +288,12 @@ describe Topic do
   context 'html in title' do
 
     def build_topic_with_title(title)
-      build(:topic, title: title).tap{ |t| t.valid? }
+      build(:topic, title: title).tap { |t| t.valid? }
     end
 
-    let(:topic_bold) { build_topic_with_title("Topic with <b>bold</b> text in its title" ) }
-    let(:topic_image) { build_topic_with_title("Topic with <img src='something'> image in its title" ) }
-    let(:topic_script) { build_topic_with_title("Topic with <script>alert('title')</script> script in its title" ) }
+    let(:topic_bold) { build_topic_with_title("Topic with <b>bold</b> text in its title") }
+    let(:topic_image) { build_topic_with_title("Topic with <img src='something'> image in its title") }
+    let(:topic_script) { build_topic_with_title("Topic with <script>alert('title')</script> script in its title") }
     let(:topic_emoji) { build_topic_with_title("I 💖 candy alot") }
 
     it "escapes script contents" do
@@ -278,7 +315,7 @@ describe Topic do
   end
 
   context 'fancy title' do
-    let(:topic) { Fabricate.build(:topic, title: "\"this topic\" -- has ``fancy stuff''" ) }
+    let(:topic) { Fabricate.build(:topic, title: "\"this topic\" -- has ``fancy stuff''") }
 
     context 'title_fancy_entities disabled' do
       before do
@@ -313,13 +350,42 @@ describe Topic do
         topic.title = "this is another edge case"
         expect(topic.fancy_title).to eq("this is another edge case")
       end
+
+      it "works with long title that results in lots of entities" do
+        long_title = "NEW STOCK PICK: PRCT - LAST PICK UP 233%, NNCO.................................................................................................................................................................. ofoum"
+        topic.title = long_title
+
+        expect { topic.save! }.to_not raise_error
+        expect(topic.fancy_title).to eq(long_title)
+      end
+
+      context 'readonly mode' do
+        before do
+          Discourse.enable_readonly_mode
+        end
+
+        after do
+          Discourse.disable_readonly_mode
+        end
+
+        it 'should not attempt to update `fancy_title`' do
+          topic.save!
+          expect(topic.fancy_title).to eq('&ldquo;this topic&rdquo; &ndash; has &ldquo;fancy stuff&rdquo;')
+
+          topic.title = "This is a test testing testing"
+          expect(topic.fancy_title).to eq("This is a test testing testing")
+
+          expect(topic.reload.read_attribute(:fancy_title))
+            .to eq('&ldquo;this topic&rdquo; &ndash; has &ldquo;fancy stuff&rdquo;')
+        end
+      end
     end
   end
 
   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 +406,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
@@ -353,7 +419,6 @@ describe Topic do
     end
   end
 
-
   context 'similar_to' do
 
     it 'returns blank with nil params' do
@@ -416,7 +481,6 @@ describe Topic do
 
   end
 
-
   context 'private message' do
     let(:coding_horror) { User.find_by(username: "CodingHorror") }
     let(:evil_trout) { Fabricate(:evil_trout) }
@@ -439,22 +503,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!(messageable_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
@@ -498,9 +582,9 @@ describe Topic do
       it "should set up actions correctly" do
         UserActionCreator.enable
 
-        expect(actions.map{|a| a.action_type}).not_to include(UserAction::NEW_TOPIC)
-        expect(actions.map{|a| a.action_type}).to include(UserAction::NEW_PRIVATE_MESSAGE)
-        expect(coding_horror.user_actions.map{|a| a.action_type}).to include(UserAction::GOT_PRIVATE_MESSAGE)
+        expect(actions.map { |a| a.action_type }).not_to include(UserAction::NEW_TOPIC)
+        expect(actions.map { |a| a.action_type }).to include(UserAction::NEW_PRIVATE_MESSAGE)
+        expect(coding_horror.user_actions.map { |a| a.action_type }).to include(UserAction::GOT_PRIVATE_MESSAGE)
       end
 
     end
@@ -510,8 +594,8 @@ describe Topic do
   context 'rate limits' do
 
     it "rate limits topic invitations" do
-      SiteSetting.stubs(:max_topic_invitations_per_day).returns(2)
-      RateLimiter.stubs(:disabled?).returns(false)
+      SiteSetting.max_topic_invitations_per_day = 2
+      RateLimiter.enable
       RateLimiter.clear_all!
 
       start = Time.now.tomorrow.beginning_of_day
@@ -567,21 +651,21 @@ describe Topic do
 
       it "bumps the topic when a new version is made of the last post" do
         expect {
-          @last_post.revise(Fabricate(:moderator), { raw: 'updated contents' })
+          @last_post.revise(Fabricate(:moderator), raw: 'updated contents')
           @topic.reload
         }.to change(@topic, :bumped_at)
       end
 
       it "doesn't bump the topic when a post that isn't the last post receives a new version" do
         expect {
-          @earlier_post.revise(Fabricate(:moderator), { raw: 'updated contents' })
+          @earlier_post.revise(Fabricate(:moderator), raw: 'updated contents')
           @topic.reload
         }.not_to change(@topic, :bumped_at)
       end
 
       it "doesn't bump the topic when a post have invalid topic title while edit" do
         expect {
-          @last_post.revise(Fabricate(:moderator), { title: 'invalid title' })
+          @last_post.revise(Fabricate(:moderator), title: 'invalid title')
           @topic.reload
         }.not_to change(@topic, :bumped_at)
       end
@@ -609,7 +693,7 @@ describe Topic do
 
     context "when moderator post fails to be created" do
       before do
-        user.toggle!(:blocked)
+        user.update_column(:silenced_till, 1.year.from_now)
       end
 
       it "should not increment moderator_posts_count" do
@@ -622,7 +706,6 @@ describe Topic do
     end
   end
 
-
   context 'update_status' do
     before do
       @topic = Fabricate(:topic, bumped_at: 1.hour.ago)
@@ -766,8 +849,8 @@ describe Topic do
       it_should_behave_like 'a status that closes a topic'
 
       context 'topic was set to close when it was created' do
-        it 'puts the autoclose duration in the moderator post' do
-          freeze_time(Time.new(2000,1,1))
+        it 'includes the autoclose duration in the moderator post' do
+          freeze_time(Time.new(2000, 1, 1))
           @topic.created_at = 3.days.ago
           @topic.update_status(status, true, @user)
           expect(@topic.posts.last.raw).to include "closed after 3 days"
@@ -775,8 +858,8 @@ describe Topic do
       end
 
       context 'topic was set to close after it was created' do
-        it 'puts the autoclose duration in the moderator post' do
-          freeze_time(Time.new(2000,1,1))
+        it 'includes the autoclose duration in the moderator post' do
+          freeze_time(Time.new(2000, 1, 1))
 
           @topic.created_at = 7.days.ago
 
@@ -844,7 +927,6 @@ describe Topic do
 
     end
 
-
   end
 
   context 'last_poster info' do
@@ -892,7 +974,7 @@ describe Topic do
   end
 
   describe 'meta data' do
-    let(:topic) { Fabricate(:topic, meta_data: {'hello' => 'world'}) }
+    let(:topic) { Fabricate(:topic, meta_data: { 'hello' => 'world' }) }
 
     it 'allows us to create a topic with meta data' do
       expect(topic.meta_data['hello']).to eq('world')
@@ -937,7 +1019,6 @@ describe Topic do
         end
       end
 
-
     end
 
   end
@@ -980,7 +1061,7 @@ describe Topic do
       end
 
       it 'should not change the topic_count when not changed' do
-       expect { topic.change_category_to_id(topic.category.id); category.reload }.not_to change(category, :topic_count)
+        expect { topic.change_category_to_id(topic.category.id); category.reload }.not_to change(category, :topic_count)
       end
 
       it "doesn't change the category when it can't be found" do
@@ -1037,6 +1118,21 @@ describe Topic do
             expect(topic_timer.execute_at).to be_within(1.second).of(Time.zone.now + 5.hours)
           end
 
+          describe 'when topic is already closed' do
+            before do
+              SiteSetting.queue_jobs = true
+              topic.update_status('closed', true, Discourse.system_user)
+            end
+
+            it 'should not set a topic timer' do
+              expect { topic.change_category_to_id(new_category.id) }
+                .to change { TopicTimer.with_deleted.count }.by(0)
+
+              expect(topic.closed).to eq(true)
+              expect(topic.reload.category).to eq(new_category)
+            end
+          end
+
           describe 'when topic has an existing topic timer' do
             let(:topic_timer) { Fabricate(:topic_timer, topic: topic) }
 
@@ -1057,7 +1153,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)) }
@@ -1091,7 +1187,7 @@ describe Topic do
         b = Fabricate(:topic, created_at: now)
         c = Fabricate(:topic, created_at: now)
         d = Fabricate(:topic, created_at: now - 2.minutes)
-        expect(Topic.by_newest).to eq([c,b,d,a])
+        expect(Topic.by_newest).to eq([c, b, d, a])
       end
     end
 
@@ -1123,103 +1219,89 @@ describe Topic do
     end
   end
 
+  describe '#private_topic_timer' do
+    let(:user) { Fabricate(:user) }
+
+    let(:topic_timer) do
+      Fabricate(:topic_timer,
+        public_type: false,
+        user: user,
+        status_type: TopicTimer.private_types[:reminder]
+      )
+    end
+
+    it 'should return the right record' do
+      expect(topic_timer.topic.private_topic_timer(user)).to eq(topic_timer)
+    end
+  end
+
   describe '#set_or_create_timer' 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) }
     let(:trust_level_4) { Fabricate(:trust_level_4) }
 
-    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
-    end
+      freeze_time now
 
-    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
+      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 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
-    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)
+      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
-    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)
+      expect(topic.topic_timers.first.execute_at).to eq(Time.zone.local(2013, 11, 22, 5, 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
-      topic.set_or_create_timer(TopicTimer.types[:close], 3, {by_user: admin})
+      topic.set_or_create_timer(TopicTimer.types[:close], 3, by_user: admin)
       expect(topic.topic_timers.first.user).to eq(admin)
     end
 
     it 'sets topic status update user to given user if it is a TL4 user' do
-      topic.set_or_create_timer(TopicTimer.types[:close], 3, {by_user: trust_level_4})
+      topic.set_or_create_timer(TopicTimer.types[:close], 3, by_user: trust_level_4)
       expect(topic.topic_timers.first.user).to eq(trust_level_4)
     end
 
     it 'sets topic status update user to system user if given user is not staff or a TL4 user' do
-      topic.set_or_create_timer(TopicTimer.types[:close], 3, {by_user: Fabricate.build(:user, id: 444)})
-      expect(topic.topic_timers.first.user).to eq(admin)
+      topic.set_or_create_timer(TopicTimer.types[:close], 3, by_user: Fabricate.build(:user, id: 444))
+      expect(topic.topic_timers.first.user).to eq(Discourse.system_user)
     end
 
     it 'sets topic status update user to system user if user is not given and topic creator is not staff nor TL4 user' do
       topic.set_or_create_timer(TopicTimer.types[:close], 3)
-      expect(topic.topic_timers.first.user).to eq(admin)
+      expect(topic.topic_timers.first.user).to eq(Discourse.system_user)
     end
 
     it 'sets topic status update user to topic creator if it is a staff user' do
@@ -1241,14 +1323,32 @@ 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 not delete topic_timer of another status_type' do
+      freeze_time
+      closing_topic.set_or_create_timer(TopicTimer.types[:open], nil)
+      topic_timer = closing_topic.public_topic_timer
+
+      expect(topic_timer.execute_at).to eq(5.hours.from_now)
+      expect(topic_timer.status_type).to eq(TopicTimer.types[:close])
+    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
-      expect{
+      expect {
         closing_topic.set_or_create_timer(TopicTimer.types[:close], 14)
       }.to_not change { closing_topic.topic_timers.first.created_at }
     end
@@ -1264,10 +1364,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
 
@@ -1283,15 +1383,23 @@ describe Topic do
         }.to change { TopicTimer.count }.by(1)
       end
 
+      it 'should not be override when setting a public topic timer' do
+        reminder
+
+        expect do
+          topic.set_or_create_timer(TopicTimer.types[:close], 3, by_user: reminder.user)
+        end.to change { TopicTimer.count }.by(1)
+      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
@@ -1299,100 +1407,131 @@ describe Topic do
   describe 'for_digest' do
     let(:user) { Fabricate.build(:user) }
 
-    it "returns none when there are no topics" do
-      expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
+    context "no edit grace period" do
+      before do
+        SiteSetting.editing_grace_period = 0
+      end
+
+      it "returns none when there are no topics" do
+        expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
+      end
+
+      it "doesn't return category topics" do
+        Fabricate(:category)
+        expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
+      end
+
+      it "returns regular topics" do
+        topic = Fabricate(:topic)
+        expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to eq([topic])
+      end
+
+      it "doesn't return topics from muted categories" do
+        user = Fabricate(:user)
+        category = Fabricate(:category)
+        Fabricate(:topic, category: category)
+
+        CategoryUser.set_notification_level_for_category(user, CategoryUser.notification_levels[:muted], category.id)
+
+        expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
+      end
+
+      it "doesn't return topics from suppressed categories" do
+        user = Fabricate(:user)
+        category = Fabricate(:category)
+        Fabricate(:topic, category: category)
+
+        SiteSetting.digest_suppress_categories = "#{category.id}"
+
+        expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
+      end
+
+      it "doesn't return topics from TL0 users" do
+        new_user = Fabricate(:user, trust_level: 0)
+        Fabricate(:topic, user_id: new_user.id)
+
+        expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
+      end
+
+      it "returns topics from TL0 users if given include_tl0" do
+        new_user = Fabricate(:user, trust_level: 0)
+        topic = Fabricate(:topic, user_id: new_user.id)
+
+        expect(Topic.for_digest(user, 1.year.ago, top_order: true, include_tl0: true)).to eq([topic])
+      end
+
+      it "returns topics from TL0 users if enabled in preferences" do
+        new_user = Fabricate(:user, trust_level: 0)
+        topic = Fabricate(:topic, user_id: new_user.id)
+
+        u = Fabricate(:user)
+        u.user_option.include_tl0_in_digests = true
+
+        expect(Topic.for_digest(u, 1.year.ago, top_order: true)).to eq([topic])
+      end
+
+      it "doesn't return topics with only muted tags" do
+        user = Fabricate(:user)
+        tag = Fabricate(:tag)
+        TagUser.change(user.id, tag.id, TagUser.notification_levels[:muted])
+        Fabricate(:topic, tags: [tag])
+
+        expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
+      end
+
+      it "returns topics with both muted and not muted tags" do
+        user = Fabricate(:user)
+        muted_tag, other_tag = Fabricate(:tag), Fabricate(:tag)
+        TagUser.change(user.id, muted_tag.id, TagUser.notification_levels[:muted])
+        topic = Fabricate(:topic, tags: [muted_tag, other_tag])
+
+        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) }
+        topic1 = Fabricate(:topic, category: category2)
+        2.times { |i| Fabricate(:topic, category: category1) }
+        CategoryUser.create(user: user, category: category2, notification_level: CategoryUser.notification_levels[:watching])
+        for_digest = Topic.for_digest(user, 1.year.ago, top_order: true)
+        expect(for_digest.first).to eq(topic1)
+      end
+
+      it "sorts by topic notification levels" do
+        topics = []
+        3.times { |i| topics << Fabricate(:topic) }
+        user = Fabricate(:user)
+        TopicUser.create(user_id: user.id, topic_id: topics[0].id, notification_level: TopicUser.notification_levels[:tracking])
+        TopicUser.create(user_id: user.id, topic_id: topics[2].id, notification_level: TopicUser.notification_levels[:watching])
+        for_digest = Topic.for_digest(user, 1.year.ago, top_order: true).pluck(:id)
+        expect(for_digest).to eq([topics[2].id, topics[0].id, topics[1].id])
+      end
     end
 
-    it "doesn't return category topics" do
-      Fabricate(:category)
-      expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
-    end
+    context "with editing_grace_period" do
+      before do
+        SiteSetting.editing_grace_period = 5.minutes
+      end
 
-    it "returns regular topics" do
-      topic = Fabricate(:topic)
-      expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to eq([topic])
-    end
-
-    it "doesn't return topics from muted categories" do
-      user = Fabricate(:user)
-      category = Fabricate(:category)
-      Fabricate(:topic, category: category)
-
-      CategoryUser.set_notification_level_for_category(user, CategoryUser.notification_levels[:muted], category.id)
-
-      expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
-    end
-
-    it "doesn't return topics from suppressed categories" do
-      user = Fabricate(:user)
-      category = Fabricate(:category)
-      Fabricate(:topic, category: category)
-
-      SiteSetting.digest_suppress_categories = "#{category.id}"
-
-      expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
-    end
-
-    it "doesn't return topics from TL0 users" do
-      new_user = Fabricate(:user, trust_level: 0)
-      Fabricate(:topic, user_id: new_user.id)
-
-      expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
-    end
-
-    it "returns topics from TL0 users if given include_tl0" do
-      new_user = Fabricate(:user, trust_level: 0)
-      topic = Fabricate(:topic, user_id: new_user.id)
-
-      expect(Topic.for_digest(user, 1.year.ago, top_order: true, include_tl0: true)).to eq([topic])
-    end
-
-    it "returns topics from TL0 users if enabled in preferences" do
-      new_user = Fabricate(:user, trust_level: 0)
-      topic = Fabricate(:topic, user_id: new_user.id)
-
-      u = Fabricate(:user)
-      u.user_option.include_tl0_in_digests = true
-
-      expect(Topic.for_digest(u, 1.year.ago, top_order: true)).to eq([topic])
-    end
-
-    it "doesn't return topics with only muted tags" do
-      user = Fabricate(:user)
-      tag = Fabricate(:tag)
-      TagUser.change(user.id, tag.id, TagUser.notification_levels[:muted])
-      Fabricate(:topic, tags: [tag])
-
-      expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to be_blank
-    end
-
-    it "returns topics with both muted and not muted tags" do
-      user = Fabricate(:user)
-      muted_tag, other_tag = Fabricate(:tag), Fabricate(:tag)
-      TagUser.change(user.id, muted_tag.id, TagUser.notification_levels[:muted])
-      topic = Fabricate(:topic, tags: [muted_tag, other_tag])
-
-      expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to eq([topic])
-    end
-
-    it "sorts by category notification levels" do
-      category1, category2 = Fabricate(:category), Fabricate(:category)
-      2.times {|i| Fabricate(:topic, category: category1) }
-      topic1 = Fabricate(:topic, category: category2)
-      2.times {|i| Fabricate(:topic, category: category1) }
-      CategoryUser.create(user: user, category: category2, notification_level: CategoryUser.notification_levels[:watching])
-      for_digest = Topic.for_digest(user, 1.year.ago, top_order: true)
-      expect(for_digest.first).to eq(topic1)
-    end
-
-    it "sorts by topic notification levels" do
-      topics = []
-      3.times {|i| topics << Fabricate(:topic) }
-      user = Fabricate(:user)
-      TopicUser.create(user_id: user.id, topic_id: topics[0].id, notification_level: TopicUser.notification_levels[:tracking])
-      TopicUser.create(user_id: user.id, topic_id: topics[2].id, notification_level: TopicUser.notification_levels[:watching])
-      for_digest = Topic.for_digest(user, 1.year.ago, top_order: true).pluck(:id)
-      expect(for_digest).to eq([topics[2].id, topics[0].id, topics[1].id])
+      it "excludes topics that are within the grace period" do
+        topic1 = Fabricate(:topic, created_at: 6.minutes.ago)
+        topic2 = Fabricate(:topic, created_at: 4.minutes.ago)
+        expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to eq([topic1])
+      end
     end
 
   end
@@ -1400,7 +1539,7 @@ describe Topic do
   describe 'secured' do
     it 'can remove secure groups' do
       category = Fabricate(:category, read_restricted: true)
-      Fabricate(:topic, category: category)
+      Fabricate(:topic, category: category, created_at: 1.day.ago)
 
       expect(Topic.secured(Guardian.new(nil)).count).to eq(0)
       expect(Topic.secured(Guardian.new(Fabricate(:admin))).count).to eq(2)
@@ -1461,39 +1600,38 @@ 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 } }
+
+    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
       expect(Topic.listable_count_per_day(2.days.ago, Time.now)).to include(listable_topics_count_per_day)
-      expect(Topic.listable_count_per_day(2.days.ago, Time.now)).not_to include({4.days.ago.to_date => 1})
+      expect(Topic.listable_count_per_day(2.days.ago, Time.now)).not_to include(4.days.ago.to_date => 1)
     end
   end
 
   describe '#secure_category?' do
-    let(:category){ Category.new }
+    let(:category) { Category.new }
 
     it "is true if the category is secure" do
       category.stubs(:read_restricted).returns(true)
-      expect(Topic.new(:category => category)).to be_read_restricted_category
+      expect(Topic.new(category: category)).to be_read_restricted_category
     end
 
     it "is false if the category is not secure" do
       category.stubs(:read_restricted).returns(false)
-      expect(Topic.new(:category => category)).not_to be_read_restricted_category
+      expect(Topic.new(category: category)).not_to be_read_restricted_category
     end
 
     it "is false if there is no category" do
-      expect(Topic.new(:category => nil)).not_to be_read_restricted_category
+      expect(Topic.new(category: nil)).not_to be_read_restricted_category
     end
   end
 
@@ -1554,7 +1692,7 @@ describe Topic do
       SiteSetting.max_replies_in_first_day = 1
       SiteSetting.stubs(:client_settings_json).returns(SiteSetting.client_settings_json_uncached)
       RateLimiter.stubs(:rate_limit_create_topic).returns(100)
-      RateLimiter.stubs(:disabled?).returns(false)
+      RateLimiter.enable
       RateLimiter.clear_all!
     end
 
@@ -1598,7 +1736,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
@@ -1663,15 +1801,15 @@ describe Topic do
     topic.save
 
     topic = Topic.find(topic.id)
-    expect(topic.custom_fields).to eq({"bob" => "marley", "jack" => "black"})
+    expect(topic.custom_fields).to eq("bob" => "marley", "jack" => "black")
   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 +1835,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
@@ -1936,4 +2074,38 @@ describe Topic do
       end
     end
   end
+
+  describe '#remove_allowed_user' do
+    let(:another_user) { Fabricate(:user) }
+
+    describe 'removing oneself' do
+      it 'should remove onself' do
+        topic.allowed_users << another_user
+
+        expect(topic.remove_allowed_user(another_user, another_user)).to eq(true)
+        expect(topic.allowed_users.include?(another_user)).to eq(false)
+
+        post = Post.last
+
+        expect(post.user).to eq(Discourse.system_user)
+        expect(post.post_type).to eq(Post.types[:small_action])
+        expect(post.action_code).to eq('user_left')
+      end
+    end
+  end
+
+  describe '#featured_link_root_domain' do
+    let(:topic) { Fabricate.build(:topic) }
+
+    [
+      "https://meta.discourse.org",
+      "https://meta.discourse.org/",
+      "https://meta.discourse.org/?filter=test",
+    ].each do |featured_link|
+      it "should extract the root domain from #{featured_link} correctly" do
+        topic.featured_link = featured_link
+        expect(topic.featured_link_root_domain).to eq("discourse.org")
+      end
+    end
+  end
 end
diff --git a/spec/models/topic_timer_spec.rb b/spec/models/topic_timer_spec.rb
index 7ffd78d2d6..ef1e32e712 100644
--- a/spec/models/topic_timer_spec.rb
+++ b/spec/models/topic_timer_spec.rb
@@ -5,10 +5,6 @@ RSpec.describe TopicTimer, type: :model do
   let(:topic) { Fabricate(:topic) }
   let(:admin) { Fabricate(:admin) }
 
-  before do
-    Jobs::ToggleTopicClosed.jobs.clear
-  end
-
   context "validations" do
     describe '#status_type' do
       it 'should ensure that only one active public topic status update exists' do
@@ -113,63 +109,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
 
@@ -248,7 +241,6 @@ RSpec.describe TopicTimer, type: :model do
   describe '.ensure_consistency!' do
     before do
       SiteSetting.queue_jobs = true
-      Jobs::ToggleTopicClosed.jobs.clear
     end
 
     it 'should enqueue jobs that have been missed' do
@@ -260,7 +252,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/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
index cd51c5ff76..aed7813ed8 100644
--- a/spec/models/topic_tracking_state_spec.rb
+++ b/spec/models/topic_tracking_state_spec.rb
@@ -39,7 +39,6 @@ describe TopicTrackingState do
     expect(report.length).to eq(1)
   end
 
-
   it "correctly handles capping" do
     user = Fabricate(:user)
 
diff --git a/spec/models/topic_user_spec.rb b/spec/models/topic_user_spec.rb
index bcc481c9c8..1c47b31a8b 100644
--- a/spec/models/topic_user_spec.rb
+++ b/spec/models/topic_user_spec.rb
@@ -90,7 +90,7 @@ describe TopicUser do
     u
   }
 
-  let(:topic_new_user) { TopicUser.get(topic, new_user)}
+  let(:topic_new_user) { TopicUser.get(topic, new_user) }
   let(:yesterday) { DateTime.now.yesterday }
 
   def ensure_topic_user
@@ -135,12 +135,12 @@ describe TopicUser do
 
     it 'should be set to "regular" notifications, by default on non creators' do
       ensure_topic_user
-      expect(TopicUser.get(topic,user).notification_level).to eq(TopicUser.notification_levels[:regular])
+      expect(TopicUser.get(topic, user).notification_level).to eq(TopicUser.notification_levels[:regular])
     end
 
     it 'reason should reset when changed' do
       topic.notify_muted!(topic.user)
-      expect(TopicUser.get(topic,topic.user).notifications_reason_id).to eq(TopicUser.notification_reasons[:user_changed])
+      expect(TopicUser.get(topic, topic.user).notifications_reason_id).to eq(TopicUser.notification_reasons[:user_changed])
     end
 
     it 'should have the correct reason for a user change when watched' do
@@ -190,7 +190,7 @@ describe TopicUser do
 
       TopicUser.track_visit!(topic.id, user.id)
       # reload is a no go
-      topic_user = TopicUser.get(topic,user)
+      topic_user = TopicUser.get(topic, user)
       expect(topic_user.first_visited_at.to_i).to eq(yesterday.to_i)
       expect(topic_user.last_visited_at.to_i).to eq(Time.zone.now.to_i)
 
@@ -201,12 +201,12 @@ describe TopicUser do
 
     context "without auto tracking" do
 
-      let(:topic_user) { TopicUser.get(topic,user) }
+      let(:topic_user) { TopicUser.get(topic, user) }
 
       it 'should create a new record for a visit' do
         freeze_time yesterday
 
-        TopicUser.update_last_read(user, topic.id, 1, 0)
+        TopicUser.update_last_read(user, topic.id, 1, 1, 0)
 
         expect(topic_user.last_read_post_number).to eq(1)
         expect(topic_user.last_visited_at.to_i).to eq(yesterday.to_i)
@@ -218,14 +218,14 @@ describe TopicUser do
         today = Time.zone.now
         freeze_time Time.zone.now
 
-        TopicUser.update_last_read(user, topic.id, 1, 0)
+        TopicUser.update_last_read(user, topic.id, 1, 1, 0)
 
         tomorrow = 1.day.from_now
         freeze_time tomorrow
 
         Fabricate(:post, topic: topic, user: user)
-        TopicUser.update_last_read(user, topic.id, 2, 0)
-        topic_user = TopicUser.get(topic,user)
+        TopicUser.update_last_read(user, topic.id, 2, 1, 0)
+        topic_user = TopicUser.get(topic, user)
 
         expect(topic_user.last_read_post_number).to eq(2)
         expect(topic_user.last_visited_at.to_i).to eq(today.to_i)
@@ -249,7 +249,7 @@ describe TopicUser do
       let(:post_creator) { PostCreator.new(new_user, raw: Fabricate.build(:post).raw, topic_id: topic.id) }
 
       before do
-        TopicUser.update_last_read(new_user, topic.id, 2, 0)
+        TopicUser.update_last_read(new_user, topic.id, 2, 2, 0)
       end
 
       it 'should automatically track topics you reply to' do
@@ -311,13 +311,13 @@ describe TopicUser do
 
       it 'should automatically track topics after they are read for long enough' do
         expect(topic_new_user.notification_level).to eq(TopicUser.notification_levels[:regular])
-        TopicUser.update_last_read(new_user, topic.id, 2, SiteSetting.default_other_auto_track_topics_after_msecs + 1)
+        TopicUser.update_last_read(new_user, topic.id, 2, 2, SiteSetting.default_other_auto_track_topics_after_msecs + 1)
         expect(TopicUser.get(topic, new_user).notification_level).to eq(TopicUser.notification_levels[:tracking])
       end
 
       it 'should not automatically track topics after they are read for long enough if changed manually' do
         TopicUser.change(new_user, topic, notification_level: TopicUser.notification_levels[:regular])
-        TopicUser.update_last_read(new_user, topic, 2, SiteSetting.default_other_auto_track_topics_after_msecs + 1)
+        TopicUser.update_last_read(new_user, topic, 2, 2, SiteSetting.default_other_auto_track_topics_after_msecs + 1)
         expect(topic_new_user.notification_level).to eq(TopicUser.notification_levels[:regular])
       end
     end
@@ -370,7 +370,7 @@ describe TopicUser do
     TopicUser.exec_sql("UPDATE topic_users set highest_seen_post_number=1, last_read_post_number=0
                        WHERE topic_id = :topic_id AND user_id = :user_id", topic_id: p1.topic_id, user_id: p1.user_id)
 
-    [p1,p2].each do |p|
+    [p1, p2].each do |p|
       PostTiming.create(topic_id: p.topic_id, post_number: p.post_number, user_id: p.user_id, msecs: 100)
     end
 
diff --git a/spec/models/topic_view_item_spec.rb b/spec/models/topic_view_item_spec.rb
index ff5940a3a4..d811a56c40 100644
--- a/spec/models/topic_view_item_spec.rb
+++ b/spec/models/topic_view_item_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe TopicViewItem do
 
-  def add(topic_id, ip, user_id=nil)
+  def add(topic_id, ip, user_id = nil)
     skip_redis = true
     TopicViewItem.add(topic_id, ip, user_id, nil, skip_redis)
   end
diff --git a/spec/models/translation_override_spec.rb b/spec/models/translation_override_spec.rb
index d1c40d61cd..9929d325f6 100644
--- a/spec/models/translation_override_spec.rb
+++ b/spec/models/translation_override_spec.rb
@@ -1,6 +1,41 @@
 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', '%{key} %{omg}'
+          )
+
+          expect(translation_override.errors.full_messages).to include(I18n.t(
+            'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
+            keys: 'key, omg'
+          ))
+        end
+
+        context 'when custom interpolation keys are included' do
+          it 'should be valid' do
+            translation_override = TranslationOverride.upsert!(
+              I18n.locale,
+              'some_key',
+              "#{described_class::CUSTOM_INTERPOLATION_KEYS_WHITELIST['user_notifications.user_'].join(", ")} %{something}"
+            )
+
+            expect(translation_override.errors.full_messages).to include(I18n.t(
+              'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
+              keys: 'something'
+            ))
+          end
+        end
+      end
+    end
+  end
 
   it "upserts values" do
     TranslationOverride.upsert!('en', 'some.key', 'some value')
@@ -19,4 +54,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 cb0a2b4e44..1c99fd9ee9 100644
--- a/spec/models/trust_level3_requirements_spec.rb
+++ b/spec/models/trust_level3_requirements_spec.rb
@@ -10,27 +10,27 @@ describe TrustLevel3Requirements do
   end
 
   def make_view(id, at, user_id)
-    TopicViewItem.add(id, '11.22.33.44', user_id, at, _skip_redis=true)
+    TopicViewItem.add(id, '11.22.33.44', user_id, at, _skip_redis = true)
   end
 
   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)
@@ -125,12 +125,12 @@ describe TrustLevel3Requirements do
 
       _not_a_reply = create_post(user: user) # user created the topic, so it doesn't count
 
-      topic1      = create_post.topic
+      topic1 = create_post.topic
       _reply1      = create_post(topic: topic1, user: user)
       _reply_again = create_post(topic: topic1, user: user) # two replies in one topic
 
-      topic2      = create_post(created_at: 101.days.ago).topic
-      _reply2      = create_post(topic: topic2, user: user, created_at: 101.days.ago) # topic is over 100 days old
+      topic2 = create_post(created_at: 101.days.ago).topic
+      _reply2 = create_post(topic: topic2, user: user, created_at: 101.days.ago) # topic is over 100 days old
 
       expect(tl3_requirements.num_topics_replied_to).to eq(1)
     end
diff --git a/spec/models/twitter_user_info_spec.rb b/spec/models/twitter_user_info_spec.rb
index 708b3d4c60..6c664068ba 100644
--- a/spec/models/twitter_user_info_spec.rb
+++ b/spec/models/twitter_user_info_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe TwitterUserInfo do
   it "does not overflow" do
-    id =  22019458041
+    id = 22019458041
     info = TwitterUserInfo.create!(user_id: -1, screen_name: 'sam', twitter_user_id: id)
     info.reload
     expect(info.twitter_user_id).to eq(id)
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index c187ddbe67..b8803fda54 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
@@ -46,6 +46,18 @@ describe Upload do
 
   end
 
+  it "extracts file extension" do
+    created_upload = UploadCreator.new(image, image_filename).create_for(user_id)
+    expect(created_upload.extension).to eq("png")
+  end
+
+  it "should create an invalid upload when the filename is blank" do
+    SiteSetting.authorized_extensions = "*"
+
+    created_upload = UploadCreator.new(image, nil).create_for(user_id)
+    expect(created_upload.valid?).to eq(false)
+  end
+
   context ".get_from_url" do
     let(:url) { "/uploads/default/original/3X/1/0/10f73034616a796dfd70177dc54b6def44c4ba6f.png" }
     let(:upload) { Fabricate(:upload, url: url) }
@@ -108,4 +120,26 @@ describe Upload do
     end
   end
 
+  describe '.short_url' do
+    it "should generate a correct short url" do
+      upload = Upload.new(sha1: 'bda2c513e1da04f7b4e99230851ea2aafeb8cc4e', extension: 'png')
+      expect(upload.short_url).to eq('upload://r3AYqESanERjladb4vBB7VsMBm6.png')
+    end
+  end
+
+  describe '.sha1_from_short_url' do
+    it "should be able to look up sha1" do
+      sha1 = 'bda2c513e1da04f7b4e99230851ea2aafeb8cc4e'
+
+      expect(Upload.sha1_from_short_url('upload://r3AYqESanERjladb4vBB7VsMBm6.png')).to eq(sha1)
+      expect(Upload.sha1_from_short_url('upload://r3AYqESanERjladb4vBB7VsMBm6')).to eq(sha1)
+      expect(Upload.sha1_from_short_url('r3AYqESanERjladb4vBB7VsMBm6')).to eq(sha1)
+    end
+
+    it "should be able to look up sha1 even with leading zeros" do
+      sha1 = '0000c513e1da04f7b4e99230851ea2aafeb8cc4e'
+      expect(Upload.sha1_from_short_url('upload://1Eg9p8rrCURq4T3a6iJUk0ri6.png')).to eq(sha1)
+    end
+  end
+
 end
diff --git a/spec/models/user_action_spec.rb b/spec/models/user_action_spec.rb
index 73ccd9a067..d76d6afad6 100644
--- a/spec/models/user_action_spec.rb
+++ b/spec/models/user_action_spec.rb
@@ -23,7 +23,7 @@ describe UserAction do
       topic
     end
 
-    def log_test_action(opts={})
+    def log_test_action(opts = {})
       UserAction.log_action!({
         action_type: UserAction::NEW_PRIVATE_MESSAGE,
         user_id: user.id,
@@ -33,76 +33,104 @@ describe UserAction do
       }.merge(opts))
     end
 
-    before do
-      # Create some test data using a helper
-      log_test_action
-      log_test_action(action_type: UserAction::GOT_PRIVATE_MESSAGE)
-      log_test_action(action_type: UserAction::NEW_TOPIC, target_topic_id: public_topic.id, target_post_id: public_post.id)
-      log_test_action(action_type: UserAction::BOOKMARK)
+    describe "integration" do
+      before do
+        # Create some test data using a helper
+        log_test_action
+        log_test_action(action_type: UserAction::GOT_PRIVATE_MESSAGE)
+        log_test_action(action_type: UserAction::NEW_TOPIC, target_topic_id: public_topic.id, target_post_id: public_post.id)
+        log_test_action(action_type: UserAction::BOOKMARK)
+      end
+
+      def stats_for_user(viewer = nil)
+        UserAction.stats(user.id, Guardian.new(viewer)).map { |r| r["action_type"].to_i }.sort
+      end
+
+      def stream_count(viewer = nil)
+        UserAction.stream(user_id: user.id, guardian: Guardian.new(viewer)).count
+      end
+
+      it 'includes the events correctly' do
+        PostActionNotifier.enable
+
+        mystats = stats_for_user(user)
+        expecting = [UserAction::NEW_TOPIC, UserAction::NEW_PRIVATE_MESSAGE, UserAction::GOT_PRIVATE_MESSAGE, UserAction::BOOKMARK].sort
+        expect(mystats).to eq(expecting)
+        expect(stream_count(user)).to eq(4)
+
+        other_stats = stats_for_user
+        expecting = [UserAction::NEW_TOPIC]
+        expect(stream_count).to eq(1)
+
+        expect(other_stats).to eq(expecting)
+
+        public_topic.trash!(user)
+        expect(stats_for_user).to eq([])
+        expect(stream_count).to eq(0)
+
+        # groups
+        category = Fabricate(:category, read_restricted: true)
+
+        public_topic.recover!
+        public_topic.category = category
+        public_topic.save
+
+        expect(stats_for_user).to eq([])
+        expect(stream_count).to eq(0)
+
+        group = Fabricate(:group)
+        u = Fabricate(:coding_horror)
+        group.add(u)
+        group.save
+
+        category.set_permissions(group => :full)
+        category.save
+
+        expect(stats_for_user(u)).to eq([UserAction::NEW_TOPIC])
+        expect(stream_count(u)).to eq(1)
+
+        # duplicate should not exception out
+        log_test_action
+
+        # recategorize belongs to the right user
+        category2 = Fabricate(:category)
+        admin = Fabricate(:admin)
+        public_post.revise(admin, category_id: category2.id)
+
+        action = UserAction.stream(user_id: public_topic.user_id, guardian: Guardian.new)[0]
+        expect(action.acting_user_id).to eq(admin.id)
+        expect(action.action_type).to eq(UserAction::EDIT)
+      end
     end
 
-    def stats_for_user(viewer=nil)
-      UserAction.stats(user.id, Guardian.new(viewer)).map{|r| r["action_type"].to_i}.sort
-    end
+    describe "mentions" do
+      before do
+        log_test_action(action_type: UserAction::MENTION)
+      end
 
-    def stream_count(viewer=nil)
-      UserAction.stream(user_id: user.id, guardian: Guardian.new(viewer)).count
-    end
+      let(:stream) do
+        UserAction.stream(
+          user_id: user.id,
+          guardian: Guardian.new(user)
+        )
+      end
 
-    it 'includes the events correctly' do
-      PostActionNotifier.enable
+      it "is returned by the stream" do
+        expect(stream).to be_present
+      end
 
-      mystats = stats_for_user(user)
-      expecting = [UserAction::NEW_TOPIC, UserAction::NEW_PRIVATE_MESSAGE, UserAction::GOT_PRIVATE_MESSAGE, UserAction::BOOKMARK].sort
-      expect(mystats).to eq(expecting)
-      expect(stream_count(user)).to eq(4)
-
-      other_stats = stats_for_user
-      expecting = [UserAction::NEW_TOPIC]
-      expect(stream_count).to eq(1)
-
-      expect(other_stats).to eq(expecting)
-
-      public_topic.trash!(user)
-      expect(stats_for_user).to eq([])
-      expect(stream_count).to eq(0)
-
-      # groups
-      category = Fabricate(:category, read_restricted: true)
-
-      public_topic.recover!
-      public_topic.category = category
-      public_topic.save
-
-      expect(stats_for_user).to eq([])
-      expect(stream_count).to eq(0)
-
-      group = Fabricate(:group)
-      u = Fabricate(:coding_horror)
-      group.add(u)
-      group.save
-
-      category.set_permissions(group => :full)
-      category.save
-
-      expect(stats_for_user(u)).to eq([UserAction::NEW_TOPIC])
-      expect(stream_count(u)).to eq(1)
-
-      # duplicate should not exception out
-      log_test_action
-
-      # recategorize belongs to the right user
-      category2 = Fabricate(:category)
-      admin = Fabricate(:admin)
-      public_post.revise(admin, { category_id: category2.id})
-
-      action = UserAction.stream(user_id: public_topic.user_id, guardian: Guardian.new)[0]
-      expect(action.acting_user_id).to eq(admin.id)
-      expect(action.action_type).to eq(UserAction::EDIT)
+      it "isn't returned when mentions aren't enabled" do
+        SiteSetting.enable_mentions = false
+        expect(stream).to be_blank
+      end
     end
 
   end
 
+  describe "mentions" do
+    it "returns the mention in the stream" do
+    end
+  end
   describe 'when user likes' do
 
     let(:post) { Fabricate(:post) }
@@ -198,7 +226,6 @@ describe UserAction do
       expect(@post.user.user_actions.find_by(action_type: UserAction::REPLY)).to eq(nil)
     end
 
-
     describe 'when another user posts on the topic' do
       before do
         @other_user = Fabricate(:coding_horror)
@@ -254,7 +281,7 @@ describe UserAction do
     end
 
     let(:private_message) do
-      PostCreator.create( user,
+      PostCreator.create(user,
                           raw: 'this is a private message',
                           title: 'this is the pm title',
                           target_usernames: user2.username,
diff --git a/spec/models/user_api_key_spec.rb b/spec/models/user_api_key_spec.rb
index 0ad783865b..90293fcba4 100644
--- a/spec/models/user_api_key_spec.rb
+++ b/spec/models/user_api_key_spec.rb
@@ -8,11 +8,10 @@ describe UserApiKey do
       expect(key.allow?("PATH_INFO" => "/random", "REQUEST_METHOD" => "GET")).to eq(false)
       expect(key.allow?("PATH_INFO" => "/message-bus/1234/poll", "REQUEST_METHOD" => "POST")).to eq(true)
 
-      expect(key.allow?("action_dispatch.request.path_parameters" => {:controller => "notifications", :action => "mark_read"},
+      expect(key.allow?("action_dispatch.request.path_parameters" => { controller: "notifications", action: "mark_read" },
                         "PATH_INFO" => "/xyz", "REQUEST_METHOD" => "PUT")).to eq(true)
 
-
-      expect(key.allow?("action_dispatch.request.path_parameters" => {:controller => "user_api_keys", :action => "revoke"},
+      expect(key.allow?("action_dispatch.request.path_parameters" => { controller: "user_api_keys", action: "revoke" },
                         "PATH_INFO" => "/xyz", "REQUEST_METHOD" => "POST")).to eq(true)
 
     end
diff --git a/spec/models/user_archived_message_spec.rb b/spec/models/user_archived_message_spec.rb
index cb3567b5db..060a097de8 100644
--- a/spec/models/user_archived_message_spec.rb
+++ b/spec/models/user_archived_message_spec.rb
@@ -7,7 +7,7 @@ describe UserArchivedMessage do
 
     topic = create_post(user: user,
                         skip_validations: true,
-                        target_usernames: [user2.username,user.username].join(","),
+                        target_usernames: [user2.username, user.username].join(","),
                         archetype: Archetype.private_message).topic
 
     UserArchivedMessage.archive!(user.id, topic.id)
@@ -18,4 +18,3 @@ describe UserArchivedMessage do
     expect(topic.message_archived?(user)).to eq(true)
   end
 end
-
diff --git a/spec/models/user_auth_token_spec.rb b/spec/models/user_auth_token_spec.rb
index 11ed5f8212..ffe003c43d 100644
--- a/spec/models/user_auth_token_spec.rb
+++ b/spec/models/user_auth_token_spec.rb
@@ -58,8 +58,8 @@ describe UserAuthToken do
     user = Fabricate(:user)
 
     user_token = UserAuthToken.generate!(user_id: user.id,
-                                    user_agent: "some user agent 2",
-                                    client_ip: "1.1.2.3")
+                                         user_agent: "some user agent 2",
+                                         client_ip: "1.1.2.3")
 
     expect(user_token.auth_token_seen).to eq(false)
 
@@ -75,8 +75,8 @@ describe UserAuthToken do
     user = Fabricate(:user)
 
     user_token = UserAuthToken.generate!(user_id: user.id,
-                                    user_agent: "some user agent 2",
-                                    client_ip: "1.1.2.3")
+                                         user_agent: "some user agent 2",
+                                         client_ip: "1.1.2.3")
 
     user_token.update_columns(auth_token_seen: true)
     expect(user_token.rotate!).to eq(true)
@@ -90,8 +90,8 @@ describe UserAuthToken do
     user = Fabricate(:user)
 
     user_token = UserAuthToken.generate!(user_id: user.id,
-                                    user_agent: "some user agent 2",
-                                    client_ip: "1.1.2.3")
+                                         user_agent: "some user agent 2",
+                                         client_ip: "1.1.2.3")
 
     UserAuthToken.lookup(user_token.unhashed_auth_token, seen: true)
 
@@ -118,8 +118,8 @@ describe UserAuthToken do
     user = Fabricate(:user)
 
     user_token = UserAuthToken.generate!(user_id: user.id,
-                                    user_agent: "some user agent 2",
-                                    client_ip: "1.1.2.3")
+                                         user_agent: "some user agent 2",
+                                         client_ip: "1.1.2.3")
 
     prev_auth_token = user_token.auth_token
     unhashed_prev = user_token.unhashed_auth_token
@@ -242,7 +242,6 @@ describe UserAuthToken do
       path: "/path"
     ).count).to eq(1)
 
-
     freeze_time(UserAuthToken::ROTATE_TIME.from_now)
 
     token.rotate!(user_agent: "firefox", client_ip: "1.1.1.1")
@@ -264,7 +263,6 @@ describe UserAuthToken do
                                     user_agent: "some user agent",
                                     client_ip: "1.1.2.3")
 
-
     lookup = UserAuthToken.lookup(token.unhashed_auth_token, seen: true)
     lookup = UserAuthToken.lookup(token.unhashed_auth_token, seen: true)
     lookup.reload
diff --git a/spec/models/user_avatar_spec.rb b/spec/models/user_avatar_spec.rb
index 46269b6a34..e76da53807 100644
--- a/spec/models/user_avatar_spec.rb
+++ b/spec/models/user_avatar_spec.rb
@@ -23,7 +23,6 @@ describe UserAvatar do
       user.user_avatar.destroy
       user.reload
 
-
       FileHelper.stubs(:download).returns(file_from_fixtures("logo.png"))
 
       UserAvatar.import_url_for_user("logo.png", user)
diff --git a/spec/models/user_history_spec.rb b/spec/models/user_history_spec.rb
index 659432d956..823dcc5440 100644
--- a/spec/models/user_history_spec.rb
+++ b/spec/models/user_history_spec.rb
@@ -21,8 +21,8 @@ describe UserHistory do
   describe '#staff_action_records' do
     context "with some records" do
       before do
-        @change_site_setting = UserHistory.create!({action: UserHistory.actions[:change_site_setting], subject: "title", previous_value: "Old", new_value: "New"})
-        @change_trust_level  = UserHistory.create!({action: UserHistory.actions[:change_trust_level], target_user_id: Fabricate(:user).id, details: "stuff happened"})
+        @change_site_setting = UserHistory.create!(action: UserHistory.actions[:change_site_setting], subject: "title", previous_value: "Old", new_value: "New")
+        @change_trust_level  = UserHistory.create!(action: UserHistory.actions[:change_trust_level], target_user_id: Fabricate(:user).id, details: "stuff happened")
       end
 
       it "returns all records for admins" do
diff --git a/spec/models/user_option_spec.rb b/spec/models/user_option_spec.rb
index 8b85a552a4..832de55276 100644
--- a/spec/models/user_option_spec.rb
+++ b/spec/models/user_option_spec.rb
@@ -19,7 +19,7 @@ describe UserOption do
     let!(:user) { Fabricate(:user) }
 
     it "should be redirected to top when there is a reason to" do
-      user.user_option.expects(:redirected_to_top).returns({ reason: "42" })
+      user.user_option.expects(:redirected_to_top).returns(reason: "42")
       expect(user.user_option.should_be_redirected_to_top).to eq(true)
     end
 
@@ -56,20 +56,20 @@ describe UserOption do
     let!(:user) { Fabricate(:user) }
 
     it "should have no reason when `SiteSetting.redirect_users_to_top_page` is disabled" do
-      SiteSetting.expects(:redirect_users_to_top_page).returns(false)
+      SiteSetting.redirect_users_to_top_page = false
       expect(user.user_option.redirected_to_top).to eq(nil)
     end
 
     context "when `SiteSetting.redirect_users_to_top_page` is enabled" do
-      before { SiteSetting.expects(:redirect_users_to_top_page).returns(true) }
+      before { SiteSetting.redirect_users_to_top_page = true }
 
       it "should have no reason when top is not in the `SiteSetting.top_menu`" do
-        SiteSetting.expects(:top_menu).returns("latest")
+        SiteSetting.top_menu = "latest"
         expect(user.user_option.redirected_to_top).to eq(nil)
       end
 
       context "and when top is in the `SiteSetting.top_menu`" do
-        before { SiteSetting.expects(:top_menu).returns("latest|top") }
+        before { SiteSetting.top_menu = "latest|top" }
 
         it "should have no reason when there are not enough topics" do
           SiteSetting.expects(:min_redirected_to_top_period).returns(nil)
@@ -87,10 +87,12 @@ describe UserOption do
             end
 
             it "should have a reason for the first visit" do
-              expect(user.user_option.redirected_to_top).to eq({
-                reason: I18n.t('redirected_to_top_reasons.new_user'),
-                period: :monthly
-              })
+              freeze_time do
+                delay = SiteSetting.active_user_rate_limit_secs / 2
+                Jobs.expects(:enqueue_in).with(delay, :update_top_redirection, user_id: user.id, redirected_at: Time.zone.now)
+
+                expect(user.user_option.redirected_to_top).to eq(reason: I18n.t('redirected_to_top_reasons.new_user'), period: :monthly)
+              end
             end
 
             it "should not have a reason for next visits" do
@@ -108,10 +110,8 @@ describe UserOption do
               user.last_seen_at = 2.months.ago
               user.user_option.expects(:update_last_redirected_to_top!).once
 
-              expect(user.user_option.redirected_to_top).to eq({
-                reason: I18n.t('redirected_to_top_reasons.not_seen_in_a_month'),
-                period: :monthly
-              })
+              expect(user.user_option.redirected_to_top).to eq(reason: I18n.t('redirected_to_top_reasons.not_seen_in_a_month'),
+                                                               period: :monthly)
             end
 
           end
diff --git a/spec/models/user_profile_spec.rb b/spec/models/user_profile_spec.rb
index 34a88c48cd..0fffc455aa 100644
--- a/spec/models/user_profile_spec.rb
+++ b/spec/models/user_profile_spec.rb
@@ -55,17 +55,21 @@ describe UserProfile do
     end
 
     context "website validation" do
-      let(:user) { Fabricate(:user) }
+      let(:user_profile) { Fabricate.build(:user_profile, user: Fabricate(:user)) }
 
-      it "ensures website is valid" do
-        expect(Fabricate.build(:user_profile, user: user, website: "http://https://google.com")).not_to be_valid
-        expect(Fabricate.build(:user_profile, user: user, website: "https://google.com")).to be_valid
+      it "should not allow invalid URLs" do
+        user_profile.website = "http://https://google.com"
+        expect(user_profile).to_not be_valid
       end
 
       it "validates website domain if user_website_domains_whitelist setting is present" do
         SiteSetting.user_website_domains_whitelist = "discourse.org"
-        expect(Fabricate.build(:user_profile, user: user, website: "https://google.com")).not_to be_valid
-        expect(Fabricate.build(:user_profile, user: user, website: "http://discourse.org")).to be_valid
+
+        user_profile.website = "https://google.com"
+        expect(user_profile).not_to be_valid
+
+        user_profile.website = "http://discourse.org"
+        expect(user_profile).to be_valid
       end
     end
 
@@ -101,6 +105,23 @@ describe UserProfile do
     end
   end
 
+  describe 'bio excerpt emojis' do
+    let(:user) { Fabricate(:user) }
+
+    before do
+      CustomEmoji.create!(name: 'test', upload_id: 1)
+      Emoji.clear_cache
+
+      user.user_profile.bio_raw = "hello :test: :woman_scientist:t5: 🤔"
+      user.user_profile.save
+      user.user_profile.reload
+    end
+
+    it 'supports emoji images' do
+      expect(user.user_profile.bio_excerpt(500, keep_emoji_images: true)).to eq("hello <img src=\"/uploads/default/original/1X/f588830852fc8091a094cf0be0be0e6559dc8304.png?v=5\" title=\":test:\" class=\"emoji emoji-custom\" alt=\":test:\"> <img src=\"/images/emoji/twitter/woman_scientist/5.png?v=5\" title=\":woman_scientist:t5:\" class=\"emoji\" alt=\":woman_scientist:t5:\"> <img src=\"/images/emoji/twitter/thinking.png?v=5\" title=\":thinking:\" class=\"emoji\" alt=\":thinking:\">")
+    end
+  end
+
   describe 'bio link stripping' do
 
     it 'returns an empty string with no bio' do
@@ -143,7 +164,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 +190,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_profile_view_spec.rb b/spec/models/user_profile_view_spec.rb
index 8c4f8a56de..de82b167c7 100644
--- a/spec/models/user_profile_view_spec.rb
+++ b/spec/models/user_profile_view_spec.rb
@@ -5,14 +5,14 @@ RSpec.describe UserProfileView do
   let(:other_user) { Fabricate(:user) }
   let(:user_profile_id) { user.user_profile.id }
 
-  def add(user_profile_id, ip, user_id=nil, at=nil)
+  def add(user_profile_id, ip, user_id = nil, at = nil)
     described_class.add(user_profile_id, ip, user_id, at, true)
   end
 
   it "should increase user's profile view count" do
-    expect{ add(user_profile_id, '1.1.1.1') }.to change{ described_class.count }.by(1)
+    expect { add(user_profile_id, '1.1.1.1') }.to change { described_class.count }.by(1)
     expect(user.user_profile.reload.views).to eq(1)
-    expect{ add(user_profile_id, '1.1.1.1', other_user.id) }.to change{ described_class.count }.by(1)
+    expect { add(user_profile_id, '1.1.1.1', other_user.id) }.to change { described_class.count }.by(1)
 
     user_profile = user.user_profile.reload
     expect(user_profile.views).to eq(2)
diff --git a/spec/models/user_search_spec.rb b/spec/models/user_search_spec.rb
index 0f8bfd63ba..73b85885ec 100644
--- a/spec/models/user_search_spec.rb
+++ b/spec/models/user_search_spec.rb
@@ -134,6 +134,9 @@ describe UserSearch do
     # don't return staged users
     results = search_for(staged.username)
     expect(results).to be_blank
+
+    results = search_for(staged.username, include_staged_users: true)
+    expect(results.first.username).to eq(staged.username)
   end
 
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 8100e92782..d057e042c3 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -2,18 +2,19 @@ require 'rails_helper'
 require_dependency 'user'
 
 describe User do
+  let(:user) { Fabricate(:user) }
 
   context 'validations' do
     it { is_expected.to validate_presence_of :username }
+    it { is_expected.to validate_presence_of :primary_email }
 
     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 +22,19 @@ 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
+
+      describe 'when user is staged' do
+        it 'should still validate presence of primary_email' do
+          user.staged = true
+          user.email = nil
+
+          expect(user).to_not be_valid
+          expect(user.errors.messages).to include(:primary_email)
         end
       end
     end
@@ -30,19 +43,18 @@ 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} }
+    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
       expect(User.count_by_signup_date(2.days.ago, Time.now)).to include(signups_by_day)
-      expect(User.count_by_signup_date(2.days.ago, Time.now)).not_to include({4.days.ago.to_date => 1})
+      expect(User.count_by_signup_date(2.days.ago, Time.now)).not_to include(4.days.ago.to_date => 1)
     end
   end
 
@@ -55,7 +67,7 @@ describe User do
     end
 
     it "doesn't enqueue the system message when the site settings disable it" do
-      SiteSetting.expects(:send_welcome_message?).returns(false)
+      SiteSetting.send_welcome_message = false
       Jobs.expects(:enqueue).with(:send_system_message, user_id: user.id, message_type: 'welcome_user').never
       user.enqueue_welcome_message('welcome_user')
     end
@@ -66,7 +78,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,15 +86,17 @@ 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
 
     it 'triggers a extensibility event' do
       user && admin # bypass the user_created event
-      DiscourseEvent.expects(:trigger).with(:user_approved, user).once
-      user.approve(admin)
+      event = DiscourseEvent.track_events { user.approve(admin) }.first
+
+      expect(event[:event_name]).to eq(:user_approved)
+      expect(event[:params].first).to eq(user)
     end
 
     context 'after approval' do
@@ -104,7 +118,6 @@ describe User do
     end
   end
 
-
   describe 'bookmark' do
     before do
       @post = Fabricate(:post)
@@ -181,8 +194,10 @@ describe User do
     end
 
     it 'triggers an extensibility event' do
-      DiscourseEvent.expects(:trigger).with(:user_created, subject).once
-      subject.save!
+      event = DiscourseEvent.track_events { subject.save! }.first
+
+      expect(event[:event_name]).to eq(:user_created)
+      expect(event[:params].first).to eq(subject)
     end
 
     context 'after_save' do
@@ -279,7 +294,6 @@ describe User do
 
     end
 
-
   end
 
   describe 'staff and regular users' do
@@ -449,12 +463,12 @@ describe User do
     end
 
     it "should not allow saving if username is reused" do
-       @codinghorror.username = @user.username
+      @codinghorror.username = @user.username
        expect(@codinghorror.save).to eq(false)
     end
 
     it "should not allow saving if username is reused in different casing" do
-       @codinghorror.username = @user.username.upcase
+      @codinghorror.username = @user.username.upcase
        expect(@codinghorror.save).to eq(false)
     end
   end
@@ -470,9 +484,16 @@ describe User do
 
     it 'returns false when a username is reserved' do
       SiteSetting.reserved_usernames = 'test|donkey'
-
       expect(User.username_available?('tESt')).to eq(false)
     end
+
+    it "returns true when username is associated to a staged user of the same email" do
+      staged = Fabricate(:user, staged: true, email: "foo@bar.com")
+      expect(User.username_available?(staged.username, staged.primary_email.email)).to eq(true)
+
+      user = Fabricate(:user, email: "bar@foo.com")
+      expect(User.username_available?(user.username, user.primary_email.email)).to eq(false)
+    end
   end
 
   describe '.reserved_username?' do
@@ -568,7 +589,9 @@ describe User do
 
     it 'whitelist should reject some emails based on the email_domains_whitelist site setting' do
       SiteSetting.email_domains_whitelist = 'vaynermedia.com'
-      expect(Fabricate.build(:user, email: 'notgood@mailinator.com')).not_to be_valid
+      user = Fabricate.build(:user, email: 'notgood@mailinator.com')
+      expect(user).not_to be_valid
+      expect(user.errors.messages[:primary_email]).to include(I18n.t('user.email.not_allowed'))
       expect(Fabricate.build(:user, email: 'sbauch@vaynermedia.com')).to be_valid
     end
 
@@ -599,7 +622,7 @@ describe User do
 
     it 'email whitelist should be used when email is being changed' do
       SiteSetting.email_domains_whitelist = 'vaynermedia.com'
-      u = Fabricate(:user, email: 'good@vaynermedia.com')
+      u = Fabricate(:user_single_email, email: 'good@vaynermedia.com')
       u.email = 'nope@mailinator.com'
       expect(u).not_to be_valid
     end
@@ -607,7 +630,10 @@ describe User do
     it "doesn't validate email address for staged users" do
       SiteSetting.email_domains_whitelist = "foo.com"
       SiteSetting.email_domains_blacklist = "bar.com"
-      expect(Fabricate.build(:user, staged: true, email: "foo@bar.com")).to be_valid
+
+      user = Fabricate.build(:user, staged: true, email: "foo@bar.com")
+
+      expect(user.save).to eq(true)
     end
   end
 
@@ -625,7 +651,7 @@ describe User do
 
       UserAuthToken.generate!(user_id: @user.id)
 
-      @user.password = "passwordT"
+      @user.password = "passwordT0"
       @user.save!
 
       # must expire old token on password change
@@ -644,8 +670,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
@@ -711,12 +737,12 @@ 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
+        $redis.flushall
       end
 
       it "updates last_seen_at" do
@@ -735,16 +761,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
@@ -755,14 +777,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
@@ -790,7 +808,7 @@ describe User do
 
     context 'when user has no email tokens for some reason' do
       it 'should return false' do
-        user.email_tokens.each {|t| t.destroy}
+        user.email_tokens.each { |t| t.destroy }
         user.reload
         expect(user.email_confirmed?).to eq(true)
       end
@@ -885,8 +903,8 @@ describe User do
 
   describe "#new_user_posting_on_first_day?" do
 
-    def test_user?(opts={})
-      Fabricate.build(:user, {created_at: Time.zone.now}.merge(opts)).new_user_posting_on_first_day?
+    def test_user?(opts = {})
+      Fabricate.build(:user, { created_at: Time.zone.now }.merge(opts)).new_user_posting_on_first_day?
     end
 
     it "handles when user has never posted" do
@@ -965,7 +983,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
 
@@ -1115,7 +1133,6 @@ describe User do
     end
   end
 
-
   describe "automatic avatar creation" do
     it "sets a system avatar for new users" do
       SiteSetting.external_system_avatars_enabled = false
@@ -1148,7 +1165,7 @@ describe User do
       user.save
       user = User.find(user.id)
 
-      expect(user.custom_fields).to eq({"jack" => "jill"})
+      expect(user.custom_fields).to eq("jack" => "jill")
     end
   end
 
@@ -1177,6 +1194,15 @@ describe User do
       expect(all_users.include?(inactive)).to eq(true)
       expect(all_users.include?(inactive_old)).to eq(false)
     end
+
+    it "does nothing if purge_unactivated_users_grace_period_days is 0" do
+      SiteSetting.purge_unactivated_users_grace_period_days = 0
+      User.purge_unactivated
+      all_users = User.all
+      expect(all_users.include?(user)).to eq(true)
+      expect(all_users.include?(inactive)).to eq(true)
+      expect(all_users.include?(inactive_old)).to eq(true)
+    end
   end
 
   describe "hash_passwords" do
@@ -1216,29 +1242,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)
 
@@ -1259,13 +1272,13 @@ 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")
       expect(user.trust_level).to eq(1)
-      expect(user.trust_level_locked).to eq(true)
+      expect(user.manual_locked_trust_level).to be_nil
+      expect(user.group_locked_trust_level).to eq(1)
     end
   end
 
@@ -1412,9 +1425,8 @@ describe User do
     let(:user) { Fabricate(:user) }
 
     it 'should publish the right message' do
-      message = MessageBus.track_publish { user.logged_out }.first
+      message = MessageBus.track_publish('/logout') { user.logged_out }.first
 
-      expect(message.channel).to eq('/logout')
       expect(message.data).to eq(user.id)
     end
   end
@@ -1507,10 +1519,53 @@ 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])
     end
   end
+
+  describe '#publish_notifications_state' do
+    it 'should publish the right message' do
+      notification = Fabricate(:notification, user: user)
+      notification2 = Fabricate(:notification, user: user, read: true)
+
+      message = MessageBus.track_publish("/notification/#{user.id}") do
+        user.publish_notifications_state
+      end.first
+
+      expect(message.data[:recent]).to eq([
+        [notification2.id, true], [notification.id, false]
+      ])
+    end
+  end
+
+  describe "silenced?" do
+
+    it "is not silenced by default" do
+      expect(Fabricate(:user)).not_to be_silenced
+    end
+
+    it "is not silenced with a date in the past" do
+      expect(Fabricate(:user, silenced_till: 1.month.ago)).not_to be_silenced
+    end
+
+    it "is is silenced with a date in the future" do
+      expect(Fabricate(:user, silenced_till: 1.month.from_now)).to be_silenced
+    end
+
+    context "finders" do
+      let!(:user0) { Fabricate(:user, silenced_till: 1.month.ago) }
+      let!(:user1) { Fabricate(:user, silenced_till: 1.month.from_now) }
+
+      it "doesn't return old silenced records" do
+        expect(User.silenced).to_not include(user0)
+        expect(User.silenced).to include(user1)
+        expect(User.not_silenced).to include(user0)
+        expect(User.not_silenced).to_not include(user1)
+      end
+    end
+  end
+
 end
diff --git a/spec/models/user_stat_spec.rb b/spec/models/user_stat_spec.rb
index f440d78b21..ccb9638d7a 100644
--- a/spec/models/user_stat_spec.rb
+++ b/spec/models/user_stat_spec.rb
@@ -72,7 +72,6 @@ describe UserStat do
     end
   end
 
-
   describe 'update_time_read!' do
     let(:user) { Fabricate(:user) }
     let(:stat) { user.user_stat }
diff --git a/spec/models/user_visit_spec.rb b/spec/models/user_visit_spec.rb
index 658d1a43c2..7532c73cb4 100644
--- a/spec/models/user_visit_spec.rb
+++ b/spec/models/user_visit_spec.rb
@@ -23,19 +23,18 @@ 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 } }
+    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
       expect(UserVisit.by_day(2.days.ago, Time.zone.now)).to include(visits_by_day)
-      expect(UserVisit.by_day(2.days.ago, Time.zone.now)).not_to include({4.days.ago.to_date => 1})
+      expect(UserVisit.by_day(2.days.ago, Time.zone.now)).not_to include(4.days.ago.to_date => 1)
     end
   end
 end
diff --git a/spec/models/watched_word_spec.rb b/spec/models/watched_word_spec.rb
new file mode 100644
index 0000000000..7bc52d47e5
--- /dev/null
+++ b/spec/models/watched_word_spec.rb
@@ -0,0 +1,92 @@
+require 'rails_helper'
+
+describe WatchedWord do
+
+  it "can't have duplicate words" do
+    Fabricate(:watched_word, word: "darn", action: described_class.actions[:block])
+    w = Fabricate.build(:watched_word, word: "darn", action: described_class.actions[:block])
+    expect(w.save).to eq(false)
+    w = Fabricate.build(:watched_word, word: "darn", action: described_class.actions[:flag])
+    expect(w.save).to eq(false)
+    expect(described_class.count).to eq(1)
+  end
+
+  it "downcases words" do
+    expect(described_class.create(word: "ShooT").word).to eq('shoot')
+  end
+
+  it "strips leading and trailing spaces" do
+    expect(described_class.create(word: "  poutine  ").word).to eq('poutine')
+  end
+
+  it "squeezes multiple asterisks" do
+    expect(described_class.create(word: "a**les").word).to eq('a*les')
+  end
+
+  describe "action_key=" do
+    let(:w) { WatchedWord.new(word: "troll") }
+
+    it "sets action attr from symbol" do
+      described_class.actions.keys.each do |k|
+        w.action_key = k
+        expect(w.action).to eq(described_class.actions[k])
+      end
+    end
+
+    it "sets action attr from string" do
+      described_class.actions.keys.each do |k|
+        w.action_key = k.to_s
+        expect(w.action).to eq(described_class.actions[k])
+      end
+    end
+
+    it "sets error for invalid key" do
+      w.action_key = "shame"
+      expect(w).to_not be_valid
+      expect(w.errors[:action]).to be_present
+    end
+  end
+
+  describe '#create_or_update_word' do
+    it "can create a new record" do
+      expect {
+        w = described_class.create_or_update_word(word: 'nickelback', action_key: :block)
+        expect(w.reload.action).to eq(described_class.actions[:block])
+      }.to change { described_class.count }.by(1)
+    end
+
+    it "can update an existing record with different action" do
+      existing = Fabricate(:watched_word, action: described_class.actions[:flag])
+      expect {
+        w = described_class.create_or_update_word(word: existing.word, action_key: :block)
+        expect(w.reload.action).to eq(described_class.actions[:block])
+        expect(w.id).to eq(existing.id)
+      }.to_not change { described_class.count }
+    end
+
+    it "doesn't error for existing record with same action" do
+      existing = Fabricate(:watched_word, action: described_class.actions[:flag], created_at: 1.day.ago, updated_at: 1.day.ago)
+      expect {
+        w = described_class.create_or_update_word(word: existing.word, action_key: :flag)
+        expect(w.id).to eq(existing.id)
+        expect(w.updated_at).to eq(w.updated_at)
+      }.to_not change { described_class.count }
+    end
+
+    it "allows action param instead of action_key" do
+      expect {
+        w = described_class.create_or_update_word(word: 'nickelback', action: described_class.actions[:block])
+        expect(w.reload.action).to eq(described_class.actions[:block])
+      }.to change { described_class.count }.by(1)
+    end
+
+    it "normalizes input" do
+      existing = Fabricate(:watched_word, action: described_class.actions[:flag])
+      expect {
+        w = described_class.create_or_update_word(word: "  #{existing.word.upcase}  ", action_key: :block)
+        expect(w.reload.action).to eq(described_class.actions[:block])
+        expect(w.id).to eq(existing.id)
+      }.to_not change { described_class.count }
+    end
+  end
+end
diff --git a/spec/models/web_hook_event_spec.rb b/spec/models/web_hook_event_spec.rb
index 5f6a9046bc..b09b3c30ed 100644
--- a/spec/models/web_hook_event_spec.rb
+++ b/spec/models/web_hook_event_spec.rb
@@ -4,13 +4,36 @@ describe WebHookEvent do
   let(:event) { WebHookEvent.new(status: 200, web_hook: Fabricate(:web_hook)) }
   let(:failed_event) { WebHookEvent.new(status: 400, web_hook: Fabricate(:web_hook)) }
 
-  it 'update last delivery status for associated WebHook record' do
-    event.update_web_hook_delivery_status
-    expect(event.web_hook.last_delivery_status).to eq(WebHook.last_delivery_statuses[:successful])
+  describe '.purge_old' do
+    before do
+      SiteSetting.retain_web_hook_events_period_days = 1
+    end
+
+    it "should be able to purge old web hook events" do
+      web_hook = Fabricate(:web_hook)
+      web_hook_event = WebHookEvent.create!(status: 200, web_hook: web_hook)
+      WebHookEvent.create!(status: 200, web_hook: web_hook, created_at: 2.days.ago)
+
+      expect { described_class.purge_old }
+        .to change { WebHookEvent.count }.by(-1)
+
+      expect(WebHookEvent.find(web_hook_event.id)).to eq(web_hook_event)
+    end
   end
 
-  it 'sets last delivery status to failed' do
-    failed_event.update_web_hook_delivery_status
-    expect(failed_event.web_hook.last_delivery_status).to eq(WebHook.last_delivery_statuses[:failed])
+  describe '#update_web_hook_delivery_status' do
+    it 'update last delivery status for associated WebHook record' do
+      event.update_web_hook_delivery_status
+
+      expect(event.web_hook.last_delivery_status)
+        .to eq(WebHook.last_delivery_statuses[:successful])
+    end
+
+    it 'sets last delivery status to failed' do
+      failed_event.update_web_hook_delivery_status
+
+      expect(failed_event.web_hook.last_delivery_status)
+        .to eq(WebHook.last_delivery_statuses[:failed])
+    end
   end
 end
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index d65641ea7e..dbb53ca837 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -35,10 +35,21 @@ describe WebHook do
   end
 
   context 'web hooks' do
-    let!(:post_hook) { Fabricate(:web_hook) }
+    let!(:post_hook) { Fabricate(:web_hook, payload_url: " https://example.com ") }
     let!(:topic_hook) { Fabricate(:topic_web_hook) }
 
+    it "removes whitspace from payload_url before saving" do
+      expect(post_hook.payload_url).to eq("https://example.com")
+    end
+
     describe '#find_by_type' do
+      it "returns unique hooks" do
+        post_hook.web_hook_event_types << WebHookEventType.find_by(name: 'topic')
+        post_hook.update!(wildcard_web_hook: true)
+
+        expect(WebHook.find_by_type(:post)).to eq([post_hook])
+      end
+
       it 'find relevant hooks' do
         expect(WebHook.find_by_type(:post)).to eq([post_hook])
         expect(WebHook.find_by_type(:topic)).to eq([topic_hook])
@@ -113,7 +124,7 @@ describe WebHook do
       Fabricate(:topic_web_hook)
 
       Sidekiq::Testing.fake! do
-        post = PostCreator.create(user, { raw: 'post', title: 'topic', skip_validations: true })
+        post = PostCreator.create(user, raw: 'post', title: 'topic', skip_validations: true)
         topic_id = post.topic_id
         job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
 
@@ -203,6 +214,18 @@ describe WebHook do
 
         expect(job_args["event_name"]).to eq("user_updated")
         expect(job_args["user_id"]).to eq(user.id)
+
+        user.logged_out
+        job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+        expect(job_args["event_name"]).to eq("user_logged_out")
+        expect(job_args["user_id"]).to eq(user.id)
+
+        user.logged_in
+        job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
+
+        expect(job_args["event_name"]).to eq("user_logged_in")
+        expect(job_args["user_id"]).to eq(user.id)
       end
     end
   end
diff --git a/spec/multisite/distributed_cache_spec.rb b/spec/multisite/distributed_cache_spec.rb
new file mode 100644
index 0000000000..6267e18194
--- /dev/null
+++ b/spec/multisite/distributed_cache_spec.rb
@@ -0,0 +1,48 @@
+require 'rails_helper'
+
+RSpec.describe 'Multisite SiteSettings' do
+  let(:conn) { RailsMultisite::ConnectionManagement }
+
+  before do
+    conn.config_filename = "spec/fixtures/multisite/two_dbs.yml"
+    conn.load_settings!
+    conn.remove_class_variable(:@@current_db)
+  end
+
+  after do
+    conn.clear_settings!
+
+    [:@@db_spec_cache, :@@host_spec_cache, :@@default_spec].each do |class_variable|
+      conn.remove_class_variable(class_variable)
+    end
+
+    conn.set_current_db
+  end
+
+  def cache(name, namespace: true)
+    DistributedCache.new(name, namespace: namespace)
+  end
+
+  context 'without namespace' do
+    let(:cache1) { cache('test', namespace: false) }
+
+    it 'does not leak state across multisite' do
+      cache1['default'] = true
+
+      expect(cache1.hash).to eq('default' => true)
+
+      conn.with_connection('second') do
+        message = MessageBus.track_publish(DistributedCache::Manager::CHANNEL_NAME) do
+          cache1['second'] = true
+        end.first
+
+        expect(message.data[:hash_key]).to eq('test')
+        expect(message.data[:op]).to eq(:set)
+        expect(message.data[:key]).to eq('second')
+        expect(message.data[:value]).to eq(true)
+      end
+
+      expect(cache1.hash).to eq('default' => true, 'second' => true)
+    end
+  end
+end
diff --git a/spec/multisite/jobs.rb b/spec/multisite/jobs.rb
new file mode 100644
index 0000000000..d9a88b0294
--- /dev/null
+++ b/spec/multisite/jobs.rb
@@ -0,0 +1,31 @@
+require 'rails_helper'
+
+RSpec.describe "Running Sidekiq Jobs in Multisite" do
+  let(:conn) { RailsMultisite::ConnectionManagement }
+
+  before do
+    conn.config_filename = "spec/fixtures/multisite/two_dbs.yml"
+    conn.load_settings!
+    conn.remove_class_variable(:@@current_db)
+  end
+
+  after do
+    conn.clear_settings!
+
+    [:@@db_spec_cache, :@@host_spec_cache, :@@default_spec].each do |class_variable|
+      conn.remove_class_variable(class_variable)
+    end
+
+    conn.set_current_db
+  end
+
+  it 'should revert back to the default connection' do
+    expect(RailsMultisite::ConnectionManagement.current_db)
+      .to eq('default')
+
+    Jobs::DestroyOldDeletionStubs.new.perform({})
+
+    expect(RailsMultisite::ConnectionManagement.current_db)
+      .to eq('default')
+  end
+end
diff --git a/spec/multisite/site_settings_spec.rb b/spec/multisite/site_settings_spec.rb
new file mode 100644
index 0000000000..09a5b90bb5
--- /dev/null
+++ b/spec/multisite/site_settings_spec.rb
@@ -0,0 +1,54 @@
+require 'rails_helper'
+
+RSpec.describe 'Multisite SiteSettings' do
+  let(:conn) { RailsMultisite::ConnectionManagement }
+
+  before do
+    @original_provider = SiteSetting.provider
+    SiteSetting.provider = SiteSettings::DbProvider.new(SiteSetting)
+    conn.config_filename = "spec/fixtures/multisite/two_dbs.yml"
+    conn.load_settings!
+    conn.remove_class_variable(:@@current_db)
+  end
+
+  after do
+    ['default', 'second'].each do |db|
+      conn.with_connection(db) { SiteSetting.where(name: 'default_locale').destroy_all }
+    end
+
+    conn.clear_settings!
+
+    [:@@db_spec_cache, :@@host_spec_cache, :@@default_spec].each do |class_variable|
+      conn.remove_class_variable(class_variable)
+    end
+
+    conn.set_current_db
+    SiteSetting.provider = @original_provider
+  end
+
+  describe '#default_locale' do
+    it 'should return the right locale' do
+      conn.with_connection('default') do
+        expect(SiteSetting.default_locale).to eq('en')
+      end
+
+      conn.with_connection('second') do
+        SiteSetting.default_locale = 'zh_TW'
+
+        expect(SiteSetting.default_locale).to eq('zh_TW')
+      end
+
+      conn.with_connection('default') do
+        expect(SiteSetting.default_locale).to eq('en')
+
+        SiteSetting.default_locale = 'ja'
+
+        expect(SiteSetting.default_locale).to eq('ja')
+      end
+
+      conn.with_connection('second') do
+        expect(SiteSetting.default_locale).to eq('zh_TW')
+      end
+    end
+  end
+end
diff --git a/spec/phantom_js/smoke_test.js b/spec/phantom_js/smoke_test.js
deleted file mode 100644
index 04d0984399..0000000000
--- a/spec/phantom_js/smoke_test.js
+++ /dev/null
@@ -1,305 +0,0 @@
-/*global phantom:true */
-
-console.log("Starting Discourse Smoke Test");
-
-var system = require("system");
-
-if (system.args.length !== 2) {
-  console.log("Expecting: phantomjs {smoke_test.js} {url}");
-  phantom.exit(1);
-}
-
-var TIMEOUT = 25000;
-var page = require("webpage").create();
-
-if (system.env["AUTH_USER"] && system.env["AUTH_PASSWORD"]) {
-  page.settings.userName = system.env["AUTH_USER"];
-  page.settings.password = system.env["AUTH_PASSWORD"];
-}
-
-page.viewportSize = {
-  width: 1366,
-  height: 768
-};
-
-// In the browser, when the cookies are disabled, it also disables the localStorage
-// Here, we're mocking that behavior and making sure the application doesn't blow up
-page.onInitialized = function() {
-  page.evaluate(function() {
-    localStorage["disableLocalStorage"] = true;
-  });
-};
-
-page.onConsoleMessage = function(msg) {
-  console.log(msg);
-};
-
-page.waitFor = function(desc, fn, cb) {
-  var start = +new Date();
-
-  var check = function() {
-    var r;
-
-    try { r = page.evaluate(fn); } catch (err) { }
-
-    var diff = (+new Date()) - start;
-
-    if (r) {
-      console.log("PASSED: " + desc + " - " + diff + "ms");
-      cb(true);
-    } else {
-      if (diff > TIMEOUT) {
-        console.log("FAILED: " + desc + " - " + diff + "ms");
-        page.render('/tmp/failed.png');
-        console.log('Content:' + page.content);
-        cb(false);
-      } else {
-        setTimeout(check, 25);
-      }
-    }
-  };
-
-  check();
-};
-
-
-var actions = [];
-
-function test(desc, fn) {
-  actions.push({ test: fn, desc: desc });
-};
-
-// function wait(delay) {
-//   actions.push({ wait: delay });
-// }
-
-function exec(desc, fn) {
-  actions.push({ exec: fn, desc: desc });
-};
-
-function execAsync(desc, delay, fn) {
-  actions.push({ execAsync: fn, delay: delay, desc: desc });
-};
-
-// function upload(input, path) {
-//   actions.push({ upload: path, input: input });
-// };
-
-// function screenshot(filename) {
-//   actions.push({ screenshot: filename });
-// }
-
-function run() {
-  var allPassed = true;
-
-  var done = function() {
-    console.log(allPassed ? "ALL PASSED" : "SMOKE TEST FAILED");
-    phantom.exit();
-  };
-
-  var performNextAction = function() {
-    if (!allPassed || actions.length === 0) {
-      done();
-    } else {
-      var action = actions[0];
-      actions = actions.splice(1);
-      if (action.test) {
-        page.waitFor(action.desc, action.test, function(success) {
-          allPassed = allPassed && success;
-          performNextAction();
-        });
-      } else if (action.exec) {
-        console.log("EXEC: " + action.desc);
-        page.evaluate(action.exec, system);
-        performNextAction();
-      } else if (action.execAsync) {
-        console.log("EXEC ASYNC: " + action.desc + " - " + action.delay + "ms");
-        setTimeout(function() {
-          page.evaluate(action.execAsync);
-          performNextAction();
-        }, action.delay);
-      } else if (action.upload) {
-        console.log("UPLOAD: " + action.upload);
-        page.uploadFile(action.input, action.upload);
-        performNextAction();
-      } else if (action.screenshot) {
-        console.log("SCREENSHOT: " + action.screenshot);
-        page.render(action.screenshot);
-        performNextAction();
-      } else if (action.wait) {
-        console.log("WAIT: " + action.wait + "ms");
-        setTimeout(function() {
-          performNextAction();
-        }, action.wait);
-      }
-    }
-  };
-
-  performNextAction();
-};
-
-var runTests = function() {
-
-  test("expect a log in button in the header", function() {
-    return $("header .login-button").length;
-  });
-
-  execAsync("go to latest page", 500, function(){
-    window.location = "/latest";
-  });
-
-  test("at least one topic shows up", function() {
-    return $(".topic-list tbody tr").length;
-  });
-
-  execAsync("go to categories page", 500, function(){
-    window.location = "/categories";
-  });
-
-  test("can see categories on the page", function() {
-    return $('.category-list').length;
-  });
-
-  execAsync("navigate to 1st topic", 500, function() {
-    $(".main-link a.title:first").click();
-  });
-
-  test("at least one post body", function() {
-    return $(".topic-post").length;
-  });
-
-  execAsync("click on the 1st user", 500, function() {
-    // remove the popup action for testing
-    $(".topic-meta-data a:first").data("ember-action", "");
-    $(".topic-meta-data a:first").focus().click();
-  });
-
-  test("user has details", function() {
-    return $("#user-card .names").length;
-  });
-
-  exec("open login modal", function() {
-    $(".login-button").click();
-  });
-
-  test("login modal is open", function() {
-    return $(".login-modal").length;
-  });
-
-  exec("type in credentials & log in", function(system) {
-    $("#login-account-name").val(system.env['DISCOURSE_USERNAME'] || 'smoke_user').trigger("change");
-    $("#login-account-password").val(system.env["DISCOURSE_PASSWORD"] || 'P4ssw0rd').trigger("change");
-    $(".login-modal .btn-primary").click();
-  });
-
-  test("is logged in", function() {
-    return $(".current-user").length;
-  });
-
-  exec("go home", function() {
-    if ($('#site-logo').length) $('#site-logo').click();
-    if ($('#site-text-logo').length) $('#site-text-logo').click();
-  });
-
-  test("it shows a topic list", function() {
-    return $(".topic-list").length;
-  });
-
-  test('we have a create topic button', function() {
-    return $("#create-topic").length;
-  });
-
-  exec("open composer", function() {
-    $("#create-topic").click();
-  });
-
-  test('the editor is visible', function() {
-    return $(".d-editor").length;
-  });
-
-  exec("compose new topic", function() {
-    var date = " (" + (+new Date()) + ")",
-        title = "This is a new topic" + date,
-        post = "I can write a new topic inside the smoke test!" + date + "\n\n";
-
-    $("#reply-title").val(title).trigger("change");
-    $("#reply-control .d-editor-input").val(post).trigger("change");
-    $("#reply-control .d-editor-input").focus()[0].setSelectionRange(post.length, post.length);
-  });
-
-  test("updates preview", function() {
-    return $(".d-editor-preview p").length;
-  });
-
-  exec("open upload modal", function() {
-    $(".d-editor-button-bar .upload").click();
-  });
-
-  test("upload modal is open", function() {
-    return $("#filename-input").length;
-  });
-
-  // TODO: Looks like PhantomJS 2.0.0 has a bug with `uploadFile`
-  // which breaks this code.
-
-  // upload("#filename-input", "spec/fixtures/images/large & unoptimized.png");
-  // test("the file is inserted into the input", function() {
-  //   return document.getElementById('filename-input').files.length
-  // });
-  // screenshot('/tmp/upload-modal.png');
-  //
-  // test("upload modal is open", function() {
-  //   return document.querySelector("#filename-input");
-  // });
-  //
-  // exec("click upload button", function() {
-  //   $(".modal .btn-primary").click();
-  // });
-  //
-  // test("image is uploaded", function() {
-  //   return document.querySelector(".cooked img");
-  // });
-
-  exec("submit the topic", function() {
-    $("#reply-control .create").click();
-  });
-
-  test("topic is created", function() {
-    return $(".fancy-title").length;
-  });
-
-  exec("click reply button", function() {
-    $(".post-controls:first .create").click();
-  });
-
-  test("composer is open", function() {
-    return $("#reply-control .d-editor-input").length;
-  });
-
-  exec("compose reply", function() {
-    var post = "I can even write a reply inside the smoke test ;) (" + (+new Date()) + ")";
-    $("#reply-control .d-editor-input").val(post).trigger("change");
-  });
-
-  test("waiting for the preview", function() {
-    return $(".d-editor-preview").text().trim().indexOf("I can even write") === 0;
-  });
-
-  execAsync("submit the reply", 6000, function() {
-    $("#reply-control .create").click();
-  });
-
-  test("reply is created", function() {
-    return !document.querySelector(".saving-text")
-        && $(".topic-post").length === 2;
-  });
-
-  run();
-};
-
-phantom.clearCookies();
-page.open(system.args[1], function() {
-  page.evaluate(function() { localStorage.clear(); });
-  console.log("OPENED: " + system.args[1]);
-  runTests();
-});
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 6354862d9e..d2b575f294 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -4,193 +4,224 @@ if ENV['COVERAGE']
 end
 
 require 'rubygems'
-require 'spork'
 require 'rbtrace'
-#uncomment the following line to use spork with the debugger
-#require 'spork/ext/ruby-debug'
 
-Spork.prefork do
-  # Loading more in this block will cause your tests to run faster. However,
-  # if you change any configuration or code from libraries loaded here, you'll
-  # need to restart spork for it take effect.
-  require 'fabrication'
-  require 'mocha/api'
-  require 'certified'
-  require 'webmock/rspec'
+# Loading more in this block will cause your tests to run faster. However,
+# if you change any configuration or code from libraries loaded here, you'll
+# need to restart spork for it take effect.
+require 'fabrication'
+require 'mocha/api'
+require 'certified'
+require 'webmock/rspec'
 
-  ENV["RAILS_ENV"] ||= 'test'
-  require File.expand_path("../../config/environment", __FILE__)
-  require 'rspec/rails'
-  require 'shoulda'
-  require 'sidekiq/testing'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+require 'shoulda'
+require 'sidekiq/testing'
 
-  # Requires supporting ruby files with custom matchers and macros, etc,
-  # in spec/support/ and its subdirectories.
-  Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
-  Dir[Rails.root.join("spec/fabricators/*.rb")].each {|f| require f}
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+Dir[Rails.root.join("spec/fabricators/*.rb")].each { |f| require f }
 
-  # Require plugin helpers at plugin/[plugin]/spec/plugin_helper.rb (includes symlinked plugins).
-  if ENV['LOAD_PLUGINS'] == "1"
-    Dir[Rails.root.join("plugins/*/spec/plugin_helper.rb")].each do |f|
-      require f
-    end
-  end
-
-  # let's not run seed_fu every test
-  SeedFu.quiet = true if SeedFu.respond_to? :quiet
-
-  SiteSetting.automatically_download_gravatars = false
-
-  SeedFu.seed
-
-  RSpec.configure do |config|
-    config.fail_fast = ENV['RSPEC_FAIL_FAST'] == "1"
-    config.include Helpers
-    config.include MessageBus
-    config.include RSpecHtmlMatchers
-    config.include IntegrationHelpers, type: :request
-    config.mock_framework = :mocha
-    config.order = 'random'
-    config.infer_spec_type_from_file_location!
-
-    # If you're not using ActiveRecord, or you'd prefer not to run each of your
-    # examples within a transaction, remove the following line or assign false
-    # instead of true.
-    config.use_transactional_fixtures = true
-
-    # If true, the base class of anonymous controllers will be inferred
-    # automatically. This will be the default behavior in future versions of
-    # rspec-rails.
-    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
-      User.skip_callback(:create, :after, :ensure_in_trust_level_group)
-
-      DiscoursePluginRegistry.clear if ENV['LOAD_PLUGINS'] != "1"
-      Discourse.current_user_provider = TestCurrentUserProvider
-
-      SiteSetting.refresh!
-
-      # Rebase defaults
-      #
-      # We nuke the DB storage provider from site settings, so need to yank out the existing settings
-      #  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
-      end
-
-      require_dependency 'site_settings/local_process_provider'
-      SiteSetting.provider = SiteSettings::LocalProcessProvider.new
-
-      WebMock.disable_net_connect!
-    end
-
-    class DiscourseMockRedis < MockRedis
-      def without_namespace
-        self
-      end
-
-      def delete_prefixed(prefix)
-        keys("#{prefix}*").each { |k| del(k) }
-      end
-    end
-
-    config.before :each do |x|
-      # TODO not sure about this, we could use a mock redis implementation here:
-      #   this gives us really clean "flush" semantics, howere the side-effect is that
-      #   we are no longer using a clean redis implementation, a preferable solution may
-      #   be simply flushing before tests, trouble is that redis may be reused with dev
-      #   so that would mean the dev would act weird
-      #
-      #   perf benefit seems low (shaves 20 secs off a 4 minute test suite)
-      #
-      # $redis = DiscourseMockRedis.new
-      #
-      PostActionNotifier.disable
-      SearchIndexer.disable
-      UserActionCreator.disable
-      NotificationEmailer.disable
-
-      SiteSetting.provider.all.each do |setting|
-        SiteSetting.remove_override!(setting.name)
-      end
-
-      # very expensive IO operations
-      SiteSetting.automatically_download_gravatars = false
-
-      Discourse.clear_readonly!
-
-      I18n.locale = :en
-    end
-
-    class TestCurrentUserProvider < Auth::DefaultCurrentUserProvider
-      def log_on_user(user,session,cookies)
-        session[:current_user_id] = user.id
-        super
-      end
-
-      def log_off_user(session,cookies)
-        session[:current_user_id] = nil
-        super
-      end
-    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"
-    end
-
-    DateTime.stubs(:now).returns(datetime)
-    Time.stubs(:now).returns(time)
-  end
-
-  def file_from_fixtures(filename, directory="images")
-    FileUtils.mkdir_p("#{Rails.root}/tmp/spec") unless Dir.exists?("#{Rails.root}/tmp/spec")
-    FileUtils.cp("#{Rails.root}/spec/fixtures/#{directory}/#{filename}", "#{Rails.root}/tmp/spec/#{filename}")
-    File.new("#{Rails.root}/tmp/spec/#{filename}")
+# Require plugin helpers at plugin/[plugin]/spec/plugin_helper.rb (includes symlinked plugins).
+if ENV['LOAD_PLUGINS'] == "1"
+  Dir[Rails.root.join("plugins/*/spec/plugin_helper.rb")].each do |f|
+    require f
   end
 end
 
-Spork.each_run do
-  # This code will be run each time you run your specs.
-  Discourse.after_fork
+# let's not run seed_fu every test
+SeedFu.quiet = true if SeedFu.respond_to? :quiet
+
+SiteSetting.automatically_download_gravatars = false
+
+SeedFu.seed
+
+RSpec.configure do |config|
+  config.fail_fast = ENV['RSPEC_FAIL_FAST'] == "1"
+  config.include Helpers
+  config.include MessageBus
+  config.include RSpecHtmlMatchers
+  config.include IntegrationHelpers, type: :request
+  config.mock_framework = :mocha
+  config.order = 'random'
+  config.infer_spec_type_from_file_location!
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+
+  # If true, the base class of anonymous controllers will be inferred
+  # automatically. This will be the default behavior in future versions of
+  # rspec-rails.
+  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
+    User.skip_callback(:create, :after, :ensure_in_trust_level_group)
+
+    DiscoursePluginRegistry.clear if ENV['LOAD_PLUGINS'] != "1"
+    Discourse.current_user_provider = TestCurrentUserProvider
+
+    SiteSetting.refresh!
+
+    # Rebase defaults
+    #
+    # We nuke the DB storage provider from site settings, so need to yank out the existing settings
+    #  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|
+      # skip setting defaults for settings that are in unloaded plugins
+      SiteSetting.defaults.set_regardless_of_locale(k, v) if SiteSetting.respond_to? k
+    end
+
+    require_dependency 'site_settings/local_process_provider'
+    SiteSetting.provider = SiteSettings::LocalProcessProvider.new
+
+    WebMock.disable_net_connect!
+  end
+
+  class DiscourseMockRedis < MockRedis
+    def without_namespace
+      self
+    end
+
+    def delete_prefixed(prefix)
+      keys("#{prefix}*").each { |k| del(k) }
+    end
+  end
+
+  config.before :each do |x|
+    # TODO not sure about this, we could use a mock redis implementation here:
+    #   this gives us really clean "flush" semantics, howere the side-effect is that
+    #   we are no longer using a clean redis implementation, a preferable solution may
+    #   be simply flushing before tests, trouble is that redis may be reused with dev
+    #   so that would mean the dev would act weird
+    #
+    #   perf benefit seems low (shaves 20 secs off a 4 minute test suite)
+    #
+    # $redis = DiscourseMockRedis.new
+
+    RateLimiter.disable
+    PostActionNotifier.disable
+    SearchIndexer.disable
+    UserActionCreator.disable
+    NotificationEmailer.disable
+
+    SiteSetting.provider.all.each do |setting|
+      SiteSetting.remove_override!(setting.name)
+    end
+    SiteSetting.defaults.site_locale = SiteSettings::DefaultsProvider::DEFAULT_LOCALE
+
+    # very expensive IO operations
+    SiteSetting.automatically_download_gravatars = false
+
+    Discourse.clear_readonly!
+    Sidekiq::Worker.clear_all
+
+    I18n.locale = :en
+
+    if $test_cleanup_callbacks
+      $test_cleanup_callbacks.reverse_each(&:call)
+      $test_cleanup_callbacks = nil
+    end
+  end
+
+  class TestCurrentUserProvider < Auth::DefaultCurrentUserProvider
+    def log_on_user(user, session, cookies)
+      session[:current_user_id] = user.id
+      super
+    end
+
+    def log_off_user(session, cookies)
+      session[:current_user_id] = nil
+      super
+    end
+  end
+
 end
 
-# --- Instructions ---
-# Sort the contents of this file into a Spork.prefork and a Spork.each_run
-# block.
-#
-# The Spork.prefork block is run only once when the spork server is started.
-# You typically want to place most of your (slow) initializer code in here, in
-# particular, require'ing any 3rd-party gems that you don't normally modify
-# during development.
-#
-# The Spork.each_run block is run each time you run your specs.  In case you
-# need to load files that tend to change during development, require them here.
-# With Rails, your application modules are loaded automatically, so sometimes
-# this block can remain empty.
-#
-# Note: You can modify files loaded *from* the Spork.each_run block without
-# restarting the spork server.  However, this file itself will not be reloaded,
-# so if you change any of the code inside the each_run block, you still need to
-# restart the server.  In general, if you have non-trivial code in this file,
-# it's advisable to move it into a separate file so you can easily edit it
-# without restarting spork.  (For example, with RSpec, you could move
-# non-trivial code into a file spec/support/my_helper.rb, making sure that the
-# spec/support/* files are require'd from inside the each_run block.)
-#
-# Any code that is left outside the two blocks will be run during preforking
-# *and* during each_run -- that's probably not what you want.
-#
-# These instructions should self-destruct in 10 seconds.  If they don't, feel
-# free to delete them.
+class TrackTimeStub
+  def self.stubbed
+    false
+  end
+end
+
+def before_next_spec(&callback)
+  ($test_cleanup_callbacks ||= []) << callback
+end
+
+def global_setting(name, value)
+  GlobalSetting.reset_s3_cache!
+
+  GlobalSetting.stubs(name).returns(value)
+
+  before_next_spec do
+    GlobalSetting.reset_s3_cache!
+  end
+end
+
+def set_env(var, value)
+  old = ENV.fetch var, :missing
+
+  ENV[var] = value
+
+  before_next_spec do
+    if old == :missing
+      ENV.delete var
+    else
+      ENV[var] = old
+    end
+  end
+end
+
+def set_cdn_url(cdn_url)
+  global_setting :cdn_url, cdn_url
+  Rails.configuration.action_controller.asset_host = cdn_url
+  ActionController::Base.asset_host = cdn_url
+
+  before_next_spec do
+    Rails.configuration.action_controller.asset_host = nil
+    ActionController::Base.asset_host = nil
+  end
+end
+
+def freeze_time(now = Time.now)
+  datetime = DateTime.parse(now.to_s)
+  time = Time.parse(now.to_s)
+
+  if block_given?
+    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")
+  FileUtils.mkdir_p("#{Rails.root}/tmp/spec") unless Dir.exists?("#{Rails.root}/tmp/spec")
+  FileUtils.cp("#{Rails.root}/spec/fixtures/#{directory}/#{filename}", "#{Rails.root}/tmp/spec/#{filename}")
+  File.new("#{Rails.root}/tmp/spec/#{filename}")
+end
diff --git a/spec/requests/admin/admin_controller_spec.rb b/spec/requests/admin/admin_controller_spec.rb
new file mode 100644
index 0000000000..2d55f8747a
--- /dev/null
+++ b/spec/requests/admin/admin_controller_spec.rb
@@ -0,0 +1,9 @@
+require 'rails_helper'
+
+RSpec.describe Admin::AdminController do
+  it "should return the right response if user isn't a staff" do
+    expect do
+      get "/admin", params: { api_key: 'asdiasiduga' }
+    end.to raise_error(ActionController::RoutingError)
+  end
+end
diff --git a/spec/requests/admin/backups_controller_spec.rb b/spec/requests/admin/backups_controller_spec.rb
index 1fc67d7601..719056f64b 100644
--- a/spec/requests/admin/backups_controller_spec.rb
+++ b/spec/requests/admin/backups_controller_spec.rb
@@ -7,6 +7,14 @@ RSpec.describe Admin::BackupsController do
     sign_in(admin)
   end
 
+  describe "#index" do
+    it "raises an error when backups are disabled" do
+      SiteSetting.enable_backups = false
+      get "/admin/backups.json"
+      expect(response).not_to be_success
+    end
+  end
+
   describe '#rollback' do
     it 'should rollback the restore' do
       BackupRestore.expects(:rollback!)
diff --git a/spec/requests/admin/email_templates_controller_spec.rb b/spec/requests/admin/email_templates_controller_spec.rb
new file mode 100644
index 0000000000..071ff0fd48
--- /dev/null
+++ b/spec/requests/admin/email_templates_controller_spec.rb
@@ -0,0 +1,312 @@
+require 'rails_helper'
+
+RSpec.describe Admin::EmailTemplatesController do
+  let(:admin) { Fabricate(:admin) }
+  let(:user) { Fabricate(:user) }
+
+  def original_text(key)
+    I18n.overrides_disabled { I18n.t(key) }
+  end
+
+  let(:original_subject) { original_text('user_notifications.admin_login.subject_template') }
+  let(:original_body) { original_text('user_notifications.admin_login.text_body_template') }
+  let(:headers) { { ACCEPT: 'application/json' } }
+
+  after do
+    TranslationOverride.delete_all
+    I18n.reload!
+  end
+
+  context "#index" do
+    it "raises an error if you aren't logged in" do
+      expect do
+        get '/admin/customize/email_templates.json'
+      end.to raise_error(ActionController::RoutingError)
+    end
+
+    it "raises an error if you aren't an admin" do
+      sign_in(user)
+      expect do
+        get '/admin/customize/email_templates.json'
+      end.to raise_error(ActionController::RoutingError)
+    end
+
+    it "should work if you are an admin" do
+      sign_in(admin)
+      get '/admin/customize/email_templates.json'
+
+      expect(response).to be_success
+
+      json = ::JSON.parse(response.body)
+      expect(json['email_templates']).to be_present
+    end
+  end
+
+  context "#update" do
+    it "raises an error if you aren't logged in" do
+      expect do
+        put '/admin/customize/email_templates/some_id', params: {
+          email_template: { subject: 'Subject', body: 'Body' }
+        }, headers: headers
+      end.to raise_error(ActionController::RoutingError)
+    end
+
+    it "raises an error if you aren't an admin" do
+      sign_in(user)
+      expect do
+        put '/admin/customize/email_templates/some_id', params: {
+          email_template: { subject: 'Subject', body: 'Body' }
+        }, headers: headers
+      end.to raise_error(ActionController::RoutingError)
+    end
+
+    context "when logged in as admin" do
+      before do
+        sign_in(admin)
+      end
+
+      it "returns 'not found' when an unknown email template id is used" do
+        put '/admin/customize/email_templates/non_existent_template', params: {
+          email_template: { subject: 'Foo', body: 'Bar' }
+        }, headers: headers
+
+        expect(response).not_to be_success
+
+        json = ::JSON.parse(response.body)
+        expect(json['error_type']).to eq('not_found')
+      end
+
+      shared_examples "invalid email template" do
+        it "returns the right error messages" do
+          put '/admin/customize/email_templates/user_notifications.admin_login', params: {
+            email_template: { subject: email_subject, body: email_body }
+          }, headers: headers
+
+          json = ::JSON.parse(response.body)
+          expect(json).to be_present
+
+          errors = json['errors']
+          expect(errors).to be_present
+          expect(errors).to eq(expected_errors)
+        end
+
+        it "doesn't create translation overrides" do
+          put '/admin/customize/email_templates/user_notifications.admin_login', params: {
+            email_template: { subject: email_subject, body: email_body }
+          }, headers: headers
+
+          expect(I18n.t('user_notifications.admin_login.subject_template')).to eq(original_subject)
+          expect(I18n.t('user_notifications.admin_login.text_body_template')).to eq(original_body)
+        end
+
+        it "doesn't create entries in the Staff Log" do
+          put '/admin/customize/email_templates/user_notifications.admin_login', params: {
+            email_template: { subject: email_subject, body: email_body }
+          }, headers: headers
+
+          log = UserHistory.find_by_subject('user_notifications.admin_login.subject_template')
+          expect(log).to be_nil
+
+          log = UserHistory.find_by_subject('user_notifications.admin_login.text_body_template')
+          expect(log).to be_nil
+        end
+      end
+
+      context "when subject is invalid" do
+        let(:email_subject) { '%{email_wrongfix} Foo' }
+        let(:email_body) { 'Body with missing interpolation keys' }
+
+        let(:expected_errors) do
+          [
+            "<b>Subject</b>: #{I18n.t(
+              'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
+              keys: 'email_wrongfix'
+            )}"
+          ]
+        end
+
+        include_examples "invalid email template"
+      end
+
+      context "when body is invalid" do
+        let(:email_subject) { 'Subject with missing interpolation key' }
+        let(:email_body) { 'Body with %{invalid} interpolation key' }
+
+        let(:expected_errors) do
+          [
+            "<b>Body</b>: #{I18n.t(
+              'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
+              keys: 'invalid'
+            )}"
+          ]
+        end
+
+        include_examples "invalid email template"
+      end
+
+      context "when subject and body are invalid invalid" do
+        let(:email_subject) { 'Subject with %{invalid} interpolation key' }
+        let(:email_body) { 'Body with some invalid interpolation keys: %{invalid}' }
+
+        let(:expected_errors) do
+          [
+            "<b>Subject</b>: #{I18n.t(
+              'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
+              keys: 'invalid'
+            )}",
+            "<b>Body</b>: #{I18n.t(
+              'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
+              keys: 'invalid'
+            )}",
+          ]
+        end
+
+        include_examples "invalid email template"
+      end
+
+      context "when subject and body contain all required interpolation keys" do
+        let(:email_subject) { '%{email_prefix} Foo' }
+        let(:email_body) { 'The body contains [%{site_name}](%{base_url}) and %{email_token}.' }
+
+        it "returns the successfully updated email template" do
+          put '/admin/customize/email_templates/user_notifications.admin_login', params: {
+            email_template: { subject: email_subject, body: email_body }
+          }, headers: headers
+
+          expect(response).to be_success
+
+          json = ::JSON.parse(response.body)
+          expect(json).to be_present
+
+          template = json['email_template']
+          expect(template).to be_present
+
+          expect(template['id']).to eq('user_notifications.admin_login')
+          expect(template['title']).to eq('Admin Login')
+          expect(template['subject']).to eq(email_subject)
+          expect(template['body']).to eq(email_body)
+          expect(template['can_revert']).to eq(true)
+        end
+
+        it "creates translation overrides" do
+          put '/admin/customize/email_templates/user_notifications.admin_login', params: {
+            email_template: { subject: email_subject, body: email_body }
+          }, headers: headers
+
+          expect(I18n.t('user_notifications.admin_login.subject_template')).to eq(email_subject)
+          expect(I18n.t('user_notifications.admin_login.text_body_template')).to eq(email_body)
+        end
+
+        it "creates entries in the Staff Log" do
+          put '/admin/customize/email_templates/user_notifications.admin_login', params: {
+            email_template: { subject: email_subject, body: email_body }
+          }, headers: headers
+
+          log = UserHistory.find_by_subject('user_notifications.admin_login.subject_template')
+
+          expect(log).to be_present
+          expect(log.action).to eq(UserHistory.actions[:change_site_text])
+          expect(log.previous_value).to eq(original_subject)
+          expect(log.new_value).to eq(email_subject)
+
+          log = UserHistory.find_by_subject('user_notifications.admin_login.text_body_template')
+
+          expect(log).to be_present
+          expect(log.action).to eq(UserHistory.actions[:change_site_text])
+          expect(log.previous_value).to eq(original_body)
+          expect(log.new_value).to eq(email_body)
+        end
+      end
+
+    end
+
+  end
+
+  context "#revert" do
+    it "raises an error if you aren't logged in" do
+      expect do
+        delete '/admin/customize/email_templates/some_id', headers: headers
+      end.to raise_error(ActionController::RoutingError)
+    end
+
+    it "raises an error if you aren't an admin" do
+      sign_in(user)
+      expect do
+        delete '/admin/customize/email_templates/some_id', headers: headers
+      end.to raise_error(ActionController::RoutingError)
+    end
+
+    context "when logged in as admin" do
+      before do
+        sign_in(admin)
+      end
+
+      it "returns 'not found' when an unknown email template id is used" do
+        delete '/admin/customize/email_templates/non_existent_template', headers: headers
+        expect(response).not_to be_success
+
+        json = ::JSON.parse(response.body)
+        expect(json['error_type']).to eq('not_found')
+      end
+
+      context "when email template has translation overrides" do
+        let(:email_subject) { '%{email_prefix} Foo' }
+        let(:email_body) { 'The body contains [%{site_name}](%{base_url}) and %{email_token}.' }
+
+        before do
+          put '/admin/customize/email_templates/user_notifications.admin_login', params: {
+            email_template: { subject: email_subject, body: email_body }
+          }, headers: headers
+        end
+
+        it "restores the original subject and body" do
+          expect(I18n.t('user_notifications.admin_login.subject_template')).to eq(email_subject)
+          expect(I18n.t('user_notifications.admin_login.text_body_template')).to eq(email_body)
+
+          delete '/admin/customize/email_templates/user_notifications.admin_login', headers: headers
+
+          expect(I18n.t('user_notifications.admin_login.subject_template')).to eq(original_subject)
+          expect(I18n.t('user_notifications.admin_login.text_body_template')).to eq(original_body)
+        end
+
+        it "returns the restored email template" do
+          delete '/admin/customize/email_templates/user_notifications.admin_login', headers: headers
+          expect(response).to be_success
+
+          json = ::JSON.parse(response.body)
+          expect(json).to be_present
+
+          template = json['email_template']
+          expect(template).to be_present
+
+          expect(template['id']).to eq('user_notifications.admin_login')
+          expect(template['title']).to eq('Admin Login')
+          expect(template['subject']).to eq(original_subject)
+          expect(template['body']).to eq(original_body)
+          expect(template['can_revert']).to eq(false)
+        end
+
+        it "creates entries in the Staff Log" do
+          UserHistory.delete_all
+          delete '/admin/customize/email_templates/user_notifications.admin_login', headers: headers
+
+          log = UserHistory.find_by_subject('user_notifications.admin_login.subject_template')
+
+          expect(log).to be_present
+          expect(log.action).to eq(UserHistory.actions[:change_site_text])
+          expect(log.previous_value).to eq(email_subject)
+          expect(log.new_value).to eq(original_subject)
+
+          log = UserHistory.find_by_subject('user_notifications.admin_login.text_body_template')
+
+          expect(log).to be_present
+          expect(log.action).to eq(UserHistory.actions[:change_site_text])
+          expect(log.previous_value).to eq(email_body)
+          expect(log.new_value).to eq(original_body)
+        end
+      end
+    end
+
+  end
+
+end
diff --git a/spec/requests/admin/emojis_controller_spec.rb b/spec/requests/admin/emojis_controller_spec.rb
new file mode 100644
index 0000000000..3d781af215
--- /dev/null
+++ b/spec/requests/admin/emojis_controller_spec.rb
@@ -0,0 +1,76 @@
+require 'rails_helper'
+
+RSpec.describe Admin::EmojisController do
+  let(:admin) { Fabricate(:admin) }
+  let(:upload) { Fabricate(:upload) }
+
+  before do
+    sign_in(admin)
+  end
+
+  describe "#create" do
+    describe 'when upload is invalid' do
+      it 'should publish the right error' do
+
+        post "/admin/customize/emojis.json", params: {
+          name: 'test',
+          file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/fake.jpg")
+        }
+
+        expect(response.status).to eq(422)
+        parsed = JSON.parse(response.body)
+        expect(parsed["errors"]).to eq([I18n.t('upload.images.size_not_found')])
+      end
+    end
+
+    describe 'when emoji name already exists' do
+      it 'should publish the right error' do
+        CustomEmoji.create!(name: 'test', upload: upload)
+
+        post "/admin/customize/emojis.json", params: {
+          name: 'test',
+          file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
+        }
+
+        expect(response.status).to eq(422)
+        parsed = JSON.parse(response.body)
+        expect(parsed["errors"]).to eq([
+          "Name #{I18n.t('activerecord.errors.models.custom_emoji.attributes.name.taken')}"
+        ])
+      end
+    end
+
+    it 'should allow an admin to add a custom emoji' do
+      Emoji.expects(:clear_cache)
+
+        post "/admin/customize/emojis.json", params: {
+          name: 'test',
+          file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
+        }
+
+        custom_emoji = CustomEmoji.last
+        upload = custom_emoji.upload
+
+        expect(upload.original_filename).to eq('logo.png')
+
+        data = JSON.parse(response.body)
+
+        expect(response.status).to eq(200)
+        expect(data["errors"]).to eq(nil)
+        expect(data["name"]).to eq(custom_emoji.name)
+        expect(data["url"]).to eq(upload.url)
+    end
+  end
+
+  describe '#destroy' do
+    it 'should allow an admin to delete a custom emoji' do
+      custom_emoji = CustomEmoji.create!(name: 'test', upload: upload)
+      Emoji.clear_cache
+
+      expect do
+        delete "/admin/customize/emojis/#{custom_emoji.name}.json",
+          params: { name: 'test' }
+      end.to change { CustomEmoji.count }.by(-1)
+    end
+  end
+end
diff --git a/spec/requests/admin/flagged_topics_controller_spec.rb b/spec/requests/admin/flagged_topics_controller_spec.rb
new file mode 100644
index 0000000000..8f768294bc
--- /dev/null
+++ b/spec/requests/admin/flagged_topics_controller_spec.rb
@@ -0,0 +1,33 @@
+require 'rails_helper'
+
+RSpec.describe Admin::FlaggedTopicsController do
+  let!(:flag) { Fabricate(:flag) }
+
+  shared_examples "successfully retrieve list of flagged topics" do
+    it "returns a list of flagged topics" do
+      get "/admin/flagged_topics.json"
+      expect(response).to be_success
+
+      data = ::JSON.parse(response.body)
+      expect(data['flagged_topics']).to be_present
+      expect(data['users']).to be_present
+    end
+  end
+
+  context "as admin" do
+    before do
+      sign_in(Fabricate(:admin))
+    end
+
+    include_examples "successfully retrieve list of flagged topics"
+  end
+
+  context "as moderator" do
+    before do
+      sign_in(Fabricate(:moderator))
+    end
+
+    include_examples "successfully retrieve list of flagged topics"
+  end
+
+end
diff --git a/spec/requests/admin/flags_controller_spec.rb b/spec/requests/admin/flags_controller_spec.rb
new file mode 100644
index 0000000000..2906624d2f
--- /dev/null
+++ b/spec/requests/admin/flags_controller_spec.rb
@@ -0,0 +1,55 @@
+require 'rails_helper'
+
+RSpec.describe Admin::FlagsController do
+  let(:admin) { Fabricate(:admin) }
+  let(:post_1) { Fabricate(:post) }
+  let(:user) { Fabricate(:user) }
+
+  before do
+    sign_in(admin)
+  end
+
+  context '#index' do
+    it 'should return the right response when nothing is flagged' do
+      get '/admin/flags.json'
+
+      expect(response).to be_success
+
+      data = ::JSON.parse(response.body)
+      expect(data["users"]).to eq([])
+      expect(data["posts"]).to eq([])
+    end
+
+    it 'should return the right response' do
+      PostAction.act(user, post_1, PostActionType.types[:spam])
+
+      get '/admin/flags.json'
+
+      expect(response).to be_success
+
+      data = ::JSON.parse(response.body)
+      data["users"].length == 2
+      data["posts"].length == 1
+    end
+  end
+
+  context '#agree' do
+    it 'should work' do
+      SiteSetting.allow_user_locale = true
+      post_action = PostAction.act(user, post_1, PostActionType.types[:spam], message: 'bad')
+      admin.update!(locale: 'ja')
+
+      post "/admin/flags/agree/#{post_1.id}.json"
+
+      expect(response).to be_success
+
+      post_action.reload
+
+      expect(post_action.agreed_by_id).to eq(admin.id)
+
+      post_1 = Post.offset(1).last
+
+      expect(post_1.raw).to eq(I18n.with_locale(:en) { I18n.t('flags_dispositions.agreed') })
+    end
+  end
+end
diff --git a/spec/requests/admin/groups_controller_spec.rb b/spec/requests/admin/groups_controller_spec.rb
new file mode 100644
index 0000000000..7d6045b608
--- /dev/null
+++ b/spec/requests/admin/groups_controller_spec.rb
@@ -0,0 +1,49 @@
+require 'rails_helper'
+
+RSpec.describe Admin::GroupsController do
+  let(:admin) { Fabricate(:admin) }
+  let(:user) { Fabricate(:user) }
+  let(:group) { Fabricate(:group) }
+
+  before do
+    sign_in(admin)
+  end
+
+  describe '#create' do
+    it 'should work' do
+      post "/admin/groups.json", params: {
+        group: {
+          name: 'testing',
+          usernames: [admin.username, user.username].join(","),
+          owner_usernames: [user.username].join(","),
+          allow_membership_requests: true,
+          membership_request_template: 'Testing',
+        }
+      }
+
+      expect(response).to be_success
+
+      group = Group.last
+
+      expect(group.name).to eq('testing')
+      expect(group.users).to contain_exactly(admin, user)
+      expect(group.allow_membership_requests).to eq(true)
+      expect(group.membership_request_template).to eq('Testing')
+    end
+  end
+
+  describe '#add_owners' do
+    it 'should work' do
+      put "/admin/groups/#{group.id}/owners.json", params: {
+        group: {
+          usernames: [user.username, admin.username].join(",")
+        }
+      }
+
+      expect(response).to be_success
+
+      expect(group.group_users.where(owner: true).map(&:user))
+        .to contain_exactly(user, admin)
+    end
+  end
+end
diff --git a/spec/requests/admin/moderation_history_controller_spec.rb b/spec/requests/admin/moderation_history_controller_spec.rb
new file mode 100644
index 0000000000..f16d340fae
--- /dev/null
+++ b/spec/requests/admin/moderation_history_controller_spec.rb
@@ -0,0 +1,55 @@
+require 'rails_helper'
+
+RSpec.describe Admin::BackupsController do
+  let(:admin) { Fabricate(:admin) }
+
+  before do
+    sign_in(admin)
+  end
+
+  describe "parameters" do
+    it "returns 404 without a valid filter" do
+      get "/admin/moderation_history.json"
+      expect(response).not_to be_success
+    end
+
+    it "returns 404 without a valid id" do
+      get "/admin/moderation_history.json?filter=topic"
+      expect(response).not_to be_success
+    end
+  end
+
+  describe "for a post" do
+    it "returns an empty array when the post doesn't exist" do
+      get "/admin/moderation_history.json?filter=post&post_id=99999999"
+      expect(response).to be_success
+      expect(::JSON.parse(response.body)['moderation_history']).to be_blank
+    end
+
+    it "returns a history when the post exists" do
+      p = Fabricate(:post)
+      p = Fabricate(:post, topic_id: p.topic_id)
+      PostDestroyer.new(Discourse.system_user, p).destroy
+      get "/admin/moderation_history.json?filter=post&post_id=#{p.id}"
+      expect(response).to be_success
+      expect(::JSON.parse(response.body)['moderation_history']).to be_present
+    end
+
+  end
+
+  describe "for a topic" do
+    it "returns empty history when the topic doesn't exist" do
+      get "/admin/moderation_history.json?filter=topic&topic_id=1234"
+      expect(response).to be_success
+      expect(::JSON.parse(response.body)['moderation_history']).to be_blank
+    end
+
+    it "returns a history when the topic exists" do
+      p = Fabricate(:post)
+      PostDestroyer.new(Discourse.system_user, p).destroy
+      get "/admin/moderation_history.json?filter=topic&topic_id=#{p.topic_id}"
+      expect(response).to be_success
+      expect(::JSON.parse(response.body)['moderation_history']).to be_present
+    end
+  end
+end
diff --git a/spec/requests/admin/search_logs_spec.rb b/spec/requests/admin/search_logs_spec.rb
new file mode 100644
index 0000000000..c4f852b480
--- /dev/null
+++ b/spec/requests/admin/search_logs_spec.rb
@@ -0,0 +1,60 @@
+require 'rails_helper'
+
+RSpec.describe Admin::SearchLogsController do
+  let(:admin) { Fabricate(:admin) }
+  let(:user) { Fabricate(:user) }
+
+  before do
+    SearchLog.log(term: 'ruby', search_type: :header, ip_address: '127.0.0.1')
+  end
+
+  context "#index" do
+    it "raises an error if you aren't logged in" do
+      expect do
+        get '/admin/logs/search_logs.json'
+      end.to raise_error(ActionController::RoutingError)
+    end
+
+    it "raises an error if you aren't an admin" do
+      sign_in(user)
+      expect do
+        get '/admin/logs/search_logs.json'
+      end.to raise_error(ActionController::RoutingError)
+    end
+
+    it "should work if you are an admin" do
+      sign_in(admin)
+      get '/admin/logs/search_logs.json'
+
+      expect(response).to be_success
+
+      json = ::JSON.parse(response.body)
+      expect(json[0]['term']).to eq('ruby')
+    end
+  end
+
+  context "#term" do
+    it "raises an error if you aren't logged in" do
+      expect do
+        get '/admin/logs/search_logs/term/ruby.json'
+      end.to raise_error(ActionController::RoutingError)
+    end
+
+    it "raises an error if you aren't an admin" do
+      sign_in(user)
+      expect do
+        get '/admin/logs/search_logs/term/ruby.json'
+      end.to raise_error(ActionController::RoutingError)
+    end
+
+    it "should work if you are an admin" do
+      sign_in(admin)
+        get '/admin/logs/search_logs/term/ruby.json'
+
+      expect(response).to be_success
+
+      json = ::JSON.parse(response.body)
+      expect(json['term']['type']).to eq('search_log_term')
+    end
+  end
+end
diff --git a/spec/requests/composer_controller_spec.rb b/spec/requests/composer_controller_spec.rb
new file mode 100644
index 0000000000..2a8923c37b
--- /dev/null
+++ b/spec/requests/composer_controller_spec.rb
@@ -0,0 +1,26 @@
+require 'rails_helper'
+
+RSpec.describe ComposerController do
+  let(:user) { Fabricate(:user) }
+
+  describe '#parse_html' do
+
+    it "should not be able access without sign in" do
+      expect {
+        post "/composer/parse_html.json", params: {
+          html: "<strong>hello</strong>"
+        }
+      }.to raise_error(Discourse::NotLoggedIn)
+    end
+
+    it "should convert html tags to markdown text" do
+      sign_in(user)
+
+      post "/composer/parse_html.json", params: {
+        html: "<strong>hello</strong>"
+      }
+
+      expect(response.body).to eq("{\"markdown\":\"**hello**\"}")
+    end
+  end
+end
diff --git a/spec/requests/directory_items_controller_spec.rb b/spec/requests/directory_items_controller_spec.rb
new file mode 100644
index 0000000000..4d6b6f93f1
--- /dev/null
+++ b/spec/requests/directory_items_controller_spec.rb
@@ -0,0 +1,82 @@
+require 'rails_helper'
+
+describe DirectoryItemsController do
+  let!(:user) { Fabricate(:user) }
+
+  it "requires a `period` param" do
+    expect do
+      get '/directory_items.json'
+    end.to raise_error(ActionController::ParameterMissing)
+  end
+
+  it "requires a proper `period` param" do
+    get '/directory_items.json', params: { period: 'eviltrout' }
+    expect(response).not_to be_success
+  end
+
+  context "without data" do
+
+    context "and a logged in user" do
+      before { sign_in(user) }
+
+      it "succeeds" do
+        get '/directory_items.json', params: { period: 'all' }
+        expect(response).to be_success
+      end
+    end
+
+  end
+
+  context "with data" do
+    before do
+      Fabricate(:evil_trout)
+      Fabricate(:walter_white)
+      Fabricate(:staged, username: 'stage_user')
+
+      DirectoryItem.refresh!
+    end
+
+    it "succeeds with a valid value" do
+      get '/directory_items.json', params: { period: 'all' }
+      expect(response).to be_success
+      json = ::JSON.parse(response.body)
+
+      expect(json).to be_present
+      expect(json['directory_items']).to be_present
+      expect(json['total_rows_directory_items']).to be_present
+      expect(json['load_more_directory_items']).to be_present
+
+      expect(json['directory_items'].length).to eq(4)
+      expect(json['total_rows_directory_items']).to eq(4)
+    end
+
+    it "fails when the directory is disabled" do
+      SiteSetting.enable_user_directory = false
+
+      get '/directory_items.json', params: { period: 'all' }
+      expect(response).not_to be_success
+    end
+
+    it "finds user by name" do
+      get '/directory_items.json', params: { period: 'all', name: 'eviltrout' }
+      expect(response).to be_success
+
+      json = ::JSON.parse(response.body)
+      expect(json).to be_present
+      expect(json['directory_items'].length).to eq(1)
+      expect(json['total_rows_directory_items']).to eq(1)
+      expect(json['directory_items'][0]['user']['username']).to eq('eviltrout')
+    end
+
+    it "finds staged user by name" do
+      get '/directory_items.json', params: { period: 'all', name: 'stage_user' }
+      expect(response).to be_success
+
+      json = ::JSON.parse(response.body)
+      expect(json).to be_present
+      expect(json['directory_items'].length).to eq(1)
+      expect(json['total_rows_directory_items']).to eq(1)
+      expect(json['directory_items'][0]['user']['username']).to eq('stage_user')
+    end
+  end
+end
diff --git a/spec/requests/email_controller_spec.rb b/spec/requests/email_controller_spec.rb
new file mode 100644
index 0000000000..cd05901915
--- /dev/null
+++ b/spec/requests/email_controller_spec.rb
@@ -0,0 +1,13 @@
+require 'rails_helper'
+
+RSpec.describe EmailController do
+  describe '#unsubscribed' do
+    describe 'when email is invalid' do
+      it 'should return the right response' do
+        get '/email/unsubscribed', params: { email: 'somerandomstring' }
+
+        expect(response.status).to eq(404)
+      end
+    end
+  end
+end
diff --git a/spec/requests/embed_controller_spec.rb b/spec/requests/embed_controller_spec.rb
new file mode 100644
index 0000000000..d6ae02f829
--- /dev/null
+++ b/spec/requests/embed_controller_spec.rb
@@ -0,0 +1,173 @@
+require 'rails_helper'
+
+describe EmbedController do
+
+  let(:host) { "eviltrout.com" }
+  let(:embed_url) { "http://eviltrout.com/2013/02/10/why-discourse-uses-emberjs.html" }
+  let(:discourse_username) { "eviltrout" }
+
+  it "is 404 without an embed_url" do
+    get '/embed/comments'
+    expect(response.body).to match(I18n.t('embed.error'))
+  end
+
+  it "raises an error with a missing host" do
+    get '/embed/comments', params: { embed_url: embed_url }
+    expect(response.body).to match(I18n.t('embed.error'))
+  end
+
+  context "by topic id" do
+    let(:headers) { { 'REFERER' => 'http://eviltrout.com/some-page' } }
+
+    before do
+      Fabricate(:embeddable_host)
+    end
+
+    it "allows a topic to be embedded by id" do
+      topic = Fabricate(:topic)
+      get '/embed/comments', params: { topic_id: topic.id }, headers: headers
+      expect(response).to be_success
+    end
+  end
+
+  context "#info" do
+    context "without api key" do
+      it "fails" do
+        get '/embed/info.json'
+        expect(response.body).to match(I18n.t('embed.error'))
+      end
+    end
+
+    context "with api key" do
+
+      let(:api_key) { ApiKey.create_master_key }
+
+      context "with valid embed url" do
+        let(:topic_embed) { Fabricate(:topic_embed, embed_url: embed_url) }
+
+        it "returns information about the topic" do
+          get '/embed/info.json',
+            params: { embed_url: topic_embed.embed_url, api_key: api_key.key, api_username: "system" }
+
+          json = JSON.parse(response.body)
+          expect(json['topic_id']).to eq(topic_embed.topic.id)
+          expect(json['post_id']).to eq(topic_embed.post.id)
+          expect(json['topic_slug']).to eq(topic_embed.topic.slug)
+        end
+      end
+
+      context "without invalid embed url" do
+        it "returns error response" do
+          get '/embed/info.json',
+            params: { embed_url: "http://nope.com", api_key: api_key.key, api_username: "system" }
+
+          json = JSON.parse(response.body)
+          expect(json["error_type"]).to eq("not_found")
+        end
+      end
+    end
+  end
+
+  context "with a host" do
+    let!(:embeddable_host) { Fabricate(:embeddable_host) }
+
+    it "raises an error with no referer" do
+      get '/embed/comments', params: { embed_url: embed_url }
+      expect(response.body).to match(I18n.t('embed.error'))
+    end
+
+    context "success" do
+      let(:headers) { { 'REFERER' => embed_url } }
+
+      after do
+        expect(response).to be_success
+        expect(response.headers['X-Frame-Options']).to eq("ALLOWALL")
+      end
+
+      it "tells the topic retriever to work when no previous embed is found" do
+        TopicEmbed.expects(:topic_id_for_embed).returns(nil)
+        retriever = mock
+        TopicRetriever.expects(:new).returns(retriever)
+        retriever.expects(:retrieve)
+        get '/embed/comments', params: { embed_url: embed_url }, headers: headers
+      end
+
+      it "displays the right view" do
+        topic_embed = Fabricate(:topic_embed, embed_url: embed_url)
+
+        get '/embed/comments', params: { embed_url: embed_url }, headers: headers
+
+        expect(response.body).to match(I18n.t('embed.start_discussion'))
+      end
+
+      it "creates a topic view when a topic_id is found" do
+        topic_embed = Fabricate(:topic_embed, embed_url: embed_url)
+        post = Fabricate(:post, topic: topic_embed.topic)
+
+        get '/embed/comments', params: { embed_url: embed_url }, headers: headers
+
+        expect(response.body).to match(I18n.t('embed.continue'))
+        expect(response.body).to match(post.cooked)
+      end
+
+      it "provides the topic retriever with the discourse username when provided" do
+        TopicRetriever.expects(:new).with(embed_url, has_entry(author_username: discourse_username))
+
+        get '/embed/comments',
+          params: { embed_url: embed_url, discourse_username: discourse_username },
+          headers: headers
+      end
+
+    end
+  end
+
+  context "with multiple hosts" do
+    before do
+      Fabricate(:embeddable_host)
+      Fabricate(:embeddable_host, host: 'http://discourse.org')
+      Fabricate(:embeddable_host, host: 'https://example.com/1234', class_name: 'example')
+    end
+
+    context "success" do
+      it "works with the first host" do
+        get '/embed/comments',
+          params: { embed_url: embed_url },
+          headers: { 'REFERER' => "http://eviltrout.com/wat/1-2-3.html" }
+
+        expect(response).to be_success
+      end
+
+      it "works with the second host" do
+        get '/embed/comments',
+          params: { embed_url: embed_url },
+          headers: { 'REFERER' => "http://eviltrout.com/wat/1-2-3.html" }
+
+        expect(response).to be_success
+      end
+
+      it "works with a host with a path" do
+        get '/embed/comments',
+          params: { embed_url: embed_url },
+          headers: { 'REFERER' => "https://example.com/some-other-path" }
+
+        expect(response).to be_success
+      end
+
+      it "contains custom class name" do
+        get '/embed/comments',
+          params: { embed_url: embed_url },
+          headers: { 'REFERER' => "https://example.com/some-other-path" }
+
+        expect(response.body).to match('class="example"')
+      end
+
+      it "doesn't work with a made up host" do
+        get '/embed/comments',
+          params: { embed_url: embed_url },
+          headers: { 'REFERER' => "http://codinghorror.com/invalid-url" }
+
+        expect(response.body).to match(I18n.t('embed.error'))
+      end
+    end
+  end
+end
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
new file mode 100644
index 0000000000..1d7c14abeb
--- /dev/null
+++ b/spec/requests/groups_controller_spec.rb
@@ -0,0 +1,726 @@
+require 'rails_helper'
+
+describe GroupsController do
+  let(:user) { Fabricate(:user) }
+  let(:group) { Fabricate(:group, users: [user]) }
+
+  describe '#index' do
+    let!(:staff_group) do
+      Fabricate(:group, name: '0000', visibility_level: Group.visibility_levels[:staff])
+    end
+
+    context 'when group directory is disabled' do
+      it 'should deny access' do
+        SiteSetting.enable_group_directory = false
+
+        get "/groups.json"
+        expect(response).to be_forbidden
+      end
+    end
+
+    it 'should return the right response' do
+      group
+      get "/groups.json"
+
+      expect(response).to be_success
+
+      response_body = JSON.parse(response.body)
+
+      group_ids = response_body["groups"].map { |g| g["id"] }
+
+      expect(response_body["extras"]["group_user_ids"]).to eq([])
+      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
+
+    context 'viewing as an admin' do
+      it 'should display automatic groups' do
+        admin = Fabricate(:admin)
+        sign_in(admin)
+        group.add(admin)
+
+        get "/groups.json"
+
+        expect(response).to be_success
+
+        response_body = JSON.parse(response.body)
+
+        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, staff_group.id)
+        expect(response_body["load_more_groups"]).to eq("/groups?page=1")
+        expect(response_body["total_rows_groups"]).to eq(10)
+      end
+    end
+  end
+
+  describe '#mentionable' do
+    it "should return the right response" do
+      sign_in(user)
+      group.update_attributes!(name: 'test')
+
+      get "/groups/test/mentionable.json", params: { name: group.name }
+
+      expect(response).to be_success
+
+      response_body = JSON.parse(response.body)
+      expect(response_body["mentionable"]).to eq(false)
+
+      group.update_attributes!(mentionable_level: Group::ALIAS_LEVELS[:everyone])
+
+      get "/groups/test/mentionable.json", params: { name: group.name }
+      expect(response).to be_success
+
+      response_body = JSON.parse(response.body)
+      expect(response_body["mentionable"]).to eq(true)
+    end
+  end
+
+  describe '#update' do
+    let(:group) do
+      Fabricate(:group,
+        name: 'test',
+        users: [user],
+        public_admission: false,
+        public_exit: false
+      )
+    end
+
+    context "when user is group owner" do
+      before do
+        group.add_owner(user)
+        sign_in(user)
+      end
+
+      it "should be able update the group" do
+        group.update!(allow_membership_requests: false)
+
+        expect do
+          put "/groups/#{group.id}.json", params: {
+            group: {
+              flair_bg_color: 'FFF',
+              flair_color: 'BBB',
+              flair_url: 'fa-adjust',
+              bio_raw: 'testing',
+              full_name: 'awesome team',
+              public_admission: true,
+              public_exit: true,
+              allow_membership_requests: true,
+              membership_request_template: 'testing',
+            }
+          }
+        end.to change { GroupHistory.count }.by(9)
+
+        expect(response).to be_success
+
+        group.reload
+
+        expect(group.flair_bg_color).to eq('FFF')
+        expect(group.flair_color).to eq('BBB')
+        expect(group.flair_url).to eq('fa-adjust')
+        expect(group.bio_raw).to eq('testing')
+        expect(group.full_name).to eq('awesome team')
+        expect(group.public_admission).to eq(true)
+        expect(group.public_exit).to eq(true)
+        expect(group.allow_membership_requests).to eq(true)
+        expect(group.membership_request_template).to eq('testing')
+        expect(GroupHistory.last.subject).to eq('membership_request_template')
+      end
+    end
+
+    context "when user is group admin" do
+      before do
+        user.update_attributes!(admin: true)
+        sign_in(user)
+      end
+
+      it 'should be able to update the group' do
+        put "/groups/#{group.id}.json", params: { group: { flair_color: 'BBB' } }
+
+        expect(response).to be_success
+        expect(group.reload.flair_color).to eq('BBB')
+      end
+    end
+
+    context "when user is not a group owner or admin" do
+      it 'should not be able to update the group' do
+        sign_in(user)
+
+        put "/groups/#{group.id}.json", params: { group: { name: 'testing' } }
+
+        expect(response.status).to eq(403)
+      end
+    end
+  end
+
+  describe '#members' do
+    let(:user1) do
+      Fabricate(:user,
+        last_seen_at: Time.zone.now,
+        last_posted_at: Time.zone.now - 1.day,
+        email: 'b@test.org'
+      )
+    end
+
+    let(:user2) do
+      Fabricate(:user,
+        last_seen_at: Time.zone.now - 1 .day,
+        last_posted_at: Time.zone.now,
+        email: 'a@test.org'
+      )
+    end
+
+    let(:user3) do
+      Fabricate(:user,
+        last_seen_at: nil,
+        last_posted_at: nil,
+        email: 'c@test.org'
+      )
+    end
+
+    let(:bot) { Fabricate(:user, id: -999) }
+
+    let(:group) { Fabricate(:group, users: [user1, user2, user3, bot]) }
+
+    it "should allow members to be sorted by" do
+      get "/groups/#{group.name}/members.json", params: {
+        order: 'last_seen_at', desc: true
+      }
+
+      expect(response).to be_success
+
+      members = JSON.parse(response.body)["members"]
+
+      expect(members.map { |m| m["id"] }).to eq([user1.id, user2.id, user3.id])
+
+      get "/groups/#{group.name}/members.json", params: { order: 'last_seen_at' }
+
+      expect(response).to be_success
+
+      members = JSON.parse(response.body)["members"]
+
+      expect(members.map { |m| m["id"] }).to eq([user2.id, user1.id, user3.id])
+
+      get "/groups/#{group.name}/members.json", params: {
+        order: 'last_posted_at', desc: true
+      }
+
+      expect(response).to be_success
+
+      members = JSON.parse(response.body)["members"]
+
+      expect(members.map { |m| m["id"] }).to eq([user2.id, user1.id, user3.id])
+    end
+
+    it "should not allow members to be sorted by columns that are not allowed" do
+      get "/groups/#{group.name}/members.json", params: { order: 'email' }
+
+      expect(response).to be_success
+
+      members = JSON.parse(response.body)["members"]
+
+      expect(members.map { |m| m["id"] }).to eq([user1.id, user2.id, user3.id])
+    end
+  end
+
+  describe "edit" do
+    let(:group) { Fabricate(:group) }
+
+    context 'when user is not signed in' do
+      it 'should be fobidden' do
+        put "/groups/#{group.id}/members.json", params: { usernames: "bob" }
+        expect(response).to be_forbidden
+
+        delete "/groups/#{group.id}/members.json", params: { username: "bob" }
+        expect(response).to be_forbidden
+      end
+
+      context 'public group' do
+        it 'should be fobidden' do
+          group.update_attributes!(
+            public_admission: true,
+            public_exit: true
+          )
+
+          expect { put "/groups/#{group.id}/members.json", params: { usernames: "bob" } }
+            .to raise_error(Discourse::NotLoggedIn)
+
+          expect { delete "/groups/#{group.id}/members.json", params: { username: "bob" } }
+            .to raise_error(Discourse::NotLoggedIn)
+        end
+      end
+    end
+
+    context 'when user is not an owner of the group' do
+      before do
+        sign_in(user)
+      end
+
+      it "refuses membership changes to unauthorized users" do
+        put "/groups/#{group.id}/members.json", params: { usernames: "bob" }
+        expect(response).to be_forbidden
+
+        delete "/groups/#{group.id}/members.json", params: { username: "bob" }
+        expect(response).to be_forbidden
+      end
+    end
+
+    context 'when user is an admin' do
+      let(:user) { Fabricate(:admin) }
+      let(:group) { Fabricate(:group, users: [user], automatic: true) }
+
+      before do
+        sign_in(user)
+      end
+
+      it "cannot add members to automatic groups" do
+        put "/groups/#{group.id}/members.json", params: { usernames: "bob" }
+        expect(response).to be_forbidden
+
+        delete "/groups/#{group.id}/members.json", params: { username: "bob" }
+        expect(response).to be_forbidden
+      end
+    end
+  end
+
+  describe "membership edits" do
+    let(:admin) { Fabricate(:admin) }
+
+    before do
+      sign_in(admin)
+    end
+
+    context 'add_members' do
+      it "can make incremental adds" do
+        user2 = Fabricate(:user)
+
+        expect do
+          put "/groups/#{group.id}/members.json", params: { usernames: user2.username }
+        end.to change { group.users.count }.by(1)
+
+        expect(response).to be_success
+
+        group_history = GroupHistory.last
+
+        expect(group_history.action).to eq(GroupHistory.actions[:add_user_to_group])
+        expect(group_history.acting_user).to eq(admin)
+        expect(group_history.target_user).to eq(user2)
+      end
+
+      it "cannot add members to automatic groups" do
+        group.update!(automatic: true)
+
+        put "/groups/#{group.id}/members.json", params: { usernames: "l77t" }
+        expect(response.status).to eq(403)
+      end
+
+      context "is able to add several members to a group" do
+        let(:user1) { Fabricate(:user) }
+        let(:user2) { Fabricate(:user) }
+
+        it "adds by username" do
+          expect do
+            put "/groups/#{group.id}/members.json",
+              params: { usernames: [user1.username, user2.username].join(",") }
+          end.to change { group.users.count }.by(2)
+
+          expect(response).to be_success
+        end
+
+        it "adds by id" do
+          expect do
+            put "/groups/#{group.id}/members.json",
+              params: { user_ids: [user1.id, user2.id].join(",") }
+          end.to change { group.users.count }.by(2)
+
+          expect(response).to be_success
+        end
+
+        it "adds by email" do
+          expect do
+            put "/groups/#{group.id}/members.json",
+              params: { user_emails: [user1.email, user2.email].join(",") }
+          end.to change { group.users.count }.by(2)
+
+          expect(response).to be_success
+        end
+      end
+
+      it "returns 422 if member already exists" do
+        put "/groups/#{group.id}/members.json", params: { usernames: user.username }
+
+        expect(response.status).to eq(422)
+      end
+
+      it "returns 404 if member is not found" do
+        put "/groups/#{group.id}/members.json", params: { usernames: 'some donkey' }
+
+        expect(response.status).to eq(404)
+      end
+
+      context 'public group' do
+        let(:other_user) { Fabricate(:user) }
+
+        before do
+          group.update!(
+            public_admission: true,
+            public_exit: true
+          )
+        end
+
+        context 'admin' do
+          it "can make incremental adds" do
+            expect do
+              put "/groups/#{group.id}/members.json",
+                params: { usernames: other_user.username }
+            end.to change { group.users.count }.by(1)
+
+            expect(response).to be_success
+
+            group_history = GroupHistory.last
+
+            expect(group_history.action).to eq(GroupHistory.actions[:add_user_to_group])
+            expect(group_history.acting_user).to eq(admin)
+            expect(group_history.target_user).to eq(other_user)
+          end
+        end
+
+        it 'should allow a user to join the group' do
+          sign_in(other_user)
+
+          expect do
+            put "/groups/#{group.id}/members.json",
+              params: { usernames: other_user.username }
+          end.to change { group.users.count }.by(1)
+
+          expect(response).to be_success
+        end
+
+        it 'should not allow an underprivilege user to add another user to a group' do
+          sign_in(user)
+
+          put "/groups/#{group.id}/members.json",
+            params: { usernames: other_user.username }
+
+          expect(response).to be_forbidden
+        end
+      end
+    end
+
+    context '#remove_member' do
+      it "cannot remove members from automatic groups" do
+        group.update!(automatic: true)
+
+        delete "/groups/#{group.id}/members.json", params: { user_id: 42 }
+        expect(response.status).to eq(403)
+      end
+
+      it "raises an error if user to be removed is not found" do
+        delete "/groups/#{group.id}/members.json", params: { user_id: -10 }
+        expect(response.status).to eq(404)
+      end
+
+      context "is able to remove a member" do
+        it "removes by id" do
+          expect do
+            delete "/groups/#{group.id}/members.json", params: { user_id: user.id }
+          end.to change { group.users.count }.by(-1)
+
+          expect(response).to be_success
+        end
+
+        it "removes by username" do
+          expect do
+            delete "/groups/#{group.id}/members.json", params: { username: user.username }
+          end.to change { group.users.count }.by(-1)
+
+          expect(response).to be_success
+        end
+
+        it "removes user.primary_group_id when user is removed from group" do
+          user.update!(primary_group_id: group.id)
+
+          delete "/groups/#{group.id}/members.json", params: { user_id: user.id }
+
+          expect(user.reload.primary_group_id).to eq(nil)
+        end
+
+        it "removes by user_email" do
+          expect do
+            delete "/groups/#{group.id}/members.json",
+              params: { user_email: user.email }
+          end.to change { group.users.count }.by(-1)
+
+          expect(response).to be_success
+        end
+
+        context 'public group' do
+          let(:other_user) { Fabricate(:user) }
+          let(:group) { Fabricate(:public_group, users: [other_user]) }
+
+          context "admin" do
+            it "removes by username" do
+              expect do
+                delete "/groups/#{group.id}/members.json",
+                  params: { username: other_user.username }
+              end.to change { group.users.count }.by(-1)
+
+              expect(response).to be_success
+            end
+          end
+
+          it 'should allow a user to leave a group' do
+            sign_in(other_user)
+
+            expect do
+              delete "/groups/#{group.id}/members.json",
+              params: { username: other_user.username }
+            end.to change { group.users.count }.by(-1)
+
+            expect(response).to be_success
+          end
+
+          it 'should not allow a underprivilege user to leave a group for another user' do
+            sign_in(user)
+
+            delete "/groups/#{group.id}/members.json",
+              params: { username: other_user.username }
+
+            expect(response).to be_forbidden
+          end
+        end
+      end
+    end
+  end
+
+  describe "group histories" do
+    context 'when user is not signed in' do
+      it 'should raise the right error' do
+        expect do
+          get "/groups/#{group.name}/logs.json"
+        end.to raise_error(Discourse::NotLoggedIn)
+      end
+    end
+
+    context 'when user is not a group owner' do
+      before do
+        sign_in(user)
+      end
+
+      it 'should be forbidden' do
+        get "/groups/#{group.name}/logs.json"
+
+        expect(response).to be_forbidden
+      end
+    end
+
+    describe 'viewing history' do
+      context 'public group' do
+        before do
+          group.add_owner(user)
+
+          group.update_attributes!(
+            public_admission: true,
+            public_exit: true
+          )
+
+          GroupActionLogger.new(user, group).log_change_group_settings
+          sign_in(user)
+        end
+
+        it 'should allow group owner to view history' do
+          get "/groups/#{group.name}/logs.json"
+
+          expect(response).to be_success
+
+          result = JSON.parse(response.body)["logs"].last
+
+          expect(result["action"]).to eq(GroupHistory.actions[1].to_s)
+          expect(result["subject"]).to eq('public_exit')
+          expect(result["prev_value"]).to eq('f')
+          expect(result["new_value"]).to eq('t')
+        end
+      end
+
+      context 'admin' do
+        let(:admin) { Fabricate(:admin) }
+
+        before do
+          sign_in(admin)
+        end
+
+        it 'should be able to view history' do
+          GroupActionLogger.new(admin, group).log_remove_user_from_group(user)
+
+          get "/groups/#{group.name}/logs.json"
+
+          expect(response).to be_success
+
+          result = JSON.parse(response.body)["logs"].first
+
+          expect(result["action"]).to eq(GroupHistory.actions[3].to_s)
+        end
+
+        it 'should be able to filter through the history' do
+          GroupActionLogger.new(admin, group).log_add_user_to_group(user)
+          GroupActionLogger.new(admin, group).log_remove_user_from_group(user)
+
+          get "/groups/#{group.name}/logs.json", params: {
+            filters: { "action" => "add_user_to_group" }
+          }
+
+          expect(response).to be_success
+
+          logs = JSON.parse(response.body)["logs"]
+
+          expect(logs.count).to eq(1)
+          expect(logs.first["action"]).to eq(GroupHistory.actions[2].to_s)
+        end
+      end
+    end
+  end
+
+  describe '#request_membership' do
+    let(:new_user) { Fabricate(:user) }
+
+    it 'requires the user to log in' do
+      expect do
+        post "/groups/#{group.name}/request_membership.json"
+      end.to raise_error(Discourse::NotLoggedIn)
+    end
+
+    it 'requires a reason' do
+      sign_in(user)
+
+      expect do
+        post "/groups/#{group.name}/request_membership.json"
+      end.to raise_error(ActionController::ParameterMissing)
+    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)
+
+      post "/groups/#{group.name}/request_membership.json",
+        params: { reason: 'Please add me in' }
+
+      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('Please add me in')
+      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 ' 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 do
+          get '/groups/search.json'
+        end.to raise_error(Discourse::NotLoggedIn)
+      end
+    end
+
+    context 'as a normal user' do
+      it "returns the right response" do
+        sign_in(user)
+
+        get '/groups/search.json'
+
+        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|
+          get "/groups/search.json?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
+
+        get "/groups/search.json?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)
+
+        get "/groups/search.json?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))
+
+        get '/groups/search.json?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/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb
new file mode 100644
index 0000000000..9a0d21a5c9
--- /dev/null
+++ b/spec/requests/list_controller_spec.rb
@@ -0,0 +1,41 @@
+require 'rails_helper'
+
+RSpec.describe ListController do
+  let(:topic) { Fabricate(:topic) }
+
+  describe '#index' do
+    it "doesn't throw an error with a negative page" do
+      get "/#{Discourse.anonymous_filters[1]}", params: { page: -1024 }
+      expect(response).to be_success
+    end
+
+    it "doesn't throw an error with page params as an array" do
+      get "/#{Discourse.anonymous_filters[1]}", params: { page: ['7'] }
+      expect(response).to be_success
+    end
+  end
+
+  describe 'titles for crawler layout' do
+    it 'has no title for the default URL' do
+      topic
+      filter = Discourse.anonymous_filters[0]
+      get "/#{filter}", params: { _escaped_fragment_: 'true' }
+
+      expect(response.body).to include(I18n.t("rss_description.posts"))
+
+      expect(response.body).to_not include(
+        I18n.t('js.filters.with_topics', filter: filter)
+      )
+    end
+
+    it 'has a title for non-default URLs' do
+      topic
+      filter = Discourse.anonymous_filters[1]
+      get "/#{filter}", params: { _escaped_fragment_: 'true' }
+
+      expect(response.body).to include(
+        I18n.t('js.filters.with_topics', filter: filter)
+      )
+    end
+  end
+end
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
new file mode 100644
index 0000000000..20ca66324b
--- /dev/null
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -0,0 +1,211 @@
+require 'rails_helper'
+
+RSpec.describe Users::OmniauthCallbacksController do
+  let(:user) { Fabricate(:user) }
+
+  before do
+    OmniAuth.config.test_mode = true
+  end
+
+  after do
+    Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2] = nil
+    OmniAuth.config.test_mode = false
+  end
+
+  context 'Google Oauth2' do
+    before do
+      SiteSetting.enable_google_oauth2_logins = true
+    end
+
+    context "without an `omniauth.auth` env" do
+      it "should return a 404" do
+        get "/auth/eviltrout/callback"
+        expect(response.code).to eq("404")
+      end
+    end
+
+    describe 'when user has been verified' do
+      before do
+        OmniAuth.config.mock_auth[:google_oauth2] = OmniAuth::AuthHash.new(
+          provider: 'google_oauth2',
+          uid: '123545',
+          info: OmniAuth::AuthHash::InfoHash.new(
+            email: user.email,
+            name: 'Some name'
+          ),
+          extra: {
+            raw_info: OmniAuth::AuthHash.new(
+              email_verified: true,
+              email: user.email,
+              family_name: 'Huh',
+              given_name: user.name,
+              gender: 'male',
+              name: "#{user.name} Huh",
+            )
+          },
+        )
+
+        Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2]
+      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(response).to be_success
+
+        response_body = JSON.parse(response.body)
+
+        expect(response_body["authenticated"]).to eq(true)
+        expect(response_body["awaiting_activation"]).to eq(false)
+        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
+
+      it "should activate/unstage staged user" do
+        user.update!(staged: true, registration_ip_address: nil)
+
+        user.reload
+        expect(user.staged).to eq(true)
+        expect(user.registration_ip_address).to eq(nil)
+
+        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.staged).to eq(false)
+        expect(user.registration_ip_address).to be_present
+      end
+
+      context 'when user has not verified his email' do
+        before do
+          GoogleUserInfo.create!(google_user_id: '12345', user: user)
+          user.update!(active: false)
+
+          OmniAuth.config.mock_auth[:google_oauth2] = OmniAuth::AuthHash.new(
+            provider: 'google_oauth2',
+            uid: '12345',
+            info: OmniAuth::AuthHash::InfoHash.new(
+              email: 'someother_email@test.com',
+              name: 'Some name'
+            ),
+            extra: {
+              raw_info: OmniAuth::AuthHash.new(
+                email_verified: true,
+                email: 'someother_email@test.com',
+                family_name: 'Huh',
+                given_name: user.name,
+                gender: 'male',
+                name: "#{user.name} Huh",
+              )
+            },
+          )
+
+          Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2]
+        end
+
+        it 'should return the right response' do
+          get "/auth/google_oauth2/callback.json"
+
+          expect(response).to be_success
+
+          response_body = JSON.parse(response.body)
+
+          expect(user.reload.active).to eq(false)
+          expect(response_body["authenticated"]).to eq(false)
+          expect(response_body["awaiting_activation"]).to eq(true)
+        end
+      end
+    end
+
+    context 'after changing email' do
+      require_dependency 'email_updater'
+
+      def login(identity)
+        OmniAuth.config.mock_auth[:google_oauth2] = OmniAuth::AuthHash.new(
+          provider: 'google_oauth2',
+          uid: "123545#{identity[:username]}",
+          info: OmniAuth::AuthHash::InfoHash.new(
+            email: identity[:email],
+            name: 'Some name'
+          ),
+          extra: {
+            raw_info: OmniAuth::AuthHash.new(
+              email_verified: true,
+              email: identity[:email],
+              family_name: 'Huh',
+              given_name: identity[:name],
+              gender: 'male',
+              name: "#{identity[:name]} Huh",
+            )
+          },
+        )
+
+        Rails.application.env_config["omniauth.auth"] = OmniAuth.config.mock_auth[:google_oauth2]
+
+        get "/auth/google_oauth2/callback.json"
+        JSON.parse(response.body)
+      end
+
+      it 'activates the correct email' do
+        old_email = 'old@email.com'
+        old_identity = { name: 'Bob',
+                         username: 'bob',
+                         email: old_email }
+        user = Fabricate(:user, email: old_email)
+        new_email = 'new@email.com'
+        new_identity = { name: 'Bob',
+                         username: 'boguslaw',
+                         email: new_email }
+
+        updater = EmailUpdater.new(user.guardian, user)
+        updater.change_to(new_email)
+
+        user.reload
+        expect(user.email).to eq(old_email)
+
+        response = login(old_identity)
+        expect(response['authenticated']).to eq(true)
+
+        user.reload
+        expect(user.email).to eq(old_email)
+
+        response = login(new_identity)
+        expect(response['authenticated']).to eq(nil)
+        expect(response['email']).to eq(new_email)
+      end
+    end
+  end
+end
diff --git a/spec/requests/post_actions_controller_spec.rb b/spec/requests/post_actions_controller_spec.rb
new file mode 100644
index 0000000000..5ad8455334
--- /dev/null
+++ b/spec/requests/post_actions_controller_spec.rb
@@ -0,0 +1,148 @@
+require 'rails_helper'
+
+RSpec.describe PostActionsController do
+  describe '#create' do
+    describe 'as a moderator' do
+      let(:user) { Fabricate(:moderator) }
+      let(:post_1) { Fabricate(:post, user: Fabricate(:coding_horror)) }
+
+      before do
+        sign_in(user)
+      end
+
+      it 'raises an error when the id is missing' do
+        expect do
+          post "/post_actions.json", params: {
+            post_action_type_id: PostActionType.types[:like]
+          }
+        end.to raise_error(ActionController::ParameterMissing)
+      end
+
+      it 'fails when the id is invalid' do
+        post "/post_actions.json", params: {
+          post_action_type_id: PostActionType.types[:like], id: -1
+        }
+
+        expect(response.status).to eq(404)
+      end
+
+      it 'raises an error when the post_action_type_id index is missing' do
+        expect do
+          post "/post_actions.json", params: { id: post_1.id }
+        end.to raise_error(ActionController::ParameterMissing)
+      end
+
+      it "fails when the user doesn't have permission to see the post" do
+        post_1 = Fabricate(:private_message_post, user: Fabricate(:user))
+
+        post "/post_actions.json", params: {
+          id: post_1.id, post_action_type_id: PostActionType.types[:like]
+        }
+
+        expect(response).to be_forbidden
+      end
+
+      it 'allows us to create an post action on a post' do
+        expect do
+          post "/post_actions.json", params: {
+            id: post_1.id, post_action_type_id: PostActionType.types[:like]
+          }
+        end.to change { PostAction.count }.by(1)
+
+        post_action = PostAction.last
+
+        expect(post_action.post_id).to eq(post_1.id)
+        expect(post_action.post_action_type_id).to eq(PostActionType.types[:like])
+      end
+
+      it "passes a list of taken actions through" do
+        PostAction.create(
+          post_id: post_1.id,
+          user_id: user.id,
+          post_action_type_id: PostActionType.types[:inappropriate]
+        )
+
+        post "/post_actions.json", params: {
+          id: post_1.id, post_action_type_id: PostActionType.types[:off_topic]
+        }
+
+        expect(response).to_not be_success
+      end
+
+      it 'passes the message through' do
+        message = 'action message goes here'
+
+        post "/post_actions.json", params: {
+          id: post_1.id,
+          post_action_type_id: PostActionType.types[:notify_user],
+          message: message
+        }
+
+        expect(PostAction.last.post_id).to eq(post_1.id)
+        expect(Post.last.raw).to include(message)
+      end
+
+      it 'passes the message through as warning' do
+        message = 'action message goes here'
+
+        post "/post_actions.json", params: {
+          id: post_1.id,
+          post_action_type_id: PostActionType.types[:notify_user],
+          message: message,
+          is_warning: true
+        }
+
+        expect(PostAction.last.post_id).to eq(post_1.id)
+
+        post = Post.last
+
+        expect(post.raw).to include(message)
+        expect(post.topic.is_official_warning?).to eq(true)
+      end
+
+      it "doesn't create message as a warning if the user isn't staff" do
+        sign_in(Fabricate(:user))
+
+        post "/post_actions.json", params: {
+          id: post_1.id,
+          post_action_type_id: PostActionType.types[:notify_user],
+          message: 'action message goes here',
+          is_warning: true
+        }
+
+        expect(response.status).to eq(403)
+      end
+
+      it 'passes take_action through' do
+        post "/post_actions.json", params: {
+          id: post_1.id,
+          post_action_type_id: PostActionType.types[:spam],
+          take_action: 'true'
+        }
+
+        expect(response).to be_success
+
+        post_action = PostAction.last
+
+        expect(post_action.post_id).to eq(post_1.id)
+        expect(post_action.staff_took_action).to eq(true)
+      end
+
+      it "doesn't pass take_action through if the user isn't staff" do
+        sign_in(Fabricate(:user))
+
+        post "/post_actions.json", params: {
+          id: post_1.id,
+          post_action_type_id: PostActionType.types[:like]
+        }
+
+        expect(response).to be_success
+
+        post_action = PostAction.last
+
+        expect(post_action.post_id).to eq(post_1.id)
+        expect(post_action.staff_took_action).to eq(false)
+      end
+    end
+  end
+end
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
new file mode 100644
index 0000000000..62256403bf
--- /dev/null
+++ b/spec/requests/posts_controller_spec.rb
@@ -0,0 +1,202 @@
+require 'rails_helper'
+
+RSpec.describe PostsController do
+  let(:user) { Fabricate(:user) }
+  let(:category) { Fabricate(:category) }
+  let(:topic) { Fabricate(:topic) }
+  let(:public_post) { Fabricate(:post, user: user, topic: topic) }
+
+  let(:private_topic) do
+    Fabricate(:topic, archetype: Archetype.private_message, category: nil)
+  end
+
+  let(:private_post) { Fabricate(:post, user: user, topic: private_topic) }
+
+  describe '#create' do
+    before do
+      sign_in(user)
+    end
+
+    it 'creates the post' do
+      post "/posts.json", params: {
+        raw: 'this is the test content',
+        title: 'this is the test title for the topic',
+        category: category.id,
+        meta_data: { xyz: 'abc' }
+      }
+
+      expect(response).to be_success
+
+      new_post = Post.last
+      topic = new_post.topic
+
+      expect(new_post.user).to eq(user)
+      expect(new_post.raw).to eq('this is the test content')
+      expect(topic.title).to eq('This is the test title for the topic')
+      expect(topic.category).to eq(category)
+      expect(topic.meta_data).to eq("xyz" => 'abc')
+    end
+
+    it 'can create a reply to a post' do
+      SiteSetting.queue_jobs = true
+
+      topic = Fabricate(:private_message_post, user: user).topic
+      post_2 = Fabricate(:private_message_post, user: user, topic: topic)
+
+      post "/posts.json", params: {
+        raw: 'this is the test content',
+        topic_id: topic.id,
+        reply_to_post_number: post_2.post_number,
+        image_sizes: { width: '100', height: '200' }
+      }
+
+      expect(response).to be_success
+
+      new_post = Post.last
+      topic = new_post.topic
+
+      expect(new_post.user).to eq(user)
+      expect(new_post.raw).to eq('this is the test content')
+      expect(new_post.reply_to_post_number).to eq(post_2.post_number)
+
+      job_args = Jobs::ProcessPost.jobs.first["args"].first
+
+      expect(job_args["image_sizes"]).to eq("width" => '100', "height" => '200')
+    end
+
+    it 'creates a private post' do
+      user_2 = Fabricate(:user)
+      user_3 = Fabricate(:user)
+
+      post "/posts.json", params: {
+        raw: 'this is the test content',
+        archetype: 'private_message',
+        title: "this is some post",
+        target_usernames: "#{user_2.username},#{user_3.username}"
+      }
+
+      expect(response).to be_success
+
+      new_post = Post.last
+      new_topic = Topic.last
+
+      expect(new_post.user).to eq(user)
+      expect(new_topic.private_message?).to eq(true)
+      expect(new_topic.allowed_users).to contain_exactly(user, user_2, user_3)
+    end
+
+    describe 'warnings' do
+      let(:user_2) { Fabricate(:user) }
+
+      context 'as a staff user' do
+        before do
+          sign_in(Fabricate(:admin))
+        end
+
+        it 'should be able to mark a topic as warning' do
+          post "/posts.json", params: {
+            raw: 'this is the test content',
+            archetype: 'private_message',
+            title: "this is some post",
+            target_usernames: user_2.username,
+            is_warning: true
+          }
+
+          expect(response).to be_success
+
+          new_topic = Topic.last
+
+          expect(new_topic.title).to eq('This is some post')
+          expect(new_topic.is_official_warning?).to eq(true)
+        end
+
+        it 'should be able to mark a topic as not a warning' do
+          post "/posts.json", params: {
+            raw: 'this is the test content',
+            archetype: 'private_message',
+            title: "this is some post",
+            target_usernames: user_2.username,
+            is_warning: false
+          }
+
+          expect(response).to be_success
+
+          new_topic = Topic.last
+
+          expect(new_topic.title).to eq('This is some post')
+          expect(new_topic.is_official_warning?).to eq(false)
+        end
+      end
+
+      context 'as a normal user' do
+        it 'should not be able to mark a topic as warning' do
+          post "/posts.json", params: {
+            raw: 'this is the test content',
+            archetype: 'private_message',
+            title: "this is some post",
+            target_usernames: user_2.username,
+            is_warning: true
+          }
+
+          expect(response).to be_success
+
+          new_topic = Topic.last
+
+          expect(new_topic.title).to eq('This is some post')
+          expect(new_topic.is_official_warning?).to eq(false)
+        end
+      end
+    end
+  end
+
+  describe '#user_posts_feed' do
+    it 'returns public posts rss feed' do
+      public_post
+      private_post
+
+      get "/u/#{user.username}/activity.rss"
+
+      expect(response).to be_success
+
+      body = response.body
+
+      expect(body).to_not include(private_post.url)
+      expect(body).to include(public_post.url)
+    end
+  end
+
+  describe '#latest' do
+    context 'private posts' do
+      it 'returns private posts rss feed' do
+        sign_in(Fabricate(:admin))
+
+        public_post
+        private_post
+        get "/private-posts.rss"
+
+        expect(response).to be_success
+
+        body = response.body
+
+        expect(body).to include(private_post.url)
+        expect(body).to_not include(public_post.url)
+      end
+    end
+
+    context 'public posts' do
+      it 'returns public posts with topic rss feed' do
+        public_post
+        private_post
+
+        get "/posts.rss"
+
+        expect(response).to be_success
+
+        body = response.body
+
+        expect(body).to include(public_post.url)
+        expect(body).to_not include(private_post.url)
+      end
+    end
+  end
+end
diff --git a/spec/requests/robots_txt_controller_spec.rb b/spec/requests/robots_txt_controller_spec.rb
new file mode 100644
index 0000000000..68d5912be4
--- /dev/null
+++ b/spec/requests/robots_txt_controller_spec.rb
@@ -0,0 +1,19 @@
+require 'rails_helper'
+
+RSpec.describe RobotsTxtController do
+  describe '#index' do
+    it "returns index when indexing is allowed" do
+      SiteSetting.allow_index_in_robots_txt = true
+      get '/robots.txt'
+
+      expect(response.body).to include("Disallow: /u/")
+    end
+
+    it "returns noindex when indexing is disallowed" do
+      SiteSetting.allow_index_in_robots_txt = false
+      get '/robots.txt'
+
+      expect(response.body).to_not include("Disallow: /u/")
+    end
+  end
+end
diff --git a/spec/requests/safe_mode_controller_spec.rb b/spec/requests/safe_mode_controller_spec.rb
new file mode 100644
index 0000000000..a47d2f085c
--- /dev/null
+++ b/spec/requests/safe_mode_controller_spec.rb
@@ -0,0 +1,13 @@
+require 'rails_helper'
+
+RSpec.describe SafeModeController do
+  describe 'enter' do
+    context 'when no params are given' do
+      it 'should redirect back to safe mode page' do
+        post '/safe-mode'
+
+        expect(response.status).to redirect_to(safe_mode_path)
+      end
+    end
+  end
+end
diff --git a/spec/requests/static_controller_spec.rb b/spec/requests/static_controller_spec.rb
new file mode 100644
index 0000000000..f4376253ac
--- /dev/null
+++ b/spec/requests/static_controller_spec.rb
@@ -0,0 +1,257 @@
+require 'rails_helper'
+
+describe StaticController do
+
+  context '#favicon' do
+    before do
+      # this is a mess in test, will fix in a future commit
+      FinalDestination.stubs(:lookup_ip).returns('1.2.3.4')
+    end
+
+    let(:png) { Base64.decode64("R0lGODlhAQABALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//wBiZCH5BAEAAA8ALAAAAAABAAEAAAQC8EUAOw==") }
+
+    it 'returns the default favicon for a missing download' do
+
+      url = "https://somewhere1.over.rainbow/#{SecureRandom.hex}.png"
+
+      stub_request(:head, url).
+        with(headers: { 'Host' => 'somewhere1.over.rainbow' }).
+        to_return(status: 404, body: "", headers: {})
+
+      SiteSetting.favicon_url = url
+
+      get '/favicon/proxied'
+
+      favicon = File.read(Rails.root + "public/images/default-favicon.png")
+
+      expect(response.status).to eq(200)
+      expect(response.content_type).to eq('image/png')
+      expect(response.body.bytesize).to eq(favicon.bytesize)
+    end
+
+    it 'can proxy a favicon correctly' do
+      url = "https://somewhere.over.rainbow/#{SecureRandom.hex}.png"
+
+      stub_request(:head, url).
+        with(headers: { 'Host' => 'somewhere.over.rainbow' }).
+        to_return(status: 200, body: "", headers: {})
+
+      stub_request(:get, url).
+        to_return(status: 200, body: png, headers: {})
+
+      SiteSetting.favicon_url = url
+
+      get '/favicon/proxied'
+
+      expect(response.status).to eq(200)
+      expect(response.content_type).to eq('image/png')
+      expect(response.body.bytesize).to eq(png.bytesize)
+    end
+  end
+
+  context '#brotli_asset' do
+    it 'returns a non brotli encoded 404 if asset is missing' do
+
+      get "/brotli_asset/missing.js"
+
+      expect(response.status).to eq(404)
+      expect(response.headers['Content-Encoding']).not_to eq('br')
+      expect(response.headers['Cache-Control']).to match(/max-age=1/)
+    end
+
+    it 'can handle fallback brotli assets' do
+      begin
+        assets_path = Rails.root.join("tmp/backup_assets")
+
+        GlobalSetting.stubs(:fallback_assets_path).returns(assets_path.to_s)
+
+        FileUtils.mkdir_p(assets_path)
+
+        file_path = assets_path.join("test.js.br")
+        File.write(file_path, 'fake brotli file')
+
+        get "/brotli_asset/test.js"
+
+        expect(response.status).to eq(200)
+        expect(response.headers["Cache-Control"]).to match(/public/)
+      ensure
+        File.delete(file_path)
+      end
+    end
+
+    it 'has correct headers for brotli assets' do
+      begin
+        assets_path = Rails.root.join("public/assets")
+
+        FileUtils.mkdir_p(assets_path)
+
+        file_path = assets_path.join("test.js.br")
+        File.write(file_path, 'fake brotli file')
+
+        get "/brotli_asset/test.js"
+
+        expect(response.status).to eq(200)
+        expect(response.headers["Cache-Control"]).to match(/public/)
+      ensure
+        File.delete(file_path)
+      end
+    end
+  end
+
+  context '#show' do
+    before do
+      post = create_post
+      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
+      it "should return the right response" do
+        get "/faq"
+
+        expect(response).to be_success
+        expect(response.body).to include(I18n.t('js.faq'))
+      end
+    end
+
+    [
+      ['tos', :tos_url, I18n.t('terms_of_service.title')],
+      ['privacy', :privacy_policy_url, I18n.t('privacy')]
+    ].each do |id, setting_name, text|
+
+      context "#{id}" do
+        context "when #{setting_name} site setting is NOT set" do
+          it "renders the #{id} page" do
+            get "/#{id}"
+
+            expect(response).to be_success
+            expect(response.body).to include(text)
+          end
+        end
+
+        context "when #{setting_name} site setting is set" do
+          before do
+            SiteSetting.public_send("#{setting_name}=", 'http://example.com/page')
+          end
+
+          it "redirects to the #{setting_name}" do
+            get "/#{id}"
+
+            expect(response).to redirect_to('http://example.com/page')
+          end
+        end
+      end
+    end
+
+    context "with a missing file" do
+      it "should respond 404" do
+        get "/static/does-not-exist"
+        expect(response.status).to eq(404)
+      end
+    end
+
+    it 'should redirect to / when logged in and path is /login' do
+      sign_in(Fabricate(:user))
+      get "/login"
+      expect(response).to redirect_to('/')
+    end
+
+    it "should display the login template when login is required" do
+      SiteSetting.login_required = true
+
+      get "/login"
+
+      expect(response).to be_success
+
+      expect(response.body).to include(PrettyText.cook(I18n.t(
+        'login_required.welcome_message', title: SiteSetting.title
+      )))
+    end
+
+    context "when login_required is enabled" do
+      before do
+        SiteSetting.login_required = true
+      end
+
+      it 'faq page redirects to login page for anon' do
+        get '/faq'
+        expect(response).to redirect_to '/login'
+      end
+
+      it 'guidelines page redirects to login page for anon' do
+        get '/guidelines'
+        expect(response).to redirect_to '/login'
+      end
+
+      it 'faq page loads for logged in user' do
+        sign_in(Fabricate(:user))
+
+        get '/faq'
+
+        expect(response).to be_success
+        expect(response.body).to include(I18n.t('js.faq'))
+      end
+
+      it 'guidelines page loads for logged in user' do
+        sign_in(Fabricate(:user))
+
+        get '/guidelines'
+
+        expect(response).to be_success
+        expect(response.body).to include(I18n.t('guidelines'))
+      end
+    end
+  end
+
+  describe '#enter' do
+    context 'without a redirect path' do
+      it 'redirects to the root url' do
+        post "/login.json"
+        expect(response).to redirect_to('/')
+      end
+    end
+
+    context 'with a redirect path' do
+      it 'redirects to the redirect path' do
+        post "/login.json", params: { redirect: '/foo' }
+        expect(response).to redirect_to('/foo')
+      end
+    end
+
+    context 'with a full url' do
+      it 'redirects to the correct path' do
+        post "/login.json", params: { redirect: "#{Discourse.base_url}/foo" }
+        expect(response).to redirect_to('/foo')
+      end
+    end
+
+    context 'with a period to force a new host' do
+      it 'redirects to the root path' do
+        post "/login.json", params: { redirect: ".org/foo" }
+        expect(response).to redirect_to('/')
+      end
+    end
+
+    context 'with a full url to someone else' do
+      it 'redirects to the root path' do
+        post "/login.json", params: { redirect: "http://eviltrout.com/foo" }
+        expect(response).to redirect_to('/')
+      end
+    end
+
+    context 'with an invalid URL' do
+      it "redirects to the root" do
+        post "/login.json", params: { redirect: "javascript:alert('trout')" }
+        expect(response).to redirect_to('/')
+      end
+    end
+
+    context 'when the redirect path is the login page' do
+      it 'redirects to the root url' do
+        post "/login.json", params: { redirect: login_path }
+        expect(response).to redirect_to('/')
+      end
+    end
+  end
+end
diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rb
new file mode 100644
index 0000000000..568fa9858d
--- /dev/null
+++ b/spec/requests/tags_controller_spec.rb
@@ -0,0 +1,20 @@
+require 'rails_helper'
+
+describe TagsController do
+  before do
+    SiteSetting.tagging_enabled = true
+  end
+
+  describe '#check_hashtag' do
+    let(:tag) { Fabricate(:tag, name: 'test') }
+
+    it "should return the right response" do
+      get "/tags/check.json", params: { tag_values: [tag.name] }
+
+      expect(response).to be_success
+
+      tag = JSON.parse(response.body)["valid"].first
+      expect(tag["value"]).to eq('test')
+    end
+  end
+end
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
new file mode 100644
index 0000000000..155fee81d9
--- /dev/null
+++ b/spec/requests/topics_controller_spec.rb
@@ -0,0 +1,216 @@
+require 'rails_helper'
+
+RSpec.describe TopicsController do
+  let(:topic) { Fabricate(:topic) }
+  let(:user) { Fabricate(:user) }
+
+  describe '#show' do
+    let(:private_topic) { Fabricate(:private_message_topic) }
+
+    describe 'when topic is not allowed' do
+      it 'should return the right response' do
+        sign_in(user)
+
+        get "/t/#{private_topic.id}.json"
+
+        expect(response.status).to eq(403)
+        expect(response.body).to eq(I18n.t('invalid_access'))
+      end
+    end
+  end
+
+  describe '#timings' do
+    let(:post_1) { Fabricate(:post, topic: topic) }
+
+    it 'should record the timing' do
+      sign_in(user)
+
+      post "/topics/timings.json", params: {
+        topic_id: topic.id,
+        topic_time: 5,
+        timings: { post_1.post_number => 2 }
+      }
+
+      expect(response).to be_success
+
+      post_timing = PostTiming.first
+
+      expect(post_timing.topic).to eq(topic)
+      expect(post_timing.user).to eq(user)
+      expect(post_timing.msecs).to eq(2)
+    end
+  end
+
+  describe '#timer' do
+    context 'when a user is not logged in' do
+      it 'should return the right response' do
+        expect do
+          post "/t/#{topic.id}/timer.json", params: {
+            time: '24',
+            status_type: TopicTimer.types[1]
+          }
+        end.to raise_error(Discourse::NotLoggedIn)
+      end
+    end
+
+    context 'when does not have permission' do
+      it 'should return the right response' do
+        sign_in(user)
+
+        post "/t/#{topic.id}/timer.json", params: {
+          time: '24',
+          status_type: TopicTimer.types[1]
+        }
+
+        expect(response.status).to eq(403)
+        expect(JSON.parse(response.body)["error_type"]).to eq('invalid_access')
+      end
+    end
+
+    context 'when logged in as an admin' do
+      let(:admin) { Fabricate(:admin) }
+
+      before do
+        sign_in(admin)
+      end
+
+      it 'should be able to create a topic status update' do
+        time = 24
+
+        post "/t/#{topic.id}/timer.json", params: {
+          time: 24,
+          status_type: TopicTimer.types[1]
+        }
+
+        expect(response).to be_success
+
+        topic_status_update = TopicTimer.last
+
+        expect(topic_status_update.topic).to eq(topic)
+
+        expect(topic_status_update.execute_at)
+          .to be_within(1.second).of(24.hours.from_now)
+
+        json = JSON.parse(response.body)
+
+        expect(DateTime.parse(json['execute_at']))
+          .to be_within(1.seconds).of(DateTime.parse(topic_status_update.execute_at.to_s))
+
+        expect(json['duration']).to eq(topic_status_update.duration)
+        expect(json['closed']).to eq(topic.reload.closed)
+      end
+
+      it 'should be able to delete a topic status update' do
+        Fabricate(:topic_timer, topic: topic)
+
+        post "/t/#{topic.id}/timer.json", params: {
+          time: nil,
+          status_type: TopicTimer.types[1]
+        }
+
+        expect(response).to be_success
+        expect(topic.reload.public_topic_timer).to eq(nil)
+
+        json = JSON.parse(response.body)
+
+        expect(json['execute_at']).to eq(nil)
+        expect(json['duration']).to eq(nil)
+        expect(json['closed']).to eq(topic.closed)
+      end
+
+      describe 'publishing topic to category in the future' do
+        it 'should be able to create the topic status update' do
+          SiteSetting.queue_jobs = true
+
+          post "/t/#{topic.id}/timer.json", params: {
+            time: 24,
+            status_type: TopicTimer.types[3],
+            category_id: topic.category_id
+          }
+
+          expect(response).to be_success
+
+          topic_status_update = TopicTimer.last
+
+          expect(topic_status_update.topic).to eq(topic)
+
+          expect(topic_status_update.execute_at)
+            .to be_within(1.second).of(24.hours.from_now)
+
+          expect(topic_status_update.status_type)
+            .to eq(TopicTimer.types[:publish_to_category])
+
+          json = JSON.parse(response.body)
+
+          expect(json['category_id']).to eq(topic.category_id)
+        end
+      end
+
+      describe 'invalid status type' do
+        it 'should raise the right error' do
+          expect do
+            post "/t/#{topic.id}/timer.json", params: {
+              time: 10,
+              status_type: 'something'
+            }
+          end.to raise_error(Discourse::InvalidParameters)
+        end
+      end
+    end
+  end
+
+  describe 'invite_group' do
+    let(:admins) { Group[:admins] }
+    let(:pm) { Fabricate(:private_message_topic) }
+
+    def invite_group(topic, expected_status)
+      post "/t/#{topic.id}/invite-group.json", params: { group: admins.name }
+      expect(response.status).to eq(expected_status)
+    end
+
+    before do
+      admins.update!(messageable_level: Group::ALIAS_LEVELS[:everyone])
+    end
+
+    describe 'as an anon user' do
+      it 'should be forbidden' do
+        invite_group(pm, 403)
+      end
+    end
+
+    describe 'as a normal user' do
+      let!(:user) { sign_in(Fabricate(:user)) }
+
+      describe 'when user does not have permission to view the topic' do
+        it 'should be forbidden' do
+          invite_group(pm, 403)
+        end
+      end
+
+      describe 'when user has permission to view the topic' do
+        before do
+          pm.allowed_users << user
+        end
+
+        it 'should allow user to invite group to topic' do
+          invite_group(pm, 200)
+          expect(pm.allowed_groups.first.id).to eq(admins.id)
+        end
+      end
+    end
+
+    describe 'as an admin user' do
+      let!(:admin) { sign_in(Fabricate(:admin)) }
+
+      it "disallows inviting a group to a topic" do
+        topic = Fabricate(:topic)
+        invite_group(topic, 422)
+      end
+
+      it "allows inviting a group to a PM" do
+        invite_group(pm, 200)
+        expect(pm.allowed_groups.first.id).to eq(admins.id)
+      end
+    end
+  end
+end
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
new file mode 100644
index 0000000000..9495effe71
--- /dev/null
+++ b/spec/requests/users_controller_spec.rb
@@ -0,0 +1,330 @@
+require 'rails_helper'
+
+RSpec.describe UsersController do
+  let(:user) { Fabricate(:user) }
+
+  def honeypot_magic(params)
+    get '/u/hp.json'
+    json = JSON.parse(response.body)
+    params[:password_confirmation] = json["value"]
+    params[:challenge] = json["challenge"].reverse
+    params
+  end
+
+  describe '#create' do
+
+    context "when taking over a staged account" do
+      let!(:staged) { Fabricate(:staged, email: "staged@account.com", active: true) }
+
+      it "succeeds" do
+        post '/u.json', params: honeypot_magic(
+          email: staged.email,
+          username: "zogstrip",
+          password: "P4ssw0rd$$"
+        )
+
+        expect(response.status).to eq(200)
+        result = ::JSON.parse(response.body)
+        expect(result["success"]).to eq(true)
+
+        created_user = User.find_by_email(staged.email)
+        expect(created_user.staged).to eq(false)
+        expect(created_user.active).to eq(false)
+        expect(created_user.registration_ip_address).to be_present
+        expect(!!created_user.custom_fields["from_staged"]).to eq(true)
+
+        # do not allow emails changes please
+
+        put "/u/update-activation-email.json", params: { email: 'bob@bob.com' }
+
+        created_user.reload
+        expect(created_user.email).to eq("staged@account.com")
+        expect(response.status).not_to eq(200)
+      end
+    end
+
+  end
+
+  describe '#show' do
+
+    it "should be able to view a user" do
+      get "/u/#{user.username}"
+
+      expect(response).to be_success
+      expect(response.body).to include(user.username)
+    end
+
+    describe 'when username contains a period' do
+      before do
+        user.update!(username: 'test.test')
+      end
+
+      it "should be able to view a user" do
+        get "/u/#{user.username}"
+
+        expect(response).to be_success
+        expect(response.body).to include(user.username)
+      end
+    end
+  end
+
+  describe "#badges" do
+    it "renders fine by default" do
+      get "/u/#{user.username}/badges"
+      expect(response).to be_success
+    end
+
+    it "fails if badges are disabled" do
+      SiteSetting.enable_badges = false
+      get "/u/#{user.username}/badges"
+      expect(response.status).to eq(404)
+    end
+  end
+
+  describe "updating a user" do
+    before do
+      sign_in(user)
+    end
+
+    it "should be able to update a user" do
+      put "/u/#{user.username}.json", params: { name: 'test.test' }
+
+      expect(response).to be_success
+      expect(user.reload.name).to eq('test.test')
+    end
+
+    describe 'when username contains a period' do
+      before do
+        user.update!(username: 'test.test')
+      end
+
+      it "should be able to update a user" do
+        put "/u/#{user.username}.json", params: { name: 'testing123' }
+
+        expect(response).to be_success
+        expect(user.reload.name).to eq('testing123')
+      end
+    end
+  end
+
+  describe "#account_created" do
+    it "returns a message when no session is present" do
+      get "/u/account-created"
+
+      expect(response).to be_success
+
+      body = response.body
+
+      expect(body).to match(I18n.t('activation.missing_session'))
+    end
+
+    it "redirects when the user is logged in" do
+      sign_in(Fabricate(:user))
+      get "/u/account-created"
+
+      expect(response).to redirect_to("/")
+    end
+
+    context "when the user account is created" do
+      include ApplicationHelper
+
+      it "returns the message when set in the session" do
+        user = create_user
+        get "/u/account-created"
+
+        expect(response).to be_success
+
+        expect(response.body).to include(
+          "{\"message\":\"#{I18n.t("login.activate_email", email: user.email).gsub!("</", "<\\/")}\",\"show_controls\":true,\"username\":\"#{user.username}\",\"email\":\"#{user.email}\"}"
+        )
+      end
+    end
+  end
+
+  describe "search_users" do
+    let(:topic) { Fabricate :topic }
+    let(:user)  { Fabricate :user, username: "joecabot", name: "Lawrence Tierney" }
+    let(:post1) { Fabricate(:post, user: user, topic: topic) }
+
+    before do
+      SearchIndexer.enable
+      post1
+    end
+
+    it "searches when provided the term only" do
+      get "/u/search/users.json", params: { term: user.name.split(" ").last }
+      expect(response).to be_success
+      json = JSON.parse(response.body)
+      expect(json["users"].map { |u| u["username"] }).to include(user.username)
+    end
+
+    it "searches when provided the topic only" do
+      get "/u/search/users.json", params: { topic_id: topic.id }
+      expect(response).to be_success
+      json = JSON.parse(response.body)
+      expect(json["users"].map { |u| u["username"] }).to include(user.username)
+    end
+
+    it "searches when provided the term and topic" do
+      get "/u/search/users.json", params: {
+        term: user.name.split(" ").last, topic_id: topic.id
+      }
+
+      expect(response).to be_success
+      json = JSON.parse(response.body)
+      expect(json["users"].map { |u| u["username"] }).to include(user.username)
+    end
+
+    it "searches only for users who have access to private topic" do
+      privileged_user = Fabricate(:user, trust_level: 4, username: "joecabit", name: "Lawrence Tierney")
+      privileged_group = Fabricate(:group)
+      privileged_group.add(privileged_user)
+      privileged_group.save
+
+      category = Fabricate(:category)
+      category.set_permissions(privileged_group => :readonly)
+      category.save
+
+      private_topic = Fabricate(:topic, category: category)
+
+      get "/u/search/users.json", params: {
+        term: user.name.split(" ").last, topic_id: private_topic.id, topic_allowed_users: "true"
+      }
+
+      expect(response).to be_success
+      json = JSON.parse(response.body)
+      expect(json["users"].map { |u| u["username"] }).to_not include(user.username)
+      expect(json["users"].map { |u| u["username"] }).to include(privileged_user.username)
+    end
+
+    context "when `enable_names` is true" do
+      before do
+        SiteSetting.enable_names = true
+      end
+
+      it "returns names" do
+        get "/u/search/users.json", params: { term: user.name }
+        json = JSON.parse(response.body)
+        expect(json["users"].map { |u| u["name"] }).to include(user.name)
+      end
+    end
+
+    context "when `enable_names` is false" do
+      before do
+        SiteSetting.enable_names = false
+      end
+
+      it "returns names" do
+        get "/u/search/users.json", params: { term: user.name }
+        json = JSON.parse(response.body)
+        expect(json["users"].map { |u| u["name"] }).not_to include(user.name)
+      end
+    end
+
+    context 'groups' do
+      let!(:mentionable_group) do
+        Fabricate(:group,
+          mentionable_level: 99,
+          messageable_level: 0,
+          visibility_level: 0
+        )
+      end
+
+      let!(:mentionable_group_2) do
+        Fabricate(:group,
+          mentionable_level: 99,
+          messageable_level: 0,
+          visibility_level: 1
+        )
+      end
+
+      let!(:messageable_group) do
+        Fabricate(:group,
+          mentionable_level: 0,
+          messageable_level: 99
+        )
+      end
+
+      describe 'when signed in' do
+        before do
+          sign_in(user)
+        end
+
+        it "only returns visible groups" do
+          get "/u/search/users.json", params: { include_groups: "true" }
+
+          expect(response).to be_success
+
+          groups = JSON.parse(response.body)["groups"]
+
+          expect(groups.map { |group| group['name'] })
+            .to_not include(mentionable_group_2.name)
+        end
+
+        it "doesn't search for groups" do
+          get "/u/search/users.json", params: {
+            include_mentionable_groups: 'false',
+            include_messageable_groups: 'false'
+          }
+
+          expect(response).to be_success
+          expect(JSON.parse(response.body)).not_to have_key(:groups)
+        end
+
+        it "searches for messageable groups" do
+          get "/u/search/users.json", params: {
+            include_mentionable_groups: 'false',
+            include_messageable_groups: 'true'
+          }
+
+          expect(response).to be_success
+
+          expect(JSON.parse(response.body)["groups"].map { |group| group['name'] })
+            .to contain_exactly(messageable_group.name, Group.find(Group::AUTO_GROUPS[:moderators]).name)
+        end
+
+        it 'searches for mentionable groups' do
+          get "/u/search/users.json", params: {
+            include_messageable_groups: 'false',
+            include_mentionable_groups: 'true'
+          }
+
+          expect(response).to be_success
+
+          groups = JSON.parse(response.body)["groups"]
+
+          expect(groups.map { |group| group['name'] })
+            .to contain_exactly(mentionable_group.name, mentionable_group_2.name)
+        end
+      end
+
+      describe 'when not signed in' do
+        it 'should not include mentionable/messageable groups' do
+          get "/u/search/users.json", params: {
+            include_mentionable_groups: 'false',
+            include_messageable_groups: 'false'
+          }
+
+          expect(response).to be_success
+          expect(JSON.parse(response.body)).not_to have_key(:groups)
+
+          get "/u/search/users.json", params: {
+            include_mentionable_groups: 'false',
+            include_messageable_groups: 'true'
+          }
+
+          expect(response).to be_success
+          expect(JSON.parse(response.body)).not_to have_key(:groups)
+
+          get "/u/search/users.json", params: {
+            include_messageable_groups: 'false',
+            include_mentionable_groups: 'true'
+          }
+
+          expect(response).to be_success
+          expect(JSON.parse(response.body)).not_to have_key(:groups)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/users_email_controller_spec.rb b/spec/requests/users_email_controller_spec.rb
new file mode 100644
index 0000000000..a0572cb726
--- /dev/null
+++ b/spec/requests/users_email_controller_spec.rb
@@ -0,0 +1,181 @@
+require 'rails_helper'
+
+describe UsersEmailController do
+
+  describe '.confirm' do
+    it 'errors out for invalid tokens' do
+      get "/u/authorize-email/asdfasdf"
+
+      expect(response).to be_success
+      expect(response.body).to include(I18n.t('change_email.already_done'))
+    end
+
+    context 'valid old address token' do
+      let(:user) { Fabricate(:moderator) }
+      let(:updater) { EmailUpdater.new(user.guardian, user) }
+
+      before do
+        updater.change_to('new.n.cool@example.com')
+      end
+
+      it 'confirms with a correct token' do
+        get "/u/authorize-email/#{user.email_tokens.last.token}"
+
+        expect(response).to be_success
+
+        body = CGI.unescapeHTML(response.body)
+
+        expect(body)
+          .to include(I18n.t('change_email.authorizing_old.title'))
+
+        expect(body)
+          .to include(I18n.t('change_email.authorizing_old.description'))
+      end
+    end
+
+    context 'valid new address token' do
+      let(:user) { Fabricate(:user) }
+      let(:updater) { EmailUpdater.new(user.guardian, user) }
+
+      before do
+        updater.change_to('new.n.cool@example.com')
+      end
+
+      it 'confirms with a correct token' do
+        user.user_stat.update_columns(bounce_score: 42, reset_bounce_score_after: 1.week.from_now)
+
+        events = DiscourseEvent.track_events do
+          get "/u/authorize-email/#{user.email_tokens.last.token}"
+        end
+
+        expect(events.map { |event| event[:event_name] }).to include(
+          :user_logged_in, :user_first_logged_in
+        )
+
+        expect(response).to be_success
+        expect(response.body).to include(I18n.t('change_email.confirmed'))
+
+        user.reload
+
+        expect(user.user_stat.bounce_score).to eq(0)
+        expect(user.user_stat.reset_bounce_score_after).to eq(nil)
+      end
+    end
+  end
+
+  describe '.update' do
+    let(:new_email) { 'bubblegum@adventuretime.ooo' }
+
+    it "requires you to be logged in" do
+      expect do
+        put "/u/asdf/preferences/email.json"
+      end.to raise_error(Discourse::NotLoggedIn)
+    end
+
+    context 'when logged in' do
+      let(:user) { Fabricate(:user) }
+
+      before do
+        sign_in(user)
+      end
+
+      it 'raises an error without an email parameter' do
+        expect do
+          put "/u/#{user.username}/preferences/email.json"
+        end.to raise_error(ActionController::ParameterMissing)
+      end
+
+      it "raises an error if you can't edit the user's email" do
+        Guardian.any_instance.expects(:can_edit_email?).with(user).returns(false)
+
+        put "/u/#{user.username}/preferences/email.json", params: { email: new_email }
+
+        expect(response).to be_forbidden
+      end
+
+      context 'when the new email address is taken' do
+        let!(:other_user) { Fabricate(:coding_horror) }
+
+        context 'hide_email_address_taken is disabled' do
+          before do
+            SiteSetting.hide_email_address_taken = false
+          end
+
+          it 'raises an error' do
+            put "/u/#{user.username}/preferences/email.json", params: {
+              email: other_user.email
+            }
+
+            expect(response).to_not be_success
+          end
+
+          it 'raises an error if there is whitespace too' do
+            put "/u/#{user.username}/preferences/email.json", params: {
+              email: "#{other_user.email} "
+            }
+
+            expect(response).to_not be_success
+          end
+        end
+
+        context 'hide_email_address_taken is enabled' do
+          before do
+            SiteSetting.hide_email_address_taken = true
+          end
+
+          it 'responds with success' do
+            put "/u/#{user.username}/preferences/email.json", params: {
+              email: other_user.email
+            }
+
+            expect(response).to be_success
+          end
+        end
+      end
+
+      context 'when new email is different case of existing email' do
+        let!(:other_user) { Fabricate(:user, email: 'case.insensitive@gmail.com') }
+
+        it 'raises an error' do
+          put "/u/#{user.username}/preferences/email.json", params: {
+            email: other_user.email.upcase
+          }
+
+          expect(response).to_not be_success
+        end
+      end
+
+      it 'raises an error when new email domain is present in email_domains_blacklist site setting' do
+        SiteSetting.email_domains_blacklist = "mailinator.com"
+
+        put "/u/#{user.username}/preferences/email.json", params: {
+          email: "not_good@mailinator.com"
+        }
+
+        expect(response).to_not be_success
+      end
+
+      it 'raises an error when new email domain is not present in email_domains_whitelist site setting' do
+        SiteSetting.email_domains_whitelist = "discourse.org"
+
+        put "/u/#{user.username}/preferences/email.json", params: {
+          email: new_email
+        }
+
+        expect(response).to_not be_success
+      end
+
+      context 'success' do
+        it 'has an email token' do
+          expect do
+            put "/u/#{user.username}/preferences/email.json", params: {
+              email: new_email
+            }
+          end.to change(EmailChangeRequest, :count)
+        end
+      end
+    end
+
+  end
+
+end
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 0000000000..065981604e
--- /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 63743c5d95..558204460e 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/group_show_serializer_spec.rb b/spec/serializers/group_show_serializer_spec.rb
index 5641ccd8d0..925cf8efb1 100644
--- a/spec/serializers/group_show_serializer_spec.rb
+++ b/spec/serializers/group_show_serializer_spec.rb
@@ -1,6 +1,9 @@
 require 'rails_helper'
 
 describe GroupShowSerializer do
+  let(:user) { Fabricate(:user) }
+  let(:group) { Fabricate(:group) }
+
   context 'admin user' do
     let(:user) { Fabricate(:admin) }
     let(:group) { Fabricate(:group, users: [user]) }
@@ -14,9 +17,6 @@ describe GroupShowSerializer do
   end
 
   context 'group owner' do
-    let(:user) { Fabricate(:user) }
-    let(:group) { Fabricate(:group) }
-
     before do
       group.add_owner(user)
     end
@@ -28,4 +28,18 @@ describe GroupShowSerializer do
       expect(json[:group_show][:is_group_user]).to eq(true)
     end
   end
+
+  describe '#mentionable' do
+    let(:group) { Fabricate(:group, mentionable_level: Group::ALIAS_LEVELS[:everyone]) }
+
+    it 'should return the right value' do
+      json = GroupShowSerializer.new(group, scope: Guardian.new).as_json
+
+      expect(json[:group_show][:mentionable]).to eq(nil)
+
+      json = GroupShowSerializer.new(group, scope: Guardian.new(user)).as_json
+
+      expect(json[:group_show][:mentionable]).to eq(true)
+    end
+  end
 end
diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb
index 4800b0f9ca..5e75727cfc 100644
--- a/spec/serializers/post_serializer_spec.rb
+++ b/spec/serializers/post_serializer_spec.rb
@@ -9,8 +9,7 @@ describe PostSerializer do
     let(:admin) { Fabricate(:admin) }
     let(:acted_ids) {
       PostActionType.public_types.values
-        .concat([:notify_user,:spam]
-        .map{|k| PostActionType.types[k]})
+        .concat([:notify_user, :spam].map { |k| PostActionType.types[k] })
     }
 
     def visible_actions_for(user)
@@ -19,21 +18,21 @@ describe PostSerializer do
       serializer.post_actions = PostAction.counts_for([post], actor)[post.id] if user.try(:id) == actor.id
       actions = serializer.as_json[:actions_summary]
       lookup = PostActionType.types.invert
-      actions.keep_if{|a| (a[:count] || 0) > 0}.map{|a| lookup[a[:id]]}
+      actions.keep_if { |a| (a[:count] || 0) > 0 }.map { |a| lookup[a[:id]] }
     end
 
     before do
-      acted_ids.each do|id|
+      acted_ids.each do |id|
         PostAction.act(actor, post, id)
       end
       post.reload
     end
 
     it "displays the correct info" do
-      expect(visible_actions_for(actor).sort).to eq([:like,:notify_user,:spam,:vote])
-      expect(visible_actions_for(post.user).sort).to eq([:like,:vote])
-      expect(visible_actions_for(nil).sort).to eq([:like,:vote])
-      expect(visible_actions_for(admin).sort).to eq([:like,:notify_user,:spam,:vote])
+      expect(visible_actions_for(actor).sort).to eq([:like, :notify_user, :spam, :vote])
+      expect(visible_actions_for(post.user).sort).to eq([:like, :vote])
+      expect(visible_actions_for(nil).sort).to eq([:like, :vote])
+      expect(visible_actions_for(admin).sort).to eq([:like, :notify_user, :spam, :vote])
     end
 
     it "can't flag your own post to notify yourself" do
@@ -70,12 +69,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
@@ -145,7 +144,6 @@ describe PostSerializer do
       end
     end
 
-
   end
 
 end
diff --git a/spec/serializers/topic_link_serializer_spec.rb b/spec/serializers/topic_link_serializer_spec.rb
new file mode 100644
index 0000000000..9b61f55ac8
--- /dev/null
+++ b/spec/serializers/topic_link_serializer_spec.rb
@@ -0,0 +1,13 @@
+require 'rails_helper'
+
+describe TopicLinkSerializer do
+
+  it "correctly serializes the topic link" do
+    post = Fabricate(:post, raw: 'https://meta.discourse.org/')
+    TopicLink.extract_from(post)
+    serialized = described_class.new(post.topic_links.first, root: false).as_json
+
+    expect(serialized[:domain]).to eq("meta.discourse.org")
+    expect(serialized[:root_domain]).to eq("discourse.org")
+  end
+end
diff --git a/spec/serializers/topic_list_item_serializer_spec.rb b/spec/serializers/topic_list_item_serializer_spec.rb
index 823682e3b2..86f599e30d 100644
--- a/spec/serializers/topic_list_item_serializer_spec.rb
+++ b/spec/serializers/topic_list_item_serializer_spec.rb
@@ -2,18 +2,45 @@ require 'rails_helper'
 require_dependency 'post_action'
 
 describe TopicListItemSerializer do
-
-  it "correctly serializes topic" do
+  let(:topic) do
     date = Time.zone.now
 
-    topic = Topic.new
-    topic.title = "test"
-    topic.created_at = date - 2.minutes
-    topic.bumped_at = date
-    topic.posters = []
+    Fabricate.build(:topic,
+      title: 'test',
+      created_at: date - 2.minutes,
+      bumped_at: date,
+      posters: [],
+    )
+  end
+
+  it "correctly serializes topic" do
+    SiteSetting.topic_featured_link_enabled = true
     serialized = TopicListItemSerializer.new(topic, scope: Guardian.new, root: false).as_json
 
     expect(serialized[:title]).to eq("test")
     expect(serialized[:bumped]).to eq(true)
+    expect(serialized[:featured_link]).to eq(nil)
+    expect(serialized[:featured_link_root_domain]).to eq(nil)
+
+    featured_link = 'http://meta.discourse.org'
+    topic.featured_link = featured_link
+    serialized = TopicListItemSerializer.new(topic, scope: Guardian.new, root: false).as_json
+
+    expect(serialized[:featured_link]).to eq(featured_link)
+    expect(serialized[:featured_link_root_domain]).to eq('discourse.org')
+  end
+
+  describe 'when topic featured link is disable' do
+    before do
+      SiteSetting.topic_featured_link_enabled = false
+    end
+
+    it "should not include the topic's featured link" do
+      topic.featured_link = 'http://meta.discourse.org'
+      serialized = TopicListItemSerializer.new(topic, scope: Guardian.new, root: false).as_json
+
+      expect(serialized[:featured_link]).to eq(nil)
+      expect(serialized[:featured_link_root_domain]).to eq(nil)
+    end
   end
 end
diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
new file mode 100644
index 0000000000..c2970db194
--- /dev/null
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -0,0 +1,67 @@
+require 'rails_helper'
+
+describe TopicViewSerializer do
+  let(:topic) { Fabricate(:topic) }
+  let(:user) { Fabricate(:user) }
+
+  describe '#featured_link and #featured_link_root_domain' do
+    let(:featured_link) { 'http://meta.discourse.org' }
+
+    describe 'when topic featured link is disable' do
+      it 'should return the right attributes' do
+        topic.update!(featured_link: featured_link)
+        SiteSetting.topic_featured_link_enabled = false
+
+        topic_view = TopicView.new(topic.id, user)
+        json = described_class.new(topic_view, scope: Guardian.new(user), root: false).as_json
+
+        expect(json[:featured_link]).to eq(nil)
+        expect(json[:featured_link_root_domain]).to eq(nil)
+      end
+    end
+
+    describe 'when topic featured link is enabled' do
+      it 'should return the right attributes' do
+        topic.update!(featured_link: featured_link)
+
+        topic_view = TopicView.new(topic.id, user)
+        json = described_class.new(topic_view, scope: Guardian.new(user), root: false).as_json
+
+        expect(json[:featured_link]).to eq(featured_link)
+        expect(json[:featured_link_root_domain]).to eq('discourse.org')
+      end
+    end
+  end
+
+  describe '#suggested_topics' do
+    let(:topic2) { Fabricate(:topic) }
+
+    before do
+      TopicUser.update_last_read(user, topic2.id, 0, 0, 0)
+    end
+
+    describe 'when loading last chunk' do
+      it 'should include suggested topics' do
+        topic_view = TopicView.new(topic.id, user)
+        json = described_class.new(topic_view, scope: Guardian.new(user), root: false).as_json
+
+        expect(json[:suggested_topics].first.id).to eq(topic2.id)
+      end
+    end
+
+    describe 'when not loading last chunk' do
+      let(:post) { Fabricate(:post, topic: topic) }
+      let(:post2) { Fabricate(:post, topic: topic) }
+
+      it 'should not include suggested topics' do
+        post
+        post2
+        topic_view = TopicView.new(topic.id, user, post_ids: [post.id])
+        topic_view.next_page
+        json = described_class.new(topic_view, scope: Guardian.new(user), root: false).as_json
+
+        expect(json[:suggested_topics]).to eq(nil)
+      end
+    end
+  end
+end
diff --git a/spec/serializers/user_serializer_spec.rb b/spec/serializers/user_serializer_spec.rb
index 52613f9d50..6ed8891c64 100644
--- a/spec/serializers/user_serializer_spec.rb
+++ b/spec/serializers/user_serializer_spec.rb
@@ -8,7 +8,7 @@ describe UserSerializer do
     let(:serializer) { UserSerializer.new(user, scope: Guardian.new, root: false) }
     let(:json) { serializer.as_json }
 
-    let(:untrusted_attributes) { %i{bio_raw bio_cooked bio_excerpt location website profile_background card_background} }
+    let(:untrusted_attributes) { %i{bio_raw bio_cooked bio_excerpt location website website_name profile_background card_background} }
 
     it "doesn't serialize untrusted attributes" do
       untrusted_attributes.each { |attr| expect(json).not_to have_key(attr) }
@@ -20,7 +20,7 @@ describe UserSerializer do
       # so we serialize more stuff
       SiteSetting.default_other_auto_track_topics_after_msecs = 0
       SiteSetting.default_other_notification_level_when_replying = 3
-      SiteSetting.default_other_new_topic_duration_minutes = 60*24
+      SiteSetting.default_other_new_topic_duration_minutes = 60 * 24
 
       user = Fabricate.build(:user,
                               user_profile: Fabricate.build(:user_profile),
@@ -31,7 +31,7 @@ describe UserSerializer do
       json = UserSerializer.new(user, scope: Guardian.new(user), root: false).as_json
 
       expect(json[:user_option][:dynamic_favicon]).to eq(true)
-      expect(json[:user_option][:new_topic_duration_minutes]).to eq(60*24)
+      expect(json[:user_option][:new_topic_duration_minutes]).to eq(60 * 24)
       expect(json[:user_option][:auto_track_topics_after_msecs]).to eq(0)
       expect(json[:user_option][:notification_level_when_replying]).to eq(3)
 
@@ -39,7 +39,7 @@ describe UserSerializer do
   end
 
   context "with a user" do
-    let(:user) { Fabricate.build(:user, user_profile: Fabricate.build(:user_profile) ) }
+    let(:user) { Fabricate.build(:user, user_profile: Fabricate.build(:user_profile)) }
     let(:serializer) { UserSerializer.new(user, scope: Guardian.new, root: false) }
     let(:json) { serializer.as_json }
 
@@ -57,10 +57,9 @@ describe UserSerializer do
       end
     end
 
-
     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 +191,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/anonymous_shadow_creator_spec.rb b/spec/services/anonymous_shadow_creator_spec.rb
index bda16a7824..2ec4ea90a7 100644
--- a/spec/services/anonymous_shadow_creator_spec.rb
+++ b/spec/services/anonymous_shadow_creator_spec.rb
@@ -48,7 +48,6 @@ describe AnonymousShadowCreator do
 
       expect(shadow.created_at).not_to eq(user.created_at)
 
-
       p = create_post
       expect(Guardian.new(shadow).post_can_act?(p, :like)).to eq(false)
       expect(Guardian.new(user).post_can_act?(p, :like)).to eq(true)
diff --git a/spec/services/auto_block_spec.rb b/spec/services/auto_block_spec.rb
deleted file mode 100644
index b2216973de..0000000000
--- a/spec/services/auto_block_spec.rb
+++ /dev/null
@@ -1,286 +0,0 @@
-require 'rails_helper'
-
-describe SpamRule::AutoBlock do
-
-  before do
-    SiteSetting.flags_required_to_hide_post = 0 # never
-    SiteSetting.num_spam_flags_to_block_new_user = 2
-    SiteSetting.num_users_to_block_new_user = 2
-  end
-
-  describe 'perform' do
-    let(:post)  { Fabricate.build(:post, user: Fabricate.build(:user, trust_level: TrustLevel[0])) }
-    subject     { described_class.new(post.user) }
-
-    it 'takes no action if user should not be blocked' do
-      subject.stubs(:block?).returns(false)
-      subject.expects(:block_user).never
-      subject.perform
-    end
-
-    it 'delivers punishment when user should be blocked' do
-      subject.stubs(:block?).returns(true)
-      subject.expects(:block_user)
-      subject.perform
-    end
-  end
-
-  describe 'num_spam_flags_against_user' do
-    before { described_class.any_instance.stubs(:block_user) }
-    let(:post)     { Fabricate(:post) }
-    let(:enforcer) { described_class.new(post.user) }
-    subject        { enforcer.num_spam_flags_against_user }
-
-    it 'returns 0 when there are no flags' do
-      expect(subject).to eq(0)
-    end
-
-    it 'returns 0 when there is one flag that has a reason other than spam' do
-      Fabricate(:flag, post: post, post_action_type_id: PostActionType.types[:off_topic])
-      expect(subject).to eq(0)
-    end
-
-    it 'returns 2 when there are two flags with spam as the reason' do
-      2.times { Fabricate(:flag, post: post, post_action_type_id: PostActionType.types[:spam]) }
-      expect(subject).to eq(2)
-    end
-
-    it 'returns 2 when there are two spam flags, each on a different post' do
-      Fabricate(:flag, post: post, post_action_type_id: PostActionType.types[:spam])
-      Fabricate(:flag, post: Fabricate(:post, user: post.user), post_action_type_id: PostActionType.types[:spam])
-      expect(subject).to eq(2)
-    end
-  end
-
-  describe 'num_users_who_flagged_spam_against_user' do
-    before { described_class.any_instance.stubs(:block_user) }
-    let(:post)     { Fabricate(:post) }
-    let(:enforcer) { described_class.new(post.user) }
-    subject        { enforcer.num_users_who_flagged_spam_against_user }
-
-    it 'returns 0 when there are no flags' do
-      expect(subject).to eq(0)
-    end
-
-    it 'returns 0 when there is one flag that has a reason other than spam' do
-      Fabricate(:flag, post: post, post_action_type_id: PostActionType.types[:off_topic])
-      expect(subject).to eq(0)
-    end
-
-    it 'returns 1 when there is one spam flag' do
-      Fabricate(:flag, post: post, post_action_type_id: PostActionType.types[:spam])
-      expect(subject).to eq(1)
-    end
-
-    it 'returns 2 when there are two spam flags from 2 users' do
-      Fabricate(:flag, post: post, post_action_type_id: PostActionType.types[:spam])
-      Fabricate(:flag, post: post, post_action_type_id: PostActionType.types[:spam])
-      expect(subject).to eq(2)
-    end
-
-    it 'returns 1 when there are two spam flags on two different posts from 1 user' do
-      flagger = Fabricate(:user)
-      Fabricate(:flag, post: post, user: flagger, post_action_type_id: PostActionType.types[:spam])
-      Fabricate(:flag, post: Fabricate(:post, user: post.user), user: flagger, post_action_type_id: PostActionType.types[:spam])
-      expect(subject).to eq(1)
-    end
-  end
-
-  describe 'num_tl3_flags_against_user' do
-    let(:post)     { Fabricate(:post) }
-    let(:enforcer) { described_class.new(post.user) }
-
-    it "counts flags of all types from tl3 users only" do
-      Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 1), post_action_type_id: PostActionType.types[:inappropriate])
-      expect(enforcer.num_tl3_flags_against_user).to eq(0)
-      Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 3), post_action_type_id: PostActionType.types[:inappropriate])
-      expect(enforcer.num_tl3_flags_against_user).to eq(1)
-      Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 1), post_action_type_id: PostActionType.types[:spam])
-      Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 3), post_action_type_id: PostActionType.types[:spam])
-      expect(enforcer.num_tl3_flags_against_user).to eq(2)
-    end
-  end
-
-  describe 'num_tl3_users_who_flagged' do
-    let(:post)     { Fabricate(:post) }
-    let(:enforcer) { described_class.new(post.user) }
-
-    it "counts only tl3 users who flagged with any type" do
-      Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 1), post_action_type_id: PostActionType.types[:inappropriate])
-      expect(enforcer.num_tl3_users_who_flagged).to eq(0)
-
-      tl3_user1 = Fabricate(:user, trust_level: 3)
-      Fabricate(:flag, post: post, user: tl3_user1, post_action_type_id: PostActionType.types[:inappropriate])
-      expect(enforcer.num_tl3_users_who_flagged).to eq(1)
-
-      Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 1), post_action_type_id: PostActionType.types[:spam])
-      expect(enforcer.num_tl3_users_who_flagged).to eq(1)
-
-      Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 3), post_action_type_id: PostActionType.types[:spam])
-      expect(enforcer.num_tl3_users_who_flagged).to eq(2)
-
-      Fabricate(:flag, post: Fabricate(:post, user: post.user), user: tl3_user1, post_action_type_id: PostActionType.types[:inappropriate])
-      expect(enforcer.num_tl3_users_who_flagged).to eq(2)
-    end
-  end
-
-  describe 'block_user' do
-    let!(:admin)  { Fabricate(:admin) } # needed for SystemMessage
-    let(:user)    { Fabricate(:user) }
-    let!(:post)   { Fabricate(:post, user: user) }
-    subject       { described_class.new(user) }
-
-    before do
-      described_class.stubs(:block?).with {|u| u.id != user.id }.returns(false)
-      described_class.stubs(:block?).with {|u| u.id == user.id }.returns(true)
-      subject.stubs(:block?).returns(true)
-    end
-
-    context 'user is not blocked' do
-      before do
-        UserBlocker.expects(:block).with(user, Discourse.system_user, message: :too_many_spam_flags).returns(true)
-      end
-
-      it 'prevents the user from making new posts' do
-        subject.block_user
-        expect(Guardian.new(user).can_create_post?(nil)).to be_falsey
-      end
-
-      it 'sends private message to moderators' do
-        SiteSetting.notify_mods_when_user_blocked = true
-        moderator = Fabricate(:moderator)
-        GroupMessage.expects(:create).with do |group, msg_type, params|
-          group == Group[:moderators].name and msg_type == :user_automatically_blocked and params[:user].id == user.id
-        end
-        subject.block_user
-      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)
-        GroupMessage.expects(:create).never
-        subject.block_user
-      end
-    end
-
-    context 'user is already blocked' do
-      before do
-        UserBlocker.expects(:block).with(user, Discourse.system_user, message: :too_many_spam_flags).returns(false)
-      end
-
-      it "doesn't send a pm to moderators if the user is already blocked" do
-        GroupMessage.expects(:create).never
-        subject.block_user
-      end
-    end
-  end
-
-  describe 'block?' do
-
-    context 'never been blocked' do
-      shared_examples "can't be blocked" do
-        it "returns false" do
-          enforcer = described_class.new(user)
-          enforcer.expects(:num_spam_flags_against_user).never
-          enforcer.expects(:num_users_who_flagged_spam_against_user).never
-          enforcer.expects(:num_flags_against_user).never
-          enforcer.expects(:num_users_who_flagged).never
-          expect(enforcer.block?).to eq(false)
-        end
-      end
-
-      (1..4).each do |trust_level|
-        context "user has trust level #{trust_level}" do
-          let(:user) { Fabricate(:user, trust_level: trust_level) }
-          include_examples "can't be blocked"
-        end
-      end
-
-      context "user is an admin" do
-        let(:user) { Fabricate(:admin) }
-        include_examples "can't be blocked"
-      end
-
-      context "user is a moderator" do
-        let(:user) { Fabricate(:moderator) }
-        include_examples "can't be blocked"
-      end
-    end
-
-    context 'new user' do
-      let(:user)  { Fabricate(:user, trust_level: TrustLevel[0]) }
-      subject     { described_class.new(user) }
-
-      it 'returns false if there are no spam flags' do
-        subject.stubs(:num_spam_flags_against_user).returns(0)
-        subject.stubs(:num_users_who_flagged_spam_against_user).returns(0)
-        expect(subject.block?).to be_falsey
-      end
-
-      it 'returns false if there are not received enough flags' do
-        subject.stubs(:num_spam_flags_against_user).returns(1)
-        subject.stubs(:num_users_who_flagged_spam_against_user).returns(2)
-        expect(subject.block?).to be_falsey
-      end
-
-      it 'returns false if there have not been enough users' do
-        subject.stubs(:num_spam_flags_against_user).returns(2)
-        subject.stubs(:num_users_who_flagged_spam_against_user).returns(1)
-        expect(subject.block?).to be_falsey
-      end
-
-      it 'returns false if num_spam_flags_to_block_new_user is 0' do
-        SiteSetting.num_spam_flags_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
-      end
-
-      it 'returns false if num_users_to_block_new_user is 0' do
-        SiteSetting.stubs(:num_users_to_block_new_user).returns(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
-      end
-
-      it 'returns true when there are enough flags from enough users' do
-        subject.stubs(:num_spam_flags_against_user).returns(2)
-        subject.stubs(:num_users_who_flagged_spam_against_user).returns(2)
-        expect(subject.block?).to be_truthy
-      end
-
-      context "all types of flags" do
-        before do
-          SiteSetting.num_tl3_flags_to_block_new_user = 3
-          SiteSetting.num_tl3_users_to_block_new_user = 2
-        end
-
-        it 'returns false if there are not enough flags' do
-          subject.stubs(:num_tl3_flags_against_user).returns(1)
-          subject.stubs(:num_tl3_users_who_flagged).returns(1)
-          expect(subject.block?).to be_falsey
-        end
-
-        it 'returns false if enough flags but not enough users' do
-          subject.stubs(:num_tl3_flags_against_user).returns(3)
-          subject.stubs(:num_tl3_users_who_flagged).returns(1)
-          expect(subject.block?).to be_falsey
-        end
-
-        it 'returns true if enough flags and users' do
-          subject.stubs(:num_tl3_flags_against_user).returns(3)
-          subject.stubs(:num_tl3_users_who_flagged).returns(2)
-          expect(subject.block?).to eq(true)
-        end
-      end
-    end
-
-    context "blocked, but has higher trust level now" do
-      let(:user)  { Fabricate(:user, blocked: true, trust_level: TrustLevel[1]) }
-      subject     { described_class.new(user) }
-
-      it 'returns false' do
-        expect(subject.block?).to be_truthy
-      end
-    end
-  end
-end
diff --git a/spec/services/auto_silence_spec.rb b/spec/services/auto_silence_spec.rb
new file mode 100644
index 0000000000..4a21a55f13
--- /dev/null
+++ b/spec/services/auto_silence_spec.rb
@@ -0,0 +1,286 @@
+require 'rails_helper'
+
+describe SpamRule::AutoSilence do
+
+  before do
+    SiteSetting.flags_required_to_hide_post = 0 # never
+    SiteSetting.num_spam_flags_to_silence_new_user = 2
+    SiteSetting.num_users_to_silence_new_user = 2
+  end
+
+  describe 'perform' do
+    let(:post)  { Fabricate.build(:post, user: Fabricate.build(:user, trust_level: TrustLevel[0])) }
+    subject     { described_class.new(post.user) }
+
+    it 'takes no action if user should not be silenced' do
+      subject.stubs(:silence?).returns(false)
+      subject.expects(:silence_user).never
+      subject.perform
+    end
+
+    it 'delivers punishment when user should be silenced' do
+      subject.stubs(:silence?).returns(true)
+      subject.expects(:silence_user)
+      subject.perform
+    end
+  end
+
+  describe 'num_spam_flags_against_user' do
+    before { described_class.any_instance.stubs(:silence_user) }
+    let(:post)     { Fabricate(:post) }
+    let(:enforcer) { described_class.new(post.user) }
+    subject        { enforcer.num_spam_flags_against_user }
+
+    it 'returns 0 when there are no flags' do
+      expect(subject).to eq(0)
+    end
+
+    it 'returns 0 when there is one flag that has a reason other than spam' do
+      Fabricate(:flag, post: post, post_action_type_id: PostActionType.types[:off_topic])
+      expect(subject).to eq(0)
+    end
+
+    it 'returns 2 when there are two flags with spam as the reason' do
+      2.times { Fabricate(:flag, post: post, post_action_type_id: PostActionType.types[:spam]) }
+      expect(subject).to eq(2)
+    end
+
+    it 'returns 2 when there are two spam flags, each on a different post' do
+      Fabricate(:flag, post: post, post_action_type_id: PostActionType.types[:spam])
+      Fabricate(:flag, post: Fabricate(:post, user: post.user), post_action_type_id: PostActionType.types[:spam])
+      expect(subject).to eq(2)
+    end
+  end
+
+  describe 'num_users_who_flagged_spam_against_user' do
+    before { described_class.any_instance.stubs(:silence_user) }
+    let(:post)     { Fabricate(:post) }
+    let(:enforcer) { described_class.new(post.user) }
+    subject        { enforcer.num_users_who_flagged_spam_against_user }
+
+    it 'returns 0 when there are no flags' do
+      expect(subject).to eq(0)
+    end
+
+    it 'returns 0 when there is one flag that has a reason other than spam' do
+      Fabricate(:flag, post: post, post_action_type_id: PostActionType.types[:off_topic])
+      expect(subject).to eq(0)
+    end
+
+    it 'returns 1 when there is one spam flag' do
+      Fabricate(:flag, post: post, post_action_type_id: PostActionType.types[:spam])
+      expect(subject).to eq(1)
+    end
+
+    it 'returns 2 when there are two spam flags from 2 users' do
+      Fabricate(:flag, post: post, post_action_type_id: PostActionType.types[:spam])
+      Fabricate(:flag, post: post, post_action_type_id: PostActionType.types[:spam])
+      expect(subject).to eq(2)
+    end
+
+    it 'returns 1 when there are two spam flags on two different posts from 1 user' do
+      flagger = Fabricate(:user)
+      Fabricate(:flag, post: post, user: flagger, post_action_type_id: PostActionType.types[:spam])
+      Fabricate(:flag, post: Fabricate(:post, user: post.user), user: flagger, post_action_type_id: PostActionType.types[:spam])
+      expect(subject).to eq(1)
+    end
+  end
+
+  describe 'num_tl3_flags_against_user' do
+    let(:post)     { Fabricate(:post) }
+    let(:enforcer) { described_class.new(post.user) }
+
+    it "counts flags of all types from tl3 users only" do
+      Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 1), post_action_type_id: PostActionType.types[:inappropriate])
+      expect(enforcer.num_tl3_flags_against_user).to eq(0)
+      Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 3), post_action_type_id: PostActionType.types[:inappropriate])
+      expect(enforcer.num_tl3_flags_against_user).to eq(1)
+      Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 1), post_action_type_id: PostActionType.types[:spam])
+      Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 3), post_action_type_id: PostActionType.types[:spam])
+      expect(enforcer.num_tl3_flags_against_user).to eq(2)
+    end
+  end
+
+  describe 'num_tl3_users_who_flagged' do
+    let(:post)     { Fabricate(:post) }
+    let(:enforcer) { described_class.new(post.user) }
+
+    it "counts only tl3 users who flagged with any type" do
+      Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 1), post_action_type_id: PostActionType.types[:inappropriate])
+      expect(enforcer.num_tl3_users_who_flagged).to eq(0)
+
+      tl3_user1 = Fabricate(:user, trust_level: 3)
+      Fabricate(:flag, post: post, user: tl3_user1, post_action_type_id: PostActionType.types[:inappropriate])
+      expect(enforcer.num_tl3_users_who_flagged).to eq(1)
+
+      Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 1), post_action_type_id: PostActionType.types[:spam])
+      expect(enforcer.num_tl3_users_who_flagged).to eq(1)
+
+      Fabricate(:flag, post: post, user: Fabricate(:user, trust_level: 3), post_action_type_id: PostActionType.types[:spam])
+      expect(enforcer.num_tl3_users_who_flagged).to eq(2)
+
+      Fabricate(:flag, post: Fabricate(:post, user: post.user), user: tl3_user1, post_action_type_id: PostActionType.types[:inappropriate])
+      expect(enforcer.num_tl3_users_who_flagged).to eq(2)
+    end
+  end
+
+  describe 'silence_user' do
+    let!(:admin)  { Fabricate(:admin) } # needed for SystemMessage
+    let(:user)    { Fabricate(:user) }
+    let!(:post)   { Fabricate(:post, user: user) }
+    subject       { described_class.new(user) }
+
+    before do
+      described_class.stubs(:silence?).with { |u| u.id != user.id }.returns(false)
+      described_class.stubs(:silence?).with { |u| u.id == user.id }.returns(true)
+      subject.stubs(:silence?).returns(true)
+    end
+
+    context 'user is not silenced' do
+      before do
+        UserSilencer.expects(:silence).with(user, Discourse.system_user, message: :too_many_spam_flags).returns(true)
+      end
+
+      it 'prevents the user from making new posts' do
+        subject.silence_user
+        expect(Guardian.new(user).can_create_post?(nil)).to be_falsey
+      end
+
+      it 'sends private message to moderators' do
+        SiteSetting.notify_mods_when_user_silenced = true
+        moderator = Fabricate(:moderator)
+        GroupMessage.expects(:create).with do |group, msg_type, params|
+          group == (Group[:moderators].name) && msg_type == (:user_automatically_silenced) && params[:user].id == (user.id)
+        end
+        subject.silence_user
+      end
+
+      it "doesn't send a pm to moderators if notify_mods_when_user_silenced is false" do
+        SiteSetting.notify_mods_when_user_silenced = false
+        GroupMessage.expects(:create).never
+        subject.silence_user
+      end
+    end
+
+    context 'user is already silenced' do
+      before do
+        UserSilencer.expects(:silence).with(user, Discourse.system_user, message: :too_many_spam_flags).returns(false)
+      end
+
+      it "doesn't send a pm to moderators if the user is already silenced" do
+        GroupMessage.expects(:create).never
+        subject.silence_user
+      end
+    end
+  end
+
+  describe 'silence?' do
+
+    context 'never been silenced' do
+      shared_examples "can't be silenced" do
+        it "returns false" do
+          enforcer = described_class.new(user)
+          enforcer.expects(:num_spam_flags_against_user).never
+          enforcer.expects(:num_users_who_flagged_spam_against_user).never
+          enforcer.expects(:num_flags_against_user).never
+          enforcer.expects(:num_users_who_flagged).never
+          expect(enforcer.silence?).to eq(false)
+        end
+      end
+
+      (1..4).each do |trust_level|
+        context "user has trust level #{trust_level}" do
+          let(:user) { Fabricate(:user, trust_level: trust_level) }
+          include_examples "can't be silenced"
+        end
+      end
+
+      context "user is an admin" do
+        let(:user) { Fabricate(:admin) }
+        include_examples "can't be silenced"
+      end
+
+      context "user is a moderator" do
+        let(:user) { Fabricate(:moderator) }
+        include_examples "can't be silenced"
+      end
+    end
+
+    context 'new user' do
+      let(:user)  { Fabricate(:user, trust_level: TrustLevel[0]) }
+      subject     { described_class.new(user) }
+
+      it 'returns false if there are no spam flags' do
+        subject.stubs(:num_spam_flags_against_user).returns(0)
+        subject.stubs(:num_users_who_flagged_spam_against_user).returns(0)
+        expect(subject.silence?).to be_falsey
+      end
+
+      it 'returns false if there are not received enough flags' do
+        subject.stubs(:num_spam_flags_against_user).returns(1)
+        subject.stubs(:num_users_who_flagged_spam_against_user).returns(2)
+        expect(subject.silence?).to be_falsey
+      end
+
+      it 'returns false if there have not been enough users' do
+        subject.stubs(:num_spam_flags_against_user).returns(2)
+        subject.stubs(:num_users_who_flagged_spam_against_user).returns(1)
+        expect(subject.silence?).to be_falsey
+      end
+
+      it 'returns false if num_spam_flags_to_silence_new_user is 0' do
+        SiteSetting.num_spam_flags_to_silence_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.silence?).to be_falsey
+      end
+
+      it 'returns false if num_users_to_silence_new_user is 0' do
+        SiteSetting.num_users_to_silence_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.silence?).to be_falsey
+      end
+
+      it 'returns true when there are enough flags from enough users' do
+        subject.stubs(:num_spam_flags_against_user).returns(2)
+        subject.stubs(:num_users_who_flagged_spam_against_user).returns(2)
+        expect(subject.silence?).to be_truthy
+      end
+
+      context "all types of flags" do
+        before do
+          SiteSetting.num_tl3_flags_to_silence_new_user = 3
+          SiteSetting.num_tl3_users_to_silence_new_user = 2
+        end
+
+        it 'returns false if there are not enough flags' do
+          subject.stubs(:num_tl3_flags_against_user).returns(1)
+          subject.stubs(:num_tl3_users_who_flagged).returns(1)
+          expect(subject.silence?).to be_falsey
+        end
+
+        it 'returns false if enough flags but not enough users' do
+          subject.stubs(:num_tl3_flags_against_user).returns(3)
+          subject.stubs(:num_tl3_users_who_flagged).returns(1)
+          expect(subject.silence?).to be_falsey
+        end
+
+        it 'returns true if enough flags and users' do
+          subject.stubs(:num_tl3_flags_against_user).returns(3)
+          subject.stubs(:num_tl3_users_who_flagged).returns(2)
+          expect(subject.silence?).to eq(true)
+        end
+      end
+    end
+
+    context "silenced, but has higher trust level now" do
+      let(:user)  { Fabricate(:user, silenced_till: 1.year.from_now, trust_level: TrustLevel[1]) }
+      subject     { described_class.new(user) }
+
+      it 'returns false' do
+        expect(subject.silence?).to be_truthy
+      end
+    end
+  end
+end
diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb
index cb906c282d..64d4b96fa7 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
@@ -81,7 +83,7 @@ describe BadgeGranter do
       }
 
       # TODO add welcome
-      expect(post.user.user_badges.pluck(:badge_id).sort).to eq([Badge::NiceTopic,Badge::GoodTopic])
+      expect(post.user.user_badges.pluck(:badge_id).sort).to eq([Badge::NiceTopic, Badge::GoodTopic])
 
       expect(post.user.notifications.count).to eq(2)
 
@@ -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
@@ -205,7 +205,7 @@ describe BadgeGranter do
     end
 
     it "grants autobiographer" do
-      user.user_profile.bio_raw  = "THIS IS MY bio it a long bio I like my bio"
+      user.user_profile.bio_raw = "THIS IS MY bio it a long bio I like my bio"
       user.uploaded_avatar_id = 10
       user.user_profile.save
       user.save
@@ -237,7 +237,7 @@ describe BadgeGranter do
 
       expect(UserBadge.where(user_id: user.id, badge_id: Badge::Editor).count).to eq(0)
 
-      PostRevisor.new(post).revise!(user, { raw: "This is my new test 1235 123" })
+      PostRevisor.new(post).revise!(user, raw: "This is my new test 1235 123")
       BadgeGranter.process_queue!
 
       expect(UserBadge.where(user_id: user.id, badge_id: Badge::Editor).count).to eq(1)
diff --git a/spec/services/color_scheme_revisor_spec.rb b/spec/services/color_scheme_revisor_spec.rb
index c2dc09d2c7..d8a2346951 100644
--- a/spec/services/color_scheme_revisor_spec.rb
+++ b/spec/services/color_scheme_revisor_spec.rb
@@ -25,8 +25,8 @@ describe ColorSchemeRevisor do
 
     it 'can change colors' do
       ColorSchemeRevisor.revise(color_scheme, valid_params.merge(colors: [
-        {name: color.name, hex: 'BEEF99'},
-        {name: 'bob', hex: 'AAAAAA'}
+        { name: color.name, hex: 'BEEF99' },
+        { name: 'bob', hex: 'AAAAAA' }
       ]))
       color_scheme.reload
 
@@ -39,7 +39,7 @@ describe ColorSchemeRevisor do
     it "doesn't make changes when a color is invalid" do
       expect {
         cs = ColorSchemeRevisor.revise(color_scheme, valid_params.merge(colors: [
-          {name: color.name, hex: 'OOPS'}
+          { name: color.name, hex: 'OOPS' }
         ]))
         expect(cs).not_to be_valid
         expect(cs.errors).to be_present
diff --git a/spec/services/flag_sockpuppets_spec.rb b/spec/services/flag_sockpuppets_spec.rb
index 9a647e68c6..8dcb69fa37 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/group_action_logger_spec.rb b/spec/services/group_action_logger_spec.rb
index 0ec4efe261..ec08846c77 100644
--- a/spec/services/group_action_logger_spec.rb
+++ b/spec/services/group_action_logger_spec.rb
@@ -36,32 +36,90 @@ RSpec.describe GroupActionLogger do
   end
 
   describe '#log_add_user_to_group' do
-    it 'should create the right record' do
-      subject.log_add_user_to_group(user)
+    describe 'as a group owner' do
+      it 'should create the right record' do
+        subject.log_add_user_to_group(user)
 
-      group_history = GroupHistory.last
+        group_history = GroupHistory.last
 
-      expect(group_history.action).to eq(GroupHistory.actions[:add_user_to_group])
-      expect(group_history.acting_user).to eq(group_owner)
-      expect(group_history.target_user).to eq(user)
+        expect(group_history.action).to eq(GroupHistory.actions[:add_user_to_group])
+        expect(group_history.acting_user).to eq(group_owner)
+        expect(group_history.target_user).to eq(user)
+      end
+    end
+
+    context 'as a normal user' do
+      subject { described_class.new(user, group) }
+
+      describe 'user cannot freely exit group' do
+        it 'should not be allowed to log the action' do
+          expect { subject.log_add_user_to_group(user) }
+            .to raise_error(Discourse::InvalidParameters)
+        end
+      end
+
+      describe 'user can freely exit group' do
+        before do
+          group.update!(public_admission: true)
+        end
+
+        it 'should create the right record' do
+          subject.log_add_user_to_group(user)
+
+          group_history = GroupHistory.last
+
+          expect(group_history.action).to eq(GroupHistory.actions[:add_user_to_group])
+          expect(group_history.acting_user).to eq(user)
+          expect(group_history.target_user).to eq(user)
+        end
+      end
     end
   end
 
   describe '#log_remove_user_from_group' do
-    it 'should create the right record' do
-      subject.log_remove_user_from_group(user)
+    describe 'as group owner' do
+      it 'should create the right record' do
+        subject.log_remove_user_from_group(user)
 
-      group_history = GroupHistory.last
+        group_history = GroupHistory.last
 
-      expect(group_history.action).to eq(GroupHistory.actions[:remove_user_from_group])
-      expect(group_history.acting_user).to eq(group_owner)
-      expect(group_history.target_user).to eq(user)
+        expect(group_history.action).to eq(GroupHistory.actions[:remove_user_from_group])
+        expect(group_history.acting_user).to eq(group_owner)
+        expect(group_history.target_user).to eq(user)
+      end
+    end
+
+    context 'as a normal user' do
+      subject { described_class.new(user, group) }
+
+      describe 'user cannot freely exit group' do
+        it 'should not be allowed to log the action' do
+          expect { subject.log_remove_user_from_group(user) }
+            .to raise_error(Discourse::InvalidParameters)
+        end
+      end
+
+      describe 'user can freely exit group' do
+        before do
+          group.update!(public_exit: true)
+        end
+
+        it 'should create the right record' do
+          subject.log_remove_user_from_group(user)
+
+          group_history = GroupHistory.last
+
+          expect(group_history.action).to eq(GroupHistory.actions[:remove_user_from_group])
+          expect(group_history.acting_user).to eq(user)
+          expect(group_history.target_user).to eq(user)
+        end
+      end
     end
   end
 
   describe '#log_change_group_settings' do
     it 'should create the right record' do
-      group.update_attributes!(public: true, created_at: Time.zone.now)
+      group.update_attributes!(public_admission: true, created_at: Time.zone.now)
 
       expect { subject.log_change_group_settings }.to change { GroupHistory.count }.by(1)
 
@@ -69,7 +127,7 @@ RSpec.describe GroupActionLogger do
 
       expect(group_history.action).to eq(GroupHistory.actions[:change_group_setting])
       expect(group_history.acting_user).to eq(group_owner)
-      expect(group_history.subject).to eq('public')
+      expect(group_history.subject).to eq('public_admission')
       expect(group_history.prev_value).to eq('f')
       expect(group_history.new_value).to eq('t')
     end
diff --git a/spec/services/group_message_spec.rb b/spec/services/group_message_spec.rb
index b4ddeaff04..94957e0bc9 100644
--- a/spec/services/group_message_spec.rb
+++ b/spec/services/group_message_spec.rb
@@ -11,19 +11,19 @@ describe GroupMessage do
     Discourse.stubs(:system_user).returns(admin)
   end
 
-  subject(:send_group_message) { GroupMessage.create(moderators_group, :user_automatically_blocked, {user: user}) }
+  subject(:send_group_message) { GroupMessage.create(moderators_group, :user_automatically_silenced, user: user) }
 
   describe 'not sent recently' do
     before { GroupMessage.any_instance.stubs(:sent_recently?).returns(false) }
 
     it 'should send a private message to the given group' do
       PostCreator.expects(:create).with do |from_user, opts|
-          from_user.id == admin.id and
-            opts[:target_group_names] and opts[:target_group_names].include?(Group[:moderators].name) and
-            opts[:archetype] == Archetype.private_message and
-            opts[:title].present? and
-            opts[:raw].present?
-        end.returns(stub_everything)
+        from_user.id == (admin.id) &&
+          opts[:target_group_names] && opts[:target_group_names].include?(Group[:moderators].name) &&
+          opts[:archetype] == (Archetype.private_message) &&
+          opts[:title].present? &&
+          opts[:raw].present?
+      end.returns(stub_everything)
       send_group_message
     end
 
@@ -42,7 +42,7 @@ describe GroupMessage do
 
   describe 'sent recently' do
     before  { GroupMessage.any_instance.stubs(:sent_recently?).returns(true) }
-    subject { GroupMessage.create(moderators_group, :user_automatically_blocked, {user: user}) }
+    subject { GroupMessage.create(moderators_group, :user_automatically_silenced, user: user) }
 
     it { is_expected.to eq(false) }
 
@@ -61,20 +61,20 @@ describe GroupMessage do
       end
     end
 
-    context 'user_automatically_blocked' do
-      subject { GroupMessage.new(moderators_group, :user_automatically_blocked, {user: user}).message_params }
+    context 'user_automatically_silenced' do
+      subject { GroupMessage.new(moderators_group, :user_automatically_silenced, user: user).message_params }
       include_examples 'common message params for group messages'
     end
 
     context 'spam_post_blocked' do
-      subject { GroupMessage.new(moderators_group, :spam_post_blocked, {user: user}).message_params }
+      subject { GroupMessage.new(moderators_group, :spam_post_blocked, user: user).message_params }
       include_examples 'common message params for group messages'
     end
   end
 
   describe 'methods that use redis' do
     let(:user)              { Fabricate.build(:user, id: 123123) }
-    subject(:group_message) { GroupMessage.new(moderators_group, :user_automatically_blocked, {user: user}) }
+    subject(:group_message) { GroupMessage.new(moderators_group, :user_automatically_silenced, user: user) }
     before do
       PostCreator.stubs(:create).returns(stub_everything)
       group_message.stubs(:sent_recently_key).returns('the_key')
@@ -92,7 +92,7 @@ describe GroupMessage do
       end
 
       it 'always returns false if limit_once_per is false' do
-        gm = GroupMessage.new(moderators_group, :user_automatically_blocked, {user: user, limit_once_per: false})
+        gm = GroupMessage.new(moderators_group, :user_automatically_silenced, user: user, limit_once_per: false)
         gm.stubs(:sent_recently_key).returns('the_key')
         $redis.stubs(:get).with(gm.sent_recently_key).returns('1')
         expect(gm.sent_recently?).to be_falsey
@@ -107,12 +107,12 @@ describe GroupMessage do
 
       it 'can use a given expiry time' do
         $redis.expects(:setex).with(anything, 30 * 60, anything).returns('OK')
-        GroupMessage.new(moderators_group, :user_automatically_blocked, {user: user, limit_once_per: 30.minutes}).remember_message_sent
+        GroupMessage.new(moderators_group, :user_automatically_silenced, user: user, limit_once_per: 30.minutes).remember_message_sent
       end
 
       it 'can be disabled' do
         $redis.expects(:setex).never
-        GroupMessage.new(moderators_group, :user_automatically_blocked, {user: user, limit_once_per: false}).remember_message_sent
+        GroupMessage.new(moderators_group, :user_automatically_silenced, user: user, limit_once_per: false).remember_message_sent
       end
     end
   end
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 0000000000..dde36f4040
--- /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/notification_emailer_spec.rb b/spec/services/notification_emailer_spec.rb
index 8e44538af3..2d8642826b 100644
--- a/spec/services/notification_emailer_spec.rb
+++ b/spec/services/notification_emailer_spec.rb
@@ -10,7 +10,7 @@ describe NotificationEmailer do
   let(:post) { Fabricate(:post, topic: topic) }
 
   # something is off with fabricator
-  def create_notification(type, user=nil)
+  def create_notification(type, user = nil)
     user ||= Fabricate(:user)
     Notification.create(data: "{\"a\": 1}",
                         user: user,
@@ -22,7 +22,7 @@ describe NotificationEmailer do
   shared_examples "enqueue" do
 
     it "enqueues a job for the email" do
-      Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification,type))
+      Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification, type))
       NotificationEmailer.process_notification(notification)
     end
 
@@ -36,7 +36,15 @@ describe NotificationEmailer do
 
       it "enqueues a job if the user is staged" do
         notification.user.staged = true
-        Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification,type))
+        Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification, type))
+        NotificationEmailer.process_notification(notification)
+      end
+
+      it "enqueues a job if the user is staged even if site requires user approval" do
+        SiteSetting.must_approve_users = true
+
+        notification.user.staged = true
+        Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification, type))
         NotificationEmailer.process_notification(notification)
       end
     end
@@ -96,7 +104,7 @@ describe NotificationEmailer do
 
     it "enqueue a delayed job for users that are online" do
       notification.user.last_seen_at = 1.minute.ago
-      Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification,type))
+      Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification, type))
       NotificationEmailer.process_notification(notification)
     end
 
diff --git a/spec/services/post_action_notifier_spec.rb b/spec/services/post_action_notifier_spec.rb
index b04b7c032f..e69ad79664 100644
--- a/spec/services/post_action_notifier_spec.rb
+++ b/spec/services/post_action_notifier_spec.rb
@@ -33,24 +33,23 @@ describe PostActionNotifier do
   context 'when editing a post' do
     it 'notifies a user of the revision' do
       expect {
-        post.revise(evil_trout, { raw: "world is the new body of the message" })
+        post.revise(evil_trout, raw: "world is the new body of the message")
       }.to change(post.user.notifications, :count).by(1)
     end
 
     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
         expect {
-          post.revise(evil_trout, { raw: "world is the new body of the message" })
+          post.revise(evil_trout, raw: "world is the new body of the message")
         }.to change(post.user.notifications, :count).by(1)
       end
 
       it 'does not notifiy a user of the revision made by the system user' do
         expect {
-          post.revise(Discourse.system_user, { raw: "world is the new body of the message" })
+          post.revise(Discourse.system_user, raw: "world is the new body of the message")
         }.not_to change(post.user.notifications, :count)
       end
 
@@ -60,7 +59,7 @@ describe PostActionNotifier do
 
   context 'private message' do
     let(:user) { Fabricate(:user) }
-    let(:mention_post) { Fabricate(:post, user: user, raw: 'Hello @eviltrout')}
+    let(:mention_post) { Fabricate(:post, user: user, raw: 'Hello @eviltrout') }
     let(:topic) do
       topic = mention_post.topic
       topic.update_columns archetype: Archetype.private_message, category_id: nil
@@ -86,7 +85,7 @@ describe PostActionNotifier do
 
   context 'moderator action post' do
     let(:user) { Fabricate(:user) }
-    let(:first_post) { Fabricate(:post, user: user, raw: 'A useless post for you.')}
+    let(:first_post) { Fabricate(:post, user: user, raw: 'A useless post for you.') }
     let(:topic) { first_post.topic }
 
     it 'should not notify anyone' do
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index c53e47977e..c500ce2d1e 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -5,7 +5,7 @@ describe PostAlerter do
   let!(:evil_trout) { Fabricate(:evil_trout) }
   let(:user) { Fabricate(:user) }
 
-  def create_post_with_alerts(args={})
+  def create_post_with_alerts(args = {})
     post = Fabricate(:post, args)
     PostAlerter.post_created(post)
   end
@@ -43,7 +43,21 @@ describe PostAlerter do
       # yes notification cause we were replied to
       expect(Notification.where(user_id: pm.user_id).count).to eq(1)
 
+    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
 
@@ -51,11 +65,10 @@ describe PostAlerter do
     it "does not return whispers as unread posts" do
       op = Fabricate(:post)
       _whisper = Fabricate(:post, raw: 'this is a whisper post',
-                                 user: Fabricate(:admin),
-                                 topic: op.topic,
-                                 reply_to_post_number: op.post_number,
-                                 post_type: Post.types[:whisper])
-
+                                  user: Fabricate(:admin),
+                                  topic: op.topic,
+                                  reply_to_post_number: op.post_number,
+                                  post_type: Post.types[:whisper])
 
       expect(PostAlerter.new.first_unread_post(op.user, op.topic)).to be_blank
     end
@@ -68,18 +81,16 @@ describe PostAlerter do
       post = Fabricate(:post, raw: 'I love waffles')
 
       admin = Fabricate(:admin)
-      post.revise(admin, {raw: 'I made a revision'})
+      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'})
+      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 +133,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,15 +162,18 @@ 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)
       expect(notification.data_hash["username2"]).to eq(admin.username)
 
-
       post.user.user_option.update_columns(like_notification_frequency:
                                            UserOption.like_notification_frequency_type[:first_time_and_daily])
 
@@ -160,10 +181,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)
@@ -191,7 +212,7 @@ describe PostAlerter do
     it "won't notify the user a second time on revision" do
       p1 = create_post_with_alerts(raw: '[quote="Evil Trout, post:1"]whatup[/quote]')
       expect {
-        p1.revise(p1.user, { raw: '[quote="Evil Trout, post:1"]whatup now?[/quote]' })
+        p1.revise(p1.user, raw: '[quote="Evil Trout, post:1"]whatup now?[/quote]')
       }.not_to change(evil_trout.notifications, :count)
     end
 
@@ -201,13 +222,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)
 
@@ -226,24 +257,30 @@ describe PostAlerter do
       # don't notify on reflection
       post1.reload
       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', mentionable_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)
 
-      Fabricate(:group, name: 'group-alt', alias_level: Group::ALIAS_LEVELS[:everyone])
+      Fabricate(:group, name: 'group-alt', mentionable_level: Group::ALIAS_LEVELS[:everyone])
 
       expect {
         create_post_with_alerts(raw: "Hello, @group-alt should not trigger a notification?")
@@ -251,18 +288,25 @@ describe PostAlerter do
 
       expect(GroupMention.count).to eq(2)
 
-      group.update_columns(alias_level: Group::ALIAS_LEVELS[:members_mods_and_admins])
+      group.update_columns(mentionable_level: Group::ALIAS_LEVELS[:members_mods_and_admins])
       expect {
         create_post_with_alerts(raw: "Hello @group you are not mentionable")
       }.to change(evil_trout.notifications, :count).by(0)
 
       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
 
-    let(:mention_post) { create_post_with_alerts(user: user, raw: 'Hello @eviltrout')}
+    let(:mention_post) { create_post_with_alerts(user: user, raw: 'Hello @eviltrout') }
     let(:topic) { mention_post.topic }
 
     it 'notifies a user' do
@@ -274,7 +318,7 @@ describe PostAlerter do
     it "won't notify the user a second time on revision" do
       mention_post
       expect {
-        mention_post.revise(mention_post.user, { raw: "New raw content that still mentions @eviltrout" })
+        mention_post.revise(mention_post.user, raw: "New raw content that still mentions @eviltrout")
       }.not_to change(evil_trout.notifications, :count)
     end
 
@@ -286,15 +330,22 @@ 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)
+    admin = Fabricate(:admin)
       post = create_post_with_alerts(user: user, raw: 'No mention here.')
       expect {
-        post.revise(admin, { raw: "Mention @eviltrout in this edit." })
+        post.revise(admin, raw: "Mention @eviltrout in this edit.")
       }.to change(evil_trout.notifications, :count)
       n = evil_trout.notifications.last
       expect(n.data_hash["original_username"]).to eq(admin.username)
-    end
+  end
   end
 
   describe ".create_notification" do
@@ -322,14 +373,26 @@ 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
-    let(:mention_post) { create_post_with_alerts(user: user, raw: 'Hello @eviltrout :heart:')}
+    let(:mention_post) { create_post_with_alerts(user: user, raw: 'Hello @eviltrout :heart:') }
     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 +406,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 +424,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 +458,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 +510,194 @@ 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
+
+    it "notifies about regular reply" do
+      user = Fabricate(:user)
+      topic = Fabricate(:topic)
+      post = Fabricate(:post, user: user, topic: topic)
+
+      reply = Fabricate(:post, topic: topic, reply_to_post_number: 1)
+      PostAlerter.post_created(reply)
+
+      expect(user.notifications.where(notification_type: Notification.types[:replied]).count).to eq(1)
+    end
+
+    it "doesn't notify regular user about whispered reply" do
+      user = Fabricate(:user)
+      admin = Fabricate(:admin)
+
+      topic = Fabricate(:topic)
+      post = Fabricate(:post, user: user, topic: topic)
+
+      whispered_reply = Fabricate(:post, user: admin, topic: topic, post_type: Post.types[:whisper], reply_to_post_number: 1)
+      PostAlerter.post_created(whispered_reply)
+
+      expect(user.notifications.where(notification_type: Notification.types[:replied]).count).to eq(0)
+    end
+
+    it "notifies staff user about whispered reply" do
+      user = Fabricate(:user)
+      admin1 = Fabricate(:admin)
+      admin2 = Fabricate(:admin)
+
+      topic = Fabricate(:topic)
+      post = Fabricate(:post, user: user, topic: topic)
+
+      whispered_reply1 = Fabricate(:post, user: admin1, topic: topic, post_type: Post.types[:whisper], reply_to_post_number: 1)
+      whispered_reply2 = Fabricate(:post, user: admin2, topic: topic, post_type: Post.types[:whisper], reply_to_post_number: 2)
+      PostAlerter.post_created(whispered_reply1)
+      PostAlerter.post_created(whispered_reply2)
+
+      expect(admin1.notifications.where(notification_type: Notification.types[:replied]).count).to eq(1)
+    end
+
+    it "sends email notifications only to users not on CC list of incoming email" do
+      alice = Fabricate(:user, username: "alice", email: "alice@example.com")
+      bob = Fabricate(:user, username: "bob", email: "bob@example.com")
+      carol = Fabricate(:user, username: "carol", email: "carol@example.com", staged: true)
+      dave = Fabricate(:user, username: "dave", email: "dave@example.com", staged: true)
+      erin = Fabricate(:user, username: "erin", email: "erin@example.com")
+
+      topic = Fabricate(:private_message_topic, topic_allowed_users: [
+        Fabricate.build(:topic_allowed_user, user: alice),
+        Fabricate.build(:topic_allowed_user, user: bob),
+        Fabricate.build(:topic_allowed_user, user: carol),
+        Fabricate.build(:topic_allowed_user, user: dave),
+        Fabricate.build(:topic_allowed_user, user: erin)
+      ])
+      post = Fabricate(:post, user: alice, topic: topic)
+
+      TopicUser.change(alice.id, topic.id, notification_level: TopicUser.notification_levels[:watching])
+      TopicUser.change(bob.id, topic.id, notification_level: TopicUser.notification_levels[:watching])
+      TopicUser.change(erin.id, topic.id, notification_level: TopicUser.notification_levels[:watching])
+
+      email = Fabricate(:incoming_email,
+                        raw: <<~RAW,
+                          Return-Path: <bob@example.com>
+                          From: Bob <bob@example.com>
+                          To: meta+1234@discoursemail.com, dave@example.com
+                          CC: carol@example.com, erin@example.com
+                          Subject: Hello world
+                          Date: Fri, 15 Jan 2016 00:12:43 +0100
+                          Message-ID: <12345@example.com>
+                          Mime-Version: 1.0
+                          Content-Type: text/plain; charset=UTF-8
+                          Content-Transfer-Encoding: quoted-printable
+
+                          This post was created by email.
+                        RAW
+                        from_address: "bob@example.com",
+                        to_addresses: "meta+1234@discoursemail.com;dave@example.com",
+                        cc_addresses: "carol@example.com;erin@example.com")
+      reply = Fabricate(:post_via_email, user: bob, topic: topic, incoming_email: email, reply_to_post_number: 1)
+
+      NotificationEmailer.expects(:process_notification).with { |n| n.user_id == alice.id }.once
+      NotificationEmailer.expects(:process_notification).with { |n| n.user_id == bob.id }.never
+      NotificationEmailer.expects(:process_notification).with { |n| n.user_id == carol.id }.never
+      NotificationEmailer.expects(:process_notification).with { |n| n.user_id == dave.id }.never
+      NotificationEmailer.expects(:process_notification).with { |n| n.user_id == erin.id }.never
+
+      PostAlerter.post_created(reply)
+
+      expect(alice.notifications.count).to eq(1)
+      expect(bob.notifications.count).to eq(0)
+      expect(carol.notifications.count).to eq(1)
+      expect(dave.notifications.count).to eq(1)
+      expect(erin.notifications.count).to eq(1)
+    end
+
+    it "does not send email notifications to staged users when notification originates in mailinglist mirror category" do
+      category = Fabricate(:mailinglist_mirror_category)
+      topic = Fabricate(:topic, category: category)
+      user = Fabricate(:staged)
+      post = Fabricate(:post, user: user, topic: topic)
+      reply = Fabricate(:post, topic: topic, reply_to_post_number: 1)
+
+      NotificationEmailer.expects(:process_notification).never
+      expect { PostAlerter.post_created(reply) }.to change(user.notifications, :count).by(0)
+
+      category.mailinglist_mirror = false
+      NotificationEmailer.expects(:process_notification).once
+      expect { PostAlerter.post_created(reply) }.to change(user.notifications, :count).by(1)
+    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
+
+  describe '#extract_linked_users' do
+    let(:topic) { Fabricate(:topic) }
+    let(:post) { Fabricate(:post, topic: topic) }
+    let(:post2) { Fabricate(:post) }
+
+    describe 'when linked post has been deleted' do
+      let(:topic_link) do
+        TopicLink.create!(
+          url: "/t/#{topic.id}",
+          topic_id: topic.id,
+          link_topic_id: post2.topic.id,
+          link_post_id: nil,
+          post_id: post.id,
+          user: user,
+          domain: 'test.com'
+        )
+      end
+
+      it 'should use the first post of the topic' do
+        topic_link
+        expect(PostAlerter.new.extract_linked_users(post.reload)).to eq([post2.user])
+      end
+    end
   end
 end
diff --git a/spec/services/post_owner_changer_spec.rb b/spec/services/post_owner_changer_spec.rb
index 10fb1cebec..f4896ea197 100644
--- a/spec/services/post_owner_changer_spec.rb
+++ b/spec/services/post_owner_changer_spec.rb
@@ -26,8 +26,12 @@ describe PostOwnerChanger do
       freeze_time 2.days.from_now
 
       old_user = p1.user
+      PostAction.act(user_a, p1, PostActionType.types[:like])
+      p1.reload
+      expect(p1.topic.like_count).to eq(1)
       PostOwnerChanger.new(post_ids: [p1.id], topic_id: topic.id, new_owner: user_a, acting_user: editor).change_owner!
       p1.reload
+      expect(p1.topic.like_count).to eq(0)
       expect(p1.topic.bumped_at).to be_within(1.second).of (bumped_at)
       expect(p1.topic.last_post_user_id).to eq(user_a.id)
       expect(old_user).not_to eq(p1.user)
@@ -79,11 +83,10 @@ describe PostOwnerChanger do
           topic_reply_count: 1
         )
 
-        UserAction.create!( action_type: UserAction::NEW_TOPIC, user_id: p1user.id, acting_user_id: p1user.id,
-                            target_post_id: -1, target_topic_id: p1.topic_id, created_at: p1.created_at )
-        UserAction.create!( action_type: UserAction::REPLY, user_id: p2user.id, acting_user_id: p2user.id,
-                            target_post_id: p2.id, target_topic_id: p2.topic_id, created_at: p2.created_at )
-
+        UserAction.create!(action_type: UserAction::NEW_TOPIC, user_id: p1user.id, acting_user_id: p1user.id,
+                           target_post_id: -1, target_topic_id: p1.topic_id, created_at: p1.created_at)
+        UserAction.create!(action_type: UserAction::REPLY, user_id: p2user.id, acting_user_id: p2user.id,
+                           target_post_id: p2.id, target_topic_id: p2.topic_id, created_at: p2.created_at)
 
         UserActionCreator.enable
       end
@@ -128,19 +131,43 @@ describe PostOwnerChanger do
         expect(user_a_stat.likes_received).to eq(1)
       end
 
+      it "handles whispers" do
+        whisper = PostCreator.new(
+          editor,
+          topic_id: p1.topic_id,
+          reply_to_post_number: 1,
+          post_type: Post.types[:whisper],
+          raw: 'this is a whispered reply'
+        ).create
+
+        user_stat = editor.user_stat
+
+        expect {
+          described_class.new(
+            post_ids: [whisper.id],
+            topic_id: topic.id,
+            new_owner: Fabricate(:admin),
+            acting_user: editor
+          ).change_owner!
+        }.to_not change { user_stat.reload.post_count }
+      end
+
       context 'private message topic' do
         let(:topic) { Fabricate(:private_message_topic) }
 
         it "should update users' counts" do
           PostAction.act(p2user, p1, PostActionType.types[:like])
 
-          change_owners
+          expect {
+            change_owners
+          }.to_not change { p1user.user_stat.post_count }
 
           expect(p1user.user_stat.likes_received).to eq(0)
 
           user_a_stat = user_a.user_stat
           expect(user_a_stat.first_post_created_at).to be_present
           expect(user_a_stat.likes_received).to eq(0)
+          expect(user_a_stat.post_count).to eq(0)
         end
       end
 
diff --git a/spec/services/random_topic_selector_spec.rb b/spec/services/random_topic_selector_spec.rb
index 18decd73c7..8b0dbbccf4 100644
--- a/spec/services/random_topic_selector_spec.rb
+++ b/spec/services/random_topic_selector_spec.rb
@@ -12,13 +12,13 @@ describe RandomTopicSelector do
     end
 
     expect(RandomTopicSelector.next(0)).to eq([])
-    expect(RandomTopicSelector.next(2)).to eq([0,1])
+    expect(RandomTopicSelector.next(2)).to eq([0, 1])
 
     $redis.expects(:multi).returns(Discourse.received_readonly!)
-    expect(RandomTopicSelector.next(2)).to eq([2,3])
+    expect(RandomTopicSelector.next(2)).to eq([2, 3])
     $redis.unstub(:multi)
 
-    expect(RandomTopicSelector.next(2)).to eq([2,3])
+    expect(RandomTopicSelector.next(2)).to eq([2, 3])
     expect(RandomTopicSelector.next(2)).to eq([])
   end
 
@@ -29,6 +29,6 @@ describe RandomTopicSelector do
     _t3 = Fabricate(:topic, category_id: category.id, deleted_at: 1.minute.ago)
     t4 = Fabricate(:topic, category_id: category.id)
 
-    expect(RandomTopicSelector.next(5, category).sort).to eq([t1.id,t4.id].sort)
+    expect(RandomTopicSelector.next(5, category).sort).to eq([t1.id, t4.id].sort)
   end
 end
diff --git a/spec/services/search_indexer_spec.rb b/spec/services/search_indexer_spec.rb
index 74ac1c2b4f..efbfce82c1 100644
--- a/spec/services/search_indexer_spec.rb
+++ b/spec/services/search_indexer_spec.rb
@@ -1,30 +1,34 @@
 require 'rails_helper'
 
 describe SearchIndexer do
-
+  let(:post_id) { 99 }
   it 'correctly indexes chinese' do
     SiteSetting.default_locale = 'zh_CN'
     data = "你好世界"
     expect(data.split(" ").length).to eq(1)
 
-    SearchIndexer.update_posts_index(99, "你好世界", "", nil)
+    SearchIndexer.update_posts_index(post_id, "你好世界", "", nil)
 
-    raw_data = PostSearchData.where(post_id: 99).pluck(:raw_data)[0]
+    raw_data = PostSearchData.where(post_id: post_id).pluck(:raw_data)[0]
     expect(raw_data.split(' ').length).to eq(2)
   end
 
-  it 'correctly indexes a post' do
+  it 'correctly indexes a post according to version' do
+    # Preparing so that they can be indexed to right version
+    SearchIndexer.update_posts_index(post_id, "dummy", "", nil)
+    PostSearchData.find_by(post_id: post_id).update_attributes!(version: -1)
+
     data = "<a>This</a> is a test"
+    SearchIndexer.update_posts_index(post_id, data, "", nil)
 
-    SearchIndexer.update_posts_index(99, data, "", nil)
-
-    raw_data, locale = PostSearchData.where(post_id: 99).pluck(:raw_data, :locale)[0]
+    raw_data, locale, version = PostSearchData.where(post_id: post_id).pluck(:raw_data, :locale, :version)[0]
     expect(raw_data).to eq("This is a test")
     expect(locale).to eq("en")
+    expect(version).to eq(Search::INDEX_VERSION)
 
-    SearchIndexer.update_posts_index(99, "tester", "", nil)
+    SearchIndexer.update_posts_index(post_id, "tester", "", nil)
 
-    raw_data = PostSearchData.where(post_id: 99).pluck(:raw_data)[0]
+    raw_data = PostSearchData.where(post_id: post_id).pluck(:raw_data)[0]
     expect(raw_data).to eq("tester")
   end
 end
diff --git a/spec/services/spam_rules_enforcer_spec.rb b/spec/services/spam_rules_enforcer_spec.rb
index 0bb0a8790b..12ee2e2ce2 100644
--- a/spec/services/spam_rules_enforcer_spec.rb
+++ b/spec/services/spam_rules_enforcer_spec.rb
@@ -19,8 +19,8 @@ describe SpamRulesEnforcer do
     context 'user argument' do
       subject(:enforce) { described_class.enforce!(Fabricate.build(:user)) }
 
-      it 'performs the AutoBlock' do
-        SpamRule::AutoBlock.any_instance.expects(:perform).once
+      it 'performs the AutoSilence' do
+        SpamRule::AutoSilence.any_instance.expects(:perform).once
         enforce
       end
     end
diff --git a/spec/services/staff_action_logger_spec.rb b/spec/services/staff_action_logger_spec.rb
index b6cdc0a85b..b8159b28fd 100644
--- a/spec/services/staff_action_logger_spec.rb
+++ b/spec/services/staff_action_logger_spec.rb
@@ -151,7 +151,7 @@ describe StaffActionLogger do
     end
 
     it "logs updated site customizations" do
-      old_json = ThemeSerializer.new(theme, root:false).to_json
+      old_json = ThemeSerializer.new(theme, root: false).to_json
 
       theme.set_field(target: :common, name: :scss, value: "body{margin: 10px;}")
 
@@ -160,7 +160,7 @@ describe StaffActionLogger do
       expect(log_record.previous_value).to be_present
 
       json = ::JSON.parse(log_record.new_value)
-      expect(json['theme_fields']).to eq([{"name" => "scss", "target" => "common", "value" => "body{margin: 10px;}", "type_id" => 1}])
+      expect(json['theme_fields']).to eq([{ "name" => "scss", "target" => "common", "value" => "body{margin: 10px;}", "type_id" => 1 }])
     end
   end
 
@@ -178,7 +178,7 @@ describe StaffActionLogger do
       expect(log_record.new_value).to eq(nil)
       json = ::JSON.parse(log_record.previous_value)
 
-      expect(json['theme_fields']).to eq([{"name" => "scss", "target" => "common", "value" => "body{margin: 10px;}", "type_id" => 1}])
+      expect(json['theme_fields']).to eq([{ "name" => "scss", "target" => "common", "value" => "body{margin: 10px;}", "type_id" => 1 }])
     end
   end
 
@@ -278,11 +278,9 @@ describe StaffActionLogger do
     end
 
     it "creates the UserHistory record" do
-      logged = logger.log_custom('clicked_something', {
-        evil: 'trout',
-        clicked_on: 'thing',
-        topic_id: 1234
-      })
+      logged = logger.log_custom('clicked_something',         evil: 'trout',
+                                                              clicked_on: 'thing',
+                                                              topic_id: 1234)
       expect(logged).to be_valid
       expect(logged.details).to eq("evil: trout\nclicked_on: thing")
       expect(logged.action).to eq(UserHistory.actions[:custom_staff])
@@ -308,7 +306,7 @@ describe StaffActionLogger do
       category.update!(attributes)
 
       logger.log_category_settings_change(category, attributes,
-        { category_group.group_name => category_group.permission_type }
+        category_group.group_name => category_group.permission_type
       )
 
       expect(UserHistory.count).to eq(2)
@@ -331,7 +329,7 @@ describe StaffActionLogger do
       old_permission = category.permissions_params
       category.update!(attributes)
 
-      logger.log_category_settings_change(category, attributes.merge({ permissions: { "everyone" => 1 } }), old_permission)
+      logger.log_category_settings_change(category, attributes.merge(permissions: { "everyone" => 1 }), old_permission)
 
       expect(UserHistory.count).to eq(1)
       expect(UserHistory.find_by_subject('name').category).to eq(category)
@@ -387,12 +385,12 @@ describe StaffActionLogger do
     end
 
     it "creates a new UserHistory record" do
-      user.trust_level_locked = true
+      user.manual_locked_trust_level = 3
       expect { logger.log_lock_trust_level(user) }.to change { UserHistory.count }.by(1)
       user_history = UserHistory.last
       expect(user_history.action).to eq(UserHistory.actions[:lock_trust_level])
 
-      user.trust_level_locked = false
+      user.manual_locked_trust_level = nil
       expect { logger.log_lock_trust_level(user) }.to change { UserHistory.count }.by(1)
       user_history = UserHistory.last
       expect(user_history.action).to eq(UserHistory.actions[:unlock_trust_level])
diff --git a/spec/services/topic_status_updater_spec.rb b/spec/services/topic_status_updater_spec.rb
index 0d1dafa897..14106b10f1 100644
--- a/spec/services/topic_status_updater_spec.rb
+++ b/spec/services/topic_status_updater_spec.rb
@@ -40,6 +40,20 @@ describe TopicStatusUpdater do
     expect(last_post.raw).to eq(I18n.t("topic_statuses.autoclosed_enabled_minutes", count: 0))
   end
 
+  it "triggers a DiscourseEvent on close" do
+    topic = create_topic
+
+    called = false
+    updater = -> (topic) { called = true }
+
+    DiscourseEvent.on(:topic_closed, &updater)
+    TopicStatusUpdater.new(topic, admin).update!("closed", true)
+    DiscourseEvent.off(:topic_closed, &updater)
+
+    expect(topic).to be_closed
+    expect(called).to eq(true)
+  end
+
   it "adds an autoclosed message based on last post" do
     topic = create_topic
     Fabricate(:post, topic: topic)
diff --git a/spec/services/topic_timestamp_changer_spec.rb b/spec/services/topic_timestamp_changer_spec.rb
index 1e9821adeb..1cc740dab2 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_anonymizer_spec.rb b/spec/services/user_anonymizer_spec.rb
index 5d463e2fcc..778538cce1 100644
--- a/spec/services/user_anonymizer_spec.rb
+++ b/spec/services/user_anonymizer_spec.rb
@@ -38,16 +38,16 @@ describe UserAnonymizer do
       end
 
       it "resets profile to default values" do
-        user.update_attributes( name: "Bibi", date_of_birth: 19.years.ago, title: "Super Star" )
+        user.update_attributes(name: "Bibi", date_of_birth: 19.years.ago, title: "Super Star")
 
-        profile = user.user_profile(true)
-        profile.update_attributes( location: "Moose Jaw",
-                                   website: "www.bim.com",
-                                   bio_raw: "I'm Bibi from Moosejaw. I sing and dance.",
-                                   bio_cooked: "I'm Bibi from Moosejaw. I sing and dance.",
-                                   profile_background: "http://example.com/bg.jpg",
-                                   bio_cooked_version: 2,
-                                   card_background: "http://example.com/cb.jpg")
+        profile = user.reload.user_profile
+        profile.update_attributes(location: "Moose Jaw",
+                                  website: "www.bim.com",
+                                  bio_raw: "I'm Bibi from Moosejaw. I sing and dance.",
+                                  bio_cooked: "I'm Bibi from Moosejaw. I sing and dance.",
+                                  profile_background: "http://example.com/bg.jpg",
+                                  bio_cooked_version: 2,
+                                  card_background: "http://example.com/cb.jpg")
 
         prev_username = user.username
 
@@ -62,7 +62,7 @@ describe UserAnonymizer do
         expect(user.title).not_to be_present
         expect(user.user_auth_tokens.count).to eq(0)
 
-        profile = user.user_profile(true)
+        profile = user.reload.user_profile
         expect(profile.location).to eq(nil)
         expect(profile.website).to eq(nil)
         expect(profile.bio_cooked).to eq(nil)
@@ -80,7 +80,7 @@ describe UserAnonymizer do
       it "changes name to anonymized username" do
         prev_username = user.username
 
-        user.update_attributes( name: "Bibi", date_of_birth: 19.years.ago, title: "Super Star" )
+        user.update_attributes(name: "Bibi", date_of_birth: 19.years.ago, title: "Super Star")
 
         make_anonymous
         user.reload
diff --git a/spec/services/user_blocker_spec.rb b/spec/services/user_blocker_spec.rb
deleted file mode 100644
index 34c0b99fbd..0000000000
--- a/spec/services/user_blocker_spec.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-require 'rails_helper'
-
-describe UserBlocker do
-
-  before do
-    SystemMessage.stubs(:create)
-  end
-
-  describe 'block' do
-    let(:user)           { stub_everything(save: true) }
-    let(:blocker)        { UserBlocker.new(user) }
-    subject(:block_user) { blocker.block }
-
-    it 'blocks the user' do
-      u = Fabricate(:user)
-      expect { UserBlocker.block(u) }.to change { u.reload.blocked? }
-    end
-
-    it 'hides posts' do
-      blocker.expects(:hide_posts)
-      block_user
-    end
-
-    context 'given a staff user argument' do
-      it 'sends the correct message to the blocked user' do
-        SystemMessage.unstub(:create)
-        SystemMessage.expects(:create).with(user, :blocked_by_staff).returns(true)
-        UserBlocker.block(user, Fabricate.build(:admin))
-      end
-    end
-
-    context 'not given a staff user argument' do
-      it 'sends a default message to the user' do
-        SystemMessage.unstub(:create)
-        SystemMessage.expects(:create).with(user, :blocked_by_staff).returns(true)
-        UserBlocker.block(user, Fabricate.build(:admin))
-      end
-    end
-
-    context 'given a message option' do
-      it 'sends that message to the user' do
-        SystemMessage.unstub(:create)
-        SystemMessage.expects(:create).with(user, :the_custom_message).returns(true)
-        UserBlocker.block(user, Fabricate.build(:admin), {message: :the_custom_message})
-      end
-    end
-
-    it "doesn't send a pm if save fails" do
-      user.stubs(:save).returns(false)
-      SystemMessage.unstub(:create)
-      SystemMessage.expects(:create).never
-      block_user
-    end
-
-    it "doesn't send a pm if the user is already blocked" do
-      user.stubs(:blocked?).returns(true)
-      SystemMessage.unstub(:create)
-      SystemMessage.expects(:create).never
-      expect(block_user).to eq(false)
-    end
-
-    it "logs it with context" do
-      SystemMessage.stubs(:create).returns(Fabricate.build(:post))
-      expect {
-        UserBlocker.block(user, Fabricate(:admin))
-      }.to change { UserHistory.count }.by(1)
-      expect(UserHistory.last.context).to be_present
-    end
-  end
-
-  describe 'unblock' do
-    let(:user)             { stub_everything(save: true) }
-    subject(:unblock_user) { UserBlocker.unblock(user, Fabricate.build(:admin)) }
-
-    it 'unblocks the user' do
-      u = Fabricate(:user, blocked: true)
-      expect { UserBlocker.unblock(u) }.to change { u.reload.blocked? }
-    end
-
-    it 'sends a message to the user' do
-      SystemMessage.unstub(:create)
-      SystemMessage.expects(:create).with(user, :unblocked).returns(true)
-      unblock_user
-    end
-
-    it "doesn't send a pm if save fails" do
-      user.stubs(:save).returns(false)
-      SystemMessage.unstub(:create)
-      SystemMessage.expects(:create).never
-      unblock_user
-    end
-
-    it "logs it" do
-      expect {
-        unblock_user
-      }.to change { UserHistory.count }.by(1)
-    end
-  end
-
-  describe 'hide_posts' do
-    let(:user)    { Fabricate(:user, trust_level: 0) }
-    let!(:post)   { Fabricate(:post, user: user) }
-    subject       { UserBlocker.new(user) }
-
-    it "hides all the user's posts" do
-      subject.block
-      expect(post.reload).to be_hidden
-    end
-
-    it "hides the topic if the post was the first post" do
-      subject.block
-      expect(post.topic.reload).to_not be_visible
-    end
-
-    it "doesn't hide posts if user is TL1" do
-      user.trust_level = 1
-      subject.block
-      expect(post.reload).to_not be_hidden
-      expect(post.topic.reload).to be_visible
-    end
-
-    it "only hides posts from the past 24 hours" do
-      old_post = Fabricate(:post, user: user, created_at: 2.days.ago)
-      subject.block
-      expect(post.reload).to be_hidden
-      expect(post.topic.reload).to_not be_visible
-      old_post.reload
-      expect(old_post).to_not be_hidden
-      expect(old_post.topic).to be_visible
-    end
-  end
-
-end
diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rb
index 55b94ff3fb..3c829d89fd 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)
@@ -50,6 +45,12 @@ describe UserDestroyer do
         StaffActionLogger.any_instance.expects(:log_user_deletion).with(@user, anything).once
         destroy
       end
+
+      it "should not log the action if quiet is true" do
+        expect {
+          UserDestroyer.new(@admin).destroy(@user, destroy_opts.merge(quiet: true))
+        }.to_not change { UserHistory.where(action: UserHistory.actions[:delete_user]).count }
+      end
     end
 
     shared_examples "email block list" do
@@ -58,16 +59,15 @@ describe UserDestroyer do
         destroy
       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}))
+      it "adds emails to block list if block_email is true" do
+        expect {
+          UserDestroyer.new(@admin).destroy(@user, destroy_opts.merge(block_email: true))
+        }.to change { ScreenedEmail.count }.by(2)
       end
     end
 
     context 'user deletes self' do
-      let(:destroy_opts) { {delete_posts: true} }
+      let(:destroy_opts) { { delete_posts: true } }
       subject(:destroy) { UserDestroyer.new(@user).destroy(@user, destroy_opts) }
 
       include_examples "successfully destroy a user"
@@ -132,7 +132,7 @@ describe UserDestroyer do
         end
 
         it 'should raise an error' do
-          expect { destroy }.to raise_error( UserDestroyer::PostsExistError )
+          expect { destroy }.to raise_error(UserDestroyer::PostsExistError)
         end
 
         it 'should not log the action' do
@@ -142,7 +142,7 @@ describe UserDestroyer do
       end
 
       context "delete_posts is true" do
-        let(:destroy_opts) { {delete_posts: true} }
+        let(:destroy_opts) { { delete_posts: true } }
 
         context "staff deletes user" do
           subject(:destroy) { UserDestroyer.new(@admin).destroy(@user, destroy_opts) }
@@ -208,7 +208,8 @@ describe UserDestroyer do
         # out of sync user_stat data shouldn't break UserDestroyer
         @user.user_stat.update_attribute(:post_count, 1)
       end
-      subject(:destroy) { UserDestroyer.new(@user).destroy(@user, {delete_posts: false}) }
+      let(:destroy_opts) { {} }
+      subject(:destroy) { UserDestroyer.new(@user).destroy(@user, delete_posts: false) }
 
       include_examples "successfully destroy a user"
     end
@@ -233,15 +234,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
@@ -275,7 +269,7 @@ describe UserDestroyer do
 
         it "doesn't add ScreenedUrl records" do
           ScreenedUrl.expects(:watch).never
-          UserDestroyer.new(@admin).destroy(@user, {delete_posts: true, block_urls: true})
+          UserDestroyer.new(@admin).destroy(@user, delete_posts: true, block_urls: true)
         end
       end
 
@@ -287,7 +281,7 @@ describe UserDestroyer do
 
         it "doesn't add ScreenedUrl records" do
           ScreenedUrl.expects(:watch).never
-          UserDestroyer.new(@admin).destroy(@user, {delete_posts: true, block_urls: true})
+          UserDestroyer.new(@admin).destroy(@user, delete_posts: true, block_urls: true)
         end
       end
     end
@@ -301,14 +295,14 @@ describe UserDestroyer do
       context "block_ip is true" do
         it "creates a new screened_ip_address record" do
           ScreenedIpAddress.expects(:watch).with(@user.ip_address).returns(stub_everything)
-          UserDestroyer.new(@admin).destroy(@user, {block_ip: true})
+          UserDestroyer.new(@admin).destroy(@user, block_ip: true)
         end
 
         it "creates two new screened_ip_address records when registration_ip_address is different than last ip_address" do
           @user.registration_ip_address = '12.12.12.12'
           ScreenedIpAddress.expects(:watch).with(@user.ip_address).returns(stub_everything)
           ScreenedIpAddress.expects(:watch).with(@user.registration_ip_address).returns(stub_everything)
-          UserDestroyer.new(@admin).destroy(@user, {block_ip: true})
+          UserDestroyer.new(@admin).destroy(@user, block_ip: true)
         end
       end
     end
@@ -317,7 +311,7 @@ describe UserDestroyer do
       let!(:category) { Fabricate(:category, user: @user) }
 
       it "assigns the system user to the categories" do
-        UserDestroyer.new(@admin).destroy(@user, {delete_posts: true})
+        UserDestroyer.new(@admin).destroy(@user, delete_posts: true)
         expect(category.reload.user_id).to eq(Discourse.system_user.id)
         expect(category.topic).to be_present
         expect(category.topic.user_id).to eq(Discourse.system_user.id)
@@ -330,7 +324,7 @@ describe UserDestroyer do
 
       it "deletes the email log" do
         expect {
-          UserDestroyer.new(@admin).destroy(user, {delete_posts: true})
+          UserDestroyer.new(@admin).destroy(user, delete_posts: true)
         }.to change { EmailLog.count }.by(-1)
       end
     end
@@ -344,7 +338,7 @@ describe UserDestroyer do
 
       it 'should destroy the like' do
         expect {
-          UserDestroyer.new(@admin).destroy(@user, {delete_posts: true})
+          UserDestroyer.new(@admin).destroy(@user, delete_posts: true)
         }.to change { PostAction.count }.by(-1)
         expect(@post.reload.like_count).to eq(0)
       end
diff --git a/spec/services/user_silencer_spec.rb b/spec/services/user_silencer_spec.rb
new file mode 100644
index 0000000000..188bd0435f
--- /dev/null
+++ b/spec/services/user_silencer_spec.rb
@@ -0,0 +1,133 @@
+require 'rails_helper'
+
+describe UserSilencer do
+
+  before do
+    SystemMessage.stubs(:create)
+  end
+
+  describe 'silence' do
+    let(:user) { Fabricate(:user) }
+    let(:silencer) { UserSilencer.new(user) }
+    subject(:silence_user) { silencer.silence }
+
+    it 'silences the user' do
+      u = Fabricate(:user)
+      expect { UserSilencer.silence(u) }.to change { u.reload.silenced? }
+    end
+
+    it 'hides posts' do
+      silencer.expects(:hide_posts)
+      silence_user
+    end
+
+    context 'given a staff user argument' do
+      it 'sends the correct message to the silenced user' do
+        SystemMessage.unstub(:create)
+        SystemMessage.expects(:create).with(user, :silenced_by_staff).returns(true)
+        UserSilencer.silence(user, Fabricate.build(:admin))
+      end
+    end
+
+    context 'not given a staff user argument' do
+      it 'sends a default message to the user' do
+        SystemMessage.unstub(:create)
+        SystemMessage.expects(:create).with(user, :silenced_by_staff).returns(true)
+        UserSilencer.silence(user, Fabricate.build(:admin))
+      end
+    end
+
+    context 'given a message option' do
+      it 'sends that message to the user' do
+        SystemMessage.unstub(:create)
+        SystemMessage.expects(:create).with(user, :the_custom_message).returns(true)
+        UserSilencer.silence(user, Fabricate.build(:admin), message: :the_custom_message)
+      end
+    end
+
+    it "doesn't send a pm if save fails" do
+      user.stubs(:save).returns(false)
+      SystemMessage.unstub(:create)
+      SystemMessage.expects(:create).never
+      silence_user
+    end
+
+    it "doesn't send a pm if the user is already silenced" do
+      user.silenced_till = 1.year.from_now
+      SystemMessage.unstub(:create)
+      SystemMessage.expects(:create).never
+      expect(silence_user).to eq(false)
+    end
+
+    it "logs it with context" do
+      SystemMessage.stubs(:create).returns(Fabricate.build(:post))
+      expect {
+        UserSilencer.silence(user, Fabricate(:admin))
+      }.to change { UserHistory.count }.by(1)
+      expect(UserHistory.last.context).to be_present
+    end
+  end
+
+  describe 'unsilence' do
+    let(:user)             { stub_everything(save: true) }
+    subject(:unsilence_user) { UserSilencer.unsilence(user, Fabricate.build(:admin)) }
+
+    it 'unsilences the user' do
+      u = Fabricate(:user, silenced_till: 1.year.from_now)
+      expect { UserSilencer.unsilence(u) }.to change { u.reload.silenced? }
+    end
+
+    it 'sends a message to the user' do
+      SystemMessage.unstub(:create)
+      SystemMessage.expects(:create).with(user, :unsilenced).returns(true)
+      unsilence_user
+    end
+
+    it "doesn't send a pm if save fails" do
+      user.stubs(:save).returns(false)
+      SystemMessage.unstub(:create)
+      SystemMessage.expects(:create).never
+      unsilence_user
+    end
+
+    it "logs it" do
+      expect {
+        unsilence_user
+      }.to change { UserHistory.count }.by(1)
+    end
+  end
+
+  describe 'hide_posts' do
+    let(:user)    { Fabricate(:user, trust_level: 0) }
+    let!(:post)   { Fabricate(:post, user: user) }
+    subject       { UserSilencer.new(user) }
+
+    it "hides all the user's posts" do
+      subject.silence
+      expect(post.reload).to be_hidden
+    end
+
+    it "hides the topic if the post was the first post" do
+      subject.silence
+      expect(post.topic.reload).to_not be_visible
+    end
+
+    it "doesn't hide posts if user is TL1" do
+      user.trust_level = 1
+      subject.silence
+      expect(post.reload).to_not be_hidden
+      expect(post.topic.reload).to be_visible
+    end
+
+    it "only hides posts from the past 24 hours" do
+      old_post = Fabricate(:post, user: user, created_at: 2.days.ago)
+      subject.silence
+      expect(post.reload).to be_hidden
+      expect(post.topic.reload).to_not be_visible
+      old_post.reload
+      expect(old_post).to_not be_hidden
+      expect(old_post.topic).to be_visible
+    end
+  end
+
+end
diff --git a/spec/services/user_updater_spec.rb b/spec/services/user_updater_spec.rb
index 0d025c8cc4..a1003ab4f9 100644
--- a/spec/services/user_updater_spec.rb
+++ b/spec/services/user_updater_spec.rb
@@ -10,18 +10,15 @@ describe UserUpdater do
       u2 = Fabricate(:user)
       u3 = Fabricate(:user)
 
-
       updater = UserUpdater.new(u1, u1)
       updater.update_muted_users("#{u2.username},#{u3.username}")
 
       updater = UserUpdater.new(u2, u2)
       updater.update_muted_users("#{u3.username},#{u1.username}")
 
-
       updater = UserUpdater.new(u3, u3)
       updater.update_muted_users("")
 
-
       expect(MutedUser.where(user_id: u2.id).count).to eq 2
       expect(MutedUser.where(user_id: u1.id).count).to eq 2
       expect(MutedUser.where(user_id: u3.id).count).to eq 0
@@ -71,16 +68,17 @@ describe UserUpdater do
       seq = user.user_option.theme_key_seq
 
       val = updater.update(bio_raw: 'my new bio',
-                     email_always: 'true',
-                     mailing_list_mode: true,
-                     digest_after_minutes: "45",
-                     new_topic_duration_minutes: 100,
-                     auto_track_topics_after_msecs: 101,
-                     notification_level_when_replying: 3,
-                     email_in_reply_to: false,
-                     date_of_birth: date_of_birth,
-                     theme_key: theme.key
-                    )
+                           email_always: 'true',
+                           mailing_list_mode: true,
+                           digest_after_minutes: "45",
+                           new_topic_duration_minutes: 100,
+                           auto_track_topics_after_msecs: 101,
+                           notification_level_when_replying: 3,
+                           email_in_reply_to: false,
+                           date_of_birth: date_of_birth,
+                           theme_key: theme.key,
+                           allow_private_messages: false)
+
       expect(val).to be_truthy
 
       user.reload
@@ -94,7 +92,8 @@ describe UserUpdater do
       expect(user.user_option.notification_level_when_replying).to eq 3
       expect(user.user_option.email_in_reply_to).to eq false
       expect(user.user_option.theme_key).to eq theme.key
-      expect(user.user_option.theme_key_seq).to eq(seq+1)
+      expect(user.user_option.theme_key_seq).to eq(seq + 1)
+      expect(user.user_option.allow_private_messages).to eq(false)
       expect(user.date_of_birth).to eq(date_of_birth.to_date)
     end
 
@@ -113,6 +112,7 @@ describe UserUpdater do
 
     context 'when sso overrides bio' do
       it 'does not change bio' do
+        SiteSetting.sso_url = "https://www.example.com/sso"
         SiteSetting.enable_sso = true
         SiteSetting.sso_overrides_bio = true
 
@@ -189,22 +189,37 @@ describe UserUpdater do
     context 'when custom_fields is empty string' do
       it "update is successful" do
         user = Fabricate(:user)
-        user.custom_fields = {'import_username' => 'my_old_username'}
+        user.custom_fields = { 'import_username' => 'my_old_username' }
         user.save
         updater = UserUpdater.new(acting_user, user)
 
         updater.update(website: 'example.com', custom_fields: '')
-        expect(user.reload.custom_fields).to eq({'import_username' => 'my_old_username'})
+        expect(user.reload.custom_fields).to eq('import_username' => 'my_old_username')
       end
     end
 
     it "logs the action" do
       user_without_name = Fabricate(:user, name: nil)
       user = Fabricate(:user, name: 'Billy Bob')
-      expect { UserUpdater.new(acting_user, user).update(name: 'Jim Tom') }.to change { UserHistory.count }.by(1)
-      expect { UserUpdater.new(acting_user, user).update(name: 'Jim Tom') }.to change { UserHistory.count }.by(0) # make sure it does not log a dupe
-      expect { UserUpdater.new(acting_user, user_without_name).update(bio_raw: 'foo bar') }.to change { UserHistory.count }.by(0) # make sure user without name (name = nil) does not raise an error
-      expect { UserUpdater.new(acting_user, user_without_name).update(name: 'Jim Tom') }.to change { UserHistory.count }.by(1)
+      expect do
+        UserUpdater.new(acting_user, user).update(name: 'Jim Tom')
+      end.to change { UserHistory.count }.by(1)
+
+      expect do
+        UserUpdater.new(acting_user, user).update(name: 'JiM TOm')
+      end.to_not change { UserHistory.count }
+
+      expect do
+        UserUpdater.new(acting_user, user_without_name).update(bio_raw: 'foo bar')
+      end.to_not change { UserHistory.count }
+
+      expect do
+        UserUpdater.new(acting_user, user_without_name).update(name: 'Jim Tom')
+      end.to change { UserHistory.count }.by(1)
+
+      expect do
+        UserUpdater.new(acting_user, user).update(name: '')
+      end.to change { UserHistory.count }.by(1)
     end
   end
 end
diff --git a/spec/services/word_watcher_spec.rb b/spec/services/word_watcher_spec.rb
new file mode 100644
index 0000000000..334446502c
--- /dev/null
+++ b/spec/services/word_watcher_spec.rb
@@ -0,0 +1,84 @@
+require 'rails_helper'
+
+describe WordWatcher do
+
+  let(:raw) { "Do you like liquorice?\n\nI really like them. One could even say that I am *addicted* to liquorice. Anf if\nyou can mix it up with some anise, then I'm in heaven ;)" }
+
+  after do
+    $redis.flushall
+  end
+
+  describe "word_matches_for_action?" do
+    it "is falsey when there are no watched words" do
+      expect(WordWatcher.new(raw).word_matches_for_action?(:require_approval)).to be_falsey
+    end
+
+    context "with watched words" do
+      let!(:anise) { Fabricate(:watched_word, word: "anise", action: WatchedWord.actions[:require_approval]) }
+
+      it "is falsey without a match" do
+        expect(WordWatcher.new("No liquorice for me, thanks...").word_matches_for_action?(:require_approval)).to be_falsey
+      end
+
+      it "is returns matched words if there's a match" do
+        m = WordWatcher.new(raw).word_matches_for_action?(:require_approval)
+        expect(m).to be_truthy
+        expect(m[1]).to eq(anise.word)
+      end
+
+      it "finds at start of string" do
+        m = WordWatcher.new("#{anise.word} is garbage").word_matches_for_action?(:require_approval)
+        expect(m[1]).to eq(anise.word)
+      end
+
+      it "finds at end of string" do
+        m = WordWatcher.new("who likes #{anise.word}").word_matches_for_action?(:require_approval)
+        expect(m[1]).to eq(anise.word)
+      end
+
+      it "finds non-letters in place of letters" do
+        Fabricate(:watched_word, word: "co(onut", action: WatchedWord.actions[:require_approval])
+        m = WordWatcher.new("This co(onut is delicious.").word_matches_for_action?(:require_approval)
+        expect(m[1]).to eq("co(onut")
+      end
+
+      it "handles * for wildcards" do
+        Fabricate(:watched_word, word: "a**le*", action: WatchedWord.actions[:require_approval])
+        m = WordWatcher.new("I acknowledge you.").word_matches_for_action?(:require_approval)
+        expect(m[1]).to eq("acknowledge")
+      end
+
+      context "regular expressions" do
+        before do
+          SiteSetting.watched_words_regular_expressions = true
+        end
+
+        it "supports regular expressions on word boundaries" do
+          Fabricate(
+            :watched_word,
+            word: /\btest\b/,
+            action: WatchedWord.actions[:block]
+          )
+          m = WordWatcher.new("this is not a test.").word_matches_for_action?(:block)
+          expect(m[1]).to eq("test")
+        end
+
+        it "supports regular expressions as a site setting" do
+          Fabricate(
+            :watched_word,
+            word: /tro[uo]+t/,
+            action: WatchedWord.actions[:require_approval]
+          )
+          m = WordWatcher.new("Evil Trout is cool").word_matches_for_action?(:require_approval)
+          expect(m[1]).to eq("Trout")
+          m = WordWatcher.new("Evil Troot is cool").word_matches_for_action?(:require_approval)
+          expect(m[1]).to eq("Troot")
+          m = WordWatcher.new("trooooooooot").word_matches_for_action?(:require_approval)
+          expect(m[1]).to eq("trooooooooot")
+        end
+      end
+
+    end
+  end
+
+end
diff --git a/spec/support/diagnostics_helper.rb b/spec/support/diagnostics_helper.rb
index 5d4c9eed49..11d131c98d 100644
--- a/spec/support/diagnostics_helper.rb
+++ b/spec/support/diagnostics_helper.rb
@@ -1,7 +1,7 @@
 module MessageBus::DiagnosticsHelper
   def publish(channel, data, opts = nil)
     id = super(channel, data, opts)
-    if @tracking
+    if @tracking && (@channel.nil? || @channel == channel)
       m = MessageBus::Message.new(-1, id, channel, data)
       m.user_ids = opts[:user_ids] if opts
       m.group_ids = opts[:group_ids] if opts
@@ -10,11 +10,13 @@ module MessageBus::DiagnosticsHelper
     id
   end
 
-  def track_publish
-    @tracking = tracking =  []
+  def track_publish(channel = nil)
+    @channel = channel
+    @tracking = tracking = []
     yield
-    @tracking = nil
     tracking
+  ensure
+    @tracking = nil
   end
 end
 
diff --git a/spec/support/discourse_event_helper.rb b/spec/support/discourse_event_helper.rb
new file mode 100644
index 0000000000..0309a5c6fa
--- /dev/null
+++ b/spec/support/discourse_event_helper.rb
@@ -0,0 +1,18 @@
+module DiscourseEvent::TestHelper
+  def trigger(event_name, *params)
+    super(event_name, *params)
+
+    if @events_trigger
+      @events_trigger << { event_name: event_name, params: params }
+    end
+  end
+
+  def track_events
+    @events_trigger = events_trigger = []
+    yield
+    @events_trigger = nil
+    events_trigger
+  end
+end
+
+DiscourseEvent.singleton_class.prepend DiscourseEvent::TestHelper
diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index 9238cf9771..0a74e2df38 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -5,7 +5,7 @@ module Helpers
     @next_seq = (@next_seq || 0) + 1
   end
 
-  def log_in(fabricator=nil)
+  def log_in(fabricator = nil)
     user = Fabricate(fabricator || :user)
     log_in_user(user)
     user
@@ -13,7 +13,7 @@ module Helpers
 
   def log_in_user(user)
     provider = Discourse.current_user_provider.new(request.env)
-    provider.log_on_user(user,session,cookies)
+    provider.log_on_user(user, session, cookies)
   end
 
   def fixture_file(filename)
@@ -26,7 +26,7 @@ module Helpers
     Fabricate.build(*args)
   end
 
-  def create_topic(args={})
+  def create_topic(args = {})
     args[:title] ||= "This is my title #{Helpers.next_seq}"
     user = args.delete(:user) || Fabricate(:user)
     guardian = Guardian.new(user)
@@ -34,7 +34,7 @@ module Helpers
     TopicCreator.create(user, guardian, args)
   end
 
-  def create_post(args={})
+  def create_post(args = {})
     args[:title] ||= "This is my title #{Helpers.next_seq}"
     args[:raw] ||= "This is the raw body of my post, it is cool #{Helpers.next_seq}"
     args[:topic_id] = args[:topic].id if args[:topic]
@@ -50,9 +50,9 @@ module Helpers
     post
   end
 
-  def generate_username(length=10)
+  def generate_username(length = 10)
     range = [*'a'..'z']
-    Array.new(length){range.sample}.join
+    Array.new(length) { range.sample }.join
   end
 
   def stub_guardian(user)
@@ -61,15 +61,16 @@ module Helpers
     Guardian.stubs(new: guardian).with(user)
   end
 
-  def wait_for(&blk)
+  def wait_for(on_fail: nil, &blk)
     i = 0
     result = false
-    while !result && i < 300
+    while !result && i < 1000
       result = blk.call
       i += 1
       sleep 0.001
     end
 
+    on_fail&.call
     expect(result).to eq(true)
   end
 
@@ -84,5 +85,4 @@ module Helpers
   def email(email_name)
     fixture_file("emails/#{email_name}.eml")
   end
-
 end
diff --git a/spec/support/integration_helpers.rb b/spec/support/integration_helpers.rb
index 24331a0761..ceea993555 100644
--- a/spec/support/integration_helpers.rb
+++ b/spec/support/integration_helpers.rb
@@ -1,9 +1,34 @@
 module IntegrationHelpers
+  def create_user
+    get "/u/hp.json"
+
+    expect(response).to be_success
+
+    body = JSON.parse(response.body)
+    honeypot = body["value"]
+    challenge = body["challenge"]
+    user = Fabricate.build(:user)
+
+    post "/u.json", params: {
+      username: user.username,
+      email: user.email,
+      password: 'asdasljdhaiosdjioaeiow',
+      password_confirmation: honeypot,
+      challenge: challenge.reverse
+    }
+
+    expect(response).to be_success
+
+    body = JSON.parse(response.body)
+    User.find(body["user_id"])
+  end
+
   def sign_in(user)
     password = 'somecomplicatedpassword'
     user.update!(password: password)
     Fabricate(:email_token, confirmed: true, user: user)
-    post "/session.json", { login: user.username, password: password }
+    post "/session.json", params: { login: user.username, password: password }
     expect(response).to be_success
+    user
   end
 end
diff --git a/spec/support/shared_examples_for_stats_cacheable.rb b/spec/support/shared_examples_for_stats_cacheable.rb
index decaf1f78d..0b4306f41b 100644
--- a/spec/support/shared_examples_for_stats_cacheable.rb
+++ b/spec/support/shared_examples_for_stats_cacheable.rb
@@ -11,16 +11,16 @@ 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
 
   describe 'fetch_stats' do
     it 'has not been implemented' do
-      expect{ described_class.fetch_stats }.to_not raise_error
+      expect { described_class.fetch_stats }.to_not raise_error
     end
   end
 end
diff --git a/spec/tasks/posts_spec.rb b/spec/tasks/posts_spec.rb
index 788dd18797..8215a08264 100644
--- a/spec/tasks/posts_spec.rb
+++ b/spec/tasks/posts_spec.rb
@@ -1,18 +1,57 @@
 require 'rails_helper'
+require 'highline/import'
+require 'highline/simulate'
 
 RSpec.describe "Post rake tasks" do
+  let!(:post) { Fabricate(:post, raw: 'The quick brown fox jumps over the lazy dog') }
+  let!(:tricky_post) { Fabricate(:post, raw: 'Today ^Today') }
+
   before do
+    Rake::Task.clear
     Discourse::Application.load_tasks
-    IO.any_instance.stubs(:puts)
+    STDOUT.stubs(:write)
   end
 
   describe 'remap' do
     it 'should remap posts' do
-      post = Fabricate(:post, raw: "The quick brown fox jumps over the lazy dog")
+      HighLine::Simulate.with('y') do
+        Rake::Task['posts:remap'].invoke("brown", "red")
+      end
 
-      Rake::Task['posts:remap'].invoke("brown","red")
       post.reload
       expect(post.raw).to eq('The quick red fox jumps over the lazy dog')
     end
+
+    context 'when type == string' do
+      it 'remaps input as string' do
+        HighLine::Simulate.with('y') do
+          Rake::Task['posts:remap'].invoke('^Today', 'Yesterday', 'string')
+        end
+
+        expect(tricky_post.reload.raw).to eq('Today Yesterday')
+      end
+    end
+
+    context 'when type == regex' do
+      it 'remaps input as regex' do
+        HighLine::Simulate.with('y') do
+          Rake::Task['posts:remap'].invoke('^Today', 'Yesterday', 'regex')
+        end
+
+        expect(tricky_post.reload.raw).to eq('Yesterday ^Today')
+      end
+    end
+  end
+
+  describe 'rebake_match' do
+    it 'rebakes matched posts' do
+      post.update_attributes(cooked: '')
+
+      HighLine::Simulate.with('y') do
+        Rake::Task['posts:rebake_match'].invoke('brown')
+      end
+
+      expect(post.reload.cooked).to eq('<p>The quick brown fox jumps over the lazy dog</p>')
+    end
   end
 end
diff --git a/spec/views/omniauth_callbacks/complete.html.erb_spec.rb b/spec/views/omniauth_callbacks/complete.html.erb_spec.rb
index 614877fdb8..f66ad99d8a 100644
--- a/spec/views/omniauth_callbacks/complete.html.erb_spec.rb
+++ b/spec/views/omniauth_callbacks/complete.html.erb_spec.rb
@@ -39,5 +39,3 @@ describe "users/omniauth_callbacks/complete.html.erb" do
   end
 
 end
-
-
diff --git a/spec/views/omniauth_callbacks/failure.html.erb_spec.rb b/spec/views/omniauth_callbacks/failure.html.erb_spec.rb
index ce6adc032a..b4c16c984c 100644
--- a/spec/views/omniauth_callbacks/failure.html.erb_spec.rb
+++ b/spec/views/omniauth_callbacks/failure.html.erb_spec.rb
@@ -2,11 +2,11 @@ require "rails_helper"
 
 describe "users/omniauth_callbacks/failure.html.erb" do
 
-    it "renders the failure page" do
-        flash[:error] = I18n.t("login.omniauth_error", strategy: 'test')
-        render
+  it "renders the failure page" do
+    flash[:error] = I18n.t("login.omniauth_error", strategy: 'test')
+      render
 
-        expect(rendered.match(I18n.t("login.omniauth_error", strategy: 'test'))).not_to eq(nil)
-    end
+      expect(rendered.match(I18n.t("login.omniauth_error", strategy: 'test'))).not_to eq(nil)
+  end
 
 end
diff --git a/test/javascripts/acceptance/about-test.js.es6 b/test/javascripts/acceptance/about-test.js.es6
index f6547bc646..c7ef9fb85a 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 661dc6197c..a0fc11267a 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-flags-test.js.es6 b/test/javascripts/acceptance/admin-flags-test.js.es6
new file mode 100644
index 0000000000..e64e823039
--- /dev/null
+++ b/test/javascripts/acceptance/admin-flags-test.js.es6
@@ -0,0 +1,128 @@
+import { acceptance } from "helpers/qunit-helpers";
+acceptance("Admin - Flagging", { loggedIn: true });
+
+QUnit.test("flagged posts", assert => {
+  visit("/admin/flags/active");
+  andThen(() => {
+    assert.equal(find('.flagged-posts .flagged-post').length, 1);
+    assert.equal(find('.flagged-post .flag-user').length, 1, 'shows who flagged it');
+    assert.equal(find('.flagged-post-response').length, 2);
+    assert.equal(find('.flagged-post-response:eq(0) img.avatar').length, 1);
+    assert.equal(find('.flagged-post-user-details .username').length, 1, 'shows the flagged username');
+  });
+});
+
+QUnit.test("flagged posts - agree", assert => {
+  const agreeFlag = selectKit('.agree-flag');
+
+  visit("/admin/flags/active");
+
+  agreeFlag.expand().selectRowByValue('confirm-agree-keep');
+
+  andThen(() => {
+    assert.equal(find('.admin-flags .flagged-post').length, 0, 'post was removed');
+  });
+});
+
+QUnit.test("flagged posts - agree + hide", assert => {
+  const agreeFlag = selectKit('.agree-flag');
+
+  visit("/admin/flags/active");
+
+  agreeFlag.expand().selectRowByValue('confirm-agree-hide');
+
+  andThen(() => {
+    assert.equal(find('.admin-flags .flagged-post').length, 0, 'post was removed');
+  });
+});
+
+QUnit.test("flagged posts - agree + deleteSpammer", assert => {
+  const agreeFlag = selectKit('.agree-flag');
+
+  visit("/admin/flags/active");
+
+  agreeFlag.expand().selectRowByValue('delete-spammer');
+
+  click('.confirm-delete');
+
+  andThen(() => {
+    assert.equal(find('.admin-flags .flagged-post').length, 0, 'post was removed');
+  });
+});
+
+QUnit.test("flagged posts - disagree", assert => {
+  visit("/admin/flags/active");
+  click('.disagree-flag');
+  andThen(() => {
+    assert.equal(find('.admin-flags .flagged-post').length, 0);
+  });
+});
+
+QUnit.test("flagged posts - defer", assert => {
+  visit("/admin/flags/active");
+  click('.defer-flag');
+  andThen(() => {
+    assert.equal(find('.admin-flags .flagged-post').length, 0);
+  });
+});
+
+QUnit.test("flagged posts - delete + defer", assert => {
+  const deleteFlag = selectKit('.delete-flag');
+
+  visit("/admin/flags/active");
+
+  deleteFlag.expand().selectRowByValue('delete-defer');
+
+  andThen(() => {
+    assert.equal(find('.admin-flags .flagged-post').length, 0);
+  });
+});
+
+QUnit.test("flagged posts - delete + agree", assert => {
+  const deleteFlag = selectKit('.delete-flag');
+
+  visit("/admin/flags/active");
+
+  deleteFlag.expand().selectRowByValue('delete-agree');
+
+  andThen(() => {
+    assert.equal(find('.admin-flags .flagged-post').length, 0);
+  });
+});
+
+QUnit.test("flagged posts - delete + deleteSpammer", assert => {
+  const deleteFlag = selectKit('.delete-flag');
+
+  visit("/admin/flags/active");
+
+  deleteFlag.expand().selectRowByValue('delete-spammer');
+
+  click('.confirm-delete');
+
+  andThen(() => {
+    assert.equal(find('.admin-flags .flagged-post').length, 0);
+  });
+});
+
+QUnit.test("flagged posts - suspend", assert => {
+  visit("/admin/flags/active");
+  click('.suspend-user');
+  andThen(() => {
+    assert.equal(find('.suspend-user-modal:visible').length, 1);
+    assert.equal(find('.suspend-user-modal .cant-suspend').length, 1);
+  });
+});
+
+QUnit.test("topics with flags", assert => {
+  visit("/admin/flags/topics");
+  andThen(() => {
+    assert.equal(find('.flagged-topics .flagged-topic').length, 1);
+    assert.equal(find('.flagged-topic .flagged-topic-user').length, 2);
+    assert.equal(find('.flagged-topic .flag-counts').length, 3);
+  });
+
+  click('.flagged-topic .show-details');
+  andThen(() => {
+    assert.equal(currentURL(), '/admin/flags/topics/280');
+  });
+});
diff --git a/test/javascripts/acceptance/admin-search-log-term-test.js.es6 b/test/javascripts/acceptance/admin-search-log-term-test.js.es6
new file mode 100644
index 0000000000..dd6b1e6269
--- /dev/null
+++ b/test/javascripts/acceptance/admin-search-log-term-test.js.es6
@@ -0,0 +1,10 @@
+import { acceptance } from "helpers/qunit-helpers";
+acceptance("Admin - Search Log Term", { loggedIn: true });
+
+QUnit.test("show search log term details", assert => {
+  visit("/admin/logs/search_logs/term/ruby");
+  andThen(() => {
+    assert.ok($('div.search-logs-filter').length, "has the search type filter");
+    assert.ok(exists('iframe.chartjs-hidden-iframe'), "has graph iframe");
+  });
+});
diff --git a/test/javascripts/acceptance/admin-search-logs-test.js.es6 b/test/javascripts/acceptance/admin-search-logs-test.js.es6
new file mode 100644
index 0000000000..e1e7ed5355
--- /dev/null
+++ b/test/javascripts/acceptance/admin-search-logs-test.js.es6
@@ -0,0 +1,10 @@
+import { acceptance } from "helpers/qunit-helpers";
+acceptance("Admin - Search Logs", { loggedIn: true });
+
+QUnit.test("show search logs", assert => {
+  visit("/admin/logs/search_logs");
+  andThen(() => {
+    assert.ok($('div.table.search-logs-list').length, "has the div class");
+    assert.ok(exists('.search-logs-list .admin-list-item .col'), "has a list of search logs");
+  });
+});
diff --git a/test/javascripts/acceptance/admin-site-text-test.js.es6 b/test/javascripts/acceptance/admin-site-text-test.js.es6
index 0cd17959c1..c20dc09f4f 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-suspend-user-test.js.es6 b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
new file mode 100644
index 0000000000..cc67726886
--- /dev/null
+++ b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
@@ -0,0 +1,69 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Admin - Suspend User", {
+  loggedIn: true,
+
+  pretend(server, helper) {
+    server.put('/admin/users/:user_id/suspend', () => helper.response(200, {
+      suspension: {
+        suspended: true
+      }
+    }));
+
+    server.put('/admin/users/:user_id/unsuspend', () => helper.response(200, {
+      suspension: {
+        suspended: false
+      }
+    }));
+  }
+});
+
+QUnit.test("suspend a user - cancel", assert => {
+  visit("/admin/users/1234/regular");
+  click(".suspend-user");
+
+  andThen(() => {
+    assert.equal(find('.suspend-user-modal:visible').length, 1);
+  });
+
+  click('.d-modal-cancel');
+  andThen(() => {
+    assert.equal(find('.suspend-user-modal:visible').length, 0);
+  });
+});
+
+QUnit.test("suspend, then unsuspend a user", assert => {
+  const suspendUntilCombobox = selectKit('.suspend-until .combobox');
+
+  visit("/admin/flags/active");
+
+  visit("/admin/users/1234/regular");
+
+  andThen(() => {
+    assert.ok(!exists('.suspension-info'));
+  });
+
+  click(".suspend-user");
+
+  andThen(() => {
+    assert.equal(find('.perform-suspend[disabled]').length, 1, 'disabled by default');
+  });
+
+  suspendUntilCombobox.expand().selectRowByValue('tomorrow');
+
+  fillIn('.suspend-reason', "for breaking the rules");
+  fillIn('.suspend-message', "this is an email reason why");
+  andThen(() => {
+    assert.equal(find('.perform-suspend[disabled]').length, 0, 'no longer disabled');
+  });
+  click('.perform-suspend');
+  andThen(() => {
+    assert.equal(find('.suspend-user-modal:visible').length, 0);
+    assert.ok(exists('.suspension-info'));
+  });
+
+  click('.unsuspend-user');
+  andThen(() => {
+    assert.ok(!exists('.suspension-info'));
+  });
+});
diff --git a/test/javascripts/acceptance/admin-users-list-test.js.es6 b/test/javascripts/acceptance/admin-users-list-test.js.es6
index a391ff9b73..a6d3117e60 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/admin-watched-words-test.js.es6 b/test/javascripts/acceptance/admin-watched-words-test.js.es6
new file mode 100644
index 0000000000..88fd0728bd
--- /dev/null
+++ b/test/javascripts/acceptance/admin-watched-words-test.js.es6
@@ -0,0 +1,68 @@
+import { acceptance } from "helpers/qunit-helpers";
+acceptance("Admin - Watched Words", { loggedIn: true });
+
+QUnit.test("list words in groups", assert => {
+  visit("/admin/logs/watched_words/action/block");
+  andThen(() => {
+    assert.ok(exists('.watched-words-list'));
+    assert.ok(!exists('.watched-words-list .watched-word'), "Don't show bad words by default.");
+  });
+
+  fillIn('.admin-controls .controls input[type=text]', 'li');
+  andThen(() => {
+    assert.equal(find('.watched-words-list .watched-word').length, 1, "When filtering, show words even if checkbox is unchecked.");
+  });
+
+  fillIn('.admin-controls .controls input[type=text]', '');
+  andThen(() => {
+    assert.ok(!exists('.watched-words-list .watched-word'), "Clearing the filter hides words again.");
+  });
+
+  click('.show-words-checkbox');
+  andThen(() => {
+    assert.ok(exists('.watched-words-list .watched-word'), "Always show the words when checkbox is checked.");
+  });
+
+  click('.nav-stacked .censor a');
+  andThen(() => {
+    assert.ok(exists('.watched-words-list'));
+    assert.ok(!exists('.watched-words-list .watched-word'), "Empty word list.");
+  });
+});
+
+QUnit.test("add words", assert => {
+  visit("/admin/logs/watched_words/action/block");
+  andThen(() => {
+    click('.show-words-checkbox');
+    fillIn('.watched-word-form input', 'poutine');
+  });
+  click('.watched-word-form button');
+  andThen(() => {
+    let found = [];
+    _.each(find('.watched-words-list .watched-word'), i => {
+      if ($(i).text().trim() === 'poutine') {
+        found.push(true);
+      }
+    });
+    assert.equal(found.length, 1);
+  });
+});
+
+QUnit.test("remove words", assert => {
+  visit("/admin/logs/watched_words/action/block");
+  click('.show-words-checkbox');
+
+  let word = null;
+  andThen(() => {
+    _.each(find('.watched-words-list .watched-word'), i => {
+      if ($(i).text().trim() === 'anise') {
+        word = i;
+      }
+    });
+    click('#' + $(word).attr('id'));
+  });
+  andThen(() => {
+    assert.equal(find('.watched-words-list .watched-word').length, 1);
+  });
+});
+
diff --git a/test/javascripts/acceptance/badges-test.js.es6 b/test/javascripts/acceptance/badges-test.js.es6
index ad1f00c0d5..9052efe222 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-chooser-test.js.es6 b/test/javascripts/acceptance/category-chooser-test.js.es6
new file mode 100644
index 0000000000..bd3979993f
--- /dev/null
+++ b/test/javascripts/acceptance/category-chooser-test.js.es6
@@ -0,0 +1,29 @@
+import { acceptance } from 'helpers/qunit-helpers';
+
+acceptance('CategoryChooser', {
+  loggedIn: true,
+  settings: {
+    allow_uncategorized_topics: false
+  }
+});
+
+QUnit.test('does not display uncategorized if not allowed', assert => {
+  const categoryChooser = selectKit('.category-chooser');
+
+  visit('/');
+  click('#create-topic');
+
+  categoryChooser.expand();
+
+  andThen(() => {
+    assert.ok(categoryChooser.rowByIndex(0).name() !== 'uncategorized');
+  });
+});
+
+QUnit.test('prefill category when category_id is set', assert => {
+  visit('/new-topic?category_id=1');
+
+  andThen(() => {
+    assert.equal(selectKit('.category-chooser').header().value(), 1);
+  });
+});
diff --git a/test/javascripts/acceptance/category-edit-security-test.js.es6 b/test/javascripts/acceptance/category-edit-security-test.js.es6
new file mode 100644
index 0000000000..2af84a1898
--- /dev/null
+++ b/test/javascripts/acceptance/category-edit-security-test.js.es6
@@ -0,0 +1,98 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Category Edit - security", {
+  loggedIn: true
+});
+
+QUnit.test("default", assert => {
+  visit("/c/bug");
+
+  click('.edit-category');
+  click('li.edit-category-security a');
+
+  andThen(() => {
+    const $permissionListItems = find('.permission-list li');
+
+    const badgeName = $permissionListItems.eq(0).find('.badge-group').text();
+    assert.equal(badgeName, 'everyone');
+
+    const permission = $permissionListItems.eq(0).find('.permission').text();
+    assert.equal(permission, 'Create / Reply / See');
+  });
+});
+
+QUnit.test("removing a permission", assert => {
+  const availableGroups = selectKit(".available-groups");
+
+  visit("/c/bug");
+
+  click('.edit-category');
+  click('li.edit-category-security a');
+  click('.edit-category-tab-security .edit-permission');
+  availableGroups.expand();
+
+  andThen(() => {
+    assert.notOk(availableGroups.rowByValue('everyone').exists(), 'everyone is already used and is not in the available groups');
+  });
+
+  click('.edit-category-tab-security .permission-list li:first-of-type .remove-permission');
+  availableGroups.expand();
+
+  andThen(() => {
+    assert.ok(availableGroups.rowByValue('everyone').exists(), 'everyone has been removed and appears in the available groups');
+  });
+});
+
+QUnit.test("adding a permission", assert => {
+  const availableGroups = selectKit(".available-groups");
+  const permissionSelector = selectKit(".permission-selector");
+
+  visit("/c/bug");
+
+  click('.edit-category');
+  click('li.edit-category-security a');
+  click('.edit-category-tab-security .edit-permission');
+  availableGroups.expand().selectRowByValue('staff');
+  permissionSelector.expand().selectRowByValue('2');
+  click('.edit-category-tab-security .add-permission');
+
+  andThen(() => {
+    const $addedPermissionItem = find('.edit-category-tab-security .permission-list li:nth-child(2)');
+
+    const badgeName = $addedPermissionItem.find('.badge-group').text();
+    assert.equal(badgeName, 'staff');
+
+    const permission = $addedPermissionItem.find('.permission').text();
+    assert.equal(permission, 'Reply / See');
+  });
+});
+
+QUnit.test("adding a previously removed permission", assert => {
+  const availableGroups = selectKit(".available-groups");
+
+  visit("/c/bug");
+
+  click('.edit-category');
+  click('li.edit-category-security a');
+  click('.edit-category-tab-security .edit-permission');
+  click('.edit-category-tab-security .permission-list li:first-of-type .remove-permission');
+
+  andThen(() => {
+    assert.equal(find(".edit-category-tab-security .permission-list li").length, 0, 'it removes the permission from the list');
+  });
+
+  availableGroups.expand().selectRowByValue('everyone');
+  click('.edit-category-tab-security .add-permission');
+
+  andThen(() => {
+    assert.equal(find(".edit-category-tab-security .permission-list li").length, 1, 'it adds the permission to the list');
+
+    const $permissionListItems = find('.permission-list li');
+
+    const badgeName = $permissionListItems.eq(0).find('.badge-group').text();
+    assert.equal(badgeName, 'everyone');
+
+    const permission = $permissionListItems.eq(0).find('.permission').text();
+    assert.equal(permission, 'Create / Reply / See');
+  });
+});
diff --git a/test/javascripts/acceptance/category-edit-test.js.es6 b/test/javascripts/acceptance/category-edit-test.js.es6
index 185cb7b216..4f9d2da99f 100644
--- a/test/javascripts/acceptance/category-edit-test.js.es6
+++ b/test/javascripts/acceptance/category-edit-test.js.es6
@@ -6,33 +6,33 @@ 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');
   andThen(() => {
-    assert.ok(visible('#discourse-modal'), 'it pops up a modal');
+    assert.ok(visible('.d-modal'), 'it pops up a modal');
   });
 
   click('a.close');
   andThen(() => {
-    assert.ok(!visible('#discourse-modal'), 'it closes the modal');
+    assert.ok(!visible('.d-modal'), 'it closes the modal');
   });
 });
 
-test("Change the category color", assert => {
+QUnit.test("Change the category color", assert => {
   visit("/c/bug");
 
   click('.edit-category');
   fillIn('#edit-text-color', '#ff0000');
   click('#save-category');
   andThen(() => {
-    assert.ok(!visible('#discourse-modal'), 'it closes the modal');
+    assert.ok(!visible('.d-modal'), 'it closes the modal');
     assert.equal(DiscourseURL.redirectedTo, '/c/bug', 'it does one of the rare full page redirects');
   });
 });
 
-test("Change the topic template", assert => {
+QUnit.test("Change the topic template", assert => {
   visit("/c/bug");
 
   click('.edit-category');
@@ -40,12 +40,12 @@ test("Change the topic template", assert => {
   fillIn('.d-editor-input', 'this is the new topic template');
   click('#save-category');
   andThen(() => {
-    assert.ok(!visible('#discourse-modal'), 'it closes the modal');
+    assert.ok(!visible('.d-modal'), 'it closes the modal');
     assert.equal(DiscourseURL.redirectedTo, '/c/bug', 'it does one of the rare full page redirects');
   });
 });
 
-test("Error Saving", assert => {
+QUnit.test("Error Saving", assert => {
   visit("/c/bug");
 
   click('.edit-category');
@@ -58,27 +58,30 @@ test("Error Saving", assert => {
   });
 });
 
-test("Subcategory list settings", () => {
+QUnit.test("Subcategory list settings", assert => {
+  const categoryChooser = selectKit('.edit-category-tab-general .category-chooser');
+
   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');
-  selectDropdown('.edit-category-tab-general .category-combobox', 2);
-
+  categoryChooser.expand().selectRowByValue(3);
   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");
   });
 });
diff --git a/test/javascripts/acceptance/category-hashtag-test.js.es6 b/test/javascripts/acceptance/category-hashtag-test.js.es6
index 99a0c711cd..bd410abc18 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>");
   });
 });
diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6
index fe086a6805..e35505eca6 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('.d-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('.d-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('.d-modal'), 'it pops up a modal');
   });
 
   click('.modal-footer button');
   andThen(() => {
-    ok(invisible('#discourse-modal'), 'the modal can be dismissed');
+    assert.ok(invisible('.d-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');
+
+  selectKit('.toolbar-popup-menu-options').expand().selectRowByValue('toggleWhisper');
+
   andThen(() => {
-    ok(
+    assert.ok(
       find('.composer-fields .whisper').text().indexOf(I18n.t("composer.whisper")) > 0,
       'it sets the post type to whisper'
     );
@@ -274,21 +274,21 @@ 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"
     );
   });
 
-  click('button.options');
-  click('.popup-menu .fa-eye-slash');
+  selectKit('.toolbar-popup-menu-options').expand().selectRowByValue('toggleInvisible');
+
   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');
   });
 });
diff --git a/test/javascripts/acceptance/composer-topic-links-test.js.es6 b/test/javascripts/acceptance/composer-topic-links-test.js.es6
index 3876fcc5cc..6f55248803 100644
--- a/test/javascripts/acceptance/composer-topic-links-test.js.es6
+++ b/test/javascripts/acceptance/composer-topic-links-test.js.es6
@@ -9,58 +9,69 @@ 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");
+  });
+});
+
+QUnit.test("onebox with title but extra words in title field", assert => {
+  visit("/");
+  click('#create-topic');
+  fillIn('#reply-title', "http://www.example.com/has-title.html test");
+  andThen(() => {
+    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(), "http://www.example.com/has-title.html test", "title is unchanged");
   });
 });
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 0b6fec4da4..cb7a2fe5c5 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 3ae0bd6373..6b2508ebf7 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 d125236ebb..bb0d77c879 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 0000000000..56a0f2b926
--- /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 0000000000..23fc2aa804
--- /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 023d9c95f4..4b1f3f987e 100644
--- a/test/javascripts/acceptance/group-edit-test.js.es6
+++ b/test/javascripts/acceptance/group-edit-test.js.es6
@@ -2,39 +2,63 @@ 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-admission').length === 1,
+      'it should display group public admission input'
+    );
+
+    assert.ok(
+      find('.group-edit-public-exit').length === 1,
+      'it should display group public exit 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');
+
+    assert.ok(
+      find('.group-edit-allow-membership-requests[disabled]').length === 1,
+      'it should disable group allow_membership_request input'
+    );
   });
 
-  andThen(() => {
-    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-public-admission');
   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-admission[disabled]').length === 1,
+      'it should disable group public admission input'
+    );
+
+    assert.ok(
+      find('.group-edit-public-exit[disabled]').length === 0,
+      'it should not disable group public exit input'
+    );
+
+    assert.equal(
+      find('.group-edit-membership-request-template').length, 1,
+      'it should display the membership request template field'
+    );
   });
 });
 
-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");
   });
 });
diff --git a/test/javascripts/acceptance/group-logs-test.js.es6 b/test/javascripts/acceptance/group-logs-test.js.es6
index 58a1acb7be..86d760cb0c 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 baf138e76d..4e098f3169 100644
--- a/test/javascripts/acceptance/groups-test.js.es6
+++ b/test/javascripts/acceptance/groups-test.js.es6
@@ -2,101 +2,144 @@ 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("Anonymous 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");
+    assert.ok(count('.group-message-button') === 0, 'it does not show group message button');
   });
 
   click(".nav-pills li a[title='Activity']");
 
   andThen(() => {
-    ok(count('.user-stream .item') > 0, "it lists stream items");
+    assert.ok(count('.group-post') > 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('.group-post') > 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('.group-post') > 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('.group-post') > 0, "it lists stream items");
   });
 });
 
-test("Admin Viewing Group", () => {
+QUnit.test("User Viewing Group", assert => {
+  logIn();
+  Discourse.reset();
+
+  visit("/groups");
+  click('.group-index-request');
+
+  server.post('/groups/Macdonald/request_membership', () => { // eslint-disable-line no-undef
+    return [
+      200,
+      { "Content-Type": "application/json" },
+      { relative_url: '/t/internationalization-localization/280' }
+    ];
+  });
+
+  andThen(() => {
+    assert.equal(find('.modal-header').text().trim(), I18n.t(
+      'groups.membership_request.title', { group_name: 'Macdonald' }
+    ));
+
+    assert.equal(find('.request-group-membership-form textarea').val(), 'Please add me');
+  });
+
+  click('.modal-footer .btn-primary');
+
+  andThen(() => {
+    assert.equal(
+      find('.fancy-title').text().trim(),
+      "Internationalization / localization"
+    );
+  });
+
+  visit("/groups/discourse");
+
+  click('.group-message-button');
+
+  andThen(() => {
+    assert.ok(count('#reply-control') === 1, 'it opens the composer');
+    assert.equal(find('.ac-wrap .item').text(), 'discourse', 'it prefills the group name');
+  });
+});
+
+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');
-
-    equal(find('.group-info-name').text(), 'Awesome Team', 'it should display the group name');
+    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');
+    assert.equal(count('.group-message-button'), 1, 'it displays show group message button');
+    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'
diff --git a/test/javascripts/acceptance/invite-accept-test.js.es6 b/test/javascripts/acceptance/invite-accept-test.js.es6
index f89d5329bc..697948e69d 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 0000000000..823a5113ce
--- /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 4bbec697a4..6153b12f22 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 4d0198bffe..564c5b4ec1 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 8083109131..34c03ec7d8 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 8cc2cb9da1..70d5f2a0c5 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 e3f0986f01..7907c12b21 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('.d-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('.d-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('.d-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('.d-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('.d-modal:visible').length === 0, 'ESC should close the modal');
   });
 });
diff --git a/test/javascripts/acceptance/password-reset-test.js.es6 b/test/javascripts/acceptance/password-reset-test.js.es6
index c8eaf488a2..4706b88c29 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 60a85e3cc7..b7a371d1e3 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 b74b46395b..3f4722d757 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 63a05b3629..48ae7ba07c 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 ccd2aff7b4..0014cefd65 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');
     });
   };
 
@@ -30,46 +30,46 @@ test("update some fields", () => {
   savePreferences();
 
   click(".preferences-nav .nav-notifications a");
-  selectDropdown('.control-group.notifications select.combobox', 1440);
+  selectKit('.control-group.notifications .combo-box.duration').expand().selectRowByValue(1440);
   savePreferences();
 
   click(".preferences-nav .nav-categories a");
   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');
   });
 });
diff --git a/test/javascripts/acceptance/queued-posts-test.js.es6 b/test/javascripts/acceptance/queued-posts-test.js.es6
new file mode 100644
index 0000000000..c2349ce01a
--- /dev/null
+++ b/test/javascripts/acceptance/queued-posts-test.js.es6
@@ -0,0 +1,47 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Queued Posts", {
+  loggedIn: true,
+  settings: { tagging_enabled: true }
+});
+
+QUnit.test("For topics: body of post, title, category and tags are all editbale", assert => {
+  server.get("/queued_posts", () => { //eslint-disable-line no-undef
+    return [
+      200,
+      {"Content-Type": "application/json"},
+      {"users":[{"id":3,"username":"test_user","avatar_template":"/letter_avatar_proxy/v2/letter/t/eada6e/{size}.png","active":true,"admin":false,"moderator":false,"last_seen_at":"2017-08-11T20:48:05.405Z","last_emailed_at":null,"created_at":"2017-08-07T02:23:33.309Z","last_seen_age":"1d","last_emailed_age":null,"created_at_age":"6d","username_lower":"test_user","trust_level":0,"trust_level_locked":false,"flag_level":0,"title":null,"suspended_at":null,"suspended_till":null,"suspended":null,"silenced":false,"time_read":"19m","staged":false,"days_visited":4,"posts_read_count":12,"topics_entered":6,"post_count":2}],"queued_posts":[{"id":22,"queue":"default","user_id":3,"state":1,"topic_id":null,"approved_by_id":null,"rejected_by_id":null,"raw":"some content","post_options":{"archetype":"regular","category":"1","typing_duration_msecs":"3200","composer_open_duration_msecs":"19007","visible":true,"is_warning":false,"title":"a new topic that needs to be reviewed","ip_address":"172.17.0.1","first_post_checks":true,"is_poll":true},"created_at":"2017-08-11T20:43:41.115Z","category_id":1,"can_delete_user":true}],"__rest_serializer":"1","refresh_queued_posts":"/queued_posts?status=new"}
+    ];
+  });
+
+  visit("/queued-posts");
+  click(".queued-posts .queued-post button.edit");
+
+  andThen(() => {
+    assert.ok(exists(".d-editor-container"), "the body should be editable");
+    assert.ok(exists(".edit-title .ember-text-field"), "the title should be editable");
+    assert.ok(exists(".category-chooser"), "category should be editbale");
+    assert.ok(exists(".tag-chooser"), "tags should be editable");
+  });
+});
+
+
+QUnit.test("For replies: only the body of post is editbale", assert => {
+  server.get("/queued_posts", () => { //eslint-disable-line no-undef
+    return [
+      200,
+      {"Content-Type": "application/json"},
+      {"users":[{"id":3,"username":"test_user","avatar_template":"/letter_avatar_proxy/v2/letter/t/eada6e/{size}.png","active":true,"admin":false,"moderator":false,"last_seen_at":"2017-08-11T20:48:05.405Z","last_emailed_at":null,"created_at":"2017-08-07T02:23:33.309Z","last_seen_age":"1d","last_emailed_age":null,"created_at_age":"6d","username_lower":"test_user","trust_level":0,"trust_level_locked":false,"flag_level":0,"title":null,"suspended_at":null,"suspended_till":null,"suspended":null,"silenced":false,"time_read":"19m","staged":false,"days_visited":4,"posts_read_count":12,"topics_entered":6,"post_count":2}],"topics":[{"id":11,"title":"This is a topic","fancy_title":"This is a topic","slug":"this-is-a-topic","posts_count":2}],"queued_posts":[{"id":4,"queue":"default","user_id":3,"state":1,"topic_id":11,"approved_by_id":null,"rejected_by_id":null,"raw":"edited haahaasdfasdfasdfasdf","post_options":{"archetype":"regular","category":"3","reply_to_post_number":"2","typing_duration_msecs":"1900","composer_open_duration_msecs":"12096","visible":true,"is_warning":false,"featured_link":"","ip_address":"172.17.0.1","first_post_checks":true,"is_poll":true},"created_at":"2017-08-07T19:11:52.018Z","category_id":3,"can_delete_user":true}],"__rest_serializer":"1","refresh_queued_posts":"/queued_posts?status=new"}
+    ];
+  });
+
+  visit("/queued-posts");
+  click(".queued-posts .queued-post button.edit");
+
+  andThen(() => {
+    assert.ok(exists(".d-editor-container"), "the body should be editable");
+    assert.notOk(exists(".edit-title .ember-text-field"), "title should not be editbale");
+    assert.notOk(exists(".category-chooser"), "category should not be editable");
+    assert.notOk(exists("div.tag-chooser"), "tags should not be editable");
+  });
+});
diff --git a/test/javascripts/acceptance/raw-plugin-outlet-test.js.es6 b/test/javascripts/acceptance/raw-plugin-outlet-test.js.es6
index e21de0a31e..5303d53cfe 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 d8050d72f4..dba53a9252 100644
--- a/test/javascripts/acceptance/search-full-test.js.es6
+++ b/test/javascripts/acceptance/search-full-test.js.es6
@@ -1,7 +1,8 @@
 import { acceptance, waitFor } from "helpers/qunit-helpers";
 acceptance("Search - Full Page", {
   settings: {tagging_enabled: true},
-  setup() {
+  loggedIn: true,
+  beforeEach() {
     const response = (object) => {
       return [
         200,
@@ -39,12 +40,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);
   });
@@ -52,7 +53,10 @@ test("perform various searches", assert => {
   fillIn('.search input.full-page-search', 'none');
   click('.search .btn-primary');
 
-  andThen(() => assert.ok(find('.fps-topic').length === 0), 'has no results');
+  andThen(() => {
+    assert.ok(find('.fps-topic').length === 0, 'has no results');
+    assert.ok(find('.no-results-suggestion .google-search-form'));
+  });
 
   fillIn('.search input.full-page-search', 'posts');
   click('.search .btn-primary');
@@ -60,7 +64,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 +99,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 +109,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 +118,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,14 +132,14 @@ 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 => {
+  const categoryChooser = selectKit('.search-advanced-options .category-chooser');
+
   visit("/search");
+
   fillIn('.search input.full-page-search', 'none');
   click('.search-advanced-btn');
-  fillIn('.search-advanced-options .category-selector', 'faq');
-  click('.search-advanced-options .category-selector');
-  keyEvent('.search-advanced-options .category-selector', 'keydown', 8);
-  keyEvent('.search-advanced-options .category-selector', 'keydown', 9);
+  categoryChooser.expand().fillInFilter('faq').selectRowByValue(4);
 
   andThen(() => {
     assert.ok(exists('.search-advanced-options .badge-category:contains("faq")'), 'has "faq" populated');
@@ -209,7 +213,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 +225,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 +237,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,48 +252,53 @@ 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 => {
+  const inSelector = selectKit('.search-advanced-options .select-kit#in');
+
   visit("/search");
+
   fillIn('.search input.full-page-search', 'none');
   click('.search-advanced-btn');
-  selectDropdown('.search-advanced-options #s2id_in', 'bookmarks');
-  fillIn('.search-advanced-options #in', 'bookmarks');
+  inSelector.expand().selectRowByValue('bookmarks');
 
   andThen(() => {
-    assert.ok(exists('.search-advanced-options #s2id_in .select2-choice .select2-chosen:contains("I\'ve bookmarked")'), 'has "I\'ve bookmarked" populated');
+    assert.ok(inSelector.rowByName("I bookmarked").exists(), 'has "I bookmarked" populated');
     assert.equal(find('.search input.full-page-search').val(), "none in:bookmarks", 'has updated search term to "none in:bookmarks"');
   });
 });
 
-test("update status through advanced search ui", assert => {
+QUnit.test("update status through advanced search ui", assert => {
+  const statusSelector = selectKit('.search-advanced-options .select-kit#status');
+
   visit("/search");
+
   fillIn('.search input.full-page-search', 'none');
   click('.search-advanced-btn');
-  selectDropdown('.search-advanced-options #s2id_status', 'closed');
-  fillIn('.search-advanced-options #status', 'closed');
+  statusSelector.expand().selectRowByValue('closed');
 
   andThen(() => {
-    assert.ok(exists('.search-advanced-options #s2id_status .select2-choice .select2-chosen:contains("are closed")'), 'has "are closed" populated');
+    assert.ok(statusSelector.rowByName("are closed").exists(), 'has "are closed" populated');
     assert.equal(find('.search input.full-page-search').val(), "none status:closed", 'has updated search term to "none status:closed"');
   });
 });
 
-test("update post time through advanced search ui", assert => {
+QUnit.test("update post time through advanced search ui", assert => {
+  const postTimeSelector = selectKit('.search-advanced-options .select-kit#postTime');
+
   visit("/search");
+
   fillIn('.search input.full-page-search', 'none');
   click('.search-advanced-btn');
-  fillIn('#search-post-date', '2016-10-05');
-  selectDropdown('.search-advanced-options #s2id_postTime', 'after');
-  fillIn('.search-advanced-options #postTime', 'after');
+  fillIn('#search-post-date .date-picker', '2016-10-05');
+  postTimeSelector.expand().selectRowByValue('after');
 
   andThen(() => {
-    assert.ok(exists('.search-advanced-options #s2id_postTime .select2-choice .select2-chosen:contains("after")'), 'has "after" populated');
-    assert.equal(find('.search-advanced-options #search-post-date').val(), "2016-10-05", 'has "2016-10-05" populated');
+    assert.ok(postTimeSelector.rowByName("after").exists(), 'has "after" populated');
     assert.equal(find('.search input.full-page-search').val(), "none after:2016-10-05", 'has updated search term to "none after:2016-10-05"');
   });
 });
 
-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 +310,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 b80552708b..5929078b28 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";
+import { acceptance, logIn } from "helpers/qunit-helpers";
 acceptance("Search");
 
-test("search", (assert) => {
+QUnit.test("search", (assert) => {
   visit("/");
 
   click('#search-button');
@@ -25,29 +25,41 @@ test("search", (assert) => {
   });
 });
 
-test("search scope checkbox", () => {
+QUnit.test("search for a tag", (assert) => {
+  visit("/");
+
+  click('#search-button');
+
+  fillIn('#search-term', 'evil');
+  keyEvent('#search-term', 'keyup', 16);
+  andThen(() => {
+    assert.ok(exists('.search-menu .results ul li'), 'it shows results');
+  });
+});
+
+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');
@@ -73,3 +85,57 @@ test("Search with context", assert => {
     assert.ok(!$('.search-context input[type=checkbox]').is(":checked"));
   });
 });
+
+QUnit.test("Right filters are shown to anonymous users", assert => {
+  const inSelector = selectKit('.select-kit#in');
+
+  visit("/search?expanded=true");
+
+  inSelector.expand();
+
+  andThen(() => {
+    assert.ok(inSelector.rowByValue('first').exists());
+    assert.ok(inSelector.rowByValue('pinned').exists());
+    assert.ok(inSelector.rowByValue('unpinned').exists());
+    assert.ok(inSelector.rowByValue('wiki').exists());
+    assert.ok(inSelector.rowByValue('images').exists());
+
+    assert.notOk(inSelector.rowByValue('unseen').exists());
+    assert.notOk(inSelector.rowByValue('posted').exists());
+    assert.notOk(inSelector.rowByValue('watching').exists());
+    assert.notOk(inSelector.rowByValue('tracking').exists());
+    assert.notOk(inSelector.rowByValue('bookmarks').exists());
+
+    assert.notOk(exists('.search-advanced-options .in-likes'));
+    assert.notOk(exists('.search-advanced-options .in-private'));
+    assert.notOk(exists('.search-advanced-options .in-seen'));
+  });
+});
+
+QUnit.test("Right filters are shown to logged-in users", assert => {
+  const inSelector = selectKit('.select-kit#in');
+
+  logIn();
+  Discourse.reset();
+  visit("/search?expanded=true");
+
+  inSelector.expand();
+
+  andThen(() => {
+    assert.ok(inSelector.rowByValue('first').exists());
+    assert.ok(inSelector.rowByValue('pinned').exists());
+    assert.ok(inSelector.rowByValue('unpinned').exists());
+    assert.ok(inSelector.rowByValue('wiki').exists());
+    assert.ok(inSelector.rowByValue('images').exists());
+
+    assert.ok(inSelector.rowByValue('unseen').exists());
+    assert.ok(inSelector.rowByValue('posted').exists());
+    assert.ok(inSelector.rowByValue('watching').exists());
+    assert.ok(inSelector.rowByValue('tracking').exists());
+    assert.ok(inSelector.rowByValue('bookmarks').exists());
+
+    assert.ok(exists('.search-advanced-options .in-likes'));
+    assert.ok(exists('.search-advanced-options .in-private'));
+    assert.ok(exists('.search-advanced-options .in-seen'));
+  });
+});
diff --git a/test/javascripts/acceptance/sign-in-test.js.es6 b/test/javascripts/acceptance/sign-in-test.js.es6
index 21403770ba..12d77228a5 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 26bc4e594b..97592dbd4a 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 e20c0afade..559b9ff926 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 c24cbee8d1..ca7a745a94 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 831968a21c..f077e99fca 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 c0767e8282..458c3471a0 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-edit-timer-test.js.es6 b/test/javascripts/acceptance/topic-edit-timer-test.js.es6
new file mode 100644
index 0000000000..569639d810
--- /dev/null
+++ b/test/javascripts/acceptance/topic-edit-timer-test.js.es6
@@ -0,0 +1,190 @@
+import { acceptance } from 'helpers/qunit-helpers';
+acceptance('Topic - Edit timer', { loggedIn: true });
+
+QUnit.test('default', assert => {
+  const timerType = selectKit('.select-kit.timer-type');
+  const futureDateInputSelector = selectKit('.future-date-input-selector');
+
+  visit('/t/internationalization-localization');
+  click('.toggle-admin-menu');
+  click('.topic-admin-status-update button');
+
+  andThen(() => {
+    assert.equal(futureDateInputSelector.header().title(), 'Select a timeframe');
+    assert.equal(futureDateInputSelector.header().value(), null);
+  });
+
+  click('#private-topic-timer');
+
+  andThen(() => {
+    assert.equal(timerType.header().title(), 'Remind Me');
+    assert.equal(timerType.header().value(), 'reminder');
+
+    assert.equal(futureDateInputSelector.header().title(), 'Select a timeframe');
+    assert.equal(futureDateInputSelector.header().value(), null);
+  });
+});
+
+QUnit.test('autoclose - specific time', assert => {
+  const futureDateInputSelector = selectKit('.future-date-input-selector');
+
+  visit('/t/internationalization-localization');
+  click('.toggle-admin-menu');
+  click('.topic-admin-status-update button');
+
+  futureDateInputSelector.expand().selectRowByValue('next_week');
+
+  andThen(() => {
+    assert.equal(futureDateInputSelector.header().title(), 'Next week');
+    assert.equal(futureDateInputSelector.header().value(), 'next_week');
+
+    const regex = /will automatically close in/g;
+    const html = find('.future-date-input .topic-status-info').html().trim();
+    assert.ok(regex.test(html));
+  });
+});
+
+QUnit.test('autoclose', assert => {
+  const futureDateInputSelector = selectKit('.future-date-input-selector');
+
+  visit('/t/internationalization-localization');
+  click('.toggle-admin-menu');
+  click('.topic-admin-status-update button');
+
+  futureDateInputSelector.expand().selectRowByValue('next_week');
+
+  andThen(() => {
+    assert.equal(futureDateInputSelector.header().title(), 'Next week');
+    assert.equal(futureDateInputSelector.header().value(), 'next_week');
+
+    const regex = /will automatically close in/g;
+    const html = find('.future-date-input .topic-status-info').html().trim();
+    assert.ok(regex.test(html));
+  });
+
+  futureDateInputSelector.expand().selectRowByValue('pick_date_and_time');
+
+  fillIn('.future-date-input .date-picker', '2099-11-24');
+
+  andThen(() => {
+    assert.equal(futureDateInputSelector.header().title(), 'Pick date and time');
+    assert.equal(futureDateInputSelector.header().value(), 'pick_date_and_time');
+
+    const regex = /will automatically close in/g;
+    const html = find('.future-date-input .topic-status-info').html().trim();
+    assert.ok(regex.test(html));
+  });
+
+  futureDateInputSelector.expand().selectRowByValue('set_based_on_last_post');
+
+  fillIn('.future-date-input input[type=number]', '2');
+
+  andThen(() => {
+    assert.equal(futureDateInputSelector.header().title(), 'Close based on last post');
+    assert.equal(futureDateInputSelector.header().value(), 'set_based_on_last_post');
+
+    const regex = /This topic will close.*after the last reply/g;
+    const html = find('.future-date-input .topic-status-info').html().trim();
+    assert.ok(regex.test(html));
+  });
+});
+
+QUnit.test('close temporarily', assert => {
+  const timerType = selectKit('.select-kit.timer-type');
+  const futureDateInputSelector = selectKit('.future-date-input-selector');
+
+  visit('/t/internationalization-localization');
+  click('.toggle-admin-menu');
+  click('.topic-admin-status-update button');
+
+  timerType.expand().selectRowByValue('open');
+
+  andThen(() => {
+    assert.equal(futureDateInputSelector.header().title(), 'Select a timeframe');
+    assert.equal(futureDateInputSelector.header().value(), null);
+  });
+
+  futureDateInputSelector.expand().selectRowByValue('next_week');
+
+  andThen(() => {
+    assert.equal(futureDateInputSelector.header().title(), 'Next week');
+    assert.equal(futureDateInputSelector.header().value(), 'next_week');
+
+    const regex = /will automatically open in/g;
+    const html = find('.future-date-input .topic-status-info').html().trim();
+    assert.ok(regex.test(html));
+  });
+
+  futureDateInputSelector.expand().selectRowByValue('pick_date_and_time');
+
+  fillIn('.future-date-input .date-picker', '2099-11-24');
+
+  andThen(() => {
+    assert.equal(futureDateInputSelector.header().title(), 'Pick date and time');
+    assert.equal(futureDateInputSelector.header().value(), 'pick_date_and_time');
+
+    const regex = /will automatically open in/g;
+    const html = find('.future-date-input .topic-status-info').html().trim();
+    assert.ok(regex.test(html));
+  });
+});
+
+QUnit.test('schedule', assert => {
+  const timerType = selectKit('.select-kit.timer-type');
+  const categoryChooser = selectKit('.modal-body .category-chooser');
+  const futureDateInputSelector = selectKit('.future-date-input-selector');
+
+  visit('/t/internationalization-localization');
+  click('.toggle-admin-menu');
+  click('.topic-admin-status-update button');
+
+  timerType.expand().selectRowByValue('publish_to_category');
+
+  andThen(() => {
+    assert.equal(categoryChooser.header().title(), 'uncategorized');
+    assert.equal(categoryChooser.header().value(), null);
+
+    assert.equal(futureDateInputSelector.header().title(), 'Select a timeframe');
+    assert.equal(futureDateInputSelector.header().value(), null);
+  });
+
+  categoryChooser.expand().selectRowByValue('7');
+
+  futureDateInputSelector.expand().selectRowByValue('next_week');
+
+  andThen(() => {
+    assert.equal(futureDateInputSelector.header().title(), 'Next week');
+    assert.equal(futureDateInputSelector.header().value(), 'next_week');
+
+    const regex = /will be published to #dev/g;
+    const text = find('.future-date-input .topic-status-info').text().trim();
+    assert.ok(regex.test(text));
+  });
+});
+
+QUnit.test('auto delete', assert => {
+  const timerType = selectKit('.select-kit.timer-type');
+  const futureDateInputSelector = selectKit('.future-date-input-selector');
+
+  visit('/t/internationalization-localization');
+  click('.toggle-admin-menu');
+  click('.topic-admin-status-update button');
+
+  timerType.expand().selectRowByValue('delete');
+
+  andThen(() => {
+    assert.equal(futureDateInputSelector.header().title(), 'Select a timeframe');
+    assert.equal(futureDateInputSelector.header().value(), null);
+  });
+
+  futureDateInputSelector.expand().selectRowByValue('two_weeks');
+
+  andThen(() => {
+    assert.equal(futureDateInputSelector.header().title(), 'Two Weeks');
+    assert.equal(futureDateInputSelector.header().value(), 'two_weeks');
+
+    const regex = /will be automatically deleted/g;
+    const html = find('.future-date-input .topic-status-info').html().trim();
+    assert.ok(regex.test(html));
+  });
+});
diff --git a/test/javascripts/acceptance/topic-notifications-button-test.js.es6 b/test/javascripts/acceptance/topic-notifications-button-test.js.es6
index 4689b86bb0..4fe8877595 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,32 +16,25 @@ acceptance("Topic Notifications button", {
   }
 });
 
-test("Updating topic notification level", () => {
+QUnit.test("Updating topic notification level", assert => {
+  const notificationOptions = selectKit("#topic-footer-buttons .topic-notifications-options");
+
   visit("/t/internationalization-localization/280");
 
-  const notificationOptions = "#topic-footer-buttons .notification-options";
-
   andThen(() => {
-    ok(
-      exists(`${notificationOptions} .tracking`),
+    assert.ok(
+      notificationOptions.exists(),
       "it should display the notification options button in the topic's footer"
     );
   });
 
-  click(`${notificationOptions} .tracking`);
-  click(`${notificationOptions} .dropdown-menu .watching`);
+  notificationOptions.expand().selectRowByValue("3");
 
   andThen(() => {
-    ok(
-      exists(`${notificationOptions} .watching`),
+    assert.equal(
+      notificationOptions.selectedRow().name(),
+      "Watching",
       "it should display the right notification level"
     );
-
-    // TODO: tgxworld I can't figure out why the topic timeline doesn't show when
-    // running the tests in phantomjs
-    // ok(
-    //   exists(".timeline-footer-controls .notification-options .watching"),
-    //   'it should display the right notification level in topic timeline'
-    // );
   });
 });
diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js.es6
index 10843ea169..b84afe844f 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,38 +30,40 @@ 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');
+  click('#topic-title .d-icon-pencil');
 
   andThen(() => {
-    ok(exists('#edit-title'), 'it shows the editing controls');
+    assert.ok(exists('#edit-title'), 'it shows the editing controls');
+    assert.ok(!exists('.title-wrapper .remove-featured-link'), 'link to remove featured link is not shown');
   });
 
   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 => {
+  const categoryChooser = selectKit('.title-wrapper .category-chooser');
+
   visit("/t/internationalization-localization/280");
-  click('#topic-title .fa-pencil');
 
+  click('#topic-title .d-icon-pencil');
   fillIn('#edit-title', 'this is the new title');
-  selectDropdown('.category-combobox', 4);
-
+  categoryChooser.expand().selectRowByValue(4);
   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 +75,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 +83,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(
-      find('.category-combobox').select2('data').text, "feature",
+    assert.equal(
+      selectKit('.category-chooser').header().value(), "2",
       "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 +123,79 @@ 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("Visit topic routes", assert => {
+  visit("/t/12");
+
+  andThen(() => {
+    assert.equal(
+      find('.fancy-title').text().trim(), 'PM for testing',
+      'it routes to the right topic'
+    );
+  });
+
+  visit("/t/280/20");
+
+  andThen(() => {
+    assert.equal(
+      find('.fancy-title').text().trim(), 'Internationalization / localization',
+      'it routes to the right topic'
+    );
+  });
+});
+
+QUnit.test("Updating the topic title with emojis", assert => {
+  visit("/t/internationalization-localization/280");
+  click('#topic-title .d-icon-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');
+  });
+});
+
+acceptance("Topic featured links", {
+  loggedIn: true,
+  settings: {
+    topic_featured_link_enabled: true,
+    max_topic_title_length: 80
+  }
+});
+
+QUnit.test("remove featured link", assert => {
+  visit("/t/299/1");
+  andThen(() => {
+    assert.ok(exists('.title-wrapper .topic-featured-link'), 'link is shown with topic title');
+  });
+
+  click('.title-wrapper .edit-topic');
+  andThen(() => {
+    assert.ok(exists('.title-wrapper .remove-featured-link'), 'link to remove featured link');
+  });
+
+  // this test only works in a browser:
+  // click('.title-wrapper .remove-featured-link');
+  // click('.title-wrapper .submit-edit');
+  // andThen(() => {
+  //   assert.ok(!exists('.title-wrapper .topic-featured-link'), 'link is gone');
+  // });
+});
diff --git a/test/javascripts/acceptance/unknown-test.js.es6 b/test/javascripts/acceptance/unknown-test.js.es6
index 148d8d2eef..541df10e1f 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 ae9b7c149f..91f3c62c75 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 4a4d7288bf..e19d96836b 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 84269cbe08..261a9b6632 100644
--- a/test/javascripts/acceptance/user-test.js.es6
+++ b/test/javascripts/acceptance/user-test.js.es6
@@ -2,32 +2,45 @@ 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");
+  });
+});
+
+QUnit.test("Viewing Summary", assert => {
+  visit("/u/eviltrout/summary");
+  andThen(() => {
+    assert.ok(exists('.replies-section li a'), 'replies');
+    assert.ok(exists('.topics-section li a'), 'topics');
+    assert.ok(exists('.links-section li a'), 'links');
+    assert.ok(exists('.replied-section .user-info'), 'liked by');
+    assert.ok(exists('.liked-by-section .user-info'), 'liked by');
+    assert.ok(exists('.liked-section .user-info'), 'liked');
+    assert.ok(exists('.badges-section .badge-card'), 'badges');
   });
 });
diff --git a/test/javascripts/acceptance/users-test.js.es6 b/test/javascripts/acceptance/users-test.js.es6
index eb89741d25..427225a774 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 2c70b5b12f..4146897093 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 f58845ecfc..112ef64d04 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 e735ec9456..e15a2b904f 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');
   });
 });
diff --git a/test/javascripts/admin/models/theme-test.js.es6 b/test/javascripts/admin/models/theme-test.js.es6
index 88d9d62947..4a16c584c8 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 76aa436ff3..e831da6eb5 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,26 @@ 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');
   }
 });
+
+componentTest('sql editor', {
+  template: '{{ace-editor mode="sql" content="SELECT * FROM users"}}',
+  test(assert) {
+    assert.expect(1);
+    assert.ok(this.$('.ace_editor').length, 'it renders the ace editor');
+  }
+});
+
+componentTest('disabled editor', {
+  template: '{{ace-editor mode="sql" content="SELECT * FROM users" disabled=true}}',
+  test(assert) {
+    const $ace = this.$('.ace_editor');
+    assert.expect(3);
+    assert.ok($ace.length, 'it renders the ace editor');
+    assert.equal($ace.parent().data().editor.getReadOnly(), true, 'it sets ACE to read-only mode');
+    assert.equal($ace.parent().attr('data-disabled'), "true", 'ACE wrapper has `data-disabled` attribute set to true');
+  }
+});
diff --git a/test/javascripts/components/categories-admin-dropdown-test.js.es6 b/test/javascripts/components/categories-admin-dropdown-test.js.es6
new file mode 100644
index 0000000000..124a4fa856
--- /dev/null
+++ b/test/javascripts/components/categories-admin-dropdown-test.js.es6
@@ -0,0 +1,19 @@
+import componentTest from 'helpers/component-test';
+moduleForComponent('categories-admin-dropdown', {integration: true});
+
+componentTest('default', {
+  template: '{{categories-admin-dropdown}}',
+
+  test(assert) {
+    const subject = selectKit();
+
+    assert.equal(subject.el().find(".d-icon-bars").length, 1);
+    assert.equal(subject.el().find(".d-icon-caret-down").length, 1);
+
+    subject.expand();
+
+    andThen(() => {
+      assert.equal(subject.rowByValue("create").name(), "New Category");
+    });
+  }
+});
diff --git a/test/javascripts/components/category-chooser-test.js.es6 b/test/javascripts/components/category-chooser-test.js.es6
new file mode 100644
index 0000000000..bb129c872b
--- /dev/null
+++ b/test/javascripts/components/category-chooser-test.js.es6
@@ -0,0 +1,137 @@
+import componentTest from 'helpers/component-test';
+
+moduleForComponent('category-chooser', {
+  integration: true,
+  beforeEach: function() {
+    this.set('subject', selectKit());
+  }
+});
+
+componentTest('with value', {
+  template: '{{category-chooser value=2}}',
+
+  test(assert) {
+    andThen(() => {
+      assert.equal(this.get('subject').header().value(), 2);
+      assert.equal(this.get('subject').header().title(), 'feature');
+    });
+  }
+});
+
+componentTest('with excludeCategoryId', {
+  template: '{{category-chooser excludeCategoryId=2}}',
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => assert.notOk(this.get('subject').rowByValue(2).exists()));
+  }
+});
+
+componentTest('with scopedCategoryId', {
+  template: '{{category-chooser scopedCategoryId=2}}',
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').rowByIndex(0).title(), 'feature');
+      assert.equal(this.get('subject').rowByIndex(0).value(), 2);
+      assert.equal(this.get('subject').rowByIndex(1).title(), 'spec');
+      assert.equal(this.get('subject').rowByIndex(1).value(), 26);
+      assert.equal(this.get('subject').rows().length, 2);
+    });
+  }
+});
+
+componentTest('with allowUncategorized=null', {
+  template: '{{category-chooser allowUncategorized=null}}',
+
+  beforeEach() {
+    this.siteSettings.allow_uncategorized_topics = false;
+  },
+
+  test(assert) {
+    andThen(() => {
+      assert.equal(this.get('subject').header().value(), null);
+      assert.equal(this.get('subject').header().title(), "Select a category&hellip;");
+    });
+  }
+});
+
+componentTest('with allowUncategorized=null rootNone=true', {
+  template: '{{category-chooser allowUncategorized=null rootNone=true}}',
+
+  beforeEach() {
+    this.siteSettings.allow_uncategorized_topics = false;
+  },
+
+  test(assert) {
+    andThen(() => {
+      assert.equal(this.get('subject').header().value(), null);
+      assert.equal(this.get('subject').header().title(), 'Select a category&hellip;');
+    });
+  }
+});
+
+componentTest('with disallowed uncategorized, rootNone and rootNoneLabel', {
+  template: '{{category-chooser allowUncategorized=null rootNone=true rootNoneLabel="test.root"}}',
+
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = { root: 'root none label' };
+    this.siteSettings.allow_uncategorized_topics = false;
+  },
+
+  test(assert) {
+    andThen(() => {
+      assert.equal(this.get('subject').header().value(), null);
+      assert.equal(this.get('subject').header().title(), 'Select a category&hellip;');
+    });
+  }
+});
+
+componentTest('with allowed uncategorized', {
+  template: '{{category-chooser allowUncategorized=true}}',
+
+  beforeEach() {
+    this.siteSettings.allow_uncategorized_topics = true;
+  },
+
+  test(assert) {
+    andThen(() => {
+      assert.equal(this.get('subject').header().value(), null);
+      assert.equal(this.get('subject').header().title(), 'uncategorized');
+    });
+  }
+});
+
+componentTest('with allowed uncategorized and rootNone', {
+  template: '{{category-chooser allowUncategorized=true rootNone=true}}',
+
+  beforeEach() {
+    this.siteSettings.allow_uncategorized_topics = true;
+  },
+
+  test(assert) {
+    andThen(() => {
+      assert.equal(this.get('subject').header().value(), null);
+      assert.equal(this.get('subject').header().title(), '(no category)');
+    });
+  }
+});
+
+componentTest('with allowed uncategorized rootNone and rootNoneLabel', {
+  template: '{{category-chooser allowUncategorized=true rootNone=true rootNoneLabel="test.root"}}',
+
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = { root: 'root none label' };
+    this.siteSettings.allow_uncategorized_topics = true;
+  },
+
+  test(assert) {
+    andThen(() => {
+      assert.equal(this.get('subject').header().value(), null);
+      assert.equal(this.get('subject').header().title(), 'root none label');
+    });
+  }
+});
diff --git a/test/javascripts/components/category-selector-test.js.es6 b/test/javascripts/components/category-selector-test.js.es6
new file mode 100644
index 0000000000..ff35b7817b
--- /dev/null
+++ b/test/javascripts/components/category-selector-test.js.es6
@@ -0,0 +1,87 @@
+import componentTest from 'helpers/component-test';
+import Category from "discourse/models/category";
+
+moduleForComponent('category-selector', {
+  integration: true,
+  beforeEach: function() {
+    this.set('subject', selectKit());
+  }
+});
+
+componentTest('default', {
+  template: '{{category-selector categories=categories}}',
+
+  beforeEach() {
+    this.set('categories', [ Category.findById(2) ]);
+  },
+
+  test(assert) {
+    andThen(() => {
+      assert.equal(this.get('subject').header().value(), 2);
+      assert.notOk(
+        this.get('subject').rowByValue(2).exists(),
+        "selected categories are not in the list"
+      );
+    });
+  }
+});
+
+componentTest('with blacklist', {
+  template: '{{category-selector categories=categories blacklist=blacklist}}',
+
+  beforeEach() {
+    this.set('categories', [ Category.findById(2) ]);
+    this.set('blacklist', [ Category.findById(8) ]);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.ok(
+        this.get('subject').rowByValue(6).exists(),
+        "not blacklisted categories are in the list"
+      );
+      assert.notOk(
+        this.get('subject').rowByValue(8).exists(),
+        "blacklisted categories are not in the list"
+      );
+    });
+  }
+});
+
+componentTest('interactions', {
+  template: '{{category-selector categories=categories}}',
+
+  beforeEach() {
+    this.set('categories', [
+      Category.findById(2),
+      Category.findById(6)
+    ]);
+  },
+
+  test(assert) {
+    this.get('subject').expand().selectRowByValue(8);
+
+    andThen(() => {
+      assert.equal(
+        this.get('subject').header().value(),
+        '2,6,8',
+        'it adds the selected category'
+      );
+      assert.equal(this.get('categories').length, 3);
+    });
+
+    this.get('subject').keyboard().backspace();
+    this.get('subject').keyboard().backspace();
+
+    andThen(() => {
+      assert.equal(
+        this.get('subject').header().value(),
+        '2,6',
+        'it removes the last selected category'
+      );
+      assert.equal(this.get('categories').length, 2);
+    });
+  }
+});
diff --git a/test/javascripts/components/combo-box-test.js.es6 b/test/javascripts/components/combo-box-test.js.es6
index 39232362ff..e1237ccc3f 100644
--- a/test/javascripts/components/combo-box-test.js.es6
+++ b/test/javascripts/components/combo-box-test.js.es6
@@ -1,74 +1,194 @@
 import componentTest from 'helpers/component-test';
-moduleForComponent('combo-box', {integration: true});
+moduleForComponent('combo-box', {
+  integration: true,
+  beforeEach: function() {
+    this.set('subject', selectKit());
+  }
+});
 
-componentTest('with objects', {
-  template: '{{combo-box content=items value=value}}',
-  setup() {
+componentTest('default', {
+  template: '{{combo-box content=items}}',
+  beforeEach() {
     this.set('items', [{id: 1, name: 'hello'}, {id: 2, name: 'world'}]);
   },
 
   test(assert) {
-    assert.equal(this.get('value'), 1);
-    assert.ok(this.$('.combobox').length);
-    assert.equal(this.$("select option[value='1']").text(), 'hello');
-    assert.equal(this.$("select option[value='2']").text(), 'world');
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().name(), "hello");
+      assert.equal(this.get('subject').rowByValue(1).name(), "hello");
+      assert.equal(this.get('subject').rowByValue(2).name(), "world");
+    });
   }
 });
 
-componentTest('with objects and valueAttribute', {
+componentTest('with valueAttribute', {
   template: '{{combo-box content=items valueAttribute="value"}}',
-  setup() {
+  beforeEach() {
     this.set('items', [{value: 0, name: 'hello'}, {value: 1, name: 'world'}]);
   },
 
   test(assert) {
-    assert.ok(this.$('.combobox').length);
-    assert.equal(this.$("select option[value='0']").text(), 'hello');
-    assert.equal(this.$("select option[value='1']").text(), 'world');
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').rowByValue(0).name(), "hello");
+      assert.equal(this.get('subject').rowByValue(1).name(), "world");
+    });
   }
 });
 
-componentTest('with an array', {
+componentTest('with nameProperty', {
+  template: '{{combo-box content=items nameProperty="text"}}',
+  beforeEach() {
+    this.set('items', [{id: 0, text: 'hello'}, {id: 1, text: 'world'}]);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').rowByValue(0).name(), "hello");
+      assert.equal(this.get('subject').rowByValue(1).name(), "world");
+    });
+  }
+});
+
+componentTest('with an array as content', {
   template: '{{combo-box content=items value=value}}',
-  setup() {
+  beforeEach() {
     this.set('items', ['evil', 'trout', 'hat']);
   },
 
   test(assert) {
-    assert.equal(this.get('value'), 'evil');
-    assert.ok(this.$('.combobox').length);
-    assert.equal(this.$("select option[value='evil']").text(), 'evil');
-    assert.equal(this.$("select option[value='trout']").text(), 'trout');
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').rowByValue('evil').name(), "evil");
+      assert.equal(this.get('subject').rowByValue('trout').name(), "trout");
+    });
   }
 });
 
-componentTest('with none', {
+componentTest('with value and none as a string', {
   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']);
+    this.set('value', 'trout');
   },
 
   test(assert) {
-    assert.equal(this.$("select option:eq(0)").text(), 'none');
-    assert.equal(this.$("select option:eq(0)").val(), '');
-    assert.equal(this.$("select option:eq(1)").text(), 'evil');
-    assert.equal(this.$("select option:eq(2)").text(), 'trout');
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').noneRow().name(), 'none');
+      assert.equal(this.get('subject').rowByValue("evil").name(), "evil");
+      assert.equal(this.get('subject').rowByValue("trout").name(), "trout");
+      assert.equal(this.get('subject').header().name(), 'trout');
+      assert.equal(this.get('value'), 'trout');
+    });
+
+    this.get('subject').selectNoneRow();
+
+    andThen(() => {
+      assert.equal(this.get('value'), null);
+    });
   }
 });
 
-componentTest('with Object none', {
-  template: '{{combo-box content=items none=none value=value selected="something"}}',
-  setup() {
+componentTest('with value and none as an object', {
+  template: '{{combo-box content=items none=none value=value}}',
+  beforeEach() {
     this.set('none', { id: 'something', name: 'none' });
     this.set('items', ['evil', 'trout', 'hat']);
+    this.set('value', 'evil');
   },
 
   test(assert) {
-    assert.equal(this.get('value'), 'something');
-    assert.equal(this.$("select option:eq(0)").text(), 'none');
-    assert.equal(this.$("select option:eq(0)").val(), 'something');
-    assert.equal(this.$("select option:eq(1)").text(), 'evil');
-    assert.equal(this.$("select option:eq(2)").text(), 'trout');
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').noneRow().name(), 'none');
+      assert.equal(this.get('subject').rowByValue("evil").name(), "evil");
+      assert.equal(this.get('subject').rowByValue("trout").name(), "trout");
+      assert.equal(this.get('subject').header().name(), 'evil');
+      assert.equal(this.get('value'), 'evil');
+    });
+
+    this.get('subject').selectNoneRow();
+
+    andThen(() => {
+      assert.equal(this.get('value'), null);
+    });
+  }
+});
+
+componentTest('with no value and none as an object', {
+  template: '{{combo-box content=items none=none value=value}}',
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = {none: 'none'};
+    this.set('none', { id: 'something', name: 'none' });
+    this.set('items', ['evil', 'trout', 'hat']);
+    this.set('value', null);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().name(), 'none');
+    });
+  }
+});
+
+componentTest('with no value and none string', {
+  template: '{{combo-box content=items none=none value=value}}',
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = {none: 'none'};
+    this.set('none', 'test.none');
+    this.set('items', ['evil', 'trout', 'hat']);
+    this.set('value', null);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().name(), 'none');
+    });
+  }
+});
+
+componentTest('with no value and no none', {
+  template: '{{combo-box content=items value=value}}',
+  beforeEach() {
+    this.set('items', ['evil', 'trout', 'hat']);
+    this.set('value', null);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().name(), 'evil', 'it sets the first row as value');
+    });
+  }
+});
+
+componentTest('with empty string as value', {
+  template: '{{combo-box content=items value=value}}',
+  beforeEach() {
+    this.set('items', ['evil', 'trout', 'hat']);
+    this.set('value', '');
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().name(), 'evil', 'it sets the first row as value');
+    });
   }
 });
diff --git a/test/javascripts/components/d-button-test.js.es6 b/test/javascripts/components/d-button-test.js.es6
new file mode 100644
index 0000000000..d283da4f21
--- /dev/null
+++ b/test/javascripts/components/d-button-test.js.es6
@@ -0,0 +1,31 @@
+import componentTest from 'helpers/component-test';
+moduleForComponent('d-button', {integration: true});
+
+componentTest('icon only button', {
+  template: '{{d-button icon="plus" tabindex="3"}}',
+
+  test(assert) {
+    assert.ok(this.$('button.btn.btn-icon.no-text').length, 'it has all the classes');
+    assert.ok(this.$('button .d-icon.d-icon-plus').length, 'it has the icon');
+    assert.equal(this.$('button').attr('tabindex'), "3", 'it has the tabindex');
+  }
+});
+
+componentTest('icon and text button', {
+  template: '{{d-button icon="plus" label="topic.create"}}',
+
+  test(assert) {
+    assert.ok(this.$('button.btn.btn-icon-text').length, 'it has all the classes');
+    assert.ok(this.$('button .d-icon.d-icon-plus').length, 'it has the icon');
+    assert.ok(this.$('button span.d-button-label').length, 'it has the label');
+  }
+});
+
+componentTest('text only button', {
+  template: '{{d-button label="topic.create"}}',
+
+  test(assert) {
+    assert.ok(this.$('button.btn.btn-text').length, 'it has all the classes');
+    assert.ok(this.$('button span.d-button-label').length, 'it has the label');
+  }
+});
diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js.es6
index cddd81828d..cf3dfdfcd1 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,84 @@ 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");
+    });
+  }
+});
+
+componentTest("quote button - selecting empty lines", {
+  template: '{{d-editor value=value composerEvents=true}}',
+  beforeEach() {
+    this.set('value', "one\n\n\n\ntwo");
+  },
+  test(assert) {
+    const textarea = jumpEnd(this.$('textarea.d-editor-input')[0]);
+
+    andThen(() => {
+      textarea.selectionStart = 6;
+      textarea.selectionEnd = 10;
+    });
+
+    click('button.quote');
+    andThen(() => {
+      assert.equal(this.get('value'), "one\n\n\n> \n> two");
+    });
+  }
+});
+
 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) {
@@ -658,66 +712,6 @@ testCase(`list button with line sequence`, function(assert, textarea) {
   });
 });
 
-testCase(`heading button with no selection`, function(assert, textarea) {
-  const example = I18n.t('composer.heading_text');
-
-  click(`button.heading`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello world.\n\n## ${example}`);
-    assert.equal(textarea.selectionStart, 14);
-    assert.equal(textarea.selectionEnd, 17 + example.length);
-  });
-
-  textarea.selectionStart = 30;
-  textarea.selectionEnd = 30;
-  click(`button.heading`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello world.\n\n${example}`);
-    assert.equal(textarea.selectionStart, 14);
-    assert.equal(textarea.selectionEnd, 14 + example.length);
-  });
-});
-
-testCase(`rule between things`, function(assert, textarea) {
-  textarea.selectionStart = 5;
-  textarea.selectionEnd = 5;
-
-  click(`button.rule`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello\n\n----------\n world.`);
-    assert.equal(textarea.selectionStart, 18);
-    assert.equal(textarea.selectionEnd, 18);
-  });
-});
-
-testCase(`rule with no selection`, function(assert, textarea) {
-  click(`button.rule`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello world.\n\n----------\n`);
-    assert.equal(textarea.selectionStart, 25);
-    assert.equal(textarea.selectionEnd, 25);
-  });
-
-  click(`button.rule`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello world.\n\n----------\n\n\n----------\n`);
-    assert.equal(textarea.selectionStart, 38);
-    assert.equal(textarea.selectionEnd, 38);
-  });
-});
-
-testCase(`rule with a selection`, function(assert, textarea) {
-  textarea.selectionStart = 6;
-  textarea.selectionEnd = 11;
-
-  click(`button.rule`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello \n\n----------\n.`);
-    assert.equal(textarea.selectionStart, 19);
-    assert.equal(textarea.selectionEnd, 19);
-  });
-});
-
 testCase(`doesn't jump to bottom with long text`, function(assert, textarea) {
 
   let longText = 'hello world.';
@@ -740,7 +734,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 +749,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/d-icon-test.js.es6 b/test/javascripts/components/d-icon-test.js.es6
new file mode 100644
index 0000000000..d4f3d489aa
--- /dev/null
+++ b/test/javascripts/components/d-icon-test.js.es6
@@ -0,0 +1,21 @@
+import componentTest from 'helpers/component-test';
+
+moduleForComponent('d-icon', {integration: true});
+
+componentTest('default', {
+  template: '{{d-icon "bars"}}',
+
+  test(assert) {
+    const html = this.$().html().trim();
+    assert.equal(html, '<i class="fa fa-bars d-icon d-icon-bars"></i>');
+  }
+});
+
+componentTest('with replacement', {
+  template: '{{d-icon "d-watching"}}',
+
+  test(assert) {
+    const html = this.$().html().trim();
+    assert.equal(html, '<i class="fa fa-exclamation-circle d-icon d-icon-d-watching"></i>');
+  }
+});
diff --git a/test/javascripts/components/group-membership-button-test.js.es6 b/test/javascripts/components/group-membership-button-test.js.es6
index 930b7270b4..1937d38088 100644
--- a/test/javascripts/components/group-membership-button-test.js.es6
+++ b/test/javascripts/components/group-membership-button-test.js.es6
@@ -1,48 +1,82 @@
 moduleFor('component:group-membership-button');
 
-test('canJoinGroup', function() {
+QUnit.test('canJoinGroup', function(assert) {
   this.subject().setProperties({
-    model: { public: false }
+    model: { public_admission: false, is_group_user: true }
   });
 
-  equal(this.subject().get("canJoinGroup"), false, "non public group cannot be joined");
+  assert.equal(
+    this.subject().get("canJoinGroup"), false,
+    "can't join group if public_admission is false"
+  );
 
-  this.subject().set("model.public", true);
+  this.subject().set("model.public_admission", true);
 
-  equal(this.subject().get("canJoinGroup"), true, "public group can be joined");
+  assert.equal(
+    this.subject().get("canJoinGroup"), false,
+    "can't join group if user is already in the group"
+  );
 
-  this.subject().setProperties({ currentUser: null, model: { public: true } });
+  this.subject().set("model.is_group_user", false);
 
-  equal(this.subject().get("canJoinGroup"), true, "can't join group when not logged in");
+  assert.equal(
+    this.subject().get("canJoinGroup"), true,
+    "allowed to join group"
+  );
 });
 
-test('userIsGroupUser', function() {
+QUnit.test('canLeaveGroup', function(assert) {
+  this.subject().setProperties({
+    model: { public_exit: false, is_group_user: false }
+  });
+
+  assert.equal(
+    this.subject().get("canLeaveGroup"), false,
+    "can't leave group if public_exit is false"
+  );
+
+  this.subject().set("model.public_exit", true);
+
+  assert.equal(
+    this.subject().get("canLeaveGroup"), false,
+    "can't leave group if user is not in the group"
+  );
+
+  this.subject().set("model.is_group_user", true);
+
+  assert.equal(
+    this.subject().get("canLeaveGroup"), true,
+    "allowed to leave group"
+  );
+});
+
+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 745a8f3c24..642f35d543 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/list-setting-test.js.es6 b/test/javascripts/components/list-setting-test.js.es6
new file mode 100644
index 0000000000..b5592974a0
--- /dev/null
+++ b/test/javascripts/components/list-setting-test.js.es6
@@ -0,0 +1,85 @@
+import componentTest from 'helpers/component-test';
+
+moduleForComponent('list-setting', {integration: true});
+
+componentTest('default', {
+  template: '{{list-setting settingValue=settingValue choices=choices}}',
+
+  beforeEach() {
+    this.set('settingValue', 'bold|italic');
+    this.set('choices', ['bold', 'italic', 'underline']);
+  },
+
+  test(assert) {
+    andThen(() => {
+      assert.equal(selectKit().header().title(), 'bold,italic');
+      assert.equal(selectKit().header().value(), 'bold,italic');
+    });
+  }
+});
+
+componentTest('with empty string as value', {
+  template: '{{list-setting settingValue=settingValue}}',
+
+  beforeEach() {
+    this.set('settingValue', '');
+  },
+
+  test(assert) {
+    andThen(() => {
+      assert.equal(selectKit().header().value(), "");
+    });
+  }
+});
+
+componentTest('with only setting value', {
+  template: '{{list-setting settingValue=settingValue}}',
+
+  beforeEach() {
+    this.set('settingValue', 'bold|italic');
+  },
+
+  test(assert) {
+    andThen(() => {
+      assert.equal(selectKit().header().value(), 'bold,italic');
+    });
+  }
+});
+
+componentTest('interactions', {
+  template: '{{list-setting settingValue=settingValue choices=choices}}',
+
+  beforeEach() {
+    this.set('settingValue', 'bold|italic');
+    this.set('choices', ['bold', 'italic', 'underline']);
+  },
+
+  test(assert) {
+    const listSetting = selectKit();
+
+    listSetting.expand().selectRowByValue('underline');
+
+    andThen(() => {
+      assert.equal(listSetting.header().value(), 'bold,italic,underline');
+    });
+
+    listSetting.fillInFilter('strike');
+
+    andThen(() => {
+      assert.equal(listSetting.highlightedRow().value(), 'strike');
+    });
+
+    listSetting.keyboard().enter();
+
+    andThen(() => {
+      assert.equal(listSetting.header().value(), 'bold,italic,underline,strike');
+    });
+
+    listSetting.keyboard().backspace();
+    listSetting.keyboard().backspace();
+
+    andThen(() => {
+      assert.equal(listSetting.header().value(), 'bold,italic,underline');
+    });
+  }
+});
diff --git a/test/javascripts/components/multi-select-test.js.es6 b/test/javascripts/components/multi-select-test.js.es6
new file mode 100644
index 0000000000..1bb5f940be
--- /dev/null
+++ b/test/javascripts/components/multi-select-test.js.es6
@@ -0,0 +1,147 @@
+import componentTest from 'helpers/component-test';
+moduleForComponent('multi-select', {
+  integration: true,
+  beforeEach: function() {
+    this.set('subject', selectKit());
+  }
+});
+
+componentTest('with objects and values', {
+  template: '{{multi-select content=items values=values}}',
+
+  beforeEach() {
+    this.set('items', [{id: 1, name: 'hello'}, {id: 2, name: 'world'}]);
+    this.set('values', [1, 2]);
+  },
+
+  test(assert) {
+    andThen(() => {
+      assert.equal(this.get('subject').header().value(), '1,2');
+    });
+  }
+});
+
+componentTest('with title', {
+  template: '{{multi-select title=(i18n "test.title")}}',
+
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = {title: 'My title'};
+  },
+
+  test(assert) {
+    andThen(() => assert.equal(selectKit().header().title(), 'My title') );
+  }
+});
+
+
+componentTest('interactions', {
+  template: '{{multi-select none=none content=items values=values}}',
+
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = {none: 'none'};
+    this.set('items', [{id: 1, name: 'regis'}, {id: 2, name: 'sam'}, {id: 3, name: 'robin'}]);
+    this.set('values', [1, 2]);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(
+        this.get('subject').highlightedRow().name(),
+        'robin',
+        'it highlights the first content row'
+      );
+    });
+
+    this.set('none', 'test.none');
+
+    andThen(() => {
+      assert.ok(this.get('subject').noneRow().exists());
+      assert.equal(
+        this.get('subject').highlightedRow().name(),
+        'robin',
+        'it highlights the first content row'
+      );
+    });
+
+    this.get('subject').selectRowByValue(3);
+
+    andThen(() => {
+      assert.equal(
+        this.get('subject').highlightedRow().name(),
+        'none',
+        'it highlights none row if no content'
+      );
+    });
+
+    this.get('subject').fillInFilter('joffrey');
+
+    andThen(() => {
+      assert.equal(
+        this.get('subject').highlightedRow().name(),
+        'joffrey',
+        'it highlights create row when filling filter'
+      );
+    });
+
+    this.get('subject').keyboard().enter();
+
+    andThen(() => {
+      assert.equal(
+        this.get('subject').highlightedRow().name(),
+        'none',
+        'it highlights none row after creating content and no content left'
+      );
+    });
+
+    this.get('subject').keyboard().backspace();
+
+    andThen(() => {
+      const $lastSelectedName = this.get('subject').header().el().find('.selected-name').last();
+      assert.equal($lastSelectedName.attr('data-name'), 'joffrey');
+      assert.ok($lastSelectedName.hasClass('is-highlighted'), 'it highlights the last selected name when using backspace');
+    });
+
+    this.get('subject').keyboard().backspace();
+
+    andThen(() => {
+      const $lastSelectedName = this.get('subject').header().el().find('.selected-name').last();
+      assert.equal($lastSelectedName.attr('data-name'), 'robin', 'it removes the previous highlighted selected content');
+      assert.notOk(this.get('subject').rowByValue('joffrey').exists(), 'generated content shouldn’t appear in content when removed');
+    });
+
+    this.get('subject').keyboard().selectAll();
+
+    andThen(() => {
+      const $highlightedSelectedNames = this.get('subject').header().el().find('.selected-name.is-highlighted');
+      assert.equal($highlightedSelectedNames.length, 3, 'it highlights each selected name');
+    });
+
+    this.get('subject').keyboard().backspace();
+
+    andThen(() => {
+      const $selectedNames = this.get('subject').header().el().find('.selected-name');
+      assert.equal($selectedNames.length, 0, 'it removed all selected content');
+    });
+
+    andThen(() => {
+      assert.ok(this.get('subject').isFocused());
+      assert.ok(this.get('subject').isExpanded());
+    });
+
+    this.get('subject').keyboard().escape();
+
+    andThen(() => {
+      assert.ok(this.get('subject').isFocused());
+      assert.notOk(this.get('subject').isExpanded());
+    });
+
+    this.get('subject').keyboard().escape();
+
+    andThen(() => {
+      assert.notOk(this.get('subject').isFocused());
+      assert.notOk(this.get('subject').isExpanded());
+    });
+  }
+});
diff --git a/test/javascripts/components/pinned-options-test.js.es6 b/test/javascripts/components/pinned-options-test.js.es6
new file mode 100644
index 0000000000..87aafc07d2
--- /dev/null
+++ b/test/javascripts/components/pinned-options-test.js.es6
@@ -0,0 +1,40 @@
+import componentTest from 'helpers/component-test';
+import Topic from 'discourse/models/topic';
+
+const buildTopic = function() {
+  return Topic.create({
+    id: 1234,
+    title: "Qunit Test Topic",
+    deleted: false,
+    pinned: true
+  });
+};
+
+moduleForComponent('pinned-options', {
+  integration: true,
+  beforeEach: function() {
+    this.set('subject', selectKit());
+  }
+});
+
+componentTest('updating the content refreshes the list', {
+  template: '{{pinned-options value=pinned topic=topic}}',
+
+  beforeEach() {
+    this.siteSettings.automatically_unpin_topics = false;
+    this.set("topic", buildTopic());
+    this.set("pinned", true);
+  },
+
+  test(assert) {
+    andThen(() => {
+      assert.equal(this.get('subject').header().name(), "pinned");
+    });
+
+    andThen(() => this.set("pinned", false));
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().name(), "unpinned");
+    });
+  }
+});
diff --git a/test/javascripts/components/share-button-test.js.es6 b/test/javascripts/components/share-button-test.js.es6
new file mode 100644
index 0000000000..41d0fa8481
--- /dev/null
+++ b/test/javascripts/components/share-button-test.js.es6
@@ -0,0 +1,16 @@
+import componentTest from 'helpers/component-test';
+moduleForComponent('share-button', {integration: true});
+
+componentTest('share button', {
+  template: '{{share-button url="https://eviltrout.com"}}',
+
+  test(assert) {
+    assert.ok(this.$(`button.share`).length, 'it has all the classes');
+
+    assert.ok(
+      this.$(`button[data-share-url="https://eviltrout.com"]`).length,
+      'it has the data attribute for sharing'
+    );
+  }
+});
+
diff --git a/test/javascripts/components/single-select-test.js.es6 b/test/javascripts/components/single-select-test.js.es6
new file mode 100644
index 0000000000..f79b2b5182
--- /dev/null
+++ b/test/javascripts/components/single-select-test.js.es6
@@ -0,0 +1,534 @@
+import componentTest from 'helpers/component-test';
+import { withPluginApi } from 'discourse/lib/plugin-api';
+import { clearCallbacks } from 'select-kit/mixins/plugin-api';
+
+moduleForComponent('single-select', {
+  integration: true,
+  beforeEach: function() {
+    this.set('subject', selectKit());
+  }
+});
+
+componentTest('updating the content refreshes the list', {
+  template: '{{single-select value=1 content=content}}',
+
+  beforeEach() {
+    this.set("content", [{ id: 1, name: "BEFORE" }]);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').rowByValue(1).name(), "BEFORE");
+    });
+
+    andThen(() => {
+      this.set("content", [{ id: 1, name: "AFTER" }]);
+    });
+
+    andThen(() => {
+      assert.equal(this.get('subject').rowByValue(1).name(), "AFTER");
+    });
+  }
+});
+
+componentTest('accepts a value by reference', {
+  template: '{{single-select value=value content=content}}',
+
+  beforeEach() {
+    this.set("value", 1);
+    this.set("content", [{ id: 1, name: "robin" }, { id: 2, name: "regis" }]);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(
+        this.get('subject').selectedRow().name(), "robin",
+        "it highlights the row corresponding to the value"
+      );
+    });
+
+    this.get('subject').selectRowByValue(1);
+
+    andThen(() => {
+      assert.equal(this.get("value"), 1, "it mutates the value");
+    });
+  }
+});
+
+componentTest('no default icon', {
+  template: '{{single-select}}',
+
+  test(assert) {
+    assert.equal(
+      this.get('subject').header().icon().length,
+      0,
+      "it doesn’t have an icon if not specified"
+    );
+  }
+});
+
+componentTest('default search icon', {
+  template: '{{single-select filterable=true}}',
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.ok(exists(this.get('subject').filter().icon()), "it has an icon");
+    });
+  }
+});
+
+componentTest('with no search icon', {
+  template: '{{single-select filterable=true filterIcon=null}}',
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.notOk(exists(this.get('subject').filter().icon()), "it has no icon");
+    });
+  }
+});
+
+componentTest('custom search icon', {
+  template: '{{single-select filterable=true filterIcon="shower"}}',
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.ok(
+        this.get('subject').filter().icon().hasClass("fa-shower"),
+        "it has a the correct icon"
+      );
+    });
+  }
+});
+
+componentTest('is expandable', {
+  template: '{{single-select}}',
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => assert.ok(this.get('subject').isExpanded()) );
+
+    this.get('subject').collapse();
+
+    andThen(() => assert.notOk(this.get('subject').isExpanded()) );
+  }
+});
+
+componentTest('accepts custom value/name keys', {
+  template: '{{single-select value=value nameProperty="item" content=content valueAttribute="identifier"}}',
+
+  beforeEach() {
+    this.set("value", 1);
+    this.set("content", [{ identifier: 1, item: "robin" }]);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').selectedRow().name(), "robin");
+    });
+  }
+});
+
+componentTest('doesn’t render collection content before first expand', {
+  template: '{{single-select value=1 content=content}}',
+
+  beforeEach() {
+    this.set("content", [{ value: 1, name: "robin" }]);
+  },
+
+  test(assert) {
+    assert.notOk(exists(find(".select-kit-collection")));
+
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.ok(exists(find(".select-kit-collection")));
+    });
+  }
+});
+
+componentTest('supports options to limit size', {
+  template: '{{single-select collectionHeight=20 content=content}}',
+
+  beforeEach() {
+    this.set("content", ["robin", "régis"]);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      const height = find(".select-kit-collection").height();
+      assert.equal(parseInt(height, 10), 20, "it limits the height");
+    });
+  }
+});
+
+componentTest('dynamic headerText', {
+  template: '{{single-select value=1 content=content}}',
+
+  beforeEach() {
+    this.set("content", [{ id: 1, name: "robin" }, { id: 2, name: "regis" }]);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().name(), 'robin');
+    });
+
+    this.get('subject').selectRowByValue(2);
+
+    andThen(() => {
+      assert.equal(
+        this.get('subject').header().name(),
+        'regis',
+        'it changes header text'
+      );
+    });
+  }
+});
+
+componentTest('supports custom row template', {
+  template: '{{single-select content=content templateForRow=templateForRow}}',
+
+  beforeEach() {
+    this.set("content", [{ id: 1, name: "robin" }]);
+    this.set("templateForRow", rowComponent => {
+      return `<b>${rowComponent.get("computedContent.name")}</b>`;
+    });
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(
+        this.get('subject').rowByValue(1).el().html().trim(), "<b>robin</b>"
+      );
+    });
+  }
+});
+
+componentTest('supports converting select value to integer', {
+  template: '{{single-select value=value content=content castInteger=true}}',
+
+  beforeEach() {
+    this.set('value', 2);
+    this.set('content', [{ id: '1', name: 'robin'}, {id: '2', name: 'régis' }]);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => assert.equal(this.get('subject').selectedRow().name(), 'régis') );
+
+    andThen(() => {
+      this.set('value', 1);
+    });
+
+    andThen(() => {
+      assert.equal(
+        this.get('subject').selectedRow().name(),
+        'robin',
+        'it works with dynamic content'
+      );
+    });
+  }
+});
+
+componentTest('supports keyboard events', {
+  template: '{{single-select content=content filterable=true}}',
+
+  beforeEach() {
+    this.set("content", [{ id: 1, name: "robin" }, { id: 2, name: "regis" }]);
+  },
+
+  test(assert) {
+    this.get('subject').expand().keyboard().down();
+
+    andThen(() => {
+      assert.equal(this.get('subject').highlightedRow().title(), "regis", "the next row is highlighted");
+    });
+
+    this.get('subject').keyboard().down();
+
+    andThen(() => {
+      assert.equal(this.get('subject').highlightedRow().title(), "robin", "it returns to the first row");
+    });
+
+    this.get('subject').keyboard().up();
+
+    andThen(() => {
+      assert.equal(this.get('subject').highlightedRow().title(), "regis", "it highlights the last row");
+    });
+
+    this.get('subject').keyboard().enter();
+
+    andThen(() => {
+      assert.equal(this.get('subject').selectedRow().title(), "regis", "it selects the row when pressing enter");
+      assert.notOk(this.get('subject').isExpanded(), "it collapses the select box when selecting a row");
+    });
+
+    this.get('subject').expand().keyboard().escape();
+
+    andThen(() => {
+      assert.notOk(this.get('subject').isExpanded(), "it collapses the select box");
+    });
+
+    this.get('subject').expand().fillInFilter('regis').keyboard().tab();
+
+    andThen(() => {
+      assert.notOk(this.get('subject').isExpanded(), "it collapses the select box when selecting a row");
+    });
+  }
+});
+
+
+componentTest('with allowInitialValueMutation', {
+  template: '{{single-select value=value content=content allowInitialValueMutation=true}}',
+
+  beforeEach() {
+    this.set("value", "");
+    this.set("content", [{ id: "1", name: "robin"}, {id: "2", name: "régis" }]);
+  },
+
+  test(assert) {
+    andThen(() => {
+      assert.equal(this.get("value"), "1", "it mutates the value on initial rendering");
+    });
+  }
+});
+
+componentTest('support appending content through plugin api', {
+  template: '{{single-select content=content}}',
+
+  beforeEach() {
+    withPluginApi('0.8.13', api => {
+      api.modifySelectKit('select-kit')
+         .appendContent([{ id: '2', name: 'regis'}]);
+    });
+
+    this.set('content', [{ id: '1', name: 'robin'}]);
+  },
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').rows().length, 2);
+      assert.equal(this.get('subject').rowByIndex(1).name(), 'regis');
+    });
+
+    andThen(() => clearCallbacks());
+  }
+});
+
+componentTest('support modifying content through plugin api', {
+  template: '{{single-select content=content}}',
+
+  beforeEach() {
+    withPluginApi('0.8.13', api => {
+      api.modifySelectKit("select-kit")
+         .modifyContent((context, existingContent) => {
+           existingContent.splice(1, 0, { id: "2", name: "sam" });
+           return existingContent;
+         });
+    });
+
+    this.set("content", [{ id: "1", name: "robin"}, { id: "3", name: "regis"}]);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').rows().length, 3);
+      assert.equal(this.get('subject').rowByIndex(1).name(), "sam");
+    });
+
+    andThen(() => clearCallbacks());
+  }
+});
+
+componentTest('support prepending content through plugin api', {
+  template: '{{single-select content=content}}',
+
+  beforeEach() {
+    withPluginApi('0.8.13', api => {
+      api.modifySelectKit("select-kit")
+         .prependContent([{ id: "2", name: "regis"}]);
+    });
+
+    this.set("content", [{ id: "1", name: "robin"}]);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').rows().length, 2);
+      assert.equal(this.get('subject').rowByIndex(0).name(), "regis");
+    });
+
+    andThen(() => clearCallbacks());
+  }
+});
+
+componentTest('support modifying on select behavior through plugin api', {
+  template: '<span class="on-select-test"></span>{{single-select content=content}}',
+
+  beforeEach() {
+    withPluginApi('0.8.13', api => {
+      api
+        .modifySelectKit("select-kit")
+        .onSelect((context, value) => {
+          find(".on-select-test").html(value);
+        });
+    });
+
+    this.set("content", [{ id: "1", name: "robin"}]);
+  },
+
+  test(assert) {
+    this.get('subject').expand().selectRowByValue(1);
+
+    andThen(() => {
+      assert.equal(find(".on-select-test").html(), "1");
+    });
+
+    andThen(() => clearCallbacks());
+  }
+});
+
+componentTest('with nameChanges', {
+  template: '{{single-select content=content nameChanges=true}}',
+
+  beforeEach() {
+    this.set("robin", { id: "1", name: "robin"});
+    this.set("content", [this.get("robin")]);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().name(), "robin");
+    });
+
+    andThen(() => {
+      this.set("robin.name", "robin2");
+    });
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().name(), "robin2");
+    });
+  }
+});
+
+
+componentTest('with null value', {
+  template: '{{single-select content=content}}',
+
+  beforeEach() {
+    this.set("content", [{ name: "robin" }]);
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().name(), "robin");
+      assert.equal(this.get('subject').header().value(), undefined);
+    });
+  }
+});
+
+componentTest('with collection header', {
+  template: '{{single-select collectionHeader=collectionHeader}}',
+
+  beforeEach() {
+    this.set("collectionHeader", "<h2>Hello</h2>");
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => assert.ok(exists(".collection-header h2")));
+  }
+});
+
+componentTest('with onToggle', {
+  template: '{{single-select onToggle=onToggle}}',
+
+  beforeEach() {
+    this.set("onToggle", () => $(".select-kit").append("<span class='onToggleTest'></span>"));
+  },
+
+  test(assert) {
+    andThen(() => assert.notOk(exists(".onToggleTest")));
+
+    this.get('subject').expand();
+
+    andThen(() => assert.ok(exists(".onToggleTest")));
+  }
+});
+
+componentTest('with onExpand', {
+  template: '{{single-select onExpand=onExpand}}',
+
+  beforeEach() {
+    this.set("onExpand", () => $(".select-kit").append("<span class='onExpandTest'></span>"));
+  },
+
+  test(assert) {
+    andThen(() => assert.notOk(exists(".onExpandTest")));
+
+    this.get('subject').expand();
+
+    andThen(() => assert.ok(exists(".onExpandTest")));
+  }
+});
+
+componentTest('with onCollapse', {
+  template: '{{single-select onCollapse=onCollapse}}',
+
+  beforeEach() {
+    this.set("onCollapse", () => $(".select-kit").append("<span class='onCollapseTest'></span>"));
+  },
+
+  test(assert) {
+    andThen(() => assert.notOk(exists(".onCollapseTest")));
+
+    this.get('subject').expand();
+
+    andThen(() => assert.notOk(exists(".onCollapseTest")));
+
+    this.get('subject').collapse();
+
+    andThen(() => assert.ok(exists(".onCollapseTest")));
+  }
+});
+
+componentTest('with title', {
+  template: '{{single-select title=(i18n "test.title")}}',
+
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = {title: 'My title'};
+  },
+
+  test(assert) {
+    andThen(() => assert.equal(this.get('subject').header().title(), 'My title') );
+  }
+});
diff --git a/test/javascripts/components/text-field-test.js.es6 b/test/javascripts/components/text-field-test.js.es6
index 81b0660052..e18662c2ab 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/topic-footer-mobile-dropdown-test.js.es6 b/test/javascripts/components/topic-footer-mobile-dropdown-test.js.es6
new file mode 100644
index 0000000000..3bdd8ec4fc
--- /dev/null
+++ b/test/javascripts/components/topic-footer-mobile-dropdown-test.js.es6
@@ -0,0 +1,44 @@
+import componentTest from 'helpers/component-test';
+import Topic from 'discourse/models/topic';
+
+const buildTopic = function() {
+  return Topic.create({
+    id: 1234,
+    title: 'Qunit Test Topic'
+  });
+};
+
+moduleForComponent('topic-footer-mobile-dropdown', {
+  integration: true,
+  beforeEach: function() {
+    this.set('subject', selectKit());
+  }
+});
+
+componentTest('default', {
+  template: '{{topic-footer-mobile-dropdown topic=topic}}',
+  beforeEach() {
+    this.set('topic', buildTopic());
+  },
+
+  test(assert) {
+    this.get('subject').expand();
+
+    andThen(() => {
+      assert.equal(this.get('subject').header().title(), 'Topic Controls');
+      assert.equal(this.get('subject').header().value(), null);
+      assert.equal(this.get('subject').rowByIndex(0).name(), 'Bookmark');
+      assert.equal(this.get('subject').rowByIndex(1).name(), 'Share');
+      assert.notOk(
+        this.get('subject').selectedRow().exists(),
+        'it doesn’t preselect first row'
+      );
+    });
+
+    this.get('subject').selectRowByValue('share');
+
+    andThen(() => {
+      assert.equal(this.get('value'), null, 'it resets the value');
+    });
+  }
+});
diff --git a/test/javascripts/components/topic-notifications-button-test.js.es6 b/test/javascripts/components/topic-notifications-button-test.js.es6
new file mode 100644
index 0000000000..8dac873939
--- /dev/null
+++ b/test/javascripts/components/topic-notifications-button-test.js.es6
@@ -0,0 +1,34 @@
+import componentTest from 'helpers/component-test';
+import Topic from 'discourse/models/topic';
+
+const buildTopic = function(level) {
+  return Topic.create({
+    id: 4563,
+    title: "Qunit Test Topic",
+    details: {
+      notification_level: level
+    }
+  });
+};
+
+moduleForComponent('topic-notifications-button', { integration: true });
+
+componentTest('the header has a localized title', {
+  template: '{{topic-notifications-button notificationLevel=topic.details.notification_level topic=topic}}',
+
+  beforeEach() {
+    this.set("topic", buildTopic(1));
+  },
+
+  test(assert) {
+    andThen(() => {
+      assert.equal(selectKit().header().name(), "Normal", "it has the correct title");
+    });
+
+    this.set("topic", buildTopic(2));
+
+    andThen(() => {
+      assert.equal(selectKit().header().name(), "Tracking", "it correctly changes the title");
+    });
+  }
+});
diff --git a/test/javascripts/components/value-list-test.js.es6 b/test/javascripts/components/value-list-test.js.es6
index 7bb9599eec..feefcbea07 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 e80e50d6f3..01d77cb5ee 100644
--- a/test/javascripts/controllers/admin-group-test.js.es6
+++ b/test/javascripts/controllers/admin-group-test.js.es6
@@ -1,33 +1,41 @@
-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_admission: 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);
+  this.subject().set("model.public_admission", true);
 
-  equal(this.subject().get("disableMembershipRequestSetting"), true, "it should disalbe setting");
+  assert.equal(
+    this.subject().get("disableMembershipRequestSetting"), true,
+    "it should disable setting"
+  );
 });
diff --git a/test/javascripts/controllers/avatar-selector-test.js.es6 b/test/javascripts/controllers/avatar-selector-test.js.es6
index 00514303f4..ce26c62163 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 11a9045a13..f5604d8169 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
deleted file mode 100644
index 9036808245..0000000000
--- a/test/javascripts/controllers/flag-test.js.es6
+++ /dev/null
@@ -1,104 +0,0 @@
-import createStore from 'helpers/create-store';
-import AdminUser from 'admin/models/admin-user';
-import { mapRoutes } from 'discourse/mapping-router';
-
-var buildPost = function(args) {
-  return Discourse.Post.create(_.merge({
-    id: 1,
-    can_delete: true,
-    version: 1
-  }, args || {}));
-};
-
-var buildAdminUser = function(args) {
-  return AdminUser.create(_.merge({
-    id: 11,
-    username: 'urist'
-  }, args || {}));
-};
-
-moduleFor("controller:flag", "controller:flag", {
-  setup() {
-    this.registry.register('router:main', mapRoutes());
-  },
-  needs: ['controller:modal']
-});
-
-test("canDeleteSpammer not staff", function(){
-  const store = createStore();
-
-  var flagController = this.subject({ model: buildPost() });
-  sandbox.stub(Discourse.User, 'currentProp').withArgs('staff').returns(false);
-
-  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');
-});
-
-var canDeleteSpammer = function(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);
-};
-
-test("canDeleteSpammer spam not selected", function(){
-  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');
-});
-
-test("canDeleteSpammer spam selected", function(){
-  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');
-
-  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');
-
-  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');
-
-  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');
-});
-
-test("canSendWarning not staff", function(){
-  const store = createStore();
-
-  var flagController = this.subject({ model: buildPost() });
-  sandbox.stub(Discourse.User, 'currentProp').withArgs('staff').returns(false);
-
-  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');
-});
-
-var canSendWarning = function(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);
-};
-
-test("canSendWarning notify_user not selected", function(){
-  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');
-});
-
-test("canSendWarning notify_user selected", function(){
-  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');
-});
diff --git a/test/javascripts/controllers/group-test.js.es6 b/test/javascripts/controllers/group-test.js.es6
index 822b14dd42..a5defd2d14 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 fc8bbe1f5c..11fe31a27e 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 a8e3609e34..804d819a90 100644
--- a/test/javascripts/controllers/topic-test.js.es6
+++ b/test/javascripts/controllers/topic-test.js.es6
@@ -1,128 +1,318 @@
-import { blank, present } from 'helpers/qunit-helpers';
-import { mapRoutes } from 'discourse/mapping-router';
+import AppEvents from "discourse/lib/app-events";
+import Topic from "discourse/models/topic";
 
-moduleFor('controller:topic', 'controller:topic', {
-  needs: ['controller:modal', 'controller:composer', 'controller:application'],
-  setup() {
-    this.registry.register('router:main', mapRoutes());
-  },
+moduleFor("controller:topic", "controller:topic", {
+  needs: ["controller:composer", "controller:application"],
+  beforeEach() {
+    this.registry.register("app-events:main", AppEvents.create(), { instantiate: false });
+    this.registry.injection("controller", "appEvents", "app-events:main");
+  }
 });
 
-import Topic from 'discourse/models/topic';
-import AppEvents from 'discourse/lib/app-events';
+QUnit.test("editTopic", function(assert) {
+  const model = Topic.create();
+  const controller = this.subject({ model });
 
-var buildTopic = function() {
-  return Topic.create({
-    title: "Qunit Test Topic",
-    participants: [
-      {id: 1234,
-       post_count: 4,
-       username: "eviltrout"}
-    ]
-  });
-};
+  assert.not(controller.get("editingTopic"), "we are not editing by default");
 
+  controller.set("model.details.can_edit", false);
+  controller.send("editTopic");
 
-test("editingMode", function() {
-  var topic = buildTopic(),
-      topicController = this.subject({model: topic});
+  assert.not(controller.get("editingTopic"), "calling editTopic doesn't enable editing unless the user can edit");
 
-  ok(!topicController.get('editingTopic'), "we are not editing by default");
+  controller.set("model.details.can_edit", true);
+  controller.send("editTopic");
 
-  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(controller.get("editingTopic"), "calling editTopic enables editing if the user can edit");
+  assert.equal(controller.get("buffered.title"), model.get("title"));
+  assert.equal(controller.get("buffered.category_id"), model.get("category_id"));
 
-  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'));
+  controller.send("cancelEditingTopic");
 
-  topicController.send('cancelEditingTopic');
-  ok(!topicController.get('editingTopic'), "cancelling edit mode reverts the property value");
+  assert.not(controller.get("editingTopic"), "cancelling edit mode reverts the property value");
 });
 
-test("toggledSelectedPost", function() {
-  var tc = this.subject({ model: buildTopic() }),
-      post = Discourse.Post.create({id: 123, post_number: 2}),
-      postStream = tc.get('model.postStream');
+QUnit.test("toggleMultiSelect", function(assert) {
+  const model = Topic.create();
+  const controller = this.subject({ model });
 
-  postStream.appendPost(post);
-  postStream.appendPost(Discourse.Post.create({id: 124, post_number: 3}));
+  assert.not(controller.get("multiSelect"), "multi selection mode is disabled by default");
 
-  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");
+  controller.get("selectedPostIds").pushObject(1);
+  assert.equal(controller.get("selectedPostIds.length"), 1);
 
-  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");
+  controller.send("toggleMultiSelect");
 
-  tc.send('toggledSelectedPost', post);
-  ok(!tc.postSelected(post), "the post is no longer selected");
+  assert.ok(controller.get("multiSelect"), "calling 'toggleMultiSelect' once enables multi selection mode");
+  assert.equal(controller.get("selectedPostIds.length"), 0, "toggling 'multiSelect' clears 'selectedPostIds'");
 
+  controller.get("selectedPostIds").pushObject(2);
+  assert.equal(controller.get("selectedPostIds.length"), 1);
+
+  controller.send("toggleMultiSelect");
+
+  assert.not(controller.get("multiSelect"), "calling 'toggleMultiSelect' twice disables multi selection mode");
+  assert.equal(controller.get("selectedPostIds.length"), 0, "toggling 'multiSelect' clears 'selectedPostIds'");
 });
 
-test("selectAll", function() {
-  var tc = this.subject({model: buildTopic(), appEvents: AppEvents.create()}),
-      post = Discourse.Post.create({id: 123, post_number: 2}),
-      postStream = tc.get('model.postStream');
+QUnit.test("selectedPosts", function(assert) {
+  const postStream = { posts: [{ id: 1 }, { id: 2 }, { id: 3 }] };
+  const model = Topic.create({ postStream });
+  const controller = this.subject({ model });
 
-  postStream.appendPost(post);
-
-  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");
-  tc.send('deselectAll');
-  ok(!tc.postSelected(post), "the post is deselected again");
-  ok(!tc.get('allPostsSelected'), "all posts are not selected");
+  controller.set("selectedPostIds", [1, 2, 42]);
 
+  assert.equal(controller.get("selectedPosts.length"), 2, "selectedPosts only contains already loaded posts");
+  assert.not(controller.get("selectedPosts").some(p => p === undefined), "selectedPosts only contains valid post objects");
 });
 
-test("Automating setting of allPostsSelected", function() {
-  var topic = buildTopic(),
-      tc = this.subject({model: topic}),
-      post = Discourse.Post.create({id: 123, post_number: 2}),
-      postStream = tc.get('model.postStream');
+QUnit.test("selectedAllPosts", function(assert) {
+  const postStream = { stream: [1, 2, 3] };
+  const model = Topic.create({ postStream });
+  const controller = this.subject({ model });
 
-  topic.set('posts_count', 1);
-  postStream.appendPost(post);
-  ok(!tc.get('allPostsSelected'), "all posts are not selected by default");
+  controller.set("selectedPostIds", [1, 2]);
 
-  tc.send('toggledSelectedPost', post);
-  ok(tc.get('allPostsSelected'), "all posts are selected if we select the only post");
+  assert.not(controller.get("selectedAllPosts"), "not all posts are selected");
 
-  tc.send('toggledSelectedPost', post);
-  ok(!tc.get('allPostsSelected'), "the posts are no longer automatically selected");
+  controller.get("selectedPostIds").pushObject(3);
+
+  assert.ok(controller.get("selectedAllPosts"), "all posts are selected");
+
+  controller.get("selectedPostIds").pushObject(42);
+
+  assert.ok(controller.get("selectedAllPosts"), "all posts (including filtered posts) are selected");
 });
 
-test("Select Replies when present", function() {
-  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});
+QUnit.test("selectedPostsUsername", function(assert) {
+  const postStream = {
+    posts: [
+      { id: 1, username: "gary" },
+      { id: 2, username: "gary" },
+      { id: 3, username: "lili" },
+    ],
+    stream: [1, 2, 3]
+  };
 
-  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");
+  const model = Topic.create({ postStream });
+  const controller = this.subject({ model });
+  const selectedPostIds = controller.get("selectedPostIds");
 
-  // 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.equal(controller.get("selectedPostsUsername"), undefined, "no username when no selected posts");
 
-  // 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");
+  selectedPostIds.pushObject(1);
 
+  assert.equal(controller.get("selectedPostsUsername"), "gary", "username of the selected posts");
+
+  selectedPostIds.pushObject(2);
+
+  assert.equal(controller.get("selectedPostsUsername"), "gary", "username of all the selected posts when same user");
+
+  selectedPostIds.pushObject(3);
+
+  assert.equal(controller.get("selectedPostsUsername"), undefined, "no username when more than 1 user");
+
+  selectedPostIds.replace(2, 1, [42]);
+
+  assert.equal(controller.get("selectedPostsUsername"), undefined, "no username when not already loaded posts are selected");
+});
+
+QUnit.test("showSelectedPostsAtBottom", function(assert) {
+  const site = Ember.Object.create({ mobileView: false });
+  const model = Topic.create({ posts_count: 3 });
+  const controller = this.subject({ model, site });
+
+  assert.not(controller.get("showSelectedPostsAtBottom"), "false on desktop");
+
+  site.set("mobileView", true);
+
+  assert.not(controller.get("showSelectedPostsAtBottom"), "requires at least 3 posts on mobile");
+
+  model.set("posts_count", 4);
+
+  assert.ok(controller.get("showSelectedPostsAtBottom"), "true when mobile and more than 3 posts");
+});
+
+QUnit.test("canDeleteSelected", function(assert) {
+  const postStream = {
+    posts: [
+      { id: 1, can_delete: false },
+      { id: 2, can_delete: true },
+      { id: 3, can_delete: true }
+    ],
+    stream: [1, 2, 3]
+  };
+
+  const model = Topic.create({ postStream });
+  const controller = this.subject({ model });
+  const selectedPostIds = controller.get("selectedPostIds");
+
+  assert.not(controller.get("canDeleteSelected"), "false when no posts are selected");
+
+  selectedPostIds.pushObject(1);
+
+  assert.not(controller.get("canDeleteSelected"), "false when can't delete one of the selected posts");
+
+  selectedPostIds.replace(0, 1, [2, 3]);
+
+  assert.ok(controller.get("canDeleteSelected"), "true when all selected posts can be deleted");
+
+  selectedPostIds.pushObject(1);
+
+  assert.ok(controller.get("canDeleteSelected"), "true when all posts are selected");
+});
+
+QUnit.test("Can split/merge topic", function(assert) {
+  const postStream = {
+    posts: [{ id: 1 }, { id: 2 }],
+    stream: [1, 2]
+  };
+
+  const model = Topic.create({ postStream, details: { can_move_posts: false } });
+  const controller = this.subject({ model });
+  const selectedPostIds = controller.get("selectedPostIds");
+
+  assert.not(controller.get("canSplitTopic"), "can't split topic when no posts are selected");
+  assert.not(controller.get("canMergeTopic"), "can't merge topic when no posts are selected");
+
+  selectedPostIds.pushObject(1);
+
+  assert.not(controller.get("canSplitTopic"), "can't split topic when can't move posts");
+  assert.not(controller.get("canMergeTopic"), "can't merge topic when can't move posts");
+
+  model.set("details.can_move_posts", true);
+
+  assert.ok(controller.get("canSplitTopic"), "can split topic");
+  assert.ok(controller.get("canMergeTopic"), "can merge topic");
+
+  selectedPostIds.pushObject(2);
+
+  assert.not(controller.get("canSplitTopic"), "can't split topic when all posts are selected");
+  assert.ok(controller.get("canMergeTopic"), "can merge topic when all posts are selected");
+});
+
+QUnit.test("canChangeOwner", function(assert) {
+  const currentUser = Discourse.User.create({ admin: false });
+  this.registry.register("current-user:main", currentUser, { instantiate: false });
+  this.registry.injection("controller", "currentUser", "current-user:main");
+
+  const postStream = {
+    posts: [
+      { id: 1, username: "gary" },
+      { id: 2, username: "lili" },
+    ],
+    stream: [1, 2]
+  };
+
+  const model = Topic.create({ postStream, currentUser: { admin: false }});
+  const controller = this.subject({ model });
+  const selectedPostIds = controller.get("selectedPostIds");
+
+  assert.not(controller.get("canChangeOwner"), "false when no posts are selected");
+
+  selectedPostIds.pushObject(1);
+
+  assert.not(controller.get("canChangeOwner"), "false when not admin");
+
+  currentUser.set("admin", true);
+
+  assert.ok(controller.get("canChangeOwner"), "true when admin and one post is selected");
+
+  selectedPostIds.pushObject(2);
+
+  assert.not(controller.get("canChangeOwner"), "false when admin but more than 1 user");
+});
+
+QUnit.test("canMergePosts", function(assert) {
+  const postStream = {
+    posts: [
+      { id: 1, username: "gary", can_delete: true },
+      { id: 2, username: "lili", can_delete: true },
+      { id: 3, username: "gary", can_delete: false },
+      { id: 4, username: "gary", can_delete: true },
+    ],
+    stream: [1, 2, 3]
+  };
+
+  const model = Topic.create({ postStream });
+  const controller = this.subject({ model });
+  const selectedPostIds = controller.get("selectedPostIds");
+
+  assert.not(controller.get("canMergePosts"), "false when no posts are selected");
+
+  selectedPostIds.pushObject(1);
+
+  assert.not(controller.get("canMergePosts"), "false when only one post is selected");
+
+  selectedPostIds.pushObject(2);
+
+  assert.not(controller.get("canMergePosts"), "false when selected posts are from different users");
+
+  selectedPostIds.replace(1, 1, [3]);
+
+  assert.not(controller.get("canMergePosts"), "false when selected posts can't be deleted");
+
+  selectedPostIds.replace(1, 1, [4]);
+
+  assert.ok(controller.get("canMergePosts"), "true when all selected posts are deletable and by the same user");
+});
+
+QUnit.test("Select/deselect all", function(assert) {
+  const postStream = { stream: [1, 2, 3] };
+  const model = Topic.create({ postStream });
+  const controller = this.subject({ model });
+
+  assert.equal(controller.get("selectedPostsCount"), 0, "no posts selected by default");
+
+  controller.send("selectAll");
+
+  assert.equal(controller.get("selectedPostsCount"), postStream.stream.length, "calling 'selectAll' selects all posts");
+
+  controller.send("deselectAll");
+
+  assert.equal(controller.get("selectedPostsCount"), 0, "calling 'deselectAll' deselects all posts");
+});
+
+QUnit.test("togglePostSelection", function(assert) {
+  const controller = this.subject();
+  const selectedPostIds = controller.get("selectedPostIds");
+
+  assert.equal(selectedPostIds[0], undefined, "no posts selected by default");
+
+  controller.send("togglePostSelection", { id: 1 });
+
+  assert.equal(selectedPostIds[0], 1, "adds the selected post id if not already selected");
+
+  controller.send("togglePostSelection", { id: 1 });
+
+  assert.equal(selectedPostIds[0], undefined, "removes the selected post id if already selected");
+});
+
+// QUnit.test("selectReplies", function(assert) {
+//   const controller = this.subject();
+//   const selectedPostIds = controller.get("selectedPostIds");
+//
+//   assert.equal(selectedPostIds[0], undefined, "no posts selected by default");
+//
+//   controller.send("selectReplies", { id: 42 });
+//
+//   assert.equal(selectedPostIds[0], 42, "selected post #42");
+//   assert.equal(selectedPostIds[1], 45, "selected post #45");
+//   assert.equal(selectedPostIds[2], 100, "selected post #100");
+// });
+
+QUnit.test("selectBelow", function(assert) {
+  const postStream = { stream: [1, 2, 3, 4, 5] };
+  const model = Topic.create({ postStream });
+  const controller = this.subject({ model });
+  const selectedPostIds = controller.get("selectedPostIds");
+
+  assert.equal(selectedPostIds[0], undefined, "no posts selected by default");
+
+  controller.send("selectBelow", { id: 3 });
+
+  assert.equal(selectedPostIds[0], 3, "selected post #3");
+  assert.equal(selectedPostIds[1], 4, "also selected 1st post below post #3");
+  assert.equal(selectedPostIds[2], 5, "also selected 2nd post below post #3");
 });
 
diff --git a/test/javascripts/ember/resolver-test.js.es6 b/test/javascripts/ember/resolver-test.js.es6
index 648729d6bd..85424065ec 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/group-fixtures.js.es6 b/test/javascripts/fixtures/group-fixtures.js.es6
index a55d8303cb..07cb5ef9f5 100644
--- a/test/javascripts/fixtures/group-fixtures.js.es6
+++ b/test/javascripts/fixtures/group-fixtures.js.es6
@@ -6,11 +6,14 @@ export default {
       "name":"discourse",
       "full_name":"Awesome Team",
       "user_count":8,
-      "alias_level":0,
+      "alias_level":99,
       "visible":true,
-      "public":true,
+      "public_admission":true,
+      "public_exit":false,
       "flair_url": 'fa-adjust',
-      "is_group_owner":true
+      "is_group_owner":true,
+      "mentionable":true,
+      "messageable":true
     }
   },
   "/groups/discourse/counts.json":{
diff --git a/test/javascripts/fixtures/groups-fixtures.js.es6 b/test/javascripts/fixtures/groups-fixtures.js.es6
index 1baa42b560..79f47e64cb 100644
--- a/test/javascripts/fixtures/groups-fixtures.js.es6
+++ b/test/javascripts/fixtures/groups-fixtures.js.es6
@@ -1,3 +1,3 @@
 export default {
-  "/groups.json": {"groups":[{"id":41,"automatic":false,"name":"discourse","user_count":0,"alias_level":0,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":"","bio_cooked":null,"public":true,"allow_membership_requests":false,"full_name":"Awesome Team"},{"id":42,"automatic":false,"name":"Macdonald","user_count":0,"alias_level":99,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":true,"full_name":null}],"extras":{"group_user_ids":[]},"total_rows_groups":2,"load_more_groups":"/groups?page=1"}
+  "/groups.json": {"groups":[{"id":41,"automatic":false,"name":"discourse","user_count":0,"alias_level":0,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":"","bio_cooked":null,"public_admission":true,"allow_membership_requests":false,"full_name":"Awesome Team"},{"id":42,"automatic":false,"name":"Macdonald","user_count":0,"alias_level":99,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public_admission":false,"allow_membership_requests":true,"membership_request_template":"Please add me","full_name":null}],"extras":{"group_user_ids":[]},"total_rows_groups":2,"load_more_groups":"/groups?page=1"}
 }
diff --git a/test/javascripts/fixtures/search-fixtures.js.es6 b/test/javascripts/fixtures/search-fixtures.js.es6
index f979f3d78b..a0b8e22bda 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/fixtures/site-fixtures.js.es6 b/test/javascripts/fixtures/site-fixtures.js.es6
index 9745c86a5d..4c22c04f0c 100644
--- a/test/javascripts/fixtures/site-fixtures.js.es6
+++ b/test/javascripts/fixtures/site-fixtures.js.es6
@@ -2,6 +2,7 @@ export default {
   "site.json":{
     "site":{
       "default_archetype":"regular",
+      "disabled_plugins":[],
       "notification_types":{
         "mentioned":1,
         "replied":2,
diff --git a/test/javascripts/fixtures/topic.js.es6 b/test/javascripts/fixtures/topic.js.es6
index 5affc55f9e..3b8344c899 100644
--- a/test/javascripts/fixtures/topic.js.es6
+++ b/test/javascripts/fixtures/topic.js.es6
@@ -2,4 +2,5 @@
 export default {"/t/280/1.json": {"post_stream":{"posts":[{"id":398,"name":"Uwe Keim","username":"uwe_keim","avatar_template":"/images/avatar.png","uploaded_avatar_id":5697,"created_at":"2013-02-05T21:29:00.280Z","cooked":"<p>Any plans to support localization of UI elements, so that I (for example) could set up a completely German speaking forum?</p>","post_number":1,"post_type":1,"updated_at":"2013-02-05T21:29:00.280Z","like_count":0,"reply_count":1,"reply_to_post_number":null,"quote_count":0,"avg_time":25,"incoming_link_count":314,"reads":475,"score":1702.25,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Uwe Keim","primary_group_name":null,"version":1,"can_edit":true,"can_delete":false,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/language-mirrors/2378/2","internal":true,"reflection":true,"title":"Language mirrors","clicks":3},{"url":"https://meta.discourse.org/t/translation-workflow/6102","internal":true,"reflection":true,"title":"Translation workflow","clicks":2},{"url":"https://meta.discourse.org/t/solving-xda-developer-style-forums/4368/4","internal":true,"reflection":true,"title":"Solving XDA-Developer style forums","clicks":2},{"url":"https://meta.discourse.org/t/comrades-lets-join-our-efforts-on-ukrainian-and-russian-translations/4403/5","internal":true,"reflection":true,"title":"Comrades let's join our efforts on ukrainian and russian translations","clicks":1},{"url":"https://meta.discourse.org/t/bookmark-last-read-sometimes-doesn-t-go-to-the-end-of-a-topic/4825/9","internal":true,"reflection":true,"title":"Bookmark/last read sometimes doesn't go to the end of a topic","clicks":0},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/5","internal":true,"reflection":true,"title":"Roadplan for Discourse 2013","clicks":0}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":255,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":419,"name":"Tim Stone","username":"tms","avatar_template":"/images/avatar.png","uploaded_avatar_id":40181,"created_at":"2013-02-05T21:32:47.649Z","cooked":"<p>The application strings <a href=\"https://github.com/discourse/discourse/blob/master/config/locales/en.yml\" rel=\"nofollow\">are externalized</a>, so localization should be entirely possible with enough translation effort.</p>","post_number":2,"post_type":1,"updated_at":"2013-02-06T10:15:27.965Z","like_count":4,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":27,"incoming_link_count":16,"reads":460,"score":308.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Tim Stone","primary_group_name":null,"version":2,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales/en.yml","internal":false,"reflection":false,"clicks":118}],"read":true,"user_title":"Great contributor","actions_summary":[{"id":2,"count":4,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":9,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":1060,"name":"Jeff Atwood","username":"codinghorror","avatar_template":"/images/avatar.png","uploaded_avatar_id":5297,"created_at":"2013-02-06T02:26:24.922Z","cooked":"<p>Yep, all strings are going through a lookup table.*</p>\n\n<p><a href=\"https://github.com/discourse/discourse/blob/master/config/locales\">master/config/locales</a></p>\n\n<p>So you could replace that lookup table with the \"de\" one to get German.</p>\n\n<p><sub>* we didn't get all the strings into the lookup table for launch, but the vast, vast majority of them are and the ones that are not, we will fix as we go!</sub></p>","post_number":3,"post_type":1,"updated_at":"2014-02-24T05:23:39.211Z","like_count":4,"reply_count":3,"reply_to_post_number":null,"quote_count":0,"avg_time":33,"incoming_link_count":5,"reads":449,"score":191.45,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Jeff Atwood","primary_group_name":"discourse","version":4,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales","internal":false,"reflection":false,"title":"discourse/config/locales at master · discourse/discourse · GitHub","clicks":62},{"url":"https://meta.discourse.org/t/github-onebox-rendering-issue/7616","internal":true,"reflection":true,"title":"GitHub OneBox Rendering Issue","clicks":0}],"read":true,"user_title":"co-founder","actions_summary":[{"id":2,"count":4,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"admin":true,"staff":true,"user_id":32,"hidden":false,"hidden_reason_id":null,"trust_level":3,"deleted_at":null,"user_deleted":false,"edit_reason":"","can_view_edit_history":true,"wiki":false},{"id":3623,"name":"Shade","username":"shade","avatar_template":"/images/avatar.png","uploaded_avatar_id":8306,"created_at":"2013-02-07T12:55:33.129Z","cooked":"<p>Is it a coincidence that the strings file is 1337 lines long? <img src=\"/images/emoji/twitter/smiley.png\" title=\":smiley:\" class=\"emoji\" alt=\"smiley\" width=\"64\" height=\"64\"></p>","post_number":4,"post_type":1,"updated_at":"2013-02-07T12:55:33.129Z","like_count":7,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":20,"incoming_link_count":15,"reads":401,"score":291.2,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Shade","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/hi-support-chinese/4393/6","internal":true,"reflection":true,"title":"Hi, support Chinese?","clicks":0}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":7,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1808,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3651,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:02:07.869Z","cooked":"<p><aside class=\"quote\" data-post=\"3\" data-topic=\"280\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"/user_avatar/meta.discourse.org/codinghorror/40/5297.png\" class=\"avatar\">codinghorror said:</div>\n<blockquote><p>So you could replace that lookup table with the \"de\" one to get German.</p></blockquote></aside></p>\n\n<p>The problem I see here is that  this file is likely two grow and change massively over the next couple months, and tracking these changes in order to keep a localized file up to date is going to be a <em>bitch</em>. </p>\n\n<p>I wonder where there is a tool that can compare two yml structures and point out which nodes are missing? That would help keep track of new strings.</p>\n\n<p>Re keeping track of <em>changed</em> strings, <a class=\"mention\" href=\"/users/codinghorror\">@codinghorror</a> I found this very interesting: <a href=\"http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders\" rel=\"nofollow\">http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders</a> if plain English placeholders were used, any change in strings would lead to a <em>new</em> node in the yml file, making keeping the translation up to date easier. Maybe worth thinking about in the future.</p>","post_number":5,"post_type":1,"updated_at":"2013-02-07T14:05:42.328Z","like_count":2,"reply_count":2,"reply_to_post_number":3,"quote_count":1,"avg_time":22,"incoming_link_count":10,"reads":386,"score":213.3,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders","internal":false,"reflection":false,"title":"internationalization - Why do people use plain english as translation placeholders? - Stack Overflow","clicks":63}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":2,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3654,"name":"Sam Saffron","username":"sam","avatar_template":"/images/avatar.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:05:39.910Z","cooked":"<p>Yes, I really like the concept of fuzzy matching for localization, perhaps you can chase up <a href=\"https://github.com/SlexAxton\">alex sexton</a> he was meaning to upload a localization tool for this kind of stuff. </p>\n\n<p>Also, I am a big fan of <a href=\"https://github.com/SlexAxton/messageformat.js\">ICU message format</a>, but it is not the \"Rails way (tm)\". </p>","post_number":6,"post_type":1,"updated_at":"2013-02-07T14:05:39.910Z","like_count":1,"reply_count":1,"reply_to_post_number":5,"quote_count":0,"avg_time":17,"incoming_link_count":4,"reads":329,"score":106.65,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://github.com/SlexAxton/messageformat.js","internal":false,"reflection":false,"title":"SlexAxton/messageformat.js · GitHub","clicks":46},{"url":"https://github.com/SlexAxton","internal":false,"reflection":false,"title":"SlexAxton (Alex Sexton) · GitHub","clicks":10}],"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"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},{"id":3655,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:08:17.493Z","cooked":"<p>Looks interesting, I'll take a peek.</p>\n\n<p>As said on dev, the best tool I can see in terms of giving translators a proper interface <em>and</em> quality control would be something like <a href=\"http://translate.wordpress.org/projects/bbpress/dev\" rel=\"nofollow\">GlotPress</a>. It's based on the PO messages format (is that somehow related to ICU?) but looks pretty great.</p>\n\n<p><aside class=\"quote\" data-post=\"6\" data-topic=\"280\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"/user_avatar/meta.discourse.org/sam/40/5243.png\" class=\"avatar\">sam said:</div>\n<blockquote><p>fuzzy matching for localization</p></blockquote></aside></p>\n\n<p>I'm not familiar with the term in this context, you mean keeping the English version in the code base (instead of a generic code like <code>message_error_nametooshort</code> ?)</p>","post_number":7,"post_type":1,"updated_at":"2013-02-07T14:12:02.965Z","like_count":1,"reply_count":1,"reply_to_post_number":6,"quote_count":1,"avg_time":16,"incoming_link_count":0,"reads":326,"score":86.0,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://translate.wordpress.org/projects/bbpress/dev","internal":false,"reflection":false,"title":"WordPress › Development < GlotPress","clicks":16}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3658,"name":"Sam Saffron","username":"sam","avatar_template":"/images/avatar.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:12:22.582Z","cooked":"<p>ICU Message format is basically Gettext on steroids, Gettext has been around for so many years and actually works pretty well, being super prevalent in Linux. </p>\n\n<p>Trouble is you need a fuzzy matcher for translators if you are going to store stuff like <code>mf.compile( 'This is a message.' )</code> in source, one letter change and all your translators need to validate it.</p>","post_number":8,"post_type":1,"updated_at":"2013-02-07T14:12:22.582Z","like_count":1,"reply_count":1,"reply_to_post_number":7,"quote_count":0,"avg_time":11,"incoming_link_count":2,"reads":296,"score":89.75,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://meta.discourse.org/t/what-i-love-about-wordpress-plugins/5697","internal":true,"reflection":true,"title":"What I love about WordPress plugins","clicks":0}],"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"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},{"id":3660,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:14:12.666Z","cooked":"<p><aside class=\"quote\" data-post=\"8\" data-topic=\"280\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"/user_avatar/meta.discourse.org/sam/40/5243.png\" class=\"avatar\">sam said:</div>\n<blockquote><p>one letter change and all your translators need to validate it.</p></blockquote></aside></p>\n\n<p>Yeah, that's why I've always been a friend of <code>message_error_nametooshort</code> placeholders, until I asked the SO question linked above. The accepted answer makes a good argument against those placeholders: you <em>want</em> translations to break even on small changes in the English original because the translations will probably need to reflect the change, too.  Maybe that's not the case right now as new stuff is being checked in pretty much every couple of hours, but in the long run, it'll be overwhelmingly true.</p>","post_number":9,"post_type":1,"updated_at":"2013-02-07T14:18:09.569Z","like_count":1,"reply_count":1,"reply_to_post_number":8,"quote_count":1,"avg_time":10,"incoming_link_count":0,"reads":293,"score":79.1,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3667,"name":"Tim Stone","username":"tms","avatar_template":"/images/avatar.png","uploaded_avatar_id":40181,"created_at":"2013-02-07T14:25:16.859Z","cooked":"<p>Hmm...You could theoretically also build something into the development process that would monitor changes to the English locale file and make a translator-friendly list of changes between versions.</p>","post_number":10,"post_type":1,"updated_at":"2013-02-07T14:25:16.859Z","like_count":1,"reply_count":1,"reply_to_post_number":9,"quote_count":0,"avg_time":7,"incoming_link_count":0,"reads":275,"score":75.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Tim Stone","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"Great contributor","reply_to_user":{"username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":9,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3673,"name":"Sam Saffron","username":"sam","avatar_template":"/images/avatar.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T14:30:21.401Z","cooked":"<p>Yeah, totally, also we could build tools for dev that make introducing string less annoying and make it possible to garbage collect old unused strings, I hate trudging through that file.</p>","post_number":11,"post_type":1,"updated_at":"2013-02-07T14:30:21.401Z","like_count":1,"reply_count":1,"reply_to_post_number":10,"quote_count":0,"avg_time":7,"incoming_link_count":1,"reads":273,"score":79.95,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"co-founder","reply_to_user":{"username":"tms","avatar_template":"/images/avatar.png","uploaded_avatar_id":40181},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"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},{"id":3675,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T14:33:38.280Z","cooked":"<p><aside class=\"quote\" data-post=\"11\" data-topic=\"280\" data-full=\"true\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"/user_avatar/meta.discourse.org/sam/40/5243.png\" class=\"avatar\">sam said:</div>\n<blockquote><p>Yeah, totally, also we could build tools for dev that make introducing string less annoying and make it possible to garbage collect old unused strings, I hate trudging through that file.</p></blockquote></aside></p>\n\n<p>As said, I'd look into whether WP's tools can't be reused for this with some tweaking. They seem to be able to scan a code base for new strings, and make them available automatically to translators.</p>\n\n<p>They're PHP based which isn't ideal, but it looks like they've done a crapload of work to take the hassle out of translations.</p>","post_number":12,"post_type":1,"updated_at":"2013-02-07T14:34:39.910Z","like_count":1,"reply_count":1,"reply_to_post_number":11,"quote_count":1,"avg_time":7,"incoming_link_count":2,"reads":273,"score":84.95,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3690,"name":"Valts","username":"Vilx","avatar_template":"/images/avatar.png","uploaded_avatar_id":7299,"created_at":"2013-02-07T15:05:35.867Z","cooked":"<p>This site looks so nice with all the little tweaks like \"10 minutes ago\" instead of simply time, etc - I wonder if there will also be support for proper pluralization in other languages? That's a pretty hard task though, I don't think I've ever seen a website that has done that. But it would be <em>awesome</em>.</p>","post_number":13,"post_type":1,"updated_at":"2013-02-07T15:05:35.867Z","like_count":3,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":7,"incoming_link_count":11,"reads":290,"score":158.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Valts","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":3,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1216,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3925,"name":"Eric Kidd","username":"emk","avatar_template":"/images/avatar.png","uploaded_avatar_id":8400,"created_at":"2013-02-07T19:37:06.194Z","cooked":"<p><aside class=\"quote\" data-post=\"12\" data-topic=\"280\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"/user_avatar/meta.discourse.org/pekka/40/5253.png\" class=\"avatar\">pekka said:</div>\n<blockquote><p>As said, I'd look into whether WP's tools can't be reused for this with some tweaking. They seem to be able to scan a code base for new strings, and make them available automatically to translators.</p></blockquote></aside></p>\n\n<p>I've had pretty decent luck using Localeapp to localize Rails applications:</p>\n\n<p><a href=\"http://www.localeapp.com/\" class=\"onebox\" target=\"_blank\" rel=\"nofollow\">http://www.localeapp.com/</a></p>\n\n<p>The developer workflow took me about an hour to really get used to, and there were a few minor glitches. But the non-technical translators had very few problems. One limitation: It insists on rewriting all those yaml files full of strings.</p>\n\n<p>Anyway, it's worth a look, and it's free for open source, if I recall correctly. Certainly easier than doing a whole bunch of toolsmithing from scratch.</p>","post_number":14,"post_type":1,"updated_at":"2013-02-07T19:37:06.194Z","like_count":3,"reply_count":1,"reply_to_post_number":12,"quote_count":1,"avg_time":9,"incoming_link_count":0,"reads":283,"score":137.05,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Eric Kidd","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"http://www.localeapp.com/","internal":false,"reflection":false,"title":"Easy localization for Rails apps | Locale","clicks":69}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":3,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1860,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3938,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T19:52:13.748Z","cooked":"<p><aside class=\"quote\" data-post=\"14\" data-topic=\"280\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"/user_avatar/meta.discourse.org/emk/40/8400.png\" class=\"avatar\">emk said:</div>\n<blockquote><p>I've had pretty decent luck using Localeapp to localize Rails applications</p></blockquote></aside></p>\n\n<p>Ohhh. Looking sexy. <em>droool</em></p>","post_number":15,"post_type":1,"updated_at":"2013-02-07T19:52:13.748Z","like_count":1,"reply_count":1,"reply_to_post_number":14,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":260,"score":72.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3982,"name":"Eric Kidd","username":"emk","avatar_template":"/images/avatar.png","uploaded_avatar_id":8400,"created_at":"2013-02-07T20:52:22.454Z","cooked":"<p><aside class=\"quote\" data-post=\"15\" data-topic=\"280\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"/user_avatar/meta.discourse.org/pekka/40/5253.png\" class=\"avatar\">pekka said:</div>\n<blockquote><p>Ohhh. Looking sexy. droool</p></blockquote></aside></p>\n\n<p>Yeah, it's pretty. <img src=\"/images/emoji/twitter/smile.png\" title=\":smile:\" class=\"emoji\" alt=\"smile\" width=\"64\" height=\"64\"> But there were still some rough edges as of a few months ago.</p>\n\n<p>Whether or not those rough edges are a deal-breaker will probably depends on whether or not localization is already a source of acute pain. If you're already hurting, Localeapp is a pretty useful tool, especially when it comes to enlisting non-technical translators.</p>\n\n<p>But it does require changing how you work with text, and adding one new tool to the mix. So for projects that just don't want to know about non-English languages, it's not yet seamless the way Unicode is these days.</p>\n\n<p>(Sweet forum software, by the way. I was just testing out Egyptian hieroglyphics on the test server, because they're well off the Basic Multilingual Plane, and tend to flush Unicode bugs. Everything worked flawlessly.)</p>","post_number":16,"post_type":1,"updated_at":"2013-02-07T20:52:22.454Z","like_count":1,"reply_count":1,"reply_to_post_number":15,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":254,"score":71.15,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Eric Kidd","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":1860,"hidden":false,"hidden_reason_id":null,"trust_level":1,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3989,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T21:04:15.405Z","cooked":"<p><aside class=\"quote\" data-post=\"16\" data-topic=\"280\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img width=\"20\" height=\"20\" src=\"/user_avatar/meta.discourse.org/emk/40/8400.png\" class=\"avatar\">emk said:</div>\n<blockquote><p>But it does require changing how you work with text, and adding one new tool to the mix. So for projects that just don't want to know about non-English languages, it's not yet seamless the way Unicode is these days.</p></blockquote></aside></p>\n\n<p>Interesting, thanks for the insight. I don't think localization is seriously on their table right now, there's likely to be many other things on the table before it... but it will become an issue sooner or later.</p>","post_number":17,"post_type":1,"updated_at":"2013-02-07T21:04:15.405Z","like_count":1,"reply_count":2,"reply_to_post_number":16,"quote_count":1,"avg_time":7,"incoming_link_count":0,"reads":255,"score":76.35,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":3996,"name":"Sam Saffron","username":"sam","avatar_template":"/images/avatar.png","uploaded_avatar_id":5243,"created_at":"2013-02-07T21:12:06.575Z","cooked":"<p>I had an idea ... what if in dev mode, you could right-click on a page and get access to all the translations on the page, make your edits and have it refreshed live. </p>\n\n<p>I think it would be awesome, very doable technically.</p>","post_number":18,"post_type":1,"updated_at":"2013-02-07T21:12:06.575Z","like_count":7,"reply_count":2,"reply_to_post_number":17,"quote_count":0,"avg_time":8,"incoming_link_count":0,"reads":264,"score":168.2,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Sam Saffron","primary_group_name":"discourse","version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":"co-founder","reply_to_user":{"username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253},"actions_summary":[{"id":2,"count":7,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":true,"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},{"id":4009,"name":"Pekka Gaiser","username":"pekka","avatar_template":"/images/avatar.png","uploaded_avatar_id":5253,"created_at":"2013-02-07T21:18:47.422Z","cooked":"<p>That would be fricking cool. There'd still be some leftovers (like error messages that normally never show up, etc.) but you could corral those up on a specific page.</p>\n\n<p>It could have a dropdown giving you all the languages that you have a .yml for in the locale directory, and write the changes into the one selected. I'm sure people would love it.</p>","post_number":19,"post_type":1,"updated_at":"2013-02-07T21:22:10.692Z","like_count":1,"reply_count":0,"reply_to_post_number":18,"quote_count":0,"avg_time":8,"incoming_link_count":1,"reads":241,"score":68.6,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Pekka Gaiser","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"read":true,"user_title":null,"reply_to_user":{"username":"sam","avatar_template":"/images/avatar.png","uploaded_avatar_id":5243},"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":7,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":4012,"name":"Marco Ceppi","username":"marcoceppi","avatar_template":"/images/avatar.png","uploaded_avatar_id":6552,"created_at":"2013-02-07T21:22:46.376Z","cooked":"<p>If you use gettext format you could leverage <a href=\"https://translations.launchpad.net/\" rel=\"nofollow\">Launchpad</a> translations and the community behind it.</p>","post_number":20,"post_type":1,"updated_at":"2013-02-07T21:22:46.376Z","like_count":1,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":9,"incoming_link_count":2,"reads":244,"score":74.25,"yours":false,"topic_id":280,"topic_slug":"internationalization-localization","display_username":"Marco Ceppi","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":true,"link_counts":[{"url":"https://translations.launchpad.net/","internal":false,"reflection":false,"title":"Launchpad Translations","clicks":13}],"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":3,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":4,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":5,"count":0,"hidden":true,"can_act":true,"can_defer_flags":false},{"id":6,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":7,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false},{"id":8,"count":0,"hidden":false,"can_act":true,"can_defer_flags":false}],"moderator":false,"admin":false,"staff":false,"user_id":761,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false}],"stream":[398,419,1060,3623,3651,3654,3655,3658,3660,3667,3673,3675,3690,3925,3938,3982,3989,3996,4009,4012],"gaps":{"before":{"20706":[20125]},"after":{}}},"id":280,"title":"Internationalization / localization","fancy_title":"Internationalization / localization","posts_count":103,"created_at":"2013-02-05T21:29:00.174Z","views":5211,"reply_count":67,"participant_count":40,"like_count":135,"last_posted_at":"2015-03-04T15:07:10.487Z","visible":true,"closed":false,"archived":false,"has_summary":true,"archetype":"regular","slug":"internationalization-localization","category_id":2,"word_count":6198,"deleted_at":null,"draft":null,"draft_key":"topic_280","draft_sequence":4,"posted":true,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":255,"username":"uwe_keim","uploaded_avatar_id":5697,"avatar_template":"/images/avatar.png"},"last_poster":{"id":14091,"username":"Luciano_Fantuzzi","uploaded_avatar_id":39484,"avatar_template":"/images/avatar.png"},"participants":[{"id":212,"username":"alxndr","uploaded_avatar_id":5619,"avatar_template":"/images/avatar.png","post_count":11},{"id":1,"username":"sam","uploaded_avatar_id":5243,"avatar_template":"/images/avatar.png","post_count":11},{"id":7,"username":"pekka","uploaded_avatar_id":5253,"avatar_template":"/images/avatar.png","post_count":8},{"id":461,"username":"kuba","uploaded_avatar_id":6049,"avatar_template":"/images/avatar.png","post_count":7},{"id":2995,"username":"tattoo","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","post_count":6},{"id":2540,"username":"jgourdon","uploaded_avatar_id":9537,"avatar_template":"/images/avatar.png","post_count":5},{"id":1860,"username":"emk","uploaded_avatar_id":8400,"avatar_template":"/images/avatar.png","post_count":4},{"id":1275,"username":"dacap","uploaded_avatar_id":7401,"avatar_template":"/images/avatar.png","post_count":4},{"id":19,"username":"eviltrout","uploaded_avatar_id":5275,"avatar_template":"/images/avatar.png","post_count":4},{"id":3704,"username":"mojzis","uploaded_avatar_id":31201,"avatar_template":"/images/avatar.png","post_count":3},{"id":3190,"username":"gururea","uploaded_avatar_id":10663,"avatar_template":"/images/avatar.png","post_count":3},{"id":1895,"username":"maciek","uploaded_avatar_id":8463,"avatar_template":"/images/avatar.png","post_count":3},{"id":22,"username":"splattne","uploaded_avatar_id":5280,"avatar_template":"/images/avatar.png","post_count":2},{"id":1979,"username":"Superuser","uploaded_avatar_id":8604,"avatar_template":"/images/avatar.png","post_count":2},{"id":3818,"username":"Tudor","uploaded_avatar_id":11675,"avatar_template":"/images/avatar.png","post_count":2},{"id":32,"username":"codinghorror","uploaded_avatar_id":5297,"avatar_template":"/images/avatar.png","post_count":2},{"id":3620,"username":"potthast","uploaded_avatar_id":11363,"avatar_template":"/images/avatar.png","post_count":2},{"id":9,"username":"tms","uploaded_avatar_id":40181,"avatar_template":"/images/avatar.png","post_count":2},{"id":14091,"username":"Luciano_Fantuzzi","uploaded_avatar_id":39484,"avatar_template":"/images/avatar.png","post_count":1},{"id":255,"username":"uwe_keim","uploaded_avatar_id":5697,"avatar_template":"/images/avatar.png","post_count":1},{"id":9006,"username":"berk","uploaded_avatar_id":19348,"avatar_template":"/images/avatar.png","post_count":1},{"id":754,"username":"danneu","uploaded_avatar_id":6540,"avatar_template":"/images/avatar.png","post_count":1},{"id":761,"username":"marcoceppi","uploaded_avatar_id":6552,"avatar_template":"/images/avatar.png","post_count":1},{"id":2753,"username":"mikl","uploaded_avatar_id":9918,"avatar_template":"/images/avatar.png","post_count":1}],"suggested_topics":[{"id":27331,"title":"Polls are still very buggy","fancy_title":"Polls are still very buggy","slug":"polls-are-still-very-buggy","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":"/uploads/default/_optimized/cd1/b8c/c162528887_690x401.png","created_at":"2015-04-08T09:51:00.357Z","last_posted_at":"2015-04-08T15:59:16.258Z","bumped":true,"bumped_at":"2015-04-08T16:05:09.842Z","unseen":false,"last_read_post_number":3,"unread":0,"new_posts":1,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":11,"views":55,"category_id":1},{"id":27343,"title":"Mobile theme doesn't show last activity time for topics on category page","fancy_title":"Mobile theme doesn&rsquo;t show last activity time for topics on category page","slug":"mobile-theme-doesnt-show-last-activity-time-for-topics-on-category-page","posts_count":4,"reply_count":2,"highest_post_number":4,"image_url":"/uploads/default/_optimized/13e/25c/bd30b466be_281x500.png","created_at":"2015-04-08T14:20:51.177Z","last_posted_at":"2015-04-08T15:40:30.037Z","bumped":true,"bumped_at":"2015-04-08T15:40:30.037Z","unseen":false,"last_read_post_number":2,"unread":0,"new_posts":2,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":3,"views":23,"category_id":9},{"id":27346,"title":"Reply+{messagekey}@... optionaly in header \"from\" in addition to \"reply-to\"","fancy_title":"Reply+{messagekey}@&hellip; optionaly in header &ldquo;from&rdquo; in addition to &ldquo;reply-to&rdquo;","slug":"reply-messagekey-optionaly-in-header-from-in-addition-to-reply-to","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2015-04-08T16:05:13.103Z","last_posted_at":"2015-04-08T16:05:13.415Z","bumped":true,"bumped_at":"2015-04-08T16:05:13.415Z","unseen":true,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":0,"views":8,"category_id":2},{"id":19670,"title":"Parsing (Oneboxing) IMDB links","fancy_title":"Parsing (Oneboxing) IMDB links","slug":"parsing-oneboxing-imdb-links","posts_count":8,"reply_count":1,"highest_post_number":8,"image_url":null,"created_at":"2014-09-05T07:19:26.161Z","last_posted_at":"2015-04-07T09:21:21.570Z","bumped":true,"bumped_at":"2015-04-07T09:21:21.570Z","unseen":false,"last_read_post_number":8,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":4,"views":253,"category_id":2},{"id":7512,"title":"Support for Piwik Analytics as an alternative to Google Analytics","fancy_title":"Support for Piwik Analytics as an alternative to Google Analytics","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","posts_count":53,"reply_count":41,"highest_post_number":65,"image_url":"/plugins/emoji/images/smile.png","created_at":"2013-06-16T01:32:30.596Z","last_posted_at":"2015-02-22T13:46:26.845Z","bumped":true,"bumped_at":"2015-02-22T13:46:26.845Z","unseen":false,"last_read_post_number":65,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":62,"views":1877,"category_id":2},{"id":25480,"title":"CSS admin-contents reloaded","fancy_title":"CSS admin-contents reloaded","slug":"css-admin-contents-reloaded","posts_count":22,"reply_count":15,"highest_post_number":22,"image_url":null,"created_at":"2015-02-21T12:15:57.707Z","last_posted_at":"2015-03-02T23:24:18.899Z","bumped":true,"bumped_at":"2015-03-02T23:24:18.899Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":21,"views":185,"category_id":2},{"id":26576,"title":"Badge timestamp should be the time the badge was granted?","fancy_title":"Badge timestamp should be the time the badge was granted?","slug":"badge-timestamp-should-be-the-time-the-badge-was-granted","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2015-03-20T13:22:08.266Z","last_posted_at":"2015-03-21T00:33:52.243Z","bumped":true,"bumped_at":"2015-03-21T00:33:52.243Z","unseen":false,"last_read_post_number":1,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":1,"bookmarked":false,"liked":false,"archetype":"regular","like_count":9,"views":87,"category_id":2}],"links":[{"url":"https://github.com/discourse/discourse/blob/master/config/locales/en.yml","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":118,"user_id":9,"domain":"github.com"},{"url":"http://www.localeapp.com/","title":"Easy localization for Rails apps | Locale","fancy_title":null,"internal":false,"reflection":false,"clicks":69,"user_id":1860,"domain":"www.localeapp.com"},{"url":"http://stackoverflow.com/questions/4232922/why-do-people-use-plain-english-as-translation-placeholders","title":"internationalization - Why do people use plain english as translation placeholders? - Stack Overflow","fancy_title":null,"internal":false,"reflection":false,"clicks":63,"user_id":7,"domain":"stackoverflow.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales","title":"discourse/config/locales at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":62,"user_id":32,"domain":"github.com"},{"url":"https://github.com/SlexAxton/messageformat.js","title":"SlexAxton/messageformat.js · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":46,"user_id":1,"domain":"github.com"},{"url":"http://www.localeapp.com/projects/1537/translations?utf8=%E2%9C%93&search=source_code","title":"langforums | Locale","fancy_title":null,"internal":false,"reflection":false,"clicks":25,"user_id":1860,"domain":"www.localeapp.com"},{"url":"https://translations.launchpad.net/","title":"Launchpad Translations","fancy_title":null,"internal":false,"reflection":false,"clicks":23,"user_id":761,"domain":"translations.launchpad.net"},{"url":"https://www.transifex.com/","title":"Transifex - Continuous Localization Platform","fancy_title":null,"internal":false,"reflection":false,"clicks":22,"user_id":1979,"domain":"www.transifex.com"},{"url":"https://github.com/berk/tr8n","title":"berk/tr8n · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":22,"user_id":1,"domain":"github.com"},{"url":"http://translate.wordpress.org/projects/bbpress/dev","title":"WordPress › Development < GlotPress","fancy_title":null,"internal":false,"reflection":false,"clicks":16,"user_id":7,"domain":"translate.wordpress.org"},{"url":"http://weblate.org","title":"Weblate - web-based translation","fancy_title":null,"internal":false,"reflection":false,"clicks":15,"user_id":2316,"domain":"weblate.org"},{"url":"https://github.com/discourse/discourse/tree/master/config/locales","title":"discourse/config/locales at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":14,"user_id":19,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/pull/493","title":"Danish translation. by mikl · Pull Request #493 · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":12,"user_id":2753,"domain":"github.com"},{"url":"https://github.com/SlexAxton","title":"SlexAxton (Alex Sexton) · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":10,"user_id":1,"domain":"github.com"},{"url":"https://github.com/gururea/discourse/tree/master/config/locales","title":"discourse/config/locales at master · gururea/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":9,"user_id":3190,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.en.yml#L691","title":"discourse/config/locales/client.en.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":461,"domain":"github.com"},{"url":"https://github.com/dacap/discourse/tree/spanish","title":"dacap/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":1275,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.nl.yml","title":"discourse/config/locales/client.nl.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":7,"user_id":461,"domain":"github.com"},{"url":"https://github.com/discourse/discourse/commit/c5761eae8afe37e20cec0d0f9d14b85b6e585bda","title":"Support for Simplified Chinese thanks to tangramor · c5761ea · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":212,"domain":"github.com"},{"url":"http://tr8n.github.com/","title":"tr8n","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":212,"domain":"tr8n.github.com"},{"url":"http://www.getlocalization.com/","title":"Crowdsourced, Social and Collaborative App & Website Translation - Get Localization","fancy_title":null,"internal":false,"reflection":false,"clicks":6,"user_id":22,"domain":"www.getlocalization.com"},{"url":"http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/","title":"Discourse as Your First Rails App","fancy_title":null,"internal":false,"reflection":false,"clicks":5,"user_id":1995,"domain":"blog.discourse.org"},{"url":"https://github.com/alxndr/discourse/blob/i18n-chinese/config/locales/server.zh.yml","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":5,"user_id":212,"domain":"github.com"},{"url":"http://translate.sourceforge.net/wiki/virtaal/index","title":"Easy-to-use and powerful offline translation tool | Virtaal","fancy_title":null,"internal":false,"reflection":false,"clicks":4,"user_id":1979,"domain":"translate.sourceforge.net"},{"url":"https://poeditor.com/","title":"POEditor - online software localization tool","fancy_title":null,"internal":false,"reflection":false,"clicks":4,"user_id":1979,"domain":"poeditor.com"},{"url":"http://en.lichess.org/@/Hellball","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":1979,"domain":"en.lichess.org"},{"url":"http://en.wikipedia.org/wiki/T%E2%80%93V_distinction","title":"T–V distinction - Wikipedia, the free encyclopedia","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":3620,"domain":"en.wikipedia.org"},{"url":"http://www.slideshare.net/HeatherRivers/linguistic-potluck-crowdsourcing-localization-with-rails","title":"Linguistic Potluck: Crowdsourcing localization with Rails","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":212,"domain":"www.slideshare.net"},{"url":"https://meta.discourse.org/t/language-mirrors/2378/2","title":"Language mirrors","fancy_title":null,"internal":true,"reflection":true,"clicks":3,"user_id":32,"domain":"meta.discourse.org"},{"url":"http://www.madanalogy.com/2012/06/rails-i18n-translations-in-yaml.html","title":"Mad Analogy: Rails i18n translations in Yaml: translation tool support","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":3190,"domain":"www.madanalogy.com"},{"url":"https://github.com/tr8n","title":"Translation Exchange · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":3,"user_id":9006,"domain":"github.com"},{"url":"http://pootle.locamotion.org/","title":"Main | Pootle Demo","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":3190,"domain":"pootle.locamotion.org"},{"url":"http://www.youtube.com/watch?v=MqqdzJ98q7s","title":"GoGaRuCo 2012 - Linguistic Potluck: Crowdsourcing Localization in Rails by Heather Rivers - YouTube","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":212,"domain":"www.youtube.com"},{"url":"https://meta.discourse.org/t/translation-workflow/6102","title":"Translation workflow","fancy_title":null,"internal":true,"reflection":true,"clicks":2,"user_id":4702,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/solving-xda-developer-style-forums/4368/4","title":"Solving XDA-Developer style forums","fancy_title":null,"internal":true,"reflection":true,"clicks":2,"user_id":639,"domain":"meta.discourse.org"},{"url":"https://tr8nhub.com","title":"TranslationExchange","fancy_title":null,"internal":false,"reflection":false,"clicks":2,"user_id":9006,"domain":"tr8nhub.com"},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/3","title":"Roadplan for Discourse 2013","fancy_title":null,"internal":true,"reflection":true,"clicks":1,"user_id":2540,"domain":"meta.discourse.org"},{"url":"http://sugarjs.com/dates#date_locales","title":"Dates - Sugar","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":461,"domain":"sugarjs.com"},{"url":"http://blog.discourse.org/2013/03/localizing-discourse/","title":"Localizing Discourse","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"blog.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/app/assets/javascripts/locales/date_locales.js","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":461,"domain":"github.com"},{"url":"http://transifex.com/projects/p/discourse-pt-br/","title":"Discourse-Translations-Project localization","fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"transifex.com"},{"url":"https://github.com/discourse/discourse/issues/279","title":null,"fancy_title":null,"internal":false,"reflection":false,"clicks":1,"user_id":893,"domain":"github.com"},{"url":"https://meta.discourse.org/t/comrades-lets-join-our-efforts-on-ukrainian-and-russian-translations/4403/5","title":"Comrades let's join our efforts on ukrainian and russian translations","fancy_title":null,"internal":true,"reflection":true,"clicks":1,"user_id":3417,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-workflow/6102/6","title":"Translation workflow","fancy_title":null,"internal":true,"reflection":false,"clicks":0,"user_id":1995,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/bookmark-last-read-sometimes-doesn-t-go-to-the-end-of-a-topic/4825/9","title":"Bookmark/last read sometimes doesn't go to the end of a topic","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":3681,"domain":"meta.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/client.de.yml","title":"discourse/config/locales/client.de.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":2,"domain":"github.com"},{"url":"https://meta.discourse.org/t/what-i-love-about-wordpress-plugins/5697","title":"What I love about WordPress plugins","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":1,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/github-onebox-rendering-issue/7616","title":"GitHub OneBox Rendering Issue","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":5372,"domain":"meta.discourse.org"},{"url":"https://github.com/discourse/discourse/blob/master/config/locales/server.de.yml","title":"discourse/config/locales/server.de.yml at master · discourse/discourse · GitHub","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":2,"domain":"github.com"},{"url":"https://meta.discourse.org/t/roadplan-for-discourse/2939/5","title":"Roadplan for Discourse 2013","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":32,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-tools-transifex-localeapp/7763","title":"Translation Tools: Transifex? Localeapp?","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":2,"domain":"meta.discourse.org"},{"url":"http://guides.rubyonrails.org/i18n.html#the-public-i18n-api","title":"Rails Internationalization (I18n) API — Ruby on Rails Guides","fancy_title":null,"internal":false,"reflection":false,"clicks":0,"user_id":1895,"domain":"guides.rubyonrails.org"},{"url":"https://meta.discourse.org/t/hi-support-chinese/4393/6","title":"Hi, support Chinese?","fancy_title":null,"internal":true,"reflection":true,"clicks":0,"user_id":2014,"domain":"meta.discourse.org"},{"url":"https://meta.discourse.org/t/translation-tools-transifex-localeapp/7763/41","title":"Translation Tools: Transifex? Localeapp?","fancy_title":null,"internal":true,"reflection":false,"clicks":0,"user_id":6626,"domain":"meta.discourse.org"}],"notification_level":2,"notifications_reason_id":4,"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":10,"last_read_post_number":10,"deleted_by":null,"has_deleted":true,"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,"tags":null},
 "/t/28830/1.json": {"post_stream":{"posts":[{"id":118591,"name":"spends too much time on WTDWTF","username":"RaceProUK","avatar_template":"/images/avatar.png","uploaded_avatar_id":40071,"created_at":"2015-05-14T20:18:17.954Z","cooked":"<p>Normally, actions such as Liking are rate-limited, and when you hit the limit, you get a message telling you you've hit the limit. However, in 1.3.0beta9, it seems those popups are no longer appearing.</p>\n\n<p>Edit: Possibly linked to <a href=\"https://meta.discourse.org/t/post-reply-on-different-topic-no-longer-works/28825?u=raceprouk\">this issue</a>?</p>","post_number":1,"post_type":1,"updated_at":"2015-05-14T20:21:42.825Z","like_count":6,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":14,"reads":24,"score":224.6,"yours":false,"topic_id":28830,"topic_slug":"1-3-0beta9-no-rate-limit-popups","display_username":"spends too much time on WTDWTF","primary_group_name":null,"version":1,"can_edit":false,"can_delete":false,"can_recover":false,"link_counts":[{"url":"https://meta.discourse.org/t/post-reply-on-different-topic-no-longer-works/28825","internal":true,"reflection":false,"title":"Post reply on different topic no longer works","clicks":6}],"read":true,"user_title":"Contributor","actions_summary":[{"id":2,"count":6,"hidden":false,"can_act":false},{"id":3,"count":0,"hidden":false,"can_act":false},{"id":4,"count":0,"hidden":false,"can_act":false},{"id":5,"count":0,"hidden":true,"can_act":false},{"id":6,"count":0,"hidden":false,"can_act":false},{"id":7,"count":0,"hidden":false,"can_act":false},{"id":8,"count":0,"hidden":false,"can_act":false}],"moderator":false,"admin":false,"staff":false,"user_id":14169,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":"","can_view_edit_history":true,"wiki":false},{"id":118597,"name":"Sam","username":"Yuun","avatar_template":"/images/avatar.png","uploaded_avatar_id":null,"created_at":"2015-05-14T20:35:03.793Z","cooked":"<p>I'm seeing this issue as well. When you hit the rate limit, any further likes look like the forum is attempting and failing to apply them - the text saying 'you liked this' comes into place before quickly being removed. </p>\n\n<p>This makes it look (to the user) like the forum software is running into errors instead of said user hitting an intentional limit, which is a bit unfortunate.</p>","post_number":2,"post_type":1,"updated_at":"2015-05-14T20:35:03.793Z","like_count":0,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":6,"reads":22,"score":34.2,"yours":false,"topic_id":28830,"topic_slug":"1-3-0beta9-no-rate-limit-popups","display_username":"Sam","primary_group_name":null,"version":1,"can_edit":false,"can_delete":false,"can_recover":false,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":0,"hidden":false,"can_act":false},{"id":3,"count":0,"hidden":false,"can_act":false},{"id":4,"count":0,"hidden":false,"can_act":false},{"id":5,"count":0,"hidden":true,"can_act":false},{"id":6,"count":0,"hidden":false,"can_act":false},{"id":7,"count":0,"hidden":false,"can_act":false},{"id":8,"count":0,"hidden":false,"can_act":false}],"moderator":false,"admin":false,"staff":false,"user_id":14795,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false},{"id":118601,"name":"Kane York","username":"riking","avatar_template":"/images/avatar.png","uploaded_avatar_id":40212,"created_at":"2015-05-14T21:05:19.837Z","cooked":"<p>I'm going to guess that the bootbox library got broken somehow?</p>","post_number":3,"post_type":1,"updated_at":"2015-05-14T21:05:19.837Z","like_count":0,"reply_count":1,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":14,"score":7.2,"yours":false,"topic_id":28830,"topic_slug":"1-3-0beta9-no-rate-limit-popups","display_username":"Kane York","primary_group_name":null,"version":1,"can_edit":false,"can_delete":false,"can_recover":false,"read":true,"user_title":"team summer intern 2014","actions_summary":[{"id":2,"count":0,"hidden":false,"can_act":false},{"id":3,"count":0,"hidden":false,"can_act":false},{"id":4,"count":0,"hidden":false,"can_act":false},{"id":5,"count":0,"hidden":true,"can_act":false},{"id":6,"count":0,"hidden":false,"can_act":false},{"id":7,"count":0,"hidden":false,"can_act":false},{"id":8,"count":0,"hidden":false,"can_act":false}],"moderator":false,"admin":false,"staff":false,"user_id":6626,"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},{"id":118606,"name":"Jeff Atwood","username":"codinghorror","avatar_template":"/images/avatar.png","uploaded_avatar_id":5297,"created_at":"2015-05-14T21:15:41.612Z","cooked":"<p>Yeah maybe another Ember 1.10 regression for <a class=\"mention\" href=\"/users/eviltrout\">@eviltrout</a> ?</p>","post_number":4,"post_type":1,"updated_at":"2015-05-14T21:15:41.612Z","like_count":0,"reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":6,"reads":12,"score":31.6,"yours":false,"topic_id":28830,"topic_slug":"1-3-0beta9-no-rate-limit-popups","display_username":"Jeff Atwood","primary_group_name":"discourse","version":1,"can_edit":false,"can_delete":false,"can_recover":false,"read":true,"user_title":"co-founder","actions_summary":[{"id":2,"count":0,"hidden":false,"can_act":false},{"id":3,"count":0,"hidden":false,"can_act":false},{"id":4,"count":0,"hidden":false,"can_act":false},{"id":5,"count":0,"hidden":true,"can_act":false},{"id":6,"count":0,"hidden":false,"can_act":false},{"id":7,"count":0,"hidden":false,"can_act":false},{"id":8,"count":0,"hidden":false,"can_act":false}],"moderator":true,"admin":true,"staff":true,"user_id":32,"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},{"id":118612,"name":"TDWTF member","username":"Onyx","avatar_template":"/images/avatar.png","uploaded_avatar_id":33015,"created_at":"2015-05-14T21:23:09.562Z","cooked":"<aside class=\"quote\" data-post=\"3\" data-topic=\"28830\" data-full=\"true\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img alt=\"\" width=\"20\" height=\"20\" src=\"/user_avatar/meta.discourse.org/riking/40/40212.png\" class=\"avatar\">riking:</div>\n<blockquote><p>I'm going to guess that the bootbox library got broken somehow?</p></blockquote></aside>\n\n<p>You mean the popup box library, guessing by the name? Still shows up when you want to cancel a post, so it's not <em>all</em> popups it seems.</p>","post_number":5,"post_type":1,"updated_at":"2015-05-14T21:23:09.562Z","like_count":1,"reply_count":0,"reply_to_post_number":3,"quote_count":1,"avg_time":null,"incoming_link_count":0,"reads":11,"score":16.0,"yours":false,"topic_id":28830,"topic_slug":"1-3-0beta9-no-rate-limit-popups","display_username":"TDWTF member","primary_group_name":null,"version":1,"can_edit":false,"can_delete":false,"can_recover":false,"read":true,"user_title":null,"actions_summary":[{"id":2,"count":1,"hidden":false,"can_act":false},{"id":3,"count":0,"hidden":false,"can_act":false},{"id":4,"count":0,"hidden":false,"can_act":false},{"id":5,"count":0,"hidden":true,"can_act":false},{"id":6,"count":0,"hidden":false,"can_act":false},{"id":7,"count":0,"hidden":false,"can_act":false},{"id":8,"count":0,"hidden":false,"can_act":false}],"moderator":false,"admin":false,"staff":false,"user_id":10886,"hidden":false,"hidden_reason_id":null,"trust_level":2,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false}],"stream":[118591,118597,118601,118606,118612]},"id":28830,"title":"1.3.0beta9: No rate-limit popups","fancy_title":"1.3.0beta9: No rate-limit popups","posts_count":5,"created_at":"2015-05-14T20:18:17.877Z","views":38,"reply_count":1,"participant_count":5,"like_count":7,"last_posted_at":"2015-05-14T21:23:09.562Z","visible":true,"closed":false,"archived":false,"has_summary":false,"archetype":"regular","slug":"1-3-0beta9-no-rate-limit-popups","category_id":1,"word_count":198,"deleted_at":null,"pending_posts_count":0,"draft":null,"draft_key":"topic_28830","draft_sequence":null,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":14169,"username":"RaceProUK","uploaded_avatar_id":40071,"avatar_template":"/images/avatar.png"},"last_poster":{"id":10886,"username":"Onyx","uploaded_avatar_id":33015,"avatar_template":"/images/avatar.png"},"participants":[{"id":14795,"username":"Yuun","uploaded_avatar_id":null,"avatar_template":"/images/avatar.png","post_count":1},{"id":10886,"username":"Onyx","uploaded_avatar_id":33015,"avatar_template":"/images/avatar.png","post_count":1},{"id":14169,"username":"RaceProUK","uploaded_avatar_id":40071,"avatar_template":"/images/avatar.png","post_count":1},{"id":6626,"username":"riking","uploaded_avatar_id":40212,"avatar_template":"/images/avatar.png","post_count":1},{"id":32,"username":"codinghorror","uploaded_avatar_id":5297,"avatar_template":"/images/avatar.png","post_count":1}],"suggested_topics":[{"id":2890,"title":"Expanded quoted text not highlighting when text is formatted","fancy_title":"Expanded quoted text not highlighting when text is formatted","slug":"expanded-quoted-text-not-highlighting-when-text-is-formatted","posts_count":8,"reply_count":5,"highest_post_number":8,"image_url":null,"created_at":"2013-02-12T12:18:02.181Z","last_posted_at":"2013-02-14T15:59:40.014Z","bumped":true,"bumped_at":"2013-02-14T15:59:40.014Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":3,"views":361,"category_id":1},{"id":14213,"title":"Plugins not being parsed in correct javascript context when loaded for jobs","fancy_title":"Plugins not being parsed in correct javascript context when loaded for jobs","slug":"plugins-not-being-parsed-in-correct-javascript-context-when-loaded-for-jobs","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":"/plugins/emoji/images/frowning.png","created_at":"2014-03-27T23:57:00.974Z","last_posted_at":"2015-03-20T04:56:03.982Z","bumped":true,"bumped_at":"2015-03-20T04:56:03.982Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":0,"views":156,"category_id":1},{"id":22544,"title":"Like count on profile off by one","fancy_title":"Like count on profile off by one","slug":"like-count-on-profile-off-by-one","posts_count":7,"reply_count":2,"highest_post_number":7,"image_url":null,"created_at":"2014-11-26T08:15:39.802Z","last_posted_at":"2014-11-27T07:23:37.638Z","bumped":true,"bumped_at":"2014-11-27T07:23:37.638Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":18,"views":192,"category_id":1},{"id":27670,"title":"Using back still shows unread indicator on the topic","fancy_title":"Using back still shows unread indicator on the topic","slug":"using-back-still-shows-unread-indicator-on-the-topic","posts_count":2,"reply_count":0,"highest_post_number":2,"image_url":null,"created_at":"2015-04-16T23:21:42.739Z","last_posted_at":"2015-04-17T02:43:08.447Z","bumped":true,"bumped_at":"2015-04-17T02:43:08.447Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":1,"views":85,"category_id":1},{"id":26628,"title":"Embed blacklist selector is broken","fancy_title":"Embed blacklist selector is broken","slug":"embed-blacklist-selector-is-broken","posts_count":11,"reply_count":7,"highest_post_number":11,"image_url":null,"created_at":"2015-03-22T11:21:14.825Z","last_posted_at":"2015-04-20T09:11:38.999Z","bumped":true,"bumped_at":"2015-04-20T09:11:38.999Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":1,"views":247,"category_id":1},{"id":18027,"title":"Minor: delete/undelete needs a rate limit","fancy_title":"Minor: delete/undelete needs a rate limit","slug":"minor-delete-undelete-needs-a-rate-limit","posts_count":4,"reply_count":1,"highest_post_number":4,"image_url":null,"created_at":"2014-07-25T02:51:41.158Z","last_posted_at":"2014-07-25T04:01:15.343Z","bumped":true,"bumped_at":"2014-07-25T11:06:46.213Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":1,"views":165,"category_id":1},{"id":17396,"title":"Bad Reply Key when pulling Autoforwarded Emails to Discourse","fancy_title":"Bad Reply Key when pulling Autoforwarded Emails to Discourse","slug":"bad-reply-key-when-pulling-autoforwarded-emails-to-discourse","posts_count":20,"reply_count":15,"highest_post_number":20,"image_url":null,"created_at":"2014-07-09T18:34:57.114Z","last_posted_at":"2014-10-21T15:08:50.441Z","bumped":true,"bumped_at":"2014-10-21T15:08:50.441Z","unseen":false,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":7,"views":542,"category_id":1}],"links":[{"url":"https://meta.discourse.org/t/post-reply-on-different-topic-no-longer-works/28825","title":"Post reply on different topic no longer works","fancy_title":null,"internal":true,"reflection":false,"clicks":6,"user_id":14169,"domain":"meta.discourse.org"}],"notification_level":1,"can_flag_topic":false},"highest_post_number":5,"deleted_by":null,"actions_summary":[{"id":4,"count":0,"hidden":false,"can_act":false},{"id":7,"count":0,"hidden":false,"can_act":false},{"id":8,"count":0,"hidden":false,"can_act":false}],"chunk_size":20,"bookmarked":null,"tags":null},
 "/t/9/1.json": {"post_stream":{"posts":[{"id":18,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:11.840Z","cooked":"<p>This is the first post.</p>","post_number":1,"post_type":1,"updated_at":"2015-08-13T14:49:11.840Z","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":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":false,"can_recover":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},{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:18.231Z","cooked":"<p>This is the second post.</p>","post_number":2,"post_type":1,"updated_at":"2015-08-13T14:49:18.231Z","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":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":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},{"id":20,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:23.927Z","cooked":"<p>This is the third post.</p>","post_number":3,"post_type":1,"updated_at":"2015-08-13T14:49:23.927Z","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":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":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}],"stream":[18,19,20]},"id":9,"title":"This is a test topic!","fancy_title":"This is a test topic!","posts_count":3,"created_at":"2015-08-13T14:49:11.720Z","views":1,"reply_count":0,"participant_count":1,"like_count":0,"last_posted_at":"2015-08-13T14:49:23.927Z","visible":true,"closed":false,"archived":false,"has_summary":false,"archetype":"regular","slug":"this-is-a-test-topic","category_id":1,"word_count":15,"deleted_at":null,"pending_posts_count":0,"user_id":1,"draft":null,"draft_key":"topic_9","draft_sequence":3,"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":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png"},"last_poster":{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png"},"participants":[{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png","post_count":3}],"suggested_topics":[{"id":8,"title":"This is a new and awesome topic!","fancy_title":"This is a new and awesome topic!","slug":"this-is-a-new-and-awesome-topic","posts_count":3,"reply_count":0,"highest_post_number":5,"image_url":null,"created_at":"2015-08-13T05:17:00.000Z","last_posted_at":"2015-08-13T10:14:34.799Z","bumped":true,"bumped_at":"2015-08-13T10:14:34.799Z","unseen":false,"last_read_post_number":5,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":0,"views":2,"category_id":1},{"id":7,"title":"This is a test category!","fancy_title":"This is a test category!","slug":"this-is-a-test-category","posts_count":3,"reply_count":0,"highest_post_number":3,"image_url":null,"created_at":"2015-08-10T13:40:38.439Z","last_posted_at":"2015-08-13T01:59:44.928Z","bumped":true,"bumped_at":"2015-08-13T01:58:35.206Z","unseen":false,"last_read_post_number":3,"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}],"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":3,"last_read_post_number":3,"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},
-"/t/12/1.json": {"post_stream":{"posts":[{"id":15,"name":null,"username":"test","avatar_template":"/images/avatar.png","created_at":"2017-01-27T03:53:58.394Z","cooked":"<p>I have a pen, I have an apple</p>","post_number":1,"post_type":1,"updated_at":"2017-01-27T03:53:58.394Z","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":"pm-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,"can_translate":false},{"id":16,"name":null,"username":"test","avatar_template":"/images/avatar.png","created_at":"2017-01-27T04:10:02.941Z","cooked":"","post_number":2,"post_type":3,"updated_at":"2017-01-27T04:10:02.941Z","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":"pm-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":true,"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,"action_code":"invited_group","action_code_who":"Group","can_translate":false}],"stream":[15,16]},"timeline_lookup":[[1,0]],"id":12,"title":"PM for testing","fancy_title":"PM for testing","posts_count":2,"created_at":"2017-01-27T03:53:58.360Z","views":1,"reply_count":0,"participant_count":1,"like_count":0,"last_posted_at":"2017-01-27T04:10:02.941Z","visible":true,"closed":false,"archived":false,"has_summary":false,"archetype":"private_message","slug":"pm-for-testing","category_id":null,"word_count":8,"deleted_at":null,"user_id":1,"draft":null,"draft_key":"topic_12","draft_sequence":2,"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":"test","avatar_template":"/images/avatar.png"},"last_poster":{"id":1,"username":"test","avatar_template":"/images/avatar.png"},"allowed_groups":[{"id":41,"automatic":false,"name":"Group","user_count":0,"alias_level":99,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null}],"allowed_users":[{"id":2,"username":"someguy","avatar_template":"/images/avatar.png"},{"id":1,"username":"test","avatar_template":"/images/avatar.png"}],"participants":[{"id":1,"username":"test","avatar_template":"/images/avatar.png","post_count":2,"primary_group_name":null,"primary_group_flair_url":null,"primary_group_flair_color":null,"primary_group_flair_bg_color":null}],"suggested_topics":[{"id":11,"title":"This is a very important announcement","fancy_title":"This is a very important announcement","slug":"this-is-a-very-important-announcement","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2017-01-27T03:52:02.061Z","last_posted_at":"2017-01-27T03:52:02.119Z","bumped":true,"bumped_at":"2017-01-27T03:52:02.119Z","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":"private_message","like_count":0,"views":1,"category_id":null,"featured_link":null,"posters":[{"extras":"latest single","description":"Original Poster, Most Recent Poster","user":{"id":1,"username":"test","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":2,"last_read_post_number":2,"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,"message_archived":false,"featured_link":null} };
+"/t/12/1.json": {"post_stream":{"posts":[{"id":15,"name":null,"username":"test","avatar_template":"/images/avatar.png","created_at":"2017-01-27T03:53:58.394Z","cooked":"<p>I have a pen, I have an apple</p>","post_number":1,"post_type":1,"updated_at":"2017-01-27T03:53:58.394Z","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":"pm-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,"can_translate":false},{"id":16,"name":null,"username":"test","avatar_template":"/images/avatar.png","created_at":"2017-01-27T04:10:02.941Z","cooked":"","post_number":2,"post_type":3,"updated_at":"2017-01-27T04:10:02.941Z","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":"pm-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":true,"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,"action_code":"invited_group","action_code_who":"Group","can_translate":false}],"stream":[15,16]},"timeline_lookup":[[1,0]],"id":12,"title":"PM for testing","fancy_title":"PM for testing","posts_count":2,"created_at":"2017-01-27T03:53:58.360Z","views":1,"reply_count":0,"participant_count":1,"like_count":0,"last_posted_at":"2017-01-27T04:10:02.941Z","visible":true,"closed":false,"archived":false,"has_summary":false,"archetype":"private_message","slug":"pm-for-testing","category_id":null,"word_count":8,"deleted_at":null,"user_id":1,"draft":null,"draft_key":"topic_12","draft_sequence":2,"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":"test","avatar_template":"/images/avatar.png"},"last_poster":{"id":1,"username":"test","avatar_template":"/images/avatar.png"},"allowed_groups":[{"id":41,"automatic":false,"name":"Group","user_count":0,"alias_level":99,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":false,"full_name":null}],"allowed_users":[{"id":2,"username":"someguy","avatar_template":"/images/avatar.png"},{"id":1,"username":"test","avatar_template":"/images/avatar.png"}],"participants":[{"id":1,"username":"test","avatar_template":"/images/avatar.png","post_count":2,"primary_group_name":null,"primary_group_flair_url":null,"primary_group_flair_color":null,"primary_group_flair_bg_color":null}],"suggested_topics":[{"id":11,"title":"This is a very important announcement","fancy_title":"This is a very important announcement","slug":"this-is-a-very-important-announcement","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2017-01-27T03:52:02.061Z","last_posted_at":"2017-01-27T03:52:02.119Z","bumped":true,"bumped_at":"2017-01-27T03:52:02.119Z","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":"private_message","like_count":0,"views":1,"category_id":null,"featured_link":null,"posters":[{"extras":"latest single","description":"Original Poster, Most Recent Poster","user":{"id":1,"username":"test","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":2,"last_read_post_number":2,"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,"message_archived":false,"featured_link":null},
+"/t/299/1.json": {"post_stream":{"posts":[{"id":18,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:11.840Z","cooked":"<p>This is the first post.</p>","post_number":1,"post_type":1,"updated_at":"2015-08-13T14:49:11.840Z","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":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":false,"can_recover":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},{"id":19,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:18.231Z","cooked":"<p>This is the second post.</p>","post_number":2,"post_type":1,"updated_at":"2015-08-13T14:49:18.231Z","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":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":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},{"id":20,"username":"eviltrout","avatar_template":"/images/avatar.png","name":"Evil Trout","uploaded_avatar_id":9,"created_at":"2015-08-13T14:49:23.927Z","cooked":"<p>This is the third post.</p>","post_number":3,"post_type":1,"updated_at":"2015-08-13T14:49:23.927Z","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":9,"topic_slug":"this-is-a-test-topic","display_username":"","primary_group_name":null,"version":1,"can_edit":true,"can_delete":true,"can_recover":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}],"stream":[18,19,20]},"id":299,"title":"Look at this link","fancy_title":"Look at this link","posts_count":3,"created_at":"2015-08-13T14:49:11.720Z","views":1,"reply_count":0,"participant_count":1,"like_count":0,"last_posted_at":"2015-08-13T14:49:23.927Z","visible":true,"closed":false,"archived":false,"has_summary":false,"archetype":"regular","slug":"this-is-a-test-topic","category_id":1,"word_count":15,"deleted_at":null,"pending_posts_count":0,"user_id":1,"draft":null,"draft_key":"topic_9","draft_sequence":3,"posted":true,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"pinned_until":null,featured_link:"http://www.example.com/has-title.html","details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png"},"last_poster":{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png"},"participants":[{"id":1,"username":"tgxworld","uploaded_avatar_id":9,"avatar_template":"/images/avatar.png","post_count":3}],"suggested_topics":[{"id":8,"title":"This is a new and awesome topic!","fancy_title":"This is a new and awesome topic!","slug":"this-is-a-new-and-awesome-topic","posts_count":3,"reply_count":0,"highest_post_number":5,"image_url":null,"created_at":"2015-08-13T05:17:00.000Z","last_posted_at":"2015-08-13T10:14:34.799Z","bumped":true,"bumped_at":"2015-08-13T10:14:34.799Z","unseen":false,"last_read_post_number":5,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":2,"bookmarked":false,"liked":false,"archetype":"regular","like_count":0,"views":2,"category_id":1},{"id":7,"title":"This is a test category!","fancy_title":"This is a test category!","slug":"this-is-a-test-category","posts_count":3,"reply_count":0,"highest_post_number":3,"image_url":null,"created_at":"2015-08-10T13:40:38.439Z","last_posted_at":"2015-08-13T01:59:44.928Z","bumped":true,"bumped_at":"2015-08-13T01:58:35.206Z","unseen":false,"last_read_post_number":3,"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}],"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":3,"last_read_post_number":3,"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} };
diff --git a/test/javascripts/fixtures/user_fixtures.js.es6 b/test/javascripts/fixtures/user_fixtures.js.es6
index 28e5a9cf04..9a87fe9af8 100644
--- a/test/javascripts/fixtures/user_fixtures.js.es6
+++ b/test/javascripts/fixtures/user_fixtures.js.es6
@@ -1,6 +1,6 @@
 /*jshint maxlen:10000000 */
 export default {
-"/u/eviltrout.json": {"user_badges":[{"id":5870,"granted_at":"2014-05-16T02:39:38.388Z","badge_id":4,"user_id":19,"granted_by_id":-1},{"id":40673,"granted_at":"2014-03-31T14:23:18.060Z","post_id":7241,"post_number":19,"badge_id":23,"user_id":19,"granted_by_id":-1,"topic_id":3153},{"id":5868,"granted_at":"2014-05-16T02:39:38.380Z","badge_id":3,"user_id":19,"granted_by_id":-1}],"badges":[{"id":4,"name":"Leader","description":null,"grant_count":7,"allow_title":true,"multiple_grant":false,"icon":"fa-user","image":null,"listable":true,"enabled":true,"badge_grouping_id":4,"system":true,"badge_type_id":1},{"id":23,"name":"Great Share","description":null,"grant_count":14,"allow_title":false,"multiple_grant":true,"icon":"fa-certificate","image":null,"listable":true,"enabled":true,"badge_grouping_id":2,"system":true,"badge_type_id":1},{"id":3,"name":"Regular","description":null,"grant_count":30,"allow_title":true,"multiple_grant":false,"icon":"fa-user","image":null,"listable":true,"enabled":true,"badge_grouping_id":4,"system":true,"badge_type_id":2}],"badge_types":[{"id":1,"name":"Gold","sort_order":9},{"id":2,"name":"Silver","sort_order":8},{"id":3,"name":"Bronze","sort_order":7}],"users":[{"id":19,"username":"eviltrout","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"},{"id":-1,"username":"system","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/system/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"}],"topics":[{"id":3153,"title":"Is it better for Discourse to use JavaScript or CoffeeScript?","fancy_title":"Is it better for Discourse to use JavaScript or CoffeeScript?","slug":"is-it-better-for-discourse-to-use-javascript-or-coffeescript","posts_count":56}],"user":{"user_option":{},"id":19,"username":"eviltrout","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png","name":"Robin Ward","email":"robin.ward@example.com","last_posted_at":"2015-05-07T15:23:35.074Z","last_seen_at":"2015-05-13T14:34:23.188Z","bio_raw":"Co-founder of Discourse. Previously, I created <a href=\"http://forumwarz.com\">Forumwarz</a>. <a href=\"https://twitter.com/eviltrout\">Follow me on Twitter</a>.","bio_cooked":"<p>Co-founder of Discourse. Previously, I created <a href=\"http://forumwarz.com\">Forumwarz</a>. <a href=\"https://twitter.com/eviltrout\">Follow me on Twitter</a>.</p>","created_at":"2013-02-03T15:19:22.704Z","website":"http://eviltrout.com","location":"Toronto","can_edit":false,"can_edit_username":true,"can_edit_email":true,"can_edit_name":true,"stats":[{"action_type":13,"count":342,"id":null},{"action_type":12,"count":109,"id":null},{"action_type":4,"count":27,"id":null},{"action_type":5,"count":1607,"id":null},{"action_type":6,"count":771,"id":null},{"action_type":1,"count":333,"id":null},{"action_type":2,"count":2671,"id":null},{"action_type":7,"count":949,"id":null},{"action_type":9,"count":42,"id":null},{"action_type":3,"count":8,"id":null},{"action_type":11,"count":20,"id":null}],"can_send_private_messages":true,"can_send_private_message_to_user":false,"bio_excerpt":"Co-founder of Discourse. Previously, I created <a href=\"http://forumwarz.com\">Forumwarz</a>. <a href=\"https://twitter.com/eviltrout\">Follow me on Twitter</a>.","trust_level":4,"moderator":true,"admin":true,"title":"co-founder","badge_count":23,"notification_count":3244,"has_title_badges":true,"custom_fields":{},"user_fields":{"1":"33"},"pending_count":0,"post_count":1987,"can_be_deleted":false,"can_delete_all_posts":false,"locale":"","email_digests":true,"email_private_messages":true,"email_direct":true,"email_always":true,"digest_after_minutes":10080,"mailing_list_mode":false,"auto_track_topics_after_msecs":60000,"new_topic_duration_minutes":1440,"external_links_in_new_tab":false,"dynamic_favicon":true,"enable_quoting":true,"muted_category_ids":[],"tracked_category_ids":[],"watched_category_ids":[3],"private_messages_stats":{"all":101,"mine":13,"unread":3},"disable_jump_reply":false,"gravatar_avatar_upload_id":5275,"custom_avatar_upload_id":1573,"card_image_badge":"/images/avatar.png","card_image_badge_id":120,"muted_usernames":[],"invited_by":{"id":1,"username":"sam","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/sam/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"},"custom_groups":[{"id":44,"automatic":false,"name":"ubuntu","user_count":11,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null},{"id":47,"automatic":false,"name":"discourse","user_count":7,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null}],"featured_user_badge_ids":[5870,40673,5868],"card_badge":{"id":120,"name":"Garbage Man","description":"This Discourse developer successfully called something \"garbage!\"","grant_count":3,"allow_title":false,"multiple_grant":false,"icon":"/images/avatar.png","image":"/images/avatar.png","listable":false,"enabled":false,"badge_grouping_id":8,"system":false,"badge_type_id":3}}},
+"/u/eviltrout.json": {"user_badges":[{"id":5870,"granted_at":"2014-05-16T02:39:38.388Z","badge_id":4,"user_id":19,"granted_by_id":-1},{"id":40673,"granted_at":"2014-03-31T14:23:18.060Z","post_id":7241,"post_number":19,"badge_id":23,"user_id":19,"granted_by_id":-1,"topic_id":3153},{"id":5868,"granted_at":"2014-05-16T02:39:38.380Z","badge_id":3,"user_id":19,"granted_by_id":-1}],"badges":[{"id":4,"name":"Leader","description":null,"grant_count":7,"allow_title":true,"multiple_grant":false,"icon":"fa-user","image":null,"listable":true,"enabled":true,"badge_grouping_id":4,"system":true,"badge_type_id":1},{"id":23,"name":"Great Share","description":null,"grant_count":14,"allow_title":false,"multiple_grant":true,"icon":"fa-certificate","image":null,"listable":true,"enabled":true,"badge_grouping_id":2,"system":true,"badge_type_id":1},{"id":3,"name":"Regular","description":null,"grant_count":30,"allow_title":true,"multiple_grant":false,"icon":"fa-user","image":null,"listable":true,"enabled":true,"badge_grouping_id":4,"system":true,"badge_type_id":2}],"badge_types":[{"id":1,"name":"Gold","sort_order":9},{"id":2,"name":"Silver","sort_order":8},{"id":3,"name":"Bronze","sort_order":7}],"users":[{"id":19,"username":"eviltrout","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"},{"id":-1,"username":"system","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/system/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"}],"topics":[{"id":3153,"title":"Is it better for Discourse to use JavaScript or CoffeeScript?","fancy_title":"Is it better for Discourse to use JavaScript or CoffeeScript?","slug":"is-it-better-for-discourse-to-use-javascript-or-coffeescript","posts_count":56}],"user":{"user_option":{},"id":19,"username":"eviltrout","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png","name":"Robin Ward","email":"robin.ward@example.com","last_posted_at":"2015-05-07T15:23:35.074Z","last_seen_at":"2015-05-13T14:34:23.188Z","bio_raw":"Co-founder of Discourse. Previously, I created <a href=\"http://forumwarz.com\">Forumwarz</a>. <a href=\"https://twitter.com/eviltrout\">Follow me on Twitter</a>.","bio_cooked":"<p>Co-founder of Discourse. Previously, I created <a href=\"http://forumwarz.com\">Forumwarz</a>. <a href=\"https://twitter.com/eviltrout\">Follow me on Twitter</a>.</p>","created_at":"2013-02-03T15:19:22.704Z","website":"http://eviltrout.com","location":"Toronto","can_edit":false,"can_edit_username":true,"can_edit_email":true,"can_edit_name":true,"stats":[{"action_type":13,"count":342,"id":null},{"action_type":12,"count":109,"id":null},{"action_type":4,"count":27,"id":null},{"action_type":5,"count":1607,"id":null},{"action_type":6,"count":771,"id":null},{"action_type":1,"count":333,"id":null},{"action_type":2,"count":2671,"id":null},{"action_type":7,"count":949,"id":null},{"action_type":9,"count":42,"id":null},{"action_type":3,"count":8,"id":null},{"action_type":11,"count":20,"id":null}],"can_send_private_messages":true,"can_send_private_message_to_user":false,"bio_excerpt":"Co-founder of Discourse. Previously, I created <a href=\"http://forumwarz.com\">Forumwarz</a>. <a href=\"https://twitter.com/eviltrout\">Follow me on Twitter</a>.","trust_level":4,"moderator":true,"admin":true,"title":"co-founder","badge_count":23,"notification_count":3244,"has_title_badges":true,"custom_fields":{},"user_fields":{"1":"33"},"pending_count":0,"post_count":1987,"can_be_deleted":false,"can_delete_all_posts":false,"locale":"","email_digests":true,"email_private_messages":true,"email_direct":true,"email_always":true,"digest_after_minutes":10080,"mailing_list_mode":false,"auto_track_topics_after_msecs":60000,"new_topic_duration_minutes":1440,"external_links_in_new_tab":false,"dynamic_favicon":true,"enable_quoting":true,"muted_category_ids":[],"tracked_category_ids":[],"watched_category_ids":[3],"watched_first_post_category_ids":[],"private_messages_stats":{"all":101,"mine":13,"unread":3},"disable_jump_reply":false,"gravatar_avatar_upload_id":5275,"custom_avatar_upload_id":1573,"card_image_badge":"/images/avatar.png","card_image_badge_id":120,"muted_usernames":[],"invited_by":{"id":1,"username":"sam","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/sam/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"},"custom_groups":[{"id":44,"automatic":false,"name":"ubuntu","user_count":11,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null},{"id":47,"automatic":false,"name":"discourse","user_count":7,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null}],"featured_user_badge_ids":[5870,40673,5868],"card_badge":{"id":120,"name":"Garbage Man","description":"This Discourse developer successfully called something \"garbage!\"","grant_count":3,"allow_title":false,"multiple_grant":false,"icon":"/images/avatar.png","image":"/images/avatar.png","listable":false,"enabled":false,"badge_grouping_id":8,"system":false,"badge_type_id":3}}},
 "/user_actions.json": {"user_actions":[{"action_type":7,"created_at":"2014-01-16T14:13:05Z","excerpt":"So again,  \n\nWhat is the problem?\n\nI need to check user_trust_level , i get the &#39;username&#39; from a form via ajax, i need to check what level he is on discourse \n\nAlso, if possible, i would like to get other details as well, like email address etc. \n\nI took a look at : <a href='https://github.com/discourse/discourse_api' rel='nofollow'>https://github.com/discourse/dis&hellip;</a>","avatar_template":"//www.gravatar.com/avatar/bdab7e61b3191e483492fd680f563fed.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/bdab7e61b3191e483492fd680f563fed.png?s={size}&r=pg&d=identicon","slug":"how-to-check-the-user-level-via-ajax","topic_id":11993,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":1,"reply_to_post_number":null,"username":"Abhishek_Gupta","name":"Abhishek Gupta","user_id":8021,"acting_username":"Abhishek_Gupta","acting_name":"Abhishek Gupta","acting_user_id":8021,"title":"How to check the user level via ajax?","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-15T16:53:49Z","excerpt":"A good fix would be to have the ERB template do an if statement. We&#39;d happily accept a PR that did this if you feel up to it: \n\n &lt;% if SiteSetting.logo_url.present? %&gt;\n  display logo html\n&lt;% else %&gt;\n  display title html\n&lt;% end %&gt;","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"users-activate-account-pulling-blank-logo-instead-of-defaulting-to-h2","topic_id":10911,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":2,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"/users/activate-account pulling blank logo instead of defaulting to h2","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-15T15:21:37Z","excerpt":"A good fix would be to have the ERB template do an if statement. We&#39;d happily accept a PR that did this if you feel up to it: \n\n &lt;% if SiteSetting.logo_url.present? %&gt;\n  display logo html\n&lt;% else %&gt;\n  display title html\n&lt;% end %&gt;","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"users-activate-account-pulling-blank-logo-instead-of-defaulting-to-h2","topic_id":10911,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":2,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"/users/activate-account pulling blank logo instead of defaulting to h2","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-15T12:22:12Z","excerpt":"OK - i see what you mean. From the piwik code I should add: \n\n_paq.push([&quot;setDocumentTitle&quot;, document.domain + &quot;/&quot; + document.title]);\n\n? \n\nUnfortunately I have had to give up on Piwik for now because I have switched the forum to SSL on a free cert and have used up the free subdomain for the forum. &hellip;","avatar_template":"//localhost:3000/uploads/default/avatars/2a8/a3c/8fddcac642/{size}.jpg","acting_avatar_template":"//localhost:3000/uploads/default/avatars/2a8/a3c/8fddcac642/{size}.jpg","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":26,"reply_to_post_number":25,"username":"citkane","name":"Michael Jonker","user_id":7604,"acting_username":"citkane","acting_name":"Michael Jonker","acting_user_id":7604,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-15T11:16:36Z","excerpt":"<a class='mention' href='/users/eviltrout'>@eviltrout</a> recently added support for multiple API keys [wink] \n\n<a href='//meta.discourse.org/uploads/default/2905/4c8decfac1518ff6.png' target='_blank'>[]</a>","avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"allow-for-multiple-api-keys","topic_id":7444,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":null,"username":"zogstrip","name":"Régis Hanol","user_id":1995,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Allow for multiple API Keys","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-15T10:58:46Z","excerpt":"<a class='mention' href='/users/eviltrout'>@eviltrout</a> added a tooltip when you click on the user&#39;s avatar which allows you to show the posts made by that user \n\n[image]","avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"to-group-posts-by-a-user","topic_id":7412,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":4,"reply_to_post_number":3,"username":"zogstrip","name":"Régis Hanol","user_id":1995,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"To group posts by a user","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-15T10:36:15Z","excerpt":"<a class='mention' href='/users/eviltrout'>@eviltrout</a>  implemented per-user API key a while ago [wink] \n\n  <a href='//meta-discourse.r.worldssl.net/uploads/default/2905/4c8decfac1518ff6.png' class='lightbox' title='Topics_-_Discourse_Meta-5.png'>[image]\nTopics_-_Discourse_Meta-5.png884x339 29.6 KB\n</a>","avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"auth-using-rest-api","topic_id":5937,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":2,"username":"zogstrip","name":"Régis Hanol","user_id":1995,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Auth using REST API?","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-15T09:55:17Z","excerpt":"<a class='mention' href='/users/eviltrout'>@eviltrout</a> has recently introduced this feature and has even blogged about it: \n\n \n    \n      \n        <a href='http://eviltrout.com/2014/01/04/hiding-offscreen-ember.html' class='track-link' target='_blank'>\n          eviltrout.com\n        </a>\n      \n    \n  \n    \n    <a href='http://eviltrout.com/2014/01/04/hiding-offscreen-ember.html' target='_blank'>Hiding Offscreen Content in Ember.js - Evil Trout&#39;s Blog</a>","avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"infinite-scrolling-reusing-dom-nodes","topic_id":5186,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":null,"username":"zogstrip","name":"Régis Hanol","user_id":1995,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Infinite scrolling: Reusing DOM nodes","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-15T00:54:32Z","excerpt":"You can retrieve a user&#39;s JSON by making a call to /users/username.json but that assumes you know the user&#39;s username. If that&#39;s impossible, I would be happy to accept a PR that would return the current user JSON from /session/current-user or something like that. \n\nAdditionally, if you&#39;re looking to&hellip;","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/035d12bad251759d8fbc9fb10574d1f6.png?s={size}&r=pg&d=identicon","slug":"get-current-user-information-via-json","topic_id":11959,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"watchmanmonitor","acting_name":"Watchman Monitoring","acting_user_id":8085,"title":"Get current user information via JSON","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-14T21:59:51Z","excerpt":"You can retrieve a user&#39;s JSON by making a call to /users/username.json but that assumes you know the user&#39;s username. If that&#39;s impossible, I would be happy to accept a PR that would return the current user JSON from /session/current-user or something like that. \n\nAdditionally, if you&#39;re looking to&hellip;","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/9cfd2536afac32d209335b092094c12c.png?s={size}&r=pg&d=identicon","slug":"get-current-user-information-via-json","topic_id":11959,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"znation","acting_name":"znation","acting_user_id":8163,"title":"Get current user information via JSON","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-14T21:46:50Z","excerpt":"Okay I&#39;ve fixed the https [point_right] http links on the server side and in the Javascript click tracking as <a class='mention' href='/users/bhaelochon'>@BhaelOchon</a> pointed out. \n\nLet me know if you find anything else broken.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"broken-links-possibly-related-to-https","topic_id":11831,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":18,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Broken links, possibly related to HTTPS","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-14T21:43:28Z","excerpt":"Thanks for your help <a class='mention' href='/users/eviltrout'>@eviltrout</a>! I will consider making that change and sending a pull request. I may not get to it for a while. \n\nI am embedding Discourse on another site and it is mostly going well. I have indeed been using your blog for inspiration.","avatar_template":"//www.gravatar.com/avatar/9cfd2536afac32d209335b092094c12c.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/9cfd2536afac32d209335b092094c12c.png?s={size}&r=pg&d=identicon","slug":"get-current-user-information-via-json","topic_id":11959,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":2,"username":"znation","name":"znation","user_id":8163,"acting_username":"znation","acting_name":"znation","acting_user_id":8163,"title":"Get current user information via JSON","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-14T21:21:52Z","excerpt":"Okay I&#39;ve fixed the https [point_right] http links on the server side and in the Javascript click tracking as <a class='mention' href='/users/bhaelochon'>@BhaelOchon</a> pointed out. \n\nLet me know if you find anything else broken.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"broken-links-possibly-related-to-https","topic_id":11831,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":18,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Broken links, possibly related to HTTPS","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-14T21:03:07Z","excerpt":"Okay I&#39;ve fixed the https [point_right] http links on the server side and in the Javascript click tracking as <a class='mention' href='/users/bhaelochon'>@BhaelOchon</a> pointed out. \n\nLet me know if you find anything else broken.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"broken-links-possibly-related-to-https","topic_id":11831,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":18,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Broken links, possibly related to HTTPS","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-14T20:42:51Z","excerpt":"You can retrieve a user&#39;s JSON by making a call to /users/username.json but that assumes you know the user&#39;s username. If that&#39;s impossible, I would be happy to accept a PR that would return the current user JSON from /session/current-user or something like that. \n\nAdditionally, if you&#39;re looking to&hellip;","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"get-current-user-information-via-json","topic_id":11959,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Get current user information via JSON","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-14T20:29:23Z","excerpt":"You can retrieve a user&#39;s JSON by making a call to /users/username.json but that assumes you know the user&#39;s username. If that&#39;s impossible, I would be happy to accept a PR that would return the current user JSON from /session/current-user or something like that. \n\nAdditionally, if you&#39;re looking to&hellip;","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"get-current-user-information-via-json","topic_id":11959,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Get current user information via JSON","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-14T19:20:28Z","excerpt":"Perhaps the [&#39;trackpageView&#39;] is not the correct API call? We can probably send more information across such as the URL.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":25,"reply_to_post_number":24,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-14T19:19:46Z","excerpt":"Nope but I bet you can find one!","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"how-far-to-take-user-documentation","topic_id":11943,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":4,"reply_to_post_number":3,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"How far to take user documentation?","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-14T18:37:05Z","excerpt":"I&#39;d be glad to write a pull request to take use there.  Is there a specific part of their documentation you have in mind?","avatar_template":"//www.gravatar.com/avatar/035d12bad251759d8fbc9fb10574d1f6.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/035d12bad251759d8fbc9fb10574d1f6.png?s={size}&r=pg&d=identicon","slug":"how-far-to-take-user-documentation","topic_id":11943,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":2,"username":"watchmanmonitor","name":"Watchman Monitoring","user_id":8085,"acting_username":"watchmanmonitor","acting_name":"Watchman Monitoring","acting_user_id":8085,"title":"How far to take user documentation?","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-14T16:04:28Z","excerpt":"Thanks <a class='mention' href='/users/eviltrout'>@eviltrout</a> , the code in the &#39;bottom of pages&#39; now reads: \n\n&lt;script type=&quot;text/javascript&quot;&gt;\nDiscourse.PageTracker.current().on(&#39;change&#39;, function() {\n  console.log(&#39;tracked!&#39;)\n  _paq.push([&#39;trackPageView&#39;]);\n});\n&lt;/script&gt;\n\nThe console is logging &#39;tracked!&#39; and piwik is logging for each page c&hellip;","avatar_template":"//localhost:3000/uploads/default/avatars/2a8/a3c/8fddcac642/{size}.jpg","acting_avatar_template":"//localhost:3000/uploads/default/avatars/2a8/a3c/8fddcac642/{size}.jpg","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":23,"reply_to_post_number":22,"username":"citkane","name":"Michael Jonker","user_id":7604,"acting_username":"citkane","acting_name":"Michael Jonker","acting_user_id":7604,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-14T15:58:27Z","excerpt":"This topic is now archived. It is frozen and cannot be changed in any way.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"regression-cannot-sort-topic-list","topic_id":11944,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":4,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Regression: Cannot sort topic list","deleted":false,"hidden":false,"moderator_action":true,"edit_reason":null},{"action_type":5,"created_at":"2014-01-14T15:26:57Z","excerpt":"I do think that leading them into the official rails documentation at that point is not a bad idea. Like &quot;congratulations, everything is ready but now you&#39;ll need to understand the platform we built it in to be productive.&quot;","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"how-far-to-take-user-documentation","topic_id":11943,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"How far to take user documentation?","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-14T08:28:00Z","excerpt":"I&#39;ve just added the ability to list reply counts on your blog index and archive pages as you <a href='http://eviltrout.com/archives/' rel='nofollow'>can see here</a>.  \n\nIt works with a similar API to embedding comments: \n\n &lt;script type=&quot;text/javascript&quot;&gt;\n  var discourseUrl = &quot;http://fishtank.eviltrout.com/&quot;;\n\n  (function() {\n    var d = document.createEleme&hellip;","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"discourse-plugin-for-static-site-generators-like-jekyll-or-octopress","topic_id":7965,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":98,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Discourse plugin for static site generators like Jekyll or Octopress","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-14T00:21:26Z","excerpt":"In <a href='https://github.com/discourse/discourse/pull/1821' rel='nofollow'>pull request 1821</a>, <a class='mention' href='/users/eviltrout'>@eviltrout</a> asked: \n\n &quot;About rails s: I wouldn&#39;t be against adding it but at what point do we stop holding their hand and expect them to know how rails works? I&#39;m sure rails documentation could do a better job than us. Actually maybe we should just link to that? \n\nWhat point to &hellip;","avatar_template":"//www.gravatar.com/avatar/035d12bad251759d8fbc9fb10574d1f6.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/035d12bad251759d8fbc9fb10574d1f6.png?s={size}&r=pg&d=identicon","slug":"how-far-to-take-user-documentation","topic_id":11943,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":1,"reply_to_post_number":null,"username":"watchmanmonitor","name":"Watchman Monitoring","user_id":8085,"acting_username":"watchmanmonitor","acting_name":"Watchman Monitoring","acting_user_id":8085,"title":"How far to take user documentation?","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-13T21:58:28Z","excerpt":"It looks uneeded, but you need to review a fair amount of code to confirm it is not needed.  \n\nI am going to keep it for now cause its safer under some weird edge conditions.","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"ruby-question-about-use-of-klass-self-in-the-site-customization-rb","topic_id":11889,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":2,"username":"sam","name":"Sam Saffron","user_id":1,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Ruby question about use of klass=self in the site_customization.rb","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T21:11:32Z","excerpt":"I had to fix an issue with Google analytics so I added a new API hook that can be used. \n\nIf you add the following it should work: \n\n Discourse.PageTracker.current().on(&#39;change&#39;, function() {\n  _paq.push([&#39;trackPageView&#39;]);\n});","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-13T21:10:57Z","excerpt":"Having a look, the fix is a bit scary imho, we should fix the root issue.","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"error-after-update-to-0-9-8-1","topic_id":11903,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":11,"reply_to_post_number":10,"username":"sam","name":"Sam Saffron","user_id":1,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Error after update to 0.9.8.1","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T20:50:34Z","excerpt":"I&#39;ve just added the ability to list reply counts on your blog index and archive pages as you <a href='http://eviltrout.com/archives/' rel='nofollow'>can see here</a>.  \n\nIt works with a similar API to embedding comments: \n\n &lt;script type=&quot;text/javascript&quot;&gt;\n  var discourseUrl = &quot;http://fishtank.eviltrout.com/&quot;;\n\n  (function() {\n    var d = document.createEleme&hellip;","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//localhost:3000/uploads/default/avatars/527/614/d16e1504d9/{size}.jpg","slug":"discourse-plugin-for-static-site-generators-like-jekyll-or-octopress","topic_id":7965,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":98,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"trident","acting_name":"Ben T","acting_user_id":5707,"title":"Discourse plugin for static site generators like Jekyll or Octopress","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T20:44:56Z","excerpt":"I had to fix an issue with Google analytics so I added a new API hook that can be used. \n\nIf you add the following it should work: \n\n Discourse.PageTracker.current().on(&#39;change&#39;, function() {\n  _paq.push([&#39;trackPageView&#39;]);\n});","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-13T20:40:21Z","excerpt":"I had to fix an issue with Google analytics so I added a new API hook that can be used. \n\nIf you add the following it should work: \n\n Discourse.PageTracker.current().on(&#39;change&#39;, function() {\n  _paq.push([&#39;trackPageView&#39;]);\n});","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T19:52:04Z","excerpt":"<a class='mention' href='/users/sam'>@Sam</a> do you have any idea why only some people are getting this issue? I dont&#39; mind the proposed fix but I&#39;d prefer to know why it happens in the first place.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"error-after-update-to-0-9-8-1","topic_id":11903,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":10,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Error after update to 0.9.8.1","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T19:01:19Z","excerpt":"I&#39;ve just added the ability to list reply counts on your blog index and archive pages as you <a href='http://eviltrout.com/archives/' rel='nofollow'>can see here</a>.  \n\nIt works with a similar API to embedding comments: \n\n &lt;script type=&quot;text/javascript&quot;&gt;\n  var discourseUrl = &quot;http://fishtank.eviltrout.com/&quot;;\n\n  (function() {\n    var d = document.createEleme&hellip;","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"discourse-plugin-for-static-site-generators-like-jekyll-or-octopress","topic_id":7965,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":98,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Discourse plugin for static site generators like Jekyll or Octopress","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T18:50:14Z","excerpt":"I&#39;ve just added the ability to list reply counts on your blog index and archive pages as you <a href='http://eviltrout.com/archives/' rel='nofollow'>can see here</a>.  \n\nIt works with a similar API to embedding comments: \n\n &lt;script type=&quot;text/javascript&quot;&gt;\n  var discourseUrl = &quot;http://fishtank.eviltrout.com/&quot;;\n\n  (function() {\n    var d = document.createEleme&hellip;","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"discourse-plugin-for-static-site-generators-like-jekyll-or-octopress","topic_id":7965,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":98,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Discourse plugin for static site generators like Jekyll or Octopress","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-13T18:47:33Z","excerpt":"I am pretty sure that the denizens of SO are correct and the variable is unneeded. <a class='mention' href='/users/sam'>@sam</a> can confirm but it seems like it was once needed for something that has since been removed and the variable declaration was left intact.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"ruby-question-about-use-of-klass-self-in-the-site-customization-rb","topic_id":11889,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Ruby question about use of klass=self in the site_customization.rb","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-13T18:45:41Z","excerpt":"I&#39;ve just added the ability to list reply counts on your blog index and archive pages as you <a href='http://eviltrout.com/archives/' rel='nofollow'>can see here</a>.  \n\nIt works with a similar API to embedding comments: \n\n &lt;script type=&quot;text/javascript&quot;&gt;\n  var discourseUrl = &quot;http://fishtank.eviltrout.com/&quot;;\n\n  (function() {\n    var d = document.createEleme&hellip;","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"discourse-plugin-for-static-site-generators-like-jekyll-or-octopress","topic_id":7965,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":98,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Discourse plugin for static site generators like Jekyll or Octopress","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T17:19:08Z","excerpt":"<a class='mention' href='/users/sam'>@Sam</a> do you have any idea why only some people are getting this issue? I dont&#39; mind the proposed fix but I&#39;d prefer to know why it happens in the first place.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/5120fc4e345db0d1a964888272073819.png?s={size}&r=pg&d=identicon","slug":"error-after-update-to-0-9-8-1","topic_id":11903,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":10,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"riking","acting_name":"Kane York","acting_user_id":6626,"title":"Error after update to 0.9.8.1","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-13T16:41:31Z","excerpt":"I&#39;d love to see API support. <a class='mention' href='/users/sam'>@sam</a> and <a class='mention' href='/users/eviltrout'>@eviltrout</a>, I can facilitate an intro to the piwik guys if you want—I&#39;ve written about them before and they&#39;re typically super-responsive. Because I know you guys are totally hunting for new stuff to do [wink]","avatar_template":"//localhost:3000/uploads/default/avatars/95a/06d/c337428568/{size}.png","acting_avatar_template":"//localhost:3000/uploads/default/avatars/95a/06d/c337428568/{size}.png","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":20,"reply_to_post_number":null,"username":"Lee_Ars","name":"Lee_Ars","user_id":4457,"acting_username":"Lee_Ars","acting_name":"Lee_Ars","acting_user_id":4457,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T16:15:51Z","excerpt":"The code looks okay but it&#39;s hard to debug this way.  \n\nOne thing you could do is add a: console.log(&#39;tracked!&#39;) just before line 8. Then open a developer console and see if the javascript is running properly.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":18,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-13T15:10:41Z","excerpt":"This is really interesting. I&#39;d like to hear your findings.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"focus-events-track-which-window-is-the-last-active-instance-of-a-forum-edit","topic_id":11872,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":9,"reply_to_post_number":8,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Focus events: Track which window is the last active instance of a forum Edit","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-13T15:02:45Z","excerpt":"The code looks okay but it&#39;s hard to debug this way.  \n\nOne thing you could do is add a: console.log(&#39;tracked!&#39;) just before line 8. Then open a developer console and see if the javascript is running properly.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":18,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-13T14:53:13Z","excerpt":"<a class='mention' href='/users/sam'>@Sam</a> do you have any idea why only some people are getting this issue? I dont&#39; mind the proposed fix but I&#39;d prefer to know why it happens in the first place.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"error-after-update-to-0-9-8-1","topic_id":11903,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":10,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Error after update to 0.9.8.1","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-13T06:27:26Z","excerpt":"Can this be archived <a class='mention' href='/users/eviltrout'>@eviltrout</a>?","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"search-not-working-for-staff-users","topic_id":11371,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":13,"reply_to_post_number":null,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Search not working for Staff users","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-13T05:32:46Z","excerpt":"When you navigate to another topic using the &quot;suggested topics&quot; area we are not registering a page view with Google.  \n\n<a class='mention' href='/users/eviltrout'>@eviltrout</a> perhaps we should do this from discourse location instead of  application controller?","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"google-analytics-is-not-registering-page-views","topic_id":11914,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":1,"reply_to_post_number":null,"username":"sam","name":"Sam Saffron","user_id":1,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Google analytics is not registering page views","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-13T02:50:25Z","excerpt":"<a class='mention' href='/users/eviltrout'>@eviltrout</a> any ideas here, the code seems correct","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":17,"reply_to_post_number":16,"username":"sam","name":"Sam Saffron","user_id":1,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-12T22:31:35Z","excerpt":"This is an interesting approach an an interesting feature. <a class='mention' href='/users/eviltrout'>@eviltrout</a> your thoughts. Essentially allows us to have notifications cross tabs.","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"focus-events-track-which-window-is-the-last-active-instance-of-a-forum-edit","topic_id":11872,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":4,"reply_to_post_number":1,"username":"sam","name":"Sam Saffron","user_id":1,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Focus events: Track which window is the last active instance of a forum Edit","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-12T18:01:04Z","excerpt":"This was the link  \n\n<a href='https://github.com/metricfu/metric_fu/blob/b1bf8feb921916fc265f041efa3157a6a6530a9b/lib/metric_fu/logging/mf_debugger.rb#L24' rel='nofollow'>metric_fu</a> \n\n[metric_fu](https://github.com/metricfu/metric_fu/blob/b1bf8feb921916fc265f041efa3157a6a6530a9b/lib/metric_fu/logging/mf_debugger.rb#L24)\n\nSeems to work fine now that <a class='mention' href='/users/eviltrout'>@eviltrout</a> worked so hard to get us MDTest 1.1 compliant.","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"underscores-in-linked-text-can-cause-markdown-bug","topic_id":10848,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":null,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Underscores in linked text can cause markdown bug","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-12T04:14:06Z","excerpt":"Awesome plugin, but doesn&#39;t seem to work out of the box with images \n\n<a href='https://github.com/discourse/discourse-spoiler-alert/issues/2' class='onebox' target='_blank' rel='nofollow'>https://github.com/discourse/discourse-spoiler-alert/issues/2</a>","avatar_template":"//localhost:3000/uploads/default/avatars/276/f19/3826efe463/{size}.jpg","acting_avatar_template":"//localhost:3000/uploads/default/avatars/276/f19/3826efe463/{size}.jpg","slug":"brand-new-plugin-interface","topic_id":8793,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":64,"reply_to_post_number":44,"username":"xrvk","name":"Eero Heikkinen","user_id":8068,"acting_username":"xrvk","acting_name":"Eero Heikkinen","acting_user_id":8068,"title":"Brand new plugin interface","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-11T23:36:11Z","excerpt":"A few things,  \n\n<a class='mention' href='/users/eviltrout'>@eviltrout</a> myself and many others have discourse_docker hosted on DigitalOcean, my user cpu is usually around 2% I have plenty of capacity.  \n\nI know that stonehearth and other larger scale discourse work on DigitalOcean fine. Officially we strongly recommend a 2GB instance, thoug&hellip;","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"performance-issue-on-digital-ocean-with-discourse-docker","topic_id":11895,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"sam","name":"Sam Saffron","user_id":1,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Performance issue on DigitalOcean with discourse_docker","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-11T00:58:23Z","excerpt":"Confirmed on try.discourse.org, this is still an issue. \n\n<a class='mention' href='/users/eviltrout'>@eviltrout</a> can you add that to your list -- unless you are a staff member you should not be able to delete (your own) posts from an archived topic.","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"archived-discussions-still-allow-posts-to-be-deleted","topic_id":6479,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":null,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Archived discussions still allow posts to be deleted","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-11T00:35:38Z","excerpt":"Agree, <a class='mention' href='/users/eviltrout'>@eviltrout</a> can you make sure the usercard is using the same logic as the user page in displaying profile info?","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"usercard-does-not-resize-for-obnoxiously-large-images","topic_id":11007,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":5,"reply_to_post_number":4,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Usercard does not resize for obnoxiously large images","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-11T00:34:06Z","excerpt":"<a class='mention' href='/users/eviltrout'>@eviltrout</a> can you make sure the &quot;import post&quot; button is suppressed on the user page when editing &quot;about me&quot;?  \n\n(I agree it is like a &quot;lose all my work&quot; button on that page if you happen to press it..) \n\nThen I can archive this.","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"quote-post-button-should-be-disabled-or-raise-an-error-when-creating-a-new-topic","topic_id":834,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":5,"reply_to_post_number":4,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"\"Quote Post\" button should be disabled or raise an error when creating a new topic","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-10T21:00:11Z","excerpt":"&gt;\n\nLooks good now. Thanks for these fixes <a class='mention' href='/users/eviltrout'>@eviltrout</a>, we (and markdown-js) are now MDTest 1.1 compliant!","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"text-editor-issue-with-the-code-block","topic_id":10050,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":5,"reply_to_post_number":null,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Text Editor issue with the code block","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":1,"created_at":"2014-01-10T20:07:46Z","excerpt":"We can&#39;t repro that one, also seems a bit obscure. But thank you very much for all the reports, whenever I see a bug entry from YOU I always know it is going to be a good one based on experience here and elsewhere. [trophy]","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"security-error-on-console-noticed-on-meta","topic_id":11825,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":12,"reply_to_post_number":11,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Security Error on console (noticed on meta)","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-10T19:48:08Z","excerpt":"Thanks for letting us know. It turns out that by using minutely(5) instead of minutely causes ice_cube to peg a core at 100% usage. I&#39;ve pushed out a fix in master.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"sidekiq-cpu-load-since-latest-release","topic_id":9515,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Sidekiq CPU load since latest release","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-10T19:47:17Z","excerpt":"Thanks for letting us know. It turns out that by using minutely(5) instead of minutely causes ice_cube to peg a core at 100% usage. I&#39;ve pushed out a fix in master.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/42776c4982dff1fa45ee8248532f8ad0.png?s={size}&r=pg&d=identicon","slug":"sidekiq-cpu-load-since-latest-release","topic_id":9515,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"neil","acting_name":"Neil","acting_user_id":2,"title":"Sidekiq CPU load since latest release","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-10T17:39:24Z","excerpt":"We should consider doing what Google Drive does: they intercept cmd-f and pop up a box that allows you to dynamically search.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/5120fc4e345db0d1a964888272073819.png?s={size}&r=pg&d=identicon","slug":"ctrl-f-search-is-interrupted-by-quotation-popup","topic_id":7114,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":12,"reply_to_post_number":11,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"riking","acting_name":"Kane York","acting_user_id":6626,"title":"Ctrl+F search is interrupted by quotation popup","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-10T17:29:15Z","excerpt":"Thanks for letting us know. It turns out that by using minutely(5) instead of minutely causes ice_cube to peg a core at 100% usage. I&#39;ve pushed out a fix in master.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/5120fc4e345db0d1a964888272073819.png?s={size}&r=pg&d=identicon","slug":"sidekiq-cpu-load-since-latest-release","topic_id":9515,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"riking","acting_name":"Kane York","acting_user_id":6626,"title":"Sidekiq CPU load since latest release","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-10T17:24:37Z","excerpt":"Thanks for letting us know. It turns out that by using minutely(5) instead of minutely causes ice_cube to peg a core at 100% usage. I&#39;ve pushed out a fix in master.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"sidekiq-cpu-load-since-latest-release","topic_id":9515,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Sidekiq CPU load since latest release","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-10T17:02:35Z","excerpt":"Fixed [smile] \n\ntop - 12:02:00 up 12 days,  2:16,  1 user,  load average: 0.28, 0.92, 0.97\nTasks: 115 total,   1 running, 114 sleeping,   0 stopped,   0 zombie\nCpu0  :  0.7%us,  0.3%sy,  0.0%ni, 99.0%id,  0.0%wa,  0.0%hi,  0.0%si,  0.0%st\nCpu1  :  0.7%us,  0.3%sy,  0.0%ni, 99.0%id,  0.0%wa,  0.0%hi,&hellip;","avatar_template":"//localhost:3000/uploads/default/avatars/886/ea8/e533d87fd9/{size}.png","acting_avatar_template":"//localhost:3000/uploads/default/avatars/886/ea8/e533d87fd9/{size}.png","slug":"sidekiq-cpu-load-since-latest-release","topic_id":9515,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":23,"reply_to_post_number":22,"username":"michaeld","name":"Michael","user_id":6548,"acting_username":"michaeld","acting_name":"Michael","acting_user_id":6548,"title":"Sidekiq CPU load since latest release","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-10T16:58:12Z","excerpt":"Thanks for letting us know. It turns out that by using minutely(5) instead of minutely causes ice_cube to peg a core at 100% usage. I&#39;ve pushed out a fix in master.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//localhost:3000/uploads/default/avatars/527/614/d16e1504d9/{size}.jpg","slug":"sidekiq-cpu-load-since-latest-release","topic_id":9515,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"trident","acting_name":"Ben T","acting_user_id":5707,"title":"Sidekiq CPU load since latest release","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null}]},
 "/topics/created-by/eviltrout.json": {"users":[{"id":19,"username":"eviltrout","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon"},{"id":5460,"username":"ned","avatar_template":"//localhost:3000/uploads/default/avatars/06b/90d/3b3ea7e56b/{size}.png"},{"id":402,"username":"thebrianbarlow","avatar_template":"//www.gravatar.com/avatar/5ddf2459e8edd6cf52dfff6cb41ca70d.png?s={size}&r=pg&d=identicon"},{"id":5707,"username":"trident","avatar_template":"//localhost:3000/uploads/default/avatars/527/614/d16e1504d9/{size}.jpg"},{"id":32,"username":"codinghorror","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon"},{"id":1995,"username":"zogstrip","avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon"},{"id":2702,"username":"ryanflorence","avatar_template":"//www.gravatar.com/avatar/749001c9fe6927c4b069a45c2a3d68f7.png?s={size}&r=pg&d=identicon"},{"id":9,"username":"tms","avatar_template":"//www.gravatar.com/avatar/3981cd271c302f5cba628c6b6d2b32ee.png?s={size}&r=pg&d=identicon"},{"id":1,"username":"sam","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon"},{"id":2636,"username":"lonnon","avatar_template":"//www.gravatar.com/avatar/9489ef302fbff6c19bba507d09f8cd1d.png?s={size}&r=pg&d=identicon"}],"topic_list":{"can_create_topic":false,"draft":null,"draft_key":"new_topic","draft_sequence":null,"topics":[{"id":7764,"title":"New: Reply via Email Support!","fancy_title":"New: Reply via Email Support!","slug":"new-reply-via-email-support","posts_count":32,"reply_count":24,"highest_post_number":35,"image_url":"/uploads/meta_discourse/1227/8f4e5818dfaa56c7.png","created_at":"2013-06-25T11:58:39.000-04:00","last_posted_at":"2014-01-09T18:53:06.000-05:00","bumped":true,"bumped_at":"2014-01-09T17:09:40.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":2201,"like_count":46,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":19},{"extras":null,"description":"Most Posts","user_id":5460},{"extras":null,"description":"Frequent Poster","user_id":402},{"extras":null,"description":"Frequent Poster","user_id":5707},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":9318,"title":"Discourse has a new Markdown Parser!","fancy_title":"Discourse has a new Markdown Parser!","slug":"discourse-has-a-new-markdown-parser","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2013-08-24T14:08:06.000-04:00","last_posted_at":"2013-08-24T14:08:06.000-04:00","bumped":true,"bumped_at":"2013-08-24T14:13:25.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":812,"like_count":13,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":19}]},{"id":7019,"title":"Discourse Ember Refactorings","fancy_title":"Discourse Ember Refactorings","slug":"discourse-ember-refactorings","posts_count":5,"reply_count":3,"highest_post_number":5,"image_url":null,"created_at":"2013-05-30T11:16:36.000-04:00","last_posted_at":"2013-06-02T11:22:58.000-04:00","bumped":true,"bumped_at":"2013-06-02T11:22:58.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":1075,"like_count":15,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":19},{"extras":null,"description":"Most Posts","user_id":1995},{"extras":null,"description":"Frequent Poster","user_id":2702}]},{"id":4650,"title":"Migrating off Active Record Observers","fancy_title":"Migrating off Active Record Observers","slug":"migrating-off-active-record-observers","posts_count":8,"reply_count":7,"highest_post_number":8,"image_url":null,"created_at":"2013-03-11T11:26:13.000-04:00","last_posted_at":"2013-05-14T18:40:16.000-04:00","bumped":true,"bumped_at":"2013-05-14T18:40:16.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":377,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":19},{"extras":null,"description":"Most Posts","user_id":9},{"extras":null,"description":"Frequent Poster","user_id":1995},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":4960,"title":"Vagrant Updates!","fancy_title":"Vagrant Updates!","slug":"vagrant-updates","posts_count":5,"reply_count":3,"highest_post_number":5,"image_url":"/plugins/emoji/images/fish.png","created_at":"2013-03-20T22:29:22.000-04:00","last_posted_at":"2013-03-21T19:06:40.000-04:00","bumped":true,"bumped_at":"2013-03-21T19:06:40.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":500,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":19},{"extras":null,"description":"Most Posts","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":1995}]},{"id":2918,"title":"New: Updated Docs","fancy_title":"New: Updated Docs","slug":"new-updated-docs","posts_count":3,"reply_count":2,"highest_post_number":3,"image_url":null,"created_at":"2013-02-12T12:13:02.000-05:00","last_posted_at":"2013-02-15T17:57:19.000-05:00","bumped":true,"bumped_at":"2013-02-15T17:57:19.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":457,"like_count":10,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":10,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":19},{"extras":null,"description":"Most Posts","user_id":2636}]}]}}
 };
diff --git a/test/javascripts/fixtures/watched-words-fixtures.js.es6 b/test/javascripts/fixtures/watched-words-fixtures.js.es6
new file mode 100644
index 0000000000..5555923385
--- /dev/null
+++ b/test/javascripts/fixtures/watched-words-fixtures.js.es6
@@ -0,0 +1,12 @@
+export default {
+  "/admin/logs/watched_words.json": {
+    "actions": ["block", "censor", "require_approval", "flag"],
+    "words": [
+      {id: 1, word: "liquorice", action: "block"},
+      {id: 2, word: "anise", action: "block"},
+      {id: 3, word: "pyramid", action: "flag"},
+      {id: 4, word: "scheme", action: "flag"},
+      {id: 5, word: "coupon", action: "require_approval"}
+    ]
+  }
+};
diff --git a/test/javascripts/helpers/assertions.js b/test/javascripts/helpers/assertions.js
index 66b6fc8f84..95d7b2a7dd 100644
--- a/test/javascripts/helpers/assertions.js
+++ b/test/javascripts/helpers/assertions.js
@@ -8,24 +8,10 @@ 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;
 }
 
-Ember.Test.registerAsyncHelper('selectDropdown', function(app, selector, itemId) {
-  var $select2 = find(selector);
-  $select2.select2('val', itemId.toString());
-  $select2.trigger("change");
-});
-
 function invisible(selector) {
   var $items = find(selector + ":visible");
   return $items.length === 0 ||
diff --git a/test/javascripts/helpers/component-test.js.es6 b/test/javascripts/helpers/component-test.js.es6
index 341c106b33..24c99aa63c 100644
--- a/test/javascripts/helpers/component-test.js.es6
+++ b/test/javascripts/helpers/component-test.js.es6
@@ -33,10 +33,10 @@ export default function(name, opts) {
                               { instantiate: false });
     }
 
-    this.registry.register('store:main', store, { instantiate: false });
+    this.registry.register('service:store', 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 85d171a37f..b0bb47e3e8 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -1,5 +1,6 @@
 import storePretender from 'helpers/store-pretender';
 import fixturePretender from 'helpers/fixture-pretender';
+import flagPretender from 'helpers/flag-pretender';
 
 export function parsePostData(query) {
   const result = {};
@@ -20,7 +21,7 @@ export function parsePostData(query) {
   return result;
 };
 
-function response(code, obj) {
+export function response(code, obj) {
   if (typeof code === "object") {
     obj = code;
     code = 200;
@@ -28,7 +29,10 @@ function response(code, obj) {
   return [code, {"Content-Type": "application/json"}, obj];
 }
 
-const success = () => response({ success: true });
+export function success() {
+  return response({ success: true });
+}
+
 const loggedIn = () => !!Discourse.User.current();
 
 
@@ -38,6 +42,7 @@ export default function() {
 
   const server = new Pretender(function() {
     storePretender.call(this, helpers);
+    flagPretender.call(this, helpers);
     const fixturesByUrl = fixturePretender.call(this, helpers);
 
     this.get('/admin/plugins', () => response({ plugins: [] }));
@@ -63,7 +68,7 @@ export default function() {
       }] });
     });
 
-    this.get(`/u/eviltrout/emails.json`, () => {
+    this.get(`/u/:username/emails.json`, () => {
       return response({ email: 'eviltrout@example.com' });
     });
 
@@ -76,12 +81,20 @@ export default function() {
     this.get('/u/eviltrout/summary.json', () => {
       return response({
         user_summary: {
-          topics: [],
-          topic_ids: [],
-          replies: [],
-          links: []
+          topic_ids: [1234],
+          replies: [{ topic_id: 1234 }],
+          links: [{ topic_id: 1234, url: 'https://eviltrout.com' }],
+          most_replied_to_users: [ { id: 333 } ],
+          most_liked_by_users: [ { id: 333 } ],
+          most_liked_users: [ { id: 333 } ],
+          badges: [ { badge_id: 444 } ]
         },
-        topics: [],
+        badges: [
+          { id: 444, count: 1 }
+        ],
+        topics: [
+          { id: 1234, title: 'cool title', url: '/t/1234/cool-title' }
+        ],
       });
     });
 
@@ -108,6 +121,16 @@ export default function() {
             id: 1234
           }]
         });
+      } else if (request.queryParams.q === 'evil') {
+        return response({
+          posts: [{
+            id: 1234
+          }],
+          tags: [{
+            id: 6,
+            name: 'eviltrout'
+          }]
+        });
       }
 
       return response({});
@@ -116,9 +139,11 @@ export default function() {
     this.put('/u/eviltrout.json', () => response({ user: {} }));
 
     this.get("/t/280.json", () => response(fixturesByUrl['/t/280/1.json']));
+    this.get("/t/280/20.json", () => response(fixturesByUrl['/t/280/1.json']));
     this.get("/t/28830.json", () => response(fixturesByUrl['/t/28830/1.json']));
     this.get("/t/9.json", () => response(fixturesByUrl['/t/9/1.json']));
     this.get("/t/12.json", () => response(fixturesByUrl['/t/12/1.json']));
+    this.put("/t/1234/re-pin", success);
 
     this.get("/t/id_for/:slug", () => {
       return response({id: 280, slug: "internationalization-localization", url: "/t/internationalization-localization/280"});
@@ -255,6 +280,10 @@ export default function() {
       return response(200, fixturesByUrl['/groups.json']);
     });
 
+    this.get("groups/search.json", () => {
+      return response(200, []);
+    });
+
     this.get("/groups/discourse/topics.json", () => {
       return response(200, fixturesByUrl['/groups/discourse/posts.json']);
     });
@@ -277,6 +306,10 @@ export default function() {
       return response(200, [ { id: 2222, post_number: 2222 } ]);
     });
 
+    this.get("/posts/:post_id/reply-ids.json", () => {
+      return response(200, { direct_reply_ids: [45], all_reply_ids: [45, 100] });
+    });
+
     this.post('/user_badges', () => response(200, fixturesByUrl['/user_badges']));
     this.delete('/user_badges/:badge_id', success);
 
@@ -329,11 +362,51 @@ export default function() {
     });
 
     this.get('/tag_groups', () => response(200, {tag_groups: []}));
+
+    this.get('/admin/users/1234.json', () => {
+      return response(200, {
+        id: 1234,
+        username: 'regular',
+      });
+    });
+
+    this.get('/admin/users/2.json', () => {
+      return response(200, {
+        id: 2,
+        username: 'sam',
+        admin: true
+      });
+    });
+
     this.post('/admin/users/:user_id/generate_api_key', success);
     this.delete('/admin/users/:user_id/revoke_api_key', success);
+    this.delete('/admin/users/:user_id.json', () => response(200, { deleted: true }));
     this.post('/admin/badges', success);
     this.delete('/admin/badges/:id', success);
 
+    this.get('/admin/logs/watched_words', () => {
+      return response(200, fixturesByUrl['/admin/logs/watched_words.json']);
+    });
+    this.delete('/admin/logs/watched_words/:id.json', success);
+
+    this.post('/admin/logs/watched_words.json', request => {
+      const result = parsePostData(request.requestBody);
+      result.id = new Date().getTime();
+      return response(200, result);
+    });
+
+    this.get('/admin/logs/search_logs.json', () => {
+      return response(200, [
+        {"term":"foobar","searches":35,"click_through":6,"unique":16}
+      ]);
+    });
+
+    this.get('/admin/logs/search_logs/term/ruby.json', () => {
+      return response(200, {
+        "term":{"type":"search_log_term","title":"Search Count","data":[{"x":"2017-07-20","y":2}]}
+      });
+    });
+
     this.get('/onebox', request => {
       if (request.queryParams.url === 'http://www.example.com/has-title.html' ||
           request.queryParams.url === 'http://www.example.com/has-title-and-a-url-that-is-more-than-80-characters-because-thats-good-for-seo-i-guess.html') {
diff --git a/test/javascripts/helpers/create-store.js.es6 b/test/javascripts/helpers/create-store.js.es6
index 9ad8d169c5..8788af03ad 100644
--- a/test/javascripts/helpers/create-store.js.es6
+++ b/test/javascripts/helpers/create-store.js.es6
@@ -11,8 +11,10 @@ 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 });
+          }
+          return this._restAdapter;
         }
         if (type === "key-value-store:main") {
           this._kvs = this._kvs || new KeyValueStore();
@@ -35,4 +37,3 @@ export default function() {
     }
   });
 }
-
diff --git a/test/javascripts/helpers/flag-pretender.js.es6 b/test/javascripts/helpers/flag-pretender.js.es6
new file mode 100644
index 0000000000..f42221453c
--- /dev/null
+++ b/test/javascripts/helpers/flag-pretender.js.es6
@@ -0,0 +1,71 @@
+export default function(helpers) {
+  const { response, success } = helpers;
+
+  const eviltrout = {
+    id: 1,
+    username: "eviltrout",
+    avatar_template:"/images/avatar.png",
+  };
+  const sam = {
+    id: 2,
+    username: "sam",
+    avatar_template:"/images/avatar.png",
+    can_delete_all_posts: true,
+    can_be_deleted: true,
+    post_count: 1,
+    topic_count: 0
+  };
+
+  this.get('/admin/flagged_topics', () => {
+    return response(200, {
+      "flagged_topics": [
+        {
+          id: 280,
+          user_ids: [eviltrout.id, sam.id],
+          flag_counts: [
+            { flag_type_id: 1, count: 3 },
+            { flag_type_id: 2, count: 2 },
+            { flag_type_id: 3, count: 1 },
+          ]
+        }
+      ],
+      "users": [ eviltrout, sam ],
+      "__rest_serializer":"1"
+    });
+  });
+
+  this.get('/admin/flags/active.json', () => {
+    return response(200, {
+      flagged_posts: [
+        {
+          id: 1,
+          user_id: sam.id,
+          post_action_ids: [1]
+        }
+      ],
+      users: [eviltrout, sam],
+      topics: [],
+      post_actions: [{
+        id: 1,
+        user_id: eviltrout.id,
+        post_action_type_id: 8,
+        name_key: 'spam',
+        conversation: {
+          response: {
+            user_id: eviltrout.id,
+            excerpt: "hello",
+          },
+          reply: {
+            user_id: eviltrout.id,
+            excerpt: "goodbye"
+          }
+        }
+      }],
+      "__rest_serializer": "1"
+    });
+  });
+
+  this.post('/admin/flags/agree/1', success);
+  this.post('/admin/flags/defer/1', success);
+  this.post('/admin/flags/disagree/1', success);
+}
diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6
index 32747f9c5a..4a12fc2239 100644
--- a/test/javascripts/helpers/qunit-helpers.js.es6
+++ b/test/javascripts/helpers/qunit-helpers.js.es6
@@ -1,7 +1,6 @@
-/* global asyncTest, fixtures */
+/* global QUnit, resetSite */
 
 import sessionFixtures from 'fixtures/session-fixtures';
-import siteFixtures from 'fixtures/site-fixtures';
 import HeaderComponent from 'discourse/components/site-header';
 import { forceMobile, resetMobile } from 'discourse/lib/mobile';
 import { resetPluginApi } from 'discourse/lib/plugin-api';
@@ -9,13 +8,13 @@ import { clearCache as clearOutletCache, resetExtraClasses } from 'discourse/lib
 import { clearHTMLCache } from 'discourse/helpers/custom-html';
 import { flushMap } from 'discourse/models/store';
 import { clearRewrites } from 'discourse/lib/url';
+import { initSearchData } from 'discourse/widgets/search-menu';
 
-
-function currentUser() {
+export function currentUser() {
   return Discourse.User.create(sessionFixtures['/session/current.json'].current_user);
 }
 
-function logIn() {
+export function logIn() {
   Discourse.User.resetCurrent(currentUser());
 }
 
@@ -39,36 +38,45 @@ function AcceptanceModal(option, _relatedTarget) {
 window.bootbox.$body = $('#ember-testing');
 $.fn.modal = AcceptanceModal;
 
-function acceptance(name, options) {
-  module("Acceptance: " + name, {
-    setup() {
+let _pretenderCallbacks = [];
+
+export function applyPretender(server, helper) {
+  _pretenderCallbacks.forEach(cb => cb(server, helper));
+}
+
+export function acceptance(name, options) {
+  options = options || {};
+
+  if (options.pretend) {
+    _pretenderCallbacks.push(options.pretend);
+  }
+
+  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) {
-          forceMobile();
-        }
+      if (options.mobileView) {
+        forceMobile();
+      }
 
-        if (options.loggedIn) {
-          logIn();
-        }
+      if (options.loggedIn) {
+        logIn();
+      }
 
-        if (options.settings) {
-          Discourse.SiteSettings = jQuery.extend(true, Discourse.SiteSettings, options.settings);
-        }
+      if (options.settings) {
+        Discourse.SiteSettings = jQuery.extend(true, Discourse.SiteSettings, options.settings);
+      }
 
-        if (options.site) {
-          Discourse.Site.resetCurrent(Discourse.Site.create(jQuery.extend(true, {}, siteJson, options.site)));
-        }
+      if (options.site) {
+        resetSite(Discourse.SiteSettings, options.site);
       }
 
       clearOutletCache();
@@ -77,69 +85,87 @@ 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();
+      localStorage.clear();
       Discourse.User.resetCurrent();
-      Discourse.Site.resetCurrent(Discourse.Site.create(jQuery.extend(true, {}, fixtures['site.json'].site)));
-
+      resetSite(Discourse.SiteSettings);
       resetExtraClasses();
       clearOutletCache();
       clearHTMLCache();
       resetPluginApi();
       clearRewrites();
+      initSearchData();
       Discourse.reset();
     }
   });
 }
 
-function controllerFor(controller, model) {
+export function controllerFor(controller, model) {
   controller = Discourse.__container__.lookup('controller:' + controller);
   if (model) { controller.set('model', model ); }
   return controller;
 }
 
-function asyncTestDiscourse(text, func) {
-  asyncTest(text, function () {
-    var self = this;
-    Ember.run(function () {
-      func.call(self);
+export function asyncTestDiscourse(text, func) {
+  QUnit.test(text, function(assert) {
+    const done = assert.async();
+    Ember.run(() => {
+      func.call(this, assert);
+      done();
     });
   });
 }
 
-function fixture(selector) {
+export function fixture(selector) {
   if (selector) {
     return $("#qunit-fixture").find(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
+  });
+};
+
+export function waitFor(assert, callback, timeout) {
   timeout = timeout || 500;
-  stop();
+
+  const done = assert.async();
   Ember.run.later(() => {
     callback();
-    start();
+    done();
   }, timeout);
 }
-
-export { acceptance,
-         controllerFor,
-         asyncTestDiscourse,
-         fixture,
-         logIn,
-         currentUser,
-         blank,
-         present,
-         waitFor };
diff --git a/test/javascripts/helpers/select-kit-helper.js b/test/javascripts/helpers/select-kit-helper.js
new file mode 100644
index 0000000000..be2debd6a8
--- /dev/null
+++ b/test/javascripts/helpers/select-kit-helper.js
@@ -0,0 +1,196 @@
+function checkSelectKitIsNotExpanded(selector) {
+  if (find(selector).hasClass('is-expanded')) {
+    throw 'You expected select-kit to be collapsed but it is expanded.';
+  }
+}
+
+function checkSelectKitIsNotCollapsed(selector) {
+  if (!find(selector).hasClass('is-expanded')) {
+    throw 'You expected select-kit to be expanded but it is collapsed.';
+  }
+}
+
+Ember.Test.registerAsyncHelper('expandSelectKit', function(app, selector) {
+  checkSelectKitIsNotExpanded(selector);
+  click(selector + ' .select-kit-header');
+});
+
+Ember.Test.registerAsyncHelper('collapseSelectKit', function(app, selector) {
+  checkSelectKitIsNotCollapsed(selector);
+  click(selector + ' .select-kit-header');
+});
+
+Ember.Test.registerAsyncHelper('selectKitFillInFilter', function(app, filter, selector) {
+  checkSelectKitIsNotCollapsed(selector);
+  fillIn(selector + ' .filter-input', filter);
+});
+
+Ember.Test.registerAsyncHelper('selectKitSelectRowByValue', function(app, value, selector) {
+  checkSelectKitIsNotCollapsed(selector);
+  click(selector + " .select-kit-row[data-value='" + value + "']");
+});
+
+Ember.Test.registerAsyncHelper('selectKitSelectRowByName', function(app, name, selector) {
+  checkSelectKitIsNotCollapsed(selector);
+  click(selector + " .select-kit-row[data-name='" + name + "']");
+});
+
+Ember.Test.registerAsyncHelper('selectKitSelectNoneRow', function(app, selector) {
+  checkSelectKitIsNotCollapsed(selector);
+  click(selector + " .select-kit-row.none");
+});
+
+Ember.Test.registerAsyncHelper('selectKitSelectRowByIndex', function(app, index, selector) {
+  checkSelectKitIsNotCollapsed(selector);
+  click(find(selector + " .select-kit-row").eq(index));
+});
+
+function selectKit(selector) { // eslint-disable-line no-unused-vars
+  selector = selector || ".select-kit";
+
+  function rowHelper(row) {
+    return {
+      name: function() { return row.attr('data-name'); },
+      icon: function() { return row.find('.d-icon'); },
+      title: function() { return row.attr('title'); },
+      value: function() { return row.attr('data-value'); },
+      exists: function() { return exists(row); },
+      el: function() { return row; }
+    };
+  }
+
+  function headerHelper(header) {
+    return {
+      value: function() { return header.attr('data-value'); },
+      name: function() { return header.attr('data-name'); },
+      icon: function() { return header.find('.icon'); },
+      title: function() { return header.attr('title'); },
+      el: function() { return header; }
+    };
+  }
+
+  function filterHelper(filter) {
+    return {
+      icon: function() { return filter.find('.d-icon'); },
+      exists: function() { return exists(filter); },
+      el: function() { return filter; }
+    };
+  }
+
+  function keyboardHelper(eventSelector) {
+    function createEvent(target, keyCode, options) {
+      target = target || ".filter-input";
+      eventSelector = find(eventSelector).find(target);
+      options = options || {};
+
+      andThen(function() {
+        var type = options.type || 'keydown';
+        var event = jQuery.Event(type);
+        event.keyCode = keyCode;
+        if (options && options.metaKey === true) { event.metaKey = true; }
+        find(eventSelector).trigger(event);
+      });
+    }
+
+    return {
+      down: function(target) { createEvent(target, 40); },
+      up: function(target) { createEvent(target, 38); },
+      escape: function(target) { createEvent(target, 27); },
+      enter: function(target) { createEvent(target, 13); },
+      tab: function(target) { createEvent(target, 9); },
+      backspace: function(target) { createEvent(target, 8); },
+      selectAll: function(target) { createEvent(target, 65, {metaKey: true}); },
+    };
+  };
+
+  return {
+    expand: function() {
+      expandSelectKit(selector);
+      return selectKit(selector);
+    },
+
+    collapse: function() {
+      collapseSelectKit(selector);
+      return selectKit(selector);
+    },
+
+    selectRowByIndex: function(index) {
+      selectKitSelectRowByIndex(index, selector);
+      return selectKit(selector);
+    },
+
+    selectRowByValue: function(value) {
+      selectKitSelectRowByValue(value, selector);
+      return selectKit(selector);
+    },
+
+    selectRowByName: function(name) {
+      selectKitSelectRowByValue(name, selector);
+      return selectKit(selector);
+    },
+
+    selectNoneRow: function() {
+      selectKitSelectNoneRow(selector);
+      return selectKit(selector);
+    },
+
+    fillInFilter: function(filter) {
+      selectKitFillInFilter(filter, selector);
+      return selectKit(selector);
+    },
+
+    keyboard: function() { return keyboardHelper(selector); },
+
+    isExpanded: function() {
+      return find(selector).hasClass('is-expanded');
+    },
+
+    isFocused: function() {
+      return find(selector).hasClass('is-focused');
+    },
+
+    isHidden: function() {
+      return find(selector).hasClass('is-hidden');
+    },
+
+    header: function() {
+      return headerHelper(find(selector).find('.select-kit-header'));
+    },
+
+    filter: function() {
+      return filterHelper(find(selector).find('.select-kit-filter'));
+    },
+
+    rows: function() {
+      return find(selector).find('.select-kit-row');
+    },
+
+    rowByValue: function(value) {
+      return rowHelper(find(selector).find('.select-kit-row[data-value="' + value + '"]'));
+    },
+
+    rowByName: function(name) {
+      return rowHelper(find(selector).find('.select-kit-row[data-name="' + name + '"]'));
+    },
+
+    rowByIndex: function(index) {
+      return rowHelper(find(selector).find('.select-kit-row:eq(' + index + ')'));
+    },
+
+    el: function() { return find(selector); },
+
+    noneRow: function() {
+      return rowHelper(find(selector).find('.select-kit-row.none'));
+    },
+
+    selectedRow: function() {
+      return rowHelper(find(selector).find('.select-kit-row.is-selected'));
+    },
+
+    highlightedRow: function() {
+      return rowHelper(find(selector).find('.select-kit-row.is-highlighted'));
+    },
+
+    exists: function() { return exists(selector); }
+  };
+}
diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js
index e44e4434e1..f11eb01177 100644
--- a/test/javascripts/helpers/site-settings.js
+++ b/test/javascripts/helpers/site-settings.js
@@ -10,8 +10,6 @@ Discourse.SiteSettingsOriginal = {
   "track_external_right_clicks":false,
   "ga_universal_tracking_code":"",
   "ga_universal_domain_name":"auto",
-  "ga_tracking_code":"UA-33736483-2",
-  "ga_domain_name":"",
   "top_menu":"latest|new|unread|categories|top",
   "post_menu":"like-count|like|share|flag|edit|bookmark|delete|admin|reply",
   "post_menu_hidden_items":"flag|edit|delete|admin",
@@ -48,7 +46,6 @@ Discourse.SiteSettingsOriginal = {
   "min_private_message_title_length":2,
   "allow_uncategorized_topics":true,
   "min_title_similar_length":10,
-  "min_body_similar_length":15,
   "edit_history_visible_to_public":true,
   "delete_removed_posts_after":24,
   "traditional_markdown_linebreaks":false,
@@ -91,6 +88,7 @@ Discourse.SiteSettingsOriginal = {
   "highlighted_languages":"apache|bash|cs|cpp|css|coffeescript|diff|xml|http|ini|json|java|javascript|makefile|markdown|nginx|objectivec|ruby|perl|php|python|sql|handlebars",
   "enable_emoji":true,
   "emoji_set":"emoji_one",
-  "desktop_category_page_style":"categories_and_latest_topics"
+  "desktop_category_page_style":"categories_and_latest_topics",
+  "enable_mentions":true
 };
 Discourse.SiteSettings = jQuery.extend(true, {}, Discourse.SiteSettingsOriginal);
diff --git a/test/javascripts/helpers/site.js.es6 b/test/javascripts/helpers/site.js.es6
index d8ab85a486..a477be1859 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 de7ff6b27c..d86f1260e8 100644
--- a/test/javascripts/helpers/store-pretender.js.es6
+++ b/test/javascripts/helpers/store-pretender.js.es6
@@ -28,7 +28,26 @@ export default function(helpers) {
   });
 
   this.get('/fruits', function() {
-    return response({ __rest_serializer: "1", fruits, farmers, colors, extras: {hello: 'world'} });
+    return response({
+      __rest_serializer: "1",
+      fruits,
+      farmers,
+      colors,
+      extras: {hello: 'world'}
+    });
+  });
+
+  this.get('/barns/:id', function() {
+    return response({
+      __rest_serializer: "1",
+      meta: {
+        types: {
+          owner: "farmer"
+        }
+      },
+      barn: { id: 1234, owner_id: farmers[0].id },
+      farmers: [farmers[0]],
+    });
   });
 
   this.get('/widgets/:widget_id', function(request) {
@@ -65,10 +84,14 @@ export default function(helpers) {
       if (qp.id) { result = result.filterBy('id', parseInt(qp.id)); }
     }
 
-    return response({ widgets: result,
-                      total_rows_widgets: 4,
-                      load_more_widgets: '/load-more-widgets',
-                      refresh_widgets: '/widgets?refresh=true' });
+    return response({
+      widgets: result,
+      meta: {
+        total_rows_widgets: 4,
+        load_more_widgets: '/load-more-widgets',
+        refresh_widgets: '/widgets?refresh=true'
+      }
+    });
   });
 
   this.get('/load-more-widgets', function() {
diff --git a/test/javascripts/helpers/widget-test.js.es6 b/test/javascripts/helpers/widget-test.js.es6
index d30170ff1d..15e43cbe32 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 4f6e0670e5..299aab839d 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,23 @@ 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");
+});
+
+QUnit.test("skip translation override if parent node is not an object", function(assert) {
+  PreloadStore.store('translationOverrides', {"js.composer.reply":"WAT","js.composer.reply.help":"foobar"});
+  LocalizationInitializer.initialize(this.registry);
+
+  assert.equal(I18n.t("composer.reply.help"), "[fr.composer.reply.help]");
 });
diff --git a/test/javascripts/lib/category-badge-test.js.es6 b/test/javascripts/lib/category-badge-test.js.es6
index 385d478c6a..6dc1ba2c51 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 parseHTML from 'discourse/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");
 });
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 4350ab6d22..92e9a07e76 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() { } };
@@ -22,7 +21,7 @@ module("lib:click-track-edit-history", {
          <div class="row">
            <div class="span8">
              <a href="http://www.google.com">google.com</a>
-             <a class="lightbox back quote-other-topic" href="http://www.google.com">google.com</a>
+             <a class="lightbox back" href="http://www.google.com">google.com</a>
              <div class="onebox-result">
                <a id="inside-onebox" href="http://www.google.com">google.com<span class="badge">1</span></a>
                <a id="inside-onebox-forced" class="track-link" href="http://www.google.com">google.com<span class="badge">1</span></a>
@@ -34,7 +33,7 @@ module("lib:click-track-edit-history", {
            </div>
            <div class="span8 offset1">
              <a href="http://www.google.com">google.com</a>
-             <a class="lightbox back quote-other-topic" href="http://www.google.com">google.com</a>
+             <a class="lightbox back" href="http://www.google.com">google.com</a>
              <div class="onebox-result">
                <a id="inside-onebox" href="http://www.google.com">google.com<span class="badge">1</span></a>
                <a id="inside-onebox-forced" class="track-link" href="http://www.google.com">google.com<span class="badge">1</span></a>
@@ -56,56 +55,53 @@ 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 category badges", assert => {
+  assert.ok(track(generateClickEventOn('.hashtag')));
 });
 
-test("does not track clicks on category badges", () => {
-  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 +111,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 +156,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 bc0b46e559..c809059c06 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() { } };
@@ -18,7 +17,7 @@ module("lib:click-track-profile-page", {
     fixture().html(
       `<p class="excerpt first" data-post-id="42" data-topic-id="1337" data-user-id="3141">
         <a href="http://www.google.com">google.com</a>
-        <a class="lightbox back quote-other-topic" href="http://www.google.com">google.com</a>
+        <a class="lightbox back" href="http://www.google.com">google.com</a>
         <div class="onebox-result">
           <a id="inside-onebox" href="http://www.google.com">google.com<span class="badge">1</span></a>
           <a id="inside-onebox-forced" class="track-link" href="http://www.google.com">google.com<span class="badge">1</span></a>
@@ -30,7 +29,7 @@ module("lib:click-track-profile-page", {
       </p>
       <p class="excerpt second" data-post-id="24" data-topic-id="7331" data-user-id="1413">
         <a href="http://www.google.com">google.com</a>
-        <a class="lightbox back quote-other-topic" href="http://www.google.com">google.com</a>
+        <a class="lightbox back" href="http://www.google.com">google.com</a>
         <div class="onebox-result">
           <a id="inside-onebox" href="http://www.google.com">google.com<span class="badge">1</span></a>
           <a id="inside-onebox-forced" class="track-link" href="http://www.google.com">google.com<span class="badge">1</span></a>
@@ -50,56 +49,53 @@ 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 category badges", assert => {
+  assert.ok(track(generateClickEventOn('.hashtag')));
 });
 
-test("does not track clicks on category badges", () => {
-  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 +105,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 +156,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 cb05ba7e56..dc6013ee08 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");
@@ -20,7 +19,7 @@ module("lib:click-track", {
       `<div id="topic" data-topic-id="1337">
         <article data-post-id="42" data-user-id="3141">
           <a href="http://www.google.com">google.com</a>
-          <a class="lightbox back quote-other-topic" href="http://www.google.fr">google.fr</a>
+          <a class="lightbox back" href="http://www.google.fr">google.fr</a>
           <a id="with-badge" data-user-id="314" href="http://www.google.de">google.de<span class="badge">1</span></a>
           <a id="with-badge-but-not-mine" href="http://www.google.es">google.es<span class="badge">1</span></a>
           <div class="onebox-result">
@@ -47,87 +46,85 @@ 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) {
+  track(generateClickEventOn('.inside-quote'));
+  assert.ok(DiscourseURL.redirectTo.calledWith("http://discuss.domain.com"));
 });
 
-test("does not track clicks on quote buttons", function() {
-  ok(track(generateClickEventOn('.quote-other-topic')));
+QUnit.test("does not track clicks on category badges", assert => {
+  assert.ok(track(generateClickEventOn('.hashtag')));
 });
 
-test("does not track clicks on category badges", () => {
-  ok(track(generateClickEventOn('.hashtag')));
+QUnit.test("does not track clicks on mailto", function(assert) {
+  assert.ok(track(generateClickEventOn('.mailto')));
 });
 
-test("does not track clicks on mailto", function() {
-  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 +133,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 +178,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 658f35e675..6752784a2c 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,27 +78,27 @@ 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({
     userUrl: url('username', "/u/%@")
   });
 
   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 a654774123..4bafe429ab 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 488d58caa2..8512b9f05c 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 31be0668ad..1d3d4e43fc 100644
--- a/test/javascripts/lib/formatter-test.js.es6
+++ b/test/javascripts/lib/formatter-test.js.es6
@@ -1,13 +1,13 @@
 var clock;
 
-import { relativeAge, autoUpdatingRelativeAge, updateRelativeAge, breakUp, number, longDate } from 'discourse/lib/formatter';
+import { relativeAge, autoUpdatingRelativeAge, updateRelativeAge, breakUp, number, longDate, durationTiny } 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,51 @@ 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");
+});
+
+QUnit.test("durationTiny", assert => {
+  assert.equal(durationTiny(), '&mdash;', "undefined is a dash");
+  assert.equal(durationTiny(null), '&mdash;', "null is a dash");
+  assert.equal(durationTiny(0), '< 1m', "0 seconds shows as < 1m");
+  assert.equal(durationTiny(59), '< 1m', "59 seconds shows as < 1m");
+  assert.equal(durationTiny(60), '1m', "60 seconds shows as 1m");
+  assert.equal(durationTiny(90), '2m', "90 seconds shows as 2m");
+  assert.equal(durationTiny(120), '2m', "120 seconds shows as 2m");
+  assert.equal(durationTiny(60 * 45), '1h', "45 minutes shows as 1h");
+  assert.equal(durationTiny(60 * 60), '1h', "60 minutes shows as 1h");
+  assert.equal(durationTiny(60 * 90), '2h', "90 minutes shows as 2h");
+  assert.equal(durationTiny(3600 * 23), '23h', "23 hours shows as 23h");
+  assert.equal(durationTiny(3600 * 24 - 29), '1d', "23 hours 31 mins shows as 1d");
+  assert.equal(durationTiny(3600 * 24 * 89), '89d', "89 days shows as 89d");
+  assert.equal(durationTiny(60 * (525600 - 1)), '12mon', "364 days shows as 12mon");
+  assert.equal(durationTiny(60 * 525600), '1y', "365 days shows as 1y");
+  assert.equal(durationTiny(86400 * 456), '1y', "456 days shows as 1y");
+  assert.equal(durationTiny(86400 * 457), '> 1y', "457 days shows as > 1y");
+  assert.equal(durationTiny(86400 * 638), '> 1y', "638 days shows as > 1y");
+  assert.equal(durationTiny(86400 * 639), '2y', "639 days shows as 2y");
+  assert.equal(durationTiny(86400 * 821), '2y', "821 days shows as 2y");
+  assert.equal(durationTiny(86400 * 822), '> 2y', "822 days shows as > 2y");
 });
diff --git a/test/javascripts/lib/i18n-test.js.es6 b/test/javascripts/lib/i18n-test.js.es6
index 9fbfa7beac..314c4cc693 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 8f1b0ae400..1bbafcc5cb 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 391ac3d2f1..26f8d04059 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 72c1adf30b..65803e8b18 100644
--- a/test/javascripts/lib/pretty-text-test.js.es6
+++ b/test/javascripts/lib/pretty-text-test.js.es6
@@ -3,616 +3,666 @@ 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,
+    enable_mentions: true,
     emoji_set: 'emoji_one',
     highlighted_languages: 'json|ruby|javascript',
     default_code_lang: 'auto',
-    censored_words: 'shucks|whiz|whizzer|a**le',
     censored_pattern: '\\d{3}-\\d{4}|tech\\w*'
   },
+  censoredWords: 'shucks|whiz|whizzer|a**le',
   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");
 
+  assert.cookedOptions(`[quote="bob, post:1, topic:1"]\ntest quote\n[/quote]`, { lookupPrimaryUserGroupByPostNumber: () => "aUserGroup" },
+      `<aside class="quote group-aUserGroup" data-post="1" data-topic="1">
+<div class="title">
+<div class="quote-controls"></div>
+ bob:</div>
+<blockquote>
+<p>test quote</p>
+</blockquote>
+</aside>`,
+  "quote has group class");
 });
 
-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("Mentions - disabled", assert => {
+  assert.cookedOptions("@eviltrout",
+                { siteSettings : { enable_mentions: false }},
+                "<p>@eviltrout</p>");
+});
+
+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 +671,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 +696,152 @@ 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|',
+`<div class="md-table">
+<table>
+<thead>
+<tr>
+<th>a</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>a</td>
+</tr>
+</tbody>
+</table>
+</div>`);
 });
 
-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 0722fdb236..f316c84767 100644
--- a/test/javascripts/lib/sanitizer-test.js.es6
+++ b/test/javascripts/lib/sanitizer-test.js.es6
@@ -1,26 +1,28 @@
 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() {
-  const pt = new PrettyText(buildOptions({ siteSettings: {} }));
-  const cooked = (input, expected, text) => equal(pt.cook(input), expected.replace(/\/>/g, ">"), text);
+QUnit.test("sanitize", assert => {
+  const pt = new PrettyText(buildOptions({ siteSettings: {
+    "allowed_iframes": 'https://www.google.com/maps/embed?|https://www.openstreetmap.org/export/embed.html?'
+  } }));
+  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");
 
@@ -28,19 +30,19 @@ test("sanitize", function() {
          "<iframe src=\"https://www.google.com/maps/embed?pb=!1m10!1m8!1m3!1d2624.9983685732213!2d2.29432085!3d48.85824149999999!3m2!1i1024!2i768!4f13.1!5e0!3m2!1sen!2s!4v1385737436368\" width=\"100\" height=\"42\"></iframe>",
          "it allows iframe to google maps");
 
-  cooked("<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>",
-         "<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>",
+  cooked("<iframe width=\"425\" height=\"350\" frameborder=\"0\" marginheight=\"0\" marginwidth=\"0\" src=\"https://www.openstreetmap.org/export/embed.html?bbox=22.49454975128174%2C51.220338322410775%2C22.523088455200195%2C51.23345342732931&amp;layer=mapnik\"></iframe>",
+         "<iframe width=\"425\" height=\"350\" frameborder=\"0\" marginheight=\"0\" marginwidth=\"0\" src=\"https://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 +62,36 @@ 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="heading--test">Test Heading</h1>`), `<h1 id="heading--test">Test Heading</h1>`);
+  assert.equal(pt.sanitize(`<h2 id="heading--cool">Test Heading</h2>`), `<h2 id="heading--cool">Test Heading</h2>`);
+  assert.equal(pt.sanitize(`<h3 id="heading--dashed-name">Test Heading</h3>`), `<h3 id="heading--dashed-name">Test Heading</h3>`);
+  assert.equal(pt.sanitize(`<h4 id="heading--underscored_name">Test Heading</h4>`), `<h4 id="heading--underscored_name">Test Heading</h4>`);
+  assert.equal(pt.sanitize(`<h5 id="heading--trout">Test Heading</h5>`), `<h5 id="heading--trout">Test Heading</h5>`);
+  assert.equal(pt.sanitize(`<h6 id="heading--discourse">Test Heading</h6>`), `<h6 id="heading--discourse">Test Heading</h6>`);
 });
 
-test("urlAllowed", () => {
-  const allowed = (url, msg) => equal(hrefAllowed(url), url, msg);
+QUnit.test("poorly formed ids on headings", assert => {
+  let pt = new PrettyText(buildOptions({ siteSettings: {} }));
+  assert.equal(pt.sanitize(`<h1 id="evil-trout">Test Heading</h1>`), `<h1>Test Heading</h1>`);
+  assert.equal(pt.sanitize(`<h1 id="heading--">Test Heading</h1>`), `<h1>Test Heading</h1>`);
+  assert.equal(pt.sanitize(`<h1 id="heading--with space">Test Heading</h1>`), `<h1>Test Heading</h1>`);
+  assert.equal(pt.sanitize(`<h1 id="heading--with*char">Test Heading</h1>`), `<h1>Test Heading</h1>`);
+  assert.equal(pt.sanitize(`<h1 id="heading--">Test Heading</h1>`), `<h1>Test Heading</h1>`);
+  assert.equal(pt.sanitize(`<h1 id="test-heading--cool">Test Heading</h1>`), `<h1>Test Heading</h1>`);
+});
+
+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/to-markdown-test.js.es6 b/test/javascripts/lib/to-markdown-test.js.es6
new file mode 100644
index 0000000000..3c2f04566b
--- /dev/null
+++ b/test/javascripts/lib/to-markdown-test.js.es6
@@ -0,0 +1,238 @@
+import toMarkdown from 'discourse/lib/to-markdown';
+
+QUnit.module("lib:to-markdown");
+
+QUnit.test("converts styles between normal words", assert => {
+  const html = `Line with <s>styles</s> <b><i>between</i></b> words.`;
+  const markdown = `Line with ~~styles~~ ***between*** words.`;
+  assert.equal(toMarkdown(html), markdown);
+
+  assert.equal(toMarkdown("A <b>bold </b>word"), "A **bold** word");
+});
+
+QUnit.test("converts inline nested styles", assert => {
+  let html = `<em>Italicised line with <strong>some random</strong> <b>bold</b> words.</em>`;
+  let markdown = `*Italicised line with **some random** **bold** words.*`;
+  assert.equal(toMarkdown(html), markdown);
+
+  html = `<i class="fa">Italicised line
+   with <b title="strong">some<br>
+   random</b> <s>bold</s> words.</i>`;
+  markdown = `<i>Italicised line with <b>some\nrandom</b> ~~bold~~ words.</i>`;
+  assert.equal(toMarkdown(html), markdown);
+});
+
+QUnit.test("converts a link", assert => {
+  let html = `<a href="https://discourse.org">Discourse</a>`;
+  let markdown = `[Discourse](https://discourse.org)`;
+  assert.equal(toMarkdown(html), markdown);
+
+  html = `<a href="https://discourse.org">Disc\n\n\nour\n\nse</a>`;
+  markdown = `[Disc our se](https://discourse.org)`;
+  assert.equal(toMarkdown(html), markdown);
+});
+
+QUnit.test("put raw URL instead of converting the link", assert => {
+  let url = "https://discourse.org";
+  const html = () => `<a href="${url}">${url}</a>`;
+
+  assert.equal(toMarkdown(html()), url);
+
+  url = "discourse.org/t/topic-slug/1";
+  assert.equal(toMarkdown(html()), url);
+});
+
+QUnit.test("skip empty link", assert => {
+  assert.equal(toMarkdown(`<a href="https://example.com"></a>`), "");
+});
+
+QUnit.test("converts heading tags", assert => {
+  const html = `
+  <h1>Heading 1</h1>
+  <h2>Heading 2</h2>
+
+  \t  <h3>Heading 3</h3>
+
+
+  <h4>Heading 4</h4>
+
+
+
+<h5>Heading 5</h5>
+
+
+
+
+<h6>Heading 6</h6>
+  `;
+  const markdown = `# Heading 1\n\n## Heading 2\n\n### Heading 3\n\n#### Heading 4\n\n##### Heading 5\n\n###### Heading 6`;
+  assert.equal(toMarkdown(html), markdown);
+});
+
+QUnit.test("converts ul list tag", assert => {
+  const html = `
+  <ul>
+    <li>Item 1</li>
+    <li>
+      Item 2
+      <ul>
+        <li>Sub Item 1</li>
+        <li><p>Sub Item 2</p></li>
+        <li>Sub Item 3<ul><li>Sub <i>Sub</i> Item 1</li><li>Sub <b>Sub</b> Item 2</li></ul></li>
+      </ul>
+    </li>
+    <li>Item 3</li>
+  </ul>
+  `;
+  const markdown = `* Item 1\n* Item 2\n  * Sub Item 1\n  * Sub Item 2\n\n  * Sub Item 3\n    * Sub *Sub* Item 1\n    * Sub **Sub** Item 2\n* Item 3`;
+  assert.equal(toMarkdown(html), markdown);
+});
+
+QUnit.test("stripes unwanted inline tags", assert => {
+  const html = `
+  <p>Lorem ipsum <span>dolor sit amet, consectetur</span> <strike>elit.</strike></p>
+  <p>Ut minim veniam, <label>quis nostrud</label> laboris <nisi> ut aliquip ex ea</nisi> commodo.</p>
+  `;
+  const markdown = `Lorem ipsum dolor sit amet, consectetur ~~elit.~~\n\nUt minim veniam, quis nostrud laboris ut aliquip ex ea commodo.`;
+  assert.equal(toMarkdown(html), markdown);
+});
+
+QUnit.test("converts table tags", assert => {
+  let html = `<address>Discourse Avenue</address><b>laboris</b>
+  <table>
+    <thead> <tr><th>Heading 1</th><th>Head 2</th></tr> </thead>
+      <tbody>
+        <tr><td>Lorem</td><td>ipsum</td></tr>
+        <tr><td><b>dolor</b></td> <td><i>sit amet</i></td> </tr>
+        
+        </tbody>
+</table>
+  `;
+  let markdown = `Discourse Avenue\n\n**laboris**\n\n|Heading 1|Head 2|\n| --- | --- |\n|Lorem|ipsum|\n|**dolor**|*sit amet*|`;
+  assert.equal(toMarkdown(html), markdown);
+
+  html = `<table>
+            <tr><th>Heading 1</th><th>Head 2</th></tr>
+            <tr><td><a href="http://example.com"><img src="http://example.com/image.png" alt="Lorem" width="45" height="45"></a></td><td>ipsum</td></tr>
+          </table>`;
+  markdown = `|Heading 1|Head 2|\n| --- | --- |\n|[![Lorem\\|45x45](http://example.com/image.png)](http://example.com)|ipsum|`;
+  assert.equal(toMarkdown(html), markdown);
+});
+
+QUnit.test("returns empty string if table format not supported", assert => {
+  let html = `<table>
+    <thead> <tr><th>Headi<br><br>ng 1</th><th>Head 2</th></tr> </thead>
+      <tbody>
+        <tr><td>Lorem</td><td>ipsum</td></tr>
+        <tr><td><a href="http://example.com"><img src="http://dolor.com/image.png" /></a></td> <td><i>sit amet</i></td></tr></tbody>
+</table>
+  `;
+  assert.equal(toMarkdown(html), "");
+
+  html = `<table>
+    <thead> <tr><th>Heading 1</th></tr> </thead>
+      <tbody>
+        <tr><td>Lorem</td></tr>
+        <tr><td><i>sit amet</i></td></tr></tbody>
+</table>
+  `;
+  assert.equal(toMarkdown(html), "");
+
+  html = `<table><tr><td>Lorem</td><td><i>sit amet</i></td></tr></table>`;
+  assert.equal(toMarkdown(html), "");
+});
+
+QUnit.test("converts img tag", assert => {
+  const url = "https://example.com/image.png";
+  let html = `<img src="${url}" width="100" height="50">`;
+  assert.equal(toMarkdown(html), `![|100x50](${url})`);
+
+  html = `<div><span><img src="${url}" alt="description" width="50" height="100" /></span></div>`;
+  assert.equal(toMarkdown(html), `![description|50x100](${url})`);
+
+  html = `<a href="http://example.com"><img src="${url}" alt="description" /></a>`;
+  assert.equal(toMarkdown(html), `[![description](${url})](http://example.com)`);
+
+  html = `<a href="http://example.com">description <img src="${url}" /></a>`;
+  assert.equal(toMarkdown(html), `[description ![](${url})](http://example.com)`);
+
+  html = `<img alt="description" />`;
+  assert.equal(toMarkdown(html), "");
+
+  html = `<a><img src="${url}" alt="description" /></a>`;
+  assert.equal(toMarkdown(html), `![description](${url})`);
+});
+
+QUnit.test("supporting html tags by keeping them", assert => {
+  let html = "Lorem <del>ipsum dolor</del> sit <big>amet, <ins>consectetur</ins></big>";
+  let output = html;
+  assert.equal(toMarkdown(html), output);
+
+  html = `Lorem <del style="font-weight: bold">ipsum dolor</del> sit <big>amet, <ins onclick="alert('hello')">consectetur</ins></big>`;
+  assert.equal(toMarkdown(html), output);
+
+  html = `<a href="http://example.com" onload="">Lorem <del style="font-weight: bold">ipsum dolor</del> sit</a>.`;
+  output = `[Lorem <del>ipsum dolor</del> sit](http://example.com).`;
+  assert.equal(toMarkdown(html), output);
+
+  html = `Lorem <del>ipsum dolor</del> sit.`;
+  assert.equal(toMarkdown(html), html);
+
+  html = `Lorem <a href="http://example.com"><del>ipsum \n\n\n dolor</del> sit.</a>`;
+  output = `Lorem [<del>ipsum dolor</del> sit.](http://example.com)`;
+  assert.equal(toMarkdown(html), output);
+});
+
+QUnit.test("converts code tags", assert => {
+  let html = `Lorem ipsum dolor sit amet,
+  <pre><code>var helloWorld = () => {
+  alert('    hello \t\t world    ');
+    return;
+}
+helloWorld();</code></pre>
+  consectetur.`;
+  let output = `Lorem ipsum dolor sit amet,\n\n\`\`\`\nvar helloWorld = () => {\n  alert('    hello \t\t world    ');\n    return;\n}\nhelloWorld();\n\`\`\`\n\nconsectetur.`;
+
+  assert.equal(toMarkdown(html), output);
+
+  html = `Lorem ipsum dolor sit amet, <code>var helloWorld = () => {
+  alert('    hello \t\t world    ');
+    return;
+}
+helloWorld();</code>consectetur.`;
+  output = `Lorem ipsum dolor sit amet, \`var helloWorld = () => {\n  alert('    hello \t\t world    ');\n    return;\n}\nhelloWorld();\` consectetur.`;
+
+  assert.equal(toMarkdown(html), output);
+});
+
+QUnit.test("converts blockquote tag", assert => {
+  let html = "<blockquote>Lorem ipsum</blockquote>";
+  let output = "> Lorem ipsum";
+  assert.equal(toMarkdown(html), output);
+
+  html = "<blockquote>Lorem ipsum</blockquote><blockquote><p>dolor sit amet</p></blockquote>";
+  output = "> Lorem ipsum\n\n> dolor sit amet";
+  assert.equal(toMarkdown(html), output);
+
+  html = "<blockquote>\nLorem ipsum\n<blockquote><p>dolor <blockquote>sit</blockquote> amet</p></blockquote></blockquote>";
+  output = "> Lorem ipsum\n> > dolor\n> > > sit\n> > amet";
+  assert.equal(toMarkdown(html), output);
+});
+
+QUnit.test("converts ol list tag", assert => {
+  const html = `Testing
+  <ol>
+    <li>Item 1</li>
+    <li>
+      Item 2
+      <ol start="100">
+        <li>Sub Item 1</li>
+        <li>Sub Item 2</li>
+      </ol>
+    </li>
+    <li>Item 3</li>
+  </ol>
+  `;
+  const markdown = `Testing\n\n1. Item 1\n2. Item 2\n  100. Sub Item 1\n  101. Sub Item 2\n3. Item 3`;
+  assert.equal(toMarkdown(html), markdown);
+});
diff --git a/test/javascripts/lib/url-test.js.es6 b/test/javascripts/lib/url-test.js.es6
index dd938b5d0c..15f760d92d 100644
--- a/test/javascripts/lib/url-test.js.es6
+++ b/test/javascripts/lib/url-test.js.es6
@@ -1,38 +1,38 @@
 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');
diff --git a/test/javascripts/lib/user-search-test.js.es6 b/test/javascripts/lib/user-search-test.js.es6
index fba45e9ff7..9cdb830221 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 403cb2c971..00e00f4c19 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,
@@ -11,65 +10,76 @@ import {
   getRawSize,
   avatarImg,
   defaultHomepage,
+  setDefaultHomepage,
   validateUploadedFiles,
   getUploadMarkdown,
   caretRowCol,
   setCaretPosition
 } from 'discourse/lib/utilities';
+import * as Utilities 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 +95,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 +120,34 @@ 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("replaces GUID in image alt text on iOS", assert => {
+  assert.equal(testUploadMarkdown("8F2B469B-6B2C-4213-BC68-57B4876365A0.jpeg"),'![8F2B469B-6B2C-4213-BC68-57B4876365A0|100x200](/uploads/123/abcdef.ext)');
+
+  sandbox.stub(Utilities, 'isAppleDevice').returns(true);
+  assert.equal(testUploadMarkdown("8F2B469B-6B2C-4213-BC68-57B4876365A0.jpeg"),'![image|100x200](/uploads/123/abcdef.ext)');
+});
+
+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 +158,80 @@ 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");
+  var meta = document.createElement("meta");
+  meta.name = "discourse_current_homepage";
+  meta.content = "hot";
+  document.body.appendChild(meta);
+  assert.equal(defaultHomepage(), "hot", "default homepage is pulled from <meta name=discourse_current_homepage>");
+  document.body.removeChild(meta);
 });
 
-test("caretRowCol", () => {
+QUnit.test("setDefaultHomepage", assert => {
+  var meta = document.createElement("meta");
+  meta.name = "discourse_current_homepage";
+  meta.content = "hot";
+  document.body.appendChild(meta);
+  setDefaultHomepage("top");
+  assert.equal(meta.content, "top", "default homepage set by setDefaultHomepage");
+  document.body.removeChild(meta);
+});
+
+QUnit.test("caretRowCol", assert => {
   var textarea = document.createElement('textarea');
   const content = document.createTextNode("01234\n56789\n012345");
   textarea.appendChild(content);
@@ -208,8 +241,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 0000000000..e8bb3d8f30
--- /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 0e9527f931..0000000000
--- 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 483f8ffa16..0000000000
--- 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 abbc48869d..0000000000
--- 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 f8df9852c7..0000000000
--- 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 e30e965489..0000000000
--- 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 750830e8c9..0000000000
--- 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 c31d171049..0000000000
--- 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 cb34534995..0000000000
--- 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 b54b09285a..0000000000
--- 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 f6461051af..0000000000
--- 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 fbef1f5f1d..0000000000
--- 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 e050061d89..0000000000
--- 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 f8a5b27bf4..0000000000
--- 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 e21ac79a2e..0000000000
--- 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 1594bda27b..0000000000
--- 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 2dc2ab6565..0000000000
--- 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 5707590915..0000000000
--- 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 fdec8ebcb6..0000000000
--- 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 0c59e89516..0000000000
--- 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 fc51e2a27e..0000000000
--- 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 d3e1d4efc7..0000000000
--- 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 25067beea3..0000000000
--- 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 41d830d038..0000000000
--- 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 3f167a1610..0000000000
--- 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 ad5f021fce..0000000000
--- 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 70d02398ec..0000000000
--- 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 96d4470d10..0000000000
--- 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 9eb8ffe694..0000000000
--- 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 8c44c98fee..0000000000
--- 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 bf81e939f5..0000000000
--- 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 29d0e4235b..0000000000
--- 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 611c1ac61f..0000000000
--- 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 01ce740d5e..0000000000
--- 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 e971a195a4..0000000000
--- 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 cb70921d1e..0000000000
--- 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 41c48857bb..0000000000
--- 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 ed3c624ffb..0000000000
--- 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 d8ec7f8e03..0000000000
--- 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 4c7421c07a..0000000000
--- 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 ea55846e6b..0000000000
--- 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 95ee690dbe..0000000000
--- 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 71ec78c709..0000000000
--- 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 589d1136e1..0000000000
--- 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 3301ba803b..0000000000
--- 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 5f18b8da21..0000000000
--- 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 f2a8ce70f5..0000000000
--- 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 92047e7413..0000000000
--- 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
deleted file mode 100644
index c6233a52a3..0000000000
--- a/test/javascripts/mixins/selected-posts-count-test.js.es6
+++ /dev/null
@@ -1,36 +0,0 @@
-module("mixin:selected-posts-count");
-
-import SelectedPostsCount from 'discourse/mixins/selected-posts-count';
-import Topic from 'discourse/models/topic';
-
-var buildTestObj = function(params) {
-  return Ember.Object.extend(SelectedPostsCount).create(params || {});
-};
-
-test("without selectedPosts", function () {
-  var testObj = buildTestObj();
-
-  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");
-});
-
-test("with some selectedPosts", function() {
-  var testObj = buildTestObj({ selectedPosts: [Discourse.Post.create({id: 123})] });
-  equal(testObj.get('selectedPostsCount'), 1, "It returns the amount of posts");
-});
-
-test("when all posts are selected and there is a posts_count", function() {
-  var testObj = buildTestObj({ allPostsSelected: true, posts_count: 1024 });
-  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() {
-  var testObj = buildTestObj({
-    allPostsSelected: true,
-    topic: Topic.create({ posts_count: 3456 })
-   });
-
-  equal(testObj.get('selectedPostsCount'), 3456, "It returns the topic's posts_count");
-});
diff --git a/test/javascripts/mixins/singleton-test.js.es6 b/test/javascripts/mixins/singleton-test.js.es6
index eeca3caa56..2e5635a4d1 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 644056d049..d9a6e0b2d3 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 ca338686ea..fc5065566a 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 039d3a18d5..02475ddb4b 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 98d4b714f9..be18f9190f 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 60f04ed1bb..6b1b726dd5 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.equal(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.equal(group.get('displayName'), "test", "it should return the group's name");
 });
diff --git a/test/javascripts/models/invite-test.js.es6 b/test/javascripts/models/invite-test.js.es6
index e55a414293..0cdc361fca 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 3270af8a55..dba22bd390 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 1af1bb14ea..38174eb639 100644
--- a/test/javascripts/models/nav-item-test.js.es6
+++ b/test/javascripts/models/nav-item-test.js.es6
@@ -1,6 +1,7 @@
+import createStore from 'helpers/create-store';
 
-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 +9,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');
@@ -20,3 +21,15 @@ test('href', function(){
   href('category/bug', '/c/bug', 'English category name');
   href('category/确实是这样', '/c/343434-category', 'Chinese category name');
 });
+
+QUnit.test("count", assert => {
+  const navItem = createStore().createRecord("nav-item", { name: "new" });
+
+  assert.equal(navItem.get("count"), 0, "it has no count by default");
+
+  const tracker = navItem.get("topicTrackingState");
+  tracker.states["t1"] = { topic_id: 1, last_read_post_number: null };
+  tracker.incrementMessageCount();
+
+  assert.equal(navItem.get("count"), 1, "it updates when a new message arrives");
+});
diff --git a/test/javascripts/models/post-stream-test.js.es6 b/test/javascripts/models/post-stream-test.js.es6
index b0c455e8fa..7418102a17 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 1f881df120..22cb0bde24 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");
+  return post.destroy(user).then(() => {
+    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");
+  });
 });
-
diff --git a/test/javascripts/models/report-test.js.es6 b/test/javascripts/models/report-test.js.es6
index 3fcdd9d037..1e4f73d89e 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 73a77e7203..031cb3b0c2 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 18c9aa0c80..2912b8ddb8 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 320b5fb366..ff330fd77f 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 bc1c3c0ac9..bce69122dc 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 933dd6271d..2e9756ff9e 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 e54f5740b9..232055bb28 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('service:store');
 
 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,14 @@ test('find embedded', function(assert) {
   });
 });
 
-test('findAll embedded', function(assert) {
+QUnit.test('meta types', function(assert) {
+  const store = createStore();
+  return store.find('barn', 1).then(function(f) {
+    assert.equal(f.get('owner.name'), 'Old MacDonald', 'it has the embedded farmer');
+  });
+});
+
+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');
@@ -157,4 +164,3 @@ test('findAll embedded', function(assert) {
     assert.equal(fruits.objectAt(2).get('farmer.name'), 'Luke Skywalker');
   });
 });
-
diff --git a/test/javascripts/models/topic-details-test.js.es6 b/test/javascripts/models/topic-details-test.js.es6
index 75719ad3e9..bc004748a1 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,24 +7,20 @@ 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({
-    suggested_topics: [{id: 1}, {id: 3}],
     allowed_users: [{username: 'eviltrout'}]
   });
 
-  equal(details.get('suggested_topics.length'), 2, 'it loaded the suggested_topics');
-  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 2c1ceac923..2e9ce44436 100644
--- a/test/javascripts/models/topic-test.js.es6
+++ b/test/javascripts/models/topic-test.js.es6
@@ -1,78 +1,107 @@
-import { blank, present } from 'helpers/qunit-helpers';
-import { IMAGE_VERSION as v} from 'pretty-text/emoji';
+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() {
-  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');
+QUnit.test("defaults", assert => {
+  const topic = Topic.create({ id: 1234 });
+
+  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() {
-  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");
+QUnit.test("visited", assert => {
+  const topic = Topic.create({ highest_post_number: 2, last_read_post_number: 1 });
+
+  assert.not(topic.get("visited"), "not visited unless we've read all the posts");
+
+  topic.set("last_read_post_number", 2);
+  assert.ok(topic.get("visited"), "is visited once we've read all the posts");
+
+  topic.set("last_read_post_number", 3);
+  assert.ok(topic.get("visited"), "is visited if we've read all the posts and some are deleted at the end");
 });
 
-test('has a postStream', function() {
-  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");
+QUnit.test('has details', assert => {
+  const topic = Topic.create({ id: 1234 });
+  const topicDetails = topic.get('details');
+
+  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");
 });
 
+QUnit.test('has a postStream', assert => {
+  const topic = Topic.create({ id: 1234 });
+  const postStream = topic.get('postStream');
 
-test('category relationship', function() {
+  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");
+});
+
+QUnit.test('has suggestedTopics', assert => {
+  const topic = Topic.create({ suggested_topics: [{ id: 1 }, { id: 2 }] });
+  const suggestedTopics = topic.get('suggestedTopics');
+
+  assert.equal(suggestedTopics.length, 2, 'it loaded the suggested_topics');
+  assert.containsInstance(suggestedTopics, Topic);
+});
+
+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') });
+  const category = Discourse.Category.list()[0];
+  const topic = Topic.create({ id: 1111, category_id: category.get('id') });
 
-  equal(topic.get('category'), category);
+  assert.equal(topic.get('category'), category);
 });
 
-test("updateFromJson", function() {
-  var topic = Topic.create({id: 1234}),
-      category = Discourse.Category.list()[0];
+QUnit.test("updateFromJson", assert => {
+  const topic = Topic.create({ id: 1234 });
+  const category = Discourse.Category.list()[0];
 
   topic.updateFromJson({
     post_stream: [1,2,3],
-    details: {hello: 'world'},
+    details: { hello: 'world' },
     cool: 'property',
     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() {
-  var user = Discourse.User.create({username: 'eviltrout'});
-  var topic = Topic.create({id: 1234});
+QUnit.test("destroy", assert => {
+  const user = Discourse.User.create({ username: 'eviltrout' });
+  const 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() {
-  var user = Discourse.User.create({username: 'eviltrout'});
-  var topic = Topic.create({id: 1234, deleted_at: new Date(), deleted_by: user});
+QUnit.test("recover", assert => {
+  const user = Discourse.User.create({ username: 'eviltrout' });
+  const 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() {
-  var topic = Topic.create({ fancy_title: ":smile: with all :) the emojis :pear::peach:" });
+QUnit.test('fancyTitle', assert => {
+  const 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");
 });
+
+QUnit.test('excerpt', assert => {
+  const topic = Topic.create({ excerpt: "This is a test topic :smile:", pinned: true });
+
+  assert.equal(topic.get('escapedExcerpt'),
+        `This is a test topic <img src='/images/emoji/emoji_one/smile.png?v=${v}' title='smile' alt='smile' class='emoji'>`,
+        "supports emojis");
+});
diff --git a/test/javascripts/models/topic-tracking-state-test.js.es6 b/test/javascripts/models/topic-tracking-state-test.js.es6
index 0814487950..3c184cb759 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 fd0bd043f1..93a988acac 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 5258d98b06..0794c2f92c 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 c5b35985e3..272dae3d33 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 ea845d582f..fb37937495 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
deleted file mode 100644
index 4b8b6bc94f..0000000000
--- a/test/javascripts/models/version-check-test.js.es6
+++ /dev/null
@@ -1,28 +0,0 @@
-import VersionCheck from 'admin/models/version-check';
-
-module("VersionCheck");
-
-test('dataIsOld', function() {
-  var dataIsOld = function(args, expected, message) {
-    equal(VersionCheck.create(args).get('dataIsOld'), expected, message);
-  };
-
-  dataIsOld({updated_at: moment().subtract(2, 'hours').toJSON()},  false, '2 hours ago');
-  dataIsOld({updated_at: moment().subtract(49, 'hours').toJSON()}, true,  '49 hours ago');
-  dataIsOld({updated_at: moment().subtract(2, 'hours').toJSON(), version_check_pending: true},  true, 'version check pending');
-});
-
-test('staleData', function() {
-  var updatedAt = function(hoursAgo) {
-    return moment().subtract(hoursAgo, 'hours').toJSON();
-  };
-  var staleData = function(args, expected, message) {
-    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');
-  staleData({missing_versions_count: 0, installed_version: '0.9.4', latest_version: '0.9.3', updated_at: updatedAt(2)}, true,  'installed and latest do not match, but missing_versions_count is 0');
-  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');
-});
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 12b73912ba..8371621731 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
@@ -31,6 +32,7 @@
 //= require sinon-qunit-1.0.0
 
 //= require helpers/assertions
+//= require helpers/select-kit-helper
 
 //= require helpers/qunit-helpers
 //= require_tree ./fixtures
@@ -52,6 +54,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();
@@ -65,26 +69,36 @@ if (window.Logster) {
 }
 
 var origDebounce = Ember.run.debounce,
-    createPretendServer = require('helpers/create-pretender', null, null, false).default,
+    pretender = require('helpers/create-pretender', null, null, false),
     fixtures = require('fixtures/site-fixtures', null, null, false).default,
     flushMap = require('discourse/models/store', null, null, false).flushMap,
     ScrollingDOMMethods = require('discourse/mixins/scrolling', null, null, false).ScrollingDOMMethods,
     _DiscourseURL = require('discourse/lib/url', null, null, false).default,
+    applyPretender = require('helpers/qunit-helpers', null, null, false).applyPretender,
     server;
 
 function dup(obj) {
   return jQuery.extend(true, {}, obj);
 }
 
-function resetSite() {
+function resetSite(siteSettings, extras) {
   var createStore = require('helpers/create-store').default;
-  var siteAttrs = dup(fixtures['site.json'].site);
+  var siteAttrs = $.extend({}, fixtures['site.json'].site, extras || {});
   siteAttrs.store = createStore();
+  siteAttrs.siteSettings = siteSettings;
   Discourse.Site.resetCurrent(Discourse.Site.create(siteAttrs));
 }
 
 QUnit.testStart(function(ctx) {
-  server = createPretendServer();
+  server = pretender.default();
+
+  var helper = {
+    parsePostData: pretender.parsePostData,
+    response: pretender.response,
+    success: pretender.success
+  };
+
+  applyPretender(server, helper);
 
   // Allow our tests to change site settings and have them reset before the next test
   Discourse.SiteSettings = dup(Discourse.SiteSettingsOriginal);
@@ -92,7 +106,7 @@ QUnit.testStart(function(ctx) {
   Discourse.BaseUrl = "localhost";
   Discourse.Session.resetCurrent();
   Discourse.User.resetCurrent();
-  resetSite();
+  resetSite(Discourse.SiteSettings);
 
   _DiscourseURL.redirectedTo = null;
   _DiscourseURL.redirectTo = function(url) {
@@ -108,7 +122,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 +149,24 @@ 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();
 
+resetSite();
diff --git a/test/javascripts/widgets/actions-summary-test.js.es6 b/test/javascripts/widgets/actions-summary-test.js.es6
index 6542d17b12..f4eb8b7882 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',
@@ -74,7 +74,7 @@ widgetTest('post deleted', {
     });
   },
   test(assert) {
-    assert.ok(this.$('.post-action .fa-trash-o').length === 1, 'it has the deleted icon');
+    assert.ok(this.$('.post-action .d-icon-trash-o').length === 1, 'it has the deleted icon');
     assert.ok(this.$('.avatar[title=eviltrout]').length === 1, 'it has the deleted by avatar');
   }
 });
diff --git a/test/javascripts/widgets/button-test.js.es6 b/test/javascripts/widgets/button-test.js.es6
new file mode 100644
index 0000000000..96bd4b245c
--- /dev/null
+++ b/test/javascripts/widgets/button-test.js.es6
@@ -0,0 +1,43 @@
+import { moduleForWidget, widgetTest } from 'helpers/widget-test';
+
+moduleForWidget('button');
+
+widgetTest('icon only button', {
+  template: '{{mount-widget widget="button" args=args}}',
+
+  beforeEach() {
+    this.set('args', { icon: 'smile-o' });
+  },
+
+  test(assert) {
+    assert.ok(this.$('button.btn.btn-icon.no-text').length, 'it has all the classes');
+    assert.ok(this.$('button .d-icon.d-icon-smile-o').length, 'it has the icon');
+  }
+});
+
+widgetTest('icon and text button', {
+  template: '{{mount-widget widget="button" args=args}}',
+
+  beforeEach() {
+    this.set('args', { icon: 'plus', label: 'topic.create' });
+  },
+
+  test(assert) {
+    assert.ok(this.$('button.btn.btn-icon-text').length, 'it has all the classes');
+    assert.ok(this.$('button .d-icon.d-icon-plus').length, 'it has the icon');
+    assert.ok(this.$('button span.d-button-label').length, 'it has the label');
+  }
+});
+
+widgetTest('text only button', {
+  template: '{{mount-widget widget="button" args=args}}',
+
+  beforeEach() {
+    this.set('args', { label: 'topic.create' });
+  },
+
+  test(assert) {
+    assert.ok(this.$('button.btn.btn-text').length, 'it has all the classes');
+    assert.ok(this.$('button span.d-button-label').length, 'it has the label');
+  }
+});
diff --git a/test/javascripts/widgets/hamburger-menu-test.js.es6 b/test/javascripts/widgets/hamburger-menu-test.js.es6
index 9c6454e47c..c8f67ccf1e 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 71676a0338..f91ab7755e 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 81db555c20..96bd889f50 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;
@@ -66,13 +66,13 @@ widgetTest('no logo - minimized', {
   },
 
   test(assert) {
-    assert.ok(this.$('i.fa-home').length === 1);
+    assert.ok(this.$('.d-icon-home').length === 1);
   }
 });
 
 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 3efc3f2b0f..c3e8f0c267 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 2438f8d8ab..071d59db95 100644
--- a/test/javascripts/widgets/post-stream-test.js.es6
+++ b/test/javascripts/widgets/post-stream-test.js.es6
@@ -7,8 +7,11 @@ moduleForWidget('post-stream');
 function postStreamTest(name, attrs) {
   widgetTest(name, {
     template: `{{mount-widget widget="post-stream" args=(hash posts=posts)}}`,
-    setup() {
-      this.set('posts', attrs.posts.call(this));
+    beforeEach() {
+      const site = this.container.lookup('site:main');
+      let posts = attrs.posts.call(this);
+      posts.forEach(p => p.set('site', site));
+      this.set('posts', posts);
     },
     test: attrs.test
   });
diff --git a/test/javascripts/widgets/post-test.js.es6 b/test/javascripts/widgets/post-test.js.es6
index 80b97b548a..0296c9dcf3 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',
@@ -436,14 +436,14 @@ widgetTest("reply directly above", {
     click('a.reply-to-tab');
     andThen(() => {
       assert.equal(this.$('section.embedded-posts.top .cooked').length, 1);
-      assert.equal(this.$('section.embedded-posts i.fa-arrow-up').length, 1);
+      assert.equal(this.$('section.embedded-posts .d-icon-arrow-up').length, 1);
     });
   }
 });
 
 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});
   },
@@ -673,14 +673,14 @@ widgetTest("replies - one below, not suppressed", {
     click('button.show-replies');
     andThen(() => {
       assert.equal(this.$('section.embedded-posts.bottom .cooked').length, 1);
-      assert.equal(this.$('section.embedded-posts i.fa-arrow-down').length, 1);
+      assert.equal(this.$('section.embedded-posts .d-icon-arrow-down').length, 1);
     });
   }
 });
 
 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: [
@@ -760,12 +760,12 @@ widgetTest("topic map - links", {
     click('nav.buttons button');
     andThen(() => {
       assert.equal(this.$('.map.map-collapsed').length, 0);
-      assert.equal(this.$('.topic-map i.fa-chevron-up').length, 1);
+      assert.equal(this.$('.topic-map .d-icon-chevron-up').length, 1);
       assert.equal(this.$('.topic-map-expanded').length, 1);
       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 fe9add7afd..c8ab8391d7 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',
@@ -38,7 +38,7 @@ widgetTest('extra classes and glyphs', {
     assert.ok(this.$('span.staff').length);
     assert.ok(this.$('span.admin').length);
     assert.ok(this.$('span.moderator').length);
-    assert.ok(this.$('i.fa-shield').length);
+    assert.ok(this.$('.d-icon-shield').length);
     assert.ok(this.$('span.new-user').length);
     assert.ok(this.$('span.fish').length);
   }
@@ -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 078d562457..67ba90a063 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 3c043090eb..8b26410e0f 100644
--- a/test/javascripts/widgets/user-menu-test.js.es6
+++ b/test/javascripts/widgets/user-menu-test.js.es6
@@ -11,13 +11,14 @@ widgetTest('basics', {
     assert.ok(this.$('.user-bookmarks-link').length);
     assert.ok(this.$('.user-preferences-link').length);
     assert.ok(this.$('.notifications').length);
+    assert.ok(this.$('.dismiss-link').length);
   }
 });
 
 widgetTest('log out', {
   template: '{{mount-widget widget="user-menu" logout="logout"}}',
 
-  setup() {
+  beforeEach() {
     this.on('logout', () => this.loggedOut = true);
   },
 
@@ -33,7 +34,7 @@ widgetTest('log out', {
 
 widgetTest('private messages - disabled', {
   template: '{{mount-widget widget="user-menu"}}',
-  setup() {
+  beforeEach() {
     this.siteSettings.enable_private_messages = false;
   },
 
@@ -44,7 +45,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 +57,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 +77,7 @@ widgetTest('anonymous', {
 widgetTest('anonymous - disabled', {
   template: '{{mount-widget widget="user-menu"}}',
 
-  setup() {
+  beforeEach() {
     this.siteSettings.allow_anonymous_posting = false;
   },
 
@@ -88,7 +89,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 +104,3 @@ widgetTest('anonymous - switch back', {
     });
   }
 });
-
diff --git a/test/javascripts/widgets/widget-test.js.es6 b/test/javascripts/widgets/widget-test.js.es6
index ed52f81bee..78502f6ccd 100644
--- a/test/javascripts/widgets/widget-test.js.es6
+++ b/test/javascripts/widgets/widget-test.js.es6
@@ -1,19 +1,17 @@
 import { moduleForWidget, widgetTest } from 'helpers/widget-test';
 import { createWidget } from 'discourse/widgets/widget';
 import { withPluginApi } from 'discourse/lib/plugin-api';
+import hbs from 'discourse/widgets/hbs-compiler';
 
 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',
-
-      html(attrs) {
-        return `Hello ${attrs.name}`;
-      },
+      template: hbs`Hello {{attrs.name}}`
     });
 
     this.set('args', { name: 'Robin' });
@@ -24,10 +22,43 @@ widgetTest('widget attributes are passed in via args', {
   }
 });
 
+widgetTest("hbs template - no tagName", {
+  template: `{{mount-widget widget="hbs-test" args=args}}`,
+
+  beforeEach() {
+    createWidget('hbs-test', {
+      template: hbs`<div class='test'>Hello {{attrs.name}}</div>`
+    });
+
+    this.set('args', { name: 'Robin' });
+  },
+
+  test(assert) {
+    assert.equal(this.$('div.test').text(), "Hello Robin");
+  }
+});
+
+widgetTest("hbs template - with tagName", {
+  template: `{{mount-widget widget="hbs-test" args=args}}`,
+
+  beforeEach() {
+    createWidget('hbs-test', {
+      tagName: 'div.test',
+      template: hbs`Hello {{attrs.name}}`
+    });
+
+    this.set('args', { name: 'Robin' });
+  },
+
+  test(assert) {
+    assert.equal(this.$('div.test').text(), "Hello Robin");
+  }
+});
+
 widgetTest('buildClasses', {
   template: `{{mount-widget widget="classname-test" args=args}}`,
 
-  setup() {
+  beforeEach() {
     createWidget('classname-test', {
       tagName: 'div.test',
 
@@ -47,7 +78,7 @@ widgetTest('buildClasses', {
 widgetTest('buildAttributes', {
   template: `{{mount-widget widget="attributes-test" args=args}}`,
 
-  setup() {
+  beforeEach() {
     createWidget('attributes-test', {
       tagName: 'div.test',
 
@@ -68,7 +99,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,19 +117,16 @@ widgetTest('buildId', {
 widgetTest('widget state', {
   template: `{{mount-widget widget="state-test"}}`,
 
-  setup() {
+  beforeEach() {
     createWidget('state-test', {
       tagName: 'button.test',
       buildKey: () => `button-test`,
+      template: hbs`{{state.clicks}} clicks`,
 
       defaultState() {
         return { clicks: 0 };
       },
 
-      html(attrs, state) {
-        return `${state.clicks} clicks`;
-      },
-
       click() {
         this.state.clicks++;
       }
@@ -119,14 +147,17 @@ 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',
-
-      html(attrs, state) {
-        return state.name || "No name";
-      },
+      template: hbs`
+        {{#if state.name}}
+          {{state.name}}
+        {{else}}
+          No name
+        {{/if}}
+      `,
 
       click() {
         return new Ember.RSVP.Promise(resolve => {
@@ -140,11 +171,11 @@ widgetTest('widget update with promise', {
   },
 
   test(assert) {
-    assert.equal(this.$('button.test').text(), "No name");
+    assert.equal(this.$('button.test').text().trim(), "No name");
 
     click(this.$('button'));
     andThen(() => {
-      assert.equal(this.$('button.test').text(), "Robin");
+      assert.equal(this.$('button.test').text().trim(), "Robin");
     });
   }
 });
@@ -152,14 +183,12 @@ 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', {
       tagName: 'div.container',
-      html() {
-        return this.attach('test-embedded');
-      },
+      template: hbs`{{attach widget="test-embedded" attrs=attrs}}`
     });
   },
 
@@ -169,15 +198,78 @@ widgetTest('widget attaching', {
   }
 });
 
+widgetTest("handlebars d-icon", {
+  template: `{{mount-widget widget="hbs-icon-test" args=args}}`,
+
+  beforeEach() {
+    createWidget('hbs-icon-test', {
+      template: hbs`{{d-icon "arrow-down"}}`
+    });
+  },
+
+  test(assert) {
+    assert.equal(this.$('i.fa.fa-arrow-down').length, 1);
+  }
+});
+
+widgetTest("handlebars i18n", {
+  template: `{{mount-widget widget="hbs-i18n-test" args=args}}`,
+
+  beforeEach() {
+    createWidget('hbs-i18n-test', {
+      template: hbs`
+        <span class='string'>{{i18n "hbs_test0"}}</span>
+        <span class='var'>{{i18n attrs.key}}</span>
+        <a href title={{i18n "hbs_test0"}}>test</a>
+      `
+    });
+    I18n.extras = [ {
+      "hbs_test0": "evil",
+      "hbs_test1": "trout"
+    } ];
+    this.set('args', { key: 'hbs_test1' });
+  },
+
+  test(assert) {
+    // comin up
+    assert.equal(this.$('span.string').text(), 'evil');
+    assert.equal(this.$('span.var').text(), 'trout');
+    assert.equal(this.$('a').prop('title'), 'evil');
+  }
+});
+
+widgetTest('handlebars #each', {
+  template: `{{mount-widget widget="hbs-each-test" args=args}}`,
+
+  beforeEach() {
+    createWidget('hbs-each-test', {
+      tagName: 'ul',
+      template: hbs`
+        {{#each attrs.items as |item|}}
+          <li>{{item}}</li>
+        {{/each}}
+      `
+    });
+
+    this.set('args', {
+      items: ['one', 'two', 'three']
+    });
+  },
+
+  test(assert) {
+    assert.equal(this.$('ul li').length, 3);
+    assert.equal(this.$('ul li:eq(0)').text(), "one");
+  }
+
+});
+
 widgetTest('widget decorating', {
   template: `{{mount-widget widget="decorate-test"}}`,
 
-  setup() {
+  beforeEach() {
     createWidget('decorate-test', {
       tagName: 'div.decorate',
-      html() {
-        return "main content";
-      },
+      template: hbs`main content`
     });
 
     withPluginApi('0.1', api => {
@@ -201,17 +293,11 @@ widgetTest('widget decorating', {
 widgetTest('widget settings', {
   template: `{{mount-widget widget="settings-test"}}`,
 
-  setup() {
+  beforeEach() {
     createWidget('settings-test', {
       tagName: 'div.settings',
-
-      settings: {
-        age: 36
-      },
-
-      html() {
-        return `age is ${this.settings.age}`;
-      },
+      template: hbs`age is {{settings.age}}`,
+      settings: { age: 36 }
     });
   },
 
@@ -223,17 +309,11 @@ widgetTest('widget settings', {
 widgetTest('override settings', {
   template: `{{mount-widget widget="ov-settings-test"}}`,
 
-  setup() {
+  beforeEach() {
     createWidget('ov-settings-test', {
       tagName: 'div.settings',
-
-      settings: {
-        age: 36
-      },
-
-      html() {
-        return `age is ${this.settings.age}`;
-      },
+      template: hbs`age is {{settings.age}}`,
+      settings: { age: 36 },
     });
 
     withPluginApi('0.1', api => {
diff --git a/test/smoke_test.js b/test/smoke_test.js
new file mode 100644
index 0000000000..282a3e9c25
--- /dev/null
+++ b/test/smoke_test.js
@@ -0,0 +1,247 @@
+const args = process.argv.slice(2);
+
+if (args.length < 1 || args.length > 2) {
+  console.log("Expecting: node {smoke_test.js} {url}");
+  process.exit(1);
+}
+
+const url = args[0];
+
+console.log(`Starting Discourse Smoke Test for ${url}`);
+
+const puppeteer = require('puppeteer');
+const path = require('path');
+
+(async () => {
+  const browser = await puppeteer.launch({
+    // headless: false,
+    // slowMo: 10,
+    args: ["--disable-local-storage"]
+  });
+  const page = await browser.newPage();
+
+  page.setViewport = {
+    width: 1366,
+    height: 768
+  };
+
+  const exec = (description, fn, assertion) => {
+    const start = +new Date();
+
+    return fn.call().then(output => {
+      if (assertion) {
+        if (assertion.call(this, output)) {
+          console.log(`PASSED: ${description} - ${(+new Date()) - start}ms`);
+        } else {
+          console.log(`FAILED: ${description} - ${(+new Date()) - start}ms`);
+          console.log("SMOKE TEST FAILED");
+          process.exit(1);
+        }
+      } else {
+        console.log(`PASSED: ${description} - ${(+new Date()) - start}ms`);
+      }
+    }).catch(error => {
+      console.log(`ERROR (${description}): ${error.message} - ${(+new Date()) - start}ms`);
+      console.log("SMOKE TEST FAILED");
+      process.exit(1);
+    });
+  };
+
+  const assert = (description, fn, assertion) => {
+    return exec(description, fn, assertion);
+  };
+
+  page.on('console', msg => console.log(`PAGE LOG: ${msg.text}`));
+
+  if (process.env.AUTH_USER && process.env.AUTH_PASSWORD) {
+    await exec("basic authentication", () => {
+      return page.authenticate({
+        username: process.env.AUTH_USER,
+        password: process.env.AUTH_PASSWORD
+      });
+    });
+  }
+
+  await exec("go to site", () => {
+    return page.goto(url);
+  });
+
+  await exec("expect a log in button in the header", () => {
+    return page.waitForSelector("header .login-button", { visible: true });
+  });
+
+  await exec("go to latest page", () => {
+    return page.goto(path.join(url, 'latest'));
+  });
+
+  await exec("at least one topic shows up", () => {
+    return page.waitForSelector(".topic-list tbody tr", { visible: true });
+  });
+
+  await exec("go to categories page", () => {
+    return page.goto(path.join(url, 'categories'));
+  });
+
+  await exec("can see categories on the page", () => {
+    return page.waitForSelector(".category-list", { visible: true });
+  });
+
+  await exec("navigate to 1st topic", () => {
+    return page.click(".main-link a.title:first-of-type");
+  });
+
+  await exec("at least one post body", () => {
+    return page.waitForSelector(".topic-post", { visible: true });
+  });
+
+  await exec("click on the 1st user", () => {
+    return page.click(".topic-meta-data a:first-of-type");
+  });
+
+  await exec("user has details", () => {
+    return page.waitForSelector("#user-card .names", { visible: true });
+  });
+
+  if (!process.env.READONLY_TESTS) {
+    await exec("open login modal", () => {
+      return page.click(".login-button");
+    });
+
+    await exec("login modal is open", () => {
+      return page.waitForSelector(".login-modal", { visible: true });
+    });
+
+    await exec("type in credentials & log in", () => {
+      let promise = page.type("#login-account-name", process.env.DISCOURSE_USERNAME || 'smoke_user');
+
+      promise = promise.then(() => {
+        return page.type("#login-account-password", process.env.DISCOURSE_PASSWORD || 'P4ssw0rd');
+      });
+
+      promise = promise.then(() => {
+        return page.click(".login-modal .btn-primary");
+      });
+
+      return promise;
+    });
+
+    await exec("is logged in", () => {
+      return page.waitForSelector(".current-user", { visible: true });
+    });
+
+    await exec("go home", () => {
+      return page.click("#site-logo, #site-text-logo");
+    });
+
+    await exec("it shows a topic list", () => {
+      return page.waitForSelector(".topic-list", { visible: true });
+    });
+
+    await exec("we have a create topic button", () => {
+      return page.waitForSelector("#create-topic", { visible: true });
+    });
+
+    await exec("open composer", () => {
+      return page.click("#create-topic");
+    });
+
+    await exec("the editor is visible", () => {
+      return page.waitForFunction(
+        "document.activeElement === document.getElementById('reply-title')"
+      );
+    });
+
+    await exec("compose new topic", () => {
+      const date = `(${(+new Date())})`;
+      const title = `This is a new topic ${date}`;
+      const post = `I can write a new topic inside the smoke test! ${date} \n\n`;
+
+      let promise = page.type("#reply-title", title);
+
+      promise = promise.then(() => {
+        return page.type("#reply-control .d-editor-input", post);
+      });
+
+      return promise;
+    });
+
+    await exec("updates preview", () => {
+      return page.waitForSelector(".d-editor-preview p", { visible: true });
+    });
+
+    await exec("open upload modal", () => {
+      return page.click(".d-editor-button-bar .upload");
+    });
+
+    await exec("upload modal is open", () => {
+      let promise = page.waitForSelector("#filename-input", { visible: true });
+
+      promise.then(() => {
+        return page.click(".d-modal-cancel");
+      });
+
+      return promise;
+    });
+
+    await exec("submit the topic", () => {
+      return page.click(".submit-panel .create");
+    });
+
+    await exec("topic is created", () => {
+      return page.waitForSelector(".fancy-title", { visible: true });
+    });
+
+    await exec("open the composer", () => {
+      return page.click(".post-controls:first-of-type .create");
+    });
+
+    await exec("composer is open", () => {
+      return page.waitForSelector("#reply-control .d-editor-input", { visible: true });
+    });
+
+    await exec("compose reply", () => {
+      const post = `I can even write a reply inside the smoke test ;) (${(+new Date())})`;
+      return page.type("#reply-control .d-editor-input", post);
+    });
+
+    await assert("waiting for the preview", () => {
+      let promise = page.waitForSelector(".d-editor-preview p",
+        { visible: true }
+      );
+
+      promise = promise.then(() => {
+        return page.evaluate(() => {
+          return document.querySelector(".d-editor-preview").innerText;
+        });
+      });
+
+      return promise;
+    }, output => {
+      return output.match("I can even write a reply");
+    });
+
+    await exec("submit the topic", () => {
+      return page.click("#reply-control .create");
+    });
+
+    await assert("reply is created", () => {
+      let promise = page.waitForSelector(".topic-post");
+
+      promise = promise.then(() => {
+        return page.evaluate(() => {
+          return document.querySelectorAll(".topic-post").length;
+        });
+      });
+
+      return promise;
+    }, output => {
+      return output === 2;
+    });
+  }
+
+  await exec("close browser", () => {
+    return browser.close();
+  });
+
+  console.log("ALL PASSED");
+})();
diff --git a/test/stylesheets/test_helper.css b/test/stylesheets/test_helper.css
index f9eddae24d..c42fb810ac 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 0000000000..4c54562fcd
--- /dev/null
+++ b/vendor/assets/javascripts/babel.js
@@ -0,0 +1,62839 @@
+(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
+		},
+		"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
+	};
+
+/***/ })
+/******/ ])))
+});
+;
diff --git a/vendor/assets/javascripts/better_markdown.js b/vendor/assets/javascripts/better_markdown.js
deleted file mode 100644
index 836b1c7e31..0000000000
--- 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 66ddfe9585..9bb7b3ccc2 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 cf41920e2e..fd722360ee 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 0000000000..2de3b1c16e
--- /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/mousetrap.js b/vendor/assets/javascripts/mousetrap.js
index 48d2f625c2..6e28146130 100644
--- a/vendor/assets/javascripts/mousetrap.js
+++ b/vendor/assets/javascripts/mousetrap.js
@@ -1,6 +1,6 @@
 /*global define:false */
 /**
- * Copyright 2015 Craig Campbell
+ * Copyright 2012-2017 Craig Campbell
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,16 @@
  * Mousetrap is a simple keyboard shortcut library for Javascript with
  * no external dependencies
  *
- * @version 1.5.3
+ * @version 1.6.1
  * @url craig.is/killing/mice
  */
 (function(window, document, undefined) {
 
+    // Check if mousetrap is used inside browser, if not, return
+    if (!window) {
+        return;
+    }
+
     /**
      * mapping of special keycodes to their corresponding keys
      *
@@ -151,7 +156,13 @@
      * loop through to map numbers on the numeric keypad
      */
     for (i = 0; i <= 9; ++i) {
-        _MAP[i + 96] = i;
+
+        // This needs to use a string cause otherwise since 0 is falsey
+        // mousetrap will never fire for numpad 0 pressed as part of a keydown
+        // event.
+        //
+        // @see https://github.com/ccampbell/mousetrap/pull/258
+        _MAP[i + 96] = i.toString();
     }
 
     /**
@@ -983,6 +994,18 @@
         return self._handleKey.apply(self, arguments);
     };
 
+    /**
+     * allow custom key mappings
+     */
+    Mousetrap.addKeycodes = function(object) {
+        for (var key in object) {
+            if (object.hasOwnProperty(key)) {
+                _MAP[key] = object[key];
+            }
+        }
+        _REVERSE_MAP = null;
+    };
+
     /**
      * Init the global mousetrap functions
      *
@@ -1018,4 +1041,4 @@
             return Mousetrap;
         });
     }
-}) (window, document);
+}) (typeof window !== 'undefined' ? window : null, typeof  window !== 'undefined' ? document : null);
diff --git a/vendor/assets/javascripts/qunit.js b/vendor/assets/javascripts/qunit.js
index 5df0822ea4..3cda99631a 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 7f0335fea5..78b157590b 100644
--- a/vendor/assets/javascripts/run-qunit.js
+++ b/vendor/assets/javascripts/run-qunit.js
@@ -1,66 +1,104 @@
-// PhantomJS QUnit Test Runner
+// Chrome QUnit Test Runner
+// Author: David Taylor
+// Requires chrome-launcher and chrome-remote-interface from npm
+// An up-to-date version of chrome is also required
 
-/*globals QUnit phantom*/
+/* globals Promise */
 
-var system = require("system"),
-    args = phantom.args;
-
-if (args === undefined) {
-  args = system.args;
-  args.shift();
-}
+var args = process.argv.slice(2);
 
 if (args.length < 1 || args.length > 2) {
-  console.log("Usage: " + phantom.scriptName + " <URL> <timeout>");
-  phantom.exit(1);
+  console.log("Usage: node run-qunit.js <URL> <timeout>");
+  process.exit(1);
 }
 
-var page = require("webpage").create();
+const chromeLauncher = require('chrome-launcher');
+const CDP = require('chrome-remote-interface');
 
-page.onConsoleMessage = function(msg) {
-  if (msg.slice(0, 8) === "WARNING:") { return; }
-  if (msg.slice(0, 6) === "DEBUG:") { return; }
+(function() {
 
-  console.log(msg);
-};
+  function launchChrome() {
+    return chromeLauncher.launch({
+      chromeFlags: [
+        '--disable-gpu',
+       '--headless',
+       '--no-sandbox'
+      ]
+    });
+  }
 
-page.onCallback = function (message) {
-  // forward the message to the standard output
-  system.stdout.write(message);
-};
+  launchChrome().then(chrome => {
+    CDP({
+      port: chrome.port
+    }).then(protocol => {
+      const {Page, Runtime} = protocol;
+      Promise.all([Page.enable(), Runtime.enable()]).then(()=>{
 
-page.open(args[0], function(status) {
-  if (status !== "success") {
-    console.error("Unable to access network");
-    phantom.exit(1);
-  } else {
-    page.evaluate(logQUnit);
+        Runtime.consoleAPICalled((response) => {
+          const message = response['args'][0].value;
 
-    var timeout = parseInt(args[1] || 200000, 10),
-        start = Date.now();
-
-    var interval = setInterval(function() {
-      if (Date.now() > start + timeout) {
-        console.error("Tests timed out");
-        phantom.exit(124);
-      } else {
-        var qunitDone = page.evaluate(function() {
-          return window.qunitDone;
+          // If it's a simple test result, write without newline
+          if(message === "." || message === "F"){
+            process.stdout.write(message);
+          }else{
+            console.log(message);
+          }
         });
 
-        if (qunitDone) {
-          clearInterval(interval);
-          if (qunitDone.failed > 0) {
-            phantom.exit(1);
-          } else {
-            phantom.exit();
-          }
-        }
-      }
-    }, 250);
-  }
-});
+        Page.navigate({
+          url: args[0]
+        });
 
+        Page.loadEventFired(() => {
+
+          Runtime.evaluate({
+            expression: `(${qunit_script})()`
+          }).then(() => {
+            const timeout = parseInt(args[1] || 300000, 10);
+            var start = Date.now();
+
+            var interval = setInterval(() => {
+              if (Date.now() > start + timeout) {
+                console.error("Tests timed out");
+
+                protocol.close();
+                chrome.kill();
+                process.exit(124);
+              } else {
+
+                Runtime.evaluate({
+                  expression: `(${check_script})()`
+                }).then(numFails => {
+                  if (numFails.result.type !== 'undefined') {
+                    clearInterval(interval);
+                    protocol.close();
+                    chrome.kill();
+
+                    if (numFails.result.value > 0) {
+                      process.exit(1);
+                    } else {
+                      process.exit();
+                    }
+                  }
+                }).catch(error);
+              }
+            }, 250);
+          }).catch(error(1));
+        });
+      }).catch(error(3));
+    }).catch(error(4));
+  }).catch(error(5));
+})();
+
+function error(code){
+  return function(){
+    console.log("A promise failed to resolve code:"+code);
+    process.exit(1);
+  };
+}
+
+// The following functions are converted to strings
+// And then sent to chrome to be evalaluated
 function logQUnit() {
   var moduleErrors = [];
   var testErrors = [];
@@ -83,9 +121,9 @@ function logQUnit() {
       var msg = "  Test Failed: " + context.name + assertionErrors.join("    ");
       testErrors.push(msg);
       assertionErrors = [];
-      window.callPhantom("F");
+      console.log("F");
     } else {
-      window.callPhantom(".");
+      console.log(".");
     }
   });
 
@@ -123,3 +161,11 @@ function logQUnit() {
     window.qunitDone = context;
   });
 }
+const qunit_script = logQUnit.toString();
+
+function check() {
+  if(window.qunitDone){
+    return window.qunitDone.failed;
+  }
+}
+const check_script = check.toString();
diff --git a/vendor/gems/discourse_imgur/Gemfile b/vendor/gems/discourse_imgur/Gemfile
deleted file mode 100644
index fcb7fdc299..0000000000
--- 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 864fc8d8db..0000000000
--- 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 a266e8fc36..0000000000
--- 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 56bb7292a1..0000000000
--- 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 c3a5eac8ec..0000000000
--- 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 5ee2b66908..0000000000
--- 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 4b1ca1262b..0000000000
--- 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 1e4f084a05..0000000000
--- 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 5762c78cd6..0000000000
--- 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 c38ed551f0..0000000000
--- 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 4b3df7e810..0000000000
--- 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 fdc220122e..0000000000
--- 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 1191c76d53..0000000000
--- 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 baaa21e417..0000000000
--- 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 f56be13979..0000000000
--- 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 61c3687dc5..0000000000
--- 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 6fa6c194df..0000000000
--- 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 d5004390ca..0000000000
--- 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 4fe83f5e04..0000000000
--- 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 3433035a82..0000000000
--- 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 0823370a17..0000000000
--- 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 113de6bfd2..0000000000
--- 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 a649611aef..0000000000
--- 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 c725c179d1..0000000000
--- 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 32f9bbc0f8..0000000000
--- 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 6c373f5d89..0000000000
--- 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 00d9648386..0000000000
--- 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 f03ea5a5bc..0000000000
--- 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 057e2409fd..0000000000
--- 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 a1dfb05666..0000000000
--- 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 4387526338..0000000000
--- 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 31204c8dae..0000000000
--- 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 ef88ca9972..0000000000
--- 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 60f6f6db4e..0000000000
--- 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 1270a7125f..0000000000
--- 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 a1b522afca..0000000000
--- 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 9f65aef693..0000000000
--- 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 a9c90a45cc..0000000000
--- 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 5a24cdaf53..0000000000
--- 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 ad976dd5cd..0000000000
--- 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 ffcb6d19b8..0000000000
--- 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 89e9b86536..0000000000
--- 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 a904776c4f..0000000000
--- 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 700c4e7a00..0000000000
--- 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 5b5ab058a4..0000000000
--- 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 b350ad5dc6..0000000000
--- 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 e8279d775a..0000000000
--- 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
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 0000000000..e73d58eb46
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,1017 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@babel/code-frame@7.0.0-beta.31":
+  version "7.0.0-beta.31"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.31.tgz#473d021ecc573a2cce1c07d5b509d5215f46ba35"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+"@babel/helper-function-name@7.0.0-beta.31":
+  version "7.0.0-beta.31"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.31.tgz#afe63ad799209989348b1109b44feb66aa245f57"
+  dependencies:
+    "@babel/helper-get-function-arity" "7.0.0-beta.31"
+    "@babel/template" "7.0.0-beta.31"
+    "@babel/traverse" "7.0.0-beta.31"
+    "@babel/types" "7.0.0-beta.31"
+
+"@babel/helper-get-function-arity@7.0.0-beta.31":
+  version "7.0.0-beta.31"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.31.tgz#1176d79252741218e0aec872ada07efb2b37a493"
+  dependencies:
+    "@babel/types" "7.0.0-beta.31"
+
+"@babel/template@7.0.0-beta.31":
+  version "7.0.0-beta.31"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.31.tgz#577bb29389f6c497c3e7d014617e7d6713f68bda"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.31"
+    "@babel/types" "7.0.0-beta.31"
+    babylon "7.0.0-beta.31"
+    lodash "^4.2.0"
+
+"@babel/traverse@7.0.0-beta.31":
+  version "7.0.0-beta.31"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.31.tgz#db399499ad74aefda014f0c10321ab255134b1df"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.31"
+    "@babel/helper-function-name" "7.0.0-beta.31"
+    "@babel/types" "7.0.0-beta.31"
+    babylon "7.0.0-beta.31"
+    debug "^3.0.1"
+    globals "^10.0.0"
+    invariant "^2.2.0"
+    lodash "^4.2.0"
+
+"@babel/types@7.0.0-beta.31":
+  version "7.0.0-beta.31"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.31.tgz#42c9c86784f674c173fb21882ca9643334029de4"
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.2.0"
+    to-fast-properties "^2.0.0"
+
+"@types/core-js@^0.9.41":
+  version "0.9.43"
+  resolved "https://registry.yarnpkg.com/@types/core-js/-/core-js-0.9.43.tgz#65d646c5e8c0cd1bdee37065799f9d3d48748253"
+
+"@types/mkdirp@^0.3.29":
+  version "0.3.29"
+  resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-0.3.29.tgz#7f2ad7ec55f914482fc9b1ec4bb1ae6028d46066"
+
+"@types/node@6.0.66":
+  version "6.0.66"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.66.tgz#5680b74a6135d33d4c00447e7c3dc691a4601625"
+
+"@types/rimraf@^0.0.28":
+  version "0.0.28"
+  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-0.0.28.tgz#5562519bc7963caca8abf7f128cae3b594d41d06"
+
+acorn-jsx@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
+  dependencies:
+    acorn "^3.0.4"
+
+acorn@^3.0.4:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+
+acorn@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7"
+
+agent-base@^4.1.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.1.2.tgz#80fa6cde440f4dcf9af2617cf246099b5d99f0c8"
+  dependencies:
+    es6-promisify "^5.0.0"
+
+ajv-keywords@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
+
+ajv@^5.2.3, ajv@^5.3.0:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
+ansi-escapes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
+ansi-styles@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
+  dependencies:
+    color-convert "^1.9.0"
+
+argparse@^1.0.7:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  dependencies:
+    sprintf-js "~1.0.2"
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+
+arrify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+
+async-limiter@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+
+babel-code-frame@^6.22.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  dependencies:
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
+
+babel-eslint@^8.0.3:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.0.3.tgz#f29ecf02336be438195325cd47c468da81ee4e98"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.31"
+    "@babel/traverse" "7.0.0-beta.31"
+    "@babel/types" "7.0.0-beta.31"
+    babylon "7.0.0-beta.31"
+
+babylon@7.0.0-beta.31:
+  version "7.0.0-beta.31"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.31.tgz#7ec10f81e0e456fd0f855ad60fa30c2ac454283f"
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+
+brace-expansion@^1.1.7:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+caller-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
+  dependencies:
+    callsites "^0.2.0"
+
+callsites@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+
+chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+chalk@^2.0.0, chalk@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
+  dependencies:
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.0"
+
+chardet@^0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
+
+chrome-launcher@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/chrome-launcher/-/chrome-launcher-0.10.0.tgz#4291ab1d20bb097da80b085e8c8c8e6b3e3d72c9"
+  dependencies:
+    "@types/core-js" "^0.9.41"
+    "@types/mkdirp" "^0.3.29"
+    "@types/node" "6.0.66"
+    "@types/rimraf" "^0.0.28"
+    is-wsl "^1.1.0"
+    lighthouse-logger "^1.0.0"
+    mkdirp "0.5.1"
+    rimraf "^2.6.1"
+
+chrome-remote-interface@^0.25.4:
+  version "0.25.4"
+  resolved "https://registry.yarnpkg.com/chrome-remote-interface/-/chrome-remote-interface-0.25.4.tgz#3a84aa9ef053dc2fd25d3b4c30d7501cb5f73883"
+  dependencies:
+    commander "2.11.x"
+    ws "3.3.x"
+
+circular-json@^0.3.1:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
+
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-width@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+
+color-convert@^1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
+  dependencies:
+    color-name "^1.1.1"
+
+color-name@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+
+commander@2.11.x:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+concat-stream@1.6.0, concat-stream@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+
+cross-spawn@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  dependencies:
+    lru-cache "^4.0.1"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+debug@2.6.9, debug@^2.6.8:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.0.1, debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+
+del@^2.0.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  dependencies:
+    globby "^5.0.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    rimraf "^2.2.8"
+
+doctrine@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.2.tgz#68f96ce8efc56cc42651f1faadb4f175273b0075"
+  dependencies:
+    esutils "^2.0.2"
+
+es6-promise@^4.0.3:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a"
+
+es6-promisify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  dependencies:
+    es6-promise "^4.0.3"
+
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+eslint-scope@^3.7.1:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint@^4.13.1:
+  version "4.13.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.13.1.tgz#0055e0014464c7eb7878caf549ef2941992b444f"
+  dependencies:
+    ajv "^5.3.0"
+    babel-code-frame "^6.22.0"
+    chalk "^2.1.0"
+    concat-stream "^1.6.0"
+    cross-spawn "^5.1.0"
+    debug "^3.0.1"
+    doctrine "^2.0.2"
+    eslint-scope "^3.7.1"
+    espree "^3.5.2"
+    esquery "^1.0.0"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    file-entry-cache "^2.0.0"
+    functional-red-black-tree "^1.0.1"
+    glob "^7.1.2"
+    globals "^11.0.1"
+    ignore "^3.3.3"
+    imurmurhash "^0.1.4"
+    inquirer "^3.0.6"
+    is-resolvable "^1.0.0"
+    js-yaml "^3.9.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.4"
+    minimatch "^3.0.2"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.2"
+    pluralize "^7.0.0"
+    progress "^2.0.0"
+    require-uncached "^1.0.3"
+    semver "^5.3.0"
+    strip-ansi "^4.0.0"
+    strip-json-comments "~2.0.1"
+    table "^4.0.1"
+    text-table "~0.2.0"
+
+espree@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.2.tgz#756ada8b979e9dcfcdb30aad8d1a9304a905e1ca"
+  dependencies:
+    acorn "^5.2.1"
+    acorn-jsx "^3.0.0"
+
+esprima@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+
+esquery@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
+  dependencies:
+    estraverse "^4.0.0"
+
+esrecurse@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163"
+  dependencies:
+    estraverse "^4.1.0"
+    object-assign "^4.0.1"
+
+estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+
+esutils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+
+external-editor@^2.0.4:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
+  dependencies:
+    chardet "^0.4.0"
+    iconv-lite "^0.4.17"
+    tmp "^0.0.33"
+
+extract-zip@^1.6.5:
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.6.tgz#1290ede8d20d0872b429fd3f351ca128ec5ef85c"
+  dependencies:
+    concat-stream "1.6.0"
+    debug "2.6.9"
+    mkdirp "0.5.0"
+    yauzl "2.4.1"
+
+fast-deep-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+
+fast-levenshtein@~2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+
+fd-slicer@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
+  dependencies:
+    pend "~1.2.0"
+
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+file-entry-cache@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
+  dependencies:
+    flat-cache "^1.2.1"
+    object-assign "^4.0.1"
+
+flat-cache@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
+  dependencies:
+    circular-json "^0.3.1"
+    del "^2.0.2"
+    graceful-fs "^4.1.2"
+    write "^0.2.1"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+
+glob@^7.0.3, glob@^7.0.5, glob@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globals@^10.0.0:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-10.4.0.tgz#5c477388b128a9e4c5c5d01c7a2aca68c68b2da7"
+
+globals@^11.0.1:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4"
+
+globby@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  dependencies:
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+graceful-fs@^4.1.2:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-flag@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
+
+https-proxy-agent@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.1.1.tgz#a7ce4382a1ba8266ee848578778122d491260fd9"
+  dependencies:
+    agent-base "^4.1.0"
+    debug "^3.1.0"
+
+iconv-lite@^0.4.17:
+  version "0.4.19"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
+
+ignore@^3.3.3:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@^2.0.3, inherits@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+inquirer@^3.0.6:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^2.0.4"
+    figures "^2.0.0"
+    lodash "^4.3.0"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rx-lite "^4.0.8"
+    rx-lite-aggregates "^4.0.8"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
+    through "^2.3.6"
+
+invariant@^2.2.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+  dependencies:
+    loose-envify "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+
+is-path-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+
+is-path-in-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
+  dependencies:
+    is-path-inside "^1.0.0"
+
+is-path-inside@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  dependencies:
+    path-is-inside "^1.0.1"
+
+is-promise@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+
+is-resolvable@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.1.tgz#acca1cd36dbe44b974b924321555a70ba03b1cf4"
+
+is-wsl@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+
+js-tokens@^3.0.0, js-tokens@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+
+js-yaml@^3.9.1:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+json-schema-traverse@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+
+levn@^0.3.0, levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+lighthouse-logger@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lighthouse-logger/-/lighthouse-logger-1.0.1.tgz#f073d83f7acbc96729bf100a121c8f006991ae61"
+  dependencies:
+    debug "^2.6.8"
+
+lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+
+loose-envify@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  dependencies:
+    js-tokens "^3.0.0"
+
+lru-cache@^4.0.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+mime@^1.3.4:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+
+mimic-fn@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
+
+minimatch@^3.0.2, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+mkdirp@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12"
+  dependencies:
+    minimist "0.0.8"
+
+mkdirp@0.5.1, mkdirp@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+
+object-assign@^4.0.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  dependencies:
+    mimic-fn "^1.0.0"
+
+optionator@^0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.4"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    wordwrap "~1.0.0"
+
+os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+path-is-inside@^1.0.1, path-is-inside@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+
+pend@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
+
+pify@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+
+pluralize@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+
+process-nextick-args@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+
+progress@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
+
+proxy-from-env@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
+
+pseudomap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+
+puppeteer@^0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-0.13.0.tgz#2e6956205f2c640964c2107f620ae1eef8bde8fd"
+  dependencies:
+    debug "^2.6.8"
+    extract-zip "^1.6.5"
+    https-proxy-agent "^2.1.0"
+    mime "^1.3.4"
+    progress "^2.0.0"
+    proxy-from-env "^1.0.0"
+    rimraf "^2.6.1"
+    ws "^3.0.0"
+
+readable-stream@^2.2.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.0.3"
+    util-deprecate "~1.0.1"
+
+require-uncached@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+  dependencies:
+    caller-path "^0.1.0"
+    resolve-from "^1.0.0"
+
+resolve-from@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
+
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+rimraf@^2.2.8, rimraf@^2.6.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  dependencies:
+    glob "^7.0.5"
+
+run-async@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  dependencies:
+    is-promise "^2.1.0"
+
+rx-lite-aggregates@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
+  dependencies:
+    rx-lite "*"
+
+rx-lite@*, rx-lite@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
+
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
+
+semver@^5.3.0:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+
+signal-exit@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+
+slice-ansi@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+
+string-width@^2.1.0, string-width@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string_decoder@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
+  dependencies:
+    safe-buffer "~5.1.0"
+
+strip-ansi@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+
+supports-color@^4.0.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
+  dependencies:
+    has-flag "^2.0.0"
+
+table@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
+  dependencies:
+    ajv "^5.2.3"
+    ajv-keywords "^2.1.0"
+    chalk "^2.1.0"
+    lodash "^4.17.4"
+    slice-ansi "1.0.0"
+    string-width "^2.1.1"
+
+text-table@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
+tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  dependencies:
+    prelude-ls "~1.1.2"
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+
+ultron@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
+
+util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+
+which@^1.2.9:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
+  dependencies:
+    isexe "^2.0.0"
+
+wordwrap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
+write@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
+  dependencies:
+    mkdirp "^0.5.1"
+
+ws@3.3.x, ws@^3.0.0:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.2.tgz#96c1d08b3fefda1d5c1e33700d3bfaa9be2d5608"
+  dependencies:
+    async-limiter "~1.0.0"
+    safe-buffer "~5.1.0"
+    ultron "~1.1.0"
+
+yallist@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+
+yauzl@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"
+  dependencies:
+    fd-slicer "~1.0.1"